diff options
Diffstat (limited to 'third_party/git')
1484 files changed, 232758 insertions, 100641 deletions
diff --git a/third_party/git/.cirrus.yml b/third_party/git/.cirrus.yml new file mode 100644 index 0000000000..c2f5fe385a --- /dev/null +++ b/third_party/git/.cirrus.yml @@ -0,0 +1,15 @@ +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 42cdc4bbfb..f9d819623d 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}] +[*.{c,h,sh,perl,pl,pm,txt}] indent_style = tab tab_width = 8 diff --git a/third_party/git/.github/CONTRIBUTING.md b/third_party/git/.github/CONTRIBUTING.md index e7b4e2f3c2..c8755e38de 100644 --- a/third_party/git/.github/CONTRIBUTING.md +++ b/third_party/git/.github/CONTRIBUTING.md @@ -16,4 +16,7 @@ If you prefer video, then [this talk](https://www.youtube.com/watch?v=Q7i_qQW__q might be useful to you as the presenter walks you through the contribution process by example. +Or, you can follow the ["My First Contribution"](https://git-scm.com/docs/MyFirstContribution) +tutorial for another example of the contribution process. + Your friendly Git community! diff --git a/third_party/git/.github/workflows/main.yml b/third_party/git/.github/workflows/main.yml new file mode 100644 index 0000000000..a940997f1b --- /dev/null +++ b/third_party/git/.github/workflows/main.yml @@ -0,0 +1,350 @@ +name: CI/PR + +on: [push, pull_request] + +env: + DEVELOPER: 1 + +jobs: + ci-config: + runs-on: ubuntu-latest + outputs: + enabled: ${{ steps.check-ref.outputs.enabled }}${{ steps.skip-if-redundant.outputs.enabled }} + steps: + - name: try to clone ci-config branch + run: | + git -c protocol.version=2 clone \ + --no-tags \ + --single-branch \ + -b ci-config \ + --depth 1 \ + --no-checkout \ + --filter=blob:none \ + https://github.com/${{ github.repository }} \ + config-repo && + cd config-repo && + git checkout HEAD -- ci/config || : ignore + - id: check-ref + name: check whether CI is enabled for ref + run: | + enabled=yes + if test -x config-repo/ci/config/allow-ref && + ! config-repo/ci/config/allow-ref '${{ github.ref }}' + then + enabled=no + fi + echo "::set-output name=enabled::$enabled" + - name: skip if the commit or tree was already tested + id: skip-if-redundant + uses: actions/github-script@v3 + if: steps.check-ref.outputs.enabled == 'yes' + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + // Figure out workflow ID, commit and tree + const { data: run } = await github.actions.getWorkflowRun({ + owner: context.repo.owner, + repo: context.repo.repo, + run_id: context.runId, + }); + const workflow_id = run.workflow_id; + const head_sha = run.head_sha; + const tree_id = run.head_commit.tree_id; + + // See whether there is a successful run for that commit or tree + const { data: runs } = await github.actions.listWorkflowRuns({ + owner: context.repo.owner, + repo: context.repo.repo, + per_page: 500, + status: 'success', + workflow_id, + }); + for (const run of runs.workflow_runs) { + if (head_sha === run.head_sha) { + core.warning(`Successful run for the commit ${head_sha}: ${run.html_url}`); + core.setOutput('enabled', ' but skip'); + break; + } + if (tree_id === run.head_commit.tree_id) { + core.warning(`Successful run for the tree ${tree_id}: ${run.html_url}`); + core.setOutput('enabled', ' but skip'); + break; + } + } + + windows-build: + needs: ci-config + if: needs.ci-config.outputs.enabled == 'yes' + runs-on: windows-latest + steps: + - uses: actions/checkout@v1 + - name: download git-sdk-64-minimal + shell: bash + run: | + ## Get artifact + urlbase=https://dev.azure.com/git-for-windows/git/_apis/build/builds + id=$(curl "$urlbase?definitions=22&statusFilter=completed&resultFilter=succeeded&\$top=1" | + jq -r ".value[] | .id") + download_url="$(curl "$urlbase/$id/artifacts" | + jq -r '.value[] | select(.name == "git-sdk-64-minimal").resource.downloadUrl')" + curl --connect-timeout 10 --retry 5 --retry-delay 0 --retry-max-time 240 \ + -o artifacts.zip "$download_url" + + ## Unzip and remove the artifact + unzip artifacts.zip + rm artifacts.zip + - name: build + shell: powershell + env: + HOME: ${{runner.workspace}} + MSYSTEM: MINGW64 + NO_PERL: 1 + run: | + & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @" + printf '%s\n' /git-sdk-64-minimal/ >>.git/info/exclude + + ci/make-test-artifacts.sh artifacts + "@ + - name: upload build artifacts + uses: actions/upload-artifact@v1 + with: + name: windows-artifacts + path: artifacts + - name: upload git-sdk-64-minimal + uses: actions/upload-artifact@v1 + with: + name: git-sdk-64-minimal + path: git-sdk-64-minimal + windows-test: + runs-on: windows-latest + needs: [windows-build] + strategy: + matrix: + nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + steps: + - uses: actions/checkout@v1 + - name: download build artifacts + uses: actions/download-artifact@v1 + with: + name: windows-artifacts + path: ${{github.workspace}} + - name: extract build artifacts + shell: bash + run: tar xf artifacts.tar.gz + - name: download git-sdk-64-minimal + uses: actions/download-artifact@v1 + with: + name: git-sdk-64-minimal + path: ${{github.workspace}}/git-sdk-64-minimal/ + - name: test + shell: powershell + run: | + & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @" + # Let Git ignore the SDK + printf '%s\n' /git-sdk-64-minimal/ >>.git/info/exclude + + ci/run-test-slice.sh ${{matrix.nr}} 10 + "@ + - name: ci/print-test-failures.sh + if: failure() + shell: powershell + run: | + & .\git-sdk-64-minimal\usr\bin\bash.exe -lc ci/print-test-failures.sh + - name: Upload failed tests' directories + if: failure() && env.FAILED_TEST_ARTIFACTS != '' + uses: actions/upload-artifact@v1 + with: + name: failed-tests-windows + path: ${{env.FAILED_TEST_ARTIFACTS}} + vs-build: + needs: ci-config + if: needs.ci-config.outputs.enabled == 'yes' + env: + MSYSTEM: MINGW64 + NO_PERL: 1 + GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'" + runs-on: windows-latest + steps: + - uses: actions/checkout@v1 + - name: download git-sdk-64-minimal + shell: bash + run: | + ## Get artifact + urlbase=https://dev.azure.com/git-for-windows/git/_apis/build/builds + id=$(curl "$urlbase?definitions=22&statusFilter=completed&resultFilter=succeeded&\$top=1" | + jq -r ".value[] | .id") + download_url="$(curl "$urlbase/$id/artifacts" | + jq -r '.value[] | select(.name == "git-sdk-64-minimal").resource.downloadUrl')" + curl --connect-timeout 10 --retry 5 --retry-delay 0 --retry-max-time 240 \ + -o artifacts.zip "$download_url" + + ## Unzip and remove the artifact + unzip artifacts.zip + rm artifacts.zip + - name: download vcpkg artifacts + shell: powershell + run: | + $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 + - name: add msbuild to PATH + uses: microsoft/setup-msbuild@v1 + - name: copy dlls to root + shell: powershell + run: | + & compat\vcbuild\vcpkg_copy_dlls.bat release + if (!$?) { exit(1) } + - name: generate Visual Studio solution + shell: bash + run: | + cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \ + -DIconv_LIBRARY=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/lib/libiconv.lib -DIconv_INCLUDE_DIR=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/include \ + -DMSGFMT_EXE=`pwd`/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON + - name: MSBuild + run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142 + - name: bundle artifact tar + shell: powershell + env: + MSVC: 1 + VCPKG_ROOT: ${{github.workspace}}\compat\vcbuild\vcpkg + run: | + & 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 2>&1 | grep ^tar)\" + "@ + - name: upload build artifacts + uses: actions/upload-artifact@v1 + with: + name: vs-artifacts + path: artifacts + vs-test: + runs-on: windows-latest + needs: [vs-build, windows-build] + strategy: + matrix: + nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + steps: + - uses: actions/checkout@v1 + - name: download git-sdk-64-minimal + uses: actions/download-artifact@v1 + with: + name: git-sdk-64-minimal + path: ${{github.workspace}}/git-sdk-64-minimal/ + - name: download build artifacts + uses: actions/download-artifact@v1 + with: + name: vs-artifacts + path: ${{github.workspace}} + - name: extract build artifacts + shell: bash + run: tar xf artifacts.tar.gz + - name: test + shell: powershell + env: + MSYSTEM: MINGW64 + NO_SVN_TESTS: 1 + GIT_TEST_SKIP_REBASE_P: 1 + run: | + & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @" + # Let Git ignore the SDK and the test-cache + printf '%s\n' /git-sdk-64-minimal/ /test-cache/ >>.git/info/exclude + + ci/run-test-slice.sh ${{matrix.nr}} 10 + "@ + - name: ci/print-test-failures.sh + if: failure() + shell: powershell + run: | + & .\git-sdk-64-minimal\usr\bin\bash.exe -lc ci/print-test-failures.sh + - name: Upload failed tests' directories + if: failure() && env.FAILED_TEST_ARTIFACTS != '' + uses: actions/upload-artifact@v1 + with: + name: failed-tests-windows + path: ${{env.FAILED_TEST_ARTIFACTS}} + regular: + needs: ci-config + if: needs.ci-config.outputs.enabled == 'yes' + strategy: + matrix: + vector: + - jobname: linux-clang + cc: clang + pool: ubuntu-latest + - jobname: linux-gcc + cc: gcc + pool: ubuntu-latest + - jobname: osx-clang + cc: clang + pool: macos-latest + - jobname: osx-gcc + cc: gcc + pool: macos-latest + - jobname: GETTEXT_POISON + cc: gcc + pool: ubuntu-latest + env: + CC: ${{matrix.vector.cc}} + jobname: ${{matrix.vector.jobname}} + runs-on: ${{matrix.vector.pool}} + steps: + - uses: actions/checkout@v1 + - run: ci/install-dependencies.sh + - run: ci/run-build-and-tests.sh + - run: ci/print-test-failures.sh + if: failure() + - name: Upload failed tests' directories + if: failure() && env.FAILED_TEST_ARTIFACTS != '' + uses: actions/upload-artifact@v1 + with: + name: failed-tests-${{matrix.vector.jobname}} + path: ${{env.FAILED_TEST_ARTIFACTS}} + dockerized: + needs: ci-config + if: needs.ci-config.outputs.enabled == 'yes' + strategy: + matrix: + vector: + - jobname: linux-musl + image: alpine + - jobname: Linux32 + image: daald/ubuntu32:xenial + env: + jobname: ${{matrix.vector.jobname}} + runs-on: ubuntu-latest + container: ${{matrix.vector.image}} + steps: + - uses: actions/checkout@v1 + - run: ci/install-docker-dependencies.sh + - run: ci/run-build-and-tests.sh + - run: ci/print-test-failures.sh + if: failure() + - name: Upload failed tests' directories + if: failure() && env.FAILED_TEST_ARTIFACTS != '' + uses: actions/upload-artifact@v1 + with: + name: failed-tests-${{matrix.vector.jobname}} + path: ${{env.FAILED_TEST_ARTIFACTS}} + static-analysis: + needs: ci-config + if: needs.ci-config.outputs.enabled == 'yes' + env: + jobname: StaticAnalysis + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: ci/install-dependencies.sh + - run: ci/run-static-analysis.sh + documentation: + needs: ci-config + if: needs.ci-config.outputs.enabled == 'yes' + env: + jobname: Documentation + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: ci/install-dependencies.sh + - run: ci/test-documentation.sh diff --git a/third_party/git/.gitignore b/third_party/git/.gitignore index 521d8f4fb4..6232d33924 100644 --- a/third_party/git/.gitignore +++ b/third_party/git/.gitignore @@ -25,6 +25,7 @@ /git-bisect--helper /git-blame /git-branch +/git-bugreport /git-bundle /git-cat-file /git-check-attr @@ -83,13 +84,13 @@ /git-init-db /git-interpret-trailers /git-instaweb -/git-legacy-stash /git-log /git-ls-files /git-ls-remote /git-ls-tree /git-mailinfo /git-mailsplit +/git-maintenance /git-merge /git-merge-base /git-merge-index @@ -134,7 +135,6 @@ /git-remote-fd /git-remote-ext /git-remote-testpy -/git-remote-testsvn /git-repack /git-replace /git-request-pull @@ -158,6 +158,7 @@ /git-show-branch /git-show-index /git-show-ref +/git-sparse-checkout /git-stage /git-stash /git-status @@ -188,6 +189,7 @@ /gitweb/gitweb.cgi /gitweb/static/gitweb.js /gitweb/static/gitweb.min.* +/config-list.h /command-list.h *.tar.gz *.dsc @@ -195,6 +197,7 @@ /git.spec *.exe *.[aos] +*.o.json *.py[co] .depend/ *.gcda @@ -216,6 +219,8 @@ /tags /TAGS /cscope* +/compile_commands.json +*.hcc *.obj *.lib *.res @@ -231,10 +236,10 @@ *.ipdb *.dll .vs/ -*.manifest Debug/ Release/ /UpgradeLog*.htm /git.VC.VC.opendb /git.VC.db *.dSYM +/contrib/buildsystems/out diff --git a/third_party/git/.mailmap b/third_party/git/.mailmap index 9a5ff04753..bde7aba756 100644 --- a/third_party/git/.mailmap +++ b/third_party/git/.mailmap @@ -18,6 +18,7 @@ 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> @@ -30,6 +31,7 @@ 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> @@ -58,7 +60,9 @@ 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> @@ -107,6 +111,7 @@ 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> @@ -285,6 +290,7 @@ 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/.travis.yml b/third_party/git/.travis.yml index fc5730b085..05f3e3f8d7 100644 --- a/third_party/git/.travis.yml +++ b/third_party/git/.travis.yml @@ -16,7 +16,7 @@ compiler: matrix: include: - - env: jobname=GIT_TEST_GETTEXT_POISON + - env: jobname=GETTEXT_POISON os: linux compiler: addons: @@ -32,7 +32,15 @@ matrix: services: - docker before_install: - script: ci/run-linux32-docker.sh + script: ci/run-docker.sh + - env: jobname=linux-musl + os: linux + compiler: + addons: + services: + - docker + before_install: + script: ci/run-docker.sh - env: jobname=StaticAnalysis os: linux compiler: diff --git a/third_party/git/.tsan-suppressions b/third_party/git/.tsan-suppressions index 8c85014a0a..5ba86d6845 100644 --- a/third_party/git/.tsan-suppressions +++ b/third_party/git/.tsan-suppressions @@ -8,3 +8,9 @@ # 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 new file mode 100644 index 0000000000..fc4645d5c0 --- /dev/null +++ b/third_party/git/CODE_OF_CONDUCT.md @@ -0,0 +1,93 @@ +# 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 f45db5b727..45465bc0c9 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 parseable and its exit code + The output of 'which' is not machine parsable and its exit code is not reliable across platforms. - We use POSIX compliant parameter substitutions and avoid bashisms; @@ -91,16 +91,10 @@ For shell scripts specifically (not exhaustive): - No shell arrays. - - No strlen ${#parameter}. - - No pattern replacement ${parameter/pattern/string}. - We use Arithmetic Expansion $(( ... )). - - Inside Arithmetic Expansion, spell shell variables with $ in front - of them, as some shells do not grok $((x)) while accepting $(($x)) - just fine (e.g. dash older than 0.5.4). - - We do not use Process Substitution <(list) or >(list). - Do not write control structures on a single line with semicolon. @@ -203,7 +197,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 identifer at the end. + to reduce the patch noise when adding a new identifier at the end. . since mid 2017 with cbc0f81d, we have been using designated initializers for struct (e.g. "struct t v = { .val = 'a' };"). @@ -238,6 +232,18 @@ For C programs: while( condition ) func (bar+1); + - Do not explicitly compare an integral value with constant 0 or '\0', + or a pointer value with constant NULL. For instance, to validate that + counted array <ptr, cnt> is initialized but has no elements, write: + + if (!ptr || cnt) + BUG("empty array expected"); + + and not: + + if (ptr == NULL || cnt != 0); + BUG("empty array expected"); + - We avoid using braces unnecessarily. I.e. if (bla) { @@ -483,16 +489,11 @@ For Python scripts: - We follow PEP-8 (http://www.python.org/dev/peps/pep-0008/). - - As a minimum, we aim to be compatible with Python 2.6 and 2.7. + - As a minimum, we aim to be compatible with Python 2.7. - Where required libraries do not restrict us to Python 2, we try to also be compatible with Python 3.1 and later. - - When you must differentiate between Unicode literals and byte string - literals, it is OK to use the 'b' prefix. Even though the Python - documentation for version 2.6 does not mention this prefix, it has - been supported since version 2.6.0. - Error Messages - Do not end error messages with a full stop. diff --git a/third_party/git/Documentation/Makefile b/third_party/git/Documentation/Makefile index 76f2ecfc1b..80d1908a44 100644 --- a/third_party/git/Documentation/Makefile +++ b/third_party/git/Documentation/Makefile @@ -17,6 +17,7 @@ MAN1_TXT += git.txt MAN1_TXT += gitk.txt MAN1_TXT += gitweb.txt +# man5 / man7 guides (note: new guides should also be added to command-list.txt) MAN5_TXT += gitattributes.txt MAN5_TXT += githooks.txt MAN5_TXT += gitignore.txt @@ -30,6 +31,7 @@ MAN7_TXT += gitcredentials.txt MAN7_TXT += gitcvs-migration.txt MAN7_TXT += gitdiffcore.txt MAN7_TXT += giteveryday.txt +MAN7_TXT += gitfaq.txt MAN7_TXT += gitglossary.txt MAN7_TXT += gitnamespaces.txt MAN7_TXT += gitremote-helpers.txt @@ -77,6 +79,7 @@ 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 @@ -91,6 +94,7 @@ TECH_DOCS += technical/protocol-capabilities TECH_DOCS += technical/protocol-common TECH_DOCS += technical/protocol-v2 TECH_DOCS += technical/racy-git +TECH_DOCS += technical/reftable TECH_DOCS += technical/send-pack-pipeline TECH_DOCS += technical/shallow TECH_DOCS += technical/signature-format @@ -123,7 +127,8 @@ ASCIIDOC_HTML = xhtml11 ASCIIDOC_DOCBOOK = docbook ASCIIDOC_CONF = -f asciidoc.conf ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ - -agit_version=$(GIT_VERSION) + -amanversion=$(GIT_VERSION) \ + -amanmanual='Git Manual' -amansource='Git' TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl @@ -147,32 +152,9 @@ endif -include ../config.mak.autogen -include ../config.mak -# -# For docbook-xsl ... -# -1.68.1, no extra settings are needed? -# 1.69.0, set ASCIIDOC_ROFF? -# 1.69.1-1.71.0, set DOCBOOK_SUPPRESS_SP? -# 1.71.1, set ASCIIDOC_ROFF? -# 1.72.0, set DOCBOOK_XSL_172. -# 1.73.0-, no extra settings are needed -# - -ifdef DOCBOOK_XSL_172 -ASCIIDOC_EXTRA += -a git-asciidoc-no-roff -MANPAGE_XSL = manpage-1.72.xsl -else - ifndef ASCIIDOC_ROFF - # docbook-xsl after 1.72 needs the regular XSL, but will not - # pass-thru raw roff codes from asciidoc.conf, so turn them off. - ASCIIDOC_EXTRA += -a git-asciidoc-no-roff - endif -endif ifndef NO_MAN_BOLD_LITERAL XMLTO_EXTRA += -m manpage-bold-literal.xsl endif -ifdef DOCBOOK_SUPPRESS_SP -XMLTO_EXTRA += -m manpage-suppress-sp.xsl -endif # Newer DocBook stylesheet emits warning cruft in the output when # this is not set, and if set it shows an absolute link. Older @@ -197,11 +179,13 @@ ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor ASCIIDOC_CONF = ASCIIDOC_HTML = xhtml5 -ASCIIDOC_DOCBOOK = docbook45 +ASCIIDOC_DOCBOOK = docbook5 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) @@ -311,6 +295,7 @@ cmds_txt = cmds-ancillaryinterrogators.txt \ cmds-plumbingmanipulators.txt \ cmds-synchingrepositories.txt \ cmds-synchelpers.txt \ + cmds-guide.txt \ cmds-purehelpers.txt \ cmds-foreignscminterface.txt @@ -318,7 +303,7 @@ $(cmds_txt): cmd-list.made cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT) $(QUIET_GEN)$(RM) $@ && \ - $(PERL_PATH) ./cmd-list.perl ../command-list.txt $(QUIET_STDERR) && \ + $(PERL_PATH) ./cmd-list.perl ../command-list.txt $(cmds_txt) $(QUIET_STDERR) && \ date >$@ mergetools_txt = mergetools-diff.txt mergetools-merge.txt diff --git a/third_party/git/Documentation/MyFirstContribution.txt b/third_party/git/Documentation/MyFirstContribution.txt index f8670379c0..4f85a089ef 100644 --- a/third_party/git/Documentation/MyFirstContribution.txt +++ b/third_party/git/Documentation/MyFirstContribution.txt @@ -23,6 +23,42 @@ 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 @@ -38,6 +74,26 @@ $ 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 @@ -97,8 +153,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_push`, and add a new line for `psuh` immediately before it, -in order to keep the declarations sorted: +declaration for `cmd_pull`, and add a new line for `psuh` immediately before it, +in order to keep the declarations alphabetically sorted: ---- int cmd_psuh(int argc, const char **argv, const char *prefix); @@ -123,7 +179,7 @@ int cmd_psuh(int argc, const char **argv, const char *prefix) } ---- -Let's try to build it. Open `Makefile`, find where `builtin/push.o` is added +Let's try to build it. Open `Makefile`, find where `builtin/pull.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 @@ -138,9 +194,6 @@ 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. @@ -149,7 +202,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. +line in alphabetical order (immediately before `cmd_pull`). 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, @@ -167,7 +220,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-push`, and +which should be ignored. Open `.gitignore` in your editor, find `/git-pull`, and add an entry for your new command in alphabetical order: ---- @@ -266,14 +319,14 @@ function body: ... git_config(git_default_config, NULL); - if (git_config_get_string_const("user.name", &cfg_name) > 0) + if (git_config_get_string_tmp("user.name", &cfg_name) > 0) printf(_("No name is found in config\n")); else printf(_("Your name: %s\n"), cfg_name); ---- `git_config()` will grab the configuration from config files known to Git and -apply standard precedence rules. `git_config_get_string_const()` will look up +apply standard precedence rules. `git_config_get_string_tmp()` will look up a specific key ("user.name") and give you the value. There are a number of single-key lookup functions like this one; you can see them all (and more info about how to use `git_config()`) in `Documentation/technical/api-config.txt`. @@ -534,6 +587,28 @@ 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! @@ -746,6 +821,14 @@ 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: @@ -970,7 +1053,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://public-inbox.org/git[mailing list]. Find your cover letter in the +https://lore.kernel.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: @@ -1096,8 +1179,8 @@ look at the section below this one for some context.) [[after-approval]] === After Review Approval -The Git project has four integration branches: `pu`, `next`, `master`, and -`maint`. Your change will be placed into `pu` fairly early on by the maintainer +The Git project has four integration branches: `seen`, `next`, `master`, and +`maint`. Your change will be placed into `seen` fairly early on by the maintainer while it is still in the review process; from there, when it is ready for wider testing, it will be merged into `next`. Plenty of early testers use `next` and may report issues. Eventually, changes in `next` will make it to `master`, diff --git a/third_party/git/Documentation/MyFirstObjectWalk.txt b/third_party/git/Documentation/MyFirstObjectWalk.txt new file mode 100644 index 0000000000..c3f2d1a831 --- /dev/null +++ b/third_party/git/Documentation/MyFirstObjectWalk.txt @@ -0,0 +1,902 @@ += 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))) { + 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 daf4bdb0d7..d6d42f3183 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. -* Crufts removal +* Cruft 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 reencodes the message to the log output encoding when + and re-encodes 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 ad060f4f89..980adfb315 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 - http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 + https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ 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 418c685cf8..4bcff945e0 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 - http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 + https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ 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 7a904419f7..a2a34b43a7 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 - http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 + https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ 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 d3a2a3e712..344333de66 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 crufts. + produce cruft. * "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 ee141c19ad..6c7f7da7eb 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 - http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 + https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ 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 c50b59c495..3ed1e01433 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 - http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 + https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ 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 fcb46ca6a4..73ed2b5278 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 tis configuration + * "gitweb" did not diagnose parsing errors properly while reading its 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 326670df6e..57597f2bf3 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 overun the buffer if it is too long. + incorrectly and could overrun 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 ecda427a35..4b822976b8 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 puser + progress output while processing objects it received to the user 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 9c03353af2..1d24edcf2f 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 smalt-HTTP protocol could + * "git send-pack" (hence "git push") over smart-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 43883c14f0..63d6e4afa4 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 puser + progress output while processing objects it received to the user 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 96090ef599..c257beb114 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 dependant error message to 'echo' and expecting it + random, data dependent 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 02f681b710..255e185af6 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 ($gmane/225824) so let's try moving it + this is fine with Cygwin 1.7 (cf. <51A606A0.5060101@web.de>) 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 acc9ebb886..0dfb17c4fc 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 recheability bitmap when it needs to split the resulting + object reachability 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 f4da28ab66..3792b7d03d 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 usuall called "theirs" in + the system where outside stuff is usually 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 c4d4397023..abbd331508 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 - reopsitory, in a worktree that is connected to the bare + repository, 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 9cd14c8197..7d35cf186d 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 multile p4 paths imported a single changelist + * "git p4" that tracks multiple 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 ef8b97da9b..d2f6a83614 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 multile p4 paths imported a single changelist + * "git p4" that tracks multiple 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 aa99d4b3ce..2a47b4cb0c 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 dirtyness in submodules differently; instead of to + various kinds of dirtiness 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 5d76ad5310..384e4de265 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 - unnecessarilyl complex. Attempt to simplify the logic by using the + unnecessarily 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 ahs been corrected. + * An unaligned 32-bit access in pack-bitmap code has 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 4246c68ff5..2711a2529d 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 distingiuish + separate and dedicated timestamp_t (so that we can distinguish 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 - unnecessarilyl complex. Attempt to simplify the logic by using the + unnecessarily 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 new file mode 100644 index 0000000000..72b7af6799 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.14.6.txt @@ -0,0 +1,54 @@ +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 new file mode 100644 index 0000000000..dc241cba34 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.15.4.txt @@ -0,0 +1,11 @@ +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 0c81c5915f..b474781ed8 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 enconding conversion. + due to incorrect encoding 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 64a0bcb0d2..f0121a8f2d 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 sharable. + so that it can be more safely shareable. * 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 new file mode 100644 index 0000000000..438306e60b --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.16.6.txt @@ -0,0 +1,8 @@ +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 c2cf891f71..8b17c26033 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 sharable. + so that it can be more safely shareable. (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 new file mode 100644 index 0000000000..5a46c94271 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.17.3.txt @@ -0,0 +1,12 @@ +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 new file mode 100644 index 0000000000..7d794ca01a --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.17.4.txt @@ -0,0 +1,16 @@ +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 new file mode 100644 index 0000000000..2abb821a73 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.17.5.txt @@ -0,0 +1,22 @@ +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 3ea280cf68..6c8a0e97c1 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 addtion, has been + on packfile content, which is a relatively recent addition, 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 new file mode 100644 index 0000000000..98b168aade --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.18.2.txt @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000000..25143f0cec --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.18.3.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..e8ef858a00 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.18.4.txt @@ -0,0 +1,5 @@ +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 a06ccf6e2a..891c79b9cb 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 programatically enumerate various + * Continuing with the idea to programmatically 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 new file mode 100644 index 0000000000..92d7f89de6 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.19.3.txt @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000000..35d0ae561b --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.19.4.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..18a4dcbfd6 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.19.5.txt @@ -0,0 +1,5 @@ +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 e71fe3dee1..3dd7e6e1fc 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 crufts" but also updates + is no longer limited to "pruning away cruft" 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 new file mode 100644 index 0000000000..8e680cb9fb --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.20.2.txt @@ -0,0 +1,18 @@ +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 new file mode 100644 index 0000000000..f6eccd103b --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.20.3.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..5a9e24e470 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.20.4.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..b7594151e4 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.21.1.txt @@ -0,0 +1,12 @@ +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 new file mode 100644 index 0000000000..a0fb83bb53 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.21.2.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..2ca0aa5c62 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.21.3.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..940a23f0d9 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.22.2.txt @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000000..57296f6d17 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.22.3.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..8b5f3e3f37 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.22.4.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..2083b492ce --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.23.1.txt @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000000..b697cbe0e3 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.23.2.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..2e35490137 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.23.3.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..bde154124c --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.24.0.txt @@ -0,0 +1,398 @@ +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 new file mode 100644 index 0000000000..18104850fe --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.24.1.txt @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000000..0049f65503 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.24.2.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..5302e0f73b --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.24.3.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..91ceb34927 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.25.0.txt @@ -0,0 +1,370 @@ +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 new file mode 100644 index 0000000000..cd869b02bb --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.25.1.txt @@ -0,0 +1,55 @@ +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 new file mode 100644 index 0000000000..303c53a17f --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.25.2.txt @@ -0,0 +1,60 @@ +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 new file mode 100644 index 0000000000..15f7f21f10 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.25.3.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..0dbb5daeec --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.25.4.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..3a7a734c26 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.26.0.txt @@ -0,0 +1,341 @@ +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 new file mode 100644 index 0000000000..1b4ecb3fdc --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.26.1.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..d434d0c695 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.26.2.txt @@ -0,0 +1,5 @@ +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.27.0.txt b/third_party/git/Documentation/RelNotes/2.27.0.txt new file mode 100644 index 0000000000..15518d06c1 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.27.0.txt @@ -0,0 +1,525 @@ +Git 2.27 Release Notes +====================== + +Updates since v2.26 +------------------- + +Backward compatibility notes + + * When "git describe C" finds that commit C is pointed by a signed or + annotated tag, which records T as its tagname in the object, the + command gives T as its answer. Even if the user renames or moves + such a tag from its natural location in the "refs/tags/" hierarchy, + "git describe C" would still give T as the answer, but in such a + case "git show T^0" would no longer work as expected. There may be + nothing at "refs/tags/T" or even worse there may be a different tag + instead. + + Starting from this version, "git describe" will always use the + "long" version, as if the "--long" option were given, when giving + its output based on such a misplaced tag to work around the problem. + + * "git pull" issues a warning message until the pull.rebase + configuration variable is explicitly given, which some existing + users may find annoying---those who prefer not to rebase need to + set the variable to false to squelch the warning. + + * The transport protocol version 2, which was promoted to the default + in Git 2.26 release, turned out to have some remaining rough edges, + so it has been demoted from the default. + + +UI, Workflows & Features + + * A handful of options to configure SSL when talking to proxies have + been added. + + * Smudge/clean conversion filters are now given more information + (e.g. the object of the tree-ish in which the blob being converted + appears, in addition to its path, which has already been given). + + * When "git describe C" finds an annotated tag with tagname A to be + the best name to explain commit C, and the tag is stored in a + "wrong" place in the refs/tags hierarchy, e.g. refs/tags/B, the + command gave a warning message but used A (not B) to describe C. + If C is exactly at the tag, the describe output would be "A", but + "git rev-parse A^0" would not be equal as "git rev-parse C^0". The + behavior of the command has been changed to use the "long" form + i.e. A-0-gOBJECTNAME, which is correctly interpreted by rev-parse. + + * "git pull" learned to warn when no pull.rebase configuration + exists, and neither --[no-]rebase nor --ff-only is given (which + would result a merge). + + * "git p4" learned four new hooks and also "--no-verify" option to + bypass them (and the existing "p4-pre-submit" hook). + + * "git pull" shares many options with underlying "git fetch", but + some of them were not documented and some of those that would make + sense to pass down were not passed down. + + * "git rebase" learned the "--no-gpg-sign" option to countermand + commit.gpgSign the user may have. + + * The output from "git format-patch" uses RFC 2047 encoding for + non-ASCII letters on From: and Subject: headers, so that it can + directly be fed to e-mail programs. A new option has been added + to produce these headers in raw. + + * "git log" learned "--show-pulls" that helps pathspec limited + history views; a merge commit that takes the whole change from a + side branch, which is normally omitted from the output, is shown + in addition to the commits that introduce real changes. + + * The interactive input from various codepaths are consolidated and + any prompt possibly issued earlier are fflush()ed before we read. + + * Allow "git rebase" to reapply all local commits, even if the may be + already in the upstream, without checking first. + + * The 'pack.useSparse' configuration variable now defaults to 'true', + enabling an optimization that has been experimental since Git 2.21. + + * "git rebase" happens to call some hooks meant for "checkout" and + "commit" by this was not a designed behaviour than historical + accident. This has been documented. + + * "git merge" learns the "--autostash" option. + + * "sparse-checkout" UI improvements. + + * "git update-ref --stdin" learned a handful of new verbs to let the + user control ref update transactions more explicitly, which helps + as an ingredient to implement two-phase commit-style atomic + ref-updates across multiple repositories. + + * "git commit-graph write" learned different ways to write out split + files. + + * Introduce an extension to the commit-graph to make it efficient to + check for the paths that were modified at each commit using Bloom + filters. + + * The approxidate parser learns to parse seconds with fraction and + ignore fractional part. + + * The userdiff patterns for Markdown documents have been added. + + * The sparse-checkout patterns have been forbidden from excluding all + paths, leaving an empty working tree, for a long time. This + limitation has been lifted. + + * "git restore --staged --worktree" now defaults to take the contents + out of "HEAD", instead of erring out. + + * "git p4" learned to recover from a (broken) state where a directory + and a file are recorded at the same path in the Perforce repository + the same way as their clients do. + + * "git multi-pack-index repack" has been taught to honor some + repack.* configuration variables. + + +Performance, Internal Implementation, Development Support etc. + + * The advise API has been revamped to allow more systematic enumeration of + advice knobs in the future. + + * SHA-256 transition continues. + + * The code to interface with GnuPG has been refactored. + + * "git stash" has kept an escape hatch to use the scripted version + for a few releases, which got stale. It has been removed. + + * Enable tests that require GnuPG on Windows. + + * Minor test usability improvement. + + * Trace2 enhancement to allow logging of the environment variables. + + * Test clean-up continues. + + * Perf-test update. + + * A Windows-specific test element has been made more robust against + misuse from both user's environment and programmer's errors. + + * Various tests have been updated to work around issues found with + shell utilities that come with busybox etc. + + * The config API made mixed uses of int and size_t types to represent + length of various pieces of text it parsed, which has been updated + to use the correct type (i.e. size_t) throughout. + + * The "--decorate-refs" and "--decorate-refs-exclude" options "git + log" takes have learned a companion configuration variable + log.excludeDecoration that sits at the lowest priority in the + family. + + * A new CI job to build and run test suite on linux with musl libc + has been added. + + * Update the CI configuration to use GitHub Actions, retiring the one + based on Azure Pipelines. + + * The directory traversal code had redundant recursive calls which + made its performance characteristics exponential with respect to + the depth of the tree, which was corrected. + + * "git blame" learns to take advantage of the "changed-paths" Bloom + filter stored in the commit-graph file. + + * The "bugreport" tool has been added. + + * The object walk with object filter "--filter=tree:0" can now take + advantage of the pack bitmap when available. + + * Instead of always building all branches at GitHub via Actions, + users can specify which branches to build. + + * Codepaths that show progress meter have been taught to also use the + start_progress() and the stop_progress() calls as a "region" to be + traced. + + * Instead of downloading Windows SDK for CI jobs for windows builds + from an external site (wingit.blob.core.windows.net), use the one + created in the windows-build job, to work around quota issues at + the external site. + + +Fixes since v2.26 +----------------- + + * The real_path() convenience function can easily be misused; with a + bit of code refactoring in the callers' side, its use has been + eliminated. + (merge 49d3c4b481 am/real-path-fix later to maint). + + * Update "git p4" to work with Python 3. + (merge 6bb40ed20a yz/p4-py3 later to maint). + + * The mechanism to prevent "git commit" from making an empty commit + or amending during an interrupted cherry-pick was broken during the + rewrite of "git rebase" in C, which has been corrected. + (merge 430b75f720 pw/advise-rebase-skip later to maint). + + * Fix "git checkout --recurse-submodules" of a nested submodule + hierarchy. + (merge 846f34d351 pb/recurse-submodules-fix later to maint). + + * The "--fork-point" mode of "git rebase" regressed when the command + was rewritten in C back in 2.20 era, which has been corrected. + (merge f08132f889 at/rebase-fork-point-regression-fix later to maint). + + * The import-tars importer (in contrib/fast-import/) used to create + phony files at the top-level of the repository when the archive + contains global PAX headers, which made its own logic to detect and + omit the common leading directory ineffective, which has been + corrected. + (merge c839fcff65 js/import-tars-do-not-make-phony-files-from-pax-headers later to maint). + + * Simplify the commit ancestry connectedness check in a partial clone + repository in which "promised" objects are assumed to be obtainable + lazily on-demand from promisor remote repositories. + (merge 2b98478c6f jt/connectivity-check-optim-in-partial-clone later to maint). + + * The server-end of the v2 protocol to serve "git clone" and "git + fetch" was not prepared to see a delim packets at unexpected + places, which led to a crash. + (merge cacae4329f jk/harden-protocol-v2-delim-handling later to maint). + + * When fed a midx that records no objects, some codepaths tried to + loop from 0 through (num_objects-1), which, due to integer + arithmetic wrapping around, made it nonsense operation with out of + bounds array accesses. The code has been corrected to reject such + an midx file. + (merge 796d61cdc0 dr/midx-avoid-int-underflow later to maint). + + * Utitiles run via the run_command() API were not spawned correctly + on Cygwin, when the paths to them are given as a full path with + backslashes. + (merge 05ac8582bc ak/run-command-on-cygwin-fix later to maint). + + * "git pull --rebase" tried to run a rebase even after noticing that + the pull results in a fast-forward and no rebase is needed nor + sensible, for the past few years due to a mistake nobody noticed. + (merge fbae70ddc6 en/pull-do-not-rebase-after-fast-forwarding later to maint). + + * "git rebase" with the merge backend did not work well when the + rebase.abbreviateCommands configuration was set. + (merge de9f1d3ef4 ag/rebase-merge-allow-ff-under-abbrev-command later to maint). + + * The logic to auto-follow tags by "git clone --single-branch" was + not careful to avoid lazy-fetching unnecessary tags, which has been + corrected. + (merge 167a575e2d jk/use-quick-lookup-in-clone-for-tag-following later to maint). + + * "git rebase -i" did not leave the reflog entries correctly. + (merge 1f6965f994 en/sequencer-reflog-action later to maint). + + * The more aggressive updates to remote-tracking branches we had for + the past 7 years or so were not reflected in the documentation, + which has been corrected. + (merge a44088435c pb/pull-fetch-doc later to maint). + + * We've left the command line parsing of "git log :/a/b/" broken for + about a full year without anybody noticing, which has been + corrected. + (merge 0220461071 jc/missing-ref-store-fix later to maint). + + * Misc fixes for Windows. + (merge 3efc128cd5 js/mingw-fixes later to maint). + + * "git rebase" (again) learns to honor "--no-keep-empty", which lets + the user to discard commits that are empty from the beginning (as + opposed to the ones that become empty because of rebasing). The + interactive rebase also marks commits that are empty in the todo. + (merge 50ed76148a en/rebase-no-keep-empty later to maint). + + * Parsing the host part out of URL for the credential helper has been corrected. + (merge 4c5971e18a jk/credential-parsing-end-of-host-in-URL later to maint). + + * Document the recommended way to abort a failing test early (e.g. by + exiting a loop), which is to say "return 1". + (merge 7cc112dc95 jc/doc-test-leaving-early later to maint). + + * The code that refreshes the last access and modified time of + on-disk packfiles and loose object files have been updated. + (merge 312cd76130 lr/freshen-file-fix later to maint). + + * Validation of push certificate has been made more robust against + timing attacks. + (merge 719483e547 bc/constant-memequal later to maint). + + * The custom hash function used by "git fast-import" has been + replaced with the one from hashmap.c, which gave us a nice + performance boost. + (merge d8410a816b jk/fast-import-use-hashmap later to maint). + + * The "git submodule" command did not initialize a few variables it + internally uses and was affected by variable settings leaked from + the environment. + (merge 65d100c4dd lx/submodule-clear-variables later to maint). + + * Raise the minimum required version of docbook-xsl package to 1.74, + as 1.74.0 was from late 2008, which is more than 10 years old, and + drop compatibility cruft from our documentation suite. + (merge 3c255ad660 ma/doc-discard-docbook-xsl-1.73 later to maint). + + * "git log" learns "--[no-]mailmap" as a synonym to "--[no-]use-mailmap" + (merge 88acccda38 jc/log-no-mailmap later to maint). + + * "git commit-graph write --expire-time=<timestamp>" did not use the + given timestamp correctly, which has been corrected. + (merge b09b785c78 ds/commit-graph-expiry-fix later to maint). + + * Tests update to use "test-chmtime" instead of "touch -t". + (merge e892a56845 ds/t5319-touch-fix later to maint). + + * "git diff" in a partial clone learned to avoid lazy loading blob + objects in more casese when they are not needed. + (merge 95acf11a3d jt/avoid-prefetch-when-able-in-diff later to maint). + + * "git push --atomic" used to show failures for refs that weren't + even pushed, which has been corrected. + (merge dfe1b7f19c jx/atomic-push later to maint). + + * Code in builtin/*, i.e. those can only be called from within + built-in subcommands, that implements bulk of a couple of + subcommands have been moved to libgit.a so that they could be used + by others. + (merge 9460fd48b5 dl/libify-a-few later to maint). + + * Allowing the user to split a patch hunk while "git stash -p" does + not work well; a band-aid has been added to make this (partially) + work better. + + * "git diff-tree --pretty --notes" used to hit an assertion failure, + as it forgot to initialize the notes subsystem. + (merge 5778b22b3d tb/diff-tree-with-notes later to maint). + + * "git range-diff" fixes. + (merge 8d1675eb7f vd/range-diff-with-custom-pretty-format-fix later to maint). + + * "git grep" did not quote a path with unusual character like other + commands (like "git diff", "git status") do, but did quote when run + from a subdirectory, both of which has been corrected. + (merge 45115d8490 mt/grep-cquote-path later to maint). + + * GNU/Hurd is also among the ones that need the fopen() wrapper. + (merge 274a1328fb jc/gnu-hurd-lets-fread-read-dirs later to maint). + + * Those fetching over protocol v2 from linux-next and other kernel + repositories are reporting that v2 often fetches way too much than + needed. + (merge 11c7f2a30b jn/demote-proto2-from-default later to maint). + + * The upload-pack protocol v2 gave up too early before finding a + common ancestor, resulting in a wasteful fetch from a fork of a + project. This has been corrected to match the behaviour of v0 + protocol. + (merge 2f0a093dd6 jt/v2-fetch-nego-fix later to maint). + + * The build procedure did not use the libcurl library and its include + files correctly for a custom-built installation. + (merge 0573831950 jk/build-with-right-curl later to maint). + + * Tighten "git mailinfo" to notice and error out when decoded result + contains NUL in it. + (merge 3919997447 dd/mailinfo-with-nul later to maint). + + * Fix in-core inconsistency after fetching into a shallow repository + that broke the code to write out commit-graph. + (merge 37b9dcabfc tb/reset-shallow later to maint). + + * The commit-graph code exhausted file descriptors easily when it + does not have to. + (merge c8828530b7 tb/commit-graph-fd-exhaustion-fix later to maint). + + * The multi-pack-index left mmapped file descriptors open when it + does not have to. + (merge 6c7ff7cf7f ds/multi-pack-index later to maint). + + * Recent update to Homebrew used by macOS folks breaks build by + moving gettext library and necessary headers. + (merge a0b3108618 ds/build-homebrew-gettext-fix later to maint). + + * Incompatible options "--root" and "--fork-point" of "git rebase" + have been marked and documented as being incompatible. + (merge a35413c378 en/rebase-root-and-fork-point-are-incompatible later to maint). + + * Error and verbose trace messages from "git push" did not redact + credential material embedded in URLs. + (merge d192fa5006 js/anonymise-push-url-in-errors later to maint). + + * Update the parser used for credential.<URL>.<variable> + configuration, to handle <URL>s with '/' in them correctly. + (merge b44d0118ac bc/wildcard-credential later to maint). + + * Recent updates broke parsing of "credential.<url>.<key>" where + <url> is not a full URL (e.g. [credential "https://"] helper = ...) + stopped working, which has been corrected. + (merge 9a121b0d22 js/partial-urlmatch-2.17 later to maint). + (merge cd93e6c029 js/partial-urlmatch later to maint). + + * Some of the files commit-graph subsystem keeps on disk did not + correctly honor the core.sharedRepository settings and some were + left read-write. + + * In error messages that "git switch" mentions its option to create a + new branch, "-b/-B" options were shown, where "-c/-C" options + should be, which has been corrected. + (merge 7c16ef7577 dl/switch-c-option-in-error-message later to maint). + + * With the recent tightening of the code that is used to parse + various parts of a URL for use in the credential subsystem, a + hand-edited credential-store file causes the credential helper to + die, which is a bit too harsh to the users. Demote the error + behaviour to just ignore and keep using well-formed lines instead. + (merge c03859a665 cb/credential-store-ignore-bogus-lines later to maint). + + * The samples in the credential documentation has been updated to + make it clear that we depict what would appear in the .git/config + file, by adding appropriate quotes as needed.. + (merge 177681a07e jk/credential-sample-update later to maint). + + * "git branch" and other "for-each-ref" variants accepted multiple + --sort=<key> options in the increasing order of precedence, but it + had a few breakages around "--ignore-case" handling, and tie-breaking + with the refname, which have been fixed. + (merge 7c5045fc18 jk/for-each-ref-multi-key-sort-fix later to maint). + + * The coding guideline for shell scripts instructed to refer to a + variable with dollar-sign inside arithmetic expansion to work + around a bug in old versions of dash, which is a thing of the past. + Now we are not forbidden from writing $((var+1)). + (merge 32b5fe7f0e jk/arith-expansion-coding-guidelines later to maint). + + * The <stdlib.h> header on NetBSD brings in its own definition of + hmac() function (eek), which conflicts with our own and unrelated + function with the same name. Our function has been renamed to work + around the issue. + (merge 3013118eb8 cb/avoid-colliding-with-netbsd-hmac later to maint). + + * The basic test did not honor $TEST_SHELL_PATH setting, which has + been corrected. + (merge 0555e4af58 cb/t0000-use-the-configured-shell later to maint). + + * Minor in-code comments and documentation updates around credential + API. + (merge 1aed817f99 cb/credential-doc-fixes later to maint). + + * Teach "am", "commit", "merge" and "rebase", when they are run with + the "--quiet" option, to pass "--quiet" down to "gc --auto". + (merge 7c3e9e8cfb jc/auto-gc-quiet later to maint). + + * The code to skip unmerged paths in the index when sparse checkout + is in use would have made out-of-bound access of the in-core index + when the last path was unmerged, which has been corrected. + + * Serving a "git fetch" client over "git://" and "ssh://" protocols + using the on-wire protocol version 2 was buggy on the server end + when the client needs to make a follow-up request to + e.g. auto-follow tags. + (merge 08450ef791 cc/upload-pack-v2-fetch-fix later to maint). + + * "git bisect replay" had trouble with input files when they used + CRLF line ending, which has been corrected. + (merge 6c722cbe5a cw/bisect-replay-with-dos later to maint). + + * "rebase -i" segfaulted when rearranging a sequence that has a + fix-up that applies another fix-up (which may or may not be a + fix-up of yet another step). + (merge 02471e7e20 js/rebase-autosquash-double-fixup-fix later to maint). + + * "git fsck" ensures that the paths recorded in tree objects are + sorted and without duplicates, but it failed to notice a case where + a blob is followed by entries that sort before a tree with the same + name. This has been corrected. + (merge 9068cfb20f rs/fsck-duplicate-names-in-trees later to maint). + + * Code clean-up by removing a compatibility implementation of a + function we no longer use. + (merge 84b0115f0d cb/no-more-gmtime later to maint). + + * When a binary file gets modified and renamed on both sides of history + to different locations, both files would be written to the working + tree but both would have the contents from "ours". This has been + corrected so that the path from each side gets their original content. + + * Fix for a copy-and-paste error introduced during 2.20 era. + (merge e68a5272b1 ds/multi-pack-verify later to maint). + + * Update an unconditional use of "grep -a" with a perl script in a test. + (merge 1eb7371236 dd/t5703-grep-a-fix later to maint). + + * Other code cleanup, docfix, build fix, etc. + (merge 564956f358 jc/maintain-doc later to maint). + (merge 7422b2a0a1 sg/commit-slab-clarify-peek later to maint). + (merge 9c688735f6 rs/doc-passthru-fetch-options later to maint). + (merge 757c2ba3e2 en/oidset-uninclude-hashmap later to maint). + (merge 8312aa7d74 jc/config-tar later to maint). + (merge d00a5bdd50 ss/submodule-foreach-cb later to maint). + (merge 64d1022e14 ar/test-style-fixes later to maint). + (merge 4a465443a6 ds/doc-clone-filter later to maint). + (merge bb2dbe301b jk/t3419-drop-expensive-tests later to maint). + (merge d3507cc712 js/test-junit-finalization-fix later to maint). + (merge 2149b6748f bc/faq later to maint). + (merge 12dc0879f1 jk/test-cleanup later to maint). + (merge 344420bf0f pb/rebase-doc-typofix later to maint). + (merge 7cd54d37dc dl/wrapper-fix-indentation later to maint). + (merge 78725ebda9 jc/allow-strlen-substitution-in-shell-scripts later to maint). + (merge 2ecfcdecc6 jm/gitweb-fastcgi-utf8 later to maint). + (merge 0740d0a5d3 jk/oid-array-cleanups later to maint). + (merge a1aba0c95c js/t0007-typofix later to maint). + (merge 76ba7fa225 ma/config-doc-fix later to maint). + (merge 826f0c0df2 js/subtree-doc-update-to-asciidoctor-2 later to maint). + (merge 88eaf361e0 eb/mboxrd-doc later to maint). + (merge 051cc54941 tm/zsh-complete-switch-restore later to maint). + (merge 39102cf4fe ms/doc-revision-illustration-fix later to maint). + (merge 4d9378bfad eb/gitweb-more-trailers later to maint). + (merge bdccbf7047 mt/doc-worktree-ref later to maint). + (merge ce9baf234f dl/push-recurse-submodules-fix later to maint). + (merge 4153274052 bc/doc-credential-helper-value later to maint). + (merge 5c7bb0146e jc/codingstyle-compare-with-null later to maint). diff --git a/third_party/git/Documentation/RelNotes/2.28.0.txt b/third_party/git/Documentation/RelNotes/2.28.0.txt new file mode 100644 index 0000000000..6baf781380 --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.28.0.txt @@ -0,0 +1,236 @@ +Git 2.28 Release Notes +====================== + +Updates since v2.27 +------------------- + +Backward compatibility notes + + * "fetch.writeCommitGraph" is deemed to be still a bit too risky and + is no longer part of the "feature.experimental" set. + + +UI, Workflows & Features + + * The commands in the "diff" family learned to honor "diff.relative" + configuration variable. + + * The check in "git fsck" to ensure that the tree objects are sorted + still had corner cases it missed unsorted entries. + + * The interface to redact sensitive information in the trace output + has been simplified. + + * The command line completion (in contrib/) learned to complete + options that the "git switch" command takes. + + * "git diff" used to take arguments in random and nonsense range + notation, e.g. "git diff A..B C", "git diff A..B C...D", etc., + which has been cleaned up. + + * "git diff-files" has been taught to say paths that are marked as + intent-to-add are new files, not modified from an empty blob. + + * "git status" learned to report the status of sparse checkout. + + * "git difftool" has trouble dealing with paths added to the index + with the intent-to-add bit. + + * "git fast-export --anonymize" learned to take customized mapping to + allow its users to tweak its output more usable for debugging. + + * The command line completion support (in contrib/) used to be + prepared to work with "set -u" but recent changes got a bit more + sloppy. This has been corrected. + + * "git gui" now allows opening work trees from the start-up dialog. + + +Performance, Internal Implementation, Development Support etc. + + * Code optimization for a common case. + (merge 8777616e4d an/merge-single-strategy-optim later to maint). + + * We've adopted a convention that any on-stack structure can be + initialized to have zero values in all fields with "= { 0 }", + even when the first field happens to be a pointer, but sparse + complained that a null pointer should be spelled NULL for a long + time. Start using -Wno-universal-initializer option to squelch + it (the latest sparse has it on by default). + + * "git log -L..." now takes advantage of the "which paths are touched + by this commit?" info stored in the commit-graph system. + + * As FreeBSD is not the only platform whose regexp library reports + a REG_ILLSEQ error when fed invalid UTF-8, add logic to detect that + automatically and skip the affected tests. + + * "git bugreport" learns to report what shell is in use. + + * Support for GIT_CURL_VERBOSE has been rewritten in terms of + GIT_TRACE_CURL. + + * Preliminary clean-ups around refs API, plus file format + specification documentation for the reftable backend. + + * Workaround breakage in MSVC build, where "curl-config --cflags" + gives settings appropriate for GCC build. + + * Code clean-up of "git clean" resulted in a fix of recent + performance regression. + + * Code clean-up in the codepath that serves "git fetch" continues. + + * "git merge-base --is-ancestor" is taught to take advantage of the + commit graph. + + * Rewrite of parts of the scripted "git submodule" Porcelain command + continues; this time it is "git submodule set-branch" subcommand's + turn. + + * The "fetch/clone" protocol has been updated to allow the server to + instruct the clients to grab pre-packaged packfile(s) in addition + to the packed object data coming over the wire. + + * A misdesigned strbuf_write_fd() function has been retired. + + * SHA-256 migration work continues, including CVS/SVN interface. + + * A few fields in "struct commit" that do not have to always be + present have been moved to commit slabs. + + * API cleanup for get_worktrees() + + * By renumbering object flag bits, "struct object" managed to lose + bloated inter-field padding. + + * The name of the primary branch in existing repositories, and the + default name used for the first branch in newly created + repositories, is made configurable, so that we can eventually wean + ourselves off of the hardcoded 'master'. + + * The effort to avoid using test_must_fail on non-git command continues. + + * In 2.28-rc0, we corrected a bug that some repository extensions are + honored by mistake even in a version 0 repositories (these + configuration variables in extensions.* namespace were supposed to + have special meaning in repositories whose version numbers are 1 or + higher), but this was a bit too big a change. The behaviour in + recent versions of Git where certain extensions.* were honored by + mistake even in version 0 repositories has been restored. + + +Fixes since v2.27 +----------------- + + * The "--prepare-p4-only" option of "git p4" is supposed to stop + after replaying one changeset, but kept going (by mistake?) + + * The error message from "git checkout -b foo -t bar baz" was + confusing. + + * Some repositories in the wild have commits that record nonsense + committer timezone (e.g. rails.git); "git fast-import" learned an + option to pass these nonsense timestamps intact to allow recreating + existing repositories as-is. + (merge d42a2fb72f en/fast-import-looser-date later to maint). + + * The command line completion script (in contrib/) tried to complete + "git stash -p" as if it were "git stash push -p", but it was too + aggressive and also affected "git stash show -p", which has been + corrected. + (merge fffd0cf520 vs/complete-stash-show-p-fix later to maint). + + * On-the-wire protocol v2 easily falls into a deadlock between the + remote-curl helper and the fetch-pack process when the server side + prematurely throws an error and disconnects. The communication has + been updated to make it more robust. + + * "git checkout -p" did not handle a newly added path at all. + (merge 2c8bd8471a js/checkout-p-new-file later to maint). + + * The code to parse "git bisect start" command line was lax in + validating the arguments. + (merge 4d9005ff5d cb/bisect-helper-parser-fix later to maint). + + * Reduce memory usage during "diff --quiet" in a worktree with too + many stat-unmatched paths. + (merge d2d7fbe129 jk/diff-memuse-optim-with-stat-unmatch later to maint). + + * The reflog entries for "git clone" and "git fetch" did not + anonymize the URL they operated on. + (merge 46da295a77 js/reflog-anonymize-for-clone-and-fetch later to maint). + + * The behaviour of "sparse-checkout" in the state "git clone + --no-checkout" left was changed accidentally in 2.27, which has + been corrected. + + * Use of negative pathspec, while collecting paths including + untracked ones in the working tree, was broken. + + * The same worktree directory must be registered only once, but + "git worktree move" allowed this invariant to be violated, which + has been corrected. + (merge 810382ed37 es/worktree-duplicate-paths later to maint). + + * The effect of sparse checkout settings on submodules is documented. + (merge e7d7c73249 en/sparse-with-submodule-doc later to maint). + + * Code clean-up around "git branch" with a minor bugfix. + (merge dc44639904 dl/branch-cleanup later to maint). + + * A branch name used in a test has been clarified to match what is + going on. + (merge 08dc26061f pb/t4014-unslave later to maint). + + * An in-code comment in "git diff" has been updated. + (merge c592fd4c83 dl/diff-usage-comment-update later to maint). + + * The documentation and some tests have been adjusted for the recent + renaming of "pu" branch to "seen". + (merge 6dca5dbf93 js/pu-to-seen later to maint). + + * The code to push changes over "dumb" HTTP had a bad interaction + with the commit reachability code due to incorrect allocation of + object flag bits, which has been corrected. + (merge 64472d15e9 bc/http-push-flagsfix later to maint). + + * "git send-email --in-reply-to=<msg>" did not use the In-Reply-To: + header with the value given from the command line, and let it be + overridden by the value on In-Reply-To: header in the messages + being sent out (if exists). + (merge f9f60d7066 ra/send-email-in-reply-to-from-command-line-wins later to maint). + + * "git log -Lx,y:path --before=date" lost track of where the range + should be because it didn't take the changes made by the youngest + commits that are omitted from the output into account. + + * When "fetch.writeCommitGraph" configuration is set in a shallow + repository and a fetch moves the shallow boundary, we wrote out + broken commit-graph files that do not match the reality, which has + been corrected. + + * "git checkout" failed to catch an error from fstat() after updating + a path in the working tree. + (merge 35e6e212fd mt/entry-fstat-fallback-fix later to maint). + + * When an aliased command, whose output is piped to a pager by git, + gets killed by a signal, the pager got into a funny state, which + has been corrected (again). + (merge c0d73a59c9 ta/wait-on-aliased-commands-upon-signal later to maint). + + * The code to produce progress output from "git commit-graph --write" + had a few breakages, which have been fixed. + + * Other code cleanup, docfix, build fix, etc. + (merge 2c31a7aa44 jx/pkt-line-doc-count-fix later to maint). + (merge d63ae31962 cb/t5608-cleanup later to maint). + (merge 788db145c7 dl/t-readme-spell-git-correctly later to maint). + (merge 45a87a83bb dl/python-2.7-is-the-floor-version later to maint). + (merge b75a219904 es/advertise-contribution-doc later to maint). + (merge 0c9a4f638a rs/pull-leakfix later to maint). + (merge d546fe2874 rs/commit-reach-leakfix later to maint). + (merge 087bf5409c mk/pb-pretty-email-without-domain-part-fix later to maint). + (merge 5f4ee57ad9 es/worktree-code-cleanup later to maint). + (merge 0172f7834a cc/cat-file-usage-update later to maint). + (merge 81de0c01cf ma/rebase-doc-typofix later to maint). diff --git a/third_party/git/Documentation/RelNotes/2.29.0.txt b/third_party/git/Documentation/RelNotes/2.29.0.txt new file mode 100644 index 0000000000..06ba2f803f --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.29.0.txt @@ -0,0 +1,514 @@ +Git 2.29 Release Notes +====================== + +Updates since v2.28 +------------------- + +UI, Workflows & Features + + * "git help log" has been enhanced by sharing more material from the + documentation for the underlying "git rev-list" command. + + * "git for-each-ref --format=<>" learned %(contents:size). + + * "git merge" learned to selectively omit " into <branch>" at the end + of the title of default merge message with merge.suppressDest + configuration. + + * The component to respond to "git fetch" request is made more + configurable to selectively allow or reject object filtering + specification used for partial cloning. + + * Stop when "sendmail.*" configuration variables are defined, which + could be a mistaken attempt to define "sendemail.*" variables. + + * The existing backends for "git mergetool" based on variants of vim + have been refactored and then support for "nvim" has been added. + + * "git bisect" learns the "--first-parent" option to find the first + breakage along the first-parent chain. + + * "git log --first-parent -p" showed patches only for single-parent + commits on the first-parent chain; the "--first-parent" option has + been made to imply "-m". Use "--no-diff-merges" to restore the + previous behaviour to omit patches for merge commits. + + * The commit labels used to explain each side of conflicted hunks + placed by the sequencer machinery have been made more readable by + humans. + + * The "--batch-size" option of "git multi-pack-index repack" command + is now used to specify that very small packfiles are collected into + one until the total size roughly exceeds it. + + * The recent addition of SHA-256 support is marked as experimental in + the documentation. + + * "git fetch" learned --no-write-fetch-head option to avoid writing + the FETCH_HEAD file. + + * Command line completion (in contrib/) usually omits redundant, + deprecated and/or dangerous options from its output; it learned to + optionally include all of them. + + * The output from the "diff" family of the commands had abbreviated + object names of blobs involved in the patch, but its length was not + affected by the --abbrev option. Now it is. + + * "git worktree" gained a "repair" subcommand to help users recover + after moving the worktrees or repository manually without telling + Git. Also, "git init --separate-git-dir" no longer corrupts + administrative data related to linked worktrees. + + * The "--format=" option to the "for-each-ref" command and friends + learned a few more tricks, e.g. the ":short" suffix that applies to + "objectname" now also can be used for "parent", "tree", etc. + + * "git worktree add" learns that the "-d" is a synonym to "--detach" + option to create a new worktree without being on a branch. + + * "format-patch --range-diff=<prev> <origin>..HEAD" has been taught + not to ignore <origin> when <prev> is a single version. + + * "add -p" now allows editing paths that were only added in intent. + + * The 'meld' backend of the "git mergetool" learned to give the + underlying 'meld' the '--auto-merge' option, which would help + reduce the amount of text that requires manual merging. + + * "git for-each-ref" and friends that list refs used to allow only + one --merged or --no-merged to filter them; they learned to take + combination of both kind of filtering. + + * "git maintenance", a "git gc"'s big brother, has been introduced to + take care of more repository maintenance tasks, not limited to the + object database cleaning. + + * "git receive-pack" that accepts requests by "git push" learned to + outsource most of the ref updates to the new "proc-receive" hook. + + * "git push" that wants to be atomic and wants to send push + certificate learned not to prepare and sign the push certificate + when it fails the local check (hence due to atomicity it is known + that no certificate is needed). + + * "git commit-graph write" learned to limit the number of bloom + filters that are computed from scratch with the --max-new-filters + option. + + * The transport protocol v2 has become the default again. + + * The installation procedure learned to optionally omit "git-foo" + executable files for each 'foo' built-in subcommand, which are only + required by old timers that still rely on the age old promise that + prepending "git --exec-path" output to PATH early in their script + will keep the "git-foo" calls they wrote working. + + * The command line completion (in contrib/) learned that "git restore + -s <TAB>" is often followed by a refname. + + * "git shortlog" has been taught to group commits by the contents of + the trailer lines, like "Reviewed-by:", "Coauthored-by:", etc. + + * "git archive" learns the "--add-file" option to include untracked + files into a snapshot from a tree-ish. + + * "git fetch" and "git push" support negative refspecs. + + * "git format-patch" learns to take "whenAble" as a possible value + for the format.useAutoBase configuration variable to become no-op + when the automatically computed base does not make sense. + + * Credential helpers are now allowed to terminate lines with CRLF + line ending, as well as LF line ending. + + +Performance, Internal Implementation, Development Support etc. + + * The changed-path Bloom filter is improved using ideas from an + independent implementation. + + * Updates to the changed-paths bloom filter. + + * The test framework has been updated so that most tests will run + with predictable (artificial) timestamps. + + * Preliminary clean-up of the refs API in preparation for adding a + new refs backend "reftable". + + * Dev support to limit the use of test_must_fail to only git commands. + + * While packing many objects in a repository with a promissor remote, + lazily fetching missing objects from the promissor remote one by + one may be inefficient---the code now attempts to fetch all the + missing objects in batch (obviously this won't work for a lazy + clone that lazily fetches tree objects as you cannot even enumerate + what blobs are missing until you learn which trees are missing). + + * The pretend-object mechanism checks if the given object already + exists in the object store before deciding to keep the data + in-core, but the check would have triggered lazy fetching of such + an object from a promissor remote. + + * The argv_array API is useful for not just managing argv but any + "vector" (NULL-terminated array) of strings, and has seen adoption + to a certain degree. It has been renamed to "strvec" to reduce the + barrier to adoption. + + * The final leg of SHA-256 transition plus doc updates. Note that + there is no interoperability between SHA-1 and SHA-256 + repositories yet. + + * CMake support to build with MSVC for Windows bypassing the Makefile. + + * A new helper function has_object() has been introduced to make it + easier to mark object existence checks that do and don't want to + trigger lazy fetches, and a few such checks are converted using it. + + * A no-op replacement function implemented as a C preprocessor macro + does not perform as good a job as one implemented as a "static + inline" function in catching errors in parameters; replace the + former with the latter in <git-compat-util.h> header. + + * Test framework update. + (merge d572f52a64 es/test-cmp-typocatcher later to maint). + + * Updates to "git merge" tests, in preparation for a new merge + strategy backend. + + * midx and commit-graph files now use the byte defined in their file + format specification for identifying the hash function used for + object names. + + * The FETCH_HEAD is now always read from the filesystem regardless of + the ref backend in use, as its format is much richer than the + normal refs, and written directly by "git fetch" as a plain file.. + + * An unused binary has been discarded, and and a bunch of commands + have been turned into into built-in. + + * A handful of places in in-tree code still relied on being able to + execute the git subcommands, especially built-ins, in "git-foo" + form, which have been corrected. + + * When a packfile is removed by "git repack", multi-pack-index gets + cleared; the code was taught to do so less aggressively by first + checking if the midx actually refers to a pack that no longer + exists. + + * Internal API clean-up to handle two options "diff-index" and "log" + have, which happen to share the same short form, more sensibly. + + * The "add -i/-p" machinery has been written in C but it is not used + by default yet. It is made default to those who are participating + in feature.experimental experiment. + + * Allow maintainers to tweak $(TAR) invocations done while making + distribution tarballs. + + * "git index-pack" learned to resolve deltified objects with greater + parallelism. + + * "diff-highlight" (in contrib/) had a logic to flush its output upon + seeing a blank line but the way it detected a blank line was broken. + + * The logic to skip testing on the tagged commit and the tag itself + was not quite consistent which led to failure of Windows test + tasks. It has been revamped to consistently skip revisions that + have already been tested, based on the tree object of the revision. + + +Fixes since v2.28 +----------------- + + * The "mediawiki" remote backend which lives in contrib/mw-to-git/ + and is not built with git by default, had an RCE bug allowing a + malicious MediaWiki server operator to inject arbitrary commands + for execution by a cloning client. This has been fixed. + + The bug was discovered and reported by Joern Schneeweisz of GitLab + to the git-security mailing list. Its practical impact due to the + obscurity of git-remote-mediawiki was deemed small enough to forgo + a dedicated security release. + + * "git clone --separate-git-dir=$elsewhere" used to stomp on the + contents of the existing directory $elsewhere, which has been + taught to fail when $elsewhere is not an empty directory. + (merge dfaa209a79 bw/fail-cloning-into-non-empty later to maint). + + * With the base fix to 2.27 regresion, any new extensions in a v0 + repository would still be silently honored, which is not quite + right. Instead, complain and die loudly. + (merge ec91ffca04 jk/reject-newer-extensions-in-v0 later to maint). + + * Fetching from a lazily cloned repository resulted at the server + side in attempts to lazy fetch objects that the client side has, + many of which will not be available from the third-party anyway. + (merge 77aa0941ce jt/avoid-lazy-fetching-upon-have-check later to maint). + + * Fix to an ancient bug caused by an over-eager attempt for + optimization. + (merge a98f7fb366 rs/add-index-entry-optim-fix later to maint). + + * Pushing a ref whose name contains non-ASCII character with the + "--force-with-lease" option did not work over smart HTTP protocol, + which has been corrected. + (merge cd85b447bf bc/push-cas-cquoted-refname later to maint). + + * "git mv src dst", when src is an unmerged path, errored out + correctly but with an incorrect error message to claim that src is + not tracked, which has been clarified. + (merge 9b906af657 ct/mv-unmerged-path-error later to maint). + + * Fix to a regression introduced during 2.27 cycle. + (merge cada7308ad en/fill-directory-exponential later to maint). + + * Command line completion (in contrib/) update. + (merge 688b87c81b mp/complete-show-color-moved later to maint). + + * All "mergy" operations that internally use the merge-recursive + machinery should honor the merge.renormalize configuration, but + many of them didn't. + + * Doc cleanup around "worktree". + (merge dc9c144be5 es/worktree-doc-cleanups later to maint). + + * The "git blame --first-parent" option was not documented, but now + it is. + (merge 11bc12ae1e rp/blame-first-parent-doc later to maint). + + * The logic to find the ref transaction hook script attempted to + cache the path to the found hook without realizing that it needed + to keep a copied value, as the API it used returned a transitory + buffer space. This has been corrected. + (merge 09b2aa30c9 ps/ref-transaction-hook later to maint). + + * Recent versions of "git diff-files" shows a diff between the index + and the working tree for "intent-to-add" paths as a "new file" + patch; "git apply --cached" should be able to take "git diff-files" + and should act as an equivalent to "git add" for the path, but the + command failed to do so for such a path. + (merge 4c025c667e rp/apply-cached-with-i-t-a later to maint). + + * "git diff [<tree-ish>] $path" for a $path that is marked with i-t-a + bit was not showing the mode bits from the working tree. + (merge cb0dd22b82 rp/ita-diff-modefix later to maint). + + * Ring buffer with size 4 used for bin-hex translation resulted in a + wrong object name in the sequencer's todo output, which has been + corrected. + (merge 5da69c0dac ak/sequencer-fix-find-uniq-abbrev later to maint). + + * When given more than one target line ranges, "git blame -La,b + -Lc,d" was over-eager to coalesce groups of original lines and + showed incorrect results, which has been corrected. + (merge c2ebaa27d6 jk/blame-coalesce-fix later to maint). + + * The regexp to identify the function boundary for FORTRAN programs + has been updated. + (merge 75c3b6b2e8 pb/userdiff-fortran-update later to maint). + + * A few end-user facing messages have been updated to be + hash-algorithm agnostic. + (merge 4279000d3e jc/object-names-are-not-sha-1 later to maint). + + * "unlink" emulation on MinGW has been optimized. + (merge 680e0b4524 jh/mingw-unlink later to maint). + + * The purpose of "git init --separate-git-dir" is to initialize a + new project with the repository separate from the working tree, + or, in the case of an existing project, to move the repository + (the .git/ directory) out of the working tree. It does not make + sense to use --separate-git-dir with a bare repository for which + there is no working tree, so disallow its use with bare + repositories. + (merge ccf236a23a es/init-no-separate-git-dir-in-bare later to maint). + + * "ls-files -o" mishandled the top-level directory of another git + working tree that hangs in the current git working tree. + (merge ab282aa548 en/dir-nonbare-embedded later to maint). + + * Fix some incorrect UNLEAK() annotations. + (merge 3e19816dc0 jk/unleak-fixes later to maint). + + * Use more buffered I/O where we used to call many small write(2)s. + (merge a698d67b08 rs/more-buffered-io later to maint). + + * The patch-id computation did not ignore the "incomplete last line" + marker like whitespaces. + (merge 82a62015a7 rs/patch-id-with-incomplete-line later to maint). + + * Updates into a lazy/partial clone with a submodule did not work + well with transfer.fsckobjects set. + + * The parser for "git for-each-ref --format=..." was too loose when + parsing the "%(trailers...)" atom, and forgot that "trailers" and + "trailers:<modifiers>" are the only two allowed forms, which has + been corrected. + (merge 2c22e102f8 hv/ref-filter-trailers-atom-parsing-fix later to maint). + + * Long ago, we decided to use 3 threads by default when running the + index-pack task in parallel, which has been adjusted a bit upwards. + (merge fbff95b67f jk/index-pack-w-more-threads later to maint). + + * "git restore/checkout --no-overlay" with wildcarded pathspec + mistakenly removed matching paths in subdirectories, which has been + corrected. + (merge bfda204ade rs/checkout-no-overlay-pathspec-fix later to maint). + + * The description of --cached/--index options in "git apply --help" + has been updated. + (merge d064702be3 rp/apply-cached-doc later to maint). + + * Feeding "$ZERO_OID" to "git log --ignore-missing --stdin", and + running "git log --ignore-missing $ZERO_OID" fell back to start + digging from HEAD; it has been corrected to become a no-op, like + "git log --tags=no-tag-matches-this-pattern" does. + (merge 04a0e98515 jk/rev-input-given-fix later to maint). + + * Various callers of run_command API have been modernized. + (merge afbdba391e jc/run-command-use-embedded-args later to maint). + + * List of options offered and accepted by "git add -i/-p" were + inconsistent, which have been corrected. + (merge ce910287e7 pw/add-p-allowed-options-fix later to maint). + + * "git diff --stat -w" showed 0-line changes for paths whose changes + were only whitespaces, which was not intuitive. We now omit such + paths from the stat output. + (merge 1cf3d5db9b mr/diff-hide-stat-wo-textual-change later to maint). + + * It was possible for xrealloc() to send a non-NULL pointer that has + been freed, which has been fixed. + (merge 6479ea4a8a jk/xrealloc-avoid-use-after-free later to maint). + + * "git status" has trouble showing where it came from by interpreting + reflog entries that record certain events, e.g. "checkout @{u}", and + gives a hard/fatal error. Even though it inherently is impossible + to give a correct answer because the reflog entries lose some + information (e.g. "@{u}" does not record what branch the user was + on hence which branch 'the upstream' needs to be computed, and even + if the record were available, the relationship between branches may + have changed), at least hide the error and allow "status" to show its + output. + + * "git status --short" quoted a path with SP in it when tracked, but + not those that are untracked, ignored or unmerged. They are all + shown quoted consistently. + + * "git diff/show" on a change that involves a submodule used to read + the information on commits in the submodule from a wrong repository + and gave a wrong information when the commit-graph is involved. + (merge 85a1ec2c32 mf/submodule-summary-with-correct-repository later to maint). + + * Unlike "git config --local", "git config --worktree" did not fail + early and cleanly when started outside a git repository. + (merge 378fe5fc3d mt/config-fail-nongit-early later to maint). + + * There is a logic to estimate how many objects are in the + repository, which is meant to run once per process invocation, but + it ran every time the estimated value was requested. + (merge 67bb65de5d jk/dont-count-existing-objects-twice later to maint). + + * "git remote set-head" that failed still said something that hints + the operation went through, which was misleading. + (merge 5a07c6c3c2 cs/don-t-pretend-a-failed-remote-set-head-succeeded later to maint). + + * "git fetch --all --ipv4/--ipv6" forgot to pass the protocol options + to instances of the "git fetch" that talk to individual remotes, + which has been corrected. + (merge 4e735c1326 ar/fetch-ipversion-in-all later to maint). + + * The "unshelve" subcommand of "git p4" incorrectly used commit^N + where it meant to say commit~N to name the Nth generation + ancestor, which has been corrected. + (merge 0acbf5997f ld/p4-unshelve-fix later to maint). + + * "git clone" that clones from SHA-1 repository, while + GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an + unusable repository that half-claims to be SHA-256 repository + with SHA-1 objects and refs. This has been corrected. + + * Adjust sample hooks for hash algorithm other than SHA-1. + (merge d8d3d632f4 dl/zero-oid-in-hooks later to maint). + + * "git range-diff" showed incorrect diffstat, which has been + corrected. + + * Earlier we taught "git pull" to warn when the user does not say the + histories need to be merged, rebased or accepts only fast- + forwarding, but the warning triggered for those who have set the + pull.ff configuration variable. + (merge 54200cef86 ah/pull later to maint). + + * Compilation fix around type punning. + (merge 176380fd11 jk/drop-unaligned-loads later to maint). + + * "git blame --ignore-rev/--ignore-revs-file" failed to validate + their input are valid revision, and failed to take into account + that the user may want to give an annotated tag instead of a + commit, which has been corrected. + (merge 610e2b9240 jc/blame-ignore-fix later to maint). + + * "git bisect start X Y", when X and Y are not valid committish + object names, should take X and Y as pathspec, but didn't. + (merge 73c6de06af cc/bisect-start-fix later to maint). + + * The explanation of the "scissors line" has been clarified. + (merge 287416dba6 eg/mailinfo-doc-scissors later to maint). + + * A race that leads to an access to a free'd data was corrected in + the codepath that reads pack files. + (merge bda959c476 mt/delta-base-cache-races later to maint). + + * in_merge_bases_many(), a way to see if a commit is reachable from + any commit in a set of commits, was totally broken when the + commit-graph feature was in use, which has been corrected. + (merge 8791bf1841 ds/in-merge-bases-many-optim-bug later to maint). + + * "git submodule update --quiet" did not squelch underlying "rebase" + and "pull" commands. + (merge 3ad0401e9e td/submodule-update-quiet later to maint). + + * The lazy fetching done internally to make missing objects available + in a partial clone incorrectly made permanent damage to the partial + clone filter in the repository, which has been corrected. + + * "log -c --find-object=X" did not work well to find a merge that + involves a change to an object X from only one parent. + (merge 957876f17d jk/diff-cc-oidfind-fix later to maint). + + * Other code cleanup, docfix, build fix, etc. + (merge 84544f2ea3 sk/typofixes later to maint). + (merge b17f411ab5 ar/help-guides-doc later to maint). + (merge 98c6871fad rs/grep-simpler-parse-object-or-die-call later to maint). + (merge 861c4ce141 en/typofixes later to maint). + (merge 60e47f6773 sg/ci-git-path-fix-with-pyenv later to maint). + (merge e2bfa50ac3 jb/doc-packfile-name later to maint). + (merge 918d8ff780 es/worktree-cleanup later to maint). + (merge dc156bc31f ma/t1450-quotefix later to maint). + (merge 56e743426b en/merge-recursive-comment-fixes later to maint). + (merge 7d23ff818f rs/bisect-oid-to-hex-fix later to maint). + (merge de20baf2c9 ny/notes-doc-sample-update later to maint). + (merge f649aaaf82 so/rev-parser-errormessage-fix later to maint). + (merge 6103d58b7f bc/sha-256-cvs-svn-updates later to maint). + (merge ac900fddb7 ma/stop-progress-null-fix later to maint). + (merge e767963ab6 rs/upload-pack-sigchain-fix later to maint). + (merge a831908599 rs/preserve-merges-unused-code-removal later to maint). + (merge 6dfefe70a9 jb/commit-graph-doc-fix later to maint). + (merge 847b37271e pb/set-url-docfix later to maint). + (merge 748f733d54 mt/checkout-entry-dead-code-removal later to maint). + (merge ce820cbd58 dl/subtree-docs later to maint). + (merge 55fe225dde jk/leakfix later to maint). + (merge ee22a29215 so/pretty-abbrev-doc later to maint). + (merge 3100fd5588 jc/post-checkout-doc later to maint). + (merge 17bae89476 pb/doc-external-diff-env later to maint). + (merge 27ed6ccc12 jk/worktree-check-clean-leakfix later to maint). + (merge 1302badd16 ea/blame-use-oideq later to maint). + (merge e6d5a11fed al/t3200-back-on-a-branch later to maint). + (merge 324efcf6b6 pw/add-p-leakfix later to maint). + (merge 1c6ffb546b jk/add-i-fixes later to maint). + (merge e40e936551 cd/commit-graph-doc later to maint). + (merge 0512eabd91 jc/sequencer-stopped-sha-simplify later to maint). + (merge d01141de5a so/combine-diff-simplify later to maint). + (merge 3be01e5ab1 sn/fast-import-doc later to maint). diff --git a/third_party/git/Documentation/RelNotes/2.29.1.txt b/third_party/git/Documentation/RelNotes/2.29.1.txt new file mode 100644 index 0000000000..295ee2135f --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.29.1.txt @@ -0,0 +1,11 @@ +Git v2.29.1 Release Notes +========================= + +This is to fix the build procedure change in 2.28 where we failed to +install a few programs that should be installed in /usr/bin (namely, +receive-pack, upload-archive and upload-pack) when the non-default +SKIP_DASHED_BUILT_INS installation option is in effect. + +A minor glitch in a non-default installation may usually not deserve +a hotfix, but I know Git for Windows ship binaries built with this +option, so let's make an exception. diff --git a/third_party/git/Documentation/RelNotes/2.29.2.txt b/third_party/git/Documentation/RelNotes/2.29.2.txt new file mode 100644 index 0000000000..632b5b580a --- /dev/null +++ b/third_party/git/Documentation/RelNotes/2.29.2.txt @@ -0,0 +1,12 @@ +Git v2.29.2 Release Notes +========================= + +This release is primarily to fix brown-paper-bag breakages in the +2.29.0 release. + +Fixes since v2.29.1 +------------------- + + * In 2.29, "--committer-date-is-author-date" option of "rebase" and + "am" subcommands lost the e-mail address by mistake, which has been + corrected. diff --git a/third_party/git/Documentation/RelNotes/2.3.3.txt b/third_party/git/Documentation/RelNotes/2.3.3.txt index 5ef12644c2..850dc68ede 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. - * Documentaton for "git remote add" mentioned "--tags" and + * Documentation 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 fc95812cb3..5769184081 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 disects a URL broke an + * An earlier update to the parser that dissects 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 914d2c1860..422e930aa2 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 portabile across + with LF line ending to make their project portable 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 87044504c5..84723f912a 100644 --- a/third_party/git/Documentation/RelNotes/2.5.0.txt +++ b/third_party/git/Documentation/RelNotes/2.5.0.txt @@ -172,7 +172,8 @@ 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 $gmane/87202 coming back + I have a slight suspicion that this may be + cf. <7vtzf77wjp.fsf@gitster.siamese.dyndns.org> 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 563dadc57e..e3cbf3a73c 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 reencode the pathname it uses to communicate + * "git p4" learned to re-encode 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 6553d69e33..6323feaf64 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_exclude_list() forgot + fields to be used by ALLOC_GROW(), but clear_pattern_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 6adf038915..f618d71efd 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 the pathname with wildcard + rev, i.e. the object named by 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 25079710fa..27320b6a9f 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 protrams that are already safe + calls to strcpy(3) in a couple of programs 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_exclude_list() forgot + fields to be used by ALLOC_GROW(), but clear_pattern_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 fedd9968e5..a63825ed87 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 http://thread.gmane.org/gmane.comp.version-control.git/291853 - and http://thread.gmane.org/gmane.comp.version-control.git/275680. + See https://lore.kernel.org/git/20160419091055.GF2345@dinwoodie.org/ + and https://lore.kernel.org/git/20150811100527.GW14466@dinwoodie.org/. * "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 b61d36712f..991640119a 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 http://thread.gmane.org/gmane.comp.version-control.git/291853 + See https://lore.kernel.org/git/20160419091055.GF2345@dinwoodie.org/ * "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 695b86f612..305e08062b 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 usuall called "theirs" in + the system where outside stuff is usually 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 6d589e118c..291b61e262 100644 --- a/third_party/git/Documentation/SubmittingPatches +++ b/third_party/git/Documentation/SubmittingPatches @@ -3,8 +3,9 @@ Submitting Patches == Guidelines -Here are some guidelines for people who want to contribute their code -to this software. +Here are some guidelines for people who want to contribute their code to this +software. There is also a link:MyFirstContribution.html[step-by-step tutorial] +available which covers many of these same guidelines. [[base-branch]] === Decide what to base your work on. @@ -18,7 +19,7 @@ change is relevant to. base your work on the tip of the topic. * A new feature should be based on `master` in general. If the new - feature depends on a topic that is in `pu`, but not in `master`, + feature depends on a topic that is in `seen`, but not in `master`, base your work on the tip of that topic. * Corrections and enhancements to a topic not yet in `master` should @@ -27,7 +28,7 @@ change is relevant to. into the series. * In the exceptional case that a new feature depends on several topics - not in `master`, start working on `next` or `pu` privately and send + not in `master`, start working on `next` or `seen` privately and send out patches for discussion. Before the final merge, you may have to wait until some of the dependent topics graduate to `master`, and rebase your work. @@ -37,7 +38,7 @@ change is relevant to. these parts should be based on their trees. To find the tip of a topic branch, run `git log --first-parent -master..pu` and look for the merge commit. The second parent of this +master..seen` and look for the merge commit. The second parent of this commit is the tip of the topic branch. [[separate-commits]] @@ -142,19 +143,25 @@ 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 sha1 (subject, date)", -with the subject enclosed in a pair of double-quotes, like this: +branch, use the format "abbreviated hash (subject, date)", 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, or this invocation of `git show`: +format (with the subject enclosed in a pair of double-quotes), or this +invocation of `git show`: .... - git show -s --date=short --pretty='format:%h ("%s", %ad)' <commit> + 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-tools]] @@ -372,9 +379,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 Pat Thoyts: +- `git-gui/` comes from git-gui project, maintained by Pratyush Yadav: - git://repo.or.cz/git-gui.git + https://github.com/prati0100/git-gui.git - `gitk-git/` comes from Paul Mackerras's gitk project: @@ -417,7 +424,7 @@ help you find out who they are. and cooked further and eventually graduates to `master`. In any time between the (2)-(3) cycle, the maintainer may pick it up -from the list and queue it to `pu`, in order to make it easier for +from the list and queue it to `seen`, in order to make it easier for people play with it without having to pick up and apply the patch to their trees themselves. @@ -428,7 +435,7 @@ their trees themselves. master. `git pull --rebase` will automatically skip already-applied patches, and will let you know. This works only if you rebase on top of the branch in which your patch has been merged (i.e. it will not - tell you if your patch is merged in pu if you rebase on top of + tell you if your patch is merged in `seen` if you rebase on top of master). * Read the Git mailing list, the maintainer regularly posts messages diff --git a/third_party/git/Documentation/asciidoc.conf b/third_party/git/Documentation/asciidoc.conf index 2c16c536ba..3e4c13971b 100644 --- a/third_party/git/Documentation/asciidoc.conf +++ b/third_party/git/Documentation/asciidoc.conf @@ -31,24 +31,6 @@ ifdef::backend-docbook[] endif::backend-docbook[] ifdef::backend-docbook[] -ifndef::git-asciidoc-no-roff[] -# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this. -# v1.72 breaks with this because it replaces dots not in roff requests. -[listingblock] -<example><title>{title}</title> -<literallayout class="monospaced"> -ifdef::doctype-manpage[] - .ft C -endif::doctype-manpage[] -| -ifdef::doctype-manpage[] - .ft -endif::doctype-manpage[] -</literallayout> -{title#}</example> -endif::git-asciidoc-no-roff[] - -ifdef::git-asciidoc-no-roff[] ifdef::doctype-manpage[] # The following two small workarounds insert a simple paragraph after screen [listingblock] @@ -67,7 +49,6 @@ ifdef::doctype-manpage[] {title#}</para></formalpara> {title%}<simpara></simpara> endif::doctype-manpage[] -endif::git-asciidoc-no-roff[] endif::backend-docbook[] ifdef::doctype-manpage[] @@ -78,9 +59,9 @@ template::[header-declarations] <refmeta> <refentrytitle>{mantitle}</refentrytitle> <manvolnum>{manvolnum}</manvolnum> -<refmiscinfo class="source">Git</refmiscinfo> -<refmiscinfo class="version">{git_version}</refmiscinfo> -<refmiscinfo class="manual">Git Manual</refmiscinfo> +<refmiscinfo class="source">{mansource}</refmiscinfo> +<refmiscinfo class="version">{manversion}</refmiscinfo> +<refmiscinfo class="manual">{manmanual}</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 0089e0cfb8..d906a00803 100644 --- a/third_party/git/Documentation/asciidoctor-extensions.rb +++ b/third_party/git/Documentation/asciidoctor-extensions.rb @@ -9,8 +9,11 @@ module Git named :chrome def process(parent, target, attrs) - if parent.document.basebackend? 'html' - prefix = parent.document.attr('git-relative-html-prefix') + 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' %(<a href="#{prefix}#{target}.html">#{target}(#{attrs[1]})</a>) elsif parent.document.basebackend? 'docbook' "<citerefentry>\n" \ @@ -20,9 +23,26 @@ 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/blame-options.txt b/third_party/git/Documentation/blame-options.txt index 5d122db6e9..88750af7ae 100644 --- a/third_party/git/Documentation/blame-options.txt +++ b/third_party/git/Documentation/blame-options.txt @@ -36,6 +36,12 @@ include::line-range-format.txt[] START. `git blame --reverse START` is taken as `git blame --reverse START..HEAD` for convenience. +--first-parent:: + Follow only the first parent commit upon seeing a merge + commit. This option can be used to determine when a line + was introduced to a particular integration branch, rather + than when it was introduced to the history overall. + -p:: --porcelain:: Show in a format designed for machine consumption. diff --git a/third_party/git/Documentation/cmd-list.perl b/third_party/git/Documentation/cmd-list.perl index 5aa73cfe45..af5da45d28 100755 --- a/third_party/git/Documentation/cmd-list.perl +++ b/third_party/git/Documentation/cmd-list.perl @@ -6,9 +6,14 @@ sub format_one { my ($out, $nameattr) = @_; my ($name, $attr) = @$nameattr; my ($state, $description); + my $mansection; $state = 0; open I, '<', "$name.txt" or die "No such file $name.txt"; while (<I>) { + if (/^git[a-z0-9-]*\(([0-9])\)$/) { + $mansection = $1; + next; + } if (/^NAME$/) { $state = 1; next; @@ -27,7 +32,7 @@ sub format_one { die "No description found in $name.txt"; } if (my ($verify_name, $text) = ($description =~ /^($name) - (.*)/)) { - print $out "linkgit:$name\[1\]::\n\t"; + print $out "linkgit:$name\[$mansection\]::\n\t"; if ($attr =~ / deprecated /) { print $out "(deprecated) "; } @@ -38,12 +43,15 @@ sub format_one { } } -while (<>) { +my ($input, @categories) = @ARGV; + +open IN, "<$input"; +while (<IN>) { last if /^### command list/; } my %cmds = (); -for (sort <>) { +for (sort <IN>) { next if /^#/; chomp; @@ -51,17 +59,10 @@ for (sort <>) { $attr = '' unless defined $attr; push @{$cmds{$cat}}, [$name, " $attr "]; } +close IN; -for my $cat (qw(ancillaryinterrogators - ancillarymanipulators - mainporcelain - plumbinginterrogators - plumbingmanipulators - synchingrepositories - foreignscminterface - purehelpers - synchelpers)) { - my $out = "cmds-$cat.txt"; +for my $out (@categories) { + my ($cat) = $out =~ /^cmds-(.*)\.txt$/; open O, '>', "$out+" or die "Cannot open output file $out+"; for (@{$cmds{$cat}}) { format_one(\*O, $_); diff --git a/third_party/git/Documentation/config.txt b/third_party/git/Documentation/config.txt index e3f5bc3396..bf706b950e 100644 --- a/third_party/git/Documentation/config.txt +++ b/third_party/git/Documentation/config.txt @@ -3,11 +3,12 @@ CONFIGURATION FILE The Git configuration file contains a number of variables that affect the Git commands' behavior. The files `.git/config` and optionally -`config.worktree` (see `extensions.worktreeConfig` below) in each -repository are used to store the configuration for that repository, and -`$HOME/.gitconfig` is used to store a per-user configuration as -fallback values for the `.git/config` file. The file `/etc/gitconfig` -can be used to store a system-wide default configuration. +`config.worktree` (see the "CONFIGURATION FILE" section of +linkgit:git-worktree[1]) in each repository are used to store the +configuration for that repository, and `$HOME/.gitconfig` is used to +store a per-user configuration as fallback values for the `.git/config` +file. The file `/etc/gitconfig` can be used to store a system-wide +default configuration. The configuration variables are used by both the Git plumbing and the porcelains. The variables are divided into sections, wherein @@ -142,7 +143,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 sytems) + case-insensitively (e.g. on case-insensitive file systems) `onbranch`:: The data that follows the keyword `onbranch:` is taken to be a @@ -178,52 +179,54 @@ 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 - - ; include only if we are in a worktree where foo-branch is - ; currently checked out - [includeIf "onbranch:foo-branch"] - 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 +[includeIf "onbranch:foo-branch"] + path = foo.inc +---- Values ~~~~~~ @@ -261,7 +264,9 @@ 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. +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`. + 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 @@ -335,6 +340,8 @@ include::config/column.txt[] include::config/commit.txt[] +include::config/commitgraph.txt[] + include::config/credential.txt[] include::config/completion.txt[] @@ -343,8 +350,12 @@ include::config/diff.txt[] include::config/difftool.txt[] +include::config/extensions.txt[] + include::config/fastimport.txt[] +include::config/feature.txt[] + include::config/fetch.txt[] include::config/format.txt[] @@ -389,6 +400,8 @@ include::config/mailinfo.txt[] include::config/mailmap.txt[] +include::config/maintenance.txt[] + include::config/man.txt[] include::config/merge.txt[] @@ -441,6 +454,8 @@ include::config/submodule.txt[] include::config/tag.txt[] +include::config/tar.txt[] + include::config/trace2.txt[] include::config/transfer.txt[] diff --git a/third_party/git/Documentation/config/add.txt b/third_party/git/Documentation/config/add.txt index 4d753f006e..c9f748f81c 100644 --- a/third_party/git/Documentation/config/add.txt +++ b/third_party/git/Documentation/config/add.txt @@ -5,3 +5,8 @@ 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 6aaa360202..bdd37c3eaa 100644 --- a/third_party/git/Documentation/config/advice.txt +++ b/third_party/git/Documentation/config/advice.txt @@ -107,4 +107,13 @@ 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 a592d522a7..cc5f3249fc 100644 --- a/third_party/git/Documentation/config/branch.txt +++ b/third_party/git/Documentation/config/branch.txt @@ -81,15 +81,16 @@ branch.<name>.rebase:: "git pull" is run. See "pull.rebase" for doing this in a non branch-specific manner. + -When `merges`, pass the `--rebase-merges` option to 'git rebase' +When `merges` (or just 'm'), 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` (deprecated in favor of `merges`), also pass +When `preserve` (or just 'p', 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`, the rebase is run in interactive mode. +When the value is `interactive` (or just 'i'), 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/commitgraph.txt b/third_party/git/Documentation/config/commitgraph.txt new file mode 100644 index 0000000000..4582c39fc4 --- /dev/null +++ b/third_party/git/Documentation/config/commitgraph.txt @@ -0,0 +1,8 @@ +commitGraph.maxNewFilters:: + Specifies the default value for the `--max-new-filters` option of `git + commit-graph write` (c.f., linkgit:git-commit-graph[1]). + +commitGraph.readChangedPaths:: + If true, then git will use the changed-path Bloom filters in the + commit-graph file (if it exists, and they are present). Defaults to + true. See linkgit:git-commit-graph[1] for more information. diff --git a/third_party/git/Documentation/config/core.txt b/third_party/git/Documentation/config/core.txt index 75538d27e7..02002cf109 100644 --- a/third_party/git/Documentation/config/core.txt +++ b/third_party/git/Documentation/config/core.txt @@ -68,6 +68,17 @@ 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 @@ -86,7 +97,9 @@ 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. + See linkgit:git-update-index[1]. `keep` by default, unless + `feature.manyFiles` is enabled which sets this setting to + `true` by default. core.checkStat:: When missing or is set to `default`, many fields in the stat @@ -386,7 +399,7 @@ the largest projects. You probably do not need to adjust this value. Common unit suffixes of 'k', 'm', or 'g' are supported. core.deltaBaseCacheLimit:: - Maximum number of bytes to reserve for caching base objects + Maximum number of bytes per thread to reserve for caching base objects that may be referenced by multiple deltified objects. By storing the entire decompressed base objects in a cache Git is able to avoid unpacking and decompressing frequently used base @@ -557,6 +570,12 @@ 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 @@ -577,7 +596,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 false. See + to parse the graph structure of commits. Defaults to true. See linkgit:git-commit-graph[1] for more information. core.useReplaceRefs:: @@ -591,8 +610,14 @@ core.multiPackIndex:: multi-pack-index design document]. core.sparseCheckout:: - Enable "sparse checkout" feature. See section "Sparse checkout" in - linkgit:git-read-tree[1] for more information. + 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. core.abbrev:: Set the length object names are abbreviated to. If diff --git a/third_party/git/Documentation/config/credential.txt b/third_party/git/Documentation/config/credential.txt index 60fb3189e1..9d01641c28 100644 --- a/third_party/git/Documentation/config/credential.txt +++ b/third_party/git/Documentation/config/credential.txt @@ -1,9 +1,13 @@ credential.helper:: Specify an external helper to be called when a username or password credential is needed; the helper may consult external - storage to avoid prompting the user for the credentials. Note - that multiple helpers may be defined. See linkgit:gitcredentials[7] - for details. + storage to avoid prompting the user for the credentials. This is + normally the name of a credential helper with possible + arguments, but may also be an absolute path with arguments or, if + preceded by `!`, shell commands. ++ +Note that multiple helpers may be defined. See linkgit:gitcredentials[7] +for details and examples. credential.useHttpPath:: When acquiring credentials, consider the "path" component of an http diff --git a/third_party/git/Documentation/config/diff.txt b/third_party/git/Documentation/config/diff.txt index 5afb5a2cbc..c3ae136eba 100644 --- a/third_party/git/Documentation/config/diff.txt +++ b/third_party/git/Documentation/config/diff.txt @@ -105,6 +105,10 @@ diff.mnemonicPrefix:: diff.noprefix:: If set, 'git diff' does not show any source or destination prefix. +diff.relative:: + If set to 'true', 'git diff' does not show changes outside of the directory + and show pathnames relative to the current directory. + diff.orderFile:: File indicating how to order files within a diff. See the '-O' option to linkgit:git-diff[1] for details. @@ -189,7 +193,7 @@ diff.guitool:: include::../mergetools-diff.txt[] diff.indentHeuristic:: - Set this option to `true` to enable experimental heuristics + Set this option to `false` to disable the default heuristics that shift diff hunk boundaries to make patches easier to read. diff.algorithm:: diff --git a/third_party/git/Documentation/config/extensions.txt b/third_party/git/Documentation/config/extensions.txt new file mode 100644 index 0000000000..4e23d73cdc --- /dev/null +++ b/third_party/git/Documentation/config/extensions.txt @@ -0,0 +1,8 @@ +extensions.objectFormat:: + Specify the hash algorithm to use. The acceptable values are `sha1` and + `sha256`. If not specified, `sha1` is assumed. It is an error to specify + this key unless `core.repositoryFormatVersion` is 1. ++ +Note that this setting should only be set by linkgit:git-init[1] or +linkgit:git-clone[1]. Trying to change it after initialization will not +work and will produce hard-to-diagnose issues. diff --git a/third_party/git/Documentation/config/feature.txt b/third_party/git/Documentation/config/feature.txt new file mode 100644 index 0000000000..cdecd04e5b --- /dev/null +++ b/third_party/git/Documentation/config/feature.txt @@ -0,0 +1,26 @@ +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: ++ +* `fetch.negotiationAlgorithm=skipping` may improve fetch negotiation times by +skipping more commits at a time, reducing the number of round trips. + +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 ba890b5884..6af6f5edb2 100644 --- a/third_party/git/Documentation/config/fetch.txt +++ b/third_party/git/Documentation/config/fetch.txt @@ -1,11 +1,14 @@ fetch.recurseSubmodules:: - This option can be either set to a boolean value or to 'on-demand'. + This option controls whether `git fetch` (and the underlying fetch + in `git pull`) will recursively fetch into populated submodules. + This option can be set either to a boolean value or to 'on-demand'. Setting it to a boolean changes the behavior of fetch and pull to - unconditionally recurse into submodules when set to true or to not - recurse at all when set to false. When set to 'on-demand' (the default - value), fetch and pull will only recurse into a populated submodule - when its superproject retrieves a commit that updates the submodule's + recurse unconditionally into submodules when set to true or to not + recurse at all when set to false. When set to 'on-demand', fetch and + pull will only recurse into a populated submodule when its + superproject retrieves a commit that updates the submodule's reference. + Defaults to 'on-demand', or to the value of 'submodule.recurse' if set. fetch.fsckObjects:: If it is set to true, git-fetch-pack will check all fetched @@ -57,9 +60,13 @@ fetch.negotiationAlgorithm:: sent when negotiating the contents of the packfile to be sent by the server. Set to "skipping" to use an algorithm that skips commits in an 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 + packfile; or set to "noop" to not send any information at all, which + will almost certainly result in a larger-than-necessary packfile, but + will skip the negotiation step. + 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). + of its descendants). If `feature.experimental` is enabled, then this + setting defaults to "skipping". Unknown values will cause 'git fetch' to error out. + See also the `--negotiation-tip` option for linkgit:git-fetch[1]. @@ -68,3 +75,22 @@ 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. diff --git a/third_party/git/Documentation/config/fmt-merge-msg.txt b/third_party/git/Documentation/config/fmt-merge-msg.txt index c73cfa90b7..3fbf40e24f 100644 --- a/third_party/git/Documentation/config/fmt-merge-msg.txt +++ b/third_party/git/Documentation/config/fmt-merge-msg.txt @@ -8,3 +8,15 @@ merge.log:: most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20. + +merge.suppressDest:: + By adding a glob that matches the names of integration + branches to this multi-valued configuration variable, the + default merge message computed for merges into these + integration branches will omit "into <branch name>" from + its title. ++ +An element with an empty value can be used to clear the list +of globs accumulated from previous configuration entries. +When there is no `merge.suppressDest` variable defined, the +default value of `master` is used for backward compatibility. diff --git a/third_party/git/Documentation/config/format.txt b/third_party/git/Documentation/config/format.txt index 414a5a8a9d..c2efd8758a 100644 --- a/third_party/git/Documentation/config/format.txt +++ b/third_party/git/Documentation/config/format.txt @@ -36,6 +36,12 @@ 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. @@ -51,6 +57,11 @@ format.suffix:: `.patch`. Use this variable to change that suffix (make sure to include the dot if you want it). +format.encodeEmailHeaders:: + Encode email headers that have non-ASCII characters with + "Q-encoding" (described in RFC 2047) for email transmission. + Defaults to true. + format.pretty:: The default pretty format for log/show/whatchanged command, See linkgit:git-log[1], linkgit:git-show[1], @@ -77,14 +88,17 @@ 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. + current working directory. All directory components will be created. format.useAutoBase:: A boolean value which lets you enable the `--base=auto` option of - format-patch by default. + format-patch by default. Can also be set to "whenAble" to allow + enabling `--base=auto` if a suitable base is available, but to skip + adding base info otherwise without the format dying. format.notes:: Provides the default value for the `--notes` option to @@ -99,4 +113,20 @@ 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. +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`. diff --git a/third_party/git/Documentation/config/gc.txt b/third_party/git/Documentation/config/gc.txt index 02b92b18b5..00ea0a678e 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 false. See linkgit:git-commit-graph[1] + required. Default is true. 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 cce2c89245..d94025cb36 100644 --- a/third_party/git/Documentation/config/gpg.txt +++ b/third_party/git/Documentation/config/gpg.txt @@ -18,3 +18,18 @@ 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 5a32f5b0a5..3968fbb697 100644 --- a/third_party/git/Documentation/config/http.txt +++ b/third_party/git/Documentation/config/http.txt @@ -29,6 +29,27 @@ http.proxyAuthMethod:: * `ntlm` - NTLM authentication (compare the --ntlm option of `curl(1)`) -- +http.proxySSLCert:: + The pathname of a file that stores a client certificate to use to authenticate + with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CERT` environment + variable. + +http.proxySSLKey:: + The pathname of a file that stores a private key to use to authenticate with + an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_KEY` environment + variable. + +http.proxySSLCertPasswordProtected:: + Enable Git's password prompt for the proxy SSL certificate. Otherwise OpenSSL + will prompt the user, possibly many times, if the certificate or private key + is encrypted. Can be overriden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED` + environment variable. + +http.proxySSLCAInfo:: + Pathname to the file containing the certificate bundle that should be used to + verify the proxy with when using an HTTPS proxy. Can be overriden by the + `GIT_PROXY_SSL_CAINFO` environment variable. + http.emptyAuth:: Attempt authentication without seeking a username or password. This can be used to attempt GSS-Negotiate authentication without specifying @@ -71,7 +92,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. Actually the possible values of + on libcurl. Currently the possible values of this option are: - HTTP/2 @@ -84,7 +105,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. Actually the possible values of + for the ssl version supported. Currently the possible values of this option are: - sslv2 @@ -199,6 +220,14 @@ 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 f181503041..7cb50b37e9 100644 --- a/third_party/git/Documentation/config/index.txt +++ b/third_party/git/Documentation/config/index.txt @@ -24,3 +24,4 @@ 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/init.txt b/third_party/git/Documentation/config/init.txt index 46fa8c6a08..dc77f8c844 100644 --- a/third_party/git/Documentation/config/init.txt +++ b/third_party/git/Documentation/config/init.txt @@ -1,3 +1,7 @@ init.templateDir:: Specify the directory from which templates will be copied. (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].) + +init.defaultBranch:: + Allows overriding the default branch name e.g. when initializing + a new repository or when cloning an empty repository. diff --git a/third_party/git/Documentation/config/log.txt b/third_party/git/Documentation/config/log.txt index e9e1e397f3..208d5fdcaa 100644 --- a/third_party/git/Documentation/config/log.txt +++ b/third_party/git/Documentation/config/log.txt @@ -18,6 +18,12 @@ log.decorate:: names are shown. This is the same as the `--decorate` option of the `git log`. +log.excludeDecoration:: + Exclude the specified patterns from the log decorations. This is + similar to the `--decorate-refs-exclude` command-line option, but + the config option can be overridden by the `--decorate-refs` + option. + log.follow:: If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given. This has the same limitations as `--follow`, diff --git a/third_party/git/Documentation/config/maintenance.txt b/third_party/git/Documentation/config/maintenance.txt new file mode 100644 index 0000000000..7cc6700d57 --- /dev/null +++ b/third_party/git/Documentation/config/maintenance.txt @@ -0,0 +1,16 @@ +maintenance.<task>.enabled:: + This boolean config option controls whether the maintenance task + with name `<task>` is run when no `--task` option is specified to + `git maintenance run`. These config values are ignored if a + `--task` option exists. By default, only `maintenance.gc.enabled` + is true. + +maintenance.commit-graph.auto:: + This integer config option controls how often the `commit-graph` task + should be run as part of `git maintenance run --auto`. If zero, then + the `commit-graph` task will not run with the `--auto` option. A + negative value will force the task to run every time. Otherwise, a + positive value implies the command should run when the number of + reachable commits that are not in the commit-graph file is at least + the value of `maintenance.commit-graph.auto`. The default value is + 100. diff --git a/third_party/git/Documentation/config/merge.txt b/third_party/git/Documentation/config/merge.txt index 6a313937f8..cb2ed58907 100644 --- a/third_party/git/Documentation/config/merge.txt +++ b/third_party/git/Documentation/config/merge.txt @@ -70,6 +70,16 @@ merge.stat:: Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default. +merge.autoStash:: + When set to true, automatically create a temporary stash entry + before the operation begins, and apply it after the operation + ends. This means that you can run merge on a dirty worktree. + However, use with care: the final stash application after a + successful merge might result in non-trivial conflicts. + This option can be overridden by the `--no-autostash` and + `--autostash` options of linkgit:git-merge[1]. + Defaults to false. + merge.tool:: Controls which merge tool is used by linkgit:git-mergetool[1]. The list below shows the valid built-in values. diff --git a/third_party/git/Documentation/config/mergetool.txt b/third_party/git/Documentation/config/mergetool.txt index 09ed31dbfa..16a27443a3 100644 --- a/third_party/git/Documentation/config/mergetool.txt +++ b/third_party/git/Documentation/config/mergetool.txt @@ -30,6 +30,16 @@ mergetool.meld.hasOutput:: to `true` tells Git to unconditionally use the `--output` option, and `false` avoids using `--output`. +mergetool.meld.useAutoMerge:: + When the `--auto-merge` is given, meld will merge all non-conflicting + parts automatically, highlight the conflicting parts and wait for + user decision. Setting `mergetool.meld.useAutoMerge` to `true` tells + Git to unconditionally use the `--auto-merge` option with `meld`. + Setting this value to `auto` makes git detect whether `--auto-merge` + is supported and will only use `--auto-merge` when available. A + value of `false` avoids using `--auto-merge` altogether, and is the + default value. + mergetool.keepBackup:: After performing a merge, the original file with conflict markers can be saved as a file with a `.orig` extension. If this variable diff --git a/third_party/git/Documentation/config/pack.txt b/third_party/git/Documentation/config/pack.txt index 9cdcfa7324..837f1b1679 100644 --- a/third_party/git/Documentation/config/pack.txt +++ b/third_party/git/Documentation/config/pack.txt @@ -27,6 +27,13 @@ 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] @@ -112,7 +119,8 @@ 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. + commits contain certain types of direct renames. Default is + `true`. 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 bfccc07491..756591d77b 100644 --- a/third_party/git/Documentation/config/protocol.txt +++ b/third_party/git/Documentation/config/protocol.txt @@ -45,11 +45,10 @@ The protocol names currently used by git are: -- protocol.version:: - 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. + 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`. Supported versions: + -- diff --git a/third_party/git/Documentation/config/pull.txt b/third_party/git/Documentation/config/pull.txt index b87cab31b3..5404830609 100644 --- a/third_party/git/Documentation/config/pull.txt +++ b/third_party/git/Documentation/config/pull.txt @@ -14,15 +14,16 @@ pull.rebase:: pull" is run. See "branch.<name>.rebase" for setting this on a per-branch basis. + -When `merges`, pass the `--rebase-merges` option to 'git rebase' +When `merges` (or just 'm'), 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` (deprecated in favor of `merges`), also pass +When `preserve` (or just 'p', 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`, the rebase is run in interactive mode. +When the value is `interactive` (or just 'i'), 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 0a0e000569..f5e5b38c68 100644 --- a/third_party/git/Documentation/config/push.txt +++ b/third_party/git/Documentation/config/push.txt @@ -1,6 +1,7 @@ push.default:: Defines the action `git push` should take if no refspec is - explicitly given. Different values are well-suited for + given (whether from the command-line, config, or elsewhere). + 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: @@ -8,7 +9,7 @@ push.default:: -- * `nothing` - do not push anything (error out) unless a refspec is - explicitly given. This is primarily meant for people who want to + 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 @@ -79,7 +80,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: @@ -96,7 +97,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 @@ -111,3 +112,5 @@ push.recurseSubmodules:: is 'no' then default behavior of ignoring submodules when pushing is retained. You may override this configuration at time of push by specifying '--recurse-submodules=check|on-demand|no'. + If not set, 'no' is used by default, unless 'submodule.recurse' is + set (in which case a 'true' value means 'on-demand'). diff --git a/third_party/git/Documentation/config/rebase.txt b/third_party/git/Documentation/config/rebase.txt index d98e32d812..7f7a07d22f 100644 --- a/third_party/git/Documentation/config/rebase.txt +++ b/third_party/git/Documentation/config/rebase.txt @@ -5,6 +5,12 @@ 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/receive.txt b/third_party/git/Documentation/config/receive.txt index 65f78aac37..85d5b5a3d2 100644 --- a/third_party/git/Documentation/config/receive.txt +++ b/third_party/git/Documentation/config/receive.txt @@ -114,6 +114,28 @@ receive.hideRefs:: An attempt to update or delete a hidden ref by `git push` is rejected. +receive.procReceiveRefs:: + This is a multi-valued variable that defines reference prefixes + to match the commands in `receive-pack`. Commands matching the + prefixes will be executed by an external hook "proc-receive", + instead of the internal `execute_commands` function. If this + variable is not defined, the "proc-receive" hook will never be + used, and all commands will be executed by the internal + `execute_commands` function. ++ +For example, if this variable is set to "refs/for", pushing to reference +such as "refs/for/master" will not create or update a reference named +"refs/for/master", but may create or update a pull request directly by +running the hook "proc-receive". ++ +Optional modifiers can be provided in the beginning of the value to filter +commands for specific actions: create (a), modify (m), delete (d). +A `!` can be included in the modifiers to negate the reference prefix entry. +E.g.: ++ + git config --system --add receive.procReceiveRefs ad:refs/heads + git config --system --add receive.procReceiveRefs !:refs/heads + receive.updateServerInfo:: If set to true, git-receive-pack will run git-update-server-info after receiving data from git-push and updating refs. diff --git a/third_party/git/Documentation/config/remote.txt b/third_party/git/Documentation/config/remote.txt index 6c4cad83a2..a8e6437a90 100644 --- a/third_party/git/Documentation/config/remote.txt +++ b/third_party/git/Documentation/config/remote.txt @@ -76,3 +76,11 @@ 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/sendemail.txt b/third_party/git/Documentation/config/sendemail.txt index 0006faf800..cbc5af42fd 100644 --- a/third_party/git/Documentation/config/sendemail.txt +++ b/third_party/git/Documentation/config/sendemail.txt @@ -61,3 +61,8 @@ sendemail.smtpBatchSize:: sendemail.smtpReloginDelay:: Seconds wait before reconnecting to smtp server. See also the `--relogin-delay` option of linkgit:git-send-email[1]. + +sendemail.forbidSendmailVariables:: + To avoid common misconfiguration mistakes, linkgit:git-send-email[1] + will abort with a warning if any configuration options for "sendmail" + exist. Set this variable to bypass the check. diff --git a/third_party/git/Documentation/config/stash.txt b/third_party/git/Documentation/config/stash.txt index abc7ef4a3a..00eb35434e 100644 --- a/third_party/git/Documentation/config/stash.txt +++ b/third_party/git/Documentation/config/stash.txt @@ -1,17 +1,9 @@ stash.useBuiltin:: - Set to `false` to use the legacy shell script implementation of - linkgit:git-stash[1]. Is `true` by default, which means use - the built-in rewrite of it in C. -+ -The C rewrite is first included with Git version 2.22 (and Git for Windows -version 2.19). This option serves as an escape hatch to re-enable the -legacy version in case any bugs are found in the rewrite. This option and -the shell script version of linkgit:git-stash[1] will be removed in some -future release. -+ -If you find some reason to set this option to `false`, other than -one-off testing, you should report the behavior difference as a bug in -Git (see https://git-scm.com/community for details). + Unused configuration variable. Used in Git versions 2.22 to + 2.26 as an escape hatch to enable the legacy shellscript + implementation of stash. Now the built-in rewrite of it in C + is always used. Setting this will emit a warning, to alert any + remaining users that setting this now does nothing. stash.showPatch:: If this is set to true, the `git stash show` command without an diff --git a/third_party/git/Documentation/config/submodule.txt b/third_party/git/Documentation/config/submodule.txt index 0a1293b051..d7a63c8c12 100644 --- a/third_party/git/Documentation/config/submodule.txt +++ b/third_party/git/Documentation/config/submodule.txt @@ -59,9 +59,17 @@ submodule.active:: submodule.recurse:: Specifies if commands recurse into submodules by default. This - applies to all commands that have a `--recurse-submodules` option, - except `clone`. + applies to all commands that have a `--recurse-submodules` option + (`checkout`, `fetch`, `grep`, `pull`, `push`, `read-tree`, `reset`, + `restore` and `switch`) except `clone` and `ls-files`. Defaults to false. + When set to true, it can be deactivated via the + `--no-recurse-submodules` option. Note that some Git commands + lacking this option may call some of the above commands affected by + `submodule.recurse`; for instance `git remote update` will call + `git fetch` but does not have a `--no-recurse-submodules` option. + For these commands a workaround is to temporarily change the + configuration value by using `git -c submodule.recurse=0`. submodule.fetchJobs:: Specifies how many submodules are fetched/cloned at the same time. @@ -79,4 +87,6 @@ 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`. + `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. diff --git a/third_party/git/Documentation/config/tag.txt b/third_party/git/Documentation/config/tag.txt index ef5adb3f42..5062a057ff 100644 --- a/third_party/git/Documentation/config/tag.txt +++ b/third_party/git/Documentation/config/tag.txt @@ -13,12 +13,5 @@ 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 affects tag signing + several times. Note that this option doesn't affect tag signing behavior enabled by "-u <keyid>" or "--local-user=<keyid>" options. - -tar.umask:: - This variable can be used to restrict the permission bits of - tar archive entries. The default is 0002, which turns off the - world write bit. The special value "user" indicates that the - archiving user's umask will be used instead. See umask(2) and - linkgit:git-archive[1]. diff --git a/third_party/git/Documentation/config/tar.txt b/third_party/git/Documentation/config/tar.txt new file mode 100644 index 0000000000..de8ff48ea9 --- /dev/null +++ b/third_party/git/Documentation/config/tar.txt @@ -0,0 +1,6 @@ +tar.umask:: + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) and + linkgit:git-archive[1]. diff --git a/third_party/git/Documentation/config/trace2.txt b/third_party/git/Documentation/config/trace2.txt index 2edbfb02fe..01d3afd8a8 100644 --- a/third_party/git/Documentation/config/trace2.txt +++ b/third_party/git/Documentation/config/trace2.txt @@ -48,9 +48,24 @@ trace2.configParams:: May be overridden by the `GIT_TRACE2_CONFIG_PARAMS` environment variable. Unset by default. +trace2.envVars:: + A comma-separated list of "important" environment variables that should + be recorded in the trace2 output. For example, + `GIT_HTTP_USER_AGENT,GIT_CONFIG` would cause the trace2 output to + contain events listing the overrides for HTTP user agent and the + location of the Git configuration file (assuming any are set). May be + overriden by the `GIT_TRACE2_ENV_VARS` environment variable. Unset by + default. + trace2.destinationDebug:: Boolean. When true Git will print error messages when a trace target destination cannot be opened for writing. 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/uploadpack.txt b/third_party/git/Documentation/config/uploadpack.txt index ed1c835695..b0d761282c 100644 --- a/third_party/git/Documentation/config/uploadpack.txt +++ b/third_party/git/Documentation/config/uploadpack.txt @@ -57,6 +57,24 @@ uploadpack.allowFilter:: If this option is set, `upload-pack` will support partial clone and partial fetch object filtering. +uploadpackfilter.allow:: + Provides a default value for unspecified object filters (see: the + below configuration variable). + Defaults to `true`. + +uploadpackfilter.<filter>.allow:: + Explicitly allow or ban the object filter corresponding to + `<filter>`, where `<filter>` may be one of: `blob:none`, + `blob:limit`, `tree`, `sparse:oid`, or `combine`. If using + combined filters, both `combine` and all of the nested filter + kinds must be allowed. Defaults to `uploadpackfilter.allow`. + +uploadpackfilter.tree.maxDepth:: + Only allow `--filter=tree:<n>` when `<n>` is no more than the value of + `uploadpackfilter.tree.maxDepth`. If set, this also implies + `uploadpackfilter.tree.allow=true`, unless this configuration + variable had already been set. Has no effect if unset. + uploadpack.allowRefInWant:: If this option is set, `upload-pack` will support the `ref-in-want` feature of the protocol version 2 `fetch` command. This feature diff --git a/third_party/git/Documentation/config/user.txt b/third_party/git/Documentation/config/user.txt index 0557cbbceb..59aec7c3ae 100644 --- a/third_party/git/Documentation/config/user.txt +++ b/third_party/git/Documentation/config/user.txt @@ -13,7 +13,12 @@ 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. - See linkgit:git-commit-tree[1] for more information. ++ +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. user.useConfigOnly:: Instruct Git to avoid trying to guess defaults for `user.email` diff --git a/third_party/git/Documentation/date-formats.txt b/third_party/git/Documentation/date-formats.txt index 6926e0a4c8..f1097fac69 100644 --- a/third_party/git/Documentation/date-formats.txt +++ b/third_party/git/Documentation/date-formats.txt @@ -20,7 +20,9 @@ RFC 2822:: ISO 8601:: Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the - `T` character as well. + `T` character as well. Fractional parts of a second will be ignored, + for example `2005-04-07T22:13:13.019` will be treated as + `2005-04-07T22:13:13`. + NOTE: In addition, the date part is accepted in the following formats: `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`. diff --git a/third_party/git/Documentation/diff-format.txt b/third_party/git/Documentation/diff-format.txt index 4d846d7346..fbbd410a84 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 f10ca410ad..b10ff4caa6 100644 --- a/third_party/git/Documentation/diff-generate-patch.txt +++ b/third_party/git/Documentation/diff-generate-patch.txt @@ -1,12 +1,17 @@ -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. +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 +`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables +(see linkgit:git[1]). What the -p option produces is slightly different from the traditional diff format: @@ -49,7 +54,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 SHA-1 checksum before and after the change. +The index line includes the blob object names 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. @@ -70,7 +75,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 @@ -80,7 +85,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 @@ -113,11 +118,11 @@ index fabadb8,cc95eb0..4866510 ------------ 1. It is preceded with a "git diff" header, that looks like - this (when `-c` option is used): + this (when the `-c` option is used): diff --combined file + -or like this (when `--cc` option is used): +or like this (when the `--cc` option is used): diff --cc file @@ -160,7 +165,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 for apply. The change is similar to the change in the + meant to be applied. 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 09faee3b44..573fb9bb71 100644 --- a/third_party/git/Documentation/diff-options.txt +++ b/third_party/git/Documentation/diff-options.txt @@ -73,6 +73,11 @@ ifndef::git-format-patch[] Synonym for `-p --raw`. endif::git-format-patch[] +ifdef::git-log[] +-t:: + Show the tree objects in the diff output. +endif::git-log[] + --indent-heuristic:: Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default. @@ -441,10 +446,11 @@ endif::git-format-patch[] --abbrev[=<n>]:: Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header - lines, show only a partial prefix. This is - independent of the `--full-index` option above, which controls - the diff-patch output format. Non default number of - digits can be specified with `--abbrev=<n>`. + lines, show only a partial prefix. + In diff-patch output format, `--full-index` takes higher + precedence, i.e. if `--full-index` is specified, full blob + names will be shown regardless of `--abbrev`. + Non default number of digits can be specified with `--abbrev=<n>`. -B[<n>][/<m>]:: --break-rewrites[=[<n>][/<m>]]:: @@ -567,13 +573,13 @@ To illustrate the difference between `-S<regex> --pickaxe-regex` and file: + ---- -+ return !regexec(regexp, two->ptr, 1, ®match, 0); ++ return frotz(nitfol, two->ptr, 1, 0); ... -- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0); +- hit = frotz(nitfol, mf2.ptr, 1, 0); ---- + -While `git log -G"regexec\(regexp"` will show this commit, `git log --S"regexec\(regexp" --pickaxe-regex` will not (because the number of +While `git log -G"frotz\(nitfol"` will show this commit, `git log +-S"frotz\(nitfol" --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 @@ -643,15 +649,18 @@ ifndef::git-format-patch[] -R:: Swap two inputs; that is, show differences from index or on-disk file to tree contents. +endif::git-format-patch[] --relative[=<path>]:: +--no-relative:: When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument. -endif::git-format-patch[] + `--no-relative` can be used to countermand both `diff.relative` config + option and previous `--relative`. -a:: --text:: diff --git a/third_party/git/Documentation/doc-diff b/third_party/git/Documentation/doc-diff index 3355be4798..1694300e50 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-header-footer cut away header and footer +cut-footer cut away footer " SUBDIRECTORY_OK=1 . "$(git --exec-path)/git-sh-setup" @@ -31,7 +31,7 @@ force= clean= from_program= to_program= -cut_header_footer= +cut_footer= while test $# -gt 0 do case "$1" in @@ -55,8 +55,8 @@ do --asciidoc) from_program=-asciidoc to_program=-asciidoc ;; - --cut-header-footer) - cut_header_footer=-cut-header-footer ;; + --cut-footer) + cut_footer=-cut-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_header_footer && -to_dir=$to_oid$to_program$cut_header_footer && +from_dir=$from_oid$from_program$cut_footer && +to_dir=$to_oid$to_program$cut_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,12 +169,11 @@ render_tree () { make -j$parallel -f - && mv "$tmp/rendered/$dname+" "$tmp/rendered/$dname" - if test "$cut_header_footer" = "-cut-header-footer" + if test "$cut_footer" = "-cut-footer" then for f in $(find "$tmp/rendered/$dname" -type f) do - tail -n +3 "$f" | head -n -2 | - sed -e '1{/^$/d}' -e '${/^$/d}' >"$f+" && + head -n -2 "$f" | sed -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 3c9b4f9e09..2bf77b46fd 100644 --- a/third_party/git/Documentation/fetch-options.txt +++ b/third_party/git/Documentation/fetch-options.txt @@ -61,9 +61,16 @@ this option multiple times, one for each matching ref name. See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]. -ifndef::git-pull[] --dry-run:: Show what would be done, without making any changes. + +ifndef::git-pull[] +--[no-]write-fetch-head:: + Write the list of remote refs fetched in the `FETCH_HEAD` + file directly under `$GIT_DIR`. This is the default. + Passing `--no-write-fetch-head` from the command line tells + Git not to write the file. Under `--dry-run` option, the + file is never written. endif::git-pull[] -f:: @@ -88,9 +95,16 @@ ifndef::git-pull[] Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified. +--[no-]auto-maintenance:: --[no-]auto-gc:: - Run `git gc --auto` at the end to perform garbage collection - if needed. This is enabled by default. + Run `git maintenance run --auto` at the end to perform automatic + repository maintenance if needed. (`--[no-]auto-gc` is a synonym.) + This is enabled by default. + +--[no-]write-commit-graph:: + Write a commit-graph after fetching. This overrides the config + setting `fetch.writeCommitGraph`. +endif::git-pull[] -p:: --prune:: @@ -103,6 +117,7 @@ ifndef::git-pull[] was cloned with the --mirror option), then they are also subject to pruning. Supplying `--prune-tags` is a shorthand for providing the tag refspec. +ifndef::git-pull[] + See the PRUNING section below for more details. @@ -129,13 +144,15 @@ endif::git-pull[] behavior for a remote may be specified with the remote.<name>.tagOpt setting. See linkgit:git-config[1]. -ifndef::git-pull[] --refmap=<refspec>:: When fetching refs listed on the command line, use the 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. See section on "Configured Remote-tracking + 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 Branches" for details. -t:: @@ -147,6 +164,7 @@ ifndef::git-pull[] is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`). +ifndef::git-pull[] --recurse-submodules[=yes|on-demand|no]:: This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a @@ -156,19 +174,36 @@ ifndef::git-pull[] value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule - clone. + clone. By default, 'on-demand' is used, unless + `fetch.recurseSubmodules` is set (see linkgit:git-config[1]). +endif::git-pull[] -j:: --jobs=<n>:: - 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. + 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. +ifndef::git-pull[] --no-recurse-submodules:: Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option). +endif::git-pull[] +--set-upstream:: + If the remote is fetched successfully, 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]. + +ifndef::git-pull[] --submodule-prefix=<path>:: Prepend <path> to paths printed in informative messages such as "Fetching submodule foo". This option is used @@ -181,7 +216,6 @@ ifndef::git-pull[] recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly. -endif::git-pull[] -u:: --update-head-ok:: @@ -191,6 +225,7 @@ endif::git-pull[] to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it. +endif::git-pull[] --upload-pack <upload-pack>:: When given, and the repository to fetch from is handled diff --git a/third_party/git/Documentation/git-add.txt b/third_party/git/Documentation/git-add.txt index 8b0e4c7fa8..be5e3ac54b 100644 --- a/third_party/git/Documentation/git-add.txt +++ b/third_party/git/Documentation/git-add.txt @@ -11,7 +11,8 @@ 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>...] + [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]] + [--] [<pathspec>...] DESCRIPTION ----------- @@ -187,6 +188,19 @@ 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 fc3b993c33..38c0852139 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) +'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)]) DESCRIPTION ----------- @@ -148,9 +148,12 @@ default. You can use `--no-utf8` to override this. -S[<keyid>]:: --gpg-sign[=<keyid>]:: +--no-gpg-sign:: GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be - stuck to the option without a space. + stuck to the option without a space. `--no-gpg-sign` is useful to + countermand both `commit.gpgSign` configuration variable, and + earlier `--gpg-sign`. --continue:: -r:: @@ -176,9 +179,11 @@ default. You can use `--no-utf8` to override this. Abort the patching operation but keep HEAD and the index untouched. ---show-current-patch:: - Show the patch being applied when "git am" is stopped because - of conflicts. +--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`. DISCUSSION ---------- @@ -190,8 +195,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: " and "Subject: " lines starting the body override the respective -commit author name and title values taken from the headers. +"From: ", "Date: ", 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-apply.txt b/third_party/git/Documentation/git-apply.txt index b9aa39000f..91d9a8601c 100644 --- a/third_party/git/Documentation/git-apply.txt +++ b/third_party/git/Documentation/git-apply.txt @@ -61,18 +61,18 @@ OPTIONS file and detects errors. Turns off "apply". --index:: - When `--check` is in effect, or when applying the patch - (which is the default when none of the options that - disables it is in effect), make sure the patch is - applicable to what the current index file records. If - the file to be patched in the working tree is not - up to date, it is flagged as an error. This flag also - causes the index file to be updated. + Apply the patch to both the index and the working tree (or + merely check that it would apply cleanly to both if `--check` is + in effect). Note that `--index` expects index entries and + working tree copies for relevant paths to be identical (their + contents and metadata such as file mode must match), and will + raise an error if they are not, even if the patch would apply + cleanly to both the index and the working tree in isolation. --cached:: - Apply a patch without touching the working tree. Instead take the - cached data, apply the patch, and store the result in the index - without using the working tree. This implies `--index`. + Apply the patch to just the index, without touching the working + tree. If `--check` is in effect, merely check that it would + apply cleanly to the index entry. --intent-to-add:: When applying the patch only to the working tree, mark new diff --git a/third_party/git/Documentation/git-archive.txt b/third_party/git/Documentation/git-archive.txt index cfa1e4ebe4..9f8172828d 100644 --- a/third_party/git/Documentation/git-archive.txt +++ b/third_party/git/Documentation/git-archive.txt @@ -55,6 +55,12 @@ OPTIONS --output=<file>:: Write the archive to <file> instead of stdout. +--add-file=<file>:: + Add a non-tracked file to the archive. Can be repeated to add + multiple files. The path of the file in the archive is built + by concatenating the value for `--prefix` (if any) and the + basename of <file>. + --worktree-attributes:: Look for attributes in .gitattributes files in the working tree as well (see <<ATTRIBUTES>>). diff --git a/third_party/git/Documentation/git-bisect-lk2009.txt b/third_party/git/Documentation/git-bisect-lk2009.txt index e99925184d..f3d9566c89 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 -combinational explosion. +combinatorial explosion. In fact the problem is that big software often has many different configuration options and that each test case should pass for each @@ -473,7 +473,7 @@ Z-Z ------------- 2) starting from the "good" ends of the graph, associate to each -commit the number of ancestors it has plus one + commit the number of ancestors it has plus one For example with the following graph where H is the "bad" commit and A and D are some parents of some "good" commits: @@ -514,7 +514,7 @@ D---E ------------- 4) the best bisection point is the commit with the highest associated -number + number So in the above example the best bisection point is commit C. @@ -580,8 +580,8 @@ good or a bad commit does not give more or less information). Let's also suppose that we have a cleaned up graph like one after step 1) in the bisection algorithm above. This means that we can measure -the information we get in terms of number of commit we can remove from -the graph.. + the information we get in terms of number of commit we can remove + from the graph.. And let's take a commit X in the graph. @@ -689,18 +689,18 @@ roughly the following steps: 6) sort the commit by decreasing associated value 7) if the first commit has not been skipped, we can return it and stop -here + here 8) otherwise filter out all the skipped commits in the sorted list 9) use a pseudo random number generator (PRNG) to generate a random -number between 0 and 1 + number between 0 and 1 10) multiply this random number with its square root to bias it toward -0 + 0 11) multiply the result by the number of commits in the filtered list -to get an index into this list + to get an index into this list 12) return the commit at the computed index @@ -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://public-inbox.org/git/7vps5xsbwp.fsf_-_@assigned-by-dhcp.cox.net/[Junio C Hamano. 'Automated bisect success story'.] +- [[[4]]] https://lore.kernel.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]]] 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.] +- [[[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.] - [[[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 4b45d837a7..fbb39fbdf5 100644 --- a/third_party/git/Documentation/git-bisect.txt +++ b/third_party/git/Documentation/git-bisect.txt @@ -16,8 +16,8 @@ DESCRIPTION The command takes various subcommands, and different options depending on the subcommand: - git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>] - [--no-checkout] [<bad> [<good>...]] [--] [<paths>...] + git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] + [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...] git bisect (bad|new|<term-new>) [<rev>] git bisect (good|old|<term-old>) [<rev>...] git bisect terms [--term-good | --term-bad] @@ -365,6 +365,17 @@ does not require a checked out tree. + If the repository is bare, `--no-checkout` is assumed. +--first-parent:: ++ +Follow only the first parent commit upon seeing a merge commit. ++ +In detecting regressions introduced through the merging of a branch, the merge +commit will be identified as introduction of the bug and its ancestors will be +ignored. ++ +This option is particularly useful in avoiding false positives when a merged +branch contained broken or non-buildable commits, but the merge itself was OK. + EXAMPLES -------- @@ -413,7 +424,7 @@ $ cat ~/test.sh # tweak the working tree by merging the hot-fix branch # and then attempt a build -if git merge --no-commit hot-fix && +if git merge --no-commit --no-ff hot-fix && make then # run project specific test and report its status diff --git a/third_party/git/Documentation/git-branch.txt b/third_party/git/Documentation/git-branch.txt index 135206ff4a..ace4ad3da8 100644 --- a/third_party/git/Documentation/git-branch.txt +++ b/third_party/git/Documentation/git-branch.txt @@ -11,8 +11,8 @@ SYNOPSIS 'git branch' [--color[=<when>] | --no-color] [--show-current] [-v [--abbrev=<length> | --no-abbrev]] [--column[=<options>] | --no-column] [--sort=<key>] - [(--merged | --no-merged) [<commit>]] - [--contains [<commit]] [--no-contains [<commit>]] + [--merged [<commit>]] [--no-merged [<commit>]] + [--contains [<commit>]] [--no-contains [<commit>]] [--points-at <object>] [--format=<format>] [(-r | --remotes) | (-a | --all)] [--list] [<pattern>...] @@ -252,13 +252,11 @@ start-point is either a local or remote-tracking branch. --merged [<commit>]:: Only list branches whose tips are reachable from the - specified commit (HEAD if not specified). Implies `--list`, - incompatible with `--no-merged`. + specified commit (HEAD if not specified). Implies `--list`. --no-merged [<commit>]:: Only list branches whose tips are not reachable from the - specified commit (HEAD if not specified). Implies `--list`, - incompatible with `--merged`. + specified commit (HEAD if not specified). Implies `--list`. <branchname>:: The name of the branch to create or delete. @@ -370,6 +368,8 @@ serve four related but different purposes: - `--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD. +include::ref-reachability-filters.txt[] + SEE ALSO -------- linkgit:git-check-ref-format[1], diff --git a/third_party/git/Documentation/git-bugreport.txt b/third_party/git/Documentation/git-bugreport.txt new file mode 100644 index 0000000000..66e88c2e31 --- /dev/null +++ b/third_party/git/Documentation/git-bugreport.txt @@ -0,0 +1,54 @@ +git-bugreport(1) +================ + +NAME +---- +git-bugreport - Collect information for user to file a bug report + +SYNOPSIS +-------- +[verse] +'git bugreport' [(-o | --output-directory) <path>] [(-s | --suffix) <format>] + +DESCRIPTION +----------- +Captures information about the user's machine, Git client, and repository state, +as well as a form requesting information about the behavior the user observed, +into a single text file which the user can then share, for example to the Git +mailing list, in order to report an observed bug. + +The following information is requested from the user: + + - Reproduction steps + - Expected behavior + - Actual behavior + +The following information is captured automatically: + + - 'git version --build-options' + - uname sysname, release, version, and machine strings + - Compiler-specific info string + - A list of enabled hooks + - $SHELL + +This tool is invoked via the typical Git setup process, which means that in some +cases, it might not be able to launch - for example, if a relevant config file +is unreadable. In this kind of scenario, it may be helpful to manually gather +the kind of information listed above when manually asking for help. + +OPTIONS +------- +-o <path>:: +--output-directory <path>:: + Place the resulting bug report file in `<path>` instead of the root of + the Git repository. + +-s <format>:: +--suffix <format>:: + Specify an alternate suffix for the bugreport name, to create a file + named 'git-bugreport-<formatted suffix>'. This should take the form of a + strftime(3) format string; the current local time will be used. + +GIT +--- +Part of the linkgit:git[1] suite diff --git a/third_party/git/Documentation/git-bundle.txt b/third_party/git/Documentation/git-bundle.txt index 7d6c9dcd17..53804cad4b 100644 --- a/third_party/git/Documentation/git-bundle.txt +++ b/third_party/git/Documentation/git-bundle.txt @@ -9,8 +9,9 @@ git-bundle - Move objects and refs by archive SYNOPSIS -------- [verse] -'git bundle' create <file> <git-rev-list-args> -'git bundle' verify <file> +'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied] + [--version=<version>] <file> <git-rev-list-args> +'git bundle' verify [-q | --quiet] <file> 'git bundle' list-heads <file> [<refname>...] 'git bundle' unbundle <file> [<refname>...] @@ -20,11 +21,14 @@ 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. 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 +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 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 @@ -33,9 +37,11 @@ destination repository. OPTIONS ------- -create <file>:: +create [options] <file> <git-rev-list-args>:: Used to create a bundle named 'file'. This requires the - 'git-rev-list-args' arguments to define the bundle contents. + '<git-rev-list-args>' arguments to define the bundle contents. + 'options' contains the options specific to the 'git bundle create' + subcommand. verify <file>:: Used to check that a bundle file is valid and will apply @@ -75,6 +81,39 @@ 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. + +--version=<version>:: + Specify the bundle version. Version 2 is the older format and can only be + used with SHA-1 repositories; the newer version 3 contains capabilities that + permit extensions. The default is the oldest supported format, based on the + hash algorithm in use. + +-q:: +--quiet:: + This flag makes the command not to report its progress + on the standard error stream. + SPECIFYING REFERENCES --------------------- @@ -92,6 +131,14 @@ 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-cat-file.txt b/third_party/git/Documentation/git-cat-file.txt index 8eca671b82..8e192d87db 100644 --- a/third_party/git/Documentation/git-cat-file.txt +++ b/third_party/git/Documentation/git-cat-file.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object> -'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks] +'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks] DESCRIPTION ----------- diff --git a/third_party/git/Documentation/git-check-attr.txt b/third_party/git/Documentation/git-check-attr.txt index 3c0578217b..84f41a8e82 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-parseable. + The output format is modified to be machine-parsable. 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 8b42cb3fb2..0c3924a63d 100644 --- a/third_party/git/Documentation/git-check-ignore.txt +++ b/third_party/git/Documentation/git-check-ignore.txt @@ -30,16 +30,22 @@ OPTIONS valid with a single pathname. -v, --verbose:: - 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]. + 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]. --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-parseable (see + The output format is modified to be machine-parsable (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 cf3cac0a2b..afa5c11fd3 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>] [--] <paths>... -'git checkout' [<tree-ish>] [--] <pathspec>... -'git checkout' (-p|--patch) [<tree-ish>] [--] [<paths>...] +'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>...] DESCRIPTION ----------- Updates files in the working tree to match the version in the index -or the specified tree. If no paths are given, 'git checkout' will +or the specified tree. If no pathspec was given, 'git checkout' will also update `HEAD` to set the specified branch as the current branch. @@ -79,13 +79,14 @@ 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' [<tree-ish>] [--] <pathspec>...:: +'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]:: - 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. + 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>`. + 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 @@ -96,12 +97,10 @@ 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 "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. - + 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. OPTIONS ------- @@ -199,6 +198,7 @@ Use `--no-guess` to disable this. Create the new branch's reflog; see linkgit:git-branch[1] for details. +-d:: --detach:: Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. @@ -293,11 +293,11 @@ Note that this option uses the no overlay mode by default (see also --recurse-submodules:: --no-recurse-submodules:: - Using `--recurse-submodules` will update the content of all initialized + Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) - is used, the work trees of submodules will not be updated. + is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule. @@ -309,6 +309,19 @@ 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 @@ -339,7 +352,13 @@ 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-cherry-pick.txt b/third_party/git/Documentation/git-cherry-pick.txt index 83ce51aedf..75feeef08a 100644 --- a/third_party/git/Documentation/git-cherry-pick.txt +++ b/third_party/git/Documentation/git-cherry-pick.txt @@ -109,9 +109,12 @@ effect to your index in a row. -S[<keyid>]:: --gpg-sign[=<keyid>]:: +--no-gpg-sign:: GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be - stuck to the option without a space. + stuck to the option without a space. `--no-gpg-sign` is useful to + countermand both `commit.gpgSign` configuration variable, and + earlier `--gpg-sign`. --ff:: If the current HEAD is the same as the parent of the diff --git a/third_party/git/Documentation/git-clean.txt b/third_party/git/Documentation/git-clean.txt index 0028ff12d1..a7f309dff5 100644 --- a/third_party/git/Documentation/git-clean.txt +++ b/third_party/git/Documentation/git-clean.txt @@ -26,18 +26,20 @@ are affected. OPTIONS ------- -d:: - 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. + 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. -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, -n or -i. Git will refuse to delete directories - with .git sub directory or file unless a second -f - is given. + 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. -i:: --interactive:: diff --git a/third_party/git/Documentation/git-clone.txt b/third_party/git/Documentation/git-clone.txt index 34011c2940..097e6a86c5 100644 --- a/third_party/git/Documentation/git-clone.txt +++ b/third_party/git/Documentation/git-clone.txt @@ -15,7 +15,8 @@ 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>] [--] <repository> + [--[no-]remote-submodules] [--jobs <n>] [--sparse] + [--filter=<filter>] [--] <repository> [<directory>] DESCRIPTION @@ -77,9 +78,9 @@ repository using this option and then delete branches (or use any other Git command that makes any existing commit unreferenced) in the source repository, some objects may become unreferenced (or dangling). These objects may be removed by normal Git operations (such as `git commit`) -which automatically call `git gc --auto`. (See linkgit:git-gc[1].) -If these objects are removed and were referenced by the cloned repository, -then the cloned repository will become corrupt. +which automatically call `git maintenance run --auto`. (See +linkgit:git-maintenance[1].) If these objects are removed and were referenced +by the cloned repository, then the cloned repository will become corrupt. + Note that running `git repack` without the `--local` option in a repository cloned with `--shared` will copy objects from the source repository into a pack @@ -156,6 +157,22 @@ 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. + +--filter=<filter-spec>:: + Use the partial clone feature and request that the server sends + a subset of reachable objects according to a given object filter. + When using `--filter`, the supplied `<filter-spec>` is used for + the partial clone filter. For example, `--filter=blob:none` will + filter out all blobs (file contents) until needed by Git. Also, + `--filter=blob:limit=<size>` will filter out all blobs of size + at least `<size>`. For more details on filter specifications, see + the `--filter` option in linkgit:git-rev-list[1]. + --mirror:: Set up a mirror of the source repository. This implies `--bare`. Compared to `--bare`, `--mirror` not only maps local branches of the @@ -242,7 +259,7 @@ maintain a branch with no references other than a single cloned branch. This is useful e.g. to maintain minimal clones of the default branch of some repository for search indexing. ---recurse-submodules[=<pathspec]:: +--recurse-submodules[=<pathspec>]:: After the clone is created, initialize and clone submodules within based on the provided pathspec. If no pathspec is provided, all submodules are initialized and cloned. @@ -262,9 +279,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 eb5e7865f0..de6b6de230 100644 --- a/third_party/git/Documentation/git-commit-graph.txt +++ b/third_party/git/Documentation/git-commit-graph.txt @@ -9,9 +9,8 @@ git-commit-graph - Write and verify Git commit-graph files SYNOPSIS -------- [verse] -'git commit-graph read' [--object-dir <dir>] -'git commit-graph verify' [--object-dir <dir>] [--shallow] -'git commit-graph write' <options> [--object-dir <dir>] +'git commit-graph verify' [--object-dir <dir>] [--shallow] [--[no-]progress] +'git commit-graph write' <options> [--object-dir <dir>] [--[no-]progress] DESCRIPTION @@ -27,8 +26,14 @@ 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`. + 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. +--[no-]progress:: + Turn progress on/off explicitly. If neither is specified, progress is + shown if standard error is connected to a terminal. COMMANDS -------- @@ -42,8 +47,10 @@ with `--stdin-commits` or `--reachable`.) + With the `--stdin-commits` option, generate the new commit graph by walking commits starting at the commits specified in stdin as a list -of OIDs in hex, one OID per line. (Cannot be combined with -`--stdin-packs` or `--reachable`.) +of OIDs in hex, one OID per line. OIDs that resolve to non-commits +(either directly, or by peeling tags) are silently ignored. OIDs that +are malformed, or do not exist generate an error. (Cannot be combined +with `--stdin-packs` or `--reachable`.) + With the `--reachable` option, generate the new commit graph by walking commits starting at all refs. (Cannot be combined with `--stdin-commits` @@ -52,11 +59,34 @@ or `--stdin-packs`.) With the `--append` option, include all commits that are present in the existing commit-graph file. + -With the `--split` option, write the commit-graph as a chain of multiple -commit-graph files stored in `<dir>/info/commit-graphs`. The new commits -not already in the commit-graph are added in a new "tip" file. This file -is merged with the existing file if the following merge conditions are -met: +With the `--changed-paths` option, compute and write information about the +paths changed between a commit and its first parent. This operation can +take a while on large repositories. It provides significant performance gains +for getting history of a directory or a file with `git log -- <path>`. If +this option is given, future commit-graph writes will automatically assume +that this option was intended. Use `--no-changed-paths` to stop storing this +data. ++ +With the `--max-new-filters=<n>` option, generate at most `n` new Bloom +filters (if `--changed-paths` is specified). If `n` is `-1`, no limit is +enforced. Only commits present in the new layer count against this +limit. To retroactively compute Bloom filters over earlier layers, it is +advised to use `--split=replace`. Overrides the `commitGraph.maxNewFilters` +configuration. ++ +With the `--split[=<strategy>]` option, write the commit-graph as a +chain of multiple commit-graph files stored in +`<dir>/info/commit-graphs`. Commit-graph layers are merged based on the +strategy and other splitting options. The new commits not already in the +commit-graph are added in a new "tip" file. This file is merged with the +existing file if the following merge conditions are met: ++ +* If `--split=no-merge` is specified, a merge is never performed, and +the remaining options are ignored. `--split=replace` overwrites the +existing chain with a new one. A bare `--split` defers to the remaining +options. (Note that merging a chain of commit graphs replaces the +existing chain with a length-1 chain where the first and only +incremental holds the entire graph). + * If `--size-multiple=<X>` is not specified, let `X` equal 2. If the new tip file would have `N` commits and the previous tip has `M` commits and @@ -71,11 +101,6 @@ 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,12 +140,6 @@ $ 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 4b90b9c12a..2e2c581098 100644 --- a/third_party/git/Documentation/git-commit-tree.txt +++ b/third_party/git/Documentation/git-commit-tree.txt @@ -61,14 +61,11 @@ OPTIONS -S[<keyid>]:: --gpg-sign[=<keyid>]:: +--no-gpg-sign:: GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be - stuck to the option without a space. - ---no-gpg-sign:: - Do not GPG-sign commit, to countermand a `--gpg-sign` option - given earlier on the command line. - + stuck to the option without a space. `--no-gpg-sign` is useful to + countermand a `--gpg-sign` option given earlier on the command line. Commit Information ------------------ @@ -79,26 +76,6 @@ 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. @@ -117,6 +94,7 @@ 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 7628193284..a3baea32ae 100644 --- a/third_party/git/Documentation/git-commit.txt +++ b/third_party/git/Documentation/git-commit.txt @@ -13,7 +13,8 @@ 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] [-S[<keyid>]] [--] [<file>...] + [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]] + [-S[<keyid>]] [--] [<pathspec>...] DESCRIPTION ----------- @@ -278,22 +279,37 @@ 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:: @@ -332,26 +348,23 @@ changes to tracked files. -S[<keyid>]:: --gpg-sign[=<keyid>]:: +--no-gpg-sign:: GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be - stuck to the option without a space. - ---no-gpg-sign:: - Countermand `commit.gpgSign` configuration variable that is - set to force each and every commit to be signed. + stuck to the option without a space. `--no-gpg-sign` is useful to + countermand both `commit.gpgSign` configuration variable, and + earlier `--gpg-sign`. \--:: Do not interpret any more arguments as options. -<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[] +<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]. EXAMPLES -------- @@ -446,6 +459,43 @@ 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 ff9310f958..7573160f21 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] [-z|--null] name [value [value_regex]] +'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-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] [-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>] [--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>] [-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] [-z|--null] [--name-only] -l | --list +'git config' [<file-option>] [--show-origin] [--show-scope] [-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,6 +222,11 @@ 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 @@ -339,33 +344,35 @@ 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-store.txt b/third_party/git/Documentation/git-credential-store.txt index 693dd9d9d7..76b0798856 100644 --- a/third_party/git/Documentation/git-credential-store.txt +++ b/third_party/git/Documentation/git-credential-store.txt @@ -94,6 +94,10 @@ stored on its own line as a URL like: https://user:pass@example.com ------------------------------ +No other kinds of lines (e.g. empty lines or comment lines) are +allowed in the file, even though some may be silently ignored. Do +not view or edit the file with editors. + When Git needs authentication for a particular URL context, credential-store will consider that context a pattern to match against each entry in the credentials file. If the protocol, hostname, and diff --git a/third_party/git/Documentation/git-credential.txt b/third_party/git/Documentation/git-credential.txt index b211440373..31c81c4c02 100644 --- a/third_party/git/Documentation/git-credential.txt +++ b/third_party/git/Documentation/git-credential.txt @@ -19,8 +19,7 @@ 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 -link:technical/api-credentials.html[the Git credential API] for more +interface models the internal C API; see credential.h for more background on the concepts. git-credential takes an "action" option on the command-line (one of @@ -104,17 +103,20 @@ INPUT/OUTPUT FORMAT `git credential` reads and/or writes (depending on the action used) credential information in its standard input/output. This information can correspond either to keys for which `git credential` will obtain -the login/password information (e.g. host, protocol, path), or to the -actual credential data to be obtained (login/password). +the login information (e.g. host, protocol, path), or to the actual +credential data to be obtained (username/password). The credential is split into a set of named attributes, with one -attribute per line. Each attribute is -specified by a key-value pair, separated by an `=` (equals) sign, -followed by a newline. The key may contain any bytes except `=`, -newline, or NUL. The value may contain any bytes except newline or NUL. +attribute per line. Each attribute is specified by a key-value pair, +separated by an `=` (equals) sign, followed by a newline. + +The key may contain any bytes except `=`, newline, or NUL. The value may +contain any bytes except newline or NUL. + In both cases, all bytes are treated as-is (i.e., there is no quoting, and one cannot transmit a value with newline or NUL in it). The list of attributes is terminated by a blank line or end-of-file. + Git understands the following attributes: `protocol`:: @@ -124,7 +126,8 @@ Git understands the following attributes: `host`:: - The remote hostname for a network credential. + The remote hostname for a network credential. This includes + the port number if one was specified (e.g., "example.com:8088"). `path`:: @@ -135,7 +138,7 @@ Git understands the following attributes: `username`:: The credential's username, if we already have one (e.g., from a - URL, from the user, or from a previously run helper). + URL, the configuration, the user, or from a previously run helper). `password`:: @@ -147,8 +150,12 @@ Git understands the following attributes: value is parsed as a URL and treated as if its constituent parts were read (e.g., `url=https://example.com` would behave as if `protocol=https` and `host=example.com` had been provided). This - can help callers avoid parsing URLs themselves. Note that any - components which are missing from the URL (e.g., there is no - username in the example above) will be set to empty; if you want - to provide a URL and override some attributes, provide the URL - attribute first, followed by any overrides. + can help callers avoid parsing URLs themselves. ++ +Note that specifying a protocol is mandatory and if the URL +doesn't specify a hostname (e.g., "cert:///path/to/file") the +credential will contain a hostname attribute whose value is an +empty string. ++ +Components which are missing from the URL (e.g., there is no +username in the example above) will be left unset. diff --git a/third_party/git/Documentation/git-cvsserver.txt b/third_party/git/Documentation/git-cvsserver.txt index 79e22b1f3a..1b1c71ad9d 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 - alpha-numeric ones, `.`, and `-` are replaced with + alphanumeric 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 72179d993c..727f24d16e 100644 --- a/third_party/git/Documentation/git-diff.txt +++ b/third_party/git/Documentation/git-diff.txt @@ -11,15 +11,17 @@ SYNOPSIS [verse] 'git diff' [<options>] [<commit>] [--] [<path>...] 'git diff' [<options>] --cached [<commit>] [--] [<path>...] -'git diff' [<options>] <commit> <commit> [--] [<path>...] +'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...] +'git diff' [<options>] <commit>...<commit> [--] [<path>...] 'git diff' [<options>] <blob> <blob> 'git diff' [<options>] --no-index [--] <path> <path> DESCRIPTION ----------- Show changes between the working tree and the index or a tree, changes -between the index and a tree, changes between two trees, changes between -two blob objects, or changes between two files on disk. +between the index and a tree, changes between two trees, changes resulting +from a merge, changes between two blob objects, or changes between two +files on disk. 'git diff' [<options>] [--] [<path>...]:: @@ -36,7 +38,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. + controlled by Git. This form implies `--exit-code`. 'git diff' [<options>] --cached [<commit>] [--] [<path>...]:: @@ -61,9 +63,19 @@ two blob objects, or changes between two files on disk. This is to view the changes between two arbitrary <commit>. +'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]:: + + This form is to view the results of a merge commit. The first + listed <commit> must be the merge itself; the remaining two or + more commits should be its parents. A convenient way to produce + the desired set of revisions is to use the {caret}@ suffix. + For instance, if `master` names a merge commit, `git diff master + master^@` gives the same combined diff as `git show master`. + 'git diff' [<options>] <commit>..<commit> [--] [<path>...]:: - This is synonymous to the previous form. If <commit> on + This is synonymous to the earlier form (without the "..") for + viewing the changes between two arbitrary <commit>. If <commit> on one side is omitted, it will have the same effect as using HEAD instead. @@ -196,7 +208,8 @@ linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], -linkgit:git-apply[1] +linkgit:git-apply[1], +linkgit:git-show[1] GIT --- diff --git a/third_party/git/Documentation/git-fast-export.txt b/third_party/git/Documentation/git-fast-export.txt index cc940eb9ad..1978dbdc6a 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 kind of an interactive -'git filter-branch'. - +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'). OPTIONS ------- @@ -75,11 +75,20 @@ 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 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 (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. --fake-missing-tagger:: Some old repositories have tags without a tagger. The @@ -110,6 +119,11 @@ marks the same across runs. the shape of the history and stored tree. See the section on `ANONYMIZING` below. +--anonymize-map=<from>[:<to>]:: + Convert token `<from>` to `<to>` in the anonymized output. If + `<to>` is omitted, map `<from>` to itself (i.e., do not + anonymize it). See the section on `ANONYMIZING` below. + --reference-excluded-parents:: By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 @@ -133,7 +147,7 @@ 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 reencoded into UTF-8. With 'no', the original + message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved. --refspec:: @@ -229,6 +243,30 @@ collapse "User 0", "User 1", etc into "User X"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream. +Reproducing some bugs may require referencing particular commits or +paths, which becomes challenging after refnames and paths have been +anonymized. You can ask for a particular token to be left as-is or +mapped to a new value. For example, if you have a bug which reproduces +with `git rev-list sensitive -- secret.c`, you can run: + +--------------------------------------------------- +$ git fast-export --anonymize --all \ + --anonymize-map=sensitive:foo \ + --anonymize-map=secret.c:bar.c \ + >stream +--------------------------------------------------- + +After importing the stream, you can then run `git rev-list foo -- bar.c` +in the anonymized repository. + +Note that paths and refnames are split into tokens at slash boundaries. +The command above would anonymize `subdir/secret.c` as something like +`path123/bar.c`; you could then search for `bar.c` in the anonymized +repository to determine the final pathname. + +To make referencing the final pathname simpler, you can map each path +component; so if you also anonymize `subdir` to `publicdir`, then the +final pathname would be `publicdir/bar.c`. LIMITATIONS ----------- diff --git a/third_party/git/Documentation/git-fast-import.txt b/third_party/git/Documentation/git-fast-import.txt index fad327aecc..39cfa05b28 100644 --- a/third_party/git/Documentation/git-fast-import.txt +++ b/third_party/git/Documentation/git-fast-import.txt @@ -51,6 +51,21 @@ 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 ~~~~~~~~~~~~~~~~~~~~~ @@ -107,6 +122,26 @@ Locations of Marks Files Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options. +Submodule Rewriting +~~~~~~~~~~~~~~~~~~~ + +--rewrite-submodules-from=<name>:<file>:: +--rewrite-submodules-to=<name>:<file>:: + Rewrite the object IDs for the submodule specified by <name> from the values + used in the from <file> to those used in the to <file>. The from marks should + have been created by `git fast-export`, and the to marks should have been + created by `git fast-import` when importing that same submodule. ++ +<name> may be any arbitrary string not containing a colon character, but the +same value must be used with both options when specifying corresponding marks. +Multiple submodules may be specified with different values for <name>. It is an +error not to use these options in corresponding pairs. ++ +These options are primarily useful when converting a repository from one hash +algorithm to another; without them, fast-import will fail if it encounters a +submodule because it has no way of writing the object ID into the new hash +algorithm. + Performance and Compression Tuning ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -258,7 +293,14 @@ by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed. + Unlike the `rfc2822` format, this format is very strict. Any -variation in formatting will cause fast-import to reject the value. +variation in formatting will cause fast-import to reject the value, +and some sanity checks on the numeric values may also be performed. + +`raw-permissive`:: + This is the same as `raw` except that no sanity checks on + the numeric epoch and local offset are performed. This can + be useful when trying to filter or import an existing history + with e.g. bogus timezone values. `rfc2822`:: This is the standard email format as described by RFC 2822. @@ -337,6 +379,13 @@ 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. @@ -391,7 +440,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? .... @@ -765,7 +814,7 @@ may have uses for this information 'original-oid' SP <object-identifier> LF .... -where `<object-identifer>` is any string not containing LF. +where `<object-identifier>` is any string not containing LF. `tag` ~~~~~ @@ -774,6 +823,7 @@ 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 @@ -913,6 +963,21 @@ 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-fetch.txt b/third_party/git/Documentation/git-fetch.txt index 5b1909fdf4..9067c2079e 100644 --- a/third_party/git/Documentation/git-fetch.txt +++ b/third_party/git/Documentation/git-fetch.txt @@ -48,6 +48,10 @@ include::fetch-options.txt[] include::pull-fetch-param.txt[] +--stdin:: + Read refspecs, one per line, from stdin in addition to those provided + as arguments. The "tag <name>" format is not supported. + include::urls-remotes.txt[] @@ -255,14 +259,14 @@ refspec. * Using refspecs explicitly: + ------------------------------------------------ -$ git fetch origin +pu:pu maint:tmp +$ git fetch origin +seen:seen maint:tmp ------------------------------------------------ + -This updates (or creates, as necessary) branches `pu` and `tmp` in +This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively) -`pu` and `maint` from the remote repository. +`seen` and `maint` from the remote repository. + -The `pu` branch will be updated even if it does not fast-forward, +The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be. * Peek at a remote's branch, without configuring the remote in your local diff --git a/third_party/git/Documentation/git-filter-branch.txt b/third_party/git/Documentation/git-filter-branch.txt index 6b53dd7e06..62e482a95e 100644 --- a/third_party/git/Documentation/git-filter-branch.txt +++ b/third_party/git/Documentation/git-filter-branch.txt @@ -16,6 +16,19 @@ 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 @@ -445,36 +458,245 @@ warned. (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead). -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`. +[[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 +filter-repo' 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. GIT --- diff --git a/third_party/git/Documentation/git-for-each-ref.txt b/third_party/git/Documentation/git-for-each-ref.txt index 6dcd39f6f6..2962f85a50 100644 --- a/third_party/git/Documentation/git-for-each-ref.txt +++ b/third_party/git/Documentation/git-for-each-ref.txt @@ -11,7 +11,7 @@ SYNOPSIS 'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl] [(--sort=<key>)...] [--format=<format>] [<pattern>...] [--points-at=<object>] - (--merged[=<object>] | --no-merged[=<object>]) + [--merged[=<object>]] [--no-merged[=<object>]] [--contains[=<object>]] [--no-contains[=<object>]] DESCRIPTION @@ -76,13 +76,11 @@ OPTIONS --merged[=<object>]:: Only list refs whose tips are reachable from the - specified commit (HEAD if not specified), - incompatible with `--no-merged`. + specified commit (HEAD if not specified). --no-merged[=<object>]:: Only list refs whose tips are not reachable from the - specified commit (HEAD if not specified), - incompatible with `--merged`. + specified commit (HEAD if not specified). --contains[=<object>]:: Only list refs which contain the specified commit (HEAD if not @@ -222,6 +220,8 @@ worktreepath:: In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field. +Fields `tree` and `parent` can also be used with modifier `:short` and +`:short=<length>` just like `objectname`. For commit and tag objects, the special `creatordate` and `creator` fields will correspond to the appropriate date or name-email-date tuple @@ -230,14 +230,35 @@ These are intended for working on a mix of annotated and lightweight tags. Fields that have name-email-date tuple as its value (`author`, `committer`, and `tagger`) can be suffixed with `name`, `email`, -and `date` to extract the named component. - -The complete message in a commit and tag object is `contents`. -Its first line is `contents:subject`, where subject is the concatenation -of all lines of the commit message up to the first blank line. The next -line is `contents:body`, where body is all of the lines after the first -blank line. The optional GPG signature is `contents:signature`. The -first `N` lines of the message is obtained using `contents:lines=N`. +and `date` to extract the named component. For email fields (`authoremail`, +`committeremail` and `taggeremail`), `:trim` can be appended to get the email +without angle brackets, and `:localpart` to get the part before the `@` symbol +out of the trimmed email. + +The message in a commit or a tag object is `contents`, from which +`contents:<part>` can be used to extract various parts out of: + +contents:size:: + The size in bytes of the commit or tag message. + +contents:subject:: + The first paragraph of the message, which typically is a + single line, is taken as the "subject" of the commit or the + tag message. + Instead of `contents:subject`, field `subject` can also be used to + obtain same results. `:sanitize` can be appended to `subject` for + subject line suitable for filename. + +contents:body:: + The remainder of the commit or the tag message that follows + the "subject". + +contents:signature:: + The optional GPG signature of the tag. + +contents:lines=N:: + The first `N` lines of the message. + Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as `trailers` (or by using the historical alias `contents:trailers`). Non-trailer lines from the trailer block can be omitted @@ -385,6 +406,11 @@ Note also that multiple copies of an object may be present in the object database; in this case, it is undefined which copy's size or delta base will be reported. +NOTES +----- + +include::ref-reachability-filters.txt[] + SEE ALSO -------- linkgit:git-show-ref[1] diff --git a/third_party/git/Documentation/git-format-patch.txt b/third_party/git/Documentation/git-format-patch.txt index b9b97e63ae..0f81d0437b 100644 --- a/third_party/git/Documentation/git-format-patch.txt +++ b/third_party/git/Documentation/git-format-patch.txt @@ -17,12 +17,14 @@ 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] - [--rfc] [--subject-prefix=Subject-Prefix] + [--cover-from-description=<mode>] + [--rfc] [--subject-prefix=<subject prefix>] [(--reroll-count|-v) <n>] [--to=<email>] [--cc=<email>] [--[no-]cover-letter] [--quiet] + [--[no-]encode-email-headers] [--no-notes | --notes[=<ref>]] [--interdiff=<previous>] [--range-diff=<previous> [--creation-factor=<percent>]] @@ -66,7 +68,8 @@ 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 .`. +`format.outputDirectory` points elsewhere, use `-o .`. All directory +components will be created. 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 @@ -159,9 +162,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:: @@ -171,9 +174,29 @@ will want to ensure that threading is disabled for `git send-email`. patches being generated, and any patch that matches is ignored. ---subject-prefix=<Subject-Prefix>:: +--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>:: 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. @@ -231,6 +254,13 @@ feeding the result to `git send-email`. containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out. +--encode-email-headers:: +--no-encode-email-headers:: + Encode email headers that have non-ASCII characters with + "Q-encoding" (described in RFC 2047), instead of outputting the + headers verbatim. Defaults to the value of the + `format.encodeEmailHeaders` configuration variable. + --interdiff=<previous>:: As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing @@ -311,10 +341,12 @@ 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. ---base=<commit>:: +--[no-]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. + below for details. If <commit> is "auto", a base commit is + automatically chosen. The `--no-base` option overrides a + `format.useAutoBase` configuration. --root:: Treat the revision argument as a <revision range>, even if it @@ -330,8 +362,9 @@ 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, and sign off patches with configuration variables. +outputting more than one patch, add "To:" or "Cc:" headers, configure +attachments, change the patch output directory, and sign off patches +with configuration variables. ------------ [format] @@ -343,7 +376,9 @@ attachments, and sign off patches with configuration variables. cc = <email> attach [ = mime-boundary-string ] signOff = true - coverletter = auto + outputDirectory = <directory> + coverLetter = auto + coverFromDescription = auto ------------ diff --git a/third_party/git/Documentation/git-gc.txt b/third_party/git/Documentation/git-gc.txt index 247f765604..0c114ad1ca 100644 --- a/third_party/git/Documentation/git-gc.txt +++ b/third_party/git/Documentation/git-gc.txt @@ -115,15 +115,14 @@ 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, 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. +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. 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 2d27969057..6077ff01a4 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), - 8 threads are used by default (for now). + 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. grep.fullName:: If set to true, enable `--full-name` option by default. @@ -93,10 +93,11 @@ OPTIONS with `--no-index`. --recurse-submodules:: - Recursively search in each submodule that has been initialized and + Recursively search in each submodule that is active 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. + the parent project's <tree> object. This option has no effect + if `--no-index` is given. -a:: --text:: @@ -205,8 +206,10 @@ providing this option will cause it to die. -z:: --null:: - Output \0 instead of the character that normally follows a - file name. + Use \0 as the delimiter for pathnames in the output, and print + them verbatim. Without this option, pathnames with "unusual" + characters are quoted as explained for the configuration + variable core.quotePath (see linkgit:git-config[1]). -o:: --only-matching:: @@ -271,6 +274,23 @@ 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 @@ -330,6 +350,17 @@ 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 5f93f8003d..c9d7e96214 100644 --- a/third_party/git/Documentation/git-gui.txt +++ b/third_party/git/Documentation/git-gui.txt @@ -112,15 +112,9 @@ Other versions are distributed as part of the Git suite for the convenience of end users. -A 'git gui' development repository can be obtained from: +The official repository of the 'git gui' project can be found at: - 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/[]. + https://github.com/prati0100/git-gui.git/ GIT --- diff --git a/third_party/git/Documentation/git-help.txt b/third_party/git/Documentation/git-help.txt index f71db0daa2..44fe8860b3 100644 --- a/third_party/git/Documentation/git-help.txt +++ b/third_party/git/Documentation/git-help.txt @@ -8,7 +8,7 @@ git-help - Display help information about Git SYNOPSIS -------- [verse] -'git help' [-a|--all [--[no-]verbose]] [-g|--guide] +'git help' [-a|--all [--[no-]verbose]] [-g|--guides] [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE] DESCRIPTION @@ -21,8 +21,8 @@ on the standard output. If the option `--all` or `-a` is given, all available commands are printed on the standard output. -If the option `--guide` or `-g` is given, a list of the useful -Git guides is also printed on the standard output. +If the option `--guides` or `-g` is given, a list of the +Git concept guides is also printed on the standard output. If a command, or a guide, is given, a manual page for that command or guide is brought up. The 'man' program is used by default for this @@ -58,7 +58,7 @@ OPTIONS -g:: --guides:: - Prints a list of useful guides on the standard output. This + Prints a list of the Git concept guides on the standard output. This option overrides any given command or guide name. -i:: diff --git a/third_party/git/Documentation/git-http-fetch.txt b/third_party/git/Documentation/git-http-fetch.txt index 666b042679..4deb4893f5 100644 --- a/third_party/git/Documentation/git-http-fetch.txt +++ b/third_party/git/Documentation/git-http-fetch.txt @@ -9,7 +9,7 @@ git-http-fetch - Download from a remote Git repository via HTTP SYNOPSIS -------- [verse] -'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url> +'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url> DESCRIPTION ----------- @@ -40,6 +40,13 @@ commit-id:: <commit-id>['\t'<filename-as-in--w>] +--packfile=<hash>:: + Instead of a commit id on the command line (which is not expected in + this case), 'git http-fetch' fetches the packfile directly at the given + URL and uses index-pack to generate corresponding .idx and .keep files. + The hash is used to determine the name of the temporary file and is + arbitrary. The output of index-pack is printed to stdout. + --recover:: Verify that everything reachable from target is fetched. Used after an earlier fetch is interrupted. diff --git a/third_party/git/Documentation/git-imap-send.txt b/third_party/git/Documentation/git-imap-send.txt index 65b53fcc47..63cf498ce9 100644 --- a/third_party/git/Documentation/git-imap-send.txt +++ b/third_party/git/Documentation/git-imap-send.txt @@ -51,17 +51,13 @@ OPTIONS CONFIGURATION ------------- -To use the tool, imap.folder and either imap.tunnel or imap.host must be set +To use the tool, `imap.folder` and either `imap.tunnel` or `imap.host` must be set to appropriate values. -Variables -~~~~~~~~~ - include::config/imap.txt[] -Examples -~~~~~~~~ - +EXAMPLES +-------- Using tunnel mode: .......................... @@ -89,14 +85,18 @@ Using direct mode with SSL: user = bob pass = p4ssw0rd port = 123 - sslverify = false + ; sslVerify = false ......................... -EXAMPLES --------- -To submit patches using GMail's IMAP interface, first, edit your ~/.gitconfig -to specify your account settings: +[NOTE] +You may want to use `sslVerify=false` +while troubleshooting, if you suspect that the reason you are +having trouble connecting is because the certificate you use at +the private server `example.com` you are trying to set up (or +have set up) may not be verified correctly. + +Using Gmail's IMAP interface: --------- [imap] @@ -104,17 +104,21 @@ to specify your account settings: host = imaps://imap.gmail.com user = user@gmail.com port = 993 - sslverify = false --------- -You might need to instead use: folder = "[Google Mail]/Drafts" if you get an error +[NOTE] +You might need to instead use: `folder = "[Google Mail]/Drafts"` if you get an error that the "Folder doesn't exist". +[NOTE] +If your Gmail account is set to another language than English, the name of the "Drafts" +folder will be localized. + Once the commits are ready to be sent, run the following command: $ git format-patch --cover-letter -M --stdout origin/master | git imap-send -Just make sure to disable line wrapping in the email client (GMail's web +Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client). diff --git a/third_party/git/Documentation/git-index-pack.txt b/third_party/git/Documentation/git-index-pack.txt index d5b7560bfe..af0c26232c 100644 --- a/third_party/git/Documentation/git-index-pack.txt +++ b/third_party/git/Documentation/git-index-pack.txt @@ -93,11 +93,21 @@ OPTIONS --max-input-size=<size>:: Die, if the pack is larger than <size>. +--object-format=<hash-algorithm>:: + Specify the given object format (hash algorithm) for the pack. The valid + values are 'sha1' and (if enabled) 'sha256'. The default is the algorithm for + the current repository (set by `extensions.objectFormat`), or 'sha1' if no + value is set or outside a repository. ++ +This option cannot be used with --stdin. ++ +include::object-format-disclaimer.txt[] + NOTES ----- -Once the index has been created, the list of object names is sorted -and the SHA-1 hash of that list is printed to stdout. If --stdin was +Once the index has been created, the hash that goes into the name of +the pack/idx file is printed to stdout. If --stdin was also used then this is prefixed by either "pack\t", or "keep\t" if a new .keep file was successfully created. This is useful to remove a .keep file used as a lock to prevent the race with 'git repack' diff --git a/third_party/git/Documentation/git-init.txt b/third_party/git/Documentation/git-init.txt index 32880aafb0..59ecda6c17 100644 --- a/third_party/git/Documentation/git-init.txt +++ b/third_party/git/Documentation/git-init.txt @@ -10,7 +10,8 @@ SYNOPSIS -------- [verse] 'git init' [-q | --quiet] [--bare] [--template=<template_directory>] - [--separate-git-dir <git dir>] + [--separate-git-dir <git dir>] [--object-format=<format>] + [-b <branch-name> | --initial-branch=<branch-name>] [--shared[=<permissions>]] [directory] @@ -48,6 +49,13 @@ Only print error and warning messages; all other output will be suppressed. Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory. +--object-format=<format>:: + +Specify the given object format (hash algorithm) for the repository. The valid +values are 'sha1' and (if enabled) 'sha256'. 'sha1' is the default. ++ +include::object-format-disclaimer.txt[] + --template=<template_directory>:: Specify the directory from which templates will be used. (See the "TEMPLATE @@ -62,6 +70,12 @@ repository. + If this is reinitialization, the repository will be moved to the specified path. +-b <branch-name>:: +--initial-branch=<branch-name>:: + +Use the specified name for the initial branch in the newly created repository. +If not specified, fall back to the default name: `master`. + --shared[=(false|true|umask|group|all|world|everybody|0xxx)]:: Specify that the Git repository is to be shared amongst several users. This diff --git a/third_party/git/Documentation/git-log.txt b/third_party/git/Documentation/git-log.txt index b406bc4c48..2b8ac5ff88 100644 --- a/third_party/git/Documentation/git-log.txt +++ b/third_party/git/Documentation/git-log.txt @@ -15,9 +15,12 @@ DESCRIPTION ----------- Shows the commit logs. -The command takes options applicable to the `git rev-list` +:git-log: 1 +include::rev-list-description.txt[] + +The command takes options applicable to the linkgit:git-rev-list[1] command to control what is shown and how, and options applicable to -the `git diff-*` commands to control how the changes +the linkgit:git-diff[1] command to control how the changes each commit introduces are shown. @@ -43,12 +46,16 @@ OPTIONS If no `--decorate-refs` is given, pretend as if all refs were included. For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it - doesn't match any of the patterns given to `--decorate-refs`. + doesn't match any of the patterns given to `--decorate-refs`. The + `log.excludeDecoration` config option allows excluding refs from + the decorations, but an explicit `--decorate-refs` pattern will + override a match in `log.excludeDecoration`. --source:: Print out the ref name given on the command line by which each commit was reached. +--[no-]mailmap:: --[no-]use-mailmap:: Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See @@ -76,8 +83,12 @@ 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. - You can specify this option more than once. + 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. + include::line-range-format.txt[] @@ -103,8 +114,51 @@ include::rev-list-options.txt[] include::pretty-formats.txt[] -COMMON DIFF OPTIONS -------------------- +DIFF FORMATTING +--------------- + +By default, `git log` does not generate any diff output. The options +below can be used to show the changes made by each commit. + +Note that unless one of `-c`, `--cc`, or `-m` is given, merge commits +will never show a diff, even if a diff format like `--patch` is +selected, nor will they match search options like `-S`. The exception is +when `--first-parent` is in use, in which merges are treated like normal +single-parent commits (this can be overridden by providing a +combined-diff option or with `--no-diff-merges`). + +-c:: + With this option, diff output for a merge commit + shows the differences from each of the parents to the merge result + simultaneously instead of showing pairwise diff between a parent + and the result one at a time. Furthermore, it lists only files + which were modified from all parents. + +--cc:: + This flag implies the `-c` option and further compresses the + patch output by omitting uninteresting hunks whose contents in + the parents have only two variants and the merge result picks + one of them without modification. + +--combined-all-paths:: + This flag causes combined diffs (used for merge commits) to + list the name of the file from all parents. It thus only has + effect when -c or --cc are specified, and is likely only + useful if filename changes are detected (i.e. when either + rename or copy detection have been requested). + +-m:: + This flag makes the merge commits show the full diff like + regular commits; for each merge parent, a separate log entry + and diff is generated. An exception is that only diff against + the first parent is shown when `--first-parent` option is given; + in that case, the output represents the changes the merge + brought _into_ the then-current branch. + +--diff-merges=off:: +--no-diff-merges:: + Disable output of diffs for merge commits (default). Useful to + override `-m`, `-c`, or `--cc`. :git-log: 1 include::diff-options.txt[] diff --git a/third_party/git/Documentation/git-ls-files.txt b/third_party/git/Documentation/git-ls-files.txt index 8461c0e83e..3cb2ebb438 100644 --- a/third_party/git/Documentation/git-ls-files.txt +++ b/third_party/git/Documentation/git-ls-files.txt @@ -148,7 +148,7 @@ a space) at the start of each line: top directory. --recurse-submodules:: - Recursively calls ls-files on each submodule in the repository. + Recursively calls ls-files on each active submodule in the repository. Currently there is only support for the --cached mode. --abbrev[=<n>]:: diff --git a/third_party/git/Documentation/git-ls-remote.txt b/third_party/git/Documentation/git-ls-remote.txt index 0b057cbb10..492e573856 100644 --- a/third_party/git/Documentation/git-ls-remote.txt +++ b/third_party/git/Documentation/git-ls-remote.txt @@ -28,7 +28,9 @@ 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. + displayed. Note that `git ls-remote -h` used without + anything else on the command line gives help, consistent + with other git subcommands. --refs:: Do not show peeled tags or pseudorefs like `HEAD` in the output. @@ -92,21 +94,23 @@ 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 seen rc +5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master +c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/seen +$ 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-mailinfo.txt b/third_party/git/Documentation/git-mailinfo.txt index 3bbc731f67..7a6aed0e30 100644 --- a/third_party/git/Documentation/git-mailinfo.txt +++ b/third_party/git/Documentation/git-mailinfo.txt @@ -72,10 +72,9 @@ conversion, even with this flag. is useful in order to associate commits with mailing list discussions. --scissors:: - Remove everything in body before a scissors line. A line that - mainly consists of scissors (either ">8" or "8<") and perforation - (dash "-") marks is called a scissors line, and is used to request - the reader to cut the message at that line. If such a line + Remove everything in body before a scissors line (e.g. "-- >8 --"). + The line represents scissors and perforation marks, and is used to + request the reader to cut the message at that line. If that line appears in the body of the message before the patch, everything before it (including the scissors line itself) is ignored when this option is used. diff --git a/third_party/git/Documentation/git-maintenance.txt b/third_party/git/Documentation/git-maintenance.txt new file mode 100644 index 0000000000..6abcb8255a --- /dev/null +++ b/third_party/git/Documentation/git-maintenance.txt @@ -0,0 +1,79 @@ +git-maintenance(1) +================== + +NAME +---- +git-maintenance - Run tasks to optimize Git repository data + + +SYNOPSIS +-------- +[verse] +'git maintenance' run [<options>] + + +DESCRIPTION +----------- +Run tasks to optimize Git repository data, speeding up other Git commands +and reducing storage requirements for the repository. + +Git commands that add repository data, such as `git add` or `git fetch`, +are optimized for a responsive user experience. These commands do not take +time to optimize the Git data, since such optimizations scale with the full +size of the repository while these user commands each perform a relatively +small action. + +The `git maintenance` command provides flexibility for how to optimize the +Git repository. + +SUBCOMMANDS +----------- + +run:: + Run one or more maintenance tasks. If one or more `--task` options + are specified, then those tasks are run in that order. Otherwise, + the tasks are determined by which `maintenance.<task>.enabled` + config options are true. By default, only `maintenance.gc.enabled` + is true. + +TASKS +----- + +commit-graph:: + The `commit-graph` job updates the `commit-graph` files incrementally, + then verifies that the written data is correct. The incremental + write is safe to run alongside concurrent Git processes since it + will not expire `.graph` files that were in the previous + `commit-graph-chain` file. They will be deleted by a later run based + on the expiration delay. + +gc:: + Clean up unnecessary files and optimize the local repository. "GC" + stands for "garbage collection," but this task performs many + smaller tasks. This task can be expensive for large repositories, + as it repacks all Git objects into a single pack-file. It can also + be disruptive in some situations, as it deletes stale data. See + linkgit:git-gc[1] for more details on garbage collection in Git. + +OPTIONS +------- +--auto:: + When combined with the `run` subcommand, run maintenance tasks + only if certain thresholds are met. For example, the `gc` task + runs when the number of loose objects exceeds the number stored + in the `gc.auto` config setting, or when the number of pack-files + exceeds the `gc.autoPackLimit` config setting. + +--quiet:: + Do not report progress or other information over `stderr`. + +--task=<task>:: + If this option is specified one or more times, then only run the + specified tasks in the specified order. If no `--task=<task>` + arguments are specified, then only the tasks with + `maintenance.<task>.enabled` configured as `true` are considered. + See the 'TASKS' section for the list of accepted `<task>` values. + +GIT +--- +Part of the linkgit:git[1] suite diff --git a/third_party/git/Documentation/git-merge-base.txt b/third_party/git/Documentation/git-merge-base.txt index 261d5c1164..2d944e0851 100644 --- a/third_party/git/Documentation/git-merge-base.txt +++ b/third_party/git/Documentation/git-merge-base.txt @@ -80,9 +80,11 @@ 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'. @@ -90,21 +92,25 @@ 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, @@ -116,11 +122,13 @@ 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, @@ -131,18 +139,22 @@ 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. @@ -154,13 +166,15 @@ 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 @@ -193,13 +207,15 @@ 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 02676fb391..2ab84a91e5 100644 --- a/third_party/git/Documentation/git-merge-index.txt +++ b/third_party/git/Documentation/git-merge-index.txt @@ -54,20 +54,24 @@ 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 01fd52dc70..3819fadac1 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] - [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] + [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]allow-unrelated-histories] [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...] 'git merge' (--continue | --abort | --quit) @@ -94,7 +94,8 @@ will be appended to the specified message. --abort:: Abort the current conflict resolution process, and - try to reconstruct the pre-merge state. + try to reconstruct the pre-merge state. If an autostash entry is + present, apply it to the worktree. + If there were uncommitted worktree changes present when the merge started, 'git merge --abort' will in some cases be unable to @@ -102,11 +103,15 @@ reconstruct these changes. It is therefore recommended to always commit or stash your changes before running 'git merge'. + 'git merge --abort' is equivalent to 'git reset --merge' when -`MERGE_HEAD` is present. +`MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in +which case 'git merge --abort' applies the stash entry to the worktree +whereas 'git reset --merge' will save the stashed changes in the stash +list. --quit:: Forget about the current merge in progress. Leave the index - and the working tree as-is. + and the working tree as-is. If `MERGE_AUTOSTASH` is present, the + stash entry will be saved to the stash list. --continue:: After a 'git merge' stops due to conflicts you can conclude the diff --git a/third_party/git/Documentation/git-multi-pack-index.txt b/third_party/git/Documentation/git-multi-pack-index.txt index 233b2b7862..eb0caa0439 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>] <subcommand> +'git multi-pack-index' [--object-dir=<dir>] [--[no-]progress] <subcommand> DESCRIPTION ----------- @@ -23,6 +23,10 @@ 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:: @@ -47,11 +51,15 @@ repack:: multi-pack-index, then divide by the total number of objects in the pack and multiply by the pack size. We select packs with expected size below the batch size until the set of packs have - total expected size at least the batch size. If the total size - does not reach the batch size, then do nothing. If a new pack- - file is created, rewrite the multi-pack-index to reference the - new pack-file. A later run of 'git multi-pack-index expire' will - delete the pack-files that were part of this batch. + total expected size at least the batch size, or all pack-files + are considered. If only one pack-file is selected, then do + nothing. If a new pack-file is created, rewrite the + multi-pack-index to reference the new pack-file. A later run of + 'git multi-pack-index expire' will delete the pack-files that + were part of this batch. ++ +If `repack.packKeptObjects` is `false`, then any pack-files with an +associated `.keep` file will not be selected for the batch to repack. EXAMPLES diff --git a/third_party/git/Documentation/git-notes.txt b/third_party/git/Documentation/git-notes.txt index f56a5a9197..0a4200674c 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. - Abort if the second object already has notes, or if the first + 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 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>` @@ -223,7 +223,7 @@ are taken from notes refs. A notes ref is usually a branch which contains "files" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form -'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence of directory +'bf'`/`'fe'`/`'30'`/`'...'`/`'680d5a...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]. diff --git a/third_party/git/Documentation/git-p4.txt b/third_party/git/Documentation/git-p4.txt index 3494a1db3e..dab9609013 100644 --- a/third_party/git/Documentation/git-p4.txt +++ b/third_party/git/Documentation/git-p4.txt @@ -374,14 +374,55 @@ These options can be used to modify 'git p4 submit' behavior. been submitted. Implies --disable-rebase. Can also be set with git-p4.disableP4Sync. Sync with origin/master still goes ahead if possible. -Hook for submit -~~~~~~~~~~~~~~~ +Hooks for submit +---------------- + +p4-pre-submit +~~~~~~~~~~~~~ + The `p4-pre-submit` hook is executed if it exists and is executable. The hook takes no parameters and nothing from standard input. Exiting with non-zero status from this script prevents `git-p4 submit` from launching. +It can be bypassed with the `--no-verify` command line option. One usage scenario is to run unit tests in the hook. +p4-prepare-changelist +~~~~~~~~~~~~~~~~~~~~~ + +The `p4-prepare-changelist` hook is executed right after preparing +the default changelist message and before the editor is started. +It takes one parameter, the name of the file that contains the +changelist text. Exiting with a non-zero status from the script +will abort the process. + +The purpose of the hook is to edit the message file in place, +and it is not supressed by the `--no-verify` option. This hook +is called even if `--prepare-p4-only` is set. + +p4-changelist +~~~~~~~~~~~~~ + +The `p4-changelist` hook is executed after the changelist +message has been edited by the user. It can be bypassed with the +`--no-verify` option. It takes a single parameter, the name +of the file that holds the proposed changelist text. Exiting +with a non-zero status causes the command to abort. + +The hook is allowed to edit the changelist file and can be used +to normalize the text into some project standard format. It can +also be used to refuse the Submit after inspect the message file. + +p4-post-changelist +~~~~~~~~~~~~~~~~~~ + +The `p4-post-changelist` hook is invoked after the submit has +successfully occured in P4. It takes no parameters and is meant +primarily for notification and cannot affect the outcome of the +git p4 submit action. + + + Rebase options ~~~~~~~~~~~~~~ These options can be used to modify 'git p4 rebase' behavior. diff --git a/third_party/git/Documentation/git-pack-objects.txt b/third_party/git/Documentation/git-pack-objects.txt index fecdf2600c..54d715ead1 100644 --- a/third_party/git/Documentation/git-pack-objects.txt +++ b/third_party/git/Documentation/git-pack-objects.txt @@ -14,7 +14,7 @@ SYNOPSIS [--local] [--incremental] [--window=<n>] [--depth=<n>] [--revs [--unpacked | --all]] [--keep-pack=<pack-name>] [--stdout [--filter=<filter-spec>] | base-name] - [--shallow] [--keep-true-parents] [--sparse] < object-list + [--shallow] [--keep-true-parents] [--[no-]sparse] < object-list DESCRIPTION @@ -196,14 +196,16 @@ depth is 4095. Add --no-reuse-object if you want to force a uniform compression level on all data no matter the source. ---sparse:: - Use the "sparse" algorithm to determine which objects to include in +--[no-]sparse:: + Toggle the "sparse" algorithm to determine which objects to include in the pack, when combined with the "--revs" option. This algorithm only walks trees that appear in paths that introduce new 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. + certain types of direct renames. If this option is not included, + it defaults to the value of `pack.useSparse`, which is true unless + otherwise specified. --thin:: Create a "thin" pack by omitting the common objects between a @@ -268,15 +270,18 @@ So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle. This option specifies how missing objects are handled. + The form '--missing=error' requests that pack-objects stop with an error if -a missing object is encountered. This is the default action. +a missing object is encountered. If the repository is a partial clone, an +attempt to fetch missing objects will be made before declaring them missing. +This is the default action. + The form '--missing=allow-any' will allow object traversal to continue -if a missing object is encountered. Missing objects will silently be -omitted from the results. +if a missing object is encountered. No fetch of a missing object will occur. +Missing objects will silently be omitted from the results. + The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. -Unexpected missing object will raise an error. +No fetch of a missing object will occur. An unexpected missing object will +raise an error. --exclude-promisor-objects:: Omit objects that are known to be in the promisor remote. (This diff --git a/third_party/git/Documentation/git-pull.txt b/third_party/git/Documentation/git-pull.txt index dfb901f8b8..5c3fb67c01 100644 --- a/third_party/git/Documentation/git-pull.txt +++ b/third_party/git/Documentation/git-pull.txt @@ -85,8 +85,9 @@ OPTIONS Pass --verbose to git-fetch and git-merge. --[no-]recurse-submodules[=yes|on-demand|no]:: - This option controls if new commits of all populated submodules should - be fetched and updated, too (see linkgit:git-config[1] and + This option controls if new commits of populated submodules should + be fetched, and if the working trees of active submodules should be + updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and linkgit:gitmodules[5]). + If the checkout is done via rebase, local submodule commits are rebased as well. @@ -133,15 +134,6 @@ unless you have read linkgit:git-rebase[1] carefully. --no-rebase:: Override earlier --rebase. ---autostash:: ---no-autostash:: - Before starting rebase, stash local modifications away (see - linkgit:git-stash[1]) if needed, and apply the stash entry when - done. `--no-autostash` is useful to override the `rebase.autoStash` - configuration variable (see linkgit:git-config[1]). -+ -This option is only valid when "--rebase" is used. - Options related to fetching ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -229,9 +221,9 @@ branch.<name>.merge options; see linkgit:git-config[1] for details. $ git pull origin next ------------------------------------------------ + -This leaves a copy of `next` temporarily in FETCH_HEAD, but -does not update any remote-tracking branches. Using remote-tracking -branches, the same can be done by invoking fetch and merge: +This leaves a copy of `next` temporarily in FETCH_HEAD, and +updates the remote-tracking branch `origin/next`. +The same can be done by invoking fetch and merge: + ------------------------------------------------ $ git fetch origin diff --git a/third_party/git/Documentation/git-range-diff.txt b/third_party/git/Documentation/git-range-diff.txt index 8a6ea2c6c5..9701c1e5fd 100644 --- a/third_party/git/Documentation/git-range-diff.txt +++ b/third_party/git/Documentation/git-range-diff.txt @@ -57,6 +57,10 @@ 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>`. @@ -75,7 +79,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 the +corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches. OUTPUT STABILITY @@ -242,7 +246,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 assigment between n and m diffs. Git +needed to compute the least-cost assignment 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 d271842608..5fa8bab64c 100644 --- a/third_party/git/Documentation/git-read-tree.txt +++ b/third_party/git/Documentation/git-read-tree.txt @@ -116,9 +116,9 @@ OPTIONS located in. --[no-]recurse-submodules:: - Using --recurse-submodules will update the content of all initialized + Using --recurse-submodules will update the content of all active submodules according to the commit recorded in the superproject by - calling read-tree recursively, also setting the submodules HEAD to be + calling read-tree recursively, also setting the submodules' HEAD to be detached at that commit. --no-sparse-checkout:: @@ -436,7 +436,7 @@ support. SEE ALSO -------- linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; -linkgit:gitignore[5] +linkgit:gitignore[5]; linkgit:git-sparse-checkout[1]; GIT --- diff --git a/third_party/git/Documentation/git-rebase.txt b/third_party/git/Documentation/git-rebase.txt index 6156609cf7..38e15488f6 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>] - [<upstream> [<branch>]] +'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] + [--onto <newbase> | --keep-base] [<upstream> [<branch>]] 'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>] --root [<branch>] 'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch) @@ -204,6 +204,7 @@ CONFIGURATION ------------- include::config/rebase.txt[] +include::config/sequencer.txt[] OPTIONS ------- @@ -217,6 +218,24 @@ 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 @@ -238,18 +257,79 @@ leave out at most one of A and B, in which case it defaults to HEAD. --quit:: Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left - unchanged as a result. + unchanged as a result. If a temporary stash entry was created + using --autostash, it will be saved to the stash list. + +--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 (unless --no-keep-empty +is specified), and commits which are clean cherry-picks (as determined +by `git log --cherry-mark ...`) are detected and dropped as a +preliminary step (unless --reapply-cherry-picks is passed). ++ +See also INCOMPATIBLE OPTIONS below. + +--no-keep-empty:: --keep-empty:: - Keep the commits that do not change anything from its - parents in the result. + Do not keep commits that start empty before the rebase + (i.e. that do not change anything from its parent) in the + result. The default is to keep commits which start empty, + since creating such commits requires passing the --allow-empty + override flag to `git commit`, signifying that a user is very + intentionally creating such a commit and thus wants to keep + it. ++ +Usage of this flag will probably be rare, since you can get rid of +commits that start empty by just firing up an interactive rebase and +removing the lines corresponding to the commits you don't want. This +flag exists as a convenient shortcut, such as for cases where external +tools generate many empty commits and you want them all removed. ++ +For commits which do not start empty but become empty after rebasing, +see the --empty flag. ++ +See also INCOMPATIBLE OPTIONS below. + +--reapply-cherry-picks:: +--no-reapply-cherry-picks:: + Reapply all clean cherry-picks of any upstream commit instead + of preemptively dropping them. (If these commits then become + empty after rebasing, because they contain a subset of already + upstream changes, the behavior towards them is controlled by + the `--empty` flag.) ++ +By default (or if `--no-reapply-cherry-picks` is given), these commits +will be automatically dropped. Because this necessitates reading all +upstream commits, this can be expensive in repos with a large number +of upstream commits that need to be read. ++ +`--reapply-cherry-picks` allows rebase to forgo reading all upstream +commits, potentially improving performance. + See also INCOMPATIBLE OPTIONS below. --allow-empty-message:: - By default, rebasing commits with an empty message will fail. - This option overrides that behavior, allowing commits with empty - messages to be rebased. + 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. + See also INCOMPATIBLE OPTIONS below. @@ -268,7 +348,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. + upstream side. This is the default. + 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 @@ -307,9 +387,12 @@ See also INCOMPATIBLE OPTIONS below. -S[<keyid>]:: --gpg-sign[=<keyid>]:: +--no-gpg-sign:: GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be - stuck to the option without a space. + stuck to the option without a space. `--no-gpg-sign` is useful to + countermand both `commit.gpgSign` configuration variable, and + earlier `--gpg-sign`. -q:: --quiet:: @@ -338,7 +421,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. + ever ignored. Implies --apply. + See also INCOMPATIBLE OPTIONS below. @@ -367,20 +450,48 @@ When --fork-point is active, 'fork_point' will be used instead of <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' 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 <upstream> 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. ++ +See also INCOMPATIBLE OPTIONS below. --ignore-whitespace:: + Ignore whitespace differences when trying to reconcile +differences. Currently, each backend implements an approximation of +this behavior: ++ +apply backend: When applying a patch, ignore changes in whitespace in +context lines. Unfortunately, this means that if the "old" lines being +replaced by the patch differ only in whitespace from the existing +file, you will get a merge conflict instead of a successful patch +application. ++ +merge backend: Treat lines with only whitespace changes as unchanged +when merging. Unfortunately, this means that any patch hunks that were +intended to modify whitespace and nothing else will be dropped, even +if the other side had no changes that conflicted. + --whitespace=<option>:: - These flag are passed to the 'git apply' program + This flag is passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. + Implies --apply. + See also INCOMPATIBLE OPTIONS below. --committer-date-is-author-date:: + Instead of using the current time as the committer date, use + the author date of the commit being rebased as the committer + date. This option implies `--force-rebase`. + --ignore-date:: - These flags are passed to 'git am' to easily change the dates - of the rebased commits (see linkgit:git-am[1]). +--reset-author-date:: + Instead of using the author date of the original commit, use + the current time as the author date of the rebased commit. This + option implies `--force-rebase`. + See also INCOMPATIBLE OPTIONS below. @@ -421,8 +532,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 in contrast to that option works well in interactive -rebases: commits can be reordered, inserted and dropped at will. +`--preserve-merges` but works with interactive rebases, +where 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 @@ -517,10 +628,8 @@ INCOMPATIBLE OPTIONS The following options: - * --committer-date-is-author-date - * --ignore-date + * --apply * --whitespace - * --ignore-whitespace * -C are incompatible with the following options: @@ -534,7 +643,9 @@ are incompatible with the following options: * --preserve-merges * --interactive * --exec - * --keep-empty + * --no-keep-empty + * --empty= + * --reapply-cherry-picks * --edit-todo * --root when used in combination with --onto @@ -543,33 +654,152 @@ In addition, the following pairs of options are incompatible: * --preserve-merges and --interactive * --preserve-merges and --signoff * --preserve-merges and --rebase-merges - * --rebase-merges and --strategy - * --rebase-merges and --strategy-option + * --preserve-merges and --empty= + * --preserve-merges and --ignore-whitespace + * --preserve-merges and --committer-date-is-author-date + * --preserve-merges and --ignore-date + * --keep-base and --onto + * --keep-base and --root + * --fork-point and --root BEHAVIORAL DIFFERENCES ----------------------- -There are some subtle differences how the backends behave. +git rebase has two primary backends: apply and merge. (The apply +backend used to be 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: Empty commits ~~~~~~~~~~~~~ -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 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 merge backend keeps intentionally empty commits by default (though +with -i they are marked as empty in the todo list editor, or they can +be dropped automatically with --no-keep-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. +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. Directory rename detection ~~~~~~~~~~~~~~~~~~~~~~~~~~ -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. +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. Both have called the post-checkout hook, +though the merge backend has squelched its output. Further, both +backends only call the post-checkout hook with the starting point +commit of the rebase, not the intermediate commits nor the final +commit. In each case, the calling of these hooks was by accident of +implementation rather than by design (both backends were originally +implemented as shell scripts and happened to invoke other commands +like 'git checkout' or 'git commit' that would call the hooks). Both +backends should have the same behavior, though it is not entirely +clear which, if any, is correct. We will likely make rebase stop +calling either of these hooks in the future. + +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/ include::merge-strategies.txt[] @@ -832,7 +1062,8 @@ 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 - `filter-branch`. + a full history rewriting command like + https://github.com/newren/git-filter-repo[`filter-repo`]. The easy case @@ -843,7 +1074,8 @@ Only works if the changes (patch IDs based on the diff contents) on 'subsystem' did. In that case, the fix is easy because 'git rebase' knows to skip -changes that are already present in the new upstream. So if you say +changes that are already present in the new upstream (unless +`--reapply-cherry-picks` is given). So if you say (assuming you're on 'topic') ------------ $ git rebase subsystem @@ -870,7 +1102,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 dedf97efbb..25702ed730 100644 --- a/third_party/git/Documentation/git-receive-pack.txt +++ b/third_party/git/Documentation/git-receive-pack.txt @@ -165,29 +165,31 @@ 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 - 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 +---- +#!/bin/sh +# mail out commit update information. +while read oval nval ref +do + if expr "$oval" : '0*$' >/dev/null 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 "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 +---- The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message. @@ -212,8 +214,10 @@ 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-remote.txt b/third_party/git/Documentation/git-remote.txt index 9659abbf8e..ea73386c81 100644 --- a/third_party/git/Documentation/git-remote.txt +++ b/third_party/git/Documentation/git-remote.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git remote' [-v | --verbose] -'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url> +'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url> 'git remote rename' <old> <new> 'git remote remove' <name> 'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>) @@ -35,7 +35,7 @@ OPTIONS -v:: --verbose:: Be a little more verbose and show remote url after name. - NOTE: This must be placed between `remote` and `subcommand`. + NOTE: This must be placed between `remote` and subcommand. COMMANDS @@ -46,7 +46,7 @@ subcommands are available to perform operations on the remotes. 'add':: -Adds a remote named <name> for the repository at +Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>. + @@ -109,13 +109,13 @@ With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted. + With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote -`HEAD` is pointed at `next`, "`git remote set-head origin -a`" will set +`HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first. + -Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., "git -remote set-head origin master" will set the symbolic-ref `refs/remotes/origin/HEAD` to +Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git +remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first. + @@ -127,7 +127,7 @@ This can be used to track a subset of the available remote branches after the initial setup for a remote. + The named branches will be interpreted as if specified with the -`-t` option on the 'git remote add' command line. +`-t` option on the `git remote add` command line. + With `--add`, instead of replacing the list of currently tracked branches, adds to that list. @@ -181,16 +181,16 @@ fetch --prune <name>`, except that no new references will be fetched. See the PRUNING section of linkgit:git-fetch[1] for what it'll prune depending on various configuration. + -With `--dry-run` option, report what branches will be pruned, but do not +With `--dry-run` option, report what branches would be pruned, but do not actually prune them. 'update':: Fetch updates for remotes or remote groups in the repository as defined by -remotes.<group>. If neither group nor remote is specified on the command line, +`remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the -configuration parameter remote.<name>.skipDefaultUpdate set to true will +configuration parameter `remote.<name>.skipDefaultUpdate` set to true will be updated. (See linkgit:git-config[1]). + With `--prune` option, run pruning against all the remotes that are updated. diff --git a/third_party/git/Documentation/git-replace.txt b/third_party/git/Documentation/git-replace.txt index 246dc9943c..f271d758c3 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-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 +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 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 97e0544d9e..252e2d4e47 100644 --- a/third_party/git/Documentation/git-reset.txt +++ b/third_party/git/Documentation/git-reset.txt @@ -8,34 +8,36 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- [verse] -'git reset' [-q] [<tree-ish>] [--] <paths>... -'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...] +'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' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>] DESCRIPTION ----------- -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>`, +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>`, optionally modifying index and working tree to match. The `<tree-ish>`/`<commit>` defaults to `HEAD` in all forms. -'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.) +'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.) + -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>...`. +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>...`. + -After running `git reset <paths>` to update the index entry, you can +After running `git reset <pathspec>` 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>] [--] [<paths>...]:: +'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]:: 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. @@ -85,6 +87,12 @@ but carries forward unmerged index entries. different between `<commit>` and `HEAD`. If a file that is different between `<commit>` and `HEAD` has local changes, reset is aborted. + +--[no-]recurse-submodules:: + When the working tree is updated, using --recurse-submodules will + also recursively reset the working tree of all active submodules + according to the commit recorded in the superproject, also setting + the submodules' HEAD to be detached at that commit. -- See "Reset, restore and revert" in linkgit:git[1] for the differences @@ -101,6 +109,26 @@ 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 1ab2e40ea9..84c6c40010 100644 --- a/third_party/git/Documentation/git-restore.txt +++ b/third_party/git/Documentation/git-restore.txt @@ -8,8 +8,9 @@ git-restore - Restore working tree files SYNOPSIS -------- [verse] -'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] <pathspec>... -'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [<pathspec>...] +'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>...] DESCRIPTION ----------- @@ -21,9 +22,8 @@ The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`. -By default, the restore sources for working tree and the index are the -index and `HEAD` respectively. `--source` could be used to specify a -commit as the restore source. +By default, if `--staged` is given, the contents are restored from `HEAD`, +otherwise from the index. Use `--source` to restore from a different commit. See "Reset, restore and revert" in linkgit:git[1] for the differences between the three commands. @@ -38,10 +38,8 @@ OPTIONS tree. It is common to specify the source tree by naming a commit, branch or tag associated with it. + -If not specified, the default restore source for the working tree is -the index, and the default restore source for the index is -`HEAD`. When both `--staged` and `--worktree` are specified, -`--source` must also be specified. +If not specified, the contents are restored from `HEAD` if `--staged` is +given, otherwise from the index. -p:: --patch:: @@ -106,6 +104,17 @@ in linkgit:git-checkout[1] for details. patterns and unconditionally restores any files in `<pathspec>`. +--recurse-submodules:: +--no-recurse-submodules:: + If `<pathspec>` names an active submodule and the restore location + includes the working tree, the submodule will only be updated if + this option is given, in which case its working tree will be + restored to the commit recorded in the superproject, and any local + modifications overwritten. If nothing (or + `--no-recurse-submodules`) is used, submodules working trees will + not be updated. Just like linkgit:git-checkout[1], this will detach + `HEAD` of the submodule. + --overlay:: --no-overlay:: In overlay mode, the command never removes files when @@ -113,6 +122,27 @@ 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 9392760b25..5da66232dc 100644 --- a/third_party/git/Documentation/git-rev-list.txt +++ b/third_party/git/Documentation/git-rev-list.txt @@ -9,101 +9,13 @@ git-rev-list - Lists commit objects in reverse chronological order SYNOPSIS -------- [verse] -'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>... ] +'git rev-list' [<options>] <commit>... [[--] <path>...] DESCRIPTION ----------- -List commits that are reachable by following the `parent` links from the -given commit(s), but exclude commits that are reachable from the one(s) -given with a '{caret}' in front of them. The output is given in reverse -chronological order by default. - -You can think of this as a set operation. Commits given on the command -line form a set of commits that are reachable from any of them, and then -commits reachable from any of the ones given with '{caret}' in front are -subtracted from that set. The remaining commits are what comes out in the -command's output. Various other options and paths parameters can be used -to further limit the result. - -Thus, the following command: - ------------------------------------------------------------------------ - $ git rev-list foo bar ^baz ------------------------------------------------------------------------ - -means "list all the commits which are reachable from 'foo' or 'bar', but -not from 'baz'". - -A special notation "'<commit1>'..'<commit2>'" can be used as a -short-hand for "{caret}'<commit1>' '<commit2>'". For example, either of -the following may be used interchangeably: - ------------------------------------------------------------------------ - $ git rev-list origin..HEAD - $ git rev-list HEAD ^origin ------------------------------------------------------------------------ - -Another special notation is "'<commit1>'...'<commit2>'" which is useful -for merges. The resulting set of commits is the symmetric difference -between the two operands. The following two commands are equivalent: - ------------------------------------------------------------------------ - $ git rev-list A B --not $(git merge-base --all A B) - $ git rev-list A...B ------------------------------------------------------------------------ +:git-rev-list: 1 +include::rev-list-description.txt[] 'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For diff --git a/third_party/git/Documentation/git-rev-parse.txt b/third_party/git/Documentation/git-rev-parse.txt index e72d332b83..19b12b6d43 100644 --- a/third_party/git/Documentation/git-rev-parse.txt +++ b/third_party/git/Documentation/git-rev-parse.txt @@ -262,7 +262,8 @@ print a message to stderr and exit with nonzero status. directory. --show-toplevel:: - Show the absolute path of the top-level directory. + Show the absolute path of the top-level directory of the working + tree. If there is no working tree, report an error. --show-superproject-working-tree:: Show the absolute path of the root of the superproject's @@ -274,6 +275,13 @@ 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-revert.txt b/third_party/git/Documentation/git-revert.txt index 9d22270757..044276e9da 100644 --- a/third_party/git/Documentation/git-revert.txt +++ b/third_party/git/Documentation/git-revert.txt @@ -90,9 +90,12 @@ effect to your index in a row. -S[<keyid>]:: --gpg-sign[=<keyid>]:: +--no-gpg-sign:: GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be - stuck to the option without a space. + stuck to the option without a space. `--no-gpg-sign` is useful to + countermand both `commit.gpgSign` configuration variable, and + earlier `--gpg-sign`. -s:: --signoff:: diff --git a/third_party/git/Documentation/git-rm.txt b/third_party/git/Documentation/git-rm.txt index b5c46223c4..ab750367fd 100644 --- a/third_party/git/Documentation/git-rm.txt +++ b/third_party/git/Documentation/git-rm.txt @@ -8,16 +8,18 @@ git-rm - Remove files from the working tree and from the index SYNOPSIS -------- [verse] -'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>... +'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] + [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]] + [--] [<pathspec>...] DESCRIPTION ----------- -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, +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, 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, @@ -26,15 +28,20 @@ allowing the file to be removed from just the index. OPTIONS ------- -<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. +<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]. -f:: --force:: @@ -68,19 +75,19 @@ OPTIONS `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`. -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. +--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). -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 d93e5d0f58..0a69810147 100644 --- a/third_party/git/Documentation/git-send-email.txt +++ b/third_party/git/Documentation/git-send-email.txt @@ -486,11 +486,13 @@ 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 bc80905a8a..fd93cd41e9 100644 --- a/third_party/git/Documentation/git-shortlog.txt +++ b/third_party/git/Documentation/git-shortlog.txt @@ -47,9 +47,38 @@ OPTIONS Each pretty-printed commit will be rewrapped before it is shown. +--group=<type>:: + Group commits based on `<type>`. If no `--group` option is + specified, the default is `author`. `<type>` is one of: ++ +-- + - `author`, commits are grouped by author + - `committer`, commits are grouped by committer (the same as `-c`) + - `trailer:<field>`, the `<field>` is interpreted as a case-insensitive + commit message trailer (see linkgit:git-interpret-trailers[1]). For + example, if your project uses `Reviewed-by` trailers, you might want + to see who has been reviewing with + `git shortlog -ns --group=trailer:reviewed-by`. ++ +Note that commits that do not include the trailer will not be counted. +Likewise, commits with multiple trailers (e.g., multiple signoffs) may +be counted more than once (but only once per unique trailer value in +that commit). ++ +Shortlog will attempt to parse each trailer value as a `name <email>` +identity. If successful, the mailmap is applied and the email is omitted +unless the `--email` option is specified. If the value cannot be parsed +as an identity, it will be taken literally and completely. +-- ++ +If `--group` is specified multiple times, commits are counted under each +value (but again, only once per unique value in that commit). For +example, `git shortlog --group=author --group=trailer:co-authored-by` +counts both authors and co-authors. + -c:: --committer:: - Collect and show committer identities instead of authors. + This is an alias for `--group=committer`. -w[<width>[,<indent1>[,<indent2>]]]:: Linewrap the output by wrapping each line at `width`. The first @@ -76,6 +105,9 @@ 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-show-index.txt b/third_party/git/Documentation/git-show-index.txt index 424e4ba84c..e49318a5a0 100644 --- a/third_party/git/Documentation/git-show-index.txt +++ b/third_party/git/Documentation/git-show-index.txt @@ -9,7 +9,7 @@ git-show-index - Show packed archive index SYNOPSIS -------- [verse] -'git show-index' +'git show-index' [--object-format=<hash-algorithm>] DESCRIPTION @@ -36,6 +36,17 @@ Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible. +OPTIONS +------- + +--object-format=<hash-algorithm>:: + Specify the given object format (hash algorithm) for the index file. The + valid values are 'sha1' and (if enabled) 'sha256'. The default is the + algorithm for the current repository (set by `extensions.objectFormat`), or + 'sha1' if no value is set or outside a repository.. ++ +include::object-format-disclaimer.txt[] + GIT --- Part of the linkgit:git[1] suite diff --git a/third_party/git/Documentation/git-sparse-checkout.txt b/third_party/git/Documentation/git-sparse-checkout.txt new file mode 100644 index 0000000000..a0eeaeb02e --- /dev/null +++ b/third_party/git/Documentation/git-sparse-checkout.txt @@ -0,0 +1,239 @@ +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. + +'reapply':: + Reapply the sparsity pattern rules to paths in the working tree. + Commands like merge or rebase can materialize paths to do their + work (e.g. in order to show you a conflict), and other + sparse-checkout commands might fail to sparsify an individual file + (e.g. because it has unstaged changes or conflicts). In such + cases, it can make sense to run `git sparse-checkout reapply` later + after cleaning up affected paths (e.g. resolving conflicts, undoing + or committing changes, etc.). + +'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 submodules +are populated based on interactions with the `git submodule` command. +Specifically, `git submodule init -- <path>` will ensure the submodule +at `<path>` is present, while `git submodule deinit [-f] -- <path>` +will remove the files for the submodule at `<path>` (including any +untracked files, uncommitted changes, and unpushed history). Similar +to how sparse-checkout removes files from the working tree but still +leaves entries in the index, deinitialized submodules are removed from +the working directory but still have an entry in the index. + +Since submodules may have unpushed changes or untracked files, +removing them could result in data loss. Thus, changing sparse +inclusion/exclusion rules will not cause an already checked out +submodule to be removed from the working copy. Said another way, just +as `checkout` will not cause submodules to be automatically removed or +initialized even when switching between branches that remove or add +submodules, using `sparse-checkout` to reduce or expand the scope of +"interesting" files will not cause submodules to be automatically +deinitialized or initialized either. + +Further, the above facts mean that there are multiple reasons that +"tracked" files might not be present in the working copy: sparsity +pattern application from sparse-checkout, and submodule initialization +state. Thus, commands like `git grep` that work on tracked files in +the working copy may return results that are limited by either or both +of these restrictions. + + +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 8fbe12c66c..31f1beb65b 100644 --- a/third_party/git/Documentation/git-stash.txt +++ b/third_party/git/Documentation/git-stash.txt @@ -15,6 +15,7 @@ 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>] @@ -43,10 +44,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}`). -OPTIONS -------- +COMMANDS +-------- -push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]:: +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>...]:: Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). @@ -56,39 +57,15 @@ 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 pathspecs, +are `stash -p` which acts as alias for `stash push -p` and pathspec elements, 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 pathspecs, - and any non-option arguments form the message. + differs from "stash push" in that it cannot take pathspec. + Instead, all non-option arguments are concatenated to form the stash + message. list [<options>]:: @@ -110,7 +87,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. When no `<stash>` is given, it shows the latest one. + created. 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). @@ -127,14 +104,6 @@ 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>]:: @@ -148,8 +117,7 @@ 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>`. When no `<stash>` - is given, applies the latest one. + `stash@{<revision>}`, it then drops the `<stash>`. + 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 @@ -165,9 +133,6 @@ 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:: @@ -184,6 +149,98 @@ 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 d4e8f24f0c..7731b45f07 100644 --- a/third_party/git/Documentation/git-status.txt +++ b/third_party/git/Documentation/git-status.txt @@ -59,16 +59,17 @@ 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 @@ -78,9 +79,10 @@ 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 @@ -100,11 +102,12 @@ 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 @@ -112,12 +115,13 @@ 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 0ed5c24dc1..7e5f995f77 100644 --- a/third_party/git/Documentation/git-submodule.txt +++ b/third_party/git/Documentation/git-submodule.txt @@ -16,6 +16,7 @@ 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>...] @@ -80,6 +81,9 @@ 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. + @@ -129,11 +133,12 @@ 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>] [--] [<path>...]:: +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 the registered submodules to match what the superproject -expects by cloning missing submodules and updating the working tree of +expects by cloning missing submodules, fetching missing commits +in 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 @@ -173,11 +178,17 @@ 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 ((-d|--default)|(-b|--branch <branch>)) [--] <path>:: +set-branch (-b|--branch) <branch> [--] <path>:: +set-branch (-d|--default) [--] <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'. + key, which causes the tracking branch to default to the remote 'HEAD'. + +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 @@ -218,7 +229,7 @@ As an example, the command below will show the path and currently checked out commit for each submodule: + -------------- -git submodule foreach 'echo $path `git rev-parse HEAD`' +git submodule foreach 'echo $sm_path `git rev-parse HEAD`' -------------- sync [--recursive] [--] [<path>...]:: @@ -237,7 +248,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 superprojects + move the git directory of the submodule into its superproject's `$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 @@ -273,7 +284,7 @@ OPTIONS `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the - option is not specified, it defaults to 'master'. + option is not specified, it defaults to the remote 'HEAD'. -f:: --force:: @@ -311,10 +322,10 @@ OPTIONS the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. - The remote branch used defaults to `master`, but the branch name may - be overridden by setting the `submodule.<name>.branch` option in - either `.gitmodules` or `.git/config` (with `.git/config` taking - precedence). + The remote branch used defaults to the remote `HEAD`, but the branch + name may be overridden by setting the `submodule.<name>.branch` + option in either `.gitmodules` or `.git/config` (with `.git/config` + taking precedence). + This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. @@ -419,6 +430,10 @@ 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 30711625fd..6624a14fbd 100644 --- a/third_party/git/Documentation/git-svn.txt +++ b/third_party/git/Documentation/git-svn.txt @@ -677,7 +677,8 @@ config key: svn.authorsProg -s<strategy>:: --strategy=<strategy>:: -p:: ---preserve-merges:: +--rebase-merges:: +--preserve-merges (DEPRECATED):: These are only used with the 'dcommit' and 'rebase' commands. + Passed directly to 'git rebase' when using 'dcommit' if a @@ -769,11 +770,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 -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. +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. svn.useSvmProps:: svn-remote.<name>.useSvmProps:: diff --git a/third_party/git/Documentation/git-switch.txt b/third_party/git/Documentation/git-switch.txt index 197900363b..3759c3a265 100644 --- a/third_party/git/Documentation/git-switch.txt +++ b/third_party/git/Documentation/git-switch.txt @@ -181,9 +181,9 @@ name, the guessing is aborted. You can explicitly give a name with --recurse-submodules:: --no-recurse-submodules:: Using `--recurse-submodules` will update the content of all - initialized submodules according to the commit recorded in the + active submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is - used, the work trees of submodules will not be updated. Just + used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules. diff --git a/third_party/git/Documentation/git-tag.txt b/third_party/git/Documentation/git-tag.txt index 2e5599a67f..56656d1be6 100644 --- a/third_party/git/Documentation/git-tag.txt +++ b/third_party/git/Documentation/git-tag.txt @@ -15,7 +15,7 @@ SYNOPSIS 'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>] [--points-at <object>] [--column[=<options>] | --no-column] [--create-reflog] [--sort=<key>] [--format=<format>] - [--[no-]merged [<commit>]] [<pattern>...] + [--merged <commit>] [--no-merged <commit>] [<pattern>...] 'git tag' -v [--format=<format>] <tagname>... DESCRIPTION @@ -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 oder otherwise. + configuration variable if it exists, or disabled otherwise. See linkgit:git-config[1]. --no-sign:: @@ -149,11 +149,11 @@ This option is only applicable when listing tags without annotation lines. --merged [<commit>]:: Only list tags whose commits are reachable from the specified - commit (`HEAD` if not specified), incompatible with `--no-merged`. + commit (`HEAD` if not specified). --no-merged [<commit>]:: Only list tags whose commits are not reachable from the specified - commit (`HEAD` if not specified), incompatible with `--merged`. + commit (`HEAD` if not specified). --points-at <object>:: Only list tags of the given object (HEAD if not @@ -377,6 +377,11 @@ $ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1 include::date-formats.txt[] +NOTES +----- + +include::ref-reachability-filters.txt[] + SEE ALSO -------- linkgit:git-check-ref-format[1]. diff --git a/third_party/git/Documentation/git-update-index.txt b/third_party/git/Documentation/git-update-index.txt index 1c4d146a41..1489cb09a0 100644 --- a/third_party/git/Documentation/git-update-index.txt +++ b/third_party/git/Documentation/git-update-index.txt @@ -16,6 +16,7 @@ SYNOPSIS [--chmod=(+|-)x] [--[no-]assume-unchanged] [--[no-]skip-worktree] + [--[no-]ignore-skip-worktree-entries] [--[no-]fsmonitor-valid] [--ignore-submodules] [--[no-]split-index] @@ -113,6 +114,11 @@ 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 @@ -426,7 +432,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 everytime a new split +modification time is updated to the current time every time a new split index based on the shared index file is either created or read from. UNTRACKED CACHE @@ -543,6 +549,22 @@ 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-update-ref.txt b/third_party/git/Documentation/git-update-ref.txt index 9671423117..d401234b03 100644 --- a/third_party/git/Documentation/git-update-ref.txt +++ b/third_party/git/Documentation/git-update-ref.txt @@ -66,6 +66,10 @@ performs all modifications together. Specify commands of the form: delete SP <ref> [SP <oldvalue>] LF verify SP <ref> [SP <oldvalue>] LF option SP <opt> LF + start LF + prepare LF + commit LF + abort LF With `--create-reflog`, update-ref will create a reflog for each ref even if one would not ordinarily be created. @@ -83,6 +87,10 @@ quoting: delete SP <ref> NUL [<oldvalue>] NUL verify SP <ref> NUL [<oldvalue>] NUL option SP <opt> NUL + start NUL + prepare NUL + commit NUL + abort NUL In this format, use 40 "0" to specify a zero value, and use the empty string to specify a missing value. @@ -107,13 +115,31 @@ delete:: verify:: Verify <ref> against <oldvalue> but do not change it. If - <oldvalue> zero or missing, the ref must not exist. + <oldvalue> is zero or missing, the ref must not exist. option:: Modify behavior of the next command naming a <ref>. The only valid option is `no-deref` to avoid dereferencing a symbolic ref. +start:: + Start a transaction. In contrast to a non-transactional session, a + transaction will automatically abort if the session ends without an + explicit commit. + +prepare:: + Prepare to commit the transaction. This will create lock files for all + queued reference updates. If one reference could not be locked, the + transaction will be aborted. + +commit:: + Commit all reference updates queued for the transaction, ending the + transaction. + +abort:: + Abort the transaction, releasing all locks if the transaction is in + prepared state. + If all <ref>s can be locked with matching <oldvalue>s simultaneously, all modifications are performed. Otherwise, no modifications are performed. Note that while each individual @@ -122,12 +148,13 @@ still see a subset of the modifications. LOGGING UPDATES --------------- -If config parameter "core.logAllRefUpdates" is true and the ref is one under -"refs/heads/", "refs/remotes/", "refs/notes/", or the symbolic ref HEAD; or -the file "$GIT_DIR/logs/<ref>" exists then `git update-ref` will append -a line to the log file "$GIT_DIR/logs/<ref>" (dereferencing all -symbolic refs before creating the log name) describing the change -in ref value. Log lines are formatted as: +If config parameter "core.logAllRefUpdates" is true and the ref is one +under "refs/heads/", "refs/remotes/", "refs/notes/", or a pseudoref +like HEAD or ORIG_HEAD; or the file "$GIT_DIR/logs/<ref>" exists then +`git update-ref` will append a line to the log file +"$GIT_DIR/logs/<ref>" (dereferencing all symbolic refs before creating +the log name) describing the change in ref value. Log lines are +formatted as: oldsha1 SP newsha1 SP committer LF diff --git a/third_party/git/Documentation/git-worktree.txt b/third_party/git/Documentation/git-worktree.txt index 85d92c9761..32e8440cde 100644 --- a/third_party/git/Documentation/git-worktree.txt +++ b/third_party/git/Documentation/git-worktree.txt @@ -15,6 +15,7 @@ SYNOPSIS 'git worktree move' <worktree> <new-path> 'git worktree prune' [-n] [-v] [--expire <expire>] 'git worktree remove' [-f] <worktree> +'git worktree repair' [<path>...] 'git worktree unlock' <worktree> DESCRIPTION @@ -25,11 +26,24 @@ Manage multiple working trees attached to the same repository. A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository. This new working tree is called a -"linked working tree" as opposed to the "main working tree" prepared by "git -init" or "git clone". A repository has one main working tree (if it's not a +"linked working tree" as opposed to the "main working tree" prepared by +linkgit:git-init[1] or linkgit:git-clone[1]. +A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees. When you are done with a linked working tree, remove it with `git worktree remove`. +In its simplest form, `git worktree add <path>` automatically creates a +new branch whose name is the final component of `<path>`, which is +convenient if you plan to work on a new topic. For instance, `git +worktree add ../hotfix` creates new branch `hotfix` and checks it out at +path `../hotfix`. To instead work on an existing branch in a new working +tree, use `git worktree add <path> <branch>`. On the other hand, if you +just plan to make some experimental changes or do testing without +disturbing existing development, it is often convenient to create a +'throwaway' working tree not associated with any branch. For instance, +`git worktree add -d <path>` creates a new working tree with a detached +`HEAD` at the same commit as the current branch. + If a working tree is deleted without using `git worktree remove`, then its associated administrative files, which reside in the repository (see "DETAILS" below), will eventually be removed automatically (see @@ -48,10 +62,10 @@ add <path> [<commit-ish>]:: Create `<path>` and checkout `<commit-ish>` into it. The new working directory is linked to the current repository, sharing everything except working -directory specific files such as HEAD, index, etc. `-` may also be -specified as `<commit-ish>`; it is synonymous with `@{-1}`. +directory specific files such as `HEAD`, `index`, etc. As a convenience, +`<commit-ish>` may be a bare "`-`", which is synonymous with `@{-1}`. + -If <commit-ish> is a branch name (call it `<branch>`) and is not found, +If `<commit-ish>` is a branch name (call it `<branch>`) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name, treat as equivalent to: @@ -66,24 +80,24 @@ one for the purposes of disambiguation, even if the `<branch>` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `<branch>` is ambiguous but exists on the -'origin' remote. See also `checkout.defaultRemote` in +`origin` remote. See also `checkout.defaultRemote` in linkgit:git-config[1]. + If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used, -then, as a convenience, the new worktree is associated with a branch +then, as a convenience, the new working tree is associated with a branch (call it `<branch>`) named after `$(basename <path>)`. If `<branch>` -doesn't exist, a new branch based on HEAD is automatically created as +doesn't exist, a new branch based on `HEAD` is automatically created as if `-b <branch>` was given. If `<branch>` does exist, it will be -checked out in the new worktree, if it's not checked out anywhere -else, otherwise the command will refuse to create the worktree (unless +checked out in the new working tree, if it's not checked out anywhere +else, otherwise the command will refuse to create the working tree (unless `--force` is used). list:: -List details of each worktree. The main worktree is listed first, followed by -each of the linked worktrees. The output details include if the worktree is -bare, the revision currently checked out, and the branch currently checked out -(or 'detached HEAD' if none). +List details of each working tree. The main working tree is listed first, +followed by each of the linked working trees. The output details include +whether the working tree is bare, the revision currently checked out, and the +branch currently checked out (or "detached HEAD" if none). lock:: @@ -96,11 +110,14 @@ with `--reason`. move:: Move a working tree to a new location. Note that the main working tree -or linked working trees containing submodules cannot be moved. +or linked working trees containing submodules cannot be moved with this +command. (The `git worktree repair` command, however, can reestablish +the connection with linked working trees if you move the main working +tree manually.) prune:: -Prune working tree information in $GIT_DIR/worktrees. +Prune working tree information in `$GIT_DIR/worktrees`. remove:: @@ -109,6 +126,23 @@ and no modification in tracked files) can be removed. Unclean working trees or ones with submodules can be removed with `--force`. The main working tree cannot be removed. +repair [<path>...]:: + +Repair working tree administrative files, if possible, if they have +become corrupted or outdated due to external factors. ++ +For instance, if the main working tree (or bare repository) is moved, +linked working trees will be unable to locate it. Running `repair` in +the main working tree will reestablish the connection from linked +working trees back to the main working tree. ++ +Similarly, if a linked working tree is moved without using `git worktree +move`, the main working tree (or bare repository) will be unable to +locate it. Running `repair` within the recently-moved working tree will +reestablish the connection. If multiple linked working trees are moved, +running `repair` from any working tree with each tree's new `<path>` as +an argument, will reestablish the connection to all the specified paths. + unlock:: Unlock a working tree, allowing it to be pruned, moved or deleted. @@ -126,7 +160,9 @@ OPTIONS locked working tree path, specify `--force` twice. + `move` refuses to move a locked working tree unless `--force` is specified -twice. +twice. If the destination is already assigned to some other working tree but is +missing (for instance, if `<new-path>` was deleted manually), then `--force` +allows the move to proceed; use `--force` twice if the destination is locked. + `remove` refuses to remove an unclean working tree unless `--force` is used. To remove a locked working tree, specify `--force` twice. @@ -135,13 +171,14 @@ To remove a locked working tree, specify `--force` twice. -B <new-branch>:: With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree. - If `<commit-ish>` is omitted, it defaults to HEAD. + If `<commit-ish>` is omitted, it defaults to `HEAD`. By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`. +-d:: --detach:: - With `add`, detach HEAD in the new working tree. See "DETACHED HEAD" + With `add`, detach `HEAD` in the new working tree. See "DETACHED HEAD" in linkgit:git-checkout[1]. --[no-]checkout:: @@ -152,7 +189,7 @@ To remove a locked working tree, specify `--force` twice. --[no-]guess-remote:: With `worktree add <path>`, without `<commit-ish>`, instead - of creating a new branch from HEAD, if there exists a tracking + of creating a new branch from `HEAD`, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as "upstream" from the new branch. @@ -164,12 +201,12 @@ This can also be set up as the default behaviour by using the When creating a new branch, if `<commit-ish>` is a branch, mark it as "upstream" from the new branch. This is the default if `<commit-ish>` is a remote-tracking branch. See - "--track" in linkgit:git-branch[1] for details. + `--track` in linkgit:git-branch[1] for details. --lock:: Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, - but without race condition. + but without a race condition. -n:: --dry-run:: @@ -183,14 +220,14 @@ This can also be set up as the default behaviour by using the -q:: --quiet:: - With 'add', suppress feedback messages. + With `add`, suppress feedback messages. -v:: --verbose:: With `prune`, report all removals. --expire <time>:: - With `prune`, only expire unused working trees older than <time>. + With `prune`, only expire unused working trees older than `<time>`. --reason <string>:: With `lock`, an explanation why the working tree is locked. @@ -200,48 +237,48 @@ This can also be set up as the default behaviour by using the absolute. + If the last path components in the working tree's path is unique among -working trees, it can be used to identify worktrees. For example if -you only have two working trees, at "/abc/def/ghi" and "/abc/def/ggg", -then "ghi" or "def/ghi" is enough to point to the former working tree. +working trees, it can be used to identify a working tree. For example if +you only have two working trees, at `/abc/def/ghi` and `/abc/def/ggg`, +then `ghi` or `def/ghi` is enough to point to the former working tree. REFS ---- In multiple working trees, some refs may be shared between all working -trees, some refs are local. One example is HEAD is different for all -working trees. This section is about the sharing rules and how to access +trees and some refs are local. One example is `HEAD` which is different for each +working tree. This section is about the sharing rules and how to access refs of one working tree from another. In general, all pseudo refs are per working tree and all refs starting -with "refs/" are shared. Pseudo refs are ones like HEAD which are -directly under GIT_DIR instead of inside GIT_DIR/refs. There is one -exception to this: refs inside refs/bisect and refs/worktree is not +with `refs/` are shared. Pseudo refs are ones like `HEAD` which are +directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are +exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not shared. Refs that are per working tree can still be accessed from another -working tree via two special paths, main-worktree and worktrees. The -former gives access to per-worktree refs of the main working tree, +working tree via two special paths, `main-worktree` and `worktrees`. The +former gives access to per-working tree refs of the main working tree, while the latter to all linked working trees. -For example, main-worktree/HEAD or main-worktree/refs/bisect/good -resolve to the same value as the main working tree's HEAD and -refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or -worktrees/bar/refs/bisect/bad are the same as -GIT_COMMON_DIR/worktrees/foo/HEAD and -GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad. +For example, `main-worktree/HEAD` or `main-worktree/refs/bisect/good` +resolve to the same value as the main working tree's `HEAD` and +`refs/bisect/good` respectively. Similarly, `worktrees/foo/HEAD` or +`worktrees/bar/refs/bisect/bad` are the same as +`$GIT_COMMON_DIR/worktrees/foo/HEAD` and +`$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`. -To access refs, it's best not to look inside GIT_DIR directly. Instead +To access refs, it's best not to look inside `$GIT_DIR` directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly. CONFIGURATION FILE ------------------ -By default, the repository "config" file is shared across all working +By default, the repository `config` file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only. In order to have configuration specific to working trees, you can turn -on "worktreeConfig" extension, e.g.: +on the `worktreeConfig` extension, e.g.: ------------ $ git config extensions.worktreeConfig true @@ -253,7 +290,7 @@ configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension. Note that in this file, the exception for `core.bare` and `core.worktree` -is gone. If you have them in $GIT_DIR/config before, you must move +is gone. If they exist in `$GIT_DIR/config`, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees: @@ -266,7 +303,7 @@ do not want to share to all working trees: DETAILS ------- Each linked working tree has a private sub-directory in the repository's -$GIT_DIR/worktrees directory. The private sub-directory's name is usually +`$GIT_DIR/worktrees` directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked @@ -274,51 +311,52 @@ working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken). -Within a linked working tree, $GIT_DIR is set to point to this private +Within a linked working tree, `$GIT_DIR` is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and -$GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR +`$GIT_COMMON_DIR` is set to point back to the main working tree's `$GIT_DIR` (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree. Path resolution via `git rev-parse --git-path` uses either -$GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the +`$GIT_DIR` or `$GIT_COMMON_DIR` depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses -$GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, -since refs are shared across all working trees, except refs/bisect and -refs/worktree. +`$GIT_COMMON_DIR` and returns `/path/main/.git/refs/heads/master`, +since refs are shared across all working trees, except `refs/bisect` and +`refs/worktree`. See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to -$GIT_DIR or $GIT_COMMON_DIR when you need to directly access something -inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path. +`$GIT_DIR` or `$GIT_COMMON_DIR` when you need to directly access something +inside `$GIT_DIR`. Use `git rev-parse --git-path` to get the final path. -If you manually move a linked working tree, you need to update the 'gitdir' file +If you manually move a linked working tree, you need to update the `gitdir` file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` -instead. +instead. Better yet, run `git worktree repair` to reestablish the connection +automatically. -To prevent a $GIT_DIR/worktrees entry from being pruned (which +To prevent a `$GIT_DIR/worktrees` entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named -'locked' to the entry's directory. The file contains the reason in +`locked` to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned. See linkgit:gitrepository-layout[5] for details. -When extensions.worktreeConfig is enabled, the config file +When `extensions.worktreeConfig` is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is. LIST OUTPUT FORMAT ------------------ -The worktree list command has two output formats. The default format shows the +The `worktree list` command has two output formats. The default format shows the details on a single line with columns. For example: ------------ @@ -331,10 +369,10 @@ $ git worktree list Porcelain Format ~~~~~~~~~~~~~~~~ The porcelain format has a line per attribute. Attributes are listed with a -label and value separated by a single space. Boolean attributes (like 'bare' -and 'detached') are listed as a label only, and are only present if and only -if the value is true. The first attribute of a worktree is always `worktree`, -an empty line indicates the end of the record. For example: +label and value separated by a single space. Boolean attributes (like `bare` +and `detached`) are listed as a label only, and are present only +if the value is true. The first attribute of a working tree is always +`worktree`, an empty line indicates the end of the record. For example: ------------ $ git worktree list --porcelain diff --git a/third_party/git/Documentation/git.txt b/third_party/git/Documentation/git.txt index 9b82564d1a..c463b937a8 100644 --- a/third_party/git/Documentation/git.txt +++ b/third_party/git/Documentation/git.txt @@ -110,9 +110,23 @@ 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. 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. + 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>`. --work-tree=<path>:: Set the path to the working tree. It can be an absolute path @@ -271,8 +285,8 @@ In general, the interrogate commands do not touch the files in the working tree. -Synching repositories -~~~~~~~~~~~~~~~~~~~~~ +Syncing repositories +~~~~~~~~~~~~~~~~~~~~ include::cmds-synchingrepositories.txt[] @@ -290,6 +304,13 @@ users typically do not use them directly. include::cmds-purehelpers.txt[] +Guides +------ + +The following documentation pages are guides about Git concepts. + +include::cmds-guide.txt[] + Configuration Mechanism ----------------------- @@ -479,16 +500,46 @@ double-quotes and respecting backslash escapes. E.g., the value details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY... +`GIT_DEFAULT_HASH`:: + If this variable is set, the default hash algorithm for new + repositories will be set to this value. This value is currently + ignored when cloning; the setting of the remote repository + is used instead. The default is "sha1". THIS VARIABLE IS + EXPERIMENTAL! See `--object-format` in linkgit:git-init[1]. + 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`:: -'EMAIL':: - see linkgit:git-commit-tree[1] + 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. Git Diffs ~~~~~~~~~ @@ -500,8 +551,9 @@ Git Diffs `GIT_EXTERNAL_DIFF`:: When the environment variable `GIT_EXTERNAL_DIFF` is set, the - program named by it is called, instead of the diff invocation - described above. For a path that is added, removed, or modified, + program named by it is called to generate diffs, and Git + does not use its builtin diff machinery. + For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters: path old-file old-hex old-mode new-file new-hex new-mode @@ -544,12 +596,22 @@ 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, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]. +`GIT_SEQUENCE_EDITOR`:: + This environment variable overrides the configured Git editor + when editing the todo list of an interactive rebase. See also + linkit::git-rebase[1] and the `sequence.editor` option in + linkit::git-config[1]. + `GIT_SSH`:: `GIT_SSH_COMMAND`:: If either of these environment variables is set then 'git fetch' @@ -660,6 +722,10 @@ of clones and fetches. time of each Git command. See `GIT_TRACE` for available trace output options. +`GIT_TRACE_REFS`:: + Enables trace messages for operations on the ref database. + See `GIT_TRACE` for available trace output options. + `GIT_TRACE_SETUP`:: Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. @@ -674,8 +740,6 @@ of clones and fetches. Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. - This option overrides setting the `GIT_CURL_VERBOSE` environment - variable. See `GIT_TRACE` for available trace output options. `GIT_TRACE_CURL_NO_DATA`:: @@ -730,11 +794,10 @@ for full details. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details. -`GIT_REDACT_COOKIES`:: - This can be set to a comma-separated list of strings. When a curl trace - is enabled (see `GIT_TRACE_CURL` above), whenever a "Cookies:" header - sent by the client is dumped, values of cookies whose key is in that - list (case-sensitive) are redacted. +`GIT_TRACE_REDACT`:: + By default, when tracing is activated, Git redacts the values of + cookies, the "Authorization:" header, and the "Proxy-Authorization:" + header. Set this variable to `0` to prevent this redaction. `GIT_LITERAL_PATHSPECS`:: Setting this variable to `1` will cause Git to treat all @@ -928,7 +991,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://public-inbox.org/git for previous bug reports and other +at https://lore.kernel.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 fb1d188d44..2d0a03715b 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 reencodes the content from the +attribute is added to Git, then Git re-encodes 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 reencoded back to the specified encoding. +the content is re-encoded 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 -suppported, and the supported capabilities are "clean", "smudge", and +supported, and the supported capabilities are "clean", "smudge", and "delay". Afterwards Git sends a list of "key=value" pairs terminated with @@ -810,6 +810,10 @@ 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. @@ -820,6 +824,8 @@ patterns are available: - `java` suitable for source code in the Java language. +- `markdown` suitable for Markdown documents. + - `matlab` suitable for source code in the MATLAB and Octave languages. - `objc` suitable for source code in the Objective-C language. diff --git a/third_party/git/Documentation/gitcli.txt b/third_party/git/Documentation/gitcli.txt index 1ed3ca33b7..92e4ba6a2f 100644 --- a/third_party/git/Documentation/gitcli.txt +++ b/third_party/git/Documentation/gitcli.txt @@ -37,6 +37,12 @@ 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 @@ -120,6 +126,11 @@ 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 @@ -205,8 +216,8 @@ only affects the files in the working tree, but with entries, and with `--cached`, it modifies only the index entries. -See also http://marc.info/?l=git&m=116563135620359 and -http://marc.info/?l=git&m=119150393620273 for further +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 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 f880d21dfb..c0b95256cc 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 checkout' what the base of the checkout would be. +just telling 'git switch' 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 adc759612d..758bf39ba3 100644 --- a/third_party/git/Documentation/gitcredentials.txt +++ b/third_party/git/Documentation/gitcredentials.txt @@ -3,7 +3,7 @@ gitcredentials(7) NAME ---- -gitcredentials - providing usernames and passwords to Git +gitcredentials - Providing usernames and passwords to Git SYNOPSIS -------- @@ -131,7 +131,9 @@ 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. +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. 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 @@ -186,8 +188,110 @@ CUSTOM HELPERS -------------- You can write your own custom helpers to interface with any system in -which you keep credentials. See the documentation for Git's -link:technical/api-credentials.html[credentials API] for details. +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" +[credential] + helper = foo + +# same as above, but pass an argument to the helper +[credential] + helper = "foo --bar=baz" + +# the arguments are parsed by the shell, so use shell +# quoting if necessary +[credential] + helper = "foo --bar='whitespace arg'" + +# you can also use an absolute path, which will not use the git wrapper +[credential] + helper = "/path/to/my/helper --with-arguments" + +# or you can specify your own shell snippet +[credential "https://example.com"] + username = your_user + helper = "!f() { test \"$1\" = get && 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's credential subsystem. + +While it is possible to override all attributes, well behaving helpers +should refrain from doing so for any attribute other than username and +password. + +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). + +Similarly, no more helpers will be consulted once both username and +password had been provided. + +For a `store` or `erase` operation, the helper's output is ignored. + +If a helper fails to perform the requested operation or needs to notify +the user of a potential issue, it may write to stderr. + +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). GIT --- diff --git a/third_party/git/Documentation/giteveryday.txt b/third_party/git/Documentation/giteveryday.txt index 1bd919f92b..faba2ef088 100644 --- a/third_party/git/Documentation/giteveryday.txt +++ b/third_party/git/Documentation/giteveryday.txt @@ -278,13 +278,13 @@ $ git am -3 -i -s ./+to-apply <4> $ compile/test $ git switch -c hold/linus && git am -3 -i -s ./+hold-linus <5> $ git switch topic/one && git rebase master <6> -$ git switch -C pu next <7> +$ git switch -C seen next <7> $ git merge topic/one topic/two && git merge hold/linus <8> $ git switch maint $ git cherry-pick master~4 <9> $ compile/test $ git tag -s -m "GIT 0.99.9x" v0.99.9x <10> -$ git fetch ko && for branch in master maint next pu <11> +$ git fetch ko && for branch in master maint next seen <11> do git show-branch ko/$branch $branch <12> done @@ -294,14 +294,14 @@ $ git push --follow-tags ko <13> <1> see what you were in the middle of doing, if anything. <2> see which branches haven't been merged into `master` yet. Likewise for any other integration branches e.g. `maint`, `next` -and `pu` (potential updates). +and `seen`. <3> read mails, save ones that are applicable, and save others that are not quite ready (other mail readers are available). <4> apply them, interactively, with your sign-offs. <5> create topic branch as needed and apply, again with sign-offs. <6> rebase internal topic branch that has not been merged to the master or exposed as a part of a stable branch. -<7> restart `pu` every time from the next. +<7> restart `seen` every time from the next. <8> and bundle topic branches still cooking. <9> backport a critical fix. <10> create a signed tag. @@ -323,7 +323,7 @@ repository at kernel.org, and looks like this: fetch = refs/heads/*:refs/remotes/ko/* push = refs/heads/master push = refs/heads/next - push = +refs/heads/pu + push = +refs/heads/seen push = refs/heads/maint ------------ diff --git a/third_party/git/Documentation/gitfaq.txt b/third_party/git/Documentation/gitfaq.txt new file mode 100644 index 0000000000..afdaeab850 --- /dev/null +++ b/third_party/git/Documentation/gitfaq.txt @@ -0,0 +1,441 @@ +gitfaq(7) +========= + +NAME +---- +gitfaq - Frequently asked questions about using Git + +SYNOPSIS +-------- +gitfaq + +DESCRIPTION +----------- + +The examples in this FAQ assume a standard POSIX shell, like `bash` or `dash`, +and a user, A U Thor, who has the account `author` on the hosting provider +`git.example.org`. + +Configuration +------------- + +[[user-name]] +What should I put in `user.name`?:: + You should put your personal name, generally a form using a given name + and family name. For example, the current maintainer of Git uses "Junio + C Hamano". This will be the name portion that is stored in every commit + you make. ++ +This configuration doesn't have any effect on authenticating to remote services; +for that, see `credential.username` in linkgit:git-config[1]. + +[[http-postbuffer]] +What does `http.postBuffer` really do?:: + This option changes the size of the buffer that Git uses when pushing + data to a remote over HTTP or HTTPS. If the data is larger than this + size, libcurl, which handles the HTTP support for Git, will use chunked + transfer encoding since it isn't known ahead of time what the size of + the pushed data will be. ++ +Leaving this value at the default size is fine unless you know that either the +remote server or a proxy in the middle doesn't support HTTP/1.1 (which +introduced the chunked transfer encoding) or is known to be broken with chunked +data. This is often (erroneously) suggested as a solution for generic push +problems, but since almost every server and proxy supports at least HTTP/1.1, +raising this value usually doesn't solve most push problems. A server or proxy +that didn't correctly support HTTP/1.1 and chunked transfer encoding wouldn't be +that useful on the Internet today, since it would break lots of traffic. ++ +Note that increasing this value will increase the memory used on every relevant +push that Git does over HTTP or HTTPS, since the entire buffer is allocated +regardless of whether or not it is all used. Thus, it's best to leave it at the +default unless you are sure you need a different value. + +[[configure-editor]] +How do I configure a different editor?:: + If you haven't specified an editor specifically for Git, it will by default + use the editor you've configured using the `VISUAL` or `EDITOR` environment + variables, or if neither is specified, the system default (which is usually + `vi`). Since some people find `vi` difficult to use or prefer a different + editor, it may be desirable to change the editor used. ++ +If you want to configure a general editor for most programs which need one, you +can edit your shell configuration (e.g., `~/.bashrc` or `~/.zshenv`) to contain +a line setting the `EDITOR` or `VISUAL` environment variable to an appropriate +value. For example, if you prefer the editor `nano`, then you could write the +following: ++ +---- +export VISUAL=nano +---- ++ +If you want to configure an editor specifically for Git, you can either set the +`core.editor` configuration value or the `GIT_EDITOR` environment variable. You +can see linkgit:git-var[1] for details on the order in which these options are +consulted. ++ +Note that in all cases, the editor value will be passed to the shell, so any +arguments containing spaces should be appropriately quoted. Additionally, if +your editor normally detaches from the terminal when invoked, you should specify +it with an argument that makes it not do that, or else Git will not see any +changes. An example of a configuration addressing both of these issues on +Windows would be the configuration `"C:\Program Files\Vim\gvim.exe" --nofork`, +which quotes the filename with spaces and specifies the `--nofork` option to +avoid backgrounding the process. + +Credentials +----------- + +[[http-credentials]] +How do I specify my credentials when pushing over HTTP?:: + The easiest way to do this is to use a credential helper via the + `credential.helper` configuration. Most systems provide a standard + choice to integrate with the system credential manager. For example, + Git for Windows provides the `wincred` credential manager, macOS has the + `osxkeychain` credential manager, and Unix systems with a standard + desktop environment can use the `libsecret` credential manager. All of + these store credentials in an encrypted store to keep your passwords or + tokens secure. ++ +In addition, you can use the `store` credential manager which stores in a file +in your home directory, or the `cache` credential manager, which does not +permanently store your credentials, but does prevent you from being prompted for +them for a certain period of time. ++ +You can also just enter your password when prompted. While it is possible to +place the password (which must be percent-encoded) in the URL, this is not +particularly secure and can lead to accidental exposure of credentials, so it is +not recommended. + +[[http-credentials-environment]] +How do I read a password or token from an environment variable?:: + The `credential.helper` configuration option can also take an arbitrary + shell command that produces the credential protocol on standard output. + This is useful when passing credentials into a container, for example. ++ +Such a shell command can be specified by starting the option value with an +exclamation point. If your password or token were stored in the `GIT_TOKEN`, +you could run the following command to set your credential helper: ++ +---- +$ git config credential.helper \ + '!f() { echo username=author; echo "password=$GIT_TOKEN"; };f' +---- + +[[http-reset-credentials]] +How do I change the password or token I've saved in my credential manager?:: + Usually, if the password or token is invalid, Git will erase it and + prompt for a new one. However, there are times when this doesn't always + happen. To change the password or token, you can erase the existing + credentials and then Git will prompt for new ones. To erase + credentials, use a syntax like the following (substituting your username + and the hostname): ++ +---- +$ echo url=https://author@git.example.org | git credential reject +---- + +[[multiple-accounts-http]] +How do I use multiple accounts with the same hosting provider using HTTP?:: + Usually the easiest way to distinguish between these accounts is to use + the username in the URL. For example, if you have the accounts `author` + and `committer` on `git.example.org`, you can use the URLs + https://author@git.example.org/org1/project1.git and + https://committer@git.example.org/org2/project2.git. This way, when you + use a credential helper, it will automatically try to look up the + correct credentials for your account. If you already have a remote set + up, you can change the URL with something like `git remote set-url + origin https://author@git.example.org/org1/project1.git` (see + linkgit:git-remote[1] for details). + +[[multiple-accounts-ssh]] +How do I use multiple accounts with the same hosting provider using SSH?:: + With most hosting providers that support SSH, a single key pair uniquely + identifies a user. Therefore, to use multiple accounts, it's necessary + to create a key pair for each account. If you're using a reasonably + modern OpenSSH version, you can create a new key pair with something + like `ssh-keygen -t ed25519 -f ~/.ssh/id_committer`. You can then + register the public key (in this case, `~/.ssh/id_committer.pub`; note + the `.pub`) with the hosting provider. ++ +Most hosting providers use a single SSH account for pushing; that is, all users +push to the `git` account (e.g., `git@git.example.org`). If that's the case for +your provider, you can set up multiple aliases in SSH to make it clear which key +pair to use. For example, you could write something like the following in +`~/.ssh/config`, substituting the proper private key file: ++ +---- +# This is the account for author on git.example.org. +Host example_author + HostName git.example.org + User git + # This is the key pair registered for author with git.example.org. + IdentityFile ~/.ssh/id_author + IdentitiesOnly yes +# This is the account for committer on git.example.org. +Host example_committer + HostName git.example.org + User git + # This is the key pair registered for committer with git.example.org. + IdentityFile ~/.ssh/id_committer + IdentitiesOnly yes +---- ++ +Then, you can adjust your push URL to use `git@example_author` or +`git@example_committer` instead of `git@example.org` (e.g., `git remote set-url +git@example_author:org1/project1.git`). + +Common Issues +------------- + +[[last-commit-amend]] +I've made a mistake in the last commit. How do I change it?:: + You can make the appropriate change to your working tree, run `git add + <file>` or `git rm <file>`, as appropriate, to stage it, and then `git + commit --amend`. Your change will be included in the commit, and you'll + be prompted to edit the commit message again; if you wish to use the + original message verbatim, you can use the `--no-edit` option to `git + commit` in addition, or just save and quit when your editor opens. + +[[undo-previous-change]] +I've made a change with a bug and it's been included in the main branch. How should I undo it?:: + The usual way to deal with this is to use `git revert`. This preserves + the history that the original change was made and was a valuable + contribution, but also introduces a new commit that undoes those changes + because the original had a problem. The commit message of the revert + indicates the commit which was reverted and is usually edited to include + an explanation as to why the revert was made. + +[[ignore-tracked-files]] +How do I ignore changes to a tracked file?:: + Git doesn't provide a way to do this. The reason is that if Git needs + to overwrite this file, such as during a checkout, it doesn't know + whether the changes to the file are precious and should be kept, or + whether they are irrelevant and can safely be destroyed. Therefore, it + has to take the safe route and always preserve them. ++ +It's tempting to try to use certain features of `git update-index`, namely the +assume-unchanged and skip-worktree bits, but these don't work properly for this +purpose and shouldn't be used this way. ++ +If your goal is to modify a configuration file, it can often be helpful to have +a file checked into the repository which is a template or set of defaults which +can then be copied alongside and modified as appropriate. This second, modified +file is usually ignored to prevent accidentally committing it. + +[[files-in-gitignore-are-tracked]] +I asked Git to ignore various files, yet they are still tracked:: + A `gitignore` file ensures that certain file(s) which are not + tracked by Git remain untracked. However, sometimes particular + file(s) may have been tracked before adding them into the + `.gitignore`, hence they still remain tracked. To untrack and + ignore files/patterns, use `git rm --cached <file/pattern>` + and add a pattern to `.gitignore` that matches the <file>. + See linkgit:gitignore[5] for details. + +[[fetching-and-pulling]] +How do I know if I want to do a fetch or a pull?:: + A fetch stores a copy of the latest changes from the remote + repository, without modifying the working tree or current branch. + You can then at your leisure inspect, merge, rebase on top of, or + ignore the upstream changes. A pull consists of a fetch followed + immediately by either a merge or rebase. See linkgit:git-pull[1]. + +Merging and Rebasing +-------------------- + +[[long-running-squash-merge]] +What kinds of problems can occur when merging long-lived branches with squash merges?:: + In general, there are a variety of problems that can occur when using squash + merges to merge two branches multiple times. These can include seeing extra + commits in `git log` output, with a GUI, or when using the `...` notation to + express a range, as well as the possibility of needing to re-resolve conflicts + again and again. ++ +When Git does a normal merge between two branches, it considers exactly three +points: the two branches and a third commit, called the _merge base_, which is +usually the common ancestor of the commits. The result of the merge is the sum +of the changes between the merge base and each head. When you merge two +branches with a regular merge commit, this results in a new commit which will +end up as a merge base when they're merged again, because there is now a new +common ancestor. Git doesn't have to consider changes that occurred before the +merge base, so you don't have to re-resolve any conflicts you resolved before. ++ +When you perform a squash merge, a merge commit isn't created; instead, the +changes from one side are applied as a regular commit to the other side. This +means that the merge base for these branches won't have changed, and so when Git +goes to perform its next merge, it considers all of the changes that it +considered the last time plus the new changes. That means any conflicts may +need to be re-resolved. Similarly, anything using the `...` notation in `git +diff`, `git log`, or a GUI will result in showing all of the changes since the +original merge base. ++ +As a consequence, if you want to merge two long-lived branches repeatedly, it's +best to always use a regular merge commit. + +[[merge-two-revert-one]] +If I make a change on two branches but revert it on one, why does the merge of those branches include the change?:: + By default, when Git does a merge, it uses a strategy called the recursive + strategy, which does a fancy three-way merge. In such a case, when Git + performs the merge, it considers exactly three points: the two heads and a + third point, called the _merge base_, which is usually the common ancestor of + those commits. Git does not consider the history or the individual commits + that have happened on those branches at all. ++ +As a result, if both sides have a change and one side has reverted that change, +the result is to include the change. This is because the code has changed on +one side and there is no net change on the other, and in this scenario, Git +adopts the change. ++ +If this is a problem for you, you can do a rebase instead, rebasing the branch +with the revert onto the other branch. A rebase in this scenario will revert +the change, because a rebase applies each individual commit, including the +revert. Note that rebases rewrite history, so you should avoid rebasing +published branches unless you're sure you're comfortable with that. See the +NOTES section in linkgit:git-rebase[1] for more details. + +Hooks +----- + +[[restrict-with-hooks]] +How do I use hooks to prevent users from making certain changes?:: + The only safe place to make these changes is on the remote repository + (i.e., the Git server), usually in the `pre-receive` hook or in a + continuous integration (CI) system. These are the locations in which + policy can be enforced effectively. ++ +It's common to try to use `pre-commit` hooks (or, for commit messages, +`commit-msg` hooks) to check these things, which is great if you're working as a +solo developer and want the tooling to help you. However, using hooks on a +developer machine is not effective as a policy control because a user can bypass +these hooks with `--no-verify` without being noticed (among various other ways). +Git assumes that the user is in control of their local repositories and doesn't +try to prevent this or tattle on the user. ++ +In addition, some advanced users find `pre-commit` hooks to be an impediment to +workflows that use temporary commits to stage work in progress or that create +fixup commits, so it's better to push these kinds of checks to the server +anyway. + +Cross-Platform Issues +--------------------- + +[[windows-text-binary]] +I'm on Windows and my text files are detected as binary.:: + Git works best when you store text files as UTF-8. Many programs on + Windows support UTF-8, but some do not and only use the little-endian + UTF-16 format, which Git detects as binary. If you can't use UTF-8 with + your programs, you can specify a working tree encoding that indicates + which encoding your files should be checked out with, while still + storing these files as UTF-8 in the repository. This allows tools like + linkgit:git-diff[1] to work as expected, while still allowing your tools + to work. ++ +To do so, you can specify a linkgit:gitattributes[5] pattern with the +`working-tree-encoding` attribute. For example, the following pattern sets all +C files to use UTF-16LE-BOM, which is a common encoding on Windows: ++ +---- +*.c working-tree-encoding=UTF-16LE-BOM +---- ++ +You will need to run `git add --renormalize` to have this take effect. Note +that if you are making these changes on a project that is used across platforms, +you'll probably want to make it in a per-user configuration file or in the one +in `$GIT_DIR/info/attributes`, since making it in a `.gitattributes` file in the +repository will apply to all users of the repository. ++ +See the following entry for information about normalizing line endings as well, +and see linkgit:gitattributes[5] for more information about attribute files. + +[[windows-diff-control-m]] +I'm on Windows and git diff shows my files as having a `^M` at the end.:: + By default, Git expects files to be stored with Unix line endings. As such, + the carriage return (`^M`) that is part of a Windows line ending is shown + because it is considered to be trailing whitespace. Git defaults to showing + trailing whitespace only on new lines, not existing ones. ++ +You can store the files in the repository with Unix line endings and convert +them automatically to your platform's line endings. To do that, set the +configuration option `core.eol` to `native` and see the following entry for +information about how to configure files as text or binary. ++ +You can also control this behavior with the `core.whitespace` setting if you +don't wish to remove the carriage returns from your line endings. + +[[always-modified-files-case]] +Why do I have a file that's always modified?:: + Internally, Git always stores file names as sequences of bytes and doesn't + perform any encoding or case folding. However, Windows and macOS by default + both perform case folding on file names. As a result, it's possible to end up + with multiple files or directories whose names differ only in case. Git can + handle this just fine, but the file system can store only one of these files, + so when Git reads the other file to see its contents, it looks modified. ++ +It's best to remove one of the files such that you only have one file. You can +do this with commands like the following (assuming two files `AFile.txt` and +`afile.txt`) on an otherwise clean working tree: ++ +---- +$ git rm --cached AFile.txt +$ git commit -m 'Remove files conflicting in case' +$ git checkout . +---- ++ +This avoids touching the disk, but removes the additional file. Your project +may prefer to adopt a naming convention, such as all-lowercase names, to avoid +this problem from occurring again; such a convention can be checked using a +`pre-receive` hook or as part of a continuous integration (CI) system. ++ +It is also possible for perpetually modified files to occur on any platform if a +smudge or clean filter is in use on your system but a file was previously +committed without running the smudge or clean filter. To fix this, run the +following on an otherwise clean working tree: ++ +---- +$ git add --renormalize . +---- + +[[recommended-storage-settings]] +What's the recommended way to store files in Git?:: + While Git can store and handle any file of any type, there are some + settings that work better than others. In general, we recommend that + text files be stored in UTF-8 without a byte-order mark (BOM) with LF + (Unix-style) endings. We also recommend the use of UTF-8 (again, + without BOM) in commit messages. These are the settings that work best + across platforms and with tools such as `git diff` and `git merge`. ++ +Additionally, if you have a choice between storage formats that are text based +or non-text based, we recommend storing files in the text format and, if +necessary, transforming them into the other format. For example, a text-based +SQL dump with one record per line will work much better for diffing and merging +than an actual database file. Similarly, text-based formats such as Markdown +and AsciiDoc will work better than binary formats such as Microsoft Word and +PDF. ++ +Similarly, storing binary dependencies (e.g., shared libraries or JAR files) or +build products in the repository is generally not recommended. Dependencies and +build products are best stored on an artifact or package server with only +references, URLs, and hashes stored in the repository. ++ +We also recommend setting a linkgit:gitattributes[5] file to explicitly mark +which files are text and which are binary. If you want Git to guess, you can +set the attribute `text=auto`. For example, the following might be appropriate +in some projects: ++ +---- +# By default, guess. +* text=auto +# Mark all C files as text. +*.c text +# Mark all JPEG files as binary. +*.jpg binary +---- ++ +These settings help tools pick the right format for output such as patches and +result in files being checked out in the appropriate line ending for the +platform. + +GIT +--- +Part of the linkgit:git[1] suite diff --git a/third_party/git/Documentation/githooks.txt b/third_party/git/Documentation/githooks.txt index 82cd573776..6e461ace6e 100644 --- a/third_party/git/Documentation/githooks.txt +++ b/third_party/git/Documentation/githooks.txt @@ -103,6 +103,28 @@ 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 ~~~~~~~~~~~~~~~~~~ @@ -171,7 +193,9 @@ worktree. The hook is given three parameters: the ref of the previous HEAD, the ref of the new HEAD (which may or may not have changed), and a flag indicating whether the checkout was a branch checkout (changing branches, flag=1) or a file checkout (retrieving a file from the index, flag=0). -This hook cannot affect the outcome of `git switch` or `git checkout`. +This hook cannot affect the outcome of `git switch` or `git checkout`, +other than that the hook's exit status becomes the exit status of +these two commands. It is also run after linkgit:git-clone[1], unless the `--no-checkout` (`-n`) option is used. The first parameter given to the hook is the null-ref, the second the @@ -311,6 +335,68 @@ The default 'update' hook, when enabled--and with `hooks.allowunannotated` config option unset or set to false--prevents unannotated tags to be pushed. +[[proc-receive]] +proc-receive +~~~~~~~~~~~~ + +This hook is invoked by linkgit:git-receive-pack[1]. If the server has +set the multi-valued config variable `receive.procReceiveRefs`, and the +commands sent to 'receive-pack' have matching reference names, these +commands will be executed by this hook, instead of by the internal +`execute_commands()` function. This hook is responsible for updating +the relevant references and reporting the results back to 'receive-pack'. + +This hook executes once for the receive operation. It takes no +arguments, but uses a pkt-line format protocol to communicate with +'receive-pack' to read commands, push-options and send results. In the +following example for the protocol, the letter 'S' stands for +'receive-pack' and the letter 'H' stands for this hook. + + # Version and features negotiation. + S: PKT-LINE(version=1\0push-options atomic...) + S: flush-pkt + H: PKT-LINE(version=1\0push-options...) + H: flush-pkt + + # Send commands from server to the hook. + S: PKT-LINE(<old-oid> <new-oid> <ref>) + S: ... ... + S: flush-pkt + # Send push-options only if the 'push-options' feature is enabled. + S: PKT-LINE(push-option) + S: ... ... + S: flush-pkt + + # Receive result from the hook. + # OK, run this command successfully. + H: PKT-LINE(ok <ref>) + # NO, I reject it. + H: PKT-LINE(ng <ref> <reason>) + # Fall through, let 'receive-pack' to execute it. + H: PKT-LINE(ok <ref>) + H: PKT-LINE(option fall-through) + # OK, but has an alternate reference. The alternate reference name + # and other status can be given in option directives. + H: PKT-LINE(ok <ref>) + H: PKT-LINE(option refname <refname>) + H: PKT-LINE(option old-oid <old-oid>) + H: PKT-LINE(option new-oid <new-oid>) + H: PKT-LINE(option forced-update) + H: ... ... + H: flush-pkt + +Each command for the 'proc-receive' hook may point to a pseudo-reference +and always has a zero-old as its old-oid, while the 'proc-receive' hook +may update an alternate reference and the alternate reference may exist +already with a non-zero old-oid. For this case, this hook will use +"option" directives to report extended attributes for the reference given +by the leading "ok" directive. + +The report of the commands of this hook should have the same order as +the input. The exit status of the 'proc-receive' hook only determines +the success or failure of the group of commands sent to it, unless +atomic push is in use. + [[post-receive]] post-receive ~~~~~~~~~~~~ @@ -382,6 +468,35 @@ Both standard output and standard error output are forwarded to `git send-pack` on the other end, so you can simply `echo` messages for the user. +reference-transaction +~~~~~~~~~~~~~~~~~~~~~ + +This hook is invoked by any Git command that performs reference +updates. It executes whenever a reference transaction is prepared, +committed or aborted and may thus get called multiple times. + +The hook takes exactly one argument, which is the current state the +given reference transaction is in: + + - "prepared": All reference updates have been queued to the + transaction and references were locked on disk. + + - "committed": The reference transaction was committed and all + references now have their respective new value. + + - "aborted": The reference transaction was aborted, no changes + were performed and the locks have been released. + +For each reference update that was added to the transaction, the hook +receives on standard input a line of the format: + + <old-value> SP <new-value> SP <ref-name> LF + +The exit status of the hook is ignored for any state except for the +"prepared" state. In the "prepared" state, a non-zero exit status will +cause the transaction to be aborted. The hook will not be called with +"aborted" state in that case. + push-to-checkout ~~~~~~~~~~~~~~~~ @@ -425,10 +540,12 @@ post-rewrite This hook is invoked by commands that rewrite commits (linkgit:git-commit[1] when called with `--amend` and -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. +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. The hook receives a list of the rewritten commits on stdin, in the format @@ -466,9 +583,16 @@ fsmonitor-watchman ~~~~~~~~~~~~~~~~~~ This hook is invoked when the configuration option `core.fsmonitor` is -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. +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. 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 @@ -491,12 +615,61 @@ The exit status determines whether git will use the data from the hook to limit its search. On error, it will fall back to verifying all files and folders. +p4-changelist +~~~~~~~~~~~~~ + +This hook is invoked by `git-p4 submit`. + +The `p4-changelist` hook is executed after the changelist +message has been edited by the user. It can be bypassed with the +`--no-verify` option. It takes a single parameter, the name +of the file that holds the proposed changelist text. Exiting +with a non-zero status causes the command to abort. + +The hook is allowed to edit the changelist file and can be used +to normalize the text into some project standard format. It can +also be used to refuse the Submit after inspect the message file. + +Run `git-p4 submit --help` for details. + +p4-prepare-changelist +~~~~~~~~~~~~~~~~~~~~~ + +This hook is invoked by `git-p4 submit`. + +The `p4-prepare-changelist` hook is executed right after preparing +the default changelist message and before the editor is started. +It takes one parameter, the name of the file that contains the +changelist text. Exiting with a non-zero status from the script +will abort the process. + +The purpose of the hook is to edit the message file in place, +and it is not supressed by the `--no-verify` option. This hook +is called even if `--prepare-p4-only` is set. + +Run `git-p4 submit --help` for details. + +p4-post-changelist +~~~~~~~~~~~~~~~~~~ + +This hook is invoked by `git-p4 submit`. + +The `p4-post-changelist` hook is invoked after the submit has +successfully occured in P4. It takes no parameters and is meant +primarily for notification and cannot affect the outcome of the +git p4 submit action. + +Run `git-p4 submit --help` for details. + p4-pre-submit ~~~~~~~~~~~~~ This hook is invoked by `git-p4 submit`. It takes no parameters and nothing from standard input. Exiting with non-zero status from this script prevent -`git-p4 submit` from launching. Run `git-p4 submit --help` for details. +`git-p4 submit` from launching. It can be bypassed with the `--no-verify` +command line option. Run `git-p4 submit --help` for details. + + post-index-change ~~~~~~~~~~~~~~~~~ diff --git a/third_party/git/Documentation/gitk.txt b/third_party/git/Documentation/gitk.txt index 1eabb0aaf3..c653ebb6a8 100644 --- a/third_party/git/Documentation/gitk.txt +++ b/third_party/git/Documentation/gitk.txt @@ -105,8 +105,12 @@ 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. - You can specify this option more than once. + 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. + *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 a66e95b70c..539b4e1997 100644 --- a/third_party/git/Documentation/gitmodules.txt +++ b/third_party/git/Documentation/gitmodules.txt @@ -44,15 +44,14 @@ 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. Note that the - '!command' form is intentionally ignored here for security - reasons. + linkgit:git-submodule[1] for their meaning. For security + reasons, the '!command' form is not accepted here. submodule.<name>.branch:: A remote branch name for tracking updates in the upstream submodule. - If the option is not specified, it defaults to 'master'. A special - value of `.` is used to indicate that the name of the branch in the - submodule should be the same name as the current branch in the + If the option is not specified, it defaults to the remote 'HEAD'. + A special value of `.` is used to indicate that the name of the branch + in the submodule should be the same name as the current branch in the current repository. See the `--remote` documentation in linkgit:git-submodule[1] for details. @@ -81,7 +80,7 @@ submodule.<name>.ignore:: Committed differences and modifications to tracked files will show up. - none;; No modifiations to submodules are ignored, all of committed + none;; No modifications to submodules are ignored, all of committed differences, and modifications to tracked and untracked files are shown. This is the default option. @@ -90,7 +89,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-submodule" option. The 'git submodule' commands are not +"--ignore-submodules" option. The 'git submodule' commands are not affected by this setting. -- @@ -105,14 +104,15 @@ EXAMPLES Consider the following .gitmodules file: - [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 "libfoo"] + path = include/foo + url = git://foo.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:git-config[1] +linkgit:git-submodule[1], linkgit:gitsubmodules[7], linkgit:git-config[1] GIT --- diff --git a/third_party/git/Documentation/gitremote-helpers.txt b/third_party/git/Documentation/gitremote-helpers.txt index 43f80c8068..6f1e269ae4 100644 --- a/third_party/git/Documentation/gitremote-helpers.txt +++ b/third_party/git/Documentation/gitremote-helpers.txt @@ -238,6 +238,9 @@ the remote repository. `--signed-tags=verbatim` to linkgit:git-fast-export[1]. In the absence of this capability, Git will use `--signed-tags=warn-strip`. +'object-format':: + This indicates that the helper is able to interact with the remote + side using an explicit hash algorithm extension. COMMANDS @@ -257,12 +260,14 @@ Support for this command is mandatory. 'list':: Lists the refs, one per line, in the format "<value> <name> [<attr> ...]". The value may be a hex sha1 hash, "@<dest>" for - a symref, or "?" to indicate that the helper could not get the - value of the ref. A space-separated list of attributes follows - the name; unrecognized attributes are ignored. The list ends - with a blank line. + a symref, ":<keyword> <value>" for a key-value pair, or + "?" to indicate that the helper could not get the value of the + ref. A space-separated list of attributes follows the name; + unrecognized attributes are ignored. The list ends with a + blank line. + See REF LIST ATTRIBUTES for a list of currently defined attributes. +See REF LIST KEYWORDS for a list of currently defined keywords. + Supported if the helper has the "fetch" or "import" capability. @@ -297,9 +302,13 @@ 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 a file under -GIT_DIR/objects/pack which is keeping a pack until refs can be -suitably updated. +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. + If option 'check-connectivity' is requested, the helper must output 'connectivity-ok' if the clone is self-contained and connected. @@ -401,7 +410,9 @@ Supported if the helper has the "connect" capability. trying to fall back). After line feed terminating the positive (empty) response, the output of the service starts. Messages (both request and response) must consist of zero or more - PKT-LINEs, terminating in a flush packet. The client must not + PKT-LINEs, terminating in a flush packet. Response messages will + then have a response end packet after the flush packet to + indicate the end of a response. The client must not expect the server to store any state in between request-response pairs. After the connection ends, the remote helper exits. + @@ -426,6 +437,18 @@ attributes are defined. This ref is unchanged since the last import or fetch, although the helper cannot necessarily determine what value that produced. +REF LIST KEYWORDS +----------------- + +The 'list' command may produce a list of key-value pairs. +The following keys are defined. + +'object-format':: + The refs are using the given hash algorithm. This keyword is only + used if the server and client both support the object-format + extension. + + OPTIONS ------- @@ -505,6 +528,19 @@ 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. + +'option object-format' {'true'|algorithm}:: + If 'true', indicate that the caller wants hash algorithm information + to be passed back from the remote. This mode is used when fetching + refs. ++ +If set to an algorithm, indicate that the caller wants to interact with +the remote side using that algorithm. + 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 216b11ee88..1a2ef4c150 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 object in compressed form, + Packs (files that store many objects 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 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, + refs/rewritten 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 if $GIT_COMMON_DIR is set and - "$GIT_COMMON_DIR/logs" will be used instead. + directory is ignored (except logs/HEAD) 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 0a890205b8..891c8da4fd 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 -------- @@ -225,10 +225,10 @@ presence of the .url field. Workflow for a third party library ---------------------------------- - # add a submodule + # Add a submodule git submodule add <url> <path> - # occasionally update the submodule to a new version: + # Occasionally update the submodule to a new version: git -C <path> checkout <new version> git add <path> git commit -m "update submodule to new version" @@ -246,20 +246,23 @@ Workflow for an artificially split repo # regular commands recurse into submodules by default git config --global submodule.recurse true - # Unlike the other commands below clone still needs + # Unlike most other commands below, clone still needs # its own recurse flag: git clone --recurse <URL> <directory> cd <directory> # Get to know the code: git grep foo - git ls-files + git ls-files --recurse-submodules + +[NOTE] +`git ls-files` also requires its own `--recurse-submodules` flag. # Get new code git fetch git pull --rebase - # change worktree + # Change worktree git checkout git reset @@ -267,11 +270,12 @@ Implementation details ---------------------- When cloning or pulling a repository containing submodules the submodules -will not be checked out by default; You can instruct 'clone' to recurse -into submodules. The 'init' and 'update' subcommands of 'git submodule' +will not be checked out by default; you can instruct `clone` to recurse +into submodules. The `init` and `update` subcommands of `git submodule` will maintain submodules checked out and at an appropriate revision in -your working tree. Alternatively you can set 'submodule.recurse' to have -'checkout' recursing into submodules. +your working tree. Alternatively you can set `submodule.recurse` to have +`checkout` recursing into submodules (note that `submodule.recurse` also +affects other Git commands, see linkgit:git-config[1] for a complete list). SEE ALSO diff --git a/third_party/git/Documentation/gitweb.conf.txt b/third_party/git/Documentation/gitweb.conf.txt index 35317e71c8..7963a79ba9 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/gitworkflows.txt b/third_party/git/Documentation/gitworkflows.txt index abc0dc6bc7..47cf97f9be 100644 --- a/third_party/git/Documentation/gitworkflows.txt +++ b/third_party/git/Documentation/gitworkflows.txt @@ -85,15 +85,15 @@ As a given feature goes from experimental to stable, it also There is a fourth official branch that is used slightly differently: -* 'pu' (proposed updates) is an integration branch for things that are - not quite ready for inclusion yet (see "Integration Branches" - below). +* 'seen' (patches seen by the maintainer) is an integration branch for + things that are not quite ready for inclusion yet (see "Integration + Branches" below). Each of the four branches is usually a direct descendant of the one above it. Conceptually, the feature enters at an unstable branch (usually 'next' -or 'pu'), and "graduates" to 'master' for the next release once it is +or 'seen'), and "graduates" to 'master' for the next release once it is considered stable enough. @@ -207,7 +207,7 @@ If you make it (very) clear that this branch is going to be deleted right after the testing, you can even publish this branch, for example to give the testers a chance to work with it, or other developers a chance to see if their in-progress work will be compatible. `git.git` -has such an official throw-away integration branch called 'pu'. +has such an official throw-away integration branch called 'seen'. Branch management for a release @@ -291,8 +291,8 @@ This will not happen if the content of the branches was verified as described in the previous section. -Branch management for next and pu after a feature release -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Branch management for next and seen after a feature release +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ After a feature release, the integration branch 'next' may optionally be rewound and rebuilt from the tip of 'master' using the surviving @@ -319,8 +319,8 @@ so. If you do this, then you should make a public announcement indicating that 'next' was rewound and rebuilt. -The same rewind and rebuild process may be followed for 'pu'. A public -announcement is not necessary since 'pu' is a throw-away branch, as +The same rewind and rebuild process may be followed for 'seen'. A public +announcement is not necessary since 'seen' is a throw-away branch, as described above. diff --git a/third_party/git/Documentation/howto/maintain-git.txt b/third_party/git/Documentation/howto/maintain-git.txt index ca4378740c..a67130debb 100644 --- a/third_party/git/Documentation/howto/maintain-git.txt +++ b/third_party/git/Documentation/howto/maintain-git.txt @@ -66,7 +66,7 @@ this mailing list after each feature release is made. demonstrated to be regression free. New changes are tested in 'next' before merged to 'master'. - - 'pu' branch is used to publish other proposed changes that do + - 'seen' branch is used to publish other proposed changes that do not yet pass the criteria set for 'next'. - The tips of 'master' and 'maint' branches will not be rewound to @@ -76,7 +76,7 @@ this mailing list after each feature release is made. of the cycle. - Usually 'master' contains all of 'maint' and 'next' contains all - of 'master'. 'pu' contains all the topics merged to 'next', but + of 'master'. 'seen' contains all the topics merged to 'next', but is rebuilt directly on 'master'. - The tip of 'master' is meant to be more stable than any @@ -154,15 +154,17 @@ by doing the following: - Anything unobvious that is applicable to 'master' (in other words, does not depend on anything that is still in 'next' and not in 'master') is applied to a new topic branch that - is forked from the tip of 'master'. This includes both + is forked from the tip of 'master' (or the last feature release, + which is a bit older than 'master'). This includes both enhancements and unobvious fixes to 'master'. A topic branch is named as ai/topic where "ai" is two-letter string named after author's initial and "topic" is a descriptive name of the topic (in other words, "what's the series is about"). - An unobvious fix meant for 'maint' is applied to a new - topic branch that is forked from the tip of 'maint'. The - topic is named as ai/maint-topic. + topic branch that is forked from the tip of 'maint' (or the + oldest and still relevant maintenance branch). The + topic may be named as ai/maint-topic. - Changes that pertain to an existing topic are applied to the branch, but: @@ -174,24 +176,40 @@ by doing the following: - Replacement patches to an existing topic are accepted only for commits not in 'next'. - The above except the "replacement" are all done with: + The initial round is done with: $ git checkout ai/topic ;# or "git checkout -b ai/topic master" $ git am -sc3 mailbox - while patch replacement is often done by: + and replacing an existing topic with subsequent round is done with: - $ git format-patch ai/topic~$n..ai/topic ;# export existing + $ git checkout master...ai/topic ;# try to reapply to the same base + $ git am -sc3 mailbox + + to prepare the new round on a detached HEAD, and then + + $ git range-diff @{-1}... + $ git diff @{-1} - then replace some parts with the new patch, and reapplying: + to double check what changed since the last round, and finally - $ git checkout ai/topic - $ git reset --hard ai/topic~$n - $ git am -sc3 -s 000*.txt + $ git checkout -B @{-1} + + to conclude (the last step is why a topic already in 'next' is + not replaced but updated incrementally). + + Whether it is the initial round or a subsequent round, the topic + may not build even in isolation, or may break the build when + merged to integration branches due to bugs. There may already + be obvious and trivial improvements suggested on the list. The + maintainer often adds an extra commit, with "SQUASH???" in its + title, to fix things up, before publishing the integration + branches to make it usable by other developers for testing. + These changes are what the maintainer is not 100% committed to + (trivial typofixes etc. are often squashed directly into the + patches that need fixing, without being applied as a separate + "SQUASH???" commit), so that they can be removed easily as needed. - The full test suite is always run for 'maint' and 'master' - after patch application; for topic branches the tests are run - as time permits. - Merge maint to master as needed: @@ -211,12 +229,12 @@ by doing the following: series?) - Prepare 'jch' branch, which is used to represent somewhere - between 'master' and 'pu' and often is slightly ahead of 'next'. + between 'master' and 'seen' and often is slightly ahead of 'next'. - $ Meta/Reintegrate master..pu >Meta/redo-jch.sh + $ Meta/Reintegrate master..seen >Meta/redo-jch.sh The result is a script that lists topics to be merged in order to - rebuild 'pu' as the input to Meta/Reintegrate script. Remove + rebuild 'seen' as the input to Meta/Reintegrate script. Remove later topics that should not be in 'jch' yet. Add a line that consists of '### match next' before the name of the first topic in the output that should be in 'jch' but not in 'next' yet. @@ -273,29 +291,29 @@ by doing the following: merged to 'master'. This may lose '### match next' marker; add it again to the appropriate place when it happens. - - Rebuild 'pu'. + - Rebuild 'seen'. - $ Meta/Reintegrate master..pu >Meta/redo-pu.sh + $ Meta/Reintegrate master..seen >Meta/redo-seen.sh - Edit the result by adding new topics that are not still in 'pu' + Edit the result by adding new topics that are not still in 'seen' in the script. Then - $ git checkout -B pu jch - $ sh Meta/redo-pu.sh + $ git checkout -B seen jch + $ sh Meta/redo-seen.sh - When all is well, clean up the redo-pu.sh script with + When all is well, clean up the redo-seen.sh script with - $ sh Meta/redo-pu.sh -u + $ sh Meta/redo-seen.sh -u Double check by running - $ git branch --no-merged pu + $ git branch --no-merged seen to see there is no unexpected leftover topics. At this point, build-test the result for semantic conflicts, and if there are, prepare an appropriate merge-fix first (see - appendix), and rebuild the 'pu' branch from scratch, starting at + appendix), and rebuild the 'seen' branch from scratch, starting at the tip of 'jch'. - Update "What's cooking" message to review the updates to @@ -305,14 +323,14 @@ by doing the following: $ Meta/cook - This script inspects the history between master..pu, finds tips + This script inspects the history between master..seen, finds tips of topic branches, compares what it found with the current contents in Meta/whats-cooking.txt, and updates that file. - Topics not listed in the file but are found in master..pu are + Topics not listed in the file but are found in master..seen are added to the "New topics" section, topics listed in the file that - are no longer found in master..pu are moved to the "Graduated to + are no longer found in master..seen are moved to the "Graduated to master" section, and topics whose commits changed their states - (e.g. used to be only in 'pu', now merged to 'next') are updated + (e.g. used to be only in 'seen', now merged to 'next') are updated with change markers "<<" and ">>". Look for lines enclosed in "<<" and ">>"; they hold contents from @@ -342,7 +360,7 @@ Observations Some observations to be made. * Each topic is tested individually, and also together with other - topics cooking first in 'pu', then in 'jch' and then in 'next'. + topics cooking first in 'seen', then in 'jch' and then in 'next'. Until it matures, no part of it is merged to 'master'. * A topic already in 'next' can get fixes while still in @@ -371,6 +389,14 @@ Some observations to be made. be included in the next feature release. Being in the 'master' branch typically is. + * Due to the nature of "SQUASH???" fix-ups, if the original author + agrees with the suggested changes, it is OK to squash them to + appropriate patches in the next round (when the suggested change + is small enough, the author should not even bother with + "Helped-by"). It is also OK to drop them from the next round + when the original author does not agree with the suggestion, but + the author is expected to say why somewhere in the discussion. + Appendix -------- @@ -385,7 +411,7 @@ new use of the variable under its old name. When these two topics are merged together, the reference to the variable newly added by the latter topic will still use the old name in the result. -The Meta/Reintegrate script that is used by redo-jch and redo-pu +The Meta/Reintegrate script that is used by redo-jch and redo-seen scripts implements a crude but usable way to work this issue around. When the script merges branch $X, it checks if "refs/merge-fix/$X" exists, and if so, the effect of it is squashed into the result of @@ -405,14 +431,14 @@ commit that can be squashed into a result of mechanical merge to correct semantic conflicts. After finding that the result of merging branch "ai/topic" to an -integration branch had such a semantic conflict, say pu~4, check the +integration branch had such a semantic conflict, say seen~4, check the problematic merge out on a detached HEAD, edit the working tree to fix the semantic conflict, and make a separate commit to record the fix-up: - $ git checkout pu~4 + $ git checkout seen~4 $ git show -s --pretty=%s ;# double check - Merge branch 'ai/topic' to pu + Merge branch 'ai/topic' to seen $ edit $ git commit -m 'merge-fix/ai/topic' -a @@ -424,9 +450,9 @@ result: Then double check the result by asking Meta/Reintegrate to redo the merge: - $ git checkout pu~5 ;# the parent of the problem merge + $ git checkout seen~5 ;# the parent of the problem merge $ echo ai/topic | Meta/Reintegrate - $ git diff pu~4 + $ git diff seen~4 This time, because you prepared refs/merge-fix/ai/topic, the resulting merge should have been tweaked to include the fix for the @@ -438,7 +464,7 @@ branch needs this merge-fix is because another branch merged earlier to the integration branch changed the underlying assumption ai/topic branch made (e.g. ai/topic branch added a site to refer to a variable, while the other branch renamed that variable and adjusted -existing use sites), and if you changed redo-jch (or redo-pu) script +existing use sites), and if you changed redo-jch (or redo-seen) script to merge ai/topic branch before the other branch, then the above merge-fix should not be applied while merging ai/topic, but should instead be applied while merging the other branch. You would need diff --git a/third_party/git/Documentation/howto/rebase-from-internal-branch.txt b/third_party/git/Documentation/howto/rebase-from-internal-branch.txt index 02cb5f758d..f2e10a7ec8 100644 --- a/third_party/git/Documentation/howto/rebase-from-internal-branch.txt +++ b/third_party/git/Documentation/howto/rebase-from-internal-branch.txt @@ -4,7 +4,7 @@ Cc: Petr Baudis <pasky@suse.cz>, Linus Torvalds <torvalds@osdl.org> Subject: Re: sending changesets from the middle of a git tree Date: Sun, 14 Aug 2005 18:37:39 -0700 Abstract: In this article, JC talks about how he rebases the - public "pu" branch using the core Git tools when he updates + public "seen" branch using the core Git tools when he updates the "master" branch, and how "rebase" works. Also discussed is how this applies to individual developers who sends patches upstream. @@ -20,8 +20,8 @@ Petr Baudis <pasky@suse.cz> writes: > where Junio C Hamano <junkio@cox.net> told me that... >> Linus Torvalds <torvalds@osdl.org> writes: >> ->> > Junio, maybe you want to talk about how you move patches from your "pu" ->> > branch to the real branches. +>> > Junio, maybe you want to talk about how you move patches from your +>> > "seen" branch to the real branches. >> > Actually, wouldn't this be also precisely for what StGIT is intended to? -------------------------------------- @@ -33,12 +33,12 @@ the kind of task StGIT is designed to do. I just have done a simpler one, this time using only the core Git tools. -I had a handful of commits that were ahead of master in pu, and I +I had a handful of commits that were ahead of master in 'seen', and I wanted to add some documentation bypassing my usual habit of -placing new things in pu first. At the beginning, the commit +placing new things in 'seen' first. At the beginning, the commit ancestry graph looked like this: - *"pu" head + *"seen" head master --> #1 --> #2 --> #3 So I started from master, made a bunch of edits, and committed: @@ -50,7 +50,7 @@ So I started from master, made a bunch of edits, and committed: After the commit, the ancestry graph would look like this: - *"pu" head + *"seen" head master^ --> #1 --> #2 --> #3 \ \---> master @@ -58,31 +58,31 @@ After the commit, the ancestry graph would look like this: The old master is now master^ (the first parent of the master). The new master commit holds my documentation updates. -Now I have to deal with "pu" branch. +Now I have to deal with "seen" branch. This is the kind of situation I used to have all the time when Linus was the maintainer and I was a contributor, when you look -at "master" branch being the "maintainer" branch, and "pu" +at "master" branch being the "maintainer" branch, and "seen" branch being the "contributor" branch. Your work started at the tip of the "maintainer" branch some time ago, you made a lot of progress in the meantime, and now the maintainer branch has some other commits you do not have yet. And "git rebase" was written with the explicit purpose of helping to maintain branches like -"pu". You _could_ merge master to pu and keep going, but if you +"seen". You _could_ merge master to 'seen' and keep going, but if you eventually want to cherrypick and merge some but not necessarily all changes back to the master branch, it often makes later operations for _you_ easier if you rebase (i.e. carry forward -your changes) "pu" rather than merge. So I ran "git rebase": +your changes) "seen" rather than merge. So I ran "git rebase": - $ git checkout pu - $ git rebase master pu + $ git checkout seen + $ git rebase master seen What this does is to pick all the commits since the current -branch (note that I now am on "pu" branch) forked from the +branch (note that I now am on "seen" branch) forked from the master branch, and forward port these changes. master^ --> #1 --> #2 --> #3 - \ *"pu" head + \ *"seen" head \---> master --> #1' --> #2' --> #3' The diff between master^ and #1 is applied to master and @@ -92,7 +92,7 @@ commits are made similarly out of #2 and #3 commits. Old #3 is not recorded in any of the .git/refs/heads/ file anymore, so after doing this you will have dangling commit if -you ran fsck-cache, which is normal. After testing "pu", you +you ran fsck-cache, which is normal. After testing "seen", you can run "git prune" to get rid of those original three commits. While I am talking about "git rebase", I should talk about how diff --git a/third_party/git/Documentation/howto/revert-branch-rebase.txt b/third_party/git/Documentation/howto/revert-branch-rebase.txt index 149508e13b..a3e5595a56 100644 --- a/third_party/git/Documentation/howto/revert-branch-rebase.txt +++ b/third_party/git/Documentation/howto/revert-branch-rebase.txt @@ -15,7 +15,7 @@ One of the changes I pulled into the 'master' branch turns out to break building Git with GCC 2.95. While they were well-intentioned portability fixes, keeping things working with gcc-2.95 was also important. Here is what I did to revert the change in the 'master' -branch and to adjust the 'pu' branch, using core Git tools and +branch and to adjust the 'seen' branch, using core Git tools and barebone Porcelain. First, prepare a throw-away branch in case I screw things up. @@ -104,11 +104,11 @@ $ git diff master..revert-c99 says nothing. -Then we rebase the 'pu' branch as usual. +Then we rebase the 'seen' branch as usual. ------------------------------------------------ -$ git checkout pu -$ git tag pu-anchor pu +$ git checkout seen +$ git tag seen-anchor seen $ git rebase master * Applying: Redo "revert" using three-way merge machinery. First trying simple merge strategy to cherry-pick. @@ -127,11 +127,11 @@ First trying simple merge strategy to cherry-pick. First trying simple merge strategy to cherry-pick. ------------------------------------------------ -The temporary tag 'pu-anchor' is me just being careful, in case 'git +The temporary tag 'seen-anchor' is me just being careful, in case 'git rebase' screws up. After this, I can do these for sanity check: ------------------------------------------------ -$ git diff pu-anchor..pu ;# make sure we got the master fix. +$ git diff seen-anchor..seen ;# make sure we got the master fix. $ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage. $ make clean test ;# make sure it did not cause other breakage. ------------------------------------------------ @@ -140,7 +140,7 @@ Everything is in the good order. I do not need the temporary branch or tag anymore, so remove them: ------------------------------------------------ -$ rm -f .git/refs/tags/pu-anchor +$ rm -f .git/refs/tags/seen-anchor $ git branch -d revert-c99 ------------------------------------------------ @@ -168,18 +168,18 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f And the final repository status looks like this: ------------------------------------------------ -$ git show-branch --more=1 master pu rc +$ git show-branch --more=1 master seen rc ! [master] Revert "Replace zero-length array decls with []." - ! [pu] git-repack: Add option to repack all objects. + ! [seen] git-repack: Add option to repack all objects. * [rc] Merge refs/heads/master from . --- - + [pu] git-repack: Add option to repack all objects. - + [pu~1] More documentation updates. - + [pu~2] Show commits in topo order and name all commits. - + [pu~3] mailinfo and applymbox updates - + [pu~4] Document "git cherry-pick" and "git revert" - + [pu~5] Remove git-apply-patch-script. - + [pu~6] Redo "revert" using three-way merge machinery. + + [seen] git-repack: Add option to repack all objects. + + [seen~1] More documentation updates. + + [seen~2] Show commits in topo order and name all commits. + + [seen~3] mailinfo and applymbox updates + + [seen~4] Document "git cherry-pick" and "git revert" + + [seen~5] Remove git-apply-patch-script. + + [seen~6] Redo "revert" using three-way merge machinery. - [rc] Merge refs/heads/master from . ++* [master] Revert "Replace zero-length array decls with []." - [rc~1] Merge refs/heads/master from . diff --git a/third_party/git/Documentation/howto/separating-topic-branches.txt b/third_party/git/Documentation/howto/separating-topic-branches.txt index bd1027433b..81be0d6115 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 crufts. Then I can finally clean things up: +for cruft. 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/howto/update-hook-example.txt b/third_party/git/Documentation/howto/update-hook-example.txt index 89821ec74f..151ee84ceb 100644 --- a/third_party/git/Documentation/howto/update-hook-example.txt +++ b/third_party/git/Documentation/howto/update-hook-example.txt @@ -179,7 +179,7 @@ allowed-groups, to describe which heads can be pushed into by whom. The format of each file would look like this: refs/heads/master junio - +refs/heads/pu junio + +refs/heads/seen junio refs/heads/cogito$ pasky refs/heads/bw/.* linus refs/heads/tmp/.* .* @@ -187,6 +187,6 @@ whom. The format of each file would look like this: With this, Linus can push or create "bw/penguin" or "bw/zebra" or "bw/panda" branches, Pasky can do only "cogito", and JC can -do master and pu branches and make versioned tags. And anybody -can do tmp/blah branches. The '+' sign at the pu record means +do master and "seen" branches and make versioned tags. And anybody +can do tmp/blah branches. The '+' sign at the "seen" record means that JC can make non-fast-forward pushes on it. diff --git a/third_party/git/Documentation/manpage-1.72.xsl b/third_party/git/Documentation/manpage-1.72.xsl deleted file mode 100644 index b4d315cb8c..0000000000 --- a/third_party/git/Documentation/manpage-1.72.xsl +++ /dev/null @@ -1,14 +0,0 @@ -<!-- manpage-1.72.xsl: - special settings for manpages rendered from asciidoc+docbook - handles peculiarities in docbook-xsl 1.72.0 --> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - -<xsl:import href="manpage-base.xsl"/> - -<!-- these are the special values for the roff control characters - needed for docbook-xsl 1.72.0 --> -<xsl:param name="git.docbook.backslash">▓</xsl:param> -<xsl:param name="git.docbook.dot" >⌂</xsl:param> - -</xsl:stylesheet> diff --git a/third_party/git/Documentation/manpage-base.xsl b/third_party/git/Documentation/manpage-base.xsl deleted file mode 100644 index a264fa6160..0000000000 --- a/third_party/git/Documentation/manpage-base.xsl +++ /dev/null @@ -1,35 +0,0 @@ -<!-- manpage-base.xsl: - special formatting for manpages rendered from asciidoc+docbook --> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - -<!-- these params silence some output from xmlto --> -<xsl:param name="man.output.quietly" select="1"/> -<xsl:param name="refentry.meta.get.quietly" select="1"/> - -<!-- convert asciidoc callouts to man page format; - git.docbook.backslash and git.docbook.dot params - must be supplied by another XSL file or other means --> -<xsl:template match="co"> - <xsl:value-of select="concat( - $git.docbook.backslash,'fB(', - substring-after(@id,'-'),')', - $git.docbook.backslash,'fR')"/> -</xsl:template> -<xsl:template match="calloutlist"> - <xsl:value-of select="$git.docbook.dot"/> - <xsl:text>sp </xsl:text> - <xsl:apply-templates/> - <xsl:text> </xsl:text> -</xsl:template> -<xsl:template match="callout"> - <xsl:value-of select="concat( - $git.docbook.backslash,'fB', - substring-after(@arearefs,'-'), - '. ',$git.docbook.backslash,'fR')"/> - <xsl:apply-templates/> - <xsl:value-of select="$git.docbook.dot"/> - <xsl:text>br </xsl:text> -</xsl:template> - -</xsl:stylesheet> diff --git a/third_party/git/Documentation/manpage-bold-literal.xsl b/third_party/git/Documentation/manpage-bold-literal.xsl index 608eb5df62..e13db85693 100644 --- a/third_party/git/Documentation/manpage-bold-literal.xsl +++ b/third_party/git/Documentation/manpage-bold-literal.xsl @@ -1,17 +1,16 @@ <!-- 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"> - <xsl:value-of select="$git.docbook.backslash"/> - <xsl:text>fB</xsl:text> +<xsl:template match="literal|d:literal"> + <xsl:text>\fB</xsl:text> <xsl:apply-templates/> - <xsl:value-of select="$git.docbook.backslash"/> - <xsl:text>fR</xsl:text> + <xsl:text>\fR</xsl:text> </xsl:template> </xsl:stylesheet> diff --git a/third_party/git/Documentation/manpage-normal.xsl b/third_party/git/Documentation/manpage-normal.xsl index a48f5b11f3..a9c7ec69f4 100644 --- a/third_party/git/Documentation/manpage-normal.xsl +++ b/third_party/git/Documentation/manpage-normal.xsl @@ -1,13 +1,26 @@ <!-- manpage-normal.xsl: - special settings for manpages rendered from asciidoc+docbook - handles anything we want to keep away from docbook-xsl 1.72.0 --> + special settings for manpages rendered from asciidoc+docbook --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> -<xsl:import href="manpage-base.xsl"/> -<!-- these are the normal values for the roff control characters --> -<xsl:param name="git.docbook.backslash">\</xsl:param> -<xsl:param name="git.docbook.dot" >.</xsl:param> +<!-- these params silence some output from xmlto --> +<xsl:param name="man.output.quietly" select="1"/> +<xsl:param name="refentry.meta.get.quietly" select="1"/> + +<!-- convert asciidoc callouts to man page format --> +<xsl:template match="co"> + <xsl:value-of select="concat('\fB(',substring-after(@id,'-'),')\fR')"/> +</xsl:template> +<xsl:template match="calloutlist"> + <xsl:text>.sp </xsl:text> + <xsl:apply-templates/> + <xsl:text> </xsl:text> +</xsl:template> +<xsl:template match="callout"> + <xsl:value-of select="concat('\fB',substring-after(@arearefs,'-'),'. \fR')"/> + <xsl:apply-templates/> + <xsl:text>.br </xsl:text> +</xsl:template> </xsl:stylesheet> diff --git a/third_party/git/Documentation/manpage-suppress-sp.xsl b/third_party/git/Documentation/manpage-suppress-sp.xsl deleted file mode 100644 index a63c7632a8..0000000000 --- a/third_party/git/Documentation/manpage-suppress-sp.xsl +++ /dev/null @@ -1,21 +0,0 @@ -<!-- manpage-suppress-sp.xsl: - special settings for manpages rendered from asciidoc+docbook - handles erroneous, inline .sp in manpage output of some - versions of docbook-xsl --> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - -<!-- attempt to work around spurious .sp at the tail of the line - that some versions of docbook stylesheets seem to add --> -<xsl:template match="simpara"> - <xsl:variable name="content"> - <xsl:apply-templates/> - </xsl:variable> - <xsl:value-of select="normalize-space($content)"/> - <xsl:if test="not(ancestor::authorblurb) and - not(ancestor::personblurb)"> - <xsl:text> </xsl:text> - </xsl:if> -</xsl:template> - -</xsl:stylesheet> diff --git a/third_party/git/Documentation/manpage.xsl b/third_party/git/Documentation/manpage.xsl new file mode 100644 index 0000000000..ef64bab17a --- /dev/null +++ b/third_party/git/Documentation/manpage.xsl @@ -0,0 +1,3 @@ +<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 79a00d2a4a..80d4831662 100644 --- a/third_party/git/Documentation/merge-options.txt +++ b/third_party/git/Documentation/merge-options.txt @@ -34,32 +34,39 @@ set to `no` at the beginning of them. --cleanup=<mode>:: This option determines how the merge message will be cleaned up before - commiting. See linkgit:git-commit[1] for more details. In addition, if + committing. 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:: - 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. + 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. -S[<keyid>]:: --gpg-sign[=<keyid>]:: +--no-gpg-sign:: GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, - it must be stuck to the option without a space. + it must be stuck to the option without a space. `--no-gpg-sign` + is useful to countermand both `commit.gpgSign` configuration variable, + and earlier `--gpg-sign`. --log[=<n>]:: --no-log:: @@ -105,6 +112,10 @@ 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 @@ -149,6 +160,14 @@ ifndef::git-pull[] endif::git-pull[] +--autostash:: +--no-autostash:: + Automatically create a temporary stash entry before the operation + begins, and apply it after the operation ends. This means + that you can run the operation on a dirty worktree. However, use + with care: the final stash application after a successful + merge might result in non-trivial conflicts. + --allow-unrelated-histories:: By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be diff --git a/third_party/git/Documentation/merge-strategies.txt b/third_party/git/Documentation/merge-strategies.txt index aa66cbe41e..2912de706b 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 to the merge result. + conflict with our side are reflected in 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/object-format-disclaimer.txt b/third_party/git/Documentation/object-format-disclaimer.txt new file mode 100644 index 0000000000..4cb106f0d1 --- /dev/null +++ b/third_party/git/Documentation/object-format-disclaimer.txt @@ -0,0 +1,6 @@ +THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still +in an early stage. A SHA-256 repository will in general not be able to +share work with "regular" SHA-1 repositories. It should be assumed +that, e.g., Git internal file formats in relation to SHA-256 +repositories may change in backwards-incompatible ways. Only use +`--object-format=sha256` for testing purposes. diff --git a/third_party/git/Documentation/pretty-formats.txt b/third_party/git/Documentation/pretty-formats.txt index 079598307a..84bbc7439a 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 sha1s of ancestral commits are printed, +"Merge: " and the hashes 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' - <sha1> <title line> + <hash> <title line> + This is designed to be as compact as possible. * 'short' - commit <sha1> + commit <hash> Author: <author> <title line> * 'medium' - commit <sha1> + commit <hash> Author: <author> Date: <author date> @@ -43,7 +43,7 @@ This is designed to be as compact as possible. * 'full' - commit <sha1> + commit <hash> Author: <author> Commit: <committer> @@ -53,7 +53,7 @@ This is designed to be as compact as possible. * 'fuller' - commit <sha1> + commit <hash> Author: <author> AuthorDate: <author date> Commit: <committer> @@ -63,19 +63,36 @@ 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 <sha1> <date> + From <hash> <date> From: <author> Date: <author date> Subject: [PATCH] <title line> <full commit message> +* 'mboxrd' ++ +Like 'email', but lines in the commit message starting with "From " +(preceded by zero or more ">") are quoted with ">" so they aren't +confused as starting a new commit. + * 'raw' + The 'raw' format shows the entire commit exactly as -stored in the commit object. Notably, the SHA-1s are +stored in the commit object. Notably, the hashes 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 @@ -163,24 +180,32 @@ 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':: committer email local-part (the part before the '@' sign) +'%cL':: committer 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 @@ -207,8 +232,9 @@ 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 e44fc8f738..17c5aac4b7 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', 'email', 'raw', 'format:<string>' + 'full', 'fuller', 'reference', '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. @@ -25,8 +25,8 @@ people using 80-column terminals. --no-abbrev-commit:: Show the full 40-byte hexadecimal commit object name. This negates - `--abbrev-commit` and those options which imply it such as - "--oneline". It also overrides the `log.abbrevCommit` variable. + `--abbrev-commit`, either explicit or implied by other options such + as "--oneline". It also overrides the `log.abbrevCommit` variable. --oneline:: This is a shorthand for "--pretty=oneline --abbrev-commit" @@ -57,7 +57,7 @@ message by 4 spaces (i.e. 'medium', which is the default, 'full', and 'fuller'). ifndef::git-rev-list[] ---notes[=<treeish>]:: +--notes[=<ref>]:: 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 '<treeish>' argument, use the treeish to find the notes -to display. The treeish can specify the full refname when it begins +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 `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[=<treeish>]:: +--show-notes[=<ref>]:: --[no-]standard-notes:: These options are deprecated. Use the above --notes/--no-notes options instead. diff --git a/third_party/git/Documentation/pull-fetch-param.txt b/third_party/git/Documentation/pull-fetch-param.txt index 7d3a60f5b9..95a7390b2c 100644 --- a/third_party/git/Documentation/pull-fetch-param.txt +++ b/third_party/git/Documentation/pull-fetch-param.txt @@ -19,7 +19,8 @@ ifndef::git-pull[] (see <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> below). endif::git-pull[] ifdef::git-pull[] - (see linkgit:git-fetch[1]). + (see the section "CONFIGURED REMOTE-TRACKING BRANCHES" + in linkgit:git-fetch[1]). endif::git-pull[] + The format of a <refspec> parameter is an optional plus @@ -29,6 +30,22 @@ The colon can be omitted when <dst> is empty. <src> is typically a ref, but it can also be a fully spelled hex object name. + +A <refspec> may contain a `*` in its <src> to indicate a simple pattern +match. Such a refspec functions like a glob that matches any ref with the +same prefix. A pattern <refspec> must have a `*` in both the <src> and +<dst>. It will map refs to the destination by replacing the `*` with the +contents matched from the source. ++ +If a refspec is prefixed by `^`, it will be interpreted as a negative +refspec. Rather than specifying which refs to fetch or which local refs to +update, such a refspec will instead specify refs to exclude. A ref will be +considered to match if it matches at least one positive refspec, and does +not match any negative refspec. Negative refspecs can be useful to restrict +the scope of a pattern refspec so that it will not include specific refs. +Negative refspecs can themselves be pattern refspecs. However, they may only +contain a <src> and do not specify a <dst>. Fully spelled out hex object +names are also not supported. ++ `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests fetching everything up to the given tag. + diff --git a/third_party/git/Documentation/ref-reachability-filters.txt b/third_party/git/Documentation/ref-reachability-filters.txt new file mode 100644 index 0000000000..9bae46d84c --- /dev/null +++ b/third_party/git/Documentation/ref-reachability-filters.txt @@ -0,0 +1,7 @@ +When combining multiple `--contains` and `--no-contains` filters, only +references that contain at least one of the `--contains` commits and +contain none of the `--no-contains` commits are shown. + +When combining multiple `--merged` and `--no-merged` filters, only +references that are reachable from at least one of the `--merged` +commits and from none of the `--no-merged` commits are shown. diff --git a/third_party/git/Documentation/rev-list-description.txt b/third_party/git/Documentation/rev-list-description.txt new file mode 100644 index 0000000000..a9efa7fa27 --- /dev/null +++ b/third_party/git/Documentation/rev-list-description.txt @@ -0,0 +1,61 @@ +List commits that are reachable by following the `parent` links from the +given commit(s), but exclude commits that are reachable from the one(s) +given with a '{caret}' in front of them. The output is given in reverse +chronological order by default. + +You can think of this as a set operation. Commits reachable from any of +the commits given on the command line form a set, and then commits reachable +from any of the ones given with '{caret}' in front are subtracted from that +set. The remaining commits are what comes out in the command's output. +Various other options and paths parameters can be used to further limit the +result. + +Thus, the following command: + +ifdef::git-rev-list[] +----------------------------------------------------------------------- +$ git rev-list foo bar ^baz +----------------------------------------------------------------------- +endif::git-rev-list[] +ifdef::git-log[] +----------------------------------------------------------------------- +$ git log foo bar ^baz +----------------------------------------------------------------------- +endif::git-log[] + +means "list all the commits which are reachable from 'foo' or 'bar', but +not from 'baz'". + +A special notation "'<commit1>'..'<commit2>'" can be used as a +short-hand for "^'<commit1>' '<commit2>'". For example, either of +the following may be used interchangeably: + +ifdef::git-rev-list[] +----------------------------------------------------------------------- +$ git rev-list origin..HEAD +$ git rev-list HEAD ^origin +----------------------------------------------------------------------- +endif::git-rev-list[] +ifdef::git-log[] +----------------------------------------------------------------------- +$ git log origin..HEAD +$ git log HEAD ^origin +----------------------------------------------------------------------- +endif::git-log[] + +Another special notation is "'<commit1>'...'<commit2>'" which is useful +for merges. The resulting set of commits is the symmetric difference +between the two operands. The following two commands are equivalent: + +ifdef::git-rev-list[] +----------------------------------------------------------------------- +$ git rev-list A B --not $(git merge-base --all A B) +$ git rev-list A...B +----------------------------------------------------------------------- +endif::git-rev-list[] +ifdef::git-log[] +----------------------------------------------------------------------- +$ git log A B --not $(git merge-base --all A B) +$ git log A...B +----------------------------------------------------------------------- +endif::git-log[] diff --git a/third_party/git/Documentation/rev-list-options.txt b/third_party/git/Documentation/rev-list-options.txt index fa4e70f511..e0e32d32e2 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 `--show-notes` is in effect, the message from the notes is +When `--notes` is in effect, the message from the notes is matched as if it were part of the log message. endif::git-rev-list[] @@ -128,8 +128,7 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit). because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits - brought in to your history by such a merge. Cannot be - combined with --bisect. + brought in to your history by such a merge. --not:: Reverses the meaning of the '{caret}' prefix (or lack thereof) @@ -207,7 +206,7 @@ ifndef::git-rev-list[] Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command - line. Cannot be combined with --first-parent. + line. endif::git-rev-list[] --stdin:: @@ -269,7 +268,7 @@ list. exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\...commit2' notations cannot be used). + -With `--pretty` format other than `oneline` (for obvious reasons), +With `--pretty` format other than `oneline` and `reference` (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,6 +292,8 @@ 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 @@ -340,6 +341,12 @@ Default mode:: branches if the end result is the same (i.e. merging branches with the same content) +--show-pulls:: + Include all commits from the default mode, but also any merge + commits that are not TREESAME to the first parent but are + TREESAME to a later parent. This mode is helpful for showing + the merge commits that "first introduced" a change to a branch. + --full-history:: Same as the default mode, but does not prune some history. @@ -532,7 +539,7 @@ Note the major differences in `N`, `P`, and `Q` over `--full-history`: parent and is TREESAME. -- -Finally, there is a fifth simplification mode available: +There is another simplification mode available: --ancestry-path:: Limit the displayed commits to those directly on the ancestry @@ -571,6 +578,135 @@ option does. Applied to the 'D..M' range, it results in: L--M ----------------------------------------------------------------------- +Before discussing another option, `--show-pulls`, we need to +create a new example history. + +A common problem users face when looking at simplified history is that a +commit they know changed a file somehow does not appear in the file's +simplified history. Let's demonstrate a new example and show how options +such as `--full-history` and `--simplify-merges` works in that case: + +----------------------------------------------------------------------- + .-A---M-----C--N---O---P + / / \ \ \/ / / + I B \ R-'`-Z' / + \ / \/ / + \ / /\ / + `---X--' `---Y--' +----------------------------------------------------------------------- + +For this example, suppose `I` created `file.txt` which was modified by +`A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`, +and `Y` do not change `file.txt`. The merge commit `M` was created by +resolving the merge conflict to include both changes from `A` and `B` +and hence is not TREESAME to either. The merge commit `R`, however, was +created by ignoring the contents of `file.txt` at `M` and taking only +the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not +`M`. Finally, the natural merge resolution to create `N` is to take the +contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`. +The merge commits `O` and `P` are TREESAME to their first parents, but +not to their second parents, `Z` and `Y` respectively. + +When using the default mode, `N` and `R` both have a TREESAME parent, so +those edges are walked and the others are ignored. The resulting history +graph is: + +----------------------------------------------------------------------- + I---X +----------------------------------------------------------------------- + +When using `--full-history`, Git walks every edge. This will discover +the commits `A` and `B` and the merge `M`, but also will reveal the +merge commits `O` and `P`. With parent rewriting, the resulting graph is: + +----------------------------------------------------------------------- + .-A---M--------N---O---P + / / \ \ \/ / / + I B \ R-'`--' / + \ / \/ / + \ / /\ / + `---X--' `------' +----------------------------------------------------------------------- + +Here, the merge commits `O` and `P` contribute extra noise, as they did +not actually contribute a change to `file.txt`. They only merged a topic +that was based on an older version of `file.txt`. This is a common +issue in repositories using a workflow where many contributors work in +parallel and merge their topic branches along a single trunk: manu +unrelated merges appear in the `--full-history` results. + +When using the `--simplify-merges` option, the commits `O` and `P` +disappear from the results. This is because the rewritten second parents +of `O` and `P` are reachable from their first parents. Those edges are +removed and then the commits look like single-parent commits that are +TREESAME to their parent. This also happens to the commit `N`, resulting +in a history view as follows: + +----------------------------------------------------------------------- + .-A---M--. + / / \ + I B R + \ / / + \ / / + `---X--' +----------------------------------------------------------------------- + +In this view, we see all of the important single-parent changes from +`A`, `B`, and `X`. We also see the carefully-resolved merge `M` and the +not-so-carefully-resolved merge `R`. This is usually enough information +to determine why the commits `A` and `B` "disappeared" from history in +the default view. However, there are a few issues with this approach. + +The first issue is performance. Unlike any previous option, the +`--simplify-merges` option requires walking the entire commit history +before returning a single result. This can make the option difficult to +use for very large repositories. + +The second issue is one of auditing. When many contributors are working +on the same repository, it is important which merge commits introduced +a change into an important branch. The problematic merge `R` above is +not likely to be the merge commit that was used to merge into an +important branch. Instead, the merge `N` was used to merge `R` and `X` +into the important branch. This commit may have information about why +the change `X` came to override the changes from `A` and `B` in its +commit message. + +--show-pulls:: + In addition to the commits shown in the default history, show + each merge commit that is not TREESAME to its first parent but + is TREESAME to a later parent. ++ +When a merge commit is included by `--show-pulls`, the merge is +treated as if it "pulled" the change from another branch. When using +`--show-pulls` on this example (and no other options) the resulting +graph is: ++ +----------------------------------------------------------------------- + I---X---R---N +----------------------------------------------------------------------- ++ +Here, the merge commits `R` and `N` are included because they pulled +the commits `X` and `R` into the base branch, respectively. These +merges are the reason the commits `A` and `B` do not appear in the +default history. ++ +When `--show-pulls` is paired with `--simplify-merges`, the +graph includes all of the necessary information: ++ +----------------------------------------------------------------------- + .-A---M--. N + / / \ / + I B R + \ / / + \ / / + `---X--' +----------------------------------------------------------------------- ++ +Notice that since `M` is reachable from `R`, the edge from `N` to `M` +was simplified away. However, `N` still appears in the history as an +important commit because it "pulled" the change `R` into the main +branch. + The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME @@ -579,6 +715,7 @@ 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 ~~~~~~~~~~~~~~~~~ @@ -605,7 +742,7 @@ outputs 'midpoint', the output of the two commands would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length -one. Cannot be combined with --first-parent. +one. --bisect-vars:: This calculates the same as `--bisect`, except that refs in @@ -634,8 +771,9 @@ 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 ~~~~~~~~~~~~~~~ @@ -677,7 +815,9 @@ 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 ~~~~~~~~~~~~~~~~ @@ -756,6 +896,22 @@ 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. @@ -801,7 +957,9 @@ endif::git-rev-list[] --do-walk:: Overrides a previous `--no-walk`. +endif::git-shortlog[] +ifndef::git-shortlog[] Commit Formatting ~~~~~~~~~~~~~~~~~ @@ -960,46 +1118,4 @@ ifdef::git-rev-list[] counts and print the count for equivalent commits separated by a tab. endif::git-rev-list[] - -ifndef::git-rev-list[] -Diff Formatting -~~~~~~~~~~~~~~~ - -Listed below are options that control the formatting of diff output. -Some of them are specific to linkgit:git-rev-list[1], however other diff -options may be given. See linkgit:git-diff-files[1] for more options. - --c:: - With this option, diff output for a merge commit - shows the differences from each of the parents to the merge result - simultaneously instead of showing pairwise diff between a parent - and the result one at a time. Furthermore, it lists only files - which were modified from all parents. - ---cc:: - This flag implies the `-c` option and further compresses the - patch output by omitting uninteresting hunks whose contents in - the parents have only two variants and the merge result picks - one of them without modification. - ---combined-all-paths:: - This flag causes combined diffs (used for merge commits) to - list the name of the file from all parents. It thus only has - effect when -c or --cc are specified, and is likely only - useful if filename changes are detected (i.e. when either - rename or copy detection have been requested). - --m:: - This flag makes the merge commits show the full diff like - regular commits; for each merge parent, a separate log entry - and diff is generated. An exception is that only diff against - the first parent is shown when `--first-parent` option is given; - in that case, the output represents the changes the merge - brought _into_ the then-current branch. - --r:: - Show recursive diffs. - --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/revisions.txt b/third_party/git/Documentation/revisions.txt index 97f995e5a9..d9169c062e 100644 --- a/third_party/git/Documentation/revisions.txt +++ b/third_party/git/Documentation/revisions.txt @@ -233,7 +233,7 @@ G H I J A = = A^0 B = A^ = A^1 = A~1 - C = A^2 = A^2 + C = = A^2 D = A^^ = A^1^1 = A~2 E = B^2 = A^^2 F = B^3 = A^^3 @@ -254,6 +254,9 @@ specifying a single revision, using the notation described in the previous section, means the set of commits `reachable` from the given commit. +Specifying several revisions means the set of commits reachable from +any of the given commits. + A commit's reachable set is the commit itself and the commits in its ancestry chain. diff --git a/third_party/git/Documentation/technical/api-allocation-growing.txt b/third_party/git/Documentation/technical/api-allocation-growing.txt deleted file mode 100644 index 5a59b54844..0000000000 --- a/third_party/git/Documentation/technical/api-allocation-growing.txt +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 870c8edbfb..0000000000 --- a/third_party/git/Documentation/technical/api-argv-array.txt +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index 7d20716c32..0000000000 --- a/third_party/git/Documentation/technical/api-config.txt +++ /dev/null @@ -1,319 +0,0 @@ -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 deleted file mode 100644 index 75368f26ca..0000000000 --- a/third_party/git/Documentation/technical/api-credentials.txt +++ /dev/null @@ -1,271 +0,0 @@ -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 deleted file mode 100644 index 30fc0e9c93..0000000000 --- a/third_party/git/Documentation/technical/api-diff.txt +++ /dev/null @@ -1,174 +0,0 @@ -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 deleted file mode 100644 index 5abb8e8b1f..0000000000 --- a/third_party/git/Documentation/technical/api-directory-listing.txt +++ /dev/null @@ -1,130 +0,0 @@ -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 deleted file mode 100644 index 45f0df600f..0000000000 --- a/third_party/git/Documentation/technical/api-gitattributes.txt +++ /dev/null @@ -1,154 +0,0 @@ -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 deleted file mode 100644 index a69cc8964d..0000000000 --- a/third_party/git/Documentation/technical/api-grep.txt +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index d0d1707c8c..0000000000 --- a/third_party/git/Documentation/technical/api-history-graph.txt +++ /dev/null @@ -1,173 +0,0 @@ -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 9dc1bed768..487d4d83ff 100644 --- a/third_party/git/Documentation/technical/api-merge.txt +++ b/third_party/git/Documentation/technical/api-merge.txt @@ -28,77 +28,9 @@ and `diff.c` for examples. * `struct ll_merge_options` -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. +Check ll-merge.h for details. Low-level (single file) merge ----------------------------- -`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) +Check ll-merge.h for details. diff --git a/third_party/git/Documentation/technical/api-object-access.txt b/third_party/git/Documentation/technical/api-object-access.txt deleted file mode 100644 index 5b29622d00..0000000000 --- a/third_party/git/Documentation/technical/api-object-access.txt +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index c97428c2c3..0000000000 --- a/third_party/git/Documentation/technical/api-oid-array.txt +++ /dev/null @@ -1,90 +0,0 @@ -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-parse-options.txt b/third_party/git/Documentation/technical/api-parse-options.txt index 2e2e7c10c6..5a60bbfa7f 100644 --- a/third_party/git/Documentation/technical/api-parse-options.txt +++ b/third_party/git/Documentation/technical/api-parse-options.txt @@ -232,9 +232,9 @@ There are some macros to easily define options: will be overwritten, so this should only be used for options where the last one specified on the command line wins. -`OPT_PASSTHRU_ARGV(short, long, &argv_array_var, arg_str, description, flags)`:: +`OPT_PASSTHRU_ARGV(short, long, &strvec_var, arg_str, description, flags)`:: Introduce an option where all instances of it on the command-line will - be reconstructed into an argv_array. This is useful when you need to + be reconstructed into a strvec. This is useful when you need to pass the command-line option, which can be specified multiple times, to another command. diff --git a/third_party/git/Documentation/technical/api-quote.txt b/third_party/git/Documentation/technical/api-quote.txt deleted file mode 100644 index e8a1bce94e..0000000000 --- a/third_party/git/Documentation/technical/api-quote.txt +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index ad9d019ff9..0000000000 --- a/third_party/git/Documentation/technical/api-ref-iteration.txt +++ /dev/null @@ -1,78 +0,0 @@ -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 deleted file mode 100644 index f10941b2e8..0000000000 --- a/third_party/git/Documentation/technical/api-remote.txt +++ /dev/null @@ -1,127 +0,0 @@ -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 deleted file mode 100644 index 03f9ea6ac4..0000000000 --- a/third_party/git/Documentation/technical/api-revision-walking.txt +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index 8bf3e37f53..0000000000 --- a/third_party/git/Documentation/technical/api-run-command.txt +++ /dev/null @@ -1,264 +0,0 @@ -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 deleted file mode 100644 index eb1fa9853e..0000000000 --- a/third_party/git/Documentation/technical/api-setup.txt +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 9e1189ef01..0000000000 --- a/third_party/git/Documentation/technical/api-sigchain.txt +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index fb06089393..0000000000 --- a/third_party/git/Documentation/technical/api-submodule-config.txt +++ /dev/null @@ -1,66 +0,0 @@ -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 deleted file mode 100644 index fadb5979c4..0000000000 --- a/third_party/git/Documentation/technical/api-trace.txt +++ /dev/null @@ -1,140 +0,0 @@ -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 71eb081fed..6b6085585d 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":"1","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":"2","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,10 +142,9 @@ system or global config value to one of the following: include::../trace2-target-values.txt[] -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). +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). == Trace2 API @@ -179,7 +178,7 @@ describe the simplified forms. == Public API -All Trace2 API functions send a messsage to all of the active +All Trace2 API functions send a message to all of the active Trace2 Targets. This section describes the set of available messages. @@ -189,261 +188,36 @@ purposes. === Basic Command Messages These are concerned with the lifetime of the overall git process. - -`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. +e.g: `void trace2_initialize_clock()`, `void trace2_initialize()`, +`int trace2_is_enabled()`, `void trace2_cmd_start(int argc, const char **argv)`. === Command Detail Messages These are concerned with describing the specific Git command after the command line, config, and environment are inspected. - -`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. +e.g: `void trace2_cmd_name(const char *name)`, +`void trace2_cmd_mode(const char *mode)`. === Child Process Messages These are concerned with the various spawned child processes, including shell scripts, git commands, editors, pagers, and hooks. -`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. +e.g: `void trace2_child_start(struct child_process *cmd)`. === Git Thread Messages These messages are concerned with Git thread usage. -`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()`. +e.g: `void trace2_thread_start(const char *thread_name)`. === Region and Data Messages These are concerned with recording performance data -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)`:: +over regions or spans of code. e.g: +`void trace2_region_enter(const char *category, const char *label, const struct repository *repo)`. - 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. +Refer to trace2.h for details about all trace2 functions. == Trace2 Target Formats @@ -605,17 +379,35 @@ 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. + 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. + ------------ { "event":"version", ... - "evt":"1", # EVENT format version + "evt":"2", # 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(). + @@ -799,7 +591,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 -proces may be a shell script which doesn't have a session-id.) +process 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 @@ -864,7 +656,8 @@ The "exec_id" field is a command-unique id and is only useful if the ------------ `"def_param"`:: - This event is generated to log a global parameter. + This event is generated to log a global parameter, such as a config + setting, command-line flag, or environment variable. + ------------ { @@ -1159,7 +952,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 correpsonding nesting +Elapsed times are relative to the start of the corresponding nesting level as expected. For example, if we add region message to: + ---------------- @@ -1354,7 +1147,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 itemts +worked on 508 items at offset 2032. Thread "th04" worked on 508 items 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 deleted file mode 100644 index bde18622a8..0000000000 --- a/third_party/git/Documentation/technical/api-tree-walking.txt +++ /dev/null @@ -1,147 +0,0 @@ -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 deleted file mode 100644 index 6296ecad1d..0000000000 --- a/third_party/git/Documentation/technical/api-xdiff-interface.txt +++ /dev/null @@ -1,7 +0,0 @@ -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 new file mode 100644 index 0000000000..bac558d049 --- /dev/null +++ b/third_party/git/Documentation/technical/bundle-format.txt @@ -0,0 +1,76 @@ += 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. + +A v2 bundle looks like this: + +---- +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 +---- + +A v3 bundle looks like this: + +---- +bundle = signature *capability *prerequisite *reference LF pack +signature = "# v3 git bundle" LF + +capability = "@" key ["=" value] LF +prerequisite = "-" obj-id SP comment LF +comment = *CHAR +reference = obj-id SP refname LF +key = 1*(ALPHA / DIGIT / "-") +value = *(%01-09 / %0b-FF) + +pack = ... ; packfile +---- + +== Semantics + +A Git bundle consists of several parts. + +* "Capabilities", which are only in the v3 format, indicate functionality that + the bundle requires to be read properly. + +* "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. + +== Capabilities + +Because there is no opportunity for negotiation, unknown capabilities cause 'git +bundle' to abort. The only known capability is `object-format`, which specifies +the hash algorithm in use, and can take the same values as the +`extensions.objectFormat` configuration value. diff --git a/third_party/git/Documentation/technical/commit-graph-format.txt b/third_party/git/Documentation/technical/commit-graph-format.txt index a4f17441ae..b3b58880b9 100644 --- a/third_party/git/Documentation/technical/commit-graph-format.txt +++ b/third_party/git/Documentation/technical/commit-graph-format.txt @@ -17,6 +17,9 @@ metadata, including: - The parents of the commit, stored using positional references within the graph file. +- The Bloom filter of the commit carrying the paths that were changed between + the commit and its first parent, if requested. + These positional references are stored as unsigned 32-bit integers corresponding to the array position within the list of commit OIDs. Due to some special constants we use to track parents, we can store at most @@ -29,7 +32,7 @@ the body into "chunks" and provide a binary lookup table at the beginning of the body. The header includes certain values, such as number of chunks and hash type. -All 4-byte numbers are in network order. +All multi-byte numbers are in network byte order. HEADER: @@ -39,8 +42,13 @@ HEADER: 1-byte version number: Currently, the only valid version is 1. - 1-byte Hash Version (1 = SHA-1) - We infer the hash length (H) from this value. + 1-byte Hash Version + We infer the hash length (H) from this value: + 1 => SHA-1 + 2 => SHA-256 + If the hash type does not match the repository's hash algorithm, the + commit-graph file should be ignored with a warning presented to the + user. 1-byte number (C) of "chunks" @@ -74,7 +82,7 @@ CHUNK DATA: Commit Data (ID: {'C', 'D', 'A', 'T' }) (N * (H + 16) bytes) * The first H bytes are for the OID of the root tree. * The next 8 bytes are for the positions of the first two parents - of the ith commit. Stores value 0x7000000 if no parent in that + of the ith commit. Stores value 0x70000000 if no parent in that position. If there are more than two parents, the second value has its most-significant bit on and the other bits store an array position into the Extra Edge List chunk. @@ -93,6 +101,33 @@ CHUNK DATA: positions for the parents until reaching a value with the most-significant bit on. The other bits correspond to the position of the last parent. + Bloom Filter Index (ID: {'B', 'I', 'D', 'X'}) (N * 4 bytes) [Optional] + * The ith entry, BIDX[i], stores the number of bytes in all Bloom filters + from commit 0 to commit i (inclusive) in lexicographic order. The Bloom + filter for the i-th commit spans from BIDX[i-1] to BIDX[i] (plus header + length), where BIDX[-1] is 0. + * The BIDX chunk is ignored if the BDAT chunk is not present. + + Bloom Filter Data (ID: {'B', 'D', 'A', 'T'}) [Optional] + * It starts with header consisting of three unsigned 32-bit integers: + - Version of the hash algorithm being used. We currently only support + value 1 which corresponds to the 32-bit version of the murmur3 hash + implemented exactly as described in + https://en.wikipedia.org/wiki/MurmurHash#Algorithm and the double + hashing technique using seed values 0x293ae76f and 0x7e646e2 as + described in https://doi.org/10.1007/978-3-540-30494-4_26 "Bloom Filters + in Probabilistic Verification" + - The number of times a path is hashed and hence the number of bit positions + that cumulatively determine whether a file is present in the commit. + - The minimum number of bits 'b' per entry in the Bloom filter. If the filter + contains 'n' entries, then the filter size is the minimum number of 64-bit + words that contain n*b bits. + * The rest of the chunk is the concatenation of all the computed Bloom + filters for the commits in lexicographic order. + * Note: Commits with no changes or more than 512 changes have Bloom filters + of length one, with either all bits set to zero or one respectively. + * The BDAT chunk is present if and only if BIDX is present. + Base Graphs List (ID: {'B', 'A', 'S', 'E'}) [Optional] This list of H-byte hashes describe a set of B commit-graph files that form a commit-graph chain. The graph position for the ith commit in this diff --git a/third_party/git/Documentation/technical/commit-graph.txt b/third_party/git/Documentation/technical/commit-graph.txt index 729fbcb32f..f14a7659aa 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 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. +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. 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 amd M, respectively, + If A and B are commits with generation numbers N and M, respectively, and N < M, then A cannot reach B. Note how the strict inequality differs from the inequality when we have @@ -210,12 +210,12 @@ file. +---------------------+ | | +-----------------------+ +---------------------+ - | graph-{hash2} |->| | + | graph-{hash2} |->| | +-----------------------+ +---------------------+ | | | +-----------------------+ +---------------------+ | | | | - | graph-{hash1} |->| | + | graph-{hash1} |->| | | | | | +-----------------------+ +---------------------+ | tmp_graphXXX @@ -223,7 +223,7 @@ file. | | | | | | - | graph-{hash0} | + | graph-{hash0} | | | | | | | @@ -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://public-inbox.org/git/20110713070517.GC18566@sigill.intra.peff.net/ +[1] https://lore.kernel.org/git/20110713070517.GC18566@sigill.intra.peff.net/ An abandoned patch that introduced generation numbers. -[2] https://public-inbox.org/git/20170908033403.q7e6dj7benasrjes@sigill.intra.peff.net/ +[2] https://lore.kernel.org/git/20170908033403.q7e6dj7benasrjes@sigill.intra.peff.net/ Discussion about generation numbers on commits and how they interact with fsck. -[3] https://public-inbox.org/git/20170908034739.4op3w4f2ma5s65ku@sigill.intra.peff.net/ +[3] https://lore.kernel.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://public-inbox.org/git/20180108154822.54829-1-git@jeffhostetler.com/T/#u +[4] https://lore.kernel.org/git/20180108154822.54829-1-git@jeffhostetler.com/T/#u A patch to remove the ahead-behind calculation from 'status'. -[5] https://public-inbox.org/git/f27db281-abad-5043-6d71-cbb083b1c877@gmail.com/ +[5] https://lore.kernel.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 2ae8fa470a..6fd20ebbc2 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 reencode during clone and to encourage peers to modernize. +hash re-encode 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 @@ -650,7 +650,6 @@ Some initial steps can be implemented independently of one another: The first user-visible change is the introduction of the objectFormat extension (without compatObjectFormat). This requires: -- implementing the loose-object-idx - teaching fsck about this mode of operation - using the hash function API (vtable) when computing object names - signing objects and verifying signatures @@ -658,6 +657,7 @@ extension (without compatObjectFormat). This requires: repository Next comes introduction of compatObjectFormat: +- implementing the loose-object-idx - translating object names between object formats - translating object content between object formats - generating and verifying signatures in the compat format @@ -730,7 +730,7 @@ adoption. Using hash functions in parallel ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -(e.g. https://public-inbox.org/git/22708.8913.864049.452252@chiark.greenend.org.uk/ ) +(e.g. https://lore.kernel.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://public-inbox.org/git/20170304011251.GA26789@aiede.mtv.corp.google.com +http://lore.kernel.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://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/ +[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/ diff --git a/third_party/git/Documentation/technical/http-protocol.txt b/third_party/git/Documentation/technical/http-protocol.txt index 9c5b6f0fac..96d89ea9b2 100644 --- a/third_party/git/Documentation/technical/http-protocol.txt +++ b/third_party/git/Documentation/technical/http-protocol.txt @@ -216,7 +216,7 @@ smart server reply: S: 001e# service=git-upload-pack\n S: 0000 S: 004895dcfa3633004da0049d3d0fa03f80589cbcaf31 refs/heads/maint\0multi_ack\n - S: 0042d049f6c27a2244e12041955e262a404c7faba355 refs/heads/master\n + S: 003fd049f6c27a2244e12041955e262a404c7faba355 refs/heads/master\n S: 003c2cb58b79488a98d2721cea644875a8dd0026b115 refs/tags/v1.0\n S: 003fa3c2e2402b99163d1d59756e5f207ae21cccba4c refs/tags/v1.0^{}\n S: 0000 @@ -401,8 +401,9 @@ at all in the request stream: The stream is terminated by a pkt-line flush (`0000`). A single "want" or "have" command MUST have one hex formatted -SHA-1 as its value. Multiple SHA-1s MUST be sent by sending -multiple commands. +object name as its value. Multiple object names MUST be sent by sending +multiple commands. Object names MUST be given using the object format +negotiated through the `object-format` capability (default SHA-1). The `have` list is created by popping the first 32 commits from `c_pending`. Less can be supplied if `c_pending` empties. diff --git a/third_party/git/Documentation/technical/index-format.txt b/third_party/git/Documentation/technical/index-format.txt index 7c4d67aa6a..f9a3644711 100644 --- a/third_party/git/Documentation/technical/index-format.txt +++ b/third_party/git/Documentation/technical/index-format.txt @@ -3,8 +3,11 @@ Git index format == The Git index file has the following format - All binary numbers are in network byte order. Version 2 is described - here unless stated otherwise. + All binary numbers are in network byte order. + In a repository using the traditional SHA-1, checksums and object IDs + (object names) mentioned below are all computed using SHA-1. Similarly, + in SHA-256 repositories, these values are computed using SHA-256. + Version 2 is described here unless stated otherwise. - A 12-byte header consisting of @@ -32,8 +35,7 @@ Git index format Extension data - - 160-bit SHA-1 over the content of the index file before this - checksum. + - Hash checksum over the content of the index file before this checksum. == Index entry @@ -80,7 +82,7 @@ Git index format 32-bit file size This is the on-disk size from stat(2), truncated to 32-bit. - 160-bit SHA-1 for the represented object + Object name for the represented object A 16-bit 'flags' field split into (high to low bits) @@ -160,8 +162,8 @@ Git index format - A newline (ASCII 10); and - - 160-bit object name for the object that would result from writing - this span of index as a tree. + - Object name for the object that would result from writing this span + of index as a tree. An entry can be in an invalidated state and is represented by having a negative number in the entry_count field. In this case, there is no @@ -198,7 +200,7 @@ Git index format stage 1 to 3 (a missing stage is represented by "0" in this field); and - - At most three 160-bit object names of the entry in stages from 1 to 3 + - At most three object names of the entry in stages from 1 to 3 (nothing is written for a missing stage). === Split index @@ -211,8 +213,8 @@ Git index format The extension consists of: - - 160-bit SHA-1 of the shared index file. The shared index file path - is $GIT_DIR/sharedindex.<SHA-1>. If all 160 bits are zero, the + - Hash of the shared index file. The shared index file path + is $GIT_DIR/sharedindex.<hash>. If all bits are zero, the index does not require a shared index file. - An ewah-encoded delete bitmap, each bit represents an entry in the @@ -253,10 +255,10 @@ Git index format - 32-bit dir_flags (see struct dir_struct) - - 160-bit SHA-1 of $GIT_DIR/info/exclude. Null SHA-1 means the file + - Hash of $GIT_DIR/info/exclude. A null hash means the file does not exist. - - 160-bit SHA-1 of core.excludesfile. Null SHA-1 means the file does + - Hash of core.excludesfile. A null hash means the file does not exist. - NUL-terminated string of per-dir exclude file name. This usually @@ -285,13 +287,13 @@ The remaining data of each directory block is grouped by type: - An ewah bitmap, the n-th bit records "check-only" bit of read_directory_recursive() for the n-th directory. - - An ewah bitmap, the n-th bit indicates whether SHA-1 and stat data + - An ewah bitmap, the n-th bit indicates whether hash and stat data is valid for the n-th directory and exists in the next data. - An array of stat data. The n-th data corresponds with the n-th "one" bit in the previous ewah bitmap. - - An array of SHA-1. The n-th SHA-1 corresponds with the n-th "one" bit + - An array of hashes. The n-th hash corresponds with the n-th "one" bit in the previous ewah bitmap. - One NUL. @@ -318,7 +320,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 begining of the extensions. Code can take + length index entries and the beginning 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. @@ -330,12 +332,12 @@ The remaining data of each directory block is grouped by type: - 32-bit offset to the end of the index entries - - 160-bit SHA-1 over the extension types and their sizes (but not + - Hash over the extension types and their sizes (but not their contents). E.g. if we have "TREE" extension that is N-bytes long, "REUC" extension that is M-bytes long, followed by "EOIE", then the hash would be: - SHA-1("TREE" + <binary representation of N> + + Hash("TREE" + <binary representation of N> + "REUC" + <binary representation of M>) == Index Entry Offset Table @@ -351,7 +353,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 begining of the file to the first cache entry + - 32-bit offset from the beginning 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 d7e57639f7..4e7631437a 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 pack.multiIndex config setting must be on to consume MIDX files. +- The core.multiPackIndex 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://public-inbox.org/git/20180107181459.222909-1-dstolee@microsoft.com/ +[1] https://lore.kernel.org/git/20180107181459.222909-1-dstolee@microsoft.com/ An earlier RFC for the multi-pack-index feature -[2] https://public-inbox.org/git/alpine.DEB.2.20.1803091557510.23109@alexmv-linux/ +[2] https://lore.kernel.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 cab5bdd2ff..f96b2e605f 100644 --- a/third_party/git/Documentation/technical/pack-format.txt +++ b/third_party/git/Documentation/technical/pack-format.txt @@ -1,6 +1,12 @@ Git pack format =============== +== Checksums and object IDs + +In a repository using the traditional SHA-1, pack checksums, index checksums, +and object IDs (object names) mentioned below are all computed using SHA-1. +Similarly, in SHA-256 repositories, these values are computed using SHA-256. + == pack-*.pack files have the following format: - A header appears at the beginning and consists of the following: @@ -26,7 +32,7 @@ Git pack format (deltified representation) n-byte type and length (3-bit type, (n-1)*7+4-bit length) - 20-byte base object name if OBJ_REF_DELTA or a negative relative + base object name if OBJ_REF_DELTA or a negative relative offset from the delta object's position in the pack if this is an OBJ_OFS_DELTA object compressed delta data @@ -34,7 +40,7 @@ Git pack format Observation: length of each object is encoded in a variable length format and is not constrained to 32-bit or anything. - - The trailer records 20-byte SHA-1 checksum of all of the above. + - The trailer records a pack checksum of all of the above. === Object types @@ -58,8 +64,8 @@ ofs-delta and ref-delta, which is only valid in a pack file. Both ofs-delta and ref-delta store the "delta" to be applied to another object (called 'base object') to reconstruct the object. The -difference between them is, ref-delta directly encodes 20-byte base -object name. If the base object is in the same pack, ofs-delta encodes +difference between them is, ref-delta directly encodes base object +name. If the base object is in the same pack, ofs-delta encodes the offset of the base object in the pack instead. The base object could also be deltified if it's in the same pack. @@ -143,14 +149,14 @@ This is the instruction reserved for future expansion. object is stored in the packfile as the offset from the beginning. - 20-byte object name. + one object name of the appropriate size. - The file is concluded with a trailer: - A copy of the 20-byte SHA-1 checksum at the end of - corresponding packfile. + A copy of the pack checksum at the end of the corresponding + packfile. - 20-byte SHA-1-checksum of all of the above. + Index checksum of all of the above. Pack Idx file: @@ -198,7 +204,7 @@ Pack file entry: <+ If it is not DELTA, then deflated bytes (the size above is the size before compression). If it is REF_DELTA, then - 20-byte base object name SHA-1 (the size above is the + base object name (the size above is the size of the delta data that follows). delta data, deflated. If it is OFS_DELTA, then @@ -227,9 +233,9 @@ Pack file entry: <+ - A 256-entry fan-out table just like v1. - - A table of sorted 20-byte SHA-1 object names. These are - packed together without offset values to reduce the cache - footprint of the binary search for a specific object name. + - A table of sorted object names. These are packed together + without offset values to reduce the cache footprint of the + binary search for a specific object name. - A table of 4-byte CRC32 values of the packed object data. This is new in v2 so compressed data can be copied directly @@ -248,10 +254,10 @@ Pack file entry: <+ - The same trailer as a v1 pack file: - A copy of the 20-byte SHA-1 checksum at the end of + A copy of the pack checksum at the end of corresponding packfile. - 20-byte SHA-1-checksum of all of the above. + Index checksum of all of the above. == multi-pack-index (MIDX) files have the following format: @@ -273,7 +279,12 @@ HEADER: Git only writes or recognizes version 1. 1-byte Object Id Version - Git only writes or recognizes version 1 (SHA1). + We infer the length of object IDs (OIDs) from this value: + 1 => SHA-1 + 2 => SHA-256 + If the hash type does not match the repository's hash algorithm, + the multi-pack-index file should be ignored with a warning + presented to the user. 1-byte number of "chunks" @@ -315,10 +326,11 @@ 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^31, then the large offset chunk + If all offsets are less than 2^32, 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. If the large offset chunk + the large offset chunk must exist, and offsets larger than + 2^31-1 must be stored in it instead. 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. @@ -328,4 +340,4 @@ CHUNK DATA: TRAILER: - 20-byte SHA1-checksum of the above contents. + Index checksum of the above contents. diff --git a/third_party/git/Documentation/technical/pack-protocol.txt b/third_party/git/Documentation/technical/pack-protocol.txt index c73e72de0e..e13a2c064d 100644 --- a/third_party/git/Documentation/technical/pack-protocol.txt +++ b/third_party/git/Documentation/technical/pack-protocol.txt @@ -96,7 +96,7 @@ Basically what the Git client is doing to connect to an 'upload-pack' process on the server side over the Git protocol is this: $ echo -e -n \ - "0039git-upload-pack /schacon/gitbook.git\0host=example.com\0" | + "003agit-upload-pack /schacon/gitbook.git\0host=example.com\0" | nc -v example.com 9418 @@ -171,9 +171,9 @@ with a version number (if "version=1" is sent as an Extra Parameter), and a listing of each reference it has (all branches and tags) along with the object name that each reference currently points to. - $ echo -e -n "0044git-upload-pack /schacon/gitbook.git\0host=example.com\0\0version=1\0" | + $ echo -e -n "0045git-upload-pack /schacon/gitbook.git\0host=example.com\0\0version=1\0" | nc -v example.com 9418 - 000aversion 1 + 000eversion 1 00887217a7c7e582c46cec22a130adf4b9d7d950fba0 HEAD\0multi_ack thin-pack side-band side-band-64k ofs-delta shallow no-progress include-tag 00441d3fcd5ced445d1abc402225c0b8a1299641f497 refs/heads/integration @@ -503,8 +503,8 @@ The reference discovery phase is done nearly the same way as it is in the fetching protocol. Each reference obj-id and name on the server is sent in packet-line format to the client, followed by a flush-pkt. The only real difference is that the capability listing is different - the only -possible values are 'report-status', 'delete-refs', 'ofs-delta' and -'push-options'. +possible values are 'report-status', 'report-status-v2', 'delete-refs', +'ofs-delta', 'atomic' and 'push-options'. Reference Update Request and Packfile Transfer ---------------------------------------------- @@ -625,7 +625,7 @@ Report Status ------------- After receiving the pack data from the sender, the receiver sends a -report if 'report-status' capability is in effect. +report if 'report-status' or 'report-status-v2' capability is in effect. It is a short listing of what happened in that update. It will first list the status of the packfile unpacking as either 'unpack ok' or 'unpack [error]'. Then it will list the status for each of the references @@ -644,7 +644,42 @@ 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*(OCTECT) ; where not "ok" + error-msg = 1*(OCTET) ; where not "ok" +---- + +The 'report-status-v2' capability extends the protocol by adding new option +lines in order to support reporting of reference rewritten by the +'proc-receive' hook. The 'proc-receive' hook may handle a command for a +pseudo-reference which may create or update one or more references, and each +reference may have different name, different new-oid, and different old-oid. + +---- + report-status-v2 = unpack-status + 1*(command-status-v2) + flush-pkt + + unpack-status = PKT-LINE("unpack" SP unpack-result) + unpack-result = "ok" / error-msg + + command-status-v2 = command-ok-v2 / command-fail + command-ok-v2 = command-ok + *option-line + + command-ok = PKT-LINE("ok" SP refname) + command-fail = PKT-LINE("ng" SP refname SP error-msg) + + error-msg = 1*(OCTET) ; where not "ok" + + option-line = *1(option-refname) + *1(option-old-oid) + *1(option-new-oid) + *1(option-forced-update) + + option-refname = PKT-LINE("option" SP "refname" SP refname) + option-old-oid = PKT-LINE("option" SP "old-oid" SP obj-id) + option-new-oid = PKT-LINE("option" SP "new-oid" SP obj-id) + option-force = PKT-LINE("option" SP "forced-update") + ---- Updates can be unsuccessful for a number of reasons. The reference can have diff --git a/third_party/git/Documentation/technical/packfile-uri.txt b/third_party/git/Documentation/technical/packfile-uri.txt new file mode 100644 index 0000000000..318713abc3 --- /dev/null +++ b/third_party/git/Documentation/technical/packfile-uri.txt @@ -0,0 +1,78 @@ +Packfile URIs +============= + +This feature allows servers to serve part of their packfile response as URIs. +This allows server designs that improve scalability in bandwidth and CPU usage +(for example, by serving some data through a CDN), and (in the future) provides +some measure of resumability to clients. + +This feature is available only in protocol version 2. + +Protocol +-------- + +The server advertises the `packfile-uris` capability. + +If the client then communicates which protocols (HTTPS, etc.) it supports with +a `packfile-uris` argument, the server MAY send a `packfile-uris` section +directly before the `packfile` section (right after `wanted-refs` if it is +sent) containing URIs of any of the given protocols. The URIs point to +packfiles that use only features that the client has declared that it supports +(e.g. ofs-delta and thin-pack). See protocol-v2.txt for the documentation of +this section. + +Clients should then download and index all the given URIs (in addition to +downloading and indexing the packfile given in the `packfile` section of the +response) before performing the connectivity check. + +Server design +------------- + +The server can be trivially made compatible with the proposed protocol by +having it advertise `packfile-uris`, tolerating the client sending +`packfile-uris`, and never sending any `packfile-uris` section. But we should +include some sort of non-trivial implementation in the Minimum Viable Product, +at least so that we can test the client. + +This is the implementation: a feature, marked experimental, that allows the +server to be configured by one or more `uploadpack.blobPackfileUri=<sha1> +<uri>` entries. Whenever the list of objects to be sent is assembled, all such +blobs are excluded, replaced with URIs. The client will download those URIs, +expecting them to each point to packfiles containing single blobs. + +Client design +------------- + +The client has a config variable `fetch.uriprotocols` that determines which +protocols the end user is willing to use. By default, this is empty. + +When the client downloads the given URIs, it should store them with "keep" +files, just like it does with the packfile in the `packfile` section. These +additional "keep" files can only be removed after the refs have been updated - +just like the "keep" file for the packfile in the `packfile` section. + +The division of work (initial fetch + additional URIs) introduces convenient +points for resumption of an interrupted clone - such resumption can be done +after the Minimum Viable Product (see "Future work"). + +Future work +----------- + +The protocol design allows some evolution of the server and client without any +need for protocol changes, so only a small-scoped design is included here to +form the MVP. For example, the following can be done: + + * On the server, more sophisticated means of excluding objects (e.g. by + specifying a commit to represent that commit and all objects that it + references). + * On the client, resumption of clone. If a clone is interrupted, information + could be recorded in the repository's config and a "clone-resume" command + can resume the clone in progress. (Resumption of subsequent fetches is more + difficult because that must deal with the user wanting to use the repository + even after the fetch was interrupted.) + +There are some possible features that will require a change in protocol: + + * Additional HTTP headers (e.g. authentication) + * Byte range support + * Different file formats referenced by URIs (e.g. raw object) diff --git a/third_party/git/Documentation/technical/partial-clone.txt b/third_party/git/Documentation/technical/partial-clone.txt index 896c7b3878..0780d30cac 100644 --- a/third_party/git/Documentation/technical/partial-clone.txt +++ b/third_party/git/Documentation/technical/partial-clone.txt @@ -30,12 +30,20 @@ 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 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 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. Non-Goals @@ -100,18 +108,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 the - promisor remote 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 promisor remotes 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 the promisor remote has promised - that it has, either because the local repository has that object in one of + 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 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 @@ -123,12 +131,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 the promisor remote. + to dynamically fetch missing objects from promisor remotes. + When the normal object lookup fails to find an object, Git invokes -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. +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. + For efficiency reasons, no check as to whether the missing object is actually a promisor object is performed. @@ -157,46 +165,80 @@ 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. We hope that concurrent efforts to add an ODB API can -encompass this. +additional flag. Fetching Missing Objects ------------------------ -- Fetching of objects is done using the existing transport mechanism using - transport_fetch_refs(), setting a new transport option - TRANS_OPT_NO_DEPENDENTS to indicate that only the objects themselves are - desired, not any object that they refer to. -+ -Because some transports invoke fetch_pack() in the same process, fetch_pack() -has been updated to not use any object flags when the corresponding argument -(no_dependents) is set. +- Fetching of objects is done by invoking a "git fetch" subprocess. - The local repository sends a request with the hashes of all requested - objects as "want" lines, and does not perform any packfile negotiation. + objects, and does not perform any packfile negotiation. It then receives a packfile. -- Because we are reusing the existing fetch-pack mechanism, fetching +- Because we are reusing the existing fetch mechanism, fetching currently fetches all objects referred to by the requested objects, even 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 ------------------- -- The remote used for a partial clone (or the first partial fetch - following a regular clone) is marked as the "promisor remote". +- 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. + -We are currently limited to a single promisor remote and only that -remote may be used for subsequent partial fetches. +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 accept this limitation because we believe initial users of this -feature will be using it on repositories with a strong single central -server. +It is not possible to push at the same time to multiple promisor +remote in a specific order. -- Dynamic object fetching will only ask the promisor remote for missing - objects. We assume that the promisor remote has a complete view of the +- Dynamic object fetching will only ask promisor remotes for missing + objects. We assume that promisor remotes have a complete view of the repository and can satisfy all such requests. - Repack essentially treats promisor and non-promisor packfiles as 2 @@ -218,15 +260,17 @@ server. Future Work ----------- -- 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. +- Improve the way to specify the order in which promisor remotes are + tried. + -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. +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. + -Or the user might want to work in a triangular work flow with multiple +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 @@ -299,26 +343,26 @@ Related Links [0] https://crbug.com/git/2 Bug#2: Partial Clone -[1] https://public-inbox.org/git/20170113155253.1644-1-benpeart@microsoft.com/ + +[1] https://lore.kernel.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://public-inbox.org/git/cover.1506714999.git.jonathantanmy@google.com/ + +[2] https://lore.kernel.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://public-inbox.org/git/20170426221346.25337-1-jonathantanmy@google.com/ + +[3] https://lore.kernel.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://public-inbox.org/git/1488999039-37631-1-git-send-email-git@jeffhostetler.com/ + +[4] https://lore.kernel.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://public-inbox.org/git/20170505152802.6724-1-benpeart@microsoft.com/ + +[5] https://lore.kernel.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://public-inbox.org/git/20170714132651.170708-1-benpeart@microsoft.com/ + +[6] https://lore.kernel.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-capabilities.txt b/third_party/git/Documentation/technical/protocol-capabilities.txt index 2b267c0da6..ba869a7d36 100644 --- a/third_party/git/Documentation/technical/protocol-capabilities.txt +++ b/third_party/git/Documentation/technical/protocol-capabilities.txt @@ -22,9 +22,9 @@ was sent. Server MUST NOT ignore capabilities that client requested and server advertised. As a consequence of these rules, server MUST NOT advertise capabilities it does not understand. -The 'atomic', 'report-status', 'delete-refs', 'quiet', and 'push-cert' -capabilities are sent and recognized by the receive-pack (push to server) -process. +The 'atomic', 'report-status', 'report-status-v2', 'delete-refs', 'quiet', +and 'push-cert' capabilities are sent and recognized by the receive-pack +(push to server) process. The 'ofs-delta' and 'side-band-64k' capabilities are sent and recognized by both upload-pack and receive-pack protocols. The 'agent' capability @@ -176,6 +176,21 @@ agent strings are purely informative for statistics and debugging purposes, and MUST NOT be used to programmatically assume the presence or absence of particular features. +object-format +------------- + +This capability, which takes a hash algorithm as an argument, indicates +that the server supports the given hash algorithms. It may be sent +multiple times; if so, the first one given is the one used in the ref +advertisement. + +When provided by the client, this indicates that it intends to use the +given hash algorithm to communicate. The algorithm provided must be one +that the server supports. + +If this capability is not provided, it is assumed that the only +supported algorithm is SHA-1. + symref ------ @@ -269,6 +284,17 @@ each reference was updated successfully. If any of those were not successful, it will send back an error message. See pack-protocol.txt for example messages. +report-status-v2 +---------------- + +Capability 'report-status-v2' extends capability 'report-status' by +adding new "option" directives in order to support reference rewritten by +the "proc-receive" hook. The "proc-receive" hook may handle a command +for a pseudo-reference which may create or update a reference with +different name, new-oid, and old-oid. While the capability +'report-status' cannot report for such case. See pack-protocol.txt +for details. + delete-refs ----------- @@ -309,15 +335,19 @@ allow-tip-sha1-in-want ---------------------- If the upload-pack server advertises this capability, fetch-pack may -send "want" lines with SHA-1s that exist at the server but are not -advertised by upload-pack. +send "want" lines with object names that exist at the server but are not +advertised by upload-pack. For historical reasons, the name of this +capability contains "sha1". Object names are always given using the +object format negotiated through the 'object-format' capability. allow-reachable-sha1-in-want ---------------------------- If the upload-pack server advertises this capability, fetch-pack may -send "want" lines with SHA-1s that exist at the server but are not -advertised by upload-pack. +send "want" lines with object names that exist at the server but are not +advertised by upload-pack. For historical reasons, the name of this +capability contains "sha1". Object names are always given using the +object format negotiated through the 'object-format' capability. push-cert=<nonce> ----------------- diff --git a/third_party/git/Documentation/technical/protocol-v2.txt b/third_party/git/Documentation/technical/protocol-v2.txt index 40f91f6b1e..e597b74da3 100644 --- a/third_party/git/Documentation/technical/protocol-v2.txt +++ b/third_party/git/Documentation/technical/protocol-v2.txt @@ -33,6 +33,8 @@ In protocol v2 these special packets will have the following semantics: * '0000' Flush Packet (flush-pkt) - indicates the end of a message * '0001' Delimiter Packet (delim-pkt) - separates sections of a message + * '0002' Message Packet (response-end-pkt) - indicates the end of a response + for stateless connections Initial Client Request ---------------------- @@ -252,7 +254,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 (ake type 6) in a packfile. + they can read OBJ_OFS_DELTA (aka 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 @@ -323,13 +325,26 @@ included in the client's request: indicating its sideband (1, 2, or 3), and the server may send "0005\2" (a PKT-LINE of sideband 2 with no payload) as a keepalive packet. +If the 'packfile-uris' feature is advertised, the following argument +can be included in the client's request as well as the potential +addition of the 'packfile-uris' section in the server's response as +explained below. + + packfile-uris <comma-separated list of protocols> + Indicates to the server that the client is willing to receive + URIs of any of the given protocols in place of objects in the + sent packfile. Before performing the connectivity check, the + client should download from all given URIs. Currently, the + protocols supported are "http" and "https". + The response of `fetch` is broken into a number of sections separated by delimiter packets (0001), with each section beginning with its section -header. +header. Most sections are sent only when the packfile is sent. - output = *section - section = (acknowledgments | shallow-info | wanted-refs | packfile) - (flush-pkt | delim-pkt) + output = acknowledgements flush-pkt | + [acknowledgments delim-pkt] [shallow-info delim-pkt] + [wanted-refs delim-pkt] [packfile-uris delim-pkt] + packfile flush-pkt acknowledgments = PKT-LINE("acknowledgments" LF) (nak | *ack) @@ -347,13 +362,17 @@ header. *PKT-LINE(wanted-ref LF) wanted-ref = obj-id SP refname + packfile-uris = PKT-LINE("packfile-uris" LF) *packfile-uri + packfile-uri = PKT-LINE(40*(HEXDIGIT) SP *%x20-ff LF) + packfile = PKT-LINE("packfile" LF) *PKT-LINE(%x01-03 *%x00-ff) acknowledgments section - * If the client determines that it is finished with negotiations - by sending a "done" line, the acknowledgments sections MUST be - omitted from the server's response. + * If the client determines that it is finished with negotiations by + sending a "done" line (thus requiring the server to send a packfile), + the acknowledgments sections MUST be omitted from the server's + response. * Always begins with the section header "acknowledgments" @@ -404,9 +423,6 @@ header. which the client has not indicated was shallow as a part of its request. - * This section is only included if a packfile section is also - included in the response. - wanted-refs section * This section is only included if the client has requested a ref using a 'want-ref' line and if a packfile section is also @@ -420,6 +436,20 @@ header. * The server MUST NOT send any refs which were not requested using 'want-ref' lines. + packfile-uris section + * This section is only included if the client sent + 'packfile-uris' and the server has at least one such URI to + send. + + * Always begins with the section header "packfile-uris". + + * For each URI the server sends, it sends a hash of the pack's + contents (as output by git index-pack) followed by the URI. + + * The hashes are 40 hex characters long. When Git upgrades to a new + hash algorithm, this might need to be updated. (It should match + whatever index-pack outputs after "pack\t" or "keep\t". + packfile section * This section is only included if the client has sent 'want' lines in its request and either requested that no more @@ -453,3 +483,12 @@ included in a request. This is done by sending each option as a a request. The provided options must not contain a NUL or LF character. + + object-format +~~~~~~~~~~~~~~~ + +The server can advertise the `object-format` capability with a value `X` (in the +form `object-format=X`) to notify the client that the server is able to deal +with objects using hash algorithm X. If not specified, the server is assumed to +only handle SHA-1. If the client would like to use a hash algorithm other than +SHA-1, it should specify its object-format string. diff --git a/third_party/git/Documentation/technical/racy-git.txt b/third_party/git/Documentation/technical/racy-git.txt index 4a8be4d144..ceda4bbfda 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://lkml.org/lkml/2015/6/9/714 +https://lore.kernel.org/lkml/5577240D.7020309@gmail.com/ Racy Git -------- diff --git a/third_party/git/Documentation/technical/reftable.txt b/third_party/git/Documentation/technical/reftable.txt new file mode 100644 index 0000000000..2951840e9c --- /dev/null +++ b/third_party/git/Documentation/technical/reftable.txt @@ -0,0 +1,1083 @@ +reftable +-------- + +Overview +~~~~~~~~ + +Problem statement +^^^^^^^^^^^^^^^^^ + +Some repositories contain a lot of references (e.g. android at 866k, +rails at 31k). The existing packed-refs format takes up a lot of space +(e.g. 62M), and does not scale with additional references. Lookup of a +single reference requires linearly scanning the file. + +Atomic pushes modifying multiple references require copying the entire +packed-refs file, which can be a considerable amount of data moved +(e.g. 62M in, 62M out) for even small transactions (2 refs modified). + +Repositories with many loose references occupy a large number of disk +blocks from the local file system, as each reference is its own file +storing 41 bytes (and another file for the corresponding reflog). This +negatively affects the number of inodes available when a large number of +repositories are stored on the same filesystem. Readers can be penalized +due to the larger number of syscalls required to traverse and read the +`$GIT_DIR/refs` directory. + + +Objectives +^^^^^^^^^^ + +* Near constant time lookup for any single reference, even when the +repository is cold and not in process or kernel cache. +* Near constant time verification if an object name is referred to by at least +one reference (for allow-tip-sha1-in-want). +* Efficient enumeration of an entire namespace, such as `refs/tags/`. +* Support atomic push with `O(size_of_update)` operations. +* Combine reflog storage with ref storage for small transactions. +* Separate reflog storage for base refs and historical logs. + +Description +^^^^^^^^^^^ + +A reftable file is a portable binary file format customized for +reference storage. References are sorted, enabling linear scans, binary +search lookup, and range scans. + +Storage in the file is organized into variable sized blocks. Prefix +compression is used within a single block to reduce disk space. Block +size and alignment is tunable by the writer. + +Performance +^^^^^^^^^^^ + +Space used, packed-refs vs. reftable: + +[cols=",>,>,>,>,>",options="header",] +|=============================================================== +|repository |packed-refs |reftable |% original |avg ref |avg obj +|android |62.2 M |36.1 M |58.0% |33 bytes |5 bytes +|rails |1.8 M |1.1 M |57.7% |29 bytes |4 bytes +|git |78.7 K |48.1 K |61.0% |50 bytes |4 bytes +|git (heads) |332 b |269 b |81.0% |33 bytes |0 bytes +|=============================================================== + +Scan (read 866k refs), by reference name lookup (single ref from 866k +refs), and by SHA-1 lookup (refs with that SHA-1, from 866k refs): + +[cols=",>,>,>,>",options="header",] +|========================================================= +|format |cache |scan |by name |by SHA-1 +|packed-refs |cold |402 ms |409,660.1 usec |412,535.8 usec +|packed-refs |hot | |6,844.6 usec |20,110.1 usec +|reftable |cold |112 ms |33.9 usec |323.2 usec +|reftable |hot | |20.2 usec |320.8 usec +|========================================================= + +Space used for 149,932 log entries for 43,061 refs, reflog vs. reftable: + +[cols=",>,>",options="header",] +|================================ +|format |size |avg entry +|$GIT_DIR/logs |173 M |1209 bytes +|reftable |5 M |37 bytes +|================================ + +Details +~~~~~~~ + +Peeling +^^^^^^^ + +References stored in a reftable are peeled, a record for an annotated +(or signed) tag records both the tag object, and the object it refers +to. This is analogous to storage in the packed-refs format. + +Reference name encoding +^^^^^^^^^^^^^^^^^^^^^^^ + +Reference names are an uninterpreted sequence of bytes that must pass +linkgit:git-check-ref-format[1] as a valid reference name. + +Key unicity +^^^^^^^^^^^ + +Each entry must have a unique key; repeated keys are disallowed. + +Network byte order +^^^^^^^^^^^^^^^^^^ + +All multi-byte, fixed width fields are in network byte order. + +Varint encoding +^^^^^^^^^^^^^^^ + +Varint encoding is identical to the ofs-delta encoding method used +within pack files. + +Decoder works such as: + +.... +val = buf[ptr] & 0x7f +while (buf[ptr] & 0x80) { + ptr++ + val = ((val + 1) << 7) | (buf[ptr] & 0x7f) +} +.... + +Ordering +^^^^^^^^ + +Blocks are lexicographically ordered by their first reference. + +Directory/file conflicts +^^^^^^^^^^^^^^^^^^^^^^^^ + +The reftable format accepts both `refs/heads/foo` and +`refs/heads/foo/bar` as distinct references. + +This property is useful for retaining log records in reftable, but may +confuse versions of Git using `$GIT_DIR/refs` directory tree to maintain +references. Users of reftable may choose to continue to reject `foo` and +`foo/bar` type conflicts to prevent problems for peers. + +File format +~~~~~~~~~~~ + +Structure +^^^^^^^^^ + +A reftable file has the following high-level structure: + +.... +first_block { + header + first_ref_block +} +ref_block* +ref_index* +obj_block* +obj_index* +log_block* +log_index* +footer +.... + +A log-only file omits the `ref_block`, `ref_index`, `obj_block` and +`obj_index` sections, containing only the file header and log block: + +.... +first_block { + header +} +log_block* +log_index* +footer +.... + +in a log-only file the first log block immediately follows the file +header, without padding to block alignment. + +Block size +^^^^^^^^^^ + +The file's block size is arbitrarily determined by the writer, and does +not have to be a power of 2. The block size must be larger than the +longest reference name or log entry used in the repository, as +references cannot span blocks. + +Powers of two that are friendly to the virtual memory system or +filesystem (such as 4k or 8k) are recommended. Larger sizes (64k) can +yield better compression, with a possible increased cost incurred by +readers during access. + +The largest block size is `16777215` bytes (15.99 MiB). + +Block alignment +^^^^^^^^^^^^^^^ + +Writers may choose to align blocks at multiples of the block size by +including `padding` filled with NUL bytes at the end of a block to round +out to the chosen alignment. When alignment is used, writers must +specify the alignment with the file header's `block_size` field. + +Block alignment is not required by the file format. Unaligned files must +set `block_size = 0` in the file header, and omit `padding`. Unaligned +files with more than one ref block must include the link:#Ref-index[ref +index] to support fast lookup. Readers must be able to read both aligned +and non-aligned files. + +Very small files (e.g. a single ref block) may omit `padding` and the ref +index to reduce total file size. + +Header (version 1) +^^^^^^^^^^^^^^^^^^ + +A 24-byte header appears at the beginning of the file: + +.... +'REFT' +uint8( version_number = 1 ) +uint24( block_size ) +uint64( min_update_index ) +uint64( max_update_index ) +.... + +Aligned files must specify `block_size` to configure readers with the +expected block alignment. Unaligned files must set `block_size = 0`. + +The `min_update_index` and `max_update_index` describe bounds for the +`update_index` field of all log records in this file. When reftables are +used in a stack for link:#Update-transactions[transactions], these +fields can order the files such that the prior file's +`max_update_index + 1` is the next file's `min_update_index`. + +Header (version 2) +^^^^^^^^^^^^^^^^^^ + +A 28-byte header appears at the beginning of the file: + +.... +'REFT' +uint8( version_number = 2 ) +uint24( block_size ) +uint64( min_update_index ) +uint64( max_update_index ) +uint32( hash_id ) +.... + +The header is identical to `version_number=1`, with the 4-byte hash ID +("sha1" for SHA1 and "s256" for SHA-256) append to the header. + +For maximum backward compatibility, it is recommended to use version 1 when +writing SHA1 reftables. + +First ref block +^^^^^^^^^^^^^^^ + +The first ref block shares the same block as the file header, and is 24 +bytes smaller than all other blocks in the file. The first block +immediately begins after the file header, at position 24. + +If the first block is a log block (a log-only file), its block header +begins immediately at position 24. + +Ref block format +^^^^^^^^^^^^^^^^ + +A ref block is written as: + +.... +'r' +uint24( block_len ) +ref_record+ +uint24( restart_offset )+ +uint16( restart_count ) + +padding? +.... + +Blocks begin with `block_type = 'r'` and a 3-byte `block_len` which +encodes the number of bytes in the block up to, but not including the +optional `padding`. This is always less than or equal to the file's +block size. In the first ref block, `block_len` includes 24 bytes for +the file header. + +The 2-byte `restart_count` stores the number of entries in the +`restart_offset` list, which must not be empty. Readers can use +`restart_count` to binary search between restarts before starting a +linear scan. + +Exactly `restart_count` 3-byte `restart_offset` values precedes the +`restart_count`. Offsets are relative to the start of the block and +refer to the first byte of any `ref_record` whose name has not been +prefix compressed. Entries in the `restart_offset` list must be sorted, +ascending. Readers can start linear scans from any of these records. + +A variable number of `ref_record` fill the middle of the block, +describing reference names and values. The format is described below. + +As the first ref block shares the first file block with the file header, +all `restart_offset` in the first block are relative to the start of the +file (position 0), and include the file header. This forces the first +`restart_offset` to be `28`. + +ref record +++++++++++ + +A `ref_record` describes a single reference, storing both the name and +its value(s). Records are formatted as: + +.... +varint( prefix_length ) +varint( (suffix_length << 3) | value_type ) +suffix +varint( update_index_delta ) +value? +.... + +The `prefix_length` field specifies how many leading bytes of the prior +reference record's name should be copied to obtain this reference's +name. This must be 0 for the first reference in any block, and also must +be 0 for any `ref_record` whose offset is listed in the `restart_offset` +table at the end of the block. + +Recovering a reference name from any `ref_record` is a simple concat: + +.... +this_name = prior_name[0..prefix_length] + suffix +.... + +The `suffix_length` value provides the number of bytes available in +`suffix` to copy from `suffix` to complete the reference name. + +The `update_index` that last modified the reference can be obtained by +adding `update_index_delta` to the `min_update_index` from the file +header: `min_update_index + update_index_delta`. + +The `value` follows. Its format is determined by `value_type`, one of +the following: + +* `0x0`: deletion; no value data (see transactions, below) +* `0x1`: one object name; value of the ref +* `0x2`: two object names; value of the ref, peeled target +* `0x3`: symbolic reference: `varint( target_len ) target` + +Symbolic references use `0x3`, followed by the complete name of the +reference target. No compression is applied to the target name. + +Types `0x4..0x7` are reserved for future use. + +Ref index +^^^^^^^^^ + +The ref index stores the name of the last reference from every ref block +in the file, enabling reduced disk seeks for lookups. Any reference can +be found by searching the index, identifying the containing block, and +searching within that block. + +The index may be organized into a multi-level index, where the 1st level +index block points to additional ref index blocks (2nd level), which may +in turn point to either additional index blocks (e.g. 3rd level) or ref +blocks (leaf level). Disk reads required to access a ref go up with +higher index levels. Multi-level indexes may be required to ensure no +single index block exceeds the file format's max block size of +`16777215` bytes (15.99 MiB). To achieve constant O(1) disk seeks for +lookups the index must be a single level, which is permitted to exceed +the file's configured block size, but not the format's max block size of +15.99 MiB. + +If present, the ref index block(s) appears after the last ref block. + +If there are at least 4 ref blocks, a ref index block should be written +to improve lookup times. Cold reads using the index require 2 disk reads +(read index, read block), and binary searching < 4 blocks also requires +<= 2 reads. Omitting the index block from smaller files saves space. + +If the file is unaligned and contains more than one ref block, the ref +index must be written. + +Index block format: + +.... +'i' +uint24( block_len ) +index_record+ +uint24( restart_offset )+ +uint16( restart_count ) + +padding? +.... + +The index blocks begin with `block_type = 'i'` and a 3-byte `block_len` +which encodes the number of bytes in the block, up to but not including +the optional `padding`. + +The `restart_offset` and `restart_count` fields are identical in format, +meaning and usage as in ref blocks. + +To reduce the number of reads required for random access in very large +files the index block may be larger than other blocks. However, readers +must hold the entire index in memory to benefit from this, so it's a +time-space tradeoff in both file size and reader memory. + +Increasing the file's block size decreases the index size. Alternatively +a multi-level index may be used, keeping index blocks within the file's +block size, but increasing the number of blocks that need to be +accessed. + +index record +++++++++++++ + +An index record describes the last entry in another block. Index records +are written as: + +.... +varint( prefix_length ) +varint( (suffix_length << 3) | 0 ) +suffix +varint( block_position ) +.... + +Index records use prefix compression exactly like `ref_record`. + +Index records store `block_position` after the suffix, specifying the +absolute position in bytes (from the start of the file) of the block +that ends with this reference. Readers can seek to `block_position` to +begin reading the block header. + +Readers must examine the block header at `block_position` to determine +if the next block is another level index block, or the leaf-level ref +block. + +Reading the index ++++++++++++++++++ + +Readers loading the ref index must first read the footer (below) to +obtain `ref_index_position`. If not present, the position will be 0. The +`ref_index_position` is for the 1st level root of the ref index. + +Obj block format +^^^^^^^^^^^^^^^^ + +Object blocks are optional. Writers may choose to omit object blocks, +especially if readers will not use the object name to ref mapping. + +Object blocks use unique, abbreviated 2-32 object name keys, mapping to +ref blocks containing references pointing to that object directly, or as +the peeled value of an annotated tag. Like ref blocks, object blocks use +the file's standard block size. The abbrevation length is available in +the footer as `obj_id_len`. + +To save space in small files, object blocks may be omitted if the ref +index is not present, as brute force search will only need to read a few +ref blocks. When missing, readers should brute force a linear search of +all references to lookup by object name. + +An object block is written as: + +.... +'o' +uint24( block_len ) +obj_record+ +uint24( restart_offset )+ +uint16( restart_count ) + +padding? +.... + +Fields are identical to ref block. Binary search using the restart table +works the same as in reference blocks. + +Because object names are abbreviated by writers to the shortest unique +abbreviation within the reftable, obj key lengths have a variable length. Their +length must be at least 2 bytes. Readers must compare only for common prefix +match within an obj block or obj index. + +obj record +++++++++++ + +An `obj_record` describes a single object abbreviation, and the blocks +containing references using that unique abbreviation: + +.... +varint( prefix_length ) +varint( (suffix_length << 3) | cnt_3 ) +suffix +varint( cnt_large )? +varint( position_delta )* +.... + +Like in reference blocks, abbreviations are prefix compressed within an +obj block. On large reftables with many unique objects, higher block +sizes (64k), and higher restart interval (128), a `prefix_length` of 2 +or 3 and `suffix_length` of 3 may be common in obj records (unique +abbreviation of 5-6 raw bytes, 10-12 hex digits). + +Each record contains `position_count` number of positions for matching +ref blocks. For 1-7 positions the count is stored in `cnt_3`. When +`cnt_3 = 0` the actual count follows in a varint, `cnt_large`. + +The use of `cnt_3` bets most objects are pointed to by only a single +reference, some may be pointed to by a couple of references, and very +few (if any) are pointed to by more than 7 references. + +A special case exists when `cnt_3 = 0` and `cnt_large = 0`: there are no +`position_delta`, but at least one reference starts with this +abbreviation. A reader that needs exact reference names must scan all +references to find which specific references have the desired object. +Writers should use this format when the `position_delta` list would have +overflowed the file's block size due to a high number of references +pointing to the same object. + +The first `position_delta` is the position from the start of the file. +Additional `position_delta` entries are sorted ascending and relative to +the prior entry, e.g. a reader would perform: + +.... +pos = position_delta[0] +prior = pos +for (j = 1; j < position_count; j++) { + pos = prior + position_delta[j] + prior = pos +} +.... + +With a position in hand, a reader must linearly scan the ref block, +starting from the first `ref_record`, testing each reference's object names +(for `value_type = 0x1` or `0x2`) for full equality. Faster searching by +object name within a single ref block is not supported by the reftable format. +Smaller block sizes reduce the number of candidates this step must +consider. + +Obj index +^^^^^^^^^ + +The obj index stores the abbreviation from the last entry for every obj +block in the file, enabling reduced disk seeks for all lookups. It is +formatted exactly the same as the ref index, but refers to obj blocks. + +The obj index should be present if obj blocks are present, as obj blocks +should only be written in larger files. + +Readers loading the obj index must first read the footer (below) to +obtain `obj_index_position`. If not present, the position will be 0. + +Log block format +^^^^^^^^^^^^^^^^ + +Unlike ref and obj blocks, log blocks are always unaligned. + +Log blocks are variable in size, and do not match the `block_size` +specified in the file header or footer. Writers should choose an +appropriate buffer size to prepare a log block for deflation, such as +`2 * block_size`. + +A log block is written as: + +.... +'g' +uint24( block_len ) +zlib_deflate { + log_record+ + uint24( restart_offset )+ + uint16( restart_count ) +} +.... + +Log blocks look similar to ref blocks, except `block_type = 'g'`. + +The 4-byte block header is followed by the deflated block contents using +zlib deflate. The `block_len` in the header is the inflated size +(including 4-byte block header), and should be used by readers to +preallocate the inflation output buffer. A log block's `block_len` may +exceed the file's block size. + +Offsets within the log block (e.g. `restart_offset`) still include the +4-byte header. Readers may prefer prefixing the inflation output buffer +with the 4-byte header. + +Within the deflate container, a variable number of `log_record` describe +reference changes. The log record format is described below. See ref +block format (above) for a description of `restart_offset` and +`restart_count`. + +Because log blocks have no alignment or padding between blocks, readers +must keep track of the bytes consumed by the inflater to know where the +next log block begins. + +log record +++++++++++ + +Log record keys are structured as: + +.... +ref_name '\0' reverse_int64( update_index ) +.... + +where `update_index` is the unique transaction identifier. The +`update_index` field must be unique within the scope of a `ref_name`. +See the update transactions section below for further details. + +The `reverse_int64` function inverses the value so lexicographical +ordering the network byte order encoding sorts the more recent records +with higher `update_index` values first: + +.... +reverse_int64(int64 t) { + return 0xffffffffffffffff - t; +} +.... + +Log records have a similar starting structure to ref and index records, +utilizing the same prefix compression scheme applied to the log record +key described above. + +.... + varint( prefix_length ) + varint( (suffix_length << 3) | log_type ) + suffix + log_data { + old_id + new_id + varint( name_length ) name + varint( email_length ) email + varint( time_seconds ) + sint16( tz_offset ) + varint( message_length ) message + }? +.... + +Log record entries use `log_type` to indicate what follows: + +* `0x0`: deletion; no log data. +* `0x1`: standard git reflog data using `log_data` above. + +The `log_type = 0x0` is mostly useful for `git stash drop`, removing an +entry from the reflog of `refs/stash` in a transaction file (below), +without needing to rewrite larger files. Readers reading a stack of +reflogs must treat this as a deletion. + +For `log_type = 0x1`, the `log_data` section follows +linkgit:git-update-ref[1] logging and includes: + +* two object names (old id, new id) +* varint string of committer's name +* varint string of committer's email +* varint time in seconds since epoch (Jan 1, 1970) +* 2-byte timezone offset in minutes (signed) +* varint string of message + +`tz_offset` is the absolute number of minutes from GMT the committer was +at the time of the update. For example `GMT-0800` is encoded in reftable +as `sint16(-480)` and `GMT+0230` is `sint16(150)`. + +The committer email does not contain `<` or `>`, it's the value normally +found between the `<>` in a git commit object header. + +The `message_length` may be 0, in which case there was no message +supplied for the update. + +Contrary to traditional reflog (which is a file), renames are encoded as +a combination of ref deletion and ref creation. A deletion is a log +record with a zero new_id, and a creation is a log record with a zero old_id. + +Reading the log ++++++++++++++++ + +Readers accessing the log must first read the footer (below) to +determine the `log_position`. The first block of the log begins at +`log_position` bytes since the start of the file. The `log_position` is +not block aligned. + +Importing logs +++++++++++++++ + +When importing from `$GIT_DIR/logs` writers should globally order all +log records roughly by timestamp while preserving file order, and assign +unique, increasing `update_index` values for each log line. Newer log +records get higher `update_index` values. + +Although an import may write only a single reftable file, the reftable +file must span many unique `update_index`, as each log line requires its +own `update_index` to preserve semantics. + +Log index +^^^^^^^^^ + +The log index stores the log key +(`refname \0 reverse_int64(update_index)`) for the last log record of +every log block in the file, supporting bounded-time lookup. + +A log index block must be written if 2 or more log blocks are written to +the file. If present, the log index appears after the last log block. +There is no padding used to align the log index to block alignment. + +Log index format is identical to ref index, except the keys are 9 bytes +longer to include `'\0'` and the 8-byte `reverse_int64(update_index)`. +Records use `block_position` to refer to the start of a log block. + +Reading the index ++++++++++++++++++ + +Readers loading the log index must first read the footer (below) to +obtain `log_index_position`. If not present, the position will be 0. + +Footer +^^^^^^ + +After the last block of the file, a file footer is written. It begins +like the file header, but is extended with additional data. + +.... + HEADER + + uint64( ref_index_position ) + uint64( (obj_position << 5) | obj_id_len ) + uint64( obj_index_position ) + + uint64( log_position ) + uint64( log_index_position ) + + uint32( CRC-32 of above ) +.... + +If a section is missing (e.g. ref index) the corresponding position +field (e.g. `ref_index_position`) will be 0. + +* `obj_position`: byte position for the first obj block. +* `obj_id_len`: number of bytes used to abbreviate object names in +obj blocks. +* `log_position`: byte position for the first log block. +* `ref_index_position`: byte position for the start of the ref index. +* `obj_index_position`: byte position for the start of the obj index. +* `log_index_position`: byte position for the start of the log index. + +The size of the footer is 68 bytes for version 1, and 72 bytes for +version 2. + +Reading the footer +++++++++++++++++++ + +Readers must first read the file start to determine the version +number. Then they seek to `file_length - FOOTER_LENGTH` to access the +footer. A trusted external source (such as `stat(2)`) is necessary to +obtain `file_length`. When reading the footer, readers must verify: + +* 4-byte magic is correct +* 1-byte version number is recognized +* 4-byte CRC-32 matches the other 64 bytes (including magic, and +version) + +Once verified, the other fields of the footer can be accessed. + +Empty tables +++++++++++++ + +A reftable may be empty. In this case, the file starts with a header +and is immediately followed by a footer. + +Binary search +^^^^^^^^^^^^^ + +Binary search within a block is supported by the `restart_offset` fields +at the end of the block. Readers can binary search through the restart +table to locate between which two restart points the sought reference or +key should appear. + +Each record identified by a `restart_offset` stores the complete key in +the `suffix` field of the record, making the compare operation during +binary search straightforward. + +Once a restart point lexicographically before the sought reference has +been identified, readers can linearly scan through the following record +entries to locate the sought record, terminating if the current record +sorts after (and therefore the sought key is not present). + +Restart point selection ++++++++++++++++++++++++ + +Writers determine the restart points at file creation. The process is +arbitrary, but every 16 or 64 records is recommended. Every 16 may be +more suitable for smaller block sizes (4k or 8k), every 64 for larger +block sizes (64k). + +More frequent restart points reduces prefix compression and increases +space consumed by the restart table, both of which increase file size. + +Less frequent restart points makes prefix compression more effective, +decreasing overall file size, with increased penalties for readers +walking through more records after the binary search step. + +A maximum of `65535` restart points per block is supported. + +Considerations +~~~~~~~~~~~~~~ + +Lightweight refs dominate +^^^^^^^^^^^^^^^^^^^^^^^^^ + +The reftable format assumes the vast majority of references are single +object names valued with common prefixes, such as Gerrit Code Review's +`refs/changes/` namespace, GitHub's `refs/pulls/` namespace, or many +lightweight tags in the `refs/tags/` namespace. + +Annotated tags storing the peeled object cost an additional object name per +reference. + +Low overhead +^^^^^^^^^^^^ + +A reftable with very few references (e.g. git.git with 5 heads) is 269 +bytes for reftable, vs. 332 bytes for packed-refs. This supports +reftable scaling down for transaction logs (below). + +Block size +^^^^^^^^^^ + +For a Gerrit Code Review type repository with many change refs, larger +block sizes (64 KiB) and less frequent restart points (every 64) yield +better compression due to more references within the block compressing +against the prior reference. + +Larger block sizes reduce the index size, as the reftable will require +fewer blocks to store the same number of references. + +Minimal disk seeks +^^^^^^^^^^^^^^^^^^ + +Assuming the index block has been loaded into memory, binary searching +for any single reference requires exactly 1 disk seek to load the +containing block. + +Scans and lookups dominate +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Scanning all references and lookup by name (or namespace such as +`refs/heads/`) are the most common activities performed on repositories. +Object names are stored directly with references to optimize this use case. + +Logs are infrequently read +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Logs are infrequently accessed, but can be large. Deflating log blocks +saves disk space, with some increased penalty at read time. + +Logs are stored in an isolated section from refs, reducing the burden on +reference readers that want to ignore logs. Further, historical logs can +be isolated into log-only files. + +Logs are read backwards +^^^^^^^^^^^^^^^^^^^^^^^ + +Logs are frequently accessed backwards (most recent N records for master +to answer `master@{4}`), so log records are grouped by reference, and +sorted descending by update index. + +Repository format +~~~~~~~~~~~~~~~~~ + +Version 1 +^^^^^^^^^ + +A repository must set its `$GIT_DIR/config` to configure reftable: + +.... +[core] + repositoryformatversion = 1 +[extensions] + refStorage = reftable +.... + +Layout +^^^^^^ + +A collection of reftable files are stored in the `$GIT_DIR/reftable/` +directory: + +.... +00000001-00000001.log +00000002-00000002.ref +00000003-00000003.ref +.... + +where reftable files are named by a unique name such as produced by the +function `${min_update_index}-${max_update_index}.ref`. + +Log-only files use the `.log` extension, while ref-only and mixed ref +and log files use `.ref`. extension. + +The stack ordering file is `$GIT_DIR/reftable/tables.list` and lists the +current files, one per line, in order, from oldest (base) to newest +(most recent): + +.... +$ cat .git/reftable/tables.list +00000001-00000001.log +00000002-00000002.ref +00000003-00000003.ref +.... + +Readers must read `$GIT_DIR/reftable/tables.list` to determine which +files are relevant right now, and search through the stack in reverse +order (last reftable is examined first). + +Reftable files not listed in `tables.list` may be new (and about to be +added to the stack by the active writer), or ancient and ready to be +pruned. + +Backward compatibility +^^^^^^^^^^^^^^^^^^^^^^ + +Older clients should continue to recognize the directory as a git +repository so they don't look for an enclosing repository in parent +directories. To this end, a reftable-enabled repository must contain the +following dummy files + +* `.git/HEAD`, a regular file containing `ref: refs/heads/.invalid`. +* `.git/refs/`, a directory +* `.git/refs/heads`, a regular file + +Readers +^^^^^^^ + +Readers can obtain a consistent snapshot of the reference space by +following: + +1. Open and read the `tables.list` file. +2. Open each of the reftable files that it mentions. +3. If any of the files is missing, goto 1. +4. Read from the now-open files as long as necessary. + +Update transactions +^^^^^^^^^^^^^^^^^^^ + +Although reftables are immutable, mutations are supported by writing a +new reftable and atomically appending it to the stack: + +1. Acquire `tables.list.lock`. +2. Read `tables.list` to determine current reftables. +3. Select `update_index` to be most recent file's +`max_update_index + 1`. +4. Prepare temp reftable `tmp_XXXXXX`, including log entries. +5. Rename `tmp_XXXXXX` to `${update_index}-${update_index}.ref`. +6. Copy `tables.list` to `tables.list.lock`, appending file from (5). +7. Rename `tables.list.lock` to `tables.list`. + +During step 4 the new file's `min_update_index` and `max_update_index` +are both set to the `update_index` selected by step 3. All log records +for the transaction use the same `update_index` in their keys. This +enables later correlation of which references were updated by the same +transaction. + +Because a single `tables.list.lock` file is used to manage locking, the +repository is single-threaded for writers. Writers may have to busy-spin +(with backoff) around creating `tables.list.lock`, for up to an +acceptable wait period, aborting if the repository is too busy to +mutate. Application servers wrapped around repositories (e.g. Gerrit +Code Review) can layer their own lock/wait queue to improve fairness to +writers. + +Reference deletions +^^^^^^^^^^^^^^^^^^^ + +Deletion of any reference can be explicitly stored by setting the `type` +to `0x0` and omitting the `value` field of the `ref_record`. This serves +as a tombstone, overriding any assertions about the existence of the +reference from earlier files in the stack. + +Compaction +^^^^^^^^^^ + +A partial stack of reftables can be compacted by merging references +using a straightforward merge join across reftables, selecting the most +recent value for output, and omitting deleted references that do not +appear in remaining, lower reftables. + +A compacted reftable should set its `min_update_index` to the smallest +of the input files' `min_update_index`, and its `max_update_index` +likewise to the largest input `max_update_index`. + +For sake of illustration, assume the stack currently consists of +reftable files (from oldest to newest): A, B, C, and D. The compactor is +going to compact B and C, leaving A and D alone. + +1. Obtain lock `tables.list.lock` and read the `tables.list` file. +2. Obtain locks `B.lock` and `C.lock`. Ownership of these locks +prevents other processes from trying to compact these files. +3. Release `tables.list.lock`. +4. Compact `B` and `C` into a temp file +`${min_update_index}-${max_update_index}_XXXXXX`. +5. Reacquire lock `tables.list.lock`. +6. Verify that `B` and `C` are still in the stack, in that order. This +should always be the case, assuming that other processes are adhering to +the locking protocol. +7. Rename `${min_update_index}-${max_update_index}_XXXXXX` to +`${min_update_index}-${max_update_index}.ref`. +8. Write the new stack to `tables.list.lock`, replacing `B` and `C` +with the file from (4). +9. Rename `tables.list.lock` to `tables.list`. +10. Delete `B` and `C`, perhaps after a short sleep to avoid forcing +readers to backtrack. + +This strategy permits compactions to proceed independently of updates. + +Each reftable (compacted or not) is uniquely identified by its name, so +open reftables can be cached by their name. + +Alternatives considered +~~~~~~~~~~~~~~~~~~~~~~~ + +bzip packed-refs +^^^^^^^^^^^^^^^^ + +`bzip2` can significantly shrink a large packed-refs file (e.g. 62 MiB +compresses to 23 MiB, 37%). However the bzip format does not support +random access to a single reference. Readers must inflate and discard +while performing a linear scan. + +Breaking packed-refs into chunks (individually compressing each chunk) +would reduce the amount of data a reader must inflate, but still leaves +the problem of indexing chunks to support readers efficiently locating +the correct chunk. + +Given the compression achieved by reftable's encoding, it does not seem +necessary to add the complexity of bzip/gzip/zlib. + +Michael Haggerty's alternate format +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Michael Haggerty proposed +link:https://lore.kernel.org/git/CAMy9T_HCnyc1g8XWOOWhe7nN0aEFyyBskV2aOMb_fe%2BwGvEJ7A%40mail.gmail.com/[an +alternate] format to reftable on the Git mailing list. This format uses +smaller chunks, without the restart table, and avoids block alignment +with padding. Reflog entries immediately follow each ref, and are thus +interleaved between refs. + +Performance testing indicates reftable is faster for lookups (51% +faster, 11.2 usec vs. 5.4 usec), although reftable produces a slightly +larger file (+ ~3.2%, 28.3M vs 29.2M): + +[cols=">,>,>,>",options="header",] +|===================================== +|format |size |seek cold |seek hot +|mh-alt |28.3 M |23.4 usec |11.2 usec +|reftable |29.2 M |19.9 usec |5.4 usec +|===================================== + +JGit Ketch RefTree +^^^^^^^^^^^^^^^^^^ + +https://dev.eclipse.org/mhonarc/lists/jgit-dev/msg03073.html[JGit Ketch] +proposed +link:https://lore.kernel.org/git/CAJo%3DhJvnAPNAdDcAAwAvU9C4RVeQdoS3Ev9WTguHx4fD0V_nOg%40mail.gmail.com/[RefTree], +an encoding of references inside Git tree objects stored as part of the +repository's object database. + +The RefTree format adds additional load on the object database storage +layer (more loose objects, more objects in packs), and relies heavily on +the packer's delta compression to save space. Namespaces which are flat +(e.g. thousands of tags in refs/tags) initially create very large loose +objects, and so RefTree does not address the problem of copying many +references to modify a handful. + +Flat namespaces are not efficiently searchable in RefTree, as tree +objects in canonical formatting cannot be binary searched. This fails +the need to handle a large number of references in a single namespace, +such as GitHub's `refs/pulls`, or a project with many tags. + +LMDB +^^^^ + +David Turner proposed +https://lore.kernel.org/git/1455772670-21142-26-git-send-email-dturner@twopensource.com/[using +LMDB], as LMDB is lightweight (64k of runtime code) and GPL-compatible +license. + +A downside of LMDB is its reliance on a single C implementation. This +makes embedding inside JGit (a popular reimplementation of Git) +difficult, and hoisting onto virtual storage (for JGit DFS) virtually +impossible. + +A common format that can be supported by all major Git implementations +(git-core, JGit, libgit2) is strongly preferred. diff --git a/third_party/git/Documentation/technical/rerere.txt b/third_party/git/Documentation/technical/rerere.txt index aa22d7ace8..af5f9fc24f 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 becames X or Y", and whenever +early part became B or C, a late part became 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/technical/shallow.txt b/third_party/git/Documentation/technical/shallow.txt index 01dedfe9ff..f3738baa0f 100644 --- a/third_party/git/Documentation/technical/shallow.txt +++ b/third_party/git/Documentation/technical/shallow.txt @@ -13,7 +13,7 @@ pretend as if they are root commits (e.g. "git log" traversal stops after showing them; "git fsck" does not complain saying the commits listed on their "parent" lines do not exist). -Each line contains exactly one SHA-1. When read, a commit_graft +Each line contains exactly one object name. When read, a commit_graft will be constructed, which has nr_parent < 0 to make it easier to discern from user provided grafts. diff --git a/third_party/git/Documentation/trace2-target-values.txt b/third_party/git/Documentation/trace2-target-values.txt index 27d3c64e66..3985b6d3c2 100644 --- a/third_party/git/Documentation/trace2-target-values.txt +++ b/third_party/git/Documentation/trace2-target-values.txt @@ -2,7 +2,9 @@ * `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. +* `<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. * `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 bc354fe2dc..1c229d7581 100644 --- a/third_party/git/Documentation/urls.txt +++ b/third_party/git/Documentation/urls.txt @@ -53,6 +53,9 @@ 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.conf b/third_party/git/Documentation/user-manual.conf index d87294de2f..0148f126dc 100644 --- a/third_party/git/Documentation/user-manual.conf +++ b/third_party/git/Documentation/user-manual.conf @@ -9,13 +9,3 @@ tilde=~ [linkgit-inlinemacro] <ulink url="{target}.html">{target}{0?({0})}</ulink> - -ifdef::backend-docbook[] -# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this. -[listingblock] -<example><title>{title}</title> -<literallayout class="monospaced"> -| -</literallayout> -{title#}</example> -endif::backend-docbook[] diff --git a/third_party/git/Documentation/user-manual.txt b/third_party/git/Documentation/user-manual.txt index 8bce75b2cf..fd480b8645 100644 --- a/third_party/git/Documentation/user-manual.txt +++ b/third_party/git/Documentation/user-manual.txt @@ -1,5 +1,4 @@ -Git User Manual -=============== += Git User Manual Git is a fast distributed revision control system. @@ -41,12 +40,10 @@ 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. @@ -73,8 +70,7 @@ 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 @@ -151,8 +147,7 @@ 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 @@ -202,8 +197,7 @@ 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. @@ -227,8 +221,7 @@ 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 @@ -247,8 +240,7 @@ 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 @@ -261,8 +253,7 @@ 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: @@ -299,8 +290,7 @@ 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, @@ -340,8 +330,7 @@ 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 @@ -358,7 +347,7 @@ $ git branch -r origin/man origin/master origin/next - origin/pu + origin/seen origin/todo ------------------------------------------------ @@ -383,8 +372,7 @@ 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 @@ -413,8 +401,7 @@ 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. @@ -425,8 +412,7 @@ 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]: @@ -474,8 +460,7 @@ 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 @@ -489,8 +474,7 @@ 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 @@ -572,8 +556,7 @@ 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: @@ -637,8 +620,7 @@ e05db0fd4f31dde7005f075a84f96b360d05984b ------------------------------------------------- [[creating-tags]] -Creating tags -------------- +=== Creating tags We can also create a tag to refer to a particular commit; after running @@ -655,8 +637,7 @@ 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 @@ -697,8 +678,7 @@ 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]: @@ -726,8 +706,7 @@ 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 @@ -742,12 +721,10 @@ 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`: @@ -765,8 +742,7 @@ $ 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. @@ -798,8 +774,7 @@ $ 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 @@ -883,8 +858,7 @@ 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. @@ -931,8 +905,7 @@ $ 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: @@ -983,8 +956,7 @@ 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 @@ -1000,12 +972,10 @@ 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]: @@ -1030,8 +1000,7 @@ 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: @@ -1052,8 +1021,7 @@ $ git commit ------------------------------------------------- [[how-to-make-a-commit]] -How to make a commit --------------------- +=== How to make a commit Creating a new commit takes three steps: @@ -1148,8 +1116,7 @@ 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 @@ -1162,8 +1129,7 @@ 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 @@ -1205,8 +1171,7 @@ 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]: @@ -1254,8 +1219,7 @@ 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 @@ -1297,8 +1261,7 @@ 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 @@ -1401,8 +1364,7 @@ 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 @@ -1423,8 +1385,7 @@ 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 @@ -1438,8 +1399,7 @@ 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 @@ -1463,8 +1423,7 @@ 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 @@ -1490,8 +1449,7 @@ 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 @@ -1518,8 +1476,7 @@ 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 @@ -1543,8 +1500,7 @@ $ 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 @@ -1575,8 +1531,7 @@ $ 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 @@ -1587,12 +1542,10 @@ 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 @@ -1618,12 +1571,10 @@ 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 @@ -1670,8 +1621,7 @@ 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 @@ -1715,12 +1665,10 @@ 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 @@ -1783,8 +1731,7 @@ $ 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: @@ -1812,8 +1759,7 @@ 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. @@ -1845,8 +1791,7 @@ 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 @@ -1886,21 +1831,22 @@ 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 @@ -1920,8 +1866,7 @@ 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. @@ -1942,8 +1887,7 @@ 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. @@ -1975,8 +1919,7 @@ 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 @@ -2035,8 +1978,7 @@ 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: @@ -2090,8 +2032,7 @@ 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 @@ -2121,8 +2062,7 @@ 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 @@ -2138,8 +2078,7 @@ 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 @@ -2158,12 +2097,10 @@ 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. @@ -2459,8 +2396,7 @@ 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 @@ -2470,8 +2406,7 @@ 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 @@ -2503,8 +2438,7 @@ 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: @@ -2591,8 +2525,7 @@ 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 @@ -2610,8 +2543,7 @@ 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 @@ -2630,8 +2562,7 @@ $ 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 @@ -2688,16 +2619,14 @@ 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 @@ -2745,8 +2674,7 @@ 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 @@ -2811,12 +2739,10 @@ 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 @@ -2844,8 +2770,7 @@ 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 @@ -2882,8 +2807,7 @@ 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: @@ -2903,8 +2827,7 @@ 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 @@ -2955,8 +2878,7 @@ 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 @@ -2966,8 +2888,7 @@ 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 @@ -3011,8 +2932,7 @@ 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 @@ -3064,8 +2984,7 @@ 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 @@ -3104,8 +3023,7 @@ 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: @@ -3134,8 +3052,7 @@ 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 @@ -3164,8 +3081,7 @@ 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 @@ -3194,8 +3110,7 @@ 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`). @@ -3253,8 +3168,7 @@ 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. @@ -3334,8 +3248,7 @@ 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 @@ -3452,8 +3365,7 @@ 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 @@ -3511,8 +3423,7 @@ 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 @@ -3698,8 +3609,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, @@ -3768,8 +3679,7 @@ 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 @@ -3777,8 +3687,7 @@ 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. @@ -3795,8 +3704,7 @@ 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 @@ -3811,8 +3719,7 @@ 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 @@ -3848,8 +3755,7 @@ 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 @@ -3864,8 +3770,7 @@ 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 @@ -3881,8 +3786,7 @@ 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 @@ -3911,8 +3815,7 @@ 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 @@ -3986,8 +3889,7 @@ 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 @@ -4022,8 +3924,7 @@ $ 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 @@ -4073,8 +3974,7 @@ 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 @@ -4144,15 +4044,13 @@ $ 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 @@ -4182,8 +4080,7 @@ 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 @@ -4392,25 +4289,22 @@ 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 A: Git Quick Reference -=============================== +[appendix] +== 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: @@ -4431,8 +4325,7 @@ $ cd project ----------------------------------------------- [[managing-branches]] -Managing branches ------------------ +=== Managing branches ----------------------------------------------- $ git branch # list all local branches in this repo @@ -4496,8 +4389,7 @@ $ git branch -r # list all remote branches [[exploring-history]] -Exploring history ------------------ +=== Exploring history ----------------------------------------------- $ gitk # visualize and browse history @@ -4532,8 +4424,7 @@ $ git bisect bad # if this revision is bad. ----------------------------------------------- [[making-changes]] -Making changes --------------- +=== Making changes Make sure Git knows who to blame: @@ -4563,8 +4454,7 @@ $ git commit -a # use latest content of all tracked files ----------------------------------------------- [[merging]] -Merging -------- +=== Merging ----------------------------------------------- $ git merge test # merge branch "test" into the current branch @@ -4574,8 +4464,7 @@ $ git pull . test # equivalent to git merge test ----------------------------------------------- [[sharing-your-changes]] -Sharing your changes --------------------- +=== Sharing your changes Importing or exporting patches: @@ -4620,8 +4509,7 @@ $ git push example test ----------------------------------------------- [[repository-maintenance]] -Repository maintenance ----------------------- +=== Repository maintenance Check for corruption: @@ -4637,12 +4525,11 @@ $ git gc [[todo]] -Appendix B: Notes and todo list for this manual -=============================================== +[appendix] +== Notes and todo list for this manual [[todo-list]] -Todo list ---------- +=== Todo list This is a work in progress. @@ -4687,5 +4574,5 @@ Write a chapter on using plumbing and writing scripts. Alternates, clone -reference, etc. More on recovery from repository corruption. See: - http://marc.info/?l=git&m=117263864820799&w=2 - http://marc.info/?l=git&m=117147855503798&w=2 + 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/ diff --git a/third_party/git/GIT-VERSION-GEN b/third_party/git/GIT-VERSION-GEN index a1539a7ce6..ca6ccb4986 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.23.0 +DEF_VER=v2.29.2 LF=' ' diff --git a/third_party/git/INSTALL b/third_party/git/INSTALL index c39006e8e7..9ba33e6a14 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 approriate "NO_<LIBRARY>=YesPlease" to the make command line or + the appropriate "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 many scripts needed - for everyday use (e.g. "bisect", "pull"). + - A POSIX-compliant shell is required to run some scripts needed + for everyday use (e.g. "bisect", "request-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", @@ -206,9 +206,7 @@ Issues of note: clone two separate git-htmldocs and git-manpages repositories next to the clone of git itself. - It has been reported that docbook-xsl version 1.72 and 1.73 are - buggy; 1.72 misformats manual pages for callouts, and 1.73 needs - the patch in contrib/patches/docbook-xsl-manpages-charmap.patch + The minimum supported version of docbook-xsl is 1.74. Users attempting to build the documentation on Cygwin may need to ensure that the /etc/xml/catalog file looks something like this: diff --git a/third_party/git/Makefile b/third_party/git/Makefile index f9255344ae..1fb0ec1705 100644 --- a/third_party/git/Makefile +++ b/third_party/git/Makefile @@ -34,13 +34,8 @@ 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 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. +# When using USE_LIBPCRE1, define NO_LIBPCRE1_JIT if you want to +# disable JIT even if supported by your library. # # Define LIBPCREDIR=/foo/bar if your PCRE header and library files are # in /foo/bar/include and /foo/bar/lib directories. Which version of @@ -287,12 +282,6 @@ all:: # Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks # field that counts the on-disk footprint in 512-byte blocks. # -# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72 -# (not v1.73 or v1.71). -# -# Define ASCIIDOC_ROFF if your DocBook XSL does not escape raw roff directives -# (versions 1.68.1 through v1.72). -# # Define GNU_ROFF if your target system uses GNU groff. This forces # apostrophes to be ASCII so that cut&pasting examples to the shell # will work. @@ -359,6 +348,9 @@ all:: # Define NO_INSTALL_HARDLINKS if you prefer to use either symbolic links or # copies to install built-in git commands e.g. git-cat-file. # +# Define SKIP_DASHED_BUILT_INS if you do not need the dashed versions of the +# built-ins to be linked/copied at all. +# # Define USE_NED_ALLOCATOR if you want to replace the platforms default # memory allocators with the nedmalloc allocator written by Niall Douglas. # @@ -410,9 +402,6 @@ all:: # with a different indexfile format version. If it isn't set the index # file format used is index-v[23]. # -# Define GMTIME_UNRELIABLE_ERRORS if your gmtime() function does not -# return NULL when it receives a bogus time_t. -# # Define HAVE_CLOCK_GETTIME if your platform has clock_gettime. # # Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC. @@ -476,6 +465,12 @@ all:: # the global variable _wpgmptr containing the absolute path of the current # executable (this is the case on Windows). # +# Define GENERATE_COMPILATION_DATABASE to "yes" to generate JSON compilation +# database entries during compilation if your compiler supports it, using the +# `-MJ` flag. The JSON entries will be placed in the `compile_commands/` +# directory, and the JSON compilation database 'compile_commands.json' will be +# created at the root of the repository. +# # Define DEVELOPER to enable more compiler warnings. Compiler version # and family are auto detected, but could be overridden by defining # COMPILER_FEATURES (see config.mak.dev). You can still set @@ -486,7 +481,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 are recognized: +# whitespace. The following keywords are recognized: # # no-error: # @@ -583,7 +578,6 @@ BUILT_INS = COMPAT_CFLAGS = COMPAT_OBJS = XDIFF_OBJS = -VCSSVN_OBJS = GENERATED_H = EXTRA_CPPFLAGS = FUZZ_OBJS = @@ -598,6 +592,7 @@ 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 @@ -613,7 +608,6 @@ SCRIPT_SH += git-merge-one-file.sh SCRIPT_SH += git-merge-resolve.sh SCRIPT_SH += git-mergetool.sh SCRIPT_SH += git-quiltimport.sh -SCRIPT_SH += git-legacy-stash.sh SCRIPT_SH += git-request-pull.sh SCRIPT_SH += git-submodule.sh SCRIPT_SH += git-web--browse.sh @@ -621,8 +615,8 @@ SCRIPT_SH += git-web--browse.sh SCRIPT_LIB += git-mergetool--lib SCRIPT_LIB += git-parse-remote SCRIPT_LIB += git-rebase--preserve-merges -SCRIPT_LIB += git-sh-setup SCRIPT_LIB += git-sh-i18n +SCRIPT_LIB += git-sh-setup SCRIPT_PERL += git-add--interactive.perl SCRIPT_PERL += git-archimport.perl @@ -685,20 +679,19 @@ EXTRA_PROGRAMS = # ... and all the rest that could be moved out of bindir to gitexecdir PROGRAMS += $(EXTRA_PROGRAMS) -PROGRAM_OBJS += credential-store.o PROGRAM_OBJS += daemon.o -PROGRAM_OBJS += fast-import.o PROGRAM_OBJS += http-backend.o PROGRAM_OBJS += imap-send.o PROGRAM_OBJS += sh-i18n--envsubst.o PROGRAM_OBJS += shell.o -PROGRAM_OBJS += remote-testsvn.o # Binary suffix, set to .exe for Windows builds X = PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS)) +TEST_BUILTINS_OBJS += test-advise.o +TEST_BUILTINS_OBJS += test-bloom.o TEST_BUILTINS_OBJS += test-chmtime.o TEST_BUILTINS_OBJS += test-config.o TEST_BUILTINS_OBJS += test-ctype.o @@ -713,23 +706,28 @@ TEST_BUILTINS_OBJS += test-dump-untracked-cache.o TEST_BUILTINS_OBJS += test-example-decorate.o TEST_BUILTINS_OBJS += test-genrandom.o TEST_BUILTINS_OBJS += test-genzeros.o +TEST_BUILTINS_OBJS += test-hash-speed.o TEST_BUILTINS_OBJS += test-hash.o TEST_BUILTINS_OBJS += test-hashmap.o -TEST_BUILTINS_OBJS += test-hash-speed.o TEST_BUILTINS_OBJS += test-index-version.o TEST_BUILTINS_OBJS += test-json-writer.o TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o TEST_BUILTINS_OBJS += test-match-trees.o TEST_BUILTINS_OBJS += test-mergesort.o TEST_BUILTINS_OBJS += test-mktemp.o +TEST_BUILTINS_OBJS += test-oid-array.o TEST_BUILTINS_OBJS += test-oidmap.o TEST_BUILTINS_OBJS += test-online-cpus.o TEST_BUILTINS_OBJS += test-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-proc-receive.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 @@ -739,7 +737,6 @@ TEST_BUILTINS_OBJS += test-run-command.o TEST_BUILTINS_OBJS += test-scrap-cache-tree.o TEST_BUILTINS_OBJS += test-serve-v2.o TEST_BUILTINS_OBJS += test-sha1.o -TEST_BUILTINS_OBJS += test-sha1-array.o TEST_BUILTINS_OBJS += test-sha256.o TEST_BUILTINS_OBJS += test-sigchain.o TEST_BUILTINS_OBJS += test-strcmp-offset.o @@ -749,16 +746,14 @@ TEST_BUILTINS_OBJS += test-submodule-nested-repo-config.o TEST_BUILTINS_OBJS += test-subprocess.o TEST_BUILTINS_OBJS += test-trace2.o TEST_BUILTINS_OBJS += test-urlmatch-normalization.o -TEST_BUILTINS_OBJS += test-xml-encode.o TEST_BUILTINS_OBJS += test-wildmatch.o TEST_BUILTINS_OBJS += test-windows-named-pipe.o TEST_BUILTINS_OBJS += test-write-cache.o +TEST_BUILTINS_OBJS += test-xml-encode.o # Do not add more tests here unless they have extra dependencies. Add # them in TEST_BUILTINS_OBJS above. TEST_PROGRAMS_NEED_X += test-fake-ssh -TEST_PROGRAMS_NEED_X += test-line-buffer -TEST_PROGRAMS_NEED_X += test-svn-fe TEST_PROGRAMS_NEED_X += test-tool TEST_PROGRAMS = $(patsubst %,t/helper/%$X,$(TEST_PROGRAMS_NEED_X)) @@ -783,16 +778,26 @@ BUILT_INS += git-whatchanged$X # what 'all' will build and 'install' will install in gitexecdir, # excluding programs for built-in commands ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) +ALL_COMMANDS_TO_INSTALL = $(ALL_PROGRAMS) +ifeq (,$(SKIP_DASHED_BUILT_INS)) +ALL_COMMANDS_TO_INSTALL += $(BUILT_INS) +else +# git-upload-pack, git-receive-pack and git-upload-archive are special: they +# are _expected_ to be present in the `bin/` directory in their dashed form. +ALL_COMMANDS_TO_INSTALL += git-receive-pack$(X) +ALL_COMMANDS_TO_INSTALL += git-upload-archive$(X) +ALL_COMMANDS_TO_INSTALL += git-upload-pack$(X) +endif # what 'all' will build but not install in gitexecdir OTHER_PROGRAMS = git$X # what test wrappers are needed and 'install' will install, in bindir BINDIR_PROGRAMS_NEED_X += git -BINDIR_PROGRAMS_NEED_X += git-upload-pack BINDIR_PROGRAMS_NEED_X += git-receive-pack -BINDIR_PROGRAMS_NEED_X += git-upload-archive BINDIR_PROGRAMS_NEED_X += git-shell +BINDIR_PROGRAMS_NEED_X += git-upload-archive +BINDIR_PROGRAMS_NEED_X += git-upload-pack BINDIR_PROGRAMS_NO_X += git-cvsserver @@ -814,31 +819,33 @@ TEST_SHELL_PATH = $(SHELL_PATH) LIB_FILE = libgit.a XDIFF_LIB = xdiff/lib.a -VCSSVN_LIB = vcs-svn/lib.a GENERATED_H += command-list.h +GENERATED_H += config-list.h -LIB_H := $(sort $(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \ +LIB_H := $(sort $(patsubst ./%,%,$(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 LIB_OBJS += apply.o -LIB_OBJS += archive.o LIB_OBJS += archive-tar.o LIB_OBJS += archive-zip.o -LIB_OBJS += argv-array.o +LIB_OBJS += archive.o LIB_OBJS += attr.o LIB_OBJS += base85.o LIB_OBJS += bisect.o LIB_OBJS += blame.o LIB_OBJS += blob.o +LIB_OBJS += bloom.o LIB_OBJS += branch.o LIB_OBJS += bulk-checkin.o LIB_OBJS += bundle.o @@ -848,9 +855,9 @@ LIB_OBJS += checkout.o LIB_OBJS += color.o LIB_OBJS += column.o LIB_OBJS += combine-diff.o -LIB_OBJS += commit.o LIB_OBJS += commit-graph.o LIB_OBJS += commit-reach.o +LIB_OBJS += commit.o LIB_OBJS += compat/obstack.o LIB_OBJS += compat/terminal.o LIB_OBJS += config.o @@ -864,17 +871,17 @@ LIB_OBJS += ctype.o LIB_OBJS += date.o LIB_OBJS += decorate.o LIB_OBJS += delta-islands.o +LIB_OBJS += diff-delta.o +LIB_OBJS += diff-lib.o +LIB_OBJS += diff-no-index.o +LIB_OBJS += diff.o LIB_OBJS += diffcore-break.o LIB_OBJS += diffcore-delta.o LIB_OBJS += diffcore-order.o LIB_OBJS += diffcore-pickaxe.o LIB_OBJS += diffcore-rename.o -LIB_OBJS += diff-delta.o -LIB_OBJS += diff-lib.o -LIB_OBJS += diff-no-index.o -LIB_OBJS += diff.o -LIB_OBJS += dir.o LIB_OBJS += dir-iterator.o +LIB_OBJS += dir.o LIB_OBJS += editor.o LIB_OBJS += entry.o LIB_OBJS += environment.o @@ -884,8 +891,8 @@ 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 += fmt-merge-msg.o LIB_OBJS += fsck.o LIB_OBJS += fsmonitor.o LIB_OBJS += gettext.o @@ -893,19 +900,18 @@ LIB_OBJS += gpg-interface.o LIB_OBJS += graph.o LIB_OBJS += grep.o LIB_OBJS += hashmap.o -LIB_OBJS += linear-assignment.o LIB_OBJS += help.o LIB_OBJS += hex.o LIB_OBJS += ident.o -LIB_OBJS += interdiff.o LIB_OBJS += json-writer.o LIB_OBJS += kwset.o LIB_OBJS += levenshtein.o LIB_OBJS += line-log.o LIB_OBJS += line-range.o -LIB_OBJS += list-objects.o -LIB_OBJS += list-objects-filter.o +LIB_OBJS += linear-assignment.o LIB_OBJS += list-objects-filter-options.o +LIB_OBJS += list-objects-filter.o +LIB_OBJS += list-objects.o LIB_OBJS += ll-merge.o LIB_OBJS += lockfile.o LIB_OBJS += log-tree.o @@ -914,31 +920,33 @@ LIB_OBJS += mailinfo.o LIB_OBJS += mailmap.o LIB_OBJS += match-trees.o LIB_OBJS += mem-pool.o -LIB_OBJS += merge.o LIB_OBJS += merge-blobs.o LIB_OBJS += merge-recursive.o +LIB_OBJS += merge.o LIB_OBJS += mergesort.o LIB_OBJS += midx.o LIB_OBJS += name-hash.o LIB_OBJS += negotiator/default.o +LIB_OBJS += negotiator/noop.o LIB_OBJS += negotiator/skipping.o -LIB_OBJS += notes.o LIB_OBJS += notes-cache.o LIB_OBJS += notes-merge.o LIB_OBJS += notes-utils.o +LIB_OBJS += notes.o LIB_OBJS += object.o +LIB_OBJS += oid-array.o LIB_OBJS += oidmap.o LIB_OBJS += oidset.o -LIB_OBJS += packfile.o -LIB_OBJS += pack-bitmap.o LIB_OBJS += pack-bitmap-write.o +LIB_OBJS += pack-bitmap.o LIB_OBJS += pack-check.o LIB_OBJS += pack-objects.o LIB_OBJS += pack-revindex.o LIB_OBJS += pack-write.o +LIB_OBJS += packfile.o LIB_OBJS += pager.o -LIB_OBJS += parse-options.o LIB_OBJS += parse-options-cb.o +LIB_OBJS += parse-options.o LIB_OBJS += patch-delta.o LIB_OBJS += patch-ids.o LIB_OBJS += path.o @@ -948,25 +956,31 @@ 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 += prune-packed.o LIB_OBJS += quote.o LIB_OBJS += range-diff.o LIB_OBJS += reachable.o LIB_OBJS += read-cache.o LIB_OBJS += rebase-interactive.o +LIB_OBJS += rebase.o +LIB_OBJS += ref-filter.o LIB_OBJS += reflog-walk.o LIB_OBJS += refs.o +LIB_OBJS += refs/debug.o LIB_OBJS += refs/files-backend.o LIB_OBJS += refs/iterator.o LIB_OBJS += refs/packed-backend.o LIB_OBJS += refs/ref-cache.o 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 += reset.o LIB_OBJS += resolve-undo.o LIB_OBJS += revision.o LIB_OBJS += run-command.o @@ -975,20 +989,21 @@ LIB_OBJS += sequencer.o LIB_OBJS += serve.o LIB_OBJS += server-info.o LIB_OBJS += setup.o -LIB_OBJS += sha1-array.o -LIB_OBJS += sha1-lookup.o LIB_OBJS += sha1-file.o +LIB_OBJS += sha1-lookup.o LIB_OBJS += sha1-name.o 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 -LIB_OBJS += submodule.o -LIB_OBJS += submodule-config.o +LIB_OBJS += strvec.o LIB_OBJS += sub-process.o +LIB_OBJS += submodule-config.o +LIB_OBJS += submodule.o LIB_OBJS += symlinks.o LIB_OBJS += tag.o LIB_OBJS += tempfile.o @@ -1007,11 +1022,11 @@ LIB_OBJS += trace2/tr2_tgt_normal.o LIB_OBJS += trace2/tr2_tgt_perf.o LIB_OBJS += trace2/tr2_tls.o LIB_OBJS += trailer.o -LIB_OBJS += transport.o LIB_OBJS += transport-helper.o +LIB_OBJS += transport.o LIB_OBJS += tree-diff.o -LIB_OBJS += tree.o LIB_OBJS += tree-walk.o +LIB_OBJS += tree.o LIB_OBJS += unpack-trees.o LIB_OBJS += upload-pack.o LIB_OBJS += url.o @@ -1040,6 +1055,7 @@ BUILTIN_OBJS += builtin/archive.o BUILTIN_OBJS += builtin/bisect--helper.o BUILTIN_OBJS += builtin/blame.o BUILTIN_OBJS += builtin/branch.o +BUILTIN_OBJS += builtin/bugreport.o BUILTIN_OBJS += builtin/bundle.o BUILTIN_OBJS += builtin/cat-file.o BUILTIN_OBJS += builtin/check-attr.o @@ -1051,11 +1067,14 @@ BUILTIN_OBJS += builtin/checkout.o BUILTIN_OBJS += builtin/clean.o BUILTIN_OBJS += builtin/clone.o BUILTIN_OBJS += builtin/column.o +BUILTIN_OBJS += builtin/commit-graph.o BUILTIN_OBJS += builtin/commit-tree.o BUILTIN_OBJS += builtin/commit.o -BUILTIN_OBJS += builtin/commit-graph.o BUILTIN_OBJS += builtin/config.o BUILTIN_OBJS += builtin/count-objects.o +BUILTIN_OBJS += builtin/credential-cache--daemon.o +BUILTIN_OBJS += builtin/credential-cache.o +BUILTIN_OBJS += builtin/credential-store.o BUILTIN_OBJS += builtin/credential.o BUILTIN_OBJS += builtin/describe.o BUILTIN_OBJS += builtin/diff-files.o @@ -1065,6 +1084,7 @@ BUILTIN_OBJS += builtin/diff.o BUILTIN_OBJS += builtin/difftool.o BUILTIN_OBJS += builtin/env--helper.o BUILTIN_OBJS += builtin/fast-export.o +BUILTIN_OBJS += builtin/fast-import.o BUILTIN_OBJS += builtin/fetch-pack.o BUILTIN_OBJS += builtin/fetch.o BUILTIN_OBJS += builtin/fmt-merge-msg.o @@ -1084,13 +1104,13 @@ BUILTIN_OBJS += builtin/ls-remote.o BUILTIN_OBJS += builtin/ls-tree.o BUILTIN_OBJS += builtin/mailinfo.o BUILTIN_OBJS += builtin/mailsplit.o -BUILTIN_OBJS += builtin/merge.o BUILTIN_OBJS += builtin/merge-base.o BUILTIN_OBJS += builtin/merge-file.o BUILTIN_OBJS += builtin/merge-index.o BUILTIN_OBJS += builtin/merge-ours.o BUILTIN_OBJS += builtin/merge-recursive.o BUILTIN_OBJS += builtin/merge-tree.o +BUILTIN_OBJS += builtin/merge.o BUILTIN_OBJS += builtin/mktag.o BUILTIN_OBJS += builtin/mktree.o BUILTIN_OBJS += builtin/multi-pack-index.o @@ -1110,9 +1130,9 @@ BUILTIN_OBJS += builtin/read-tree.o BUILTIN_OBJS += builtin/rebase.o BUILTIN_OBJS += builtin/receive-pack.o BUILTIN_OBJS += builtin/reflog.o -BUILTIN_OBJS += builtin/remote.o BUILTIN_OBJS += builtin/remote-ext.o BUILTIN_OBJS += builtin/remote-fd.o +BUILTIN_OBJS += builtin/remote.o BUILTIN_OBJS += builtin/repack.o BUILTIN_OBJS += builtin/replace.o BUILTIN_OBJS += builtin/rerere.o @@ -1126,6 +1146,7 @@ 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 @@ -1145,6 +1166,20 @@ 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 = @@ -1169,7 +1204,7 @@ PTHREAD_CFLAGS = # For the 'sparse' target SPARSE_FLAGS ?= -SP_EXTRA_FLAGS = +SP_EXTRA_FLAGS = -Wno-universal-initializer # For the 'coccicheck' target; setting SPATCH_BATCH_SIZE higher will # usually result in less CPU usage at the cost of higher peak memory. @@ -1197,12 +1232,14 @@ SANITIZERS := $(foreach flag,$(subst $(comma),$(space),$(SANITIZE)),$(flag)) BASIC_CFLAGS += -fsanitize=$(SANITIZE) -fno-sanitize-recover=$(SANITIZE) BASIC_CFLAGS += -fno-omit-frame-pointer ifneq ($(filter undefined,$(SANITIZERS)),) -BASIC_CFLAGS += -DNO_UNALIGNED_LOADS BASIC_CFLAGS += -DSHA1DC_FORCE_ALIGNED_ACCESS endif ifneq ($(filter leak,$(SANITIZERS)),) BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS endif +ifneq ($(filter address,$(SANITIZERS)),) +NO_REGEX = NeededForASAN +endif endif ifndef sysconfdir @@ -1238,6 +1275,27 @@ $(error please set COMPUTE_HEADER_DEPENDENCIES to yes, no, or auto \ endif endif +ifndef GENERATE_COMPILATION_DATABASE +GENERATE_COMPILATION_DATABASE = no +endif + +ifeq ($(GENERATE_COMPILATION_DATABASE),yes) +compdb_check = $(shell $(CC) $(ALL_CFLAGS) \ + -c -MJ /dev/null \ + -x c /dev/null -o /dev/null 2>&1; \ + echo $$?) +ifneq ($(compdb_check),0) +override GENERATE_COMPILATION_DATABASE = no +$(warning GENERATE_COMPILATION_DATABASE is set to "yes", but your compiler does not \ +support generating compilation database entries) +endif +else +ifneq ($(GENERATE_COMPILATION_DATABASE),no) +$(error please set GENERATE_COMPILATION_DATABASE to "yes" or "no" \ +(not "$(GENERATE_COMPILATION_DATABASE)")) +endif +endif + ifdef SANE_TOOL_PATH SANE_TOOL_PATH_SQ = $(subst ','\'',$(SANE_TOOL_PATH)) BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|' @@ -1336,17 +1394,22 @@ ifdef NO_CURL else ifdef CURLDIR # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case. - BASIC_CFLAGS += -I$(CURLDIR)/include + CURL_CFLAGS = -I$(CURLDIR)/include CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) else + CURL_CFLAGS = CURL_LIBCURL = endif -ifdef CURL_LDFLAGS + ifndef CURL_LDFLAGS + CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS) + endif CURL_LIBCURL += $(CURL_LDFLAGS) -else - CURL_LIBCURL += $(shell $(CURL_CONFIG) --libs) -endif + + ifndef CURL_CFLAGS + CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS) + endif + BASIC_CFLAGS += $(CURL_CFLAGS) REMOTE_CURL_PRIMARY = git-remote-http$X REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X @@ -1609,11 +1672,8 @@ ifdef NO_INET_PTON endif ifdef NO_UNIX_SOCKETS BASIC_CFLAGS += -DNO_UNIX_SOCKETS - EXCLUDED_PROGRAMS += git-credential-cache git-credential-cache--daemon else LIB_OBJS += unix-socket.o - PROGRAM_OBJS += credential-cache.o - PROGRAM_OBJS += credential-cache--daemon.o endif ifdef NO_ICONV @@ -1714,7 +1774,6 @@ 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 @@ -1782,11 +1841,6 @@ ifndef NO_MSGFMT_EXTENDED_OPTIONS MSGFMT += --check --statistics endif -ifdef GMTIME_UNRELIABLE_ERRORS - COMPAT_OBJS += compat/gmtime.o - BASIC_CFLAGS += -DGMTIME_UNRELIABLE_ERRORS -endif - ifdef HAVE_CLOCK_GETTIME BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME endif @@ -1871,8 +1925,9 @@ ifndef V QUIET_MSGFMT = @echo ' ' MSGFMT $@; QUIET_GCOV = @echo ' ' GCOV $@; QUIET_SP = @echo ' ' SP $<; - QUIET_HDR = @echo ' ' HDR $<; + QUIET_HDR = @echo ' ' HDR $(<:hcc=h); QUIET_RC = @echo ' ' RC $@; + QUIET_SPATCH = @echo ' ' SPATCH $<; QUIET_SUBDIR0 = +@subdir= QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ $(MAKE) $(PRINT_DIR) -C $$subdir @@ -2046,9 +2101,9 @@ profile-fast: profile-clean $(MAKE) PROFILE=USE all -all:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS +all:: $(ALL_COMMANDS_TO_INSTALL) $(SCRIPT_LIB) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS ifneq (,$X) - $(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test -d '$p' -o '$p' -ef '$p$X' || $(RM) '$p';) + $(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_COMMANDS_TO_INSTALL) git$X)), test -d '$p' -o '$p' -ef '$p$X' || $(RM) '$p';) endif all:: @@ -2111,7 +2166,7 @@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS) help.sp help.s help.o: command-list.h -builtin/help.sp builtin/help.s builtin/help.o: command-list.h GIT-PREFIX +builtin/help.sp builtin/help.s builtin/help.o: config-list.h GIT-PREFIX builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \ '-DGIT_HTML_PATH="$(htmldir_relative_SQ)"' \ '-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \ @@ -2131,6 +2186,12 @@ $(BUILT_INS): git$X ln -s $< $@ 2>/dev/null || \ cp $< $@ +config-list.h: generate-configlist.sh + +config-list.h: + $(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh \ + >$@+ && mv $@+ $@ + command-list.h: generate-cmdlist.sh command-list.txt command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt Documentation/config/*.txt @@ -2313,23 +2374,16 @@ reconfigure config.mak.autogen: config.status endif XDIFF_OBJS += xdiff/xdiffi.o -XDIFF_OBJS += xdiff/xprepare.o -XDIFF_OBJS += xdiff/xutils.o XDIFF_OBJS += xdiff/xemit.o +XDIFF_OBJS += xdiff/xhistogram.o XDIFF_OBJS += xdiff/xmerge.o XDIFF_OBJS += xdiff/xpatience.o -XDIFF_OBJS += xdiff/xhistogram.o - -VCSSVN_OBJS += vcs-svn/line_buffer.o -VCSSVN_OBJS += vcs-svn/sliding_window.o -VCSSVN_OBJS += vcs-svn/fast_export.o -VCSSVN_OBJS += vcs-svn/svndiff.o -VCSSVN_OBJS += vcs-svn/svndump.o +XDIFF_OBJS += xdiff/xprepare.o +XDIFF_OBJS += xdiff/xutils.o TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS)) OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \ $(XDIFF_OBJS) \ - $(VCSSVN_OBJS) \ $(FUZZ_OBJS) \ common-main.o \ git.o @@ -2355,16 +2409,30 @@ missing_dep_dirs = dep_args = endif +compdb_dir = compile_commands + +ifeq ($(GENERATE_COMPILATION_DATABASE),yes) +missing_compdb_dir = $(compdb_dir) +$(missing_compdb_dir): + @mkdir -p $@ + +compdb_file = $(compdb_dir)/$(subst /,-,$@.json) +compdb_args = -MJ $(compdb_file) +else +missing_compdb_dir = +compdb_args = +endif + ASM_SRC := $(wildcard $(OBJECTS:o=S)) ASM_OBJ := $(ASM_SRC:S=o) C_OBJ := $(filter-out $(ASM_OBJ),$(OBJECTS)) .SUFFIXES: -$(C_OBJ): %.o: %.c GIT-CFLAGS $(missing_dep_dirs) - $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< -$(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs) - $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< +$(C_OBJ): %.o: %.c GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir) + $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< +$(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir) + $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< %.s: %.c GIT-CFLAGS FORCE $(QUIET_CC)$(CC) -o $@ -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< @@ -2387,6 +2455,14 @@ else $(OBJECTS): $(LIB_H) $(GENERATED_H) endif +ifeq ($(GENERATE_COMPILATION_DATABASE),yes) +all:: compile_commands.json +compile_commands.json: + @$(RM) $@ + $(QUIET_GEN)sed -e '1s/^/[/' -e '$$s/,$$/]/' $(compdb_dir)/*.o.json > $@+ + @if test -s $@+; then mv $@+ $@; else $(RM) $@+; fi +endif + exec-cmd.sp exec-cmd.s exec-cmd.o: GIT-PREFIX exec-cmd.sp exec-cmd.s exec-cmd.o: EXTRA_CPPFLAGS = \ '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \ @@ -2444,10 +2520,6 @@ git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS) -git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB) - $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) \ - $(VCSSVN_LIB) - $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY) $(QUIET_LNCP)$(RM) $@ && \ ln $< $@ 2>/dev/null || \ @@ -2464,9 +2536,6 @@ $(LIB_FILE): $(LIB_OBJS) $(XDIFF_LIB): $(XDIFF_OBJS) $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^ -$(VCSSVN_LIB): $(VCSSVN_OBJS) - $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^ - export DEFAULT_EDITOR DEFAULT_PAGER Documentation/GIT-EXCLUDED-PROGRAMS: FORCE @@ -2599,6 +2668,7 @@ 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 @@ -2740,10 +2810,6 @@ perf: all .PHONY: test perf -t/helper/test-line-buffer$X: $(VCSSVN_LIB) - -t/helper/test-svn-fe$X: $(VCSSVN_LIB) - .PRECIOUS: $(TEST_OBJS) t/helper/test-tool$X: $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS)) @@ -2763,16 +2829,20 @@ $(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE .PHONY: sparse $(SP_OBJ) sparse: $(SP_OBJ) -GEN_HDRS := command-list.h unicode-width.h -EXCEPT_HDRS := $(GEN_HDRS) compat/% xdiff/% +EXCEPT_HDRS := command-list.h config-list.h unicode-width.h compat/% xdiff/% ifndef GCRYPT_SHA256 EXCEPT_HDRS += sha256/gcrypt.h endif -CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(patsubst ./%,%,$(LIB_H))) +CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(LIB_H)) HCO = $(patsubst %.h,%.hco,$(CHK_HDRS)) +HCC = $(HCO:hco=hcc) + +%.hcc: %.h + @echo '#include "git-compat-util.h"' >$@ + @echo '#include "$<"' >>$@ -$(HCO): %.hco: %.h FORCE - $(QUIET_HDR)$(CC) -include git-compat-util.h -I. -o /dev/null -c -xc $< +$(HCO): %.hco: %.hcc FORCE + $(QUIET_HDR)$(CC) $(ALL_CFLAGS) -o /dev/null -c -xc $< .PHONY: hdr-check $(HCO) hdr-check: $(HCO) @@ -2781,7 +2851,7 @@ hdr-check: $(HCO) style: git clang-format --style file --diff --extensions c,h -check: command-list.h +check: config-list.h command-list.h @if sparse; \ then \ echo >&2 "Use 'make sparse' instead"; \ @@ -2791,15 +2861,11 @@ check: command-list.h exit 1; \ fi -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 +FOUND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES))) +COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FOUND_C_SOURCES)) %.cocci.patch: %.cocci $(COCCI_SOURCES) - @echo ' ' SPATCH $<; \ + $(QUIET_SPATCH) \ if test $(SPATCH_BATCH_SIZE) = 0; then \ limit=; \ else \ @@ -2868,20 +2934,8 @@ ifdef MSVC # have already been rolled up into the exe's pdb file. # We DO NOT have pdb files for the builtin commands (like git-status.exe) # because it is just a copy/hardlink of git.exe, rather than a unique binary. - $(INSTALL) git.pdb '$(DESTDIR_SQ)$(bindir_SQ)' - $(INSTALL) git-shell.pdb '$(DESTDIR_SQ)$(bindir_SQ)' - $(INSTALL) git-upload-pack.pdb '$(DESTDIR_SQ)$(bindir_SQ)' - $(INSTALL) git-credential-store.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-daemon.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-fast-import.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-http-backend.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-http-fetch.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-http-push.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-imap-send.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-remote-http.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-remote-testsvn.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-sh-i18n--envsubst.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-show-index.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' + $(INSTALL) $(patsubst %.exe,%.pdb,$(filter-out $(BUILT_INS),$(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X)))) '$(DESTDIR_SQ)$(bindir_SQ)' + $(INSTALL) $(patsubst %.exe,%.pdb,$(filter-out $(BUILT_INS) $(REMOTE_CURL_ALIASES),$(PROGRAMS))) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' ifndef DEBUG $(INSTALL) $(vcpkg_rel_bin)/*.dll '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) $(vcpkg_rel_bin)/*.pdb '$(DESTDIR_SQ)$(bindir_SQ)' @@ -2909,7 +2963,7 @@ ifndef NO_TCLTK $(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install endif ifneq (,$X) - $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p' -ef '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p$X' || $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';) + $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_COMMANDS_TO_INSTALL) git$X)), test '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p' -ef '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p$X' || $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';) endif bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \ @@ -2932,16 +2986,19 @@ endif { test -z "$(NO_INSTALL_HARDLINKS)" && \ ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \ ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \ - cp "$$bindir/git$X" "$$bindir/$$p" || exit; } \ + cp "$$bindir/git$X" "$$bindir/$$p" || exit; }; \ done && \ for p in $(BUILT_INS); do \ $(RM) "$$execdir/$$p" && \ - test -n "$(INSTALL_SYMLINKS)" && \ - ln -s "$$destdir_from_execdir_SQ/$(bindir_relative_SQ)/git$X" "$$execdir/$$p" || \ - { test -z "$(NO_INSTALL_HARDLINKS)" && \ - ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ - ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ - cp "$$execdir/git$X" "$$execdir/$$p" || exit; } \ + if test -z "$(SKIP_DASHED_BUILT_INS)"; \ + then \ + test -n "$(INSTALL_SYMLINKS)" && \ + ln -s "$$destdir_from_execdir_SQ/$(bindir_relative_SQ)/git$X" "$$execdir/$$p" || \ + { test -z "$(NO_INSTALL_HARDLINKS)" && \ + ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ + ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ + cp "$$execdir/git$X" "$$execdir/$$p" || exit; }; \ + fi \ done && \ remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \ for p in $$remote_curl_aliases; do \ @@ -2993,33 +3050,33 @@ quick-install-html: ### Maintainer's dist rules +# Allow tweaking to hide local environment effects, like perm bits. +# With GNU tar, "--mode=u+rwX,og+rX,og-w" would be a good idea, for example. +TAR_DIST_EXTRA_OPTS = GIT_TARNAME = git-$(GIT_VERSION) +GIT_ARCHIVE_EXTRA_FILES = \ + --prefix=$(GIT_TARNAME)/ \ + --add-file=configure \ + --add-file=$(GIT_TARNAME)/version \ + --prefix=$(GIT_TARNAME)/git-gui/ \ + --add-file=$(GIT_TARNAME)/git-gui/version +ifdef DC_SHA1_SUBMODULE +GIT_ARCHIVE_EXTRA_FILES += \ + --prefix=$(GIT_TARNAME)/sha1collisiondetection/ \ + --add-file=sha1collisiondetection/LICENSE.txt \ + --prefix=$(GIT_TARNAME)/sha1collisiondetection/lib/ \ + --add-file=sha1collisiondetection/lib/sha1.c \ + --add-file=sha1collisiondetection/lib/sha1.h \ + --add-file=sha1collisiondetection/lib/ubc_check.c \ + --add-file=sha1collisiondetection/lib/ubc_check.h +endif dist: git-archive$(X) configure - ./git-archive --format=tar \ - --prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar @mkdir -p $(GIT_TARNAME) - @cp configure $(GIT_TARNAME) @echo $(GIT_VERSION) > $(GIT_TARNAME)/version @$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version - $(TAR) rf $(GIT_TARNAME).tar \ - $(GIT_TARNAME)/configure \ - $(GIT_TARNAME)/version \ - $(GIT_TARNAME)/git-gui/version -ifdef DC_SHA1_SUBMODULE - @mkdir -p $(GIT_TARNAME)/sha1collisiondetection/lib - @cp sha1collisiondetection/LICENSE.txt \ - $(GIT_TARNAME)/sha1collisiondetection/ - @cp sha1collisiondetection/LICENSE.txt \ - $(GIT_TARNAME)/sha1collisiondetection/ - @cp sha1collisiondetection/lib/sha1.[ch] \ - $(GIT_TARNAME)/sha1collisiondetection/lib/ - @cp sha1collisiondetection/lib/ubc_check.[ch] \ - $(GIT_TARNAME)/sha1collisiondetection/lib/ - $(TAR) rf $(GIT_TARNAME).tar \ - $(GIT_TARNAME)/sha1collisiondetection/LICENSE.txt \ - $(GIT_TARNAME)/sha1collisiondetection/lib/sha1.[ch] \ - $(GIT_TARNAME)/sha1collisiondetection/lib/ubc_check.[ch] -endif + ./git-archive --format=tar \ + $(GIT_ARCHIVE_EXTRA_FILES) \ + --prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar @$(RM) -r $(GIT_TARNAME) gzip -f -9 $(GIT_TARNAME).tar @@ -3028,7 +3085,11 @@ rpm:: @false .PHONY: rpm -artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \ +ifneq ($(INCLUDE_DLLS_IN_ARTIFACTS),) +OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll) +endif + +artifacts-tar:: $(ALL_COMMANDS_TO_INSTALL) $(SCRIPT_LIB) $(OTHER_PROGRAMS) \ GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \ $(MOFILES) $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) \ @@ -3045,7 +3106,7 @@ dist-doc: $(RM) -r .doc-tmp-dir mkdir .doc-tmp-dir $(MAKE) -C Documentation WEBDOC_DEST=../.doc-tmp-dir install-webdoc - cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar . + cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar $(TAR_DIST_EXTRA_OPTS) . gzip -n -9 -f $(htmldocs).tar : $(RM) -r .doc-tmp-dir @@ -3055,7 +3116,7 @@ dist-doc: man5dir=../.doc-tmp-dir/man5 \ man7dir=../.doc-tmp-dir/man7 \ install - cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar . + cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar $(TAR_DIST_EXTRA_OPTS) . gzip -n -9 -f $(manpages).tar $(RM) -r .doc-tmp-dir @@ -3077,13 +3138,14 @@ cocciclean: clean: profile-clean coverage-clean cocciclean $(RM) *.res $(RM) $(OBJECTS) - $(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB) + $(RM) $(LIB_FILE) $(XDIFF_LIB) $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X $(RM) $(TEST_PROGRAMS) $(RM) $(FUZZ_PROGRAMS) - $(RM) -r bin-wrappers $(dep_dirs) + $(RM) $(HCC) + $(RM) -r bin-wrappers $(dep_dirs) $(compdb_dir) compile_commands.json $(RM) -r po/build/ - $(RM) *.pyc *.pyo */*.pyc */*.pyo command-list.h $(ETAGS_TARGET) tags cscope* + $(RM) *.pyc *.pyo */*.pyc */*.pyo $(GENERATED_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 @@ -3122,11 +3184,12 @@ endif ### Check documentation # -ALL_COMMANDS = $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) +ALL_COMMANDS = $(ALL_COMMANDS_TO_INSTALL) $(SCRIPT_LIB) ALL_COMMANDS += git +ALL_COMMANDS += git-citool +ALL_COMMANDS += git-gui ALL_COMMANDS += gitk ALL_COMMANDS += gitweb -ALL_COMMANDS += git-gui git-citool .PHONY: check-docs check-docs:: @@ -3161,7 +3224,7 @@ check-docs:: -e 's/\.txt//'; \ ) | while read how cmd; \ do \ - case " $(patsubst %$X,%,$(ALL_COMMANDS) $(EXCLUDED_PROGRAMS)) " in \ + case " $(patsubst %$X,%,$(ALL_COMMANDS) $(BUILT_INS) $(EXCLUDED_PROGRAMS)) " in \ *" $$cmd "*) ;; \ *) echo "removed but $$how: $$cmd" ;; \ esac; \ diff --git a/third_party/git/README.md b/third_party/git/README.md index e1d2b82209..eb8115e6b0 100644 --- a/third_party/git/README.md +++ b/third_party/git/README.md @@ -1,4 +1,4 @@ -[](https://dev.azure.com/git/git/_build/latest?definitionId=11) +[](https://github.com/git/git/actions?query=branch%3Amaster+event%3Apush) Git - fast, scalable, distributed revision control system ========================================================= @@ -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://public-inbox.org/git/>, +available at <https://lore.kernel.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 248d137c43..01daa17077 120000 --- a/third_party/git/RelNotes +++ b/third_party/git/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.23.0.txt \ No newline at end of file +Documentation/RelNotes/2.29.2.txt \ No newline at end of file diff --git a/third_party/git/abspath.c b/third_party/git/abspath.c index 9857985329..6f15a418bb 100644 --- a/third_party/git/abspath.c +++ b/third_party/git/abspath.c @@ -202,22 +202,6 @@ error_out: return retval; } -/* - * Resolve `path` into an absolute, cleaned-up path. The return value - * comes from a shared buffer. - */ -const char *real_path(const char *path) -{ - static struct strbuf realpath = STRBUF_INIT; - return strbuf_realpath(&realpath, path, 1); -} - -const char *real_path_if_valid(const char *path) -{ - static struct strbuf realpath = STRBUF_INIT; - return strbuf_realpath(&realpath, path, 0); -} - char *real_pathdup(const char *path, int die_on_error) { struct strbuf realpath = STRBUF_INIT; @@ -233,7 +217,7 @@ char *real_pathdup(const char *path, int die_on_error) /* * Use this to get an absolute path from a relative one. If you want - * to resolve links, you should use real_path. + * to resolve links, you should use strbuf_realpath. */ const char *absolute_path(const char *path) { diff --git a/third_party/git/add-interactive.c b/third_party/git/add-interactive.c new file mode 100644 index 0000000000..555c4abf32 --- /dev/null +++ b/third_party/git/add-interactive.c @@ -0,0 +1,1176 @@ +#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" +#include "prompt.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 (git_read_line_interactively(&input) == EOF) { + putchar('\n'); + if (immediate) + res = LIST_AND_CHOOSE_QUIT; + break; + } + + 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 strvec args = STRVEC_INIT; + struct pathspec ps_selected = { 0 }; + + for (i = 0; i < files->items.nr; i++) + if (files->selected[i]) + strvec_push(&args, + files->items.items[i].string); + parse_pathspec(&ps_selected, + PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL, + PATHSPEC_LITERAL_PATH, "", args.v); + res = run_add_p(s->r, ADD_P_ADD, NULL, &ps_selected); + strvec_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 strvec args = STRVEC_INIT; + + strvec_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]) + strvec_push(&args, + files->items.items[i].string); + res = run_command_v_opt(args.v, 0); + strvec_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 new file mode 100644 index 0000000000..693f125e8e --- /dev/null +++ b/third_party/git/add-interactive.h @@ -0,0 +1,41 @@ +#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 new file mode 100644 index 0000000000..bd94bd3a7c --- /dev/null +++ b/third_party/git/add-patch.c @@ -0,0 +1,1742 @@ +#include "cache.h" +#include "add-interactive.h" +#include "strbuf.h" +#include "run-command.h" +#include "strvec.h" +#include "pathspec.h" +#include "color.h" +#include "diff.h" +#include "compat/terminal.h" +#include "prompt.h" + +enum prompt_mode_type { + PROMPT_MODE_CHANGE = 0, PROMPT_DELETION, PROMPT_ADDITION, 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 addition [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 addition [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 addition [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 addition 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 addition 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 addition 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 addition 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 addition 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 addition 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, added:1, mode_change:1,binary:1; + } *file_diff; + size_t file_diff_nr; + + /* patch mode */ + struct patch_mode *mode; + const char *revision; +}; + +static void add_p_state_clear(struct add_p_state *s) +{ + size_t i; + + strbuf_release(&s->answer); + strbuf_release(&s->buf); + strbuf_release(&s->plain); + strbuf_release(&s->colored); + for (i = 0; i < s->file_diff_nr; i++) + free(s->file_diff[i].hunk); + free(s->file_diff); + clear_add_i_state(&s->s); +} + +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 *))) + strvec_push(&cp->args, arg); + va_end(ap); + + cp->git_cmd = 1; + strvec_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 strvec args = STRVEC_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; + + strvec_pushv(&args, s->mode->diff_cmd); + if (diff_algorithm) + strvec_pushf(&args, "--diff-algorithm=%s", diff_algorithm); + if (s->revision) { + struct object_id oid; + strvec_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.nr; + /* Use `--no-color` explicitly, just in case `diff.color = always`. */ + strvec_pushl(&args, "--no-color", "-p", "--", NULL); + for (i = 0; i < ps->nr; i++) + strvec_push(&args, ps->items[i].original); + + setup_child_process(s, &cp, NULL); + cp.argv = args.v; + res = capture_command(&cp, plain, 0); + if (res) { + strvec_clear(&args); + return error(_("could not parse diff")); + } + if (!plain->len) { + strvec_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.v[color_arg_index], 8, "--color"); + colored_cp.argv = args.v; + colored = &s->colored; + res = capture_command(&colored_cp, colored, 0); + strvec_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; + } + strvec_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 ")) { + ALLOC_GROW_BY(s->file_diff, s->file_diff_nr, 1, + file_diff_alloc); + file_diff = s->file_diff + s->file_diff_nr - 1; + 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++; + + ALLOC_GROW_BY(file_diff->hunk, file_diff->hunk_nr, 1, + file_diff->hunk_alloc); + hunk = file_diff->hunk + file_diff->hunk_nr - 1; + + 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 && + starts_with(p, "new file")) { + file_diff->added = 1; + } 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_BY(file_diff->hunk, file_diff->hunk_nr, 1, + file_diff->hunk_alloc); + 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->added + + !!file_diff->mode_change > 1) + BUG("diff can only contain delete *or* add *or* 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); + strvec_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 (git_read_line_interactively(&s->answer) == EOF) + return EOF; + 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) { + /* abandoned */ + *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; + enum { + ALLOW_GOTO_PREVIOUS_HUNK = 1 << 0, + ALLOW_GOTO_PREVIOUS_UNDECIDED_HUNK = 1 << 1, + ALLOW_GOTO_NEXT_HUNK = 1 << 2, + ALLOW_GOTO_NEXT_UNDECIDED_HUNK = 1 << 3, + ALLOW_SEARCH_AND_GOTO = 1 << 4, + ALLOW_SPLIT = 1 << 5, + ALLOW_EDIT = 1 << 6 + } permitted = 0; + + /* Empty added files have no hunks */ + if (!file_diff->hunk_nr && !file_diff->added) + 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_nr + ? file_diff->hunk + hunk_index + : &file_diff->head; + undecided_previous = -1; + undecided_next = -1; + + if (file_diff->hunk_nr) { + for (i = hunk_index - 1; i >= 0; i--) + if (file_diff->hunk[i].use == UNDECIDED_HUNK) { + undecided_previous = i; + break; + } + + 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); + if (file_diff->hunk_nr) { + render_hunk(s, hunk, 0, colored, &s->buf); + fputs(s->buf.buf, stdout); + + strbuf_reset(&s->buf); + if (undecided_previous >= 0) { + permitted |= ALLOW_GOTO_PREVIOUS_UNDECIDED_HUNK; + strbuf_addstr(&s->buf, ",k"); + } + if (hunk_index) { + permitted |= ALLOW_GOTO_PREVIOUS_HUNK; + strbuf_addstr(&s->buf, ",K"); + } + if (undecided_next >= 0) { + permitted |= ALLOW_GOTO_NEXT_UNDECIDED_HUNK; + strbuf_addstr(&s->buf, ",j"); + } + if (hunk_index + 1 < file_diff->hunk_nr) { + permitted |= ALLOW_GOTO_NEXT_HUNK; + strbuf_addstr(&s->buf, ",J"); + } + if (file_diff->hunk_nr > 1) { + permitted |= ALLOW_SEARCH_AND_GOTO; + strbuf_addstr(&s->buf, ",g,/"); + } + if (hunk->splittable_into > 1) { + permitted |= ALLOW_SPLIT; + strbuf_addstr(&s->buf, ",s"); + } + if (hunk_index + 1 > file_diff->mode_change && + !file_diff->deleted) { + permitted |= ALLOW_EDIT; + strbuf_addstr(&s->buf, ",e"); + } + } + if (file_diff->deleted) + prompt_mode_type = PROMPT_DELETION; + else if (file_diff->added) + prompt_mode_type = PROMPT_ADDITION; + 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 + ? file_diff->hunk_nr + : 1)); + 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') { + if (file_diff->hunk_nr) { + 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 (hunk->use == UNDECIDED_HUNK) { + hunk->use = USE_HUNK; + } + } else if (ch == 'd' || ch == 'q') { + if (file_diff->hunk_nr) { + for (; hunk_index < file_diff->hunk_nr; hunk_index++) { + hunk = file_diff->hunk + hunk_index; + if (hunk->use == UNDECIDED_HUNK) + hunk->use = SKIP_HUNK; + } + } else if (hunk->use == UNDECIDED_HUNK) { + hunk->use = SKIP_HUNK; + } + if (ch == 'q') { + quit = 1; + break; + } + } else if (s->answer.buf[0] == 'K') { + if (permitted & ALLOW_GOTO_PREVIOUS_HUNK) + hunk_index--; + else + err(s, _("No previous hunk")); + } else if (s->answer.buf[0] == 'J') { + if (permitted & ALLOW_GOTO_NEXT_HUNK) + hunk_index++; + else + err(s, _("No next hunk")); + } else if (s->answer.buf[0] == 'k') { + if (permitted & ALLOW_GOTO_PREVIOUS_UNDECIDED_HUNK) + hunk_index = undecided_previous; + else + err(s, _("No previous hunk")); + } else if (s->answer.buf[0] == 'j') { + if (permitted & ALLOW_GOTO_NEXT_UNDECIDED_HUNK) + hunk_index = undecided_next; + else + err(s, _("No next hunk")); + } else if (s->answer.buf[0] == 'g') { + char *pend; + unsigned long response; + + if (!(permitted & ALLOW_SEARCH_AND_GOTO)) { + 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 (!(permitted & ALLOW_SEARCH_AND_GOTO)) { + 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 (!(permitted & ALLOW_SPLIT)) + 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 (!(permitted & ALLOW_EDIT)) + 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 || + (!file_diff->hunk_nr && file_diff->head.use == USE_HUNK)) { + /* 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); + strvec_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) >= 0) + 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) { + add_p_state_clear(&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")); + + add_p_state_clear(&s); + return 0; +} diff --git a/third_party/git/advice.c b/third_party/git/advice.c index 3ee0ee2d8f..f0a3d32d20 100644 --- a/third_party/git/advice.c +++ b/third_party/git/advice.c @@ -29,7 +29,9 @@ int advice_ignored_hook = 1; 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] = { @@ -79,7 +81,7 @@ static struct { { "sequencerInUse", &advice_sequencer_in_use }, { "implicitIdentity", &advice_implicit_identity }, { "detachedHead", &advice_detached_head }, - { "setupStreamFailure", &advice_set_upstream_failure }, + { "setUpstreamFailure", &advice_set_upstream_failure }, { "objectNameWarning", &advice_object_name_warning }, { "amWorkDir", &advice_amworkdir }, { "rmHints", &advice_rm_hints }, @@ -88,21 +90,66 @@ static struct { { "waitingForEditor", &advice_waiting_for_editor }, { "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 } }; -void advise(const char *advice, ...) +static struct { + const char *key; + int enabled; +} advice_setting[] = { + [ADVICE_ADD_EMBEDDED_REPO] = { "addEmbeddedRepo", 1 }, + [ADVICE_AM_WORK_DIR] = { "amWorkDir", 1 }, + [ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = { "checkoutAmbiguousRemoteBranchName", 1 }, + [ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge", 1 }, + [ADVICE_DETACHED_HEAD] = { "detachedHead", 1 }, + [ADVICE_FETCH_SHOW_FORCED_UPDATES] = { "fetchShowForcedUpdates", 1 }, + [ADVICE_GRAFT_FILE_DEPRECATED] = { "graftFileDeprecated", 1 }, + [ADVICE_IGNORED_HOOK] = { "ignoredHook", 1 }, + [ADVICE_IMPLICIT_IDENTITY] = { "implicitIdentity", 1 }, + [ADVICE_NESTED_TAG] = { "nestedTag", 1 }, + [ADVICE_OBJECT_NAME_WARNING] = { "objectNameWarning", 1 }, + [ADVICE_PUSH_ALREADY_EXISTS] = { "pushAlreadyExists", 1 }, + [ADVICE_PUSH_FETCH_FIRST] = { "pushFetchFirst", 1 }, + [ADVICE_PUSH_NEEDS_FORCE] = { "pushNeedsForce", 1 }, + + /* make this an alias for backward compatibility */ + [ADVICE_PUSH_UPDATE_REJECTED_ALIAS] = { "pushNonFastForward", 1 }, + + [ADVICE_PUSH_NON_FF_CURRENT] = { "pushNonFFCurrent", 1 }, + [ADVICE_PUSH_NON_FF_MATCHING] = { "pushNonFFMatching", 1 }, + [ADVICE_PUSH_UNQUALIFIED_REF_NAME] = { "pushUnqualifiedRefName", 1 }, + [ADVICE_PUSH_UPDATE_REJECTED] = { "pushUpdateRejected", 1 }, + [ADVICE_RESET_QUIET_WARNING] = { "resetQuiet", 1 }, + [ADVICE_RESOLVE_CONFLICT] = { "resolveConflict", 1 }, + [ADVICE_RM_HINTS] = { "rmHints", 1 }, + [ADVICE_SEQUENCER_IN_USE] = { "sequencerInUse", 1 }, + [ADVICE_SET_UPSTREAM_FAILURE] = { "setUpstreamFailure", 1 }, + [ADVICE_STATUS_AHEAD_BEHIND_WARNING] = { "statusAheadBehindWarning", 1 }, + [ADVICE_STATUS_HINTS] = { "statusHints", 1 }, + [ADVICE_STATUS_U_OPTION] = { "statusUoption", 1 }, + [ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE] = { "submoduleAlternateErrorStrategyDie", 1 }, + [ADVICE_WAITING_FOR_EDITOR] = { "waitingForEditor", 1 }, +}; + +static const char turn_off_instructions[] = +N_("\n" + "Disable this message with \"git config advice.%s false\""); + +static void vadvise(const char *advice, int display_instructions, + const char *key, va_list params) { struct strbuf buf = STRBUF_INIT; - va_list params; const char *cp, *np; - va_start(params, advice); strbuf_vaddf(&buf, advice, params); - va_end(params); + + if (display_instructions) + strbuf_addf(&buf, turn_off_instructions, key); for (cp = buf.buf; *cp; cp = np) { np = strchrnul(cp, '\n'); @@ -116,6 +163,37 @@ void advise(const char *advice, ...) strbuf_release(&buf); } +void advise(const char *advice, ...) +{ + va_list params; + va_start(params, advice); + vadvise(advice, 0, "", params); + va_end(params); +} + +int advice_enabled(enum advice_type type) +{ + switch(type) { + case ADVICE_PUSH_UPDATE_REJECTED: + return advice_setting[ADVICE_PUSH_UPDATE_REJECTED].enabled && + advice_setting[ADVICE_PUSH_UPDATE_REJECTED_ALIAS].enabled; + default: + return advice_setting[type].enabled; + } +} + +void advise_if_enabled(enum advice_type type, const char *advice, ...) +{ + va_list params; + + if (!advice_enabled(type)) + return; + + va_start(params, advice); + vadvise(advice, 1, advice_setting[type].key, params); + va_end(params); +} + int git_default_advice_config(const char *var, const char *value) { const char *k, *slot_name; @@ -142,6 +220,13 @@ int git_default_advice_config(const char *var, const char *value) if (strcasecmp(k, advice_config[i].name)) continue; *advice_config[i].preference = git_config_bool(var, value); + break; + } + + for (i = 0; i < ARRAY_SIZE(advice_setting); i++) { + if (strcasecmp(k, advice_setting[i].key)) + continue; + advice_setting[i].enabled = git_config_bool(var, value); return 0; } @@ -152,8 +237,8 @@ void list_config_advices(struct string_list *list, const char *prefix) { int i; - for (i = 0; i < ARRAY_SIZE(advice_config); i++) - list_config_item(list, prefix, advice_config[i].name); + for (i = 0; i < ARRAY_SIZE(advice_setting); i++) + list_config_item(list, prefix, advice_setting[i].key); } int error_resolve_conflict(const char *me) diff --git a/third_party/git/advice.h b/third_party/git/advice.h index d015404843..16f2c11642 100644 --- a/third_party/git/advice.h +++ b/third_party/git/advice.h @@ -29,11 +29,64 @@ extern int advice_ignored_hook; 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; + +/* + * To add a new advice, you need to: + * Define a new advice_type. + * Add a new entry to advice_setting array. + * Add the new config variable to Documentation/config/advice.txt. + * Call advise_if_enabled to print your advice. + */ + enum advice_type { + ADVICE_ADD_EMBEDDED_REPO, + ADVICE_AM_WORK_DIR, + ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME, + ADVICE_COMMIT_BEFORE_MERGE, + ADVICE_DETACHED_HEAD, + ADVICE_FETCH_SHOW_FORCED_UPDATES, + ADVICE_GRAFT_FILE_DEPRECATED, + ADVICE_IGNORED_HOOK, + ADVICE_IMPLICIT_IDENTITY, + ADVICE_NESTED_TAG, + ADVICE_OBJECT_NAME_WARNING, + ADVICE_PUSH_ALREADY_EXISTS, + ADVICE_PUSH_FETCH_FIRST, + ADVICE_PUSH_NEEDS_FORCE, + ADVICE_PUSH_NON_FF_CURRENT, + ADVICE_PUSH_NON_FF_MATCHING, + ADVICE_PUSH_UNQUALIFIED_REF_NAME, + ADVICE_PUSH_UPDATE_REJECTED_ALIAS, + ADVICE_PUSH_UPDATE_REJECTED, + ADVICE_RESET_QUIET_WARNING, + ADVICE_RESOLVE_CONFLICT, + ADVICE_RM_HINTS, + ADVICE_SEQUENCER_IN_USE, + ADVICE_SET_UPSTREAM_FAILURE, + ADVICE_STATUS_AHEAD_BEHIND_WARNING, + ADVICE_STATUS_HINTS, + ADVICE_STATUS_U_OPTION, + ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE, + ADVICE_WAITING_FOR_EDITOR, +}; int git_default_advice_config(const char *var, const char *value); __attribute__((format (printf, 1, 2))) void advise(const char *advice, ...); + +/** + * Checks if advice type is enabled (can be printed to the user). + * Should be called before advise(). + */ +int advice_enabled(enum advice_type type); + +/** + * Checks the visibility of the advice before printing. + */ +void advise_if_enabled(enum advice_type type, const char *advice, ...); + int error_resolve_conflict(const char *me); void NORETURN die_resolve_conflict(const char *me); void NORETURN die_conclude_merge(void); diff --git a/third_party/git/alloc.c b/third_party/git/alloc.c index 1c64c4dd16..957a0af362 100644 --- a/third_party/git/alloc.c +++ b/third_party/git/alloc.c @@ -99,23 +99,27 @@ void *alloc_object_node(struct repository *r) return obj; } -static unsigned int alloc_commit_index(struct repository *r) +/* + * The returned count is to be used as an index into commit slabs, + * that are *NOT* maintained per repository, and that is why a single + * global counter is used. + */ +static unsigned int alloc_commit_index(void) { - return r->parsed_objects->commit_count++; + static unsigned int parsed_commits_count; + return parsed_commits_count++; } -void init_commit_node(struct repository *r, struct commit *c) +void init_commit_node(struct commit *c) { c->object.type = OBJ_COMMIT; - c->index = alloc_commit_index(r); - c->graph_pos = COMMIT_NOT_FROM_GRAPH; - c->generation = GENERATION_NUMBER_INFINITY; + c->index = alloc_commit_index(); } void *alloc_commit_node(struct repository *r) { struct commit *c = alloc_node(r->parsed_objects->commit_state, sizeof(struct commit)); - init_commit_node(r, c); + init_commit_node(c); return c; } diff --git a/third_party/git/alloc.h b/third_party/git/alloc.h index ed1071c11e..371d388b55 100644 --- a/third_party/git/alloc.h +++ b/third_party/git/alloc.h @@ -9,7 +9,7 @@ struct repository; void *alloc_blob_node(struct repository *r); void *alloc_tree_node(struct repository *r); -void init_commit_node(struct repository *r, struct commit *c); +void init_commit_node(struct commit *c); void *alloc_commit_node(struct repository *r); void *alloc_tag_node(struct repository *r); void *alloc_object_node(struct repository *r); diff --git a/third_party/git/apply.c b/third_party/git/apply.c index cde95369bb..76dba93c97 100644 --- a/third_party/git/apply.c +++ b/third_party/git/apply.c @@ -30,9 +30,9 @@ struct gitdiff_data { 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_default_config, NULL); + git_config_get_string("apply.whitespace", &apply_default_whitespace); + git_config_get_string("apply.ignorewhitespace", &apply_default_ignorewhitespace); + git_config(git_xmerge_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://public-inbox.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/ + * https://lore.kernel.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/ */ if (unquote_c_style(&name, line, NULL)) { strbuf_release(&name); @@ -1361,11 +1361,32 @@ int parse_git_diff_header(struct strbuf *root, if (check_header_line(*linenr, patch)) return -1; if (res > 0) - return offset; + goto done; 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; } @@ -1546,26 +1567,6 @@ 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; } @@ -2661,6 +2662,16 @@ 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. @@ -3146,7 +3157,8 @@ static int apply_binary(struct apply_state *state, * See if the old one matches what the patch * applies to. */ - hash_object_file(img->buf, img->len, blob_type, &oid); + hash_object_file(the_hash_algo, 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 " @@ -3166,7 +3178,7 @@ static int apply_binary(struct apply_state *state, return 0; /* deletion patch */ } - if (has_object_file(&oid)) { + if (has_object(the_repository, &oid, 0)) { /* We already have the postimage */ enum object_type type; unsigned long size; @@ -3191,7 +3203,8 @@ static int apply_binary(struct apply_state *state, name); /* verify that the result matches */ - hash_object_file(img->buf, img->len, blob_type, &oid); + hash_object_file(the_hash_algo, 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)); @@ -3727,6 +3740,7 @@ static int check_preimage(struct apply_state *state, #define EXISTS_IN_INDEX 1 #define EXISTS_IN_WORKTREE 2 +#define EXISTS_IN_INDEX_AS_ITA 3 static int check_to_create(struct apply_state *state, const char *new_name, @@ -3734,10 +3748,23 @@ static int check_to_create(struct apply_state *state, { struct stat nst; - if (state->check_index && - index_name_pos(state->repo->index, new_name, strlen(new_name)) >= 0 && - !ok_if_exists) - return EXISTS_IN_INDEX; + if (state->check_index && (!ok_if_exists || !state->cached)) { + int pos; + + pos = index_name_pos(state->repo->index, new_name, strlen(new_name)); + if (pos >= 0) { + struct cache_entry *ce = state->repo->index->cache[pos]; + + /* allow ITA, as they do not yet exist in the index */ + if (!ok_if_exists && !(ce->ce_flags & CE_INTENT_TO_ADD)) + return EXISTS_IN_INDEX; + + /* ITA entries can never match working tree files */ + if (!state->cached && (ce->ce_flags & CE_INTENT_TO_ADD)) + return EXISTS_IN_INDEX_AS_ITA; + } + } + if (state->cached) return 0; @@ -3922,6 +3949,9 @@ static int check_patch(struct apply_state *state, struct patch *patch) case EXISTS_IN_INDEX: return error(_("%s: already exists in index"), new_name); break; + case EXISTS_IN_INDEX_AS_ITA: + return error(_("%s: does not match index"), new_name); + break; case EXISTS_IN_WORKTREE: return error(_("%s: already exists in working directory"), new_name); @@ -4182,8 +4212,8 @@ static void show_rename_copy(struct patch *p) old_name = slash_old + 1; new_name = slash_new + 1; } - /* p->old_name thru old_name is the common prefix, and old_name and new_name - * through the end of names are renames + /* p->old_name through 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, @@ -4336,7 +4366,7 @@ static int try_create_file(struct apply_state *state, const char *path, if (fd < 0) return 1; - if (convert_to_working_tree(state->repo->index, path, buf, size, &nbuf)) { + if (convert_to_working_tree(state->repo->index, path, buf, size, &nbuf, NULL)) { size = nbuf.len; buf = nbuf.buf; } @@ -4643,6 +4673,7 @@ 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) @@ -4670,6 +4701,14 @@ 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) @@ -4746,6 +4785,8 @@ 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); @@ -4940,15 +4981,15 @@ int apply_parse_options(int argc, const char **argv, const char * const *apply_usage) { struct option builtin_apply_options[] = { - { OPTION_CALLBACK, 0, "exclude", state, N_("path"), + OPT_CALLBACK_F(0, "exclude", state, N_("path"), N_("don't apply changes matching the given path"), - PARSE_OPT_NONEG, apply_option_parse_exclude }, - { OPTION_CALLBACK, 0, "include", state, N_("path"), + PARSE_OPT_NONEG, apply_option_parse_exclude), + OPT_CALLBACK_F(0, "include", state, N_("path"), N_("apply changes matching the given path"), - PARSE_OPT_NONEG, apply_option_parse_include }, - { OPTION_CALLBACK, 'p', NULL, state, N_("num"), + PARSE_OPT_NONEG, apply_option_parse_include), + OPT_CALLBACK('p', NULL, state, N_("num"), N_("remove <num> leading slashes from traditional diff paths"), - 0, apply_option_parse_p }, + apply_option_parse_p), OPT_BOOL(0, "no-add", &state->no_add, N_("ignore additions made by the patch")), OPT_BOOL(0, "stat", &state->diffstat, @@ -4981,15 +5022,15 @@ int apply_parse_options(int argc, const char **argv, N_("paths are separated with NUL character"), '\0'), OPT_INTEGER('C', NULL, &state->p_context, N_("ensure at least <n> lines of context match")), - { OPTION_CALLBACK, 0, "whitespace", state, N_("action"), + OPT_CALLBACK(0, "whitespace", state, N_("action"), N_("detect new or modified lines that have whitespace errors"), - 0, apply_option_parse_whitespace }, - { OPTION_CALLBACK, 0, "ignore-space-change", state, NULL, + apply_option_parse_whitespace), + OPT_CALLBACK_F(0, "ignore-space-change", state, NULL, N_("ignore changes in whitespace when finding context"), - PARSE_OPT_NOARG, apply_option_parse_space_change }, - { OPTION_CALLBACK, 0, "ignore-whitespace", state, NULL, + PARSE_OPT_NOARG, apply_option_parse_space_change), + OPT_CALLBACK_F(0, "ignore-whitespace", state, NULL, N_("ignore changes in whitespace when finding context"), - PARSE_OPT_NOARG, apply_option_parse_space_change }, + PARSE_OPT_NOARG, apply_option_parse_space_change), OPT_BOOL('R', "reverse", &state->apply_in_reverse, N_("apply the patch in reverse")), OPT_BOOL(0, "unidiff-zero", &state->unidiff_zero, @@ -5005,9 +5046,9 @@ int apply_parse_options(int argc, const char **argv, OPT_BIT(0, "recount", options, N_("do not trust the line counts in the hunk headers"), APPLY_OPT_RECOUNT), - { OPTION_CALLBACK, 0, "directory", state, N_("root"), + OPT_CALLBACK(0, "directory", state, N_("root"), N_("prepend <root> to all filenames"), - 0, apply_option_parse_directory }, + apply_option_parse_directory), OPT_END() }; diff --git a/third_party/git/apply.h b/third_party/git/apply.h index a795193435..da3d95fa50 100644 --- a/third_party/git/apply.h +++ b/third_party/git/apply.h @@ -1,6 +1,7 @@ #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 3e53aac1e6..f1a1447ebd 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(const struct object_id *oid) +static int stream_blocked(struct repository *r, const struct object_id *oid) { struct git_istream *st; enum object_type type; @@ -120,7 +120,7 @@ static int stream_blocked(const struct object_id *oid) char buf[BLOCKSIZE]; ssize_t readlen; - st = open_istream(oid, &type, &sz, NULL); + st = open_istream(r, oid, &type, &sz, NULL); if (!st) return error(_("cannot stream blob %s"), oid_to_hex(oid)); for (;;) { @@ -142,19 +142,25 @@ static int stream_blocked(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, unsigned int valuelen) + const char *value, size_t valuelen) { - int len, tmp; + size_t orig_len = sb->len; + size_t len, tmp; /* "%u %s=%s\n" */ len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1; - for (tmp = len; tmp > 9; tmp /= 10) + for (tmp = 1; len / 10 >= tmp; tmp *= 10) len++; strbuf_grow(sb, len); - strbuf_addf(sb, "%u %s=", len, keyword); + strbuf_addf(sb, "%"PRIuMAX" %s=", (uintmax_t)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)); } /* @@ -236,13 +242,12 @@ static void write_extended_header(struct archiver_args *args, static int write_tar_entry(struct archiver_args *args, const struct object_id *oid, const char *path, size_t pathlen, - unsigned int mode) + unsigned int mode, + void *buffer, unsigned long size) { struct ustar_header header; struct strbuf ext_header = STRBUF_INIT; - unsigned int old_mode = mode; - unsigned long size, size_in_header; - void *buffer; + unsigned long size_in_header; int err = 0; memset(&header, 0, sizeof(header)); @@ -276,20 +281,6 @@ static int write_tar_entry(struct archiver_args *args, } else memcpy(header.name, path, pathlen); - if (S_ISREG(mode) && !args->convert && - oid_object_info(args->repo, oid, &size) == OBJ_BLOB && - size > big_file_threshold) - buffer = NULL; - else if (S_ISLNK(mode) || S_ISREG(mode)) { - enum object_type type; - buffer = object_file_to_archive(args, path, oid, old_mode, &type, &size); - if (!buffer) - return error(_("cannot read %s"), oid_to_hex(oid)); - } else { - buffer = NULL; - size = 0; - } - if (S_ISLNK(mode)) { if (size > sizeof(header.linkname)) { xsnprintf(header.linkname, sizeof(header.linkname), @@ -318,9 +309,8 @@ static int write_tar_entry(struct archiver_args *args, if (buffer) write_blocked(buffer, size); else - err = stream_blocked(oid); + err = stream_blocked(args->repo, oid); } - free(buffer); return err; } @@ -358,7 +348,7 @@ static struct archiver **tar_filters; static int nr_tar_filters; static int alloc_tar_filters; -static struct archiver *find_tar_filter(const char *name, int len) +static struct archiver *find_tar_filter(const char *name, size_t len) { int i; for (i = 0; i < nr_tar_filters; i++) { @@ -374,7 +364,7 @@ static int tar_filter_config(const char *var, const char *value, void *data) struct archiver *ar; const char *name; const char *type; - int namelen; + size_t namelen; if (parse_config_key(var, "tar", &name, &namelen, &type) < 0 || !name) return 0; diff --git a/third_party/git/archive-zip.c b/third_party/git/archive-zip.c index 4d66b5be6e..2961e01c75 100644 --- a/third_party/git/archive-zip.c +++ b/third_party/git/archive-zip.c @@ -24,6 +24,11 @@ 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]; @@ -280,7 +285,8 @@ static int entry_is_binary(struct index_state *istate, const char *path, static int write_zip_entry(struct archiver_args *args, const struct object_id *oid, const char *path, size_t pathlen, - unsigned int mode) + unsigned int mode, + void *buffer, unsigned long size) { struct zip_local_header header; uintmax_t offset = zip_offset; @@ -291,13 +297,11 @@ static int write_zip_entry(struct archiver_args *args, unsigned long attr2; unsigned long compressed_size; unsigned long crc; - int method; + enum zip_method method; unsigned char *out; void *deflated = NULL; - void *buffer; struct git_istream *stream = NULL; unsigned long flags = 0; - unsigned long size; int is_binary = -1; const char *path_without_prefix = path + args->baselen; unsigned int creator_version = 0; @@ -320,45 +324,36 @@ static int write_zip_entry(struct archiver_args *args, } if (S_ISDIR(mode) || S_ISGITLINK(mode)) { - method = 0; + method = ZIP_METHOD_STORE; attr2 = 16; out = NULL; - size = 0; compressed_size = 0; - buffer = NULL; } else if (S_ISREG(mode) || S_ISLNK(mode)) { - enum object_type type = oid_object_info(args->repo, oid, - &size); - - method = 0; + method = ZIP_METHOD_STORE; 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 = 8; + method = ZIP_METHOD_DEFLATE; - if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert && - size > big_file_threshold) { - stream = open_istream(oid, &type, &size, NULL); + if (!buffer) { + enum object_type type; + stream = open_istream(args->repo, oid, &type, &size, + NULL); if (!stream) return error(_("cannot stream blob %s"), oid_to_hex(oid)); flags |= ZIP_STREAM; - out = buffer = NULL; + out = NULL; } else { - buffer = object_file_to_archive(args, path, oid, mode, - &type, &size); - if (!buffer) - return error(_("cannot read %s"), - oid_to_hex(oid)); crc = crc32(crc, buffer, size); is_binary = entry_is_binary(args->repo->index, path_without_prefix, buffer, size); out = buffer; } - compressed_size = (method == 0) ? size : 0; + compressed_size = (method == ZIP_METHOD_STORE) ? size : 0; } else { return error(_("unsupported file mode: 0%o (SHA1: %s)"), mode, oid_to_hex(oid)); @@ -367,13 +362,13 @@ static int write_zip_entry(struct archiver_args *args, if (creator_version > max_creator_version) max_creator_version = creator_version; - if (buffer && method == 8) { + if (buffer && method == ZIP_METHOD_DEFLATE) { out = deflated = zlib_deflate_raw(buffer, size, args->compression_level, &compressed_size); if (!out || compressed_size >= size) { out = buffer; - method = 0; + method = ZIP_METHOD_STORE; compressed_size = size; } } @@ -420,7 +415,7 @@ static int write_zip_entry(struct archiver_args *args, zip_offset += ZIP64_EXTRA_SIZE; } - if (stream && method == 0) { + if (stream && method == ZIP_METHOD_STORE) { unsigned char buf[STREAM_BUFFER_SIZE]; ssize_t readlen; @@ -443,7 +438,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 == 8) { + } else if (stream && method == ZIP_METHOD_DEFLATE) { unsigned char buf[STREAM_BUFFER_SIZE]; ssize_t readlen; git_zstream zstream; @@ -505,7 +500,6 @@ static int write_zip_entry(struct archiver_args *args, } free(deflated); - free(buffer); if (compressed_size > 0xffffffff || size > 0xffffffff || offset > 0xffffffff) { @@ -603,18 +597,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 *t; + struct tm tm; if (date_overflows(*timestamp)) die(_("timestamp too large for this system: %"PRItime), *timestamp); time = (time_t)*timestamp; - t = localtime(&time); + localtime_r(&time, &tm); *timestamp = time; - *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; + *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; } static int archive_zip_config(const char *var, const char *value, void *data) diff --git a/third_party/git/archive.c b/third_party/git/archive.c index a8da0fcc4f..3c1541af9e 100644 --- a/third_party/git/archive.c +++ b/third_party/git/archive.c @@ -70,13 +70,20 @@ static void format_subst(const struct commit *commit, free(to_free); } -void *object_file_to_archive(const struct archiver_args *args, - const char *path, const struct object_id *oid, - unsigned int mode, enum object_type *type, - unsigned long *sizep) +static void *object_file_to_archive(const struct archiver_args *args, + const char *path, + const struct object_id *oid, + unsigned int mode, + enum object_type *type, + unsigned long *sizep) { void *buffer; const struct commit *commit = args->convert ? args->commit : NULL; + struct checkout_metadata meta; + + init_checkout_metadata(&meta, args->refname, + args->commit_oid ? args->commit_oid : + (args->tree ? &args->tree->object.oid : NULL), oid); path += args->baselen; buffer = read_object_file(oid, type, sizep); @@ -85,7 +92,7 @@ void *object_file_to_archive(const struct archiver_args *args, size_t size = 0; strbuf_attach(&buf, buffer, *sizep, *sizep + 1); - convert_to_working_tree(args->repo->index, path, buf.buf, buf.len, &buf); + convert_to_working_tree(args->repo->index, path, buf.buf, buf.len, &buf, &meta); if (commit) format_subst(commit, buf.buf, buf.len, &buf); buffer = strbuf_detach(&buf, &size); @@ -140,6 +147,9 @@ static int write_archive_entry(const struct object_id *oid, const char *base, write_archive_entry_fn_t write_entry = c->write_entry; int err; const char *path_without_prefix; + unsigned long size; + void *buffer; + enum object_type type; args->convert = 0; strbuf_reset(&path); @@ -162,7 +172,7 @@ static int write_archive_entry(const struct object_id *oid, const char *base, if (S_ISDIR(mode) || S_ISGITLINK(mode)) { if (args->verbose) fprintf(stderr, "%.*s\n", (int)path.len, path.buf); - err = write_entry(args, oid, path.buf, path.len, mode); + err = write_entry(args, oid, path.buf, path.len, mode, NULL, 0); if (err) return err; return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0); @@ -170,7 +180,19 @@ static int write_archive_entry(const struct object_id *oid, const char *base, if (args->verbose) fprintf(stderr, "%.*s\n", (int)path.len, path.buf); - return write_entry(args, oid, path.buf, path.len, mode); + + /* Stream it? */ + if (S_ISREG(mode) && !args->convert && + oid_object_info(args->repo, oid, &size) == OBJ_BLOB && + size > big_file_threshold) + return write_entry(args, oid, path.buf, path.len, mode, NULL, size); + + buffer = object_file_to_archive(args, path.buf, oid, mode, &type, &size); + if (!buffer) + return error(_("cannot read %s"), oid_to_hex(oid)); + err = write_entry(args, oid, path.buf, path.len, mode, buffer, size); + free(buffer); + return err; } static void queue_directory(const unsigned char *sha1, @@ -244,6 +266,11 @@ static int queue_or_write_archive_entry(const struct object_id *oid, stage, context); } +struct extra_file_info { + char *base; + struct stat stat; +}; + int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry) { @@ -251,6 +278,10 @@ int write_archive_entries(struct archiver_args *args, struct unpack_trees_options opts; struct tree_desc t; int err; + struct strbuf path_in_archive = STRBUF_INIT; + struct strbuf content = STRBUF_INIT; + struct object_id fake_oid = null_oid; + int i; if (args->baselen > 0 && args->base[args->baselen - 1] == '/') { size_t len = args->baselen; @@ -260,7 +291,7 @@ int write_archive_entries(struct archiver_args *args, if (args->verbose) fprintf(stderr, "%.*s\n", (int)len, args->base); err = write_entry(args, &args->tree->object.oid, args->base, - len, 040777); + len, 040777, NULL, 0); if (err) return err; } @@ -296,6 +327,33 @@ int write_archive_entries(struct archiver_args *args, free(context.bottom); context.bottom = next; } + + for (i = 0; i < args->extra_files.nr; i++) { + struct string_list_item *item = args->extra_files.items + i; + char *path = item->string; + struct extra_file_info *info = item->util; + + put_be64(fake_oid.hash, i + 1); + + strbuf_reset(&path_in_archive); + if (info->base) + strbuf_addstr(&path_in_archive, info->base); + strbuf_addstr(&path_in_archive, basename(path)); + + strbuf_reset(&content); + if (strbuf_read_file(&content, path, info->stat.st_size) < 0) + err = error_errno(_("could not read '%s'"), path); + else + err = write_entry(args, &fake_oid, path_in_archive.buf, + path_in_archive.len, + info->stat.st_mode, + content.buf, content.len); + if (err) + break; + } + strbuf_release(&path_in_archive); + strbuf_release(&content); + return err; } @@ -385,16 +443,17 @@ static void parse_treeish_arg(const char **argv, struct tree *tree; const struct commit *commit; struct object_id oid; + char *ref = NULL; /* Remotes are only allowed to fetch actual refs */ if (remote && !remote_allow_unreachable) { - char *ref = NULL; const char *colon = strchrnul(name, ':'); int refnamelen = colon - name; - if (!dwim_ref(name, refnamelen, &oid, &ref)) + if (!dwim_ref(name, refnamelen, &oid, &ref, 0)) die(_("no such ref: %.*s"), refnamelen, name); - free(ref); + } else { + dwim_ref(name, strlen(name), &oid, &ref, 0); } if (get_oid(name, &oid)) @@ -427,12 +486,49 @@ static void parse_treeish_arg(const char **argv, tree = parse_tree_indirect(&tree_oid); } + ar_args->refname = ref; ar_args->tree = tree; ar_args->commit_oid = commit_oid; ar_args->commit = commit; ar_args->time = archive_time; } +static void extra_file_info_clear(void *util, const char *str) +{ + struct extra_file_info *info = util; + free(info->base); + free(info); +} + +static int add_file_cb(const struct option *opt, const char *arg, int unset) +{ + struct archiver_args *args = opt->value; + const char **basep = (const char **)opt->defval; + const char *base = *basep; + char *path; + struct string_list_item *item; + struct extra_file_info *info; + + if (unset) { + string_list_clear_func(&args->extra_files, + extra_file_info_clear); + return 0; + } + + if (!arg) + return -1; + + path = prefix_filename(args->prefix, arg); + item = string_list_append_nodup(&args->extra_files, path); + item->util = info = xmalloc(sizeof(*info)); + info->base = xstrdup_or_null(base); + if (stat(path, &info->stat)) + die(_("File not found: %s"), path); + if (!S_ISREG(info->stat.st_mode)) + die(_("Not a regular file: %s"), path); + return 0; +} + #define OPT__COMPR(s, v, h, p) \ OPT_SET_INT_F(s, NULL, v, h, p, PARSE_OPT_NONEG) #define OPT__COMPR_HIDDEN(s, v, p) \ @@ -457,6 +553,9 @@ static int parse_archive_args(int argc, const char **argv, OPT_STRING(0, "format", &format, N_("fmt"), N_("archive format")), OPT_STRING(0, "prefix", &base, N_("prefix"), N_("prepend prefix to each pathname in the archive")), + { OPTION_CALLBACK, 0, "add-file", args, N_("file"), + N_("add untracked file to archive"), 0, add_file_cb, + (intptr_t)&base }, OPT_STRING('o', "output", &output, N_("file"), N_("write the archive to this file")), OPT_BOOL(0, "worktree-attributes", &worktree_attributes, @@ -491,6 +590,8 @@ static int parse_archive_args(int argc, const char **argv, die(_("Option --exec can only be used together with --remote")); if (output) die(_("Unexpected option --output")); + if (is_remote && args->extra_files.nr) + die(_("Options --add-file and --remote cannot be used together")); if (!base) base = ""; @@ -537,11 +638,14 @@ int write_archive(int argc, const char **argv, const char *prefix, { const struct archiver *ar = NULL; struct archiver_args args; + int rc; git_config_get_bool("uploadarchive.allowunreachable", &remote_allow_unreachable); git_config(git_default_config, NULL); args.repo = repo; + args.prefix = prefix; + string_list_init(&args.extra_files, 1); argc = parse_archive_args(argc, argv, &ar, &args, name_hint, remote); if (!startup_info->have_repository) { /* @@ -555,7 +659,11 @@ int write_archive(int argc, const char **argv, const char *prefix, parse_treeish_arg(argv, &args, prefix, remote); parse_pathspec_arg(argv + 1, &args); - return ar->write_archive(ar, &args); + rc = ar->write_archive(ar, &args); + + string_list_clear_func(&args.extra_files, extra_file_info_clear); + + return rc; } static int match_extension(const char *filename, const char *ext) diff --git a/third_party/git/archive.h b/third_party/git/archive.h index e60e3dd31c..82b226011a 100644 --- a/third_party/git/archive.h +++ b/third_party/git/archive.h @@ -8,6 +8,8 @@ struct repository; struct archiver_args { struct repository *repo; + const char *refname; + const char *prefix; const char *base; size_t baselen; struct tree *tree; @@ -19,6 +21,7 @@ struct archiver_args { unsigned int worktree_attributes : 1; unsigned int convert : 1; int compression_level; + struct string_list extra_files; }; /* main api */ @@ -48,12 +51,9 @@ void init_archivers(void); typedef int (*write_archive_entry_fn_t)(struct archiver_args *args, const struct object_id *oid, const char *path, size_t pathlen, - unsigned int mode); + unsigned int mode, + void *buffer, unsigned long size); int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry); -void *object_file_to_archive(const struct archiver_args *args, - const char *path, const struct object_id *oid, - unsigned int mode, enum object_type *type, - unsigned long *sizep); #endif /* ARCHIVE_H */ diff --git a/third_party/git/argv-array.c b/third_party/git/argv-array.c deleted file mode 100644 index f352ea9357..0000000000 --- a/third_party/git/argv-array.c +++ /dev/null @@ -1,109 +0,0 @@ -#include "cache.h" -#include "argv-array.h" -#include "strbuf.h" - -const char *empty_argv[] = { NULL }; - -void argv_array_init(struct argv_array *array) -{ - array->argv = empty_argv; - array->argc = 0; - array->alloc = 0; -} - -static void argv_array_push_nodup(struct argv_array *array, const char *value) -{ - if (array->argv == empty_argv) - array->argv = NULL; - - ALLOC_GROW(array->argv, array->argc + 2, array->alloc); - array->argv[array->argc++] = value; - array->argv[array->argc] = NULL; -} - -const char *argv_array_push(struct argv_array *array, const char *value) -{ - argv_array_push_nodup(array, xstrdup(value)); - return array->argv[array->argc - 1]; -} - -const char *argv_array_pushf(struct argv_array *array, const char *fmt, ...) -{ - va_list ap; - struct strbuf v = STRBUF_INIT; - - va_start(ap, fmt); - strbuf_vaddf(&v, fmt, ap); - va_end(ap); - - argv_array_push_nodup(array, strbuf_detach(&v, NULL)); - return array->argv[array->argc - 1]; -} - -void argv_array_pushl(struct argv_array *array, ...) -{ - va_list ap; - const char *arg; - - va_start(ap, array); - while((arg = va_arg(ap, const char *))) - argv_array_push(array, arg); - va_end(ap); -} - -void argv_array_pushv(struct argv_array *array, const char **argv) -{ - for (; *argv; argv++) - argv_array_push(array, *argv); -} - -void argv_array_pop(struct argv_array *array) -{ - if (!array->argc) - return; - free((char *)array->argv[array->argc - 1]); - array->argv[array->argc - 1] = NULL; - array->argc--; -} - -void argv_array_split(struct argv_array *array, const char *to_split) -{ - while (isspace(*to_split)) - to_split++; - for (;;) { - const char *p = to_split; - - if (!*p) - break; - - while (*p && !isspace(*p)) - p++; - argv_array_push_nodup(array, xstrndup(to_split, p - to_split)); - - while (isspace(*p)) - p++; - to_split = p; - } -} - -void argv_array_clear(struct argv_array *array) -{ - if (array->argv != empty_argv) { - int i; - for (i = 0; i < array->argc; i++) - free((char *)array->argv[i]); - free(array->argv); - } - argv_array_init(array); -} - -const char **argv_array_detach(struct argv_array *array) -{ - if (array->argv == empty_argv) - return xcalloc(1, sizeof(const char *)); - else { - const char **ret = array->argv; - argv_array_init(array); - return ret; - } -} diff --git a/third_party/git/argv-array.h b/third_party/git/argv-array.h deleted file mode 100644 index a39ba43f57..0000000000 --- a/third_party/git/argv-array.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef ARGV_ARRAY_H -#define ARGV_ARRAY_H - -extern const char *empty_argv[]; - -struct argv_array { - const char **argv; - int argc; - int alloc; -}; - -#define ARGV_ARRAY_INIT { empty_argv, 0, 0 } - -void argv_array_init(struct argv_array *); -const char *argv_array_push(struct argv_array *, const char *); -__attribute__((format (printf,2,3))) -const char *argv_array_pushf(struct argv_array *, const char *fmt, ...); -LAST_ARG_MUST_BE_NULL -void argv_array_pushl(struct argv_array *, ...); -void argv_array_pushv(struct argv_array *, const char **); -void argv_array_pop(struct argv_array *); -/* Splits by whitespace; does not handle quoted arguments! */ -void argv_array_split(struct argv_array *, const char *); -void argv_array_clear(struct argv_array *); -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 93dc16b59c..a826b2ef1f 100644 --- a/third_party/git/attr.c +++ b/third_party/git/attr.c @@ -1,7 +1,6 @@ /* * Handle git attributes. See gitattributes(5) for a description of - * the file syntax, and Documentation/technical/api-gitattributes.txt - * for a description of the API. + * the file syntax, and attr.h 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. @@ -62,7 +61,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; /* must be the first member! */ + struct hashmap_entry ent; const char *key; /* the key; memory should be owned by value */ size_t keylen; /* length of the key */ void *value; /* the stored value */ @@ -70,12 +69,14 @@ struct attr_hash_entry { /* attr_hashmap comparison function */ static int attr_hash_entry_cmp(const void *unused_cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *unused_keydata) { - const struct attr_hash_entry *a = entry; - const struct attr_hash_entry *b = entry_or_key; + 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); return (a->keylen != b->keylen) || strncmp(a->key, b->key, a->keylen); } @@ -98,10 +99,10 @@ static void *attr_hashmap_get(struct attr_hashmap *map, if (!map->map.tablesize) attr_hashmap_init(map); - hashmap_entry_init(&k, memhash(key, keylen)); + hashmap_entry_init(&k.ent, memhash(key, keylen)); k.key = key; k.keylen = keylen; - e = hashmap_get(&map->map, &k, NULL); + e = hashmap_get_entry(&map->map, &k, ent, NULL); return e ? e->value : NULL; } @@ -117,12 +118,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, memhash(key, keylen)); + hashmap_entry_init(&e->ent, memhash(key, keylen)); e->key = key; e->keylen = keylen; e->value = value; - hashmap_add(&map->map, e); + hashmap_add(&map->map, &e->ent); } struct all_attrs_item { @@ -161,12 +162,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; - while ((e = hashmap_iter_next(&iter))) { + hashmap_for_each_entry(&map->map, &iter, e, + ent /* member name */) { const struct git_attr *a = e->value; check->all_attrs[a->attr_nr].attr = a; } @@ -259,7 +260,7 @@ struct pattern { const char *pattern; int patternlen; int nowildcardlen; - unsigned flags; /* EXC_FLAG_* */ + unsigned flags; /* PATTERN_FLAG_* */ }; /* @@ -400,11 +401,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_exclude_pattern(&res->u.pat.pattern, + parse_path_pattern(&res->u.pat.pattern, &res->u.pat.patternlen, &res->u.pat.flags, &res->u.pat.nowildcardlen); - if (res->u.pat.flags & EXC_FLAG_NEGATIVE) { + if (res->u.pat.flags & PATTERN_FLAG_NEGATIVE) { warning(_("Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation.")); goto fail_return; @@ -991,10 +992,10 @@ static int path_matches(const char *pathname, int pathlen, int prefix = pat->nowildcardlen; int isdir = (pathlen && pathname[pathlen - 1] == '/'); - if ((pat->flags & EXC_FLAG_MUSTBEDIR) && !isdir) + if ((pat->flags & PATTERN_FLAG_MUSTBEDIR) && !isdir) return 0; - if (pat->flags & EXC_FLAG_NODIR) { + if (pat->flags & PATTERN_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 b0378bfe5f..404548f028 100644 --- a/third_party/git/attr.h +++ b/third_party/git/attr.h @@ -1,9 +1,121 @@ #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 a pointer to this opaque structure */ +/** + * 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 git_attr; /* opaque structures used internally for attribute collection */ @@ -21,21 +133,36 @@ const struct git_attr *git_attr(const char *); extern const char git_attr__true[]; extern const char git_attr__false[]; -/* For public to check git_attr_check results */ +/** + * 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. */ #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) -/* - * 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. - */ +/* This structure represents one attribute and its value. */ 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 deleted file mode 100644 index c329b7218b..0000000000 --- a/third_party/git/azure-pipelines.yml +++ /dev/null @@ -1,387 +0,0 @@ -resources: -- repo: self - fetchDepth: 1 - -jobs: -- job: windows_build - displayName: Windows Build - condition: succeeded() - pool: Hosted - 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 @" - ci/make-test-artifacts.sh artifacts - "@ - if (!$?) { exit(1) } - displayName: Build - env: - HOME: $(Build.SourcesDirectory) - MSYSTEM: MINGW64 - DEVELOPER: 1 - NO_PERL: 1 - - task: PublishPipelineArtifact@0 - displayName: 'Publish Pipeline Artifact: test artifacts' - inputs: - artifactName: 'windows-artifacts' - targetPath: '$(Build.SourcesDirectory)\artifacts' - - task: PublishPipelineArtifact@0 - displayName: 'Publish Pipeline Artifact: git-sdk-64-minimal' - inputs: - artifactName: 'git-sdk-64-minimal' - targetPath: '$(Build.SourcesDirectory)\git-sdk-64-minimal' - - 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: windows_test - displayName: Windows Test - dependsOn: windows_build - condition: succeeded() - pool: Hosted - 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: test artifacts' - inputs: - artifactName: 'windows-artifacts' - targetPath: '$(Build.SourcesDirectory)' - - task: DownloadPipelineArtifact@0 - displayName: 'Download Pipeline Artifact: git-sdk-64-minimal' - inputs: - artifactName: 'git-sdk-64-minimal' - targetPath: '$(Build.SourcesDirectory)\git-sdk-64-minimal' - - powershell: | - & git-sdk-64-minimal\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' /git-sdk-64-minimal/ /test-cache/ >>.git/info/exclude - - ci/run-test-slice.sh `$SYSTEM_JOBPOSITIONINPHASE `$SYSTEM_TOTALJOBSINPHASE || { - ci/print-test-failures.sh - exit 1 - } - "@ - 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: 'windows' - 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-test-artifacts - -- job: linux_clang - displayName: linux-clang - condition: succeeded() - 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 -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev apache2-bin && - - export CC=clang || exit 1 - - ci/install-dependencies.sh || exit 1 - ci/run-build-and-tests.sh || { - ci/print-test-failures.sh - exit 1 - } - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1 - displayName: 'ci/run-build-and-tests.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'linux-clang' - platform: Linux - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: linux_gcc - displayName: linux-gcc - condition: succeeded() - 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 add-apt-repository ppa:ubuntu-toolchain-r/test && - sudo apt-get update && - sudo apt-get -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev apache2 language-pack-is git-svn gcc-8 || exit 1 - - ci/install-dependencies.sh || exit 1 - ci/run-build-and-tests.sh || { - ci/print-test-failures.sh - exit 1 - } - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1 - displayName: 'ci/run-build-and-tests.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'linux-gcc' - platform: Linux - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: osx_clang - displayName: osx-clang - condition: succeeded() - 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 - - export CC=clang - - ci/install-dependencies.sh || exit 1 - ci/run-build-and-tests.sh || { - ci/print-test-failures.sh - exit 1 - } - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || umount "$HOME/test-cache" || exit 1 - displayName: 'ci/run-build-and-tests.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'osx-clang' - platform: macOS - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: osx_gcc - displayName: osx-gcc - condition: succeeded() - 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 - - ci/install-dependencies.sh || exit 1 - ci/run-build-and-tests.sh || { - ci/print-test-failures.sh - exit 1 - } - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || umount "$HOME/test-cache" || exit 1 - displayName: 'ci/run-build-and-tests.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'osx-gcc' - platform: macOS - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: gettext_poison - displayName: GETTEXT_POISON - condition: succeeded() - 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 -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev && - - export jobname=GETTEXT_POISON || exit 1 - - ci/run-build-and-tests.sh || { - ci/print-test-failures.sh - exit 1 - } - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1 - displayName: 'ci/run-build-and-tests.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'gettext-poison' - platform: Linux - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: linux32 - displayName: Linux32 - condition: succeeded() - 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 - - res=0 - sudo AGENT_OS="$AGENT_OS" BUILD_BUILDNUMBER="$BUILD_BUILDNUMBER" BUILD_REPOSITORY_URI="$BUILD_REPOSITORY_URI" BUILD_SOURCEBRANCH="$BUILD_SOURCEBRANCH" BUILD_SOURCEVERSION="$BUILD_SOURCEVERSION" SYSTEM_PHASENAME="$SYSTEM_PHASENAME" SYSTEM_TASKDEFINITIONSURI="$SYSTEM_TASKDEFINITIONSURI" SYSTEM_TEAMPROJECT="$SYSTEM_TEAMPROJECT" CC=$CC MAKEFLAGS="$MAKEFLAGS" bash -lxc ci/run-linux32-docker.sh || res=1 - - sudo chmod a+r t/out/TEST-*.xml - test ! -d t/failed-test-artifacts || sudo chmod a+r t/failed-test-artifacts - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || res=1 - exit $res - displayName: 'ci/run-linux32-docker.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'linux32' - platform: Linux - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: static_analysis - displayName: StaticAnalysis - condition: succeeded() - 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 && - - export jobname=StaticAnalysis && - - ci/run-static-analysis.sh || exit 1 - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1 - displayName: 'ci/run-static-analysis.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - -- job: documentation - displayName: Documentation - condition: succeeded() - 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 && - - export ALREADY_HAVE_ASCIIDOCTOR=yes. && - export jobname=Documentation && - - ci/test-documentation.sh || exit 1 - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1 - displayName: 'ci/test-documentation.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) diff --git a/third_party/git/banned.h b/third_party/git/banned.h index 447af24807..60a18d4403 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(sprintf) +#define vsprintf(buf,fmt,arg) BANNED(vsprintf) #endif #endif /* BANNED_H */ diff --git a/third_party/git/bisect.c b/third_party/git/bisect.c index e87ac29a51..f5b1368128 100644 --- a/third_party/git/bisect.c +++ b/third_party/git/bisect.c @@ -10,11 +10,12 @@ #include "run-command.h" #include "log-tree.h" #include "bisect.h" -#include "sha1-array.h" -#include "argv-array.h" +#include "oid-array.h" +#include "strvec.h" #include "commit-slab.h" #include "commit-reach.h" #include "object-store.h" +#include "dir.h" static struct oid_array good_revs; static struct oid_array skipped_revs; @@ -88,15 +89,16 @@ static inline void weight_set(struct commit_list *elem, int weight) **commit_weight_at(&commit_weight, elem->item) = weight; } -static int count_interesting_parents(struct commit *commit) +static int count_interesting_parents(struct commit *commit, unsigned bisect_flags) { struct commit_list *p; int count; for (count = 0, p = commit->parents; p; p = p->next) { - if (p->item->object.flags & UNINTERESTING) - continue; - count++; + if (!(p->item->object.flags & UNINTERESTING)) + count++; + if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY) + break; } return count; } @@ -135,7 +137,7 @@ static void show_list(const char *debug, int counted, int nr, for (p = list; p; p = p->next) { struct commit_list *pp; struct commit *commit = p->item; - unsigned flags = commit->object.flags; + unsigned commit_flags = commit->object.flags; enum object_type type; unsigned long size; char *buf = read_object_file(&commit->object.oid, &type, @@ -144,9 +146,9 @@ static void show_list(const char *debug, int counted, int nr, int subject_len; fprintf(stderr, "%c%c%c ", - (flags & TREESAME) ? ' ' : 'T', - (flags & UNINTERESTING) ? 'U' : ' ', - (flags & COUNTED) ? 'C' : ' '); + (commit_flags & TREESAME) ? ' ' : 'T', + (commit_flags & UNINTERESTING) ? 'U' : ' ', + (commit_flags & COUNTED) ? 'C' : ' '); if (*commit_weight_at(&commit_weight, p->item)) fprintf(stderr, "%3d", weight(p)); else @@ -171,9 +173,9 @@ static struct commit_list *best_bisection(struct commit_list *list, int nr) best = list; for (p = list; p; p = p->next) { int distance; - unsigned flags = p->item->object.flags; + unsigned commit_flags = p->item->object.flags; - if (flags & TREESAME) + if (commit_flags & TREESAME) continue; distance = weight(p); if (nr - distance < distance) @@ -212,9 +214,9 @@ static struct commit_list *best_bisection_sorted(struct commit_list *list, int n for (p = list, cnt = 0; p; p = p->next) { int distance; - unsigned flags = p->item->object.flags; + unsigned commit_flags = p->item->object.flags; - if (flags & TREESAME) + if (commit_flags & TREESAME) continue; distance = weight(p); if (nr - distance < distance) @@ -259,7 +261,7 @@ static struct commit_list *best_bisection_sorted(struct commit_list *list, int n */ static struct commit_list *do_find_bisection(struct commit_list *list, int nr, int *weights, - int find_all) + unsigned bisect_flags) { int n, counted; struct commit_list *p; @@ -268,12 +270,12 @@ static struct commit_list *do_find_bisection(struct commit_list *list, for (n = 0, p = list; p; p = p->next) { struct commit *commit = p->item; - unsigned flags = commit->object.flags; + unsigned commit_flags = commit->object.flags; *commit_weight_at(&commit_weight, p->item) = &weights[n++]; - switch (count_interesting_parents(commit)) { + switch (count_interesting_parents(commit, bisect_flags)) { case 0: - if (!(flags & TREESAME)) { + if (!(commit_flags & TREESAME)) { weight_set(p, 1); counted++; show_list("bisection 2 count one", @@ -314,11 +316,13 @@ static struct commit_list *do_find_bisection(struct commit_list *list, continue; if (weight(p) != -2) continue; + if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY) + BUG("shouldn't be calling count-distance in fp mode"); weight_set(p, count_distance(p)); clear_distance(list); /* Does it happen to be at exactly half-way? */ - if (!find_all && halfway(p, nr)) + if (!(bisect_flags & FIND_BISECTION_ALL) && halfway(p, nr)) return p; counted++; } @@ -328,11 +332,14 @@ static struct commit_list *do_find_bisection(struct commit_list *list, while (counted < nr) { for (p = list; p; p = p->next) { struct commit_list *q; - unsigned flags = p->item->object.flags; + unsigned commit_flags = p->item->object.flags; if (0 <= weight(p)) continue; - for (q = p->item->parents; q; q = q->next) { + + for (q = p->item->parents; + q; + q = bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY ? NULL : q->next) { if (q->item->object.flags & UNINTERESTING) continue; if (0 <= weight(q)) @@ -346,7 +353,7 @@ static struct commit_list *do_find_bisection(struct commit_list *list, * add one for p itself if p is to be counted, * otherwise inherit it from q directly. */ - if (!(flags & TREESAME)) { + if (!(commit_flags & TREESAME)) { weight_set(p, weight(q)+1); counted++; show_list("bisection 2 count one", @@ -356,21 +363,21 @@ static struct commit_list *do_find_bisection(struct commit_list *list, weight_set(p, weight(q)); /* Does it happen to be at exactly half-way? */ - if (!find_all && halfway(p, nr)) + if (!(bisect_flags & FIND_BISECTION_ALL) && halfway(p, nr)) return p; } } show_list("bisection 2 counted all", counted, nr, list); - if (!find_all) + if (!(bisect_flags & FIND_BISECTION_ALL)) return best_bisection(list, nr); else return best_bisection_sorted(list, nr); } void find_bisection(struct commit_list **commit_list, int *reaches, - int *all, int find_all) + int *all, unsigned bisect_flags) { int nr, on_list; struct commit_list *list, *p, *best, *next, *last; @@ -386,16 +393,16 @@ void find_bisection(struct commit_list **commit_list, int *reaches, for (nr = on_list = 0, last = NULL, p = *commit_list; p; p = next) { - unsigned flags = p->item->object.flags; + unsigned commit_flags = p->item->object.flags; next = p->next; - if (flags & UNINTERESTING) { + if (commit_flags & UNINTERESTING) { free(p); continue; } p->next = last; last = p; - if (!(flags & TREESAME)) + if (!(commit_flags & TREESAME)) nr++; on_list++; } @@ -406,9 +413,9 @@ void find_bisection(struct commit_list **commit_list, int *reaches, weights = xcalloc(on_list, sizeof(*weights)); /* Do the real work of finding bisection commit. */ - best = do_find_bisection(list, nr, weights, find_all); + best = do_find_bisection(list, nr, weights, bisect_flags); if (best) { - if (!find_all) { + if (!(bisect_flags & FIND_BISECTION_ALL)) { list->item = best->item; free_commit_list(list->next); best = list; @@ -454,9 +461,10 @@ static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN") static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START") static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG") static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS") +static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT") static GIT_PATH_FUNC(git_path_head_name, "head-name") -static void read_bisect_paths(struct argv_array *array) +static void read_bisect_paths(struct strvec *array) { struct strbuf str = STRBUF_INIT; const char *filename = git_path_bisect_names(); @@ -464,7 +472,7 @@ static void read_bisect_paths(struct argv_array *array) while (strbuf_getline_lf(&str, fp) != EOF) { strbuf_trim(&str); - if (sq_dequote_to_argv_array(str.buf, array)) + if (sq_dequote_to_strvec(str.buf, array)) die(_("Badly quoted content in file '%s': %s"), filename, str.buf); } @@ -473,7 +481,7 @@ static void read_bisect_paths(struct argv_array *array) fclose(fp); } -static char *join_sha1_array_hex(struct oid_array *array, char delim) +static char *join_oid_array_hex(struct oid_array *array, char delim) { struct strbuf joined_hexs = STRBUF_INIT; int i; @@ -572,7 +580,7 @@ static int sqrti(int val) { float d, x = val; - if (val == 0) + if (!val) return 0; do { @@ -632,7 +640,7 @@ static void bisect_rev_setup(struct repository *r, struct rev_info *revs, const char *bad_format, const char *good_format, int read_paths) { - struct argv_array rev_argv = ARGV_ARRAY_INIT; + struct strvec rev_argv = STRVEC_INIT; int i; repo_init_revisions(r, revs, prefix); @@ -640,16 +648,16 @@ static void bisect_rev_setup(struct repository *r, struct rev_info *revs, revs->commit_format = CMIT_FMT_UNSPECIFIED; /* rev_argv.argv[0] will be ignored by setup_revisions */ - argv_array_push(&rev_argv, "bisect_rev_setup"); - argv_array_pushf(&rev_argv, bad_format, oid_to_hex(current_bad_oid)); + strvec_push(&rev_argv, "bisect_rev_setup"); + strvec_pushf(&rev_argv, bad_format, oid_to_hex(current_bad_oid)); for (i = 0; i < good_revs.nr; i++) - argv_array_pushf(&rev_argv, good_format, - oid_to_hex(good_revs.oid + i)); - argv_array_push(&rev_argv, "--"); + strvec_pushf(&rev_argv, good_format, + oid_to_hex(good_revs.oid + i)); + strvec_push(&rev_argv, "--"); if (read_paths) read_bisect_paths(&rev_argv); - setup_revisions(rev_argv.argc, rev_argv.argv, revs, NULL); + setup_revisions(rev_argv.nr, rev_argv.v, revs, NULL); /* XXX leak rev_argv, as "revs" may still be pointing to it */ } @@ -661,11 +669,11 @@ static void bisect_common(struct rev_info *revs) mark_edges_uninteresting(revs, NULL, 0); } -static void exit_if_skipped_commits(struct commit_list *tried, +static enum bisect_error error_if_skipped_commits(struct commit_list *tried, const struct object_id *bad) { if (!tried) - return; + return BISECT_OK; printf("There are only 'skip'ped commits left to test.\n" "The first %s commit could be any of:\n", term_bad); @@ -676,7 +684,8 @@ static void exit_if_skipped_commits(struct commit_list *tried, if (bad) printf("%s\n", oid_to_hex(bad)); printf(_("We cannot bisect more!\n")); - exit(2); + + return BISECT_ONLY_SKIPPED_LEFT; } static int is_expected_rev(const struct object_id *oid) @@ -703,11 +712,12 @@ static int is_expected_rev(const struct object_id *oid) return res; } -static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout) +static enum bisect_error 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), GIT_SHA1_HEXSZ + 1); + oid_to_hex_r(bisect_rev_hex, bisect_rev); update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR); argv_checkout[2] = bisect_rev_hex; @@ -715,14 +725,24 @@ static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout) 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) - exit(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); } argv_show_branch[1] = bisect_rev_hex; - return run_command_v_opt(argv_show_branch, RUN_GIT_CMD); + 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); } static struct commit *get_commit_reference(struct repository *r, @@ -749,11 +769,11 @@ static struct commit **get_bad_and_good_commits(struct repository *r, return rev; } -static void handle_bad_merge_base(void) +static enum bisect_error handle_bad_merge_base(void) { if (is_expected_rev(current_bad_oid)) { char *bad_hex = oid_to_hex(current_bad_oid); - char *good_hex = join_sha1_array_hex(&good_revs, ' '); + char *good_hex = join_oid_array_hex(&good_revs, ' '); if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) { fprintf(stderr, _("The merge base %s is bad.\n" "This means the bug has been fixed " @@ -770,21 +790,21 @@ static void handle_bad_merge_base(void) "between %s and [%s].\n"), bad_hex, term_bad, term_good, bad_hex, good_hex); } - exit(3); + return BISECT_MERGE_BASE_CHECK; } 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); - exit(1); + return BISECT_FAILED; } static void handle_skipped_merge_base(const struct object_id *mb) { char *mb_hex = oid_to_hex(mb); char *bad_hex = oid_to_hex(current_bad_oid); - char *good_hex = join_sha1_array_hex(&good_revs, ' '); + char *good_hex = join_oid_array_hex(&good_revs, ' '); warning(_("the merge base between %s and [%s] " "must be skipped.\n" @@ -799,13 +819,18 @@ 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 exit with a non 0 error code. + * and we must return error 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 void check_merge_bases(int rev_nr, struct commit **rev, int no_checkout) +static enum bisect_error 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); @@ -813,18 +838,24 @@ static void check_merge_bases(int rev_nr, struct commit **rev, int no_checkout) for (; result; result = result->next) { const struct object_id *mb = &result->item->object.oid; if (oideq(mb, current_bad_oid)) { - handle_bad_merge_base(); + res = handle_bad_merge_base(); + break; } 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")); - exit(bisect_checkout(mb, no_checkout)); + res = bisect_checkout(mb, no_checkout); + if (!res) + /* indicate early success */ + res = BISECT_INTERNAL_SUCCESS_MERGE_BASE; + break; } } free_commit_list(result); + return res; } static int check_ancestors(struct repository *r, int rev_nr, @@ -850,43 +881,58 @@ 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 exit. + * checked out to be tested by the user and we will return. */ -static void check_good_are_ancestors_of_bad(struct repository *r, + +static enum bisect_error check_good_are_ancestors_of_bad(struct repository *r, const char *prefix, int no_checkout) { - char *filename = git_pathdup("BISECT_ANCESTORS_OK"); + char *filename; struct stat st; int fd, rev_nr; + enum bisect_error res = BISECT_OK; struct commit **rev; if (!current_bad_oid) - die(_("a %s revision is needed"), term_bad); + return error(_("a %s revision is needed"), term_bad); + + filename = git_pathdup("BISECT_ANCESTORS_OK"); /* 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 == 0) + if (!good_revs.nr) 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)) - check_merge_bases(rev_nr, rev, no_checkout); + res = check_merge_bases(rev_nr, rev, no_checkout); free(rev); - /* 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); + 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); + } done: free(filename); + return res; } /* @@ -938,64 +984,96 @@ void read_bisect_terms(const char **read_bad, const char **read_good) } /* - * We use the convention that exiting with an exit code 10 means that + * We use the convention that return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) means * the bisection process finished successfully. - * In this case the calling shell script should exit 0. + * 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. * - * If no_checkout is non-zero, the bisection process does not - * checkout the trial commit but instead simply updates BISECT_HEAD. + * Checking BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND + * in bisect_helper::bisect_next() and only transforming it to 0 at + * the end of bisect_helper::cmd_bisect__helper() helps bypassing + * all the code related to finding a commit to test. */ -int bisect_next_all(struct repository *r, const char *prefix, int no_checkout) +enum bisect_error bisect_next_all(struct repository *r, const char *prefix) { 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; + /* + * If no_checkout is non-zero, the bisection process does not + * checkout the trial commit but instead simply updates BISECT_HEAD. + */ + int no_checkout = ref_exists("BISECT_HEAD"); + unsigned bisect_flags = 0; read_bisect_terms(&term_bad, &term_good); if (read_bisect_refs()) die(_("reading bisect refs failed")); - check_good_are_ancestors_of_bad(r, prefix, no_checkout); + if (file_exists(git_path_bisect_first_parent())) + bisect_flags |= FIND_BISECTION_FIRST_PARENT_ONLY; + + if (skipped_revs.nr) + bisect_flags |= FIND_BISECTION_ALL; + + res = check_good_are_ancestors_of_bad(r, prefix, no_checkout); + if (res) + return res; bisect_rev_setup(r, &revs, prefix, "%s", "^%s", 1); + + revs.first_parent_only = !!(bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY); revs.limited = 1; bisect_common(&revs); - find_bisection(&revs.commits, &reaches, &all, !!skipped_revs.nr); + find_bisection(&revs.commits, &reaches, &all, bisect_flags); revs.commits = managed_skipped(revs.commits, &tried); if (!revs.commits) { /* - * We should exit here only if the "bad" + * We should return error here only if the "bad" * commit is also a "skip" commit. */ - exit_if_skipped_commits(tried, NULL); - + res = error_if_skipped_commits(tried, NULL); + if (res < 0) + return res; printf(_("%s was both %s and %s\n"), oid_to_hex(current_bad_oid), term_good, term_bad); - exit(1); + + return BISECT_FAILED; } if (!all) { fprintf(stderr, _("No testable commit found.\n" "Maybe you started with bad path parameters?\n")); - exit(4); + + return BISECT_NO_TESTABLE_COMMIT; } bisect_rev = &revs.commits->item->object.oid; if (oideq(bisect_rev, current_bad_oid)) { - exit_if_skipped_commits(tried, current_bad_oid); + res = error_if_skipped_commits(tried, current_bad_oid); + if (res) + return res; 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. */ - exit(10); + /* + * 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; } nr = all - reaches - 1; @@ -1011,6 +1089,8 @@ int bisect_next_all(struct repository *r, const char *prefix, int no_checkout) "Bisecting: %d revisions left to test after this %s\n", nr), nr, steps_msg); free(steps_msg); + /* Clean up objects used, as they will be reused. */ + clear_commit_marks_all(ALL_REV_FLAGS); return bisect_checkout(bisect_rev, no_checkout); } @@ -1080,6 +1160,7 @@ int bisect_clean_state(void) unlink_or_warn(git_path_bisect_names()); unlink_or_warn(git_path_bisect_run()); unlink_or_warn(git_path_bisect_terms()); + unlink_or_warn(git_path_bisect_first_parent()); /* Cleanup head-name if it got left by an old version of git-bisect */ unlink_or_warn(git_path_head_name()); /* diff --git a/third_party/git/bisect.h b/third_party/git/bisect.h index 4e69a11ea8..ec24ac2d7e 100644 --- a/third_party/git/bisect.h +++ b/third_party/git/bisect.h @@ -12,7 +12,7 @@ struct repository; * best commit, as chosen by `find_all`. */ void find_bisection(struct commit_list **list, int *reaches, int *all, - int find_all); + unsigned bisect_flags); struct commit_list *filter_skipped(struct commit_list *list, struct commit_list **tried, @@ -23,6 +23,9 @@ struct commit_list *filter_skipped(struct commit_list *list, #define BISECT_SHOW_ALL (1<<0) #define REV_LIST_QUIET (1<<1) +#define FIND_BISECTION_ALL (1u<<0) +#define FIND_BISECTION_FIRST_PARENT_ONLY (1u<<1) + struct rev_list_info { struct rev_info *revs; int flags; @@ -31,9 +34,34 @@ struct rev_list_info { const char *header_prefix; }; -int bisect_next_all(struct repository *r, - const char *prefix, - int no_checkout); +/* + * 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, const char *prefix); int estimate_bisect_steps(int all); diff --git a/third_party/git/blame.c b/third_party/git/blame.c index 36a2e7ef11..686845b2b4 100644 --- a/third_party/git/blame.c +++ b/third_party/git/blame.c @@ -9,6 +9,8 @@ #include "blame.h" #include "alloc.h" #include "commit-slab.h" +#include "bloom.h" +#include "commit-graph.h" define_commit_slab(blame_suspects, struct blame_origin *); static struct blame_suspects blame_suspects; @@ -144,7 +146,7 @@ static void append_merge_parents(struct repository *r, while (!strbuf_getwholeline_fd(&line, merge_head, '\n')) { struct object_id oid; - if (line.len < GIT_SHA1_HEXSZ || get_oid_hex(line.buf, &oid)) + if (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,14 +419,15 @@ static void get_fingerprint(struct fingerprint *result, /* Ignore whitespace pairs */ if (hash == 0) continue; - hashmap_entry_init(entry, hash); + hashmap_entry_init(&entry->entry, hash); - found_entry = hashmap_get(&result->map, entry, NULL); + found_entry = hashmap_get_entry(&result->map, entry, + /* member name */ entry, NULL); if (found_entry) { found_entry->count += 1; } else { entry->count = 1; - hashmap_add(&result->map, entry); + hashmap_add(&result->map, &entry->entry); ++entry; } } @@ -432,7 +435,7 @@ static void get_fingerprint(struct fingerprint *result, static void free_fingerprint(struct fingerprint *f) { - hashmap_free(&f->map, 0); + hashmap_free(&f->map); free(f->entries); } @@ -449,10 +452,10 @@ static int fingerprint_similarity(struct fingerprint *a, struct fingerprint *b) struct hashmap_iter iter; const struct fingerprint_entry *entry_a, *entry_b; - hashmap_iter_init(&b->map, &iter); - - while ((entry_b = hashmap_iter_next(&iter))) { - if ((entry_a = hashmap_get(&a->map, entry_b, NULL))) { + 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) { intersection += entry_a->count < entry_b->count ? entry_a->count : entry_b->count; } @@ -470,10 +473,12 @@ static void fingerprint_subtract(struct fingerprint *a, struct fingerprint *b) hashmap_iter_init(&b->map, &iter); - while ((entry_b = hashmap_iter_next(&iter))) { - if ((entry_a = hashmap_get(&a->map, entry_b, NULL))) { + 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) { if (entry_a->count <= entry_b->count) - hashmap_remove(&a->map, entry_b, NULL); + hashmap_remove(&a->map, &entry_b->entry, NULL); else entry_a->count -= entry_b->count; } @@ -1179,6 +1184,7 @@ void blame_coalesce(struct blame_scoreboard *sb) for (ent = sb->ent; ent && (next = ent->next); ent = next) { if (ent->suspect == next->suspect && ent->s_lno + ent->num_lines == next->s_lno && + ent->lno + ent->num_lines == next->lno && ent->ignored == next->ignored && ent->unblamable == next->unblamable) { ent->num_lines += next->num_lines; @@ -1243,13 +1249,74 @@ static int fill_blob_sha1_and_mode(struct repository *r, return -1; } +struct blame_bloom_data { + /* + * Changed-path Bloom filter keys. These can help prevent + * computing diffs against first parents, but we need to + * expand the list as code is moved or files are renamed. + */ + struct bloom_filter_settings *settings; + struct bloom_key **keys; + int nr; + int alloc; +}; + +static int bloom_count_queries = 0; +static int bloom_count_no = 0; +static int maybe_changed_path(struct repository *r, + struct blame_origin *origin, + struct blame_bloom_data *bd) +{ + int i; + struct bloom_filter *filter; + + if (!bd) + return 1; + + if (commit_graph_generation(origin->commit) == GENERATION_NUMBER_INFINITY) + return 1; + + filter = get_bloom_filter(r, origin->commit); + + if (!filter) + return 1; + + bloom_count_queries++; + for (i = 0; i < bd->nr; i++) { + if (bloom_filter_contains(filter, + bd->keys[i], + bd->settings)) + return 1; + } + + bloom_count_no++; + return 0; +} + +static void add_bloom_key(struct blame_bloom_data *bd, + const char *path) +{ + if (!bd) + return; + + if (bd->nr >= bd->alloc) { + bd->alloc *= 2; + REALLOC_ARRAY(bd->keys, bd->alloc); + } + + bd->keys[bd->nr] = xmalloc(sizeof(struct bloom_key)); + fill_bloom_key(path, strlen(path), bd->keys[bd->nr], bd->settings); + bd->nr++; +} + /* * We have an origin -- check if the same path exists in the * parent and return an origin structure to represent it. */ static struct blame_origin *find_origin(struct repository *r, struct commit *parent, - struct blame_origin *origin) + struct blame_origin *origin, + struct blame_bloom_data *bd) { struct blame_origin *porigin; struct diff_options diff_opts; @@ -1283,10 +1350,18 @@ static struct blame_origin *find_origin(struct repository *r, if (is_null_oid(&origin->commit->object.oid)) do_diff_cache(get_commit_tree_oid(parent), &diff_opts); - else - diff_tree_oid(get_commit_tree_oid(parent), - get_commit_tree_oid(origin->commit), - "", &diff_opts); + else { + int compute_diff = 1; + if (origin->commit->parents && + oideq(&parent->object.oid, + &origin->commit->parents->item->object.oid)) + compute_diff = maybe_changed_path(r, origin, bd); + + if (compute_diff) + diff_tree_oid(get_commit_tree_oid(parent), + get_commit_tree_oid(origin->commit), + "", &diff_opts); + } diffcore_std(&diff_opts); if (!diff_queued_diff.nr) { @@ -1338,7 +1413,8 @@ static struct blame_origin *find_origin(struct repository *r, */ static struct blame_origin *find_rename(struct repository *r, struct commit *parent, - struct blame_origin *origin) + struct blame_origin *origin, + struct blame_bloom_data *bd) { struct blame_origin *porigin = NULL; struct diff_options diff_opts; @@ -1363,6 +1439,7 @@ static struct blame_origin *find_rename(struct repository *r, struct diff_filepair *p = diff_queued_diff.queue[i]; if ((p->status == 'R' || p->status == 'C') && !strcmp(p->two->path, origin->path)) { + add_bloom_key(bd, p->one->path); porigin = get_origin(parent, p->one->path); oidcpy(&porigin->blob_oid, &p->one->oid); porigin->mode = p->one->mode; @@ -2329,6 +2406,11 @@ static void distribute_blame(struct blame_scoreboard *sb, struct blame_entry *bl #define MAXSG 16 +typedef struct blame_origin *(*blame_find_alg)(struct repository *, + struct commit *, + struct blame_origin *, + struct blame_bloom_data *); + static void pass_blame(struct blame_scoreboard *sb, struct blame_origin *origin, int opt) { struct rev_info *revs = sb->revs; @@ -2353,8 +2435,7 @@ static void pass_blame(struct blame_scoreboard *sb, struct blame_origin *origin, * common cases, then we look for renames in the second pass. */ for (pass = 0; pass < 2 - sb->no_whole_file_rename; pass++) { - struct blame_origin *(*find)(struct repository *, struct commit *, struct blame_origin *); - find = pass ? find_rename : find_origin; + blame_find_alg find = pass ? find_rename : find_origin; for (i = 0, sg = first_scapegoat(revs, commit, sb->reverse); i < num_sg && sg; @@ -2366,7 +2447,7 @@ static void pass_blame(struct blame_scoreboard *sb, struct blame_origin *origin, continue; if (parse_commit(p)) continue; - porigin = find(sb->repo, p, origin); + porigin = find(sb->repo, p, origin, sb->bloom_data); if (!porigin) continue; if (oideq(&porigin->blob_oid, &origin->blob_oid)) { @@ -2806,3 +2887,47 @@ struct blame_entry *blame_entry_prepend(struct blame_entry *head, blame_origin_incref(o); return new_head; } + +void setup_blame_bloom_data(struct blame_scoreboard *sb, + const char *path) +{ + struct blame_bloom_data *bd; + struct bloom_filter_settings *bs; + + if (!sb->repo->objects->commit_graph) + return; + + bs = get_bloom_filter_settings(sb->repo); + if (!bs) + return; + + bd = xmalloc(sizeof(struct blame_bloom_data)); + + bd->settings = bs; + + bd->alloc = 4; + bd->nr = 0; + ALLOC_ARRAY(bd->keys, bd->alloc); + + add_bloom_key(bd, path); + + sb->bloom_data = bd; +} + +void cleanup_scoreboard(struct blame_scoreboard *sb) +{ + if (sb->bloom_data) { + int i; + for (i = 0; i < sb->bloom_data->nr; i++) { + free(sb->bloom_data->keys[i]->hashes); + free(sb->bloom_data->keys[i]); + } + free(sb->bloom_data->keys); + FREE_AND_NULL(sb->bloom_data); + + trace2_data_intmax("blame", sb->repo, + "bloom/queries", bloom_count_queries); + trace2_data_intmax("blame", sb->repo, + "bloom/response-no", bloom_count_no); + } +} diff --git a/third_party/git/blame.h b/third_party/git/blame.h index 4a9e1270b0..b6bbee4147 100644 --- a/third_party/git/blame.h +++ b/third_party/git/blame.h @@ -16,6 +16,8 @@ #define BLAME_DEFAULT_MOVE_SCORE 20 #define BLAME_DEFAULT_COPY_SCORE 40 +struct fingerprint; + /* * One blob in a commit that is being suspected */ @@ -52,7 +54,7 @@ struct blame_origin { struct blame_entry *suspects; mmfile_t file; int num_lines; - void *fingerprints; + struct fingerprint *fingerprints; struct object_id blob_oid; unsigned short mode; /* guilty gets set when shipping any suspects to the final @@ -98,6 +100,8 @@ struct blame_entry { int unblamable; }; +struct blame_bloom_data; + /* * The current state of the blame assignment. */ @@ -154,6 +158,7 @@ struct blame_scoreboard { void(*found_guilty_entry)(struct blame_entry *, void *); void *found_guilty_entry_data; + struct blame_bloom_data *bloom_data; }; /* @@ -178,6 +183,9 @@ void init_scoreboard(struct blame_scoreboard *sb); void setup_scoreboard(struct blame_scoreboard *sb, const char *path, struct blame_origin **orig); +void setup_blame_bloom_data(struct blame_scoreboard *sb, + const char *path); +void cleanup_scoreboard(struct blame_scoreboard *sb); struct blame_entry *blame_entry_prepend(struct blame_entry *head, long start, long end, diff --git a/third_party/git/blob.c b/third_party/git/blob.c index 36f9abda19..182718aba9 100644 --- a/third_party/git/blob.c +++ b/third_party/git/blob.c @@ -10,7 +10,7 @@ struct blob *lookup_blob(struct repository *r, const struct object_id *oid) struct object *obj = lookup_object(r, oid); if (!obj) return create_object(r, oid, alloc_blob_node(r)); - return object_as_type(r, obj, OBJ_BLOB, 0); + return object_as_type(obj, OBJ_BLOB, 0); } int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size) diff --git a/third_party/git/bloom.c b/third_party/git/bloom.c new file mode 100644 index 0000000000..68c73200a5 --- /dev/null +++ b/third_party/git/bloom.c @@ -0,0 +1,327 @@ +#include "git-compat-util.h" +#include "bloom.h" +#include "diff.h" +#include "diffcore.h" +#include "revision.h" +#include "hashmap.h" +#include "commit-graph.h" +#include "commit.h" + +define_commit_slab(bloom_filter_slab, struct bloom_filter); + +static struct bloom_filter_slab bloom_filters; + +struct pathmap_hash_entry { + struct hashmap_entry entry; + const char path[FLEX_ARRAY]; +}; + +static uint32_t rotate_left(uint32_t value, int32_t count) +{ + uint32_t mask = 8 * sizeof(uint32_t) - 1; + count &= mask; + return ((value << count) | (value >> ((-count) & mask))); +} + +static inline unsigned char get_bitmask(uint32_t pos) +{ + return ((unsigned char)1) << (pos & (BITS_PER_WORD - 1)); +} + +static int load_bloom_filter_from_graph(struct commit_graph *g, + struct bloom_filter *filter, + struct commit *c) +{ + uint32_t lex_pos, start_index, end_index; + uint32_t graph_pos = commit_graph_position(c); + + while (graph_pos < g->num_commits_in_base) + g = g->base_graph; + + /* The commit graph commit 'c' lives in doesn't carry Bloom filters. */ + if (!g->chunk_bloom_indexes) + return 0; + + lex_pos = graph_pos - g->num_commits_in_base; + + end_index = get_be32(g->chunk_bloom_indexes + 4 * lex_pos); + + if (lex_pos > 0) + start_index = get_be32(g->chunk_bloom_indexes + 4 * (lex_pos - 1)); + else + start_index = 0; + + filter->len = end_index - start_index; + filter->data = (unsigned char *)(g->chunk_bloom_data + + sizeof(unsigned char) * start_index + + BLOOMDATA_CHUNK_HEADER_SIZE); + + return 1; +} + +/* + * Calculate the murmur3 32-bit hash value for the given data + * using the given seed. + * Produces a uniformly distributed hash value. + * Not considered to be cryptographically secure. + * Implemented as described in https://en.wikipedia.org/wiki/MurmurHash#Algorithm + */ +uint32_t murmur3_seeded(uint32_t seed, const char *data, size_t len) +{ + const uint32_t c1 = 0xcc9e2d51; + const uint32_t c2 = 0x1b873593; + const uint32_t r1 = 15; + const uint32_t r2 = 13; + const uint32_t m = 5; + const uint32_t n = 0xe6546b64; + int i; + uint32_t k1 = 0; + const char *tail; + + int len4 = len / sizeof(uint32_t); + + uint32_t k; + for (i = 0; i < len4; i++) { + uint32_t byte1 = (uint32_t)data[4*i]; + uint32_t byte2 = ((uint32_t)data[4*i + 1]) << 8; + uint32_t byte3 = ((uint32_t)data[4*i + 2]) << 16; + uint32_t byte4 = ((uint32_t)data[4*i + 3]) << 24; + k = byte1 | byte2 | byte3 | byte4; + k *= c1; + k = rotate_left(k, r1); + k *= c2; + + seed ^= k; + seed = rotate_left(seed, r2) * m + n; + } + + tail = (data + len4 * sizeof(uint32_t)); + + switch (len & (sizeof(uint32_t) - 1)) { + case 3: + k1 ^= ((uint32_t)tail[2]) << 16; + /*-fallthrough*/ + case 2: + k1 ^= ((uint32_t)tail[1]) << 8; + /*-fallthrough*/ + case 1: + k1 ^= ((uint32_t)tail[0]) << 0; + k1 *= c1; + k1 = rotate_left(k1, r1); + k1 *= c2; + seed ^= k1; + break; + } + + seed ^= (uint32_t)len; + seed ^= (seed >> 16); + seed *= 0x85ebca6b; + seed ^= (seed >> 13); + seed *= 0xc2b2ae35; + seed ^= (seed >> 16); + + return seed; +} + +void fill_bloom_key(const char *data, + size_t len, + struct bloom_key *key, + const struct bloom_filter_settings *settings) +{ + int i; + const uint32_t seed0 = 0x293ae76f; + const uint32_t seed1 = 0x7e646e2c; + const uint32_t hash0 = murmur3_seeded(seed0, data, len); + const uint32_t hash1 = murmur3_seeded(seed1, data, len); + + key->hashes = (uint32_t *)xcalloc(settings->num_hashes, sizeof(uint32_t)); + for (i = 0; i < settings->num_hashes; i++) + key->hashes[i] = hash0 + i * hash1; +} + +void clear_bloom_key(struct bloom_key *key) +{ + FREE_AND_NULL(key->hashes); +} + +void add_key_to_filter(const struct bloom_key *key, + struct bloom_filter *filter, + const struct bloom_filter_settings *settings) +{ + int i; + uint64_t mod = filter->len * BITS_PER_WORD; + + for (i = 0; i < settings->num_hashes; i++) { + uint64_t hash_mod = key->hashes[i] % mod; + uint64_t block_pos = hash_mod / BITS_PER_WORD; + + filter->data[block_pos] |= get_bitmask(hash_mod); + } +} + +void init_bloom_filters(void) +{ + init_bloom_filter_slab(&bloom_filters); +} + +static int pathmap_cmp(const void *hashmap_cmp_fn_data, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, + const void *keydata) +{ + const struct pathmap_hash_entry *e1, *e2; + + e1 = container_of(eptr, const struct pathmap_hash_entry, entry); + e2 = container_of(entry_or_key, const struct pathmap_hash_entry, entry); + + return strcmp(e1->path, e2->path); +} + +static void init_truncated_large_filter(struct bloom_filter *filter) +{ + filter->data = xmalloc(1); + filter->data[0] = 0xFF; + filter->len = 1; +} + +struct bloom_filter *get_or_compute_bloom_filter(struct repository *r, + struct commit *c, + int compute_if_not_present, + const struct bloom_filter_settings *settings, + enum bloom_filter_computed *computed) +{ + struct bloom_filter *filter; + int i; + struct diff_options diffopt; + + if (computed) + *computed = BLOOM_NOT_COMPUTED; + + if (!bloom_filters.slab_size) + return NULL; + + filter = bloom_filter_slab_at(&bloom_filters, c); + + if (!filter->data) { + load_commit_graph_info(r, c); + if (commit_graph_position(c) != COMMIT_NOT_FROM_GRAPH) + load_bloom_filter_from_graph(r->objects->commit_graph, filter, c); + } + + if (filter->data && filter->len) + return filter; + if (!compute_if_not_present) + return NULL; + + repo_diff_setup(r, &diffopt); + diffopt.flags.recursive = 1; + diffopt.detect_rename = 0; + diffopt.max_changes = settings->max_changed_paths; + diff_setup_done(&diffopt); + + /* ensure commit is parsed so we have parent information */ + repo_parse_commit(r, c); + + if (c->parents) + diff_tree_oid(&c->parents->item->object.oid, &c->object.oid, "", &diffopt); + else + diff_tree_oid(NULL, &c->object.oid, "", &diffopt); + diffcore_std(&diffopt); + + if (diff_queued_diff.nr <= settings->max_changed_paths) { + struct hashmap pathmap; + struct pathmap_hash_entry *e; + struct hashmap_iter iter; + hashmap_init(&pathmap, pathmap_cmp, NULL, 0); + + for (i = 0; i < diff_queued_diff.nr; i++) { + const char *path = diff_queued_diff.queue[i]->two->path; + + /* + * Add each leading directory of the changed file, i.e. for + * 'dir/subdir/file' add 'dir' and 'dir/subdir' as well, so + * the Bloom filter could be used to speed up commands like + * 'git log dir/subdir', too. + * + * Note that directories are added without the trailing '/'. + */ + do { + char *last_slash = strrchr(path, '/'); + + FLEX_ALLOC_STR(e, path, path); + hashmap_entry_init(&e->entry, strhash(path)); + + if (!hashmap_get(&pathmap, &e->entry, NULL)) + hashmap_add(&pathmap, &e->entry); + else + free(e); + + if (!last_slash) + last_slash = (char*)path; + *last_slash = '\0'; + + } while (*path); + + diff_free_filepair(diff_queued_diff.queue[i]); + } + + if (hashmap_get_size(&pathmap) > settings->max_changed_paths) { + init_truncated_large_filter(filter); + if (computed) + *computed |= BLOOM_TRUNC_LARGE; + goto cleanup; + } + + filter->len = (hashmap_get_size(&pathmap) * settings->bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD; + if (!filter->len) { + if (computed) + *computed |= BLOOM_TRUNC_EMPTY; + filter->len = 1; + } + filter->data = xcalloc(filter->len, sizeof(unsigned char)); + + hashmap_for_each_entry(&pathmap, &iter, e, entry) { + struct bloom_key key; + fill_bloom_key(e->path, strlen(e->path), &key, settings); + add_key_to_filter(&key, filter, settings); + } + + cleanup: + hashmap_free_entries(&pathmap, struct pathmap_hash_entry, entry); + } else { + for (i = 0; i < diff_queued_diff.nr; i++) + diff_free_filepair(diff_queued_diff.queue[i]); + init_truncated_large_filter(filter); + + if (computed) + *computed |= BLOOM_TRUNC_LARGE; + } + + if (computed) + *computed |= BLOOM_COMPUTED; + + free(diff_queued_diff.queue); + DIFF_QUEUE_CLEAR(&diff_queued_diff); + + return filter; +} + +int bloom_filter_contains(const struct bloom_filter *filter, + const struct bloom_key *key, + const struct bloom_filter_settings *settings) +{ + int i; + uint64_t mod = filter->len * BITS_PER_WORD; + + if (!mod) + return -1; + + for (i = 0; i < settings->num_hashes; i++) { + uint64_t hash_mod = key->hashes[i] % mod; + uint64_t block_pos = hash_mod / BITS_PER_WORD; + if (!(filter->data[block_pos] & get_bitmask(hash_mod))) + return 0; + } + + return 1; +} diff --git a/third_party/git/bloom.h b/third_party/git/bloom.h new file mode 100644 index 0000000000..adde6dfe21 --- /dev/null +++ b/third_party/git/bloom.h @@ -0,0 +1,112 @@ +#ifndef BLOOM_H +#define BLOOM_H + +struct commit; +struct repository; + +struct bloom_filter_settings { + /* + * The version of the hashing technique being used. + * We currently only support version = 1 which is + * the seeded murmur3 hashing technique implemented + * in bloom.c. + */ + uint32_t hash_version; + + /* + * The number of times a path is hashed, i.e. the + * number of bit positions tht cumulatively + * determine whether a path is present in the + * Bloom filter. + */ + uint32_t num_hashes; + + /* + * The minimum number of bits per entry in the Bloom + * filter. If the filter contains 'n' entries, then + * filter size is the minimum number of 8-bit words + * that contain n*b bits. + */ + uint32_t bits_per_entry; + + /* + * The maximum number of changed paths per commit + * before declaring a Bloom filter to be too-large. + * + * Not written to the commit-graph file. + */ + uint32_t max_changed_paths; +}; + +#define DEFAULT_BLOOM_MAX_CHANGES 512 +#define DEFAULT_BLOOM_FILTER_SETTINGS { 1, 7, 10, DEFAULT_BLOOM_MAX_CHANGES } +#define BITS_PER_WORD 8 +#define BLOOMDATA_CHUNK_HEADER_SIZE 3 * sizeof(uint32_t) + +/* + * A bloom_filter struct represents a data segment to + * use when testing hash values. The 'len' member + * dictates how many entries are stored in + * 'data'. + */ +struct bloom_filter { + unsigned char *data; + size_t len; +}; + +/* + * A bloom_key represents the k hash values for a + * given string. These can be precomputed and + * stored in a bloom_key for re-use when testing + * against a bloom_filter. The number of hashes is + * given by the Bloom filter settings and is the same + * for all Bloom filters and keys interacting with + * the loaded version of the commit graph file and + * the Bloom data chunks. + */ +struct bloom_key { + uint32_t *hashes; +}; + +/* + * Calculate the murmur3 32-bit hash value for the given data + * using the given seed. + * Produces a uniformly distributed hash value. + * Not considered to be cryptographically secure. + * Implemented as described in https://en.wikipedia.org/wiki/MurmurHash#Algorithm + */ +uint32_t murmur3_seeded(uint32_t seed, const char *data, size_t len); + +void fill_bloom_key(const char *data, + size_t len, + struct bloom_key *key, + const struct bloom_filter_settings *settings); +void clear_bloom_key(struct bloom_key *key); + +void add_key_to_filter(const struct bloom_key *key, + struct bloom_filter *filter, + const struct bloom_filter_settings *settings); + +void init_bloom_filters(void); + +enum bloom_filter_computed { + BLOOM_NOT_COMPUTED = (1 << 0), + BLOOM_COMPUTED = (1 << 1), + BLOOM_TRUNC_LARGE = (1 << 2), + BLOOM_TRUNC_EMPTY = (1 << 3), +}; + +struct bloom_filter *get_or_compute_bloom_filter(struct repository *r, + struct commit *c, + int compute_if_not_present, + const struct bloom_filter_settings *settings, + enum bloom_filter_computed *computed); + +#define get_bloom_filter(r, c) get_or_compute_bloom_filter( \ + (r), (c), 0, NULL, NULL) + +int bloom_filter_contains(const struct bloom_filter *filter, + const struct bloom_key *key, + const struct bloom_filter_settings *settings); + +#endif diff --git a/third_party/git/branch.c b/third_party/git/branch.c index 579494738a..9c9dae1eae 100644 --- a/third_party/git/branch.c +++ b/third_party/git/branch.c @@ -281,7 +281,7 @@ void create_branch(struct repository *r, die(_("Not a valid object name: '%s'."), start_name); } - switch (dwim_ref(start_name, strlen(start_name), &oid, &real_ref)) { + switch (dwim_ref(start_name, strlen(start_name), &oid, &real_ref, 0)) { case 0: /* Not branching from any existing branch */ if (explicit_tracking) @@ -344,6 +344,7 @@ void remove_merge_branch_state(struct repository *r) unlink(git_path_merge_rr(r)); unlink(git_path_merge_msg(r)); unlink(git_path_merge_mode(r)); + save_autostash(git_path_merge_autostash(r)); } void remove_branch_state(struct repository *r, int verbose) @@ -369,7 +370,7 @@ int replace_each_worktree_head_symref(const char *oldref, const char *newref, const char *logmsg) { int ret = 0; - struct worktree **worktrees = get_worktrees(0); + struct worktree **worktrees = get_worktrees(); int i; for (i = 0; worktrees[i]; i++) { diff --git a/third_party/git/builtin.h b/third_party/git/builtin.h index 5cf5df69f7..53fb290963 100644 --- a/third_party/git/builtin.h +++ b/third_party/git/builtin.h @@ -94,25 +94,9 @@ * command. */ -#define DEFAULT_MERGE_LOG_LEN 20 - extern const char git_usage_string[]; extern const char git_more_info_string[]; -#define PRUNE_PACKED_DRY_RUN 01 -#define PRUNE_PACKED_VERBOSE 02 - -void prune_packed_objects(int); - -struct fmt_merge_msg_opts { - unsigned add_title:1, - credit_people:1; - int shortlog_len; -}; - -int fmt_merge_msg(struct strbuf *in, struct strbuf *out, - struct fmt_merge_msg_opts *); - /** * If a built-in has DELAY_PAGER_CONFIG set, the built-in should call this early * when it wishes to respect the `pager.foo`-config. The `cmd` is the name of @@ -135,6 +119,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix); int cmd_bisect__helper(int argc, const char **argv, const char *prefix); int cmd_blame(int argc, const char **argv, const char *prefix); int cmd_branch(int argc, const char **argv, const char *prefix); +int cmd_bugreport(int argc, const char **argv, const char *prefix); int cmd_bundle(int argc, const char **argv, const char *prefix); int cmd_cat_file(int argc, const char **argv, const char *prefix); int cmd_checkout(int argc, const char **argv, const char *prefix); @@ -154,6 +139,9 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix); int cmd_config(int argc, const char **argv, const char *prefix); int cmd_count_objects(int argc, const char **argv, const char *prefix); int cmd_credential(int argc, const char **argv, const char *prefix); +int cmd_credential_cache(int argc, const char **argv, const char *prefix); +int cmd_credential_cache_daemon(int argc, const char **argv, const char *prefix); +int cmd_credential_store(int argc, const char **argv, const char *prefix); int cmd_describe(int argc, const char **argv, const char *prefix); int cmd_diff_files(int argc, const char **argv, const char *prefix); int cmd_diff_index(int argc, const char **argv, const char *prefix); @@ -162,6 +150,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix); int cmd_difftool(int argc, const char **argv, const char *prefix); int cmd_env__helper(int argc, const char **argv, const char *prefix); int cmd_fast_export(int argc, const char **argv, const char *prefix); +int cmd_fast_import(int argc, const char **argv, const char *prefix); int cmd_fetch(int argc, const char **argv, const char *prefix); int cmd_fetch_pack(int argc, const char **argv, const char *prefix); int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix); @@ -183,6 +172,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix); int cmd_ls_remote(int argc, const char **argv, const char *prefix); int cmd_mailinfo(int argc, const char **argv, const char *prefix); int cmd_mailsplit(int argc, const char **argv, const char *prefix); +int cmd_maintenance(int argc, const char **argv, const char *prefix); int cmd_merge(int argc, const char **argv, const char *prefix); int cmd_merge_base(int argc, const char **argv, const char *prefix); int cmd_merge_index(int argc, const char **argv, const char *prefix); @@ -225,6 +215,7 @@ 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 dd18e5c9b6..a825887c50 100644 --- a/third_party/git/builtin/add.c +++ b/third_party/git/builtin/add.c @@ -18,8 +18,9 @@ #include "diffcore.h" #include "revision.h" #include "bulk-checkin.h" -#include "argv-array.h" +#include "strvec.h" #include "submodule.h" +#include "add-interactive.h" static const char * const builtin_add_usage[] = { N_("git add [<options>] [--] <pathspec>..."), @@ -28,6 +29,9 @@ 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; @@ -184,24 +188,58 @@ int run_add_interactive(const char *revision, const char *patch_mode, const struct pathspec *pathspec) { int status, i; - struct argv_array argv = ARGV_ARRAY_INIT; + struct strvec argv = STRVEC_INIT; + int use_builtin_add_i = + git_env_bool("GIT_TEST_ADD_I_USE_BUILTIN", -1); + + if (use_builtin_add_i < 0) { + int experimental; + if (!git_config_get_bool("add.interactive.usebuiltin", + &use_builtin_add_i)) + ; /* ok */ + else if (!git_config_get_bool("feature.experimental", &experimental) && + experimental) + use_builtin_add_i = 1; + } + + 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"); + strvec_push(&argv, "add--interactive"); if (patch_mode) - argv_array_push(&argv, patch_mode); + strvec_push(&argv, patch_mode); if (revision) - argv_array_push(&argv, revision); - argv_array_push(&argv, "--"); + strvec_push(&argv, revision); + strvec_push(&argv, "--"); for (i = 0; i < pathspec->nr; i++) /* pass original pathspec, to be re-parsed */ - argv_array_push(&argv, pathspec->items[i].original); + strvec_push(&argv, pathspec->items[i].original); - status = run_command_v_opt(argv.argv, RUN_GIT_CMD); - argv_array_clear(&argv); + status = run_command_v_opt(argv.v, RUN_GIT_CMD); + strvec_clear(&argv); return status; } -int interactive_add(int argc, const char **argv, const char *prefix, int patch) +int interactive_add(const char **argv, const char *prefix, int patch) { struct pathspec pathspec; @@ -298,10 +336,10 @@ static struct option builtin_add_options[] = { OPT_BOOL(0, "renormalize", &add_renormalize, N_("renormalize EOL of tracked files (implies -u)")), OPT_BOOL('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")), OPT_BOOL('A', "all", &addremove_explicit, N_("add changes from all tracked and untracked files")), - { OPTION_CALLBACK, 0, "ignore-removal", &addremove_explicit, + OPT_CALLBACK_F(0, "ignore-removal", &addremove_explicit, NULL /* takes no arguments */, N_("ignore paths removed in the working tree (same as --no-all)"), - PARSE_OPT_NOARG, ignore_removal_cb }, + PARSE_OPT_NOARG, ignore_removal_cb), OPT_BOOL( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")), OPT_BOOL( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")), OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")), @@ -309,6 +347,10 @@ 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(), }; @@ -319,6 +361,7 @@ 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); } @@ -369,7 +412,10 @@ 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); - fprintf(stderr, _("Use -f if you really want to add them.\n")); + 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\"")); exit_status = 1; } @@ -402,11 +448,28 @@ 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) - exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive)); + if (add_interactive) { + if (pathspec_from_file) + die(_("--pathspec-from-file is incompatible with --interactive/--patch")); + exit(interactive_add(argv + 1, prefix, patch_interactive)); + } + if (legacy_stash_p) { + struct pathspec pathspec; - if (edit_interactive) + 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")); return(edit_patch(argc, argv, prefix)); + } argc--; argv++; @@ -418,10 +481,6 @@ 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")); @@ -434,19 +493,6 @@ 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. @@ -456,17 +502,49 @@ 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")); die_in_unpopulated_submodule(&the_index, prefix); die_path_inside_submodule(&the_index, &pathspec); + dir_init(&dir); if (add_new_files) { int baselen; /* Set up the default git porcelain excludes */ - memset(&dir, 0, sizeof(dir)); if (!ignored_too) { dir.flags |= DIR_COLLECT_IGNORED; setup_standard_excludes(&dir); @@ -539,7 +617,7 @@ finish: COMMIT_LOCK | SKIP_IF_UNCHANGED)) die(_("Unable to write new index file")); + dir_clear(&dir); UNLEAK(pathspec); - UNLEAK(dir); return exit_status; } diff --git a/third_party/git/builtin/am.c b/third_party/git/builtin/am.c index 1aea657a7f..4949535a7f 100644 --- a/third_party/git/builtin/am.c +++ b/third_party/git/builtin/am.c @@ -24,7 +24,6 @@ #include "sequencer.h" #include "revision.h" #include "merge-recursive.h" -#include "revision.h" #include "log-tree.h" #include "notes-utils.h" #include "rerere.h" @@ -82,6 +81,11 @@ 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; @@ -94,6 +98,8 @@ struct am_state { char *author_name; char *author_email; char *author_date; + char *committer_name; + char *committer_email; char *msg; size_t msg_len; @@ -112,7 +118,7 @@ struct am_state { int keep; /* enum keep_type */ int message_id; int scissors; /* enum scissors_type */ - struct argv_array git_apply_opts; + struct strvec git_apply_opts; const char *resolvemsg; int committer_date_is_author_date; int ignore_date; @@ -126,6 +132,8 @@ struct am_state { */ static void am_state_init(struct am_state *state) { + const char *committer; + struct ident_split id; int gpgsign; memset(state, 0, sizeof(*state)); @@ -142,10 +150,18 @@ static void am_state_init(struct am_state *state) state->scissors = SCISSORS_UNSET; - argv_array_init(&state->git_apply_opts); + strvec_init(&state->git_apply_opts); if (!git_config_get_bool("commit.gpgsign", &gpgsign)) state->sign_commit = gpgsign ? "" : NULL; + + committer = git_committer_info(IDENT_STRICT); + if (split_ident_line(&id, committer, strlen(committer)) < 0) + die(_("invalid committer: %s"), committer); + state->committer_name = + xmemdupz(id.name_begin, id.name_end - id.name_begin); + state->committer_email = + xmemdupz(id.mail_begin, id.mail_end - id.mail_begin); } /** @@ -157,8 +173,10 @@ static void am_state_release(struct am_state *state) free(state->author_name); free(state->author_email); free(state->author_date); + free(state->committer_name); + free(state->committer_email); free(state->msg); - argv_array_clear(&state->git_apply_opts); + strvec_clear(&state->git_apply_opts); } /** @@ -394,8 +412,8 @@ static void am_load(struct am_state *state) state->scissors = SCISSORS_UNSET; read_state_file(&sb, state, "apply-opt", 1); - argv_array_clear(&state->git_apply_opts); - if (sq_dequote_to_argv_array(sb.buf, &state->git_apply_opts) < 0) + strvec_clear(&state->git_apply_opts); + if (sq_dequote_to_strvec(sb.buf, &state->git_apply_opts) < 0) die(_("could not parse %s"), am_path(state, "apply-opt")); state->rebasing = !!file_exists(am_path(state, "rebasing")); @@ -448,8 +466,8 @@ static int run_post_rewrite_hook(const struct am_state *state) if (!hook) return 0; - argv_array_push(&cp.args, hook); - argv_array_push(&cp.args, "rebase"); + strvec_push(&cp.args, hook); + strvec_push(&cp.args, "rebase"); cp.in = xopen(am_path(state, "rewritten"), O_RDONLY); cp.stdout_to_stderr = 1; @@ -647,16 +665,16 @@ static int split_mail_mbox(struct am_state *state, const char **paths, int ret; cp.git_cmd = 1; - argv_array_push(&cp.args, "mailsplit"); - argv_array_pushf(&cp.args, "-d%d", state->prec); - argv_array_pushf(&cp.args, "-o%s", state->dir); - argv_array_push(&cp.args, "-b"); + strvec_push(&cp.args, "mailsplit"); + strvec_pushf(&cp.args, "-d%d", state->prec); + strvec_pushf(&cp.args, "-o%s", state->dir); + strvec_push(&cp.args, "-b"); if (keep_cr) - argv_array_push(&cp.args, "--keep-cr"); + strvec_push(&cp.args, "--keep-cr"); if (mboxrd) - argv_array_push(&cp.args, "--mboxrd"); - argv_array_push(&cp.args, "--"); - argv_array_pushv(&cp.args, paths); + strvec_push(&cp.args, "--mboxrd"); + strvec_push(&cp.args, "--"); + strvec_pushv(&cp.args, paths); ret = capture_command(&cp, &last, 8); if (ret) @@ -783,7 +801,7 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths, const char *series_dir; char *series_dir_buf; FILE *fp; - struct argv_array patches = ARGV_ARRAY_INIT; + struct strvec patches = STRVEC_INIT; struct strbuf sb = STRBUF_INIT; int ret; @@ -801,16 +819,16 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths, if (*sb.buf == '#') continue; /* skip comment lines */ - argv_array_push(&patches, mkpath("%s/%s", series_dir, sb.buf)); + strvec_push(&patches, mkpath("%s/%s", series_dir, sb.buf)); } fclose(fp); strbuf_release(&sb); free(series_dir_buf); - ret = split_mail_conv(stgit_patch_to_mail, state, patches.argv, keep_cr); + ret = split_mail_conv(stgit_patch_to_mail, state, patches.v, keep_cr); - argv_array_clear(&patches); + strvec_clear(&patches); return ret; } @@ -998,7 +1016,7 @@ static void am_setup(struct am_state *state, enum patch_format patch_format, } write_state_text(state, "scissors", str); - sq_quote_argv(&sb, state->git_apply_opts.argv); + sq_quote_argv(&sb, state->git_apply_opts.v); write_state_text(state, "apply-opt", sb.buf); if (state->rebasing) @@ -1072,19 +1090,6 @@ 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. */ @@ -1272,7 +1277,9 @@ 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); @@ -1397,8 +1404,8 @@ static int parse_mail_rebase(struct am_state *state, const char *mail) */ static int run_apply(const struct am_state *state, const char *index_file) { - struct argv_array apply_paths = ARGV_ARRAY_INIT; - struct argv_array apply_opts = ARGV_ARRAY_INIT; + struct strvec apply_paths = STRVEC_INIT; + struct strvec apply_opts = STRVEC_INIT; struct apply_state apply_state; int res, opts_left; int force_apply = 0; @@ -1407,10 +1414,10 @@ static int run_apply(const struct am_state *state, const char *index_file) if (init_apply_state(&apply_state, the_repository, NULL)) BUG("init_apply_state() failed"); - argv_array_push(&apply_opts, "apply"); - argv_array_pushv(&apply_opts, state->git_apply_opts.argv); + strvec_push(&apply_opts, "apply"); + strvec_pushv(&apply_opts, state->git_apply_opts.v); - opts_left = apply_parse_options(apply_opts.argc, apply_opts.argv, + opts_left = apply_parse_options(apply_opts.nr, apply_opts.v, &apply_state, &force_apply, &options, NULL); @@ -1433,12 +1440,12 @@ static int run_apply(const struct am_state *state, const char *index_file) if (check_apply_state(&apply_state, force_apply)) BUG("check_apply_state() failed"); - argv_array_push(&apply_paths, am_path(state, "patch")); + strvec_push(&apply_paths, am_path(state, "patch")); - res = apply_all_patches(&apply_state, apply_paths.argc, apply_paths.argv, options); + res = apply_all_patches(&apply_state, apply_paths.nr, apply_paths.v, options); - argv_array_clear(&apply_paths); - argv_array_clear(&apply_opts); + strvec_clear(&apply_paths); + strvec_clear(&apply_opts); clear_apply_state(&apply_state); if (res) @@ -1461,10 +1468,10 @@ static int build_fake_ancestor(const struct am_state *state, const char *index_f struct child_process cp = CHILD_PROCESS_INIT; cp.git_cmd = 1; - argv_array_push(&cp.args, "apply"); - argv_array_pushv(&cp.args, state->git_apply_opts.argv); - argv_array_pushf(&cp.args, "--build-fake-ancestor=%s", index_file); - argv_array_push(&cp.args, am_path(state, "patch")); + strvec_push(&cp.args, "apply"); + strvec_pushv(&cp.args, state->git_apply_opts.v); + strvec_pushf(&cp.args, "--build-fake-ancestor=%s", index_file); + strvec_push(&cp.args, am_path(state, "patch")); if (run_command(&cp)) return -1; @@ -1538,7 +1545,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 = 0; + o.detect_directory_renames = MERGE_DIRECTORY_RENAMES_NONE; if (state->quiet) o.verbosity = 0; @@ -1563,7 +1570,7 @@ static void do_commit(const struct am_state *state) struct object_id tree, parent, commit; const struct object_id *old_oid; struct commit_list *parents = NULL; - const char *reflog_msg, *author; + const char *reflog_msg, *author, *committer = NULL; struct strbuf sb = STRBUF_INIT; if (run_hook_le(NULL, "pre-applypatch", NULL)) @@ -1587,11 +1594,15 @@ static void do_commit(const struct am_state *state) IDENT_STRICT); if (state->committer_date_is_author_date) - setenv("GIT_COMMITTER_DATE", - state->ignore_date ? "" : state->author_date, 1); - - if (commit_tree(state->msg, state->msg_len, &tree, parents, &commit, - author, state->sign_commit)) + committer = fmt_ident(state->committer_name, + state->committer_email, WANT_COMMITTER_IDENT, + state->ignore_date ? NULL + : state->author_date, + IDENT_STRICT); + + if (commit_tree_extended(state->msg, state->msg_len, &tree, parents, + &commit, author, committer, state->sign_commit, + NULL)) die(_("failed to write commit object")); reflog_msg = getenv("GIT_REFLOG_ACTION"); @@ -1683,7 +1694,7 @@ static int do_interactive(struct am_state *state) if (!pager) pager = "cat"; prepare_pager_args(&cp, pager); - argv_array_push(&cp.args, am_path(state, "patch")); + strvec_push(&cp.args, am_path(state, "patch")); run_command(&cp); } } @@ -1698,12 +1709,12 @@ static int do_interactive(struct am_state *state) */ static void am_run(struct am_state *state, int resume) { - const char *argv_gc_auto[] = {"gc", "--auto", NULL}; struct strbuf sb = STRBUF_INIT; unlink(am_path(state, "dirtyindex")); - refresh_and_write_cache(); + if (refresh_and_write_cache(REFRESH_QUIET, 0, 0) < 0) + die(_("unable to write index file")); if (repo_index_has_changes(the_repository, NULL, &sb)) { write_state_bool(state, "dirtyindex", 1); @@ -1774,7 +1785,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' to see the failed patch")); + advise(_("Use 'git am --show-current-patch=diff' to see the failed patch")); die_user_resolve(state); } @@ -1802,7 +1813,7 @@ next: if (!state->rebasing) { am_destroy(state); close_object_store(the_repository->objects); - run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); + run_auto_maintenance(state->quiet); } } @@ -2072,7 +2083,7 @@ static void am_abort(struct am_state *state) am_destroy(state); } -static int show_patch(struct am_state *state) +static int show_patch(struct am_state *state, enum show_patch_type sub_mode) { struct strbuf sb = STRBUF_INIT; const char *patch_path; @@ -2089,7 +2100,17 @@ static int show_patch(struct am_state *state) return ret; } - patch_path = am_path(state, msgnum(state)); + 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"); + } + len = strbuf_read_file(&sb, patch_path, 0); if (len < 0) die_errno(_("failed to read '%s'"), patch_path); @@ -2129,7 +2150,7 @@ static int parse_opt_patchformat(const struct option *opt, const char *arg, int return 0; } -enum resume_mode { +enum resume_type { RESUME_FALSE = 0, RESUME_APPLY, RESUME_RESOLVED, @@ -2139,6 +2160,47 @@ enum resume_mode { 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; + + BUG_ON_OPT_NEG(unset); + + 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; @@ -2156,7 +2218,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; - enum resume_mode resume = RESUME_FALSE; + struct resume_mode resume = { .mode = RESUME_FALSE }; int in_progress; int ret = 0; @@ -2225,24 +2287,26 @@ 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, + OPT_CMDMODE(0, "continue", &resume.mode, N_("continue applying patches after resolving a conflict"), RESUME_RESOLVED), - OPT_CMDMODE('r', "resolved", &resume, + OPT_CMDMODE('r', "resolved", &resume.mode, N_("synonyms for --continue"), RESUME_RESOLVED), - OPT_CMDMODE(0, "skip", &resume, + OPT_CMDMODE(0, "skip", &resume.mode, N_("skip the current patch"), RESUME_SKIP), - OPT_CMDMODE(0, "abort", &resume, + OPT_CMDMODE(0, "abort", &resume.mode, N_("restore the original branch and abort the patching operation."), RESUME_ABORT), - OPT_CMDMODE(0, "quit", &resume, + OPT_CMDMODE(0, "quit", &resume.mode, N_("abort the patching operation but keep HEAD where it is."), RESUME_QUIT), - OPT_CMDMODE(0, "show-current-patch", &resume, - N_("show the patch being applied."), - RESUME_SHOW_PATCH), + { 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_BOOL(0, "committer-date-is-author-date", &state.committer_date_is_author_date, N_("lie about committer date")), @@ -2292,17 +2356,17 @@ 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 == RESUME_FALSE && !isatty(0))) + if (argc || (resume.mode == RESUME_FALSE && !isatty(0))) die(_("previous rebase directory %s still exists but mbox given."), state.dir); - if (resume == RESUME_FALSE) - resume = RESUME_APPLY; + if (resume.mode == RESUME_FALSE) + resume.mode = RESUME_APPLY; if (state.signoff == SIGNOFF_EXPLICIT) am_append_signoff(&state); } else { - struct argv_array paths = ARGV_ARRAY_INIT; + struct strvec paths = STRVEC_INIT; int i; /* @@ -2311,7 +2375,7 @@ int cmd_am(int argc, const char **argv, const char *prefix) * stray directories. */ if (file_exists(state.dir) && !state.rebasing) { - if (resume == RESUME_ABORT || resume == RESUME_QUIT) { + if (resume.mode == RESUME_ABORT || resume.mode == RESUME_QUIT) { am_destroy(&state); am_state_release(&state); return 0; @@ -2322,25 +2386,25 @@ int cmd_am(int argc, const char **argv, const char *prefix) state.dir); } - if (resume) + if (resume.mode) die(_("Resolve operation not in progress, we are not resuming.")); for (i = 0; i < argc; i++) { if (is_absolute_path(argv[i]) || !prefix) - argv_array_push(&paths, argv[i]); + strvec_push(&paths, argv[i]); else - argv_array_push(&paths, mkpath("%s/%s", prefix, argv[i])); + strvec_push(&paths, mkpath("%s/%s", prefix, argv[i])); } - if (state.interactive && !paths.argc) + if (state.interactive && !paths.nr) die(_("interactive mode requires patches on the command line")); - am_setup(&state, patch_format, paths.argv, keep_cr); + am_setup(&state, patch_format, paths.v, keep_cr); - argv_array_clear(&paths); + strvec_clear(&paths); } - switch (resume) { + switch (resume.mode) { case RESUME_FALSE: am_run(&state, 0); break; @@ -2361,7 +2425,7 @@ int cmd_am(int argc, const char **argv, const char *prefix) am_destroy(&state); break; case RESUME_SHOW_PATCH: - ret = show_patch(&state); + ret = show_patch(&state, resume.sub_mode); break; default: BUG("invalid resume value"); diff --git a/third_party/git/builtin/annotate.c b/third_party/git/builtin/annotate.c index da413ae0d1..58ff977a23 100644 --- a/third_party/git/builtin/annotate.c +++ b/third_party/git/builtin/annotate.c @@ -5,18 +5,18 @@ */ #include "git-compat-util.h" #include "builtin.h" -#include "argv-array.h" +#include "strvec.h" int cmd_annotate(int argc, const char **argv, const char *prefix) { - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; int i; - argv_array_pushl(&args, "annotate", "-c", NULL); + strvec_pushl(&args, "annotate", "-c", NULL); for (i = 1; i < argc; i++) { - argv_array_push(&args, argv[i]); + strvec_push(&args, argv[i]); } - return cmd_blame(args.argc, args.argv, prefix); + return cmd_blame(args.nr, args.v, prefix); } diff --git a/third_party/git/builtin/bisect--helper.c b/third_party/git/builtin/bisect--helper.c index 1fbe156e67..7512b880f0 100644 --- a/third_party/git/builtin/bisect--helper.c +++ b/third_party/git/builtin/bisect--helper.c @@ -4,22 +4,23 @@ #include "bisect.h" #include "refs.h" #include "dir.h" -#include "argv-array.h" +#include "strvec.h" #include "run-command.h" #include "prompt.h" #include "quote.h" +#include "revision.h" static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS") static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV") static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK") static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START") -static GIT_PATH_FUNC(git_path_bisect_head, "BISECT_HEAD") static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG") static GIT_PATH_FUNC(git_path_head_name, "head-name") static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES") +static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT") static const char * const git_bisect_helper_usage[] = { - N_("git bisect--helper --next-all [--no-checkout]"), + N_("git bisect--helper --next-all"), N_("git bisect--helper --write-terms <bad_term> <good_term>"), N_("git bisect--helper --bisect-clean-state"), N_("git bisect--helper --bisect-reset [<commit>]"), @@ -27,11 +28,19 @@ static const char * const git_bisect_helper_usage[] = { N_("git bisect--helper --bisect-check-and-set-terms <command> <good_term> <bad_term>"), N_("git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"), N_("git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"), - N_("git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}=<term>]" - "[--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"), + N_("git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>]" + " [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]"), + N_("git bisect--helper --bisect-next"), + N_("git bisect--helper --bisect-auto-next"), + N_("git bisect--helper --bisect-autostart"), NULL }; +struct add_bisect_ref_data { + struct rev_info *revs; + unsigned int object_flags; +}; + struct bisect_terms { char *term_good; char *term_bad; @@ -52,8 +61,10 @@ 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"; + +static int bisect_autostart(struct bisect_terms *terms); /* * Check whether the string `term` belongs to the set of strings @@ -74,6 +85,52 @@ static int one_of(const char *term, ...) return res; } +static int write_in_file(const char *path, const char *mode, const char *format, va_list args) +{ + FILE *fp = NULL; + int res = 0; + + if (strcmp(mode, "w") && strcmp(mode, "a")) + BUG("write-in-file does not support '%s' mode", mode); + fp = fopen(path, mode); + if (!fp) + return error_errno(_("cannot open file '%s' in mode '%s'"), path, mode); + res = vfprintf(fp, format, args); + + if (res < 0) { + int saved_errno = errno; + fclose(fp); + errno = saved_errno; + return error_errno(_("could not write to file '%s'"), path); + } + + return fclose(fp); +} + +static int write_to_file(const char *path, const char *format, ...) +{ + int res; + va_list args; + + va_start(args, format); + res = write_in_file(path, "w", format, args); + va_end(args); + + return res; +} + +static int append_to_file(const char *path, const char *format, ...) +{ + int res; + va_list args; + + va_start(args, format); + res = write_in_file(path, "a", format, args); + va_end(args); + + return res; +} + static int check_term_format(const char *term, const char *orig_term) { int res; @@ -104,7 +161,6 @@ static int check_term_format(const char *term, const char *orig_term) static int write_terms(const char *bad, const char *good) { - FILE *fp = NULL; int res; if (!strcmp(bad, good)) @@ -113,13 +169,9 @@ static int write_terms(const char *bad, const char *good) if (check_term_format(bad, "bad") || check_term_format(good, "good")) return -1; - fp = fopen(git_path_bisect_terms(), "w"); - if (!fp) - return error_errno(_("could not open the file BISECT_TERMS")); + res = write_to_file(git_path_bisect_terms(), "%s\n%s\n", bad, good); - res = fprintf(fp, "%s\n%s\n", bad, good); - res |= fclose(fp); - return (res < 0) ? -1 : 0; + return res; } static int is_expected_rev(const char *expected_hex) @@ -164,18 +216,19 @@ static int bisect_reset(const char *commit) strbuf_addstr(&branch, commit); } - if (!file_exists(git_path_bisect_head())) { - struct argv_array argv = ARGV_ARRAY_INIT; + if (!ref_exists("BISECT_HEAD")) { + struct strvec argv = STRVEC_INIT; - argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL); - if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { + strvec_pushl(&argv, "checkout", branch.buf, "--", NULL); + if (run_command_v_opt(argv.v, 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 error(_("could not check out original" - " HEAD '%s'. Try 'git bisect" - " reset <commit>'."), branch.buf); + strvec_clear(&argv); + return -1; } - argv_array_clear(&argv); + strvec_clear(&argv); } strbuf_release(&branch); @@ -205,31 +258,31 @@ static int bisect_write(const char *state, const char *rev, struct object_id oid; struct commit *commit; FILE *fp = NULL; - int retval = 0; + int res = 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 { - retval = error(_("Bad bisect_write argument: %s"), state); + res = error(_("Bad bisect_write argument: %s"), state); goto finish; } if (get_oid(rev, &oid)) { - retval = error(_("couldn't get the oid of the rev '%s'"), rev); + res = 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)) { - retval = -1; + res = -1; goto finish; } fp = fopen(git_path_bisect_log(), "a"); if (!fp) { - retval = error_errno(_("couldn't open the file '%s'"), git_path_bisect_log()); + res = error_errno(_("couldn't open the file '%s'"), git_path_bisect_log()); goto finish; } @@ -243,7 +296,7 @@ finish: if (fp) fclose(fp); strbuf_release(&tag); - return retval; + return res; } static int check_and_set_terms(struct bisect_terms *terms, const char *cmd) @@ -281,35 +334,23 @@ 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 bisect_next_check(const struct bisect_terms *terms, - const char *current_term) +static int decide_next(const struct bisect_terms *terms, + const char *current_term, int missing_good, + int missing_bad) { - 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) - goto finish; - - if (!current_term) { - retval = -1; - goto finish; - } + return 0; + if (!current_term) + return -1; if (missing_good && !missing_bad && !strcmp(current_term, terms->term_good)) { @@ -320,7 +361,7 @@ static int bisect_next_check(const struct bisect_terms *terms, */ warning(_("bisecting only with a %s commit"), terms->term_bad); if (!isatty(0)) - goto finish; + return 0; /* * TRANSLATORS: Make sure to include [Y] and [n] in your * translation. The program will only accept English input @@ -328,21 +369,35 @@ static int bisect_next_check(const struct bisect_terms *terms, */ yesno = git_prompt(_("Are you sure [Y/n]? "), PROMPT_ECHO); if (starts_with(yesno, "N") || starts_with(yesno, "n")) - 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); + return -1; + return 0; } -finish: - free((void *) good_glob); - free((void *) bad_ref); - return retval; + 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); } static int get_terms(struct bisect_terms *terms) @@ -396,7 +451,7 @@ static int bisect_terms(struct bisect_terms *terms, const char *option) static int bisect_append_log_quoted(const char **argv) { - int retval = 0; + int res = 0; FILE *fp = fopen(git_path_bisect_log(), "a"); struct strbuf orig_args = STRBUF_INIT; @@ -404,25 +459,162 @@ static int bisect_append_log_quoted(const char **argv) return -1; if (fprintf(fp, "git bisect start") < 1) { - retval = -1; + res = -1; goto finish; } sq_quote_argv(&orig_args, argv); if (fprintf(fp, "%s\n", orig_args.buf) < 1) - retval = -1; + res = -1; finish: fclose(fp); strbuf_release(&orig_args); - return retval; + return res; +} + +static int add_bisect_ref(const char *refname, const struct object_id *oid, + int flags, void *cb) +{ + struct add_bisect_ref_data *data = cb; + + add_pending_oid(data->revs, refname, oid, data->object_flags); + + return 0; +} + +static int prepare_revs(struct bisect_terms *terms, struct rev_info *revs) +{ + int res = 0; + struct add_bisect_ref_data cb = { revs }; + char *good = xstrfmt("%s-*", terms->term_good); + + /* + * We cannot use terms->term_bad directly in + * for_each_glob_ref_in() and we have to append a '*' to it, + * otherwise for_each_glob_ref_in() will append '/' and '*'. + */ + char *bad = xstrfmt("%s*", terms->term_bad); + + /* + * It is important to reset the flags used by revision walks + * as the previous call to bisect_next_all() in turn + * sets up a revision walk. + */ + reset_revision_walk(); + init_revisions(revs, NULL); + setup_revisions(0, NULL, revs, NULL); + for_each_glob_ref_in(add_bisect_ref, bad, "refs/bisect/", &cb); + cb.object_flags = UNINTERESTING; + for_each_glob_ref_in(add_bisect_ref, good, "refs/bisect/", &cb); + if (prepare_revision_walk(revs)) + res = error(_("revision walk setup failed\n")); + + free(good); + free(bad); + return res; } -static int bisect_start(struct bisect_terms *terms, int no_checkout, - const char **argv, int argc) +static int bisect_skipped_commits(struct bisect_terms *terms) { + int res; + FILE *fp = NULL; + struct rev_info revs; + struct commit *commit; + struct pretty_print_context pp = {0}; + struct strbuf commit_name = STRBUF_INIT; + + res = prepare_revs(terms, &revs); + if (res) + return res; + + fp = fopen(git_path_bisect_log(), "a"); + if (!fp) + return error_errno(_("could not open '%s' for appending"), + git_path_bisect_log()); + + if (fprintf(fp, "# only skipped commits left to test\n") < 0) + return error_errno(_("failed to write to '%s'"), git_path_bisect_log()); + + while ((commit = get_revision(&revs)) != NULL) { + strbuf_reset(&commit_name); + format_commit_message(commit, "%s", + &commit_name, &pp); + fprintf(fp, "# possible first %s commit: [%s] %s\n", + terms->term_bad, oid_to_hex(&commit->object.oid), + commit_name.buf); + } + + /* + * Reset the flags used by revision walks in case + * there is another revision walk after this one. + */ + reset_revision_walk(); + + strbuf_release(&commit_name); + fclose(fp); + return 0; +} + +static int bisect_successful(struct bisect_terms *terms) +{ + struct object_id oid; + struct commit *commit; + struct pretty_print_context pp = {0}; + struct strbuf commit_name = STRBUF_INIT; + char *bad_ref = xstrfmt("refs/bisect/%s",terms->term_bad); + int res; + + read_ref(bad_ref, &oid); + commit = lookup_commit_reference_by_name(bad_ref); + format_commit_message(commit, "%s", &commit_name, &pp); + + res = append_to_file(git_path_bisect_log(), "# first %s commit: [%s] %s\n", + terms->term_bad, oid_to_hex(&commit->object.oid), + commit_name.buf); + + strbuf_release(&commit_name); + free(bad_ref); + return res; +} + +static enum bisect_error bisect_next(struct bisect_terms *terms, const char *prefix) +{ + enum bisect_error res; + + if (bisect_autostart(terms)) + return BISECT_FAILED; + + if (bisect_next_check(terms, terms->term_good)) + return BISECT_FAILED; + + /* Perform all bisection computation */ + res = bisect_next_all(the_repository, prefix); + + if (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND) { + res = bisect_successful(terms); + return res ? res : BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND; + } else if (res == BISECT_ONLY_SKIPPED_LEFT) { + res = bisect_skipped_commits(terms); + return res ? res : BISECT_ONLY_SKIPPED_LEFT; + } + return res; +} + +static enum bisect_error bisect_auto_next(struct bisect_terms *terms, const char *prefix) +{ + if (bisect_next_check(terms, NULL)) + return BISECT_OK; + + return bisect_next(terms, prefix); +} + +static int bisect_start(struct bisect_terms *terms, const char **argv, int argc) +{ + int no_checkout = 0; + int first_parent_only = 0; int i, has_double_dash = 0, must_write_terms = 0, bad_seen = 0; - int flags, pathspec_pos, retval = 0; + int flags, pathspec_pos, res = 0; struct string_list revs = STRING_LIST_INIT_DUP; struct string_list states = STRING_LIST_INIT_DUP; struct strbuf start_head = STRBUF_INIT; @@ -450,11 +642,16 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout, break; } else if (!strcmp(arg, "--no-checkout")) { no_checkout = 1; + } else if (!strcmp(arg, "--first-parent")) { + first_parent_only = 1; } else if (!strcmp(arg, "--term-good") || !strcmp(arg, "--term-old")) { + i++; + if (argc <= i) + return error(_("'' is not a valid term")); must_write_terms = 1; free((void *) terms->term_good); - terms->term_good = xstrdup(argv[++i]); + terms->term_good = xstrdup(argv[i]); } else if (skip_prefix(arg, "--term-good=", &arg) || skip_prefix(arg, "--term-old=", &arg)) { must_write_terms = 1; @@ -462,25 +659,26 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout, terms->term_good = xstrdup(arg); } else if (!strcmp(arg, "--term-bad") || !strcmp(arg, "--term-new")) { + i++; + if (argc <= i) + return error(_("'' is not a valid term")); must_write_terms = 1; free((void *) terms->term_bad); - terms->term_bad = xstrdup(argv[++i]); + terms->term_bad = xstrdup(argv[i]); } else if (skip_prefix(arg, "--term-bad=", &arg) || skip_prefix(arg, "--term-new=", &arg)) { must_write_terms = 1; free((void *) terms->term_bad); terms->term_bad = xstrdup(arg); - } else if (starts_with(arg, "--") && - !one_of(arg, "--term-good", "--term-bad", NULL)) { + } else if (starts_with(arg, "--")) { return error(_("unrecognized option: '%s'"), arg); - } else { - char *commit_id = xstrfmt("%s^{commit}", arg); - if (get_oid(commit_id, &oid) && has_double_dash) - die(_("'%s' does not appear to be a valid " - "revision"), arg); - + } else if (!get_oidf(&oid, "%s^{commit}", arg)) { string_list_append(&revs, oid_to_hex(&oid)); - free(commit_id); + } else if (has_double_dash) { + die(_("'%s' does not appear to be a valid " + "revision"), arg); + } else { + break; } } pathspec_pos = i; @@ -518,12 +716,12 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout, strbuf_read_file(&start_head, git_path_bisect_start(), 0); strbuf_trim(&start_head); if (!no_checkout) { - struct argv_array argv = ARGV_ARRAY_INIT; + struct strvec argv = STRVEC_INIT; - argv_array_pushl(&argv, "checkout", start_head.buf, - "--", NULL); - if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { - retval = error(_("checking out '%s' failed." + strvec_pushl(&argv, "checkout", start_head.buf, + "--", NULL); + if (run_command_v_opt(argv.v, RUN_GIT_CMD)) { + res = error(_("checking out '%s' failed." " Try 'git bisect start " "<valid-branch>'."), start_head.buf); @@ -569,14 +767,17 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout, */ write_file(git_path_bisect_start(), "%s\n", start_head.buf); + if (first_parent_only) + write_file(git_path_bisect_first_parent(), "\n"); + if (no_checkout) { if (get_oid(start_head.buf, &oid) < 0) { - retval = error(_("invalid ref: '%s'"), start_head.buf); + res = error(_("invalid ref: '%s'"), start_head.buf); goto finish; } if (update_ref(NULL, "BISECT_HEAD", &oid, NULL, 0, UPDATE_REFS_MSG_ON_ERR)) { - retval = -1; + res = -1; goto finish; } } @@ -588,26 +789,58 @@ 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)) { - retval = -1; + res = -1; goto finish; } if (must_write_terms && write_terms(terms->term_bad, terms->term_good)) { - retval = -1; + res = -1; goto finish; } - retval = bisect_append_log_quoted(argv); - if (retval) - retval = -1; + res = bisect_append_log_quoted(argv); + if (res) + res = -1; finish: string_list_clear(&revs, 0); string_list_clear(&states, 0); strbuf_release(&start_head); strbuf_release(&bisect_names); - return retval; + return res; +} + +static inline int file_is_not_empty(const char *path) +{ + return !is_empty_or_missing_file(path); +} + +static int bisect_autostart(struct bisect_terms *terms) +{ + int res; + const char *yesno; + + if (file_is_not_empty(git_path_bisect_start())) + return 0; + + fprintf_ln(stderr, _("You need to start by \"git bisect " + "start\"\n")); + + if (!isatty(STDIN_FILENO)) + return -1; + + /* + * TRANSLATORS: Make sure to include [Y] and [n] in your + * translation. The program will only accept English input + * at this point. + */ + yesno = git_prompt(_("Do you want me to do it for you " + "[Y/n]? "), PROMPT_ECHO); + res = tolower(*yesno) == 'n' ? + -1 : bisect_start(terms, empty_strvec, 0); + + return res; } int cmd_bisect__helper(int argc, const char **argv, const char *prefix) @@ -622,9 +855,12 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) CHECK_AND_SET_TERMS, BISECT_NEXT_CHECK, BISECT_TERMS, - BISECT_START + BISECT_START, + BISECT_AUTOSTART, + BISECT_NEXT, + BISECT_AUTO_NEXT } cmdmode = 0; - int no_checkout = 0, res = 0, nolog = 0; + int res = 0, nolog = 0; struct option options[] = { OPT_CMDMODE(0, "next-all", &cmdmode, N_("perform 'git bisect next'"), NEXT_ALL), @@ -646,8 +882,12 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) N_("print out the bisect terms"), BISECT_TERMS), OPT_CMDMODE(0, "bisect-start", &cmdmode, N_("start the bisect session"), BISECT_START), - OPT_BOOL(0, "no-checkout", &no_checkout, - N_("update BISECT_HEAD instead of checking out the current commit")), + OPT_CMDMODE(0, "bisect-next", &cmdmode, + N_("find the next bisection commit"), BISECT_NEXT), + OPT_CMDMODE(0, "bisect-auto-next", &cmdmode, + N_("verify the next bisection state then checkout the next bisection commit"), BISECT_AUTO_NEXT), + OPT_CMDMODE(0, "bisect-autostart", &cmdmode, + N_("start the bisection if it has not yet been started"), BISECT_AUTOSTART), OPT_BOOL(0, "no-log", &nolog, N_("no log for BISECT_WRITE")), OPT_END() @@ -663,7 +903,8 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) switch (cmdmode) { case NEXT_ALL: - return bisect_next_all(the_repository, prefix, no_checkout); + res = bisect_next_all(the_repository, prefix); + break; case WRITE_TERMS: if (argc != 2) return error(_("--write-terms requires two arguments")); @@ -704,11 +945,37 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) break; case BISECT_START: set_terms(&terms, "bad", "good"); - res = bisect_start(&terms, no_checkout, argv, argc); + res = bisect_start(&terms, argv, argc); + break; + case BISECT_NEXT: + if (argc) + return error(_("--bisect-next requires 0 arguments")); + get_terms(&terms); + res = bisect_next(&terms, prefix); + break; + case BISECT_AUTO_NEXT: + if (argc) + return error(_("--bisect-auto-next requires 0 arguments")); + get_terms(&terms); + res = bisect_auto_next(&terms, prefix); + break; + case BISECT_AUTOSTART: + if (argc) + return error(_("--bisect-autostart does not accept arguments")); + set_terms(&terms, "bad", "good"); + res = bisect_autostart(&terms); break; default: - return error("BUG: unknown subcommand '%d'", cmdmode); + BUG("unknown subcommand %d", cmdmode); } free_terms(&terms); - return !!res; + + /* + * 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_INTERNAL_SUCCESS_1ST_BAD_FOUND)) + res = BISECT_OK; + + return -res; } diff --git a/third_party/git/builtin/blame.c b/third_party/git/builtin/blame.c index 7ebd51ae4d..7112be2afe 100644 --- a/third_party/git/builtin/blame.c +++ b/third_party/git/builtin/blame.c @@ -26,8 +26,8 @@ #include "progress.h" #include "object-store.h" #include "blame.h" -#include "string-list.h" #include "refs.h" +#include "tag.h" static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"); @@ -320,18 +320,18 @@ static const char *format_time(timestamp_t time, const char *tz_str, return time_buf.buf; } -#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 +#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) static void emit_porcelain_details(struct blame_origin *suspect, int repeat) { @@ -460,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) ? GIT_SHA1_HEXSZ : abbrev; + int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? the_hash_algo->hexsz : abbrev; if (opt & OUTPUT_COLOR_LINE) { if (cnt > 0) { @@ -804,6 +804,26 @@ static int is_a_rev(const char *name) return OBJ_NONE < oid_object_info(the_repository, &oid, NULL); } +static int peel_to_commit_oid(struct object_id *oid_ret, void *cbdata) +{ + struct repository *r = ((struct blame_scoreboard *)cbdata)->repo; + struct object_id oid; + + oidcpy(&oid, oid_ret); + while (1) { + struct object *obj; + int kind = oid_object_info(r, &oid, NULL); + if (kind == OBJ_COMMIT) { + oidcpy(oid_ret, &oid); + return 0; + } + if (kind != OBJ_TAG) + return -1; + obj = deref_tag(r, parse_object(r, &oid), NULL, 0); + oidcpy(&oid, &obj->oid); + } +} + static void build_ignorelist(struct blame_scoreboard *sb, struct string_list *ignore_revs_file_list, struct string_list *ignore_rev_list) @@ -816,10 +836,12 @@ static void build_ignorelist(struct blame_scoreboard *sb, if (!strcmp(i->string, "")) oidset_clear(&sb->ignore_list); else - oidset_parse_file(&sb->ignore_list, i->string); + oidset_parse_file_carefully(&sb->ignore_list, i->string, + peel_to_commit_oid, sb); } for_each_string_list_item(i, ignore_rev_list) { - if (get_oid_committish(i->string, &oid)) + if (get_oid_committish(i->string, &oid) || + peel_to_commit_oid(&oid, sb)) die(_("cannot find revision %s to ignore"), i->string); oidset_insert(&sb->ignore_list, &oid); } @@ -843,7 +865,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) const char *contents_from = NULL; const struct option options[] = { OPT_BOOL(0, "incremental", &incremental, N_("Show blame entries as we find them, incrementally")), - OPT_BOOL('b', NULL, &blank_boundary, N_("Show blank SHA-1 for boundary commits (Default: off)")), + OPT_BOOL('b', NULL, &blank_boundary, N_("Do not show object names of boundary commits (Default: off)")), OPT_BOOL(0, "root", &show_root, N_("Do not treat root commits as boundaries (Default: off)")), OPT_BOOL(0, "show-stats", &show_stats, N_("Show work cost statistics")), OPT_BOOL(0, "progress", &show_progress, N_("Force progress reporting")), @@ -862,19 +884,11 @@ 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")), - { OPTION_CALLBACK, 'C', NULL, &opt, N_("score"), N_("Find line copies within and across files"), PARSE_OPT_OPTARG, blame_copy_callback }, - { OPTION_CALLBACK, 'M', NULL, &opt, N_("score"), N_("Find line movements within and across files"), PARSE_OPT_OPTARG, blame_move_callback }, + OPT_CALLBACK_F('C', NULL, &opt, N_("score"), N_("Find line copies within and across files"), PARSE_OPT_OPTARG, blame_copy_callback), + OPT_CALLBACK_F('M', NULL, &opt, N_("score"), N_("Find line movements within and across files"), PARSE_OPT_OPTARG, blame_move_callback), OPT_STRING_LIST('L', NULL, &range_list, N_("n,m"), N_("Process only line range n,m, counting from 1")), OPT__ABBREV(&abbrev), OPT_END() @@ -885,6 +899,7 @@ 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); @@ -931,11 +946,11 @@ parse_done: } else if (show_progress < 0) show_progress = isatty(2); - if (0 < abbrev && abbrev < GIT_SHA1_HEXSZ) + if (0 < abbrev && abbrev < hexsz) /* one more abbrev length is needed for the boundary commit */ abbrev++; else if (!abbrev) - abbrev = GIT_SHA1_HEXSZ; + abbrev = hexsz; if (revs_file && read_ancestry(revs_file)) die_errno("reading graft file '%s' failed", revs_file); @@ -1072,6 +1087,14 @@ parse_done: string_list_clear(&ignore_revs_file_list, 0); string_list_clear(&ignore_rev_list, 0); setup_scoreboard(&sb, path, &o); + + /* + * Changed-path Bloom filters are disabled when looking + * for copies. + */ + if (!(opt & PICKAXE_BLAME_COPY)) + setup_blame_bloom_data(&sb, path); + lno = sb.num_lines; if (lno && !range_list.nr) @@ -1175,5 +1198,7 @@ parse_done: printf("num get patch: %d\n", sb.num_get_patch); printf("num commits: %d\n", sb.num_commits); } + + cleanup_scoreboard(&sb); return 0; } diff --git a/third_party/git/builtin/branch.c b/third_party/git/builtin/branch.c index 2ef214632f..efb30b8820 100644 --- a/third_party/git/builtin/branch.c +++ b/third_party/git/builtin/branch.c @@ -26,7 +26,7 @@ #include "commit-reach.h" static const char * const builtin_branch_usage[] = { - N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"), + N_("git branch [<options>] [-r | -a] [--merged] [--no-merged]"), N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"), N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."), N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"), @@ -468,7 +468,7 @@ static void print_current_branch_name(void) static void reject_rebase_or_bisect_branch(const char *target) { - struct worktree **worktrees = get_worktrees(0); + struct worktree **worktrees = get_worktrees(); int i; for (i = 0; worktrees[i]; i++) { @@ -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), @@ -653,10 +653,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix) OPT_NO_MERGED(&filter, N_("print only branches that are not merged")), OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")), OPT_REF_SORT(sorting_tail), - { - OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"), - N_("print only branches of the object"), 0, parse_opt_object_name - }, + OPT_CALLBACK(0, "points-at", &filter.points_at, N_("object"), + N_("print only branches of the object"), parse_opt_object_name), OPT_BOOL('i', "ignore-case", &icase, N_("sorting and filtering are case insensitive")), OPT_STRING( 0 , "format", &format.format, N_("format"), N_("format to use for the output")), OPT_END(), @@ -690,12 +688,12 @@ int cmd_branch(int argc, const char **argv, const char *prefix) !show_current && !unset_upstream && argc == 0) list = 1; - if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE || filter.points_at.nr || - filter.no_commit) + if (filter.with_commit || filter.no_commit || + filter.reachable_from || filter.unreachable_from || filter.points_at.nr) list = 1; if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current + - list + unset_upstream > 1) + list + edit_description + unset_upstream > 1) usage_with_options(builtin_branch_usage, options); if (filter.abbrev == -1) @@ -739,7 +737,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) */ if (!sorting) sorting = ref_default_sorting(); - sorting->ignore_case = icase; + ref_sorting_icase_all(sorting, icase); print_ref_list(&filter, sorting, &format); print_columns(&output, colopts, NULL); string_list_clear(&output, 0); diff --git a/third_party/git/builtin/bugreport.c b/third_party/git/builtin/bugreport.c new file mode 100644 index 0000000000..3ad4b9b62e --- /dev/null +++ b/third_party/git/builtin/bugreport.c @@ -0,0 +1,194 @@ +#include "builtin.h" +#include "parse-options.h" +#include "strbuf.h" +#include "help.h" +#include "compat/compiler.h" +#include "run-command.h" + + +static void get_system_info(struct strbuf *sys_info) +{ + struct utsname uname_info; + char *shell = NULL; + + /* get git version from native cmd */ + strbuf_addstr(sys_info, _("git version:\n")); + get_version_info(sys_info, 1); + + /* system call for other version info */ + strbuf_addstr(sys_info, "uname: "); + if (uname(&uname_info)) + strbuf_addf(sys_info, _("uname() failed with error '%s' (%d)\n"), + strerror(errno), + errno); + else + strbuf_addf(sys_info, "%s %s %s %s\n", + uname_info.sysname, + uname_info.release, + uname_info.version, + uname_info.machine); + + strbuf_addstr(sys_info, _("compiler info: ")); + get_compiler_info(sys_info); + + strbuf_addstr(sys_info, _("libc info: ")); + get_libc_info(sys_info); + + shell = getenv("SHELL"); + strbuf_addf(sys_info, "$SHELL (typically, interactive shell): %s\n", + shell ? shell : "<unset>"); +} + +static void get_populated_hooks(struct strbuf *hook_info, int nongit) +{ + /* + * NEEDSWORK: Doesn't look like there is a list of all possible hooks; + * so below is a transcription of `git help hooks`. Later, this should + * be replaced with some programmatically generated list (generated from + * doc or else taken from some library which tells us about all the + * hooks) + */ + static const char *hook[] = { + "applypatch-msg", + "pre-applypatch", + "post-applypatch", + "pre-commit", + "pre-merge-commit", + "prepare-commit-msg", + "commit-msg", + "post-commit", + "pre-rebase", + "post-checkout", + "post-merge", + "pre-push", + "pre-receive", + "update", + "post-receive", + "post-update", + "push-to-checkout", + "pre-auto-gc", + "post-rewrite", + "sendemail-validate", + "fsmonitor-watchman", + "p4-pre-submit", + "post-index-change", + }; + int i; + + if (nongit) { + strbuf_addstr(hook_info, + _("not run from a git repository - no hooks to show\n")); + return; + } + + for (i = 0; i < ARRAY_SIZE(hook); i++) + if (find_hook(hook[i])) + strbuf_addf(hook_info, "%s\n", hook[i]); +} + +static const char * const bugreport_usage[] = { + N_("git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"), + NULL +}; + +static int get_bug_template(struct strbuf *template) +{ + const char template_text[] = N_( +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n"); + + strbuf_addstr(template, _(template_text)); + return 0; +} + +static void get_header(struct strbuf *buf, const char *title) +{ + strbuf_addf(buf, "\n\n[%s]\n", title); +} + +int cmd_bugreport(int argc, const char **argv, const char *prefix) +{ + struct strbuf buffer = STRBUF_INIT; + struct strbuf report_path = STRBUF_INIT; + int report = -1; + time_t now = time(NULL); + char *option_output = NULL; + char *option_suffix = "%Y-%m-%d-%H%M"; + const char *user_relative_path = NULL; + + const struct option bugreport_options[] = { + OPT_STRING('o', "output-directory", &option_output, N_("path"), + N_("specify a destination for the bugreport file")), + OPT_STRING('s', "suffix", &option_suffix, N_("format"), + N_("specify a strftime format suffix for the filename")), + OPT_END() + }; + + argc = parse_options(argc, argv, prefix, bugreport_options, + bugreport_usage, 0); + + /* Prepare the path to put the result */ + strbuf_addstr(&report_path, + prefix_filename(prefix, + option_output ? option_output : "")); + strbuf_complete(&report_path, '/'); + + strbuf_addstr(&report_path, "git-bugreport-"); + strbuf_addftime(&report_path, option_suffix, localtime(&now), 0, 0); + strbuf_addstr(&report_path, ".txt"); + + switch (safe_create_leading_directories(report_path.buf)) { + case SCLD_OK: + case SCLD_EXISTS: + break; + default: + die(_("could not create leading directories for '%s'"), + report_path.buf); + } + + /* Prepare the report contents */ + get_bug_template(&buffer); + + get_header(&buffer, _("System Info")); + get_system_info(&buffer); + + get_header(&buffer, _("Enabled Hooks")); + get_populated_hooks(&buffer, !startup_info->have_repository); + + /* fopen doesn't offer us an O_EXCL alternative, except with glibc. */ + report = open(report_path.buf, O_CREAT | O_EXCL | O_WRONLY, 0666); + + if (report < 0) + die(_("couldn't create a new file at '%s'"), report_path.buf); + + if (write_in_full(report, buffer.buf, buffer.len) < 0) + die_errno(_("unable to write to %s"), report_path.buf); + + close(report); + + /* + * We want to print the path relative to the user, but we still need the + * path relative to us to give to the editor. + */ + if (!(prefix && skip_prefix(report_path.buf, prefix, &user_relative_path))) + user_relative_path = report_path.buf; + fprintf(stderr, _("Created new report at '%s'.\n"), + user_relative_path); + + UNLEAK(buffer); + UNLEAK(report_path); + return !!launch_editor(report_path.buf, NULL, NULL); +} diff --git a/third_party/git/builtin/bundle.c b/third_party/git/builtin/bundle.c index 1ea4bfdfc1..ea6948110b 100644 --- a/third_party/git/builtin/bundle.c +++ b/third_party/git/builtin/bundle.c @@ -1,4 +1,6 @@ #include "builtin.h" +#include "strvec.h" +#include "parse-options.h" #include "cache.h" #include "bundle.h" @@ -9,59 +11,187 @@ * bundle supporting "fetch", "pull", and "ls-remote". */ -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_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 +}; -int cmd_bundle(int argc, const char **argv, const char *prefix) -{ +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 strvec pack_opts; + int version = -1; + + 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_INTEGER(0, "version", &version, + N_("specify bundle format version")), + 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 */ + + strvec_init(&pack_opts); + if (progress == 0) + strvec_push(&pack_opts, "--quiet"); + else if (progress == 1) + strvec_push(&pack_opts, "--progress"); + else if (progress == 2) + strvec_push(&pack_opts, "--all-progress"); + if (progress && all_progress_implied) + strvec_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, version); +} + +static int cmd_bundle_verify(int argc, const char **argv, const char *prefix) { struct bundle_header header; - const char *cmd, *bundle_file; int bundle_fd = -1; + int quiet = 0; - if (argc < 3) - usage(builtin_bundle_usage); + struct option options[] = { + OPT_BOOL('q', "quiet", &quiet, + N_("do not show bundle details")), + OPT_END() + }; + const char* bundle_file; - cmd = argv[1]; - bundle_file = prefix_filename(prefix, argv[2]); - argc -= 2; - argv += 2; + 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 (strcmp(cmd, "create") && (bundle_fd = - read_bundle_header(bundle_file, &header)) < 0) + 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; +} - 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); +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) { + 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_unbundle_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; + 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, "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); + return result ? 1 : 0; } diff --git a/third_party/git/builtin/cat-file.c b/third_party/git/builtin/cat-file.c index 995d47c85a..5ebf13359e 100644 --- a/third_party/git/builtin/cat-file.c +++ b/third_party/git/builtin/cat-file.c @@ -12,9 +12,10 @@ #include "userdiff.h" #include "streaming.h" #include "tree-walk.h" -#include "sha1-array.h" +#include "oid-array.h" #include "packfile.h" #include "object-store.h" +#include "promisor-remote.h" struct batch_options { int enabled; @@ -41,7 +42,10 @@ static int filter_object(const char *path, unsigned mode, oid_to_hex(oid), path); if ((type == OBJ_BLOB) && S_ISREG(mode)) { struct strbuf strbuf = STRBUF_INIT; - if (convert_to_working_tree(&the_index, path, *buf, *size, &strbuf)) { + struct checkout_metadata meta; + + init_checkout_metadata(&meta, NULL, NULL, oid); + if (convert_to_working_tree(&the_index, path, *buf, *size, &strbuf, &meta)) { free(*buf); *size = strbuf.len; *buf = strbuf_detach(&strbuf, NULL); @@ -261,7 +265,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_sha1 = data->delta_base_oid.hash; + data->info.delta_base_oid = &data->delta_base_oid; else strbuf_addstr(sb, oid_to_hex(&data->delta_base_oid)); @@ -524,8 +528,8 @@ static int batch_objects(struct batch_options *opt) if (opt->all_objects) { struct object_cb_data cb; - if (repository_format_partial_clone) - warning("This repository has extensions.partialClone set. Some objects may not be loaded."); + if (has_promisor_remote()) + warning("This repository uses promisor remotes. Some objects may not be loaded."); cb.opt = opt; cb.expand = &data; @@ -592,7 +596,7 @@ static int batch_objects(struct batch_options *opt) static const char * const cat_file_usage[] = { N_("git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>"), - N_("git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"), + N_("git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-symlinks] [--textconv | --filters]"), NULL }; @@ -646,14 +650,14 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "allow-unknown-type", &unknown_type, N_("allow -s and -t to work with broken/corrupt objects")), OPT_BOOL(0, "buffer", &batch.buffer_output, N_("buffer --batch output")), - { OPTION_CALLBACK, 0, "batch", &batch, "format", + OPT_CALLBACK_F(0, "batch", &batch, "format", N_("show info and content of objects fed from the standard input"), PARSE_OPT_OPTARG | PARSE_OPT_NONEG, - batch_option_callback }, - { OPTION_CALLBACK, 0, "batch-check", &batch, "format", + batch_option_callback), + OPT_CALLBACK_F(0, "batch-check", &batch, "format", N_("show info about objects fed from the standard input"), PARSE_OPT_OPTARG | PARSE_OPT_NONEG, - batch_option_callback }, + batch_option_callback), OPT_BOOL(0, "follow-symlinks", &batch.follow_symlinks, N_("follow in-tree symlinks (used with --batch or --batch-check)")), OPT_BOOL(0, "batch-all-objects", &batch.all_objects, diff --git a/third_party/git/builtin/check-ignore.c b/third_party/git/builtin/check-ignore.c index 599097304b..3c652748d5 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_exclude(const char *path, struct exclude *exclude) +static void output_pattern(const char *path, struct path_pattern *pattern) { - char *bang = (exclude && exclude->flags & EXC_FLAG_NEGATIVE) ? "!" : ""; - char *slash = (exclude && exclude->flags & EXC_FLAG_MUSTBEDIR) ? "/" : ""; + char *bang = (pattern && pattern->flags & PATTERN_FLAG_NEGATIVE) ? "!" : ""; + char *slash = (pattern && pattern->flags & PATTERN_FLAG_MUSTBEDIR) ? "/" : ""; if (!nul_term_line) { if (!verbose) { write_name_quoted(path, stdout, '\n'); } else { - if (exclude) { - quote_c_style(exclude->el->src, NULL, stdout, 0); + if (pattern) { + quote_c_style(pattern->pl->src, NULL, stdout, 0); printf(":%d:%s%s%s\t", - exclude->srcpos, - bang, exclude->pattern, slash); + pattern->srcpos, + bang, pattern->pattern, slash); } else { printf("::\t"); @@ -56,11 +56,11 @@ static void output_exclude(const char *path, struct exclude *exclude) if (!verbose) { printf("%s%c", path, '\0'); } else { - if (exclude) + if (pattern) printf("%s%c%d%c%s%s%s%c%s%c", - exclude->el->src, '\0', - exclude->srcpos, '\0', - bang, exclude->pattern, slash, '\0', + pattern->pl->src, '\0', + pattern->srcpos, '\0', + bang, pattern->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 exclude *exclude; + struct path_pattern *pattern; struct pathspec pathspec; if (!argc) { @@ -103,15 +103,18 @@ 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; - exclude = NULL; + pattern = NULL; if (!seen[i]) { int dtype = DT_UNKNOWN; - exclude = last_exclude_matching(dir, &the_index, + pattern = last_matching_pattern(dir, &the_index, full_path, &dtype); + if (!verbose && pattern && + pattern->flags & PATTERN_FLAG_NEGATIVE) + pattern = NULL; } - if (!quiet && (exclude || show_non_matching)) - output_exclude(pathspec.items[i].original, exclude); - if (exclude) + if (!quiet && (pattern || show_non_matching)) + output_pattern(pathspec.items[i].original, pattern); + if (pattern) num_ignored++; } free(seen); @@ -177,7 +180,7 @@ int cmd_check_ignore(int argc, const char **argv, const char *prefix) if (!no_index && read_cache() < 0) die(_("index file corrupt")); - memset(&dir, 0, sizeof(dir)); + dir_init(&dir); setup_standard_excludes(&dir); if (stdin_paths) { @@ -187,7 +190,7 @@ int cmd_check_ignore(int argc, const char **argv, const char *prefix) maybe_flush_or_die(stdout, "ignore to stdout"); } - clear_directory(&dir); + dir_clear(&dir); return !num_ignored; } diff --git a/third_party/git/builtin/checkout-index.c b/third_party/git/builtin/checkout-index.c index 1ac1cc290e..a854fd16e7 100644 --- a/third_party/git/builtin/checkout-index.c +++ b/third_party/git/builtin/checkout-index.c @@ -177,9 +177,9 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) N_("write the content to temporary files")), OPT_STRING(0, "prefix", &state.base_dir, N_("string"), N_("when creating files, prepend <string>")), - { OPTION_CALLBACK, 0, "stage", NULL, "(1|2|3|all)", + OPT_CALLBACK_F(0, "stage", NULL, "(1|2|3|all)", N_("copy out the files from named stage"), - PARSE_OPT_NONEG, option_parse_stage }, + PARSE_OPT_NONEG, option_parse_stage), OPT_END() }; diff --git a/third_party/git/builtin/checkout.c b/third_party/git/builtin/checkout.c index 6123f732a2..0951f8fee5 100644 --- a/third_party/git/builtin/checkout.c +++ b/third_party/git/builtin/checkout.c @@ -70,6 +70,8 @@ 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; @@ -86,6 +88,19 @@ struct checkout_opts { struct tree *source_tree; }; +struct branch_info { + const char *name; /* The short name used */ + const char *path; /* The full name of a real branch */ + struct commit *commit; /* The named commit */ + char *refname; /* The full name of the ref being checked out. */ + struct object_id oid; /* The object ID of the commit being checked out. */ + /* + * if not null the branch is detached because it's already + * checked out in this checkout + */ + char *checkout; +}; + static int post_checkout_hook(struct commit *old_commit, struct commit *new_commit, int changed) { @@ -126,6 +141,7 @@ 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); @@ -223,6 +239,8 @@ static int checkout_merged(int pos, const struct checkout *state, int *nr_checko mmbuffer_t result_buf; struct object_id threeway[3]; unsigned mode = 0; + struct ll_merge_options ll_opts; + int renormalize = 0; memset(threeway, 0, sizeof(threeway)); while (pos < active_nr) { @@ -243,13 +261,12 @@ static int checkout_merged(int pos, const struct checkout *state, int *nr_checko read_mmblob(&ours, &threeway[1]); read_mmblob(&theirs, &threeway[2]); - /* - * NEEDSWORK: re-create conflicts from merges with - * merge.renormalize set, too - */ + memset(&ll_opts, 0, sizeof(ll_opts)); + git_config_get_bool("merge.renormalize", &renormalize); + ll_opts.renormalize = renormalize; status = ll_merge(&result_buf, path, &ancestor, "base", &ours, "ours", &theirs, "theirs", - state->istate, NULL); + state->istate, &ll_opts); free(ancestor.ptr); free(ours.ptr); free(theirs.ptr); @@ -334,7 +351,8 @@ static void mark_ce_for_checkout_no_overlay(struct cache_entry *ce, } } -static int checkout_worktree(const struct checkout_opts *opts) +static int checkout_worktree(const struct checkout_opts *opts, + const struct branch_info *info) { struct checkout state = CHECKOUT_INIT; int nr_checkouts = 0, nr_unmerged = 0; @@ -345,6 +363,10 @@ static int checkout_worktree(const struct checkout_opts *opts) state.refresh_cache = 1; state.istate = &the_index; + init_checkout_metadata(&state.meta, info->refname, + info->commit ? &info->commit->object.oid : &info->oid, + NULL); + enable_delayed_checkout(&state); for (pos = 0; pos < active_nr; pos++) { struct cache_entry *ce = active_cache[pos]; @@ -393,7 +415,7 @@ static int checkout_worktree(const struct checkout_opts *opts) } static int checkout_paths(const struct checkout_opts *opts, - const char *revision) + const struct branch_info *new_branch_info) { int pos; static char *ps_matched; @@ -459,7 +481,7 @@ static int checkout_paths(const struct checkout_opts *opts, else BUG("either flag must have been set, worktree=%d, index=%d", opts->checkout_worktree, opts->checkout_index); - return run_add_interactive(revision, patch_mode, &opts->pathspec); + return run_add_interactive(new_branch_info->name, patch_mode, &opts->pathspec); } repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR); @@ -520,7 +542,9 @@ 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); + errs |= checkout_worktree(opts, new_branch_info); + else + remove_marked_cache_entries(&the_index, 1); /* * Allow updating the index when checking out from the index. @@ -581,7 +605,8 @@ static void describe_detached_head(const char *msg, struct commit *commit) } static int reset_tree(struct tree *tree, const struct checkout_opts *o, - int worktree, int *writeout_error) + int worktree, int *writeout_error, + struct branch_info *info) { struct unpack_trees_options opts; struct tree_desc tree_desc; @@ -596,6 +621,9 @@ static int reset_tree(struct tree *tree, const struct checkout_opts *o, opts.verbose_update = o->show_progress; opts.src_index = &the_index; opts.dst_index = &the_index; + init_checkout_metadata(&opts.meta, info->refname, + info->commit ? &info->commit->object.oid : &null_oid, + NULL); parse_tree(tree); init_tree_desc(&tree_desc, tree->buffer, tree->size); switch (unpack_trees(1, &tree_desc, &opts)) { @@ -615,21 +643,17 @@ static int reset_tree(struct tree *tree, const struct checkout_opts *o, } } -struct branch_info { - const char *name; /* The short name used */ - const char *path; /* The full name of a real branch */ - struct commit *commit; /* The named commit */ - /* - * if not null the branch is detached because it's already - * checked out in this checkout - */ - char *checkout; -}; - static void setup_branch_path(struct branch_info *branch) { struct strbuf buf = STRBUF_INIT; + /* + * If this is a ref, resolve it; otherwise, look up the OID for our + * expression. Failure here is okay. + */ + if (!dwim_ref(branch->name, strlen(branch->name), &branch->oid, &branch->refname, 0)) + repo_get_oid_committish(the_repository, branch->name, &branch->oid); + strbuf_branchname(&buf, branch->name, INTERPRET_BRANCH_LOCAL); if (strcmp(buf.buf, branch->name)) branch->name = xstrdup(buf.buf); @@ -658,7 +682,7 @@ static int merge_working_tree(const struct checkout_opts *opts, } else new_tree = get_commit_tree(new_branch_info->commit); if (opts->discard_changes) { - ret = reset_tree(new_tree, opts, 1, writeout_error); + ret = reset_tree(new_tree, opts, 1, writeout_error, new_branch_info); if (ret) return ret; } else { @@ -687,6 +711,10 @@ static int merge_working_tree(const struct checkout_opts *opts, topts.quiet = opts->merge && old_branch_info->commit; topts.verbose_update = opts->show_progress; topts.fn = twoway_merge; + init_checkout_metadata(&topts.meta, new_branch_info->refname, + new_branch_info->commit ? + &new_branch_info->commit->object.oid : + &new_branch_info->oid, NULL); if (opts->overwrite_ignore) { topts.dir = xcalloc(1, sizeof(*topts.dir)); topts.dir->flags |= DIR_SHOW_IGNORED; @@ -708,11 +736,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; @@ -730,13 +758,6 @@ 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 */ /* @@ -751,36 +772,35 @@ static int merge_working_tree(const struct checkout_opts *opts, */ add_files_to_cache(NULL, NULL, 0); - /* - * NEEDSWORK: carrying over local changes - * when branches have different end-of-line - * normalization (or clean+smudge rules) is - * a pain; plumb in an option to set - * o.renormalize? - */ init_merge_options(&o, the_repository); o.verbosity = 0; - work = write_tree_from_memory(&o); + work = write_in_core_index_as_tree(the_repository); ret = reset_tree(new_tree, opts, 1, - writeout_error); + writeout_error, new_branch_info); 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, - &result); + old_tree); if (ret < 0) exit(128); ret = reset_tree(new_tree, opts, 0, - writeout_error); + writeout_error, new_branch_info); strbuf_release(&o.obuf); + strbuf_release(&old_commit_shortname); if (ret) return ret; } @@ -861,7 +881,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_insert(&msg, 0, reflog_msg, strlen(reflog_msg)); + strbuf_insertstr(&msg, 0, reflog_msg); if (!strcmp(new_branch_info->name, "HEAD") && !new_branch_info->path && !opts->force_detach) { /* Nothing to do. */ @@ -1100,8 +1120,10 @@ static void setup_new_branch_info_and_source_tree( if (!check_refname_format(new_branch_info->path, 0) && !read_ref(new_branch_info->path, &branch_rev)) oidcpy(rev, &branch_rev); - else + else { + free((char *)new_branch_info->path); new_branch_info->path = NULL; /* not an existing branch */ + } new_branch_info->commit = lookup_commit_reference_gently(the_repository, rev, 1); if (!new_branch_info->commit) { @@ -1113,12 +1135,43 @@ 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, - int *dwim_remotes_matched) + struct object_id *rev) { const char **new_branch = &opts->new_branch; int argcount = 0; @@ -1223,13 +1276,9 @@ static int parse_branchname_arg(int argc, const char **argv, recover_with_dwim = 0; if (recover_with_dwim) { - const char *remote = unique_tracking_name(arg, rev, - dwim_remotes_matched); + const char *remote = parse_remote_branch(arg, rev, + could_be_checkout_paths); 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) */ @@ -1296,7 +1345,7 @@ static void die_expecting_a_branch(const struct branch_info *branch_info) struct object_id oid; char *to_free; - if (dwim_ref(branch_info->name, strlen(branch_info->name), &oid, &to_free) == 1) { + if (dwim_ref(branch_info->name, strlen(branch_info->name), &oid, &to_free, 0) == 1) { const char *ref = to_free; if (skip_prefix(ref, "refs/tags/", &ref)) @@ -1431,9 +1480,9 @@ static struct option *add_common_options(struct checkout_opts *opts, { struct option options[] = { OPT__QUIET(&opts->quiet, N_("suppress progress reporting")), - { OPTION_CALLBACK, 0, "recurse-submodules", NULL, + OPT_CALLBACK_F(0, "recurse-submodules", NULL, "checkout", "control recursive updating of submodules", - PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater }, + PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater), OPT_BOOL(0, "progress", &opts->show_progress, N_("force progress reporting")), OPT_BOOL('m', "merge", &opts->merge, N_("perform a 3-way merge with the new branch")), OPT_STRING(0, "conflict", &opts->conflict_style, N_("style"), @@ -1480,6 +1529,8 @@ 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); @@ -1487,12 +1538,14 @@ static struct option *add_checkout_path_options(struct checkout_opts *opts, return newopts; } +/* create-branch option (either b or c) */ +static char cb_option = 'b'; + static int checkout_main(int argc, const char **argv, const char *prefix, struct checkout_opts *opts, struct option *options, 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)); @@ -1530,7 +1583,8 @@ static int checkout_main(int argc, const char **argv, const char *prefix, } if ((!!opts->new_branch + !!opts->new_branch_force + !!opts->new_orphan_branch) > 1) - die(_("-b, -B and --orphan are mutually exclusive")); + die(_("-%c, -%c and --orphan are mutually exclusive"), + cb_option, toupper(cb_option)); if (opts->overlay_mode == 1 && opts->patch_mode) die(_("-p and --overlay are mutually exclusive")); @@ -1549,16 +1603,16 @@ static int checkout_main(int argc, const char **argv, const char *prefix, if (opts->checkout_index < 0 || opts->checkout_worktree < 0) BUG("these flags should be non-negative by now"); /* - * convenient shortcut: "git restore --staged" equals - * "git restore --staged --source HEAD" + * convenient shortcut: "git restore --staged [--worktree]" equals + * "git restore --staged [--worktree] --source HEAD" */ - if (!opts->from_treeish && opts->checkout_index && !opts->checkout_worktree) + if (!opts->from_treeish && opts->checkout_index) opts->from_treeish = "HEAD"; /* * From here on, new_branch will contain the branch to be checked out, * and new_branch_force and new_orphan_branch will tell us which one of - * -b/-B/--orphan is being used. + * -b/-B/-c/-C/--orphan is being used. */ if (opts->new_branch_force) opts->new_branch = opts->new_branch_force; @@ -1566,7 +1620,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix, if (opts->new_orphan_branch) opts->new_branch = opts->new_orphan_branch; - /* --track without -b/-B/--orphan should DWIM */ + /* --track without -c/-C/-b/-B/--orphan should DWIM */ if (opts->track != BRANCH_TRACK_UNSPECIFIED && !opts->new_branch) { const char *argv0 = argv[0]; if (!argc || !strcmp(argv0, "--")) @@ -1575,7 +1629,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix, skip_prefix(argv0, "remotes/", &argv0); argv0 = strchr(argv0, '/'); if (!argv0 || !argv0[1]) - die(_("missing branch name; try -b")); + die(_("missing branch name; try -%c"), cb_option); opts->new_branch = argv0 + 1; } @@ -1600,8 +1654,7 @@ 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, - &dwim_remotes_matched); + &new_branch_info, opts, &rev); argv += n; argc -= n; } else if (!opts->accept_ref && opts->from_treeish) { @@ -1618,10 +1671,6 @@ 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, @@ -1634,17 +1683,42 @@ static int checkout_main(int argc, const char **argv, const char *prefix, * Try to give more helpful suggestion. * new_branch && argc > 1 will be caught later. */ - if (opts->new_branch && argc == 1) + if (opts->new_branch && argc == 1 && !new_branch_info.commit) die(_("'%s' is not a commit and a branch '%s' cannot be created from it"), argv[0], opts->new_branch); 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")); + } + + opts->pathspec.recursive = 1; + + 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) { @@ -1659,28 +1733,10 @@ static int checkout_main(int argc, const char **argv, const char *prefix, } UNLEAK(opts); - 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 { + if (opts->patch_mode || opts->pathspec.nr) + return checkout_paths(opts, &new_branch_info); + else return checkout_branch(opts, &new_branch_info); - } } int cmd_checkout(int argc, const char **argv, const char *prefix) @@ -1714,6 +1770,15 @@ 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); @@ -1757,6 +1822,8 @@ int cmd_switch(int argc, const char **argv, const char *prefix) options = add_common_options(&opts, options); options = add_common_switch_branch_options(&opts, options); + cb_option = 'c'; + ret = checkout_main(argc, argv, prefix, &opts, options, switch_branch_usage); FREE_AND_NULL(options); diff --git a/third_party/git/builtin/clean.c b/third_party/git/builtin/clean.c index d5579da716..687ab473c2 100644 --- a/third_party/git/builtin/clean.c +++ b/third_party/git/builtin/clean.c @@ -18,6 +18,7 @@ #include "color.h" #include "pathspec.h" #include "help.h" +#include "prompt.h" static int force = -1; /* unset */ static int interactive; @@ -158,9 +159,10 @@ 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); + quote_path(path->buf, prefix, "ed, 0); printf(dry_run ? _(msg_would_skip_git_dir) : _(msg_skip_git_dir), quoted.buf); } @@ -175,7 +177,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag, res = dry_run ? 0 : rmdir(path->buf); if (res) { int saved_errno = errno; - quote_path_relative(path->buf, prefix, "ed); + quote_path(path->buf, prefix, "ed, 0); errno = saved_errno; warning_errno(_(msg_warn_remove_failed), quoted.buf); *dir_gone = 0; @@ -200,7 +202,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag, if (remove_dirs(path, prefix, force_flag, dry_run, quiet, &gone)) ret = 1; if (gone) { - quote_path_relative(path->buf, prefix, "ed); + quote_path(path->buf, prefix, "ed, 0); string_list_append(&dels, quoted.buf); } else *dir_gone = 0; @@ -208,11 +210,11 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag, } else { res = dry_run ? 0 : unlink(path->buf); if (!res) { - quote_path_relative(path->buf, prefix, "ed); + quote_path(path->buf, prefix, "ed, 0); string_list_append(&dels, quoted.buf); } else { int saved_errno = errno; - quote_path_relative(path->buf, prefix, "ed); + quote_path(path->buf, prefix, "ed, 0); errno = saved_errno; warning_errno(_(msg_warn_remove_failed), quoted.buf); *dir_gone = 0; @@ -236,7 +238,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag, *dir_gone = 1; else { int saved_errno = errno; - quote_path_relative(path->buf, prefix, "ed); + quote_path(path->buf, prefix, "ed, 0); errno = saved_errno; warning_errno(_(msg_warn_remove_failed), quoted.buf); *dir_gone = 0; @@ -264,7 +266,7 @@ static void pretty_print_dels(void) struct column_options copts; for_each_string_list_item(item, &del_list) { - qname = quote_path_relative(item->string, NULL, &buf); + qname = quote_path(item->string, NULL, &buf, 0); string_list_append(&list, qname); } @@ -419,7 +421,6 @@ static int find_unique(const char *choice, struct menu_stuff *menu_stuff) return found; } - /* * Parse user input, and return choice(s) for menu (menu_stuff). * @@ -579,9 +580,7 @@ static int *list_and_choose(struct menu_opts *opts, struct menu_stuff *stuff) clean_get_color(CLEAN_COLOR_RESET)); } - if (strbuf_getline_lf(&choice, stdin) != EOF) { - strbuf_trim(&choice); - } else { + if (git_read_line_interactively(&choice) == EOF) { eof = 1; break; } @@ -648,7 +647,7 @@ static int filter_by_patterns_cmd(void) struct strbuf confirm = STRBUF_INIT; struct strbuf **ignore_list; struct string_list_item *item; - struct exclude_list *el; + struct pattern_list *pl; int changed = -1, i; for (;;) { @@ -661,17 +660,15 @@ static int filter_by_patterns_cmd(void) clean_print_color(CLEAN_COLOR_PROMPT); printf(_("Input ignore patterns>> ")); clean_print_color(CLEAN_COLOR_RESET); - if (strbuf_getline_lf(&confirm, stdin) != EOF) - strbuf_trim(&confirm); - else + if (git_read_line_interactively(&confirm) == EOF) putchar('\n'); /* quit filter_by_pattern mode if press ENTER or Ctrl-D */ if (!confirm.len) break; - memset(&dir, 0, sizeof(dir)); - el = add_exclude_list(&dir, EXC_CMDL, "manual exclude"); + dir_init(&dir); + pl = add_pattern_list(&dir, EXC_CMDL, "manual exclude"); ignore_list = strbuf_split_max(&confirm, ' ', 0); for (i = 0; ignore_list[i]; i++) { @@ -679,7 +676,7 @@ static int filter_by_patterns_cmd(void) if (!ignore_list[i]->len) continue; - add_exclude(ignore_list[i]->buf, "", 0, el, -(i+1)); + add_pattern(ignore_list[i]->buf, "", 0, pl, -(i+1)); } changed = 0; @@ -701,7 +698,7 @@ static int filter_by_patterns_cmd(void) } strbuf_list_free(ignore_list); - clear_directory(&dir); + dir_clear(&dir); } strbuf_release(&confirm); @@ -756,12 +753,10 @@ static int ask_each_cmd(void) for_each_string_list_item(item, &del_list) { /* Ctrl-D should stop removing files */ if (!eof) { - qname = quote_path_relative(item->string, NULL, &buf); + qname = quote_path(item->string, NULL, &buf, 0); /* TRANSLATORS: Make sure to keep [y/N] as is */ printf(_("Remove %s [y/N]? "), qname); - if (strbuf_getline_lf(&confirm, stdin) != EOF) { - strbuf_trim(&confirm); - } else { + if (git_read_line_interactively(&confirm) == EOF) { putchar('\n'); eof = 1; } @@ -901,7 +896,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 exclude_list *el; + struct pattern_list *pl; struct string_list_item *item; const char *qname; struct option options[] = { @@ -911,8 +906,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix) OPT_BOOL('i', "interactive", &interactive, N_("interactive cleaning")), OPT_BOOL('d', NULL, &remove_directories, N_("remove whole directories")), - { OPTION_CALLBACK, 'e', "exclude", &exclude_list, N_("pattern"), - N_("add <pattern> to ignore rules"), PARSE_OPT_NONEG, exclude_cb }, + OPT_CALLBACK_F('e', "exclude", &exclude_list, N_("pattern"), + N_("add <pattern> to ignore rules"), PARSE_OPT_NONEG, exclude_cb), OPT_BOOL('x', NULL, &ignored, N_("remove ignored files, too")), OPT_BOOL('X', NULL, &ignored_only, N_("remove only ignored files")), @@ -928,13 +923,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, builtin_clean_usage, 0); - memset(&dir, 0, sizeof(dir)); - if (ignored_only) - dir.flags |= DIR_SHOW_IGNORED; - - if (ignored && ignored_only) - die(_("-x and -X cannot be used together")); - + dir_init(&dir); if (!interactive && !dry_run && !force) { if (config_set) die(_("clean.requireForce set to true and neither -i, -n, nor -f given; " @@ -946,21 +935,64 @@ 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 (remove_directories) - dir.flags |= DIR_SHOW_IGNORED_TOO | DIR_KEEP_UNTRACKED_CONTENTS; + if (ignored && ignored_only) + die(_("-x and -X cannot be used together")); + if (!ignored) + setup_standard_excludes(&dir); + if (ignored_only) + dir.flags |= DIR_SHOW_IGNORED; + + if (argc) { + /* + * Remaining args implies pathspecs specified, and we should + * recurse within those. + */ + remove_directories = 1; + } + + if (remove_directories && !ignored_only) { + /* + * We need to know about ignored files too: + * + * If (ignored), then we will delete ignored files as well. + * + * If (!ignored), then even though we not are doing + * anything with ignored files, we need to know about them + * so that we can avoid deleting a directory of untracked + * files that also contains an ignored file within it. + * + * For the (!ignored) case, since we only need to avoid + * deleting ignored files, we can set + * DIR_SHOW_IGNORED_TOO_MODE_MATCHING in order to avoid + * recursing into a directory which is itself ignored. + */ + dir.flags |= DIR_SHOW_IGNORED_TOO; + if (!ignored) + dir.flags |= DIR_SHOW_IGNORED_TOO_MODE_MATCHING; + + /* + * Let the fill_directory() machinery know that we aren't + * just recursing to collect the ignored files; we want all + * the untracked ones so that we can delete them. (Note: + * we could also set DIR_KEEP_UNTRACKED_CONTENTS when + * ignored_only is true, since DIR_KEEP_UNTRACKED_CONTENTS + * only has effect in combination with DIR_SHOW_IGNORED_TOO. It makes + * the code clearer to exclude it, though. + */ + dir.flags |= DIR_KEEP_UNTRACKED_CONTENTS; + } if (read_cache() < 0) die(_("index file corrupt")); - if (!ignored) - setup_standard_excludes(&dir); - - el = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); + pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option"); for (i = 0; i < exclude_list.nr; i++) - add_exclude(exclude_list.items[i].string, "", 0, el, -(i+1)); + add_pattern(exclude_list.items[i].string, "", 0, pl, -(i+1)); parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD, @@ -978,12 +1010,6 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (!cache_name_is_other(ent->name, ent->len)) continue; - if (pathspec.nr) - matches = dir_path_match(&the_index, ent, &pathspec, 0, NULL); - - if (pathspec.nr && !matches) - continue; - if (lstat(ent->name, &st)) die_errno("Cannot lstat '%s'", ent->name); @@ -995,11 +1021,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) string_list_append(&del_list, rel); } - for (i = 0; i < dir.nr; i++) - free(dir.entries[i]); - - for (i = 0; i < dir.ignored_nr; i++) - free(dir.ignored[i]); + dir_clear(&dir); if (interactive && del_list.nr > 0) interactive_main_loop(); @@ -1007,6 +1029,7 @@ 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); @@ -1024,23 +1047,22 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (remove_dirs(&abs_path, prefix, rm_flags, dry_run, quiet, &gone)) errors++; if (gone && !quiet) { - qname = quote_path_relative(item->string, NULL, &buf); + qname = quote_path(item->string, NULL, &buf, 0); printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname); } } else { res = dry_run ? 0 : unlink(abs_path.buf); if (res) { int saved_errno = errno; - qname = quote_path_relative(item->string, NULL, &buf); + qname = quote_path(item->string, NULL, &buf, 0); errno = saved_errno; warning_errno(_(msg_warn_remove_failed), qname); errors++; } else if (!quiet) { - qname = quote_path_relative(item->string, NULL, &buf); + qname = quote_path(item->string, NULL, &buf, 0); 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 f665b28ccc..391aa41075 100644 --- a/third_party/git/builtin/clone.c +++ b/third_party/git/builtin/clone.c @@ -32,7 +32,6 @@ #include "connected.h" #include "packfile.h" #include "list-objects-filter-options.h" -#include "object-store.h" /* * Overall FIXMEs: @@ -60,6 +59,7 @@ 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; @@ -102,10 +102,10 @@ static struct option builtin_clone_options[] = { N_("don't use local hardlinks, always copy")), OPT_BOOL('s', "shared", &option_shared, N_("setup as shared repository")), - OPT_ALIAS(0, "recursive", "recurse-submodules"), { OPTION_CALLBACK, 0, "recurse-submodules", &option_recurse_submodules, N_("pathspec"), N_("initialize submodules in the clone"), PARSE_OPT_OPTARG, recurse_submodules_cb, (intptr_t)"." }, + OPT_ALIAS(0, "recursive", "recurse-submodules"), OPT_INTEGER('j', "jobs", &max_jobs, N_("number of submodules cloned in parallel")), OPT_STRING(0, "template", &option_template, N_("template-directory"), @@ -147,6 +147,8 @@ 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() }; @@ -418,6 +420,7 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest, struct dir_iterator *iter; int iter_status; unsigned int flags; + struct strbuf realpath = STRBUF_INIT; mkdir_if_missing(dest->buf, 0777); @@ -452,7 +455,8 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest, if (unlink(dest->buf) && errno != ENOENT) die_errno(_("failed to unlink '%s'"), dest->buf); if (!option_no_hardlinks) { - if (!link(real_path(src->buf), dest->buf)) + strbuf_realpath(&realpath, src->buf, 1); + if (!link(realpath.buf, dest->buf)) continue; if (option_local > 0) die_errno(_("failed to create link '%s'"), dest->buf); @@ -466,6 +470,8 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest, strbuf_setlen(src, src_len); die(_("failed to iterate over '%s'"), src->buf); } + + strbuf_release(&realpath); } static void clone_local(const char *src_repo, const char *dest_repo) @@ -637,7 +643,9 @@ static void write_followtags(const struct ref *refs, const char *msg) continue; if (ends_with(ref->name, "^{}")) continue; - if (!has_object_file(&ref->old_oid)) + if (!has_object_file_with_flags(&ref->old_oid, + OBJECT_INFO_QUICK | + OBJECT_INFO_SKIP_FETCH_OBJECT)) continue; update_ref(msg, ref->name, &ref->old_oid, NULL, 0, UPDATE_REFS_DIE_ON_ERR); @@ -670,8 +678,7 @@ static void update_remote_refs(const struct ref *refs, const char *branch_top, const char *msg, struct transport *transport, - int check_connectivity, - int check_refs_only) + int check_connectivity) { const struct ref *rm = mapped_refs; @@ -680,7 +687,6 @@ static void update_remote_refs(const struct ref *refs, opt.transport = transport; opt.progress = transport->progress; - opt.check_refs_only = !!check_refs_only; if (check_connected(iterate_ref_map, &rm, &opt)) die(_("remote did not send all necessary objects")); @@ -734,6 +740,27 @@ static void update_head(const struct ref *our, const struct ref *remote, } } +static int git_sparse_checkout_init(const char *repo) +{ + struct strvec argv = STRVEC_INIT; + int result = 0; + strvec_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.v, RUN_GIT_CMD)) { + error(_("failed to initialize sparse-checkout")); + result = 1; + } + + strvec_clear(&argv); + return result; +} + static int checkout(int submodule_progress) { struct object_id oid; @@ -756,11 +783,11 @@ static int checkout(int submodule_progress) if (!strcmp(head, "HEAD")) { if (advice_detached_head) detach_advice(oid_to_hex(&oid)); + FREE_AND_NULL(head); } else { if (!starts_with(head, "refs/heads/")) die(_("HEAD not found below refs/heads!")); } - free(head); /* We need to be in the new work tree for the checkout */ setup_work_tree(); @@ -775,6 +802,7 @@ static int checkout(int submodule_progress) opts.verbose_update = (option_verbosity >= 0); opts.src_index = &the_index; opts.dst_index = &the_index; + init_checkout_metadata(&opts.meta, head, &oid, NULL); tree = parse_tree_indirect(&oid); parse_tree(tree); @@ -782,35 +810,42 @@ static int checkout(int submodule_progress) if (unpack_trees(1, &t, &opts) < 0) die(_("unable to checkout working tree")); + free(head); + if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) die(_("unable to write new index file")); - err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1), + err |= run_hook_le(NULL, "post-checkout", oid_to_hex(&null_oid), 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", "--init", "--recursive", NULL); + struct strvec args = STRVEC_INIT; + strvec_pushl(&args, "submodule", "update", "--require-init", "--recursive", NULL); if (option_shallow_submodules == 1) - argv_array_push(&args, "--depth=1"); + strvec_push(&args, "--depth=1"); if (max_jobs != -1) - argv_array_pushf(&args, "--jobs=%d", max_jobs); + strvec_pushf(&args, "--jobs=%d", max_jobs); if (submodule_progress) - argv_array_push(&args, "--progress"); + strvec_push(&args, "--progress"); if (option_verbosity < 0) - argv_array_push(&args, "--quiet"); + strvec_push(&args, "--quiet"); if (option_remote_submodules) { - argv_array_push(&args, "--remote"); - argv_array_push(&args, "--no-fetch"); + strvec_push(&args, "--remote"); + strvec_push(&args, "--no-fetch"); } - err = run_command_v_opt(args.argv, RUN_GIT_CMD); - argv_array_clear(&args); + if (option_single_branch >= 0) + strvec_push(&args, option_single_branch ? + "--single-branch" : + "--no-single-branch"); + + err = run_command_v_opt(args.v, RUN_GIT_CMD); + strvec_clear(&args); } return err; @@ -900,7 +935,7 @@ static void dissociate_from_references(void) free(alternates); } -static int dir_exists(const char *path) +static int path_exists(const char *path) { struct stat sb; return !stat(path, &sb); @@ -910,15 +945,14 @@ int cmd_clone(int argc, const char **argv, const char *prefix) { int is_bundle = 0, is_local; const char *repo_name, *repo, *work_tree, *git_dir; - char *path, *dir; - int dest_exists; + char *path, *dir, *display_repo = NULL; + int dest_exists, real_dest_exists = 0; const struct ref *refs, *remote_head; const struct ref *remote_head_points_at; const struct ref *our_head_points_at; struct ref *mapped_refs; const struct ref *ref; struct strbuf key = STRBUF_INIT; - struct strbuf default_refspec = STRBUF_INIT; struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT; struct transport *transport = NULL; const char *src_ref_prefix = "refs/heads/"; @@ -926,9 +960,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) int err = 0, complete_refs_before_fetch = 1; int submodule_progress; - struct argv_array ref_prefixes = ARGV_ARRAY_INIT; - - fetch_if_missing = 0; + struct strvec ref_prefixes = STRVEC_INIT; packet_trace_identity("clone"); argc = parse_options(argc, argv, prefix, builtin_clone_options, @@ -967,10 +999,11 @@ int cmd_clone(int argc, const char **argv, const char *prefix) path = get_repo_path(repo_name, &is_bundle); if (path) repo = absolute_pathdup(repo_name); - else if (!strchr(repo_name, ':')) - die(_("repository '%s' does not exist"), repo_name); - else + else if (strchr(repo_name, ':')) { repo = repo_name; + display_repo = transport_anonymize_url(repo); + } else + die(_("repository '%s' does not exist"), repo_name); /* no need to be strict, transport_set_option() will validate it again */ if (option_depth && atoi(option_depth) < 1) @@ -982,18 +1015,28 @@ 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 = dir_exists(dir); + dest_exists = path_exists(dir); if (dest_exists && !is_empty_dir(dir)) die(_("destination path '%s' already exists and is not " "an empty directory."), dir); - strbuf_addf(&reflog_msg, "clone: from %s", repo); + if (real_git_dir) { + real_dest_exists = path_exists(real_git_dir); + if (real_dest_exists && !is_empty_dir(real_git_dir)) + die(_("repository path '%s' already exists and is not " + "an empty directory."), real_git_dir); + } + + + strbuf_addf(&reflog_msg, "clone: from %s", + display_repo ? display_repo : repo); + free(display_repo); if (option_bare) work_tree = NULL; else { work_tree = getenv("GIT_WORK_TREE"); - if (work_tree && dir_exists(work_tree)) + if (work_tree && path_exists(work_tree)) die(_("working tree '%s' already exists."), work_tree); } @@ -1021,7 +1064,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) } if (real_git_dir) { - if (dir_exists(real_git_dir)) + if (real_dest_exists) junk_git_dir_flags |= REMOVE_DIR_KEEP_TOPLEVEL; junk_git_dir = real_git_dir; } else { @@ -1075,7 +1118,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix) } } - init_db(git_dir, real_git_dir, option_template, INIT_DB_QUIET); + init_db(git_dir, real_git_dir, option_template, GIT_HASH_UNKNOWN, NULL, + INIT_DB_QUIET); if (real_git_dir) git_dir = real_git_dir; @@ -1107,11 +1151,13 @@ 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, - branch_top.buf); - refspec_append(&remote->fetch, default_refspec.buf); + refspec_appendf(&remote->fetch, "+%s*:%s*", src_ref_prefix, + branch_top.buf); transport = transport_get(remote, remote->url[0]); transport_set_verbosity(transport, option_verbosity, option_progress); @@ -1160,29 +1206,36 @@ int cmd_clone(int argc, const char **argv, const char *prefix) transport->server_options = &server_options; if (filter_options.choice) { - struct strbuf expanded_filter_spec = STRBUF_INIT; - expand_list_objects_filter_spec(&filter_options, - &expanded_filter_spec); + const char *spec = + expand_list_objects_filter_spec(&filter_options); transport_set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, - expanded_filter_spec.buf); + spec); transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1"); - strbuf_release(&expanded_filter_spec); } if (transport->smart_options && !deepen && !filter_options.choice) transport->smart_options->check_self_contained_and_connected = 1; - argv_array_push(&ref_prefixes, "HEAD"); + strvec_push(&ref_prefixes, "HEAD"); refspec_ref_prefixes(&remote->fetch, &ref_prefixes); if (option_branch) expand_ref_prefix(&ref_prefixes, option_branch); if (!option_no_tags) - argv_array_push(&ref_prefixes, "refs/tags/"); + strvec_push(&ref_prefixes, "refs/tags/"); refs = transport_get_remote_refs(transport, &ref_prefixes); if (refs) { + int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport)); + + /* + * Now that we know what algorithm the remote side is using, + * let's set ours to the same thing. + */ + initialize_repository_version(hash_algo, 1); + repo_set_hash_algo(the_repository, hash_algo); + mapped_refs = wanted_peer_refs(refs, &remote->fetch); /* * transport_get_remote_refs() may return refs with null sha-1 @@ -1229,9 +1282,13 @@ int cmd_clone(int argc, const char **argv, const char *prefix) remote_head_points_at = NULL; remote_head = NULL; option_no_checkout = 1; - if (!option_bare) - install_branch_config(0, "master", option_origin, - "refs/heads/master"); + if (!option_bare) { + const char *branch = git_default_branch_name(); + char *ref = xstrfmt("refs/heads/%s", branch); + + install_branch_config(0, branch, option_origin, ref); + free(ref); + } } write_refspec_config(src_ref_prefix, our_head_points_at, @@ -1247,7 +1304,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) update_remote_refs(refs, mapped_refs, remote_head_points_at, branch_top.buf, reflog_msg.buf, transport, - !is_local, filter_options.choice); + !is_local); update_head(our_head_points_at, remote_head, reflog_msg.buf); @@ -1268,15 +1325,13 @@ 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); strbuf_release(&branch_top); strbuf_release(&key); - strbuf_release(&default_refspec); junk_mode = JUNK_LEAVE_ALL; - argv_array_clear(&ref_prefixes); + strvec_clear(&ref_prefixes); return err; } diff --git a/third_party/git/builtin/commit-graph.c b/third_party/git/builtin/commit-graph.c index 38027b83d9..78fa08f43a 100644 --- a/third_party/git/builtin/commit-graph.c +++ b/third_party/git/builtin/commit-graph.c @@ -6,27 +6,28 @@ #include "repository.h" #include "commit-graph.h" #include "object-store.h" +#include "progress.h" +#include "tag.h" static char const * const builtin_commit_graph_usage[] = { - 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>"), + N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"), + N_("git commit-graph write [--object-dir <objdir>] [--append] " + "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] " + "[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] " + "<split options>"), NULL }; static const char * const builtin_commit_graph_verify_usage[] = { - 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>]"), + N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"), 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] <split options>"), + N_("git commit-graph write [--object-dir <objdir>] [--append] " + "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] " + "[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] " + "<split options>"), NULL }; @@ -38,11 +39,36 @@ static struct opts_commit_graph { int append; int split; int shallow; + int progress; + int enable_changed_paths; } 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); + struct strbuf odb_path_real = STRBUF_INIT; + + prepare_alt_odb(r); + for (odb = r->objects->odb; odb; odb = odb->next) { + strbuf_realpath(&odb_path_real, odb->path, 1); + if (!strcmp(obj_dir_real, odb_path_real.buf)) + break; + } + + free(obj_dir_real); + strbuf_release(&odb_path_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; @@ -55,9 +81,13 @@ 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); @@ -66,8 +96,11 @@ 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; - graph_name = get_commit_graph_filename(opts.obj_dir); + odb = find_odb(the_repository, opts.obj_dir); + graph_name = get_commit_graph_filename(odb); open_ok = open_commit_graph(graph_name, &fd, &st); if (!open_ok && errno != ENOENT) die_errno(_("Could not open commit-graph '%s'"), graph_name); @@ -75,9 +108,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); - else - graph = read_commit_graph_one(the_repository, opts.obj_dir); + graph = load_commit_graph_one_fd_st(the_repository, fd, &st, odb); + else + graph = read_commit_graph_one(the_repository, odb); /* Return failure if open_ok predicted success */ if (!graph) @@ -87,74 +120,90 @@ 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) +extern int read_replace_refs; +static struct commit_graph_opts write_opts; + +static int write_option_parse_split(const struct option *opt, const char *arg, + int unset) { - struct commit_graph *graph = NULL; - char *graph_name; - int open_ok; - int fd; - struct stat st; + enum commit_graph_split_flags *flags = opt->value; - 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(), - }; + BUG_ON_OPT_NEG(unset); - argc = parse_options(argc, argv, NULL, - builtin_commit_graph_read_options, - builtin_commit_graph_read_usage, 0); + opts.split = 1; + if (!arg) + return 0; - if (!opts.obj_dir) - opts.obj_dir = get_object_directory(); + if (!strcmp(arg, "no-merge")) + *flags = COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED; + else if (!strcmp(arg, "replace")) + *flags = COMMIT_GRAPH_SPLIT_REPLACE; + else + die(_("unrecognized --split argument, %s"), arg); - graph_name = get_commit_graph_filename(opts.obj_dir); + return 0; +} - open_ok = open_commit_graph(graph_name, &fd, &st); - if (!open_ok) - die_errno(_("Could not open commit-graph '%s'"), graph_name); +static int read_one_commit(struct oidset *commits, struct progress *progress, + const char *hash) +{ + struct object *result; + struct object_id oid; + const char *end; - graph = load_commit_graph_one_fd_st(fd, &st); - if (!graph) - return 1; + if (parse_oid_hex(hash, &oid, &end)) + return error(_("unexpected non-hex object ID: %s"), hash); - FREE_AND_NULL(graph_name); + result = deref_tag(the_repository, parse_object(the_repository, &oid), + NULL, 0); + if (!result) + return error(_("invalid object: %s"), hash); + else if (object_as_type(result, OBJ_COMMIT, 1)) + oidset_insert(commits, &result->oid); - 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"); + display_progress(progress, oidset_size(commits)); - UNLEAK(graph); + return 0; +} +static int write_option_max_new_filters(const struct option *opt, + const char *arg, + int unset) +{ + int *to = opt->value; + if (unset) + *to = -1; + else { + const char *s; + *to = strtol(arg, (char **)&s, 10); + if (*s) + return error(_("%s expects a numerical value"), + optname(opt, opt->flags)); + } return 0; } -extern int read_replace_refs; -static struct split_commit_graph_opts split_opts; +static int git_commit_graph_write_config(const char *var, const char *value, + void *cb) +{ + if (!strcmp(var, "commitgraph.maxnewfilters")) + write_opts.max_new_filters = git_config_int(var, value); + /* + * No need to fall-back to 'git_default_config', since this was already + * called in 'cmd_commit_graph()'. + */ + return 0; +} static int graph_write(int argc, const char **argv) { - struct string_list *pack_indexes = NULL; - struct string_list *commit_hex = NULL; - struct string_list lines; + struct string_list pack_indexes = STRING_LIST_INIT_NODUP; + struct strbuf buf = STRBUF_INIT; + struct oidset commits = OIDSET_INIT; + struct object_directory *odb = NULL; int result = 0; - unsigned int flags = COMMIT_GRAPH_PROGRESS; + enum commit_graph_write_flags flags = 0; + struct progress *progress = NULL; static struct option builtin_commit_graph_write_options[] = { OPT_STRING(0, "object-dir", &opts.obj_dir, @@ -168,20 +217,35 @@ 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, "split", &opts.split, - N_("allow writing an incremental commit-graph file")), - OPT_INTEGER(0, "max-commits", &split_opts.max_commits, + OPT_BOOL(0, "changed-paths", &opts.enable_changed_paths, + N_("enable computation for changed paths")), + OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")), + OPT_CALLBACK_F(0, "split", &write_opts.split_flags, NULL, + N_("allow writing an incremental commit-graph file"), + PARSE_OPT_OPTARG | PARSE_OPT_NONEG, + write_option_parse_split), + OPT_INTEGER(0, "max-commits", &write_opts.max_commits, N_("maximum number of commits in a non-base split commit-graph")), - OPT_INTEGER(0, "size-multiple", &split_opts.size_multiple, + OPT_INTEGER(0, "size-multiple", &write_opts.size_multiple, N_("maximum ratio between two levels of a split commit-graph")), - OPT_EXPIRY_DATE(0, "expire-time", &split_opts.expire_time, - N_("maximum number of commits in a non-base split commit-graph")), + OPT_EXPIRY_DATE(0, "expire-time", &write_opts.expire_time, + N_("only expire files older than a given date-time")), + OPT_CALLBACK_F(0, "max-new-filters", &write_opts.max_new_filters, + NULL, N_("maximum number of changed-path Bloom filters to compute"), + 0, write_option_max_new_filters), OPT_END(), }; - split_opts.size_multiple = 2; - split_opts.max_commits = 0; - split_opts.expire_time = 0; + opts.progress = isatty(2); + opts.enable_changed_paths = -1; + write_opts.size_multiple = 2; + write_opts.max_commits = 0; + write_opts.expire_time = 0; + write_opts.max_new_filters = -1; + + trace2_cmd_mode("write"); + + git_config(git_commit_graph_write_config, &opts); argc = parse_options(argc, argv, NULL, builtin_commit_graph_write_options, @@ -192,41 +256,56 @@ 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_APPEND; + flags |= COMMIT_GRAPH_WRITE_APPEND; if (opts.split) - flags |= COMMIT_GRAPH_SPLIT; + flags |= COMMIT_GRAPH_WRITE_SPLIT; + if (opts.progress) + flags |= COMMIT_GRAPH_WRITE_PROGRESS; + if (!opts.enable_changed_paths) + flags |= COMMIT_GRAPH_NO_WRITE_BLOOM_FILTERS; + if (opts.enable_changed_paths == 1 || + git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0)) + flags |= COMMIT_GRAPH_WRITE_BLOOM_FILTERS; read_replace_refs = 0; + odb = find_odb(the_repository, opts.obj_dir); if (opts.reachable) { - if (write_commit_graph_reachable(opts.obj_dir, flags, &split_opts)) + if (write_commit_graph_reachable(odb, flags, &write_opts)) return 1; return 0; } - string_list_init(&lines, 0); - if (opts.stdin_packs || opts.stdin_commits) { - struct strbuf buf = STRBUF_INIT; - + if (opts.stdin_packs) { while (strbuf_getline(&buf, stdin) != EOF) - string_list_append(&lines, strbuf_detach(&buf, NULL)); - - if (opts.stdin_packs) - pack_indexes = &lines; - if (opts.stdin_commits) - commit_hex = &lines; - - UNLEAK(buf); + string_list_append(&pack_indexes, + strbuf_detach(&buf, NULL)); + } else if (opts.stdin_commits) { + oidset_init(&commits, 0); + if (opts.progress) + progress = start_delayed_progress( + _("Collecting commits from input"), 0); + + while (strbuf_getline(&buf, stdin) != EOF) { + if (read_one_commit(&commits, progress, buf.buf)) { + result = 1; + goto cleanup; + } + } + + stop_progress(&progress); } - if (write_commit_graph(opts.obj_dir, - pack_indexes, - commit_hex, + if (write_commit_graph(odb, + opts.stdin_packs ? &pack_indexes : NULL, + opts.stdin_commits ? &commits : NULL, flags, - &split_opts)) + &write_opts)) result = 1; - UNLEAK(lines); +cleanup: + string_list_clear(&pack_indexes, 0); + strbuf_release(&buf); return result; } @@ -249,9 +328,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-tree.c b/third_party/git/builtin/commit-tree.c index b866d83951..1031b9a491 100644 --- a/third_party/git/builtin/commit-tree.c +++ b/third_party/git/builtin/commit-tree.c @@ -108,15 +108,15 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix) struct object_id commit_oid; struct option options[] = { - { OPTION_CALLBACK, 'p', NULL, &parents, N_("parent"), + OPT_CALLBACK_F('p', NULL, &parents, N_("parent"), N_("id of a parent commit object"), PARSE_OPT_NONEG, - parse_parent_arg_callback }, - { OPTION_CALLBACK, 'm', NULL, &buffer, N_("message"), + parse_parent_arg_callback), + OPT_CALLBACK_F('m', NULL, &buffer, N_("message"), N_("commit message"), PARSE_OPT_NONEG, - parse_message_arg_callback }, - { OPTION_CALLBACK, 'F', NULL, &buffer, N_("file"), + parse_message_arg_callback), + OPT_CALLBACK_F('F', NULL, &buffer, N_("file"), N_("read commit log message from file"), PARSE_OPT_NONEG, - parse_file_arg_callback }, + parse_file_arg_callback), { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"), N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, OPT_END() diff --git a/third_party/git/builtin/commit.c b/third_party/git/builtin/commit.c index ae7aaf6dc6..1dfd799ec5 100644 --- a/third_party/git/builtin/commit.c +++ b/third_party/git/builtin/commit.c @@ -59,6 +59,9 @@ N_("The previous cherry-pick is now empty, possibly due to conflict resolution.\ " git commit --allow-empty\n" "\n"); +static const char empty_rebase_pick_advice[] = +N_("Otherwise, please use 'git rebase --skip'\n"); + static const char empty_cherry_pick_advice_single[] = N_("Otherwise, please use 'git cherry-pick --skip'\n"); @@ -107,9 +110,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; +static int no_post_rewrite, allow_empty_message, pathspec_file_nul; static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg; -static char *sign_commit; +static char *sign_commit, *pathspec_from_file; /* * The default commit message cleanup mode will remove the lines @@ -122,7 +125,6 @@ static enum commit_msg_cleanup_mode cleanup_mode; static const char *cleanup_arg; static enum commit_whence whence; -static int sequencer_in_use; static int use_editor = 1, include_status = 1; static int have_option_m; static struct strbuf message = STRBUF_INIT; @@ -179,12 +181,7 @@ static void determine_whence(struct wt_status *s) { if (file_exists(git_path_merge_head(the_repository))) whence = FROM_MERGE; - else if (file_exists(git_path_cherry_pick_head(the_repository))) { - whence = FROM_CHERRY_PICK; - if (file_exists(git_path_seq_dir())) - sequencer_in_use = 1; - } - else + else if (!sequencer_determine_whence(the_repository, &whence)) whence = FROM_COMMIT; if (s) s->whence = whence; @@ -329,7 +326,7 @@ static void refresh_cache_or_die(int refresh_flags) die_resolve_conflict("commit"); } -static const char *prepare_index(int argc, const char **argv, const char *prefix, +static const char *prepare_index(const char **argv, const char *prefix, const struct commit *current_head, int is_status) { struct string_list partial = STRING_LIST_INIT_DUP; @@ -343,11 +340,31 @@ 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; + char *old_index_env = NULL, *old_repo_index_file; hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR); refresh_cache_or_die(refresh_flags); @@ -355,12 +372,16 @@ 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, get_lock_file_path(&index_lock), 1); + setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1); - if (interactive_add(argc, argv, prefix, patch_interactive) != 0) + if (interactive_add(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 @@ -453,8 +474,10 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix if (whence != FROM_COMMIT) { if (whence == FROM_MERGE) die(_("cannot do a partial commit during a merge.")); - else if (whence == FROM_CHERRY_PICK) + else if (is_from_cherry_pick(whence)) die(_("cannot do a partial commit during a cherry-pick.")); + else if (is_from_rebase(whence)) + die(_("cannot do a partial commit during a rebase.")); } if (list_paths(&partial, !current_head ? NULL : "HEAD", &pathspec)) @@ -510,7 +533,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) - hashcpy(s->sha1_commit, oid.hash); + oidcpy(&s->oid_commit, &oid); s->status_format = status_format; s->ignore_submodule_arg = ignore_submodule_arg; @@ -537,7 +560,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_addf(&buf, "%.*s", (int)(e - s), s); + strbuf_add(&buf, s, e - s); setenv(var, buf.buf, 1); strbuf_release(&buf); } @@ -771,7 +794,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, */ else if (whence == FROM_MERGE) hook_arg1 = "merge"; - else if (whence == FROM_CHERRY_PICK) { + else if (is_from_cherry_pick(whence) || whence == FROM_REBASE_PICK) { hook_arg1 = "commit"; hook_arg2 = "CHERRY_PICK_HEAD"; } @@ -824,21 +847,19 @@ static int prepare_to_commit(const char *index_file, const char *prefix, if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS && !merge_contains_scissors) wt_status_add_cut_line(s->fp); - status_printf_ln(s, GIT_COLOR_NORMAL, - whence == FROM_MERGE - ? _("\n" - "It looks like you may be committing a merge.\n" - "If this is not correct, please remove the file\n" - " %s\n" - "and try again.\n") - : _("\n" - "It looks like you may be committing a cherry-pick.\n" - "If this is not correct, please remove the file\n" - " %s\n" - "and try again.\n"), + status_printf_ln( + s, GIT_COLOR_NORMAL, whence == FROM_MERGE ? - git_path_merge_head(the_repository) : - git_path_cherry_pick_head(the_repository)); + _("\n" + "It looks like you may be committing a merge.\n" + "If this is not correct, please run\n" + " git update-ref -d MERGE_HEAD\n" + "and try again.\n") : + _("\n" + "It looks like you may be committing a cherry-pick.\n" + "If this is not correct, please run\n" + " git update-ref -d CHERRY_PICK_HEAD\n" + "and try again.\n")); } fprintf(s->fp, "\n"); @@ -944,16 +965,20 @@ 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) fputs(_(empty_amend_advice), stderr); - else if (whence == FROM_CHERRY_PICK) { + else if (is_from_cherry_pick(whence) || + whence == FROM_REBASE_PICK) { fputs(_(empty_cherry_pick_advice), stderr); - if (!sequencer_in_use) + if (whence == FROM_CHERRY_PICK_SINGLE) fputs(_(empty_cherry_pick_advice_single), stderr); - else + else if (whence == FROM_CHERRY_PICK_MULTI) fputs(_(empty_cherry_pick_advice_multi), stderr); + else + fputs(_(empty_rebase_pick_advice), stderr); } return 0; } @@ -978,15 +1003,15 @@ static int prepare_to_commit(const char *index_file, const char *prefix, return 0; if (use_editor) { - struct argv_array env = ARGV_ARRAY_INIT; + struct strvec env = STRVEC_INIT; - argv_array_pushf(&env, "GIT_INDEX_FILE=%s", index_file); - if (launch_editor(git_path_commit_editmsg(), NULL, env.argv)) { + strvec_pushf(&env, "GIT_INDEX_FILE=%s", index_file); + if (launch_editor(git_path_commit_editmsg(), NULL, env.v)) { fprintf(stderr, _("Please supply the message using either -m or -F option.\n")); exit(1); } - argv_array_clear(&env); + strvec_clear(&env); } if (!no_verify && @@ -1156,8 +1181,10 @@ static int parse_and_validate_options(int argc, const char *argv[], if (amend && whence != FROM_COMMIT) { if (whence == FROM_MERGE) die(_("You are in the middle of a merge -- cannot amend.")); - else if (whence == FROM_CHERRY_PICK) + else if (is_from_cherry_pick(whence)) die(_("You are in the middle of a cherry-pick -- cannot amend.")); + else if (whence == FROM_REBASE_PICK) + die(_("You are in the middle of a rebase -- cannot amend.")); } if (fixup_message && squash_message) die(_("Options --squash and --fixup cannot be used together")); @@ -1179,7 +1206,8 @@ static int parse_and_validate_options(int argc, const char *argv[], use_message = edit_message; if (amend && !use_message && !fixup_message) use_message = "HEAD"; - if (!use_message && whence != FROM_CHERRY_PICK && renew_authorship) + if (!use_message && !is_from_cherry_pick(whence) && + !is_from_rebase(whence) && renew_authorship) die(_("--reset-author can be used only with -C, -c or --amend.")); if (use_message) { use_message_buffer = read_commit_message(use_message); @@ -1188,7 +1216,8 @@ static int parse_and_validate_options(int argc, const char *argv[], author_message_buffer = use_message_buffer; } } - if (whence == FROM_CHERRY_PICK && !renew_authorship) { + if ((is_from_cherry_pick(whence) || whence == FROM_REBASE_PICK) && + !renew_authorship) { author_message = "CHERRY_PICK_HEAD"; author_message_buffer = read_commit_message(author_message); } @@ -1198,8 +1227,6 @@ 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); @@ -1214,13 +1241,13 @@ static int parse_and_validate_options(int argc, const char *argv[], return argc; } -static int dry_run_commit(int argc, const char **argv, const char *prefix, +static int dry_run_commit(const char **argv, const char *prefix, const struct commit *current_head, struct wt_status *s) { int committable; const char *index_file; - index_file = prepare_index(argc, argv, prefix, current_head, 1); + index_file = prepare_index(argv, prefix, current_head, 1); committable = run_status(stdout, index_file, prefix, 0, s); rollback_index_files(); @@ -1343,9 +1370,9 @@ int cmd_status(int argc, const char **argv, const char *prefix) N_("show stash information")), OPT_BOOL(0, "ahead-behind", &s.ahead_behind_flags, N_("compute full ahead/behind values")), - { OPTION_CALLBACK, 0, "porcelain", &status_format, + OPT_CALLBACK_F(0, "porcelain", &status_format, N_("version"), N_("machine-readable output"), - PARSE_OPT_OPTARG, opt_parse_porcelain }, + PARSE_OPT_OPTARG, opt_parse_porcelain), OPT_SET_INT(0, "long", &status_format, N_("show status in long format (default)"), STATUS_FORMAT_LONG), @@ -1364,9 +1391,9 @@ int cmd_status(int argc, const char **argv, const char *prefix) PARSE_OPT_OPTARG, NULL, (intptr_t)"all" }, OPT_COLUMN(0, "column", &s.colopts, N_("list untracked files in columns")), OPT_BOOL(0, "no-renames", &no_renames, N_("do not detect renames")), - { OPTION_CALLBACK, 'M', "find-renames", &rename_score_arg, + OPT_CALLBACK_F('M', "find-renames", &rename_score_arg, N_("n"), N_("detect renames, optionally set similarity index"), - PARSE_OPT_OPTARG | PARSE_OPT_NONEG, opt_parse_rename_score }, + PARSE_OPT_OPTARG | PARSE_OPT_NONEG, opt_parse_rename_score), OPT_END(), }; @@ -1406,7 +1433,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) - hashcpy(s.sha1_commit, oid.hash); + oidcpy(&s.oid_commit, &oid); s.ignore_submodule_arg = ignore_submodule_arg; s.status_format = status_format; @@ -1463,31 +1490,8 @@ 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}; static struct wt_status s; static struct option builtin_commit_options[] = { OPT__QUIET(&quiet, N_("suppress summary after successful commit")), @@ -1535,6 +1539,8 @@ 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, @@ -1578,8 +1584,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix) verbose = (config_commit_verbose < 0) ? 0 : config_commit_verbose; if (dry_run) - return dry_run_commit(argc, argv, prefix, current_head, &s); - index_file = prepare_index(argc, argv, prefix, current_head, 0); + return dry_run_commit(argv, prefix, current_head, &s); + index_file = prepare_index(argv, prefix, current_head, 0); /* Set up everything for writing the commit object. This includes running hooks, writing the trees, and interacting with the user. */ @@ -1628,8 +1634,10 @@ int cmd_commit(int argc, const char **argv, const char *prefix) reduce_heads_replace(&parents); } else { if (!reflog_msg) - reflog_msg = (whence == FROM_CHERRY_PICK) + reflog_msg = is_from_cherry_pick(whence) ? "commit (cherry-pick)" + : is_from_rebase(whence) + ? "commit (rebase)" : "commit"; commit_list_insert(current_head, &parents); } @@ -1656,7 +1664,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) } if (amend) { - const char *exclude_gpgsig[2] = { "gpgsig", NULL }; + const char *exclude_gpgsig[3] = { "gpgsig", "gpgsig-sha256", NULL }; extra = read_commit_extra_headers(current_head, exclude_gpgsig); } else { struct commit_extra_header **tail = &extra; @@ -1664,8 +1672,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix) } if (commit_tree_extended(sb.buf, sb.len, &active_cache_tree->oid, - parents, &oid, author_ident.buf, sign_commit, - extra)) { + parents, &oid, author_ident.buf, NULL, + sign_commit, extra)) { rollback_index_files(); die(_("failed to write commit object")); } @@ -1689,12 +1697,10 @@ int cmd_commit(int argc, const char **argv, const char *prefix) "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover.")); - if (git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) && - write_commit_graph_reachable(get_object_directory(), 0, NULL)) - return 1; + git_test_write_commit_graph_or_die(); repo_rerere(the_repository, 0); - run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); + run_auto_maintenance(quiet); run_commit_hook(use_editor, get_index_file(), "post-commit", NULL); if (amend && !no_post_rewrite) { commit_post_rewrite(the_repository, current_head, &oid); @@ -1710,6 +1716,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix) &oid, flags); } + apply_autostash(git_path_merge_autostash(the_repository)); + UNLEAK(err); UNLEAK(sb); return 0; diff --git a/third_party/git/builtin/config.c b/third_party/git/builtin/config.c index 98d65bc0ad..963d65fd3f 100644 --- a/third_party/git/builtin/config.c +++ b/third_party/git/builtin/config.c @@ -29,10 +29,11 @@ static int use_worktree_config; static struct git_config_source given_config_source; static int actions, type; static char *default_value; -static int end_null; +static int end_nul; 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) @@ -64,6 +65,7 @@ static int show_origin; #define TYPE_PATH 4 #define TYPE_EXPIRY_DATE 5 #define TYPE_COLOR 6 +#define TYPE_BOOL_OR_STR 7 #define OPT_CALLBACK_VALUE(s, l, v, h, i) \ { OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \ @@ -93,6 +95,8 @@ static int option_parse_type(const struct option *opt, const char *arg, new_type = TYPE_INT; else if (!strcmp(arg, "bool-or-int")) new_type = TYPE_BOOL_OR_INT; + else if (!strcmp(arg, "bool-or-str")) + new_type = TYPE_BOOL_OR_STR; else if (!strcmp(arg, "path")) new_type = TYPE_PATH; else if (!strcmp(arg, "expiry-date")) @@ -148,13 +152,15 @@ static struct option builtin_config_options[] = { OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or \"false\""), TYPE_BOOL), OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"), TYPE_INT), OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or --int"), TYPE_BOOL_OR_INT), + OPT_CALLBACK_VALUE(0, "bool-or-str", &type, N_("value is --bool or string"), TYPE_BOOL_OR_STR), 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_null, N_("terminate values with NUL byte")), + OPT_BOOL('z', "null", &end_nul, 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(), }; @@ -178,22 +184,34 @@ static void check_argc(int argc, int min, int max) static void show_config_origin(struct strbuf *buf) { - const char term = end_null ? '\0' : '\t'; + const char term = end_nul ? '\0' : '\t'; strbuf_addstr(buf, current_config_origin_type()); strbuf_addch(buf, ':'); - if (end_null) + if (end_nul) 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) { + if (show_origin || show_scope) { struct strbuf buf = STRBUF_INIT; - show_config_origin(&buf); + if (show_scope) + show_config_scope(&buf); + if (show_origin) + 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); @@ -213,6 +231,8 @@ 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) @@ -234,6 +254,12 @@ static int format_config(struct strbuf *buf, const char *key_, const char *value strbuf_addstr(buf, v ? "true" : "false"); else strbuf_addf(buf, "%d", v); + } else if (type == TYPE_BOOL_OR_STR) { + int v = git_parse_maybe_bool(value_); + if (v < 0) + strbuf_addstr(buf, value_); + else + strbuf_addstr(buf, v ? "true" : "false"); } else if (type == TYPE_PATH) { const char *v; if (git_config_pathname(&v, key_, value_) < 0) @@ -395,6 +421,13 @@ static char *normalize_value(const char *key, const char *value) else return xstrdup(v ? "true" : "false"); } + if (type == TYPE_BOOL_OR_STR) { + int v = git_parse_maybe_bool(value); + if (v < 0) + return xstrdup(value); + else + return xstrdup(v ? "true" : "false"); + } if (type == TYPE_COLOR) { char v[COLOR_MAXLEN]; if (git_config_color(v, key, value)) @@ -612,16 +645,21 @@ int cmd_config(int argc, const char **argv, const char *prefix) usage_builtin_config(); } - if (use_local_config && nongit) - die(_("--local can only be used inside a git repository")); + if (nongit) { + if (use_local_config) + die(_("--local can only be used inside a git repository")); + if (given_config_source.blob) + die(_("--blob can only be used inside a git repository")); + if (use_worktree_config) + die(_("--worktree can only be used inside a git repository")); - if (given_config_source.blob && nongit) - die(_("--blob can only be used inside a git repository")); + } if (given_config_source.file && !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) { @@ -637,6 +675,8 @@ 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; @@ -646,12 +686,14 @@ 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(); - else if (use_local_config) + given_config_source.scope = CONFIG_SCOPE_SYSTEM; + } else if (use_local_config) { given_config_source.file = git_pathdup("config"); - else if (use_worktree_config) { - struct worktree **worktrees = get_worktrees(0); + given_config_source.scope = CONFIG_SCOPE_LOCAL; + } else if (use_worktree_config) { + struct worktree **worktrees = get_worktrees(); if (repository_format_worktree_config) given_config_source.file = git_pathdup("config.worktree"); else if (worktrees[0] && worktrees[1]) @@ -662,13 +704,18 @@ 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 @@ -678,7 +725,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) config_options.git_dir = get_git_dir(); } - if (end_null) { + if (end_nul) { term = '\0'; delim = '\n'; key_delim = '\n'; diff --git a/third_party/git/credential-cache--daemon.c b/third_party/git/builtin/credential-cache--daemon.c index ec1271f89c..c61f123a3b 100644 --- a/third_party/git/credential-cache--daemon.c +++ b/third_party/git/builtin/credential-cache--daemon.c @@ -1,9 +1,12 @@ -#include "cache.h" +#include "builtin.h" +#include "parse-options.h" + +#ifndef NO_UNIX_SOCKETS + #include "config.h" #include "tempfile.h" #include "credential.h" #include "unix-socket.h" -#include "parse-options.h" struct credential_cache_entry { struct credential item; @@ -257,7 +260,7 @@ static void init_socket_directory(const char *path) free(path_copy); } -int cmd_main(int argc, const char **argv) +int cmd_credential_cache_daemon(int argc, const char **argv, const char *prefix) { struct tempfile *socket_file; const char *socket_path; @@ -275,7 +278,7 @@ int cmd_main(int argc, const char **argv) git_config_get_bool("credentialcache.ignoresighup", &ignore_sighup); - argc = parse_options(argc, argv, NULL, options, usage, 0); + argc = parse_options(argc, argv, prefix, options, usage, 0); socket_path = argv[0]; if (!socket_path) @@ -295,3 +298,21 @@ int cmd_main(int argc, const char **argv) return 0; } + +#else + +int cmd_credential_cache_daemon(int argc, const char **argv, const char *prefix) +{ + const char * const usage[] = { + "git credential-cache--daemon [options] <action>", + "", + "credential-cache--daemon is disabled in this build of Git", + NULL + }; + struct option options[] = { OPT_END() }; + + argc = parse_options(argc, argv, prefix, options, usage, 0); + die(_("credential-cache--daemon unavailable; no unix socket support")); +} + +#endif /* NO_UNIX_SOCKET */ diff --git a/third_party/git/credential-cache.c b/third_party/git/builtin/credential-cache.c index 1cccc3a0b9..9b3f709905 100644 --- a/third_party/git/credential-cache.c +++ b/third_party/git/builtin/credential-cache.c @@ -1,7 +1,10 @@ -#include "cache.h" +#include "builtin.h" +#include "parse-options.h" + +#ifndef NO_UNIX_SOCKETS + #include "credential.h" #include "string-list.h" -#include "parse-options.h" #include "unix-socket.h" #include "run-command.h" @@ -39,13 +42,13 @@ static int send_request(const char *socket, const struct strbuf *out) static void spawn_daemon(const char *socket) { struct child_process daemon = CHILD_PROCESS_INIT; - const char *argv[] = { NULL, NULL, NULL }; char buf[128]; int r; - argv[0] = "git-credential-cache--daemon"; - argv[1] = socket; - daemon.argv = argv; + strvec_pushl(&daemon.args, + "credential-cache--daemon", socket, + NULL); + daemon.git_cmd = 1; daemon.no_stdin = 1; daemon.out = -1; @@ -96,7 +99,7 @@ static char *get_socket_path(void) return socket; } -int cmd_main(int argc, const char **argv) +int cmd_credential_cache(int argc, const char **argv, const char *prefix) { char *socket_path = NULL; int timeout = 900; @@ -113,7 +116,7 @@ int cmd_main(int argc, const char **argv) OPT_END() }; - argc = parse_options(argc, argv, NULL, options, usage, 0); + argc = parse_options(argc, argv, prefix, options, usage, 0); if (!argc) usage_with_options(usage, options); op = argv[0]; @@ -134,3 +137,21 @@ int cmd_main(int argc, const char **argv) return 0; } + +#else + +int cmd_credential_cache(int argc, const char **argv, const char *prefix) +{ + const char * const usage[] = { + "git credential-cache [options] <action>", + "", + "credential-cache is disabled in this build of Git", + NULL + }; + struct option options[] = { OPT_END() }; + + argc = parse_options(argc, argv, prefix, options, usage, 0); + die(_("credential-cache unavailable; no unix socket support")); +} + +#endif /* NO_UNIX_SOCKETS */ diff --git a/third_party/git/credential-store.c b/third_party/git/builtin/credential-store.c index ac295420dd..5331ab151a 100644 --- a/third_party/git/credential-store.c +++ b/third_party/git/builtin/credential-store.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "builtin.h" #include "lockfile.h" #include "credential.h" #include "string-list.h" @@ -24,8 +24,8 @@ static int parse_credential_file(const char *fn, } while (strbuf_getline_lf(&line, fh) != EOF) { - credential_from_url(&entry, line.buf); - if (entry.username && entry.password && + if (!credential_from_url_gently(&entry, line.buf, 1) && + entry.username && entry.password && credential_match(c, &entry)) { found_credential = 1; if (match_cb) { @@ -72,15 +72,16 @@ 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, 1); + strbuf_addstr_urlencode(&buf, c->username, is_rfc3986_unreserved); strbuf_addch(&buf, ':'); - strbuf_addstr_urlencode(&buf, c->password, 1); + strbuf_addstr_urlencode(&buf, c->password, is_rfc3986_unreserved); strbuf_addch(&buf, '@'); if (c->host) - strbuf_addstr_urlencode(&buf, c->host, 1); + strbuf_addstr_urlencode(&buf, c->host, is_rfc3986_unreserved); if (c->path) { strbuf_addch(&buf, '/'); - strbuf_addstr_urlencode(&buf, c->path, 0); + strbuf_addstr_urlencode(&buf, c->path, + is_rfc3986_reserved_or_unreserved); } rewrite_credential_file(fn, c, &buf); @@ -142,7 +143,7 @@ static void lookup_credential(const struct string_list *fns, struct credential * return; /* Found credential */ } -int cmd_main(int argc, const char **argv) +int cmd_credential_store(int argc, const char **argv, const char *prefix) { const char * const usage[] = { "git credential-store [<options>] <action>", @@ -160,7 +161,7 @@ int cmd_main(int argc, const char **argv) umask(077); - argc = parse_options(argc, (const char **)argv, NULL, options, usage, 0); + argc = parse_options(argc, (const char **)argv, prefix, options, usage, 0); if (argc != 1) usage_with_options(usage, options); op = argv[0]; diff --git a/third_party/git/builtin/describe.c b/third_party/git/builtin/describe.c index 200154297d..7668591d57 100644 --- a/third_party/git/builtin/describe.c +++ b/third_party/git/builtin/describe.c @@ -12,10 +12,9 @@ #include "revision.h" #include "diff.h" #include "hashmap.h" -#include "argv-array.h" +#include "strvec.h" #include "run-command.h" #include "object-store.h" -#include "revision.h" #include "list-objects.h" #include "commit-slab.h" @@ -55,6 +54,7 @@ struct commit_name { struct tag *tag; unsigned prio:2; /* annotated tag = 2, tag = 1, head = 0 */ unsigned name_checked:1; + unsigned misnamed:1; struct object_id oid; char *path; }; @@ -64,19 +64,22 @@ static const char *prio_names[] = { }; static int commit_name_neq(const void *unused_cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *peeled) { - const struct commit_name *cn1 = entry; - const struct commit_name *cn2 = entry_or_key; + 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); return !oideq(&cn1->peeled, peeled ? peeled : &cn2->peeled); } static inline struct commit_name *find_commit_name(const struct object_id *peeled) { - return hashmap_get_from_hash(&names, oidhash(peeled), peeled); + return hashmap_get_entry_from_hash(&names, oidhash(peeled), peeled, + struct commit_name, entry); } static int replace_name(struct commit_name *e, @@ -123,13 +126,14 @@ 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, oidhash(peeled)); - hashmap_add(&names, e); + hashmap_entry_init(&e->entry, oidhash(peeled)); + hashmap_add(&names, &e->entry); e->path = NULL; } e->tag = tag; e->prio = prio; e->name_checked = 0; + e->misnamed = 0; oidcpy(&e->oid, oid); free(e->path); e->path = xstrdup(path); @@ -273,10 +277,11 @@ static void append_name(struct commit_name *n, struct strbuf *dst) die(_("annotated tag %s not available"), n->path); } if (n->tag && !n->name_checked) { - if (!n->tag->tag) - die(_("annotated tag %s has no embedded name"), n->path); - if (strcmp(n->tag->tag, all ? n->path + 5 : n->path)) - warning(_("tag '%s' is really '%s' here"), n->tag->tag, n->path); + if (strcmp(n->tag->tag, all ? n->path + 5 : n->path)) { + warning(_("tag '%s' is externally known as '%s'"), + n->path, n->tag->tag); + n->misnamed = 1; + } n->name_checked = 1; } @@ -312,8 +317,8 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst) * Exact match to an existing ref. */ append_name(n, dst); - if (longformat) - append_suffix(0, n->tag ? &n->tag->tagged->oid : oid, dst); + if (n->misnamed || longformat) + append_suffix(0, n->tag ? get_tagged_oid(n->tag) : oid, dst); if (suffix) strbuf_addstr(dst, suffix); return; @@ -330,8 +335,8 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst) struct commit_name *n; init_commit_names(&commit_names); - n = hashmap_iter_first(&names, &iter); - for (; n; n = hashmap_iter_next(&iter)) { + hashmap_for_each_entry(&names, &iter, n, + entry /* member name */) { c = lookup_commit_reference_gently(the_repository, &n->peeled, 1); if (c) @@ -374,11 +379,25 @@ 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) { - if (debug) - fprintf(stderr, _("finished search at %s\n"), - oid_to_hex(&c->object.oid)); - break; + 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; + } } while (parents) { struct commit *p = parents->item; @@ -447,7 +466,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst) } append_name(all_matches[0].name, dst); - if (abbrev) + if (all_matches[0].name->misnamed || abbrev) append_suffix(all_matches[0].depth, &cmit->object.oid, dst); if (suffix) strbuf_addstr(dst, suffix); @@ -482,15 +501,15 @@ static void process_object(struct object *obj, const char *path, void *data) static void describe_blob(struct object_id oid, struct strbuf *dst) { struct rev_info revs; - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; struct process_commit_data pcd = { null_oid, oid, dst, &revs}; - argv_array_pushl(&args, "internal: The first arg is not parsed", - "--objects", "--in-commit-order", "--reverse", "HEAD", - NULL); + strvec_pushl(&args, "internal: The first arg is not parsed", + "--objects", "--in-commit-order", "--reverse", "HEAD", + NULL); repo_init_revisions(the_repository, &revs, NULL); - if (setup_revisions(args.argc, args.argv, &revs, NULL) > 1) + if (setup_revisions(args.nr, args.v, &revs, NULL) > 1) BUG("setup_revisions could not handle all args?"); if (prepare_revision_walk(&revs)) @@ -575,26 +594,26 @@ int cmd_describe(int argc, const char **argv, const char *prefix) if (contains) { struct string_list_item *item; - struct argv_array args; + struct strvec args; - argv_array_init(&args); - argv_array_pushl(&args, "name-rev", - "--peel-tag", "--name-only", "--no-undefined", - NULL); + strvec_init(&args); + strvec_pushl(&args, "name-rev", + "--peel-tag", "--name-only", "--no-undefined", + NULL); if (always) - argv_array_push(&args, "--always"); + strvec_push(&args, "--always"); if (!all) { - argv_array_push(&args, "--tags"); + strvec_push(&args, "--tags"); for_each_string_list_item(item, &patterns) - argv_array_pushf(&args, "--refs=refs/tags/%s", item->string); + strvec_pushf(&args, "--refs=refs/tags/%s", item->string); for_each_string_list_item(item, &exclude_patterns) - argv_array_pushf(&args, "--exclude=refs/tags/%s", item->string); + strvec_pushf(&args, "--exclude=refs/tags/%s", item->string); } if (argc) - argv_array_pushv(&args, argv); + strvec_pushv(&args, argv); else - argv_array_push(&args, "HEAD"); - return cmd_name_rev(args.argc, args.argv, prefix); + strvec_push(&args, "HEAD"); + return cmd_name_rev(args.nr, args.v, prefix); } hashmap_init(&names, commit_name_neq, NULL, 0); @@ -605,7 +624,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix) if (argc == 0) { if (broken) { struct child_process cp = CHILD_PROCESS_INIT; - argv_array_pushv(&cp.args, diff_index_args); + strvec_pushv(&cp.args, diff_index_args); cp.git_cmd = 1; cp.no_stdin = 1; cp.no_stdout = 1; @@ -627,7 +646,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix) } else if (dirty) { struct lock_file index_lock = LOCK_INIT; struct rev_info revs; - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; int fd, result; setup_work_tree(); @@ -639,8 +658,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix) repo_update_index_if_able(the_repository, &index_lock); repo_init_revisions(the_repository, &revs, prefix); - argv_array_pushv(&args, diff_index_args); - if (setup_revisions(args.argc, args.argv, &revs, NULL) != 1) + strvec_pushv(&args, diff_index_args); + if (setup_revisions(args.nr, args.v, &revs, NULL) != 1) BUG("malformed internal diff-index command line"); result = run_diff_index(&revs, 0); diff --git a/third_party/git/builtin/diff-files.c b/third_party/git/builtin/diff-files.c index 86ae474fbf..1e352dd8f7 100644 --- a/third_party/git/builtin/diff-files.c +++ b/third_party/git/builtin/diff-files.c @@ -28,6 +28,13 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ repo_init_revisions(the_repository, &rev, prefix); rev.abbrev = 0; + + /* + * Consider "intent-to-add" files as new by default, unless + * explicitly specified in the command line or anywhere else. + */ + rev.diffopt.ita_invisible_in_index = 1; + precompose_argv(argc, argv); argc = setup_revisions(argc, argv, &rev, NULL); diff --git a/third_party/git/builtin/diff-tree.c b/third_party/git/builtin/diff-tree.c index cb9ea79367..802363d0a2 100644 --- a/third_party/git/builtin/diff-tree.c +++ b/third_party/git/builtin/diff-tree.c @@ -109,6 +109,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) struct object *tree1, *tree2; static struct rev_info *opt = &log_tree_opt; struct setup_revision_opt s_r_opt; + struct userformat_want w; int read_stdin = 0; if (argc == 2 && !strcmp(argv[1], "-h")) @@ -127,6 +128,14 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) precompose_argv(argc, argv); argc = setup_revisions(argc, argv, opt, &s_r_opt); + memset(&w, 0, sizeof(w)); + userformat_find_requirements(NULL, &w); + + if (!opt->show_notes_given && w.notes) + opt->show_notes = 1; + if (opt->show_notes) + load_display_notes(&opt->notes_opt); + while (--argc > 0) { const char *arg = *++argv; diff --git a/third_party/git/builtin/diff.c b/third_party/git/builtin/diff.c index 42ac803091..cd4083fed9 100644 --- a/third_party/git/builtin/diff.c +++ b/third_party/git/builtin/diff.c @@ -6,6 +6,7 @@ #define USE_THE_INDEX_COMPATIBILITY_MACROS #include "cache.h" #include "config.h" +#include "ewah/ewok.h" #include "lockfile.h" #include "color.h" #include "commit.h" @@ -17,13 +18,19 @@ #include "log-tree.h" #include "builtin.h" #include "submodule.h" -#include "sha1-array.h" +#include "oid-array.h" #define DIFF_NO_INDEX_EXPLICIT 1 #define DIFF_NO_INDEX_IMPLICIT 2 static const char builtin_diff_usage[] = -"git diff [<options>] [<commit> [<commit>]] [--] [<path>...]"; +"git diff [<options>] [<commit>] [--] [<path>...]\n" +" or: git diff [<options>] --cached [<commit>] [--] [<path>...]\n" +" or: git diff [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n" +" or: git diff [<options>] <commit>...<commit>] [--] [<path>...]\n" +" or: git diff [<options>] <blob> <blob>]\n" +" or: git diff [<options>] --no-index [--] <path> <path>]\n" +COMMON_DIFF_OPTIONS_HELP; static const char *blob_path(struct object_array_entry *entry) { @@ -196,8 +203,7 @@ static int builtin_diff_combined(struct rev_info *revs, revs->dense_combined_merges = revs->combine_merges = 1; for (i = 1; i < ents; i++) oid_array_append(&parents, &ent[i].item->oid); - diff_tree_combined(&ent[0].item->oid, &parents, - revs->dense_combined_merges, revs); + diff_tree_combined(&ent[0].item->oid, &parents, revs); oid_array_clear(&parents); return 0; } @@ -254,6 +260,108 @@ static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv return run_diff_files(revs, options); } +struct symdiff { + struct bitmap *skip; + int warn; + const char *base, *left, *right; +}; + +/* + * Check for symmetric-difference arguments, and if present, arrange + * everything we need to know to handle them correctly. As a bonus, + * weed out all bogus range-based revision specifications, e.g., + * "git diff A..B C..D" or "git diff A..B C" get rejected. + * + * For an actual symmetric diff, *symdiff is set this way: + * + * - its skip is non-NULL and marks *all* rev->pending.objects[i] + * indices that the caller should ignore (extra merge bases, of + * which there might be many, and A in A...B). Note that the + * chosen merge base and right side are NOT marked. + * - warn is set if there are multiple merge bases. + * - base, left, and right point to the names to use in a + * warning about multiple merge bases. + * + * If there is no symmetric diff argument, sym->skip is NULL and + * sym->warn is cleared. The remaining fields are not set. + */ +static void symdiff_prepare(struct rev_info *rev, struct symdiff *sym) +{ + int i, is_symdiff = 0, basecount = 0, othercount = 0; + int lpos = -1, rpos = -1, basepos = -1; + struct bitmap *map = NULL; + + /* + * Use the whence fields to find merge bases and left and + * right parts of symmetric difference, so that we do not + * depend on the order that revisions are parsed. If there + * are any revs that aren't from these sources, we have a + * "git diff C A...B" or "git diff A...B C" case. Or we + * could even get "git diff A...B C...E", for instance. + * + * If we don't have just one merge base, we pick one + * at random. + * + * NB: REV_CMD_LEFT, REV_CMD_RIGHT are also used for A..B, + * so we must check for SYMMETRIC_LEFT too. The two arrays + * rev->pending.objects and rev->cmdline.rev are parallel. + */ + for (i = 0; i < rev->cmdline.nr; i++) { + struct object *obj = rev->pending.objects[i].item; + switch (rev->cmdline.rev[i].whence) { + case REV_CMD_MERGE_BASE: + if (basepos < 0) + basepos = i; + basecount++; + break; /* do mark all bases */ + case REV_CMD_LEFT: + if (lpos >= 0) + usage(builtin_diff_usage); + lpos = i; + if (obj->flags & SYMMETRIC_LEFT) { + is_symdiff = 1; + break; /* do mark A */ + } + continue; + case REV_CMD_RIGHT: + if (rpos >= 0) + usage(builtin_diff_usage); + rpos = i; + continue; /* don't mark B */ + case REV_CMD_PARENTS_ONLY: + case REV_CMD_REF: + case REV_CMD_REV: + othercount++; + continue; + } + if (map == NULL) + map = bitmap_new(); + bitmap_set(map, i); + } + + /* + * Forbid any additional revs for both A...B and A..B. + */ + if (lpos >= 0 && othercount > 0) + usage(builtin_diff_usage); + + if (!is_symdiff) { + bitmap_free(map); + sym->warn = 0; + sym->skip = NULL; + return; + } + + sym->left = rev->pending.objects[lpos].name; + sym->right = rev->pending.objects[rpos].name; + if (basecount == 0) + die(_("%s...%s: no merge base"), sym->left, sym->right); + sym->base = rev->pending.objects[basepos].name; + bitmap_unset(map, basepos); /* unmark the base we want */ + sym->warn = basecount > 1; + sym->skip = map; +} + int cmd_diff(int argc, const char **argv, const char *prefix) { int i; @@ -263,19 +371,29 @@ int cmd_diff(int argc, const char **argv, const char *prefix) struct object_array_entry *blob[2]; int nongit = 0, no_index = 0; int result = 0; + struct symdiff sdiff; /* * We could get N tree-ish in the rev.pending_objects list. - * Also there could be M blobs there, and P pathspecs. + * Also there could be M blobs there, and P pathspecs. --cached may + * also be present. * * N=0, M=0: - * cache vs files (diff-files) + * cache vs files (diff-files) + * + * N=0, M=0, --cached: + * HEAD vs cache (diff-index --cached) + * * N=0, M=2: * compare two random blobs. P must be zero. + * * N=0, M=1, P=1: - * compare a blob with a working tree file. + * compare a blob with a working tree file. * * N=1, M=0: + * tree vs files (diff-index) + * + * N=1, M=0, --cached: * tree vs cache (diff-index --cached) * * N=2, M=0: @@ -382,6 +500,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) } } + symdiff_prepare(&rev, &sdiff); for (i = 0; i < rev.pending.nr; i++) { struct object_array_entry *entry = &rev.pending.objects[i]; struct object *obj = entry->item; @@ -396,6 +515,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix) obj = &get_commit_tree(((struct commit *)obj))->object; if (obj->type == OBJ_TREE) { + if (sdiff.skip && bitmap_get(sdiff.skip, i)) + continue; obj->flags |= flags; add_object_array(obj, name, &ent); } else if (obj->type == OBJ_BLOB) { @@ -437,21 +558,12 @@ int cmd_diff(int argc, const char **argv, const char *prefix) usage(builtin_diff_usage); else if (ent.nr == 1) result = builtin_diff_index(&rev, argc, argv); - else if (ent.nr == 2) + else if (ent.nr == 2) { + if (sdiff.warn) + warning(_("%s...%s: multiple merge bases, using %s"), + sdiff.left, sdiff.right, sdiff.base); result = builtin_diff_tree(&rev, argc, argv, &ent.objects[0], &ent.objects[1]); - else if (ent.objects[0].item->flags & UNINTERESTING) { - /* - * diff A...B where there is at least one merge base - * between A and B. We have ent.objects[0] == - * merge-base, ent.objects[ents-2] == A, and - * ent.objects[ents-1] == B. Show diff between the - * base and B. Note that we pick one merge base at - * random if there are more than one. - */ - result = builtin_diff_tree(&rev, argc, argv, - &ent.objects[0], - &ent.objects[ent.nr-1]); } else result = builtin_diff_combined(&rev, argc, argv, ent.objects, ent.nr); diff --git a/third_party/git/builtin/difftool.c b/third_party/git/builtin/difftool.c index 16eb8b70ea..7ac432b881 100644 --- a/third_party/git/builtin/difftool.c +++ b/third_party/git/builtin/difftool.c @@ -18,7 +18,7 @@ #include "run-command.h" #include "exec-cmd.h" #include "parse-options.h" -#include "argv-array.h" +#include "strvec.h" #include "strbuf.h" #include "lockfile.h" #include "object-store.h" @@ -125,12 +125,15 @@ struct working_tree_entry { }; static int working_tree_entry_cmp(const void *unused_cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *unused_keydata) { - const struct working_tree_entry *a = entry; - const struct working_tree_entry *b = entry_or_key; + 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); + return strcmp(a->path, b->path); } @@ -145,12 +148,14 @@ struct pair_entry { }; static int pair_cmp(const void *unused_cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *unused_keydata) { - const struct pair_entry *a = entry; - const struct pair_entry *b = entry_or_key; + 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); return strcmp(a->path, b->path); } @@ -161,14 +166,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, strhash(path)); - existing = hashmap_get(map, e, NULL); + hashmap_entry_init(&e->entry, strhash(path)); + existing = hashmap_get_entry(map, e, entry, NULL); if (existing) { free(e); e = existing; } else { e->left[0] = e->right[0] = '\0'; - hashmap_add(map, e); + hashmap_add(map, &e->entry); } strlcpy(is_right ? e->right : e->left, content, PATH_MAX); } @@ -179,12 +184,14 @@ struct path_entry { }; static int path_entry_cmp(const void *unused_cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *key) { - const struct path_entry *a = entry; - const struct path_entry *b = entry_or_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); return strcmp(a->path, key ? key : b->path); } @@ -203,10 +210,10 @@ static void changed_files(struct hashmap *result, const char *index_path, strbuf_addf(&index_env, "GIT_INDEX_FILE=%s", index_path); env[0] = index_env.buf; - argv_array_pushl(&update_index.args, - "--git-dir", git_dir, "--work-tree", workdir, - "update-index", "--really-refresh", "-q", - "--unmerged", NULL); + strvec_pushl(&update_index.args, + "--git-dir", git_dir, "--work-tree", workdir, + "update-index", "--really-refresh", "-q", + "--unmerged", NULL); update_index.no_stdin = 1; update_index.no_stdout = 1; update_index.no_stderr = 1; @@ -218,9 +225,9 @@ static void changed_files(struct hashmap *result, const char *index_path, /* Ignore any errors of update-index */ run_command(&update_index); - argv_array_pushl(&diff_files.args, - "--git-dir", git_dir, "--work-tree", workdir, - "diff-files", "--name-only", "-z", NULL); + strvec_pushl(&diff_files.args, + "--git-dir", git_dir, "--work-tree", workdir, + "diff-files", "--name-only", "-z", NULL); diff_files.no_stdin = 1; diff_files.git_cmd = 1; diff_files.use_shell = 0; @@ -234,8 +241,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, strhash(buf.buf)); - hashmap_add(result, entry); + hashmap_entry_init(&entry->entry, strhash(buf.buf)); + hashmap_add(result, &entry->entry); } fclose(fp); if (finish_command(&diff_files)) @@ -386,10 +393,10 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix, child.clean_on_exit = 1; child.dir = prefix; child.out = -1; - argv_array_pushl(&child.args, "diff", "--raw", "--no-abbrev", "-z", - NULL); + strvec_pushl(&child.args, "diff", "--raw", "--no-abbrev", "-z", + NULL); for (i = 0; i < argc; i++) - argv_array_push(&child.args, argv[i]); + strvec_push(&child.args, argv[i]); if (start_command(&child)) die("could not obtain raw diff"); fp = xfdopen(child.out, "r"); @@ -461,12 +468,13 @@ 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, strhash(dst_path)); - if (hashmap_get(&working_tree_dups, entry, NULL)) { + hashmap_entry_init(&entry->entry, strhash(dst_path)); + if (hashmap_get(&working_tree_dups, &entry->entry, + NULL)) { free(entry); continue; } - hashmap_add(&working_tree_dups, entry); + hashmap_add(&working_tree_dups, &entry->entry); if (!use_wt_file(workdir, dst_path, &roid)) { if (checkout_path(rmode, &roid, dst_path, @@ -530,8 +538,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_iter_init(&submodules, &iter); - while ((entry = hashmap_iter_next(&iter))) { + hashmap_for_each_entry(&submodules, &iter, entry, + entry /* member name */) { if (*entry->left) { add_path(&ldir, ldir_len, entry->path); ensure_leading_directories(ldir.buf); @@ -549,8 +557,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_iter_init(&symlinks2, &iter); - while ((entry = hashmap_iter_next(&iter))) { + hashmap_for_each_entry(&symlinks2, &iter, entry, + entry /* member name */) { if (*entry->left) { add_path(&ldir, ldir_len, entry->path); ensure_leading_directories(ldir.buf); @@ -659,7 +667,7 @@ finish: static int run_file_diff(int prompt, const char *prefix, int argc, const char **argv) { - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; const char *env[] = { "GIT_PAGER=", "GIT_EXTERNAL_DIFF=git-difftool--helper", NULL, NULL @@ -672,10 +680,10 @@ static int run_file_diff(int prompt, const char *prefix, env[2] = "GIT_DIFFTOOL_NO_PROMPT=true"; - argv_array_push(&args, "diff"); + strvec_push(&args, "diff"); for (i = 0; i < argc; i++) - argv_array_push(&args, argv[i]); - ret = run_command_v_opt_cd_env(args.argv, RUN_GIT_CMD, prefix, env); + strvec_push(&args, argv[i]); + ret = run_command_v_opt_cd_env(args.v, RUN_GIT_CMD, prefix, env); exit(ret); } diff --git a/third_party/git/builtin/env--helper.c b/third_party/git/builtin/env--helper.c index 23c214fff6..27349098b0 100644 --- a/third_party/git/builtin/env--helper.c +++ b/third_party/git/builtin/env--helper.c @@ -7,18 +7,22 @@ static char const * const env__helper_usage[] = { NULL }; -static enum { +enum cmdmode { ENV_HELPER_TYPE_BOOL = 1, ENV_HELPER_TYPE_ULONG -} cmdmode = 0; +}; static int option_parse_type(const struct option *opt, const char *arg, int unset) { + enum cmdmode *cmdmode = opt->value; + + BUG_ON_OPT_NEG(unset); + if (!strcmp(arg, "bool")) - cmdmode = ENV_HELPER_TYPE_BOOL; + *cmdmode = ENV_HELPER_TYPE_BOOL; else if (!strcmp(arg, "ulong")) - cmdmode = ENV_HELPER_TYPE_ULONG; + *cmdmode = ENV_HELPER_TYPE_ULONG; else die(_("unrecognized --type argument, %s"), arg); @@ -33,6 +37,7 @@ int cmd_env__helper(int argc, const char **argv, const char *prefix) int ret; int ret_int, default_int; unsigned long ret_ulong, default_ulong; + enum cmdmode cmdmode = 0; struct option opts[] = { OPT_CALLBACK_F(0, "type", &cmdmode, N_("type"), N_("value is given this type"), PARSE_OPT_NONEG, diff --git a/third_party/git/builtin/fast-export.c b/third_party/git/builtin/fast-export.c index f541f55d33..d2e33f5005 100644 --- a/third_party/git/builtin/fast-export.c +++ b/third_party/git/builtin/fast-export.c @@ -40,10 +40,12 @@ 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; static int anonymize; +static struct hashmap anonymized_seeds; static struct revision_sources revision_sources; static int parse_opt_signed_tag_mode(const struct option *opt, @@ -119,19 +121,33 @@ static int has_unshown_parent(struct commit *commit) struct anonymized_entry { struct hashmap_entry hash; + const char *anon; + const char orig[FLEX_ARRAY]; +}; + +struct anonymized_entry_key { + struct hashmap_entry hash; const char *orig; size_t orig_len; - const char *anon; - size_t anon_len; }; static int anonymized_entry_cmp(const void *unused_cmp_data, - const void *va, const void *vb, - const void *unused_keydata) + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, + const void *keydata) { - const struct anonymized_entry *a = va, *b = vb; - return a->orig_len != b->orig_len || - memcmp(a->orig, b->orig, a->orig_len); + const struct anonymized_entry *a, *b; + + a = container_of(eptr, const struct anonymized_entry, hash); + if (keydata) { + const struct anonymized_entry_key *key = keydata; + int equal = !strncmp(a->orig, key->orig, key->orig_len) && + !a->orig[key->orig_len]; + return !equal; + } + + b = container_of(entry_or_key, const struct anonymized_entry, hash); + return strcmp(a->orig, b->orig); } /* @@ -139,31 +155,39 @@ static int anonymized_entry_cmp(const void *unused_cmp_data, * the same anonymized string with another. The actual generation * is farmed out to the generate function. */ -static const void *anonymize_mem(struct hashmap *map, - void *(*generate)(const void *, size_t *), - const void *orig, size_t *len) +static const char *anonymize_str(struct hashmap *map, + char *(*generate)(void *), + const char *orig, size_t len, + void *data) { - struct anonymized_entry key, *ret; + struct anonymized_entry_key key; + struct anonymized_entry *ret; if (!map->cmpfn) hashmap_init(map, anonymized_entry_cmp, NULL, 0); - hashmap_entry_init(&key, memhash(orig, *len)); + hashmap_entry_init(&key.hash, memhash(orig, len)); key.orig = orig; - key.orig_len = *len; - ret = hashmap_get(map, &key, NULL); + key.orig_len = len; + + /* First check if it's a token the user configured manually... */ + if (anonymized_seeds.cmpfn) + ret = hashmap_get_entry(&anonymized_seeds, &key, hash, &key); + else + ret = NULL; + /* ...otherwise check if we've already seen it in this context... */ + if (!ret) + ret = hashmap_get_entry(map, &key, hash, &key); + + /* ...and finally generate a new mapping if necessary */ if (!ret) { - ret = xmalloc(sizeof(*ret)); + FLEX_ALLOC_MEM(ret, orig, orig, len); hashmap_entry_init(&ret->hash, key.hash.hash); - ret->orig = xstrdup(orig); - ret->orig_len = *len; - ret->anon = generate(orig, len); - ret->anon_len = *len; - hashmap_put(map, ret); + ret->anon = generate(data); + hashmap_put(map, &ret->hash); } - *len = ret->anon_len; return ret->anon; } @@ -175,13 +199,13 @@ static const void *anonymize_mem(struct hashmap *map, */ static void anonymize_path(struct strbuf *out, const char *path, struct hashmap *map, - void *(*generate)(const void *, size_t *)) + char *(*generate)(void *)) { while (*path) { const char *end_of_component = strchrnul(path, '/'); size_t len = end_of_component - path; - const char *c = anonymize_mem(map, generate, path, &len); - strbuf_add(out, c, len); + const char *c = anonymize_str(map, generate, path, len, NULL); + strbuf_addstr(out, c); path = end_of_component; if (*path) strbuf_addch(out, *path++); @@ -287,7 +311,8 @@ 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(oid, buf, size, type_name(type)) < 0) + if (check_object_signature(the_repository, 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); @@ -354,12 +379,12 @@ static void print_path_1(const char *path) printf("%s", path); } -static void *anonymize_path_component(const void *path, size_t *len) +static char *anonymize_path_component(void *data) { static int counter; struct strbuf out = STRBUF_INIT; strbuf_addf(&out, "path%d", counter++); - return strbuf_detach(&out, len); + return strbuf_detach(&out, NULL); } static void print_path(const char *path) @@ -376,20 +401,23 @@ static void print_path(const char *path) } } -static void *generate_fake_oid(const void *old, size_t *len) +static char *generate_fake_oid(void *data) { static uint32_t counter = 1; /* avoid null oid */ const unsigned hashsz = the_hash_algo->rawsz; - unsigned char *out = xcalloc(hashsz, 1); - put_be32(out + hashsz - 4, counter++); - return out; + struct object_id oid; + char *hex = xmallocz(GIT_MAX_HEXSZ); + + oidclr(&oid); + put_be32(oid.hash + hashsz - 4, counter++); + return oid_to_hex_r(hex, &oid); } -static const struct object_id *anonymize_oid(const struct object_id *oid) +static const char *anonymize_oid(const char *oid_hex) { static struct hashmap objs; - size_t len = the_hash_algo->rawsz; - return anonymize_mem(&objs, generate_fake_oid, oid, &len); + size_t len = strlen(oid_hex); + return anonymize_str(&objs, generate_fake_oid, oid_hex, len, NULL); } static void show_filemodify(struct diff_queue_struct *q, @@ -448,9 +476,9 @@ static void show_filemodify(struct diff_queue_struct *q, */ if (no_data || S_ISGITLINK(spec->mode)) printf("M %06o %s ", spec->mode, - oid_to_hex(anonymize ? - anonymize_oid(&spec->oid) : - &spec->oid)); + anonymize ? + anonymize_oid(oid_to_hex(&spec->oid)) : + oid_to_hex(&spec->oid)); else { struct object *object = lookup_object(the_repository, &spec->oid); @@ -486,12 +514,12 @@ static const char *find_encoding(const char *begin, const char *end) return bol; } -static void *anonymize_ref_component(const void *old, size_t *len) +static char *anonymize_ref_component(void *data) { static int counter; struct strbuf out = STRBUF_INIT; strbuf_addf(&out, "ref%d", counter++); - return strbuf_detach(&out, len); + return strbuf_detach(&out, NULL); } static const char *anonymize_refname(const char *refname) @@ -510,13 +538,6 @@ static const char *anonymize_refname(const char *refname) static struct strbuf anon = STRBUF_INIT; int i; - /* - * We also leave "master" as a special case, since it does not reveal - * anything interesting. - */ - if (!strcmp(refname, "refs/heads/master")) - return refname; - strbuf_reset(&anon); for (i = 0; i < ARRAY_SIZE(prefixes); i++) { if (skip_prefix(refname, prefixes[i], &refname)) { @@ -539,14 +560,13 @@ static char *anonymize_commit_message(const char *old) return xstrfmt("subject %d\n\nbody\n", counter++); } -static struct hashmap idents; -static void *anonymize_ident(const void *old, size_t *len) +static char *anonymize_ident(void *data) { static int counter; struct strbuf out = STRBUF_INIT; strbuf_addf(&out, "User %d <user%d@example.com>", counter, counter); counter++; - return strbuf_detach(&out, len); + return strbuf_detach(&out, NULL); } /* @@ -556,6 +576,7 @@ static void *anonymize_ident(const void *old, size_t *len) */ static void anonymize_ident_line(const char **beg, const char **end) { + static struct hashmap idents; static struct strbuf buffers[] = { STRBUF_INIT, STRBUF_INIT }; static unsigned which_buffer; @@ -581,9 +602,9 @@ static void anonymize_ident_line(const char **beg, const char **end) size_t len; len = split.mail_end - split.name_begin; - ident = anonymize_mem(&idents, anonymize_ident, - split.name_begin, &len); - strbuf_add(out, ident, len); + ident = anonymize_str(&idents, anonymize_ident, + split.name_begin, len, NULL); + strbuf_addstr(out, ident); strbuf_addch(out, ' '); strbuf_add(out, split.date_begin, split.tz_end - split.date_begin); } else { @@ -705,9 +726,10 @@ static void handle_commit(struct commit *commit, struct rev_info *rev, if (mark) printf(":%d\n", mark); else - printf("%s\n", oid_to_hex(anonymize ? - anonymize_oid(&obj->oid) : - &obj->oid)); + printf("%s\n", + anonymize ? + anonymize_oid(oid_to_hex(&obj->oid)) : + oid_to_hex(&obj->oid)); i++; } @@ -722,12 +744,12 @@ static void handle_commit(struct commit *commit, struct rev_info *rev, show_progress(); } -static void *anonymize_tag(const void *old, size_t *len) +static char *anonymize_tag(void *data) { static int counter; struct strbuf out = STRBUF_INIT; strbuf_addf(&out, "tag message %d", counter++); - return strbuf_detach(&out, len); + return strbuf_detach(&out, NULL); } static void handle_tail(struct object_array *commits, struct rev_info *revs, @@ -797,8 +819,8 @@ static void handle_tag(const char *name, struct tag *tag) name = anonymize_refname(name); if (message) { static struct hashmap tags; - message = anonymize_mem(&tags, anonymize_tag, - message, &message_size); + message = anonymize_str(&tags, anonymize_tag, + message, message_size, NULL); } } @@ -842,25 +864,39 @@ static void handle_tag(const char *name, struct tag *tag) free(buf); return; case REWRITE: - 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; + 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); } - tagged_mark = get_object_mark(&p->object); } } - if (starts_with(name, "refs/tags/")) - name += 10; - printf("tag %s\nfrom :%d\n", name, tagged_mark); + 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 (show_original_ids) printf("original-oid %s\n", oid_to_hex(&tag->object.oid)); printf("%.*s%sdata %d\n%.*s\n", @@ -907,7 +943,7 @@ static void get_tags_and_duplicates(struct rev_cmdline_info *info) if (e->flags & UNINTERESTING) continue; - if (dwim_ref(e->name, strlen(e->name), &oid, &full_name) != 1) + if (dwim_ref(e->name, strlen(e->name), &oid, &full_name, 0) != 1) continue; if (refspecs.nr) { @@ -990,7 +1026,7 @@ static void handle_tags_and_duplicates(struct string_list *extras) /* * Getting here means we have a commit which * was excluded by a negative refspec (e.g. - * fast-export ^master master). If we are + * fast-export ^HEAD HEAD). If we are * referencing excluded commits, set the ref * to the exact commit. Otherwise, the user * wants the branch exported but every commit @@ -1047,11 +1083,16 @@ static void export_marks(char *file) error("Unable to write marks file %s.", file); } -static void import_marks(char *input_file) +static void import_marks(char *input_file, int check_exists) { char line[512]; - FILE *f = xfopen(input_file, "r"); + FILE *f; + struct stat sb; + if (check_exists && stat(input_file, &sb)) + return; + + f = xfopen(input_file, "r"); while (fgets(line, sizeof(line), f)) { uint32_t mark; char *line_end, *mark_end; @@ -1110,12 +1151,45 @@ static void handle_deletes(void) } } +static char *anonymize_seed(void *data) +{ + return xstrdup(data); +} + +static int parse_opt_anonymize_map(const struct option *opt, + const char *arg, int unset) +{ + struct hashmap *map = opt->value; + const char *delim, *value; + size_t keylen; + + BUG_ON_OPT_NEG(unset); + + delim = strchr(arg, ':'); + if (delim) { + keylen = delim - arg; + value = delim + 1; + } else { + keylen = strlen(arg); + value = arg; + } + + if (!keylen || !*value) + return error(_("--anonymize-map token cannot be empty")); + + anonymize_str(map, anonymize_seed, arg, keylen, (void *)value); + + return 0; +} + 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; + char *export_filename = NULL, + *import_filename = NULL, + *import_filename_if_exists = NULL; uint32_t lastimportid; struct string_list refspecs_list = STRING_LIST_INIT_NODUP; struct string_list paths_of_changed_objects = STRING_LIST_INIT_DUP; @@ -1135,6 +1209,10 @@ 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, @@ -1145,10 +1223,15 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) OPT_STRING_LIST(0, "refspec", &refspecs_list, N_("refspec"), N_("Apply refspec to exported refs")), OPT_BOOL(0, "anonymize", &anonymize, N_("anonymize output")), + OPT_CALLBACK_F(0, "anonymize-map", &anonymized_seeds, N_("from:to"), + N_("convert <from> to <to> in anonymized output"), + PARSE_OPT_NONEG, parse_opt_anonymize_map), OPT_BOOL(0, "reference-excluded-parents", &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() }; @@ -1170,6 +1253,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) if (argc > 1) usage_with_options (fast_export_usage, options); + if (anonymized_seeds.cmpfn && !anonymize) + die(_("--anonymize-map without --anonymize does not make sense")); + if (refspecs_list.nr) { int i; @@ -1182,8 +1268,12 @@ 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); + import_marks(import_filename, 0); + else if (import_filename_if_exists) + import_marks(import_filename_if_exists, 1); lastimportid = last_idnum; if (import_filename && revs.prune_data.nr) diff --git a/third_party/git/fast-import.c b/third_party/git/builtin/fast-import.c index b44d6a467e..1bf50a73dc 100644 --- a/third_party/git/fast-import.c +++ b/third_party/git/builtin/fast-import.c @@ -18,6 +18,7 @@ #include "object-store.h" #include "mem-pool.h" #include "commit-reach.h" +#include "khash.h" #define PACK_ID_BITS 16 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1) @@ -38,12 +39,28 @@ struct object_entry { struct pack_idx_entry idx; - struct object_entry *next; + struct hashmap_entry ent; uint32_t type : TYPE_BITS, pack_id : PACK_ID_BITS, depth : DEPTH_BITS; }; +static int object_entry_hashcmp(const void *map_data, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, + const void *keydata) +{ + const struct object_id *oid = keydata; + const struct object_entry *e1, *e2; + + e1 = container_of(eptr, const struct object_entry, ent); + if (oid) + return oidcmp(&e1->idx.oid, oid); + + e2 = container_of(entry_or_key, const struct object_entry, ent); + return oidcmp(&e1->idx.oid, &e2->idx.oid); +} + struct object_entry_pool { struct object_entry_pool *next_pool; struct object_entry *next_free; @@ -53,6 +70,7 @@ struct object_entry_pool { struct mark_set { union { + struct object_id *oids[1024]; struct object_entry *marked[1024]; struct mark_set *sets[1024]; } data; @@ -121,6 +139,7 @@ struct hash_list { typedef enum { WHENSPEC_RAW = 1, + WHENSPEC_RAW_PERMISSIVE, WHENSPEC_RFC2822, WHENSPEC_NOW } whenspec_type; @@ -131,6 +150,9 @@ struct recent_command { char *buf; }; +typedef void (*mark_set_inserter_t)(struct mark_set *s, struct object_id *oid, uintmax_t mark); +typedef void (*each_mark_fn_t)(uintmax_t mark, void *obj, void *cbp); + /* Configured limits on output */ static unsigned long max_depth = 50; static off_t max_packsize; @@ -173,7 +195,7 @@ static off_t pack_size; /* Table of objects we've written. */ static unsigned int object_entry_alloc = 5000; static struct object_entry_pool *blocks; -static struct object_entry *object_table[1 << 16]; +static struct hashmap object_table; static struct mark_set *marks; static const char *export_marks_file; static const char *import_marks_file; @@ -217,10 +239,16 @@ 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; +/* Submodule marks */ +static struct string_list sub_marks_from = STRING_LIST_INIT_DUP; +static struct string_list sub_marks_to = STRING_LIST_INIT_DUP; +static kh_oid_map_t *sub_oid_map; + /* Where to write output of cat-blob commands */ static int cat_blob_fd = STDOUT_FILENO; @@ -229,6 +257,29 @@ static void parse_get_mark(const char *p); static void parse_cat_blob(const char *p); static void parse_ls(const char *p, struct branch *b); +static void for_each_mark(struct mark_set *m, uintmax_t base, each_mark_fn_t callback, void *p) +{ + uintmax_t k; + if (m->shift) { + for (k = 0; k < 1024; k++) { + if (m->data.sets[k]) + for_each_mark(m->data.sets[k], base + (k << m->shift), callback, p); + } + } else { + for (k = 0; k < 1024; k++) { + if (m->data.marked[k]) + callback(base + k, m->data.marked[k], p); + } + } +} + +static void dump_marks_fn(uintmax_t mark, void *object, void *cbp) { + struct object_entry *e = object; + FILE *f = cbp; + + fprintf(f, ":%" PRIuMAX " %s\n", mark, oid_to_hex(&e->idx.oid)); +} + static void write_branch_report(FILE *rpt, struct branch *b) { fprintf(rpt, "%s:\n", b->name); @@ -257,8 +308,6 @@ static void write_branch_report(FILE *rpt, struct branch *b) fputc('\n', rpt); } -static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *); - static void write_crash_report(const char *err) { char *loc = git_pathdup("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid()); @@ -337,7 +386,7 @@ static void write_crash_report(const char *err) if (export_marks_file) fprintf(rpt, " exported to %s\n", export_marks_file); else - dump_marks_helper(rpt, 0, marks); + for_each_mark(marks, 0, dump_marks_fn, rpt); fputc('\n', rpt); fputs("-------------------\n", rpt); @@ -423,44 +472,37 @@ static struct object_entry *new_object(struct object_id *oid) static struct object_entry *find_object(struct object_id *oid) { - unsigned int h = oid->hash[0] << 8 | oid->hash[1]; - struct object_entry *e; - for (e = object_table[h]; e; e = e->next) - if (oideq(oid, &e->idx.oid)) - return e; - return NULL; + return hashmap_get_entry_from_hash(&object_table, oidhash(oid), oid, + struct object_entry, ent); } static struct object_entry *insert_object(struct object_id *oid) { - unsigned int h = oid->hash[0] << 8 | oid->hash[1]; - struct object_entry *e = object_table[h]; + struct object_entry *e; + unsigned int hash = oidhash(oid); - while (e) { - if (oideq(oid, &e->idx.oid)) - return e; - e = e->next; + e = hashmap_get_entry_from_hash(&object_table, hash, oid, + struct object_entry, ent); + if (!e) { + e = new_object(oid); + e->idx.offset = 0; + hashmap_entry_init(&e->ent, hash); + hashmap_add(&object_table, &e->ent); } - e = new_object(oid); - e->next = object_table[h]; - e->idx.offset = 0; - object_table[h] = e; return e; } static void invalidate_pack_id(unsigned int id) { - unsigned int h; unsigned long lu; struct tag *t; + struct hashmap_iter iter; + struct object_entry *e; - for (h = 0; h < ARRAY_SIZE(object_table); h++) { - struct object_entry *e; - - for (e = object_table[h]; e; e = e->next) - if (e->pack_id == id) - e->pack_id = MAX_PACK_ID; + hashmap_for_each_entry(&object_table, &iter, e, ent) { + if (e->pack_id == id) + e->pack_id = MAX_PACK_ID; } for (lu = 0; lu < branch_table_sz; lu++) { @@ -484,17 +526,8 @@ static unsigned int hc_str(const char *s, size_t len) return r; } -static char *pool_strdup(const char *s) -{ - size_t len = strlen(s) + 1; - char *r = mem_pool_alloc(&fi_mem_pool, len); - memcpy(r, s, len); - return r; -} - -static void insert_mark(uintmax_t idnum, struct object_entry *oe) +static void insert_mark(struct mark_set *s, uintmax_t idnum, struct object_entry *oe) { - struct mark_set *s = marks; while ((idnum >> s->shift) >= 1024) { s = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set)); s->shift = marks->shift + 10; @@ -515,10 +548,9 @@ static void insert_mark(uintmax_t idnum, struct object_entry *oe) s->data.marked[idnum] = oe; } -static struct object_entry *find_mark(uintmax_t idnum) +static void *find_mark(struct mark_set *s, uintmax_t idnum) { uintmax_t orig_idnum = idnum; - struct mark_set *s = marks; struct object_entry *oe = NULL; if ((idnum >> s->shift) < 1024) { while (s && s->shift) { @@ -575,7 +607,7 @@ static struct branch *new_branch(const char *name) die("Branch name doesn't conform to GIT standards: %s", name); b = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct branch)); - b->name = pool_strdup(name); + b->name = mem_pool_strdup(&fi_mem_pool, name); b->table_next_branch = branch_table[hc]; b->branch_tree.versions[0].mode = S_IFDIR; b->branch_tree.versions[1].mode = S_IFDIR; @@ -707,7 +739,6 @@ static void start_packfile(void) { struct strbuf tmp_file = STRBUF_INIT; struct packed_git *p; - struct pack_header hdr; int pack_fd; pack_fd = odb_mkstemp(&tmp_file, "pack/tmp_pack_XXXXXX"); @@ -718,13 +749,8 @@ static void start_packfile(void) p->do_not_close = 1; pack_file = hashfd(pack_fd, p->pack_name); - hdr.hdr_signature = htonl(PACK_SIGNATURE); - hdr.hdr_version = htonl(2); - hdr.hdr_entries = 0; - hashwrite(pack_file, &hdr, sizeof(hdr)); - pack_data = p; - pack_size = sizeof(hdr); + pack_size = write_pack_header(pack_file, 0); object_count = 0; REALLOC_ARRAY(all_packs, pack_id + 1); @@ -803,9 +829,9 @@ static int loosen_small_pack(const struct packed_git *p) unpack.in = p->pack_fd; unpack.git_cmd = 1; unpack.stdout_to_stderr = 1; - argv_array_push(&unpack.args, "unpack-objects"); + strvec_push(&unpack.args, "unpack-objects"); if (!show_stats) - argv_array_push(&unpack.args, "-q"); + strvec_push(&unpack.args, "-q"); return run_command(&unpack); } @@ -918,7 +944,7 @@ static int store_object( e = insert_object(&oid); if (mark) - insert_mark(mark, e); + insert_mark(marks, mark, e); if (e->idx.offset) { duplicate_count_by_type[type]++; return 1; @@ -1116,7 +1142,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark) e = insert_object(&oid); if (mark) - insert_mark(mark, e); + insert_mark(marks, mark, e); if (e->idx.offset) { duplicate_count_by_type[OBJ_BLOB]++; @@ -1654,26 +1680,6 @@ static void dump_tags(void) strbuf_release(&err); } -static void dump_marks_helper(FILE *f, - uintmax_t base, - struct mark_set *m) -{ - uintmax_t k; - if (m->shift) { - for (k = 0; k < 1024; k++) { - if (m->data.sets[k]) - dump_marks_helper(f, base + (k << m->shift), - m->data.sets[k]); - } - } else { - for (k = 0; k < 1024; k++) { - if (m->data.marked[k]) - fprintf(f, ":%" PRIuMAX " %s\n", base + k, - oid_to_hex(&m->data.marked[k]->idx.oid)); - } - } -} - static void dump_marks(void) { struct lock_file mark_lock = LOCK_INIT; @@ -1682,6 +1688,12 @@ 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); @@ -1697,7 +1709,7 @@ static void dump_marks(void) return; } - dump_marks_helper(f, 0, marks); + for_each_mark(marks, 0, dump_marks_fn, f); if (commit_lock_file(&mark_lock)) { failure |= error_errno("Unable to write file %s", export_marks_file); @@ -1705,21 +1717,38 @@ static void dump_marks(void) } } -static void read_marks(void) +static void insert_object_entry(struct mark_set *s, struct object_id *oid, uintmax_t mark) +{ + struct object_entry *e; + e = find_object(oid); + if (!e) { + enum object_type type = oid_object_info(the_repository, + oid, NULL); + if (type < 0) + die("object not found: %s", oid_to_hex(oid)); + e = insert_object(oid); + e->type = type; + e->pack_id = MAX_PACK_ID; + e->idx.offset = 1; /* just not zero! */ + } + insert_mark(s, mark, e); +} + +static void insert_oid_entry(struct mark_set *s, struct object_id *oid, uintmax_t mark) +{ + insert_mark(s, mark, xmemdupz(oid, sizeof(*oid))); +} + +static void read_mark_file(struct mark_set *s, FILE *f, mark_set_inserter_t inserter) { char line[512]; - FILE *f = fopen(import_marks_file, "r"); - if (f) - ; - else if (import_marks_file_ignore_missing && errno == ENOENT) - goto done; /* Marks file does not exist */ - else - die_errno("cannot read '%s'", import_marks_file); while (fgets(line, sizeof(line), f)) { uintmax_t mark; char *end; struct object_id oid; - struct object_entry *e; + + /* Ensure SHA-1 objects are padded with zeros. */ + memset(oid.hash, 0, sizeof(oid.hash)); end = strchr(line, '\n'); if (line[0] != ':' || !end) @@ -1727,21 +1756,23 @@ static void read_marks(void) *end = 0; mark = strtoumax(line + 1, &end, 10); if (!mark || end == line + 1 - || *end != ' ' || get_oid_hex(end + 1, &oid)) + || *end != ' ' + || get_oid_hex_any(end + 1, &oid) == GIT_HASH_UNKNOWN) die("corrupt mark line: %s", line); - e = find_object(&oid); - if (!e) { - enum object_type type = oid_object_info(the_repository, - &oid, NULL); - if (type < 0) - die("object not found: %s", oid_to_hex(&oid)); - e = insert_object(&oid); - e->type = type; - e->pack_id = MAX_PACK_ID; - e->idx.offset = 1; /* just not zero! */ - } - insert_mark(mark, e); + inserter(s, &oid, mark); } +} + +static void read_marks(void) +{ + FILE *f = fopen(import_marks_file, "r"); + if (f) + ; + else if (import_marks_file_ignore_missing && errno == ENOENT) + goto done; /* Marks file does not exist */ + else + die_errno("cannot read '%s'", import_marks_file); + read_mark_file(marks, f, insert_object_entry); fclose(f); done: import_marks_file_done = 1; @@ -1763,7 +1794,6 @@ 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; @@ -1784,7 +1814,7 @@ static int read_next_command(void) free(rc->buf); } - rc->buf = command_buf.buf; + rc->buf = xstrdup(command_buf.buf); rc->prev = cmd_tail; rc->next = cmd_hist.prev; rc->prev->next = rc; @@ -1833,7 +1863,6 @@ 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); @@ -1869,7 +1898,7 @@ static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res) return 1; } -static int validate_raw_date(const char *src, struct strbuf *result) +static int validate_raw_date(const char *src, struct strbuf *result, int strict) { const char *orig_src = src; char *endp; @@ -1878,7 +1907,11 @@ static int validate_raw_date(const char *src, struct strbuf *result) errno = 0; num = strtoul(src, &endp, 10); - /* NEEDSWORK: perhaps check for reasonable values? */ + /* + * NEEDSWORK: perhaps check for reasonable values? For example, we + * could error on values representing times more than a + * day in the future. + */ if (errno || endp == src || *endp != ' ') return -1; @@ -1887,7 +1920,13 @@ static int validate_raw_date(const char *src, struct strbuf *result) return -1; num = strtoul(src + 1, &endp, 10); - if (errno || endp == src + 1 || *endp || 1400 < num) + /* + * NEEDSWORK: check for brokenness other than num > 1400, such as + * (num % 100) >= 60, or ((num % 100) % 15) != 0 ? + */ + if (errno || endp == src + 1 || *endp || /* did not parse */ + (strict && (1400 < num)) /* parsed a broken timezone */ + ) return -1; strbuf_addstr(result, orig_src); @@ -1921,7 +1960,11 @@ static char *parse_ident(const char *buf) switch (whenspec) { case WHENSPEC_RAW: - if (validate_raw_date(ltgt, &ident) < 0) + if (validate_raw_date(ltgt, &ident, 1) < 0) + die("Invalid raw date \"%s\" in ident: %s", ltgt, buf); + break; + case WHENSPEC_RAW_PERMISSIVE: + if (validate_raw_date(ltgt, &ident, 0) < 0) die("Invalid raw date \"%s\" in ident: %s", ltgt, buf); break; case WHENSPEC_RFC2822: @@ -2129,6 +2172,30 @@ static uintmax_t change_note_fanout(struct tree_entry *root, return do_change_note_fanout(root, root, hex_oid, 0, path, 0, fanout); } +static int parse_mapped_oid_hex(const char *hex, struct object_id *oid, const char **end) +{ + int algo; + khiter_t it; + + /* Make SHA-1 object IDs have all-zero padding. */ + memset(oid->hash, 0, sizeof(oid->hash)); + + algo = parse_oid_hex_any(hex, oid, end); + if (algo == GIT_HASH_UNKNOWN) + return -1; + + it = kh_get_oid_map(sub_oid_map, *oid); + /* No such object? */ + if (it == kh_end(sub_oid_map)) { + /* If we're using the same algorithm, pass it through. */ + if (hash_algos[algo].format_id == the_hash_algo->format_id) + return 0; + return -1; + } + oidcpy(oid, kh_value(sub_oid_map, it)); + return 0; +} + /* * Given a pointer into a string, parse a mark reference: * @@ -2209,13 +2276,13 @@ static void file_change_m(const char *p, struct branch *b) } if (*p == ':') { - oe = find_mark(parse_mark_ref_space(&p)); + oe = find_mark(marks, parse_mark_ref_space(&p)); oidcpy(&oid, &oe->idx.oid); } else if (skip_prefix(p, "inline ", &p)) { inline_data = 1; oe = NULL; /* not used with inline_data, but makes gcc happy */ } else { - if (parse_oid_hex(p, &oid, &p)) + if (parse_mapped_oid_hex(p, &oid, &p)) die("Invalid dataref: %s", command_buf.buf); oe = find_object(&oid); if (*p++ != ' ') @@ -2383,13 +2450,13 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa /* Now parse the notemodify command. */ /* <dataref> or 'inline' */ if (*p == ':') { - oe = find_mark(parse_mark_ref_space(&p)); + oe = find_mark(marks, parse_mark_ref_space(&p)); oidcpy(&oid, &oe->idx.oid); } else if (skip_prefix(p, "inline ", &p)) { inline_data = 1; oe = NULL; /* not used with inline_data, but makes gcc happy */ } else { - if (parse_oid_hex(p, &oid, &p)) + if (parse_mapped_oid_hex(p, &oid, &p)) die("Invalid dataref: %s", command_buf.buf); oe = find_object(&oid); if (*p++ != ' ') @@ -2404,7 +2471,7 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa oidcpy(&commit_oid, &s->oid); } else if (*p == ':') { uintmax_t commit_mark = parse_mark_ref_eol(p); - struct object_entry *commit_oe = find_mark(commit_mark); + struct object_entry *commit_oe = find_mark(marks, commit_mark); if (commit_oe->type != OBJ_COMMIT) die("Mark :%" PRIuMAX " not a commit", commit_mark); oidcpy(&commit_oid, &commit_oe->idx.oid); @@ -2491,18 +2558,14 @@ static void parse_from_existing(struct branch *b) } } -static int parse_from(struct branch *b) +static int parse_objectish(struct branch *b, const char *objectish) { - 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(from); + s = lookup_branch(objectish); if (b == s) die("Can't create a branch from itself: %s", b->name); else if (s) { @@ -2510,9 +2573,9 @@ static int parse_from(struct branch *b) oidcpy(&b->oid, &s->oid); oidcpy(&b->branch_tree.versions[0].oid, t); oidcpy(&b->branch_tree.versions[1].oid, t); - } else if (*from == ':') { - uintmax_t idnum = parse_mark_ref_eol(from); - struct object_entry *oe = find_mark(idnum); + } else if (*objectish == ':') { + uintmax_t idnum = parse_mark_ref_eol(objectish); + struct object_entry *oe = find_mark(marks, idnum); if (oe->type != OBJ_COMMIT) die("Mark :%" PRIuMAX " not a commit", idnum); if (!oideq(&b->oid, &oe->idx.oid)) { @@ -2525,13 +2588,13 @@ static int parse_from(struct branch *b) } else parse_from_existing(b); } - } else if (!get_oid(from, &b->oid)) { + } else if (!get_oid(objectish, &b->oid)) { parse_from_existing(b); if (is_null_oid(&b->oid)) b->delete = 1; } else - die("Invalid ref name or SHA1 expression: %s", from); + die("Invalid ref name or SHA1 expression: %s", objectish); if (b->branch_tree.tree && !oideq(&oid, &b->branch_tree.versions[1].oid)) { release_tree_content_recursive(b->branch_tree.tree); @@ -2542,6 +2605,26 @@ static int parse_from(struct branch *b) 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; @@ -2556,7 +2639,7 @@ static struct hash_list *parse_merge(unsigned int *count) oidcpy(&n->oid, &s->oid); else if (*from == ':') { uintmax_t idnum = parse_mark_ref_eol(from); - struct object_entry *oe = find_mark(idnum); + struct object_entry *oe = find_mark(marks, idnum); if (oe->type != OBJ_COMMIT) die("Mark :%" PRIuMAX " not a commit", idnum); oidcpy(&n->oid, &oe->idx.oid); @@ -2588,7 +2671,7 @@ static void parse_new_commit(const char *arg) struct branch *b; char *author = NULL; char *committer = NULL; - const char *encoding = NULL; + char *encoding = NULL; struct hash_list *merge_list = NULL; unsigned int merge_count; unsigned char prev_fanout, new_fanout; @@ -2611,8 +2694,10 @@ 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 ", &encoding)) + if (skip_prefix(command_buf.buf, "encoding ", &v)) { + encoding = xstrdup(v); read_next_command(); + } parse_data(&msg, 0, NULL); read_next_command(); parse_from(b); @@ -2686,6 +2771,7 @@ 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; @@ -2706,13 +2792,14 @@ static void parse_new_tag(const char *arg) t = mem_pool_alloc(&fi_mem_pool, sizeof(struct tag)); memset(t, 0, sizeof(struct tag)); - t->name = pool_strdup(arg); + t->name = mem_pool_strdup(&fi_mem_pool, arg); if (last_tag) last_tag->next_tag = t; else first_tag = t; last_tag = t; read_next_command(); + parse_mark(); /* from ... */ if (!skip_prefix(command_buf.buf, "from ", &from)) @@ -2726,7 +2813,7 @@ static void parse_new_tag(const char *arg) } else if (*from == ':') { struct object_entry *oe; from_mark = parse_mark_ref_eol(from); - oe = find_mark(from_mark); + oe = find_mark(marks, from_mark); type = oe->type; oidcpy(&oid, &oe->idx.oid); } else if (!get_oid(from, &oid)) { @@ -2769,7 +2856,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, 0)) + if (store_object(OBJ_TAG, &new_data, NULL, &t->oid, next_mark)) t->pack_id = MAX_PACK_ID; else t->pack_id = pack_id; @@ -2778,6 +2865,7 @@ 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) { @@ -2793,6 +2881,32 @@ 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; } @@ -2857,7 +2971,7 @@ static void parse_get_mark(const char *p) if (*p != ':') die("Not a mark: %s", p); - oe = find_mark(parse_mark_ref_eol(p)); + oe = find_mark(marks, parse_mark_ref_eol(p)); if (!oe) die("Unknown mark: %s", command_buf.buf); @@ -2872,12 +2986,12 @@ static void parse_cat_blob(const char *p) /* cat-blob SP <object> LF */ if (*p == ':') { - oe = find_mark(parse_mark_ref_eol(p)); + oe = find_mark(marks, parse_mark_ref_eol(p)); if (!oe) die("Unknown mark: %s", command_buf.buf); oidcpy(&oid, &oe->idx.oid); } else { - if (parse_oid_hex(p, &oid, &p)) + if (parse_mapped_oid_hex(p, &oid, &p)) die("Invalid dataref: %s", command_buf.buf); if (*p) die("Garbage after SHA1: %s", command_buf.buf); @@ -2941,18 +3055,54 @@ static struct object_entry *dereference(struct object_entry *oe, return find_object(oid); } +static void insert_mapped_mark(uintmax_t mark, void *object, void *cbp) +{ + struct object_id *fromoid = object; + struct object_id *tooid = find_mark(cbp, mark); + int ret; + khiter_t it; + + it = kh_put_oid_map(sub_oid_map, *fromoid, &ret); + /* We've already seen this object. */ + if (ret == 0) + return; + kh_value(sub_oid_map, it) = tooid; +} + +static void build_mark_map_one(struct mark_set *from, struct mark_set *to) +{ + for_each_mark(from, 0, insert_mapped_mark, to); +} + +static void build_mark_map(struct string_list *from, struct string_list *to) +{ + struct string_list_item *fromp, *top; + + sub_oid_map = kh_init_oid_map(); + + for_each_string_list_item(fromp, from) { + top = string_list_lookup(to, fromp->string); + if (!fromp->util) { + die(_("Missing from marks for submodule '%s'"), fromp->string); + } else if (!top || !top->util) { + die(_("Missing to marks for submodule '%s'"), fromp->string); + } + build_mark_map_one(fromp->util, top->util); + } +} + static struct object_entry *parse_treeish_dataref(const char **p) { struct object_id oid; struct object_entry *e; if (**p == ':') { /* <mark> */ - e = find_mark(parse_mark_ref_space(p)); + e = find_mark(marks, parse_mark_ref_space(p)); if (!e) die("Unknown mark: %s", command_buf.buf); oidcpy(&oid, &e->idx.oid); } else { /* <sha1> */ - if (parse_oid_hex(*p, &oid, p)) + if (parse_mapped_oid_hex(*p, &oid, p)) die("Invalid dataref: %s", command_buf.buf); e = find_object(&oid); if (*(*p)++ != ' ') @@ -3059,6 +3209,28 @@ 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(marks, next_mark, e); +} + static char* make_fast_import_path(const char *path) { if (!relative_marks_paths || is_absolute_path(path)) @@ -3079,7 +3251,6 @@ 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; } @@ -3088,6 +3259,8 @@ static void option_date_format(const char *fmt) { if (!strcmp(fmt, "raw")) whenspec = WHENSPEC_RAW; + else if (!strcmp(fmt, "raw-permissive")) + whenspec = WHENSPEC_RAW_PERMISSIVE; else if (!strcmp(fmt, "rfc2822")) whenspec = WHENSPEC_RFC2822; else if (!strcmp(fmt, "now")) @@ -3120,7 +3293,6 @@ 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) @@ -3138,6 +3310,26 @@ static void option_export_pack_edges(const char *edges) pack_edges = xfopen(edges, "a"); } +static void option_rewrite_submodules(const char *arg, struct string_list *list) +{ + struct mark_set *ms; + FILE *fp; + char *s = xstrdup(arg); + char *f = strchr(s, ':'); + if (!f) + die(_("Expected format name:filename for submodule rewrite option")); + *f = '\0'; + f++; + ms = xcalloc(1, sizeof(*ms)); + string_list_insert(list, s)->util = ms; + + fp = fopen(f, "r"); + if (!fp) + die_errno("cannot read '%s'", f); + read_mark_file(ms, fp, insert_oid_entry); + fclose(fp); +} + static int parse_one_option(const char *option) { if (skip_prefix(option, "max-pack-size=", &option)) { @@ -3163,10 +3355,12 @@ 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 (starts_with(option, "quiet")) { + } else if (!strcmp(option, "quiet")) { show_stats = 0; - } else if (starts_with(option, "stats")) { + } else if (!strcmp(option, "stats")) { show_stats = 1; + } else if (!strcmp(option, "allow-unsafe-features")) { + ; /* already handled during early option parsing */ } else { return 0; } @@ -3174,6 +3368,13 @@ 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; @@ -3181,11 +3382,21 @@ 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 (skip_prefix(feature, "rewrite-submodules-to=", &arg)) { + option_rewrite_submodules(arg, &sub_marks_to); + } else if (skip_prefix(feature, "rewrite-submodules-from=", &arg)) { + option_rewrite_submodules(arg, &sub_marks_from); + } else if (skip_prefix(feature, "rewrite-submodules-from=", &arg)) { } else if (!strcmp(feature, "get-mark")) { ; /* Don't die - this feature is supported */ } else if (!strcmp(feature, "cat-blob")) { @@ -3291,16 +3502,16 @@ static void parse_argv(void) seen_data_command = 1; if (import_marks_file) read_marks(); + build_mark_map(&sub_marks_from, &sub_marks_to); } -int cmd_main(int argc, const char **argv) +int cmd_fast_import(int argc, const char **argv, const char *prefix) { unsigned int i; if (argc == 2 && !strcmp(argv[1], "-h")) usage(fast_import_usage); - setup_git_directory(); reset_pack_idx_option(&pack_idx_opts); git_pack_config(); @@ -3311,6 +3522,22 @@ 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)); + hashmap_init(&object_table, object_entry_hashcmp, NULL, 0); + + /* + * 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; @@ -3342,6 +3569,8 @@ 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/builtin/fetch-pack.c b/third_party/git/builtin/fetch-pack.c index dc1485c8aa..58b7c1fbdc 100644 --- a/third_party/git/builtin/fetch-pack.c +++ b/third_party/git/builtin/fetch-pack.c @@ -3,7 +3,7 @@ #include "fetch-pack.h" #include "remote.h" #include "connect.h" -#include "sha1-array.h" +#include "oid-array.h" #include "protocol.h" static const char fetch_pack_usage[] = @@ -48,8 +48,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) struct ref **sought = NULL; int nr_sought = 0, alloc_sought = 0; int fd[2]; - char *pack_lockfile = NULL; - char **pack_lockfile_ptr = NULL; + struct string_list pack_lockfiles = STRING_LIST_INIT_DUP; + struct string_list *pack_lockfiles_ptr = NULL; struct child_process *conn; struct fetch_pack_args args; struct oid_array shallow = OID_ARRAY_INIT; @@ -134,7 +134,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) } if (!strcmp("--lock-pack", arg)) { args.lock_pack = 1; - pack_lockfile_ptr = &pack_lockfile; + pack_lockfiles_ptr = &pack_lockfiles; continue; } if (!strcmp("--check-self-contained-and-connected", arg)) { @@ -153,10 +153,6 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) args.from_promisor = 1; continue; } - if (!strcmp("--no-dependents", arg)) { - args.no_dependents = 1; - continue; - } if (skip_prefix(arg, ("--" CL_ARG__FILTER "="), &arg)) { parse_list_objects_filter(&args.filter_options, arg); continue; @@ -224,7 +220,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) version = discover_version(&reader); switch (version) { case protocol_v2: - get_remote_refs(fd[1], &reader, &ref, 0, NULL, NULL); + get_remote_refs(fd[1], &reader, &ref, 0, NULL, NULL, args.stateless_rpc); break; case protocol_v1: case protocol_v0: @@ -235,10 +231,15 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) } ref = fetch_pack(&args, fd, ref, sought, nr_sought, - &shallow, pack_lockfile_ptr, version); - if (pack_lockfile) { - printf("lock %s\n", pack_lockfile); + &shallow, pack_lockfiles_ptr, version); + if (pack_lockfiles.nr) { + int i; + + printf("lock %s\n", pack_lockfiles.items[0].string); fflush(stdout); + for (i = 1; i < pack_lockfiles.nr; i++) + warning(_("Lockfile created but not reported: %s"), + pack_lockfiles.items[i].string); } if (args.check_self_contained_and_connected && args.self_contained_and_connected) { diff --git a/third_party/git/builtin/fetch.c b/third_party/git/builtin/fetch.c index 717dd14e89..f9c3c49f14 100644 --- a/third_party/git/builtin/fetch.c +++ b/third_party/git/builtin/fetch.c @@ -7,6 +7,7 @@ #include "refs.h" #include "refspec.h" #include "object-store.h" +#include "oidset.h" #include "commit.h" #include "builtin.h" #include "string-list.h" @@ -18,11 +19,15 @@ #include "submodule-config.h" #include "submodule.h" #include "connected.h" -#include "argv-array.h" +#include "strvec.h" #include "utf8.h" #include "packfile.h" #include "list-objects-filter-options.h" #include "commit-reach.h" +#include "branch.h" +#include "promisor-remote.h" +#include "commit-graph.h" +#include "shallow.h" #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000) @@ -50,11 +55,14 @@ 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, verbosity, deepen_relative; +static int all, append, dry_run, force, keep, multiple, update_head_ok; +static int write_fetch_head = 1; +static int verbosity, deepen_relative, set_upstream; static int progress = -1; static int enable_auto_gc = 1; static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen; -static int max_children = 1; +static int max_jobs = -1, submodule_fetch_jobs_config = -1; +static int fetch_parallel_config = 1; static enum transport_family family; static const char *depth; static const char *deepen_since; @@ -71,6 +79,8 @@ 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 stdin_refspecs = 0; static int git_fetch_config(const char *k, const char *v, void *cb) { @@ -96,13 +106,20 @@ static int git_fetch_config(const char *k, const char *v, void *cb) } if (!strcmp(k, "submodule.fetchjobs")) { - max_children = parse_submodule_fetchjobs(k, v); + submodule_fetch_jobs_config = 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); } @@ -123,6 +140,8 @@ 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"), @@ -134,17 +153,19 @@ 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_children, + OPT_INTEGER('j', "jobs", &max_jobs, N_("number of submodules fetched in parallel")), OPT_BOOL('p', "prune", &prune, N_("prune remote-tracking branches no longer on remote")), OPT_BOOL('P', "prune-tags", &prune_tags, N_("prune local tags no longer on remote and clobber changed tags")), - { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"), + OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules, N_("on-demand"), N_("control recursive fetching of submodules"), - PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules }, + PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules), OPT_BOOL(0, "dry-run", &dry_run, N_("dry run")), + OPT_BOOL(0, "write-fetch-head", &write_fetch_head, + N_("write fetched references to the FETCH_HEAD file")), OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")), OPT_BOOL('u', "update-head-ok", &update_head_ok, N_("allow updating of HEAD ref")), @@ -162,15 +183,15 @@ static struct option builtin_fetch_options[] = { 1, PARSE_OPT_NONEG), { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"), N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN }, - { OPTION_CALLBACK, 0, "recurse-submodules-default", + OPT_CALLBACK_F(0, "recurse-submodules-default", &recurse_submodules_default, N_("on-demand"), N_("default for recursive fetching of submodules " "(lower priority than config files)"), - PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules }, + PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules), OPT_BOOL(0, "update-shallow", &update_shallow, N_("accept refs that update .git/shallow")), - { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"), - N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg }, + OPT_CALLBACK_F(0, "refmap", NULL, N_("refmap"), + N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg), OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")), OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"), TRANSPORT_FAMILY_IPV4), @@ -179,10 +200,16 @@ static struct option builtin_fetch_options[] = { OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"), N_("report that we have only objects reachable from this object")), OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options), + OPT_BOOL(0, "auto-maintenance", &enable_auto_gc, + N_("run 'maintenance --auto' after fetching")), OPT_BOOL(0, "auto-gc", &enable_auto_gc, - N_("run 'gc --auto' after fetching")), + N_("run 'maintenance --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_BOOL(0, "stdin", &stdin_refspecs, + N_("accept refspecs from stdin")), OPT_END() }; @@ -239,32 +266,31 @@ static void add_merge_config(struct ref **head, } } -static int will_fetch(struct ref **head, const unsigned char *sha1) +static void create_fetch_oidset(struct ref **head, struct oidset *out) { struct ref *rm = *head; while (rm) { - if (hasheq(rm->old_oid.hash, sha1)) - return 1; + oidset_insert(out, &rm->old_oid); rm = rm->next; } - return 0; } struct refname_hash_entry { - struct hashmap_entry ent; /* must be the first member */ + struct hashmap_entry ent; struct object_id oid; int ignore; char refname[FLEX_ARRAY]; }; static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data, - const void *e1_, - const void *e2_, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *keydata) { - const struct refname_hash_entry *e1 = e1_; - const struct refname_hash_entry *e2 = e2_; + const struct refname_hash_entry *e1, *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); } @@ -276,9 +302,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, strhash(refname)); + hashmap_entry_init(&ent->ent, strhash(refname)); oidcpy(&ent->oid, oid); - hashmap_add(map, ent); + hashmap_add(map, &ent->ent); return ent; } @@ -313,13 +339,16 @@ 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) { @@ -334,11 +363,10 @@ 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, - 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)) + !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)) clear_item(item); item = NULL; continue; @@ -351,8 +379,8 @@ static void find_non_local_tags(const struct ref *refs, * fetch. */ if (item && - !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) && - !will_fetch(head, item->oid.hash)) + !has_object_file_with_flags(&item->oid, quick_flags) && + !oidset_contains(&fetch_oids, &item->oid)) clear_item(item); item = NULL; @@ -365,15 +393,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(&existing_refs, 1); + hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent); /* * 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, OBJECT_INFO_QUICK) && - !will_fetch(head, item->oid.hash)) + !has_object_file_with_flags(&item->oid, quick_flags) && + !oidset_contains(&fetch_oids, &item->oid)) clear_item(item); /* @@ -383,8 +411,10 @@ 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_from_hash(&remote_refs, strhash(refname), refname); + item = hashmap_get_entry_from_hash(&remote_refs, hash, refname, + struct refname_hash_entry, ent); if (!item) BUG("unseen remote ref?"); @@ -398,8 +428,9 @@ static void find_non_local_tags(const struct ref *refs, **tail = rm; *tail = &rm->next; } - hashmap_free(&remote_refs, 1); + hashmap_free_entries(&remote_refs, struct refname_hash_entry, ent); string_list_clear(&remote_refs_list, 0); + oidset_clear(&fetch_oids); } static struct ref *get_ref_map(struct remote *remote, @@ -416,6 +447,7 @@ static struct ref *get_ref_map(struct remote *remote, struct ref *orefs = NULL, **oref_tail = &orefs; struct hashmap existing_refs; + int existing_refs_populated = 0; if (rs->nr) { struct refspec *fetch_refspec; @@ -507,26 +539,41 @@ static struct ref *get_ref_map(struct remote *remote, tail = &rm->next; } - ref_map = ref_remove_duplicates(ref_map); + /* + * apply negative refspecs first, before we remove duplicates. This is + * necessary as negative refspecs might remove an otherwise conflicting + * duplicate. + */ + if (rs->nr) + ref_map = apply_negative_refspecs(ref_map, rs); + else + ref_map = apply_negative_refspecs(ref_map, &remote->fetch); - refname_hash_init(&existing_refs); - for_each_ref(add_one_refname, &existing_refs); + ref_map = ref_remove_duplicates(ref_map); for (rm = ref_map; rm; rm = rm->next) { 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_from_hash(&existing_refs, - strhash(refname), - refname); + if (!existing_refs_populated) { + refname_hash_init(&existing_refs); + for_each_ref(add_one_refname, &existing_refs); + existing_refs_populated = 1; + } + + peer_item = hashmap_get_entry_from_hash(&existing_refs, + hash, refname, + struct refname_hash_entry, ent); if (peer_item) { struct object_id *old_oid = &peer_item->oid; oidcpy(&rm->peer_ref->old_oid, old_oid); } } } - hashmap_free(&existing_refs, 1); + if (existing_refs_populated) + hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent); return ref_map; } @@ -621,7 +668,7 @@ static void prepare_format_display(struct ref *ref_map) struct ref *rm; const char *format = "full"; - git_config_get_string_const("fetch.output", &format); + git_config_get_string_tmp("fetch.output", &format); if (!strcasecmp(format, "full")) compact_format = 0; else if (!strcasecmp(format, "compact")) @@ -869,7 +916,9 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, const char *what, *kind; struct ref *rm; char *url; - const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(the_repository); + const char *filename = (!write_fetch_head + ? "/dev/null" + : git_path_fetch_head(the_repository)); int want_status; int summary_width = transport_summary_width(ref_map); @@ -883,8 +932,10 @@ 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; + rm = ref_map; - if (check_connected(iterate_ref_map, &rm, NULL)) { + if (check_connected(iterate_ref_map, &rm, &opt)) { rc = error(_("%s did not send all necessary objects\n"), url); goto abort; } @@ -927,25 +978,21 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, ref->force = rm->peer_ref->force; } - if (recurse_submodules != RECURSE_SUBMODULES_OFF) + if (recurse_submodules != RECURSE_SUBMODULES_OFF && + (!rm->peer_ref || !oideq(&ref->old_oid, &ref->new_oid))) { check_for_new_submodule_commits(&rm->old_oid); + } if (!strcmp(rm->name, "HEAD")) { kind = ""; what = ""; } - else if (starts_with(rm->name, "refs/heads/")) { + else if (skip_prefix(rm->name, "refs/heads/", &what)) kind = "branch"; - what = rm->name + 11; - } - else if (starts_with(rm->name, "refs/tags/")) { + else if (skip_prefix(rm->name, "refs/tags/", &what)) kind = "tag"; - what = rm->name + 10; - } - else if (starts_with(rm->name, "refs/remotes/")) { + else if (skip_prefix(rm->name, "refs/remotes/", &what)) kind = "remote-tracking branch"; - what = rm->name + 13; - } else { kind = ""; what = rm->name; @@ -990,11 +1037,17 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, rc |= update_local_ref(ref, what, rm, ¬e, summary_width); free(ref); - } else + } else if (write_fetch_head || dry_run) { + /* + * Display fetches written to FETCH_HEAD (or + * would be written to FETCH_HEAD, if --dry-run + * is set). + */ format_display(¬e, '*', *kind ? kind : "branch", NULL, *what ? what : "HEAD", "FETCH_HEAD", summary_width); + } if (note.len) { if (verbosity >= 0 && !shown_url) { fprintf(stderr, _("From %.*s\n"), @@ -1054,7 +1107,8 @@ 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(&r->old_oid)) + if (!has_object_file_with_flags(&r->old_oid, + OBJECT_INFO_SKIP_FETCH_OBJECT)) return -1; } @@ -1065,8 +1119,11 @@ 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) + if (ret) { + trace2_region_enter("fetch", "fetch_refs", the_repository); 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 @@ -1082,11 +1139,14 @@ 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 = store_updated_refs(transport->url, - transport->remote->name, - connectivity_checked, - ref_map); + int ret; + trace2_region_enter("fetch", "consume_refs", the_repository); + 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; } @@ -1238,13 +1298,10 @@ 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) { - 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); + const char *spec = + expand_list_objects_filter_spec(&filter_options); + set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, spec); set_option(transport, TRANS_OPT_FROM_PROMISOR, "1"); - strbuf_release(&expanded_filter_spec); } if (negotiation_tip.nr) { if (transport->smart_options) @@ -1292,7 +1349,7 @@ static int do_fetch(struct transport *transport, int autotags = (transport->remote->fetch_tags == 1); int retcode = 0; const struct ref *remote_refs; - struct argv_array ref_prefixes = ARGV_ARRAY_INIT; + struct strvec ref_prefixes = STRVEC_INIT; int must_list_refs = 1; if (tags == TAGS_DEFAULT) { @@ -1303,7 +1360,7 @@ static int do_fetch(struct transport *transport, } /* if not appending, truncate FETCH_HEAD */ - if (!append && !dry_run) { + if (!append && write_fetch_head) { retcode = truncate_fetch_head(); if (retcode) goto cleanup; @@ -1330,16 +1387,18 @@ static int do_fetch(struct transport *transport, if (tags == TAGS_SET || tags == TAGS_DEFAULT) { must_list_refs = 1; - if (ref_prefixes.argc) - argv_array_push(&ref_prefixes, "refs/tags/"); + if (ref_prefixes.nr) + strvec_push(&ref_prefixes, "refs/tags/"); } - if (must_list_refs) + if (must_list_refs) { + trace2_region_enter("fetch", "remote_refs", the_repository); remote_refs = transport_get_remote_refs(transport, &ref_prefixes); - else + trace2_region_leave("fetch", "remote_refs", the_repository); + } else remote_refs = NULL; - argv_array_clear(&ref_prefixes); + strvec_clear(&ref_prefixes); ref_map = get_ref_map(transport->remote, remote_refs, rs, tags, &autotags); @@ -1367,6 +1426,51 @@ 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 @@ -1432,65 +1536,138 @@ static int add_remote_or_group(const char *name, struct string_list *list) return 1; } -static void add_options_to_argv(struct argv_array *argv) +static void add_options_to_argv(struct strvec *argv) { if (dry_run) - argv_array_push(argv, "--dry-run"); + strvec_push(argv, "--dry-run"); if (prune != -1) - argv_array_push(argv, prune ? "--prune" : "--no-prune"); + strvec_push(argv, prune ? "--prune" : "--no-prune"); if (prune_tags != -1) - argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags"); + strvec_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags"); if (update_head_ok) - argv_array_push(argv, "--update-head-ok"); + strvec_push(argv, "--update-head-ok"); if (force) - argv_array_push(argv, "--force"); + strvec_push(argv, "--force"); if (keep) - argv_array_push(argv, "--keep"); + strvec_push(argv, "--keep"); if (recurse_submodules == RECURSE_SUBMODULES_ON) - argv_array_push(argv, "--recurse-submodules"); + strvec_push(argv, "--recurse-submodules"); else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) - argv_array_push(argv, "--recurse-submodules=on-demand"); + strvec_push(argv, "--recurse-submodules=on-demand"); if (tags == TAGS_SET) - argv_array_push(argv, "--tags"); + strvec_push(argv, "--tags"); else if (tags == TAGS_UNSET) - argv_array_push(argv, "--no-tags"); + strvec_push(argv, "--no-tags"); if (verbosity >= 2) - argv_array_push(argv, "-v"); + strvec_push(argv, "-v"); if (verbosity >= 1) - argv_array_push(argv, "-v"); + strvec_push(argv, "-v"); else if (verbosity < 0) - argv_array_push(argv, "-q"); + strvec_push(argv, "-q"); + if (family == TRANSPORT_FAMILY_IPV4) + strvec_push(argv, "--ipv4"); + else if (family == TRANSPORT_FAMILY_IPV6) + strvec_push(argv, "--ipv6"); +} + +/* 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; + strvec_pushv(&cp->args, state->argv); + strvec_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_multiple(struct string_list *list) +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) { int i, result = 0; - struct argv_array argv = ARGV_ARRAY_INIT; + struct strvec argv = STRVEC_INIT; - if (!append && !dry_run) { + if (!append && write_fetch_head) { int errcode = truncate_fetch_head(); if (errcode) return errcode; } - argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", NULL); + strvec_pushl(&argv, "fetch", "--append", "--no-auto-gc", + "--no-write-commit-graph", NULL); add_options_to_argv(&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; + if (max_children != 1 && list->nr != 1) { + struct parallel_fetch_state state = { argv.v, list, 0, 0 }; + + strvec_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; + strvec_push(&argv, name); + if (verbosity >= 0) + printf(_("Fetching %s\n"), name); + if (run_command_v_opt(argv.v, RUN_GIT_CMD)) { + error(_("Could not fetch %s"), name); + result = 1; + } + strvec_pop(&argv); } - argv_array_pop(&argv); - } - argv_array_clear(&argv); - return result; + strvec_clear(&argv); + return !!result; } /* @@ -1510,41 +1687,32 @@ 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 (!repository_format_partial_clone && !filter_options.choice) + if (!has_promisor_remote() && !filter_options.choice) return; /* - * 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 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 there is currently no default filter-spec. */ - if (!repository_format_partial_clone && filter_options.choice) { + if (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); + partial_clone_get_default_filter_spec(&filter_options, remote->name); return; } -static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok) +static int fetch_one(struct remote *remote, int argc, const char **argv, + int prune_tags_ok, int use_stdin_refspecs) { struct refspec rs = REFSPEC_INIT_FETCH; int i; @@ -1587,20 +1755,24 @@ static int fetch_one(struct remote *remote, int argc, const char **argv, int pru for (i = 0; i < argc; i++) { if (!strcmp(argv[i], "tag")) { - char *tag; i++; if (i >= argc) die(_("You need to specify a tag name.")); - tag = xstrfmt("refs/tags/%s:refs/tags/%s", - argv[i], argv[i]); - refspec_append(&rs, tag); - free(tag); + refspec_appendf(&rs, "refs/tags/%s:refs/tags/%s", + argv[i], argv[i]); } else { refspec_append(&rs, argv[i]); } } + if (use_stdin_refspecs) { + struct strbuf line = STRBUF_INIT; + while (strbuf_getline_lf(&line, stdin) != EOF) + refspec_append(&rs, line.buf); + strbuf_release(&line); + } + if (server_options.nr) gtransport->server_options = &server_options; @@ -1622,22 +1794,31 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) struct remote *remote = NULL; int result = 0; int prune_tags_ok = 1; - struct argv_array argv_gc_auto = ARGV_ARRAY_INIT; 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]); + for (i = 1; i < argc; i++) { + /* This handles non-URLs gracefully */ + char *anon = transport_anonymize_url(argv[i]); + + strbuf_addf(&default_rla, " %s", anon); + free(anon); + } - fetch_config_from_gitmodules(&max_children, &recurse_submodules); git_config(git_fetch_config, NULL); argc = parse_options(argc, argv, prefix, builtin_fetch_options, builtin_fetch_usage, 0); + if (recurse_submodules != RECURSE_SUBMODULES_OFF) { + int *sfjc = submodule_fetch_jobs_config == -1 + ? &submodule_fetch_jobs_config : NULL; + int *rs = recurse_submodules == RECURSE_SUBMODULES_DEFAULT + ? &recurse_submodules : NULL; + + fetch_config_from_gitmodules(sfjc, rs); + } if (deepen_relative) { if (deepen_relative < 0) @@ -1661,8 +1842,9 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) if (depth || deepen_since || deepen_not.nr) deepen = 1; - if (filter_options.choice && !repository_format_partial_clone) - die("--filter can only be used when extensions.partialClone is set"); + /* FETCH_HEAD never gets updated in --dry-run mode */ + if (dry_run) + write_fetch_head = 0; if (all) { if (argc == 1) @@ -1695,19 +1877,35 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) } if (remote) { - if (filter_options.choice || repository_format_partial_clone) + if (filter_options.choice || has_promisor_remote()) fetch_one_setup_partial(remote); - result = fetch_one(remote, argc, argv, prune_tags_ok); + result = fetch_one(remote, argc, argv, prune_tags_ok, stdin_refspecs); } else { + int max_children = max_jobs; + if (filter_options.choice) die(_("--filter can only be used with the remote " "configured in extensions.partialclone")); + + if (stdin_refspecs) + die(_("--stdin can only be used when fetching " + "from one remote")); + + 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); + result = fetch_multiple(&list, max_children); } if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) { - struct argv_array options = ARGV_ARRAY_INIT; + struct strvec options = STRVEC_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, @@ -1717,20 +1915,29 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) recurse_submodules_default, verbosity < 0, max_children); - argv_array_clear(&options); + strvec_clear(&options); } string_list_clear(&list, 0); - close_object_store(the_repository->objects); + 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; - if (enable_auto_gc) { - argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL); - if (verbosity < 0) - argv_array_push(&argv_gc_auto, "--quiet"); - run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD); - argv_array_clear(&argv_gc_auto); + write_commit_graph_reachable(the_repository->objects->odb, + commit_graph_flags, + NULL); } + close_object_store(the_repository->objects); + + if (enable_auto_gc) + run_auto_maintenance(verbosity < 0); + return result; } diff --git a/third_party/git/builtin/fmt-merge-msg.c b/third_party/git/builtin/fmt-merge-msg.c index a4615587fd..48a8699de7 100644 --- a/third_party/git/builtin/fmt-merge-msg.c +++ b/third_party/git/builtin/fmt-merge-msg.c @@ -1,667 +1,13 @@ #include "builtin.h" -#include "cache.h" #include "config.h" -#include "refs.h" -#include "object-store.h" -#include "commit.h" -#include "diff.h" -#include "revision.h" -#include "tag.h" -#include "string-list.h" -#include "branch.h" #include "fmt-merge-msg.h" -#include "gpg-interface.h" -#include "repository.h" -#include "commit-reach.h" +#include "parse-options.h" static const char * const fmt_merge_msg_usage[] = { N_("git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"), NULL }; -static int use_branch_desc; - -int fmt_merge_msg_config(const char *key, const char *value, void *cb) -{ - if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) { - int is_bool; - merge_log_config = git_config_bool_or_int(key, value, &is_bool); - if (!is_bool && merge_log_config < 0) - return error("%s: negative length %s", key, value); - if (is_bool && merge_log_config) - merge_log_config = DEFAULT_MERGE_LOG_LEN; - } else if (!strcmp(key, "merge.branchdesc")) { - use_branch_desc = git_config_bool(key, value); - } else { - return git_default_config(key, value, cb); - } - return 0; -} - -/* merge data per repository where the merged tips came from */ -struct src_data { - struct string_list branch, tag, r_branch, generic; - int head_status; -}; - -struct origin_data { - struct object_id oid; - unsigned is_local_branch:1; -}; - -static void init_src_data(struct src_data *data) -{ - data->branch.strdup_strings = 1; - data->tag.strdup_strings = 1; - data->r_branch.strdup_strings = 1; - data->generic.strdup_strings = 1; -} - -static struct string_list srcs = STRING_LIST_INIT_DUP; -static struct string_list origins = STRING_LIST_INIT_DUP; - -struct merge_parents { - int alloc, nr; - struct merge_parent { - struct object_id given; - struct object_id commit; - unsigned char used; - } *item; -}; - -/* - * I know, I know, this is inefficient, but you won't be pulling and merging - * hundreds of heads at a time anyway. - */ -static struct merge_parent *find_merge_parent(struct merge_parents *table, - struct object_id *given, - struct object_id *commit) -{ - int i; - for (i = 0; i < table->nr; i++) { - if (given && !oideq(&table->item[i].given, given)) - continue; - if (commit && !oideq(&table->item[i].commit, commit)) - continue; - return &table->item[i]; - } - return NULL; -} - -static void add_merge_parent(struct merge_parents *table, - struct object_id *given, - struct object_id *commit) -{ - if (table->nr && find_merge_parent(table, given, commit)) - return; - ALLOC_GROW(table->item, table->nr + 1, table->alloc); - oidcpy(&table->item[table->nr].given, given); - oidcpy(&table->item[table->nr].commit, commit); - table->item[table->nr].used = 0; - table->nr++; -} - -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; - struct src_data *src_data; - struct string_list_item *item; - int pulling_head = 0; - struct object_id oid; - const unsigned hexsz = the_hash_algo->hexsz; - - if (len < hexsz + 3 || line[hexsz] != '\t') - return 1; - - if (starts_with(line + hexsz + 1, "not-for-merge")) - return 0; - - if (line[hexsz + 1] != '\t') - return 2; - - i = get_oid_hex(line, &oid); - if (i) - return 3; - - if (!find_merge_parent(merge_parents, &oid, NULL)) - return 0; /* subsumed by other parents */ - - origin_data = xcalloc(1, sizeof(struct origin_data)); - oidcpy(&origin_data->oid, &oid); - - if (line[len - 1] == '\n') - line[len - 1] = 0; - line += hexsz + 2; - - /* - * At this point, line points at the beginning of comment e.g. - * "branch 'frotz' of git://that/repository.git". - * Find the repository name and point it with src. - */ - src = strstr(line, " of "); - if (src) { - *src = 0; - src += 4; - pulling_head = 0; - } else { - src = line; - pulling_head = 1; - } - - item = unsorted_string_list_lookup(&srcs, src); - if (!item) { - item = string_list_append(&srcs, src); - item->util = xcalloc(1, sizeof(struct src_data)); - init_src_data(item->util); - } - src_data = item->util; - - if (pulling_head) { - origin = src; - src_data->head_status |= 1; - } 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 (starts_with(line, "tag ")) { - origin = line; - 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); - src_data->head_status |= 2; - } else { - origin = src; - string_list_append(&src_data->generic, line); - src_data->head_status |= 2; - } - - if (!strcmp(".", src) || !strcmp(src, origin)) { - int len = strlen(origin); - if (origin[0] == '\'' && origin[len - 1] == '\'') - origin = xmemdupz(origin + 1, len - 2); - } else - origin = xstrfmt("%s of %s", origin, src); - if (strcmp(".", src)) - origin_data->is_local_branch = 0; - string_list_append(&origins, origin)->util = origin_data; - return 0; -} - -static void print_joined(const char *singular, const char *plural, - struct string_list *list, struct strbuf *out) -{ - if (list->nr == 0) - return; - if (list->nr == 1) { - strbuf_addf(out, "%s%s", singular, list->items[0].string); - } else { - int i; - strbuf_addstr(out, plural); - for (i = 0; i < list->nr - 1; i++) - strbuf_addf(out, "%s%s", i > 0 ? ", " : "", - list->items[i].string); - strbuf_addf(out, " and %s", list->items[list->nr - 1].string); - } -} - -static void add_branch_desc(struct strbuf *out, const char *name) -{ - struct strbuf desc = STRBUF_INIT; - - if (!read_branch_desc(&desc, name)) { - const char *bp = desc.buf; - while (*bp) { - const char *ep = strchrnul(bp, '\n'); - if (*ep) - ep++; - strbuf_addf(out, " : %.*s", (int)(ep - bp), bp); - bp = ep; - } - strbuf_complete_line(out); - } - strbuf_release(&desc); -} - -#define util_as_integral(elem) ((intptr_t)((elem)->util)) - -static void record_person_from_buf(int which, struct string_list *people, - const char *buffer) -{ - char *name_buf, *name, *name_end; - struct string_list_item *elem; - const char *field; - - field = (which == 'a') ? "\nauthor " : "\ncommitter "; - name = strstr(buffer, field); - if (!name) - return; - name += strlen(field); - name_end = strchrnul(name, '<'); - if (*name_end) - name_end--; - while (isspace(*name_end) && name <= name_end) - name_end--; - if (name_end < name) - return; - name_buf = xmemdupz(name, name_end - name + 1); - - elem = string_list_lookup(people, name_buf); - if (!elem) { - elem = string_list_insert(people, name_buf); - elem->util = (void *)0; - } - elem->util = (void*)(util_as_integral(elem) + 1); - free(name_buf); -} - - -static void record_person(int which, struct string_list *people, - struct commit *commit) -{ - const char *buffer = get_commit_buffer(commit, NULL); - record_person_from_buf(which, people, buffer); - unuse_commit_buffer(commit, buffer); -} - -static int cmp_string_list_util_as_integral(const void *a_, const void *b_) -{ - const struct string_list_item *a = a_, *b = b_; - return util_as_integral(b) - util_as_integral(a); -} - -static void add_people_count(struct strbuf *out, struct string_list *people) -{ - if (people->nr == 1) - strbuf_addstr(out, people->items[0].string); - else if (people->nr == 2) - strbuf_addf(out, "%s (%d) and %s (%d)", - people->items[0].string, - (int)util_as_integral(&people->items[0]), - people->items[1].string, - (int)util_as_integral(&people->items[1])); - else if (people->nr) - strbuf_addf(out, "%s (%d) and others", - people->items[0].string, - (int)util_as_integral(&people->items[0])); -} - -static void credit_people(struct strbuf *out, - struct string_list *them, - int kind) -{ - const char *label; - const char *me; - - if (kind == 'a') { - label = "By"; - me = git_author_info(IDENT_NO_DATE); - } else { - label = "Via"; - me = git_committer_info(IDENT_NO_DATE); - } - - if (!them->nr || - (them->nr == 1 && - me && - skip_prefix(me, them->items->string, &me) && - starts_with(me, " <"))) - return; - strbuf_addf(out, "\n%c %s ", comment_line_char, label); - add_people_count(out, them); -} - -static void add_people_info(struct strbuf *out, - struct string_list *authors, - struct string_list *committers) -{ - QSORT(authors->items, authors->nr, - cmp_string_list_util_as_integral); - QSORT(committers->items, committers->nr, - cmp_string_list_util_as_integral); - - credit_people(out, authors, 'a'); - credit_people(out, committers, 'c'); -} - -static void shortlog(const char *name, - struct origin_data *origin_data, - struct commit *head, - struct rev_info *rev, - struct fmt_merge_msg_opts *opts, - struct strbuf *out) -{ - int i, count = 0; - struct commit *commit; - struct object *branch; - struct string_list subjects = STRING_LIST_INIT_DUP; - struct string_list authors = STRING_LIST_INIT_DUP; - struct string_list committers = STRING_LIST_INIT_DUP; - int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED; - struct strbuf sb = STRBUF_INIT; - const struct object_id *oid = &origin_data->oid; - int limit = opts->shortlog_len; - - branch = deref_tag(the_repository, parse_object(the_repository, oid), - oid_to_hex(oid), - the_hash_algo->hexsz); - if (!branch || branch->type != OBJ_COMMIT) - return; - - setup_revisions(0, NULL, rev, NULL); - add_pending_object(rev, branch, name); - add_pending_object(rev, &head->object, "^HEAD"); - head->object.flags |= UNINTERESTING; - if (prepare_revision_walk(rev)) - die("revision walk setup failed"); - while ((commit = get_revision(rev)) != NULL) { - struct pretty_print_context ctx = {0}; - - if (commit->parents && commit->parents->next) { - /* do not list a merge but count committer */ - if (opts->credit_people) - record_person('c', &committers, commit); - continue; - } - if (!count && opts->credit_people) - /* the 'tip' committer */ - record_person('c', &committers, commit); - if (opts->credit_people) - record_person('a', &authors, commit); - count++; - if (subjects.nr > limit) - continue; - - format_commit_message(commit, "%s", &sb, &ctx); - strbuf_ltrim(&sb); - - if (!sb.len) - string_list_append(&subjects, - oid_to_hex(&commit->object.oid)); - else - string_list_append_nodup(&subjects, - strbuf_detach(&sb, NULL)); - } - - if (opts->credit_people) - add_people_info(out, &authors, &committers); - if (count > limit) - strbuf_addf(out, "\n* %s: (%d commits)\n", name, count); - else - strbuf_addf(out, "\n* %s:\n", name); - - if (origin_data->is_local_branch && use_branch_desc) - add_branch_desc(out, name); - - for (i = 0; i < subjects.nr; i++) - if (i >= limit) - strbuf_addstr(out, " ...\n"); - else - strbuf_addf(out, " %s\n", subjects.items[i].string); - - clear_commit_marks((struct commit *)branch, flags); - clear_commit_marks(head, flags); - free_commit_list(rev->commits); - rev->commits = NULL; - rev->pending.nr = 0; - - string_list_clear(&authors, 0); - string_list_clear(&committers, 0); - string_list_clear(&subjects, 0); -} - -static void fmt_merge_msg_title(struct strbuf *out, - const char *current_branch) -{ - int i = 0; - char *sep = ""; - - strbuf_addstr(out, "Merge "); - for (i = 0; i < srcs.nr; i++) { - struct src_data *src_data = srcs.items[i].util; - const char *subsep = ""; - - strbuf_addstr(out, sep); - sep = "; "; - - if (src_data->head_status == 1) { - strbuf_addstr(out, srcs.items[i].string); - continue; - } - if (src_data->head_status == 3) { - subsep = ", "; - strbuf_addstr(out, "HEAD"); - } - if (src_data->branch.nr) { - strbuf_addstr(out, subsep); - subsep = ", "; - print_joined("branch ", "branches ", &src_data->branch, - out); - } - if (src_data->r_branch.nr) { - strbuf_addstr(out, subsep); - subsep = ", "; - print_joined("remote-tracking branch ", "remote-tracking branches ", - &src_data->r_branch, out); - } - if (src_data->tag.nr) { - strbuf_addstr(out, subsep); - subsep = ", "; - print_joined("tag ", "tags ", &src_data->tag, out); - } - if (src_data->generic.nr) { - strbuf_addstr(out, subsep); - print_joined("commit ", "commits ", &src_data->generic, - out); - } - if (strcmp(".", srcs.items[i].string)) - strbuf_addf(out, " of %s", srcs.items[i].string); - } - - if (!strcmp("master", current_branch)) - strbuf_addch(out, '\n'); - else - strbuf_addf(out, " into %s\n", current_branch); -} - -static void fmt_tag_signature(struct strbuf *tagbuf, - struct strbuf *sig, - const char *buf, - unsigned long len) -{ - const char *tag_body = strstr(buf, "\n\n"); - if (tag_body) { - tag_body += 2; - strbuf_add(tagbuf, tag_body, buf + len - tag_body); - } - strbuf_complete_line(tagbuf); - if (sig->len) { - strbuf_addch(tagbuf, '\n'); - strbuf_add_commented_lines(tagbuf, sig->buf, sig->len); - } -} - -static void fmt_merge_msg_sigs(struct strbuf *out) -{ - int i, tag_number = 0, first_tag = 0; - struct strbuf tagbuf = STRBUF_INIT; - - for (i = 0; i < origins.nr; i++) { - struct object_id *oid = origins.items[i].util; - enum object_type type; - unsigned long size, len; - char *buf = read_object_file(oid, &type, &size); - struct strbuf sig = STRBUF_INIT; - - if (!buf || type != OBJ_TAG) - goto next; - len = parse_signature(buf, size); - - if (size == len) - ; /* merely annotated */ - else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig, NULL)) { - if (!sig.len) - strbuf_addstr(&sig, "gpg verification failed.\n"); - } - - if (!tag_number++) { - fmt_tag_signature(&tagbuf, &sig, buf, len); - first_tag = i; - } else { - if (tag_number == 2) { - struct strbuf tagline = STRBUF_INIT; - strbuf_addch(&tagline, '\n'); - strbuf_add_commented_lines(&tagline, - origins.items[first_tag].string, - strlen(origins.items[first_tag].string)); - strbuf_insert(&tagbuf, 0, tagline.buf, - tagline.len); - strbuf_release(&tagline); - } - strbuf_addch(&tagbuf, '\n'); - strbuf_add_commented_lines(&tagbuf, - origins.items[i].string, - strlen(origins.items[i].string)); - fmt_tag_signature(&tagbuf, &sig, buf, len); - } - strbuf_release(&sig); - next: - free(buf); - } - if (tagbuf.len) { - strbuf_addch(out, '\n'); - strbuf_addbuf(out, &tagbuf); - } - strbuf_release(&tagbuf); -} - -static void find_merge_parents(struct merge_parents *result, - struct strbuf *in, struct object_id *head) -{ - struct commit_list *parents; - struct commit *head_commit; - int pos = 0, i, j; - - parents = NULL; - while (pos < in->len) { - int len; - char *p = in->buf + pos; - char *newline = strchr(p, '\n'); - const char *q; - struct object_id oid; - struct commit *parent; - struct object *obj; - - len = newline ? newline - p : strlen(p); - pos += len + !!newline; - - if (parse_oid_hex(p, &oid, &q) || - q[0] != '\t' || - q[1] != '\t') - continue; /* skip not-for-merge */ - /* - * Do not use get_merge_parent() here; we do not have - * "name" here and we do not want to contaminate its - * util field yet. - */ - obj = parse_object(the_repository, &oid); - parent = (struct commit *)peel_to_type(NULL, 0, obj, OBJ_COMMIT); - if (!parent) - continue; - commit_list_insert(parent, &parents); - add_merge_parent(result, &obj->oid, &parent->object.oid); - } - head_commit = lookup_commit(the_repository, head); - if (head_commit) - commit_list_insert(head_commit, &parents); - reduce_heads_replace(&parents); - - while (parents) { - struct commit *cmit = pop_commit(&parents); - for (i = 0; i < result->nr; i++) - if (oideq(&result->item[i].commit, &cmit->object.oid)) - result->item[i].used = 1; - } - - for (i = j = 0; i < result->nr; i++) { - if (result->item[i].used) { - if (i != j) - result->item[j] = result->item[i]; - j++; - } - } - result->nr = j; -} - -int fmt_merge_msg(struct strbuf *in, struct strbuf *out, - struct fmt_merge_msg_opts *opts) -{ - int i = 0, pos = 0; - struct object_id head_oid; - const char *current_branch; - void *current_branch_to_free; - struct merge_parents merge_parents; - - memset(&merge_parents, 0, sizeof(merge_parents)); - - /* get current branch */ - current_branch = current_branch_to_free = - resolve_refdup("HEAD", RESOLVE_REF_READING, &head_oid, NULL); - if (!current_branch) - die("No current branch"); - if (starts_with(current_branch, "refs/heads/")) - current_branch += 11; - - find_merge_parents(&merge_parents, in, &head_oid); - - /* get a line */ - while (pos < in->len) { - int len; - char *newline, *p = in->buf + pos; - - newline = strchr(p, '\n'); - len = newline ? newline - p : strlen(p); - pos += len + !!newline; - i++; - p[len] = 0; - if (handle_line(p, &merge_parents)) - die("error in line %d: %.*s", i, len, p); - } - - if (opts->add_title && srcs.nr) - fmt_merge_msg_title(out, current_branch); - - if (origins.nr) - fmt_merge_msg_sigs(out); - - if (opts->shortlog_len) { - struct commit *head; - struct rev_info rev; - - head = lookup_commit_or_die(&head_oid, "HEAD"); - repo_init_revisions(the_repository, &rev, NULL); - rev.commit_format = CMIT_FMT_ONELINE; - rev.ignore_merges = 1; - rev.limited = 1; - - strbuf_complete_line(out); - - for (i = 0; i < origins.nr; i++) - shortlog(origins.items[i].string, - origins.items[i].util, - head, &rev, opts, out); - } - - strbuf_complete_line(out); - free(current_branch_to_free); - free(merge_parents.item); - return 0; -} - int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix) { const char *inpath = NULL; diff --git a/third_party/git/builtin/for-each-ref.c b/third_party/git/builtin/for-each-ref.c index 465153e853..9d1ecda2b8 100644 --- a/third_party/git/builtin/for-each-ref.c +++ b/third_party/git/builtin/for-each-ref.c @@ -9,7 +9,7 @@ static char const * const for_each_ref_usage[] = { N_("git for-each-ref [<options>] [<pattern>]"), N_("git for-each-ref [--points-at <object>]"), - N_("git for-each-ref [(--merged | --no-merged) [<commit>]]"), + N_("git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"), N_("git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"), NULL }; @@ -70,7 +70,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) if (!sorting) sorting = ref_default_sorting(); - sorting->ignore_case = icase; + ref_sorting_icase_all(sorting, icase); filter.ignore_case = icase; filter.name_patterns = argv; diff --git a/third_party/git/builtin/fsck.c b/third_party/git/builtin/fsck.c index 18403a94fa..fbf26cafcf 100644 --- a/third_party/git/builtin/fsck.c +++ b/third_party/git/builtin/fsck.c @@ -49,41 +49,22 @@ static int name_objects; #define ERROR_PACK 04 #define ERROR_REFS 010 #define ERROR_COMMIT_GRAPH 020 +#define ERROR_MULTI_PACK_INDEX 040 -static const char *describe_object(struct object *obj) +static const char *describe_object(const struct object_id *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; + return fsck_describe_object(&fsck_walk_options, oid); } -static const char *printable_type(struct object *obj) +static const char *printable_type(const struct object_id *oid, + enum object_type type) { const char *ret; - 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); - } + if (type == OBJ_NONE) + type = oid_object_info(the_repository, oid, NULL); - ret = type_name(obj->type); + ret = type_name(type); if (!ret) ret = _("unknown"); @@ -118,26 +99,32 @@ 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), describe_object(obj), err); + printable_type(&obj->oid, obj->type), + describe_object(&obj->oid), err); return -1; } static int fsck_error_func(struct fsck_options *o, - struct object *obj, int type, const char *message) + const struct object_id *oid, + enum object_type object_type, + int msg_type, const char *message) { - switch (type) { + switch (msg_type) { case FSCK_WARN: /* TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> */ fprintf_ln(stderr, _("warning in %s %s: %s"), - printable_type(obj), describe_object(obj), message); + printable_type(oid, object_type), + describe_object(oid), 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(obj), describe_object(obj), message); + printable_type(oid, object_type), + describe_object(oid), message); return 1; default: - BUG("%d (FSCK_IGNORE?) should never trigger this callback", type); + BUG("%d (FSCK_IGNORE?) should never trigger this callback", + msg_type); } } @@ -155,7 +142,8 @@ 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), describe_object(parent)); + printable_type(&parent->oid, parent->type), + describe_object(&parent->oid)); printf_ln(_("broken link from %7s %s"), (type == OBJ_ANY ? _("unknown") : type_name(type)), _("unknown")); @@ -180,13 +168,13 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt return 0; if (!(obj->flags & HAS_OBJ)) { - if (parent && !has_object_file(&obj->oid)) { + if (parent && !has_object(the_repository, &obj->oid, 1)) { printf_ln(_("broken link from %7s %s\n" " to %7s %s"), - printable_type(parent), - describe_object(parent), - printable_type(obj), - describe_object(obj)); + printable_type(&parent->oid, parent->type), + describe_object(&parent->oid), + printable_type(&obj->oid, obj->type), + describe_object(&obj->oid)); errors_found |= ERROR_REACHABLE; } return 1; @@ -253,7 +241,7 @@ static void mark_unreachable_referents(const struct object_id *oid) enum object_type type = oid_object_info(the_repository, &obj->oid, NULL); if (type > 0) - object_as_type(the_repository, obj, type, 0); + object_as_type(obj, type, 0); } options.walk = mark_used; @@ -292,8 +280,9 @@ 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), - describe_object(obj)); + printf_ln(_("missing %s %s"), + printable_type(&obj->oid, obj->type), + describe_object(&obj->oid)); errors_found |= ERROR_REACHABLE; return; } @@ -318,8 +307,9 @@ 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), - describe_object(obj)); + printf_ln(_("unreachable %s %s"), + printable_type(&obj->oid, obj->type), + describe_object(&obj->oid)); return; } @@ -337,12 +327,13 @@ static void check_unreachable_object(struct object *obj) */ if (!(obj->flags & USED)) { if (show_dangling) - printf_ln(_("dangling %s %s"), printable_type(obj), - describe_object(obj)); + printf_ln(_("dangling %s %s"), + printable_type(&obj->oid, obj->type), + describe_object(&obj->oid)); if (write_lost_and_found) { char *filename = git_pathdup("lost-found/%s/%s", obj->type == OBJ_COMMIT ? "commit" : "other", - describe_object(obj)); + describe_object(&obj->oid)); FILE *f; if (safe_create_leading_directories_const(filename)) { @@ -355,7 +346,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)); + fprintf(f, "%s\n", describe_object(&obj->oid)); if (fclose(f)) die_errno(_("could not finish '%s'"), filename); @@ -374,7 +365,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)); + fprintf_ln(stderr, _("Checking %s"), describe_object(&obj->oid)); if (obj->flags & REACHABLE) check_reachable_object(obj); @@ -432,7 +423,8 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size) if (verbose) fprintf_ln(stderr, _("Checking %s %s"), - printable_type(obj), describe_object(obj)); + printable_type(&obj->oid, obj->type), + describe_object(&obj->oid)); if (fsck_walk(obj, NULL, &fsck_obj_options)) objerror(obj, _("broken links")); @@ -445,7 +437,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)); + describe_object(&commit->object.oid)); } if (obj->type == OBJ_TAG) { @@ -453,10 +445,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), - describe_object(tag->tagged), + printable_type(&tag->tagged->oid, tag->tagged->type), + describe_object(&tag->tagged->oid), tag->tag, - describe_object(&tag->object)); + describe_object(&tag->object.oid)); } } @@ -499,10 +491,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 && name_objects) - add_decoration(fsck_walk_options.object_names, - obj, - xstrfmt("%s@{%"PRItime"}", refname, timestamp)); + if (timestamp) + fsck_put_object_name(&fsck_walk_options, oid, + "%s@{%"PRItime"}", + refname, timestamp); obj->flags |= USED; mark_object_reachable(obj); } else if (!is_promisor_object(oid)) { @@ -566,9 +558,8 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid, } default_refs++; obj->flags |= USED; - if (name_objects) - add_decoration(fsck_walk_options.object_names, - obj, xstrdup(refname)); + fsck_put_object_name(&fsck_walk_options, + oid, "%s", refname); mark_object_reachable(obj); return 0; @@ -586,7 +577,7 @@ static void get_default_heads(void) for_each_rawref(fsck_handle_ref, NULL); - worktrees = get_worktrees(0); + worktrees = get_worktrees(); for (p = worktrees; *p; p++) { struct worktree *wt = *p; struct strbuf ref = STRBUF_INIT; @@ -742,9 +733,7 @@ static int fsck_cache_tree(struct cache_tree *it) return 1; } obj->flags |= USED; - if (name_objects) - add_decoration(fsck_walk_options.object_names, - obj, xstrdup(":")); + fsck_put_object_name(&fsck_walk_options, &it->oid, ":"); mark_object_reachable(obj); if (obj->type != OBJ_TREE) err |= objerror(obj, _("non-tree in cache-tree")); @@ -830,8 +819,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) } if (name_objects) - fsck_walk_options.object_names = - xcalloc(1, sizeof(struct decoration)); + fsck_enable_object_names(&fsck_walk_options); git_config(fsck_config, NULL); @@ -890,9 +878,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) } obj->flags |= USED; - if (name_objects) - add_decoration(fsck_walk_options.object_names, - obj, xstrdup(arg)); + fsck_put_object_name(&fsck_walk_options, &oid, + "%s", arg); mark_object_reachable(obj); continue; } @@ -928,10 +915,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) continue; obj = &blob->object; obj->flags |= USED; - if (name_objects) - add_decoration(fsck_walk_options.object_names, - obj, - xstrfmt(":%s", active_cache[i]->name)); + fsck_put_object_name(&fsck_walk_options, &obj->oid, + ":%s", active_cache[i]->name); mark_object_reachable(obj); } if (active_cache_tree) @@ -968,7 +953,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) midx_argv[2] = "--object-dir"; midx_argv[3] = odb->path; if (run_command(&midx_verify)) - errors_found |= ERROR_COMMIT_GRAPH; + errors_found |= ERROR_MULTI_PACK_INDEX; } } diff --git a/third_party/git/builtin/gc.c b/third_party/git/builtin/gc.c index c18efadda5..090959350e 100644 --- a/third_party/git/builtin/gc.c +++ b/third_party/git/builtin/gc.c @@ -18,7 +18,7 @@ #include "parse-options.h" #include "run-command.h" #include "sigchain.h" -#include "argv-array.h" +#include "strvec.h" #include "commit.h" #include "commit-graph.h" #include "packfile.h" @@ -27,6 +27,8 @@ #include "pack-objects.h" #include "blob.h" #include "tree.h" +#include "promisor-remote.h" +#include "refs.h" #define FAILED_RUN "failed to run %s" @@ -41,7 +43,6 @@ 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"; @@ -50,12 +51,12 @@ static const char *prune_worktrees_expire = "3.months.ago"; static unsigned long big_pack_threshold; static unsigned long max_delta_cache_size = DEFAULT_DELTA_CACHE_SIZE; -static struct argv_array pack_refs_cmd = ARGV_ARRAY_INIT; -static struct argv_array reflog = ARGV_ARRAY_INIT; -static struct argv_array repack = ARGV_ARRAY_INIT; -static struct argv_array prune = ARGV_ARRAY_INIT; -static struct argv_array prune_worktrees = ARGV_ARRAY_INIT; -static struct argv_array rerere = ARGV_ARRAY_INIT; +static struct strvec pack_refs_cmd = STRVEC_INIT; +static struct strvec reflog = STRVEC_INIT; +static struct strvec repack = STRVEC_INIT; +static struct strvec prune = STRVEC_INIT; +static struct strvec prune_worktrees = STRVEC_INIT; +static struct strvec rerere = STRVEC_INIT; static struct tempfile *pidfile; static struct lock_file log_lock; @@ -148,7 +149,6 @@ 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); @@ -312,18 +312,18 @@ static uint64_t estimate_repack_memory(struct packed_git *pack) static int keep_one_pack(struct string_list_item *item, void *data) { - argv_array_pushf(&repack, "--keep-pack=%s", basename(item->string)); + strvec_pushf(&repack, "--keep-pack=%s", basename(item->string)); return 0; } static void add_repack_all_option(struct string_list *keep_pack) { if (prune_expire && !strcmp(prune_expire, "now")) - argv_array_push(&repack, "-a"); + strvec_push(&repack, "-a"); else { - argv_array_push(&repack, "-A"); + strvec_push(&repack, "-A"); if (prune_expire) - argv_array_pushf(&repack, "--unpack-unreachable=%s", prune_expire); + strvec_pushf(&repack, "--unpack-unreachable=%s", prune_expire); } if (keep_pack) @@ -332,7 +332,7 @@ static void add_repack_all_option(struct string_list *keep_pack) static void add_repack_incremental_option(void) { - argv_array_push(&repack, "--no-write-bitmap-index"); + strvec_push(&repack, "--no-write-bitmap-index"); } static int need_to_gc(void) @@ -459,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 occured while reading gc.log + * message and returns -1 if an error occurred while reading gc.log */ static int report_last_gc_error(void) { @@ -515,11 +515,11 @@ static void gc_before_repack(void) if (done++) return; - if (pack_refs && run_command_v_opt(pack_refs_cmd.argv, RUN_GIT_CMD)) - die(FAILED_RUN, pack_refs_cmd.argv[0]); + if (pack_refs && run_command_v_opt(pack_refs_cmd.v, RUN_GIT_CMD)) + die(FAILED_RUN, pack_refs_cmd.v[0]); - if (prune_reflogs && run_command_v_opt(reflog.argv, RUN_GIT_CMD)) - die(FAILED_RUN, reflog.argv[0]); + if (prune_reflogs && run_command_v_opt(reflog.v, RUN_GIT_CMD)) + die(FAILED_RUN, reflog.v[0]); } int cmd_gc(int argc, const char **argv, const char *prefix) @@ -553,12 +553,12 @@ int cmd_gc(int argc, const char **argv, const char *prefix) if (argc == 2 && !strcmp(argv[1], "-h")) usage_with_options(builtin_gc_usage, builtin_gc_options); - argv_array_pushl(&pack_refs_cmd, "pack-refs", "--all", "--prune", NULL); - argv_array_pushl(&reflog, "reflog", "expire", "--all", NULL); - argv_array_pushl(&repack, "repack", "-d", "-l", NULL); - argv_array_pushl(&prune, "prune", "--expire", NULL); - argv_array_pushl(&prune_worktrees, "worktree", "prune", "--expire", NULL); - argv_array_pushl(&rerere, "rerere", "gc", NULL); + strvec_pushl(&pack_refs_cmd, "pack-refs", "--all", "--prune", NULL); + strvec_pushl(&reflog, "reflog", "expire", "--all", NULL); + strvec_pushl(&repack, "repack", "-d", "-l", NULL); + strvec_pushl(&prune, "prune", "--expire", NULL); + strvec_pushl(&prune_worktrees, "worktree", "prune", "--expire", NULL); + strvec_pushl(&rerere, "rerere", "gc", NULL); /* default expiry time, overwritten in gc_config */ gc_config(); @@ -577,14 +577,14 @@ int cmd_gc(int argc, const char **argv, const char *prefix) die(_("failed to parse prune expiry value %s"), prune_expire); if (aggressive) { - argv_array_push(&repack, "-f"); + strvec_push(&repack, "-f"); if (aggressive_depth > 0) - argv_array_pushf(&repack, "--depth=%d", aggressive_depth); + strvec_pushf(&repack, "--depth=%d", aggressive_depth); if (aggressive_window > 0) - argv_array_pushf(&repack, "--window=%d", aggressive_window); + strvec_pushf(&repack, "--window=%d", aggressive_window); } if (quiet) - argv_array_push(&repack, "-q"); + strvec_push(&repack, "-q"); if (auto_gc) { /* @@ -602,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 occured, already reported */ + /* an I/O error occurred, already reported */ exit(128); if (ret == 1) /* Last gc --auto failed. Skip this one. */ @@ -654,29 +654,29 @@ int cmd_gc(int argc, const char **argv, const char *prefix) if (!repository_format_precious_objects) { close_object_store(the_repository->objects); - if (run_command_v_opt(repack.argv, RUN_GIT_CMD)) - die(FAILED_RUN, repack.argv[0]); + if (run_command_v_opt(repack.v, RUN_GIT_CMD)) + die(FAILED_RUN, repack.v[0]); if (prune_expire) { - argv_array_push(&prune, prune_expire); + strvec_push(&prune, prune_expire); if (quiet) - argv_array_push(&prune, "--no-progress"); - if (repository_format_partial_clone) - argv_array_push(&prune, - "--exclude-promisor-objects"); - if (run_command_v_opt(prune.argv, RUN_GIT_CMD)) - die(FAILED_RUN, prune.argv[0]); + strvec_push(&prune, "--no-progress"); + if (has_promisor_remote()) + strvec_push(&prune, + "--exclude-promisor-objects"); + if (run_command_v_opt(prune.v, RUN_GIT_CMD)) + die(FAILED_RUN, prune.v[0]); } } if (prune_worktrees_expire) { - argv_array_push(&prune_worktrees, prune_worktrees_expire); - if (run_command_v_opt(prune_worktrees.argv, RUN_GIT_CMD)) - die(FAILED_RUN, prune_worktrees.argv[0]); + strvec_push(&prune_worktrees, prune_worktrees_expire); + if (run_command_v_opt(prune_worktrees.v, RUN_GIT_CMD)) + die(FAILED_RUN, prune_worktrees.v[0]); } - if (run_command_v_opt(rerere.argv, RUN_GIT_CMD)) - die(FAILED_RUN, rerere.argv[0]); + if (run_command_v_opt(rerere.v, RUN_GIT_CMD)) + die(FAILED_RUN, rerere.v[0]); report_garbage = report_pack_garbage; reprepare_packed_git(the_repository); @@ -685,11 +685,11 @@ int cmd_gc(int argc, const char **argv, const char *prefix) clean_pack_garbage(); } - if (gc_write_commit_graph && - write_commit_graph_reachable(get_object_directory(), - !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0, - NULL)) - return 1; + 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 (auto_gc && too_many_loose_objects()) warning(_("There are too many unreachable loose objects; " @@ -700,3 +700,339 @@ int cmd_gc(int argc, const char **argv, const char *prefix) return 0; } + +static const char * const builtin_maintenance_run_usage[] = { + N_("git maintenance run [--auto] [--[no-]quiet] [--task=<task>]"), + NULL +}; + +struct maintenance_run_opts { + int auto_flag; + int quiet; +}; + +/* Remember to update object flag allocation in object.h */ +#define SEEN (1u<<0) + +struct cg_auto_data { + int num_not_in_graph; + int limit; +}; + +static int dfs_on_ref(const char *refname, + const struct object_id *oid, int flags, + void *cb_data) +{ + struct cg_auto_data *data = (struct cg_auto_data *)cb_data; + int result = 0; + struct object_id peeled; + struct commit_list *stack = NULL; + struct commit *commit; + + if (!peel_ref(refname, &peeled)) + oid = &peeled; + if (oid_object_info(the_repository, oid, NULL) != OBJ_COMMIT) + return 0; + + commit = lookup_commit(the_repository, oid); + if (!commit) + return 0; + if (parse_commit(commit)) + return 0; + + commit_list_append(commit, &stack); + + while (!result && stack) { + struct commit_list *parent; + + commit = pop_commit(&stack); + + for (parent = commit->parents; parent; parent = parent->next) { + if (parse_commit(parent->item) || + commit_graph_position(parent->item) != COMMIT_NOT_FROM_GRAPH || + parent->item->object.flags & SEEN) + continue; + + parent->item->object.flags |= SEEN; + data->num_not_in_graph++; + + if (data->num_not_in_graph >= data->limit) { + result = 1; + break; + } + + commit_list_append(parent->item, &stack); + } + } + + free_commit_list(stack); + return result; +} + +static int should_write_commit_graph(void) +{ + int result; + struct cg_auto_data data; + + data.num_not_in_graph = 0; + data.limit = 100; + git_config_get_int("maintenance.commit-graph.auto", + &data.limit); + + if (!data.limit) + return 0; + if (data.limit < 0) + return 1; + + result = for_each_ref(dfs_on_ref, &data); + + clear_commit_marks_all(SEEN); + + return result; +} + +static int run_write_commit_graph(struct maintenance_run_opts *opts) +{ + struct child_process child = CHILD_PROCESS_INIT; + + child.git_cmd = 1; + strvec_pushl(&child.args, "commit-graph", "write", + "--split", "--reachable", NULL); + + if (opts->quiet) + strvec_push(&child.args, "--no-progress"); + + return !!run_command(&child); +} + +static int maintenance_task_commit_graph(struct maintenance_run_opts *opts) +{ + close_object_store(the_repository->objects); + if (run_write_commit_graph(opts)) { + error(_("failed to write commit-graph")); + return 1; + } + + return 0; +} + +static int maintenance_task_gc(struct maintenance_run_opts *opts) +{ + struct child_process child = CHILD_PROCESS_INIT; + + child.git_cmd = 1; + strvec_push(&child.args, "gc"); + + if (opts->auto_flag) + strvec_push(&child.args, "--auto"); + if (opts->quiet) + strvec_push(&child.args, "--quiet"); + else + strvec_push(&child.args, "--no-quiet"); + + close_object_store(the_repository->objects); + return run_command(&child); +} + +typedef int maintenance_task_fn(struct maintenance_run_opts *opts); + +/* + * An auto condition function returns 1 if the task should run + * and 0 if the task should NOT run. See needs_to_gc() for an + * example. + */ +typedef int maintenance_auto_fn(void); + +struct maintenance_task { + const char *name; + maintenance_task_fn *fn; + maintenance_auto_fn *auto_condition; + unsigned enabled:1; + + /* -1 if not selected. */ + int selected_order; +}; + +enum maintenance_task_label { + TASK_GC, + TASK_COMMIT_GRAPH, + + /* Leave as final value */ + TASK__COUNT +}; + +static struct maintenance_task tasks[] = { + [TASK_GC] = { + "gc", + maintenance_task_gc, + need_to_gc, + 1, + }, + [TASK_COMMIT_GRAPH] = { + "commit-graph", + maintenance_task_commit_graph, + should_write_commit_graph, + }, +}; + +static int compare_tasks_by_selection(const void *a_, const void *b_) +{ + const struct maintenance_task *a, *b; + + a = (const struct maintenance_task *)&a_; + b = (const struct maintenance_task *)&b_; + + return b->selected_order - a->selected_order; +} + +static int maintenance_run_tasks(struct maintenance_run_opts *opts) +{ + int i, found_selected = 0; + int result = 0; + struct lock_file lk; + struct repository *r = the_repository; + char *lock_path = xstrfmt("%s/maintenance", r->objects->odb->path); + + if (hold_lock_file_for_update(&lk, lock_path, LOCK_NO_DEREF) < 0) { + /* + * Another maintenance command is running. + * + * If --auto was provided, then it is likely due to a + * recursive process stack. Do not report an error in + * that case. + */ + if (!opts->auto_flag && !opts->quiet) + warning(_("lock file '%s' exists, skipping maintenance"), + lock_path); + free(lock_path); + return 0; + } + free(lock_path); + + for (i = 0; !found_selected && i < TASK__COUNT; i++) + found_selected = tasks[i].selected_order >= 0; + + if (found_selected) + QSORT(tasks, TASK__COUNT, compare_tasks_by_selection); + + for (i = 0; i < TASK__COUNT; i++) { + if (found_selected && tasks[i].selected_order < 0) + continue; + + if (!found_selected && !tasks[i].enabled) + continue; + + if (opts->auto_flag && + (!tasks[i].auto_condition || + !tasks[i].auto_condition())) + continue; + + trace2_region_enter("maintenance", tasks[i].name, r); + if (tasks[i].fn(opts)) { + error(_("task '%s' failed"), tasks[i].name); + result = 1; + } + trace2_region_leave("maintenance", tasks[i].name, r); + } + + rollback_lock_file(&lk); + return result; +} + +static void initialize_task_config(void) +{ + int i; + struct strbuf config_name = STRBUF_INIT; + gc_config(); + + for (i = 0; i < TASK__COUNT; i++) { + int config_value; + + strbuf_setlen(&config_name, 0); + strbuf_addf(&config_name, "maintenance.%s.enabled", + tasks[i].name); + + if (!git_config_get_bool(config_name.buf, &config_value)) + tasks[i].enabled = config_value; + } + + strbuf_release(&config_name); +} + +static int task_option_parse(const struct option *opt, + const char *arg, int unset) +{ + int i, num_selected = 0; + struct maintenance_task *task = NULL; + + BUG_ON_OPT_NEG(unset); + + for (i = 0; i < TASK__COUNT; i++) { + if (tasks[i].selected_order >= 0) + num_selected++; + if (!strcasecmp(tasks[i].name, arg)) { + task = &tasks[i]; + } + } + + if (!task) { + error(_("'%s' is not a valid task"), arg); + return 1; + } + + if (task->selected_order >= 0) { + error(_("task '%s' cannot be selected multiple times"), arg); + return 1; + } + + task->selected_order = num_selected + 1; + + return 0; +} + +static int maintenance_run(int argc, const char **argv, const char *prefix) +{ + int i; + struct maintenance_run_opts opts; + struct option builtin_maintenance_run_options[] = { + OPT_BOOL(0, "auto", &opts.auto_flag, + N_("run tasks based on the state of the repository")), + OPT_BOOL(0, "quiet", &opts.quiet, + N_("do not report progress or other information over stderr")), + OPT_CALLBACK_F(0, "task", NULL, N_("task"), + N_("run a specific task"), + PARSE_OPT_NONEG, task_option_parse), + OPT_END() + }; + memset(&opts, 0, sizeof(opts)); + + opts.quiet = !isatty(2); + initialize_task_config(); + + for (i = 0; i < TASK__COUNT; i++) + tasks[i].selected_order = -1; + + argc = parse_options(argc, argv, prefix, + builtin_maintenance_run_options, + builtin_maintenance_run_usage, + PARSE_OPT_STOP_AT_NON_OPTION); + + if (argc != 0) + usage_with_options(builtin_maintenance_run_usage, + builtin_maintenance_run_options); + return maintenance_run_tasks(&opts); +} + +static const char builtin_maintenance_usage[] = N_("git maintenance run [<options>]"); + +int cmd_maintenance(int argc, const char **argv, const char *prefix) +{ + if (argc < 2 || + (argc == 2 && !strcmp(argv[1], "-h"))) + usage(builtin_maintenance_usage); + + if (!strcmp(argv[1], "run")) + return maintenance_run(argc - 1, argv + 1, prefix); + + die(_("invalid subcommand: %s"), argv[1]); +} diff --git a/third_party/git/builtin/grep.c b/third_party/git/builtin/grep.c index 560051784e..c8037388c6 100644 --- a/third_party/git/builtin/grep.c +++ b/third_party/git/builtin/grep.c @@ -24,6 +24,7 @@ #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>...]"), @@ -32,7 +33,6 @@ 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,8 +91,11 @@ static pthread_cond_t cond_result; static int skip_first_line; -static void add_work(struct grep_opt *opt, const struct grep_source *gs) +static void add_work(struct grep_opt *opt, 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) { @@ -100,9 +103,6 @@ static void add_work(struct grep_opt *opt, const 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,14 +295,36 @@ 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) +static void grep_source_name(struct grep_opt *opt, const char *filename, + int tree_name_len, struct strbuf *out) { - void *data; + strbuf_reset(out); + + if (opt->null_following_name) { + if (opt->relative && opt->prefix_length) { + struct strbuf rel_buf = STRBUF_INIT; + const char *rel_name = + relative_path(filename + tree_name_len, + opt->prefix, &rel_buf); + + if (tree_name_len) + strbuf_add(out, filename, tree_name_len); + + strbuf_addstr(out, rel_name); + strbuf_release(&rel_buf); + } else { + strbuf_addstr(out, filename); + } + return; + } - grep_read_lock(); - data = read_object_file(oid, type, size); - grep_read_unlock(); - return data; + if (opt->relative && opt->prefix_length) + quote_path(filename + tree_name_len, opt->prefix, out, 0); + else + quote_c_style(filename + tree_name_len, out, NULL, 0); + + if (tree_name_len) + strbuf_insert(out, 0, filename, tree_name_len); } static int grep_oid(struct grep_opt *opt, const struct object_id *oid, @@ -312,13 +334,7 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid, struct strbuf pathbuf = STRBUF_INIT; struct grep_source gs; - if (opt->relative && opt->prefix_length) { - quote_path_relative(filename + tree_name_len, opt->prefix, &pathbuf); - strbuf_insert(&pathbuf, 0, filename, tree_name_len); - } else { - strbuf_addstr(&pathbuf, filename); - } - + grep_source_name(opt, filename, tree_name_len, &pathbuf); grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid); strbuf_release(&pathbuf); @@ -344,11 +360,7 @@ static int grep_file(struct grep_opt *opt, const char *filename) struct strbuf buf = STRBUF_INIT; struct grep_source gs; - if (opt->relative && opt->prefix_length) - quote_path_relative(filename, opt->prefix, &buf); - else - strbuf_addstr(&buf, filename); - + grep_source_name(opt, filename, 0, &buf); grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename); strbuf_release(&buf); @@ -385,7 +397,7 @@ static void run_pager(struct grep_opt *opt, const char *prefix) int i, status; for (i = 0; i < path_list->nr; i++) - argv_array_push(&child.args, path_list->items[i].string); + strvec_push(&child.args, path_list->items[i].string); child.dir = prefix; child.use_shell = 1; @@ -403,34 +415,32 @@ 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) + const char *filename, const char *path, int cached) { struct repository subrepo; struct repository *superproject = opt->repo; - const struct submodule *sub = submodule_from_path(superproject, - &null_oid, path); + const struct submodule *sub; struct grep_opt subopt; int hit; - /* - * 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(); + sub = submodule_from_path(superproject, &null_oid, path); - if (!is_submodule_active(superproject, path)) { - grep_read_unlock(); + if (!is_submodule_active(superproject, path)) return 0; - } - if (repo_submodule_init(&subrepo, superproject, sub)) { - grep_read_unlock(); + if (repo_submodule_init(&subrepo, superproject, sub)) return 0; - } - repo_read_gitmodules(&subrepo); + /* + * 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); /* * NEEDSWORK: This adds the submodule's object directory to the list of @@ -443,7 +453,7 @@ static int grep_submodule(struct grep_opt *opt, * object. */ add_to_alternates_memory(subrepo.objects->odb->path); - grep_read_unlock(); + obj_read_unlock(); memcpy(&subopt, opt, sizeof(subopt)); subopt.repo = &subrepo; @@ -455,14 +465,12 @@ static int grep_submodule(struct grep_opt *opt, unsigned long size; struct strbuf base = STRBUF_INIT; - object = parse_object_or_die(oid, oid_to_hex(oid)); - - grep_read_lock(); + obj_read_lock(); + object = parse_object_or_die(oid, NULL); + obj_read_unlock(); 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)); @@ -475,7 +483,7 @@ static int grep_submodule(struct grep_opt *opt, strbuf_release(&base); free(data); } else { - hit = grep_cache(&subopt, pathspec, 1); + hit = grep_cache(&subopt, pathspec, cached); } repo_clear(&subrepo); @@ -523,7 +531,8 @@ 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); + hit |= grep_submodule(opt, pathspec, NULL, ce->name, + ce->name, cached); } else { continue; } @@ -586,7 +595,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec, void *data; unsigned long size; - data = lock_and_read_oid_file(&entry.oid, &type, &size); + data = read_object_file(&entry.oid, &type, &size); if (!data) die(_("unable to read tree (%s)"), oid_to_hex(&entry.oid)); @@ -598,7 +607,8 @@ 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); + base->buf, base->buf + tn_len, + 1); /* ignored */ } strbuf_setlen(base, old_baselen); @@ -623,12 +633,9 @@ 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)); @@ -657,13 +664,18 @@ 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)) { @@ -681,7 +693,7 @@ static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec, struct dir_struct dir; int i, hit = 0; - memset(&dir, 0, sizeof(dir)); + dir_init(&dir); if (!use_index) dir.flags |= DIR_NO_GITLINKS; if (exc_std) @@ -689,12 +701,11 @@ static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec, fill_directory(&dir, opt->repo->index, pathspec); for (i = 0; i < dir.nr; i++) { - if (!dir_path_match(opt->repo->index, dir.entries[i], pathspec, 0, NULL)) - continue; hit |= grep_file(opt, dir.entries[i]->name); if (hit && opt->status_only) break; } + dir_clear(&dir); return hit; } @@ -896,20 +907,20 @@ int cmd_grep(int argc, const char **argv, const char *prefix) OPT_GROUP(""), OPT_CALLBACK('f', NULL, &opt, N_("file"), N_("read patterns from file"), file_callback), - { OPTION_CALLBACK, 'e', NULL, &opt, N_("pattern"), - N_("match <pattern>"), PARSE_OPT_NONEG, pattern_callback }, - { OPTION_CALLBACK, 0, "and", &opt, NULL, - N_("combine patterns specified with -e"), - PARSE_OPT_NOARG | PARSE_OPT_NONEG, and_callback }, + OPT_CALLBACK_F('e', NULL, &opt, N_("pattern"), + N_("match <pattern>"), PARSE_OPT_NONEG, pattern_callback), + OPT_CALLBACK_F(0, "and", &opt, NULL, + N_("combine patterns specified with -e"), + PARSE_OPT_NOARG | PARSE_OPT_NONEG, and_callback), OPT_BOOL(0, "or", &dummy, ""), - { OPTION_CALLBACK, 0, "not", &opt, NULL, "", - PARSE_OPT_NOARG | PARSE_OPT_NONEG, not_callback }, - { OPTION_CALLBACK, '(', NULL, &opt, NULL, "", - PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH, - open_callback }, - { OPTION_CALLBACK, ')', NULL, &opt, NULL, "", - PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH, - close_callback }, + OPT_CALLBACK_F(0, "not", &opt, NULL, "", + PARSE_OPT_NOARG | PARSE_OPT_NONEG, not_callback), + OPT_CALLBACK_F('(', NULL, &opt, NULL, "", + PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH, + open_callback), + OPT_CALLBACK_F(')', NULL, &opt, NULL, "", + PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH, + close_callback), OPT__QUIET(&opt.status_only, N_("indicate hit with exit status without output")), OPT_BOOL(0, "all-match", &opt.all_match, @@ -956,6 +967,9 @@ 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 @@ -1060,7 +1074,10 @@ int cmd_grep(int argc, const char **argv, const char *prefix) pathspec.recursive = 1; pathspec.recurse_submodules = !!recurse_submodules; - if (list.nr || cached || show_in_pager) { + if (recurse_submodules && untracked) + die(_("--untracked not supported with --recurse-submodules")); + + if (show_in_pager) { if (num_threads > 1) warning(_("invalid option combination, ignoring --threads")); num_threads = 1; @@ -1070,7 +1087,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 ? GREP_NUM_THREADS_DEFAULT : 1; + num_threads = HAVE_THREADS ? online_cpus() : 1; if (num_threads > 1) { if (!HAVE_THREADS) @@ -1079,6 +1096,17 @@ 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 { /* @@ -1108,14 +1136,11 @@ 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, buf.buf); - strbuf_detach(&buf, NULL); + string_list_append(&path_list, + 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(); @@ -1145,5 +1170,6 @@ 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/help.c b/third_party/git/builtin/help.c index e5590d7787..bb339f0fc8 100644 --- a/third_party/git/builtin/help.c +++ b/third_party/git/builtin/help.c @@ -8,6 +8,7 @@ #include "parse-options.h" #include "run-command.h" #include "column.h" +#include "config-list.h" #include "help.h" #include "alias.h" @@ -62,6 +63,91 @@ static const char * const builtin_help_usage[] = { NULL }; +struct slot_expansion { + const char *prefix; + const char *placeholder; + void (*fn)(struct string_list *list, const char *prefix); + int found; +}; + +static void list_config_help(int for_human) +{ + struct slot_expansion slot_expansions[] = { + { "advice", "*", list_config_advices }, + { "color.branch", "<slot>", list_config_color_branch_slots }, + { "color.decorate", "<slot>", list_config_color_decorate_slots }, + { "color.diff", "<slot>", list_config_color_diff_slots }, + { "color.grep", "<slot>", list_config_color_grep_slots }, + { "color.interactive", "<slot>", list_config_color_interactive_slots }, + { "color.remote", "<slot>", list_config_color_sideband_slots }, + { "color.status", "<slot>", list_config_color_status_slots }, + { "fsck", "<msg-id>", list_config_fsck_msg_ids }, + { "receive.fsck", "<msg-id>", list_config_fsck_msg_ids }, + { NULL, NULL, NULL } + }; + const char **p; + struct slot_expansion *e; + struct string_list keys = STRING_LIST_INIT_DUP; + int i; + + for (p = config_name_list; *p; p++) { + const char *var = *p; + struct strbuf sb = STRBUF_INIT; + + for (e = slot_expansions; e->prefix; e++) { + + strbuf_reset(&sb); + strbuf_addf(&sb, "%s.%s", e->prefix, e->placeholder); + if (!strcasecmp(var, sb.buf)) { + e->fn(&keys, e->prefix); + e->found++; + break; + } + } + strbuf_release(&sb); + if (!e->prefix) + string_list_append(&keys, var); + } + + for (e = slot_expansions; e->prefix; e++) + if (!e->found) + BUG("slot_expansion %s.%s is not used", + e->prefix, e->placeholder); + + string_list_sort(&keys); + for (i = 0; i < keys.nr; i++) { + const char *var = keys.items[i].string; + const char *wildcard, *tag, *cut; + + if (for_human) { + puts(var); + continue; + } + + wildcard = strchr(var, '*'); + tag = strchr(var, '<'); + + if (!wildcard && !tag) { + puts(var); + continue; + } + + if (wildcard && !tag) + cut = wildcard; + else if (!wildcard && tag) + cut = tag; + else + cut = wildcard < tag ? wildcard : tag; + + /* + * We may produce duplicates, but that's up to + * git-completion.bash to handle + */ + printf("%.*s\n", (int)(cut - var), var); + } + string_list_clear(&keys, 0); +} + static enum help_format parse_help_format(const char *format) { if (!strcmp(format, "man")) @@ -242,7 +328,7 @@ static int add_man_viewer_cmd(const char *name, static int add_man_viewer_info(const char *var, const char *value) { const char *name, *subkey; - int namelen; + size_t namelen; if (parse_config_key(var, "man", &name, &namelen, &subkey) < 0 || !name) return 0; @@ -493,7 +579,7 @@ int cmd_help(int argc, const char **argv, const char *prefix) } if (show_guides) - list_common_guides_help(); + list_guides_help(); if (show_all || show_guides) { printf("%s\n", _(git_more_info_string)); diff --git a/third_party/git/builtin/index-pack.c b/third_party/git/builtin/index-pack.c index 0d55f73b0b..0d03cb442d 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 "fetch-object.h" +#include "promisor-remote.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>])"; @@ -33,19 +33,61 @@ struct object_stat { }; struct base_data { + /* Initialized by make_base(). */ struct base_data *base; - struct base_data *child; struct object_entry *obj; - void *data; - unsigned long size; int ref_first, ref_last; int ofs_first, ofs_last; + /* + * Threads should increment retain_data if they are about to call + * patch_delta() using this struct's data as a base, and decrement this + * when they are done. While retain_data is nonzero, this struct's data + * will not be freed even if the delta base cache limit is exceeded. + */ + int retain_data; + /* + * The number of direct children that have not been fully processed + * (entered work_head, entered done_head, left done_head). When this + * number reaches zero, this struct base_data can be freed. + */ + int children_remaining; + + /* Not initialized by make_base(). */ + struct list_head list; + void *data; + unsigned long size; }; +/* + * Stack of struct base_data that have unprocessed children. + * threaded_second_pass() uses this as a source of work (the other being the + * objects array). + * + * Guarded by work_mutex. + */ +static LIST_HEAD(work_head); + +/* + * Stack of struct base_data that have children, all of whom have been + * processed or are being processed, and at least one child is being processed. + * These struct base_data must be kept around until the last child is + * processed. + * + * Guarded by work_mutex. + */ +static LIST_HEAD(done_head); + +/* + * All threads share one delta base cache. + * + * base_cache_used is guarded by work_mutex, and base_cache_limit is read-only + * in a thread. + */ +static size_t base_cache_used; +static size_t base_cache_limit; + struct thread_local { pthread_t thread; - struct base_data *base_cache; - size_t base_cache_used; int pack_fd; }; @@ -117,10 +159,6 @@ static pthread_mutex_t deepest_delta_mutex; #define deepest_delta_lock() lock_mutex(&deepest_delta_mutex) #define deepest_delta_unlock() unlock_mutex(&deepest_delta_mutex) -static pthread_mutex_t type_cas_mutex; -#define type_cas_lock() lock_mutex(&type_cas_mutex) -#define type_cas_unlock() unlock_mutex(&type_cas_mutex) - static pthread_key_t key; static inline void lock_mutex(pthread_mutex_t *mutex) @@ -144,7 +182,6 @@ static void init_thread(void) init_recursive_mutex(&read_mutex); pthread_mutex_init(&counter_mutex, NULL); pthread_mutex_init(&work_mutex, NULL); - pthread_mutex_init(&type_cas_mutex, NULL); if (show_stat) pthread_mutex_init(&deepest_delta_mutex, NULL); pthread_key_create(&key, NULL); @@ -167,7 +204,6 @@ static void cleanup_thread(void) pthread_mutex_destroy(&read_mutex); pthread_mutex_destroy(&counter_mutex); pthread_mutex_destroy(&work_mutex); - pthread_mutex_destroy(&type_cas_mutex); if (show_stat) pthread_mutex_destroy(&deepest_delta_mutex); for (i = 0; i < nr_threads; i++) @@ -364,56 +400,42 @@ static void set_thread_data(struct thread_local *data) pthread_setspecific(key, data); } -static struct base_data *alloc_base_data(void) -{ - struct base_data *base = xcalloc(1, sizeof(struct base_data)); - base->ref_last = -1; - base->ofs_last = -1; - return base; -} - static void free_base_data(struct base_data *c) { if (c->data) { FREE_AND_NULL(c->data); - get_thread_data()->base_cache_used -= c->size; + base_cache_used -= c->size; } } static void prune_base_data(struct base_data *retain) { - struct base_data *b; - struct thread_local *data = get_thread_data(); - for (b = data->base_cache; - data->base_cache_used > delta_base_cache_limit && b; - b = b->child) { - if (b->data && b != retain) - free_base_data(b); - } -} + struct list_head *pos; -static void link_base_data(struct base_data *base, struct base_data *c) -{ - if (base) - base->child = c; - else - get_thread_data()->base_cache = c; + if (base_cache_used <= base_cache_limit) + return; - c->base = base; - c->child = NULL; - if (c->data) - get_thread_data()->base_cache_used += c->size; - prune_base_data(c); -} + list_for_each_prev(pos, &done_head) { + struct base_data *b = list_entry(pos, struct base_data, list); + if (b->retain_data || b == retain) + continue; + if (b->data) { + free_base_data(b); + if (base_cache_used <= base_cache_limit) + return; + } + } -static void unlink_base_data(struct base_data *c) -{ - struct base_data *base = c->base; - if (base) - base->child = NULL; - else - get_thread_data()->base_cache = NULL; - free_base_data(c); + list_for_each_prev(pos, &work_head) { + struct base_data *b = list_entry(pos, struct base_data, list); + if (b->retain_data || b == retain) + continue; + if (b->data) { + free_base_data(b); + if (base_cache_used <= base_cache_limit) + return; + } + } } static int is_delta_type(enum object_type type) @@ -614,7 +636,7 @@ static int compare_ofs_delta_bases(off_t offset1, off_t offset2, 0; } -static int find_ofs_delta(const off_t offset, enum object_type type) +static int find_ofs_delta(const off_t offset) { int first = 0, last = nr_ofs_deltas; @@ -624,7 +646,8 @@ static int find_ofs_delta(const off_t offset, enum object_type type) int cmp; cmp = compare_ofs_delta_bases(offset, delta->offset, - type, objects[delta->obj_no].type); + OBJ_OFS_DELTA, + objects[delta->obj_no].type); if (!cmp) return next; if (cmp < 0) { @@ -637,10 +660,9 @@ static int find_ofs_delta(const off_t offset, enum object_type type) } static void find_ofs_delta_children(off_t offset, - int *first_index, int *last_index, - enum object_type type) + int *first_index, int *last_index) { - int first = find_ofs_delta(offset, type); + int first = find_ofs_delta(offset); int last = first; int end = nr_ofs_deltas - 1; @@ -668,7 +690,7 @@ static int compare_ref_delta_bases(const struct object_id *oid1, return oidcmp(oid1, oid2); } -static int find_ref_delta(const struct object_id *oid, enum object_type type) +static int find_ref_delta(const struct object_id *oid) { int first = 0, last = nr_ref_deltas; @@ -678,7 +700,8 @@ static int find_ref_delta(const struct object_id *oid, enum object_type type) int cmp; cmp = compare_ref_delta_bases(oid, &delta->oid, - type, objects[delta->obj_no].type); + OBJ_REF_DELTA, + objects[delta->obj_no].type); if (!cmp) return next; if (cmp < 0) { @@ -691,10 +714,9 @@ static int find_ref_delta(const struct object_id *oid, enum object_type type) } static void find_ref_delta_children(const struct object_id *oid, - int *first_index, int *last_index, - enum object_type type) + int *first_index, int *last_index) { - int first = find_ref_delta(oid, type); + int first = find_ref_delta(oid); int last = first; int end = nr_ref_deltas - 1; @@ -757,7 +779,8 @@ static int check_collison(struct object_entry *entry) memset(&data, 0, sizeof(data)); data.entry = entry; - data.st = open_istream(&entry->idx.oid, &type, &size, NULL); + data.st = open_istream(the_repository, &entry->idx.oid, &type, &size, + NULL); if (!data.st) return -1; if (size != entry->size || type != entry->type) @@ -865,26 +888,15 @@ static void sha1_object(const void *data, struct object_entry *obj_entry, } /* - * This function is part of find_unresolved_deltas(). There are two - * walkers going in the opposite ways. - * - * The first one in find_unresolved_deltas() traverses down from - * parent node to children, deflating nodes along the way. However, - * memory for deflated nodes is limited by delta_base_cache_limit, so - * at some point parent node's deflated content may be freed. - * - * The second walker is this function, which goes from current node up - * to top parent if necessary to deflate the node. In normal - * situation, its parent node would be already deflated, so it just - * needs to apply delta. - * - * In the worst case scenario, parent node is no longer deflated because - * we're running out of delta_base_cache_limit; we need to re-deflate - * parents, possibly up to the top base. + * Ensure that this node has been reconstructed and return its contents. * - * All deflated objects here are subject to be freed if we exceed - * delta_base_cache_limit, just like in find_unresolved_deltas(), we - * just need to make sure the last node is not freed. + * In the typical and best case, this node would already be reconstructed + * (through the invocation to resolve_delta() in threaded_second_pass()) and it + * would not be pruned. However, if pruning of this node was necessary due to + * reaching delta_base_cache_limit, this function will find the closest + * ancestor with reconstructed data that has not been pruned (or if there is + * none, the ultimate base object), and reconstruct each node in the delta + * chain in order to generate the reconstructed data for this node. */ static void *get_base_data(struct base_data *c) { @@ -901,7 +913,7 @@ static void *get_base_data(struct base_data *c) if (!delta_nr) { c->data = get_data_from_pack(obj); c->size = obj->size; - get_thread_data()->base_cache_used += c->size; + base_cache_used += c->size; prune_base_data(c); } for (; delta_nr > 0; delta_nr--) { @@ -917,7 +929,7 @@ static void *get_base_data(struct base_data *c) free(raw); if (!c->data) bad_object(obj->idx.offset, _("failed to apply delta")); - get_thread_data()->base_cache_used += c->size; + base_cache_used += c->size; prune_base_data(c); } free(delta); @@ -925,10 +937,27 @@ static void *get_base_data(struct base_data *c) return c->data; } -static void resolve_delta(struct object_entry *delta_obj, - struct base_data *base, struct base_data *result) +static struct base_data *make_base(struct object_entry *obj, + struct base_data *parent) { - void *base_data, *delta_data; + struct base_data *base = xcalloc(1, sizeof(struct base_data)); + base->base = parent; + base->obj = obj; + find_ref_delta_children(&obj->idx.oid, + &base->ref_first, &base->ref_last); + find_ofs_delta_children(obj->idx.offset, + &base->ofs_first, &base->ofs_last); + base->children_remaining = base->ref_last - base->ref_first + + base->ofs_last - base->ofs_first + 2; + return base; +} + +static struct base_data *resolve_delta(struct object_entry *delta_obj, + struct base_data *base) +{ + void *delta_data, *result_data; + struct base_data *result; + unsigned long result_size; if (show_stat) { int i = delta_obj - objects; @@ -941,113 +970,26 @@ static void resolve_delta(struct object_entry *delta_obj, obj_stat[i].base_object_no = j; } delta_data = get_data_from_pack(delta_obj); - base_data = get_base_data(base); - result->obj = delta_obj; - result->data = patch_delta(base_data, base->size, - delta_data, delta_obj->size, &result->size); + assert(base->data); + result_data = patch_delta(base->data, base->size, + delta_data, delta_obj->size, &result_size); free(delta_data); - if (!result->data) + if (!result_data) bad_object(delta_obj->idx.offset, _("failed to apply delta")); - hash_object_file(result->data, result->size, + hash_object_file(the_hash_algo, 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, + sha1_object(result_data, NULL, result_size, delta_obj->real_type, &delta_obj->idx.oid); + + result = make_base(delta_obj, base); + result->data = result_data; + result->size = result_size; + counter_lock(); nr_resolved_deltas++; counter_unlock(); -} - -/* - * Standard boolean compare-and-swap: atomically check whether "*type" is - * "want"; if so, swap in "set" and return true. Otherwise, leave it untouched - * and return false. - */ -static int compare_and_swap_type(signed char *type, - enum object_type want, - enum object_type set) -{ - enum object_type old; - - type_cas_lock(); - old = *type; - if (old == want) - *type = set; - type_cas_unlock(); - return old == want; -} - -static struct base_data *find_unresolved_deltas_1(struct base_data *base, - struct base_data *prev_base) -{ - if (base->ref_last == -1 && base->ofs_last == -1) { - find_ref_delta_children(&base->obj->idx.oid, - &base->ref_first, &base->ref_last, - OBJ_REF_DELTA); - - find_ofs_delta_children(base->obj->idx.offset, - &base->ofs_first, &base->ofs_last, - OBJ_OFS_DELTA); - - if (base->ref_last == -1 && base->ofs_last == -1) { - free(base->data); - return NULL; - } - - link_base_data(prev_base, base); - } - - if (base->ref_first <= base->ref_last) { - struct object_entry *child = objects + ref_deltas[base->ref_first].obj_no; - struct base_data *result = alloc_base_data(); - - if (!compare_and_swap_type(&child->real_type, OBJ_REF_DELTA, - base->obj->real_type)) - BUG("child->real_type != OBJ_REF_DELTA"); - - resolve_delta(child, base, result); - if (base->ref_first == base->ref_last && base->ofs_last == -1) - free_base_data(base); - - base->ref_first++; - return result; - } - - if (base->ofs_first <= base->ofs_last) { - struct object_entry *child = objects + ofs_deltas[base->ofs_first].obj_no; - struct base_data *result = alloc_base_data(); - - assert(child->real_type == OBJ_OFS_DELTA); - child->real_type = base->obj->real_type; - resolve_delta(child, base, result); - if (base->ofs_first == base->ofs_last) - free_base_data(base); - - base->ofs_first++; - return result; - } - - unlink_base_data(base); - return NULL; -} - -static void find_unresolved_deltas(struct base_data *base) -{ - struct base_data *new_base, *prev_base = NULL; - for (;;) { - new_base = find_unresolved_deltas_1(base, prev_base); - - if (new_base) { - prev_base = base; - base = new_base; - } else { - free(base); - base = prev_base; - if (!base) - return; - prev_base = base->base; - } - } + return result; } static int compare_ofs_delta_entry(const void *a, const void *b) @@ -1068,34 +1010,135 @@ static int compare_ref_delta_entry(const void *a, const void *b) return oidcmp(&delta_a->oid, &delta_b->oid); } -static void resolve_base(struct object_entry *obj) -{ - struct base_data *base_obj = alloc_base_data(); - base_obj->obj = obj; - base_obj->data = NULL; - find_unresolved_deltas(base_obj); -} - static void *threaded_second_pass(void *data) { - set_thread_data(data); + if (data) + set_thread_data(data); for (;;) { - int i; + struct base_data *parent = NULL; + struct object_entry *child_obj; + struct base_data *child; + counter_lock(); display_progress(progress, nr_resolved_deltas); counter_unlock(); + work_lock(); - while (nr_dispatched < nr_objects && - is_delta_type(objects[nr_dispatched].type)) - nr_dispatched++; - if (nr_dispatched >= nr_objects) { - work_unlock(); - break; + if (list_empty(&work_head)) { + /* + * Take an object from the object array. + */ + while (nr_dispatched < nr_objects && + is_delta_type(objects[nr_dispatched].type)) + nr_dispatched++; + if (nr_dispatched >= nr_objects) { + work_unlock(); + break; + } + child_obj = &objects[nr_dispatched++]; + } else { + /* + * Peek at the top of the stack, and take a child from + * it. + */ + parent = list_first_entry(&work_head, struct base_data, + list); + + if (parent->ref_first <= parent->ref_last) { + int offset = ref_deltas[parent->ref_first++].obj_no; + child_obj = objects + offset; + if (child_obj->real_type != OBJ_REF_DELTA) + die("REF_DELTA at offset %"PRIuMAX" already resolved (duplicate base %s?)", + (uintmax_t) child_obj->idx.offset, + oid_to_hex(&parent->obj->idx.oid)); + child_obj->real_type = parent->obj->real_type; + } else { + child_obj = objects + + ofs_deltas[parent->ofs_first++].obj_no; + assert(child_obj->real_type == OBJ_OFS_DELTA); + child_obj->real_type = parent->obj->real_type; + } + + if (parent->ref_first > parent->ref_last && + parent->ofs_first > parent->ofs_last) { + /* + * This parent has run out of children, so move + * it to done_head. + */ + list_del(&parent->list); + list_add(&parent->list, &done_head); + } + + /* + * Ensure that the parent has data, since we will need + * it later. + * + * NEEDSWORK: If parent data needs to be reloaded, this + * prolongs the time that the current thread spends in + * the mutex. A mitigating factor is that parent data + * needs to be reloaded only if the delta base cache + * limit is exceeded, so in the typical case, this does + * not happen. + */ + get_base_data(parent); + parent->retain_data++; } - i = nr_dispatched++; work_unlock(); - resolve_base(&objects[i]); + if (parent) { + child = resolve_delta(child_obj, parent); + if (!child->children_remaining) + FREE_AND_NULL(child->data); + } else { + child = make_base(child_obj, NULL); + if (child->children_remaining) { + /* + * Since this child has its own delta children, + * we will need this data in the future. + * Inflate now so that future iterations will + * have access to this object's data while + * outside the work mutex. + */ + child->data = get_data_from_pack(child_obj); + child->size = child_obj->size; + } + } + + work_lock(); + if (parent) + parent->retain_data--; + if (child->data) { + /* + * This child has its own children, so add it to + * work_head. + */ + list_add(&child->list, &work_head); + base_cache_used += child->size; + prune_base_data(NULL); + } else { + /* + * This child does not have its own children. It may be + * the last descendant of its ancestors; free those + * that we can. + */ + struct base_data *p = parent; + + while (p) { + struct base_data *next_p; + + p->children_remaining--; + if (p->children_remaining) + break; + + next_p = p->base; + free_base_data(p); + list_del(&p->list); + free(p); + + p = next_p; + } + } + work_unlock(); } return NULL; } @@ -1196,6 +1239,7 @@ static void resolve_deltas(void) nr_ref_deltas + nr_ofs_deltas); nr_dispatched = 0; + base_cache_limit = delta_base_cache_limit * nr_threads; if (nr_threads > 1 || getenv("GIT_FORCE_THREADS")) { init_thread(); for (i = 0; i < nr_threads; i++) { @@ -1210,15 +1254,7 @@ static void resolve_deltas(void) cleanup_thread(); return; } - - for (i = 0; i < nr_objects; i++) { - struct object_entry *obj = &objects[i]; - - if (is_delta_type(obj->type)) - continue; - resolve_base(obj); - display_progress(progress, nr_resolved_deltas); - } + threaded_second_pass(¬hread_data); } /* @@ -1352,7 +1388,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 (repository_format_partial_clone) { + if (has_promisor_remote()) { /* * Prefetch the delta bases. */ @@ -1365,30 +1401,36 @@ static void fix_unresolved_deltas(struct hashfile *f) continue; oid_array_append(&to_fetch, &d->oid); } - if (to_fetch.nr) - fetch_objects(repository_format_partial_clone, - to_fetch.oid, to_fetch.nr); + promisor_remote_get_direct(the_repository, + to_fetch.oid, to_fetch.nr); oid_array_clear(&to_fetch); } for (i = 0; i < nr_ref_deltas; i++) { struct ref_delta_entry *d = sorted_by_pos[i]; enum object_type type; - struct base_data *base_obj = alloc_base_data(); + void *data; + unsigned long size; if (objects[d->obj_no].real_type != OBJ_REF_DELTA) continue; - base_obj->data = read_object_file(&d->oid, &type, - &base_obj->size); - if (!base_obj->data) + data = read_object_file(&d->oid, &type, &size); + if (!data) continue; - if (check_object_signature(&d->oid, base_obj->data, - base_obj->size, type_name(type))) + if (check_object_signature(the_repository, &d->oid, + data, 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); - find_unresolved_deltas(base_obj); + + /* + * Add this as an object to the objects array and call + * threaded_second_pass() (which will pick up the added + * object). + */ + append_obj_to_pack(f, d->oid.hash, data, size, type); + threaded_second_pass(NULL); + display_progress(progress, nr_resolved_deltas); } free(sorted_by_pos); @@ -1490,11 +1532,11 @@ static void final(const char *final_pack_name, const char *curr_pack_name, } if (!from_stdin) { - printf("%s\n", sha1_to_hex(hash)); + printf("%s\n", hash_to_hex(hash)); } else { struct strbuf buf = STRBUF_INIT; - strbuf_addf(&buf, "%s\t%s\n", report, sha1_to_hex(hash)); + strbuf_addf(&buf, "%s\t%s\n", report, hash_to_hex(hash)); write_or_die(1, buf.buf, buf.len); strbuf_release(&buf); @@ -1552,13 +1594,9 @@ static void read_v2_anomalous_offsets(struct packed_git *p, { const uint32_t *idx1, *idx2; uint32_t i; - const uint32_t hashwords = the_hash_algo->rawsz / sizeof(uint32_t); /* The address of the 4-byte offset table */ - idx1 = (((const uint32_t *)p->index_data) - + 2 /* 8-byte header */ - + 256 /* fan out */ - + hashwords * p->num_objects /* object ID table */ + idx1 = (((const uint32_t *)((const uint8_t *)p->index_data + p->crc_offset)) + p->num_objects /* CRC32 table */ ); @@ -1668,6 +1706,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) unsigned char pack_hash[GIT_MAX_RAWSZ]; unsigned foreign_nr = 1; /* zero is a "good" value, assume bad */ int report_end_of_input = 0; + int hash_algo = 0; /* * index-pack never needs to fetch missing objects except when @@ -1761,6 +1800,11 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) die(_("bad %s"), arg); } else if (skip_prefix(arg, "--max-input-size=", &arg)) { max_input_size = strtoumax(arg, NULL, 10); + } else if (skip_prefix(arg, "--object-format=", &arg)) { + hash_algo = hash_algo_by_name(arg); + if (hash_algo == GIT_HASH_UNKNOWN) + die(_("unknown hash algorithm '%s'"), arg); + repo_set_hash_algo(the_repository, hash_algo); } else usage(index_pack_usage); continue; @@ -1777,6 +1821,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) die(_("--fix-thin cannot be used without --stdin")); if (from_stdin && !startup_info->have_repository) die(_("--stdin requires a git repository")); + if (from_stdin && hash_algo) + die(_("--object-format cannot be used with --stdin")); if (!index_name && pack_name) index_name = derive_filename(pack_name, "idx", &index_name_buf); @@ -1791,9 +1837,22 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) if (HAVE_THREADS && !nr_threads) { nr_threads = online_cpus(); - /* An experiment showed that more threads does not mean faster */ - if (nr_threads > 3) - nr_threads = 3; + /* + * Experiments show that going above 20 threads doesn't help, + * no matter how many cores you have. Below that, we tend to + * max at half the number of online_cpus(), presumably because + * half of those are hyperthreads rather than full cores. We'll + * never reduce the level below "3", though, to match a + * historical value that nobody complained about. + */ + if (nr_threads < 4) + ; /* too few cores to consider capping */ + else if (nr_threads < 6) + nr_threads = 3; /* historic cap */ + else if (nr_threads < 40) + nr_threads /= 2; + else + nr_threads = 20; /* hard cap */ } curr_pack = open_pack_file(pack_name); diff --git a/third_party/git/builtin/init-db.c b/third_party/git/builtin/init-db.c index 944ec77fe1..01bc648d41 100644 --- a/third_party/git/builtin/init-db.c +++ b/third_party/git/builtin/init-db.c @@ -9,6 +9,7 @@ #include "builtin.h" #include "exec-cmd.h" #include "parse-options.h" +#include "worktree.h" #ifndef DEFAULT_GIT_TEMPLATE_DIR #define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates" @@ -20,6 +21,8 @@ #define TEST_FILEMODE 1 #endif +#define GIT_DEFAULT_HASH_ENVIRONMENT "GIT_DEFAULT_HASH" + static int init_is_bare_repository = 0; static int init_shared_repository = -1; static const char *init_db_template_dir; @@ -176,13 +179,34 @@ static int needs_work_tree_config(const char *git_dir, const char *work_tree) return 1; } +void initialize_repository_version(int hash_algo, int reinit) +{ + char repo_version_string[10]; + int repo_version = GIT_REPO_VERSION; + + if (hash_algo != GIT_HASH_SHA1) + repo_version = GIT_REPO_VERSION_READ; + + /* This forces creation of new config file */ + xsnprintf(repo_version_string, sizeof(repo_version_string), + "%d", repo_version); + git_config_set("core.repositoryformatversion", repo_version_string); + + if (hash_algo != GIT_HASH_SHA1) + git_config_set("extensions.objectformat", + hash_algos[hash_algo].name); + else if (reinit) + git_config_set_gently("extensions.objectformat", NULL); +} + static int create_default_files(const char *template_path, - const char *original_git_dir) + const char *original_git_dir, + const char *initial_branch, + const struct repository_format *fmt) { struct stat st1; struct strbuf buf = STRBUF_INIT; char *path; - char repo_version_string[10]; char junk[2]; int reinit; int filemode; @@ -233,21 +257,29 @@ static int create_default_files(const char *template_path, die("failed to set up refs db: %s", err.buf); /* - * Create the default symlink from ".git/HEAD" to the "master" - * branch, if it does not exist yet. + * Point the HEAD symref to the initial branch with if HEAD does + * not yet exist. */ path = git_path_buf(&buf, "HEAD"); reinit = (!access(path, R_OK) || readlink(path, junk, sizeof(junk)-1) != -1); if (!reinit) { - if (create_symref("HEAD", "refs/heads/master", NULL) < 0) + char *ref; + + if (!initial_branch) + initial_branch = git_default_branch_name(); + + ref = xstrfmt("refs/heads/%s", initial_branch); + if (check_refname_format(ref, 0) < 0) + die(_("invalid initial branch name: '%s'"), + initial_branch); + + if (create_symref("HEAD", ref, NULL) < 0) exit(1); + free(ref); } - /* This forces creation of new config file */ - xsnprintf(repo_version_string, sizeof(repo_version_string), - "%d", GIT_REPO_VERSION); - git_config_set("core.repositoryformatversion", repo_version_string); + initialize_repository_version(fmt->hash_algo, 0); /* Check filemode trustability */ path = git_path_buf(&buf, "config"); @@ -335,17 +367,40 @@ static void separate_git_dir(const char *git_dir, const char *git_link) if (rename(src, git_dir)) die_errno(_("unable to move %s to %s"), src, git_dir); + repair_worktrees(NULL, NULL); } write_file(git_link, "gitdir: %s", git_dir); } +static void validate_hash_algorithm(struct repository_format *repo_fmt, int hash) +{ + const char *env = getenv(GIT_DEFAULT_HASH_ENVIRONMENT); + /* + * If we already have an initialized repo, don't allow the user to + * specify a different algorithm, as that could cause corruption. + * Otherwise, if the user has specified one on the command line, use it. + */ + if (repo_fmt->version >= 0 && hash != GIT_HASH_UNKNOWN && hash != repo_fmt->hash_algo) + die(_("attempt to reinitialize repository with different hash")); + else if (hash != GIT_HASH_UNKNOWN) + repo_fmt->hash_algo = hash; + else if (env) { + int env_algo = hash_algo_by_name(env); + if (env_algo == GIT_HASH_UNKNOWN) + die(_("unknown hash algorithm '%s'"), env); + repo_fmt->hash_algo = env_algo; + } +} + int init_db(const char *git_dir, const char *real_git_dir, - const char *template_dir, unsigned int flags) + const char *template_dir, int hash, const char *initial_branch, + unsigned int flags) { int reinit; int exist_ok = flags & INIT_DB_EXIST_OK; char *original_git_dir = real_pathdup(git_dir, 1); + struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT; if (real_git_dir) { struct stat st; @@ -356,12 +411,12 @@ int init_db(const char *git_dir, const char *real_git_dir, if (!exist_ok && !stat(real_git_dir, &st)) die(_("%s already exists"), real_git_dir); - set_git_dir(real_path(real_git_dir)); + set_git_dir(real_git_dir, 1); git_dir = get_git_dir(); separate_git_dir(git_dir, original_git_dir); } else { - set_git_dir(real_path(git_dir)); + set_git_dir(git_dir, 1); git_dir = get_git_dir(); } startup_info->have_repository = 1; @@ -378,9 +433,15 @@ int init_db(const char *git_dir, const char *real_git_dir, * config file, so this will not fail. What we are catching * is an attempt to reinitialize new repository with an old tool. */ - check_repository_format(); + check_repository_format(&repo_fmt); - reinit = create_default_files(template_dir, original_git_dir); + validate_hash_algorithm(&repo_fmt, hash); + + reinit = create_default_files(template_dir, original_git_dir, + initial_branch, &repo_fmt); + if (reinit && initial_branch) + warning(_("re-init: ignored --initial-branch=%s"), + initial_branch); create_object_directory(); @@ -482,6 +543,9 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) const char *work_tree; const char *template_dir = NULL; unsigned int flags = 0; + const char *object_format = NULL; + const char *initial_branch = NULL; + int hash_algo = GIT_HASH_UNKNOWN; const struct option init_db_options[] = { OPT_STRING(0, "template", &template_dir, N_("template-directory"), N_("directory from which templates will be used")), @@ -494,11 +558,18 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) OPT_BIT('q', "quiet", &flags, N_("be quiet"), INIT_DB_QUIET), OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"), N_("separate git dir from working tree")), + OPT_STRING('b', "initial-branch", &initial_branch, N_("name"), + N_("override the name of the initial branch")), + OPT_STRING(0, "object-format", &object_format, N_("hash"), + N_("specify the hash algorithm to use")), OPT_END() }; argc = parse_options(argc, argv, prefix, init_db_options, init_db_usage, 0); + if (real_git_dir && is_bare_repository_cfg == 1) + die(_("--separate-git-dir and --bare are mutually exclusive")); + if (real_git_dir && !is_absolute_path(real_git_dir)) real_git_dir = real_pathdup(real_git_dir, 1); @@ -546,6 +617,12 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) free(cwd); } + if (object_format) { + hash_algo = hash_algo_by_name(object_format); + if (hash_algo == GIT_HASH_UNKNOWN) + die(_("unknown hash algorithm '%s'"), object_format); + } + if (init_shared_repository != -1) set_shared_repository(init_shared_repository); @@ -567,6 +644,30 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT; + /* + * When --separate-git-dir is used inside a linked worktree, take + * care to ensure that the common .git/ directory is relocated, not + * the worktree-specific .git/worktrees/<id>/ directory. + */ + if (real_git_dir) { + int err; + const char *p; + struct strbuf sb = STRBUF_INIT; + + p = read_gitfile_gently(git_dir, &err); + if (p && get_common_dir(&sb, p)) { + struct strbuf mainwt = STRBUF_INIT; + + strbuf_addbuf(&mainwt, &sb); + strbuf_strip_suffix(&mainwt, "/.git"); + if (chdir(mainwt.buf) < 0) + die_errno(_("cannot chdir to %s"), mainwt.buf); + strbuf_release(&mainwt); + git_dir = strbuf_detach(&sb, NULL); + } + strbuf_release(&sb); + } + if (is_bare_repository_cfg < 0) is_bare_repository_cfg = guess_repository_type(git_dir); @@ -588,6 +689,8 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) get_git_work_tree()); } else { + if (real_git_dir) + die(_("--separate-git-dir incompatible with bare repository")); if (work_tree) set_git_work_tree(work_tree); } @@ -597,5 +700,6 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) UNLEAK(work_tree); flags |= INIT_DB_EXIST_OK; - return init_db(git_dir, real_git_dir, template_dir, flags); + return init_db(git_dir, real_git_dir, template_dir, hash_algo, + initial_branch, flags); } diff --git a/third_party/git/builtin/interpret-trailers.c b/third_party/git/builtin/interpret-trailers.c index f101d092b8..84748eafc0 100644 --- a/third_party/git/builtin/interpret-trailers.c +++ b/third_party/git/builtin/interpret-trailers.c @@ -105,8 +105,8 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "only-trailers", &opts.only_trailers, N_("output only the trailers")), OPT_BOOL(0, "only-input", &opts.only_input, N_("do not apply config rules")), OPT_BOOL(0, "unfold", &opts.unfold, N_("join whitespace-continued values")), - { OPTION_CALLBACK, 0, "parse", &opts, NULL, N_("set parsing options"), - PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_parse }, + OPT_CALLBACK_F(0, "parse", &opts, NULL, N_("set parsing options"), + PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_parse), OPT_BOOL(0, "no-divider", &opts.no_divider, N_("do not treat --- specially")), OPT_CALLBACK(0, "trailer", &trailers, N_("trailer"), N_("trailer(s) to add"), option_parse_trailer), diff --git a/third_party/git/builtin/log.c b/third_party/git/builtin/log.c index 44b10b3415..0a7ed4bef9 100644 --- a/third_party/git/builtin/log.c +++ b/third_party/git/builtin/log.c @@ -33,10 +33,10 @@ #include "commit-slab.h" #include "repository.h" #include "commit-reach.h" -#include "interdiff.h" #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; @@ -45,6 +45,7 @@ static int default_abbrev_commit; static int default_show_root = 1; static int default_follow; static int default_show_signature; +static int default_encode_email_headers = 1; static int decoration_style; static int decoration_given; static int use_mailmap_config = 1; @@ -150,6 +151,7 @@ static void cmd_log_init_defaults(struct rev_info *rev) rev->show_root_diff = default_show_root; rev->subject_prefix = fmt_patch_subject_prefix; rev->show_signature = default_show_signature; + rev->encode_email_headers = default_encode_email_headers; rev->diffopt.flags.allow_textconv = 1; if (default_date_mode) @@ -163,21 +165,24 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, int quiet = 0, source = 0, mailmap; static struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP}; static struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP; + static struct string_list decorate_refs_exclude_config = STRING_LIST_INIT_NODUP; static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP; struct decoration_filter decoration_filter = {&decorate_refs_include, - &decorate_refs_exclude}; + &decorate_refs_exclude, + &decorate_refs_exclude_config}; static struct revision_sources revision_sources; const struct option builtin_log_options[] = { OPT__QUIET(&quiet, N_("suppress diff output")), OPT_BOOL(0, "source", &source, N_("show source")), OPT_BOOL(0, "use-mailmap", &mailmap, N_("Use mail map file")), + OPT_ALIAS(0, "mailmap", "use-mailmap"), OPT_STRING_LIST(0, "decorate-refs", &decorate_refs_include, N_("pattern"), N_("only decorate refs that match <pattern>")), OPT_STRING_LIST(0, "decorate-refs-exclude", &decorate_refs_exclude, N_("pattern"), N_("do not decorate refs that match <pattern>")), - { OPTION_CALLBACK, 0, "decorate", NULL, NULL, N_("decorate options"), - PARSE_OPT_OPTARG, decorate_callback}, + OPT_CALLBACK_F(0, "decorate", NULL, NULL, N_("decorate options"), + PARSE_OPT_OPTARG, decorate_callback), OPT_CALLBACK('L', NULL, &line_cb, "n,m:file", N_("Process line range n,m in file, counting from 1"), log_line_range_callback), @@ -207,7 +212,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) - init_display_notes(&rev->notes_opt); + load_display_notes(&rev->notes_opt); if ((rev->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) || rev->diffopt.filter || rev->diffopt.flags.follow_renames) @@ -235,7 +240,19 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, } if (decoration_style) { + const struct string_list *config_exclude = + repo_config_get_value_multi(the_repository, + "log.excludeDecoration"); + + if (config_exclude) { + struct string_list_item *item; + for_each_string_list_item(item, config_exclude) + string_list_append(&decorate_refs_exclude_config, + item->string); + } + rev->show_decorations = 1; + load_ref_decorations(&decoration_filter, decoration_style); } @@ -437,6 +454,10 @@ static int git_log_config(const char *var, const char *value, void *cb) return git_config_string(&fmt_pretty, var, value); if (!strcmp(var, "format.subjectprefix")) return git_config_string(&fmt_patch_subject_prefix, var, value); + if (!strcmp(var, "format.encodeemailheaders")) { + default_encode_email_headers = git_config_bool(var, value); + return 0; + } if (!strcmp(var, "log.abbrevcommit")) { default_abbrev_commit = git_config_bool(var, value); return 0; @@ -577,8 +598,8 @@ static int show_tree_object(const struct object_id *oid, static void show_setup_revisions_tweak(struct rev_info *rev, struct setup_revision_opt *opt) { - if (rev->ignore_merges) { - /* There was no "-m" on the command line */ + if (rev->ignore_merges < 0) { + /* There was no "-m" variant on the command line */ rev->ignore_merges = 0; if (!rev->first_parent_only && !rev->combine_merges) { /* No "--first-parent", "-c", or "--cc" */ @@ -627,6 +648,7 @@ 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'); @@ -638,10 +660,10 @@ int cmd_show(int argc, const char **argv, const char *prefix) rev.shown_one = 1; if (ret) break; - o = parse_object(the_repository, &t->tagged->oid); + o = parse_object(the_repository, oid); if (!o) ret = error(_("could not read object %s"), - oid_to_hex(&t->tagged->oid)); + oid_to_hex(oid)); objects[i].item = o; i--; break; @@ -709,8 +731,7 @@ static void log_setup_revisions_tweak(struct rev_info *rev, if (!rev->diffopt.output_format && rev->combine_merges) rev->diffopt.output_format = DIFF_FORMAT_PATCH; - /* Turn -m on when --cc/-c was given */ - if (rev->combine_merges) + if (rev->first_parent_only && rev->ignore_merges < 0) rev->ignore_merges = 0; } @@ -764,28 +785,62 @@ static void add_header(const char *value) item->string[len] = '\0'; } -#define THREAD_SHALLOW 1 -#define THREAD_DEEP 2 -static int thread; +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 +}; + +enum auto_base_setting { + AUTO_BASE_NEVER, + AUTO_BASE_ALWAYS, + AUTO_BASE_WHEN_ABLE +}; + +static enum thread_level thread; static int do_signoff; -static int base_auto; +static enum auto_base_setting auto_base; static char *from; static const char *signature = git_version_string; static const char *signature_file; -static int config_cover_letter; +static enum cover_setting 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; -enum { - COVER_UNSET, - COVER_OFF, - COVER_ON, - COVER_AUTO -}; +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); +} 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")); @@ -835,7 +890,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 = git_config_bool(var, value) ? THREAD_SHALLOW : THREAD_UNSET; return 0; } if (!strcmp(var, "format.signoff")) { @@ -857,7 +912,11 @@ static int git_format_config(const char *var, const char *value, void *cb) if (!strcmp(var, "format.outputdirectory")) return git_config_string(&config_output_directory, var, value); if (!strcmp(var, "format.useautobase")) { - base_auto = git_config_bool(var, value); + if (value && !strcasecmp(value, "whenAble")) { + auto_base = AUTO_BASE_WHEN_ABLE; + return 0; + } + auto_base = git_config_bool(var, value) ? AUTO_BASE_ALWAYS : AUTO_BASE_NEVER; return 0; } if (!strcmp(var, "format.from")) { @@ -872,19 +931,17 @@ 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) - 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; - } + 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); return 0; } @@ -993,20 +1050,6 @@ 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; @@ -1027,7 +1070,7 @@ static char *find_branch_name(struct rev_info *rev) return NULL; ref = rev->cmdline.rev[positive].name; tip_oid = &rev->cmdline.rev[positive].item->oid; - if (dwim_ref(ref, strlen(ref), &branch_oid, &full_ref) && + if (dwim_ref(ref, strlen(ref), &branch_oid, &full_ref, 0) && skip_prefix(full_ref, "refs/heads/", &v) && oideq(tip_oid, &branch_oid)) branch = xstrdup(v); @@ -1053,6 +1096,63 @@ 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) +{ + strvec_pushf(arg, "--notes=%s", item->string); + return 0; +} + +static void get_notes_args(struct strvec *arg, struct rev_info *rev) +{ + if (!rev->show_notes) { + strvec_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)) { + strvec_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, @@ -1060,8 +1160,6 @@ 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; @@ -1091,15 +1189,12 @@ 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); - pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte); - pp_remainder(&pp, &msg, &sb, 0); - add_branch_description(&sb, branch_name); + prepare_cover_text(&pp, branch_name, &sb, encoding, need_8bit_cte); fprintf(rev->diffopt.file, "%s\n", sb.buf); strbuf_release(&sb); @@ -1110,6 +1205,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, log.in1 = 2; log.in2 = 4; log.file = rev->diffopt.file; + log.groups = SHORTLOG_GROUP_AUTHOR; for (i = 0; i < nr; i++) shortlog_add_commit(&log, list[i]); @@ -1121,7 +1217,8 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, if (rev->idiff_oid1) { fprintf_ln(rev->diffopt.file, "%s", rev->idiff_title); - show_interdiff(rev, 0); + show_interdiff(rev->idiff_oid1, rev->idiff_oid2, 0, + &rev->diffopt); } if (rev->rdiff1) { @@ -1130,13 +1227,16 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, * can be added later if deemed desirable. */ struct diff_options opts; + struct strvec other_arg = STRVEC_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); + rev->creation_factor, 1, &opts, &other_arg); + strvec_clear(&other_arg); } } @@ -1248,9 +1348,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) { - int *thread = (int *)opt->value; + enum thread_level *thread = (enum thread_level *)opt->value; if (unset) - *thread = 0; + *thread = THREAD_UNSET; else if (!arg || !strcmp(arg, "shallow")) *thread = THREAD_SHALLOW; else if (!strcmp(arg, "deep")) @@ -1297,7 +1397,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; } @@ -1335,6 +1435,23 @@ static int from_callback(const struct option *opt, const char *arg, int unset) return 0; } +static int base_callback(const struct option *opt, const char *arg, int unset) +{ + const char **base_commit = opt->value; + + if (unset) { + auto_base = AUTO_BASE_NEVER; + *base_commit = NULL; + } else if (!strcmp(arg, "auto")) { + auto_base = AUTO_BASE_ALWAYS; + *base_commit = NULL; + } else { + auto_base = AUTO_BASE_NEVER; + *base_commit = arg; + } + return 0; +} + struct base_tree_info { struct object_id base_commit; int nr_patch_id, alloc_patch_id; @@ -1347,13 +1464,36 @@ static struct commit *get_base_commit(const char *base_commit, { struct commit *base = NULL; struct commit **rev; - int i = 0, rev_nr = 0; + int i = 0, rev_nr = 0, auto_select, die_on_failure; + + switch (auto_base) { + case AUTO_BASE_NEVER: + if (base_commit) { + auto_select = 0; + die_on_failure = 1; + } else { + /* no base information is requested */ + return NULL; + } + break; + case AUTO_BASE_ALWAYS: + case AUTO_BASE_WHEN_ABLE: + if (base_commit) { + BUG("requested automatic base selection but a commit was provided"); + } else { + auto_select = 1; + die_on_failure = auto_base == AUTO_BASE_ALWAYS; + } + break; + default: + BUG("unexpected automatic base selection method"); + } - if (base_commit && strcmp(base_commit, "auto")) { + if (!auto_select) { base = lookup_commit_reference_by_name(base_commit); if (!base) die(_("unknown commit %s"), base_commit); - } else if ((base_commit && !strcmp(base_commit, "auto")) || base_auto) { + } else { struct branch *curr_branch = branch_get(NULL); const char *upstream = branch_get_upstream(curr_branch, NULL); if (upstream) { @@ -1361,19 +1501,32 @@ static struct commit *get_base_commit(const char *base_commit, struct commit *commit; struct object_id oid; - if (get_oid(upstream, &oid)) - die(_("failed to resolve '%s' as a valid ref"), upstream); + if (get_oid(upstream, &oid)) { + if (die_on_failure) + die(_("failed to resolve '%s' as a valid ref"), upstream); + else + return NULL; + } commit = lookup_commit_or_die(&oid, "upstream base"); base_list = get_merge_bases_many(commit, total, list); /* There should be one and only one merge base. */ - if (!base_list || base_list->next) - die(_("could not find exact merge base")); + if (!base_list || base_list->next) { + if (die_on_failure) { + die(_("could not find exact merge base")); + } else { + free_commit_list(base_list); + return NULL; + } + } base = base_list->item; free_commit_list(base_list); } else { - die(_("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")); + if (die_on_failure) + die(_("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")); + else + return NULL; } } @@ -1390,8 +1543,14 @@ static struct commit *get_base_commit(const char *base_commit, for (i = 0; i < rev_nr / 2; i++) { struct commit_list *merge_base; merge_base = get_merge_bases(rev[2 * i], rev[2 * i + 1]); - if (!merge_base || merge_base->next) - die(_("failed to find exact merge base")); + if (!merge_base || merge_base->next) { + if (die_on_failure) { + die(_("failed to find exact merge base")); + } else { + free(rev); + return NULL; + } + } rev[i] = merge_base->item; } @@ -1401,12 +1560,24 @@ static struct commit *get_base_commit(const char *base_commit, rev_nr = DIV_ROUND_UP(rev_nr, 2); } - if (!in_merge_bases(base, rev[0])) - die(_("base commit should be the ancestor of revision list")); + if (!in_merge_bases(base, rev[0])) { + if (die_on_failure) { + die(_("base commit should be the ancestor of revision list")); + } else { + free(rev); + return NULL; + } + } for (i = 0; i < total; i++) { - if (base == list[i]) - die(_("base commit shouldn't be in revision list")); + if (base == list[i]) { + if (die_on_failure) { + die(_("base commit shouldn't be in revision list")); + } else { + free(rev); + return NULL; + } + } } free(rev); @@ -1506,16 +1677,20 @@ static void infer_range_diff_ranges(struct strbuf *r1, struct commit *head) { const char *head_oid = oid_to_hex(&head->object.oid); + int prev_is_range = !!strstr(prev, ".."); - if (!strstr(prev, "..")) { + if (prev_is_range) + strbuf_addstr(r1, prev); + else strbuf_addf(r1, "%s..%s", head_oid, prev); + + if (origin) + strbuf_addf(r2, "%s..%s", oid_to_hex(&origin->object.oid), head_oid); + else if (prev_is_range) + die(_("failed to infer range-diff origin of current series")); + else { + warning(_("using '%s' as range-diff origin of current series"), prev); strbuf_addf(r2, "%s..%s", prev, head_oid); - } else if (!origin) { - die(_("failed to infer range-diff ranges")); - } else { - strbuf_addstr(r1, prev); - strbuf_addf(r2, "%s..%s", - oid_to_hex(&origin->object.oid), head_oid); } } @@ -1541,9 +1716,11 @@ 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; + struct commit *base; int show_progress = 0; struct progress *progress = NULL; struct oid_array idiff_prev = OID_ARRAY_INIT; @@ -1555,12 +1732,12 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) int creation_factor = -1; const struct option builtin_format_patch_options[] = { - { OPTION_CALLBACK, 'n', "numbered", &numbered, NULL, + OPT_CALLBACK_F('n', "numbered", &numbered, NULL, N_("use [PATCH n/m] even with a single patch"), - PARSE_OPT_NOARG, numbered_callback }, - { OPTION_CALLBACK, 'N', "no-numbered", &numbered, NULL, + PARSE_OPT_NOARG, numbered_callback), + OPT_CALLBACK_F('N', "no-numbered", &numbered, NULL, N_("use [PATCH] even with multiple patches"), - PARSE_OPT_NOARG | PARSE_OPT_NONEG, no_numbered_callback }, + PARSE_OPT_NOARG | PARSE_OPT_NONEG, no_numbered_callback), OPT_BOOL('s', "signoff", &do_signoff, N_("add Signed-off-by:")), OPT_BOOL(0, "stdout", &use_stdout, N_("print patches to standard out")), @@ -1574,18 +1751,21 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) N_("start numbering patches at <n> instead of 1")), OPT_INTEGER('v', "reroll-count", &reroll_count, N_("mark the series as Nth re-roll")), - { OPTION_CALLBACK, 0, "rfc", &rev, NULL, + OPT_CALLBACK_F(0, "rfc", &rev, NULL, N_("Use [RFC PATCH] instead of [PATCH]"), - PARSE_OPT_NOARG | PARSE_OPT_NONEG, rfc_callback }, - { OPTION_CALLBACK, 0, "subject-prefix", &rev, N_("prefix"), + 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")), + OPT_CALLBACK_F(0, "subject-prefix", &rev, N_("prefix"), N_("Use [<prefix>] instead of [PATCH]"), - PARSE_OPT_NONEG, subject_prefix_callback }, - { OPTION_CALLBACK, 'o', "output-directory", &output_directory, + PARSE_OPT_NONEG, subject_prefix_callback), + OPT_CALLBACK_F('o', "output-directory", &output_directory, N_("dir"), N_("store resulting files in <dir>"), - PARSE_OPT_NONEG, output_directory_callback }, - { OPTION_CALLBACK, 'k', "keep-subject", &rev, NULL, + PARSE_OPT_NONEG, output_directory_callback), + OPT_CALLBACK_F('k', "keep-subject", &rev, NULL, N_("don't strip/add [PATCH]"), - PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback }, + PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback), OPT_BOOL(0, "no-binary", &no_binary_diff, N_("don't output binary diffs")), OPT_BOOL(0, "zero-commit", &zero_commit, @@ -1596,31 +1776,30 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) N_("show patch format instead of default (patch + stat)"), 1, PARSE_OPT_NONEG), OPT_GROUP(N_("Messaging")), - { OPTION_CALLBACK, 0, "add-header", NULL, N_("header"), - N_("add email header"), 0, header_callback }, - { OPTION_CALLBACK, 0, "to", NULL, N_("email"), N_("add To: header"), - 0, to_callback }, - { OPTION_CALLBACK, 0, "cc", NULL, N_("email"), N_("add Cc: header"), - 0, cc_callback }, - { OPTION_CALLBACK, 0, "from", &from, N_("ident"), + OPT_CALLBACK(0, "add-header", NULL, N_("header"), + N_("add email header"), header_callback), + OPT_CALLBACK(0, "to", NULL, N_("email"), N_("add To: header"), to_callback), + OPT_CALLBACK(0, "cc", NULL, N_("email"), N_("add Cc: header"), cc_callback), + OPT_CALLBACK_F(0, "from", &from, N_("ident"), N_("set From address to <ident> (or committer ident if absent)"), - PARSE_OPT_OPTARG, from_callback }, + PARSE_OPT_OPTARG, from_callback), OPT_STRING(0, "in-reply-to", &in_reply_to, N_("message-id"), N_("make first mail a reply to <message-id>")), - { OPTION_CALLBACK, 0, "attach", &rev, N_("boundary"), + OPT_CALLBACK_F(0, "attach", &rev, N_("boundary"), N_("attach the patch"), PARSE_OPT_OPTARG, - attach_callback }, - { OPTION_CALLBACK, 0, "inline", &rev, N_("boundary"), + attach_callback), + OPT_CALLBACK_F(0, "inline", &rev, N_("boundary"), N_("inline the patch"), PARSE_OPT_OPTARG | PARSE_OPT_NONEG, - inline_callback }, - { OPTION_CALLBACK, 0, "thread", &thread, N_("style"), + inline_callback), + OPT_CALLBACK_F(0, "thread", &thread, N_("style"), N_("enable message threading, styles: shallow, deep"), - PARSE_OPT_OPTARG, thread_callback }, + PARSE_OPT_OPTARG, thread_callback), OPT_STRING(0, "signature", &signature, N_("signature"), N_("add a signature")), - OPT_STRING(0, "base", &base_commit, N_("base-commit"), - N_("add prerequisite tree info to the patch series")), + OPT_CALLBACK_F(0, "base", &base_commit, N_("base-commit"), + N_("add prerequisite tree info to the patch series"), + 0, base_callback), OPT_FILENAME(0, "signature-file", &signature_file, N_("add a signature from a file")), OPT__QUIET(&quiet, N_("don't print the patch filenames")), @@ -1640,9 +1819,13 @@ 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); - git_config(git_format_config, &rev); + rev.show_notes = show_notes; + memcpy(&rev.notes_opt, ¬es_opt, sizeof(notes_opt)); rev.commit_format = CMIT_FMT_EMAIL; + rev.encode_email_headers = default_encode_email_headers; rev.expand_tabs_in_log_default = 0; rev.verbose_header = 1; rev.diff = 1; @@ -1668,6 +1851,9 @@ 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", @@ -1754,7 +1940,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.diffopt.flags.binary = 1; if (rev.show_notes) - init_display_notes(&rev.notes_opt); + load_display_notes(&rev.notes_opt); if (!output_directory && !use_stdout) output_directory = config_output_directory; @@ -1765,10 +1951,26 @@ 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); @@ -1897,8 +2099,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) } memset(&bases, 0, sizeof(bases)); - if (base_commit || base_auto) { - struct commit *base = get_base_commit(base_commit, list, nr); + base = get_base_commit(base_commit, list, nr); + if (base) { reset_revision_walk(); clear_object_flags(UNINTERESTING); prepare_bases(&bases, base, list, nr); diff --git a/third_party/git/builtin/ls-files.c b/third_party/git/builtin/ls-files.c index 670e8fb93c..c8eae899b8 100644 --- a/third_party/git/builtin/ls-files.c +++ b/third_party/git/builtin/ls-files.c @@ -128,8 +128,9 @@ static void show_dir_entry(const struct index_state *istate, if (len > ent->len) die("git ls-files: internal error - directory entry not superset of prefix"); - if (!dir_path_match(istate, ent, &pathspec, len, ps_matched)) - return; + /* If ps_matches is non-NULL, figure out which pathspec(s) match. */ + if (ps_matched) + dir_path_match(istate, ent, &pathspec, len, ps_matched); fputs(tag, stdout); write_eolinfo(istate, NULL, ent->name); @@ -492,7 +493,7 @@ static int option_parse_exclude_from(const struct option *opt, BUG_ON_OPT_NEG(unset); exc_given = 1; - add_excludes_from_file(dir, arg); + add_patterns_from_file(dir, arg); return 0; } @@ -516,7 +517,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 exclude_list *el; + struct pattern_list *pl; struct string_list exclude_list = STRING_LIST_INIT_NODUP; struct option builtin_ls_files_options[] = { /* Think twice before adding "--nul" synonym to this */ @@ -554,18 +555,18 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) N_("show unmerged files in the output")), OPT_BOOL(0, "resolve-undo", &show_resolve_undo, N_("show resolve-undo information")), - { OPTION_CALLBACK, 'x', "exclude", &exclude_list, N_("pattern"), + OPT_CALLBACK_F('x', "exclude", &exclude_list, N_("pattern"), N_("skip files matching pattern"), - PARSE_OPT_NONEG, option_parse_exclude }, - { OPTION_CALLBACK, 'X', "exclude-from", &dir, N_("file"), + PARSE_OPT_NONEG, option_parse_exclude), + OPT_CALLBACK_F('X', "exclude-from", &dir, N_("file"), N_("exclude patterns are read from <file>"), - PARSE_OPT_NONEG, option_parse_exclude_from }, + PARSE_OPT_NONEG, option_parse_exclude_from), OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"), N_("read additional per-directory exclude patterns in <file>")), - { OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL, + OPT_CALLBACK_F(0, "exclude-standard", &dir, NULL, N_("add the standard git exclusions"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, - option_parse_exclude_standard }, + option_parse_exclude_standard), OPT_SET_INT_F(0, "full-name", &prefix_len, N_("make the output relative to the project top directory"), 0, PARSE_OPT_NONEG), @@ -583,7 +584,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) if (argc == 2 && !strcmp(argv[1], "-h")) usage_with_options(ls_files_usage, builtin_ls_files_options); - memset(&dir, 0, sizeof(dir)); + dir_init(&dir); prefix = cmd_prefix; if (prefix) prefix_len = strlen(prefix); @@ -594,9 +595,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); - el = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); + pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option"); for (i = 0; i < exclude_list.nr; i++) { - add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args); + add_pattern(exclude_list.items[i].string, "", 0, pl, --exclude_args); } if (show_tag || show_valid_bit || show_fsmonitor_bit) { tag_cached = "H "; @@ -687,6 +688,6 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) return bad ? 1 : 0; } - UNLEAK(dir); + dir_clear(&dir); return 0; } diff --git a/third_party/git/builtin/ls-remote.c b/third_party/git/builtin/ls-remote.c index 6ef519514b..092917eca2 100644 --- a/third_party/git/builtin/ls-remote.c +++ b/third_party/git/builtin/ls-remote.c @@ -45,7 +45,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) int show_symref_target = 0; const char *uploadpack = NULL; const char **pattern = NULL; - struct argv_array ref_prefixes = ARGV_ARRAY_INIT; + struct strvec ref_prefixes = STRVEC_INIT; int i; struct string_list server_options = STRING_LIST_INIT_DUP; @@ -83,6 +83,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) PARSE_OPT_STOP_AT_NON_OPTION); dest = argv[0]; + UNLEAK(sorting); + if (argc > 1) { int i; pattern = xcalloc(argc, sizeof(const char *)); @@ -92,9 +94,9 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) } if (flags & REF_TAGS) - argv_array_push(&ref_prefixes, "refs/tags/"); + strvec_push(&ref_prefixes, "refs/tags/"); if (flags & REF_HEADS) - argv_array_push(&ref_prefixes, "refs/heads/"); + strvec_push(&ref_prefixes, "refs/heads/"); remote = remote_get(dest); if (!remote) { @@ -107,7 +109,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) if (get_url) { printf("%s\n", *remote->url); - UNLEAK(sorting); return 0; } @@ -118,10 +119,12 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) transport->server_options = &server_options; ref = transport_get_remote_refs(transport, &ref_prefixes); - if (transport_disconnect(transport)) { - UNLEAK(sorting); - return 1; + if (ref) { + int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport)); + repo_set_hash_algo(the_repository, hash_algo); } + if (transport_disconnect(transport)) + return 1; if (!dest && !quiet) fprintf(stderr, "From %s\n", *remote->url); @@ -146,7 +149,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) status = 0; /* we found something */ } - UNLEAK(sorting); ref_array_clear(&ref_array); return status; } diff --git a/third_party/git/builtin/merge-base.c b/third_party/git/builtin/merge-base.c index e3f8da13b6..6719ac198d 100644 --- a/third_party/git/builtin/merge-base.c +++ b/third_party/git/builtin/merge-base.c @@ -114,26 +114,16 @@ static int handle_is_ancestor(int argc, const char **argv) static int handle_fork_point(int argc, const char **argv) { struct object_id oid; - char *refname; struct commit *derived, *fork_point; const char *commitname; - switch (dwim_ref(argv[0], strlen(argv[0]), &oid, &refname)) { - case 0: - die("No such ref: '%s'", argv[0]); - case 1: - break; /* good */ - default: - die("Ambiguous refname: '%s'", argv[0]); - } - commitname = (argc == 2) ? argv[1] : "HEAD"; if (get_oid(commitname, &oid)) die("Not a valid object name: '%s'", commitname); derived = lookup_commit_reference(the_repository, &oid); - fork_point = get_fork_point(refname, derived); + fork_point = get_fork_point(argv[0], derived); if (!fork_point) return 1; diff --git a/third_party/git/builtin/merge-recursive.c b/third_party/git/builtin/merge-recursive.c index 5b910e351e..a4bfd8fc51 100644 --- a/third_party/git/builtin/merge-recursive.c +++ b/third_party/git/builtin/merge-recursive.c @@ -1,3 +1,4 @@ +#include "cache.h" #include "builtin.h" #include "commit.h" #include "tag.h" @@ -63,6 +64,9 @@ 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 97b54caeb9..e72714a5a8 100644 --- a/third_party/git/builtin/merge-tree.c +++ b/third_party/git/builtin/merge-tree.c @@ -180,8 +180,9 @@ 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) { - char *path = xmallocz(traverse_path_len(info, n) + the_hash_algo->rawsz); - return make_traverse_path(path, info, n); + struct strbuf buf = STRBUF_INIT; + strbuf_make_traverse_path(&buf, info, n->path, n->pathlen); + return strbuf_detach(&buf, NULL); } 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 e2ccbc44e2..9d5359edc2 100644 --- a/third_party/git/builtin/merge.c +++ b/third_party/git/builtin/merge.c @@ -40,6 +40,7 @@ #include "branch.h" #include "commit-reach.h" #include "wt-status.h" +#include "commit-graph.h" #define DEFAULT_TWOHEAD (1<<0) #define DEFAULT_OCTOPUS (1<<1) @@ -62,6 +63,7 @@ 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; @@ -70,7 +72,6 @@ static const char **xopts; static size_t xopts_nr, xopts_alloc; static const char *branch; static char *branch_mergeoptions; -static int option_renormalize; static int verbosity; static int allow_rerere_auto; static int abort_current_merge; @@ -81,7 +82,8 @@ static int show_progress = -1; static int default_to_upstream = 1; static int signoff; static const char *sign_commit; -static int verify_msg = 1; +static int autostash; +static int no_verify; static struct strategy all_strategy[] = { { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL }, @@ -240,9 +242,9 @@ static int option_parse_n(const struct option *opt, } static struct option builtin_merge_options[] = { - { OPTION_CALLBACK, 'n', NULL, NULL, NULL, + OPT_CALLBACK_F('n', NULL, NULL, NULL, N_("do not show a diffstat at the end of the merge"), - PARSE_OPT_NOARG, option_parse_n }, + PARSE_OPT_NOARG, option_parse_n), OPT_BOOL(0, "stat", &show_diffstat, N_("show a diffstat at the end of the merge")), OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")), @@ -285,9 +287,10 @@ static struct option builtin_merge_options[] = { OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1), { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"), N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, + OPT_AUTOSTASH(&autostash), 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, "verify", &verify_msg, N_("verify commit-msg hook")), + OPT_BOOL(0, "no-verify", &no_verify, N_("bypass pre-merge-commit and commit-msg hooks")), OPT_END() }; @@ -446,7 +449,6 @@ static void finish(struct commit *head_commit, if (verbosity >= 0 && !merge_msg.len) printf(_("No merge message -- not updating HEAD\n")); else { - const char *argv_gc_auto[] = { "gc", "--auto", NULL }; update_ref(reflog_message.buf, "HEAD", new_head, head, 0, UPDATE_REFS_DIE_ON_ERR); /* @@ -454,7 +456,7 @@ static void finish(struct commit *head_commit, * user should see them. */ close_object_store(the_repository->objects); - run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); + run_auto_maintenance(verbosity < 0); } } if (new_head && show_diffstat) { @@ -474,6 +476,7 @@ static void finish(struct commit *head_commit, /* Run a post-merge hook */ run_hook_le(NULL, "post-merge", squash ? "1" : "0", NULL); + apply_autostash(git_path_merge_autostash(the_repository)); strbuf_release(&reflog_message); } @@ -497,7 +500,7 @@ static void merge_name(const char *remote, struct strbuf *msg) if (!remote_head) die(_("'%s' does not point to a commit"), remote); - if (dwim_ref(remote, strlen(remote), &branch_head, &found_ref) > 0) { + if (dwim_ref(remote, strlen(remote), &branch_head, &found_ref, 0) > 0) { if (starts_with(found_ref, "refs/heads/")) { strbuf_addf(msg, "%s\t\tbranch '%s' of .\n", oid_to_hex(&branch_head), remote); @@ -596,10 +599,12 @@ static void parse_branch_merge_options(char *bmo) static int git_merge_config(const char *k, const char *v, void *cb) { int status; + const char *str; - if (branch && starts_with(k, "branch.") && - starts_with(k + 7, branch) && - !strcmp(k + 7 + strlen(branch), ".mergeoptions")) { + if (branch && + skip_prefix(k, "branch.", &str) && + skip_prefix(str, branch, &str) && + !strcmp(str, ".mergeoptions")) { free(branch_mergeoptions); branch_mergeoptions = xstrdup(v); return 0; @@ -615,8 +620,6 @@ static int git_merge_config(const char *k, const char *v, void *cb) return git_config_string(&pull_octopus, k, v); else if (!strcmp(k, "commit.cleanup")) return git_config_string(&cleanup_arg, k, v); - else if (!strcmp(k, "merge.renormalize")) - option_renormalize = git_config_bool(k, v); else if (!strcmp(k, "merge.ff")) { int boolval = git_parse_maybe_bool(v); if (0 <= boolval) { @@ -631,6 +634,11 @@ 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; + } else if (!strcmp(k, "merge.autostash")) { + autostash = git_config_bool(k, v); + return 0; } status = fmt_merge_msg_config(k, v, cb); @@ -688,16 +696,13 @@ 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"; - hold_locked_index(&lock, LOCK_DIE_ON_ERROR); - refresh_cache(REFRESH_QUIET); - if (write_locked_index(&the_index, &lock, - COMMIT_LOCK | SKIP_IF_UNCHANGED)) + if (refresh_and_write_cache(REFRESH_QUIET, SKIP_IF_UNCHANGED, 0) < 0) 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; @@ -713,7 +718,6 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, if (!strcmp(strategy, "subtree")) o.subtree_shift = ""; - o.renormalize = option_renormalize; o.show_rename_progress = show_progress == -1 ? isatty(2) : show_progress; @@ -816,6 +820,18 @@ 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"); @@ -842,7 +858,7 @@ static void prepare_to_commit(struct commit_list *remoteheads) abort_commit(remoteheads, NULL); } - if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(), + if (!no_verify && run_commit_hook(0 < option_edit, get_index_file(), "commit-msg", git_path_merge_msg(the_repository), NULL)) abort_commit(remoteheads, NULL); @@ -860,12 +876,8 @@ 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; - hold_locked_index(&lock, LOCK_DIE_ON_ERROR); - refresh_cache(REFRESH_QUIET); - if (write_locked_index(&the_index, &lock, - COMMIT_LOCK | SKIP_IF_UNCHANGED)) + if (refresh_and_write_cache(REFRESH_QUIET, SKIP_IF_UNCHANGED, 0) < 0) return error(_("Unable to write index.")); write_tree_trivial(&result_tree); @@ -1273,6 +1285,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) if (abort_current_merge) { int nargc = 2; const char *nargv[] = {"reset", "--merge", NULL}; + struct strbuf stash_oid = STRBUF_INIT; if (orig_argc != 2) usage_msg_opt(_("--abort expects no arguments"), @@ -1281,8 +1294,17 @@ int cmd_merge(int argc, const char **argv, const char *prefix) if (!file_exists(git_path_merge_head(the_repository))) die(_("There is no merge to abort (MERGE_HEAD missing).")); + if (read_oneliner(&stash_oid, git_path_merge_autostash(the_repository), + READ_ONELINER_SKIP_IF_EMPTY)) + unlink(git_path_merge_autostash(the_repository)); + /* Invoke 'git reset --merge' */ ret = cmd_reset(nargc, nargv, prefix); + + if (stash_oid.len) + apply_autostash_oid(stash_oid.buf); + + strbuf_release(&stash_oid); goto done; } @@ -1326,7 +1348,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) else die(_("You have not concluded your merge (MERGE_HEAD exists).")); } - if (file_exists(git_path_cherry_pick_head(the_repository))) { + if (ref_exists("CHERRY_PICK_HEAD")) { if (advice_resolve_conflict) die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge.")); @@ -1392,7 +1414,8 @@ 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); + verify_merge_signature(remoteheads->item, verbosity, + check_trust_level); remote_head_oid = &remoteheads->item->object.oid; read_empty(remote_head_oid, 0); @@ -1415,7 +1438,8 @@ 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); + verify_merge_signature(p->item, verbosity, + check_trust_level); } } @@ -1503,6 +1527,10 @@ int cmd_merge(int argc, const char **argv, const char *prefix) goto done; } + if (autostash) + create_autostash(the_repository, + git_path_merge_autostash(the_repository), + "merge"); if (checkout_fast_forward(the_repository, &head_commit->object.oid, &commit->object.oid, @@ -1569,6 +1597,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix) if (fast_forward == FF_ONLY) die(_("Not possible to fast-forward, aborting.")); + if (autostash) + create_autostash(the_repository, + git_path_merge_autostash(the_repository), + "merge"); + /* We are going to make a new commit. */ git_committer_info(IDENT_STRICT); @@ -1619,7 +1652,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) } merge_was_ok = 1; } - cnt = evaluate_result(); + cnt = (use_strategies_nr > 1) ? evaluate_result() : 0; if (best_cnt <= 0 || cnt <= best_cnt) { best_strategy = use_strategies[i]->name; best_cnt = cnt; @@ -1663,9 +1696,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix) head_commit); } - if (squash) + if (squash) { finish(head_commit, remoteheads, NULL, NULL); - else + + git_test_write_commit_graph_or_die(); + } else write_merge_state(remoteheads); if (merge_was_ok) diff --git a/third_party/git/builtin/mktag.c b/third_party/git/builtin/mktag.c index 6fb7dc8578..4982d3a93e 100644 --- a/third_party/git/builtin/mktag.c +++ b/third_party/git/builtin/mktag.c @@ -29,8 +29,11 @@ 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(repl, buffer, size, expected_type); + if (type == type_from_string(expected_type)) { + ret = check_object_signature(the_repository, 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 b1ea1a6aa1..5bf88cd2a8 100644 --- a/third_party/git/builtin/multi-pack-index.c +++ b/third_party/git/builtin/multi-pack-index.c @@ -6,21 +6,25 @@ #include "trace2.h" static char const * const builtin_multi_pack_index_usage[] = { - N_("git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --batch-size=<size>)"), + N_("git multi-pack-index [<options>] (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(), @@ -28,12 +32,15 @@ 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, @@ -47,16 +54,17 @@ 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); + return midx_repack(the_repository, opts.object_dir, + (size_t)opts.batch_size, flags); 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); + return write_midx_file(opts.object_dir, flags); if (!strcmp(argv[0], "verify")) - return verify_midx_file(the_repository, opts.object_dir); + return verify_midx_file(the_repository, opts.object_dir, flags); if (!strcmp(argv[0], "expire")) - return expire_midx_packs(the_repository, opts.object_dir); + return expire_midx_packs(the_repository, opts.object_dir, flags); die(_("unrecognized subcommand: %s"), argv[0]); } diff --git a/third_party/git/builtin/mv.c b/third_party/git/builtin/mv.c index be15ba7044..7dac714af9 100644 --- a/third_party/git/builtin/mv.c +++ b/third_party/git/builtin/mv.c @@ -132,6 +132,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) struct stat st; struct string_list src_for_dst = STRING_LIST_INIT_NODUP; struct lock_file lock_file = LOCK_INIT; + struct cache_entry *ce; git_config(git_default_config, NULL); @@ -220,9 +221,11 @@ int cmd_mv(int argc, const char **argv, const char *prefix) } argc += last - first; } - } else if (cache_name_pos(src, length) < 0) + } else if (!(ce = cache_file_exists(src, length, ignore_case))) { bad = _("not under version control"); - else if (lstat(dst, &st) == 0 && + } else if (ce_stage(ce)) { + bad = _("conflicted"); + } else if (lstat(dst, &st) == 0 && (!ignore_case || strcasecmp(src, dst))) { bad = _("destination exists"); if (force) { diff --git a/third_party/git/builtin/name-rev.c b/third_party/git/builtin/name-rev.c index c785fe16ba..725dd04519 100644 --- a/third_party/git/builtin/name-rev.c +++ b/third_party/git/builtin/name-rev.c @@ -6,20 +6,25 @@ #include "tag.h" #include "refs.h" #include "parse-options.h" +#include "prio-queue.h" #include "sha1-lookup.h" #include "commit-slab.h" -#define CUTOFF_DATE_SLOP 86400 /* one day */ +/* + * One day. See the 'name a rev shortly after epoch' test in t6120 when + * changing this value + */ +#define CUTOFF_DATE_SLOP 86400 -typedef struct rev_name { - const char *tip_name; +struct rev_name { + 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; @@ -27,16 +32,16 @@ static struct commit_rev_name rev_names; /* How many generations are maximally preferred over _one_ merge traversal? */ #define MERGE_TRAVERSAL_WEIGHT 65535 -static struct rev_name *get_commit_rev_name(struct commit *commit) +static int is_valid_rev_name(const struct rev_name *name) { - struct rev_name **slot = commit_rev_name_peek(&rev_names, commit); - - return slot ? *slot : NULL; + return name && (name->generation || name->tip_name); } -static void set_commit_rev_name(struct commit *commit, struct rev_name *name) +static struct rev_name *get_commit_rev_name(const struct commit *commit) { - *commit_rev_name_at(&rev_names, commit) = name; + struct rev_name *name = commit_rev_name_peek(&rev_names, commit); + + return is_valid_rev_name(name) ? name : NULL; } static int is_better_name(struct rev_name *name, @@ -75,68 +80,135 @@ static int is_better_name(struct rev_name *name, return 0; } -static void name_rev(struct commit *commit, - const char *tip_name, timestamp_t taggerdate, - int generation, int distance, int from_tag, - int deref) +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 = get_commit_rev_name(commit); - struct commit_list *parents; - int parent_number = 1; - char *to_free = NULL; - - parse_commit(commit); + 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); + } - if (commit->date < cutoff) - return; + name->taggerdate = taggerdate; + name->generation = generation; + name->distance = distance; + name->from_tag = from_tag; - if (deref) { - tip_name = to_free = xstrfmt("%s^0", tip_name); + return name; +} - if (generation) - die("generation: %d, but deref?", generation); +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); +} - 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); +static void name_rev(struct commit *start_commit, + const char *tip_name, timestamp_t taggerdate, + 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; - } - 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); + 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); + + 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; + + for (parents = commit->parents; + parents; + parents = parents->next, parent_number++) { + struct commit *parent = parents->item; + struct rev_name *parent_name; + int generation, distance; + + parse_commit(parent); + if (parent->date < cutoff) + continue; + + if (parent_number > 1) { + generation = 0; + distance = name->distance + MERGE_TRAVERSAL_WEIGHT; + } else { + generation = name->generation + 1; + distance = name->distance + 1; + } + + 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++; + } } + + /* 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) @@ -157,10 +229,10 @@ static const char *name_ref_abbrev(const char *refname, int shorten_unambiguous) { if (shorten_unambiguous) refname = shorten_unambiguous_ref(refname, 0); - else if (starts_with(refname, "refs/heads/")) - refname = refname + 11; - else if (starts_with(refname, "refs/")) - refname = refname + 5; + else if (skip_prefix(refname, "refs/heads/", &refname)) + ; /* refname already advanced */ + else + skip_prefix(refname, "refs/", &refname); return refname; } @@ -175,6 +247,10 @@ 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; @@ -182,13 +258,18 @@ static struct tip_table { } tip_table; static void add_to_tip_table(const struct object_id *oid, const char *refname, - int shorten_unambiguous) + int shorten_unambiguous, struct commit *commit, + timestamp_t taggerdate, int from_tag, int deref) { 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; } @@ -199,12 +280,30 @@ 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/")) @@ -253,8 +352,6 @@ 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) @@ -264,18 +361,35 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo taggerdate = t->date; } if (o && o->type == OBJ_COMMIT) { - struct commit *commit = (struct commit *)o; - int from_tag = starts_with(path, "refs/tags/"); - + commit = (struct commit *)o; + from_tag = starts_with(path, "refs/tags/"); 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); + taggerdate = commit->date; } + + add_to_tip_table(oid, path, can_abbreviate_output, commit, taggerdate, + 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); + } + } +} + static const unsigned char *nth_tip_table_ent(size_t ix, void *table_) { struct tip_table_entry *table = table_; @@ -305,11 +419,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; - struct commit *c; + const struct commit *c; if (o->type != OBJ_COMMIT) return get_exact_ref_match(o); - c = (struct commit *) o; + c = (const struct commit *) o; n = get_commit_rev_name(c); if (!n) return NULL; @@ -317,11 +431,10 @@ 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_addf(buf, "%.*s~%d", len, n->tip_name, n->generation); + strbuf_addstr(buf, n->tip_name); + strbuf_strip_suffix(buf, "^0"); + strbuf_addf(buf, "~%d", n->generation); return buf->buf; } } @@ -408,7 +521,7 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix) int all = 0, transform_stdin = 0, allow_undefined = 1, always = 0, peel_tag = 0; struct name_ref_data data = { 0, 0, STRING_LIST_INIT_NODUP, STRING_LIST_INIT_NODUP }; struct option opts[] = { - OPT_BOOL(0, "name-only", &data.name_only, N_("print only names (no SHA-1)")), + OPT_BOOL(0, "name-only", &data.name_only, N_("print only ref-based names (no object names)")), OPT_BOOL(0, "tags", &data.tags_only, N_("only use tags to name the commits")), OPT_STRING_LIST(0, "refs", &data.ref_filters, N_("pattern"), N_("only use refs matching <pattern>")), @@ -481,9 +594,15 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix) add_object_array(object, *argv, &revs); } - if (cutoff) - cutoff = cutoff - CUTOFF_DATE_SLOP; + if (cutoff) { + /* check for undeflow */ + if (cutoff > TIME_MIN + CUTOFF_DATE_SLOP) + cutoff = cutoff - CUTOFF_DATE_SLOP; + else + cutoff = TIME_MIN; + } 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 02e97f55c5..2987c08a2e 100644 --- a/third_party/git/builtin/notes.c +++ b/third_party/git/builtin/notes.c @@ -406,18 +406,18 @@ static int add(int argc, const char **argv, const char *prefix) const struct object_id *note; struct note_data d = { 0, 0, NULL, STRBUF_INIT }; struct option options[] = { - { OPTION_CALLBACK, 'm', "message", &d, N_("message"), + OPT_CALLBACK_F('m', "message", &d, N_("message"), N_("note contents as a string"), PARSE_OPT_NONEG, - parse_msg_arg}, - { OPTION_CALLBACK, 'F', "file", &d, N_("file"), + parse_msg_arg), + OPT_CALLBACK_F('F', "file", &d, N_("file"), N_("note contents in a file"), PARSE_OPT_NONEG, - parse_file_arg}, - { OPTION_CALLBACK, 'c', "reedit-message", &d, N_("object"), + parse_file_arg), + OPT_CALLBACK_F('c', "reedit-message", &d, N_("object"), N_("reuse and edit specified note object"), PARSE_OPT_NONEG, - parse_reedit_arg}, - { OPTION_CALLBACK, 'C', "reuse-message", &d, N_("object"), + parse_reedit_arg), + OPT_CALLBACK_F('C', "reuse-message", &d, N_("object"), N_("reuse specified note object"), PARSE_OPT_NONEG, - parse_reuse_arg}, + parse_reuse_arg), OPT_BOOL(0, "allow-empty", &allow_empty, N_("allow storing empty note")), OPT__FORCE(&force, N_("replace existing notes"), PARSE_OPT_NOCOMPLETE), @@ -513,7 +513,7 @@ static int copy(int argc, const char **argv, const char *prefix) } } - if (argc < 2) { + if (argc < 1) { error(_("too few parameters")); usage_with_options(git_notes_copy_usage, options); } @@ -572,18 +572,18 @@ static int append_edit(int argc, const char **argv, const char *prefix) const char * const *usage; struct note_data d = { 0, 0, NULL, STRBUF_INIT }; struct option options[] = { - { OPTION_CALLBACK, 'm', "message", &d, N_("message"), + OPT_CALLBACK_F('m', "message", &d, N_("message"), N_("note contents as a string"), PARSE_OPT_NONEG, - parse_msg_arg}, - { OPTION_CALLBACK, 'F', "file", &d, N_("file"), + parse_msg_arg), + OPT_CALLBACK_F('F', "file", &d, N_("file"), N_("note contents in a file"), PARSE_OPT_NONEG, - parse_file_arg}, - { OPTION_CALLBACK, 'c', "reedit-message", &d, N_("object"), + parse_file_arg), + OPT_CALLBACK_F('c', "reedit-message", &d, N_("object"), N_("reuse and edit specified note object"), PARSE_OPT_NONEG, - parse_reedit_arg}, - { OPTION_CALLBACK, 'C', "reuse-message", &d, N_("object"), + parse_reedit_arg), + OPT_CALLBACK_F('C', "reuse-message", &d, N_("object"), N_("reuse specified note object"), PARSE_OPT_NONEG, - parse_reuse_arg}, + parse_reuse_arg), OPT_BOOL(0, "allow-empty", &allow_empty, N_("allow storing empty note")), OPT_END() @@ -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_insert(&d.buf, 0, "\n", 1); + strbuf_insertstr(&d.buf, 0, "\n"); 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_insert(&msg, 0, "notes: ", 7); + strbuf_insertstr(&msg, 0, "notes: "); 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 76ce906946..5617c01b5a 100644 --- a/third_party/git/builtin/pack-objects.c +++ b/third_party/git/builtin/pack-objects.c @@ -26,14 +26,16 @@ #include "pack-bitmap.h" #include "delta-islands.h" #include "reachable.h" -#include "sha1-array.h" -#include "argv-array.h" +#include "oid-array.h" +#include "strvec.h" #include "list.h" #include "packfile.h" #include "object-store.h" #include "dir.h" #include "midx.h" #include "trace2.h" +#include "shallow.h" +#include "promisor-remote.h" #define IN_PACK(obj) oe_in_pack(&to_pack, obj) #define SIZE(obj) oe_size(&to_pack, obj) @@ -92,10 +94,11 @@ static struct progress *progress_state; static struct packed_git *reuse_packfile; static uint32_t reuse_packfile_objects; -static off_t reuse_packfile_offset; +static struct bitmap *reuse_packfile_bitmap; 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, @@ -115,6 +118,8 @@ static unsigned long window_memory_limit = 0; static struct list_objects_filter_options filter_options; +static struct string_list uri_protocols = STRING_LIST_INIT_NODUP; + enum missing_action { MA_ERROR = 0, /* fail if any missing objects are encountered */ MA_ALLOW_ANY, /* silently allow ALL missing objects */ @@ -123,6 +128,15 @@ enum missing_action { static enum missing_action arg_missing_action; static show_object_fn fn_show_object; +struct configured_exclusion { + struct oidmap_entry e; + char *pack_hash_hex; + char *uri; +}; +static struct oidmap configured_exclusions; + +static struct oidset excluded_by_config; + /* * stats */ @@ -163,7 +177,7 @@ static void *get_delta(struct object_entry *entry) delta_buf = diff_delta(base_buf, base_size, buf, size, &delta_size, 0); /* - * We succesfully computed this delta once but dropped it for + * We successfully computed this delta once but dropped it for * memory reasons. Something is very wrong if this time we * recompute and create a different delta. */ @@ -303,7 +317,8 @@ 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(&entry->idx.oid, &type, &size, NULL)) != NULL) + (st = open_istream(the_repository, &entry->idx.oid, &type, + &size, NULL)) != NULL) buf = NULL; else { buf = read_object_file(&entry->idx.oid, &type, &size); @@ -610,12 +625,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, NULL); + struct object_entry *entry = packlist_find(&to_pack, oid); if (entry) entry->tagged = 1; if (!peel_ref(path, &peeled)) { - entry = packlist_find(&to_pack, &peeled, NULL); + entry = packlist_find(&to_pack, &peeled); if (entry) entry->tagged = 1; } @@ -784,57 +799,205 @@ static struct object_entry **compute_write_order(void) return wo; } -static off_t write_reused_pack(struct hashfile *f) + +/* + * 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) { - unsigned char buffer[8192]; - off_t to_write, total; - int fd; + if (reused_chunks_nr && reused_chunks[reused_chunks_nr-1].difference == offset) + return; - if (!is_pack_valid(reuse_packfile)) - die(_("packfile is invalid: %s"), reuse_packfile->pack_name); + 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++; +} - fd = git_open(reuse_packfile->pack_name); - if (fd < 0) - die_errno(_("unable to open packfile for reuse: %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; + } + + /* + * 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; - if (read_pack > to_write) - read_pack = to_write; + unsigned char header[MAX_PACK_OBJECT_HEADER]; + unsigned len; - hashwrite(f, buffer, read_pack); - to_write -= read_pack; + 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, the_hash_algo->rawsz); + 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); + + 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); - /* - * 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; - close(fd); - written = reuse_packfile_objects; - display_progress(progress_state, written); - return reuse_packfile_offset - sizeof(struct pack_header); + 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); +} + +static void write_excluded_by_configs(void) +{ + struct oidset_iter iter; + const struct object_id *oid; + + oidset_iter_init(&excluded_by_config, &iter); + while ((oid = oidset_iter_next(&iter))) { + struct configured_exclusion *ex = + oidmap_get(&configured_exclusions, oid); + + if (!ex) + BUG("configured exclusion wasn't configured"); + write_in_full(1, ex->pack_hash_hex, strlen(ex->pack_hash_hex)); + write_in_full(1, " ", 1); + write_in_full(1, ex->uri, strlen(ex->uri)); + write_in_full(1, "\n", 1); + } } static const char no_split_warning[] = N_( @@ -867,11 +1030,9 @@ static void write_pack_file(void) offset = write_pack_header(f, nr_remaining); if (reuse_packfile) { - off_t packfile_size; assert(pack_to_stdout); - - packfile_size = write_reused_pack(f); - offset += packfile_size; + write_reused_pack(f); + offset = hashfile_total(f); } nr_written = 0; @@ -996,12 +1157,15 @@ 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, - uint32_t *index_pos) + int exclude) { struct object_entry *entry; - entry = packlist_find(&to_pack, oid, index_pos); + if (reuse_packfile_bitmap && + bitmap_walk_contains(bitmap_git, reuse_packfile_bitmap, oid)) + return 1; + + entry = packlist_find(&to_pack, oid); if (!entry) return 0; @@ -1133,6 +1297,25 @@ static int want_object_in_pack(const struct object_id *oid, } } + if (uri_protocols.nr) { + struct configured_exclusion *ex = + oidmap_get(&configured_exclusions, oid); + int i; + const char *p; + + if (ex) { + for (i = 0; i < uri_protocols.nr; i++) { + if (skip_prefix(ex->uri, + uri_protocols.items[i].string, + &p) && + *p == ':') { + oidset_insert(&excluded_by_config, oid); + return 0; + } + } + } + } + return 1; } @@ -1141,13 +1324,12 @@ 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->hash, index_pos); + entry = packlist_alloc(&to_pack, oid); entry->hash = hash; oe_set_type(entry, type); if (exclude) @@ -1171,11 +1353,10 @@ 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, &index_pos)) + if (have_duplicate_entry(oid, exclude)) return 0; if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset)) { @@ -1190,7 +1371,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), - index_pos, found_pack, found_offset); + found_pack, found_offset); return 1; } @@ -1199,17 +1380,15 @@ 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, &index_pos)) + if (have_duplicate_entry(oid, 0)) return 0; if (!want_object_in_pack(oid, 0, &pack, &offset)) return 0; - create_object_entry(oid, type, name_hash, 0, 0, index_pos, pack, offset); + create_object_entry(oid, type, name_hash, 0, 0, pack, offset); return 1; } @@ -1491,23 +1670,17 @@ static void cleanup_preferred_base(void) * deltify other objects against, in order to avoid * circular deltas. */ -static int can_reuse_delta(const unsigned char *base_sha1, +static int can_reuse_delta(const struct object_id *base_oid, 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, NULL); + base = packlist_find(&to_pack, base_oid); if (base) { if (!in_same_island(&delta->idx.oid, &base->idx.oid)) return 0; @@ -1520,9 +1693,9 @@ static int can_reuse_delta(const unsigned char *base_sha1, * 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; @@ -1532,14 +1705,36 @@ static int can_reuse_delta(const unsigned char *base_sha1, return 0; } -static void check_object(struct object_entry *entry) +static void prefetch_to_pack(uint32_t object_index_start) { + struct oid_array to_fetch = OID_ARRAY_INIT; + uint32_t i; + + for (i = object_index_start; i < to_pack.nr_objects; i++) { + struct object_entry *entry = to_pack.objects + i; + + if (!oid_object_info_extended(the_repository, + &entry->idx.oid, + NULL, + OBJECT_INFO_FOR_PREFETCH)) + continue; + oid_array_append(&to_fetch, &entry->idx.oid); + } + promisor_remote_get_direct(the_repository, + to_fetch.oid, to_fetch.nr); + oid_array_clear(&to_fetch); +} + +static void check_object(struct object_entry *entry, uint32_t object_index) { unsigned long canonical_size; + enum object_type type; + struct object_info oi = {.typep = &type, .sizep = &canonical_size}; if (IN_PACK(entry)) { struct packed_git *p = IN_PACK(entry); struct pack_window *w_curs = NULL; - const unsigned char *base_ref = NULL; + int have_base = 0; + struct object_id base_ref; struct object_entry *base_entry; unsigned long used, used_0; unsigned long avail; @@ -1580,9 +1775,13 @@ static void check_object(struct object_entry *entry) unuse_pack(&w_curs); return; case OBJ_REF_DELTA: - if (reuse_delta && !entry->preferred_base) - base_ref = use_pack(p, &w_curs, - entry->in_pack_offset + used, NULL); + if (reuse_delta && !entry->preferred_base) { + oidread(&base_ref, + use_pack(p, &w_curs, + entry->in_pack_offset + used, + NULL)); + have_base = 1; + } entry->in_pack_header_size = used + the_hash_algo->rawsz; break; case OBJ_OFS_DELTA: @@ -1612,13 +1811,15 @@ static void check_object(struct object_entry *entry) revidx = find_pack_revindex(p, ofs); if (!revidx) goto give_up; - base_ref = nth_packed_object_sha1(p, revidx->nr); + if (!nth_packed_object_id(&base_ref, p, revidx->nr)) + have_base = 1; } entry->in_pack_header_size = used + used_0; break; } - if (can_reuse_delta(base_ref, entry, &base_entry)) { + if (have_base && + 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); @@ -1628,7 +1829,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); @@ -1661,8 +1862,18 @@ static void check_object(struct object_entry *entry) unuse_pack(&w_curs); } - oe_set_type(entry, - oid_object_info(the_repository, &entry->idx.oid, &canonical_size)); + if (oid_object_info_extended(the_repository, &entry->idx.oid, &oi, + OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_LOOKUP_REPLACE) < 0) { + if (has_promisor_remote()) { + prefetch_to_pack(object_index); + if (oid_object_info_extended(the_repository, &entry->idx.oid, &oi, + OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_LOOKUP_REPLACE) < 0) + type = -1; + } else { + type = -1; + } + } + oe_set_type(entry, type); if (entry->type_valid) { SET_SIZE(entry, canonical_size); } else { @@ -1882,7 +2093,7 @@ static void get_object_details(void) for (i = 0; i < to_pack.nr_objects; i++) { struct object_entry *entry = sorted_by_offset[i]; - check_object(entry); + check_object(entry, i); if (entry->type_valid && oe_size_greater_than(&to_pack, entry, big_file_threshold)) entry->no_try_delta = 1; @@ -2342,15 +2553,6 @@ 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. @@ -2391,12 +2593,10 @@ 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); @@ -2568,6 +2768,13 @@ 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; @@ -2579,7 +2786,7 @@ static void add_tag_chain(const struct object_id *oid) * it was included via bitmaps, we would not have parsed it * previously). */ - if (packlist_find(&to_pack, oid, NULL)) + if (obj_is_packed(oid)) return; tag = lookup_tag(the_repository, oid); @@ -2603,7 +2810,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? */ - packlist_find(&to_pack, &peeled, NULL)) /* object packed? */ + obj_is_packed(&peeled)) /* object packed? */ add_tag_chain(oid); return 0; } @@ -2671,6 +2878,7 @@ 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); @@ -2715,8 +2923,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.usesparse")) { - sparse = git_config_bool(k, v); + if (!strcmp(k, "pack.allowpackreuse")) { + allow_pack_reuse = git_config_bool(k, v); return 0; } if (!strcmp(k, "pack.threads")) { @@ -2737,6 +2945,29 @@ static int git_pack_config(const char *k, const char *v, void *cb) pack_idx_opts.version); return 0; } + if (!strcmp(k, "uploadpack.blobpackfileuri")) { + struct configured_exclusion *ex = xmalloc(sizeof(*ex)); + const char *oid_end, *pack_end; + /* + * Stores the pack hash. This is not a true object ID, but is + * of the same form. + */ + struct object_id pack_hash; + + if (parse_oid_hex(v, &ex->e.oid, &oid_end) || + *oid_end != ' ' || + parse_oid_hex(oid_end + 1, &pack_hash, &pack_end) || + *pack_end != ' ') + die(_("value of uploadpack.blobpackfileuri must be " + "of the form '<object-hash> <pack-hash> <uri>' (got '%s')"), v); + if (oidmap_get(&configured_exclusions, &ex->e.oid)) + die(_("object already configured in another " + "uploadpack.blobpackfileuri (got '%s')"), v); + ex->pack_hash_hex = xcalloc(1, pack_end - oid_end); + memcpy(ex->pack_hash_hex, oid_end + 1, pack_end - oid_end - 1); + ex->uri = xstrdup(pack_end + 1); + oidmap_put(&configured_exclusions, ex); + } return git_default_config(k, v, cb); } @@ -2803,7 +3034,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, NULL); + ent = packlist_find(&to_pack, &obj->oid); if (ent && depth > oe_tree_depth(&to_pack, ent)) oe_set_tree_depth(&to_pack, ent, depth); } @@ -2817,7 +3048,7 @@ static void show_object__ma_allow_any(struct object *obj, const char *name, void * Quietly ignore ALL missing objects. This avoids problems with * staging them now and getting an odd error later. */ - if (!has_object_file(&obj->oid)) + if (!has_object(the_repository, &obj->oid, 0)) return; show_object(obj, name, data); @@ -2831,7 +3062,7 @@ static void show_object__ma_allow_promisor(struct object *obj, const char *name, * Quietly ignore EXPECTED missing objects. This avoids problems with * staging them now and getting an odd error later. */ - if (!has_object_file(&obj->oid) && is_promisor_object(&obj->oid)) + if (!has_object(the_repository, &obj->oid, 0) && is_promisor_object(&obj->oid)) return; show_object(obj, name, data); @@ -2929,7 +3160,7 @@ static void add_objects_in_unpacked_packs(void) in_pack.alloc); for (i = 0; i < p->num_objects; i++) { - nth_packed_object_oid(&oid, p, i); + nth_packed_object_id(&oid, p, i); o = lookup_unknown_object(&oid); if (!(o->flags & OBJECT_ADDED)) mark_in_pack_object(o, p, &in_pack); @@ -3033,8 +3264,8 @@ static void loosen_unused_packed_objects(void) die(_("cannot open pack index")); for (i = 0; i < p->num_objects; i++) { - nth_packed_object_oid(&oid, p, i); - if (!packlist_find(&to_pack, &oid, NULL) && + nth_packed_object_id(&oid, p, i); + if (!packlist_find(&to_pack, &oid) && !has_sha1_pack_kept_or_nonlocal(&oid) && !loosened_object_can_be_discarded(&oid, p->mtime)) if (force_object_loose(&oid, p->mtime)) @@ -3050,8 +3281,8 @@ static void loosen_unused_packed_objects(void) */ static int pack_options_allow_reuse(void) { - return pack_to_stdout && - allow_ofs_delta && + return allow_pack_reuse && + pack_to_stdout && !ignore_packed_keep_on_disk && !ignore_packed_keep_in_core && (!local || !have_non_local_packs) && @@ -3060,7 +3291,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))) + if (!(bitmap_git = prepare_bitmap_walk(revs, &filter_options))) return -1; if (pack_options_allow_reuse() && @@ -3068,13 +3299,14 @@ static int get_object_list_from_bitmap(struct rev_info *revs) bitmap_git, &reuse_packfile, &reuse_packfile_objects, - &reuse_packfile_offset)) { + &reuse_packfile_bitmap)) { assert(reuse_packfile_objects); nr_result += reuse_packfile_objects; display_progress(progress_state, nr_result); } - traverse_bitmap_commit_list(bitmap_git, &add_object_entry_from_bitmap); + traverse_bitmap_commit_list(bitmap_git, revs, + &add_object_entry_from_bitmap); return 0; } @@ -3125,7 +3357,7 @@ static void get_object_list(int ac, const char **av) if (starts_with(line, "--shallow ")) { struct object_id oid; if (get_oid_hex(line + 10, &oid)) - die("not an SHA-1 '%s'", line + 10); + die("not an object name '%s'", line + 10); register_shallow(the_repository, &oid); use_bitmap_index = 0; continue; @@ -3239,7 +3471,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) int use_internal_rev_list = 0; int shallow = 0; int all_progress_implied = 0; - struct argv_array rp = ARGV_ARRAY_INIT; + struct strvec rp = STRVEC_INIT; int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0; int rev_list_index = 0; struct string_list keep_pack_list = STRING_LIST_INIT_NODUP; @@ -3253,9 +3485,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "all-progress-implied", &all_progress_implied, N_("similar to --all-progress when progress meter is shown")), - { OPTION_CALLBACK, 0, "index-version", NULL, N_("<version>[,<offset>]"), + OPT_CALLBACK_F(0, "index-version", NULL, N_("<version>[,<offset>]"), N_("write the pack index file in the specified idx format version"), - PARSE_OPT_NONEG, option_parse_index_version }, + PARSE_OPT_NONEG, option_parse_index_version), OPT_MAGNITUDE(0, "max-pack-size", &pack_size_limit, N_("maximum size of each output pack file")), OPT_BOOL(0, "local", &local, @@ -3300,9 +3532,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) N_("keep unreachable objects")), OPT_BOOL(0, "pack-loose-unreachable", &pack_loose_unreachable, N_("pack loose unreachable objects")), - { OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"), + OPT_CALLBACK_F(0, "unpack-unreachable", NULL, N_("time"), N_("unpack unreachable objects newer than <time>"), - PARSE_OPT_OPTARG, option_parse_unpack_unreachable }, + PARSE_OPT_OPTARG, option_parse_unpack_unreachable), OPT_BOOL(0, "sparse", &sparse, N_("use the sparse reachability algorithm")), OPT_BOOL(0, "thin", &thin, @@ -3327,13 +3559,16 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) N_("write a bitmap index if possible"), WRITE_BITMAP_QUIET, PARSE_OPT_HIDDEN), OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options), - { OPTION_CALLBACK, 0, "missing", NULL, N_("action"), + OPT_CALLBACK_F(0, "missing", NULL, N_("action"), N_("handling for missing objects"), PARSE_OPT_NONEG, - option_parse_missing_action }, + option_parse_missing_action), OPT_BOOL(0, "exclude-promisor-objects", &exclude_promisor_objects, N_("do not pack objects in promisor packfiles")), OPT_BOOL(0, "delta-islands", &use_delta_islands, N_("respect islands during delta compression")), + OPT_STRING_LIST(0, "uri-protocol", &uri_protocols, + N_("protocol"), + N_("exclude any configured uploadpack.blobpackfileuri with this protocol")), OPT_END(), }; @@ -3342,7 +3577,11 @@ 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); + sparse = git_env_bool("GIT_TEST_PACK_SPARSE", -1); + prepare_repo_settings(the_repository); + if (sparse < 0) + sparse = the_repository->settings.pack_use_sparse; + reset_pack_idx_option(&pack_idx_opts); git_config(git_pack_config, NULL); @@ -3368,36 +3607,36 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) cache_max_small_delta_size = (1U << OE_Z_DELTA_BITS) - 1; } - argv_array_push(&rp, "pack-objects"); + strvec_push(&rp, "pack-objects"); if (thin) { use_internal_rev_list = 1; - argv_array_push(&rp, shallow + strvec_push(&rp, shallow ? "--objects-edge-aggressive" : "--objects-edge"); } else - argv_array_push(&rp, "--objects"); + strvec_push(&rp, "--objects"); if (rev_list_all) { use_internal_rev_list = 1; - argv_array_push(&rp, "--all"); + strvec_push(&rp, "--all"); } if (rev_list_reflog) { use_internal_rev_list = 1; - argv_array_push(&rp, "--reflog"); + strvec_push(&rp, "--reflog"); } if (rev_list_index) { use_internal_rev_list = 1; - argv_array_push(&rp, "--indexed-objects"); + strvec_push(&rp, "--indexed-objects"); } if (rev_list_unpacked) { use_internal_rev_list = 1; - argv_array_push(&rp, "--unpacked"); + strvec_push(&rp, "--unpacked"); } if (exclude_promisor_objects) { use_internal_rev_list = 1; fetch_if_missing = 0; - argv_array_push(&rp, "--exclude-promisor-objects"); + strvec_push(&rp, "--exclude-promisor-objects"); } if (unpack_unreachable || keep_unreachable || pack_loose_unreachable) use_internal_rev_list = 1; @@ -3434,7 +3673,6 @@ 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; } /* @@ -3460,7 +3698,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) write_bitmap_index = 0; if (use_delta_islands) - argv_array_push(&rp, "--topo-order"); + strvec_push(&rp, "--topo-order"); if (progress && all_progress_implied) progress = 2; @@ -3498,8 +3736,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) if (!use_internal_rev_list) read_object_list_from_stdin(); else { - get_object_list(rp.argc, rp.argv); - argv_array_clear(&rp); + get_object_list(rp.nr, rp.v); + strvec_clear(&rp); } cleanup_preferred_base(); if (include_tag && nr_result) @@ -3519,13 +3757,16 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) } trace2_region_enter("pack-objects", "write-pack-file", the_repository); + write_excluded_by_configs(); write_pack_file(); trace2_region_leave("pack-objects", "write-pack-file", the_repository); if (progress) fprintf_ln(stderr, _("Total %"PRIu32" (delta %"PRIu32")," - " reused %"PRIu32" (delta %"PRIu32")"), - written, written_delta, reused, reused_delta); + " reused %"PRIu32" (delta %"PRIu32")," + " pack-reused %"PRIu32), + written, written_delta, reused, reused_delta, + reuse_packfile_objects); return 0; } diff --git a/third_party/git/builtin/patch-id.c b/third_party/git/builtin/patch-id.c index bd28b80b2d..822ffff51f 100644 --- a/third_party/git/builtin/patch-id.c +++ b/third_party/git/builtin/patch-id.c @@ -1,16 +1,12 @@ +#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) { - 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); + if (patchlen) + printf("%s %s\n", oid_to_hex(result), oid_to_hex(id)); } static int remove_space(char *line) @@ -60,9 +56,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_SHA_CTX ctx; + git_hash_ctx ctx; - git_SHA1_Init(&ctx); + the_hash_algo->init_fn(&ctx); oidclr(result); while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) { @@ -122,7 +118,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; - git_SHA1_Update(&ctx, line, len); + the_hash_algo->update_fn(&ctx, line, len); } if (!found_next) diff --git a/third_party/git/builtin/prune-packed.c b/third_party/git/builtin/prune-packed.c index 48c5e78e33..b7b9281a8c 100644 --- a/third_party/git/builtin/prune-packed.c +++ b/third_party/git/builtin/prune-packed.c @@ -1,54 +1,12 @@ #include "builtin.h" -#include "cache.h" -#include "progress.h" #include "parse-options.h" -#include "packfile.h" -#include "object-store.h" +#include "prune-packed.h" static const char * const prune_packed_usage[] = { N_("git prune-packed [-n | --dry-run] [-q | --quiet]"), NULL }; -static struct progress *progress; - -static int prune_subdir(unsigned int nr, const char *path, void *data) -{ - int *opts = data; - display_progress(progress, nr + 1); - if (!(*opts & PRUNE_PACKED_DRY_RUN)) - rmdir(path); - return 0; -} - -static int prune_object(const struct object_id *oid, const char *path, - void *data) -{ - int *opts = data; - - if (!has_object_pack(oid)) - return 0; - - if (*opts & PRUNE_PACKED_DRY_RUN) - printf("rm -f %s\n", path); - else - unlink_or_warn(path); - return 0; -} - -void prune_packed_objects(int opts) -{ - if (opts & PRUNE_PACKED_VERBOSE) - progress = start_delayed_progress(_("Removing duplicate objects"), 256); - - for_each_loose_file_in_objdir(get_object_directory(), - prune_object, NULL, prune_subdir, &opts); - - /* Ensure we show 100% before finishing progress */ - display_progress(progress, 256); - stop_progress(&progress); -} - int cmd_prune_packed(int argc, const char **argv, const char *prefix) { int opts = isatty(2) ? PRUNE_PACKED_VERBOSE : 0; diff --git a/third_party/git/builtin/prune.c b/third_party/git/builtin/prune.c index 2b76872ad2..02c6ab7cba 100644 --- a/third_party/git/builtin/prune.c +++ b/third_party/git/builtin/prune.c @@ -6,7 +6,9 @@ #include "reachable.h" #include "parse-options.h" #include "progress.h" +#include "prune-packed.h" #include "object-store.h" +#include "shallow.h" static const char * const prune_usage[] = { N_("git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"), diff --git a/third_party/git/builtin/pull.c b/third_party/git/builtin/pull.c index f1eaf6e6ed..425950f469 100644 --- a/third_party/git/builtin/pull.c +++ b/third_party/git/builtin/pull.c @@ -12,9 +12,10 @@ #include "parse-options.h" #include "exec-cmd.h" #include "run-command.h" -#include "sha1-array.h" +#include "oid-array.h" #include "remote.h" #include "dir.h" +#include "rebase.h" #include "refs.h" #include "refspec.h" #include "revision.h" @@ -26,15 +27,6 @@ #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 @@ -45,22 +37,9 @@ enum rebase_type { static enum rebase_type parse_config_rebase(const char *key, const char *value, int fatal) { - 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. - */ + enum rebase_type v = rebase_parse_value(value); + if (v != REBASE_INVALID) + return v; if (fatal) die(_("Invalid value for %s: %s"), key, value); @@ -107,8 +86,9 @@ static char *opt_ff; static char *opt_verify_signatures; static int opt_autostash = -1; static int config_autostash; -static struct argv_array opt_strategies = ARGV_ARRAY_INIT; -static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT; +static int check_trust_level = 1; +static struct strvec opt_strategies = STRVEC_INIT; +static struct strvec opt_strategy_opts = STRVEC_INIT; static char *opt_gpg_sign; static int opt_allow_unrelated_histories; @@ -129,6 +109,8 @@ 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 strvec opt_fetch = STRVEC_INIT; static struct option pull_options[] = { /* Shared options */ @@ -136,17 +118,17 @@ static struct option pull_options[] = { OPT_PASSTHRU(0, "progress", &opt_progress, NULL, N_("force progress reporting"), PARSE_OPT_NOARG), - { OPTION_CALLBACK, 0, "recurse-submodules", + OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules, N_("on-demand"), N_("control for recursive fetching of submodules"), - PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules }, + PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules), /* Options passed to git-merge or git-rebase */ OPT_GROUP(N_("Options related to merging")), - { OPTION_CALLBACK, 'r', "rebase", &opt_rebase, + OPT_CALLBACK_F('r', "rebase", &opt_rebase, "(false|true|merges|preserve|interactive)", N_("incorporate changes by rebasing rather than merging"), - PARSE_OPT_OPTARG, parse_opt_rebase }, + PARSE_OPT_OPTARG, parse_opt_rebase), OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL, N_("do not show a diffstat at the end of the merge"), PARSE_OPT_NOARG | PARSE_OPT_NONEG), @@ -182,7 +164,7 @@ static struct option pull_options[] = { N_("verify that the named commit has a valid GPG signature"), PARSE_OPT_NOARG), OPT_BOOL(0, "autostash", &opt_autostash, - N_("automatically stash/stash pop before and after rebase")), + N_("automatically stash/stash pop before and after")), OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies, N_("strategy"), N_("merge strategy to use"), 0), @@ -226,6 +208,15 @@ static struct option pull_options[] = { OPT_PASSTHRU(0, "depth", &opt_depth, N_("depth"), N_("deepen history of shallow clone"), 0), + OPT_PASSTHRU_ARGV(0, "shallow-since", &opt_fetch, N_("time"), + N_("deepen history of shallow repository based on time"), + 0), + OPT_PASSTHRU_ARGV(0, "shallow-exclude", &opt_fetch, N_("revision"), + N_("deepen history of shallow clone, excluding rev"), + 0), + OPT_PASSTHRU_ARGV(0, "deepen", &opt_fetch, N_("n"), + N_("deepen history of shallow clone"), + 0), OPT_PASSTHRU(0, "unshallow", &opt_unshallow, NULL, N_("convert to a complete repository"), PARSE_OPT_NONEG | PARSE_OPT_NOARG), @@ -235,14 +226,24 @@ static struct option pull_options[] = { OPT_PASSTHRU(0, "refmap", &opt_refmap, N_("refmap"), N_("specify fetch refmap"), PARSE_OPT_NONEG), + OPT_PASSTHRU_ARGV('o', "server-option", &opt_fetch, + N_("server-specific"), + N_("option to transmit"), + 0), OPT_PASSTHRU('4', "ipv4", &opt_ipv4, NULL, N_("use IPv4 addresses only"), PARSE_OPT_NOARG), OPT_PASSTHRU('6', "ipv6", &opt_ipv6, NULL, N_("use IPv6 addresses only"), PARSE_OPT_NOARG), + OPT_PASSTHRU_ARGV(0, "negotiation-tip", &opt_fetch, N_("revision"), + N_("report that we have only objects reachable from this object"), + 0), 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() }; @@ -250,25 +251,25 @@ static struct option pull_options[] = { /** * Pushes "-q" or "-v" switches into arr to match the opt_verbosity level. */ -static void argv_push_verbosity(struct argv_array *arr) +static void argv_push_verbosity(struct strvec *arr) { int verbosity; for (verbosity = opt_verbosity; verbosity > 0; verbosity--) - argv_array_push(arr, "-v"); + strvec_push(arr, "-v"); for (verbosity = opt_verbosity; verbosity < 0; verbosity++) - argv_array_push(arr, "-q"); + strvec_push(arr, "-q"); } /** * Pushes "-f" switches into arr to match the opt_force level. */ -static void argv_push_force(struct argv_array *arr) +static void argv_push_force(struct strvec *arr) { int force = opt_force; while (force-- > 0) - argv_array_push(arr, "-f"); + strvec_push(arr, "-f"); } /** @@ -343,6 +344,21 @@ static enum rebase_type config_get_rebase(void) if (!git_config_get_value("pull.rebase", &value)) return parse_config_rebase("pull.rebase", value, 1); + if (opt_verbosity >= 0 && !opt_ff) { + warning(_("Pulling without specifying how to reconcile divergent branches is\n" + "discouraged. You can squelch this message by running one of the following\n" + "commands sometime before your next pull:\n" + "\n" + " git config pull.rebase false # merge (the default strategy)\n" + " git config pull.rebase true # rebase\n" + " git config pull.ff only # fast-forward only\n" + "\n" + "You can replace \"git config\" with \"git config --global\" to set a default\n" + "preference for all repositories. You can also pass --rebase, --no-rebase,\n" + "or --ff-only on the command line to override the configured default per\n" + "invocation.\n")); + } + return REBASE_FALSE; } @@ -351,6 +367,8 @@ 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; @@ -358,7 +376,14 @@ 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); } @@ -498,72 +523,75 @@ static void parse_repo_refspecs(int argc, const char **argv, const char **repo, */ static int run_fetch(const char *repo, const char **refspecs) { - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; int ret; - argv_array_pushl(&args, "fetch", "--update-head-ok", NULL); + strvec_pushl(&args, "fetch", "--update-head-ok", NULL); /* Shared options */ argv_push_verbosity(&args); if (opt_progress) - argv_array_push(&args, opt_progress); + strvec_push(&args, opt_progress); /* Options passed to git-fetch */ if (opt_all) - argv_array_push(&args, opt_all); + strvec_push(&args, opt_all); if (opt_append) - argv_array_push(&args, opt_append); + strvec_push(&args, opt_append); if (opt_upload_pack) - argv_array_push(&args, opt_upload_pack); + strvec_push(&args, opt_upload_pack); argv_push_force(&args); if (opt_tags) - argv_array_push(&args, opt_tags); + strvec_push(&args, opt_tags); if (opt_prune) - argv_array_push(&args, opt_prune); + strvec_push(&args, opt_prune); if (recurse_submodules != RECURSE_SUBMODULES_DEFAULT) switch (recurse_submodules) { case RECURSE_SUBMODULES_ON: - argv_array_push(&args, "--recurse-submodules=on"); + strvec_push(&args, "--recurse-submodules=on"); break; case RECURSE_SUBMODULES_OFF: - argv_array_push(&args, "--recurse-submodules=no"); + strvec_push(&args, "--recurse-submodules=no"); break; case RECURSE_SUBMODULES_ON_DEMAND: - argv_array_push(&args, "--recurse-submodules=on-demand"); + strvec_push(&args, "--recurse-submodules=on-demand"); break; default: BUG("submodule recursion option not understood"); } if (max_children) - argv_array_push(&args, max_children); + strvec_push(&args, max_children); if (opt_dry_run) - argv_array_push(&args, "--dry-run"); + strvec_push(&args, "--dry-run"); if (opt_keep) - argv_array_push(&args, opt_keep); + strvec_push(&args, opt_keep); if (opt_depth) - argv_array_push(&args, opt_depth); + strvec_push(&args, opt_depth); if (opt_unshallow) - argv_array_push(&args, opt_unshallow); + strvec_push(&args, opt_unshallow); if (opt_update_shallow) - argv_array_push(&args, opt_update_shallow); + strvec_push(&args, opt_update_shallow); if (opt_refmap) - argv_array_push(&args, opt_refmap); + strvec_push(&args, opt_refmap); if (opt_ipv4) - argv_array_push(&args, opt_ipv4); + strvec_push(&args, opt_ipv4); if (opt_ipv6) - argv_array_push(&args, opt_ipv6); + strvec_push(&args, opt_ipv6); if (opt_show_forced_updates > 0) - argv_array_push(&args, "--show-forced-updates"); + strvec_push(&args, "--show-forced-updates"); else if (opt_show_forced_updates == 0) - argv_array_push(&args, "--no-show-forced-updates"); + strvec_push(&args, "--no-show-forced-updates"); + if (set_upstream) + strvec_push(&args, set_upstream); + strvec_pushv(&args, opt_fetch.v); if (repo) { - argv_array_push(&args, repo); - argv_array_pushv(&args, refspecs); + strvec_push(&args, repo); + strvec_pushv(&args, refspecs); } else if (*refspecs) BUG("refspecs without repo?"); - ret = run_command_v_opt(args.argv, RUN_GIT_CMD); - argv_array_clear(&args); + ret = run_command_v_opt(args.v, RUN_GIT_CMD); + strvec_clear(&args); return ret; } @@ -581,7 +609,8 @@ 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); + verify_merge_signature(commit, opt_verbosity, + check_trust_level); } /* @@ -607,8 +636,8 @@ static int rebase_submodules(void) cp.git_cmd = 1; cp.no_stdin = 1; - argv_array_pushl(&cp.args, "submodule", "update", - "--recursive", "--rebase", NULL); + strvec_pushl(&cp.args, "submodule", "update", + "--recursive", "--rebase", NULL); argv_push_verbosity(&cp.args); return run_command(&cp); @@ -620,8 +649,8 @@ static int update_submodules(void) cp.git_cmd = 1; cp.no_stdin = 1; - argv_array_pushl(&cp.args, "submodule", "update", - "--recursive", "--checkout", NULL); + strvec_pushl(&cp.args, "submodule", "update", + "--recursive", "--checkout", NULL); argv_push_verbosity(&cp.args); return run_command(&cp); @@ -633,44 +662,48 @@ static int update_submodules(void) static int run_merge(void) { int ret; - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; - argv_array_pushl(&args, "merge", NULL); + strvec_pushl(&args, "merge", NULL); /* Shared options */ argv_push_verbosity(&args); if (opt_progress) - argv_array_push(&args, opt_progress); + strvec_push(&args, opt_progress); /* Options passed to git-merge */ if (opt_diffstat) - argv_array_push(&args, opt_diffstat); + strvec_push(&args, opt_diffstat); if (opt_log) - argv_array_push(&args, opt_log); + strvec_push(&args, opt_log); if (opt_signoff) - argv_array_push(&args, opt_signoff); + strvec_push(&args, opt_signoff); if (opt_squash) - argv_array_push(&args, opt_squash); + strvec_push(&args, opt_squash); if (opt_commit) - argv_array_push(&args, opt_commit); + strvec_push(&args, opt_commit); if (opt_edit) - argv_array_push(&args, opt_edit); + strvec_push(&args, opt_edit); if (cleanup_arg) - argv_array_pushf(&args, "--cleanup=%s", cleanup_arg); + strvec_pushf(&args, "--cleanup=%s", cleanup_arg); if (opt_ff) - argv_array_push(&args, opt_ff); + strvec_push(&args, opt_ff); if (opt_verify_signatures) - argv_array_push(&args, opt_verify_signatures); - argv_array_pushv(&args, opt_strategies.argv); - argv_array_pushv(&args, opt_strategy_opts.argv); + strvec_push(&args, opt_verify_signatures); + strvec_pushv(&args, opt_strategies.v); + strvec_pushv(&args, opt_strategy_opts.v); if (opt_gpg_sign) - argv_array_push(&args, opt_gpg_sign); + strvec_push(&args, opt_gpg_sign); + if (opt_autostash == 0) + strvec_push(&args, "--no-autostash"); + else if (opt_autostash == 1) + strvec_push(&args, "--autostash"); if (opt_allow_unrelated_histories > 0) - argv_array_push(&args, "--allow-unrelated-histories"); + strvec_push(&args, "--allow-unrelated-histories"); - argv_array_push(&args, "FETCH_HEAD"); - ret = run_command_v_opt(args.argv, RUN_GIT_CMD); - argv_array_clear(&args); + strvec_push(&args, "FETCH_HEAD"); + ret = run_command_v_opt(args.v, RUN_GIT_CMD); + strvec_clear(&args); return ret; } @@ -767,8 +800,8 @@ static int get_rebase_fork_point(struct object_id *fork_point, const char *repo, if (!remote_branch) return -1; - argv_array_pushl(&cp.args, "merge-base", "--fork-point", - remote_branch, curr_branch->name, NULL); + strvec_pushl(&cp.args, "merge-base", "--fork-point", + remote_branch, curr_branch->name, NULL); cp.no_stdin = 1; cp.no_stderr = 1; cp.git_cmd = 1; @@ -828,48 +861,48 @@ static int run_rebase(const struct object_id *curr_head, { int ret; struct object_id oct_merge_base; - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; if (!get_octopus_merge_base(&oct_merge_base, curr_head, merge_head, fork_point)) if (!is_null_oid(fork_point) && oideq(&oct_merge_base, fork_point)) fork_point = NULL; - argv_array_push(&args, "rebase"); + strvec_push(&args, "rebase"); /* Shared options */ argv_push_verbosity(&args); /* Options passed to git-rebase */ if (opt_rebase == REBASE_MERGES) - argv_array_push(&args, "--rebase-merges"); + strvec_push(&args, "--rebase-merges"); else if (opt_rebase == REBASE_PRESERVE) - argv_array_push(&args, "--preserve-merges"); + strvec_push(&args, "--preserve-merges"); else if (opt_rebase == REBASE_INTERACTIVE) - argv_array_push(&args, "--interactive"); + strvec_push(&args, "--interactive"); if (opt_diffstat) - argv_array_push(&args, opt_diffstat); - argv_array_pushv(&args, opt_strategies.argv); - argv_array_pushv(&args, opt_strategy_opts.argv); + strvec_push(&args, opt_diffstat); + strvec_pushv(&args, opt_strategies.v); + strvec_pushv(&args, opt_strategy_opts.v); if (opt_gpg_sign) - argv_array_push(&args, opt_gpg_sign); + strvec_push(&args, opt_gpg_sign); if (opt_autostash == 0) - argv_array_push(&args, "--no-autostash"); + strvec_push(&args, "--no-autostash"); else if (opt_autostash == 1) - argv_array_push(&args, "--autostash"); + strvec_push(&args, "--autostash"); if (opt_verify_signatures && !strcmp(opt_verify_signatures, "--verify-signatures")) warning(_("ignoring --verify-signatures for rebase")); - argv_array_push(&args, "--onto"); - argv_array_push(&args, oid_to_hex(merge_head)); + strvec_push(&args, "--onto"); + strvec_push(&args, oid_to_hex(merge_head)); if (fork_point && !is_null_oid(fork_point)) - argv_array_push(&args, oid_to_hex(fork_point)); + strvec_push(&args, oid_to_hex(fork_point)); else - argv_array_push(&args, oid_to_hex(merge_head)); + strvec_push(&args, oid_to_hex(merge_head)); - ret = run_command_v_opt(args.argv, RUN_GIT_CMD); - argv_array_clear(&args); + ret = run_command_v_opt(args.v, RUN_GIT_CMD); + strvec_clear(&args); return ret; } @@ -912,9 +945,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (get_oid("HEAD", &orig_head)) oidclr(&orig_head); - if (!opt_rebase && opt_autostash != -1) - die(_("--[no-]autostash option is only valid with --rebase.")); - autostash = config_autostash; if (opt_rebase) { if (opt_autostash != -1) @@ -980,6 +1010,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (opt_rebase) { int ret = 0; + int ran_ff = 0; if ((recurse_submodules == RECURSE_SUBMODULES_ON || recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) && submodule_touches_in_range(the_repository, &rebase_fork_point, &curr_head)) @@ -993,13 +1024,17 @@ int cmd_pull(int argc, const char **argv, const char *prefix) commit_list_insert(head, &list); merge_head = lookup_commit_reference(the_repository, &merge_heads.oid[0]); - if (is_descendant_of(merge_head, list)) { + if (repo_is_descendant_of(the_repository, + merge_head, list)) { /* we can fast-forward this without invoking rebase */ opt_ff = "--ff-only"; + ran_ff = 1; ret = run_merge(); } + free_commit_list(list); } - ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point); + if (!ran_ff) + ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point); if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON || recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)) diff --git a/third_party/git/builtin/push.c b/third_party/git/builtin/push.c index 021dd3b1e4..6da3a8e5d3 100644 --- a/third_party/git/builtin/push.c +++ b/third_party/git/builtin/push.c @@ -61,40 +61,41 @@ static struct refspec rs = REFSPEC_INIT_PUSH; 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) +static void refspec_append_mapped(struct refspec *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? */ - if (count_refspec_match(ref, local_refs, &matched) != 1) - return ref; + if (count_refspec_match(ref, local_refs, &matched) != 1) { + refspec_append(refspec, ref); + return; + } if (remote->push.nr) { struct refspec_item query; memset(&query, 0, sizeof(struct refspec_item)); query.src = matched->name; if (!query_refspecs(&remote->push, &query) && query.dst) { - struct strbuf buf = STRBUF_INIT; - strbuf_addf(&buf, "%s%s:%s", - query.force ? "+" : "", - query.src, query.dst); - return strbuf_detach(&buf, NULL); + refspec_appendf(refspec, "%s%s:%s", + query.force ? "+" : "", + query.src, query.dst); + return; } } if (push_default == PUSH_DEFAULT_UPSTREAM && - starts_with(matched->name, "refs/heads/")) { - struct branch *branch = branch_get(matched->name + 11); + skip_prefix(matched->name, "refs/heads/", &branch_name)) { + struct branch *branch = branch_get(branch_name); if (branch->merge_nr == 1 && branch->merge[0]->src) { - struct strbuf buf = STRBUF_INIT; - strbuf_addf(&buf, "%s:%s", - ref, branch->merge[0]->src); - return strbuf_detach(&buf, NULL); + refspec_appendf(refspec, "%s:%s", + ref, branch->merge[0]->src); + return; } } - return ref; + refspec_append(refspec, ref); } static void set_refspecs(const char **refs, int nr, const char *repo) @@ -106,30 +107,26 @@ static void set_refspecs(const char **refs, int nr, const char *repo) for (i = 0; i < nr; i++) { const char *ref = refs[i]; if (!strcmp("tag", ref)) { - struct strbuf tagref = STRBUF_INIT; if (nr <= ++i) die(_("tag shorthand without <tag>")); ref = refs[i]; if (deleterefs) - strbuf_addf(&tagref, ":refs/tags/%s", ref); + refspec_appendf(&rs, ":refs/tags/%s", ref); else - strbuf_addf(&tagref, "refs/tags/%s", ref); - ref = strbuf_detach(&tagref, NULL); + refspec_appendf(&rs, "refs/tags/%s", ref); } else if (deleterefs) { - struct strbuf delref = STRBUF_INIT; if (strchr(ref, ':')) die(_("--delete only accepts plain target ref names")); - strbuf_addf(&delref, ":%s", ref); - ref = strbuf_detach(&delref, NULL); + refspec_appendf(&rs, ":%s", ref); } else if (!strchr(ref, ':')) { if (!remote) { /* lazily grab remote and local_refs */ remote = remote_get(repo); local_refs = get_local_heads(); } - ref = map_refspec(ref, remote, local_refs); - } - refspec_append(&rs, ref); + refspec_append_mapped(&rs, ref, remote, local_refs); + } else + refspec_append(&rs, ref); } } @@ -143,8 +140,8 @@ static int push_url_of_remote(struct remote *remote, const char ***url_p) return remote->url_nr; } -static NORETURN int die_push_simple(struct branch *branch, - struct remote *remote) +static NORETURN void die_push_simple(struct branch *branch, + struct remote *remote) { /* * There's no point in using shorten_unambiguous_ref here, @@ -191,8 +188,6 @@ static const char message_detached_head_die[] = static void setup_push_upstream(struct remote *remote, struct branch *branch, int triangular, int simple) { - struct strbuf refspec = STRBUF_INIT; - if (!branch) die(_(message_detached_head_die), remote->name); if (!branch->merge_nr || !branch->merge || !branch->remote_name) @@ -218,18 +213,14 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch, die_push_simple(branch, remote); } - strbuf_addf(&refspec, "%s:%s", branch->refname, branch->merge[0]->src); - refspec_append(&rs, refspec.buf); + refspec_appendf(&rs, "%s:%s", branch->refname, branch->merge[0]->src); } static void setup_push_current(struct remote *remote, struct branch *branch) { - struct strbuf refspec = STRBUF_INIT; - if (!branch) die(_(message_detached_head_die), remote->name); - strbuf_addf(&refspec, "%s:%s", branch->refname, branch->refname); - refspec_append(&rs, refspec.buf); + refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname); } static int is_workflow_triangular(struct remote *remote) @@ -339,6 +330,7 @@ static int push_with_options(struct transport *transport, struct refspec *rs, { int err; unsigned int reject_reasons; + char *anon_url = transport_anonymize_url(transport->url); transport_set_verbosity(transport, verbosity, progress); transport->family = family; @@ -356,16 +348,19 @@ static int push_with_options(struct transport *transport, struct refspec *rs, } if (verbosity > 0) - fprintf(stderr, _("Pushing to %s\n"), transport->url); + fprintf(stderr, _("Pushing to %s\n"), anon_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); + error(_("failed to push some refs to '%s'"), anon_url); fprintf(stderr, "%s", push_get_color(PUSH_COLOR_RESET)); } err |= transport_disconnect(transport); + free(anon_url); if (!err) return 0; @@ -384,31 +379,15 @@ static int push_with_options(struct transport *transport, struct refspec *rs, return 1; } -static int do_push(const char *repo, int flags, - const struct string_list *push_options) +static int do_push(int flags, + const struct string_list *push_options, + struct remote *remote) { 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; @@ -447,10 +426,8 @@ static int option_parse_recurse_submodules(const struct option *opt, if (unset) *recurse_submodules = RECURSE_SUBMODULES_OFF; - else if (arg) - *recurse_submodules = parse_push_recurse_submodules_arg(opt->long_name, arg); else - die("%s missing parameter", opt->long_name); + *recurse_submodules = parse_push_recurse_submodules_arg(opt->long_name, arg); return 0; } @@ -548,6 +525,7 @@ 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), @@ -560,13 +538,11 @@ int cmd_push(int argc, const char **argv, const char *prefix) OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN), OPT_BIT( 0, "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN), OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE), - { OPTION_CALLBACK, - 0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"), - N_("require old value of ref to be at this value"), - PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option }, - { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, "(check|on-demand|no)", - N_("control recursive pushing of submodules"), - PARSE_OPT_OPTARG, option_parse_recurse_submodules }, + OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"), + N_("require old value of ref to be at this value"), + PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option), + OPT_CALLBACK(0, "recurse-submodules", &recurse_submodules, "(check|on-demand|no)", + N_("control recursive pushing of submodules"), option_parse_recurse_submodules), OPT_BOOL_F( 0 , "thin", &thin, N_("use thin pack"), PARSE_OPT_NOCOMPLETE), OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", N_("receive pack program")), OPT_STRING( 0 , "exec", &receivepack, "receive-pack", N_("receive pack program")), @@ -578,9 +554,8 @@ int cmd_push(int argc, const char **argv, const char *prefix) OPT_BIT(0, "no-verify", &flags, N_("bypass pre-push hook"), TRANSPORT_PUSH_NO_HOOK), OPT_BIT(0, "follow-tags", &flags, N_("push missing but relevant tags"), TRANSPORT_PUSH_FOLLOW_TAGS), - { OPTION_CALLBACK, - 0, "signed", &push_cert, "(yes|no|if-asked)", N_("GPG sign the push"), - PARSE_OPT_OPTARG, option_parse_push_signed }, + OPT_CALLBACK_F(0, "signed", &push_cert, "(yes|no|if-asked)", N_("GPG sign the push"), + PARSE_OPT_OPTARG, option_parse_push_signed), OPT_BIT(0, "atomic", &flags, N_("request atomic transaction on remote side"), TRANSPORT_PUSH_ATOMIC), OPT_STRING_LIST('o', "push-option", &push_options_cmdline, N_("server-specific"), N_("option to transmit")), OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"), @@ -602,20 +577,6 @@ 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; @@ -632,11 +593,43 @@ 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); + rc = do_push(flags, push_options, remote); 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 9202e75544..24c4162f74 100644 --- a/third_party/git/builtin/range-diff.c +++ b/third_party/git/builtin/range-diff.c @@ -15,12 +15,16 @@ 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 strvec other_arg = STRVEC_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; @@ -78,8 +82,9 @@ 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); + simple_color < 1, &diffopt, &other_arg); + strvec_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 ca5e655d2f..485e7b0479 100644 --- a/third_party/git/builtin/read-tree.c +++ b/third_party/git/builtin/read-tree.c @@ -120,9 +120,9 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) int prefix_set = 0; struct lock_file lock_file = LOCK_INIT; const struct option read_tree_options[] = { - { OPTION_CALLBACK, 0, "index-output", NULL, N_("file"), + OPT_CALLBACK_F(0, "index-output", NULL, N_("file"), N_("write resulting index to <file>"), - PARSE_OPT_NONEG, index_output_cb }, + PARSE_OPT_NONEG, index_output_cb), OPT_BOOL(0, "empty", &read_empty, N_("only empty the index")), OPT__VERBOSE(&opts.verbose_update, N_("be verbose")), @@ -140,10 +140,10 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) PARSE_OPT_NONEG }, OPT_BOOL('u', NULL, &opts.update, N_("update working tree with merge result")), - { OPTION_CALLBACK, 0, "exclude-per-directory", &opts, + OPT_CALLBACK_F(0, "exclude-per-directory", &opts, N_("gitignore"), N_("allow explicitly ignored files to be overwritten"), - PARSE_OPT_NONEG, exclude_per_directory_cb }, + PARSE_OPT_NONEG, exclude_per_directory_cb), OPT_BOOL('i', NULL, &opts.index_only, N_("don't check the working tree after merging")), OPT__DRY_RUN(&opts.dry_run, N_("don't update the index or the work tree")), @@ -151,9 +151,9 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) N_("skip applying sparse checkout filter")), OPT_BOOL(0, "debug-unpack", &opts.debug_unpack, N_("debug unpack-trees")), - { OPTION_CALLBACK, 0, "recurse-submodules", NULL, + OPT_CALLBACK_F(0, "recurse-submodules", NULL, "checkout", "control recursive updating of submodules", - PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater }, + PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater), OPT__QUIET(&opts.quiet, N_("suppress feedback messages")), OPT_END() }; @@ -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 670096c065..eeca53382f 100644 --- a/third_party/git/builtin/rebase.c +++ b/third_party/git/builtin/rebase.c @@ -8,7 +8,7 @@ #include "builtin.h" #include "run-command.h" #include "exec-cmd.h" -#include "argv-array.h" +#include "strvec.h" #include "dir.h" #include "packfile.h" #include "refs.h" @@ -27,10 +27,13 @@ #include "branch.h" #include "sequencer.h" #include "rebase-interactive.h" +#include "reset.h" + +#define DEFAULT_REFLOG_ACTION "rebase" static char const * const builtin_rebase_usage[] = { - N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] " - "[<upstream>] [<branch>]"), + N_("git rebase [-i] [options] [--exec <cmd>] " + "[--onto <newbase> | --keep-base] [<upstream> [<branch>]]"), N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] " "--root [<branch>]"), N_("git rebase --continue | --abort | --skip | --edit-todo"), @@ -44,14 +47,22 @@ static GIT_PATH_FUNC(merge_dir, "rebase-merge") enum rebase_type { REBASE_UNSPECIFIED = -1, - REBASE_AM, + REBASE_APPLY, 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; @@ -62,7 +73,7 @@ struct rebase_options { const char *onto_name; const char *revisions; const char *switch_to; - int root; + int root, root_with_onto; struct object_id *squash_onto; struct commit *restrict_revision; int dont_finish_rebase; @@ -73,7 +84,7 @@ struct rebase_options { REBASE_FORCE = 1<<3, REBASE_INTERACTIVE_EXPLICIT = 1<<4, } flags; - struct argv_array git_am_opts; + struct strvec git_am_opts; const char *action; int signoff; int allow_rerere_autoupdate; @@ -81,6 +92,8 @@ struct rebase_options { int autosquash; char *gpg_sign_opt; int autostash; + int committer_date_is_author_date; + int ignore_date; char *cmd; int allow_empty_message; int rebase_merges, rebase_cousins; @@ -88,12 +101,16 @@ struct rebase_options { struct strbuf git_format_patch_opt; int reschedule_failed_exec; int use_legacy_rebase; + int reapply_cherry_picks; }; #define REBASE_OPTIONS_INIT { \ .type = REBASE_UNSPECIFIED, \ + .empty = EMPTY_UNSPECIFIED, \ + .keep_empty = 1, \ + .default_backend = "merge", \ .flags = REBASE_NO_QUIET, \ - .git_am_opts = ARGV_ARRAY_INIT, \ + .git_am_opts = STRVEC_INIT, \ .git_format_patch_opt = STRBUF_INIT \ } @@ -110,13 +127,25 @@ 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.committer_date_is_author_date = + opts->committer_date_is_author_date; + replay.ignore_date = opts->ignore_date; replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt); replay.strategy = opts->strategy; + 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; } @@ -241,21 +270,17 @@ static int edit_todo_file(unsigned flags) } static int get_revision_ranges(struct commit *upstream, struct commit *onto, - const char **head_hash, + struct object_id *orig_head, const char **head_hash, char **revisions, char **shortrevisions) { struct commit *base_rev = upstream ? upstream : onto; const char *shorthead; - struct object_id orig_head; - if (get_oid("HEAD", &orig_head)) - return error(_("no HEAD?")); - - *head_hash = find_unique_abbrev(&orig_head, GIT_MAX_HEXSZ); + *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; @@ -304,17 +329,13 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) int ret; const char *head_hash = NULL; char *revisions = NULL, *shortrevisions = NULL; - struct argv_array make_script_args = ARGV_ARRAY_INIT; + struct strvec make_script_args = STRVEC_INIT; struct todo_list todo_list = TODO_LIST_INIT; struct replay_opts replay = get_replay_opts(opts); struct string_list commands = STRING_LIST_INIT_DUP; - 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)) + if (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head, + &head_hash, &revisions, &shortrevisions)) return -1; if (init_basic_state(&replay, @@ -330,13 +351,13 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) write_file(path_squash_onto(), "%s\n", oid_to_hex(opts->squash_onto)); - argv_array_pushl(&make_script_args, "", revisions, NULL); + strvec_pushl(&make_script_args, "", revisions, NULL); if (opts->restrict_revision) - argv_array_push(&make_script_args, - oid_to_hex(&opts->restrict_revision->object.oid)); + strvec_pushf(&make_script_args, "^%s", + 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, + make_script_args.nr, make_script_args.v, flags); if (ret) @@ -357,12 +378,12 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) free(revisions); free(shortrevisions); todo_list_release(&todo_list); - argv_array_clear(&make_script_args); + strvec_clear(&make_script_args); return ret; } -static int run_rebase_interactive(struct rebase_options *opts, +static int run_sequencer_rebase(struct rebase_options *opts, enum action command) { unsigned flags = 0; @@ -374,7 +395,9 @@ static int run_rebase_interactive(struct rebase_options *opts, 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; + flags |= opts->reapply_cherry_picks ? TODO_LIST_REAPPLY_CHERRY_PICKS : 0; switch (command) { case ACTION_NONE: { @@ -403,7 +426,7 @@ static int run_rebase_interactive(struct rebase_options *opts, struct child_process cmd = CHILD_PROCESS_INIT; cmd.git_cmd = 1; - argv_array_pushl(&cmd.args, "show", "REBASE_HEAD", "--", NULL); + strvec_pushl(&cmd.args, "show", "REBASE_HEAD", "--", NULL); ret = run_command(&cmd); break; @@ -433,6 +456,20 @@ static int run_rebase_interactive(struct rebase_options *opts, return ret; } +static void imply_merge(struct rebase_options *opts, const char *option); +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); + + imply_merge(opts, unset ? "--no-keep-empty" : "--keep-empty"); + opts->keep_empty = !unset; + opts->type = REBASE_MERGE; + return 0; +} + static const char * const builtin_rebase_interactive_usage[] = { N_("git rebase--interactive [<options>]"), NULL @@ -446,9 +483,13 @@ 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), - 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_CALLBACK_F('k', "keep-empty", &options, NULL, + N_("keep commits which start empty"), + 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, "rebase-merges", &opts.rebase_merges, N_("rebase merge commits")), OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins, N_("keep original branch points of cousins")), @@ -518,28 +559,26 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) warning(_("--[no-]rebase-cousins has no effect without " "--rebase-merges")); - return !!run_rebase_interactive(&opts, command); + return !!run_sequencer_rebase(&opts, command); } -static int is_interactive(struct rebase_options *opts) +static int is_merge(struct rebase_options *opts) { - return opts->type == REBASE_INTERACTIVE || + return opts->type == REBASE_MERGE || opts->type == REBASE_PRESERVE_MERGES; } -static void imply_interactive(struct rebase_options *opts, const char *option) +static void imply_merge(struct rebase_options *opts, const char *option) { switch (opts->type) { - case REBASE_AM: - die(_("%s requires an interactive rebase"), option); + case REBASE_APPLY: + die(_("%s requires the merge backend"), option); break; - case REBASE_INTERACTIVE: + case REBASE_MERGE: case REBASE_PRESERVE_MERGES: break; - case REBASE_MERGE: - /* we now implement --merge via --interactive */ default: - opts->type = REBASE_INTERACTIVE; /* implied */ + opts->type = REBASE_MERGE; /* implied */ break; } } @@ -560,15 +599,6 @@ static const char *state_dir_path(const char *filename, struct rebase_options *o return path.buf; } -/* Read one file, then strip line endings */ -static int read_one(const char *path, struct strbuf *buf) -{ - if (strbuf_read_file(buf, path, 0) < 0) - return error_errno(_("could not read '%s'"), path); - strbuf_trim_trailing_newline(buf); - return 0; -} - /* Initialize the rebase options from the state directory. */ static int read_basic_state(struct rebase_options *opts) { @@ -576,8 +606,10 @@ static int read_basic_state(struct rebase_options *opts) struct strbuf buf = STRBUF_INIT; struct object_id oid; - if (read_one(state_dir_path("head-name", opts), &head_name) || - read_one(state_dir_path("onto", opts), &buf)) + if (!read_oneliner(&head_name, state_dir_path("head-name", opts), + READ_ONELINER_WARN_MISSING) || + !read_oneliner(&buf, state_dir_path("onto", opts), + READ_ONELINER_WARN_MISSING)) return -1; opts->head_name = starts_with(head_name.buf, "refs/") ? xstrdup(head_name.buf) : NULL; @@ -593,9 +625,11 @@ static int read_basic_state(struct rebase_options *opts) */ strbuf_reset(&buf); if (file_exists(state_dir_path("orig-head", opts))) { - if (read_one(state_dir_path("orig-head", opts), &buf)) + if (!read_oneliner(&buf, state_dir_path("orig-head", opts), + READ_ONELINER_WARN_MISSING)) return -1; - } else if (read_one(state_dir_path("head", opts), &buf)) + } else if (!read_oneliner(&buf, state_dir_path("head", opts), + READ_ONELINER_WARN_MISSING)) return -1; if (get_oid(buf.buf, &opts->orig_head)) return error(_("invalid orig-head: '%s'"), buf.buf); @@ -615,8 +649,8 @@ static int read_basic_state(struct rebase_options *opts) if (file_exists(state_dir_path("allow_rerere_autoupdate", opts))) { strbuf_reset(&buf); - if (read_one(state_dir_path("allow_rerere_autoupdate", opts), - &buf)) + if (!read_oneliner(&buf, state_dir_path("allow_rerere_autoupdate", opts), + READ_ONELINER_WARN_MISSING)) return -1; if (!strcmp(buf.buf, "--rerere-autoupdate")) opts->allow_rerere_autoupdate = RERERE_AUTOUPDATE; @@ -629,8 +663,8 @@ static int read_basic_state(struct rebase_options *opts) if (file_exists(state_dir_path("gpg_sign_opt", opts))) { strbuf_reset(&buf); - if (read_one(state_dir_path("gpg_sign_opt", opts), - &buf)) + if (!read_oneliner(&buf, state_dir_path("gpg_sign_opt", opts), + READ_ONELINER_WARN_MISSING)) return -1; free(opts->gpg_sign_opt); opts->gpg_sign_opt = xstrdup(buf.buf); @@ -638,7 +672,8 @@ static int read_basic_state(struct rebase_options *opts) if (file_exists(state_dir_path("strategy", opts))) { strbuf_reset(&buf); - if (read_one(state_dir_path("strategy", opts), &buf)) + if (!read_oneliner(&buf, state_dir_path("strategy", opts), + READ_ONELINER_WARN_MISSING)) return -1; free(opts->strategy); opts->strategy = xstrdup(buf.buf); @@ -646,7 +681,8 @@ static int read_basic_state(struct rebase_options *opts) if (file_exists(state_dir_path("strategy_opts", opts))) { strbuf_reset(&buf); - if (read_one(state_dir_path("strategy_opts", opts), &buf)) + if (!read_oneliner(&buf, state_dir_path("strategy_opts", opts), + READ_ONELINER_WARN_MISSING)) return -1; free(opts->strategy_opts); opts->strategy_opts = xstrdup(buf.buf); @@ -665,8 +701,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)); - write_file(state_dir_path("quiet", opts), "%s", - opts->flags & REBASE_NO_QUIET ? "" : "t"); + if (!(opts->flags & REBASE_NO_QUIET)) + write_file(state_dir_path("quiet", opts), "%s", ""); if (opts->flags & REBASE_VERBOSE) write_file(state_dir_path("verbose", opts), "%s", ""); if (opts->strategy) @@ -684,71 +720,25 @@ 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("strategy", opts), "--signoff"); + write_file(state_dir_path("signoff", opts), "--signoff"); return 0; } -static int apply_autostash(struct rebase_options *opts) -{ - const char *path = state_dir_path("autostash", opts); - struct strbuf autostash = STRBUF_INIT; - struct child_process stash_apply = CHILD_PROCESS_INIT; - - if (!file_exists(path)) - return 0; - - if (read_one(path, &autostash)) - return error(_("Could not read '%s'"), path); - /* Ensure that the hash is not mistaken for a number */ - strbuf_addstr(&autostash, "^0"); - argv_array_pushl(&stash_apply.args, - "stash", "apply", autostash.buf, NULL); - stash_apply.git_cmd = 1; - stash_apply.no_stderr = stash_apply.no_stdout = - stash_apply.no_stdin = 1; - if (!run_command(&stash_apply)) - printf(_("Applied autostash.\n")); - else { - struct argv_array args = ARGV_ARRAY_INIT; - int res = 0; - - argv_array_pushl(&args, - "stash", "store", "-m", "autostash", "-q", - autostash.buf, NULL); - if (run_command_v_opt(args.argv, RUN_GIT_CMD)) - res = error(_("Cannot store %s"), autostash.buf); - argv_array_clear(&args); - strbuf_release(&autostash); - if (res) - return res; - - fprintf(stderr, - _("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")); - } - - strbuf_release(&autostash); - return 0; -} - static int finish_rebase(struct rebase_options *opts) { struct strbuf dir = STRBUF_INIT; - const char *argv_gc_auto[] = { "gc", "--auto", NULL }; int ret = 0; delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF); - apply_autostash(opts); + apply_autostash(state_dir_path("autostash", opts)); close_object_store(the_repository->objects); /* - * We ignore errors in 'gc --auto', since the + * We ignore errors in 'git maintenance run --auto', since the * user should see them. */ - run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); - if (opts->type == REBASE_INTERACTIVE) { + run_auto_maintenance(!(opts->flags & (REBASE_NO_QUIET|REBASE_VERBOSE))); + if (opts->type == REBASE_MERGE) { struct replay_opts replay = REPLAY_OPTS_INIT; replay.action = REPLAY_INTERACTIVE_REBASE; @@ -786,143 +776,6 @@ static void add_var(struct strbuf *buf, const char *name, const char *value) } } -#define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION" - -#define RESET_HEAD_DETACH (1<<0) -#define RESET_HEAD_HARD (1<<1) -#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2) -#define RESET_HEAD_REFS_ONLY (1<<3) -#define RESET_ORIG_HEAD (1<<4) - -static int reset_head(struct object_id *oid, const char *action, - const char *switch_to_branch, unsigned flags, - const char *reflog_orig_head, const char *reflog_head) -{ - unsigned detach_head = flags & RESET_HEAD_DETACH; - unsigned reset_hard = flags & RESET_HEAD_HARD; - unsigned run_hook = flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK; - unsigned refs_only = flags & RESET_HEAD_REFS_ONLY; - unsigned update_orig_head = flags & RESET_ORIG_HEAD; - struct object_id head_oid; - struct tree_desc desc[2] = { { NULL }, { NULL } }; - struct lock_file lock = LOCK_INIT; - struct unpack_trees_options unpack_tree_opts; - struct tree *tree; - const char *reflog_action; - struct strbuf msg = STRBUF_INIT; - size_t prefix_len; - struct object_id *orig = NULL, oid_orig, - *old_orig = NULL, oid_old_orig; - int ret = 0, nr = 0; - - if (switch_to_branch && !starts_with(switch_to_branch, "refs/")) - BUG("Not a fully qualified branch: '%s'", switch_to_branch); - - if (!refs_only && hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0) { - ret = -1; - goto leave_reset_head; - } - - if ((!oid || !reset_hard) && get_oid("HEAD", &head_oid)) { - ret = error(_("could not determine HEAD revision")); - goto leave_reset_head; - } - - if (!oid) - oid = &head_oid; - - if (refs_only) - goto reset_head_refs; - - memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts)); - setup_unpack_trees_porcelain(&unpack_tree_opts, action); - unpack_tree_opts.head_idx = 1; - unpack_tree_opts.src_index = the_repository->index; - unpack_tree_opts.dst_index = the_repository->index; - unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge; - unpack_tree_opts.update = 1; - unpack_tree_opts.merge = 1; - if (!detach_head) - unpack_tree_opts.reset = 1; - - if (repo_read_index_unmerged(the_repository) < 0) { - ret = error(_("could not read index")); - goto leave_reset_head; - } - - if (!reset_hard && !fill_tree_descriptor(the_repository, &desc[nr++], &head_oid)) { - ret = error(_("failed to find tree of %s"), - oid_to_hex(&head_oid)); - goto leave_reset_head; - } - - if (!fill_tree_descriptor(the_repository, &desc[nr++], oid)) { - ret = error(_("failed to find tree of %s"), oid_to_hex(oid)); - goto leave_reset_head; - } - - if (unpack_trees(nr, desc, &unpack_tree_opts)) { - ret = -1; - goto leave_reset_head; - } - - tree = parse_tree_indirect(oid); - prime_cache_tree(the_repository, the_repository->index, tree); - - if (write_locked_index(the_repository->index, &lock, COMMIT_LOCK) < 0) { - ret = error(_("could not write index")); - goto leave_reset_head; - } - -reset_head_refs: - reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT); - strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : "rebase"); - prefix_len = msg.len; - - if (update_orig_head) { - if (!get_oid("ORIG_HEAD", &oid_old_orig)) - old_orig = &oid_old_orig; - if (!get_oid("HEAD", &oid_orig)) { - orig = &oid_orig; - if (!reflog_orig_head) { - strbuf_addstr(&msg, "updating ORIG_HEAD"); - reflog_orig_head = msg.buf; - } - update_ref(reflog_orig_head, "ORIG_HEAD", orig, - old_orig, 0, UPDATE_REFS_MSG_ON_ERR); - } else if (old_orig) - delete_ref(NULL, "ORIG_HEAD", old_orig, 0); - } - - if (!reflog_head) { - strbuf_setlen(&msg, prefix_len); - strbuf_addstr(&msg, "updating HEAD"); - reflog_head = msg.buf; - } - if (!switch_to_branch) - ret = update_ref(reflog_head, "HEAD", oid, orig, - detach_head ? REF_NO_DEREF : 0, - UPDATE_REFS_MSG_ON_ERR); - else { - ret = update_ref(reflog_head, switch_to_branch, oid, - NULL, 0, UPDATE_REFS_MSG_ON_ERR); - if (!ret) - ret = create_symref("HEAD", switch_to_branch, - reflog_head); - } - if (run_hook) - run_hook_le(NULL, "post-checkout", - oid_to_hex(orig ? orig : &null_oid), - oid_to_hex(oid), "1", NULL); - -leave_reset_head: - strbuf_release(&msg); - rollback_lock_file(&lock); - while (nr) - free((void *)desc[--nr].buffer); - return ret; -} - static int move_to_original_branch(struct rebase_options *opts) { struct strbuf orig_head_reflog = STRBUF_INIT, head_reflog = STRBUF_INIT; @@ -938,8 +791,10 @@ static int move_to_original_branch(struct rebase_options *opts) opts->head_name, oid_to_hex(&opts->onto->object.oid)); strbuf_addf(&head_reflog, "rebase finished: returning to %s", opts->head_name); - ret = reset_head(NULL, "", opts->head_name, RESET_HEAD_REFS_ONLY, - orig_head_reflog.buf, head_reflog.buf); + ret = reset_head(the_repository, NULL, "", opts->head_name, + RESET_HEAD_REFS_ONLY, + orig_head_reflog.buf, head_reflog.buf, + DEFAULT_REFLOG_ACTION); strbuf_release(&orig_head_reflog); strbuf_release(&head_reflog); @@ -962,13 +817,13 @@ static int run_am(struct rebase_options *opts) char *rebased_patches; am.git_cmd = 1; - argv_array_push(&am.args, "am"); + strvec_push(&am.args, "am"); if (opts->action && !strcmp("continue", opts->action)) { - argv_array_push(&am.args, "--resolved"); - argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg); + strvec_push(&am.args, "--resolved"); + strvec_pushf(&am.args, "--resolvemsg=%s", resolvemsg); if (opts->gpg_sign_opt) - argv_array_push(&am.args, opts->gpg_sign_opt); + strvec_push(&am.args, opts->gpg_sign_opt); status = run_command(&am); if (status) return status; @@ -976,8 +831,8 @@ static int run_am(struct rebase_options *opts) return move_to_original_branch(opts); } if (opts->action && !strcmp("skip", opts->action)) { - argv_array_push(&am.args, "--skip"); - argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg); + strvec_push(&am.args, "--skip"); + strvec_pushf(&am.args, "--resolvemsg=%s", resolvemsg); status = run_command(&am); if (status) return status; @@ -985,7 +840,7 @@ static int run_am(struct rebase_options *opts) return move_to_original_branch(opts); } if (opts->action && !strcmp("show-current-patch", opts->action)) { - argv_array_push(&am.args, "--show-current-patch"); + strvec_push(&am.args, "--show-current-patch"); return run_command(&am); } @@ -1003,31 +858,33 @@ static int run_am(struct rebase_options *opts) status = error_errno(_("could not open '%s' for writing"), rebased_patches); free(rebased_patches); - argv_array_clear(&am.args); + strvec_clear(&am.args); return status; } format_patch.git_cmd = 1; - 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", NULL); + strvec_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); if (opts->git_format_patch_opt.len) - argv_array_split(&format_patch.args, - opts->git_format_patch_opt.buf); - argv_array_push(&format_patch.args, revisions.buf); + strvec_split(&format_patch.args, + opts->git_format_patch_opt.buf); + strvec_push(&format_patch.args, revisions.buf); if (opts->restrict_revision) - argv_array_pushf(&format_patch.args, "^%s", - oid_to_hex(&opts->restrict_revision->object.oid)); + strvec_pushf(&format_patch.args, "^%s", + oid_to_hex(&opts->restrict_revision->object.oid)); status = run_command(&format_patch); if (status) { unlink(rebased_patches); free(rebased_patches); - argv_array_clear(&am.args); + strvec_clear(&am.args); - reset_head(&opts->orig_head, "checkout", opts->head_name, 0, - "HEAD", NULL); + reset_head(the_repository, &opts->orig_head, "checkout", + opts->head_name, 0, + "HEAD", NULL, DEFAULT_REFLOG_ACTION); error(_("\ngit encountered an error while preparing the " "patches to replay\n" "these revisions:\n" @@ -1045,20 +902,20 @@ static int run_am(struct rebase_options *opts) status = error_errno(_("could not open '%s' for reading"), rebased_patches); free(rebased_patches); - argv_array_clear(&am.args); + strvec_clear(&am.args); return status; } - argv_array_pushv(&am.args, opts->git_am_opts.argv); - argv_array_push(&am.args, "--rebasing"); - argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg); - argv_array_push(&am.args, "--patch-format=mboxrd"); + strvec_pushv(&am.args, opts->git_am_opts.v); + strvec_push(&am.args, "--rebasing"); + strvec_pushf(&am.args, "--resolvemsg=%s", resolvemsg); + strvec_push(&am.args, "--patch-format=mboxrd"); if (opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE) - argv_array_push(&am.args, "--rerere-autoupdate"); + strvec_push(&am.args, "--rerere-autoupdate"); else if (opts->allow_rerere_autoupdate == RERERE_NOAUTOUPDATE) - argv_array_push(&am.args, "--no-rerere-autoupdate"); + strvec_push(&am.args, "--no-rerere-autoupdate"); if (opts->gpg_sign_opt) - argv_array_push(&am.args, opts->gpg_sign_opt); + strvec_push(&am.args, opts->gpg_sign_opt); status = run_command(&am); unlink(rebased_patches); free(rebased_patches); @@ -1080,8 +937,8 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action) int status; const char *backend, *backend_func; - if (opts->type == REBASE_INTERACTIVE) { - /* Run builtin interactive rebase */ + if (opts->type == REBASE_MERGE) { + /* Run sequencer-based rebase */ setenv("GIT_CHERRY_PICK_HELP", resolvemsg, 1); if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) { setenv("GIT_SEQUENCE_EDITOR", ":", 1); @@ -1094,11 +951,11 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action) opts->gpg_sign_opt = tmp; } - status = run_rebase_interactive(opts, action); + status = run_sequencer_rebase(opts, action); goto finished_rebase; } - if (opts->type == REBASE_AM) { + if (opts->type == REBASE_APPLY) { status = run_am(opts); goto finished_rebase; } @@ -1118,9 +975,7 @@ 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); + sq_quote_argv_pretty(&buf, opts->git_am_opts.v); add_var(&script_snippet, "git_am_opt", buf.buf); strbuf_release(&buf); add_var(&script_snippet, "verbose", @@ -1155,7 +1010,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_interactive(opts) && + if (is_merge(opts) && !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) { strbuf_addstr(&script_snippet, "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; "); @@ -1180,15 +1035,15 @@ 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_INTERACTIVE) - ; /* interactive rebase cleans up after itself */ + else if (opts->type == REBASE_MERGE) + ; /* merge backend cleans up after itself */ else if (status == 0) { if (!file_exists(state_dir_path("stopped-sha", opts))) finish_rebase(opts); } else if (status == 2) { struct strbuf dir = STRBUF_INIT; - apply_autostash(opts); + apply_autostash(state_dir_path("autostash", opts)); strbuf_addstr(&dir, opts->state_dir); remove_dir_recursively(&dir, 0); strbuf_release(&dir); @@ -1239,6 +1094,10 @@ 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); } @@ -1260,28 +1119,60 @@ static int is_linear_history(struct commit *from, struct commit *to) return 1; } -static int can_fast_forward(struct commit *onto, struct object_id *head_oid, - struct object_id *merge_base) +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) { struct commit *head = lookup_commit(the_repository, head_oid); - struct commit_list *merge_bases; - int res; + struct commit_list *merge_bases = NULL; + int res = 0; if (!head) - return 0; + goto done; merge_bases = get_merge_bases(onto, head); - if (merge_bases && !merge_bases->next) { - oidcpy(merge_base, &merge_bases->item->object.oid); - res = oideq(merge_base, &onto->object.oid); - } else { + if (!merge_bases || merge_bases->next) { oidcpy(merge_base, &null_oid); - res = 0; + goto done; } + + 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) { @@ -1290,7 +1181,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_interactive(opts)) + if (!is_merge(opts)) opts->type = REBASE_MERGE; return 0; @@ -1305,12 +1196,35 @@ 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_INTERACTIVE; + opts->type = REBASE_MERGE; 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); @@ -1346,14 +1260,14 @@ static void set_reflog_action(struct rebase_options *options) const char *env; struct strbuf buf = STRBUF_INIT; - if (!is_interactive(options)) + if (!is_merge(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 -i (%s)", options->action); + strbuf_addf(&buf, "rebase (%s)", options->action); setenv(GIT_REFLOG_ACTION_ENVIRONMENT, buf.buf, 1); strbuf_release(&buf); } @@ -1370,17 +1284,18 @@ static int check_exec_cmd(const char *cmd) return 0; } - 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; struct strbuf buf = STRBUF_INIT; struct object_id merge_base; + int ignore_whitespace = 0; enum action action = ACTION_NONE; const char *gpg_sign = NULL; struct string_list exec = STRING_LIST_INIT_NODUP; @@ -1390,15 +1305,18 @@ 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), @@ -1407,16 +1325,17 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) PARSE_OPT_NOARG, NULL, REBASE_DIFFSTAT }, OPT_BOOL(0, "signoff", &options.signoff, N_("add a Signed-off-by: line to each commit")), - OPT_PASSTHRU_ARGV(0, "ignore-whitespace", &options.git_am_opts, - NULL, N_("passed to 'git am'"), - PARSE_OPT_NOARG), - OPT_PASSTHRU_ARGV(0, "committer-date-is-author-date", - &options.git_am_opts, NULL, - N_("passed to 'git am'"), PARSE_OPT_NOARG), - OPT_PASSTHRU_ARGV(0, "ignore-date", &options.git_am_opts, NULL, - N_("passed to 'git am'"), PARSE_OPT_NOARG), + OPT_BOOL(0, "committer-date-is-author-date", + &options.committer_date_is_author_date, + N_("make committer date match author date")), + OPT_BOOL(0, "reset-author-date", &options.ignore_date, + N_("ignore author date and use current date")), + OPT_HIDDEN_BOOL(0, "ignore-date", &options.ignore_date, + N_("synonym of --reset-author-date")), OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"), N_("passed to 'git apply'"), 0), + OPT_BOOL(0, "ignore-whitespace", &ignore_whitespace, + N_("ignore changes in whitespace")), OPT_PASSTHRU_ARGV(0, "whitespace", &options.git_am_opts, N_("action"), N_("passed to 'git apply'"), 0), OPT_BIT('f', "force-rebase", &options.flags, @@ -1439,34 +1358,44 @@ 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, 'm', "merge", &options, NULL, + OPT_CALLBACK_F(0, "apply", &options, NULL, + N_("use apply strategies to rebase"), + PARSE_OPT_NOARG | PARSE_OPT_NONEG, + parse_opt_am), + OPT_CALLBACK_F('m', "merge", &options, NULL, N_("use merging strategies to rebase"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, - parse_opt_merge }, - { OPTION_CALLBACK, 'i', "interactive", &options, NULL, + parse_opt_merge), + OPT_CALLBACK_F('i', "interactive", &options, NULL, N_("let the user edit the list of commits to rebase"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, - parse_opt_interactive }, - OPT_SET_INT('p', "preserve-merges", &options.type, - N_("(DEPRECATED) try to recreate merges instead of " - "ignoring them"), REBASE_PRESERVE_MERGES), + 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_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), - OPT_BOOL('k', "keep-empty", &options.keep_empty, - N_("preserve empty commits during rebase")), + OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}", + N_("how to handle commits that become empty"), + PARSE_OPT_NONEG, parse_opt_empty), + OPT_CALLBACK_F('k', "keep-empty", &options, NULL, + N_("keep commits which start empty"), + PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, + parse_opt_keep_empty), OPT_BOOL(0, "autosquash", &options.autosquash, N_("move commits that begin with " "squash!/fixup! under -i")), { OPTION_STRING, 'S', "gpg-sign", &gpg_sign, N_("key-id"), N_("GPG-sign commits"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, - OPT_BOOL(0, "autostash", &options.autostash, - N_("automatically stash/stash pop before and after")), + OPT_AUTOSTASH(&options.autostash), OPT_STRING_LIST('x', "exec", &exec, N_("exec"), N_("add exec lines after each commit of the " "editable list")), - OPT_BOOL(0, "allow-empty-message", - &options.allow_empty_message, - N_("allow rebasing commits with empty messages")), + OPT_BOOL_F(0, "allow-empty-message", + &options.allow_empty_message, + N_("allow rebasing commits with empty messages"), + PARSE_OPT_HIDDEN), {OPTION_STRING, 'r', "rebase-merges", &rebase_merges, N_("mode"), N_("try to rebase merges instead of skipping them"), @@ -1484,6 +1413,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "reschedule-failed-exec", &reschedule_failed_exec, N_("automatically re-schedule any `exec` that fails")), + OPT_BOOL(0, "reapply-cherry-picks", &options.reapply_cherry_picks, + N_("apply all changes, even those already present upstream")), OPT_END(), }; int i; @@ -1494,6 +1425,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) options.allow_empty_message = 1; git_config(rebase_config, &options); + /* options.gpg_sign_opt will be either "-S" or NULL */ + gpg_sign = options.gpg_sign_opt ? "" : NULL; + FREE_AND_NULL(options.gpg_sign_opt); if (options.use_legacy_rebase || !git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1)) @@ -1506,7 +1440,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_AM; + options.type = REBASE_APPLY; options.state_dir = apply_dir(); } else if (is_directory(merge_dir())) { strbuf_reset(&buf); @@ -1518,7 +1452,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_INTERACTIVE; + options.type = REBASE_MERGE; options.flags |= REBASE_INTERACTIVE_EXPLICIT; } else options.type = REBASE_MERGE; @@ -1547,16 +1481,26 @@ 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 (options.root && fork_point > 0) + die(_("cannot combine '--root' with '--fork-point'")); + if (action != ACTION_NONE && !in_progress) die(_("No rebase in progress?")); setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0); - if (action == ACTION_EDIT_TODO && !is_interactive(&options)) + if (action == ACTION_EDIT_TODO && !is_merge(&options)) die(_("The --edit-todo action can only be used during " "interactive rebase.")); if (trace2_is_enabled()) { - if (is_interactive(&options)) + if (is_merge(&options)) trace2_cmd_mode("interactive"); else if (exec.nr) trace2_cmd_mode("interactive-exec"); @@ -1604,8 +1548,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) rerere_clear(the_repository, &merge_rr); string_list_clear(&merge_rr, 1); - if (reset_head(NULL, "reset", NULL, RESET_HEAD_HARD, - NULL, NULL) < 0) + if (reset_head(the_repository, NULL, "reset", NULL, RESET_HEAD_HARD, + NULL, NULL, DEFAULT_REFLOG_ACTION) < 0) die(_("could not discard worktree changes")); remove_branch_state(the_repository, 0); if (read_basic_state(&options)) @@ -1622,9 +1566,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (read_basic_state(&options)) exit(1); - if (reset_head(&options.orig_head, "reset", + if (reset_head(the_repository, &options.orig_head, "reset", options.head_name, RESET_HEAD_HARD, - NULL, NULL) < 0) + NULL, NULL, DEFAULT_REFLOG_ACTION) < 0) die(_("could not move back to %s"), oid_to_hex(&options.orig_head)); remove_branch_state(the_repository, 0); @@ -1632,7 +1576,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) goto cleanup; } case ACTION_QUIT: { - if (options.type == REBASE_INTERACTIVE) { + save_autostash(state_dir_path("autostash", &options)); + if (options.type == REBASE_MERGE) { struct replay_opts replay = REPLAY_OPTS_INIT; replay.action = REPLAY_INTERACTIVE_REBASE; @@ -1681,13 +1626,20 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) state_dir_base, cmd_live_rebase, buf.buf); } - 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") || + if ((options.flags & REBASE_INTERACTIVE_EXPLICIT) || + (action != ACTION_NONE) || + (exec.nr > 0) || + options.autosquash) { + allow_preemptive_ff = 0; + } + if (options.committer_date_is_author_date || options.ignore_date) + options.flags |= REBASE_FORCE; + + for (i = 0; i < options.git_am_opts.nr; i++) { + const char *option = options.git_am_opts.v[i], *p; + if (!strcmp(option, "--whitespace=fix") || !strcmp(option, "--whitespace=strip")) - options.flags |= REBASE_FORCE; + allow_preemptive_ff = 0; else if (skip_prefix(option, "-C", &p)) { while (*p) if (!isdigit(*(p++))) @@ -1705,20 +1657,21 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) exit(1); if (!(options.flags & REBASE_NO_QUIET)) - argv_array_push(&options.git_am_opts, "-q"); + strvec_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 (options.reapply_cherry_picks) + imply_merge(&options, "--reapply-cherry-picks"); - if (gpg_sign) { - free(options.gpg_sign_opt); + if (gpg_sign) options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign); - } if (exec.nr) { int i; - imply_interactive(&options, "--exec"); + imply_merge(&options, "--exec"); strbuf_reset(&buf); for (i = 0; i < exec.nr; i++) @@ -1734,7 +1687,24 @@ 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_interactive(&options, "--rebase-merges"); + imply_merge(&options, "--rebase-merges"); + } + + if (options.type == REBASE_APPLY) { + if (ignore_whitespace) + strvec_push(&options.git_am_opts, + "--ignore-whitespace"); + if (options.committer_date_is_author_date) + strvec_push(&options.git_am_opts, + "--committer-date-is-author-date"); + if (options.ignore_date) + strvec_push(&options.git_am_opts, "--ignore-date"); + } else { + /* REBASE_MERGE and PRESERVE_MERGES */ + if (ignore_whitespace) { + string_list_append(&strategy_options, + "ignore-space-change"); + } } if (strategy_options.nr) { @@ -1753,10 +1723,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (options.strategy) { options.strategy = xstrdup(options.strategy); switch (options.type) { - case REBASE_AM: + case REBASE_APPLY: die(_("--strategy requires --merge or --interactive")); case REBASE_MERGE: - case REBASE_INTERACTIVE: case REBASE_PRESERVE_MERGES: /* compatible */ break; @@ -1769,52 +1738,70 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) } if (options.type == REBASE_MERGE) - imply_interactive(&options, "--merge"); + imply_merge(&options, "--merge"); if (options.root && !options.onto_name) - imply_interactive(&options, "--root without --onto"); + imply_merge(&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.nr || options.type == REBASE_APPLY) { + /* all am options except -q are compatible only with --apply */ + for (i = options.git_am_opts.nr - 1; i >= 0; i--) + if (strcmp(options.git_am_opts.v[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_AM: + case REBASE_APPLY: options.state_dir = apply_dir(); break; default: - /* the default rebase backend is `--am` */ - options.type = REBASE_AM; - options.state_dir = apply_dir(); - break; + BUG("options.type was just set above; should be unreachable."); } - if (reschedule_failed_exec > 0 && !is_interactive(&options)) + 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)) 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 " "'--preserve-merges'"); - argv_array_push(&options.git_am_opts, "--signoff"); + strvec_push(&options.git_am_opts, "--signoff"); options.flags |= REBASE_FORCE; } @@ -1833,15 +1820,6 @@ 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; @@ -1872,7 +1850,9 @@ 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) @@ -1882,12 +1862,22 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) } /* Make sure the branch to rebase onto is valid. */ - if (!options.onto_name) + 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) options.onto_name = options.upstream_name; if (strstr(options.onto_name, "...")) { - if (get_oid_mb(options.onto_name, &merge_base) < 0) - die(_("'%s': need exactly one merge base"), - 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); + } options.onto = lookup_commit_or_die(&merge_base, options.onto_name); } else { @@ -1912,10 +1902,11 @@ 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)) + if (!read_ref(buf.buf, &options.orig_head)) { + die_if_checked_out(buf.buf, 1); 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'"), @@ -1953,60 +1944,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) die(_("could not read index")); if (options.autostash) { - struct lock_file lock_file = LOCK_INIT; - int fd; - - fd = hold_locked_index(&lock_file, 0); - refresh_cache(REFRESH_QUIET); - if (0 <= fd) - repo_update_index_if_able(the_repository, &lock_file); - rollback_lock_file(&lock_file); - - if (has_unstaged_changes(the_repository, 1) || - has_uncommitted_changes(the_repository, 1)) { - const char *autostash = - 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); - stash.git_cmd = 1; - stash.no_stdin = 1; - strbuf_reset(&buf); - if (capture_command(&stash, &buf, GIT_MAX_HEXSZ)) - die(_("Cannot autostash")); - strbuf_trim_trailing_newline(&buf); - if (get_oid(buf.buf, &oid)) - die(_("Unexpected stash response: '%s'"), - buf.buf); - strbuf_reset(&buf); - strbuf_add_unique_abbrev(&buf, &oid, DEFAULT_ABBREV); - - if (safe_create_leading_directories_const(autostash)) - die(_("Could not create directory for '%s'"), - options.state_dir); - write_file(autostash, "%s", oid_to_hex(&oid)); - printf(_("Created autostash: %s\n"), buf.buf); - 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) - die(_("could not read index")); - } + create_autostash(the_repository, state_dir_path("autostash", &options), + DEFAULT_REFLOG_ACTION); } if (require_clean_work_tree(the_repository, "rebase", @@ -2022,34 +1961,30 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) /* * Check if we are already based on onto with linear history, - * but this should be done only when upstream and onto are the same - * and if this is not an interactive rebase. + * 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. */ - 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)) { + if (can_fast_forward(options.onto, options.upstream, options.restrict_revision, + &options.orig_head, &merge_base) && + allow_preemptive_ff) { 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(&oid, "checkout", + if (reset_head(the_repository, + &options.orig_head, "checkout", options.head_name, RESET_HEAD_RUN_POST_CHECKOUT_HOOK, - NULL, buf.buf) < 0) { + NULL, buf.buf, + DEFAULT_REFLOG_ACTION) < 0) { ret = !!error(_("could not switch to " "%s"), options.switch_to); @@ -2111,7 +2046,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) diff_flush(&opts); } - if (is_interactive(&options)) + if (is_merge(&options)) goto run_rebase; /* Detach HEAD and reset the tree */ @@ -2121,10 +2056,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) strbuf_addf(&msg, "%s: checkout %s", getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name); - if (reset_head(&options.onto->object.oid, "checkout", NULL, + if (reset_head(the_repository, &options.onto->object.oid, "checkout", NULL, RESET_HEAD_DETACH | RESET_ORIG_HEAD | RESET_HEAD_RUN_POST_CHECKOUT_HOOK, - NULL, msg.buf)) + NULL, msg.buf, DEFAULT_REFLOG_ACTION)) die(_("Could not detach HEAD")); strbuf_release(&msg); @@ -2139,8 +2074,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) strbuf_addf(&msg, "rebase finished: %s onto %s", options.head_name ? options.head_name : "detached HEAD", oid_to_hex(&options.onto->object.oid)); - reset_head(NULL, "Fast-forwarded", options.head_name, - RESET_HEAD_REFS_ONLY, "HEAD", msg.buf); + reset_head(the_repository, NULL, "Fast-forwarded", options.head_name, + RESET_HEAD_REFS_ONLY, "HEAD", msg.buf, + DEFAULT_REFLOG_ACTION); strbuf_release(&msg); ret = !!finish_rebase(&options); goto cleanup; diff --git a/third_party/git/builtin/receive-pack.c b/third_party/git/builtin/receive-pack.c index dcf385511f..bb9909c52e 100644 --- a/third_party/git/builtin/receive-pack.c +++ b/third_party/git/builtin/receive-pack.c @@ -13,9 +13,9 @@ #include "remote.h" #include "connect.h" #include "string-list.h" -#include "sha1-array.h" +#include "oid-array.h" #include "connected.h" -#include "argv-array.h" +#include "strvec.h" #include "version.h" #include "tag.h" #include "gpg-interface.h" @@ -27,6 +27,8 @@ #include "object-store.h" #include "protocol.h" #include "commit-reach.h" +#include "worktree.h" +#include "shallow.h" static const char * const receive_pack_usage[] = { N_("git receive-pack <git-dir>"), @@ -55,6 +57,7 @@ static int advertise_push_options; static int unpack_limit = 100; static off_t max_input_size; static int report_status; +static int report_status_v2; static int use_sideband; static int use_atomic; static int use_push_options; @@ -95,6 +98,17 @@ static int keepalive_in_sec = 5; static struct tmp_objdir *tmp_objdir; +static struct proc_receive_ref { + unsigned int want_add:1, + want_delete:1, + want_modify:1, + negative_ref:1; + char *ref_prefix; + struct proc_receive_ref *next; +} *proc_receive_ref; + +static void proc_receive_ref_append(const char *prefix); + static enum deny_action parse_deny_action(const char *var, const char *value) { if (value) { @@ -227,6 +241,13 @@ static int receive_pack_config(const char *var, const char *value, void *cb) return 0; } + if (strcmp(var, "receive.procreceiverefs") == 0) { + if (!value) + return config_error_nonbool(var); + proc_receive_ref_append(value); + return 0; + } + return git_default_config(var, value, cb); } @@ -238,7 +259,7 @@ static void show_ref(const char *path, const struct object_id *oid) struct strbuf cap = STRBUF_INIT; strbuf_addstr(&cap, - "report-status delete-refs side-band-64k quiet"); + "report-status report-status-v2 delete-refs side-band-64k quiet"); if (advertise_atomic_push) strbuf_addstr(&cap, " atomic"); if (prefer_ofs_delta) @@ -247,6 +268,7 @@ static void show_ref(const char *path, const struct object_id *oid) strbuf_addf(&cap, " push-cert=%s", push_cert_nonce); if (advertise_push_options) strbuf_addstr(&cap, " push-options"); + strbuf_addf(&cap, " object-format=%s", the_hash_algo->name); strbuf_addf(&cap, " agent=%s", git_user_agent_sanitized()); packet_write_fmt(1, "%s %s%c%s\n", oid_to_hex(oid), path, 0, cap.buf); @@ -307,17 +329,94 @@ static void write_head_info(void) packet_flush(1); } +#define RUN_PROC_RECEIVE_SCHEDULED 1 +#define RUN_PROC_RECEIVE_RETURNED 2 struct command { struct command *next; const char *error_string; + struct ref_push_report *report; unsigned int skip_update:1, - did_not_exist:1; + did_not_exist:1, + run_proc_receive:2; int index; struct object_id old_oid; struct object_id new_oid; char ref_name[FLEX_ARRAY]; /* more */ }; +static void proc_receive_ref_append(const char *prefix) +{ + struct proc_receive_ref *ref_pattern; + char *p; + int len; + + ref_pattern = xcalloc(1, sizeof(struct proc_receive_ref)); + p = strchr(prefix, ':'); + if (p) { + while (prefix < p) { + if (*prefix == 'a') + ref_pattern->want_add = 1; + else if (*prefix == 'd') + ref_pattern->want_delete = 1; + else if (*prefix == 'm') + ref_pattern->want_modify = 1; + else if (*prefix == '!') + ref_pattern->negative_ref = 1; + prefix++; + } + prefix++; + } else { + ref_pattern->want_add = 1; + ref_pattern->want_delete = 1; + ref_pattern->want_modify = 1; + } + len = strlen(prefix); + while (len && prefix[len - 1] == '/') + len--; + ref_pattern->ref_prefix = xmemdupz(prefix, len); + if (!proc_receive_ref) { + proc_receive_ref = ref_pattern; + } else { + struct proc_receive_ref *end; + + end = proc_receive_ref; + while (end->next) + end = end->next; + end->next = ref_pattern; + } +} + +static int proc_receive_ref_matches(struct command *cmd) +{ + struct proc_receive_ref *p; + + if (!proc_receive_ref) + return 0; + + for (p = proc_receive_ref; p; p = p->next) { + const char *match = p->ref_prefix; + const char *remains; + + if (!p->want_add && is_null_oid(&cmd->old_oid)) + continue; + else if (!p->want_delete && is_null_oid(&cmd->new_oid)) + continue; + else if (!p->want_modify && + !is_null_oid(&cmd->old_oid) && + !is_null_oid(&cmd->new_oid)) + continue; + + if (skip_prefix(cmd->ref_name, match, &remains) && + (!*remains || *remains == '/')) { + if (!p->negative_ref) + return 1; + } else if (p->negative_ref) { + return 1; + } + } + return 0; +} + static void rp_error(const char *err, ...) __attribute__((format (printf, 1, 2))); static void rp_warning(const char *err, ...) __attribute__((format (printf, 1, 2))); @@ -417,24 +516,22 @@ static int copy_to_sideband(int in, int out, void *arg) return 0; } -#define HMAC_BLOCK_SIZE 64 - -static void hmac_sha1(unsigned char *out, +static void hmac_hash(unsigned char *out, const char *key_in, size_t key_len, const char *text, size_t text_len) { - unsigned char key[HMAC_BLOCK_SIZE]; - unsigned char k_ipad[HMAC_BLOCK_SIZE]; - unsigned char k_opad[HMAC_BLOCK_SIZE]; + unsigned char key[GIT_MAX_BLKSZ]; + unsigned char k_ipad[GIT_MAX_BLKSZ]; + unsigned char k_opad[GIT_MAX_BLKSZ]; int i; - git_SHA_CTX ctx; + git_hash_ctx ctx; /* RFC 2104 2. (1) */ - 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); + 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); } else { memcpy(key, key_in, key_len); } @@ -446,29 +543,29 @@ static void hmac_sha1(unsigned char *out, } /* RFC 2104 2. (3) & (4) */ - 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); + 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); /* RFC 2104 2. (6) & (7) */ - 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); + 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); } static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp) { struct strbuf buf = STRBUF_INIT; - unsigned char sha1[GIT_SHA1_RAWSZ]; + unsigned char hash[GIT_MAX_RAWSZ]; strbuf_addf(&buf, "%s:%"PRItime, path, stamp); - hmac_sha1(sha1, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed)); + hmac_hash(hash, 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, GIT_SHA1_HEXSZ, sha1_to_hex(sha1)); + /* RFC 2104 5. HMAC-SHA1 or HMAC-SHA256 */ + strbuf_addf(&buf, "%"PRItime"-%.*s", stamp, (int)the_hash_algo->hexsz, hash_to_hex(hash)); return strbuf_detach(&buf, NULL); } @@ -500,12 +597,27 @@ static char *find_header(const char *msg, size_t len, const char *key, return NULL; } +/* + * Return zero if a and b are equal up to n bytes and nonzero if they are not. + * This operation is guaranteed to run in constant time to avoid leaking data. + */ +static int constant_memequal(const char *a, const char *b, size_t n) +{ + int res = 0; + size_t i; + + for (i = 0; i < n; i++) + res |= a[i] ^ b[i]; + return res; +} + static const char *check_nonce(const char *buf, size_t len) { char *nonce = find_header(buf, len, "nonce", NULL); timestamp_t stamp, ostamp; char *bohmac, *expect = NULL; const char *retval = NONCE_BAD; + size_t noncelen; if (!nonce) { retval = NONCE_MISSING; @@ -547,8 +659,14 @@ static const char *check_nonce(const char *buf, size_t len) goto leave; } + noncelen = strlen(nonce); expect = prepare_push_cert_nonce(service_dir, stamp); - if (strcmp(expect, nonce)) { + if (noncelen != strlen(expect)) { + /* This is not even the right size. */ + retval = NONCE_BAD; + goto leave; + } + if (constant_memequal(expect, nonce, noncelen)) { /* Not what we would have signed earlier */ retval = NONCE_BAD; goto leave; @@ -645,31 +763,32 @@ static void prepare_push_cert_sha1(struct child_process *proc) nonce_status = check_nonce(push_cert.buf, bogs); } if (!is_null_oid(&push_cert_oid)) { - argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT=%s", - oid_to_hex(&push_cert_oid)); - argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT_SIGNER=%s", - sigcheck.signer ? sigcheck.signer : ""); - argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT_KEY=%s", - sigcheck.key ? sigcheck.key : ""); - argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT_STATUS=%c", - sigcheck.result); + strvec_pushf(&proc->env_array, "GIT_PUSH_CERT=%s", + oid_to_hex(&push_cert_oid)); + strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_SIGNER=%s", + sigcheck.signer ? sigcheck.signer : ""); + strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_KEY=%s", + sigcheck.key ? sigcheck.key : ""); + strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_STATUS=%c", + sigcheck.result); if (push_cert_nonce) { - argv_array_pushf(&proc->env_array, - "GIT_PUSH_CERT_NONCE=%s", - push_cert_nonce); - argv_array_pushf(&proc->env_array, - "GIT_PUSH_CERT_NONCE_STATUS=%s", - nonce_status); + strvec_pushf(&proc->env_array, + "GIT_PUSH_CERT_NONCE=%s", + push_cert_nonce); + strvec_pushf(&proc->env_array, + "GIT_PUSH_CERT_NONCE_STATUS=%s", + nonce_status); if (nonce_status == NONCE_SLOP) - argv_array_pushf(&proc->env_array, - "GIT_PUSH_CERT_NONCE_SLOP=%ld", - nonce_stamp_slop); + strvec_pushf(&proc->env_array, + "GIT_PUSH_CERT_NONCE_SLOP=%ld", + nonce_stamp_slop); } } } struct receive_hook_feed_state { struct command *cmd; + struct ref_push_report *report; int skip_broken; struct strbuf buf; const struct string_list *push_options; @@ -698,16 +817,16 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, if (feed_state->push_options) { int i; for (i = 0; i < feed_state->push_options->nr; i++) - argv_array_pushf(&proc.env_array, - "GIT_PUSH_OPTION_%d=%s", i, - feed_state->push_options->items[i].string); - argv_array_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT=%d", - feed_state->push_options->nr); + strvec_pushf(&proc.env_array, + "GIT_PUSH_OPTION_%d=%s", i, + feed_state->push_options->items[i].string); + strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT=%d", + feed_state->push_options->nr); } else - argv_array_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT"); + strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT"); if (tmp_objdir) - argv_array_pushv(&proc.env_array, tmp_objdir_env(tmp_objdir)); + strvec_pushv(&proc.env_array, tmp_objdir_env(tmp_objdir)); if (use_sideband) { memset(&muxer, 0, sizeof(muxer)); @@ -757,11 +876,31 @@ static int feed_receive_hook(void *state_, const char **bufp, size_t *sizep) cmd = cmd->next; if (!cmd) return -1; /* EOF */ + if (!bufp) + return 0; /* OK, can feed something. */ strbuf_reset(&state->buf); - strbuf_addf(&state->buf, "%s %s %s\n", - oid_to_hex(&cmd->old_oid), oid_to_hex(&cmd->new_oid), - cmd->ref_name); - state->cmd = cmd->next; + if (!state->report) + state->report = cmd->report; + if (state->report) { + struct object_id *old_oid; + struct object_id *new_oid; + const char *ref_name; + + old_oid = state->report->old_oid ? state->report->old_oid : &cmd->old_oid; + new_oid = state->report->new_oid ? state->report->new_oid : &cmd->new_oid; + ref_name = state->report->ref_name ? state->report->ref_name : cmd->ref_name; + strbuf_addf(&state->buf, "%s %s %s\n", + oid_to_hex(old_oid), oid_to_hex(new_oid), + ref_name); + state->report = state->report->next; + if (!state->report) + state->cmd = cmd->next; + } else { + strbuf_addf(&state->buf, "%s %s %s\n", + oid_to_hex(&cmd->old_oid), oid_to_hex(&cmd->new_oid), + cmd->ref_name); + state->cmd = cmd->next; + } if (bufp) { *bufp = state->buf.buf; *sizep = state->buf.len; @@ -780,6 +919,7 @@ static int run_receive_hook(struct command *commands, strbuf_init(&state.buf, 0); state.cmd = commands; state.skip_broken = skip_broken; + state.report = NULL; if (feed_receive_hook(&state, NULL, NULL)) return 0; state.cmd = commands; @@ -818,14 +958,266 @@ static int run_update_hook(struct command *cmd) return finish_command(&proc); } -static int is_ref_checked_out(const char *ref) +static struct command *find_command_by_refname(struct command *list, + const char *refname) { - if (is_bare_repository()) - return 0; + for (; list; list = list->next) + if (!strcmp(list->ref_name, refname)) + return list; + return NULL; +} - if (!head_name) - return 0; - return !strcmp(head_name, ref); +static int read_proc_receive_report(struct packet_reader *reader, + struct command *commands, + struct strbuf *errmsg) +{ + struct command *cmd; + struct command *hint = NULL; + struct ref_push_report *report = NULL; + int new_report = 0; + int code = 0; + int once = 0; + + for (;;) { + struct object_id old_oid, new_oid; + const char *head; + const char *refname; + char *p; + + if (packet_reader_read(reader) != PACKET_READ_NORMAL) + break; + + head = reader->line; + p = strchr(head, ' '); + if (!p) { + strbuf_addf(errmsg, "proc-receive reported incomplete status line: '%s'\n", head); + code = -1; + continue; + } + *p++ = '\0'; + if (!strcmp(head, "option")) { + const char *key, *val; + + if (!hint || !(report || new_report)) { + if (!once++) + strbuf_addstr(errmsg, "proc-receive reported 'option' without a matching 'ok/ng' directive\n"); + code = -1; + continue; + } + if (new_report) { + if (!hint->report) { + hint->report = xcalloc(1, sizeof(struct ref_push_report)); + report = hint->report; + } else { + report = hint->report; + while (report->next) + report = report->next; + report->next = xcalloc(1, sizeof(struct ref_push_report)); + report = report->next; + } + new_report = 0; + } + key = p; + p = strchr(key, ' '); + if (p) + *p++ = '\0'; + val = p; + if (!strcmp(key, "refname")) + report->ref_name = xstrdup_or_null(val); + else if (!strcmp(key, "old-oid") && val && + !parse_oid_hex(val, &old_oid, &val)) + report->old_oid = oiddup(&old_oid); + else if (!strcmp(key, "new-oid") && val && + !parse_oid_hex(val, &new_oid, &val)) + report->new_oid = oiddup(&new_oid); + else if (!strcmp(key, "forced-update")) + report->forced_update = 1; + else if (!strcmp(key, "fall-through")) + /* Fall through, let 'receive-pack' to execute it. */ + hint->run_proc_receive = 0; + continue; + } + + report = NULL; + new_report = 0; + refname = p; + p = strchr(refname, ' '); + if (p) + *p++ = '\0'; + if (strcmp(head, "ok") && strcmp(head, "ng")) { + strbuf_addf(errmsg, "proc-receive reported bad status '%s' on ref '%s'\n", + head, refname); + code = -1; + continue; + } + + /* first try searching at our hint, falling back to all refs */ + if (hint) + hint = find_command_by_refname(hint, refname); + if (!hint) + hint = find_command_by_refname(commands, refname); + if (!hint) { + strbuf_addf(errmsg, "proc-receive reported status on unknown ref: %s\n", + refname); + code = -1; + continue; + } + if (!hint->run_proc_receive) { + strbuf_addf(errmsg, "proc-receive reported status on unexpected ref: %s\n", + refname); + code = -1; + continue; + } + hint->run_proc_receive |= RUN_PROC_RECEIVE_RETURNED; + if (!strcmp(head, "ng")) { + if (p) + hint->error_string = xstrdup(p); + else + hint->error_string = "failed"; + code = -1; + continue; + } + new_report = 1; + } + + for (cmd = commands; cmd; cmd = cmd->next) + if (cmd->run_proc_receive && !cmd->error_string && + !(cmd->run_proc_receive & RUN_PROC_RECEIVE_RETURNED)) { + cmd->error_string = "proc-receive failed to report status"; + code = -1; + } + return code; +} + +static int run_proc_receive_hook(struct command *commands, + const struct string_list *push_options) +{ + struct child_process proc = CHILD_PROCESS_INIT; + struct async muxer; + struct command *cmd; + const char *argv[2]; + struct packet_reader reader; + struct strbuf cap = STRBUF_INIT; + struct strbuf errmsg = STRBUF_INIT; + int hook_use_push_options = 0; + int version = 0; + int code; + + argv[0] = find_hook("proc-receive"); + if (!argv[0]) { + rp_error("cannot find hook 'proc-receive'"); + return -1; + } + argv[1] = NULL; + + proc.argv = argv; + proc.in = -1; + proc.out = -1; + proc.trace2_hook_name = "proc-receive"; + + if (use_sideband) { + memset(&muxer, 0, sizeof(muxer)); + muxer.proc = copy_to_sideband; + muxer.in = -1; + code = start_async(&muxer); + if (code) + return code; + proc.err = muxer.in; + } else { + proc.err = 0; + } + + code = start_command(&proc); + if (code) { + if (use_sideband) + finish_async(&muxer); + return code; + } + + sigchain_push(SIGPIPE, SIG_IGN); + + /* Version negotiaton */ + packet_reader_init(&reader, proc.out, NULL, 0, + PACKET_READ_CHOMP_NEWLINE | + PACKET_READ_GENTLE_ON_EOF); + if (use_atomic) + strbuf_addstr(&cap, " atomic"); + if (use_push_options) + strbuf_addstr(&cap, " push-options"); + if (cap.len) { + packet_write_fmt(proc.in, "version=1%c%s\n", '\0', cap.buf + 1); + strbuf_release(&cap); + } else { + packet_write_fmt(proc.in, "version=1\n"); + } + packet_flush(proc.in); + + for (;;) { + int linelen; + + if (packet_reader_read(&reader) != PACKET_READ_NORMAL) + break; + + if (reader.pktlen > 8 && starts_with(reader.line, "version=")) { + version = atoi(reader.line + 8); + linelen = strlen(reader.line); + if (linelen < reader.pktlen) { + const char *feature_list = reader.line + linelen + 1; + if (parse_feature_request(feature_list, "push-options")) + hook_use_push_options = 1; + } + } + } + + if (version != 1) { + strbuf_addf(&errmsg, "proc-receive version '%d' is not supported", + version); + code = -1; + goto cleanup; + } + + /* Send commands */ + for (cmd = commands; cmd; cmd = cmd->next) { + if (!cmd->run_proc_receive || cmd->skip_update || cmd->error_string) + continue; + packet_write_fmt(proc.in, "%s %s %s", + oid_to_hex(&cmd->old_oid), + oid_to_hex(&cmd->new_oid), + cmd->ref_name); + } + packet_flush(proc.in); + + /* Send push options */ + if (hook_use_push_options) { + struct string_list_item *item; + + for_each_string_list_item(item, push_options) + packet_write_fmt(proc.in, "%s", item->string); + packet_flush(proc.in); + } + + /* Read result from proc-receive */ + code = read_proc_receive_report(&reader, commands, &errmsg); + +cleanup: + close(proc.in); + close(proc.out); + if (use_sideband) + finish_async(&muxer); + if (finish_command(&proc)) + code = -1; + if (errmsg.len >0) { + char *p = errmsg.buf; + + p += errmsg.len - 1; + if (*p == '\n') + *p = '\0'; + rp_error("%s", errmsg.buf); + strbuf_release(&errmsg); + } + sigchain_pop(SIGPIPE); + + return code; } static char *refuse_unconfigured_deny_msg = @@ -866,7 +1258,7 @@ static void refuse_unconfigured_deny_delete_current(void) static int command_singleton_iterator(void *cb_data, struct object_id *oid); static int update_shallow_ref(struct command *cmd, struct shallow_info *si) { - struct lock_file shallow_lock = LOCK_INIT; + struct shallow_lock shallow_lock = SHALLOW_LOCK_INIT; struct oid_array extra = OID_ARRAY_INIT; struct check_connected_options opt = CHECK_CONNECTED_INIT; uint32_t mask = 1 << (cmd->index % 32); @@ -883,12 +1275,12 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si) opt.env = tmp_objdir_env(tmp_objdir); setup_alternate_shallow(&shallow_lock, &opt.shallow_file, &extra); if (check_connected(command_singleton_iterator, cmd, &opt)) { - rollback_lock_file(&shallow_lock); + rollback_shallow_file(the_repository, &shallow_lock); oid_array_clear(&extra); return -1; } - commit_lock_file(&shallow_lock); + commit_shallow_file(the_repository, &shallow_lock); /* * Make sure setup_alternate_shallow() for the next ref does @@ -919,7 +1311,7 @@ static int head_has_history(void) } static const char *push_to_deploy(unsigned char *sha1, - struct argv_array *env, + struct strvec *env, const char *work_tree) { const char *update_refresh[] = { @@ -938,7 +1330,7 @@ static const char *push_to_deploy(unsigned char *sha1, struct child_process child = CHILD_PROCESS_INIT; child.argv = update_refresh; - child.env = env->argv; + child.env = env->v; child.dir = work_tree; child.no_stdin = 1; child.stdout_to_stderr = 1; @@ -949,7 +1341,7 @@ static const char *push_to_deploy(unsigned char *sha1, /* run_command() does not clean up completely; reinitialize */ child_process_init(&child); child.argv = diff_files; - child.env = env->argv; + child.env = env->v; child.dir = work_tree; child.no_stdin = 1; child.stdout_to_stderr = 1; @@ -962,7 +1354,7 @@ static const char *push_to_deploy(unsigned char *sha1, child_process_init(&child); child.argv = diff_index; - child.env = env->argv; + child.env = env->v; child.no_stdin = 1; child.no_stdout = 1; child.stdout_to_stderr = 0; @@ -970,10 +1362,10 @@ static const char *push_to_deploy(unsigned char *sha1, if (run_command(&child)) return "Working directory has staged changes"; - read_tree[3] = sha1_to_hex(sha1); + read_tree[3] = hash_to_hex(sha1); child_process_init(&child); child.argv = read_tree; - child.env = env->argv; + child.env = env->v; child.dir = work_tree; child.no_stdin = 1; child.no_stdout = 1; @@ -987,35 +1379,45 @@ 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 *sha1, - struct argv_array *env, +static const char *push_to_checkout(unsigned char *hash, + struct strvec *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, - sha1_to_hex(sha1), NULL)) + strvec_pushf(env, "GIT_WORK_TREE=%s", absolute_path(work_tree)); + if (run_hook_le(env->v, push_to_checkout_hook, + hash_to_hex(hash), NULL)) return "push-to-checkout hook declined"; else return NULL; } -static const char *update_worktree(unsigned char *sha1) +static const char *update_worktree(unsigned char *sha1, const struct worktree *worktree) { - const char *retval; - const char *work_tree = git_work_tree_cfg ? git_work_tree_cfg : ".."; - struct argv_array env = ARGV_ARRAY_INIT; + const char *retval, *work_tree, *git_dir = NULL; + struct strvec env = STRVEC_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(get_git_dir())); + strvec_pushf(&env, "GIT_DIR=%s", absolute_path(git_dir)); if (!find_hook(push_to_checkout_hook)) retval = push_to_deploy(sha1, &env, work_tree); else retval = push_to_checkout(sha1, &env, work_tree); - argv_array_clear(&env); + strvec_clear(&env); return retval; } @@ -1028,6 +1430,7 @@ 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 +1442,7 @@ static const char *update(struct command *cmd, struct shallow_info *si) free(namespaced_name); namespaced_name = strbuf_detach(&namespaced_name_buf, NULL); - if (is_ref_checked_out(namespaced_name)) { + if (worktree) { switch (deny_current_branch) { case DENY_IGNORE: break; @@ -1071,7 +1474,7 @@ static const char *update(struct command *cmd, struct shallow_info *si) return "deletion prohibited"; } - if (head_name && !strcmp(namespaced_name, head_name)) { + if (worktree || (head_name && !strcmp(namespaced_name, head_name))) { switch (deny_delete_current) { case DENY_IGNORE: break; @@ -1120,7 +1523,7 @@ static const char *update(struct command *cmd, struct shallow_info *si) } if (do_update_worktree) { - ret = update_worktree(new_oid->hash); + ret = update_worktree(new_oid->hash, find_shared_symref("HEAD", name)); if (ret) return ret; } @@ -1182,11 +1585,11 @@ static void run_update_post_hook(struct command *commands) for (cmd = commands; cmd; cmd = cmd->next) { if (cmd->error_string || cmd->did_not_exist) continue; - if (!proc.args.argc) - argv_array_push(&proc.args, hook); - argv_array_push(&proc.args, cmd->ref_name); + if (!proc.args.nr) + strvec_push(&proc.args, hook); + strvec_push(&proc.args, cmd->ref_name); } - if (!proc.args.argc) + if (!proc.args.nr) return; proc.no_stdin = 1; @@ -1392,7 +1795,7 @@ static void execute_commands_non_atomic(struct command *commands, struct strbuf err = STRBUF_INIT; for (cmd = commands; cmd; cmd = cmd->next) { - if (!should_process_cmd(cmd)) + if (!should_process_cmd(cmd) || cmd->run_proc_receive) continue; transaction = ref_transaction_begin(&err); @@ -1432,7 +1835,7 @@ static void execute_commands_atomic(struct command *commands, } for (cmd = commands; cmd; cmd = cmd->next) { - if (!should_process_cmd(cmd)) + if (!should_process_cmd(cmd) || cmd->run_proc_receive) continue; cmd->error_string = update(cmd, si); @@ -1468,6 +1871,7 @@ static void execute_commands(struct command *commands, struct iterate_data data; struct async muxer; int err_fd = 0; + int run_proc_receive = 0; if (unpacker_error) { for (cmd = commands; cmd; cmd = cmd->next) @@ -1497,6 +1901,22 @@ static void execute_commands(struct command *commands, reject_updates_to_hidden(commands); + /* + * Try to find commands that have special prefix in their reference names, + * and mark them to run an external "proc-receive" hook later. + */ + if (proc_receive_ref) { + for (cmd = commands; cmd; cmd = cmd->next) { + if (!should_process_cmd(cmd)) + continue; + + if (proc_receive_ref_matches(cmd)) { + cmd->run_proc_receive = RUN_PROC_RECEIVE_SCHEDULED; + run_proc_receive = 1; + } + } + } + if (run_receive_hook(commands, "pre-receive", 0, push_options)) { for (cmd = commands; cmd; cmd = cmd->next) { if (!cmd->error_string) @@ -1523,6 +1943,14 @@ static void execute_commands(struct command *commands, free(head_name_to_free); head_name = head_name_to_free = resolve_refdup("HEAD", 0, NULL, NULL); + if (run_proc_receive && + run_proc_receive_hook(commands, push_options)) + for (cmd = commands; cmd; cmd = cmd->next) + if (!cmd->error_string && + !(cmd->run_proc_receive & RUN_PROC_RECEIVE_RETURNED) && + (cmd->run_proc_receive || use_atomic)) + cmd->error_string = "fail to run proc-receive hook"; + if (use_atomic) execute_commands_atomic(commands, si); else @@ -1602,8 +2030,12 @@ static struct command *read_head_info(struct packet_reader *reader, linelen = strlen(reader->line); if (linelen < reader->pktlen) { const char *feature_list = reader->line + linelen + 1; + const char *hash = NULL; + int len = 0; if (parse_feature_request(feature_list, "report-status")) report_status = 1; + if (parse_feature_request(feature_list, "report-status-v2")) + report_status_v2 = 1; if (parse_feature_request(feature_list, "side-band-64k")) use_sideband = LARGE_PACKET_MAX; if (parse_feature_request(feature_list, "quiet")) @@ -1614,6 +2046,13 @@ static struct command *read_head_info(struct packet_reader *reader, if (advertise_push_options && parse_feature_request(feature_list, "push-options")) use_push_options = 1; + hash = parse_feature_value(feature_list, "object-format", &len, NULL); + if (!hash) { + hash = hash_algos[GIT_HASH_SHA1].name; + len = strlen(hash); + } + if (xstrncmpz(the_hash_algo->name, hash, len)) + die("error: unsupported object format '%s'", hash); } if (!strcmp(reader->line, "push-cert")) { @@ -1683,10 +2122,10 @@ static const char *parse_pack_header(struct pack_header *hdr) static const char *pack_lockfile; -static void push_header_arg(struct argv_array *args, struct pack_header *hdr) +static void push_header_arg(struct strvec *args, struct pack_header *hdr) { - argv_array_pushf(args, "--pack_header=%"PRIu32",%"PRIu32, - ntohl(hdr->hdr_version), ntohl(hdr->hdr_entries)); + strvec_pushf(args, "--pack_header=%"PRIu32",%"PRIu32, + ntohl(hdr->hdr_version), ntohl(hdr->hdr_entries)); } static const char *unpack(int err_fd, struct shallow_info *si) @@ -1710,8 +2149,8 @@ static const char *unpack(int err_fd, struct shallow_info *si) if (si->nr_ours || si->nr_theirs) { alt_shallow_file = setup_temporary_shallow(si->shallow); - argv_array_push(&child.args, "--shallow-file"); - argv_array_push(&child.args, alt_shallow_file); + strvec_push(&child.args, "--shallow-file"); + strvec_push(&child.args, alt_shallow_file); } tmp_objdir = tmp_objdir_create(); @@ -1730,16 +2169,16 @@ static const char *unpack(int err_fd, struct shallow_info *si) tmp_objdir_add_as_alternate(tmp_objdir); if (ntohl(hdr.hdr_entries) < unpack_limit) { - argv_array_push(&child.args, "unpack-objects"); + strvec_push(&child.args, "unpack-objects"); push_header_arg(&child.args, &hdr); if (quiet) - argv_array_push(&child.args, "-q"); + strvec_push(&child.args, "-q"); if (fsck_objects) - argv_array_pushf(&child.args, "--strict%s", - fsck_msg_types.buf); + strvec_pushf(&child.args, "--strict%s", + fsck_msg_types.buf); if (max_input_size) - argv_array_pushf(&child.args, "--max-input-size=%"PRIuMAX, - (uintmax_t)max_input_size); + strvec_pushf(&child.args, "--max-input-size=%"PRIuMAX, + (uintmax_t)max_input_size); child.no_stdout = 1; child.err = err_fd; child.git_cmd = 1; @@ -1749,28 +2188,28 @@ static const char *unpack(int err_fd, struct shallow_info *si) } else { char hostname[HOST_NAME_MAX + 1]; - argv_array_pushl(&child.args, "index-pack", "--stdin", NULL); + strvec_pushl(&child.args, "index-pack", "--stdin", NULL); push_header_arg(&child.args, &hdr); if (xgethostname(hostname, sizeof(hostname))) xsnprintf(hostname, sizeof(hostname), "localhost"); - argv_array_pushf(&child.args, - "--keep=receive-pack %"PRIuMAX" on %s", - (uintmax_t)getpid(), - hostname); + strvec_pushf(&child.args, + "--keep=receive-pack %"PRIuMAX" on %s", + (uintmax_t)getpid(), + hostname); if (!quiet && err_fd) - argv_array_push(&child.args, "--show-resolving-progress"); + strvec_push(&child.args, "--show-resolving-progress"); if (use_sideband) - argv_array_push(&child.args, "--report-end-of-input"); + strvec_push(&child.args, "--report-end-of-input"); if (fsck_objects) - argv_array_pushf(&child.args, "--strict%s", - fsck_msg_types.buf); + strvec_pushf(&child.args, "--strict%s", + fsck_msg_types.buf); if (!reject_thin) - argv_array_push(&child.args, "--fix-thin"); + strvec_push(&child.args, "--fix-thin"); if (max_input_size) - argv_array_pushf(&child.args, "--max-input-size=%"PRIuMAX, - (uintmax_t)max_input_size); + strvec_pushf(&child.args, "--max-input-size=%"PRIuMAX, + (uintmax_t)max_input_size); child.out = -1; child.err = err_fd; child.git_cmd = 1; @@ -1915,6 +2354,51 @@ static void report(struct command *commands, const char *unpack_status) strbuf_release(&buf); } +static void report_v2(struct command *commands, const char *unpack_status) +{ + struct command *cmd; + struct strbuf buf = STRBUF_INIT; + struct ref_push_report *report; + + packet_buf_write(&buf, "unpack %s\n", + unpack_status ? unpack_status : "ok"); + for (cmd = commands; cmd; cmd = cmd->next) { + int count = 0; + + if (cmd->error_string) { + packet_buf_write(&buf, "ng %s %s\n", + cmd->ref_name, + cmd->error_string); + continue; + } + packet_buf_write(&buf, "ok %s\n", + cmd->ref_name); + for (report = cmd->report; report; report = report->next) { + if (count++ > 0) + packet_buf_write(&buf, "ok %s\n", + cmd->ref_name); + if (report->ref_name) + packet_buf_write(&buf, "option refname %s\n", + report->ref_name); + if (report->old_oid) + packet_buf_write(&buf, "option old-oid %s\n", + oid_to_hex(report->old_oid)); + if (report->new_oid) + packet_buf_write(&buf, "option new-oid %s\n", + oid_to_hex(report->new_oid)); + if (report->forced_update) + packet_buf_write(&buf, "option forced-update\n"); + } + } + packet_buf_flush(&buf); + + if (use_sideband) + send_sideband(1, 1, buf.buf, buf.len, use_sideband); + else + write_or_die(1, buf.buf, buf.len); + strbuf_release(&buf); +} + static int delete_only(struct command *commands) { struct command *cmd; @@ -2023,7 +2507,9 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) &push_options); if (pack_lockfile) unlink_or_warn(pack_lockfile); - if (report_status) + if (report_status_v2) + report_v2(commands, unpack_status); + else if (report_status) report(commands, unpack_status); run_receive_hook(commands, "post-receive", 1, &push_options); diff --git a/third_party/git/builtin/reflog.c b/third_party/git/builtin/reflog.c index 4d3430900d..ca1d8079f3 100644 --- a/third_party/git/builtin/reflog.c +++ b/third_party/git/builtin/reflog.c @@ -459,7 +459,7 @@ static struct reflog_expire_cfg *find_cfg_ent(const char *pattern, size_t len) static int reflog_expire_config(const char *var, const char *value, void *cb) { const char *pattern, *key; - int pattern_len; + size_t pattern_len; timestamp_t expire; int slot; struct reflog_expire_cfg *ent; @@ -560,15 +560,16 @@ 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 (starts_with(arg, "--expire=")) { - if (parse_expiry_date(arg + 9, &cb.cmd.expire_total)) + else if (skip_prefix(arg, "--expire=", &arg)) { + if (parse_expiry_date(arg, &cb.cmd.expire_total)) die(_("'%s' is not a valid timestamp"), arg); explicit_expiry |= EXPIRE_TOTAL; } - else if (starts_with(arg, "--expire-unreachable=")) { - if (parse_expiry_date(arg + 21, &cb.cmd.expire_unreachable)) + else if (skip_prefix(arg, "--expire-unreachable=", &arg)) { + if (parse_expiry_date(arg, &cb.cmd.expire_unreachable)) die(_("'%s' is not a valid timestamp"), arg); explicit_expiry |= EXPIRE_UNREACH; } @@ -614,7 +615,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix) int i; memset(&collected, 0, sizeof(collected)); - worktrees = get_worktrees(0); + worktrees = get_worktrees(); for (p = worktrees; *p; p++) { if (!all_worktrees && !(*p)->is_current) continue; diff --git a/third_party/git/builtin/remote-ext.c b/third_party/git/builtin/remote-ext.c index 6a9127a33c..fd3538d4f0 100644 --- a/third_party/git/builtin/remote-ext.c +++ b/third_party/git/builtin/remote-ext.c @@ -117,12 +117,12 @@ static char *strip_escapes(const char *str, const char *service, } } -static void parse_argv(struct argv_array *out, const char *arg, const char *service) +static void parse_argv(struct strvec *out, const char *arg, const char *service) { while (*arg) { char *expanded = strip_escapes(arg, service, &arg); if (expanded) - argv_array_push(out, expanded); + strvec_push(out, expanded); free(expanded); } } diff --git a/third_party/git/builtin/remote.c b/third_party/git/builtin/remote.c index 5591cef775..64b4b551eb 100644 --- a/third_party/git/builtin/remote.c +++ b/third_party/git/builtin/remote.c @@ -6,10 +6,11 @@ #include "string-list.h" #include "strbuf.h" #include "run-command.h" +#include "rebase.h" #include "refs.h" #include "refspec.h" #include "object-store.h" -#include "argv-array.h" +#include "strvec.h" #include "commit-reach.h" static const char * const builtin_remote_usage[] = { @@ -169,9 +170,9 @@ static int add(int argc, const char **argv) OPT_STRING_LIST('t', "track", &track, N_("branch"), N_("branch(es) to track")), OPT_STRING('m', "master", &master, N_("branch"), N_("master branch")), - { OPTION_CALLBACK, 0, "mirror", &mirror, "(push|fetch)", + OPT_CALLBACK_F(0, "mirror", &mirror, "(push|fetch)", N_("set up remote as a mirror to push to or fetch from"), - PARSE_OPT_OPTARG | PARSE_OPT_COMP_ARG, parse_mirror_opt }, + PARSE_OPT_OPTARG | PARSE_OPT_COMP_ARG, parse_mirror_opt), OPT_END() }; @@ -248,9 +249,8 @@ static int add(int argc, const char **argv) struct branch_info { char *remote_name; struct string_list merge; - enum { - NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE, REBASE_MERGES - } rebase; + enum rebase_type rebase; + char *push_remote_name; }; static struct string_list branch_list = STRING_LIST_INIT_NODUP; @@ -264,59 +264,69 @@ static const char *abbrev_ref(const char *name, const char *prefix) static int config_read_branches(const char *key, const char *value, void *cb) { - 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; + 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; - item = string_list_insert(&branch_list, name); + if (!starts_with(key, "branch.")) + return 0; - 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; + 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, ' '); } + 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; } @@ -468,6 +478,7 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map; struct refspec_item refspec; + memset(&refspec, 0, sizeof(refspec)); refspec.force = 0; refspec.pattern = 1; refspec.src = refspec.dst = "refs/heads/*"; @@ -605,6 +616,56 @@ 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[] = { @@ -680,6 +741,11 @@ 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) @@ -693,9 +759,8 @@ 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, &oid, &flag); + read_ref_full(item->string, RESOLVE_REF_READING, NULL, &flag); if (!(flag & REF_ISSYMREF)) continue; if (delete_ref(NULL, item->string, NULL, REF_NO_DEREF)) @@ -736,6 +801,9 @@ 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; } @@ -782,6 +850,13 @@ 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); + } } /* @@ -814,6 +889,8 @@ 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; @@ -944,7 +1021,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) + if (branch_info->rebase >= REBASE_TRUE) show_info->any_rebase = 1; item = string_list_insert(show_info->list, branch_item->string); @@ -961,16 +1038,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 && branch_info->merge.nr > 1) { + if (branch_info->rebase >= REBASE_TRUE && 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) { + if (branch_info->rebase >= REBASE_TRUE) { const char *msg; - if (branch_info->rebase == INTERACTIVE_REBASE) + if (branch_info->rebase == REBASE_INTERACTIVE) msg = _("rebases interactively onto remote %s"); else if (branch_info->rebase == REBASE_MERGES) msg = _("rebases interactively (with merges) onto " @@ -1279,7 +1356,7 @@ static int set_head(int argc, const char **argv) result |= error(_("Not a valid ref: %s"), buf2.buf); else if (create_symref(buf.buf, buf2.buf, "remote set-head")) result |= error(_("Could not setup %s"), buf.buf); - if (opt_a) + else if (opt_a) printf("%s/HEAD set to %s\n", argv[0], head_name); free(head_name); } @@ -1375,35 +1452,35 @@ static int update(int argc, const char **argv) N_("prune remotes after fetching")), OPT_END() }; - struct argv_array fetch_argv = ARGV_ARRAY_INIT; + struct strvec fetch_argv = STRVEC_INIT; int default_defined = 0; int retval; argc = parse_options(argc, argv, NULL, options, builtin_remote_update_usage, PARSE_OPT_KEEP_ARGV0); - argv_array_push(&fetch_argv, "fetch"); + strvec_push(&fetch_argv, "fetch"); if (prune != -1) - argv_array_push(&fetch_argv, prune ? "--prune" : "--no-prune"); + strvec_push(&fetch_argv, prune ? "--prune" : "--no-prune"); if (verbose) - argv_array_push(&fetch_argv, "-v"); - argv_array_push(&fetch_argv, "--multiple"); + strvec_push(&fetch_argv, "-v"); + strvec_push(&fetch_argv, "--multiple"); if (argc < 2) - argv_array_push(&fetch_argv, "default"); + strvec_push(&fetch_argv, "default"); for (i = 1; i < argc; i++) - argv_array_push(&fetch_argv, argv[i]); + strvec_push(&fetch_argv, argv[i]); - if (strcmp(fetch_argv.argv[fetch_argv.argc-1], "default") == 0) { + if (strcmp(fetch_argv.v[fetch_argv.nr-1], "default") == 0) { git_config(get_remote_default, &default_defined); if (!default_defined) { - argv_array_pop(&fetch_argv); - argv_array_push(&fetch_argv, "--all"); + strvec_pop(&fetch_argv); + strvec_push(&fetch_argv, "--all"); } } - retval = run_command_v_opt(fetch_argv.argv, RUN_GIT_CMD); - argv_array_clear(&fetch_argv); + retval = run_command_v_opt(fetch_argv.v, RUN_GIT_CMD); + strvec_clear(&fetch_argv); return retval; } diff --git a/third_party/git/builtin/repack.c b/third_party/git/builtin/repack.c index 632c0c0a79..01e7767c79 100644 --- a/third_party/git/builtin/repack.c +++ b/third_party/git/builtin/repack.c @@ -7,10 +7,13 @@ #include "sigchain.h" #include "strbuf.h" #include "string-list.h" -#include "argv-array.h" +#include "strvec.h" #include "midx.h" #include "packfile.h" +#include "prune-packed.h" #include "object-store.h" +#include "promisor-remote.h" +#include "shallow.h" static int delta_base_offset = 1; static int pack_kept_objects = -1; @@ -130,7 +133,11 @@ static void get_non_kept_pack_filenames(struct string_list *fname_list, static void remove_redundant_pack(const char *dir_name, const char *base_name) { struct strbuf buf = STRBUF_INIT; - strbuf_addf(&buf, "%s/%s.pack", dir_name, base_name); + struct multi_pack_index *m = get_local_multi_pack_index(the_repository); + strbuf_addf(&buf, "%s.pack", base_name); + if (m && midx_contains_pack(m, buf.buf)) + clear_midx_file(the_repository); + strbuf_insertf(&buf, 0, "%s/", dir_name); unlink_pack_path(buf.buf, 1); strbuf_release(&buf); } @@ -150,28 +157,28 @@ struct pack_objects_args { static void prepare_pack_objects(struct child_process *cmd, const struct pack_objects_args *args) { - argv_array_push(&cmd->args, "pack-objects"); + strvec_push(&cmd->args, "pack-objects"); if (args->window) - argv_array_pushf(&cmd->args, "--window=%s", args->window); + strvec_pushf(&cmd->args, "--window=%s", args->window); if (args->window_memory) - argv_array_pushf(&cmd->args, "--window-memory=%s", args->window_memory); + strvec_pushf(&cmd->args, "--window-memory=%s", args->window_memory); if (args->depth) - argv_array_pushf(&cmd->args, "--depth=%s", args->depth); + strvec_pushf(&cmd->args, "--depth=%s", args->depth); if (args->threads) - argv_array_pushf(&cmd->args, "--threads=%s", args->threads); + strvec_pushf(&cmd->args, "--threads=%s", args->threads); if (args->max_pack_size) - argv_array_pushf(&cmd->args, "--max-pack-size=%s", args->max_pack_size); + strvec_pushf(&cmd->args, "--max-pack-size=%s", args->max_pack_size); if (args->no_reuse_delta) - argv_array_pushf(&cmd->args, "--no-reuse-delta"); + strvec_pushf(&cmd->args, "--no-reuse-delta"); if (args->no_reuse_object) - argv_array_pushf(&cmd->args, "--no-reuse-object"); + strvec_pushf(&cmd->args, "--no-reuse-object"); if (args->local) - argv_array_push(&cmd->args, "--local"); + strvec_push(&cmd->args, "--local"); if (args->quiet) - argv_array_push(&cmd->args, "--quiet"); + strvec_push(&cmd->args, "--quiet"); if (delta_base_offset) - argv_array_push(&cmd->args, "--delta-base-offset"); - argv_array_push(&cmd->args, packtmp); + strvec_push(&cmd->args, "--delta-base-offset"); + strvec_push(&cmd->args, packtmp); cmd->git_cmd = 1; cmd->out = -1; } @@ -190,7 +197,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), GIT_SHA1_HEXSZ); + xwrite(cmd->in, oid_to_hex(oid), the_hash_algo->hexsz); xwrite(cmd->in, "\n", 1); return 0; } @@ -232,6 +239,13 @@ 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); @@ -276,7 +290,6 @@ int cmd_repack(int argc, const char **argv, const char *prefix) int keep_unreachable = 0; struct string_list keep_pack_list = STRING_LIST_INIT_NODUP; int no_update_server_info = 0; - int midx_cleared = 0; struct pack_objects_args po_args = {NULL}; struct option builtin_repack_options[] = { @@ -351,24 +364,24 @@ int cmd_repack(int argc, const char **argv, const char *prefix) prepare_pack_objects(&cmd, &po_args); - argv_array_push(&cmd.args, "--keep-true-parents"); + strvec_push(&cmd.args, "--keep-true-parents"); if (!pack_kept_objects) - argv_array_push(&cmd.args, "--honor-pack-keep"); + strvec_push(&cmd.args, "--honor-pack-keep"); for (i = 0; i < keep_pack_list.nr; i++) - argv_array_pushf(&cmd.args, "--keep-pack=%s", - keep_pack_list.items[i].string); - argv_array_push(&cmd.args, "--non-empty"); - argv_array_push(&cmd.args, "--all"); - argv_array_push(&cmd.args, "--reflog"); - argv_array_push(&cmd.args, "--indexed-objects"); - if (repository_format_partial_clone) - argv_array_push(&cmd.args, "--exclude-promisor-objects"); + strvec_pushf(&cmd.args, "--keep-pack=%s", + keep_pack_list.items[i].string); + strvec_push(&cmd.args, "--non-empty"); + strvec_push(&cmd.args, "--all"); + strvec_push(&cmd.args, "--reflog"); + strvec_push(&cmd.args, "--indexed-objects"); + if (has_promisor_remote()) + strvec_push(&cmd.args, "--exclude-promisor-objects"); if (write_bitmaps > 0) - argv_array_push(&cmd.args, "--write-bitmap-index"); + strvec_push(&cmd.args, "--write-bitmap-index"); else if (write_bitmaps < 0) - argv_array_push(&cmd.args, "--write-bitmap-index-quiet"); + strvec_push(&cmd.args, "--write-bitmap-index-quiet"); if (use_delta_islands) - argv_array_push(&cmd.args, "--delta-islands"); + strvec_push(&cmd.args, "--delta-islands"); if (pack_everything & ALL_INTO_ONE) { get_non_kept_pack_filenames(&existing_packs, &keep_pack_list); @@ -377,23 +390,23 @@ int cmd_repack(int argc, const char **argv, const char *prefix) if (existing_packs.nr && delete_redundant) { if (unpack_unreachable) { - argv_array_pushf(&cmd.args, - "--unpack-unreachable=%s", - unpack_unreachable); - argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1"); + strvec_pushf(&cmd.args, + "--unpack-unreachable=%s", + unpack_unreachable); + strvec_push(&cmd.env_array, "GIT_REF_PARANOIA=1"); } else if (pack_everything & LOOSEN_UNREACHABLE) { - argv_array_push(&cmd.args, - "--unpack-unreachable"); + strvec_push(&cmd.args, + "--unpack-unreachable"); } else if (keep_unreachable) { - argv_array_push(&cmd.args, "--keep-unreachable"); - argv_array_push(&cmd.args, "--pack-loose-unreachable"); + strvec_push(&cmd.args, "--keep-unreachable"); + strvec_push(&cmd.args, "--pack-loose-unreachable"); } else { - argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1"); + strvec_push(&cmd.env_array, "GIT_REF_PARANOIA=1"); } } } else { - argv_array_push(&cmd.args, "--unpacked"); - argv_array_push(&cmd.args, "--incremental"); + strvec_push(&cmd.args, "--unpacked"); + strvec_push(&cmd.args, "--incremental"); } cmd.no_stdin = 1; @@ -429,11 +442,6 @@ int cmd_repack(int argc, const char **argv, const char *prefix) for (ext = 0; ext < ARRAY_SIZE(exts); ext++) { char *fname, *fname_old; - if (!midx_cleared) { - clear_midx_file(the_repository); - midx_cleared = 1; - } - fname = mkpathdup("%s/pack-%s%s", packdir, item->string, exts[ext].name); if (!file_exists(fname)) { @@ -561,7 +569,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()); + write_midx_file(get_object_directory(), 0); 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 644b21ca8d..cd48765911 100644 --- a/third_party/git/builtin/replace.c +++ b/third_party/git/builtin/replace.c @@ -228,13 +228,13 @@ static int export_object(const struct object_id *oid, enum object_type type, if (fd < 0) return error_errno(_("unable to open %s for writing"), filename); - argv_array_push(&cmd.args, "--no-replace-objects"); - argv_array_push(&cmd.args, "cat-file"); + strvec_push(&cmd.args, "--no-replace-objects"); + strvec_push(&cmd.args, "cat-file"); if (raw) - argv_array_push(&cmd.args, type_name(type)); + strvec_push(&cmd.args, type_name(type)); else - argv_array_push(&cmd.args, "-p"); - argv_array_push(&cmd.args, oid_to_hex(oid)); + strvec_push(&cmd.args, "-p"); + strvec_push(&cmd.args, oid_to_hex(oid)); cmd.git_cmd = 1; cmd.out = fd; @@ -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, 41) < 0) { + if (strbuf_read(&result, cmd.out, the_hash_algo->hexsz + 1) < 0) { error_errno(_("unable to read from mktree")); close(fd); close(cmd.out); @@ -358,14 +358,15 @@ 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 += GIT_SHA1_HEXSZ + 6; /* "tree " + "hex sha1" + "\n" */ + parent_start += hexsz + 6; /* "tree " + "hex sha1" + "\n" */ parent_end = parent_start; while (starts_with(parent_end, "parent ")) - parent_end += 48; /* "parent " + "hex sha1" + "\n" */ + parent_end += hexsz + 8; /* "parent " + "hex sha1" + "\n" */ /* prepare new parents */ for (i = 0; i < argc; i++) { @@ -408,7 +409,8 @@ static int check_one_mergetag(struct commit *commit, struct tag *tag; int i; - hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &tag_oid); + hash_object_file(the_hash_algo, 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); @@ -421,7 +423,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(&tag->tagged->oid, &oid)) + if (oideq(get_tagged_oid(tag), &oid)) return 0; /* found */ } @@ -500,7 +502,7 @@ static int convert_graft_file(int force) const char *graft_file = get_graft_file(the_repository); FILE *fp = fopen_or_warn(graft_file, "r"); struct strbuf buf = STRBUF_INIT, err = STRBUF_INIT; - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; if (!fp) return -1; @@ -510,10 +512,10 @@ static int convert_graft_file(int force) if (*buf.buf == '#') continue; - argv_array_split(&args, buf.buf); - if (args.argc && create_graft(args.argc, args.argv, force, 1)) + strvec_split(&args, buf.buf); + if (args.nr && create_graft(args.nr, args.v, force, 1)) strbuf_addf(&err, "\n\t%s", buf.buf); - argv_array_clear(&args); + strvec_clear(&args); } fclose(fp); diff --git a/third_party/git/builtin/reset.c b/third_party/git/builtin/reset.c index fdd572168b..c635b062c3 100644 --- a/third_party/git/builtin/reset.c +++ b/third_party/git/builtin/reset.c @@ -30,8 +30,9 @@ static const char * const git_reset_usage[] = { N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"), - N_("git reset [-q] [<tree-ish>] [--] <paths>..."), - N_("git reset --patch [<tree-ish>] [--] [<paths>...]"), + 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>...]"), NULL }; @@ -45,7 +46,7 @@ static inline int is_merge(void) return !access(git_path_merge_head(the_repository), F_OK); } -static int reset_index(const struct object_id *oid, int reset_type, int quiet) +static int reset_index(const char *ref, const struct object_id *oid, int reset_type, int quiet) { int i, nr = 0; struct tree_desc desc[2]; @@ -59,6 +60,7 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet) opts.dst_index = &the_index; opts.fn = oneway_merge; opts.merge = 1; + init_checkout_metadata(&opts.meta, ref, oid, NULL); if (!quiet) opts.verbose_update = 1; switch (reset_type) { @@ -284,8 +286,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, unborn; - const char *rev; + int patch_mode = 0, pathspec_file_nul = 0, unborn; + const char *rev, *pathspec_from_file = NULL; struct object_id oid; struct pathspec pathspec; int intent_to_add = 0; @@ -300,12 +302,14 @@ int cmd_reset(int argc, const char **argv, const char *prefix) N_("reset HEAD, index and working tree"), MERGE), OPT_SET_INT(0, "keep", &reset_type, N_("reset HEAD but keep local changes"), KEEP), - { OPTION_CALLBACK, 0, "recurse-submodules", NULL, + OPT_CALLBACK_F(0, "recurse-submodules", NULL, "reset", "control recursive updating of submodules", - PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater }, + PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater), 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() }; @@ -316,11 +320,25 @@ 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) { + } else if (!pathspec.nr && !patch_mode) { struct commit *commit; if (get_oid_committish(rev, &oid)) die(_("Failed to resolve '%s' as a valid revision."), rev); @@ -401,11 +419,20 @@ int cmd_reset(int argc, const char **argv, const char *prefix) } } } else { - int err = reset_index(&oid, reset_type, quiet); + struct object_id dummy; + char *ref = NULL; + int err; + + dwim_ref(rev, strlen(rev), &dummy, &ref, 0); + if (ref && !starts_with(ref, "refs/")) + ref = NULL; + + err = reset_index(ref, &oid, reset_type, quiet); if (reset_type == KEEP && !err) - err = reset_index(&oid, MIXED, quiet); + err = reset_index(ref, &oid, MIXED, quiet); if (err) die(_("Could not reset index file to revision '%s'."), rev); + free(ref); } if (write_locked_index(&the_index, &lock, COMMIT_LOCK)) diff --git a/third_party/git/builtin/rev-list.c b/third_party/git/builtin/rev-list.c index 301ccb970b..25c6c3b38d 100644 --- a/third_party/git/builtin/rev-list.c +++ b/third_party/git/builtin/rev-list.c @@ -18,7 +18,6 @@ #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" @@ -254,11 +253,26 @@ 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 @@ -365,6 +379,79 @@ 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; @@ -471,10 +558,6 @@ 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))) { @@ -526,8 +609,10 @@ 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 (filter_options.choice && use_bitmap_index) - die(_("cannot combine --use-bitmap-index with object filtering")); + 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")); save_commit_buffer = (revs.verbose_header || revs.grep_filter.pattern_list || @@ -538,28 +623,11 @@ 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 && !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 (use_bitmap_index) { + if (!try_bitmap_count(&revs, &filter_options)) + return 0; + if (!try_bitmap_traversal(&revs, &filter_options)) + return 0; } if (prepare_revision_walk(&revs)) @@ -569,8 +637,15 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) if (bisect_list) { int reaches, all; + unsigned bisect_flags = 0; + + if (bisect_find_all) + bisect_flags |= FIND_BISECTION_ALL; + + if (revs.first_parent_only) + bisect_flags |= FIND_BISECTION_FIRST_PARENT_ONLY; - find_bisection(&revs.commits, &reaches, &all, bisect_find_all); + find_bisection(&revs.commits, &reaches, &all, bisect_flags); if (bisect_show_vars) return show_bisect_vars(&info, reaches, all); diff --git a/third_party/git/builtin/rev-parse.c b/third_party/git/builtin/rev-parse.c index f8bbe6d47e..ed200c8af1 100644 --- a/third_party/git/builtin/rev-parse.c +++ b/third_party/git/builtin/rev-parse.c @@ -16,6 +16,7 @@ #include "split-index.h" #include "submodule.h" #include "commit-reach.h" +#include "shallow.h" #define DO_REVS 1 #define DO_NOREV 2 @@ -135,7 +136,7 @@ static void show_rev(int type, const struct object_id *oid, const char *name) struct object_id discard; char *full; - switch (dwim_ref(name, strlen(name), &discard, &full)) { + switch (dwim_ref(name, strlen(name), &discard, &full, 0)) { case 0: /* * Not found -- not a ref. We could @@ -593,6 +594,7 @@ 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); @@ -730,8 +732,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 (40 <= abbrev) - abbrev = 40; + else if (hexsz <= abbrev) + abbrev = hexsz; continue; } if (!strcmp(arg, "--sq")) { @@ -802,12 +804,15 @@ 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")) { - const char *superproject = get_superproject_working_tree(); - if (superproject) - puts(superproject); + struct strbuf superproject = STRBUF_INIT; + if (get_superproject_working_tree(&superproject)) + puts(superproject.buf); + strbuf_release(&superproject); continue; } if (!strcmp(arg, "--show-prefix")) { @@ -854,7 +859,10 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) if (!gitdir && !prefix) gitdir = ".git"; if (gitdir) { - puts(real_path(gitdir)); + struct strbuf realpath = STRBUF_INIT; + strbuf_realpath(&realpath, gitdir, 1); + puts(realpath.buf); + strbuf_release(&realpath); continue; } } @@ -918,6 +926,17 @@ 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 19ce95a901..4858631e0f 100644 --- a/third_party/git/builtin/rm.c +++ b/third_party/git/builtin/rm.c @@ -235,7 +235,8 @@ 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; +static int ignore_unmatch = 0, pathspec_file_nul; +static char *pathspec_from_file; static struct option builtin_rm_options[] = { OPT__DRY_RUN(&show_only, N_("dry run")), @@ -245,6 +246,8 @@ 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(), }; @@ -259,8 +262,24 @@ int cmd_rm(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, builtin_rm_options, builtin_rm_usage, 0); - if (!argc) - usage_with_options(builtin_rm_usage, builtin_rm_options); + + 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 (!index_only) setup_work_tree(); @@ -270,9 +289,6 @@ 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/send-pack.c b/third_party/git/builtin/send-pack.c index 098ebf22d0..7af148d733 100644 --- a/third_party/git/builtin/send-pack.c +++ b/third_party/git/builtin/send-pack.c @@ -11,7 +11,7 @@ #include "quote.h" #include "transport.h" #include "version.h" -#include "sha1-array.h" +#include "oid-array.h" #include "gpg-interface.h" #include "gettext.h" #include "protocol.h" @@ -29,10 +29,12 @@ static struct send_pack_args args; static void print_helper_status(struct ref *ref) { struct strbuf buf = STRBUF_INIT; + struct ref_push_report *report; for (; ref; ref = ref->next) { const char *msg = NULL; const char *res; + int count = 0; switch(ref->status) { case REF_STATUS_NONE: @@ -94,6 +96,23 @@ static void print_helper_status(struct ref *ref) } strbuf_addch(&buf, '\n'); + if (ref->status == REF_STATUS_OK) { + for (report = ref->report; report; report = report->next) { + if (count++ > 0) + strbuf_addf(&buf, "ok %s\n", ref->name); + if (report->ref_name) + strbuf_addf(&buf, "option refname %s\n", + report->ref_name); + if (report->old_oid) + strbuf_addf(&buf, "option old-oid %s\n", + oid_to_hex(report->old_oid)); + if (report->new_oid) + strbuf_addf(&buf, "option new-oid %s\n", + oid_to_hex(report->new_oid)); + if (report->forced_update) + strbuf_addstr(&buf, "option forced-update\n"); + } + } write_or_die(1, buf.buf, buf.len); } strbuf_release(&buf); @@ -165,9 +184,8 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) OPT_BOOL('n' , "dry-run", &dry_run, N_("dry run")), OPT_BOOL(0, "mirror", &send_mirror, N_("mirror all refs")), OPT_BOOL('f', "force", &force_update, N_("force updates")), - { OPTION_CALLBACK, - 0, "signed", &push_cert, "(yes|no|if-asked)", N_("GPG sign the push"), - PARSE_OPT_OPTARG, option_parse_push_signed }, + OPT_CALLBACK_F(0, "signed", &push_cert, "(yes|no|if-asked)", N_("GPG sign the push"), + PARSE_OPT_OPTARG, option_parse_push_signed), OPT_STRING_LIST(0, "push-option", &push_options, N_("server-specific"), N_("option to transmit")), @@ -177,10 +195,9 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "stateless-rpc", &stateless_rpc, N_("use stateless RPC protocol")), OPT_BOOL(0, "stdin", &from_stdin, N_("read refs from stdin")), OPT_BOOL(0, "helper-status", &helper_status, N_("print status from remote helper")), - { OPTION_CALLBACK, - 0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"), + OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"), N_("require old value of ref to be at this value"), - PARSE_OPT_OPTARG, parseopt_push_cas_option }, + PARSE_OPT_OPTARG, parseopt_push_cas_option), OPT_END() }; diff --git a/third_party/git/builtin/shortlog.c b/third_party/git/builtin/shortlog.c index 65cd41392c..0a5c4968f6 100644 --- a/third_party/git/builtin/shortlog.c +++ b/third_party/git/builtin/shortlog.c @@ -9,6 +9,7 @@ #include "mailmap.h" #include "shortlog.h" #include "parse-options.h" +#include "trailer.h" static char const * const shortlog_usage[] = { N_("git shortlog [<options>] [<revision-range>] [[--] <path>...]"), @@ -49,12 +50,12 @@ static int compare_by_list(const void *a1, const void *a2) } static void insert_one_record(struct shortlog *log, - const char *author, + const char *ident, const char *oneline) { struct string_list_item *item; - item = string_list_insert(&log->list, author); + item = string_list_insert(&log->list, ident); if (log->summary) item->util = (void *)(UTIL_TO_INT(item) + 1); @@ -97,8 +98,8 @@ static void insert_one_record(struct shortlog *log, } } -static int parse_stdin_author(struct shortlog *log, - struct strbuf *out, const char *in) +static int parse_ident(struct shortlog *log, + struct strbuf *out, const char *in) { const char *mailbuf, *namebuf; size_t namelen, maillen; @@ -122,18 +123,33 @@ static int parse_stdin_author(struct shortlog *log, static void read_from_stdin(struct shortlog *log) { - struct strbuf author = STRBUF_INIT; - struct strbuf mapped_author = STRBUF_INIT; + struct strbuf ident = STRBUF_INIT; + struct strbuf mapped_ident = STRBUF_INIT; struct strbuf oneline = STRBUF_INIT; static const char *author_match[2] = { "Author: ", "author " }; static const char *committer_match[2] = { "Commit: ", "committer " }; const char **match; - match = log->committer ? committer_match : author_match; - while (strbuf_getline_lf(&author, stdin) != EOF) { + if (HAS_MULTI_BITS(log->groups)) + die(_("using multiple --group options with stdin is not supported")); + + switch (log->groups) { + case SHORTLOG_GROUP_AUTHOR: + match = author_match; + break; + case SHORTLOG_GROUP_COMMITTER: + match = committer_match; + break; + case SHORTLOG_GROUP_TRAILER: + die(_("using --group=trailer with stdin is not supported")); + default: + BUG("unhandled shortlog group"); + } + + while (strbuf_getline_lf(&ident, stdin) != EOF) { const char *v; - if (!skip_prefix(author.buf, match[0], &v) && - !skip_prefix(author.buf, match[1], &v)) + if (!skip_prefix(ident.buf, match[0], &v) && + !skip_prefix(ident.buf, match[1], &v)) continue; while (strbuf_getline_lf(&oneline, stdin) != EOF && oneline.len) @@ -142,23 +158,118 @@ static void read_from_stdin(struct shortlog *log) !oneline.len) ; /* discard blanks */ - strbuf_reset(&mapped_author); - if (parse_stdin_author(log, &mapped_author, v) < 0) + strbuf_reset(&mapped_ident); + if (parse_ident(log, &mapped_ident, v) < 0) continue; - insert_one_record(log, mapped_author.buf, oneline.buf); + insert_one_record(log, mapped_ident.buf, oneline.buf); } - strbuf_release(&author); - strbuf_release(&mapped_author); + strbuf_release(&ident); + strbuf_release(&mapped_ident); strbuf_release(&oneline); } +struct strset_item { + struct hashmap_entry ent; + char value[FLEX_ARRAY]; +}; + +struct strset { + struct hashmap map; +}; + +#define STRSET_INIT { { NULL } } + +static int strset_item_hashcmp(const void *hash_data, + const struct hashmap_entry *entry, + const struct hashmap_entry *entry_or_key, + const void *keydata) +{ + const struct strset_item *a, *b; + + a = container_of(entry, const struct strset_item, ent); + if (keydata) + return strcmp(a->value, keydata); + + b = container_of(entry_or_key, const struct strset_item, ent); + return strcmp(a->value, b->value); +} + +/* + * Adds "str" to the set if it was not already present; returns true if it was + * already there. + */ +static int strset_check_and_add(struct strset *ss, const char *str) +{ + unsigned int hash = strhash(str); + struct strset_item *item; + + if (!ss->map.table) + hashmap_init(&ss->map, strset_item_hashcmp, NULL, 0); + + if (hashmap_get_from_hash(&ss->map, hash, str)) + return 1; + + FLEX_ALLOC_STR(item, value, str); + hashmap_entry_init(&item->ent, hash); + hashmap_add(&ss->map, &item->ent); + return 0; +} + +static void strset_clear(struct strset *ss) +{ + if (!ss->map.table) + return; + hashmap_free_entries(&ss->map, struct strset_item, ent); +} + +static void insert_records_from_trailers(struct shortlog *log, + struct strset *dups, + struct commit *commit, + struct pretty_print_context *ctx, + const char *oneline) +{ + struct trailer_iterator iter; + const char *commit_buffer, *body; + struct strbuf ident = STRBUF_INIT; + + /* + * Using format_commit_message("%B") would be simpler here, but + * this saves us copying the message. + */ + commit_buffer = logmsg_reencode(commit, NULL, ctx->output_encoding); + body = strstr(commit_buffer, "\n\n"); + if (!body) + return; + + trailer_iterator_init(&iter, body); + while (trailer_iterator_advance(&iter)) { + const char *value = iter.val.buf; + + if (!string_list_has_string(&log->trailers, iter.key.buf)) + continue; + + strbuf_reset(&ident); + if (!parse_ident(log, &ident, value)) + value = ident.buf; + + if (strset_check_and_add(dups, value)) + continue; + insert_one_record(log, value, oneline); + } + trailer_iterator_release(&iter); + + strbuf_release(&ident); + unuse_commit_buffer(commit, commit_buffer); +} + void shortlog_add_commit(struct shortlog *log, struct commit *commit) { - struct strbuf author = STRBUF_INIT; + struct strbuf ident = STRBUF_INIT; struct strbuf oneline = STRBUF_INIT; + struct strset dups = STRSET_INIT; struct pretty_print_context ctx = {0}; - const char *fmt; + const char *oneline_str; ctx.fmt = CMIT_FMT_USERFORMAT; ctx.abbrev = log->abbrev; @@ -166,21 +277,38 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit) ctx.date_mode.type = DATE_NORMAL; ctx.output_encoding = get_log_output_encoding(); - fmt = log->committer ? - (log->email ? "%cN <%cE>" : "%cN") : - (log->email ? "%aN <%aE>" : "%aN"); - - format_commit_message(commit, fmt, &author, &ctx); if (!log->summary) { if (log->user_format) pretty_print_commit(&ctx, commit, &oneline); else format_commit_message(commit, "%s", &oneline, &ctx); } + oneline_str = oneline.len ? oneline.buf : "<none>"; + + if (log->groups & SHORTLOG_GROUP_AUTHOR) { + strbuf_reset(&ident); + format_commit_message(commit, + log->email ? "%aN <%aE>" : "%aN", + &ident, &ctx); + if (!HAS_MULTI_BITS(log->groups) || + !strset_check_and_add(&dups, ident.buf)) + insert_one_record(log, ident.buf, oneline_str); + } + if (log->groups & SHORTLOG_GROUP_COMMITTER) { + strbuf_reset(&ident); + format_commit_message(commit, + log->email ? "%cN <%cE>" : "%cN", + &ident, &ctx); + if (!HAS_MULTI_BITS(log->groups) || + !strset_check_and_add(&dups, ident.buf)) + insert_one_record(log, ident.buf, oneline_str); + } + if (log->groups & SHORTLOG_GROUP_TRAILER) { + insert_records_from_trailers(log, &dups, commit, &ctx, oneline_str); + } - insert_one_record(log, author.buf, oneline.len ? oneline.buf : "<none>"); - - strbuf_release(&author); + strset_clear(&dups); + strbuf_release(&ident); strbuf_release(&oneline); } @@ -241,6 +369,28 @@ static int parse_wrap_args(const struct option *opt, const char *arg, int unset) return 0; } +static int parse_group_option(const struct option *opt, const char *arg, int unset) +{ + struct shortlog *log = opt->value; + const char *field; + + if (unset) { + log->groups = 0; + string_list_clear(&log->trailers, 0); + } else if (!strcasecmp(arg, "author")) + log->groups |= SHORTLOG_GROUP_AUTHOR; + else if (!strcasecmp(arg, "committer")) + log->groups |= SHORTLOG_GROUP_COMMITTER; + else if (skip_prefix(arg, "trailer:", &field)) { + log->groups |= SHORTLOG_GROUP_TRAILER; + string_list_append(&log->trailers, field); + } else + return error(_("unknown group type: %s"), arg); + + return 0; +} + + void shortlog_init(struct shortlog *log) { memset(log, 0, sizeof(*log)); @@ -251,6 +401,8 @@ void shortlog_init(struct shortlog *log) log->wrap = DEFAULT_WRAPLEN; log->in1 = DEFAULT_INDENT1; log->in2 = DEFAULT_INDENT2; + log->trailers.strdup_strings = 1; + log->trailers.cmp = strcasecmp; } int cmd_shortlog(int argc, const char **argv, const char *prefix) @@ -260,17 +412,20 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix) int nongit = !startup_info->have_repository; const struct option options[] = { - OPT_BOOL('c', "committer", &log.committer, - N_("Group by committer rather than author")), + OPT_BIT('c', "committer", &log.groups, + N_("Group by committer rather than author"), + SHORTLOG_GROUP_COMMITTER), OPT_BOOL('n', "numbered", &log.sort_by_number, N_("sort output according to the number of commits per author")), OPT_BOOL('s', "summary", &log.summary, N_("Suppress commit descriptions, only provides commit count")), OPT_BOOL('e', "email", &log.email, N_("Show the email address of each author")), - { OPTION_CALLBACK, 'w', NULL, &log, N_("<w>[,<i1>[,<i2>]]"), + OPT_CALLBACK_F('w', NULL, &log, N_("<w>[,<i1>[,<i2>]]"), N_("Linewrap output"), PARSE_OPT_OPTARG, - &parse_wrap_args }, + &parse_wrap_args), + OPT_CALLBACK(0, "group", &log, N_("field"), + N_("Group by field"), parse_group_option), OPT_END(), }; @@ -311,6 +466,10 @@ parse_done: log.abbrev = rev.abbrev; log.file = rev.diffopt.file; + if (!log.groups) + log.groups = SHORTLOG_GROUP_AUTHOR; + string_list_sort(&log.trailers); + /* assume HEAD if from a tty */ if (!nongit && !rev.pending.nr && isatty(0)) add_head_to_pending(&rev); diff --git a/third_party/git/builtin/show-branch.c b/third_party/git/builtin/show-branch.c index 35d7f51c23..d6d2dabeca 100644 --- a/third_party/git/builtin/show-branch.c +++ b/third_party/git/builtin/show-branch.c @@ -4,7 +4,7 @@ #include "refs.h" #include "builtin.h" #include "color.h" -#include "argv-array.h" +#include "strvec.h" #include "parse-options.h" #include "dir.h" #include "commit-slab.h" @@ -20,7 +20,7 @@ static const char* show_branch_usage[] = { static int showbranch_use_color = -1; -static struct argv_array default_args = ARGV_ARRAY_INIT; +static struct strvec default_args = STRVEC_INIT; /* * TODO: convert this use of commit->object.flags to commit-slab @@ -536,7 +536,7 @@ static void append_one_rev(const char *av) append_ref(av, &revkey, 0); return; } - if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) { + if (strpbrk(av, "*?[")) { /* glob style match */ int saved_matches = ref_name_cnt; @@ -561,9 +561,9 @@ static int git_show_branch_config(const char *var, const char *value, void *cb) * default_arg is now passed to parse_options(), so we need to * mimic the real argv a bit better. */ - if (!default_args.argc) - argv_array_push(&default_args, "show-branch"); - argv_array_push(&default_args, value); + if (!default_args.nr) + strvec_push(&default_args, "show-branch"); + strvec_push(&default_args, value); return 0; } @@ -671,11 +671,11 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) N_("topologically sort, maintaining date order " "where possible"), REV_SORT_BY_COMMIT_DATE), - { OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("<n>[,<base>]"), + OPT_CALLBACK_F('g', "reflog", &reflog_base, N_("<n>[,<base>]"), N_("show <n> most recent ref-log entries starting at " "base"), PARSE_OPT_OPTARG | PARSE_OPT_NONEG, - parse_reflog_param }, + parse_reflog_param), OPT_END() }; @@ -684,9 +684,9 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) git_config(git_show_branch_config, NULL); /* If nothing is specified, try the default first */ - if (ac == 1 && default_args.argc) { - ac = default_args.argc; - av = default_args.argv; + if (ac == 1 && default_args.nr) { + ac = default_args.nr; + av = default_args.v; } ac = parse_options(ac, av, prefix, builtin_show_branch_options, @@ -741,7 +741,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) die(Q_("only %d entry can be shown at one time.", "only %d entries can be shown at one time.", MAX_REVS), MAX_REVS); - if (!dwim_ref(*av, strlen(*av), &oid, &ref)) + if (!dwim_ref(*av, strlen(*av), &oid, &ref, 0)) die(_("no such ref %s"), *av); /* Has the base been specified? */ diff --git a/third_party/git/builtin/show-index.c b/third_party/git/builtin/show-index.c index a6e678809e..8106b03a6b 100644 --- a/third_party/git/builtin/show-index.c +++ b/third_party/git/builtin/show-index.c @@ -1,9 +1,12 @@ #include "builtin.h" #include "cache.h" #include "pack.h" +#include "parse-options.h" -static const char show_index_usage[] = -"git show-index"; +static const char *const show_index_usage[] = { + "git show-index [--object-format=<hash-algorithm>]", + NULL +}; int cmd_show_index(int argc, const char **argv, const char *prefix) { @@ -11,9 +14,26 @@ int cmd_show_index(int argc, const char **argv, const char *prefix) unsigned nr; unsigned int version; static unsigned int top_index[256]; + unsigned hashsz; + const char *hash_name = NULL; + int hash_algo; + const struct option show_index_options[] = { + OPT_STRING(0, "object-format", &hash_name, N_("hash-algorithm"), + N_("specify the hash algorithm to use")), + OPT_END() + }; + + argc = parse_options(argc, argv, prefix, show_index_options, show_index_usage, 0); + + if (hash_name) { + hash_algo = hash_algo_by_name(hash_name); + if (hash_algo == GIT_HASH_UNKNOWN) + die(_("Unknown hash algorithm")); + repo_set_hash_algo(the_repository, hash_algo); + } + + hashsz = the_hash_algo->rawsz; - if (argc != 1) - usage(show_index_usage); if (fread(top_index, 2 * 4, 1, stdin) != 1) die("unable to read header"); if (top_index[0] == htonl(PACK_IDX_SIGNATURE)) { @@ -36,23 +56,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[6]; + unsigned int offset, entry[(GIT_MAX_RAWSZ + 4) / sizeof(unsigned int)]; - if (fread(entry, 4 + 20, 1, stdin) != 1) + if (fread(entry, 4 + hashsz, 1, stdin) != 1) die("unable to read entry %u/%u", i, nr); offset = ntohl(entry[0]); - printf("%u %s\n", offset, sha1_to_hex((void *)(entry+1))); + printf("%u %s\n", offset, hash_to_hex((void *)(entry+1))); } } else { unsigned off64_nr = 0; struct { - unsigned char sha1[20]; + struct object_id oid; uint32_t crc; uint32_t off; } *entries; ALLOC_ARRAY(entries, nr); for (i = 0; i < nr; i++) - if (fread(entries[i].sha1, 20, 1, stdin) != 1) + if (fread(entries[i].oid.hash, hashsz, 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) @@ -77,7 +97,7 @@ int cmd_show_index(int argc, const char **argv, const char *prefix) } printf("%" PRIuMAX " %s (%08"PRIx32")\n", (uintmax_t) offset, - sha1_to_hex(entries[i].sha1), + oid_to_hex(&entries[i].oid), ntohl(entries[i].crc)); } free(entries); diff --git a/third_party/git/builtin/show-ref.c b/third_party/git/builtin/show-ref.c index 6456da70cc..ae60b4acf2 100644 --- a/third_party/git/builtin/show-ref.c +++ b/third_party/git/builtin/show-ref.c @@ -169,15 +169,15 @@ static const struct option show_ref_options[] = { N_("show the HEAD reference, even if it would be filtered out")), OPT_BOOL('d', "dereference", &deref_tags, N_("dereference tags into object IDs")), - { OPTION_CALLBACK, 's', "hash", &abbrev, N_("n"), - N_("only show SHA1 hash using <n> digits"), - PARSE_OPT_OPTARG, &hash_callback }, + OPT_CALLBACK_F('s', "hash", &abbrev, N_("n"), + N_("only show SHA1 hash using <n> digits"), + PARSE_OPT_OPTARG, &hash_callback), OPT__ABBREV(&abbrev), OPT__QUIET(&quiet, N_("do not print results to stdout (useful with --verify)")), - { OPTION_CALLBACK, 0, "exclude-existing", &exclude_existing_arg, - N_("pattern"), N_("show refs from stdin that aren't in local repository"), - PARSE_OPT_OPTARG | PARSE_OPT_NONEG, exclude_existing_callback }, + OPT_CALLBACK_F(0, "exclude-existing", &exclude_existing_arg, + N_("pattern"), N_("show refs from stdin that aren't in local repository"), + PARSE_OPT_OPTARG | PARSE_OPT_NONEG, exclude_existing_callback), OPT_END() }; diff --git a/third_party/git/builtin/sparse-checkout.c b/third_party/git/builtin/sparse-checkout.c new file mode 100644 index 0000000000..e3140db2a0 --- /dev/null +++ b/third_party/git/builtin/sparse-checkout.c @@ -0,0 +1,663 @@ +#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|reapply|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 char const * const builtin_sparse_checkout_list_usage[] = { + N_("git sparse-checkout list"), + NULL +}; + +static int sparse_checkout_list(int argc, const char **argv) +{ + static struct option builtin_sparse_checkout_list_options[] = { + OPT_END(), + }; + struct pattern_list pl; + char *sparse_filename; + int res; + + argc = parse_options(argc, argv, NULL, + builtin_sparse_checkout_list_options, + builtin_sparse_checkout_list_usage, 0); + + 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) +{ + enum update_sparsity_result result; + struct unpack_trees_options o; + struct lock_file lock_file = LOCK_INIT; + struct repository *r = the_repository; + + /* If no branch has been checked out, there are no updates to make. */ + if (is_index_unborn(r->index)) + return UPDATE_SPARSITY_SUCCESS; + + memset(&o, 0, sizeof(o)); + o.verbose_update = isatty(2); + o.update = 1; + o.head_idx = -1; + o.src_index = r->index; + o.dst_index = r->index; + o.skip_sparse_checkout = 0; + o.pl = pl; + + setup_work_tree(); + + repo_hold_locked_index(r, &lock_file, LOCK_DIE_ON_ERROR); + + setup_unpack_trees_porcelain(&o, "sparse-checkout"); + result = update_sparsity(&o); + clear_unpack_trees_porcelain(&o); + + if (result == UPDATE_SPARSITY_WARNINGS) + /* + * We don't do any special handling of warnings from untracked + * files in the way or dirty entries that can't be removed. + */ + result = UPDATE_SPARSITY_SUCCESS; + if (result == UPDATE_SPARSITY_SUCCESS) + 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 (upgrade_repository_format(1) < 0) + die(_("unable to upgrade repository format to enable worktreeConfig")); + 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); + + 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); + + 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 char const * const builtin_sparse_checkout_reapply_usage[] = { + N_("git sparse-checkout reapply"), + NULL +}; + +static int sparse_checkout_reapply(int argc, const char **argv) +{ + static struct option builtin_sparse_checkout_reapply_options[] = { + OPT_END(), + }; + + argc = parse_options(argc, argv, NULL, + builtin_sparse_checkout_reapply_options, + builtin_sparse_checkout_reapply_usage, 0); + + repo_read_index(the_repository); + return update_working_directory(NULL); +} + +static char const * const builtin_sparse_checkout_disable_usage[] = { + N_("git sparse-checkout disable"), + NULL +}; + +static int sparse_checkout_disable(int argc, const char **argv) +{ + static struct option builtin_sparse_checkout_disable_options[] = { + OPT_END(), + }; + struct pattern_list pl; + struct strbuf match_all = STRBUF_INIT; + + argc = parse_options(argc, argv, NULL, + builtin_sparse_checkout_disable_options, + builtin_sparse_checkout_disable_usage, 0); + + repo_read_index(the_repository); + + 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], "reapply")) + return sparse_checkout_reapply(argc, argv); + 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 b5a301f24d..3f811f3050 100644 --- a/third_party/git/builtin/stash.c +++ b/third_party/git/builtin/stash.c @@ -7,7 +7,7 @@ #include "cache-tree.h" #include "unpack-trees.h" #include "merge-recursive.h" -#include "argv-array.h" +#include "strvec.h" #include "run-command.h" #include "dir.h" #include "rerere.h" @@ -27,6 +27,7 @@ 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>]"), @@ -184,7 +185,7 @@ static int get_stash_info(struct stash_info *info, int argc, const char **argv) end_of_rev = strchrnul(revision, '@'); strbuf_add(&symbolic, revision, end_of_rev - revision); - ret = dwim_ref(symbolic.buf, symbolic.len, &dummy, &expanded_ref); + ret = dwim_ref(symbolic.buf, symbolic.len, &dummy, &expanded_ref, 0); strbuf_release(&symbolic); switch (ret) { case 0: /* Not found, but valid ref */ @@ -276,8 +277,8 @@ static int diff_tree_binary(struct strbuf *out, struct object_id *w_commit) * however it should be done together with apply_cached. */ cp.git_cmd = 1; - argv_array_pushl(&cp.args, "diff-tree", "--binary", NULL); - argv_array_pushf(&cp.args, "%s^2^..%s^2", w_commit_hex, w_commit_hex); + strvec_pushl(&cp.args, "diff-tree", "--binary", NULL); + strvec_pushf(&cp.args, "%s^2^..%s^2", w_commit_hex, w_commit_hex); return pipe_command(&cp, NULL, 0, out, 0, NULL, 0); } @@ -292,7 +293,7 @@ static int apply_cached(struct strbuf *out) * buffer. */ cp.git_cmd = 1; - argv_array_pushl(&cp.args, "apply", "--cached", NULL); + strvec_pushl(&cp.args, "apply", "--cached", NULL); return pipe_command(&cp, out->buf, out->len, NULL, 0, NULL, 0); } @@ -305,7 +306,7 @@ static int reset_head(void) * API for resetting. */ cp.git_cmd = 1; - argv_array_push(&cp.args, "reset"); + strvec_push(&cp.args, "reset"); return run_command(&cp); } @@ -334,9 +335,9 @@ static int get_newly_staged(struct strbuf *out, struct object_id *c_tree) * converted together with update_index. */ cp.git_cmd = 1; - argv_array_pushl(&cp.args, "diff-index", "--cached", "--name-only", - "--diff-filter=A", NULL); - argv_array_push(&cp.args, c_tree_hex); + strvec_pushl(&cp.args, "diff-index", "--cached", "--name-only", + "--diff-filter=A", NULL); + strvec_push(&cp.args, c_tree_hex); return pipe_command(&cp, NULL, 0, out, 0, NULL, 0); } @@ -349,7 +350,7 @@ static int update_index(struct strbuf *out) * function exposed in order to remove this forking. */ cp.git_cmd = 1; - argv_array_pushl(&cp.args, "update-index", "--add", "--stdin", NULL); + strvec_pushl(&cp.args, "update-index", "--add", "--stdin", NULL); return pipe_command(&cp, out->buf, out->len, NULL, 0, NULL, 0); } @@ -364,10 +365,10 @@ static int restore_untracked(struct object_id *u_tree) * run_command to fork processes that will not interfere. */ cp.git_cmd = 1; - argv_array_push(&cp.args, "read-tree"); - argv_array_push(&cp.args, oid_to_hex(u_tree)); - argv_array_pushf(&cp.env_array, "GIT_INDEX_FILE=%s", - stash_index_path.buf); + strvec_push(&cp.args, "read-tree"); + strvec_push(&cp.args, oid_to_hex(u_tree)); + strvec_pushf(&cp.env_array, "GIT_INDEX_FILE=%s", + stash_index_path.buf); if (run_command(&cp)) { remove_path(stash_index_path.buf); return -1; @@ -375,9 +376,9 @@ static int restore_untracked(struct object_id *u_tree) child_process_init(&cp); cp.git_cmd = 1; - argv_array_pushl(&cp.args, "checkout-index", "--all", NULL); - argv_array_pushf(&cp.env_array, "GIT_INDEX_FILE=%s", - stash_index_path.buf); + strvec_pushl(&cp.args, "checkout-index", "--all", NULL); + strvec_pushf(&cp.env_array, "GIT_INDEX_FILE=%s", + stash_index_path.buf); res = run_command(&cp); remove_path(stash_index_path.buf); @@ -396,7 +397,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_cache(REFRESH_QUIET)) + if (refresh_and_write_cache(REFRESH_QUIET, 0, 0)) return -1; if (write_cache_as_tree(&c_tree, 0, NULL)) @@ -427,6 +428,8 @@ 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(); } } @@ -481,13 +484,12 @@ 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 (refresh_cache(REFRESH_QUIET)) - warning("could not refresh index"); - } else { + if (!quiet) { struct child_process cp = CHILD_PROCESS_INIT; /* @@ -497,7 +499,11 @@ static int do_apply_stash(const char *prefix, struct stash_info *info, */ cp.git_cmd = 1; cp.dir = prefix; - argv_array_push(&cp.args, "status"); + strvec_pushf(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT"=%s", + absolute_path(get_git_work_tree())); + strvec_pushf(&cp.env_array, GIT_DIR_ENVIRONMENT"=%s", + absolute_path(get_git_dir())); + strvec_push(&cp.args, "status"); run_command(&cp); } @@ -540,9 +546,9 @@ static int do_drop_stash(struct stash_info *info, int quiet) */ cp_reflog.git_cmd = 1; - argv_array_pushl(&cp_reflog.args, "reflog", "delete", "--updateref", - "--rewrite", NULL); - argv_array_push(&cp_reflog.args, info->revision.buf); + strvec_pushl(&cp_reflog.args, "reflog", "delete", "--updateref", + "--rewrite", NULL); + strvec_push(&cp_reflog.args, info->revision.buf); ret = run_command(&cp_reflog); if (!ret) { if (!quiet) @@ -560,8 +566,8 @@ static int do_drop_stash(struct stash_info *info, int quiet) cp.git_cmd = 1; /* Even though --quiet is specified, rev-parse still outputs the hash */ cp.no_stdout = 1; - argv_array_pushl(&cp.args, "rev-parse", "--verify", "--quiet", NULL); - argv_array_pushf(&cp.args, "%s@{0}", ref_stash); + strvec_pushl(&cp.args, "rev-parse", "--verify", "--quiet", NULL); + strvec_pushf(&cp.args, "%s@{0}", ref_stash); ret = run_command(&cp); /* do_clear_stash if we just dropped the last stash entry */ @@ -657,9 +663,9 @@ static int branch_stash(int argc, const char **argv, const char *prefix) return -1; cp.git_cmd = 1; - argv_array_pushl(&cp.args, "checkout", "-b", NULL); - argv_array_push(&cp.args, branch); - argv_array_push(&cp.args, oid_to_hex(&info.b_commit)); + strvec_pushl(&cp.args, "checkout", "-b", NULL); + strvec_push(&cp.args, branch); + strvec_push(&cp.args, oid_to_hex(&info.b_commit)); ret = run_command(&cp); if (!ret) ret = do_apply_stash(prefix, &info, 1, 0); @@ -686,16 +692,17 @@ static int list_stash(int argc, const char **argv, const char *prefix) return 0; cp.git_cmd = 1; - argv_array_pushl(&cp.args, "log", "--format=%gd: %gs", "-g", - "--first-parent", "-m", NULL); - argv_array_pushv(&cp.args, argv); - argv_array_push(&cp.args, ref_stash); - argv_array_push(&cp.args, "--"); + strvec_pushl(&cp.args, "log", "--format=%gd: %gs", "-g", + "--first-parent", "-m", NULL); + strvec_pushv(&cp.args, argv); + strvec_push(&cp.args, ref_stash); + strvec_push(&cp.args, "--"); return run_command(&cp); } static int show_stat = 1; static int show_patch; +static int use_legacy_stash; static int git_stash_config(const char *var, const char *value, void *cb) { @@ -707,7 +714,11 @@ static int git_stash_config(const char *var, const char *value, void *cb) show_patch = git_config_bool(var, value); return 0; } - return git_default_config(var, value, cb); + if (!strcmp(var, "stash.usebuiltin")) { + use_legacy_stash = !git_config_bool(var, value); + return 0; + } + return git_diff_basic_config(var, value, cb); } static int show_stash(int argc, const char **argv, const char *prefix) @@ -716,8 +727,8 @@ static int show_stash(int argc, const char **argv, const char *prefix) int ret = 0; struct stash_info info; struct rev_info rev; - struct argv_array stash_args = ARGV_ARRAY_INIT; - struct argv_array revision_args = ARGV_ARRAY_INIT; + struct strvec stash_args = STRVEC_INIT; + struct strvec revision_args = STRVEC_INIT; struct option options[] = { OPT_END() }; @@ -726,16 +737,16 @@ static int show_stash(int argc, const char **argv, const char *prefix) git_config(git_diff_ui_config, NULL); init_revisions(&rev, prefix); - argv_array_push(&revision_args, argv[0]); + strvec_push(&revision_args, argv[0]); for (i = 1; i < argc; i++) { if (argv[i][0] != '-') - argv_array_push(&stash_args, argv[i]); + strvec_push(&stash_args, argv[i]); else - argv_array_push(&revision_args, argv[i]); + strvec_push(&revision_args, argv[i]); } - ret = get_stash_info(&info, stash_args.argc, stash_args.argv); - argv_array_clear(&stash_args); + ret = get_stash_info(&info, stash_args.nr, stash_args.v); + strvec_clear(&stash_args); if (ret) return -1; @@ -743,8 +754,7 @@ static int show_stash(int argc, const char **argv, const char *prefix) * The config settings are applied only if there are not passed * any options. */ - if (revision_args.argc == 1) { - git_config(git_stash_config, NULL); + if (revision_args.nr == 1) { if (show_stat) rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT; @@ -757,7 +767,7 @@ static int show_stash(int argc, const char **argv, const char *prefix) } } - argc = setup_revisions(revision_args.argc, revision_args.argv, &rev, NULL); + argc = setup_revisions(revision_args.nr, revision_args.v, &rev, NULL); if (argc > 1) { free_stash_info(&info); usage_with_options(git_stash_show_usage, options); @@ -832,12 +842,12 @@ static int store_stash(int argc, const char **argv, const char *prefix) return do_store_stash(&obj, stash_msg, quiet); } -static void add_pathspecs(struct argv_array *args, +static void add_pathspecs(struct strvec *args, const struct pathspec *ps) { int i; for (i = 0; i < ps->nr; i++) - argv_array_push(args, ps->items[i].original); + strvec_push(args, ps->items[i].original); } /* @@ -851,33 +861,23 @@ static int get_untracked_files(const struct pathspec *ps, int include_untracked, struct strbuf *untracked_files) { int i; - int max_len; int found = 0; - char *seen; struct dir_struct dir; - memset(&dir, 0, sizeof(dir)); + dir_init(&dir); if (include_untracked != INCLUDE_ALL_FILES) setup_standard_excludes(&dir); - seen = xcalloc(ps->nr, 1); - - max_len = fill_directory(&dir, the_repository->index, ps); + fill_directory(&dir, the_repository->index, ps); for (i = 0; i < dir.nr; i++) { struct dir_entry *ent = dir.entries[i]; - if (dir_path_match(&the_index, ent, ps, max_len, seen)) { - found++; - strbuf_addstr(untracked_files, ent->name); - /* NUL-terminate: will be fed to update-index -z */ - strbuf_addch(untracked_files, '\0'); - } - free(ent); + found++; + strbuf_addstr(untracked_files, ent->name); + /* NUL-terminate: will be fed to update-index -z */ + strbuf_addch(untracked_files, '\0'); } - free(seen); - free(dir.entries); - free(dir.ignored); - clear_directory(&dir); + dir_clear(&dir); return found; } @@ -957,9 +957,9 @@ static int save_untracked_files(struct stash_info *info, struct strbuf *msg, struct index_state istate = { NULL }; cp_upd_index.git_cmd = 1; - 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", + strvec_pushl(&cp_upd_index.args, "update-index", "-z", "--add", + "--remove", "--stdin", NULL); + strvec_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s", stash_index_path.buf); strbuf_addf(&untracked_msg, "untracked files on %s\n", msg->buf); @@ -993,32 +993,35 @@ 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); cp_read_tree.git_cmd = 1; - argv_array_pushl(&cp_read_tree.args, "read-tree", "HEAD", NULL); - argv_array_pushf(&cp_read_tree.env_array, "GIT_INDEX_FILE=%s", - stash_index_path.buf); + strvec_pushl(&cp_read_tree.args, "read-tree", "HEAD", NULL); + strvec_pushf(&cp_read_tree.env_array, "GIT_INDEX_FILE=%s", + stash_index_path.buf); if (run_command(&cp_read_tree)) { ret = -1; goto done; } /* Find out what the user wants. */ - 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; - } + 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); /* State of the working tree. */ if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0, @@ -1028,8 +1031,8 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps, } cp_diff_tree.git_cmd = 1; - argv_array_pushl(&cp_diff_tree.args, "diff-tree", "-p", "HEAD", - oid_to_hex(&info->w_tree), "--", NULL); + strvec_pushl(&cp_diff_tree.args, "diff-tree", "-p", "-U1", "HEAD", + oid_to_hex(&info->w_tree), "--", NULL); if (pipe_command(&cp_diff_tree, NULL, 0, out_patch, 0, NULL, 0)) { ret = -1; goto done; @@ -1082,10 +1085,11 @@ 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", "-z", "--add", - "--remove", "--stdin", NULL); - argv_array_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s", - stash_index_path.buf); + strvec_pushl(&cp_upd_index.args, "update-index", + "--ignore-skip-worktree-entries", + "-z", "--add", "--remove", "--stdin", NULL); + strvec_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s", + stash_index_path.buf); if (pipe_command(&cp_upd_index, diff_output.buf, diff_output.len, NULL, 0, NULL, 0)) { @@ -1129,7 +1133,10 @@ 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); - refresh_cache(REFRESH_QUIET); + if (refresh_and_write_cache(REFRESH_QUIET, 0, 0) < 0) { + ret = -1; + goto done; + } if (get_oid("HEAD", &info->b_commit)) { if (!quiet) @@ -1290,7 +1297,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q free(ps_matched); } - if (refresh_cache(REFRESH_QUIET)) { + if (refresh_and_write_cache(REFRESH_QUIET, 0, 0)) { ret = -1; goto done; } @@ -1332,10 +1339,10 @@ 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, "clean", "--force", - "--quiet", "-d", NULL); + strvec_pushl(&cp.args, "clean", "--force", + "--quiet", "-d", NULL); if (include_untracked == INCLUDE_ALL_FILES) - argv_array_push(&cp.args, "-x"); + strvec_push(&cp.args, "-x"); if (run_command(&cp)) { ret = -1; goto done; @@ -1349,12 +1356,12 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q struct strbuf out = STRBUF_INIT; cp_add.git_cmd = 1; - argv_array_push(&cp_add.args, "add"); + strvec_push(&cp_add.args, "add"); if (!include_untracked) - argv_array_push(&cp_add.args, "-u"); + strvec_push(&cp_add.args, "-u"); if (include_untracked == INCLUDE_ALL_FILES) - argv_array_push(&cp_add.args, "--force"); - argv_array_push(&cp_add.args, "--"); + strvec_push(&cp_add.args, "--force"); + strvec_push(&cp_add.args, "--"); add_pathspecs(&cp_add.args, ps); if (run_command(&cp_add)) { ret = -1; @@ -1362,9 +1369,9 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q } cp_diff.git_cmd = 1; - argv_array_pushl(&cp_diff.args, "diff-index", "-p", - "--cached", "--binary", "HEAD", "--", - NULL); + strvec_pushl(&cp_diff.args, "diff-index", "-p", + "--cached", "--binary", "HEAD", "--", + NULL); add_pathspecs(&cp_diff.args, ps); if (pipe_command(&cp_diff, NULL, 0, &out, 0, NULL, 0)) { ret = -1; @@ -1372,8 +1379,8 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q } cp_apply.git_cmd = 1; - argv_array_pushl(&cp_apply.args, "apply", "--index", - "-R", NULL); + strvec_pushl(&cp_apply.args, "apply", "--index", + "-R", NULL); if (pipe_command(&cp_apply, out.buf, out.len, NULL, 0, NULL, 0)) { ret = -1; @@ -1382,8 +1389,8 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q } else { struct child_process cp = CHILD_PROCESS_INIT; cp.git_cmd = 1; - argv_array_pushl(&cp.args, "reset", "--hard", "-q", - NULL); + strvec_pushl(&cp.args, "reset", "--hard", "-q", + "--no-recurse-submodules", NULL); if (run_command(&cp)) { ret = -1; goto done; @@ -1394,10 +1401,10 @@ 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, "checkout", "--no-overlay", - oid_to_hex(&info.i_tree), "--", NULL); + strvec_pushl(&cp.args, "checkout", "--no-overlay", + oid_to_hex(&info.i_tree), "--", NULL); if (!ps->nr) - argv_array_push(&cp.args, ":/"); + strvec_push(&cp.args, ":/"); else add_pathspecs(&cp.args, ps); if (run_command(&cp)) { @@ -1410,7 +1417,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, "apply", "-R", NULL); + strvec_pushl(&cp.args, "apply", "-R", NULL); if (pipe_command(&cp, patch.buf, patch.len, NULL, 0, NULL, 0)) { if (!quiet) @@ -1424,7 +1431,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", "-q", "--", NULL); + strvec_pushl(&cp.args, "reset", "-q", "--", NULL); add_pathspecs(&cp.args, ps); if (run_command(&cp)) { ret = -1; @@ -1439,13 +1446,17 @@ done: return ret; } -static int push_stash(int argc, const char **argv, const char *prefix) +static int push_stash(int argc, const char **argv, const char *prefix, + int push_assumed) { + 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, @@ -1459,16 +1470,45 @@ 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) + if (argc) { + force_assume = !strcmp(argv[0], "-p"); argc = parse_options(argc, argv, prefix, options, git_stash_push_usage, - 0); + 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]); + } + } 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); } @@ -1513,55 +1553,22 @@ static int save_stash(int argc, const char **argv, const char *prefix) return ret; } -static int use_builtin_stash(void) -{ - struct child_process cp = CHILD_PROCESS_INIT; - struct strbuf out = STRBUF_INIT; - int ret, env = git_env_bool("GIT_TEST_STASH_USE_BUILTIN", -1); - - if (env != -1) - return env; - - argv_array_pushl(&cp.args, - "config", "--bool", "stash.usebuiltin", NULL); - cp.git_cmd = 1; - if (capture_command(&cp, &out, 6)) { - strbuf_release(&out); - return 1; - } - - strbuf_trim(&out); - ret = !strcmp("true", out.buf); - strbuf_release(&out); - return ret; -} - 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; + struct strvec args = STRVEC_INIT; struct option options[] = { OPT_END() }; - if (!use_builtin_stash()) { - const char *path = mkpath("%s/git-legacy-stash", - git_exec_path()); - - if (sane_execvp(path, (char **)argv) < 0) - die_errno(_("could not exec %s"), path); - else - BUG("sane_execvp() returned???"); - } - - prefix = setup_git_directory(); - trace_repo_setup(prefix); - setup_work_tree(); + git_config(git_stash_config, NULL); - git_config(git_diff_basic_config, NULL); + if (use_legacy_stash || + !git_env_bool("GIT_TEST_STASH_USE_BUILTIN", -1)) + warning(_("the stash.useBuiltin support has been removed!\n" + "See its entry in 'git help config' for details.")); argc = parse_options(argc, argv, prefix, options, git_stash_usage, PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH); @@ -1571,7 +1578,7 @@ int cmd_stash(int argc, const char **argv, const char *prefix) (uintmax_t)pid); if (!argc) - return !!push_stash(0, NULL, prefix); + return !!push_stash(0, NULL, prefix, 0); else if (!strcmp(argv[0], "apply")) return !!apply_stash(argc, argv, prefix); else if (!strcmp(argv[0], "clear")) @@ -1591,45 +1598,15 @@ 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); + return !!push_stash(argc, argv, prefix, 0); 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); - 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); + /* Assume 'stash push' */ + strvec_push(&args, "push"); + strvec_pushv(&args, argv); + return !!push_stash(args.nr, args.v, prefix, 1); } diff --git a/third_party/git/builtin/submodule--helper.c b/third_party/git/builtin/submodule--helper.c index 909e77e802..c30896c897 100644 --- a/third_party/git/builtin/submodule--helper.c +++ b/third_party/git/builtin/submodule--helper.c @@ -19,6 +19,8 @@ #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) @@ -292,9 +294,9 @@ static char *compute_rev_name(const char *sub_path, const char* object_id) cp.git_cmd = 1; cp.no_stderr = 1; - argv_array_push(&cp.args, "describe"); - argv_array_pushv(&cp.args, *d); - argv_array_push(&cp.args, object_id); + strvec_push(&cp.args, "describe"); + strvec_pushv(&cp.args, *d); + strvec_push(&cp.args, object_id); if (!capture_command(&cp, &sb, 0)) { strbuf_strip_suffix(&sb, "\n"); @@ -424,7 +426,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, sha1_to_hex(null_sha1)); + printf("%06o %s U\t", ce->ce_mode, oid_to_hex(&null_oid)); else printf("%06o %s %d\t", ce->ce_mode, oid_to_hex(&ce->oid), ce_stage(ce)); @@ -442,19 +444,19 @@ static void for_each_listed_submodule(const struct module_list *list, fn(list->entries[i], cb_data); } -struct cb_foreach { +struct foreach_cb { int argc; const char **argv; const char *prefix; int quiet; int recursive; }; -#define CB_FOREACH_INIT { 0 } +#define FOREACH_CB_INIT { 0 } static void runcommand_in_submodule_cb(const struct cache_entry *list_item, void *cb_data) { - struct cb_foreach *info = cb_data; + struct foreach_cb *info = cb_data; const char *path = list_item->name; const struct object_id *ce_oid = &list_item->oid; @@ -493,12 +495,12 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, char *toplevel = xgetcwd(); struct strbuf sb = STRBUF_INIT; - argv_array_pushf(&cp.env_array, "name=%s", sub->name); - argv_array_pushf(&cp.env_array, "sm_path=%s", path); - argv_array_pushf(&cp.env_array, "displaypath=%s", displaypath); - argv_array_pushf(&cp.env_array, "sha1=%s", - oid_to_hex(ce_oid)); - argv_array_pushf(&cp.env_array, "toplevel=%s", toplevel); + strvec_pushf(&cp.env_array, "name=%s", sub->name); + strvec_pushf(&cp.env_array, "sm_path=%s", path); + strvec_pushf(&cp.env_array, "displaypath=%s", displaypath); + strvec_pushf(&cp.env_array, "sha1=%s", + oid_to_hex(ce_oid)); + strvec_pushf(&cp.env_array, "toplevel=%s", toplevel); /* * Since the path variable was accessible from the script @@ -507,15 +509,15 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, * on windows. And since environment variables are * case-insensitive in windows, it interferes with the * existing PATH variable. Hence, to avoid that, we expose - * path via the args argv_array and not via env_array. + * path via the args strvec and not via env_array. */ sq_quote_buf(&sb, path); - argv_array_pushf(&cp.args, "path=%s; %s", - sb.buf, info->argv[0]); + strvec_pushf(&cp.args, "path=%s; %s", + sb.buf, info->argv[0]); strbuf_release(&sb); free(toplevel); } else { - argv_array_pushv(&cp.args, info->argv); + strvec_pushv(&cp.args, info->argv); } if (!info->quiet) @@ -532,16 +534,16 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, cpr.dir = path; prepare_submodule_repo_env(&cpr.env_array); - argv_array_pushl(&cpr.args, "--super-prefix", NULL); - argv_array_pushf(&cpr.args, "%s/", displaypath); - argv_array_pushl(&cpr.args, "submodule--helper", "foreach", "--recursive", - NULL); + strvec_pushl(&cpr.args, "--super-prefix", NULL); + strvec_pushf(&cpr.args, "%s/", displaypath); + strvec_pushl(&cpr.args, "submodule--helper", "foreach", "--recursive", + NULL); if (info->quiet) - argv_array_push(&cpr.args, "--quiet"); + strvec_push(&cpr.args, "--quiet"); - argv_array_push(&cpr.args, "--"); - argv_array_pushv(&cpr.args, info->argv); + strvec_push(&cpr.args, "--"); + strvec_pushv(&cpr.args, info->argv); if (run_command(&cpr)) die(_("run_command returned non-zero status while " @@ -555,7 +557,7 @@ cleanup: static int module_foreach(int argc, const char **argv, const char *prefix) { - struct cb_foreach info = CB_FOREACH_INIT; + struct foreach_cb info = FOREACH_CB_INIT; struct pathspec pathspec; struct module_list list = MODULE_LIST_INIT; @@ -610,7 +612,6 @@ struct init_cb { const char *prefix; unsigned int flags; }; - #define INIT_CB_INIT { NULL, 0 } static void init_submodule(const char *path, const char *prefix, @@ -740,7 +741,6 @@ struct status_cb { const char *prefix; unsigned int flags; }; - #define STATUS_CB_INIT { NULL, 0 } static void print_status(unsigned int flags, char state, const char *path, @@ -777,9 +777,11 @@ static void status_submodule(const char *path, const struct object_id *ce_oid, unsigned int flags) { char *displaypath; - struct argv_array diff_files_args = ARGV_ARRAY_INIT; + struct strvec diff_files_args = STRVEC_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'"), @@ -792,21 +794,30 @@ static void status_submodule(const char *path, const struct object_id *ce_oid, goto cleanup; } - if (!is_submodule_active(the_repository, path)) { + 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)) { 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); + strvec_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, prefix); + + repo_init_revisions(the_repository, &rev, NULL); rev.abbrev = 0; - diff_files_args.argc = setup_revisions(diff_files_args.argc, - diff_files_args.argv, - &rev, NULL); + diff_files_args.nr = setup_revisions(diff_files_args.nr, + diff_files_args.v, + &rev, NULL); diff_files_result = run_diff_files(&rev, 0); if (!diff_result_code(&rev.diffopt, diff_files_result)) { @@ -836,23 +847,23 @@ static void status_submodule(const char *path, const struct object_id *ce_oid, cpr.dir = path; prepare_submodule_repo_env(&cpr.env_array); - argv_array_push(&cpr.args, "--super-prefix"); - argv_array_pushf(&cpr.args, "%s/", displaypath); - argv_array_pushl(&cpr.args, "submodule--helper", "status", - "--recursive", NULL); + strvec_push(&cpr.args, "--super-prefix"); + strvec_pushf(&cpr.args, "%s/", displaypath); + strvec_pushl(&cpr.args, "submodule--helper", "status", + "--recursive", NULL); if (flags & OPT_CACHED) - argv_array_push(&cpr.args, "--cached"); + strvec_push(&cpr.args, "--cached"); if (flags & OPT_QUIET) - argv_array_push(&cpr.args, "--quiet"); + strvec_push(&cpr.args, "--quiet"); if (run_command(&cpr)) die(_("failed to recurse into submodule '%s'"), path); } cleanup: - argv_array_clear(&diff_files_args); + strvec_clear(&diff_files_args); free(displaypath); } @@ -916,11 +927,437 @@ static int module_name(int argc, const char **argv, const char *prefix) return 0; } +struct module_cb { + unsigned int mod_src; + unsigned int mod_dst; + struct object_id oid_src; + struct object_id oid_dst; + char status; + const char *sm_path; +}; +#define MODULE_CB_INIT { 0, 0, NULL, NULL, '\0', NULL } + +struct module_cb_list { + struct module_cb **entries; + int alloc, nr; +}; +#define MODULE_CB_LIST_INIT { NULL, 0, 0 } + +struct summary_cb { + int argc; + const char **argv; + const char *prefix; + unsigned int cached: 1; + unsigned int for_status: 1; + unsigned int files: 1; + int summary_limit; +}; +#define SUMMARY_CB_INIT { 0, NULL, NULL, 0, 0, 0, 0 } + +enum diff_cmd { + DIFF_INDEX, + DIFF_FILES +}; + +static char *verify_submodule_committish(const char *sm_path, + const char *committish) +{ + struct child_process cp_rev_parse = CHILD_PROCESS_INIT; + struct strbuf result = STRBUF_INIT; + + cp_rev_parse.git_cmd = 1; + cp_rev_parse.dir = sm_path; + prepare_submodule_repo_env(&cp_rev_parse.env_array); + strvec_pushl(&cp_rev_parse.args, "rev-parse", "-q", "--short", NULL); + strvec_pushf(&cp_rev_parse.args, "%s^0", committish); + strvec_push(&cp_rev_parse.args, "--"); + + if (capture_command(&cp_rev_parse, &result, 0)) + return NULL; + + strbuf_trim_trailing_newline(&result); + return strbuf_detach(&result, NULL); +} + +static void print_submodule_summary(struct summary_cb *info, char *errmsg, + int total_commits, const char *displaypath, + const char *src_abbrev, const char *dst_abbrev, + struct module_cb *p) +{ + if (p->status == 'T') { + if (S_ISGITLINK(p->mod_dst)) + printf(_("* %s %s(blob)->%s(submodule)"), + displaypath, src_abbrev, dst_abbrev); + else + printf(_("* %s %s(submodule)->%s(blob)"), + displaypath, src_abbrev, dst_abbrev); + } else { + printf("* %s %s...%s", + displaypath, src_abbrev, dst_abbrev); + } + + if (total_commits < 0) + printf(":\n"); + else + printf(" (%d):\n", total_commits); + + if (errmsg) { + printf(_("%s"), errmsg); + } else if (total_commits > 0) { + struct child_process cp_log = CHILD_PROCESS_INIT; + + cp_log.git_cmd = 1; + cp_log.dir = p->sm_path; + prepare_submodule_repo_env(&cp_log.env_array); + strvec_pushl(&cp_log.args, "log", NULL); + + if (S_ISGITLINK(p->mod_src) && S_ISGITLINK(p->mod_dst)) { + if (info->summary_limit > 0) + strvec_pushf(&cp_log.args, "-%d", + info->summary_limit); + + strvec_pushl(&cp_log.args, "--pretty= %m %s", + "--first-parent", NULL); + strvec_pushf(&cp_log.args, "%s...%s", + src_abbrev, dst_abbrev); + } else if (S_ISGITLINK(p->mod_dst)) { + strvec_pushl(&cp_log.args, "--pretty= > %s", + "-1", dst_abbrev, NULL); + } else { + strvec_pushl(&cp_log.args, "--pretty= < %s", + "-1", src_abbrev, NULL); + } + run_command(&cp_log); + } + printf("\n"); +} + +static void generate_submodule_summary(struct summary_cb *info, + struct module_cb *p) +{ + char *displaypath, *src_abbrev = NULL, *dst_abbrev; + int missing_src = 0, missing_dst = 0; + char *errmsg = NULL; + int total_commits = -1; + + if (!info->cached && oideq(&p->oid_dst, &null_oid)) { + if (S_ISGITLINK(p->mod_dst)) { + struct ref_store *refs = get_submodule_ref_store(p->sm_path); + if (refs) + refs_head_ref(refs, handle_submodule_head_ref, &p->oid_dst); + } else if (S_ISLNK(p->mod_dst) || S_ISREG(p->mod_dst)) { + struct stat st; + int fd = open(p->sm_path, O_RDONLY); + + if (fd < 0 || fstat(fd, &st) < 0 || + index_fd(&the_index, &p->oid_dst, fd, &st, OBJ_BLOB, + p->sm_path, 0)) + error(_("couldn't hash object from '%s'"), p->sm_path); + } else { + /* for a submodule removal (mode:0000000), don't warn */ + if (p->mod_dst) + warning(_("unexpected mode %o\n"), p->mod_dst); + } + } + + if (S_ISGITLINK(p->mod_src)) { + if (p->status != 'D') + src_abbrev = verify_submodule_committish(p->sm_path, + oid_to_hex(&p->oid_src)); + if (!src_abbrev) { + missing_src = 1; + /* + * As `rev-parse` failed, we fallback to getting + * the abbreviated hash using oid_src. We do + * this as we might still need the abbreviated + * hash in cases like a submodule type change, etc. + */ + src_abbrev = xstrndup(oid_to_hex(&p->oid_src), 7); + } + } else { + /* + * The source does not point to a submodule. + * So, we fallback to getting the abbreviation using + * oid_src as we might still need the abbreviated + * hash in cases like submodule add, etc. + */ + src_abbrev = xstrndup(oid_to_hex(&p->oid_src), 7); + } + + if (S_ISGITLINK(p->mod_dst)) { + dst_abbrev = verify_submodule_committish(p->sm_path, + oid_to_hex(&p->oid_dst)); + if (!dst_abbrev) { + missing_dst = 1; + /* + * As `rev-parse` failed, we fallback to getting + * the abbreviated hash using oid_dst. We do + * this as we might still need the abbreviated + * hash in cases like a submodule type change, etc. + */ + dst_abbrev = xstrndup(oid_to_hex(&p->oid_dst), 7); + } + } else { + /* + * The destination does not point to a submodule. + * So, we fallback to getting the abbreviation using + * oid_dst as we might still need the abbreviated + * hash in cases like a submodule removal, etc. + */ + dst_abbrev = xstrndup(oid_to_hex(&p->oid_dst), 7); + } + + displaypath = get_submodule_displaypath(p->sm_path, info->prefix); + + if (!missing_src && !missing_dst) { + struct child_process cp_rev_list = CHILD_PROCESS_INIT; + struct strbuf sb_rev_list = STRBUF_INIT; + + strvec_pushl(&cp_rev_list.args, "rev-list", + "--first-parent", "--count", NULL); + if (S_ISGITLINK(p->mod_src) && S_ISGITLINK(p->mod_dst)) + strvec_pushf(&cp_rev_list.args, "%s...%s", + src_abbrev, dst_abbrev); + else + strvec_push(&cp_rev_list.args, S_ISGITLINK(p->mod_src) ? + src_abbrev : dst_abbrev); + strvec_push(&cp_rev_list.args, "--"); + + cp_rev_list.git_cmd = 1; + cp_rev_list.dir = p->sm_path; + prepare_submodule_repo_env(&cp_rev_list.env_array); + + if (!capture_command(&cp_rev_list, &sb_rev_list, 0)) + total_commits = atoi(sb_rev_list.buf); + + strbuf_release(&sb_rev_list); + } else { + /* + * Don't give error msg for modification whose dst is not + * submodule, i.e., deleted or changed to blob + */ + if (S_ISGITLINK(p->mod_dst)) { + struct strbuf errmsg_str = STRBUF_INIT; + if (missing_src && missing_dst) { + strbuf_addf(&errmsg_str, " Warn: %s doesn't contain commits %s and %s\n", + displaypath, oid_to_hex(&p->oid_src), + oid_to_hex(&p->oid_dst)); + } else { + strbuf_addf(&errmsg_str, " Warn: %s doesn't contain commit %s\n", + displaypath, missing_src ? + oid_to_hex(&p->oid_src) : + oid_to_hex(&p->oid_dst)); + } + errmsg = strbuf_detach(&errmsg_str, NULL); + } + } + + print_submodule_summary(info, errmsg, total_commits, + displaypath, src_abbrev, + dst_abbrev, p); + + free(displaypath); + free(src_abbrev); + free(dst_abbrev); +} + +static void prepare_submodule_summary(struct summary_cb *info, + struct module_cb_list *list) +{ + int i; + for (i = 0; i < list->nr; i++) { + const struct submodule *sub; + struct module_cb *p = list->entries[i]; + struct strbuf sm_gitdir = STRBUF_INIT; + + if (p->status == 'D' || p->status == 'T') { + generate_submodule_summary(info, p); + continue; + } + + if (info->for_status && p->status != 'A' && + (sub = submodule_from_path(the_repository, + &null_oid, p->sm_path))) { + char *config_key = NULL; + const char *value; + int ignore_all = 0; + + config_key = xstrfmt("submodule.%s.ignore", + sub->name); + if (!git_config_get_string_tmp(config_key, &value)) + ignore_all = !strcmp(value, "all"); + else if (sub->ignore) + ignore_all = !strcmp(sub->ignore, "all"); + + free(config_key); + if (ignore_all) + continue; + } + + /* Also show added or modified modules which are checked out */ + strbuf_addstr(&sm_gitdir, p->sm_path); + if (is_nonbare_repository_dir(&sm_gitdir)) + generate_submodule_summary(info, p); + strbuf_release(&sm_gitdir); + } +} + +static void submodule_summary_callback(struct diff_queue_struct *q, + struct diff_options *options, + void *data) +{ + int i; + struct module_cb_list *list = data; + for (i = 0; i < q->nr; i++) { + struct diff_filepair *p = q->queue[i]; + struct module_cb *temp; + + if (!S_ISGITLINK(p->one->mode) && !S_ISGITLINK(p->two->mode)) + continue; + temp = (struct module_cb*)malloc(sizeof(struct module_cb)); + temp->mod_src = p->one->mode; + temp->mod_dst = p->two->mode; + temp->oid_src = p->one->oid; + temp->oid_dst = p->two->oid; + temp->status = p->status; + temp->sm_path = xstrdup(p->one->path); + + ALLOC_GROW(list->entries, list->nr + 1, list->alloc); + list->entries[list->nr++] = temp; + } +} + +static const char *get_diff_cmd(enum diff_cmd diff_cmd) +{ + switch (diff_cmd) { + case DIFF_INDEX: return "diff-index"; + case DIFF_FILES: return "diff-files"; + default: BUG("bad diff_cmd value %d", diff_cmd); + } +} + +static int compute_summary_module_list(struct object_id *head_oid, + struct summary_cb *info, + enum diff_cmd diff_cmd) +{ + struct strvec diff_args = STRVEC_INIT; + struct rev_info rev; + struct module_cb_list list = MODULE_CB_LIST_INIT; + + strvec_push(&diff_args, get_diff_cmd(diff_cmd)); + if (info->cached) + strvec_push(&diff_args, "--cached"); + strvec_pushl(&diff_args, "--ignore-submodules=dirty", "--raw", NULL); + if (head_oid) + strvec_push(&diff_args, oid_to_hex(head_oid)); + strvec_push(&diff_args, "--"); + if (info->argc) + strvec_pushv(&diff_args, info->argv); + + git_config(git_diff_basic_config, NULL); + init_revisions(&rev, info->prefix); + rev.abbrev = 0; + precompose_argv(diff_args.nr, diff_args.v); + setup_revisions(diff_args.nr, diff_args.v, &rev, NULL); + rev.diffopt.output_format = DIFF_FORMAT_NO_OUTPUT | DIFF_FORMAT_CALLBACK; + rev.diffopt.format_callback = submodule_summary_callback; + rev.diffopt.format_callback_data = &list; + + if (!info->cached) { + if (diff_cmd == DIFF_INDEX) + setup_work_tree(); + if (read_cache_preload(&rev.diffopt.pathspec) < 0) { + perror("read_cache_preload"); + return -1; + } + } else if (read_cache() < 0) { + perror("read_cache"); + return -1; + } + + if (diff_cmd == DIFF_INDEX) + run_diff_index(&rev, info->cached); + else + run_diff_files(&rev, 0); + prepare_submodule_summary(info, &list); + strvec_clear(&diff_args); + return 0; +} + +static int module_summary(int argc, const char **argv, const char *prefix) +{ + struct summary_cb info = SUMMARY_CB_INIT; + int cached = 0; + int for_status = 0; + int files = 0; + int summary_limit = -1; + enum diff_cmd diff_cmd = DIFF_INDEX; + struct object_id head_oid; + int ret; + + struct option module_summary_options[] = { + OPT_BOOL(0, "cached", &cached, + N_("use the commit stored in the index instead of the submodule HEAD")), + OPT_BOOL(0, "files", &files, + N_("to compare the commit in the index with that in the submodule HEAD")), + OPT_BOOL(0, "for-status", &for_status, + N_("skip submodules with 'ignore_config' value set to 'all'")), + OPT_INTEGER('n', "summary-limit", &summary_limit, + N_("limit the summary size")), + OPT_END() + }; + + const char *const git_submodule_helper_usage[] = { + N_("git submodule--helper summary [<options>] [<commit>] [--] [<path>]"), + NULL + }; + + argc = parse_options(argc, argv, prefix, module_summary_options, + git_submodule_helper_usage, 0); + + if (!summary_limit) + return 0; + + if (!get_oid(argc ? argv[0] : "HEAD", &head_oid)) { + if (argc) { + argv++; + argc--; + } + } else if (!argc || !strcmp(argv[0], "HEAD")) { + /* before the first commit: compare with an empty tree */ + oidcpy(&head_oid, the_hash_algo->empty_tree); + if (argc) { + argv++; + argc--; + } + } else { + if (get_oid("HEAD", &head_oid)) + die(_("could not fetch a revision for HEAD")); + } + + if (files) { + if (cached) + die(_("--cached and --files are mutually exclusive")); + diff_cmd = DIFF_FILES; + } + + info.argc = argc; + info.argv = argv; + info.prefix = prefix; + info.cached = !!cached; + info.files = !!files; + info.for_status = !!for_status; + info.summary_limit = summary_limit; + + ret = compute_summary_module_list((diff_cmd == DIFF_INDEX) ? &head_oid : NULL, + &info, diff_cmd); + return ret; +} + struct sync_cb { const char *prefix; unsigned int flags; }; - #define SYNC_CB_INIT { NULL, 0 } static void sync_submodule(const char *path, const char *prefix, @@ -982,8 +1419,8 @@ static void sync_submodule(const char *path, const char *prefix, prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; cp.dir = path; - argv_array_pushl(&cp.args, "submodule--helper", - "print-default-remote", NULL); + strvec_pushl(&cp.args, "submodule--helper", + "print-default-remote", NULL); strbuf_reset(&sb); if (capture_command(&cp, &sb, 0)) @@ -1008,13 +1445,13 @@ static void sync_submodule(const char *path, const char *prefix, cpr.dir = path; prepare_submodule_repo_env(&cpr.env_array); - argv_array_push(&cpr.args, "--super-prefix"); - argv_array_pushf(&cpr.args, "%s/", displaypath); - argv_array_pushl(&cpr.args, "submodule--helper", "sync", - "--recursive", NULL); + strvec_push(&cpr.args, "--super-prefix"); + strvec_pushf(&cpr.args, "%s/", displaypath); + strvec_pushl(&cpr.args, "submodule--helper", "sync", + "--recursive", NULL); if (flags & OPT_QUIET) - argv_array_push(&cpr.args, "--quiet"); + strvec_push(&cpr.args, "--quiet"); if (run_command(&cpr)) die(_("failed to recurse into submodule '%s'"), @@ -1114,8 +1551,8 @@ static void deinit_submodule(const char *path, const char *prefix, if (!(flags & OPT_FORCE)) { struct child_process cp_rm = CHILD_PROCESS_INIT; cp_rm.git_cmd = 1; - argv_array_pushl(&cp_rm.args, "rm", "-qn", - path, NULL); + strvec_pushl(&cp_rm.args, "rm", "-qn", + path, NULL); if (run_command(&cp_rm)) die(_("Submodule work tree '%s' contains local " @@ -1143,8 +1580,8 @@ static void deinit_submodule(const char *path, const char *prefix, displaypath); cp_config.git_cmd = 1; - argv_array_pushl(&cp_config.args, "config", "--get-regexp", NULL); - argv_array_pushf(&cp_config.args, "submodule.%s\\.", sub->name); + strvec_pushl(&cp_config.args, "config", "--get-regexp", NULL); + strvec_pushf(&cp_config.args, "submodule.%s\\.", sub->name); /* remove the .git/config entries (unless the user already did it) */ if (!capture_command(&cp_config, &sb_config, 0) && sb_config.len) { @@ -1222,32 +1659,36 @@ 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 quiet, int progress, int single_branch) { struct child_process cp = CHILD_PROCESS_INIT; - argv_array_push(&cp.args, "clone"); - argv_array_push(&cp.args, "--no-checkout"); + strvec_push(&cp.args, "clone"); + strvec_push(&cp.args, "--no-checkout"); if (quiet) - argv_array_push(&cp.args, "--quiet"); + strvec_push(&cp.args, "--quiet"); if (progress) - argv_array_push(&cp.args, "--progress"); + strvec_push(&cp.args, "--progress"); if (depth && *depth) - argv_array_pushl(&cp.args, "--depth", depth, NULL); + strvec_pushl(&cp.args, "--depth", depth, NULL); if (reference->nr) { struct string_list_item *item; for_each_string_list_item(item, reference) - argv_array_pushl(&cp.args, "--reference", - item->string, NULL); + strvec_pushl(&cp.args, "--reference", + item->string, NULL); } if (dissociate) - argv_array_push(&cp.args, "--dissociate"); + strvec_push(&cp.args, "--dissociate"); if (gitdir && *gitdir) - argv_array_pushl(&cp.args, "--separate-git-dir", gitdir, NULL); + strvec_pushl(&cp.args, "--separate-git-dir", gitdir, NULL); + if (single_branch >= 0) + strvec_push(&cp.args, single_branch ? + "--single-branch" : + "--no-single-branch"); - argv_array_push(&cp.args, "--"); - argv_array_push(&cp.args, url); - argv_array_push(&cp.args, path); + strvec_push(&cp.args, "--"); + strvec_push(&cp.args, url); + strvec_push(&cp.args, path); cp.git_cmd = 1; prepare_submodule_repo_env(&cp.env_array); @@ -1268,6 +1709,13 @@ 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) { @@ -1299,6 +1747,8 @@ 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: @@ -1359,8 +1809,9 @@ 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; + int dissociate = 0, require_init = 0; char *sm_alternate = NULL, *error_strategy = NULL; + int single_branch = -1; struct option module_clone_options[] = { OPT_STRING(0, "prefix", &prefix, @@ -1386,12 +1837,17 @@ 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 }; @@ -1413,6 +1869,10 @@ 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); @@ -1420,10 +1880,12 @@ 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)) + quiet, progress, single_branch)) 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); @@ -1473,11 +1935,13 @@ static void determine_submodule_update_strategy(struct repository *r, if (parse_submodule_update_strategy(update, out) < 0) die(_("Invalid update mode '%s' for submodule path '%s'"), update, path); - } else if (!repo_config_get_string_const(r, key, &val)) { + } else if (!repo_config_get_string_tmp(r, key, &val)) { if (parse_submodule_update_strategy(val, out) < 0) 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 @@ -1536,9 +2000,11 @@ 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; @@ -1553,10 +2019,14 @@ struct submodule_update_clone { int max_jobs; }; -#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} +#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, \ +} static void next_submodule_warn_missing(struct submodule_update_clone *suc, @@ -1621,7 +2091,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, } key = xstrfmt("submodule.%s.update", sub->name); - if (!repo_config_get_string_const(the_repository, key, &update_string)) { + if (!repo_config_get_string_tmp(the_repository, key, &update_string)) { update_type = parse_submodule_update_type(update_string); } else { update_type = sub->update_strategy.type; @@ -1644,7 +2114,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, strbuf_reset(&sb); strbuf_addf(&sb, "submodule.%s.url", sub->name); - if (repo_config_get_string_const(the_repository, sb.buf, &url)) { + if (repo_config_get_string_tmp(the_repository, sb.buf, &url)) { if (starts_with_dot_slash(sub->url) || starts_with_dot_dot_slash(sub->url)) { url = compute_submodule_clone_url(sub->url); @@ -1671,32 +2141,38 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, child->no_stdin = 1; child->stdout_to_stderr = 1; child->err = -1; - argv_array_push(&child->args, "submodule--helper"); - argv_array_push(&child->args, "clone"); + strvec_push(&child->args, "submodule--helper"); + strvec_push(&child->args, "clone"); if (suc->progress) - argv_array_push(&child->args, "--progress"); + strvec_push(&child->args, "--progress"); if (suc->quiet) - argv_array_push(&child->args, "--quiet"); + strvec_push(&child->args, "--quiet"); if (suc->prefix) - argv_array_pushl(&child->args, "--prefix", suc->prefix, NULL); + strvec_pushl(&child->args, "--prefix", suc->prefix, NULL); if (suc->recommend_shallow && sub->recommend_shallow == 1) - argv_array_push(&child->args, "--depth=1"); - 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); + strvec_push(&child->args, "--depth=1"); + if (suc->require_init) + strvec_push(&child->args, "--require-init"); + strvec_pushl(&child->args, "--path", sub->path, NULL); + strvec_pushl(&child->args, "--name", sub->name, NULL); + strvec_pushl(&child->args, "--url", url, NULL); if (suc->references.nr) { struct string_list_item *item; for_each_string_list_item(item, &suc->references) - argv_array_pushl(&child->args, "--reference", item->string, NULL); + strvec_pushl(&child->args, "--reference", item->string, NULL); } if (suc->dissociate) - argv_array_push(&child->args, "--dissociate"); + strvec_push(&child->args, "--dissociate"); if (suc->depth) - argv_array_push(&child->args, suc->depth); + strvec_push(&child->args, suc->depth); + if (suc->single_branch >= 0) + strvec_push(&child->args, suc->single_branch ? + "--single-branch" : + "--no-single-branch"); cleanup: - strbuf_reset(&displaypath_sb); - strbuf_reset(&sb); + strbuf_release(&displaypath_sb); + strbuf_release(&sb); if (need_free_url) free((void*)url); @@ -1870,11 +2346,15 @@ 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; @@ -1920,12 +2400,12 @@ static const char *remote_submodule_branch(const char *path) return NULL; key = xstrfmt("submodule.%s.branch", sub->name); - if (repo_config_get_string_const(the_repository, key, &branch)) + if (repo_config_get_string_tmp(the_repository, key, &branch)) branch = sub->branch; free(key); if (!branch) - return "master"; + return "HEAD"; if (!strcmp(branch, ".")) { const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL); @@ -2045,7 +2525,7 @@ static int ensure_core_worktree(int argc, const char **argv, const char *prefix) { const struct submodule *sub; const char *path; - char *cw; + const char *cw; struct repository subrepo; if (argc != 2) @@ -2060,7 +2540,7 @@ static int ensure_core_worktree(int argc, const char **argv, const char *prefix) if (repo_submodule_init(&subrepo, the_repository, sub)) die(_("could not get a repository handle for submodule '%s'"), path); - if (!repo_config_get_string(&subrepo, "core.worktree", &cw)) { + if (!repo_config_get_string_tmp(&subrepo, "core.worktree", &cw)) { char *cfg_file, *abs_path; const char *rel_path; struct strbuf sb = STRBUF_INIT; @@ -2190,6 +2670,80 @@ static int module_config(int argc, const char **argv, const char *prefix) usage_with_options(git_submodule_helper_usage, module_config_options); } +static int module_set_url(int argc, const char **argv, const char *prefix) +{ + int quiet = 0; + const char *newurl; + const char *path; + char *config_name; + + struct option options[] = { + OPT__QUIET(&quiet, N_("Suppress output for setting url of a submodule")), + OPT_END() + }; + const char *const usage[] = { + N_("git submodule--helper set-url [--quiet] <path> <newurl>"), + NULL + }; + + argc = parse_options(argc, argv, prefix, options, usage, 0); + + if (argc != 2 || !(path = argv[0]) || !(newurl = argv[1])) + usage_with_options(usage, options); + + config_name = xstrfmt("submodule.%s.url", path); + + config_set_in_gitmodules_file_gently(config_name, newurl); + sync_submodule(path, prefix, quiet ? OPT_QUIET : 0); + + free(config_name); + + return 0; +} + +static int module_set_branch(int argc, const char **argv, const char *prefix) +{ + int opt_default = 0, ret; + const char *opt_branch = NULL; + const char *path; + char *config_name; + + /* + * We accept the `quiet` option for uniformity across subcommands, + * though there is nothing to make less verbose in this subcommand. + */ + struct option options[] = { + OPT_NOOP_NOARG('q', "quiet"), + OPT_BOOL('d', "default", &opt_default, + N_("set the default tracking branch to master")), + OPT_STRING('b', "branch", &opt_branch, N_("branch"), + N_("set the default tracking branch")), + OPT_END() + }; + const char *const usage[] = { + N_("git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"), + N_("git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"), + NULL + }; + + argc = parse_options(argc, argv, prefix, options, usage, 0); + + if (!opt_branch && !opt_default) + die(_("--branch or --default required")); + + if (opt_branch && opt_default) + die(_("--branch and --default are mutually exclusive")); + + if (argc != 1 || !(path = argv[0])) + usage_with_options(usage, options); + + config_name = xstrfmt("submodule.%s.branch", path); + ret = config_set_in_gitmodules_file_gently(config_name, opt_branch); + + free(config_name); + return !!ret; +} + #define SUPPORT_SUPER_PREFIX (1<<0) struct cmd_struct { @@ -2214,12 +2768,15 @@ static struct cmd_struct commands[] = { {"print-default-remote", print_default_remote, 0}, {"sync", module_sync, SUPPORT_SUPER_PREFIX}, {"deinit", module_deinit, 0}, + {"summary", module_summary, SUPPORT_SUPER_PREFIX}, {"remote-branch", resolve_remote_submodule_branch, 0}, {"push-check", push_check, 0}, {"absorb-git-dirs", absorb_git_dirs, SUPPORT_SUPER_PREFIX}, {"is-active", is_active, 0}, {"check-name", check_name, 0}, {"config", module_config, 0}, + {"set-url", module_set_url, 0}, + {"set-branch", module_set_branch, 0}, }; int cmd_submodule__helper(int argc, const char **argv, const char *prefix) diff --git a/third_party/git/builtin/tag.c b/third_party/git/builtin/tag.c index e0a4c25382..ecf011776d 100644 --- a/third_party/git/builtin/tag.c +++ b/third_party/git/builtin/tag.c @@ -17,7 +17,7 @@ #include "diff.h" #include "revision.h" #include "gpg-interface.h" -#include "sha1-array.h" +#include "oid-array.h" #include "column.h" #include "ref-filter.h" @@ -26,7 +26,7 @@ static const char * const git_tag_usage[] = { "\t\t<tagname> [<head>]"), N_("git tag -d <tagname>..."), N_("git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n" - "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"), + "\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"), N_("git tag -v [--format=<format>] <tagname>..."), NULL }; @@ -231,8 +231,9 @@ static void create_tag(const struct object_id *object, const char *object_ref, if (type <= OBJ_NONE) die(_("bad object type.")); - if (type == OBJ_TAG && advice_nested_tag) - advise(_(message_advice_nested_tag), tag, object_ref); + if (type == OBJ_TAG) + advise_if_enabled(ADVICE_NESTED_TAG, _(message_advice_nested_tag), + tag, object_ref); strbuf_addf(&header, "object %s\n" @@ -409,8 +410,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix) OPT_GROUP(N_("Tag creation options")), OPT_BOOL('a', "annotate", &annotate, N_("annotated tag, needs a message")), - { OPTION_CALLBACK, 'm', "message", &msg, N_("message"), - N_("tag message"), PARSE_OPT_NONEG, parse_msg_arg }, + OPT_CALLBACK_F('m', "message", &msg, N_("message"), + N_("tag message"), PARSE_OPT_NONEG, parse_msg_arg), OPT_FILENAME('F', "file", &msgfile, N_("read message from file")), OPT_BOOL('e', "edit", &edit_flag, N_("force edit of tag message")), OPT_BOOL('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")), @@ -456,8 +457,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix) if (argc == 0) cmdmode = 'l'; else if (filter.with_commit || filter.no_commit || - filter.points_at.nr || filter.merge_commit || - filter.lines != -1) + filter.reachable_from || filter.unreachable_from || + filter.points_at.nr || filter.lines != -1) cmdmode = 'l'; } @@ -484,7 +485,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) } if (!sorting) sorting = ref_default_sorting(); - sorting->ignore_case = icase; + ref_sorting_icase_all(sorting, icase); filter.ignore_case = icase; if (cmdmode == 'l') { int ret; @@ -508,7 +509,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) die(_("--no-contains option is only allowed in list mode")); if (filter.points_at.nr) die(_("--points-at option is only allowed in list mode")); - if (filter.merge_commit) + if (filter.reachable_from || filter.unreachable_from) die(_("--merged and --no-merged options are only allowed in list mode")); if (cmdmode == 'd') return for_each_tag_name(argv, delete_tag, NULL); diff --git a/third_party/git/builtin/unpack-objects.c b/third_party/git/builtin/unpack-objects.c index a87a4bfd2c..dd4a75e030 100644 --- a/third_party/git/builtin/unpack-objects.c +++ b/third_party/git/builtin/unpack-objects.c @@ -24,6 +24,7 @@ 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 @@ -92,6 +93,7 @@ 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) @@ -263,7 +265,8 @@ static void write_object(unsigned nr, enum object_type type, } else { struct object *obj; int eaten; - hash_object_file(buf, size, type_name(type), &obj_list[nr].oid); + hash_object_file(the_hash_algo, 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, @@ -484,7 +487,6 @@ 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 dff2f4b837..79087bccea 100644 --- a/third_party/git/builtin/update-index.c +++ b/third_party/git/builtin/update-index.c @@ -35,6 +35,7 @@ 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; @@ -381,7 +382,8 @@ 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 (allow_remove && remove_file_from_cache(path)) + if (!ignore_skip_worktree_entries && allow_remove && + remove_file_from_cache(path)) return error("%s: cannot remove from the index", path); return 0; } @@ -966,6 +968,7 @@ 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"), @@ -982,14 +985,14 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) OPT_BIT(0, "unmerged", &refresh_args.flags, N_("refresh even if index contains unmerged entries"), REFRESH_UNMERGED), - {OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL, + OPT_CALLBACK_F(0, "refresh", &refresh_args, NULL, N_("refresh stat information"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, - refresh_callback}, - {OPTION_CALLBACK, 0, "really-refresh", &refresh_args, NULL, + refresh_callback), + OPT_CALLBACK_F(0, "really-refresh", &refresh_args, NULL, N_("like --refresh, but ignore assume-unchanged setting"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, - really_refresh_callback}, + really_refresh_callback), {OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL, N_("<mode>,<object>,<path>"), N_("add the specified entry to the index"), @@ -997,10 +1000,10 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP, NULL, 0, cacheinfo_callback}, - {OPTION_CALLBACK, 0, "chmod", &set_executable_bit, "(+|-)x", + OPT_CALLBACK_F(0, "chmod", &set_executable_bit, "(+|-)x", N_("override the executable bit of the listed files"), PARSE_OPT_NONEG, - chmod_callback}, + chmod_callback), {OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL, N_("mark files as \"not changing\""), PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG}, @@ -1013,6 +1016,8 @@ 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, @@ -1040,10 +1045,10 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) REFRESH_IGNORE_MISSING), OPT_SET_INT(0, "verbose", &verbose, N_("report actions to standard output"), 1), - {OPTION_CALLBACK, 0, "clear-resolve-undo", NULL, NULL, + OPT_CALLBACK_F(0, "clear-resolve-undo", NULL, NULL, N_("(for porcelains) forget saved unresolved conflicts"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, - resolve_undo_clear_callback}, + resolve_undo_clear_callback), OPT_INTEGER(0, "index-version", &preferred_index_format, N_("write index in this format")), OPT_BOOL(0, "split-index", &split_index, @@ -1180,11 +1185,12 @@ 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 (git_config_get_untracked_cache() == 1) + if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE) warning(_("core.untrackedCache is set to true; " "remove or change it, if you really want to " "disable the untracked cache")); @@ -1196,7 +1202,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 (git_config_get_untracked_cache() == 0) + if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE) 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/update-ref.c b/third_party/git/builtin/update-ref.c index 2d8f7f0578..8a2df4459c 100644 --- a/third_party/git/builtin/update-ref.c +++ b/third_party/git/builtin/update-ref.c @@ -4,7 +4,7 @@ #include "builtin.h" #include "parse-options.h" #include "quote.h" -#include "argv-array.h" +#include "strvec.h" static const char * const git_update_ref_usage[] = { N_("git update-ref [<options>] -d <refname> [<old-val>]"), @@ -50,7 +50,7 @@ static const char *parse_arg(const char *next, struct strbuf *arg) * the argument. Die if C-quoting is malformed or the reference name * is invalid. */ -static char *parse_refname(struct strbuf *input, const char **next) +static char *parse_refname(const char **next) { struct strbuf ref = STRBUF_INIT; @@ -95,7 +95,7 @@ static char *parse_refname(struct strbuf *input, const char **next) * provided but cannot be converted to a SHA-1, die. flags can * include PARSE_SHA1_OLD and/or PARSE_SHA1_ALLOW_EMPTY. */ -static int parse_next_oid(struct strbuf *input, const char **next, +static int parse_next_oid(const char **next, const char *end, struct object_id *oid, const char *command, const char *refname, int flags) @@ -103,7 +103,7 @@ static int parse_next_oid(struct strbuf *input, const char **next, struct strbuf arg = STRBUF_INIT; int ret = 0; - if (*next == input->buf + input->len) + if (*next == end) goto eof; if (line_termination) { @@ -128,7 +128,7 @@ static int parse_next_oid(struct strbuf *input, const char **next, die("%s %s: expected NUL but got: %s", command, refname, *next); (*next)++; - if (*next == input->buf + input->len) + if (*next == end) goto eof; strbuf_addstr(&arg, *next); *next += arg.len; @@ -178,23 +178,23 @@ static int parse_next_oid(struct strbuf *input, const char **next, * depending on how line_termination is set. */ -static const char *parse_cmd_update(struct ref_transaction *transaction, - struct strbuf *input, const char *next) +static void parse_cmd_update(struct ref_transaction *transaction, + const char *next, const char *end) { struct strbuf err = STRBUF_INIT; char *refname; struct object_id new_oid, old_oid; int have_old; - refname = parse_refname(input, &next); + refname = parse_refname(&next); if (!refname) die("update: missing <ref>"); - if (parse_next_oid(input, &next, &new_oid, "update", refname, + if (parse_next_oid(&next, end, &new_oid, "update", refname, PARSE_SHA1_ALLOW_EMPTY)) die("update %s: missing <newvalue>", refname); - have_old = !parse_next_oid(input, &next, &old_oid, "update", refname, + have_old = !parse_next_oid(&next, end, &old_oid, "update", refname, PARSE_SHA1_OLD); if (*next != line_termination) @@ -209,22 +209,20 @@ static const char *parse_cmd_update(struct ref_transaction *transaction, update_flags = default_flags; free(refname); strbuf_release(&err); - - return next; } -static const char *parse_cmd_create(struct ref_transaction *transaction, - struct strbuf *input, const char *next) +static void parse_cmd_create(struct ref_transaction *transaction, + const char *next, const char *end) { struct strbuf err = STRBUF_INIT; char *refname; struct object_id new_oid; - refname = parse_refname(input, &next); + refname = parse_refname(&next); if (!refname) die("create: missing <ref>"); - if (parse_next_oid(input, &next, &new_oid, "create", refname, 0)) + if (parse_next_oid(&next, end, &new_oid, "create", refname, 0)) die("create %s: missing <newvalue>", refname); if (is_null_oid(&new_oid)) @@ -241,23 +239,21 @@ static const char *parse_cmd_create(struct ref_transaction *transaction, update_flags = default_flags; free(refname); strbuf_release(&err); - - return next; } -static const char *parse_cmd_delete(struct ref_transaction *transaction, - struct strbuf *input, const char *next) +static void parse_cmd_delete(struct ref_transaction *transaction, + const char *next, const char *end) { struct strbuf err = STRBUF_INIT; char *refname; struct object_id old_oid; int have_old; - refname = parse_refname(input, &next); + refname = parse_refname(&next); if (!refname) die("delete: missing <ref>"); - if (parse_next_oid(input, &next, &old_oid, "delete", refname, + if (parse_next_oid(&next, end, &old_oid, "delete", refname, PARSE_SHA1_OLD)) { have_old = 0; } else { @@ -277,22 +273,20 @@ static const char *parse_cmd_delete(struct ref_transaction *transaction, update_flags = default_flags; free(refname); strbuf_release(&err); - - return next; } -static const char *parse_cmd_verify(struct ref_transaction *transaction, - struct strbuf *input, const char *next) +static void parse_cmd_verify(struct ref_transaction *transaction, + const char *next, const char *end) { struct strbuf err = STRBUF_INIT; char *refname; struct object_id old_oid; - refname = parse_refname(input, &next); + refname = parse_refname(&next); if (!refname) die("verify: missing <ref>"); - if (parse_next_oid(input, &next, &old_oid, "verify", refname, + if (parse_next_oid(&next, end, &old_oid, "verify", refname, PARSE_SHA1_OLD)) oidclr(&old_oid); @@ -306,50 +300,179 @@ static const char *parse_cmd_verify(struct ref_transaction *transaction, update_flags = default_flags; free(refname); strbuf_release(&err); - - return next; } -static const char *parse_cmd_option(struct strbuf *input, const char *next) +static void parse_cmd_option(struct ref_transaction *transaction, + const char *next, const char *end) { const char *rest; if (skip_prefix(next, "no-deref", &rest) && *rest == line_termination) update_flags |= REF_NO_DEREF; else die("option unknown: %s", next); - return rest; } -static void update_refs_stdin(struct ref_transaction *transaction) +static void parse_cmd_start(struct ref_transaction *transaction, + const char *next, const char *end) +{ + if (*next != line_termination) + die("start: extra input: %s", next); + puts("start: ok"); +} + +static void parse_cmd_prepare(struct ref_transaction *transaction, + const char *next, const char *end) +{ + struct strbuf error = STRBUF_INIT; + if (*next != line_termination) + die("prepare: extra input: %s", next); + if (ref_transaction_prepare(transaction, &error)) + die("prepare: %s", error.buf); + puts("prepare: ok"); +} + +static void parse_cmd_abort(struct ref_transaction *transaction, + const char *next, const char *end) +{ + struct strbuf error = STRBUF_INIT; + if (*next != line_termination) + die("abort: extra input: %s", next); + if (ref_transaction_abort(transaction, &error)) + die("abort: %s", error.buf); + puts("abort: ok"); +} + +static void parse_cmd_commit(struct ref_transaction *transaction, + const char *next, const char *end) +{ + struct strbuf error = STRBUF_INIT; + if (*next != line_termination) + die("commit: extra input: %s", next); + if (ref_transaction_commit(transaction, &error)) + die("commit: %s", error.buf); + puts("commit: ok"); + ref_transaction_free(transaction); +} + +enum update_refs_state { + /* Non-transactional state open for updates. */ + UPDATE_REFS_OPEN, + /* A transaction has been started. */ + UPDATE_REFS_STARTED, + /* References are locked and ready for commit */ + UPDATE_REFS_PREPARED, + /* Transaction has been committed or closed. */ + UPDATE_REFS_CLOSED, +}; + +static const struct parse_cmd { + const char *prefix; + void (*fn)(struct ref_transaction *, const char *, const char *); + unsigned args; + enum update_refs_state state; +} command[] = { + { "update", parse_cmd_update, 3, UPDATE_REFS_OPEN }, + { "create", parse_cmd_create, 2, UPDATE_REFS_OPEN }, + { "delete", parse_cmd_delete, 2, UPDATE_REFS_OPEN }, + { "verify", parse_cmd_verify, 2, UPDATE_REFS_OPEN }, + { "option", parse_cmd_option, 1, UPDATE_REFS_OPEN }, + { "start", parse_cmd_start, 0, UPDATE_REFS_STARTED }, + { "prepare", parse_cmd_prepare, 0, UPDATE_REFS_PREPARED }, + { "abort", parse_cmd_abort, 0, UPDATE_REFS_CLOSED }, + { "commit", parse_cmd_commit, 0, UPDATE_REFS_CLOSED }, +}; + +static void update_refs_stdin(void) { - struct strbuf input = STRBUF_INIT; - const char *next; + struct strbuf input = STRBUF_INIT, err = STRBUF_INIT; + enum update_refs_state state = UPDATE_REFS_OPEN; + struct ref_transaction *transaction; + int i, j; + + transaction = ref_transaction_begin(&err); + if (!transaction) + die("%s", err.buf); - if (strbuf_read(&input, 0, 1000) < 0) - die_errno("could not read from stdin"); - next = input.buf; /* Read each line dispatch its command */ - while (next < input.buf + input.len) { - if (*next == line_termination) + while (!strbuf_getwholeline(&input, stdin, line_termination)) { + const struct parse_cmd *cmd = NULL; + + if (*input.buf == line_termination) die("empty command in input"); - else if (isspace(*next)) - die("whitespace before command: %s", next); - else if (skip_prefix(next, "update ", &next)) - next = parse_cmd_update(transaction, &input, next); - else if (skip_prefix(next, "create ", &next)) - next = parse_cmd_create(transaction, &input, next); - else if (skip_prefix(next, "delete ", &next)) - next = parse_cmd_delete(transaction, &input, next); - else if (skip_prefix(next, "verify ", &next)) - next = parse_cmd_verify(transaction, &input, next); - else if (skip_prefix(next, "option ", &next)) - next = parse_cmd_option(&input, next); - else - die("unknown command: %s", next); - - next++; + else if (isspace(*input.buf)) + die("whitespace before command: %s", input.buf); + + for (i = 0; i < ARRAY_SIZE(command); i++) { + const char *prefix = command[i].prefix; + char c; + + if (!starts_with(input.buf, prefix)) + continue; + + /* + * If the command has arguments, verify that it's + * followed by a space. Otherwise, it shall be followed + * by a line terminator. + */ + c = command[i].args ? ' ' : line_termination; + if (input.buf[strlen(prefix)] != c) + continue; + + cmd = &command[i]; + break; + } + if (!cmd) + die("unknown command: %s", input.buf); + + /* + * Read additional arguments if NUL-terminated. Do not raise an + * error in case there is an early EOF to let the command + * handle missing arguments with a proper error message. + */ + for (j = 1; line_termination == '\0' && j < cmd->args; j++) + if (strbuf_appendwholeline(&input, stdin, line_termination)) + break; + + switch (state) { + case UPDATE_REFS_OPEN: + case UPDATE_REFS_STARTED: + /* Do not downgrade a transaction to a non-transaction. */ + if (cmd->state >= state) + state = cmd->state; + break; + case UPDATE_REFS_PREPARED: + if (cmd->state != UPDATE_REFS_CLOSED) + die("prepared transactions can only be closed"); + state = cmd->state; + break; + case UPDATE_REFS_CLOSED: + die("transaction is closed"); + break; + } + + cmd->fn(transaction, input.buf + strlen(cmd->prefix) + !!cmd->args, + input.buf + input.len); + } + + switch (state) { + case UPDATE_REFS_OPEN: + /* Commit by default if no transaction was requested. */ + if (ref_transaction_commit(transaction, &err)) + die("%s", err.buf); + ref_transaction_free(transaction); + break; + case UPDATE_REFS_STARTED: + case UPDATE_REFS_PREPARED: + /* If using a transaction, we want to abort it. */ + if (ref_transaction_abort(transaction, &err)) + die("%s", err.buf); + break; + case UPDATE_REFS_CLOSED: + /* Otherwise no need to do anything, the transaction was closed already. */ + break; } + strbuf_release(&err); strbuf_release(&input); } @@ -384,21 +507,11 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) } if (read_stdin) { - struct strbuf err = STRBUF_INIT; - struct ref_transaction *transaction; - - transaction = ref_transaction_begin(&err); - if (!transaction) - die("%s", err.buf); if (delete || argc > 0) usage_with_options(git_update_ref_usage, options); if (end_null) line_termination = '\0'; - update_refs_stdin(transaction); - if (ref_transaction_commit(transaction, &err)) - die("%s", err.buf); - ref_transaction_free(transaction); - strbuf_release(&err); + update_refs_stdin(); return 0; } diff --git a/third_party/git/builtin/upload-archive.c b/third_party/git/builtin/upload-archive.c index 018879737a..24654b4c9b 100644 --- a/third_party/git/builtin/upload-archive.c +++ b/third_party/git/builtin/upload-archive.c @@ -7,7 +7,7 @@ #include "pkt-line.h" #include "sideband.h" #include "run-command.h" -#include "argv-array.h" +#include "strvec.h" static const char upload_archive_usage[] = "git upload-archive <repo>"; @@ -19,7 +19,7 @@ static const char deadchild[] = int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix) { - struct argv_array sent_argv = ARGV_ARRAY_INIT; + struct strvec sent_argv = STRVEC_INIT; const char *arg_cmd = "argument "; if (argc != 2 || !strcmp(argv[1], "-h")) @@ -31,21 +31,21 @@ int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix) init_archivers(); /* put received options in sent_argv[] */ - argv_array_push(&sent_argv, "git-upload-archive"); + strvec_push(&sent_argv, "git-upload-archive"); for (;;) { char *buf = packet_read_line(0, NULL); if (!buf) break; /* got a flush */ - if (sent_argv.argc > MAX_ARGS) + if (sent_argv.nr > MAX_ARGS) die("Too many options (>%d)", MAX_ARGS - 1); if (!starts_with(buf, arg_cmd)) die("'argument' token or flush expected"); - argv_array_push(&sent_argv, buf + strlen(arg_cmd)); + strvec_push(&sent_argv, buf + strlen(arg_cmd)); } /* parse all options sent by the client */ - return write_archive(sent_argv.argc, sent_argv.argv, prefix, + return write_archive(sent_argv.nr, sent_argv.v, prefix, the_repository, NULL, 1); } diff --git a/third_party/git/builtin/verify-pack.c b/third_party/git/builtin/verify-pack.c index c2a1a5c504..05c5213594 100644 --- a/third_party/git/builtin/verify-pack.c +++ b/third_party/git/builtin/verify-pack.c @@ -7,21 +7,26 @@ #define VERIFY_PACK_VERBOSE 01 #define VERIFY_PACK_STAT_ONLY 02 -static int verify_one_pack(const char *path, unsigned int flags) +static int verify_one_pack(const char *path, unsigned int flags, const char *hash_algo) { struct child_process index_pack = CHILD_PROCESS_INIT; - const char *argv[] = {"index-pack", NULL, NULL, NULL }; + struct strvec *argv = &index_pack.args; struct strbuf arg = STRBUF_INIT; int verbose = flags & VERIFY_PACK_VERBOSE; int stat_only = flags & VERIFY_PACK_STAT_ONLY; int err; + strvec_push(argv, "index-pack"); + if (stat_only) - argv[1] = "--verify-stat-only"; + strvec_push(argv, "--verify-stat-only"); else if (verbose) - argv[1] = "--verify-stat"; + strvec_push(argv, "--verify-stat"); else - argv[1] = "--verify"; + strvec_push(argv, "--verify"); + + if (hash_algo) + strvec_pushf(argv, "--object-format=%s", hash_algo); /* * In addition to "foo.pack" we accept "foo.idx" and "foo"; @@ -31,9 +36,8 @@ static int verify_one_pack(const char *path, unsigned int flags) if (strbuf_strip_suffix(&arg, ".idx") || !ends_with(arg.buf, ".pack")) strbuf_addstr(&arg, ".pack"); - argv[2] = arg.buf; + strvec_push(argv, arg.buf); - index_pack.argv = argv; index_pack.git_cmd = 1; err = run_command(&index_pack); @@ -60,12 +64,15 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix) { int err = 0; unsigned int flags = 0; + const char *object_format = NULL; int i; const struct option verify_pack_options[] = { OPT_BIT('v', "verbose", &flags, N_("verbose"), VERIFY_PACK_VERBOSE), OPT_BIT('s', "stat-only", &flags, N_("show statistics only"), VERIFY_PACK_STAT_ONLY), + OPT_STRING(0, "object-format", &object_format, N_("hash"), + N_("specify the hash algorithm to use")), OPT_END() }; @@ -75,7 +82,7 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix) if (argc < 1) usage_with_options(verify_pack_usage, verify_pack_options); for (i = 0; i < argc; i++) { - if (verify_one_pack(argv[i], flags)) + if (verify_one_pack(argv[i], flags, object_format)) err = 1; } diff --git a/third_party/git/builtin/worktree.c b/third_party/git/builtin/worktree.c index a5bb02b207..99abaeec6c 100644 --- a/third_party/git/builtin/worktree.c +++ b/third_party/git/builtin/worktree.c @@ -4,13 +4,12 @@ #include "builtin.h" #include "dir.h" #include "parse-options.h" -#include "argv-array.h" +#include "strvec.h" #include "branch.h" #include "refs.h" #include "run-command.h" #include "sigchain.h" #include "submodule.h" -#include "refs.h" #include "utf8.h" #include "worktree.h" @@ -68,7 +67,12 @@ static void delete_worktrees_dir_if_empty(void) rmdir(git_path("worktrees")); /* ignore failed removal */ } -static int prune_worktree(const char *id, struct strbuf *reason) +/* + * Return true if worktree entry should be pruned, along with the reason for + * pruning. Otherwise, return false and the worktree's path, or NULL if it + * cannot be determined. Caller is responsible for freeing returned path. + */ +static int should_prune_worktree(const char *id, struct strbuf *reason, char **wtpath) { struct stat st; char *path; @@ -76,20 +80,21 @@ static int prune_worktree(const char *id, struct strbuf *reason) size_t len; ssize_t read_result; + *wtpath = NULL; if (!is_directory(git_path("worktrees/%s", id))) { - strbuf_addf(reason, _("Removing worktrees/%s: not a valid directory"), id); + strbuf_addstr(reason, _("not a valid directory")); return 1; } if (file_exists(git_path("worktrees/%s/locked", id))) return 0; if (stat(git_path("worktrees/%s/gitdir", id), &st)) { - strbuf_addf(reason, _("Removing worktrees/%s: gitdir file does not exist"), id); + strbuf_addstr(reason, _("gitdir file does not exist")); return 1; } fd = open(git_path("worktrees/%s/gitdir", id), O_RDONLY); if (fd < 0) { - strbuf_addf(reason, _("Removing worktrees/%s: unable to read gitdir file (%s)"), - id, strerror(errno)); + strbuf_addf(reason, _("unable to read gitdir file (%s)"), + strerror(errno)); return 1; } len = xsize_t(st.st_size); @@ -97,8 +102,8 @@ static int prune_worktree(const char *id, struct strbuf *reason) read_result = read_in_full(fd, path, len); if (read_result < 0) { - strbuf_addf(reason, _("Removing worktrees/%s: unable to read gitdir file (%s)"), - id, strerror(errno)); + strbuf_addf(reason, _("unable to read gitdir file (%s)"), + strerror(errno)); close(fd); free(path); return 1; @@ -107,53 +112,103 @@ static int prune_worktree(const char *id, struct strbuf *reason) if (read_result != len) { strbuf_addf(reason, - _("Removing worktrees/%s: short read (expected %"PRIuMAX" bytes, read %"PRIuMAX")"), - id, (uintmax_t)len, (uintmax_t)read_result); + _("short read (expected %"PRIuMAX" bytes, read %"PRIuMAX")"), + (uintmax_t)len, (uintmax_t)read_result); free(path); return 1; } while (len && (path[len - 1] == '\n' || path[len - 1] == '\r')) len--; if (!len) { - strbuf_addf(reason, _("Removing worktrees/%s: invalid gitdir file"), id); + strbuf_addstr(reason, _("invalid gitdir file")); free(path); return 1; } path[len] = '\0'; if (!file_exists(path)) { - free(path); if (stat(git_path("worktrees/%s/index", id), &st) || st.st_mtime <= expire) { - strbuf_addf(reason, _("Removing worktrees/%s: gitdir file points to non-existent location"), id); + strbuf_addstr(reason, _("gitdir file points to non-existent location")); + free(path); return 1; } else { + *wtpath = path; return 0; } } - free(path); + *wtpath = path; return 0; } +static void prune_worktree(const char *id, const char *reason) +{ + if (show_only || verbose) + printf_ln(_("Removing %s/%s: %s"), "worktrees", id, reason); + if (!show_only) + delete_git_dir(id); +} + +static int prune_cmp(const void *a, const void *b) +{ + const struct string_list_item *x = a; + const struct string_list_item *y = b; + int c; + + if ((c = fspathcmp(x->string, y->string))) + return c; + /* + * paths same; prune_dupes() removes all but the first worktree entry + * having the same path, so sort main worktree ('util' is NULL) above + * linked worktrees ('util' not NULL) since main worktree can't be + * removed + */ + if (!x->util) + return -1; + if (!y->util) + return 1; + /* paths same; sort by .git/worktrees/<id> */ + return strcmp(x->util, y->util); +} + +static void prune_dups(struct string_list *l) +{ + int i; + + QSORT(l->items, l->nr, prune_cmp); + for (i = 1; i < l->nr; i++) { + if (!fspathcmp(l->items[i].string, l->items[i - 1].string)) + prune_worktree(l->items[i].util, "duplicate entry"); + } +} + static void prune_worktrees(void) { struct strbuf reason = STRBUF_INIT; + struct strbuf main_path = STRBUF_INIT; + struct string_list kept = STRING_LIST_INIT_NODUP; DIR *dir = opendir(git_path("worktrees")); struct dirent *d; if (!dir) return; while ((d = readdir(dir)) != NULL) { + char *path; if (is_dot_or_dotdot(d->d_name)) continue; strbuf_reset(&reason); - if (!prune_worktree(d->d_name, &reason)) - continue; - if (show_only || verbose) - printf("%s\n", reason.buf); - if (show_only) - continue; - delete_git_dir(d->d_name); + if (should_prune_worktree(d->d_name, &reason, &path)) + prune_worktree(d->d_name, reason.buf); + else if (path) + string_list_append(&kept, path)->util = xstrdup(d->d_name); } closedir(dir); + + strbuf_add_absolute_path(&main_path, get_git_common_dir()); + /* massage main worktree absolute path to match 'gitdir' content */ + strbuf_strip_suffix(&main_path, "/."); + string_list_append(&kept, strbuf_detach(&main_path, NULL)); + prune_dups(&kept); + string_list_clear(&kept, 1); + if (!show_only) delete_worktrees_dir_if_empty(); strbuf_release(&reason); @@ -225,59 +280,55 @@ static const char *worktree_basename(const char *path, int *olen) return name; } -static void validate_worktree_add(const char *path, const struct add_opts *opts) +/* check that path is viable location for worktree */ +static void check_candidate_path(const char *path, + int force, + struct worktree **worktrees, + const char *cmd) { - struct worktree **worktrees; struct worktree *wt; int locked; if (file_exists(path) && !is_empty_dir(path)) die(_("'%s' already exists"), path); - worktrees = get_worktrees(0); - /* - * 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); + wt = find_worktree_by_path(worktrees, path); if (!wt) - goto done; + return; locked = !!worktree_lock_reason(wt); - if ((!locked && opts->force) || (locked && opts->force > 1)) { + if ((!locked && force) || (locked && force > 1)) { if (delete_git_dir(wt->id)) - die(_("unable to re-add worktree '%s'"), path); - goto done; + die(_("unusable worktree destination '%s'"), path); + return; } if (locked) - die(_("'%s' is a missing but locked worktree;\nuse 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), path); + die(_("'%s' is a missing but locked worktree;\nuse '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), cmd, path); else - die(_("'%s' is a missing but already registered worktree;\nuse 'add -f' to override, or 'prune' or 'remove' to clear"), path); - -done: - free_worktrees(worktrees); + die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), cmd, path); } static int add_worktree(const char *path, const char *refname, const struct add_opts *opts) { struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT; - struct strbuf sb = STRBUF_INIT; + struct strbuf sb = STRBUF_INIT, realpath = STRBUF_INIT; const char *name; struct child_process cp = CHILD_PROCESS_INIT; - struct argv_array child_env = ARGV_ARRAY_INIT; + struct strvec child_env = STRVEC_INIT; unsigned int counter = 0; int len, ret; struct strbuf symref = STRBUF_INIT; struct commit *commit = NULL; int is_branch = 0; struct strbuf sb_name = STRBUF_INIT; + struct worktree **worktrees; - validate_worktree_add(path, opts); + worktrees = get_worktrees(); + check_candidate_path(path, opts->force, worktrees, "add"); + free_worktrees(worktrees); + worktrees = NULL; /* is 'refname' a branch or commit? */ if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) && @@ -338,9 +389,11 @@ static int add_worktree(const char *path, const char *refname, strbuf_reset(&sb); strbuf_addf(&sb, "%s/gitdir", sb_repo.buf); - write_file(sb.buf, "%s", real_path(sb_git.buf)); + strbuf_realpath(&realpath, sb_git.buf, 1); + write_file(sb.buf, "%s", realpath.buf); + strbuf_realpath(&realpath, get_git_common_dir(), 1); write_file(sb_git.buf, "gitdir: %s/worktrees/%s", - real_path(get_git_common_dir()), name); + realpath.buf, name); /* * This is to keep resolve_ref() happy. We need a valid HEAD * or is_git_directory() will reject the directory. Any value which @@ -350,37 +403,37 @@ 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", sha1_to_hex(null_sha1)); + write_file(sb.buf, "%s", oid_to_hex(&null_oid)); strbuf_reset(&sb); strbuf_addf(&sb, "%s/commondir", sb_repo.buf); write_file(sb.buf, "../.."); - argv_array_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf); - argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path); + strvec_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf); + strvec_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path); cp.git_cmd = 1; if (!is_branch) - argv_array_pushl(&cp.args, "update-ref", "HEAD", - oid_to_hex(&commit->object.oid), NULL); + strvec_pushl(&cp.args, "update-ref", "HEAD", + oid_to_hex(&commit->object.oid), NULL); else { - argv_array_pushl(&cp.args, "symbolic-ref", "HEAD", - symref.buf, NULL); + strvec_pushl(&cp.args, "symbolic-ref", "HEAD", + symref.buf, NULL); if (opts->quiet) - argv_array_push(&cp.args, "--quiet"); + strvec_push(&cp.args, "--quiet"); } - cp.env = child_env.argv; + cp.env = child_env.v; ret = run_command(&cp); if (ret) goto done; if (opts->checkout) { cp.argv = NULL; - argv_array_clear(&cp.args); - argv_array_pushl(&cp.args, "reset", "--hard", NULL); + strvec_clear(&cp.args); + strvec_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL); if (opts->quiet) - argv_array_push(&cp.args, "--quiet"); - cp.env = child_env.argv; + strvec_push(&cp.args, "--quiet"); + cp.env = child_env.v; ret = run_command(&cp); if (ret) goto done; @@ -412,20 +465,21 @@ done: cp.env = env; cp.argv = NULL; cp.trace2_hook_name = "post-checkout"; - argv_array_pushl(&cp.args, absolute_path(hook), - oid_to_hex(&null_oid), - oid_to_hex(&commit->object.oid), - "1", NULL); + strvec_pushl(&cp.args, absolute_path(hook), + oid_to_hex(&null_oid), + oid_to_hex(&commit->object.oid), + "1", NULL); ret = run_command(&cp); } } - argv_array_clear(&child_env); + strvec_clear(&child_env); strbuf_release(&sb); strbuf_release(&symref); strbuf_release(&sb_repo); strbuf_release(&sb_git); strbuf_release(&sb_name); + strbuf_release(&realpath); return ret; } @@ -501,7 +555,7 @@ static int add(int ac, const char **av, const char *prefix) N_("create a new branch")), OPT_STRING('B', NULL, &new_branch_force, N_("branch"), N_("create or reset a branch")), - OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")), + OPT_BOOL('d', "detach", &opts.detach, N_("detach HEAD at named commit")), OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")), OPT_BOOL(0, "lock", &opts.keep_locked, N_("keep the new working tree locked")), OPT__QUIET(&opts.quiet, N_("suppress progress reporting")), @@ -565,15 +619,15 @@ static int add(int ac, const char **av, const char *prefix) if (new_branch) { struct child_process cp = CHILD_PROCESS_INIT; cp.git_cmd = 1; - argv_array_push(&cp.args, "branch"); + strvec_push(&cp.args, "branch"); if (new_branch_force) - argv_array_push(&cp.args, "--force"); + strvec_push(&cp.args, "--force"); if (opts.quiet) - argv_array_push(&cp.args, "--quiet"); - argv_array_push(&cp.args, new_branch); - argv_array_push(&cp.args, branch); + strvec_push(&cp.args, "--quiet"); + strvec_push(&cp.args, new_branch); + strvec_push(&cp.args, branch); if (opt_track) - argv_array_push(&cp.args, opt_track); + strvec_push(&cp.args, opt_track); if (run_command(&cp)) return -1; branch = new_branch; @@ -643,6 +697,23 @@ static void measure_widths(struct worktree **wt, int *abbrev, int *maxlen) } } +static int pathcmp(const void *a_, const void *b_) +{ + const struct worktree *const *a = a_; + const struct worktree *const *b = b_; + return fspathcmp((*a)->path, (*b)->path); +} + +static void pathsort(struct worktree **wt) +{ + int n = 0; + struct worktree **p = wt; + + while (*p++) + n++; + QSORT(wt, n, pathcmp); +} + static int list(int ac, const char **av, const char *prefix) { int porcelain = 0; @@ -656,9 +727,12 @@ static int list(int ac, const char **av, const char *prefix) if (ac) usage_with_options(worktree_usage, options); else { - struct worktree **worktrees = get_worktrees(GWT_SORT_LINKED); + struct worktree **worktrees = get_worktrees(); int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i; + /* sort worktrees by path but keep main worktree at top */ + pathsort(worktrees + 1); + if (!porcelain) measure_widths(worktrees, &abbrev, &path_maxlen); @@ -687,7 +761,7 @@ static int lock_worktree(int ac, const char **av, const char *prefix) if (ac != 1) usage_with_options(worktree_usage, options); - worktrees = get_worktrees(0); + worktrees = get_worktrees(); wt = find_worktree(worktrees, prefix, av[0]); if (!wt) die(_("'%s' is not a working tree"), av[0]); @@ -720,7 +794,7 @@ static int unlock_worktree(int ac, const char **av, const char *prefix) if (ac != 1) usage_with_options(worktree_usage, options); - worktrees = get_worktrees(0); + worktrees = get_worktrees(); wt = find_worktree(worktrees, prefix, av[0]); if (!wt) die(_("'%s' is not a working tree"), av[0]); @@ -794,7 +868,7 @@ static int move_worktree(int ac, const char **av, const char *prefix) strbuf_addstr(&dst, path); free(path); - worktrees = get_worktrees(0); + worktrees = get_worktrees(); wt = find_worktree(worktrees, prefix, av[0]); if (!wt) die(_("'%s' is not a working tree"), av[0]); @@ -809,8 +883,7 @@ static int move_worktree(int ac, const char **av, const char *prefix) strbuf_trim_trailing_dir_sep(&dst); strbuf_addstr(&dst, sep); } - if (file_exists(dst.buf)) - die(_("target '%s' already exists"), dst.buf); + check_candidate_path(dst.buf, force, worktrees, "move"); validate_no_submodules(wt); @@ -851,7 +924,6 @@ static int move_worktree(int ac, const char **av, const char *prefix) static void check_clean_worktree(struct worktree *wt, const char *original_path) { - struct argv_array child_env = ARGV_ARRAY_INIT; struct child_process cp; char buf[1]; int ret; @@ -862,15 +934,14 @@ static void check_clean_worktree(struct worktree *wt, */ validate_no_submodules(wt); - argv_array_pushf(&child_env, "%s=%s/.git", - GIT_DIR_ENVIRONMENT, wt->path); - argv_array_pushf(&child_env, "%s=%s", - GIT_WORK_TREE_ENVIRONMENT, wt->path); - memset(&cp, 0, sizeof(cp)); - argv_array_pushl(&cp.args, "status", - "--porcelain", "--ignore-submodules=none", - NULL); - cp.env = child_env.argv; + child_process_init(&cp); + strvec_pushf(&cp.env_array, "%s=%s/.git", + GIT_DIR_ENVIRONMENT, wt->path); + strvec_pushf(&cp.env_array, "%s=%s", + GIT_WORK_TREE_ENVIRONMENT, wt->path); + strvec_pushl(&cp.args, "status", + "--porcelain", "--ignore-submodules=none", + NULL); cp.git_cmd = 1; cp.dir = wt->path; cp.out = -1; @@ -880,7 +951,7 @@ static void check_clean_worktree(struct worktree *wt, original_path); ret = xread(cp.out, buf, sizeof(buf)); if (ret) - die(_("'%s' is dirty, use --force to delete it"), + die(_("'%s' contains modified or untracked files, use --force to delete it"), original_path); close(cp.out); ret = finish_command(&cp); @@ -921,7 +992,7 @@ static int remove_worktree(int ac, const char **av, const char *prefix) if (ac != 1) usage_with_options(worktree_usage, options); - worktrees = get_worktrees(0); + worktrees = get_worktrees(); wt = find_worktree(worktrees, prefix, av[0]); if (!wt) die(_("'%s' is not a working tree"), av[0]); @@ -957,6 +1028,34 @@ static int remove_worktree(int ac, const char **av, const char *prefix) return ret; } +static void report_repair(int iserr, const char *path, const char *msg, void *cb_data) +{ + if (!iserr) { + printf_ln(_("repair: %s: %s"), msg, path); + } else { + int *exit_status = (int *)cb_data; + fprintf_ln(stderr, _("error: %s: %s"), msg, path); + *exit_status = 1; + } +} + +static int repair(int ac, const char **av, const char *prefix) +{ + const char **p; + const char *self[] = { ".", NULL }; + struct option options[] = { + OPT_END() + }; + int rc = 0; + + ac = parse_options(ac, av, prefix, options, worktree_usage, 0); + repair_worktrees(report_repair, &rc); + p = ac > 0 ? av : self; + for (; *p; p++) + repair_worktree_at_path(*p, report_repair, &rc); + return rc; +} + int cmd_worktree(int ac, const char **av, const char *prefix) { struct option options[] = { @@ -983,5 +1082,7 @@ int cmd_worktree(int ac, const char **av, const char *prefix) return move_worktree(ac - 1, av + 1, prefix); if (!strcmp(av[1], "remove")) return remove_worktree(ac - 1, av + 1, prefix); + if (!strcmp(av[1], "repair")) + return repair(ac - 1, av + 1, prefix); usage_with_options(worktree_usage, options); } diff --git a/third_party/git/bulk-checkin.c b/third_party/git/bulk-checkin.c index 39ee7d6107..583aacb9e3 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; + struct hashfile_checkpoint checkpoint = {0}; 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 b5d21cd80f..cb0e5931ac 100644 --- a/third_party/git/bundle.c +++ b/third_party/git/bundle.c @@ -10,9 +10,18 @@ #include "list-objects.h" #include "run-command.h" #include "refs.h" -#include "argv-array.h" +#include "strvec.h" -static const char bundle_signature[] = "# v2 git bundle\n"; + +static const char v2_bundle_signature[] = "# v2 git bundle\n"; +static const char v3_bundle_signature[] = "# v3 git bundle\n"; +static struct { + int version; + const char *signature; +} bundle_sigs[] = { + { 2, v2_bundle_signature }, + { 3, v3_bundle_signature }, +}; static void add_to_ref_list(const struct object_id *oid, const char *name, struct ref_list *list) @@ -23,6 +32,32 @@ static void add_to_ref_list(const struct object_id *oid, const char *name, list->nr++; } +static int parse_capability(struct bundle_header *header, const char *capability) +{ + const char *arg; + if (skip_prefix(capability, "object-format=", &arg)) { + int algo = hash_algo_by_name(arg); + if (algo == GIT_HASH_UNKNOWN) + return error(_("unrecognized bundle hash algorithm: %s"), arg); + header->hash_algo = &hash_algos[algo]; + return 0; + } + return error(_("unknown capability '%s'"), capability); +} + +static int parse_bundle_signature(struct bundle_header *header, const char *line) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(bundle_sigs); i++) { + if (!strcmp(line, bundle_sigs[i].signature)) { + header->version = bundle_sigs[i].version; + return 0; + } + } + return -1; +} + static int parse_bundle_header(int fd, struct bundle_header *header, const char *report_path) { @@ -31,14 +66,16 @@ static int parse_bundle_header(int fd, struct bundle_header *header, /* The bundle header begins with the signature */ if (strbuf_getwholeline_fd(&buf, fd, '\n') || - strcmp(buf.buf, bundle_signature)) { + parse_bundle_signature(header, buf.buf)) { if (report_path) - error(_("'%s' does not look like a v2 bundle file"), + error(_("'%s' does not look like a v2 or v3 bundle file"), report_path); status = -1; goto abort; } + header->hash_algo = the_hash_algo; + /* The bundle header ends with an empty line */ while (!strbuf_getwholeline_fd(&buf, fd, '\n') && buf.len && buf.buf[0] != '\n') { @@ -46,18 +83,27 @@ static int parse_bundle_header(int fd, struct bundle_header *header, int is_prereq = 0; const char *p; + strbuf_rtrim(&buf); + + if (header->version == 3 && *buf.buf == '@') { + if (parse_capability(header, buf.buf + 1)) { + status = -1; + break; + } + continue; + } + if (*buf.buf == '-') { is_prereq = 1; strbuf_remove(&buf, 0, 1); } - strbuf_rtrim(&buf); /* * Tip lines have object name, SP, and refname. * Prerequisites have object name that is optionally * followed by SP and subject line. */ - if (parse_oid_hex(buf.buf, &oid, &p) || + if (parse_oid_hex_algop(buf.buf, &oid, &p, header->hash_algo) || (*p && !isspace(*p)) || (!is_prereq && !*p)) { if (report_path) @@ -249,15 +295,16 @@ out: /* Write the pack data to bundle_fd */ -static int write_pack_data(int bundle_fd, struct rev_info *revs) +static int write_pack_data(int bundle_fd, struct rev_info *revs, struct strvec *pack_options) { struct child_process pack_objects = CHILD_PROCESS_INIT; int i; - argv_array_pushl(&pack_objects.args, - "pack-objects", "--all-progress-implied", - "--stdout", "--thin", "--delta-base-offset", - NULL); + strvec_pushl(&pack_objects.args, + "pack-objects", + "--stdout", "--thin", "--delta-base-offset", + NULL); + strvec_pushv(&pack_objects.args, pack_options->v); pack_objects.in = -1; pack_objects.out = bundle_fd; pack_objects.git_cmd = 1; @@ -282,7 +329,7 @@ static int write_pack_data(int bundle_fd, struct rev_info *revs) 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), GIT_SHA1_HEXSZ); + write_or_die(pack_objects.in, oid_to_hex(&object->oid), the_hash_algo->hexsz); write_or_die(pack_objects.in, "\n", 1); } close(pack_objects.in); @@ -300,11 +347,11 @@ static int compute_and_write_prerequisites(int bundle_fd, FILE *rls_fout; int i; - argv_array_pushl(&rls.args, - "rev-list", "--boundary", "--pretty=oneline", - NULL); + strvec_pushl(&rls.args, + "rev-list", "--boundary", "--pretty=oneline", + NULL); for (i = 1; i < argc; i++) - argv_array_push(&rls.args, argv[i]); + strvec_push(&rls.args, argv[i]); rls.out = -1; rls.git_cmd = 1; if (start_command(&rls)) @@ -356,7 +403,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs) if (e->item->flags & UNINTERESTING) continue; - if (dwim_ref(e->name, strlen(e->name), &oid, &ref) != 1) + if (dwim_ref(e->name, strlen(e->name), &oid, &ref, 0) != 1) goto skip_write_ref; if (read_ref_full(e->name, RESOLVE_REF_READING, &oid, &flag)) flag = 0; @@ -414,7 +461,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), 40); + write_or_die(bundle_fd, oid_to_hex(&e->item->oid), the_hash_algo->hexsz); write_or_die(bundle_fd, " ", 1); write_or_die(bundle_fd, display_ref, strlen(display_ref)); write_or_die(bundle_fd, "\n", 1); @@ -428,13 +475,14 @@ 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) + int argc, const char **argv, struct strvec *pack_options, int version) { struct lock_file lock = LOCK_INIT; int bundle_fd = -1; int bundle_to_stdout; int ref_count = 0; struct rev_info revs; + int min_version = the_hash_algo == &hash_algos[GIT_HASH_SHA1] ? 2 : 3; bundle_to_stdout = !strcmp(path, "-"); if (bundle_to_stdout) @@ -443,8 +491,22 @@ int create_bundle(struct repository *r, const char *path, bundle_fd = hold_lock_file_for_update(&lock, path, LOCK_DIE_ON_ERROR); - /* write signature */ - write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature)); + if (version == -1) + version = min_version; + + if (version < 2 || version > 3) { + die(_("unsupported bundle version %d"), version); + } else if (version < min_version) { + die(_("cannot write bundle version %d with algorithm %s"), version, the_hash_algo->name); + } else if (version == 2) { + write_or_die(bundle_fd, v2_bundle_signature, strlen(v2_bundle_signature)); + } else { + const char *capability = "@object-format="; + write_or_die(bundle_fd, v3_bundle_signature, strlen(v3_bundle_signature)); + write_or_die(bundle_fd, capability, strlen(capability)); + write_or_die(bundle_fd, the_hash_algo->name, strlen(the_hash_algo->name)); + write_or_die(bundle_fd, "\n", 1); + } /* init revs to list objects for pack-objects later */ save_commit_buffer = 0; @@ -470,7 +532,7 @@ int create_bundle(struct repository *r, const char *path, goto err; /* write pack */ - if (write_pack_data(bundle_fd, &revs)) + if (write_pack_data(bundle_fd, &revs, pack_options)) goto err; if (!bundle_to_stdout) { diff --git a/third_party/git/bundle.h b/third_party/git/bundle.h index 37c37d7f65..f9e2d1c8ef 100644 --- a/third_party/git/bundle.h +++ b/third_party/git/bundle.h @@ -1,6 +1,7 @@ #ifndef BUNDLE_H #define BUNDLE_H +#include "strvec.h" #include "cache.h" struct ref_list { @@ -12,14 +13,17 @@ struct ref_list { }; struct bundle_header { + unsigned version; struct ref_list prerequisites; struct ref_list references; + const struct git_hash_algo *hash_algo; }; 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); + int argc, const char **argv, struct strvec *pack_options, + int version); 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 706ffcf188..a537a806c1 100644 --- a/third_party/git/cache-tree.c +++ b/third_party/git/cache-tree.c @@ -5,6 +5,7 @@ #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 @@ -357,7 +358,7 @@ static int update_one(struct cache_tree *it, } ce_missing_ok = mode == S_IFGITLINK || missing_ok || - (repository_format_partial_clone && + (has_promisor_remote() && ce_skip_worktree(ce)); if (is_null_oid(oid) || (!ce_missing_ok && !has_object_file(oid))) { @@ -406,13 +407,15 @@ static int update_one(struct cache_tree *it, if (repair) { struct object_id oid; - hash_object_file(buffer.buf, buffer.len, tree_type, &oid); - if (has_object_file(&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)) oidcpy(&it->oid, &oid); else to_invalidate = 1; } else if (dryrun) { - hash_object_file(buffer.buf, buffer.len, tree_type, &it->oid); + hash_object_file(the_hash_algo, buffer.buf, buffer.len, + tree_type, &it->oid); } else if (write_object_file(buffer.buf, buffer.len, tree_type, &it->oid)) { strbuf_release(&buffer); @@ -608,11 +611,66 @@ 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 = 0; + int ret; hold_lock_file_for_update(&lock_file, index_path, LOCK_DIE_ON_ERROR); @@ -621,18 +679,14 @@ 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); - if (!index_state->cache_tree) - index_state->cache_tree = cache_tree(); + was_valid = !(flags & WRITE_TREE_IGNORE_CACHE_TREE) && + index_state->cache_tree && + cache_tree_fully_valid(index_state->cache_tree); - 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; - } + ret = write_index_as_tree_internal(oid, index_state, was_valid, flags, + prefix); + if (!ret && !was_valid) { 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 @@ -642,18 +696,6 @@ 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; @@ -713,7 +755,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.path); + return cache_tree_find(our_parent, info->name); } int cache_tree_matches_traversal(struct cache_tree *root, @@ -786,9 +828,10 @@ 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, the_hash_algo->rawsz); + strbuf_add(&tree_buf, oid->hash, r->hash_algo->rawsz); } - hash_object_file(tree_buf.buf, tree_buf.len, tree_type, &new_oid); + hash_object_file(r->hash_algo, 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 757bbc48bc..639bfa5340 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_cache_as_tree flags */ +/* bitmasks to write_index_as_tree flags */ #define WRITE_TREE_MISSING_OK 1 #define WRITE_TREE_IGNORE_CACHE_TREE 2 #define WRITE_TREE_DRY_RUN 4 @@ -46,6 +46,7 @@ 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 023e8af412..a5930c1680 100644 --- a/third_party/git/cache.h +++ b/third_party/git/cache.h @@ -14,7 +14,7 @@ #include "pack-revindex.h" #include "hash.h" #include "path.h" -#include "sha1-array.h" +#include "oid-array.h" #include "repository.h" #include "mem-pool.h" @@ -304,6 +304,7 @@ static inline unsigned int canon_mode(unsigned int mode) struct split_index; struct untracked_cache; +struct progress; struct index_state { struct cache_entry **cache; @@ -323,9 +324,10 @@ struct index_state { struct hashmap dir_hash; struct object_id oid; struct untracked_cache *untracked; - uint64_t fsmonitor_last_update; + char *fsmonitor_last_update; struct ewah_bitmap *fsmonitor_dirty; struct mem_pool *ce_mem_pool; + struct progress *progress; }; /* Name hashing */ @@ -414,6 +416,7 @@ 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)) @@ -540,7 +543,7 @@ const char *get_git_common_dir(void); char *get_object_directory(void); char *get_index_file(void); char *get_graft_file(struct repository *r); -void set_git_dir(const char *path); +void set_git_dir(const char *path, int make_realpath); int get_common_dir_noenv(struct strbuf *sb, const char *gitdir); int get_common_dir(struct strbuf *sb, const char *gitdir); const char *get_git_namespace(void); @@ -624,17 +627,55 @@ int path_inside_repo(const char *prefix, const char *path); #define INIT_DB_EXIST_OK 0x0002 int init_db(const char *git_dir, const char *real_git_dir, - const char *template_dir, unsigned int flags); + const char *template_dir, int hash_algo, + const char *initial_branch, unsigned int flags); +void initialize_repository_version(int hash_algo, int reinit); void sanitize_stdfds(void); int daemonize(void); #define alloc_nr(x) (((x)+16)*3/2) -/* - * 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. +/** + * 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. * * DO NOT USE any expression with side-effect for 'x', 'nr', or 'alloc'. */ @@ -649,6 +690,25 @@ 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, @@ -725,6 +785,19 @@ 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 */ @@ -812,6 +885,23 @@ 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 *); @@ -831,8 +921,8 @@ extern int assume_unchanged; extern int prefer_symlink_refs; extern int warn_ambiguous_refs; extern int warn_on_object_refname_ambiguity; -extern const char *apply_default_whitespace; -extern const char *apply_default_ignorewhitespace; +extern char *apply_default_whitespace; +extern char *apply_default_ignorewhitespace; extern const char *git_attributes_file; extern const char *git_hooks_path; extern int zlib_compression_level; @@ -865,12 +955,14 @@ 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 @@ -937,8 +1029,6 @@ 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; /* @@ -954,6 +1044,7 @@ struct repository_format { int hash_algo; char *work_tree; struct string_list unknown_extensions; + struct string_list v1_only_extensions; }; /* @@ -967,6 +1058,7 @@ struct repository_format { .is_bare = -1, \ .hash_algo = GIT_HASH_SHA1, \ .unknown_extensions = STRING_LIST_INIT_DUP, \ + .v1_only_extensions = STRING_LIST_INIT_DUP, \ } /* @@ -998,8 +1090,10 @@ int verify_repository_format(const struct repository_format *format, * and die if it is a version we don't understand. Generally one would * set_git_dir() before calling this, and use it only for "are we in a valid * repo?". + * + * If successful and fmt is not NULL, fill fmt with data. */ -void check_repository_format(void); +void check_repository_format(struct repository_format *fmt); #define MTIME_CHANGED 0x0001 #define CTIME_CHANGED 0x0002 @@ -1029,7 +1123,6 @@ 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) @@ -1064,14 +1157,9 @@ 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 hasheq(oid->hash, null_sha1); + return oideq(oid, &null_oid); } static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src) @@ -1232,8 +1320,6 @@ static inline int is_absolute_path(const char *path) int is_directory(const char *); char *strbuf_realpath(struct strbuf *resolved, const char *path, int die_on_error); -const char *real_path(const char *path); -const char *real_path_if_valid(const char *path); char *real_pathdup(const char *path, int die_on_error); const char *absolute_path(const char *path); char *absolute_pathdup(const char *path); @@ -1281,7 +1367,8 @@ 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(const struct object_id *oid, void *buf, unsigned long size, const char *type); +int check_object_signature(struct repository *r, const struct object_id *oid, + void *buf, unsigned long size, const char *type); int finalize_object_file(const char *tmpfile, const char *filename); @@ -1398,6 +1485,9 @@ int set_disambiguate_hint_config(const char *var, const char *value); int get_sha1_hex(const char *hex, unsigned char *sha1); int get_oid_hex(const char *hex, struct object_id *sha1); +/* Like get_oid_hex, but for an arbitrary hash algorithm. */ +int get_oid_hex_algop(const char *hex, struct object_id *oid, const struct git_hash_algo *algop); + /* * Read `len` pairs of hexadecimal digits from `hex` and write the * values to `binary` as `len` bytes. Return 0 on success, or -1 if @@ -1406,7 +1496,8 @@ 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 to its hex equivalent. The `_r` variant is reentrant, + * Convert a binary hash in "unsigned char []" or an object name in + * "struct object_id *" 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. @@ -1414,13 +1505,12 @@ 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", sha1_to_hex(one), sha1_to_hex(two)); + * printf("%s -> %s", hash_to_hex(one), hash_to_hex(two)); + * printf("%s -> %s", oid_to_hex(one), oid_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 */ @@ -1433,6 +1523,20 @@ char *oid_to_hex(const struct object_id *oid); /* same static buffer */ */ int parse_oid_hex(const char *hex, struct object_id *oid, const char **end); +/* Like parse_oid_hex, but for an arbitrary hash algorithm. */ +int parse_oid_hex_algop(const char *hex, struct object_id *oid, const char **end, + const struct git_hash_algo *algo); + + +/* + * These functions work like get_oid_hex and parse_oid_hex, but they will parse + * a hex value for any algorithm. The algorithm is detected based on the length + * and the algorithm in use is returned. If this is not a hex object ID in any + * algorithm, returns GIT_HASH_UNKNOWN. + */ +int get_oid_hex_any(const char *hex, struct object_id *oid); +int parse_oid_hex_any(const char *hex, struct object_id *oid, const char **end); + /* * This reads short-hand syntax that not only evaluates to a commit * object name, but also can act as if the end user spelled the name @@ -1453,21 +1557,32 @@ int parse_oid_hex(const char *hex, struct object_id *oid, const char **end); * * If the input was ok but there are not N branch switches in the * reflog, it returns 0. - * - * If "allowed" is non-zero, it is a treated as a bitfield of allowable - * expansions: local branches ("refs/heads/"), remote branches - * ("refs/remotes/"), or "HEAD". If no "allowed" bits are set, any expansion is - * allowed, even ones to refs outside of those namespaces. */ #define INTERPRET_BRANCH_LOCAL (1<<0) #define INTERPRET_BRANCH_REMOTE (1<<1) #define INTERPRET_BRANCH_HEAD (1<<2) +struct interpret_branch_name_options { + /* + * If "allowed" is non-zero, it is a treated as a bitfield of allowable + * expansions: local branches ("refs/heads/"), remote branches + * ("refs/remotes/"), or "HEAD". If no "allowed" bits are set, any expansion is + * allowed, even ones to refs outside of those namespaces. + */ + unsigned allowed; + + /* + * If ^{upstream} or ^{push} (or equivalent) is requested, and the + * branch in question does not have such a reference, return -1 instead + * of die()-ing. + */ + unsigned nonfatal_dangling_mark : 1; +}; int repo_interpret_branch_name(struct repository *r, const char *str, int len, struct strbuf *buf, - unsigned allowed); -#define interpret_branch_name(str, len, buf, allowed) \ - repo_interpret_branch_name(the_repository, str, len, buf, allowed) + const struct interpret_branch_name_options *options); +#define interpret_branch_name(str, len, buf, options) \ + repo_interpret_branch_name(the_repository, str, len, buf, options) int validate_headref(const char *ref); @@ -1517,8 +1632,7 @@ 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, const struct timeval *now, - struct strbuf *timebuf); +void show_date_relative(timestamp_t time, 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); @@ -1527,7 +1641,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, const struct timeval *now); +timestamp_t approxidate_relative(const char *date); void parse_date_format(const char *format, struct date_mode *mode); int date_overflows(timestamp_t date); @@ -1598,6 +1712,7 @@ struct checkout { const char *base_dir; int base_dir_len; struct delayed_checkout *delayed_checkout; + struct checkout_metadata meta; unsigned force:1, quiet:1, not_new:1, diff --git a/third_party/git/checkout.c b/third_party/git/checkout.c index c72e9f9773..6586e30ca5 100644 --- a/third_party/git/checkout.c +++ b/third_party/git/checkout.c @@ -47,7 +47,7 @@ const char *unique_tracking_name(const char *name, struct object_id *oid, { struct tracking_name_data cb_data = TRACKING_NAME_DATA_INIT; const char *default_remote = NULL; - if (!git_config_get_string_const("checkout.defaultremote", &default_remote)) + if (!git_config_get_string_tmp("checkout.defaultremote", &default_remote)) cb_data.default_remote = default_remote; cb_data.src_ref = xstrfmt("refs/heads/%s", name); cb_data.dst_oid = oid; @@ -55,7 +55,6 @@ const char *unique_tracking_name(const char *name, struct object_id *oid, if (dwim_remotes_matched) *dwim_remotes_matched = cb_data.num_matches; free(cb_data.src_ref); - free((char *)default_remote); if (cb_data.num_matches == 1) { free(cb_data.default_dst_ref); free(cb_data.default_dst_oid); diff --git a/third_party/git/ci/config/allow-ref.sample b/third_party/git/ci/config/allow-ref.sample new file mode 100755 index 0000000000..af0e076f8a --- /dev/null +++ b/third_party/git/ci/config/allow-ref.sample @@ -0,0 +1,27 @@ +#!/bin/sh +# +# Sample script for enabling/disabling GitHub Actions CI runs on +# particular refs. By default, CI is run for all branches pushed to +# GitHub. You can override this by dropping the ".sample" from the script, +# editing it, committing, and pushing the result to the "ci-config" branch of +# your repository: +# +# git checkout -b ci-config +# cp allow-ref.sample allow-ref +# $EDITOR allow-ref +# git add allow-ref +# git commit -am "implement my ci preferences" +# git push +# +# This script will then be run when any refs are pushed to that repository. It +# gets the fully qualified refname as the first argument, and should exit with +# success only for refs for which you want to run CI. + +case "$1" in +# allow one-off tests by pushing to "for-ci" or "for-ci/mybranch" +refs/heads/for-ci*) true ;; +# always build your integration branch +refs/heads/my-integration-branch) true ;; +# don't build any other branches or tags +*) false ;; +esac diff --git a/third_party/git/ci/install-dependencies.sh b/third_party/git/ci/install-dependencies.sh index 8cc72503cb..0229a77f7d 100755 --- a/third_party/git/ci/install-dependencies.sh +++ b/third_party/git/ci/install-dependencies.sh @@ -7,12 +7,16 @@ P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION +UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev + tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl + libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl" case "$jobname" in linux-clang|linux-gcc) sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test" sudo apt-get -q update - sudo apt-get -q -y install language-pack-is libsvn-perl apache2 + sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \ + $UBUNTU_COMMON_PKGS case "$jobname" in linux-gcc) sudo apt-get -q -y install gcc-8 @@ -40,23 +44,37 @@ 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 link gcc@8 + brew install gcc@9 + # Just in case the image is updated to contain gcc@9 + # pre-installed but not linked. + brew link gcc@9 ;; esac ;; StaticAnalysis) sudo apt-get -q update - sudo apt-get -q -y install coccinelle + sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \ + libexpat-dev gettext make ;; Documentation) sudo apt-get -q update - sudo apt-get -q -y install asciidoc xmlto + sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make test -n "$ALREADY_HAVE_ASCIIDOCTOR" || - gem install --version 1.5.8 asciidoctor + sudo gem install --version 1.5.8 asciidoctor + ;; +linux-gcc-4.8|GETTEXT_POISON) + sudo apt-get -q update + sudo apt-get -q -y install $UBUNTU_COMMON_PKGS ;; esac diff --git a/third_party/git/ci/install-docker-dependencies.sh b/third_party/git/ci/install-docker-dependencies.sh new file mode 100755 index 0000000000..26a6689766 --- /dev/null +++ b/third_party/git/ci/install-docker-dependencies.sh @@ -0,0 +1,18 @@ +#!/bin/sh +# +# Install dependencies required to build and test Git inside container +# + +case "$jobname" in +Linux32) + linux32 --32bit i386 sh -c ' + apt update >/dev/null && + apt install -y build-essential libcurl4-openssl-dev \ + libssl-dev libexpat-dev gettext python >/dev/null + ' + ;; +linux-musl) + apk add --update build-base curl-dev openssl-dev expat-dev gettext \ + pcre2-dev python3 musl-libintl perl-utils ncurses >/dev/null + ;; +esac diff --git a/third_party/git/ci/lib.sh b/third_party/git/ci/lib.sh index 44db2d5cbb..38c0eac351 100755 --- a/third_party/git/ci/lib.sh +++ b/third_party/git/ci/lib.sh @@ -34,6 +34,11 @@ 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 || test true = "$GITHUB_ACTIONS" + 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. @@ -74,6 +79,9 @@ check_unignored_build_artifacts () } } +# GitHub Action doesn't set TERM, which is required by tput +export TERM=${TERM:-dumb} + # Clear MAKEFLAGS that may come from the outside world. export MAKEFLAGS= @@ -126,14 +134,33 @@ 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" test windows_nt != "$CI_OS_NAME" || GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS" +elif test true = "$GITHUB_ACTIONS" +then + CI_TYPE=github-actions + CI_BRANCH="$GITHUB_REF" + CI_COMMIT="$GITHUB_SHA" + CI_OS_NAME="$(echo "$RUNNER_OS" | tr A-Z a-z)" + test macos != "$CI_OS_NAME" || CI_OS_NAME=osx + CI_REPO_SLUG="$GITHUB_REPOSITORY" + CI_JOB_ID="$GITHUB_RUN_ID" + CC="${CC:-gcc}" + DONT_SKIP_TAGS=t + + cache_dir="$HOME/none" + + export GIT_PROVE_OPTS="--timer --jobs 10" + export GIT_TEST_OPTS="--verbose-log -x" + MAKEFLAGS="$MAKEFLAGS --jobs=10" + test windows != "$CI_OS_NAME" || + GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS" else echo "Could not identify CI type" >&2 + env >&2 exit 1 fi @@ -141,6 +168,7 @@ good_trees_file="$cache_dir/good-trees" mkdir -p "$cache_dir" +test -n "${DONT_SKIP_TAGS-}" || skip_branch_tip_with_tag skip_good_tree @@ -151,16 +179,20 @@ fi export DEVELOPER=1 export DEFAULT_TEST_TARGET=prove -export GIT_TEST_CLONE_2GB=YesPlease +export GIT_TEST_CLONE_2GB=true +export SKIP_DASHED_BUILT_INS=YesPlease case "$jobname" in linux-clang|linux-gcc) if [ "$jobname" = linux-gcc ] then export CC=gcc-8 + MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3" + else + MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2" fi - export GIT_TEST_HTTPD=YesPlease + export GIT_TEST_HTTPD=true # The Linux build installs the defined dependency versions below. # The OS X build installs much more recent versions, whichever @@ -177,7 +209,10 @@ linux-clang|linux-gcc) osx-clang|osx-gcc) if [ "$jobname" = osx-gcc ] then - export CC=gcc-8 + export CC=gcc-9 + MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)" + else + MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)" fi # t9810 occasionally fails on Travis CI OS X @@ -185,9 +220,17 @@ osx-clang|osx-gcc) # Travis CI OS X export GIT_SKIP_TESTS="t9810 t9816" ;; -GIT_TEST_GETTEXT_POISON) +GETTEXT_POISON) export GIT_TEST_GETTEXT_POISON=true ;; +Linux32) + CC=gcc + ;; +linux-musl) + CC=gcc + MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3 USE_LIBPCRE2=Yes" + MAKEFLAGS="$MAKEFLAGS NO_REGEX=Yes ICONV_OMITS_BOM=Yes" + ;; esac MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}" diff --git a/third_party/git/ci/print-test-failures.sh b/third_party/git/ci/print-test-failures.sh index e688a26f0d..92a983a265 100755 --- a/third_party/git/ci/print-test-failures.sh +++ b/third_party/git/ci/print-test-failures.sh @@ -46,6 +46,13 @@ do mv "$trash_dir" failed-test-artifacts continue ;; + github-actions) + mkdir -p failed-test-artifacts + echo "::set-env name=FAILED_TEST_ARTIFACTS::t/failed-test-artifacts" + cp "${TEST_EXIT%.exit}.out" failed-test-artifacts/ + tar czf failed-test-artifacts/"$test_name".trash.tar.gz "$trash_dir" + continue + ;; *) echo "Unhandled CI type: $CI_TYPE" >&2 exit 1 diff --git a/third_party/git/ci/run-build-and-tests.sh b/third_party/git/ci/run-build-and-tests.sh index ff0ef7f08e..6c27b886b8 100755 --- a/third_party/git/ci/run-build-and-tests.sh +++ b/third_party/git/ci/run-build-and-tests.sh @@ -19,7 +19,15 @@ linux-gcc) export GIT_TEST_OE_SIZE=10 export GIT_TEST_OE_DELTA_SIZE=5 export GIT_TEST_COMMIT_GRAPH=1 + export GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1 export GIT_TEST_MULTI_PACK_INDEX=1 + export GIT_TEST_ADD_I_USE_BUILTIN=1 + make test + ;; +linux-clang) + export GIT_TEST_DEFAULT_HASH=sha1 + make test + export GIT_TEST_DEFAULT_HASH=sha256 make test ;; linux-gcc-4.8) diff --git a/third_party/git/ci/run-linux32-build.sh b/third_party/git/ci/run-docker-build.sh index e3a193adbc..8d47a5fda3 100755 --- a/third_party/git/ci/run-linux32-build.sh +++ b/third_party/git/ci/run-docker-build.sh @@ -1,25 +1,33 @@ #!/bin/sh # -# Build and test Git in a 32-bit environment +# Build and test Git inside container # # Usage: -# run-linux32-build.sh <host-user-id> +# run-docker-build.sh <host-user-id> # set -ex if test $# -ne 1 || test -z "$1" then - echo >&2 "usage: run-linux32-build.sh <host-user-id>" + echo >&2 "usage: run-docker-build.sh <host-user-id>" exit 1 fi -# Update packages to the latest available versions -linux32 --32bit i386 sh -c ' - apt update >/dev/null && - apt install -y build-essential libcurl4-openssl-dev libssl-dev \ - libexpat-dev gettext python >/dev/null -' +case "$jobname" in +Linux32) + switch_cmd="linux32 --32bit i386" + ;; +linux-musl) + switch_cmd= + useradd () { adduser -D "$@"; } + ;; +*) + exit 1 + ;; +esac + +"${0%/*}/install-docker-dependencies.sh" # If this script runs inside a docker container, then all commands are # usually executed as root. Consequently, the host user might not be @@ -51,10 +59,17 @@ else fi # Build and test -linux32 --32bit i386 su -m -l $CI_USER -c ' +command $switch_cmd su -m -l $CI_USER -c " set -ex + export DEVELOPER='$DEVELOPER' + export DEFAULT_TEST_TARGET='$DEFAULT_TEST_TARGET' + export GIT_PROVE_OPTS='$GIT_PROVE_OPTS' + export GIT_TEST_OPTS='$GIT_TEST_OPTS' + export GIT_TEST_CLONE_2GB='$GIT_TEST_CLONE_2GB' + export MAKEFLAGS='$MAKEFLAGS' + export cache_dir='$cache_dir' cd /usr/src/git - test -n "$cache_dir" && ln -s "$cache_dir/.prove" t/.prove + test -n '$cache_dir' && ln -s '$cache_dir/.prove' t/.prove make make test -' +" diff --git a/third_party/git/ci/run-docker.sh b/third_party/git/ci/run-docker.sh new file mode 100755 index 0000000000..37fa372052 --- /dev/null +++ b/third_party/git/ci/run-docker.sh @@ -0,0 +1,47 @@ +#!/bin/sh +# +# Download and run Docker image to build and test Git +# + +. ${0%/*}/lib.sh + +case "$jobname" in +Linux32) + CI_CONTAINER="daald/ubuntu32:xenial" + ;; +linux-musl) + CI_CONTAINER=alpine + ;; +*) + exit 1 + ;; +esac + +docker pull "$CI_CONTAINER" + +# Use the following command to debug the docker build locally: +# <host-user-id> must be 0 if podman is used as drop-in replacement for docker +# $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/sh "$CI_CONTAINER" +# root@container:/# export jobname=<jobname> +# root@container:/# /usr/src/git/ci/run-docker-build.sh <host-user-id> + +container_cache_dir=/tmp/travis-cache + +docker run \ + --interactive \ + --env DEVELOPER \ + --env DEFAULT_TEST_TARGET \ + --env GIT_PROVE_OPTS \ + --env GIT_TEST_OPTS \ + --env GIT_TEST_CLONE_2GB \ + --env MAKEFLAGS \ + --env jobname \ + --env cache_dir="$container_cache_dir" \ + --volume "${PWD}:/usr/src/git" \ + --volume "$cache_dir:$container_cache_dir" \ + "$CI_CONTAINER" \ + /usr/src/git/ci/run-docker-build.sh $(id -u $USER) + +check_unignored_build_artifacts + +save_good_tree diff --git a/third_party/git/ci/run-linux32-docker.sh b/third_party/git/ci/run-linux32-docker.sh deleted file mode 100755 index 751acfcf8a..0000000000 --- a/third_party/git/ci/run-linux32-docker.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Download and run Docker image to build and test 32-bit Git -# - -. ${0%/*}/lib.sh - -docker pull daald/ubuntu32:xenial - -# Use the following command to debug the docker build locally: -# $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/bash daald/ubuntu32:xenial -# root@container:/# /usr/src/git/ci/run-linux32-build.sh <host-user-id> - -container_cache_dir=/tmp/travis-cache - -docker run \ - --interactive \ - --env DEVELOPER \ - --env DEFAULT_TEST_TARGET \ - --env GIT_PROVE_OPTS \ - --env GIT_TEST_OPTS \ - --env GIT_TEST_CLONE_2GB \ - --env cache_dir="$container_cache_dir" \ - --volume "${PWD}:/usr/src/git" \ - --volume "$cache_dir:$container_cache_dir" \ - daald/ubuntu32:xenial \ - /usr/src/git/ci/run-linux32-build.sh $(id -u $USER) - -check_unignored_build_artifacts - -save_good_tree diff --git a/third_party/git/ci/run-static-analysis.sh b/third_party/git/ci/run-static-analysis.sh index a19aa7ebbc..65bcebda41 100755 --- a/third_party/git/ci/run-static-analysis.sh +++ b/third_party/git/ci/run-static-analysis.sh @@ -26,4 +26,7 @@ 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 d49089832d..de41888430 100755 --- a/third_party/git/ci/test-documentation.sh +++ b/third_party/git/ci/test-documentation.sh @@ -7,7 +7,10 @@ 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 ebb222ec33..64f52a4f93 100644 --- a/third_party/git/color.c +++ b/third_party/git/color.c @@ -24,6 +24,14 @@ 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; @@ -61,15 +69,38 @@ static int get_hex_color(const char *in, unsigned char *out) return 0; } -static int parse_color(struct color *out, const char *name, int len) +/* + * 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) { /* Positions in array must match ANSI color codes */ static const char * const color_names[] = { "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" }; - char *end; 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; long val; /* First try the special word "normal"... */ @@ -89,12 +120,8 @@ static int parse_color(struct color *out, const char *name, int len) } /* Then pick from our human-readable color names... */ - 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; - } + if (parse_ansi_color(out, name, len) == 0) { + return 0; } /* And finally try a literal 256-color-mode number */ @@ -109,10 +136,15 @@ static int parse_color(struct color *out, const char *name, int len) else if (val < 0) { out->type = COLOR_NORMAL; return 0; - /* Rewrite low numbers as more-portable standard colors. */ + /* Rewrite 0-7 as more-portable standard colors. */ } else if (val < 8) { out->type = COLOR_ANSI; - out->value = val; + 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; return 0; } else if (val < 256) { out->type = COLOR_256; @@ -166,23 +198,26 @@ 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, char type) +static char *color_output(char *out, int len, const struct color *c, int background) { + int offset = 0; + + if (background) + offset = COLOR_BACKGROUND_OFFSET; switch (c->type) { case COLOR_UNSPECIFIED: case COLOR_NORMAL: break; case COLOR_ANSI: - if (len < 2) - BUG("color parsing ran out of space"); - *out++ = type; - *out++ = '0' + c->value; + out += xsnprintf(out, len, "%d", c->value + offset); break; case COLOR_256: - out += xsnprintf(out, len, "%c8;5;%d", type, c->value); + out += xsnprintf(out, len, "%d;5;%d", COLOR_FOREGROUND_256 + offset, + c->value); break; case COLOR_RGB: - out += xsnprintf(out, len, "%c8;2;%d;%d;%d", type, + out += xsnprintf(out, len, "%d;2;%d;%d;%d", + COLOR_FOREGROUND_RGB + offset, c->red, c->green, c->blue); break; } @@ -279,14 +314,12 @@ int color_parse_mem(const char *value, int value_len, char *dst) if (!color_empty(&fg)) { if (sep++) OUT(';'); - /* foreground colors are all in the 3x range */ - dst = color_output(dst, end - dst, &fg, '3'); + dst = color_output(dst, end - dst, &fg, 0); } if (!color_empty(&bg)) { if (sep++) OUT(';'); - /* background colors are all in the 4x range */ - dst = color_output(dst, end - dst, &bg, '4'); + dst = color_output(dst, end - dst, &bg, 1); } OUT('m'); } diff --git a/third_party/git/column.c b/third_party/git/column.c index 7a17c14b82..1261e18a72 100644 --- a/third_party/git/column.c +++ b/third_party/git/column.c @@ -23,18 +23,7 @@ struct column_data { /* return length of 's' in letters, ANSI escapes stripped */ static int item_length(const char *s) { - 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; + return utf8_strnwidth(s, -1, 1); } /* @@ -118,7 +107,7 @@ static void display_plain(const struct string_list *list, printf("%s%s%s", indent, list->items[i].string, nl); } -/* Print a cell to stdout with all necessary leading/traling space */ +/* Print a cell to stdout with all necessary leading/trailing space */ static int display_cell(struct column_data *data, int initial_width, const char *empty_cell, int x, int y) { @@ -369,7 +358,7 @@ static struct child_process column_process = CHILD_PROCESS_INIT; int run_column_filter(int colopts, const struct column_options *opts) { - struct argv_array *argv; + struct strvec *argv; if (fd_out != -1) return -1; @@ -377,14 +366,14 @@ int run_column_filter(int colopts, const struct column_options *opts) child_process_init(&column_process); argv = &column_process.args; - argv_array_push(argv, "column"); - argv_array_pushf(argv, "--raw-mode=%d", colopts); + strvec_push(argv, "column"); + strvec_pushf(argv, "--raw-mode=%d", colopts); if (opts && opts->width) - argv_array_pushf(argv, "--width=%d", opts->width); + strvec_pushf(argv, "--width=%d", opts->width); if (opts && opts->indent) - argv_array_pushf(argv, "--indent=%s", opts->indent); + strvec_pushf(argv, "--indent=%s", opts->indent); if (opts && opts->padding) - argv_array_pushf(argv, "--padding=%d", opts->padding); + strvec_pushf(argv, "--padding=%d", opts->padding); fflush(stdout); column_process.in = -1; diff --git a/third_party/git/combine-diff.c b/third_party/git/combine-diff.c index 3e49f3bda8..9228aebc16 100644 --- a/third_party/git/combine-diff.c +++ b/third_party/git/combine-diff.c @@ -10,7 +10,7 @@ #include "log-tree.h" #include "refs.h" #include "userdiff.h" -#include "sha1-array.h" +#include "oid-array.h" #include "revision.h" static int compare_paths(const struct combine_diff_path *one, @@ -923,14 +923,13 @@ static void dump_quoted_path(const char *head, static void show_combined_header(struct combine_diff_path *elem, int num_parent, - int dense, struct rev_info *rev, const char *line_prefix, int mode_differs, int show_file_header) { struct diff_options *opt = &rev->diffopt; - int abbrev = opt->flags.full_index ? GIT_SHA1_HEXSZ : DEFAULT_ABBREV; + int abbrev = opt->flags.full_index ? the_hash_algo->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); @@ -939,6 +938,7 @@ static void show_combined_header(struct combine_diff_path *elem, int added = 0; int deleted = 0; int i; + int dense = rev->dense_combined_merges; if (rev->loginfo && !rev->no_commit_id) show_log(rev); @@ -1012,7 +1012,7 @@ static void show_combined_header(struct combine_diff_path *elem, } static void show_patch_diff(struct combine_diff_path *elem, int num_parent, - int dense, int working_tree_file, + int working_tree_file, struct rev_info *rev) { struct diff_options *opt = &rev->diffopt; @@ -1145,7 +1145,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, } } if (is_binary) { - show_combined_header(elem, num_parent, dense, rev, + show_combined_header(elem, num_parent, rev, line_prefix, mode_differs, 0); printf("Binary files differ\n"); free(result); @@ -1200,10 +1200,10 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, textconv, elem->path, opt->xdl_opts); } - show_hunks = make_hunks(sline, cnt, num_parent, dense); + show_hunks = make_hunks(sline, cnt, num_parent, rev->dense_combined_merges); if (show_hunks || mode_differs || working_tree_file) { - show_combined_header(elem, num_parent, dense, rev, + show_combined_header(elem, num_parent, rev, line_prefix, mode_differs, 1); dump_sline(sline, line_prefix, cnt, num_parent, opt->use_color, result_deleted); @@ -1284,7 +1284,6 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re */ void show_combined_diff(struct combine_diff_path *p, int num_parent, - int dense, struct rev_info *rev) { struct diff_options *opt = &rev->diffopt; @@ -1294,7 +1293,7 @@ void show_combined_diff(struct combine_diff_path *p, DIFF_FORMAT_NAME_STATUS)) show_raw_diff(p, num_parent, rev); else if (opt->output_format & DIFF_FORMAT_PATCH) - show_patch_diff(p, num_parent, dense, 1, rev); + show_patch_diff(p, num_parent, 1, rev); } static void free_combined_pair(struct diff_filepair *pair) @@ -1451,10 +1450,45 @@ static struct combine_diff_path *find_paths_multitree( return paths_head.next; } +static int match_objfind(struct combine_diff_path *path, + int num_parent, + const struct oidset *set) +{ + int i; + if (oidset_contains(set, &path->oid)) + return 1; + for (i = 0; i < num_parent; i++) { + if (oidset_contains(set, &path->parent[i].oid)) + return 1; + } + return 0; +} + +static struct combine_diff_path *combined_objfind(struct diff_options *opt, + struct combine_diff_path *paths, + int num_parent) +{ + struct combine_diff_path *ret = NULL, **tail = &ret; + struct combine_diff_path *p = paths; + + while (p) { + struct combine_diff_path *next = p->next; + + if (match_objfind(p, num_parent, opt->objfind)) { + p->next = NULL; + *tail = p; + tail = &p->next; + } else { + free(p); + } + p = next; + } + + return ret; +} void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, - int dense, struct rev_info *rev) { struct diff_options *opt = &rev->diffopt; @@ -1506,10 +1540,10 @@ void diff_tree_combined(const struct object_id *oid, opt->flags.follow_renames || opt->break_opt != -1 || opt->detect_rename || - (opt->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) || + (opt->pickaxe_opts & + (DIFF_PICKAXE_KINDS_MASK & ~DIFF_PICKAXE_KIND_OBJFIND)) || opt->filter; - if (need_generic_pathscan) { /* * NOTE generic case also handles --stat, as it computes @@ -1523,6 +1557,9 @@ void diff_tree_combined(const struct object_id *oid, int stat_opt; paths = find_paths_multitree(oid, parents, &diffopts); + if (opt->pickaxe_opts & DIFF_PICKAXE_KIND_OBJFIND) + paths = combined_objfind(opt, paths, num_parent); + /* * show stat against the first parent even * when doing combined diff. @@ -1581,8 +1618,7 @@ void diff_tree_combined(const struct object_id *oid, printf("%s%c", diff_line_prefix(opt), opt->line_termination); for (p = paths; p; p = p->next) - show_patch_diff(p, num_parent, dense, - 0, rev); + show_patch_diff(p, num_parent, 0, rev); } } @@ -1600,7 +1636,7 @@ void diff_tree_combined(const struct object_id *oid, clear_pathspec(&diffopts.pathspec); } -void diff_tree_combined_merge(const struct commit *commit, int dense, +void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev) { struct commit_list *parent = get_saved_parents(rev, commit); @@ -1610,6 +1646,6 @@ void diff_tree_combined_merge(const struct commit *commit, int dense, oid_array_append(&parents, &parent->item->object.oid); parent = parent->next; } - diff_tree_combined(&commit->object.oid, &parents, dense, rev); + diff_tree_combined(&commit->object.oid, &parents, rev); oid_array_clear(&parents); } diff --git a/third_party/git/command-list.txt b/third_party/git/command-list.txt index a9ac72bef4..0e3204e7d1 100644 --- a/third_party/git/command-list.txt +++ b/third_party/git/command-list.txt @@ -54,6 +54,7 @@ git-archive mainporcelain git-bisect mainporcelain info git-blame ancillaryinterrogators complete git-branch mainporcelain history +git-bugreport ancillaryinterrogators git-bundle mainporcelain git-cat-file plumbinginterrogators git-check-attr purehelpers @@ -116,6 +117,7 @@ git-ls-remote plumbinginterrogators git-ls-tree plumbinginterrogators git-mailinfo purehelpers git-mailsplit purehelpers +git-maintenance mainporcelain git-merge mainporcelain history git-merge-base plumbinginterrogators git-merge-file plumbingmanipulators @@ -135,7 +137,7 @@ git-pack-redundant plumbinginterrogators git-pack-refs ancillarymanipulators git-parse-remote synchelpers git-patch-id purehelpers -git-prune ancillarymanipulators +git-prune ancillarymanipulators complete git-prune-packed plumbingmanipulators git-pull mainporcelain remote git-push mainporcelain remote @@ -166,6 +168,7 @@ 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 @@ -193,16 +196,20 @@ git-write-tree plumbingmanipulators gitattributes guide gitcli guide gitcore-tutorial guide +gitcredentials guide gitcvs-migration guide gitdiffcore guide giteveryday guide +gitfaq guide gitglossary guide githooks guide gitignore guide gitmodules guide gitnamespaces guide +gitremote-helpers 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 fe954ab5f8..cb042bdba8 100644 --- a/third_party/git/commit-graph.c +++ b/third_party/git/commit-graph.c @@ -1,7 +1,5 @@ -#include "cache.h" -#include "config.h" -#include "dir.h" #include "git-compat-util.h" +#include "config.h" #include "lockfile.h" #include "pack.h" #include "packfile.h" @@ -16,13 +14,35 @@ #include "hashmap.h" #include "replace-object.h" #include "progress.h" +#include "bloom.h" +#include "commit-slab.h" +#include "shallow.h" +#include "json-writer.h" +#include "trace2.h" + +void git_test_write_commit_graph_or_die(void) +{ + int flags = 0; + if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0)) + return; + + if (git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0)) + flags = COMMIT_GRAPH_WRITE_BLOOM_FILTERS; + + if (write_commit_graph_reachable(the_repository->objects->odb, + flags, NULL)) + die("failed to write commit-graph under GIT_TEST_COMMIT_GRAPH"); +} #define GRAPH_SIGNATURE 0x43475048 /* "CGPH" */ #define GRAPH_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */ #define GRAPH_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */ #define GRAPH_CHUNKID_DATA 0x43444154 /* "CDAT" */ #define GRAPH_CHUNKID_EXTRAEDGES 0x45444745 /* "EDGE" */ +#define GRAPH_CHUNKID_BLOOMINDEXES 0x42494458 /* "BIDX" */ +#define GRAPH_CHUNKID_BLOOMDATA 0x42444154 /* "BDAT" */ #define GRAPH_CHUNKID_BASE 0x42415345 /* "BASE" */ +#define MAX_NUM_CHUNKS 7 #define GRAPH_DATA_WIDTH (the_hash_algo->rawsz + 16) @@ -41,41 +61,137 @@ #define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * GRAPH_CHUNKLOOKUP_WIDTH \ + GRAPH_FANOUT_SIZE + the_hash_algo->rawsz) -char *get_commit_graph_filename(const char *obj_dir) +/* Remember to update object flag allocation in object.h */ +#define REACHABLE (1u<<15) + +/* Keep track of the order in which commits are added to our list. */ +define_commit_slab(commit_pos, int); +static struct commit_pos commit_pos = COMMIT_SLAB_INIT(1, commit_pos); + +static void set_commit_pos(struct repository *r, const struct object_id *oid) +{ + static int32_t max_pos; + struct commit *commit = lookup_commit(r, oid); + + if (!commit) + return; /* should never happen, but be lenient */ + + *commit_pos_at(&commit_pos, commit) = max_pos++; +} + +static int commit_pos_cmp(const void *va, const void *vb) { - char *filename = xstrfmt("%s/info/commit-graph", obj_dir); - char *normalized = xmalloc(strlen(filename) + 1); - normalize_path_copy(normalized, filename); - free(filename); - return normalized; + const struct commit *a = *(const struct commit **)va; + const struct commit *b = *(const struct commit **)vb; + return commit_pos_at(&commit_pos, a) - + commit_pos_at(&commit_pos, b); } -static char *get_split_graph_filename(const char *obj_dir, +define_commit_slab(commit_graph_data_slab, struct commit_graph_data); +static struct commit_graph_data_slab commit_graph_data_slab = + COMMIT_SLAB_INIT(1, commit_graph_data_slab); + +uint32_t commit_graph_position(const struct commit *c) +{ + struct commit_graph_data *data = + commit_graph_data_slab_peek(&commit_graph_data_slab, c); + + return data ? data->graph_pos : COMMIT_NOT_FROM_GRAPH; +} + +uint32_t commit_graph_generation(const struct commit *c) +{ + struct commit_graph_data *data = + commit_graph_data_slab_peek(&commit_graph_data_slab, c); + + if (!data) + return GENERATION_NUMBER_INFINITY; + else if (data->graph_pos == COMMIT_NOT_FROM_GRAPH) + return GENERATION_NUMBER_INFINITY; + + return data->generation; +} + +static struct commit_graph_data *commit_graph_data_at(const struct commit *c) +{ + unsigned int i, nth_slab; + struct commit_graph_data *data = + commit_graph_data_slab_peek(&commit_graph_data_slab, c); + + if (data) + return data; + + nth_slab = c->index / commit_graph_data_slab.slab_size; + data = commit_graph_data_slab_at(&commit_graph_data_slab, c); + + /* + * commit-slab initializes elements with zero, overwrite this with + * COMMIT_NOT_FROM_GRAPH for graph_pos. + * + * We avoid initializing generation with checking if graph position + * is not COMMIT_NOT_FROM_GRAPH. + */ + for (i = 0; i < commit_graph_data_slab.slab_size; i++) { + commit_graph_data_slab.slab[nth_slab][i].graph_pos = + COMMIT_NOT_FROM_GRAPH; + } + + return data; +} + +static int commit_gen_cmp(const void *va, const void *vb) +{ + const struct commit *a = *(const struct commit **)va; + const struct commit *b = *(const struct commit **)vb; + + uint32_t generation_a = commit_graph_generation(a); + uint32_t generation_b = commit_graph_generation(b); + /* lower generation commits first */ + if (generation_a < generation_b) + return -1; + else if (generation_a > generation_b) + return 1; + + /* use date as a heuristic when generations are equal */ + if (a->date < b->date) + return -1; + else if (a->date > b->date) + return 1; + return 0; +} + +char *get_commit_graph_filename(struct object_directory *obj_dir) +{ + return xstrfmt("%s/info/commit-graph", obj_dir->path); +} + +static char *get_split_graph_filename(struct object_directory *odb, const char *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; + return xstrfmt("%s/info/commit-graphs/graph-%s.graph", odb->path, + oid_hex); } -static char *get_chain_filename(const char *obj_dir) +char *get_commit_graph_chain_filename(struct object_directory *odb) { - return xstrfmt("%s/info/commit-graphs/commit-graph-chain", obj_dir); + return xstrfmt("%s/info/commit-graphs/commit-graph-chain", odb->path); } static uint8_t oid_version(void) { - return 1; + switch (hash_algo_by_ptr(the_hash_algo)) { + case GIT_HASH_SHA1: + return 1; + case GIT_HASH_SHA256: + return 2; + default: + die(_("invalid hash version")); + } } static struct commit_graph *alloc_commit_graph(void) { struct commit_graph *g = xcalloc(1, sizeof(*g)); - g->graph_fd = -1; return g; } @@ -94,7 +210,8 @@ static int commit_graph_compatible(struct repository *r) } prepare_commit_graft(r); - if (r->parsed_objects && r->parsed_objects->grafts_nr) + if (r->parsed_objects && + (r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent)) return 0; if (is_repository_shallow(r)) return 0; @@ -114,7 +231,9 @@ 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 commit_graph *load_commit_graph_one_fd_st(struct repository *r, + int fd, struct stat *st, + struct object_directory *odb) { void *graph_map; size_t graph_size; @@ -128,12 +247,13 @@ struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st) return NULL; } graph_map = xmmap(NULL, graph_size, PROT_READ, MAP_PRIVATE, fd, 0); - ret = parse_commit_graph(graph_map, fd, graph_size); + close(fd); + ret = parse_commit_graph(r, graph_map, graph_size); - if (!ret) { + if (ret) + ret->odb = odb; + else munmap(graph_map, graph_size); - close(fd); - } return ret; } @@ -168,14 +288,13 @@ static int verify_commit_graph_lite(struct commit_graph *g) return 0; } -struct commit_graph *parse_commit_graph(void *graph_map, int fd, - size_t graph_size) +struct commit_graph *parse_commit_graph(struct repository *r, + void *graph_map, size_t graph_size) { const unsigned char *data, *chunk_lookup; uint32_t i; struct commit_graph *graph; - uint64_t last_chunk_offset; - uint32_t last_chunk_id; + uint64_t next_chunk_offset; uint32_t graph_signature; unsigned char graph_version, hash_version; @@ -208,39 +327,40 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd, return NULL; } + prepare_repo_settings(r); + graph = alloc_commit_graph(); graph->hash_len = the_hash_algo->rawsz; graph->num_chunks = *(unsigned char*)(data + 6); - graph->graph_fd = fd; graph->data = graph_map; graph->data_len = graph_size; - last_chunk_id = 0; - last_chunk_offset = 8; + if (graph_size < GRAPH_HEADER_SIZE + + (graph->num_chunks + 1) * GRAPH_CHUNKLOOKUP_WIDTH + + GRAPH_FANOUT_SIZE + the_hash_algo->rawsz) { + error(_("commit-graph file is too small to hold %u chunks"), + graph->num_chunks); + free(graph); + return NULL; + } + chunk_lookup = data + 8; + next_chunk_offset = get_be64(chunk_lookup + 4); for (i = 0; i < graph->num_chunks; i++) { uint32_t chunk_id; - uint64_t chunk_offset; + uint64_t chunk_offset = next_chunk_offset; int chunk_repeated = 0; - if (data + graph_size - chunk_lookup < - GRAPH_CHUNKLOOKUP_WIDTH) { - error(_("commit-graph chunk lookup table entry missing; file may be incomplete")); - free(graph); - return NULL; - } - chunk_id = get_be32(chunk_lookup + 0); - chunk_offset = get_be64(chunk_lookup + 4); chunk_lookup += GRAPH_CHUNKLOOKUP_WIDTH; + next_chunk_offset = get_be64(chunk_lookup + 4); if (chunk_offset > graph_size - the_hash_algo->rawsz) { error(_("commit-graph improper chunk offset %08x%08x"), (uint32_t)(chunk_offset >> 32), (uint32_t)chunk_offset); - free(graph); - return NULL; + goto free_and_return; } switch (chunk_id) { @@ -254,8 +374,11 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd, case GRAPH_CHUNKID_OIDLOOKUP: if (graph->chunk_oid_lookup) chunk_repeated = 1; - else + else { graph->chunk_oid_lookup = data + chunk_offset; + graph->num_commits = (next_chunk_offset - chunk_offset) + / graph->hash_len; + } break; case GRAPH_CHUNKID_DATA: @@ -277,35 +400,66 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd, chunk_repeated = 1; else graph->chunk_base_graphs = data + chunk_offset; + break; + + case GRAPH_CHUNKID_BLOOMINDEXES: + if (graph->chunk_bloom_indexes) + chunk_repeated = 1; + else if (r->settings.commit_graph_read_changed_paths) + graph->chunk_bloom_indexes = data + chunk_offset; + break; + + case GRAPH_CHUNKID_BLOOMDATA: + if (graph->chunk_bloom_data) + chunk_repeated = 1; + else if (r->settings.commit_graph_read_changed_paths) { + uint32_t hash_version; + graph->chunk_bloom_data = data + chunk_offset; + hash_version = get_be32(data + chunk_offset); + + if (hash_version != 1) + break; + + graph->bloom_filter_settings = xmalloc(sizeof(struct bloom_filter_settings)); + graph->bloom_filter_settings->hash_version = hash_version; + graph->bloom_filter_settings->num_hashes = get_be32(data + chunk_offset + 4); + graph->bloom_filter_settings->bits_per_entry = get_be32(data + chunk_offset + 8); + graph->bloom_filter_settings->max_changed_paths = DEFAULT_BLOOM_MAX_CHANGES; + } + break; } if (chunk_repeated) { error(_("commit-graph chunk id %08x appears multiple times"), chunk_id); - free(graph); - return NULL; - } - - if (last_chunk_id == GRAPH_CHUNKID_OIDLOOKUP) - { - graph->num_commits = (chunk_offset - last_chunk_offset) - / graph->hash_len; + goto free_and_return; } + } - last_chunk_id = chunk_id; - last_chunk_offset = chunk_offset; + if (graph->chunk_bloom_indexes && graph->chunk_bloom_data) { + init_bloom_filters(); + } else { + /* We need both the bloom chunks to exist together. Else ignore the data */ + graph->chunk_bloom_indexes = NULL; + graph->chunk_bloom_data = NULL; + FREE_AND_NULL(graph->bloom_filter_settings); } hashcpy(graph->oid.hash, graph->data + graph->data_len - graph->hash_len); - if (verify_commit_graph_lite(graph)) { - free(graph); - return NULL; - } + if (verify_commit_graph_lite(graph)) + goto free_and_return; return graph; + +free_and_return: + free(graph->bloom_filter_settings); + free(graph); + return NULL; } -static struct commit_graph *load_commit_graph_one(const char *graph_file) +static struct commit_graph *load_commit_graph_one(struct repository *r, + const char *graph_file, + struct object_directory *odb) { struct stat st; @@ -316,7 +470,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); + g = load_commit_graph_one_fd_st(r, fd, &st, odb); if (g) g->filename = xstrdup(graph_file); @@ -324,15 +478,13 @@ 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, const char *obj_dir) +static struct commit_graph *load_commit_graph_v1(struct repository *r, + struct object_directory *odb) { - char *graph_name = get_commit_graph_filename(obj_dir); - struct commit_graph *g = load_commit_graph_one(graph_name); + char *graph_name = get_commit_graph_filename(odb); + struct commit_graph *g = load_commit_graph_one(r, graph_name, odb); free(graph_name); - if (g) - g->obj_dir = obj_dir; - return g; } @@ -369,14 +521,15 @@ static int add_graph_to_chain(struct commit_graph *g, return 1; } -static struct commit_graph *load_commit_graph_chain(struct repository *r, const char *obj_dir) +static struct commit_graph *load_commit_graph_chain(struct repository *r, + struct object_directory *odb) { 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(obj_dir); + char *chain_name = get_commit_graph_chain_filename(odb); FILE *fp; int stat_res; @@ -409,14 +562,12 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r, const valid = 0; for (odb = r->objects->odb; odb; odb = odb->next) { - char *graph_name = get_split_graph_filename(odb->path, line.buf); - struct commit_graph *g = load_commit_graph_one(graph_name); + char *graph_name = get_split_graph_filename(odb, line.buf); + struct commit_graph *g = load_commit_graph_one(r, graph_name, odb); 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; @@ -439,47 +590,52 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r, const return graph_chain; } -struct commit_graph *read_commit_graph_one(struct repository *r, const char *obj_dir) +struct commit_graph *read_commit_graph_one(struct repository *r, + struct object_directory *odb) { - struct commit_graph *g = load_commit_graph_v1(r, obj_dir); + struct commit_graph *g = load_commit_graph_v1(r, odb); if (!g) - g = load_commit_graph_chain(r, obj_dir); + g = load_commit_graph_chain(r, odb); return g; } -static void prepare_commit_graph_one(struct repository *r, const char *obj_dir) +static void prepare_commit_graph_one(struct repository *r, + struct object_directory *odb) { if (r->objects->commit_graph) return; - r->objects->commit_graph = read_commit_graph_one(r, obj_dir); + r->objects->commit_graph = read_commit_graph_one(r, odb); } /* * Return 1 if commit_graph is non-NULL, and 0 otherwise. * - * On the first invocation, this function attemps to load the commit + * On the first invocation, this function attempts 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; - 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); + /* + * 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; + prepare_repo_settings(r); + if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) && - (repo_config_get_bool(r, "core.commitgraph", &config_value) || - !config_value)) + r->settings.core_commit_graph != 1) /* * This repository is not configured to use commit graphs, so * do not load one. (But report commit_graph_attempted anyway @@ -495,7 +651,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->path); + prepare_commit_graph_one(r, odb); return !!r->objects->commit_graph; } @@ -517,6 +673,17 @@ int generation_numbers_enabled(struct repository *r) return !!first_generation; } +struct bloom_filter_settings *get_bloom_filter_settings(struct repository *r) +{ + struct commit_graph *g = r->objects->commit_graph; + while (g) { + if (g->bloom_filter_settings) + return g->bloom_filter_settings; + g = g->base_graph; + } + return NULL; +} + static void close_commit_graph_one(struct commit_graph *g) { if (!g) @@ -573,13 +740,14 @@ static struct commit_list **insert_parent_or_die(struct repository *r, c = lookup_commit(r, &oid); if (!c) die(_("could not find commit %s"), oid_to_hex(&oid)); - c->graph_pos = pos; + commit_graph_data_at(c)->graph_pos = pos; return &commit_list_insert(c, pptr)->next; } static void fill_commit_graph_info(struct commit *item, struct commit_graph *g, uint32_t pos) { const unsigned char *commit_data; + struct commit_graph_data *graph_data; uint32_t lex_index; while (pos < g->num_commits_in_base) @@ -587,8 +755,10 @@ static void fill_commit_graph_info(struct commit *item, struct commit_graph *g, lex_index = pos - g->num_commits_in_base; commit_data = g->chunk_commit_data + GRAPH_DATA_WIDTH * lex_index; - item->graph_pos = pos; - item->generation = get_be32(commit_data + g->hash_len + 8) >> 2; + + graph_data = commit_graph_data_at(item); + graph_data->graph_pos = pos; + graph_data->generation = get_be32(commit_data + g->hash_len + 8) >> 2; } static inline void set_commit_tree(struct commit *c, struct tree *t) @@ -604,6 +774,7 @@ static int fill_commit_in_graph(struct repository *r, uint32_t *parent_data_ptr; uint64_t date_low, date_high; struct commit_list **pptr; + struct commit_graph_data *graph_data; const unsigned char *commit_data; uint32_t lex_index; @@ -617,7 +788,8 @@ static int fill_commit_in_graph(struct repository *r, * Store the "full" position, but then use the * "local" position for the rest of the calculation. */ - item->graph_pos = pos; + graph_data = commit_graph_data_at(item); + graph_data->graph_pos = pos; lex_index = pos - g->num_commits_in_base; commit_data = g->chunk_commit_data + (g->hash_len + 16) * lex_index; @@ -630,7 +802,7 @@ static int fill_commit_in_graph(struct repository *r, date_low = get_be32(commit_data + g->hash_len + 12); item->date = (timestamp_t)((date_high << 32) | date_low); - item->generation = get_be32(commit_data + g->hash_len + 8) >> 2; + graph_data->generation = get_be32(commit_data + g->hash_len + 8) >> 2; pptr = &item->parents; @@ -662,8 +834,9 @@ static int fill_commit_in_graph(struct repository *r, static int find_commit_in_graph(struct commit *item, struct commit_graph *g, uint32_t *pos) { - if (item->graph_pos != COMMIT_NOT_FROM_GRAPH) { - *pos = item->graph_pos; + uint32_t graph_pos = commit_graph_position(item); + if (graph_pos != COMMIT_NOT_FROM_GRAPH) { + *pos = graph_pos; return 1; } else { struct commit_graph *cur_g = g; @@ -698,6 +871,14 @@ static int parse_commit_in_graph_one(struct repository *r, int parse_commit_in_graph(struct repository *r, struct commit *item) { + static int checked_env = 0; + + if (!checked_env && + git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE, 0)) + die("dying as requested by the '%s' variable on commit-graph parse!", + GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE); + checked_env = 1; + if (!prepare_commit_graph(r)) return 0; return parse_commit_in_graph_one(r, r->objects->commit_graph, item); @@ -718,12 +899,13 @@ static struct tree *load_tree_for_commit(struct repository *r, { struct object_id oid; const unsigned char *commit_data; + uint32_t graph_pos = commit_graph_position(c); - while (c->graph_pos < g->num_commits_in_base) + while (graph_pos < g->num_commits_in_base) g = g->base_graph; commit_data = g->chunk_commit_data + - GRAPH_DATA_WIDTH * (c->graph_pos - g->num_commits_in_base); + GRAPH_DATA_WIDTH * (graph_pos - g->num_commits_in_base); hashcpy(oid.hash, commit_data); set_commit_tree(c, lookup_tree(r, &oid)); @@ -737,7 +919,7 @@ static struct tree *get_commit_tree_in_graph_one(struct repository *r, { if (c->maybe_tree) return c->maybe_tree; - if (c->graph_pos == COMMIT_NOT_FROM_GRAPH) + if (commit_graph_position(c) == COMMIT_NOT_FROM_GRAPH) BUG("get_commit_tree_in_graph_one called from non-commit-graph commit"); return load_tree_for_commit(r, g, (struct commit *)c); @@ -762,7 +944,7 @@ struct packed_oid_list { struct write_commit_graph_context { struct repository *r; - char *obj_dir; + struct object_directory *odb; char *graph_name; struct packed_oid_list oids; struct packed_commit_list commits; @@ -783,13 +965,22 @@ struct write_commit_graph_context { unsigned append:1, report_progress:1, - split:1; - - const struct split_commit_graph_opts *split_opts; + split:1, + changed_paths:1, + order_by_pack:1; + + const struct commit_graph_opts *opts; + size_t total_bloom_filter_data_size; + const struct bloom_filter_settings *bloom_settings; + + int count_bloom_filter_computed; + int count_bloom_filter_not_computed; + int count_bloom_filter_trunc_empty; + int count_bloom_filter_trunc_large; }; -static void write_graph_chunk_fanout(struct hashfile *f, - struct write_commit_graph_context *ctx) +static int write_graph_chunk_fanout(struct hashfile *f, + struct write_commit_graph_context *ctx) { int i, count = 0; struct commit **list = ctx->commits.list; @@ -810,17 +1001,21 @@ static void write_graph_chunk_fanout(struct hashfile *f, hashwrite_be32(f, count); } + + return 0; } -static void write_graph_chunk_oids(struct hashfile *f, int hash_len, - struct write_commit_graph_context *ctx) +static int write_graph_chunk_oids(struct hashfile *f, + struct write_commit_graph_context *ctx) { struct commit **list = ctx->commits.list; int count; for (count = 0; count < ctx->commits.nr; count++, list++) { display_progress(ctx->progress, ++ctx->progress_cnt); - hashwrite(f, (*list)->object.oid.hash, (int)hash_len); + hashwrite(f, (*list)->object.oid.hash, the_hash_algo->rawsz); } + + return 0; } static const unsigned char *commit_to_sha1(size_t index, void *table) @@ -829,8 +1024,8 @@ static const unsigned char *commit_to_sha1(size_t index, void *table) return commits[index]->object.oid.hash; } -static void write_graph_chunk_data(struct hashfile *f, int hash_len, - struct write_commit_graph_context *ctx) +static int write_graph_chunk_data(struct hashfile *f, + struct write_commit_graph_context *ctx) { struct commit **list = ctx->commits.list; struct commit **last = ctx->commits.list + ctx->commits.nr; @@ -838,12 +1033,16 @@ 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); - parse_commit_no_graph(*list); - hashwrite(f, get_commit_tree_oid(*list)->hash, hash_len); + 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, the_hash_algo->rawsz); parent = (*list)->parents; @@ -857,7 +1056,7 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len, if (edge_value >= 0) edge_value += ctx->new_num_commits_in_base; - else { + else if (ctx->new_base_graph) { uint32_t pos; if (find_commit_in_graph(parent->item, ctx->new_base_graph, @@ -888,7 +1087,7 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len, if (edge_value >= 0) edge_value += ctx->new_num_commits_in_base; - else { + else if (ctx->new_base_graph) { uint32_t pos; if (find_commit_in_graph(parent->item, ctx->new_base_graph, @@ -916,17 +1115,19 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len, else packedDate[0] = 0; - packedDate[0] |= htonl((*list)->generation << 2); + packedDate[0] |= htonl(commit_graph_data_at(*list)->generation << 2); packedDate[1] = htonl((*list)->date); hashwrite(f, packedDate, 8); list++; } + + return 0; } -static void write_graph_chunk_extra_edges(struct hashfile *f, - struct write_commit_graph_context *ctx) +static int write_graph_chunk_extra_edges(struct hashfile *f, + struct write_commit_graph_context *ctx) { struct commit **list = ctx->commits.list; struct commit **last = ctx->commits.list + ctx->commits.nr; @@ -955,7 +1156,7 @@ static void write_graph_chunk_extra_edges(struct hashfile *f, if (edge_value >= 0) edge_value += ctx->new_num_commits_in_base; - else { + else if (ctx->new_base_graph) { uint32_t pos; if (find_commit_in_graph(parent->item, ctx->new_base_graph, @@ -975,6 +1176,68 @@ static void write_graph_chunk_extra_edges(struct hashfile *f, list++; } + + return 0; +} + +static int write_graph_chunk_bloom_indexes(struct hashfile *f, + struct write_commit_graph_context *ctx) +{ + struct commit **list = ctx->commits.list; + struct commit **last = ctx->commits.list + ctx->commits.nr; + uint32_t cur_pos = 0; + + while (list < last) { + struct bloom_filter *filter = get_bloom_filter(ctx->r, *list); + size_t len = filter ? filter->len : 0; + cur_pos += len; + display_progress(ctx->progress, ++ctx->progress_cnt); + hashwrite_be32(f, cur_pos); + list++; + } + + return 0; +} + +static void trace2_bloom_filter_settings(struct write_commit_graph_context *ctx) +{ + struct json_writer jw = JSON_WRITER_INIT; + + jw_object_begin(&jw, 0); + jw_object_intmax(&jw, "hash_version", ctx->bloom_settings->hash_version); + jw_object_intmax(&jw, "num_hashes", ctx->bloom_settings->num_hashes); + jw_object_intmax(&jw, "bits_per_entry", ctx->bloom_settings->bits_per_entry); + jw_object_intmax(&jw, "max_changed_paths", ctx->bloom_settings->max_changed_paths); + jw_end(&jw); + + trace2_data_json("bloom", ctx->r, "settings", &jw); + + jw_release(&jw); +} + +static int write_graph_chunk_bloom_data(struct hashfile *f, + struct write_commit_graph_context *ctx) +{ + struct commit **list = ctx->commits.list; + struct commit **last = ctx->commits.list + ctx->commits.nr; + + trace2_bloom_filter_settings(ctx); + + hashwrite_be32(f, ctx->bloom_settings->hash_version); + hashwrite_be32(f, ctx->bloom_settings->num_hashes); + hashwrite_be32(f, ctx->bloom_settings->bits_per_entry); + + while (list < last) { + struct bloom_filter *filter = get_bloom_filter(ctx->r, *list); + size_t len = filter ? filter->len : 0; + + display_progress(ctx->progress, ++ctx->progress_cnt); + if (len) + hashwrite(f, filter->data, len * sizeof(unsigned char)); + list++; + } + + return 0; } static int oid_compare(const void *_a, const void *_b) @@ -1008,6 +1271,8 @@ static int add_packed_commits(const struct object_id *oid, oidcpy(&(ctx->oids.list[ctx->oids.nr]), oid); ctx->oids.nr++; + set_commit_pos(ctx->r, oid); + return 0; } @@ -1015,11 +1280,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 & UNINTERESTING)) { + if (!(parent->item->object.flags & REACHABLE)) { 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 |= UNINTERESTING; + parent->item->object.flags |= REACHABLE; } } } @@ -1028,6 +1293,8 @@ static void close_reachable(struct write_commit_graph_context *ctx) { int i; struct commit *commit; + enum commit_graph_split_flags flags = ctx->opts ? + ctx->opts->split_flags : COMMIT_GRAPH_SPLIT_UNSPECIFIED; if (ctx->report_progress) ctx->progress = start_delayed_progress( @@ -1037,7 +1304,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 |= UNINTERESTING; + commit->object.flags |= REACHABLE; } stop_progress(&ctx->progress); @@ -1049,7 +1316,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"), - ctx->oids.nr); + 0); for (i = 0; i < ctx->oids.nr; i++) { display_progress(ctx->progress, i + 1); commit = lookup_commit(ctx->r, &ctx->oids.list[i]); @@ -1057,8 +1324,9 @@ static void close_reachable(struct write_commit_graph_context *ctx) if (!commit) continue; if (ctx->split) { - if (!parse_commit(commit) && - commit->graph_pos == COMMIT_NOT_FROM_GRAPH) + if ((!parse_commit(commit) && + commit_graph_position(commit) == COMMIT_NOT_FROM_GRAPH) || + flags == COMMIT_GRAPH_SPLIT_REPLACE) add_missing_parents(ctx, commit); } else if (!parse_commit_no_graph(commit)) add_missing_parents(ctx, commit); @@ -1074,7 +1342,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 &= ~UNINTERESTING; + commit->object.flags &= ~REACHABLE; } stop_progress(&ctx->progress); } @@ -1085,13 +1353,15 @@ static void compute_generation_numbers(struct write_commit_graph_context *ctx) struct commit_list *list = NULL; if (ctx->report_progress) - ctx->progress = start_progress( + ctx->progress = start_delayed_progress( _("Computing commit graph generation numbers"), ctx->commits.nr); for (i = 0; i < ctx->commits.nr; i++) { + uint32_t generation = commit_graph_data_at(ctx->commits.list[i])->generation; + display_progress(ctx->progress, i + 1); - if (ctx->commits.list[i]->generation != GENERATION_NUMBER_INFINITY && - ctx->commits.list[i]->generation != GENERATION_NUMBER_ZERO) + if (generation != GENERATION_NUMBER_INFINITY && + generation != GENERATION_NUMBER_ZERO) continue; commit_list_insert(ctx->commits.list[i], &list); @@ -1102,49 +1372,142 @@ static void compute_generation_numbers(struct write_commit_graph_context *ctx) uint32_t max_generation = 0; for (parent = current->parents; parent; parent = parent->next) { - if (parent->item->generation == GENERATION_NUMBER_INFINITY || - parent->item->generation == GENERATION_NUMBER_ZERO) { + generation = commit_graph_data_at(parent->item)->generation; + + if (generation == GENERATION_NUMBER_INFINITY || + generation == GENERATION_NUMBER_ZERO) { all_parents_computed = 0; commit_list_insert(parent->item, &list); break; - } else if (parent->item->generation > max_generation) { - max_generation = parent->item->generation; + } else if (generation > max_generation) { + max_generation = generation; } } if (all_parents_computed) { - current->generation = max_generation + 1; + struct commit_graph_data *data = commit_graph_data_at(current); + + data->generation = max_generation + 1; pop_commit(&list); - if (current->generation > GENERATION_NUMBER_MAX) - current->generation = GENERATION_NUMBER_MAX; + if (data->generation > GENERATION_NUMBER_MAX) + data->generation = GENERATION_NUMBER_MAX; } } } stop_progress(&ctx->progress); } -static int add_ref_to_list(const char *refname, - const struct object_id *oid, - int flags, void *cb_data) +static void trace2_bloom_filter_write_statistics(struct write_commit_graph_context *ctx) +{ + trace2_data_intmax("commit-graph", ctx->r, "filter-computed", + ctx->count_bloom_filter_computed); + trace2_data_intmax("commit-graph", ctx->r, "filter-not-computed", + ctx->count_bloom_filter_not_computed); + trace2_data_intmax("commit-graph", ctx->r, "filter-trunc-empty", + ctx->count_bloom_filter_trunc_empty); + trace2_data_intmax("commit-graph", ctx->r, "filter-trunc-large", + ctx->count_bloom_filter_trunc_large); +} + +static void compute_bloom_filters(struct write_commit_graph_context *ctx) { - struct string_list *list = (struct string_list *)cb_data; + int i; + struct progress *progress = NULL; + struct commit **sorted_commits; + int max_new_filters; + + init_bloom_filters(); + + if (ctx->report_progress) + progress = start_delayed_progress( + _("Computing commit changed paths Bloom filters"), + ctx->commits.nr); + + ALLOC_ARRAY(sorted_commits, ctx->commits.nr); + COPY_ARRAY(sorted_commits, ctx->commits.list, ctx->commits.nr); + + if (ctx->order_by_pack) + QSORT(sorted_commits, ctx->commits.nr, commit_pos_cmp); + else + QSORT(sorted_commits, ctx->commits.nr, commit_gen_cmp); + + max_new_filters = ctx->opts && ctx->opts->max_new_filters >= 0 ? + ctx->opts->max_new_filters : ctx->commits.nr; + + for (i = 0; i < ctx->commits.nr; i++) { + enum bloom_filter_computed computed = 0; + struct commit *c = sorted_commits[i]; + struct bloom_filter *filter = get_or_compute_bloom_filter( + ctx->r, + c, + ctx->count_bloom_filter_computed < max_new_filters, + ctx->bloom_settings, + &computed); + if (computed & BLOOM_COMPUTED) { + ctx->count_bloom_filter_computed++; + if (computed & BLOOM_TRUNC_EMPTY) + ctx->count_bloom_filter_trunc_empty++; + if (computed & BLOOM_TRUNC_LARGE) + ctx->count_bloom_filter_trunc_large++; + } else if (computed & BLOOM_NOT_COMPUTED) + ctx->count_bloom_filter_not_computed++; + ctx->total_bloom_filter_data_size += filter + ? sizeof(unsigned char) * filter->len : 0; + display_progress(progress, i + 1); + } + + if (trace2_is_enabled()) + trace2_bloom_filter_write_statistics(ctx); + + free(sorted_commits); + stop_progress(&progress); +} + +struct refs_cb_data { + struct oidset *commits; + struct progress *progress; +}; + +static int add_ref_to_set(const char *refname, + const struct object_id *oid, + int flags, void *cb_data) +{ + struct object_id peeled; + struct refs_cb_data *data = (struct refs_cb_data *)cb_data; + + if (!peel_ref(refname, &peeled)) + oid = &peeled; + if (oid_object_info(the_repository, oid, NULL) == OBJ_COMMIT) + oidset_insert(data->commits, oid); + + display_progress(data->progress, oidset_size(data->commits)); - string_list_append(list, oid_to_hex(oid)); return 0; } -int write_commit_graph_reachable(const char *obj_dir, unsigned int flags, - const struct split_commit_graph_opts *split_opts) +int write_commit_graph_reachable(struct object_directory *odb, + enum commit_graph_write_flags flags, + const struct commit_graph_opts *opts) { - struct string_list list = STRING_LIST_INIT_DUP; + struct oidset commits = OIDSET_INIT; + struct refs_cb_data data; int result; - for_each_ref(add_ref_to_list, &list); - result = write_commit_graph(obj_dir, NULL, &list, - flags, split_opts); + memset(&data, 0, sizeof(data)); + data.commits = &commits; + if (flags & COMMIT_GRAPH_WRITE_PROGRESS) + data.progress = start_delayed_progress( + _("Collecting referenced commits"), 0); - string_list_clear(&list, 0); + for_each_ref(add_ref_to_set, &data); + + stop_progress(&data.progress); + + result = write_commit_graph(odb, NULL, &commits, + flags, opts); + + oidset_clear(&commits); return result; } @@ -1156,7 +1519,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->obj_dir); + strbuf_addf(&packname, "%s/pack/", ctx->odb->path); dirlen = packname.len; if (ctx->report_progress) { strbuf_addf(&progress_title, @@ -1193,42 +1556,23 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx, return 0; } -static void fill_oids_from_commit_hex(struct write_commit_graph_context *ctx, - struct string_list *commit_hex) +static int fill_oids_from_commits(struct write_commit_graph_context *ctx, + struct oidset *commits) { - uint32_t i; - struct strbuf progress_title = STRBUF_INIT; - - if (ctx->report_progress) { - strbuf_addf(&progress_title, - Q_("Finding commits for commit graph from %d ref", - "Finding commits for commit graph from %d refs", - commit_hex->nr), - commit_hex->nr); - ctx->progress = start_delayed_progress( - progress_title.buf, - commit_hex->nr); - } - for (i = 0; i < commit_hex->nr; i++) { - const char *end; - struct object_id oid; - struct commit *result; + struct oidset_iter iter; + struct object_id *oid; - display_progress(ctx->progress, i + 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 (!oidset_size(commits)) + return 0; - 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++; - } + oidset_iter_init(commits, &iter); + while ((oid = oidset_iter_next(&iter))) { + ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc); + oidcpy(&ctx->oids.list[ctx->oids.nr], oid); + ctx->oids.nr++; } - stop_progress(&ctx->progress); - strbuf_release(&progress_title); + + return 0; } static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx) @@ -1261,7 +1605,7 @@ static uint32_t count_distinct_commits(struct write_commit_graph_context *ctx) if (ctx->split) { struct commit *c = lookup_commit(ctx->r, &ctx->oids.list[i]); - if (!c || c->graph_pos != COMMIT_NOT_FROM_GRAPH) + if (!c || commit_graph_position(c) != COMMIT_NOT_FROM_GRAPH) continue; } @@ -1276,7 +1620,8 @@ 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; + enum commit_graph_split_flags flags = ctx->opts ? + ctx->opts->split_flags : COMMIT_GRAPH_SPLIT_UNSPECIFIED; ctx->num_extra_edges = 0; if (ctx->report_progress) @@ -1284,7 +1629,8 @@ 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++) { - int num_parents = 0; + unsigned int num_parents; + display_progress(ctx->progress, i + 1); if (i > 0 && oideq(&ctx->oids.list[i - 1], &ctx->oids.list[i])) continue; @@ -1292,16 +1638,16 @@ static void copy_oids_to_commits(struct write_commit_graph_context *ctx) ALLOC_GROW(ctx->commits.list, ctx->commits.nr + 1, ctx->commits.alloc); ctx->commits.list[ctx->commits.nr] = lookup_commit(ctx->r, &ctx->oids.list[i]); - if (ctx->split && - ctx->commits.list[ctx->commits.nr]->graph_pos != COMMIT_NOT_FROM_GRAPH) + if (ctx->split && flags != COMMIT_GRAPH_SPLIT_REPLACE && + commit_graph_position(ctx->commits.list[ctx->commits.nr]) != COMMIT_NOT_FROM_GRAPH) continue; - parse_commit_no_graph(ctx->commits.list[ctx->commits.nr]); - - for (parent = ctx->commits.list[ctx->commits.nr]->parents; - parent; parent = parent->next) - num_parents++; + if (ctx->split && flags == COMMIT_GRAPH_SPLIT_REPLACE) + parse_commit(ctx->commits.list[ctx->commits.nr]); + else + parse_commit_no_graph(ctx->commits.list[ctx->commits.nr]); + num_parents = commit_list_count(ctx->commits.list[ctx->commits.nr]->parents); if (num_parents > 2) ctx->num_extra_edges += num_parents - 1; @@ -1336,17 +1682,26 @@ static int write_graph_chunk_base(struct hashfile *f, return 0; } +typedef int (*chunk_write_fn)(struct hashfile *f, + struct write_commit_graph_context *ctx); + +struct chunk_info { + uint32_t id; + uint64_t size; + chunk_write_fn write_fn; +}; + static int write_commit_graph_file(struct write_commit_graph_context *ctx) { uint32_t i; int fd; struct hashfile *f; struct lock_file lk = LOCK_INIT; - uint32_t chunk_ids[6]; - uint64_t chunk_offsets[6]; + struct chunk_info chunks[MAX_NUM_CHUNKS + 1]; const unsigned hashsz = the_hash_algo->rawsz; struct strbuf progress_title = STRBUF_INIT; int num_chunks = 3; + uint64_t chunk_offset; struct object_id file_hash; if (ctx->split) { @@ -1354,10 +1709,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->obj_dir); + ctx->odb->path); ctx->graph_name = strbuf_detach(&tmp_file, NULL); } else { - ctx->graph_name = get_commit_graph_filename(ctx->obj_dir); + ctx->graph_name = get_commit_graph_filename(ctx->odb); } if (safe_create_leading_directories(ctx->graph_name)) { @@ -1368,54 +1723,67 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) } if (ctx->split) { - char *lock_name = get_chain_filename(ctx->obj_dir); + char *lock_name = get_commit_graph_chain_filename(ctx->odb); - hold_lock_file_for_update(&lk, lock_name, LOCK_DIE_ON_ERROR); + hold_lock_file_for_update_mode(&lk, lock_name, + LOCK_DIE_ON_ERROR, 0444); fd = git_mkstemp_mode(ctx->graph_name, 0444); if (fd < 0) { - error(_("unable to create '%s'"), ctx->graph_name); + error(_("unable to create temporary graph layer")); + return -1; + } + + if (adjust_shared_perm(ctx->graph_name)) { + error(_("unable to adjust shared permissions for '%s'"), + ctx->graph_name); return -1; } f = hashfd(fd, ctx->graph_name); } else { - hold_lock_file_for_update(&lk, ctx->graph_name, LOCK_DIE_ON_ERROR); + hold_lock_file_for_update_mode(&lk, ctx->graph_name, + LOCK_DIE_ON_ERROR, 0444); fd = lk.tempfile->fd; f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf); } - chunk_ids[0] = GRAPH_CHUNKID_OIDFANOUT; - chunk_ids[1] = GRAPH_CHUNKID_OIDLOOKUP; - chunk_ids[2] = GRAPH_CHUNKID_DATA; + chunks[0].id = GRAPH_CHUNKID_OIDFANOUT; + chunks[0].size = GRAPH_FANOUT_SIZE; + chunks[0].write_fn = write_graph_chunk_fanout; + chunks[1].id = GRAPH_CHUNKID_OIDLOOKUP; + chunks[1].size = hashsz * ctx->commits.nr; + chunks[1].write_fn = write_graph_chunk_oids; + chunks[2].id = GRAPH_CHUNKID_DATA; + chunks[2].size = (hashsz + 16) * ctx->commits.nr; + chunks[2].write_fn = write_graph_chunk_data; if (ctx->num_extra_edges) { - chunk_ids[num_chunks] = GRAPH_CHUNKID_EXTRAEDGES; + chunks[num_chunks].id = GRAPH_CHUNKID_EXTRAEDGES; + chunks[num_chunks].size = 4 * ctx->num_extra_edges; + chunks[num_chunks].write_fn = write_graph_chunk_extra_edges; num_chunks++; } - if (ctx->num_commit_graphs_after > 1) { - chunk_ids[num_chunks] = GRAPH_CHUNKID_BASE; + if (ctx->changed_paths) { + chunks[num_chunks].id = GRAPH_CHUNKID_BLOOMINDEXES; + chunks[num_chunks].size = sizeof(uint32_t) * ctx->commits.nr; + chunks[num_chunks].write_fn = write_graph_chunk_bloom_indexes; num_chunks++; - } - - chunk_ids[num_chunks] = 0; - - chunk_offsets[0] = 8 + (num_chunks + 1) * GRAPH_CHUNKLOOKUP_WIDTH; - chunk_offsets[1] = chunk_offsets[0] + GRAPH_FANOUT_SIZE; - chunk_offsets[2] = chunk_offsets[1] + hashsz * ctx->commits.nr; - chunk_offsets[3] = chunk_offsets[2] + (hashsz + 16) * ctx->commits.nr; - - num_chunks = 3; - if (ctx->num_extra_edges) { - chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] + - 4 * ctx->num_extra_edges; + chunks[num_chunks].id = GRAPH_CHUNKID_BLOOMDATA; + chunks[num_chunks].size = sizeof(uint32_t) * 3 + + ctx->total_bloom_filter_data_size; + chunks[num_chunks].write_fn = write_graph_chunk_bloom_data; num_chunks++; } if (ctx->num_commit_graphs_after > 1) { - chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] + - hashsz * (ctx->num_commit_graphs_after - 1); + chunks[num_chunks].id = GRAPH_CHUNKID_BASE; + chunks[num_chunks].size = hashsz * (ctx->num_commit_graphs_after - 1); + chunks[num_chunks].write_fn = write_graph_chunk_base; num_chunks++; } + chunks[num_chunks].id = 0; + chunks[num_chunks].size = 0; + hashwrite_be32(f, GRAPH_SIGNATURE); hashwrite_u8(f, GRAPH_VERSION); @@ -1423,13 +1791,16 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) hashwrite_u8(f, num_chunks); hashwrite_u8(f, ctx->num_commit_graphs_after - 1); + chunk_offset = 8 + (num_chunks + 1) * GRAPH_CHUNKLOOKUP_WIDTH; for (i = 0; i <= num_chunks; i++) { uint32_t chunk_write[3]; - chunk_write[0] = htonl(chunk_ids[i]); - chunk_write[1] = htonl(chunk_offsets[i] >> 32); - chunk_write[2] = htonl(chunk_offsets[i] & 0xffffffff); + chunk_write[0] = htonl(chunks[i].id); + chunk_write[1] = htonl(chunk_offset >> 32); + chunk_write[2] = htonl(chunk_offset & 0xffffffff); hashwrite(f, chunk_write, 12); + + chunk_offset += chunks[i].size; } if (ctx->report_progress) { @@ -1442,21 +1813,25 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) progress_title.buf, num_chunks * ctx->commits.nr); } - write_graph_chunk_fanout(f, ctx); - write_graph_chunk_oids(f, hashsz, ctx); - write_graph_chunk_data(f, hashsz, ctx); - if (ctx->num_extra_edges) - write_graph_chunk_extra_edges(f, ctx); - if (ctx->num_commit_graphs_after > 1 && - write_graph_chunk_base(f, ctx)) { - return -1; + + for (i = 0; i < num_chunks; i++) { + uint64_t start_offset = f->total + f->offset; + + if (chunks[i].write_fn(f, ctx)) + return -1; + + if (f->total + f->offset != start_offset + chunks[i].size) + BUG("expected to write %"PRId64" bytes to chunk %"PRIx32", but wrote %"PRId64" instead", + chunks[i].size, chunks[i].id, + f->total + f->offset - start_offset); } + stop_progress(&ctx->progress); strbuf_release(&progress_title); 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->obj_dir, new_base_hash); + char *new_base_name = get_split_graph_filename(ctx->new_base_graph->odb, 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]); @@ -1480,8 +1855,12 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) } if (ctx->base_graph_name) { - const char *dest = ctx->commit_graph_filenames_after[ - ctx->num_commit_graphs_after - 2]; + const char *dest; + int idx = ctx->num_commit_graphs_after - 1; + if (ctx->num_commit_graphs_after > 1) + idx--; + + dest = ctx->commit_graph_filenames_after[idx]; if (strcmp(ctx->base_graph_name, dest)) { result = rename(ctx->base_graph_name, dest); @@ -1492,12 +1871,12 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) } } } else { - char *graph_name = get_commit_graph_filename(ctx->obj_dir); + char *graph_name = get_commit_graph_filename(ctx->odb); 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->obj_dir, + final_graph_name = get_split_graph_filename(ctx->odb, 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; @@ -1519,39 +1898,55 @@ 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 = ctx->r->objects->commit_graph; - uint32_t num_commits = ctx->commits.nr; + struct commit_graph *g; + uint32_t num_commits; + enum commit_graph_split_flags flags = COMMIT_GRAPH_SPLIT_UNSPECIFIED; uint32_t i; int max_commits = 0; int size_mult = 2; - if (ctx->split_opts) { - max_commits = ctx->split_opts->max_commits; - size_mult = ctx->split_opts->size_multiple; + if (ctx->opts) { + max_commits = ctx->opts->max_commits; + + if (ctx->opts->size_multiple) + size_mult = ctx->opts->size_multiple; + + flags = ctx->opts->split_flags; } g = ctx->r->objects->commit_graph; - 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 (strcmp(g->obj_dir, ctx->obj_dir)) - break; + num_commits = ctx->commits.nr; + if (flags == COMMIT_GRAPH_SPLIT_REPLACE) + ctx->num_commit_graphs_after = 1; + else + ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1; + + if (flags != COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED && + flags != COMMIT_GRAPH_SPLIT_REPLACE) { + while (g && (g->num_commits <= size_mult * num_commits || + (max_commits && num_commits > max_commits))) { + if (g->odb != ctx->odb) + break; - num_commits += g->num_commits; - g = g->base_graph; + num_commits += g->num_commits; + g = g->base_graph; - ctx->num_commit_graphs_after--; + ctx->num_commit_graphs_after--; + } } - ctx->new_base_graph = g; + if (flags != COMMIT_GRAPH_SPLIT_REPLACE) + ctx->new_base_graph = g; + else if (ctx->num_commit_graphs_after != 1) + BUG("split_graph_merge_strategy: num_commit_graphs_after " + "should be 1 with --split=replace"); if (ctx->num_commit_graphs_after == 2) { - char *old_graph_name = get_commit_graph_filename(g->obj_dir); + char *old_graph_name = get_commit_graph_filename(g->odb); if (!strcmp(g->filename, old_graph_name) && - strcmp(g->obj_dir, ctx->obj_dir)) { + g->odb != ctx->odb) { ctx->num_commit_graphs_after = 1; ctx->new_base_graph = NULL; } @@ -1559,8 +1954,8 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx) free(old_graph_name); } - ALLOC_ARRAY(ctx->commit_graph_filenames_after, ctx->num_commit_graphs_after); - ALLOC_ARRAY(ctx->commit_graph_hash_after, ctx->num_commit_graphs_after); + CALLOC_ARRAY(ctx->commit_graph_filenames_after, ctx->num_commit_graphs_after); + CALLOC_ARRAY(ctx->commit_graph_hash_after, ctx->num_commit_graphs_after); for (i = 0; i < ctx->num_commit_graphs_after && i < ctx->num_commit_graphs_before; i++) @@ -1613,8 +2008,7 @@ 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, num_parents; - struct commit_list *parent; + uint32_t i; if (ctx->report_progress) ctx->progress = start_delayed_progress( @@ -1632,10 +2026,9 @@ 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 { - num_parents = 0; - for (parent = ctx->commits.list[i]->parents; parent; parent = parent->next) - num_parents++; + unsigned int num_parents; + num_parents = commit_list_count(ctx->commits.list[i]->parents); if (num_parents > 2) ctx->num_extra_edges += num_parents - 1; } @@ -1648,19 +2041,15 @@ 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) { - strbuf_addstr(&progress_title, _("Merging commit-graph")); - ctx->progress = start_delayed_progress(progress_title.buf, 0); - } + if (ctx->report_progress) + ctx->progress = start_delayed_progress(_("Merging commit-graph"), 0); merge_commit_graph(ctx, g); stop_progress(&ctx->progress); - strbuf_release(&progress_title); g = g->base_graph; } @@ -1701,16 +2090,16 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx) size_t dirnamelen; timestamp_t expire_time = time(NULL); - if (ctx->split_opts && ctx->split_opts->expire_time) - expire_time -= ctx->split_opts->expire_time; + if (ctx->opts && ctx->opts->expire_time) + expire_time = ctx->opts->expire_time; if (!ctx->split) { - char *chain_file_name = get_chain_filename(ctx->obj_dir); + char *chain_file_name = get_commit_graph_chain_filename(ctx->odb); unlink(chain_file_name); free(chain_file_name); ctx->num_commit_graphs_after = 0; } - strbuf_addstr(&path, ctx->obj_dir); + strbuf_addstr(&path, ctx->odb->path); strbuf_addstr(&path, "/info/commit-graphs"); dir = opendir(path.buf); @@ -1749,34 +2138,52 @@ out: strbuf_release(&path); } -int write_commit_graph(const char *obj_dir, +int write_commit_graph(struct object_directory *odb, struct string_list *pack_indexes, - struct string_list *commit_hex, - unsigned int flags, - const struct split_commit_graph_opts *split_opts) + struct oidset *commits, + enum commit_graph_write_flags flags, + const struct commit_graph_opts *opts) { struct write_commit_graph_context *ctx; uint32_t i, count_distinct = 0; - size_t len; int res = 0; + int replace = 0; + struct bloom_filter_settings bloom_settings = DEFAULT_BLOOM_FILTER_SETTINGS; if (!commit_graph_compatible(the_repository)) return 0; 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->opts = opts; + ctx->total_bloom_filter_data_size = 0; + + bloom_settings.bits_per_entry = git_env_ulong("GIT_TEST_BLOOM_SETTINGS_BITS_PER_ENTRY", + bloom_settings.bits_per_entry); + bloom_settings.num_hashes = git_env_ulong("GIT_TEST_BLOOM_SETTINGS_NUM_HASHES", + bloom_settings.num_hashes); + bloom_settings.max_changed_paths = git_env_ulong("GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS", + bloom_settings.max_changed_paths); + ctx->bloom_settings = &bloom_settings; + + if (flags & COMMIT_GRAPH_WRITE_BLOOM_FILTERS) + ctx->changed_paths = 1; + if (!(flags & COMMIT_GRAPH_NO_WRITE_BLOOM_FILTERS)) { + struct commit_graph *g; + prepare_commit_graph_one(ctx->r, ctx->odb); - /* 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; + g = ctx->r->objects->commit_graph; - 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; + /* We have changed-paths already. Keep them in the next graph */ + if (g && g->chunk_bloom_data) { + ctx->changed_paths = 1; + ctx->bloom_settings = g->bloom_filter_settings; + } + } if (ctx->split) { struct commit_graph *g; @@ -1799,16 +2206,19 @@ int write_commit_graph(const char *obj_dir, g = g->base_graph; } } + + if (ctx->opts) + replace = ctx->opts->split_flags & COMMIT_GRAPH_SPLIT_REPLACE; } ctx->approx_nr_objects = approximate_object_count(); ctx->oids.alloc = ctx->approx_nr_objects / 32; - if (ctx->split && split_opts && ctx->oids.alloc > split_opts->max_commits) - ctx->oids.alloc = split_opts->max_commits; + if (ctx->split && opts && ctx->oids.alloc > opts->max_commits) + ctx->oids.alloc = opts->max_commits; if (ctx->append) { - prepare_commit_graph_one(ctx->r, ctx->obj_dir); + prepare_commit_graph_one(ctx->r, ctx->odb); if (ctx->r->objects->commit_graph) ctx->oids.alloc += ctx->r->objects->commit_graph->num_commits; } @@ -1826,15 +2236,20 @@ int write_commit_graph(const char *obj_dir, } if (pack_indexes) { + ctx->order_by_pack = 1; if ((res = fill_oids_from_packs(ctx, pack_indexes))) goto cleanup; } - if (commit_hex) - fill_oids_from_commit_hex(ctx, commit_hex); + if (commits) { + if ((res = fill_oids_from_commits(ctx, commits))) + goto cleanup; + } - if (!pack_indexes && !commit_hex) + if (!pack_indexes && !commits) { + ctx->order_by_pack = 1; fill_oids_from_all_packs(ctx); + } close_reachable(ctx); @@ -1857,18 +2272,22 @@ int write_commit_graph(const char *obj_dir, goto cleanup; } - if (!ctx->commits.nr) + if (!ctx->commits.nr && !replace) goto cleanup; if (ctx->split) { split_graph_merge_strategy(ctx); - merge_commit_graphs(ctx); + if (!replace) + merge_commit_graphs(ctx); } else ctx->num_commit_graphs_after = 1; compute_generation_numbers(ctx); + if (ctx->changed_paths) + compute_bloom_filters(ctx); + res = write_commit_graph_file(ctx); if (ctx->split) @@ -1880,7 +2299,6 @@ 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++) { @@ -1986,12 +2404,15 @@ 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; - progress = start_progress(_("Verifying commits in commit graph"), - g->num_commits); + if (flags & COMMIT_GRAPH_WRITE_PROGRESS) + 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; uint32_t max_generation = 0; + uint32_t generation; display_progress(progress, i + 1); hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i); @@ -2030,8 +2451,9 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags) oid_to_hex(&graph_parents->item->object.oid), oid_to_hex(&odb_parents->item->object.oid)); - if (graph_parents->item->generation > max_generation) - max_generation = graph_parents->item->generation; + generation = commit_graph_generation(graph_parents->item); + if (generation > max_generation) + max_generation = generation; graph_parents = graph_parents->next; odb_parents = odb_parents->next; @@ -2041,7 +2463,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags) graph_report(_("commit-graph parent list for commit %s terminates early"), oid_to_hex(&cur_oid)); - if (!graph_commit->generation) { + if (!commit_graph_generation(graph_commit)) { if (generation_zero == GENERATION_NUMBER_EXISTS) graph_report(_("commit-graph has generation number zero for commit %s, but non-zero elsewhere"), oid_to_hex(&cur_oid)); @@ -2061,10 +2483,11 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags) if (max_generation == GENERATION_NUMBER_MAX) max_generation--; - if (graph_commit->generation != max_generation + 1) + generation = commit_graph_generation(graph_commit); + if (generation != max_generation + 1) graph_report(_("commit-graph generation for commit %s is %u != %u"), oid_to_hex(&cur_oid), - graph_commit->generation, + generation, max_generation + 1); if (graph_commit->date != odb_commit->date) @@ -2087,11 +2510,16 @@ void free_commit_graph(struct commit_graph *g) { if (!g) return; - if (g->graph_fd >= 0) { + if (g->data) { munmap((void *)g->data, g->data_len); g->data = NULL; - close(g->graph_fd); } free(g->filename); + free(g->bloom_filter_settings); 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 df9a3b20e4..f8e92500c6 100644 --- a/third_party/git/commit-graph.h +++ b/third_party/git/commit-graph.h @@ -2,16 +2,30 @@ #define COMMIT_GRAPH_H #include "git-compat-util.h" -#include "repository.h" -#include "string-list.h" -#include "cache.h" +#include "object-store.h" +#include "oidset.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" +#define GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE "GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE" +#define GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS "GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS" + +/* + * This method is only used to enhance coverage of the commit-graph + * feature in the test suite with the GIT_TEST_COMMIT_GRAPH and + * GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS environment variables. Do not + * call this method oustide of a builtin, and only if you know what + * you are doing! + */ +void git_test_write_commit_graph_or_die(void); struct commit; +struct bloom_filter_settings; +struct repository; +struct raw_object_store; +struct string_list; -char *get_commit_graph_filename(const char *obj_dir); +char *get_commit_graph_filename(struct object_directory *odb); +char *get_commit_graph_chain_filename(struct object_directory *odb); int open_commit_graph(const char *graph_file, int *fd, struct stat *st); /* @@ -38,8 +52,6 @@ struct tree *get_commit_tree_in_graph(struct repository *r, const struct commit *c); struct commit_graph { - int graph_fd; - const unsigned char *data; size_t data_len; @@ -48,7 +60,7 @@ struct commit_graph { uint32_t num_commits; struct object_id oid; char *filename; - const char *obj_dir; + struct object_directory *odb; uint32_t num_commits_in_base; struct commit_graph *base_graph; @@ -58,12 +70,19 @@ struct commit_graph { const unsigned char *chunk_commit_data; const unsigned char *chunk_extra_edges; const unsigned char *chunk_base_graphs; + const unsigned char *chunk_bloom_indexes; + const unsigned char *chunk_bloom_data; + + struct bloom_filter_settings *bloom_filter_settings; }; -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); +struct commit_graph *load_commit_graph_one_fd_st(struct repository *r, + 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 *parse_commit_graph(struct repository *r, + void *graph_map, size_t graph_size); /* * Return 1 if and only if the repository has a commit-graph @@ -71,14 +90,28 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd, */ int generation_numbers_enabled(struct repository *r); -#define COMMIT_GRAPH_APPEND (1 << 0) -#define COMMIT_GRAPH_PROGRESS (1 << 1) -#define COMMIT_GRAPH_SPLIT (1 << 2) +struct bloom_filter_settings *get_bloom_filter_settings(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), + COMMIT_GRAPH_WRITE_BLOOM_FILTERS = (1 << 3), + COMMIT_GRAPH_NO_WRITE_BLOOM_FILTERS = (1 << 4), +}; + +enum commit_graph_split_flags { + COMMIT_GRAPH_SPLIT_UNSPECIFIED = 0, + COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED = 1, + COMMIT_GRAPH_SPLIT_REPLACE = 2 +}; -struct split_commit_graph_opts { +struct commit_graph_opts { int size_multiple; int max_commits; timestamp_t expire_time; + enum commit_graph_split_flags split_flags; + int max_new_filters; }; /* @@ -87,13 +120,14 @@ 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(const char *obj_dir, unsigned int flags, - const struct split_commit_graph_opts *split_opts); -int write_commit_graph(const char *obj_dir, +int write_commit_graph_reachable(struct object_directory *odb, + enum commit_graph_write_flags flags, + const struct commit_graph_opts *opts); +int write_commit_graph(struct object_directory *odb, struct string_list *pack_indexes, - struct string_list *commit_hex, - unsigned int flags, - const struct split_commit_graph_opts *split_opts); + struct oidset *commits, + enum commit_graph_write_flags flags, + const struct commit_graph_opts *opts); #define COMMIT_GRAPH_VERIFY_SHALLOW (1 << 0) @@ -102,4 +136,20 @@ 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); + +struct commit_graph_data { + uint32_t graph_pos; + uint32_t generation; +}; + +/* + * Commits should be parsed before accessing generation, graph positions. + */ +uint32_t commit_graph_generation(const struct commit *); +uint32_t commit_graph_position(const struct commit *); #endif diff --git a/third_party/git/commit-reach.c b/third_party/git/commit-reach.c index 3ea174788a..50175b159e 100644 --- a/third_party/git/commit-reach.c +++ b/third_party/git/commit-reach.c @@ -10,7 +10,6 @@ #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) @@ -59,14 +58,15 @@ static struct commit_list *paint_down_to_common(struct repository *r, struct commit *commit = prio_queue_get(&queue); struct commit_list *parents; int flags; + uint32_t generation = commit_graph_generation(commit); - if (min_generation && commit->generation > last_gen) + if (min_generation && generation > last_gen) BUG("bad generation skip %8x > %8x at %s", - commit->generation, last_gen, + generation, last_gen, oid_to_hex(&commit->object.oid)); - last_gen = commit->generation; + last_gen = generation; - if (commit->generation < min_generation) + if (generation < min_generation) break; flags = commit->object.flags & (PARENT1 | PARENT2 | STALE); @@ -177,18 +177,20 @@ static int remove_redundant(struct repository *r, struct commit **array, int cnt repo_parse_commit(r, array[i]); for (i = 0; i < cnt; i++) { struct commit_list *common; - uint32_t min_generation = array[i]->generation; + uint32_t min_generation = commit_graph_generation(array[i]); if (redundant[i]) continue; for (j = filled = 0; j < cnt; j++) { + uint32_t curr_generation; if (i == j || redundant[j]) continue; filled_index[filled] = j; work[filled++] = array[j]; - if (array[j]->generation < min_generation) - min_generation = array[j]->generation; + curr_generation = commit_graph_generation(array[j]); + if (curr_generation < min_generation) + min_generation = curr_generation; } common = paint_down_to_common(r, array[i], filled, work, min_generation); @@ -284,7 +286,9 @@ struct commit_list *repo_get_merge_bases(struct repository *r, /* * Is "commit" a descendant of one of the elements on the "with_commit" list? */ -int is_descendant_of(struct commit *commit, struct commit_list *with_commit) +int repo_is_descendant_of(struct repository *r, + struct commit *commit, + struct commit_list *with_commit) { if (!with_commit) return 1; @@ -302,7 +306,7 @@ int is_descendant_of(struct commit *commit, struct commit_list *with_commit) other = with_commit->item; with_commit = with_commit->next; - if (in_merge_bases(other, commit)) + if (repo_in_merge_bases_many(r, other, 1, &commit)) return 1; } return 0; @@ -317,23 +321,26 @@ int repo_in_merge_bases_many(struct repository *r, struct commit *commit, { struct commit_list *bases; int ret = 0, i; - uint32_t min_generation = GENERATION_NUMBER_INFINITY; + uint32_t generation, max_generation = GENERATION_NUMBER_ZERO; if (repo_parse_commit(r, commit)) return ret; for (i = 0; i < nr_reference; i++) { if (repo_parse_commit(r, reference[i])) return ret; - if (reference[i]->generation < min_generation) - min_generation = reference[i]->generation; + + generation = commit_graph_generation(reference[i]); + if (generation > max_generation) + max_generation = generation; } - if (commit->generation > min_generation) + generation = commit_graph_generation(commit); + if (generation > max_generation) return ret; bases = paint_down_to_common(r, commit, nr_reference, reference, - commit->generation); + generation); if (commit->object.flags & PARENT2) ret = 1; clear_commit_marks(commit, all_flags); @@ -349,7 +356,15 @@ int repo_in_merge_bases(struct repository *r, struct commit *commit, struct commit *reference) { - return repo_in_merge_bases_many(r, commit, 1, &reference); + int res; + struct commit_list *list = NULL; + struct commit_list **next = &list; + + next = commit_list_append(commit, next); + res = repo_is_descendant_of(r, reference, list); + free_commit_list(list); + + return res; } struct commit_list *reduce_heads(struct commit_list *heads) @@ -397,6 +412,7 @@ int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid) struct object *o; struct commit *old_commit, *new_commit; struct commit_list *old_commit_list = NULL; + int ret; /* * Both new_commit and old_commit must be commit-ish and new_commit is descendant of @@ -418,7 +434,10 @@ int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid) return 0; commit_list_insert(old_commit, &old_commit_list); - return is_descendant_of(new_commit, old_commit_list); + ret = repo_is_descendant_of(the_repository, + new_commit, old_commit_list); + free_commit_list(old_commit_list); + return ret; } /* @@ -468,7 +487,7 @@ static enum contains_result contains_test(struct commit *candidate, /* Otherwise, we don't know; prepare to recurse */ parse_commit_or_die(candidate); - if (candidate->generation < cutoff) + if (commit_graph_generation(candidate) < cutoff) return CONTAINS_NO; return CONTAINS_UNKNOWN; @@ -491,10 +510,12 @@ static enum contains_result contains_tag_algo(struct commit *candidate, const struct commit_list *p; for (p = want; p; p = p->next) { + uint32_t generation; struct commit *c = p->item; load_commit_graph_info(the_repository, c); - if (c->generation < cutoff) - cutoff = c->generation; + generation = commit_graph_generation(c); + if (generation < cutoff) + cutoff = generation; } result = contains_test(candidate, want, cache, cutoff); @@ -537,7 +558,7 @@ int commit_contains(struct ref_filter *filter, struct commit *commit, { if (filter->with_commit_tag_algo) return contains_tag_algo(commit, list, cache) == CONTAINS_YES; - return is_descendant_of(commit, list); + return repo_is_descendant_of(the_repository, commit, list); } static int compare_commits_by_gen(const void *_a, const void *_b) @@ -545,9 +566,12 @@ static int compare_commits_by_gen(const void *_a, const void *_b) const struct commit *a = *(const struct commit * const *)_a; const struct commit *b = *(const struct commit * const *)_b; - if (a->generation < b->generation) + uint32_t generation_a = commit_graph_generation(a); + uint32_t generation_b = commit_graph_generation(b); + + if (generation_a < generation_b) return -1; - if (a->generation > b->generation) + if (generation_a > generation_b) return 1; return 0; } @@ -586,7 +610,7 @@ int can_all_from_reach_with_flag(struct object_array *from, list[nr_commits] = (struct commit *)from_one; if (parse_commit(list[nr_commits]) || - list[nr_commits]->generation < min_generation) { + commit_graph_generation(list[nr_commits]) < min_generation) { result = 0; goto cleanup; } @@ -622,7 +646,7 @@ int can_all_from_reach_with_flag(struct object_array *from, if (parse_commit(parent->item) || parent->item->date < min_commit_date || - parent->item->generation < min_generation) + commit_graph_generation(parent->item) < min_generation) continue; commit_list_insert(parent->item, &stack); @@ -663,11 +687,13 @@ int can_all_from_reach(struct commit_list *from, struct commit_list *to, add_object_array(&from_iter->item->object, NULL, &from_objs); if (!parse_commit(from_iter->item)) { + uint32_t generation; if (from_iter->item->date < min_commit_date) min_commit_date = from_iter->item->date; - if (from_iter->item->generation < min_generation) - min_generation = from_iter->item->generation; + generation = commit_graph_generation(from_iter->item); + if (generation < min_generation) + min_generation = generation; } from_iter = from_iter->next; @@ -675,11 +701,13 @@ int can_all_from_reach(struct commit_list *from, struct commit_list *to, while (to_iter) { if (!parse_commit(to_iter->item)) { + uint32_t generation; if (to_iter->item->date < min_commit_date) min_commit_date = to_iter->item->date; - if (to_iter->item->generation < min_generation) - min_generation = to_iter->item->generation; + generation = commit_graph_generation(to_iter->item); + if (generation < min_generation) + min_generation = generation; } to_iter->item->object.flags |= PARENT2; @@ -719,11 +747,13 @@ struct commit_list *get_reachable_subset(struct commit **from, int nr_from, struct prio_queue queue = { compare_commits_by_gen_then_commit_date }; for (item = to; item < to_last; item++) { + uint32_t generation; struct commit *c = *item; parse_commit(c); - if (c->generation < min_generation) - min_generation = c->generation; + generation = commit_graph_generation(c); + if (generation < min_generation) + min_generation = generation; if (!(c->object.flags & PARENT1)) { c->object.flags |= PARENT1; @@ -756,7 +786,7 @@ struct commit_list *get_reachable_subset(struct commit **from, int nr_from, parse_commit(p); - if (p->generation < min_generation) + if (commit_graph_generation(p) < min_generation) continue; if (p->object.flags & PARENT2) diff --git a/third_party/git/commit-reach.h b/third_party/git/commit-reach.h index 99a43e8b64..b49ad71a31 100644 --- a/third_party/git/commit-reach.h +++ b/third_party/git/commit-reach.h @@ -27,7 +27,9 @@ struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r, struct commit_list *get_octopus_merge_bases(struct commit_list *in); -int is_descendant_of(struct commit *commit, struct commit_list *with_commit); +int repo_is_descendant_of(struct repository *r, + struct commit *commit, + struct commit_list *with_commit); int repo_in_merge_bases(struct repository *r, struct commit *commit, struct commit *reference); diff --git a/third_party/git/commit-slab-decl.h b/third_party/git/commit-slab-decl.h index adc7b46c83..98de2c970c 100644 --- a/third_party/git/commit-slab-decl.h +++ b/third_party/git/commit-slab-decl.h @@ -1,5 +1,5 @@ -#ifndef COMMIT_SLAB_HDR_H -#define COMMIT_SLAB_HDR_H +#ifndef COMMIT_SLAB_DECL_H +#define COMMIT_SLAB_DECL_H /* allocate ~512kB at once, allowing for malloc overhead */ #ifndef COMMIT_SLAB_SIZE @@ -32,6 +32,7 @@ struct slabname { \ void init_ ##slabname## _with_stride(struct slabname *s, unsigned stride); \ void init_ ##slabname(struct slabname *s); \ void clear_ ##slabname(struct slabname *s); \ +void deep_clear_ ##slabname(struct slabname *s, void (*free_fn)(elemtype *ptr)); \ elemtype *slabname## _at_peek(struct slabname *s, const struct commit *c, int add_if_missing); \ elemtype *slabname## _at(struct slabname *s, const struct commit *c); \ elemtype *slabname## _peek(struct slabname *s, const struct commit *c) @@ -40,4 +41,4 @@ elemtype *slabname## _peek(struct slabname *s, const struct commit *c) declare_commit_slab(slabname, elemtype); \ declare_commit_slab_prototypes(slabname, elemtype) -#endif /* COMMIT_SLAB_HDR_H */ +#endif /* COMMIT_SLAB_DECL_H */ diff --git a/third_party/git/commit-slab-impl.h b/third_party/git/commit-slab-impl.h index 5c0eb91a5d..557738df27 100644 --- a/third_party/git/commit-slab-impl.h +++ b/third_party/git/commit-slab-impl.h @@ -38,6 +38,19 @@ scope void clear_ ##slabname(struct slabname *s) \ FREE_AND_NULL(s->slab); \ } \ \ +scope void deep_clear_ ##slabname(struct slabname *s, void (*free_fn)(elemtype *)) \ +{ \ + unsigned int i; \ + for (i = 0; i < s->slab_count; i++) { \ + unsigned int j; \ + if (!s->slab[i]) \ + continue; \ + for (j = 0; j < s->slab_size; j++) \ + free_fn(&s->slab[i][j * s->stride]); \ + } \ + clear_ ##slabname(s); \ +} \ + \ scope elemtype *slabname## _at_peek(struct slabname *s, \ const struct commit *c, \ int add_if_missing) \ diff --git a/third_party/git/commit-slab.h b/third_party/git/commit-slab.h index 69bf0c807c..8e72a30536 100644 --- a/third_party/git/commit-slab.h +++ b/third_party/git/commit-slab.h @@ -24,7 +24,12 @@ * - int *indegree_peek(struct indegree *, struct commit *); * * This function is similar to indegree_at(), but it will return NULL - * until a call to indegree_at() was made for the commit. + * if the location to store the data associated with the given commit + * has not been allocated yet. + * Note that the location to store the data might have already been + * allocated even if no indegree_at() call has been made for that commit + * yet; in this case this function returns a pointer to a + * zero-initialized location. * * - void init_indegree(struct indegree *); * void init_indegree_with_stride(struct indegree *, int); @@ -42,6 +47,16 @@ * * Call this function before the slab falls out of scope to avoid * leaking memory. + * + * - void deep_clear_indegree(struct indegree *, void (*free_fn)(int*)) + * + * Empties the slab, similar to clear_indegree(), but in addition it + * calls the given 'free_fn' for each slab entry to release any + * additional memory that might be owned by the entry (but not the + * entry itself!). + * Note that 'free_fn' might be called even for entries for which no + * indegree_at() call has been made; in this case 'free_fn' is invoked + * with a pointer to a zero-initialized location. */ #define define_commit_slab(slabname, elemtype) \ diff --git a/third_party/git/commit.c b/third_party/git/commit.c index a98de16e3d..f53429c0ac 100644 --- a/third_party/git/commit.c +++ b/third_party/git/commit.c @@ -19,6 +19,8 @@ #include "advice.h" #include "refs.h" #include "commit-reach.h" +#include "run-command.h" +#include "shallow.h" static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **); @@ -35,7 +37,7 @@ struct commit *lookup_commit_reference_gently(struct repository *r, if (!obj) return NULL; - return object_as_type(r, obj, OBJ_COMMIT, quiet); + return object_as_type(obj, OBJ_COMMIT, quiet); } struct commit *lookup_commit_reference(struct repository *r, const struct object_id *oid) @@ -60,7 +62,7 @@ struct commit *lookup_commit(struct repository *r, const struct object_id *oid) struct object *obj = lookup_object(r, oid); if (!obj) return create_object(r, oid, alloc_commit_node(r)); - return object_as_type(r, obj, OBJ_COMMIT, 0); + return object_as_type(obj, OBJ_COMMIT, 0); } struct commit *lookup_commit_reference_by_name(const char *name) @@ -109,7 +111,7 @@ static const unsigned char *commit_graft_sha1_access(size_t index, void *table) return commit_graft_table[index]->oid.hash; } -static int commit_graft_pos(struct repository *r, const unsigned char *sha1) +int commit_graft_pos(struct repository *r, const unsigned char *sha1) { return sha1_pos(sha1, r->parsed_objects->grafts, r->parsed_objects->grafts_nr, @@ -244,19 +246,6 @@ int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data) return ret; } -int unregister_shallow(const struct object_id *oid) -{ - int pos = commit_graft_pos(the_repository, oid->hash); - if (pos < 0) - return -1; - if (pos + 1 < the_repository->parsed_objects->grafts_nr) - MOVE_ARRAY(the_repository->parsed_objects->grafts + pos, - the_repository->parsed_objects->grafts + pos + 1, - the_repository->parsed_objects->grafts_nr - pos - 1); - the_repository->parsed_objects->grafts_nr--; - return 0; -} - struct commit_buffer { void *buffer; unsigned long size; @@ -350,7 +339,7 @@ struct tree *repo_get_commit_tree(struct repository *r, if (commit->maybe_tree || !commit->object.parsed) return commit->maybe_tree; - if (commit->graph_pos != COMMIT_NOT_FROM_GRAPH) + if (commit_graph_position(commit) != COMMIT_NOT_FROM_GRAPH) return get_commit_tree_in_graph(r, commit); return NULL; @@ -358,14 +347,15 @@ struct tree *repo_get_commit_tree(struct repository *r, struct object_id *get_commit_tree_oid(const struct commit *commit) { - return &get_commit_tree(commit)->object.oid; + struct tree *tree = get_commit_tree(commit); + return tree ? &tree->object.oid : NULL; } void release_commit_memory(struct parsed_object_pool *pool, struct commit *c) { set_commit_tree(c, NULL); - c->index = 0; free_commit_buffer(pool, c); + c->index = 0; free_commit_list(c->parents); c->object.parsed = 0; @@ -400,10 +390,22 @@ 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; - item->object.parsed = 1; + + 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; + } + tail += size; if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) || bufptr[tree_entry_len] != '\n') @@ -411,11 +413,18 @@ 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)); - set_commit_tree(item, lookup_tree(r, &parent)); + 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); bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */ pptr = &item->parents; graft = lookup_commit_graft(r, &item->object.oid); + if (graft) + r->parsed_objects->substituted_parent = 1; while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) { struct commit *new_parent; @@ -431,8 +440,11 @@ 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) - pptr = &commit_list_insert(new_parent, pptr)->next; + 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 (graft) { int i; @@ -441,7 +453,9 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b new_parent = lookup_commit(r, &graft->parent[i]); if (!new_parent) - continue; + return error("bad graft parent %s in commit %s", + oid_to_hex(&graft->parent[i]), + oid_to_hex(&item->object.oid)); pptr = &commit_list_insert(new_parent, pptr)->next; } } @@ -450,6 +464,7 @@ 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; } @@ -716,11 +731,13 @@ int compare_commits_by_author_date(const void *a_, const void *b_, int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused) { const struct commit *a = a_, *b = b_; + const uint32_t generation_a = commit_graph_generation(a), + generation_b = commit_graph_generation(b); /* newer commits first */ - if (a->generation < b->generation) + if (generation_a < generation_b) return 1; - else if (a->generation > b->generation) + else if (generation_a > generation_b) return -1; /* use date as a heuristic when generations are equal */ @@ -902,12 +919,22 @@ struct commit *get_fork_point(const char *refname, struct commit *commit) struct commit_list *bases; int i; struct commit *ret = NULL; + char *full_refname; + + switch (dwim_ref(refname, strlen(refname), &oid, &full_refname, 0)) { + case 0: + die("No such ref: '%s'", refname); + case 1: + break; /* good */ + default: + die("Ambiguous refname: '%s'", refname); + } memset(&revs, 0, sizeof(revs)); revs.initial = 1; - for_each_reflog_ent(refname, collect_one_reflog_ent, &revs); + for_each_reflog_ent(full_refname, collect_one_reflog_ent, &revs); - if (!revs.nr && !get_oid(refname, &oid)) + if (!revs.nr) add_one_commit(&oid, &revs); for (i = 0; i < revs.nr; i++) @@ -933,17 +960,26 @@ struct commit *get_fork_point(const char *refname, struct commit *commit) cleanup_return: free_commit_list(bases); + free(full_refname); return ret; } -static const char gpg_sig_header[] = "gpgsig"; -static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1; +/* + * Indexed by hash algorithm identifier. + */ +static const char *gpg_sig_headers[] = { + NULL, + "gpgsig", + "gpgsig-sha256", +}; static int do_sign_commit(struct strbuf *buf, const char *keyid) { struct strbuf sig = STRBUF_INIT; int inspos, copypos; const char *eoh; + const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(the_hash_algo)]; + int gpg_sig_header_len = strlen(gpg_sig_header); /* find the end of the header */ eoh = strstr(buf->buf, "\n\n"); @@ -968,7 +1004,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_insert(buf, inspos++, " ", 1); + strbuf_insertstr(buf, inspos++, " "); strbuf_insert(buf, inspos, bol, len); inspos += len; copypos += len; @@ -985,6 +1021,8 @@ int parse_signed_commit(const struct commit *commit, const char *buffer = get_commit_buffer(commit, &size); int in_signature, saw_signature = -1; const char *line, *tail; + const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(the_hash_algo)]; + int gpg_sig_header_len = strlen(gpg_sig_header); line = buffer; tail = buffer + size; @@ -1031,11 +1069,17 @@ int remove_signature(struct strbuf *buf) if (in_signature && line[0] == ' ') sig_end = next; - else if (starts_with(line, gpg_sig_header) && - line[gpg_sig_header_len] == ' ') { - sig_start = line; - sig_end = next; - in_signature = 1; + else if (starts_with(line, "gpgsig")) { + int i; + for (i = 1; i < GIT_HASH_NALGOS; i++) { + const char *p; + if (skip_prefix(line, gpg_sig_headers[i], &p) && + *p == ' ') { + sig_start = line; + sig_end = next; + in_signature = 1; + } + } } else { if (*line == '\n') /* dump the whole remainder of the buffer */ @@ -1111,21 +1155,23 @@ int check_commit_signature(const struct commit *commit, struct signature_check * return ret; } -void verify_merge_signature(struct commit *commit, int verbosity) +void verify_merge_signature(struct commit *commit, int verbosity, + int check_trust) { char hex[GIT_MAX_HEXSZ + 1]; struct signature_check signature_check; + int ret; memset(&signature_check, 0, sizeof(signature_check)); - check_commit_signature(commit, &signature_check); + ret = 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); @@ -1270,8 +1316,8 @@ int commit_tree(const char *msg, size_t msg_len, const struct object_id *tree, int result; append_merge_tag_headers(parents, &tail); - result = commit_tree_extended(msg, msg_len, tree, parents, ret, - author, sign_commit, extra); + result = commit_tree_extended(msg, msg_len, tree, parents, ret, author, + NULL, sign_commit, extra); free_commit_extra_headers(extra); return result; } @@ -1394,7 +1440,8 @@ N_("Warning: commit message did not conform to UTF-8.\n" int commit_tree_extended(const char *msg, size_t msg_len, const struct object_id *tree, struct commit_list *parents, struct object_id *ret, - const char *author, const char *sign_commit, + const char *author, const char *committer, + const char *sign_commit, struct commit_extra_header *extra) { int result; @@ -1427,7 +1474,9 @@ int commit_tree_extended(const char *msg, size_t msg_len, if (!author) author = git_author_info(IDENT_STRICT); strbuf_addf(&buffer, "author %s\n", author); - strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT)); + if (!committer) + committer = git_committer_info(IDENT_STRICT); + strbuf_addf(&buffer, "committer %s\n", committer); if (!encoding_is_utf8) strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding); @@ -1580,3 +1629,26 @@ 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 strvec hook_env = STRVEC_INIT; + va_list args; + int ret; + + strvec_pushf(&hook_env, "GIT_INDEX_FILE=%s", index_file); + + /* + * Let the hook know that no editor will be launched. + */ + if (!editor_is_used) + strvec_push(&hook_env, "GIT_EDITOR=:"); + + va_start(args, name); + ret = run_hook_ve(hook_env.v, name, args); + va_end(args); + strvec_clear(&hook_env); + + return ret; +} diff --git a/third_party/git/commit.h b/third_party/git/commit.h index f5295ca7f3..5467786c7b 100644 --- a/third_party/git/commit.h +++ b/third_party/git/commit.h @@ -36,8 +36,6 @@ struct commit { * or get_commit_tree_oid(). */ struct tree *maybe_tree; - uint32_t graph_pos; - uint32_t generation; unsigned int index; }; @@ -97,7 +95,6 @@ static inline int parse_commit_no_graph(struct commit *commit) #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS #define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use) -#define parse_commit_gently(item, quiet) repo_parse_commit_gently(the_repository, item, quiet) #define parse_commit(item) repo_parse_commit(the_repository, item) #endif @@ -132,7 +129,7 @@ const void *repo_get_commit_buffer(struct repository *r, #endif /* - * Tell the commit subsytem that we are done with a particular commit buffer. + * Tell the commit subsystem 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. @@ -236,6 +233,8 @@ struct commit_graft { typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *); struct commit_graft *read_graft_line(struct strbuf *line); +/* commit_graft_pos returns an index into r->parsed_objects->grafts. */ +int commit_graft_pos(struct repository *r, const unsigned char *sha1); int register_commit_graft(struct repository *r, struct commit_graft *, int); void prepare_commit_graft(struct repository *r); struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid); @@ -247,55 +246,9 @@ struct commit *get_fork_point(const char *refname, struct commit *commit); struct oid_array; struct ref; -int register_shallow(struct repository *r, const struct object_id *oid); -int unregister_shallow(const struct object_id *oid); int for_each_commit_graft(each_commit_graft_fn, void *); -int is_repository_shallow(struct repository *r); -struct commit_list *get_shallow_commits(struct object_array *heads, - int depth, int shallow_flag, int not_shallow_flag); -struct commit_list *get_shallow_commits_by_rev_list( - int ac, const char **av, int shallow_flag, int not_shallow_flag); -void set_alternate_shallow_file(struct repository *r, const char *path, int override); -int write_shallow_commits(struct strbuf *out, int use_pack_protocol, - const struct oid_array *extra); -void setup_alternate_shallow(struct lock_file *shallow_lock, - const char **alternate_shallow_file, - const struct oid_array *extra); -const char *setup_temporary_shallow(const struct oid_array *extra); -void advertise_shallow_grafts(int); -/* - * Initialize with prepare_shallow_info() or zero-initialize (equivalent to - * prepare_shallow_info with a NULL oid_array). - */ -struct shallow_info { - struct oid_array *shallow; - int *ours, nr_ours; - int *theirs, nr_theirs; - struct oid_array *ref; - - /* for receive-pack */ - uint32_t **used_shallow; - int *need_reachability_test; - int *reachable; - int *shallow_ref; - struct commit **commits; - int nr_commits; -}; - -void prepare_shallow_info(struct shallow_info *, struct oid_array *); -void clear_shallow_info(struct shallow_info *); -void remove_nonexistent_theirs_shallow(struct shallow_info *); -void assign_shallow_commits_to_refs(struct shallow_info *info, - uint32_t **used, - int *ref_status); -int delayed_reachability_test(struct shallow_info *si, int c); -#define PRUNE_SHOW_ONLY 1 -#define PRUNE_QUICK 2 -void prune_shallow(unsigned options); -extern struct trace_key trace_shallow; - -int interactive_add(int argc, const char **argv, const char *prefix, int patch); +int interactive_add(const char **argv, const char *prefix, int patch); int run_add_interactive(const char *revision, const char *patch_mode, const struct pathspec *pathspec); @@ -316,10 +269,9 @@ int commit_tree(const char *msg, size_t msg_len, int commit_tree_extended(const char *msg, size_t msg_len, const struct object_id *tree, - struct commit_list *parents, - struct object_id *ret, const char *author, - const char *sign_commit, - struct commit_extra_header *); + struct commit_list *parents, struct object_id *ret, + const char *author, const char *committer, + const char *sign_commit, struct commit_extra_header *); struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **); @@ -383,8 +335,18 @@ 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); +void verify_merge_signature(struct commit *commit, int verbose, + int check_trust); 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 582a7b1886..71e21dd20a 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/bswap.h b/third_party/git/compat/bswap.h index e4e25735ce..c0bb744adc 100644 --- a/third_party/git/compat/bswap.h +++ b/third_party/git/compat/bswap.h @@ -145,28 +145,6 @@ static inline uint64_t git_bswap64(uint64_t x) #endif -/* - * Performance might be improved if the CPU architecture is OK with - * unaligned 32-bit loads and a fast ntohl() is available. - * Otherwise fall back to byte loads and shifts which is portable, - * and is faster on architectures with memory alignment issues. - */ - -#if !defined(NO_UNALIGNED_LOADS) && ( \ - defined(__i386__) || defined(__x86_64__) || \ - defined(_M_IX86) || defined(_M_X64) || \ - defined(__ppc__) || defined(__ppc64__) || \ - defined(__powerpc__) || defined(__powerpc64__) || \ - defined(__s390__) || defined(__s390x__)) - -#define get_be16(p) ntohs(*(unsigned short *)(p)) -#define get_be32(p) ntohl(*(unsigned int *)(p)) -#define get_be64(p) ntohll(*(uint64_t *)(p)) -#define put_be32(p, v) do { *(unsigned int *)(p) = htonl(v); } while (0) -#define put_be64(p, v) do { *(uint64_t *)(p) = htonll(v); } while (0) - -#else - static inline uint16_t get_be16(const void *ptr) { const unsigned char *p = ptr; @@ -212,6 +190,4 @@ static inline void put_be64(void *ptr, uint64_t value) p[7] = value >> 0; } -#endif - #endif /* COMPAT_BSWAP_H */ diff --git a/third_party/git/compat/compiler.h b/third_party/git/compat/compiler.h new file mode 100644 index 0000000000..10dbb65937 --- /dev/null +++ b/third_party/git/compat/compiler.h @@ -0,0 +1,41 @@ +#ifndef COMPILER_H +#define COMPILER_H + +#include "git-compat-util.h" +#include "strbuf.h" + +#ifdef __GLIBC__ +#include <gnu/libc-version.h> +#endif + +static inline void get_compiler_info(struct strbuf *info) +{ + int len = info->len; +#ifdef __clang__ + strbuf_addf(info, "clang: %s\n", __clang_version__); +#elif defined(__GNUC__) + strbuf_addf(info, "gnuc: %d.%d\n", __GNUC__, __GNUC_MINOR__); +#endif + +#ifdef _MSC_VER + strbuf_addf(info, "MSVC version: %02d.%02d.%05d\n", + _MSC_VER / 100, _MSC_VER % 100, _MSC_FULL_VER % 100000); +#endif + + if (len == info->len) + strbuf_addstr(info, _("no compiler information available\n")); +} + +static inline void get_libc_info(struct strbuf *info) +{ + int len = info->len; + +#ifdef __GLIBC__ + strbuf_addf(info, "glibc: %s\n", gnu_get_libc_version()); +#endif + + if (len == info->len) + strbuf_addstr(info, _("no libc information available\n")); +} + +#endif /* COMPILER_H */ diff --git a/third_party/git/compat/gmtime.c b/third_party/git/compat/gmtime.c deleted file mode 100644 index e8362dd2b9..0000000000 --- a/third_party/git/compat/gmtime.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "../git-compat-util.h" -#undef gmtime -#undef gmtime_r - -struct tm *git_gmtime(const time_t *timep) -{ - static struct tm result; - return git_gmtime_r(timep, &result); -} - -struct tm *git_gmtime_r(const time_t *timep, struct tm *result) -{ - struct tm *ret; - - memset(result, 0, sizeof(*result)); - ret = gmtime_r(timep, result); - - /* - * Rather than NULL, FreeBSD gmtime simply leaves the "struct tm" - * untouched when it encounters overflow. Since "mday" cannot otherwise - * be zero, we can test this very quickly. - */ - if (ret && !ret->tm_mday) { - ret = NULL; - errno = EOVERFLOW; - } - - return ret; -} diff --git a/third_party/git/compat/mingw.c b/third_party/git/compat/mingw.c index 738f0a826a..a00f331230 100644 --- a/third_party/git/compat/mingw.c +++ b/third_party/git/compat/mingw.c @@ -13,6 +13,19 @@ 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; + + strvec_pushl(&cp.args, "mintty", "gdb", NULL); + strvec_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; @@ -114,6 +127,7 @@ 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; @@ -212,6 +226,7 @@ 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; @@ -231,6 +246,15 @@ 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; } @@ -266,6 +290,9 @@ int mingw_unlink(const char *pathname) if (xutftowcs_path(wpathname, pathname) < 0) return -1; + if (DeleteFileW(wpathname)) + return 0; + /* read-only files cannot be removed */ _wchmod(wpathname, 0666); while ((ret = _wunlink(wpathname)) == -1 && tries < ARRAY_SIZE(delay)) { @@ -363,6 +390,8 @@ static inline int needs_hiding(const char *path) /* ignore trailing slashes */ if (*path) basename = path; + else + break; } if (hide_dotfiles == HIDE_DOTFILES_TRUE) @@ -390,6 +419,12 @@ 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); @@ -428,8 +463,21 @@ static int mingw_open_append(wchar_t const *wfilename, int oflags, ...) handle = CreateFileW(wfilename, FILE_APPEND_DATA, FILE_SHARE_WRITE | FILE_SHARE_READ, NULL, create, FILE_ATTRIBUTE_NORMAL, NULL); - if (handle == INVALID_HANDLE_VALUE) - return errno = err_win_to_posix(GetLastError()), -1; + if (handle == INVALID_HANDLE_VALUE) { + DWORD err = GetLastError(); + + /* + * Some network storage solutions (e.g. Isilon) might return + * ERROR_INVALID_PARAMETER instead of expected error + * ERROR_PATH_NOT_FOUND, which results in an unknown error. If + * so, let's turn the error to ERROR_PATH_NOT_FOUND instead. + */ + if (err == ERROR_INVALID_PARAMETER) + err = ERROR_PATH_NOT_FOUND; + + errno = err_win_to_posix(err); + return -1; + } /* * No O_APPEND here, because the CRT uses it only to reset the @@ -463,7 +511,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; + int fd, create = (oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL); wchar_t wfilename[MAX_PATH]; open_fn_t open_fn; @@ -471,16 +519,21 @@ int mingw_open (const char *filename, int oflags, ...) mode = va_arg(args, int); va_end(args); - if (filename && !strcmp(filename, "/dev/null")) - filename = "nul"; + if (!is_valid_win32_path(filename, !create)) { + errno = create ? EINVAL : ENOENT; + return -1; + } if ((oflags & O_APPEND) && !is_local_named_pipe_path(filename)) open_fn = mingw_open_append; else open_fn = _wopen; - if (xutftowcs_path(wfilename, filename) < 0) + if (filename && !strcmp(filename, "/dev/null")) + wcscpy(wfilename, L"nul"); + else if (xutftowcs_path(wfilename, filename) < 0) return -1; + fd = open_fn(wfilename, oflags, mode); if (fd < 0 && (oflags & O_ACCMODE) != O_RDONLY && errno == EACCES) { @@ -538,10 +591,17 @@ FILE *mingw_fopen (const char *filename, const char *otype) FILE *file; wchar_t wfilename[MAX_PATH], wotype[4]; if (filename && !strcmp(filename, "/dev/null")) - filename = "nul"; - if (xutftowcs_path(wfilename, filename) < 0 || - xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0) + 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) + return NULL; + if (hide && !access(filename, F_OK) && set_hidden_flag(wfilename, 0)) { error("could not unhide %s", filename); return NULL; @@ -560,10 +620,17 @@ 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")) - filename = "nul"; - if (xutftowcs_path(wfilename, filename) < 0 || - xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0) + 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) + return NULL; + if (hide && !access(filename, F_OK) && set_hidden_flag(wfilename, 0)) { error("could not unhide %s", filename); return NULL; @@ -913,7 +980,16 @@ revert_attrs: size_t mingw_strftime(char *s, size_t max, const char *format, const struct tm *tm) { - size_t ret = strftime(s, max, format, tm); + /* a pointer to the original strftime in case we can't find the UCRT version */ + static size_t (*fallback)(char *, size_t, const char *, const struct tm *) = strftime; + size_t ret; + DECLARE_PROC_ADDR(ucrtbase.dll, size_t, strftime, char *, size_t, + const char *, const struct tm *); + + if (INIT_PROC_ADDR(strftime)) + ret = strftime(s, max, format, tm); + else + ret = fallback(s, max, format, tm); if (!ret && errno == EINVAL) die("invalid strftime format: '%s'", format); @@ -984,16 +1060,16 @@ int pipe(int filedes[2]) struct tm *gmtime_r(const time_t *timep, struct tm *result) { - /* gmtime() in MSVCRT.DLL is thread-safe, but not reentrant */ - memcpy(result, gmtime(timep), sizeof(struct tm)); - return result; + if (gmtime_s(result, timep) == 0) + return result; + return NULL; } struct tm *localtime_r(const time_t *timep, struct tm *result) { - /* localtime() in MSVCRT.DLL is thread-safe, but not reentrant */ - memcpy(result, localtime(timep), sizeof(struct tm)); - return result; + if (localtime_s(result, timep) == 0) + return result; + return NULL; } char *mingw_getcwd(char *pointer, int len) @@ -1052,7 +1128,7 @@ static const char *quote_arg_msvc(const char *arg) p++; len++; } - if (*p == '"') + if (*p == '"' || !*p) n += count*2 + 1; continue; } @@ -1074,16 +1150,19 @@ static const char *quote_arg_msvc(const char *arg) count++; *d++ = *arg++; } - if (*arg == '"') { + if (*arg == '"' || !*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; } @@ -1096,13 +1175,14 @@ static const char *quote_arg_msys2(const char *arg) for (p = arg; *p; p++) { int ws = isspace(*p); - if (!ws && *p != '\\' && *p != '"' && *p != '{') + if (!ws && *p != '\\' && *p != '"' && *p != '{' && *p != '\'' && + *p != '?' && *p != '*' && *p != '~') continue; if (!buf.len) strbuf_addch(&buf, '"'); if (p != p2) strbuf_add(&buf, p2, p - p2); - if (!ws && *p != '{') + if (*p == '\\' || *p == '"') strbuf_addch(&buf, '\\'); p2 = p; } @@ -1112,7 +1192,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); @@ -1161,14 +1241,21 @@ 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 (!isexe && access(path, F_OK) == 0) + if (xutftowcs_path(wpath, path) < 0) + return NULL; + + if (!isexe && _waccess(wpath, F_OK) == 0) return xstrdup(path); - path[strlen(path)-4] = '\0'; - if ((!exe_only || isexe) && access(path, F_OK) == 0) - if (!(GetFileAttributes(path) & FILE_ATTRIBUTE_DIRECTORY)) + 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'; return xstrdup(path); + } + } return NULL; } @@ -1183,7 +1270,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 (strchr(cmd, '/') || strchr(cmd, '\\')) + if (strpbrk(cmd, "/\\")) return xstrdup(cmd); path = mingw_getenv("PATH"); @@ -1229,11 +1316,6 @@ 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. @@ -1265,15 +1347,15 @@ static wchar_t *make_environment_block(char **deltaenv) } ALLOC_ARRAY(result, size); - memcpy(result, wenv, size * sizeof(*wenv)); + COPY_ARRAY(result, wenv, size); FreeEnvironmentStringsW(wenv); return result; } /* * If there is a deltaenv, let's accumulate all keys into `array`, - * sort them using the stable git_qsort() and then copy, skipping - * duplicate keys + * sort them using the stable git_stable_qsort() and then copy, + * skipping duplicate keys */ for (p = wenv; p && *p; ) { ALLOC_GROW(array, nr + 1, alloc); @@ -1296,7 +1378,7 @@ static wchar_t *make_environment_block(char **deltaenv) p += wlen + 1; } - git_qsort(array, nr, sizeof(*array), wenvcmp); + git_stable_qsort(array, nr, sizeof(*array), wenvcmp); ALLOC_ARRAY(result, size + delta_size); for (p = result, i = 0; i < nr; i++) { @@ -1309,7 +1391,7 @@ static wchar_t *make_environment_block(char **deltaenv) continue; size = wcslen(array[i]) + 1; - memcpy(p, array[i], size * sizeof(*p)); + COPY_ARRAY(p, array[i], size); p += size; } *p = L'\0'; @@ -1367,7 +1449,10 @@ static inline int match_last_path_component(const char *path, size_t *len, static int is_msys2_sh(const char *cmd) { - if (cmd && !strcmp(cmd, "sh")) { + if (!cmd) + return 0; + + if (!strcmp(cmd, "sh")) { static int ret = -1; char *p; @@ -1387,6 +1472,16 @@ 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; } @@ -1394,15 +1489,35 @@ 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) { - STARTUPINFOW si; + static int restrict_handle_inheritance = -1; + STARTUPINFOEXW 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(*argv) ? quote_arg_msys2 : quote_arg_msvc; + is_msys2_sh(cmd ? cmd : *argv) ? + quote_arg_msys2 : quote_arg_msvc; + const char *strace_env; + + /* 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; do_unset_environment_variables(); @@ -1431,11 +1546,23 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen CloseHandle(cons); } memset(&si, 0, sizeof(si)); - 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); + 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; if (*argv && !strcmp(cmd, *argv)) wcmd[0] = L'\0'; @@ -1461,6 +1588,31 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen free(quoted); } + strace_env = getenv("GIT_STRACE_COMMANDS"); + if (strace_env) { + char *p = path_lookup("strace.exe", 1); + if (!p) + return error("strace not found!"); + if (xutftowcs_path(wcmd, p) < 0) { + free(p); + return -1; + } + free(p); + if (!strcmp("1", strace_env) || + !strcasecmp("yes", strace_env) || + !strcasecmp("true", strace_env)) + strbuf_insert(&args, 0, "strace ", 7); + else { + const char *quoted = quote_arg(strace_env); + struct strbuf buf = STRBUF_INIT; + strbuf_addf(&buf, "strace -o %s ", quoted); + if (quoted != strace_env) + free((char *)quoted); + strbuf_insert(&args, 0, buf.buf, buf.len); + strbuf_release(&buf); + } + } + ALLOC_ARRAY(wargs, st_add(st_mult(2, args.len), 1)); xutftowcs(wargs, args.buf, 2 * args.len + 1); strbuf_release(&args); @@ -1468,16 +1620,98 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen wenvblk = make_environment_block(deltaenv); memset(&pi, 0, sizeof(pi)); - ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL, TRUE, - flags, wenvblk, dir ? wdir : NULL, &si, &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); free(wenvblk); free(wargs); - if (!ret) { - errno = ENOENT; + if (!ret) return -1; - } + CloseHandle(pi.hThread); /* @@ -1562,7 +1796,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 */ - memcpy(&argv2[1], &argv[1], sizeof(*argv) * argc); + COPY_ARRAY(&argv2[1], &argv[1], argc); exec_id = trace2_exec(prog, argv2); pid = mingw_spawnv(prog, argv2, 1); if (pid >= 0) { @@ -1663,6 +1897,8 @@ 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); @@ -2361,6 +2597,130 @@ 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': + /* COM1 ... COM9, CON, CONIN$, CONOUT$ */ + if ((c = path[++i]) != 'o' && c != 'O') + goto not_a_reserved_name; + c = path[++i]; + if (c == 'm' || c == 'M') { /* COM1 ... COM9 */ + c = path[++i]; + if (c < '1' || c > '9') + 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 a03e40e6e2..af8eddd73e 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 -extern int mingw_core_config(const char *var, const char *value, void *cb); +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 ';' -extern char *mingw_query_user_email(void); +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,6 +453,27 @@ extern 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 @@ -558,7 +579,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(). Intialised in + * functions (mingw_spawnv[p]e()) and waitpid(). Initialised in * the replacement main() macro below. */ extern CRITICAL_SECTION pinfo_cs; @@ -578,6 +599,16 @@ 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. + */ +void open_in_gdb(void); + +/* * Used by Pthread API implementation for Windows */ -extern int err_win_to_posix(DWORD winerr); +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 b833ff9225..814845d4b3 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 coalesed segments */ +/* This function supports releasing coalesced 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 continguous morecore disabled or failed */ +/* mstate bit set if contiguous 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 - timming, and a counter to force periodic scanning to release unused + timing, 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; - INITIAL_LOCK(&gm->mutex); + (void)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); - INITIAL_LOCK(&m->mutex); + (void)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 ae36ed6a66..f90a46d9b9 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 -accreting characters to the end of the object as we normally would. +accrediting 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,8 +135,10 @@ extern "C" { alignment relative to 0. */ #define __PTR_ALIGN(B, P, A) \ - __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \ - 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)) \ + ) #include <string.h> diff --git a/third_party/git/compat/poll/poll.c b/third_party/git/compat/poll/poll.c index 0e95dd493c..afa6d24584 100644 --- a/third_party/git/compat/poll/poll.c +++ b/third_party/git/compat/poll/poll.c @@ -139,22 +139,10 @@ 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) { @@ -166,22 +154,9 @@ win32_compute_revents (HANDLE h, int *p_sought) else { - /* 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)) + /* 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. */ happened |= *p_sought & (POLLOUT | POLLWRNORM | POLLWRBAND); } return happened; diff --git a/third_party/git/compat/regex/regcomp.c b/third_party/git/compat/regex/regcomp.c index c0d838834a..d1bc09e49b 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 matcing table for this equivalence class. */ + /* Build single byte matching 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.c b/third_party/git/compat/regex/regex.c index f3e03a9eab..e6f4a5d177 100644 --- a/third_party/git/compat/regex/regex.c +++ b/third_party/git/compat/regex/regex.c @@ -60,6 +60,7 @@ #undefs RE_DUP_MAX and sets it to the right value. */ #include <limits.h> #include <stdint.h> +#include <stdlib.h> #ifdef GAWK #undef alloca diff --git a/third_party/git/compat/regex/regex.h b/third_party/git/compat/regex/regex.h index 4d81358a83..2d3412860d 100644 --- a/third_party/git/compat/regex/regex.h +++ b/third_party/git/compat/regex/regex.h @@ -41,6 +41,11 @@ 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 @@ -322,7 +327,7 @@ typedef enum /* POSIX regcomp return error codes. (In the order listed in the standard.) */ REG_BADPAT, /* Invalid pattern. */ - REG_ECOLLATE, /* Inalid collating element. */ + REG_ECOLLATE, /* Invalid 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 59bf151336..ec51cf3446 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 independ of contexts. +/* Create the new state which is independent of contexts. Return the new state if succeeded, otherwise return NULL. */ static re_dfastate_t * diff --git a/third_party/git/compat/regex/regex_internal.h b/third_party/git/compat/regex/regex_internal.h index 3ee8aae59d..0bad8b841e 100644 --- a/third_party/git/compat/regex/regex_internal.h +++ b/third_party/git/compat/regex/regex_internal.h @@ -23,7 +23,6 @@ #include <assert.h> #include <ctype.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC diff --git a/third_party/git/compat/regex/regexec.c b/third_party/git/compat/regex/regexec.c index 1b5d89fd5e..49358ae475 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 - correspoding back references. */ + corresponding 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 transiton table. */ + /* Initialize transition 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 fa13ee672d..43b73ddc75 100644 --- a/third_party/git/compat/terminal.c +++ b/third_party/git/compat/terminal.c @@ -2,6 +2,9 @@ #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) @@ -32,7 +35,7 @@ static void restore_term(void) term_fd = -1; } -static int disable_echo(void) +static int disable_bits(tcflag_t bits) { struct termios t; @@ -43,7 +46,7 @@ static int disable_echo(void) old_term = t; sigchain_push_common(restore_term_on_signal); - t.c_lflag &= ~ECHO; + t.c_lflag &= ~bits; if (!tcsetattr(term_fd, TCSAFLUSH, &t)) return 0; @@ -53,17 +56,44 @@ 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; + + strvec_push(&cp.args, "stty"); + for (i = 0; i < stty_restore.nr; i++) + strvec_push(&cp.args, stty_restore.items[i].string); + run_command(&cp); + string_list_clear(&stty_restore, 0); + return; + } + if (hconin == INVALID_HANDLE_VALUE) return; @@ -72,8 +102,39 @@ static void restore_term(void) hconin = INVALID_HANDLE_VALUE; } -static int disable_echo(void) +static int disable_bits(DWORD bits) { + if (use_stty) { + struct child_process cp = CHILD_PROCESS_INIT; + + strvec_push(&cp.args, "stty"); + + if (bits & ENABLE_LINE_INPUT) { + string_list_append(&stty_restore, "icanon"); + strvec_push(&cp.args, "-icanon"); + } + + if (bits & ENABLE_ECHO_INPUT) { + string_list_append(&stty_restore, "echo"); + strvec_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"); + strvec_push(&cp.args, "ignbrk"); + strvec_push(&cp.args, "intr"); + strvec_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); @@ -82,7 +143,7 @@ static int disable_echo(void) GetConsoleMode(hconin, &cmode); sigchain_push_common(restore_term_on_signal); - if (!SetConsoleMode(hconin, cmode & (~ENABLE_ECHO_INPUT))) { + if (!SetConsoleMode(hconin, cmode & ~bits)) { CloseHandle(hconin); hconin = INVALID_HANDLE_VALUE; return -1; @@ -91,6 +152,47 @@ static int disable_echo(void) 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 @@ -137,6 +239,126 @@ 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); + + strvec_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) @@ -144,4 +366,23 @@ 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 97db7cd69d..a9d52b8464 100644 --- a/third_party/git/compat/terminal.h +++ b/third_party/git/compat/terminal.h @@ -3,4 +3,7 @@ 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/README b/third_party/git/compat/vcbuild/README index 1b6dabf5a2..51fb083dbb 100644 --- a/third_party/git/compat/vcbuild/README +++ b/third_party/git/compat/vcbuild/README @@ -26,8 +26,8 @@ The Steps to Build Git with VS2015 or VS2017 from the command line. Use ONE of the following forms which should match how you want to compile git.exe. - $ ./compat/vcbuild/vcpkg_copy_packages.bat debug - $ ./compat/vcbuild/vcpkg_copy_packages.bat release + $ ./compat/vcbuild/vcpkg_copy_dlls.bat debug + $ ./compat/vcbuild/vcpkg_copy_dlls.bat release 3. Build git using MSVC from an SDK bash window using one of the following commands: @@ -92,8 +92,8 @@ The Steps of Build Git with VS2008 the git operations. 3. Inside Git's directory run the command: - make command-list.h - to generate the command-list.h file needed to compile git. + make command-list.h config-list.h + to generate the header file needed to compile git. 4. Then either build Git with the GNU Make Makefile in the Git projects root diff --git a/third_party/git/compat/vcbuild/find_vs_env.bat b/third_party/git/compat/vcbuild/find_vs_env.bat index 40194dd230..b35d264c0e 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" commmand prompt setup script, installs +REM searches for the "best" command 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 c7b021bfac..df167d1e1a 100755 --- a/third_party/git/compat/vcbuild/scripts/clink.pl +++ b/third_party/git/compat/vcbuild/scripts/clink.pl @@ -23,7 +23,9 @@ while (@ARGV) { # before any "-l*" flags. $is_debug = 1; } - if ("$arg" =~ /^-[DIMGOZ]/) { + if ("$arg" =~ /^-I\/mingw(32|64)/) { + # eat + } elsif ("$arg" =~ /^-[DIMGOZ]/) { push(@cflags, $arg); } elsif ("$arg" eq "-o") { my $file_out = shift @ARGV; @@ -45,9 +47,9 @@ while (@ARGV) { } elsif ("$arg" eq "-liconv") { push(@args, "libiconv.lib"); } elsif ("$arg" eq "-lcrypto") { - push(@args, "libeay32.lib"); + push(@args, "libcrypto.lib"); } elsif ("$arg" eq "-lssl") { - push(@args, "ssleay32.lib"); + push(@args, "libssl.lib"); } elsif ("$arg" eq "-lcurl") { my $lib = ""; # Newer vcpkg definitions call this libcurl_imp.lib; Do we @@ -64,12 +66,58 @@ while (@ARGV) { } push(@args, $lib); } elsif ("$arg" eq "-lexpat") { - push(@args, "expat.lib"); + push(@args, "libexpat.lib"); } elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") { $arg =~ s/^-L/-LIBPATH:/; push(@lflags, $arg); - } elsif ("$arg" =~ /^-R/) { + } elsif ("$arg" =~ /^-[Rl]/) { # 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 d9d3641de8..ebf2f12eb6 100644 --- a/third_party/git/compat/win32/path-utils.c +++ b/third_party/git/compat/win32/path-utils.c @@ -1,5 +1,29 @@ #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 0f70d43920..bba2b64408 100644 --- a/third_party/git/compat/win32/path-utils.h +++ b/third_party/git/compat/win32/path-utils.h @@ -1,5 +1,9 @@ -#define has_dos_drive_prefix(path) \ - (isalpha(*(path)) && (path)[1] == ':' ? 2 : 0) +#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 + 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) @@ -16,5 +20,18 @@ static inline char *win32_find_last_dir_sep(const char *path) return ret; } #define find_last_dir_sep win32_find_last_dir_sep +static inline int win32_has_dir_sep(const char *path) +{ + /* + * See how long the non-separator part of the given path is, and + * if and only if it covers the whole path (i.e. path[len] is NUL), + * there is no separator in the path---otherwise there is a separator. + */ + size_t len = strcspn(path, "/\\"); + return !!path[len]; +} +#define has_dir_sep(path) win32_has_dir_sep(path) int win32_offset_1st_component(const char *path); #define offset_1st_component win32_offset_1st_component + +#endif diff --git a/third_party/git/compat/win32/pthread.h b/third_party/git/compat/win32/pthread.h index c6cb8dd219..737983d00b 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; -extern int pthread_create(pthread_t *thread, const void *unused, - void *(*start_routine)(void*), void *arg); +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 @@ extern int pthread_create(pthread_t *thread, const void *unused, */ #define pthread_join(a, b) win32_pthread_join(&(a), (b)) -extern int win32_pthread_join(pthread_t *thread, void **value_ptr); +int win32_pthread_join(pthread_t *thread, void **value_ptr); #define pthread_equal(t1, t2) ((t1).tid == (t2).tid) -extern pthread_t pthread_self(void); +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 cacd82c833..c27b20a79d 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[0]; + WCHAR NameBuffer[FLEX_ARRAY]; } OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; #define ObjectNameInformation 1 @@ -662,10 +662,20 @@ 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; - return (HANDLE)_get_osfhandle(fd); + 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; } diff --git a/third_party/git/config.c b/third_party/git/config.c index 3900e4947b..2bdff4457b 100644 --- a/third_party/git/config.c +++ b/third_party/git/config.c @@ -37,6 +37,7 @@ struct config_source { enum config_error_action default_error_action; int linenr; int eof; + size_t total_len; struct strbuf value; struct strbuf var; unsigned subsection_case_sensitive : 1; @@ -204,7 +205,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_insert(pat, 0, "**/", 3); + strbuf_insertstr(pat, 0, "**/"); add_trailing_starstar_for_dir(pat); @@ -275,7 +276,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 || !the_repository->gitdir ? + const char *refname = !the_repository->gitdir ? NULL : resolve_ref_unsafe("HEAD", 0, NULL, &flags); const char *shortname; @@ -309,7 +310,7 @@ int git_config_include(const char *var, const char *value, void *data) { struct config_include_data *inc = data; const char *cond, *key; - int cond_len; + size_t cond_len; int ret; /* @@ -358,12 +359,13 @@ static inline int iskeychar(int c) * * store_key - pointer to char* which will hold a copy of the key with * lowercase section and variable name - * baselen - pointer to int which will hold the length of the + * baselen - pointer to size_t which will hold the length of the * section + subsection part, can be NULL */ -static int git_config_parse_key_1(const char *key, char **store_key, int *baselen_, int quiet) +static int git_config_parse_key_1(const char *key, char **store_key, size_t *baselen_, int quiet) { - int i, dot, baselen; + size_t i, baselen; + int dot; const char *last_dot = strrchr(key, '.'); /* @@ -425,7 +427,7 @@ out_free_ret_1: return -CONFIG_INVALID_KEY; } -int git_config_parse_key(const char *key, char **store_key, int *baselen) +int git_config_parse_key(const char *key, char **store_key, size_t *baselen) { return git_config_parse_key_1(key, store_key, baselen, 0); } @@ -523,6 +525,19 @@ static int get_next_char(void) c = '\r'; } } + + if (c != EOF && ++cf->total_len > INT_MAX) { + /* + * This is an absurdly long config file; refuse to parse + * further in order to protect downstream code from integer + * overflows. Note that we can't return an error specifically, + * but we can mark EOF and put trash in the return value, + * which will trigger a parse error. + */ + cf->eof = 1; + return 0; + } + if (c == '\n') cf->linenr++; if (c == EOF) { @@ -728,7 +743,7 @@ static int git_parse_source(config_fn_t fn, void *data, const struct config_options *opts) { int comment = 0; - int baselen = 0; + size_t baselen = 0; struct strbuf *var = &cf->var; int error_return = 0; char *error_msg = NULL; @@ -1204,7 +1219,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 > 40) + if (abbrev < minimum_abbrev || abbrev > the_hash_algo->hexsz) return error(_("abbrev length out of range: %d"), abbrev); default_abbrev = abbrev; } @@ -1364,6 +1379,11 @@ 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; @@ -1379,11 +1399,6 @@ 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; @@ -1539,6 +1554,7 @@ static int do_config_from(struct config_source *top, config_fn_t fn, void *data, top->prev = cf; top->linenr = 1; top->eof = 0; + top->total_len = 0; strbuf_init(&top->value, 1024); strbuf_init(&top->var, 1024); cf = top; @@ -1702,6 +1718,7 @@ 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); @@ -1724,15 +1741,12 @@ 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_REPO; + current_parsing_scope = CONFIG_SCOPE_LOCAL; if (!opts->ignore_repo && repo_config && !access_or_die(repo_config, R_OK, 0)) ret += git_config_from_file(fn, repo_config, data); - /* - * Note: this should have a new scope, CONFIG_SCOPE_WORKTREE. - * But let's not complicate things before it's actually needed. - */ + current_parsing_scope = CONFIG_SCOPE_WORKTREE; if (!opts->ignore_worktree && repository_format_worktree_config) { char *path = git_pathdup("config.worktree"); if (!access_or_die(path, R_OK, 0)) @@ -1740,11 +1754,11 @@ static int do_git_config_sequence(const struct config_options *opts, free(path); } - current_parsing_scope = CONFIG_SCOPE_CMDLINE; + current_parsing_scope = CONFIG_SCOPE_COMMAND; if (!opts->ignore_cmdline && git_config_from_parameters(fn, data) < 0) die(_("unable to parse command-line config")); - current_parsing_scope = CONFIG_SCOPE_UNKNOWN; + current_parsing_scope = prev_parsing_scope; free(xdg_config); free(user_config); free(repo_config); @@ -1765,6 +1779,9 @@ 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. @@ -1861,9 +1878,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, strhash(normalized_key)); + hashmap_entry_init(&k.ent, strhash(normalized_key)); k.key = normalized_key; - found_entry = hashmap_get(&cs->config_hash, &k, NULL); + found_entry = hashmap_get_entry(&cs->config_hash, &k, ent, NULL); free(normalized_key); return found_entry; } @@ -1882,10 +1899,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, strhash(key)); + hashmap_entry_init(&e->ent, strhash(key)); e->key = xstrdup(key); string_list_init(&e->value_list, 1); - hashmap_add(&cs->config_hash, e); + hashmap_add(&cs->config_hash, &e->ent); } si = string_list_append_nodup(&e->value_list, xstrdup_or_null(value)); @@ -1913,12 +1930,14 @@ 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 void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *unused_keydata) { - const struct config_set_element *e1 = entry; - const struct config_set_element *e2 = entry_or_key; + 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); return strcmp(e1->key, e2->key); } @@ -1939,12 +1958,12 @@ void git_configset_clear(struct config_set *cs) if (!cs->hash_initialized) return; - hashmap_iter_init(&cs->config_hash, &iter); - while ((entry = hashmap_iter_next(&iter))) { + hashmap_for_each_entry(&cs->config_hash, &iter, entry, + ent /* member name */) { free(entry->key); string_list_clear(&entry->value_list, 1); } - hashmap_free(&cs->config_hash, 1); + hashmap_free_entries(&cs->config_hash, struct config_set_element, ent); cs->hash_initialized = 0; free(cs->list.items); cs->list.nr = 0; @@ -1987,18 +2006,27 @@ const struct string_list *git_configset_get_value_multi(struct config_set *cs, c return e ? &e->value_list : NULL; } -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) { const char *value; if (!git_configset_get_value(cs, key, &value)) - return git_config_string(dest, key, value); + return git_config_string((const char **)dest, key, value); else return 1; } -int git_configset_get_string(struct config_set *cs, const char *key, char **dest) +int git_configset_get_string_tmp(struct config_set *cs, const char *key, + const char **dest) { - return git_configset_get_string_const(cs, key, (const char **)dest); + const char *value; + if (!git_configset_get_value(cs, key, &value)) { + if (!value) + return config_error_nonbool(key); + *dest = value; + return 0; + } else { + return 1; + } } int git_configset_get_int(struct config_set *cs, const char *key, int *dest) @@ -2128,22 +2156,26 @@ const struct string_list *repo_config_get_value_multi(struct repository *repo, return git_configset_get_value_multi(repo->config, key); } -int repo_config_get_string_const(struct repository *repo, - const char *key, const char **dest) +int repo_config_get_string(struct repository *repo, + const char *key, char **dest) { int ret; git_config_check_init(repo); - ret = git_configset_get_string_const(repo->config, key, dest); + ret = git_configset_get_string(repo->config, key, dest); if (ret < 0) git_die_config(key, NULL); return ret; } -int repo_config_get_string(struct repository *repo, - const char *key, char **dest) +int repo_config_get_string_tmp(struct repository *repo, + const char *key, const char **dest) { + int ret; git_config_check_init(repo); - return repo_config_get_string_const(repo, key, (const char **)dest); + ret = git_configset_get_string_tmp(repo->config, key, dest); + if (ret < 0) + git_die_config(key, NULL); + return ret; } int repo_config_get_int(struct repository *repo, @@ -2213,14 +2245,14 @@ const struct string_list *git_config_get_value_multi(const char *key) return repo_config_get_value_multi(the_repository, key); } -int git_config_get_string_const(const char *key, const char **dest) +int git_config_get_string(const char *key, char **dest) { - return repo_config_get_string_const(the_repository, key, dest); + return repo_config_get_string(the_repository, key, dest); } -int git_config_get_string(const char *key, char **dest) +int git_config_get_string_tmp(const char *key, const char **dest) { - return repo_config_get_string(the_repository, key, dest); + return repo_config_get_string_tmp(the_repository, key, dest); } int git_config_get_int(const char *key, int *dest) @@ -2255,7 +2287,7 @@ int git_config_get_pathname(const char *key, const char **dest) int git_config_get_expiry(const char *key, const char **output) { - int ret = git_config_get_string_const(key, output); + int ret = git_config_get_string(key, (char **)output); if (ret) return ret; if (strcmp(*output, "now")) { @@ -2268,11 +2300,11 @@ int git_config_get_expiry(const char *key, const char **output) int git_config_get_expiry_in_days(const char *key, timestamp_t *expiry, timestamp_t now) { - char *expiry_string; + const char *expiry_string; intmax_t days; timestamp_t when; - if (git_config_get_string(key, &expiry_string)) + if (git_config_get_string_tmp(key, &expiry_string)) return 1; /* no such thing */ if (git_parse_signed(expiry_string, &days, maximum_signed_value_of_type(int))) { @@ -2288,30 +2320,6 @@ 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; @@ -2404,7 +2412,7 @@ void git_die_config(const char *key, const char *err, ...) */ struct config_store_data { - int baselen; + size_t baselen; char *key; int do_not_match; regex_t *value_regex; @@ -2530,7 +2538,7 @@ static struct strbuf store_create_section(const char *key, const struct config_store_data *store) { const char *dot; - int i; + size_t i; struct strbuf sb = STRBUF_INIT; dot = memchr(key, '.', store->baselen); @@ -2543,7 +2551,9 @@ static struct strbuf store_create_section(const char *key, } strbuf_addstr(&sb, "\"]\n"); } else { - strbuf_addf(&sb, "[%.*s]\n", store->baselen, key); + strbuf_addch(&sb, '['); + strbuf_add(&sb, key, store->baselen); + strbuf_addstr(&sb, "]\n"); } return sb; @@ -2566,7 +2576,6 @@ static ssize_t write_pair(int fd, const char *key, const char *value, { int i; ssize_t ret; - int length = strlen(key + store->baselen + 1); const char *quote = ""; struct strbuf sb = STRBUF_INIT; @@ -2585,8 +2594,7 @@ static ssize_t write_pair(int fd, const char *key, const char *value, if (i && value[i - 1] == ' ') quote = "\""; - strbuf_addf(&sb, "\t%.*s = %s", - length, key + store->baselen + 1, quote); + strbuf_addf(&sb, "\t%s = %s", key + store->baselen + 1, quote); for (i = 0; value[i]; i++) switch (value[i]) { @@ -3120,7 +3128,7 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename } while (fgets(buf, sizeof(buf), config_file)) { - int i; + unsigned i; int length; int is_section = 0; char *output = buf; @@ -3259,7 +3267,7 @@ int config_error_nonbool(const char *var) int parse_config_key(const char *var, const char *section, - const char **subsection, int *subsection_len, + const char **subsection, size_t *subsection_len, const char **key) { const char *dot; @@ -3319,6 +3327,26 @@ 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; @@ -3339,6 +3367,14 @@ 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 f0ed464004..91cdfbfb41 100644 --- a/third_party/git/config.h +++ b/third_party/git/config.h @@ -4,6 +4,22 @@ #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: */ @@ -19,10 +35,22 @@ 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 { @@ -71,9 +99,34 @@ 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 *); @@ -88,34 +141,157 @@ 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_parse_key(const char *, char **, size_t *); 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 *); @@ -130,18 +306,35 @@ 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; @@ -166,9 +359,36 @@ int git_config_include(const char *name, const char *value, void *data); */ int parse_config_key(const char *var, const char *section, - const char **subsection, int *subsection_len, + const char **subsection, size_t *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; @@ -197,18 +417,49 @@ 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_string_tmp(struct config_set *cs, const char *key, const char **dest); int git_configset_get_int(struct config_set *cs, const char *key, int *dest); int git_configset_get_ulong(struct config_set *cs, const char *key, unsigned long *dest); int git_configset_get_bool(struct config_set *cs, const char *key, int *dest); @@ -223,10 +474,10 @@ int repo_config_get_value(struct repository *repo, const char *key, const char **value); const struct string_list *repo_config_get_value_multi(struct repository *repo, const char *key); -int repo_config_get_string_const(struct repository *repo, - const char *key, const char **dest); int repo_config_get_string(struct repository *repo, const char *key, char **dest); +int repo_config_get_string_tmp(struct repository *repo, + const char *key, const char **dest); int repo_config_get_int(struct repository *repo, const char *key, int *dest); int repo_config_get_ulong(struct repository *repo, @@ -240,17 +491,95 @@ 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); -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`, but does not allocate any new + * memory; on success `dest` will point to memory owned by the config + * machinery, which could be invalidated if it is discarded and reloaded. + */ +int git_config_get_string_tmp(const char *key, const 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); @@ -270,7 +599,19 @@ 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 bf1f3fcdee..89b218d11a 100644 --- a/third_party/git/config.mak.dev +++ b/third_party/git/config.mak.dev @@ -9,7 +9,6 @@ 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 db7f06b95f..c7eba69e54 100644 --- a/third_party/git/config.mak.uname +++ b/third_party/git/config.mak.uname @@ -133,8 +133,17 @@ ifeq ($(uname_S),Darwin) HAVE_BSD_SYSCTL = YesPlease FREAD_READS_DIRECTORIES = UnfortunatelyYes HAVE_NS_GET_EXECUTABLE_PATH = YesPlease - BASIC_CFLAGS += -I/usr/local/include - BASIC_LDFLAGS += -L/usr/local/lib + + # Workaround for `gettext` being keg-only and not even being linked via + # `brew link --force gettext`, should be obsolete as of + # https://github.com/Homebrew/homebrew-core/pull/53489 + ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y) + BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include + BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib + ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y) + MSGFMT = /usr/local/opt/gettext/bin/msgfmt + endif + endif endif ifeq ($(uname_S),SunOS) NEEDS_SOCKET = YesPlease @@ -237,7 +246,6 @@ ifeq ($(uname_S),FreeBSD) PYTHON_PATH = /usr/local/bin/python PERL_PATH = /usr/local/bin/perl HAVE_PATHS_H = YesPlease - GMTIME_UNRELIABLE_ERRORS = UnfortunatelyYes HAVE_BSD_SYSCTL = YesPlease HAVE_BSD_KERN_PROC_SYSCTL = YesPlease PAGER_ENV = LESS=FRX LV=-c MORE=FRX @@ -308,6 +316,7 @@ ifeq ($(uname_S),GNU) NO_STRLCPY = YesPlease HAVE_PATHS_H = YesPlease LIBC_CONTAINS_LIBINTL = YesPlease + FREAD_READS_DIRECTORIES = UnfortunatelyYes endif ifeq ($(uname_S),IRIX) NO_SETENV = YesPlease @@ -454,7 +463,6 @@ 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 @@ -616,7 +624,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 -DPROTECT_NTFS_DEFAULT=1 + BASIC_CFLAGS += -DWIN32 EXTLIBS += -lws2_32 GITLIBS += git.res PTHREAD_LIBS = @@ -703,32 +711,35 @@ vcxproj: perl contrib/buildsystems/generate -g Vcxproj git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj - # Generate the LinkOrCopyBuiltins.targets file + # Generate the LinkOrCopyBuiltins.targets and LinkOrCopyRemoteHttp.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/LinkOrCopyBuiltins.targets - git add -f git/LinkOrCopyBuiltins.targets + echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets + git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets - # Add command-list.h - $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 command-list.h - git add -f command-list.h + # Add command-list.h and config-list.h + $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 config-list.h command-list.h + git add -f config-list.h command-list.h # Add scripts rm -f perl/perl.mak - $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 \ - $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN) + $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(SCRIPT_LIB) $(SCRIPTS) # 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) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN) + git add -f $(SCRIPT_LIB) $(SCRIPTS) # Add Perl module $(MAKE) $(LIB_PERL_GEN) @@ -758,6 +769,10 @@ 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 a43b476402..66aedb9288 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 specied by --with-WITHNAME. +# Set VAR to the value specified 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,12 +844,61 @@ 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 2778481264..8b8f56cf6d 100644 --- a/third_party/git/connect.c +++ b/third_party/git/connect.c @@ -9,7 +9,7 @@ #include "connect.h" #include "url.h" #include "string-list.h" -#include "sha1-array.h" +#include "oid-array.h" #include "transport.h" #include "strbuf.h" #include "version.h" @@ -17,8 +17,8 @@ #include "alias.h" static char *server_capabilities_v1; -static struct argv_array server_capabilities_v2 = ARGV_ARRAY_INIT; -static const char *parse_feature_value(const char *, const char *, int *); +static struct strvec server_capabilities_v2 = STRVEC_INIT; +static const char *next_server_feature_value(const char *feature, int *len, int *offset); static int check_ref(const char *name, unsigned int flags) { @@ -70,9 +70,9 @@ int server_supports_v2(const char *c, int die_on_error) { int i; - for (i = 0; i < server_capabilities_v2.argc; i++) { + for (i = 0; i < server_capabilities_v2.nr; i++) { const char *out; - if (skip_prefix(server_capabilities_v2.argv[i], c, &out) && + if (skip_prefix(server_capabilities_v2.v[i], c, &out) && (!*out || *out == '=')) return 1; } @@ -83,14 +83,29 @@ int server_supports_v2(const char *c, int die_on_error) return 0; } +int server_feature_v2(const char *c, const char **v) +{ + int i; + + for (i = 0; i < server_capabilities_v2.nr; i++) { + const char *out; + if (skip_prefix(server_capabilities_v2.v[i], c, &out) && + (*out == '=')) { + *v = out + 1; + return 1; + } + } + return 0; +} + int server_supports_feature(const char *c, const char *feature, int die_on_error) { int i; - for (i = 0; i < server_capabilities_v2.argc; i++) { + for (i = 0; i < server_capabilities_v2.nr; i++) { const char *out; - if (skip_prefix(server_capabilities_v2.argv[i], c, &out) && + if (skip_prefix(server_capabilities_v2.v[i], c, &out) && (!*out || *(out++) == '=')) { if (parse_feature_request(out, feature)) return 1; @@ -108,7 +123,7 @@ int server_supports_feature(const char *c, const char *feature, static void process_capabilities_v2(struct packet_reader *reader) { while (packet_reader_read(reader) == PACKET_READ_NORMAL) - argv_array_push(&server_capabilities_v2, reader->line); + strvec_push(&server_capabilities_v2, reader->line); if (reader->status != PACKET_READ_FLUSH) die(_("expected flush after capabilities")); @@ -127,6 +142,7 @@ enum protocol_version discover_version(struct packet_reader *reader) die_initial_contact(0); case PACKET_READ_FLUSH: case PACKET_READ_DELIM: + case PACKET_READ_RESPONSE_END: version = protocol_v0; break; case PACKET_READ_NORMAL: @@ -180,17 +196,16 @@ reject: static void annotate_refs_with_symref_info(struct ref *ref) { struct string_list symref = STRING_LIST_INIT_DUP; - const char *feature_list = server_capabilities_v1; + int offset = 0; - while (feature_list) { + while (1) { int len; const char *val; - val = parse_feature_value(feature_list, "symref", &len); + val = next_server_feature_value("symref", &len, &offset); if (!val) break; parse_one_symref_info(&symref, val, len); - feature_list = val + 1; } string_list_sort(&symref); @@ -204,21 +219,36 @@ static void annotate_refs_with_symref_info(struct ref *ref) string_list_clear(&symref, 0); } -static void process_capabilities(const char *line, int *len) +static void process_capabilities(struct packet_reader *reader, int *linelen) { + const char *feat_val; + int feat_len; + const char *line = reader->line; int nul_location = strlen(line); - if (nul_location == *len) + if (nul_location == *linelen) return; server_capabilities_v1 = xstrdup(line + nul_location + 1); - *len = nul_location; + *linelen = nul_location; + + feat_val = server_feature_value("object-format", &feat_len); + if (feat_val) { + char *hash_name = xstrndup(feat_val, feat_len); + int hash_algo = hash_algo_by_name(hash_name); + if (hash_algo != GIT_HASH_UNKNOWN) + reader->hash_algo = &hash_algos[hash_algo]; + free(hash_name); + } else { + reader->hash_algo = &hash_algos[GIT_HASH_SHA1]; + } } -static int process_dummy_ref(const char *line) +static int process_dummy_ref(const struct packet_reader *reader) { + const char *line = reader->line; struct object_id oid; const char *name; - if (parse_oid_hex(line, &oid, &name)) + if (parse_oid_hex_algop(line, &oid, &name, reader->hash_algo)) return 0; if (*name != ' ') return 0; @@ -234,13 +264,15 @@ static void check_no_capabilities(const char *line, int len) line + strlen(line)); } -static int process_ref(const char *line, int len, struct ref ***list, - unsigned int flags, struct oid_array *extra_have) +static int process_ref(const struct packet_reader *reader, int len, + struct ref ***list, unsigned int flags, + struct oid_array *extra_have) { + const char *line = reader->line; struct object_id old_oid; const char *name; - if (parse_oid_hex(line, &old_oid, &name)) + if (parse_oid_hex_algop(line, &old_oid, &name, reader->hash_algo)) return 0; if (*name != ' ') return 0; @@ -260,16 +292,17 @@ static int process_ref(const char *line, int len, struct ref ***list, return 1; } -static int process_shallow(const char *line, int len, +static int process_shallow(const struct packet_reader *reader, int len, struct oid_array *shallow_points) { + const char *line = reader->line; const char *arg; struct object_id old_oid; if (!skip_prefix(line, "shallow ", &arg)) return 0; - if (get_oid_hex(arg, &old_oid)) + if (get_oid_hex_algop(arg, &old_oid, reader->hash_algo)) die(_("protocol error: expected shallow sha-1, got '%s'"), arg); if (!shallow_points) die(_("repository on the other end cannot be shallow")); @@ -310,25 +343,26 @@ struct ref **get_remote_heads(struct packet_reader *reader, state = EXPECTING_DONE; break; case PACKET_READ_DELIM: + case PACKET_READ_RESPONSE_END: die(_("invalid packet")); } switch (state) { case EXPECTING_FIRST_REF: - process_capabilities(reader->line, &len); - if (process_dummy_ref(reader->line)) { + process_capabilities(reader, &len); + if (process_dummy_ref(reader)) { state = EXPECTING_SHALLOW; break; } state = EXPECTING_REF; /* fallthrough */ case EXPECTING_REF: - if (process_ref(reader->line, len, &list, flags, extra_have)) + if (process_ref(reader, len, &list, flags, extra_have)) break; state = EXPECTING_SHALLOW; /* fallthrough */ case EXPECTING_SHALLOW: - if (process_shallow(reader->line, len, shallow_points)) + if (process_shallow(reader, len, shallow_points)) break; die(_("protocol error: unexpected '%s'"), reader->line); case EXPECTING_DONE: @@ -342,7 +376,7 @@ struct ref **get_remote_heads(struct packet_reader *reader, } /* Returns 1 when a valid ref has been added to `list`, 0 otherwise */ -static int process_ref_v2(const char *line, struct ref ***list) +static int process_ref_v2(struct packet_reader *reader, struct ref ***list) { int ret = 1; int i = 0; @@ -350,6 +384,7 @@ static int process_ref_v2(const char *line, struct ref ***list) struct ref *ref; struct string_list line_sections = STRING_LIST_INIT_DUP; const char *end; + const char *line = reader->line; /* * Ref lines have a number of fields which are space deliminated. The @@ -362,7 +397,7 @@ static int process_ref_v2(const char *line, struct ref ***list) goto out; } - if (parse_oid_hex(line_sections.items[i++].string, &old_oid, &end) || + if (parse_oid_hex_algop(line_sections.items[i++].string, &old_oid, &end, reader->hash_algo) || *end) { ret = 0; goto out; @@ -370,7 +405,7 @@ static int process_ref_v2(const char *line, struct ref ***list) ref = alloc_ref(line_sections.items[i++].string); - oidcpy(&ref->old_oid, &old_oid); + memcpy(ref->old_oid.hash, old_oid.hash, reader->hash_algo->rawsz); **list = ref; *list = &ref->next; @@ -383,7 +418,8 @@ static int process_ref_v2(const char *line, struct ref ***list) struct object_id peeled_oid; char *peeled_name; struct ref *peeled; - if (parse_oid_hex(arg, &peeled_oid, &end) || *end) { + if (parse_oid_hex_algop(arg, &peeled_oid, &end, + reader->hash_algo) || *end) { ret = 0; goto out; } @@ -391,7 +427,8 @@ static int process_ref_v2(const char *line, struct ref ***list) peeled_name = xstrfmt("%s^{}", ref->name); peeled = alloc_ref(peeled_name); - oidcpy(&peeled->old_oid, &peeled_oid); + memcpy(peeled->old_oid.hash, peeled_oid.hash, + reader->hash_algo->rawsz); **list = peeled; *list = &peeled->next; @@ -404,12 +441,24 @@ out: return ret; } +void check_stateless_delimiter(int stateless_rpc, + struct packet_reader *reader, + const char *error) +{ + if (!stateless_rpc) + return; /* not in stateless mode, no delimiter expected */ + if (packet_reader_read(reader) != PACKET_READ_RESPONSE_END) + die("%s", error); +} + struct ref **get_remote_refs(int fd_out, struct packet_reader *reader, struct ref **list, int for_push, - const struct argv_array *ref_prefixes, - const struct string_list *server_options) + const struct strvec *ref_prefixes, + const struct string_list *server_options, + int stateless_rpc) { int i; + const char *hash_name; *list = NULL; if (server_supports_v2("ls-refs", 1)) @@ -418,6 +467,16 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader, if (server_supports_v2("agent", 0)) packet_write_fmt(fd_out, "agent=%s", git_user_agent_sanitized()); + if (server_feature_v2("object-format", &hash_name)) { + int hash_algo = hash_algo_by_name(hash_name); + if (hash_algo == GIT_HASH_UNKNOWN) + die(_("unknown object format '%s' specified by server"), hash_name); + reader->hash_algo = &hash_algos[hash_algo]; + packet_write_fmt(fd_out, "object-format=%s", reader->hash_algo->name); + } else { + reader->hash_algo = &hash_algos[GIT_HASH_SHA1]; + } + if (server_options && server_options->nr && server_supports_v2("server-option", 1)) for (i = 0; i < server_options->nr; i++) @@ -429,25 +488,28 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader, if (!for_push) packet_write_fmt(fd_out, "peel\n"); packet_write_fmt(fd_out, "symrefs\n"); - for (i = 0; ref_prefixes && i < ref_prefixes->argc; i++) { + for (i = 0; ref_prefixes && i < ref_prefixes->nr; i++) { packet_write_fmt(fd_out, "ref-prefix %s\n", - ref_prefixes->argv[i]); + ref_prefixes->v[i]); } packet_flush(fd_out); /* Process response from server */ while (packet_reader_read(reader) == PACKET_READ_NORMAL) { - if (!process_ref_v2(reader->line, &list)) + if (!process_ref_v2(reader, &list)) die(_("invalid ls-refs response: %s"), reader->line); } if (reader->status != PACKET_READ_FLUSH) die(_("expected flush after ref listing")); + check_stateless_delimiter(stateless_rpc, reader, + _("expected response end packet after ref listing")); + return list; } -static const char *parse_feature_value(const char *feature_list, const char *feature, int *lenp) +const char *parse_feature_value(const char *feature_list, const char *feature, int *lenp, int *offset) { int len; @@ -455,6 +517,8 @@ static const char *parse_feature_value(const char *feature_list, const char *fea return NULL; len = strlen(feature); + if (offset) + feature_list += *offset; while (*feature_list) { const char *found = strstr(feature_list, feature); if (!found) @@ -469,9 +533,14 @@ static const char *parse_feature_value(const char *feature_list, const char *fea } /* feature with a value (e.g., "agent=git/1.2.3") */ else if (*value == '=') { + int end; + value++; + end = strcspn(value, " \t\n"); if (lenp) - *lenp = strcspn(value, " \t\n"); + *lenp = end; + if (offset) + *offset = value + end - feature_list; return value; } /* @@ -484,14 +553,41 @@ static const char *parse_feature_value(const char *feature_list, const char *fea return NULL; } +int server_supports_hash(const char *desired, int *feature_supported) +{ + int offset = 0; + int len; + const char *hash; + + hash = next_server_feature_value("object-format", &len, &offset); + if (feature_supported) + *feature_supported = !!hash; + if (!hash) { + hash = hash_algos[GIT_HASH_SHA1].name; + len = strlen(hash); + } + while (hash) { + if (!xstrncmpz(desired, hash, len)) + return 1; + + hash = next_server_feature_value("object-format", &len, &offset); + } + return 0; +} + int parse_feature_request(const char *feature_list, const char *feature) { - return !!parse_feature_value(feature_list, feature, NULL); + return !!parse_feature_value(feature_list, feature, NULL, NULL); +} + +static const char *next_server_feature_value(const char *feature, int *len, int *offset) +{ + return parse_feature_value(server_capabilities_v1, feature, len, offset); } const char *server_feature_value(const char *feature, int *len) { - return parse_feature_value(server_capabilities_v1, feature, len); + return parse_feature_value(server_capabilities_v1, feature, len, NULL); } int server_supports(const char *feature) @@ -511,7 +607,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); + (has_dos_drive_prefix(url) && is_valid_path(url)); } static const char *prot_name(enum protocol protocol) @@ -848,9 +944,9 @@ static struct child_process *git_proxy_connect(int fd[2], char *host) proxy = xmalloc(sizeof(*proxy)); child_process_init(proxy); - argv_array_push(&proxy->args, git_proxy_command); - argv_array_push(&proxy->args, host); - argv_array_push(&proxy->args, port); + strvec_push(&proxy->args, git_proxy_command); + strvec_push(&proxy->args, host); + strvec_push(&proxy->args, port); proxy->in = -1; proxy->out = -1; if (start_command(proxy)) @@ -915,6 +1011,10 @@ 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 @@ -952,7 +1052,7 @@ static const char *get_ssh_command(void) if ((ssh = getenv("GIT_SSH_COMMAND"))) return ssh; - if (!git_config_get_string_const("core.sshcommand", &ssh)) + if (!git_config_get_string_tmp("core.sshcommand", &ssh)) return ssh; return NULL; @@ -971,7 +1071,7 @@ static void override_ssh_variant(enum ssh_variant *ssh_variant) { const char *variant = getenv("GIT_SSH_VARIANT"); - if (!variant && git_config_get_string_const("ssh.variant", &variant)) + if (!variant && git_config_get_string_tmp("ssh.variant", &variant)) return; if (!strcmp(variant, "auto")) @@ -1099,16 +1199,16 @@ static struct child_process *git_connect_git(int fd[2], char *hostandport, * Append the appropriate environment variables to `env` and options to * `args` for running ssh in Git's SSH-tunneled transport. */ -static void push_ssh_options(struct argv_array *args, struct argv_array *env, +static void push_ssh_options(struct strvec *args, struct strvec *env, enum ssh_variant variant, const char *port, enum protocol_version version, int flags) { if (variant == VARIANT_SSH && version > 0) { - argv_array_push(args, "-o"); - argv_array_push(args, "SendEnv=" GIT_PROTOCOL_ENVIRONMENT); - argv_array_pushf(env, GIT_PROTOCOL_ENVIRONMENT "=version=%d", - version); + strvec_push(args, "-o"); + strvec_push(args, "SendEnv=" GIT_PROTOCOL_ENVIRONMENT); + strvec_pushf(env, GIT_PROTOCOL_ENVIRONMENT "=version=%d", + version); } if (flags & CONNECT_IPV4) { @@ -1121,7 +1221,7 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env, case VARIANT_PLINK: case VARIANT_PUTTY: case VARIANT_TORTOISEPLINK: - argv_array_push(args, "-4"); + strvec_push(args, "-4"); } } else if (flags & CONNECT_IPV6) { switch (variant) { @@ -1133,12 +1233,12 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env, case VARIANT_PLINK: case VARIANT_PUTTY: case VARIANT_TORTOISEPLINK: - argv_array_push(args, "-6"); + strvec_push(args, "-6"); } } if (variant == VARIANT_TORTOISEPLINK) - argv_array_push(args, "-batch"); + strvec_push(args, "-batch"); if (port) { switch (variant) { @@ -1147,15 +1247,15 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env, case VARIANT_SIMPLE: die(_("ssh variant 'simple' does not support setting port")); case VARIANT_SSH: - argv_array_push(args, "-p"); + strvec_push(args, "-p"); break; case VARIANT_PLINK: case VARIANT_PUTTY: case VARIANT_TORTOISEPLINK: - argv_array_push(args, "-P"); + strvec_push(args, "-P"); } - argv_array_push(args, port); + strvec_push(args, port); } } @@ -1193,18 +1293,18 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host, detect.use_shell = conn->use_shell; detect.no_stdin = detect.no_stdout = detect.no_stderr = 1; - argv_array_push(&detect.args, ssh); - argv_array_push(&detect.args, "-G"); + strvec_push(&detect.args, ssh); + strvec_push(&detect.args, "-G"); push_ssh_options(&detect.args, &detect.env_array, VARIANT_SSH, port, version, flags); - argv_array_push(&detect.args, ssh_host); + strvec_push(&detect.args, ssh_host); variant = run_command(&detect) ? VARIANT_SIMPLE : VARIANT_SSH; } - argv_array_push(&conn->args, ssh); + strvec_push(&conn->args, ssh); push_ssh_options(&conn->args, &conn->env_array, variant, port, version, flags); - argv_array_push(&conn->args, ssh_host); + strvec_push(&conn->args, ssh_host); } /* @@ -1265,7 +1365,7 @@ struct child_process *git_connect(int fd[2], const char *url, /* remove repo-local variables from the environment */ for (var = local_repo_env; *var; var++) - argv_array_push(&conn->env_array, *var); + strvec_push(&conn->env_array, *var); conn->use_shell = 1; conn->in = conn->out = -1; @@ -1297,11 +1397,12 @@ struct child_process *git_connect(int fd[2], const char *url, transport_check_allowed("file"); conn->trace2_child_class = "transport/file"; if (version > 0) { - argv_array_pushf(&conn->env_array, GIT_PROTOCOL_ENVIRONMENT "=version=%d", - version); + strvec_pushf(&conn->env_array, + GIT_PROTOCOL_ENVIRONMENT "=version=%d", + version); } } - argv_array_push(&conn->args, cmd.buf); + strvec_push(&conn->args, cmd.buf); if (start_command(conn)) die(_("unable to fork")); diff --git a/third_party/git/connect.h b/third_party/git/connect.h index 5f2382e018..c53586e929 100644 --- a/third_party/git/connect.h +++ b/third_party/git/connect.h @@ -18,8 +18,15 @@ int url_is_local_not_ssh(const char *url); struct packet_reader; enum protocol_version discover_version(struct packet_reader *reader); +int server_supports_hash(const char *desired, int *feature_supported); +const char *parse_feature_value(const char *feature_list, const char *feature, int *lenp, int *offset); int server_supports_v2(const char *c, int die_on_error); +int server_feature_v2(const char *c, const char **v); int server_supports_feature(const char *c, const char *feature, int die_on_error); +void check_stateless_delimiter(int stateless_rpc, + struct packet_reader *reader, + const char *error); + #endif diff --git a/third_party/git/connected.c b/third_party/git/connected.c index cd9b324afa..b18299fdf0 100644 --- a/third_party/git/connected.c +++ b/third_party/git/connected.c @@ -5,6 +5,7 @@ #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 @@ -21,8 +22,8 @@ int check_connected(oid_iterate_fn fn, void *cb_data, struct check_connected_options *opt) { struct child_process rev_list = CHILD_PROCESS_INIT; + FILE *rev_list_in; struct check_connected_options defaults = CHECK_CONNECTED_INIT; - char commit[GIT_MAX_HEXSZ + 1]; struct object_id oid; int err = 0; struct packed_git *new_pack = NULL; @@ -41,49 +42,70 @@ int check_connected(oid_iterate_fn fn, void *cb_data, if (transport && transport->smart_options && transport->smart_options->self_contained_and_connected && - transport->pack_lockfile && - strip_suffix(transport->pack_lockfile, ".keep", &base_len)) { + transport->pack_lockfiles.nr == 1 && + strip_suffix(transport->pack_lockfiles.items[0].string, + ".keep", &base_len)) { struct strbuf idx_file = STRBUF_INIT; - strbuf_add(&idx_file, transport->pack_lockfile, base_len); + strbuf_add(&idx_file, transport->pack_lockfiles.items[0].string, + base_len); strbuf_addstr(&idx_file, ".idx"); new_pack = add_packed_git(idx_file.buf, idx_file.len, 1); strbuf_release(&idx_file); } - if (opt->check_refs_only) { + if (has_promisor_remote()) { /* * 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 the objects pointed to by each wanted ref. + * received, in a promisor packfile, the objects pointed to by + * each wanted ref. + * + * Before checking for promisor packs, be sure we have the + * latest pack-files loaded into memory. */ + reprepare_packed_git(the_repository); do { - if (!repo_has_object_file(the_repository, &oid)) - return 1; + 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; + } + /* + * Fallback to rev-list with oid and the rest of the + * object IDs provided by fn. + */ + goto no_promisor_pack_found; +promisor_pack_found: + ; } while (!fn(cb_data, &oid)); return 0; } +no_promisor_pack_found: if (opt->shallow_file) { - argv_array_push(&rev_list.args, "--shallow-file"); - argv_array_push(&rev_list.args, opt->shallow_file); + strvec_push(&rev_list.args, "--shallow-file"); + strvec_push(&rev_list.args, opt->shallow_file); } - argv_array_push(&rev_list.args,"rev-list"); - argv_array_push(&rev_list.args, "--objects"); - argv_array_push(&rev_list.args, "--stdin"); - if (repository_format_partial_clone) - argv_array_push(&rev_list.args, "--exclude-promisor-objects"); + strvec_push(&rev_list.args,"rev-list"); + strvec_push(&rev_list.args, "--objects"); + strvec_push(&rev_list.args, "--stdin"); + if (has_promisor_remote()) + strvec_push(&rev_list.args, "--exclude-promisor-objects"); if (!opt->is_deepening_fetch) { - argv_array_push(&rev_list.args, "--not"); - argv_array_push(&rev_list.args, "--all"); + strvec_push(&rev_list.args, "--not"); + strvec_push(&rev_list.args, "--all"); } - argv_array_push(&rev_list.args, "--quiet"); - argv_array_push(&rev_list.args, "--alternate-refs"); + strvec_push(&rev_list.args, "--quiet"); + strvec_push(&rev_list.args, "--alternate-refs"); if (opt->progress) - argv_array_pushf(&rev_list.args, "--progress=%s", - _("Checking connectivity")); + strvec_pushf(&rev_list.args, "--progress=%s", + _("Checking connectivity")); rev_list.git_cmd = 1; rev_list.env = opt->env; @@ -99,7 +121,8 @@ int check_connected(oid_iterate_fn fn, void *cb_data, sigchain_push(SIGPIPE, SIG_IGN); - commit[GIT_SHA1_HEXSZ] = '\n'; + rev_list_in = xfdopen(rev_list.in, "w"); + do { /* * If index-pack already checked that: @@ -112,16 +135,17 @@ int check_connected(oid_iterate_fn fn, void *cb_data, if (new_pack && find_pack_entry_one(oid.hash, new_pack)) continue; - 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; + if (fprintf(rev_list_in, "%s\n", oid_to_hex(&oid)) < 0) break; - } } while (!fn(cb_data, &oid)); - if (close(rev_list.in)) + if (ferror(rev_list_in) || fflush(rev_list_in)) { + if (errno != EPIPE && errno != EINVAL) + error_errno(_("failed write to rev-list")); + err = -1; + } + + if (fclose(rev_list_in)) err = error_errno(_("failed to close rev-list's stdin")); sigchain_pop(SIGPIPE); diff --git a/third_party/git/connected.h b/third_party/git/connected.h index ce2e7d8f2e..8d5a6b3ad6 100644 --- a/third_party/git/connected.h +++ b/third_party/git/connected.h @@ -46,14 +46,6 @@ struct check_connected_options { * during a fetch. */ unsigned is_deepening_fetch : 1; - - /* - * 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_only : 1; }; #define CHECK_CONNECTED_INIT { 0 } diff --git a/third_party/git/contrib/buildsystems/CMakeLists.txt b/third_party/git/contrib/buildsystems/CMakeLists.txt new file mode 100644 index 0000000000..df539a44fa --- /dev/null +++ b/third_party/git/contrib/buildsystems/CMakeLists.txt @@ -0,0 +1,988 @@ +# +# Copyright (c) 2020 Sibi Siddharthan +# + +#[[ + +Instructions how to use this in Visual Studio: + +Open the worktree as a folder. Visual Studio 2019 and later will detect +the CMake configuration automatically and set everything up for you, +ready to build. You can then run the tests in `t/` via a regular Git Bash. + +Note: Visual Studio also has the option of opening `CMakeLists.txt` +directly; Using this option, Visual Studio will not find the source code, +though, therefore the `File>Open>Folder...` option is preferred. + +Instructions to run CMake manually: + + mkdir -p contrib/buildsystems/out + cd contrib/buildsystems/out + cmake ../ -DCMAKE_BUILD_TYPE=Release + +This will build the git binaries in contrib/buildsystems/out +directory (our top-level .gitignore file knows to ignore contents of +this directory). + +Possible build configurations(-DCMAKE_BUILD_TYPE) with corresponding +compiler flags +Debug : -g +Release: -O3 +RelWithDebInfo : -O2 -g +MinSizeRel : -Os +empty(default) : + +NOTE: -DCMAKE_BUILD_TYPE is optional. For multi-config generators like Visual Studio +this option is ignored + +This process generates a Makefile(Linux/*BSD/MacOS) , Visual Studio solution(Windows) by default. +Run `make` to build Git on Linux/*BSD/MacOS. +Open git.sln on Windows and build Git. + +NOTE: By default CMake uses Makefile as the build tool on Linux and Visual Studio in Windows, +to use another tool say `ninja` add this to the command line when configuring. +`-G Ninja` + +]] +cmake_minimum_required(VERSION 3.14) + +#set the source directory to root of git +set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) +if(WIN32) + set(VCPKG_DIR "${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg") + if(MSVC AND NOT EXISTS ${VCPKG_DIR}) + message("Initializing vcpkg and building the Git's dependencies (this will take a while...)") + execute_process(COMMAND ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg_install.bat) + endif() + list(APPEND CMAKE_PREFIX_PATH "${VCPKG_DIR}/installed/x64-windows") + + # In the vcpkg edition, we need this to be able to link to libcurl + set(CURL_NO_CURL_CMAKE ON) +endif() + +find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin") +if(NOT SH_EXE) + message(FATAL_ERROR "sh: shell interpreter was not found in your path, please install one." + "On Windows, you can get it as part of 'Git for Windows' install at https://gitforwindows.org/") +endif() + +#Create GIT-VERSION-FILE using GIT-VERSION-GEN +if(NOT EXISTS ${CMAKE_SOURCE_DIR}/GIT-VERSION-FILE) + message("Generating GIT-VERSION-FILE") + execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/GIT-VERSION-GEN + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +endif() + +#Parse GIT-VERSION-FILE to get the version +file(STRINGS ${CMAKE_SOURCE_DIR}/GIT-VERSION-FILE git_version REGEX "GIT_VERSION = (.*)") +string(REPLACE "GIT_VERSION = " "" git_version ${git_version}) +string(FIND ${git_version} "GIT" location) +if(location EQUAL -1) + string(REGEX MATCH "[0-9]*\\.[0-9]*\\.[0-9]*" git_version ${git_version}) +else() + string(REGEX MATCH "[0-9]*\\.[0-9]*" git_version ${git_version}) + string(APPEND git_version ".0") #for building from a snapshot +endif() + +project(git + VERSION ${git_version} + LANGUAGES C) + + +#TODO gitk git-gui gitweb +#TODO Enable NLS on windows natively +#TODO Add pcre support + +#macros for parsing the Makefile for sources and scripts +macro(parse_makefile_for_sources list_var regex) + file(STRINGS ${CMAKE_SOURCE_DIR}/Makefile ${list_var} REGEX "^${regex} \\+=(.*)") + string(REPLACE "${regex} +=" "" ${list_var} ${${list_var}}) + string(REPLACE "$(COMPAT_OBJS)" "" ${list_var} ${${list_var}}) #remove "$(COMPAT_OBJS)" This is only for libgit. + string(STRIP ${${list_var}} ${list_var}) #remove trailing/leading whitespaces + string(REPLACE ".o" ".c;" ${list_var} ${${list_var}}) #change .o to .c, ; is for converting the string into a list + list(TRANSFORM ${list_var} STRIP) #remove trailing/leading whitespaces for each element in list + list(REMOVE_ITEM ${list_var} "") #remove empty list elements +endmacro() + +macro(parse_makefile_for_scripts list_var regex lang) + file(STRINGS ${CMAKE_SOURCE_DIR}/Makefile ${list_var} REGEX "^${regex} \\+=(.*)") + string(REPLACE "${regex} +=" "" ${list_var} ${${list_var}}) + string(STRIP ${${list_var}} ${list_var}) #remove trailing/leading whitespaces + string(REPLACE " " ";" ${list_var} ${${list_var}}) #convert string to a list + if(NOT ${lang}) #exclude for SCRIPT_LIB + list(TRANSFORM ${list_var} REPLACE "${lang}" "") #do the replacement + endif() +endmacro() + +include(CheckTypeSize) +include(CheckCSourceRuns) +include(CheckCSourceCompiles) +include(CheckIncludeFile) +include(CheckFunctionExists) +include(CheckSymbolExists) +include(CheckStructHasMember) +include(CTest) + +find_package(ZLIB REQUIRED) +find_package(CURL) +find_package(EXPAT) +find_package(Iconv) + +#Don't use libintl on Windows Visual Studio and Clang builds +if(NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "MSVC" OR CMAKE_C_COMPILER_ID STREQUAL "Clang"))) + find_package(Intl) +endif() + +if(NOT Intl_FOUND) + add_compile_definitions(NO_GETTEXT) + if(NOT Iconv_FOUND) + add_compile_definitions(NO_ICONV) + endif() +endif() + +include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) +if(CURL_FOUND) + include_directories(SYSTEM ${CURL_INCLUDE_DIRS}) +endif() +if(EXPAT_FOUND) + include_directories(SYSTEM ${EXPAT_INCLUDE_DIRS}) +endif() +if(Iconv_FOUND) + include_directories(SYSTEM ${Iconv_INCLUDE_DIRS}) +endif() +if(Intl_FOUND) + include_directories(SYSTEM ${Intl_INCLUDE_DIRS}) +endif() + + +if(WIN32 AND NOT MSVC)#not required for visual studio builds + find_program(WINDRES_EXE windres) + if(NOT WINDRES_EXE) + message(FATAL_ERROR "Install windres on Windows for resource files") + endif() +endif() + +find_program(MSGFMT_EXE msgfmt) +if(NOT MSGFMT_EXE) + set(MSGFMT_EXE ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg/downloads/tools/msys2/msys64/usr/bin/msgfmt.exe) + if(NOT EXISTS ${MSGFMT_EXE}) + message(WARNING "Text Translations won't be built") + unset(MSGFMT_EXE) + endif() +endif() + +#Force all visual studio outputs to CMAKE_BINARY_DIR +if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}) + add_compile_options(/MP) +endif() + +#default behaviour +include_directories(${CMAKE_SOURCE_DIR}) +add_compile_definitions(GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR}") +add_compile_definitions(SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX) +add_compile_definitions(NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES + SHA1DC_INIT_SAFE_HASH_DEFAULT=0 + SHA1DC_CUSTOM_INCLUDE_SHA1_C="cache.h" + SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h" ) +list(APPEND compat_SOURCES sha1dc_git.c sha1dc/sha1.c sha1dc/ubc_check.c block-sha1/sha1.c sha256/block/sha256.c compat/qsort_s.c) + + +add_compile_definitions(PAGER_ENV="LESS=FRX LV=-c" + ETC_GITATTRIBUTES="etc/gitattributes" + ETC_GITCONFIG="etc/gitconfig" + GIT_EXEC_PATH="libexec/git-core" + GIT_LOCALE_PATH="share/locale" + GIT_MAN_PATH="share/man" + GIT_INFO_PATH="share/info" + GIT_HTML_PATH="share/doc/git-doc" + DEFAULT_HELP_FORMAT="html" + DEFAULT_GIT_TEMPLATE_DIR="share/git-core/templates" + GIT_VERSION="${PROJECT_VERSION}.GIT" + GIT_USER_AGENT="git/${PROJECT_VERSION}.GIT" + BINDIR="bin" + GIT_BUILT_FROM_COMMIT="") + +if(WIN32) + set(FALLBACK_RUNTIME_PREFIX /mingw64) + add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}") +else() + set(FALLBACK_RUNTIME_PREFIX /home/$ENV{USER}) + add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}") +endif() + + +#Platform Specific +if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") + include_directories(${CMAKE_SOURCE_DIR}/compat/vcbuild/include) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE) + endif() + include_directories(${CMAKE_SOURCE_DIR}/compat/win32) + add_compile_definitions(HAVE_ALLOCA_H NO_POSIX_GOODIES NATIVE_CRLF NO_UNIX_SOCKETS WIN32 + _CONSOLE DETECT_MSYS_TTY STRIP_EXTENSION=".exe" NO_SYMLINK_HEAD UNRELIABLE_FSTAT + NOGDI OBJECT_CREATION_MODE=1 __USE_MINGW_ANSI_STDIO=0 + USE_NED_ALLOCATOR OVERRIDE_STRDUP MMAP_PREVENTS_DELETE USE_WIN32_MMAP + UNICODE _UNICODE HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET) + list(APPEND compat_SOURCES compat/mingw.c compat/winansi.c compat/win32/path-utils.c + compat/win32/pthread.c compat/win32mmap.c compat/win32/syslog.c + compat/win32/trace2_win32_process_info.c compat/win32/dirent.c + compat/nedmalloc/nedmalloc.c compat/strdup.c) + set(NO_UNIX_SOCKETS 1) + +elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") + add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY ) + list(APPEND compat_SOURCES unix-socket.c) +endif() + +set(EXE_EXTENSION ${CMAKE_EXECUTABLE_SUFFIX}) + +#header checks +check_include_file(libgen.h HAVE_LIBGEN_H) +if(NOT HAVE_LIBGEN_H) + add_compile_definitions(NO_LIBGEN_H) + list(APPEND compat_SOURCES compat/basename.c) +endif() + +check_include_file(sys/sysinfo.h HAVE_SYSINFO) +if(HAVE_SYSINFO) + add_compile_definitions(HAVE_SYSINFO) +endif() + +check_c_source_compiles(" +#include <alloca.h> + +int main(void) +{ + char *p = (char *) alloca(2 * sizeof(int)); + + if (p) + return 0; + return 0; +}" +HAVE_ALLOCA_H) +if(HAVE_ALLOCA_H) + add_compile_definitions(HAVE_ALLOCA_H) +endif() + +check_include_file(strings.h HAVE_STRINGS_H) +if(HAVE_STRINGS_H) + add_compile_definitions(HAVE_STRINGS_H) +endif() + +check_include_file(sys/select.h HAVE_SYS_SELECT_H) +if(NOT HAVE_SYS_SELECT_H) + add_compile_definitions(NO_SYS_SELECT_H) +endif() + +check_include_file(sys/poll.h HAVE_SYS_POLL_H) +if(NOT HAVE_SYS_POLL_H) + add_compile_definitions(NO_SYS_POLL_H) +endif() + +check_include_file(poll.h HAVE_POLL_H) +if(NOT HAVE_POLL_H) + add_compile_definitions(NO_POLL_H) +endif() + +check_include_file(inttypes.h HAVE_INTTYPES_H) +if(NOT HAVE_INTTYPES_H) + add_compile_definitions(NO_INTTYPES_H) +endif() + +check_include_file(paths.h HAVE_PATHS_H) +if(HAVE_PATHS_H) + add_compile_definitions(HAVE_PATHS_H) +endif() + +#function checks +set(function_checks + strcasestr memmem strlcpy strtoimax strtoumax strtoull + setenv mkdtemp poll pread memmem) + +#unsetenv,hstrerror are incompatible with windows build +if(NOT WIN32) + list(APPEND function_checks unsetenv hstrerror) +endif() + +foreach(f ${function_checks}) + string(TOUPPER ${f} uf) + check_function_exists(${f} HAVE_${uf}) + if(NOT HAVE_${uf}) + add_compile_definitions(NO_${uf}) + endif() +endforeach() + +if(NOT HAVE_POLL_H OR NOT HAVE_SYS_POLL_H OR NOT HAVE_POLL) + include_directories(${CMAKE_SOURCE_DIR}/compat/poll) + add_compile_definitions(NO_POLL) + list(APPEND compat_SOURCES compat/poll/poll.c) +endif() + +if(NOT HAVE_STRCASESTR) + list(APPEND compat_SOURCES compat/strcasestr.c) +endif() + +if(NOT HAVE_STRLCPY) + list(APPEND compat_SOURCES compat/strlcpy.c) +endif() + +if(NOT HAVE_STRTOUMAX) + list(APPEND compat_SOURCES compat/strtoumax.c compat/strtoimax.c) +endif() + +if(NOT HAVE_SETENV) + list(APPEND compat_SOURCES compat/setenv.c) +endif() + +if(NOT HAVE_MKDTEMP) + list(APPEND compat_SOURCES compat/mkdtemp.c) +endif() + +if(NOT HAVE_PREAD) + list(APPEND compat_SOURCES compat/pread.c) +endif() + +if(NOT HAVE_MEMMEM) + list(APPEND compat_SOURCES compat/memmem.c) +endif() + +if(NOT WIN32) + if(NOT HAVE_UNSETENV) + list(APPEND compat_SOURCES compat/unsetenv.c) + endif() + + if(NOT HAVE_HSTRERROR) + list(APPEND compat_SOURCES compat/hstrerror.c) + endif() +endif() + +check_function_exists(getdelim HAVE_GETDELIM) +if(HAVE_GETDELIM) + add_compile_definitions(HAVE_GETDELIM) +endif() + +check_function_exists(clock_gettime HAVE_CLOCK_GETTIME) +check_symbol_exists(CLOCK_MONOTONIC "time.h" HAVE_CLOCK_MONOTONIC) +if(HAVE_CLOCK_GETTIME) + add_compile_definitions(HAVE_CLOCK_GETTIME) +endif() +if(HAVE_CLOCK_MONOTONIC) + add_compile_definitions(HAVE_CLOCK_MONOTONIC) +endif() + +#check for st_blocks in struct stat +check_struct_has_member("struct stat" st_blocks "sys/stat.h" STRUCT_STAT_HAS_ST_BLOCKS) +if(NOT STRUCT_STAT_HAS_ST_BLOCKS) + add_compile_definitions(NO_ST_BLOCKS_IN_STRUCT_STAT) +endif() + +#compile checks +check_c_source_runs(" +#include<stdio.h> +#include<stdarg.h> +#include<string.h> +#include<stdlib.h> + +int test_vsnprintf(char *str, size_t maxsize, const char *format, ...) +{ + int ret; + va_list ap; + + va_start(ap, format); + ret = vsnprintf(str, maxsize, format, ap); + va_end(ap); + return ret; +} + +int main(void) +{ + char buf[6]; + + if (test_vsnprintf(buf, 3, \"%s\", \"12345\") != 5 + || strcmp(buf, \"12\")) + return 1; + if (snprintf(buf, 3, \"%s\", \"12345\") != 5 + || strcmp(buf, \"12\")) + return 1; + return 0; +}" +SNPRINTF_OK) +if(NOT SNPRINTF_OK) + add_compile_definitions(SNPRINTF_RETURNS_BOGUS) + list(APPEND compat_SOURCES compat/snprintf.c) +endif() + +check_c_source_runs(" +#include<stdio.h> + +int main(void) +{ + FILE *f = fopen(\".\", \"r\"); + + return f != NULL; +}" +FREAD_READS_DIRECTORIES_NO) +if(NOT FREAD_READS_DIRECTORIES_NO) + add_compile_definitions(FREAD_READS_DIRECTORIES) + list(APPEND compat_SOURCES compat/fopen.c) +endif() + +check_c_source_compiles(" +#include <regex.h> +#ifndef REG_STARTEND +#error oops we dont have it +#endif + +int main(void) +{ + return 0; +}" +HAVE_REGEX) +if(NOT HAVE_REGEX) + include_directories(${CMAKE_SOURCE_DIR}/compat/regex) + list(APPEND compat_SOURCES compat/regex/regex.c ) + add_compile_definitions(NO_REGEX NO_MBSUPPORT GAWK) +endif() + + +check_c_source_compiles(" +#include <stddef.h> +#include <sys/types.h> +#include <sys/sysctl.h> + +int main(void) +{ + int val, mib[2]; + size_t len; + + mib[0] = CTL_HW; + mib[1] = 1; + len = sizeof(val); + return sysctl(mib, 2, &val, &len, NULL, 0) ? 1 : 0; +}" +HAVE_BSD_SYSCTL) +if(HAVE_BSD_SYSCTL) + add_compile_definitions(HAVE_BSD_SYSCTL) +endif() + +set(CMAKE_REQUIRED_LIBRARIES ${Iconv_LIBRARIES}) +set(CMAKE_REQUIRED_INCLUDES ${Iconv_INCLUDE_DIRS}) + +check_c_source_compiles(" +#include <iconv.h> + +extern size_t iconv(iconv_t cd, + char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft); + +int main(void) +{ + return 0; +}" +HAVE_NEW_ICONV) +if(HAVE_NEW_ICONV) + set(HAVE_OLD_ICONV 0) +else() + set(HAVE_OLD_ICONV 1) +endif() + +check_c_source_runs(" +#include <iconv.h> +#if ${HAVE_OLD_ICONV} +typedef const char *iconv_ibp; +#else +typedef char *iconv_ibp; +#endif + +int main(void) +{ + 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; +}" +ICONV_DOESNOT_OMIT_BOM) +if(NOT ICONV_DOESNOT_OMIT_BOM) + add_compile_definitions(ICONV_OMITS_BOM) +endif() + +unset(CMAKE_REQUIRED_LIBRARIES) +unset(CMAKE_REQUIRED_INCLUDES) + + +#programs +set(PROGRAMS_BUILT + git git-daemon git-http-backend git-sh-i18n--envsubst + git-shell) + +if(NOT CURL_FOUND) + list(APPEND excluded_progs git-http-fetch git-http-push) + add_compile_definitions(NO_CURL) + message(WARNING "git-http-push and git-http-fetch will not be built") +else() + list(APPEND PROGRAMS_BUILT git-http-fetch git-http-push git-imap-send git-remote-http) + if(CURL_VERSION_STRING VERSION_GREATER_EQUAL 7.34.0) + add_compile_definitions(USE_CURL_FOR_IMAP_SEND) + endif() +endif() + +if(NOT EXPAT_FOUND) + list(APPEND excluded_progs git-http-push) + add_compile_definitions(NO_EXPAT) +else() + list(APPEND PROGRAMS_BUILT git-http-push) + if(EXPAT_VERSION_STRING VERSION_LESS_EQUAL 1.2) + add_compile_definitions(EXPAT_NEEDS_XMLPARSE_H) + endif() +endif() + +list(REMOVE_DUPLICATES excluded_progs) +list(REMOVE_DUPLICATES PROGRAMS_BUILT) + + +foreach(p ${excluded_progs}) + list(APPEND EXCLUSION_PROGS --exclude-program ${p} ) +endforeach() + +#for comparing null values +list(APPEND EXCLUSION_PROGS empty) +set(EXCLUSION_PROGS_CACHE ${EXCLUSION_PROGS} CACHE STRING "Programs not built" FORCE) + +if(NOT EXISTS ${CMAKE_BINARY_DIR}/command-list.h OR NOT EXCLUSION_PROGS_CACHE STREQUAL EXCLUSION_PROGS) + list(REMOVE_ITEM EXCLUSION_PROGS empty) + message("Generating command-list.h") + execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-cmdlist.sh ${EXCLUSION_PROGS} command-list.txt + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_FILE ${CMAKE_BINARY_DIR}/command-list.h) +endif() + +if(NOT EXISTS ${CMAKE_BINARY_DIR}/config-list.h) + message("Generating config-list.h") + execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-configlist.sh + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_FILE ${CMAKE_BINARY_DIR}/config-list.h) +endif() + +include_directories(${CMAKE_BINARY_DIR}) + +#build +#libgit +parse_makefile_for_sources(libgit_SOURCES "LIB_OBJS") + +list(TRANSFORM libgit_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/") +list(TRANSFORM compat_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/") +add_library(libgit ${libgit_SOURCES} ${compat_SOURCES}) + +#libxdiff +parse_makefile_for_sources(libxdiff_SOURCES "XDIFF_OBJS") + +list(TRANSFORM libxdiff_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/") +add_library(xdiff STATIC ${libxdiff_SOURCES}) + +if(WIN32) + if(NOT MSVC)#use windres when compiling with gcc and clang + add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git.res + COMMAND ${WINDRES_EXE} -O coff -DMAJOR=${PROJECT_VERSION_MAJOR} -DMINOR=${PROJECT_VERSION_MINOR} + -DMICRO=${PROJECT_VERSION_PATCH} -DPATCHLEVEL=0 -DGIT_VERSION="\\\"${PROJECT_VERSION}.GIT\\\"" + -i ${CMAKE_SOURCE_DIR}/git.rc -o ${CMAKE_BINARY_DIR}/git.res + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + VERBATIM) + else()#MSVC use rc + add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git.res + COMMAND ${CMAKE_RC_COMPILER} /d MAJOR=${PROJECT_VERSION_MAJOR} /d MINOR=${PROJECT_VERSION_MINOR} + /d MICRO=${PROJECT_VERSION_PATCH} /d PATCHLEVEL=0 /d GIT_VERSION="${PROJECT_VERSION}.GIT" + /fo ${CMAKE_BINARY_DIR}/git.res ${CMAKE_SOURCE_DIR}/git.rc + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + VERBATIM) + endif() + add_custom_target(git-rc DEPENDS ${CMAKE_BINARY_DIR}/git.res) +endif() + +#link all required libraries to common-main +add_library(common-main OBJECT ${CMAKE_SOURCE_DIR}/common-main.c) + +target_link_libraries(common-main libgit xdiff ${ZLIB_LIBRARIES}) +if(Intl_FOUND) + target_link_libraries(common-main ${Intl_LIBRARIES}) +endif() +if(Iconv_FOUND) + target_link_libraries(common-main ${Iconv_LIBRARIES}) +endif() +if(WIN32) + target_link_libraries(common-main ws2_32 ntdll ${CMAKE_BINARY_DIR}/git.res) + add_dependencies(common-main git-rc) + if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_link_options(common-main PUBLIC -municode -Wl,--nxcompat -Wl,--dynamicbase -Wl,--pic-executable,-e,mainCRTStartup) + elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_options(common-main PUBLIC -municode -Wl,-nxcompat -Wl,-dynamicbase -Wl,-entry:wmainCRTStartup -Wl,invalidcontinue.obj) + elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC") + target_link_options(common-main PUBLIC /IGNORE:4217 /IGNORE:4049 /NOLOGO /ENTRY:wmainCRTStartup /SUBSYSTEM:CONSOLE invalidcontinue.obj) + else() + message(FATAL_ERROR "Unhandled compiler: ${CMAKE_C_COMPILER_ID}") + endif() +elseif(UNIX) + target_link_libraries(common-main pthread rt) +endif() + +#git +parse_makefile_for_sources(git_SOURCES "BUILTIN_OBJS") + +list(TRANSFORM git_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/") +add_executable(git ${CMAKE_SOURCE_DIR}/git.c ${git_SOURCES}) +target_link_libraries(git common-main) + +add_executable(git-daemon ${CMAKE_SOURCE_DIR}/daemon.c) +target_link_libraries(git-daemon common-main) + +add_executable(git-http-backend ${CMAKE_SOURCE_DIR}/http-backend.c) +target_link_libraries(git-http-backend common-main) + +add_executable(git-sh-i18n--envsubst ${CMAKE_SOURCE_DIR}/sh-i18n--envsubst.c) +target_link_libraries(git-sh-i18n--envsubst common-main) + +add_executable(git-shell ${CMAKE_SOURCE_DIR}/shell.c) +target_link_libraries(git-shell common-main) + +if(CURL_FOUND) + add_library(http_obj OBJECT ${CMAKE_SOURCE_DIR}/http.c) + + add_executable(git-imap-send ${CMAKE_SOURCE_DIR}/imap-send.c) + target_link_libraries(git-imap-send http_obj common-main ${CURL_LIBRARIES}) + + add_executable(git-http-fetch ${CMAKE_SOURCE_DIR}/http-walker.c ${CMAKE_SOURCE_DIR}/http-fetch.c) + target_link_libraries(git-http-fetch http_obj common-main ${CURL_LIBRARIES}) + + add_executable(git-remote-http ${CMAKE_SOURCE_DIR}/http-walker.c ${CMAKE_SOURCE_DIR}/remote-curl.c) + target_link_libraries(git-remote-http http_obj common-main ${CURL_LIBRARIES} ) + + if(EXPAT_FOUND) + add_executable(git-http-push ${CMAKE_SOURCE_DIR}/http-push.c) + target_link_libraries(git-http-push http_obj common-main ${CURL_LIBRARIES} ${EXPAT_LIBRARIES}) + endif() +endif() + +set(git_builtin_extra + cherry cherry-pick format-patch fsck-objects + init merge-subtree restore show + stage status switch whatchanged) + +#Creating hardlinks +foreach(s ${git_SOURCES} ${git_builtin_extra}) + string(REPLACE "${CMAKE_SOURCE_DIR}/builtin/" "" s ${s}) + string(REPLACE ".c" "" s ${s}) + file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git${EXE_EXTENSION} git-${s}${EXE_EXTENSION})\n") + list(APPEND git_links ${CMAKE_BINARY_DIR}/git-${s}${EXE_EXTENSION}) +endforeach() + +if(CURL_FOUND) + set(remote_exes + git-remote-https git-remote-ftp git-remote-ftps) + foreach(s ${remote_exes}) + file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git-remote-http${EXE_EXTENSION} ${s}${EXE_EXTENSION})\n") + list(APPEND git_http_links ${CMAKE_BINARY_DIR}/${s}${EXE_EXTENSION}) + endforeach() +endif() + +add_custom_command(OUTPUT ${git_links} ${git_http_links} + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/CreateLinks.cmake + DEPENDS git git-remote-http) +add_custom_target(git-links ALL DEPENDS ${git_links} ${git_http_links}) + + +#creating required scripts +set(SHELL_PATH /bin/sh) +set(PERL_PATH /usr/bin/perl) +set(LOCALEDIR ${FALLBACK_RUNTIME_PREFIX}/share/locale) +set(GITWEBDIR ${FALLBACK_RUNTIME_PREFIX}/share/locale) +set(INSTLIBDIR ${FALLBACK_RUNTIME_PREFIX}/share/perl5) + +#shell scripts +parse_makefile_for_scripts(git_sh_scripts "SCRIPT_SH" ".sh") +parse_makefile_for_scripts(git_shlib_scripts "SCRIPT_LIB" "") +set(git_shell_scripts + ${git_sh_scripts} ${git_shlib_scripts} git-instaweb) + +foreach(script ${git_shell_scripts}) + file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.sh content NEWLINE_CONSUME) + string(REPLACE "@SHELL_PATH@" "${SHELL_PATH}" content "${content}") + string(REPLACE "@@DIFF@@" "diff" content "${content}") + string(REPLACE "@LOCALEDIR@" "${LOCALEDIR}" content "${content}") + string(REPLACE "@GITWEBDIR@" "${GITWEBDIR}" content "${content}") + string(REPLACE "@@NO_CURL@@" "" content "${content}") + string(REPLACE "@@USE_GETTEXT_SCHEME@@" "" content "${content}") + string(REPLACE "# @@BROKEN_PATH_FIX@@" "" content "${content}") + string(REPLACE "@@PERL@@" "${PERL_PATH}" content "${content}") + string(REPLACE "@@SANE_TEXT_GREP@@" "-a" content "${content}") + string(REPLACE "@@PAGER_ENV@@" "LESS=FRX LV=-c" content "${content}") + file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content}) +endforeach() + +#perl scripts +parse_makefile_for_scripts(git_perl_scripts "SCRIPT_PERL" ".perl") + +#create perl header +file(STRINGS ${CMAKE_SOURCE_DIR}/perl/header_templates/fixed_prefix.template.pl perl_header ) +string(REPLACE "@@PATHSEP@@" ":" perl_header "${perl_header}") +string(REPLACE "@@INSTLIBDIR@@" "${INSTLIBDIR}" perl_header "${perl_header}") + +foreach(script ${git_perl_scripts}) + file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.perl content NEWLINE_CONSUME) + string(REPLACE "#!/usr/bin/perl" "#!/usr/bin/perl\n${perl_header}\n" content "${content}") + string(REPLACE "@@GIT_VERSION@@" "${PROJECT_VERSION}" content "${content}") + file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content}) +endforeach() + +#python script +file(STRINGS ${CMAKE_SOURCE_DIR}/git-p4.py content NEWLINE_CONSUME) +string(REPLACE "#!/usr/bin/env python" "#!/usr/bin/python" content "${content}") +file(WRITE ${CMAKE_BINARY_DIR}/git-p4 ${content}) + +#perl modules +file(GLOB_RECURSE perl_modules "${CMAKE_SOURCE_DIR}/perl/*.pm") + +foreach(pm ${perl_modules}) + string(REPLACE "${CMAKE_SOURCE_DIR}/perl/" "" file_path ${pm}) + file(STRINGS ${pm} content NEWLINE_CONSUME) + string(REPLACE "@@LOCALEDIR@@" "${LOCALEDIR}" content "${content}") + string(REPLACE "@@NO_PERL_CPAN_FALLBACKS@@" "" content "${content}") + file(WRITE ${CMAKE_BINARY_DIR}/perl/build/lib/${file_path} ${content}) +#test-lib.sh requires perl/build/lib to be the build directory of perl modules +endforeach() + + +#templates +file(GLOB templates "${CMAKE_SOURCE_DIR}/templates/*") +list(TRANSFORM templates REPLACE "${CMAKE_SOURCE_DIR}/templates/" "") +list(REMOVE_ITEM templates ".gitignore") +list(REMOVE_ITEM templates "Makefile") +list(REMOVE_ITEM templates "blt")# Prevents an error when reconfiguring for in source builds + +list(REMOVE_ITEM templates "branches--") +file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/branches) #create branches + +#templates have @.*@ replacement so use configure_file instead +foreach(tm ${templates}) + string(REPLACE "--" "/" blt_tm ${tm}) + string(REPLACE "this" "" blt_tm ${blt_tm})# for this-- + configure_file(${CMAKE_SOURCE_DIR}/templates/${tm} ${CMAKE_BINARY_DIR}/templates/blt/${blt_tm} @ONLY) +endforeach() + + +#translations +if(MSGFMT_EXE) + file(GLOB po_files "${CMAKE_SOURCE_DIR}/po/*.po") + list(TRANSFORM po_files REPLACE "${CMAKE_SOURCE_DIR}/po/" "") + list(TRANSFORM po_files REPLACE ".po" "") + foreach(po ${po_files}) + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES) + add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo + COMMAND ${MSGFMT_EXE} --check --statistics -o ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo ${CMAKE_SOURCE_DIR}/po/${po}.po) + list(APPEND po_gen ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo) + endforeach() + add_custom_target(po-gen ALL DEPENDS ${po_gen}) +endif() + + +#to help with the install +list(TRANSFORM git_shell_scripts PREPEND "${CMAKE_BINARY_DIR}/") +list(TRANSFORM git_perl_scripts PREPEND "${CMAKE_BINARY_DIR}/") + +#install +install(TARGETS git git-shell + RUNTIME DESTINATION bin) +install(PROGRAMS ${CMAKE_BINARY_DIR}/git-cvsserver + DESTINATION bin) + +list(REMOVE_ITEM PROGRAMS_BUILT git git-shell) +install(TARGETS ${PROGRAMS_BUILT} + RUNTIME DESTINATION libexec/git-core) + +set(bin_links + git-receive-pack git-upload-archive git-upload-pack) + +foreach(b ${bin_links}) +install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/bin/${b}${EXE_EXTENSION})") +endforeach() + +install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git${EXE_EXTENSION})") +install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git-shell${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-shell${EXE_EXTENSION})") + +foreach(b ${git_links}) + string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b}) + install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b}${EXE_EXTENSION})") +endforeach() + +foreach(b ${git_http_links}) + string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b}) + install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-remote-http${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b}${EXE_EXTENSION})") +endforeach() + +install(PROGRAMS ${git_shell_scripts} ${git_perl_scripts} ${CMAKE_BINARY_DIR}/git-p4 + DESTINATION libexec/git-core) + +install(DIRECTORY ${CMAKE_SOURCE_DIR}/mergetools DESTINATION libexec/git-core) +install(DIRECTORY ${CMAKE_BINARY_DIR}/perl/build/lib/ DESTINATION share/perl5 + FILES_MATCHING PATTERN "*.pm") +install(DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/ DESTINATION share/git-core/templates) + +if(MSGFMT_EXE) + install(DIRECTORY ${CMAKE_BINARY_DIR}/po/build/locale DESTINATION share) +endif() + + +if(BUILD_TESTING) + +#tests-helpers +add_executable(test-fake-ssh ${CMAKE_SOURCE_DIR}/t/helper/test-fake-ssh.c) +target_link_libraries(test-fake-ssh common-main) + +#test-tool +parse_makefile_for_sources(test-tool_SOURCES "TEST_BUILTINS_OBJS") + +list(TRANSFORM test-tool_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/t/helper/") +add_executable(test-tool ${CMAKE_SOURCE_DIR}/t/helper/test-tool.c ${test-tool_SOURCES}) +target_link_libraries(test-tool common-main) + +set_target_properties(test-fake-ssh test-tool + PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/helper) + +if(MSVC) + set_target_properties(test-fake-ssh test-tool + PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/t/helper) + set_target_properties(test-fake-ssh test-tool + PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/t/helper) +endif() + +#wrapper scripts +set(wrapper_scripts + git git-upload-pack git-receive-pack git-upload-archive git-shell git-remote-ext) + +set(wrapper_test_scripts + test-fake-ssh test-tool) + + +foreach(script ${wrapper_scripts}) + file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME) + string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}") + string(REPLACE "@@PROG@@" "${script}${EXE_EXTENSION}" content "${content}") + file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content}) +endforeach() + +foreach(script ${wrapper_test_scripts}) + file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME) + string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}") + string(REPLACE "@@PROG@@" "t/helper/${script}${EXE_EXTENSION}" content "${content}") + file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content}) +endforeach() + +file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME) +string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}") +string(REPLACE "@@PROG@@" "git-cvsserver" content "${content}") +file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/git-cvsserver ${content}) + +#options for configuring test options +option(PERL_TESTS "Perform tests that use perl" ON) +option(PYTHON_TESTS "Perform tests that use python" ON) + +#GIT-BUILD-OPTIONS +set(TEST_SHELL_PATH ${SHELL_PATH}) +set(DIFF diff) +set(PYTHON_PATH /usr/bin/python) +set(TAR tar) +set(NO_CURL ) +set(NO_EXPAT ) +set(USE_LIBPCRE1 ) +set(USE_LIBPCRE2 ) +set(NO_LIBPCRE1_JIT ) +set(NO_PERL ) +set(NO_PTHREADS ) +set(NO_PYTHON ) +set(PAGER_ENV "LESS=FRX LV=-c") +set(DC_SHA1 YesPlease) +set(RUNTIME_PREFIX true) +set(NO_GETTEXT ) + +if(NOT CURL_FOUND) + set(NO_CURL 1) +endif() + +if(NOT EXPAT_FOUND) + set(NO_EXPAT 1) +endif() + +if(NOT Intl_FOUND) + set(NO_GETTEXT 1) +endif() + +if(NOT PERL_TESTS) + set(NO_PERL 1) +endif() + +if(NOT PYTHON_TESTS) + set(NO_PYTHON 1) +endif() + +file(WRITE ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "SHELL_PATH='${SHELL_PATH}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "TEST_SHELL_PATH='${TEST_SHELL_PATH}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PERL_PATH='${PERL_PATH}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "DIFF='${DIFF}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PYTHON_PATH='${PYTHON_PATH}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "TAR='${TAR}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_CURL='${NO_CURL}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_EXPAT='${NO_EXPAT}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "USE_LIBPCRE1='${USE_LIBPCRE1}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_LIBPCRE1_JIT='${NO_LIBPCRE1_JIT}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PERL='${NO_PERL}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PTHREADS='${NO_PTHREADS}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_UNIX_SOCKETS='${NO_UNIX_SOCKETS}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PAGER_ENV='${PAGER_ENV}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "DC_SHA1='${DC_SHA1}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "X='${EXE_EXTENSION}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "RUNTIME_PREFIX='${RUNTIME_PREFIX}'\n") +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PYTHON='${NO_PYTHON}'\n") +if(WIN32) + file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows/bin\"\n") +endif() + +#Make the tests work when building out of the source tree +get_filename_component(CACHE_PATH ${CMAKE_CURRENT_LIST_DIR}/../../CMakeCache.txt ABSOLUTE) +if(NOT ${CMAKE_BINARY_DIR}/CMakeCache.txt STREQUAL ${CACHE_PATH}) + file(RELATIVE_PATH BUILD_DIR_RELATIVE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/CMakeCache.txt) + string(REPLACE "/CMakeCache.txt" "" BUILD_DIR_RELATIVE ${BUILD_DIR_RELATIVE}) + #Setting the build directory in test-lib.sh before running tests + file(WRITE ${CMAKE_BINARY_DIR}/CTestCustom.cmake + "file(STRINGS ${CMAKE_SOURCE_DIR}/t/test-lib.sh GIT_BUILD_DIR_REPL REGEX \"GIT_BUILD_DIR=(.*)\")\n" + "file(STRINGS ${CMAKE_SOURCE_DIR}/t/test-lib.sh content NEWLINE_CONSUME)\n" + "string(REPLACE \"\${GIT_BUILD_DIR_REPL}\" \"GIT_BUILD_DIR=\\\"$TEST_DIRECTORY/../${BUILD_DIR_RELATIVE}\\\"\" content \"\${content}\")\n" + "file(WRITE ${CMAKE_SOURCE_DIR}/t/test-lib.sh \${content})") + #misc copies + file(COPY ${CMAKE_SOURCE_DIR}/t/chainlint.sed DESTINATION ${CMAKE_BINARY_DIR}/t/) + file(COPY ${CMAKE_SOURCE_DIR}/po/is.po DESTINATION ${CMAKE_BINARY_DIR}/po/) + file(COPY ${CMAKE_SOURCE_DIR}/mergetools/tkdiff DESTINATION ${CMAKE_BINARY_DIR}/mergetools/) + file(COPY ${CMAKE_SOURCE_DIR}/contrib/completion/git-prompt.sh DESTINATION ${CMAKE_BINARY_DIR}/contrib/completion/) + file(COPY ${CMAKE_SOURCE_DIR}/contrib/completion/git-completion.bash DESTINATION ${CMAKE_BINARY_DIR}/contrib/completion/) +endif() + +file(GLOB test_scipts "${CMAKE_SOURCE_DIR}/t/t[0-9]*.sh") + +#test +foreach(tsh ${test_scipts}) + add_test(NAME ${tsh} + COMMAND ${SH_EXE} ${tsh} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/t) +endforeach() + +endif()#BUILD_TESTING diff --git a/third_party/git/contrib/buildsystems/Generators/Vcxproj.pm b/third_party/git/contrib/buildsystems/Generators/Vcxproj.pm index 576ccabe1d..d2584450ba 100644 --- a/third_party/git/contrib/buildsystems/Generators/Vcxproj.pm +++ b/third_party/git/contrib/buildsystems/Generators/Vcxproj.pm @@ -79,7 +79,9 @@ 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/; + $libs_debug =~ s/zlib\.lib/zlibd\.lib/g; + $libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g; + $libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g; } $defines =~ s/-D//g; @@ -119,13 +121,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"> @@ -277,6 +279,9 @@ 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 fba8a3f056..2ff9620459 100755 --- a/third_party/git/contrib/buildsystems/engine.pl +++ b/third_party/git/contrib/buildsystems/engine.pl @@ -343,13 +343,13 @@ sub handleLinkLine } elsif ("$part" eq "-lz") { push(@libs, "zlib.lib"); } elsif ("$part" eq "-lcrypto") { - push(@libs, "libeay32.lib"); + push(@libs, "libcrypto.lib"); } elsif ("$part" eq "-lssl") { - push(@libs, "ssleay32.lib"); + push(@libs, "libssl.lib"); } elsif ("$part" eq "-lcurl") { push(@libs, "libcurl.lib"); } elsif ("$part" eq "-lexpat") { - push(@libs, "expat.lib"); + push(@libs, "libexpat.lib"); } elsif ("$part" eq "-liconv") { push(@libs, "libiconv.lib"); } elsif ($part =~ /^[-\/]/) { diff --git a/third_party/git/contrib/coccinelle/commit.cocci b/third_party/git/contrib/coccinelle/commit.cocci index d03453341e..af6dd4c20c 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 direcly. +// These excluded functions must access c->maybe_tree directly. // 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. @@ -32,3 +32,21 @@ expression c; - c->maybe_tree + repo_get_commit_tree(specify_the_right_repo_here, c) ...>} + +@@ +struct commit *c; +expression E; +@@ +( +- c->generation = E; ++ commit_graph_data_at(c)->generation = E; +| +- c->graph_pos = E; ++ commit_graph_data_at(c)->graph_pos = E; +| +- c->generation ++ commit_graph_generation(c) +| +- c->graph_pos ++ commit_graph_position(c) +) diff --git a/third_party/git/contrib/coccinelle/hashmap.cocci b/third_party/git/contrib/coccinelle/hashmap.cocci new file mode 100644 index 0000000000..d69e120ccf --- /dev/null +++ b/third_party/git/contrib/coccinelle/hashmap.cocci @@ -0,0 +1,16 @@ +@ 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 3e536a9834..ddf4f22bd7 100644 --- a/third_party/git/contrib/coccinelle/object_id.cocci +++ b/third_party/git/contrib/coccinelle/object_id.cocci @@ -13,38 +13,6 @@ 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 e087c4bf00..0a96ad87e7 100644 --- a/third_party/git/contrib/completion/git-completion.bash +++ b/third_party/git/contrib/completion/git-completion.bash @@ -39,6 +39,11 @@ # When set to "1", do not include "DWIM" suggestions in git-checkout # and git-switch completion (e.g., completing "foo" when "origin/foo" # exists). +# +# GIT_COMPLETION_SHOW_ALL +# +# When set to "1" suggest all options, including options which are +# typically hidden (e.g. '--allow-empty' for 'git commit'). case "$COMP_WORDBREAKS" in *:*) : great ;; @@ -50,7 +55,7 @@ esac # variable. __git_find_repo_path () { - if [ -n "$__git_repo_path" ]; then + if [ -n "${__git_repo_path-}" ]; then # we already know where it is return fi @@ -301,6 +306,19 @@ __gitcomp_direct () COMPREPLY=($1) } +# Similar to __gitcomp_direct, but appends to COMPREPLY instead. +# Callers must take care of providing only words that match the current word +# to be completed and adding any prefix and/or suffix (trailing space!), if +# necessary. +# 1: List of newline-separated matching completion words, complete with +# prefix and suffix. +__gitcomp_direct_append () +{ + local IFS=$'\n' + + COMPREPLY+=($1) +} + __gitcompappend () { local x i=${#COMPREPLY[@]} @@ -340,7 +358,7 @@ __gitcomp () c="$c${4-}" if [[ $c == "$cur_"* ]]; then case $c in - --*=*|*.) ;; + --*=|*.) ;; *) c="$c " ;; esac COMPREPLY[i++]="${2-}$c" @@ -360,7 +378,7 @@ __gitcomp () c="$c${4-}" if [[ $c == "$cur_"* ]]; then case $c in - --*=*|*.) ;; + *=|*.) ;; *) c="$c " ;; esac COMPREPLY[i++]="${2-}$c" @@ -373,7 +391,7 @@ __gitcomp () # Clear the variables caching builtins' options when (re-)sourcing # the completion script. if [[ -n ${ZSH_VERSION-} ]]; then - unset $(set |sed -ne 's/^\(__gitcomp_builtin_[a-zA-Z0-9_][a-zA-Z0-9_]*\)=.*/\1/p') 2>/dev/null + unset ${(M)${(k)parameters[@]}:#__gitcomp_builtin_*} 2>/dev/null else unset $(compgen -v __gitcomp_builtin_) fi @@ -391,17 +409,24 @@ __gitcomp_builtin () # spaces must be replaced with underscore for multi-word # commands, e.g. "git remote add" becomes remote_add. local cmd="$1" - local incl="$2" - local excl="$3" + local incl="${2-}" + local excl="${3-}" local var=__gitcomp_builtin_"${cmd/-/_}" local options - eval "options=\$$var" + eval "options=\${$var-}" + + local completion_helper + if [ "$GIT_COMPLETION_SHOW_ALL" = "1" ]; then + completion_helper="--git-completion-helper-all" + else + completion_helper="--git-completion-helper" + fi if [ -z "$options" ]; then # leading and trailing spaces are significant to make # option removal work correctly. - options=" $incl $(__git ${cmd/_/ } --git-completion-helper) " || return + options=" $incl $(__git ${cmd/_/ } $completion_helper) " || return for i in $excl; do options="${options/ $i / }" @@ -504,7 +529,7 @@ __git_index_files () { local root="$2" match="$3" - __git_ls_files_helper "$root" "$1" "$match" | + __git_ls_files_helper "$root" "$1" "${match:-?}" | awk -F / -v pfx="${2//\\/\\\\}" '{ paths[$1] = 1 } @@ -524,7 +549,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 direcory + # Because of this we may have seen the same directory # both quoted and unquoted. if (p in paths) # We have seen the same directory unquoted, @@ -550,7 +575,7 @@ __git_index_files () esc_idx, 1) } else if (esc == "n") { # Uh-oh, a newline character. - # We cant reliably put a pathname + # We cannot reliably put a pathname # containing a newline into COMPREPLY, # and the newline would create a mess. # Skip this path. @@ -565,7 +590,7 @@ __git_index_files () } } # Drop closing double quote, if there is one. - # (There isnt any if this is a directory, as it was + # (There is not 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) @@ -611,6 +636,19 @@ __git_heads () "refs/heads/$cur_*" "refs/heads/$cur_*/**" } +# Lists branches from remote repositories. +# 1: A prefix to be added to each listed branch (optional). +# 2: List only branches matching this word (optional; list all branches if +# unset or empty). +# 3: A suffix to be appended to each listed branch (optional). +__git_remote_heads () +{ + local pfx="${1-}" cur_="${2-}" sfx="${3-}" + + __git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \ + "refs/remotes/$cur_*" "refs/remotes/$cur_*/**" +} + # Lists tags from the local repository. # Accepts the same positional parameters as __git_heads() above. __git_tags () @@ -621,6 +659,26 @@ __git_tags () "refs/tags/$cur_*" "refs/tags/$cur_*/**" } +# List unique branches from refs/remotes used for 'git checkout' and 'git +# switch' tracking DWIMery. +# 1: A prefix to be added to each listed branch (optional) +# 2: List only branches matching this word (optional; list all branches if +# unset or empty). +# 3: A suffix to be appended to each listed branch (optional). +__git_dwim_remote_heads () +{ + local pfx="${1-}" cur_="${2-}" sfx="${3-}" + local fer_pfx="${pfx//\%/%%}" # "escape" for-each-ref format specifiers + + # employ the heuristic used by git checkout and git switch + # Try to find a remote branch that cur_es the completion word + # but only output if the branch name is unique + __git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \ + --sort="refname:strip=3" \ + "refs/remotes/*/$cur_*" "refs/remotes/*/$cur_*/**" | \ + uniq -u +} + # Lists refs from the local (by default) or from a remote repository. # It accepts 0, 1 or 2 arguments: # 1: The remote to list refs from (optional; ignored, if set but empty). @@ -696,13 +754,7 @@ __git_refs () __git_dir="$dir" __git for-each-ref --format="$fer_pfx%($format)$sfx" \ "${refs[@]}" if [ -n "$track" ]; then - # employ the heuristic used by git checkout - # Try to find a remote branch that matches the completion word - # but only output if the branch name is unique - __git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \ - --sort="refname:strip=3" \ - "refs/remotes/*/$match*" "refs/remotes/*/$match*/**" | \ - uniq -u + __git_dwim_remote_heads "$pfx" "$match" "$sfx" fi return fi @@ -749,29 +801,51 @@ __git_refs () # Usage: __git_complete_refs [<option>]... # --remote=<remote>: The remote to list refs from, can be the name of a # configured remote, a path, or a URL. -# --track: List unique remote branches for 'git checkout's tracking DWIMery. +# --dwim: List unique remote branches for 'git switch's tracking DWIMery. # --pfx=<prefix>: A prefix to be added to each ref. # --cur=<word>: The current ref to be completed. Defaults to the current # word to be completed. # --sfx=<suffix>: A suffix to be appended to each ref instead of the default # space. +# --mode=<mode>: What set of refs to complete, one of 'refs' (the default) to +# complete all refs, 'heads' to complete only branches, or +# 'remote-heads' to complete only remote branches. Note that +# --remote is only compatible with --mode=refs. __git_complete_refs () { - local remote track pfx cur_="$cur" sfx=" " + local remote= dwim= pfx= cur_="$cur" sfx=" " mode="refs" while test $# != 0; do case "$1" in --remote=*) remote="${1##--remote=}" ;; - --track) track="yes" ;; + --dwim) dwim="yes" ;; + # --track is an old spelling of --dwim + --track) dwim="yes" ;; --pfx=*) pfx="${1##--pfx=}" ;; --cur=*) cur_="${1##--cur=}" ;; --sfx=*) sfx="${1##--sfx=}" ;; + --mode=*) mode="${1##--mode=}" ;; *) return 1 ;; esac shift done - __gitcomp_direct "$(__git_refs "$remote" "$track" "$pfx" "$cur_" "$sfx")" + # complete references based on the specified mode + case "$mode" in + refs) + __gitcomp_direct "$(__git_refs "$remote" "" "$pfx" "$cur_" "$sfx")" ;; + heads) + __gitcomp_direct "$(__git_heads "$pfx" "$cur_" "$sfx")" ;; + remote-heads) + __gitcomp_direct "$(__git_remote_heads "$pfx" "$cur_" "$sfx")" ;; + *) + return 1 ;; + esac + + # Append DWIM remote branch names if requested + if [ "$dwim" = "yes" ]; then + __gitcomp_direct_append "$(__git_dwim_remote_heads "$pfx" "$cur_" "$sfx")" + fi } # __git_refs2 requires 1 argument (to pass to __git_refs) @@ -1069,15 +1143,32 @@ __git_aliased_command () done } -# __git_find_on_cmdline requires 1 argument +# 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 () { - local word subcommand c=1 + 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" + while [ $c -lt $cword ]; do - word="${words[c]}" - for subcommand in $1; do - if [ "$subcommand" = "$word" ]; then - echo "$subcommand" + for word in $wordlist; do + if [ "$word" = "${words[c]}" ]; then + if [ -n "${show_idx-}" ]; then + echo "$c $word" + else + echo "$word" + fi return fi done @@ -1085,6 +1176,40 @@ __git_find_on_cmdline () done } +# Similar to __git_find_on_cmdline, except that it loops backwards and thus +# prints the *last* word found. Useful for finding which of two options that +# supersede each other came last, such as "--guess" and "--no-guess". +# +# Usage: __git_find_last_on_cmdline [<option>]... "<wordlist>" +# --show-idx: Optionally show the index of the found word in the $words array. +__git_find_last_on_cmdline () +{ + local word c=$cword show_idx + + while test $# -gt 1; do + case "$1" in + --show-idx) show_idx=y ;; + *) return 1 ;; + esac + shift + done + local wordlist="$1" + + while [ $c -gt 1 ]; do + ((c--)) + for word in $wordlist; do + if [ "$word" = "${words[c]}" ]; then + if [ -n "$show_idx" ]; then + echo "$c $word" + else + echo "$word" + fi + return + fi + done + done +} + # Echo the value of an option set on the command line or config # # $1: short option name @@ -1180,6 +1305,7 @@ __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 () @@ -1198,6 +1324,10 @@ _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" @@ -1250,10 +1380,7 @@ _git_archive () return ;; --*) - __gitcomp " - --format= --list --verbose - --prefix= --remote= --exec= --output - " + __gitcomp_builtin archive "--format= --list --verbose --prefix= --worktree-attributes" return ;; esac @@ -1337,10 +1464,66 @@ _git_bundle () esac } +# Helper function to decide whether or not we should enable DWIM logic for +# git-switch and git-checkout. +# +# To decide between the following rules in priority order +# 1) the last provided of "--guess" or "--no-guess" explicitly enable or +# disable completion of DWIM logic respectively. +# 2) If the --no-track option is provided, take this as a hint to disable the +# DWIM completion logic +# 3) If GIT_COMPLETION_CHECKOUT_NO_GUESS is set, disable the DWIM completion +# logic, as requested by the user. +# 4) Enable DWIM logic otherwise. +# +__git_checkout_default_dwim_mode () +{ + local last_option dwim_opt="--dwim" + + if [ "${GIT_COMPLETION_CHECKOUT_NO_GUESS-}" = "1" ]; then + dwim_opt="" + fi + + # --no-track disables DWIM, but with lower priority than + # --guess/--no-guess + if [ -n "$(__git_find_on_cmdline "--no-track")" ]; then + dwim_opt="" + fi + + # Find the last provided --guess or --no-guess + last_option="$(__git_find_last_on_cmdline "--guess --no-guess")" + case "$last_option" in + --guess) + dwim_opt="--dwim" + ;; + --no-guess) + dwim_opt="" + ;; + esac + + echo "$dwim_opt" +} + _git_checkout () { __git_has_doubledash && return + local dwim_opt="$(__git_checkout_default_dwim_mode)" + + case "$prev" in + -b|-B|--orphan) + # Complete local branches (and DWIM branch + # remote branch names) for an option argument + # specifying a new branch name. This is for + # convenience, assuming new branches are + # possibly based on pre-existing branch names. + __git_complete_refs $dwim_opt --mode="heads" + return + ;; + *) + ;; + esac + case "$cur" in --conflict=*) __gitcomp "diff3 merge" "" "${cur##--conflict=}" @@ -1349,19 +1532,28 @@ _git_checkout () __gitcomp_builtin checkout ;; *) - # check if --track, --no-track, or --no-guess was specified - # if so, disable DWIM mode - local flags="--track --no-track --no-guess" track_opt="--track" - if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] || - [ -n "$(__git_find_on_cmdline "$flags")" ]; then - track_opt='' + # At this point, we've already handled special completion for + # the arguments to -b/-B, and --orphan. There are 3 main + # things left we can possibly complete: + # 1) a start-point for -b/-B, -d/--detach, or --orphan + # 2) a remote head, for --track + # 3) an arbitrary reference, possibly including DWIM names + # + + if [ -n "$(__git_find_on_cmdline "-b -B -d --detach --orphan")" ]; then + __git_complete_refs --mode="refs" + elif [ -n "$(__git_find_on_cmdline "--track")" ]; then + __git_complete_refs --mode="remote-heads" + else + __git_complete_refs $dwim_opt --mode="refs" fi - __git_complete_refs $track_opt ;; esac } -__git_cherry_pick_inprogress_options="--continue --quit --abort" +__git_sequencer_inprogress_options="--continue --quit --abort --skip" + +__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options _git_cherry_pick () { @@ -1399,7 +1591,18 @@ _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 @@ -1460,9 +1663,16 @@ __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 @@ -1476,6 +1686,8 @@ __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 () @@ -1491,6 +1703,14 @@ _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 @@ -1503,8 +1723,8 @@ _git_diff () } __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff - tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc - codecompare smerge + tkdiff vimdiff nvimdiff gvimdiff xxdiff araxis p4merge + bc codecompare smerge " _git_difftool () @@ -1563,6 +1783,10 @@ _git_format_patch () " "" "${cur##--thread=}" return ;; + --base=*|--interdiff=*|--range-diff=*) + __git_complete_refs --cur="${cur#--*=}" + return + ;; --*) __gitcomp_builtin format-patch "$__git_format_patch_extra_options" return @@ -1737,7 +1961,7 @@ __git_log_shortlog_options=" --all-match --invert-grep " -__git_log_pretty_formats="oneline short medium full fuller email raw format: mboxrd" +__git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd" __git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:" _git_log () @@ -1784,6 +2008,10 @@ _git_log () __gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}" return ;; + --no-walk=*) + __gitcomp "sorted unsorted" "" "${cur##--no-walk=}" + return + ;; --*) __gitcomp " $__git_log_common_options @@ -1791,19 +2019,23 @@ _git_log () $__git_log_gitk_options --root --topo-order --date-order --reverse --follow --full-diff - --abbrev-commit --abbrev= + --abbrev-commit --no-abbrev-commit --abbrev= --relative-date --date= --pretty= --format= --oneline --show-signature --cherry-mark --cherry-pick --graph - --decorate --decorate= + --decorate --decorate= --no-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 + --patch --no-patch " return ;; @@ -2004,15 +2236,18 @@ _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 "--continue --skip --abort --quit --edit-todo --show-current-patch" + __gitcomp "$__git_rebase_interactive_inprogress_options" return elif [ -d "$__git_repo_path"/rebase-apply ] || \ [ -d "$__git_repo_path"/rebase-merge ]; then - __gitcomp "--continue --skip --abort --quit --show-current-patch" + __gitcomp "$__git_rebase_inprogress_options" return fi __git_complete_strategy && return @@ -2021,20 +2256,13 @@ _git_rebase () __gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}" return ;; + --onto=*) + __git_complete_refs --cur="${cur##--onto=}" + return + ;; --*) - __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 - " + __gitcomp_builtin rebase "" \ + "$__git_rebase_interactive_inprogress_options" return esac @@ -2163,6 +2391,22 @@ _git_status () _git_switch () { + local dwim_opt="$(__git_checkout_default_dwim_mode)" + + case "$prev" in + -c|-C|--orphan) + # Complete local branches (and DWIM branch + # remote branch names) for an option argument + # specifying a new branch name. This is for + # convenience, assuming new branches are + # possibly based on pre-existing branch names. + __git_complete_refs $dwim_opt --mode="heads" + return + ;; + *) + ;; + esac + case "$cur" in --conflict=*) __gitcomp "diff3 merge" "" "${cur##--conflict=}" @@ -2171,29 +2415,26 @@ _git_switch () __gitcomp_builtin switch ;; *) - # check if --track, --no-track, or --no-guess was specified - # if so, disable DWIM mode - local track_opt="--track" only_local_ref=n - if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] || - [ -n "$(__git_find_on_cmdline "--track --no-track --no-guess")" ]; then - track_opt='' - fi - # explicit --guess enables DWIM mode regardless of - # $GIT_COMPLETION_CHECKOUT_NO_GUESS - if [ -n "$(__git_find_on_cmdline "--guess")" ]; then - track_opt='--track' - fi - if [ -z "$(__git_find_on_cmdline "-d --detach")" ]; then - only_local_ref=y - else - # --guess --detach is invalid combination, no - # dwim will be done when --detach is specified - track_opt= + # Unlike in git checkout, git switch --orphan does not take + # a start point. Thus we really have nothing to complete after + # the branch name. + if [ -n "$(__git_find_on_cmdline "--orphan")" ]; then + return fi - if [ $only_local_ref = y -a -z "$track_opt" ]; then - __gitcomp_direct "$(__git_heads "" "$cur" " ")" + + # At this point, we've already handled special completion for + # -c/-C, and --orphan. There are 3 main things left to + # complete: + # 1) a start-point for -c/-C or -d/--detach + # 2) a remote head, for --track + # 3) a branch name, possibly including DWIM remote branches + + if [ -n "$(__git_find_on_cmdline "-c -C -d --detach")" ]; then + __git_complete_refs --mode="refs" + elif [ -n "$(__git_find_on_cmdline "--track")" ]; then + __git_complete_refs --mode="remote-heads" else - __git_complete_refs $track_opt + __git_complete_refs $dwim_opt --mode="heads" fi ;; esac @@ -2225,181 +2466,282 @@ __git_config_vars= __git_compute_config_vars () { test -n "$__git_config_vars" || - __git_config_vars="$(git help --config-for-completion | sort | uniq)" + __git_config_vars="$(git help --config-for-completion | sort -u)" } -_git_config () +# 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 () { - local varname + 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 if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then - varname="${prev,,}" + varname="${varname,,}" else - varname="$(echo "$prev" |tr A-Z a-z)" + varname="$(echo "$varname" |tr A-Z a-z)" fi case "$varname" in branch.*.remote|branch.*.pushremote) - __gitcomp_nl "$(__git_remotes)" + __gitcomp_nl "$(__git_remotes)" "" "$cur_" return ;; branch.*.merge) - __git_complete_refs + __git_complete_refs --cur="$cur_" return ;; branch.*.rebase) - __gitcomp "false true merges preserve interactive" + __gitcomp "false true merges preserve interactive" "" "$cur_" return ;; remote.pushdefault) - __gitcomp_nl "$(__git_remotes)" + __gitcomp_nl "$(__git_remotes)" "" "$cur_" return ;; remote.*.fetch) - local remote="${prev#remote.}" + local remote="${varname#remote.}" remote="${remote%.fetch}" - if [ -z "$cur" ]; then + if [ -z "$cur_" ]; then __gitcomp_nl "refs/heads/" "" "" "" return fi - __gitcomp_nl "$(__git_refs_remotes "$remote")" + __gitcomp_nl "$(__git_refs_remotes "$remote")" "" "$cur_" return ;; remote.*.push) - local remote="${prev#remote.}" + local remote="${varname#remote.}" remote="${remote%.push}" __gitcomp_nl "$(__git for-each-ref \ - --format='%(refname):%(refname)' refs/heads)" + --format='%(refname):%(refname)' refs/heads)" "" "$cur_" return ;; pull.twohead|pull.octopus) __git_compute_merge_strategies - __gitcomp "$__git_merge_strategies" - return - ;; - color.branch|color.diff|color.interactive|\ - color.showbranch|color.status|color.ui) - __gitcomp "always never auto" + __gitcomp "$__git_merge_strategies" "" "$cur_" return ;; color.pager) - __gitcomp "false true" + __gitcomp "false true" "" "$cur_" 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" + __gitcomp "$__git_diff_submodule_formats" "" "$cur_" return ;; help.format) - __gitcomp "man info web html" + __gitcomp "man info web html" "" "$cur_" return ;; log.date) - __gitcomp "$__git_log_date_formats" + __gitcomp "$__git_log_date_formats" "" "$cur_" return ;; sendemail.aliasfiletype) - __gitcomp "mutt mailrc pine elm gnus" + __gitcomp "mutt mailrc pine elm gnus" "" "$cur_" return ;; sendemail.confirm) - __gitcomp "$__git_send_email_confirm_options" + __gitcomp "$__git_send_email_confirm_options" "" "$cur_" return ;; sendemail.suppresscc) - __gitcomp "$__git_send_email_suppresscc_options" + __gitcomp "$__git_send_email_suppresscc_options" "" "$cur_" return ;; sendemail.transferencoding) - __gitcomp "7bit 8bit quoted-printable base64" - return - ;; - --get|--get-all|--unset|--unset-all) - __gitcomp_nl "$(__git_config_get_set_variables)" + __gitcomp "7bit 8bit quoted-printable base64" "" "$cur_" return ;; *.*) return ;; esac - case "$cur" in - --*) - __gitcomp_builtin config - return - ;; +} + +# 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 branch.*.*) - local pfx="${cur%.*}." cur_="${cur##*.}" - __gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_" + local pfx="${cur_%.*}." + cur_="${cur_##*.}" + __gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_" "$sfx" 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_" + __gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx" 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_" + " "$pfx" "$cur_" "$sfx" return ;; difftool.*.*) - local pfx="${cur%.*}." cur_="${cur##*.}" - __gitcomp "cmd path" "$pfx" "$cur_" + local pfx="${cur_%.*}." + cur_="${cur_##*.}" + __gitcomp "cmd path" "$pfx" "$cur_" "$sfx" return ;; man.*.*) - local pfx="${cur%.*}." cur_="${cur##*.}" - __gitcomp "cmd path" "$pfx" "$cur_" + local pfx="${cur_%.*}." + cur_="${cur_##*.}" + __gitcomp "cmd path" "$pfx" "$cur_" "$sfx" return ;; mergetool.*.*) - local pfx="${cur%.*}." cur_="${cur##*.}" - __gitcomp "cmd path trustExitCode" "$pfx" "$cur_" + local pfx="${cur_%.*}." + cur_="${cur_##*.}" + __gitcomp "cmd path trustExitCode" "$pfx" "$cur_" "$sfx" return ;; pager.*) - local pfx="${cur%.*}." cur_="${cur#*.}" + local pfx="${cur_%.*}." + cur_="${cur_#*.}" __git_compute_all_commands - __gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" + __gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx" 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_" + " "$pfx" "$cur_" "$sfx" return ;; remote.*) - local pfx="${cur%.*}." cur_="${cur#*.}" + local pfx="${cur_%.*}." + cur_="${cur_#*.}" __gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "." - __gitcomp_nl_append "pushDefault" "$pfx" "$cur_" + __gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "$sfx" return ;; url.*.*) - local pfx="${cur%.*}." cur_="${cur##*.}" - __gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_" + local pfx="${cur_%.*}." + cur_="${cur_##*.}" + __gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_" "$sfx" return ;; *.*) __git_compute_config_vars - __gitcomp "$__git_config_vars" + __gitcomp "$__git_config_vars" "" "$cur_" "$sfx" ;; *) __git_compute_config_vars - __gitcomp "$(echo "$__git_config_vars" | sed 's/\.[^ ]*/./g')" + __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 + ;; esac } @@ -2499,6 +2841,13 @@ _git_reset () _git_restore () { + case "$prev" in + -s) + __git_complete_refs + return + ;; + esac + case "$cur" in --conflict=*) __gitcomp "diff3 merge" "" "${cur##--conflict=}" @@ -2512,7 +2861,7 @@ _git_restore () esac } -__git_revert_inprogress_options="--continue --quit --abort" +__git_revert_inprogress_options=$__git_sequencer_inprogress_options _git_revert () { @@ -2579,9 +2928,18 @@ _git_show () __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 "--pretty= --format= --abbrev-commit --oneline - --show-signature + __gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit + --oneline --show-signature --patch + --expand-tabs --expand-tabs= --no-expand-tabs $__git_diff_common_options " return @@ -2601,12 +2959,33 @@ _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' local subcommands='push list show apply clear drop pop create branch' local subcommand="$(__git_find_on_cmdline "$subcommands save")" - if [ -n "$(__git_find_on_cmdline "-p")" ]; then + if [ -z "$subcommand" -a -n "$(__git_find_on_cmdline "-p")" ]; then subcommand="push" fi if [ -z "$subcommand" ]; then @@ -2666,7 +3045,7 @@ _git_submodule () { __git_has_doubledash && return - local subcommands="add status init deinit update set-branch summary foreach sync absorbgitdirs" + local subcommands="add status init deinit update set-branch set-url summary foreach sync absorbgitdirs" local subcommand="$(__git_find_on_cmdline "$subcommands")" if [ -z "$subcommand" ]; then case "$cur" in @@ -2730,6 +3109,7 @@ _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=" @@ -2851,33 +3231,83 @@ _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="$(__git_find_on_cmdline "$subcommands")" - if [ -z "$subcommand" ]; then + local subcommand subcommand_idx + + subcommand="$(__git_find_on_cmdline --show-idx "$subcommands")" + subcommand_idx="${subcommand% *}" + subcommand="${subcommand#* }" + + case "$subcommand,$cur" in + ,*) __gitcomp "$subcommands" - else - case "$subcommand,$cur" in - add,--*) - __gitcomp_builtin worktree_add - ;; - list,--*) - __gitcomp_builtin worktree_list - ;; - lock,--*) - __gitcomp_builtin worktree_lock - ;; - prune,--*) - __gitcomp_builtin worktree_prune - ;; - remove,--*) - __gitcomp "--force" + ;; + *,--*) + __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 ;; - *) + -*) # 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 ;; esac - fi + ;; + 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 } __git_complete_common () { @@ -2949,14 +3379,18 @@ __git_main () ((c++)) done - if [ -z "$command" ]; then + if [ -z "${command-}" ]; then case "$prev" in --git-dir|-C|--work-tree) # these need a path argument, let's fall back to # Bash filename completion return ;; - -c|--namespace) + -c) + __git_complete_config_variable_name_and_value + return + ;; + --namespace) # we don't support completing these options' arguments return ;; @@ -2980,7 +3414,7 @@ __git_main () " ;; *) - if test -n "$GIT_TESTING_PORCELAIN_COMMAND_LIST" + if test -n "${GIT_TESTING_PORCELAIN_COMMAND_LIST-}" then __gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST" else diff --git a/third_party/git/contrib/completion/git-completion.zsh b/third_party/git/contrib/completion/git-completion.zsh index 886bf95d1f..ce47e86b60 100644 --- a/third_party/git/contrib/completion/git-completion.zsh +++ b/third_party/git/contrib/completion/git-completion.zsh @@ -11,8 +11,9 @@ # # zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh # -# The recommended way to install this script is to copy to '~/.zsh/_git', and -# then add the following to your ~/.zshrc file: +# 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: # # fpath=(~/.zsh $fpath) @@ -149,9 +150,11 @@ __git_zsh_cmd_common () push:'update remote refs along with associated objects' rebase:'forward-port local commits to the updated upstream head' reset:'reset current HEAD to the specified state' + restore:'restore working tree files' rm:'remove files from the working tree and from the index' show:'show various types of objects' status:'show the working tree status' + switch:'switch branches' tag:'create, list, delete or verify a tag object signed with GPG') _describe -t common-commands 'common commands' list && _ret=0 } diff --git a/third_party/git/contrib/completion/git-prompt.sh b/third_party/git/contrib/completion/git-prompt.sh index 1d510cd47b..16260bab73 100644 --- a/third_party/git/contrib/completion/git-prompt.sh +++ b/third_party/git/contrib/completion/git-prompt.sh @@ -70,6 +70,15 @@ # state symbols by setting GIT_PS1_STATESEPARATOR. The default separator # is SP. # +# When there is an in-progress operation such as a merge, rebase, +# revert, cherry-pick, or bisect, the prompt will include information +# related to the operation, often in the form "|<OPERATION-NAME>". +# +# When the repository has a sparse-checkout, a notification of the form +# "|SPARSE" will be included in the prompt. This can be shortened to a +# single '?' character by setting GIT_PS1_COMPRESSSPARSESTATE, or omitted +# by setting GIT_PS1_OMITSPARSESTATE. +# # By default, __git_ps1 will compare HEAD to your SVN upstream if it can # find one, or @{upstream} otherwise. Once you have set # GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by @@ -421,6 +430,13 @@ __git_ps1 () return $exit fi + local sparse="" + if [ -z "${GIT_PS1_COMPRESSSPARSESTATE}" ] && + [ -z "${GIT_PS1_OMITSPARSESTATE}" ] && + [ "$(git config --bool core.sparseCheckout)" = "true" ]; then + sparse="|SPARSE" + fi + local r="" local b="" local step="" @@ -429,11 +445,7 @@ __git_ps1 () __git_eread "$g/rebase-merge/head-name" b __git_eread "$g/rebase-merge/msgnum" step __git_eread "$g/rebase-merge/end" total - if [ -f "$g/rebase-merge/interactive" ]; then - r="|REBASE-i" - else - r="|REBASE-m" - fi + r="|REBASE" else if [ -d "$g/rebase-apply" ]; then __git_eread "$g/rebase-apply/next" step @@ -496,6 +508,7 @@ __git_ps1 () local i="" local s="" local u="" + local h="" local c="" local p="" @@ -528,6 +541,11 @@ __git_ps1 () u="%${ZSH_VERSION+%}" fi + if [ -n "${GIT_PS1_COMPRESSSPARSESTATE}" ] && + [ "$(git config --bool core.sparseCheckout)" = "true" ]; then + h="?" + fi + if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then __git_ps1_show_upstream fi @@ -546,8 +564,8 @@ __git_ps1 () b="\${__git_ps1_branch_name}" fi - local f="$w$i$s$u" - local gitstring="$c$b${f:+$z$f}$r$p" + local f="$h$w$i$s$u" + local gitstring="$c$b${f:+$z$f}${sparse}$r$p" if [ $pcmode = yes ]; then if [ "${__git_printf_supports_v-}" != yes ]; then diff --git a/third_party/git/contrib/credential/netrc/.gitignore b/third_party/git/contrib/credential/netrc/.gitignore new file mode 100644 index 0000000000..d41cdde84b --- /dev/null +++ b/third_party/git/contrib/credential/netrc/.gitignore @@ -0,0 +1 @@ +git-credential-netrc diff --git a/third_party/git/contrib/credential/netrc/Makefile b/third_party/git/contrib/credential/netrc/Makefile index 6174e3bb83..c284fb8ac4 100644 --- a/third_party/git/contrib/credential/netrc/Makefile +++ b/third_party/git/contrib/credential/netrc/Makefile @@ -1,8 +1,30 @@ # The default target of this Makefile is... all:: -test: +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 ./t-git-credential-netrc.sh -testverbose: +testverbose: build ./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 b/third_party/git/contrib/credential/netrc/git-credential-netrc.perl index ebfc123ec6..bc57cc6588 100755 --- a/third_party/git/contrib/credential/netrc/git-credential-netrc +++ b/third_party/git/contrib/credential/netrc/git-credential-netrc.perl @@ -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->repository()->config('gpg.program') + $options->{'gpg'} //= Git::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 7440aa1c46..376f577737 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 @@ -112,7 +112,7 @@ sub handle_line { # Since we can receive arbitrary input, there's no optimal # place to flush. Flushing on a blank line is a heuristic that # happens to match git-log output. - if (!length) { + if (/^$/) { $flush_cb->(); } } diff --git a/third_party/git/contrib/fast-import/import-tars.perl b/third_party/git/contrib/fast-import/import-tars.perl index e800d9f5c9..d50ce26d5d 100755 --- a/third_party/git/contrib/fast-import/import-tars.perl +++ b/third_party/git/contrib/fast-import/import-tars.perl @@ -139,6 +139,8 @@ foreach my $tar_file (@ARGV) print FI "\n"; } + next if ($typeflag eq 'g'); # ignore global header + my $path; if ($prefix) { $path = "$prefix/$name"; 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 de3f81667e..7eb1b24cc7 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 not hgvers.has_key("0"): - print 'creating repository' +if "0" not in hgvers: + print('creating repository') os.system('git init') # loop through every hg changeset for cset in range(int(tip) + 1): # incremental, already seen - if hgvers.has_key(str(cset)): + if str(cset) in hgvers: 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 8823399e75..f563be82fc 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 outputing with the default encoding. If it fails, + # Try outputting 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 acces to the ssl layer + # with access 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 certificat is not verified (smtp) ***\n' + '*** Warning, the server certificate 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 descripition of the project.""" + """Return a one-line description 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 b9bb11834e..0f98c5a23d 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 instanciating the +# configuration in .git/config (must come before instantiating 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 8747b84334..ff565eb3d8 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) # - # Get's us to something pretty safe (apart from the small time + # Gets 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 d18b317b2f..0092d67b8a 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 abbrevations are: +The opcode abbreviations 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 158958d363..b7333267ad 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 readabilty. +# return value would be harmful to the code readability. # 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-mw.perl b/third_party/git/contrib/mw-to-git/git-mw.perl index 28df3ee321..eb52a53d32 100755 --- a/third_party/git/contrib/mw-to-git/git-mw.perl +++ b/third_party/git/contrib/mw-to-git/git-mw.perl @@ -6,7 +6,7 @@ # License: GPL v2 or later # Set of tools for git repo with a mediawiki remote. -# Documentation & bugtracker: https://github.com/moy/Git-Mediawiki/ +# Documentation & bugtracker: https://github.com/Git-Mediawiki/Git-Mediawiki use strict; use warnings; 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 af9cbc9d0f..a5624413dc 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 @@ -9,7 +9,7 @@ # License: GPL v2 or later # Gateway between Git and MediaWiki. -# Documentation & bugtracker: https://github.com/moy/Git-Mediawiki/ +# Documentation & bugtracker: https://github.com/Git-Mediawiki/Git-Mediawiki use strict; use MediaWiki::API; @@ -56,38 +56,38 @@ my $url = $ARGV[1]; # Accept both space-separated and multiple keys in config file. # Spaces should be written as _ anyway because we'll use chomp. -my @tracked_pages = split(/[ \n]/, run_git("config --get-all remote.${remotename}.pages")); +my @tracked_pages = split(/[ \n]/, run_git_quoted(["config", "--get-all", "remote.${remotename}.pages"])); chomp(@tracked_pages); # Just like @tracked_pages, but for MediaWiki categories. -my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories")); +my @tracked_categories = split(/[ \n]/, run_git_quoted(["config", "--get-all", "remote.${remotename}.categories"])); chomp(@tracked_categories); # Just like @tracked_categories, but for MediaWiki namespaces. -my @tracked_namespaces = split(/[ \n]/, run_git("config --get-all remote.${remotename}.namespaces")); +my @tracked_namespaces = split(/[ \n]/, run_git_quoted(["config", "--get-all", "remote.${remotename}.namespaces"])); for (@tracked_namespaces) { s/_/ /g; } chomp(@tracked_namespaces); # Import media files on pull -my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport"); +my $import_media = run_git_quoted(["config", "--get", "--bool", "remote.${remotename}.mediaimport"]); chomp($import_media); $import_media = ($import_media eq 'true'); # Export media files on push -my $export_media = run_git("config --get --bool remote.${remotename}.mediaexport"); +my $export_media = run_git_quoted(["config", "--get", "--bool", "remote.${remotename}.mediaexport"]); chomp($export_media); $export_media = !($export_media eq 'false'); -my $wiki_login = run_git("config --get remote.${remotename}.mwLogin"); -# 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"); +my $wiki_login = run_git_quoted(["config", "--get", "remote.${remotename}.mwLogin"]); +# Note: mwPassword is discouraged. Use the credential system instead. +my $wiki_passwd = run_git_quoted(["config", "--get", "remote.${remotename}.mwPassword"]); +my $wiki_domain = run_git_quoted(["config", "--get", "remote.${remotename}.mwDomain"]); chomp($wiki_login); chomp($wiki_passwd); chomp($wiki_domain); # Import only last revisions (both for clone and fetch) -my $shallow_import = run_git("config --get --bool remote.${remotename}.shallow"); +my $shallow_import = run_git_quoted(["config", "--get", "--bool", "remote.${remotename}.shallow"]); chomp($shallow_import); $shallow_import = ($shallow_import eq 'true'); @@ -97,9 +97,9 @@ $shallow_import = ($shallow_import eq 'true'); # Possible values: # - by_rev: perform one query per new revision on the remote wiki # - by_page: query each tracked page for new revision -my $fetch_strategy = run_git("config --get remote.${remotename}.fetchStrategy"); +my $fetch_strategy = run_git_quoted(["config", "--get", "remote.${remotename}.fetchStrategy"]); if (!$fetch_strategy) { - $fetch_strategy = run_git('config --get mediawiki.fetchStrategy'); + $fetch_strategy = run_git_quoted(["config", "--get", "mediawiki.fetchStrategy"]); } chomp($fetch_strategy); if (!$fetch_strategy) { @@ -123,9 +123,9 @@ my %basetimestamps; # will get the history with information lost). If the import is # deterministic, this means everybody gets the same sha1 for each # MediaWiki revision. -my $dumb_push = run_git("config --get --bool remote.${remotename}.dumbPush"); +my $dumb_push = run_git_quoted(["config", "--get", "--bool", "remote.${remotename}.dumbPush"]); if (!$dumb_push) { - $dumb_push = run_git('config --get --bool mediawiki.dumbPush'); + $dumb_push = run_git_quoted(["config", "--get", "--bool", "mediawiki.dumbPush"]); } chomp($dumb_push); $dumb_push = ($dumb_push eq 'true'); @@ -369,12 +369,14 @@ sub get_mw_pages { return %pages; } -# usage: $out = run_git("command args"); -# $out = run_git("command args", "raw"); # don't interpret output as UTF-8. -sub run_git { +# usage: $out = run_git_quoted(["command", "args", ...]); +# $out = run_git_quoted(["command", "args", ...], "raw"); # don't interpret output as UTF-8. +# $out = run_git_quoted_nostderr(["command", "args", ...]); # discard stderr +# $out = run_git_quoted_nostderr(["command", "args", ...], "raw"); # ditto but raw instead of UTF-8 as above +sub _run_git { my $args = shift; my $encoding = (shift || 'encoding(UTF-8)'); - open(my $git, "-|:${encoding}", "git ${args}") + open(my $git, "-|:${encoding}", @$args) or die "Unable to fork: $!\n"; my $res = do { local $/ = undef; @@ -385,6 +387,13 @@ sub run_git { return $res; } +sub run_git_quoted { + _run_git(["git", @{$_[0]}], $_[1]); +} + +sub run_git_quoted_nostderr { + _run_git(['sh', '-c', 'git "$@" 2>/dev/null', '--', @{$_[0]}], $_[1]); +} sub get_all_mediafiles { my $pages = shift; @@ -511,8 +520,9 @@ sub download_mw_mediafile { } sub get_last_local_revision { - # Get note regarding last mediawiki revision - my $note = run_git("notes --ref=${remotename}/mediawiki show refs/mediawiki/${remotename}/master 2>/dev/null"); + # Get note regarding last mediawiki revision. + my $note = run_git_quoted_nostderr(["notes", "--ref=${remotename}/mediawiki", + "show", "refs/mediawiki/${remotename}/master"]); my @note_info = split(/ /, $note); my $lastrevision_number; @@ -807,7 +817,10 @@ sub get_more_refs { sub mw_import { # multiple import commands can follow each other. my @refs = (shift, get_more_refs('import')); + my $processedRefs; foreach my $ref (@refs) { + next if $processedRefs->{$ref}; # skip duplicates: "import refs/heads/master" being issued twice; TODO: why? + $processedRefs->{$ref} = 1; mw_import_ref($ref); } print {*STDOUT} "done\n"; @@ -970,7 +983,7 @@ sub mw_import_revids { } sub error_non_fast_forward { - my $advice = run_git('config --bool advice.pushNonFastForward'); + my $advice = run_git_quoted(["config", "--bool", "advice.pushNonFastForward"]); chomp($advice); if ($advice ne 'false') { # Native git-push would show this after the summary. @@ -1014,7 +1027,7 @@ sub mw_upload_file { } } else { # Don't let perl try to interpret file content as UTF-8 => use "raw" - my $content = run_git("cat-file blob ${new_sha1}", 'raw'); + my $content = run_git_quoted(["cat-file", "blob", $new_sha1], 'raw'); if ($content ne EMPTY) { $mediawiki = connect_maybe($mediawiki, $remotename, $url); $mediawiki->{config}->{upload_url} = @@ -1084,7 +1097,7 @@ sub mw_push_file { # with this content instead: $file_content = DELETED_CONTENT; } else { - $file_content = run_git("cat-file blob ${new_sha1}"); + $file_content = run_git_quoted(["cat-file", "blob", $new_sha1]); } $mediawiki = connect_maybe($mediawiki, $remotename, $url); @@ -1174,10 +1187,10 @@ sub mw_push_revision { my $mw_revision = $last_remote_revid; # Get sha1 of commit pointed by local HEAD - my $HEAD_sha1 = run_git("rev-parse ${local} 2>/dev/null"); + my $HEAD_sha1 = run_git_quoted_nostderr(["rev-parse", $local]); chomp($HEAD_sha1); # Get sha1 of commit pointed by remotes/$remotename/master - my $remoteorigin_sha1 = run_git("rev-parse refs/remotes/${remotename}/master 2>/dev/null"); + my $remoteorigin_sha1 = run_git_quoted_nostderr(["rev-parse", "refs/remotes/${remotename}/master"]); chomp($remoteorigin_sha1); if ($last_local_revid > 0 && @@ -1197,7 +1210,7 @@ sub mw_push_revision { my $parsed_sha1 = $remoteorigin_sha1; # Find a path from last MediaWiki commit to pushed commit print {*STDERR} "Computing path from local to remote ...\n"; - my @local_ancestry = split(/\n/, run_git("rev-list --boundary --parents ${local} ^${parsed_sha1}")); + my @local_ancestry = split(/\n/, run_git_quoted(["rev-list", "--boundary", "--parents", $local, "^${parsed_sha1}"])); my %local_ancestry; foreach my $line (@local_ancestry) { if (my ($child, $parents) = $line =~ /^-?([a-f0-9]+) ([a-f0-9 ]+)/) { @@ -1221,7 +1234,7 @@ sub mw_push_revision { # No remote mediawiki revision. Export the whole # history (linearized with --first-parent) print {*STDERR} "Warning: no common ancestor, pushing complete history\n"; - my $history = run_git("rev-list --first-parent --children ${local}"); + my $history = run_git_quoted(["rev-list", "--first-parent", "--children", $local]); my @history = split(/\n/, $history); @history = @history[1..$#history]; foreach my $line (reverse @history) { @@ -1233,12 +1246,12 @@ sub mw_push_revision { foreach my $commit_info_split (@commit_pairs) { my $sha1_child = @{$commit_info_split}[0]; my $sha1_commit = @{$commit_info_split}[1]; - my $diff_infos = run_git("diff-tree -r --raw -z ${sha1_child} ${sha1_commit}"); + my $diff_infos = run_git_quoted(["diff-tree", "-r", "--raw", "-z", $sha1_child, $sha1_commit]); # TODO: we could detect rename, and encode them with a #redirect on the wiki. # TODO: for now, it's just a delete+add my @diff_info_list = split(/\0/, $diff_infos); # Keep the subject line of the commit message as mediawiki comment for the revision - my $commit_msg = run_git(qq(log --no-walk --format="%s" ${sha1_commit})); + my $commit_msg = run_git_quoted(["log", "--no-walk", '--format="%s"', $sha1_commit]); chomp($commit_msg); # Push every blob while (@diff_info_list) { @@ -1263,7 +1276,10 @@ sub mw_push_revision { } } if (!$dumb_push) { - run_git(qq(notes --ref=${remotename}/mediawiki add -f -m "mediawiki_revision: ${mw_revision}" ${sha1_commit})); + run_git_quoted(["notes", "--ref=${remotename}/mediawiki", + "add", "-f", "-m", + "mediawiki_revision: ${mw_revision}", + $sha1_commit]); } } @@ -1304,7 +1320,7 @@ sub get_mw_namespace_id { # already cached. Namespaces are stored in form: # "Name_of_namespace:Id_namespace", ex.: "File:6". my @temp = split(/\n/, - run_git("config --get-all remote.${remotename}.namespaceCache")); + run_git_quoted(["config", "--get-all", "remote.${remotename}.namespaceCache"])); chomp(@temp); foreach my $ns (@temp) { my ($n, $id) = split(/:/, $ns); @@ -1358,7 +1374,7 @@ sub get_mw_namespace_id { # Store explicitly requested namespaces on disk if (!exists $cached_mw_namespace_id{$name}) { - run_git(qq(config --add remote.${remotename}.namespaceCache "${name}:${store_id}")); + run_git_quoted(["config", "--add", "remote.${remotename}.namespaceCache", "${name}:${store_id}"]); $cached_mw_namespace_id{$name} = 1; } return $id; diff --git a/third_party/git/contrib/mw-to-git/git-remote-mediawiki.txt b/third_party/git/contrib/mw-to-git/git-remote-mediawiki.txt index 23b7ef9f62..5da825f61e 100644 --- a/third_party/git/contrib/mw-to-git/git-remote-mediawiki.txt +++ b/third_party/git/contrib/mw-to-git/git-remote-mediawiki.txt @@ -4,4 +4,4 @@ objects from mediawiki just as one would do with a classic git repository thanks to remote-helpers. For more information, visit the wiki at -https://github.com/moy/Git-Mediawiki/wiki +https://github.com/Git-Mediawiki/Git-Mediawiki diff --git a/third_party/git/contrib/mw-to-git/t/.gitignore b/third_party/git/contrib/mw-to-git/t/.gitignore index a7a40b4964..2b8dc30c6d 100644 --- a/third_party/git/contrib/mw-to-git/t/.gitignore +++ b/third_party/git/contrib/mw-to-git/t/.gitignore @@ -1,4 +1,4 @@ WEB/ -wiki/ +mediawiki/ trash directory.t*/ test-results/ diff --git a/third_party/git/contrib/mw-to-git/t/README b/third_party/git/contrib/mw-to-git/t/README index 2ee34be7e4..72c4889db7 100644 --- a/third_party/git/contrib/mw-to-git/t/README +++ b/third_party/git/contrib/mw-to-git/t/README @@ -14,11 +14,11 @@ install the following packages (Debian/Ubuntu names, may need to be adapted for another distribution): * lighttpd -* php5 -* php5-cgi -* php5-cli -* php5-curl -* php5-sqlite +* php +* php-cgi +* php-cli +* php-curl +* php-sqlite Principles and Technical Choices -------------------------------- diff --git a/third_party/git/contrib/mw-to-git/t/install-wiki/.gitignore b/third_party/git/contrib/mw-to-git/t/install-wiki/.gitignore deleted file mode 100644 index b5a2a4408c..0000000000 --- a/third_party/git/contrib/mw-to-git/t/install-wiki/.gitignore +++ /dev/null @@ -1 +0,0 @@ -wikidb.sqlite diff --git a/third_party/git/contrib/mw-to-git/t/install-wiki/LocalSettings.php b/third_party/git/contrib/mw-to-git/t/install-wiki/LocalSettings.php deleted file mode 100644 index 745e47e881..0000000000 --- a/third_party/git/contrib/mw-to-git/t/install-wiki/LocalSettings.php +++ /dev/null @@ -1,129 +0,0 @@ -<?php -# This file was automatically generated by the MediaWiki 1.19.0 -# installer. If you make manual changes, please keep track in case you -# need to recreate them later. -# -# See includes/DefaultSettings.php for all configurable settings -# and their default values, but don't forget to make changes in _this_ -# file, not there. -# -# Further documentation for configuration settings may be found at: -# http://www.mediawiki.org/wiki/Manual:Configuration_settings - -# Protect against web entry -if ( !defined( 'MEDIAWIKI' ) ) { - exit; -} - -## Uncomment this to disable output compression -# $wgDisableOutputCompression = true; - -$wgSitename = "Git-MediaWiki-Test"; -$wgMetaNamespace = "Git-MediaWiki-Test"; - -## The URL base path to the directory containing the wiki; -## defaults for all runtime URL paths are based off of this. -## For more information on customizing the URLs please see: -## http://www.mediawiki.org/wiki/Manual:Short_URL -$wgScriptPath = "@WG_SCRIPT_PATH@"; -$wgScriptExtension = ".php"; - -## The protocol and server name to use in fully-qualified URLs -$wgServer = "@WG_SERVER@"; - -## The relative URL path to the skins directory -$wgStylePath = "$wgScriptPath/skins"; - -## The relative URL path to the logo. Make sure you change this from the default, -## or else you'll overwrite your logo when you upgrade! -$wgLogo = "$wgStylePath/common/images/wiki.png"; - -## UPO means: this is also a user preference option - -$wgEnableEmail = true; -$wgEnableUserEmail = true; # UPO - -$wgEmergencyContact = "apache@localhost"; -$wgPasswordSender = "apache@localhost"; - -$wgEnotifUserTalk = false; # UPO -$wgEnotifWatchlist = false; # UPO -$wgEmailAuthentication = true; - -## Database settings -$wgDBtype = "sqlite"; -$wgDBserver = ""; -$wgDBname = "@WG_SQLITE_DATAFILE@"; -$wgDBuser = ""; -$wgDBpassword = ""; - -# SQLite-specific settings -$wgSQLiteDataDir = "@WG_SQLITE_DATADIR@"; - - -## Shared memory settings -$wgMainCacheType = CACHE_NONE; -$wgMemCachedServers = array(); - -## To enable image uploads, make sure the 'images' directory -## is writable, then set this to true: -$wgEnableUploads = true; -$wgUseImageMagick = true; -$wgImageMagickConvertCommand ="@CONVERT@"; -$wgFileExtensions[] = 'txt'; - -# InstantCommons allows wiki to use images from http://commons.wikimedia.org -$wgUseInstantCommons = false; - -## If you use ImageMagick (or any other shell command) on a -## Linux server, this will need to be set to the name of an -## available UTF-8 locale -$wgShellLocale = "en_US.utf8"; - -## If you want to use image uploads under safe mode, -## create the directories images/archive, images/thumb and -## images/temp, and make them all writable. Then uncomment -## this, if it's not already uncommented: -#$wgHashedUploadDirectory = false; - -## Set $wgCacheDirectory to a writable directory on the web server -## to make your wiki go slightly faster. The directory should not -## be publicly accessible from the web. -#$wgCacheDirectory = "$IP/cache"; - -# Site language code, should be one of the list in ./languages/Names.php -$wgLanguageCode = "en"; - -$wgSecretKey = "1c912bfe3519fb70f5dc523ecc698111cd43d81a11c585b3eefb28f29c2699b7"; -#$wgSecretKey = "@SECRETKEY@"; - - -# Site upgrade key. Must be set to a string (default provided) to turn on the -# web installer while LocalSettings.php is in place -$wgUpgradeKey = "ddae7dc87cd0a645"; - -## Default skin: you can change the default skin. Use the internal symbolic -## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook', 'vector': -$wgDefaultSkin = "vector"; - -## For attaching licensing metadata to pages, and displaying an -## appropriate copyright notice / icon. GNU Free Documentation -## License and Creative Commons licenses are supported so far. -$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright -$wgRightsUrl = ""; -$wgRightsText = ""; -$wgRightsIcon = ""; - -# Path to the GNU diff3 utility. Used for conflict resolution. -$wgDiff3 = "/usr/bin/diff3"; - -# Query string length limit for ResourceLoader. You should only set this if -# your web server has a query string length limit (then set it to that limit), -# or if you have suhosin.get.max_value_length set in php.ini (then set it to -# that value) -$wgResourceLoaderMaxQueryLength = -1; - - - -# End of automatically generated settings. -# Add more configuration options below. 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 deleted file mode 100644 index 0f3f4e018a..0000000000 --- a/third_party/git/contrib/mw-to-git/t/install-wiki/db_install.php +++ /dev/null @@ -1,120 +0,0 @@ -<?php -/** - * This script generates a SQLite database for a MediaWiki version 1.19.0 - * You must specify the login of the admin (argument 1) and its - * password (argument 2) and the folder where the database file - * is located (absolute path in argument 3). - * It is used by the script install-wiki.sh in order to make easy the - * installation of a MediaWiki. - * - * In order to generate a SQLite database file, MediaWiki ask the user - * to submit some forms in its web browser. This script simulates this - * behavior though the functions <get> and <submit> - * - */ -$argc = $_SERVER['argc']; -$argv = $_SERVER['argv']; - -$login = $argv[2]; -$pass = $argv[3]; -$tmp = $argv[4]; -$port = $argv[5]; - -$url = 'http://localhost:'.$port.'/wiki/mw-config/index.php'; -$db_dir = urlencode($tmp); -$tmp_cookie = tempnam($tmp, "COOKIE_"); -/* - * Fetchs a page with cURL. - */ -function get($page_name = "") { - $curl = curl_init(); - $page_name_add = ""; - if ($page_name != "") { - $page_name_add = '?page='.$page_name; - } - $url = $GLOBALS['url'].$page_name_add; - $tmp_cookie = $GLOBALS['tmp_cookie']; - curl_setopt($curl, CURLOPT_COOKIEJAR, $tmp_cookie); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($curl, CURLOPT_COOKIEFILE, $tmp_cookie); - curl_setopt($curl, CURLOPT_HEADER, true); - curl_setopt($curl, CURLOPT_URL, $url); - - $page = curl_exec($curl); - if (!$page) { - die("Could not get page: $url\n"); - } - curl_close($curl); - return $page; -} - -/* - * Submits a form with cURL. - */ -function submit($page_name, $option = "") { - $curl = curl_init(); - $datapost = 'submit-continue=Continue+%E2%86%92'; - if ($option != "") { - $datapost = $option.'&'.$datapost; - } - $url = $GLOBALS['url'].'?page='.$page_name; - $tmp_cookie = $GLOBALS['tmp_cookie']; - curl_setopt($curl, CURLOPT_URL, $url); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $datapost); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); - curl_setopt($curl, CURLOPT_COOKIEJAR, $tmp_cookie); - curl_setopt($curl, CURLOPT_COOKIEFILE, $tmp_cookie); - - $page = curl_exec($curl); - if (!$page) { - die("Could not get page: $url\n"); - } - curl_close($curl); - return "$page"; -} - -/* - * Here starts this script: simulates the behavior of the user - * submitting forms to generates the database file. - * Note this simulation was made for the MediaWiki version 1.19.0, - * we can't assume it works with other versions. - * - */ - -$page = get(); -if (!preg_match('/input type="hidden" value="([0-9]+)" name="LanguageRequestTime"/', - $page, $matches)) { - echo "Unexpected content for page downloaded:\n"; - echo "$page"; - die; -}; -$timestamp = $matches[1]; -$language = "LanguageRequestTime=$timestamp&uselang=en&ContLang=en"; -$page = submit('Language', $language); - -submit('Welcome'); - -$db_config = 'DBType=sqlite'; -$db_config = $db_config.'&sqlite_wgSQLiteDataDir='.$db_dir; -$db_config = $db_config.'&sqlite_wgDBname='.$argv[1]; -submit('DBConnect', $db_config); - -$wiki_config = 'config_wgSitename=TEST'; -$wiki_config = $wiki_config.'&config__NamespaceType=site-name'; -$wiki_config = $wiki_config.'&config_wgMetaNamespace=MyWiki'; -$wiki_config = $wiki_config.'&config__AdminName='.$login; - -$wiki_config = $wiki_config.'&config__AdminPassword='.$pass; -$wiki_config = $wiki_config.'&config__AdminPassword2='.$pass; - -$wiki_config = $wiki_config.'&wiki__configEmail=email%40email.org'; -$wiki_config = $wiki_config.'&config__SkipOptional=skip'; -submit('Name', $wiki_config); -submit('Install'); -submit('Install'); - -unlink($tmp_cookie); -?> 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 cfbfe7ddf6..4c39bda7bf 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 @@ -28,7 +28,7 @@ test_expect_success 'Git clone creates the expected git log with one file' ' git log --format=%s HEAD^..HEAD >log.tmp ) && echo "this must be the same" >msg.tmp && - diff -b mw_dir_1/log.tmp msg.tmp + test_cmp msg.tmp mw_dir_1/log.tmp ' @@ -50,8 +50,8 @@ test_expect_success 'Git clone creates the expected git log with multiple files' echo "this must be the same" >>msgDaddy.tmp && echo "identical too" >msgDj.tmp && echo "identical" >>msgDj.tmp && - diff -b mw_dir_2/logDaddy.tmp msgDaddy.tmp && - diff -b mw_dir_2/logDj.tmp msgDj.tmp + test_cmp msgDaddy.tmp mw_dir_2/logDaddy.tmp && + test_cmp msgDj.tmp mw_dir_2/logDj.tmp ' @@ -135,7 +135,7 @@ test_expect_success 'Git clone works with one specific page cloned ' ' cd mw_dir_8 && echo "this log must stay" >msg.tmp && git log --format=%s >log.tmp && - diff -b msg.tmp log.tmp + test_cmp msg.tmp log.tmp ) && wiki_check_content mw_dir_8/Namnam.mw Namnam ' @@ -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 disapear" false && + wiki_editpage bar "I will not disappear" 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/t9363-mw-to-git-export-import.sh b/third_party/git/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh index 3ff3a09567..6187ec67fa 100755 --- a/third_party/git/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh +++ b/third_party/git/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh @@ -27,12 +27,12 @@ test_git_reimport () { # Don't bother with permissions, be administrator by default test_expect_success 'setup config' ' - git config --global remote.origin.mwLogin WikiAdmin && - git config --global remote.origin.mwPassword AdminPass && + git config --global remote.origin.mwLogin "$WIKI_ADMIN" && + git config --global remote.origin.mwPassword "$WIKI_PASSW" && test_might_fail git config --global --unset remote.origin.mediaImport ' -test_expect_success 'git push can upload media (File:) files' ' +test_expect_failure 'git push can upload media (File:) files' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir && ( @@ -48,13 +48,14 @@ test_expect_success 'git push can upload media (File:) files' ' ) ' -test_expect_success 'git clone works on previously created wiki with media files' ' +test_expect_failure 'git clone works on previously created wiki with media files' ' test_when_finished "rm -rf mw_dir mw_dir_clone" && git clone -c remote.origin.mediaimport=true \ mediawiki::'"$WIKI_URL"' mw_dir_clone && test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt && (cd mw_dir_clone && git checkout HEAD^) && (cd mw_dir && git checkout HEAD^) && + test_path_is_file mw_dir_clone/Foo.txt && test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt ' 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 6546294f15..64e46c1671 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 @@ -13,7 +13,8 @@ . ./test.config -WIKI_URL=http://"$SERVER_ADDR:$PORT/$WIKI_DIR_NAME" +WIKI_BASE_URL=http://$SERVER_ADDR:$PORT +WIKI_URL=$WIKI_BASE_URL/$WIKI_DIR_NAME CURR_DIR=$(pwd) TEST_OUTPUT_DIRECTORY=$(pwd) TEST_DIRECTORY="$CURR_DIR"/../../../t @@ -65,7 +66,7 @@ test_check_precond () { GIT_EXEC_PATH=$(cd "$(dirname "$0")" && cd "../.." && pwd) PATH="$GIT_EXEC_PATH"'/bin-wrapper:'"$PATH" - if [ ! -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" ]; + if ! test -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" then skip_all='skipping gateway git-mw tests, no mediawiki found' test_done @@ -279,7 +280,7 @@ start_lighttpd () { "$LIGHTTPD_DIR"/lighttpd -f "$WEB"/lighttpd.conf if test $? -ne 0 ; then - echo "Could not execute http deamon lighttpd" + echo "Could not execute http daemon lighttpd" exit 1 fi } @@ -291,27 +292,59 @@ stop_lighttpd () { test -f "$WEB_TMP/pid" && kill $(cat "$WEB_TMP/pid") } -# Create the SQLite database of the MediaWiki. If the database file already -# exists, it will be deleted. -# This script should be runned from the directory where $FILES_FOLDER is -# located. -create_db () { - rm -f "$TMP/$DB_FILE" - - echo "Generating the SQLite database file. It can take some time ..." - # Run the php script to generate the SQLite database file - # with cURL calls. - php "$FILES_FOLDER/$DB_INSTALL_SCRIPT" $(basename "$DB_FILE" .sqlite) \ - "$WIKI_ADMIN" "$WIKI_PASSW" "$TMP" "$PORT" - - if [ ! -f "$TMP/$DB_FILE" ] ; then - error "Can't create database file $TMP/$DB_FILE. Try to run ./install-wiki.sh delete first." +wiki_delete_db () { + rm -rf \ + "$FILES_FOLDER_DB"/* || error "Couldn't delete $FILES_FOLDER_DB/" +} + +wiki_delete_db_backup () { + rm -rf \ + "$FILES_FOLDER_POST_INSTALL_DB"/* || error "Couldn't delete $FILES_FOLDER_POST_INSTALL_DB/" +} + +# Install MediaWiki using its install.php script. If the database file +# already exists, it will be deleted. +install_mediawiki () { + + localsettings="$WIKI_DIR_INST/$WIKI_DIR_NAME/LocalSettings.php" + if test -f "$localsettings" + then + error "We already installed the wiki, since $localsettings exists" \ + "perhaps you wanted to run 'delete' first?" fi - # Copy the generated database file into the directory the - # user indicated. - cp "$TMP/$DB_FILE" "$FILES_FOLDER" || - error "Unable to copy $TMP/$DB_FILE to $FILES_FOLDER" + wiki_delete_db + wiki_delete_db_backup + mkdir \ + "$FILES_FOLDER_DB/" \ + "$FILES_FOLDER_POST_INSTALL_DB/" + + install_script="$WIKI_DIR_INST/$WIKI_DIR_NAME/maintenance/install.php" + echo "Installing MediaWiki using $install_script. This may take some time ..." + + php "$WIKI_DIR_INST/$WIKI_DIR_NAME/maintenance/install.php" \ + --server $WIKI_BASE_URL \ + --scriptpath /wiki \ + --lang en \ + --dbtype sqlite \ + --dbpath $PWD/$FILES_FOLDER_DB/ \ + --pass "$WIKI_PASSW" \ + Git-MediaWiki-Test \ + "$WIKI_ADMIN" || + error "Couldn't run $install_script, see errors above. Try to run ./install-wiki.sh delete first." + cat <<-'EOF' >>$localsettings +# Custom settings added by test-gitmw-lib.sh +# +# Uploading text files is needed for +# t9363-mw-to-git-export-import.sh +$wgEnableUploads = true; +$wgFileExtensions[] = 'txt'; +EOF + + # Copy the initially generated database file into our backup + # folder + cp -R "$FILES_FOLDER_DB/"* "$FILES_FOLDER_POST_INSTALL_DB/" || + error "Unable to copy $FILES_FOLDER_DB/* to $FILES_FOLDER_POST_INSTALL_DB/*" } # Install a wiki in your web server directory. @@ -320,30 +353,33 @@ wiki_install () { start_lighttpd fi - SERVER_ADDR=$SERVER_ADDR:$PORT # In this part, we change directory to $TMP in order to download, # unpack and copy the files of MediaWiki ( mkdir -p "$WIKI_DIR_INST/$WIKI_DIR_NAME" - if [ ! -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" ] ; then + if ! test -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" + then error "Folder $WIKI_DIR_INST/$WIKI_DIR_NAME doesn't exist. Please create it and launch the script again." fi - # Fetch MediaWiki's archive if not already present in the TMP directory + # Fetch MediaWiki's archive if not already present in the + # download directory + mkdir -p "$FILES_FOLDER_DOWNLOAD" MW_FILENAME="mediawiki-$MW_VERSION_MAJOR.$MW_VERSION_MINOR.tar.gz" - cd "$TMP" - if [ ! -f $MW_FILENAME ] ; then + cd "$FILES_FOLDER_DOWNLOAD" + if ! test -f $MW_FILENAME + then echo "Downloading $MW_VERSION_MAJOR.$MW_VERSION_MINOR sources ..." wget "http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/$MW_FILENAME" || error "Unable to download "\ "http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/"\ "$MW_FILENAME. "\ "Please fix your connection and launch the script again." - echo "$MW_FILENAME downloaded in $(pwd). "\ - "You can delete it later if you want." + echo "$MW_FILENAME downloaded in $(pwd)/;" \ + "you can delete it later if you want." else - echo "Reusing existing $MW_FILENAME downloaded in $(pwd)." + echo "Reusing existing $MW_FILENAME downloaded in $(pwd)/" fi archive_abs_path=$(pwd)/$MW_FILENAME cd "$WIKI_DIR_INST/$WIKI_DIR_NAME/" || @@ -352,48 +388,12 @@ wiki_install () { error "Unable to extract WikiMedia's files from $archive_abs_path to "\ "$WIKI_DIR_INST/$WIKI_DIR_NAME" ) || exit 1 + echo Extracted in "$WIKI_DIR_INST/$WIKI_DIR_NAME" - create_db - - # Copy the generic LocalSettings.php in the web server's directory - # And modify parameters according to the ones set at the top - # of this script. - # Note that LocalSettings.php is never modified. - if [ ! -f "$FILES_FOLDER/LocalSettings.php" ] ; then - error "Can't find $FILES_FOLDER/LocalSettings.php " \ - "in the current folder. "\ - "Please run the script inside its folder." - fi - cp "$FILES_FOLDER/LocalSettings.php" \ - "$FILES_FOLDER/LocalSettings-tmp.php" || - error "Unable to copy $FILES_FOLDER/LocalSettings.php " \ - "to $FILES_FOLDER/LocalSettings-tmp.php" - - # Parse and set the LocalSettings file of the user according to the - # CONFIGURATION VARIABLES section at the beginning of this script - file_swap="$FILES_FOLDER/LocalSettings-swap.php" - sed "s,@WG_SCRIPT_PATH@,/$WIKI_DIR_NAME," \ - "$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap" - mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php" - sed "s,@WG_SERVER@,http://$SERVER_ADDR," \ - "$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap" - mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php" - sed "s,@WG_SQLITE_DATADIR@,$TMP," \ - "$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap" - mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php" - sed "s,@WG_SQLITE_DATAFILE@,$( basename $DB_FILE .sqlite)," \ - "$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap" - mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php" - - mv "$FILES_FOLDER/LocalSettings-tmp.php" \ - "$WIKI_DIR_INST/$WIKI_DIR_NAME/LocalSettings.php" || - error "Unable to move $FILES_FOLDER/LocalSettings-tmp.php" \ - "in $WIKI_DIR_INST/$WIKI_DIR_NAME" - echo "File $FILES_FOLDER/LocalSettings.php is set in" \ - " $WIKI_DIR_INST/$WIKI_DIR_NAME" + install_mediawiki echo "Your wiki has been installed. You can check it at - http://$SERVER_ADDR/$WIKI_DIR_NAME" + $WIKI_URL" } # Reset the database of the wiki and the password of the admin @@ -401,12 +401,18 @@ wiki_install () { # Warning: This function must be called only in a subdirectory of t/ directory wiki_reset () { # Copy initial database of the wiki - if [ ! -f "../$FILES_FOLDER/$DB_FILE" ] ; then - error "Can't find ../$FILES_FOLDER/$DB_FILE in the current folder." + if ! test -d "../$FILES_FOLDER_DB" + then + error "No wiki database at ../$FILES_FOLDER_DB, not installed yet?" + fi + if ! test -d "../$FILES_FOLDER_POST_INSTALL_DB" + then + error "No wiki backup database at ../$FILES_FOLDER_POST_INSTALL_DB, failed installation?" fi - cp "../$FILES_FOLDER/$DB_FILE" "$TMP" || - error "Can't copy ../$FILES_FOLDER/$DB_FILE in $TMP" - echo "File $FILES_FOLDER/$DB_FILE is set in $TMP" + wiki_delete_db + cp -R "../$FILES_FOLDER_POST_INSTALL_DB/"* "../$FILES_FOLDER_DB/" || + error "Can't copy ../$FILES_FOLDER_POST_INSTALL_DB/* to ../$FILES_FOLDER_DB/*" + echo "File $FILES_FOLDER_DB/* has been reset" } # Delete the wiki created in the web server's directory and all its content @@ -420,13 +426,7 @@ wiki_delete () { rm -rf "$WIKI_DIR_INST/$WIKI_DIR_NAME" || error "Wiki's directory $WIKI_DIR_INST/" \ "$WIKI_DIR_NAME could not be deleted" - # Delete the wiki's SQLite database. - rm -f "$TMP/$DB_FILE" || - error "Database $TMP/$DB_FILE could not be deleted." fi - - # Delete the wiki's SQLite database - rm -f "$TMP/$DB_FILE" || error "Database $TMP/$DB_FILE could not be deleted." - rm -f "$FILES_FOLDER/$DB_FILE" - rm -rf "$TMP/mediawiki-$MW_VERSION_MAJOR.$MW_VERSION_MINOR.tar.gz" + wiki_delete_db + wiki_delete_db_backup } diff --git a/third_party/git/contrib/mw-to-git/t/test-gitmw.pl b/third_party/git/contrib/mw-to-git/t/test-gitmw.pl index 0ff76259fa..c5d687f078 100755 --- a/third_party/git/contrib/mw-to-git/t/test-gitmw.pl +++ b/third_party/git/contrib/mw-to-git/t/test-gitmw.pl @@ -24,9 +24,7 @@ use MediaWiki::API; use Getopt::Long; -use encoding 'utf8'; use DateTime::Format::ISO8601; -use open ':encoding(utf8)'; use constant SLASH_REPLACEMENT => "%2F"; #Parsing of the config file @@ -87,7 +85,7 @@ sub wiki_getpage { # Replace spaces by underscore in the page name $pagename =~ s/ /_/g; $pagename =~ s/\//%2F/g; - open(my $file, ">$destdir/$pagename.mw"); + open(my $file, ">:encoding(UTF-8)", "$destdir/$pagename.mw"); print $file "$content"; close ($file); @@ -172,7 +170,7 @@ sub wiki_getallpagename { cmlimit => 500 }, ) || die $mw->{error}->{code}.": ".$mw->{error}->{details}; - open(my $file, ">all.txt"); + open(my $file, ">:encoding(UTF-8)", "all.txt"); foreach my $page (@{$mw_pages}) { print $file "$page->{title}\n"; } @@ -185,7 +183,7 @@ sub wiki_getallpagename { aplimit => 500, }) || die $mw->{error}->{code}.": ".$mw->{error}->{details}; - open(my $file, ">all.txt"); + open(my $file, ">:encoding(UTF-8)", "all.txt"); foreach my $page (@{$mw_pages}) { print $file "$page->{title}\n"; } @@ -214,12 +212,12 @@ my $fct_to_call = shift; wiki_login($wiki_admin, $wiki_admin_pass); -my %functions_to_call = qw( - upload_file wiki_upload_file - get_page wiki_getpage - delete_page wiki_delete_page - edit_page wiki_editpage - getallpagename wiki_getallpagename +my %functions_to_call = ( + upload_file => \&wiki_upload_file, + get_page => \&wiki_getpage, + delete_page => \&wiki_delete_page, + edit_page => \&wiki_editpage, + getallpagename => \&wiki_getallpagename, ); die "$0 ERROR: wrong argument" unless exists $functions_to_call{$fct_to_call}; -&{$functions_to_call{$fct_to_call}}(@ARGV); +$functions_to_call{$fct_to_call}->(map { utf8::decode($_); $_ } @ARGV); diff --git a/third_party/git/contrib/mw-to-git/t/test.config b/third_party/git/contrib/mw-to-git/t/test.config index 5ba0684162..ed10b3e4a4 100644 --- a/third_party/git/contrib/mw-to-git/t/test.config +++ b/third_party/git/contrib/mw-to-git/t/test.config @@ -3,15 +3,11 @@ WIKI_DIR_NAME=wiki # Login and password of the wiki's admin WIKI_ADMIN=WikiAdmin -WIKI_PASSW=AdminPass +WIKI_PASSW=AdminPass1 # Address of the web server SERVER_ADDR=localhost -# SQLite database of the wiki, named DB_FILE, is located in TMP -TMP=/tmp -DB_FILE=wikidb.sqlite - # If LIGHTTPD is not set to true, the script will use the default # web server running in WIKI_DIR_INST. WIKI_DIR_INST=/var/www @@ -28,10 +24,17 @@ WEB=WEB WEB_TMP=$WEB/tmp WEB_WWW=$WEB/www +# Where our configuration for the wiki is located +FILES_FOLDER=mediawiki +FILES_FOLDER_DOWNLOAD=$FILES_FOLDER/download +FILES_FOLDER_DB=$FILES_FOLDER/db +FILES_FOLDER_POST_INSTALL_DB=$FILES_FOLDER/post-install-db + # The variables below are used by the script to install a wiki. # You should not modify these unless you are modifying the script itself. -# tested versions: 1.19.X -> 1.21.1 -MW_VERSION_MAJOR=1.21 -MW_VERSION_MINOR=1 -FILES_FOLDER=install-wiki -DB_INSTALL_SCRIPT=db_install.php +# tested versions: 1.19.X -> 1.21.1 -> 1.34.2 +# +# See https://www.mediawiki.org/wiki/Download for what the latest +# version is. +MW_VERSION_MAJOR=1.34 +MW_VERSION_MINOR=2 diff --git a/third_party/git/contrib/subtree/Makefile b/third_party/git/contrib/subtree/Makefile index 6906aae441..6fa7496bfd 100644 --- a/third_party/git/contrib/subtree/Makefile +++ b/third_party/git/contrib/subtree/Makefile @@ -25,14 +25,16 @@ ASCIIDOC_HTML = xhtml11 ASCIIDOC_DOCBOOK = docbook ASCIIDOC_EXTRA = XMLTO = xmlto +XMLTO_EXTRA = ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor ASCIIDOC_CONF = ASCIIDOC_HTML = xhtml5 -ASCIIDOC_DOCBOOK = docbook45 +ASCIIDOC_DOCBOOK = docbook ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' +XMLTO_EXTRA += --skip-validation endif ifndef SHELL_PATH @@ -78,7 +80,7 @@ install-html: $(GIT_SUBTREE_HTML) $(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir) $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML) - $(XMLTO) -m $(MANPAGE_XSL) man $^ + $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^ $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT) $(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \ diff --git a/third_party/git/contrib/subtree/git-subtree.txt b/third_party/git/contrib/subtree/git-subtree.txt index 352deda69d..0db02fe3c0 100644 --- a/third_party/git/contrib/subtree/git-subtree.txt +++ b/third_party/git/contrib/subtree/git-subtree.txt @@ -139,12 +139,12 @@ OPTIONS -m <message>:: --message=<message>:: - This option is only valid for add, merge and pull (unsure). + This option is only valid for add, merge, pull, and split --rejoin. Specify <message> as the commit message for the merge commit. -OPTIONS FOR add, merge, push, pull ----------------------------------- +OPTIONS FOR add, merge, and pull +-------------------------------- --squash:: This option is only valid for add, merge, and pull commands. diff --git a/third_party/git/contrib/svn-fe/.gitignore b/third_party/git/contrib/svn-fe/.gitignore deleted file mode 100644 index 02a7791585..0000000000 --- a/third_party/git/contrib/svn-fe/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/*.xml -/*.1 -/*.html -/svn-fe diff --git a/third_party/git/contrib/svn-fe/Makefile b/third_party/git/contrib/svn-fe/Makefile deleted file mode 100644 index e8651aaf4b..0000000000 --- a/third_party/git/contrib/svn-fe/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -all:: svn-fe$X - -CC = cc -RM = rm -f -MV = mv - -CFLAGS = -g -O2 -Wall -LDFLAGS = -EXTLIBS = -lz - -include ../../config.mak.uname --include ../../config.mak.autogen --include ../../config.mak - -ifeq ($(uname_S),Darwin) - ifndef NO_FINK - ifeq ($(shell test -d /sw/lib && echo y),y) - CFLAGS += -I/sw/include - LDFLAGS += -L/sw/lib - endif - endif - ifndef NO_DARWIN_PORTS - ifeq ($(shell test -d /opt/local/lib && echo y),y) - CFLAGS += -I/opt/local/include - LDFLAGS += -L/opt/local/lib - endif - endif -endif - -ifndef NO_OPENSSL - EXTLIBS += -lssl - ifdef NEEDS_CRYPTO_WITH_SSL - EXTLIBS += -lcrypto - endif -endif - -ifndef NO_PTHREADS - CFLAGS += $(PTHREADS_CFLAGS) - EXTLIBS += $(PTHREAD_LIBS) -endif - -ifdef HAVE_CLOCK_GETTIME - CFLAGS += -DHAVE_CLOCK_GETTIME - EXTLIBS += -lrt -endif - -ifdef NEEDS_LIBICONV - EXTLIBS += -liconv -endif - -GIT_LIB = ../../libgit.a -VCSSVN_LIB = ../../vcs-svn/lib.a -XDIFF_LIB = ../../xdiff/lib.a - -LIBS = $(VCSSVN_LIB) $(GIT_LIB) $(XDIFF_LIB) - -QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir -QUIET_SUBDIR1 = - -ifneq ($(findstring $(MAKEFLAGS),w),w) -PRINT_DIR = --no-print-directory -else # "make -w" -NO_SUBDIR = : -endif - -ifneq ($(findstring $(MAKEFLAGS),s),s) -ifndef V - QUIET_CC = @echo ' ' CC $@; - QUIET_LINK = @echo ' ' LINK $@; - QUIET_SUBDIR0 = +@subdir= - QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ - $(MAKE) $(PRINT_DIR) -C $$subdir -endif -endif - -svn-fe$X: svn-fe.o $(VCSSVN_LIB) $(XDIFF_LIB) $(GIT_LIB) - $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(EXTLIBS) -o $@ svn-fe.o $(LIBS) - -svn-fe.o: svn-fe.c ../../vcs-svn/svndump.h - $(QUIET_CC)$(CC) $(CFLAGS) -I../../vcs-svn -o $*.o -c $< - -svn-fe.html: svn-fe.txt - $(QUIET_SUBDIR0)../../Documentation $(QUIET_SUBDIR1) \ - MAN_TXT=../contrib/svn-fe/svn-fe.txt \ - ../contrib/svn-fe/$@ - -svn-fe.1: svn-fe.txt - $(QUIET_SUBDIR0)../../Documentation $(QUIET_SUBDIR1) \ - MAN_TXT=../contrib/svn-fe/svn-fe.txt \ - ../contrib/svn-fe/$@ - $(MV) ../../Documentation/svn-fe.1 . - -../../vcs-svn/lib.a: FORCE - $(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) vcs-svn/lib.a - -../../xdiff/lib.a: FORCE - $(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) xdiff/lib.a - -../../libgit.a: FORCE - $(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) libgit.a - -clean: - $(RM) svn-fe$X svn-fe.o svn-fe.html svn-fe.xml svn-fe.1 - -.PHONY: all clean FORCE diff --git a/third_party/git/contrib/svn-fe/svn-fe.c b/third_party/git/contrib/svn-fe/svn-fe.c deleted file mode 100644 index f363505abb..0000000000 --- a/third_party/git/contrib/svn-fe/svn-fe.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * This file is in the public domain. - * You may freely use, modify, distribute, and relicense it. - */ - -#include <stdlib.h> -#include "svndump.h" - -int main(int argc, char **argv) -{ - if (svndump_init(NULL)) - return 1; - svndump_read((argc > 1) ? argv[1] : NULL, "refs/heads/master", - "refs/notes/svn/revs"); - svndump_deinit(); - svndump_reset(); - return 0; -} diff --git a/third_party/git/contrib/svn-fe/svn-fe.txt b/third_party/git/contrib/svn-fe/svn-fe.txt deleted file mode 100644 index a3425f4770..0000000000 --- a/third_party/git/contrib/svn-fe/svn-fe.txt +++ /dev/null @@ -1,71 +0,0 @@ -svn-fe(1) -========= - -NAME ----- -svn-fe - convert an SVN "dumpfile" to a fast-import stream - -SYNOPSIS --------- -[verse] -mkfifo backchannel && -svnadmin dump --deltas REPO | - svn-fe [url] 3<backchannel | - git fast-import --cat-blob-fd=3 3>backchannel - -DESCRIPTION ------------ - -Converts a Subversion dumpfile into input suitable for -git-fast-import(1) and similar importers. REPO is a path to a -Subversion repository mirrored on the local disk. Remote Subversion -repositories can be mirrored on local disk using the `svnsync` -command. - -Note: this tool is very young. The details of its commandline -interface may change in backward incompatible ways. - -INPUT FORMAT ------------- -Subversion's repository dump format is documented in full in -`notes/dump-load-format.txt` from the Subversion source tree. -Files in this format can be generated using the 'svnadmin dump' or -'svk admin dump' command. - -OUTPUT FORMAT -------------- -The fast-import format is documented by the git-fast-import(1) -manual page. - -NOTES ------ -Subversion dumps do not record a separate author and committer for -each revision, nor do they record a separate display name and email -address for each author. Like git-svn(1), 'svn-fe' will use the name - ---------- -user <user@UUID> ---------- - -as committer, where 'user' is the value of the `svn:author` property -and 'UUID' the repository's identifier. - -To support incremental imports, 'svn-fe' puts a `git-svn-id` line at -the end of each commit log message if passed a URL on the command -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-branch --subdirectory-filter' command -may be useful for this purpose. - -BUGS ----- -Empty directories and unknown properties are silently discarded. - -The exit status does not reflect whether an error was detected. - -SEE ALSO --------- -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 deleted file mode 100755 index 11ac6f6927..0000000000 --- a/third_party/git/contrib/svn-fe/svnrdump_sim.py +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/python -""" -Simulates svnrdump by replaying an existing dump from a file, taking care -of the specified revision range. -To simulate incremental imports the environment variable SVNRMAX can be set -to the highest revision that should be available. -""" -import sys -import os - -if sys.hexversion < 0x02040000: - # The limiter is the ValueError() calls. This may be too conservative - sys.stderr.write("svnrdump-sim.py: requires Python 2.4 or later.\n") - sys.exit(1) - - -def getrevlimit(): - var = 'SVNRMAX' - if var in os.environ: - return os.environ[var] - return None - - -def writedump(url, lower, upper): - if url.startswith('sim://'): - filename = url[6:] - if filename[-1] == '/': - filename = filename[:-1] # remove terminating slash - else: - raise ValueError('sim:// url required') - f = open(filename, 'r') - state = 'header' - wroterev = False - while(True): - l = f.readline() - if l == '': - break - if state == 'header' and l.startswith('Revision-number: '): - state = 'prefix' - if state == 'prefix' and l == 'Revision-number: %s\n' % lower: - state = 'selection' - if not upper == 'HEAD' and state == 'selection' and \ - l == 'Revision-number: %s\n' % upper: - break - - if state == 'header' or state == 'selection': - if state == 'selection': - wroterev = True - sys.stdout.write(l) - return wroterev - -if __name__ == "__main__": - if not (len(sys.argv) in (3, 4, 5)): - print("usage: %s dump URL -rLOWER:UPPER") - sys.exit(1) - if not sys.argv[1] == 'dump': - 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': - r = sys.argv[3][2:].lstrip().split(':') - if not getrevlimit() is None: - r[1] = getrevlimit() - if writedump(url, r[0], r[1]): - ret = 0 - else: - ret = 1 - sys.exit(ret) diff --git a/third_party/git/convert.c b/third_party/git/convert.c index 94ff837649..ee360c2f07 100644 --- a/third_party/git/convert.c +++ b/third_party/git/convert.c @@ -8,6 +8,7 @@ #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. @@ -194,7 +195,7 @@ static enum eol output_eol(enum crlf_action crlf_action) return core_eol; } -static void check_global_conv_flags_eol(const char *path, enum crlf_action crlf_action, +static void check_global_conv_flags_eol(const char *path, struct text_stat *old_stats, struct text_stat *new_stats, int conv_flags) { @@ -269,8 +270,12 @@ 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 (istarts_with(enc, "UTF")) { + if (skip_iprefix(enc, "UTF", &stripped)) { + skip_prefix(stripped, "-", &stripped); + /* * Check for detectable errors in UTF encodings */ @@ -284,15 +289,10 @@ 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."); - 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); + int stripped_len = strlen(stripped) - strlen("BE"); + advise(advise_msg, path, stripped_len, stripped); if (die_on_error) die(error_msg, path, enc); else { @@ -307,12 +307,7 @@ 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 { @@ -417,7 +412,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 reencode to the original encoding. This + * we would try to re-encode 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. */ @@ -552,7 +547,7 @@ static int crlf_to_git(const struct index_state *istate, new_stats.crlf += new_stats.lonelf; new_stats.lonelf = 0; } - check_global_conv_flags_eol(path, crlf_action, &stats, &new_stats, conv_flags); + check_global_conv_flags_eol(path, &stats, &new_stats, conv_flags); } if (!convert_crlf_into_lf) return 0; @@ -643,7 +638,6 @@ static int filter_buffer_or_fd(int in, int out, void *data) struct child_process child_process = CHILD_PROCESS_INIT; struct filter_params *params = (struct filter_params *)data; int write_err, status; - const char *argv[] = { NULL, NULL }; /* apply % substitution to cmd */ struct strbuf cmd = STRBUF_INIT; @@ -661,9 +655,7 @@ static int filter_buffer_or_fd(int in, int out, void *data) strbuf_expand(&cmd, params->cmd, strbuf_expand_dict_cb, &dict); strbuf_release(&path); - argv[0] = cmd.buf; - - child_process.argv = argv; + strvec_push(&child_process.args, cmd.buf); child_process.use_shell = 1; child_process.in = -1; child_process.out = out; @@ -802,6 +794,7 @@ static void handle_filter_error(const struct strbuf *filter_status, static int apply_multi_file_filter(const char *path, const char *src, size_t len, int fd, struct strbuf *dst, const char *cmd, const unsigned int wanted_capability, + const struct checkout_metadata *meta, struct delayed_checkout *dco) { int err; @@ -860,6 +853,24 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len if (err) goto done; + if (meta && meta->refname) { + err = packet_write_fmt_gently(process->in, "ref=%s\n", meta->refname); + if (err) + goto done; + } + + if (meta && !is_null_oid(&meta->treeish)) { + err = packet_write_fmt_gently(process->in, "treeish=%s\n", oid_to_hex(&meta->treeish)); + if (err) + goto done; + } + + if (meta && !is_null_oid(&meta->blob)) { + err = packet_write_fmt_gently(process->in, "blob=%s\n", oid_to_hex(&meta->blob)); + if (err) + goto done; + } + if ((entry->supported_capabilities & CAP_DELAY) && dco && dco->state == CE_CAN_DELAY) { can_delay = 1; @@ -976,6 +987,7 @@ static struct convert_driver { static int apply_filter(const char *path, const char *src, size_t len, int fd, struct strbuf *dst, struct convert_driver *drv, const unsigned int wanted_capability, + const struct checkout_metadata *meta, struct delayed_checkout *dco) { const char *cmd = NULL; @@ -995,7 +1007,7 @@ static int apply_filter(const char *path, const char *src, size_t len, return apply_single_file_filter(path, src, len, fd, dst, cmd); else if (drv->process && *drv->process) return apply_multi_file_filter(path, src, len, fd, dst, - drv->process, wanted_capability, dco); + drv->process, wanted_capability, meta, dco); return 0; } @@ -1003,7 +1015,7 @@ static int apply_filter(const char *path, const char *src, size_t len, static int read_convert_config(const char *var, const char *value, void *cb) { const char *key, *name; - int namelen; + size_t namelen; struct convert_driver *drv; /* @@ -1151,7 +1163,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(src, len, "blob", &oid); + hash_object_file(the_hash_algo, src, len, "blob", &oid); strbuf_grow(buf, len + cnt * (the_hash_algo->hexsz + 3)); for (;;) { @@ -1293,10 +1305,11 @@ 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) { @@ -1339,6 +1352,23 @@ 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; @@ -1355,7 +1385,7 @@ int would_convert_to_git_filter_fd(const struct index_state *istate, const char if (!ca.drv->required) return 0; - return apply_filter(path, NULL, 0, -1, NULL, ca.drv, CAP_CLEAN, NULL); + return apply_filter(path, NULL, 0, -1, NULL, ca.drv, CAP_CLEAN, NULL, NULL); } const char *get_convert_attr_ascii(const struct index_state *istate, const char *path) @@ -1393,7 +1423,7 @@ int convert_to_git(const struct index_state *istate, convert_attrs(istate, &ca, path); - ret |= apply_filter(path, src, len, -1, dst, ca.drv, CAP_CLEAN, NULL); + ret |= apply_filter(path, src, len, -1, dst, ca.drv, CAP_CLEAN, NULL, NULL); if (!ret && ca.drv && ca.drv->required) die(_("%s: clean filter '%s' failed"), path, ca.drv->name); @@ -1428,7 +1458,7 @@ void convert_to_git_filter_fd(const struct index_state *istate, assert(ca.drv); assert(ca.drv->clean || ca.drv->process); - if (!apply_filter(path, NULL, 0, fd, dst, ca.drv, CAP_CLEAN, NULL)) + if (!apply_filter(path, NULL, 0, fd, dst, ca.drv, CAP_CLEAN, NULL, NULL)) die(_("%s: clean filter '%s' failed"), path, ca.drv->name); encode_to_git(path, dst->buf, dst->len, dst, ca.working_tree_encoding, conv_flags); @@ -1439,7 +1469,9 @@ void convert_to_git_filter_fd(const struct index_state *istate, static int convert_to_working_tree_internal(const struct index_state *istate, const char *path, const char *src, size_t len, struct strbuf *dst, - int normalizing, struct delayed_checkout *dco) + int normalizing, + const struct checkout_metadata *meta, + struct delayed_checkout *dco) { int ret = 0, ret_filter = 0; struct conv_attrs ca; @@ -1471,7 +1503,7 @@ static int convert_to_working_tree_internal(const struct index_state *istate, } ret_filter = apply_filter( - path, src, len, -1, dst, ca.drv, CAP_SMUDGE, dco); + path, src, len, -1, dst, ca.drv, CAP_SMUDGE, meta, dco); if (!ret_filter && ca.drv && ca.drv->required) die(_("%s: smudge filter %s failed"), path, ca.drv->name); @@ -1481,22 +1513,24 @@ static int convert_to_working_tree_internal(const struct index_state *istate, int async_convert_to_working_tree(const struct index_state *istate, const char *path, const char *src, size_t len, struct strbuf *dst, + const struct checkout_metadata *meta, void *dco) { - return convert_to_working_tree_internal(istate, path, src, len, dst, 0, dco); + return convert_to_working_tree_internal(istate, path, src, len, dst, 0, meta, dco); } int convert_to_working_tree(const struct index_state *istate, const char *path, const char *src, - size_t len, struct strbuf *dst) + size_t len, struct strbuf *dst, + const struct checkout_metadata *meta) { - return convert_to_working_tree_internal(istate, path, src, len, dst, 0, NULL); + return convert_to_working_tree_internal(istate, path, src, len, dst, 0, meta, NULL); } int renormalize_buffer(const struct index_state *istate, const char *path, const char *src, size_t len, struct strbuf *dst) { - int ret = convert_to_working_tree_internal(istate, path, src, len, dst, 1, NULL); + int ret = convert_to_working_tree_internal(istate, path, src, len, dst, 1, NULL, NULL); if (ret) { src = dst->buf; len = dst->len; @@ -1927,7 +1961,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, smuge/clean or ident to a + * Note that you would be crazy to set CRLF, smudge/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, @@ -1969,3 +2003,25 @@ int stream_filter(struct stream_filter *filter, { return filter->vtbl->filter(filter, input, isize_p, output, osize_p); } + +void init_checkout_metadata(struct checkout_metadata *meta, const char *refname, + const struct object_id *treeish, + const struct object_id *blob) +{ + memset(meta, 0, sizeof(*meta)); + if (refname) + meta->refname = refname; + if (treeish) + oidcpy(&meta->treeish, treeish); + if (blob) + oidcpy(&meta->blob, blob); +} + +void clone_checkout_metadata(struct checkout_metadata *dst, + const struct checkout_metadata *src, + const struct object_id *blob) +{ + memcpy(dst, src, sizeof(*dst)); + if (blob) + oidcpy(&dst->blob, blob); +} diff --git a/third_party/git/convert.h b/third_party/git/convert.h index 831559f10d..e29d1026a6 100644 --- a/third_party/git/convert.h +++ b/third_party/git/convert.h @@ -4,10 +4,10 @@ #ifndef CONVERT_H #define CONVERT_H +#include "hash.h" #include "string-list.h" struct index_state; -struct object_id; struct strbuf; #define CONV_EOL_RNDTRP_DIE (1<<0) /* Die if CRLF to LF to CRLF is different */ @@ -57,6 +57,12 @@ struct delayed_checkout { struct string_list paths; }; +struct checkout_metadata { + const char *refname; + struct object_id treeish; + struct object_id blob; +}; + extern enum eol core_eol; extern char *check_roundtrip_encoding; const char *get_cached_convert_stats_ascii(const struct index_state *istate, @@ -71,10 +77,12 @@ int convert_to_git(const struct index_state *istate, struct strbuf *dst, int conv_flags); int convert_to_working_tree(const struct index_state *istate, const char *path, const char *src, - size_t len, struct strbuf *dst); + size_t len, struct strbuf *dst, + const struct checkout_metadata *meta); int async_convert_to_working_tree(const struct index_state *istate, const char *path, const char *src, size_t len, struct strbuf *dst, + const struct checkout_metadata *meta, void *dco); int async_query_available_blobs(const char *cmd, struct string_list *available_paths); @@ -94,6 +102,29 @@ 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); +/* + * Initialize the checkout metadata with the given values. Any argument may be + * NULL if it is not applicable. The treeish should be a commit if that is + * available, and a tree otherwise. + * + * The refname is not copied and must be valid for the lifetime of the struct. + * THe object IDs are copied. + */ +void init_checkout_metadata(struct checkout_metadata *meta, const char *refname, + const struct object_id *treeish, + const struct object_id *blob); + +/* Copy the metadata from src to dst, updating the blob. */ +void clone_checkout_metadata(struct checkout_metadata *dst, + const struct checkout_metadata *src, + const struct object_id *blob); + +/* + * 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.c b/third_party/git/credential.c index 62be651b03..e5202fbef2 100644 --- a/third_party/git/credential.c +++ b/third_party/git/credential.c @@ -6,6 +6,7 @@ #include "url.h" #include "prompt.h" #include "sigchain.h" +#include "urlmatch.h" void credential_init(struct credential *c) { @@ -36,11 +37,15 @@ int credential_match(const struct credential *want, #undef CHECK } + +static int credential_from_potentially_partial_url(struct credential *c, + const char *url); + static int credential_config_callback(const char *var, const char *value, void *data) { struct credential *c = data; - const char *key, *dot; + const char *key; if (!skip_prefix(var, "credential.", &key)) return 0; @@ -48,31 +53,16 @@ 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) + if (!c->username_from_proto) { + free(c->username); c->username = xstrdup(value); + } } else if (!strcmp(key, "usehttppath")) c->use_http_path = git_config_bool(var, value); @@ -87,11 +77,60 @@ 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 int match_partial_url(const char *url, void *cb) +{ + struct credential *c = cb; + struct credential want = CREDENTIAL_INIT; + int matches = 0; + + if (credential_from_potentially_partial_url(&want, url) < 0) + warning(_("skipping credential lookup for key: credential.%s"), + url); + else + matches = credential_match(&want, c); + credential_clear(&want); + + return matches; +} + 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; - git_config(credential_config_callback, c); + + config.section = "credential"; + config.key = NULL; + config.collect_fn = credential_config_callback; + config.cascade_fn = NULL; + config.select_fn = select_all; + config.fallback_match_fn = match_partial_url; + 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); + c->configured = 1; if (!c->use_http_path && proto_is_http(c->protocol)) { @@ -112,6 +151,23 @@ 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_ENCODE_SLASH); + strbuf_addch(out, '@'); + } + if (c->host) + strbuf_addstr(out, c->host); + if (c->path) { + strbuf_addch(out, '/'); + strbuf_add_percentencode(out, c->path, 0); + } +} + static char *credential_ask_one(const char *what, struct credential *c, int flags) { @@ -146,7 +202,7 @@ int credential_read(struct credential *c, FILE *fp) { struct strbuf line = STRBUF_INIT; - while (strbuf_getline_lf(&line, fp) != EOF) { + while (strbuf_getline(&line, fp) != EOF) { char *key = line.buf; char *value = strchr(key, '='); @@ -163,6 +219,7 @@ 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); @@ -191,20 +248,25 @@ int credential_read(struct credential *c, FILE *fp) return 0; } -static void credential_write_item(FILE *fp, const char *key, const char *value) +static void credential_write_item(FILE *fp, const char *key, const char *value, + int required) { + 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); - 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); + 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); } static int run_credential_helper(struct credential *c, @@ -212,11 +274,9 @@ static int run_credential_helper(struct credential *c, int want_output) { struct child_process helper = CHILD_PROCESS_INIT; - const char *argv[] = { NULL, NULL }; FILE *fp; - argv[0] = cmd; - helper.argv = argv; + strvec_push(&helper.args, cmd); helper.use_shell = 1; helper.in = -1; if (want_output) @@ -322,7 +382,45 @@ void credential_reject(struct credential *c) c->approved = 0; } -void credential_from_url(struct credential *c, const char *url) +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; +} + +/* + * Potentially-partial URLs can, but do not have to, contain + * + * - a protocol (or scheme) of the form "<protocol>://" + * + * - a host name (the part after the protocol and before the first slash after + * that, if any) + * + * - a user name and potentially a password (as "<user>[:<password>]@" part of + * the host name) + * + * - a path (the part after the host name, if any, starting with the slash) + * + * Missing parts will be left unset in `struct credential`. Thus, `https://` + * will have only the `protocol` set, `example.com` only the host name, and + * `/git` only the path. + * + * Note that an empty host name in an otherwise fully-qualified URL (e.g. + * `cert:///path/to/cert.pem`) will be treated as unset if we expect the URL to + * be potentially partial, and only then (otherwise, the empty string is used). + * + * The credential_from_url() function does not allow partial URLs. + */ +static int credential_from_url_1(struct credential *c, const char *url, + int allow_partial_url, int quiet) { const char *at, *colon, *cp, *slash, *host, *proto_end; @@ -335,12 +433,22 @@ void credential_from_url(struct credential *c, const char *url) * (3) proto://<user>:<pass>@<host>/... */ proto_end = strstr(url, "://"); - if (!proto_end) - return; - cp = proto_end + 3; + if (!allow_partial_url && (!proto_end || proto_end == url)) { + if (!quiet) + warning(_("url has no scheme: %s"), url); + return -1; + } + cp = proto_end ? proto_end + 3 : url; at = strchr(cp, '@'); colon = strchr(cp, ':'); - slash = strchrnul(cp, '/'); + + /* + * A query or fragment marker before the slash ends the host portion. + * We'll just continue to call this "slash" for simplicity. Notably our + * "trim leading slashes" part won't skip over this part of the path, + * but that's what we'd want. + */ + slash = cp + strcspn(cp, "/?#"); if (!at || slash <= at) { /* Case (1) */ @@ -349,17 +457,21 @@ void credential_from_url(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; } - if (proto_end - url > 0) + if (proto_end && proto_end - url > 0) c->protocol = xmemdupz(url, proto_end - url); - if (slash - host > 0) + if (!allow_partial_url || slash - host > 0) c->host = url_decode_mem(host, slash - host); /* Trim leading and trailing slashes from path */ while (*slash == '/') @@ -371,4 +483,30 @@ void credential_from_url(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; +} + +static int credential_from_potentially_partial_url(struct credential *c, + const char *url) +{ + return credential_from_url_1(c, url, 1, 0); +} + +int credential_from_url_gently(struct credential *c, const char *url, int quiet) +{ + return credential_from_url_1(c, url, 0, quiet); +} + +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 6b0cd16be2..c0e17e3554 100644 --- a/third_party/git/credential.h +++ b/third_party/git/credential.h @@ -3,12 +3,123 @@ #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; + use_http_path:1, + username_from_proto:1; char *username; char *password; @@ -19,17 +130,66 @@ 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 and the function will return an + * error (even in 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_match(const struct credential *have, - const struct credential *want); +int credential_from_url_gently(struct credential *, const char *url, int quiet); + +int credential_match(const struct credential *want, + const struct credential *have); #endif /* CREDENTIAL_H */ diff --git a/third_party/git/csum-file.c b/third_party/git/csum-file.c index 53ce37f7ca..0f35fa5ee4 100644 --- a/third_party/git/csum-file.c +++ b/third_party/git/csum-file.c @@ -157,7 +157,7 @@ void hashfile_checkpoint(struct hashfile *f, struct hashfile_checkpoint *checkpo { hashflush(f); checkpoint->offset = f->total; - checkpoint->ctx = f->ctx; + the_hash_algo->clone_fn(&checkpoint->ctx, &f->ctx); } int hashfile_truncate(struct hashfile *f, struct hashfile_checkpoint *checkpoint) diff --git a/third_party/git/csum-file.h b/third_party/git/csum-file.h index a98b1eee53..f9cbd317fb 100644 --- a/third_party/git/csum-file.h +++ b/third_party/git/csum-file.h @@ -42,6 +42,15 @@ 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 9d2e0d20ef..2ab7ea82eb 100644 --- a/third_party/git/daemon.c +++ b/third_party/git/daemon.c @@ -296,7 +296,7 @@ static const char *path_ok(const char *directory, struct hostinfo *hi) return NULL; /* Fallthrough. Deny by default */ } -typedef int (*daemon_service_fn)(const struct argv_array *env); +typedef int (*daemon_service_fn)(const struct strvec *env); struct daemon_service { const char *name; const char *config_name; @@ -377,7 +377,7 @@ error_return: } static int run_service(const char *dir, struct daemon_service *service, - struct hostinfo *hi, const struct argv_array *env) + struct hostinfo *hi, const struct strvec *env) { const char *path; int enabled = service->enabled; @@ -462,7 +462,7 @@ static void copy_to_log(int fd) static int run_service_command(struct child_process *cld) { - argv_array_push(&cld->args, "."); + strvec_push(&cld->args, "."); cld->git_cmd = 1; cld->err = -1; if (start_command(cld)) @@ -476,33 +476,33 @@ static int run_service_command(struct child_process *cld) return finish_command(cld); } -static int upload_pack(const struct argv_array *env) +static int upload_pack(const struct strvec *env) { struct child_process cld = CHILD_PROCESS_INIT; - argv_array_pushl(&cld.args, "upload-pack", "--strict", NULL); - argv_array_pushf(&cld.args, "--timeout=%u", timeout); + strvec_pushl(&cld.args, "upload-pack", "--strict", NULL); + strvec_pushf(&cld.args, "--timeout=%u", timeout); - argv_array_pushv(&cld.env_array, env->argv); + strvec_pushv(&cld.env_array, env->v); return run_service_command(&cld); } -static int upload_archive(const struct argv_array *env) +static int upload_archive(const struct strvec *env) { struct child_process cld = CHILD_PROCESS_INIT; - argv_array_push(&cld.args, "upload-archive"); + strvec_push(&cld.args, "upload-archive"); - argv_array_pushv(&cld.env_array, env->argv); + strvec_pushv(&cld.env_array, env->v); return run_service_command(&cld); } -static int receive_pack(const struct argv_array *env) +static int receive_pack(const struct strvec *env) { struct child_process cld = CHILD_PROCESS_INIT; - argv_array_push(&cld.args, "receive-pack"); + strvec_push(&cld.args, "receive-pack"); - argv_array_pushv(&cld.env_array, env->argv); + strvec_pushv(&cld.env_array, env->v); return run_service_command(&cld); } @@ -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 - * arguemnt, or 'extra_args' if there is no host arguemnt. + * argument, or 'extra_args' if there is no host argument. */ static char *parse_host_arg(struct hostinfo *hi, char *extra_args, int buflen) { @@ -633,7 +633,7 @@ static char *parse_host_arg(struct hostinfo *hi, char *extra_args, int buflen) return extra_args; } -static void parse_extra_args(struct hostinfo *hi, struct argv_array *env, +static void parse_extra_args(struct hostinfo *hi, struct strvec *env, char *extra_args, int buflen) { const char *end = extra_args + 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 specificly (like the 'host' arg) + * git-daemon needs to parse specifically (like the 'host' arg) * then it can be parsed here and not added to 'git_protocol'. */ if (*arg) { @@ -664,8 +664,8 @@ static void parse_extra_args(struct hostinfo *hi, struct argv_array *env, if (git_protocol.len > 0) { loginfo("Extended attribute \"protocol\": %s", git_protocol.buf); - argv_array_pushf(env, GIT_PROTOCOL_ENVIRONMENT "=%s", - git_protocol.buf); + strvec_pushf(env, GIT_PROTOCOL_ENVIRONMENT "=%s", + git_protocol.buf); } strbuf_release(&git_protocol); } @@ -761,7 +761,7 @@ static int execute(void) int pktlen, len, i; char *addr = getenv("REMOTE_ADDR"), *port = getenv("REMOTE_PORT"); struct hostinfo hi; - struct argv_array env = ARGV_ARRAY_INIT; + struct strvec env = STRVEC_INIT; hostinfo_init(&hi); @@ -794,13 +794,13 @@ static int execute(void) */ int rc = run_service(arg, s, &hi, &env); hostinfo_clear(&hi); - argv_array_clear(&env); + strvec_clear(&env); return rc; } } hostinfo_clear(&hi); - argv_array_clear(&env); + strvec_clear(&env); logerror("Protocol error: '%s'", line); return -1; } @@ -893,7 +893,7 @@ static void check_dead_children(void) cradle = &blanket->next; } -static struct argv_array cld_argv = ARGV_ARRAY_INIT; +static struct strvec cld_argv = STRVEC_INIT; static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen) { struct child_process cld = CHILD_PROCESS_INIT; @@ -913,21 +913,21 @@ static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen) char buf[128] = ""; struct sockaddr_in *sin_addr = (void *) addr; inet_ntop(addr->sa_family, &sin_addr->sin_addr, buf, sizeof(buf)); - argv_array_pushf(&cld.env_array, "REMOTE_ADDR=%s", buf); - argv_array_pushf(&cld.env_array, "REMOTE_PORT=%d", - ntohs(sin_addr->sin_port)); + strvec_pushf(&cld.env_array, "REMOTE_ADDR=%s", buf); + strvec_pushf(&cld.env_array, "REMOTE_PORT=%d", + ntohs(sin_addr->sin_port)); #ifndef NO_IPV6 } else if (addr->sa_family == AF_INET6) { char buf[128] = ""; struct sockaddr_in6 *sin6_addr = (void *) addr; inet_ntop(AF_INET6, &sin6_addr->sin6_addr, buf, sizeof(buf)); - argv_array_pushf(&cld.env_array, "REMOTE_ADDR=[%s]", buf); - argv_array_pushf(&cld.env_array, "REMOTE_PORT=%d", - ntohs(sin6_addr->sin6_port)); + strvec_pushf(&cld.env_array, "REMOTE_ADDR=[%s]", buf); + strvec_pushf(&cld.env_array, "REMOTE_PORT=%d", + ntohs(sin6_addr->sin6_port)); #endif } - cld.argv = cld_argv.argv; + cld.argv = cld_argv.v; cld.in = incoming; cld.out = dup(incoming); @@ -1476,10 +1476,10 @@ int cmd_main(int argc, const char **argv) write_file(pid_file, "%"PRIuMAX, (uintmax_t) getpid()); /* prepare argv for serving-processes */ - argv_array_push(&cld_argv, argv[0]); /* git-daemon */ - argv_array_push(&cld_argv, "--serve"); + strvec_push(&cld_argv, argv[0]); /* git-daemon */ + strvec_push(&cld_argv, "--serve"); for (i = 1; i < argc; ++i) - argv_array_push(&cld_argv, argv[i]); + strvec_push(&cld_argv, argv[i]); return serve(&listen_addr, listen_port, cred); } diff --git a/third_party/git/date.c b/third_party/git/date.c index 06340a77f3..40726b7e75 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) +static struct tm *time_to_tm(timestamp_t time, int tz, struct tm *tm) { time_t t = gm_time_t(time, tz); - return gmtime(&t); + return gmtime_r(&t, tm); } -static struct tm *time_to_tm_local(timestamp_t time) +static struct tm *time_to_tm_local(timestamp_t time, struct tm *tm) { time_t t = time; - return localtime(&t); + return localtime_r(&t, tm); } /* @@ -128,16 +128,17 @@ static void get_time(struct timeval *now) gettimeofday(now, NULL); } -void show_date_relative(timestamp_t time, - const struct timeval *now, - struct strbuf *timebuf) +void show_date_relative(timestamp_t time, struct strbuf *timebuf) { + struct timeval now; timestamp_t diff; - if (now->tv_sec < time) { + + get_time(&now); + 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); @@ -240,9 +241,7 @@ static void show_date_normal(struct strbuf *buf, timestamp_t time, struct tm *tm /* Show "today" times as just relative times */ if (hide.wday) { - struct timeval now; - get_time(&now); - show_date_relative(time, &now, buf); + show_date_relative(time, buf); return; } @@ -284,6 +283,7 @@ 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,20 +313,17 @@ 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); - get_time(&now); - show_date_relative(time, &now, &timebuf); + show_date_relative(time, &timebuf); return timebuf.buf; } if (mode->local) - tm = time_to_tm_local(time); + tm = time_to_tm_local(time, &tmbuf); else - tm = time_to_tm(time, tz); + tm = time_to_tm(time, tz, &tmbuf); if (!tm) { - tm = time_to_tm(0, 0); + tm = time_to_tm(0, 0, &tmbuf); tz = 0; } @@ -515,7 +512,7 @@ static int match_alpha(const char *date, struct tm *tm, int *offset) return skip_alpha(date); } -static int is_date(int year, int month, int day, struct tm *now_tm, time_t now, struct tm *tm) +static int set_date(int year, int month, int day, struct tm *now_tm, time_t now, struct tm *tm) { if (month > 0 && month < 13 && day > 0 && day < 32) { struct tm check = *tm; @@ -536,9 +533,9 @@ static int is_date(int year, int month, int day, struct tm *now_tm, time_t now, else if (year < 38) r->tm_year = year + 100; else - return 0; + return -1; if (!now_tm) - return 1; + return 0; specified = tm_to_time_t(r); @@ -547,14 +544,33 @@ static int is_date(int year, int month, int day, struct tm *now_tm, time_t now, * sure it is not later than ten days from now... */ if ((specified != -1) && (now + 10*24*3600 < specified)) - return 0; + return -1; tm->tm_mon = r->tm_mon; tm->tm_mday = r->tm_mday; if (year != -1) tm->tm_year = r->tm_year; - return 1; + return 0; } - return 0; + return -1; +} + +static int set_time(long hour, long minute, long second, struct tm *tm) +{ + /* We accept 61st second because of leap second */ + if (0 <= hour && hour <= 24 && + 0 <= minute && minute < 60 && + 0 <= second && second <= 60) { + tm->tm_hour = hour; + tm->tm_min = minute; + tm->tm_sec = second; + return 0; + } + return -1; +} + +static int is_date_known(struct tm *tm) +{ + return tm->tm_year != -1 && tm->tm_mon != -1 && tm->tm_mday != -1; } static int match_multi_number(timestamp_t num, char c, const char *date, @@ -574,10 +590,14 @@ static int match_multi_number(timestamp_t num, char c, const char *date, case ':': if (num3 < 0) num3 = 0; - if (num < 25 && num2 >= 0 && num2 < 60 && num3 >= 0 && num3 <= 60) { - tm->tm_hour = num; - tm->tm_min = num2; - tm->tm_sec = num3; + if (set_time(num, num2, num3, tm) == 0) { + /* + * If %H:%M:%S was just parsed followed by: .<num4> + * Consider (& discard) it as fractional second + * if %Y%m%d is parsed before. + */ + if (*end == '.' && isdigit(end[1]) && is_date_known(tm)) + strtol(end + 1, &end, 10); break; } return 0; @@ -593,10 +613,10 @@ static int match_multi_number(timestamp_t num, char c, const char *date, if (num > 70) { /* yyyy-mm-dd? */ - if (is_date(num, num2, num3, NULL, now, tm)) + if (set_date(num, num2, num3, NULL, now, tm) == 0) break; /* yyyy-dd-mm? */ - if (is_date(num, num3, num2, NULL, now, tm)) + if (set_date(num, num3, num2, NULL, now, tm) == 0) break; } /* Our eastern European friends say dd.mm.yy[yy] @@ -604,14 +624,14 @@ static int match_multi_number(timestamp_t num, char c, const char *date, * mm/dd/yy[yy] form only when separator is not '.' */ if (c != '.' && - is_date(num3, num, num2, refuse_future, now, tm)) + set_date(num3, num, num2, refuse_future, now, tm) == 0) break; /* European dd.mm.yy[yy] or funny US dd/mm/yy[yy] */ - if (is_date(num3, num2, num, refuse_future, now, tm)) + if (set_date(num3, num2, num, refuse_future, now, tm) == 0) break; /* Funny European mm.dd.yy */ if (c == '.' && - is_date(num3, num, num2, refuse_future, now, tm)) + set_date(num3, num, num2, refuse_future, now, tm) == 0) break; return 0; } @@ -682,6 +702,20 @@ static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt n++; } while (isdigit(date[n])); + /* 8 digits, compact style of ISO-8601's date: YYYYmmDD */ + /* 6 digits, compact style of ISO-8601's time: HHMMSS */ + if (n == 8 || n == 6) { + unsigned int num1 = num / 10000; + unsigned int num2 = (num % 10000) / 100; + unsigned int num3 = num % 100; + if (n == 8) + set_date(num1, num2, num3, NULL, time(NULL), tm); + else if (n == 6 && set_time(num1, num2, num3, tm) == 0 && + *end == '.' && isdigit(end[1])) + strtoul(end + 1, &end, 10); + return end - date; + } + /* Four-digit year or a timezone? */ if (n == 4) { if (num <= 1400 && *offset == -1) { @@ -980,10 +1014,11 @@ void datestamp(struct strbuf *out) { time_t now; int offset; + struct tm tm = { 0 }; time(&now); - offset = tm_to_time_t(localtime(&now)) - now; + offset = tm_to_time_t(localtime_r(&now, &tm)) - now; offset /= 60; date_string(now, offset, out); @@ -1305,15 +1340,18 @@ static timestamp_t approxidate_str(const char *date, return (timestamp_t)update_tm(&tm, &now, 0); } -timestamp_t approxidate_relative(const char *date, const struct timeval *tv) +timestamp_t approxidate_relative(const char *date) { + struct timeval tv; timestamp_t timestamp; int offset; int errors = 0; if (!parse_date_basic(date, ×tamp, &offset)) return timestamp; - return approxidate_str(date, tv, &errors); + + get_time(&tv); + return approxidate_str(date, (const struct timeval *) &tv, &errors); } timestamp_t approxidate_careful(const char *date, int *error_ret) diff --git a/third_party/git/default.nix b/third_party/git/default.nix index 10e47fea26..26ea911a59 100644 --- a/third_party/git/default.nix +++ b/third_party/git/default.nix @@ -5,7 +5,7 @@ with depot.third_party; (originals.git.overrideAttrs(_: { - version = "2.23.0"; + version = "2.29.2"; src = ./.; doInstallCheck = false; preConfigure = '' diff --git a/third_party/git/delta-islands.c b/third_party/git/delta-islands.c index 09dbd3cf72..aa98b2e541 100644 --- a/third_party/git/delta-islands.c +++ b/third_party/git/delta-islands.c @@ -17,7 +17,7 @@ #include "pack-bitmap.h" #include "pack-objects.h" #include "delta-islands.h" -#include "sha1-array.h" +#include "oid-array.h" #include "config.h" KHASH_INIT(str, const char *, void *, 1, kh_str_hash_func, kh_str_hash_equal) diff --git a/third_party/git/diff-delta.c b/third_party/git/diff-delta.c index e49643353b..77fea08dfb 100644 --- a/third_party/git/diff-delta.c +++ b/third_party/git/diff-delta.c @@ -326,6 +326,8 @@ 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-lib.c b/third_party/git/diff-lib.c index 61812f48c2..f95c6de75f 100644 --- a/third_party/git/diff-lib.c +++ b/third_party/git/diff-lib.c @@ -177,9 +177,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option) i--; if (revs->combine_merges && num_compare_stages == 2) { - show_combined_diff(dpath, 2, - revs->dense_combined_merges, - revs); + show_combined_diff(dpath, 2, revs); free(dpath); continue; } @@ -219,9 +217,9 @@ int run_diff_files(struct rev_info *revs, unsigned int option) continue; } else if (revs->diffopt.ita_invisible_in_index && ce_intent_to_add(ce)) { - diff_addremove(&revs->diffopt, '+', ce->ce_mode, - the_hash_algo->empty_tree, 0, - ce->name, 0); + newmode = ce_mode_from_stat(ce, st.st_mode); + diff_addremove(&revs->diffopt, '+', newmode, + &null_oid, 0, ce->name, 0); continue; } @@ -361,7 +359,7 @@ static int show_modified(struct rev_info *revs, p->parent[1].status = DIFF_STATUS_MODIFIED; p->parent[1].mode = old_entry->ce_mode; oidcpy(&p->parent[1].oid, &old_entry->oid); - show_combined_diff(p, 2, revs->dense_combined_merges, revs); + show_combined_diff(p, 2, revs); free(p); return 0; } @@ -405,14 +403,8 @@ static void do_oneway_diff(struct unpack_trees_options *o, /* if the entry is not checked out, don't examine work tree */ cached = o->index_only || (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx))); - /* - * Backward compatibility wart - "diff-index -m" does - * not mean "do not ignore merges", but "match_missing". - * - * But with the revision flag parsing, that's found in - * "!revs->ignore_merges". - */ - match_missing = !revs->ignore_merges; + + match_missing = revs->match_missing; if (cached && idx && ce_stage(idx)) { struct diff_filepair *pair; @@ -571,3 +563,28 @@ int index_differs_from(struct repository *r, object_array_clear(&rev.pending); return (rev.diffopt.flags.has_changes != 0); } + +static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data) +{ + return data; +} + +void show_interdiff(const struct object_id *oid1, const struct object_id *oid2, + int indent, struct diff_options *diffopt) +{ + struct diff_options opts; + struct strbuf prefix = STRBUF_INIT; + + memcpy(&opts, diffopt, sizeof(opts)); + opts.output_format = DIFF_FORMAT_PATCH; + opts.output_prefix = idiff_prefix_cb; + strbuf_addchars(&prefix, ' ', indent); + opts.output_prefix_data = &prefix; + diff_setup_done(&opts); + + diff_tree_oid(oid1, oid2, "", &opts); + diffcore_std(&opts); + diff_flush(&opts); + + strbuf_release(&prefix); +} diff --git a/third_party/git/diff.c b/third_party/git/diff.c index efe42b341a..2bb2f8f57e 100644 --- a/third_party/git/diff.c +++ b/third_party/git/diff.c @@ -20,12 +20,12 @@ #include "hashmap.h" #include "ll-merge.h" #include "string-list.h" -#include "argv-array.h" +#include "strvec.h" #include "graph.h" #include "packfile.h" #include "parse-options.h" #include "help.h" -#include "fetch-object.h" +#include "promisor-remote.h" #ifdef NO_FAST_WORKING_DIRECTORY #define FAST_WORKING_DIRECTORY 0 @@ -48,6 +48,7 @@ static const char *diff_order_file_cfg; int diff_auto_refresh_index = 1; static int diff_mnemonic_prefix; static int diff_no_prefix; +static int diff_relative; static int diff_stat_graph_width; static int diff_dirstat_permille_default = 30; static struct diff_options default_diff_options; @@ -386,6 +387,10 @@ int git_diff_ui_config(const char *var, const char *value, void *cb) diff_no_prefix = git_config_bool(var, value); return 0; } + if (!strcmp(var, "diff.relative")) { + diff_relative = git_config_bool(var, value); + return 0; + } if (!strcmp(var, "diff.statgraphwidth")) { diff_stat_graph_width = git_config_int(var, value); return 0; @@ -414,14 +419,6 @@ 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; @@ -450,6 +447,14 @@ 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 */ @@ -477,14 +482,14 @@ int git_diff_basic_config(const char *var, const char *value, void *cb) static char *quote_two(const char *one, const char *two) { - int need_one = quote_c_style(one, NULL, NULL, 1); - int need_two = quote_c_style(two, NULL, NULL, 1); + int need_one = quote_c_style(one, NULL, NULL, CQUOTE_NODQ); + int need_two = quote_c_style(two, NULL, NULL, CQUOTE_NODQ); struct strbuf res = STRBUF_INIT; if (need_one + need_two) { strbuf_addch(&res, '"'); - quote_c_style(one, &res, NULL, 1); - quote_c_style(two, &res, NULL, 1); + quote_c_style(one, &res, NULL, CQUOTE_NODQ); + quote_c_style(two, &res, NULL, CQUOTE_NODQ); strbuf_addch(&res, '"'); } else { strbuf_addstr(&res, one); @@ -573,7 +578,7 @@ static int fill_mmfile(struct repository *r, mmfile_t *mf, mf->size = 0; return 0; } - else if (diff_populate_filespec(r, one, 0)) + else if (diff_populate_filespec(r, one, NULL)) return -1; mf->ptr = one->data; @@ -585,9 +590,13 @@ static int fill_mmfile(struct repository *r, mmfile_t *mf, static unsigned long diff_filespec_size(struct repository *r, struct diff_filespec *one) { + struct diff_populate_filespec_options dpf_options = { + .check_size_only = 1, + }; + if (!DIFF_FILE_VALID(one)) return 0; - diff_populate_filespec(r, one, CHECK_SIZE_ONLY); + diff_populate_filespec(r, one, &dpf_options); return one->size; } @@ -933,16 +942,18 @@ static int cmp_in_block_with_wsd(const struct diff_options *o, } static int moved_entry_cmp(const void *hashmap_cmp_fn_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *keydata) { const struct diff_options *diffopt = hashmap_cmp_fn_data; - const struct moved_entry *a = entry; - const struct moved_entry *b = entry_or_key; + const struct moved_entry *a, *b; 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) /* @@ -964,8 +975,9 @@ 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); - ret->ent.hash = xdiff_hash_string(l->line, l->len, flags); + hashmap_entry_init(&ret->ent, hash); ret->es = l; ret->next_line = NULL; @@ -1002,7 +1014,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); + hashmap_add(hm, &key->ent); prev_line = key; } } @@ -1018,7 +1030,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, match, NULL)) { + if (cur && !hm->cmpfn(o, &cur->ent, &match->ent, NULL)) { pmb[i].match = cur; } else { pmb[i].match = NULL; @@ -1035,7 +1047,7 @@ static void pmb_advance_or_null_multi_match(struct diff_options *o, int i; char *got_match = xcalloc(1, pmb_nr); - for (; match; match = hashmap_get_next(hm, match)) { + hashmap_for_each_entry_from(hm, match, ent) { for (i = 0; i < pmb_nr; i++) { struct moved_entry *prev = pmb[i].match; struct moved_entry *cur = (prev && prev->next_line) ? @@ -1143,13 +1155,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(hm, key, NULL); + match = hashmap_get_entry(hm, key, ent, NULL); free(key); break; case DIFF_SYMBOL_MINUS: hm = add_lines; key = prepare_entry(o, n); - match = hashmap_get(hm, key, NULL); + match = hashmap_get_entry(hm, key, ent, NULL); free(key); break; default: @@ -1188,7 +1200,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. */ - for (; match; match = hashmap_get_next(hm, match)) { + hashmap_for_each_entry_from(hm, match, ent) { ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc); if (o->color_moved_ws_handling & COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) { @@ -2492,22 +2504,6 @@ 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) @@ -2548,7 +2544,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 alloted width is one column shorter + * scale linearly as if the allotted width is one column shorter * than it is, and then add 1 to the result. */ return 1 + (it * (width - 1) / max_change); @@ -3033,6 +3029,9 @@ static void show_dirstat(struct diff_options *options) struct diff_filepair *p = q->queue[i]; const char *name; unsigned long copied, added, damage; + struct diff_populate_filespec_options dpf_options = { + .check_size_only = 1, + }; name = p->two->path ? p->two->path : p->one->path; @@ -3060,19 +3059,19 @@ static void show_dirstat(struct diff_options *options) } if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) { - diff_populate_filespec(options->repo, p->one, 0); - diff_populate_filespec(options->repo, p->two, 0); + diff_populate_filespec(options->repo, p->one, NULL); + diff_populate_filespec(options->repo, p->two, NULL); diffcore_count_changes(options->repo, p->one, p->two, NULL, NULL, &copied, &added); diff_free_filespec_data(p->one); diff_free_filespec_data(p->two); } else if (DIFF_FILE_VALID(p->one)) { - diff_populate_filespec(options->repo, p->one, CHECK_SIZE_ONLY); + diff_populate_filespec(options->repo, p->one, &dpf_options); copied = added = 0; diff_free_filespec_data(p->one); } else if (DIFF_FILE_VALID(p->two)) { - diff_populate_filespec(options->repo, p->two, CHECK_SIZE_ONLY); + diff_populate_filespec(options->repo, p->two, &dpf_options); copied = 0; added = p->two->size; diff_free_filespec_data(p->two); @@ -3154,16 +3153,19 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o gather_dirstat(options, &dir, changed, "", 0); } -static void free_diffstat_info(struct diffstat_t *diffstat) +static void free_diffstat_file(struct diffstat_file *f) +{ + free(f->print_name); + free(f->name); + free(f->from_name); + free(f); +} + +void free_diffstat_info(struct diffstat_t *diffstat) { int i; - for (i = 0; i < diffstat->nr; i++) { - struct diffstat_file *f = diffstat->files[i]; - free(f->print_name); - free(f->name); - free(f->from_name); - free(f); - } + for (i = 0; i < diffstat->nr; i++) + free_diffstat_file(diffstat->files[i]); free(diffstat->files); } @@ -3193,7 +3195,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] thru line[marker_size-1] are same as firstchar */ + /* line[1] through line[marker_size-1] are same as firstchar */ if (len < marker_size + 1 || !isspace(line[marker_size])) return 0; return 1; @@ -3352,13 +3354,17 @@ static void emit_binary_diff(struct diff_options *o, int diff_filespec_is_binary(struct repository *r, struct diff_filespec *one) { + struct diff_populate_filespec_options dpf_options = { + .check_binary = 1, + }; + if (one->is_binary == -1) { diff_filespec_load_driver(one, r->index); if (one->driver->binary != -1) one->is_binary = one->driver->binary; else { if (!one->data && DIFF_FILE_VALID(one)) - diff_populate_filespec(r, one, CHECK_BINARY); + diff_populate_filespec(r, one, &dpf_options); if (one->is_binary == -1 && one->data) one->is_binary = buffer_is_binary(one->data, one->size); @@ -3426,7 +3432,7 @@ static void builtin_diff(const char *name_a, if (o->submodule_format == DIFF_SUBMODULE_LOG && (!one->mode || S_ISGITLINK(one->mode)) && (!two->mode || S_ISGITLINK(two->mode))) { - show_submodule_summary(o, one->path ? one->path : two->path, + show_submodule_diff_summary(o, one->path ? one->path : two->path, &one->oid, &two->oid, two->dirty_submodule); return; @@ -3657,7 +3663,7 @@ static void builtin_diffstat(const char *name_a, const char *name_b, { mmfile_t mf1, mf2; struct diffstat_file *data; - int same_contents; + int may_differ; int complete_rewrite = 0; if (!DIFF_PAIR_UNMERGED(p)) { @@ -3675,12 +3681,14 @@ static void builtin_diffstat(const char *name_a, const char *name_b, return; } - same_contents = oideq(&one->oid, &two->oid); + /* saves some reads if true, not a guarantee of diff outcome */ + may_differ = !(one->oid_valid && two->oid_valid && + oideq(&one->oid, &two->oid)); if (diff_filespec_is_binary(o->repo, one) || diff_filespec_is_binary(o->repo, two)) { data->is_binary = 1; - if (same_contents) { + if (!may_differ) { data->added = 0; data->deleted = 0; } else { @@ -3690,13 +3698,13 @@ static void builtin_diffstat(const char *name_a, const char *name_b, } else if (complete_rewrite) { - diff_populate_filespec(o->repo, one, 0); - diff_populate_filespec(o->repo, two, 0); + diff_populate_filespec(o->repo, one, NULL); + diff_populate_filespec(o->repo, two, NULL); data->deleted = count_lines(one->data, one->size); data->added = count_lines(two->data, two->size); } - else if (!same_contents) { + else if (may_differ) { /* Crazy xdl interfaces.. */ xpparam_t xpp; xdemitconf_t xecfg; @@ -3715,6 +3723,27 @@ static void builtin_diffstat(const char *name_a, const char *name_b, if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line, diffstat_consume, diffstat, &xpp, &xecfg)) die("unable to generate diffstat for %s", one->path); + + if (DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two)) { + struct diffstat_file *file = + diffstat->files[diffstat->nr - 1]; + /* + * Omit diffstats of modified files where nothing changed. + * Even if may_differ, this might be the case due to + * ignoring whitespace changes, etc. + * + * But note that we special-case additions, deletions, + * renames, and mode changes as adding an empty file, + * for example is still of interest. + */ + if ((p->status == DIFF_STATUS_MODIFIED) + && !file->added + && !file->deleted + && one->mode == two->mode) { + free_diffstat_file(file); + diffstat->nr--; + } + } } diff_free_filespec_data(one); @@ -3927,9 +3956,10 @@ static int diff_populate_gitlink(struct diff_filespec *s, int size_only) */ int diff_populate_filespec(struct repository *r, struct diff_filespec *s, - unsigned int flags) + const struct diff_populate_filespec_options *options) { - int size_only = flags & CHECK_SIZE_ONLY; + int size_only = options ? options->check_size_only : 0; + int check_binary = options ? options->check_binary : 0; int err = 0; int conv_flags = global_conv_flags_eol; /* @@ -3999,7 +4029,7 @@ int diff_populate_filespec(struct repository *r, * opening the file and inspecting the contents, this * is probably fine. */ - if ((flags & CHECK_BINARY) && + if (check_binary && s->size > big_file_threshold && s->is_binary == -1) { s->is_binary = 1; return 0; @@ -4024,12 +4054,30 @@ int diff_populate_filespec(struct repository *r, } } else { - enum object_type type; - if (size_only || (flags & CHECK_BINARY)) { - type = oid_object_info(r, &s->oid, &s->size); - if (type < 0) - die("unable to read %s", - oid_to_hex(&s->oid)); + struct object_info info = { + .sizep = &s->size + }; + + if (!(size_only || check_binary)) + /* + * Set contentp, since there is no chance that merely + * the size is sufficient. + */ + info.contentp = &s->data; + + if (options && options->missing_object_cb) { + if (!oid_object_info_extended(r, &s->oid, &info, + OBJECT_INFO_LOOKUP_REPLACE | + OBJECT_INFO_SKIP_FETCH_OBJECT)) + goto object_read; + options->missing_object_cb(options->missing_object_data); + } + if (oid_object_info_extended(r, &s->oid, &info, + OBJECT_INFO_LOOKUP_REPLACE)) + die("unable to read %s", oid_to_hex(&s->oid)); + +object_read: + if (size_only || check_binary) { if (size_only) return 0; if (s->size > big_file_threshold && s->is_binary == -1) { @@ -4037,9 +4085,12 @@ int diff_populate_filespec(struct repository *r, return 0; } } - s->data = read_object_file(&s->oid, &type, &s->size); - if (!s->data) - die("unable to read %s", oid_to_hex(&s->oid)); + if (!info.contentp) { + info.contentp = &s->data; + if (oid_object_info_extended(r, &s->oid, &info, + OBJECT_INFO_LOOKUP_REPLACE)) + die("unable to read %s", oid_to_hex(&s->oid)); + } s->should_free = 1; } return 0; @@ -4075,6 +4126,9 @@ static void prep_temp_blob(struct index_state *istate, struct strbuf tempfile = STRBUF_INIT; char *path_dup = xstrdup(path); const char *base = basename(path_dup); + struct checkout_metadata meta; + + init_checkout_metadata(&meta, NULL, NULL, oid); /* Generate "XXXXXX_basename.ext" */ strbuf_addstr(&tempfile, "XXXXXX_"); @@ -4084,7 +4138,7 @@ static void prep_temp_blob(struct index_state *istate, if (!temp->tempfile) die_errno("unable to create temp-file"); if (convert_to_working_tree(istate, path, - (const char *)blob, (size_t)size, &buf)) { + (const char *)blob, (size_t)size, &buf, &meta)) { blob = buf.buf; size = buf.len; } @@ -4154,7 +4208,7 @@ static struct diff_tempfile *prepare_temp_file(struct repository *r, return temp; } else { - if (diff_populate_filespec(r, one, 0)) + if (diff_populate_filespec(r, one, NULL)) die("cannot read data blob for %s", one->path); prep_temp_blob(r->index, name, temp, one->data, one->size, @@ -4164,14 +4218,14 @@ static struct diff_tempfile *prepare_temp_file(struct repository *r, } static void add_external_diff_name(struct repository *r, - struct argv_array *argv, + struct strvec *argv, const char *name, struct diff_filespec *df) { struct diff_tempfile *temp = prepare_temp_file(r, name, df); - argv_array_push(argv, temp->name); - argv_array_push(argv, temp->hex); - argv_array_push(argv, temp->mode); + strvec_push(argv, temp->name); + strvec_push(argv, temp->hex); + strvec_push(argv, temp->mode); } /* An external diff command takes: @@ -4188,12 +4242,12 @@ static void run_external_diff(const char *pgm, const char *xfrm_msg, struct diff_options *o) { - struct argv_array argv = ARGV_ARRAY_INIT; - struct argv_array env = ARGV_ARRAY_INIT; + struct strvec argv = STRVEC_INIT; + struct strvec env = STRVEC_INIT; struct diff_queue_struct *q = &diff_queued_diff; - argv_array_push(&argv, pgm); - argv_array_push(&argv, name); + strvec_push(&argv, pgm); + strvec_push(&argv, name); if (one && two) { add_external_diff_name(o->repo, &argv, name, one); @@ -4201,22 +4255,22 @@ static void run_external_diff(const char *pgm, add_external_diff_name(o->repo, &argv, name, two); else { add_external_diff_name(o->repo, &argv, other, two); - argv_array_push(&argv, other); - argv_array_push(&argv, xfrm_msg); + strvec_push(&argv, other); + strvec_push(&argv, xfrm_msg); } } - argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter); - argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr); + strvec_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter); + strvec_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr); diff_free_filespec_data(one); diff_free_filespec_data(two); - if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv)) + if (run_command_v_opt_cd_env(argv.v, RUN_USING_SHELL, NULL, env.v)) die(_("external diff died, stopping at %s"), name); remove_tempfile(); - argv_array_clear(&argv); - argv_array_clear(&env); + strvec_clear(&argv); + strvec_clear(&env); } static int similarity_index(struct diff_filepair *p) @@ -4291,7 +4345,10 @@ static void fill_metainfo(struct strbuf *msg, } if (one && two && !oideq(&one->oid, &two->oid)) { const unsigned hexsz = the_hash_algo->hexsz; - int abbrev = o->flags.full_index ? hexsz : DEFAULT_ABBREV; + int abbrev = o->abbrev ? o->abbrev : DEFAULT_ABBREV; + + if (o->flags.full_index) + abbrev = hexsz; if (o->flags.binary) { mmfile_t mf; @@ -4515,6 +4572,7 @@ void repo_diff_setup(struct repository *r, struct diff_options *options) options->interhunkcontext = diff_interhunk_context_default; options->ws_error_highlight = ws_error_highlight_default; options->flags.rename_empty = 1; + options->flags.relative_name = diff_relative; options->objfind = NULL; /* pathchange left =NULL by default */ @@ -5172,8 +5230,7 @@ static int diff_opt_relative(const struct option *opt, { struct diff_options *options = opt->value; - BUG_ON_OPT_NEG(unset); - options->flags.relative_name = 1; + options->flags.relative_name = !unset; if (arg) options->prefix = arg; return 0; @@ -5469,7 +5526,7 @@ static void prep_parse_options(struct diff_options *options) OPT_GROUP(N_("Other diff options")), OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"), N_("when run from subdir, exclude changes outside and show relative paths"), - PARSE_OPT_NONEG | PARSE_OPT_OPTARG, + PARSE_OPT_OPTARG, diff_opt_relative), OPT_BOOL('a', "text", &options->flags.text, N_("treat all files as text")), @@ -5978,7 +6035,7 @@ static void diff_summary(struct diff_options *opt, struct diff_filepair *p) } struct patch_id_t { - git_SHA_CTX *ctx; + git_hash_ctx *ctx; int patchlen; }; @@ -5995,16 +6052,16 @@ static int remove_space(char *line, int len) return dst - line; } -void flush_one_hunk(struct object_id *result, git_SHA_CTX *ctx) +void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx) { unsigned char hash[GIT_MAX_RAWSZ]; unsigned short carry = 0; int i; - git_SHA1_Final(hash, ctx); - git_SHA1_Init(ctx); + the_hash_algo->final_fn(hash, ctx); + the_hash_algo->init_fn(ctx); /* 20-byte sum, with carry */ - for (i = 0; i < GIT_SHA1_RAWSZ; ++i) { + for (i = 0; i < the_hash_algo->rawsz; ++i) { carry += result->hash[i] + hash[i]; result->hash[i] = carry; carry >>= 8; @@ -6016,23 +6073,25 @@ static void patch_id_consume(void *priv, char *line, unsigned long len) struct patch_id_t *data = priv; int new_len; + if (len > 12 && starts_with(line, "\\ ")) + return; new_len = remove_space(line, len); - git_SHA1_Update(data->ctx, line, new_len); + the_hash_algo->update_fn(data->ctx, line, new_len); data->patchlen += new_len; } -static void patch_id_add_string(git_SHA_CTX *ctx, const char *str) +static void patch_id_add_string(git_hash_ctx *ctx, const char *str) { - git_SHA1_Update(ctx, str, strlen(str)); + the_hash_algo->update_fn(ctx, str, strlen(str)); } -static void patch_id_add_mode(git_SHA_CTX *ctx, unsigned mode) +static void patch_id_add_mode(git_hash_ctx *ctx, unsigned mode) { /* large enough for 2^32 in octal */ char buf[12]; int len = xsnprintf(buf, sizeof(buf), "%06o", mode); - git_SHA1_Update(ctx, buf, len); + the_hash_algo->update_fn(ctx, buf, len); } /* returns 0 upon success, and writes result into oid */ @@ -6040,10 +6099,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_SHA_CTX ctx; + git_hash_ctx ctx; struct patch_id_t data; - git_SHA1_Init(&ctx); + the_hash_algo->init_fn(&ctx); memset(&data, 0, sizeof(struct patch_id_t)); data.ctx = &ctx; oidclr(oid); @@ -6076,27 +6135,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/"); - git_SHA1_Update(&ctx, p->one->path, len1); + the_hash_algo->update_fn(&ctx, p->one->path, len1); patch_id_add_string(&ctx, "b/"); - git_SHA1_Update(&ctx, p->two->path, len2); + the_hash_algo->update_fn(&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/"); - git_SHA1_Update(&ctx, p->two->path, len2); + the_hash_algo->update_fn(&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/"); - git_SHA1_Update(&ctx, p->one->path, len1); + the_hash_algo->update_fn(&ctx, p->one->path, len1); patch_id_add_string(&ctx, "+++/dev/null"); } else { patch_id_add_string(&ctx, "---a/"); - git_SHA1_Update(&ctx, p->one->path, len1); + the_hash_algo->update_fn(&ctx, p->one->path, len1); patch_id_add_string(&ctx, "+++b/"); - git_SHA1_Update(&ctx, p->two->path, len2); + the_hash_algo->update_fn(&ctx, p->two->path, len2); } if (diff_header_only) @@ -6108,10 +6167,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)) { - 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); + 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); continue; } @@ -6128,7 +6187,7 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid } if (!stable) - git_SHA1_Final(oid->hash, &ctx); + the_hash_algo->final_fn(oid->hash, &ctx); return 0; } @@ -6230,8 +6289,10 @@ 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(&add_lines, 1); - hashmap_free(&del_lines, 1); + hashmap_free_entries(&add_lines, struct moved_entry, + ent); + hashmap_free_entries(&del_lines, struct moved_entry, + ent); } for (i = 0; i < esm.nr; i++) @@ -6278,12 +6339,7 @@ void diff_flush(struct diff_options *options) dirstat_by_line) { struct diffstat_t diffstat; - 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); - } + compute_diffstat(options, &diffstat, q); if (output_format & DIFF_FORMAT_NUMSTAT) show_numstat(&diffstat, options); if (output_format & DIFF_FORMAT_DIFFSTAT) @@ -6423,9 +6479,9 @@ static int diff_filespec_is_identical(struct repository *r, { if (S_ISGITLINK(one->mode)) return 0; - if (diff_populate_filespec(r, one, 0)) + if (diff_populate_filespec(r, one, NULL)) return 0; - if (diff_populate_filespec(r, two, 0)) + if (diff_populate_filespec(r, two, NULL)) return 0; return !memcmp(one->data, two->data, one->size); } @@ -6433,6 +6489,12 @@ static int diff_filespec_is_identical(struct repository *r, static int diff_filespec_check_stat_unmatch(struct repository *r, struct diff_filepair *p) { + struct diff_populate_filespec_options dpf_options = { + .check_size_only = 1, + .missing_object_cb = diff_queued_diff_prefetch, + .missing_object_data = r, + }; + if (p->done_skip_stat_unmatch) return p->skip_stat_unmatch_result; @@ -6455,8 +6517,8 @@ static int diff_filespec_check_stat_unmatch(struct repository *r, !DIFF_FILE_VALID(p->two) || (p->one->oid_valid && p->two->oid_valid) || (p->one->mode != p->two->mode) || - diff_populate_filespec(r, p->one, CHECK_SIZE_ONLY) || - diff_populate_filespec(r, p->two, CHECK_SIZE_ONLY) || + diff_populate_filespec(r, p->one, &dpf_options) || + diff_populate_filespec(r, p->two, &dpf_options) || (p->one->size != p->two->size) || !diff_filespec_is_identical(r, p->one, p->two)) /* (2) */ p->skip_stat_unmatch_result = 1; @@ -6507,41 +6569,59 @@ void diffcore_fix_diff_index(void) QSORT(q->queue, q->nr, diffnamecmp); } -static void add_if_missing(struct repository *r, - struct oid_array *to_fetch, - const struct diff_filespec *filespec) +void diff_add_if_missing(struct repository *r, + struct oid_array *to_fetch, + 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); } -void diffcore_std(struct diff_options *options) +void diff_queued_diff_prefetch(void *repository) { - if (options->repo == the_repository && - repository_format_partial_clone) { - /* - * Prefetch the diff pairs that are about to be flushed. - */ - int i; - struct diff_queue_struct *q = &diff_queued_diff; - struct oid_array to_fetch = OID_ARRAY_INIT; + struct repository *repo = repository; + int i; + struct diff_queue_struct *q = &diff_queued_diff; + struct oid_array to_fetch = OID_ARRAY_INIT; - for (i = 0; i < q->nr; i++) { - struct diff_filepair *p = q->queue[i]; - add_if_missing(options->repo, &to_fetch, p->one); - add_if_missing(options->repo, &to_fetch, p->two); - } - if (to_fetch.nr) - /* - * NEEDSWORK: Consider deduplicating the OIDs sent. - */ - fetch_objects(repository_format_partial_clone, - to_fetch.oid, to_fetch.nr); - oid_array_clear(&to_fetch); + for (i = 0; i < q->nr; i++) { + struct diff_filepair *p = q->queue[i]; + diff_add_if_missing(repo, &to_fetch, p->one); + diff_add_if_missing(repo, &to_fetch, p->two); } + /* + * NEEDSWORK: Consider deduplicating the OIDs sent. + */ + promisor_remote_get_direct(repo, to_fetch.oid, to_fetch.nr); + + oid_array_clear(&to_fetch); +} + +void diffcore_std(struct diff_options *options) +{ + int output_formats_to_prefetch = DIFF_FORMAT_DIFFSTAT | + DIFF_FORMAT_NUMSTAT | + DIFF_FORMAT_PATCH | + DIFF_FORMAT_SHORTSTAT | + DIFF_FORMAT_DIRSTAT; + + /* + * Check if the user requested a blob-data-requiring diff output and/or + * break-rewrite detection (which requires blob data). If yes, prefetch + * the diff pairs. + * + * If no prefetching occurs, diffcore_rename() will prefetch if it + * decides that it needs inexact rename detection. + */ + if (options->repo == the_repository && has_promisor_remote() && + (options->output_format & output_formats_to_prefetch || + options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)) + diff_queued_diff_prefetch(options->repo); + /* NOTE please keep the following in sync with diff_tree_combined() */ if (options->skip_stat_unmatch) diffcore_skip_stat_unmatch(options); @@ -6616,6 +6696,20 @@ 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, @@ -6700,8 +6794,11 @@ void diff_change(struct diff_options *options, return; if (options->flags.quick && options->skip_stat_unmatch && - !diff_filespec_check_stat_unmatch(options->repo, p)) + !diff_filespec_check_stat_unmatch(options->repo, p)) { + diff_free_filespec_data(p->one); + diff_free_filespec_data(p->two); return; + } options->flags.has_changes = 1; } @@ -6773,7 +6870,7 @@ size_t fill_textconv(struct repository *r, *outbuf = ""; return 0; } - if (diff_populate_filespec(r, df, 0)) + if (diff_populate_filespec(r, df, NULL)) die("unable to read files to diff"); *outbuf = df->data; return df->size; diff --git a/third_party/git/diff.h b/third_party/git/diff.h index c2c3056810..11de52e9e9 100644 --- a/third_party/git/diff.h +++ b/third_party/git/diff.h @@ -9,6 +9,49 @@ #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; @@ -65,21 +108,66 @@ 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; @@ -131,36 +219,75 @@ 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; + + /* If non-zero, then stop computing after this many changes. */ + int max_changes; + int ita_invisible_in_index; /* white-space error highlighting */ #define WSEH_NEW (1<<12) @@ -192,6 +319,7 @@ 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; @@ -245,6 +373,22 @@ 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, @@ -270,6 +414,7 @@ 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) @@ -284,11 +429,11 @@ struct combine_diff_path *diff_tree_paths( struct combine_diff_path *p, const struct object_id *oid, const struct object_id **parents_oid, int nparent, struct strbuf *base, struct diff_options *opt); -int diff_tree_oid(const struct object_id *old_oid, - const struct object_id *new_oid, - const char *base, struct diff_options *opt); -int diff_root_tree_oid(const struct object_id *new_oid, const char *base, - struct diff_options *opt); +void diff_tree_oid(const struct object_id *old_oid, + const struct object_id *new_oid, + const char *base, struct diff_options *opt); +void diff_root_tree_oid(const struct object_id *new_oid, const char *base, + struct diff_options *opt); struct combine_diff_path { struct combine_diff_path *next; @@ -307,11 +452,11 @@ struct combine_diff_path { st_mult(sizeof(struct combine_diff_parent), (n))) void show_combined_diff(struct combine_diff_path *elem, int num_parent, - int dense, struct rev_info *); + struct rev_info *); -void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev); +void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, struct rev_info *rev); -void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev); +void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev); void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); @@ -334,6 +479,10 @@ 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 @@ -438,7 +587,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 *, git_SHA_CTX *); +void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx); int diff_result_code(struct diff_options *, int); @@ -450,6 +599,13 @@ int index_differs_from(struct repository *r, const char *def, int ita_invisible_in_index); /* + * Emit an interdiff of two object ID's to 'diff_options.file' optionally + * indented by 'indent' spaces. + */ +void show_interdiff(const struct object_id *, const struct object_id *, + int indent, struct diff_options *); + +/* * Fill the contents of the filespec "df", respecting any textconv defined by * its userdiff driver. The "driver" parameter must come from a * previous call to get_textconv(), and therefore should either be NULL or have diff --git a/third_party/git/diffcore-break.c b/third_party/git/diffcore-break.c index 875aefd3fe..0d4a14964d 100644 --- a/third_party/git/diffcore-break.c +++ b/third_party/git/diffcore-break.c @@ -4,6 +4,7 @@ #include "cache.h" #include "diff.h" #include "diffcore.h" +#include "promisor-remote.h" static int should_break(struct repository *r, struct diff_filespec *src, @@ -49,6 +50,8 @@ static int should_break(struct repository *r, unsigned long delta_size, max_size; unsigned long src_copied, literal_added, src_removed; + struct diff_populate_filespec_options options = { 0 }; + *merge_score_p = 0; /* assume no deletion --- "do not break" * is the default. */ @@ -62,8 +65,13 @@ static int should_break(struct repository *r, oideq(&src->oid, &dst->oid)) return 0; /* they are the same */ - if (diff_populate_filespec(r, src, 0) || - diff_populate_filespec(r, dst, 0)) + if (r == the_repository && has_promisor_remote()) { + options.missing_object_cb = diff_queued_diff_prefetch; + options.missing_object_data = r; + } + + if (diff_populate_filespec(r, src, &options) || + diff_populate_filespec(r, dst, &options)) return 0; /* error but caught downstream */ max_size = ((src->size > dst->size) ? src->size : dst->size); @@ -286,17 +294,17 @@ void diffcore_merge_broken(void) /* Peer survived. Merge them */ merge_broken(p, pp, &outq); q->queue[j] = NULL; - break; + goto next; } } - if (q->nr <= j) - /* The peer did not survive, so we keep - * it in the output. - */ - diff_q(&outq, p); + /* 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 9624864858..99e63e90f8 100644 --- a/third_party/git/diffcore-rename.c +++ b/third_party/git/diffcore-rename.c @@ -1,4 +1,5 @@ /* + * * Copyright (C) 2005 Junio C Hamano */ #include "cache.h" @@ -7,6 +8,7 @@ #include "object-store.h" #include "hashmap.h" #include "progress.h" +#include "promisor-remote.h" /* Table of rename/copy destinations */ @@ -128,10 +130,46 @@ struct diff_score { short name_score; }; +struct prefetch_options { + struct repository *repo; + int skip_unmodified; +}; +static void prefetch(void *prefetch_options) +{ + struct prefetch_options *options = prefetch_options; + int i; + struct oid_array to_fetch = OID_ARRAY_INIT; + + for (i = 0; i < rename_dst_nr; i++) { + if (rename_dst[i].pair) + /* + * The loop in diffcore_rename() will not need these + * blobs, so skip prefetching. + */ + continue; /* already found exact match */ + diff_add_if_missing(options->repo, &to_fetch, + rename_dst[i].two); + } + for (i = 0; i < rename_src_nr; i++) { + if (options->skip_unmodified && + diff_unmodified_pair(rename_src[i].p)) + /* + * The loop in diffcore_rename() will not need these + * blobs, so skip prefetching. + */ + continue; + diff_add_if_missing(options->repo, &to_fetch, + rename_src[i].p->one); + } + promisor_remote_get_direct(options->repo, to_fetch.oid, to_fetch.nr); + oid_array_clear(&to_fetch); +} + static int estimate_similarity(struct repository *r, struct diff_filespec *src, struct diff_filespec *dst, - int minimum_score) + int minimum_score, + int skip_unmodified) { /* src points at a file that existed in the original tree (or * optionally a file in the destination tree) and dst points @@ -148,6 +186,15 @@ static int estimate_similarity(struct repository *r, */ unsigned long max_size, delta_size, base_size, src_copied, literal_added; int score; + struct diff_populate_filespec_options dpf_options = { + .check_size_only = 1 + }; + struct prefetch_options prefetch_options = {r, skip_unmodified}; + + if (r == the_repository && has_promisor_remote()) { + dpf_options.missing_object_cb = prefetch; + dpf_options.missing_object_data = &prefetch_options; + } /* We deal only with regular files. Symlink renames are handled * only when they are exact matches --- in other words, no edits @@ -166,10 +213,10 @@ static int estimate_similarity(struct repository *r, * say whether the size is valid or not!) */ if (!src->cnt_data && - diff_populate_filespec(r, src, CHECK_SIZE_ONLY)) + diff_populate_filespec(r, src, &dpf_options)) return 0; if (!dst->cnt_data && - diff_populate_filespec(r, dst, CHECK_SIZE_ONLY)) + diff_populate_filespec(r, dst, &dpf_options)) return 0; max_size = ((src->size > dst->size) ? src->size : dst->size); @@ -187,9 +234,11 @@ static int estimate_similarity(struct repository *r, if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE) return 0; - if (!src->cnt_data && diff_populate_filespec(r, src, 0)) + dpf_options.check_size_only = 0; + + if (!src->cnt_data && diff_populate_filespec(r, src, &dpf_options)) return 0; - if (!dst->cnt_data && diff_populate_filespec(r, dst, 0)) + if (!dst->cnt_data && diff_populate_filespec(r, dst, &dpf_options)) return 0; if (diffcore_count_changes(r, src, dst, @@ -261,10 +310,10 @@ static unsigned int hash_filespec(struct repository *r, struct diff_filespec *filespec) { if (!filespec->oid_valid) { - if (diff_populate_filespec(r, filespec, 0)) + if (diff_populate_filespec(r, filespec, NULL)) return 0; - hash_object_file(filespec->data, filespec->size, "blob", - &filespec->oid); + hash_object_file(r->hash_algo, filespec->data, filespec->size, + "blob", &filespec->oid); } return oidhash(&filespec->oid); } @@ -274,18 +323,17 @@ 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_from_hash(srcs, - hash_filespec(options->repo, target), - NULL); - for (; p; p = hashmap_get_next(srcs, p)) { + p = hashmap_get_entry_from_hash(srcs, hash, NULL, + struct file_similarity, entry); + hashmap_for_each_entry_from(srcs, p, entry) { int score; struct diff_filespec *source = p->filespec; @@ -329,8 +377,8 @@ static void insert_file_table(struct repository *r, entry->index = index; entry->filespec = filespec; - hashmap_entry_init(entry, hash_filespec(r, filespec)); - hashmap_add(table, entry); + hashmap_entry_init(&entry->entry, hash_filespec(r, filespec)); + hashmap_add(table, &entry->entry); } /* @@ -359,7 +407,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(&file_table, 1); + hashmap_free_entries(&file_table, struct file_similarity, entry); return renames; } @@ -567,7 +615,8 @@ void diffcore_rename(struct diff_options *options) this_src.score = estimate_similarity(options->repo, one, two, - minimum_score); + minimum_score, + skip_unmodified); this_src.name_score = basename_same(one, two); this_src.dst = i; this_src.src = j; @@ -585,7 +634,7 @@ void diffcore_rename(struct diff_options *options) stop_progress(&progress); /* cost matrix sorted by most to least similar pair */ - QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare); + STABLE_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 b651061c0e..d2a63c5c71 100644 --- a/third_party/git/diffcore.h +++ b/third_party/git/diffcore.h @@ -28,6 +28,12 @@ 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; @@ -59,13 +65,40 @@ void free_filespec(struct diff_filespec *); void fill_filespec(struct diff_filespec *, const struct object_id *, int, unsigned short); -#define CHECK_SIZE_ONLY 1 -#define CHECK_BINARY 2 -int diff_populate_filespec(struct repository *, struct diff_filespec *, unsigned int); +/* + * Prefetch the entries in diff_queued_diff. The parameter is a pointer to a + * struct repository. + */ +void diff_queued_diff_prefetch(void *repository); + +struct diff_populate_filespec_options { + unsigned check_size_only : 1; + unsigned check_binary : 1; + + /* + * If an object is missing, diff_populate_filespec() will invoke this + * callback before attempting to read that object again. + */ + void (*missing_object_cb)(void *); + void *missing_object_data; +}; +int diff_populate_filespec(struct repository *, struct diff_filespec *, + const struct diff_populate_filespec_options *); 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; @@ -77,6 +110,7 @@ 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) @@ -94,11 +128,25 @@ 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; \ @@ -150,4 +198,12 @@ int diffcore_count_changes(struct repository *r, unsigned long *src_copied, unsigned long *literal_added); +/* + * If filespec contains an OID and if that object is missing from the given + * repository, add that OID to to_fetch. + */ +void diff_add_if_missing(struct repository *r, + struct oid_array *to_fetch, + const struct diff_filespec *filespec); + #endif diff --git a/third_party/git/dir.c b/third_party/git/dir.c index d021c908e5..78387110e6 100644 --- a/third_party/git/dir.c +++ b/third_party/git/dir.c @@ -2,8 +2,6 @@ * 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 */ @@ -43,7 +41,8 @@ struct cached_dir { int nr_files; int nr_dirs; - struct dirent *de; + const char *d_name; + int d_type; const char *file; struct untracked_cache_dir *ucd; }; @@ -52,8 +51,13 @@ 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 get_dtype(struct dirent *de, struct index_state *istate, - const char *path, int len); +static int resolve_dtype(int dtype, struct index_state *istate, + const char *path, int len); + +void dir_init(struct dir_struct *dir) +{ + memset(dir, 0, sizeof(*dir)); +} int count_slashes(const char *s) { @@ -139,7 +143,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 xuz/abc as + * subdir xyz, the common prefix is still xyz, not xyz/abc as * in non-:(icase). */ GUARD_PATHSPEC(pathspec, @@ -194,6 +198,10 @@ int fill_directory(struct dir_struct *dir, const char *prefix; size_t prefix_len; + unsigned exclusive_flags = DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO; + if ((dir->flags & exclusive_flags) == exclusive_flags) + BUG("DIR_SHOW_IGNORED and DIR_SHOW_IGNORED_TOO are exclusive"); + /* * Calculate common prefix for the pathspec, and * use that to optimize the directory walk @@ -273,19 +281,30 @@ 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_SUBMODULE (1<<2) +#define DO_MATCH_LEADING_PATHSPEC (1<<2) /* - * Does 'match' match the given name? - * A match is found if + * Does the given pathspec match the given name? A match is found if * - * (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'. + * (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"). * - * and the return value tells which case it was. + * Return value tells which case it was (1-4), or 0 when there is no match. * - * It returns 0 when there is no match. + * It may be instructive to look at a small table of concrete examples + * to understand the differences between 1, 2, and 4: + * + * 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. */ static int match_pathspec_item(const struct index_state *istate, const struct pathspec_item *item, int prefix, @@ -353,21 +372,30 @@ 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 super set of the pathspec */ - if (flags & DO_MATCH_SUBMODULE) { + /* Perform checks to see if "name" is a leading string of the pathspec */ + if ( (flags & DO_MATCH_LEADING_PATHSPEC) && + !(flags & DO_MATCH_EXCLUDE)) { /* name is a literal prefix of the pathspec */ + int offset = name[namelen-1] == '/' ? 1 : 0; if ((namelen < matchlen) && - (match[namelen] == '/') && + (match[namelen-offset] == '/') && !ps_strncmp(item, match, name, namelen)) - return MATCHED_RECURSIVELY; + return MATCHED_RECURSIVELY_LEADING_PATHSPEC; - /* 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 @@ -376,13 +404,17 @@ 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; + return MATCHED_RECURSIVELY_LEADING_PATHSPEC; } return 0; } /* + * do_match_pathspec() is meant to ONLY be called by + * match_pathspec_with_flags(); calling it directly risks pathspecs + * like ':!unwanted_path' being ignored. + * * Given a name and a list of pathspecs, returns the nature of the * closest (i.e. most specific) match of the name to any of the * pathspecs. @@ -468,13 +500,12 @@ static int do_match_pathspec(const struct index_state *istate, return retval; } -int match_pathspec(const struct index_state *istate, - const struct pathspec *ps, - const char *name, int namelen, - int prefix, char *seen, int is_dir) +static int match_pathspec_with_flags(const struct index_state *istate, + const struct pathspec *ps, + const char *name, int namelen, + int prefix, char *seen, unsigned flags) { int positive, negative; - unsigned flags = is_dir ? DO_MATCH_DIRECTORY : 0; positive = do_match_pathspec(istate, ps, name, namelen, prefix, seen, flags); if (!(ps->magic & PATHSPEC_EXCLUDE) || !positive) @@ -485,6 +516,16 @@ int match_pathspec(const struct index_state *istate, return negative ? 0 : positive; } +int match_pathspec(const struct index_state *istate, + const struct pathspec *ps, + const char *name, int namelen, + int prefix, char *seen, int is_dir) +{ + unsigned flags = is_dir ? DO_MATCH_DIRECTORY : 0; + return match_pathspec_with_flags(istate, ps, name, namelen, + prefix, seen, flags); +} + /** * Check if a submodule is a superset of the pathspec */ @@ -493,11 +534,11 @@ int submodule_path_match(const struct index_state *istate, const char *submodule_name, char *seen) { - int matched = do_match_pathspec(istate, ps, submodule_name, - strlen(submodule_name), - 0, seen, - DO_MATCH_DIRECTORY | - DO_MATCH_SUBMODULE); + int matched = match_pathspec_with_flags(istate, ps, submodule_name, + strlen(submodule_name), + 0, seen, + DO_MATCH_DIRECTORY | + DO_MATCH_LEADING_PATHSPEC); return matched; } @@ -561,7 +602,7 @@ int no_wildcard(const char *string) return string[simple_length(string)] == '\0'; } -void parse_exclude_pattern(const char **pattern, +void parse_path_pattern(const char **pattern, int *patternlen, unsigned *flags, int *nowildcardlen) @@ -571,20 +612,20 @@ void parse_exclude_pattern(const char **pattern, *flags = 0; if (*p == '!') { - *flags |= EXC_FLAG_NEGATIVE; + *flags |= PATTERN_FLAG_NEGATIVE; p++; } len = strlen(p); if (len && p[len - 1] == '/') { len--; - *flags |= EXC_FLAG_MUSTBEDIR; + *flags |= PATTERN_FLAG_MUSTBEDIR; } for (i = 0; i < len; i++) { if (p[i] == '/') break; } if (i == len) - *flags |= EXC_FLAG_NODIR; + *flags |= PATTERN_FLAG_NODIR; *nowildcardlen = simple_length(p); /* * we should have excluded the trailing slash from 'p' too, @@ -594,35 +635,261 @@ void parse_exclude_pattern(const char **pattern, if (*nowildcardlen > len) *nowildcardlen = len; if (*p == '*' && no_wildcard(p + 1)) - *flags |= EXC_FLAG_ENDSWITH; + *flags |= PATTERN_FLAG_ENDSWITH; *pattern = p; *patternlen = len; } -void add_exclude(const char *string, const char *base, - int baselen, struct exclude_list *el, int srcpos) +int pl_hashmap_cmp(const void *unused_cmp_data, + const struct hashmap_entry *a, + const struct hashmap_entry *b, + const void *key) +{ + 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) { - struct exclude *x; + 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; int patternlen; unsigned flags; int nowildcardlen; - parse_exclude_pattern(&string, &patternlen, &flags, &nowildcardlen); - if (flags & EXC_FLAG_MUSTBEDIR) { - FLEXPTR_ALLOC_MEM(x, pattern, string, patternlen); + parse_path_pattern(&string, &patternlen, &flags, &nowildcardlen); + if (flags & PATTERN_FLAG_MUSTBEDIR) { + FLEXPTR_ALLOC_MEM(pattern, pattern, string, patternlen); } else { - x = xmalloc(sizeof(*x)); - x->pattern = string; + pattern = xmalloc(sizeof(*pattern)); + pattern->pattern = string; } - 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; + 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); } static int read_skip_worktree_file_from_index(const struct index_state *istate, @@ -643,19 +910,21 @@ static int read_skip_worktree_file_from_index(const struct index_state *istate, } /* - * Frees memory within el which was allocated for exclude patterns and - * the file buffer. Does not free el itself. + * Frees memory within pl which was allocated for exclude patterns and + * the file buffer. Does not free pl itself. */ -void clear_exclude_list(struct exclude_list *el) +void clear_pattern_list(struct pattern_list *pl) { int i; - for (i = 0; i < el->nr; i++) - free(el->excludes[i]); - free(el->excludes); - free(el->filebuf); + for (i = 0; i < pl->nr; i++) + free(pl->patterns[i]); + free(pl->patterns); + free(pl->filebuf); + hashmap_free_entries(&pl->recursive_hashmap, struct pattern_entry, ent); + hashmap_free_entries(&pl->parent_hashmap, struct pattern_entry, ent); - memset(el, 0, sizeof(*el)); + memset(pl, 0, sizeof(*pl)); } static void trim_trailing_spaces(char *buf) @@ -762,21 +1031,21 @@ static void invalidate_directory(struct untracked_cache *uc, dir->dirs[i]->recurse = 0; } -static int add_excludes_from_buffer(char *buf, size_t size, +static int add_patterns_from_buffer(char *buf, size_t size, const char *base, int baselen, - struct exclude_list *el); + struct pattern_list *pl); /* * 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 "el". + * exclude rules in "pl". * * If "ss" is not NULL, compute SHA-1 of the exclude file and fill - * stat data from disk (only valid if add_excludes returns zero). If + * stat data from disk (only valid if add_patterns returns zero). If * ss_valid is non-zero, "ss" must contain good value as input. */ -static int add_excludes(const char *fname, const char *base, int baselen, - struct exclude_list *el, struct index_state *istate, +static int add_patterns(const char *fname, const char *base, int baselen, + struct pattern_list *pl, struct index_state *istate, struct oid_stat *oid_stat) { struct stat st; @@ -830,28 +1099,31 @@ static int add_excludes(const char *fname, const char *base, int baselen, oidcpy(&oid_stat->oid, &istate->cache[pos]->oid); else - hash_object_file(buf, size, "blob", - &oid_stat->oid); + hash_object_file(the_hash_algo, buf, size, + "blob", &oid_stat->oid); fill_stat_data(&oid_stat->stat, &st); oid_stat->valid = 1; } } - add_excludes_from_buffer(buf, size, base, baselen, el); + add_patterns_from_buffer(buf, size, base, baselen, pl); return 0; } -static int add_excludes_from_buffer(char *buf, size_t size, +static int add_patterns_from_buffer(char *buf, size_t size, const char *base, int baselen, - struct exclude_list *el) + struct pattern_list *pl) { int i, lineno = 1; char *entry; - el->filebuf = buf; + hashmap_init(&pl->recursive_hashmap, pl_hashmap_cmp, NULL, 0); + hashmap_init(&pl->parent_hashmap, pl_hashmap_cmp, NULL, 0); + + pl->filebuf = buf; if (skip_utf8_bom(&buf, size)) - size -= buf - el->filebuf; + size -= buf - pl->filebuf; entry = buf; @@ -860,7 +1132,7 @@ static int add_excludes_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_exclude(entry, base, baselen, el, lineno); + add_pattern(entry, base, baselen, pl, lineno); } lineno++; entry = buf + i + 1; @@ -869,17 +1141,17 @@ static int add_excludes_from_buffer(char *buf, size_t size, return 0; } -int add_excludes_from_file_to_list(const char *fname, const char *base, - int baselen, struct exclude_list *el, +int add_patterns_from_file_to_list(const char *fname, const char *base, + int baselen, struct pattern_list *pl, struct index_state *istate) { - return add_excludes(fname, base, baselen, el, istate, NULL); + return add_patterns(fname, base, baselen, pl, istate, NULL); } -int add_excludes_from_blob_to_list( +int add_patterns_from_blob_to_list( struct object_id *oid, const char *base, int baselen, - struct exclude_list *el) + struct pattern_list *pl) { char *buf; size_t size; @@ -889,31 +1161,31 @@ int add_excludes_from_blob_to_list( if (r != 1) return r; - add_excludes_from_buffer(buf, size, base, baselen, el); + add_patterns_from_buffer(buf, size, base, baselen, pl); return 0; } -struct exclude_list *add_exclude_list(struct dir_struct *dir, +struct pattern_list *add_pattern_list(struct dir_struct *dir, int group_type, const char *src) { - struct exclude_list *el; + struct pattern_list *pl; struct exclude_list_group *group; group = &dir->exclude_list_group[group_type]; - ALLOC_GROW(group->el, group->nr + 1, group->alloc); - el = &group->el[group->nr++]; - memset(el, 0, sizeof(*el)); - el->src = src; - return el; + ALLOC_GROW(group->pl, group->nr + 1, group->alloc); + pl = &group->pl[group->nr++]; + memset(pl, 0, sizeof(*pl)); + pl->src = src; + return pl; } /* * Used to set up core.excludesfile and .git/info/exclude lists. */ -static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname, +static void add_patterns_from_file_1(struct dir_struct *dir, const char *fname, struct oid_stat *oid_stat) { - struct exclude_list *el; + struct pattern_list *pl; /* * catch setup_standard_excludes() that's called before * dir->untracked is assigned. That function behaves @@ -921,15 +1193,15 @@ static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname, */ if (!dir->untracked) dir->unmanaged_exclude_files++; - el = add_exclude_list(dir, EXC_FILE, fname); - if (add_excludes(fname, "", 0, el, NULL, oid_stat) < 0) + pl = add_pattern_list(dir, EXC_FILE, fname); + if (add_patterns(fname, "", 0, pl, NULL, oid_stat) < 0) die(_("cannot use %s as an exclude file"), fname); } -void add_excludes_from_file(struct dir_struct *dir, const char *fname) +void add_patterns_from_file(struct dir_struct *dir, const char *fname) { dir->unmanaged_exclude_files++; /* see validate_untracked_cache() */ - add_excludes_from_file_1(dir, fname, NULL); + add_patterns_from_file_1(dir, fname, NULL); } int match_basename(const char *basename, int basenamelen, @@ -940,7 +1212,7 @@ int match_basename(const char *basename, int basenamelen, if (patternlen == basenamelen && !fspathncmp(pattern, basename, basenamelen)) return 1; - } else if (flags & EXC_FLAG_ENDSWITH) { + } else if (flags & PATTERN_FLAG_ENDSWITH) { /* "*literal" matching against "fooliteral" */ if (patternlen - 1 <= basenamelen && !fspathncmp(pattern + 1, @@ -1021,85 +1293,138 @@ 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 exclude *last_exclude_matching_from_list(const char *pathname, +static struct path_pattern *last_matching_pattern_from_list(const char *pathname, int pathlen, const char *basename, int *dtype, - struct exclude_list *el, + struct pattern_list *pl, struct index_state *istate) { - struct exclude *exc = NULL; /* undecided */ + struct path_pattern *res = NULL; /* undecided */ int i; - if (!el->nr) + if (!pl->nr) return NULL; /* undefined */ - for (i = el->nr - 1; 0 <= i; i--) { - struct exclude *x = el->excludes[i]; - const char *exclude = x->pattern; - int prefix = x->nowildcardlen; + for (i = pl->nr - 1; 0 <= i; i--) { + struct path_pattern *pattern = pl->patterns[i]; + const char *exclude = pattern->pattern; + int prefix = pattern->nowildcardlen; - if (x->flags & EXC_FLAG_MUSTBEDIR) { - if (*dtype == DT_UNKNOWN) - *dtype = get_dtype(NULL, istate, pathname, pathlen); + if (pattern->flags & PATTERN_FLAG_MUSTBEDIR) { + *dtype = resolve_dtype(*dtype, istate, pathname, pathlen); if (*dtype != DT_DIR) continue; } - if (x->flags & EXC_FLAG_NODIR) { + if (pattern->flags & PATTERN_FLAG_NODIR) { if (match_basename(basename, pathlen - (basename - pathname), - exclude, prefix, x->patternlen, - x->flags)) { - exc = x; + exclude, prefix, pattern->patternlen, + pattern->flags)) { + res = pattern; break; } continue; } - assert(x->baselen == 0 || x->base[x->baselen - 1] == '/'); + assert(pattern->baselen == 0 || + pattern->base[pattern->baselen - 1] == '/'); if (match_pathname(pathname, pathlen, - x->base, x->baselen ? x->baselen - 1 : 0, - exclude, prefix, x->patternlen, x->flags)) { - exc = x; + pattern->base, + pattern->baselen ? pattern->baselen - 1 : 0, + exclude, prefix, pattern->patternlen, + pattern->flags)) { + res = pattern; break; } } - return exc; + return res; } /* - * Scan the list and let the last match determine the fate. - * Return 1 for exclude, 0 for include and -1 for undecided. + * 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. */ -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 */ +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; } -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) +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) { int i, j; struct exclude_list_group *group; - struct exclude *exclude; + struct path_pattern *pattern; for (i = EXC_CMDL; i <= EXC_FILE; i++) { group = &dir->exclude_list_group[i]; for (j = group->nr - 1; j >= 0; j--) { - exclude = last_exclude_matching_from_list( + pattern = last_matching_pattern_from_list( pathname, pathlen, basename, dtype_p, - &group->el[j], istate); - if (exclude) - return exclude; + &group->pl[j], istate); + if (pattern) + return pattern; } } return NULL; @@ -1114,7 +1439,7 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen) { struct exclude_list_group *group; - struct exclude_list *el; + struct pattern_list *pl; struct exclude_stack *stk = NULL; struct untracked_cache_dir *untracked; int current; @@ -1130,17 +1455,17 @@ static void prep_exclude(struct dir_struct *dir, if (stk->baselen <= baselen && !strncmp(dir->basebuf.buf, base, stk->baselen)) break; - el = &group->el[dir->exclude_stack->exclude_ix]; + pl = &group->pl[dir->exclude_stack->exclude_ix]; dir->exclude_stack = stk->prev; - dir->exclude = NULL; - free((char *)el->src); /* see strbuf_detach() below */ - clear_exclude_list(el); + dir->pattern = NULL; + free((char *)pl->src); /* see strbuf_detach() below */ + clear_pattern_list(pl); free(stk); group->nr--; } /* Skip traversing into sub directories if the parent is excluded */ - if (dir->exclude) + if (dir->pattern) return; /* @@ -1181,7 +1506,7 @@ static void prep_exclude(struct dir_struct *dir, stk->baselen = cp - base; stk->exclude_ix = group->nr; stk->ucd = untracked; - el = add_exclude_list(dir, EXC_DIRS, NULL); + pl = add_pattern_list(dir, EXC_DIRS, NULL); strbuf_add(&dir->basebuf, base + current, stk->baselen - current); assert(stk->baselen == dir->basebuf.len); @@ -1189,15 +1514,15 @@ static void prep_exclude(struct dir_struct *dir, if (stk->baselen) { int dt = DT_DIR; dir->basebuf.buf[stk->baselen - 1] = 0; - dir->exclude = last_exclude_matching_from_lists(dir, + dir->pattern = last_matching_pattern_from_lists(dir, istate, dir->basebuf.buf, stk->baselen - 1, dir->basebuf.buf + current, &dt); dir->basebuf.buf[stk->baselen - 1] = '/'; - if (dir->exclude && - dir->exclude->flags & EXC_FLAG_NEGATIVE) - dir->exclude = NULL; - if (dir->exclude) { + if (dir->pattern && + dir->pattern->flags & PATTERN_FLAG_NEGATIVE) + dir->pattern = NULL; + if (dir->pattern) { dir->exclude_stack = stk; return; } @@ -1223,30 +1548,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 exclude correctly + * member of each struct path_pattern correctly * back-references its source file. Other invocations - * of add_exclude_list provide stable strings, so we + * of add_pattern_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); - el->src = strbuf_detach(&sb, NULL); - add_excludes(el->src, el->src, stk->baselen, el, istate, + pl->src = strbuf_detach(&sb, NULL); + add_patterns(pl->src, pl->src, stk->baselen, pl, 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_exclude_matching(). When the cache is - * used, last_exclude_matching() will not be called and + * times more in last_matching_pattern(). When the cache is + * used, last_matching_pattern() 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_exclude_matching(). Be careful about ignore rule + * last_matching_pattern(). Be careful about ignore rule * order, though, if you do that. */ if (untracked && @@ -1266,7 +1591,7 @@ static void prep_exclude(struct dir_struct *dir, * Returns the exclude_list element which matched, or NULL for * undecided. */ -struct exclude *last_exclude_matching(struct dir_struct *dir, +struct path_pattern *last_matching_pattern(struct dir_struct *dir, struct index_state *istate, const char *pathname, int *dtype_p) @@ -1277,10 +1602,10 @@ struct exclude *last_exclude_matching(struct dir_struct *dir, prep_exclude(dir, istate, pathname, basename-pathname); - if (dir->exclude) - return dir->exclude; + if (dir->pattern) + return dir->pattern; - return last_exclude_matching_from_lists(dir, istate, pathname, pathlen, + return last_matching_pattern_from_lists(dir, istate, pathname, pathlen, basename, dtype_p); } @@ -1292,10 +1617,10 @@ struct exclude *last_exclude_matching(struct dir_struct *dir, int is_excluded(struct dir_struct *dir, struct index_state *istate, const char *pathname, int *dtype_p) { - struct exclude *exclude = - last_exclude_matching(dir, istate, pathname, dtype_p); - if (exclude) - return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1; + struct path_pattern *pattern = + last_matching_pattern(dir, istate, pathname, dtype_p); + if (pattern) + return pattern->flags & PATTERN_FLAG_NEGATIVE ? 0 : 1; return 0; } @@ -1427,23 +1752,64 @@ static enum exist_status directory_exists_in_index(struct index_state *istate, static enum path_treatment treat_directory(struct dir_struct *dir, struct index_state *istate, struct untracked_cache_dir *untracked, - const char *dirname, int len, int baselen, int exclude, + const char *dirname, int len, int baselen, int excluded, const struct pathspec *pathspec) { + /* + * WARNING: From this function, you can return path_recurse or you + * can call read_directory_recursive() (or neither), but + * you CAN'T DO BOTH. + */ + enum path_treatment state; + int matches_how = 0; + int nested_repo = 0, check_only, stop_early; + int old_ignored_nr, old_untracked_nr; /* The "len-1" is to strip the final '/' */ - switch (directory_exists_in_index(istate, dirname, len-1)) { - case index_directory: - return path_recurse; + enum exist_status status = directory_exists_in_index(istate, dirname, len-1); - case index_gitdir: + if (status == index_directory) + return path_recurse; + if (status == index_gitdir) return path_none; + if (status != index_nonexistent) + BUG("Unhandled value for directory_exists_in_index: %d\n", status); - case index_nonexistent: - if (dir->flags & DIR_SHOW_OTHER_DIRECTORIES) - break; - if (exclude && - (dir->flags & DIR_SHOW_IGNORED_TOO) && - (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)) { + /* + * We don't want to descend into paths that don't match the necessary + * patterns. Clearly, if we don't have a pathspec, then we can't check + * for matching patterns. Also, if (excluded) then we know we matched + * the exclusion patterns so as an optimization we can skip checking + * for matching patterns. + */ + if (pathspec && !excluded) { + matches_how = match_pathspec_with_flags(istate, pathspec, + dirname, len, + 0 /* prefix */, + NULL /* seen */, + DO_MATCH_LEADING_PATHSPEC); + if (!matches_how) + return path_none; + } + + + 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) { + if ((dir->flags & DIR_SKIP_NESTED_GIT) || + (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC)) + return path_none; + return excluded ? path_excluded : path_untracked; + } + + if (!(dir->flags & DIR_SHOW_OTHER_DIRECTORIES)) { + if (excluded && + (dir->flags & DIR_SHOW_IGNORED_TOO) && + (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)) { /* * This is an excluded directory and we are @@ -1465,30 +1831,140 @@ 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; } /* This is the "show_other_directories" case */ - if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES)) - return exclude ? path_excluded : path_untracked; + /* + * If we have a pathspec which could match something _below_ this + * directory (e.g. when checking 'subdir/' having a pathspec like + * 'subdir/some/deep/path/file' or 'subdir/widget-*.c'), then we + * need to recurse. + */ + if (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC) + return path_recurse; + + /* + * Other than the path_recurse case immediately above, we only need + * to recurse into untracked/ignored directories if either of the + * following bits is set: + * - DIR_SHOW_IGNORED_TOO (because then we need to determine if + * there are ignored entries below) + * - DIR_HIDE_EMPTY_DIRECTORIES (because we have to determine if + * the directory is empty) + */ + if (!(dir->flags & (DIR_SHOW_IGNORED_TOO | DIR_HIDE_EMPTY_DIRECTORIES))) + return excluded ? path_excluded : path_untracked; + + /* + * ...and even if DIR_SHOW_IGNORED_TOO is set, we can still avoid + * recursing into ignored directories if the path is excluded and + * DIR_SHOW_IGNORED_TOO_MODE_MATCHING is also set. + */ + if (excluded && + (dir->flags & DIR_SHOW_IGNORED_TOO) && + (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)) + return path_excluded; + + /* + * Even if we don't want to know all the paths under an untracked or + * ignored directory, we may still need to go into the directory to + * determine if it is empty (because with DIR_HIDE_EMPTY_DIRECTORIES, + * an empty directory should be path_none instead of path_excluded or + * path_untracked). + */ + check_only = ((dir->flags & DIR_HIDE_EMPTY_DIRECTORIES) && + !(dir->flags & DIR_SHOW_IGNORED_TOO)); + + /* + * However, there's another optimization possible as a subset of + * check_only, based on the cases we have to consider: + * A) Directory matches no exclude patterns: + * * Directory is empty => path_none + * * Directory has an untracked file under it => path_untracked + * * Directory has only ignored files under it => path_excluded + * B) Directory matches an exclude pattern: + * * Directory is empty => path_none + * * Directory has an untracked file under it => path_excluded + * * Directory has only ignored files under it => path_excluded + * In case A, we can exit as soon as we've found an untracked + * file but otherwise have to walk all files. In case B, though, + * we can stop at the first file we find under the directory. + */ + stop_early = check_only && excluded; + + /* + * If /every/ file within an untracked directory is ignored, then + * we want to treat the directory as ignored (for e.g. status + * --porcelain), without listing the individual ignored files + * underneath. To do so, we'll save the current ignored_nr, and + * pop all the ones added after it if it turns out the entire + * directory is ignored. Also, when DIR_SHOW_IGNORED_TOO and + * !DIR_KEEP_UNTRACKED_CONTENTS then we don't want to show + * untracked paths so will need to pop all those off the last + * after we traverse. + */ + old_ignored_nr = dir->ignored_nr; + old_untracked_nr = dir->nr; + /* Actually recurse into dirname now, we'll fixup the state later. */ untracked = lookup_untracked(dir->untracked, untracked, dirname + baselen, len - baselen); + state = read_directory_recursive(dir, istate, dirname, len, untracked, + check_only, stop_early, pathspec); + + /* There are a variety of reasons we may need to fixup the state... */ + if (state == path_excluded) { + /* state == path_excluded implies all paths under + * dirname were ignored... + * + * if running e.g. `git status --porcelain --ignored=matching`, + * then we want to see the subpaths that are ignored. + * + * if running e.g. just `git status --porcelain`, then + * we just want the directory itself to be listed as ignored + * and not the individual paths underneath. + */ + int want_ignored_subpaths = + ((dir->flags & DIR_SHOW_IGNORED_TOO) && + (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)); + + if (want_ignored_subpaths) { + /* + * with --ignored=matching, we want the subpaths + * INSTEAD of the directory itself. + */ + state = path_none; + } else { + int i; + for (i = old_ignored_nr + 1; i<dir->ignored_nr; ++i) + FREE_AND_NULL(dir->ignored[i]); + dir->ignored_nr = old_ignored_nr; + } + } /* - * If this is an excluded directory, then we only need to check if - * the directory contains any files. + * We may need to ignore some of the untracked paths we found while + * traversing subdirectories. */ - return read_directory_recursive(dir, istate, dirname, len, - untracked, 1, exclude, pathspec); + if ((dir->flags & DIR_SHOW_IGNORED_TOO) && + !(dir->flags & DIR_KEEP_UNTRACKED_CONTENTS)) { + int i; + for (i = old_untracked_nr + 1; i<dir->nr; ++i) + FREE_AND_NULL(dir->entries[i]); + dir->nr = old_untracked_nr; + } + + /* + * If there is nothing under the current directory and we are not + * hiding empty directories, then we need to report on the + * untracked or ignored status of the directory itself. + */ + if (state == path_none && !(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES)) + state = excluded ? path_excluded : path_untracked; + + return state; } /* @@ -1607,10 +2083,9 @@ static int get_index_dtype(struct index_state *istate, return DT_UNKNOWN; } -static int get_dtype(struct dirent *de, struct index_state *istate, - const char *path, int len) +static int resolve_dtype(int dtype, struct index_state *istate, + const char *path, int len) { - int dtype = de ? DTYPE(de) : DT_UNKNOWN; struct stat st; if (dtype != DT_UNKNOWN) @@ -1629,22 +2104,68 @@ static int get_dtype(struct dirent *de, struct index_state *istate, return dtype; } -static enum path_treatment treat_one_path(struct dir_struct *dir, - struct untracked_cache_dir *untracked, - struct index_state *istate, - struct strbuf *path, - int baselen, - const struct pathspec *pathspec, - int dtype, struct dirent *de) +static enum path_treatment treat_path_fast(struct dir_struct *dir, + struct cached_dir *cdir, + struct index_state *istate, + struct strbuf *path, + int baselen, + const struct pathspec *pathspec) { - int exclude; - int has_path_in_index = !!index_file_exists(istate, path->buf, path->len, ignore_case); - enum path_treatment path_treatment; + /* + * WARNING: From this function, you can return path_recurse or you + * can call read_directory_recursive() (or neither), but + * you CAN'T DO BOTH. + */ + strbuf_setlen(path, baselen); + if (!cdir->ucd) { + strbuf_addstr(path, cdir->file); + return path_untracked; + } + strbuf_addstr(path, cdir->ucd->name); + /* treat_one_path() does this before it calls treat_directory() */ + strbuf_complete(path, '/'); + if (cdir->ucd->check_only) + /* + * check_only is set as a result of treat_directory() getting + * to its bottom. Verify again the same set of directories + * with check_only set. + */ + return read_directory_recursive(dir, istate, path->buf, path->len, + cdir->ucd, 1, 0, pathspec); + /* + * We get path_recurse in the first run when + * directory_exists_in_index() returns index_nonexistent. We + * are sure that new changes in the index does not impact the + * outcome. Return now. + */ + return path_recurse; +} + +static enum path_treatment treat_path(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) +{ + int has_path_in_index, dtype, excluded; + + if (!cdir->d_name) + return treat_path_fast(dir, cdir, istate, path, + baselen, pathspec); + if (is_dot_or_dotdot(cdir->d_name) || !fspathcmp(cdir->d_name, ".git")) + return path_none; + strbuf_setlen(path, baselen); + strbuf_addstr(path, cdir->d_name); + if (simplify_away(path->buf, path->len, pathspec)) + return path_none; - if (dtype == DT_UNKNOWN) - dtype = get_dtype(de, istate, path->buf, path->len); + dtype = resolve_dtype(cdir->d_type, istate, path->buf, path->len); /* Always exclude indexed files */ + has_path_in_index = !!index_file_exists(istate, path->buf, path->len, + ignore_case); if (dtype != DT_DIR && has_path_in_index) return path_none; @@ -1672,99 +2193,40 @@ static enum path_treatment treat_one_path(struct dir_struct *dir, (directory_exists_in_index(istate, path->buf, path->len) == index_nonexistent)) return path_none; - exclude = is_excluded(dir, istate, path->buf, &dtype); + excluded = is_excluded(dir, istate, path->buf, &dtype); /* * Excluded? If we don't explicitly want to show * ignored files, ignore it */ - if (exclude && !(dir->flags & (DIR_SHOW_IGNORED|DIR_SHOW_IGNORED_TOO))) + if (excluded && !(dir->flags & (DIR_SHOW_IGNORED|DIR_SHOW_IGNORED_TOO))) return path_excluded; switch (dtype) { default: return path_none; case DT_DIR: - strbuf_addch(path, '/'); - path_treatment = treat_directory(dir, istate, untracked, - path->buf, path->len, - baselen, exclude, pathspec); /* - * If 1) we only want to return directories that - * match an exclude pattern and 2) this directory does - * not match an exclude pattern but all of its - * contents are excluded, then indicate that we should - * recurse into this directory (instead of marking the - * directory itself as an ignored path). + * WARNING: Do not ignore/amend the return value from + * treat_directory(), and especially do not change it to return + * path_recurse as that can cause exponential slowdown. + * Instead, modify treat_directory() to return the right value. */ - if (!exclude && - path_treatment == path_excluded && - (dir->flags & DIR_SHOW_IGNORED_TOO) && - (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)) - return path_recurse; - return path_treatment; + strbuf_addch(path, '/'); + return treat_directory(dir, istate, untracked, + path->buf, path->len, + baselen, excluded, pathspec); case DT_REG: case DT_LNK: - return exclude ? path_excluded : path_untracked; - } -} - -static enum path_treatment treat_path_fast(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) -{ - strbuf_setlen(path, baselen); - if (!cdir->ucd) { - strbuf_addstr(path, cdir->file); + if (pathspec && + !match_pathspec(istate, pathspec, path->buf, path->len, + 0 /* prefix */, NULL /* seen */, + 0 /* is_dir */)) + return path_none; + if (excluded) + return path_excluded; return path_untracked; } - strbuf_addstr(path, cdir->ucd->name); - /* treat_one_path() does this before it calls treat_directory() */ - strbuf_complete(path, '/'); - if (cdir->ucd->check_only) - /* - * check_only is set as a result of treat_directory() getting - * to its bottom. Verify again the same set of directories - * with check_only set. - */ - return read_directory_recursive(dir, istate, path->buf, path->len, - cdir->ucd, 1, 0, pathspec); - /* - * We get path_recurse in the first run when - * directory_exists_in_index() returns index_nonexistent. We - * are sure that new changes in the index does not impact the - * outcome. Return now. - */ - return path_recurse; -} - -static enum path_treatment treat_path(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) -{ - 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(de->d_name) || !fspathcmp(de->d_name, ".git")) - return path_none; - strbuf_setlen(path, baselen); - strbuf_addstr(path, de->d_name); - if (simplify_away(path->buf, path->len, pathspec)) - return path_none; - - 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) @@ -1808,7 +2270,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_exclude_matching(). We + * but it's called much later in last_matching_pattern(). 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. @@ -1852,10 +2314,17 @@ static int open_cached_dir(struct cached_dir *cdir, static int read_cached_dir(struct cached_dir *cdir) { + struct dirent *de; + if (cdir->fdir) { - cdir->de = readdir(cdir->fdir); - if (!cdir->de) + de = readdir(cdir->fdir); + if (!de) { + cdir->d_name = NULL; + cdir->d_type = DT_UNKNOWN; return -1; + } + cdir->d_name = de->d_name; + cdir->d_type = DTYPE(de); return 0; } while (cdir->nr_dirs < cdir->untracked->dirs_nr) { @@ -1891,6 +2360,40 @@ 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 @@ -1903,7 +2406,7 @@ static void close_cached_dir(struct cached_dir *cdir) * If 'stop_at_first_file' is specified, 'path_excluded' is returned * to signal that a file was found. This is the least significant value that * indicates that a file was encountered that does not depend on the order of - * whether an untracked or exluded path was encountered first. + * whether an untracked or excluded path was encountered first. * * Returns the most significant path_treatment value encountered in the scan. * If 'stop_at_first_file' is specified, `path_excluded` is the most @@ -1915,6 +2418,11 @@ 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: Do NOT recurse unless path_recurse is returned from + * treat_path(). Recursing on any other return value + * can result in exponential slowdown. + */ struct cached_dir cdir; enum path_treatment state, subdir_state, dir_state = path_none; struct strbuf path = STRBUF_INIT; @@ -1936,10 +2444,7 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, dir_state = state; /* recurse into subdir if instructed by treat_path */ - if ((state == path_recurse) || - ((state == path_untracked) && - (dir->flags & DIR_SHOW_IGNORED_TOO) && - (get_dtype(cdir.de, istate, path.buf, path.len) == DT_DIR))) { + if (state == path_recurse) { struct untracked_cache_dir *ud; ud = lookup_untracked(dir->untracked, untracked, path.buf + baselen, @@ -1950,6 +2455,12 @@ 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) { @@ -1981,33 +2492,13 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, add_untracked(untracked, path.buf + baselen); break; } - /* skip the dir_add_* part */ + /* skip the add_path_to_appropriate_result_list() */ continue; } - /* 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; - } + add_path_to_appropriate_result_list(dir, untracked, &cdir, + istate, &path, baselen, + pathspec, state); } close_cached_dir(&cdir); out: @@ -2038,40 +2529,69 @@ static int treat_leading_path(struct dir_struct *dir, const struct pathspec *pathspec) { struct strbuf sb = STRBUF_INIT; - int baselen, rc = 0; + struct strbuf subdir = STRBUF_INIT; + int prevlen, baselen; const char *cp; - int old_flags = dir->flags; + 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. + */ while (len && path[len - 1] == '/') len--; if (!len) return 1; + + memset(&cdir, 0, sizeof(cdir)); + cdir.d_type = DT_DIR; baselen = 0; - dir->flags &= ~DIR_SHOW_OTHER_DIRECTORIES; + prevlen = 0; while (1) { - cp = path + baselen + !!baselen; + prevlen = baselen + !!baselen; + cp = path + prevlen; cp = memchr(cp, '/', path + len - cp); if (!cp) baselen = len; else baselen = cp - path; - strbuf_setlen(&sb, 0); + strbuf_reset(&sb); strbuf_add(&sb, path, baselen); if (!is_directory(sb.buf)) break; - if (simplify_away(sb.buf, sb.len, pathspec)) - break; - if (treat_one_path(dir, NULL, istate, &sb, baselen, pathspec, - DT_DIR, NULL) == path_none) + 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_recurse) break; /* do not recurse into it */ - if (len <= baselen) { - rc = 1; + if (len <= baselen) break; /* finished checking */ - } } + add_path_to_appropriate_result_list(dir, NULL, &cdir, istate, + &sb, baselen, pathspec, + state); + + strbuf_release(&subdir); strbuf_release(&sb); - dir->flags = old_flags; - return rc; + return state == path_recurse; } static const char *get_ident_string(void) @@ -2258,28 +2778,6 @@ int read_directory(struct dir_struct *dir, struct index_state *istate, QSORT(dir->entries, dir->nr, cmp_dir_entry); QSORT(dir->ignored, dir->ignored_nr, cmp_dir_entry); - /* - * If DIR_SHOW_IGNORED_TOO is set, read_directory_recursive() will - * also pick up untracked contents of untracked dirs; by default - * we discard these, but given DIR_KEEP_UNTRACKED_CONTENTS we do not. - */ - if ((dir->flags & DIR_SHOW_IGNORED_TOO) && - !(dir->flags & DIR_KEEP_UNTRACKED_CONTENTS)) { - int i, j; - - /* remove from dir->entries untracked contents of untracked dirs */ - for (i = j = 0; j < dir->nr; j++) { - if (i && - check_dir_entry_contains(dir->entries[i - 1], dir->entries[j])) { - FREE_AND_NULL(dir->entries[j]); - } else { - dir->entries[i++] = dir->entries[j]; - } - } - - dir->nr = i; - } - trace_performance_leave("read directory %.*s", len, path); if (dir->untracked) { static int force_untracked_cache = -1; @@ -2446,7 +2944,7 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up) * wanted anyway */ continue; - /* fall thru */ + /* fall through */ } else if (S_ISDIR(st.st_mode)) { if (!remove_dir_recurse(path, flag, &kept_down)) continue; /* happy */ @@ -2488,14 +2986,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_excludes_from_file_1(dir, excludes_file, + add_patterns_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_excludes_from_file_1(dir, path, + add_patterns_from_file_1(dir, path, dir->untracked ? &dir->ss_info_exclude : NULL); } } @@ -2520,27 +3018,34 @@ int remove_path(const char *name) } /* - * Frees memory within dir which was allocated for exclude lists and - * the exclude_stack. Does not free dir itself. + * Frees memory within dir which was allocated, and resets fields for further + * use. Does not free dir itself. */ -void clear_directory(struct dir_struct *dir) +void dir_clear(struct dir_struct *dir) { int i, j; struct exclude_list_group *group; - struct exclude_list *el; + struct pattern_list *pl; 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++) { - el = &group->el[j]; + pl = &group->pl[j]; if (i == EXC_DIRS) - free((char *)el->src); - clear_exclude_list(el); + free((char *)pl->src); + clear_pattern_list(pl); } - free(group->el); + free(group->pl); } + for (i = 0; i < dir->ignored_nr; i++) + free(dir->ignored[i]); + for (i = 0; i < dir->nr; i++) + free(dir->entries[i]); + free(dir->ignored); + free(dir->entries); + stk = dir->exclude_stack; while (stk) { struct exclude_stack *prev = stk->prev; @@ -2548,6 +3053,8 @@ void clear_directory(struct dir_struct *dir) stk = prev; } strbuf_release(&dir->basebuf); + + dir_init(dir); } struct ondisk_untracked_cache { diff --git a/third_party/git/dir.h b/third_party/git/dir.h index 680079bbe3..a3c40dec51 100644 --- a/third_party/git/dir.h +++ b/third_party/git/dir.h @@ -1,34 +1,67 @@ #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` using `dir_init()` function. + * + * - 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, instead of manually calling + * the add_pattern*() family of functions. + * + * - Call `fill_directory()`. + * + * - Use `dir.entries[]` and `dir.ignored[]`. + * + * - Call `dir_clear()` when the contained elements are no longer in use. + * + */ + struct dir_entry { unsigned int len; char name[FLEX_ARRAY]; /* more */ }; -#define EXC_FLAG_NODIR 1 -#define EXC_FLAG_ENDSWITH 4 -#define EXC_FLAG_MUSTBEDIR 8 -#define EXC_FLAG_NEGATIVE 16 +#define PATTERN_FLAG_NODIR 1 +#define PATTERN_FLAG_ENDSWITH 4 +#define PATTERN_FLAG_MUSTBEDIR 8 +#define PATTERN_FLAG_NEGATIVE 16 -struct exclude { +struct path_pattern { /* - * This allows callers of last_exclude_matching() etc. + * This allows callers of last_matching_pattern() etc. * to determine the origin of the matching pattern. */ - struct exclude_list *el; + struct pattern_list *pl; const char *pattern; int patternlen; int nowildcardlen; const char *base; int baselen; - unsigned flags; /* EXC_FLAG_* */ + unsigned flags; /* PATTERN_FLAG_* */ /* * Counting starts from 1 for line numbers in ignore files, @@ -37,6 +70,13 @@ struct exclude { 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 @@ -44,7 +84,7 @@ struct exclude { * can also be used to represent the list of --exclude values passed * via CLI args. */ -struct exclude_list { +struct pattern_list { int nr; int alloc; @@ -54,7 +94,27 @@ struct exclude_list { /* origin of list, e.g. path to filename, or descriptive string */ const char *src; - struct exclude **excludes; + 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; }; /* @@ -72,7 +132,7 @@ struct exclude_stack { struct exclude_list_group { int nr, alloc; - struct exclude_list *el; + struct pattern_list *pl; }; struct oid_stat { @@ -144,24 +204,101 @@ 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 { - int nr, alloc; - int ignored_nr, ignored_alloc; + + /* 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 */ 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, - DIR_SHOW_IGNORED_TOO_MODE_MATCHING = 1<<8 + + /** + * 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 } 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; - /* Exclude info */ + /** + * The name of the file to be read in each directory for excluded files + * (typically `.gitignore`). + */ const char *exclude_per_dir; /* @@ -191,7 +328,7 @@ struct dir_struct { * matching exclude struct if the directory is excluded. */ struct exclude_stack *exclude_stack; - struct exclude *exclude; + struct path_pattern *pattern; struct strbuf basebuf; /* Enable untracked file cache if set */ @@ -211,8 +348,9 @@ int count_slashes(const char *s); * when populating the seen[] array. */ #define MATCHED_RECURSIVELY 1 -#define MATCHED_FNMATCH 2 -#define MATCHED_EXACTLY 3 +#define MATCHED_RECURSIVELY_LEADING_PATHSPEC 2 +#define MATCHED_FNMATCH 3 +#define MATCHED_EXACTLY 4 int simple_length(const char *match); int no_wildcard(const char *string); char *common_prefix(const struct pathspec *pathspec); @@ -223,6 +361,8 @@ int match_pathspec(const struct index_state *istate, int report_path_error(const char *ps_matched, const struct pathspec *pathspec); int within_depth(const char *name, int namelen, int depth, int max_depth); +void dir_init(struct dir_struct *dir); + int fill_directory(struct dir_struct *dir, struct index_state *istate, const struct pathspec *pathspec); @@ -230,10 +370,24 @@ int read_directory(struct dir_struct *, struct index_state *istate, const char *path, int len, const struct pathspec *pathspec); -int is_excluded_from_list(const char *pathname, int pathlen, - const char *basename, int *dtype, - struct exclude_list *el, - struct index_state *istate); +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); struct dir_entry *dir_add_ignored(struct dir_struct *dir, struct index_state *istate, const char *pathname, int len); @@ -248,27 +402,34 @@ int match_pathname(const char *, int, const char *, int, const char *, int, int, unsigned); -struct exclude *last_exclude_matching(struct dir_struct *dir, - struct index_state *istate, - const char *name, int *dtype); +struct path_pattern *last_matching_pattern(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); -struct exclude_list *add_exclude_list(struct dir_struct *dir, +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, int group_type, const char *src); -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, +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, const char *base, int baselen, - 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); + 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); +void dir_clear(struct dir_struct *dir); int repo_file_exists(struct repository *repo, const char *path); int file_exists(const char *); diff --git a/third_party/git/editor.c b/third_party/git/editor.c index f079abbf11..6303ae0ab0 100644 --- a/third_party/git/editor.c +++ b/third_party/git/editor.c @@ -40,7 +40,7 @@ const char *git_sequence_editor(void) const char *editor = getenv("GIT_SEQUENCE_EDITOR"); if (!editor) - git_config_get_string_const("sequence.editor", &editor); + git_config_get_string_tmp("sequence.editor", &editor); if (!editor) editor = git_editor(); @@ -54,7 +54,8 @@ static int launch_specified_editor(const char *editor, const char *path, return error("Terminal is dumb, but EDITOR unset"); if (strcmp(editor, ":")) { - const char *args[] = { editor, real_path(path), NULL }; + struct strbuf realpath = STRBUF_INIT; + const char *args[] = { editor, NULL, NULL }; struct child_process p = CHILD_PROCESS_INIT; int ret, sig; int print_waiting_for_editor = advice_waiting_for_editor && isatty(2); @@ -75,16 +76,22 @@ static int launch_specified_editor(const char *editor, const char *path, fflush(stderr); } + strbuf_realpath(&realpath, path, 1); + args[1] = realpath.buf; + p.argv = args; p.env = env; p.use_shell = 1; p.trace2_child_class = "editor"; - if (start_command(&p) < 0) + if (start_command(&p) < 0) { + strbuf_release(&realpath); return error("unable to start editor '%s'", editor); + } sigchain_push(SIGINT, SIG_IGN); sigchain_push(SIGQUIT, SIG_IGN); ret = finish_command(&p); + strbuf_release(&realpath); sig = ret - 128; sigchain_pop(SIGINT); sigchain_pop(SIGQUIT); diff --git a/third_party/git/entry.c b/third_party/git/entry.c index 53380bb614..a0532f1f00 100644 --- a/third_party/git/entry.c +++ b/third_party/git/entry.c @@ -113,8 +113,7 @@ static int fstat_output(int fd, const struct checkout *state, struct stat *st) /* use fstat() only when path == ce->name */ if (fstat_is_reliable() && state->refresh_cache && !state->base_dir_len) { - fstat(fd, st); - return 1; + return !fstat(fd, st); } return 0; } @@ -264,6 +263,9 @@ static int write_entry(struct cache_entry *ce, size_t newsize = 0; struct stat st; const struct submodule *sub; + struct checkout_metadata meta; + + clone_checkout_metadata(&meta, &state->meta, &ce->oid); if (ce_mode_s_ifmt == S_IFREG) { struct stream_filter *filter = get_stream_filter(state->istate, ce->name, @@ -315,13 +317,13 @@ static int write_entry(struct cache_entry *ce, */ if (dco && dco->state != CE_NO_DELAY) { ret = async_convert_to_working_tree(state->istate, ce->name, new_blob, - size, &buf, dco); + size, &buf, &meta, dco); if (ret && string_list_has_string(&dco->paths, ce->name)) { free(new_blob); goto delayed; } } else - ret = convert_to_working_tree(state->istate, ce->name, new_blob, size, &buf); + ret = convert_to_working_tree(state->istate, ce->name, new_blob, size, &buf, &meta); if (ret) { free(new_blob); @@ -508,8 +510,6 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state, /* If it is a gitlink, leave it alone! */ if (S_ISGITLINK(ce->ce_mode)) return 0; - if (!state->force) - return error("%s is a directory", path.buf); remove_subtree(&path); } else if (unlink(path.buf)) return error_errno("unable to unlink old '%s'", path.buf); diff --git a/third_party/git/environment.c b/third_party/git/environment.c index 89af47cb85..bb518c61cd 100644 --- a/third_party/git/environment.c +++ b/third_party/git/environment.c @@ -14,9 +14,10 @@ #include "refs.h" #include "fmt-merge-msg.h" #include "commit.h" -#include "argv-array.h" +#include "strvec.h" #include "object-store.h" #include "chdir-notify.h" +#include "shallow.h" int trust_executable_bit = 1; int trust_ctime = 1; @@ -31,13 +32,11 @@ 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; -const char *apply_default_whitespace; -const char *apply_default_ignorewhitespace; +char *apply_default_whitespace; +char *apply_default_ignorewhitespace; const char *git_attributes_file; const char *git_hooks_path; int zlib_compression_level = Z_BEST_SPEED; @@ -69,6 +68,7 @@ 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; @@ -80,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 0 +#define PROTECT_NTFS_DEFAULT 1 #endif int protect_ntfs = PROTECT_NTFS_DEFAULT; const char *core_fsmonitor; @@ -156,15 +156,15 @@ static char *expand_namespace(const char *raw_namespace) * Wrapper of getenv() that returns a strdup value. This value is kept * in argv to be freed later. */ -static const char *getenv_safe(struct argv_array *argv, const char *name) +static const char *getenv_safe(struct strvec *argv, const char *name) { const char *value = getenv(name); if (!value) return NULL; - argv_array_push(argv, value); - return argv->argv[argv->argc - 1]; + strvec_push(argv, value); + return argv->v[argv->nr - 1]; } void setup_git_env(const char *git_dir) @@ -172,7 +172,7 @@ void setup_git_env(const char *git_dir) const char *shallow_file; const char *replace_ref_base; struct set_gitdir_args args = { NULL }; - struct argv_array to_free = ARGV_ARRAY_INIT; + struct strvec to_free = STRVEC_INIT; args.commondir = getenv_safe(&to_free, GIT_COMMON_DIR_ENVIRONMENT); args.object_dir = getenv_safe(&to_free, DB_ENVIRONMENT); @@ -180,7 +180,7 @@ void setup_git_env(const char *git_dir) args.index_file = getenv_safe(&to_free, INDEX_ENVIRONMENT); args.alternate_db = getenv_safe(&to_free, ALTERNATE_DB_ENVIRONMENT); repo_set_gitdir(the_repository, git_dir, &args); - argv_array_clear(&to_free); + strvec_clear(&to_free); if (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT)) read_replace_refs = 0; @@ -255,8 +255,11 @@ static int git_work_tree_initialized; */ void set_git_work_tree(const char *new_work_tree) { + struct strbuf realpath = STRBUF_INIT; + if (git_work_tree_initialized) { - new_work_tree = real_path(new_work_tree); + strbuf_realpath(&realpath, new_work_tree, 1); + new_work_tree = realpath.buf; if (strcmp(new_work_tree, the_repository->worktree)) die("internal error: work tree has already been set\n" "Current worktree: %s\nNew worktree: %s", @@ -265,6 +268,8 @@ void set_git_work_tree(const char *new_work_tree) } git_work_tree_initialized = 1; repo_set_worktree(the_repository, new_work_tree); + + strbuf_release(&realpath); } const char *get_git_work_tree(void) @@ -346,11 +351,20 @@ static void update_relative_gitdir(const char *name, free(path); } -void set_git_dir(const char *path) +void set_git_dir(const char *path, int make_realpath) { + struct strbuf realpath = STRBUF_INIT; + + if (make_realpath) { + strbuf_realpath(&realpath, path, 1); + path = realpath.buf; + } + set_git_dir_1(path); if (!is_absolute_path(path)) chdir_notify_register(NULL, update_relative_gitdir, NULL); + + strbuf_release(&realpath); } const char *get_log_output_encoding(void) diff --git a/third_party/git/ewah/bitmap.c b/third_party/git/ewah/bitmap.c index 52f1178db4..d8cec585af 100644 --- a/third_party/git/ewah/bitmap.c +++ b/third_party/git/ewah/bitmap.c @@ -22,21 +22,26 @@ #define EWAH_MASK(x) ((eword_t)1 << (x % BITS_IN_EWORD)) #define EWAH_BLOCK(x) (x / BITS_IN_EWORD) -struct bitmap *bitmap_new(void) +struct bitmap *bitmap_word_alloc(size_t word_alloc) { struct bitmap *bitmap = xmalloc(sizeof(struct bitmap)); - bitmap->words = xcalloc(32, sizeof(eword_t)); - bitmap->word_alloc = 32; + bitmap->words = xcalloc(word_alloc, sizeof(eword_t)); + bitmap->word_alloc = word_alloc; 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 * 2; + self->word_alloc = block ? block * 2 : 1; REALLOC_ARRAY(self->words, self->word_alloc); memset(self->words + old_size, 0x0, (self->word_alloc - old_size) * sizeof(eword_t)); @@ -45,6 +50,14 @@ 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 84b2a29faa..011852bef1 100644 --- a/third_party/git/ewah/ewok.h +++ b/third_party/git/ewah/ewok.h @@ -172,7 +172,9 @@ 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/exec-cmd.c b/third_party/git/exec-cmd.c index 7deeab3039..eeb2ee52b8 100644 --- a/third_party/git/exec-cmd.c +++ b/third_party/git/exec-cmd.c @@ -1,7 +1,7 @@ #include "cache.h" #include "exec-cmd.h" #include "quote.h" -#include "argv-array.h" +#include "strvec.h" #if defined(RUNTIME_PREFIX) @@ -320,26 +320,26 @@ void setup_path(void) strbuf_release(&new_path); } -const char **prepare_git_cmd(struct argv_array *out, const char **argv) +const char **prepare_git_cmd(struct strvec *out, const char **argv) { - argv_array_push(out, "git"); - argv_array_pushv(out, argv); - return out->argv; + strvec_push(out, "git"); + strvec_pushv(out, argv); + return out->v; } int execv_git_cmd(const char **argv) { - struct argv_array nargv = ARGV_ARRAY_INIT; + struct strvec nargv = STRVEC_INIT; prepare_git_cmd(&nargv, argv); - trace_argv_printf(nargv.argv, "trace: exec:"); + trace_argv_printf(nargv.v, "trace: exec:"); /* execvp() can only ever return if it fails */ - sane_execvp("git", (char **)nargv.argv); + sane_execvp("git", (char **)nargv.v); trace_printf("trace: exec failed: %s\n", strerror(errno)); - argv_array_clear(&nargv); + strvec_clear(&nargv); return -1; } diff --git a/third_party/git/exec-cmd.h b/third_party/git/exec-cmd.h index 8cd1df28d3..330b41d54d 100644 --- a/third_party/git/exec-cmd.h +++ b/third_party/git/exec-cmd.h @@ -1,13 +1,13 @@ #ifndef GIT_EXEC_CMD_H #define GIT_EXEC_CMD_H -struct argv_array; +struct strvec; void git_set_exec_path(const char *exec_path); void git_resolve_executable_dir(const char *path); const char *git_exec_path(void); void setup_path(void); -const char **prepare_git_cmd(struct argv_array *out, const char **argv); +const char **prepare_git_cmd(struct strvec *out, const char **argv); int execv_git_cmd(const char **argv); /* NULL terminated */ LAST_ARG_MUST_BE_NULL int execl_git_cmd(const char *cmd, ...); diff --git a/third_party/git/fetch-negotiator.c b/third_party/git/fetch-negotiator.c index d6d685cba0..57ed5784e1 100644 --- a/third_party/git/fetch-negotiator.c +++ b/third_party/git/fetch-negotiator.c @@ -2,19 +2,25 @@ #include "fetch-negotiator.h" #include "negotiator/default.h" #include "negotiator/skipping.h" +#include "negotiator/noop.h" +#include "repository.h" -void fetch_negotiator_init(struct fetch_negotiator *negotiator, - const char *algorithm) +void fetch_negotiator_init(struct repository *r, + struct fetch_negotiator *negotiator) { - 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); - } + prepare_repo_settings(r); + switch(r->settings.fetch_negotiation_algorithm) { + case FETCH_NEGOTIATION_SKIPPING: + skipping_negotiator_init(negotiator); + return; + + case FETCH_NEGOTIATION_NOOP: + noop_negotiator_init(negotiator); + return; + + case FETCH_NEGOTIATION_DEFAULT: + default: + default_negotiator_init(negotiator); + return; } - default_negotiator_init(negotiator); } diff --git a/third_party/git/fetch-negotiator.h b/third_party/git/fetch-negotiator.h index 9e3967ce66..ea78868504 100644 --- a/third_party/git/fetch-negotiator.h +++ b/third_party/git/fetch-negotiator.h @@ -2,6 +2,7 @@ #define FETCH_NEGOTIATOR_H struct commit; +struct repository; /* * An object that supplies the information needed to negotiate the contents of @@ -52,7 +53,7 @@ struct fetch_negotiator { void *data; }; -void fetch_negotiator_init(struct fetch_negotiator *negotiator, - const char *algorithm); +void fetch_negotiator_init(struct repository *r, + struct fetch_negotiator *negotiator); #endif diff --git a/third_party/git/fetch-object.c b/third_party/git/fetch-object.c deleted file mode 100644 index 4266548800..0000000000 --- a/third_party/git/fetch-object.c +++ /dev/null @@ -1,40 +0,0 @@ -#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 deleted file mode 100644 index d6444caa5a..0000000000 --- a/third_party/git/fetch-object.h +++ /dev/null @@ -1,9 +0,0 @@ -#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 65be043f2a..b10c432315 100644 --- a/third_party/git/fetch-pack.c +++ b/third_party/git/fetch-pack.c @@ -15,13 +15,14 @@ #include "connect.h" #include "transport.h" #include "version.h" -#include "sha1-array.h" +#include "oid-array.h" #include "oidset.h" #include "packfile.h" #include "object-store.h" #include "connected.h" #include "fetch-negotiator.h" #include "fsck.h" +#include "shallow.h" static int transfer_unpack_limit = -1; static int fetch_unpack_limit = -1; @@ -34,10 +35,10 @@ static int fetch_fsck_objects = -1; static int transfer_fsck_objects = -1; static int agent_supported; static int server_supports_filtering; -static struct lock_file shallow_lock; +static struct shallow_lock shallow_lock; static const char *alternate_shallow_file; -static char *negotiation_algorithm; static struct strbuf fsck_msg_types = STRBUF_INIT; +static struct string_list uri_protocols = STRING_LIST_INIT_DUP; /* Remember to update object flag allocation in object.h */ #define COMPLETE (1U << 0) @@ -107,24 +108,48 @@ static void for_each_cached_alternate(struct fetch_negotiator *negotiator, cb(negotiator, cache.items[i]); } +static struct commit *deref_without_lazy_fetch(const struct object_id *oid, + int mark_tags_complete) +{ + enum object_type type; + struct object_info info = { .typep = &type }; + + while (1) { + if (oid_object_info_extended(the_repository, oid, &info, + OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK)) + return NULL; + if (type == OBJ_TAG) { + struct tag *tag = (struct tag *) + parse_object(the_repository, oid); + + if (!tag->tagged) + return NULL; + if (mark_tags_complete) + tag->object.flags |= COMPLETE; + oid = &tag->tagged->oid; + } else { + break; + } + } + if (type == OBJ_COMMIT) + return (struct commit *) parse_object(the_repository, oid); + return NULL; +} + static int rev_list_insert_ref(struct fetch_negotiator *negotiator, - const char *refname, const struct object_id *oid) { - struct object *o = deref_tag(the_repository, - parse_object(the_repository, oid), - refname, 0); - - if (o && o->type == OBJ_COMMIT) - negotiator->add_tip(negotiator, (struct commit *)o); + struct commit *c = deref_without_lazy_fetch(oid, 0); + if (c) + negotiator->add_tip(negotiator, c); return 0; } static int rev_list_insert_ref_oid(const char *refname, const struct object_id *oid, int flag, void *cb_data) { - return rev_list_insert_ref(cb_data, refname, oid); + return rev_list_insert_ref(cb_data, oid); } enum ack_type { @@ -168,16 +193,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)) { - if (!get_oid_hex(arg, result_oid)) { - arg += 40; - len -= arg - reader->line; + const char *p; + if (!parse_oid_hex(arg, result_oid, &p)) { + len -= p - reader->line; if (len < 1) return ACK; - if (strstr(arg, "continue")) + if (strstr(p, "continue")) return ACK_continue; - if (strstr(arg, "common")) + if (strstr(p, "common")) return ACK_common; - if (strstr(arg, "ready")) + if (strstr(p, "ready")) return ACK_ready; return ACK; } @@ -200,7 +225,7 @@ static void send_request(struct fetch_pack_args *args, static void insert_one_alternate_object(struct fetch_negotiator *negotiator, struct object *obj) { - rev_list_insert_ref(negotiator, NULL, &obj->oid); + rev_list_insert_ref(negotiator, &obj->oid); } #define INITIAL_FLUSH 16 @@ -229,13 +254,12 @@ static void mark_tips(struct fetch_negotiator *negotiator, int i; if (!negotiation_tips) { - for_each_ref(rev_list_insert_ref_oid, negotiator); + for_each_rawref(rev_list_insert_ref_oid, negotiator); return; } for (i = 0; i < negotiation_tips->nr; i++) - rev_list_insert_ref(negotiator, NULL, - &negotiation_tips->oid[i]); + rev_list_insert_ref(negotiator, &negotiation_tips->oid[i]); return; } @@ -261,10 +285,8 @@ static int find_common(struct fetch_negotiator *negotiator, PACKET_READ_CHOMP_NEWLINE | PACKET_READ_DIE_ON_ERR_PACKET); - if (!args->no_dependents) { - mark_tips(negotiator, args->negotiation_tips); - for_each_cached_alternate(negotiator, insert_one_alternate_object); - } + mark_tips(negotiator, args->negotiation_tips); + for_each_cached_alternate(negotiator, insert_one_alternate_object); fetching = 0; for ( ; refs ; refs = refs->next) { @@ -281,12 +303,8 @@ static int find_common(struct fetch_negotiator *negotiator, * We use lookup_object here because we are only * interested in the case we *know* the object is * reachable and we have already scanned it. - * - * Do this only if args->no_dependents is false (if it is true, - * we cannot trust the object flags). */ - if (!args->no_dependents && - ((o = lookup_object(the_repository, remote)) != NULL) && + if (((o = lookup_object(the_repository, remote)) != NULL) && (o->flags & COMPLETE)) { continue; } @@ -339,12 +357,9 @@ static int find_common(struct fetch_negotiator *negotiator, } } if (server_supports_filtering && args->filter_options.choice) { - 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); + const char *spec = + expand_list_objects_filter_spec(&args->filter_options); + packet_buf_write(&req_buf, "filter %s", spec); } packet_buf_flush(&req_buf); state_len = req_buf.len; @@ -386,10 +401,9 @@ 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) - goto done; while ((oid = negotiator->next(negotiator))) { packet_buf_write(&req_buf, "have %s\n", oid_to_hex(oid)); print_verbose(args, "have %s", oid_to_hex(oid)); @@ -470,6 +484,7 @@ 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); @@ -503,21 +518,11 @@ static struct commit_list *complete; static int mark_complete(const struct object_id *oid) { - struct object *o = parse_object(the_repository, oid); - - while (o && o->type == OBJ_TAG) { - struct tag *t = (struct tag *) o; - if (!t->tagged) - break; /* broken repository */ - o->flags |= COMPLETE; - o = parse_object(the_repository, &t->tagged->oid); - } - if (o && o->type == OBJ_COMMIT) { - struct commit *commit = (struct commit *)o; - if (!(commit->object.flags & COMPLETE)) { - commit->object.flags |= COMPLETE; - commit_list_insert(commit, &complete); - } + struct commit *commit = deref_without_lazy_fetch(oid, 1); + + if (commit && !(commit->object.flags & COMPLETE)) { + commit->object.flags |= COMPLETE; + commit_list_insert(commit, &complete); } return 0; } @@ -653,9 +658,7 @@ struct loose_object_iter { /* * Mark recent commits available locally and reachable from a local ref as - * COMPLETE. If args->no_dependents is false, also mark COMPLETE remote refs as - * COMMON_REF (otherwise, we are not planning to participate in negotiation, and - * thus do not need COMMON_REF marks). + * COMPLETE. * * The cutoff time for recency is determined by this heuristic: it is the * earliest commit time of the objects in refs that are commits and that we know @@ -671,17 +674,20 @@ 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_QUICK | + OBJECT_INFO_SKIP_FETCH_OBJECT)) 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). */ @@ -691,31 +697,36 @@ 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_rawref(mark_complete_oid, NULL); for_each_cached_alternate(NULL, mark_alternate_complete); commit_list_sort_by_date(&complete); 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, - &ref->old_oid), - NULL, 0); + struct commit *c = deref_without_lazy_fetch(&ref->old_oid, 0); - if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE)) + if (!c || !(c->object.flags & COMPLETE)) continue; - negotiator->known_common(negotiator, - (struct commit *)o); + negotiator->known_common(negotiator, c); } + trace2_region_leave("fetch-pack", "mark_common_remote_refs", NULL); save_commit_buffer = old_save_commit_buffer; } @@ -758,8 +769,38 @@ 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); +} + +/* + * Pass 1 as "only_packfile" if the pack received is the only pack in this + * fetch request (that is, if there were no packfile URIs provided). + */ static int get_pack(struct fetch_pack_args *args, - int xd[2], char **pack_lockfile) + int xd[2], struct string_list *pack_lockfiles, + int only_packfile, + struct ref **sought, int nr_sought) { struct async demux; int do_keep = args->keep_pack; @@ -797,68 +838,85 @@ static int get_pack(struct fetch_pack_args *args, } if (alternate_shallow_file) { - argv_array_push(&cmd.args, "--shallow-file"); - argv_array_push(&cmd.args, alternate_shallow_file); + strvec_push(&cmd.args, "--shallow-file"); + strvec_push(&cmd.args, alternate_shallow_file); } if (do_keep || args->from_promisor) { - if (pack_lockfile) + if (pack_lockfiles) cmd.out = -1; cmd_name = "index-pack"; - argv_array_push(&cmd.args, cmd_name); - argv_array_push(&cmd.args, "--stdin"); + strvec_push(&cmd.args, cmd_name); + strvec_push(&cmd.args, "--stdin"); if (!args->quiet && !args->no_progress) - argv_array_push(&cmd.args, "-v"); + strvec_push(&cmd.args, "-v"); if (args->use_thin_pack) - argv_array_push(&cmd.args, "--fix-thin"); + strvec_push(&cmd.args, "--fix-thin"); if (do_keep && (args->lock_pack || unpack_limit)) { char hostname[HOST_NAME_MAX + 1]; if (xgethostname(hostname, sizeof(hostname))) xsnprintf(hostname, sizeof(hostname), "localhost"); - argv_array_pushf(&cmd.args, - "--keep=fetch-pack %"PRIuMAX " on %s", - (uintmax_t)getpid(), hostname); + strvec_pushf(&cmd.args, + "--keep=fetch-pack %"PRIuMAX " on %s", + (uintmax_t)getpid(), hostname); } - if (args->check_self_contained_and_connected) - argv_array_push(&cmd.args, "--check-self-contained-and-connected"); + if (only_packfile && args->check_self_contained_and_connected) + strvec_push(&cmd.args, "--check-self-contained-and-connected"); + else + /* + * We cannot perform any connectivity checks because + * not all packs have been downloaded; let the caller + * have this responsibility. + */ + args->check_self_contained_and_connected = 0; + if (args->from_promisor) - argv_array_push(&cmd.args, "--promisor"); + /* + * write_promisor_file() may be called afterwards but + * we still need index-pack to know that this is a + * promisor pack. For example, if transfer.fsckobjects + * is true, index-pack needs to know that .gitmodules + * is a promisor object (so that it won't complain if + * it is missing). + */ + strvec_push(&cmd.args, "--promisor"); } else { cmd_name = "unpack-objects"; - argv_array_push(&cmd.args, cmd_name); + strvec_push(&cmd.args, cmd_name); if (args->quiet || args->no_progress) - argv_array_push(&cmd.args, "-q"); + strvec_push(&cmd.args, "-q"); args->check_self_contained_and_connected = 0; } if (pass_header) - argv_array_pushf(&cmd.args, "--pack_header=%"PRIu32",%"PRIu32, - ntohl(header.hdr_version), + strvec_pushf(&cmd.args, "--pack_header=%"PRIu32",%"PRIu32, + ntohl(header.hdr_version), ntohl(header.hdr_entries)); if (fetch_fsck_objects >= 0 ? fetch_fsck_objects : transfer_fsck_objects >= 0 ? transfer_fsck_objects : 0) { - if (args->from_promisor) + if (args->from_promisor || !only_packfile) /* * We cannot use --strict in index-pack because it * checks both broken objects and links, but we only * want to check for broken objects. */ - argv_array_push(&cmd.args, "--fsck-objects"); + strvec_push(&cmd.args, "--fsck-objects"); else - argv_array_pushf(&cmd.args, "--strict%s", - fsck_msg_types.buf); + strvec_pushf(&cmd.args, "--strict%s", + fsck_msg_types.buf); } cmd.in = demux.out; cmd.git_cmd = 1; if (start_command(&cmd)) die(_("fetch-pack: unable to fork off %s"), cmd_name); - if (do_keep && pack_lockfile) { - *pack_lockfile = index_pack_lockfile(cmd.out); + if (do_keep && pack_lockfiles) { + string_list_append_nodup(pack_lockfiles, + index_pack_lockfile(cmd.out)); close(cmd.out); } @@ -875,6 +933,14 @@ 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_lockfiles && pack_lockfiles->nr && args->from_promisor) + write_promisor_file(pack_lockfiles->items[0].string, sought, nr_sought); + return 0; } @@ -890,14 +956,18 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, const struct ref *orig_ref, struct ref **sought, int nr_sought, struct shallow_info *si, - char **pack_lockfile) + struct string_list *pack_lockfiles) { + 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; - fetch_negotiator_init(&negotiator, negotiation_algorithm); + struct fetch_negotiator negotiator_alloc; + struct fetch_negotiator *negotiator; + + negotiator = &negotiator_alloc; + fetch_negotiator_init(r, negotiator); sort_ref_list(&ref, ref_compare_name); QSORT(sought, nr_sought, cmp_ref_by_name); @@ -911,7 +981,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(the_repository)) + else if (args->depth > 0 || is_repository_shallow(r)) die(_("Server does not support shallow clients")); if (args->depth > 0 || args->deepen_since || args->deepen_not) args->deepen = 1; @@ -982,18 +1052,16 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, print_verbose(args, _("Server supports %s"), "deepen-relative"); else if (args->deepen_relative) die(_("Server does not support --deepen")); + if (!server_supports_hash(the_hash_algo->name, NULL)) + die(_("Server does not support this repository's object format")); - if (!args->no_dependents) { - mark_complete_and_common_ref(&negotiator, args, &ref); - filter_refs(args, &ref, sought, nr_sought); - if (everything_local(args, &ref)) { - packet_flush(fd[1]); - goto all_done; - } - } else { - filter_refs(args, &ref, sought, nr_sought); + mark_complete_and_common_ref(negotiator, args, &ref); + filter_refs(args, &ref, sought, nr_sought); + if (everything_local(args, &ref)) { + packet_flush(fd[1]); + goto all_done; } - 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. @@ -1009,11 +1077,12 @@ 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)) + if (get_pack(args, fd, pack_lockfiles, 1, sought, nr_sought)) die(_("git fetch-pack: fetch failed.")); all_done: - negotiator.release(&negotiator); + if (negotiator) + negotiator->release(negotiator); return ref; } @@ -1039,7 +1108,7 @@ static void add_shallow_requests(struct strbuf *req_buf, packet_buf_write(req_buf, "deepen-relative\n"); } -static void add_wants(int no_dependents, const struct ref *wants, struct strbuf *req_buf) +static void add_wants(const struct ref *wants, struct strbuf *req_buf) { int use_ref_in_want = server_supports_feature("fetch", "ref-in-want", 0); @@ -1056,12 +1125,8 @@ static void add_wants(int no_dependents, const struct ref *wants, struct strbuf * We use lookup_object here because we are only * interested in the case we *know* the object is * reachable and we have already scanned it. - * - * Do this only if args->no_dependents is false (if it is true, - * we cannot trust the object flags). */ - if (!no_dependents && - ((o = lookup_object(the_repository, remote)) != NULL) && + if (((o = lookup_object(the_repository, remote)) != NULL) && (o->flags & COMPLETE)) { continue; } @@ -1085,6 +1150,7 @@ static void add_common(struct strbuf *req_buf, struct oidset *common) } static int add_haves(struct fetch_negotiator *negotiator, + int seen_ack, struct strbuf *req_buf, int *haves_to_send, int *in_vain) { @@ -1099,7 +1165,7 @@ static int add_haves(struct fetch_negotiator *negotiator, } *in_vain += haves_added; - if (!haves_added || *in_vain >= MAX_IN_VAIN) { + if (!haves_added || (seen_ack && *in_vain >= MAX_IN_VAIN)) { /* Send Done */ packet_buf_write(req_buf, "done\n"); ret = 1; @@ -1112,12 +1178,13 @@ static int add_haves(struct fetch_negotiator *negotiator, } static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out, - const struct fetch_pack_args *args, + struct fetch_pack_args *args, const struct ref *wants, struct oidset *common, int *haves_to_send, int *in_vain, - int sideband_all) + int sideband_all, int seen_ack) { int ret = 0; + const char *hash_name; struct strbuf req_buf = STRBUF_INIT; if (server_supports_v2("fetch", 1)) @@ -1132,6 +1199,17 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out, args->server_options->items[i].string); } + if (server_feature_v2("object-format", &hash_name)) { + int hash_algo = hash_algo_by_name(hash_name); + if (hash_algo_by_ptr(the_hash_algo) != hash_algo) + die(_("mismatched algorithms: client %s; server %s"), + the_hash_algo->name, hash_name); + packet_write_fmt(fd_out, "object-format=%s", the_hash_algo->name); + } else if (hash_algo_by_ptr(the_hash_algo) != GIT_HASH_SHA1) { + die(_("the server does not support algorithm '%s'"), + the_hash_algo->name); + } + packet_buf_delim(&req_buf); if (args->use_thin_pack) packet_buf_write(&req_buf, "thin-pack"); @@ -1153,31 +1231,44 @@ 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) { - struct strbuf expanded_filter_spec = STRBUF_INIT; + const char *spec = + expand_list_objects_filter_spec(&args->filter_options); print_verbose(args, _("Server supports filter")); - 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_write(&req_buf, "filter %s", spec); } else if (args->filter_options.choice) { warning("filtering not recognized by server, ignoring"); } - /* add wants */ - add_wants(args->no_dependents, wants, &req_buf); + if (server_supports_feature("fetch", "packfile-uris", 0)) { + int i; + struct strbuf to_send = STRBUF_INIT; - if (args->no_dependents) { - packet_buf_write(&req_buf, "done"); - ret = 1; - } else { - /* Add all of the common commits we've found in previous rounds */ - add_common(&req_buf, common); + for (i = 0; i < uri_protocols.nr; i++) { + const char *s = uri_protocols.items[i].string; - /* Add initial haves */ - ret = add_haves(negotiator, &req_buf, haves_to_send, in_vain); + if (!strcmp(s, "https") || !strcmp(s, "http")) { + if (to_send.len) + strbuf_addch(&to_send, ','); + strbuf_addstr(&to_send, s); + } + } + if (to_send.len) { + packet_buf_write(&req_buf, "packfile-uris %s", + to_send.buf); + strbuf_release(&to_send); + } } + /* add wants */ + add_wants(wants, &req_buf); + + /* Add all of the common commits we've found in previous rounds */ + add_common(&req_buf, common); + + /* Add initial haves */ + ret = add_haves(negotiator, seen_ack, &req_buf, + haves_to_send, in_vain); + /* Send request */ packet_buf_flush(&req_buf); if (write_in_full(fd_out, req_buf.buf, req_buf.len) < 0) @@ -1213,9 +1304,29 @@ static int process_section_header(struct packet_reader *reader, return ret; } -static int process_acks(struct fetch_negotiator *negotiator, - struct packet_reader *reader, - struct oidset *common) +enum common_found { + /* + * No commit was found to be possessed by both the client and the + * server, and "ready" was not received. + */ + NO_COMMON_FOUND, + + /* + * At least one commit was found to be possessed by both the client and + * the server, and "ready" was not received. + */ + COMMON_FOUND, + + /* + * "ready" was received, indicating that the server is ready to send + * the packfile without any further negotiation. + */ + READY +}; + +static enum common_found process_acks(struct fetch_negotiator *negotiator, + struct packet_reader *reader, + struct oidset *common) { /* received */ int received_ready = 0; @@ -1230,11 +1341,13 @@ static int process_acks(struct fetch_negotiator *negotiator, if (skip_prefix(reader->line, "ACK ", &arg)) { struct object_id oid; + received_ack = 1; if (!get_oid_hex(arg, &oid)) { struct commit *commit; oidset_insert(common, &oid); commit = lookup_commit(the_repository, &oid); - negotiator->ack(negotiator, commit); + if (negotiator) + negotiator->ack(negotiator, commit); } continue; } @@ -1263,8 +1376,8 @@ static int process_acks(struct fetch_negotiator *negotiator, if (!received_ready && reader->status != PACKET_READ_FLUSH) die(_("expected no other sections to be sent after no 'ready'")); - /* return 0 if no common, 1 if there are common, or 2 if ready */ - return received_ready ? 2 : (received_ack ? 1 : 0); + return received_ready ? READY : + (received_ack ? COMMON_FOUND : NO_COMMON_FOUND); } static void receive_shallow_info(struct fetch_pack_args *args, @@ -1363,6 +1476,21 @@ static void receive_wanted_refs(struct packet_reader *reader, die(_("error processing wanted refs: %d"), reader->status); } +static void receive_packfile_uris(struct packet_reader *reader, + struct string_list *uris) +{ + process_section_header(reader, "packfile-uris", 0); + while (packet_reader_read(reader) == PACKET_READ_NORMAL) { + if (reader->pktlen < the_hash_algo->hexsz || + reader->line[the_hash_algo->hexsz] != ' ') + die("expected '<hash> <uri>', got: %s\n", reader->line); + + string_list_append(uris, reader->line); + } + if (reader->status != PACKET_READ_DELIM) + die("expected DELIM"); +} + enum fetch_state { FETCH_CHECK_LOCAL = 0, FETCH_SEND_REQUEST, @@ -1371,22 +1499,37 @@ enum fetch_state { FETCH_DONE, }; +static void do_check_stateless_delimiter(const struct fetch_pack_args *args, + struct packet_reader *reader) +{ + check_stateless_delimiter(args->stateless_rpc, reader, + _("git fetch-pack: expected response end packet")); +} + static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, int fd[2], const struct ref *orig_ref, struct ref **sought, int nr_sought, struct oid_array *shallows, struct shallow_info *si, - char **pack_lockfile) + struct string_list *pack_lockfiles) { + 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; + int in_vain = 0, negotiation_started = 0; int haves_to_send = INITIAL_FLUSH; - struct fetch_negotiator negotiator; - fetch_negotiator_init(&negotiator, negotiation_algorithm); + struct fetch_negotiator negotiator_alloc; + struct fetch_negotiator *negotiator; + int seen_ack = 0; + struct string_list packfile_uris = STRING_LIST_INIT_DUP; + int i; + + negotiator = &negotiator_alloc; + fetch_negotiator_init(r, negotiator); + packet_reader_init(&reader, fd[0], NULL, 0, PACKET_READ_CHOMP_NEWLINE | PACKET_READ_DIE_ON_ERR_PACKET); @@ -1409,46 +1552,57 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, args->deepen = 1; /* Filter 'ref' by 'sought' and those that aren't local */ - if (!args->no_dependents) { - 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, - insert_one_alternate_object); - } else { - filter_refs(args, &ref, sought, nr_sought); + 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, + insert_one_alternate_object); break; case FETCH_SEND_REQUEST: - if (send_fetch_request(&negotiator, fd[1], args, ref, + if (!negotiation_started) { + negotiation_started = 1; + trace2_region_enter("fetch-pack", + "negotiation_v2", + the_repository); + } + if (send_fetch_request(negotiator, fd[1], args, ref, &common, &haves_to_send, &in_vain, - reader.use_sideband)) + reader.use_sideband, + seen_ack)) state = FETCH_GET_PACK; else state = FETCH_PROCESS_ACKS; break; case FETCH_PROCESS_ACKS: /* Process ACKs/NAKs */ - switch (process_acks(&negotiator, &reader, &common)) { - case 2: + switch (process_acks(negotiator, &reader, &common)) { + case READY: + /* + * Don't check for response delimiter; get_pack() will + * read the rest of this response. + */ state = FETCH_GET_PACK; break; - case 1: + case COMMON_FOUND: in_vain = 0; + seen_ack = 1; /* fallthrough */ - default: + case NO_COMMON_FOUND: + do_check_stateless_delimiter(args, &reader); state = FETCH_SEND_REQUEST; break; } 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); @@ -1456,10 +1610,14 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, if (process_section_header(&reader, "wanted-refs", 1)) receive_wanted_refs(&reader, sought, nr_sought); - /* get the pack */ + /* get the pack(s) */ + if (process_section_header(&reader, "packfile-uris", 1)) + receive_packfile_uris(&reader, &packfile_uris); process_section_header(&reader, "packfile", 0); - if (get_pack(args, fd, pack_lockfile)) + if (get_pack(args, fd, pack_lockfiles, + !packfile_uris.nr, sought, nr_sought)) die(_("git fetch-pack: fetch failed.")); + do_check_stateless_delimiter(args, &reader); state = FETCH_DONE; break; @@ -1468,7 +1626,55 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, } } - negotiator.release(&negotiator); + for (i = 0; i < packfile_uris.nr; i++) { + struct child_process cmd = CHILD_PROCESS_INIT; + char packname[GIT_MAX_HEXSZ + 1]; + const char *uri = packfile_uris.items[i].string + + the_hash_algo->hexsz + 1; + + strvec_push(&cmd.args, "http-fetch"); + strvec_pushf(&cmd.args, "--packfile=%.*s", + (int) the_hash_algo->hexsz, + packfile_uris.items[i].string); + strvec_push(&cmd.args, uri); + cmd.git_cmd = 1; + cmd.no_stdin = 1; + cmd.out = -1; + if (start_command(&cmd)) + die("fetch-pack: unable to spawn http-fetch"); + + if (read_in_full(cmd.out, packname, 5) < 0 || + memcmp(packname, "keep\t", 5)) + die("fetch-pack: expected keep then TAB at start of http-fetch output"); + + if (read_in_full(cmd.out, packname, + the_hash_algo->hexsz + 1) < 0 || + packname[the_hash_algo->hexsz] != '\n') + die("fetch-pack: expected hash then LF at end of http-fetch output"); + + packname[the_hash_algo->hexsz] = '\0'; + + close(cmd.out); + + if (finish_command(&cmd)) + die("fetch-pack: unable to finish http-fetch"); + + if (memcmp(packfile_uris.items[i].string, packname, + the_hash_algo->hexsz)) + die("fetch-pack: pack downloaded from %s does not match expected hash %.*s", + uri, (int) the_hash_algo->hexsz, + packfile_uris.items[i].string); + + string_list_append_nodup(pack_lockfiles, + xstrfmt("%s/pack/pack-%s.keep", + get_object_directory(), + packname)); + } + string_list_clear(&packfile_uris, 0); + + if (negotiator) + negotiator->release(negotiator); + oidset_clear(&common); return ref; } @@ -1505,8 +1711,14 @@ 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); + if (!uri_protocols.nr) { + char *str; + + if (!git_config_get_string("fetch.uriprotocols", &str) && str) { + string_list_split(&uri_protocols, str, ',', -1); + free(str); + } + } git_config(fetch_pack_config_cb, NULL); } @@ -1556,9 +1768,9 @@ static void update_shallow(struct fetch_pack_args *args, if (args->deepen && alternate_shallow_file) { if (*alternate_shallow_file == '\0') { /* --unshallow */ unlink_or_warn(git_path_shallow(the_repository)); - rollback_lock_file(&shallow_lock); + rollback_shallow_file(the_repository, &shallow_lock); } else - commit_lock_file(&shallow_lock); + commit_shallow_file(the_repository, &shallow_lock); alternate_shallow_file = NULL; return; } @@ -1582,7 +1794,7 @@ static void update_shallow(struct fetch_pack_args *args, setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, &extra); - commit_lock_file(&shallow_lock); + commit_shallow_file(the_repository, &shallow_lock); alternate_shallow_file = NULL; } oid_array_clear(&extra); @@ -1620,7 +1832,7 @@ static void update_shallow(struct fetch_pack_args *args, setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, &extra); - commit_lock_file(&shallow_lock); + commit_shallow_file(the_repository, &shallow_lock); oid_array_clear(&extra); oid_array_clear(&ref); alternate_shallow_file = NULL; @@ -1659,7 +1871,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args, const struct ref *ref, struct ref **sought, int nr_sought, struct oid_array *shallow, - char **pack_lockfile, + struct string_list *pack_lockfiles, enum protocol_version version) { struct ref *ref_cpy; @@ -1670,20 +1882,6 @@ struct ref *fetch_pack(struct fetch_pack_args *args, if (nr_sought) nr_sought = remove_duplicates_in_refs(sought, nr_sought); - if (args->no_dependents && !args->filter_options.choice) { - /* - * The protocol does not support requesting that only the - * wanted objects be sent, so approximate this by setting a - * "blob:none" filter if no filter is already set. This works - * for all object types: note that wanted blobs will still be - * sent because they are directly specified as a "want". - * - * NEEDSWORK: Add an option in the protocol to request that - * only the wanted objects be sent, and implement it. - */ - parse_list_objects_filter(&args->filter_options, "blob:none"); - } - if (version != protocol_v2 && !ref) { packet_flush(fd[1]); die(_("no matching remote head")); @@ -1694,11 +1892,11 @@ struct ref *fetch_pack(struct fetch_pack_args *args, memset(&si, 0, sizeof(si)); ref_cpy = do_fetch_pack_v2(args, fd, ref, sought, nr_sought, &shallows_scratch, &si, - pack_lockfile); + pack_lockfiles); } else { prepare_shallow_info(&si, shallow); ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought, - &si, pack_lockfile); + &si, pack_lockfiles); } reprepare_packed_git(the_repository); @@ -1712,7 +1910,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args, error(_("remote did not send all necessary objects")); free_refs(ref_cpy); ref_cpy = NULL; - rollback_lock_file(&shallow_lock); + rollback_shallow_file(the_repository, &shallow_lock); goto cleanup; } args->connectivity_checked = 1; diff --git a/third_party/git/fetch-pack.h b/third_party/git/fetch-pack.h index 67f684229a..736a3dae46 100644 --- a/third_party/git/fetch-pack.h +++ b/third_party/git/fetch-pack.h @@ -40,21 +40,15 @@ struct fetch_pack_args { unsigned cloning:1; unsigned update_shallow:1; unsigned deepen:1; - unsigned from_promisor:1; /* - * Attempt to fetch only the wanted objects, and not any objects - * referred to by them. Due to protocol limitations, extraneous - * objects may still be included. (When fetching non-blob - * objects, only blobs are excluded; when fetching a blob, the - * blob itself will still be sent. The client does not need to - * know whether a wanted object is a blob or not.) - * - * If 1, fetch_pack() will also not modify any object flags. - * This allows fetch_pack() to safely be called by any function, - * regardless of which object flags it uses (if any). + * Indicate that the remote of this request is a promisor remote. The + * pack received does not need all referred-to objects to be present in + * the local object store, and fetch-pack will store the pack received + * together with a ".promisor" file indicating that the aforementioned + * pack is a promisor pack. */ - unsigned no_dependents:1; + unsigned from_promisor:1; /* * Because fetch_pack() overwrites the shallow file upon a @@ -83,7 +77,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args, struct ref **sought, int nr_sought, struct oid_array *shallow, - char **pack_lockfile, + struct string_list *pack_lockfiles, enum protocol_version version); /* diff --git a/third_party/git/fmt-merge-msg.c b/third_party/git/fmt-merge-msg.c new file mode 100644 index 0000000000..bd22e1ea88 --- /dev/null +++ b/third_party/git/fmt-merge-msg.c @@ -0,0 +1,686 @@ +#include "config.h" +#include "refs.h" +#include "object-store.h" +#include "diff.h" +#include "revision.h" +#include "tag.h" +#include "string-list.h" +#include "branch.h" +#include "fmt-merge-msg.h" +#include "commit-reach.h" + +static int use_branch_desc; +static int suppress_dest_pattern_seen; +static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP; + +int fmt_merge_msg_config(const char *key, const char *value, void *cb) +{ + if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) { + int is_bool; + merge_log_config = git_config_bool_or_int(key, value, &is_bool); + if (!is_bool && merge_log_config < 0) + return error("%s: negative length %s", key, value); + if (is_bool && merge_log_config) + merge_log_config = DEFAULT_MERGE_LOG_LEN; + } else if (!strcmp(key, "merge.branchdesc")) { + use_branch_desc = git_config_bool(key, value); + } else if (!strcmp(key, "merge.suppressdest")) { + if (!value) + return config_error_nonbool(key); + if (!*value) + string_list_clear(&suppress_dest_patterns, 0); + else + string_list_append(&suppress_dest_patterns, value); + suppress_dest_pattern_seen = 1; + } else { + return git_default_config(key, value, cb); + } + return 0; +} + +/* merge data per repository where the merged tips came from */ +struct src_data { + struct string_list branch, tag, r_branch, generic; + int head_status; +}; + +struct origin_data { + struct object_id oid; + unsigned is_local_branch:1; +}; + +static void init_src_data(struct src_data *data) +{ + data->branch.strdup_strings = 1; + data->tag.strdup_strings = 1; + data->r_branch.strdup_strings = 1; + data->generic.strdup_strings = 1; +} + +static struct string_list srcs = STRING_LIST_INIT_DUP; +static struct string_list origins = STRING_LIST_INIT_DUP; + +struct merge_parents { + int alloc, nr; + struct merge_parent { + struct object_id given; + struct object_id commit; + unsigned char used; + } *item; +}; + +/* + * I know, I know, this is inefficient, but you won't be pulling and merging + * hundreds of heads at a time anyway. + */ +static struct merge_parent *find_merge_parent(struct merge_parents *table, + struct object_id *given, + struct object_id *commit) +{ + int i; + for (i = 0; i < table->nr; i++) { + if (given && !oideq(&table->item[i].given, given)) + continue; + if (commit && !oideq(&table->item[i].commit, commit)) + continue; + return &table->item[i]; + } + return NULL; +} + +static void add_merge_parent(struct merge_parents *table, + struct object_id *given, + struct object_id *commit) +{ + if (table->nr && find_merge_parent(table, given, commit)) + return; + ALLOC_GROW(table->item, table->nr + 1, table->alloc); + oidcpy(&table->item[table->nr].given, given); + oidcpy(&table->item[table->nr].commit, commit); + table->item[table->nr].used = 0; + table->nr++; +} + +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; + struct src_data *src_data; + struct string_list_item *item; + int pulling_head = 0; + struct object_id oid; + const unsigned hexsz = the_hash_algo->hexsz; + + if (len < hexsz + 3 || line[hexsz] != '\t') + return 1; + + if (starts_with(line + hexsz + 1, "not-for-merge")) + return 0; + + if (line[hexsz + 1] != '\t') + return 2; + + i = get_oid_hex(line, &oid); + if (i) + return 3; + + if (!find_merge_parent(merge_parents, &oid, NULL)) + return 0; /* subsumed by other parents */ + + origin_data = xcalloc(1, sizeof(struct origin_data)); + oidcpy(&origin_data->oid, &oid); + + if (line[len - 1] == '\n') + line[len - 1] = 0; + line += hexsz + 2; + + /* + * At this point, line points at the beginning of comment e.g. + * "branch 'frotz' of git://that/repository.git". + * Find the repository name and point it with src. + */ + src = strstr(line, " of "); + if (src) { + *src = 0; + src += 4; + pulling_head = 0; + } else { + src = line; + pulling_head = 1; + } + + item = unsorted_string_list_lookup(&srcs, src); + if (!item) { + item = string_list_append(&srcs, src); + item->util = xcalloc(1, sizeof(struct src_data)); + init_src_data(item->util); + } + src_data = item->util; + + if (pulling_head) { + origin = src; + src_data->head_status |= 1; + } else if (skip_prefix(line, "branch ", &origin)) { + origin_data->is_local_branch = 1; + string_list_append(&src_data->branch, origin); + src_data->head_status |= 2; + } else if (skip_prefix(line, "tag ", &tag_name)) { + origin = line; + string_list_append(&src_data->tag, tag_name); + src_data->head_status |= 2; + } else if (skip_prefix(line, "remote-tracking branch ", &origin)) { + string_list_append(&src_data->r_branch, origin); + src_data->head_status |= 2; + } else { + origin = src; + string_list_append(&src_data->generic, line); + src_data->head_status |= 2; + } + + if (!strcmp(".", src) || !strcmp(src, origin)) { + int len = strlen(origin); + if (origin[0] == '\'' && origin[len - 1] == '\'') + origin = xmemdupz(origin + 1, len - 2); + } else + origin = xstrfmt("%s of %s", origin, src); + if (strcmp(".", src)) + origin_data->is_local_branch = 0; + string_list_append(&origins, origin)->util = origin_data; + return 0; +} + +static void print_joined(const char *singular, const char *plural, + struct string_list *list, struct strbuf *out) +{ + if (list->nr == 0) + return; + if (list->nr == 1) { + strbuf_addf(out, "%s%s", singular, list->items[0].string); + } else { + int i; + strbuf_addstr(out, plural); + for (i = 0; i < list->nr - 1; i++) + strbuf_addf(out, "%s%s", i > 0 ? ", " : "", + list->items[i].string); + strbuf_addf(out, " and %s", list->items[list->nr - 1].string); + } +} + +static void add_branch_desc(struct strbuf *out, const char *name) +{ + struct strbuf desc = STRBUF_INIT; + + if (!read_branch_desc(&desc, name)) { + const char *bp = desc.buf; + while (*bp) { + const char *ep = strchrnul(bp, '\n'); + if (*ep) + ep++; + strbuf_addf(out, " : %.*s", (int)(ep - bp), bp); + bp = ep; + } + strbuf_complete_line(out); + } + strbuf_release(&desc); +} + +#define util_as_integral(elem) ((intptr_t)((elem)->util)) + +static void record_person_from_buf(int which, struct string_list *people, + const char *buffer) +{ + char *name_buf, *name, *name_end; + struct string_list_item *elem; + const char *field; + + field = (which == 'a') ? "\nauthor " : "\ncommitter "; + name = strstr(buffer, field); + if (!name) + return; + name += strlen(field); + name_end = strchrnul(name, '<'); + if (*name_end) + name_end--; + while (isspace(*name_end) && name <= name_end) + name_end--; + if (name_end < name) + return; + name_buf = xmemdupz(name, name_end - name + 1); + + elem = string_list_lookup(people, name_buf); + if (!elem) { + elem = string_list_insert(people, name_buf); + elem->util = (void *)0; + } + elem->util = (void*)(util_as_integral(elem) + 1); + free(name_buf); +} + + +static void record_person(int which, struct string_list *people, + struct commit *commit) +{ + const char *buffer = get_commit_buffer(commit, NULL); + record_person_from_buf(which, people, buffer); + unuse_commit_buffer(commit, buffer); +} + +static int cmp_string_list_util_as_integral(const void *a_, const void *b_) +{ + const struct string_list_item *a = a_, *b = b_; + return util_as_integral(b) - util_as_integral(a); +} + +static void add_people_count(struct strbuf *out, struct string_list *people) +{ + if (people->nr == 1) + strbuf_addstr(out, people->items[0].string); + else if (people->nr == 2) + strbuf_addf(out, "%s (%d) and %s (%d)", + people->items[0].string, + (int)util_as_integral(&people->items[0]), + people->items[1].string, + (int)util_as_integral(&people->items[1])); + else if (people->nr) + strbuf_addf(out, "%s (%d) and others", + people->items[0].string, + (int)util_as_integral(&people->items[0])); +} + +static void credit_people(struct strbuf *out, + struct string_list *them, + int kind) +{ + const char *label; + const char *me; + + if (kind == 'a') { + label = "By"; + me = git_author_info(IDENT_NO_DATE); + } else { + label = "Via"; + me = git_committer_info(IDENT_NO_DATE); + } + + if (!them->nr || + (them->nr == 1 && + me && + skip_prefix(me, them->items->string, &me) && + starts_with(me, " <"))) + return; + strbuf_addf(out, "\n%c %s ", comment_line_char, label); + add_people_count(out, them); +} + +static void add_people_info(struct strbuf *out, + struct string_list *authors, + struct string_list *committers) +{ + QSORT(authors->items, authors->nr, + cmp_string_list_util_as_integral); + QSORT(committers->items, committers->nr, + cmp_string_list_util_as_integral); + + credit_people(out, authors, 'a'); + credit_people(out, committers, 'c'); +} + +static void shortlog(const char *name, + struct origin_data *origin_data, + struct commit *head, + struct rev_info *rev, + struct fmt_merge_msg_opts *opts, + struct strbuf *out) +{ + int i, count = 0; + struct commit *commit; + struct object *branch; + struct string_list subjects = STRING_LIST_INIT_DUP; + struct string_list authors = STRING_LIST_INIT_DUP; + struct string_list committers = STRING_LIST_INIT_DUP; + int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED; + struct strbuf sb = STRBUF_INIT; + const struct object_id *oid = &origin_data->oid; + int limit = opts->shortlog_len; + + branch = deref_tag(the_repository, parse_object(the_repository, oid), + oid_to_hex(oid), + the_hash_algo->hexsz); + if (!branch || branch->type != OBJ_COMMIT) + return; + + setup_revisions(0, NULL, rev, NULL); + add_pending_object(rev, branch, name); + add_pending_object(rev, &head->object, "^HEAD"); + head->object.flags |= UNINTERESTING; + if (prepare_revision_walk(rev)) + die("revision walk setup failed"); + while ((commit = get_revision(rev)) != NULL) { + struct pretty_print_context ctx = {0}; + + if (commit->parents && commit->parents->next) { + /* do not list a merge but count committer */ + if (opts->credit_people) + record_person('c', &committers, commit); + continue; + } + if (!count && opts->credit_people) + /* the 'tip' committer */ + record_person('c', &committers, commit); + if (opts->credit_people) + record_person('a', &authors, commit); + count++; + if (subjects.nr > limit) + continue; + + format_commit_message(commit, "%s", &sb, &ctx); + strbuf_ltrim(&sb); + + if (!sb.len) + string_list_append(&subjects, + oid_to_hex(&commit->object.oid)); + else + string_list_append_nodup(&subjects, + strbuf_detach(&sb, NULL)); + } + + if (opts->credit_people) + add_people_info(out, &authors, &committers); + if (count > limit) + strbuf_addf(out, "\n* %s: (%d commits)\n", name, count); + else + strbuf_addf(out, "\n* %s:\n", name); + + if (origin_data->is_local_branch && use_branch_desc) + add_branch_desc(out, name); + + for (i = 0; i < subjects.nr; i++) + if (i >= limit) + strbuf_addstr(out, " ...\n"); + else + strbuf_addf(out, " %s\n", subjects.items[i].string); + + clear_commit_marks((struct commit *)branch, flags); + clear_commit_marks(head, flags); + free_commit_list(rev->commits); + rev->commits = NULL; + rev->pending.nr = 0; + + string_list_clear(&authors, 0); + string_list_clear(&committers, 0); + string_list_clear(&subjects, 0); +} + +/* + * See if dest_branch matches with any glob pattern on the + * suppress_dest_patterns list. + * + * We may want to also allow negative matches e.g. ":!glob" like we do + * for pathspec, but for now, let's keep it simple and stupid. + */ +static int dest_suppressed(const char *dest_branch) +{ + struct string_list_item *item; + + for_each_string_list_item(item, &suppress_dest_patterns) { + if (!wildmatch(item->string, dest_branch, WM_PATHNAME)) + return 1; + } + return 0; +} + +static void fmt_merge_msg_title(struct strbuf *out, + const char *current_branch) +{ + int i = 0; + char *sep = ""; + + strbuf_addstr(out, "Merge "); + for (i = 0; i < srcs.nr; i++) { + struct src_data *src_data = srcs.items[i].util; + const char *subsep = ""; + + strbuf_addstr(out, sep); + sep = "; "; + + if (src_data->head_status == 1) { + strbuf_addstr(out, srcs.items[i].string); + continue; + } + if (src_data->head_status == 3) { + subsep = ", "; + strbuf_addstr(out, "HEAD"); + } + if (src_data->branch.nr) { + strbuf_addstr(out, subsep); + subsep = ", "; + print_joined("branch ", "branches ", &src_data->branch, + out); + } + if (src_data->r_branch.nr) { + strbuf_addstr(out, subsep); + subsep = ", "; + print_joined("remote-tracking branch ", "remote-tracking branches ", + &src_data->r_branch, out); + } + if (src_data->tag.nr) { + strbuf_addstr(out, subsep); + subsep = ", "; + print_joined("tag ", "tags ", &src_data->tag, out); + } + if (src_data->generic.nr) { + strbuf_addstr(out, subsep); + print_joined("commit ", "commits ", &src_data->generic, + out); + } + if (strcmp(".", srcs.items[i].string)) + strbuf_addf(out, " of %s", srcs.items[i].string); + } + + if (!dest_suppressed(current_branch)) + strbuf_addf(out, " into %s", current_branch); + strbuf_addch(out, '\n'); +} + +static void fmt_tag_signature(struct strbuf *tagbuf, + struct strbuf *sig, + const char *buf, + unsigned long len) +{ + const char *tag_body = strstr(buf, "\n\n"); + if (tag_body) { + tag_body += 2; + strbuf_add(tagbuf, tag_body, buf + len - tag_body); + } + strbuf_complete_line(tagbuf); + if (sig->len) { + strbuf_addch(tagbuf, '\n'); + strbuf_add_commented_lines(tagbuf, sig->buf, sig->len); + } +} + +static void fmt_merge_msg_sigs(struct strbuf *out) +{ + int i, tag_number = 0, first_tag = 0; + struct strbuf tagbuf = STRBUF_INIT; + + for (i = 0; i < origins.nr; i++) { + struct object_id *oid = origins.items[i].util; + enum object_type type; + unsigned long size, len; + char *buf = read_object_file(oid, &type, &size); + struct signature_check sigc = { NULL }; + struct strbuf sig = STRBUF_INIT; + + if (!buf || type != OBJ_TAG) + goto next; + len = parse_signature(buf, size); + + if (size == len) + ; /* merely annotated */ + else if (check_signature(buf, len, buf + len, size - len, &sigc) && + !sigc.gpg_output) + strbuf_addstr(&sig, "gpg verification failed.\n"); + else + strbuf_addstr(&sig, sigc.gpg_output); + signature_check_clear(&sigc); + + if (!tag_number++) { + fmt_tag_signature(&tagbuf, &sig, buf, len); + first_tag = i; + } else { + if (tag_number == 2) { + struct strbuf tagline = STRBUF_INIT; + strbuf_addch(&tagline, '\n'); + strbuf_add_commented_lines(&tagline, + origins.items[first_tag].string, + strlen(origins.items[first_tag].string)); + strbuf_insert(&tagbuf, 0, tagline.buf, + tagline.len); + strbuf_release(&tagline); + } + strbuf_addch(&tagbuf, '\n'); + strbuf_add_commented_lines(&tagbuf, + origins.items[i].string, + strlen(origins.items[i].string)); + fmt_tag_signature(&tagbuf, &sig, buf, len); + } + strbuf_release(&sig); + next: + free(buf); + } + if (tagbuf.len) { + strbuf_addch(out, '\n'); + strbuf_addbuf(out, &tagbuf); + } + strbuf_release(&tagbuf); +} + +static void find_merge_parents(struct merge_parents *result, + struct strbuf *in, struct object_id *head) +{ + struct commit_list *parents; + struct commit *head_commit; + int pos = 0, i, j; + + parents = NULL; + while (pos < in->len) { + int len; + char *p = in->buf + pos; + char *newline = strchr(p, '\n'); + const char *q; + struct object_id oid; + struct commit *parent; + struct object *obj; + + len = newline ? newline - p : strlen(p); + pos += len + !!newline; + + if (parse_oid_hex(p, &oid, &q) || + q[0] != '\t' || + q[1] != '\t') + continue; /* skip not-for-merge */ + /* + * Do not use get_merge_parent() here; we do not have + * "name" here and we do not want to contaminate its + * util field yet. + */ + obj = parse_object(the_repository, &oid); + parent = (struct commit *)peel_to_type(NULL, 0, obj, OBJ_COMMIT); + if (!parent) + continue; + commit_list_insert(parent, &parents); + add_merge_parent(result, &obj->oid, &parent->object.oid); + } + head_commit = lookup_commit(the_repository, head); + if (head_commit) + commit_list_insert(head_commit, &parents); + reduce_heads_replace(&parents); + + while (parents) { + struct commit *cmit = pop_commit(&parents); + for (i = 0; i < result->nr; i++) + if (oideq(&result->item[i].commit, &cmit->object.oid)) + result->item[i].used = 1; + } + + for (i = j = 0; i < result->nr; i++) { + if (result->item[i].used) { + if (i != j) + result->item[j] = result->item[i]; + j++; + } + } + result->nr = j; +} + + +int fmt_merge_msg(struct strbuf *in, struct strbuf *out, + struct fmt_merge_msg_opts *opts) +{ + int i = 0, pos = 0; + struct object_id head_oid; + const char *current_branch; + void *current_branch_to_free; + struct merge_parents merge_parents; + + if (!suppress_dest_pattern_seen) + string_list_append(&suppress_dest_patterns, "master"); + + memset(&merge_parents, 0, sizeof(merge_parents)); + + /* get current branch */ + current_branch = current_branch_to_free = + resolve_refdup("HEAD", RESOLVE_REF_READING, &head_oid, NULL); + if (!current_branch) + die("No current branch"); + if (starts_with(current_branch, "refs/heads/")) + current_branch += 11; + + find_merge_parents(&merge_parents, in, &head_oid); + + /* get a line */ + while (pos < in->len) { + int len; + char *newline, *p = in->buf + pos; + + newline = strchr(p, '\n'); + len = newline ? newline - p : strlen(p); + pos += len + !!newline; + i++; + p[len] = 0; + if (handle_line(p, &merge_parents)) + die("error in line %d: %.*s", i, len, p); + } + + if (opts->add_title && srcs.nr) + fmt_merge_msg_title(out, current_branch); + + if (origins.nr) + fmt_merge_msg_sigs(out); + + if (opts->shortlog_len) { + struct commit *head; + struct rev_info rev; + + head = lookup_commit_or_die(&head_oid, "HEAD"); + repo_init_revisions(the_repository, &rev, NULL); + rev.commit_format = CMIT_FMT_ONELINE; + rev.ignore_merges = 1; + rev.limited = 1; + + strbuf_complete_line(out); + + for (i = 0; i < origins.nr; i++) + shortlog(origins.items[i].string, + origins.items[i].util, + head, &rev, opts, out); + } + + strbuf_complete_line(out); + free(current_branch_to_free); + free(merge_parents.item); + return 0; +} diff --git a/third_party/git/fmt-merge-msg.h b/third_party/git/fmt-merge-msg.h index 01e3aa88c5..f2ab0e0085 100644 --- a/third_party/git/fmt-merge-msg.h +++ b/third_party/git/fmt-merge-msg.h @@ -1,7 +1,20 @@ #ifndef FMT_MERGE_MSG_H #define FMT_MERGE_MSG_H +#include "strbuf.h" + +#define DEFAULT_MERGE_LOG_LEN 20 + +struct fmt_merge_msg_opts { + unsigned add_title:1, + credit_people:1; + int shortlog_len; +}; + extern int merge_log_config; int fmt_merge_msg_config(const char *key, const char *value, void *cb); +int fmt_merge_msg(struct strbuf *in, struct strbuf *out, + struct fmt_merge_msg_opts *); + #endif /* FMT_MERGE_MSG_H */ diff --git a/third_party/git/fsck.c b/third_party/git/fsck.c index cdb7d8db03..f82e2fe9e3 100644 --- a/third_party/git/fsck.c +++ b/third_party/git/fsck.c @@ -9,12 +9,14 @@ #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; @@ -43,21 +45,17 @@ 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) \ @@ -68,6 +66,7 @@ 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) \ @@ -281,14 +280,16 @@ static void append_msg_id(struct strbuf *sb, const char *msg_id) strbuf_addstr(sb, ": "); } -static int object_on_skiplist(struct fsck_options *opts, struct object *obj) +static int object_on_skiplist(struct fsck_options *opts, + const struct object_id *oid) { - return opts && obj && oidset_contains(&opts->skiplist, &obj->oid); + return opts && oid && oidset_contains(&opts->skiplist, oid); } -__attribute__((format (printf, 4, 5))) -static int report(struct fsck_options *options, struct object *object, - enum fsck_msg_id id, const char *fmt, ...) +__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, ...) { va_list ap; struct strbuf sb = STRBUF_INIT; @@ -297,7 +298,7 @@ static int report(struct fsck_options *options, struct object *object, if (msg_type == FSCK_IGNORE) return 0; - if (object_on_skiplist(options, object)) + if (object_on_skiplist(options, oid)) return 0; if (msg_type == FSCK_FATAL) @@ -309,49 +310,71 @@ static int report(struct fsck_options *options, struct object *object, va_start(ap, fmt); strbuf_vaddf(&sb, fmt, ap); - result = options->error_func(options, object, msg_type, sb.buf); + result = options->error_func(options, oid, object_type, + msg_type, sb.buf); strbuf_release(&sb); va_end(ap); return result; } -static char *get_object_name(struct fsck_options *options, struct object *obj) +void fsck_enable_object_names(struct fsck_options *options) { 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; - return lookup_decoration(options->object_names, obj); + 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); } -static void put_object_name(struct fsck_options *options, struct object *obj, - const char *fmt, ...) +void fsck_put_object_name(struct fsck_options *options, + const struct object_id *oid, + const char *fmt, ...) { va_list ap; struct strbuf buf = STRBUF_INIT; - char *existing; + khiter_t pos; + int hashret; if (!options->object_names) return; - existing = lookup_decoration(options->object_names, obj); - if (existing) + + pos = kh_put_oid_map(options->object_names, *oid, &hashret); + if (!hashret) return; va_start(ap, fmt); strbuf_vaddf(&buf, fmt, ap); - add_decoration(options->object_names, obj, strbuf_detach(&buf, NULL)); + kh_value(options->object_names, pos) = strbuf_detach(&buf, NULL); va_end(ap); } -static const char *describe_object(struct fsck_options *o, struct object *obj) +const char *fsck_describe_object(struct fsck_options *options, + const struct object_id *oid) { - 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); + 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); - return buf.buf; + return buf->buf; } static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *options) @@ -364,7 +387,7 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op if (parse_tree(tree)) return -1; - name = get_object_name(options, &tree->object); + name = fsck_get_object_name(options, &tree->object.oid); if (init_tree_desc_gently(&desc, tree->buffer, tree->size)) return -1; while (tree_entry_gently(&desc, &entry)) { @@ -377,20 +400,21 @@ 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) - put_object_name(options, obj, "%s%s/", name, - entry.path); + fsck_put_object_name(options, &entry.oid, "%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) - put_object_name(options, obj, "%s%s", name, - entry.path); + fsck_put_object_name(options, &entry.oid, "%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", - describe_object(options, &tree->object), entry.path, entry.mode); + fsck_describe_object(options, &tree->object.oid), + entry.path, entry.mode); } if (result < 0) return result; @@ -411,10 +435,10 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio if (parse_commit(commit)) return -1; - name = get_object_name(options, &commit->object); + name = fsck_get_object_name(options, &commit->object.oid); if (name) - put_object_name(options, &get_commit_tree(commit)->object, - "%s:", name); + fsck_put_object_name(options, get_commit_tree_oid(commit), + "%s:", name); result = options->walk((struct object *)get_commit_tree(commit), OBJ_TREE, data, options); @@ -442,16 +466,17 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio while (parents) { if (name) { - struct object *obj = &parents->item->object; + struct object_id *oid = &parents->item->object.oid; if (counter++) - put_object_name(options, obj, "%s^%d", - name, counter); + fsck_put_object_name(options, oid, "%s^%d", + name, counter); else if (generation > 0) - put_object_name(options, obj, "%.*s~%d", - name_prefix_len, name, generation + 1); + fsck_put_object_name(options, oid, "%.*s~%d", + name_prefix_len, name, + generation + 1); else - put_object_name(options, obj, "%s^", name); + fsck_put_object_name(options, oid, "%s^", name); } result = options->walk((struct object *)parents->item, OBJ_COMMIT, data, options); if (result < 0) @@ -465,12 +490,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) { - char *name = get_object_name(options, &tag->object); + const char *name = fsck_get_object_name(options, &tag->object.oid); if (parse_tag(tag)) return -1; if (name) - put_object_name(options, tag->tagged, "%s", name); + fsck_put_object_name(options, &tag->tagged->oid, "%s", name); return options->walk(tag->tagged, OBJ_ANY, data, options); } @@ -492,11 +517,34 @@ 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", describe_object(options, obj)); + error("Unknown object type for %s", + fsck_describe_object(options, &obj->oid)); return -1; } } +struct name_stack { + const char **names; + size_t nr, alloc; +}; + +static void name_stack_push(struct name_stack *stack, const char *name) +{ + ALLOC_GROW(stack->names, stack->nr + 1, stack->alloc); + stack->names[stack->nr++] = name; +} + +static const char *name_stack_pop(struct name_stack *stack) +{ + return stack->nr ? stack->names[--stack->nr] : NULL; +} + +static void name_stack_clear(struct name_stack *stack) +{ + FREE_AND_NULL(stack->names); + stack->nr = stack->alloc = 0; +} + /* * The entries in a tree are ordered in the _path_ order, * which means that a directory entry is ordered by adding @@ -508,7 +556,14 @@ int fsck_walk(struct object *obj, void *data, struct fsck_options *options) #define TREE_UNORDERED (-1) #define TREE_HAS_DUPS (-2) -static int verify_ordered(unsigned mode1, const char *name1, unsigned mode2, const char *name2) +static int is_less_than_slash(unsigned char c) +{ + return '\0' < c && c < '/'; +} + +static int verify_ordered(unsigned mode1, const char *name1, + unsigned mode2, const char *name2, + struct name_stack *candidates) { int len1 = strlen(name1); int len2 = strlen(name2); @@ -540,10 +595,47 @@ static int verify_ordered(unsigned mode1, const char *name1, unsigned mode2, con c1 = '/'; if (!c2 && S_ISDIR(mode2)) c2 = '/'; + + /* + * There can be non-consecutive duplicates due to the implicitly + * added slash, e.g.: + * + * foo + * foo.bar + * foo.bar.baz + * foo.bar/ + * foo/ + * + * Record non-directory candidates (like "foo" and "foo.bar" in + * the example) on a stack and check directory candidates (like + * foo/" and "foo.bar/") against that stack. + */ + if (!c1 && is_less_than_slash(c2)) { + name_stack_push(candidates, name1); + } else if (c2 == '/' && is_less_than_slash(c1)) { + for (;;) { + const char *p; + const char *f_name = name_stack_pop(candidates); + + if (!f_name) + break; + if (!skip_prefix(name2, f_name, &p)) + continue; + if (!*p) + return TREE_HAS_DUPS; + if (is_less_than_slash(*p)) { + name_stack_push(candidates, f_name); + break; + } + } + } + return c1 < c2 ? 0 : TREE_UNORDERED; } -static int fsck_tree(struct tree *item, struct fsck_options *options) +static int fsck_tree(const struct object_id *oid, + const char *buffer, unsigned long size, + struct fsck_options *options) { int retval = 0; int has_null_sha1 = 0; @@ -559,9 +651,10 @@ static int fsck_tree(struct tree *item, struct fsck_options *options) struct tree_desc desc; unsigned o_mode; const char *o_name; + struct name_stack df_dup_candidates = { NULL }; - 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"); + if (init_tree_desc_gently(&desc, buffer, size)) { + retval += report(options, oid, OBJ_TREE, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree"); return retval; } @@ -570,7 +663,7 @@ static int fsck_tree(struct tree *item, struct fsck_options *options) while (desc.size) { unsigned short mode; - const char *name; + const char *name, *backslash; const struct object_id *oid; oid = tree_entry_extract(&desc, &name, &mode); @@ -587,13 +680,30 @@ static int fsck_tree(struct tree *item, struct fsck_options *options) if (!S_ISLNK(mode)) oidset_insert(&gitmodules_found, oid); else - retval += report(options, &item->object, + retval += report(options, + oid, OBJ_TREE, 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, &item->object, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree"); + retval += report(options, oid, OBJ_TREE, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree"); break; } @@ -621,7 +731,8 @@ static int fsck_tree(struct tree *item, struct fsck_options *options) } if (o_name) { - switch (verify_ordered(o_mode, o_name, mode, name)) { + switch (verify_ordered(o_mode, o_name, mode, name, + &df_dup_candidates)) { case TREE_UNORDERED: not_properly_sorted = 1; break; @@ -637,31 +748,34 @@ static int fsck_tree(struct tree *item, struct fsck_options *options) o_name = name; } + name_stack_clear(&df_dup_candidates); + if (has_null_sha1) - retval += report(options, &item->object, FSCK_MSG_NULL_SHA1, "contains entries pointing to null sha1"); + retval += report(options, oid, OBJ_TREE, FSCK_MSG_NULL_SHA1, "contains entries pointing to null sha1"); if (has_full_path) - retval += report(options, &item->object, FSCK_MSG_FULL_PATHNAME, "contains full pathnames"); + retval += report(options, oid, OBJ_TREE, FSCK_MSG_FULL_PATHNAME, "contains full pathnames"); if (has_empty_name) - retval += report(options, &item->object, FSCK_MSG_EMPTY_NAME, "contains empty pathname"); + retval += report(options, oid, OBJ_TREE, FSCK_MSG_EMPTY_NAME, "contains empty pathname"); if (has_dot) - retval += report(options, &item->object, FSCK_MSG_HAS_DOT, "contains '.'"); + retval += report(options, oid, OBJ_TREE, FSCK_MSG_HAS_DOT, "contains '.'"); if (has_dotdot) - retval += report(options, &item->object, FSCK_MSG_HAS_DOTDOT, "contains '..'"); + retval += report(options, oid, OBJ_TREE, FSCK_MSG_HAS_DOTDOT, "contains '..'"); if (has_dotgit) - retval += report(options, &item->object, FSCK_MSG_HAS_DOTGIT, "contains '.git'"); + retval += report(options, oid, OBJ_TREE, FSCK_MSG_HAS_DOTGIT, "contains '.git'"); if (has_zero_pad) - retval += report(options, &item->object, FSCK_MSG_ZERO_PADDED_FILEMODE, "contains zero-padded file modes"); + retval += report(options, oid, OBJ_TREE, FSCK_MSG_ZERO_PADDED_FILEMODE, "contains zero-padded file modes"); if (has_bad_modes) - retval += report(options, &item->object, FSCK_MSG_BAD_FILEMODE, "contains bad file modes"); + retval += report(options, oid, OBJ_TREE, FSCK_MSG_BAD_FILEMODE, "contains bad file modes"); if (has_dup_entries) - retval += report(options, &item->object, FSCK_MSG_DUPLICATE_ENTRIES, "contains duplicate file entries"); + retval += report(options, oid, OBJ_TREE, FSCK_MSG_DUPLICATE_ENTRIES, "contains duplicate file entries"); if (not_properly_sorted) - retval += report(options, &item->object, FSCK_MSG_TREE_NOT_SORTED, "not properly sorted"); + retval += report(options, oid, OBJ_TREE, FSCK_MSG_TREE_NOT_SORTED, "not properly sorted"); return retval; } static int verify_headers(const void *data, unsigned long size, - struct object *obj, struct fsck_options *options) + const struct object_id *oid, enum object_type type, + struct fsck_options *options) { const char *buffer = (const char *)data; unsigned long i; @@ -669,7 +783,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, obj, + return report(options, oid, type, FSCK_MSG_NUL_IN_HEADER, "unterminated header: NUL at offset %ld", i); case '\n': @@ -687,11 +801,13 @@ static int verify_headers(const void *data, unsigned long size, if (size && buffer[size - 1] == '\n') return 0; - return report(options, obj, + return report(options, oid, type, FSCK_MSG_UNTERMINATED_HEADER, "unterminated header"); } -static int fsck_ident(const char **ident, struct object *obj, struct fsck_options *options) +static int fsck_ident(const char **ident, + const struct object_id *oid, enum object_type type, + struct fsck_options *options) { const char *p = *ident; char *end; @@ -701,28 +817,28 @@ static int fsck_ident(const char **ident, struct object *obj, struct fsck_option (*ident)++; if (*p == '<') - return report(options, obj, FSCK_MSG_MISSING_NAME_BEFORE_EMAIL, "invalid author/committer line - missing space before email"); + return report(options, oid, type, FSCK_MSG_MISSING_NAME_BEFORE_EMAIL, "invalid author/committer line - missing space before email"); p += strcspn(p, "<>\n"); if (*p == '>') - return report(options, obj, FSCK_MSG_BAD_NAME, "invalid author/committer line - bad name"); + return report(options, oid, type, FSCK_MSG_BAD_NAME, "invalid author/committer line - bad name"); if (*p != '<') - return report(options, obj, FSCK_MSG_MISSING_EMAIL, "invalid author/committer line - missing email"); + return report(options, oid, type, FSCK_MSG_MISSING_EMAIL, "invalid author/committer line - missing email"); if (p[-1] != ' ') - return report(options, obj, FSCK_MSG_MISSING_SPACE_BEFORE_EMAIL, "invalid author/committer line - missing space before email"); + return report(options, oid, type, FSCK_MSG_MISSING_SPACE_BEFORE_EMAIL, "invalid author/committer line - missing space before email"); p++; p += strcspn(p, "<>\n"); if (*p != '>') - return report(options, obj, FSCK_MSG_BAD_EMAIL, "invalid author/committer line - bad email"); + return report(options, oid, type, FSCK_MSG_BAD_EMAIL, "invalid author/committer line - bad email"); p++; if (*p != ' ') - return report(options, obj, FSCK_MSG_MISSING_SPACE_BEFORE_DATE, "invalid author/committer line - missing space before date"); + return report(options, oid, type, FSCK_MSG_MISSING_SPACE_BEFORE_DATE, "invalid author/committer line - missing space before date"); p++; if (*p == '0' && p[1] != ' ') - return report(options, obj, FSCK_MSG_ZERO_PADDED_DATE, "invalid author/committer line - zero-padded date"); + return report(options, oid, type, FSCK_MSG_ZERO_PADDED_DATE, "invalid author/committer line - zero-padded date"); if (date_overflows(parse_timestamp(p, &end, 10))) - return report(options, obj, FSCK_MSG_BAD_DATE_OVERFLOW, "invalid author/committer line - date causes integer overflow"); + return report(options, oid, type, FSCK_MSG_BAD_DATE_OVERFLOW, "invalid author/committer line - date causes integer overflow"); if ((end == p || *end != ' ')) - return report(options, obj, FSCK_MSG_BAD_DATE, "invalid author/committer line - bad date"); + return report(options, oid, type, FSCK_MSG_BAD_DATE, "invalid author/committer line - bad date"); p = end + 1; if ((*p != '+' && *p != '-') || !isdigit(p[1]) || @@ -730,83 +846,60 @@ static int fsck_ident(const char **ident, struct object *obj, struct fsck_option !isdigit(p[3]) || !isdigit(p[4]) || (p[5] != '\n')) - return report(options, obj, FSCK_MSG_BAD_TIMEZONE, "invalid author/committer line - bad time zone"); + return report(options, oid, type, FSCK_MSG_BAD_TIMEZONE, "invalid author/committer line - bad time zone"); p += 6; return 0; } -static int fsck_commit_buffer(struct commit *commit, const char *buffer, - unsigned long size, struct fsck_options *options) +static int fsck_commit(const struct object_id *oid, + const char *buffer, unsigned long size, + struct fsck_options *options) { - struct object_id tree_oid, oid; - struct commit_graft *graft; - unsigned parent_count, parent_line_count = 0, author_count; + struct object_id tree_oid, parent_oid; + unsigned author_count; int err; const char *buffer_begin = buffer; const char *p; - if (verify_headers(buffer, size, &commit->object, options)) + if (verify_headers(buffer, size, oid, OBJ_COMMIT, options)) return -1; if (!skip_prefix(buffer, "tree ", &buffer)) - return report(options, &commit->object, FSCK_MSG_MISSING_TREE, "invalid format - expected 'tree' line"); + return report(options, oid, OBJ_COMMIT, FSCK_MSG_MISSING_TREE, "invalid format - expected 'tree' line"); if (parse_oid_hex(buffer, &tree_oid, &p) || *p != '\n') { - err = report(options, &commit->object, FSCK_MSG_BAD_TREE_SHA1, "invalid 'tree' line format - bad sha1"); + err = report(options, oid, OBJ_COMMIT, 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, &oid, &p) || *p != '\n') { - err = report(options, &commit->object, FSCK_MSG_BAD_PARENT_SHA1, "invalid 'parent' line format - bad sha1"); + 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 (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, &commit->object, options); + err = fsck_ident(&buffer, oid, OBJ_COMMIT, options); if (err) return err; } if (author_count < 1) - err = report(options, &commit->object, FSCK_MSG_MISSING_AUTHOR, "invalid format - expected 'author' line"); + err = report(options, oid, OBJ_COMMIT, FSCK_MSG_MISSING_AUTHOR, "invalid format - expected 'author' line"); else if (author_count > 1) - err = report(options, &commit->object, FSCK_MSG_MULTIPLE_AUTHORS, "invalid format - multiple 'author' lines"); + err = report(options, oid, OBJ_COMMIT, FSCK_MSG_MULTIPLE_AUTHORS, "invalid format - multiple 'author' lines"); if (err) return err; if (!skip_prefix(buffer, "committer ", &buffer)) - return report(options, &commit->object, FSCK_MSG_MISSING_COMMITTER, "invalid format - expected 'committer' line"); - err = fsck_ident(&buffer, &commit->object, options); + return report(options, oid, OBJ_COMMIT, FSCK_MSG_MISSING_COMMITTER, "invalid format - expected 'committer' line"); + err = fsck_ident(&buffer, oid, OBJ_COMMIT, 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, &commit->object, FSCK_MSG_NUL_IN_COMMIT, + err = report(options, oid, OBJ_COMMIT, FSCK_MSG_NUL_IN_COMMIT, "NUL byte in the commit object body"); if (err) return err; @@ -814,91 +907,60 @@ static int fsck_commit_buffer(struct commit *commit, const char *buffer, return 0; } -static int fsck_commit(struct commit *commit, const char *data, - unsigned long size, struct fsck_options *options) -{ - 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) +static int fsck_tag(const struct object_id *oid, const char *buffer, + unsigned long size, struct fsck_options *options) { - struct object_id oid; + struct object_id tagged_oid; int ret = 0; - const char *buffer; - char *to_free = NULL, *eol; + char *eol; struct strbuf sb = STRBUF_INIT; const char *p; - 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); + ret = verify_headers(buffer, size, oid, OBJ_TAG, options); if (ret) goto done; if (!skip_prefix(buffer, "object ", &buffer)) { - ret = report(options, &tag->object, FSCK_MSG_MISSING_OBJECT, "invalid format - expected 'object' line"); + ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_OBJECT, "invalid format - expected 'object' line"); goto done; } - 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 (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 (ret) goto done; } buffer = p + 1; if (!skip_prefix(buffer, "type ", &buffer)) { - ret = report(options, &tag->object, FSCK_MSG_MISSING_TYPE_ENTRY, "invalid format - expected 'type' line"); + ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TYPE_ENTRY, "invalid format - expected 'type' line"); goto done; } eol = strchr(buffer, '\n'); if (!eol) { - ret = report(options, &tag->object, FSCK_MSG_MISSING_TYPE, "invalid format - unexpected end after 'type' line"); + ret = report(options, oid, OBJ_TAG, 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, &tag->object, FSCK_MSG_BAD_TYPE, "invalid 'type' value"); + ret = report(options, oid, OBJ_TAG, FSCK_MSG_BAD_TYPE, "invalid 'type' value"); if (ret) goto done; buffer = eol + 1; if (!skip_prefix(buffer, "tag ", &buffer)) { - ret = report(options, &tag->object, FSCK_MSG_MISSING_TAG_ENTRY, "invalid format - expected 'tag' line"); + ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TAG_ENTRY, "invalid format - expected 'tag' line"); goto done; } eol = strchr(buffer, '\n'); if (!eol) { - ret = report(options, &tag->object, FSCK_MSG_MISSING_TAG, "invalid format - unexpected end after 'type' line"); + ret = report(options, oid, OBJ_TAG, 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, &tag->object, FSCK_MSG_BAD_TAG_NAME, - "invalid 'tag' name: %.*s", - (int)(eol - buffer), buffer); + ret = report(options, oid, OBJ_TAG, + FSCK_MSG_BAD_TAG_NAME, + "invalid 'tag' name: %.*s", + (int)(eol - buffer), buffer); if (ret) goto done; } @@ -906,32 +968,163 @@ static int fsck_tag_buffer(struct tag *tag, const char *data, if (!skip_prefix(buffer, "tagger ", &buffer)) { /* early tags do not contain 'tagger' lines; warn only */ - ret = report(options, &tag->object, FSCK_MSG_MISSING_TAGGER_ENTRY, "invalid format - expected 'tagger' line"); + ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TAGGER_ENTRY, "invalid format - expected 'tagger' line"); if (ret) goto done; } else - ret = fsck_ident(&buffer, &tag->object, options); + ret = fsck_ident(&buffer, oid, OBJ_TAG, options); done: strbuf_release(&sb); - free(to_free); return ret; } -static int fsck_tag(struct tag *tag, const char *data, - unsigned long size, struct fsck_options *options) +/* + * 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) { - struct object *tagged = tag->tagged; + return str[0] == '.' && (str[1] == '/' || str[1] == '\\'); +} - if (!tagged) - return report(options, &tag->object, FSCK_MSG_BAD_TAG_OBJECT, "could not load tagged object"); +/* + * 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); +} - return fsck_tag_buffer(tag, data, size, options); +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) +{ + /* + * 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; +} + +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; + } + + 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; } struct fsck_gitmodules_data { - struct object *obj; + const struct object_id *oid; struct fsck_options *options; int ret; }; @@ -940,7 +1133,7 @@ static int fsck_gitmodules_fn(const char *var, const char *value, void *vdata) { struct fsck_gitmodules_data *data = vdata; const char *subsection, *key; - int subsection_len; + size_t subsection_len; char *name; if (parse_config_key(var, "submodule", &subsection, &subsection_len, &key) < 0 || @@ -949,38 +1142,47 @@ 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->obj, + data->ret |= report(data->options, + data->oid, OBJ_BLOB, FSCK_MSG_GITMODULES_NAME, "disallowed submodule name: %s", name); if (!strcmp(key, "url") && value && - looks_like_command_line_option(value)) - data->ret |= report(data->options, data->obj, + check_submodule_url(value) < 0) + data->ret |= report(data->options, + data->oid, OBJ_BLOB, 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->obj, + data->ret |= report(data->options, + data->oid, OBJ_BLOB, 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(struct blob *blob, const char *buf, +static int fsck_blob(const struct object_id *oid, 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, &blob->object.oid)) + if (!oidset_contains(&gitmodules_found, oid)) return 0; - oidset_insert(&gitmodules_done, &blob->object.oid); + oidset_insert(&gitmodules_done, oid); - if (object_on_skiplist(options, &blob->object)) + if (object_on_skiplist(options, oid)) return 0; if (!buf) { @@ -989,18 +1191,18 @@ static int fsck_blob(struct blob *blob, const char *buf, * blob too gigantic to load into memory. Let's just consider * that an error. */ - return report(options, &blob->object, + return report(options, oid, OBJ_BLOB, FSCK_MSG_GITMODULES_LARGE, ".gitmodules too large to parse"); } - data.obj = &blob->object; + data.oid = oid; 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, &blob->object, + data.ret |= report(options, oid, OBJ_BLOB, FSCK_MSG_GITMODULES_PARSE, "could not parse gitmodules blob"); @@ -1011,31 +1213,33 @@ int fsck_object(struct object *obj, void *data, unsigned long size, struct fsck_options *options) { if (!obj) - return report(options, obj, FSCK_MSG_BAD_OBJECT_SHA1, "no valid object to fsck"); + return report(options, NULL, OBJ_NONE, FSCK_MSG_BAD_OBJECT_SHA1, "no valid object to fsck"); if (obj->type == OBJ_BLOB) - return fsck_blob((struct blob *)obj, data, size, options); + return fsck_blob(&obj->oid, data, size, options); if (obj->type == OBJ_TREE) - return fsck_tree((struct tree *) obj, options); + return fsck_tree(&obj->oid, data, size, options); if (obj->type == OBJ_COMMIT) - return fsck_commit((struct commit *) obj, (const char *) data, - size, options); + return fsck_commit(&obj->oid, data, size, options); if (obj->type == OBJ_TAG) - return fsck_tag((struct tag *) obj, (const char *) data, - size, options); + return fsck_tag(&obj->oid, data, size, options); - return report(options, obj, FSCK_MSG_UNKNOWN_TYPE, "unknown type '%d' (internal fsck error)", - obj->type); + return report(options, &obj->oid, obj->type, + FSCK_MSG_UNKNOWN_TYPE, + "unknown type '%d' (internal fsck error)", + obj->type); } int fsck_error_function(struct fsck_options *o, - struct object *obj, int msg_type, const char *message) + const struct object_id *oid, + enum object_type object_type, + int msg_type, const char *message) { if (msg_type == FSCK_WARN) { - warning("object %s: %s", describe_object(o, obj), message); + warning("object %s: %s", fsck_describe_object(o, oid), message); return 0; } - error("object %s: %s", describe_object(o, obj), message); + error("object %s: %s", fsck_describe_object(o, oid), message); return 1; } @@ -1047,7 +1251,6 @@ 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; @@ -1055,29 +1258,22 @@ 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(&blob->object.oid)) + if (is_promisor_object(oid)) continue; - ret |= report(options, &blob->object, + ret |= report(options, + oid, OBJ_BLOB, FSCK_MSG_GITMODULES_MISSING, "unable to read .gitmodules blob"); continue; } if (type == OBJ_BLOB) - ret |= fsck_blob(blob, buf, size, options); + ret |= fsck_blob(oid, buf, size, options); else - ret |= report(options, &blob->object, + ret |= report(options, + oid, type, 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 b95595ae5f..69cf715e79 100644 --- a/third_party/git/fsck.h +++ b/third_party/git/fsck.h @@ -27,10 +27,12 @@ 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, - struct object *obj, int type, const char *message); + const struct object_id *oid, enum object_type object_type, + int msg_type, const char *message); int fsck_error_function(struct fsck_options *o, - struct object *obj, int type, const char *message); + const struct object_id *oid, enum object_type object_type, + int msg_type, const char *message); struct fsck_options { fsck_walk_func walk; @@ -38,7 +40,7 @@ struct fsck_options { unsigned strict:1; int *msg_type; struct oidset skiplist; - struct decoration *object_names; + kh_oid_map_t *object_names; }; #define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0, NULL, OIDSET_INIT } @@ -52,7 +54,11 @@ struct fsck_options { * 0 everything OK */ int fsck_walk(struct object *obj, void *data, struct fsck_options *options); -/* If NULL is passed for data, we assume the object is local and read it. */ + +/* + * 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. + */ int fsck_object(struct object *obj, void *data, unsigned long size, struct fsck_options *options); @@ -63,4 +69,29 @@ 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 231e83a94d..ca031c3abb 100644 --- a/third_party/git/fsmonitor.c +++ b/third_party/git/fsmonitor.c @@ -6,19 +6,42 @@ #include "run-command.h" #include "strbuf.h" -#define INDEX_EXTENSION_VERSION (1) -#define HOOK_INTERFACE_VERSION (1) +#define INDEX_EXTENSION_VERSION1 (1) +#define INDEX_EXTENSION_VERSION2 (2) +#define HOOK_INTERFACE_VERSION1 (1) +#define HOOK_INTERFACE_VERSION2 (2) 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 = istate->cache[pos]; + struct cache_entry *ce; + 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) { @@ -27,17 +50,26 @@ 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) + sizeof(uint64_t) + sizeof(uint32_t)) + if (sz < sizeof(uint32_t) + 1 + sizeof(uint32_t)) return error("corrupt fsmonitor extension (too short)"); hdr_version = get_be32(index); index += sizeof(uint32_t); - if (hdr_version != INDEX_EXTENSION_VERSION) + 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 { return error("bad fsmonitor version %d", hdr_version); + } - istate->fsmonitor_last_update = get_be64(index); - index += sizeof(uint64_t); + istate->fsmonitor_last_update = strbuf_detach(&last_update, NULL); ewah_size = get_be32(index); index += sizeof(uint32_t); @@ -50,32 +82,45 @@ 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; + unsigned int i, skipped = 0; istate->fsmonitor_dirty = ewah_new(); - for (i = 0; i < istate->cache_nr; i++) - if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID)) - ewah_set(istate->fsmonitor_dirty, i); + 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); + } } 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; - put_be32(&hdr_version, INDEX_EXTENSION_VERSION); + 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); strbuf_add(sb, &hdr_version, sizeof(uint32_t)); - put_be64(&tm, istate->fsmonitor_last_update); - strbuf_add(sb, &tm, sizeof(uint64_t)); + strbuf_addstr(sb, istate->fsmonitor_last_update); + strbuf_addch(sb, 0); /* Want to keep a NUL */ + fixup = sb->len; strbuf_add(sb, &ewah_size, sizeof(uint32_t)); /* we'll fix this up later */ @@ -92,18 +137,18 @@ void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate) } /* - * Call the query-fsmonitor hook passing the time of the last saved results. + * Call the query-fsmonitor hook passing the last update token of the saved results. */ -static int query_fsmonitor(int version, uint64_t last_update, struct strbuf *query_result) +static int query_fsmonitor(int version, const char *last_update, struct strbuf *query_result) { struct child_process cp = CHILD_PROCESS_INIT; if (!core_fsmonitor) return -1; - argv_array_push(&cp.args, core_fsmonitor); - argv_array_pushf(&cp.args, "%d", version); - argv_array_pushf(&cp.args, "%" PRIuMAX, (uintmax_t)last_update); + strvec_push(&cp.args, core_fsmonitor); + strvec_pushf(&cp.args, "%d", version); + strvec_pushf(&cp.args, "%s", last_update); cp.use_shell = 1; cp.dir = get_git_work_tree(); @@ -130,14 +175,18 @@ 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; - size_t bol; /* beginning of line */ + int query_success = 0, hook_version = -1; + size_t bol = 0; /* 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"); @@ -146,26 +195,60 @@ 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 time, call query_fsmonitor for the set of - * changes since that time, else assume everything is possibly dirty + * If we have a last update token, call query_fsmonitor for the set of + * changes since that token, else assume everything is possibly dirty * and check it all. */ if (istate->fsmonitor_last_update) { - query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION, - istate->fsmonitor_last_update, &query_result); + 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 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); + } + 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[0] != '/') { + if (query_success && query_result.buf[bol] != '/') { /* Mark all entries returned by the monitor as dirty */ buf = query_result.buf; - bol = 0; - for (i = 0; i < query_result.len; i++) { + for (i = bol; i < query_result.len; i++) { if (buf[i] != '\0') continue; fsmonitor_refresh_callback(istate, buf + bol); @@ -173,31 +256,47 @@ 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++) - istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID; + 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; + } + } /* If we're going to check every file, ensure we save the results */ - istate->cache_changed |= FSMONITOR_CHANGED; + if (is_cache_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 time */ - istate->fsmonitor_last_update = last_update; + /* 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); } 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; - istate->fsmonitor_last_update = getnanotime(); + strbuf_addf(&last_update, "%"PRIu64"", getnanotime()); + istate->fsmonitor_last_update = strbuf_detach(&last_update, NULL); /* reset the fsmonitor state */ for (i = 0; i < istate->cache_nr; i++) @@ -219,7 +318,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; - istate->fsmonitor_last_update = 0; + FREE_AND_NULL(istate->fsmonitor_last_update); } } @@ -236,11 +335,12 @@ 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); - /* Now mark the untracked cache for fsmonitor usage */ - if (istate->untracked) - istate->untracked->use_fsmonitor = 1; + refresh_fsmonitor(istate); } ewah_free(istate->fsmonitor_dirty); diff --git a/third_party/git/fuzz-commit-graph.c b/third_party/git/fuzz-commit-graph.c index 0157acbf2e..e7cf6d5b0f 100644 --- a/third_party/git/fuzz-commit-graph.c +++ b/third_party/git/fuzz-commit-graph.c @@ -1,8 +1,8 @@ #include "commit-graph.h" #include "repository.h" -struct commit_graph *parse_commit_graph(void *graph_map, int fd, - size_t graph_size); +struct commit_graph *parse_commit_graph(struct repository *r, + void *graph_map, size_t graph_size); int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); @@ -11,9 +11,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) struct commit_graph *g; initialize_the_repository(); - g = parse_commit_graph((void *)data, -1, size); + g = parse_commit_graph(the_repository, (void *)data, size); repo_clear(the_repository); - free(g); + free_commit_graph(g); return 0; } diff --git a/third_party/git/generate-cmdlist.sh b/third_party/git/generate-cmdlist.sh index 71158f7d8b..9dbbb08e70 100755 --- a/third_party/git/generate-cmdlist.sh +++ b/third_party/git/generate-cmdlist.sh @@ -10,7 +10,7 @@ command_list () { } get_categories () { - tr ' ' '\n'| + tr ' ' '\012'| grep -v '^$' | sort | uniq @@ -76,23 +76,6 @@ print_command_list () { echo "};" } -print_config_list () { - cat <<EOF -static const char *config_name_list[] = { -EOF - grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt | - sed '/deprecated/d; s/::$//; s/, */\n/g' | - sort | - while read line - do - echo " \"$line\"," - done - cat <<EOF - NULL, -}; -EOF -} - exclude_programs= while test "--exclude-program" = "$1" do @@ -113,5 +96,3 @@ echo define_category_names "$1" echo print_command_list "$1" -echo -print_config_list diff --git a/third_party/git/generate-configlist.sh b/third_party/git/generate-configlist.sh new file mode 100755 index 0000000000..8692fe5cf4 --- /dev/null +++ b/third_party/git/generate-configlist.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +echo "/* Automatically generated by generate-configlist.sh */" +echo + +print_config_list () { + cat <<EOF +static const char *config_name_list[] = { +EOF + grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt | + sed '/deprecated/d; s/::$//; s/, */\n/g' | + sort | + sed 's/^.*$/ "&",/' + cat <<EOF + NULL, +}; +EOF +} + +echo +print_config_list diff --git a/third_party/git/git-add--interactive.perl b/third_party/git/git-add--interactive.perl index c20ae9e210..8a72018712 100755 --- a/third_party/git/git-add--interactive.perl +++ b/third_party/git/git-add--interactive.perl @@ -177,7 +177,9 @@ sub run_cmd_pipe { } else { my $fh = undef; open($fh, '-|', @_) or die; - return <$fh>; + my @out = <$fh>; + close $fh || die "Cannot close @_ ($!)"; + return @out; } } @@ -224,7 +226,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; } @@ -712,7 +714,7 @@ sub parse_diff { if (defined $patch_mode_revision) { push @diff_cmd, get_diff_reference($patch_mode_revision); } - my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path); + my @diff = run_cmd_pipe("git", @diff_cmd, qw(--no-color --), $path); my @colored = (); if ($diff_use_color) { my @display_cmd = ("git", @diff_cmd, qw(--color --), $path); @@ -752,8 +754,13 @@ sub parse_diff_header { my $head = { TEXT => [], DISPLAY => [], TYPE => 'header' }; my $mode = { TEXT => [], DISPLAY => [], TYPE => 'mode' }; my $deletion = { TEXT => [], DISPLAY => [], TYPE => 'deletion' }; + my $addition; for (my $i = 0; $i < @{$src->{TEXT}}; $i++) { + if ($src->{TEXT}->[$i] =~ /^new file/) { + $addition = 1; + $head->{TYPE} = 'addition'; + } my $dest = $src->{TEXT}->[$i] =~ /^(old|new) mode (\d+)$/ ? $mode : $src->{TEXT}->[$i] =~ /^deleted file/ ? $deletion : @@ -761,7 +768,7 @@ sub parse_diff_header { push @{$dest->{TEXT}}, $src->{TEXT}->[$i]; push @{$dest->{DISPLAY}}, $src->{DISPLAY}->[$i]; } - return ($head, $mode, $deletion); + return ($head, $mode, $deletion, $addition); } sub hunk_splittable { @@ -1127,7 +1134,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) { @@ -1425,46 +1432,55 @@ my %patch_update_prompt_modes = ( stage => { mode => N__("Stage mode change [y,n,q,a,d%s,?]? "), deletion => N__("Stage deletion [y,n,q,a,d%s,?]? "), + addition => N__("Stage addition [y,n,q,a,d%s,?]? "), hunk => N__("Stage this hunk [y,n,q,a,d%s,?]? "), }, stash => { mode => N__("Stash mode change [y,n,q,a,d%s,?]? "), deletion => N__("Stash deletion [y,n,q,a,d%s,?]? "), + addition => N__("Stash addition [y,n,q,a,d%s,?]? "), hunk => N__("Stash this hunk [y,n,q,a,d%s,?]? "), }, reset_head => { mode => N__("Unstage mode change [y,n,q,a,d%s,?]? "), deletion => N__("Unstage deletion [y,n,q,a,d%s,?]? "), + addition => N__("Unstage addition [y,n,q,a,d%s,?]? "), hunk => N__("Unstage this hunk [y,n,q,a,d%s,?]? "), }, reset_nothead => { mode => N__("Apply mode change to index [y,n,q,a,d%s,?]? "), deletion => N__("Apply deletion to index [y,n,q,a,d%s,?]? "), + addition => N__("Apply addition to index [y,n,q,a,d%s,?]? "), hunk => N__("Apply this hunk to index [y,n,q,a,d%s,?]? "), }, checkout_index => { mode => N__("Discard mode change from worktree [y,n,q,a,d%s,?]? "), deletion => N__("Discard deletion from worktree [y,n,q,a,d%s,?]? "), + addition => N__("Discard addition from worktree [y,n,q,a,d%s,?]? "), hunk => N__("Discard this hunk from worktree [y,n,q,a,d%s,?]? "), }, checkout_head => { mode => N__("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "), deletion => N__("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "), + addition => N__("Discard addition from index and worktree [y,n,q,a,d%s,?]? "), hunk => N__("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "), }, checkout_nothead => { mode => N__("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "), deletion => N__("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "), + addition => N__("Apply addition to index and worktree [y,n,q,a,d%s,?]? "), hunk => N__("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "), }, worktree_head => { mode => N__("Discard mode change from worktree [y,n,q,a,d%s,?]? "), deletion => N__("Discard deletion from worktree [y,n,q,a,d%s,?]? "), + addition => N__("Discard addition from worktree [y,n,q,a,d%s,?]? "), hunk => N__("Discard this hunk from worktree [y,n,q,a,d%s,?]? "), }, worktree_nothead => { mode => N__("Apply mode change to worktree [y,n,q,a,d%s,?]? "), deletion => N__("Apply deletion to worktree [y,n,q,a,d%s,?]? "), + addition => N__("Apply addition to worktree [y,n,q,a,d%s,?]? "), hunk => N__("Apply this hunk to worktree [y,n,q,a,d%s,?]? "), }, ); @@ -1474,7 +1490,7 @@ sub patch_update_file { my ($ix, $num); my $path = shift; my ($head, @hunk) = parse_diff($path); - ($head, my $mode, my $deletion) = parse_diff_header($head); + ($head, my $mode, my $deletion, my $addition) = parse_diff_header($head); for (@{$head->{DISPLAY}}) { print; } @@ -1497,6 +1513,7 @@ sub patch_update_file { my ($prev, $next, $other, $undecided, $i); $other = ''; + last if ($ix and !$num); if ($num <= $ix) { $ix = 0; } @@ -1529,35 +1546,51 @@ sub patch_update_file { last; } } - last if (!$undecided); + last if (!$undecided && ($num || !$addition)); - if ($hunk[$ix]{TYPE} eq 'hunk' && - hunk_splittable($hunk[$ix]{TEXT})) { - $other .= ',s'; - } - if ($hunk[$ix]{TYPE} eq 'hunk') { - $other .= ',e'; - } - for (@{$hunk[$ix]{DISPLAY}}) { - print; + if ($num) { + if ($hunk[$ix]{TYPE} eq 'hunk' && + hunk_splittable($hunk[$ix]{TEXT})) { + $other .= ',s'; + } + if ($hunk[$ix]{TYPE} eq 'hunk') { + $other .= ',e'; + } + for (@{$hunk[$ix]{DISPLAY}}) { + print; + } } - print colored $prompt_color, - sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other); + my $type = $num ? $hunk[$ix]{TYPE} : $head->{TYPE}; + print colored $prompt_color, "(", ($ix+1), "/", ($num ? $num : 1), ") ", + sprintf(__($patch_update_prompt_modes{$patch_mode}{$type}), $other); my $line = prompt_single_character; last unless defined $line; if ($line) { if ($line =~ /^y/i) { - $hunk[$ix]{USE} = 1; + if ($num) { + $hunk[$ix]{USE} = 1; + } else { + $head->{USE} = 1; + } } elsif ($line =~ /^n/i) { - $hunk[$ix]{USE} = 0; + if ($num) { + $hunk[$ix]{USE} = 0; + } else { + $head->{USE} = 0; + } } elsif ($line =~ /^a/i) { - while ($ix < $num) { - if (!defined $hunk[$ix]{USE}) { - $hunk[$ix]{USE} = 1; + if ($num) { + while ($ix < $num) { + if (!defined $hunk[$ix]{USE}) { + $hunk[$ix]{USE} = 1; + } + $ix++; } + } else { + $head->{USE} = 1; $ix++; } next; @@ -1594,19 +1627,28 @@ sub patch_update_file { next; } elsif ($line =~ /^d/i) { - while ($ix < $num) { - if (!defined $hunk[$ix]{USE}) { - $hunk[$ix]{USE} = 0; + if ($num) { + while ($ix < $num) { + if (!defined $hunk[$ix]{USE}) { + $hunk[$ix]{USE} = 0; + } + $ix++; } + } else { + $head->{USE} = 0; $ix++; } next; } elsif ($line =~ /^q/i) { - for ($i = 0; $i < $num; $i++) { - if (!defined $hunk[$i]{USE}) { - $hunk[$i]{USE} = 0; + if ($num) { + for ($i = 0; $i < $num; $i++) { + if (!defined $hunk[$i]{USE}) { + $hunk[$i]{USE} = 0; + } } + } elsif (!defined $head->{USE}) { + $head->{USE} = 0; } $quit = 1; last; @@ -1724,7 +1766,7 @@ sub patch_update_file { } } - @hunk = coalesce_overlapping_hunks(@hunk); + @hunk = coalesce_overlapping_hunks(@hunk) if ($num); my $n_lofs = 0; my @result = (); @@ -1734,7 +1776,7 @@ sub patch_update_file { } } - if (@result) { + if (@result or $head->{USE}) { my @patch = reassemble_patch($head->{TEXT}, @result); my $apply_routine = $patch_mode_flavour{APPLY}; &$apply_routine(@patch); diff --git a/third_party/git/git-bisect.sh b/third_party/git/git-bisect.sh index efee12b8b1..ea7e684ebb 100755 --- a/third_party/git/git-bisect.sh +++ b/third_party/git/git-bisect.sh @@ -3,8 +3,8 @@ USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]' LONG_USAGE='git bisect help print this long help message. -git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>] - [--no-checkout] [<bad> [<good>...]] [--] [<pathspec>...] +git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] + [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...] reset bisect state and start bisection. git bisect (bad|new) [<rev>] mark <rev> a known-bad revision/ @@ -41,7 +41,7 @@ TERM_GOOD=good bisect_head() { - if test -f "$GIT_DIR/BISECT_HEAD" + if git rev-parse --verify -q BISECT_HEAD > /dev/null then echo BISECT_HEAD else @@ -49,27 +49,6 @@ bisect_head() fi } -bisect_autostart() { - test -s "$GIT_DIR/BISECT_START" || { - gettextln "You need to start by \"git bisect start\"" >&2 - if test -t 0 - then - # TRANSLATORS: Make sure to include [Y] and [n] in your - # translation. The program will only accept English input - # at this point. - gettext "Do you want me to do it for you [Y/n]? " >&2 - read yesno - case "$yesno" in - [Nn]*) - exit ;; - esac - bisect_start - else - exit 1 - fi - } -} - bisect_start() { git bisect--helper --bisect-start $@ || exit @@ -86,8 +65,7 @@ bisect_start() { # # Check if we can proceed to the next bisect state. # - get_terms - bisect_auto_next + git bisect--helper --bisect-auto-next || exit trap '-' 0 } @@ -108,7 +86,7 @@ bisect_skip() { } bisect_state() { - bisect_autostart + git bisect--helper --bisect-autostart || exit state=$1 git bisect--helper --check-and-set-terms $state $TERM_GOOD $TERM_BAD || exit get_terms @@ -140,45 +118,7 @@ bisect_state() { *) usage ;; esac - bisect_auto_next -} - -bisect_auto_next() { - git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD && bisect_next || : -} - -bisect_next() { - case "$#" in 0) ;; *) usage ;; esac - bisect_autostart - git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD $TERM_GOOD|| exit - - # Perform all bisection computation, display and checkout - git bisect--helper --next-all $(test -f "$GIT_DIR/BISECT_HEAD" && echo --no-checkout) - res=$? - - # Check if we should exit because bisection is finished - if test $res -eq 10 - then - bad_rev=$(git show-ref --hash --verify refs/bisect/$TERM_BAD) - bad_commit=$(git show-branch $bad_rev) - echo "# first $TERM_BAD commit: $bad_commit" >>"$GIT_DIR/BISECT_LOG" - exit 0 - elif test $res -eq 2 - then - echo "# only skipped commits left to test" >>"$GIT_DIR/BISECT_LOG" - good_revs=$(git for-each-ref --format="%(objectname)" "refs/bisect/$TERM_GOOD-*") - for skipped in $(git rev-list refs/bisect/$TERM_BAD --not $good_revs) - do - skipped_commit=$(git show-branch $skipped) - echo "# possible first $TERM_BAD commit: $skipped_commit" >>"$GIT_DIR/BISECT_LOG" - done - exit $res - fi - - # Check for an error in the bisection process - test $res -ne 0 && exit $res - - return 0 + git bisect--helper --bisect-auto-next } bisect_visualize() { @@ -209,7 +149,8 @@ bisect_replay () { test "$#" -eq 1 || die "$(gettext "No logfile given")" test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")" git bisect--helper --bisect-reset || exit - while read git bisect command rev + oIFS="$IFS" IFS="$IFS$(printf '\015')" + while read git bisect command rev tail do test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue if test "$git" = "git-bisect" @@ -222,7 +163,7 @@ bisect_replay () { get_terms case "$command" in start) - cmd="bisect_start $rev" + cmd="bisect_start $rev $tail" eval "$cmd" ;; "$TERM_GOOD"|"$TERM_BAD"|skip) git bisect--helper --bisect-write "$command" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit;; @@ -232,7 +173,8 @@ bisect_replay () { die "$(gettext "?? what are you talking about?")" ;; esac done <"$file" - bisect_auto_next + IFS="$oIFS" + git bisect--helper --bisect-auto-next || exit } bisect_run () { @@ -329,7 +271,7 @@ case "$#" in bisect_skip "$@" ;; next) # Not sure we want "next" at the UI level anymore. - bisect_next "$@" ;; + git bisect--helper --bisect-next "$@" || exit ;; visualize|view) bisect_visualize "$@" ;; reset) diff --git a/third_party/git/git-compat-util.h b/third_party/git/git-compat-util.h index 83be89de0a..7a0fb7a045 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 - * <at> x: the array whose size you want. + * @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 @@ -252,8 +252,10 @@ typedef unsigned long uintptr_t; #ifdef PRECOMPOSE_UNICODE #include "compat/precompose_utf8.h" #else -#define precompose_str(in,i_nfd2nfc) -#define precompose_argv(c,v) +static inline void precompose_argv(int argc, const char **argv) +{ + ; /* nothing */ +} #define probe_utf8_pathname_composition() #endif @@ -270,7 +272,9 @@ struct itimerval { #endif #ifdef NO_SETITIMER -#define setitimer(which,value,ovalue) +static inline int setitimer(int which, const struct itimerval *value, struct itimerval *newvalue) { + ; /* nothing */ +} #endif #ifndef NO_LIBGEN_H @@ -320,30 +324,11 @@ 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 ':' @@ -396,6 +381,10 @@ 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) { @@ -404,6 +393,14 @@ static inline char *git_find_last_dir_sep(const char *path) #define find_last_dir_sep git_find_last_dir_sep #endif +#ifndef has_dir_sep +static inline int git_has_dir_sep(const char *path) +{ + return !!strchr(path, '/'); +} +#define has_dir_sep(path) git_has_dir_sep(path) +#endif + #ifndef query_user_email #define query_user_email() NULL #endif @@ -818,9 +815,6 @@ 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)) @@ -879,6 +873,12 @@ FILE *fopen_for_writing(const char *path); FILE *fopen_or_warn(const char *path, const char *mode); /* + * Like strncmp, but only return zero if s is NUL-terminated and exactly len + * characters long. If it is not, consider it greater than t. + */ +int xstrncmpz(const char *s, const char *t, size_t len); + +/* * FREE_AND_NULL(ptr) is like free(ptr) followed by ptr = NULL. Note * that ptr is used twice, so don't pass e.g. ptr++. */ @@ -1094,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 -void git_qsort(void *base, size_t nmemb, size_t size, - int(*compar)(const void *, const void *)); -#define qsort git_qsort +#define qsort git_stable_qsort #endif #define QSORT(base, n, compar) sane_qsort((base), (n), sizeof(*(base)), compar) @@ -1108,6 +1108,9 @@ 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); @@ -1223,13 +1226,6 @@ int access_or_die(const char *path, int mode, unsigned flag); /* Warn on an inaccessible file if errno indicates this is an error */ int warn_on_fopen_errors(const char *path); -#ifdef GMTIME_UNRELIABLE_ERRORS -struct tm *git_gmtime(const time_t *); -struct tm *git_gmtime_r(const time_t *, struct tm *); -#define gmtime git_gmtime -#define gmtime_r git_gmtime_r -#endif - #if !defined(USE_PARENS_AROUND_GETTEXT_N) && defined(__GNUC__) #define USE_PARENS_AROUND_GETTEXT_N 1 #endif @@ -1239,8 +1235,14 @@ struct tm *git_gmtime_r(const time_t *, struct tm *); #endif #ifndef _POSIX_THREAD_SAFE_FUNCTIONS -#define flockfile(fh) -#define funlockfile(fh) +static inline void flockfile(FILE *fh) +{ + ; /* nothing */ +} +static inline void funlockfile(FILE *fh) +{ + ; /* nothing */ +} #define getc_unlocked(fh) getc(fh) #endif @@ -1312,4 +1314,42 @@ 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-cvsexportcommit.perl b/third_party/git/git-cvsexportcommit.perl index fc00d5946a..289d4bc684 100755 --- a/third_party/git/git-cvsexportcommit.perl +++ b/third_party/git/git-cvsexportcommit.perl @@ -22,11 +22,15 @@ die "Need at least one commit identifier!" unless @ARGV; my $repo = Git->repository(); $opt_w = $repo->config('cvsexportcommit.cvsdir') unless defined $opt_w; +my $tmpdir = File::Temp::tempdir(CLEANUP => 1); +my $hash_algo = $repo->config('extensions.objectformat') || 'sha1'; +my $hexsz = $hash_algo eq 'sha256' ? 64 : 40; + if ($opt_w || $opt_W) { # Remember where GIT_DIR is before changing to CVS checkout unless ($ENV{GIT_DIR}) { # No GIT_DIR set. Figure it out for ourselves - my $gd =`git-rev-parse --git-dir`; + my $gd =`git rev-parse --git-dir`; chomp($gd); $ENV{GIT_DIR} = $gd; } @@ -62,7 +66,7 @@ if ($opt_d) { # resolve target commit my $commit; $commit = pop @ARGV; -$commit = safe_pipe_capture('git-rev-parse', '--verify', "$commit^0"); +$commit = safe_pipe_capture('git', 'rev-parse', '--verify', "$commit^0"); chomp $commit; if ($?) { die "The commit reference $commit did not resolve!"; @@ -72,7 +76,7 @@ if ($?) { my $parent; if (@ARGV) { $parent = pop @ARGV; - $parent = safe_pipe_capture('git-rev-parse', '--verify', "$parent^0"); + $parent = safe_pipe_capture('git', 'rev-parse', '--verify', "$parent^0"); chomp $parent; if ($?) { die "The parent reference did not resolve!"; @@ -80,7 +84,7 @@ if (@ARGV) { } # find parents from the commit itself -my @commit = safe_pipe_capture('git-cat-file', 'commit', $commit); +my @commit = safe_pipe_capture('git', 'cat-file', 'commit', $commit); my @parents; my $committer; my $author; @@ -96,7 +100,7 @@ foreach my $line (@commit) { } if ($stage eq 'headers') { - if ($line =~ m/^parent (\w{40})$/) { # found a parent + if ($line =~ m/^parent ([0-9a-f]{$hexsz})$/) { # found a parent push @parents, $1; } elsif ($line =~ m/^author (.+) \d+ [-+]\d+$/) { $author = $1; @@ -111,7 +115,7 @@ foreach my $line (@commit) { } } -my $noparent = "0000000000000000000000000000000000000000"; +my $noparent = "0" x $hexsz; if ($parent) { my $found; # double check that it's a valid parent @@ -158,9 +162,9 @@ if ($opt_a) { close MSG; if ($parent eq $noparent) { - `git-diff-tree --binary -p --root $commit >.cvsexportcommit.diff`;# || die "Cannot diff"; + `git diff-tree --binary -p --root $commit >.cvsexportcommit.diff`;# || die "Cannot diff"; } else { - `git-diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff"; + `git diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff"; } ## apply non-binary changes @@ -174,7 +178,7 @@ my $context = $opt_p ? '' : '-C1'; print "Checking if patch will apply\n"; my @stat; -open APPLY, "GIT_DIR= git-apply $context --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch"; +open APPLY, "GIT_INDEX_FILE=$tmpdir/index git apply $context --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch"; @stat=<APPLY>; close APPLY || die "Cannot patch"; my (@bfiles,@files,@afiles,@dfiles); @@ -329,7 +333,7 @@ print "Applying\n"; if ($opt_W) { system("git checkout -q $commit^0") && die "cannot patch"; } else { - `GIT_DIR= git-apply $context --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch"; + `GIT_INDEX_FILE=$tmpdir/index git apply $context --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch"; } print "Patch applied successfully. Adding new files and directories to CVS\n"; @@ -407,7 +411,7 @@ unlink(".cvsexportcommit.diff"); if ($opt_W) { system("git checkout $go_back_to") && die "cannot move back to $go_back_to"; - if (!($go_back_to =~ /^[0-9a-fA-F]{40}$/)) { + if (!($go_back_to =~ /^[0-9a-fA-F]{$hexsz}$/)) { system("git symbolic-ref HEAD $go_back_to") && die "cannot move back to $go_back_to"; } diff --git a/third_party/git/git-cvsimport.perl b/third_party/git/git-cvsimport.perl index b31613cb8a..7bf3c12d67 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 "Unparseable date: $d\n"; + or die "Unparsable date: $d\n"; my $y=$1; $y+=100 if $y<70; $y+=1900 if $y<1000; @@ -637,9 +637,9 @@ sub getwd() { return $pwd; } -sub is_sha1 { +sub is_oid { my $s = shift; - return $s =~ /^[a-f0-9]{40}$/; + return $s =~ /^[a-f0-9]{40}(?:[a-f0-9]{24})?$/; } sub get_headref ($) { @@ -810,7 +810,7 @@ sub write_tree () { open(my $fh, '-|', qw(git write-tree)) or die "unable to open git write-tree: $!"; chomp(my $tree = <$fh>); - is_sha1($tree) + is_oid($tree) or die "Cannot get tree id ($tree): $!"; close($fh) or die "Error running git write-tree: $?\n"; @@ -896,7 +896,7 @@ sub commit { print "Committed patch $patchset ($branch $commit_date)\n" if $opt_v; chomp(my $cid = <$commit_read>); - is_sha1($cid) or die "Cannot get commit id ($cid): $!\n"; + is_oid($cid) or die "Cannot get commit id ($cid): $!\n"; print "Commit ID $cid\n" if $opt_v; close($commit_read); diff --git a/third_party/git/git-cvsserver.perl b/third_party/git/git-cvsserver.perl index ae1044273d..f6f3fc192c 100755 --- a/third_party/git/git-cvsserver.perl +++ b/third_party/git/git-cvsserver.perl @@ -365,7 +365,7 @@ sub req_Root } foreach my $line ( @gitvars ) { - next unless ( $line =~ /^(gitcvs)\.(?:(ext|pserver)\.)?([\w-]+)=(.*)$/ ); + next unless ( $line =~ /^(gitcvs|extensions)\.(?:(ext|pserver)\.)?([\w-]+)=(.*)$/ ); unless ($2) { $cfg->{$1}{$3} = $4; } else { @@ -392,6 +392,9 @@ sub req_Root $log->nofile(); } + $state->{rawsz} = ($cfg->{'extensions'}{'objectformat'} || 'sha1') eq 'sha256' ? 32 : 20; + $state->{hexsz} = $state->{rawsz} * 2; + return 1; } @@ -1581,7 +1584,7 @@ sub req_ci $parenthash = safe_pipe_capture('git', 'show-ref', '-s', $branchRef); chomp $parenthash; - if ($parenthash !~ /^[0-9a-f]{40}$/) + if ($parenthash !~ /^[0-9a-f]{$state->{hexsz}}$/) { if ( defined($stickyInfo) && defined($stickyInfo->{tag}) ) { @@ -1708,7 +1711,7 @@ sub req_ci chomp($commithash); $log->info("Commit hash : $commithash"); - unless ( $commithash =~ /[a-zA-Z0-9]{40}/ ) + unless ( $commithash =~ /[a-zA-Z0-9]{$state->{hexsz}}/ ) { $log->warn("Commit failed (Invalid commit hash)"); print "error 1 Commit failed (unknown reason)\n"; @@ -2375,7 +2378,7 @@ sub req_annotate print "E ***************\n"; while ( <ANNOTATE> ) { - if (m/^([a-zA-Z0-9]{40})\t\([^\)]*\)(.*)$/i) + if (m/^([a-zA-Z0-9]{$state->{hexsz}})\t\([^\)]*\)(.*)$/i) { my $commithash = $1; my $data = $2; @@ -2852,7 +2855,7 @@ sub transmitfile return; } - die "Need filehash" unless ( defined ( $filehash ) and $filehash =~ /^[a-zA-Z0-9]{40}$/ ); + die "Need filehash" unless ( defined ( $filehash ) and $filehash =~ /^[a-zA-Z0-9]{$state->{hexsz}}$/ ); my $type = safe_pipe_capture('git', 'cat-file', '-t', $filehash); chomp $type; @@ -3042,7 +3045,7 @@ sub ensureWorkTree my $ver = safe_pipe_capture('git', 'show-ref', '-s', "refs/heads/$state->{module}"); chomp $ver; - if ($ver !~ /^[0-9a-f]{40}$/) + if ($ver !~ /^[0-9a-f]{$state->{hexsz}}$/) { $log->warn("Error from git show-ref -s refs/head$state->{module}"); print "error 1 cannot find the current HEAD of module"; @@ -3281,7 +3284,7 @@ sub open_blob_or_die } elsif( $srcType eq "sha1" ) { - unless ( defined ( $name ) and $name =~ /^[a-zA-Z0-9]{40}$/ ) + unless ( defined ( $name ) and $name =~ /^[a-zA-Z0-9]{$state->{hexsz}}$/ ) { $log->warn("Need filehash"); die "Need filehash\n"; @@ -3817,7 +3820,7 @@ sub update chomp $commitsha1; my $commitinfo = ::safe_pipe_capture('git', 'cat-file', 'commit', $self->{module}); - unless ( $commitinfo =~ /tree\s+[a-zA-Z0-9]{40}/ ) + unless ( $commitinfo =~ /tree\s+[a-zA-Z0-9]{$state->{hexsz}}/ ) { die("Invalid module '$self->{module}'"); } @@ -3957,7 +3960,7 @@ sub update while ( <FILELIST> ) { chomp; - unless ( /^:\d{6}\s+([0-7]{6})\s+[a-f0-9]{40}\s+([a-f0-9]{40})\s+(\w)$/o ) + unless ( /^:\d{6}\s+([0-7]{6})\s+[a-f0-9]{$state->{hexsz}}\s+([a-f0-9]{$state->{hexsz}})\s+(\w)$/o ) { die("Couldn't process git-diff-tree line : $_"); } @@ -4625,11 +4628,11 @@ sub getmeta $db_query->execute($filename, $intRev); $meta = $db_query->fetchrow_hashref; } - elsif ( $revision =~ /^2\.1\.1\.2000(\.[1-3][0-9][0-9]){20}$/ ) + elsif ( $revision =~ /^2\.1\.1\.2000(\.[1-3][0-9][0-9]){$state->{rawsz}}$/ ) { my ($commitHash)=($revision=~/^2\.1\.1\.2000(.*)$/); $commitHash=~s/\.([0-9]+)/sprintf("%02x",$1-100)/eg; - if($commitHash=~/^[0-9a-f]{40}$/) + if($commitHash=~/^[0-9a-f]{$state->{hexsz}}$/) { return $self->getMetaFromCommithash($filename,$commitHash); } @@ -4639,7 +4642,7 @@ sub getmeta $log->warning("failed get $revision with commithash=$commitHash"); undef $revision; } - elsif ( $revision =~ /^[0-9a-f]{40}$/ ) + elsif ( $revision =~ /^[0-9a-f]{$state->{hexsz}}$/ ) { # Try DB first. This is mostly only useful for req_annotate(), # which only calls this for stuff that should already be in @@ -4658,7 +4661,7 @@ sub getmeta if(! $meta) { my($revCommit)=$self->lookupCommitRef($revision); - if($revCommit=~/^[0-9a-f]{40}$/) + if($revCommit=~/^[0-9a-f]{$state->{hexsz}}$/) { return $self->getMetaFromCommithash($filename,$revCommit); } @@ -4672,7 +4675,7 @@ sub getmeta else { my($revCommit)=$self->lookupCommitRef($revision); - if($revCommit=~/^[0-9a-f]{40}$/) + if($revCommit=~/^[0-9a-f]{$state->{hexsz}}$/) { return $self->getMetaFromCommithash($filename,$revCommit); } @@ -4767,7 +4770,7 @@ sub getMetaFromCommithash my($fileHash) = ::safe_pipe_capture("git","rev-parse","$revCommit:$filename"); chomp $fileHash; - if(!($fileHash=~/^[0-9a-f]{40}$/)) + if(!($fileHash=~/^[0-9a-f]{$state->{hexsz}}$/)) { die "Invalid fileHash '$fileHash' looking up" ." '$revCommit:$filename'\n"; @@ -4863,7 +4866,7 @@ sub lookupCommitRef $commitHash = ::safe_pipe_capture("git","rev-parse","--verify","--quiet", $self->unescapeRefName($ref)); $commitHash=~s/\s*$//; - if(!($commitHash=~/^[0-9a-f]{40}$/)) + if(!($commitHash=~/^[0-9a-f]{$state->{hexsz}}$/)) { $commitHash=undef; } @@ -4909,7 +4912,7 @@ sub commitmessage my $commithash = shift; my $tablename = $self->tablename("commitmsgs"); - die("Need commithash") unless ( defined($commithash) and $commithash =~ /^[a-zA-Z0-9]{40}$/ ); + die("Need commithash") unless ( defined($commithash) and $commithash =~ /^[a-zA-Z0-9]{$state->{hexsz}}$/ ); my $db_query; $db_query = $self->{dbh}->prepare_cached("SELECT value FROM $tablename WHERE key=?",{},1); diff --git a/third_party/git/git-filter-branch.sh b/third_party/git/git-filter-branch.sh index 5c5afa2b98..fea7964617 100755 --- a/third_party/git/git-filter-branch.sh +++ b/third_party/git/git-filter-branch.sh @@ -83,6 +83,20 @@ 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 new file mode 100644 index 0000000000..5ce2122fbc --- /dev/null +++ b/third_party/git/git-gui/README.md @@ -0,0 +1,174 @@ +# 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 4277f30c41..1c99ee8ca2 100755 --- a/third_party/git/git-gui/git-gui--askpass +++ b/third_party/git/git-gui/git-gui--askpass @@ -56,6 +56,11 @@ 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 6de74ce639..867b8cea46 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.4} err] - || [catch {package require Tk 8.4} err] +if {[catch {package require Tcl 8.5} err] + || [catch {package require Tk 8.5} err] } { catch {wm withdraw .} tk_messageBox \ @@ -684,6 +684,7 @@ 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 {} } @@ -719,7 +720,9 @@ proc rmsel_tag {text} { -background [$text cget -background] \ -foreground [$text cget -foreground] \ -borderwidth 0 - $text tag conf in_sel -background lightgray + $text tag conf in_sel\ + -background $color::select_bg \ + -foreground $color::select_fg bind $text <Motion> break return $text } @@ -862,6 +865,7 @@ proc apply_config {} { set NS ttk bind [winfo class .] <<ThemeChanged>> [list InitTheme] pave_toplevel . + color::sync_with_theme } } } @@ -946,15 +950,15 @@ if {![regsub {^git version } $_git_version {} _git_version]} { } proc get_trimmed_version {s} { - set r {} - foreach x [split $s -._] { - if {[string is integer -strict $x]} { - lappend r $x - } else { - break - } - } - return [join $r .] + set r {} + foreach x [split $s -._] { + if {[string is integer -strict $x]} { + lappend r $x + } else { + break + } + } + return [join $r .] } set _real_git_version $_git_version set _git_version [get_trimmed_version $_git_version] @@ -966,7 +970,7 @@ if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} { -type yesno \ -default no \ -title "[appname]: warning" \ - -message [mc "Git version cannot be determined. + -message [mc "Git version cannot be determined. %s claims it is version '%s'. @@ -1340,6 +1344,7 @@ 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 @@ -1347,8 +1352,9 @@ 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" @@ -1434,7 +1440,7 @@ proc PARENT {} { } proc force_amend {} { - global selected_commit_type + global commit_type_is_amend global HEAD PARENT MERGE_HEAD commit_type repository_state newType newHEAD newMERGE_HEAD @@ -1443,7 +1449,7 @@ proc force_amend {} { set MERGE_HEAD $newMERGE_HEAD set commit_type $newType - set selected_commit_type amend + set commit_type_is_amend 1 do_select_commit_type } @@ -1650,7 +1656,7 @@ proc prepare_commit_msg_hook_wait {fd_ph} { set pch_error {} catch {file delete [gitdir PREPARE_COMMIT_MSG]} return - } + } fconfigure $fd_ph -blocking 0 catch {file delete [gitdir PREPARE_COMMIT_MSG]} } @@ -1795,10 +1801,10 @@ proc ui_status {msg} { } } -proc ui_ready {{test {}}} { +proc ui_ready {} { global main_status if {[info exists main_status]} { - $main_status show [mc "Ready."] $test + $main_status show [mc "Ready."] } } @@ -1998,72 +2004,72 @@ set filemask { #define mask_width 14 #define mask_height 15 static unsigned char mask_bits[] = { - 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, - 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, - 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f}; + 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, + 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, + 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f}; } image create bitmap file_plain -background white -foreground black -data { #define plain_width 14 #define plain_height 15 static unsigned char plain_bits[] = { - 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, - 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, - 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; + 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, + 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, + 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; } -maskdata $filemask image create bitmap file_mod -background white -foreground blue -data { #define mod_width 14 #define mod_height 15 static unsigned char mod_bits[] = { - 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, - 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, - 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; + 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, + 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, + 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; } -maskdata $filemask image create bitmap file_fulltick -background white -foreground "#007000" -data { #define file_fulltick_width 14 #define file_fulltick_height 15 static unsigned char file_fulltick_bits[] = { - 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16, - 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10, - 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; + 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16, + 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10, + 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; } -maskdata $filemask image create bitmap file_question -background white -foreground black -data { #define file_question_width 14 #define file_question_height 15 static unsigned char file_question_bits[] = { - 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13, - 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10, - 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; + 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13, + 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10, + 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; } -maskdata $filemask image create bitmap file_removed -background white -foreground red -data { #define file_removed_width 14 #define file_removed_height 15 static unsigned char file_removed_bits[] = { - 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, - 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13, - 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f}; + 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, + 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13, + 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f}; } -maskdata $filemask image create bitmap file_merge -background white -foreground blue -data { #define file_merge_width 14 #define file_merge_height 15 static unsigned char file_merge_bits[] = { - 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10, - 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, - 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; + 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10, + 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, + 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; } -maskdata $filemask image create bitmap file_statechange -background white -foreground green -data { #define file_statechange_width 14 #define file_statechange_height 15 static unsigned char file_statechange_bits[] = { - 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10, - 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, - 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; + 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10, + 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, + 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; } -maskdata $filemask set ui_index .vpane.files.index.list @@ -2148,8 +2154,6 @@ 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 @@ -2204,9 +2208,12 @@ proc do_gitk {revs {is_submodule false}} { set env(GIT_WORK_TREE) $_gitworktree cd $pwd - ui_status $::starting_gitk_msg - after 10000 { - ui_ready $starting_gitk_msg + if {[info exists main_status]} { + set status_operation [$::main_status \ + start \ + [mc "Starting %s... please wait..." "gitk"]] + + after 3500 [list $status_operation stop] } } } @@ -2238,16 +2245,16 @@ proc do_git_gui {} { set env(GIT_WORK_TREE) $_gitworktree cd $pwd - ui_status $::starting_gitk_msg - after 10000 { - ui_ready $starting_gitk_msg - } + set status_operation [$::main_status \ + start \ + [mc "Starting %s... please wait..." "git-gui"]] + + after 3500 [list $status_operation stop] } } -proc do_explore {} { - global _gitworktree - set explorer {} +# Get the system-specific explorer app/command. +proc get_explorer {} { if {[is_Cygwin] || [is_Windows]} { set explorer "explorer.exe" } elseif {[is_MacOSX]} { @@ -2256,9 +2263,23 @@ proc do_explore {} { # 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 @@ -2494,7 +2515,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 + global last_clicked selected_paths file_lists_last_clicked if {$mode eq "click"} { foreach {x y} $args break @@ -2551,6 +2572,8 @@ 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] @@ -2580,12 +2603,12 @@ proc toggle_or_diff {mode w args} { update_indexinfo \ "Unstaging [short_path $path] from commit" \ [list $path] \ - [concat $after [list ui_ready]] + [concat $after {ui_ready;}] } elseif {$w eq $ui_workdir} { update_index \ "Adding [short_path $path]" \ [list $path] \ - [concat $after [list ui_ready]] + [concat $after {ui_ready;}] } } else { set selected_paths($path) 1 @@ -2664,6 +2687,32 @@ 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 @@ -2706,10 +2755,18 @@ 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] \ - [list "Git Bash" bash --login -l &]} + -command {eval exec [auto_execok start] $cmdLine} } if {[is_Windows] || ![is_bare]} { @@ -2852,19 +2909,11 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} { menu .mbar.commit if {![is_enabled nocommit]} { - .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 \ + .mbar.commit add checkbutton \ -label [mc "Amend Last Commit"] \ - -command do_select_commit_type \ - -variable selected_commit_type \ - -value amend + -accelerator $M1T-E \ + -variable commit_type_is_amend \ + -command do_select_commit_type lappend disable_on_lock \ [list .mbar.commit entryconf [.mbar.commit index last] -state] @@ -3030,8 +3079,23 @@ 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 -bind all <$M1B-Key-w> {destroy [winfo toplevel %W]} -bind all <$M1B-Key-W> {destroy [winfo toplevel %W]} + +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 set subcommand_args {} proc usage {} { @@ -3211,7 +3275,7 @@ pack .vpane -anchor n -side top -fill both -expand 1 textframe .vpane.files.workdir -height 100 -width 200 tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \ -background lightsalmon -foreground black -ttext $ui_workdir -background white -foreground black \ +ttext $ui_workdir \ -borderwidth 0 \ -width 20 -height 10 \ -wrap none \ @@ -3233,7 +3297,7 @@ textframe .vpane.files.index -height 100 -width 200 tlabel .vpane.files.index.title \ -text [mc "Staged Changes (Will Commit)"] \ -background lightgreen -foreground black -ttext $ui_index -background white -foreground black \ +ttext $ui_index \ -borderwidth 0 \ -width 20 -height 10 \ -wrap none \ @@ -3260,7 +3324,9 @@ if {!$use_ttk} { foreach i [list $ui_index $ui_workdir] { rmsel_tag $i - $i tag conf in_diff -background [$i tag cget in_sel -background] + $i tag conf in_diff \ + -background $color::select_bg \ + -foreground $color::select_fg } unset i @@ -3337,18 +3403,10 @@ set ui_comm .vpane.lower.commarea.buffer.frame.t set ui_coml .vpane.lower.commarea.buffer.header.l if {![is_enabled nocommit]} { - ${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 \ + ${NS}::checkbutton .vpane.lower.commarea.buffer.header.amend \ -text [mc "Amend Last Commit"] \ - -command do_select_commit_type \ - -variable selected_commit_type \ - -value amend + -variable commit_type_is_amend \ + -command do_select_commit_type lappend disable_on_lock \ [list .vpane.lower.commarea.buffer.header.amend conf -state] } @@ -3373,11 +3431,10 @@ 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 -ttext $ui_comm -background white -foreground black \ +ttext $ui_comm \ -borderwidth 1 \ -undo true \ -maxundo 20 \ @@ -3387,10 +3444,16 @@ 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 @@ -3470,9 +3533,11 @@ tlabel .vpane.lower.diff.header.file \ -justify left tlabel .vpane.lower.diff.header.path \ -background gold \ - -foreground black \ + -foreground blue \ -anchor w \ - -justify left + -justify left \ + -font [eval font create [font configure font_ui] -underline 1] \ + -cursor hand2 pack .vpane.lower.diff.header.status -side left pack .vpane.lower.diff.header.file -side left pack .vpane.lower.diff.header.path -fill x @@ -3487,14 +3552,18 @@ $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 # textframe .vpane.lower.diff.body set ui_diff .vpane.lower.diff.body.t -ttext $ui_diff -background white -foreground black \ +ttext $ui_diff \ -borderwidth 0 \ -width 80 -height 5 -wrap none \ -font font_diff \ @@ -3547,6 +3616,9 @@ $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 @@ -3606,16 +3678,32 @@ set ctxm .vpane.lower.diff.body.ctxm menu $ctxm -tearoff 0 $ctxm add command \ -label [mc "Apply/Reverse Hunk"] \ - -command {apply_hunk $cursorX $cursorY} + -command {apply_or_revert_hunk $cursorX $cursorY 0} 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_range_or_line $cursorX $cursorY; do_rescan} + -command {apply_or_revert_range_or_line $cursorX $cursorY 0; 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] @@ -3693,7 +3781,7 @@ proc has_textconv {path} { } proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} { - global current_diff_path file_states + global current_diff_path file_states last_revert set ::cursorX $x set ::cursorY $y if {[info exists file_states($current_diff_path)]} { @@ -3707,19 +3795,28 @@ 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 @@ -3730,11 +3827,35 @@ 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 } } @@ -3762,18 +3883,18 @@ proc on_application_mapped {} { set gm $repo_config(gui.geometry) if {$use_ttk} { bind .vpane <Map> \ - [list on_ttk_pane_mapped %W 0 [lindex $gm 1]] + [list on_ttk_pane_mapped %W 0 [lindex $gm 1]] bind .vpane.files <Map> \ - [list on_ttk_pane_mapped %W 0 [lindex $gm 2]] + [list on_ttk_pane_mapped %W 0 [lindex $gm 2]] } else { bind .vpane <Map> \ - [list on_tk_pane_mapped %W 0 \ - [lindex $gm 1] \ - [lindex [.vpane sash coord 0] 1]] + [list on_tk_pane_mapped %W 0 \ + [lindex $gm 1] \ + [lindex [.vpane sash coord 0] 1]] bind .vpane.files <Map> \ - [list on_tk_pane_mapped %W 0 \ - [lindex [.vpane.files sash coord 0] 0] \ - [lindex $gm 2]] + [list on_tk_pane_mapped %W 0 \ + [lindex [.vpane.files sash coord 0] 0] \ + [lindex $gm 2]] } wm geometry . [lindex $gm 0] } @@ -3812,6 +3933,8 @@ bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break} bind $ui_comm <$M1B-Key-equal> {show_more_context;break} bind $ui_comm <$M1B-Key-plus> {show_more_context;break} bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break} +bind $ui_comm <$M1B-Key-BackSpace> {event generate %W <Meta-Delete>;break} +bind $ui_comm <$M1B-Key-Delete> {event generate %W <Meta-d>;break} bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break} bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break} @@ -3861,6 +3984,8 @@ 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} @@ -3877,6 +4002,14 @@ 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] @@ -4055,6 +4188,9 @@ 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 a1aeb8b96e..8441e109be 100644 --- a/third_party/git/git-gui/lib/blame.tcl +++ b/third_party/git/git-gui/lib/blame.tcl @@ -24,6 +24,7 @@ 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 @@ -274,6 +275,7 @@ 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 \ @@ -326,6 +328,7 @@ constructor new {i_commit i_path i_jump} { bind $i <Any-Motion> [cb _show_tooltip $i @%x,%y] bind $i <Any-Enter> [cb _hide_tooltip] bind $i <Any-Leave> [cb _hide_tooltip] + bind $i <Deactivate> [cb _hide_tooltip] bind_button3 $i " [cb _hide_tooltip] set cursorX %x @@ -602,16 +605,23 @@ 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} { @@ -806,10 +816,11 @@ method _read_blame {fd cur_w cur_d} { [mc "Loading original location annotations..."] } else { set current_fd {} - $status stop [mc "Annotation complete."] + $status_operation stop [mc "Annotation complete."] + set status_operation {} } } else { - $status update $blame_lines $total_lines + $status_operation update $blame_lines $total_lines } } ifdeleted { catch {close $fd} } @@ -1124,7 +1135,7 @@ method _blameparent {} { set diffcmd [list diff-tree --unified=0 $cparent $cmit -- $new_path] } if {[catch {set fd [eval git_read $diffcmd]} err]} { - $status stop [mc "Unable to display parent"] + $status_operation 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 777eeb79c1..8b0c485889 100644 --- a/third_party/git/git-gui/lib/branch.tcl +++ b/third_party/git/git-gui/lib/branch.tcl @@ -8,6 +8,7 @@ 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] @@ -24,6 +25,7 @@ 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 9e7412c446..21ea768d80 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 {} - $::main_status start \ + set status_bar_operation [$::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,26 +354,27 @@ method _readtree {} { $new_hash \ ] fconfigure $fd -blocking 0 -translation binary - fileevent $fd readable [cb _readtree_wait $fd] + fileevent $fd readable [cb _readtree_wait $fd $status_bar_operation] } -method _readtree_wait {fd} { +method _readtree_wait {fd status_bar_operation} { global current_branch set buf [read $fd] - $::main_status update_meter $buf + $status_bar_operation 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 - $::main_status stop [mc "Aborted checkout of '%s' (file level merging is required)." [_name $this]] + $status_bar_operation stop [mc "Aborted checkout of '%s' (file level merging is required)." [_name $this]] warn_popup [strcat [mc "File level merge required."] " $err @@ -384,12 +385,12 @@ $err return } - $::main_status stop + $status_bar_operation stop _after_readtree $this } method _after_readtree {} { - global selected_commit_type commit_type HEAD MERGE_HEAD PARENT + global commit_type HEAD MERGE_HEAD PARENT global current_branch is_detached global ui_comm @@ -490,12 +491,12 @@ method _update_repo_state {} { # amend mode our file lists are accurate and we can avoid # the rescan. # - global selected_commit_type commit_type HEAD MERGE_HEAD PARENT + global commit_type_is_amend commit_type HEAD MERGE_HEAD PARENT global ui_comm unlock_index set name [_name $this] - set selected_commit_type new + set commit_type_is_amend 0 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 80f5a59bbb..af1fee7c75 100644 --- a/third_party/git/git-gui/lib/choose_repository.tcl +++ b/third_party/git/git-gui/lib/choose_repository.tcl @@ -9,6 +9,18 @@ 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 @@ -345,31 +357,10 @@ proc _is_git {path {outdir_var ""}} { if {$outdir_var ne ""} { upvar 1 $outdir_var outdir } - if {[file isfile $path]} { - set fp [open $path r] - gets $fp line - close $fp - if {[regexp "^gitdir: (.+)$" $line line link_target]} { - set path [file join [file dirname $path] $link_target] - set path [file normalize $path] - } - } - - if {[file exists [file join $path HEAD]] - && [file exists [file join $path objects]] - && [file exists [file join $path config]]} { - set outdir $path - return 1 - } - if {[is_Cygwin]} { - if {[file exists [file join $path HEAD]] - && [file exists [file join $path objects.lnk]] - && [file exists [file join $path config.lnk]]} { - set outdir $path - return 1 - } + if {[catch {set outdir [git rev-parse --resolve-git-dir $path]}]} { + return 0 } - return 0 + return 1 } proc _objdir {path} { @@ -659,12 +650,12 @@ method _do_clone2 {} { switch -exact -- $clone_type { hardlink { - set o_cons [status_bar::two_line $w_body] + set o_status [status_bar::two_line $w_body] pack $w_body -fill x -padx 10 -pady 10 - $o_cons start \ + set status_op [$o_status start \ [mc "Counting objects"] \ - [mc "buckets"] + [mc "buckets"]] update if {[file exists [file join $objdir info alternates]]} { @@ -689,6 +680,7 @@ method _do_clone2 {} { } err]} { catch {cd $pwd} _clone_failed $this [mc "Unable to copy objects/info/alternates: %s" $err] + $status_op stop return } } @@ -700,7 +692,7 @@ method _do_clone2 {} { -directory [file join $objdir] ??] set bcnt [expr {[llength $buckets] + 2}] set bcur 1 - $o_cons update $bcur $bcnt + $status_op update $bcur $bcnt update file mkdir [file join .git objects pack] @@ -708,7 +700,7 @@ method _do_clone2 {} { -directory [file join $objdir pack] *] { lappend tolink [file join pack $i] } - $o_cons update [incr bcur] $bcnt + $status_op update [incr bcur] $bcnt update foreach i $buckets { @@ -717,10 +709,10 @@ method _do_clone2 {} { -directory [file join $objdir $i] *] { lappend tolink [file join $i $j] } - $o_cons update [incr bcur] $bcnt + $status_op update [incr bcur] $bcnt update } - $o_cons stop + $status_op stop if {$tolink eq {}} { info_popup [strcat \ @@ -747,6 +739,8 @@ method _do_clone2 {} { if {!$i} return destroy $w_body + + set o_status {} } full { set o_cons [console::embed \ @@ -781,9 +775,9 @@ method _do_clone2 {} { } method _copy_files {objdir tocopy} { - $o_cons start \ + set status_op [$o_status start \ [mc "Copying objects"] \ - [mc "KiB"] + [mc "KiB"]] set tot 0 set cmp 0 foreach p $tocopy { @@ -798,7 +792,7 @@ method _copy_files {objdir tocopy} { while {![eof $f_in]} { incr cmp [fcopy $f_in $f_cp -size 16384] - $o_cons update \ + $status_op update \ [expr {$cmp / 1024}] \ [expr {$tot / 1024}] update @@ -808,17 +802,19 @@ 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] - $o_cons start \ + set status_op [$o_status start \ [mc "Linking objects"] \ - [mc "objects"] + [mc "objects"]] for {set i 0} {$i < $total} {} { set p [lindex $tolink $i] if {[catch { @@ -827,15 +823,17 @@ 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} { - $o_cons update $i $total + $status_op update $i $total update } } + $status_op stop return 1 } @@ -958,11 +956,26 @@ method _do_clone_checkout {HEAD} { return } - set o_cons [status_bar::two_line $w_body] + set status [status_bar::two_line $w_body] pack $w_body -fill x -padx 10 -pady 10 - $o_cons start \ + + # 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 \ [mc "Creating working directory"] \ - [mc "files"] + [mc "files"]] set readtree_err {} set fd [git_read --stderr read-tree \ @@ -976,33 +989,9 @@ 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_cons update_meter $buf + $o_status_op update_meter $buf append readtree_err $buf fconfigure $fd -blocking 1 @@ -1050,6 +1039,34 @@ 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 new file mode 100644 index 0000000000..e21e7d3d0b --- /dev/null +++ b/third_party/git/git-gui/lib/chord.tcl @@ -0,0 +1,158 @@ +# 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 75ea965dac..b516aa2990 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 selected_commit_type + global ui_comm commit_type_is_amend 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 1f3248ffd1..bb6b9c889e 100644 --- a/third_party/git/git-gui/lib/console.tcl +++ b/third_party/git/git-gui/lib/console.tcl @@ -203,6 +203,8 @@ 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 68c4a6c736..871ad488c2 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,19 +270,6 @@ 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 @@ -298,7 +285,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 [get_conflict_marker_size $path] + set conflict_size [gitattr $path conflict-marker-size 7] set cmd [list] if {$w eq $ui_index} { @@ -360,6 +347,10 @@ 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] \ @@ -462,11 +453,23 @@ 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_++ } @@ -567,24 +570,31 @@ proc read_diff {fd conflict_size cont_info} { } } -proc apply_hunk {x y} { +proc apply_or_revert_hunk {x y revert} { global current_diff_path current_diff_header current_diff_side - global ui_diff ui_index file_states + global ui_diff ui_index file_states last_revert last_revert_enc if {$current_diff_path eq {} || $current_diff_header eq {}} return if {![lock_index apply_hunk]} return - set apply_cmd {apply --cached --whitespace=nowarn} + set apply_cmd {apply --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 + lappend apply_cmd --reverse --cached if {[string index $mi 0] ne {M}} { unlock_index return } } else { - set failed_msg [mc "Failed to stage selected hunk."] + 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 + } + if {[string index $mi 1] ne {M}} { unlock_index return @@ -603,29 +613,40 @@ proc apply_hunk {x y} { 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 $current_diff_header - puts -nonewline $p [$ui_diff get $s_lno $e_lno] + 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 $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 ? } - if {$current_diff_side eq $ui_index} { + # Update the status flags. + if {$revert} { + set mi [string index $mi 0]$o + } elseif {$current_diff_side eq $ui_index} { set mi ${o}M } elseif {[string index $mi 0] eq {_}} { set mi M$o @@ -640,9 +661,9 @@ proc apply_hunk {x y} { } } -proc apply_range_or_line {x y} { +proc apply_or_revert_range_or_line {x y revert} { global current_diff_path current_diff_header current_diff_side - global ui_diff ui_index file_states + global ui_diff ui_index file_states last_revert set selected [$ui_diff tag nextrange sel 0.0] @@ -660,19 +681,27 @@ proc apply_range_or_line {x y} { if {$current_diff_path eq {} || $current_diff_header eq {}} return if {![lock_index apply_hunk]} return - set apply_cmd {apply --cached --whitespace=nowarn} + set apply_cmd {apply --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 + lappend apply_cmd --reverse --cached if {[string index $mi 0] ne {M}} { unlock_index return } } else { - set failed_msg [mc "Failed to stage selected line."] - set to_context {-} + 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 + } + if {[string index $mi 1] ne {M}} { unlock_index return @@ -830,7 +859,47 @@ proc apply_range_or_line {x y} { 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 b588db11d9..d2ec24bd80 100644 --- a/third_party/git/git-gui/lib/index.tcl +++ b/third_party/git/git-gui/lib/index.tcl @@ -7,67 +7,74 @@ proc _delete_indexlock {} { } } -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 +proc close_and_unlock_index {fd after} { + if {![catch {_close_updateindex $fd} err]} { unlock_index - rescan $after 0 - return + uplevel #0 $after + } else { + rescan_on_error $err $after } +} - $::main_status stop +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 unlock_index - uplevel #0 $after + rescan [concat $after {ui_ready;}] 0 } -proc update_indexinfo {msg pathList after} { +proc update_indexinfo {msg path_list after} { global update_index_cp if {![lock_index update]} return set update_index_cp 0 - set pathList [lsort $pathList] - set totalCnt [llength $pathList] - set batch [expr {int($totalCnt * .01) + 1}] + set path_list [lsort $path_list] + set total_cnt [llength $path_list] + set batch [expr {int($total_cnt * .01) + 1}] if {$batch > 25} {set batch 25} - $::main_status start $msg [mc "files"] + set status_bar_operation [$::main_status start $msg [mc "files"]] set fd [git_write update-index -z --index-info] fconfigure $fd \ -blocking 0 \ @@ -78,26 +85,29 @@ proc update_indexinfo {msg pathList after} { fileevent $fd writable [list \ write_update_indexinfo \ $fd \ - $pathList \ - $totalCnt \ + $path_list \ + $total_cnt \ $batch \ + $status_bar_operation \ $after \ ] } -proc write_update_indexinfo {fd pathList totalCnt batch after} { +proc write_update_indexinfo {fd path_list total_cnt batch status_bar_operation \ + after} { global update_index_cp global file_states current_diff_path - if {$update_index_cp >= $totalCnt} { - _close_updateindex $fd $after + if {$update_index_cp >= $total_cnt} { + $status_bar_operation stop + close_and_unlock_index $fd $after return } for {set i $batch} \ - {$update_index_cp < $totalCnt && $i > 0} \ + {$update_index_cp < $total_cnt && $i > 0} \ {incr i -1} { - set path [lindex $pathList $update_index_cp] + set path [lindex $path_list $update_index_cp] incr update_index_cp set s $file_states($path) @@ -119,21 +129,21 @@ proc write_update_indexinfo {fd pathList totalCnt batch after} { display_file $path $new } - $::main_status update $update_index_cp $totalCnt + $status_bar_operation update $update_index_cp $total_cnt } -proc update_index {msg pathList after} { +proc update_index {msg path_list after} { global update_index_cp if {![lock_index update]} return set update_index_cp 0 - set pathList [lsort $pathList] - set totalCnt [llength $pathList] - set batch [expr {int($totalCnt * .01) + 1}] + set path_list [lsort $path_list] + set total_cnt [llength $path_list] + set batch [expr {int($total_cnt * .01) + 1}] if {$batch > 25} {set batch 25} - $::main_status start $msg [mc "files"] + set status_bar_operation [$::main_status start $msg [mc "files"]] set fd [git_write update-index --add --remove -z --stdin] fconfigure $fd \ -blocking 0 \ @@ -144,26 +154,29 @@ proc update_index {msg pathList after} { fileevent $fd writable [list \ write_update_index \ $fd \ - $pathList \ - $totalCnt \ + $path_list \ + $total_cnt \ $batch \ + $status_bar_operation \ $after \ ] } -proc write_update_index {fd pathList totalCnt batch after} { +proc write_update_index {fd path_list total_cnt batch status_bar_operation \ + after} { global update_index_cp global file_states current_diff_path - if {$update_index_cp >= $totalCnt} { - _close_updateindex $fd $after + if {$update_index_cp >= $total_cnt} { + $status_bar_operation stop + close_and_unlock_index $fd $after return } for {set i $batch} \ - {$update_index_cp < $totalCnt && $i > 0} \ + {$update_index_cp < $total_cnt && $i > 0} \ {incr i -1} { - set path [lindex $pathList $update_index_cp] + set path [lindex $path_list $update_index_cp] incr update_index_cp switch -glob -- [lindex $file_states($path) 0] { @@ -190,21 +203,21 @@ proc write_update_index {fd pathList totalCnt batch after} { display_file $path $new } - $::main_status update $update_index_cp $totalCnt + $status_bar_operation update $update_index_cp $total_cnt } -proc checkout_index {msg pathList after} { +proc checkout_index {msg path_list after capture_error} { global update_index_cp if {![lock_index update]} return set update_index_cp 0 - set pathList [lsort $pathList] - set totalCnt [llength $pathList] - set batch [expr {int($totalCnt * .01) + 1}] + set path_list [lsort $path_list] + set total_cnt [llength $path_list] + set batch [expr {int($total_cnt * .01) + 1}] if {$batch > 25} {set batch 25} - $::main_status start $msg [mc "files"] + set status_bar_operation [$::main_status start $msg [mc "files"]] set fd [git_write checkout-index \ --index \ --quiet \ @@ -221,26 +234,45 @@ proc checkout_index {msg pathList after} { fileevent $fd writable [list \ write_checkout_index \ $fd \ - $pathList \ - $totalCnt \ + $path_list \ + $total_cnt \ $batch \ + $status_bar_operation \ $after \ + $capture_error \ ] } -proc write_checkout_index {fd pathList totalCnt batch after} { +proc write_checkout_index {fd path_list total_cnt batch status_bar_operation \ + after capture_error} { global update_index_cp global file_states current_diff_path - if {$update_index_cp >= $totalCnt} { - _close_updateindex $fd $after + 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 + return } for {set i $batch} \ - {$update_index_cp < $totalCnt && $i > 0} \ + {$update_index_cp < $total_cnt && $i > 0} \ {incr i -1} { - set path [lindex $pathList $update_index_cp] + set path [lindex $path_list $update_index_cp] incr update_index_cp switch -glob -- [lindex $file_states($path) 0] { U? {continue} @@ -253,7 +285,7 @@ proc write_checkout_index {fd pathList totalCnt batch after} { } } - $::main_status update $update_index_cp $totalCnt + $status_bar_operation update $update_index_cp $total_cnt } proc unstage_helper {txt paths} { @@ -261,7 +293,7 @@ proc unstage_helper {txt paths} { if {![lock_index begin-update]} return - set pathList [list] + set path_list [list] set after {} foreach path $paths { switch -glob -- [lindex $file_states($path) 0] { @@ -269,20 +301,20 @@ proc unstage_helper {txt paths} { M? - T? - D? { - lappend pathList $path + lappend path_list $path if {$path eq $current_diff_path} { set after {reshow_diff;} } } } } - if {$pathList eq {}} { + if {$path_list eq {}} { unlock_index } else { update_indexinfo \ $txt \ - $pathList \ - [concat $after [list ui_ready]] + $path_list \ + [concat $after {ui_ready;}] } } @@ -305,7 +337,7 @@ proc add_helper {txt paths} { if {![lock_index begin-update]} return - set pathList [list] + set path_list [list] set after {} foreach path $paths { switch -glob -- [lindex $file_states($path) 0] { @@ -321,20 +353,20 @@ proc add_helper {txt paths} { ?M - ?D - ?T { - lappend pathList $path + lappend path_list $path if {$path eq $current_diff_path} { set after {reshow_diff;} } } } } - if {$pathList eq {}} { + if {$path_list eq {}} { unlock_index } else { update_index \ $txt \ - $pathList \ - [concat $after {ui_status [mc "Ready to commit."]}] + $path_list \ + [concat $after {ui_status [mc "Ready to commit."];}] } } @@ -388,66 +420,303 @@ 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 - set pathList [list] - set after {} + # 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] + foreach path $paths { switch -glob -- [lindex $file_states($path) 0] { U? {continue} + ?O { + lappend untracked_list $path + } ?M - ?T - ?D { - lappend pathList $path + lappend path_list $path if {$path eq $current_diff_path} { - set after {reshow_diff;} + $after_chord eval { set should_reshow_diff 1 } } } } } + 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] + } - # 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 { - set query [mc "Revert changes in these %i files?" $n] + 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] + } } - set reply [tk_dialog \ - .confirm_revert \ - "[appname] ([reponame])" \ - "$query + # 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 +} -[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]] +# 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 + ]] } else { - unlock_index + # 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 + } +} + +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 *] + + if {[llength $contents] > 0} { break } + if {[catch {file delete -- $directory_path}]} { break } + + set directory_path $parent_path + set parent_path [file dirname $directory_path] } } @@ -466,19 +735,19 @@ proc do_revert_selection {} { } proc do_select_commit_type {} { - global commit_type selected_commit_type + global commit_type commit_type_is_amend - if {$selected_commit_type eq {new} + if {$commit_type_is_amend == 0 && [string match amend* $commit_type]} { create_new_commit - } elseif {$selected_commit_type eq {amend} + } elseif {$commit_type_is_amend == 1 && ![string match amend* $commit_type]} { load_last_commit # The amend request was rejected... # if {![string match amend* $commit_type]} { - set selected_commit_type new + set commit_type_is_amend 0 } } } diff --git a/third_party/git/git-gui/lib/merge.tcl b/third_party/git/git-gui/lib/merge.tcl index 9f253db5b3..664803cf3f 100644 --- a/third_party/git/git-gui/lib/merge.tcl +++ b/third_party/git/git-gui/lib/merge.tcl @@ -241,23 +241,27 @@ 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 - fileevent $fd readable [namespace code [list _reset_wait $fd]] - $::main_status start [mc "Aborting"] [mc "files reset"] + set status_bar_operation [$::main_status \ + start \ + [mc "Aborting"] \ + [mc "files reset"]] + fileevent $fd readable [namespace code [list \ + _reset_wait $fd $status_bar_operation]] } else { unlock_index } } -proc _reset_wait {fd} { +proc _reset_wait {fd status_bar_operation} { global ui_comm - $::main_status update_meter [read $fd] + $status_bar_operation 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/mergetool.tcl b/third_party/git/git-gui/lib/mergetool.tcl index 120bc4064b..e688b016ef 100644 --- a/third_party/git/git-gui/lib/mergetool.tcl +++ b/third_party/git/git-gui/lib/mergetool.tcl @@ -59,7 +59,7 @@ proc merge_add_resolution {path} { update_index \ [mc "Adding resolution for %s" [short_path $path]] \ [list $path] \ - [concat $after [list ui_ready]] + [concat $after {ui_ready;}] } proc merge_force_stage {stage} { diff --git a/third_party/git/git-gui/lib/status_bar.tcl b/third_party/git/git-gui/lib/status_bar.tcl index 02111a1742..d32b14142f 100644 --- a/third_party/git/git-gui/lib/status_bar.tcl +++ b/third_party/git/git-gui/lib/status_bar.tcl @@ -1,16 +1,42 @@ # 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 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) + +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 constructor new {path} { global use_ttk NS @@ -18,12 +44,19 @@ 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 \ + -textvariable @status_bar_text \ -anchor w \ -justify left pack $w_l -side left @@ -44,9 +77,16 @@ 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 \ + -textvariable @status_bar_text \ -anchor w \ -justify left pack $w_l -anchor w -fill x @@ -56,7 +96,7 @@ constructor two_line {path} { return $this } -method start {msg uds} { +method ensure_canvas {} { if {[winfo exists $w_c]} { $w_c coords bar 0 0 0 20 } else { @@ -68,31 +108,170 @@ method start {msg uds} { $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} { - set pdone 0 - set cdone 0 + if {!$is_active} { return } + + set progress 0 + if {$total > 0} { - set pdone [expr {100 * $have / $total}] - set cdone [expr {[winfo width $w_c] * $have / $total}] + set progress [expr {100 * $have / $total}] } set prec [string length [format %i $total]] + set status [mc "%s ... %*i of %*i %s (%3i%%)" \ $prefix \ $prec $have \ $prec $total \ - $units $pdone] - $w_c coords bar 0 0 $cdone 20 + $units $progress] + + $status_bar refresh } method update_meter {buf} { + if {!$is_active} { return } + append meter $buf set r [string last "\r" $meter] if {$r == -1} { @@ -109,23 +288,25 @@ method update_meter {buf} { } } -method stop {{msg {}}} { - destroy $w_c - if {$msg ne {}} { - set status $msg +method stop {{stop_msg {}}} { + if {$is_active} { + set is_active 0 + $status_bar stop $this $stop_msg } } -method show {msg {test {}}} { - if {$test eq {} || $status eq $test} { - set status $msg - } +method restart {msg} { + if {!$is_active} { return } + + set status $msg + set prefix $msg + set meter {} + $status_bar refresh } -method _delete {current} { - if {$current eq $w} { - delete_this - } +method _delete {} { + stop + delete_this } } diff --git a/third_party/git/git-gui/lib/themed.tcl b/third_party/git/git-gui/lib/themed.tcl index 88b3119a75..83e3ac795f 100644 --- a/third_party/git/git-gui/lib/themed.tcl +++ b/third_party/git/git-gui/lib/themed.tcl @@ -1,6 +1,44 @@ # Functions for supporting the use of themed Tk widgets in git-gui. # Copyright (C) 2009 Pat Thoyts <patthoyts@users.sourceforge.net> + +namespace eval color { + # Variable colors + # Preffered way to set widget colors is using add_option. + # In some cases, like with tags in_diff/in_sel, we use these colors. + variable select_bg lightgray + variable select_fg black + + proc sync_with_theme {} { + set base_bg [ttk::style lookup . -background] + set base_fg [ttk::style lookup . -foreground] + set text_bg [ttk::style lookup Treeview -background] + set text_fg [ttk::style lookup Treeview -foreground] + set select_bg [ttk::style lookup Default -selectbackground] + set select_fg [ttk::style lookup Default -selectforeground] + + set color::select_bg $select_bg + set color::select_fg $select_fg + + proc add_option {key val} { + option add $key $val widgetDefault + } + # Add options for plain Tk widgets + # Using `option add` instead of tk_setPalette to avoid unintended + # consequences. + if {![is_MacOSX]} { + add_option *Menu.Background $base_bg + add_option *Menu.Foreground $base_fg + add_option *Menu.activeBackground $select_bg + add_option *Menu.activeForeground $select_fg + } + add_option *Text.Background $text_bg + add_option *Text.Foreground $text_fg + add_option *Text.HighlightBackground $base_bg + add_option *Text.HighlightColor $select_bg + } +} + proc ttk_get_current_theme {} { # Handle either current Tk or older versions of 8.5 if {[catch {set theme [ttk::style theme use]}]} { diff --git a/third_party/git/git-gui/po/de.po b/third_party/git/git-gui/po/de.po index baebff2fff..a8d5f61ca3 100644 --- a/third_party/git/git-gui/po/de.po +++ b/third_party/git/git-gui/po/de.po @@ -7,41 +7,42 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \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" +"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" "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: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 +#: git-gui.sh:847 #, tcl-format msgid "Invalid font specified in %s:" msgstr "Ungรผltige Zeichensatz-Angabe in %s:" -#: git-gui.sh:779 +#: git-gui.sh:901 msgid "Main Font" msgstr "Programmschriftart" -#: git-gui.sh:780 +#: git-gui.sh:902 msgid "Diff/Console Font" msgstr "Vergleich-Schriftart" -#: git-gui.sh:794 +#: 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 msgid "Cannot find git in PATH." msgstr "Git kann im PATH nicht gefunden werden." -#: git-gui.sh:821 +#: git-gui.sh:945 msgid "Cannot parse Git version string:" msgstr "Git Versionsangabe kann nicht erkannt werden:" -#: git-gui.sh:839 +#: git-gui.sh:970 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -60,479 +61,524 @@ msgstr "" "\n" "Soll angenommen werden, ยป%sยซ sei Version 1.5.0?\n" -#: git-gui.sh:1128 +#: git-gui.sh:1267 msgid "Git directory not found:" msgstr "Git-Verzeichnis nicht gefunden:" -#: git-gui.sh:1146 +#: git-gui.sh:1301 msgid "Cannot move to top of working directory:" msgstr "" "Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt " "werden:" -#: git-gui.sh:1154 +#: git-gui.sh:1309 msgid "Cannot use bare repository:" -msgstr "Bloรes Projektarchiv kann nicht benutzt werden:" +msgstr "Bloรes Repository kann nicht benutzt werden:" -#: git-gui.sh:1162 +#: git-gui.sh:1317 msgid "No working directory" msgstr "Kein Arbeitsverzeichnis" -#: git-gui.sh:1334 lib/checkout_op.tcl:306 +#: git-gui.sh:1491 lib/checkout_op.tcl:306 msgid "Refreshing file status..." msgstr "Dateistatus aktualisieren..." -#: git-gui.sh:1390 +#: git-gui.sh:1551 msgid "Scanning for modified files ..." msgstr "Nach geรคnderten Dateien suchen..." -#: git-gui.sh:1454 +#: git-gui.sh:1629 msgid "Calling prepare-commit-msg hook..." -msgstr "Aufrufen der Eintragen-Vorbereiten-Kontrolle (ยปprepare-commit hookยซ)..." +msgstr "Aufrufen des ยปprepare-commit-msg hookยซ..." -#: git-gui.sh:1471 +#: git-gui.sh:1646 msgid "Commit declined by prepare-commit-msg hook." -msgstr "" -"Eintragen abgelehnt durch Eintragen-Vorbereiten-Kontrolle (ยปprepare-commit " -"hookยซ)." +msgstr "Commit abgelehnt durch ยปprepare-commit-msg hookยซ." -#: git-gui.sh:1629 lib/browser.tcl:246 +#: git-gui.sh:1804 lib/browser.tcl:252 msgid "Ready." msgstr "Bereit." -#: git-gui.sh:1787 +#: git-gui.sh:1968 #, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Nur %s von %s Dateien werden angezeigt." +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." -#: git-gui.sh:1913 +#: git-gui.sh:2091 msgid "Unmodified" msgstr "Unverรคndert" -#: git-gui.sh:1915 +#: git-gui.sh:2093 msgid "Modified, not staged" msgstr "Verรคndert, nicht bereitgestellt" -#: git-gui.sh:1916 git-gui.sh:1924 +#: git-gui.sh:2094 git-gui.sh:2106 msgid "Staged for commit" -msgstr "Bereitgestellt zum Eintragen" +msgstr "Bereitgestellt zum Committen" -#: git-gui.sh:1917 git-gui.sh:1925 +#: git-gui.sh:2095 git-gui.sh:2107 msgid "Portions staged for commit" -msgstr "Teilweise bereitgestellt zum Eintragen" +msgstr "Teilweise bereitgestellt zum Committen" -#: git-gui.sh:1918 git-gui.sh:1926 +#: git-gui.sh:2096 git-gui.sh:2108 msgid "Staged for commit, missing" -msgstr "Bereitgestellt zum Eintragen, fehlend" +msgstr "Bereitgestellt zum Committen, fehlend" -#: git-gui.sh:1920 +#: git-gui.sh:2098 msgid "File type changed, not staged" msgstr "Dateityp geรคndert, nicht bereitgestellt" -#: git-gui.sh:1921 +#: 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 msgid "File type changed, staged" msgstr "Dateityp geรคndert, bereitgestellt" -#: git-gui.sh:1923 +#: 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 msgid "Untracked, not staged" -msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt" +msgstr "Unversioniert, nicht bereitgestellt" -#: git-gui.sh:1928 +#: git-gui.sh:2110 msgid "Missing" msgstr "Fehlend" -#: git-gui.sh:1929 +#: git-gui.sh:2111 msgid "Staged for removal" msgstr "Bereitgestellt zum Lรถschen" -#: git-gui.sh:1930 +#: git-gui.sh:2112 msgid "Staged for removal, still present" msgstr "Bereitgestellt zum Lรถschen, trotzdem vorhanden" -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 +#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 +#: git-gui.sh:2118 git-gui.sh:2119 msgid "Requires merge resolution" msgstr "Konfliktauflรถsung nรถtig" -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "Gitk wird gestartet... bitte warten." - -#: git-gui.sh:1984 +#: git-gui.sh:2164 msgid "Couldn't find gitk in PATH" msgstr "Gitk kann im PATH nicht gefunden werden." -#: git-gui.sh:2043 +#: 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 msgid "Couldn't find git gui in PATH" msgstr "ยปGit guiยซ kann im PATH nicht gefunden werden." -#: git-gui.sh:2455 lib/choose_repository.tcl:36 +#: git-gui.sh:2726 lib/choose_repository.tcl:53 msgid "Repository" -msgstr "Projektarchiv" +msgstr "Repository" -#: git-gui.sh:2456 +#: git-gui.sh:2727 msgid "Edit" msgstr "Bearbeiten" -#: git-gui.sh:2458 lib/choose_rev.tcl:561 +#: git-gui.sh:2729 lib/choose_rev.tcl:567 msgid "Branch" -msgstr "Zweig" +msgstr "Branch" -#: git-gui.sh:2461 lib/choose_rev.tcl:548 +#: git-gui.sh:2732 lib/choose_rev.tcl:554 msgid "Commit@@noun" -msgstr "Version" +msgstr "Commit" -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174 msgid "Merge" msgstr "Zusammenfรผhren" -#: git-gui.sh:2465 lib/choose_rev.tcl:557 +#: git-gui.sh:2736 lib/choose_rev.tcl:563 msgid "Remote" -msgstr "Externe Archive" +msgstr "Extern" -#: git-gui.sh:2468 +#: git-gui.sh:2739 msgid "Tools" msgstr "Werkzeuge" -#: git-gui.sh:2477 +#: git-gui.sh:2748 msgid "Explore Working Copy" -msgstr "Arbeitskopie im Dateimanager" +msgstr "Arbeitskopie im Dateimanager รถffnen" + +#: git-gui.sh:2763 +msgid "Git Bash" +msgstr "Git Bash" -#: git-gui.sh:2483 +#: git-gui.sh:2772 msgid "Browse Current Branch's Files" -msgstr "Aktuellen Zweig durchblรคttern" +msgstr "Aktuellen Branch durchblรคttern" -#: git-gui.sh:2487 +#: git-gui.sh:2776 msgid "Browse Branch Files..." -msgstr "Einen Zweig durchblรคttern..." +msgstr "Branch durchblรคttern..." -#: git-gui.sh:2492 +#: git-gui.sh:2781 msgid "Visualize Current Branch's History" -msgstr "Aktuellen Zweig darstellen" +msgstr "Aktuellen Branch darstellen" -#: git-gui.sh:2496 +#: git-gui.sh:2785 msgid "Visualize All Branch History" -msgstr "Alle Zweige darstellen" +msgstr "Historie aller Branches darstellen" -#: git-gui.sh:2503 +#: git-gui.sh:2792 #, tcl-format msgid "Browse %s's Files" -msgstr "Zweig ยป%sยซ durchblรคttern" +msgstr "Branch ยป%sยซ durchblรคttern" -#: git-gui.sh:2505 +#: git-gui.sh:2794 #, tcl-format msgid "Visualize %s's History" msgstr "Historie von ยป%sยซ darstellen" -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 +#: git-gui.sh:2799 lib/database.tcl:40 msgid "Database Statistics" msgstr "Datenbankstatistik" -#: git-gui.sh:2513 lib/database.tcl:34 +#: git-gui.sh:2802 lib/database.tcl:33 msgid "Compress Database" msgstr "Datenbank komprimieren" -#: git-gui.sh:2516 +#: git-gui.sh:2805 msgid "Verify Database" msgstr "Datenbank รผberprรผfen" -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820 msgid "Create Desktop Icon" msgstr "Desktop-Icon erstellen" -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217 msgid "Quit" msgstr "Beenden" -#: git-gui.sh:2547 +#: git-gui.sh:2836 msgid "Undo" msgstr "Rรผckgรคngig" -#: git-gui.sh:2550 +#: git-gui.sh:2839 msgid "Redo" msgstr "Wiederholen" -#: git-gui.sh:2554 git-gui.sh:3109 +#: git-gui.sh:2843 git-gui.sh:3461 msgid "Cut" msgstr "Ausschneiden" -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 +#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633 #: lib/console.tcl:69 msgid "Copy" msgstr "Kopieren" -#: git-gui.sh:2560 git-gui.sh:3115 +#: git-gui.sh:2849 git-gui.sh:3467 msgid "Paste" msgstr "Einfรผgen" -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 +#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39 +#: lib/branch_delete.tcl:28 msgid "Delete" msgstr "Lรถschen" -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 +#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71 msgid "Select All" msgstr "Alle auswรคhlen" -#: git-gui.sh:2576 +#: git-gui.sh:2865 msgid "Create..." msgstr "Erstellen..." -#: git-gui.sh:2582 +#: git-gui.sh:2871 msgid "Checkout..." -msgstr "Umstellen..." +msgstr "Auschecken..." -#: git-gui.sh:2588 +#: git-gui.sh:2877 msgid "Rename..." msgstr "Umbenennen..." -#: git-gui.sh:2593 +#: git-gui.sh:2882 msgid "Delete..." msgstr "Lรถschen..." -#: git-gui.sh:2598 +#: git-gui.sh:2887 msgid "Reset..." -msgstr "Zurรผcksetzen..." +msgstr "รnderungen verwerfen..." -#: git-gui.sh:2608 +#: git-gui.sh:2897 msgid "Done" msgstr "Fertig" -#: git-gui.sh:2610 +#: git-gui.sh:2899 msgid "Commit@@verb" -msgstr "Eintragen" +msgstr "Committen" -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "Neue Version" - -#: git-gui.sh:2627 git-gui.sh:3057 +#: git-gui.sh:2908 git-gui.sh:3400 msgid "Amend Last Commit" -msgstr "Letzte nachbessern" +msgstr "Letzten Commit nachbessern" -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 +#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101 msgid "Rescan" msgstr "Neu laden" -#: git-gui.sh:2643 +#: git-gui.sh:2924 msgid "Stage To Commit" -msgstr "Zum Eintragen bereitstellen" +msgstr "Fรผr Commit bereitstellen" -#: git-gui.sh:2649 +#: git-gui.sh:2930 msgid "Stage Changed Files To Commit" -msgstr "Geรคnderte Dateien bereitstellen" +msgstr "Geรคnderte Dateien fรผr Commit bereitstellen" -#: git-gui.sh:2655 +#: git-gui.sh:2936 msgid "Unstage From Commit" -msgstr "Aus der Bereitstellung herausnehmen" +msgstr "Aus Commit-Bereitstellung herausnehmen" -#: git-gui.sh:2661 lib/index.tcl:412 +#: git-gui.sh:2942 lib/index.tcl:521 msgid "Revert Changes" msgstr "รnderungen verwerfen" -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 +#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731 msgid "Show Less Context" msgstr "Weniger Zeilen anzeigen" -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 +#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735 msgid "Show More Context" msgstr "Mehr Zeilen anzeigen" -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 +#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485 msgid "Sign Off" msgstr "Abzeichnen" -#: git-gui.sh:2696 +#: git-gui.sh:2977 msgid "Local Merge..." msgstr "Lokales Zusammenfรผhren..." -#: git-gui.sh:2701 +#: git-gui.sh:2982 msgid "Abort Merge..." msgstr "Zusammenfรผhren abbrechen..." -#: git-gui.sh:2713 git-gui.sh:2741 +#: git-gui.sh:2994 git-gui.sh:3022 msgid "Add..." -msgstr "Hinzufรผgen..." +msgstr "Neues hinzufรผgen..." -#: git-gui.sh:2717 +#: git-gui.sh:2998 msgid "Push..." msgstr "Versenden..." -#: git-gui.sh:2721 +#: git-gui.sh:3002 msgid "Delete Branch..." -msgstr "Zweig lรถschen..." +msgstr "Branch lรถschen..." -#: git-gui.sh:2731 git-gui.sh:3292 +#: git-gui.sh:3012 git-gui.sh:3666 msgid "Options..." msgstr "Optionen..." -#: git-gui.sh:2742 +#: git-gui.sh:3023 msgid "Remove..." msgstr "Entfernen..." -#: git-gui.sh:2751 lib/choose_repository.tcl:50 +#: git-gui.sh:3032 lib/choose_repository.tcl:67 msgid "Help" msgstr "Hilfe" -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 +#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61 +#: lib/choose_repository.tcl:70 lib/about.tcl:14 #, tcl-format msgid "About %s" msgstr "รber %s" -#: git-gui.sh:2783 +#: git-gui.sh:3064 msgid "Online Documentation" msgstr "Online-Dokumentation" -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73 msgid "Show SSH Key" msgstr "SSH-Schlรผssel anzeigen" -#: git-gui.sh:2893 +#: 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 #, 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:2926 +#: git-gui.sh:3246 msgid "Current Branch:" -msgstr "Aktueller Zweig:" +msgstr "Aktueller Branch:" -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "Bereitstellung (zum Eintragen)" - -#: git-gui.sh:2967 +#: git-gui.sh:3271 msgid "Unstaged Changes" msgstr "Nicht bereitgestellte รnderungen" -#: git-gui.sh:3017 +#: git-gui.sh:3293 +msgid "Staged Changes (Will Commit)" +msgstr "Bereitstellung (zum Committen)" + +#: git-gui.sh:3367 msgid "Stage Changed" msgstr "Alles bereitstellen" -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 +#: git-gui.sh:3386 lib/transport.tcl:137 msgid "Push" msgstr "Versenden" -#: git-gui.sh:3071 +#: git-gui.sh:3413 msgid "Initial Commit Message:" -msgstr "Erste Versionsbeschreibung:" +msgstr "Erste Commit-Beschreibung:" -#: git-gui.sh:3072 +#: git-gui.sh:3414 msgid "Amended Commit Message:" msgstr "Nachgebesserte Beschreibung:" -#: git-gui.sh:3073 +#: git-gui.sh:3415 msgid "Amended Initial Commit Message:" msgstr "Nachgebesserte erste Beschreibung:" -#: git-gui.sh:3074 +#: git-gui.sh:3416 msgid "Amended Merge Commit Message:" msgstr "Nachgebesserte Zusammenfรผhrungs-Beschreibung:" -#: git-gui.sh:3075 +#: git-gui.sh:3417 msgid "Merge Commit Message:" msgstr "Zusammenfรผhrungs-Beschreibung:" -#: git-gui.sh:3076 +#: git-gui.sh:3418 msgid "Commit Message:" -msgstr "Versionsbeschreibung:" +msgstr "Commit-Beschreibung:" -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 +#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73 msgid "Copy All" msgstr "Alle kopieren" -#: git-gui.sh:3149 lib/blame.tcl:104 +#: git-gui.sh:3501 lib/blame.tcl:106 msgid "File:" msgstr "Datei:" -#: git-gui.sh:3255 +#: git-gui.sh:3549 lib/choose_repository.tcl:1100 +msgid "Open" +msgstr "รffnen" + +#: git-gui.sh:3629 msgid "Refresh" msgstr "Aktualisieren" -#: git-gui.sh:3276 +#: git-gui.sh:3650 msgid "Decrease Font Size" msgstr "Schriftgrรถรe verkleinern" -#: git-gui.sh:3280 +#: git-gui.sh:3654 msgid "Increase Font Size" msgstr "Schriftgrรถรe vergrรถรern" -#: git-gui.sh:3288 lib/blame.tcl:281 +#: git-gui.sh:3662 lib/blame.tcl:296 msgid "Encoding" msgstr "Zeichenkodierung" -#: git-gui.sh:3299 +#: git-gui.sh:3673 msgid "Apply/Reverse Hunk" -msgstr "Kontext anwenden/umkehren" +msgstr "Patch-Block anwenden/zurรผcknehmen" -#: git-gui.sh:3304 +#: git-gui.sh:3678 msgid "Apply/Reverse Line" -msgstr "Zeile anwenden/umkehren" +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" -#: git-gui.sh:3323 +#: git-gui.sh:3713 msgid "Run Merge Tool" msgstr "Zusammenfรผhrungswerkzeug" -#: git-gui.sh:3328 +#: git-gui.sh:3718 msgid "Use Remote Version" msgstr "Externe Version benutzen" -#: git-gui.sh:3332 +#: git-gui.sh:3722 msgid "Use Local Version" msgstr "Lokale Version benutzen" -#: git-gui.sh:3336 +#: git-gui.sh:3726 msgid "Revert To Base" -msgstr "Ursprรผngliche Version benutzen" +msgstr "Zurรผcksetzen auf ursprรผnglichen Commit" -#: git-gui.sh:3354 +#: git-gui.sh:3744 msgid "Visualize These Changes In The Submodule" -msgstr "Diese รnderungen im Untermodul darstellen" +msgstr "Diese รnderungen im Submodul darstellen" -#: git-gui.sh:3358 +#: git-gui.sh:3748 msgid "Visualize Current Branch History In The Submodule" -msgstr "Aktuellen Zweig im Untermodul darstellen" +msgstr "Aktuellen Branch im Submodul darstellen" -#: git-gui.sh:3362 +#: git-gui.sh:3752 msgid "Visualize All Branch History In The Submodule" -msgstr "Alle Zweige im Untermodul darstellen" +msgstr "Alle Branches im Submodul darstellen" -#: git-gui.sh:3367 +#: git-gui.sh:3757 msgid "Start git gui In The Submodule" -msgstr "Git gui im Untermodul starten" +msgstr "Git gui im Submodul starten" -#: git-gui.sh:3389 +#: git-gui.sh:3793 msgid "Unstage Hunk From Commit" -msgstr "Kontext aus Bereitstellung herausnehmen" +msgstr "Patch-Block aus Bereitstellung herausnehmen" -#: git-gui.sh:3391 +#: git-gui.sh:3797 msgid "Unstage Lines From Commit" msgstr "Zeilen aus der Bereitstellung herausnehmen" -#: git-gui.sh:3393 +#: git-gui.sh:3798 git-gui.sh:3809 +msgid "Revert Lines" +msgstr "Zeilenรคnderung zurรผcknehmen" + +#: git-gui.sh:3800 msgid "Unstage Line From Commit" msgstr "Zeile aus der Bereitstellung herausnehmen" -#: git-gui.sh:3396 +#: git-gui.sh:3804 msgid "Stage Hunk For Commit" -msgstr "Kontext zur Bereitstellung hinzufรผgen" +msgstr "Patch-Block zur Bereitstellung hinzufรผgen" -#: git-gui.sh:3398 +#: git-gui.sh:3808 msgid "Stage Lines For Commit" msgstr "Zeilen zur Bereitstellung hinzufรผgen" -#: git-gui.sh:3400 +#: git-gui.sh:3811 msgid "Stage Line For Commit" msgstr "Zeile zur Bereitstellung hinzufรผgen" -#: git-gui.sh:3424 +#: git-gui.sh:3861 msgid "Initializing..." msgstr "Initialisieren..." -#: git-gui.sh:3541 +#: git-gui.sh:4017 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -548,7 +594,7 @@ msgstr "" "von %s an Git weitergegeben werden:\n" "\n" -#: git-gui.sh:3570 +#: git-gui.sh:4046 msgid "" "\n" "This is due to a known issue with the\n" @@ -558,7 +604,7 @@ msgstr "" "Dies ist ein bekanntes Problem der Tcl-Version, die\n" "in Cygwin mitgeliefert wird." -#: git-gui.sh:3575 +#: git-gui.sh:4051 #, tcl-format msgid "" "\n" @@ -574,315 +620,151 @@ msgstr "" "gewรผnschten Werte fรผr die Einstellung user.name und \n" "user.email in Ihre Datei ~/.gitconfig einfรผgen.\n" -#: 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:72 -msgid "File Viewer" -msgstr "Datei-Browser" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Version:" - -#: 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/spellcheck.tcl:57 +msgid "Unsupported spell checker" +msgstr "Rechtschreibprรผfungsprogramm nicht unterstรผtzt" -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Historien-Kontext anzeigen" +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" +msgstr "Rechtschreibprรผfung nicht verfรผgbar" -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Elternversion annotieren" +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" +msgstr "Unbenutzbare Konfiguration der Rechtschreibprรผfung" -#: lib/blame.tcl:450 +#: lib/spellcheck.tcl:70 #, tcl-format -msgid "Reading %s..." -msgstr "%s lesen..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "Annotierungen fรผr Kopieren/Verschieben werden geladen..." - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "Zeilen annotiert" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "Annotierungen fรผr ursprรผnglichen Ort werden geladen..." - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "Annotierung vollstรคndig." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Verarbeitung lรคuft" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "Annotierung lรคuft bereits." - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Intensive Kopie-Erkennung lรคuft..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "Annotierung laden..." - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "Autor:" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "Eintragender:" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "Ursprรผngliche Datei:" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "Zweigspitze (ยปHEADยซ) kann nicht gefunden werden:" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "Elternversion kann nicht gefunden werden:" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "Elternversion kann nicht angezeigt werden" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "Fehler beim Laden des Vergleichs:" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "Ursprรผnglich von:" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "In Datei:" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -msgstr "Kopiert oder verschoben durch:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Auf Zweig umstellen" - -#: 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/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Version" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "Optionen" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "รbernahmezweig anfordern" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "Verbindung zu lokalem Zweig lรถsen" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Zweig erstellen" - -#: 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:" +msgid "Reverting dictionary to %s." +msgstr "Wรถrterbuch auf %s zurรผckgesetzt." -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Nein" +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" +msgstr "Rechtschreibprรผfungsprogramm mit Fehler abgebrochen" -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Nur Schnellzusammenfรผhrung" +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" +msgstr "Unbekanntes Rechtschreibprรผfungsprogramm" -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "Zurรผcksetzen" +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" +msgstr "Keine Vorschlรคge" -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Arbeitskopie umstellen nach Erstellen" +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" +msgstr "Unerwartetes EOF vom Rechtschreibprรผfungsprogramm" -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Bitte wรคhlen Sie einen รbernahmezweig." +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" +msgstr "Rechtschreibprรผfung fehlgeschlagen" -#: lib/branch_create.tcl:140 +#: lib/transport.tcl:6 lib/remote_add.tcl:132 #, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "รbernahmezweig ยป%sยซ ist kein Zweig im externen Projektarchiv." +msgid "fetch %s" +msgstr "ยป%sยซ anfordern" -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Bitte geben Sie einen Zweignamen an." +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "Neue รnderungen von ยป%sยซ holen" -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#: lib/transport.tcl:18 #, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "ยป%sยซ ist kein zulรคssiger Zweigname." +msgid "remote prune %s" +msgstr "Gelรถschte externe Branches aus ยป%sยซ entfernen" -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Zweig lรถschen" +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "Gelรถschte externe Trackingbranches aus ยป%sยซ werden entfernt" -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Lokalen Zweig lรถschen" +#: lib/transport.tcl:25 +msgid "fetch all remotes" +msgstr "Abrufen aller externen" -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "Lokale Zweige" +#: lib/transport.tcl:26 +msgid "Fetching new changes from all remotes" +msgstr "Neue รnderungen von allen externen anfordern" -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Nur lรถschen, wenn zusammengefรผhrt nach" +#: lib/transport.tcl:40 +msgid "remote prune all remotes" +msgstr "Extern veraltete Branches entfernen aller Repositories" -#: 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/transport.tcl:41 +msgid "Pruning tracking branches deleted from all remotes" +msgstr "" +"Gelรถschte externe Trackingbranches aus allen Repositories werden entfernt" -#: lib/branch_delete.tcl:103 +#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 +#: lib/remote_add.tcl:162 #, 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 "" -"Das Wiederherstellen von gelรถschten Zweigen ist nur mit grรถรerem Aufwand " -"mรถglich.\n" -"\n" -"Sollen die ausgewรคhlten Zweige gelรถscht werden?" +msgid "push %s" +msgstr "ยป%sยซ versenden..." -#: lib/branch_delete.tcl:141 +#: lib/transport.tcl:55 #, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Fehler beim Lรถschen der Zweige:\n" -"%s" +msgid "Pushing changes to %s" +msgstr "รnderungen nach ยป%sยซ versenden" -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "Zweig umbenennen" +#: lib/transport.tcl:93 +#, tcl-format +msgid "Mirroring to %s" +msgstr "Spiegeln nach %s" -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "Umbenennen" +#: lib/transport.tcl:111 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "%s %s nach %s versenden" -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "Zweig:" +#: lib/transport.tcl:132 +msgid "Push Branches" +msgstr "Branches versenden" -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "Neuer Name:" +#: 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" +msgstr "Abbrechen" -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Bitte wรคhlen Sie einen Zweig zum umbenennen." +#: lib/transport.tcl:147 +msgid "Source Branches" +msgstr "Lokale Branches" -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Zweig ยป%sยซ existiert bereits." +#: lib/transport.tcl:162 +msgid "Destination Repository" +msgstr "Ziel-Repository" -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Fehler beim Umbenennen von ยป%sยซ." +#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 +msgid "Remote:" +msgstr "Externes Repository:" -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Starten..." +#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 +msgid "Arbitrary Location:" +msgstr "Beliebige Adresse:" -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "Datei-Browser" +#: lib/transport.tcl:205 +msgid "Transfer Options" +msgstr "Netzwerk-Einstellungen" -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "%s laden..." +#: lib/transport.tcl:207 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "" +"รberschreiben von existierenden Branches erzwingen (kรถnnte รnderungen " +"lรถschen)" -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Nach oben]" +#: lib/transport.tcl:211 +msgid "Use thin pack (for slow network connections)" +msgstr "Kompaktes Datenformat benutzen (fรผr langsame Netzverbindungen)" -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Dateien des Zweigs durchblรคttern" +#: lib/transport.tcl:215 +msgid "Include tags" +msgstr "Mit Tags versenden" -#: 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/transport.tcl:229 +#, tcl-format +msgid "%s (%s): Push" +msgstr "%s (%s): Versenden" #: lib/checkout_op.tcl:85 #, tcl-format @@ -892,23 +774,28 @@ msgstr "รnderungen ยป%sยซ von ยป%sยซ anfordern" #: lib/checkout_op.tcl:133 #, tcl-format msgid "fatal: Cannot resolve %s" -msgstr "Fehler: ยป%sยซ kann nicht als Zweig oder Version erkannt werden" +msgstr "Fehler: ยป%sยซ kann nicht als Branch oder Version erkannt werden" -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 +#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81 +#: lib/database.tcl:30 msgid "Close" msgstr "Schlieรen" #: lib/checkout_op.tcl:175 #, tcl-format msgid "Branch '%s' does not exist." -msgstr "Zweig ยป%sยซ existiert nicht." +msgstr "Branch ยป%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 "" @@ -917,10 +804,10 @@ msgid "" "It cannot fast-forward to %s.\n" "A merge is required." msgstr "" -"Zweig ยป%sยซ existiert bereits.\n" +"Branch ยป%sยซ existiert bereits.\n" "\n" -"Zweig kann nicht mit ยป%sยซ schnellzusammengefรผhrt werden. Regulรคres " -"Zusammenfรผhren ist notwendig." +"Branch kann nicht auf ยป%sยซ vorgespult werden. Regulรคres Zusammenfรผhren ist " +"notwendig." #: lib/checkout_op.tcl:243 #, tcl-format @@ -945,76 +832,79 @@ msgid "" "\n" "The rescan will be automatically started now.\n" msgstr "" -"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv รผberein.\n" +"Der letzte geladene Status stimmt nicht mehr mit dem Repository รผberein.\n" "\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" +"Ein anderes Git-Programm hat das Repository seit dem letzten Laden " +"geรคndert. Vor dem Wechseln des lokalen Branches 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 umstellen auf ยป%sยซ..." +msgstr "Arbeitskopie aktualisieren auf ยป%sยซ..." #: lib/checkout_op.tcl:346 msgid "files checked out" msgstr "Dateien aktualisiert" -#: lib/checkout_op.tcl:376 +#: lib/checkout_op.tcl:377 #, tcl-format msgid "Aborted checkout of '%s' (file level merging is required)." msgstr "" -"Auf Zweig ยป%sยซ umstellen abgebrochen (Zusammenfรผhren der Dateien ist " +"Branch ยป%sยซ Auschecken abgebrochen (Zusammenfรผhren der Dateien ist " "notwendig)." -#: lib/checkout_op.tcl:377 +#: lib/checkout_op.tcl:378 msgid "File level merge required." msgstr "Zusammenfรผhren der Dateien ist notwendig." -#: lib/checkout_op.tcl:381 +#: lib/checkout_op.tcl:382 #, tcl-format msgid "Staying on branch '%s'." -msgstr "Es wird auf Zweig ยป%sยซ verblieben." +msgstr "Es wird auf Branch ยป%sยซ verblieben." -#: lib/checkout_op.tcl:452 +#: 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'." msgstr "" -"Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n" +"Die Arbeitskopie ist nicht auf einem lokalen Branch.\n" "\n" -"Wenn Sie auf einem Zweig arbeiten mรถchten, erstellen Sie bitte jetzt einen " -"Zweig mit der Auswahl ยปAbgetrennte Arbeitskopie-Versionยซ." +"Wenn Sie auf einem Branch arbeiten mรถchten, erstellen Sie bitte jetzt einen " +"Branch mit der Auswahl ยปLosgelรถste Arbeitskopie-Versionยซ." -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508 #, tcl-format msgid "Checked out '%s'." msgstr "Umgestellt auf ยป%sยซ." -#: lib/checkout_op.tcl:535 +#: lib/checkout_op.tcl:536 #, tcl-format msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Zurรผcksetzen von ยป%sยซ nach ยป%sยซ wird folgende Versionen verwerfen:" +msgstr "Umsetzen von ยป%sยซ nach ยป%sยซ wird folgende Commits verlieren:" -#: lib/checkout_op.tcl:557 +#: lib/checkout_op.tcl:558 msgid "Recovering lost commits may not be easy." msgstr "" -"Verworfene Versionen kรถnnen nur mit grรถรerem Aufwand wiederhergestellt " -"werden." +"Verlorene Commits kรถnnen nur mit grรถรerem Aufwand wiederhergestellt werden." -#: lib/checkout_op.tcl:562 +#: lib/checkout_op.tcl:563 #, tcl-format msgid "Reset '%s'?" -msgstr "ยป%sยซ zurรผcksetzen?" +msgstr "ยป%sยซ umsetzen?" -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170 msgid "Visualize" msgstr "Darstellen" -#: lib/checkout_op.tcl:635 +#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85 +msgid "Reset" +msgstr "Umsetzen (Reset)" + +#: lib/checkout_op.tcl:636 #, tcl-format msgid "" "Failed to set current branch.\n" @@ -1024,7 +914,7 @@ msgid "" "\n" "This should not have occurred. %s will now close and give up." msgstr "" -"Lokaler Zweig kann nicht gesetzt werden.\n" +"Lokaler Branch 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 " @@ -1032,23 +922,345 @@ msgstr "" "\n" "Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen." -#: lib/choose_font.tcl:39 +#: 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 msgid "Select" msgstr "Auswรคhlen" -#: lib/choose_font.tcl:53 +#: lib/choose_font.tcl:55 msgid "Font Family" msgstr "Schriftfamilie" -#: lib/choose_font.tcl:74 +#: lib/choose_font.tcl:76 msgid "Font Size" msgstr "Schriftgrรถรe" -#: lib/choose_font.tcl:91 +#: lib/choose_font.tcl:93 msgid "Font Example" msgstr "Schriftbeispiel" -#: lib/choose_font.tcl:103 +#: lib/choose_font.tcl:105 msgid "" "This is example text.\n" "If you like this text, it can be your font." @@ -1056,277 +1268,1137 @@ msgstr "" "Dies ist ein Beispieltext.\n" "Wenn Ihnen dieser Text gefรคllt, sollten Sie diese Schriftart wรคhlen." -#: lib/choose_repository.tcl:28 +#: 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 msgid "Git Gui" msgstr "Git Gui" -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 +#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427 msgid "Create New Repository" -msgstr "Neues Projektarchiv" +msgstr "Repository neu erstellen" -#: lib/choose_repository.tcl:93 +#: lib/choose_repository.tcl:110 msgid "New..." msgstr "Neu..." -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 +#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511 msgid "Clone Existing Repository" -msgstr "Projektarchiv klonen" +msgstr "Repository klonen" -#: lib/choose_repository.tcl:106 +#: lib/choose_repository.tcl:128 msgid "Clone..." msgstr "Klonen..." -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 +#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105 msgid "Open Existing Repository" -msgstr "Projektarchiv รถffnen" +msgstr "Repository รถffnen" -#: lib/choose_repository.tcl:119 +#: lib/choose_repository.tcl:141 msgid "Open..." msgstr "รffnen..." -#: lib/choose_repository.tcl:132 +#: lib/choose_repository.tcl:154 msgid "Recent Repositories" -msgstr "Zuletzt benutzte Projektarchive" +msgstr "Letzte Repositories" -#: lib/choose_repository.tcl:138 +#: lib/choose_repository.tcl:164 msgid "Open Recent Repository:" -msgstr "Zuletzt benutztes Projektarchiv รถffnen:" +msgstr "Zuletzt benutztes Repository รถffnen:" -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 +#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338 +#: lib/choose_repository.tcl:345 #, tcl-format msgid "Failed to create repository %s:" -msgstr "Projektarchiv ยป%sยซ konnte nicht erstellt werden:" +msgstr "Repository ยป%sยซ konnte nicht erstellt werden:" -#: lib/choose_repository.tcl:391 +#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33 +msgid "Create" +msgstr "Erstellen" + +#: lib/choose_repository.tcl:432 msgid "Directory:" msgstr "Verzeichnis:" -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 +#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588 +#: lib/choose_repository.tcl:1139 msgid "Git Repository" -msgstr "Git Projektarchiv" +msgstr "Git Repository" -#: lib/choose_repository.tcl:448 +#: lib/choose_repository.tcl:487 #, tcl-format msgid "Directory %s already exists." msgstr "Verzeichnis ยป%sยซ existiert bereits." -#: lib/choose_repository.tcl:452 +#: lib/choose_repository.tcl:491 #, tcl-format msgid "File %s already exists." msgstr "Datei ยป%sยซ existiert bereits." -#: lib/choose_repository.tcl:466 +#: lib/choose_repository.tcl:506 msgid "Clone" msgstr "Klonen" -#: lib/choose_repository.tcl:479 +#: lib/choose_repository.tcl:519 msgid "Source Location:" -msgstr "Herkunft:" +msgstr "Herkunfts-Adresse:" -#: lib/choose_repository.tcl:490 +#: lib/choose_repository.tcl:528 msgid "Target Directory:" msgstr "Zielverzeichnis:" -#: lib/choose_repository.tcl:502 +#: lib/choose_repository.tcl:538 msgid "Clone Type:" msgstr "Art des Klonens:" -#: lib/choose_repository.tcl:508 +#: lib/choose_repository.tcl:543 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" msgstr "Standard (schnell, teilweise redundant, Hardlinks)" -#: lib/choose_repository.tcl:514 +#: lib/choose_repository.tcl:548 msgid "Full Copy (Slower, Redundant Backup)" msgstr "Alles kopieren (langsamer, volle Redundanz)" -#: lib/choose_repository.tcl:520 +#: lib/choose_repository.tcl:553 msgid "Shared (Fastest, Not Recommended, No Backup)" msgstr "Verknรผpft (schnell, nicht empfohlen, kein Backup)" -#: 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 +#: 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 #, tcl-format msgid "Not a Git repository: %s" -msgstr "Kein Git-Projektarchiv in ยป%sยซ gefunden." +msgstr "Kein Git-Repository: %s" -#: lib/choose_repository.tcl:592 +#: lib/choose_repository.tcl:630 msgid "Standard only available for local repository." -msgstr "Standard ist nur fรผr lokale Projektarchive verfรผgbar." +msgstr "Standard ist nur fรผr lokale Repositories verfรผgbar." -#: lib/choose_repository.tcl:596 +#: lib/choose_repository.tcl:634 msgid "Shared only available for local repository." -msgstr "Verknรผpft ist nur fรผr lokale Projektarchive verfรผgbar." +msgstr "Verknรผpft ist nur fรผr lokale Repositories verfรผgbar." -#: lib/choose_repository.tcl:617 +#: lib/choose_repository.tcl:655 #, tcl-format msgid "Location %s already exists." -msgstr "Projektarchiv ยป%sยซ existiert bereits." +msgstr "Adresse ยป%sยซ existiert bereits." -#: lib/choose_repository.tcl:628 +#: lib/choose_repository.tcl:666 msgid "Failed to configure origin" msgstr "Der Ursprungsort konnte nicht eingerichtet werden" -#: lib/choose_repository.tcl:640 +#: lib/choose_repository.tcl:678 msgid "Counting objects" msgstr "Objekte werden gezรคhlt" -#: lib/choose_repository.tcl:641 +#: lib/choose_repository.tcl:679 msgid "buckets" msgstr "Buckets" -#: lib/choose_repository.tcl:665 +#: lib/choose_repository.tcl:703 #, 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:701 +#: lib/choose_repository.tcl:740 #, tcl-format msgid "Nothing to clone from %s." msgstr "Von ยป%sยซ konnte nichts geklont werden." -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 +#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962 +#: lib/choose_repository.tcl:974 msgid "The 'master' branch has not been initialized." -msgstr "Der ยปmasterยซ-Zweig wurde noch nicht initialisiert." +msgstr "Der ยปmasterยซ-Branch wurde noch nicht initialisiert." -#: lib/choose_repository.tcl:716 +#: lib/choose_repository.tcl:755 msgid "Hardlinks are unavailable. Falling back to copying." msgstr "Hardlinks nicht verfรผgbar. Stattdessen wird kopiert." -#: lib/choose_repository.tcl:728 +#: lib/choose_repository.tcl:769 #, tcl-format msgid "Cloning from %s" msgstr "Kopieren von ยป%sยซ" -#: lib/choose_repository.tcl:759 +#: lib/choose_repository.tcl:800 msgid "Copying objects" msgstr "Objektdatenbank kopieren" -#: lib/choose_repository.tcl:760 +#: lib/choose_repository.tcl:801 msgid "KiB" msgstr "KB" -#: lib/choose_repository.tcl:784 +#: lib/choose_repository.tcl:825 #, tcl-format msgid "Unable to copy object: %s" msgstr "Objekt kann nicht kopiert werden: %s" -#: lib/choose_repository.tcl:794 +#: lib/choose_repository.tcl:837 msgid "Linking objects" msgstr "Objekte verlinken" -#: lib/choose_repository.tcl:795 +#: lib/choose_repository.tcl:838 msgid "objects" msgstr "Objekte" -#: lib/choose_repository.tcl:803 +#: lib/choose_repository.tcl:846 #, tcl-format msgid "Unable to hardlink object: %s" msgstr "Fรผr Objekt konnte kein Hardlink erstellt werden: %s" -#: lib/choose_repository.tcl:858 +#: lib/choose_repository.tcl:903 msgid "Cannot fetch branches and objects. See console output for details." msgstr "" -"Zweige und Objekte konnten nicht angefordert werden. Kontrollieren Sie die " -"Ausgaben auf der Konsole fรผr weitere Angaben." +"Branches und Objekte konnten nicht angefordert werden. Kontrollieren Sie " +"die Ausgaben auf der Konsole fรผr weitere Angaben." -#: lib/choose_repository.tcl:869 +#: lib/choose_repository.tcl:914 msgid "Cannot fetch tags. See console output for details." msgstr "" -"Markierungen konnten nicht angefordert werden. Kontrollieren Sie die " -"Ausgaben auf der Konsole fรผr weitere Angaben." +"Tags konnten nicht angefordert werden. Kontrollieren Sie die Ausgaben auf " +"der Konsole fรผr weitere Angaben." -#: lib/choose_repository.tcl:893 +#: lib/choose_repository.tcl:938 msgid "Cannot determine HEAD. See console output for details." msgstr "" -"Die Zweigspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die " +"Die Branchspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die " "Ausgaben auf der Konsole fรผr weitere Angaben." -#: lib/choose_repository.tcl:902 +#: lib/choose_repository.tcl:947 #, tcl-format msgid "Unable to cleanup %s" msgstr "Verzeichnis ยป%sยซ kann nicht aufgerรคumt werden." -#: lib/choose_repository.tcl:908 +#: lib/choose_repository.tcl:953 msgid "Clone failed." msgstr "Klonen fehlgeschlagen." -#: lib/choose_repository.tcl:915 +#: lib/choose_repository.tcl:960 msgid "No default branch obtained." -msgstr "Kein voreingestellter Zweig gefunden." +msgstr "Kein voreingestellter Branch gefunden." -#: lib/choose_repository.tcl:926 +#: lib/choose_repository.tcl:971 #, tcl-format msgid "Cannot resolve %s as a commit." -msgstr "ยป%sยซ wurde nicht als Version gefunden." +msgstr "ยป%sยซ wurde nicht als Commit gefunden." -#: lib/choose_repository.tcl:938 +#: lib/choose_repository.tcl:998 msgid "Creating working directory" msgstr "Arbeitskopie erstellen" -#: 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 +#: lib/choose_repository.tcl:1028 msgid "Initial file checkout failed." msgstr "Erstellen der Arbeitskopie fehlgeschlagen." -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "รffnen" +#: lib/choose_repository.tcl:1072 +msgid "Cloning submodules" +msgstr "Klone Submodul" -#: lib/choose_repository.tcl:1021 +#: lib/choose_repository.tcl:1087 +msgid "Cannot clone submodules." +msgstr "Submodul konnte nicht geklont werden." + +#: lib/choose_repository.tcl:1110 msgid "Repository:" -msgstr "Projektarchiv:" +msgstr "Repository:" -#: lib/choose_repository.tcl:1072 +#: lib/choose_repository.tcl:1159 #, tcl-format msgid "Failed to open repository %s:" -msgstr "Projektarchiv ยป%sยซ konnte nicht geรถffnet werden." +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" -#: lib/choose_rev.tcl:53 +#: 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 msgid "This Detached Checkout" -msgstr "Abgetrennte Arbeitskopie-Version" +msgstr "Losgelรถste Arbeitskopie-Version" #: lib/choose_rev.tcl:60 msgid "Revision Expression:" -msgstr "Version Regexp-Ausdruck:" +msgstr "Version Regex-Ausdruck:" -#: lib/choose_rev.tcl:74 +#: lib/choose_rev.tcl:72 msgid "Local Branch" -msgstr "Lokaler Zweig" +msgstr "Lokaler Branch" -#: lib/choose_rev.tcl:79 +#: lib/choose_rev.tcl:77 msgid "Tracking Branch" -msgstr "รbernahmezweig" +msgstr "Trackingbranch" -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 +#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 msgid "Tag" -msgstr "Markierung" +msgstr "Tag" -#: lib/choose_rev.tcl:317 +#: lib/choose_rev.tcl:321 #, tcl-format msgid "Invalid revision: %s" msgstr "Ungรผltige Version: %s" -#: lib/choose_rev.tcl:338 +#: lib/choose_rev.tcl:342 msgid "No revision selected." msgstr "Keine Version ausgewรคhlt." -#: lib/choose_rev.tcl:346 +#: lib/choose_rev.tcl:350 msgid "Revision expression is empty." msgstr "Versions-Ausdruck ist leer." -#: lib/choose_rev.tcl:531 +#: lib/choose_rev.tcl:537 msgid "Updated" msgstr "Aktualisiert" -#: lib/choose_rev.tcl:559 +#: lib/choose_rev.tcl:565 msgid "URL" msgstr "URL" @@ -1337,10 +2409,10 @@ msgid "" "You are about to create the initial commit. There is no commit before this " "to amend.\n" msgstr "" -"Keine Version zur Nachbesserung vorhanden.\n" +"Kein Commit zur Nachbesserung vorhanden.\n" "\n" -"Sie sind dabei, die erste Version zu รผbertragen. Es gibt keine existierende " -"Version, die Sie nachbessern kรถnnten.\n" +"Sie sind dabei, den ersten Commit zu erstellen. Es gibt keinen existierenden " +"Commit, den Sie nachbessern kรถnnten.\n" #: lib/commit.tcl:18 msgid "" @@ -1350,31 +2422,31 @@ msgid "" "completed. You cannot amend the prior commit unless you first abort the " "current merge activity.\n" msgstr "" -"Nachbesserung wรคhren Zusammenfรผhrung nicht mรถglich.\n" +"Nachbesserung bei Zusammenfรผhrung nicht mรถglich.\n" "\n" -"Sie haben das Zusammenfรผhren von Versionen angefangen, aber noch nicht " -"beendet. Sie kรถnnen keine vorige รbertragung nachbessern, solange eine " +"Sie haben das Zusammenfรผhren von Commits angefangen, aber noch nicht " +"beendet. Sie kรถnnen keinen vorigen Commit nachbessern, solange eine " "unfertige Zusammenfรผhrung existiert. Dazu mรผssen Sie die Zusammenfรผhrung " "beenden oder abbrechen.\n" -#: lib/commit.tcl:48 +#: lib/commit.tcl:56 msgid "Error loading commit data for amend:" -msgstr "Fehler beim Laden der Versionsdaten fรผr Nachbessern:" +msgstr "Fehler beim Laden der Commitdaten fรผr Nachbessern:" -#: lib/commit.tcl:75 +#: lib/commit.tcl:83 msgid "Unable to obtain your identity:" msgstr "Benutzername konnte nicht bestimmt werden:" -#: lib/commit.tcl:80 +#: lib/commit.tcl:88 msgid "Invalid GIT_COMMITTER_IDENT:" msgstr "Ungรผltiger Wert von GIT_COMMITTER_INDENT:" -#: lib/commit.tcl:129 +#: lib/commit.tcl:138 #, tcl-format msgid "warning: Tcl does not support encoding '%s'." msgstr "Warning: Tcl/Tk unterstรผtzt die Zeichencodierung ยป%sยซ nicht." -#: lib/commit.tcl:149 +#: lib/commit.tcl:158 msgid "" "Last scanned state does not match repository state.\n" "\n" @@ -1383,14 +2455,14 @@ msgid "" "\n" "The rescan will be automatically started now.\n" msgstr "" -"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv รผberein.\n" +"Der letzte geladene Status stimmt nicht mehr mit dem Repository รผberein.\n" "\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" +"Ein anderes Git-Programm hat das Repository seit dem letzten Laden " +"geรคndert. Vor dem nรคchsten Commit muss neu geladen werden.\n" "\n" "Es wird gleich neu geladen.\n" -#: lib/commit.tcl:172 +#: lib/commit.tcl:182 #, tcl-format msgid "" "Unmerged files cannot be committed.\n" @@ -1398,12 +2470,13 @@ 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 eingetragen werden.\n" +"Nicht zusammengefรผhrte Dateien kรถnnen nicht committet werden.\n" "\n" "Die Datei ยป%sยซ hat noch nicht aufgelรถste Zusammenfรผhrungs-Konflikte. Sie " -"mรผssen diese Konflikte auflรถsen, bevor Sie eintragen kรถnnen.\n" +"mรผssen diese Konflikte auflรถsen und die Dateien in die Bereitstellung " +"hinzufรผgen, bevor Sie committen kรถnnen.\n" -#: lib/commit.tcl:180 +#: lib/commit.tcl:190 #, tcl-format msgid "" "Unknown file state %s detected.\n" @@ -1412,19 +2485,19 @@ msgid "" msgstr "" "Unbekannter Dateizustand ยป%sยซ.\n" "\n" -"Datei ยป%sยซ kann nicht eingetragen werden.\n" +"Datei ยป%sยซ kann nicht committet werden.\n" -#: lib/commit.tcl:188 +#: lib/commit.tcl:198 msgid "" "No changes to commit.\n" "\n" "You must stage at least 1 file before you can commit.\n" msgstr "" -"Keine รnderungen vorhanden, die eingetragen werden kรถnnten.\n" +"Keine รnderungen vorhanden, die committet werden kรถnnten.\n" "\n" -"Sie mรผssen mindestens eine Datei bereitstellen, bevor Sie eintragen kรถnnen.\n" +"Sie mรผssen mindestens eine Datei bereitstellen, bevor Sie committen kรถnnen.\n" -#: lib/commit.tcl:203 +#: lib/commit.tcl:213 msgid "" "Please supply a commit message.\n" "\n" @@ -1444,42 +2517,58 @@ msgstr "" "\n" "- Rest: Eine ausfรผhrliche Beschreibung, warum diese รnderung hilfreich ist.\n" -#: lib/commit.tcl:234 +#: lib/commit.tcl:244 msgid "Calling pre-commit hook..." -msgstr "Aufrufen der Vor-Eintragen-Kontrolle (ยปpre-commit hookยซ)..." +msgstr "Aufrufen des ยปpre-commit hookยซ..." -#: lib/commit.tcl:249 +#: lib/commit.tcl:259 msgid "Commit declined by pre-commit hook." -msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (ยปpre-commit hookยซ)." +msgstr "Committen abgelehnt durch ยปpre-commit hookยซ." -#: lib/commit.tcl:272 +#: 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 msgid "Calling commit-msg hook..." -msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle (ยปcommit-message hookยซ)..." +msgstr "Aufrufen des ยปcommit-msg hookยซ..." -#: lib/commit.tcl:287 +#: lib/commit.tcl:314 msgid "Commit declined by commit-msg hook." -msgstr "" -"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (ยปcommit-message " -"hookยซ)." +msgstr "Committen abgelehnt durch ยปcommit-msg hookยซ." -#: lib/commit.tcl:300 +#: lib/commit.tcl:327 msgid "Committing changes..." -msgstr "รnderungen eintragen..." +msgstr "รnderungen committen..." -#: lib/commit.tcl:316 +#: lib/commit.tcl:344 msgid "write-tree failed:" msgstr "write-tree fehlgeschlagen:" -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 +#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422 msgid "Commit failed." -msgstr "Eintragen fehlgeschlagen." +msgstr "Committen fehlgeschlagen." -#: lib/commit.tcl:334 +#: lib/commit.tcl:362 #, tcl-format msgid "Commit %s appears to be corrupt" msgstr "Version ยป%sยซ scheint beschรคdigt zu sein" -#: lib/commit.tcl:339 +#: lib/commit.tcl:367 msgid "" "No changes to commit.\n" "\n" @@ -1487,70 +2576,104 @@ msgid "" "\n" "A rescan will be automatically started now.\n" msgstr "" -"Keine รnderungen einzutragen.\n" +"Keine รnderungen zum committen.\n" "\n" -"Es gibt keine geรคnderte Datei bei dieser Version und es wurde auch nichts " +"Es gibt keine geรคnderte Datei in diesem Commit und es wurde auch nichts " "zusammengefรผhrt.\n" "\n" "Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n" -#: lib/commit.tcl:346 +#: lib/commit.tcl:374 msgid "No changes to commit." -msgstr "Keine รnderungen, die eingetragen werden kรถnnen." +msgstr "Keine รnderungen, die committet werden kรถnnen." -#: lib/commit.tcl:360 +#: lib/commit.tcl:394 msgid "commit-tree failed:" msgstr "commit-tree fehlgeschlagen:" -#: lib/commit.tcl:381 +#: lib/commit.tcl:421 msgid "update-ref failed:" msgstr "update-ref fehlgeschlagen:" -#: lib/commit.tcl:469 +#: lib/commit.tcl:514 #, tcl-format msgid "Created commit %s: %s" -msgstr "Version %s รผbertragen: %s" +msgstr "Commit %s erstellt: %s" -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Verarbeitung. Bitte warten..." +#: lib/branch_delete.tcl:16 +#, tcl-format +msgid "%s (%s): Delete Branch" +msgstr "%s (%s): Branch lรถschen" -#: lib/console.tcl:186 -msgid "Success" -msgstr "Erfolgreich" +#: lib/branch_delete.tcl:21 +msgid "Delete Local Branch" +msgstr "Lokalen Branch lรถschen" -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Fehler: Kommando fehlgeschlagen" +#: lib/branch_delete.tcl:39 +msgid "Local Branches" +msgstr "Lokale Branches" -#: lib/database.tcl:43 +#: lib/branch_delete.tcl:51 +msgid "Delete Only If Merged Into" +msgstr "Nur lรถschen, wenn zusammengefรผhrt nach" + +#: 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/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"Fehler beim Lรถschen der Branches:\n" +"%s" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "Ungรผltiges Datum von Git: %s" + +#: lib/database.tcl:42 msgid "Number of loose objects" msgstr "Anzahl unverknรผpfter Objekte" -#: lib/database.tcl:44 +#: lib/database.tcl:43 msgid "Disk space used by loose objects" msgstr "Festplattenplatz von unverknรผpften Objekten" -#: lib/database.tcl:45 +#: lib/database.tcl:44 msgid "Number of packed objects" msgstr "Anzahl komprimierter Objekte" -#: lib/database.tcl:46 +#: lib/database.tcl:45 msgid "Number of packs" msgstr "Anzahl Komprimierungseinheiten" -#: lib/database.tcl:47 +#: lib/database.tcl:46 msgid "Disk space used by packed objects" msgstr "Festplattenplatz von komprimierten Objekten" -#: lib/database.tcl:48 +#: lib/database.tcl:47 msgid "Packed objects waiting for pruning" msgstr "Komprimierte Objekte, die zum Aufrรคumen vorgesehen sind" -#: lib/database.tcl:49 +#: lib/database.tcl:48 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" @@ -1569,214 +2692,37 @@ msgid "" "\n" "Compress the database now?" msgstr "" -"Dieses Projektarchiv enthรคlt ungefรคhr %i nicht verknรผpfte Objekte.\n" +"Dieses Repository enthรคlt ungefรคhr %i nicht verknรผpfte Objekte.\n" "\n" -"Fรผr eine optimale Performance wird empfohlen, die Datenbank des Projektarchivs zu komprimieren.\n" +"Fรผr eine optimale Performance wird empfohlen, die Datenbank des Repository " +"zu komprimieren.\n" "\n" "Soll die Datenbank jetzt komprimiert werden?" -#: lib/date.tcl:25 +#: lib/error.tcl:20 #, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Ungรผltiges Datum von Git: %s" - -#: lib/diff.tcl:64 -#, 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: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/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 "Unable to display %s" -msgstr "Datei ยป%sยซ kann nicht angezeigt werden" - -#: 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" +msgid "%s: error" +msgstr "%s: 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 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/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" +msgid "%s: warning" +msgstr "%s: Warnung" -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "Bereit zum Eintragen." - -#: lib/index.tcl:341 +#: lib/error.tcl:80 #, tcl-format -msgid "Adding %s" -msgstr "ยป%sยซ hinzufรผgen..." +msgid "%s hook failed:" +msgstr "%s hook fehlgeschlagen:" -#: 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." +#: lib/error.tcl:96 +msgid "You must correct the above errors before committing." 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" +"Sie mรผssen die obigen Fehler zuerst beheben, bevor Sie committen kรถnnen." -#: lib/index.tcl:433 +#: lib/error.tcl:116 #, tcl-format -msgid "Reverting %s" -msgstr "รnderungen in %s verwerfen" +msgid "%s (%s): error" +msgstr "%s (%s): Fehler" #: lib/merge.tcl:13 msgid "" @@ -1786,7 +2732,7 @@ msgid "" msgstr "" "Zusammenfรผhren kann nicht gleichzeitig mit Nachbessern durchgefรผhrt werden.\n" "\n" -"Sie mรผssen zuerst die Nachbesserungs-Version abschlieรen, bevor Sie " +"Sie mรผssen zuerst den Nachbesserungs-Commit abschlieรen, bevor Sie " "zusammenfรผhren kรถnnen.\n" #: lib/merge.tcl:27 @@ -1798,9 +2744,9 @@ msgid "" "\n" "The rescan will be automatically started now.\n" msgstr "" -"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv รผberein.\n" +"Der letzte geladene Status stimmt nicht mehr mit dem Repository รผberein.\n" "\n" -"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " +"Ein anderes Git-Programm hat das Repository seit dem letzten Laden " "geรคndert. Vor einem Zusammenfรผhren muss neu geladen werden.\n" "\n" "Es wird gleich neu geladen.\n" @@ -1817,10 +2763,11 @@ msgid "" msgstr "" "Zusammenfรผhrung mit Konflikten.\n" "\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" +"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" #: lib/merge.tcl:55 #, tcl-format @@ -1834,39 +2781,45 @@ msgid "" msgstr "" "Es liegen รnderungen vor.\n" "\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" +"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" -#: lib/merge.tcl:107 +#: lib/merge.tcl:108 #, tcl-format msgid "%s of %s" msgstr "%s von %s" -#: lib/merge.tcl:120 +#: lib/merge.tcl:126 #, tcl-format msgid "Merging %s and %s..." msgstr "Zusammenfรผhren von %s und %s..." -#: lib/merge.tcl:131 +#: lib/merge.tcl:137 msgid "Merge completed successfully." msgstr "Zusammenfรผhren erfolgreich abgeschlossen." -#: lib/merge.tcl:133 +#: lib/merge.tcl:139 msgid "Merge failed. Conflict resolution is required." msgstr "Zusammenfรผhren fehlgeschlagen. Konfliktauflรถsung ist notwendig." -#: lib/merge.tcl:158 +#: lib/merge.tcl:156 +#, tcl-format +msgid "%s (%s): Merge" +msgstr "%s (%s): Zusammenfรผhren" + +#: lib/merge.tcl:164 #, tcl-format msgid "Merge Into %s" msgstr "Zusammenfรผhren in ยป%sยซ" -#: lib/merge.tcl:177 +#: lib/merge.tcl:183 msgid "Revision To Merge" msgstr "Zusammenzufรผhrende Version" -#: lib/merge.tcl:212 +#: lib/merge.tcl:218 msgid "" "Cannot abort while amending.\n" "\n" @@ -1874,9 +2827,9 @@ msgid "" msgstr "" "Abbruch der Nachbesserung ist nicht mรถglich.\n" "\n" -"Sie mรผssen die Nachbesserung der Version abschlieรen.\n" +"Sie mรผssen die Nachbesserung diese Commits abschlieรen.\n" -#: lib/merge.tcl:222 +#: lib/merge.tcl:228 msgid "" "Abort merge?\n" "\n" @@ -1886,12 +2839,11 @@ msgid "" msgstr "" "Zusammenfรผhren abbrechen?\n" "\n" -"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen รnderungen " -"verloren.\n" +"Wenn Sie abbrechen, gehen alle noch nicht committeten รnderungen verloren.\n" "\n" "Zusammenfรผhren jetzt abbrechen?" -#: lib/merge.tcl:228 +#: lib/merge.tcl:234 msgid "" "Reset changes?\n" "\n" @@ -1899,694 +2851,24 @@ msgid "" "\n" "Continue with resetting the current changes?" msgstr "" -"รnderungen zurรผcksetzen?\n" +"รnderungen verwerfen?\n" "\n" -"Wenn Sie zurรผcksetzen, gehen alle noch nicht eingetragenen รnderungen " -"verloren.\n" +"Alle noch nicht committeten รnderungen wรผrden verloren gehen.\n" "\n" -"รnderungen jetzt zurรผcksetzen?" +"รnderungen jetzt verwerfen?" -#: lib/merge.tcl:239 +#: lib/merge.tcl:246 msgid "Aborting" msgstr "Abbruch" -#: lib/merge.tcl:239 +#: lib/merge.tcl:247 msgid "files reset" msgstr "Dateien zurรผckgesetzt" -#: lib/merge.tcl:267 +#: lib/merge.tcl:277 msgid "Abort failed." msgstr "Abbruch fehlgeschlagen." -#: lib/merge.tcl:269 +#: lib/merge.tcl:279 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 0c94f9c2c6..b79ed4e133 100644 --- a/third_party/git/git-gui/po/git-gui.pot +++ b/third_party/git/git-gui/po/git-gui.pot @@ -8,41 +8,42 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" +"POT-Creation-Date: 2020-02-08 22:54+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" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: 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 +#: git-gui.sh:847 #, tcl-format msgid "Invalid font specified in %s:" msgstr "" -#: git-gui.sh:779 +#: git-gui.sh:901 msgid "Main Font" msgstr "" -#: git-gui.sh:780 +#: git-gui.sh:902 msgid "Diff/Console Font" msgstr "" -#: git-gui.sh:794 +#: 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 msgid "Cannot find git in PATH." msgstr "" -#: git-gui.sh:821 +#: git-gui.sh:945 msgid "Cannot parse Git version string:" msgstr "" -#: git-gui.sh:839 +#: git-gui.sh:970 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -54,473 +55,518 @@ msgid "" "Assume '%s' is version 1.5.0?\n" msgstr "" -#: git-gui.sh:1128 +#: git-gui.sh:1267 msgid "Git directory not found:" msgstr "" -#: git-gui.sh:1146 +#: git-gui.sh:1301 msgid "Cannot move to top of working directory:" msgstr "" -#: git-gui.sh:1154 +#: git-gui.sh:1309 msgid "Cannot use bare repository:" msgstr "" -#: git-gui.sh:1162 +#: git-gui.sh:1317 msgid "No working directory" msgstr "" -#: git-gui.sh:1334 lib/checkout_op.tcl:306 +#: git-gui.sh:1491 lib/checkout_op.tcl:306 msgid "Refreshing file status..." msgstr "" -#: git-gui.sh:1390 +#: git-gui.sh:1551 msgid "Scanning for modified files ..." msgstr "" -#: git-gui.sh:1454 +#: git-gui.sh:1629 msgid "Calling prepare-commit-msg hook..." msgstr "" -#: git-gui.sh:1471 +#: git-gui.sh:1646 msgid "Commit declined by prepare-commit-msg hook." msgstr "" -#: git-gui.sh:1629 lib/browser.tcl:246 +#: git-gui.sh:1804 lib/browser.tcl:252 msgid "Ready." msgstr "" -#: git-gui.sh:1787 +#: git-gui.sh:1968 #, tcl-format -msgid "Displaying only %s of %s files." +msgid "" +"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." msgstr "" -#: git-gui.sh:1913 +#: git-gui.sh:2091 msgid "Unmodified" msgstr "" -#: git-gui.sh:1915 +#: git-gui.sh:2093 msgid "Modified, not staged" msgstr "" -#: git-gui.sh:1916 git-gui.sh:1924 +#: git-gui.sh:2094 git-gui.sh:2106 msgid "Staged for commit" msgstr "" -#: git-gui.sh:1917 git-gui.sh:1925 +#: git-gui.sh:2095 git-gui.sh:2107 msgid "Portions staged for commit" msgstr "" -#: git-gui.sh:1918 git-gui.sh:1926 +#: git-gui.sh:2096 git-gui.sh:2108 msgid "Staged for commit, missing" msgstr "" -#: git-gui.sh:1920 +#: git-gui.sh:2098 msgid "File type changed, not staged" msgstr "" -#: git-gui.sh:1921 +#: git-gui.sh:2099 git-gui.sh:2100 +msgid "File type changed, old type staged for commit" +msgstr "" + +#: git-gui.sh:2101 msgid "File type changed, staged" msgstr "" -#: git-gui.sh:1923 +#: 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 msgid "Untracked, not staged" msgstr "" -#: git-gui.sh:1928 +#: git-gui.sh:2110 msgid "Missing" msgstr "" -#: git-gui.sh:1929 +#: git-gui.sh:2111 msgid "Staged for removal" msgstr "" -#: git-gui.sh:1930 +#: git-gui.sh:2112 msgid "Staged for removal, still present" msgstr "" -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 +#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 +#: git-gui.sh:2118 git-gui.sh:2119 msgid "Requires merge resolution" msgstr "" -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." +#: git-gui.sh:2164 +msgid "Couldn't find gitk in PATH" msgstr "" -#: git-gui.sh:1984 -msgid "Couldn't find gitk in PATH" +#: git-gui.sh:2210 git-gui.sh:2245 +#, tcl-format +msgid "Starting %s... please wait..." msgstr "" -#: git-gui.sh:2043 +#: git-gui.sh:2224 msgid "Couldn't find git gui in PATH" msgstr "" -#: git-gui.sh:2455 lib/choose_repository.tcl:36 +#: git-gui.sh:2726 lib/choose_repository.tcl:53 msgid "Repository" msgstr "" -#: git-gui.sh:2456 +#: git-gui.sh:2727 msgid "Edit" msgstr "" -#: git-gui.sh:2458 lib/choose_rev.tcl:561 +#: git-gui.sh:2729 lib/choose_rev.tcl:567 msgid "Branch" msgstr "" -#: git-gui.sh:2461 lib/choose_rev.tcl:548 +#: git-gui.sh:2732 lib/choose_rev.tcl:554 msgid "Commit@@noun" msgstr "" -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174 msgid "Merge" msgstr "" -#: git-gui.sh:2465 lib/choose_rev.tcl:557 +#: git-gui.sh:2736 lib/choose_rev.tcl:563 msgid "Remote" msgstr "" -#: git-gui.sh:2468 +#: git-gui.sh:2739 msgid "Tools" msgstr "" -#: git-gui.sh:2477 +#: git-gui.sh:2748 msgid "Explore Working Copy" msgstr "" -#: git-gui.sh:2483 +#: git-gui.sh:2763 +msgid "Git Bash" +msgstr "" + +#: git-gui.sh:2772 msgid "Browse Current Branch's Files" msgstr "" -#: git-gui.sh:2487 +#: git-gui.sh:2776 msgid "Browse Branch Files..." msgstr "" -#: git-gui.sh:2492 +#: git-gui.sh:2781 msgid "Visualize Current Branch's History" msgstr "" -#: git-gui.sh:2496 +#: git-gui.sh:2785 msgid "Visualize All Branch History" msgstr "" -#: git-gui.sh:2503 +#: git-gui.sh:2792 #, tcl-format msgid "Browse %s's Files" msgstr "" -#: git-gui.sh:2505 +#: git-gui.sh:2794 #, tcl-format msgid "Visualize %s's History" msgstr "" -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 +#: git-gui.sh:2799 lib/database.tcl:40 msgid "Database Statistics" msgstr "" -#: git-gui.sh:2513 lib/database.tcl:34 +#: git-gui.sh:2802 lib/database.tcl:33 msgid "Compress Database" msgstr "" -#: git-gui.sh:2516 +#: git-gui.sh:2805 msgid "Verify Database" msgstr "" -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820 msgid "Create Desktop Icon" msgstr "" -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217 msgid "Quit" msgstr "" -#: git-gui.sh:2547 +#: git-gui.sh:2836 msgid "Undo" msgstr "" -#: git-gui.sh:2550 +#: git-gui.sh:2839 msgid "Redo" msgstr "" -#: git-gui.sh:2554 git-gui.sh:3109 +#: git-gui.sh:2843 git-gui.sh:3461 msgid "Cut" msgstr "" -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 +#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633 #: lib/console.tcl:69 msgid "Copy" msgstr "" -#: git-gui.sh:2560 git-gui.sh:3115 +#: git-gui.sh:2849 git-gui.sh:3467 msgid "Paste" msgstr "" -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 +#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39 +#: lib/branch_delete.tcl:28 msgid "Delete" msgstr "" -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 +#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71 msgid "Select All" msgstr "" -#: git-gui.sh:2576 +#: git-gui.sh:2865 msgid "Create..." msgstr "" -#: git-gui.sh:2582 +#: git-gui.sh:2871 msgid "Checkout..." msgstr "" -#: git-gui.sh:2588 +#: git-gui.sh:2877 msgid "Rename..." msgstr "" -#: git-gui.sh:2593 +#: git-gui.sh:2882 msgid "Delete..." msgstr "" -#: git-gui.sh:2598 +#: git-gui.sh:2887 msgid "Reset..." msgstr "" -#: git-gui.sh:2608 +#: git-gui.sh:2897 msgid "Done" msgstr "" -#: git-gui.sh:2610 +#: git-gui.sh:2899 msgid "Commit@@verb" msgstr "" -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "" - -#: git-gui.sh:2627 git-gui.sh:3057 +#: git-gui.sh:2908 git-gui.sh:3400 msgid "Amend Last Commit" msgstr "" -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 +#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101 msgid "Rescan" msgstr "" -#: git-gui.sh:2643 +#: git-gui.sh:2924 msgid "Stage To Commit" msgstr "" -#: git-gui.sh:2649 +#: git-gui.sh:2930 msgid "Stage Changed Files To Commit" msgstr "" -#: git-gui.sh:2655 +#: git-gui.sh:2936 msgid "Unstage From Commit" msgstr "" -#: git-gui.sh:2661 lib/index.tcl:412 +#: git-gui.sh:2942 lib/index.tcl:521 msgid "Revert Changes" msgstr "" -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 +#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731 msgid "Show Less Context" msgstr "" -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 +#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735 msgid "Show More Context" msgstr "" -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 +#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485 msgid "Sign Off" msgstr "" -#: git-gui.sh:2696 +#: git-gui.sh:2977 msgid "Local Merge..." msgstr "" -#: git-gui.sh:2701 +#: git-gui.sh:2982 msgid "Abort Merge..." msgstr "" -#: git-gui.sh:2713 git-gui.sh:2741 +#: git-gui.sh:2994 git-gui.sh:3022 msgid "Add..." msgstr "" -#: git-gui.sh:2717 +#: git-gui.sh:2998 msgid "Push..." msgstr "" -#: git-gui.sh:2721 +#: git-gui.sh:3002 msgid "Delete Branch..." msgstr "" -#: git-gui.sh:2731 git-gui.sh:3292 +#: git-gui.sh:3012 git-gui.sh:3666 msgid "Options..." msgstr "" -#: git-gui.sh:2742 +#: git-gui.sh:3023 msgid "Remove..." msgstr "" -#: git-gui.sh:2751 lib/choose_repository.tcl:50 +#: git-gui.sh:3032 lib/choose_repository.tcl:67 msgid "Help" msgstr "" -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 +#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61 +#: lib/choose_repository.tcl:70 lib/about.tcl:14 #, tcl-format msgid "About %s" msgstr "" -#: git-gui.sh:2783 +#: git-gui.sh:3064 msgid "Online Documentation" msgstr "" -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73 msgid "Show SSH Key" msgstr "" -#: git-gui.sh:2893 +#: 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 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" msgstr "" -#: git-gui.sh:2926 +#: git-gui.sh:3246 msgid "Current Branch:" msgstr "" -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" +#: git-gui.sh:3271 +msgid "Unstaged Changes" msgstr "" -#: git-gui.sh:2967 -msgid "Unstaged Changes" +#: git-gui.sh:3293 +msgid "Staged Changes (Will Commit)" msgstr "" -#: git-gui.sh:3017 +#: git-gui.sh:3367 msgid "Stage Changed" msgstr "" -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 +#: git-gui.sh:3386 lib/transport.tcl:137 msgid "Push" msgstr "" -#: git-gui.sh:3071 +#: git-gui.sh:3413 msgid "Initial Commit Message:" msgstr "" -#: git-gui.sh:3072 +#: git-gui.sh:3414 msgid "Amended Commit Message:" msgstr "" -#: git-gui.sh:3073 +#: git-gui.sh:3415 msgid "Amended Initial Commit Message:" msgstr "" -#: git-gui.sh:3074 +#: git-gui.sh:3416 msgid "Amended Merge Commit Message:" msgstr "" -#: git-gui.sh:3075 +#: git-gui.sh:3417 msgid "Merge Commit Message:" msgstr "" -#: git-gui.sh:3076 +#: git-gui.sh:3418 msgid "Commit Message:" msgstr "" -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 +#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73 msgid "Copy All" msgstr "" -#: git-gui.sh:3149 lib/blame.tcl:104 +#: git-gui.sh:3501 lib/blame.tcl:106 msgid "File:" msgstr "" -#: git-gui.sh:3255 +#: git-gui.sh:3549 lib/choose_repository.tcl:1100 +msgid "Open" +msgstr "" + +#: git-gui.sh:3629 msgid "Refresh" msgstr "" -#: git-gui.sh:3276 +#: git-gui.sh:3650 msgid "Decrease Font Size" msgstr "" -#: git-gui.sh:3280 +#: git-gui.sh:3654 msgid "Increase Font Size" msgstr "" -#: git-gui.sh:3288 lib/blame.tcl:281 +#: git-gui.sh:3662 lib/blame.tcl:296 msgid "Encoding" msgstr "" -#: git-gui.sh:3299 +#: git-gui.sh:3673 msgid "Apply/Reverse Hunk" msgstr "" -#: git-gui.sh:3304 +#: git-gui.sh:3678 msgid "Apply/Reverse Line" msgstr "" -#: git-gui.sh:3323 +#: 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 msgid "Run Merge Tool" msgstr "" -#: git-gui.sh:3328 +#: git-gui.sh:3718 msgid "Use Remote Version" msgstr "" -#: git-gui.sh:3332 +#: git-gui.sh:3722 msgid "Use Local Version" msgstr "" -#: git-gui.sh:3336 +#: git-gui.sh:3726 msgid "Revert To Base" msgstr "" -#: git-gui.sh:3354 +#: git-gui.sh:3744 msgid "Visualize These Changes In The Submodule" msgstr "" -#: git-gui.sh:3358 +#: git-gui.sh:3748 msgid "Visualize Current Branch History In The Submodule" msgstr "" -#: git-gui.sh:3362 +#: git-gui.sh:3752 msgid "Visualize All Branch History In The Submodule" msgstr "" -#: git-gui.sh:3367 +#: git-gui.sh:3757 msgid "Start git gui In The Submodule" msgstr "" -#: git-gui.sh:3389 +#: git-gui.sh:3793 msgid "Unstage Hunk From Commit" msgstr "" -#: git-gui.sh:3391 +#: git-gui.sh:3797 msgid "Unstage Lines From Commit" msgstr "" -#: git-gui.sh:3393 +#: git-gui.sh:3798 git-gui.sh:3809 +msgid "Revert Lines" +msgstr "" + +#: git-gui.sh:3800 msgid "Unstage Line From Commit" msgstr "" -#: git-gui.sh:3396 +#: git-gui.sh:3804 msgid "Stage Hunk For Commit" msgstr "" -#: git-gui.sh:3398 +#: git-gui.sh:3808 msgid "Stage Lines For Commit" msgstr "" -#: git-gui.sh:3400 +#: git-gui.sh:3811 msgid "Stage Line For Commit" msgstr "" -#: git-gui.sh:3424 +#: git-gui.sh:3861 msgid "Initializing..." msgstr "" -#: git-gui.sh:3541 +#: git-gui.sh:4017 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -531,14 +577,14 @@ msgid "" "\n" msgstr "" -#: git-gui.sh:3570 +#: git-gui.sh:4046 msgid "" "\n" "This is due to a known issue with the\n" "Tcl binary distributed by Cygwin." msgstr "" -#: git-gui.sh:3575 +#: git-gui.sh:4051 #, tcl-format msgid "" "\n" @@ -549,1846 +595,2072 @@ msgid "" "~/.gitconfig file.\n" msgstr "" -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" msgstr "" -#: lib/blame.tcl:72 -msgid "File Viewer" +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" msgstr "" -#: lib/blame.tcl:78 -msgid "Commit:" +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" msgstr "" -#: lib/blame.tcl:271 -msgid "Copy Commit" +#: lib/spellcheck.tcl:70 +#, tcl-format +msgid "Reverting dictionary to %s." msgstr "" -#: lib/blame.tcl:275 -msgid "Find Text..." +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" msgstr "" -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" msgstr "" -#: lib/blame.tcl:288 -msgid "Show History Context" +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" msgstr "" -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" msgstr "" -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" msgstr "" -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." +#: lib/transport.tcl:6 lib/remote_add.tcl:132 +#, tcl-format +msgid "fetch %s" msgstr "" -#: lib/blame.tcl:577 -msgid "lines annotated" +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" msgstr "" -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" msgstr "" -#: lib/blame.tcl:772 -msgid "Annotation complete." +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" msgstr "" -#: lib/blame.tcl:802 -msgid "Busy" +#: lib/transport.tcl:25 +msgid "fetch all remotes" msgstr "" -#: lib/blame.tcl:803 -msgid "Annotation process is already running." +#: lib/transport.tcl:26 +msgid "Fetching new changes from all remotes" msgstr "" -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." +#: lib/transport.tcl:40 +msgid "remote prune all remotes" msgstr "" -#: lib/blame.tcl:910 -msgid "Loading annotation..." +#: lib/transport.tcl:41 +msgid "Pruning tracking branches deleted from all remotes" msgstr "" -#: lib/blame.tcl:963 -msgid "Author:" +#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 +#: lib/remote_add.tcl:162 +#, tcl-format +msgid "push %s" msgstr "" -#: lib/blame.tcl:967 -msgid "Committer:" +#: lib/transport.tcl:55 +#, tcl-format +msgid "Pushing changes to %s" msgstr "" -#: lib/blame.tcl:972 -msgid "Original File:" +#: lib/transport.tcl:93 +#, tcl-format +msgid "Mirroring to %s" msgstr "" -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" +#: lib/transport.tcl:111 +#, tcl-format +msgid "Pushing %s %s to %s" msgstr "" -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" +#: lib/transport.tcl:132 +msgid "Push Branches" msgstr "" -#: lib/blame.tcl:1090 -msgid "Unable to display parent" +#: 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" msgstr "" -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" +#: lib/transport.tcl:147 +msgid "Source Branches" msgstr "" -#: lib/blame.tcl:1231 -msgid "Originally By:" +#: lib/transport.tcl:162 +msgid "Destination Repository" msgstr "" -#: lib/blame.tcl:1237 -msgid "In File:" +#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 +msgid "Remote:" msgstr "" -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" +#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 +msgid "Arbitrary Location:" msgstr "" -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" +#: lib/transport.tcl:205 +msgid "Transfer Options" msgstr "" -#: lib/branch_checkout.tcl:23 -msgid "Checkout" +#: lib/transport.tcl:207 +msgid "Force overwrite existing branch (may discard changes)" msgstr "" -#: 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" +#: lib/transport.tcl:211 +msgid "Use thin pack (for slow network connections)" msgstr "" -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" +#: lib/transport.tcl:215 +msgid "Include tags" msgstr "" -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" +#: lib/transport.tcl:229 +#, tcl-format +msgid "%s (%s): Push" msgstr "" -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" +#: lib/checkout_op.tcl:85 +#, tcl-format +msgid "Fetching %s from %s" msgstr "" -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" +#: lib/checkout_op.tcl:133 +#, tcl-format +msgid "fatal: Cannot resolve %s" msgstr "" -#: lib/branch_create.tcl:22 -msgid "Create Branch" +#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81 +#: lib/database.tcl:30 +msgid "Close" msgstr "" -#: lib/branch_create.tcl:27 -msgid "Create New Branch" +#: lib/checkout_op.tcl:175 +#, tcl-format +msgid "Branch '%s' does not exist." msgstr "" -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 -msgid "Create" +#: lib/checkout_op.tcl:194 +#, tcl-format +msgid "Failed to configure simplified git-pull for '%s'." msgstr "" -#: lib/branch_create.tcl:40 -msgid "Branch Name" +#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 +#, tcl-format +msgid "Branch '%s' already exists." msgstr "" -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" +#: 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/branch_create.tcl:58 -msgid "Match Tracking Branch Name" +#: lib/checkout_op.tcl:243 +#, tcl-format +msgid "Merge strategy '%s' not supported." msgstr "" -#: lib/branch_create.tcl:66 -msgid "Starting Revision" +#: lib/checkout_op.tcl:262 +#, tcl-format +msgid "Failed to update '%s'." msgstr "" -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" +#: lib/checkout_op.tcl:274 +msgid "Staging area (index) is already locked." msgstr "" -#: lib/branch_create.tcl:75 -msgid "No" +#: 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/branch_create.tcl:80 -msgid "Fast Forward Only" +#: lib/checkout_op.tcl:345 +#, tcl-format +msgid "Updating working directory to '%s'..." msgstr "" -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" +#: lib/checkout_op.tcl:346 +msgid "files checked out" msgstr "" -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" +#: lib/checkout_op.tcl:377 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." msgstr "" -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." +#: lib/checkout_op.tcl:378 +msgid "File level merge required." msgstr "" -#: lib/branch_create.tcl:140 +#: lib/checkout_op.tcl:382 #, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." +msgid "Staying on branch '%s'." msgstr "" -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." +#: 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'." msgstr "" -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508 #, tcl-format -msgid "'%s' is not an acceptable branch name." +msgid "Checked out '%s'." msgstr "" -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" +#: lib/checkout_op.tcl:536 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" msgstr "" -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" +#: lib/checkout_op.tcl:558 +msgid "Recovering lost commits may not be easy." msgstr "" -#: lib/branch_delete.tcl:37 -msgid "Local Branches" +#: lib/checkout_op.tcl:563 +#, tcl-format +msgid "Reset '%s'?" msgstr "" -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" +#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170 +msgid "Visualize" msgstr "" -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" +#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85 +msgid "Reset" msgstr "" -#: lib/branch_delete.tcl:103 +#: lib/checkout_op.tcl:636 #, 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 "" -"Recovering deleted branches is difficult.\n" +"Failed to set current branch.\n" "\n" -"Delete the selected branches?" +"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_delete.tcl:141 +#: lib/remote_add.tcl:20 #, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" +msgid "%s (%s): Add Remote" msgstr "" -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" +#: lib/remote_add.tcl:25 +msgid "Add New Remote" msgstr "" -#: lib/branch_rename.tcl:26 -msgid "Rename" +#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 +msgid "Add" msgstr "" -#: lib/branch_rename.tcl:36 -msgid "Branch:" +#: lib/remote_add.tcl:39 +msgid "Remote Details" msgstr "" -#: lib/branch_rename.tcl:39 -msgid "New Name:" +#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 +msgid "Name:" msgstr "" -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." +#: lib/remote_add.tcl:50 +msgid "Location:" msgstr "" -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 +#: 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" +msgstr "" + +#: lib/remote_add.tcl:75 +msgid "Do Nothing Else Now" +msgstr "" + +#: lib/remote_add.tcl:100 +msgid "Please supply a remote name." +msgstr "" + +#: lib/remote_add.tcl:113 #, tcl-format -msgid "Branch '%s' already exists." +msgid "'%s' is not an acceptable remote name." msgstr "" -#: lib/branch_rename.tcl:117 +#: lib/remote_add.tcl:124 #, tcl-format -msgid "Failed to rename '%s'." +msgid "Failed to add remote '%s' of location '%s'." +msgstr "" + +#: lib/remote_add.tcl:133 +#, tcl-format +msgid "Fetching the %s" +msgstr "" + +#: lib/remote_add.tcl:156 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." +msgstr "" + +#: lib/remote_add.tcl:163 +#, tcl-format +msgid "Setting up the %s (at %s)" msgstr "" #: lib/browser.tcl:17 msgid "Starting..." msgstr "" -#: lib/browser.tcl:26 -msgid "File Browser" +#: lib/browser.tcl:27 +#, tcl-format +msgid "%s (%s): File Browser" msgstr "" -#: lib/browser.tcl:126 lib/browser.tcl:143 +#: lib/browser.tcl:132 lib/browser.tcl:149 #, tcl-format msgid "Loading %s..." msgstr "" -#: lib/browser.tcl:187 +#: lib/browser.tcl:193 msgid "[Up To Parent]" msgstr "" -#: lib/browser.tcl:267 lib/browser.tcl:273 +#: lib/browser.tcl:275 +#, tcl-format +msgid "%s (%s): Browse Branch Files" +msgstr "" + +#: lib/browser.tcl:282 msgid "Browse Branch Files" msgstr "" -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 +#: 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 "" -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" +#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 +msgid "Revision" msgstr "" -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" +#: lib/index.tcl:6 +msgid "Unable to unlock the index." msgstr "" -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" +#: lib/index.tcl:30 +msgid "Index Error" msgstr "" -#: lib/checkout_op.tcl:175 +#: 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 #, tcl-format -msgid "Branch '%s' does not exist." +msgid "Unstaging %s from commit" msgstr "" -#: lib/checkout_op.tcl:194 +#: lib/index.tcl:369 +msgid "Ready to commit." +msgstr "" + +#: lib/index.tcl:378 +msgid "Adding selected files" +msgstr "" + +#: lib/index.tcl:382 #, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." +msgid "Adding %s" msgstr "" -#: lib/checkout_op.tcl:229 +#: lib/index.tcl:412 #, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." +msgid "Stage %d untracked files?" msgstr "" -#: lib/checkout_op.tcl:243 +#: lib/index.tcl:420 +msgid "Adding all changed files" +msgstr "" + +#: lib/index.tcl:503 #, tcl-format -msgid "Merge strategy '%s' not supported." +msgid "Revert changes in file %s?" msgstr "" -#: lib/checkout_op.tcl:262 +#: lib/index.tcl:508 #, tcl-format -msgid "Failed to update '%s'." +msgid "Revert changes in these %i files?" msgstr "" -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." +#: lib/index.tcl:517 +msgid "Any unstaged changes will be permanently lost by the revert." 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/index.tcl:520 lib/index.tcl:563 +msgid "Do Nothing" msgstr "" -#: lib/checkout_op.tcl:345 +#: lib/index.tcl:545 #, tcl-format -msgid "Updating working directory to '%s'..." +msgid "Delete untracked file %s?" msgstr "" -#: lib/checkout_op.tcl:346 -msgid "files checked out" +#: lib/index.tcl:550 +#, tcl-format +msgid "Delete these %i untracked files?" msgstr "" -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." +#: lib/index.tcl:560 +msgid "Files will be permanently deleted." msgstr "" -#: lib/checkout_op.tcl:377 -msgid "File level merge required." +#: lib/index.tcl:564 +msgid "Delete Files" msgstr "" -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." +#: lib/index.tcl:586 +msgid "Deleting" msgstr "" -#: 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'." +#: lib/index.tcl:665 +msgid "Encountered errors deleting files:\n" msgstr "" -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#: lib/index.tcl:674 #, tcl-format -msgid "Checked out '%s'." +msgid "None of the %d selected files could be deleted." msgstr "" -#: lib/checkout_op.tcl:535 +#: lib/index.tcl:679 #, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" +msgid "%d of the %d selected files could not be deleted." msgstr "" -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." +#: lib/index.tcl:726 +msgid "Reverting selected files" msgstr "" -#: lib/checkout_op.tcl:562 +#: lib/index.tcl:730 #, tcl-format -msgid "Reset '%s'?" +msgid "Reverting %s" msgstr "" -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" +#: lib/branch_checkout.tcl:16 +#, tcl-format +msgid "%s (%s): Checkout Branch" msgstr "" -#: 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." +#: lib/branch_checkout.tcl:21 +msgid "Checkout Branch" msgstr "" -#: lib/choose_font.tcl:39 -msgid "Select" +#: lib/branch_checkout.tcl:26 +msgid "Checkout" msgstr "" -#: lib/choose_font.tcl:53 -msgid "Font Family" +#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 +msgid "Options" msgstr "" -#: lib/choose_font.tcl:74 -msgid "Font Size" +#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" msgstr "" -#: lib/choose_font.tcl:91 -msgid "Font Example" +#: lib/branch_checkout.tcl:47 +msgid "Detach From Local Branch" msgstr "" -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." +#: lib/status_bar.tcl:263 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" msgstr "" -#: lib/choose_repository.tcl:28 -msgid "Git Gui" +#: lib/remote.tcl:200 +msgid "Push to" msgstr "" -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 -msgid "Create New Repository" +#: lib/remote.tcl:218 +msgid "Remove Remote" msgstr "" -#: lib/choose_repository.tcl:93 -msgid "New..." +#: lib/remote.tcl:223 +msgid "Prune from" msgstr "" -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 -msgid "Clone Existing Repository" +#: lib/remote.tcl:228 +msgid "Fetch from" msgstr "" -#: lib/choose_repository.tcl:106 -msgid "Clone..." +#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264 +msgid "All" msgstr "" -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 -msgid "Open Existing Repository" +#: lib/branch_rename.tcl:15 +#, tcl-format +msgid "%s (%s): Rename Branch" msgstr "" -#: lib/choose_repository.tcl:119 -msgid "Open..." +#: lib/branch_rename.tcl:23 +msgid "Rename Branch" msgstr "" -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" +#: lib/branch_rename.tcl:28 +msgid "Rename" msgstr "" -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" +#: lib/branch_rename.tcl:38 +msgid "Branch:" msgstr "" -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 -#, tcl-format -msgid "Failed to create repository %s:" +#: lib/branch_rename.tcl:46 +msgid "New Name:" msgstr "" -#: lib/choose_repository.tcl:391 -msgid "Directory:" +#: lib/branch_rename.tcl:81 +msgid "Please select a branch to rename." msgstr "" -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 -msgid "Git Repository" +#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 +msgid "Please supply a branch name." msgstr "" -#: lib/choose_repository.tcl:448 +#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 #, tcl-format -msgid "Directory %s already exists." +msgid "'%s' is not an acceptable branch name." msgstr "" -#: lib/choose_repository.tcl:452 +#: lib/branch_rename.tcl:123 #, tcl-format -msgid "File %s already exists." +msgid "Failed to rename '%s'." msgstr "" -#: lib/choose_repository.tcl:466 -msgid "Clone" +#: lib/choose_font.tcl:41 +msgid "Select" msgstr "" -#: lib/choose_repository.tcl:479 -msgid "Source Location:" +#: lib/choose_font.tcl:55 +msgid "Font Family" msgstr "" -#: lib/choose_repository.tcl:490 -msgid "Target Directory:" +#: lib/choose_font.tcl:76 +msgid "Font Size" msgstr "" -#: lib/choose_repository.tcl:502 -msgid "Clone Type:" +#: lib/choose_font.tcl:93 +msgid "Font Example" msgstr "" -#: lib/choose_repository.tcl:508 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +#: lib/choose_font.tcl:105 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." msgstr "" -#: lib/choose_repository.tcl:514 -msgid "Full Copy (Slower, Redundant Backup)" +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" msgstr "" -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" +#: lib/option.tcl:19 +#, tcl-format +msgid "Invalid repo encoding '%s'" +msgstr "" + +#: lib/option.tcl:119 +msgid "Restore Defaults" +msgstr "" + +#: lib/option.tcl:123 +msgid "Save" msgstr "" -#: 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 +#: lib/option.tcl:133 #, tcl-format -msgid "Not a Git repository: %s" +msgid "%s Repository" msgstr "" -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." +#: lib/option.tcl:134 +msgid "Global (All Repositories)" msgstr "" -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." +#: lib/option.tcl:140 +msgid "User Name" msgstr "" -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." +#: lib/option.tcl:141 +msgid "Email Address" msgstr "" -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" +#: lib/option.tcl:143 +msgid "Summarize Merge Commits" msgstr "" -#: lib/choose_repository.tcl:640 -msgid "Counting objects" +#: lib/option.tcl:144 +msgid "Merge Verbosity" msgstr "" -#: lib/choose_repository.tcl:641 -msgid "buckets" +#: lib/option.tcl:145 +msgid "Show Diffstat After Merge" msgstr "" -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" +#: lib/option.tcl:146 +msgid "Use Merge Tool" msgstr "" -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." +#: lib/option.tcl:148 +msgid "Trust File Modification Timestamps" msgstr "" -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." +#: lib/option.tcl:149 +msgid "Prune Tracking Branches During Fetch" msgstr "" -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." +#: lib/option.tcl:150 +msgid "Match Tracking Branches" msgstr "" -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" +#: lib/option.tcl:151 +msgid "Use Textconv For Diffs and Blames" msgstr "" -#: lib/choose_repository.tcl:759 -msgid "Copying objects" +#: lib/option.tcl:152 +msgid "Blame Copy Only On Changed Files" msgstr "" -#: lib/choose_repository.tcl:760 -msgid "KiB" +#: lib/option.tcl:153 +msgid "Maximum Length of Recent Repositories List" msgstr "" -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" +#: lib/option.tcl:154 +msgid "Minimum Letters To Blame Copy On" msgstr "" -#: lib/choose_repository.tcl:794 -msgid "Linking objects" +#: lib/option.tcl:155 +msgid "Blame History Context Radius (days)" msgstr "" -#: lib/choose_repository.tcl:795 -msgid "objects" +#: lib/option.tcl:156 +msgid "Number of Diff Context Lines" msgstr "" -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" +#: lib/option.tcl:157 +msgid "Additional Diff Parameters" msgstr "" -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." +#: lib/option.tcl:158 +msgid "Commit Message Text Width" msgstr "" -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." +#: lib/option.tcl:159 +msgid "New Branch Name Template" msgstr "" -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." +#: lib/option.tcl:160 +msgid "Default File Contents Encoding" msgstr "" -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" +#: lib/option.tcl:161 +msgid "Warn before committing to a detached head" msgstr "" -#: lib/choose_repository.tcl:908 -msgid "Clone failed." +#: lib/option.tcl:162 +msgid "Staging of untracked files" msgstr "" -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." +#: lib/option.tcl:163 +msgid "Show untracked files" msgstr "" -#: lib/choose_repository.tcl:926 +#: lib/option.tcl:164 +msgid "Tab spacing" +msgstr "" + +#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282 +#: lib/database.tcl:57 #, tcl-format -msgid "Cannot resolve %s as a commit." +msgid "%s:" msgstr "" -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" +#: lib/option.tcl:210 +msgid "Change" msgstr "" -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" +#: lib/option.tcl:254 +msgid "Spelling Dictionary:" msgstr "" -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." +#: lib/option.tcl:284 +msgid "Change Font" msgstr "" -#: lib/choose_repository.tcl:1011 -msgid "Open" +#: lib/option.tcl:288 +#, tcl-format +msgid "Choose %s" msgstr "" -#: lib/choose_repository.tcl:1021 -msgid "Repository:" +#: lib/option.tcl:294 +msgid "pt." msgstr "" -#: lib/choose_repository.tcl:1072 +#: lib/option.tcl:308 +msgid "Preferences" +msgstr "" + +#: lib/option.tcl:345 +msgid "Failed to completely save options:" +msgstr "" + +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "" + +#: lib/encoding.tcl:448 #, tcl-format -msgid "Failed to open repository %s:" +msgid "System (%s)" msgstr "" -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" msgstr "" -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" +#: lib/tools.tcl:76 +#, tcl-format +msgid "Running %s requires a selected file." msgstr "" -#: lib/choose_rev.tcl:74 -msgid "Local Branch" +#: lib/tools.tcl:92 +#, tcl-format +msgid "Are you sure you want to run %1$s on file \"%2$s\"?" msgstr "" -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" +#: lib/tools.tcl:96 +#, tcl-format +msgid "Are you sure you want to run %s?" msgstr "" -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" +#: lib/tools.tcl:118 +#, tcl-format +msgid "Tool: %s" msgstr "" -#: lib/choose_rev.tcl:317 +#: lib/tools.tcl:119 #, tcl-format -msgid "Invalid revision: %s" +msgid "Running: %s" msgstr "" -#: lib/choose_rev.tcl:338 -msgid "No revision selected." +#: lib/tools.tcl:158 +#, tcl-format +msgid "Tool completed successfully: %s" msgstr "" -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." +#: lib/tools.tcl:160 +#, tcl-format +msgid "Tool failed: %s" msgstr "" -#: lib/choose_rev.tcl:531 -msgid "Updated" +#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" msgstr "" -#: lib/choose_rev.tcl:559 -msgid "URL" +#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" 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/mergetool.tcl:10 +msgid "Force resolution to the other branch?" msgstr "" -#: lib/commit.tcl:18 +#: lib/mergetool.tcl:14 +#, tcl-format msgid "" -"Cannot amend while merging.\n" +"Note that the diff shows only conflicting changes.\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" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." msgstr "" -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" +#: lib/mergetool.tcl:45 +#, tcl-format +msgid "File %s seems to have unresolved conflicts, still stage?" msgstr "" -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" msgstr "" -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" +#: lib/mergetool.tcl:141 +msgid "Cannot resolve deletion or link conflicts using a tool" msgstr "" -#: lib/commit.tcl:129 +#: lib/mergetool.tcl:146 +msgid "Conflict file does not exist" +msgstr "" + +#: lib/mergetool.tcl:246 #, tcl-format -msgid "warning: Tcl does not support encoding '%s'." +msgid "Not a GUI merge tool: '%s'" msgstr "" -#: lib/commit.tcl:149 -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/mergetool.tcl:275 +#, tcl-format +msgid "Unsupported merge tool '%s'" msgstr "" -#: lib/commit.tcl:172 +#: lib/mergetool.tcl:310 +msgid "Merge tool is already running, terminate it?" +msgstr "" + +#: lib/mergetool.tcl:330 #, 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" +"Error retrieving versions:\n" +"%s" msgstr "" -#: lib/commit.tcl:180 +#: lib/mergetool.tcl:350 #, tcl-format msgid "" -"Unknown file state %s detected.\n" +"Could not start the merge tool:\n" "\n" -"File %s cannot be committed by this program.\n" +"%s" msgstr "" -#: lib/commit.tcl:188 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" +#: lib/mergetool.tcl:354 +msgid "Running merge tool..." msgstr "" -#: 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" +#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 +msgid "Merge tool failed." msgstr "" -#: lib/commit.tcl:234 -msgid "Calling pre-commit hook..." +#: lib/tools_dlg.tcl:22 +#, tcl-format +msgid "%s (%s): Add Tool" msgstr "" -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" msgstr "" -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." +#: lib/tools_dlg.tcl:34 +msgid "Add globally" msgstr "" -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." +#: lib/tools_dlg.tcl:46 +msgid "Tool Details" msgstr "" -#: lib/commit.tcl:300 -msgid "Committing changes..." +#: lib/tools_dlg.tcl:49 +msgid "Use '/' separators to create a submenu tree:" msgstr "" -#: lib/commit.tcl:316 -msgid "write-tree failed:" +#: lib/tools_dlg.tcl:60 +msgid "Command:" msgstr "" -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." +#: lib/tools_dlg.tcl:71 +msgid "Show a dialog before running" msgstr "" -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" +#: lib/tools_dlg.tcl:77 +msgid "Ask the user to select a revision (sets $REVISION)" msgstr "" -#: lib/commit.tcl:339 -msgid "" -"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" +#: lib/tools_dlg.tcl:82 +msgid "Ask the user for additional arguments (sets $ARGS)" msgstr "" -#: lib/commit.tcl:346 -msgid "No changes to commit." +#: lib/tools_dlg.tcl:89 +msgid "Don't show the command output window" msgstr "" -#: lib/commit.tcl:360 -msgid "commit-tree failed:" +#: lib/tools_dlg.tcl:94 +msgid "Run only if a diff is selected ($FILENAME not empty)" msgstr "" -#: lib/commit.tcl:381 -msgid "update-ref failed:" +#: lib/tools_dlg.tcl:118 +msgid "Please supply a name for the tool." msgstr "" -#: lib/commit.tcl:469 +#: lib/tools_dlg.tcl:126 #, tcl-format -msgid "Created commit %s: %s" +msgid "Tool '%s' already exists." msgstr "" -#: lib/console.tcl:59 -msgid "Working... please wait..." +#: lib/tools_dlg.tcl:148 +#, tcl-format +msgid "" +"Could not add tool:\n" +"%s" msgstr "" -#: lib/console.tcl:186 -msgid "Success" +#: lib/tools_dlg.tcl:187 +#, tcl-format +msgid "%s (%s): Remove Tool" msgstr "" -#: lib/console.tcl:200 -msgid "Error: Command Failed" +#: lib/tools_dlg.tcl:193 +msgid "Remove Tool Commands" msgstr "" -#: lib/database.tcl:43 -msgid "Number of loose objects" +#: lib/tools_dlg.tcl:198 +msgid "Remove" msgstr "" -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" +#: lib/tools_dlg.tcl:231 +msgid "(Blue denotes repository-local tools)" msgstr "" -#: lib/database.tcl:45 -msgid "Number of packed objects" +#: lib/tools_dlg.tcl:283 +#, tcl-format +msgid "%s (%s):" msgstr "" -#: lib/database.tcl:46 -msgid "Number of packs" +#: lib/tools_dlg.tcl:292 +#, tcl-format +msgid "Run Command: %s" msgstr "" -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" +#: lib/tools_dlg.tcl:306 +msgid "Arguments" msgstr "" -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" +#: lib/tools_dlg.tcl:341 +msgid "OK" msgstr "" -#: lib/database.tcl:49 -msgid "Garbage files" +#: lib/search.tcl:48 +msgid "Find:" msgstr "" -#: lib/database.tcl:72 -msgid "Compressing the object database" +#: lib/search.tcl:50 +msgid "Next" msgstr "" -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" +#: lib/search.tcl:51 +msgid "Prev" 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/search.tcl:52 +msgid "RegExp" msgstr "" -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" +#: lib/search.tcl:54 +msgid "Case" msgstr "" -#: lib/diff.tcl:64 +#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75 #, 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." +msgid "%s (%s): Create Desktop Icon" msgstr "" -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." +#: lib/shortcut.tcl:24 lib/shortcut.tcl:65 +msgid "Cannot write shortcut:" msgstr "" -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" +#: lib/shortcut.tcl:140 +msgid "Cannot write icon:" msgstr "" -#: lib/diff.tcl:130 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" +#: lib/remote_branch_delete.tcl:29 +#, tcl-format +msgid "%s (%s): Delete Branch Remotely" msgstr "" -#: lib/diff.tcl:137 -msgid "LOCAL:\n" +#: lib/remote_branch_delete.tcl:34 +msgid "Delete Branch Remotely" msgstr "" -#: lib/diff.tcl:140 -msgid "REMOTE:\n" +#: lib/remote_branch_delete.tcl:48 +msgid "From Repository" msgstr "" -#: lib/diff.tcl:202 lib/diff.tcl:319 -#, tcl-format -msgid "Unable to display %s" +#: lib/remote_branch_delete.tcl:88 +msgid "Branches" msgstr "" -#: lib/diff.tcl:203 -msgid "Error loading file:" +#: lib/remote_branch_delete.tcl:110 +msgid "Delete Only If" msgstr "" -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" +#: lib/remote_branch_delete.tcl:112 +msgid "Merged Into:" msgstr "" -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." +#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 +msgid "Always (Do not perform merge checks)" msgstr "" -#: lib/diff.tcl:227 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" +#: lib/remote_branch_delete.tcl:153 +msgid "A branch is required for 'Merged Into'." msgstr "" -#: lib/diff.tcl:233 +#: lib/remote_branch_delete.tcl:185 #, tcl-format msgid "" +"The following branches are not completely merged into %s:\n" "\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" +" - %s" msgstr "" -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." +#: 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 "" -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." +#: lib/remote_branch_delete.tcl:208 +msgid "Please select one or more branches to delete." msgstr "" -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." +#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 +msgid "" +"Recovering deleted branches is difficult.\n" +"\n" +"Delete the selected branches?" msgstr "" -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." +#: lib/remote_branch_delete.tcl:227 +#, tcl-format +msgid "Deleting branches from %s" msgstr "" -#: lib/encoding.tcl:443 -msgid "Default" +#: lib/remote_branch_delete.tcl:300 +msgid "No repository selected." msgstr "" -#: lib/encoding.tcl:448 +#: lib/remote_branch_delete.tcl:305 #, tcl-format -msgid "System (%s)" +msgid "Scanning %s..." msgstr "" -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" +#: lib/choose_repository.tcl:45 +msgid "Git Gui" msgstr "" -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" +#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427 +msgid "Create New Repository" msgstr "" -#: lib/error.tcl:36 -msgid "warning" +#: lib/choose_repository.tcl:110 +msgid "New..." msgstr "" -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." +#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511 +msgid "Clone Existing Repository" msgstr "" -#: lib/index.tcl:6 -msgid "Unable to unlock the index." +#: lib/choose_repository.tcl:128 +msgid "Clone..." msgstr "" -#: lib/index.tcl:15 -msgid "Index Error" +#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105 +msgid "Open Existing Repository" msgstr "" -#: lib/index.tcl:17 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." +#: lib/choose_repository.tcl:141 +msgid "Open..." msgstr "" -#: lib/index.tcl:28 -msgid "Continue" +#: lib/choose_repository.tcl:154 +msgid "Recent Repositories" msgstr "" -#: lib/index.tcl:31 -msgid "Unlock Index" +#: lib/choose_repository.tcl:164 +msgid "Open Recent Repository:" msgstr "" -#: lib/index.tcl:289 +#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338 +#: lib/choose_repository.tcl:345 #, tcl-format -msgid "Unstaging %s from commit" +msgid "Failed to create repository %s:" msgstr "" -#: lib/index.tcl:328 -msgid "Ready to commit." +#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33 +msgid "Create" msgstr "" -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" +#: lib/choose_repository.tcl:432 +msgid "Directory:" msgstr "" -#: lib/index.tcl:398 +#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588 +#: lib/choose_repository.tcl:1139 +msgid "Git Repository" +msgstr "" + +#: lib/choose_repository.tcl:487 #, tcl-format -msgid "Revert changes in file %s?" +msgid "Directory %s already exists." msgstr "" -#: lib/index.tcl:400 +#: lib/choose_repository.tcl:491 #, tcl-format -msgid "Revert changes in these %i files?" +msgid "File %s already exists." msgstr "" -#: lib/index.tcl:408 -msgid "Any unstaged changes will be permanently lost by the revert." +#: lib/choose_repository.tcl:506 +msgid "Clone" msgstr "" -#: lib/index.tcl:411 -msgid "Do Nothing" +#: lib/choose_repository.tcl:519 +msgid "Source Location:" msgstr "" -#: lib/index.tcl:429 -msgid "Reverting selected files" +#: lib/choose_repository.tcl:528 +msgid "Target Directory:" msgstr "" -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" +#: lib/choose_repository.tcl:538 +msgid "Clone Type:" 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/choose_repository.tcl:543 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" 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/choose_repository.tcl:548 +msgid "Full Copy (Slower, Redundant Backup)" msgstr "" -#: lib/merge.tcl:45 +#: lib/choose_repository.tcl:553 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "" + +#: lib/choose_repository.tcl:560 +msgid "Recursively clone submodules too" +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 #, 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 "Not a Git repository: %s" msgstr "" -#: lib/merge.tcl:55 +#: lib/choose_repository.tcl:630 +msgid "Standard only available for local repository." +msgstr "" + +#: lib/choose_repository.tcl:634 +msgid "Shared only available for local repository." +msgstr "" + +#: lib/choose_repository.tcl:655 #, 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" +msgid "Location %s already exists." +msgstr "" + +#: lib/choose_repository.tcl:666 +msgid "Failed to configure origin" +msgstr "" + +#: lib/choose_repository.tcl:678 +msgid "Counting objects" +msgstr "" + +#: lib/choose_repository.tcl:679 +msgid "buckets" msgstr "" -#: lib/merge.tcl:107 +#: lib/choose_repository.tcl:703 #, tcl-format -msgid "%s of %s" +msgid "Unable to copy objects/info/alternates: %s" msgstr "" -#: lib/merge.tcl:120 +#: lib/choose_repository.tcl:740 #, tcl-format -msgid "Merging %s and %s..." +msgid "Nothing to clone from %s." msgstr "" -#: lib/merge.tcl:131 -msgid "Merge completed successfully." +#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962 +#: lib/choose_repository.tcl:974 +msgid "The 'master' branch has not been initialized." msgstr "" -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." +#: lib/choose_repository.tcl:755 +msgid "Hardlinks are unavailable. Falling back to copying." msgstr "" -#: lib/merge.tcl:158 +#: lib/choose_repository.tcl:769 #, tcl-format -msgid "Merge Into %s" +msgid "Cloning from %s" msgstr "" -#: lib/merge.tcl:177 -msgid "Revision To Merge" +#: lib/choose_repository.tcl:800 +msgid "Copying objects" msgstr "" -#: lib/merge.tcl:212 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" +#: lib/choose_repository.tcl:801 +msgid "KiB" msgstr "" -#: 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?" +#: lib/choose_repository.tcl:825 +#, tcl-format +msgid "Unable to copy object: %s" msgstr "" -#: 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?" +#: lib/choose_repository.tcl:837 +msgid "Linking objects" msgstr "" -#: lib/merge.tcl:239 -msgid "Aborting" +#: lib/choose_repository.tcl:838 +msgid "objects" msgstr "" -#: lib/merge.tcl:239 -msgid "files reset" +#: lib/choose_repository.tcl:846 +#, tcl-format +msgid "Unable to hardlink object: %s" msgstr "" -#: lib/merge.tcl:267 -msgid "Abort failed." +#: lib/choose_repository.tcl:903 +msgid "Cannot fetch branches and objects. See console output for details." msgstr "" -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." +#: lib/choose_repository.tcl:914 +msgid "Cannot fetch tags. See console output for details." msgstr "" -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" +#: lib/choose_repository.tcl:938 +msgid "Cannot determine HEAD. See console output for details." msgstr "" -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" +#: lib/choose_repository.tcl:947 +#, tcl-format +msgid "Unable to cleanup %s" msgstr "" -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" +#: lib/choose_repository.tcl:953 +msgid "Clone failed." msgstr "" -#: 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." +#: lib/choose_repository.tcl:960 +msgid "No default branch obtained." msgstr "" -#: lib/mergetool.tcl:45 +#: lib/choose_repository.tcl:971 #, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" +msgid "Cannot resolve %s as a commit." msgstr "" -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" +#: lib/choose_repository.tcl:998 +msgid "Creating working directory" msgstr "" -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" +#: lib/choose_repository.tcl:1028 +msgid "Initial file checkout failed." msgstr "" -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" +#: lib/choose_repository.tcl:1072 +msgid "Cloning submodules" msgstr "" -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" +#: lib/choose_repository.tcl:1087 +msgid "Cannot clone submodules." +msgstr "" + +#: lib/choose_repository.tcl:1110 +msgid "Repository:" msgstr "" -#: lib/mergetool.tcl:268 +#: lib/choose_repository.tcl:1159 #, tcl-format -msgid "Unsupported merge tool '%s'" +msgid "Failed to open repository %s:" msgstr "" -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." msgstr "" -#: lib/mergetool.tcl:323 +#: lib/blame.tcl:74 #, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" +msgid "%s (%s): File Viewer" msgstr "" -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" +#: lib/blame.tcl:80 +msgid "Commit:" msgstr "" -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." +#: lib/blame.tcl:282 +msgid "Copy Commit" msgstr "" -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." +#: lib/blame.tcl:286 +msgid "Find Text..." msgstr "" -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" +#: lib/blame.tcl:290 +msgid "Goto Line..." msgstr "" -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" +#: lib/blame.tcl:299 +msgid "Do Full Copy Detection" msgstr "" -#: lib/option.tcl:117 -msgid "Restore Defaults" +#: lib/blame.tcl:303 +msgid "Show History Context" msgstr "" -#: lib/option.tcl:121 -msgid "Save" +#: lib/blame.tcl:306 +msgid "Blame Parent Commit" msgstr "" -#: lib/option.tcl:131 +#: lib/blame.tcl:468 #, tcl-format -msgid "%s Repository" +msgid "Reading %s..." msgstr "" -#: lib/option.tcl:132 -msgid "Global (All Repositories)" +#: lib/blame.tcl:596 +msgid "Loading copy/move tracking annotations..." msgstr "" -#: lib/option.tcl:138 -msgid "User Name" +#: lib/blame.tcl:613 +msgid "lines annotated" msgstr "" -#: lib/option.tcl:139 -msgid "Email Address" +#: lib/blame.tcl:815 +msgid "Loading original location annotations..." msgstr "" -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" +#: lib/blame.tcl:818 +msgid "Annotation complete." msgstr "" -#: lib/option.tcl:142 -msgid "Merge Verbosity" +#: lib/blame.tcl:849 +msgid "Busy" msgstr "" -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" +#: lib/blame.tcl:850 +msgid "Annotation process is already running." msgstr "" -#: lib/option.tcl:144 -msgid "Use Merge Tool" +#: lib/blame.tcl:889 +msgid "Running thorough copy detection..." msgstr "" -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" +#: lib/blame.tcl:957 +msgid "Loading annotation..." msgstr "" -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" +#: lib/blame.tcl:1010 +msgid "Author:" msgstr "" -#: lib/option.tcl:148 -msgid "Match Tracking Branches" +#: lib/blame.tcl:1014 +msgid "Committer:" msgstr "" -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" +#: lib/blame.tcl:1019 +msgid "Original File:" msgstr "" -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" +#: lib/blame.tcl:1067 +msgid "Cannot find HEAD commit:" msgstr "" -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" +#: lib/blame.tcl:1122 +msgid "Cannot find parent commit:" msgstr "" -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" +#: lib/blame.tcl:1137 +msgid "Unable to display parent" msgstr "" -#: lib/option.tcl:153 -msgid "Commit Message Text Width" +#: lib/blame.tcl:1138 lib/diff.tcl:345 +msgid "Error loading diff:" msgstr "" -#: lib/option.tcl:154 -msgid "New Branch Name Template" +#: lib/blame.tcl:1279 +msgid "Originally By:" msgstr "" -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" +#: lib/blame.tcl:1285 +msgid "In File:" msgstr "" -#: lib/option.tcl:203 -msgid "Change" +#: lib/blame.tcl:1290 +msgid "Copied Or Moved Here By:" msgstr "" -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" +#: 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 "" -#: lib/option.tcl:254 -msgid "Change Font" +#: lib/diff.tcl:117 +#, tcl-format +msgid "Loading diff of %s..." msgstr "" -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" +#: lib/diff.tcl:143 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" msgstr "" -#: lib/option.tcl:264 -msgid "pt." +#: lib/diff.tcl:148 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" msgstr "" -#: lib/option.tcl:278 -msgid "Preferences" +#: lib/diff.tcl:155 +msgid "LOCAL:\n" msgstr "" -#: lib/option.tcl:314 -msgid "Failed to completely save options:" +#: lib/diff.tcl:158 +msgid "REMOTE:\n" msgstr "" -#: lib/remote.tcl:163 -msgid "Remove Remote" +#: lib/diff.tcl:220 lib/diff.tcl:344 +#, tcl-format +msgid "Unable to display %s" msgstr "" -#: lib/remote.tcl:168 -msgid "Prune from" +#: lib/diff.tcl:221 +msgid "Error loading file:" msgstr "" -#: lib/remote.tcl:173 -msgid "Fetch from" +#: lib/diff.tcl:227 +msgid "Git Repository (subproject)" msgstr "" -#: lib/remote.tcl:215 -msgid "Push to" +#: lib/diff.tcl:239 +msgid "* Binary file (not showing content)." msgstr "" -#: lib/remote_add.tcl:19 -msgid "Add Remote" +#: lib/diff.tcl:244 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" msgstr "" -#: lib/remote_add.tcl:24 -msgid "Add New Remote" +#: 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 "" -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" +#: lib/diff.tcl:583 +msgid "Failed to unstage selected hunk." msgstr "" -#: lib/remote_add.tcl:37 -msgid "Remote Details" +#: lib/diff.tcl:591 +msgid "Failed to revert selected hunk." msgstr "" -#: lib/remote_add.tcl:50 -msgid "Location:" +#: lib/diff.tcl:594 +msgid "Failed to stage selected hunk." msgstr "" -#: lib/remote_add.tcl:62 -msgid "Further Action" +#: lib/diff.tcl:687 +msgid "Failed to unstage selected line." msgstr "" -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" +#: lib/diff.tcl:696 +msgid "Failed to revert selected line." msgstr "" -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" +#: lib/diff.tcl:700 +msgid "Failed to stage selected line." msgstr "" -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" +#: lib/diff.tcl:889 +msgid "Failed to undo last revert." msgstr "" -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." +#: lib/sshkey.tcl:34 +msgid "No keys found." msgstr "" -#: lib/remote_add.tcl:114 +#: lib/sshkey.tcl:37 #, tcl-format -msgid "'%s' is not an acceptable remote name." +msgid "Found a public key in: %s" msgstr "" -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." +#: lib/sshkey.tcl:43 +msgid "Generate Key" msgstr "" -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" +#: lib/sshkey.tcl:61 +msgid "Copy To Clipboard" msgstr "" -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" +#: lib/sshkey.tcl:75 +msgid "Your OpenSSH Public Key" msgstr "" -#: lib/remote_add.tcl:157 +#: lib/sshkey.tcl:83 +msgid "Generating..." +msgstr "" + +#: lib/sshkey.tcl:89 #, tcl-format -msgid "Do not know how to initialize repository at location '%s'." +msgid "" +"Could not start ssh-keygen:\n" +"\n" +"%s" +msgstr "" + +#: lib/sshkey.tcl:116 +msgid "Generation failed." msgstr "" -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 +#: lib/sshkey.tcl:123 +msgid "Generation succeeded, but no keys found." +msgstr "" + +#: lib/sshkey.tcl:126 #, tcl-format -msgid "push %s" +msgid "Your key is in: %s" msgstr "" -#: lib/remote_add.tcl:164 +#: lib/branch_create.tcl:23 #, tcl-format -msgid "Setting up the %s (at %s)" +msgid "%s (%s): Create Branch" msgstr "" -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" +#: lib/branch_create.tcl:28 +msgid "Create New Branch" msgstr "" -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" +#: lib/branch_create.tcl:42 +msgid "Branch Name" msgstr "" -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" +#: lib/branch_create.tcl:57 +msgid "Match Tracking Branch Name" msgstr "" -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" +#: lib/branch_create.tcl:66 +msgid "Starting Revision" msgstr "" -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" msgstr "" -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" +#: lib/branch_create.tcl:75 +msgid "No" msgstr "" -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" msgstr "" -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" msgstr "" -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" +#: lib/branch_create.tcl:132 +msgid "Please select a tracking branch." msgstr "" -#: lib/remote_branch_delete.tcl:189 +#: lib/branch_create.tcl:141 #, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." +msgid "Tracking branch %s is not a branch in the remote repository." msgstr "" -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." +#: lib/console.tcl:59 +msgid "Working... please wait..." msgstr "" -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" +#: lib/console.tcl:186 +msgid "Success" msgstr "" -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." +#: lib/console.tcl:200 +msgid "Error: Command Failed" +msgstr "" + +#: lib/line.tcl:17 +msgid "Goto Line:" +msgstr "" + +#: lib/line.tcl:23 +msgid "Go" +msgstr "" + +#: lib/choose_rev.tcl:52 +msgid "This Detached Checkout" +msgstr "" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "" + +#: lib/choose_rev.tcl:72 +msgid "Local Branch" +msgstr "" + +#: lib/choose_rev.tcl:77 +msgid "Tracking Branch" +msgstr "" + +#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 +msgid "Tag" msgstr "" -#: lib/remote_branch_delete.tcl:297 +#: lib/choose_rev.tcl:321 #, tcl-format -msgid "Scanning %s..." +msgid "Invalid revision: %s" msgstr "" -#: lib/search.tcl:21 -msgid "Find:" +#: lib/choose_rev.tcl:342 +msgid "No revision selected." msgstr "" -#: lib/search.tcl:23 -msgid "Next" +#: lib/choose_rev.tcl:350 +msgid "Revision expression is empty." msgstr "" -#: lib/search.tcl:24 -msgid "Prev" +#: lib/choose_rev.tcl:537 +msgid "Updated" msgstr "" -#: lib/search.tcl:25 -msgid "Case-Sensitive" +#: lib/choose_rev.tcl:565 +msgid "URL" msgstr "" -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" +#: 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" msgstr "" -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" +#: 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/spellcheck.tcl:57 -msgid "Unsupported spell checker" +#: lib/commit.tcl:56 +msgid "Error loading commit data for amend:" msgstr "" -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" +#: lib/commit.tcl:83 +msgid "Unable to obtain your identity:" msgstr "" -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" +#: lib/commit.tcl:88 +msgid "Invalid GIT_COMMITTER_IDENT:" msgstr "" -#: lib/spellcheck.tcl:70 +#: lib/commit.tcl:138 #, tcl-format -msgid "Reverting dictionary to %s." +msgid "warning: Tcl does not support encoding '%s'." msgstr "" -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" +#: 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" msgstr "" -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" +#: lib/commit.tcl:182 +#, 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" msgstr "" -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" +#: lib/commit.tcl:190 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" msgstr "" -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" +#: lib/commit.tcl:198 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" msgstr "" -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" +#: 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" msgstr "" -#: lib/sshkey.tcl:31 -msgid "No keys found." +#: lib/commit.tcl:244 +msgid "Calling pre-commit hook..." msgstr "" -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" +#: lib/commit.tcl:259 +msgid "Commit declined by pre-commit hook." msgstr "" -#: lib/sshkey.tcl:40 -msgid "Generate Key" +#: 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 "" -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" +#: lib/commit.tcl:299 +msgid "Calling commit-msg hook..." msgstr "" -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" +#: lib/commit.tcl:314 +msgid "Commit declined by commit-msg hook." msgstr "" -#: lib/sshkey.tcl:78 -msgid "Generating..." +#: lib/commit.tcl:327 +msgid "Committing changes..." +msgstr "" + +#: lib/commit.tcl:344 +msgid "write-tree failed:" +msgstr "" + +#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422 +msgid "Commit failed." msgstr "" -#: lib/sshkey.tcl:84 +#: lib/commit.tcl:362 #, tcl-format +msgid "Commit %s appears to be corrupt" +msgstr "" + +#: lib/commit.tcl:367 msgid "" -"Could not start ssh-keygen:\n" +"No changes to commit.\n" "\n" -"%s" +"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/sshkey.tcl:111 -msgid "Generation failed." +#: lib/commit.tcl:374 +msgid "No changes to commit." msgstr "" -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." +#: lib/commit.tcl:394 +msgid "commit-tree failed:" msgstr "" -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" +#: lib/commit.tcl:421 +msgid "update-ref failed:" msgstr "" -#: lib/status_bar.tcl:83 +#: lib/commit.tcl:514 #, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" +msgid "Created commit %s: %s" msgstr "" -#: lib/tools.tcl:75 +#: lib/branch_delete.tcl:16 #, tcl-format -msgid "Running %s requires a selected file." +msgid "%s (%s): Delete Branch" msgstr "" -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" +#: lib/branch_delete.tcl:21 +msgid "Delete Local Branch" +msgstr "" + +#: lib/branch_delete.tcl:39 +msgid "Local Branches" msgstr "" -#: lib/tools.tcl:110 +#: lib/branch_delete.tcl:51 +msgid "Delete Only If Merged Into" +msgstr "" + +#: lib/branch_delete.tcl:103 #, tcl-format -msgid "Tool: %s" +msgid "The following branches are not completely merged into %s:" msgstr "" -#: lib/tools.tcl:111 +#: lib/branch_delete.tcl:131 #, tcl-format -msgid "Running: %s" +msgid " - %s:" msgstr "" -#: lib/tools.tcl:149 +#: lib/branch_delete.tcl:141 #, tcl-format -msgid "Tool completed successfully: %s" +msgid "" +"Failed to delete branches:\n" +"%s" msgstr "" -#: lib/tools.tcl:151 +#: lib/date.tcl:25 #, tcl-format -msgid "Tool failed: %s" +msgid "Invalid date from Git: %s" msgstr "" -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" +#: lib/database.tcl:42 +msgid "Number of loose objects" msgstr "" -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" +#: lib/database.tcl:43 +msgid "Disk space used by loose objects" msgstr "" -#: lib/tools_dlg.tcl:33 -msgid "Add globally" +#: lib/database.tcl:44 +msgid "Number of packed objects" msgstr "" -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" +#: lib/database.tcl:45 +msgid "Number of packs" msgstr "" -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" +#: lib/database.tcl:46 +msgid "Disk space used by packed objects" msgstr "" -#: lib/tools_dlg.tcl:61 -msgid "Command:" +#: lib/database.tcl:47 +msgid "Packed objects waiting for pruning" msgstr "" -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" +#: lib/database.tcl:48 +msgid "Garbage files" msgstr "" -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" +#: lib/database.tcl:66 +#, tcl-format +msgid "%s (%s): Database Statistics" msgstr "" -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" +#: lib/database.tcl:72 +msgid "Compressing the object database" msgstr "" -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" msgstr "" -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" +#: 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?" msgstr "" -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." +#: lib/error.tcl:20 +#, tcl-format +msgid "%s: error" msgstr "" -#: lib/tools_dlg.tcl:129 +#: lib/error.tcl:36 #, tcl-format -msgid "Tool '%s' already exists." +msgid "%s: warning" msgstr "" -#: lib/tools_dlg.tcl:151 +#: lib/error.tcl:80 #, tcl-format -msgid "" -"Could not add tool:\n" -"%s" +msgid "%s hook failed:" msgstr "" -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" +#: lib/error.tcl:96 +msgid "You must correct the above errors before committing." msgstr "" -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" +#: lib/error.tcl:116 +#, tcl-format +msgid "%s (%s): error" msgstr "" -#: lib/tools_dlg.tcl:200 -msgid "Remove" +#: 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/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" +#: 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/tools_dlg.tcl:297 +#: lib/merge.tcl:45 #, tcl-format -msgid "Run Command: %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/tools_dlg.tcl:311 -msgid "Arguments" +#: 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/tools_dlg.tcl:348 -msgid "OK" +#: lib/merge.tcl:108 +#, tcl-format +msgid "%s of %s" msgstr "" -#: lib/transport.tcl:7 +#: lib/merge.tcl:126 #, tcl-format -msgid "Fetching new changes from %s" +msgid "Merging %s and %s..." msgstr "" -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" +#: lib/merge.tcl:137 +msgid "Merge completed successfully." msgstr "" -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" +#: lib/merge.tcl:139 +msgid "Merge failed. Conflict resolution is required." msgstr "" -#: lib/transport.tcl:26 +#: lib/merge.tcl:156 #, tcl-format -msgid "Pushing changes to %s" +msgid "%s (%s): Merge" msgstr "" -#: lib/transport.tcl:64 +#: lib/merge.tcl:164 #, tcl-format -msgid "Mirroring to %s" +msgid "Merge Into %s" msgstr "" -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" +#: lib/merge.tcl:183 +msgid "Revision To Merge" msgstr "" -#: lib/transport.tcl:100 -msgid "Push Branches" +#: lib/merge.tcl:218 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" msgstr "" -#: lib/transport.tcl:114 -msgid "Source Branches" +#: 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?" msgstr "" -#: lib/transport.tcl:131 -msgid "Destination Repository" +#: 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?" msgstr "" -#: lib/transport.tcl:169 -msgid "Transfer Options" +#: lib/merge.tcl:246 +msgid "Aborting" msgstr "" -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" +#: lib/merge.tcl:247 +msgid "files reset" msgstr "" -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" +#: lib/merge.tcl:277 +msgid "Abort failed." msgstr "" -#: lib/transport.tcl:179 -msgid "Include tags" +#: lib/merge.tcl:279 +msgid "Abort completed. Ready." msgstr "" diff --git a/third_party/git/git-gui/po/glossary/de.po b/third_party/git/git-gui/po/glossary/de.po index 35764d1d22..4c5f233ee5 100644 --- a/third_party/git/git-gui/po/glossary/de.po +++ b/third_party/git/git-gui/po/glossary/de.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: git-gui glossary\n" -"POT-Creation-Date: 2008-01-07 21:20+0100\n" -"PO-Revision-Date: 2008-02-16 21:48+0100\n" +"POT-Creation-Date: 2020-01-26 22:26+0100\n" +"PO-Revision-Date: 2020-02-09 21:22+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" @@ -19,6 +20,9 @@ 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 " @@ -32,33 +36,77 @@ 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 "Zweig" +msgstr "Branch" #. "" msgid "branch [verb]" -msgstr "verzweigen" +msgstr "branchen" #. "" msgid "checkout [noun]" msgstr "" -"Arbeitskopie (Erstellung einer Arbeitskopie; Auscheck? Ausspielung? Abruf? " -"Source Safe: Auscheckvorgang)" +"Arbeitskopie (Checkout; Erstellung einer Arbeitskopie; Auscheck? 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; Zweig umstellen [checkout a branch] (auschecken? " -"ausspielen? abrufen? Source Safe: auschecken)" +"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" #. "" msgid "clone [verb]" @@ -66,39 +114,98 @@ msgstr "klonen" #. "A single point in the git history." msgid "commit [noun]" -msgstr "" -"Version; Eintragung; รnderung (Buchung?, Eintragung?, รbertragung?, " -"Sendung?, รbergabe?, Einspielung?, Ablagevorgang?)" +msgstr "Commit (Version?)" #. "The action of storing a new snapshot of the project's state in the git history." msgid "commit [verb]" msgstr "" -"eintragen (TortoiseSVN: รผbertragen; Source Safe: einchecken; senden?, " -"รผbergeben?, einspielen?, einpflegen?, ablegen?)" +"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?)" #. "" msgid "diff [noun]" -msgstr "Vergleich (Source Safe: Unterschiede)" +msgstr "Vergleich (Diff? Source Safe: Unterschiede)" #. "" msgid "diff [verb]" msgstr "vergleichen" -#. "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" +#. "" +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" #. "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 "Kontext" +msgstr "Patch-Block (Kontext?)" #. "A collection of files. The index is a stored version of your working tree." msgid "index (in git-gui: staging area)" -msgstr "Bereitstellung" +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" #. "A successful merge results in the creation of a new commit representing the result of the merge." msgid "merge [noun]" @@ -112,78 +219,212 @@ msgstr "zusammenfรผhren" msgid "message" msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)" -#. "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>'." +#. "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>'." msgid "prune" -msgstr "aufrรคumen (entfernen?)" +msgstr "veraltete Branches entfernen (aufrรคumen?, entfernen?)" #. "Pulling a branch means to fetch it and merge it." msgid "pull" -msgstr "รผbernehmen (ziehen?)" +msgstr "" +"รผbernehmen (pull? ziehen? Vorsicht: zusammenfรผhren = merge, aber pull kann " +"auch rebase bewirken)" #. "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" -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "Andere Archive (Gegenseite?, Entfernte?, Server?)" +#. "" +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" #. "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 "Projektarchiv" +msgstr "Repository" #. "" msgid "reset" -msgstr "zurรผcksetzen (zurรผckkehren?)" +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?)" #. "" msgid "revert" -msgstr "verwerfen (bei git-reset), revidieren (bei git-revert, also mit neuem commit)" +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" #. "A particular state of files and directories which was stored in the object database." msgid "revision" -msgstr "Version (TortoiseSVN: Revision; Source Safe: Version)" +msgstr "" +"Version (aber was macht das Wort revision hier im Git?? TortoiseSVN: " +"Revision; Source Safe: Version)" #. "" msgid "sign off" -msgstr "abzeichnen (gegenzeichnen?, freizeichnen?, absegnen?)" +msgstr "abzeichnen (signieren? gegenzeichnen?, freizeichnen?)" -#. "" +#. "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" -#. "A ref pointing to a tag or commit object" +#. "" +msgid "submodule" +msgstr "Submodul (Untermodul?)" + +#. "A ref pointing to some commit object. In other words: A label on a specific commit." msgid "tag [noun]" -msgstr "Markierung" +msgstr "Tag (Markierung?)" -#. "" +#. "The process of creating a tag at a specific commit object" msgid "tag [verb]" -msgstr "markieren" +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" #. "A regular git branch that is used to follow changes from another repository." msgid "tracking branch" -msgstr "รbernahmezweig" +msgstr "Tracking-Branch (Verfolgungsbranch? รbernahmebranch?)" + +#. "" +msgid "trailer" +msgstr "Anhang" + +#. "1. tree object, 2. directory tree" +msgid "tree" +msgstr "1. Baum-Objekt, 2. Verzeichnisbaum" #. "" 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 copy, working tree" +msgid "working directory, 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 40eb3e9c07..4e66e0da3a 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: 2008-01-07 21:20+0100\n" +"POT-Creation-Date: 2020-01-26 22:26+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,14 +18,46 @@ 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 "" @@ -42,6 +74,18 @@ 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 "" @@ -54,6 +98,26 @@ 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 "" @@ -62,14 +126,34 @@ msgstr "" msgid "diff [verb]" msgstr "" -#. "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" +#. "" +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" 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 "" @@ -78,6 +162,26 @@ 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 "" @@ -90,7 +194,42 @@ msgstr "" msgid "message" msgstr "" -#. "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>'." +#. "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>'." msgid "prune" msgstr "" @@ -102,12 +241,43 @@ 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 "" -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" +#. "" +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" 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?)" @@ -118,10 +288,22 @@ 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 "" @@ -130,39 +312,87 @@ 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 "" -#. "A ref pointing to a tag or commit object" +#. "" +msgid "submodule" +msgstr "" + +#. "A ref pointing to some commit object. In other words: A label on a specific commit." 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 copy, working tree" +msgid "working directory, 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 409304692d..48b9f10e57 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,67 +1,96 @@ "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]" "" -"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." +"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." "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" "" -"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>'." +"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>'." "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" "" -"remote" "An other repository ('remote'). One might have a set of remotes whose branches one tracks." +"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." "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" "" -"staging area" "" +"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" "status" "" -"tag [noun]" "A ref pointing to a tag or commit object" -"tag [verb]" "" +"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" "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 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" +"working directory, working copy, working tree" "The tree of actual checked out files." diff --git a/third_party/git/git-gui/po/ja.po b/third_party/git/git-gui/po/ja.po index 208651c1af..2f61153ab9 100644 --- a/third_party/git/git-gui/po/ja.po +++ b/third_party/git/git-gui/po/ja.po @@ -4,14 +4,15 @@ # # ใใใใ ใชใชใ <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: 2016-06-22 12:50+0900\n" -"Last-Translator: Satoshi Yasushima <s.yasushima@gmail.com>\n" +"PO-Revision-Date: 2019-10-13 23:20+0900\n" +"Last-Translator: KIDANI Akito <a.kid.1985@gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -661,7 +662,7 @@ msgstr "" #: lib/merge.tcl:108 #, tcl-format msgid "%s of %s" -msgstr "%s ใฎ %s ใใฉใณใ" +msgstr "%2$s ใฎ %1$s ใใฉใณใ" #: lib/merge.tcl:122 #, tcl-format @@ -956,7 +957,7 @@ msgstr "ใจใฉใผ: ใณใใณใใๅคฑๆใใพใใ" #: lib/checkout_op.tcl:85 #, tcl-format msgid "Fetching %s from %s" -msgstr "%s ใใ %s ใใใงใใใใฆใใพใ" +msgstr "%2$s ใใ %1$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 deleted file mode 100755 index f60e9b3e87..0000000000 --- a/third_party/git/git-legacy-stash.sh +++ /dev/null @@ -1,797 +0,0 @@ -#!/bin/sh -# Copyright (c) 2007, Nanako Shiraishi - -dashless=$(basename "$0" | sed -e 's/-/ /') -USAGE="list [<options>] - or: $dashless show [<stash>] - or: $dashless drop [-q|--quiet] [<stash>] - or: $dashless ( pop | apply ) [--index] [-q|--quiet] [<stash>] - or: $dashless branch <branchname> [<stash>] - or: $dashless save [--patch] [-k|--[no-]keep-index] [-q|--quiet] - [-u|--include-untracked] [-a|--all] [<message>] - or: $dashless [push [--patch] [-k|--[no-]keep-index] [-q|--quiet] - [-u|--include-untracked] [-a|--all] [-m <message>] - [-- <pathspec>...]] - or: $dashless clear" - -SUBDIRECTORY_OK=Yes -OPTIONS_SPEC= -START_DIR=$(pwd) -. git-sh-setup -require_work_tree -prefix=$(git rev-parse --show-prefix) || exit 1 -cd_to_toplevel - -TMP="$GIT_DIR/.git-stash.$$" -TMPindex=${GIT_INDEX_FILE-"$(git rev-parse --git-path index)"}.stash.$$ -trap 'rm -f "$TMP-"* "$TMPindex"' 0 - -ref_stash=refs/stash - -if git config --get-colorbool color.interactive; then - help_color="$(git config --get-color color.interactive.help 'red bold')" - reset_color="$(git config --get-color '' reset)" -else - help_color= - reset_color= -fi - -no_changes () { - git diff-index --quiet --cached HEAD --ignore-submodules -- "$@" && - git diff-files --quiet --ignore-submodules -- "$@" && - (test -z "$untracked" || test -z "$(untracked_files "$@")") -} - -untracked_files () { - if test "$1" = "-z" - then - shift - z=-z - else - z= - fi - excl_opt=--exclude-standard - test "$untracked" = "all" && excl_opt= - git ls-files -o $z $excl_opt -- "$@" -} - -prepare_fallback_ident () { - if ! git -c user.useconfigonly=yes var GIT_COMMITTER_IDENT >/dev/null 2>&1 - then - GIT_AUTHOR_NAME="git stash" - GIT_AUTHOR_EMAIL=git@stash - GIT_COMMITTER_NAME="git stash" - GIT_COMMITTER_EMAIL=git@stash - export GIT_AUTHOR_NAME - export GIT_AUTHOR_EMAIL - export GIT_COMMITTER_NAME - export GIT_COMMITTER_EMAIL - fi -} - -clear_stash () { - if test $# != 0 - then - die "$(gettext "git stash clear with parameters is unimplemented")" - fi - if current=$(git rev-parse --verify --quiet $ref_stash) - then - git update-ref -d $ref_stash $current - fi -} - -maybe_quiet () { - case "$1" in - --keep-stdout) - shift - if test -n "$GIT_QUIET" - then - "$@" 2>/dev/null - else - "$@" - fi - ;; - *) - if test -n "$GIT_QUIET" - then - "$@" >/dev/null 2>&1 - else - "$@" - fi - ;; - esac -} - -create_stash () { - - prepare_fallback_ident - - stash_msg= - untracked= - while test $# != 0 - do - case "$1" in - -m|--message) - shift - stash_msg=${1?"BUG: create_stash () -m requires an argument"} - ;; - -m*) - stash_msg=${1#-m} - ;; - --message=*) - stash_msg=${1#--message=} - ;; - -u|--include-untracked) - shift - untracked=${1?"BUG: create_stash () -u requires an argument"} - ;; - --) - shift - break - ;; - esac - shift - done - - git update-index -q --refresh - if maybe_quiet no_changes "$@" - then - exit 0 - fi - - # state of the base commit - if b_commit=$(maybe_quiet --keep-stdout git rev-parse --verify HEAD) - then - head=$(git rev-list --oneline -n 1 HEAD --) - elif test -n "$GIT_QUIET" - then - exit 1 - else - die "$(gettext "You do not have the initial commit yet")" - fi - - if branch=$(git symbolic-ref -q HEAD) - then - branch=${branch#refs/heads/} - else - branch='(no branch)' - fi - msg=$(printf '%s: %s' "$branch" "$head") - - # state of the index - i_tree=$(git write-tree) && - i_commit=$(printf 'index on %s\n' "$msg" | - git commit-tree $i_tree -p $b_commit) || - die "$(gettext "Cannot save the current index state")" - - if test -n "$untracked" - then - # Untracked files are stored by themselves in a parentless commit, for - # ease of unpacking later. - u_commit=$( - untracked_files -z "$@" | ( - GIT_INDEX_FILE="$TMPindex" && - export GIT_INDEX_FILE && - rm -f "$TMPindex" && - git update-index -z --add --remove --stdin && - u_tree=$(git write-tree) && - printf 'untracked files on %s\n' "$msg" | git commit-tree $u_tree && - rm -f "$TMPindex" - ) ) || die "$(gettext "Cannot save the untracked files")" - - untracked_commit_option="-p $u_commit"; - else - untracked_commit_option= - fi - - if test -z "$patch_mode" - then - - # state of the working tree - w_tree=$( ( - git read-tree --index-output="$TMPindex" -m $i_tree && - GIT_INDEX_FILE="$TMPindex" && - export GIT_INDEX_FILE && - git diff-index --name-only -z HEAD -- "$@" >"$TMP-stagenames" && - git update-index -z --add --remove --stdin <"$TMP-stagenames" && - git write-tree && - rm -f "$TMPindex" - ) ) || - die "$(gettext "Cannot save the current worktree state")" - - else - - rm -f "$TMP-index" && - GIT_INDEX_FILE="$TMP-index" git read-tree HEAD && - - # find out what the user wants - GIT_INDEX_FILE="$TMP-index" \ - git add--interactive --patch=stash -- "$@" && - - # state of the working tree - w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) || - die "$(gettext "Cannot save the current worktree state")" - - git diff-tree -p HEAD $w_tree -- >"$TMP-patch" && - test -s "$TMP-patch" || - die "$(gettext "No changes selected")" - - rm -f "$TMP-index" || - die "$(gettext "Cannot remove temporary index (can't happen)")" - - fi - - # create the stash - if test -z "$stash_msg" - then - stash_msg=$(printf 'WIP on %s' "$msg") - else - stash_msg=$(printf 'On %s: %s' "$branch" "$stash_msg") - fi - w_commit=$(printf '%s\n' "$stash_msg" | - git commit-tree $w_tree -p $b_commit -p $i_commit $untracked_commit_option) || - die "$(gettext "Cannot record working tree state")" -} - -store_stash () { - while test $# != 0 - do - case "$1" in - -m|--message) - shift - stash_msg="$1" - ;; - -m*) - stash_msg=${1#-m} - ;; - --message=*) - stash_msg=${1#--message=} - ;; - -q|--quiet) - quiet=t - ;; - *) - break - ;; - esac - shift - done - test $# = 1 || - die "$(eval_gettext "\"$dashless store\" requires one <commit> argument")" - - w_commit="$1" - if test -z "$stash_msg" - then - stash_msg="Created via \"git stash store\"." - fi - - git update-ref --create-reflog -m "$stash_msg" $ref_stash $w_commit - ret=$? - test $ret != 0 && test -z "$quiet" && - die "$(eval_gettext "Cannot update \$ref_stash with \$w_commit")" - return $ret -} - -push_stash () { - keep_index= - patch_mode= - untracked= - stash_msg= - while test $# != 0 - do - case "$1" in - -k|--keep-index) - keep_index=t - ;; - --no-keep-index) - keep_index=n - ;; - -p|--patch) - patch_mode=t - # only default to keep if we don't already have an override - test -z "$keep_index" && keep_index=t - ;; - -q|--quiet) - GIT_QUIET=t - ;; - -u|--include-untracked) - untracked=untracked - ;; - -a|--all) - untracked=all - ;; - -m|--message) - shift - test -z ${1+x} && usage - stash_msg=$1 - ;; - -m*) - stash_msg=${1#-m} - ;; - --message=*) - stash_msg=${1#--message=} - ;; - --help) - show_help - ;; - --) - shift - break - ;; - -*) - option="$1" - eval_gettextln "error: unknown option for 'stash push': \$option" - usage - ;; - *) - break - ;; - esac - shift - done - - eval "set $(git rev-parse --sq --prefix "$prefix" -- "$@")" - - if test -n "$patch_mode" && test -n "$untracked" - then - die "$(gettext "Can't use --patch and --include-untracked or --all at the same time")" - fi - - test -n "$untracked" || git ls-files --error-unmatch -- "$@" >/dev/null || exit 1 - - git update-index -q --refresh - if maybe_quiet no_changes "$@" - then - say "$(gettext "No local changes to save")" - exit 0 - fi - - git reflog exists $ref_stash || - clear_stash || die "$(gettext "Cannot initialize stash")" - - create_stash -m "$stash_msg" -u "$untracked" -- "$@" - store_stash -m "$stash_msg" -q $w_commit || - die "$(gettext "Cannot save the current status")" - say "$(eval_gettext "Saved working directory and index state \$stash_msg")" - - if test -z "$patch_mode" - then - test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION= - if test -n "$untracked" && test $# = 0 - then - git clean --force --quiet -d $CLEAN_X_OPTION - fi - - if test $# != 0 - then - test -z "$untracked" && UPDATE_OPTION="-u" || UPDATE_OPTION= - test "$untracked" = "all" && FORCE_OPTION="--force" || FORCE_OPTION= - git add $UPDATE_OPTION $FORCE_OPTION -- "$@" - git diff-index -p --cached --binary HEAD -- "$@" | - git apply --index -R - else - git reset --hard -q - fi - - if test "$keep_index" = "t" && test -n "$i_tree" - then - git read-tree --reset $i_tree - git ls-files -z --modified -- "$@" | - git checkout-index -z --force --stdin - fi - else - git apply -R < "$TMP-patch" || - die "$(gettext "Cannot remove worktree changes")" - - if test "$keep_index" != "t" - then - git reset -q -- "$@" - fi - fi -} - -save_stash () { - push_options= - while test $# != 0 - do - case "$1" in - -q|--quiet) - GIT_QUIET=t - ;; - --) - shift - break - ;; - -*) - # pass all options through to push_stash - push_options="$push_options $1" - ;; - *) - break - ;; - esac - shift - done - - stash_msg="$*" - - if test -z "$stash_msg" - then - push_stash $push_options - else - push_stash $push_options -m "$stash_msg" - fi -} - -have_stash () { - git rev-parse --verify --quiet $ref_stash >/dev/null -} - -list_stash () { - have_stash || return 0 - git log --format="%gd: %gs" -g --first-parent -m "$@" $ref_stash -- -} - -show_stash () { - ALLOW_UNKNOWN_FLAGS=t - assert_stash_like "$@" - - if test -z "$FLAGS" - then - if test "$(git config --bool stash.showStat || echo true)" = "true" - then - FLAGS=--stat - fi - - if test "$(git config --bool stash.showPatch || echo false)" = "true" - then - FLAGS=${FLAGS}${FLAGS:+ }-p - fi - - if test -z "$FLAGS" - then - return 0 - fi - fi - - git diff ${FLAGS} $b_commit $w_commit -} - -show_help () { - exec git help stash - exit 1 -} - -# -# Parses the remaining options looking for flags and -# at most one revision defaulting to ${ref_stash}@{0} -# if none found. -# -# Derives related tree and commit objects from the -# revision, if one is found. -# -# stash records the work tree, and is a merge between the -# base commit (first parent) and the index tree (second parent). -# -# REV is set to the symbolic version of the specified stash-like commit -# IS_STASH_LIKE is non-blank if ${REV} looks like a stash -# IS_STASH_REF is non-blank if the ${REV} looks like a stash ref -# s is set to the SHA1 of the stash commit -# w_commit is set to the commit containing the working tree -# b_commit is set to the base commit -# i_commit is set to the commit containing the index tree -# u_commit is set to the commit containing the untracked files tree -# w_tree is set to the working tree -# b_tree is set to the base tree -# i_tree is set to the index tree -# u_tree is set to the untracked files tree -# -# GIT_QUIET is set to t if -q is specified -# INDEX_OPTION is set to --index if --index is specified. -# FLAGS is set to the remaining flags (if allowed) -# -# dies if: -# * too many revisions specified -# * no revision is specified and there is no stash stack -# * a revision is specified which cannot be resolve to a SHA1 -# * a non-existent stash reference is specified -# * unknown flags were set and ALLOW_UNKNOWN_FLAGS is not "t" -# - -parse_flags_and_rev() -{ - test "$PARSE_CACHE" = "$*" && return 0 # optimisation - PARSE_CACHE="$*" - - IS_STASH_LIKE= - IS_STASH_REF= - INDEX_OPTION= - s= - w_commit= - b_commit= - i_commit= - u_commit= - w_tree= - b_tree= - i_tree= - u_tree= - - FLAGS= - REV= - for opt - do - case "$opt" in - -q|--quiet) - GIT_QUIET=-t - ;; - --index) - INDEX_OPTION=--index - ;; - --help) - show_help - ;; - -*) - test "$ALLOW_UNKNOWN_FLAGS" = t || - die "$(eval_gettext "unknown option: \$opt")" - FLAGS="${FLAGS}${FLAGS:+ }$opt" - ;; - *) - REV="${REV}${REV:+ }'$opt'" - ;; - esac - done - - eval set -- $REV - - case $# in - 0) - have_stash || die "$(gettext "No stash entries found.")" - set -- ${ref_stash}@{0} - ;; - 1) - : - ;; - *) - die "$(eval_gettext "Too many revisions specified: \$REV")" - ;; - esac - - case "$1" in - *[!0-9]*) - : - ;; - *) - set -- "${ref_stash}@{$1}" - ;; - esac - - REV=$(git rev-parse --symbolic --verify --quiet "$1") || { - reference="$1" - die "$(eval_gettext "\$reference is not a valid reference")" - } - - i_commit=$(git rev-parse --verify --quiet "$REV^2") && - set -- $(git rev-parse "$REV" "$REV^1" "$REV:" "$REV^1:" "$REV^2:" 2>/dev/null) && - s=$1 && - w_commit=$1 && - b_commit=$2 && - w_tree=$3 && - b_tree=$4 && - i_tree=$5 && - IS_STASH_LIKE=t && - test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" && - IS_STASH_REF=t - - u_commit=$(git rev-parse --verify --quiet "$REV^3") && - u_tree=$(git rev-parse "$REV^3:" 2>/dev/null) -} - -is_stash_like() -{ - parse_flags_and_rev "$@" - test -n "$IS_STASH_LIKE" -} - -assert_stash_like() { - is_stash_like "$@" || { - args="$*" - die "$(eval_gettext "'\$args' is not a stash-like commit")" - } -} - -is_stash_ref() { - is_stash_like "$@" && test -n "$IS_STASH_REF" -} - -assert_stash_ref() { - is_stash_ref "$@" || { - args="$*" - die "$(eval_gettext "'\$args' is not a stash reference")" - } -} - -apply_stash () { - - assert_stash_like "$@" - - git update-index -q --refresh || die "$(gettext "unable to refresh index")" - - # current index state - c_tree=$(git write-tree) || - die "$(gettext "Cannot apply a stash in the middle of a merge")" - - unstashed_index_tree= - if test -n "$INDEX_OPTION" && test "$b_tree" != "$i_tree" && - test "$c_tree" != "$i_tree" - then - git diff-tree --binary $s^2^..$s^2 | git apply --cached - test $? -ne 0 && - die "$(gettext "Conflicts in index. Try without --index.")" - unstashed_index_tree=$(git write-tree) || - die "$(gettext "Could not save index tree")" - git reset - fi - - if test -n "$u_tree" - then - GIT_INDEX_FILE="$TMPindex" git read-tree "$u_tree" && - GIT_INDEX_FILE="$TMPindex" git checkout-index --all && - rm -f "$TMPindex" || - die "$(gettext "Could not restore untracked files from stash entry")" - fi - - eval " - GITHEAD_$w_tree='Stashed changes' && - GITHEAD_$c_tree='Updated upstream' && - GITHEAD_$b_tree='Version stash was based on' && - export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree - " - - if test -n "$GIT_QUIET" - then - GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY - fi - if git merge-recursive $b_tree -- $c_tree $w_tree - then - # No conflict - if test -n "$unstashed_index_tree" - then - git read-tree "$unstashed_index_tree" - else - a="$TMP-added" && - git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" && - git read-tree --reset $c_tree && - git update-index --add --stdin <"$a" || - die "$(gettext "Cannot unstage modified files")" - rm -f "$a" - fi - squelch= - if test -n "$GIT_QUIET" - then - squelch='>/dev/null 2>&1' - fi - (cd "$START_DIR" && eval "git status $squelch") || : - else - # Merge conflict; keep the exit status from merge-recursive - status=$? - git rerere - if test -n "$INDEX_OPTION" - then - gettextln "Index was not unstashed." >&2 - fi - exit $status - fi -} - -pop_stash() { - assert_stash_ref "$@" - - if apply_stash "$@" - then - drop_stash "$@" - else - status=$? - say "$(gettext "The stash entry is kept in case you need it again.")" - exit $status - fi -} - -drop_stash () { - assert_stash_ref "$@" - - git reflog delete --updateref --rewrite "${REV}" && - say "$(eval_gettext "Dropped \${REV} (\$s)")" || - die "$(eval_gettext "\${REV}: Could not drop stash entry")" - - # clear_stash if we just dropped the last stash entry - git rev-parse --verify --quiet "$ref_stash@{0}" >/dev/null || - clear_stash -} - -apply_to_branch () { - test -n "$1" || die "$(gettext "No branch name specified")" - branch=$1 - shift 1 - - set -- --index "$@" - assert_stash_like "$@" - - git checkout -b $branch $REV^ && - apply_stash "$@" && { - test -z "$IS_STASH_REF" || drop_stash "$@" - } -} - -test "$1" = "-p" && set "push" "$@" - -PARSE_CACHE='--not-parsed' -# The default command is "push" if nothing but options are given -seen_non_option= -for opt -do - case "$opt" in - --) break ;; - -*) ;; - *) seen_non_option=t; break ;; - esac -done - -test -n "$seen_non_option" || set "push" "$@" - -# Main command set -case "$1" in -list) - shift - list_stash "$@" - ;; -show) - shift - show_stash "$@" - ;; -save) - shift - save_stash "$@" - ;; -push) - shift - push_stash "$@" - ;; -apply) - shift - apply_stash "$@" - ;; -clear) - shift - clear_stash "$@" - ;; -create) - shift - create_stash -m "$*" && echo "$w_commit" - ;; -store) - shift - store_stash "$@" - ;; -drop) - shift - drop_stash "$@" - ;; -pop) - shift - pop_stash "$@" - ;; -branch) - shift - apply_to_branch "$@" - ;; -*) - case $# in - 0) - push_stash && - say "$(gettext "(To restore them type \"git stash apply\")")" - ;; - *) - usage - esac - ;; -esac diff --git a/third_party/git/git-mergetool--lib.sh b/third_party/git/git-mergetool--lib.sh index 204a5acd66..2defef28cd 100644 --- a/third_party/git/git-mergetool--lib.sh +++ b/third_party/git/git-mergetool--lib.sh @@ -43,7 +43,14 @@ show_tool_names () { shown_any= ( cd "$MERGE_TOOLS_DIR" && ls ) | { - while read toolname + while read scriptname + do + setup_tool "$scriptname" 2>/dev/null + variants="$variants$(list_tool_variants)\n" + done + variants="$(echo "$variants" | sort | uniq)" + + for toolname in $variants do if setup_tool "$toolname" 2>/dev/null && (eval "$condition" "$toolname") @@ -157,6 +164,10 @@ setup_tool () { echo "$1" } + list_tool_variants () { + echo "$tool" + } + # Most tools' exit codes cannot be trusted, so By default we ignore # their exit code and check the merged file's modification time in # check_unchanged() to determine whether or not the merge was @@ -178,19 +189,26 @@ setup_tool () { false } - - if ! test -f "$MERGE_TOOLS_DIR/$tool" + if test -f "$MERGE_TOOLS_DIR/$tool" + then + . "$MERGE_TOOLS_DIR/$tool" + elif test -f "$MERGE_TOOLS_DIR/${tool%[0-9]}" then + . "$MERGE_TOOLS_DIR/${tool%[0-9]}" + else setup_user_tool return $? fi - # Load the redefined functions - . "$MERGE_TOOLS_DIR/$tool" # Now let the user override the default command for the tool. If # they have not done so then this will return 1 which we ignore. setup_user_tool + if ! list_tool_variants | grep -q "^$tool$" + then + return 1 + fi + if merge_mode && ! can_merge then echo "error: '$tool' can not be used to resolve merges" >&2 @@ -286,11 +304,14 @@ list_merge_tool_candidates () { tools="$tools smerge" fi case "${VISUAL:-$EDITOR}" in + *nvim*) + tools="$tools nvimdiff vimdiff emerge" + ;; *vim*) - tools="$tools vimdiff emerge" + tools="$tools vimdiff nvimdiff emerge" ;; *) - tools="$tools emerge vimdiff" + tools="$tools emerge vimdiff nvimdiff" ;; esac } diff --git a/third_party/git/git-p4.py b/third_party/git/git-p4.py index 3991e7d1a7..4433ca53de 100755 --- a/third_party/git/git-p4.py +++ b/third_party/git/git-p4.py @@ -7,13 +7,21 @@ # 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 - sys.stderr.write("git-p4: requires Python 2.4 or later.\n") +if sys.version_info.major < 3 and sys.version_info.minor < 7: + sys.stderr.write("git-p4: requires Python 2.7 or later.\n") sys.exit(1) import os import optparse +import functools import marshal import subprocess import tempfile @@ -26,37 +34,17 @@ import zipfile import zlib import ctypes import errno +import glob +# On python2.7 where raw_input() and input() are both availble, +# we want raw_input's semantics, but aliased to input for python3 +# compatibility # support basestring in python3 try: - unicode = unicode -except NameError: - # 'unicode' is undefined, must be Python 3 - str = str - unicode = str - bytes = bytes - basestring = (str,bytes) -else: - # 'unicode' exists, must be Python 2 - str = str - unicode = unicode - bytes = str - basestring = basestring - -try: - from subprocess import CalledProcessError -except ImportError: - # from python2.7:subprocess.py - # Exception classes used by this module. - class CalledProcessError(Exception): - """This exception is raised when a process run by check_call() returns - a non-zero exit status. The exit status will be stored in the - returncode attribute.""" - def __init__(self, returncode, cmd): - self.returncode = returncode - self.cmd = cmd - def __str__(self): - return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode) + if raw_input and input: + input = raw_input +except: + pass verbose = False @@ -105,7 +93,7 @@ def p4_build_cmd(cmd): # Provide a way to not pass this option by setting git-p4.retries to 0 real_cmd += ["-r", str(retries)] - if isinstance(cmd,basestring): + if not isinstance(cmd, list): real_cmd = ' '.join(real_cmd) + ' ' + cmd else: real_cmd += cmd @@ -161,17 +149,135 @@ 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: + sys.stderr.flush() + sys.stdout.write(prompt_text) + sys.stdout.flush() + response=sys.stdin.readline().strip().lower() + if not response: + continue + response = response[0] + if response in choices: + return response + +# We need different encoding/decoding strategies for text data being passed +# around in pipes depending on python version +if bytes is not str: + # For python3, always encode and decode as appropriate + def decode_text_stream(s): + return s.decode() if isinstance(s, bytes) else s + def encode_text_stream(s): + return s.encode() if isinstance(s, str) else s +else: + # For python2.7, pass read strings as-is, but also allow writing unicode + def decode_text_stream(s): + return s + def encode_text_stream(s): + return s.encode('utf_8') if isinstance(s, unicode) else s + +def decode_path(path): + """Decode a given string (bytes or otherwise) using configured path encoding options + """ + encoding = gitConfig('git-p4.pathEncoding') or 'utf_8' + if bytes is not str: + return path.decode(encoding, errors='replace') if isinstance(path, bytes) else path + else: + try: + path.decode('ascii') + except: + path = path.decode(encoding, errors='replace') + if verbose: + print('Path with non-ASCII characters detected. Used {} to decode: {}'.format(encoding, path)) + return path + +def run_git_hook(cmd, param=[]): + """Execute a hook if the hook exists.""" + if verbose: + sys.stderr.write("Looking for hook: %s\n" % cmd) + sys.stderr.flush() + + hooks_path = gitConfig("core.hooksPath") + if len(hooks_path) <= 0: + hooks_path = os.path.join(os.environ["GIT_DIR"], "hooks") + + if not isinstance(param, list): + param=[param] + + # resolve hook file name, OS depdenent + hook_file = os.path.join(hooks_path, cmd) + if platform.system() == 'Windows': + if not os.path.isfile(hook_file): + # look for the file with an extension + files = glob.glob(hook_file + ".*") + if not files: + return True + files.sort() + hook_file = files.pop() + while hook_file.upper().endswith(".SAMPLE"): + # The file is a sample hook. We don't want it + if len(files) > 0: + hook_file = files.pop() + else: + return True + + if not os.path.isfile(hook_file) or not os.access(hook_file, os.X_OK): + return True + + return run_hook_command(hook_file, param) == 0 + +def run_hook_command(cmd, param): + """Executes a git hook command + cmd = the command line file to be executed. This can be + a file that is run by OS association. + + param = a list of parameters to pass to the cmd command + + On windows, the extension is checked to see if it should + be run with the Git for Windows Bash shell. If there + is no file extension, the file is deemed a bash shell + and will be handed off to sh.exe. Otherwise, Windows + will be called with the shell to handle the file assocation. + + For non Windows operating systems, the file is called + as an executable. + """ + cli = [cmd] + param + use_shell = False + if platform.system() == 'Windows': + (root,ext) = os.path.splitext(cmd) + if ext == "": + exe_path = os.environ.get("EXEPATH") + if exe_path is None: + exe_path = "" + else: + exe_path = os.path.join(exe_path, "bin") + cli = [os.path.join(exe_path, "SH.EXE")] + cli + else: + use_shell = True + return subprocess.call(cli, shell=use_shell) + + def write_pipe(c, stdin): if verbose: sys.stderr.write('Writing pipe: %s\n' % str(c)) - expand = isinstance(c,basestring) + expand = not isinstance(c, list) p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand) pipe = p.stdin val = pipe.write(stdin) @@ -183,6 +289,8 @@ def write_pipe(c, stdin): def p4_write_pipe(c, stdin): real_cmd = p4_build_cmd(c) + if bytes is not str and isinstance(stdin, str): + stdin = encode_text_stream(stdin) return write_pipe(real_cmd, stdin) def read_pipe_full(c): @@ -193,15 +301,17 @@ def read_pipe_full(c): if verbose: sys.stderr.write('Reading pipe: %s\n' % str(c)) - expand = isinstance(c,basestring) + expand = not isinstance(c, list) p = subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=expand) (out, err) = p.communicate() - return (p.returncode, out, err) + return (p.returncode, out, decode_text_stream(err)) -def read_pipe(c, ignore_error=False): +def read_pipe(c, ignore_error=False, raw=False): """ Read output from command. Returns the output text on success. On failure, terminates execution, unless ignore_error is True, when it returns an empty string. + + If raw is True, do not attempt to decode output text. """ (retcode, out, err) = read_pipe_full(c) if retcode != 0: @@ -209,6 +319,8 @@ def read_pipe(c, ignore_error=False): out = "" else: die('Command failed: %s\nError: %s' % (str(c), err)) + if not raw: + out = decode_text_stream(out) return out def read_pipe_text(c): @@ -219,23 +331,22 @@ def read_pipe_text(c): if retcode != 0: return None else: - return out.rstrip() + return decode_text_stream(out).rstrip() -def p4_read_pipe(c, ignore_error=False): +def p4_read_pipe(c, ignore_error=False, raw=False): real_cmd = p4_build_cmd(c) - return read_pipe(real_cmd, ignore_error) + return read_pipe(real_cmd, ignore_error, raw=raw) def read_pipe_lines(c): if verbose: sys.stderr.write('Reading pipe: %s\n' % str(c)) - expand = isinstance(c, basestring) + expand = not isinstance(c, list) p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand) pipe = p.stdout - val = pipe.readlines() + val = [decode_text_stream(line) for line in pipe.readlines()] if pipe.close() or p.wait(): die('Command failed: %s' % str(c)) - return val def p4_read_pipe_lines(c): @@ -263,6 +374,7 @@ def p4_has_move_command(): cmd = p4_build_cmd(["move", "-k", "@from", "@to"]) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (out, err) = p.communicate() + err = decode_text_stream(err) # return code will be 1 in either case if err.find("Invalid option") >= 0: return False @@ -272,7 +384,7 @@ def p4_has_move_command(): return True def system(cmd, ignore_error=False): - expand = isinstance(cmd,basestring) + expand = not isinstance(cmd, list) if verbose: sys.stderr.write("executing %s\n" % str(cmd)) retcode = subprocess.call(cmd, shell=expand) @@ -284,7 +396,7 @@ def system(cmd, ignore_error=False): def p4_system(cmd): """Specifically invoke p4 as the system command. """ real_cmd = p4_build_cmd(cmd) - expand = isinstance(real_cmd, basestring) + expand = not isinstance(real_cmd, list) retcode = subprocess.call(real_cmd, shell=expand) if retcode: raise CalledProcessError(retcode, real_cmd) @@ -522,7 +634,7 @@ def getP4OpenedType(file): # Return the set of all p4 labels def getP4Labels(depotPaths): labels = set() - if isinstance(depotPaths,basestring): + if not isinstance(depotPaths, list): depotPaths = [depotPaths] for l in p4CmdList(["labels"] + ["%s..." % p for p in depotPaths]): @@ -539,12 +651,7 @@ def getGitTags(): gitTags.add(tag) return gitTags -def diffTreePattern(): - # This is a simple generator for the diff tree regex pattern. This could be - # a class variable if this and parseDiffTreeEntry were a part of a class. - pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)') - while True: - yield pattern +_diff_tree_pattern = None def parseDiffTreeEntry(entry): """Parses a single diff tree entry into its component elements. @@ -565,7 +672,11 @@ def parseDiffTreeEntry(entry): If the pattern is not matched, None is returned.""" - match = diffTreePattern().next().match(entry) + global _diff_tree_pattern + if not _diff_tree_pattern: + _diff_tree_pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)') + + match = _diff_tree_pattern.match(entry) if match: return { 'src_mode': match.group(1), @@ -603,13 +714,21 @@ 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) def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False, errors_as_exceptions=False): - if isinstance(cmd,basestring): + if not isinstance(cmd, list): cmd = "-G " + cmd expand = True else: @@ -626,11 +745,12 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False, stdin_file = None if stdin is not None: stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode) - if isinstance(stdin,basestring): + if not isinstance(stdin, list): stdin_file.write(stdin) else: for i in stdin: - stdin_file.write(i + '\n') + stdin_file.write(encode_text_stream(i)) + stdin_file.write(b'\n') stdin_file.flush() stdin_file.seek(0) @@ -643,6 +763,20 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False, try: while True: entry = marshal.load(p4.stdout) + if bytes is not str: + # Decode unmarshalled dict to use str keys and values, except for: + # - `data` which may contain arbitrary binary data + # - `depotFile[0-9]*`, `path`, or `clientFile` which may contain non-UTF8 encoded text + decoded_entry = {} + for key, value in entry.items(): + key = key.decode() + if isinstance(value, bytes) and not (key in ('data', 'path', 'clientFile') or key.startswith('depotFile')): + value = value.decode() + decoded_entry[key] = value + # Parse out data if it's an error response + if decoded_entry.get('code') == 'error' and 'data' in decoded_entry: + decoded_entry['data'] = decoded_entry['data'].decode() + entry = decoded_entry if skip_info: if 'code' in entry and entry['code'] == 'info': continue @@ -693,7 +827,8 @@ def p4Where(depotPath): if "depotFile" in entry: # Search for the base client side depot path, as long as it starts with the branch's P4 path. # The base path always ends with "/...". - if entry["depotFile"].find(depotPath) == 0 and entry["depotFile"][-4:] == "/...": + entry_path = decode_path(entry['depotFile']) + if entry_path.find(depotPath) == 0 and entry_path[-4:] == "/...": output = entry break elif "data" in entry: @@ -708,11 +843,11 @@ def p4Where(depotPath): return "" clientPath = "" if "path" in output: - clientPath = output.get("path") + clientPath = decode_path(output['path']) elif "data" in output: data = output.get("data") - lastSpace = data.rfind(" ") - clientPath = data[lastSpace + 1:] + lastSpace = data.rfind(b" ") + clientPath = decode_path(data[lastSpace + 1:]) if clientPath.endswith("..."): clientPath = clientPath[:-3] @@ -860,6 +995,7 @@ def branch_exists(branch): cmd = [ "git", "rev-parse", "--symbolic", "--verify", branch ] p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, _ = p.communicate() + out = decode_text_stream(out) if p.returncode: return False # expect exactly one line of output: the branch name @@ -1137,7 +1273,7 @@ class LargeFileSystem(object): assert False, "Method 'pushFile' required in " + self.__class__.__name__ def hasLargeFileExtension(self, relPath): - return reduce( + return functools.reduce( lambda a, b: a or b, [relPath.endswith('.' + e) for e in gitConfigList('git-p4.largeFileExtensions')], False @@ -1160,13 +1296,11 @@ class LargeFileSystem(object): if contentsSize <= gitConfigInt('git-p4.largeFileCompressedThreshold'): return False contentTempFile = self.generateTempFile(contents) - 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 + 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 os.remove(contentTempFile) - os.remove(compressedContentFile.name) if compressedContentsSize > gitConfigInt('git-p4.largeFileCompressedThreshold'): return True return False @@ -1246,7 +1380,7 @@ class GitLFS(LargeFileSystem): ['git', 'lfs', 'pointer', '--file=' + contentFile], stdout=subprocess.PIPE ) - pointerFile = pointerProcess.stdout.read() + pointerFile = decode_text_stream(pointerProcess.stdout.read()) if pointerProcess.wait(): os.remove(contentFile) die('git-lfs pointer command failed. Did you install the extension?') @@ -1259,9 +1393,15 @@ 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( - os.getcwd(), - '.git', 'lfs', 'objects', oid[:2], oid[2:4], + lfs_path, + 'objects', oid[:2], oid[2:4], oid, ) # LFS Spec states that pointer files should not have the executable bit set. @@ -1376,14 +1516,14 @@ class P4UserMap: for (key, val) in self.users.items(): s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1)) - open(self.getUserCacheFilename(), "wb").write(s) + open(self.getUserCacheFilename(), 'w').write(s) self.userMapFromPerforceServer = True def loadUserMapFromCache(self): self.users = {} self.userMapFromPerforceServer = False try: - cache = open(self.getUserCacheFilename(), "rb") + cache = open(self.getUserCacheFilename(), 'r') lines = cache.readlines() cache.close() for line in lines: @@ -1498,13 +1638,39 @@ class P4Submit(Command, P4UserMap): "work from a local git branch that is not master"), optparse.make_option("--disable-p4sync", dest="disable_p4sync", action="store_true", help="Skip Perforce sync of p4/master after submit or shelve"), + optparse.make_option("--no-verify", dest="no_verify", action="store_true", + help="Bypass p4-pre-submit and p4-changelist hooks"), ] self.description = """Submit changes from git to the perforce depot.\n - The `p4-pre-submit` hook is executed if it exists and is executable. - The hook takes no parameters and nothing from standard input. Exiting with - non-zero status from this script prevents `git-p4 submit` from launching. - - One usage scenario is to run unit tests in the hook.""" + The `p4-pre-submit` hook is executed if it exists and is executable. It + can be bypassed with the `--no-verify` command line option. The hook takes + no parameters and nothing from standard input. Exiting with a non-zero status + from this script prevents `git-p4 submit` from launching. + + One usage scenario is to run unit tests in the hook. + + The `p4-prepare-changelist` hook is executed right after preparing the default + changelist message and before the editor is started. It takes one parameter, + the name of the file that contains the changelist text. Exiting with a non-zero + status from the script will abort the process. + + The purpose of the hook is to edit the message file in place, and it is not + supressed by the `--no-verify` option. This hook is called even if + `--prepare-p4-only` is set. + + The `p4-changelist` hook is executed after the changelist message has been + edited by the user. It can be bypassed with the `--no-verify` option. It + takes a single parameter, the name of the file that holds the proposed + changelist text. Exiting with a non-zero status causes the command to abort. + + The hook is allowed to edit the changelist file and can be used to normalize + the text into some project standard format. It can also be used to refuse the + Submit after inspect the message file. + + The `p4-post-changelist` hook is invoked after the submit has successfully + occured in P4. It takes no parameters and is meant primarily for notification + and cannot affect the outcome of the git p4 submit action. + """ self.usage += " [name of git branch to submit into perforce depot]" self.origin = "" @@ -1522,6 +1688,7 @@ class P4Submit(Command, P4UserMap): self.exportLabels = False self.p4HasMoveCommand = p4_has_move_command() self.branch = None + self.no_verify = False if gitConfig('git-p4.largeFileSystem'): die("Large file system not supported for git-p4 submit command. Please remove it from config.") @@ -1660,7 +1827,8 @@ class P4Submit(Command, P4UserMap): c = changes[0] if c['User'] == newUser: return # nothing to do c['User'] = newUser - input = marshal.dumps(c) + # p4 does not understand format version 3 and above + input = marshal.dumps(c, 2) result = p4CmdList("change -f -i", stdin=input) for r in result: @@ -1724,7 +1892,7 @@ class P4Submit(Command, P4UserMap): break if not change_entry: die('Failed to decode output of p4 change -o') - for key, value in change_entry.iteritems(): + for key, value in change_entry.items(): if key.startswith('File'): if 'depot-paths' in settings: if not [p for p in settings['depot-paths'] @@ -1780,12 +1948,11 @@ class P4Submit(Command, P4UserMap): if os.stat(template_file).st_mtime > mtime: return True - 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 + response = prompt("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 @@ -1909,6 +2076,9 @@ class P4Submit(Command, P4UserMap): applyPatchCmd = patchcmd + "--check --apply -" patch_succeeded = True + if verbose: + print("TryPatch: %s" % tryPatchCmd) + if os.system(tryPatchCmd) != 0: fixed_rcs_keywords = False patch_succeeded = False @@ -1948,6 +2118,7 @@ class P4Submit(Command, P4UserMap): print("Retrying the patch with RCS keywords cleaned up") if os.system(tryPatchCmd) == 0: patch_succeeded = True + print("Patch succeesed this time with RCS keywords cleaned") if not patch_succeeded: for f in editedFiles: @@ -2005,58 +2176,76 @@ class P4Submit(Command, P4UserMap): tmpFile = os.fdopen(handle, "w+b") if self.isWindows: submitTemplate = submitTemplate.replace("\n", "\r\n") - tmpFile.write(submitTemplate) + tmpFile.write(encode_text_stream(submitTemplate)) tmpFile.close() - if self.prepare_p4_only: - # - # Leave the p4 tree prepared, and the submit template around - # and let the user decide what to do next - # - print() - print("P4 workspace prepared for submission.") - print("To submit or revert, go to client workspace") - print(" " + self.clientPath) - print() - print("To submit, use \"p4 submit\" to write a new description,") - print("or \"p4 submit -i <%s\" to use the one prepared by" \ - " \"git p4\"." % fileName) - print("You can delete the file \"%s\" when finished." % fileName) - - if self.preserveUser and p4User and not self.p4UserIsMe(p4User): - print("To preserve change ownership by user %s, you must\n" \ - "do \"p4 change -f <change>\" after submitting and\n" \ - "edit the User field.") - if pureRenameCopy: - print("After submitting, renamed files must be re-synced.") - print("Invoke \"p4 sync -f\" on each of these files:") - for f in pureRenameCopy: - print(" " + f) - - print() - print("To revert the changes, use \"p4 revert ...\", and delete") - print("the submit template file \"%s\"" % fileName) - if filesToAdd: - print("Since the commit adds new files, they must be deleted:") - for f in filesToAdd: - print(" " + f) - print() - return True - - # - # Let the user edit the change description, then submit it. - # submitted = False try: + # Allow the hook to edit the changelist text before presenting it + # to the user. + if not run_git_hook("p4-prepare-changelist", [fileName]): + return False + + if self.prepare_p4_only: + # + # Leave the p4 tree prepared, and the submit template around + # and let the user decide what to do next + # + submitted = True + print("") + print("P4 workspace prepared for submission.") + print("To submit or revert, go to client workspace") + print(" " + self.clientPath) + print("") + print("To submit, use \"p4 submit\" to write a new description,") + print("or \"p4 submit -i <%s\" to use the one prepared by" \ + " \"git p4\"." % fileName) + print("You can delete the file \"%s\" when finished." % fileName) + + if self.preserveUser and p4User and not self.p4UserIsMe(p4User): + print("To preserve change ownership by user %s, you must\n" \ + "do \"p4 change -f <change>\" after submitting and\n" \ + "edit the User field.") + if pureRenameCopy: + print("After submitting, renamed files must be re-synced.") + print("Invoke \"p4 sync -f\" on each of these files:") + for f in pureRenameCopy: + print(" " + f) + + print("") + print("To revert the changes, use \"p4 revert ...\", and delete") + print("the submit template file \"%s\"" % fileName) + if filesToAdd: + print("Since the commit adds new files, they must be deleted:") + for f in filesToAdd: + print(" " + f) + print("") + sys.stdout.flush() + return True + if self.edit_template(fileName): + if not self.no_verify: + if not run_git_hook("p4-changelist", [fileName]): + print("The p4-changelist hook failed.") + sys.stdout.flush() + return False + # read the edited message and submit tmpFile = open(fileName, "rb") - message = tmpFile.read() + message = decode_text_stream(tmpFile.read()) tmpFile.close() if self.isWindows: message = message.replace("\r\n", "\n") - submitTemplate = message[:message.index(separatorLine)] + if message.find(separatorLine) != -1: + submitTemplate = message[:message.index(separatorLine)] + else: + submitTemplate = message + + if len(submitTemplate.strip()) == 0: + print("Changelist is empty, aborting this changelist.") + sys.stdout.flush() + return False if update_shelve: p4_write_pipe(['shelve', '-r', '-i'], submitTemplate) @@ -2079,20 +2268,23 @@ class P4Submit(Command, P4UserMap): submitted = True + run_git_hook("p4-post-changelist") finally: - # skip this patch + # Revert changes if we skip this patch if not submitted or self.shelve: if self.shelve: print ("Reverting shelved files.") else: print ("Submission cancelled, undoing p4 changes.") + sys.stdout.flush() for f in editedFiles | filesToDelete: p4_revert(f) for f in filesToAdd: p4_revert(f) os.remove(f) - os.remove(fileName) + if not self.prepare_p4_only: + os.remove(fileName) return submitted # Export git tags as p4 labels. Create a p4 label and then tag @@ -2316,13 +2508,17 @@ class P4Submit(Command, P4UserMap): sys.exit("number of commits (%d) must match number of shelved changelist (%d)" % (len(commits), num_shelves)) - hooks_path = gitConfig("core.hooksPath") - if len(hooks_path) <= 0: - hooks_path = os.path.join(os.environ.get("GIT_DIR", ".git"), "hooks") - - hook_file = os.path.join(hooks_path, "p4-pre-submit") - if os.path.isfile(hook_file) and os.access(hook_file, os.X_OK) and subprocess.call([hook_file]) != 0: - sys.exit(1) + if not self.no_verify: + try: + if not run_git_hook("p4-pre-submit"): + print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nYou can skip " \ + "this pre-submission check by adding\nthe command line option '--no-verify', " \ + "however,\nthis will also skip the p4-changelist hook as well.") + sys.exit(1) + except Exception as e: + print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed "\ + "with the error '{0}'".format(e.message) ) + sys.exit(1) # # Apply the commits, one at a time. On failure, ask if should @@ -2341,37 +2537,29 @@ class P4Submit(Command, P4UserMap): ok = self.applyCommit(commit) if ok: applied.append(commit) - else: - if self.prepare_p4_only and i < last: - print("Processing only the first commit due to option" \ - " --prepare-p4-only") + if self.prepare_p4_only: + if i < last: + print("Processing only the first commit due to option" \ + " --prepare-p4-only") break + else: if i < last: - 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: + # 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") break chdir(self.oldWorkingDirectory) @@ -2481,7 +2669,7 @@ class View(object): def convert_client_path(self, clientFile): # chop off //client/ part to make it relative - if not clientFile.startswith(self.client_prefix): + if not decode_path(clientFile).startswith(self.client_prefix): die("No prefix '%s' on clientFile '%s'" % (self.client_prefix, clientFile)) return clientFile[len(self.client_prefix):] @@ -2490,7 +2678,7 @@ class View(object): """ Caching file paths by "p4 where" batch query """ # List depot file paths exclude that already cached - fileArgs = [f['path'] for f in files if f['path'] not in self.client_spec_path_cache] + fileArgs = [f['path'] for f in files if decode_path(f['path']) not in self.client_spec_path_cache] if len(fileArgs) == 0: return # All files in cache @@ -2505,16 +2693,18 @@ class View(object): if "unmap" in res: # it will list all of them, but only one not unmap-ped continue + depot_path = decode_path(res['depotFile']) if gitConfigBool("core.ignorecase"): - res['depotFile'] = res['depotFile'].lower() - self.client_spec_path_cache[res['depotFile']] = self.convert_client_path(res["clientFile"]) + depot_path = depot_path.lower() + self.client_spec_path_cache[depot_path] = self.convert_client_path(res["clientFile"]) # not found files or unmap files set to "" for depotFile in fileArgs: + depotFile = decode_path(depotFile) if gitConfigBool("core.ignorecase"): depotFile = depotFile.lower() if depotFile not in self.client_spec_path_cache: - self.client_spec_path_cache[depotFile] = "" + self.client_spec_path_cache[depotFile] = b'' def map_in_client(self, depot_path): """Return the relative location in the client where this @@ -2619,6 +2809,7 @@ class P4Sync(Command, P4UserMap): def checkpoint(self): self.gitStream.write("checkpoint\n\n") self.gitStream.write("progress checkpoint\n\n") + self.gitStream.flush() out = self.gitOutput.readline() if self.verbose: print("checkpoint finished: " + out) @@ -2632,7 +2823,7 @@ class P4Sync(Command, P4UserMap): elif path.lower() == p.lower(): return False for p in self.depotPaths: - if p4PathStartsWith(path, p): + if p4PathStartsWith(path, decode_path(p)): return True return False @@ -2641,7 +2832,7 @@ class P4Sync(Command, P4UserMap): fnum = 0 while "depotFile%s" % fnum in commit: path = commit["depotFile%s" % fnum] - found = self.isPathWanted(path) + found = self.isPathWanted(decode_path(path)) if not found: fnum = fnum + 1 continue @@ -2675,7 +2866,7 @@ class P4Sync(Command, P4UserMap): if self.useClientSpec: # branch detection moves files up a level (the branch name) # from what client spec interpretation gives - path = self.clientSpecDirs.map_in_client(path) + path = decode_path(self.clientSpecDirs.map_in_client(path)) if self.detectBranches: for b in self.knownBranches: if p4PathStartsWith(path, b + "/"): @@ -2709,14 +2900,15 @@ class P4Sync(Command, P4UserMap): branches = {} fnum = 0 while "depotFile%s" % fnum in commit: - path = commit["depotFile%s" % fnum] + raw_path = commit["depotFile%s" % fnum] + path = decode_path(raw_path) found = self.isPathWanted(path) if not found: fnum = fnum + 1 continue file = {} - file["path"] = path + file["path"] = raw_path file["rev"] = commit["rev%s" % fnum] file["action"] = commit["action%s" % fnum] file["type"] = commit["type%s" % fnum] @@ -2725,7 +2917,7 @@ class P4Sync(Command, P4UserMap): # start with the full relative path where this file would # go in a p4 client if self.useClientSpec: - relPath = self.clientSpecDirs.map_in_client(path) + relPath = decode_path(self.clientSpecDirs.map_in_client(path)) else: relPath = self.stripRepoPath(path, self.depotPaths) @@ -2741,7 +2933,7 @@ class P4Sync(Command, P4UserMap): return branches def writeToGitStream(self, gitMode, relPath, contents): - self.gitStream.write('M %s inline %s\n' % (gitMode, relPath)) + self.gitStream.write(encode_text_stream(u'M {} inline {}\n'.format(gitMode, relPath))) self.gitStream.write('data %d\n' % sum(len(d) for d in contents)) for d in contents: self.gitStream.write(d) @@ -2763,14 +2955,15 @@ class P4Sync(Command, P4UserMap): # - helper for streamP4Files def streamOneP4File(self, file, contents): - relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes) - relPath = self.encodeWithUTF8(relPath) + file_path = file['depotFile'] + relPath = self.stripRepoPath(decode_path(file_path), self.branchPrefixes) + if verbose: if 'fileSize' in self.stream_file: size = int(self.stream_file['fileSize']) else: size = 0 # deleted files don't get a fileSize apparently - sys.stdout.write('\r%s --> %s (%i MB)\n' % (file['depotFile'], relPath, size/1024/1024)) + sys.stdout.write('\r%s --> %s (%i MB)\n' % (file_path, relPath, size/1024/1024)) sys.stdout.flush() (type_base, type_mods) = split_p4_type(file["type"]) @@ -2782,13 +2975,13 @@ class P4Sync(Command, P4UserMap): git_mode = "120000" # p4 print on a symlink sometimes contains "target\n"; # if it does, remove the newline - data = ''.join(contents) + data = ''.join(decode_text_stream(c) for c in contents) if not data: # Some version of p4 allowed creating a symlink that pointed # to nothing. This causes p4 errors when checking out such # a change, and errors here too. Work around it by ignoring # the bad symlink; hopefully a future change fixes it. - print("\nIgnoring empty symlink in %s" % file['depotFile']) + print("\nIgnoring empty symlink in %s" % file_path) return elif data[-1] == '\n': contents = [data[:-1]] @@ -2807,7 +3000,7 @@ class P4Sync(Command, P4UserMap): # just the native "NT" type. # try: - text = p4_read_pipe(['print', '-q', '-o', '-', '%s@%s' % (file['depotFile'], file['change'])]) + text = p4_read_pipe(['print', '-q', '-o', '-', '%s@%s' % (decode_path(file['depotFile']), file['change'])], raw=True) except Exception as e: if 'Translation of file content failed' in str(e): type_base = 'binary' @@ -2815,7 +3008,7 @@ class P4Sync(Command, P4UserMap): raise e else: if p4_version_string().find('/NT') >= 0: - text = text.replace('\r\n', '\n') + text = text.replace(b'\r\n', b'\n') contents = [ text ] if type_base == "apple": @@ -2836,7 +3029,7 @@ class P4Sync(Command, P4UserMap): pattern = p4_keywords_regexp_for_type(type_base, type_mods) if pattern: regexp = re.compile(pattern, re.VERBOSE) - text = ''.join(contents) + text = ''.join(decode_text_stream(c) for c in contents) text = regexp.sub(r'$\1$', text) contents = [ text ] @@ -2846,12 +3039,11 @@ class P4Sync(Command, P4UserMap): self.writeToGitStream(git_mode, relPath, contents) def streamOneP4Deletion(self, file): - relPath = self.stripRepoPath(file['path'], self.branchPrefixes) - relPath = self.encodeWithUTF8(relPath) + relPath = self.stripRepoPath(decode_path(file['path']), self.branchPrefixes) if verbose: sys.stdout.write("delete %s\n" % relPath) sys.stdout.flush() - self.gitStream.write("D %s\n" % relPath) + self.gitStream.write(encode_text_stream(u'D {}\n'.format(relPath))) if self.largeFileSystem and self.largeFileSystem.isLargeFile(relPath): self.largeFileSystem.removeLargeFile(relPath) @@ -2951,9 +3143,9 @@ class P4Sync(Command, P4UserMap): if 'shelved_cl' in f: # Handle shelved CLs using the "p4 print file@=N" syntax to print # the contents - fileArg = '%s@=%d' % (f['path'], f['shelved_cl']) + fileArg = f['path'] + encode_text_stream('@={}'.format(f['shelved_cl'])) else: - fileArg = '%s#%s' % (f['path'], f['rev']) + fileArg = f['path'] + encode_text_stream('#{}'.format(f['rev'])) fileArgs.append(fileArg) @@ -3023,6 +3215,42 @@ class P4Sync(Command, P4UserMap): print('Ignoring file outside of prefix: {0}'.format(path)) return hasPrefix + def findShadowedFiles(self, files, change): + # Perforce allows you commit files and directories with the same name, + # so you could have files //depot/foo and //depot/foo/bar both checked + # in. A p4 sync of a repository in this state fails. Deleting one of + # the files recovers the repository. + # + # Git will not allow the broken state to exist and only the most recent + # of the conflicting names is left in the repository. When one of the + # conflicting files is deleted we need to re-add the other one to make + # sure the git repository recovers in the same way as perforce. + deleted = [f for f in files if f['action'] in self.delete_actions] + to_check = set() + for f in deleted: + path = decode_path(f['path']) + to_check.add(path + '/...') + while True: + path = path.rsplit("/", 1)[0] + if path == "/" or path in to_check: + break + to_check.add(path) + to_check = ['%s@%s' % (wildcard_encode(p), change) for p in to_check + if self.hasBranchPrefix(p)] + if to_check: + stat_result = p4CmdList(["-x", "-", "fstat", "-T", + "depotFile,headAction,headRev,headType"], stdin=to_check) + for record in stat_result: + if record['code'] != 'stat': + continue + if record['headAction'] in self.delete_actions: + continue + files.append({ + 'action': 'add', + 'path': record['depotFile'], + 'rev': record['headRev'], + 'type': record['headType']}) + def commit(self, details, files, branch, parent = "", allow_empty=False): epoch = details["time"] author = details["user"] @@ -3031,11 +3259,14 @@ class P4Sync(Command, P4UserMap): if self.verbose: print('commit into {0}'.format(branch)) + files = [f for f in files + if self.hasBranchPrefix(decode_path(f['path']))] + self.findShadowedFiles(files, details['change']) + if self.clientSpecDirs: self.clientSpecDirs.update_client_spec_path_cache(files) - files = [f for f in files - if self.inClientSpec(f['path']) and self.hasBranchPrefix(f['path'])] + files = [f for f in files if self.inClientSpec(decode_path(f['path']))] if gitConfigBool('git-p4.keepEmptyCommits'): allow_empty = True @@ -3525,10 +3756,79 @@ class P4Sync(Command, P4UserMap): self.updateOptionDict(details) try: self.commit(details, self.extractFilesFromCommit(details), self.branch) - except IOError: + except IOError as err: 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, @@ -3538,12 +3838,24 @@ class P4Sync(Command, P4UserMap): self.gitStream = self.importProcess.stdin self.gitError = self.importProcess.stderr + if bytes is not str: + # Wrap gitStream.write() so that it can be called using `str` arguments + def make_encoded_write(write): + def encoded_write(s): + return write(s.encode() if isinstance(s, str) else s) + return encoded_write + + self.gitStream.write = make_encoded_write(self.gitStream.write) + 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: @@ -3727,87 +4039,36 @@ class P4Sync(Command, P4UserMap): b = b[len(self.projectName):] self.createdBranches.add(b) - self.openStreams() - - if revision: - self.importHeadRevision(revision) - else: - changes = [] - - 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) + p4_check_access() - 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) + self.openStreams() - if len(self.maxChanges) > 0: - changes = changes[:min(int(self.maxChanges), len(changes))] + err = None - if len(changes) == 0: - if not self.silent: - print("No changes to import!") + try: + if revision: + self.importHeadRevision(revision) else: - if not self.silent and not self.detectBranches: - print("Import destination: %s" % self.branch) + self.importRevisions(args, branch_arg_given) - self.updatedBranches = set() + if gitConfigBool("git-p4.importLabels"): + self.importLabels = True - if not self.detectBranches: - if args: - # start a new branch - self.initialParent = "" - else: - # build on a previous revision - self.initialParent = parseRevision(self.branch) + if self.importLabels: + p4Labels = getP4Labels(self.depotPaths) + gitTags = getGitTags() - self.importChanges(changes) + missingP4Labels = p4Labels - gitTags + self.importP4Labels(self.gitStream, missingP4Labels) - 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() + except P4CommandException as e: + err = e - missingP4Labels = p4Labels - gitTags - self.importP4Labels(self.gitStream, missingP4Labels) + finally: + self.closeStreams() - self.closeStreams() + if err: + die(str(err)) # Cleanup temporary branches created during import if self.tempBranches != []: @@ -3976,7 +4237,7 @@ class P4Unshelve(Command): """ for parent in (range(65535)): - log = extractLogMessageFromGitCommit("{0}^{1}".format(starting_point, parent)) + log = extractLogMessageFromGitCommit("{0}~{1}".format(starting_point, parent)) settings = extractSettingsGitLog(log) if 'change' in settings: return settings @@ -4111,7 +4372,6 @@ commands = { "unshelve" : P4Unshelve, } - def main(): if len(sys.argv[1:]) == 0: printUsage(commands.keys()) @@ -4141,7 +4401,12 @@ def main(): description = cmd.description, formatter = HelpFormatter()) - (cmd, args) = parser.parse_args(sys.argv[2:], cmd); + try: + (cmd, args) = parser.parse_args(sys.argv[2:], cmd); + except: + parser.print_help() + raise + global verbose verbose = cmd.verbose if cmd.needsGit: diff --git a/third_party/git/git-rebase--preserve-merges.sh b/third_party/git/git-rebase--preserve-merges.sh index dec90e9af6..b9c71d2a71 100644 --- a/third_party/git/git-rebase--preserve-merges.sh +++ b/third_party/git/git-rebase--preserve-merges.sh @@ -193,16 +193,6 @@ mark_action_done () { fi } -# Put the last action marked done at the beginning of the todo list -# again. If there has not been an action marked done yet, leave the list of -# items on the todo list unchanged. -reschedule_last_action () { - tail -n 1 "$done" | cat - "$todo" >"$todo".new - sed -e \$d <"$done" >"$done".new - mv -f "$todo".new "$todo" - mv -f "$done".new "$done" -} - append_todo_help () { gettext " Commands: diff --git a/third_party/git/git-send-email.perl b/third_party/git/git-send-email.perl index 5f92c89c1c..1f425c0809 100755 --- a/third_party/git/git-send-email.perl +++ b/third_party/git/git-send-email.perl @@ -250,6 +250,7 @@ my $chain_reply_to = 0; my $use_xmailer = 1; my $validate = 1; my $target_xfer_encoding = 'auto'; +my $forbid_sendmail_variables = 1; my %config_bool_settings = ( "thread" => \$thread, @@ -263,6 +264,7 @@ my %config_bool_settings = ( "multiedit" => \$multiedit, "annotate" => \$annotate, "xmailer" => \$use_xmailer, + "forbidsendmailvariables" => \$forbid_sendmail_variables, ); my %config_settings = ( @@ -478,6 +480,12 @@ unless ($rc) { usage(); } +if ($forbid_sendmail_variables && (scalar Git::config_regexp("^sendmail[.]")) != 0) { + die __("fatal: found configuration options for 'sendmail'\n" . + "git-send-email is configured with the sendemail.* options - note the 'e'.\n" . + "Set sendemail.forbidSendmailVariables to false to disable this check.\n"); +} + die __("Cannot run git format-patch from outside a repository\n") if $format_patch and not $repo; @@ -1228,7 +1236,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 receiveing MTA may deny the connection. +# match, the receiving MTA may deny the connection. # # Here is a deny example of Net::SMTP with the default "localhost.localdomain" # @@ -1699,10 +1707,14 @@ sub process_file { $xfer_encoding = $1 if not defined $xfer_encoding; } elsif (/^In-Reply-To: (.*)/i) { - $in_reply_to = $1; + if (!$initial_in_reply_to || $thread) { + $in_reply_to = $1; + } } elsif (/^References: (.*)/i) { - $references = $1; + if (!$initial_in_reply_to || $thread) { + $references = $1; + } } elsif (!/^Date:\s/i && /^[-A-Za-z]+:\s+\S/) { push @xh, $_; diff --git a/third_party/git/git-submodule.sh b/third_party/git/git-submodule.sh index c7f58c5756..7ce52872b7 100755 --- a/third_party/git/git-submodule.sh +++ b/third_party/git/git-submodule.sh @@ -10,8 +10,9 @@ 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] [--] [<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] 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>...] @@ -36,6 +37,7 @@ reference= cached= recursive= init= +require_init= files= remote= nofetch= @@ -45,6 +47,9 @@ custom_name= depth= progress= dissociate= +single_branch= +jobs= +recommend_shallow= die_if_unmatched () { @@ -54,31 +59,6 @@ die_if_unmatched () fi } -# -# Print a submodule configuration setting -# -# $1 = submodule name -# $2 = option name -# $3 = default value -# -# Checks in the usual git-config places first (for overrides), -# otherwise it falls back on .gitmodules. This allows you to -# distribute project-wide defaults in .gitmodules, while still -# customizing individual repositories if necessary. If the option is -# not in .gitmodules either, print a default value. -# -get_submodule_config () { - name="$1" - option="$2" - default="$3" - value=$(git config submodule."$name"."$option") - if test -z "$value" - then - value=$(git submodule--helper config submodule."$name"."$option") - fi - printf '%s' "${value:-$default}" -} - isnumber() { n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1" @@ -239,13 +219,15 @@ cmd_add() die "$(eval_gettext "'\$sm_path' does not have a commit checked out")" fi - if test -z "$force" && - ! git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" > /dev/null 2>&1 + if test -z "$force" then - 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 + 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 fi if test -n "$custom_name" @@ -458,7 +440,7 @@ cmd_update() GIT_QUIET=1 ;; -v) - GIT_QUIET=0 + unset GIT_QUIET ;; --progress) progress=1 @@ -466,6 +448,10 @@ cmd_update() -i|--init) init=1 ;; + --require-init) + init=1 + require_init=1 + ;; --remote) remote=1 ;; @@ -520,6 +506,12 @@ cmd_update() --jobs=*) jobs=$1 ;; + --single-branch) + single_branch="--single-branch" + ;; + --no-single-branch) + single_branch="--no-single-branch" + ;; --) shift break @@ -548,6 +540,8 @@ cmd_update() ${reference:+"$reference"} \ ${dissociate:+"--dissociate"} \ ${depth:+--depth "$depth"} \ + ${require_init:+--require-init} \ + $single_branch \ $recommend_shallow \ $jobs \ -- \ @@ -620,13 +614,13 @@ cmd_update() say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")" ;; rebase) - command="git rebase" + command="git rebase ${GIT_QUIET:+--quiet}" die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")" say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")" must_die_on_failure=yes ;; merge) - command="git merge" + command="git merge ${GIT_QUIET:+--quiet}" die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")" say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")" must_die_on_failure=yes @@ -700,7 +694,7 @@ cmd_update() # $@ = requested path # cmd_set_branch() { - unset_branch=false + default= branch= while test $# -ne 0 @@ -710,7 +704,7 @@ cmd_set_branch() { # we don't do anything with this but we need to accept it ;; -d|--default) - unset_branch=true + default=1 ;; -b|--branch) case "$2" in '') usage ;; esac @@ -731,33 +725,36 @@ cmd_set_branch() { shift done - if test $# -ne 1 - 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 - - test -n "$branch"; has_branch=$? - test "$unset_branch" = true; has_unset_branch=$? + git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper set-branch ${GIT_QUIET:+--quiet} ${branch:+--branch "$branch"} ${default:+--default} -- "$@" +} - if test $((!$has_branch != !$has_unset_branch)) -eq 0 - then - usage - fi +# +# 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 $has_branch -eq 0 - then - git submodule--helper config submodule."$name".branch "$branch" - else - git submodule--helper config --unset submodule."$name".branch - fi + git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper set-url ${GIT_QUIET:+--quiet} -- "$@" } # @@ -809,166 +806,7 @@ cmd_summary() { shift done - test $summary_limit = 0 && return - - if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"}) - then - head=$rev - test $# = 0 || shift - elif test -z "$1" || test "$1" = "HEAD" - then - # before the first commit: compare with an empty tree - head=$(git hash-object -w -t tree --stdin </dev/null) - test -z "$1" || shift - else - head="HEAD" - fi - - if [ -n "$files" ] - then - test -n "$cached" && - die "$(gettext "The --cached option cannot be used with the --files option")" - diff_cmd=diff-files - head= - fi - - cd_to_toplevel - eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")" - # Get modified modules cared by user - modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" | - sane_egrep '^:([0-7]* )?160000' | - while read -r mod_src mod_dst sha1_src sha1_dst status sm_path - do - # Always show modules deleted or type-changed (blob<->module) - if test "$status" = D || test "$status" = T - then - printf '%s\n' "$sm_path" - continue - fi - # Respect the ignore setting for --for-status. - if test -n "$for_status" - then - name=$(git submodule--helper name "$sm_path") - ignore_config=$(get_submodule_config "$name" ignore none) - test $status != A && test $ignore_config = all && continue - fi - # Also show added or modified modules which are checked out - GIT_DIR="$sm_path/.git" git rev-parse --git-dir >/dev/null 2>&1 && - printf '%s\n' "$sm_path" - done - ) - - test -z "$modules" && return - - git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules | - sane_egrep '^:([0-7]* )?160000' | - cut -c2- | - while read -r mod_src mod_dst sha1_src sha1_dst status name - do - if test -z "$cached" && - is_zero_oid $sha1_dst - then - case "$mod_dst" in - 160000) - sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD) - ;; - 100644 | 100755 | 120000) - sha1_dst=$(git hash-object $name) - ;; - 000000) - ;; # removed - *) - # unexpected type - eval_gettextln "unexpected mode \$mod_dst" >&2 - continue ;; - esac - fi - missing_src= - missing_dst= - - test $mod_src = 160000 && - ! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_src^0 >/dev/null && - missing_src=t - - test $mod_dst = 160000 && - ! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_dst^0 >/dev/null && - missing_dst=t - - display_name=$(git submodule--helper relative-path "$name" "$wt_prefix") - - total_commits= - case "$missing_src,$missing_dst" in - t,) - errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_src")" - ;; - ,t) - errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_dst")" - ;; - t,t) - errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commits \$sha1_src and \$sha1_dst")" - ;; - *) - errmsg= - total_commits=$( - if test $mod_src = 160000 && test $mod_dst = 160000 - then - range="$sha1_src...$sha1_dst" - elif test $mod_src = 160000 - then - range=$sha1_src - else - range=$sha1_dst - fi - GIT_DIR="$name/.git" \ - git rev-list --first-parent $range -- | wc -l - ) - total_commits=" ($(($total_commits + 0)))" - ;; - esac - - sha1_abbr_src=$(GIT_DIR="$name/.git" git rev-parse --short $sha1_src 2>/dev/null || - echo $sha1_src | cut -c1-7) - sha1_abbr_dst=$(GIT_DIR="$name/.git" git rev-parse --short $sha1_dst 2>/dev/null || - echo $sha1_dst | cut -c1-7) - - if test $status = T - then - blob="$(gettext "blob")" - submodule="$(gettext "submodule")" - if test $mod_dst = 160000 - then - echo "* $display_name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:" - else - echo "* $display_name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:" - fi - else - echo "* $display_name $sha1_abbr_src...$sha1_abbr_dst$total_commits:" - fi - if test -n "$errmsg" - then - # Don't give error msg for modification whose dst is not submodule - # i.e. deleted or changed to blob - test $mod_dst = 160000 && echo "$errmsg" - else - if test $mod_src = 160000 && test $mod_dst = 160000 - then - limit= - test $summary_limit -gt 0 && limit="-$summary_limit" - GIT_DIR="$name/.git" \ - git log $limit --pretty='format: %m %s' \ - --first-parent $sha1_src...$sha1_dst - elif test $mod_dst = 160000 - then - GIT_DIR="$name/.git" \ - git log --pretty='format: > %s' -1 $sha1_dst - else - GIT_DIR="$name/.git" \ - git log --pretty='format: < %s' -1 $sha1_src - fi - echo - fi - echo - done + git ${wt_prefix:+-C "$wt_prefix"} submodule--helper summary ${prefix:+--prefix "$prefix"} ${files:+--files} ${cached:+--cached} ${for_status:+--for-status} ${summary_limit:+-n $summary_limit} -- "$@" } # # List all submodules, prefixed with: @@ -1059,7 +897,7 @@ cmd_absorbgitdirs() while test $# != 0 && test -z "$command" do case "$1" in - add | foreach | init | deinit | update | set-branch | status | summary | sync | absorbgitdirs) + add | foreach | init | deinit | update | set-branch | set-url | 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 050f2a36f4..58f5a7ac8f 100755 --- a/third_party/git/git-svn.perl +++ b/third_party/git/git-svn.perl @@ -5,7 +5,8 @@ use 5.008; use warnings; use strict; use vars qw/ $AUTHOR $VERSION - $sha1 $sha1_short $_revision $_repository + $oid $oid_short $oid_length + $_revision $_repository $_q $_authors $_authors_prog %users/; $AUTHOR = 'Eric Wong <normalperson@yhbt.net>'; $VERSION = '@@GIT_VERSION@@'; @@ -103,14 +104,15 @@ sub _req_svn { } } -$sha1 = qr/[a-f\d]{40}/; -$sha1_short = qr/[a-f\d]{4,40}/; +$oid = qr/(?:[a-f\d]{40}(?:[a-f\d]{24})?)/; +$oid_short = qr/[a-f\d]{4,64}/; +$oid_length = 40; my ($_stdin, $_help, $_edit, $_message, $_file, $_branch_dest, $_template, $_shared, $_version, $_fetch_all, $_no_rebase, $_fetch_parent, $_before, $_after, - $_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local, + $_merge, $_strategy, $_rebase_merges, $_dry_run, $_parents, $_local, $_prefix, $_no_checkout, $_url, $_verbose, $_commit_url, $_tag, $_merge_info, $_interactive, $_set_svn_props); @@ -270,7 +272,8 @@ my %cmd = ( 'local|l' => \$_local, 'fetch-all|all' => \$_fetch_all, 'dry-run|n' => \$_dry_run, - 'preserve-merges|p' => \$_preserve_merges, + 'rebase-merges|p' => \$_rebase_merges, + 'preserve-merges|p' => \$_rebase_merges, %fc_opts } ], 'commit-diff' => [ \&cmd_commit_diff, 'Commit a diff between two trees', @@ -497,6 +500,7 @@ sub do_git_init_db { command_noisy('config', "$pfx.preserve-empty-dirs", 'true'); command_noisy('config', "$pfx.placeholder-filename", $$fname); } + load_object_format(); } sub init_subdir { @@ -581,7 +585,7 @@ sub cmd_set_tree { print "Reading from stdin...\n"; @commits = (); while (<STDIN>) { - if (/\b($sha1_short)\b/o) { + if (/\b($oid_short)\b/o) { unshift @commits, $1; } } @@ -1054,7 +1058,7 @@ sub cmd_dcommit { 'If you are attempting to commit ', "merges, try running:\n\t", 'git rebase --interactive', - '--preserve-merges ', + '--rebase-merges ', $gs->refname, "\nBefore dcommitting"; } @@ -1717,7 +1721,7 @@ sub rebase_cmd { push @cmd, '-v' if $_verbose; push @cmd, qw/--merge/ if $_merge; push @cmd, "--strategy=$_strategy" if $_strategy; - push @cmd, "--preserve-merges" if $_preserve_merges; + push @cmd, "--rebase-merges" if $_rebase_merges; @cmd; } @@ -1830,7 +1834,7 @@ sub get_tree_from_treeish { if ($type eq 'commit') { $expected = (grep /^tree /, command(qw/cat-file commit/, $treeish))[0]; - ($expected) = ($expected =~ /^tree ($sha1)$/o); + ($expected) = ($expected =~ /^tree ($oid)$/o); die "Unable to get tree from $treeish\n" unless $expected; } elsif ($type eq 'tree') { $expected = $treeish; @@ -1974,9 +1978,15 @@ sub read_git_config { } } } + load_object_format(); delete @$opts{@config_only} if @config_only; } +sub load_object_format { + chomp(my $hash = `git config --get extensions.objectformat`); + $::oid_length = 64 if $hash eq 'sha256'; +} + sub extract_metadata { my $id = shift or return (undef, undef, undef); my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+) @@ -2005,10 +2015,10 @@ sub cmt_sha2rev_batch { print $out $sha, "\n"; while (my $line = <$in>) { - if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) { + if ($first && $line =~ /^$::oid\smissing$/) { last; } elsif ($first && - $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) { + $line =~ /^$::oid\scommit\s(\d+)$/) { $first = 0; $size = $1; next; @@ -2035,7 +2045,7 @@ sub working_head_info { my $hash; my %max; while (<$fh>) { - if ( m{^commit ($::sha1)$} ) { + if ( m{^commit ($::oid)$} ) { unshift @$refs, $hash if $hash and $refs; $hash = $1; next; diff --git a/third_party/git/git.c b/third_party/git/git.c index c1ee7124ed..4bdcdad2cc 100644 --- a/third_party/git/git.c +++ b/third_party/git/git.c @@ -4,6 +4,7 @@ #include "help.h" #include "run-command.h" #include "alias.h" +#include "shallow.h" #define RUN_SETUP (1<<0) #define RUN_SETUP_GENTLY (1<<1) @@ -345,12 +346,15 @@ static int handle_alias(int *argcp, const char ***argv) commit_pager_choice(); child.use_shell = 1; + child.clean_on_exit = 1; + child.wait_after_clean = 1; child.trace2_child_class = "shell_alias"; - argv_array_push(&child.args, alias_string + 1); - argv_array_pushv(&child.args, (*argv) + 1); + strvec_push(&child.args, alias_string + 1); + strvec_pushv(&child.args, (*argv) + 1); - trace2_cmd_alias(alias_command, child.args.argv); + trace2_cmd_alias(alias_command, child.args.v); trace2_cmd_list_config(); + trace2_cmd_list_env_vars(); trace2_cmd_name("_run_shell_alias_"); ret = run_command(&child); @@ -369,8 +373,7 @@ 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); - memmove(new_argv - option_count, new_argv, - count * sizeof(char *)); + MOVE_ARRAY(new_argv - option_count, new_argv, count); new_argv -= option_count; if (count < 1) @@ -385,10 +388,11 @@ static int handle_alias(int *argcp, const char ***argv) REALLOC_ARRAY(new_argv, count + *argcp); /* insert after command name */ - memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp); + COPY_ARRAY(new_argv + count, *argv + 1, *argcp); trace2_cmd_alias(alias_command, new_argv); trace2_cmd_list_config(); + trace2_cmd_list_env_vars(); *argv = new_argv; *argcp += count - 1; @@ -440,6 +444,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) trace_argv_printf(argv, "trace: built-in: git"); trace2_cmd_name(p->cmd); trace2_cmd_list_config(); + trace2_cmd_list_env_vars(); validate_cache_entries(the_repository->index); status = p->fn(argc, argv, prefix); @@ -474,6 +479,7 @@ static struct cmd_struct commands[] = { { "bisect--helper", cmd_bisect__helper, RUN_SETUP }, { "blame", cmd_blame, RUN_SETUP }, { "branch", cmd_branch, RUN_SETUP | DELAY_PAGER_CONFIG }, + { "bugreport", cmd_bugreport, RUN_SETUP_GENTLY }, { "bundle", cmd_bundle, RUN_SETUP_GENTLY | NO_PARSEOPT }, { "cat-file", cmd_cat_file, RUN_SETUP }, { "check-attr", cmd_check_attr, RUN_SETUP }, @@ -494,6 +500,9 @@ static struct cmd_struct commands[] = { { "config", cmd_config, RUN_SETUP_GENTLY | DELAY_PAGER_CONFIG }, { "count-objects", cmd_count_objects, RUN_SETUP }, { "credential", cmd_credential, RUN_SETUP_GENTLY | NO_PARSEOPT }, + { "credential-cache", cmd_credential_cache }, + { "credential-cache--daemon", cmd_credential_cache_daemon }, + { "credential-store", cmd_credential_store }, { "describe", cmd_describe, RUN_SETUP }, { "diff", cmd_diff, NO_PARSEOPT }, { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT }, @@ -502,6 +511,7 @@ static struct cmd_struct commands[] = { { "difftool", cmd_difftool, RUN_SETUP_GENTLY }, { "env--helper", cmd_env__helper }, { "fast-export", cmd_fast_export, RUN_SETUP }, + { "fast-import", cmd_fast_import, RUN_SETUP | NO_PARSEOPT }, { "fetch", cmd_fetch, RUN_SETUP }, { "fetch-pack", cmd_fetch_pack, RUN_SETUP | NO_PARSEOPT }, { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP }, @@ -524,6 +534,7 @@ static struct cmd_struct commands[] = { { "ls-tree", cmd_ls_tree, RUN_SETUP }, { "mailinfo", cmd_mailinfo, RUN_SETUP_GENTLY | NO_PARSEOPT }, { "mailsplit", cmd_mailsplit, NO_PARSEOPT }, + { "maintenance", cmd_maintenance, RUN_SETUP_GENTLY | NO_PARSEOPT }, { "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE }, { "merge-base", cmd_merge_base, RUN_SETUP }, { "merge-file", cmd_merge_file, RUN_SETUP_GENTLY }, @@ -571,15 +582,11 @@ static struct cmd_struct commands[] = { { "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER }, { "show", cmd_show, RUN_SETUP }, { "show-branch", cmd_show_branch, RUN_SETUP }, - { "show-index", cmd_show_index }, + { "show-index", cmd_show_index, RUN_SETUP_GENTLY }, { "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 - * longer needs redirection to the stash shell script this is kept as - * is, then should be changed to RUN_SETUP | NEED_WORK_TREE - */ - { "stash", cmd_stash }, + { "stash", cmd_stash, RUN_SETUP | NEED_WORK_TREE }, { "status", cmd_status, RUN_SETUP | NEED_WORK_TREE }, { "stripspace", cmd_stripspace }, { "submodule--helper", cmd_submodule__helper, RUN_SETUP | SUPPORT_SUPER_PREFIX | NO_PARSEOPT }, @@ -631,6 +638,25 @@ static void list_builtins(struct string_list *out, unsigned int exclude_option) } } +void load_builtin_commands(const char *prefix, struct cmdnames *cmds) +{ + const char *name; + int i; + + /* + * Callers can ask for a subset of the commands based on a certain + * prefix, which is then dropped from the added names. The names in + * the `commands[]` array do not have the `git-` prefix, though, + * therefore we must expect the `prefix` to at least start with `git-`. + */ + if (!skip_prefix(prefix, "git-", &prefix)) + BUG("prefix '%s' must start with 'git-'", prefix); + + for (i = 0; i < ARRAY_SIZE(commands); i++) + if (skip_prefix(commands[i].cmd, prefix, &name)) + add_cmdname(cmds, name, strlen(name)); +} + #ifdef STRIP_EXTENSION static void strip_extension(const char **argv) { @@ -645,7 +671,7 @@ static void strip_extension(const char **argv) static void handle_builtin(int argc, const char **argv) { - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; const char *cmd; struct cmd_struct *builtin; @@ -660,19 +686,19 @@ static void handle_builtin(int argc, const char **argv) argv[0] = cmd = "help"; for (i = 0; i < argc; i++) { - argv_array_push(&args, argv[i]); + strvec_push(&args, argv[i]); if (!i) - argv_array_push(&args, "--exclude-guides"); + strvec_push(&args, "--exclude-guides"); } argc++; - argv = args.argv; + argv = args.v; } builtin = get_builtin(cmd); if (builtin) exit(run_builtin(builtin, argc, argv)); - argv_array_clear(&args); + strvec_clear(&args); } static void execv_dashed_external(const char **argv) @@ -687,8 +713,8 @@ static void execv_dashed_external(const char **argv) use_pager = check_pager_config(argv[0]); commit_pager_choice(); - argv_array_pushf(&cmd.args, "git-%s", argv[0]); - argv_array_pushv(&cmd.args, argv + 1); + strvec_pushf(&cmd.args, "git-%s", argv[0]); + strvec_pushv(&cmd.args, argv + 1); cmd.clean_on_exit = 1; cmd.wait_after_clean = 1; cmd.silent_exec_failure = 1; @@ -700,7 +726,7 @@ static void execv_dashed_external(const char **argv) * The code in run_command() logs trace2 child_start/child_exit * events, so we do not need to report exec/exec_result events here. */ - trace_argv_printf(cmd.args.argv, "trace: exec:"); + trace_argv_printf(cmd.args.v, "trace: exec:"); /* * If we fail because the command is not found, it is @@ -740,7 +766,7 @@ static int run_argv(int *argcp, const char ***argv) if (!done_alias) handle_builtin(*argcp, *argv); else if (get_builtin(**argv)) { - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; int i; /* @@ -757,18 +783,18 @@ static int run_argv(int *argcp, const char ***argv) commit_pager_choice(); - argv_array_push(&args, "git"); + strvec_push(&args, "git"); for (i = 0; i < *argcp; i++) - argv_array_push(&args, (*argv)[i]); + strvec_push(&args, (*argv)[i]); - trace_argv_printf(args.argv, "trace: exec:"); + trace_argv_printf(args.v, "trace: exec:"); /* * if we fail because the command is not found, it is * OK to return. Otherwise, we just pass along the status code. */ - i = run_command_v_opt_tr2(args.argv, RUN_SILENT_EXEC_FAILURE | - RUN_CLEAN_ON_EXIT, "git_alias"); + i = run_command_v_opt_tr2(args.v, RUN_SILENT_EXEC_FAILURE | + RUN_CLEAN_ON_EXIT | RUN_WAIT_AFTER_CLEAN, "git_alias"); if (i >= 0 || errno != ENOENT) exit(i); die("could not execute builtin %s", **argv); diff --git a/third_party/git/gitk-git/gitk b/third_party/git/gitk-git/gitk index a14d7a16b2..23d9dd1fe0 100755 --- a/third_party/git/gitk-git/gitk +++ b/third_party/git/gitk-git/gitk @@ -11,14 +11,14 @@ package require Tk proc hasworktree {} { return [expr {[exec git rev-parse --is-bare-repository] == "false" && - [exec git rev-parse --is-inside-git-dir] == "false"}] + [exec git rev-parse --is-inside-git-dir] == "false"}] } proc reponame {} { global gitdir set n [file normalize $gitdir] if {[string match "*/.git" $n]} { - set n [string range $n 0 end-5] + set n [string range $n 0 end-5] } return [file tail $n] } @@ -26,7 +26,7 @@ proc reponame {} { proc gitworktree {} { variable _gitworktree if {[info exists _gitworktree]} { - return $_gitworktree + return $_gitworktree } # v1.7.0 introduced --show-toplevel to return the canonical work-tree if {[catch {set _gitworktree [exec git rev-parse --show-toplevel]}]} { @@ -34,10 +34,9 @@ proc gitworktree {} { # cdup to obtain a relative path to the top of the worktree. If # run from the top, the ./ prefix ensures normalize expands pwd. if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} { - catch {set _gitworktree [exec git config --get core.worktree]} - if {$_gitworktree eq ""} { - set _gitworktree [file normalize ./[exec git rev-parse --show-cdup]] - } + if {[catch {set _gitworktree [exec git config --get core.worktree]}]} { + set _gitworktree [file normalize ./[exec git rev-parse --show-cdup]] + } } } return $_gitworktree @@ -54,7 +53,7 @@ proc run args { set script $args if {[info exists isonrunq($script)]} return if {$runq eq {} && ![info exists currunq]} { - after idle dorunq + after idle dorunq } lappend runq [list {} $script] set isonrunq($script) 1 @@ -69,7 +68,7 @@ proc filereadable {fd script} { fileevent $fd readable {} if {$runq eq {} && ![info exists currunq]} { - after idle dorunq + after idle dorunq } lappend runq [list $fd $script] } @@ -78,11 +77,11 @@ proc nukefile {fd} { global runq for {set i 0} {$i < [llength $runq]} {} { - if {[lindex $runq $i 0] eq $fd} { - set runq [lreplace $runq $i $i] - } else { - incr i - } + if {[lindex $runq $i 0] eq $fd} { + set runq [lreplace $runq $i $i] + } else { + incr i + } } } @@ -92,30 +91,30 @@ proc dorunq {} { set tstart [clock clicks -milliseconds] set t0 $tstart while {[llength $runq] > 0} { - set fd [lindex $runq 0 0] - set script [lindex $runq 0 1] - set currunq [lindex $runq 0] - set runq [lrange $runq 1 end] - set repeat [eval $script] - unset currunq - set t1 [clock clicks -milliseconds] - set t [expr {$t1 - $t0}] - if {$repeat ne {} && $repeat} { - if {$fd eq {} || $repeat == 2} { - # script returns 1 if it wants to be readded - # file readers return 2 if they could do more straight away - lappend runq [list $fd $script] - } else { - fileevent $fd readable [list filereadable $fd $script] - } - } elseif {$fd eq {}} { - unset isonrunq($script) - } - set t0 $t1 - if {$t1 - $tstart >= 80} break + set fd [lindex $runq 0 0] + set script [lindex $runq 0 1] + set currunq [lindex $runq 0] + set runq [lrange $runq 1 end] + set repeat [eval $script] + unset currunq + set t1 [clock clicks -milliseconds] + set t [expr {$t1 - $t0}] + if {$repeat ne {} && $repeat} { + if {$fd eq {} || $repeat == 2} { + # script returns 1 if it wants to be readded + # file readers return 2 if they could do more straight away + lappend runq [list $fd $script] + } else { + fileevent $fd readable [list filereadable $fd $script] + } + } elseif {$fd eq {}} { + unset isonrunq($script) + } + set t0 $t1 + if {$t1 - $tstart >= 80} break } if {$runq ne {}} { - after idle dorunq + after idle dorunq } } @@ -135,20 +134,20 @@ proc unmerged_files {files} { set mlist {} set nr_unmerged 0 if {[catch { - set fd [open "| git ls-files -u" r] + set fd [open "| git ls-files -u" r] } err]} { - show_error {} . "[mc "Couldn't get list of unmerged files:"] $err" - exit 1 + show_error {} . "[mc "Couldn't get list of unmerged files:"] $err" + exit 1 } while {[gets $fd line] >= 0} { - set i [string first "\t" $line] - if {$i < 0} continue - set fname [string range $line [expr {$i+1}] end] - if {[lsearch -exact $mlist $fname] >= 0} continue - incr nr_unmerged - if {$files eq {} || [path_filter $files $fname]} { - lappend mlist $fname - } + set i [string first "\t" $line] + if {$i < 0} continue + set fname [string range $line [expr {$i+1}] end] + if {[lsearch -exact $mlist $fname] >= 0} continue + incr nr_unmerged + if {$files eq {} || [path_filter $files $fname]} { + lappend mlist $fname + } } catch {close $fd} return $mlist @@ -171,115 +170,115 @@ proc parseviewargs {n arglist} { set filtered 0 set i -1 foreach arg $arglist { - incr i - if {$nextisval} { - lappend glflags $arg - set nextisval 0 - continue - } - switch -glob -- $arg { - "-d" - - "--date-order" { - set vdatemode($n) 1 - # remove from origargs in case we hit an unknown option - set origargs [lreplace $origargs $i $i] - incr i -1 - } - "-[puabwcrRBMC]" - - "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" - - "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" - - "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" - - "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" - - "--ignore-space-change" - "-U*" - "--unified=*" { - # These request or affect diff output, which we don't want. - # Some could be used to set our defaults for diff display. - lappend diffargs $arg - } - "--raw" - "--patch-with-raw" - "--patch-with-stat" - - "--name-only" - "--name-status" - "--color" - - "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" - - "--cc" - "-z" - "--header" - "--parents" - "--boundary" - - "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" - - "--timestamp" - "relative-date" - "--date=*" - "--stdin" - - "--objects" - "--objects-edge" - "--reverse" { - # These cause our parsing of git log's output to fail, or else - # they're options we want to set ourselves, so ignore them. - } - "--color-words*" - "--word-diff=color" { - # These trigger a word diff in the console interface, - # so help the user by enabling our own support - if {[package vcompare $git_version "1.7.2"] >= 0} { - set worddiff [mc "Color words"] - } - } - "--word-diff*" { - if {[package vcompare $git_version "1.7.2"] >= 0} { - set worddiff [mc "Markup words"] - } - } - "--stat=*" - "--numstat" - "--shortstat" - "--summary" - - "--check" - "--exit-code" - "--quiet" - "--topo-order" - - "--full-history" - "--dense" - "--sparse" - - "--follow" - "--left-right" - "--encoding=*" { - # These are harmless, and some are even useful - lappend glflags $arg - } - "--diff-filter=*" - "--no-merges" - "--unpacked" - - "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" - - "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" - - "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" - - "--remove-empty" - "--first-parent" - "--cherry-pick" - - "-S*" - "-G*" - "--pickaxe-all" - "--pickaxe-regex" - - "--simplify-by-decoration" { - # These mean that we get a subset of the commits - set filtered 1 - lappend glflags $arg - } - "-L*" { - # Line-log with 'stuck' argument (unstuck form is - # not supported) - set filtered 1 - set vinlinediff($n) 1 - set allknown 0 - lappend glflags $arg - } - "-n" { - # This appears to be the only one that has a value as a - # separate word following it - set filtered 1 - set nextisval 1 - lappend glflags $arg - } - "--not" - "--all" { - lappend revargs $arg - } - "--merge" { - set vmergeonly($n) 1 - # git rev-parse doesn't understand --merge - lappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD - } - "--no-replace-objects" { - set env(GIT_NO_REPLACE_OBJECTS) "1" - } - "-*" { - # Other flag arguments including -<n> - if {[string is digit -strict [string range $arg 1 end]]} { - set filtered 1 - } else { - # a flag argument that we don't recognize; - # that means we can't optimize - set allknown 0 - } - lappend glflags $arg - } - default { - # Non-flag arguments specify commits or ranges of commits - if {[string match "*...*" $arg]} { - lappend revargs --gitk-symmetric-diff-marker - } - lappend revargs $arg - } - } + incr i + if {$nextisval} { + lappend glflags $arg + set nextisval 0 + continue + } + switch -glob -- $arg { + "-d" - + "--date-order" { + set vdatemode($n) 1 + # remove from origargs in case we hit an unknown option + set origargs [lreplace $origargs $i $i] + incr i -1 + } + "-[puabwcrRBMC]" - + "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" - + "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" - + "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" - + "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" - + "--ignore-space-change" - "-U*" - "--unified=*" { + # These request or affect diff output, which we don't want. + # Some could be used to set our defaults for diff display. + lappend diffargs $arg + } + "--raw" - "--patch-with-raw" - "--patch-with-stat" - + "--name-only" - "--name-status" - "--color" - + "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" - + "--cc" - "-z" - "--header" - "--parents" - "--boundary" - + "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" - + "--timestamp" - "relative-date" - "--date=*" - "--stdin" - + "--objects" - "--objects-edge" - "--reverse" { + # These cause our parsing of git log's output to fail, or else + # they're options we want to set ourselves, so ignore them. + } + "--color-words*" - "--word-diff=color" { + # These trigger a word diff in the console interface, + # so help the user by enabling our own support + if {[package vcompare $git_version "1.7.2"] >= 0} { + set worddiff [mc "Color words"] + } + } + "--word-diff*" { + if {[package vcompare $git_version "1.7.2"] >= 0} { + set worddiff [mc "Markup words"] + } + } + "--stat=*" - "--numstat" - "--shortstat" - "--summary" - + "--check" - "--exit-code" - "--quiet" - "--topo-order" - + "--full-history" - "--dense" - "--sparse" - + "--follow" - "--left-right" - "--encoding=*" { + # These are harmless, and some are even useful + lappend glflags $arg + } + "--diff-filter=*" - "--no-merges" - "--unpacked" - + "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" - + "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" - + "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" - + "--remove-empty" - "--first-parent" - "--cherry-pick" - + "-S*" - "-G*" - "--pickaxe-all" - "--pickaxe-regex" - + "--simplify-by-decoration" { + # These mean that we get a subset of the commits + set filtered 1 + lappend glflags $arg + } + "-L*" { + # Line-log with 'stuck' argument (unstuck form is + # not supported) + set filtered 1 + set vinlinediff($n) 1 + set allknown 0 + lappend glflags $arg + } + "-n" { + # This appears to be the only one that has a value as a + # separate word following it + set filtered 1 + set nextisval 1 + lappend glflags $arg + } + "--not" - "--all" { + lappend revargs $arg + } + "--merge" { + set vmergeonly($n) 1 + # git rev-parse doesn't understand --merge + lappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD + } + "--no-replace-objects" { + set env(GIT_NO_REPLACE_OBJECTS) "1" + } + "-*" { + # Other flag arguments including -<n> + if {[string is digit -strict [string range $arg 1 end]]} { + set filtered 1 + } else { + # a flag argument that we don't recognize; + # that means we can't optimize + set allknown 0 + } + lappend glflags $arg + } + default { + # Non-flag arguments specify commits or ranges of commits + if {[string match "*...*" $arg]} { + lappend revargs --gitk-symmetric-diff-marker + } + lappend revargs $arg + } + } } set vdflags($n) $diffargs set vflags($n) $glflags @@ -293,61 +292,61 @@ proc parseviewrevs {view revs} { global vposids vnegids if {$revs eq {}} { - set revs HEAD + set revs HEAD } elseif {[lsearch -exact $revs --all] >= 0} { - lappend revs HEAD + lappend revs HEAD } if {[catch {set ids [eval exec git rev-parse $revs]} err]} { - # we get stdout followed by stderr in $err - # for an unknown rev, git rev-parse echoes it and then errors out - set errlines [split $err "\n"] - set badrev {} - for {set l 0} {$l < [llength $errlines]} {incr l} { - set line [lindex $errlines $l] - if {!([string length $line] == 40 && [string is xdigit $line])} { - if {[string match "fatal:*" $line]} { - if {[string match "fatal: ambiguous argument*" $line] - && $badrev ne {}} { - if {[llength $badrev] == 1} { - set err "unknown revision $badrev" - } else { - set err "unknown revisions: [join $badrev ", "]" - } - } else { - set err [join [lrange $errlines $l end] "\n"] - } - break - } - lappend badrev $line - } - } - error_popup "[mc "Error parsing revisions:"] $err" - return {} + # we get stdout followed by stderr in $err + # for an unknown rev, git rev-parse echoes it and then errors out + set errlines [split $err "\n"] + set badrev {} + for {set l 0} {$l < [llength $errlines]} {incr l} { + set line [lindex $errlines $l] + if {!([string length $line] == 40 && [string is xdigit $line])} { + if {[string match "fatal:*" $line]} { + if {[string match "fatal: ambiguous argument*" $line] + && $badrev ne {}} { + if {[llength $badrev] == 1} { + set err "unknown revision $badrev" + } else { + set err "unknown revisions: [join $badrev ", "]" + } + } else { + set err [join [lrange $errlines $l end] "\n"] + } + break + } + lappend badrev $line + } + } + error_popup "[mc "Error parsing revisions:"] $err" + return {} } set ret {} set pos {} set neg {} set sdm 0 foreach id [split $ids "\n"] { - if {$id eq "--gitk-symmetric-diff-marker"} { - set sdm 4 - } elseif {[string match "^*" $id]} { - if {$sdm != 1} { - lappend ret $id - if {$sdm == 3} { - set sdm 0 - } - } - lappend neg [string range $id 1 end] - } else { - if {$sdm != 2} { - lappend ret $id - } else { - lset ret end $id...[lindex $ret end] - } - lappend pos $id - } - incr sdm -1 + if {$id eq "--gitk-symmetric-diff-marker"} { + set sdm 4 + } elseif {[string match "^*" $id]} { + if {$sdm != 1} { + lappend ret $id + if {$sdm == 3} { + set sdm 0 + } + } + lappend neg [string range $id 1 end] + } else { + if {$sdm != 2} { + lappend ret $id + } else { + lset ret end $id...[lindex $ret end] + } + lappend pos $id + } + incr sdm -1 } set vposids($view) $pos set vnegids($view) $neg @@ -374,63 +373,63 @@ proc start_rev_list {view} { set args $viewargs($view) if {$viewargscmd($view) ne {}} { - if {[catch { - set str [exec sh -c $viewargscmd($view)] - } err]} { - error_popup "[mc "Error executing --argscmd command:"] $err" - return 0 - } - set args [concat $args [split $str "\n"]] + if {[catch { + set str [exec sh -c $viewargscmd($view)] + } err]} { + error_popup "[mc "Error executing --argscmd command:"] $err" + return 0 + } + set args [concat $args [split $str "\n"]] } set vcanopt($view) [parseviewargs $view $args] set files $viewfiles($view) if {$vmergeonly($view)} { - set files [unmerged_files $files] - if {$files eq {}} { - global nr_unmerged - if {$nr_unmerged == 0} { - error_popup [mc "No files selected: --merge specified but\ - no files are unmerged."] - } else { - error_popup [mc "No files selected: --merge specified but\ - no unmerged files are within file limit."] - } - return 0 - } + set files [unmerged_files $files] + if {$files eq {}} { + global nr_unmerged + if {$nr_unmerged == 0} { + error_popup [mc "No files selected: --merge specified but\ + no files are unmerged."] + } else { + error_popup [mc "No files selected: --merge specified but\ + no unmerged files are within file limit."] + } + return 0 + } } set vfilelimit($view) $files if {$vcanopt($view)} { - set revs [parseviewrevs $view $vrevs($view)] - if {$revs eq {}} { - return 0 - } - set args [concat $vflags($view) $revs] + set revs [parseviewrevs $view $vrevs($view)] + if {$revs eq {}} { + return 0 + } + set args [concat $vflags($view) $revs] } else { - set args $vorigargs($view) + set args $vorigargs($view) } if {[catch { - set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \ - --parents --boundary $args "--" $files] r] + set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \ + --parents --boundary $args "--" $files] r] } err]} { - error_popup "[mc "Error executing git log:"] $err" - return 0 + error_popup "[mc "Error executing git log:"] $err" + return 0 } set i [reg_instance $fd] set viewinstances($view) [list $i] set viewmainheadid($view) $mainheadid set viewmainheadid_orig($view) $mainheadid if {$files ne {} && $mainheadid ne {}} { - get_viewmainhead $view + get_viewmainhead $view } if {$showlocalchanges && $viewmainheadid($view) ne {}} { - interestedin $viewmainheadid($view) dodiffindex + interestedin $viewmainheadid($view) dodiffindex } fconfigure $fd -blocking 0 -translation lf -eofchar {} if {$tclencoding != {}} { - fconfigure $fd -encoding $tclencoding + fconfigure $fd -encoding $tclencoding } filerun $fd [list getcommitlines $fd $i $view 0] nowbusy $view [mc "Reading"] @@ -444,13 +443,13 @@ proc stop_instance {inst} { set fd $commfd($inst) catch { - set pid [pid $fd] + set pid [pid $fd] - if {$::tcl_platform(platform) eq {windows}} { - exec taskkill /pid $pid - } else { - exec kill $pid - } + if {$::tcl_platform(platform) eq {windows}} { + exec taskkill /pid $pid + } else { + exec kill $pid + } } catch {close $fd} nukefile $fd @@ -462,7 +461,7 @@ proc stop_backends {} { global commfd foreach inst [array names commfd] { - stop_instance $inst + stop_instance $inst } } @@ -470,7 +469,7 @@ proc stop_rev_list {view} { global viewinstances foreach inst $viewinstances($view) { - stop_instance $inst + stop_instance $inst } set viewinstances($view) {} } @@ -479,11 +478,11 @@ proc reset_pending_select {selid} { global pending_select mainheadid selectheadid if {$selid ne {}} { - set pending_select $selid + set pending_select $selid } elseif {$selectheadid ne {}} { - set pending_select $selectheadid + set pending_select $selectheadid } else { - set pending_select $mainheadid + set pending_select $mainheadid } } @@ -492,11 +491,11 @@ proc getcommits {selid} { initlayout if {[start_rev_list $curview]} { - reset_pending_select $selid - show_status [mc "Reading commits..."] - set need_redisplay 1 + reset_pending_select $selid + show_status [mc "Reading commits..."] + set need_redisplay 1 } else { - show_status [mc "No commits selected"] + show_status [mc "No commits selected"] } } @@ -513,67 +512,67 @@ proc updatecommits {} { rereadrefs set view $curview if {$mainheadid ne $viewmainheadid_orig($view)} { - if {$showlocalchanges} { - dohidelocalchanges - } - set viewmainheadid($view) $mainheadid - set viewmainheadid_orig($view) $mainheadid - if {$vfilelimit($view) ne {}} { - get_viewmainhead $view - } + if {$showlocalchanges} { + dohidelocalchanges + } + set viewmainheadid($view) $mainheadid + set viewmainheadid_orig($view) $mainheadid + if {$vfilelimit($view) ne {}} { + get_viewmainhead $view + } } if {$showlocalchanges} { - doshowlocalchanges + doshowlocalchanges } if {$vcanopt($view)} { - set oldpos $vposids($view) - set oldneg $vnegids($view) - set revs [parseviewrevs $view $vrevs($view)] - if {$revs eq {}} { - return - } - # note: getting the delta when negative refs change is hard, - # and could require multiple git log invocations, so in that - # case we ask git log for all the commits (not just the delta) - if {$oldneg eq $vnegids($view)} { - set newrevs {} - set npos 0 - # take out positive refs that we asked for before or - # that we have already seen - foreach rev $revs { - if {[string length $rev] == 40} { - if {[lsearch -exact $oldpos $rev] < 0 - && ![info exists varcid($view,$rev)]} { - lappend newrevs $rev - incr npos - } - } else { - lappend $newrevs $rev - } - } - if {$npos == 0} return - set revs $newrevs - set vposids($view) [lsort -unique [concat $oldpos $vposids($view)]] - } - set args [concat $vflags($view) $revs --not $oldpos] + set oldpos $vposids($view) + set oldneg $vnegids($view) + set revs [parseviewrevs $view $vrevs($view)] + if {$revs eq {}} { + return + } + # note: getting the delta when negative refs change is hard, + # and could require multiple git log invocations, so in that + # case we ask git log for all the commits (not just the delta) + if {$oldneg eq $vnegids($view)} { + set newrevs {} + set npos 0 + # take out positive refs that we asked for before or + # that we have already seen + foreach rev $revs { + if {[string length $rev] == 40} { + if {[lsearch -exact $oldpos $rev] < 0 + && ![info exists varcid($view,$rev)]} { + lappend newrevs $rev + incr npos + } + } else { + lappend $newrevs $rev + } + } + if {$npos == 0} return + set revs $newrevs + set vposids($view) [lsort -unique [concat $oldpos $vposids($view)]] + } + set args [concat $vflags($view) $revs --not $oldpos] } else { - set args $vorigargs($view) + set args $vorigargs($view) } if {[catch { - set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \ - --parents --boundary $args "--" $vfilelimit($view)] r] + set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \ + --parents --boundary $args "--" $vfilelimit($view)] r] } err]} { - error_popup "[mc "Error executing git log:"] $err" - return + error_popup "[mc "Error executing git log:"] $err" + return } if {$viewactive($view) == 0} { - set startmsecs [clock clicks -milliseconds] + set startmsecs [clock clicks -milliseconds] } set i [reg_instance $fd] lappend viewinstances($view) $i fconfigure $fd -blocking 0 -translation lf -eofchar {} if {$tclencoding != {}} { - fconfigure $fd -encoding $tclencoding + fconfigure $fd -encoding $tclencoding } filerun $fd [list getcommitlines $fd $i $view 1] incr viewactive($view) @@ -581,7 +580,7 @@ proc updatecommits {} { reset_pending_select {} nowbusy $view [mc "Reading"] if {$showneartags} { - getallcommits + getallcommits } } @@ -592,11 +591,11 @@ proc reloadcommits {} { set selid {} if {$selectedline ne {}} { - set selid $currentid + set selid $currentid } if {!$viewcomplete($curview)} { - stop_rev_list $curview + stop_rev_list $curview } resetvarcs $curview set selectedline {} @@ -606,7 +605,7 @@ proc reloadcommits {} { readrefs changedrefs if {$showneartags} { - getallcommits + getallcommits } clear_display unset -nocomplain commitinfo @@ -622,11 +621,11 @@ proc reloadcommits {} { # sorts as a string in numerical order proc strrep {n} { if {$n < 16} { - return [format "%x" $n] + return [format "%x" $n] } elseif {$n < 256} { - return [format "x%.2x" $n] + return [format "x%.2x" $n] } elseif {$n < 65536} { - return [format "y%.4x" $n] + return [format "y%.4x" $n] } return [format "z%.8x" $n] } @@ -657,22 +656,22 @@ proc resetvarcs {view} { global vshortids foreach vid [array names varcid $view,*] { - unset varcid($vid) - unset children($vid) - unset parents($vid) + unset varcid($vid) + unset children($vid) + unset parents($vid) } foreach vid [array names vshortids $view,*] { - unset vshortids($vid) + unset vshortids($vid) } # some commits might have children but haven't been seen yet foreach vid [array names children $view,*] { - unset children($vid) + unset children($vid) } foreach va [array names varccommits $view,*] { - unset varccommits($va) + unset varccommits($va) } foreach vd [array names vseedcount $view,*] { - unset vseedcount($vd) + unset vseedcount($vd) } unset -nocomplain ordertok } @@ -684,8 +683,8 @@ proc seeds {v} { set ret {} set a [lindex $vdownptr($v) 0] while {$a != 0} { - lappend ret [lindex $varcstart($v) $a] - set a [lindex $vleftptr($v) $a] + lappend ret [lindex $varcstart($v) $a] + set a [lindex $vleftptr($v) $a] } return $ret } @@ -698,60 +697,60 @@ proc newvarc {view id} { set a [llength $varctok($view)] set vid $view,$id if {[llength $children($vid)] == 0 || $vdatemode($view)} { - if {![info exists commitinfo($id)]} { - parsecommit $id $commitdata($id) 1 - } - set cdate [lindex [lindex $commitinfo($id) 4] 0] - if {![string is integer -strict $cdate]} { - set cdate 0 - } - if {![info exists vseedcount($view,$cdate)]} { - set vseedcount($view,$cdate) -1 - } - set c [incr vseedcount($view,$cdate)] - set cdate [expr {$cdate ^ 0xffffffff}] - set tok "s[strrep $cdate][strrep $c]" + if {![info exists commitinfo($id)]} { + parsecommit $id $commitdata($id) 1 + } + set cdate [lindex [lindex $commitinfo($id) 4] 0] + if {![string is integer -strict $cdate]} { + set cdate 0 + } + if {![info exists vseedcount($view,$cdate)]} { + set vseedcount($view,$cdate) -1 + } + set c [incr vseedcount($view,$cdate)] + set cdate [expr {$cdate ^ 0xffffffff}] + set tok "s[strrep $cdate][strrep $c]" } else { - set tok {} + set tok {} } set ka 0 if {[llength $children($vid)] > 0} { - set kid [lindex $children($vid) end] - set k $varcid($view,$kid) - if {[string compare [lindex $varctok($view) $k] $tok] > 0} { - set ki $kid - set ka $k - set tok [lindex $varctok($view) $k] - } + set kid [lindex $children($vid) end] + set k $varcid($view,$kid) + if {[string compare [lindex $varctok($view) $k] $tok] > 0} { + set ki $kid + set ka $k + set tok [lindex $varctok($view) $k] + } } if {$ka != 0} { - set i [lsearch -exact $parents($view,$ki) $id] - set j [expr {[llength $parents($view,$ki)] - 1 - $i}] - append tok [strrep $j] + set i [lsearch -exact $parents($view,$ki) $id] + set j [expr {[llength $parents($view,$ki)] - 1 - $i}] + append tok [strrep $j] } set c [lindex $vlastins($view) $ka] if {$c == 0 || [string compare $tok [lindex $varctok($view) $c]] < 0} { - set c $ka - set b [lindex $vdownptr($view) $ka] + set c $ka + set b [lindex $vdownptr($view) $ka] } else { - set b [lindex $vleftptr($view) $c] + set b [lindex $vleftptr($view) $c] } while {$b != 0 && [string compare $tok [lindex $varctok($view) $b]] >= 0} { - set c $b - set b [lindex $vleftptr($view) $c] + set c $b + set b [lindex $vleftptr($view) $c] } if {$c == $ka} { - lset vdownptr($view) $ka $a - lappend vbackptr($view) 0 + lset vdownptr($view) $ka $a + lappend vbackptr($view) 0 } else { - lset vleftptr($view) $c $a - lappend vbackptr($view) $c + lset vleftptr($view) $c $a + lappend vbackptr($view) $c } lset vlastins($view) $ka $a lappend vupptr($view) $ka lappend vleftptr($view) $b if {$b != 0} { - lset vbackptr($view) $b $a + lset vbackptr($view) $b $a } lappend varctok($view) $tok lappend varcstart($view) $id @@ -782,7 +781,7 @@ proc splitvarc {p v} { set varccommits($v,$na) [lrange $ac $i end] lappend varcstart($v) $p foreach id $varccommits($v,$na) { - set varcid($v,$id) $na + set varcid($v,$id) $na } lappend vdownptr($v) [lindex $vdownptr($v) $oa] lappend vlastins($v) [lindex $vlastins($v) $oa] @@ -792,10 +791,10 @@ proc splitvarc {p v} { lappend vleftptr($v) 0 lappend vbackptr($v) 0 for {set b [lindex $vdownptr($v) $na]} {$b != 0} {set b [lindex $vleftptr($v) $b]} { - lset vupptr($v) $b $na + lset vupptr($v) $b $na } if {[string compare $otok $vtokmod($v)] <= 0} { - modify_arc $v $oa + modify_arc $v $oa } } @@ -809,120 +808,120 @@ proc renumbervarc {a v} { set kidchanged($a) 1 set ntot 0 while {$a != 0} { - if {[info exists isrelated($a)]} { - lappend todo $a - set id [lindex $varccommits($v,$a) end] - foreach p $parents($v,$id) { - if {[info exists varcid($v,$p)]} { - set isrelated($varcid($v,$p)) 1 - } - } - } - incr ntot - set b [lindex $vdownptr($v) $a] - if {$b == 0} { - while {$a != 0} { - set b [lindex $vleftptr($v) $a] - if {$b != 0} break - set a [lindex $vupptr($v) $a] - } - } - set a $b + if {[info exists isrelated($a)]} { + lappend todo $a + set id [lindex $varccommits($v,$a) end] + foreach p $parents($v,$id) { + if {[info exists varcid($v,$p)]} { + set isrelated($varcid($v,$p)) 1 + } + } + } + incr ntot + set b [lindex $vdownptr($v) $a] + if {$b == 0} { + while {$a != 0} { + set b [lindex $vleftptr($v) $a] + if {$b != 0} break + set a [lindex $vupptr($v) $a] + } + } + set a $b } foreach a $todo { - if {![info exists kidchanged($a)]} continue - set id [lindex $varcstart($v) $a] - if {[llength $children($v,$id)] > 1} { - set children($v,$id) [lsort -command [list vtokcmp $v] \ - $children($v,$id)] - } - set oldtok [lindex $varctok($v) $a] - if {!$vdatemode($v)} { - set tok {} - } else { - set tok $oldtok - } - set ka 0 - set kid [last_real_child $v,$id] - if {$kid ne {}} { - set k $varcid($v,$kid) - if {[string compare [lindex $varctok($v) $k] $tok] > 0} { - set ki $kid - set ka $k - set tok [lindex $varctok($v) $k] - } - } - if {$ka != 0} { - set i [lsearch -exact $parents($v,$ki) $id] - set j [expr {[llength $parents($v,$ki)] - 1 - $i}] - append tok [strrep $j] - } - if {$tok eq $oldtok} { - continue - } - set id [lindex $varccommits($v,$a) end] - foreach p $parents($v,$id) { - if {[info exists varcid($v,$p)]} { - set kidchanged($varcid($v,$p)) 1 - } else { - set sortkids($p) 1 - } - } - lset varctok($v) $a $tok - set b [lindex $vupptr($v) $a] - if {$b != $ka} { - if {[string compare [lindex $varctok($v) $ka] $vtokmod($v)] < 0} { - modify_arc $v $ka - } - if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} { - modify_arc $v $b - } - set c [lindex $vbackptr($v) $a] - set d [lindex $vleftptr($v) $a] - if {$c == 0} { - lset vdownptr($v) $b $d - } else { - lset vleftptr($v) $c $d - } - if {$d != 0} { - lset vbackptr($v) $d $c - } - if {[lindex $vlastins($v) $b] == $a} { - lset vlastins($v) $b $c - } - lset vupptr($v) $a $ka - set c [lindex $vlastins($v) $ka] - if {$c == 0 || \ - [string compare $tok [lindex $varctok($v) $c]] < 0} { - set c $ka - set b [lindex $vdownptr($v) $ka] - } else { - set b [lindex $vleftptr($v) $c] - } - while {$b != 0 && \ - [string compare $tok [lindex $varctok($v) $b]] >= 0} { - set c $b - set b [lindex $vleftptr($v) $c] - } - if {$c == $ka} { - lset vdownptr($v) $ka $a - lset vbackptr($v) $a 0 - } else { - lset vleftptr($v) $c $a - lset vbackptr($v) $a $c - } - lset vleftptr($v) $a $b - if {$b != 0} { - lset vbackptr($v) $b $a - } - lset vlastins($v) $ka $a - } + if {![info exists kidchanged($a)]} continue + set id [lindex $varcstart($v) $a] + if {[llength $children($v,$id)] > 1} { + set children($v,$id) [lsort -command [list vtokcmp $v] \ + $children($v,$id)] + } + set oldtok [lindex $varctok($v) $a] + if {!$vdatemode($v)} { + set tok {} + } else { + set tok $oldtok + } + set ka 0 + set kid [last_real_child $v,$id] + if {$kid ne {}} { + set k $varcid($v,$kid) + if {[string compare [lindex $varctok($v) $k] $tok] > 0} { + set ki $kid + set ka $k + set tok [lindex $varctok($v) $k] + } + } + if {$ka != 0} { + set i [lsearch -exact $parents($v,$ki) $id] + set j [expr {[llength $parents($v,$ki)] - 1 - $i}] + append tok [strrep $j] + } + if {$tok eq $oldtok} { + continue + } + set id [lindex $varccommits($v,$a) end] + foreach p $parents($v,$id) { + if {[info exists varcid($v,$p)]} { + set kidchanged($varcid($v,$p)) 1 + } else { + set sortkids($p) 1 + } + } + lset varctok($v) $a $tok + set b [lindex $vupptr($v) $a] + if {$b != $ka} { + if {[string compare [lindex $varctok($v) $ka] $vtokmod($v)] < 0} { + modify_arc $v $ka + } + if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} { + modify_arc $v $b + } + set c [lindex $vbackptr($v) $a] + set d [lindex $vleftptr($v) $a] + if {$c == 0} { + lset vdownptr($v) $b $d + } else { + lset vleftptr($v) $c $d + } + if {$d != 0} { + lset vbackptr($v) $d $c + } + if {[lindex $vlastins($v) $b] == $a} { + lset vlastins($v) $b $c + } + lset vupptr($v) $a $ka + set c [lindex $vlastins($v) $ka] + if {$c == 0 || \ + [string compare $tok [lindex $varctok($v) $c]] < 0} { + set c $ka + set b [lindex $vdownptr($v) $ka] + } else { + set b [lindex $vleftptr($v) $c] + } + while {$b != 0 && \ + [string compare $tok [lindex $varctok($v) $b]] >= 0} { + set c $b + set b [lindex $vleftptr($v) $c] + } + if {$c == $ka} { + lset vdownptr($v) $ka $a + lset vbackptr($v) $a 0 + } else { + lset vleftptr($v) $c $a + lset vbackptr($v) $a $c + } + lset vleftptr($v) $a $b + if {$b != 0} { + lset vbackptr($v) $b $a + } + lset vlastins($v) $ka $a + } } foreach id [array names sortkids] { - if {[llength $children($v,$id)] > 1} { - set children($v,$id) [lsort -command [list vtokcmp $v] \ - $children($v,$id)] - } + if {[llength $children($v,$id)] > 1} { + set children($v,$id) [lsort -command [list vtokcmp $v] \ + $children($v,$id)] + } } set t2 [clock clicks -milliseconds] #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms" @@ -936,14 +935,14 @@ proc fix_reversal {p a v} { set pa $varcid($v,$p) if {$p ne [lindex $varcstart($v) $pa]} { - splitvarc $p $v - set pa $varcid($v,$p) + splitvarc $p $v + set pa $varcid($v,$p) } # seeds always need to be renumbered if {[lindex $vupptr($v) $pa] == 0 || - [string compare [lindex $varctok($v) $a] \ - [lindex $varctok($v) $pa]] > 0} { - renumbervarc $pa $v + [string compare [lindex $varctok($v) $a] \ + [lindex $varctok($v) $pa]] > 0} { + renumbervarc $pa $v } } @@ -961,24 +960,24 @@ proc insertrow {id p v} { set varcid($vid) $a lappend vshortids($v,[string range $id 0 3]) $id if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] < 0} { - modify_arc $v $a + modify_arc $v $a } lappend varccommits($v,$a) $id set vp $v,$p if {[llength [lappend children($vp) $id]] > 1} { - set children($vp) [lsort -command [list vtokcmp $v] $children($vp)] - unset -nocomplain ordertok + set children($vp) [lsort -command [list vtokcmp $v] $children($vp)] + unset -nocomplain ordertok } fix_reversal $p $a $v incr commitidx($v) if {$v == $curview} { - set numcommits $commitidx($v) - setcanvscroll - if {[info exists targetid]} { - if {![comes_before $targetid $p]} { - incr targetrow - } - } + set numcommits $commitidx($v) + setcanvscroll + if {[info exists targetid]} { + if {![comes_before $targetid $p]} { + incr targetrow + } + } } } @@ -990,8 +989,8 @@ proc insertfakerow {id p} { set a $varcid($v,$p) set i [lsearch -exact $varccommits($v,$a) $p] if {$i < 0} { - puts "oops: insertfakerow can't find [shortids $p] on arc $a" - return + puts "oops: insertfakerow can't find [shortids $p] on arc $a" + return } set children($v,$id) {} set parents($v,$id) [list $p] @@ -1003,9 +1002,9 @@ proc insertfakerow {id p} { set varccommits($v,$a) [linsert $varccommits($v,$a) $i $id] modify_arc $v $a $i if {[info exists targetid]} { - if {![comes_before $targetid $p]} { - incr targetrow - } + if {![comes_before $targetid $p]} { + incr targetrow + } } setcanvscroll drawvisible @@ -1018,15 +1017,15 @@ proc removefakerow {id} { set v $curview if {[llength $parents($v,$id)] != 1} { - puts "oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents" - return + puts "oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents" + return } set p [lindex $parents($v,$id) 0] set a $varcid($v,$id) set i [lsearch -exact $varccommits($v,$a) $id] if {$i < 0} { - puts "oops: removefakerow can't find [shortids $id] on arc $a" - return + puts "oops: removefakerow can't find [shortids $id] on arc $a" + return } unset varcid($v,$id) set varccommits($v,$a) [lreplace $varccommits($v,$a) $i $i] @@ -1036,15 +1035,15 @@ proc removefakerow {id} { set numcommits [incr commitidx($v) -1] set j [lsearch -exact $children($v,$p) $id] if {$j >= 0} { - set children($v,$p) [lreplace $children($v,$p) $j $j] + set children($v,$p) [lreplace $children($v,$p) $j $j] } modify_arc $v $a $i if {[info exist currentid] && $id eq $currentid} { - unset currentid - set selectedline {} + unset currentid + set selectedline {} } if {[info exists targetid] && $targetid eq $id} { - set targetid $p + set targetid $p } setcanvscroll drawvisible @@ -1055,9 +1054,9 @@ proc real_children {vp} { set kids {} foreach id $children($vp) { - if {$id ne $nullid && $id ne $nullid2} { - lappend kids $id - } + if {$id ne $nullid && $id ne $nullid2} { + lappend kids $id + } } return $kids } @@ -1066,9 +1065,9 @@ proc first_real_child {vp} { global children nullid nullid2 foreach id $children($vp) { - if {$id ne $nullid && $id ne $nullid2} { - return $id - } + if {$id ne $nullid && $id ne $nullid2} { + return $id + } } return {} } @@ -1078,10 +1077,10 @@ proc last_real_child {vp} { set kids $children($vp) for {set i [llength $kids]} {[incr i -1] >= 0} {} { - set id [lindex $kids $i] - if {$id ne $nullid && $id ne $nullid2} { - return $id - } + set id [lindex $kids $i] + if {$id ne $nullid && $id ne $nullid2} { + return $id + } } return {} } @@ -1090,7 +1089,7 @@ proc vtokcmp {v a b} { global varctok varcid return [string compare [lindex $varctok($v) $varcid($v,$a)] \ - [lindex $varctok($v) $varcid($v,$b)]] + [lindex $varctok($v) $varcid($v,$b)]] } # This assumes that if lim is not given, the caller has checked that @@ -1099,29 +1098,29 @@ proc modify_arc {v a {lim {}}} { global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits if {$lim ne {}} { - set c [string compare [lindex $varctok($v) $a] $vtokmod($v)] - if {$c > 0} return - if {$c == 0} { - set r [lindex $varcrow($v) $a] - if {$r ne {} && $vrowmod($v) <= $r + $lim} return - } + set c [string compare [lindex $varctok($v) $a] $vtokmod($v)] + if {$c > 0} return + if {$c == 0} { + set r [lindex $varcrow($v) $a] + if {$r ne {} && $vrowmod($v) <= $r + $lim} return + } } set vtokmod($v) [lindex $varctok($v) $a] set varcmod($v) $a if {$v == $curview} { - while {$a != 0 && [lindex $varcrow($v) $a] eq {}} { - set a [lindex $vupptr($v) $a] - set lim {} - } - set r 0 - if {$a != 0} { - if {$lim eq {}} { - set lim [llength $varccommits($v,$a)] - } - set r [expr {[lindex $varcrow($v) $a] + $lim}] - } - set vrowmod($v) $r - undolayout $r + while {$a != 0 && [lindex $varcrow($v) $a] eq {}} { + set a [lindex $vupptr($v) $a] + set lim {} + } + set r 0 + if {$a != 0} { + if {$lim eq {}} { + set lim [llength $varccommits($v,$a)] + } + set r [expr {[lindex $varcrow($v) $a] + $lim}] + } + set vrowmod($v) $r + undolayout $r } } @@ -1133,62 +1132,62 @@ proc update_arcrows {v} { if {$vrowmod($v) == $commitidx($v)} return if {$v == $curview} { - if {[llength $displayorder] > $vrowmod($v)} { - set displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]] - set parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]] - } - unset -nocomplain cached_commitrow + if {[llength $displayorder] > $vrowmod($v)} { + set displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]] + set parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]] + } + unset -nocomplain cached_commitrow } set narctot [expr {[llength $varctok($v)] - 1}] set a $varcmod($v) while {$a != 0 && [lindex $varcix($v) $a] eq {}} { - # go up the tree until we find something that has a row number, - # or we get to a seed - set a [lindex $vupptr($v) $a] + # go up the tree until we find something that has a row number, + # or we get to a seed + set a [lindex $vupptr($v) $a] } if {$a == 0} { - set a [lindex $vdownptr($v) 0] - if {$a == 0} return - set vrownum($v) {0} - set varcorder($v) [list $a] - lset varcix($v) $a 0 - lset varcrow($v) $a 0 - set arcn 0 - set row 0 + set a [lindex $vdownptr($v) 0] + if {$a == 0} return + set vrownum($v) {0} + set varcorder($v) [list $a] + lset varcix($v) $a 0 + lset varcrow($v) $a 0 + set arcn 0 + set row 0 } else { - set arcn [lindex $varcix($v) $a] - if {[llength $vrownum($v)] > $arcn + 1} { - set vrownum($v) [lrange $vrownum($v) 0 $arcn] - set varcorder($v) [lrange $varcorder($v) 0 $arcn] - } - set row [lindex $varcrow($v) $a] + set arcn [lindex $varcix($v) $a] + if {[llength $vrownum($v)] > $arcn + 1} { + set vrownum($v) [lrange $vrownum($v) 0 $arcn] + set varcorder($v) [lrange $varcorder($v) 0 $arcn] + } + set row [lindex $varcrow($v) $a] } while {1} { - set p $a - incr row [llength $varccommits($v,$a)] - # go down if possible - set b [lindex $vdownptr($v) $a] - if {$b == 0} { - # if not, go left, or go up until we can go left - while {$a != 0} { - set b [lindex $vleftptr($v) $a] - if {$b != 0} break - set a [lindex $vupptr($v) $a] - } - if {$a == 0} break - } - set a $b - incr arcn - lappend vrownum($v) $row - lappend varcorder($v) $a - lset varcix($v) $a $arcn - lset varcrow($v) $a $row + set p $a + incr row [llength $varccommits($v,$a)] + # go down if possible + set b [lindex $vdownptr($v) $a] + if {$b == 0} { + # if not, go left, or go up until we can go left + while {$a != 0} { + set b [lindex $vleftptr($v) $a] + if {$b != 0} break + set a [lindex $vupptr($v) $a] + } + if {$a == 0} break + } + set a $b + incr arcn + lappend vrownum($v) $row + lappend varcorder($v) $a + lset varcix($v) $a $arcn + lset varcrow($v) $a $row } set vtokmod($v) [lindex $varctok($v) $p] set varcmod($v) $p set vrowmod($v) $row if {[info exists currentid]} { - set selectedline [rowofcommit $currentid] + set selectedline [rowofcommit $currentid] } } @@ -1206,20 +1205,20 @@ proc rowofcommit {id} { set v $curview if {![info exists varcid($v,$id)]} { - puts "oops rowofcommit no arc for [shortids $id]" - return {} + puts "oops rowofcommit no arc for [shortids $id]" + return {} } set a $varcid($v,$id) if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] >= 0} { - update_arcrows $v + update_arcrows $v } if {[info exists cached_commitrow($id)]} { - return $cached_commitrow($id) + return $cached_commitrow($id) } set i [lsearch -exact $varccommits($v,$a) $id] if {$i < 0} { - puts "oops didn't find commit [shortids $id] in arc $a" - return {} + puts "oops didn't find commit [shortids $id] in arc $a" + return {} } incr i [lindex $varcrow($v) $a] set cached_commitrow($id) $i @@ -1232,32 +1231,32 @@ proc comes_before {a b} { set v $curview if {$a eq $b || ![info exists varcid($v,$a)] || \ - ![info exists varcid($v,$b)]} { - return 0 + ![info exists varcid($v,$b)]} { + return 0 } if {$varcid($v,$a) != $varcid($v,$b)} { - return [expr {[string compare [lindex $varctok($v) $varcid($v,$a)] \ - [lindex $varctok($v) $varcid($v,$b)]] < 0}] + return [expr {[string compare [lindex $varctok($v) $varcid($v,$a)] \ + [lindex $varctok($v) $varcid($v,$b)]] < 0}] } return [expr {[rowofcommit $a] < [rowofcommit $b]}] } proc bsearch {l elt} { if {[llength $l] == 0 || $elt <= [lindex $l 0]} { - return 0 + return 0 } set lo 0 set hi [llength $l] while {$hi - $lo > 1} { - set mid [expr {int(($lo + $hi) / 2)}] - set t [lindex $l $mid] - if {$elt < $t} { - set hi $mid - } elseif {$elt > $t} { - set lo $mid - } else { - return $mid - } + set mid [expr {int(($lo + $hi) / 2)}] + set t [lindex $l $mid] + if {$elt < $t} { + set hi $mid + } elseif {$elt > $t} { + set lo $mid + } else { + return $mid + } } return $lo } @@ -1269,37 +1268,37 @@ proc make_disporder {start end} { global d_valid_start d_valid_end if {$end > $vrowmod($curview)} { - update_arcrows $curview + update_arcrows $curview } set ai [bsearch $vrownum($curview) $start] set start [lindex $vrownum($curview) $ai] set narc [llength $vrownum($curview)] for {set r $start} {$ai < $narc && $r < $end} {incr ai} { - set a [lindex $varcorder($curview) $ai] - set l [llength $displayorder] - set al [llength $varccommits($curview,$a)] - if {$l < $r + $al} { - if {$l < $r} { - set pad [ntimes [expr {$r - $l}] {}] - set displayorder [concat $displayorder $pad] - set parentlist [concat $parentlist $pad] - } elseif {$l > $r} { - set displayorder [lrange $displayorder 0 [expr {$r - 1}]] - set parentlist [lrange $parentlist 0 [expr {$r - 1}]] - } - foreach id $varccommits($curview,$a) { - lappend displayorder $id - lappend parentlist $parents($curview,$id) - } - } elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} { - set i $r - foreach id $varccommits($curview,$a) { - lset displayorder $i $id - lset parentlist $i $parents($curview,$id) - incr i - } - } - incr r $al + set a [lindex $varcorder($curview) $ai] + set l [llength $displayorder] + set al [llength $varccommits($curview,$a)] + if {$l < $r + $al} { + if {$l < $r} { + set pad [ntimes [expr {$r - $l}] {}] + set displayorder [concat $displayorder $pad] + set parentlist [concat $parentlist $pad] + } elseif {$l > $r} { + set displayorder [lrange $displayorder 0 [expr {$r - 1}]] + set parentlist [lrange $parentlist 0 [expr {$r - 1}]] + } + foreach id $varccommits($curview,$a) { + lappend displayorder $id + lappend parentlist $parents($curview,$id) + } + } elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} { + set i $r + foreach id $varccommits($curview,$a) { + lset displayorder $i $id + lset parentlist $i $parents($curview,$id) + incr i + } + } + incr r $al } } @@ -1308,8 +1307,8 @@ proc commitonrow {row} { set id [lindex $displayorder $row] if {$id eq {}} { - make_disporder $row [expr {$row + 1}] - set id [lindex $displayorder $row] + make_disporder $row [expr {$row + 1}] + set id [lindex $displayorder $row] } return $id } @@ -1322,35 +1321,35 @@ proc closevarcs {v} { set scripts {} set narcs [llength $varctok($v)] for {set a 1} {$a < $narcs} {incr a} { - set id [lindex $varccommits($v,$a) end] - foreach p $parents($v,$id) { - if {[info exists varcid($v,$p)]} continue - # add p as a new commit - incr missing_parents - set cmitlisted($v,$p) 0 - set parents($v,$p) {} - if {[llength $children($v,$p)] == 1 && - [llength $parents($v,$id)] == 1} { - set b $a - } else { - set b [newvarc $v $p] - } - set varcid($v,$p) $b - if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} { - modify_arc $v $b - } - lappend varccommits($v,$b) $p - incr commitidx($v) - if {$v == $curview} { - set numcommits $commitidx($v) - } - set scripts [check_interest $p $scripts] - } + set id [lindex $varccommits($v,$a) end] + foreach p $parents($v,$id) { + if {[info exists varcid($v,$p)]} continue + # add p as a new commit + incr missing_parents + set cmitlisted($v,$p) 0 + set parents($v,$p) {} + if {[llength $children($v,$p)] == 1 && + [llength $parents($v,$id)] == 1} { + set b $a + } else { + set b [newvarc $v $p] + } + set varcid($v,$p) $b + if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} { + modify_arc $v $b + } + lappend varccommits($v,$b) $p + incr commitidx($v) + if {$v == $curview} { + set numcommits $commitidx($v) + } + set scripts [check_interest $p $scripts] + } } if {$missing_parents > 0} { - foreach s $scripts { - eval $s - } + foreach s $scripts { + eval $s + } } } @@ -1360,23 +1359,23 @@ proc rewrite_commit {v id rwid} { global children parents varcid varctok vtokmod varccommits foreach ch $children($v,$id) { - # make $rwid be $ch's parent in place of $id - set i [lsearch -exact $parents($v,$ch) $id] - if {$i < 0} { - puts "oops rewrite_commit didn't find $id in parent list for $ch" - } - set parents($v,$ch) [lreplace $parents($v,$ch) $i $i $rwid] - # add $ch to $rwid's children and sort the list if necessary - if {[llength [lappend children($v,$rwid) $ch]] > 1} { - set children($v,$rwid) [lsort -command [list vtokcmp $v] \ - $children($v,$rwid)] - } - # fix the graph after joining $id to $rwid - set a $varcid($v,$ch) - fix_reversal $rwid $a $v - # parentlist is wrong for the last element of arc $a - # even if displayorder is right, hence the 3rd arg here - modify_arc $v $a [expr {[llength $varccommits($v,$a)] - 1}] + # make $rwid be $ch's parent in place of $id + set i [lsearch -exact $parents($v,$ch) $id] + if {$i < 0} { + puts "oops rewrite_commit didn't find $id in parent list for $ch" + } + set parents($v,$ch) [lreplace $parents($v,$ch) $i $i $rwid] + # add $ch to $rwid's children and sort the list if necessary + if {[llength [lappend children($v,$rwid) $ch]] > 1} { + set children($v,$rwid) [lsort -command [list vtokcmp $v] \ + $children($v,$rwid)] + } + # fix the graph after joining $id to $rwid + set a $varcid($v,$ch) + fix_reversal $rwid $a $v + # parentlist is wrong for the last element of arc $a + # even if displayorder is right, hence the 3rd arg here + modify_arc $v $a [expr {[llength $varccommits($v,$a)] - 1}] } } @@ -1396,19 +1395,19 @@ proc check_interest {id scripts} { set prefix [string range $id 0 3] if {[info exists commitinterest($prefix)]} { - set newlist {} - foreach {i script} $commitinterest($prefix) { - if {[string match "$i*" $id]} { - lappend scripts [string map [list "%I" $id "%P" $i] $script] - } else { - lappend newlist $i $script - } - } - if {$newlist ne {}} { - set commitinterest($prefix) $newlist - } else { - unset commitinterest($prefix) - } + set newlist {} + foreach {i script} $commitinterest($prefix) { + if {[string match "$i*" $id]} { + lappend scripts [string map [list "%I" $id "%P" $i] $script] + } else { + lappend newlist $i $script + } + } + if {$newlist ne {}} { + set commitinterest($prefix) $newlist + } else { + unset commitinterest($prefix) + } } return $scripts } @@ -1423,192 +1422,192 @@ proc getcommitlines {fd inst view updating} { set stuff [read $fd 500000] # git log doesn't terminate the last commit with a null... if {$stuff == {} && $leftover($inst) ne {} && [eof $fd]} { - set stuff "\0" + set stuff "\0" } if {$stuff == {}} { - if {![eof $fd]} { - return 1 - } - global commfd viewcomplete viewactive viewname - global viewinstances - unset commfd($inst) - set i [lsearch -exact $viewinstances($view) $inst] - if {$i >= 0} { - set viewinstances($view) [lreplace $viewinstances($view) $i $i] - } - # set it blocking so we wait for the process to terminate - fconfigure $fd -blocking 1 - if {[catch {close $fd} err]} { - set fv {} - if {$view != $curview} { - set fv " for the \"$viewname($view)\" view" - } - if {[string range $err 0 4] == "usage"} { - set err "Gitk: error reading commits$fv:\ - bad arguments to git log." - if {$viewname($view) eq [mc "Command line"]} { - append err \ - " (Note: arguments to gitk are passed to git log\ - to allow selection of commits to be displayed.)" - } - } else { - set err "Error reading commits$fv: $err" - } - error_popup $err - } - if {[incr viewactive($view) -1] <= 0} { - set viewcomplete($view) 1 - # Check if we have seen any ids listed as parents that haven't - # appeared in the list - closevarcs $view - notbusy $view - } - if {$view == $curview} { - run chewcommits - } - return 0 + if {![eof $fd]} { + return 1 + } + global commfd viewcomplete viewactive viewname + global viewinstances + unset commfd($inst) + set i [lsearch -exact $viewinstances($view) $inst] + if {$i >= 0} { + set viewinstances($view) [lreplace $viewinstances($view) $i $i] + } + # set it blocking so we wait for the process to terminate + fconfigure $fd -blocking 1 + if {[catch {close $fd} err]} { + set fv {} + if {$view != $curview} { + set fv " for the \"$viewname($view)\" view" + } + if {[string range $err 0 4] == "usage"} { + set err "Gitk: error reading commits$fv:\ + bad arguments to git log." + if {$viewname($view) eq [mc "Command line"]} { + append err \ + " (Note: arguments to gitk are passed to git log\ + to allow selection of commits to be displayed.)" + } + } else { + set err "Error reading commits$fv: $err" + } + error_popup $err + } + if {[incr viewactive($view) -1] <= 0} { + set viewcomplete($view) 1 + # Check if we have seen any ids listed as parents that haven't + # appeared in the list + closevarcs $view + notbusy $view + } + if {$view == $curview} { + run chewcommits + } + return 0 } set start 0 set gotsome 0 set scripts {} while 1 { - set i [string first "\0" $stuff $start] - if {$i < 0} { - append leftover($inst) [string range $stuff $start end] - break - } - if {$start == 0} { - set cmit $leftover($inst) - append cmit [string range $stuff 0 [expr {$i - 1}]] - set leftover($inst) {} - } else { - set cmit [string range $stuff $start [expr {$i - 1}]] - } - set start [expr {$i + 1}] - set j [string first "\n" $cmit] - set ok 0 - set listed 1 - if {$j >= 0 && [string match "commit *" $cmit]} { - set ids [string range $cmit 7 [expr {$j - 1}]] - if {[string match {[-^<>]*} $ids]} { - switch -- [string index $ids 0] { - "-" {set listed 0} - "^" {set listed 2} - "<" {set listed 3} - ">" {set listed 4} - } - set ids [string range $ids 1 end] - } - set ok 1 - foreach id $ids { - if {[string length $id] != 40} { - set ok 0 - break - } - } - } - if {!$ok} { - set shortcmit $cmit - if {[string length $shortcmit] > 80} { - set shortcmit "[string range $shortcmit 0 80]..." - } - error_popup "[mc "Can't parse git log output:"] {$shortcmit}" - exit 1 - } - set id [lindex $ids 0] - set vid $view,$id - - lappend vshortids($view,[string range $id 0 3]) $id - - if {!$listed && $updating && ![info exists varcid($vid)] && - $vfilelimit($view) ne {}} { - # git log doesn't rewrite parents for unlisted commits - # when doing path limiting, so work around that here - # by working out the rewritten parent with git rev-list - # and if we already know about it, using the rewritten - # parent as a substitute parent for $id's children. - if {![catch { - set rwid [exec git rev-list --first-parent --max-count=1 \ - $id -- $vfilelimit($view)] - }]} { - if {$rwid ne {} && [info exists varcid($view,$rwid)]} { - # use $rwid in place of $id - rewrite_commit $view $id $rwid - continue - } - } - } - - set a 0 - if {[info exists varcid($vid)]} { - if {$cmitlisted($vid) || !$listed} continue - set a $varcid($vid) - } - if {$listed} { - set olds [lrange $ids 1 end] - } else { - set olds {} - } - set commitdata($id) [string range $cmit [expr {$j + 1}] end] - set cmitlisted($vid) $listed - set parents($vid) $olds - if {![info exists children($vid)]} { - set children($vid) {} - } elseif {$a == 0 && [llength $children($vid)] == 1} { - set k [lindex $children($vid) 0] - if {[llength $parents($view,$k)] == 1 && - (!$vdatemode($view) || - $varcid($view,$k) == [llength $varctok($view)] - 1)} { - set a $varcid($view,$k) - } - } - if {$a == 0} { - # new arc - set a [newvarc $view $id] - } - if {[string compare [lindex $varctok($view) $a] $vtokmod($view)] < 0} { - modify_arc $view $a - } - if {![info exists varcid($vid)]} { - set varcid($vid) $a - lappend varccommits($view,$a) $id - incr commitidx($view) - } - - set i 0 - foreach p $olds { - if {$i == 0 || [lsearch -exact $olds $p] >= $i} { - set vp $view,$p - if {[llength [lappend children($vp) $id]] > 1 && - [vtokcmp $view [lindex $children($vp) end-1] $id] > 0} { - set children($vp) [lsort -command [list vtokcmp $view] \ - $children($vp)] - unset -nocomplain ordertok - } - if {[info exists varcid($view,$p)]} { - fix_reversal $p $a $view - } - } - incr i - } - - set scripts [check_interest $id $scripts] - set gotsome 1 + set i [string first "\0" $stuff $start] + if {$i < 0} { + append leftover($inst) [string range $stuff $start end] + break + } + if {$start == 0} { + set cmit $leftover($inst) + append cmit [string range $stuff 0 [expr {$i - 1}]] + set leftover($inst) {} + } else { + set cmit [string range $stuff $start [expr {$i - 1}]] + } + set start [expr {$i + 1}] + set j [string first "\n" $cmit] + set ok 0 + set listed 1 + if {$j >= 0 && [string match "commit *" $cmit]} { + set ids [string range $cmit 7 [expr {$j - 1}]] + if {[string match {[-^<>]*} $ids]} { + switch -- [string index $ids 0] { + "-" {set listed 0} + "^" {set listed 2} + "<" {set listed 3} + ">" {set listed 4} + } + set ids [string range $ids 1 end] + } + set ok 1 + foreach id $ids { + if {[string length $id] != 40} { + set ok 0 + break + } + } + } + if {!$ok} { + set shortcmit $cmit + if {[string length $shortcmit] > 80} { + set shortcmit "[string range $shortcmit 0 80]..." + } + error_popup "[mc "Can't parse git log output:"] {$shortcmit}" + exit 1 + } + set id [lindex $ids 0] + set vid $view,$id + + lappend vshortids($view,[string range $id 0 3]) $id + + if {!$listed && $updating && ![info exists varcid($vid)] && + $vfilelimit($view) ne {}} { + # git log doesn't rewrite parents for unlisted commits + # when doing path limiting, so work around that here + # by working out the rewritten parent with git rev-list + # and if we already know about it, using the rewritten + # parent as a substitute parent for $id's children. + if {![catch { + set rwid [exec git rev-list --first-parent --max-count=1 \ + $id -- $vfilelimit($view)] + }]} { + if {$rwid ne {} && [info exists varcid($view,$rwid)]} { + # use $rwid in place of $id + rewrite_commit $view $id $rwid + continue + } + } + } + + set a 0 + if {[info exists varcid($vid)]} { + if {$cmitlisted($vid) || !$listed} continue + set a $varcid($vid) + } + if {$listed} { + set olds [lrange $ids 1 end] + } else { + set olds {} + } + set commitdata($id) [string range $cmit [expr {$j + 1}] end] + set cmitlisted($vid) $listed + set parents($vid) $olds + if {![info exists children($vid)]} { + set children($vid) {} + } elseif {$a == 0 && [llength $children($vid)] == 1} { + set k [lindex $children($vid) 0] + if {[llength $parents($view,$k)] == 1 && + (!$vdatemode($view) || + $varcid($view,$k) == [llength $varctok($view)] - 1)} { + set a $varcid($view,$k) + } + } + if {$a == 0} { + # new arc + set a [newvarc $view $id] + } + if {[string compare [lindex $varctok($view) $a] $vtokmod($view)] < 0} { + modify_arc $view $a + } + if {![info exists varcid($vid)]} { + set varcid($vid) $a + lappend varccommits($view,$a) $id + incr commitidx($view) + } + + set i 0 + foreach p $olds { + if {$i == 0 || [lsearch -exact $olds $p] >= $i} { + set vp $view,$p + if {[llength [lappend children($vp) $id]] > 1 && + [vtokcmp $view [lindex $children($vp) end-1] $id] > 0} { + set children($vp) [lsort -command [list vtokcmp $view] \ + $children($vp)] + unset -nocomplain ordertok + } + if {[info exists varcid($view,$p)]} { + fix_reversal $p $a $view + } + } + incr i + } + + set scripts [check_interest $id $scripts] + set gotsome 1 } if {$gotsome} { - global numcommits hlview - - if {$view == $curview} { - set numcommits $commitidx($view) - run chewcommits - } - if {[info exists hlview] && $view == $hlview} { - # we never actually get here... - run vhighlightmore - } - foreach s $scripts { - eval $s - } + global numcommits hlview + + if {$view == $curview} { + set numcommits $commitidx($view) + run chewcommits + } + if {[info exists hlview] && $view == $hlview} { + # we never actually get here... + run vhighlightmore + } + foreach s $scripts { + eval $s + } } return 2 } @@ -1619,28 +1618,28 @@ proc chewcommits {} { layoutmore if {$viewcomplete($curview)} { - global commitidx varctok - global numcommits startmsecs - - if {[info exists pending_select]} { - update - reset_pending_select {} - - if {[commitinview $pending_select $curview]} { - selectline [rowofcommit $pending_select] 1 - } else { - set row [first_real_row] - selectline $row 1 - } - } - if {$commitidx($curview) > 0} { - #set ms [expr {[clock clicks -milliseconds] - $startmsecs}] - #puts "overall $ms ms for $numcommits commits" - #puts "[llength $varctok($view)] arcs, $commitidx($view) commits" - } else { - show_status [mc "No commits selected"] - } - notbusy layout + global commitidx varctok + global numcommits startmsecs + + if {[info exists pending_select]} { + update + reset_pending_select {} + + if {[commitinview $pending_select $curview]} { + selectline [rowofcommit $pending_select] 1 + } else { + set row [first_real_row] + selectline $row 1 + } + } + if {$commitidx($curview) > 0} { + #set ms [expr {[clock clicks -milliseconds] - $startmsecs}] + #puts "overall $ms ms for $numcommits commits" + #puts "[llength $varctok($view)] arcs, $commitidx($view) commits" + } else { + show_status [mc "No commits selected"] + } + notbusy layout } return 0 } @@ -1653,7 +1652,7 @@ proc do_readcommit {id} { # Read the results using i18n.logoutputencoding fconfigure $fd -translation lf -eofchar {} if {$tclencoding != {}} { - fconfigure $fd -encoding $tclencoding + fconfigure $fd -encoding $tclencoding } set contents [read $fd] close $fd @@ -1680,44 +1679,44 @@ proc parsecommit {id contents listed} { set comdate {} set hdrend [string first "\n\n" $contents] if {$hdrend < 0} { - # should never happen... - set hdrend [string length $contents] + # should never happen... + set hdrend [string length $contents] } set header [string range $contents 0 [expr {$hdrend - 1}]] set comment [string range $contents [expr {$hdrend + 2}] end] foreach line [split $header "\n"] { - set line [split $line " "] - set tag [lindex $line 0] - if {$tag == "author"} { - set audate [lrange $line end-1 end] - set auname [join [lrange $line 1 end-2] " "] - } elseif {$tag == "committer"} { - set comdate [lrange $line end-1 end] - set comname [join [lrange $line 1 end-2] " "] - } + set line [split $line " "] + set tag [lindex $line 0] + if {$tag == "author"} { + set audate [lrange $line end-1 end] + set auname [join [lrange $line 1 end-2] " "] + } elseif {$tag == "committer"} { + set comdate [lrange $line end-1 end] + set comname [join [lrange $line 1 end-2] " "] + } } set headline {} # take the first non-blank line of the comment as the headline set headline [string trimleft $comment] set i [string first "\n" $headline] if {$i >= 0} { - set headline [string range $headline 0 $i] + set headline [string range $headline 0 $i] } set headline [string trimright $headline] set i [string first "\r" $headline] if {$i >= 0} { - set headline [string trimright [string range $headline 0 $i]] + set headline [string trimright [string range $headline 0 $i]] } if {!$listed} { - # git log indents the comment by 4 spaces; - # if we got this via git cat-file, add the indentation - set newcomment {} - foreach line [split $comment "\n"] { - append newcomment " " - append newcomment $line - append newcomment "\n" - } - set comment $newcomment + # git log indents the comment by 4 spaces; + # if we got this via git cat-file, add the indentation + set newcomment {} + foreach line [split $comment "\n"] { + append newcomment " " + append newcomment $line + append newcomment "\n" + } + set comment $newcomment } set hasnote [string first "\nNotes:\n" $contents] set diff "" @@ -1726,23 +1725,23 @@ proc parsecommit {id contents listed} { # diff. set i [string first "\n\ndiff" $comment] if {$i >= 0} { - set diff [string range $comment $i+1 end] - set comment [string range $comment 0 $i-1] + set diff [string range $comment $i+1 end] + set comment [string range $comment 0 $i-1] } set commitinfo($id) [list $headline $auname $audate \ - $comname $comdate $comment $hasnote $diff] + $comname $comdate $comment $hasnote $diff] } proc getcommit {id} { global commitdata commitinfo if {[info exists commitdata($id)]} { - parsecommit $id $commitdata($id) 1 + parsecommit $id $commitdata($id) 1 } else { - readcommit $id - if {![info exists commitinfo($id)]} { - set commitinfo($id) [list [mc "No commit information available"]] - } + readcommit $id + if {![info exists commitinfo($id)]} { + set commitinfo($id) [list [mc "No commit information available"]] + } } return 1 } @@ -1755,22 +1754,22 @@ proc longid {prefix} { set ids {} if {[string length $prefix] >= 4} { - set vshortid $curview,[string range $prefix 0 3] - if {[info exists vshortids($vshortid)]} { - foreach id $vshortids($vshortid) { - if {[string match "$prefix*" $id]} { - if {[lsearch -exact $ids $id] < 0} { - lappend ids $id - if {[llength $ids] >= 2} break - } - } - } - } + set vshortid $curview,[string range $prefix 0 3] + if {[info exists vshortids($vshortid)]} { + foreach id $vshortids($vshortid) { + if {[string match "$prefix*" $id]} { + if {[lsearch -exact $ids $id] < 0} { + lappend ids $id + if {[llength $ids] >= 2} break + } + } + } + } } else { - foreach match [array names varcid "$curview,$prefix*"] { - lappend ids [lindex [split $match ","] 1] - if {[llength $ids] >= 2} break - } + foreach match [array names varcid "$curview,$prefix*"] { + lappend ids [lindex [split $match ","] 1] + if {[llength $ids] >= 2} break + } } return $ids } @@ -1780,57 +1779,61 @@ proc readrefs {} { global otherrefids idotherrefs mainhead mainheadid global selecthead selectheadid global hideremotes + global tclencoding foreach v {tagids idtags headids idheads otherrefids idotherrefs} { - unset -nocomplain $v + unset -nocomplain $v } set refd [open [list | git show-ref -d] r] + if {$tclencoding != {}} { + fconfigure $refd -encoding $tclencoding + } while {[gets $refd line] >= 0} { - if {[string index $line 40] ne " "} continue - set id [string range $line 0 39] - set ref [string range $line 41 end] - if {![string match "refs/*" $ref]} continue - set name [string range $ref 5 end] - if {[string match "remotes/*" $name]} { - if {![string match "*/HEAD" $name] && !$hideremotes} { - set headids($name) $id - lappend idheads($id) $name - } - } elseif {[string match "heads/*" $name]} { - set name [string range $name 6 end] - set headids($name) $id - lappend idheads($id) $name - } elseif {[string match "tags/*" $name]} { - # this lets refs/tags/foo^{} overwrite refs/tags/foo, - # which is what we want since the former is the commit ID - set name [string range $name 5 end] - if {[string match "*^{}" $name]} { - set name [string range $name 0 end-3] - } else { - set tagobjid($name) $id - } - set tagids($name) $id - lappend idtags($id) $name - } else { - set otherrefids($name) $id - lappend idotherrefs($id) $name - } + if {[string index $line 40] ne " "} continue + set id [string range $line 0 39] + set ref [string range $line 41 end] + if {![string match "refs/*" $ref]} continue + set name [string range $ref 5 end] + if {[string match "remotes/*" $name]} { + if {![string match "*/HEAD" $name] && !$hideremotes} { + set headids($name) $id + lappend idheads($id) $name + } + } elseif {[string match "heads/*" $name]} { + set name [string range $name 6 end] + set headids($name) $id + lappend idheads($id) $name + } elseif {[string match "tags/*" $name]} { + # this lets refs/tags/foo^{} overwrite refs/tags/foo, + # which is what we want since the former is the commit ID + set name [string range $name 5 end] + if {[string match "*^{}" $name]} { + set name [string range $name 0 end-3] + } else { + set tagobjid($name) $id + } + set tagids($name) $id + lappend idtags($id) $name + } else { + set otherrefids($name) $id + lappend idotherrefs($id) $name + } } catch {close $refd} set mainhead {} set mainheadid {} catch { - set mainheadid [exec git rev-parse HEAD] - set thehead [exec git symbolic-ref HEAD] - if {[string match "refs/heads/*" $thehead]} { - set mainhead [string range $thehead 11 end] - } + set mainheadid [exec git rev-parse HEAD] + set thehead [exec git symbolic-ref HEAD] + if {[string match "refs/heads/*" $thehead]} { + set mainhead [string range $thehead 11 end] + } } set selectheadid {} if {$selecthead ne {}} { - catch { - set selectheadid [exec git rev-parse --verify $selecthead] - } + catch { + set selectheadid [exec git rev-parse --verify $selecthead] + } } } @@ -1839,10 +1842,10 @@ proc first_real_row {} { global nullid nullid2 numcommits for {set row 0} {$row < $numcommits} {incr row} { - set id [commitonrow $row] - if {$id ne $nullid && $id ne $nullid2} { - break - } + set id [commitonrow $row] + if {$id ne $nullid && $id ne $nullid2} { + break + } } return $row } @@ -1861,12 +1864,12 @@ proc removehead {id name} { global headids idheads if {$idheads($id) eq $name} { - unset idheads($id) + unset idheads($id) } else { - set i [lsearch -exact $idheads($id) $name] - if {$i >= 0} { - set idheads($id) [lreplace $idheads($id) $i $i] - } + set i [lsearch -exact $idheads($id) $name] + if {$i >= 0} { + set idheads($id) [lreplace $idheads($id) $i $i] + } } unset headids($name) } @@ -1894,7 +1897,7 @@ proc make_transient {window origin} { # Windows fails to place transient windows normally, so # schedule a callback to center them on the parent. if {[tk windowingsystem] eq {win32}} { - after idle [list tk::PlaceWindow $window widget $origin] + after idle [list tk::PlaceWindow $window widget $origin] } } @@ -1994,41 +1997,41 @@ proc setttkstyle {} { proc makemenu {m items} { menu $m if {[tk windowingsystem] eq {aqua}} { - set Meta1 Cmd + set Meta1 Cmd } else { - set Meta1 Ctrl + set Meta1 Ctrl } foreach i $items { - set name [mc [lindex $i 1]] - set type [lindex $i 2] - set thing [lindex $i 3] - set params [list $type] - if {$name ne {}} { - set u [string first "&" [string map {&& x} $name]] - lappend params -label [string map {&& & & {}} $name] - if {$u >= 0} { - lappend params -underline $u - } - } - switch -- $type { - "cascade" { - set submenu [string tolower [string map {& ""} [lindex $i 1]]] - lappend params -menu $m.$submenu - } - "command" { - lappend params -command $thing - } - "radiobutton" { - lappend params -variable [lindex $thing 0] \ - -value [lindex $thing 1] - } - } - set tail [lrange $i 4 end] - regsub -all {\yMeta1\y} $tail $Meta1 tail - eval $m add $params $tail - if {$type eq "cascade"} { - makemenu $m.$submenu $thing - } + set name [mc [lindex $i 1]] + set type [lindex $i 2] + set thing [lindex $i 3] + set params [list $type] + if {$name ne {}} { + set u [string first "&" [string map {&& x} $name]] + lappend params -label [string map {&& & & {}} $name] + if {$u >= 0} { + lappend params -underline $u + } + } + switch -- $type { + "cascade" { + set submenu [string tolower [string map {& ""} [lindex $i 1]]] + lappend params -menu $m.$submenu + } + "command" { + lappend params -command $thing + } + "radiobutton" { + lappend params -variable [lindex $thing 0] \ + -value [lindex $thing 1] + } + } + set tail [lrange $i 4 end] + regsub -all {\yMeta1\y} $tail $Meta1 tail + eval $m add $params $tail + if {$type eq "cascade"} { + makemenu $m.$submenu $thing + } } } @@ -2048,12 +2051,12 @@ proc makedroplist {w varname args} { set cx [string length $label] if {$cx > $width} {set width $cx} } - set gm [ttk::combobox $w -width $width -state readonly\ - -textvariable $varname -values $args \ - -exportselection false] - bind $gm <<ComboboxSelected>> [list $gm selection clear] + set gm [ttk::combobox $w -width $width -state readonly\ + -textvariable $varname -values $args \ + -exportselection false] + bind $gm <<ComboboxSelected>> [list $gm selection clear] } else { - set gm [eval [linsert $args 0 tk_optionMenu $w $varname]] + set gm [eval [linsert $args 0 tk_optionMenu $w $varname]] } return $gm } @@ -2069,7 +2072,7 @@ proc makewindow {} { global rowctxmenu fakerowmenu mergemax wrapcomment global highlight_files gdttype global searchstring sstring - global bgcolor fgcolor bglist fglist diffcolors selectbgcolor + global bgcolor fgcolor bglist fglist diffcolors diffbgcolors selectbgcolor global uifgcolor uifgdisabledcolor global filesepbgcolor filesepfgcolor global mergecolors foundbgcolor currentsearchhitbgcolor @@ -2083,49 +2086,49 @@ proc makewindow {} { # The "mc" arguments here are purely so that xgettext # sees the following string as needing to be translated set file { - mc "&File" cascade { - {mc "&Update" command updatecommits -accelerator F5} - {mc "&Reload" command reloadcommits -accelerator Shift-F5} - {mc "Reread re&ferences" command rereadrefs} - {mc "&List references" command showrefs -accelerator F2} - {xx "" separator} - {mc "Start git &gui" command {exec git gui &}} - {xx "" separator} - {mc "&Quit" command doquit -accelerator Meta1-Q} - }} + mc "&File" cascade { + {mc "&Update" command updatecommits -accelerator F5} + {mc "&Reload" command reloadcommits -accelerator Shift-F5} + {mc "Reread re&ferences" command rereadrefs} + {mc "&List references" command showrefs -accelerator F2} + {xx "" separator} + {mc "Start git &gui" command {exec git gui &}} + {xx "" separator} + {mc "&Quit" command doquit -accelerator Meta1-Q} + }} set edit { - mc "&Edit" cascade { - {mc "&Preferences" command doprefs} - }} + mc "&Edit" cascade { + {mc "&Preferences" command doprefs} + }} set view { - mc "&View" cascade { - {mc "&New view..." command {newview 0} -accelerator Shift-F4} - {mc "&Edit view..." command editview -state disabled -accelerator F4} - {mc "&Delete view" command delview -state disabled} - {xx "" separator} - {mc "&All files" radiobutton {selectedview 0} -command {showview 0}} - }} + mc "&View" cascade { + {mc "&New view..." command {newview 0} -accelerator Shift-F4} + {mc "&Edit view..." command editview -state disabled -accelerator F4} + {mc "&Delete view" command delview -state disabled} + {xx "" separator} + {mc "&All files" radiobutton {selectedview 0} -command {showview 0}} + }} if {[tk windowingsystem] ne "aqua"} { - set help { - mc "&Help" cascade { - {mc "&About gitk" command about} - {mc "&Key bindings" command keys} - }} - set bar [list $file $edit $view $help] + set help { + mc "&Help" cascade { + {mc "&About gitk" command about} + {mc "&Key bindings" command keys} + }} + set bar [list $file $edit $view $help] } else { - proc ::tk::mac::ShowPreferences {} {doprefs} - proc ::tk::mac::Quit {} {doquit} - lset file end [lreplace [lindex $file end] end-1 end] - set apple { - xx "&Apple" cascade { - {mc "&About gitk" command about} - {xx "" separator} - }} - set help { - mc "&Help" cascade { - {mc "&Key bindings" command keys} - }} - set bar [list $apple $file $view $help] + proc ::tk::mac::ShowPreferences {} {doprefs} + proc ::tk::mac::Quit {} {doquit} + lset file end [lreplace [lindex $file end] end-1 end] + set apple { + xx "&Apple" cascade { + {mc "&About gitk" command about} + {xx "" separator} + }} + set help { + mc "&Help" cascade { + {mc "&Key bindings" command keys} + }} + set bar [list $apple $file $view $help] } makemenu .bar $bar . configure -menu .bar @@ -2153,36 +2156,36 @@ proc makewindow {} { ${NS}::frame .tf.histframe ${NS}::panedwindow .tf.histframe.pwclist -orient horizontal if {!$use_ttk} { - .tf.histframe.pwclist configure -sashpad 0 -handlesize 4 + .tf.histframe.pwclist configure -sashpad 0 -handlesize 4 } # create three canvases set cscroll .tf.histframe.csb set canv .tf.histframe.pwclist.canv canvas $canv \ - -selectbackground $selectbgcolor \ - -background $bgcolor -bd 0 \ - -yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll" + -selectbackground $selectbgcolor \ + -background $bgcolor -bd 0 \ + -yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll" .tf.histframe.pwclist add $canv set canv2 .tf.histframe.pwclist.canv2 canvas $canv2 \ - -selectbackground $selectbgcolor \ - -background $bgcolor -bd 0 -yscrollincr $linespc + -selectbackground $selectbgcolor \ + -background $bgcolor -bd 0 -yscrollincr $linespc .tf.histframe.pwclist add $canv2 set canv3 .tf.histframe.pwclist.canv3 canvas $canv3 \ - -selectbackground $selectbgcolor \ - -background $bgcolor -bd 0 -yscrollincr $linespc + -selectbackground $selectbgcolor \ + -background $bgcolor -bd 0 -yscrollincr $linespc .tf.histframe.pwclist add $canv3 if {$use_ttk} { - bind .tf.histframe.pwclist <Map> { - bind %W <Map> {} - .tf.histframe.pwclist sashpos 1 [lindex $::geometry(pwsash1) 0] - .tf.histframe.pwclist sashpos 0 [lindex $::geometry(pwsash0) 0] - } + bind .tf.histframe.pwclist <Map> { + bind %W <Map> {} + .tf.histframe.pwclist sashpos 1 [lindex $::geometry(pwsash1) 0] + .tf.histframe.pwclist sashpos 0 [lindex $::geometry(pwsash0) 0] + } } else { - eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0) - eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1) + eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0) + eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1) } # a scroll bar to rule them @@ -2201,7 +2204,7 @@ proc makewindow {} { set entries $sha1entry set sha1but .tf.bar.sha1label button $sha1but -text "[mc "SHA1 ID:"] " -state disabled -relief flat \ - -command gotocommit -width 8 + -command gotocommit -width 8 $sha1but conf -disabledforeground [$sha1but cget -foreground] pack .tf.bar.sha1label -side left ${NS}::entry $sha1entry -width 40 -font textfont -textvariable sha1string @@ -2209,20 +2212,20 @@ proc makewindow {} { pack $sha1entry -side left -pady 2 set bm_left_data { - #define left_width 16 - #define left_height 16 - static unsigned char left_bits[] = { - 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00, - 0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00, - 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01}; + #define left_width 16 + #define left_height 16 + static unsigned char left_bits[] = { + 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00, + 0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00, + 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01}; } set bm_right_data { - #define right_width 16 - #define right_height 16 - static unsigned char right_bits[] = { - 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c, - 0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c, - 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01}; + #define right_width 16 + #define right_height 16 + static unsigned char right_bits[] = { + 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c, + 0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c, + 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01}; } image create bitmap bm-left -data $bm_left_data -foreground $uifgcolor image create bitmap bm-left-gray -data $bm_left_data -foreground $uifgdisabledcolor @@ -2231,28 +2234,28 @@ proc makewindow {} { ${NS}::button .tf.bar.leftbut -command goback -state disabled -width 26 if {$use_ttk} { - .tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray] + .tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray] } else { - .tf.bar.leftbut configure -image bm-left + .tf.bar.leftbut configure -image bm-left } pack .tf.bar.leftbut -side left -fill y ${NS}::button .tf.bar.rightbut -command goforw -state disabled -width 26 if {$use_ttk} { - .tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray] + .tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray] } else { - .tf.bar.rightbut configure -image bm-right + .tf.bar.rightbut configure -image bm-right } pack .tf.bar.rightbut -side left -fill y ${NS}::label .tf.bar.rowlabel -text [mc "Row"] set rownumsel {} ${NS}::label .tf.bar.rownum -width 7 -textvariable rownumsel \ - -relief sunken -anchor e + -relief sunken -anchor e ${NS}::label .tf.bar.rowlabel2 -text "/" ${NS}::label .tf.bar.numcommits -width 7 -textvariable numcommits \ - -relief sunken -anchor e + -relief sunken -anchor e pack .tf.bar.rowlabel .tf.bar.rownum .tf.bar.rowlabel2 .tf.bar.numcommits \ - -side left + -side left if {!$use_ttk} { foreach w {rownum numcommits} {.tf.bar.$w configure -font textfont} } @@ -2264,14 +2267,14 @@ proc makewindow {} { ${NS}::label $statusw -width 15 -relief sunken pack $statusw -side left -padx 5 if {$use_ttk} { - set progresscanv [ttk::progressbar .tf.bar.progress] + set progresscanv [ttk::progressbar .tf.bar.progress] } else { - set h [expr {[font metrics uifont -linespace] + 2}] - set progresscanv .tf.bar.progress - canvas $progresscanv -relief sunken -height $h -borderwidth 2 - set progressitem [$progresscanv create rect -1 0 0 $h -fill "#00ff00"] - set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow] - set rprogitem [$progresscanv create rect -1 0 0 $h -fill red] + set h [expr {[font metrics uifont -linespace] + 2}] + set progresscanv .tf.bar.progress + canvas $progresscanv -relief sunken -height $h -borderwidth 2 + set progressitem [$progresscanv create rect -1 0 0 $h -fill "#00ff00"] + set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow] + set rprogitem [$progresscanv create rect -1 0 0 $h -fill red] } pack $progresscanv -side right -expand 1 -fill x -padx {0 2} set progresscoords {0 0} @@ -2285,26 +2288,26 @@ proc makewindow {} { ${NS}::label .tf.lbar.flabel -text "[mc "Find"] " set bm_down_data { - #define down_width 16 - #define down_height 16 - static unsigned char down_bits[] = { - 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, - 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, - 0x87, 0xe1, 0x8e, 0x71, 0x9c, 0x39, 0xb8, 0x1d, - 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01}; + #define down_width 16 + #define down_height 16 + static unsigned char down_bits[] = { + 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, + 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, + 0x87, 0xe1, 0x8e, 0x71, 0x9c, 0x39, 0xb8, 0x1d, + 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01}; } image create bitmap bm-down -data $bm_down_data -foreground $uifgcolor ${NS}::button .tf.lbar.fnext -width 26 -command {dofind 1 1} .tf.lbar.fnext configure -image bm-down set bm_up_data { - #define up_width 16 - #define up_height 16 - static unsigned char up_bits[] = { - 0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, - 0xb8, 0x1d, 0x9c, 0x39, 0x8e, 0x71, 0x87, 0xe1, - 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, - 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01}; + #define up_width 16 + #define up_height 16 + static unsigned char up_bits[] = { + 0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, + 0xb8, 0x1d, 0x9c, 0x39, 0x8e, 0x71, 0x87, 0xe1, + 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, + 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01}; } image create bitmap bm-up -data $bm_up_data -foreground $uifgcolor ${NS}::button .tf.lbar.fprev -width 26 -command {dofind -1 1} @@ -2313,13 +2316,13 @@ proc makewindow {} { ${NS}::label .tf.lbar.flab2 -text " [mc "commit"] " pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \ - -side left -fill y + -side left -fill y set gdttype [mc "containing:"] set gm [makedroplist .tf.lbar.gdttype gdttype \ - [mc "containing:"] \ - [mc "touching paths:"] \ - [mc "adding/removing string:"] \ - [mc "changing lines matching:"]] + [mc "containing:"] \ + [mc "touching paths:"] \ + [mc "adding/removing string:"] \ + [mc "changing lines matching:"]] trace add variable gdttype write gdttype_change pack .tf.lbar.gdttype -side left -fill y @@ -2330,11 +2333,11 @@ proc makewindow {} { trace add variable findstring write find_change set findtype [mc "Exact"] set findtypemenu [makedroplist .tf.lbar.findtype \ - findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]] + findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]] trace add variable findtype write findcom_change set findloc [mc "All fields"] makedroplist .tf.lbar.findloc findloc [mc "All fields"] [mc "Headline"] \ - [mc "Comments"] [mc "Author"] [mc "Committer"] + [mc "Comments"] [mc "Author"] [mc "Committer"] trace add variable findloc write find_change pack .tf.lbar.findloc -side right pack .tf.lbar.findtype -side right @@ -2346,8 +2349,8 @@ proc makewindow {} { pack .tf.histframe -fill both -side top -expand 1 .ctop add .tf if {!$use_ttk} { - .ctop paneconfigure .tf -height $geometry(topheight) - .ctop paneconfigure .tf -width $geometry(topwidth) + .ctop paneconfigure .tf -height $geometry(topheight) + .ctop paneconfigure .tf -width $geometry(topwidth) } # now build up the bottom @@ -2357,9 +2360,9 @@ proc makewindow {} { # if we know window height, then that will set the lower text height, otherwise # we set lower text height which will drive window height if {[info exists geometry(main)]} { - ${NS}::frame .bleft -width $geometry(botwidth) + ${NS}::frame .bleft -width $geometry(botwidth) } else { - ${NS}::frame .bleft -width $geometry(botwidth) -height $geometry(botheight) + ${NS}::frame .bleft -width $geometry(botwidth) -height $geometry(botheight) } ${NS}::frame .bleft.top ${NS}::frame .bleft.mid @@ -2377,41 +2380,41 @@ proc makewindow {} { trace add variable searchstring write incrsearch pack $sstring -side left -expand 1 -fill x ${NS}::radiobutton .bleft.mid.diff -text [mc "Diff"] \ - -command changediffdisp -variable diffelide -value {0 0} + -command changediffdisp -variable diffelide -value {0 0} ${NS}::radiobutton .bleft.mid.old -text [mc "Old version"] \ - -command changediffdisp -variable diffelide -value {0 1} + -command changediffdisp -variable diffelide -value {0 1} ${NS}::radiobutton .bleft.mid.new -text [mc "New version"] \ - -command changediffdisp -variable diffelide -value {1 0} + -command changediffdisp -variable diffelide -value {1 0} ${NS}::label .bleft.mid.labeldiffcontext -text " [mc "Lines of context"]: " pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left -ipadx $wgap spinbox .bleft.mid.diffcontext -width 5 \ - -from 0 -increment 1 -to 10000000 \ - -validate all -validatecommand "diffcontextvalidate %P" \ - -textvariable diffcontextstring + -from 0 -increment 1 -to 10000000 \ + -validate all -validatecommand "diffcontextvalidate %P" \ + -textvariable diffcontextstring .bleft.mid.diffcontext set $diffcontext trace add variable diffcontextstring write diffcontextchange lappend entries .bleft.mid.diffcontext pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext -side left -ipadx $wgap ${NS}::checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \ - -command changeignorespace -variable ignorespace + -command changeignorespace -variable ignorespace pack .bleft.mid.ignspace -side left -padx 5 set worddiff [mc "Line diff"] if {[package vcompare $git_version "1.7.2"] >= 0} { - makedroplist .bleft.mid.worddiff worddiff [mc "Line diff"] \ - [mc "Markup words"] [mc "Color words"] - trace add variable worddiff write changeworddiff - pack .bleft.mid.worddiff -side left -padx 5 + makedroplist .bleft.mid.worddiff worddiff [mc "Line diff"] \ + [mc "Markup words"] [mc "Color words"] + trace add variable worddiff write changeworddiff + pack .bleft.mid.worddiff -side left -padx 5 } set ctext .bleft.bottom.ctext text $ctext -background $bgcolor -foreground $fgcolor \ - -state disabled -undo 0 -font textfont \ - -yscrollcommand scrolltext -wrap none \ - -xscrollcommand ".bleft.bottom.sbhorizontal set" + -state disabled -undo 0 -font textfont \ + -yscrollcommand scrolltext -wrap none \ + -xscrollcommand ".bleft.bottom.sbhorizontal set" if {$have_tk85} { - $ctext conf -tabstyle wordprocessor + $ctext conf -tabstyle wordprocessor } ${NS}::scrollbar .bleft.bottom.sb -command "$ctext yview" ${NS}::scrollbar .bleft.bottom.sbhorizontal -command "$ctext xview" -orient h @@ -2430,7 +2433,9 @@ proc makewindow {} { $ctext tag conf filesep -font textfontbold -fore $filesepfgcolor -back $filesepbgcolor $ctext tag conf hunksep -fore [lindex $diffcolors 2] $ctext tag conf d0 -fore [lindex $diffcolors 0] + $ctext tag conf d0 -back [lindex $diffbgcolors 0] $ctext tag conf dresult -fore [lindex $diffcolors 1] + $ctext tag conf dresult -back [lindex $diffbgcolors 1] $ctext tag conf m0 -fore [lindex $mergecolors 0] $ctext tag conf m1 -fore [lindex $mergecolors 1] $ctext tag conf m2 -fore [lindex $mergecolors 2] @@ -2455,38 +2460,44 @@ proc makewindow {} { $ctext tag conf currentsearchhit -back $currentsearchhitbgcolor $ctext tag conf wwrap -wrap word -lmargin2 1c $ctext tag conf bold -font textfontbold + # set these to the lowest priority: + $ctext tag lower currentsearchhit + $ctext tag lower found + $ctext tag lower filesep + $ctext tag lower dresult + $ctext tag lower d0 .pwbottom add .bleft if {!$use_ttk} { - .pwbottom paneconfigure .bleft -width $geometry(botwidth) + .pwbottom paneconfigure .bleft -width $geometry(botwidth) } # lower right ${NS}::frame .bright ${NS}::frame .bright.mode ${NS}::radiobutton .bright.mode.patch -text [mc "Patch"] \ - -command reselectline -variable cmitmode -value "patch" + -command reselectline -variable cmitmode -value "patch" ${NS}::radiobutton .bright.mode.tree -text [mc "Tree"] \ - -command reselectline -variable cmitmode -value "tree" + -command reselectline -variable cmitmode -value "tree" grid .bright.mode.patch .bright.mode.tree -sticky ew pack .bright.mode -side top -fill x set cflist .bright.cfiles set indent [font measure mainfont "nn"] text $cflist \ - -selectbackground $selectbgcolor \ - -background $bgcolor -foreground $fgcolor \ - -font mainfont \ - -tabs [list $indent [expr {2 * $indent}]] \ - -yscrollcommand ".bright.sb set" \ - -cursor [. cget -cursor] \ - -spacing1 1 -spacing3 1 + -selectbackground $selectbgcolor \ + -background $bgcolor -foreground $fgcolor \ + -font mainfont \ + -tabs [list $indent [expr {2 * $indent}]] \ + -yscrollcommand ".bright.sb set" \ + -cursor [. cget -cursor] \ + -spacing1 1 -spacing3 1 lappend bglist $cflist lappend fglist $cflist ${NS}::scrollbar .bright.sb -command "$cflist yview" pack .bright.sb -side right -fill y pack $cflist -side left -fill both -expand 1 $cflist tag configure highlight \ - -background [$cflist cget -selectbackground] + -background [$cflist cget -selectbackground] $cflist tag configure bold -font mainfontbold .pwbottom add .bright @@ -2494,15 +2505,15 @@ proc makewindow {} { # restore window width & height if known if {[info exists geometry(main)]} { - if {[scan $geometry(main) "%dx%d" w h] >= 2} { - if {$w > [winfo screenwidth .]} { - set w [winfo screenwidth .] - } - if {$h > [winfo screenheight .]} { - set h [winfo screenheight .] - } - wm geometry . "${w}x$h" - } + if {[scan $geometry(main) "%dx%d" w h] >= 2} { + if {$w > [winfo screenwidth .]} { + set w [winfo screenwidth .] + } + if {$h > [winfo screenheight .]} { + set h [winfo screenheight .] + } + wm geometry . "${w}x$h" + } } if {[info exists geometry(state)] && $geometry(state) eq "zoomed"} { @@ -2526,25 +2537,25 @@ proc makewindow {} { bind %W <Map> {} %W sashpos 0 $::geometry(botwidth) } + bind .pwbottom <Configure> {resizecdetpanes %W %w} } - bind .pwbottom <Configure> {resizecdetpanes %W %w} pack .ctop -fill both -expand 1 bindall <1> {selcanvline %W %x %y} #bindall <B1-Motion> {selcanvline %W %x %y} if {[tk windowingsystem] == "win32"} { - bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D } - bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D ; break } + bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D } + bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D ; break } } else { - bindall <ButtonRelease-4> "allcanvs yview scroll -5 units" - bindall <ButtonRelease-5> "allcanvs yview scroll 5 units" - bind $ctext <Button> { - if {"%b" eq 6} { - $ctext xview scroll -5 units - } elseif {"%b" eq 7} { - $ctext xview scroll 5 units - } - } + bindall <ButtonRelease-4> "allcanvs yview scroll -5 units" + bindall <ButtonRelease-5> "allcanvs yview scroll 5 units" + bind $ctext <Button> { + if {"%b" eq 6} { + $ctext xview scroll -5 units + } elseif {"%b" eq 7} { + $ctext xview scroll 5 units + } + } if {[tk windowingsystem] eq "aqua"} { bindall <MouseWheel> { set delta [expr {- (%D)}] @@ -2627,7 +2638,7 @@ proc makewindow {} { bind $ctext <Button-1> {focus %W} bind $ctext <<Selection>> rehighlight_search_results for {set i 1} {$i < 10} {incr i} { - bind . <$M1B-Key-$i> [list go_to_parent $i] + bind . <$M1B-Key-$i> [list go_to_parent $i] } set maincursor [. cget -cursor] @@ -2636,60 +2647,60 @@ proc makewindow {} { set rowctxmenu .rowctxmenu makemenu $rowctxmenu { - {mc "Diff this -> selected" command {diffvssel 0}} - {mc "Diff selected -> this" command {diffvssel 1}} - {mc "Make patch" command mkpatch} - {mc "Create tag" command mktag} - {mc "Copy commit summary" command copysummary} - {mc "Write commit to file" command writecommit} - {mc "Create new branch" command mkbranch} - {mc "Cherry-pick this commit" command cherrypick} - {mc "Reset HEAD branch to here" command resethead} - {mc "Mark this commit" command markhere} - {mc "Return to mark" command gotomark} - {mc "Find descendant of this and mark" command find_common_desc} - {mc "Compare with marked commit" command compare_commits} - {mc "Diff this -> marked commit" command {diffvsmark 0}} - {mc "Diff marked commit -> this" command {diffvsmark 1}} - {mc "Revert this commit" command revert} + {mc "Diff this -> selected" command {diffvssel 0}} + {mc "Diff selected -> this" command {diffvssel 1}} + {mc "Make patch" command mkpatch} + {mc "Create tag" command mktag} + {mc "Copy commit reference" command copyreference} + {mc "Write commit to file" command writecommit} + {mc "Create new branch" command mkbranch} + {mc "Cherry-pick this commit" command cherrypick} + {mc "Reset HEAD branch to here" command resethead} + {mc "Mark this commit" command markhere} + {mc "Return to mark" command gotomark} + {mc "Find descendant of this and mark" command find_common_desc} + {mc "Compare with marked commit" command compare_commits} + {mc "Diff this -> marked commit" command {diffvsmark 0}} + {mc "Diff marked commit -> this" command {diffvsmark 1}} + {mc "Revert this commit" command revert} } $rowctxmenu configure -tearoff 0 set fakerowmenu .fakerowmenu makemenu $fakerowmenu { - {mc "Diff this -> selected" command {diffvssel 0}} - {mc "Diff selected -> this" command {diffvssel 1}} - {mc "Make patch" command mkpatch} - {mc "Diff this -> marked commit" command {diffvsmark 0}} - {mc "Diff marked commit -> this" command {diffvsmark 1}} + {mc "Diff this -> selected" command {diffvssel 0}} + {mc "Diff selected -> this" command {diffvssel 1}} + {mc "Make patch" command mkpatch} + {mc "Diff this -> marked commit" command {diffvsmark 0}} + {mc "Diff marked commit -> this" command {diffvsmark 1}} } $fakerowmenu configure -tearoff 0 set headctxmenu .headctxmenu makemenu $headctxmenu { - {mc "Check out this branch" command cobranch} - {mc "Rename this branch" command mvbranch} - {mc "Remove this branch" command rmbranch} - {mc "Copy branch name" command {clipboard clear; clipboard append $headmenuhead}} + {mc "Check out this branch" command cobranch} + {mc "Rename this branch" command mvbranch} + {mc "Remove this branch" command rmbranch} + {mc "Copy branch name" command {clipboard clear; clipboard append $headmenuhead}} } $headctxmenu configure -tearoff 0 global flist_menu set flist_menu .flistctxmenu makemenu $flist_menu { - {mc "Highlight this too" command {flist_hl 0}} - {mc "Highlight this only" command {flist_hl 1}} - {mc "External diff" command {external_diff}} - {mc "Blame parent commit" command {external_blame 1}} - {mc "Copy path" command {clipboard clear; clipboard append $flist_menu_file}} + {mc "Highlight this too" command {flist_hl 0}} + {mc "Highlight this only" command {flist_hl 1}} + {mc "External diff" command {external_diff}} + {mc "Blame parent commit" command {external_blame 1}} + {mc "Copy path" command {clipboard clear; clipboard append $flist_menu_file}} } $flist_menu configure -tearoff 0 global diff_menu set diff_menu .diffctxmenu makemenu $diff_menu { - {mc "Show origin of this line" command show_line_source} - {mc "Run git gui blame on this line" command {external_blame_diff}} + {mc "Show origin of this line" command show_line_source} + {mc "Run git gui blame on this line" command {external_blame_diff}} } $diff_menu configure -tearoff 0 } @@ -2701,14 +2712,14 @@ proc windows_mousewheel_redirector {W X Y D} { global canv canv2 canv3 set w [winfo containing -displayof $W $X $Y] if {$w ne ""} { - set u [expr {$D < 0 ? 5 : -5}] - if {$w == $canv || $w == $canv2 || $w == $canv3} { - allcanvs yview scroll $u units - } else { - catch { - $w yview scroll $u units - } - } + set u [expr {$D < 0 ? 5 : -5}] + if {$w == $canv || $w == $canv2 || $w == $canv3} { + allcanvs yview scroll $u units + } else { + catch { + $w yview scroll $u units + } + } } } @@ -2717,9 +2728,9 @@ proc selectedline_change {n1 n2 op} { global selectedline rownumsel if {$selectedline eq {}} { - set rownumsel {} + set rownumsel {} } else { - set rownumsel [expr {$selectedline + 1}] + set rownumsel [expr {$selectedline + 1}] } } @@ -2728,11 +2739,11 @@ proc selectedline_change {n1 n2 op} { proc canvscan {op w x y} { global canv canv2 canv3 foreach c [list $canv $canv2 $canv3] { - if {$c == $w} { - $c scan $op $x $y - } else { - $c scan $op 0 $y - } + if {$c == $w} { + $c scan $op $x $y + } else { + $c scan $op 0 $y + } } } @@ -2750,10 +2761,10 @@ proc bindkey {ev script} { bind . $ev $script set escript [bind Entry $ev] if {$escript == {}} { - set escript [bind Entry <Key>] + set escript [bind Entry <Key>] } foreach e $entries { - bind $e $ev "$escript; break" + bind $e $ev "$escript; break" } } @@ -2767,7 +2778,7 @@ proc bindmodfunctionkey {mod n script} { proc click {w} { global ctext entries foreach e [concat $entries $ctext] { - if {$w == $e} return + if {$w == $e} return } focus . } @@ -2779,8 +2790,8 @@ proc adjustprogress {} { global rprogitem rprogcoord use_ttk if {$use_ttk} { - $progresscanv configure -value [expr {int($fprogcoord * 100)}] - return + $progresscanv configure -value [expr {int($fprogcoord * 100)}] + return } set w [expr {[winfo width $progresscanv] - 4}] @@ -2792,11 +2803,11 @@ proc adjustprogress {} { $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h set now [clock clicks -milliseconds] if {$now >= $lastprogupdate + 100} { - set progupdatepending 0 - update + set progupdatepending 0 + update } elseif {!$progupdatepending} { - set progupdatepending 1 - after [expr {$lastprogupdate + 100 - $now}] doprogupdate + set progupdatepending 1 + after [expr {$lastprogupdate + 100 - $now}] doprogupdate } } @@ -2804,9 +2815,9 @@ proc doprogupdate {} { global lastprogupdate progupdatepending if {$progupdatepending} { - set progupdatepending 0 - set lastprogupdate [clock clicks -milliseconds] - update + set progupdatepending 0 + set lastprogupdate [clock clicks -milliseconds] + update } } @@ -2814,14 +2825,14 @@ proc config_check_tmp_exists {tries_left} { global config_file_tmp if {[file exists $config_file_tmp]} { - incr tries_left -1 - if {$tries_left > 0} { - after 100 [list config_check_tmp_exists $tries_left] - } else { - error_popup "There appears to be a stale $config_file_tmp\ + incr tries_left -1 + if {$tries_left > 0} { + after 100 [list config_check_tmp_exists $tries_left] + } else { + error_popup "There appears to be a stale $config_file_tmp\ file, which will prevent gitk from saving its configuration on exit.\ Please remove it if it is not being used by any existing gitk process." - } + } } } @@ -2838,9 +2849,9 @@ proc config_variable_change_cb {name name2 op} { upvar #0 $name var if {$op eq "write" && - (![info exists config_variable_original($name)] || - $config_variable_original($name) ne $var)} { - set config_variable_changed($name) 1 + (![info exists config_variable_original($name)] || + $config_variable_original($name) ne $var)} { + set config_variable_changed($name) 1 } } @@ -2862,151 +2873,158 @@ proc savestuff {w} { if {![winfo viewable .]} return set remove_tmp 0 if {[catch { - set try_count 0 - while {[catch {set f [open $config_file_tmp {WRONLY CREAT EXCL}]}]} { - if {[incr try_count] > 50} { - error "Unable to write config file: $config_file_tmp exists" - } - after 100 - } - set remove_tmp 1 - if {$::tcl_platform(platform) eq {windows}} { - file attributes $config_file_tmp -hidden true - } - if {[file exists $config_file]} { - source $config_file - } - foreach var_name $config_variables { - upvar #0 $var_name var - upvar 0 $var_name old_var - if {!$config_variable_changed($var_name) && [info exists old_var]} { - puts $f [list set $var_name $old_var] - } else { - puts $f [list set $var_name $var] - } - } - - puts $f "set geometry(main) [wm geometry .]" - puts $f "set geometry(state) [wm state .]" - puts $f "set geometry(topwidth) [winfo width .tf]" - puts $f "set geometry(topheight) [winfo height .tf]" - if {$current_use_ttk} { - puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sashpos 0] 1\"" - puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sashpos 1] 1\"" - } else { - puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\"" - puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\"" - } - puts $f "set geometry(botwidth) [winfo width .bleft]" - puts $f "set geometry(botheight) [winfo height .bleft]" - - array set view_save {} - array set views {} - if {![info exists permviews]} { set permviews {} } - foreach view $permviews { - set view_save([lindex $view 0]) 1 - set views([lindex $view 0]) $view - } - puts -nonewline $f "set permviews {" - for {set v 1} {$v < $current_nextviewnum} {incr v} { - if {$viewchanged($v)} { - if {$current_viewperm($v)} { - set views($current_viewname($v)) [list $current_viewname($v) $current_viewfiles($v) $current_viewargs($v) $current_viewargscmd($v)] - } else { - set view_save($current_viewname($v)) 0 - } - } - } - # write old and updated view to their places and append remaining to the end - foreach view $permviews { - set view_name [lindex $view 0] - if {$view_save($view_name)} { - puts $f "{$views($view_name)}" - } - unset views($view_name) - } - foreach view_name [array names views] { - puts $f "{$views($view_name)}" - } - puts $f "}" - close $f - file rename -force $config_file_tmp $config_file - set remove_tmp 0 + set try_count 0 + while {[catch {set f [open $config_file_tmp {WRONLY CREAT EXCL}]}]} { + if {[incr try_count] > 50} { + error "Unable to write config file: $config_file_tmp exists" + } + after 100 + } + set remove_tmp 1 + if {$::tcl_platform(platform) eq {windows}} { + file attributes $config_file_tmp -hidden true + } + if {[file exists $config_file]} { + source $config_file + } + foreach var_name $config_variables { + upvar #0 $var_name var + upvar 0 $var_name old_var + if {!$config_variable_changed($var_name) && [info exists old_var]} { + puts $f [list set $var_name $old_var] + } else { + puts $f [list set $var_name $var] + } + } + + puts $f "set geometry(main) [wm geometry .]" + puts $f "set geometry(state) [wm state .]" + puts $f "set geometry(topwidth) [winfo width .tf]" + puts $f "set geometry(topheight) [winfo height .tf]" + if {$current_use_ttk} { + puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sashpos 0] 1\"" + puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sashpos 1] 1\"" + } else { + puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\"" + puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\"" + } + puts $f "set geometry(botwidth) [winfo width .bleft]" + puts $f "set geometry(botheight) [winfo height .bleft]" + + array set view_save {} + array set views {} + if {![info exists permviews]} { set permviews {} } + foreach view $permviews { + set view_save([lindex $view 0]) 1 + set views([lindex $view 0]) $view + } + puts -nonewline $f "set permviews {" + for {set v 1} {$v < $current_nextviewnum} {incr v} { + if {$viewchanged($v)} { + if {$current_viewperm($v)} { + set views($current_viewname($v)) [list $current_viewname($v) $current_viewfiles($v) $current_viewargs($v) $current_viewargscmd($v)] + } else { + set view_save($current_viewname($v)) 0 + } + } + } + # write old and updated view to their places and append remaining to the end + foreach view $permviews { + set view_name [lindex $view 0] + if {$view_save($view_name)} { + puts $f "{$views($view_name)}" + } + unset views($view_name) + } + foreach view_name [array names views] { + puts $f "{$views($view_name)}" + } + puts $f "}" + close $f + file rename -force $config_file_tmp $config_file + set remove_tmp 0 } err]} { puts "Error saving config: $err" } if {$remove_tmp} { - file delete -force $config_file_tmp + file delete -force $config_file_tmp } set stuffsaved 1 } proc resizeclistpanes {win w} { - global oldwidth use_ttk + global oldwidth oldsash use_ttk if {[info exists oldwidth($win)]} { - if {$use_ttk} { - set s0 [$win sashpos 0] - set s1 [$win sashpos 1] - } else { - set s0 [$win sash coord 0] - set s1 [$win sash coord 1] - } - if {$w < 60} { - set sash0 [expr {int($w/2 - 2)}] - set sash1 [expr {int($w*5/6 - 2)}] - } else { - set factor [expr {1.0 * $w / $oldwidth($win)}] - set sash0 [expr {int($factor * [lindex $s0 0])}] - set sash1 [expr {int($factor * [lindex $s1 0])}] - if {$sash0 < 30} { - set sash0 30 - } - if {$sash1 < $sash0 + 20} { - set sash1 [expr {$sash0 + 20}] - } - if {$sash1 > $w - 10} { - set sash1 [expr {$w - 10}] - if {$sash0 > $sash1 - 20} { - set sash0 [expr {$sash1 - 20}] - } - } - } - if {$use_ttk} { - $win sashpos 0 $sash0 - $win sashpos 1 $sash1 - } else { - $win sash place 0 $sash0 [lindex $s0 1] - $win sash place 1 $sash1 [lindex $s1 1] - } + if {[info exists oldsash($win)]} { + set s0 [lindex $oldsash($win) 0] + set s1 [lindex $oldsash($win) 1] + } elseif {$use_ttk} { + set s0 [$win sashpos 0] + set s1 [$win sashpos 1] + } else { + set s0 [$win sash coord 0] + set s1 [$win sash coord 1] + } + if {$w < 60} { + set sash0 [expr {int($w/2 - 2)}] + set sash1 [expr {int($w*5/6 - 2)}] + } else { + set factor [expr {1.0 * $w / $oldwidth($win)}] + set sash0 [expr {int($factor * [lindex $s0 0])}] + set sash1 [expr {int($factor * [lindex $s1 0])}] + if {$sash0 < 30} { + set sash0 30 + } + if {$sash1 < $sash0 + 20} { + set sash1 [expr {$sash0 + 20}] + } + if {$sash1 > $w - 10} { + set sash1 [expr {$w - 10}] + if {$sash0 > $sash1 - 20} { + set sash0 [expr {$sash1 - 20}] + } + } + } + if {$use_ttk} { + $win sashpos 0 $sash0 + $win sashpos 1 $sash1 + } else { + $win sash place 0 $sash0 [lindex $s0 1] + $win sash place 1 $sash1 [lindex $s1 1] + } + set oldsash($win) [list $sash0 $sash1] } set oldwidth($win) $w } proc resizecdetpanes {win w} { - global oldwidth use_ttk + global oldwidth oldsash use_ttk if {[info exists oldwidth($win)]} { - if {$use_ttk} { - set s0 [$win sashpos 0] - } else { - set s0 [$win sash coord 0] - } - if {$w < 60} { - set sash0 [expr {int($w*3/4 - 2)}] - } else { - set factor [expr {1.0 * $w / $oldwidth($win)}] - set sash0 [expr {int($factor * [lindex $s0 0])}] - if {$sash0 < 45} { - set sash0 45 - } - if {$sash0 > $w - 15} { - set sash0 [expr {$w - 15}] - } - } - if {$use_ttk} { - $win sashpos 0 $sash0 - } else { - $win sash place 0 $sash0 [lindex $s0 1] - } + if {[info exists oldsash($win)]} { + set s0 $oldsash($win) + } elseif {$use_ttk} { + set s0 [$win sashpos 0] + } else { + set s0 [$win sash coord 0] + } + if {$w < 60} { + set sash0 [expr {int($w*3/4 - 2)}] + } else { + set factor [expr {1.0 * $w / $oldwidth($win)}] + set sash0 [expr {int($factor * [lindex $s0 0])}] + if {$sash0 < 45} { + set sash0 45 + } + if {$sash0 > $w - 15} { + set sash0 [expr {$w - 15}] + } + } + if {$use_ttk} { + $win sashpos 0 $sash0 + } else { + $win sash place 0 $sash0 [lindex $s0 1] + } + set oldsash($win) $sash0 } set oldwidth($win) $w } @@ -3029,8 +3047,8 @@ proc about {} { global bgcolor NS set w .about if {[winfo exists $w]} { - raise $w - return + raise $w + return } ttk_toplevel $w wm title $w [mc "About gitk"] @@ -3041,7 +3059,7 @@ Gitk - a commit viewer for git Copyright \u00a9 2005-2016 Paul Mackerras Use and redistribute under the terms of the GNU General Public License"] \ - -justify center -aspect 400 -border 2 -bg $bgcolor -relief groove + -justify center -aspect 400 -border 2 -bg $bgcolor -relief groove pack $w.m -side top -fill x -padx 2 -pady 2 ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active pack $w.ok -side bottom @@ -3055,13 +3073,13 @@ proc keys {} { global bgcolor NS set w .keys if {[winfo exists $w]} { - raise $w - return + raise $w + return } if {[tk windowingsystem] eq {aqua}} { - set M1T Cmd + set M1T Cmd } else { - set M1T Ctrl + set M1T Ctrl } ttk_toplevel $w wm title $w [mc "Gitk key bindings"] @@ -3108,7 +3126,7 @@ proc keys {} { [mc "<%s-minus> Decrease font size" $M1T] [mc "<F5> Update"] " \ - -justify left -bg $bgcolor -border 2 -relief groove + -justify left -bg $bgcolor -border 2 -relief groove pack $w.m -side top -fill both -padx 2 -pady 2 ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active bind $w <Key-Escape> [list destroy $w] @@ -3135,68 +3153,68 @@ proc treeview {w l openlevs} { set treecontents() {} $w conf -state normal foreach f $l { - while {[string range $f 0 $prefixend] ne $prefix} { - if {$lev <= $openlevs} { - $w mark set e:$treeindex($prefix) "end -1c" - $w mark gravity e:$treeindex($prefix) left - } - set treeheight($prefix) $ht - incr ht [lindex $htstack end] - set htstack [lreplace $htstack end end] - set prefixend [lindex $prefendstack end] - set prefendstack [lreplace $prefendstack end end] - set prefix [string range $prefix 0 $prefixend] - incr lev -1 - } - set tail [string range $f [expr {$prefixend+1}] end] - while {[set slash [string first "/" $tail]] >= 0} { - lappend htstack $ht - set ht 0 - lappend prefendstack $prefixend - incr prefixend [expr {$slash + 1}] - set d [string range $tail 0 $slash] - lappend treecontents($prefix) $d - set oldprefix $prefix - append prefix $d - set treecontents($prefix) {} - set treeindex($prefix) [incr ix] - set treeparent($prefix) $oldprefix - set tail [string range $tail [expr {$slash+1}] end] - if {$lev <= $openlevs} { - set ht 1 - set treediropen($prefix) [expr {$lev < $openlevs}] - set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}] - $w mark set d:$ix "end -1c" - $w mark gravity d:$ix left - set str "\n" - for {set i 0} {$i < $lev} {incr i} {append str "\t"} - $w insert end $str - $w image create end -align center -image $bm -padx 1 \ - -name a:$ix - $w insert end $d [highlight_tag $prefix] - $w mark set s:$ix "end -1c" - $w mark gravity s:$ix left - } - incr lev - } - if {$tail ne {}} { - if {$lev <= $openlevs} { - incr ht - set str "\n" - for {set i 0} {$i < $lev} {incr i} {append str "\t"} - $w insert end $str - $w insert end $tail [highlight_tag $f] - } - lappend treecontents($prefix) $tail - } + while {[string range $f 0 $prefixend] ne $prefix} { + if {$lev <= $openlevs} { + $w mark set e:$treeindex($prefix) "end -1c" + $w mark gravity e:$treeindex($prefix) left + } + set treeheight($prefix) $ht + incr ht [lindex $htstack end] + set htstack [lreplace $htstack end end] + set prefixend [lindex $prefendstack end] + set prefendstack [lreplace $prefendstack end end] + set prefix [string range $prefix 0 $prefixend] + incr lev -1 + } + set tail [string range $f [expr {$prefixend+1}] end] + while {[set slash [string first "/" $tail]] >= 0} { + lappend htstack $ht + set ht 0 + lappend prefendstack $prefixend + incr prefixend [expr {$slash + 1}] + set d [string range $tail 0 $slash] + lappend treecontents($prefix) $d + set oldprefix $prefix + append prefix $d + set treecontents($prefix) {} + set treeindex($prefix) [incr ix] + set treeparent($prefix) $oldprefix + set tail [string range $tail [expr {$slash+1}] end] + if {$lev <= $openlevs} { + set ht 1 + set treediropen($prefix) [expr {$lev < $openlevs}] + set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}] + $w mark set d:$ix "end -1c" + $w mark gravity d:$ix left + set str "\n" + for {set i 0} {$i < $lev} {incr i} {append str "\t"} + $w insert end $str + $w image create end -align center -image $bm -padx 1 \ + -name a:$ix + $w insert end $d [highlight_tag $prefix] + $w mark set s:$ix "end -1c" + $w mark gravity s:$ix left + } + incr lev + } + if {$tail ne {}} { + if {$lev <= $openlevs} { + incr ht + set str "\n" + for {set i 0} {$i < $lev} {incr i} {append str "\t"} + $w insert end $str + $w insert end $tail [highlight_tag $f] + } + lappend treecontents($prefix) $tail + } } while {$htstack ne {}} { - set treeheight($prefix) $ht - incr ht [lindex $htstack end] - set htstack [lreplace $htstack end end] - set prefixend [lindex $prefendstack end] - set prefendstack [lreplace $prefendstack end end] - set prefix [string range $prefix 0 $prefixend] + set treeheight($prefix) $ht + incr ht [lindex $htstack end] + set htstack [lreplace $htstack end end] + set prefixend [lindex $prefendstack end] + set prefendstack [lreplace $prefendstack end end] + set prefix [string range $prefix 0 $prefixend] } $w conf -state disabled } @@ -3207,21 +3225,21 @@ proc linetoelt {l} { set y 2 set prefix {} while {1} { - foreach e $treecontents($prefix) { - if {$y == $l} { - return "$prefix$e" - } - set n 1 - if {[string index $e end] eq "/"} { - set n $treeheight($prefix$e) - if {$y + $n > $l} { - append prefix $e - incr y - break - } - } - incr y $n - } + foreach e $treecontents($prefix) { + if {$y == $l} { + return "$prefix$e" + } + set n 1 + if {[string index $e end] eq "/"} { + set n $treeheight($prefix$e) + if {$y + $n > $l} { + append prefix $e + incr y + break + } + } + incr y $n + } } } @@ -3229,14 +3247,14 @@ proc highlight_tree {y prefix} { global treeheight treecontents cflist foreach e $treecontents($prefix) { - set path $prefix$e - if {[highlight_tag $path] ne {}} { - $cflist tag add bold $y.0 "$y.0 lineend" - } - incr y - if {[string index $e end] eq "/" && $treeheight($path) > 1} { - set y [highlight_tree $y $path] - } + set path $prefix$e + if {[highlight_tag $path] ne {}} { + $cflist tag add bold $y.0 "$y.0 lineend" + } + incr y + if {[string index $e end] eq "/" && $treeheight($path) > 1} { + set y [highlight_tree $y $path] + } } return $y } @@ -3252,8 +3270,8 @@ proc treeclosedir {w dir} { $w conf -state disabled set n [expr {1 - $treeheight($dir)}] while {$dir ne {}} { - incr treeheight($dir) $n - set dir $treeparent($dir) + incr treeheight($dir) $n + set dir $treeparent($dir) } } @@ -3269,28 +3287,28 @@ proc treeopendir {w dir} { set str "\n" set n [llength $treecontents($dir)] for {set x $dir} {$x ne {}} {set x $treeparent($x)} { - incr lev - append str "\t" - incr treeheight($x) $n + incr lev + append str "\t" + incr treeheight($x) $n } foreach e $treecontents($dir) { - set de $dir$e - if {[string index $e end] eq "/"} { - set iy $treeindex($de) - $w mark set d:$iy e:$ix - $w mark gravity d:$iy left - $w insert e:$ix $str - set treediropen($de) 0 - $w image create e:$ix -align center -image tri-rt -padx 1 \ - -name a:$iy - $w insert e:$ix $e [highlight_tag $de] - $w mark set s:$iy e:$ix - $w mark gravity s:$iy left - set treeheight($de) 1 - } else { - $w insert e:$ix $str - $w insert e:$ix $e [highlight_tag $de] - } + set de $dir$e + if {[string index $e end] eq "/"} { + set iy $treeindex($de) + $w mark set d:$iy e:$ix + $w mark gravity d:$iy left + $w insert e:$ix $str + set treediropen($de) 0 + $w image create e:$ix -align center -image tri-rt -padx 1 \ + -name a:$iy + $w insert e:$ix $e [highlight_tag $de] + $w mark set s:$iy e:$ix + $w mark gravity s:$iy left + set treeheight($de) 1 + } else { + $w insert e:$ix $str + $w insert e:$ix $e [highlight_tag $de] + } } $w mark gravity e:$ix right $w conf -state disabled @@ -3299,13 +3317,13 @@ proc treeopendir {w dir} { set ht [$w cget -height] set l [lindex [split [$w index s:$ix] .] 0] if {$l < $top} { - $w yview $l.0 + $w yview $l.0 } elseif {$l + $n + 1 > $top + $ht} { - set top [expr {$l + $n + 2 - $ht}] - if {$l < $top} { - set top $l - } - $w yview $top.0 + set top [expr {$l + $n + 2 - $ht}] + if {$l < $top} { + set top $l + } + $w yview $top.0 } } @@ -3319,16 +3337,16 @@ proc treeclick {w x y} { $cflist tag add highlight $l.0 "$l.0 lineend" set cflist_top $l if {$l == 1} { - $ctext yview 1.0 - return + $ctext yview 1.0 + return } set e [linetoelt $l] if {[string index $e end] ne "/"} { - showfile $e + showfile $e } elseif {$treediropen($e)} { - treeclosedir $w $e + treeclosedir $w $e } else { - treeopendir $w $e + treeopendir $w $e } } @@ -3337,10 +3355,10 @@ proc setfilelist {id} { treeview $cflist $treefilelist($id) 0 if {$jump_to_here ne {}} { - set f [lindex $jump_to_here 0] - if {[lsearch -exact $treefilelist($id) $f] >= 0} { - showfile $f - } + set f [lindex $jump_to_here 0] + if {[lsearch -exact $treefilelist($id) $f] >= 0} { + showfile $f + } } } @@ -3404,6 +3422,8 @@ 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 @@ -3413,11 +3433,11 @@ proc init_flist {first} { $cflist conf -state normal $cflist delete 0.0 end if {$first ne {}} { - $cflist insert end $first - set cflist_top 1 - $cflist tag add highlight 1.0 "1.0 lineend" + $cflist insert end $first + set cflist_top 1 + $cflist tag add highlight 1.0 "1.0 lineend" } else { - unset -nocomplain cflist_top + unset -nocomplain cflist_top } $cflist conf -state disabled set difffilestart {} @@ -3427,9 +3447,9 @@ proc highlight_tag {f} { global highlight_paths foreach p $highlight_paths { - if {[string match $p $f]} { - return "bold" - } + if {[string match $p $f]} { + return "bold" + } } return {} } @@ -3439,15 +3459,15 @@ proc highlight_filelist {} { $cflist conf -state normal if {$cmitmode ne "tree"} { - set end [lindex [split [$cflist index end] .] 0] - for {set l 2} {$l < $end} {incr l} { - set line [$cflist get $l.0 "$l.0 lineend"] - if {[highlight_tag $line] ne {}} { - $cflist tag add bold $l.0 "$l.0 lineend" - } - } + set end [lindex [split [$cflist index end] .] 0] + for {set l 2} {$l < $end} {incr l} { + set line [$cflist get $l.0 "$l.0 lineend"] + if {[highlight_tag $line] ne {}} { + $cflist tag add bold $l.0 "$l.0 lineend" + } + } } else { - highlight_tree 2 {} + highlight_tree 2 {} } $cflist conf -state disabled } @@ -3465,8 +3485,8 @@ proc add_flist {fl} { $cflist conf -state normal foreach f $fl { - $cflist insert end "\n" - $cflist insert end $f [highlight_tag $f] + $cflist insert end "\n" + $cflist insert end $f [highlight_tag $f] } $cflist conf -state disabled } @@ -3481,9 +3501,9 @@ proc sel_flist {w x y} { $cflist tag add highlight $l.0 "$l.0 lineend" set cflist_top $l if {$l == 1} { - $ctext yview 1.0 + $ctext yview 1.0 } else { - catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]} + catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]} } suppress_highlighting_file_for_current_scrollpos } @@ -3496,15 +3516,15 @@ proc pop_flist_menu {w X Y x y} { set l [lindex [split [$w index "@$x,$y"] "."] 0] if {$l <= 1} return if {$cmitmode eq "tree"} { - set e [linetoelt $l] - if {[string index $e end] eq "/"} return + set e [linetoelt $l] + if {[string index $e end] eq "/"} return } else { - set e [lindex $treediffs($diffids) [expr {$l-2}]] + set e [lindex $treediffs($diffids) [expr {$l-2}]] } set flist_menu_file $e set xdiffstate "normal" if {$cmitmode eq "tree"} { - set xdiffstate "disabled" + set xdiffstate "disabled" } # Disable "External diff" item in tree mode $flist_menu entryconf 2 -state $xdiffstate @@ -3533,7 +3553,7 @@ proc pop_diff_menu {w X Y x y} { set diff_menu_line [lindex $diff_menu_txtpos 0] # don't pop up the menu on hunk-separator or file-separator lines if {[lsearch -glob [$ctext tag names $diff_menu_line.0] "*sep"] >= 0} { - return + return } stopfinding set f [find_ctext_fileinfo $diff_menu_line] @@ -3548,9 +3568,9 @@ proc flist_hl {only} { set x [shellquote $flist_menu_file] if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} { - set findstring $x + set findstring $x } else { - append findstring " " $x + append findstring " " $x } set gdttype [mc "touching paths:"] } @@ -3559,29 +3579,29 @@ proc gitknewtmpdir {} { global diffnum gitktmpdir gitdir env if {![info exists gitktmpdir]} { - if {[info exists env(GITK_TMPDIR)]} { - set tmpdir $env(GITK_TMPDIR) - } elseif {[info exists env(TMPDIR)]} { - set tmpdir $env(TMPDIR) - } else { - set tmpdir $gitdir - } - set gitktmpformat [file join $tmpdir ".gitk-tmp.XXXXXX"] - if {[catch {set gitktmpdir [exec mktemp -d $gitktmpformat]}]} { - set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]] - } - if {[catch {file mkdir $gitktmpdir} err]} { - error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err" - unset gitktmpdir - return {} - } - set diffnum 0 + if {[info exists env(GITK_TMPDIR)]} { + set tmpdir $env(GITK_TMPDIR) + } elseif {[info exists env(TMPDIR)]} { + set tmpdir $env(TMPDIR) + } else { + set tmpdir $gitdir + } + set gitktmpformat [file join $tmpdir ".gitk-tmp.XXXXXX"] + if {[catch {set gitktmpdir [exec mktemp -d $gitktmpformat]}]} { + set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]] + } + if {[catch {file mkdir $gitktmpdir} err]} { + error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err" + unset gitktmpdir + return {} + } + set diffnum 0 } incr diffnum set diffdir [file join $gitktmpdir $diffnum] if {[catch {file mkdir $diffdir} err]} { - error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err" - return {} + error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err" + return {} } return $diffdir } @@ -3590,11 +3610,11 @@ proc save_file_from_commit {filename output what} { global nullfile if {[catch {exec git show $filename -- > $output} err]} { - if {[string match "fatal: bad revision *" $err]} { - return $nullfile - } - error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err" - return {} + if {[string match "fatal: bad revision *" $err]} { + return $nullfile + } + error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err" + return {} } return $output } @@ -3605,10 +3625,10 @@ proc external_diff_get_one_file {diffid filename diffdir} { if {$diffid == $nullid} { set difffile [file join $worktree $filename] - if {[file exists $difffile]} { - return $difffile - } - return $nullfile + if {[file exists $difffile]} { + return $difffile + } + return $nullfile } if {$diffid == $nullid2} { set difffile [file join $diffdir "\[index\] [file tail $filename]"] @@ -3616,7 +3636,7 @@ proc external_diff_get_one_file {diffid filename diffdir} { } set difffile [file join $diffdir "\[$diffid\] [file tail $filename]"] return [save_file_from_commit $diffid:$filename $difffile \ - "revision $diffid"] + "revision $diffid"] } proc external_diff {} { @@ -3673,18 +3693,18 @@ proc find_hunk_blamespec {base line} { set s_line [$ctext get $s_lix "$s_lix + 1 lines"] if {![regexp {^@@@*(( -\d+(,\d+)?)+) \+(\d+)(,\d+)? @@} $s_line \ - s_line old_specs osz osz1 new_line nsz]} { - return + s_line old_specs osz osz1 new_line nsz]} { + return } # base lines for the parents set base_lines [list $new_line] foreach old_spec [lrange [split $old_specs " "] 1 end] { - if {![regexp -- {-(\d+)(,\d+)?} $old_spec \ - old_spec old_line osz]} { - return - } - lappend base_lines $old_line + if {![regexp -- {-(\d+)(,\d+)?} $old_spec \ + old_spec old_line osz]} { + return + } + lappend base_lines $old_line } # Now scan the lines to determine offset within the hunk @@ -3695,38 +3715,38 @@ proc find_hunk_blamespec {base line} { # Determine if the line is removed set chunk [$ctext get $line.0 "$line.1 + $max_parent chars"] if {[string match {[-+ ]*} $chunk]} { - set removed_idx [string first "-" $chunk] - # Choose a parent index - if {$removed_idx >= 0} { - set parent $removed_idx - } else { - set unchanged_idx [string first " " $chunk] - if {$unchanged_idx >= 0} { - set parent $unchanged_idx - } else { - # blame the current commit - set parent -1 - } - } - # then count other lines that belong to it - for {set i $line} {[incr i -1] > $s_lno} {} { - set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"] - # Determine if the line is removed - set removed_idx [string first "-" $chunk] - if {$parent >= 0} { - set code [string index $chunk $parent] - if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} { - incr dline - } - } else { - if {$removed_idx < 0} { - incr dline - } - } - } - incr parent + set removed_idx [string first "-" $chunk] + # Choose a parent index + if {$removed_idx >= 0} { + set parent $removed_idx + } else { + set unchanged_idx [string first " " $chunk] + if {$unchanged_idx >= 0} { + set parent $unchanged_idx + } else { + # blame the current commit + set parent -1 + } + } + # then count other lines that belong to it + for {set i $line} {[incr i -1] > $s_lno} {} { + set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"] + # Determine if the line is removed + set removed_idx [string first "-" $chunk] + if {$parent >= 0} { + set code [string index $chunk $parent] + if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} { + incr dline + } + } else { + if {$removed_idx < 0} { + incr dline + } + } + } + incr parent } else { - set parent 0 + set parent 0 } incr dline [lindex $base_lines $parent] @@ -3739,17 +3759,17 @@ proc external_blame_diff {} { global diff_menu_filebase flist_menu_file if {$cmitmode eq "tree"} { - set parent_idx 0 - set line [expr {$diff_menu_line - $diff_menu_filebase}] + set parent_idx 0 + set line [expr {$diff_menu_line - $diff_menu_filebase}] } else { - set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line] - if {$hinfo ne {}} { - set parent_idx [lindex $hinfo 0] - set line [lindex $hinfo 1] - } else { - set parent_idx 0 - set line 0 - } + set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line] + if {$hinfo ne {}} { + set parent_idx [lindex $hinfo 0] + set line [lindex $hinfo 1] + } else { + set parent_idx 0 + set line 0 + } } external_blame $parent_idx $line @@ -3760,12 +3780,12 @@ proc external_blame_diff {} { proc index_sha1 {fname} { set f [open [list | git ls-files -s $fname] r] while {[gets $f line] >= 0} { - set info [lindex [split $line "\t"] 0] - set stage [lindex $info 2] - if {$stage eq "0" || $stage eq "2"} { - close $f - return [lindex $info 1] - } + set info [lindex [split $line "\t"] 0] + set stage [lindex $info 2] + if {$stage eq "0" || $stage eq "2"} { + close $f + return [lindex $info 1] + } } close $f return {} @@ -3774,7 +3794,7 @@ proc index_sha1 {fname} { # Turn an absolute path into one relative to the current directory proc make_relative {f} { if {[file pathtype $f] eq "relative"} { - return $f + return $f } set elts [file split $f] set here [file split [pwd]] @@ -3782,12 +3802,12 @@ proc make_relative {f} { set hi 0 set res {} foreach d $here { - if {$ei < $hi || $ei >= [llength $elts] || [lindex $elts $ei] ne $d} { - lappend res ".." - } else { - incr ei - } - incr hi + if {$ei < $hi || $ei >= [llength $elts] || [lindex $elts $ei] ne $d} { + lappend res ".." + } else { + incr ei + } + incr hi } set elts [concat $res [lrange $elts $ei end]] return [eval file join $elts] @@ -3799,19 +3819,19 @@ proc external_blame {parent_idx {line {}}} { global parentlist selectedline currentid if {$parent_idx > 0} { - set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]] + set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]] } else { - set base_commit $currentid + set base_commit $currentid } if {$base_commit eq {} || $base_commit eq $nullid || $base_commit eq $nullid2} { - error_popup [mc "No such commit"] - return + error_popup [mc "No such commit"] + return } set cmdline [list git gui blame] if {$line ne {} && $line > 1} { - lappend cmdline "--line=$line" + lappend cmdline "--line=$line" } set f [file join $cdup $flist_menu_file] # Unfortunately it seems git gui blame doesn't like @@ -3819,7 +3839,7 @@ proc external_blame {parent_idx {line {}}} { set f [make_relative $f] lappend cmdline $base_commit $f if {[catch {eval exec $cmdline &} err]} { - error_popup "[mc "git gui blame: command failed:"] $err" + error_popup "[mc "git gui blame: command failed:"] $err" } } @@ -3830,61 +3850,61 @@ proc show_line_source {} { set from_index {} if {$cmitmode eq "tree"} { - set id $currentid - set line [expr {$diff_menu_line - $diff_menu_filebase}] + set id $currentid + set line [expr {$diff_menu_line - $diff_menu_filebase}] } else { - set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line] - if {$h eq {}} return - set pi [lindex $h 0] - if {$pi == 0} { - mark_ctext_line $diff_menu_line - return - } - incr pi -1 - if {$currentid eq $nullid} { - if {$pi > 0} { - # must be a merge in progress... - if {[catch { - # get the last line from .git/MERGE_HEAD - set f [open [file join $gitdir MERGE_HEAD] r] - set id [lindex [split [read $f] "\n"] end-1] - close $f - } err]} { - error_popup [mc "Couldn't read merge head: %s" $err] - return - } - } elseif {$parents($curview,$currentid) eq $nullid2} { - # need to do the blame from the index - if {[catch { - set from_index [index_sha1 $flist_menu_file] - } err]} { - error_popup [mc "Error reading index: %s" $err] - return - } - } else { - set id $parents($curview,$currentid) - } - } else { - set id [lindex $parents($curview,$currentid) $pi] - } - set line [lindex $h 1] + set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line] + if {$h eq {}} return + set pi [lindex $h 0] + if {$pi == 0} { + mark_ctext_line $diff_menu_line + return + } + incr pi -1 + if {$currentid eq $nullid} { + if {$pi > 0} { + # must be a merge in progress... + if {[catch { + # get the last line from .git/MERGE_HEAD + set f [open [file join $gitdir MERGE_HEAD] r] + set id [lindex [split [read $f] "\n"] end-1] + close $f + } err]} { + error_popup [mc "Couldn't read merge head: %s" $err] + return + } + } elseif {$parents($curview,$currentid) eq $nullid2} { + # need to do the blame from the index + if {[catch { + set from_index [index_sha1 $flist_menu_file] + } err]} { + error_popup [mc "Error reading index: %s" $err] + return + } + } else { + set id $parents($curview,$currentid) + } + } else { + set id [lindex $parents($curview,$currentid) $pi] + } + set line [lindex $h 1] } set blameargs {} if {$from_index ne {}} { - lappend blameargs | git cat-file blob $from_index + lappend blameargs | git cat-file blob $from_index } lappend blameargs | git blame -p -L$line,+1 if {$from_index ne {}} { - lappend blameargs --contents - + lappend blameargs --contents - } else { - lappend blameargs $id + lappend blameargs $id } lappend blameargs -- [file join $cdup $flist_menu_file] if {[catch { - set f [open $blameargs r] + set f [open $blameargs r] } err]} { - error_popup [mc "Couldn't start git blame: %s" $err] - return + error_popup [mc "Couldn't start git blame: %s" $err] + return } nowbusy blaming [mc "Searching"] fconfigure $f -blocking 0 @@ -3898,9 +3918,9 @@ proc stopblaming {} { global blameinst if {[info exists blameinst]} { - stop_instance $blameinst - unset blameinst - notbusy blaming + stop_instance $blameinst + unset blameinst + notbusy blaming } } @@ -3908,18 +3928,18 @@ proc read_line_source {fd inst} { global blamestuff curview commfd blameinst nullid nullid2 while {[gets $fd line] >= 0} { - lappend blamestuff($inst) $line + lappend blamestuff($inst) $line } if {![eof $fd]} { - return 1 + return 1 } unset commfd($inst) unset blameinst notbusy blaming fconfigure $fd -blocking 1 if {[catch {close $fd} err]} { - error_popup [mc "Error running git blame: %s" $err] - return 0 + error_popup [mc "Error running git blame: %s" $err] + return 0 } set fname {} @@ -3927,30 +3947,30 @@ proc read_line_source {fd inst} { set id [lindex $line 0] set lnum [lindex $line 1] if {[string length $id] == 40 && [string is xdigit $id] && - [string is digit -strict $lnum]} { - # look for "filename" line - foreach l $blamestuff($inst) { - if {[string match "filename *" $l]} { - set fname [string range $l 9 end] - break - } - } + [string is digit -strict $lnum]} { + # look for "filename" line + foreach l $blamestuff($inst) { + if {[string match "filename *" $l]} { + set fname [string range $l 9 end] + break + } + } } if {$fname ne {}} { - # all looks good, select it - if {$id eq $nullid} { - # blame uses all-zeroes to mean not committed, - # which would mean a change in the index - set id $nullid2 - } - if {[commitinview $id $curview]} { - selectline [rowofcommit $id] 1 [list $fname $lnum] 1 - } else { - error_popup [mc "That line comes from commit %s, \ - which is not in this view" [shortids $id]] - } + # all looks good, select it + if {$id eq $nullid} { + # blame uses all-zeroes to mean not committed, + # which would mean a change in the index + set id $nullid2 + } + if {[commitinview $id $curview]} { + selectline [rowofcommit $id] 1 [list $fname $lnum] 1 + } else { + error_popup [mc "That line comes from commit %s, \ + which is not in this view" [shortids $id]] + } } else { - puts "oops couldn't parse git blame output" + puts "oops couldn't parse git blame output" } return 0 } @@ -3959,11 +3979,11 @@ proc read_line_source {fd inst} { proc delete_at_eof {f dir} { while {[gets $f line] >= 0} {} if {[eof $f]} { - if {[catch {close $f} err]} { - error_popup "[mc "External diff viewer failed:"] $err" - } - file delete -force $dir - return 0 + if {[catch {close $f} err]} { + error_popup "[mc "External diff viewer failed:"] $err" + } + file delete -force $dir + return 0 } return 1 } @@ -3972,13 +3992,13 @@ proc delete_at_eof {f dir} { proc shellquote {str} { if {![string match "*\['\"\\ \t]*" $str]} { - return $str + return $str } if {![string match "*\['\"\\]*" $str]} { - return "\"$str\"" + return "\"$str\"" } if {![string match "*'*" $str]} { - return "'$str'" + return "'$str'" } return "\"[string map {\" \\\" \\ \\\\} $str]\"" } @@ -3986,10 +4006,10 @@ proc shellquote {str} { proc shellarglist {l} { set str {} foreach a $l { - if {$str ne {}} { - append str " " - } - append str [shellquote $a] + if {$str ne {}} { + append str " " + } + append str [shellquote $a] } return $str } @@ -3998,52 +4018,52 @@ proc shelldequote {str} { set ret {} set used -1 while {1} { - incr used - if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} { - append ret [string range $str $used end] - set used [string length $str] - break - } - set first [lindex $first 0] - set ch [string index $str $first] - if {$first > $used} { - append ret [string range $str $used [expr {$first - 1}]] - set used $first - } - if {$ch eq " " || $ch eq "\t"} break - incr used - if {$ch eq "'"} { - set first [string first "'" $str $used] - if {$first < 0} { - error "unmatched single-quote" - } - append ret [string range $str $used [expr {$first - 1}]] - set used $first - continue - } - if {$ch eq "\\"} { - if {$used >= [string length $str]} { - error "trailing backslash" - } - append ret [string index $str $used] - continue - } - # here ch == "\"" - while {1} { - if {![regexp -start $used -indices "\[\"\\\\]" $str first]} { - error "unmatched double-quote" - } - set first [lindex $first 0] - set ch [string index $str $first] - if {$first > $used} { - append ret [string range $str $used [expr {$first - 1}]] - set used $first - } - if {$ch eq "\""} break - incr used - append ret [string index $str $used] - incr used - } + incr used + if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} { + append ret [string range $str $used end] + set used [string length $str] + break + } + set first [lindex $first 0] + set ch [string index $str $first] + if {$first > $used} { + append ret [string range $str $used [expr {$first - 1}]] + set used $first + } + if {$ch eq " " || $ch eq "\t"} break + incr used + if {$ch eq "'"} { + set first [string first "'" $str $used] + if {$first < 0} { + error "unmatched single-quote" + } + append ret [string range $str $used [expr {$first - 1}]] + set used $first + continue + } + if {$ch eq "\\"} { + if {$used >= [string length $str]} { + error "trailing backslash" + } + append ret [string index $str $used] + continue + } + # here ch == "\"" + while {1} { + if {![regexp -start $used -indices "\[\"\\\\]" $str first]} { + error "unmatched double-quote" + } + set first [lindex $first 0] + set ch [string index $str $first] + if {$first > $used} { + append ret [string range $str $used [expr {$first - 1}]] + set used $first + } + if {$ch eq "\""} break + incr used + append ret [string index $str $used] + incr used + } } return [list $used $ret] } @@ -4051,13 +4071,13 @@ proc shelldequote {str} { proc shellsplit {str} { set l {} while {1} { - set str [string trimleft $str] - if {$str eq {}} break - set dq [shelldequote $str] - set n [lindex $dq 0] - set word [lindex $dq 1] - set str [string range $str $n end] - lappend l $word + set str [string trimleft $str] + if {$str eq {}} break + set dq [shelldequote $str] + set n [lindex $dq 0] + set word [lindex $dq 1] + set str [string range $str $n end] + lappend l $word } return $l } @@ -4066,11 +4086,11 @@ proc set_window_title {} { global appname curview viewname vrevs set rev [mc "All files"] if {$curview ne 0} { - if {$viewname($curview) eq [mc "Command line"]} { - set rev [string map {"--gitk-symmetric-diff-marker" "--merge"} $vrevs($curview)] - } else { - set rev $viewname($curview) - } + if {$viewname($curview) eq [mc "Command line"]} { + set rev [string map {"--gitk-symmetric-diff-marker" "--merge"} $vrevs($curview)] + } else { + set rev $viewname($curview) + } } wm title . "[reponame]: $rev - $appname" } @@ -4084,8 +4104,8 @@ proc newview {ishighlight} { set newishighlight $ishighlight set top .gitkview if {[winfo exists $top]} { - raise $top - return + raise $top + return } decode_view_opts $nextviewnum $revtreeargs set newviewname($nextviewnum) "[mc "View"] $nextviewnum" @@ -4134,29 +4154,29 @@ proc encode_view_opts {n} { set rargs [list] foreach opt $known_view_options { - set patterns [lindex $opt 3] - if {$patterns eq {}} continue - set pattern [lindex $patterns 0] - - if {[lindex $opt 1] eq "b"} { - set val $newviewopts($n,[lindex $opt 0]) - if {$val} { - lappend rargs $pattern - } - } elseif {[regexp {^r(\d+)$} [lindex $opt 1] type value]} { - regexp {^(.*_)} [lindex $opt 0] uselessvar button_id - set val $newviewopts($n,$button_id) - if {$val eq $value} { - lappend rargs $pattern - } - } else { - set val $newviewopts($n,[lindex $opt 0]) - set val [string trim $val] - if {$val ne {}} { - set pfix [string range $pattern 0 end-1] - lappend rargs $pfix$val - } - } + set patterns [lindex $opt 3] + if {$patterns eq {}} continue + set pattern [lindex $patterns 0] + + if {[lindex $opt 1] eq "b"} { + set val $newviewopts($n,[lindex $opt 0]) + if {$val} { + lappend rargs $pattern + } + } elseif {[regexp {^r(\d+)$} [lindex $opt 1] type value]} { + regexp {^(.*_)} [lindex $opt 0] uselessvar button_id + set val $newviewopts($n,$button_id) + if {$val eq $value} { + lappend rargs $pattern + } + } else { + set val $newviewopts($n,[lindex $opt 0]) + set val [string trim $val] + if {$val ne {}} { + set pfix [string range $pattern 0 end-1] + lappend rargs $pfix$val + } + } } set rargs [concat $rargs [shellsplit $newviewopts($n,refs)]] return [concat $rargs [shellsplit $newviewopts($n,args)]] @@ -4167,59 +4187,59 @@ proc decode_view_opts {n view_args} { global known_view_options newviewopts foreach opt $known_view_options { - set id [lindex $opt 0] - if {[lindex $opt 1] eq "b"} { - # Checkboxes - set val 0 + set id [lindex $opt 0] + if {[lindex $opt 1] eq "b"} { + # Checkboxes + set val 0 } elseif {[regexp {^r(\d+)$} [lindex $opt 1]]} { - # Radiobuttons - regexp {^(.*_)} $id uselessvar id - set val 0 - } else { - # Text fields - set val {} - } - set newviewopts($n,$id) $val + # Radiobuttons + regexp {^(.*_)} $id uselessvar id + set val 0 + } else { + # Text fields + set val {} + } + set newviewopts($n,$id) $val } set oargs [list] set refargs [list] foreach arg $view_args { - if {[regexp -- {^-([0-9]+)$} $arg arg cnt] - && ![info exists found(limit)]} { - set newviewopts($n,limit) $cnt - set found(limit) 1 - continue - } - catch { unset val } - foreach opt $known_view_options { - set id [lindex $opt 0] - if {[info exists found($id)]} continue - foreach pattern [lindex $opt 3] { - if {![string match $pattern $arg]} continue - if {[lindex $opt 1] eq "b"} { - # Check buttons - set val 1 - } elseif {[regexp {^r(\d+)$} [lindex $opt 1] match num]} { - # Radio buttons - regexp {^(.*_)} $id uselessvar id - set val $num - } else { - # Text input fields - set size [string length $pattern] - set val [string range $arg [expr {$size-1}] end] - } - set newviewopts($n,$id) $val - set found($id) 1 - break - } - if {[info exists val]} break - } - if {[info exists val]} continue - if {[regexp {^-} $arg]} { - lappend oargs $arg - } else { - lappend refargs $arg - } + if {[regexp -- {^-([0-9]+)$} $arg arg cnt] + && ![info exists found(limit)]} { + set newviewopts($n,limit) $cnt + set found(limit) 1 + continue + } + catch { unset val } + foreach opt $known_view_options { + set id [lindex $opt 0] + if {[info exists found($id)]} continue + foreach pattern [lindex $opt 3] { + if {![string match $pattern $arg]} continue + if {[lindex $opt 1] eq "b"} { + # Check buttons + set val 1 + } elseif {[regexp {^r(\d+)$} [lindex $opt 1] match num]} { + # Radio buttons + regexp {^(.*_)} $id uselessvar id + set val $num + } else { + # Text input fields + set size [string length $pattern] + set val [string range $arg [expr {$size-1}] end] + } + set newviewopts($n,$id) $val + set found($id) 1 + break + } + if {[info exists val]} break + } + if {[info exists val]} continue + if {[regexp {^-} $arg]} { + lappend oargs $arg + } else { + lappend refargs $arg + } } set newviewopts($n,refs) [shellarglist $refargs] set newviewopts($n,args) [shellarglist $oargs] @@ -4229,9 +4249,9 @@ proc edit_or_newview {} { global curview if {$curview > 0} { - editview + editview } else { - newview 0 + newview 0 } } @@ -4242,8 +4262,8 @@ proc editview {} { set top .gitkvedit-$curview if {[winfo exists $top]} { - raise $top - return + raise $top + return } decode_view_opts $curview $viewargs($curview) set newviewname($curview) $viewname($curview) @@ -4273,66 +4293,66 @@ proc vieweditor {top n title} { set cexpand 0 set cnt 0 foreach opt $known_view_options { - set id [lindex $opt 0] - set type [lindex $opt 1] - set flags [lindex $opt 2] - set title [eval [lindex $opt 4]] - set lxpad 0 - - if {$flags eq "+" || $flags eq "*"} { - set cframe $top.fr$cnt - incr cnt - ${NS}::frame $cframe - pack $cframe -in $top -fill x -pady 3 -padx 3 - set cexpand [expr {$flags eq "*"}] + set id [lindex $opt 0] + set type [lindex $opt 1] + set flags [lindex $opt 2] + set title [eval [lindex $opt 4]] + set lxpad 0 + + if {$flags eq "+" || $flags eq "*"} { + set cframe $top.fr$cnt + incr cnt + ${NS}::frame $cframe + pack $cframe -in $top -fill x -pady 3 -padx 3 + set cexpand [expr {$flags eq "*"}] } elseif {$flags eq ".." || $flags eq "*."} { - set cframe $top.fr$cnt - incr cnt - ${NS}::frame $cframe - pack $cframe -in $top -fill x -pady 3 -padx [list 15 3] - set cexpand [expr {$flags eq "*."}] - } else { - set lxpad 5 - } - - if {$type eq "l"} { + set cframe $top.fr$cnt + incr cnt + ${NS}::frame $cframe + pack $cframe -in $top -fill x -pady 3 -padx [list 15 3] + set cexpand [expr {$flags eq "*."}] + } else { + set lxpad 5 + } + + if {$type eq "l"} { ${NS}::label $cframe.l_$id -text $title pack $cframe.l_$id -in $cframe -side left -pady [list 3 0] -anchor w - } elseif {$type eq "b"} { - ${NS}::checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id) - pack $cframe.c_$id -in $cframe -side left \ - -padx [list $lxpad 0] -expand $cexpand -anchor w - } elseif {[regexp {^r(\d+)$} $type type sz]} { - regexp {^(.*_)} $id uselessvar button_id - ${NS}::radiobutton $cframe.c_$id -text $title -variable newviewopts($n,$button_id) -value $sz - pack $cframe.c_$id -in $cframe -side left \ - -padx [list $lxpad 0] -expand $cexpand -anchor w - } elseif {[regexp {^t(\d+)$} $type type sz]} { - ${NS}::label $cframe.l_$id -text $title - ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \ - -textvariable newviewopts($n,$id) - pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0] - pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x - } elseif {[regexp {^t(\d+)=$} $type type sz]} { - ${NS}::label $cframe.l_$id -text $title - ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \ - -textvariable newviewopts($n,$id) - pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w - pack $cframe.e_$id -in $cframe -side top -fill x - } elseif {$type eq "path"} { - ${NS}::label $top.l -text $title - pack $top.l -in $top -side top -pady [list 3 0] -anchor w -padx 3 - text $top.t -width 40 -height 5 -background $bgcolor - if {[info exists viewfiles($n)]} { - foreach f $viewfiles($n) { - $top.t insert end $f - $top.t insert end "\n" - } - $top.t delete {end - 1c} end - $top.t mark set insert 0.0 - } - pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3 - } + } elseif {$type eq "b"} { + ${NS}::checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id) + pack $cframe.c_$id -in $cframe -side left \ + -padx [list $lxpad 0] -expand $cexpand -anchor w + } elseif {[regexp {^r(\d+)$} $type type sz]} { + regexp {^(.*_)} $id uselessvar button_id + ${NS}::radiobutton $cframe.c_$id -text $title -variable newviewopts($n,$button_id) -value $sz + pack $cframe.c_$id -in $cframe -side left \ + -padx [list $lxpad 0] -expand $cexpand -anchor w + } elseif {[regexp {^t(\d+)$} $type type sz]} { + ${NS}::label $cframe.l_$id -text $title + ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \ + -textvariable newviewopts($n,$id) + pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0] + pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x + } elseif {[regexp {^t(\d+)=$} $type type sz]} { + ${NS}::label $cframe.l_$id -text $title + ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \ + -textvariable newviewopts($n,$id) + pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w + pack $cframe.e_$id -in $cframe -side top -fill x + } elseif {$type eq "path"} { + ${NS}::label $top.l -text $title + pack $top.l -in $top -side top -pady [list 3 0] -anchor w -padx 3 + text $top.t -width 40 -height 5 -background $bgcolor + if {[info exists viewfiles($n)]} { + foreach f $viewfiles($n) { + $top.t insert end $f + $top.t insert end "\n" + } + $top.t delete {end - 1c} end + $top.t mark set insert 0.0 + } + pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3 + } } ${NS}::frame $top.buts @@ -4353,10 +4373,10 @@ proc vieweditor {top n title} { proc doviewmenu {m first cmd op argv} { set nmenu [$m index end] for {set i $first} {$i <= $nmenu} {incr i} { - if {[$m entrycget $i -command] eq $cmd} { - eval $m $op $i $argv - break - } + if {[$m entrycget $i -command] eq $cmd} { + eval $m $op $i $argv + break + } } } @@ -4373,53 +4393,53 @@ proc newviewok {top n {apply 0}} { global viewargs viewargscmd newviewopts viewhlmenu if {[catch { - set newargs [encode_view_opts $n] + set newargs [encode_view_opts $n] } err]} { - error_popup "[mc "Error in commit selection arguments:"] $err" $top - return + error_popup "[mc "Error in commit selection arguments:"] $err" $top + return } set files {} foreach f [split [$top.t get 0.0 end] "\n"] { - set ft [string trim $f] - if {$ft ne {}} { - lappend files $ft - } + set ft [string trim $f] + if {$ft ne {}} { + lappend files $ft + } } if {![info exists viewfiles($n)]} { - # creating a new view - incr nextviewnum - set viewname($n) $newviewname($n) - set viewperm($n) $newviewopts($n,perm) - set viewchanged($n) 1 - set viewfiles($n) $files - set viewargs($n) $newargs - set viewargscmd($n) $newviewopts($n,cmd) - addviewmenu $n - if {!$newishighlight} { - run showview $n - } else { - run addvhighlight $n - } + # creating a new view + incr nextviewnum + set viewname($n) $newviewname($n) + set viewperm($n) $newviewopts($n,perm) + set viewchanged($n) 1 + set viewfiles($n) $files + set viewargs($n) $newargs + set viewargscmd($n) $newviewopts($n,cmd) + addviewmenu $n + if {!$newishighlight} { + run showview $n + } else { + run addvhighlight $n + } } else { - # editing an existing view - set viewperm($n) $newviewopts($n,perm) - set viewchanged($n) 1 - if {$newviewname($n) ne $viewname($n)} { - set viewname($n) $newviewname($n) - doviewmenu .bar.view 5 [list showview $n] \ - entryconf [list -label $viewname($n)] - # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \ - # entryconf [list -label $viewname($n) -value $viewname($n)] - } - if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \ - $newviewopts($n,cmd) ne $viewargscmd($n)} { - set viewfiles($n) $files - set viewargs($n) $newargs - set viewargscmd($n) $newviewopts($n,cmd) - if {$curview == $n} { - run reloadcommits - } - } + # editing an existing view + set viewperm($n) $newviewopts($n,perm) + set viewchanged($n) 1 + if {$newviewname($n) ne $viewname($n)} { + set viewname($n) $newviewname($n) + doviewmenu .bar.view 5 [list showview $n] \ + entryconf [list -label $viewname($n)] + # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \ + # entryconf [list -label $viewname($n) -value $viewname($n)] + } + if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \ + $newviewopts($n,cmd) ne $viewargscmd($n)} { + set viewfiles($n) $files + set viewargs($n) $newargs + set viewargscmd($n) $newviewopts($n,cmd) + if {$curview == $n} { + run reloadcommits + } + } } if {$apply} return catch {destroy $top} @@ -4430,8 +4450,8 @@ proc delview {} { if {$curview == 0} return if {[info exists hlview] && $hlview == $curview} { - set selectedhlview [mc "None"] - unset hlview + set selectedhlview [mc "None"] + unset hlview } allviewmenus $curview delete set viewperm($curview) 0 @@ -4443,7 +4463,7 @@ proc addviewmenu {n} { global viewname viewhlmenu .bar.view add radiobutton -label $viewname($n) \ - -command [list showview $n] -variable selectedview -value $n + -command [list showview $n] -variable selectedview -value $n #$viewhlmenu add radiobutton -label $viewname($n) \ # -command [list addvhighlight $n] -variable selectedhlview } @@ -4468,22 +4488,22 @@ proc showview {n} { set ybot [expr {[lindex $span 1] * $ymax}] set yscreen [expr {($ybot - $ytop) / 2}] if {$selectedline ne {}} { - set selid $currentid - set y [yc $selectedline] - if {$ytop < $y && $y < $ybot} { - set yscreen [expr {$y - $ytop}] - } + set selid $currentid + set y [yc $selectedline] + if {$ytop < $y && $y < $ybot} { + set yscreen [expr {$y - $ytop}] + } } elseif {[info exists pending_select]} { - set selid $pending_select - unset pending_select + set selid $pending_select + unset pending_select } unselectline normalline unset -nocomplain treediffs clear_display if {[info exists hlview] && $hlview == $n} { - unset hlview - set selectedhlview [mc "None"] + unset hlview + set selectedhlview [mc "None"] } unset -nocomplain commitinterest unset -nocomplain cached_commitrow @@ -4496,8 +4516,8 @@ proc showview {n} { run refill_reflist if {![info exists viewcomplete($n)]} { - getcommits $selid - return + getcommits $selid + return } set displayorder {} @@ -4517,39 +4537,39 @@ proc showview {n} { set yf 0 set row {} if {$selid ne {} && [commitinview $selid $n]} { - set row [rowofcommit $selid] - # try to get the selected row in the same position on the screen - set ymax [lindex [$canv cget -scrollregion] 3] - set ytop [expr {[yc $row] - $yscreen}] - if {$ytop < 0} { - set ytop 0 - } - set yf [expr {$ytop * 1.0 / $ymax}] + set row [rowofcommit $selid] + # try to get the selected row in the same position on the screen + set ymax [lindex [$canv cget -scrollregion] 3] + set ytop [expr {[yc $row] - $yscreen}] + if {$ytop < 0} { + set ytop 0 + } + set yf [expr {$ytop * 1.0 / $ymax}] } allcanvs yview moveto $yf drawvisible if {$row ne {}} { - selectline $row 0 + selectline $row 0 } elseif {!$viewcomplete($n)} { - reset_pending_select $selid + reset_pending_select $selid } else { - reset_pending_select {} + reset_pending_select {} - if {[commitinview $pending_select $curview]} { - selectline [rowofcommit $pending_select] 1 - } else { - set row [first_real_row] - if {$row < $numcommits} { - selectline $row 0 - } - } + if {[commitinview $pending_select $curview]} { + selectline [rowofcommit $pending_select] 1 + } else { + set row [first_real_row] + if {$row < $numcommits} { + selectline $row 0 + } + } } if {!$viewcomplete($n)} { - if {$numcommits == 0} { - show_status [mc "Reading commits..."] - } + if {$numcommits == 0} { + show_status [mc "Reading commits..."] + } } elseif {$numcommits == 0} { - show_status [mc "No commits selected"] + show_status [mc "No commits selected"] } set_window_title } @@ -4560,16 +4580,16 @@ proc ishighlighted {id} { global vhighlights fhighlights nhighlights rhighlights if {[info exists nhighlights($id)] && $nhighlights($id) > 0} { - return $nhighlights($id) + return $nhighlights($id) } if {[info exists vhighlights($id)] && $vhighlights($id) > 0} { - return $vhighlights($id) + return $vhighlights($id) } if {[info exists fhighlights($id)] && $fhighlights($id) > 0} { - return $fhighlights($id) + return $fhighlights($id) } if {[info exists rhighlights($id)] && $rhighlights($id) > 0} { - return $rhighlights($id) + return $rhighlights($id) } return 0 } @@ -4582,14 +4602,14 @@ proc bolden {id font} { lappend boldids $id $canv itemconf $linehtag($id) -font $font if {[info exists currentid] && $id eq $currentid} { - $canv delete secsel - set t [eval $canv create rect [$canv bbox $linehtag($id)] \ - -outline {{}} -tags secsel \ - -fill [$canv cget -selectbackground]] - $canv lower $t + $canv delete secsel + set t [eval $canv create rect [$canv bbox $linehtag($id)] \ + -outline {{}} -tags secsel \ + -fill [$canv cget -selectbackground]] + $canv lower $t } if {[info exists markedid] && $id eq $markedid} { - make_idmark $id + make_idmark $id } } @@ -4600,11 +4620,11 @@ proc bolden_name {id font} { lappend boldnameids $id $canv2 itemconf $linentag($id) -font $font if {[info exists currentid] && $id eq $currentid} { - $canv2 delete secsel - set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \ - -outline {{}} -tags secsel \ - -fill [$canv2 cget -selectbackground]] - $canv2 lower $t + $canv2 delete secsel + set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \ + -outline {{}} -tags secsel \ + -fill [$canv2 cget -selectbackground]] + $canv2 lower $t } } @@ -4613,11 +4633,11 @@ proc unbolden {} { set stillbold {} foreach id $boldids { - if {![ishighlighted $id]} { - bolden $id mainfont - } else { - lappend stillbold $id - } + if {![ishighlighted $id]} { + bolden $id mainfont + } else { + lappend stillbold $id + } } set boldids $stillbold } @@ -4626,15 +4646,15 @@ proc addvhighlight {n} { global hlview viewcomplete curview vhl_done commitidx if {[info exists hlview]} { - delvhighlight + delvhighlight } set hlview $n if {$n != $curview && ![info exists viewcomplete($n)]} { - start_rev_list $n + start_rev_list $n } set vhl_done $commitidx($hlview) if {$vhl_done > 0} { - drawvisible + drawvisible } } @@ -4655,16 +4675,16 @@ proc vhighlightmore {} { set r0 [lindex $vr 0] set r1 [lindex $vr 1] for {set i $vhl_done} {$i < $max} {incr i} { - set id [commitonrow $i $hlview] - if {[commitinview $id $curview]} { - set row [rowofcommit $id] - if {$r0 <= $row && $row <= $r1} { - if {![highlighted $row]} { - bolden $id mainfontbold - } - set vhighlights($id) 1 - } - } + set id [commitonrow $i $hlview] + if {[commitinview $id $curview]} { + set row [rowofcommit $id] + if {$r0 <= $row && $row <= $r1} { + if {![highlighted $row]} { + bolden $id mainfontbold + } + set vhighlights($id) 1 + } + } } set vhl_done $max return 0 @@ -4674,12 +4694,12 @@ proc askvhighlight {row id} { global hlview vhighlights iddrawn if {[commitinview $id $hlview]} { - if {[info exists iddrawn($id)] && ![ishighlighted $id]} { - bolden $id mainfontbold - } - set vhighlights($id) 1 + if {[info exists iddrawn($id)] && ![ishighlighted $id]} { + bolden $id mainfontbold + } + set vhighlights($id) 1 } else { - set vhighlights($id) 0 + set vhighlights($id) 0 } } @@ -4688,18 +4708,18 @@ proc hfiles_change {} { global highlight_paths if {[info exists filehighlight]} { - # delete previous highlights - catch {close $filehighlight} - unset filehighlight - unset -nocomplain fhighlights - unbolden - unhighlight_filelist + # delete previous highlights + catch {close $filehighlight} + unset filehighlight + unset -nocomplain fhighlights + unbolden + unhighlight_filelist } set highlight_paths {} after cancel do_file_hl $fh_serial incr fh_serial if {$highlight_files ne {}} { - after 300 do_file_hl $fh_serial + after 300 do_file_hl $fh_serial } } @@ -4708,21 +4728,21 @@ proc gdttype_change {name ix op} { stopfinding if {$findstring ne {}} { - if {$gdttype eq [mc "containing:"]} { - if {$highlight_files ne {}} { - set highlight_files {} - hfiles_change - } - findcom_change - } else { - if {$findpattern ne {}} { - set findpattern {} - findcom_change - } - set highlight_files $findstring - hfiles_change - } - drawvisible + if {$gdttype eq [mc "containing:"]} { + if {$highlight_files ne {}} { + set highlight_files {} + hfiles_change + } + findcom_change + } else { + if {$findpattern ne {}} { + set findpattern {} + findcom_change + } + set highlight_files $findstring + hfiles_change + } + drawvisible } # enable/disable findtype/findloc menus too } @@ -4732,12 +4752,12 @@ proc find_change {name ix op} { stopfinding if {$gdttype eq [mc "containing:"]} { - findcom_change + findcom_change } else { - if {$highlight_files ne $findstring} { - set highlight_files $findstring - hfiles_change - } + if {$highlight_files ne $findstring} { + set highlight_files $findstring + hfiles_change + } } drawvisible } @@ -4749,33 +4769,33 @@ proc findcom_change args { stopfinding # delete previous highlights, if any foreach id $boldnameids { - bolden_name $id mainfont + bolden_name $id mainfont } set boldnameids {} unset -nocomplain nhighlights unbolden unmarkmatches if {$gdttype ne [mc "containing:"] || $findstring eq {}} { - set findpattern {} + set findpattern {} } elseif {$findtype eq [mc "Regexp"]} { - set findpattern $findstring + set findpattern $findstring } else { - set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \ - $findstring] - set findpattern "*$e*" + set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \ + $findstring] + set findpattern "*$e*" } } proc makepatterns {l} { set ret {} foreach e $l { - set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e] - if {[string index $ee end] eq "/"} { - lappend ret "$ee*" - } else { - lappend ret $ee - lappend ret "$ee/*" - } + set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e] + if {[string index $ee end] eq "/"} { + lappend ret "$ee*" + } else { + lappend ret $ee + lappend ret "$ee/*" + } } return $ret } @@ -4785,26 +4805,26 @@ proc do_file_hl {serial} { global cdup findtype if {$gdttype eq [mc "touching paths:"]} { - # If "exact" match then convert backslashes to forward slashes. - # Most useful to support Windows-flavoured file paths. - if {$findtype eq [mc "Exact"]} { - set highlight_files [string map {"\\" "/"} $highlight_files] - } - if {[catch {set paths [shellsplit $highlight_files]}]} return - set highlight_paths [makepatterns $paths] - highlight_filelist - set relative_paths {} - foreach path $paths { - lappend relative_paths [file join $cdup $path] - } - set gdtargs [concat -- $relative_paths] + # If "exact" match then convert backslashes to forward slashes. + # Most useful to support Windows-flavoured file paths. + if {$findtype eq [mc "Exact"]} { + set highlight_files [string map {"\\" "/"} $highlight_files] + } + if {[catch {set paths [shellsplit $highlight_files]}]} return + set highlight_paths [makepatterns $paths] + highlight_filelist + set relative_paths {} + foreach path $paths { + lappend relative_paths [file join $cdup $path] + } + set gdtargs [concat -- $relative_paths] } elseif {$gdttype eq [mc "adding/removing string:"]} { - set gdtargs [list "-S$highlight_files"] + set gdtargs [list "-S$highlight_files"] } elseif {$gdttype eq [mc "changing lines matching:"]} { - set gdtargs [list "-G$highlight_files"] + set gdtargs [list "-G$highlight_files"] } else { - # must be "containing:", i.e. we're searching commit info - return + # must be "containing:", i.e. we're searching commit info + return } set cmd [concat | git diff-tree -r -s --stdin $gdtargs] set filehighlight [open $cmd r+] @@ -4819,9 +4839,9 @@ proc flushhighlights {} { global filehighlight fhl_list if {[info exists filehighlight]} { - lappend fhl_list {} - puts $filehighlight "" - flush $filehighlight + lappend fhl_list {} + puts $filehighlight "" + flush $filehighlight } } @@ -4838,34 +4858,34 @@ proc readfhighlight {} { global fhl_list find_dirn if {![info exists filehighlight]} { - return 0 + return 0 } set nr 0 while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} { - set line [string trim $line] - set i [lsearch -exact $fhl_list $line] - if {$i < 0} continue - for {set j 0} {$j < $i} {incr j} { - set id [lindex $fhl_list $j] - set fhighlights($id) 0 - } - set fhl_list [lrange $fhl_list [expr {$i+1}] end] - if {$line eq {}} continue - if {![commitinview $line $curview]} continue - if {[info exists iddrawn($line)] && ![ishighlighted $line]} { - bolden $line mainfontbold - } - set fhighlights($line) 1 + set line [string trim $line] + set i [lsearch -exact $fhl_list $line] + if {$i < 0} continue + for {set j 0} {$j < $i} {incr j} { + set id [lindex $fhl_list $j] + set fhighlights($id) 0 + } + set fhl_list [lrange $fhl_list [expr {$i+1}] end] + if {$line eq {}} continue + if {![commitinview $line $curview]} continue + if {[info exists iddrawn($line)] && ![ishighlighted $line]} { + bolden $line mainfontbold + } + set fhighlights($line) 1 } if {[eof $filehighlight]} { - # strange... - puts "oops, git diff-tree died" - catch {close $filehighlight} - unset filehighlight - return 0 + # strange... + puts "oops, git diff-tree died" + catch {close $filehighlight} + unset filehighlight + return 0 } if {[info exists find_dirn]} { - run findmore + run findmore } return 1 } @@ -4874,11 +4894,11 @@ proc doesmatch {f} { global findtype findpattern if {$findtype eq [mc "Regexp"]} { - return [regexp $findpattern $f] + return [regexp $findpattern $f] } elseif {$findtype eq [mc "IgnCase"]} { - return [string match -nocase $findpattern $f] + return [string match -nocase $findpattern $f] } else { - return [string match $findpattern $f] + return [string match $findpattern $f] } } @@ -4888,32 +4908,32 @@ proc askfindhighlight {row id} { global markingmatches if {![info exists commitinfo($id)]} { - getcommit $id + getcommit $id } set info $commitinfo($id) set isbold 0 set fldtypes [list [mc Headline] [mc Author] "" [mc Committer] "" [mc Comments]] foreach f $info ty $fldtypes { - if {$ty eq ""} continue - if {($findloc eq [mc "All fields"] || $findloc eq $ty) && - [doesmatch $f]} { - if {$ty eq [mc "Author"]} { - set isbold 2 - break - } - set isbold 1 - } + if {$ty eq ""} continue + if {($findloc eq [mc "All fields"] || $findloc eq $ty) && + [doesmatch $f]} { + if {$ty eq [mc "Author"]} { + set isbold 2 + break + } + set isbold 1 + } } if {$isbold && [info exists iddrawn($id)]} { - if {![ishighlighted $id]} { - bolden $id mainfontbold - if {$isbold > 1} { - bolden_name $id mainfontbold - } - } - if {$markingmatches} { - markrowmatches $row $id - } + if {![ishighlighted $id]} { + bolden $id mainfontbold + if {$isbold > 1} { + bolden_name $id mainfontbold + } + } + if {$markingmatches} { + markrowmatches $row $id + } } set nhighlights($id) $isbold } @@ -4926,18 +4946,18 @@ proc markrowmatches {row id} { $canv delete match$row $canv2 delete match$row if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} { - set m [findmatches $headline] - if {$m ne {}} { - markmatches $canv $row $headline $linehtag($id) $m \ - [$canv itemcget $linehtag($id) -font] $row - } + set m [findmatches $headline] + if {$m ne {}} { + markmatches $canv $row $headline $linehtag($id) $m \ + [$canv itemcget $linehtag($id) -font] $row + } } if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} { - set m [findmatches $author] - if {$m ne {}} { - markmatches $canv2 $row $author $linentag($id) $m \ - [$canv2 itemcget $linentag($id) -font] $row - } + set m [findmatches $author] + if {$m ne {}} { + markmatches $canv2 $row $author $linentag($id) $m \ + [$canv2 itemcget $linentag($id) -font] $row + } } } @@ -4946,7 +4966,7 @@ proc vrel_change {name ix op} { rhighlight_none if {$highlight_related ne [mc "None"]} { - run drawvisible + run drawvisible } } @@ -4960,8 +4980,8 @@ proc rhighlight_sel {a} { unset -nocomplain ancestor set anc_todo [list $a] if {$highlight_related ne [mc "None"]} { - rhighlight_none - run drawvisible + rhighlight_none + run drawvisible } } @@ -4981,24 +5001,24 @@ proc is_descendent {a} { set leftover {} set done 0 for {set i 0} {$i < [llength $todo]} {incr i} { - set do [lindex $todo $i] - if {[rowofcommit $do] < $la} { - lappend leftover $do - continue - } - foreach nk $children($v,$do) { - if {![info exists descendent($nk)]} { - set descendent($nk) 1 - lappend todo $nk - if {$nk eq $a} { - set done 1 - } - } - } - if {$done} { - set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]] - return - } + set do [lindex $todo $i] + if {[rowofcommit $do] < $la} { + lappend leftover $do + continue + } + foreach nk $children($v,$do) { + if {![info exists descendent($nk)]} { + set descendent($nk) 1 + lappend todo $nk + if {$nk eq $a} { + set done 1 + } + } + } + if {$done} { + set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]] + return + } } set descendent($a) 0 set desc_todo $leftover @@ -5013,24 +5033,24 @@ proc is_ancestor {a} { set leftover {} set done 0 for {set i 0} {$i < [llength $todo]} {incr i} { - set do [lindex $todo $i] - if {![commitinview $do $v] || [rowofcommit $do] > $la} { - lappend leftover $do - continue - } - foreach np $parents($v,$do) { - if {![info exists ancestor($np)]} { - set ancestor($np) 1 - lappend todo $np - if {$np eq $a} { - set done 1 - } - } - } - if {$done} { - set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]] - return - } + set do [lindex $todo $i] + if {![commitinview $do $v] || [rowofcommit $do] > $la} { + lappend leftover $do + continue + } + foreach np $parents($v,$do) { + if {![info exists ancestor($np)]} { + set ancestor($np) 1 + lappend todo $np + if {$np eq $a} { + set done 1 + } + } + } + if {$done} { + set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]] + return + } } set ancestor($a) 0 set anc_todo $leftover @@ -5043,26 +5063,26 @@ proc askrelhighlight {row id} { if {$selectedline eq {}} return set isbold 0 if {$highlight_related eq [mc "Descendant"] || - $highlight_related eq [mc "Not descendant"]} { - if {![info exists descendent($id)]} { - is_descendent $id - } - if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} { - set isbold 1 - } + $highlight_related eq [mc "Not descendant"]} { + if {![info exists descendent($id)]} { + is_descendent $id + } + if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} { + set isbold 1 + } } elseif {$highlight_related eq [mc "Ancestor"] || - $highlight_related eq [mc "Not ancestor"]} { - if {![info exists ancestor($id)]} { - is_ancestor $id - } - if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} { - set isbold 1 - } + $highlight_related eq [mc "Not ancestor"]} { + if {![info exists ancestor($id)]} { + is_ancestor $id + } + if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} { + set isbold 1 + } } if {[info exists iddrawn($id)]} { - if {$isbold && ![ishighlighted $id]} { - bolden $id mainfontbold - } + if {$isbold && ![ishighlighted $id]} { + bolden $id mainfontbold + } } set rhighlights($id) $isbold } @@ -5072,13 +5092,13 @@ proc askrelhighlight {row id} { proc shortids {ids} { set res {} foreach id $ids { - if {[llength $id] > 1} { - lappend res [shortids $id] - } elseif {[regexp {^[0-9a-f]{40}$} $id]} { - lappend res [string range $id 0 7] - } else { - lappend res $id - } + if {[llength $id] > 1} { + lappend res [shortids $id] + } elseif {[regexp {^[0-9a-f]{40}$} $id]} { + lappend res [string range $id 0 7] + } else { + lappend res $id + } } return $res } @@ -5087,10 +5107,10 @@ proc ntimes {n o} { set ret {} set o [list $o] for {set mask 1} {$mask <= $n} {incr mask $mask} { - if {($n & $mask) != 0} { - set ret [concat $ret $o] - } - set o [concat $o $o] + if {($n & $mask) != 0} { + set ret [concat $ret $o] + } + set o [concat $o $o] } return $ret } @@ -5100,41 +5120,41 @@ proc ordertoken {id} { global nullid nullid2 if {[info exists ordertok($id)]} { - return $ordertok($id) + return $ordertok($id) } set origid $id set todo {} while {1} { - if {[info exists varcid($curview,$id)]} { - set a $varcid($curview,$id) - set p [lindex $varcstart($curview) $a] - } else { - set p [lindex $children($curview,$id) 0] - } - if {[info exists ordertok($p)]} { - set tok $ordertok($p) - break - } - set id [first_real_child $curview,$p] - if {$id eq {}} { - # it's a root - set tok [lindex $varctok($curview) $varcid($curview,$p)] - break - } - if {[llength $parents($curview,$id)] == 1} { - lappend todo [list $p {}] - } else { - set j [lsearch -exact $parents($curview,$id) $p] - if {$j < 0} { - puts "oops didn't find [shortids $p] in parents of [shortids $id]" - } - lappend todo [list $p [strrep $j]] - } + if {[info exists varcid($curview,$id)]} { + set a $varcid($curview,$id) + set p [lindex $varcstart($curview) $a] + } else { + set p [lindex $children($curview,$id) 0] + } + if {[info exists ordertok($p)]} { + set tok $ordertok($p) + break + } + set id [first_real_child $curview,$p] + if {$id eq {}} { + # it's a root + set tok [lindex $varctok($curview) $varcid($curview,$p)] + break + } + if {[llength $parents($curview,$id)] == 1} { + lappend todo [list $p {}] + } else { + set j [lsearch -exact $parents($curview,$id) $p] + if {$j < 0} { + puts "oops didn't find [shortids $p] in parents of [shortids $id]" + } + lappend todo [list $p [strrep $j]] + } } for {set i [llength $todo]} {[incr i -1] >= 0} {} { - set p [lindex $todo $i 0] - append tok [lindex $todo $i 1] - set ordertok($p) $tok + set p [lindex $todo $i 0] + append tok [lindex $todo $i 1] + set ordertok($p) $tok } set ordertok($origid) $tok return $tok @@ -5145,19 +5165,19 @@ proc ordertoken {id} { proc idcol {idlist id {i 0}} { set t [ordertoken $id] if {$i < 0} { - set i 0 + set i 0 } if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} { - if {$i > [llength $idlist]} { - set i [llength $idlist] - } - while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {} - incr i + if {$i > [llength $idlist]} { + set i [llength $idlist] + } + while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {} + incr i } else { - if {$t > [ordertoken [lindex $idlist $i]]} { - while {[incr i] < [llength $idlist] && - $t >= [ordertoken [lindex $idlist $i]]} {} - } + if {$t > [ordertoken [lindex $idlist $i]]} { + while {[incr i] < [llength $idlist] && + $t >= [ordertoken [lindex $idlist $i]]} {} + } } return $i } @@ -5202,12 +5222,12 @@ proc visiblerows {} { set y0 [expr {int([lindex $f 0] * $ymax)}] set r0 [expr {int(($y0 - 3) / $linespc) - 1}] if {$r0 < 0} { - set r0 0 + set r0 0 } set y1 [expr {int([lindex $f 1] * $ymax)}] set r1 [expr {int(($y1 - 3) / $linespc) + 1}] if {$r1 >= $numcommits} { - set r1 [expr {$numcommits - 1}] + set r1 [expr {$numcommits - 1}] } return [list $r0 $r1] } @@ -5218,13 +5238,13 @@ proc layoutmore {} { global lastscrollset lastscrollrows if {$lastscrollrows < 100 || $viewcomplete($curview) || - [clock clicks -milliseconds] - $lastscrollset > 500} { - setcanvscroll + [clock clicks -milliseconds] - $lastscrollset > 500} { + setcanvscroll } if {[info exists pending_select] && - [commitinview $pending_select $curview]} { - update - selectline [rowofcommit $pending_select] 1 + [commitinview $pending_select $curview]} { + update + selectline [rowofcommit $pending_select] 1 } drawvisible } @@ -5236,13 +5256,13 @@ proc get_viewmainhead {view} { global viewmainheadid vfilelimit viewinstances mainheadid catch { - set rfd [open [concat | git rev-list -1 $mainheadid \ - -- $vfilelimit($view)] r] - set j [reg_instance $rfd] - lappend viewinstances($view) $j - fconfigure $rfd -blocking 0 - filerun $rfd [list getviewhead $rfd $j $view] - set viewmainheadid($curview) {} + set rfd [open [concat | git rev-list -1 $mainheadid \ + -- $vfilelimit($view)] r] + set j [reg_instance $rfd] + lappend viewinstances($view) $j + fconfigure $rfd -blocking 0 + filerun $rfd [list getviewhead $rfd $j $view] + set viewmainheadid($curview) {} } } @@ -5252,21 +5272,21 @@ proc getviewhead {fd inst view} { set id {} if {[gets $fd line] < 0} { - if {![eof $fd]} { - return 1 - } + if {![eof $fd]} { + return 1 + } } elseif {[string length $line] == 40 && [string is xdigit $line]} { - set id $line + set id $line } set viewmainheadid($view) $id close $fd unset commfd($inst) set i [lsearch -exact $viewinstances($view) $inst] if {$i >= 0} { - set viewinstances($view) [lreplace $viewinstances($view) $i $i] + set viewinstances($view) [lreplace $viewinstances($view) $i $i] } if {$showlocalchanges && $id ne {} && $view == $curview} { - doshowlocalchanges + doshowlocalchanges } return 0 } @@ -5276,9 +5296,9 @@ proc doshowlocalchanges {} { if {$viewmainheadid($curview) eq {}} return if {[commitinview $viewmainheadid($curview) $curview]} { - dodiffindex + dodiffindex } else { - interestedin $viewmainheadid($curview) dodiffindex + interestedin $viewmainheadid($curview) dodiffindex } } @@ -5286,10 +5306,10 @@ proc dohidelocalchanges {} { global nullid nullid2 lserial curview if {[commitinview $nullid $curview]} { - removefakerow $nullid + removefakerow $nullid } if {[commitinview $nullid2 $curview]} { - removefakerow $nullid2 + removefakerow $nullid2 } incr lserial } @@ -5302,12 +5322,12 @@ proc dodiffindex {} { if {!$showlocalchanges || !$hasworktree} return incr lserial if {[package vcompare $git_version "1.7.2"] >= 0} { - set cmd "|git diff-index --cached --ignore-submodules=dirty HEAD" + set cmd "|git diff-index --cached --ignore-submodules=dirty HEAD" } else { - set cmd "|git diff-index --cached HEAD" + set cmd "|git diff-index --cached HEAD" } if {$vfilelimit($curview) ne {}} { - set cmd [concat $cmd -- $vfilelimit($curview)] + set cmd [concat $cmd -- $vfilelimit($curview)] } set fd [open $cmd r] fconfigure $fd -blocking 0 @@ -5321,22 +5341,22 @@ proc readdiffindex {fd serial inst} { set isdiff 1 if {[gets $fd line] < 0} { - if {![eof $fd]} { - return 1 - } - set isdiff 0 + if {![eof $fd]} { + return 1 + } + set isdiff 0 } # we only need to see one line and we don't really care what it says... stop_instance $inst if {$serial != $lserial} { - return 0 + return 0 } # now see if there are any local changes not checked in to the index set cmd "|git diff-files" if {$vfilelimit($curview) ne {}} { - set cmd [concat $cmd -- $vfilelimit($curview)] + set cmd [concat $cmd -- $vfilelimit($curview)] } set fd [open $cmd r] fconfigure $fd -blocking 0 @@ -5344,19 +5364,19 @@ proc readdiffindex {fd serial inst} { filerun $fd [list readdifffiles $fd $serial $i] if {$isdiff && ![commitinview $nullid2 $curview]} { - # add the line for the changes in the index to the graph - set hl [mc "Local changes checked in to index but not committed"] - set commitinfo($nullid2) [list $hl {} {} {} {} " $hl\n"] - set commitdata($nullid2) "\n $hl\n" - if {[commitinview $nullid $curview]} { - removefakerow $nullid - } - insertfakerow $nullid2 $viewmainheadid($curview) + # add the line for the changes in the index to the graph + set hl [mc "Local changes checked in to index but not committed"] + set commitinfo($nullid2) [list $hl {} {} {} {} " $hl\n"] + set commitdata($nullid2) "\n $hl\n" + if {[commitinview $nullid $curview]} { + removefakerow $nullid + } + insertfakerow $nullid2 $viewmainheadid($curview) } elseif {!$isdiff && [commitinview $nullid2 $curview]} { - if {[commitinview $nullid $curview]} { - removefakerow $nullid - } - removefakerow $nullid2 + if {[commitinview $nullid $curview]} { + removefakerow $nullid + } + removefakerow $nullid2 } return 0 } @@ -5367,31 +5387,31 @@ proc readdifffiles {fd serial inst} { set isdiff 1 if {[gets $fd line] < 0} { - if {![eof $fd]} { - return 1 - } - set isdiff 0 + if {![eof $fd]} { + return 1 + } + set isdiff 0 } # we only need to see one line and we don't really care what it says... stop_instance $inst if {$serial != $lserial} { - return 0 + return 0 } if {$isdiff && ![commitinview $nullid $curview]} { - # add the line for the local diff to the graph - set hl [mc "Local uncommitted changes, not checked in to index"] - set commitinfo($nullid) [list $hl {} {} {} {} " $hl\n"] - set commitdata($nullid) "\n $hl\n" - if {[commitinview $nullid2 $curview]} { - set p $nullid2 - } else { - set p $viewmainheadid($curview) - } - insertfakerow $nullid $p + # add the line for the local diff to the graph + set hl [mc "Local uncommitted changes, not checked in to index"] + set commitinfo($nullid) [list $hl {} {} {} {} " $hl\n"] + set commitdata($nullid) "\n $hl\n" + if {[commitinview $nullid2 $curview]} { + set p $nullid2 + } else { + set p $viewmainheadid($curview) + } + insertfakerow $nullid $p } elseif {!$isdiff && [commitinview $nullid $curview]} { - removefakerow $nullid + removefakerow $nullid } return 0 } @@ -5400,17 +5420,17 @@ proc nextuse {id row} { global curview children if {[info exists children($curview,$id)]} { - foreach kid $children($curview,$id) { - if {![commitinview $kid $curview]} { - return -1 - } - if {[rowofcommit $kid] > $row} { - return [rowofcommit $kid] - } - } + foreach kid $children($curview,$id) { + if {![commitinview $kid $curview]} { + return -1 + } + if {[rowofcommit $kid] > $row} { + return [rowofcommit $kid] + } + } } if {[commitinview $id $curview]} { - return [rowofcommit $id] + return [rowofcommit $id] } return -1 } @@ -5420,12 +5440,12 @@ proc prevuse {id row} { set ret -1 if {[info exists children($curview,$id)]} { - foreach kid $children($curview,$id) { - if {![commitinview $kid $curview]} break - if {[rowofcommit $kid] < $row} { - set ret [rowofcommit $kid] - } - } + foreach kid $children($curview,$id) { + if {![commitinview $kid $curview]} break + if {[rowofcommit $kid] < $row} { + set ret [rowofcommit $kid] + } + } } return $ret } @@ -5436,70 +5456,70 @@ proc make_idlist {row} { set r [expr {$row - $mingaplen - $downarrowlen - 1}] if {$r < 0} { - set r 0 + set r 0 } set ra [expr {$row - $downarrowlen}] if {$ra < 0} { - set ra 0 + set ra 0 } set rb [expr {$row + $uparrowlen}] if {$rb > $commitidx($curview)} { - set rb $commitidx($curview) + set rb $commitidx($curview) } make_disporder $r [expr {$rb + 1}] set ids {} for {} {$r < $ra} {incr r} { - set nextid [lindex $displayorder [expr {$r + 1}]] - foreach p [lindex $parentlist $r] { - if {$p eq $nextid} continue - set rn [nextuse $p $r] - if {$rn >= $row && - $rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} { - lappend ids [list [ordertoken $p] $p] - } - } + set nextid [lindex $displayorder [expr {$r + 1}]] + foreach p [lindex $parentlist $r] { + if {$p eq $nextid} continue + set rn [nextuse $p $r] + if {$rn >= $row && + $rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} { + lappend ids [list [ordertoken $p] $p] + } + } } for {} {$r < $row} {incr r} { - set nextid [lindex $displayorder [expr {$r + 1}]] - foreach p [lindex $parentlist $r] { - if {$p eq $nextid} continue - set rn [nextuse $p $r] - if {$rn < 0 || $rn >= $row} { - lappend ids [list [ordertoken $p] $p] - } - } + set nextid [lindex $displayorder [expr {$r + 1}]] + foreach p [lindex $parentlist $r] { + if {$p eq $nextid} continue + set rn [nextuse $p $r] + if {$rn < 0 || $rn >= $row} { + lappend ids [list [ordertoken $p] $p] + } + } } set id [lindex $displayorder $row] lappend ids [list [ordertoken $id] $id] while {$r < $rb} { - foreach p [lindex $parentlist $r] { - set firstkid [lindex $children($curview,$p) 0] - if {[rowofcommit $firstkid] < $row} { - lappend ids [list [ordertoken $p] $p] - } - } - incr r - set id [lindex $displayorder $r] - if {$id ne {}} { - set firstkid [lindex $children($curview,$id) 0] - if {$firstkid ne {} && [rowofcommit $firstkid] < $row} { - lappend ids [list [ordertoken $id] $id] - } - } + foreach p [lindex $parentlist $r] { + set firstkid [lindex $children($curview,$p) 0] + if {[rowofcommit $firstkid] < $row} { + lappend ids [list [ordertoken $p] $p] + } + } + incr r + set id [lindex $displayorder $r] + if {$id ne {}} { + set firstkid [lindex $children($curview,$id) 0] + if {$firstkid ne {} && [rowofcommit $firstkid] < $row} { + lappend ids [list [ordertoken $id] $id] + } + } } set idlist {} foreach idx [lsort -unique $ids] { - lappend idlist [lindex $idx 1] + lappend idlist [lindex $idx 1] } return $idlist } proc rowsequal {a b} { while {[set i [lsearch -exact $a {}]] >= 0} { - set a [lreplace $a $i $i] + set a [lreplace $a $i $i] } while {[set i [lsearch -exact $b {}]] >= 0} { - set b [lreplace $b $i $i] + set b [lreplace $b $i $i] } return [expr {$a eq $b}] } @@ -5508,20 +5528,20 @@ proc makeupline {id row rend col} { global rowidlist uparrowlen downarrowlen mingaplen for {set r $rend} {1} {set r $rstart} { - set rstart [prevuse $id $r] - if {$rstart < 0} return - if {$rstart < $row} break + set rstart [prevuse $id $r] + if {$rstart < 0} return + if {$rstart < $row} break } if {$rstart + $uparrowlen + $mingaplen + $downarrowlen < $rend} { - set rstart [expr {$rend - $uparrowlen - 1}] + set rstart [expr {$rend - $uparrowlen - 1}] } for {set r $rstart} {[incr r] <= $row} {} { - set idlist [lindex $rowidlist $r] - if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} { - set col [idcol $idlist $id $col] - lset rowidlist $r [linsert $idlist $col $id] - changedrow $r - } + set idlist [lindex $rowidlist $r] + if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} { + set col [idcol $idlist $id $col] + lset rowidlist $r [linsert $idlist $col $id] + changedrow $r + } } } @@ -5534,100 +5554,100 @@ proc layoutrows {row endrow} { make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}] set idlist {} if {$row > 0} { - set rm1 [expr {$row - 1}] - foreach id [lindex $rowidlist $rm1] { - if {$id ne {}} { - lappend idlist $id - } - } - set final [lindex $rowfinal $rm1] + set rm1 [expr {$row - 1}] + foreach id [lindex $rowidlist $rm1] { + if {$id ne {}} { + lappend idlist $id + } + } + set final [lindex $rowfinal $rm1] } for {} {$row < $endrow} {incr row} { - set rm1 [expr {$row - 1}] - if {$rm1 < 0 || $idlist eq {}} { - set idlist [make_idlist $row] - set final 1 - } else { - set id [lindex $displayorder $rm1] - set col [lsearch -exact $idlist $id] - set idlist [lreplace $idlist $col $col] - foreach p [lindex $parentlist $rm1] { - if {[lsearch -exact $idlist $p] < 0} { - set col [idcol $idlist $p $col] - set idlist [linsert $idlist $col $p] - # if not the first child, we have to insert a line going up - if {$id ne [lindex $children($curview,$p) 0]} { - makeupline $p $rm1 $row $col - } - } - } - set id [lindex $displayorder $row] - if {$row > $downarrowlen} { - set termrow [expr {$row - $downarrowlen - 1}] - foreach p [lindex $parentlist $termrow] { - set i [lsearch -exact $idlist $p] - if {$i < 0} continue - set nr [nextuse $p $termrow] - if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} { - set idlist [lreplace $idlist $i $i] - } - } - } - set col [lsearch -exact $idlist $id] - if {$col < 0} { - set col [idcol $idlist $id] - set idlist [linsert $idlist $col $id] - if {$children($curview,$id) ne {}} { - makeupline $id $rm1 $row $col - } - } - set r [expr {$row + $uparrowlen - 1}] - if {$r < $commitidx($curview)} { - set x $col - foreach p [lindex $parentlist $r] { - if {[lsearch -exact $idlist $p] >= 0} continue - set fk [lindex $children($curview,$p) 0] - if {[rowofcommit $fk] < $row} { - set x [idcol $idlist $p $x] - set idlist [linsert $idlist $x $p] - } - } - if {[incr r] < $commitidx($curview)} { - set p [lindex $displayorder $r] - if {[lsearch -exact $idlist $p] < 0} { - set fk [lindex $children($curview,$p) 0] - if {$fk ne {} && [rowofcommit $fk] < $row} { - set x [idcol $idlist $p $x] - set idlist [linsert $idlist $x $p] - } - } - } - } - } - if {$final && !$viewcomplete($curview) && - $row + $uparrowlen + $mingaplen + $downarrowlen - >= $commitidx($curview)} { - set final 0 - } - set l [llength $rowidlist] - if {$row == $l} { - lappend rowidlist $idlist - lappend rowisopt 0 - lappend rowfinal $final - } elseif {$row < $l} { - if {![rowsequal $idlist [lindex $rowidlist $row]]} { - lset rowidlist $row $idlist - changedrow $row - } - lset rowfinal $row $final - } else { - set pad [ntimes [expr {$row - $l}] {}] - set rowidlist [concat $rowidlist $pad] - lappend rowidlist $idlist - set rowfinal [concat $rowfinal $pad] - lappend rowfinal $final - set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]] - } + set rm1 [expr {$row - 1}] + if {$rm1 < 0 || $idlist eq {}} { + set idlist [make_idlist $row] + set final 1 + } else { + set id [lindex $displayorder $rm1] + set col [lsearch -exact $idlist $id] + set idlist [lreplace $idlist $col $col] + foreach p [lindex $parentlist $rm1] { + if {[lsearch -exact $idlist $p] < 0} { + set col [idcol $idlist $p $col] + set idlist [linsert $idlist $col $p] + # if not the first child, we have to insert a line going up + if {$id ne [lindex $children($curview,$p) 0]} { + makeupline $p $rm1 $row $col + } + } + } + set id [lindex $displayorder $row] + if {$row > $downarrowlen} { + set termrow [expr {$row - $downarrowlen - 1}] + foreach p [lindex $parentlist $termrow] { + set i [lsearch -exact $idlist $p] + if {$i < 0} continue + set nr [nextuse $p $termrow] + if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} { + set idlist [lreplace $idlist $i $i] + } + } + } + set col [lsearch -exact $idlist $id] + if {$col < 0} { + set col [idcol $idlist $id] + set idlist [linsert $idlist $col $id] + if {$children($curview,$id) ne {}} { + makeupline $id $rm1 $row $col + } + } + set r [expr {$row + $uparrowlen - 1}] + if {$r < $commitidx($curview)} { + set x $col + foreach p [lindex $parentlist $r] { + if {[lsearch -exact $idlist $p] >= 0} continue + set fk [lindex $children($curview,$p) 0] + if {[rowofcommit $fk] < $row} { + set x [idcol $idlist $p $x] + set idlist [linsert $idlist $x $p] + } + } + if {[incr r] < $commitidx($curview)} { + set p [lindex $displayorder $r] + if {[lsearch -exact $idlist $p] < 0} { + set fk [lindex $children($curview,$p) 0] + if {$fk ne {} && [rowofcommit $fk] < $row} { + set x [idcol $idlist $p $x] + set idlist [linsert $idlist $x $p] + } + } + } + } + } + if {$final && !$viewcomplete($curview) && + $row + $uparrowlen + $mingaplen + $downarrowlen + >= $commitidx($curview)} { + set final 0 + } + set l [llength $rowidlist] + if {$row == $l} { + lappend rowidlist $idlist + lappend rowisopt 0 + lappend rowfinal $final + } elseif {$row < $l} { + if {![rowsequal $idlist [lindex $rowidlist $row]]} { + lset rowidlist $row $idlist + changedrow $row + } + lset rowfinal $row $final + } else { + set pad [ntimes [expr {$row - $l}] {}] + set rowidlist [concat $rowidlist $pad] + lappend rowidlist $idlist + set rowfinal [concat $rowfinal $pad] + lappend rowfinal $final + set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]] + } } return $row } @@ -5637,17 +5657,17 @@ proc changedrow {row} { set l [llength $rowisopt] if {$row < $l} { - lset rowisopt $row 0 - if {$row + 1 < $l} { - lset rowisopt [expr {$row + 1}] 0 - if {$row + 2 < $l} { - lset rowisopt [expr {$row + 2}] 0 - } - } + lset rowisopt $row 0 + if {$row + 1 < $l} { + lset rowisopt [expr {$row + 1}] 0 + if {$row + 2 < $l} { + lset rowisopt [expr {$row + 2}] 0 + } + } } set id [lindex $displayorder $row] if {[info exists iddrawn($id)]} { - set need_redisplay 1 + set need_redisplay 1 } } @@ -5660,7 +5680,7 @@ proc insert_pad {row col npad} { set aft [lrange $idlist $col end] set i [lsearch -exact $aft {}] if {$i > 0} { - set aft [lreplace $aft $i $i] + set aft [lreplace $aft $i $i] } lset rowidlist $row [concat $bef $pad $aft] changedrow $row @@ -5670,123 +5690,123 @@ proc optimize_rows {row col endrow} { global rowidlist rowisopt displayorder curview children if {$row < 1} { - set row 1 + set row 1 } for {} {$row < $endrow} {incr row; set col 0} { - if {[lindex $rowisopt $row]} continue - set haspad 0 - set y0 [expr {$row - 1}] - set ym [expr {$row - 2}] - set idlist [lindex $rowidlist $row] - set previdlist [lindex $rowidlist $y0] - if {$idlist eq {} || $previdlist eq {}} continue - if {$ym >= 0} { - set pprevidlist [lindex $rowidlist $ym] - if {$pprevidlist eq {}} continue - } else { - set pprevidlist {} - } - set x0 -1 - set xm -1 - for {} {$col < [llength $idlist]} {incr col} { - set id [lindex $idlist $col] - if {[lindex $previdlist $col] eq $id} continue - if {$id eq {}} { - set haspad 1 - continue - } - set x0 [lsearch -exact $previdlist $id] - if {$x0 < 0} continue - set z [expr {$x0 - $col}] - set isarrow 0 - set z0 {} - if {$ym >= 0} { - set xm [lsearch -exact $pprevidlist $id] - if {$xm >= 0} { - set z0 [expr {$xm - $x0}] - } - } - if {$z0 eq {}} { - # if row y0 is the first child of $id then it's not an arrow - if {[lindex $children($curview,$id) 0] ne - [lindex $displayorder $y0]} { - set isarrow 1 - } - } - if {!$isarrow && $id ne [lindex $displayorder $row] && - [lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} { - set isarrow 1 - } - # Looking at lines from this row to the previous row, - # make them go straight up if they end in an arrow on - # the previous row; otherwise make them go straight up - # or at 45 degrees. - if {$z < -1 || ($z < 0 && $isarrow)} { - # Line currently goes left too much; - # insert pads in the previous row, then optimize it - set npad [expr {-1 - $z + $isarrow}] - insert_pad $y0 $x0 $npad - if {$y0 > 0} { - optimize_rows $y0 $x0 $row - } - set previdlist [lindex $rowidlist $y0] - set x0 [lsearch -exact $previdlist $id] - set z [expr {$x0 - $col}] - if {$z0 ne {}} { - set pprevidlist [lindex $rowidlist $ym] - set xm [lsearch -exact $pprevidlist $id] - set z0 [expr {$xm - $x0}] - } - } elseif {$z > 1 || ($z > 0 && $isarrow)} { - # Line currently goes right too much; - # insert pads in this line - set npad [expr {$z - 1 + $isarrow}] - insert_pad $row $col $npad - set idlist [lindex $rowidlist $row] - incr col $npad - set z [expr {$x0 - $col}] - set haspad 1 - } - if {$z0 eq {} && !$isarrow && $ym >= 0} { - # this line links to its first child on row $row-2 - set id [lindex $displayorder $ym] - set xc [lsearch -exact $pprevidlist $id] - if {$xc >= 0} { - set z0 [expr {$xc - $x0}] - } - } - # avoid lines jigging left then immediately right - if {$z0 ne {} && $z < 0 && $z0 > 0} { - insert_pad $y0 $x0 1 - incr x0 - optimize_rows $y0 $x0 $row - set previdlist [lindex $rowidlist $y0] - } - } - if {!$haspad} { - # Find the first column that doesn't have a line going right - for {set col [llength $idlist]} {[incr col -1] >= 0} {} { - set id [lindex $idlist $col] - if {$id eq {}} break - set x0 [lsearch -exact $previdlist $id] - if {$x0 < 0} { - # check if this is the link to the first child - set kid [lindex $displayorder $y0] - if {[lindex $children($curview,$id) 0] eq $kid} { - # it is, work out offset to child - set x0 [lsearch -exact $previdlist $kid] - } - } - if {$x0 <= $col} break - } - # Insert a pad at that column as long as it has a line and - # isn't the last column - if {$x0 >= 0 && [incr col] < [llength $idlist]} { - set idlist [linsert $idlist $col {}] - lset rowidlist $row $idlist - changedrow $row - } - } + if {[lindex $rowisopt $row]} continue + set haspad 0 + set y0 [expr {$row - 1}] + set ym [expr {$row - 2}] + set idlist [lindex $rowidlist $row] + set previdlist [lindex $rowidlist $y0] + if {$idlist eq {} || $previdlist eq {}} continue + if {$ym >= 0} { + set pprevidlist [lindex $rowidlist $ym] + if {$pprevidlist eq {}} continue + } else { + set pprevidlist {} + } + set x0 -1 + set xm -1 + for {} {$col < [llength $idlist]} {incr col} { + set id [lindex $idlist $col] + if {[lindex $previdlist $col] eq $id} continue + if {$id eq {}} { + set haspad 1 + continue + } + set x0 [lsearch -exact $previdlist $id] + if {$x0 < 0} continue + set z [expr {$x0 - $col}] + set isarrow 0 + set z0 {} + if {$ym >= 0} { + set xm [lsearch -exact $pprevidlist $id] + if {$xm >= 0} { + set z0 [expr {$xm - $x0}] + } + } + if {$z0 eq {}} { + # if row y0 is the first child of $id then it's not an arrow + if {[lindex $children($curview,$id) 0] ne + [lindex $displayorder $y0]} { + set isarrow 1 + } + } + if {!$isarrow && $id ne [lindex $displayorder $row] && + [lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} { + set isarrow 1 + } + # Looking at lines from this row to the previous row, + # make them go straight up if they end in an arrow on + # the previous row; otherwise make them go straight up + # or at 45 degrees. + if {$z < -1 || ($z < 0 && $isarrow)} { + # Line currently goes left too much; + # insert pads in the previous row, then optimize it + set npad [expr {-1 - $z + $isarrow}] + insert_pad $y0 $x0 $npad + if {$y0 > 0} { + optimize_rows $y0 $x0 $row + } + set previdlist [lindex $rowidlist $y0] + set x0 [lsearch -exact $previdlist $id] + set z [expr {$x0 - $col}] + if {$z0 ne {}} { + set pprevidlist [lindex $rowidlist $ym] + set xm [lsearch -exact $pprevidlist $id] + set z0 [expr {$xm - $x0}] + } + } elseif {$z > 1 || ($z > 0 && $isarrow)} { + # Line currently goes right too much; + # insert pads in this line + set npad [expr {$z - 1 + $isarrow}] + insert_pad $row $col $npad + set idlist [lindex $rowidlist $row] + incr col $npad + set z [expr {$x0 - $col}] + set haspad 1 + } + if {$z0 eq {} && !$isarrow && $ym >= 0} { + # this line links to its first child on row $row-2 + set id [lindex $displayorder $ym] + set xc [lsearch -exact $pprevidlist $id] + if {$xc >= 0} { + set z0 [expr {$xc - $x0}] + } + } + # avoid lines jigging left then immediately right + if {$z0 ne {} && $z < 0 && $z0 > 0} { + insert_pad $y0 $x0 1 + incr x0 + optimize_rows $y0 $x0 $row + set previdlist [lindex $rowidlist $y0] + } + } + if {!$haspad} { + # Find the first column that doesn't have a line going right + for {set col [llength $idlist]} {[incr col -1] >= 0} {} { + set id [lindex $idlist $col] + if {$id eq {}} break + set x0 [lsearch -exact $previdlist $id] + if {$x0 < 0} { + # check if this is the link to the first child + set kid [lindex $displayorder $y0] + if {[lindex $children($curview,$id) 0] eq $kid} { + # it is, work out offset to child + set x0 [lsearch -exact $previdlist $kid] + } + } + if {$x0 <= $col} break + } + # Insert a pad at that column as long as it has a line and + # isn't the last column + if {$x0 >= 0 && [incr col] < [llength $idlist]} { + set idlist [linsert $idlist $col {}] + lset rowidlist $row $idlist + changedrow $row + } + } } } @@ -5805,7 +5825,7 @@ proc linewidth {id} { set wid $lthickness if {[info exists thickerline] && $id eq $thickerline} { - set wid [expr {2 * $lthickness}] + set wid [expr {2 * $lthickness}] } return $wid } @@ -5816,52 +5836,52 @@ proc rowranges {id} { set kids $children($curview,$id) if {$kids eq {}} { - return {} + return {} } set ret {} lappend kids $id foreach child $kids { - if {![commitinview $child $curview]} break - set row [rowofcommit $child] - if {![info exists prev]} { - lappend ret [expr {$row + 1}] - } else { - if {$row <= $prevrow} { - puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow" - } - # see if the line extends the whole way from prevrow to row - if {$row > $prevrow + $uparrowlen + $downarrowlen && - [lsearch -exact [lindex $rowidlist \ - [expr {int(($row + $prevrow) / 2)}]] $id] < 0} { - # it doesn't, see where it ends - set r [expr {$prevrow + $downarrowlen}] - if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} { - while {[incr r -1] > $prevrow && - [lsearch -exact [lindex $rowidlist $r] $id] < 0} {} - } else { - while {[incr r] <= $row && - [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {} - incr r -1 - } - lappend ret $r - # see where it starts up again - set r [expr {$row - $uparrowlen}] - if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} { - while {[incr r] < $row && - [lsearch -exact [lindex $rowidlist $r] $id] < 0} {} - } else { - while {[incr r -1] >= $prevrow && - [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {} - incr r - } - lappend ret $r - } - } - if {$child eq $id} { - lappend ret $row - } - set prev $child - set prevrow $row + if {![commitinview $child $curview]} break + set row [rowofcommit $child] + if {![info exists prev]} { + lappend ret [expr {$row + 1}] + } else { + if {$row <= $prevrow} { + puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow" + } + # see if the line extends the whole way from prevrow to row + if {$row > $prevrow + $uparrowlen + $downarrowlen && + [lsearch -exact [lindex $rowidlist \ + [expr {int(($row + $prevrow) / 2)}]] $id] < 0} { + # it doesn't, see where it ends + set r [expr {$prevrow + $downarrowlen}] + if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} { + while {[incr r -1] > $prevrow && + [lsearch -exact [lindex $rowidlist $r] $id] < 0} {} + } else { + while {[incr r] <= $row && + [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {} + incr r -1 + } + lappend ret $r + # see where it starts up again + set r [expr {$row - $uparrowlen}] + if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} { + while {[incr r] < $row && + [lsearch -exact [lindex $rowidlist $r] $id] < 0} {} + } else { + while {[incr r -1] >= $prevrow && + [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {} + incr r + } + lappend ret $r + } + } + if {$child eq $id} { + lappend ret $row + } + set prev $child + set prevrow $row } return $ret } @@ -5874,158 +5894,158 @@ proc drawlineseg {id row endrow arrowlow} { set le [expr {$row + 1}] set arrowhigh 1 while {1} { - set c [lsearch -exact [lindex $rowidlist $le] $id] - if {$c < 0} { - incr le -1 - break - } - lappend cols $c - set x [lindex $displayorder $le] - if {$x eq $id} { - set arrowhigh 0 - break - } - if {[info exists iddrawn($x)] || $le == $endrow} { - set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id] - if {$c >= 0} { - lappend cols $c - set arrowhigh 0 - } - break - } - incr le + set c [lsearch -exact [lindex $rowidlist $le] $id] + if {$c < 0} { + incr le -1 + break + } + lappend cols $c + set x [lindex $displayorder $le] + if {$x eq $id} { + set arrowhigh 0 + break + } + if {[info exists iddrawn($x)] || $le == $endrow} { + set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id] + if {$c >= 0} { + lappend cols $c + set arrowhigh 0 + } + break + } + incr le } if {$le <= $row} { - return $row + return $row } set lines {} set i 0 set joinhigh 0 if {[info exists linesegs($id)]} { - set lines $linesegs($id) - foreach li $lines { - set r0 [lindex $li 0] - if {$r0 > $row} { - if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} { - set joinhigh 1 - } - break - } - incr i - } + set lines $linesegs($id) + foreach li $lines { + set r0 [lindex $li 0] + if {$r0 > $row} { + if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} { + set joinhigh 1 + } + break + } + incr i + } } set joinlow 0 if {$i > 0} { - set li [lindex $lines [expr {$i-1}]] - set r1 [lindex $li 1] - if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} { - set joinlow 1 - } + set li [lindex $lines [expr {$i-1}]] + set r1 [lindex $li 1] + if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} { + set joinlow 1 + } } set x [lindex $cols [expr {$le - $row}]] set xp [lindex $cols [expr {$le - 1 - $row}]] set dir [expr {$xp - $x}] if {$joinhigh} { - set ith [lindex $lines $i 2] - set coords [$canv coords $ith] - set ah [$canv itemcget $ith -arrow] - set arrowhigh [expr {$ah eq "first" || $ah eq "both"}] - set x2 [lindex $cols [expr {$le + 1 - $row}]] - if {$x2 ne {} && $x - $x2 == $dir} { - set coords [lrange $coords 0 end-2] - } + set ith [lindex $lines $i 2] + set coords [$canv coords $ith] + set ah [$canv itemcget $ith -arrow] + set arrowhigh [expr {$ah eq "first" || $ah eq "both"}] + set x2 [lindex $cols [expr {$le + 1 - $row}]] + if {$x2 ne {} && $x - $x2 == $dir} { + set coords [lrange $coords 0 end-2] + } } else { - set coords [list [xc $le $x] [yc $le]] + set coords [list [xc $le $x] [yc $le]] } if {$joinlow} { - set itl [lindex $lines [expr {$i-1}] 2] - set al [$canv itemcget $itl -arrow] - set arrowlow [expr {$al eq "last" || $al eq "both"}] + set itl [lindex $lines [expr {$i-1}] 2] + set al [$canv itemcget $itl -arrow] + set arrowlow [expr {$al eq "last" || $al eq "both"}] } elseif {$arrowlow} { - if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 || - [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} { - set arrowlow 0 - } + if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 || + [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} { + set arrowlow 0 + } } set arrow [lindex {none first last both} [expr {$arrowhigh + 2*$arrowlow}]] for {set y $le} {[incr y -1] > $row} {} { - set x $xp - set xp [lindex $cols [expr {$y - 1 - $row}]] - set ndir [expr {$xp - $x}] - if {$dir != $ndir || $xp < 0} { - lappend coords [xc $y $x] [yc $y] - } - set dir $ndir + set x $xp + set xp [lindex $cols [expr {$y - 1 - $row}]] + set ndir [expr {$xp - $x}] + if {$dir != $ndir || $xp < 0} { + lappend coords [xc $y $x] [yc $y] + } + set dir $ndir } if {!$joinlow} { - if {$xp < 0} { - # join parent line to first child - set ch [lindex $displayorder $row] - set xc [lsearch -exact [lindex $rowidlist $row] $ch] - if {$xc < 0} { - puts "oops: drawlineseg: child $ch not on row $row" - } elseif {$xc != $x} { - if {($arrowhigh && $le == $row + 1) || $dir == 0} { - set d [expr {int(0.5 * $linespc)}] - set x1 [xc $row $x] - if {$xc < $x} { - set x2 [expr {$x1 - $d}] - } else { - set x2 [expr {$x1 + $d}] - } - set y2 [yc $row] - set y1 [expr {$y2 + $d}] - lappend coords $x1 $y1 $x2 $y2 - } elseif {$xc < $x - 1} { - lappend coords [xc $row [expr {$x-1}]] [yc $row] - } elseif {$xc > $x + 1} { - lappend coords [xc $row [expr {$x+1}]] [yc $row] - } - set x $xc - } - lappend coords [xc $row $x] [yc $row] - } else { - set xn [xc $row $xp] - set yn [yc $row] - lappend coords $xn $yn - } - if {!$joinhigh} { - assigncolor $id - set t [$canv create line $coords -width [linewidth $id] \ - -fill $colormap($id) -tags lines.$id -arrow $arrow] - $canv lower $t - bindline $t $id - set lines [linsert $lines $i [list $row $le $t]] - } else { - $canv coords $ith $coords - if {$arrow ne $ah} { - $canv itemconf $ith -arrow $arrow - } - lset lines $i 0 $row - } + if {$xp < 0} { + # join parent line to first child + set ch [lindex $displayorder $row] + set xc [lsearch -exact [lindex $rowidlist $row] $ch] + if {$xc < 0} { + puts "oops: drawlineseg: child $ch not on row $row" + } elseif {$xc != $x} { + if {($arrowhigh && $le == $row + 1) || $dir == 0} { + set d [expr {int(0.5 * $linespc)}] + set x1 [xc $row $x] + if {$xc < $x} { + set x2 [expr {$x1 - $d}] + } else { + set x2 [expr {$x1 + $d}] + } + set y2 [yc $row] + set y1 [expr {$y2 + $d}] + lappend coords $x1 $y1 $x2 $y2 + } elseif {$xc < $x - 1} { + lappend coords [xc $row [expr {$x-1}]] [yc $row] + } elseif {$xc > $x + 1} { + lappend coords [xc $row [expr {$x+1}]] [yc $row] + } + set x $xc + } + lappend coords [xc $row $x] [yc $row] + } else { + set xn [xc $row $xp] + set yn [yc $row] + lappend coords $xn $yn + } + if {!$joinhigh} { + assigncolor $id + set t [$canv create line $coords -width [linewidth $id] \ + -fill $colormap($id) -tags lines.$id -arrow $arrow] + $canv lower $t + bindline $t $id + set lines [linsert $lines $i [list $row $le $t]] + } else { + $canv coords $ith $coords + if {$arrow ne $ah} { + $canv itemconf $ith -arrow $arrow + } + lset lines $i 0 $row + } } else { - set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id] - set ndir [expr {$xo - $xp}] - set clow [$canv coords $itl] - if {$dir == $ndir} { - set clow [lrange $clow 2 end] - } - set coords [concat $coords $clow] - if {!$joinhigh} { - lset lines [expr {$i-1}] 1 $le - } else { - # coalesce two pieces - $canv delete $ith - set b [lindex $lines [expr {$i-1}] 0] - set e [lindex $lines $i 1] - set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]] - } - $canv coords $itl $coords - if {$arrow ne $al} { - $canv itemconf $itl -arrow $arrow - } + set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id] + set ndir [expr {$xo - $xp}] + set clow [$canv coords $itl] + if {$dir == $ndir} { + set clow [lrange $clow 2 end] + } + set coords [concat $coords $clow] + if {!$joinhigh} { + lset lines [expr {$i-1}] 1 $le + } else { + # coalesce two pieces + $canv delete $ith + set b [lindex $lines [expr {$i-1}] 0] + set e [lindex $lines $i 1] + set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]] + } + $canv coords $itl $coords + if {$arrow ne $al} { + $canv itemconf $itl -arrow $arrow + } } set linesegs($id) $lines @@ -6050,54 +6070,54 @@ proc drawparentlinks {id row} { # rmx = right-most X coord used set rmx 0 foreach p $olds { - set i [lsearch -exact $ids $p] - if {$i < 0} { - puts "oops, parent $p of $id not in list" - continue - } - set x2 [xc $row2 $i] - if {$x2 > $rmx} { - set rmx $x2 - } - set j [lsearch -exact $rowids $p] - if {$j < 0} { - # drawlineseg will do this one for us - continue - } - assigncolor $p - # should handle duplicated parents here... - set coords [list $x $y] - if {$i != $col} { - # if attaching to a vertical segment, draw a smaller - # slant for visual distinctness - if {$i == $j} { - if {$i < $col} { - lappend coords [expr {$x2 + $d}] $y $x2 $ymid - } else { - lappend coords [expr {$x2 - $d}] $y $x2 $ymid - } - } elseif {$i < $col && $i < $j} { - # segment slants towards us already - lappend coords [xc $row $j] $y - } else { - if {$i < $col - 1} { - lappend coords [expr {$x2 + $linespc}] $y - } elseif {$i > $col + 1} { - lappend coords [expr {$x2 - $linespc}] $y - } - lappend coords $x2 $y2 - } - } else { - lappend coords $x2 $y2 - } - set t [$canv create line $coords -width [linewidth $p] \ - -fill $colormap($p) -tags lines.$p] - $canv lower $t - bindline $t $p + set i [lsearch -exact $ids $p] + if {$i < 0} { + puts "oops, parent $p of $id not in list" + continue + } + set x2 [xc $row2 $i] + if {$x2 > $rmx} { + set rmx $x2 + } + set j [lsearch -exact $rowids $p] + if {$j < 0} { + # drawlineseg will do this one for us + continue + } + assigncolor $p + # should handle duplicated parents here... + set coords [list $x $y] + if {$i != $col} { + # if attaching to a vertical segment, draw a smaller + # slant for visual distinctness + if {$i == $j} { + if {$i < $col} { + lappend coords [expr {$x2 + $d}] $y $x2 $ymid + } else { + lappend coords [expr {$x2 - $d}] $y $x2 $ymid + } + } elseif {$i < $col && $i < $j} { + # segment slants towards us already + lappend coords [xc $row $j] $y + } else { + if {$i < $col - 1} { + lappend coords [expr {$x2 + $linespc}] $y + } elseif {$i > $col + 1} { + lappend coords [expr {$x2 - $linespc}] $y + } + lappend coords $x2 $y2 + } + } else { + lappend coords $x2 $y2 + } + set t [$canv create line $coords -width [linewidth $p] \ + -fill $colormap($p) -tags lines.$p] + $canv lower $t + bindline $t $p } if {$rmx > [lindex $idpos($id) 1]} { - lset idpos($id) 1 $rmx - redrawtags $id + lset idpos($id) 1 $rmx + redrawtags $id } } @@ -6120,35 +6140,35 @@ proc drawcmittext {id row col} { # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right set listed $cmitlisted($curview,$id) if {$id eq $nullid} { - set ofill $workingfilescirclecolor + set ofill $workingfilescirclecolor } elseif {$id eq $nullid2} { - set ofill $indexcirclecolor + set ofill $indexcirclecolor } elseif {$id eq $mainheadid} { - set ofill $mainheadcirclecolor + set ofill $mainheadcirclecolor } else { - set ofill [lindex $circlecolors $listed] + set ofill [lindex $circlecolors $listed] } set x [xc $row $col] set y [yc $row] set orad [expr {$linespc / 3}] if {$listed <= 2} { - set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \ - [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \ - -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle] + set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \ + [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \ + -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle] } elseif {$listed == 3} { - # triangle pointing left for left-side commits - set t [$canv create polygon \ - [expr {$x - $orad}] $y \ - [expr {$x + $orad - 1}] [expr {$y - $orad}] \ - [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \ - -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle] + # triangle pointing left for left-side commits + set t [$canv create polygon \ + [expr {$x - $orad}] $y \ + [expr {$x + $orad - 1}] [expr {$y - $orad}] \ + [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \ + -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle] } else { - # triangle pointing right for right-side commits - set t [$canv create polygon \ - [expr {$x + $orad - 1}] $y \ - [expr {$x - $orad}] [expr {$y - $orad}] \ - [expr {$x - $orad}] [expr {$y + $orad - 1}] \ - -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle] + # triangle pointing right for right-side commits + set t [$canv create polygon \ + [expr {$x + $orad - 1}] $y \ + [expr {$x - $orad}] [expr {$y - $orad}] \ + [expr {$x - $orad}] [expr {$y + $orad - 1}] \ + -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle] } set circleitem($row) $t $canv raise $t @@ -6156,23 +6176,23 @@ proc drawcmittext {id row col} { set rmx [llength [lindex $rowidlist $row]] set olds [lindex $parentlist $row] if {$olds ne {}} { - set nextids [lindex $rowidlist [expr {$row + 1}]] - foreach p $olds { - set i [lsearch -exact $nextids $p] - if {$i > $rmx} { - set rmx $i - } - } + set nextids [lindex $rowidlist [expr {$row + 1}]] + foreach p $olds { + set i [lsearch -exact $nextids $p] + if {$i > $rmx} { + set rmx $i + } + } } set xt [xc $row $rmx] set rowtextx($row) $xt set idpos($id) [list $x $xt $y] if {[info exists idtags($id)] || [info exists idheads($id)] - || [info exists idotherrefs($id)]} { - set xt [drawtags $id $x $xt $y] + || [info exists idotherrefs($id)]} { + set xt [drawtags $id $x $xt $y] } if {[lindex $commitinfo($id) 6] > 0} { - set xt [drawnotesign $xt $y] + set xt [drawnotesign $xt $y] } set headline [lindex $commitinfo($id) 0] set name [lindex $commitinfo($id) 1] @@ -6182,30 +6202,30 @@ proc drawcmittext {id row col} { set nfont mainfont set isbold [ishighlighted $id] if {$isbold > 0} { - lappend boldids $id - set font mainfontbold - if {$isbold > 1} { - lappend boldnameids $id - set nfont mainfontbold - } + lappend boldids $id + set font mainfontbold + if {$isbold > 1} { + lappend boldnameids $id + set nfont mainfontbold + } } set linehtag($id) [$canv create text $xt $y -anchor w -fill $fgcolor \ - -text $headline -font $font -tags text] + -text $headline -font $font -tags text] $canv bind $linehtag($id) $ctxbut "rowmenu %X %Y $id" set linentag($id) [$canv2 create text 3 $y -anchor w -fill $fgcolor \ - -text $name -font $nfont -tags text] + -text $name -font $nfont -tags text] set linedtag($id) [$canv3 create text 3 $y -anchor w -fill $fgcolor \ - -text $date -font mainfont -tags text] + -text $date -font mainfont -tags text] if {$selectedline == $row} { - make_secsel $id + make_secsel $id } if {[info exists markedid] && $markedid eq $id} { - make_idmark $id + make_idmark $id } set xr [expr {$xt + [font measure $font $headline]}] if {$xr > $canvxmax} { - set canvxmax $xr - setcanvscroll + set canvxmax $xr + setcanvscroll } } @@ -6221,33 +6241,33 @@ proc drawcmitrow {row} { set id [lindex $displayorder $row] if {[info exists hlview] && ![info exists vhighlights($id)]} { - askvhighlight $row $id + askvhighlight $row $id } if {[info exists filehighlight] && ![info exists fhighlights($id)]} { - askfilehighlight $row $id + askfilehighlight $row $id } if {$findpattern ne {} && ![info exists nhighlights($id)]} { - askfindhighlight $row $id + askfindhighlight $row $id } if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} { - askrelhighlight $row $id + askrelhighlight $row $id } if {![info exists iddrawn($id)]} { - set col [lsearch -exact [lindex $rowidlist $row] $id] - if {$col < 0} { - puts "oops, row $row id $id not in list" - return - } - if {![info exists commitinfo($id)]} { - getcommit $id - } - assigncolor $id - drawcmittext $id $row $col - set iddrawn($id) 1 - incr nrows_drawn + set col [lsearch -exact [lindex $rowidlist $row] $id] + if {$col < 0} { + puts "oops, row $row id $id not in list" + return + } + if {![info exists commitinfo($id)]} { + getcommit $id + } + assigncolor $id + drawcmittext $id $row $col + set iddrawn($id) 1 + incr nrows_drawn } if {$markingmatches} { - markrowmatches $row $id + markrowmatches $row $id } } @@ -6256,78 +6276,78 @@ proc drawcommits {row {endrow {}}} { global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn if {$row < 0} { - set row 0 + set row 0 } if {$endrow eq {}} { - set endrow $row + set endrow $row } if {$endrow >= $numcommits} { - set endrow [expr {$numcommits - 1}] + set endrow [expr {$numcommits - 1}] } set rl1 [expr {$row - $downarrowlen - 3}] if {$rl1 < 0} { - set rl1 0 + set rl1 0 } set ro1 [expr {$row - 3}] if {$ro1 < 0} { - set ro1 0 + set ro1 0 } set r2 [expr {$endrow + $uparrowlen + 3}] if {$r2 > $numcommits} { - set r2 $numcommits + set r2 $numcommits } for {set r $rl1} {$r < $r2} {incr r} { - if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} { - if {$rl1 < $r} { - layoutrows $rl1 $r - } - set rl1 [expr {$r + 1}] - } + if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} { + if {$rl1 < $r} { + layoutrows $rl1 $r + } + set rl1 [expr {$r + 1}] + } } if {$rl1 < $r} { - layoutrows $rl1 $r + layoutrows $rl1 $r } optimize_rows $ro1 0 $r2 if {$need_redisplay || $nrows_drawn > 2000} { - clear_display + clear_display } # make the lines join to already-drawn rows either side set r [expr {$row - 1}] if {$r < 0 || ![info exists iddrawn([lindex $displayorder $r])]} { - set r $row + set r $row } set er [expr {$endrow + 1}] if {$er >= $numcommits || - ![info exists iddrawn([lindex $displayorder $er])]} { - set er $endrow + ![info exists iddrawn([lindex $displayorder $er])]} { + set er $endrow } for {} {$r <= $er} {incr r} { - set id [lindex $displayorder $r] - set wasdrawn [info exists iddrawn($id)] - drawcmitrow $r - if {$r == $er} break - set nextid [lindex $displayorder [expr {$r + 1}]] - if {$wasdrawn && [info exists iddrawn($nextid)]} continue - drawparentlinks $id $r - - set rowids [lindex $rowidlist $r] - foreach lid $rowids { - if {$lid eq {}} continue - if {[info exists lineend($lid)] && $lineend($lid) > $r} continue - if {$lid eq $id} { - # see if this is the first child of any of its parents - foreach p [lindex $parentlist $r] { - if {[lsearch -exact $rowids $p] < 0} { - # make this line extend up to the child - set lineend($p) [drawlineseg $p $r $er 0] - } - } - } else { - set lineend($lid) [drawlineseg $lid $r $er 1] - } - } + set id [lindex $displayorder $r] + set wasdrawn [info exists iddrawn($id)] + drawcmitrow $r + if {$r == $er} break + set nextid [lindex $displayorder [expr {$r + 1}]] + if {$wasdrawn && [info exists iddrawn($nextid)]} continue + drawparentlinks $id $r + + set rowids [lindex $rowidlist $r] + foreach lid $rowids { + if {$lid eq {}} continue + if {[info exists lineend($lid)] && $lineend($lid) > $r} continue + if {$lid eq $id} { + # see if this is the first child of any of its parents + foreach p [lindex $parentlist $r] { + if {[lsearch -exact $rowids $p] < 0} { + # make this line extend up to the child + set lineend($p) [drawlineseg $p $r $er 0] + } + } + } else { + set lineend($lid) [drawlineseg $lid $r $er 1] + } + } } } @@ -6337,15 +6357,15 @@ proc undolayout {row} { set r [expr {$row - ($uparrowlen + $mingaplen + $downarrowlen)}] if {$r < 0} { - set r 0 + set r 0 } if {[llength $rowidlist] > $r} { - incr r -1 - set rowidlist [lrange $rowidlist 0 $r] - set rowfinal [lrange $rowfinal 0 $r] - set rowisopt [lrange $rowisopt 0 $r] - set need_redisplay 1 - run drawvisible + incr r -1 + set rowidlist [lrange $rowidlist 0 $r] + set rowfinal [lrange $rowfinal 0 $r] + set rowisopt [lrange $rowisopt 0 $r] + set need_redisplay 1 + run drawvisible } } @@ -6362,44 +6382,44 @@ proc drawvisible {} { set y1 [expr {int($f1 * $ymax)}] if {[info exists targetid]} { - if {[commitinview $targetid $curview]} { - set r [rowofcommit $targetid] - if {$r != $targetrow} { - # Fix up the scrollregion and change the scrolling position - # now that our target row has moved. - set diff [expr {($r - $targetrow) * $linespc}] - set targetrow $r - setcanvscroll - set ymax [lindex [$canv cget -scrollregion] 3] - incr y0 $diff - incr y1 $diff - set f0 [expr {$y0 / $ymax}] - set f1 [expr {$y1 / $ymax}] - allcanvs yview moveto $f0 - $cscroll set $f0 $f1 - set need_redisplay 1 - } - } else { - unset targetid - } + if {[commitinview $targetid $curview]} { + set r [rowofcommit $targetid] + if {$r != $targetrow} { + # Fix up the scrollregion and change the scrolling position + # now that our target row has moved. + set diff [expr {($r - $targetrow) * $linespc}] + set targetrow $r + setcanvscroll + set ymax [lindex [$canv cget -scrollregion] 3] + incr y0 $diff + incr y1 $diff + set f0 [expr {$y0 / $ymax}] + set f1 [expr {$y1 / $ymax}] + allcanvs yview moveto $f0 + $cscroll set $f0 $f1 + set need_redisplay 1 + } + } else { + unset targetid + } } set row [expr {int(($y0 - 3) / $linespc) - 1}] set endrow [expr {int(($y1 - 3) / $linespc) + 1}] if {$endrow >= $vrowmod($curview)} { - update_arcrows $curview + update_arcrows $curview } if {$selectedline ne {} && - $row <= $selectedline && $selectedline <= $endrow} { - set targetrow $selectedline + $row <= $selectedline && $selectedline <= $endrow} { + set targetrow $selectedline } elseif {[info exists targetid]} { - set targetrow [expr {int(($row + $endrow) / 2)}] + set targetrow [expr {int(($row + $endrow) / 2)}] } if {[info exists targetrow]} { - if {$targetrow >= $numcommits} { - set targetrow [expr {$numcommits - 1}] - } - set targetid [commitonrow $targetrow] + if {$targetrow >= $numcommits} { + set targetrow [expr {$numcommits - 1}] + } + set targetid [commitonrow $targetrow] } drawcommits $row $endrow } @@ -6431,31 +6451,31 @@ proc findcrossings {id} { set cross {} set ccross {} foreach {s e} [rowranges $id] { - if {$e >= $numcommits} { - set e [expr {$numcommits - 1}] - } - if {$e <= $s} continue - for {set row $e} {[incr row -1] >= $s} {} { - set x [lsearch -exact [lindex $rowidlist $row] $id] - if {$x < 0} break - set olds [lindex $parentlist $row] - set kid [lindex $displayorder $row] - set kidx [lsearch -exact [lindex $rowidlist $row] $kid] - if {$kidx < 0} continue - set nextrow [lindex $rowidlist [expr {$row + 1}]] - foreach p $olds { - set px [lsearch -exact $nextrow $p] - if {$px < 0} continue - if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} { - if {[lsearch -exact $ccross $p] >= 0} continue - if {$x == $px + ($kidx < $px? -1: 1)} { - lappend ccross $p - } elseif {[lsearch -exact $cross $p] < 0} { - lappend cross $p - } - } - } - } + if {$e >= $numcommits} { + set e [expr {$numcommits - 1}] + } + if {$e <= $s} continue + for {set row $e} {[incr row -1] >= $s} {} { + set x [lsearch -exact [lindex $rowidlist $row] $id] + if {$x < 0} break + set olds [lindex $parentlist $row] + set kid [lindex $displayorder $row] + set kidx [lsearch -exact [lindex $rowidlist $row] $kid] + if {$kidx < 0} continue + set nextrow [lindex $rowidlist [expr {$row + 1}]] + foreach p $olds { + set px [lsearch -exact $nextrow $p] + if {$px < 0} continue + if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} { + if {[lsearch -exact $ccross $p] >= 0} continue + if {$x == $px + ($kidx < $px? -1: 1)} { + lappend ccross $p + } elseif {[lsearch -exact $cross $p] < 0} { + lappend cross $p + } + } + } + } } return [concat $ccross {{}} $cross] } @@ -6467,58 +6487,58 @@ proc assigncolor {id} { if {[info exists colormap($id)]} return set ncolors [llength $colors] if {[info exists children($curview,$id)]} { - set kids $children($curview,$id) + set kids $children($curview,$id) } else { - set kids {} + set kids {} } if {[llength $kids] == 1} { - set child [lindex $kids 0] - if {[info exists colormap($child)] - && [llength $parents($curview,$child)] == 1} { - set colormap($id) $colormap($child) - return - } + set child [lindex $kids 0] + if {[info exists colormap($child)] + && [llength $parents($curview,$child)] == 1} { + set colormap($id) $colormap($child) + return + } } set badcolors {} set origbad {} foreach x [findcrossings $id] { - if {$x eq {}} { - # delimiter between corner crossings and other crossings - if {[llength $badcolors] >= $ncolors - 1} break - set origbad $badcolors - } - if {[info exists colormap($x)] - && [lsearch -exact $badcolors $colormap($x)] < 0} { - lappend badcolors $colormap($x) - } + if {$x eq {}} { + # delimiter between corner crossings and other crossings + if {[llength $badcolors] >= $ncolors - 1} break + set origbad $badcolors + } + if {[info exists colormap($x)] + && [lsearch -exact $badcolors $colormap($x)] < 0} { + lappend badcolors $colormap($x) + } } if {[llength $badcolors] >= $ncolors} { - set badcolors $origbad + set badcolors $origbad } set origbad $badcolors if {[llength $badcolors] < $ncolors - 1} { - foreach child $kids { - if {[info exists colormap($child)] - && [lsearch -exact $badcolors $colormap($child)] < 0} { - lappend badcolors $colormap($child) - } - foreach p $parents($curview,$child) { - if {[info exists colormap($p)] - && [lsearch -exact $badcolors $colormap($p)] < 0} { - lappend badcolors $colormap($p) - } - } - } - if {[llength $badcolors] >= $ncolors} { - set badcolors $origbad - } + foreach child $kids { + if {[info exists colormap($child)] + && [lsearch -exact $badcolors $colormap($child)] < 0} { + lappend badcolors $colormap($child) + } + foreach p $parents($curview,$child) { + if {[info exists colormap($p)] + && [lsearch -exact $badcolors $colormap($p)] < 0} { + lappend badcolors $colormap($p) + } + } + } + if {[llength $badcolors] >= $ncolors} { + set badcolors $origbad + } } for {set i 0} {$i <= $ncolors} {incr i} { - set c [lindex $colors $nextcolor] - if {[incr nextcolor] >= $ncolors} { - set nextcolor 0 - } - if {[lsearch -exact $badcolors $c]} break + set c [lindex $colors $nextcolor] + if {[incr nextcolor] >= $ncolors} { + set nextcolor 0 + } + if {[lsearch -exact $badcolors $c]} break } set colormap($id) $c } @@ -6536,9 +6556,9 @@ proc graph_pane_width {} { global use_ttk if {$use_ttk} { - set g [.tf.histframe.pwclist sashpos 0] + set g [.tf.histframe.pwclist sashpos 0] } else { - set g [.tf.histframe.pwclist sash coord 0] + set g [.tf.histframe.pwclist sash coord 0] } return [lindex $g 0] } @@ -6546,7 +6566,7 @@ proc graph_pane_width {} { proc totalwidth {l font extra} { set tot 0 foreach str $l { - set tot [expr {$tot + [font measure $font $str] + $extra}] + set tot [expr {$tot + [font measure $font $str] + $extra}] } return $tot } @@ -6570,29 +6590,29 @@ proc drawtags {id x xt y1} { set extra [expr {$delta + $lthickness + $linespc}] if {[info exists idtags($id)]} { - set marks $idtags($id) - set ntags [llength $marks] - if {$ntags > $maxtags || - [totalwidth $marks mainfont $extra] > $maxwidth} { - # show just a single "n tags..." tag - set singletag 1 - if {$ntags == 1} { - set marks [list "tag..."] - } else { - set marks [list [format "%d tags..." $ntags]] - } - set ntags 1 - } + set marks $idtags($id) + set ntags [llength $marks] + if {$ntags > $maxtags || + [totalwidth $marks mainfont $extra] > $maxwidth} { + # show just a single "n tags..." tag + set singletag 1 + if {$ntags == 1} { + set marks [list "tag..."] + } else { + set marks [list [format "%d tags..." $ntags]] + } + set ntags 1 + } } if {[info exists idheads($id)]} { - set marks [concat $marks $idheads($id)] - set nheads [llength $idheads($id)] + set marks [concat $marks $idheads($id)] + set nheads [llength $idheads($id)] } if {[info exists idotherrefs($id)]} { - set marks [concat $marks $idotherrefs($id)] + set marks [concat $marks $idotherrefs($id)] } if {$marks eq {}} { - return $xt + return $xt } set yt [expr {$y1 - 0.5 * $linespc}] @@ -6601,66 +6621,66 @@ proc drawtags {id x xt y1} { set wvals {} set i -1 foreach tag $marks { - incr i - if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} { - set wid [font measure mainfontbold $tag] - } else { - set wid [font measure mainfont $tag] - } - lappend xvals $xt - lappend wvals $wid - set xt [expr {$xt + $wid + $extra}] + incr i + if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} { + set wid [font measure mainfontbold $tag] + } else { + set wid [font measure mainfont $tag] + } + lappend xvals $xt + lappend wvals $wid + set xt [expr {$xt + $wid + $extra}] } set t [$canv create line $x $y1 [lindex $xvals end] $y1 \ - -width $lthickness -fill $reflinecolor -tags tag.$id] + -width $lthickness -fill $reflinecolor -tags tag.$id] $canv lower $t foreach tag $marks x $xvals wid $wvals { - set tag_quoted [string map {% %%} $tag] - set xl [expr {$x + $delta}] - set xr [expr {$x + $delta + $wid + $lthickness}] - set font mainfont - if {[incr ntags -1] >= 0} { - # draw a tag - set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \ - $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \ - -width 1 -outline $tagoutlinecolor -fill $tagbgcolor \ - -tags tag.$id] - if {$singletag} { - set tagclick [list showtags $id 1] - } else { - set tagclick [list showtag $tag_quoted 1] - } - $canv bind $t <1> $tagclick - set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}] - } else { - # draw a head or other ref - if {[incr nheads -1] >= 0} { - set col $headbgcolor - if {$tag eq $mainhead} { - set font mainfontbold - } - } else { - set col "#ddddff" - } - set xl [expr {$xl - $delta/2}] - $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \ - -width 1 -outline black -fill $col -tags tag.$id - if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} { - set rwid [font measure mainfont $remoteprefix] - set xi [expr {$x + 1}] - set yti [expr {$yt + 1}] - set xri [expr {$x + $rwid}] - $canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \ - -width 0 -fill $remotebgcolor -tags tag.$id - } - } - set t [$canv create text $xl $y1 -anchor w -text $tag -fill $headfgcolor \ - -font $font -tags [list tag.$id text]] - if {$ntags >= 0} { - $canv bind $t <1> $tagclick - } elseif {$nheads >= 0} { - $canv bind $t $ctxbut [list headmenu %X %Y $id $tag_quoted] - } + set tag_quoted [string map {% %%} $tag] + set xl [expr {$x + $delta}] + set xr [expr {$x + $delta + $wid + $lthickness}] + set font mainfont + if {[incr ntags -1] >= 0} { + # draw a tag + set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \ + $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \ + -width 1 -outline $tagoutlinecolor -fill $tagbgcolor \ + -tags tag.$id] + if {$singletag} { + set tagclick [list showtags $id 1] + } else { + set tagclick [list showtag $tag_quoted 1] + } + $canv bind $t <1> $tagclick + set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}] + } else { + # draw a head or other ref + if {[incr nheads -1] >= 0} { + set col $headbgcolor + if {$tag eq $mainhead} { + set font mainfontbold + } + } else { + set col "#ddddff" + } + set xl [expr {$xl - $delta/2}] + $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \ + -width 1 -outline black -fill $col -tags tag.$id + if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} { + set rwid [font measure mainfont $remoteprefix] + set xi [expr {$x + 1}] + set yti [expr {$yt + 1}] + set xri [expr {$x + $rwid}] + $canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \ + -width 0 -fill $remotebgcolor -tags tag.$id + } + } + set t [$canv create text $xl $y1 -anchor w -text $tag -fill $headfgcolor \ + -font $font -tags [list tag.$id text]] + if {$ntags >= 0} { + $canv bind $t <1> $tagclick + } elseif {$nheads >= 0} { + $canv bind $t $ctxbut [list headmenu %X %Y $id $tag_quoted] + } } return $xt } @@ -6670,8 +6690,8 @@ proc drawnotesign {xt y} { set orad [expr {$linespc / 3}] set t [$canv create rectangle [expr {$xt - $orad}] [expr {$y - $orad}] \ - [expr {$xt + $orad - 1}] [expr {$y + $orad - 1}] \ - -fill yellow -outline $fgcolor -width 1 -tags circle] + [expr {$xt + $orad - 1}] [expr {$y + $orad - 1}] \ + -fill yellow -outline $fgcolor -width 1 -tags circle] set xt [expr {$xt + $orad * 3}] return $xt } @@ -6681,9 +6701,9 @@ proc xcoord {i level ln} { set x [expr {$canvx0 + $i * $xspc1($ln)}] if {$i > 0 && $i == $level} { - set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}] + set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}] } elseif {$i > $level} { - set x [expr {$x + $xspc2 - $xspc1($ln)}] + set x [expr {$x + $xspc2 - $xspc1($ln)}] } return $x } @@ -6694,7 +6714,7 @@ proc show_status {msg} { clear_display set_window_title $canv create text 3 3 -anchor nw -text $msg -font mainfont \ - -tags text -fill $fgcolor + -tags text -fill $fgcolor } # Don't change the text pane cursor if it is currently the hand cursor, @@ -6703,7 +6723,7 @@ proc settextcursor {c} { global ctext curtextcursor if {[$ctext cget -cursor] == $curtextcursor} { - $ctext config -cursor $c + $ctext config -cursor $c } set curtextcursor $c } @@ -6712,13 +6732,13 @@ proc nowbusy {what {name {}}} { global isbusy busyname statusw if {[array names isbusy] eq {}} { - . config -cursor watch - settextcursor watch + . config -cursor watch + settextcursor watch } set isbusy($what) 1 set busyname($what) $name if {$name ne {}} { - $statusw conf -text $name + $statusw conf -text $name } } @@ -6726,35 +6746,35 @@ proc notbusy {what} { global isbusy maincursor textcursor busyname statusw catch { - unset isbusy($what) - if {$busyname($what) ne {} && - [$statusw cget -text] eq $busyname($what)} { - $statusw conf -text {} - } + unset isbusy($what) + if {$busyname($what) ne {} && + [$statusw cget -text] eq $busyname($what)} { + $statusw conf -text {} + } } if {[array names isbusy] eq {}} { - . config -cursor $maincursor - settextcursor $textcursor + . config -cursor $maincursor + settextcursor $textcursor } } proc findmatches {f} { global findtype findstring if {$findtype == [mc "Regexp"]} { - set matches [regexp -indices -all -inline $findstring $f] + set matches [regexp -indices -all -inline $findstring $f] } else { - set fs $findstring - if {$findtype == [mc "IgnCase"]} { - set f [string tolower $f] - set fs [string tolower $fs] - } - set matches {} - set i 0 - set l [string length $fs] - while {[set j [string first $fs $f $i]] >= 0} { - lappend matches [list $j [expr {$j+$l-1}]] - set i [expr {$j + $l}] - } + set fs $findstring + if {$findtype == [mc "IgnCase"]} { + set f [string tolower $f] + set fs [string tolower $fs] + } + set matches {} + set i 0 + set l [string length $fs] + while {[set j [string first $fs $f $i]] >= 0} { + lappend matches [list $j [expr {$j+$l-1}]] + set i [expr {$j + $l}] + } } return $matches } @@ -6764,21 +6784,21 @@ proc dofind {{dirn 1} {wrap 1}} { global gdttype filehighlight fh_serial find_dirn findallowwrap if {[info exists find_dirn]} { - if {$find_dirn == $dirn} return - stopfinding + if {$find_dirn == $dirn} return + stopfinding } focus . if {$findstring eq {} || $numcommits == 0} return if {$selectedline eq {}} { - set findstartline [lindex [visiblerows] [expr {$dirn < 0}]] + set findstartline [lindex [visiblerows] [expr {$dirn < 0}]] } else { - set findstartline $selectedline + set findstartline $selectedline } set findcurline $findstartline nowbusy finding [mc "Searching"] if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} { - after cancel do_file_hl $fh_serial - do_file_hl $fh_serial + after cancel do_file_hl $fh_serial + do_file_hl $fh_serial } set find_dirn $dirn set findallowwrap $wrap @@ -6789,11 +6809,11 @@ proc stopfinding {} { global find_dirn findcurline fprogcoord if {[info exists find_dirn]} { - unset find_dirn - unset findcurline - notbusy finding - set fprogcoord 0 - adjustprogress + unset find_dirn + unset findcurline + notbusy finding + set fprogcoord 0 + adjustprogress } stopblaming } @@ -6805,41 +6825,41 @@ proc findmore {} { global curview varcorder vrownum varccommits vrowmod if {![info exists find_dirn]} { - return 0 + return 0 } set fldtypes [list [mc "Headline"] [mc "Author"] "" [mc "Committer"] "" [mc "Comments"]] set l $findcurline set moretodo 0 if {$find_dirn > 0} { - incr l - if {$l >= $numcommits} { - set l 0 - } - if {$l <= $findstartline} { - set lim [expr {$findstartline + 1}] - } else { - set lim $numcommits - set moretodo $findallowwrap - } + incr l + if {$l >= $numcommits} { + set l 0 + } + if {$l <= $findstartline} { + set lim [expr {$findstartline + 1}] + } else { + set lim $numcommits + set moretodo $findallowwrap + } } else { - if {$l == 0} { - set l $numcommits - } - incr l -1 - if {$l >= $findstartline} { - set lim [expr {$findstartline - 1}] - } else { - set lim -1 - set moretodo $findallowwrap - } + if {$l == 0} { + set l $numcommits + } + incr l -1 + if {$l >= $findstartline} { + set lim [expr {$findstartline - 1}] + } else { + set lim -1 + set moretodo $findallowwrap + } } set n [expr {($lim - $l) * $find_dirn}] if {$n > 500} { - set n 500 - set moretodo 1 + set n 500 + set moretodo 1 } if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} { - update_arcrows $curview + update_arcrows $curview } set found 0 set domore 1 @@ -6849,81 +6869,81 @@ proc findmore {} { set ids [lindex $varccommits($curview,$a)] set arowend [expr {$arow + [llength $ids]}] if {$gdttype eq [mc "containing:"]} { - for {} {$n > 0} {incr n -1; incr l $find_dirn} { - if {$l < $arow || $l >= $arowend} { - incr ai $find_dirn - set a [lindex $varcorder($curview) $ai] - set arow [lindex $vrownum($curview) $ai] - set ids [lindex $varccommits($curview,$a)] - set arowend [expr {$arow + [llength $ids]}] - } - set id [lindex $ids [expr {$l - $arow}]] - # shouldn't happen unless git log doesn't give all the commits... - if {![info exists commitdata($id)] || - ![doesmatch $commitdata($id)]} { - continue - } - if {![info exists commitinfo($id)]} { - getcommit $id - } - set info $commitinfo($id) - foreach f $info ty $fldtypes { - if {$ty eq ""} continue - if {($findloc eq [mc "All fields"] || $findloc eq $ty) && - [doesmatch $f]} { - set found 1 - break - } - } - if {$found} break - } + for {} {$n > 0} {incr n -1; incr l $find_dirn} { + if {$l < $arow || $l >= $arowend} { + incr ai $find_dirn + set a [lindex $varcorder($curview) $ai] + set arow [lindex $vrownum($curview) $ai] + set ids [lindex $varccommits($curview,$a)] + set arowend [expr {$arow + [llength $ids]}] + } + set id [lindex $ids [expr {$l - $arow}]] + # shouldn't happen unless git log doesn't give all the commits... + if {![info exists commitdata($id)] || + ![doesmatch $commitdata($id)]} { + continue + } + if {![info exists commitinfo($id)]} { + getcommit $id + } + set info $commitinfo($id) + foreach f $info ty $fldtypes { + if {$ty eq ""} continue + if {($findloc eq [mc "All fields"] || $findloc eq $ty) && + [doesmatch $f]} { + set found 1 + break + } + } + if {$found} break + } } else { - for {} {$n > 0} {incr n -1; incr l $find_dirn} { - if {$l < $arow || $l >= $arowend} { - incr ai $find_dirn - set a [lindex $varcorder($curview) $ai] - set arow [lindex $vrownum($curview) $ai] - set ids [lindex $varccommits($curview,$a)] - set arowend [expr {$arow + [llength $ids]}] - } - set id [lindex $ids [expr {$l - $arow}]] - if {![info exists fhighlights($id)]} { - # this sets fhighlights($id) to -1 - askfilehighlight $l $id - } - if {$fhighlights($id) > 0} { - set found $domore - break - } - if {$fhighlights($id) < 0} { - if {$domore} { - set domore 0 - set findcurline [expr {$l - $find_dirn}] - } - } - } + for {} {$n > 0} {incr n -1; incr l $find_dirn} { + if {$l < $arow || $l >= $arowend} { + incr ai $find_dirn + set a [lindex $varcorder($curview) $ai] + set arow [lindex $vrownum($curview) $ai] + set ids [lindex $varccommits($curview,$a)] + set arowend [expr {$arow + [llength $ids]}] + } + set id [lindex $ids [expr {$l - $arow}]] + if {![info exists fhighlights($id)]} { + # this sets fhighlights($id) to -1 + askfilehighlight $l $id + } + if {$fhighlights($id) > 0} { + set found $domore + break + } + if {$fhighlights($id) < 0} { + if {$domore} { + set domore 0 + set findcurline [expr {$l - $find_dirn}] + } + } + } } if {$found || ($domore && !$moretodo)} { - unset findcurline - unset find_dirn - notbusy finding - set fprogcoord 0 - adjustprogress - if {$found} { - findselectline $l - } else { - bell - } - return 0 + unset findcurline + unset find_dirn + notbusy finding + set fprogcoord 0 + adjustprogress + if {$found} { + findselectline $l + } else { + bell + } + return 0 } if {!$domore} { - flushhighlights + flushhighlights } else { - set findcurline [expr {$l - $find_dirn}] + set findcurline [expr {$l - $find_dirn}] } set n [expr {($findcurline - $findstartline) * $find_dirn - 1}] if {$n < 0} { - incr n $numcommits + incr n $numcommits } set fprogcoord [expr {$n * 1.0 / $numcommits}] adjustprogress @@ -6937,15 +6957,15 @@ proc findselectline {l} { set findcurline $l selectline $l 1 if {$markingmatches && - ($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} { - # highlight the matches in the comments - set f [$ctext get 1.0 $commentend] - set matches [findmatches $f] - foreach match $matches { - set start [lindex $match 0] - set end [expr {[lindex $match 1] + 1}] - $ctext tag add found "1.0 + $start c" "1.0 + $end c" - } + ($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} { + # highlight the matches in the comments + set f [$ctext get 1.0 $commentend] + set matches [findmatches $f] + foreach match $matches { + set start [lindex $match 0] + set end [expr {[lindex $match 1] + 1}] + $ctext tag add found "1.0 + $start c" "1.0 + $end c" + } } drawvisible } @@ -6959,18 +6979,18 @@ proc markmatches {canv l str tag matches font row} { set y0 [lindex $bbox 1] set y1 [lindex $bbox 3] foreach match $matches { - set start [lindex $match 0] - set end [lindex $match 1] - if {$start > $end} continue - set xoff [font measure $font [string range $str 0 [expr {$start-1}]]] - set xlen [font measure $font [string range $str 0 [expr {$end}]]] - set t [$canv create rect [expr {$x0+$xoff}] $y0 \ - [expr {$x0+$xlen+2}] $y1 \ - -outline {} -tags [list match$l matches] -fill yellow] - $canv lower $t - if {$row == $selectedline} { - $canv raise $t secsel - } + set start [lindex $match 0] + set end [lindex $match 1] + if {$start > $end} continue + set xoff [font measure $font [string range $str 0 [expr {$start-1}]]] + set xlen [font measure $font [string range $str 0 [expr {$end}]]] + set t [$canv create rect [expr {$x0+$xoff}] $y0 \ + [expr {$x0+$xlen+2}] $y1 \ + -outline {} -tags [list match$l matches] -fill yellow] + $canv lower $t + if {$row == $selectedline} { + $canv raise $t secsel + } } } @@ -6991,12 +7011,12 @@ proc selcanvline {w x y} { set y [expr {$y + $yfrac * $ymax}] set l [expr {int(($y - $canvy0) / $linespc + 0.5)}] if {$l < 0} { - set l 0 + set l 0 } if {$w eq $canv} { - set xmax [lindex [$canv cget -scrollregion] 2] - set xleft [expr {[lindex [$canv xview] 0] * $xmax}] - if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return + set xmax [lindex [$canv cget -scrollregion] 2] + set xleft [expr {[lindex [$canv xview] 0] * $xmax}] + if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return } unmarkmatches selectline $l 1 @@ -7005,17 +7025,18 @@ proc selcanvline {w x y} { proc commit_descriptor {p} { global commitinfo if {![info exists commitinfo($p)]} { - getcommit $p + getcommit $p } set l "..." if {[llength $commitinfo($p)] > 1} { - set l [lindex $commitinfo($p) 0] + set l [lindex $commitinfo($p) 0] } return "$p ($l)\n" } # 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 @@ -7023,14 +7044,26 @@ proc appendwithlinks {text tags} { $ctext insert end $text $tags set links [regexp -indices -all -inline {(?:\m|-g)[0-9a-f]{6,40}\M} $text] foreach l $links { - set s [lindex $l 0] - set e [lindex $l 1] - set linkid [string range $text $s $e] - incr e - $ctext tag delete link$linknum - $ctext tag add link$linknum "$start + $s c" "$start + $e c" - setlink $linkid link$linknum - incr linknum + set s [lindex $l 0] + set e [lindex $l 1] + set linkid [string range $text $s $e] + incr e + $ctext tag delete link$linknum + $ctext tag add link$linknum "$start + $s c" "$start + $e c" + 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 } } @@ -7044,26 +7077,38 @@ proc setlink {id lk} { set known 0 if {[string length $id] < 40} { - set matches [longid $id] - if {[llength $matches] > 0} { - if {[llength $matches] > 1} return - set known 1 - set id [lindex $matches 0] - } + set matches [longid $id] + if {[llength $matches] > 0} { + if {[llength $matches] > 1} return + set known 1 + set id [lindex $matches 0] + } } else { - set known [commitinview $id $curview] + set known [commitinview $id $curview] } if {$known} { - $ctext tag conf $lk -foreground $linkfgcolor -underline 1 - $ctext tag bind $lk <1> [list selbyid $id] - $ctext tag bind $lk <Enter> {linkcursor %W 1} - $ctext tag bind $lk <Leave> {linkcursor %W -1} + $ctext tag conf $lk -foreground $linkfgcolor -underline 1 + $ctext tag bind $lk <1> [list selbyid $id] + $ctext tag bind $lk <Enter> {linkcursor %W 1} + $ctext tag bind $lk <Leave> {linkcursor %W -1} } else { - lappend pendinglinks($id) $lk - interestedin $id {makelink %P} + lappend pendinglinks($id) $lk + interestedin $id {makelink %P} } } +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 @@ -7080,7 +7125,7 @@ proc makelink {id} { if {![info exists pendinglinks($id)]} return foreach lk $pendinglinks($id) { - setlink $id $lk + setlink $id $lk } unset pendinglinks($id) } @@ -7089,12 +7134,22 @@ proc linkcursor {w inc} { global linkentercount curtextcursor if {[incr linkentercount $inc] > 0} { - $w configure -cursor hand2 + $w configure -cursor hand2 } else { - $w configure -cursor $curtextcursor - if {$linkentercount < 0} { - set linkentercount 0 - } + $w configure -cursor $curtextcursor + if {$linkentercount < 0} { + set linkentercount 0 + } + } +} + +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" } } @@ -7107,9 +7162,9 @@ proc viewnextline {dir} { set wtop [expr {[lindex $wnow 0] * $ymax}] set newtop [expr {$wtop + $dir * $linespc}] if {$newtop < 0} { - set newtop 0 + set newtop 0 } elseif {$newtop > $ymax} { - set newtop $ymax + set newtop $ymax } allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}] } @@ -7120,15 +7175,15 @@ proc appendrefs {pos ids var} { global ctext linknum curview $var maxrefs visiblerefs mainheadid if {[catch {$ctext index $pos}]} { - return 0 + return 0 } $ctext conf -state normal $ctext delete $pos "$pos lineend" set tags {} foreach id $ids { - foreach tag [set $var\($id\)] { - lappend tags [list $tag $id] - } + foreach tag [set $var\($id\)] { + lappend tags [list $tag $id] + } } set sep {} @@ -7136,44 +7191,44 @@ proc appendrefs {pos ids var} { set nutags 0 if {[llength $tags] > $maxrefs} { - # If we are displaying heads, and there are too many, - # see if there are some important heads to display. - # Currently that are the current head and heads listed in $visiblerefs option - set itags {} - if {$var eq "idheads"} { - set utags {} - foreach ti $tags { - set hname [lindex $ti 0] - set id [lindex $ti 1] - if {([lsearch -exact $visiblerefs $hname] != -1 || $id eq $mainheadid) && - [llength $itags] < $maxrefs} { - lappend itags $ti - } else { - lappend utags $ti - } - } - set tags $utags - } - if {$itags ne {}} { - set str [mc "and many more"] - set sep " " - } else { - set str [mc "many"] - } - $ctext insert $pos "$str ([llength $tags])" - set nutags [llength $tags] - set tags $itags + # If we are displaying heads, and there are too many, + # see if there are some important heads to display. + # Currently that are the current head and heads listed in $visiblerefs option + set itags {} + if {$var eq "idheads"} { + set utags {} + foreach ti $tags { + set hname [lindex $ti 0] + set id [lindex $ti 1] + if {([lsearch -exact $visiblerefs $hname] != -1 || $id eq $mainheadid) && + [llength $itags] < $maxrefs} { + lappend itags $ti + } else { + lappend utags $ti + } + } + set tags $utags + } + if {$itags ne {}} { + set str [mc "and many more"] + set sep " " + } else { + set str [mc "many"] + } + $ctext insert $pos "$str ([llength $tags])" + set nutags [llength $tags] + set tags $itags } foreach ti $tags { - set id [lindex $ti 1] - set lk link$linknum - incr linknum - $ctext tag delete $lk - $ctext insert $pos $sep - $ctext insert $pos [lindex $ti 0] $lk - setlink $id $lk - set sep ", " + set id [lindex $ti 1] + set lk link$linknum + incr linknum + $ctext tag delete $lk + $ctext insert $pos $sep + $ctext insert $pos [lindex $ti 0] $lk + setlink $id $lk + set sep ", " } $ctext tag add wwrap "$pos linestart" "$pos lineend" $ctext conf -state disabled @@ -7187,11 +7242,11 @@ proc dispneartags {delay} { if {$selectedline eq {} || !$showneartags} return after cancel dispnexttag if {$delay} { - after 200 dispnexttag - set tagphase -1 + after 200 dispnexttag + set tagphase -1 } else { - after idle dispnexttag - set tagphase 0 + after idle dispnexttag + set tagphase 0 } } @@ -7200,33 +7255,33 @@ proc dispnexttag {} { if {$selectedline eq {} || !$showneartags} return switch -- $tagphase { - 0 { - set dtags [desctags $currentid] - if {$dtags ne {}} { - appendrefs precedes $dtags idtags - } - } - 1 { - set atags [anctags $currentid] - if {$atags ne {}} { - appendrefs follows $atags idtags - } - } - 2 { - set dheads [descheads $currentid] - if {$dheads ne {}} { - if {[appendrefs branch $dheads idheads] > 1 - && [$ctext get "branch -3c"] eq "h"} { - # turn "Branch" into "Branches" - $ctext conf -state normal - $ctext insert "branch -2c" "es" - $ctext conf -state disabled - } - } - } + 0 { + set dtags [desctags $currentid] + if {$dtags ne {}} { + appendrefs precedes $dtags idtags + } + } + 1 { + set atags [anctags $currentid] + if {$atags ne {}} { + appendrefs follows $atags idtags + } + } + 2 { + set dheads [descheads $currentid] + if {$dheads ne {}} { + if {[appendrefs branch $dheads idheads] > 1 + && [$ctext get "branch -3c"] eq "h"} { + # turn "Branch" into "Branches" + $ctext conf -state normal + $ctext insert "branch -2c" "es" + $ctext conf -state disabled + } + } + } } if {[incr tagphase] <= 2} { - after idle dispnexttag + after idle dispnexttag } } @@ -7236,15 +7291,15 @@ proc make_secsel {id} { if {![info exists linehtag($id)]} return $canv delete secsel set t [eval $canv create rect [$canv bbox $linehtag($id)] -outline {{}} \ - -tags secsel -fill [$canv cget -selectbackground]] + -tags secsel -fill [$canv cget -selectbackground]] $canv lower $t $canv2 delete secsel set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] -outline {{}} \ - -tags secsel -fill [$canv2 cget -selectbackground]] + -tags secsel -fill [$canv2 cget -selectbackground]] $canv2 lower $t $canv3 delete secsel set t [eval $canv3 create rect [$canv3 bbox $linedtag($id)] -outline {{}} \ - -tags secsel -fill [$canv3 cget -selectbackground]] + -tags secsel -fill [$canv3 cget -selectbackground]] $canv3 lower $t } @@ -7254,7 +7309,7 @@ proc make_idmark {id} { if {![info exists linehtag($id)]} return $canv delete markid set t [eval $canv create rect [$canv bbox $linehtag($id)] \ - -tags markid -outline $fgcolor] + -tags markid -outline $fgcolor] $canv raise $t } @@ -7281,7 +7336,7 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} { set selectedline $l set currentid $id if {$lastscrollrows < $numcommits} { - setcanvscroll + setcanvscroll } if {$cmitmode ne "patch" && $switch_to_patch} { @@ -7298,42 +7353,42 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} { set wh [expr {$wbot - $wtop}] set newtop $wtop if {$ytop < $wtop} { - if {$ybot < $wtop} { - set newtop [expr {$y - $wh / 2.0}] - } else { - set newtop $ytop - if {$newtop > $wtop - $linespc} { - set newtop [expr {$wtop - $linespc}] - } - } + if {$ybot < $wtop} { + set newtop [expr {$y - $wh / 2.0}] + } else { + set newtop $ytop + if {$newtop > $wtop - $linespc} { + set newtop [expr {$wtop - $linespc}] + } + } } elseif {$ybot > $wbot} { - if {$ytop > $wbot} { - set newtop [expr {$y - $wh / 2.0}] - } else { - set newtop [expr {$ybot - $wh}] - if {$newtop < $wtop + $linespc} { - set newtop [expr {$wtop + $linespc}] - } - } + if {$ytop > $wbot} { + set newtop [expr {$y - $wh / 2.0}] + } else { + set newtop [expr {$ybot - $wh}] + if {$newtop < $wtop + $linespc} { + set newtop [expr {$wtop + $linespc}] + } + } } if {$newtop != $wtop} { - if {$newtop < 0} { - set newtop 0 - } - allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}] - drawvisible + if {$newtop < 0} { + set newtop 0 + } + allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}] + drawvisible } make_secsel $id if {$isnew} { - addtohistory [list selbyid $id 0] savecmitpos + addtohistory [list selbyid $id 0] savecmitpos } $sha1entry delete 0 end $sha1entry insert 0 $id if {$autoselect} { - $sha1entry selection range 0 $autosellen + $sha1entry selection range 0 $autosellen } rhighlight_sel $id @@ -7341,7 +7396,7 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} { clear_ctext set linknum 0 if {![info exists commitinfo($id)]} { - getcommit $id + getcommit $id } set info $commitinfo($id) set date [formatdate [lindex $info 2]] @@ -7349,59 +7404,59 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} { set date [formatdate [lindex $info 4]] $ctext insert end "[mc "Committer"]: [lindex $info 3] $date\n" if {[info exists idtags($id)]} { - $ctext insert end [mc "Tags:"] - foreach tag $idtags($id) { - $ctext insert end " $tag" - } - $ctext insert end "\n" + $ctext insert end [mc "Tags:"] + foreach tag $idtags($id) { + $ctext insert end " $tag" + } + $ctext insert end "\n" } set headers {} set olds $parents($curview,$id) if {[llength $olds] > 1} { - set np 0 - foreach p $olds { - if {$np >= $mergemax} { - set tag mmax - } else { - set tag m$np - } - $ctext insert end "[mc "Parent"]: " $tag - appendwithlinks [commit_descriptor $p] {} - incr np - } + set np 0 + foreach p $olds { + if {$np >= $mergemax} { + set tag mmax + } else { + set tag m$np + } + $ctext insert end "[mc "Parent"]: " $tag + appendwithlinks [commit_descriptor $p] {} + incr np + } } else { - foreach p $olds { - append headers "[mc "Parent"]: [commit_descriptor $p]" - } + foreach p $olds { + append headers "[mc "Parent"]: [commit_descriptor $p]" + } } foreach c $children($curview,$id) { - append headers "[mc "Child"]: [commit_descriptor $c]" + append headers "[mc "Child"]: [commit_descriptor $c]" } # make anything that looks like a SHA1 ID be a clickable link appendwithlinks $headers {} if {$showneartags} { - if {![info exists allcommits]} { - getallcommits - } - $ctext insert end "[mc "Branch"]: " - $ctext mark set branch "end -1c" - $ctext mark gravity branch left - $ctext insert end "\n[mc "Follows"]: " - $ctext mark set follows "end -1c" - $ctext mark gravity follows left - $ctext insert end "\n[mc "Precedes"]: " - $ctext mark set precedes "end -1c" - $ctext mark gravity precedes left - $ctext insert end "\n" - dispneartags 1 + if {![info exists allcommits]} { + getallcommits + } + $ctext insert end "[mc "Branch"]: " + $ctext mark set branch "end -1c" + $ctext mark gravity branch left + $ctext insert end "\n[mc "Follows"]: " + $ctext mark set follows "end -1c" + $ctext mark gravity follows left + $ctext insert end "\n[mc "Precedes"]: " + $ctext mark set precedes "end -1c" + $ctext mark gravity precedes left + $ctext insert end "\n" + dispneartags 1 } $ctext insert end "\n" set comment [lindex $info 5] if {[string first "\r" $comment] >= 0} { - set comment [string map {"\r" "\n "} $comment] + set comment [string map {"\r" "\n "} $comment] } appendwithlinks $comment {comment} @@ -7412,13 +7467,13 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} { set jump_to_here $desired_loc init_flist [mc "Comments"] if {$cmitmode eq "tree"} { - gettree $id + gettree $id } elseif {$vinlinediff($curview) == 1} { - showinlinediff $id + showinlinediff $id } elseif {[llength $olds] <= 1} { - startdiff $id + startdiff $id } else { - mergediff $id + mergediff $id } } @@ -7448,14 +7503,14 @@ proc selnextpage {dir} { set lpp [expr {([winfo height $canv] - 2) / $linespc}] if {$lpp < 1} { - set lpp 1 + set lpp 1 } allcanvs yview scroll [expr {$dir * $lpp}] units drawvisible if {$selectedline eq {}} return set l [expr {$selectedline + $dir * $lpp}] if {$l < 0} { - set l 0 + set l 0 } elseif {$l >= $numcommits} { set l [expr $numcommits - 1] } @@ -7476,7 +7531,7 @@ proc reselectline {} { global selectedline if {$selectedline ne {}} { - selectline $selectedline 0 + selectline $selectedline 0 } } @@ -7487,20 +7542,20 @@ proc addtohistory {cmd {saveproc {}}} { save_position set elt [list $curview $cmd $saveproc {}] if {$historyindex > 0 - && [lindex $history [expr {$historyindex - 1}]] == $elt} { - return + && [lindex $history [expr {$historyindex - 1}]] == $elt} { + return } if {$historyindex < [llength $history]} { - set history [lreplace $history $historyindex end $elt] + set history [lreplace $history $historyindex end $elt] } else { - lappend history $elt + lappend history $elt } incr historyindex if {$historyindex > 1} { - .tf.bar.leftbut conf -state normal + .tf.bar.leftbut conf -state normal } else { - .tf.bar.leftbut conf -state disabled + .tf.bar.leftbut conf -state disabled } .tf.bar.rightbut conf -state disabled } @@ -7513,7 +7568,7 @@ proc save_position {} { set hi [expr {$historyindex - 1}] set fn [lindex $history $hi 2] if {$fn ne {}} { - lset history $hi 3 [eval $fn] + lset history $hi 3 [eval $fn] } } @@ -7521,11 +7576,11 @@ proc unset_posvars {} { global last_posvars if {[info exists last_posvars]} { - foreach {var val} $last_posvars { - global $var - unset -nocomplain $var - } - unset last_posvars + foreach {var val} $last_posvars { + global $var + unset -nocomplain $var + } + unset last_posvars } } @@ -7536,12 +7591,12 @@ proc godo {elt} { set cmd [lindex $elt 1] set pv [lindex $elt 3] if {$curview != $view} { - showview $view + showview $view } unset_posvars foreach {var val} $pv { - global $var - set $var $val + global $var + set $var $val } set last_posvars $pv eval $cmd @@ -7552,13 +7607,13 @@ proc goback {} { focus . if {$historyindex > 1} { - save_position - incr historyindex -1 - godo [lindex $history [expr {$historyindex - 1}]] - .tf.bar.rightbut conf -state normal + save_position + incr historyindex -1 + godo [lindex $history [expr {$historyindex - 1}]] + .tf.bar.rightbut conf -state normal } if {$historyindex <= 1} { - .tf.bar.leftbut conf -state disabled + .tf.bar.leftbut conf -state disabled } } @@ -7567,14 +7622,14 @@ proc goforw {} { focus . if {$historyindex < [llength $history]} { - save_position - set cmd [lindex $history $historyindex] - incr historyindex - godo $cmd - .tf.bar.leftbut conf -state normal + save_position + set cmd [lindex $history $historyindex] + incr historyindex + godo $cmd + .tf.bar.leftbut conf -state normal } if {$historyindex >= [llength $history]} { - .tf.bar.rightbut conf -state disabled + .tf.bar.rightbut conf -state disabled } } @@ -7582,7 +7637,7 @@ proc go_to_parent {i} { global parents curview targetid set ps $parents($curview,$targetid) if {[llength $ps] >= $i} { - selbyid [lindex $ps [expr $i - 1]] + selbyid [lindex $ps [expr $i - 1]] } } @@ -7593,25 +7648,25 @@ proc gettree {id} { set diffids $id unset -nocomplain diffmergeid if {![info exists treefilelist($id)]} { - if {![info exists treepending]} { - if {$id eq $nullid} { - set cmd [list | git ls-files] - } elseif {$id eq $nullid2} { - set cmd [list | git ls-files --stage -t] - } else { - set cmd [list | git ls-tree -r $id] - } - if {[catch {set gtf [open $cmd r]}]} { - return - } - set treepending $id - set treefilelist($id) {} - set treeidlist($id) {} - fconfigure $gtf -blocking 0 -encoding binary - filerun $gtf [list gettreeline $gtf $id] - } + if {![info exists treepending]} { + if {$id eq $nullid} { + set cmd [list | git ls-files] + } elseif {$id eq $nullid2} { + set cmd [list | git ls-files --stage -t] + } else { + set cmd [list | git ls-tree -r $id] + } + if {[catch {set gtf [open $cmd r]}]} { + return + } + set treepending $id + set treefilelist($id) {} + set treeidlist($id) {} + fconfigure $gtf -blocking 0 -encoding binary + filerun $gtf [list gettreeline $gtf $id] + } } else { - setfilelist $id + setfilelist $id } } @@ -7620,36 +7675,36 @@ proc gettreeline {gtf id} { set nl 0 while {[incr nl] <= 1000 && [gets $gtf line] >= 0} { - if {$diffids eq $nullid} { - set fname $line - } else { - set i [string first "\t" $line] - if {$i < 0} continue - set fname [string range $line [expr {$i+1}] end] - set line [string range $line 0 [expr {$i-1}]] - if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue - set sha1 [lindex $line 2] - lappend treeidlist($id) $sha1 - } - if {[string index $fname 0] eq "\""} { - set fname [lindex $fname 0] - } - set fname [encoding convertfrom $fname] - lappend treefilelist($id) $fname + if {$diffids eq $nullid} { + set fname $line + } else { + set i [string first "\t" $line] + if {$i < 0} continue + set fname [string range $line [expr {$i+1}] end] + set line [string range $line 0 [expr {$i-1}]] + if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue + set sha1 [lindex $line 2] + lappend treeidlist($id) $sha1 + } + if {[string index $fname 0] eq "\""} { + set fname [lindex $fname 0] + } + set fname [encoding convertfrom $fname] + lappend treefilelist($id) $fname } if {![eof $gtf]} { - return [expr {$nl >= 1000? 2: 1}] + return [expr {$nl >= 1000? 2: 1}] } close $gtf unset treepending if {$cmitmode ne "tree"} { - if {![info exists diffmergeid]} { - gettreediffs $diffids - } + if {![info exists diffmergeid]} { + gettreediffs $diffids + } } elseif {$id ne $diffids} { - gettree $diffids + gettree $diffids } else { - setfilelist $id + setfilelist $id } return 0 } @@ -7661,20 +7716,20 @@ proc showfile {f} { set i [lsearch -exact $treefilelist($diffids) $f] if {$i < 0} { - puts "oops, $f not in list for id $diffids" - return + puts "oops, $f not in list for id $diffids" + return } if {$diffids eq $nullid} { - if {[catch {set bf [open $f r]} err]} { - puts "oops, can't read $f: $err" - return - } + if {[catch {set bf [open $f r]} err]} { + puts "oops, can't read $f: $err" + return + } } else { - set blob [lindex $treeidlist($diffids) $i] - if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} { - puts "oops, error reading blob $blob: $err" - return - } + set blob [lindex $treeidlist($diffids) $i] + if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} { + puts "oops, error reading blob $blob: $err" + return + } } fconfigure $bf -blocking 0 -encoding [get_path_encoding $f] filerun $bf [list getblobline $bf $diffids] @@ -7693,28 +7748,28 @@ proc getblobline {bf id} { global diffids cmitmode ctext if {$id ne $diffids || $cmitmode ne "tree"} { - catch {close $bf} - return 0 + catch {close $bf} + return 0 } $ctext config -state normal set nl 0 while {[incr nl] <= 1000 && [gets $bf line] >= 0} { - $ctext insert end "$line\n" + $ctext insert end "$line\n" } if {[eof $bf]} { - global jump_to_here ctext_file_names commentend - - # delete last newline - $ctext delete "end - 2c" "end - 1c" - close $bf - if {$jump_to_here ne {} && - [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} { - set lnum [expr {[lindex $jump_to_here 1] + - [lindex [split $commentend .] 0]}] - mark_ctext_line $lnum - } - $ctext config -state disabled - return 0 + global jump_to_here ctext_file_names commentend + + # delete last newline + $ctext delete "end - 2c" "end - 1c" + close $bf + if {$jump_to_here ne {} && + [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} { + set lnum [expr {[lindex $jump_to_here 1] + + [lindex [split $commentend .] 0]}] + mark_ctext_line $lnum + } + $ctext config -state disabled + return 0 } $ctext config -state disabled return [expr {$nl >= 1000? 2: 1}] @@ -7749,13 +7804,13 @@ proc startdiff {ids} { set diffids $ids unset -nocomplain diffmergeid if {![info exists treediffs($ids)] || - [lsearch -exact $ids $nullid] >= 0 || - [lsearch -exact $ids $nullid2] >= 0} { - if {![info exists treepending]} { - gettreediffs $ids - } + [lsearch -exact $ids $nullid] >= 0 || + [lsearch -exact $ids $nullid2] >= 0} { + if {![info exists treepending]} { + gettreediffs $ids + } } else { - addtocflist $ids + addtocflist $ids } } @@ -7772,13 +7827,13 @@ proc showinlinediff {ids} { set inhdr 0 foreach line $difflines { - if {![string compare -length 5 "diff " $line]} { - set inhdr 1 - } elseif {$inhdr && ![string compare -length 4 "+++ " $line]} { - # offset also accounts for the b/ prefix - lappend treediff [string range $line 6 end] - set inhdr 0 - } + if {![string compare -length 5 "diff " $line]} { + set inhdr 1 + } elseif {$inhdr && ![string compare -length 4 "+++ " $line]} { + # offset also accounts for the b/ prefix + lappend treediff [string range $line 6 end] + set inhdr 0 + } } set treediffs($ids) $treediff @@ -7786,7 +7841,7 @@ proc showinlinediff {ids} { $ctext conf -state normal foreach line $difflines { - parseblobdiffline $ids $line + parseblobdiffline $ids $line } maybe_scroll_ctext 1 $ctext conf -state disabled @@ -7797,11 +7852,11 @@ proc showinlinediff {ids} { proc path_filter {filter name} { set worktree [gitworktree] foreach p $filter { - set fq_p [file normalize $p] - set fq_n [file normalize [file join $worktree $name]] - if {[string match [file normalize $fq_p]* $fq_n]} { - return 1 - } + set fq_p [file normalize $p] + set fq_n [file normalize [file join $worktree $name]] + if {[string match [file normalize $fq_p]* $fq_n]} { + return 1 + } } return 0 } @@ -7819,42 +7874,42 @@ proc diffcmd {ids flags} { set i [lsearch -exact $ids $nullid] set j [lsearch -exact $ids $nullid2] if {$i >= 0} { - if {[llength $ids] > 1 && $j < 0} { - # comparing working directory with some specific revision - set cmd [concat | git diff-index $flags] - if {$i == 0} { - lappend cmd -R [lindex $ids 1] - } else { - lappend cmd [lindex $ids 0] - } - } else { - # comparing working directory with index - set cmd [concat | git diff-files $flags] - if {$j == 1} { - lappend cmd -R - } - } + if {[llength $ids] > 1 && $j < 0} { + # comparing working directory with some specific revision + set cmd [concat | git diff-index $flags] + if {$i == 0} { + lappend cmd -R [lindex $ids 1] + } else { + lappend cmd [lindex $ids 0] + } + } else { + # comparing working directory with index + set cmd [concat | git diff-files $flags] + if {$j == 1} { + lappend cmd -R + } + } } elseif {$j >= 0} { - if {[package vcompare $git_version "1.7.2"] >= 0} { - set flags "$flags --ignore-submodules=dirty" - } - set cmd [concat | git diff-index --cached $flags] - if {[llength $ids] > 1} { - # comparing index with specific revision - if {$j == 0} { - lappend cmd -R [lindex $ids 1] - } else { - lappend cmd [lindex $ids 0] - } - } else { - # comparing index with HEAD - lappend cmd HEAD - } + if {[package vcompare $git_version "1.7.2"] >= 0} { + set flags "$flags --ignore-submodules=dirty" + } + set cmd [concat | git diff-index --cached $flags] + if {[llength $ids] > 1} { + # comparing index with specific revision + if {$j == 0} { + lappend cmd -R [lindex $ids 1] + } else { + lappend cmd [lindex $ids 0] + } + } else { + # comparing index with HEAD + lappend cmd HEAD + } } else { - if {$log_showroot} { - lappend flags --root - } - set cmd [concat | git diff-tree -r $flags $ids] + if {$log_showroot} { + lappend flags --root + } + set cmd [concat | git diff-tree -r $flags $ids] } return $cmd } @@ -7864,7 +7919,7 @@ proc gettreediffs {ids} { set cmd [diffcmd $ids {--no-commit-id}] if {$limitdiffs && $vfilelimit($curview) ne {}} { - set cmd [concat $cmd -- $vfilelimit($curview)] + set cmd [concat $cmd -- $vfilelimit($curview)] } if {[catch {set gdtf [open $cmd r]}]} return @@ -7882,44 +7937,44 @@ proc gettreediffline {gdtf ids} { set sublist {} set max 1000 if {$perfile_attrs} { - # cache_gitattr is slow, and even slower on win32 where we - # have to invoke it for only about 30 paths at a time - set max 500 - if {[tk windowingsystem] == "win32"} { - set max 120 - } + # cache_gitattr is slow, and even slower on win32 where we + # have to invoke it for only about 30 paths at a time + set max 500 + if {[tk windowingsystem] == "win32"} { + set max 120 + } } while {[incr nr] <= $max && [gets $gdtf line] >= 0} { - set i [string first "\t" $line] - if {$i >= 0} { - set file [string range $line [expr {$i+1}] end] - if {[string index $file 0] eq "\""} { - set file [lindex $file 0] - } - set file [encoding convertfrom $file] - if {$file ne [lindex $treediff end]} { - lappend treediff $file - lappend sublist $file - } - } + set i [string first "\t" $line] + if {$i >= 0} { + set file [string range $line [expr {$i+1}] end] + if {[string index $file 0] eq "\""} { + set file [lindex $file 0] + } + set file [encoding convertfrom $file] + if {$file ne [lindex $treediff end]} { + lappend treediff $file + lappend sublist $file + } + } } if {$perfile_attrs} { - cache_gitattr encoding $sublist + cache_gitattr encoding $sublist } if {![eof $gdtf]} { - return [expr {$nr >= $max? 2: 1}] + return [expr {$nr >= $max? 2: 1}] } close $gdtf set treediffs($ids) $treediff unset treepending if {$cmitmode eq "tree" && [llength $diffids] == 1} { - gettree $diffids + gettree $diffids } elseif {$ids != $diffids} { - if {![info exists diffmergeid]} { - gettreediffs $diffids - } + if {![info exists diffmergeid]} { + gettreediffs $diffids + } } else { - addtocflist $ids + addtocflist $ids } return 0 } @@ -7933,10 +7988,10 @@ proc diffcontextchange {n1 n2 op} { global diffcontextstring diffcontext if {[string is integer -strict $diffcontextstring]} { - if {$diffcontextstring >= 0} { - set diffcontext $diffcontextstring - reselectline - } + if {$diffcontextstring >= 0} { + set diffcontext $diffcontextstring + reselectline + } } } @@ -7970,25 +8025,25 @@ proc getblobdiffs {ids} { set textconv {} if {[package vcompare $git_version "1.6.1"] >= 0} { - set textconv "--textconv" + set textconv "--textconv" } set submodule {} if {[package vcompare $git_version "1.6.6"] >= 0} { - set submodule "--submodule" + set submodule "--submodule" } set cmd [diffcmd $ids "-p $textconv $submodule -C --cc --no-commit-id -U$diffcontext"] if {$ignorespace} { - append cmd " -w" + append cmd " -w" } if {$worddiff ne [mc "Line diff"]} { - append cmd " --word-diff=porcelain" + append cmd " --word-diff=porcelain" } if {$limitdiffs && $vfilelimit($curview) ne {}} { - set cmd [concat $cmd -- $vfilelimit($curview)] + set cmd [concat $cmd -- $vfilelimit($curview)] } if {[catch {set bdf [open $cmd r]} err]} { - error_popup [mc "Error getting diffs: %s" $err] - return + error_popup [mc "Error getting diffs: %s" $err] + return } fconfigure $bdf -blocking 0 -encoding binary -eofchar {} set blobdifffd($ids) $bdf @@ -8000,7 +8055,7 @@ proc savecmitpos {} { global ctext cmitmode if {$cmitmode eq "tree"} { - return {} + return {} } return [list target_scrollpos [$ctext index @0,0]] } @@ -8016,9 +8071,9 @@ proc maybe_scroll_ctext {ateof} { if {![info exists target_scrollpos]} return if {!$ateof} { - set nlines [expr {[winfo height $ctext] - / [font metrics textfont -linespace]}] - if {[$ctext compare "$target_scrollpos + $nlines lines" <= end]} return + set nlines [expr {[winfo height $ctext] + / [font metrics textfont -linespace]}] + if {[$ctext compare "$target_scrollpos + $nlines lines" <= end]} return } $ctext yview $target_scrollpos unset target_scrollpos @@ -8028,12 +8083,12 @@ proc setinlist {var i val} { global $var while {[llength [set $var]] < $i} { - lappend $var {} + lappend $var {} } if {[llength [set $var]] == $i} { - lappend $var $val + lappend $var $val } else { - lset $var $i $val + lset $var $i $val } } @@ -8045,7 +8100,7 @@ proc makediffhdr {fname ids} { set diffencoding [get_path_encoding $fname] set i [lsearch -exact $treediffs($ids) $fname] if {$i >= 0} { - setinlist difffilestart $i $curdiffstart + setinlist difffilestart $i $curdiffstart } lset ctext_file_names end $fname set l [expr {(78 - [string length $fname]) / 2}] @@ -8053,7 +8108,7 @@ proc makediffhdr {fname ids} { $ctext insert $curdiffstart "$pad $fname $pad" filesep set targetline {} if {$jump_to_here ne {} && [lindex $jump_to_here 0] eq $fname} { - set targetline [lindex $jump_to_here 1] + set targetline [lindex $jump_to_here 1] } set diffline 0 } @@ -8061,7 +8116,7 @@ proc makediffhdr {fname ids} { proc blobdiffmaybeseehere {ateof} { global diffseehere if {$diffseehere >= 0} { - mark_ctext_line [lindex [split $diffseehere .] 0] + mark_ctext_line [lindex [split $diffseehere .] 0] } maybe_scroll_ctext $ateof } @@ -8073,22 +8128,22 @@ proc getblobdiffline {bdf ids} { set nr 0 $ctext conf -state normal while {[incr nr] <= 1000 && [gets $bdf line] >= 0} { - if {$ids != $diffids || $bdf != $blobdifffd($ids)} { - # Older diff read. Abort it. - catch {close $bdf} - if {$ids != $diffids} { - array unset blobdifffd $ids - } - return 0 - } - parseblobdiffline $ids $line + if {$ids != $diffids || $bdf != $blobdifffd($ids)} { + # Older diff read. Abort it. + catch {close $bdf} + if {$ids != $diffids} { + array unset blobdifffd $ids + } + return 0 + } + parseblobdiffline $ids $line } $ctext conf -state disabled blobdiffmaybeseehere [eof $bdf] if {[eof $bdf]} { - catch {close $bdf} - array unset blobdifffd $ids - return 0 + catch {close $bdf} + array unset blobdifffd $ids + return 0 } return [expr {$nr >= 1000? 2: 1}] } @@ -8102,199 +8157,199 @@ proc parseblobdiffline {ids line} { global worddiff diffseehere if {![string compare -length 5 "diff " $line]} { - if {![regexp {^diff (--cc|--git) } $line m type]} { - set line [encoding convertfrom $line] - $ctext insert end "$line\n" hunksep - continue - } - # start of a new file - set diffinhdr 1 - $ctext insert end "\n" - set curdiffstart [$ctext index "end - 1c"] - lappend ctext_file_names "" - lappend ctext_file_lines [lindex [split $curdiffstart "."] 0] - $ctext insert end "\n" filesep - - if {$type eq "--cc"} { - # start of a new file in a merge diff - set fname [string range $line 10 end] - if {[lsearch -exact $treediffs($ids) $fname] < 0} { - lappend treediffs($ids) $fname - add_flist [list $fname] - } - - } else { - set line [string range $line 11 end] - # If the name hasn't changed the length will be odd, - # the middle char will be a space, and the two bits either - # side will be a/name and b/name, or "a/name" and "b/name". - # If the name has changed we'll get "rename from" and - # "rename to" or "copy from" and "copy to" lines following - # this, and we'll use them to get the filenames. - # This complexity is necessary because spaces in the - # filename(s) don't get escaped. - set l [string length $line] - set i [expr {$l / 2}] - if {!(($l & 1) && [string index $line $i] eq " " && - [string range $line 2 [expr {$i - 1}]] eq \ - [string range $line [expr {$i + 3}] end])} { - return - } - # unescape if quoted and chop off the a/ from the front - if {[string index $line 0] eq "\""} { - set fname [string range [lindex $line 0] 2 end] - } else { - set fname [string range $line 2 [expr {$i - 1}]] - } - } - makediffhdr $fname $ids + if {![regexp {^diff (--cc|--git) } $line m type]} { + set line [encoding convertfrom $line] + $ctext insert end "$line\n" hunksep + continue + } + # start of a new file + set diffinhdr 1 + set currdiffsubmod "" + + $ctext insert end "\n" + set curdiffstart [$ctext index "end - 1c"] + lappend ctext_file_names "" + lappend ctext_file_lines [lindex [split $curdiffstart "."] 0] + $ctext insert end "\n" filesep + + if {$type eq "--cc"} { + # start of a new file in a merge diff + set fname [string range $line 10 end] + if {[lsearch -exact $treediffs($ids) $fname] < 0} { + lappend treediffs($ids) $fname + add_flist [list $fname] + } + + } else { + set line [string range $line 11 end] + # If the name hasn't changed the length will be odd, + # the middle char will be a space, and the two bits either + # side will be a/name and b/name, or "a/name" and "b/name". + # If the name has changed we'll get "rename from" and + # "rename to" or "copy from" and "copy to" lines following + # this, and we'll use them to get the filenames. + # This complexity is necessary because spaces in the + # filename(s) don't get escaped. + set l [string length $line] + set i [expr {$l / 2}] + if {!(($l & 1) && [string index $line $i] eq " " && + [string range $line 2 [expr {$i - 1}]] eq \ + [string range $line [expr {$i + 3}] end])} { + return + } + # unescape if quoted and chop off the a/ from the front + if {[string index $line 0] eq "\""} { + set fname [string range [lindex $line 0] 2 end] + } else { + set fname [string range $line 2 [expr {$i - 1}]] + } + } + makediffhdr $fname $ids } elseif {![string compare -length 16 "* Unmerged path " $line]} { - set fname [encoding convertfrom [string range $line 16 end]] - $ctext insert end "\n" - set curdiffstart [$ctext index "end - 1c"] - lappend ctext_file_names $fname - lappend ctext_file_lines [lindex [split $curdiffstart "."] 0] - $ctext insert end "$line\n" filesep - set i [lsearch -exact $treediffs($ids) $fname] - if {$i >= 0} { - setinlist difffilestart $i $curdiffstart - } + set fname [encoding convertfrom [string range $line 16 end]] + $ctext insert end "\n" + set curdiffstart [$ctext index "end - 1c"] + lappend ctext_file_names $fname + lappend ctext_file_lines [lindex [split $curdiffstart "."] 0] + $ctext insert end "$line\n" filesep + set i [lsearch -exact $treediffs($ids) $fname] + if {$i >= 0} { + setinlist difffilestart $i $curdiffstart + } } elseif {![string compare -length 2 "@@" $line]} { - regexp {^@@+} $line ats - set line [encoding convertfrom $diffencoding $line] - $ctext insert end "$line\n" hunksep - if {[regexp { \+(\d+),\d+ @@} $line m nl]} { - set diffline $nl - } - set diffnparents [expr {[string length $ats] - 1}] - set diffinhdr 0 + regexp {^@@+} $line ats + set line [encoding convertfrom $diffencoding $line] + $ctext insert end "$line\n" hunksep + if {[regexp { \+(\d+),\d+ @@} $line m nl]} { + set diffline $nl + } + set diffnparents [expr {[string length $ats] - 1}] + set diffinhdr 0 } elseif {![string compare -length 10 "Submodule " $line]} { - # start of a new submodule - if {[regexp -indices "\[0-9a-f\]+\\.\\." $line nameend]} { - set fname [string range $line 10 [expr [lindex $nameend 0] - 2]] - } else { - set fname [string range $line 10 [expr [string first "contains " $line] - 2]] - } - if {$currdiffsubmod != $fname} { - $ctext insert end "\n"; # Add newline after commit message - } - set curdiffstart [$ctext index "end - 1c"] - lappend ctext_file_names "" - if {$currdiffsubmod != $fname} { - lappend ctext_file_lines $fname - makediffhdr $fname $ids - set currdiffsubmod $fname - $ctext insert end "\n$line\n" filesep - } else { - $ctext insert end "$line\n" filesep - } - } elseif {![string compare -length 3 " >" $line]} { - set $currdiffsubmod "" - set line [encoding convertfrom $diffencoding $line] - $ctext insert end "$line\n" dresult - } elseif {![string compare -length 3 " <" $line]} { - set $currdiffsubmod "" - set line [encoding convertfrom $diffencoding $line] - $ctext insert end "$line\n" d0 + # start of a new submodule + if {[regexp -indices "\[0-9a-f\]+\\.\\." $line nameend]} { + set fname [string range $line 10 [expr [lindex $nameend 0] - 2]] + } else { + set fname [string range $line 10 [expr [string first "contains " $line] - 2]] + } + if {$currdiffsubmod != $fname} { + $ctext insert end "\n"; # Add newline after commit message + } + if {$currdiffsubmod != $fname} { + set curdiffstart [$ctext index "end - 1c"] + lappend ctext_file_names "" + lappend ctext_file_lines [lindex [split $curdiffstart "."] 0] + makediffhdr $fname $ids + set currdiffsubmod $fname + $ctext insert end "\n$line\n" filesep + } else { + $ctext insert end "$line\n" filesep + } + } elseif {$currdiffsubmod != "" && ![string compare -length 3 " >" $line]} { + set line [encoding convertfrom $diffencoding $line] + $ctext insert end "$line\n" dresult + } elseif {$currdiffsubmod != "" && ![string compare -length 3 " <" $line]} { + set line [encoding convertfrom $diffencoding $line] + $ctext insert end "$line\n" d0 } elseif {$diffinhdr} { - if {![string compare -length 12 "rename from " $line]} { - set fname [string range $line [expr 6 + [string first " from " $line] ] end] - if {[string index $fname 0] eq "\""} { - set fname [lindex $fname 0] - } - set fname [encoding convertfrom $fname] - set i [lsearch -exact $treediffs($ids) $fname] - if {$i >= 0} { - setinlist difffilestart $i $curdiffstart - } - } elseif {![string compare -length 10 $line "rename to "] || - ![string compare -length 8 $line "copy to "]} { - set fname [string range $line [expr 4 + [string first " to " $line] ] end] - if {[string index $fname 0] eq "\""} { - set fname [lindex $fname 0] - } - makediffhdr $fname $ids - } elseif {[string compare -length 3 $line "---"] == 0} { - # do nothing - return - } elseif {[string compare -length 3 $line "+++"] == 0} { - set diffinhdr 0 - return - } - $ctext insert end "$line\n" filesep + if {![string compare -length 12 "rename from " $line]} { + set fname [string range $line [expr 6 + [string first " from " $line] ] end] + if {[string index $fname 0] eq "\""} { + set fname [lindex $fname 0] + } + set fname [encoding convertfrom $fname] + set i [lsearch -exact $treediffs($ids) $fname] + if {$i >= 0} { + setinlist difffilestart $i $curdiffstart + } + } elseif {![string compare -length 10 $line "rename to "] || + ![string compare -length 8 $line "copy to "]} { + set fname [string range $line [expr 4 + [string first " to " $line] ] end] + if {[string index $fname 0] eq "\""} { + set fname [lindex $fname 0] + } + makediffhdr $fname $ids + } elseif {[string compare -length 3 $line "---"] == 0} { + # do nothing + return + } elseif {[string compare -length 3 $line "+++"] == 0} { + set diffinhdr 0 + return + } + $ctext insert end "$line\n" filesep } else { - set line [string map {\x1A ^Z} \ - [encoding convertfrom $diffencoding $line]] - # parse the prefix - one ' ', '-' or '+' for each parent - set prefix [string range $line 0 [expr {$diffnparents - 1}]] - set tag [expr {$diffnparents > 1? "m": "d"}] - set dowords [expr {$worddiff ne [mc "Line diff"] && $diffnparents == 1}] - set words_pre_markup "" - set words_post_markup "" - if {[string trim $prefix " -+"] eq {}} { - # prefix only has " ", "-" and "+" in it: normal diff line - set num [string first "-" $prefix] - if {$dowords} { - set line [string range $line 1 end] - } - if {$num >= 0} { - # removed line, first parent with line is $num - if {$num >= $mergemax} { - set num "max" - } - if {$dowords && $worddiff eq [mc "Markup words"]} { - $ctext insert end "\[-$line-\]" $tag$num - } else { - $ctext insert end "$line" $tag$num - } - if {!$dowords} { - $ctext insert end "\n" $tag$num - } - } else { - set tags {} - if {[string first "+" $prefix] >= 0} { - # added line - lappend tags ${tag}result - if {$diffnparents > 1} { - set num [string first " " $prefix] - if {$num >= 0} { - if {$num >= $mergemax} { - set num "max" - } - lappend tags m$num - } - } - set words_pre_markup "{+" - set words_post_markup "+}" - } - if {$targetline ne {}} { - if {$diffline == $targetline} { - set diffseehere [$ctext index "end - 1 chars"] - set targetline {} - } else { - incr diffline - } - } - if {$dowords && $worddiff eq [mc "Markup words"]} { - $ctext insert end "$words_pre_markup$line$words_post_markup" $tags - } else { - $ctext insert end "$line" $tags - } - if {!$dowords} { - $ctext insert end "\n" $tags - } - } - } elseif {$dowords && $prefix eq "~"} { - $ctext insert end "\n" {} - } else { - # "\ No newline at end of file", - # or something else we don't recognize - $ctext insert end "$line\n" hunksep - } + set line [string map {\x1A ^Z} \ + [encoding convertfrom $diffencoding $line]] + # parse the prefix - one ' ', '-' or '+' for each parent + set prefix [string range $line 0 [expr {$diffnparents - 1}]] + set tag [expr {$diffnparents > 1? "m": "d"}] + set dowords [expr {$worddiff ne [mc "Line diff"] && $diffnparents == 1}] + set words_pre_markup "" + set words_post_markup "" + if {[string trim $prefix " -+"] eq {}} { + # prefix only has " ", "-" and "+" in it: normal diff line + set num [string first "-" $prefix] + if {$dowords} { + set line [string range $line 1 end] + } + if {$num >= 0} { + # removed line, first parent with line is $num + if {$num >= $mergemax} { + set num "max" + } + if {$dowords && $worddiff eq [mc "Markup words"]} { + $ctext insert end "\[-$line-\]" $tag$num + } else { + $ctext insert end "$line" $tag$num + } + if {!$dowords} { + $ctext insert end "\n" $tag$num + } + } else { + set tags {} + if {[string first "+" $prefix] >= 0} { + # added line + lappend tags ${tag}result + if {$diffnparents > 1} { + set num [string first " " $prefix] + if {$num >= 0} { + if {$num >= $mergemax} { + set num "max" + } + lappend tags m$num + } + } + set words_pre_markup "{+" + set words_post_markup "+}" + } + if {$targetline ne {}} { + if {$diffline == $targetline} { + set diffseehere [$ctext index "end - 1 chars"] + set targetline {} + } else { + incr diffline + } + } + if {$dowords && $worddiff eq [mc "Markup words"]} { + $ctext insert end "$words_pre_markup$line$words_post_markup" $tags + } else { + $ctext insert end "$line" $tags + } + if {!$dowords} { + $ctext insert end "\n" $tags + } + } + } elseif {$dowords && $prefix eq "~"} { + $ctext insert end "\n" {} + } else { + # "\ No newline at end of file", + # or something else we don't recognize + $ctext insert end "$line\n" hunksep + } } } @@ -8324,9 +8379,9 @@ proc highlightfile_for_scrollpos {topidx} { set top [lindex [split $topidx .] 0] if {$difffilestart eq {} || $top < [lindex $difffilestart 0]} { - highlightfile 0 + highlightfile 0 } else { - highlightfile [expr {[bsearch $difffilestart $top] + 2}] + highlightfile [expr {[bsearch $difffilestart $top] + 2}] } } @@ -8337,11 +8392,11 @@ proc prevfile {} { set prev 0.0 set here [$ctext index @0,0] foreach loc $difffilestart { - if {[$ctext compare $loc >= $here]} { - $ctext yview $prev - return - } - set prev $loc + if {[$ctext compare $loc >= $here]} { + $ctext yview $prev + return + } + set prev $loc } $ctext yview $prev } @@ -8352,10 +8407,10 @@ proc nextfile {} { if {$cmitmode eq "tree"} return set here [$ctext index @0,0] foreach loc $difffilestart { - if {[$ctext compare $loc > $here]} { - $ctext yview $loc - return - } + if {[$ctext compare $loc > $here]} { + $ctext yview $loc + return + } } } @@ -8366,14 +8421,14 @@ proc clear_ctext {{first 1.0}} { set l [lindex [split $first .] 0] if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} { - set smarktop $l + set smarktop $l } if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} { - set smarkbot $l + set smarkbot $l } $ctext delete $first end if {$first eq "1.0"} { - unset -nocomplain pendinglinks + unset -nocomplain pendinglinks } set ctext_file_names {} set ctext_file_lines {} @@ -8383,16 +8438,16 @@ proc settabs {{firstab {}}} { global firsttabstop tabstop ctext have_tk85 if {$firstab ne {} && $have_tk85} { - set firsttabstop $firstab + set firsttabstop $firstab } set w [font measure textfont "0"] if {$firsttabstop != 0} { - $ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \ - [expr {($firsttabstop + 2 * $tabstop) * $w}]] + $ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \ + [expr {($firsttabstop + 2 * $tabstop) * $w}]] } elseif {$have_tk85 || $tabstop != 8} { - $ctext conf -tabs [expr {$tabstop * $w}] + $ctext conf -tabs [expr {$tabstop * $w}] } else { - $ctext conf -tabs {} + $ctext conf -tabs {} } } @@ -8400,26 +8455,26 @@ proc incrsearch {name ix op} { global ctext searchstring searchdirn if {[catch {$ctext index anchor}]} { - # no anchor set, use start of selection, or of visible area - set sel [$ctext tag ranges sel] - if {$sel ne {}} { - $ctext mark set anchor [lindex $sel 0] - } elseif {$searchdirn eq "-forwards"} { - $ctext mark set anchor @0,0 - } else { - $ctext mark set anchor @0,[winfo height $ctext] - } + # no anchor set, use start of selection, or of visible area + set sel [$ctext tag ranges sel] + if {$sel ne {}} { + $ctext mark set anchor [lindex $sel 0] + } elseif {$searchdirn eq "-forwards"} { + $ctext mark set anchor @0,0 + } else { + $ctext mark set anchor @0,[winfo height $ctext] + } } if {$searchstring ne {}} { - set here [$ctext search -count mlen $searchdirn -- $searchstring anchor] - if {$here ne {}} { - $ctext see $here - set mend "$here + $mlen c" - $ctext tag remove sel 1.0 end - $ctext tag add sel $here $mend - suppress_highlighting_file_for_current_scrollpos - highlightfile_for_scrollpos $here - } + set here [$ctext search -count mlen $searchdirn -- $searchstring anchor] + if {$here ne {}} { + $ctext see $here + set mend "$here + $mlen c" + $ctext tag remove sel 1.0 end + $ctext tag add sel $here $mend + suppress_highlighting_file_for_current_scrollpos + highlightfile_for_scrollpos $here + } } rehighlight_search_results } @@ -8431,25 +8486,25 @@ proc dosearch {} { $sstring icursor end set searchdirn -forwards if {$searchstring ne {}} { - set sel [$ctext tag ranges sel] - if {$sel ne {}} { - set start "[lindex $sel 0] + 1c" - } elseif {[catch {set start [$ctext index anchor]}]} { - set start "@0,0" - } - set match [$ctext search -count mlen -- $searchstring $start] - $ctext tag remove sel 1.0 end - if {$match eq {}} { - bell - return - } - $ctext see $match - suppress_highlighting_file_for_current_scrollpos - highlightfile_for_scrollpos $match - set mend "$match + $mlen c" - $ctext tag add sel $match $mend - $ctext mark unset anchor - rehighlight_search_results + set sel [$ctext tag ranges sel] + if {$sel ne {}} { + set start "[lindex $sel 0] + 1c" + } elseif {[catch {set start [$ctext index anchor]}]} { + set start "@0,0" + } + set match [$ctext search -count mlen -- $searchstring $start] + $ctext tag remove sel 1.0 end + if {$match eq {}} { + bell + return + } + $ctext see $match + suppress_highlighting_file_for_current_scrollpos + highlightfile_for_scrollpos $match + set mend "$match + $mlen c" + $ctext tag add sel $match $mend + $ctext mark unset anchor + rehighlight_search_results } } @@ -8460,25 +8515,25 @@ proc dosearchback {} { $sstring icursor end set searchdirn -backwards if {$searchstring ne {}} { - set sel [$ctext tag ranges sel] - if {$sel ne {}} { - set start [lindex $sel 0] - } elseif {[catch {set start [$ctext index anchor]}]} { - set start @0,[winfo height $ctext] - } - set match [$ctext search -backwards -count ml -- $searchstring $start] - $ctext tag remove sel 1.0 end - if {$match eq {}} { - bell - return - } - $ctext see $match - suppress_highlighting_file_for_current_scrollpos - highlightfile_for_scrollpos $match - set mend "$match + $ml c" - $ctext tag add sel $match $mend - $ctext mark unset anchor - rehighlight_search_results + set sel [$ctext tag ranges sel] + if {$sel ne {}} { + set start [lindex $sel 0] + } elseif {[catch {set start [$ctext index anchor]}]} { + set start @0,[winfo height $ctext] + } + set match [$ctext search -backwards -count ml -- $searchstring $start] + $ctext tag remove sel 1.0 end + if {$match eq {}} { + bell + return + } + $ctext see $match + suppress_highlighting_file_for_current_scrollpos + highlightfile_for_scrollpos $match + set mend "$match + $ml c" + $ctext tag add sel $match $mend + $ctext mark unset anchor + rehighlight_search_results } } @@ -8489,7 +8544,7 @@ proc rehighlight_search_results {} { $ctext tag remove currentsearchhit 1.0 end if {$searchstring ne {}} { - searchmarkvisible 1 + searchmarkvisible 1 } } @@ -8500,14 +8555,14 @@ proc searchmark {first last} { set mend $first.0 while {1} { - set match [$ctext search -count mlen -- $searchstring $mend $last.end] - if {$match eq {}} break - set mend "$match + $mlen c" - if {$sel ne {} && [$ctext compare $match == [lindex $sel 0]]} { - $ctext tag add currentsearchhit $match $mend - } else { - $ctext tag add found $match $mend - } + set match [$ctext search -count mlen -- $searchstring $mend $last.end] + if {$match eq {}} break + set mend "$match + $mlen c" + if {$sel ne {} && [$ctext compare $match == [lindex $sel 0]]} { + $ctext tag add currentsearchhit $match $mend + } else { + $ctext tag add found $match $mend + } } } @@ -8517,19 +8572,19 @@ proc searchmarkvisible {doall} { set topline [lindex [split [$ctext index @0,0] .] 0] set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0] if {$doall || $botline < $smarktop || $topline > $smarkbot} { - # no overlap with previous - searchmark $topline $botline - set smarktop $topline - set smarkbot $botline + # no overlap with previous + searchmark $topline $botline + set smarktop $topline + set smarkbot $botline } else { - if {$topline < $smarktop} { - searchmark $topline [expr {$smarktop-1}] - set smarktop $topline - } - if {$botline > $smarkbot} { - searchmark [expr {$smarkbot+1}] $botline - set smarkbot $botline - } + if {$topline < $smarktop} { + searchmark $topline [expr {$smarktop-1}] + set smarktop $topline + } + if {$botline > $smarkbot} { + searchmark [expr {$smarkbot+1}] $botline + set smarkbot $botline + } } } @@ -8545,15 +8600,15 @@ proc scrolltext {f0 f1} { set topidx [$ctext index @0,0] if {![info exists suppress_highlighting_file_for_this_scrollpos] - || $topidx ne $suppress_highlighting_file_for_this_scrollpos} { - highlightfile_for_scrollpos $topidx + || $topidx ne $suppress_highlighting_file_for_this_scrollpos} { + highlightfile_for_scrollpos $topidx } unset -nocomplain suppress_highlighting_file_for_this_scrollpos .bleft.bottom.sb set $f0 $f1 if {$searchstring ne {}} { - searchmarkvisible 0 + searchmarkvisible 0 } } @@ -8582,8 +8637,8 @@ proc redisplay {} { allcanvs yview moveto [lindex $span 0] drawvisible if {$selectedline ne {}} { - selectline $selectedline 0 - allcanvs yview moveto [lindex $span 0] + selectline $selectedline 0 + allcanvs yview moveto [lindex $span 0] } } @@ -8593,20 +8648,20 @@ proc parsefont {f n} { set fontattr($f,family) [lindex $n 0] set s [lindex $n 1] if {$s eq {} || $s == 0} { - set s 10 + set s 10 } elseif {$s < 0} { - set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}] + set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}] } set fontattr($f,size) $s set fontattr($f,weight) normal set fontattr($f,slant) roman foreach style [lrange $n 2 end] { - switch -- $style { - "normal" - - "bold" {set fontattr($f,weight) $style} - "roman" - - "italic" {set fontattr($f,slant) $style} - } + switch -- $style { + "normal" - + "bold" {set fontattr($f,weight) $style} + "roman" - + "italic" {set fontattr($f,slant) $style} + } } } @@ -8614,8 +8669,8 @@ proc fontflags {f {isbold 0}} { global fontattr return [list -family $fontattr($f,family) -size $fontattr($f,size) \ - -weight [expr {$isbold? "bold": $fontattr($f,weight)}] \ - -slant $fontattr($f,slant)] + -weight [expr {$isbold? "bold": $fontattr($f,weight)}] \ + -slant $fontattr($f,slant)] } proc fontname {f} { @@ -8623,10 +8678,10 @@ proc fontname {f} { set n [list $fontattr($f,family) $fontattr($f,size)] if {$fontattr($f,weight) eq "bold"} { - lappend n "bold" + lappend n "bold" } if {$fontattr($f,slant) eq "italic"} { - lappend n "italic" + lappend n "italic" } return $n } @@ -8639,7 +8694,7 @@ proc incrfont {inc} { set s $fontattr(mainfont,size) incr s $inc if {$s < 1} { - set s 1 + set s 1 } set fontattr(mainfont,size) $s font config mainfont -size $s @@ -8648,7 +8703,7 @@ proc incrfont {inc} { set s $fontattr(textfont,size) incr s $inc if {$s < 1} { - set s 1 + set s 1 } set fontattr(textfont,size) $s font config textfont -size $s @@ -8662,23 +8717,23 @@ proc incrfont {inc} { proc clearsha1 {} { global sha1entry sha1string if {[string length $sha1string] == 40} { - $sha1entry delete 0 end + $sha1entry delete 0 end } } proc sha1change {n1 n2 op} { global sha1string currentid sha1but if {$sha1string == {} - || ([info exists currentid] && $sha1string == $currentid)} { - set state disabled + || ([info exists currentid] && $sha1string == $currentid)} { + set state disabled } else { - set state normal + set state normal } if {[$sha1but cget -state] == $state} return if {$state == "normal"} { - $sha1but conf -state normal -relief raised -text "[mc "Goto:"] " + $sha1but conf -state normal -relief raised -text "[mc "Goto:"] " } else { - $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] " + $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] " } } @@ -8686,37 +8741,37 @@ proc gotocommit {} { global sha1string tagids headids curview varcid if {$sha1string == {} - || ([info exists currentid] && $sha1string == $currentid)} return + || ([info exists currentid] && $sha1string == $currentid)} return if {[info exists tagids($sha1string)]} { - set id $tagids($sha1string) + set id $tagids($sha1string) } elseif {[info exists headids($sha1string)]} { - set id $headids($sha1string) + set id $headids($sha1string) } else { - set id [string tolower $sha1string] - if {[regexp {^[0-9a-f]{4,39}$} $id]} { - set matches [longid $id] - if {$matches ne {}} { - if {[llength $matches] > 1} { - error_popup [mc "Short SHA1 id %s is ambiguous" $id] - return - } - set id [lindex $matches 0] - } - } else { - if {[catch {set id [exec git rev-parse --verify $sha1string]}]} { - error_popup [mc "Revision %s is not known" $sha1string] - return - } - } + set id [string tolower $sha1string] + if {[regexp {^[0-9a-f]{4,39}$} $id]} { + set matches [longid $id] + if {$matches ne {}} { + if {[llength $matches] > 1} { + error_popup [mc "Short SHA1 id %s is ambiguous" $id] + return + } + set id [lindex $matches 0] + } + } else { + if {[catch {set id [exec git rev-parse --verify $sha1string]}]} { + error_popup [mc "Revision %s is not known" $sha1string] + return + } + } } if {[commitinview $id $curview]} { - selectline [rowofcommit $id] 1 - return + selectline [rowofcommit $id] 1 + return } if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} { - set msg [mc "SHA1 id %s is not known" $sha1string] + set msg [mc "SHA1 id %s is not known" $sha1string] } else { - set msg [mc "Revision %s is not in the current view" $sha1string] + set msg [mc "Revision %s is not in the current view" $sha1string] } error_popup $msg } @@ -8730,7 +8785,7 @@ proc lineenter {x y id} { set hovery $y set hoverid $id if {[info exists hovertimer]} { - after cancel $hovertimer + after cancel $hovertimer } set hovertimer [after 500 linehover] $canv delete hover @@ -8740,12 +8795,12 @@ proc linemotion {x y id} { global hoverx hovery hoverid hovertimer if {[info exists hoverid] && $id == $hoverid} { - set hoverx $x - set hovery $y - if {[info exists hovertimer]} { - after cancel $hovertimer - } - set hovertimer [after 500 linehover] + set hoverx $x + set hovery $y + if {[info exists hovertimer]} { + after cancel $hovertimer + } + set hovertimer [after 500 linehover] } } @@ -8753,12 +8808,12 @@ proc lineleave {id} { global hoverid hovertimer canv if {[info exists hoverid] && $id == $hoverid} { - $canv delete hover - if {[info exists hovertimer]} { - after cancel $hovertimer - unset hovertimer - } - unset hoverid + $canv delete hover + if {[info exists hovertimer]} { + after cancel $hovertimer + unset hovertimer + } + unset hoverid } } @@ -8780,11 +8835,11 @@ proc linehover {} { set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}] set y1 [expr {$y + $linespc + 2 * $lthickness}] set t [$canv create rectangle $x0 $y0 $x1 $y1 \ - -fill $linehoverbgcolor -outline $linehoveroutlinecolor \ - -width 1 -tags hover] + -fill $linehoverbgcolor -outline $linehoveroutlinecolor \ + -width 1 -tags hover] $canv raise $t set t [$canv create text $x $y -anchor nw -text $text -tags hover \ - -font mainfont -fill $linehoverfgcolor] + -font mainfont -fill $linehoverfgcolor] $canv raise $t } @@ -8795,10 +8850,10 @@ proc clickisonarrow {id y} { set thresh [expr {2 * $lthickness + 6}] set n [expr {[llength $ranges] - 1}] for {set i 1} {$i < $n} {incr i} { - set row [lindex $ranges $i] - if {abs([yc $row] - $y) < $thresh} { - return $i - } + set row [lindex $ranges $i] + if {abs([yc $row] - $y) < $thresh} { + return $i + } } return {} } @@ -8816,7 +8871,7 @@ proc arrowjump {id n y} { set yspan [expr {[lindex $view 1] - [lindex $view 0]}] set yfrac [expr {$yt / $ymax - $yspan / 2}] if {$yfrac < 0} { - set yfrac 0 + set yfrac 0 } allcanvs yview moveto $yfrac } @@ -8833,19 +8888,19 @@ proc lineclick {x y id isnew} { set thickerline $id drawlines $id if {$isnew} { - set ymax [lindex [$canv cget -scrollregion] 3] - if {$ymax eq {}} return - set yfrac [lindex [$canv yview] 0] - set y [expr {$y + $yfrac * $ymax}] + set ymax [lindex [$canv cget -scrollregion] 3] + if {$ymax eq {}} return + set yfrac [lindex [$canv yview] 0] + set y [expr {$y + $yfrac * $ymax}] } set dirn [clickisonarrow $id $y] if {$dirn ne {}} { - arrowjump $id $dirn $y - return + arrowjump $id $dirn $y + return } if {$isnew} { - addtohistory [list lineclick $x $y $id 0] savectextpos + addtohistory [list lineclick $x $y $id 0] savectextpos } # fill the details pane with info about this line $ctext conf -state normal @@ -8861,20 +8916,20 @@ proc lineclick {x y id isnew} { $ctext insert end "\t[mc "Date"]:\t$date\n" set kids $children($curview,$id) if {$kids ne {}} { - $ctext insert end "\n[mc "Children"]:" - set i 0 - foreach child $kids { - incr i - if {![info exists commitinfo($child)] && ![getcommit $child]} continue - set info $commitinfo($child) - $ctext insert end "\n\t" - $ctext insert end $child link$i - setlink $child link$i - $ctext insert end "\n\t[lindex $info 0]" - $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]" - set date [formatdate [lindex $info 2]] - $ctext insert end "\n\t[mc "Date"]:\t$date\n" - } + $ctext insert end "\n[mc "Children"]:" + set i 0 + foreach child $kids { + incr i + if {![info exists commitinfo($child)] && ![getcommit $child]} continue + set info $commitinfo($child) + $ctext insert end "\n\t" + $ctext insert end $child link$i + setlink $child link$i + $ctext insert end "\n\t[lindex $info 0]" + $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]" + set date [formatdate [lindex $info 2]] + $ctext insert end "\n\t[mc "Date"]:\t$date\n" + } } maybe_scroll_ctext 1 $ctext conf -state disabled @@ -8884,23 +8939,23 @@ proc lineclick {x y id isnew} { proc normalline {} { global thickerline if {[info exists thickerline]} { - set id $thickerline - unset thickerline - drawlines $id + set id $thickerline + unset thickerline + drawlines $id } } proc selbyid {id {isnew 1}} { global curview if {[commitinview $id $curview]} { - selectline [rowofcommit $id] $isnew + selectline [rowofcommit $id] $isnew } } proc mstime {} { global startmstime if {![info exists startmstime]} { - set startmstime [clock clicks -milliseconds] + set startmstime [clock clicks -milliseconds] } return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]] } @@ -8912,27 +8967,27 @@ proc rowmenu {x y id} { stopfinding set rowmenuid $id if {$selectedline eq {} || [rowofcommit $id] eq $selectedline} { - set state disabled + set state disabled } else { - set state normal + set state normal } if {[info exists markedid] && $markedid ne $id} { - set mstate normal + set mstate normal } else { - set mstate disabled + set mstate disabled } if {$id ne $nullid && $id ne $nullid2} { - set menu $rowctxmenu - if {$mainhead ne {}} { - $menu entryconfigure 8 -label [mc "Reset %s branch to here" $mainhead] -state normal - } else { - $menu entryconfigure 8 -label [mc "Detached head: can't reset" $mainhead] -state disabled - } - $menu entryconfigure 10 -state $mstate - $menu entryconfigure 11 -state $mstate - $menu entryconfigure 12 -state $mstate + set menu $rowctxmenu + if {$mainhead ne {}} { + $menu entryconfigure 8 -label [mc "Reset %s branch to here" $mainhead] -state normal + } else { + $menu entryconfigure 8 -label [mc "Detached head: can't reset" $mainhead] -state disabled + } + $menu entryconfigure 10 -state $mstate + $menu entryconfigure 11 -state $mstate + $menu entryconfigure 12 -state $mstate } else { - set menu $fakerowmenu + set menu $fakerowmenu } $menu entryconfigure [mca "Diff this -> selected"] -state $state $menu entryconfigure [mca "Diff selected -> this"] -state $state @@ -8953,7 +9008,7 @@ proc gotomark {} { global markedid if {[info exists markedid]} { - selbyid $markedid + selbyid $markedid } } @@ -8963,7 +9018,7 @@ proc replace_by_kids {l r} { set id [commitonrow $r] set l [lreplace $l 0 0] foreach kid $children($curview,$id) { - lappend l [rowofcommit $kid] + lappend l [rowofcommit $kid] } return [lsort -integer -decreasing -unique $l] } @@ -8973,23 +9028,23 @@ proc find_common_desc {} { if {![info exists markedid]} return if {![commitinview $markedid $curview] || - ![commitinview $rowmenuid $curview]} return + ![commitinview $rowmenuid $curview]} return #set t1 [clock clicks -milliseconds] set l1 [list [rowofcommit $markedid]] set l2 [list [rowofcommit $rowmenuid]] while 1 { - set r1 [lindex $l1 0] - set r2 [lindex $l2 0] - if {$r1 eq {} || $r2 eq {}} break - if {$r1 == $r2} { - selectline $r1 1 - break - } - if {$r1 > $r2} { - set l1 [replace_by_kids $l1 $r1] - } else { - set l2 [replace_by_kids $l2 $r2] - } + set r1 [lindex $l1 0] + set r2 [lindex $l2 0] + if {$r1 eq {} || $r2 eq {}} break + if {$r1 == $r2} { + selectline $r1 1 + break + } + if {$r1 > $r2} { + set l1 [replace_by_kids $l1 $r1] + } else { + set l2 [replace_by_kids $l2 $r2] + } } #set t2 [clock clicks -milliseconds] #puts "took [expr {$t2-$t1}]ms" @@ -9008,15 +9063,15 @@ proc getpatchid {id} { global patchids if {![info exists patchids($id)]} { - set cmd [diffcmd [list $id] {-p --root}] - # trim off the initial "|" - set cmd [lrange $cmd 1 end] - if {[catch { - set x [eval exec $cmd | git patch-id] - set patchids($id) [lindex $x 0] - }]} { - set patchids($id) "error" - } + set cmd [diffcmd [list $id] {-p --root}] + # trim off the initial "|" + set cmd [lrange $cmd 1 end] + if {[catch { + set x [eval exec $cmd | git patch-id] + set patchids($id) [lindex $x 0] + }]} { + set patchids($id) "error" + } } return $patchids($id) } @@ -9028,75 +9083,75 @@ proc do_cmp_commits {a b} { clear_ctext init_flist {} for {set i 0} {$i < 100} {incr i} { - set skipa 0 - set skipb 0 - if {[llength $parents($curview,$a)] > 1} { - appendshortlink $a [mc "Skipping merge commit "] "\n" - set skipa 1 - } else { - set patcha [getpatchid $a] - } - if {[llength $parents($curview,$b)] > 1} { - appendshortlink $b [mc "Skipping merge commit "] "\n" - set skipb 1 - } else { - set patchb [getpatchid $b] - } - if {!$skipa && !$skipb} { - set heada [lindex $commitinfo($a) 0] - set headb [lindex $commitinfo($b) 0] - if {$patcha eq "error"} { - appendshortlink $a [mc "Error getting patch ID for "] \ - [mc " - stopping\n"] - break - } - if {$patchb eq "error"} { - appendshortlink $b [mc "Error getting patch ID for "] \ - [mc " - stopping\n"] - break - } - if {$patcha eq $patchb} { - if {$heada eq $headb} { - appendshortlink $a [mc "Commit "] - appendshortlink $b " == " " $heada\n" - } else { - appendshortlink $a [mc "Commit "] " $heada\n" - appendshortlink $b [mc " is the same patch as\n "] \ - " $headb\n" - } - set skipa 1 - set skipb 1 - } else { - $ctext insert end "\n" - appendshortlink $a [mc "Commit "] " $heada\n" - appendshortlink $b [mc " differs from\n "] \ - " $headb\n" - $ctext insert end [mc "Diff of commits:\n\n"] - $ctext conf -state disabled - update - diffcommits $a $b - return - } - } - if {$skipa} { - set kids [real_children $curview,$a] - if {[llength $kids] != 1} { - $ctext insert end "\n" - appendshortlink $a [mc "Commit "] \ - [mc " has %s children - stopping\n" [llength $kids]] - break - } - set a [lindex $kids 0] - } - if {$skipb} { - set kids [real_children $curview,$b] - if {[llength $kids] != 1} { - appendshortlink $b [mc "Commit "] \ - [mc " has %s children - stopping\n" [llength $kids]] - break - } - set b [lindex $kids 0] - } + set skipa 0 + set skipb 0 + if {[llength $parents($curview,$a)] > 1} { + appendshortlink $a [mc "Skipping merge commit "] "\n" + set skipa 1 + } else { + set patcha [getpatchid $a] + } + if {[llength $parents($curview,$b)] > 1} { + appendshortlink $b [mc "Skipping merge commit "] "\n" + set skipb 1 + } else { + set patchb [getpatchid $b] + } + if {!$skipa && !$skipb} { + set heada [lindex $commitinfo($a) 0] + set headb [lindex $commitinfo($b) 0] + if {$patcha eq "error"} { + appendshortlink $a [mc "Error getting patch ID for "] \ + [mc " - stopping\n"] + break + } + if {$patchb eq "error"} { + appendshortlink $b [mc "Error getting patch ID for "] \ + [mc " - stopping\n"] + break + } + if {$patcha eq $patchb} { + if {$heada eq $headb} { + appendshortlink $a [mc "Commit "] + appendshortlink $b " == " " $heada\n" + } else { + appendshortlink $a [mc "Commit "] " $heada\n" + appendshortlink $b [mc " is the same patch as\n "] \ + " $headb\n" + } + set skipa 1 + set skipb 1 + } else { + $ctext insert end "\n" + appendshortlink $a [mc "Commit "] " $heada\n" + appendshortlink $b [mc " differs from\n "] \ + " $headb\n" + $ctext insert end [mc "Diff of commits:\n\n"] + $ctext conf -state disabled + update + diffcommits $a $b + return + } + } + if {$skipa} { + set kids [real_children $curview,$a] + if {[llength $kids] != 1} { + $ctext insert end "\n" + appendshortlink $a [mc "Commit "] \ + [mc " has %s children - stopping\n" [llength $kids]] + break + } + set a [lindex $kids 0] + } + if {$skipb} { + set kids [real_children $curview,$b] + if {[llength $kids] != 1} { + appendshortlink $b [mc "Commit "] \ + [mc " has %s children - stopping\n" [llength $kids]] + break + } + set b [lindex $kids 0] + } } $ctext conf -state disabled } @@ -9108,17 +9163,17 @@ proc diffcommits {a b} { set fna [file join $tmpdir "commit-[string range $a 0 7]"] set fnb [file join $tmpdir "commit-[string range $b 0 7]"] if {[catch { - exec git diff-tree -p --pretty $a >$fna - exec git diff-tree -p --pretty $b >$fnb + exec git diff-tree -p --pretty $a >$fna + exec git diff-tree -p --pretty $b >$fnb } err]} { - error_popup [mc "Error writing commit to file: %s" $err] - return + error_popup [mc "Error writing commit to file: %s" $err] + return } if {[catch { - set fd [open "| diff -U$diffcontext $fna $fnb" r] + set fd [open "| diff -U$diffcontext $fna $fnb" r] } err]} { - error_popup [mc "Error diffing commits: %s" $err] - return + error_popup [mc "Error diffing commits: %s" $err] + return } set diffids [list commits $a $b] set blobdifffd($diffids) $fd @@ -9132,11 +9187,11 @@ proc diffvssel {dirn} { if {$selectedline eq {}} return if {$dirn} { - set oldid [commitonrow $selectedline] - set newid $rowmenuid + set oldid [commitonrow $selectedline] + set newid $rowmenuid } else { - set oldid $rowmenuid - set newid [commitonrow $selectedline] + set oldid $rowmenuid + set newid [commitonrow $selectedline] } addtohistory [list doseldiff $oldid $newid] savectextpos doseldiff $oldid $newid @@ -9147,11 +9202,11 @@ proc diffvsmark {dirn} { if {![info exists markedid]} return if {$dirn} { - set oldid $markedid - set newid $rowmenuid + set oldid $markedid + set newid $rowmenuid } else { - set oldid $rowmenuid - set newid $markedid + set oldid $rowmenuid + set newid $markedid } addtohistory [list doseldiff $oldid $newid] savectextpos doseldiff $oldid $newid @@ -9240,11 +9295,11 @@ proc mkpatchrev {} { set newid [$patchtop.tosha1 get] set newhead [$patchtop.tohead get] foreach e [list fromsha1 fromhead tosha1 tohead] \ - v [list $newid $newhead $oldid $oldhead] { - $patchtop.$e conf -state normal - $patchtop.$e delete 0 end - $patchtop.$e insert 0 $v - $patchtop.$e conf -state readonly + v [list $newid $newhead $oldid $oldhead] { + $patchtop.$e conf -state normal + $patchtop.$e delete 0 end + $patchtop.$e insert 0 $v + $patchtop.$e conf -state readonly } } @@ -9259,7 +9314,7 @@ proc mkpatchgo {} { set cmd [lrange $cmd 1 end] lappend cmd >$fname & if {[catch {eval exec $cmd} err]} { - error_popup "[mc "Error creating patch:"] $err" $patchtop + error_popup "[mc "Error creating patch:"] $err" $patchtop } catch {destroy $patchtop} unset patchtop @@ -9318,22 +9373,22 @@ proc domktag {} { set tag [$mktagtop.tag get] set msg [$mktagtop.msg get] if {$tag == {}} { - error_popup [mc "No tag name specified"] $mktagtop - return 0 + error_popup [mc "No tag name specified"] $mktagtop + return 0 } if {[info exists tagids($tag)]} { - error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop - return 0 + error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop + return 0 } if {[catch { - if {$msg != {}} { - exec git tag -a -m $msg $tag $id - } else { - exec git tag $tag $id - } + if {$msg != {}} { + exec git tag -a -m $msg $tag $id + } else { + exec git tag $tag $id + } } err]} { - error_popup "[mc "Error creating tag:"] $err" $mktagtop - return 0 + error_popup "[mc "Error creating tag:"] $err" $mktagtop + return 0 } set tagids($tag) $id @@ -9354,9 +9409,9 @@ proc redrawtags {id} { if {![info exists iddrawn($id)]} return set row [rowofcommit $id] if {$id eq $mainheadid} { - set ofill $mainheadcirclecolor + set ofill $mainheadcirclecolor } else { - set ofill [lindex $circlecolors $cmitlisted($curview,$id)] + set ofill [lindex $circlecolors $cmitlisted($curview,$id)] } $canv itemconf $circleitem($row) -fill $ofill $canv delete tag.$id @@ -9366,14 +9421,14 @@ proc redrawtags {id} { set font [$canv itemcget $linehtag($id) -font] set xr [expr {$xt + [font measure $font $text]}] if {$xr > $canvxmax} { - set canvxmax $xr - setcanvscroll + set canvxmax $xr + setcanvscroll } if {[info exists currentid] && $currentid == $id} { - make_secsel $id + make_secsel $id } if {[info exists markedid] && $markedid eq $id} { - make_idmark $id + make_idmark $id } } @@ -9389,7 +9444,7 @@ proc mktaggo {} { mktagcan } -proc copysummary {} { +proc copyreference {} { global rowmenuid autosellen set format "%h (\"%s\", %ad)" @@ -9397,10 +9452,10 @@ proc copysummary {} { if {$autosellen < 40} { lappend cmd --abbrev=$autosellen } - set summary [eval exec $cmd $rowmenuid] + set reference [eval exec $cmd $rowmenuid] clipboard clear - clipboard append $summary + clipboard append $reference } proc writecommit {} { @@ -9448,7 +9503,7 @@ proc wrcomgo {} { set cmd "echo $id | [$wrcomtop.cmd get]" set fname [$wrcomtop.fname get] if {[catch {exec sh -c $cmd >$fname &} err]} { - error_popup "[mc "Error writing commit:"] $err" $wrcomtop + error_popup "[mc "Error writing commit:"] $err" $wrcomtop } catch {destroy $wrcomtop} unset wrcomtop @@ -9535,41 +9590,41 @@ proc mkbrgo {top} { set cmdargs {} set old_id {} if {$name eq {}} { - error_popup [mc "Please specify a name for the new branch"] $top - return + error_popup [mc "Please specify a name for the new branch"] $top + return } if {[info exists headids($name)]} { - if {![confirm_popup [mc \ - "Branch '%s' already exists. Overwrite?" $name] $top]} { - return - } - set old_id $headids($name) - lappend cmdargs -f + if {![confirm_popup [mc \ + "Branch '%s' already exists. Overwrite?" $name] $top]} { + return + } + set old_id $headids($name) + lappend cmdargs -f } catch {destroy $top} lappend cmdargs $name $id nowbusy newbranch update if {[catch { - eval exec git branch $cmdargs + eval exec git branch $cmdargs } err]} { - notbusy newbranch - error_popup $err + notbusy newbranch + error_popup $err } else { - notbusy newbranch - if {$old_id ne {}} { - movehead $id $name - movedhead $id $name - redrawtags $old_id - redrawtags $id - } else { - set headids($name) $id - lappend idheads($id) $name - addedhead $id $name - redrawtags $id - } - dispneartags 0 - run refill_reflist + notbusy newbranch + if {$old_id ne {}} { + movehead $id $name + movedhead $id $name + redrawtags $old_id + redrawtags $id + } else { + set headids($name) $id + lappend idheads($id) $name + addedhead $id $name + redrawtags $id + } + dispneartags 0 + run refill_reflist } } @@ -9580,36 +9635,36 @@ proc mvbrgo {top prevname} { set id [$top.sha1 get] set cmdargs {} if {$name eq $prevname} { - catch {destroy $top} - return + catch {destroy $top} + return } if {$name eq {}} { - error_popup [mc "Please specify a new name for the branch"] $top - return + error_popup [mc "Please specify a new name for the branch"] $top + return } catch {destroy $top} lappend cmdargs -m $prevname $name nowbusy renamebranch update if {[catch { - eval exec git branch $cmdargs + eval exec git branch $cmdargs } err]} { - notbusy renamebranch - error_popup $err + notbusy renamebranch + error_popup $err } else { - notbusy renamebranch - removehead $id $prevname - removedhead $id $prevname - set headids($name) $id - lappend idheads($id) $name - addedhead $id $name - if {$prevname eq $mainhead} { - set mainhead $name - set mainheadid $id - } - redrawtags $id - dispneartags 0 - run refill_reflist + notbusy renamebranch + removehead $id $prevname + removedhead $id $prevname + set headids($name) $id + lappend idheads($id) $name + addedhead $id $name + if {$prevname eq $mainhead} { + set mainhead $name + set mainheadid $id + } + redrawtags $id + dispneartags 0 + run refill_reflist } } @@ -9619,18 +9674,18 @@ proc exec_citool {tool_args {baseid {}}} { set save_env [array get env GIT_AUTHOR_*] if {$baseid ne {}} { - if {![info exists commitinfo($baseid)]} { - getcommit $baseid - } - set author [lindex $commitinfo($baseid) 1] - set date [lindex $commitinfo($baseid) 2] - if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \ - $author author name email] - && $date ne {}} { - set env(GIT_AUTHOR_NAME) $name - set env(GIT_AUTHOR_EMAIL) $email - set env(GIT_AUTHOR_DATE) $date - } + if {![info exists commitinfo($baseid)]} { + getcommit $baseid + } + set author [lindex $commitinfo($baseid) 1] + set date [lindex $commitinfo($baseid) 2] + if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \ + $author author name email] + && $date ne {}} { + set env(GIT_AUTHOR_NAME) $name + set env(GIT_AUTHOR_EMAIL) $email + set env(GIT_AUTHOR_DATE) $date + } } eval exec git citool $tool_args & @@ -9647,57 +9702,57 @@ proc cherrypick {} { set oldhead [exec git rev-parse HEAD] set dheads [descheads $rowmenuid] if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} { - set ok [confirm_popup [mc "Commit %s is already\ - included in branch %s -- really re-apply it?" \ - [string range $rowmenuid 0 7] $mainhead]] - if {!$ok} return + set ok [confirm_popup [mc "Commit %s is already\ + included in branch %s -- really re-apply it?" \ + [string range $rowmenuid 0 7] $mainhead]] + if {!$ok} return } nowbusy cherrypick [mc "Cherry-picking"] update # Unfortunately git-cherry-pick writes stuff to stderr even when # no error occurs, and exec takes that as an indication of error... if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} { - notbusy cherrypick - if {[regexp -line \ - {Entry '(.*)' (would be overwritten by merge|not uptodate)} \ - $err msg fname]} { - error_popup [mc "Cherry-pick failed because of local changes\ - to file '%s'.\nPlease commit, reset or stash\ - your changes and try again." $fname] - } elseif {[regexp -line \ - {^(CONFLICT \(.*\):|Automatic cherry-pick failed|error: could not apply)} \ - $err]} { - if {[confirm_popup [mc "Cherry-pick failed because of merge\ - conflict.\nDo you wish to run git citool to\ - resolve it?"]]} { - # Force citool to read MERGE_MSG - file delete [file join $gitdir "GITGUI_MSG"] - exec_citool {} $rowmenuid - } - } else { - error_popup $err - } - run updatecommits - return + notbusy cherrypick + if {[regexp -line \ + {Entry '(.*)' (would be overwritten by merge|not uptodate)} \ + $err msg fname]} { + error_popup [mc "Cherry-pick failed because of local changes\ + to file '%s'.\nPlease commit, reset or stash\ + your changes and try again." $fname] + } elseif {[regexp -line \ + {^(CONFLICT \(.*\):|Automatic cherry-pick failed|error: could not apply)} \ + $err]} { + if {[confirm_popup [mc "Cherry-pick failed because of merge\ + conflict.\nDo you wish to run git citool to\ + resolve it?"]]} { + # Force citool to read MERGE_MSG + file delete [file join $gitdir "GITGUI_MSG"] + exec_citool {} $rowmenuid + } + } else { + error_popup $err + } + run updatecommits + return } set newhead [exec git rev-parse HEAD] if {$newhead eq $oldhead} { - notbusy cherrypick - error_popup [mc "No changes committed"] - return + notbusy cherrypick + error_popup [mc "No changes committed"] + return } addnewchild $newhead $oldhead if {[commitinview $oldhead $curview]} { - # XXX this isn't right if we have a path limit... - insertrow $newhead $oldhead $curview - if {$mainhead ne {}} { - movehead $newhead $mainhead - movedhead $newhead $mainhead - } - set mainheadid $newhead - redrawtags $oldhead - redrawtags $newhead - selbyid $newhead + # XXX this isn't right if we have a path limit... + insertrow $newhead $oldhead $curview + if {$mainhead ne {}} { + movehead $newhead $mainhead + movedhead $newhead $mainhead + } + set mainheadid $newhead + redrawtags $oldhead + redrawtags $newhead + selbyid $newhead } notbusy cherrypick } @@ -9772,18 +9827,18 @@ proc resethead {} { make_transient $w . wm title $w [mc "Confirm reset"] ${NS}::label $w.m -text \ - [mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]] + [mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]] pack $w.m -side top -fill x -padx 20 -pady 20 ${NS}::labelframe $w.f -text [mc "Reset type:"] set resettype mixed ${NS}::radiobutton $w.f.soft -value soft -variable resettype \ - -text [mc "Soft: Leave working tree and index untouched"] + -text [mc "Soft: Leave working tree and index untouched"] grid $w.f.soft -sticky w ${NS}::radiobutton $w.f.mixed -value mixed -variable resettype \ - -text [mc "Mixed: Leave working tree untouched, reset index"] + -text [mc "Mixed: Leave working tree untouched, reset index"] grid $w.f.mixed -sticky w ${NS}::radiobutton $w.f.hard -value hard -variable resettype \ - -text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"] + -text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"] grid $w.f.hard -sticky w pack $w.f -side top -fill x -padx 4 ${NS}::button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w" @@ -9795,13 +9850,13 @@ proc resethead {} { tkwait window $w if {!$confirm_ok} return if {[catch {set fd [open \ - [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} { - error_popup $err + [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} { + error_popup $err } else { - dohidelocalchanges - filerun $fd [list readresetstat $fd] - nowbusy reset [mc "Resetting"] - selbyid $rowmenuid + dohidelocalchanges + filerun $fd [list readresetstat $fd] + nowbusy reset [mc "Resetting"] + selbyid $rowmenuid } } @@ -9809,29 +9864,29 @@ proc readresetstat {fd} { global mainhead mainheadid showlocalchanges rprogcoord if {[gets $fd line] >= 0} { - if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} { - set rprogcoord [expr {1.0 * $m / $n}] - adjustprogress - } - return 1 + if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} { + set rprogcoord [expr {1.0 * $m / $n}] + adjustprogress + } + return 1 } set rprogcoord 0 adjustprogress notbusy reset if {[catch {close $fd} err]} { - error_popup $err + error_popup $err } set oldhead $mainheadid set newhead [exec git rev-parse HEAD] if {$newhead ne $oldhead} { - movehead $newhead $mainhead - movedhead $newhead $mainhead - set mainheadid $newhead - redrawtags $oldhead - redrawtags $newhead + movehead $newhead $mainhead + movedhead $newhead $mainhead + set mainheadid $newhead + redrawtags $oldhead + redrawtags $newhead } if {$showlocalchanges} { - doshowlocalchanges + doshowlocalchanges } return 0 } @@ -9845,17 +9900,17 @@ proc headmenu {x y id head} { set headmenuhead $head array set state {0 normal 1 normal 2 normal} if {[string match "remotes/*" $head]} { - set localhead [string range $head [expr [string last / $head] + 1] end] - if {[info exists headids($localhead)]} { - set state(0) disabled - } - array set state {1 disabled 2 disabled} + set localhead [string range $head [expr [string last / $head] + 1] end] + if {[info exists headids($localhead)]} { + set state(0) disabled + } + array set state {1 disabled 2 disabled} } if {$head eq $mainhead} { - array set state {0 disabled 2 disabled} + array set state {0 disabled 2 disabled} } foreach i {0 1 2} { - $headctxmenu entryconfigure $i -state $state($i) + $headctxmenu entryconfigure $i -state $state($i) } tk_popup $headctxmenu $x $y } @@ -9868,32 +9923,32 @@ proc cobranch {} { set newhead $headmenuhead set command [list | git checkout] if {[string match "remotes/*" $newhead]} { - set remote $newhead - set newhead [string range $newhead [expr [string last / $newhead] + 1] end] - # The following check is redundant - the menu option should - # be disabled to begin with... - if {[info exists headids($newhead)]} { - error_popup [mc "A local branch named %s exists already" $newhead] - return - } - lappend command -b $newhead --track $remote + set remote $newhead + set newhead [string range $newhead [expr [string last / $newhead] + 1] end] + # The following check is redundant - the menu option should + # be disabled to begin with... + if {[info exists headids($newhead)]} { + error_popup [mc "A local branch named %s exists already" $newhead] + return + } + lappend command -b $newhead --track $remote } else { - lappend command $newhead + lappend command $newhead } lappend command 2>@1 nowbusy checkout [mc "Checking out"] update dohidelocalchanges if {[catch { - set fd [open $command r] + set fd [open $command r] } err]} { - notbusy checkout - error_popup $err - if {$showlocalchanges} { - dodiffindex - } + notbusy checkout + error_popup $err + if {$showlocalchanges} { + dodiffindex + } } else { - filerun $fd [list readcheckoutstat $fd $newhead $headmenuid] + filerun $fd [list readcheckoutstat $fd $newhead $headmenuid] } } @@ -9902,24 +9957,24 @@ proc readcheckoutstat {fd newhead newheadid} { global viewmainheadid curview if {[gets $fd line] >= 0} { - if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} { - set progresscoords [list 0 [expr {1.0 * $m / $n}]] - adjustprogress - } - return 1 + if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} { + set progresscoords [list 0 [expr {1.0 * $m / $n}]] + adjustprogress + } + return 1 } set progresscoords {0 0} adjustprogress notbusy checkout if {[catch {close $fd} err]} { - error_popup $err - return + error_popup $err + return } set oldmainid $mainheadid if {! [info exists headids($newhead)]} { - set headids($newhead) $newheadid - lappend idheads($newheadid) $newhead - addedhead $newheadid $newhead + set headids($newhead) $newheadid + lappend idheads($newheadid) $newhead + addedhead $newheadid $newhead } set mainhead $newhead set mainheadid $newheadid @@ -9928,7 +9983,7 @@ proc readcheckoutstat {fd newhead newheadid} { redrawtags $newheadid selbyid $newheadid if {$showlocalchanges} { - dodiffindex + dodiffindex } } @@ -9940,21 +9995,21 @@ proc rmbranch {} { set id $headmenuid # this check shouldn't be needed any more... if {$head eq $mainhead} { - error_popup [mc "Cannot delete the currently checked-out branch"] - return + error_popup [mc "Cannot delete the currently checked-out branch"] + return } set dheads [descheads $id] if {[llength $dheads] == 1 && $idheads($dheads) eq $head} { - # the stuff on this branch isn't on any other branch - if {![confirm_popup [mc "The commits on branch %s aren't on any other\ - branch.\nReally delete branch %s?" $head $head]]} return + # the stuff on this branch isn't on any other branch + if {![confirm_popup [mc "The commits on branch %s aren't on any other\ + branch.\nReally delete branch %s?" $head $head]]} return } nowbusy rmbranch update if {[catch {exec git branch -D $head} err]} { - notbusy rmbranch - error_popup $err - return + notbusy rmbranch + error_popup $err + return } removehead $id $head removedhead $id $head @@ -9972,22 +10027,22 @@ proc showrefs {} { set top .showrefs set showrefstop $top if {[winfo exists $top]} { - raise $top - refill_reflist - return + raise $top + refill_reflist + return } ttk_toplevel $top wm title $top [mc "Tags and heads: %s" [file tail [pwd]]] make_transient $top . text $top.list -background $bgcolor -foreground $fgcolor \ - -selectbackground $selectbgcolor -font mainfont \ - -xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \ - -width 30 -height 20 -cursor $maincursor \ - -spacing1 1 -spacing3 1 -state disabled + -selectbackground $selectbgcolor -font mainfont \ + -xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \ + -width 30 -height 20 -cursor $maincursor \ + -spacing1 1 -spacing3 1 -state disabled $top.list tag configure highlight -background $selectbgcolor if {![lsearch -exact $bglist $top.list]} { - lappend bglist $top.list - lappend fglist $top.list + lappend bglist $top.list + lappend fglist $top.list } ${NS}::scrollbar $top.ysb -command "$top.list yview" -orient vertical ${NS}::scrollbar $top.xsb -command "$top.list xview" -orient horizontal @@ -10021,9 +10076,10 @@ proc sel_reflist {w x y} { set ref [lindex $reflist [expr {$l-1}]] set n [lindex $ref 0] switch -- [lindex $ref 1] { - "H" {selbyid $headids($n)} - "T" {selbyid $tagids($n)} - "o" {selbyid $otherrefids($n)} + "H" {selbyid $headids($n)} + "R" {selbyid $headids($n)} + "T" {selbyid $tagids($n)} + "o" {selbyid $otherrefids($n)} } $showrefstop.list tag add highlight $l.0 "$l.0 lineend" } @@ -10049,31 +10105,35 @@ proc refill_reflist {} { if {![info exists showrefstop] || ![winfo exists $showrefstop]} return set refs {} foreach n [array names headids] { - if {[string match $reflistfilter $n]} { - if {[commitinview $headids($n) $curview]} { - lappend refs [list $n H] - } else { - interestedin $headids($n) {run refill_reflist} - } - } + 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] + } + } else { + interestedin $headids($n) {run refill_reflist} + } + } } foreach n [array names tagids] { - if {[string match $reflistfilter $n]} { - if {[commitinview $tagids($n) $curview]} { - lappend refs [list $n T] - } else { - interestedin $tagids($n) {run refill_reflist} - } - } + if {[string match $reflistfilter $n]} { + if {[commitinview $tagids($n) $curview]} { + lappend refs [list $n T] + } else { + interestedin $tagids($n) {run refill_reflist} + } + } } foreach n [array names otherrefids] { - if {[string match $reflistfilter $n]} { - if {[commitinview $otherrefids($n) $curview]} { - lappend refs [list $n o] - } else { - interestedin $otherrefids($n) {run refill_reflist} - } - } + if {[string match $reflistfilter $n]} { + if {[commitinview $otherrefids($n) $curview]} { + lappend refs [list $n o] + } else { + interestedin $otherrefids($n) {run refill_reflist} + } + } } set refs [lsort -index 0 $refs] if {$refs eq $reflist} return @@ -10085,37 +10145,37 @@ proc refill_reflist {} { set i 0 set j 0 while {$i < [llength $reflist] || $j < [llength $refs]} { - if {$i < [llength $reflist]} { - if {$j < [llength $refs]} { - set cmp [string compare [lindex $reflist $i 0] \ - [lindex $refs $j 0]] - if {$cmp == 0} { - set cmp [string compare [lindex $reflist $i 1] \ - [lindex $refs $j 1]] - } - } else { - set cmp -1 - } - } else { - set cmp 1 - } - switch -- $cmp { - -1 { - $showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0" - incr i - } - 0 { - incr i - incr j - } - 1 { - set l [expr {$j + 1}] - $showrefstop.list image create $l.0 -align baseline \ - -image reficon-[lindex $refs $j 1] -padx 2 - $showrefstop.list insert $l.1 "[lindex $refs $j 0]\n" - incr j - } - } + if {$i < [llength $reflist]} { + if {$j < [llength $refs]} { + set cmp [string compare [lindex $reflist $i 0] \ + [lindex $refs $j 0]] + if {$cmp == 0} { + set cmp [string compare [lindex $reflist $i 1] \ + [lindex $refs $j 1]] + } + } else { + set cmp -1 + } + } else { + set cmp 1 + } + switch -- $cmp { + -1 { + $showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0" + incr i + } + 0 { + incr i + incr j + } + 1 { + set l [expr {$j + 1}] + $showrefstop.list image create $l.0 -align baseline \ + -image reficon-[lindex $refs $j 1] -padx 2 + $showrefstop.list insert $l.1 "[lindex $refs $j 0]\n" + incr j + } + } } set reflist $refs # delete last newline @@ -10130,54 +10190,54 @@ proc getallcommits {} { global gitdir if {![info exists allcommits]} { - set nextarc 0 - set allcommits 0 - set seeds {} - set allcwait 0 - set cachedarcs 0 - set allccache [file join $gitdir "gitk.cache"] - if {![catch { - set f [open $allccache r] - set allcwait 1 - getcache $f - }]} return + set nextarc 0 + set allcommits 0 + set seeds {} + set allcwait 0 + set cachedarcs 0 + set allccache [file join $gitdir "gitk.cache"] + if {![catch { + set f [open $allccache r] + set allcwait 1 + getcache $f + }]} return } if {$allcwait} { - return + return } set cmd [list | git rev-list --parents] set allcupdate [expr {$seeds ne {}}] if {!$allcupdate} { - set ids "--all" + set ids "--all" } else { - set refs [concat [array names idheads] [array names idtags] \ - [array names idotherrefs]] - set ids {} - set tagobjs {} - foreach name [array names tagobjid] { - lappend tagobjs $tagobjid($name) - } - foreach id [lsort -unique $refs] { - if {![info exists allparents($id)] && - [lsearch -exact $tagobjs $id] < 0} { - lappend ids $id - } - } - if {$ids ne {}} { - foreach id $seeds { - lappend ids "^$id" - } - } + set refs [concat [array names idheads] [array names idtags] \ + [array names idotherrefs]] + set ids {} + set tagobjs {} + foreach name [array names tagobjid] { + lappend tagobjs $tagobjid($name) + } + foreach id [lsort -unique $refs] { + if {![info exists allparents($id)] && + [lsearch -exact $tagobjs $id] < 0} { + lappend ids $id + } + } + if {$ids ne {}} { + foreach id $seeds { + lappend ids "^$id" + } + } } if {$ids ne {}} { - set fd [open [concat $cmd $ids] r] - fconfigure $fd -blocking 0 - incr allcommits - nowbusy allcommits - filerun $fd [list getallclines $fd] + set fd [open [concat $cmd $ids] r] + fconfigure $fd -blocking 0 + incr allcommits + nowbusy allcommits + filerun $fd [list getallclines $fd] } else { - dispneartags 0 + dispneartags 0 } } @@ -10203,103 +10263,103 @@ proc getallclines {fd} { set nid 0 while {[incr nid] <= 1000 && [gets $fd line] >= 0} { - set id [lindex $line 0] - if {[info exists allparents($id)]} { - # seen it already - continue - } - set cachedarcs 0 - set olds [lrange $line 1 end] - set allparents($id) $olds - if {![info exists allchildren($id)]} { - set allchildren($id) {} - set arcnos($id) {} - lappend seeds $id - } else { - set a $arcnos($id) - if {[llength $olds] == 1 && [llength $a] == 1} { - lappend arcids($a) $id - if {[info exists idtags($id)]} { - lappend arctags($a) $id - } - if {[info exists idheads($id)]} { - lappend archeads($a) $id - } - if {[info exists allparents($olds)]} { - # seen parent already - if {![info exists arcout($olds)]} { - splitarc $olds - } - lappend arcids($a) $olds - set arcend($a) $olds - unset growing($a) - } - lappend allchildren($olds) $id - lappend arcnos($olds) $a - continue - } - } - foreach a $arcnos($id) { - lappend arcids($a) $id - set arcend($a) $id - unset growing($a) - } - - set ao {} - foreach p $olds { - lappend allchildren($p) $id - set a [incr nextarc] - set arcstart($a) $id - set archeads($a) {} - set arctags($a) {} - set archeads($a) {} - set arcids($a) {} - lappend ao $a - set growing($a) 1 - if {[info exists allparents($p)]} { - # seen it already, may need to make a new branch - if {![info exists arcout($p)]} { - splitarc $p - } - lappend arcids($a) $p - set arcend($a) $p - unset growing($a) - } - lappend arcnos($p) $a - } - set arcout($id) $ao + set id [lindex $line 0] + if {[info exists allparents($id)]} { + # seen it already + continue + } + set cachedarcs 0 + set olds [lrange $line 1 end] + set allparents($id) $olds + if {![info exists allchildren($id)]} { + set allchildren($id) {} + set arcnos($id) {} + lappend seeds $id + } else { + set a $arcnos($id) + if {[llength $olds] == 1 && [llength $a] == 1} { + lappend arcids($a) $id + if {[info exists idtags($id)]} { + lappend arctags($a) $id + } + if {[info exists idheads($id)]} { + lappend archeads($a) $id + } + if {[info exists allparents($olds)]} { + # seen parent already + if {![info exists arcout($olds)]} { + splitarc $olds + } + lappend arcids($a) $olds + set arcend($a) $olds + unset growing($a) + } + lappend allchildren($olds) $id + lappend arcnos($olds) $a + continue + } + } + foreach a $arcnos($id) { + lappend arcids($a) $id + set arcend($a) $id + unset growing($a) + } + + set ao {} + foreach p $olds { + lappend allchildren($p) $id + set a [incr nextarc] + set arcstart($a) $id + set archeads($a) {} + set arctags($a) {} + set archeads($a) {} + set arcids($a) {} + lappend ao $a + set growing($a) 1 + if {[info exists allparents($p)]} { + # seen it already, may need to make a new branch + if {![info exists arcout($p)]} { + splitarc $p + } + lappend arcids($a) $p + set arcend($a) $p + unset growing($a) + } + lappend arcnos($p) $a + } + set arcout($id) $ao } if {$nid > 0} { - global cached_dheads cached_dtags cached_atags - unset -nocomplain cached_dheads - unset -nocomplain cached_dtags - unset -nocomplain cached_atags + global cached_dheads cached_dtags cached_atags + unset -nocomplain cached_dheads + unset -nocomplain cached_dtags + unset -nocomplain cached_atags } if {![eof $fd]} { - return [expr {$nid >= 1000? 2: 1}] + return [expr {$nid >= 1000? 2: 1}] } set cacheok 1 if {[catch { - fconfigure $fd -blocking 1 - close $fd + fconfigure $fd -blocking 1 + close $fd } err]} { - # got an error reading the list of commits - # if we were updating, try rereading the whole thing again - if {$allcupdate} { - incr allcommits -1 - dropcache $err - return - } - error_popup "[mc "Error reading commit topology information;\ - branch and preceding/following tag information\ - will be incomplete."]\n($err)" - set cacheok 0 + # got an error reading the list of commits + # if we were updating, try rereading the whole thing again + if {$allcupdate} { + incr allcommits -1 + dropcache $err + return + } + error_popup "[mc "Error reading commit topology information;\ + branch and preceding/following tag information\ + will be incomplete."]\n($err)" + set cacheok 0 } if {[incr allcommits -1] == 0} { - notbusy allcommits - if {$cacheok} { - run savecache - } + notbusy allcommits + if {$cacheok} { + run savecache + } } dispneartags 0 return 0 @@ -10311,12 +10371,12 @@ proc recalcarc {a} { set at {} set ah {} foreach id [lrange $arcids($a) 0 end-1] { - if {[info exists idtags($id)]} { - lappend at $id - } - if {[info exists idheads($id)]} { - lappend ah $id - } + if {[info exists idtags($id)]} { + lappend at $id + } + if {[info exists idheads($id)]} { + lappend ah $id + } } set arctags($a) $at set archeads($a) $ah @@ -10328,22 +10388,22 @@ proc splitarc {p} { set a $arcnos($p) if {[llength $a] != 1} { - puts "oops splitarc called but [llength $a] arcs already" - return + puts "oops splitarc called but [llength $a] arcs already" + return } set a [lindex $a 0] set i [lsearch -exact $arcids($a) $p] if {$i < 0} { - puts "oops splitarc $p not in arc $a" - return + puts "oops splitarc $p not in arc $a" + return } set na [incr nextarc] if {[info exists arcend($a)]} { - set arcend($na) $arcend($a) + set arcend($na) $arcend($a) } else { - set l [lindex $allparents([lindex $arcids($a) end]) 0] - set j [lsearch -exact $arcnos($l) $a] - set arcnos($l) [lreplace $arcnos($l) $j $j $na] + set l [lindex $allparents([lindex $arcids($a) end]) 0] + set j [lsearch -exact $arcnos($l) $a] + set arcnos($l) [lreplace $arcnos($l) $j $j $na] } set tail [lrange $arcids($a) [expr {$i+1}] end] set arcids($a) [lrange $arcids($a) 0 $i] @@ -10352,26 +10412,26 @@ proc splitarc {p} { set arcout($p) $na set arcids($na) $tail if {[info exists growing($a)]} { - set growing($na) 1 - unset growing($a) + set growing($na) 1 + unset growing($a) } foreach id $tail { - if {[llength $arcnos($id)] == 1} { - set arcnos($id) $na - } else { - set j [lsearch -exact $arcnos($id) $a] - set arcnos($id) [lreplace $arcnos($id) $j $j $na] - } + if {[llength $arcnos($id)] == 1} { + set arcnos($id) $na + } else { + set j [lsearch -exact $arcnos($id) $a] + set arcnos($id) [lreplace $arcnos($id) $j $j $na] + } } # reconstruct tags and heads lists if {$arctags($a) ne {} || $archeads($a) ne {}} { - recalcarc $a - recalcarc $na + recalcarc $a + recalcarc $na } else { - set arctags($na) {} - set archeads($na) {} + set arctags($na) {} + set archeads($na) {} } } @@ -10395,7 +10455,7 @@ proc addnewchild {id p} { set arcids($a) [list $p] set arcend($a) $p if {![info exists arcout($p)]} { - splitarc $p + splitarc $p } lappend arcnos($p) $a set arcout($id) [list $a] @@ -10412,78 +10472,78 @@ proc readcache {f} { set a $nextarc set lim $cachedarcs if {$lim - $a > 500} { - set lim [expr {$a + 500}] + set lim [expr {$a + 500}] } if {[catch { - if {$a == $lim} { - # finish reading the cache and setting up arctags, etc. - set line [gets $f] - if {$line ne "1"} {error "bad final version"} - close $f - foreach id [array names idtags] { - if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 && - [llength $allparents($id)] == 1} { - set a [lindex $arcnos($id) 0] - if {$arctags($a) eq {}} { - recalcarc $a - } - } - } - foreach id [array names idheads] { - if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 && - [llength $allparents($id)] == 1} { - set a [lindex $arcnos($id) 0] - if {$archeads($a) eq {}} { - recalcarc $a - } - } - } - foreach id [lsort -unique $possible_seeds] { - if {$arcnos($id) eq {}} { - lappend seeds $id - } - } - set allcwait 0 - } else { - while {[incr a] <= $lim} { - set line [gets $f] - if {[llength $line] != 3} {error "bad line"} - set s [lindex $line 0] - set arcstart($a) $s - lappend arcout($s) $a - if {![info exists arcnos($s)]} { - lappend possible_seeds $s - set arcnos($s) {} - } - set e [lindex $line 1] - if {$e eq {}} { - set growing($a) 1 - } else { - set arcend($a) $e - if {![info exists arcout($e)]} { - set arcout($e) {} - } - } - set arcids($a) [lindex $line 2] - foreach id $arcids($a) { - lappend allparents($s) $id - set s $id - lappend arcnos($id) $a - } - if {![info exists allparents($s)]} { - set allparents($s) {} - } - set arctags($a) {} - set archeads($a) {} - } - set nextarc [expr {$a - 1}] - } + if {$a == $lim} { + # finish reading the cache and setting up arctags, etc. + set line [gets $f] + if {$line ne "1"} {error "bad final version"} + close $f + foreach id [array names idtags] { + if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 && + [llength $allparents($id)] == 1} { + set a [lindex $arcnos($id) 0] + if {$arctags($a) eq {}} { + recalcarc $a + } + } + } + foreach id [array names idheads] { + if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 && + [llength $allparents($id)] == 1} { + set a [lindex $arcnos($id) 0] + if {$archeads($a) eq {}} { + recalcarc $a + } + } + } + foreach id [lsort -unique $possible_seeds] { + if {$arcnos($id) eq {}} { + lappend seeds $id + } + } + set allcwait 0 + } else { + while {[incr a] <= $lim} { + set line [gets $f] + if {[llength $line] != 3} {error "bad line"} + set s [lindex $line 0] + set arcstart($a) $s + lappend arcout($s) $a + if {![info exists arcnos($s)]} { + lappend possible_seeds $s + set arcnos($s) {} + } + set e [lindex $line 1] + if {$e eq {}} { + set growing($a) 1 + } else { + set arcend($a) $e + if {![info exists arcout($e)]} { + set arcout($e) {} + } + } + set arcids($a) [lindex $line 2] + foreach id $arcids($a) { + lappend allparents($s) $id + set s $id + lappend arcnos($id) $a + } + if {![info exists allparents($s)]} { + set allparents($s) {} + } + set arctags($a) {} + set archeads($a) {} + } + set nextarc [expr {$a - 1}] + } } err]} { - dropcache $err - return 0 + dropcache $err + return 0 } if {!$allcwait} { - getallcommits + getallcommits } return $allcwait } @@ -10492,16 +10552,16 @@ proc getcache {f} { global nextarc cachedarcs possible_seeds if {[catch { - set line [gets $f] - if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"} - # make sure it's an integer - set cachedarcs [expr {int([lindex $line 1])}] - if {$cachedarcs < 0} {error "bad number of arcs"} - set nextarc 0 - set possible_seeds {} - run readcache $f + set line [gets $f] + if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"} + # make sure it's an integer + set cachedarcs [expr {int([lindex $line 1])}] + if {$cachedarcs < 0} {error "bad number of arcs"} + set nextarc 0 + set possible_seeds {} + run readcache $f } err]} { - dropcache $err + dropcache $err } return 0 } @@ -10511,9 +10571,9 @@ proc dropcache {err} { #puts "dropping cache ($err)" foreach v {arcnos arcout arcids arcstart arcend growing \ - arctags archeads allparents allchildren} { - global $v - unset -nocomplain $v + arctags archeads allparents allchildren} { + global $v + unset -nocomplain $v } set allcwait 0 set nextarc 0 @@ -10529,27 +10589,27 @@ proc writecache {f} { set a $cachearc set lim $cachedarcs if {$lim - $a > 1000} { - set lim [expr {$a + 1000}] + set lim [expr {$a + 1000}] } if {[catch { - while {[incr a] <= $lim} { - if {[info exists arcend($a)]} { - puts $f [list $arcstart($a) $arcend($a) $arcids($a)] - } else { - puts $f [list $arcstart($a) {} $arcids($a)] - } - } + while {[incr a] <= $lim} { + if {[info exists arcend($a)]} { + puts $f [list $arcstart($a) $arcend($a) $arcids($a)] + } else { + puts $f [list $arcstart($a) {} $arcids($a)] + } + } } err]} { - catch {close $f} - catch {file delete $allccache} - #puts "writing cache failed ($err)" - return 0 + catch {close $f} + catch {file delete $allccache} + #puts "writing cache failed ($err)" + return 0 } set cachearc [expr {$a - 1}] if {$a > $cachedarcs} { - puts $f "1" - close $f - return 0 + puts $f "1" + close $f + return 0 } return 1 } @@ -10561,9 +10621,9 @@ proc savecache {} { set cachearc 0 set cachedarcs $nextarc catch { - set f [open $allccache w] - puts $f [list 1 $cachedarcs] - run writecache $f + set f [open $allccache w] + puts $f [list 1 $cachedarcs] + run writecache $f } } @@ -10573,92 +10633,92 @@ proc anc_or_desc {a b} { global arcout arcstart arcend arcnos cached_isanc if {$arcnos($a) eq $arcnos($b)} { - # Both are on the same arc(s); either both are the same BMP, - # or if one is not a BMP, the other is also not a BMP or is - # the BMP at end of the arc (and it only has 1 incoming arc). - # Or both can be BMPs with no incoming arcs. - if {$a eq $b || $arcnos($a) eq {}} { - return 0 - } - # assert {[llength $arcnos($a)] == 1} - set arc [lindex $arcnos($a) 0] - set i [lsearch -exact $arcids($arc) $a] - set j [lsearch -exact $arcids($arc) $b] - if {$i < 0 || $i > $j} { - return 1 - } else { - return -1 - } + # Both are on the same arc(s); either both are the same BMP, + # or if one is not a BMP, the other is also not a BMP or is + # the BMP at end of the arc (and it only has 1 incoming arc). + # Or both can be BMPs with no incoming arcs. + if {$a eq $b || $arcnos($a) eq {}} { + return 0 + } + # assert {[llength $arcnos($a)] == 1} + set arc [lindex $arcnos($a) 0] + set i [lsearch -exact $arcids($arc) $a] + set j [lsearch -exact $arcids($arc) $b] + if {$i < 0 || $i > $j} { + return 1 + } else { + return -1 + } } if {![info exists arcout($a)]} { - set arc [lindex $arcnos($a) 0] - if {[info exists arcend($arc)]} { - set aend $arcend($arc) - } else { - set aend {} - } - set a $arcstart($arc) + set arc [lindex $arcnos($a) 0] + if {[info exists arcend($arc)]} { + set aend $arcend($arc) + } else { + set aend {} + } + set a $arcstart($arc) } else { - set aend $a + set aend $a } if {![info exists arcout($b)]} { - set arc [lindex $arcnos($b) 0] - if {[info exists arcend($arc)]} { - set bend $arcend($arc) - } else { - set bend {} - } - set b $arcstart($arc) + set arc [lindex $arcnos($b) 0] + if {[info exists arcend($arc)]} { + set bend $arcend($arc) + } else { + set bend {} + } + set b $arcstart($arc) } else { - set bend $b + set bend $b } if {$a eq $bend} { - return 1 + return 1 } if {$b eq $aend} { - return -1 + return -1 } if {[info exists cached_isanc($a,$bend)]} { - if {$cached_isanc($a,$bend)} { - return 1 - } + if {$cached_isanc($a,$bend)} { + return 1 + } } if {[info exists cached_isanc($b,$aend)]} { - if {$cached_isanc($b,$aend)} { - return -1 - } - if {[info exists cached_isanc($a,$bend)]} { - return 0 - } + if {$cached_isanc($b,$aend)} { + return -1 + } + if {[info exists cached_isanc($a,$bend)]} { + return 0 + } } set todo [list $a $b] set anc($a) a set anc($b) b for {set i 0} {$i < [llength $todo]} {incr i} { - set x [lindex $todo $i] - if {$anc($x) eq {}} { - continue - } - foreach arc $arcnos($x) { - set xd $arcstart($arc) - if {$xd eq $bend} { - set cached_isanc($a,$bend) 1 - set cached_isanc($b,$aend) 0 - return 1 - } elseif {$xd eq $aend} { - set cached_isanc($b,$aend) 1 - set cached_isanc($a,$bend) 0 - return -1 - } - if {![info exists anc($xd)]} { - set anc($xd) $anc($x) - lappend todo $xd - } elseif {$anc($xd) ne $anc($x)} { - set anc($xd) {} - } - } + set x [lindex $todo $i] + if {$anc($x) eq {}} { + continue + } + foreach arc $arcnos($x) { + set xd $arcstart($arc) + if {$xd eq $bend} { + set cached_isanc($a,$bend) 1 + set cached_isanc($b,$aend) 0 + return 1 + } elseif {$xd eq $aend} { + set cached_isanc($b,$aend) 1 + set cached_isanc($a,$bend) 0 + return -1 + } + if {![info exists anc($xd)]} { + set anc($xd) $anc($x) + lappend todo $xd + } elseif {$anc($xd) ne $anc($x)} { + set anc($xd) {} + } + } } set cached_isanc($a,$bend) 0 set cached_isanc($b,$aend) 0 @@ -10681,90 +10741,90 @@ proc is_certain {desc anc} { set certain {} if {[llength $arcnos($anc)] == 1} { - # tags on the same arc are certain - if {$arcnos($desc) eq $arcnos($anc)} { - return 1 - } - if {![info exists arcout($anc)]} { - # if $anc is partway along an arc, use the start of the arc instead - set a [lindex $arcnos($anc) 0] - set anc $arcstart($a) - } + # tags on the same arc are certain + if {$arcnos($desc) eq $arcnos($anc)} { + return 1 + } + if {![info exists arcout($anc)]} { + # if $anc is partway along an arc, use the start of the arc instead + set a [lindex $arcnos($anc) 0] + set anc $arcstart($a) + } } if {[llength $arcnos($desc)] > 1 || [info exists arcout($desc)]} { - set x $desc + set x $desc } else { - set a [lindex $arcnos($desc) 0] - set x $arcend($a) + set a [lindex $arcnos($desc) 0] + set x $arcend($a) } if {$x == $anc} { - return 1 + return 1 } set anclist [list $x] set dl($x) 1 set nnh 1 set ngrowanc 0 for {set i 0} {$i < [llength $anclist] && ($nnh > 0 || $ngrowanc > 0)} {incr i} { - set x [lindex $anclist $i] - if {$dl($x)} { - incr nnh -1 - } - set done($x) 1 - foreach a $arcout($x) { - if {[info exists growing($a)]} { - if {![info exists growanc($x)] && $dl($x)} { - set growanc($x) 1 - incr ngrowanc - } - } else { - set y $arcend($a) - if {[info exists dl($y)]} { - if {$dl($y)} { - if {!$dl($x)} { - set dl($y) 0 - if {![info exists done($y)]} { - incr nnh -1 - } - if {[info exists growanc($x)]} { - incr ngrowanc -1 - } - set xl [list $y] - for {set k 0} {$k < [llength $xl]} {incr k} { - set z [lindex $xl $k] - foreach c $arcout($z) { - if {[info exists arcend($c)]} { - set v $arcend($c) - if {[info exists dl($v)] && $dl($v)} { - set dl($v) 0 - if {![info exists done($v)]} { - incr nnh -1 - } - if {[info exists growanc($v)]} { - incr ngrowanc -1 - } - lappend xl $v - } - } - } - } - } - } - } elseif {$y eq $anc || !$dl($x)} { - set dl($y) 0 - lappend anclist $y - } else { - set dl($y) 1 - lappend anclist $y - incr nnh - } - } - } + set x [lindex $anclist $i] + if {$dl($x)} { + incr nnh -1 + } + set done($x) 1 + foreach a $arcout($x) { + if {[info exists growing($a)]} { + if {![info exists growanc($x)] && $dl($x)} { + set growanc($x) 1 + incr ngrowanc + } + } else { + set y $arcend($a) + if {[info exists dl($y)]} { + if {$dl($y)} { + if {!$dl($x)} { + set dl($y) 0 + if {![info exists done($y)]} { + incr nnh -1 + } + if {[info exists growanc($x)]} { + incr ngrowanc -1 + } + set xl [list $y] + for {set k 0} {$k < [llength $xl]} {incr k} { + set z [lindex $xl $k] + foreach c $arcout($z) { + if {[info exists arcend($c)]} { + set v $arcend($c) + if {[info exists dl($v)] && $dl($v)} { + set dl($v) 0 + if {![info exists done($v)]} { + incr nnh -1 + } + if {[info exists growanc($v)]} { + incr ngrowanc -1 + } + lappend xl $v + } + } + } + } + } + } + } elseif {$y eq $anc || !$dl($x)} { + set dl($y) 0 + lappend anclist $y + } else { + set dl($y) 1 + lappend anclist $y + incr nnh + } + } + } } foreach x [array names growanc] { - if {$dl($x)} { - return 0 - } - return 0 + if {$dl($x)} { + return 0 + } + return 0 } return 1 } @@ -10775,11 +10835,11 @@ proc validate_arctags {a} { set i -1 set na $arctags($a) foreach id $arctags($a) { - incr i - if {![info exists idtags($id)]} { - set na [lreplace $na $i $i] - incr i -1 - } + incr i + if {![info exists idtags($id)]} { + set na [lreplace $na $i $i] + incr i -1 + } } set arctags($a) $na } @@ -10790,11 +10850,11 @@ proc validate_archeads {a} { set i -1 set na $archeads($a) foreach id $archeads($a) { - incr i - if {![info exists idheads($id)]} { - set na [lreplace $na $i $i] - incr i -1 - } + incr i + if {![info exists idheads($id)]} { + set na [lreplace $na $i $i] + incr i -1 + } } set archeads($a) $na } @@ -10806,33 +10866,33 @@ proc desctags {id} { global growing cached_dtags if {![info exists allparents($id)]} { - return {} + return {} } set t1 [clock clicks -milliseconds] set argid $id if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} { - # part-way along an arc; check that arc first - set a [lindex $arcnos($id) 0] - if {$arctags($a) ne {}} { - validate_arctags $a - set i [lsearch -exact $arcids($a) $id] - set tid {} - foreach t $arctags($a) { - set j [lsearch -exact $arcids($a) $t] - if {$j >= $i} break - set tid $t - } - if {$tid ne {}} { - return $tid - } - } - set id $arcstart($a) - if {[info exists idtags($id)]} { - return $id - } + # part-way along an arc; check that arc first + set a [lindex $arcnos($id) 0] + if {$arctags($a) ne {}} { + validate_arctags $a + set i [lsearch -exact $arcids($a) $id] + set tid {} + foreach t $arctags($a) { + set j [lsearch -exact $arcids($a) $t] + if {$j >= $i} break + set tid $t + } + if {$tid ne {}} { + return $tid + } + } + set id $arcstart($a) + if {[info exists idtags($id)]} { + return $id + } } if {[info exists cached_dtags($id)]} { - return $cached_dtags($id) + return $cached_dtags($id) } set origid $id @@ -10840,111 +10900,111 @@ proc desctags {id} { set queued($id) 1 set nc 1 for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} { - set id [lindex $todo $i] - set done($id) 1 - set ta [info exists hastaggedancestor($id)] - if {!$ta} { - incr nc -1 - } - # ignore tags on starting node - if {!$ta && $i > 0} { - if {[info exists idtags($id)]} { - set tagloc($id) $id - set ta 1 - } elseif {[info exists cached_dtags($id)]} { - set tagloc($id) $cached_dtags($id) - set ta 1 - } - } - foreach a $arcnos($id) { - set d $arcstart($a) - if {!$ta && $arctags($a) ne {}} { - validate_arctags $a - if {$arctags($a) ne {}} { - lappend tagloc($id) [lindex $arctags($a) end] - } - } - if {$ta || $arctags($a) ne {}} { - set tomark [list $d] - for {set j 0} {$j < [llength $tomark]} {incr j} { - set dd [lindex $tomark $j] - if {![info exists hastaggedancestor($dd)]} { - if {[info exists done($dd)]} { - foreach b $arcnos($dd) { - lappend tomark $arcstart($b) - } - if {[info exists tagloc($dd)]} { - unset tagloc($dd) - } - } elseif {[info exists queued($dd)]} { - incr nc -1 - } - set hastaggedancestor($dd) 1 - } - } - } - if {![info exists queued($d)]} { - lappend todo $d - set queued($d) 1 - if {![info exists hastaggedancestor($d)]} { - incr nc - } - } - } + set id [lindex $todo $i] + set done($id) 1 + set ta [info exists hastaggedancestor($id)] + if {!$ta} { + incr nc -1 + } + # ignore tags on starting node + if {!$ta && $i > 0} { + if {[info exists idtags($id)]} { + set tagloc($id) $id + set ta 1 + } elseif {[info exists cached_dtags($id)]} { + set tagloc($id) $cached_dtags($id) + set ta 1 + } + } + foreach a $arcnos($id) { + set d $arcstart($a) + if {!$ta && $arctags($a) ne {}} { + validate_arctags $a + if {$arctags($a) ne {}} { + lappend tagloc($id) [lindex $arctags($a) end] + } + } + if {$ta || $arctags($a) ne {}} { + set tomark [list $d] + for {set j 0} {$j < [llength $tomark]} {incr j} { + set dd [lindex $tomark $j] + if {![info exists hastaggedancestor($dd)]} { + if {[info exists done($dd)]} { + foreach b $arcnos($dd) { + lappend tomark $arcstart($b) + } + if {[info exists tagloc($dd)]} { + unset tagloc($dd) + } + } elseif {[info exists queued($dd)]} { + incr nc -1 + } + set hastaggedancestor($dd) 1 + } + } + } + if {![info exists queued($d)]} { + lappend todo $d + set queued($d) 1 + if {![info exists hastaggedancestor($d)]} { + incr nc + } + } + } } set tags {} foreach id [array names tagloc] { - if {![info exists hastaggedancestor($id)]} { - foreach t $tagloc($id) { - if {[lsearch -exact $tags $t] < 0} { - lappend tags $t - } - } - } + if {![info exists hastaggedancestor($id)]} { + foreach t $tagloc($id) { + if {[lsearch -exact $tags $t] < 0} { + lappend tags $t + } + } + } } set t2 [clock clicks -milliseconds] set loopix $i # remove tags that are descendents of other tags for {set i 0} {$i < [llength $tags]} {incr i} { - set a [lindex $tags $i] - for {set j 0} {$j < $i} {incr j} { - set b [lindex $tags $j] - set r [anc_or_desc $a $b] - if {$r == 1} { - set tags [lreplace $tags $j $j] - incr j -1 - incr i -1 - } elseif {$r == -1} { - set tags [lreplace $tags $i $i] - incr i -1 - break - } - } + set a [lindex $tags $i] + for {set j 0} {$j < $i} {incr j} { + set b [lindex $tags $j] + set r [anc_or_desc $a $b] + if {$r == 1} { + set tags [lreplace $tags $j $j] + incr j -1 + incr i -1 + } elseif {$r == -1} { + set tags [lreplace $tags $i $i] + incr i -1 + break + } + } } if {[array names growing] ne {}} { - # graph isn't finished, need to check if any tag could get - # eclipsed by another tag coming later. Simply ignore any - # tags that could later get eclipsed. - set ctags {} - foreach t $tags { - if {[is_certain $t $origid]} { - lappend ctags $t - } - } - if {$tags eq $ctags} { - set cached_dtags($origid) $tags - } else { - set tags $ctags - } + # graph isn't finished, need to check if any tag could get + # eclipsed by another tag coming later. Simply ignore any + # tags that could later get eclipsed. + set ctags {} + foreach t $tags { + if {[is_certain $t $origid]} { + lappend ctags $t + } + } + if {$tags eq $ctags} { + set cached_dtags($origid) $tags + } else { + set tags $ctags + } } else { - set cached_dtags($origid) $tags + set cached_dtags($origid) $tags } set t3 [clock clicks -milliseconds] if {0 && $t3 - $t1 >= 100} { - puts "iterating descendents ($loopix/[llength $todo] nodes) took\ - [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left" + puts "iterating descendents ($loopix/[llength $todo] nodes) took\ + [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left" } return $tags } @@ -10954,33 +11014,33 @@ proc anctags {id} { global growing cached_atags if {![info exists allparents($id)]} { - return {} + return {} } set t1 [clock clicks -milliseconds] set argid $id if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} { - # part-way along an arc; check that arc first - set a [lindex $arcnos($id) 0] - if {$arctags($a) ne {}} { - validate_arctags $a - set i [lsearch -exact $arcids($a) $id] - foreach t $arctags($a) { - set j [lsearch -exact $arcids($a) $t] - if {$j > $i} { - return $t - } - } - } - if {![info exists arcend($a)]} { - return {} - } - set id $arcend($a) - if {[info exists idtags($id)]} { - return $id - } + # part-way along an arc; check that arc first + set a [lindex $arcnos($id) 0] + if {$arctags($a) ne {}} { + validate_arctags $a + set i [lsearch -exact $arcids($a) $id] + foreach t $arctags($a) { + set j [lsearch -exact $arcids($a) $t] + if {$j > $i} { + return $t + } + } + } + if {![info exists arcend($a)]} { + return {} + } + set id $arcend($a) + if {[info exists idtags($id)]} { + return $id + } } if {[info exists cached_atags($id)]} { - return $cached_atags($id) + return $cached_atags($id) } set origid $id @@ -10989,114 +11049,114 @@ proc anctags {id} { set taglist {} set nc 1 for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} { - set id [lindex $todo $i] - set done($id) 1 - set td [info exists hastaggeddescendent($id)] - if {!$td} { - incr nc -1 - } - # ignore tags on starting node - if {!$td && $i > 0} { - if {[info exists idtags($id)]} { - set tagloc($id) $id - set td 1 - } elseif {[info exists cached_atags($id)]} { - set tagloc($id) $cached_atags($id) - set td 1 - } - } - foreach a $arcout($id) { - if {!$td && $arctags($a) ne {}} { - validate_arctags $a - if {$arctags($a) ne {}} { - lappend tagloc($id) [lindex $arctags($a) 0] - } - } - if {![info exists arcend($a)]} continue - set d $arcend($a) - if {$td || $arctags($a) ne {}} { - set tomark [list $d] - for {set j 0} {$j < [llength $tomark]} {incr j} { - set dd [lindex $tomark $j] - if {![info exists hastaggeddescendent($dd)]} { - if {[info exists done($dd)]} { - foreach b $arcout($dd) { - if {[info exists arcend($b)]} { - lappend tomark $arcend($b) - } - } - if {[info exists tagloc($dd)]} { - unset tagloc($dd) - } - } elseif {[info exists queued($dd)]} { - incr nc -1 - } - set hastaggeddescendent($dd) 1 - } - } - } - if {![info exists queued($d)]} { - lappend todo $d - set queued($d) 1 - if {![info exists hastaggeddescendent($d)]} { - incr nc - } - } - } + set id [lindex $todo $i] + set done($id) 1 + set td [info exists hastaggeddescendent($id)] + if {!$td} { + incr nc -1 + } + # ignore tags on starting node + if {!$td && $i > 0} { + if {[info exists idtags($id)]} { + set tagloc($id) $id + set td 1 + } elseif {[info exists cached_atags($id)]} { + set tagloc($id) $cached_atags($id) + set td 1 + } + } + foreach a $arcout($id) { + if {!$td && $arctags($a) ne {}} { + validate_arctags $a + if {$arctags($a) ne {}} { + lappend tagloc($id) [lindex $arctags($a) 0] + } + } + if {![info exists arcend($a)]} continue + set d $arcend($a) + if {$td || $arctags($a) ne {}} { + set tomark [list $d] + for {set j 0} {$j < [llength $tomark]} {incr j} { + set dd [lindex $tomark $j] + if {![info exists hastaggeddescendent($dd)]} { + if {[info exists done($dd)]} { + foreach b $arcout($dd) { + if {[info exists arcend($b)]} { + lappend tomark $arcend($b) + } + } + if {[info exists tagloc($dd)]} { + unset tagloc($dd) + } + } elseif {[info exists queued($dd)]} { + incr nc -1 + } + set hastaggeddescendent($dd) 1 + } + } + } + if {![info exists queued($d)]} { + lappend todo $d + set queued($d) 1 + if {![info exists hastaggeddescendent($d)]} { + incr nc + } + } + } } set t2 [clock clicks -milliseconds] set loopix $i set tags {} foreach id [array names tagloc] { - if {![info exists hastaggeddescendent($id)]} { - foreach t $tagloc($id) { - if {[lsearch -exact $tags $t] < 0} { - lappend tags $t - } - } - } + if {![info exists hastaggeddescendent($id)]} { + foreach t $tagloc($id) { + if {[lsearch -exact $tags $t] < 0} { + lappend tags $t + } + } + } } # remove tags that are ancestors of other tags for {set i 0} {$i < [llength $tags]} {incr i} { - set a [lindex $tags $i] - for {set j 0} {$j < $i} {incr j} { - set b [lindex $tags $j] - set r [anc_or_desc $a $b] - if {$r == -1} { - set tags [lreplace $tags $j $j] - incr j -1 - incr i -1 - } elseif {$r == 1} { - set tags [lreplace $tags $i $i] - incr i -1 - break - } - } + set a [lindex $tags $i] + for {set j 0} {$j < $i} {incr j} { + set b [lindex $tags $j] + set r [anc_or_desc $a $b] + if {$r == -1} { + set tags [lreplace $tags $j $j] + incr j -1 + incr i -1 + } elseif {$r == 1} { + set tags [lreplace $tags $i $i] + incr i -1 + break + } + } } if {[array names growing] ne {}} { - # graph isn't finished, need to check if any tag could get - # eclipsed by another tag coming later. Simply ignore any - # tags that could later get eclipsed. - set ctags {} - foreach t $tags { - if {[is_certain $origid $t]} { - lappend ctags $t - } - } - if {$tags eq $ctags} { - set cached_atags($origid) $tags - } else { - set tags $ctags - } + # graph isn't finished, need to check if any tag could get + # eclipsed by another tag coming later. Simply ignore any + # tags that could later get eclipsed. + set ctags {} + foreach t $tags { + if {[is_certain $origid $t]} { + lappend ctags $t + } + } + if {$tags eq $ctags} { + set cached_atags($origid) $tags + } else { + set tags $ctags + } } else { - set cached_atags($origid) $tags + set cached_atags($origid) $tags } set t3 [clock clicks -milliseconds] if {0 && $t3 - $t1 >= 100} { - puts "iterating ancestors ($loopix/[llength $todo] nodes) took\ - [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left" + puts "iterating ancestors ($loopix/[llength $todo] nodes) took\ + [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left" } return $tags } @@ -11108,49 +11168,49 @@ proc descheads {id} { global allparents arcout if {![info exists allparents($id)]} { - return {} + return {} } set aret {} if {![info exists arcout($id)]} { - # part-way along an arc; check it first - set a [lindex $arcnos($id) 0] - if {$archeads($a) ne {}} { - validate_archeads $a - set i [lsearch -exact $arcids($a) $id] - foreach t $archeads($a) { - set j [lsearch -exact $arcids($a) $t] - if {$j > $i} break - lappend aret $t - } - } - set id $arcstart($a) + # part-way along an arc; check it first + set a [lindex $arcnos($id) 0] + if {$archeads($a) ne {}} { + validate_archeads $a + set i [lsearch -exact $arcids($a) $id] + foreach t $archeads($a) { + set j [lsearch -exact $arcids($a) $t] + if {$j > $i} break + lappend aret $t + } + } + set id $arcstart($a) } set origid $id set todo [list $id] set seen($id) 1 set ret {} for {set i 0} {$i < [llength $todo]} {incr i} { - set id [lindex $todo $i] - if {[info exists cached_dheads($id)]} { - set ret [concat $ret $cached_dheads($id)] - } else { - if {[info exists idheads($id)]} { - lappend ret $id - } - foreach a $arcnos($id) { - if {$archeads($a) ne {}} { - validate_archeads $a - if {$archeads($a) ne {}} { - set ret [concat $ret $archeads($a)] - } - } - set d $arcstart($a) - if {![info exists seen($d)]} { - lappend todo $d - set seen($d) 1 - } - } - } + set id [lindex $todo $i] + if {[info exists cached_dheads($id)]} { + set ret [concat $ret $cached_dheads($id)] + } else { + if {[info exists idheads($id)]} { + lappend ret $id + } + foreach a $arcnos($id) { + if {$archeads($a) ne {}} { + validate_archeads $a + if {$archeads($a) ne {}} { + set ret [concat $ret $archeads($a)] + } + } + set d $arcstart($a) + if {![info exists seen($d)]} { + lappend todo $d + set seen($d) 1 + } + } + } } set ret [lsort -unique $ret] set cached_dheads($origid) $ret @@ -11162,7 +11222,7 @@ proc addedtag {id} { if {![info exists arcnos($id)]} return if {![info exists arcout($id)]} { - recalcarc [lindex $arcnos($id) 0] + recalcarc [lindex $arcnos($id) 0] } unset -nocomplain cached_dtags unset -nocomplain cached_atags @@ -11173,7 +11233,7 @@ proc addedhead {hid head} { if {![info exists arcnos($hid)]} return if {![info exists arcout($hid)]} { - recalcarc [lindex $arcnos($hid) 0] + recalcarc [lindex $arcnos($hid) 0] } unset -nocomplain cached_dheads } @@ -11189,7 +11249,7 @@ proc movedhead {hid head} { if {![info exists arcnos($hid)]} return if {![info exists arcout($hid)]} { - recalcarc [lindex $arcnos($hid) 0] + recalcarc [lindex $arcnos($hid) 0] } unset -nocomplain cached_dheads } @@ -11199,13 +11259,13 @@ proc changedrefs {} { global arctags archeads arcnos arcout idheads idtags foreach id [concat [array names idheads] [array names idtags]] { - if {[info exists arcnos($id)] && ![info exists arcout($id)]} { - set a [lindex $arcnos($id) 0] - if {![info exists donearc($a)]} { - recalcarc $a - set donearc($a) 1 - } - } + if {[info exists arcnos($id)] && ![info exists arcout($id)]} { + set a [lindex $arcnos($id) 0] + if {![info exists donearc($a)]} { + recalcarc $a + set donearc($a) 1 + } + } } unset -nocomplain cached_tagcontent unset -nocomplain cached_dtags @@ -11217,26 +11277,26 @@ proc rereadrefs {} { global idtags idheads idotherrefs mainheadid set refids [concat [array names idtags] \ - [array names idheads] [array names idotherrefs]] + [array names idheads] [array names idotherrefs]] foreach id $refids { - if {![info exists ref($id)]} { - set ref($id) [listrefs $id] - } + if {![info exists ref($id)]} { + set ref($id) [listrefs $id] + } } set oldmainhead $mainheadid readrefs changedrefs set refids [lsort -unique [concat $refids [array names idtags] \ - [array names idheads] [array names idotherrefs]]] + [array names idheads] [array names idotherrefs]]] foreach id $refids { - set v [listrefs $id] - if {![info exists ref($id)] || $ref($id) != $v} { - redrawtags $id - } + set v [listrefs $id] + if {![info exists ref($id)] || $ref($id) != $v} { + redrawtags $id + } } if {$oldmainhead ne $mainheadid} { - redrawtags $oldmainhead - redrawtags $mainheadid + redrawtags $oldmainhead + redrawtags $mainheadid } run refill_reflist } @@ -11246,15 +11306,15 @@ proc listrefs {id} { set x {} if {[info exists idtags($id)]} { - set x $idtags($id) + set x $idtags($id) } set y {} if {[info exists idheads($id)]} { - set y $idheads($id) + set y $idheads($id) } set z {} if {[info exists idotherrefs($id)]} { - set z $idotherrefs($id) + set z $idotherrefs($id) } return [list $x $y $z] } @@ -11263,15 +11323,15 @@ proc add_tag_ctext {tag} { global ctext cached_tagcontent tagids if {![info exists cached_tagcontent($tag)]} { - catch { - set cached_tagcontent($tag) [exec git cat-file -p $tag] - } + catch { + set cached_tagcontent($tag) [exec git cat-file -p $tag] + } } $ctext insert end "[mc "Tag"]: $tag\n" bold if {[info exists cached_tagcontent($tag)]} { - set text $cached_tagcontent($tag) + set text $cached_tagcontent($tag) } else { - set text "[mc "Id"]: $tagids($tag)" + set text "[mc "Id"]: $tagids($tag)" } appendwithlinks $text {} } @@ -11280,7 +11340,7 @@ proc showtag {tag isnew} { global ctext cached_tagcontent tagids linknum tagobjid if {$isnew} { - addtohistory [list showtag $tag 0] savectextpos + addtohistory [list showtag $tag 0] savectextpos } $ctext conf -state normal clear_ctext @@ -11296,7 +11356,7 @@ proc showtags {id isnew} { global idtags ctext linknum if {$isnew} { - addtohistory [list showtags $id 0] savectextpos + addtohistory [list showtags $id 0] savectextpos } $ctext conf -state normal clear_ctext @@ -11304,9 +11364,9 @@ proc showtags {id isnew} { set linknum 0 set sep {} foreach tag $idtags($id) { - $ctext insert end $sep - add_tag_ctext $tag - set sep "\n\n" + $ctext insert end $sep + add_tag_ctext $tag + set sep "\n\n" } maybe_scroll_ctext 1 $ctext conf -state disabled @@ -11322,7 +11382,7 @@ proc doquit {} { destroy . if {[info exists gitktmpdir]} { - catch {file delete -force $gitktmpdir} + catch {file delete -force $gitktmpdir} } } @@ -11331,9 +11391,9 @@ proc mkfontdisp {font top which} { set fontpref($font) [set $font] ${NS}::button $top.${font}but -text $which \ - -command [list choosefont $font $which] + -command [list choosefont $font $which] ${NS}::label $top.$font -relief flat -font $font \ - -text $fontattr($font,family) -justify left + -text $fontattr($font,family) -justify left grid x $top.${font}but $top.$font -sticky w } @@ -11350,58 +11410,58 @@ proc choosefont {font which} { set top .gitkfont set fonttop $top if {![winfo exists $top]} { - font create sample - eval font config sample [font actual $font] - ttk_toplevel $top - make_transient $top $prefstop - wm title $top [mc "Gitk font chooser"] - ${NS}::label $top.l -textvariable fontparam(which) - pack $top.l -side top - set fontlist [lsort [font families]] - ${NS}::frame $top.f - listbox $top.f.fam -listvariable fontlist \ - -yscrollcommand [list $top.f.sb set] - bind $top.f.fam <<ListboxSelect>> selfontfam - ${NS}::scrollbar $top.f.sb -command [list $top.f.fam yview] - pack $top.f.sb -side right -fill y - pack $top.f.fam -side left -fill both -expand 1 - pack $top.f -side top -fill both -expand 1 - ${NS}::frame $top.g - spinbox $top.g.size -from 4 -to 40 -width 4 \ - -textvariable fontparam(size) \ - -validatecommand {string is integer -strict %s} - checkbutton $top.g.bold -padx 5 \ - -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \ - -variable fontparam(weight) -onvalue bold -offvalue normal - checkbutton $top.g.ital -padx 5 \ - -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0 \ - -variable fontparam(slant) -onvalue italic -offvalue roman - pack $top.g.size $top.g.bold $top.g.ital -side left - pack $top.g -side top - canvas $top.c -width 150 -height 50 -border 2 -relief sunk \ - -background white - $top.c create text 100 25 -anchor center -text $which -font sample \ - -fill black -tags text - bind $top.c <Configure> [list centertext $top.c] - pack $top.c -side top -fill x - ${NS}::frame $top.buts - ${NS}::button $top.buts.ok -text [mc "OK"] -command fontok -default active - ${NS}::button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal - bind $top <Key-Return> fontok - bind $top <Key-Escape> fontcan - grid $top.buts.ok $top.buts.can - grid columnconfigure $top.buts 0 -weight 1 -uniform a - grid columnconfigure $top.buts 1 -weight 1 -uniform a - pack $top.buts -side bottom -fill x - trace add variable fontparam write chg_fontparam + font create sample + eval font config sample [font actual $font] + ttk_toplevel $top + make_transient $top $prefstop + wm title $top [mc "Gitk font chooser"] + ${NS}::label $top.l -textvariable fontparam(which) + pack $top.l -side top + set fontlist [lsort [font families]] + ${NS}::frame $top.f + listbox $top.f.fam -listvariable fontlist \ + -yscrollcommand [list $top.f.sb set] + bind $top.f.fam <<ListboxSelect>> selfontfam + ${NS}::scrollbar $top.f.sb -command [list $top.f.fam yview] + pack $top.f.sb -side right -fill y + pack $top.f.fam -side left -fill both -expand 1 + pack $top.f -side top -fill both -expand 1 + ${NS}::frame $top.g + spinbox $top.g.size -from 4 -to 40 -width 4 \ + -textvariable fontparam(size) \ + -validatecommand {string is integer -strict %s} + checkbutton $top.g.bold -padx 5 \ + -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \ + -variable fontparam(weight) -onvalue bold -offvalue normal + checkbutton $top.g.ital -padx 5 \ + -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0 \ + -variable fontparam(slant) -onvalue italic -offvalue roman + pack $top.g.size $top.g.bold $top.g.ital -side left + pack $top.g -side top + canvas $top.c -width 150 -height 50 -border 2 -relief sunk \ + -background white + $top.c create text 100 25 -anchor center -text $which -font sample \ + -fill black -tags text + bind $top.c <Configure> [list centertext $top.c] + pack $top.c -side top -fill x + ${NS}::frame $top.buts + ${NS}::button $top.buts.ok -text [mc "OK"] -command fontok -default active + ${NS}::button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal + bind $top <Key-Return> fontok + bind $top <Key-Escape> fontcan + grid $top.buts.ok $top.buts.can + grid columnconfigure $top.buts 0 -weight 1 -uniform a + grid columnconfigure $top.buts 1 -weight 1 -uniform a + pack $top.buts -side bottom -fill x + trace add variable fontparam write chg_fontparam } else { - raise $top - $top.c itemconf text -text $which + raise $top + $top.c itemconf text -text $which } set i [lsearch -exact $fontlist $fontparam(family)] if {$i >= 0} { - $top.f.fam selection set $i - $top.f.fam see $i + $top.f.fam selection set $i + $top.f.fam see $i } } @@ -11415,10 +11475,10 @@ proc fontok {} { set f $fontparam(font) set fontpref($f) [list $fontparam(family) $fontparam(size)] if {$fontparam(weight) eq "bold"} { - lappend fontpref($f) "bold" + lappend fontpref($f) "bold" } if {$fontparam(slant) eq "italic"} { - lappend fontpref($f) "italic" + lappend fontpref($f) "italic" } set w $prefstop.notebook.fonts.$f $w conf -text $fontparam(family) -font $fontpref($f) @@ -11430,10 +11490,10 @@ proc fontcan {} { global fonttop fontparam if {[info exists fonttop]} { - catch {destroy $fonttop} - catch {font delete sample} - unset fonttop - unset fontparam + catch {destroy $fonttop} + catch {font delete sample} + unset fonttop + unset fontparam } } @@ -11441,21 +11501,21 @@ if {[package vsatisfies [package provide Tk] 8.6]} { # In Tk 8.6 we have a native font chooser dialog. Overwrite the above # function to make use of it. proc choosefont {font which} { - tk fontchooser configure -title $which -font $font \ - -command [list on_choosefont $font $which] - tk fontchooser show + tk fontchooser configure -title $which -font $font \ + -command [list on_choosefont $font $which] + tk fontchooser show } proc on_choosefont {font which newfont} { - global fontparam - puts stderr "$font $newfont" - array set f [font actual $newfont] - set fontparam(which) $which - set fontparam(font) $font - set fontparam(family) $f(-family) - set fontparam(size) $f(-size) - set fontparam(weight) $f(-weight) - set fontparam(slant) $f(-slant) - fontok + global fontparam + puts stderr "$font $newfont" + array set f [font actual $newfont] + set fontparam(which) $which + set fontparam(font) $font + set fontparam(family) $f(-family) + set fontparam(size) $f(-size) + set fontparam(weight) $f(-weight) + set fontparam(slant) $f(-slant) + fontok } } @@ -11464,7 +11524,7 @@ proc selfontfam {} { set i [$fonttop.f.fam curselection] if {$i ne {}} { - set fontparam(family) [$fonttop.f.fam get $i] + set fontparam(family) [$fonttop.f.fam get $i] } } @@ -11479,16 +11539,16 @@ proc create_prefs_page {w} { global NS set parent [join [lrange [split $w .] 0 end-1] .] if {[winfo class $parent] eq "TNotebook"} { - ${NS}::frame $w + ${NS}::frame $w } else { - ${NS}::labelframe $w + ${NS}::labelframe $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 + global hideremotes want_ttk have_ttk maxrefs web_browser set page [create_prefs_page $notebook.general] @@ -11503,14 +11563,14 @@ proc prefspage_general {notebook} { spinbox $page.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct grid x $page.maxpctl $page.maxpct -sticky w ${NS}::checkbutton $page.showlocal -text [mc "Show local changes"] \ - -variable showlocalchanges + -variable showlocalchanges grid x $page.showlocal -sticky w ${NS}::checkbutton $page.autoselect -text [mc "Auto-select SHA1 (length)"] \ - -variable autoselect + -variable autoselect spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen grid x $page.autoselect $page.autosellen -sticky w ${NS}::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \ - -variable hideremotes + -variable hideremotes grid x $page.hideremotes -sticky w ${NS}::label $page.ddisp -text [mc "Diff display options"] @@ -11519,16 +11579,16 @@ proc prefspage_general {notebook} { spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop grid x $page.tabstopl $page.tabstop -sticky w ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \ - -variable showneartags + -variable showneartags grid x $page.ntag -sticky w ${NS}::label $page.maxrefsl -text [mc "Maximum # tags/heads to show"] spinbox $page.maxrefs -from 1 -to 1000 -width 4 -textvariable maxrefs grid x $page.maxrefsl $page.maxrefs -sticky w ${NS}::checkbutton $page.ldiff -text [mc "Limit diffs to listed paths"] \ - -variable limitdiffs + -variable limitdiffs grid x $page.ldiff -sticky w ${NS}::checkbutton $page.lattr -text [mc "Support per-file encodings"] \ - -variable perfile_attrs + -variable perfile_attrs grid x $page.lattr -sticky w ${NS}::entry $page.extdifft -textvariable extdifftool @@ -11539,14 +11599,21 @@ 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 \ - -text [mc "Use themed widgets"] + -text [mc "Use themed widgets"] if {$have_ttk} { - ${NS}::label $page.ttk_note -text [mc "(change requires restart)"] + ${NS}::label $page.ttk_note -text [mc "(change requires restart)"] } else { - ${NS}::label $page.ttk_note -text [mc "(currently unavailable)"] + ${NS}::label $page.ttk_note -text [mc "(currently unavailable)"] } grid x $page.want_ttk $page.ttk_note -sticky w return $page @@ -11554,6 +11621,7 @@ proc prefspage_general {notebook} { proc prefspage_colors {notebook} { global NS uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor + global diffbgcolors set page [create_prefs_page $notebook.colors] @@ -11565,37 +11633,49 @@ proc prefspage_colors {notebook} { grid x $page.uibut $page.ui -sticky w label $page.bg -padx 40 -relief sunk -background $bgcolor ${NS}::button $page.bgbut -text [mc "Background"] \ - -command [list choosecolor bgcolor {} $page.bg [mc "background"] setbg] + -command [list choosecolor bgcolor {} $page.bg [mc "background"] setbg] grid x $page.bgbut $page.bg -sticky w label $page.fg -padx 40 -relief sunk -background $fgcolor ${NS}::button $page.fgbut -text [mc "Foreground"] \ - -command [list choosecolor fgcolor {} $page.fg [mc "foreground"] setfg] + -command [list choosecolor fgcolor {} $page.fg [mc "foreground"] setfg] grid x $page.fgbut $page.fg -sticky w label $page.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0] ${NS}::button $page.diffoldbut -text [mc "Diff: old lines"] \ - -command [list choosecolor diffcolors 0 $page.diffold [mc "diff old lines"] \ - [list $ctext tag conf d0 -foreground]] + -command [list choosecolor diffcolors 0 $page.diffold [mc "diff old lines"] \ + [list $ctext tag conf d0 -foreground]] grid x $page.diffoldbut $page.diffold -sticky w + label $page.diffoldbg -padx 40 -relief sunk -background [lindex $diffbgcolors 0] + ${NS}::button $page.diffoldbgbut -text [mc "Diff: old lines bg"] \ + -command [list choosecolor diffbgcolors 0 $page.diffoldbg \ + [mc "diff old lines bg"] \ + [list $ctext tag conf d0 -background]] + grid x $page.diffoldbgbut $page.diffoldbg -sticky w label $page.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1] ${NS}::button $page.diffnewbut -text [mc "Diff: new lines"] \ - -command [list choosecolor diffcolors 1 $page.diffnew [mc "diff new lines"] \ - [list $ctext tag conf dresult -foreground]] + -command [list choosecolor diffcolors 1 $page.diffnew [mc "diff new lines"] \ + [list $ctext tag conf dresult -foreground]] grid x $page.diffnewbut $page.diffnew -sticky w + label $page.diffnewbg -padx 40 -relief sunk -background [lindex $diffbgcolors 1] + ${NS}::button $page.diffnewbgbut -text [mc "Diff: new lines bg"] \ + -command [list choosecolor diffbgcolors 1 $page.diffnewbg \ + [mc "diff new lines bg"] \ + [list $ctext tag conf dresult -background]] + grid x $page.diffnewbgbut $page.diffnewbg -sticky w label $page.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2] ${NS}::button $page.hunksepbut -text [mc "Diff: hunk header"] \ - -command [list choosecolor diffcolors 2 $page.hunksep \ - [mc "diff hunk header"] \ - [list $ctext tag conf hunksep -foreground]] + -command [list choosecolor diffcolors 2 $page.hunksep \ + [mc "diff hunk header"] \ + [list $ctext tag conf hunksep -foreground]] grid x $page.hunksepbut $page.hunksep -sticky w label $page.markbgsep -padx 40 -relief sunk -background $markbgcolor ${NS}::button $page.markbgbut -text [mc "Marked line bg"] \ - -command [list choosecolor markbgcolor {} $page.markbgsep \ - [mc "marked line background"] \ - [list $ctext tag conf omark -background]] + -command [list choosecolor markbgcolor {} $page.markbgsep \ + [mc "marked line background"] \ + [list $ctext tag conf omark -background]] grid x $page.markbgbut $page.markbgsep -sticky w label $page.selbgsep -padx 40 -relief sunk -background $selectbgcolor ${NS}::button $page.selbgbut -text [mc "Select bg"] \ - -command [list choosecolor selectbgcolor {} $page.selbgsep [mc "background"] setselbg] + -command [list choosecolor selectbgcolor {} $page.selbgsep [mc "background"] setselbg] grid x $page.selbgbut $page.selbgsep -sticky w return $page } @@ -11621,21 +11701,21 @@ proc doprefs {} { set top .gitkprefs set prefstop $top if {[winfo exists $top]} { - raise $top - return + raise $top + return } foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ - limitdiffs tabstop perfile_attrs hideremotes want_ttk} { - set oldprefs($v) [set $v] + limitdiffs tabstop perfile_attrs hideremotes want_ttk} { + set oldprefs($v) [set $v] } ttk_toplevel $top wm title $top [mc "Gitk preferences"] make_transient $top . if {[set use_notebook [expr {$use_ttk && [info command ::ttk::notebook] ne ""}]]} { - set notebook [ttk::notebook $top.notebook] + set notebook [ttk::notebook $top.notebook] } else { - set notebook [${NS}::frame $top.notebook -borderwidth 0 -relief flat] + set notebook [${NS}::frame $top.notebook -borderwidth 0 -relief flat] } lappend pages [prefspage_general $notebook] [mc "General"] @@ -11643,21 +11723,21 @@ proc doprefs {} { lappend pages [prefspage_fonts $notebook] [mc "Fonts"] set col 0 foreach {page title} $pages { - if {$use_notebook} { - $notebook add $page -text $title - } else { - set btn [${NS}::button $notebook.b_[string map {. X} $page] \ - -text $title -command [list raise $page]] - $page configure -text $title - grid $btn -row 0 -column [incr col] -sticky w - grid $page -row 1 -column 0 -sticky news -columnspan 100 - } + if {$use_notebook} { + $notebook add $page -text $title + } else { + set btn [${NS}::button $notebook.b_[string map {. X} $page] \ + -text $title -command [list raise $page]] + $page configure -text $title + grid $btn -row 0 -column [incr col] -sticky w + grid $page -row 1 -column 0 -sticky news -columnspan 100 + } } if {!$use_notebook} { - grid columnconfigure $notebook 0 -weight 1 - grid rowconfigure $notebook 1 -weight 1 - raise [lindex $pages 0] + grid columnconfigure $notebook 0 -weight 1 + grid rowconfigure $notebook 1 -weight 1 + raise [lindex $pages 0] } grid $notebook -sticky news -padx 2 -pady 2 @@ -11682,7 +11762,7 @@ proc choose_extdiff {} { set prog [tk_getOpenFile -title [mc "External diff tool"] -multiple false] if {$prog ne {}} { - set extdifftool $prog + set extdifftool $prog } } @@ -11690,7 +11770,7 @@ proc choosecolor {v vi w x cmd} { global $v set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \ - -title [mc "Gitk: choose color for %s" $x]] + -title [mc "Gitk: choose color for %s" $x]] if {$c eq {}} return $w conf -background $c lset $v $vi $c @@ -11700,12 +11780,12 @@ proc choosecolor {v vi w x cmd} { proc setselbg {c} { global bglist cflist foreach w $bglist { - if {[winfo exists $w]} { - $w configure -selectbackground $c - } + if {[winfo exists $w]} { + $w configure -selectbackground $c + } } $cflist tag configure highlight \ - -background [$cflist cget -selectbackground] + -background [$cflist cget -selectbackground] allcanvs itemconf secsel -fill $c } @@ -11719,7 +11799,7 @@ proc setui {c} { set bg [winfo rgb . $c] set selc black if {[lindex $bg 0] + 1.5 * [lindex $bg 1] + 0.5 * [lindex $bg 2] > 100000} { - set selc white + set selc white } tk_setPalette background $c selectColor $selc } @@ -11728,9 +11808,9 @@ proc setbg {c} { global bglist foreach w $bglist { - if {[winfo exists $w]} { - $w conf -background $c - } + if {[winfo exists $w]} { + $w conf -background $c + } } } @@ -11738,9 +11818,9 @@ proc setfg {c} { global fglist canv foreach w $fglist { - if {[winfo exists $w]} { - $w conf -foreground $c - } + if {[winfo exists $w]} { + $w conf -foreground $c + } } allcanvs itemconf text -fill $c $canv itemconf circle -outline $c @@ -11751,9 +11831,9 @@ proc prefscan {} { global oldprefs prefstop foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ - limitdiffs tabstop perfile_attrs hideremotes want_ttk} { - global $v - set $v $oldprefs($v) + limitdiffs tabstop perfile_attrs hideremotes want_ttk} { + global $v + set $v $oldprefs($v) } catch {destroy $prefstop} unset prefstop @@ -11772,76 +11852,76 @@ proc prefsok {} { fontcan set fontchanged 0 if {$mainfont ne $fontpref(mainfont)} { - set mainfont $fontpref(mainfont) - parsefont mainfont $mainfont - eval font configure mainfont [fontflags mainfont] - eval font configure mainfontbold [fontflags mainfont 1] - setcoords - set fontchanged 1 + set mainfont $fontpref(mainfont) + parsefont mainfont $mainfont + eval font configure mainfont [fontflags mainfont] + eval font configure mainfontbold [fontflags mainfont 1] + setcoords + set fontchanged 1 } if {$textfont ne $fontpref(textfont)} { - set textfont $fontpref(textfont) - parsefont textfont $textfont - eval font configure textfont [fontflags textfont] - eval font configure textfontbold [fontflags textfont 1] + set textfont $fontpref(textfont) + parsefont textfont $textfont + eval font configure textfont [fontflags textfont] + eval font configure textfontbold [fontflags textfont 1] } if {$uifont ne $fontpref(uifont)} { - set uifont $fontpref(uifont) - parsefont uifont $uifont - eval font configure uifont [fontflags uifont] + set uifont $fontpref(uifont) + parsefont uifont $uifont + eval font configure uifont [fontflags uifont] } settabs if {$showlocalchanges != $oldprefs(showlocalchanges)} { - if {$showlocalchanges} { - doshowlocalchanges - } else { - dohidelocalchanges - } + if {$showlocalchanges} { + doshowlocalchanges + } else { + dohidelocalchanges + } } if {$limitdiffs != $oldprefs(limitdiffs) || - ($perfile_attrs && !$oldprefs(perfile_attrs))} { - # treediffs elements are limited by path; - # won't have encodings cached if perfile_attrs was just turned on - unset -nocomplain treediffs + ($perfile_attrs && !$oldprefs(perfile_attrs))} { + # treediffs elements are limited by path; + # won't have encodings cached if perfile_attrs was just turned on + unset -nocomplain treediffs } if {$fontchanged || $maxwidth != $oldprefs(maxwidth) - || $maxgraphpct != $oldprefs(maxgraphpct)} { - redisplay + || $maxgraphpct != $oldprefs(maxgraphpct)} { + redisplay } elseif {$showneartags != $oldprefs(showneartags) || - $limitdiffs != $oldprefs(limitdiffs)} { - reselectline + $limitdiffs != $oldprefs(limitdiffs)} { + reselectline } if {$hideremotes != $oldprefs(hideremotes)} { - rereadrefs + rereadrefs } } proc formatdate {d} { global datetimeformat if {$d ne {}} { - # If $datetimeformat includes a timezone, display in the - # timezone of the argument. Otherwise, display in local time. - if {[string match {*%[zZ]*} $datetimeformat]} { - if {[catch {set d [clock format [lindex $d 0] -timezone [lindex $d 1] -format $datetimeformat]}]} { - # Tcl < 8.5 does not support -timezone. Emulate it by - # setting TZ (e.g. TZ=<-0430>+04:30). - global env - if {[info exists env(TZ)]} { - set savedTZ $env(TZ) - } - set zone [lindex $d 1] - set sign [string map {+ - - +} [string index $zone 0]] - set env(TZ) <$zone>$sign[string range $zone 1 2]:[string range $zone 3 4] - set d [clock format [lindex $d 0] -format $datetimeformat] - if {[info exists savedTZ]} { - set env(TZ) $savedTZ - } else { - unset env(TZ) - } - } - } else { - set d [clock format [lindex $d 0] -format $datetimeformat] - } + # If $datetimeformat includes a timezone, display in the + # timezone of the argument. Otherwise, display in local time. + if {[string match {*%[zZ]*} $datetimeformat]} { + if {[catch {set d [clock format [lindex $d 0] -timezone [lindex $d 1] -format $datetimeformat]}]} { + # Tcl < 8.5 does not support -timezone. Emulate it by + # setting TZ (e.g. TZ=<-0430>+04:30). + global env + if {[info exists env(TZ)]} { + set savedTZ $env(TZ) + } + set zone [lindex $d 1] + set sign [string map {+ - - +} [string index $zone 0]] + set env(TZ) <$zone>$sign[string range $zone 1 2]:[string range $zone 3 4] + set d [clock format [lindex $d 0] -format $datetimeformat] + if {[info exists savedTZ]} { + set env(TZ) $savedTZ + } else { + unset env(TZ) + } + } + } else { + set d [clock format [lindex $d 0] -format $datetimeformat] + } } return $d } @@ -12087,38 +12167,38 @@ set encoding_aliases { proc tcl_encoding {enc} { global encoding_aliases tcl_encoding_cache if {[info exists tcl_encoding_cache($enc)]} { - return $tcl_encoding_cache($enc) + return $tcl_encoding_cache($enc) } set names [encoding names] set lcnames [string tolower $names] set enc [string tolower $enc] set i [lsearch -exact $lcnames $enc] if {$i < 0} { - # look for "isonnn" instead of "iso-nnn" or "iso_nnn" - if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} { - set i [lsearch -exact $lcnames $encx] - } + # look for "isonnn" instead of "iso-nnn" or "iso_nnn" + if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} { + set i [lsearch -exact $lcnames $encx] + } } if {$i < 0} { - foreach l $encoding_aliases { - set ll [string tolower $l] - if {[lsearch -exact $ll $enc] < 0} continue - # look through the aliases for one that tcl knows about - foreach e $ll { - set i [lsearch -exact $lcnames $e] - if {$i < 0} { - if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} { - set i [lsearch -exact $lcnames $ex] - } - } - if {$i >= 0} break - } - break - } + foreach l $encoding_aliases { + set ll [string tolower $l] + if {[lsearch -exact $ll $enc] < 0} continue + # look through the aliases for one that tcl knows about + foreach e $ll { + set i [lsearch -exact $lcnames $e] + if {$i < 0} { + if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} { + set i [lsearch -exact $lcnames $ex] + } + } + if {$i >= 0} break + } + break + } } set tclenc {} if {$i >= 0} { - set tclenc [lindex $names $i] + set tclenc [lindex $names $i] } set tcl_encoding_cache($enc) $tclenc return $tclenc @@ -12127,16 +12207,16 @@ proc tcl_encoding {enc} { proc gitattr {path attr default} { global path_attr_cache if {[info exists path_attr_cache($attr,$path)]} { - set r $path_attr_cache($attr,$path) + set r $path_attr_cache($attr,$path) } else { - set r "unspecified" - if {![catch {set line [exec git check-attr $attr -- $path]}]} { - regexp "(.*): $attr: (.*)" $line m f r - } - set path_attr_cache($attr,$path) $r + set r "unspecified" + if {![catch {set line [exec git check-attr $attr -- $path]}]} { + regexp "(.*): $attr: (.*)" $line m f r + } + set path_attr_cache($attr,$path) $r } if {$r eq "unspecified"} { - return $default + return $default } return $r } @@ -12145,28 +12225,28 @@ proc cache_gitattr {attr pathlist} { global path_attr_cache set newlist {} foreach path $pathlist { - if {![info exists path_attr_cache($attr,$path)]} { - lappend newlist $path - } + if {![info exists path_attr_cache($attr,$path)]} { + lappend newlist $path + } } set lim 1000 if {[tk windowingsystem] == "win32"} { - # windows has a 32k limit on the arguments to a command... - set lim 30 + # windows has a 32k limit on the arguments to a command... + set lim 30 } while {$newlist ne {}} { - set head [lrange $newlist 0 [expr {$lim - 1}]] - set newlist [lrange $newlist $lim end] - if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} { - foreach row [split $rlist "\n"] { - if {[regexp "(.*): $attr: (.*)" $row m path value]} { - if {[string index $path 0] eq "\""} { - set path [encoding convertfrom [lindex $path 0]] - } - set path_attr_cache($attr,$path) $value - } - } - } + set head [lrange $newlist 0 [expr {$lim - 1}]] + set newlist [lrange $newlist $lim end] + if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} { + foreach row [split $rlist "\n"] { + if {[regexp "(.*): $attr: (.*)" $row m path value]} { + if {[string index $path 0] eq "\""} { + set path [encoding convertfrom [lindex $path 0]] + } + set path_attr_cache($attr,$path) $value + } + } + } } } @@ -12174,10 +12254,10 @@ proc get_path_encoding {path} { global gui_encoding perfile_attrs set tcl_enc $gui_encoding if {$path ne {} && $perfile_attrs} { - set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]] - if {$enc2 ne {}} { - set tcl_enc $enc2 - } + set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]] + if {$enc2 ne {}} { + set tcl_enc $enc2 + } } return $tcl_enc } @@ -12204,7 +12284,7 @@ namespace import ::msgcat::mc # First check that Tcl/Tk is recent enough if {[catch {package require Tk 8.4} err]} { show_error {} . [mc "Sorry, gitk cannot run with this version of Tcl/Tk.\n\ - Gitk requires at least Tcl/Tk 8.4."] + Gitk requires at least Tcl/Tk 8.4."] exit 1 } @@ -12244,12 +12324,12 @@ set gui_encoding [encoding system] catch { set enc [exec git config --get gui.encoding] if {$enc ne {}} { - set tclenc [tcl_encoding $enc] - if {$tclenc ne {}} { - set gui_encoding $tclenc - } else { - puts stderr "Warning: encoding $enc is not supported by Tcl/Tk" - } + set tclenc [tcl_encoding $enc] + if {$tclenc ne {}} { + set gui_encoding $tclenc + } else { + puts stderr "Warning: encoding $enc is not supported by Tcl/Tk" + } } } @@ -12310,6 +12390,7 @@ 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 @@ -12317,8 +12398,14 @@ 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 diffcolors {"#c30000" "#009800" blue} +set diffbgcolors {"#fff3f3" "#f0fff0"} set diffcontext 3 set mergecolors {red blue "#00ff00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"} set ignorespace 0 @@ -12358,22 +12445,22 @@ catch { # follow the XDG base directory specification by default. See # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html if {[info exists env(XDG_CONFIG_HOME)] && $env(XDG_CONFIG_HOME) ne ""} { - # XDG_CONFIG_HOME environment variable is set - set config_file [file join $env(XDG_CONFIG_HOME) git gitk] - set config_file_tmp [file join $env(XDG_CONFIG_HOME) git gitk-tmp] + # XDG_CONFIG_HOME environment variable is set + set config_file [file join $env(XDG_CONFIG_HOME) git gitk] + set config_file_tmp [file join $env(XDG_CONFIG_HOME) git gitk-tmp] } else { - # default XDG_CONFIG_HOME - set config_file "~/.config/git/gitk" - set config_file_tmp "~/.config/git/gitk-tmp" + # default XDG_CONFIG_HOME + set config_file "~/.config/git/gitk" + set config_file_tmp "~/.config/git/gitk-tmp" } if {![file exists $config_file]} { - # for backward compatibility use the old config file if it exists - if {[file exists "~/.gitk"]} { - set config_file "~/.gitk" - set config_file_tmp "~/.gitk-tmp" - } elseif {![file exists [file dirname $config_file]]} { - file mkdir [file dirname $config_file] - } + # for backward compatibility use the old config file if it exists + if {[file exists "~/.gitk"]} { + set config_file "~/.gitk" + set config_file_tmp "~/.gitk-tmp" + } elseif {![file exists [file dirname $config_file]]} { + file mkdir [file dirname $config_file] + } } source $config_file } @@ -12389,7 +12476,8 @@ set config_variables { remotebgcolor tagbgcolor tagfgcolor tagoutlinecolor reflinecolor filesepbgcolor filesepfgcolor linehoverbgcolor linehoverfgcolor linehoveroutlinecolor mainheadcirclecolor workingfilescirclecolor - indexcirclecolor circlecolors linkfgcolor circleoutlinecolor + indexcirclecolor circlecolors linkfgcolor circleoutlinecolor diffbgcolors + web_browser } foreach var $config_variables { config_init_trace $var @@ -12426,20 +12514,20 @@ set i 0 set revtreeargscmd {} foreach arg $argv { switch -glob -- $arg { - "" { } - "--" { - set cmdline_files [lrange $argv [expr {$i + 1}] end] - break - } - "--select-commit=*" { - set selecthead [string range $arg 16 end] - } - "--argscmd=*" { - set revtreeargscmd [string range $arg 10 end] - } - default { - lappend revtreeargs $arg - } + "" { } + "--" { + set cmdline_files [lrange $argv [expr {$i + 1}] end] + break + } + "--select-commit=*" { + set selecthead [string range $arg 16 end] + } + "--argscmd=*" { + set revtreeargscmd [string range $arg 10 end] + } + default { + lappend revtreeargs $arg + } } incr i } @@ -12451,29 +12539,29 @@ if {$selecthead eq "HEAD"} { if {$i >= [llength $argv] && $revtreeargs ne {}} { # no -- on command line, but some arguments (other than --argscmd) if {[catch { - set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs] - set cmdline_files [split $f "\n"] - set n [llength $cmdline_files] - set revtreeargs [lrange $revtreeargs 0 end-$n] - # Unfortunately git rev-parse doesn't produce an error when - # something is both a revision and a filename. To be consistent - # with git log and git rev-list, check revtreeargs for filenames. - foreach arg $revtreeargs { - if {[file exists $arg]} { - show_error {} . [mc "Ambiguous argument '%s': both revision\ - and filename" $arg] - exit 1 - } - } + set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs] + set cmdline_files [split $f "\n"] + set n [llength $cmdline_files] + set revtreeargs [lrange $revtreeargs 0 end-$n] + # Unfortunately git rev-parse doesn't produce an error when + # something is both a revision and a filename. To be consistent + # with git log and git rev-list, check revtreeargs for filenames. + foreach arg $revtreeargs { + if {[file exists $arg]} { + show_error {} . [mc "Ambiguous argument '%s': both revision\ + and filename" $arg] + exit 1 + } + } } err]} { - # unfortunately we get both stdout and stderr in $err, - # so look for "fatal:". - set i [string first "fatal:" $err] - if {$i > 0} { - set err [string range $err [expr {$i + 6}] end] - } - show_error {} . "[mc "Bad arguments to gitk:"]\n$err" - exit 1 + # unfortunately we get both stdout and stderr in $err, + # so look for "fatal:". + set i [string first "fatal:" $err] + if {$i > 0} { + set err [string range $err [expr {$i + 6}] end] + } + show_error {} . "[mc "Bad arguments to gitk:"]\n$err" + exit 1 } } @@ -12543,7 +12631,7 @@ set cdup {} if {[expr {[exec git rev-parse --is-inside-work-tree] == "true"}]} { set cdup [exec git rev-parse --show-cdup] } -set worktree [exec git rev-parse --show-toplevel] +set worktree [gitworktree] setcoords makewindow catch { @@ -12594,15 +12682,15 @@ if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} { if {[info exists permviews]} { foreach v $permviews { - set n $nextviewnum - incr nextviewnum - set viewname($n) [lindex $v 0] - set viewfiles($n) [lindex $v 1] - set viewargs($n) [lindex $v 2] - set viewargscmd($n) [lindex $v 3] - set viewperm($n) 1 - set viewchanged($n) 0 - addviewmenu $n + set n $nextviewnum + incr nextviewnum + set viewname($n) [lindex $v 0] + set viewfiles($n) [lindex $v 1] + set viewargs($n) [lindex $v 2] + set viewargscmd($n) [lindex $v 3] + set viewperm($n) 1 + set viewchanged($n) 0 + addviewmenu $n } } diff --git a/third_party/git/gitk-git/po/zh_cn.po b/third_party/git/gitk-git/po/zh_cn.po new file mode 100644 index 0000000000..17b7f899da --- /dev/null +++ b/third_party/git/gitk-git/po/zh_cn.po @@ -0,0 +1,1367 @@ +# 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 7fef19fe59..0959a782ec 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 ovverriden by GITWEB_CONFIG or GITWEB_CONFIG_SYSTEM. + # Those settings can be overridden 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 @@ -1291,9 +1291,23 @@ our $is_last_request = sub { 1 }; our ($pre_dispatch_hook, $post_dispatch_hook, $pre_listen_hook); our $CGI = 'CGI'; our $cgi; +our $FCGI_Stream_PRINT_raw = \&FCGI::Stream::PRINT; sub configure_as_fcgi { require CGI::Fast; our $CGI = 'CGI::Fast'; + # FCGI is not Unicode aware hence the UTF-8 encoding must be done manually. + # However no encoding must be done within git_blob_plain() and git_snapshot() + # which must still output in raw binary mode. + no warnings 'redefine'; + my $enc = Encode::find_encoding('UTF-8'); + *FCGI::Stream::PRINT = sub { + my @OUTPUT = @_; + for (my $i = 1; $i < @_; $i++) { + $OUTPUT[$i] = $enc->encode($_[$i], Encode::FB_CROAK|Encode::LEAVE_SRC); + } + @_ = @OUTPUT; + goto $FCGI_Stream_PRINT_raw; + }; my $request_number = 0; # let each child service 100 requests @@ -1657,15 +1671,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', # 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) + "\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) ); my $chr = ( (exists $es{$cntrl}) ? $es{$cntrl} @@ -4048,7 +4062,7 @@ sub print_feed_meta { $href_params{'extra_options'} = undef; $href_params{'action'} = $type; - $link_attr{'-href'} = href(%href_params); + $link_attr{'-href'} = esc_attr(href(%href_params)); print "<link ". "rel=\"$link_attr{'-rel'}\" ". "title=\"$link_attr{'-title'}\" ". @@ -4057,7 +4071,7 @@ sub print_feed_meta { "/>\n"; $href_params{'extra_options'} = '--no-merges'; - $link_attr{'-href'} = href(%href_params); + $link_attr{'-href'} = esc_attr(href(%href_params)); $link_attr{'-title'} .= ' (no merges)'; print "<link ". "rel=\"$link_attr{'-rel'}\" ". @@ -4070,10 +4084,12 @@ 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), href(project=>undef, action=>"project_index")); + esc_attr($site_name), + esc_attr(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), href(project=>undef, action=>"opml")); + esc_attr($site_name), + esc_attr(href(project=>undef, action=>"opml"))); } } @@ -4287,8 +4303,8 @@ sub git_footer_html { if (defined $action && $action eq 'blame_incremental') { print qq!<script type="text/javascript">\n!. - qq!startBlame("!. href(action=>"blame_data", -replay=>1) .qq!",\n!. - qq! "!. href() .qq!");\n!. + qq!startBlame("!. esc_attr(href(action=>"blame_data", -replay=>1)) .qq!",\n!. + qq! "!. esc_attr(href()) .qq!");\n!. qq!</script>\n!; } else { my ($jstimezone, $tz_cookie, $datetime_class) = @@ -4625,7 +4641,7 @@ sub git_print_log { # print log my $skip_blank_line = 0; foreach my $line (@$log) { - if ($line =~ m/^\s*([A-Z][-A-Za-z]*-[Bb]y|C[Cc]): /) { + if ($line =~ m/^\s*([A-Z][-A-Za-z]*-([Bb]y|[Tt]o)|C[Cc]|(Clos|Fix)es): /) { if (! $opts{'-remove_signoff'}) { print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n"; $skip_blank_line = 1; @@ -5283,7 +5299,7 @@ sub format_ctx_rem_add_lines { # + c # + d # - # Otherwise the highlightling would be confusing. + # Otherwise the highlighting would be confusing. if ($is_combined) { for (my $i = 0; $i < @$add; $i++) { my $prefix_rem = substr($rem->[$i], 0, $num_parents); @@ -7077,6 +7093,7 @@ sub git_blob_plain { ($sandbox ? 'attachment' : 'inline') . '; filename="' . $save_as . '"'); local $/ = undef; + local *FCGI::Stream::PRINT = $FCGI_Stream_PRINT_raw; binmode STDOUT, ':raw'; print <$fd>; binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi @@ -7155,8 +7172,8 @@ sub git_blob { print qq! alt="!.esc_attr($file_name).qq!" title="!.esc_attr($file_name).qq!"!; } print qq! src="! . - href(action=>"blob_plain", hash=>$hash, - hash_base=>$hash_base, file_name=>$file_name) . + esc_attr(href(action=>"blob_plain", hash=>$hash, + hash_base=>$hash_base, file_name=>$file_name)) . qq!" />\n!; } else { my $nr; @@ -7415,6 +7432,7 @@ sub git_snapshot { open my $fd, "-|", $cmd or die_error(500, "Execute git-archive failed"); + local *FCGI::Stream::PRINT = $FCGI_Stream_PRINT_raw; binmode STDOUT, ':raw'; print <$fd>; binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi @@ -8239,6 +8257,7 @@ 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; @@ -8276,7 +8295,7 @@ XML $alt_url . '" />' . "\n" . '<link rel="self" type="' . $content_type . '" href="' . $cgi->self_url() . '" />' . "\n" . - "<id>" . href(-full=>1) . "</id>\n" . + "<id>" . esc_url(href(-full=>1)) . "</id>\n" . # use project owner for feed author "<author><name>$owner</name></author>\n"; if (defined $favicon) { @@ -8322,7 +8341,7 @@ XML "<author>" . esc_html($co{'author'}) . "</author>\n" . "<pubDate>$cd{'rfc2822'}</pubDate>\n" . "<guid isPermaLink=\"true\">$co_url</guid>\n" . - "<link>$co_url</link>\n" . + "<link>" . esc_html($co_url) . "</link>\n" . "<description>" . esc_html($co{'title'}) . "</description>\n" . "<content:encoded>" . "<![CDATA[\n"; @@ -8344,8 +8363,8 @@ XML } print "</contributor>\n" . "<published>$cd{'iso-8601'}</published>\n" . - "<link rel=\"alternate\" type=\"text/html\" href=\"$co_url\" />\n" . - "<id>$co_url</id>\n" . + "<link rel=\"alternate\" type=\"text/html\" href=\"" . esc_attr($co_url) . "\" />\n" . + "<id>" . esc_html($co_url) . "</id>\n" . "<content type=\"xhtml\" xml:base=\"" . esc_url($my_url) . "\">\n" . "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n"; } @@ -8452,8 +8471,8 @@ XML } my $path = esc_html(chop_str($proj{'path'}, 25, 5)); - my $rss = href('project' => $proj{'path'}, 'action' => 'rss', -full => 1); - my $html = href('project' => $proj{'path'}, 'action' => 'summary', -full => 1); + my $rss = esc_attr(href('project' => $proj{'path'}, 'action' => 'rss', -full => 1)); + my $html = esc_attr(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 db6eb50584..e100d8206b 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 d60115ca40..b499270836 100644 --- a/third_party/git/gpg-interface.c +++ b/third_party/git/gpg-interface.c @@ -7,6 +7,8 @@ #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; @@ -85,6 +87,8 @@ 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) @@ -96,15 +100,49 @@ 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; @@ -126,9 +164,18 @@ 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 found_duplicate_status; + goto error; } if (sigcheck_gpg_status[i].result) @@ -136,33 +183,62 @@ 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, ' '); - free(sigc->key); - sigc->key = xmemdupz(line, next - line); + replace_cstring(&sigc->key, line, next); /* Do we have signer information? */ if (*next && (sigcheck_gpg_status[i].flags & GPG_STATUS_UID)) { line = next + 1; next = strchrnul(line, '\n'); - free(sigc->signer); - sigc->signer = xmemdupz(line, next - line); + 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(trust); + } + /* Do we have fingerprint? */ if (sigcheck_gpg_status[i].flags & GPG_STATUS_FINGERPRINT) { - next = strchrnul(line, ' '); - free(sigc->fingerprint); - sigc->fingerprint = xmemdupz(line, next - line); + const char *limit; + char **field; - /* Skip interim fields */ + 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'); for (j = 9; j > 0; j--) { - if (!*next) + if (!*next || limit <= next) break; line = next + 1; next = strchrnul(line, ' '); } - next = strchrnul(line, '\n'); - free(sigc->primary_key_fingerprint); - sigc->primary_key_fingerprint = xmemdupz(line, next - line); + field = &sigc->primary_key_fingerprint; + if (!j) { + next = strchrnul(line, '\n'); + replace_cstring(field, line, next); + } else { + replace_cstring(field, NULL, NULL); + } } break; @@ -171,14 +247,7 @@ static void parse_gpg_output(struct signature_check *sigc) } return; -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. - */ +error: sigc->result = 'E'; /* Clear partial data to avoid confusion */ FREE_AND_NULL(sigc->primary_key_fingerprint); @@ -187,6 +256,55 @@ found_duplicate_status: FREE_AND_NULL(sigc->key); } +static int verify_signed_buffer(const char *payload, size_t payload_size, + const char *signature, size_t signature_size, + struct strbuf *gpg_output, + struct strbuf *gpg_status) +{ + struct child_process gpg = CHILD_PROCESS_INIT; + struct gpg_format *fmt; + struct tempfile *temp; + int ret; + struct strbuf buf = STRBUF_INIT; + + temp = mks_tempfile_t(".git_vtag_tmpXXXXXX"); + if (!temp) + return error_errno(_("could not create temporary file")); + if (write_in_full(temp->fd, signature, signature_size) < 0 || + close_tempfile_gently(temp) < 0) { + error_errno(_("failed writing detached signature to '%s'"), + temp->filename.buf); + delete_tempfile(&temp); + return -1; + } + + fmt = get_format_by_sig(signature); + if (!fmt) + BUG("bad signature '%s'", signature); + + strvec_push(&gpg.args, fmt->program); + strvec_pushv(&gpg.args, fmt->verify_args); + strvec_pushl(&gpg.args, + "--status-fd=1", + "--verify", temp->filename.buf, "-", + NULL); + + if (!gpg_status) + gpg_status = &buf; + + sigchain_push(SIGPIPE, SIG_IGN); + ret = pipe_command(&gpg, payload, payload_size, + gpg_status, 0, gpg_output, 0); + sigchain_pop(SIGPIPE); + + delete_tempfile(&temp); + + ret |= !strstr(gpg_status->buf, "\n[GNUPG:] GOODSIG "); + strbuf_release(&buf); /* no matter it was used or not */ + + return ret; +} + int check_signature(const char *payload, size_t plen, const char *signature, size_t slen, struct signature_check *sigc) { @@ -195,6 +313,7 @@ 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); @@ -204,7 +323,8 @@ 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' && sigc->result != 'U'; + status |= sigc->result != 'G'; + status |= sigc->trust_level < configured_min_trust_level; out: strbuf_release(&gpg_status); @@ -251,6 +371,8 @@ 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) @@ -270,6 +392,20 @@ 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"; @@ -298,11 +434,11 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *sig size_t i, j, bottom; struct strbuf gpg_status = STRBUF_INIT; - argv_array_pushl(&gpg.args, - use_format->program, - "--status-fd=2", - "-bsau", signing_key, - NULL); + strvec_pushl(&gpg.args, + use_format->program, + "--status-fd=2", + "-bsau", signing_key, + NULL); bottom = signature->len; @@ -331,51 +467,3 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *sig return 0; } - -int verify_signed_buffer(const char *payload, size_t payload_size, - const char *signature, size_t signature_size, - struct strbuf *gpg_output, struct strbuf *gpg_status) -{ - struct child_process gpg = CHILD_PROCESS_INIT; - struct gpg_format *fmt; - struct tempfile *temp; - int ret; - struct strbuf buf = STRBUF_INIT; - - temp = mks_tempfile_t(".git_vtag_tmpXXXXXX"); - if (!temp) - return error_errno(_("could not create temporary file")); - if (write_in_full(temp->fd, signature, signature_size) < 0 || - close_tempfile_gently(temp) < 0) { - error_errno(_("failed writing detached signature to '%s'"), - temp->filename.buf); - delete_tempfile(&temp); - return -1; - } - - fmt = get_format_by_sig(signature); - if (!fmt) - BUG("bad signature '%s'", signature); - - argv_array_push(&gpg.args, fmt->program); - argv_array_pushv(&gpg.args, fmt->verify_args); - argv_array_pushl(&gpg.args, - "--status-fd=1", - "--verify", temp->filename.buf, "-", - NULL); - - if (!gpg_status) - gpg_status = &buf; - - sigchain_push(SIGPIPE, SIG_IGN); - ret = pipe_command(&gpg, payload, payload_size, - gpg_status, 0, gpg_output, 0); - sigchain_pop(SIGPIPE); - - delete_tempfile(&temp); - - ret |= !strstr(gpg_status->buf, "\n[GNUPG:] GOODSIG "); - strbuf_release(&buf); /* no matter it was used or not */ - - return ret; -} diff --git a/third_party/git/gpg-interface.h b/third_party/git/gpg-interface.h index 3e624ec289..f4e9b4f371 100644 --- a/third_party/git/gpg-interface.h +++ b/third_party/git/gpg-interface.h @@ -7,6 +7,14 @@ 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; @@ -16,7 +24,6 @@ struct signature_check { * possible "result": * 0 (not checked) * N (checked but no further result) - * U (untrusted good) * G (good) * B (bad) */ @@ -25,6 +32,7 @@ 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); @@ -46,15 +54,6 @@ size_t parse_signature(const char *buf, size_t size); int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key); -/* - * Run "gpg" to see if the payload matches the detached signature. - * gpg_output, when set, receives the diagnostic output from GPG. - * gpg_status, when set, receives the status output from GPG. - */ -int verify_signed_buffer(const char *payload, size_t payload_size, - const char *signature, size_t signature_size, - struct strbuf *gpg_output, struct strbuf *gpg_status); - int git_gpg_config(const char *, const char *, void *); void set_signing_key(const char *); const char *get_signing_key(void); diff --git a/third_party/git/graph.c b/third_party/git/graph.c index f53135485f..c128ad0cce 100644 --- a/third_party/git/graph.c +++ b/third_party/git/graph.c @@ -4,7 +4,7 @@ #include "color.h" #include "graph.h" #include "revision.h" -#include "argv-array.h" +#include "strvec.h" /* Internal API */ @@ -34,6 +34,7 @@ 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, @@ -81,7 +82,7 @@ static void graph_show_line_prefix(const struct diff_options *diffopt) static const char **column_colors; static unsigned short column_colors_max; -static void parse_graph_colors_config(struct argv_array *colors, const char *string) +static void parse_graph_colors_config(struct strvec *colors, const char *string) { const char *end, *start; @@ -92,13 +93,13 @@ static void parse_graph_colors_config(struct argv_array *colors, const char *str char color[COLOR_MAXLEN]; if (!color_parse_mem(start, comma - start, color)) - argv_array_push(colors, color); + strvec_push(colors, color); else warning(_("ignore invalid color '%.*s' in log.graphColors"), (int)(comma - start), start); start = comma + 1; } - argv_array_push(colors, GIT_COLOR_RESET); + strvec_push(colors, GIT_COLOR_RESET); } void graph_set_column_colors(const char **colors, unsigned short colors_max) @@ -112,14 +113,42 @@ static const char *column_get_color_code(unsigned short color) return column_colors[color]; } -static void strbuf_write_column(struct strbuf *sb, const struct column *c, - char col_char) +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) { if (c->color < column_colors_max) - strbuf_addstr(sb, column_get_color_code(c->color)); - strbuf_addch(sb, col_char); + graph_line_addcolor(line, c->color); + graph_line_addch(line, col_char); if (c->color < column_colors_max) - strbuf_addstr(sb, column_get_color_code(column_colors_max)); + graph_line_addcolor(line, column_colors_max); } struct git_graph { @@ -175,9 +204,63 @@ 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 new_mapping arrays. + * that can be stored in the mapping and old_mapping arrays. */ int column_capacity; /* @@ -215,12 +298,12 @@ struct git_graph { */ int *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. + * 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. */ - int *new_mapping; + int *old_mapping; /* * The current default column color being used. This is * stored as an index into the array column_colors. @@ -267,13 +350,13 @@ struct git_graph *graph_init(struct rev_info *opt) graph_set_column_colors(column_colors_ansi, column_colors_ansi_max); } else { - static struct argv_array custom_colors = ARGV_ARRAY_INIT; - argv_array_clear(&custom_colors); + static struct strvec custom_colors = STRVEC_INIT; + strvec_clear(&custom_colors); parse_graph_colors_config(&custom_colors, string); free(string); /* graph_set_column_colors takes a max-index, not a count */ - graph_set_column_colors(custom_colors.argv, - custom_colors.argc - 1); + graph_set_column_colors(custom_colors.v, + custom_colors.nr - 1); } } @@ -285,6 +368,9 @@ 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; @@ -303,7 +389,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->new_mapping, 2 * graph->column_capacity); + ALLOC_ARRAY(graph->old_mapping, 2 * graph->column_capacity); /* * The diff output prefix callback, with this we can make @@ -333,7 +419,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->new_mapping, graph->column_capacity * 2); + REALLOC_ARRAY(graph->old_mapping, graph->column_capacity * 2); } /* @@ -432,74 +518,76 @@ static unsigned short graph_find_commit_color(const struct git_graph *graph, return graph_get_current_column_color(graph); } -static void graph_insert_into_new_columns(struct git_graph *graph, - struct commit *commit, - int *mapping_index) +static int graph_find_new_column_by_commit(struct git_graph *graph, + struct commit *commit) { int i; - - /* - * If the commit is already in the new_columns list, we don't need to - * add it. Just update the mapping correctly. - */ 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->new_columns[i].commit == commit) + return i; } - - /* - * 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++; + return -1; } -static void graph_update_width(struct git_graph *graph, - int is_commit_in_existing_columns) +static void graph_insert_into_new_columns(struct git_graph *graph, + struct commit *commit, + int idx) { - /* - * 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; + int i = graph_find_new_column_by_commit(graph, commit); + int mapping_idx; /* - * Even if the current commit has no parents to be printed, it - * still takes up a column for itself. + * If the commit is not already in the new_columns array, then add it + * and record it as being in the final column. */ - if (graph->num_parents < 1) - max_cols++; + 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); + } - /* - * 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--; + 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; - /* - * Each column takes up 2 spaces - */ - graph->width = max_cols * 2; + dist = idx - i; + shift = (dist > 1) ? 2 * dist - 3 : 1; + + graph->merge_layout = (dist > 0) ? 0 : 1; + graph->edges_added = graph->num_parents + graph->merge_layout - 2; + + mapping_idx = graph->width + (graph->merge_layout - 1) * shift; + graph->width += 2 * graph->merge_layout; + + } 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; + } + + graph->mapping[mapping_idx] = i; } 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; /* @@ -532,6 +620,10 @@ 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 * @@ -542,7 +634,6 @@ 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; @@ -556,9 +647,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)) { @@ -571,21 +662,18 @@ 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, - &mapping_idx); + graph_insert_into_new_columns(graph, parent->item, i); } /* - * We always need to increment mapping_idx by at + * We always need to increment graph->width by at * least 2, even if it has no interesting parents. * The current commit always takes up at least 2 * spaces. */ - if (mapping_idx == old_mapping_idx) - mapping_idx += 2; + if (graph->num_parents == 0) + graph->width += 2; } else { - graph_insert_into_new_columns(graph, col_commit, - &mapping_idx); + graph_insert_into_new_columns(graph, col_commit, -1); } } @@ -595,11 +683,43 @@ 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) +{ /* - * Compute graph->width for this commit + * 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: + * + * | * + * | |\ + * | * \ + * |/|\ \ */ - graph_update_width(graph, is_commit_in_columns); + 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); } void graph_update(struct git_graph *graph, struct commit *commit) @@ -657,8 +777,7 @@ void graph_update(struct git_graph *graph, struct commit *commit) */ if (graph->state != GRAPH_PADDING) graph->state = GRAPH_SKIP; - else if (graph->num_parents >= 3 && - graph->commit_index < (graph->num_columns - 1)) + else if (graph_needs_pre_commit_line(graph)) graph->state = GRAPH_PRE_COMMIT; else graph->state = GRAPH_COMMIT; @@ -686,8 +805,7 @@ static int graph_is_mapping_correct(struct git_graph *graph) return 1; } -static void graph_pad_horizontally(struct git_graph *graph, struct strbuf *sb, - int chars_written) +static void graph_pad_horizontally(struct git_graph *graph, struct graph_line *line) { /* * Add additional spaces to the end of the strbuf, so that all @@ -696,34 +814,22 @@ static void graph_pad_horizontally(struct git_graph *graph, struct strbuf *sb, * This way, fields printed to the right of the graph will remain * aligned for the entire commit. */ - if (chars_written < graph->width) - strbuf_addchars(sb, ' ', graph->width - chars_written); + if (line->width < graph->width) + graph_line_addchars(line, ' ', graph->width - line->width); } static void graph_output_padding_line(struct git_graph *graph, - struct strbuf *sb) + struct graph_line *line) { 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++) { - strbuf_write_column(sb, &graph->new_columns[i], '|'); - strbuf_addch(sb, ' '); + graph_line_write_column(line, &graph->new_columns[i], '|'); + graph_line_addch(line, ' '); } - - graph_pad_horizontally(graph, sb, graph->num_new_columns * 2); } @@ -733,28 +839,24 @@ int graph_width(struct git_graph *graph) } -static void graph_output_skip_line(struct git_graph *graph, struct strbuf *sb) +static void graph_output_skip_line(struct git_graph *graph, struct graph_line *line) { /* * Output an ellipsis to indicate that a portion * of the graph is missing. */ - strbuf_addstr(sb, "..."); - graph_pad_horizontally(graph, sb, 3); + graph_line_addstr(line, "..."); - if (graph->num_parents >= 3 && - graph->commit_index < (graph->num_columns - 1)) + if (graph_needs_pre_commit_line(graph)) 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 strbuf *sb) + struct graph_line *line) { - int num_expansion_rows; int i, seen_this; - int chars_written; /* * This function formats a row that increases the space around a commit @@ -764,27 +866,24 @@ 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 < num_expansion_rows); + graph->expansion_row < graph_num_expansion_rows(graph)); /* * 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; - strbuf_write_column(sb, col, '|'); - strbuf_addchars(sb, ' ', graph->expansion_row); - chars_written += 1 + graph->expansion_row; + graph_line_write_column(line, col, '|'); + graph_line_addchars(line, ' ', graph->expansion_row); } else if (seen_this && (graph->expansion_row == 0)) { /* * This is the first line of the pre-commit output. @@ -797,33 +896,27 @@ static void graph_output_pre_commit_line(struct git_graph *graph, */ if (graph->prev_state == GRAPH_POST_MERGE && graph->prev_commit_index < i) - strbuf_write_column(sb, col, '\\'); + graph_line_write_column(line, col, '\\'); else - strbuf_write_column(sb, col, '|'); - chars_written++; + graph_line_write_column(line, col, '|'); } else if (seen_this && (graph->expansion_row > 0)) { - strbuf_write_column(sb, col, '\\'); - chars_written++; + graph_line_write_column(line, col, '\\'); } else { - strbuf_write_column(sb, col, '|'); - chars_written++; + graph_line_write_column(line, col, '|'); } - strbuf_addch(sb, ' '); - chars_written++; + graph_line_addch(line, ' '); } - graph_pad_horizontally(graph, sb, chars_written); - /* * Increment graph->expansion_row, * and move to state GRAPH_COMMIT if necessary */ graph->expansion_row++; - if (graph->expansion_row >= num_expansion_rows) + if (!graph_needs_pre_commit_line(graph)) graph_update_state(graph, GRAPH_COMMIT); } -static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb) +static void graph_output_commit_char(struct git_graph *graph, struct graph_line *line) { /* * For boundary commits, print 'o' @@ -831,72 +924,67 @@ static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb) */ if (graph->commit->object.flags & BOUNDARY) { assert(graph->revs->boundary); - strbuf_addch(sb, 'o'); + graph_line_addch(line, 'o'); return; } /* * get_revision_mark() handles all other cases without assert() */ - strbuf_addstr(sb, get_revision_mark(graph->revs, graph->commit)); + graph_line_addstr(line, get_revision_mark(graph->revs, graph->commit)); } /* - * Draw the horizontal dashes of an octopus merge and return the number of - * characters written. + * Draw the horizontal dashes of an octopus merge. */ -static int graph_draw_octopus_merge(struct git_graph *graph, - struct strbuf *sb) +static void graph_draw_octopus_merge(struct git_graph *graph, struct graph_line *line) { /* - * 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. + * The parents of a merge commit can be arbitrarily reordered as they + * are mapped onto display columns, for example this is a valid merge: * - * | *---. - * | |\ \ \ - * | | | | | - * x 0 1 2 3 + * | | *---. + * | | |\ \ \ + * | | |/ / / + * | |/| | / + * | |_|_|/ + * |/| | | + * 3 1 0 2 * - */ - 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: + * 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. * - * | *---. - * | |\ \ \ - * |/ / / / - * x 0 1 2 + * 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. * - * In which case the number of parents will be one greater than the - * number of added columns. + * 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. */ - int added_cols = (graph->num_new_columns - graph->num_columns); - int parent_in_old_cols = graph->num_parents - added_cols; - /* - * In both cases, commit_index corresponds to the edge labeled "0". - */ - int first_col = graph->commit_index + dashless_parents - - parent_in_old_cols; + int i, j; + struct column *col; - 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 ? '.' : '-'); + 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]; + + graph_line_write_column(line, col, '-'); + graph_line_write_column(line, col, (i == dashed_parents - 1) ? '.' : '-'); } - return 2 * dashful_parents; + + return; } -static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb) +static void graph_output_commit_line(struct git_graph *graph, struct graph_line *line) { int seen_this = 0; - int i, chars_written; + int i; /* * Output the row containing this commit @@ -906,7 +994,6 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb) * 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; @@ -920,19 +1007,17 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb) if (col_commit == graph->commit) { seen_this = 1; - graph_output_commit_char(graph, sb); - chars_written++; + graph_output_commit_char(graph, line); if (graph->num_parents > 2) - 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)) { + 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)) { /* - * This is a 2-way merge commit. - * There is no GRAPH_PRE_COMMIT stage for 2-way + * 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 * merges, so this is the first line of output * for this commit. Check to see what the previous * line of output was. @@ -944,21 +1029,21 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb) * makes the output look nicer. */ if (graph->prev_state == GRAPH_POST_MERGE && + graph->prev_edges_added > 0 && graph->prev_commit_index < i) - strbuf_write_column(sb, col, '\\'); + graph_line_write_column(line, col, '\\'); else - strbuf_write_column(sb, col, '|'); - chars_written++; + 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, '/'); } else { - strbuf_write_column(sb, col, '|'); - chars_written++; + graph_line_write_column(line, col, '|'); } - strbuf_addch(sb, ' '); - chars_written++; + graph_line_addch(line, ' '); } - graph_pad_horizontally(graph, sb, chars_written); - /* * Update graph->state */ @@ -970,26 +1055,19 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb) graph_update_state(graph, GRAPH_COLLAPSING); } -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 const char merge_chars[] = {'/', '|', '\\'}; -static void graph_output_post_merge_line(struct git_graph *graph, struct strbuf *sb) +static void graph_output_post_merge_line(struct git_graph *graph, struct graph_line *line) { int seen_this = 0; - int i, j, chars_written; + int i, j; + + struct commit_list *first_parent = first_interesting_parent(graph); + struct column *parent_col = NULL; /* * 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; @@ -1008,37 +1086,49 @@ static void graph_output_post_merge_line(struct git_graph *graph, struct strbuf * new_columns and use those to format the * edges. */ - struct commit_list *parents = NULL; - struct column *par_column; + struct commit_list *parents = first_parent; + int par_column; + int idx = graph->merge_layout; + char c; seen_this = 1; - 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++) { + + 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 = 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, ' '); } - chars_written += j * 2; + if (graph->edges_added == 0) + graph_line_addch(line, ' '); + } else if (seen_this) { - strbuf_write_column(sb, col, '\\'); - strbuf_addch(sb, ' '); - chars_written += 2; + if (graph->edges_added > 0) + graph_line_write_column(line, col, '\\'); + else + graph_line_write_column(line, col, '|'); + graph_line_addch(line, ' '); } else { - strbuf_write_column(sb, col, '|'); - strbuf_addch(sb, ' '); - chars_written += 2; + 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, ' '); + } } - } - graph_pad_horizontally(graph, sb, chars_written); + if (col_commit == first_parent->item) + parent_col = col; + } /* * Update graph->state @@ -1049,7 +1139,7 @@ static void graph_output_post_merge_line(struct git_graph *graph, struct strbuf graph_update_state(graph, GRAPH_COLLAPSING); } -static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf *sb) +static void graph_output_collapsing_line(struct git_graph *graph, struct graph_line *line) { int i; short used_horizontal = 0; @@ -1057,13 +1147,18 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf int horizontal_edge_target = -1; /* - * Clear out the new_mapping array + * Swap the mapping and old_mapping arrays + */ + SWAP(graph->mapping, graph->old_mapping); + + /* + * Clear out the mapping array */ for (i = 0; i < graph->mapping_size; i++) - graph->new_mapping[i] = -1; + graph->mapping[i] = -1; for (i = 0; i < graph->mapping_size; i++) { - int target = graph->mapping[i]; + int target = graph->old_mapping[i]; if (target < 0) continue; @@ -1084,14 +1179,14 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf * This column is already in the * correct place */ - assert(graph->new_mapping[i] == -1); - graph->new_mapping[i] = target; - } else if (graph->new_mapping[i - 1] < 0) { + assert(graph->mapping[i] == -1); + graph->mapping[i] = target; + } else if (graph->mapping[i - 1] < 0) { /* * Nothing is to the left. * Move to the left by one */ - graph->new_mapping[i - 1] = target; + graph->mapping[i - 1] = target; /* * If there isn't already an edge moving horizontally * select this one. @@ -1107,9 +1202,9 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf * line. */ for (j = (target * 2)+3; j < (i - 2); j += 2) - graph->new_mapping[j] = target; + graph->mapping[j] = target; } - } else if (graph->new_mapping[i - 1] == target) { + } else if (graph->mapping[i - 1] == target) { /* * There is a branch line to our left * already, and it is our target. We @@ -1117,7 +1212,7 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf * the same parent commit. * * We don't have to add anything to the - * output or new_mapping, since the + * output or mapping, since the * existing branch line has already taken * care of it. */ @@ -1129,39 +1224,46 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf * * 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->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; + assert(graph->mapping[i - 1] > target); + assert(graph->mapping[i - 2] < 0); + graph->mapping[i - 2] = target; /* * Mark this branch as the horizontal edge to * prevent any other edges from moving * horizontally. */ - if (horizontal_edge == -1) - horizontal_edge = i; + 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; + } } } /* + * 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->new_mapping[graph->mapping_size - 1] < 0) + if (graph->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->new_mapping[i]; + int target = graph->mapping[i]; if (target < 0) - strbuf_addch(sb, ' '); + graph_line_addch(line, ' '); else if (target * 2 == i) - strbuf_write_column(sb, &graph->new_columns[target], '|'); + graph_line_write_column(line, &graph->new_columns[target], '|'); else if (target == horizontal_edge_target && i != horizontal_edge - 1) { /* @@ -1170,24 +1272,17 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf * won't continue into the next line. */ if (i != (target * 2)+3) - graph->new_mapping[i] = -1; + graph->mapping[i] = -1; used_horizontal = 1; - strbuf_write_column(sb, &graph->new_columns[target], '_'); + graph_line_write_column(line, &graph->new_columns[target], '_'); } else { if (used_horizontal && i < horizontal_edge) - graph->new_mapping[i] = -1; - strbuf_write_column(sb, &graph->new_columns[target], '/'); + graph->mapping[i] = -1; + graph_line_write_column(line, &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. @@ -1199,35 +1294,49 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf 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, sb); - return 0; + graph_output_padding_line(graph, &line); + break; case GRAPH_SKIP: - graph_output_skip_line(graph, sb); - return 0; + graph_output_skip_line(graph, &line); + break; case GRAPH_PRE_COMMIT: - graph_output_pre_commit_line(graph, sb); - return 0; + graph_output_pre_commit_line(graph, &line); + break; case GRAPH_COMMIT: - graph_output_commit_line(graph, sb); - return 1; + graph_output_commit_line(graph, &line); + shown_commit_line = 1; + break; case GRAPH_POST_MERGE: - graph_output_post_merge_line(graph, sb); - return 0; + graph_output_post_merge_line(graph, &line); + break; case GRAPH_COLLAPSING: - graph_output_collapsing_line(graph, sb); - return 0; + graph_output_collapsing_line(graph, &line); + break; } - assert(0); - return 0; + graph_pad_horizontally(graph, &line); + return shown_commit_line; } static void graph_padding_line(struct git_graph *graph, struct strbuf *sb) { int i; - int chars_written = 0; + struct graph_line line = { .buf = sb, .width = 0 }; if (graph->state != GRAPH_COMMIT) { graph_next_line(graph, sb); @@ -1244,20 +1353,17 @@ 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]; - strbuf_write_column(sb, col, '|'); - chars_written++; + graph_line_write_column(&line, col, '|'); if (col->commit == graph->commit && graph->num_parents > 2) { int len = (graph->num_parents - 2) * 2; - strbuf_addchars(sb, ' ', len); - chars_written += len; + graph_line_addchars(&line, ' ', len); } else { - strbuf_addch(sb, ' '); - chars_written++; + graph_line_addch(&line, ' '); } } - graph_pad_horizontally(graph, sb, chars_written); + graph_pad_horizontally(graph, &line); /* * 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 af623390b6..8313e293c7 100644 --- a/third_party/git/graph.h +++ b/third_party/git/graph.h @@ -2,6 +2,103 @@ #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; @@ -50,6 +147,21 @@ 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); @@ -62,6 +174,10 @@ 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); @@ -112,6 +228,7 @@ 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); @@ -121,6 +238,10 @@ 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 cd952ef5d3..54af9f813e 100644 --- a/third_party/git/grep.c +++ b/third_party/git/grep.c @@ -16,6 +16,20 @@ 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", @@ -150,12 +164,28 @@ 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; @@ -178,6 +208,13 @@ 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) { /* @@ -368,31 +405,20 @@ 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 (has_non_ascii(p->pattern)) + if (!opt->ignore_locale && has_non_ascii(p->pattern)) p->pcre1_tables = pcre_maketables(); options |= PCRE_CASELESS; } - if (is_utf8_locale() && has_non_ascii(p->pattern)) + if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern)) options |= PCRE_UTF8; p->pcre1_regexp = pcre_compile(p->pattern, options, &error, &erroffset, @@ -400,44 +426,31 @@ static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt) if (!p->pcre1_regexp) compile_regexp_failed(p, 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 +#if defined(PCRE_CONFIG_JIT) && !defined(NO_LIBPCRE1_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); - } + 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); + if (!p->pcre1_extra_info && error) + die("%s", error); } static int pcre1match(struct grep_pat *p, const char *line, const char *eol, regmatch_t *match, int eflags) { - int ovector[30], ret, flags = 0; + int ovector[30], ret, flags = PCRE_NO_UTF8_CHECK; if (eflags & REG_NOTBOL) flags |= PCRE_NOTBOL; -#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)); - } + 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); @@ -453,15 +466,12 @@ 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 GIT_PCRE1_USE_JIT - if (p->pcre1_jit_on) { +#ifdef PCRE_CONFIG_JIT + if (p->pcre1_jit_on) pcre_free_study(p->pcre1_extra_info); - pcre_jit_stack_free(p->pcre1_jit_stack); - } else + else #endif - { pcre_free(p->pcre1_extra_info); - } pcre_free((void *)p->pcre1_tables); } #else /* !USE_LIBPCRE1 */ @@ -488,7 +498,6 @@ 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; @@ -497,15 +506,20 @@ 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 (has_non_ascii(p->pattern)) { - character_tables = pcre2_maketables(NULL); + 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); p->pcre2_compile_context = pcre2_compile_context_create(NULL); - pcre2_set_character_tables(p->pcre2_compile_context, character_tables); + pcre2_set_character_tables(p->pcre2_compile_context, + p->pcre2_tables); } options |= PCRE2_CASELESS; } - if (is_utf8_locale() && has_non_ascii(p->pattern)) + if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern) && + !(!opt->ignore_case && (p->fixed || p->is_fixed))) options |= PCRE2_UTF; p->pcre2_pattern = pcre2_compile((PCRE2_SPTR)p->pattern, @@ -522,7 +536,9 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt } pcre2_config(PCRE2_CONFIG_JIT, &p->pcre2_jit_on); - if (p->pcre2_jit_on == 1) { + if (opt->debug) + fprintf(stderr, "pcre2_jit_on=%d\n", p->pcre2_jit_on); + if (p->pcre2_jit_on) { 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); @@ -547,19 +563,11 @@ 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); } } @@ -603,8 +611,7 @@ 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); - pcre2_jit_stack_free(p->pcre2_jit_stack); - pcre2_match_context_free(p->pcre2_match_context); + free((void *)p->pcre2_tables); } #else /* !USE_LIBPCRE2 */ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt) @@ -626,7 +633,6 @@ 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) { @@ -647,46 +653,66 @@ 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; - ascii_only = !has_non_ascii(p->pattern); + p->fixed = opt->fixed; - /* - * 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. - */ + 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")); + + 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 */ compile_fixed_regexp(p, opt); +#endif /* !USE_LIBPCRE2 */ return; } @@ -1053,9 +1079,7 @@ void free_grep_patterns(struct grep_opt *opt) case GREP_PATTERN: /* atom */ case GREP_PATTERN_HEAD: case GREP_PATTERN_BODY: - if (p->kws) - kwsfree(p->kws); - else if (p->pcre1_regexp) + if (p->pcre1_regexp) free_pcre1_regexp(p); else if (p->pcre2_pattern) free_pcre2_pattern(p); @@ -1115,29 +1139,12 @@ 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->fixed) - hit = !fixmatch(p, line, eol, match); - else if (p->pcre1_regexp) + if (p->pcre1_regexp) hit = !pcre1match(p, line, eol, match, eflags); else if (p->pcre2_pattern) hit = !pcre2match(p, line, eol, match, eflags); @@ -1533,11 +1540,6 @@ 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; @@ -1734,13 +1736,20 @@ static int fill_textconv_grep(struct repository *r, } /* - * fill_textconv is not remotely thread-safe; it may load objects - * behind the scenes, and it modifies the global diff tempfile - * structure. + * 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. */ - grep_read_lock(); + obj_read_lock(); size = fill_textconv(r, driver, df, &buf); - grep_read_unlock(); + obj_read_unlock(); free_filespec(df); /* @@ -1806,10 +1815,15 @@ 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. + * is not thread-safe. Also, get_oid_with_context() and + * parse_object() might be internally called. As they are not + * currently thread-safe and might be racy with object reading, + * obj_read_lock() must be called. */ grep_attr_lock(); + obj_read_lock(); textconv = userdiff_get_textconv(opt->repo, gs->driver); + obj_read_unlock(); grep_attr_unlock(); } @@ -2109,10 +2123,7 @@ 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 1875880f37..9115db8515 100644 --- a/third_party/git/grep.h +++ b/third_party/git/grep.h @@ -3,24 +3,12 @@ #include "color.h" #ifdef USE_LIBPCRE1 #include <pcre.h> -#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; +#ifndef PCRE_NO_UTF8_CHECK +#define PCRE_NO_UTF8_CHECK 0 #endif #else typedef int pcre; typedef int pcre_extra; -typedef int pcre_jit_stack; #endif #ifdef USE_LIBPCRE2 #define PCRE2_CODE_UNIT_WIDTH 8 @@ -29,10 +17,7 @@ typedef int pcre_jit_stack; 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" @@ -88,17 +73,15 @@ 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; - pcre2_match_context *pcre2_match_context; - pcre2_jit_stack *pcre2_jit_stack; + const uint8_t *pcre2_tables; uint32_t pcre2_jit_on; - kwset_t kws; unsigned fixed:1; + unsigned is_fixed:1; unsigned ignore_case:1; unsigned word_regexp:1; }; @@ -173,6 +156,7 @@ 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; @@ -189,6 +173,7 @@ 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); @@ -235,18 +220,5 @@ 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/hash.h b/third_party/git/hash.h index 52a4f1a3f4..e0f3f16b06 100644 --- a/third_party/git/hash.h +++ b/third_party/git/hash.h @@ -16,6 +16,7 @@ #endif #if defined(SHA256_GCRYPT) +#define SHA256_NEEDS_CLONE_HELPER #include "sha256/gcrypt.h" #elif defined(SHA256_OPENSSL) #include <openssl/sha.h> @@ -54,12 +55,28 @@ #define git_SHA256_Update platform_SHA256_Update #define git_SHA256_Final platform_SHA256_Final +#ifdef platform_SHA256_Clone +#define git_SHA256_Clone platform_SHA256_Clone +#endif + #ifdef SHA1_MAX_BLOCK_SIZE #include "compat/sha1-chunked.h" #undef git_SHA1_Update #define git_SHA1_Update git_SHA1_Update_Chunked #endif +static inline void git_SHA1_Clone(git_SHA_CTX *dst, const git_SHA_CTX *src) +{ + memcpy(dst, src, sizeof(*dst)); +} + +#ifndef SHA256_NEEDS_CLONE_HELPER +static inline void git_SHA256_Clone(git_SHA256_CTX *dst, const git_SHA256_CTX *src) +{ + memcpy(dst, src, sizeof(*dst)); +} +#endif + /* * Note that these constants are suitable for indexing the hash_algos array and * comparing against each other, but are otherwise arbitrary, so they should not @@ -85,6 +102,7 @@ union git_hash_ctx { typedef union git_hash_ctx git_hash_ctx; typedef void (*git_hash_init_fn)(git_hash_ctx *ctx); +typedef void (*git_hash_clone_fn)(git_hash_ctx *dst, const git_hash_ctx *src); typedef void (*git_hash_update_fn)(git_hash_ctx *ctx, const void *in, size_t len); typedef void (*git_hash_final_fn)(unsigned char *hash, git_hash_ctx *ctx); @@ -110,6 +128,9 @@ struct git_hash_algo { /* The hash initialization function. */ git_hash_init_fn init_fn; + /* The hash context cloning function. */ + git_hash_clone_fn clone_fn; + /* The hash update function. */ git_hash_update_fn update_fn; diff --git a/third_party/git/hashmap.c b/third_party/git/hashmap.c index d42f01ff5a..09813e1a46 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) } /* - * Incoporate another chunk of data into a memihash + * Incorporate 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 void *unused1, - const void *unused2, + const struct hashmap_entry *unused1, + const struct hashmap_entry *unused2, const void *unused_keydata) { return 0; @@ -171,41 +171,49 @@ void hashmap_init(struct hashmap *map, hashmap_cmp_fn equals_function, map->do_count_items = 1; } -void hashmap_free(struct hashmap *map, int free_entries) +void hashmap_free_(struct hashmap *map, ssize_t entry_offset) { if (!map || !map->table) return; - if (free_entries) { + if (entry_offset >= 0) { /* called by hashmap_free_entries */ struct hashmap_iter iter; struct hashmap_entry *e; + hashmap_iter_init(map, &iter); while ((e = hashmap_iter_next(&iter))) - free(e); + /* + * like container_of, but using caller-calculated + * offset (caller being hashmap_free_entries) + */ + free((char *)e - entry_offset); } free(map->table); memset(map, 0, sizeof(*map)); } -void *hashmap_get(const struct hashmap *map, const void *key, const void *keydata) +struct hashmap_entry *hashmap_get(const struct hashmap *map, + const struct hashmap_entry *key, + const void *keydata) { return *find_entry_ptr(map, key, keydata); } -void *hashmap_get_next(const struct hashmap *map, const void *entry) +struct hashmap_entry *hashmap_get_next(const struct hashmap *map, + const struct hashmap_entry *entry) { - struct hashmap_entry *e = ((struct hashmap_entry *) entry)->next; + struct hashmap_entry *e = entry->next; for (; e; e = e->next) if (entry_equals(map, entry, e, NULL)) return e; return NULL; } -void hashmap_add(struct hashmap *map, void *entry) +void hashmap_add(struct hashmap *map, struct hashmap_entry *entry) { unsigned int b = bucket(map, entry); /* add entry */ - ((struct hashmap_entry *) entry)->next = map->table[b]; + entry->next = map->table[b]; map->table[b] = entry; /* fix size and rehash if appropriate */ @@ -216,7 +224,9 @@ void hashmap_add(struct hashmap *map, void *entry) } } -void *hashmap_remove(struct hashmap *map, const void *key, const void *keydata) +struct hashmap_entry *hashmap_remove(struct hashmap *map, + const struct hashmap_entry *key, + const void *keydata) { struct hashmap_entry *old; struct hashmap_entry **e = find_entry_ptr(map, key, keydata); @@ -238,7 +248,8 @@ void *hashmap_remove(struct hashmap *map, const void *key, const void *keydata) return old; } -void *hashmap_put(struct hashmap *map, void *entry) +struct hashmap_entry *hashmap_put(struct hashmap *map, + struct hashmap_entry *entry) { struct hashmap_entry *old = hashmap_remove(map, entry, NULL); hashmap_add(map, entry); @@ -252,7 +263,7 @@ void hashmap_iter_init(struct hashmap *map, struct hashmap_iter *iter) iter->next = NULL; } -void *hashmap_iter_next(struct hashmap_iter *iter) +struct hashmap_entry *hashmap_iter_next(struct hashmap_iter *iter) { struct hashmap_entry *current = iter->next; for (;;) { @@ -275,10 +286,15 @@ struct pool_entry { }; static int pool_entry_cmp(const void *unused_cmp_data, - const struct pool_entry *e1, - const struct pool_entry *e2, - const unsigned char *keydata) + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, + const void *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)); } @@ -290,18 +306,18 @@ const void *memintern(const void *data, size_t len) /* initialize string pool hashmap */ if (!map.tablesize) - hashmap_init(&map, (hashmap_cmp_fn) pool_entry_cmp, NULL, 0); + hashmap_init(&map, pool_entry_cmp, NULL, 0); /* lookup interned string in pool */ - hashmap_entry_init(&key, memhash(data, len)); + hashmap_entry_init(&key.ent, memhash(data, len)); key.len = len; - e = hashmap_get(&map, &key, data); + e = hashmap_get_entry(&map, &key, ent, data); if (!e) { /* not found: create it */ FLEX_ALLOC_MEM(e, data, data, len); - hashmap_entry_init(e, key.ent.hash); + hashmap_entry_init(&e->ent, key.ent.hash); e->len = len; - hashmap_add(&map, e); + hashmap_add(&map, &e->ent); } return e->data; } diff --git a/third_party/git/hashmap.h b/third_party/git/hashmap.h index 8424911566..b011b394fe 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; // must be the first member! + * struct hashmap_entry ent; * long key; * char value[FLEX_ARRAY]; // be careful with allocating on stack! * }; @@ -21,12 +21,16 @@ * #define COMPARE_VALUE 1 * * static int long2string_cmp(const void *hashmap_cmp_fn_data, - * const struct long2string *e1, - * const struct long2string *e2, + * const struct hashmap_entry *eptr, + * const struct hashmap_entry *entry_or_key, * 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 || @@ -41,54 +45,58 @@ * char value[255], action[32]; * unsigned flags = 0; * - * hashmap_init(&map, (hashmap_cmp_fn) long2string_cmp, &flags, 0); + * hashmap_init(&map, 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, memhash(&key, sizeof(long))); + * hashmap_entry_init(&e->ent, memhash(&key, sizeof(long))); * e->key = key; - * hashmap_add(&map, e); + * hashmap_add(&map, &e->ent); * } * * if (!strcmp("print_all_by_key", action)) { * struct long2string k, *e; - * hashmap_entry_init(&k, memhash(&key, sizeof(long))); + * hashmap_entry_init(&k.ent, memhash(&key, sizeof(long))); * k.key = key; * * flags &= ~COMPARE_VALUE; - * e = hashmap_get(&map, &k, NULL); + * e = hashmap_get_entry(&map, &k, ent, NULL); * if (e) { * printf("first: %ld %s\n", e->key, e->value); - * while ((e = hashmap_get_next(&map, e))) + * while ((e = hashmap_get_next_entry(&map, e, + * struct long2string, ent))) { * 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, memhash(&key, sizeof(long))); + * hashmap_entry_init(&e->ent, memhash(&key, sizeof(long))); * e->key = key; * * flags |= COMPARE_VALUE; - * printf("%sfound\n", hashmap_get(&map, e, NULL) ? "" : "not "); + * printf("%sfound\n", + * hashmap_get(&map, &e->ent, NULL) ? "" : "not "); * free(e); * } * * if (!strcmp("has_exact_match_no_heap_alloc", action)) { * struct long2string k; - * hashmap_entry_init(&k, memhash(&key, sizeof(long))); + * hashmap_entry_init(&k.ent, memhash(&key, sizeof(long))); * k.key = key; * * flags |= COMPARE_VALUE; - * printf("%sfound\n", hashmap_get(&map, &k, value) ? "" : "not "); + * printf("%sfound\n", + * hashmap_get(&map, &k.ent, value) ? "" : "not "); * } * * if (!strcmp("end", action)) { - * hashmap_free(&map, 1); + * hashmap_free_entries(&map, struct long2string, ent); * break; * } * } @@ -133,7 +141,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, which must be used as first member of user data structures. + * hash table. * Ideally it should be followed by an int-sized member to prevent unused * memory on 64-bit systems due to alignment. */ @@ -160,7 +168,7 @@ struct hashmap_entry { * argument `keydata`, respectively. Otherwise, `keydata` is NULL. * * When it is too expensive to allocate a user entry (either because it is - * large or varialbe sized, such that it is not on the stack), then the + * large or variable sized, such that it is not on the stack), then the * relevant data to check for equality should be passed via `keydata`. * In this case `key` can be a stripped down version of the user key data * or even just a hashmap_entry having the correct hash. @@ -168,7 +176,8 @@ 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 void *entry, const void *entry_or_key, + const struct hashmap_entry *entry, + const struct hashmap_entry *entry_or_key, const void *keydata); /* @@ -223,13 +232,20 @@ 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. - * - * If `free_entries` is true, each hashmap_entry in the map is freed as well - * using stdlibs free(). + * Frees a hashmap structure and allocated memory, leaves entries undisturbed */ -void hashmap_free(struct hashmap *map, int free_entries); +#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 + */ +#define hashmap_free_entries(map, type, member) \ + hashmap_free_(map, offsetof(type, member)); /* hashmap_entry functions */ @@ -244,9 +260,9 @@ void hashmap_free(struct hashmap *map, int free_entries); * 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(void *entry, unsigned int hash) +static inline void hashmap_entry_init(struct hashmap_entry *e, + unsigned int hash) { - struct hashmap_entry *e = entry; e->hash = hash; e->next = NULL; } @@ -286,8 +302,9 @@ 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. */ -void *hashmap_get(const struct hashmap *map, const void *key, - const void *keydata); +struct hashmap_entry *hashmap_get(const struct hashmap *map, + const struct hashmap_entry *key, + const void *keydata); /* * Returns the hashmap entry for the specified hash code and key data, @@ -301,9 +318,10 @@ void *hashmap_get(const struct hashmap *map, const void *key, * `entry_or_key` parameter of `hashmap_cmp_fn` points to a hashmap_entry * structure that should not be used in the comparison. */ -static inline void *hashmap_get_from_hash(const struct hashmap *map, - unsigned int hash, - const void *keydata) +static inline struct hashmap_entry *hashmap_get_from_hash( + const struct hashmap *map, + unsigned int hash, + const void *keydata) { struct hashmap_entry key; hashmap_entry_init(&key, hash); @@ -318,7 +336,8 @@ static inline void *hashmap_get_from_hash(const struct hashmap *map, * `entry` is the hashmap_entry to start the search from, obtained via a previous * call to `hashmap_get` or `hashmap_get_next`. */ -void *hashmap_get_next(const struct hashmap *map, const void *entry); +struct hashmap_entry *hashmap_get_next(const struct hashmap *map, + const struct hashmap_entry *entry); /* * Adds a hashmap entry. This allows to add duplicate entries (i.e. @@ -327,7 +346,7 @@ void *hashmap_get_next(const struct hashmap *map, const void *entry); * `map` is the hashmap structure. * `entry` is the entry to add. */ -void hashmap_add(struct hashmap *map, void *entry); +void hashmap_add(struct hashmap *map, struct hashmap_entry *entry); /* * Adds or replaces a hashmap entry. If the hashmap contains duplicate @@ -337,7 +356,20 @@ void hashmap_add(struct hashmap *map, void *entry); * `entry` is the entry to add or replace. * Returns the replaced entry, or NULL if not found (i.e. the entry was added). */ -void *hashmap_put(struct hashmap *map, void *entry); +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)) /* * Removes a hashmap entry matching the specified key. If the hashmap contains @@ -346,8 +378,24 @@ void *hashmap_put(struct hashmap *map, void *entry); * * Argument explanation is the same as in `hashmap_get`. */ -void *hashmap_remove(struct hashmap *map, const void *key, - const void *keydata); +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)) /* * Returns the `bucket` an entry is stored in. @@ -370,10 +418,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. */ -void *hashmap_iter_next(struct hashmap_iter *iter); +struct hashmap_entry *hashmap_iter_next(struct hashmap_iter *iter); /* Initializes the iterator and returns the first entry, if any. */ -static inline void *hashmap_iter_first(struct hashmap *map, +static inline struct hashmap_entry *hashmap_iter_first(struct hashmap *map, struct hashmap_iter *iter) { hashmap_iter_init(map, iter); @@ -381,6 +429,65 @@ static inline void *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 = NULL, /* for systems without typeof */ \ + 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 @@ -396,7 +503,7 @@ static inline void hashmap_disable_item_counting(struct hashmap *map) } /* - * Re-enable item couting when adding/removing items. + * Re-enable item counting 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 5261d83ecf..919cbb9206 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 / Synching Repositories") }, + { CAT_synchingrepositories, N_("Low-level Commands / Syncing Repositories") }, { CAT_purehelpers, N_("Low-level Commands / Internal Helpers") }, { 0, NULL } }; @@ -263,6 +263,8 @@ void load_command_list(const char *prefix, const char *env_path = getenv("PATH"); const char *exec_path = git_exec_path(); + load_builtin_commands(prefix, main_cmds); + if (exec_path) { list_commands_in_dir(main_cmds, exec_path, prefix); QSORT(main_cmds->names, main_cmds->cnt, cmdname_compare); @@ -375,7 +377,7 @@ void list_cmds_by_config(struct string_list *list) { const char *cmd_list; - if (git_config_get_string_const("completion.commands", &cmd_list)) + if (git_config_get_string_tmp("completion.commands", &cmd_list)) return; string_list_sort(list); @@ -397,101 +399,16 @@ void list_cmds_by_config(struct string_list *list) } } -void list_common_guides_help(void) +void list_guides_help(void) { struct category_description catdesc[] = { - { CAT_guide, N_("The common Git guides are:") }, + { CAT_guide, N_("The Git concept guides are:") }, { 0, NULL } }; print_cmd_by_category(catdesc, NULL); putchar('\n'); } -struct slot_expansion { - const char *prefix; - const char *placeholder; - void (*fn)(struct string_list *list, const char *prefix); - int found; -}; - -void list_config_help(int for_human) -{ - struct slot_expansion slot_expansions[] = { - { "advice", "*", list_config_advices }, - { "color.branch", "<slot>", list_config_color_branch_slots }, - { "color.decorate", "<slot>", list_config_color_decorate_slots }, - { "color.diff", "<slot>", list_config_color_diff_slots }, - { "color.grep", "<slot>", list_config_color_grep_slots }, - { "color.interactive", "<slot>", list_config_color_interactive_slots }, - { "color.remote", "<slot>", list_config_color_sideband_slots }, - { "color.status", "<slot>", list_config_color_status_slots }, - { "fsck", "<msg-id>", list_config_fsck_msg_ids }, - { "receive.fsck", "<msg-id>", list_config_fsck_msg_ids }, - { NULL, NULL, NULL } - }; - const char **p; - struct slot_expansion *e; - struct string_list keys = STRING_LIST_INIT_DUP; - int i; - - for (p = config_name_list; *p; p++) { - const char *var = *p; - struct strbuf sb = STRBUF_INIT; - - for (e = slot_expansions; e->prefix; e++) { - - strbuf_reset(&sb); - strbuf_addf(&sb, "%s.%s", e->prefix, e->placeholder); - if (!strcasecmp(var, sb.buf)) { - e->fn(&keys, e->prefix); - e->found++; - break; - } - } - strbuf_release(&sb); - if (!e->prefix) - string_list_append(&keys, var); - } - - for (e = slot_expansions; e->prefix; e++) - if (!e->found) - BUG("slot_expansion %s.%s is not used", - e->prefix, e->placeholder); - - string_list_sort(&keys); - for (i = 0; i < keys.nr; i++) { - const char *var = keys.items[i].string; - const char *wildcard, *tag, *cut; - - if (for_human) { - puts(var); - continue; - } - - wildcard = strchr(var, '*'); - tag = strchr(var, '<'); - - if (!wildcard && !tag) { - puts(var); - continue; - } - - if (wildcard && !tag) - cut = wildcard; - else if (!wildcard && tag) - cut = tag; - else - cut = wildcard < tag ? wildcard : tag; - - /* - * We may produce duplicates, but that's up to - * git-completion.bash to handle - */ - printf("%.*s\n", (int)(cut - var), var); - } - string_list_clear(&keys, 0); -} - static int get_alias(const char *var, const char *value, void *data) { struct string_list *list = data; @@ -707,8 +624,33 @@ const char *help_unknown_cmd(const char *cmd) exit(1); } +void get_version_info(struct strbuf *buf, int show_build_options) +{ + /* + * The format of this string should be kept stable for compatibility + * with external projects that rely on the output of "git version". + * + * Always show the version, even if other options are given. + */ + strbuf_addf(buf, "git version %s\n", git_version_string); + + if (show_build_options) { + strbuf_addf(buf, "cpu: %s\n", GIT_HOST_CPU); + if (git_built_from_commit_string[0]) + strbuf_addf(buf, "built from commit: %s\n", + git_built_from_commit_string); + else + strbuf_addstr(buf, "no commit associated with this build\n"); + strbuf_addf(buf, "sizeof-long: %d\n", (int)sizeof(long)); + strbuf_addf(buf, "sizeof-size_t: %d\n", (int)sizeof(size_t)); + strbuf_addf(buf, "shell-path: %s\n", SHELL_PATH); + /* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */ + } +} + int cmd_version(int argc, const char **argv, const char *prefix) { + struct strbuf buf = STRBUF_INIT; int build_options = 0; const char * const usage[] = { N_("git version [<options>]"), @@ -722,25 +664,11 @@ int cmd_version(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, usage, 0); - /* - * The format of this string should be kept stable for compatibility - * with external projects that rely on the output of "git version". - * - * Always show the version, even if other options are given. - */ - printf("git version %s\n", git_version_string); + get_version_info(&buf, build_options); + printf("%s", buf.buf); + + strbuf_release(&buf); - if (build_options) { - printf("cpu: %s\n", GIT_HOST_CPU); - if (git_built_from_commit_string[0]) - printf("built from commit: %s\n", - git_built_from_commit_string); - else - printf("no commit associated with this build\n"); - printf("sizeof-long: %d\n", (int)sizeof(long)); - printf("sizeof-size_t: %d\n", (int)sizeof(size_t)); - /* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */ - } return 0; } @@ -774,7 +702,8 @@ static struct string_list guess_refs(const char *ref) return similar_refs; } -void help_unknown_ref(const char *ref, const char *cmd, const char *error) +NORETURN 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 b8780fbd0f..5871e93ba2 100644 --- a/third_party/git/help.h +++ b/third_party/git/help.h @@ -21,8 +21,7 @@ static inline void mput_char(char c, unsigned int num) void list_common_cmds_help(void); void list_all_cmds_help(void); -void list_common_guides_help(void); -void list_config_help(int for_human); +void list_guides_help(void); void list_all_main_cmds(struct string_list *list); void list_all_other_cmds(struct string_list *list); @@ -33,17 +32,19 @@ const char *help_unknown_cmd(const char *cmd); void load_command_list(const char *prefix, struct cmdnames *main_cmds, struct cmdnames *other_cmds); +void load_builtin_commands(const char *prefix, struct cmdnames *cmds); void add_cmdname(struct cmdnames *cmds, const char *name, int len); /* Here we require that excludes is a sorted list. */ void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes); int is_in_cmdlist(struct cmdnames *cmds, const char *name); void list_commands(unsigned int colopts, struct cmdnames *main_cmds, struct cmdnames *other_cmds); +void get_version_info(struct strbuf *buf, int show_build_options); /* * call this to die(), when it is suspected that the user mistyped a * ref to the command, to give suggested "correct" refs. */ -void help_unknown_ref(const char *ref, const char *cmd, const char *error); +NORETURN 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 7850a8879d..da51e64929 100644 --- a/third_party/git/hex.c +++ b/third_party/git/hex.c @@ -47,32 +47,73 @@ int hex_to_bytes(unsigned char *binary, const char *hex, size_t len) return 0; } -int get_sha1_hex(const char *hex, unsigned char *sha1) +static int get_hash_hex_algop(const char *hex, unsigned char *hash, + const struct git_hash_algo *algop) { int i; - for (i = 0; i < the_hash_algo->rawsz; i++) { + for (i = 0; i < algop->rawsz; i++) { int val = hex2chr(hex); if (val < 0) return -1; - *sha1++ = val; + *hash++ = val; hex += 2; } return 0; } +int get_sha1_hex(const char *hex, unsigned char *sha1) +{ + return get_hash_hex_algop(hex, sha1, the_hash_algo); +} + +int get_oid_hex_algop(const char *hex, struct object_id *oid, + const struct git_hash_algo *algop) +{ + return get_hash_hex_algop(hex, oid->hash, algop); +} + +/* + * NOTE: This function relies on hash algorithms being in order from shortest + * length to longest length. + */ +int get_oid_hex_any(const char *hex, struct object_id *oid) +{ + int i; + for (i = GIT_HASH_NALGOS - 1; i > 0; i--) { + if (!get_hash_hex_algop(hex, oid->hash, &hash_algos[i])) + return i; + } + return GIT_HASH_UNKNOWN; +} + int get_oid_hex(const char *hex, struct object_id *oid) { - return get_sha1_hex(hex, oid->hash); + return get_oid_hex_algop(hex, oid, the_hash_algo); } -int parse_oid_hex(const char *hex, struct object_id *oid, const char **end) +int parse_oid_hex_algop(const char *hex, struct object_id *oid, + const char **end, + const struct git_hash_algo *algop) { - int ret = get_oid_hex(hex, oid); + int ret = get_hash_hex_algop(hex, oid->hash, algop); if (!ret) - *end = hex + the_hash_algo->hexsz; + *end = hex + algop->hexsz; return ret; } +int parse_oid_hex_any(const char *hex, struct object_id *oid, const char **end) +{ + int ret = get_oid_hex_any(hex, oid); + if (ret) + *end = hex + hash_algos[ret].hexsz; + return ret; +} + +int parse_oid_hex(const char *hex, struct object_id *oid, const char **end) +{ + return parse_oid_hex_algop(hex, oid, end, the_hash_algo); +} + char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash, const struct git_hash_algo *algop) { @@ -90,11 +131,6 @@ 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); @@ -108,11 +144,6 @@ 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-backend.c b/third_party/git/http-backend.c index ec3144b444..a03b4bae22 100644 --- a/third_party/git/http-backend.c +++ b/third_party/git/http-backend.c @@ -9,7 +9,7 @@ #include "run-command.h" #include "string-list.h" #include "url.h" -#include "argv-array.h" +#include "strvec.h" #include "packfile.h" #include "object-store.h" #include "protocol.h" @@ -477,10 +477,10 @@ static void run_service(const char **argv, int buffer_input) host = "(none)"; if (!getenv("GIT_COMMITTER_NAME")) - argv_array_pushf(&cld.env_array, "GIT_COMMITTER_NAME=%s", user); + strvec_pushf(&cld.env_array, "GIT_COMMITTER_NAME=%s", user); if (!getenv("GIT_COMMITTER_EMAIL")) - argv_array_pushf(&cld.env_array, - "GIT_COMMITTER_EMAIL=%s@http.%s", user, host); + strvec_pushf(&cld.env_array, + "GIT_COMMITTER_EMAIL=%s@http.%s", user, host); cld.argv = argv; if (buffer_input || gzipped_request || req_len >= 0) diff --git a/third_party/git/http-fetch.c b/third_party/git/http-fetch.c index a32ac118d9..c4ccc5fea9 100644 --- a/third_party/git/http-fetch.c +++ b/third_party/git/http-fetch.c @@ -5,22 +5,93 @@ #include "walker.h" static const char http_fetch_usage[] = "git http-fetch " -"[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url"; +"[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin | --packfile=hash | commit-id] url"; -int cmd_main(int argc, const char **argv) +static int fetch_using_walker(const char *raw_url, int get_verbosely, + int get_recover, int commits, char **commit_id, + const char **write_ref, int commits_on_stdin) { + char *url = NULL; struct walker *walker; + int rc; + + str_end_url_with_slash(raw_url, &url); + + http_init(NULL, url, 0); + + walker = get_http_walker(url); + walker->get_verbosely = get_verbosely; + walker->get_recover = get_recover; + walker->get_progress = 0; + + rc = walker_fetch(walker, commits, commit_id, write_ref, url); + + if (commits_on_stdin) + walker_targets_free(commits, commit_id, write_ref); + + if (walker->corrupt_object_found) { + fprintf(stderr, +"Some loose object were found to be corrupt, but they might be just\n" +"a false '404 Not Found' error message sent with incorrect HTTP\n" +"status code. Suggest running 'git fsck'.\n"); + } + + walker_free(walker); + http_cleanup(); + free(url); + + return rc; +} + +static void fetch_single_packfile(struct object_id *packfile_hash, + const char *url) { + struct http_pack_request *preq; + struct slot_results results; + int ret; + + http_init(NULL, url, 0); + + preq = new_direct_http_pack_request(packfile_hash->hash, xstrdup(url)); + if (preq == NULL) + die("couldn't create http pack request"); + preq->slot->results = &results; + preq->generate_keep = 1; + + if (start_active_slot(preq->slot)) { + run_active_slot(preq->slot); + if (results.curl_result != CURLE_OK) { + die("Unable to get pack file %s\n%s", preq->url, + curl_errorstr); + } + } else { + die("Unable to start request"); + } + + if ((ret = finish_http_pack_request(preq))) + die("finish_http_pack_request gave result %d", ret); + + release_http_pack_request(preq); + http_cleanup(); +} + +int cmd_main(int argc, const char **argv) +{ int commits_on_stdin = 0; int commits; const char **write_ref = NULL; char **commit_id; - char *url = NULL; int arg = 1; - int rc = 0; int get_verbosely = 0; int get_recover = 0; + int packfile = 0; + int nongit; + struct object_id packfile_hash; + + setup_git_directory_gently(&nongit); while (arg < argc && argv[arg][0] == '-') { + const char *p; + if (argv[arg][1] == 't') { } else if (argv[arg][1] == 'c') { } else if (argv[arg][1] == 'a') { @@ -35,46 +106,35 @@ int cmd_main(int argc, const char **argv) get_recover = 1; } else if (!strcmp(argv[arg], "--stdin")) { commits_on_stdin = 1; + } else if (skip_prefix(argv[arg], "--packfile=", &p)) { + const char *end; + + packfile = 1; + if (parse_oid_hex(p, &packfile_hash, &end) || *end) + die(_("argument to --packfile must be a valid hash (got '%s')"), p); } arg++; } - if (argc != arg + 2 - commits_on_stdin) + if (argc != arg + 2 - (commits_on_stdin || packfile)) usage(http_fetch_usage); - if (commits_on_stdin) { - commits = walker_targets_stdin(&commit_id, &write_ref); - } else { - commit_id = (char **) &argv[arg++]; - commits = 1; - } - - if (argv[arg]) - str_end_url_with_slash(argv[arg], &url); - setup_git_directory(); + if (nongit) + die(_("not a git repository")); git_config(git_default_config, NULL); - http_init(NULL, url, 0); - walker = get_http_walker(url); - walker->get_verbosely = get_verbosely; - walker->get_recover = get_recover; - - rc = walker_fetch(walker, commits, commit_id, write_ref, url); - - if (commits_on_stdin) - walker_targets_free(commits, commit_id, write_ref); - - if (walker->corrupt_object_found) { - fprintf(stderr, -"Some loose object were found to be corrupt, but they might be just\n" -"a false '404 Not Found' error message sent with incorrect HTTP\n" -"status code. Suggest running 'git fsck'.\n"); + if (packfile) { + fetch_single_packfile(&packfile_hash, argv[arg]); + return 0; } - walker_free(walker); - http_cleanup(); - - free(url); - - return rc; + if (commits_on_stdin) { + commits = walker_targets_stdin(&commit_id, &write_ref); + } else { + commit_id = (char **) &argv[arg++]; + commits = 1; + } + return fetch_using_walker(argv[arg], get_verbosely, get_recover, + commits, commit_id, write_ref, + commits_on_stdin); } diff --git a/third_party/git/http-push.c b/third_party/git/http-push.c index 0353f9f514..6a4a43e07f 100644 --- a/third_party/git/http-push.c +++ b/third_party/git/http-push.c @@ -11,7 +11,7 @@ #include "remote.h" #include "list-objects.h" #include "sigchain.h" -#include "argv-array.h" +#include "strvec.h" #include "packfile.h" #include "object-store.h" #include "commit-reach.h" @@ -70,10 +70,10 @@ enum XML_Status { #define LOCK_REFRESH 30 /* Remember to update object flag allocation in object.h */ -#define LOCAL (1u<<16) -#define REMOTE (1u<<17) -#define FETCHING (1u<<18) -#define PUSHING (1u<<19) +#define LOCAL (1u<<11) +#define REMOTE (1u<<12) +#define FETCHING (1u<<13) +#define PUSHING (1u<<14) /* We allow "recursive" symbolic refs. Only within reason, though */ #define MAXDEPTH 5 @@ -117,6 +117,7 @@ enum transfer_state { struct transfer_request { struct object *obj; + struct packed_git *target; char *url; char *dest; struct remote_lock *lock; @@ -314,17 +315,18 @@ static void start_fetch_packed(struct transfer_request *request) release_request(request); return; } + close_pack_index(target); + request->target = target; fprintf(stderr, "Fetching pack %s\n", hash_to_hex(target->hash)); fprintf(stderr, " which contains %s\n", oid_to_hex(&request->obj->oid)); - preq = new_http_pack_request(target, repo->url); + preq = new_http_pack_request(target->hash, repo->url); if (preq == NULL) { repo->can_update_info_refs = 0; return; } - preq->lst = &repo->packs; /* Make sure there isn't another open request for this pack */ while (check_request) { @@ -501,10 +503,10 @@ static void release_request(struct transfer_request *request) if (request == request_queue_head) { request_queue_head = request->next; } else { - while (entry->next != NULL && entry->next != request) + while (entry && entry->next != request) entry = entry->next; - if (entry->next == request) - entry->next = entry->next->next; + if (entry) + entry->next = request->next; } free(request->url); @@ -597,6 +599,8 @@ static void finish_request(struct transfer_request *request) } if (fail) repo->can_update_info_refs = 0; + else + http_install_packfile(request->target, &repo->packs); release_request(request); } } @@ -981,7 +985,7 @@ static int unlock_remote(struct remote_lock *lock) while (prev && prev->next != lock) prev = prev->next; if (prev) - prev->next = prev->next->next; + prev->next = lock->next; } free(lock->owner); @@ -1842,7 +1846,7 @@ int cmd_main(int argc, const char **argv) new_refs = 0; for (ref = remote_refs; ref; ref = ref->next) { - struct argv_array commit_argv = ARGV_ARRAY_INIT; + struct strvec commit_argv = STRVEC_INIT; if (!ref->peer_ref) continue; @@ -1920,14 +1924,14 @@ int cmd_main(int argc, const char **argv) } /* Set up revision info for this refspec */ - argv_array_push(&commit_argv, ""); /* ignored */ - argv_array_push(&commit_argv, "--objects"); - argv_array_push(&commit_argv, oid_to_hex(&ref->new_oid)); + strvec_push(&commit_argv, ""); /* ignored */ + strvec_push(&commit_argv, "--objects"); + strvec_push(&commit_argv, oid_to_hex(&ref->new_oid)); if (!push_all && !is_null_oid(&ref->old_oid)) - argv_array_pushf(&commit_argv, "^%s", - oid_to_hex(&ref->old_oid)); + strvec_pushf(&commit_argv, "^%s", + oid_to_hex(&ref->old_oid)); repo_init_revisions(the_repository, &revs, setup_git_directory()); - setup_revisions(commit_argv.argc, commit_argv.argv, &revs, NULL); + setup_revisions(commit_argv.nr, commit_argv.v, &revs, NULL); revs.edge_hint = 0; /* just in case */ /* Generate a list of objects that need to be pushed */ @@ -1957,7 +1961,7 @@ int cmd_main(int argc, const char **argv) printf("%s %s\n", !rc ? "ok" : "error", ref->name); unlock_remote(ref_lock); check_locks(); - argv_array_clear(&commit_argv); + strvec_clear(&commit_argv); } /* Update remote server info if appropriate */ diff --git a/third_party/git/http-walker.c b/third_party/git/http-walker.c index fe15e325fa..4fb1235cd4 100644 --- a/third_party/git/http-walker.c +++ b/third_party/git/http-walker.c @@ -439,6 +439,7 @@ static int http_fetch_pack(struct walker *walker, struct alt_base *repo, unsigne target = find_sha1_pack(sha1, repo->packs); if (!target) return -1; + close_pack_index(target); if (walker->get_verbosely) { fprintf(stderr, "Getting pack %s\n", @@ -447,10 +448,9 @@ static int http_fetch_pack(struct walker *walker, struct alt_base *repo, unsigne hash_to_hex(sha1)); } - preq = new_http_pack_request(target, repo->base); + preq = new_http_pack_request(target->hash, repo->base); if (preq == NULL) goto abort; - preq->lst = &repo->packs; preq->slot->results = &results; if (start_active_slot(preq->slot)) { @@ -469,6 +469,7 @@ static int http_fetch_pack(struct walker *walker, struct alt_base *repo, unsigne release_http_pack_request(preq); if (ret) return ret; + http_install_packfile(target, &repo->packs); return 0; diff --git a/third_party/git/http.c b/third_party/git/http.c index 27aa0a3192..8b23a546af 100644 --- a/third_party/git/http.c +++ b/third_party/git/http.c @@ -18,7 +18,7 @@ static struct trace_key trace_curl = TRACE_KEY_INIT(CURL); static int trace_curl_data = 1; -static struct string_list cookies_to_redact = STRING_LIST_INIT_DUP; +static int trace_curl_redact = 1; #if LIBCURL_VERSION_NUM >= 0x070a08 long int git_curl_ipresolve = CURL_IPRESOLVE_WHATEVER; #else @@ -86,6 +86,13 @@ static long curl_low_speed_time = -1; static int curl_ftp_no_epsv; static const char *curl_http_proxy; static const char *http_proxy_authmethod; + +static const char *http_proxy_ssl_cert; +static const char *http_proxy_ssl_key; +static const char *http_proxy_ssl_ca_info; +static struct credential proxy_cert_auth = CREDENTIAL_INIT; +static int proxy_ssl_cert_password_required; + static struct { const char *name; long curlauth_param; @@ -150,7 +157,7 @@ static unsigned long empty_auth_useless = static struct curl_slist *pragma_header; static struct curl_slist *no_pragma_header; -static struct curl_slist *extra_http_headers; +static struct string_list extra_http_headers = STRING_LIST_INIT_DUP; static struct active_request_slot *active_queue_head; @@ -365,6 +372,20 @@ static int http_options(const char *var, const char *value, void *cb) if (!strcmp("http.proxyauthmethod", var)) return git_config_string(&http_proxy_authmethod, var, value); + if (!strcmp("http.proxysslcert", var)) + return git_config_string(&http_proxy_ssl_cert, var, value); + + if (!strcmp("http.proxysslkey", var)) + return git_config_string(&http_proxy_ssl_key, var, value); + + if (!strcmp("http.proxysslcainfo", var)) + return git_config_string(&http_proxy_ssl_ca_info, var, value); + + if (!strcmp("http.proxysslcertpasswordprotected", var)) { + proxy_ssl_cert_password_required = git_config_bool(var, value); + return 0; + } + if (!strcmp("http.cookiefile", var)) return git_config_pathname(&curl_cookie_file, var, value); if (!strcmp("http.savecookies", var)) { @@ -414,11 +435,9 @@ static int http_options(const char *var, const char *value, void *cb) if (!value) { return config_error_nonbool(var); } else if (!*value) { - curl_slist_free_all(extra_http_headers); - extra_http_headers = NULL; + string_list_clear(&extra_http_headers, 0); } else { - extra_http_headers = - curl_slist_append(extra_http_headers, value); + string_list_append(&extra_http_headers, value); } return 0; } @@ -513,9 +532,11 @@ static void set_proxyauth_name_password(CURL *result) #else struct strbuf s = STRBUF_INIT; - strbuf_addstr_urlencode(&s, proxy_auth.username, 1); + strbuf_addstr_urlencode(&s, proxy_auth.username, + is_rfc3986_unreserved); strbuf_addch(&s, ':'); - strbuf_addstr_urlencode(&s, proxy_auth.password, 1); + strbuf_addstr_urlencode(&s, proxy_auth.password, + is_rfc3986_unreserved); curl_proxyuserpwd = strbuf_detach(&s, NULL); curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, curl_proxyuserpwd); #endif @@ -558,6 +579,7 @@ 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); @@ -565,6 +587,22 @@ static int has_cert_password(void) return 1; } +#if LIBCURL_VERSION_NUM >= 0x073400 +static int has_proxy_cert_password(void) +{ + if (http_proxy_ssl_cert == NULL || proxy_ssl_cert_password_required != 1) + return 0; + if (!proxy_cert_auth.password) { + proxy_cert_auth.protocol = xstrdup("cert"); + proxy_cert_auth.host = xstrdup(""); + proxy_cert_auth.username = xstrdup(""); + proxy_cert_auth.path = xstrdup(http_proxy_ssl_cert); + credential_fill(&proxy_cert_auth); + } + return 1; +} +#endif + #if LIBCURL_VERSION_NUM >= 0x071900 static void set_curl_keepalive(CURL *c) { @@ -604,8 +642,9 @@ static void redact_sensitive_header(struct strbuf *header) { const char *sensitive_header; - if (skip_prefix(header->buf, "Authorization:", &sensitive_header) || - skip_prefix(header->buf, "Proxy-Authorization:", &sensitive_header)) { + if (trace_curl_redact && + (skip_prefix(header->buf, "Authorization:", &sensitive_header) || + skip_prefix(header->buf, "Proxy-Authorization:", &sensitive_header))) { /* The first token is the type, which is OK to log */ while (isspace(*sensitive_header)) sensitive_header++; @@ -614,20 +653,15 @@ static void redact_sensitive_header(struct strbuf *header) /* Everything else is opaque and possibly sensitive */ strbuf_setlen(header, sensitive_header - header->buf); strbuf_addstr(header, " <redacted>"); - } else if (cookies_to_redact.nr && + } else if (trace_curl_redact && skip_prefix(header->buf, "Cookie:", &sensitive_header)) { struct strbuf redacted_header = STRBUF_INIT; - char *cookie; + const char *cookie; while (isspace(*sensitive_header)) sensitive_header++; - /* - * The contents of header starting from sensitive_header will - * subsequently be overridden, so it is fine to mutate this - * string (hence the assignment to "char *"). - */ - cookie = (char *) sensitive_header; + cookie = sensitive_header; while (cookie) { char *equals; @@ -640,14 +674,8 @@ static void redact_sensitive_header(struct strbuf *header) strbuf_addstr(&redacted_header, cookie); continue; } - *equals = 0; /* temporarily set to NUL for lookup */ - if (string_list_lookup(&cookies_to_redact, cookie)) { - strbuf_addstr(&redacted_header, cookie); - strbuf_addstr(&redacted_header, "=<redacted>"); - } else { - *equals = '='; - strbuf_addstr(&redacted_header, cookie); - } + strbuf_add(&redacted_header, cookie, equals - cookie); + strbuf_addstr(&redacted_header, "=<redacted>"); if (semicolon) { /* * There are more cookies. (Or, for some @@ -680,8 +708,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_insert((*header), 0, text, strlen(text)); - strbuf_insert((*header), strlen(text), ": ", 2); + strbuf_insertstr((*header), 0, text); + strbuf_insertstr((*header), strlen(text), ": "); strbuf_rtrim((*header)); strbuf_addch((*header), '\n'); trace_strbuf(&trace_curl, (*header)); @@ -766,6 +794,12 @@ static int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size, return 0; } +void http_trace_curl_no_data(void) +{ + trace_override_envvar(&trace_curl, "1"); + trace_curl_data = 0; +} + void setup_curl_trace(CURL *handle) { if (!trace_want(&trace_curl)) @@ -924,8 +958,14 @@ static CURL *get_curl_handle(void) #if LIBCURL_VERSION_NUM >= 0x073400 curl_easy_setopt(result, CURLOPT_PROXY_CAINFO, NULL); #endif - } else if (ssl_cainfo != NULL) - curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo); + } else if (ssl_cainfo != NULL || http_proxy_ssl_ca_info != NULL) { + if (ssl_cainfo != NULL) + curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo); +#if LIBCURL_VERSION_NUM >= 0x073400 + if (http_proxy_ssl_ca_info != NULL) + curl_easy_setopt(result, CURLOPT_PROXY_CAINFO, http_proxy_ssl_ca_info); +#endif + } if (curl_low_speed_limit > 0 && curl_low_speed_time > 0) { curl_easy_setopt(result, CURLOPT_LOW_SPEED_LIMIT, @@ -949,15 +989,12 @@ static CURL *get_curl_handle(void) warning(_("Protocol restrictions not supported with cURL < 7.19.4")); #endif if (getenv("GIT_CURL_VERBOSE")) - curl_easy_setopt(result, CURLOPT_VERBOSE, 1L); + http_trace_curl_no_data(); setup_curl_trace(result); if (getenv("GIT_TRACE_CURL_NO_DATA")) trace_curl_data = 0; - if (getenv("GIT_REDACT_COOKIES")) { - string_list_split(&cookies_to_redact, - getenv("GIT_REDACT_COOKIES"), ',', -1); - string_list_sort(&cookies_to_redact); - } + if (!git_env_bool("GIT_TRACE_REDACT", 1)) + trace_curl_redact = 0; curl_easy_setopt(result, CURLOPT_USERAGENT, user_agent ? user_agent : git_user_agent()); @@ -1018,9 +1055,18 @@ static CURL *get_curl_handle(void) CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4); #endif #if LIBCURL_VERSION_NUM >= 0x073400 - else if (starts_with(curl_http_proxy, "https")) - curl_easy_setopt(result, - CURLOPT_PROXYTYPE, CURLPROXY_HTTPS); + else if (starts_with(curl_http_proxy, "https")) { + curl_easy_setopt(result, CURLOPT_PROXYTYPE, CURLPROXY_HTTPS); + + if (http_proxy_ssl_cert) + curl_easy_setopt(result, CURLOPT_PROXY_SSLCERT, http_proxy_ssl_cert); + + if (http_proxy_ssl_key) + curl_easy_setopt(result, CURLOPT_PROXY_SSLKEY, http_proxy_ssl_key); + + if (has_proxy_cert_password()) + curl_easy_setopt(result, CURLOPT_PROXY_KEYPASSWD, proxy_cert_auth.password); + } #endif if (strstr(curl_http_proxy, "://")) credential_from_url(&proxy_auth, curl_http_proxy); @@ -1073,6 +1119,7 @@ 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) { @@ -1159,6 +1206,13 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) max_requests = DEFAULT_MAX_REQUESTS; #endif + set_from_env(&http_proxy_ssl_cert, "GIT_PROXY_SSL_CERT"); + set_from_env(&http_proxy_ssl_key, "GIT_PROXY_SSL_KEY"); + set_from_env(&http_proxy_ssl_ca_info, "GIT_PROXY_SSL_CAINFO"); + + if (getenv("GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED")) + proxy_ssl_cert_password_required = 1; + if (getenv("GIT_CURL_FTP_NO_EPSV")) curl_ftp_no_epsv = 1; @@ -1199,8 +1253,7 @@ void http_cleanup(void) #endif curl_global_cleanup(); - curl_slist_free_all(extra_http_headers); - extra_http_headers = NULL; + string_list_clear(&extra_http_headers, 0); curl_slist_free_all(pragma_header); pragma_header = NULL; @@ -1230,6 +1283,12 @@ void http_cleanup(void) } ssl_cert_password_required = 0; + if (proxy_cert_auth.password != NULL) { + memset(proxy_cert_auth.password, 0, strlen(proxy_cert_auth.password)); + FREE_AND_NULL(proxy_cert_auth.password); + } + proxy_ssl_cert_password_required = 0; + FREE_AND_NULL(cached_accept_language); } @@ -1624,10 +1683,11 @@ int run_one_slot(struct active_request_slot *slot, struct curl_slist *http_copy_default_headers(void) { - struct curl_slist *headers = NULL, *h; + struct curl_slist *headers = NULL; + const struct string_list_item *item; - for (h = extra_http_headers; h; h = h->next) - headers = curl_slist_append(headers, h->data); + for_each_string_list_item(item, &extra_http_headers) + headers = curl_slist_append(headers, item->string); return headers; } @@ -2201,70 +2261,74 @@ void release_http_pack_request(struct http_pack_request *preq) int finish_http_pack_request(struct http_pack_request *preq) { - struct packed_git **lst; - struct packed_git *p = preq->target; - char *tmp_idx; - size_t len; struct child_process ip = CHILD_PROCESS_INIT; - - close_pack_index(p); + int tmpfile_fd; + int ret = 0; fclose(preq->packfile); preq->packfile = NULL; - lst = preq->lst; - while (*lst != p) - lst = &((*lst)->next); - *lst = (*lst)->next; - - if (!strip_suffix(preq->tmpfile.buf, ".pack.temp", &len)) - BUG("pack tmpfile does not end in .pack.temp?"); - tmp_idx = xstrfmt("%.*s.idx.temp", (int)len, preq->tmpfile.buf); + tmpfile_fd = xopen(preq->tmpfile.buf, O_RDONLY); - argv_array_push(&ip.args, "index-pack"); - argv_array_pushl(&ip.args, "-o", tmp_idx, NULL); - argv_array_push(&ip.args, preq->tmpfile.buf); + strvec_push(&ip.args, "index-pack"); + strvec_push(&ip.args, "--stdin"); ip.git_cmd = 1; - ip.no_stdin = 1; - ip.no_stdout = 1; + ip.in = tmpfile_fd; + if (preq->generate_keep) { + strvec_pushf(&ip.args, "--keep=git %"PRIuMAX, + (uintmax_t)getpid()); + ip.out = 0; + } else { + ip.no_stdout = 1; + } if (run_command(&ip)) { - unlink(preq->tmpfile.buf); - unlink(tmp_idx); - free(tmp_idx); - return -1; + ret = -1; + goto cleanup; } - unlink(sha1_pack_index_name(p->hash)); +cleanup: + close(tmpfile_fd); + unlink(preq->tmpfile.buf); + return ret; +} - if (finalize_object_file(preq->tmpfile.buf, sha1_pack_name(p->hash)) - || finalize_object_file(tmp_idx, sha1_pack_index_name(p->hash))) { - free(tmp_idx); - return -1; - } +void http_install_packfile(struct packed_git *p, + struct packed_git **list_to_remove_from) +{ + struct packed_git **lst = list_to_remove_from; + + while (*lst != p) + lst = &((*lst)->next); + *lst = (*lst)->next; install_packed_git(the_repository, p); - free(tmp_idx); - return 0; } struct http_pack_request *new_http_pack_request( - struct packed_git *target, const char *base_url) + const unsigned char *packed_git_hash, const char *base_url) { + + struct strbuf buf = STRBUF_INIT; + + end_url_with_slash(&buf, base_url); + strbuf_addf(&buf, "objects/pack/pack-%s.pack", + hash_to_hex(packed_git_hash)); + return new_direct_http_pack_request(packed_git_hash, + strbuf_detach(&buf, NULL)); +} + +struct http_pack_request *new_direct_http_pack_request( + const unsigned char *packed_git_hash, char *url) { off_t prev_posn = 0; - struct strbuf buf = STRBUF_INIT; struct http_pack_request *preq; preq = xcalloc(1, sizeof(*preq)); strbuf_init(&preq->tmpfile, 0); - preq->target = target; - end_url_with_slash(&buf, base_url); - strbuf_addf(&buf, "objects/pack/pack-%s.pack", - hash_to_hex(target->hash)); - preq->url = strbuf_detach(&buf, NULL); + preq->url = url; - strbuf_addf(&preq->tmpfile, "%s.temp", sha1_pack_name(target->hash)); + strbuf_addf(&preq->tmpfile, "%s.temp", sha1_pack_name(packed_git_hash)); preq->packfile = fopen(preq->tmpfile.buf, "a"); if (!preq->packfile) { error("Unable to open local file %s for pack", @@ -2288,7 +2352,7 @@ struct http_pack_request *new_http_pack_request( if (http_is_verbose) fprintf(stderr, "Resuming fetch of pack %s at byte %"PRIuMAX"\n", - hash_to_hex(target->hash), + hash_to_hex(packed_git_hash), (uintmax_t)prev_posn); http_opt_request_remainder(preq->slot->curl, prev_posn); } diff --git a/third_party/git/http.h b/third_party/git/http.h index b429f1cf04..5de792ef3f 100644 --- a/third_party/git/http.h +++ b/third_party/git/http.h @@ -25,8 +25,12 @@ #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) @@ -212,18 +216,36 @@ int http_get_info_packs(const char *base_url, struct http_pack_request { char *url; - struct packed_git *target; - struct packed_git **lst; + + /* + * If this is true, finish_http_pack_request() will pass "--keep" to + * index-pack, resulting in the creation of a keep file, and will not + * suppress its stdout (that is, the "keep\t<hash>\n" line will be + * printed to stdout). + */ + unsigned generate_keep : 1; + FILE *packfile; struct strbuf tmpfile; struct active_request_slot *slot; }; struct http_pack_request *new_http_pack_request( - struct packed_git *target, const char *base_url); + const unsigned char *packed_git_hash, const char *base_url); +struct http_pack_request *new_direct_http_pack_request( + const unsigned char *packed_git_hash, char *url); int finish_http_pack_request(struct http_pack_request *preq); void release_http_pack_request(struct http_pack_request *preq); +/* + * Remove p from the given list, and invoke install_packed_git() on it. + * + * This is a convenience function for users that have obtained a list of packs + * from http_get_info_packs() and have chosen a specific pack to fetch. + */ +void http_install_packfile(struct packed_git *p, + struct packed_git **list_to_remove_from); + /* Helpers for fetching object */ struct http_object_request { char *url; @@ -248,6 +270,13 @@ int finish_http_object_request(struct http_object_request *freq); void abort_http_object_request(struct http_object_request *freq); void release_http_object_request(struct http_object_request *freq); +/* + * Instead of using environment variables to determine if curl tracing happens, + * behave as if GIT_TRACE_CURL=1 and GIT_TRACE_CURL_NO_DATA=1 is set. Call this + * before calling setup_curl_trace(). + */ +void http_trace_curl_no_data(void); + /* setup routine for curl_easy_setopt CURLOPT_DEBUGFUNCTION */ void setup_curl_trace(CURL *handle); #endif /* HTTP_H */ diff --git a/third_party/git/ident.c b/third_party/git/ident.c index e666ee4e59..6aba4b5cb6 100644 --- a/third_party/git/ident.c +++ b/third_party/git/ident.c @@ -345,27 +345,45 @@ person_only: return 0; } -static const char *env_hint = -N_("\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"); + +static void ident_env_hint(enum want_ident whose_ident) +{ + switch (whose_ident) { + case WANT_AUTHOR_IDENT: + fputs(_("Author identity unknown\n"), stderr); + break; + case WANT_COMMITTER_IDENT: + fputs(_("Committer identity unknown\n"), stderr); + break; + default: + break; + } + + fputs(_("\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"), stderr); +} const char *fmt_ident(const char *name, const char *email, enum want_ident whose_ident, const char *date_str, int flag) { - static struct strbuf ident = STRBUF_INIT; + static int index; + static struct strbuf ident_pool[2] = { STRBUF_INIT, STRBUF_INIT }; int strict = (flag & IDENT_STRICT); int want_date = !(flag & IDENT_NO_DATE); int want_name = !(flag & IDENT_NO_NAME); + struct strbuf *ident = &ident_pool[index]; + index = (index + 1) % ARRAY_SIZE(ident_pool); + if (!email) { if (whose_ident == WANT_AUTHOR_IDENT && git_author_email.len) email = git_author_email.buf; @@ -375,12 +393,12 @@ const char *fmt_ident(const char *name, const char *email, if (!email) { if (strict && ident_use_config_only && !(ident_config_given & IDENT_MAIL_GIVEN)) { - fputs(_(env_hint), stderr); + ident_env_hint(whose_ident); die(_("no email was given and auto-detection is disabled")); } email = ident_default_email(); if (strict && default_email_is_bogus) { - fputs(_(env_hint), stderr); + ident_env_hint(whose_ident); die(_("unable to auto-detect email address (got '%s')"), email); } } @@ -397,13 +415,13 @@ const char *fmt_ident(const char *name, const char *email, if (!name) { if (strict && ident_use_config_only && !(ident_config_given & IDENT_NAME_GIVEN)) { - fputs(_(env_hint), stderr); + ident_env_hint(whose_ident); die(_("no name was given and auto-detection is disabled")); } name = ident_default_name(); using_default = 1; if (strict && default_name_is_bogus) { - fputs(_(env_hint), stderr); + ident_env_hint(whose_ident); die(_("unable to auto-detect name (got '%s')"), name); } } @@ -411,7 +429,7 @@ const char *fmt_ident(const char *name, const char *email, struct passwd *pw; if (strict) { if (using_default) - fputs(_(env_hint), stderr); + ident_env_hint(whose_ident); die(_("empty ident name (for <%s>) not allowed"), email); } pw = xgetpwuid_self(NULL); @@ -421,25 +439,25 @@ const char *fmt_ident(const char *name, const char *email, die(_("name consists only of disallowed characters: %s"), name); } - strbuf_reset(&ident); + strbuf_reset(ident); if (want_name) { - strbuf_addstr_without_crud(&ident, name); - strbuf_addstr(&ident, " <"); + strbuf_addstr_without_crud(ident, name); + strbuf_addstr(ident, " <"); } - strbuf_addstr_without_crud(&ident, email); + strbuf_addstr_without_crud(ident, email); if (want_name) - strbuf_addch(&ident, '>'); + strbuf_addch(ident, '>'); if (want_date) { - strbuf_addch(&ident, ' '); + strbuf_addch(ident, ' '); if (date_str && date_str[0]) { - if (parse_date(date_str, &ident) < 0) + if (parse_date(date_str, ident) < 0) die(_("invalid date format: %s"), date_str); } else - strbuf_addstr(&ident, ident_default_date()); + strbuf_addstr(ident, ident_default_date()); } - return ident.buf; + return ident->buf; } const char *fmt_name(enum want_ident whose_ident) diff --git a/third_party/git/imap-send.c b/third_party/git/imap-send.c index 6c54d8c29d..5764dd812c 100644 --- a/third_party/git/imap-send.c +++ b/third_party/git/imap-send.c @@ -976,7 +976,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f imap_info("Starting tunnel '%s'... ", srvc->tunnel); - argv_array_push(&tunnel.args, srvc->tunnel); + strvec_push(&tunnel.args, srvc->tunnel); tunnel.use_shell = 1; tunnel.in = -1; tunnel.out = -1; @@ -1464,7 +1464,7 @@ static CURL *setup_curl(struct imap_server_conf *srvc, struct credential *cred) curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L); if (0 < verbosity || getenv("GIT_CURL_VERBOSE")) - curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); + http_trace_curl_no_data(); setup_curl_trace(curl); return curl; diff --git a/third_party/git/interdiff.c b/third_party/git/interdiff.c deleted file mode 100644 index c81d680a6c..0000000000 --- a/third_party/git/interdiff.c +++ /dev/null @@ -1,28 +0,0 @@ -#include "cache.h" -#include "commit.h" -#include "revision.h" -#include "interdiff.h" - -static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data) -{ - return data; -} - -void show_interdiff(struct rev_info *rev, int indent) -{ - struct diff_options opts; - struct strbuf prefix = STRBUF_INIT; - - memcpy(&opts, &rev->diffopt, sizeof(opts)); - opts.output_format = DIFF_FORMAT_PATCH; - opts.output_prefix = idiff_prefix_cb; - strbuf_addchars(&prefix, ' ', indent); - opts.output_prefix_data = &prefix; - diff_setup_done(&opts); - - diff_tree_oid(rev->idiff_oid1, rev->idiff_oid2, "", &opts); - diffcore_std(&opts); - diff_flush(&opts); - - strbuf_release(&prefix); -} diff --git a/third_party/git/interdiff.h b/third_party/git/interdiff.h deleted file mode 100644 index 01c730a5c9..0000000000 --- a/third_party/git/interdiff.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef INTERDIFF_H -#define INTERDIFF_H - -struct rev_info; - -void show_interdiff(struct rev_info *, int indent); - -#endif diff --git a/third_party/git/kwset.h b/third_party/git/kwset.h index df99a92178..f50ecae573 100644 --- a/third_party/git/kwset.h +++ b/third_party/git/kwset.h @@ -1,3 +1,6 @@ +#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. @@ -59,3 +62,4 @@ 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 3aff1849e7..68eeb425f8 100644 --- a/third_party/git/line-log.c +++ b/third_party/git/line-log.c @@ -14,7 +14,8 @@ #include "graph.h" #include "userdiff.h" #include "line-log.h" -#include "argv-array.h" +#include "strvec.h" +#include "bloom.h" static void range_set_grow(struct range_set *rs, size_t extra) { @@ -519,7 +520,7 @@ static void fill_line_ends(struct repository *r, unsigned long *ends = NULL; char *data = NULL; - if (diff_populate_filespec(r, spec, 0)) + if (diff_populate_filespec(r, spec, NULL)) die("Cannot read blob %s", oid_to_hex(&spec->oid)); ALLOC_ARRAY(ends, size); @@ -737,6 +738,38 @@ 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 strvec array = STRVEC_INIT; + const char **paths; + + for (r = range; r; r = r->next) + strvec_push(&array, r->path); + paths = strvec_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; @@ -746,20 +779,7 @@ 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); - 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); - } + parse_pathspec_from_ranges(&rev->diffopt.pathspec, range); } static void move_diff_queue(struct diff_queue_struct *dst, @@ -817,15 +837,29 @@ 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 ? get_commit_tree_oid(parent) : NULL, - get_commit_tree_oid(commit), "", opt); - if (opt->detect_rename) { + 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); + filter_diffs_for_paths(range, 1); - if (diff_might_be_rename()) - diffcore_std(opt); + diffcore_std(opt); filter_diffs_for_paths(range, 0); } move_diff_queue(queue, &diff_queued_diff); @@ -1012,12 +1046,12 @@ static int process_diff_filepair(struct rev_info *rev, return 0; assert(pair->two->oid_valid); - diff_populate_filespec(rev->diffopt.repo, pair->two, 0); + diff_populate_filespec(rev->diffopt.repo, pair->two, NULL); file_target.ptr = pair->two->data; file_target.size = pair->two->size; if (pair->one->oid_valid) { - diff_populate_filespec(rev->diffopt.repo, pair->one, 0); + diff_populate_filespec(rev->diffopt.repo, pair->one, NULL); file_parent.ptr = pair->one->data; file_parent.size = pair->one->size; } else { @@ -1113,6 +1147,37 @@ int line_log_print(struct rev_info *rev, struct commit *commit) return 1; } +static int bloom_filter_check(struct rev_info *rev, + struct commit *commit, + struct line_log_data *range) +{ + struct bloom_filter *filter; + struct bloom_key key; + int result = 0; + + if (!commit->parents) + return 1; + + if (!rev->bloom_filter_settings || + !(filter = get_bloom_filter(rev->repo, commit))) + return 1; + + if (!range) + return 0; + + while (!result && range) { + fill_bloom_key(range->path, strlen(range->path), &key, rev->bloom_filter_settings); + + if (bloom_filter_contains(filter, &key, rev->bloom_filter_settings)) + result = 1; + + clear_bloom_key(&key); + range = range->next; + } + + return result; +} + static int process_ranges_ordinary_commit(struct rev_info *rev, struct commit *commit, struct line_log_data *range) { @@ -1126,6 +1191,7 @@ static int process_ranges_ordinary_commit(struct rev_info *rev, struct commit *c queue_diffs(range, &rev->diffopt, &queue, commit, parent); changed = process_all_files(&parent_range, rev, &queue, range); + if (parent) add_line_range(rev, parent, parent_range); free_line_log_data(parent_range); @@ -1194,13 +1260,17 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm /* NEEDSWORK leaking like a sieve */ } -static int process_ranges_arbitrary_commit(struct rev_info *rev, struct commit *commit) +int line_log_process_ranges_arbitrary_commit(struct rev_info *rev, struct commit *commit) { struct line_log_data *range = lookup_line_range(rev, commit); int changed = 0; if (range) { - if (!commit->parents || !commit->parents->next) + if (commit->parents && !bloom_filter_check(rev, commit, range)) { + struct line_log_data *prange = line_log_data_copy(range); + add_line_range(rev, commit->parents->item, prange); + clear_commit_line_range(rev, commit); + } else if (!commit->parents || !commit->parents->next) changed = process_ranges_ordinary_commit(rev, commit, range); else changed = process_ranges_merge_commit(rev, commit, range); @@ -1237,7 +1307,7 @@ int line_log_filter(struct rev_info *rev) while (list) { struct commit_list *to_free = NULL; commit = list->item; - if (process_ranges_arbitrary_commit(rev, commit)) { + if (line_log_process_ranges_arbitrary_commit(rev, commit)) { *pp = list; pp = &list->next; } else diff --git a/third_party/git/line-log.h b/third_party/git/line-log.h index 8ee7a2bd4a..82ae8d98a4 100644 --- a/third_party/git/line-log.h +++ b/third_party/git/line-log.h @@ -46,10 +46,7 @@ void sort_and_merge_range_set(struct range_set *); struct line_log_data { struct line_log_data *next; char *path; - char status; struct range_set ranges; - int arg_alloc, arg_nr; - const char **args; struct diff_filepair *pair; struct diff_ranges diff; }; @@ -57,6 +54,8 @@ struct line_log_data { void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args); int line_log_filter(struct rev_info *rev); +int line_log_process_ranges_arbitrary_commit(struct rev_info *rev, + struct commit *commit); int line_log_print(struct rev_info *rev, struct commit *commit); diff --git a/third_party/git/list-objects-filter-options.c b/third_party/git/list-objects-filter-options.c index 1cb20c659c..defd3dfd10 100644 --- a/third_party/git/list-objects-filter-options.c +++ b/third_party/git/list-objects-filter-options.c @@ -2,10 +2,41 @@ #include "commit.h" #include "config.h" #include "revision.h" -#include "argv-array.h" +#include "strvec.h" #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); + +const char *list_object_filter_config_name(enum list_objects_filter_choice c) +{ + switch (c) { + case LOFC_DISABLED: + /* we have no name for "no filter at all" */ + break; + case LOFC_BLOB_NONE: + return "blob:none"; + case LOFC_BLOB_LIMIT: + return "blob:limit"; + case LOFC_TREE_DEPTH: + return "tree"; + case LOFC_SPARSE_OID: + return "sparse:oid"; + case LOFC_COMBINE: + return "combine"; + case LOFC__COUNT: + /* not a real filter type; just the count of all filters */ + break; + } + BUG("list_object_filter_choice_name: invalid argument '%d'", c); +} /* * Parse value of the argument to the "filter" keyword. @@ -29,16 +60,11 @@ static int gently_parse_list_objects_filter( { const char *v0; - if (filter_options->choice) { - if (errbuf) { - strbuf_addstr( - errbuf, - _("multiple filter-specs cannot be combined")); - } - return 1; - } + if (!arg) + return 0; - filter_options->filter_spec = strdup(arg); + if (filter_options->choice) + BUG("filter_options already populated"); if (!strcmp(arg, "blob:none")) { filter_options->choice = LOFC_BLOB_NONE; @@ -52,28 +78,14 @@ static int gently_parse_list_objects_filter( } else if (skip_prefix(arg, "tree:", &v0)) { if (!git_parse_ulong(v0, &filter_options->tree_exclude_depth)) { - if (errbuf) { - strbuf_addstr( - errbuf, - _("expected 'tree:<depth>'")); - } + strbuf_addstr(errbuf, _("expected 'tree:<depth>'")); return 1; } filter_options->choice = LOFC_TREE_DEPTH; return 0; } else if (skip_prefix(arg, "sparse:oid=", &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->sparse_oid_name = xstrdup(v0); filter_options->choice = LOFC_SPARSE_OID; return 0; @@ -84,103 +96,307 @@ 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 */ - if (errbuf) - strbuf_addf(errbuf, _("invalid filter-spec '%s'"), arg); + strbuf_addf(errbuf, _("invalid filter-spec '%s'"), arg); memset(filter_options, 0, sizeof(*filter_options)); return 1; } -int parse_list_objects_filter(struct list_objects_filter_options *filter_options, - const char *arg) +static const char *RESERVED_NON_WS = "~`!@#$^&*()[]{}\\;'\",<>?"; + +static int has_reserved_character( + struct strbuf *sub_spec, struct strbuf *errbuf) { - struct strbuf buf = STRBUF_INIT; - if (gently_parse_list_objects_filter(filter_options, arg, &buf)) - die("%s", buf.buf); + 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) +{ + 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); +} + int opt_parse_list_objects_filter(const struct option *opt, const char *arg, int unset) { struct list_objects_filter_options *filter_options = opt->value; - if (unset || !arg) { + if (unset || !arg) list_objects_filter_set_no_filter(filter_options); - return 0; + 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 parse_list_objects_filter(filter_options, arg); + return filter->filter_spec.items[0].string; } -void expand_list_objects_filter_spec( - const struct list_objects_filter_options *filter, - struct strbuf *expanded_spec) +const char *expand_list_objects_filter_spec( + struct list_objects_filter_options *filter) { - strbuf_init(expanded_spec, strlen(filter->filter_spec)); - if (filter->choice == LOFC_BLOB_LIMIT) - strbuf_addf(expanded_spec, "blob:limit=%lu", + if (filter->choice == LOFC_BLOB_LIMIT) { + struct strbuf expanded_spec = STRBUF_INIT; + strbuf_addf(&expanded_spec, "blob:limit=%lu", filter->blob_limit_value); - 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); + 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); } void list_objects_filter_release( struct list_objects_filter_options *filter_options) { - free(filter_options->filter_spec); - free(filter_options->sparse_oid_value); + 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); memset(filter_options, 0, sizeof(*filter_options)); } void partial_clone_register( const char *remote, - const struct list_objects_filter_options *filter_options) + struct list_objects_filter_options *filter_options) { - /* - * 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")); + struct promisor_remote *promisor_remote; + char *cfg_name; + char *filter_name; - git_config_set("core.repositoryformatversion", "1"); - git_config_set("extensions.partialclone", remote); + /* Check if it is already registered */ + if ((promisor_remote = promisor_remote_find(remote))) { + if (promisor_remote->partial_clone_filter) + /* + * Remote is already registered and a filter is already + * set, so we don't need to do anything here. + */ + return; + } else { + if (upgrade_repository_format(1) < 0) + die(_("unable to upgrade repository format to support partial clone")); - repository_format_partial_clone = xstrdup(remote); + /* Add promisor config for the remote */ + cfg_name = xstrfmt("remote.%s.promisor", remote); + git_config_set(cfg_name, "true"); + free(cfg_name); + } /* * Record the initial filter-spec in the config as * the default for subsequent fetches from this remote. */ - core_partial_clone_filter_default = - xstrdup(filter_options->filter_spec); - git_config_set("core.partialclonefilter", - core_partial_clone_filter_default); + 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(); } void partial_clone_get_default_filter_spec( - struct list_objects_filter_options *filter_options) + struct list_objects_filter_options *filter_options, + const char *remote) { + 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 (!core_partial_clone_filter_default) + if (!promisor) return; + + string_list_append(&filter_options->filter_spec, + promisor->partial_clone_filter); gently_parse_list_objects_filter(filter_options, - core_partial_clone_filter_default, - NULL); + promisor->partial_clone_filter, + &errbuf); + strbuf_release(&errbuf); } diff --git a/third_party/git/list-objects-filter-options.h b/third_party/git/list-objects-filter-options.h index c54f0000fb..01767c3c96 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 "strbuf.h" +#include "string-list.h" /* * The list of defined filters for list-objects. @@ -13,9 +13,16 @@ enum list_objects_filter_choice { LOFC_BLOB_LIMIT, LOFC_TREE_DEPTH, LOFC_SPARSE_OID, + LOFC_COMBINE, LOFC__COUNT /* must be last */ }; +/* + * Returns a configuration key suitable for describing the given object filter, + * e.g.: "blob:none", "combine", etc. + */ +const char *list_object_filter_config_name(enum list_objects_filter_choice c); + struct list_objects_filter_options { /* * 'filter_spec' is the raw argument value given on the command line @@ -23,8 +30,10 @@ 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(). */ - char *filter_spec; + struct string_list filter_spec; /* * 'choice' is determined by parsing the filter-spec. This indicates @@ -38,19 +47,40 @@ struct list_objects_filter_options { unsigned int no_filter : 1; /* - * Parsed values (fields) from within the filter-spec. These are - * choice-specific; not all values will be defined for any given - * choice. + * BEGIN choice-specific parsed values from within the filter-spec. Only + * some values will be defined for any given choice. */ - struct object_id *sparse_oid_value; + + char *sparse_oid_name; 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" -int parse_list_objects_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( struct list_objects_filter_options *filter_options, const char *arg); @@ -58,20 +88,29 @@ int opt_parse_list_objects_filter(const struct option *opt, const char *arg, int unset); #define OPT_PARSE_LIST_OBJECTS_FILTER(fo) \ - { OPTION_CALLBACK, 0, CL_ARG__FILTER, fo, N_("args"), \ - N_("object filtering"), 0, \ - opt_parse_list_objects_filter } + OPT_CALLBACK(0, CL_ARG__FILTER, fo, N_("args"), \ + N_("object filtering"), \ + opt_parse_list_objects_filter) /* * 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 filter_spec field when - * communicating with a remote process or subprocess. + * 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. */ -void expand_list_objects_filter_spec( - const struct list_objects_filter_options *filter, - struct strbuf *expanded_spec); +const char *list_objects_filter_spec( + struct list_objects_filter_options *filter); void list_objects_filter_release( struct list_objects_filter_options *filter_options); @@ -85,8 +124,9 @@ static inline void list_objects_filter_set_no_filter( void partial_clone_register( const char *remote, - const struct list_objects_filter_options *filter_options); -void partial_clone_get_default_filter_spec( struct list_objects_filter_options *filter_options); +void partial_clone_get_default_filter_spec( + struct list_objects_filter_options *filter_options, + const char *remote); #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 36e1f774bc..0a3ef3cab3 100644 --- a/third_party/git/list-objects-filter.c +++ b/third_party/git/list-objects-filter.c @@ -26,11 +26,46 @@ */ #define FILTER_SHOWN_BUT_REVISIT (1<<21) -/* - * 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 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. */ struct oidset *omits; }; @@ -40,10 +75,9 @@ 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); @@ -61,24 +95,18 @@ static enum list_objects_filter_result filter_blobs_none( assert(obj->type == OBJ_BLOB); assert((obj->flags & SEEN) == 0); - if (filter_data->omits) - oidset_insert(filter_data->omits, &obj->oid); + if (omits) + oidset_insert(omits, &obj->oid); return LOFR_MARK_SEEN; /* but not LOFR_DO_SHOW (hard omit) */ } } -static void *filter_blobs_none__init( - struct oidset *omitted, +static void filter_blobs_none__init( struct list_objects_filter_options *filter_options, - filter_object_fn *filter_fn, - filter_free_fn *filter_free_fn) + struct filter *filter) { - struct filter_blobs_none_data *d = xcalloc(1, sizeof(*d)); - d->omits = omitted; - - *filter_fn = filter_blobs_none; - *filter_free_fn = free; - return d; + filter->filter_object_fn = filter_blobs_none; + filter->free_fn = free; } /* @@ -86,8 +114,6 @@ 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 @@ -110,16 +136,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 filter_trees_depth_data *filter_data, + struct oidset *omits, int include_it) { - if (!filter_data->omits) + if (!omits) return 0; if (include_it) - return oidset_remove(filter_data->omits, &obj->oid); + return oidset_remove(omits, &obj->oid); else - return oidset_insert(filter_data->omits, &obj->oid); + return oidset_insert(omits, &obj->oid); } static enum list_objects_filter_result filter_trees_depth( @@ -128,6 +154,7 @@ 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_; @@ -152,7 +179,7 @@ static enum list_objects_filter_result filter_trees_depth( return LOFR_ZERO; case LOFS_BLOB: - filter_trees_update_omits(obj, filter_data, include_it); + filter_trees_update_omits(obj, omits, include_it); return include_it ? LOFR_MARK_SEEN | LOFR_DO_SHOW : LOFR_ZERO; case LOFS_BEGIN_TREE: @@ -173,12 +200,12 @@ static enum list_objects_filter_result filter_trees_depth( filter_res = LOFR_SKIP_TREE; } else { int been_omitted = filter_trees_update_omits( - obj, filter_data, include_it); + obj, omits, include_it); seen_info->depth = filter_data->current_depth; if (include_it) filter_res = LOFR_DO_SHOW; - else if (filter_data->omits && !been_omitted) + else if (omits && !been_omitted) /* * Must update omit information of children * recursively; they have not been omitted yet. @@ -201,21 +228,18 @@ static void filter_trees_free(void *filter_data) { free(d); } -static void *filter_trees_depth__init( - struct oidset *omitted, +static void filter_trees_depth__init( struct list_objects_filter_options *filter_options, - filter_object_fn *filter_fn, - filter_free_fn *filter_free_fn) + struct filter *filter) { 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_fn = filter_trees_depth; - *filter_free_fn = filter_trees_free; - return d; + filter->filter_data = d; + filter->filter_object_fn = filter_trees_depth; + filter->free_fn = filter_trees_free; } /* @@ -223,7 +247,6 @@ 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; }; @@ -233,6 +256,7 @@ 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_; @@ -270,30 +294,27 @@ static enum list_objects_filter_result filter_blobs_limit( if (object_length < filter_data->max_bytes) goto include_it; - if (filter_data->omits) - oidset_insert(filter_data->omits, &obj->oid); + if (omits) + oidset_insert(omits, &obj->oid); return LOFR_MARK_SEEN; /* but not LOFR_DO_SHOW (hard omit) */ } include_it: - if (filter_data->omits) - oidset_remove(filter_data->omits, &obj->oid); + if (omits) + oidset_remove(omits, &obj->oid); return LOFR_MARK_SEEN | LOFR_DO_SHOW; } -static void *filter_blobs_limit__init( - struct oidset *omitted, +static void filter_blobs_limit__init( struct list_objects_filter_options *filter_options, - filter_object_fn *filter_fn, - filter_free_fn *filter_free_fn) + struct filter *filter) { struct filter_blobs_limit_data *d = xcalloc(1, sizeof(*d)); - d->omits = omitted; d->max_bytes = filter_options->blob_limit_value; - *filter_fn = filter_blobs_limit; - *filter_free_fn = free; - return d; + filter->filter_data = d; + filter->filter_object_fn = filter_blobs_limit; + filter->free_fn = free; } /* @@ -307,12 +328,12 @@ static void *filter_blobs_limit__init( */ struct frame { /* - * defval is the usual default include/exclude value that + * default_match 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. */ - int defval; + enum pattern_match_result default_match; /* * 1 if the directory (recursively) contains any provisionally @@ -326,8 +347,7 @@ struct frame { }; struct filter_sparse_data { - struct oidset *omits; - struct exclude_list el; + struct pattern_list pl; size_t nr, alloc; struct frame *array_frame; @@ -339,11 +359,13 @@ 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 val, dtype; + int dtype; struct frame *frame; + enum pattern_match_result match; switch (filter_situation) { default: @@ -352,15 +374,15 @@ static enum list_objects_filter_result filter_sparse( case LOFS_BEGIN_TREE: assert(obj->type == OBJ_TREE); dtype = DT_DIR; - 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; + 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; ALLOC_GROW(filter_data->array_frame, filter_data->nr + 1, filter_data->alloc); - filter_data->array_frame[filter_data->nr].defval = val; + filter_data->array_frame[filter_data->nr].default_match = match; filter_data->array_frame[filter_data->nr].child_prov_omit = 0; filter_data->nr++; @@ -414,14 +436,14 @@ static enum list_objects_filter_result filter_sparse( frame = &filter_data->array_frame[filter_data->nr - 1]; dtype = DT_REG; - val = is_excluded_from_list(pathname, strlen(pathname), - filename, &dtype, &filter_data->el, + match = path_matches_pattern_list(pathname, strlen(pathname), + filename, &dtype, &filter_data->pl, r->index); - if (val < 0) - val = frame->defval; - if (val > 0) { - if (filter_data->omits) - oidset_remove(filter_data->omits, &obj->oid); + if (match == UNDECIDED) + match = frame->default_match; + if (match == MATCHED) { + if (omits) + oidset_remove(omits, &obj->oid); return LOFR_MARK_SEEN | LOFR_DO_SHOW; } @@ -435,8 +457,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 (filter_data->omits) - oidset_insert(filter_data->omits, &obj->oid); + if (omits) + oidset_insert(omits, &obj->oid); /* * Remember that at least 1 blob in this tree was @@ -456,33 +478,169 @@ static void filter_sparse_free(void *filter_data) free(d); } -static void *filter_sparse_oid__init( - struct oidset *omitted, +static void filter_sparse_oid__init( struct list_objects_filter_options *filter_options, - filter_object_fn *filter_fn, - filter_free_fn *filter_free_fn) + struct filter *filter) { struct filter_sparse_data *d = xcalloc(1, sizeof(*d)); - 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"); + 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)); ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc); - d->array_frame[d->nr].defval = 0; /* default to include */ + d->array_frame[d->nr].default_match = 0; /* default to include */ d->array_frame[d->nr].child_prov_omit = 0; d->nr++; - *filter_fn = filter_sparse; - *filter_free_fn = filter_sparse_free; - return d; + filter->filter_data = d; + filter->filter_object_fn = filter_sparse; + filter->free_fn = filter_sparse_free; } -typedef void *(*filter_init_fn)( - struct oidset *omitted, +/* 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; +} + +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, - filter_object_fn *filter_fn, - filter_free_fn *filter_free_fn); + 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)( + struct list_objects_filter_options *filter_options, + struct filter *filter); /* * Must match "enum list_objects_filter_choice". @@ -493,27 +651,64 @@ static filter_init_fn s_filters[] = { filter_blobs_limit__init, filter_trees_depth__init, filter_sparse_oid__init, + filter_combine__init, }; -void *list_objects_filter__init( +struct filter *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) + struct list_objects_filter_options *filter_options) { + struct filter *filter; filter_init_fn init_fn; assert((sizeof(s_filters) / sizeof(s_filters[0])) == LOFC__COUNT); + if (!filter_options) + return NULL; + if (filter_options->choice >= LOFC__COUNT) BUG("invalid list-objects filter choice: %d", filter_options->choice); init_fn = s_filters[filter_options->choice]; - if (init_fn) - return init_fn(omitted, filter_options, - filter_fn, filter_free_fn); - *filter_fn = NULL; - *filter_free_fn = NULL; - return NULL; + 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); } diff --git a/third_party/git/list-objects-filter.h b/third_party/git/list-objects-filter.h index 1d45a4ad57..cfd784e203 100644 --- a/third_party/git/list-objects-filter.h +++ b/third_party/git/list-objects-filter.h @@ -60,30 +60,36 @@ enum list_objects_filter_situation { LOFS_BLOB }; -typedef enum list_objects_filter_result (*filter_object_fn)( +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( struct repository *r, enum list_objects_filter_situation filter_situation, struct object *obj, const char *pathname, const char *filename, - void *filter_data); - -typedef void (*filter_free_fn)(void *filter_data); + struct filter *filter); /* - * 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. + * Destroys `filter` and finalizes the `omitted` set, if present. Does + * nothing if `filter` is null. */ -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); +void list_objects_filter__free(struct filter *filter); #endif /* LIST_OBJECTS_FILTER_H */ diff --git a/third_party/git/list-objects.c b/third_party/git/list-objects.c index b5651ddd5b..e19589baa0 100644 --- a/third_party/git/list-objects.c +++ b/third_party/git/list-objects.c @@ -18,8 +18,7 @@ struct traversal_context { show_object_fn show_object; show_commit_fn show_commit; void *show_data; - filter_object_fn filter_fn; - void *filter_data; + struct filter *filter; }; static void process_blob(struct traversal_context *ctx, @@ -29,7 +28,7 @@ static void process_blob(struct traversal_context *ctx, { struct object *obj = &blob->object; size_t pathlen; - enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW; + enum list_objects_filter_result r; if (!ctx->revs->blob_objects) return; @@ -54,11 +53,10 @@ static void process_blob(struct traversal_context *ctx, pathlen = path->len; strbuf_addstr(path, name); - 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); + r = list_objects_filter__filter_object(ctx->revs->repo, + LOFS_BLOB, obj, + path->buf, &path->buf[pathlen], + ctx->filter); if (r & LOFR_MARK_SEEN) obj->flags |= SEEN; if (r & LOFR_DO_SHOW) @@ -157,7 +155,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 = LOFR_MARK_SEEN | LOFR_DO_SHOW; + enum list_objects_filter_result r; int failed_parse; if (!revs->tree_objects) @@ -186,11 +184,10 @@ static void process_tree(struct traversal_context *ctx, } strbuf_addstr(base, name); - 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); + r = list_objects_filter__filter_object(ctx->revs->repo, + LOFS_BEGIN_TREE, obj, + base->buf, &base->buf[baselen], + ctx->filter); if (r & LOFR_MARK_SEEN) obj->flags |= SEEN; if (r & LOFR_DO_SHOW) @@ -203,16 +200,14 @@ static void process_tree(struct traversal_context *ctx, else if (!failed_parse) process_tree_contents(ctx, tree, base); - 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); - } + 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); strbuf_setlen(base, baselen); free_tree_buffer(tree); @@ -370,7 +365,9 @@ 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 (get_commit_tree(commit)) { + if (!ctx->revs->tree_objects) + ; /* do not bother loading tree */ + else if (get_commit_tree(commit)) { struct tree *tree = get_commit_tree(commit); tree->object.flags |= NOT_USER_GIVEN; add_pending_tree(ctx->revs, tree); @@ -402,8 +399,7 @@ 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_fn = NULL; - ctx.filter_data = NULL; + ctx.filter = NULL; do_traverse(&ctx); } @@ -416,17 +412,12 @@ 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_fn = NULL; - - ctx.filter_data = list_objects_filter__init(omitted, filter_options, - &ctx.filter_fn, &filter_free_fn); + ctx.filter = list_objects_filter__init(omitted, filter_options); do_traverse(&ctx); - if (ctx.filter_data && filter_free_fn) - filter_free_fn(ctx.filter_data); + list_objects_filter__free(ctx.filter); } diff --git a/third_party/git/ll-merge.c b/third_party/git/ll-merge.c index 5b8d46aede..1ec0b959e0 100644 --- a/third_party/git/ll-merge.c +++ b/third_party/git/ll-merge.c @@ -32,6 +32,20 @@ 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 */ @@ -233,7 +247,7 @@ static int read_merge_config(const char *var, const char *value, void *cb) { struct ll_merge_driver *fn; const char *key, *name; - int namelen; + size_t namelen; if (!strcmp(var, "merge.default")) return git_config_string(&default_ll_merge, var, value); @@ -354,7 +368,7 @@ int ll_merge(mmbuffer_t *result_buf, struct index_state *istate, const struct ll_merge_options *opts) { - static struct attr_check *check; + struct attr_check *check = load_merge_attributes(); static const struct ll_merge_options default_opts; const char *ll_driver_name = NULL; int marker_size = DEFAULT_CONFLICT_MARKER_SIZE; @@ -369,9 +383,6 @@ 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 b9e2af1c88..aceb1b2413 100644 --- a/third_party/git/ll-merge.h +++ b/third_party/git/ll-merge.h @@ -7,16 +7,87 @@ #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; - unsigned variant : 2; /* favor ours, favor theirs, or union merge */ + + /** + * 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 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, @@ -26,5 +97,6 @@ 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/lockfile.c b/third_party/git/lockfile.c index 8e8ab4f29f..cc9a4b8428 100644 --- a/third_party/git/lockfile.c +++ b/third_party/git/lockfile.c @@ -70,7 +70,8 @@ static void resolve_symlink(struct strbuf *path) } /* Make sure errno contains a meaningful value on error */ -static int lock_file(struct lock_file *lk, const char *path, int flags) +static int lock_file(struct lock_file *lk, const char *path, int flags, + int mode) { struct strbuf filename = STRBUF_INIT; @@ -79,7 +80,7 @@ static int lock_file(struct lock_file *lk, const char *path, int flags) resolve_symlink(&filename); strbuf_addstr(&filename, LOCK_SUFFIX); - lk->tempfile = create_tempfile(filename.buf); + lk->tempfile = create_tempfile_mode(filename.buf, mode); strbuf_release(&filename); return lk->tempfile ? lk->tempfile->fd : -1; } @@ -99,7 +100,7 @@ static int lock_file(struct lock_file *lk, const char *path, int flags) * exactly once. If timeout_ms is -1, try indefinitely. */ static int lock_file_timeout(struct lock_file *lk, const char *path, - int flags, long timeout_ms) + int flags, long timeout_ms, int mode) { int n = 1; int multiplier = 1; @@ -107,7 +108,7 @@ static int lock_file_timeout(struct lock_file *lk, const char *path, static int random_initialized = 0; if (timeout_ms == 0) - return lock_file(lk, path, flags); + return lock_file(lk, path, flags, mode); if (!random_initialized) { srand((unsigned int)getpid()); @@ -121,7 +122,7 @@ static int lock_file_timeout(struct lock_file *lk, const char *path, long backoff_ms, wait_ms; int fd; - fd = lock_file(lk, path, flags); + fd = lock_file(lk, path, flags, mode); if (fd >= 0) return fd; /* success */ @@ -169,10 +170,11 @@ NORETURN void unable_to_lock_die(const char *path, int err) } /* This should return a meaningful errno on failure */ -int hold_lock_file_for_update_timeout(struct lock_file *lk, const char *path, - int flags, long timeout_ms) +int hold_lock_file_for_update_timeout_mode(struct lock_file *lk, + const char *path, int flags, + long timeout_ms, int mode) { - int fd = lock_file_timeout(lk, path, flags, timeout_ms); + int fd = lock_file_timeout(lk, path, flags, timeout_ms, mode); if (fd < 0) { if (flags & LOCK_DIE_ON_ERROR) unable_to_lock_die(path, errno); diff --git a/third_party/git/lockfile.h b/third_party/git/lockfile.h index 9843053ce8..db93e6ba73 100644 --- a/third_party/git/lockfile.h +++ b/third_party/git/lockfile.h @@ -90,6 +90,15 @@ * functions. In particular, the state diagram and the cleanup * machinery are all implemented in the tempfile module. * + * Permission bits + * --------------- + * + * If you call either `hold_lock_file_for_update_mode` or + * `hold_lock_file_for_update_timeout_mode`, you can specify a suggested + * mode for the underlying temporary file. Note that the file isn't + * guaranteed to have this exact mode, since it may be limited by either + * the umask, 'core.sharedRepository', or both. See `adjust_shared_perm` + * for more. * * Error handling * -------------- @@ -156,12 +165,20 @@ struct lock_file { * file descriptor for writing to it, or -1 on error. If the file is * currently locked, retry with quadratic backoff for at least * timeout_ms milliseconds. If timeout_ms is 0, try exactly once; if - * timeout_ms is -1, retry indefinitely. The flags argument and error - * handling are described above. + * timeout_ms is -1, retry indefinitely. The flags argument, error + * handling, and mode are described above. */ -int hold_lock_file_for_update_timeout( +int hold_lock_file_for_update_timeout_mode( + struct lock_file *lk, const char *path, + int flags, long timeout_ms, int mode); + +static inline int hold_lock_file_for_update_timeout( struct lock_file *lk, const char *path, - int flags, long timeout_ms); + int flags, long timeout_ms) +{ + return hold_lock_file_for_update_timeout_mode(lk, path, flags, + timeout_ms, 0666); +} /* * Attempt to create a lockfile for the file at `path` and return a @@ -175,6 +192,13 @@ static inline int hold_lock_file_for_update( return hold_lock_file_for_update_timeout(lk, path, flags, 0); } +static inline int hold_lock_file_for_update_mode( + struct lock_file *lk, const char *path, + int flags, int mode) +{ + return hold_lock_file_for_update_timeout_mode(lk, path, flags, 0, mode); +} + /* * Return a nonzero value iff `lk` is currently locked. */ diff --git a/third_party/git/log-tree.c b/third_party/git/log-tree.c index 1e56df62a7..1927f917ce 100644 --- a/third_party/git/log-tree.c +++ b/third_party/git/log-tree.c @@ -15,7 +15,6 @@ #include "sequencer.h" #include "line-log.h" #include "help.h" -#include "interdiff.h" #include "range-diff.h" static struct decoration name_decoration = { "object names" }; @@ -77,9 +76,60 @@ 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); } +static int match_ref_pattern(const char *refname, + const struct string_list_item *item) +{ + int matched = 0; + if (item->util == NULL) { + if (!wildmatch(item->string, refname, 0)) + matched = 1; + } else { + const char *rest; + if (skip_prefix(refname, item->string, &rest) && + (!*rest || *rest == '/')) + matched = 1; + } + return matched; +} + +static int ref_filter_match(const char *refname, + const struct decoration_filter *filter) +{ + struct string_list_item *item; + const struct string_list *exclude_patterns = filter->exclude_ref_pattern; + const struct string_list *include_patterns = filter->include_ref_pattern; + const struct string_list *exclude_patterns_config = + filter->exclude_ref_config_pattern; + + if (exclude_patterns && exclude_patterns->nr) { + for_each_string_list_item(item, exclude_patterns) { + if (match_ref_pattern(refname, item)) + return 0; + } + } + + if (include_patterns && include_patterns->nr) { + for_each_string_list_item(item, include_patterns) { + if (match_ref_pattern(refname, item)) + return 1; + } + return 0; + } + + if (exclude_patterns_config && exclude_patterns_config->nr) { + for_each_string_list_item(item, exclude_patterns_config) { + if (match_ref_pattern(refname, item)) + return 0; + } + } + + return 1; +} + static int add_ref_decoration(const char *refname, const struct object_id *oid, int flags, void *cb_data) { @@ -87,9 +137,7 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid, enum decoration_type type = DECORATION_NONE; struct decoration_filter *filter = (struct decoration_filter *)cb_data; - if (filter && !ref_filter_match(refname, - filter->include_ref_pattern, - filter->exclude_ref_pattern)) + if (filter && !ref_filter_match(refname, filter)) return 0; if (starts_with(refname, git_replace_ref_base)) { @@ -154,6 +202,9 @@ void load_ref_decorations(struct decoration_filter *filter, int flags) for_each_string_list_item(item, filter->include_ref_pattern) { normalize_glob_ref(item, NULL, item->string); } + for_each_string_list_item(item, filter->exclude_ref_config_pattern) { + normalize_glob_ref(item, NULL, item->string); + } } decoration_loaded = 1; decoration_flags = flags; @@ -448,22 +499,21 @@ static void show_signature(struct rev_info *opt, struct commit *commit) { struct strbuf payload = STRBUF_INIT; struct strbuf signature = STRBUF_INIT; - struct strbuf gpg_output = STRBUF_INIT; + struct signature_check sigc = { 0 }; int status; if (parse_signed_commit(commit, &payload, &signature) <= 0) goto out; - status = verify_signed_buffer(payload.buf, payload.len, - signature.buf, signature.len, - &gpg_output, NULL); - if (status && !gpg_output.len) - strbuf_addstr(&gpg_output, "No signature\n"); - - show_sig_lines(opt, status, gpg_output.buf); + status = check_signature(payload.buf, payload.len, signature.buf, + signature.len, &sigc); + if (status && !sigc.gpg_output) + show_sig_lines(opt, status, "No signature\n"); + else + show_sig_lines(opt, status, sigc.gpg_output); + signature_check_clear(&sigc); out: - strbuf_release(&gpg_output); strbuf_release(&payload); strbuf_release(&signature); } @@ -496,10 +546,12 @@ static int show_one_mergetag(struct commit *commit, struct object_id oid; struct tag *tag; struct strbuf verify_message; + struct signature_check sigc = { 0 }; int status, nth; - size_t payload_size, gpg_message_offset; + size_t payload_size; - hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &oid); + hash_object_file(the_hash_algo, extra->value, extra->len, + type_name(OBJ_TAG), &oid); tag = lookup_tag(the_repository, &oid); if (!tag) return -1; /* error message already given */ @@ -514,23 +566,23 @@ 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, tag->tagged->oid.hash); + tag->tag, oid_to_hex(&tag->tagged->oid)); else strbuf_addf(&verify_message, "parent #%d, tagged '%s'\n", nth + 1, tag->tag); - gpg_message_offset = verify_message.len; payload_size = parse_signature(extra->value, extra->len); status = -1; if (extra->len > payload_size) { /* could have a good signature */ - if (!verify_signed_buffer(extra->value, payload_size, - extra->value + payload_size, - extra->len - payload_size, - &verify_message, NULL)) - status = 0; /* good */ - else if (verify_message.len <= gpg_message_offset) + status = check_signature(extra->value, payload_size, + extra->value + payload_size, + extra->len - payload_size, &sigc); + if (sigc.gpg_output) + strbuf_addstr(&verify_message, sigc.gpg_output); + else strbuf_addstr(&verify_message, "No signature\n"); + signature_check_clear(&sigc); /* otherwise we couldn't verify, which is shown as bad */ } @@ -677,9 +729,7 @@ 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 = notebuf.len - ? strbuf_detach(¬ebuf, NULL) - : xcalloc(1, 1); + ctx.notes_message = strbuf_detach(¬ebuf, NULL); } /* @@ -693,6 +743,7 @@ void show_log(struct rev_info *opt) ctx.abbrev = opt->diffopt.abbrev; ctx.after_subject = extra_headers; ctx.preserve_subject = opt->preserve_subject; + ctx.encode_email_headers = opt->encode_email_headers; ctx.reflog_info = opt->reflog_info; ctx.fmt = opt->commit_format; ctx.mailmap = opt->mailmap; @@ -748,7 +799,8 @@ void show_log(struct rev_info *opt) next_commentary_block(opt, NULL); fprintf_ln(opt->diffopt.file, "%s", opt->idiff_title); - show_interdiff(opt, 2); + show_interdiff(opt->idiff_oid1, opt->idiff_oid2, 2, + &opt->diffopt); memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff)); } @@ -771,7 +823,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); + opt->creation_factor, 1, &opts, NULL); memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff)); } @@ -833,7 +885,7 @@ int log_tree_diff_flush(struct rev_info *opt) static int do_diff_combined(struct rev_info *opt, struct commit *commit) { - diff_tree_combined_merge(commit, opt->dense_combined_merges, opt); + diff_tree_combined_merge(commit, opt); return !opt->loginfo; } @@ -865,26 +917,15 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log } /* More than one parent? */ - if (parents && parents->next) { + if (parents->next) { if (opt->ignore_merges) return 0; else if (opt->combine_merges) return do_diff_combined(opt, commit); - else if (opt->first_parent_only) { - /* - * Generate merge log entry only for the first - * parent, showing summary diff of the others - * we merged _in_. - */ - parse_commit_or_die(parents->item); - diff_tree_oid(get_commit_tree_oid(parents->item), - oid, "", &opt->diffopt); - log_tree_diff_flush(opt); - return !opt->loginfo; + else if (!opt->first_parent_only) { + /* If we show multiple diffs, show the parent info */ + log->parent = parents->item; } - - /* If we show individual diffs, show the parent info */ - log->parent = parents->item; } showed_log = 0; @@ -900,7 +941,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log /* Set up the log info for the next parent, if any.. */ parents = parents->next; - if (!parents) + if (!parents || opt->first_parent_only) break; log->parent = parents->item; opt->loginfo = log; diff --git a/third_party/git/log-tree.h b/third_party/git/log-tree.h index e668628074..8fa79289ec 100644 --- a/third_party/git/log-tree.h +++ b/third_party/git/log-tree.h @@ -8,7 +8,9 @@ struct log_info { }; struct decoration_filter { - struct string_list *include_ref_pattern, *exclude_ref_pattern; + struct string_list *include_ref_pattern; + struct string_list *exclude_ref_pattern; + struct string_list *exclude_ref_config_pattern; }; int parse_decorate_color_config(const char *var, const char *slot_name, const char *value); diff --git a/third_party/git/ls-refs.c b/third_party/git/ls-refs.c index 818aef70a0..a1e0b473e4 100644 --- a/third_party/git/ls-refs.c +++ b/third_party/git/ls-refs.c @@ -2,7 +2,7 @@ #include "repository.h" #include "refs.h" #include "remote.h" -#include "argv-array.h" +#include "strvec.h" #include "ls-refs.h" #include "pkt-line.h" #include "config.h" @@ -11,15 +11,15 @@ * Check if one of the prefixes is a prefix of the ref. * If no prefixes were provided, all refs match. */ -static int ref_match(const struct argv_array *prefixes, const char *refname) +static int ref_match(const struct strvec *prefixes, const char *refname) { int i; - if (!prefixes->argc) + if (!prefixes->nr) return 1; /* no restriction */ - for (i = 0; i < prefixes->argc; i++) { - const char *prefix = prefixes->argv[i]; + for (i = 0; i < prefixes->nr; i++) { + const char *prefix = prefixes->v[i]; if (starts_with(refname, prefix)) return 1; @@ -31,7 +31,7 @@ static int ref_match(const struct argv_array *prefixes, const char *refname) struct ls_refs_data { unsigned peel; unsigned symrefs; - struct argv_array prefixes; + struct strvec prefixes; }; static int send_ref(const char *refname, const struct object_id *oid, @@ -84,7 +84,7 @@ static int ls_refs_config(const char *var, const char *value, void *data) return parse_hide_refs_config(var, value, "uploadpack"); } -int ls_refs(struct repository *r, struct argv_array *keys, +int ls_refs(struct repository *r, struct strvec *keys, struct packet_reader *request) { struct ls_refs_data data; @@ -93,7 +93,7 @@ int ls_refs(struct repository *r, struct argv_array *keys, git_config(ls_refs_config, NULL); - while (packet_reader_read(request) != PACKET_READ_FLUSH) { + while (packet_reader_read(request) == PACKET_READ_NORMAL) { const char *arg = request->line; const char *out; @@ -102,12 +102,15 @@ int ls_refs(struct repository *r, struct argv_array *keys, else if (!strcmp("symrefs", arg)) data.symrefs = 1; else if (skip_prefix(arg, "ref-prefix ", &out)) - argv_array_push(&data.prefixes, out); + strvec_push(&data.prefixes, out); } + if (request->status != PACKET_READ_FLUSH) + die(_("expected flush after ls-refs arguments")); + head_ref_namespaced(send_ref, &data); for_each_namespaced_ref(send_ref, &data); packet_flush(1); - argv_array_clear(&data.prefixes); + strvec_clear(&data.prefixes); return 0; } diff --git a/third_party/git/ls-refs.h b/third_party/git/ls-refs.h index 7e5646f5f6..7b33a7c6b8 100644 --- a/third_party/git/ls-refs.h +++ b/third_party/git/ls-refs.h @@ -2,9 +2,9 @@ #define LS_REFS_H struct repository; -struct argv_array; +struct strvec; struct packet_reader; -int ls_refs(struct repository *r, struct argv_array *keys, +int ls_refs(struct repository *r, struct strvec *keys, struct packet_reader *request); #endif /* LS_REFS_H */ diff --git a/third_party/git/mailinfo.c b/third_party/git/mailinfo.c index b395adbdf2..5681d9130d 100644 --- a/third_party/git/mailinfo.c +++ b/third_party/git/mailinfo.c @@ -19,8 +19,7 @@ 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 || strchr(name->buf, '@') || - strchr(name->buf, '<') || strchr(name->buf, '>')) + if (name->len < 3 || 60 < name->len || strpbrk(name->buf, "@<>")) src = email; else if (name == out) return; @@ -254,7 +253,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_insert(boundary, 0, "--", 2); + strbuf_insertstr(boundary, 0, "--"); if (++mi->content_top >= &mi->content[MAX_BOUNDARIES]) { error("Too many boundaries to handle"); mi->input_error = -1; @@ -346,11 +345,17 @@ static const char *header[MAX_HDR_PARSED] = { "From","Subject","Date", }; -static inline int cmp_header(const struct strbuf *line, const char *hdr) +static inline int skip_header(const struct strbuf *line, const char *hdr, + const char **outval) { - int len = strlen(hdr); - return !strncasecmp(line->buf, hdr, len) && line->len > len && - line->buf[len] == ':' && isspace(line->buf[len + 1]); + const char *val; + if (!skip_iprefix(line->buf, hdr, &val) || + *val++ != ':') + return 0; + while (isspace(*val)) + val++; + *outval = val; + return 1; } static int is_format_patch_separator(const char *line, int len) @@ -442,19 +447,21 @@ static int convert_to_utf8(struct mailinfo *mi, struct strbuf *line, const char *charset) { char *out; + size_t out_len; if (!mi->metainfo_charset || !charset || !*charset) return 0; if (same_encoding(mi->metainfo_charset, charset)) return 0; - out = reencode_string(line->buf, mi->metainfo_charset, charset); + out = reencode_string_len(line->buf, line->len, + mi->metainfo_charset, charset, &out_len); if (!out) { mi->input_error = -1; return error("cannot convert from %s to %s", charset, mi->metainfo_charset); } - strbuf_attach(line, out, strlen(out), strlen(out)); + strbuf_attach(line, out, out_len, out_len); return 0; } @@ -543,22 +550,36 @@ 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, len; + int i, ret = 0; struct strbuf sb = STRBUF_INIT; /* search for the interesting parts */ for (i = 0; header[i]; i++) { - 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); + if ((!hdr_data[i] || overwrite) && + parse_header(line, header[i], mi, &sb)) { handle_header(&hdr_data[i], &sb); ret = 1; goto check_header_out; @@ -566,27 +587,17 @@ static int check_header(struct mailinfo *mi, } /* Content stuff */ - 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); + if (parse_header(line, "Content-Type", mi, &sb)) { handle_content_type(mi, &sb); ret = 1; goto check_header_out; } - 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); + if (parse_header(line, "Content-Transfer-Encoding", mi, &sb)) { handle_content_transfer_encoding(mi, &sb); ret = 1; goto check_header_out; } - if (cmp_header(line, "Message-Id")) { - len = strlen("Message-Id: "); - strbuf_add(&sb, line->buf + len, line->len - len); - decode_header(mi, &sb); + if (parse_header(line, "Message-Id", mi, &sb)) { if (mi->add_message_id) mi->message_id = strbuf_detach(&sb, NULL); ret = 1; @@ -607,8 +618,9 @@ 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] && cmp_header(line, header[i])) + if (!mi->s_hdr_data[i] && skip_header(line, header[i], &val)) return 1; return 0; } @@ -1126,6 +1138,11 @@ static void handle_info(struct mailinfo *mi) else continue; + if (memchr(hdr->buf, '\0', hdr->len)) { + error("a NUL byte in '%s' is not allowed.", header[i]); + mi->input_error = -1; + } + if (!strcmp(header[i], "Subject")) { if (!mi->keep_subject) { cleanup_subject(mi, hdr); diff --git a/third_party/git/mem-pool.c b/third_party/git/mem-pool.c index a2841a4a9a..8401761dda 100644 --- a/third_party/git/mem-pool.c +++ b/third_party/git/mem-pool.c @@ -12,11 +12,13 @@ * `insert_after`. If `insert_after` is NULL, then insert block at the * head of the linked list. */ -static struct mp_block *mem_pool_alloc_block(struct mem_pool *mem_pool, size_t block_alloc, struct mp_block *insert_after) +static struct mp_block *mem_pool_alloc_block(struct mem_pool *pool, + size_t block_alloc, + struct mp_block *insert_after) { struct mp_block *p; - mem_pool->pool_alloc += sizeof(struct mp_block) + block_alloc; + pool->pool_alloc += sizeof(struct mp_block) + block_alloc; p = xmalloc(st_add(sizeof(struct mp_block), block_alloc)); p->next_free = (char *)p->space; @@ -26,35 +28,27 @@ static struct mp_block *mem_pool_alloc_block(struct mem_pool *mem_pool, size_t b p->next_block = insert_after->next_block; insert_after->next_block = p; } else { - p->next_block = mem_pool->mp_block; - mem_pool->mp_block = p; + p->next_block = pool->mp_block; + pool->mp_block = p; } return p; } -void mem_pool_init(struct mem_pool **mem_pool, size_t initial_size) +void mem_pool_init(struct mem_pool *pool, size_t initial_size) { - struct mem_pool *pool; - - if (*mem_pool) - return; - - pool = xcalloc(1, sizeof(*pool)); - + memset(pool, 0, sizeof(*pool)); pool->block_alloc = BLOCK_GROWTH_SIZE; if (initial_size > 0) mem_pool_alloc_block(pool, initial_size, NULL); - - *mem_pool = pool; } -void mem_pool_discard(struct mem_pool *mem_pool, int invalidate_memory) +void mem_pool_discard(struct mem_pool *pool, int invalidate_memory) { struct mp_block *block, *block_to_free; - block = mem_pool->mp_block; + block = pool->mp_block; while (block) { block_to_free = block; @@ -66,10 +60,11 @@ void mem_pool_discard(struct mem_pool *mem_pool, int invalidate_memory) free(block_to_free); } - free(mem_pool); + pool->mp_block = NULL; + pool->pool_alloc = 0; } -void *mem_pool_alloc(struct mem_pool *mem_pool, size_t len) +void *mem_pool_alloc(struct mem_pool *pool, size_t len) { struct mp_block *p = NULL; void *r; @@ -78,15 +73,15 @@ void *mem_pool_alloc(struct mem_pool *mem_pool, size_t len) if (len & (sizeof(uintmax_t) - 1)) len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1)); - if (mem_pool->mp_block && - mem_pool->mp_block->end - mem_pool->mp_block->next_free >= len) - p = mem_pool->mp_block; + if (pool->mp_block && + pool->mp_block->end - pool->mp_block->next_free >= len) + p = pool->mp_block; if (!p) { - if (len >= (mem_pool->block_alloc / 2)) - return mem_pool_alloc_block(mem_pool, len, mem_pool->mp_block); + if (len >= (pool->block_alloc / 2)) + return mem_pool_alloc_block(pool, len, pool->mp_block); - p = mem_pool_alloc_block(mem_pool, mem_pool->block_alloc, NULL); + p = mem_pool_alloc_block(pool, pool->block_alloc, NULL); } r = p->next_free; @@ -94,20 +89,38 @@ void *mem_pool_alloc(struct mem_pool *mem_pool, size_t len) return r; } -void *mem_pool_calloc(struct mem_pool *mem_pool, size_t count, size_t size) +void *mem_pool_calloc(struct mem_pool *pool, size_t count, size_t size) { size_t len = st_mult(count, size); - void *r = mem_pool_alloc(mem_pool, len); + void *r = mem_pool_alloc(pool, len); memset(r, 0, len); return r; } -int mem_pool_contains(struct mem_pool *mem_pool, void *mem) +char *mem_pool_strdup(struct mem_pool *pool, const char *str) +{ + size_t len = strlen(str) + 1; + char *ret = mem_pool_alloc(pool, len); + + return memcpy(ret, str, len); +} + +char *mem_pool_strndup(struct mem_pool *pool, const char *str, size_t len) +{ + char *p = memchr(str, '\0', len); + size_t actual_len = (p ? p - str : len); + char *ret = mem_pool_alloc(pool, actual_len+1); + + ret[actual_len] = '\0'; + return memcpy(ret, str, actual_len); +} + +int mem_pool_contains(struct mem_pool *pool, void *mem) { struct mp_block *p; /* Check if memory is allocated in a block */ - for (p = mem_pool->mp_block; p; p = p->next_block) + for (p = pool->mp_block; p; p = p->next_block) if ((mem >= ((void *)p->space)) && (mem < ((void *)p->end))) return 1; diff --git a/third_party/git/mem-pool.h b/third_party/git/mem-pool.h index 999d3c3a52..fe7507f022 100644 --- a/third_party/git/mem-pool.h +++ b/third_party/git/mem-pool.h @@ -24,12 +24,12 @@ struct mem_pool { /* * Initialize mem_pool with specified initial size. */ -void mem_pool_init(struct mem_pool **mem_pool, size_t initial_size); +void mem_pool_init(struct mem_pool *pool, size_t initial_size); /* - * Discard a memory pool and free all the memory it is responsible for. + * Discard all the memory the memory pool is responsible for. */ -void mem_pool_discard(struct mem_pool *mem_pool, int invalidate_memory); +void mem_pool_discard(struct mem_pool *pool, int invalidate_memory); /* * Alloc memory from the mem_pool. @@ -42,6 +42,12 @@ void *mem_pool_alloc(struct mem_pool *pool, size_t len); void *mem_pool_calloc(struct mem_pool *pool, size_t count, size_t size); /* + * Allocate memory from the memory pool and copy str into it. + */ +char *mem_pool_strdup(struct mem_pool *pool, const char *str); +char *mem_pool_strndup(struct mem_pool *pool, const char *str, size_t len); + +/* * Move the memory associated with the 'src' pool to the 'dst' pool. The 'src' * pool will be empty and not contain any memory. It still needs to be free'd * with a call to `mem_pool_discard`. @@ -52,6 +58,6 @@ void mem_pool_combine(struct mem_pool *dst, struct mem_pool *src); * Check if a memory pointed at by 'mem' is part of the range of * memory managed by the specified mem_pool. */ -int mem_pool_contains(struct mem_pool *mem_pool, void *mem); +int mem_pool_contains(struct mem_pool *pool, void *mem); #endif diff --git a/third_party/git/merge-recursive.c b/third_party/git/merge-recursive.c index 6b812d67e3..d0214335a7 100644 --- a/third_party/git/merge-recursive.c +++ b/third_party/git/merge-recursive.c @@ -4,30 +4,40 @@ * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 */ #include "cache.h" -#include "config.h" +#include "merge-recursive.h" + #include "advice.h" -#include "lockfile.h" -#include "cache-tree.h" -#include "object-store.h" -#include "repository.h" -#include "commit.h" +#include "alloc.h" +#include "attr.h" #include "blob.h" #include "builtin.h" -#include "tree-walk.h" +#include "cache-tree.h" +#include "commit.h" +#include "commit-reach.h" +#include "config.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 "alloc.h" +#include "tree-walk.h" #include "unpack-trees.h" -#include "string-list.h" #include "xdiff-interface.h" -#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 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; +}; struct path_hashmap_entry { struct hashmap_entry e; @@ -35,14 +45,16 @@ struct path_hashmap_entry { }; static int path_hashmap_cmp(const void *cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *keydata) { - const struct path_hashmap_entry *a = entry; - const struct path_hashmap_entry *b = entry_or_key; + const struct path_hashmap_entry *a, *b; 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 @@ -54,6 +66,24 @@ 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) { @@ -61,18 +91,20 @@ static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap, if (dir == NULL) return NULL; - hashmap_entry_init(&key, strhash(dir)); + hashmap_entry_init(&key.ent, strhash(dir)); key.dir = dir; - return hashmap_get(hashmap, &key, NULL); + return hashmap_get_entry(hashmap, &key, ent, NULL); } static int dir_rename_cmp(const void *unused_cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *unused_keydata) { - const struct dir_rename_entry *e1 = entry; - const struct dir_rename_entry *e2 = entry_or_key; + 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); return strcmp(e1->dir, e2->dir); } @@ -85,34 +117,46 @@ 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, strhash(directory)); + hashmap_entry_init(&entry->ent, 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, strhash(target_file)); + hashmap_entry_init(&key.ent, strhash(target_file)); key.target_file = target_file; - return hashmap_get(hashmap, &key, NULL); + return hashmap_get_entry(hashmap, &key, ent, NULL); } -static int collision_cmp(void *unused_cmp_data, - const struct collision_entry *e1, - const struct collision_entry *e2, +static int collision_cmp(const void *unused_cmp_data, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, 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, (hashmap_cmp_fn) collision_cmp, NULL, 0); + hashmap_init(map, collision_cmp, NULL, 0); } static void flush_output(struct merge_options *opt) @@ -180,17 +224,6 @@ 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, @@ -284,7 +317,8 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type, static int show(struct merge_options *opt, int v) { - return (!opt->call_depth && opt->verbosity >= v) || opt->verbosity >= 5; + return (!opt->priv->call_depth && opt->verbosity >= v) || + opt->verbosity >= 5; } __attribute__((format (printf, 3, 4))) @@ -295,7 +329,7 @@ static void output(struct merge_options *opt, int v, const char *fmt, ...) if (!show(opt, v)) return; - strbuf_addchars(&opt->obuf, ' ', opt->call_depth * 2); + strbuf_addchars(&opt->obuf, ' ', opt->priv->call_depth * 2); va_start(ap, fmt); strbuf_vaddf(&opt->obuf, fmt, ap); @@ -310,7 +344,7 @@ static void output_commit_title(struct merge_options *opt, struct commit *commit { struct merge_remote_desc *desc; - strbuf_addchars(&opt->obuf, ' ', opt->call_depth * 2); + strbuf_addchars(&opt->obuf, ' ', opt->priv->call_depth * 2); desc = merge_remote_util(commit); if (desc) strbuf_addf(&opt->obuf, "virtual %s\n", desc->name); @@ -358,6 +392,11 @@ 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); @@ -373,74 +412,43 @@ static int unpack_trees_start(struct merge_options *opt, struct tree_desc t[3]; struct index_state tmp_index = { NULL }; - memset(&opt->unpack_opts, 0, sizeof(opt->unpack_opts)); - if (opt->call_depth) - opt->unpack_opts.index_only = 1; + memset(&opt->priv->unpack_opts, 0, sizeof(opt->priv->unpack_opts)); + if (opt->priv->call_depth) + opt->priv->unpack_opts.index_only = 1; else - 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"); + 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"); 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->unpack_opts); + rc = unpack_trees(3, t, &opt->priv->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->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->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.) */ - opt->orig_index = *opt->repo->index; + opt->priv->orig_index = *opt->repo->index; *opt->repo->index = tmp_index; - opt->unpack_opts.src_index = &opt->orig_index; + opt->priv->unpack_opts.src_index = &opt->priv->orig_index; return rc; } static void unpack_trees_finish(struct merge_options *opt) { - 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; + discard_index(&opt->priv->orig_index); + clear_unpack_trees_porcelain(&opt->priv->unpack_opts); } static int save_files_dirs(const struct object_id *oid, @@ -454,8 +462,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, path_hash(entry->path)); - hashmap_add(&opt->current_file_dir_set, entry); + hashmap_entry_init(&entry->e, path_hash(entry->path)); + hashmap_add(&opt->priv->current_file_dir_set, &entry->e); strbuf_setlen(base, baselen); return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0); @@ -586,7 +594,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->call_depth) + if (opt->priv->call_depth) return; /* Ensure D/F conflicts are adjacent in the entries list. */ @@ -598,7 +606,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->df_conflict_file_set, 1); + string_list_clear(&opt->priv->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); @@ -614,7 +622,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->df_conflict_file_set, last_file); + string_list_insert(&opt->priv->df_conflict_file_set, last_file); } /* @@ -681,8 +689,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->call_depth || clean; - int update_working_directory = !opt->call_depth && !no_wd; + int update_cache = opt->priv->call_depth || clean; + int update_working_directory = !opt->priv->call_depth && !no_wd; if (update_cache) { if (remove_file_from_index(opt->repo->index, path)) @@ -712,7 +720,9 @@ 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; @@ -723,16 +733,16 @@ static char *unique_path(struct merge_options *opt, const char *path, const char add_flattened_path(&newpath, branch); base_len = newpath.len; - while (hashmap_get_from_hash(&opt->current_file_dir_set, + while (hashmap_get_from_hash(&opt->priv->current_file_dir_set, path_hash(newpath.buf), newpath.buf) || - (!opt->call_depth && file_exists(newpath.buf))) { + (!opt->priv->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, path_hash(entry->path)); - hashmap_add(&opt->current_file_dir_set, entry); + hashmap_entry_init(&entry->e, path_hash(entry->path)); + hashmap_add(&opt->priv->current_file_dir_set, &entry->e); return strbuf_detach(&newpath, NULL); } @@ -764,7 +774,8 @@ 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)); + !(empty_ok && is_empty_dir(path)) && + !has_symlink_leading_path(path, strlen(path)); } /* @@ -774,7 +785,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->orig_index, path, strlen(path)); + int pos = index_name_pos(&opt->priv->orig_index, path, strlen(path)); struct cache_entry *ce; if (0 > pos) @@ -782,8 +793,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->orig_index.cache[pos]; - return (oid_eq(&ce->oid, &blob->oid) && ce->ce_mode == blob->mode); + ce = opt->priv->orig_index.cache[pos]; + return (oideq(&ce->oid, &blob->oid) && ce->ce_mode == blob->mode); } /* @@ -791,7 +802,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->orig_index, path, strlen(path)); + int pos = index_name_pos(&opt->priv->orig_index, path, strlen(path)); if (0 <= pos) /* we were tracking this path before the merge */ @@ -848,12 +859,12 @@ static int was_dirty(struct merge_options *opt, const char *path) struct cache_entry *ce; int dirty = 1; - if (opt->call_depth || !was_tracked(opt, path)) + if (opt->priv->call_depth || !was_tracked(opt, path)) return !dirty; - ce = index_file_exists(opt->unpack_opts.src_index, + ce = index_file_exists(opt->priv->unpack_opts.src_index, path, strlen(path), ignore_case); - dirty = verify_uptodate(ce, &opt->unpack_opts) != 0; + dirty = verify_uptodate(ce, &opt->priv->unpack_opts) != 0; return dirty; } @@ -863,8 +874,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->df_conflict_file_set.nr; i++) { - const char *df_path = opt->df_conflict_file_set.items[i].string; + 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; size_t pathlen = strlen(path); size_t df_pathlen = strlen(df_path); if (df_pathlen < pathlen && @@ -874,7 +885,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->df_conflict_file_set, + unsorted_string_list_delete_item(&opt->priv->df_conflict_file_set, i, 0); break; } @@ -915,7 +926,7 @@ static int update_file_flags(struct merge_options *opt, { int ret = 0; - if (opt->call_depth) + if (opt->priv->call_depth) update_wd = 0; if (update_wd) { @@ -934,9 +945,11 @@ static int update_file_flags(struct merge_options *opt, } buf = read_object_file(&contents->oid, &type, &size); - if (!buf) - return err(opt, _("cannot read object %s '%s'"), - oid_to_hex(&contents->oid), path); + if (!buf) { + ret = err(opt, _("cannot read object %s '%s'"), + oid_to_hex(&contents->oid), path); + goto free_buf; + } if (type != OBJ_BLOB) { ret = err(opt, _("blob expected for %s '%s'"), oid_to_hex(&contents->oid), path); @@ -944,7 +957,8 @@ 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, NULL)) { free(buf); size = strbuf.len; buf = strbuf_detach(&strbuf, NULL); @@ -984,10 +998,13 @@ static int update_file_flags(struct merge_options *opt, free(buf); } update_index: - if (!ret && update_cache) - if (add_cacheinfo(opt, contents, path, 0, update_wd, + if (!ret && update_cache) { + int refresh = (!opt->priv->call_depth && + contents->mode != S_IFGITLINK); + if (add_cacheinfo(opt, contents, path, 0, refresh, ADD_CACHE_OK_TO_ADD)) return -1; + } return ret; } @@ -997,7 +1014,7 @@ static int update_file(struct merge_options *opt, const char *path) { return update_file_flags(opt, contents, path, - opt->call_depth || clean, !opt->call_depth); + opt->priv->call_depth || clean, !opt->priv->call_depth); } /* Low level file merging, update and removal */ @@ -1019,22 +1036,22 @@ static int merge_3way(struct merge_options *opt, { mmfile_t orig, src1, src2; struct ll_merge_options ll_opts = {0}; - char *base_name, *name1, *name2; + char *base, *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->call_depth) { + if (opt->priv->call_depth) { ll_opts.virtual_ancestor = 1; ll_opts.variant = 0; } else { switch (opt->recursive_variant) { - case MERGE_RECURSIVE_OURS: + case MERGE_VARIANT_OURS: ll_opts.variant = XDL_MERGE_FAVOR_OURS; break; - case MERGE_RECURSIVE_THEIRS: + case MERGE_VARIANT_THEIRS: ll_opts.variant = XDL_MERGE_FAVOR_THEIRS; break; default: @@ -1043,16 +1060,13 @@ static int merge_3way(struct merge_options *opt, } } - 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); + 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); name1 = mkpathdup("%s:%s", branch1, a->path); name2 = mkpathdup("%s:%s", branch2, b->path); } else { - base_name = opt->ancestor == NULL ? NULL : - mkpathdup("%s", opt->ancestor); + base = mkpathdup("%s", opt->ancestor); name1 = mkpathdup("%s", branch1); name2 = mkpathdup("%s", branch2); } @@ -1061,11 +1075,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_name, + merge_status = ll_merge(result_buf, a->path, &orig, base, &src1, name1, &src2, name2, opt->repo->index, &ll_opts); - free(base_name); + free(base); free(name1); free(name2); free(orig.ptr); @@ -1160,7 +1174,7 @@ static int merge_submodule(struct merge_options *opt, struct object_array merges; int i; - int search = !opt->call_depth; + int search = !opt->priv->call_depth; /* store a in result in case we fail */ oidcpy(result, a); @@ -1295,7 +1309,7 @@ static int merge_mode_and_contents(struct merge_options *opt, oidcpy(&result->blob.oid, &b->oid); } } else { - if (!oid_eq(&a->oid, &o->oid) && !oid_eq(&b->oid, &o->oid)) + if (!oideq(&a->oid, &o->oid) && !oideq(&b->oid, &o->oid)) result->merge = 1; /* @@ -1311,9 +1325,9 @@ static int merge_mode_and_contents(struct merge_options *opt, } } - if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &o->oid)) + if (oideq(&a->oid, &b->oid) || oideq(&a->oid, &o->oid)) oidcpy(&result->blob.oid, &b->oid); - else if (oid_eq(&b->oid, &o->oid)) + else if (oideq(&b->oid, &o->oid)) oidcpy(&result->blob.oid, &a->oid); else if (S_ISREG(a->mode)) { mmbuffer_t result_buf; @@ -1344,15 +1358,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_RECURSIVE_NORMAL: + case MERGE_VARIANT_NORMAL: oidcpy(&result->blob.oid, &a->oid); - if (!oid_eq(&a->oid, &b->oid)) + if (!oideq(&a->oid, &b->oid)) result->clean = 0; break; - case MERGE_RECURSIVE_OURS: + case MERGE_VARIANT_OURS: oidcpy(&result->blob.oid, &a->oid); break; - case MERGE_RECURSIVE_THEIRS: + case MERGE_VARIANT_THEIRS: oidcpy(&result->blob.oid, &b->oid); break; } @@ -1378,10 +1392,11 @@ 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 == 1); + int mark_conflicted = (opt->detect_directory_renames == + MERGE_DIRECTORY_RENAMES_CONFLICT); assert(ren->dir_rename_original_dest); - if (!opt->call_depth && would_lose_untracked(opt, dest->path)) { + if (!opt->priv->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; " @@ -1424,12 +1439,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->call_depth, 0) || - (!opt->call_depth && would_lose_untracked(opt, path))) { + if (dir_in_way(opt->repo->index, path, !opt->priv->call_depth, 0) || + (!opt->priv->call_depth && would_lose_untracked(opt, path))) { update_path = alt_path = unique_path(opt, path, change_branch); } - if (opt->call_depth) { + if (opt->priv->call_depth) { /* * We cannot arbitrarily accept either a_sha or b_sha as * correct; since there is no true "middle point" between @@ -1504,14 +1519,14 @@ static int handle_rename_delete(struct merge_options *opt, opt->branch2 : opt->branch1); if (handle_change_delete(opt, - opt->call_depth ? orig->path : dest->path, - opt->call_depth ? NULL : orig->path, + opt->priv->call_depth ? orig->path : dest->path, + opt->priv->call_depth ? NULL : orig->path, orig, dest, rename_branch, delete_branch, _("rename"), _("renamed"))) return -1; - if (opt->call_depth) + if (opt->priv->call_depth) return remove_file_from_index(opt->repo->index, dest->path); else return update_stages(opt, dest->path, NULL, @@ -1545,42 +1560,13 @@ 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->call_depth || would_lose_untracked(opt, prev_path1)); + opt->priv->call_depth || would_lose_untracked(opt, prev_path1)); if (prev_path2) remove_file(opt, 1, prev_path2, - opt->call_depth || would_lose_untracked(opt, prev_path2)); + opt->priv->call_depth || would_lose_untracked(opt, prev_path2)); /* * Remove the collision path, if it wouldn't cause dirty contents @@ -1622,12 +1608,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->call_depth * 2, &mfi)) + branch1, branch2, opt->priv->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->call_depth && + if (!mfi.clean && !opt->priv->call_depth && update_stages(opt, collide_path, NULL, a, b)) return -1; free(alt_path); @@ -1667,7 +1653,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->call_depth * 2, &mfi)) + 1 + opt->priv->call_depth * 2, &mfi)) return -1; free(prev_path_desc); @@ -1685,7 +1671,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->call_depth, 0)) { + if (dir_in_way(opt->repo->index, path, !opt->priv->call_depth, 0)) { new_path = unique_path(opt, path, branch1); output(opt, 1, _("%s is a directory in %s adding " "as %s instead"), @@ -1700,6 +1686,14 @@ 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) { @@ -1716,95 +1710,78 @@ 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->call_depth ? _(" (left unresolved)") : ""); + opt->priv->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->call_depth * 2, &mfi)) + opt->priv->call_depth * 2, &mfi)) return -1; free(path_desc); - 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)) + 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)) + return -1; + } + if (!mfi.clean && mfi.blob.mode == a->mode && + oideq(&mfi.blob.oid, &a->oid)) { /* - * 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. + * Getting here means we were attempting to merge a binary + * blob. Since we can't merge binaries, the merge algorithm + * just takes one side. But we don't want to copy the + * contents of one side to both paths; we'd rather use the + * original content at the given path for each path. */ - 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); + oidcpy(&mfi.blob.oid, &b->oid); + mfi.blob.mode = b->mode; + } + 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; } else { - /* - * 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; - } + 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; } return 0; @@ -1834,19 +1811,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 = ostage1 ^ 1; + ostage2 = flip_stage(ostage1); 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->call_depth * 2, &mfi_c1) || + 1 + opt->priv->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->call_depth * 2, &mfi_c2)) + 1 + opt->priv->call_depth * 2, &mfi_c2)) return -1; free(path_side_1_desc); free(path_side_2_desc); @@ -1880,17 +1857,15 @@ 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->merge_rename_limit >= 0 ? opt->merge_rename_limit : - opt->diff_rename_limit >= 0 ? opt->diff_rename_limit : - 1000; + opts.rename_limit = (opt->rename_limit >= 0) ? opt->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->needed_rename_limit) - opt->needed_rename_limit = opts.needed_rename_limit; + if (opts.needed_rename_limit > opt->priv->needed_rename_limit) + opt->priv->needed_rename_limit = opts.needed_rename_limit; ret = xmalloc(sizeof(*ret)); *ret = diff_queued_diff; @@ -1930,6 +1905,16 @@ 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); @@ -1942,8 +1927,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; @@ -1954,43 +1939,91 @@ 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. - * - * Also, if the basename of the file changed, we don't care. We - * want to know which portion of the directory, if any, changed. + */ + + /* + * 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 == NULL || end_of_new == NULL) + /* + * 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(""); 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 */ + /* - * 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 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 == '/') - end_of_old++; - if (*end_of_old != '/') - end_of_new++; - end_of_old = strchr(end_of_old, '/'); - end_of_new = strchr(end_of_new, '/'); + 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 */ /* - * 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. + * 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. */ - old_len = end_of_old - old_path; - new_len = 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); + 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; } + + /* + * 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/. + */ + end_of_old = strchr(++end_of_old, '/'); + end_of_new = strchr(++end_of_new, '/'); + + /* 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); } static void remove_hashmap_entries(struct hashmap *dir_renames, @@ -2001,7 +2034,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, NULL); + hashmap_remove(dir_renames, &entry->ent, NULL); } string_list_clear(items_to_remove, 0); } @@ -2124,8 +2157,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_iter_init(dir_re_head, &iter); - while ((head_ent = hashmap_iter_next(&iter))) { + hashmap_for_each_entry(dir_re_head, &iter, head_ent, + ent /* member name */) { merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir); if (merge_ent && !head_ent->non_unique_new_dir && @@ -2149,8 +2182,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_iter_init(dir_re_merge, &iter); - while ((merge_ent = hashmap_iter_next(&iter))) { + hashmap_for_each_entry(dir_re_merge, &iter, merge_ent, + ent /* member name */) { 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 */ @@ -2229,7 +2262,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); + hashmap_put(dir_renames, &entry->ent); } else { free(old_dir); } @@ -2254,8 +2287,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_iter_init(dir_renames, &iter); - while ((entry = hashmap_iter_next(&iter))) { + hashmap_for_each_entry(dir_renames, &iter, entry, + ent /* member name */) { int max = 0; int bad_max = 0; char *best = NULL; @@ -2358,8 +2391,9 @@ static void compute_collisions(struct hashmap *collisions, if (!collision_ent) { collision_ent = xcalloc(1, sizeof(struct collision_entry)); - hashmap_entry_init(collision_ent, strhash(new_path)); - hashmap_put(collisions, collision_ent); + hashmap_entry_init(&collision_ent->ent, + strhash(new_path)); + hashmap_put(collisions, &collision_ent->ent); collision_ent->target_file = new_path; } else { free(new_path); @@ -2612,12 +2646,12 @@ static struct string_list *get_renames(struct merge_options *opt, entries); } - hashmap_iter_init(&collisions, &iter); - while ((e = hashmap_iter_next(&iter))) { + hashmap_for_each_entry(&collisions, &iter, e, + ent /* member name */) { free(e->target_file); string_list_clear(&e->source_files, 0); } - hashmap_free(&collisions, 1); + hashmap_free_entries(&collisions, struct collision_entry, ent); return renames; } @@ -2756,15 +2790,15 @@ static int process_renames(struct merge_options *opt, dst_other.mode = ren1->dst_entry->stages[other_stage].mode; try_merge = 0; - if (oid_eq(&src_other.oid, &null_oid) && + if (oideq(&src_other.oid, &null_oid) && ren1->dir_rename_original_type == 'A') { setup_rename_conflict_info(RENAME_VIA_DIR, opt, ren1, NULL); - } else if (oid_eq(&src_other.oid, &null_oid)) { + } else if (oideq(&src_other.oid, &null_oid)) { setup_rename_conflict_info(RENAME_DELETE, opt, ren1, NULL); } else if ((dst_other.mode == ren1->pair->two->mode) && - oid_eq(&dst_other.oid, &ren1->pair->two->oid)) { + oideq(&dst_other.oid, &ren1->pair->two->oid)) { /* * Added file on the other side identical to * the file being renamed: clean merge. @@ -2779,7 +2813,7 @@ static int process_renames(struct merge_options *opt, 1, /* update_cache */ 0 /* update_wd */)) clean_merge = -1; - } else if (!oid_eq(&dst_other.oid, &null_oid)) { + } else if (!oideq(&dst_other.oid, &null_oid)) { /* * Probably not a clean merge, but it's * premature to set clean_merge to 0 here, @@ -2830,13 +2864,13 @@ static void initial_cleanup_rename(struct diff_queue_struct *pairs, struct hashmap_iter iter; struct dir_rename_entry *e; - hashmap_iter_init(dir_renames, &iter); - while ((e = hashmap_iter_next(&iter))) { + hashmap_for_each_entry(dir_renames, &iter, e, + ent /* member name */) { free(e->dir); strbuf_release(&e->new_dir); /* possible_new_dirs already cleared in get_directory_renames */ } - hashmap_free(dir_renames, 1); + hashmap_free_entries(dir_renames, struct dir_rename_entry, ent); free(dir_renames); free(pairs->queue); @@ -2863,8 +2897,9 @@ 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 == 2) || - (opt->detect_directory_renames == 1 && !opt->call_depth)) { + if ((opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_TRUE) || + (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_CONFLICT && + !opt->priv->call_depth)) { dir_re_head = get_directory_renames(head_pairs); dir_re_merge = get_directory_renames(merge_pairs); @@ -2956,7 +2991,7 @@ static int blob_unchanged(struct merge_options *opt, if (a->mode != o->mode) return 0; - if (oid_eq(&o->oid, &a->oid)) + if (oideq(&o->oid, &a->oid)) return 1; if (!renormalize) return 0; @@ -3021,13 +3056,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->call_depth, + if (ci && dir_in_way(opt->repo->index, path, !opt->priv->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->call_depth * 2, mfi)) + opt->priv->call_depth * 2, mfi)) return -1; /* @@ -3043,7 +3078,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->call_depth && !is_dirty), 0)) + 0, (!opt->priv->call_depth && !is_dirty), 0)) return -1; /* * However, add_cacheinfo() will delete the old cache entry @@ -3051,8 +3086,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->orig_index, path, strlen(path)); - ce = opt->orig_index.cache[pos]; + pos = index_name_pos(&opt->priv->orig_index, path, strlen(path)); + ce = opt->priv->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]; @@ -3073,7 +3108,7 @@ static int handle_content_merge(struct merge_file_info *mfi, if (df_conflict_remains || is_dirty) { char *new_path; - if (opt->call_depth) { + if (opt->priv->call_depth) { remove_file_from_index(opt->repo->index, path); } else { if (!mfi->clean) { @@ -3122,7 +3157,8 @@ 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 == 1 && + if (clean && + opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_CONFLICT && ren->dir_rename_original_dest) { if (update_stages(opt, path, NULL, @@ -3167,12 +3203,12 @@ static int warn_about_dir_renamed_entries(struct merge_options *opt, return clean; /* Sanity checks */ - assert(opt->detect_directory_renames > 0); + assert(opt->detect_directory_renames > MERGE_DIRECTORY_RENAMES_NONE); 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 == 2); + clean = (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_TRUE); is_add = (ren->dir_rename_original_type == 'A'); if (ren->dir_rename_original_type == 'A' && clean) { @@ -3331,7 +3367,7 @@ static int process_entry(struct merge_options *opt, conf = _("directory/file"); } if (dir_in_way(opt->repo->index, path, - !opt->call_depth && !S_ISGITLINK(a->mode), + !opt->priv->call_depth && !S_ISGITLINK(a->mode), 0)) { char *new_path = unique_path(opt, path, add_branch); clean_merge = 0; @@ -3340,7 +3376,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->call_depth) + else if (opt->priv->call_depth) remove_file_from_index(opt->repo->index, path); free(new_path); } else { @@ -3380,37 +3416,32 @@ static int process_entry(struct merge_options *opt, return clean_merge; } -int merge_trees(struct merge_options *opt, - struct tree *head, - struct tree *merge, - struct tree *common, - struct tree **result) +static int merge_trees_internal(struct merge_options *opt, + struct tree *head, + struct tree *merge, + struct tree *merge_base, + 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); - common = shift_tree_object(opt->repo, head, common, 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); } - if (oid_eq(&common->object.oid, &merge->object.oid)) { + if (oideq(&merge_base->object.oid, &merge->object.oid)) { output(opt, 0, _("Already up to date!")); *result = head; return 1; } - code = unpack_trees_start(opt, common, head, merge); + code = unpack_trees_start(opt, merge_base, head, merge); if (code != 0) { - if (show(opt, 4) || opt->call_depth) + if (show(opt, 4) || opt->priv->call_depth) err(opt, _("merging of trees %s and %s failed"), oid_to_hex(&head->object.oid), oid_to_hex(&merge->object.oid)); @@ -3429,12 +3460,13 @@ int merge_trees(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->current_file_dir_set, path_hashmap_cmp, NULL, 512); + hashmap_init(&opt->priv->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, common, head, merge, + clean = detect_and_process_renames(opt, merge_base, head, merge, entries, &re_info); record_df_conflict_files(opt, entries); if (clean < 0) @@ -3465,7 +3497,8 @@ int merge_trees(struct merge_options *opt, string_list_clear(entries, 1); free(entries); - hashmap_free(&opt->current_file_dir_set, 1); + hashmap_free_entries(&opt->priv->current_file_dir_set, + struct path_hashmap_entry, e); if (clean < 0) { unpack_trees_finish(opt); @@ -3477,7 +3510,8 @@ int merge_trees(struct merge_options *opt, unpack_trees_finish(opt); - if (opt->call_depth && !(*result = write_tree_from_memory(opt))) + if (opt->priv->call_depth && + !(*result = write_in_core_index_as_tree(opt->repo))) return -1; return clean; @@ -3495,19 +3529,22 @@ 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. + * Merge the commits h1 and h2, returning a flag (int) indicating the + * cleanness of the merge. Also, if opt->priv->call_depth, create a + * virtual commit and write its location to *result. */ -int merge_recursive(struct merge_options *opt, - struct commit *h1, - struct commit *h2, - struct commit_list *ca, - struct commit **result) +static int merge_recursive_internal(struct merge_options *opt, + struct commit *h1, + struct commit *h2, + struct commit_list *merge_bases, + struct commit **result) { struct commit_list *iter; - struct commit *merged_common_ancestors; - struct tree *mrtree; + struct commit *merged_merge_bases; + struct tree *result_tree; int clean; + const char *ancestor_name; + struct strbuf merge_base_abbrev = STRBUF_INIT; if (show(opt, 4)) { output(opt, 4, _("Merging:")); @@ -3515,32 +3552,43 @@ int merge_recursive(struct merge_options *opt, output_commit_title(opt, h2); } - if (!ca) { - ca = get_merge_bases(h1, h2); - ca = reverse_commit_list(ca); + if (!merge_bases) { + merge_bases = get_merge_bases(h1, h2); + merge_bases = reverse_commit_list(merge_bases); } if (show(opt, 5)) { - unsigned cnt = commit_list_count(ca); + unsigned cnt = commit_list_count(merge_bases); output(opt, 5, Q_("found %u common ancestor:", "found %u common ancestors:", cnt), cnt); - for (iter = ca; iter; iter = iter->next) + for (iter = merge_bases; iter; iter = iter->next) output_commit_title(opt, iter->item); } - merged_common_ancestors = pop_commit(&ca); - if (merged_common_ancestors == NULL) { + merged_merge_bases = pop_commit(&merge_bases); + if (merged_merge_bases == 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_common_ancestors = make_virtual_commit(opt->repo, tree, "ancestor"); + 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; } - for (iter = ca; iter; iter = iter->next) { + for (iter = merge_bases; iter; iter = iter->next) { const char *saved_b1, *saved_b2; - opt->call_depth++; + opt->priv->call_depth++; /* * When the merge fails, the result contains files * with conflict markers. The cleanness flag is @@ -3554,45 +3602,134 @@ int merge_recursive(struct merge_options *opt, saved_b2 = opt->branch2; opt->branch1 = "Temporary merge branch 1"; opt->branch2 = "Temporary merge branch 2"; - if (merge_recursive(opt, merged_common_ancestors, iter->item, - NULL, &merged_common_ancestors) < 0) + if (merge_recursive_internal(opt, merged_merge_bases, iter->item, + NULL, &merged_merge_bases) < 0) return -1; opt->branch1 = saved_b1; opt->branch2 = saved_b2; - opt->call_depth--; + opt->priv->call_depth--; - if (!merged_common_ancestors) + if (!merged_merge_bases) return err(opt, _("merge returned no commit")); } discard_index(opt->repo->index); - if (!opt->call_depth) + if (!opt->priv->call_depth) repo_read_index(opt->repo); - opt->ancestor = "merged common ancestors"; - clean = merge_trees(opt, get_commit_tree(h1), get_commit_tree(h2), - get_commit_tree(merged_common_ancestors), - &mrtree); + 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 */ if (clean < 0) { flush_output(opt); return clean; } - if (opt->call_depth) { - *result = make_virtual_commit(opt->repo, mrtree, "merged tree"); + if (opt->priv->call_depth) { + *result = make_virtual_commit(opt->repo, result_tree, + "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->call_depth && opt->buffer_output < 2) + if (!opt->priv->call_depth && opt->buffer_output < 2) strbuf_release(&opt->obuf); if (show(opt, 2)) diff_warn_rename_limit("merge.renamelimit", - opt->needed_rename_limit, 0); + 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); + return clean; } -static struct commit *get_ref(struct repository *repo, const struct object_id *oid, +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, const char *name) { struct object *object; @@ -3613,8 +3750,8 @@ static struct commit *get_ref(struct repository *repo, const struct object_id *o int merge_recursive_generic(struct merge_options *opt, const struct object_id *head, const struct object_id *merge, - int num_base_list, - const struct object_id **base_list, + int num_merge_bases, + const struct object_id **merge_bases, struct commit **result) { int clean; @@ -3623,15 +3760,18 @@ 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 (base_list) { + if (merge_bases) { int i; - for (i = 0; i < num_base_list; ++i) { + for (i = 0; i < num_merge_bases; ++i) { struct commit *base; - if (!(base = get_ref(opt->repo, base_list[i], oid_to_hex(base_list[i])))) + if (!(base = get_ref(opt->repo, merge_bases[i], + oid_to_hex(merge_bases[i])))) return err(opt, _("Could not parse object '%s'"), - oid_to_hex(base_list[i])); + oid_to_hex(merge_bases[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); @@ -3652,23 +3792,29 @@ int merge_recursive_generic(struct merge_options *opt, static void merge_recursive_config(struct merge_options *opt) { char *value = NULL; + int renormalize = 0; git_config_get_int("merge.verbosity", &opt->verbosity); - git_config_get_int("diff.renamelimit", &opt->diff_rename_limit); - git_config_get_int("merge.renamelimit", &opt->merge_rename_limit); + git_config_get_int("diff.renamelimit", &opt->rename_limit); + git_config_get_int("merge.renamelimit", &opt->rename_limit); + git_config_get_bool("merge.renormalize", &renormalize); + opt->renormalize = renormalize; if (!git_config_get_string("diff.renames", &value)) { - opt->diff_detect_rename = git_config_rename("diff.renames", value); + opt->detect_renames = git_config_rename("diff.renames", value); free(value); } if (!git_config_get_string("merge.renames", &value)) { - opt->merge_detect_rename = git_config_rename("merge.renames", value); + opt->detect_renames = 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 ? 2 : 0; + opt->detect_directory_renames = boolval ? + MERGE_DIRECTORY_RENAMES_TRUE : + MERGE_DIRECTORY_RENAMES_NONE; } else if (!strcasecmp(value, "conflict")) { - opt->detect_directory_renames = 1; + opt->detect_directory_renames = + MERGE_DIRECTORY_RENAMES_CONFLICT; } /* avoid erroring on values from future versions of git */ free(value); } @@ -3680,23 +3826,25 @@ 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; - opt->diff_rename_limit = -1; - opt->merge_rename_limit = -1; + strbuf_init(&opt->obuf, 0); + 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) @@ -3706,9 +3854,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_RECURSIVE_OURS; + opt->recursive_variant = MERGE_VARIANT_OURS; else if (!strcmp(s, "theirs")) - opt->recursive_variant = MERGE_RECURSIVE_THEIRS; + opt->recursive_variant = MERGE_VARIANT_THEIRS; else if (!strcmp(s, "subtree")) opt->subtree_shift = ""; else if (skip_prefix(s, "subtree=", &arg)) @@ -3739,16 +3887,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->merge_detect_rename = 0; + opt->detect_renames = 0; else if (!strcmp(s, "find-renames")) { - opt->merge_detect_rename = 1; + opt->detect_renames = 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->merge_detect_rename = 1; + opt->detect_renames = 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 c2b7bb65c6..0795a1d3ec 100644 --- a/third_party/git/merge-recursive.h +++ b/third_party/git/merge-recursive.h @@ -1,104 +1,123 @@ #ifndef MERGE_RECURSIVE_H #define MERGE_RECURSIVE_H -#include "string-list.h" -#include "unpack-trees.h" +#include "strbuf.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_RECURSIVE_NORMAL = 0, - MERGE_RECURSIVE_OURS, - MERGE_RECURSIVE_THEIRS + 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 } recursive_variant; - const char *subtree_shift; + + /* 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 renormalize : 1; - 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; + + /* internal fields used by the implementation */ + struct merge_options_internal *priv; }; +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); + /* - * 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 + * 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. */ -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; -}; - -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; -} +/* + * rename-detecting three-way merge, no recursion. + * + * Outputs: + * - See RETURN VALUES above + * - opt->repo->index has the new index + * - new index NOT written to disk + * - The working tree is updated with results of the merge + */ +int merge_trees(struct merge_options *opt, + struct tree *head, + struct tree *merge, + struct tree *merge_base); -/* merge_trees() but with recursive ancestor consolidation */ -int merge_recursive(struct merge_options *o, +/* + * merge_recursive is like merge_trees() but with recursive ancestor + * consolidation. + * + * 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 + * - *result is treated as scratch space for temporary recursive merges + * - opt->repo->index has the new index + * - new index NOT written to disk + * - The working tree is updated with results of the merge + */ +int merge_recursive(struct merge_options *opt, struct commit *h1, struct commit *h2, - struct commit_list *ancestors, + struct commit_list *merge_bases, 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); - /* - * "git-merge-recursive" can be fed trees; wrap them into - * virtual commits and call merge_recursive() proper. + * 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 + * - *result is treated as scratch space for temporary recursive merges + * - opt->repo->index has the new index + * - new index also written to $GIT_INDEX_FILE on disk + * - The working tree is updated with results of the merge */ -int merge_recursive_generic(struct merge_options *o, +int merge_recursive_generic(struct merge_options *opt, const struct object_id *head, const struct object_id *merge, - int num_ca, - const struct object_id **ca, + int num_merge_bases, + const struct object_id **merge_bases, 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/merge.c b/third_party/git/merge.c index 7c1d756c3f..5fb88af102 100644 --- a/third_party/git/merge.c +++ b/third_party/git/merge.c @@ -19,22 +19,22 @@ int try_merge_command(struct repository *r, const char **xopts, struct commit_list *common, const char *head_arg, struct commit_list *remotes) { - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; int i, ret; struct commit_list *j; - argv_array_pushf(&args, "merge-%s", strategy); + strvec_pushf(&args, "merge-%s", strategy); for (i = 0; i < xopts_nr; i++) - argv_array_pushf(&args, "--%s", xopts[i]); + strvec_pushf(&args, "--%s", xopts[i]); for (j = common; j; j = j->next) - argv_array_push(&args, merge_argument(j->item)); - argv_array_push(&args, "--"); - argv_array_push(&args, head_arg); + strvec_push(&args, merge_argument(j->item)); + strvec_push(&args, "--"); + strvec_push(&args, head_arg); for (j = remotes; j; j = j->next) - argv_array_push(&args, merge_argument(j->item)); + strvec_push(&args, merge_argument(j->item)); - ret = run_command_v_opt(args.argv, RUN_GIT_CMD); - argv_array_clear(&args); + ret = run_command_v_opt(args.v, RUN_GIT_CMD); + strvec_clear(&args); discard_index(r->index); if (repo_read_index(r) < 0) @@ -80,8 +80,8 @@ int checkout_fast_forward(struct repository *r, } memset(&opts, 0, sizeof(opts)); + dir_init(&dir); if (overwrite_ignore) { - memset(&dir, 0, sizeof(dir)); dir.flags |= DIR_SHOW_IGNORED; setup_standard_excludes(&dir); opts.dir = &dir; @@ -94,6 +94,7 @@ int checkout_fast_forward(struct repository *r, opts.verbose_update = 1; opts.merge = 1; opts.fn = twoway_merge; + init_checkout_metadata(&opts.meta, NULL, remote, NULL); setup_unpack_trees_porcelain(&opts, "merge"); if (unpack_trees(nr_trees, t, &opts)) { @@ -101,6 +102,7 @@ int checkout_fast_forward(struct repository *r, clear_unpack_trees_porcelain(&opts); return -1; } + dir_clear(&dir); clear_unpack_trees_porcelain(&opts); if (write_locked_index(r->index, &lock_file, COMMIT_LOCK)) diff --git a/third_party/git/mergetools/bc b/third_party/git/mergetools/bc index 3a69e60faa..a89086ee72 100644 --- a/third_party/git/mergetools/bc +++ b/third_party/git/mergetools/bc @@ -21,3 +21,8 @@ translate_merge_tool_path() { echo bcompare fi } + +list_tool_variants () { + echo bc + echo bc3 +} diff --git a/third_party/git/mergetools/bc3 b/third_party/git/mergetools/bc3 deleted file mode 100644 index 5d8dd48184..0000000000 --- a/third_party/git/mergetools/bc3 +++ /dev/null @@ -1 +0,0 @@ -. "$MERGE_TOOLS_DIR/bc" diff --git a/third_party/git/mergetools/gvimdiff3 b/third_party/git/mergetools/gvimdiff3 deleted file mode 100644 index 04a5bb0ea8..0000000000 --- a/third_party/git/mergetools/gvimdiff3 +++ /dev/null @@ -1 +0,0 @@ -. "$MERGE_TOOLS_DIR/vimdiff" diff --git a/third_party/git/mergetools/meld b/third_party/git/mergetools/meld index 7a08470f88..aab4ebb935 100644 --- a/third_party/git/mergetools/meld +++ b/third_party/git/mergetools/meld @@ -3,34 +3,87 @@ diff_cmd () { } merge_cmd () { - if test -z "${meld_has_output_option:+set}" + check_meld_for_features + + option_auto_merge= + if test "$meld_use_auto_merge_option" = true then - check_meld_for_output_version + option_auto_merge="--auto-merge" fi if test "$meld_has_output_option" = true then - "$merge_tool_path" --output="$MERGED" \ + "$merge_tool_path" $option_auto_merge --output="$MERGED" \ "$LOCAL" "$BASE" "$REMOTE" else - "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" + "$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE" fi } -# Check whether we should use 'meld --output <file>' -check_meld_for_output_version () { - meld_path="$(git config mergetool.meld.path)" - meld_path="${meld_path:-meld}" +# Get meld help message +init_meld_help_msg () { + if test -z "$meld_help_msg" + then + meld_path="$(git config mergetool.meld.path || echo meld)" + meld_help_msg=$("$meld_path" --help 2>&1) + fi +} - if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput) +# Check the features and set flags +check_meld_for_features () { + # Check whether we should use 'meld --output <file>' + if test -z "$meld_has_output_option" then - : use configured value - elif "$meld_path" --help 2>&1 | - grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null + meld_has_output_option=$(git config --bool mergetool.meld.hasOutput) + case "$meld_has_output_option" in + true | false) + : use configured value + ;; + *) + : empty or invalid configured value, detecting "--output" automatically + init_meld_help_msg + + case "$meld_help_msg" in + *"--output="* | *'[OPTION...]'*) + # All version that has [OPTION...] supports --output + meld_has_output_option=true + ;; + *) + meld_has_output_option=false + ;; + esac + ;; + esac + fi + # Check whether we should use 'meld --auto-merge ...' + if test -z "$meld_use_auto_merge_option" then - : old ones mention --output and new ones just say OPTION... - meld_has_output_option=true - else - meld_has_output_option=false + meld_use_auto_merge_option=$( + git config --bool-or-str mergetool.meld.useAutoMerge + ) + case "$meld_use_auto_merge_option" in + true | false) + : use well formatted boolean value + ;; + auto) + # testing the "--auto-merge" option only if config is "auto" + init_meld_help_msg + + case "$meld_help_msg" in + *"--auto-merge"* | *'[OPTION...]'*) + meld_use_auto_merge_option=true + ;; + *) + meld_use_auto_merge_option=false + ;; + esac + ;; + "") + meld_use_auto_merge_option=false + ;; + *) + die "unknown mergetool.meld.useAutoMerge: $meld_use_auto_merge_option" + ;; + esac fi } diff --git a/third_party/git/mergetools/gvimdiff2 b/third_party/git/mergetools/nvimdiff index 04a5bb0ea8..04a5bb0ea8 100644 --- a/third_party/git/mergetools/gvimdiff2 +++ b/third_party/git/mergetools/nvimdiff diff --git a/third_party/git/mergetools/vimdiff b/third_party/git/mergetools/vimdiff index 10d86f3e19..abc8ce4ec4 100644 --- a/third_party/git/mergetools/vimdiff +++ b/third_party/git/mergetools/vimdiff @@ -5,7 +5,7 @@ diff_cmd () { merge_cmd () { case "$1" in - gvimdiff|vimdiff) + *vimdiff) if $base_present then "$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \ @@ -15,11 +15,11 @@ merge_cmd () { "$LOCAL" "$MERGED" "$REMOTE" fi ;; - gvimdiff2|vimdiff2) + *vimdiff2) "$merge_tool_path" -f -d -c 'wincmd l' \ "$LOCAL" "$MERGED" "$REMOTE" ;; - gvimdiff3|vimdiff3) + *vimdiff3) if $base_present then "$merge_tool_path" -f -d -c 'hid | hid | hid' \ @@ -34,10 +34,13 @@ merge_cmd () { translate_merge_tool_path() { case "$1" in - gvimdiff|gvimdiff2|gvimdiff3) + nvimdiff*) + echo nvim + ;; + gvimdiff*) echo gvim ;; - vimdiff|vimdiff2|vimdiff3) + vimdiff*) echo vim ;; esac @@ -46,3 +49,11 @@ translate_merge_tool_path() { exit_code_trustable () { true } + +list_tool_variants () { + for prefix in '' g n; do + for suffix in '' 2 3; do + echo "${prefix}vimdiff${suffix}" + done + done +} diff --git a/third_party/git/mergetools/vimdiff2 b/third_party/git/mergetools/vimdiff2 deleted file mode 100644 index 04a5bb0ea8..0000000000 --- a/third_party/git/mergetools/vimdiff2 +++ /dev/null @@ -1 +0,0 @@ -. "$MERGE_TOOLS_DIR/vimdiff" diff --git a/third_party/git/mergetools/vimdiff3 b/third_party/git/mergetools/vimdiff3 deleted file mode 100644 index 04a5bb0ea8..0000000000 --- a/third_party/git/mergetools/vimdiff3 +++ /dev/null @@ -1 +0,0 @@ -. "$MERGE_TOOLS_DIR/vimdiff" diff --git a/third_party/git/midx.c b/third_party/git/midx.c index d649644420..0de42ffdfb 100644 --- a/third_party/git/midx.c +++ b/third_party/git/midx.c @@ -17,10 +17,8 @@ #define MIDX_BYTE_HASH_VERSION 5 #define MIDX_BYTE_NUM_CHUNKS 6 #define MIDX_BYTE_NUM_PACKS 8 -#define MIDX_HASH_VERSION 1 #define MIDX_HEADER_SIZE 12 -#define MIDX_HASH_LEN 20 -#define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + MIDX_HASH_LEN) +#define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + the_hash_algo->rawsz) #define MIDX_MAX_CHUNKS 5 #define MIDX_CHUNK_ALIGNMENT 4 @@ -37,6 +35,18 @@ #define PACK_EXPIRED UINT_MAX +static uint8_t oid_version(void) +{ + switch (hash_algo_by_ptr(the_hash_algo)) { + case GIT_HASH_SHA1: + return 1; + case GIT_HASH_SHA256: + return 2; + default: + die(_("invalid hash version")); + } +} + static char *get_midx_filename(const char *object_dir) { return xstrfmt("%s/pack/multi-pack-index", object_dir); @@ -73,9 +83,9 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local FREE_AND_NULL(midx_name); midx_map = xmmap(NULL, midx_size, PROT_READ, MAP_PRIVATE, fd, 0); + close(fd); FLEX_ALLOC_STR(m, object_dir, object_dir); - m->fd = fd; m->data = midx_map; m->data_len = midx_size; m->local = local; @@ -91,9 +101,12 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local m->version); 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 = MIDX_HASH_LEN; + if (hash_version != oid_version()) { + error(_("multi-pack-index hash version %u does not match version %u"), + hash_version, oid_version()); + goto cleanup_fail; + } + m->hash_len = the_hash_algo->rawsz; m->num_chunks = m->data[MIDX_BYTE_NUM_CHUNKS]; @@ -191,8 +204,6 @@ void close_midx(struct multi_pack_index *m) return; munmap((unsigned char *)m->data, m->data_len); - close(m->fd); - m->fd = -1; for (i = 0; i < m->num_packs; i++) { if (m->packs[i]) @@ -234,7 +245,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, - MIDX_HASH_LEN, result); + the_hash_algo->rawsz, result); } struct object_id *nth_midxed_object_oid(struct object_id *oid, @@ -405,8 +416,12 @@ int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, i m = load_multi_pack_index(object_dir, local); if (m) { - m->next = r->objects->multi_pack_index; - r->objects->multi_pack_index = m; + struct multi_pack_index *mp = r->objects->multi_pack_index; + if (mp) { + m->next = mp->next; + mp->next = m; + } else + r->objects->multi_pack_index = m; return 1; } @@ -417,14 +432,11 @@ static size_t write_midx_header(struct hashfile *f, unsigned char num_chunks, uint32_t num_packs) { - unsigned char byte_values[4]; - hashwrite_be32(f, MIDX_SIGNATURE); - byte_values[0] = MIDX_VERSION; - byte_values[1] = MIDX_HASH_VERSION; - byte_values[2] = num_chunks; - byte_values[3] = 0; /* unused */ - hashwrite(f, byte_values, sizeof(byte_values)); + hashwrite_u8(f, MIDX_VERSION); + hashwrite_u8(f, oid_version()); + hashwrite_u8(f, num_chunks); + hashwrite_u8(f, 0); /* unused */ hashwrite_be32(f, num_packs); return MIDX_HEADER_SIZE; @@ -449,6 +461,8 @@ 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, @@ -457,6 +471,7 @@ 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; @@ -532,7 +547,7 @@ static void fill_pack_entry(uint32_t pack_int_id, uint32_t cur_object, struct pack_midx_entry *entry) { - if (!nth_packed_object_oid(&entry->oid, p, cur_object)) + if (nth_packed_object_id(&entry->oid, p, cur_object) < 0) die(_("failed to locate object %d in packfile"), cur_object); entry->pack_int_id = pack_int_id; @@ -786,7 +801,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) + struct string_list *packs_to_drop, unsigned flags) { unsigned char cur_chunk, num_chunks = 0; char *midx_name; @@ -800,17 +815,16 @@ 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; int result = 0; midx_name = get_midx_filename(object_dir); - if (safe_create_leading_directories(midx_name)) { - UNLEAK(midx_name); + if (safe_create_leading_directories(midx_name)) die_errno(_("unable to create leading directories of %s"), midx_name); - } if (m) packs.m = m; @@ -834,7 +848,14 @@ 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; @@ -913,6 +934,12 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index * cur_chunk = 0; num_chunks = large_offsets_needed ? 5 : 4; + if (packs.nr - dropped_packs == 0) { + error(_("no pack files to index.")); + result = 1; + goto cleanup; + } + written = write_midx_header(f, num_chunks, packs.nr - dropped_packs); chunk_ids[cur_chunk] = MIDX_CHUNKID_PACKNAMES; @@ -928,7 +955,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 * MIDX_HASH_LEN; + chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * the_hash_algo->rawsz; cur_chunk++; chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * MIDX_CHUNK_OFFSET_WIDTH; @@ -959,6 +986,9 @@ 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, @@ -976,7 +1006,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, MIDX_HASH_LEN, entries, nr_entries); + written += write_midx_oid_lookup(f, the_hash_algo->rawsz, entries, nr_entries); break; case MIDX_CHUNKID_OBJECTOFFSETS: @@ -991,7 +1021,10 @@ 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, @@ -1017,9 +1050,9 @@ cleanup: return result; } -int write_midx_file(const char *object_dir) +int write_midx_file(const char *object_dir, unsigned flags) { - return write_midx_internal(object_dir, NULL, NULL); + return write_midx_internal(object_dir, NULL, NULL, flags); } void clear_midx_file(struct repository *r) @@ -1031,10 +1064,8 @@ void clear_midx_file(struct repository *r) r->objects->multi_pack_index = NULL; } - if (remove_path(midx)) { - UNLEAK(midx); + if (remove_path(midx)) die(_("failed to clear multi-pack-index at %s"), midx); - } free(midx); } @@ -1077,19 +1108,29 @@ 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) +int verify_midx_file(struct repository *r, const char *object_dir, unsigned flags) { struct pair_pos_vs_id *pairs = NULL; uint32_t i; - struct progress *progress; + struct progress *progress = NULL; struct multi_pack_index *m = load_multi_pack_index(object_dir, 1); verify_midx_error = 0; - if (!m) - return 0; + if (!m) { + int result = 0; + struct stat sb; + char *filename = get_midx_filename(object_dir); + if (!stat(filename, &sb)) { + error(_("multi-pack-index file exists, but failed to parse")); + result = 1; + } + free(filename); + return result; + } - progress = start_progress(_("Looking for referenced packfiles"), - m->num_packs); + if (flags & MIDX_PROGRESS) + 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); @@ -1107,8 +1148,18 @@ int verify_midx_file(struct repository *r, const char *object_dir) i, oid_fanout1, oid_fanout2, i + 1); } - progress = start_sparse_progress(_("Verifying OID order in MIDX"), - m->num_objects - 1); + if (m->num_objects == 0) { + midx_report(_("the midx contains no oid")); + /* + * Remaining tests assume that we have objects, so we can + * return here. + */ + return verify_midx_error; + } + + if (flags & MIDX_PROGRESS) + progress = start_sparse_progress(_("Verifying OID order in multi-pack-index"), + m->num_objects - 1); for (i = 0; i < m->num_objects - 1; i++) { struct object_id oid1, oid2; @@ -1135,13 +1186,15 @@ int verify_midx_file(struct repository *r, const char *object_dir) pairs[i].pack_int_id = nth_midxed_pack_int_id(m, i); } - progress = start_sparse_progress(_("Sorting objects by packfile"), - m->num_objects); + if (flags & MIDX_PROGRESS) + 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); - progress = start_sparse_progress(_("Verifying object offsets"), m->num_objects); + if (flags & MIDX_PROGRESS) + 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; @@ -1184,23 +1237,34 @@ int verify_midx_file(struct repository *r, const char *object_dir) return verify_midx_error; } -int expire_midx_packs(struct repository *r, const char *object_dir) +int expire_midx_packs(struct repository *r, const char *object_dir, unsigned flags) { 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; @@ -1218,11 +1282,12 @@ int expire_midx_packs(struct repository *r, const char *object_dir) 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); + result = write_midx_internal(object_dir, m, &packs_to_drop, flags); string_list_clear(&packs_to_drop, 0); return result; @@ -1248,15 +1313,26 @@ static int compare_by_mtime(const void *a_, const void *b_) return 0; } -static int fill_included_packs_all(struct multi_pack_index *m, +static int fill_included_packs_all(struct repository *r, + struct multi_pack_index *m, unsigned char *include_pack) { - uint32_t i; + uint32_t i, count = 0; + int pack_kept_objects = 0; + + repo_config_get_bool(r, "repack.packkeptobjects", &pack_kept_objects); + + for (i = 0; i < m->num_packs; i++) { + if (prepare_midx_pack(r, m, i)) + continue; + if (!pack_kept_objects && m->packs[i]->pack_keep) + continue; - for (i = 0; i < m->num_packs; i++) include_pack[i] = 1; + count++; + } - return m->num_packs < 2; + return count < 2; } static int fill_included_packs_batch(struct repository *r, @@ -1267,6 +1343,9 @@ static int fill_included_packs_batch(struct repository *r, uint32_t i, packs_to_repack; size_t total_size; struct repack_info *pack_info = xcalloc(m->num_packs, sizeof(struct repack_info)); + int pack_kept_objects = 0; + + repo_config_get_bool(r, "repack.packkeptobjects", &pack_kept_objects); for (i = 0; i < m->num_packs; i++) { pack_info[i].pack_int_id = i; @@ -1293,6 +1372,8 @@ static int fill_included_packs_batch(struct repository *r, if (!p) continue; + if (!pack_kept_objects && p->pack_keep) + continue; if (open_pack_index(p) || !p->num_objects) continue; @@ -1310,21 +1391,30 @@ static int fill_included_packs_batch(struct repository *r, free(pack_info); - if (total_size < batch_size || packs_to_repack < 2) + if (packs_to_repack < 2) return 1; return 0; } -int midx_repack(struct repository *r, const char *object_dir, size_t batch_size) +int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, unsigned flags) { int result = 0; uint32_t i; unsigned char *include_pack; struct child_process cmd = CHILD_PROCESS_INIT; + FILE *cmd_in; struct strbuf base_name = STRBUF_INIT; struct multi_pack_index *m = load_multi_pack_index(object_dir, 1); + /* + * When updating the default for these configuration + * variables in builtin/repack.c, these must be adjusted + * to match. + */ + int delta_base_offset = 1; + int use_delta_islands = 0; + if (!m) return 0; @@ -1333,14 +1423,28 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size) if (batch_size) { if (fill_included_packs_batch(r, m, include_pack, batch_size)) goto cleanup; - } else if (fill_included_packs_all(m, include_pack)) + } else if (fill_included_packs_all(r, m, include_pack)) goto cleanup; - argv_array_push(&cmd.args, "pack-objects"); + repo_config_get_bool(r, "repack.usedeltabaseoffset", &delta_base_offset); + repo_config_get_bool(r, "repack.usedeltaislands", &use_delta_islands); + + strvec_push(&cmd.args, "pack-objects"); strbuf_addstr(&base_name, object_dir); strbuf_addstr(&base_name, "/pack/pack"); - argv_array_push(&cmd.args, base_name.buf); + strvec_push(&cmd.args, base_name.buf); + + if (delta_base_offset) + strvec_push(&cmd.args, "--delta-base-offset"); + if (use_delta_islands) + strvec_push(&cmd.args, "--delta-islands"); + + if (flags & MIDX_PROGRESS) + strvec_push(&cmd.args, "--progress"); + else + strvec_push(&cmd.args, "-q"); + strbuf_release(&base_name); cmd.git_cmd = 1; @@ -1352,6 +1456,8 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size) goto cleanup; } + cmd_in = xfdopen(cmd.in, "w"); + for (i = 0; i < m->num_objects; i++) { struct object_id oid; uint32_t pack_int_id = nth_midxed_pack_int_id(m, i); @@ -1360,10 +1466,9 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size) continue; nth_midxed_object_oid(&oid, m, i); - xwrite(cmd.in, oid_to_hex(&oid), the_hash_algo->hexsz); - xwrite(cmd.in, "\n", 1); + fprintf(cmd_in, "%s\n", oid_to_hex(&oid)); } - close(cmd.in); + fclose(cmd_in); if (finish_command(&cmd)) { error(_("could not finish pack-objects")); @@ -1371,7 +1476,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); + result = write_midx_internal(object_dir, m, NULL, flags); m = NULL; cleanup: diff --git a/third_party/git/midx.h b/third_party/git/midx.h index f0ae656b5d..b18cf53bc4 100644 --- a/third_party/git/midx.h +++ b/third_party/git/midx.h @@ -12,8 +12,6 @@ struct repository; struct multi_pack_index { struct multi_pack_index *next; - int fd; - const unsigned char *data; size_t data_len; @@ -37,6 +35,8 @@ 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); @@ -47,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); +int write_midx_file(const char *object_dir, unsigned flags); void clear_midx_file(struct repository *r); -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); +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); 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 695908609f..fb526a3775 100644 --- a/third_party/git/name-hash.c +++ b/third_party/git/name-hash.c @@ -17,14 +17,16 @@ struct dir_entry { }; static int dir_entry_cmp(const void *unused_cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *keydata) { - const struct dir_entry *e1 = entry; - const struct dir_entry *e2 = entry_or_key; + const struct dir_entry *e1, *e2; 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); } @@ -33,9 +35,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, hash); + hashmap_entry_init(&key.ent, hash); key.namelen = namelen; - return hashmap_get(&istate->dir_hash, &key, name); + return hashmap_get_entry(&istate->dir_hash, &key, ent, name); } static struct dir_entry *find_dir_entry(struct index_state *istate, @@ -68,9 +70,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, memihash(ce->name, namelen)); + hashmap_entry_init(&dir->ent, memihash(ce->name, namelen)); dir->namelen = namelen; - hashmap_add(&istate->dir_hash, dir); + hashmap_add(&istate->dir_hash, &dir->ent); /* recursively add missing parent directories */ dir->parent = hash_dir_entry(istate, ce, namelen); @@ -95,7 +97,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, NULL); + hashmap_remove(&istate->dir_hash, &dir->ent, NULL); free(dir); dir = parent; } @@ -106,20 +108,23 @@ 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, memihash(ce->name, ce_namelen(ce))); - hashmap_add(&istate->name_hash, ce); + hashmap_entry_init(&ce->ent, memihash(ce->name, ce_namelen(ce))); + hashmap_add(&istate->name_hash, &ce->ent); if (ignore_case) add_dir_entry(istate, ce); } static int cache_entry_cmp(const void *unused_cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *remove) { - const struct cache_entry *ce1 = entry; - const struct cache_entry *ce2 = entry_or_key; + 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); + /* * For remove_name_hash, find the exact entry (pointer equality); for * index_file_exists, find all entries with matching hash code and @@ -133,7 +138,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 (upto + * thread and use that to decide how many threads to run (up to * the number on the system). * * For guidance setting the lower per-thread bound, see: @@ -213,7 +218,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) by a factor of n. + * decrease the collision rate by (hopefully) a factor of n. */ static void init_dir_mutex(void) { @@ -280,10 +285,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, hash); + hashmap_entry_init(&dir->ent, hash); dir->namelen = prefix->len; dir->parent = parent; - hashmap_add(&istate->dir_hash, dir); + hashmap_add(&istate->dir_hash, &dir->ent); if (parent) { unlock_dir_mutex(lock_nr); @@ -472,8 +477,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, d->lazy_entries[k].hash_name); - hashmap_add(&d->istate->name_hash, ce_k); + hashmap_entry_init(&ce_k->ent, d->lazy_entries[k].hash_name); + hashmap_add(&d->istate->name_hash, &ce_k->ent); } return NULL; @@ -625,7 +630,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, ce); + hashmap_remove(&istate->name_hash, &ce->ent, ce); if (ignore_case) remove_dir_entry(istate, ce); @@ -702,15 +707,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_from_hash(&istate->name_hash, - memihash(name, namelen), NULL); - while (ce) { + 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) { if (same_name(ce, name, namelen, icase)) return ce; - ce = hashmap_get_next(&istate->name_hash, ce); } return NULL; } @@ -721,6 +726,6 @@ void free_name_hash(struct index_state *istate) return; istate->name_hash_initialized = 0; - hashmap_free(&istate->name_hash, 0); - hashmap_free(&istate->dir_hash, 1); + hashmap_free(&istate->name_hash); + hashmap_free_entries(&istate->dir_hash, struct dir_entry, ent); } diff --git a/third_party/git/negotiator/noop.c b/third_party/git/negotiator/noop.c new file mode 100644 index 0000000000..60569b8350 --- /dev/null +++ b/third_party/git/negotiator/noop.c @@ -0,0 +1,44 @@ +#include "cache.h" +#include "noop.h" +#include "../commit.h" +#include "../fetch-negotiator.h" + +static void known_common(struct fetch_negotiator *n, struct commit *c) +{ + /* do nothing */ +} + +static void add_tip(struct fetch_negotiator *n, struct commit *c) +{ + /* do nothing */ +} + +static const struct object_id *next(struct fetch_negotiator *n) +{ + return NULL; +} + +static int ack(struct fetch_negotiator *n, struct commit *c) +{ + /* + * This negotiator does not emit any commits, so there is no commit to + * be acknowledged. If there is any ack, there is a bug. + */ + BUG("ack with noop negotiator, which does not emit any commits"); + return 0; +} + +static void release(struct fetch_negotiator *n) +{ + /* nothing to release */ +} + +void noop_negotiator_init(struct fetch_negotiator *negotiator) +{ + negotiator->known_common = known_common; + negotiator->add_tip = add_tip; + negotiator->next = next; + negotiator->ack = ack; + negotiator->release = release; + negotiator->data = NULL; +} diff --git a/third_party/git/negotiator/noop.h b/third_party/git/negotiator/noop.h new file mode 100644 index 0000000000..2b4ec5d07a --- /dev/null +++ b/third_party/git/negotiator/noop.h @@ -0,0 +1,8 @@ +#ifndef NEGOTIATOR_NOOP_H +#define NEGOTIATOR_NOOP_H + +struct fetch_negotiator; + +void noop_negotiator_init(struct fetch_negotiator *negotiator); + +#endif diff --git a/third_party/git/notes-utils.c b/third_party/git/notes-utils.c index a819410698..4bf4888d8c 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_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */ + strbuf_insertstr(&buf, 0, "notes: "); 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 75c028b300..564baac64d 100644 --- a/third_party/git/notes.c +++ b/third_party/git/notes.c @@ -269,8 +269,10 @@ 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)) + if (oideq(&l->val_oid, &entry->val_oid)) { + free(entry); return 0; + } ret = combine_notes(&l->val_oid, &entry->val_oid); @@ -458,7 +460,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(&l->key_oid), t->ref); + oid_to_hex(&object_oid), t->ref); continue; @@ -574,16 +576,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 = @@ -600,7 +602,7 @@ redo: path, cb_data); } - if (n > fanout * 2 || + if (n >= 2 * fanout || !(flags & FOR_EACH_NOTE_DONT_UNPACK_SUBTREES)) { /* unpack subtree and resume traversal */ tree->a[i] = NULL; @@ -721,13 +723,15 @@ static int write_each_note_helper(struct tree_write_stack *tws, struct write_each_note_data { struct tree_write_stack *root; - struct non_note *next_non_note; + struct non_note **nn_list; + struct non_note *nn_prev; }; static int write_each_non_note_until(const char *note_path, struct write_each_note_data *d) { - struct non_note *n = d->next_non_note; + struct non_note *p = d->nn_prev; + struct non_note *n = p ? p->next : *d->nn_list; int cmp = 0, ret; while (n && (!note_path || (cmp = strcmp(n->path, note_path)) <= 0)) { if (note_path && cmp == 0) @@ -738,9 +742,10 @@ static int write_each_non_note_until(const char *note_path, if (ret) return ret; } + p = n; n = n->next; } - d->next_non_note = n; + d->nn_prev = p; return 0; } @@ -1041,6 +1046,39 @@ 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; @@ -1142,7 +1180,8 @@ 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.next_non_note = t->first_non_note; + cb_data.nn_list = &(t->first_non_note); + cb_data.nn_prev = NULL; /* Write tree objects representing current notes tree */ flags = FOR_EACH_NOTE_DONT_UNPACK_SUBTREES | @@ -1244,10 +1283,8 @@ 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 { - if (starts_with(ref, "refs/")) - ref += 5; - if (starts_with(ref, "notes/")) - ref += 6; + skip_prefix(ref, "refs/", &ref); + skip_prefix(ref, "notes/", &ref); strbuf_addf(sb, "\nNotes (%s):\n", ref); } } @@ -1297,9 +1334,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_insert(sb, 0, "refs/", 5); + strbuf_insertstr(sb, 0, "refs/"); else - strbuf_insert(sb, 0, "refs/notes/", 11); + strbuf_insertstr(sb, 0, "refs/notes/"); } void expand_loose_notes_ref(struct strbuf *sb) diff --git a/third_party/git/notes.h b/third_party/git/notes.h index 76337f2384..c1682c39a9 100644 --- a/third_party/git/notes.h +++ b/third_party/git/notes.h @@ -261,6 +261,26 @@ 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 @@ -272,16 +292,16 @@ struct display_notes_opt { * - extra_notes_refs may contain a list of globs (in the same style * as notes.displayRef) where notes should be loaded from. */ -void init_display_notes(struct display_notes_opt *opt); +void load_display_notes(struct display_notes_opt *opt); /* * Append notes for the given 'object_sha1' from all trees set up by - * init_display_notes() to 'sb'. + * load_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 init_display_notes() before using this function. + * You *must* call load_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 7f7b3cdd80..c4fc9dd74e 100644 --- a/third_party/git/object-store.h +++ b/third_party/git/object-store.h @@ -4,8 +4,9 @@ #include "cache.h" #include "oidmap.h" #include "list.h" -#include "sha1-array.h" +#include "oid-array.h" #include "strbuf.h" +#include "thread-utils.h" struct object_directory { struct object_directory *next; @@ -60,6 +61,7 @@ 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; @@ -68,6 +70,7 @@ struct packed_git { size_t index_size; uint32_t num_objects; uint32_t num_bad_objects; + uint32_t crc_offset; unsigned char *bad_object_sha1; int index_version; time_t mtime; @@ -88,6 +91,20 @@ 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 @@ -110,6 +127,8 @@ 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 */ @@ -132,6 +151,12 @@ 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. @@ -177,8 +202,9 @@ 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 void *buf, unsigned long len, - const char *type, struct object_id *oid); +int hash_object_file(const struct git_hash_algo *algo, 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); @@ -187,6 +213,14 @@ 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); @@ -205,12 +239,33 @@ int read_loose_object(const char *path, unsigned long *size, void **contents); +/* Retry packed storage after checking packed and loose storage */ +#define HAS_OBJECT_RECHECK_PACKED 1 + +/* + * Returns 1 if the object exists. This function will not lazily fetch objects + * in a partial clone. + */ +int has_object(struct repository *r, const struct object_id *oid, + unsigned flags); + +/* + * These macros and functions are deprecated. If checking existence for an + * object that is likely to be missing and/or whose absence is relatively + * inconsequential (or is consequential but the caller is prepared to handle + * it), use has_object(), which has better defaults (no lazy fetch in a partial + * clone and no rechecking of packed storage). In the unlikely event that a + * caller needs to assert existence of an object that it fully expects to + * exist, and wants to trigger a lazy fetch in a partial clone, use + * oid_object_info_extended() with a NULL struct object_info. + * + * These functions can be removed once all callers have migrated to + * has_object() and/or oid_object_info_extended(). + */ #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS #define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags) #define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1) #endif - -/* Same as the above, except for struct object_id. */ int repo_has_object_file(struct repository *r, const struct object_id *oid); int repo_has_object_file_with_flags(struct repository *r, const struct object_id *oid, int flags); @@ -228,12 +283,46 @@ 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; - unsigned char *delta_base_sha1; + struct object_id *delta_base_oid; struct strbuf *type_name; void **contentp; @@ -271,8 +360,6 @@ 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 07bdd5b26e..3257518656 100644 --- a/third_party/git/object.c +++ b/third_party/git/object.c @@ -7,7 +7,6 @@ #include "commit.h" #include "tag.h" #include "alloc.h" -#include "object-store.h" #include "packfile.h" #include "commit-graph.h" @@ -158,13 +157,13 @@ void *create_object(struct repository *r, const struct object_id *oid, void *o) return obj; } -void *object_as_type(struct repository *r, struct object *obj, enum object_type type, int quiet) +void *object_as_type(struct object *obj, enum object_type type, int quiet) { if (obj->type == type) return obj; else if (obj->type == OBJ_NONE) { if (type == OBJ_COMMIT) - init_commit_node(r, (struct commit *) obj); + init_commit_node((struct commit *) obj); else obj->type = type; return obj; @@ -263,7 +262,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(repl, NULL, 0, NULL) < 0) { + if (check_object_signature(r, repl, NULL, 0, NULL) < 0) { error(_("hash mismatch %s"), oid_to_hex(oid)); return NULL; } @@ -273,7 +272,8 @@ 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(repl, buffer, size, type_name(type)) < 0) { + if (check_object_signature(r, repl, buffer, size, + type_name(type)) < 0) { free(buffer); error(_("hash mismatch %s"), oid_to_hex(repl)); return NULL; @@ -308,6 +308,15 @@ 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. @@ -480,6 +489,8 @@ 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; } @@ -507,6 +518,7 @@ 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; @@ -519,6 +531,8 @@ 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 0120892bbd..20b18805f0 100644 --- a/third_party/git/object.h +++ b/third_party/git/object.h @@ -15,7 +15,6 @@ struct parsed_object_pool { struct alloc_state *commit_state; struct alloc_state *tag_state; struct alloc_state *object_state; - unsigned commit_count; /* parent substitutions from .git/info/grafts and .git/shallow */ struct commit_graft **grafts; @@ -26,6 +25,7 @@ struct parsed_object_pool { char *alternate_shallow_file; int commit_graft_prepared; + int substituted_parent; struct buffer_slab *buffer_slab; }; @@ -59,7 +59,7 @@ struct object_array { /* * object flag allocation: - * revision.h: 0---------10 25----28 + * revision.h: 0---------10 15 23------26 * fetch-pack.c: 01 * negotiator/default.c: 2--5 * walker.c: 0-2 @@ -67,18 +67,20 @@ struct object_array { * builtin/blame.c: 12-13 * bisect.c: 16 * bundle.c: 16 - * http-push.c: 16-----19 - * commit-reach.c: 15-------19 + * http-push.c: 11-----14 + * commit-graph.c: 15 + * commit-reach.c: 16-----19 * sha1-name.c: 20 * list-objects-filter.c: 21 * builtin/fsck.c: 0--3 + * builtin/gc.c: 0 * builtin/index-pack.c: 2021 * builtin/pack-objects.c: 20 * builtin/reflog.c: 10--12 * builtin/show-branch.c: 0-------------------------------------------26 * builtin/unpack-objects.c: 2021 */ -#define FLAG_BITS 29 +#define FLAG_BITS 28 /* * The object type is stored in 3 bits. @@ -120,7 +122,7 @@ struct object *lookup_object(struct repository *r, const struct object_id *oid); void *create_object(struct repository *r, const struct object_id *oid, void *obj); -void *object_as_type(struct repository *r, struct object *obj, enum object_type type, int quiet); +void *object_as_type(struct object *obj, enum object_type type, int quiet); /* * Returns the object, having parsed it to find out what it is. @@ -150,6 +152,8 @@ 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/sha1-array.c b/third_party/git/oid-array.c index d922e94e3f..8657a5cedf 100644 --- a/third_party/git/sha1-array.c +++ b/third_party/git/oid-array.c @@ -1,5 +1,5 @@ #include "cache.h" -#include "sha1-array.h" +#include "oid-array.h" #include "sha1-lookup.h" void oid_array_append(struct oid_array *array, const struct object_id *oid) @@ -46,9 +46,9 @@ int oid_array_for_each(struct oid_array *array, for_each_oid_fn fn, void *data) { - int i; + size_t i; - /* No oid_array_sort() here! See the api-oid-array.txt docs! */ + /* No oid_array_sort() here! See oid-array.h */ for (i = 0; i < array->nr; i++) { int ret = fn(array->oid + i, data); @@ -62,7 +62,7 @@ int oid_array_for_each_unique(struct oid_array *array, for_each_oid_fn fn, void *data) { - int i; + size_t i; if (!array->sorted) oid_array_sort(array); @@ -82,7 +82,7 @@ void oid_array_filter(struct oid_array *array, for_each_oid_fn want, void *cb_data) { - unsigned nr = array->nr, src, dst; + size_t nr = array->nr, src, dst; struct object_id *oids = array->oid; for (src = dst = 0; src < nr; src++) { diff --git a/third_party/git/oid-array.h b/third_party/git/oid-array.h new file mode 100644 index 0000000000..f28d322c90 --- /dev/null +++ b/third_party/git/oid-array.h @@ -0,0 +1,109 @@ +#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 oid_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; + size_t nr; + size_t alloc; + int sorted; +}; + +#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); + +#endif /* SHA1_ARRAY_H */ diff --git a/third_party/git/oidmap.c b/third_party/git/oidmap.c index 6d6e840d03..423aa014a3 100644 --- a/third_party/git/oidmap.c +++ b/third_party/git/oidmap.c @@ -2,14 +2,18 @@ #include "oidmap.h" static int oidmap_neq(const void *hashmap_cmp_fn_data, - const void *entry, const void *entry_or_key, + const struct hashmap_entry *e1, + const struct hashmap_entry *e2, const void *keydata) { - const struct oidmap_entry *entry_ = entry; + 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); + if (keydata) - return !oideq(&entry_->oid, (const struct object_id *) keydata); - return !oideq(&entry_->oid, - &((const struct oidmap_entry *) entry_or_key)->oid); + return !oideq(&a->oid, (const struct object_id *) keydata); + return !oideq(&a->oid, &b->oid); } void oidmap_init(struct oidmap *map, size_t initial_size) @@ -21,7 +25,9 @@ void oidmap_free(struct oidmap *map, int free_entries) { if (!map) return; - hashmap_free(&map->map, free_entries); + + /* TODO: make oidmap itself not depend on struct layouts */ + hashmap_free_(&map->map, free_entries ? 0 : -1); } void *oidmap_get(const struct oidmap *map, const struct object_id *key) @@ -51,5 +57,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); + return hashmap_put(&map->map, &to_put->internal_entry); } diff --git a/third_party/git/oidmap.h b/third_party/git/oidmap.h index 7a939461ff..c66a83ab1d 100644 --- a/third_party/git/oidmap.h +++ b/third_party/git/oidmap.h @@ -78,14 +78,16 @@ static inline void oidmap_iter_init(struct oidmap *map, struct oidmap_iter *iter static inline void *oidmap_iter_next(struct oidmap_iter *iter) { - return hashmap_iter_next(&iter->h_iter); + /* TODO: this API could be reworked to do compile-time type checks */ + return (void *)hashmap_iter_next(&iter->h_iter); } static inline void *oidmap_iter_first(struct oidmap *map, struct oidmap_iter *iter) { oidmap_iter_init(map, iter); - return oidmap_iter_next(iter); + /* TODO: this API could be reworked to do compile-time type checks */ + return (void *)oidmap_iter_next(iter); } #endif diff --git a/third_party/git/oidset.c b/third_party/git/oidset.c index f63ce818f6..2d0ab76fb5 100644 --- a/third_party/git/oidset.c +++ b/third_party/git/oidset.c @@ -36,8 +36,19 @@ void oidset_clear(struct oidset *set) oidset_init(set, 0); } +int oidset_size(struct oidset *set) +{ + return kh_size(&set->set); +} + void oidset_parse_file(struct oidset *set, const char *path) { + oidset_parse_file_carefully(set, path, NULL, NULL); +} + +void oidset_parse_file_carefully(struct oidset *set, const char *path, + oidset_parse_tweak_fn fn, void *cbdata) +{ FILE *fp; struct strbuf sb = STRBUF_INIT; struct object_id oid; @@ -61,7 +72,8 @@ void oidset_parse_file(struct oidset *set, const char *path) if (!sb.len) continue; - if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0') + if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0' || + (fn && fn(&oid, cbdata))) die("invalid object name: %s", sb.buf); oidset_insert(set, &oid); } diff --git a/third_party/git/oidset.h b/third_party/git/oidset.h index 5346563b0b..01f6560283 100644 --- a/third_party/git/oidset.h +++ b/third_party/git/oidset.h @@ -1,11 +1,10 @@ #ifndef OIDSET_H #define OIDSET_H -#include "hashmap.h" #include "khash.h" /** - * This API is similar to sha1-array, in that it maintains a set of object ids + * This API is similar to oid-array, in that it maintains a set of object ids * in a memory-efficient way. The major differences are: * * 1. It uses a hash, so we can do online duplicate removal, rather than @@ -56,6 +55,11 @@ int oidset_insert(struct oidset *set, const struct object_id *oid); int oidset_remove(struct oidset *set, const struct object_id *oid); /** + * Returns the number of oids in the set. + */ +int oidset_size(struct oidset *set); + +/** * Remove all entries from the oidset, freeing any resources associated with * it. */ @@ -69,6 +73,15 @@ void oidset_clear(struct oidset *set); */ void oidset_parse_file(struct oidset *set, const char *path); +/* + * Similar to the above, but with a callback which can (1) return non-zero to + * signal displeasure with the object and (2) replace object ID with something + * else (meant to be used to "peel"). + */ +typedef int (*oidset_parse_tweak_fn)(struct object_id *, void *); +void oidset_parse_file_carefully(struct oidset *set, const char *path, + oidset_parse_tweak_fn fn, void *cbdata); + struct oidset_iter { kh_oid_set_t *set; khiter_t iter; diff --git a/third_party/git/pack-bitmap-write.c b/third_party/git/pack-bitmap-write.c index fa78a460c9..5e998bdaa7 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, NULL); + struct object_entry *entry = packlist_find(writer.to_pack, oid); if (!entry) { die("Failed to write bitmap index. Packfile doesn't have full closure " @@ -503,8 +503,7 @@ static void write_hash_cache(struct hashfile *f, for (i = 0; i < index_nr; ++i) { struct object_entry *entry = (struct object_entry *)index[i]; - uint32_t hash_value = htonl(entry->hash); - hashwrite(f, &hash_value, sizeof(hash_value)); + hashwrite_be32(f, entry->hash); } } diff --git a/third_party/git/pack-bitmap.c b/third_party/git/pack-bitmap.c index ed2befaac6..4077e731e8 100644 --- a/third_party/git/pack-bitmap.c +++ b/third_party/git/pack-bitmap.c @@ -12,6 +12,7 @@ #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 @@ -169,7 +170,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 unsigned char *hash, + const struct object_id *oid, struct stored_bitmap *xor_with, int flags) { @@ -181,7 +182,7 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index, stored->root = root; stored->xor = xor_with; stored->flags = flags; - oidread(&stored->oid, hash); + oidcpy(&stored->oid, oid); hash_pos = kh_put_oid_map(index->bitmaps, stored->oid, &ret); @@ -189,7 +190,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", hash_to_hex(hash)); + error("Duplicate entry in bitmap index: %s", oid_to_hex(oid)); return NULL; } @@ -221,13 +222,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; - const unsigned char *sha1; + struct object_id oid; 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); - sha1 = nth_packed_object_sha1(index->pack, commit_idx_pos); + nth_packed_object_id(&oid, index->pack, commit_idx_pos); bitmap = read_bitmap_1(index); if (!bitmap) @@ -244,7 +245,7 @@ static int load_bitmap_entries_v1(struct bitmap_index *index) } recent_bitmaps[i % MAX_XOR_OFFSET] = store_bitmap( - index, bitmap, sha1, xor_bitmap, flags); + index, bitmap, &oid, xor_bitmap, flags); } return 0; @@ -326,6 +327,13 @@ 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; } @@ -498,7 +506,8 @@ static int should_include(struct commit *commit, void *_data) static struct bitmap *find_objects(struct bitmap_index *bitmap_git, struct rev_info *revs, struct object_list *roots, - struct bitmap *seen) + struct bitmap *seen, + struct list_objects_filter_options *filter) { struct bitmap *base = NULL; int needs_walk = 0; @@ -591,14 +600,16 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git, show_data.bitmap_git = bitmap_git; show_data.base = base; - traverse_commit_list(revs, show_commit, show_object, - &show_data); + traverse_commit_list_filtered(filter, revs, + show_commit, show_object, + &show_data, NULL); } return base; } 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; @@ -612,17 +623,48 @@ 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 pos = 0, i = 0; + size_t i = 0; uint32_t offset; struct ewah_iterator it; @@ -630,13 +672,15 @@ static void show_objects_for_type( struct bitmap *objects = bitmap_git->result; - if (bitmap_git->reuse_objects == bitmap_git->pack->num_objects) - return; - - ewah_iterator_init(&it, type_filter); + init_type_iterator(&it, bitmap_git, object_type); - while (i < objects->word_alloc && ewah_iterator_next(&filter, &it)) { + 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); + + if (!word) + continue; for (offset = 0; offset < BITS_IN_EWORD; ++offset) { struct object_id oid; @@ -648,20 +692,14 @@ 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_oid(&oid, bitmap_git->pack, entry->nr); + nth_packed_object_id(&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++; } } @@ -679,7 +717,215 @@ static int in_bitmapped_pack(struct bitmap_index *bitmap_git, return 0; } -struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs) +static struct bitmap *find_tip_objects(struct bitmap_index *bitmap_git, + struct object_list *tip_objects, + enum object_type type) +{ + struct bitmap *result = bitmap_new(); + struct object_list *p; + + for (p = tip_objects; p; p = p->next) { + int pos; + + if (p->item->type != type) + continue; + + pos = bitmap_position(bitmap_git, &p->item->oid); + if (pos < 0) + continue; + + bitmap_set(result, pos); + } + + return result; +} + +static void filter_bitmap_exclude_type(struct bitmap_index *bitmap_git, + struct object_list *tip_objects, + struct bitmap *to_filter, + enum object_type type) +{ + struct eindex *eindex = &bitmap_git->ext_index; + struct bitmap *tips; + struct ewah_iterator it; + eword_t mask; + uint32_t i; + + if (type != OBJ_BLOB && type != OBJ_TREE) + BUG("filter_bitmap_exclude_type: unsupported type '%d'", type); + + /* + * The non-bitmap version of this filter never removes + * objects which the other side specifically asked for, + * so we must match that behavior. + */ + tips = find_tip_objects(bitmap_git, tip_objects, type); + + /* + * 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, type); + 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 == type && + bitmap_get(to_filter, pos) && + !bitmap_get(tips, pos)) + bitmap_unset(to_filter, pos); + } + + bitmap_free(tips); +} + +static void filter_bitmap_blob_none(struct bitmap_index *bitmap_git, + struct object_list *tip_objects, + struct bitmap *to_filter) +{ + filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, + OBJ_BLOB); +} + +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_objects(bitmap_git, tip_objects, OBJ_BLOB); + + 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 void filter_bitmap_tree_depth(struct bitmap_index *bitmap_git, + struct object_list *tip_objects, + struct bitmap *to_filter, + unsigned long limit) +{ + if (limit) + BUG("filter_bitmap_tree_depth given non-zero limit"); + + filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, + OBJ_TREE); + filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, + OBJ_BLOB); +} + +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; + } + + if (filter->choice == LOFC_TREE_DEPTH && + filter->tree_exclude_depth == 0) { + if (bitmap_git) + filter_bitmap_tree_depth(bitmap_git, tip_objects, + to_filter, + filter->tree_exclude_depth); + 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) { unsigned int i; @@ -689,9 +935,22 @@ 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 = xcalloc(1, sizeof(*bitmap_git)); + 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; + /* 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; @@ -709,9 +968,7 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs) else object_list_insert(object, &wants); - if (!tag->tagged) - die("bad tag"); - object = parse_object_or_die(&tag->tagged->oid, NULL); + object = parse_object_or_die(get_tagged_oid(tag), NULL); } if (object->flags & UNINTERESTING) @@ -744,7 +1001,8 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs) if (haves) { revs->ignore_missing_links = 1; - haves_bitmap = find_objects(bitmap_git, revs, haves, NULL); + haves_bitmap = find_objects(bitmap_git, revs, haves, NULL, + filter); reset_revision_walk(); revs->ignore_missing_links = 0; @@ -752,7 +1010,8 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs) BUG("failed to perform bitmap walk"); } - wants_bitmap = find_objects(bitmap_git, revs, wants, haves_bitmap); + wants_bitmap = find_objects(bitmap_git, revs, wants, haves_bitmap, + filter); if (!wants_bitmap) BUG("failed to perform bitmap walk"); @@ -760,93 +1019,173 @@ 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; } -int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git, - struct packed_git **packfile, - uint32_t *entries, - off_t *up_to) +static void try_partial_reuse(struct bitmap_index *bitmap_git, + size_t pos, + struct bitmap *reuse, + struct pack_window **w_curs) { + 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; + } + /* - * Reuse the packfile content if we need more than - * 90% of its objects + * If we got here, then the object is OK to reuse. Mark it. */ - static const double REUSE_PERCENT = 0.9; + bitmap_set(reuse, pos); +} +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; - uint32_t reuse_threshold; - uint32_t i, reuse_objects = 0; + struct bitmap *reuse; + struct pack_window *w_curs = NULL; + size_t i = 0; + uint32_t offset; assert(result); - for (i = 0; i < result->word_alloc; ++i) { - if (result->words[i] != (eword_t)~0) { - reuse_objects += ewah_bit_ctz64(~result->words[i]); - break; - } + while (i < result->word_alloc && result->words[i] == (eword_t)~0) + i++; - reuse_objects += BITS_IN_EWORD; - } + /* 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; -#ifdef GIT_BITMAP_DEBUG - { - const unsigned char *sha1; - struct revindex_entry *entry; + reuse = bitmap_word_alloc(i); + memset(reuse->words, 0xFF, i * sizeof(eword_t)); - entry = &bitmap_git->reverse_index->revindex[reuse_objects]; - sha1 = nth_packed_object_sha1(bitmap_git->pack, entry->nr); + for (; i < result->word_alloc; ++i) { + eword_t word = result->words[i]; + size_t pos = (i * BITS_IN_EWORD); - fprintf(stderr, "Failed to reuse at %d (%016llx)\n", - reuse_objects, result->words[i]); - fprintf(stderr, " %s\n", hash_to_hex(sha1)); + for (offset = 0; offset < BITS_IN_EWORD; ++offset) { + if ((word >> offset) == 0) + break; + + offset += ewah_bit_ctz64(word >> offset); + try_partial_reuse(bitmap_git, pos + offset, reuse, &w_curs); + } } -#endif - if (!reuse_objects) - return -1; + unuse_pack(&w_curs); - 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; + *entries = bitmap_popcount(reuse); + if (!*entries) { + bitmap_free(reuse); + return -1; } - reuse_threshold = bitmap_popcount(bitmap_git->result) * REUSE_PERCENT; + /* + * 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; +} - if (reuse_objects < reuse_threshold) - return -1; +int bitmap_walk_contains(struct bitmap_index *bitmap_git, + struct bitmap *bitmap, const struct object_id *oid) +{ + int idx; - bitmap_git->reuse_objects = *entries = reuse_objects; - *up_to = bitmap_git->pack->revindex[reuse_objects].offset; - *packfile = bitmap_git->pack; + if (!bitmap) + return 0; - return 0; + idx = bitmap_position(bitmap_git, oid); + return idx >= 0 && bitmap_get(bitmap, idx); } 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, 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_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_extended_objects(bitmap_git, show_reachable); + show_extended_objects(bitmap_git, revs, show_reachable); } static uint32_t count_object_type(struct bitmap_index *bitmap_git, @@ -859,26 +1198,7 @@ static uint32_t count_object_type(struct bitmap_index *bitmap_git, struct ewah_iterator it; eword_t filter; - 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; - } + init_type_iterator(&it, bitmap_git, type); while (i < objects->word_alloc && ewah_iterator_next(&filter, &it)) { eword_t word = objects->words[i++] & filter; @@ -1062,8 +1382,8 @@ int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git, struct object_entry *oe; entry = &bitmap_git->pack->revindex[i]; - nth_packed_object_oid(&oid, bitmap_git->pack, entry->nr); - oe = packlist_find(mapping, &oid, NULL); + nth_packed_object_id(&oid, bitmap_git->pack, entry->nr); + oe = packlist_find(mapping, &oid); if (oe) reposition[i] = oe_in_pack_pos(mapping, oe) + 1; @@ -1120,16 +1440,6 @@ void free_bitmap_index(struct bitmap_index *b) int bitmap_has_oid_in_uninteresting(struct bitmap_index *bitmap_git, const struct object_id *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); + return bitmap_git && + bitmap_walk_contains(bitmap_git, bitmap_git->haves, oid); } diff --git a/third_party/git/pack-bitmap.h b/third_party/git/pack-bitmap.h index 00de3ec8e4..1203120c43 100644 --- a/third_party/git/pack-bitmap.h +++ b/third_party/git/pack-bitmap.h @@ -3,22 +3,24 @@ #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[4]; + char magic[ARRAY_SIZE(BITMAP_IDX_SIGNATURE)]; 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 { @@ -44,15 +46,20 @@ 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 bitmap_index *prepare_bitmap_walk(struct rev_info *revs, + struct list_objects_filter_options *filter); int reuse_partial_packfile_from_bitmap(struct bitmap_index *, struct packed_git **packfile, - uint32_t *entries, off_t *up_to); + uint32_t *entries, + struct bitmap **reuse_out); 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 2cc3603189..dad6d8ae7f 100644 --- a/third_party/git/pack-check.c +++ b/third_party/git/pack-check.c @@ -8,10 +8,6 @@ struct idx_entry { off_t offset; - union idx_entry_object { - const unsigned char *hash; - struct object_id *oid; - } oid; unsigned int nr; }; @@ -67,23 +63,23 @@ static int verify_packfile(struct repository *r, if (!is_pack_valid(p)) return error("packfile %s cannot be accessed", p->pack_name); - the_hash_algo->init_fn(&ctx); + r->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 - the_hash_algo->rawsz; + pack_sig_ofs = p->pack_size - r->hash_algo->rawsz; if (offset > pack_sig_ofs) remaining -= (unsigned int)(offset - pack_sig_ofs); - the_hash_algo->update_fn(&ctx, in, remaining); + r->hash_algo->update_fn(&ctx, in, remaining); } while (offset < pack_sig_ofs); - the_hash_algo->final_fn(hash, &ctx); + r->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 - the_hash_algo->hexsz, pack_sig)) + if (!hasheq(index_base + index_size - r->hash_algo->hexsz, pack_sig)) err = error("%s pack checksum does not match its index", p->pack_name); unuse_pack(w_curs); @@ -97,9 +93,6 @@ 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; } @@ -107,11 +100,16 @@ 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; @@ -119,7 +117,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(entries[i].oid.oid), + oid_to_hex(&oid), p->pack_name, (uintmax_t)offset); } @@ -142,14 +140,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(entries[i].oid.oid), p->pack_name, + oid_to_hex(&oid), p->pack_name, (uintmax_t)entries[i].offset); - else if (check_object_signature(entries[i].oid.oid, data, size, type_name(type))) + else if (check_object_signature(r, &oid, data, size, type_name(type))) err = error("packed %s from %s is corrupt", - oid_to_hex(entries[i].oid.oid), p->pack_name); + oid_to_hex(&oid), p->pack_name); else if (fn) { int eaten = 0; - err |= fn(entries[i].oid.oid, type, size, data, &eaten); + err |= fn(&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 52560293b6..f2a433885a 100644 --- a/third_party/git/pack-objects.c +++ b/third_party/git/pack-objects.c @@ -68,8 +68,7 @@ static void rehash_objects(struct packing_data *pdata) } struct object_entry *packlist_find(struct packing_data *pdata, - const struct object_id *oid, - uint32_t *index_pos) + const struct object_id *oid) { uint32_t i; int found; @@ -79,9 +78,6 @@ 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; @@ -123,7 +119,10 @@ void oe_map_new_pack(struct packing_data *pack) { uint32_t i; - REALLOC_ARRAY(pack->in_pack, pack->nr_alloc); + if (pack->in_pack) + BUG("packing_data has already been converted to pack array"); + + ALLOC_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); @@ -153,8 +152,7 @@ void prepare_packing_data(struct repository *r, struct packing_data *pdata) } struct object_entry *packlist_alloc(struct packing_data *pdata, - const unsigned char *sha1, - uint32_t index_pos) + const struct object_id *oid) { struct object_entry *new_entry; @@ -177,12 +175,19 @@ struct object_entry *packlist_alloc(struct packing_data *pdata, new_entry = pdata->objects + pdata->nr_objects++; memset(new_entry, 0, sizeof(*new_entry)); - hashcpy(new_entry->idx.oid.hash, sha1); + oidcpy(&new_entry->idx.oid, oid); if (pdata->index_size * 3 <= pdata->nr_objects * 4) rehash_objects(pdata); - else - pdata->index[index_pos] = pdata->nr_objects; + 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; + } if (pdata->in_pack) pdata->in_pack[pdata->nr_objects - 1] = NULL; @@ -198,14 +203,14 @@ struct object_entry *packlist_alloc(struct packing_data *pdata, void oe_set_delta_ext(struct packing_data *pdata, struct object_entry *delta, - const unsigned char *sha1) + const struct object_id *oid) { 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)); - hashcpy(base->idx.oid.hash, sha1); + oidcpy(&base->idx.oid, oid); /* 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 857d43850b..9d88e3e518 100644 --- a/third_party/git/pack-objects.h +++ b/third_party/git/pack-objects.h @@ -183,12 +183,10 @@ static inline void packing_data_unlock(struct packing_data *pdata) } struct object_entry *packlist_alloc(struct packing_data *pdata, - const unsigned char *sha1, - uint32_t index_pos); + const struct object_id *oid); struct object_entry *packlist_find(struct packing_data *pdata, - const struct object_id *oid, - uint32_t *index_pos); + const struct object_id *oid); static inline uint32_t pack_name_hash(const char *name) { @@ -253,12 +251,21 @@ static inline void oe_set_in_pack(struct packing_data *pack, struct object_entry *e, struct packed_git *p) { - if (!p->index) + 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. + */ oe_map_new_pack(pack); - if (pack->in_pack_by_idx) - e->in_pack_idx = p->index; - else - pack->in_pack[e - pack->objects] = p; + } + pack->in_pack[e - pack->objects] = p; } static inline struct object_entry *oe_delta( @@ -285,7 +292,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 unsigned char *sha1); + const struct object_id *oid); 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 29d17a9bec..a6cdb3c67c 100644 --- a/third_party/git/pack-write.c +++ b/third_party/git/pack-write.c @@ -38,9 +38,8 @@ static int need_large_offset(off_t offset, const struct pack_idx_option *opts) } /* - * On entry *sha1 contains the pack content SHA1 hash, on exit it is - * the SHA1 hash of sorted object names. The objects array passed in - * will be sorted by SHA1 on exit. + * The *sha1 contains the pack content SHA1 hash. + * The objects array passed in will be sorted by SHA1 on exit. */ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objects, int nr_objects, const struct pack_idx_option *opts, @@ -118,10 +117,8 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec list = sorted_by_sha; for (i = 0; i < nr_objects; i++) { struct pack_idx_entry *obj = *list++; - if (index_version < 2) { - uint32_t offset = htonl(obj->offset); - hashwrite(f, &offset, 4); - } + if (index_version < 2) + hashwrite_be32(f, obj->offset); hashwrite(f, obj->oid.hash, the_hash_algo->rawsz); if ((opts->flags & WRITE_IDX_STRICT) && (i && oideq(&list[-2]->oid, &obj->oid))) @@ -136,8 +133,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec list = sorted_by_sha; for (i = 0; i < nr_objects; i++) { struct pack_idx_entry *obj = *list++; - uint32_t crc32_val = htonl(obj->crc32); - hashwrite(f, &crc32_val, 4); + hashwrite_be32(f, obj->crc32); } /* write the 32-bit offset table */ @@ -149,8 +145,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec offset = (need_large_offset(obj->offset, opts) ? (0x80000000 | nr_large_offset++) : obj->offset); - offset = htonl(offset); - hashwrite(f, &offset, 4); + hashwrite_be32(f, offset); } /* write the large offset table */ @@ -349,7 +344,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 sha1[]) + unsigned char hash[]) { const char *idx_tmp_name; int basename_len = name_buffer->len; @@ -358,18 +353,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, sha1); + pack_idx_opts, hash); if (adjust_shared_perm(idx_tmp_name)) die_errno("unable to make temporary index file readable"); - strbuf_addf(name_buffer, "%s.pack", sha1_to_hex(sha1)); + strbuf_addf(name_buffer, "%s.pack", hash_to_hex(hash)); 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", sha1_to_hex(sha1)); + strbuf_addf(name_buffer, "%s.idx", hash_to_hex(hash)); 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 fc43a6c52c..0929ebe4fc 100644 --- a/third_party/git/packfile.c +++ b/third_party/git/packfile.c @@ -6,7 +6,6 @@ #include "mergesort.h" #include "packfile.h" #include "delta.h" -#include "list.h" #include "streaming.h" #include "sha1-lookup.h" #include "commit.h" @@ -17,14 +16,15 @@ #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 *sha1, + const unsigned char *hash, const char *ext) { strbuf_reset(buf); strbuf_addf(buf, "%s/pack/pack-%s.%s", get_object_directory(), - sha1_to_hex(sha1), ext); + hash_to_hex(hash), ext); return buf->buf; } @@ -178,6 +178,7 @@ int load_idx(const char *path, const unsigned int hashsz, void *idx_map, */ (sizeof(off_t) <= 4)) return error("pack too large for current definition of off_t in %s", path); + p->crc_offset = 8 + 4 * 256 + nr * hashsz; } p->index_version = version; @@ -287,13 +288,6 @@ 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) { @@ -517,7 +511,6 @@ 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; @@ -561,16 +554,6 @@ 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) @@ -594,9 +577,8 @@ 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); - 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); + read_result = pread_in_full(p->pack_fd, hash, hashsz, + p->pack_size - hashsz); if (read_result < 0) return error_errno("error reading from %s", p->pack_name); if (read_result != hashsz) @@ -710,23 +692,12 @@ 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. @@ -775,6 +746,9 @@ 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); @@ -874,20 +848,18 @@ 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))) { - /* Don't reopen a pack we already have. */ - 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; - } + 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); - if (!p) { + /* Don't reopen a pack we already have. */ + if (!hashmap_get(&data->r->objects->pack_map, &hent, pack_name)) { 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) @@ -951,6 +923,7 @@ unsigned long repo_approximate_object_count(struct repository *r) count += p->num_objects; } r->objects->approximate_object_count = count; + r->objects->approximate_object_count_valid = 1; } return r->objects->approximate_object_count; } @@ -1033,12 +1006,14 @@ 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) @@ -1053,6 +1028,17 @@ struct multi_pack_index *get_multi_pack_index(struct repository *r) return r->objects->multi_pack_index; } +struct multi_pack_index *get_local_multi_pack_index(struct repository *r) +{ + struct multi_pack_index *m = get_multi_pack_index(r); + + /* no need to iterate; we always put the local one first (if any) */ + if (m && m->local) + return m; + + return NULL; +} + struct packed_git *get_all_packs(struct repository *r) { struct multi_pack_index *m; @@ -1115,7 +1101,23 @@ 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)); @@ -1191,11 +1193,11 @@ const struct packed_git *has_packed_and_bad(struct repository *r, return NULL; } -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) +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; @@ -1236,30 +1238,32 @@ static 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 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) +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) { if (type == OBJ_REF_DELTA) { unsigned char *base = use_pack(p, w_curs, curpos, NULL); - return base; + oidread(oid, base); + return 0; } 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 NULL; + return -1; revidx = find_pack_revindex(p, base_offset); if (!revidx) - return NULL; + return -1; - return nth_packed_object_sha1(p, revidx->nr); + return nth_packed_object_id(oid, p, revidx->nr); } else - return NULL; + return -1; } static int retry_bad_packed_offset(struct repository *r, @@ -1272,7 +1276,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_oid(&oid, p, revidx->nr); + nth_packed_object_id(&oid, p, revidx->nr); mark_bad_packed_object(p, oid.hash); type = oid_object_info(r, &oid, NULL); if (type <= OBJ_NONE) @@ -1361,7 +1365,7 @@ struct delta_base_cache_key { }; struct delta_base_cache_entry { - struct hashmap hash; + struct hashmap_entry ent; struct delta_base_cache_key key; struct list_head lru; void *data; @@ -1381,7 +1385,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; + struct hashmap_entry entry, *e; struct delta_base_cache_key key; if (!delta_base_cache.cmpfn) @@ -1390,7 +1394,8 @@ 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; - return hashmap_get(&delta_base_cache, &entry, &key); + e = hashmap_get(&delta_base_cache, &entry, &key); + return e ? container_of(e, struct delta_base_cache_entry, ent) : NULL; } static int delta_base_cache_key_eq(const struct delta_base_cache_key *a, @@ -1400,11 +1405,16 @@ 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 void *va, const void *vb, + const struct hashmap_entry *va, + const struct hashmap_entry *vb, const void *vkey) { - const struct delta_base_cache_entry *a = va, *b = vb; + const struct delta_base_cache_entry *a, *b; 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 @@ -1423,7 +1433,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->key); + hashmap_remove(&delta_base_cache, &ent->ent, &ent->key); list_del(&ent->lru); delta_base_cached -= ent->size; free(ent); @@ -1465,9 +1475,19 @@ void clear_delta_base_cache(void) static void add_delta_base_cache(struct packed_git *p, off_t base_offset, void *base, unsigned long base_size, enum object_type type) { - struct delta_base_cache_entry *ent = xmalloc(sizeof(*ent)); + struct delta_base_cache_entry *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)) { + free(base); + return; + } + delta_base_cached += base_size; list_for_each_safe(lru, tmp, &delta_base_cache_lru) { @@ -1478,6 +1498,7 @@ static void add_delta_base_cache(struct packed_git *p, off_t base_offset, release_delta_base_cache(f); } + ent = xmalloc(sizeof(*ent)); ent->key.p = p; ent->key.base_offset = base_offset; ent->type = type; @@ -1487,8 +1508,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, pack_entry_hash(p, base_offset)); - hashmap_add(&delta_base_cache, ent); + hashmap_entry_init(&ent->ent, pack_entry_hash(p, base_offset)); + hashmap_add(&delta_base_cache, &ent->ent); } int packed_object_info(struct repository *r, struct packed_git *p, @@ -1553,20 +1574,16 @@ int packed_object_info(struct repository *r, struct packed_git *p, } } - if (oi->delta_base_sha1) { + if (oi->delta_base_oid) { if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) { - const unsigned char *base; - - base = get_delta_base_sha1(p, &w_curs, curpos, - type, obj_offset); - if (!base) { + if (get_delta_base_oid(p, &w_curs, curpos, + oi->delta_base_oid, + type, obj_offset) < 0) { type = OBJ_BAD; goto out; } - - hashcpy(oi->delta_base_sha1, base); } else - hashclr(oi->delta_base_sha1); + oidclr(oi->delta_base_oid); } oi->whence = in_delta_base_cache(p, obj_offset) ? OI_DBCACHED : @@ -1597,7 +1614,15 @@ 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; @@ -1682,7 +1707,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_oid(&oid, p, revidx->nr); + nth_packed_object_id(&oid, p, revidx->nr); error("bad packed object CRC for %s", oid_to_hex(&oid)); mark_bad_packed_object(p, oid.hash); @@ -1754,12 +1779,10 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset, void *external_base = NULL; unsigned long delta_size, base_size = size; int i; + off_t base_obj_offset = obj_offset; data = NULL; - if (base) - add_delta_base_cache(p, obj_offset, base, base_size, type); - if (!base) { /* * We're probably in deep shit, but let's try to fetch @@ -1771,7 +1794,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_oid(&base_oid, p, revidx->nr); + nth_packed_object_id(&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, @@ -1797,24 +1820,33 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset, "at offset %"PRIuMAX" from %s", (uintmax_t)curpos, p->pack_name); data = NULL; - free(external_base); - continue; - } + } else { + data = patch_delta(base, base_size, delta_data, + delta_size, &size); - data = patch_delta(base, base_size, - delta_data, delta_size, - &size); + /* + * We could not apply the delta; warn the user, but + * keep going. Our failure will be noticed either in + * the next iteration of the loop, or if this is the + * final delta, in the caller when we return NULL. + * Those code paths will take care of making a more + * explicit warning and retrying with another copy of + * the object. + */ + if (!data) + error("failed to apply delta"); + } /* - * We could not apply the delta; warn the user, but keep going. - * Our failure will be noticed either in the next iteration of - * the loop, or if this is the final delta, in the caller when - * we return NULL. Those code paths will take care of making - * a more explicit warning and retrying with another copy of - * the object. + * We delay adding `base` to the cache until the end of the loop + * because unpack_compressed_entry() momentarily releases the + * obj_read_mutex, giving another thread the chance to access + * the cache. Therefore, if `base` was already there, this other + * thread could free() it (e.g. to make space for another entry) + * before we are done using it. */ - if (!data) - error("failed to apply delta"); + if (!external_base) + add_delta_base_cache(p, base_obj_offset, base, base_size, type); free(delta_data); free(external_base); @@ -1858,36 +1890,27 @@ int bsearch_pack(const struct object_id *oid, const struct packed_git *p, uint32 index_lookup, index_lookup_width, result); } -const unsigned char *nth_packed_object_sha1(struct packed_git *p, - uint32_t n) +int nth_packed_object_id(struct object_id *oid, + 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 NULL; + return -1; index = p->index_data; } if (n >= p->num_objects) - return NULL; + return -1; index += 4 * 256; if (p->index_version == 1) { - return index + (hashsz + 4) * n + 4; + oidread(oid, index + (hashsz + 4) * n + 4); } else { index += 8; - return index + hashsz * n; + oidread(oid, index + hashsz * n); } -} - -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; + return 0; } void check_pack_index_ptr(const struct packed_git *p, const void *vptr) @@ -2066,7 +2089,7 @@ int for_each_object_in_pack(struct packed_git *p, else pos = i; - if (!nth_packed_object_oid(&oid, p, pos)) + if (nth_packed_object_id(&oid, p, pos) < 0) return error("unable to get sha1 of object %u in %s", pos, p->pack_name); @@ -2139,7 +2162,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, &tag->tagged->oid); + oidset_insert(set, get_tagged_oid(tag)); } return 0; } @@ -2150,7 +2173,7 @@ int is_promisor_object(const struct object_id *oid) static int promisor_objects_prepared; if (!promisor_objects_prepared) { - if (repository_format_partial_clone) { + if (has_promisor_remote()) { 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 3e98910bdd..a58fc738e0 100644 --- a/third_party/git/packfile.h +++ b/third_party/git/packfile.h @@ -57,6 +57,7 @@ void install_packed_git(struct repository *r, struct packed_git *pack); struct packed_git *get_packed_git(struct repository *r); struct list_head *get_packed_git_mru(struct repository *r); struct multi_pack_index *get_multi_pack_index(struct repository *r); +struct multi_pack_index *get_local_multi_pack_index(struct repository *r); struct packed_git *get_all_packs(struct repository *r); /* @@ -100,7 +101,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". */ -extern void unlink_pack_path(const char *pack_name, int force_delete); +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,18 +122,11 @@ 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); /* - * 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. + * 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. */ -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); +int nth_packed_object_id(struct object_id *, struct packed_git *, uint32_t n); /* * Return the offset of the nth object within the specified packfile. @@ -151,6 +145,9 @@ 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/pager.c b/third_party/git/pager.c index 41446d4f05..ee435de675 100644 --- a/third_party/git/pager.c +++ b/third_party/git/pager.c @@ -68,7 +68,7 @@ const char *git_pager(int stdout_is_tty) return pager; } -static void setup_pager_env(struct argv_array *env) +static void setup_pager_env(struct strvec *env) { const char **argv; int i; @@ -88,7 +88,7 @@ static void setup_pager_env(struct argv_array *env) *cp = '\0'; if (!getenv(argv[i])) { *cp = '='; - argv_array_push(env, argv[i]); + strvec_push(env, argv[i]); } } free(pager_env); @@ -97,7 +97,7 @@ static void setup_pager_env(struct argv_array *env) void prepare_pager_args(struct child_process *pager_process, const char *pager) { - argv_array_push(&pager_process->args, pager); + strvec_push(&pager_process->args, pager); pager_process->use_shell = 1; setup_pager_env(&pager_process->env_array); pager_process->trace2_child_class = "pager"; @@ -126,7 +126,7 @@ void setup_pager(void) /* spawn the pager */ prepare_pager_args(&pager_process, pager); pager_process.in = -1; - argv_array_push(&pager_process.env_array, "GIT_PAGER_IN_USE"); + strvec_push(&pager_process.env_array, "GIT_PAGER_IN_USE"); if (start_command(&pager_process)) return; diff --git a/third_party/git/parse-options-cb.c b/third_party/git/parse-options-cb.c index 1240a8514e..4542d4d3f9 100644 --- a/third_party/git/parse-options-cb.c +++ b/third_party/git/parse-options-cb.c @@ -4,8 +4,8 @@ #include "commit.h" #include "color.h" #include "string-list.h" -#include "argv-array.h" -#include "sha1-array.h" +#include "strvec.h" +#include "oid-array.h" /*----- some often used options -----*/ @@ -105,6 +105,8 @@ int parse_opt_commit(const struct option *opt, const char *arg, int unset) struct commit *commit; struct commit **target = opt->value; + BUG_ON_OPT_NEG(unset); + if (!arg) return -1; if (get_oid(arg, &oid)) @@ -159,39 +161,32 @@ int parse_opt_tertiary(const struct option *opt, const char *arg, int unset) return 0; } -struct option *parse_options_dup(const struct option *o) +static size_t parse_options_count(const struct option *opt) { - struct option *opts; - int nr = 0; + size_t n = 0; - while (o && o->type != OPTION_END) { - nr++; - o++; - } + for (; opt && opt->type != OPTION_END; opt++) + n++; + return n; +} - 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_dup(const struct option *o) +{ + struct option no_options[] = { OPT_END() }; + + return parse_options_concat(o, no_options); } -struct option *parse_options_concat(struct option *a, struct option *b) +struct option *parse_options_concat(const struct option *a, + const struct option *b) { struct option *ret; - 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++; + size_t a_len = parse_options_count(a); + size_t b_len = parse_options_count(b); ALLOC_ARRAY(ret, st_add3(a_len, b_len, 1)); - 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 */ + COPY_ARRAY(ret, a, a_len); + COPY_ARRAY(ret + a_len, b, b_len + 1); /* + 1 for final OPTION_END */ return ret; } @@ -282,19 +277,19 @@ int parse_opt_passthru(const struct option *opt, const char *arg, int unset) /** * For an option opt, recreate the command-line option, appending it to - * opt->value which must be a argv_array. This is useful when we need to pass + * opt->value which must be a strvec. This is useful when we need to pass * the command-line option, which can be specified multiple times, to another * command. */ int parse_opt_passthru_argv(const struct option *opt, const char *arg, int unset) { static struct strbuf sb = STRBUF_INIT; - struct argv_array *opt_value = opt->value; + struct strvec *opt_value = opt->value; if (recreate_opt(&sb, opt, arg, unset) < 0) return -1; - argv_array_push(opt_value, sb.buf); + strvec_push(opt_value, sb.buf); return 0; } diff --git a/third_party/git/parse-options.c b/third_party/git/parse-options.c index 87b26a1d92..f0507432ee 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->type != OPTION_CMDMODE || + !(that->flags & PARSE_OPT_CMDMODE) || that->value != opt->value || that->defval != *(int *)opt->value) continue; @@ -95,6 +95,14 @@ 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); @@ -130,16 +138,6 @@ 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; @@ -357,8 +355,7 @@ is_abbreviated: } /* negated? */ if (!starts_with(arg, "no-")) { - if (starts_with(long_name, "no-")) { - long_name += 3; + if (skip_prefix(long_name, "no-", &long_name)) { opt_flags |= OPT_UNSET; goto again; } @@ -420,7 +417,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); } @@ -428,7 +425,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); } } @@ -528,7 +525,8 @@ void parse_options_start(struct parse_opt_ctx_t *ctx, parse_options_start_1(ctx, argc, argv, prefix, options, flags); } -static void show_negated_gitcomp(const struct option *opts, int nr_noopts) +static void show_negated_gitcomp(const struct option *opts, int show_all, + int nr_noopts) { int printed_dashdash = 0; @@ -538,7 +536,8 @@ static void show_negated_gitcomp(const struct option *opts, int nr_noopts) if (!opts->long_name) continue; - if (opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE)) + if (!show_all && + (opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE))) continue; if (opts->flags & PARSE_OPT_NONEG) continue; @@ -575,7 +574,7 @@ static void show_negated_gitcomp(const struct option *opts, int nr_noopts) } } -static int show_gitcomp(const struct option *opts) +static int show_gitcomp(const struct option *opts, int show_all) { const struct option *original_opts = opts; int nr_noopts = 0; @@ -585,7 +584,8 @@ static int show_gitcomp(const struct option *opts) if (!opts->long_name) continue; - if (opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE)) + if (!show_all && + (opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE))) continue; switch (opts->type) { @@ -613,8 +613,8 @@ static int show_gitcomp(const struct option *opts) nr_noopts++; printf(" --%s%s", opts->long_name, suffix); } - show_negated_gitcomp(original_opts, -1); - show_negated_gitcomp(original_opts, nr_noopts); + show_negated_gitcomp(original_opts, show_all, -1); + show_negated_gitcomp(original_opts, show_all, nr_noopts); fputc('\n', stdout); return PARSE_OPT_COMPLETE; } @@ -623,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 substitue + * Right now this is only used to preprocess and substitute * OPTION_ALIAS. */ static struct option *preprocess_options(struct parse_opt_ctx_t *ctx, @@ -651,6 +651,7 @@ static struct option *preprocess_options(struct parse_opt_ctx_t *ctx, int short_name; const char *long_name; const char *source; + struct strbuf help = STRBUF_INIT; int j; if (newopt[i].type != OPTION_ALIAS) @@ -662,6 +663,7 @@ static struct option *preprocess_options(struct parse_opt_ctx_t *ctx, if (!long_name) BUG("An alias must have long option name"); + strbuf_addf(&help, _("alias of --%s"), source); for (j = 0; j < nr; j++) { const char *name = options[j].long_name; @@ -672,15 +674,10 @@ static struct option *preprocess_options(struct parse_opt_ctx_t *ctx, if (options[j].type == OPTION_ALIAS) BUG("No please. Nested aliases are not supported."); - /* - * NEEDSWORK: this is a bit inconsistent because - * usage_with_options() on the original options[] will print - * help string as "alias of %s" but "git cmd -h" will - * print the original help string. - */ memcpy(newopt + i, options + j, sizeof(*newopt)); newopt[i].short_name = short_name; newopt[i].long_name = long_name; + newopt[i].help = strbuf_detach(&help, NULL); break; } @@ -729,9 +726,14 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, if (internal_help && ctx->total == 1 && !strcmp(arg + 1, "h")) goto show_usage; - /* lone --git-completion-helper is asked by git-completion.bash */ - if (ctx->total == 1 && !strcmp(arg + 1, "-git-completion-helper")) - return show_gitcomp(options); + /* + * lone --git-completion-helper and --git-completion-helper-all + * are asked by git-completion.bash + */ + if (ctx->total == 1 && !strcmp(arg, "--git-completion-helper")) + return show_gitcomp(options, 0); + if (ctx->total == 1 && !strcmp(arg, "--git-completion-helper-all")) + return show_gitcomp(options, 1); if (arg[1] != '-') { ctx->opt = arg + 1; @@ -780,7 +782,8 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, continue; } - if (!arg[2]) { /* "--" */ + if (!arg[2] /* "--" */ || + !strcmp(arg + 2, "end-of-options")) { 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 a4bd40bb6a..7030d8f3da 100644 --- a/third_party/git/parse-options.h +++ b/third_party/git/parse-options.h @@ -1,6 +1,10 @@ #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, @@ -14,7 +18,6 @@ enum parse_opt_type { OPTION_BITOP, OPTION_COUNTUP, OPTION_SET_INT, - OPTION_CMDMODE, /* options with arguments (usually) */ OPTION_STRING, OPTION_INTEGER, @@ -43,7 +46,17 @@ 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_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 }; struct option; @@ -155,8 +168,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_CMDMODE, (s), (l), (v), NULL, \ - (h), PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) } +#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_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 } @@ -241,15 +254,6 @@ 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 @@ -277,7 +281,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(struct option *a, struct option *b); +struct option *parse_options_concat(const struct option *a, const struct option *b); /*----- some often used options -----*/ int parse_opt_abbrev_cb(const struct option *, const char *, int); @@ -310,7 +314,7 @@ int parse_opt_passthru_argv(const struct option *, const char *, int); #define OPT__FORCE(var, h, f) OPT_COUNTUP_F('f', "force", (var), (h), (f)) #define OPT__ABBREV(var) \ { OPTION_CALLBACK, 0, "abbrev", (var), N_("n"), \ - N_("use <n> digits to display SHA-1s"), \ + N_("use <n> digits to display object names"), \ PARSE_OPT_OPTARG, &parse_opt_abbrev_cb, 0 } #define OPT__COLOR(var, h) \ OPT_COLOR_FLAG(0, "color", (var), (h)) @@ -330,5 +334,8 @@ 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")) +#define OPT_AUTOSTASH(v) OPT_BOOL(0, "autostash", v, N_("automatically stash/stash pop before and after")) #endif diff --git a/third_party/git/patch-ids.c b/third_party/git/patch-ids.c index e8c150d0c9..12aa6d494b 100644 --- a/third_party/git/patch-ids.c +++ b/third_party/git/patch-ids.c @@ -36,14 +36,16 @@ 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 void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *unused_keydata) { /* NEEDSWORK: const correctness? */ struct diff_options *opt = (void *)cmpfn_data; - struct patch_id *a = (void *)entry; - struct patch_id *b = (void *)entry_or_key; + struct patch_id *a, *b; + + a = container_of(eptr, struct patch_id, ent); + b = container_of(entry_or_key, struct patch_id, ent); if (is_null_oid(&a->patch_id) && commit_patch_id(a->commit, opt, &a->patch_id, 0, 0)) @@ -69,7 +71,7 @@ int init_patch_ids(struct repository *r, struct patch_ids *ids) int free_patch_ids(struct patch_ids *ids) { - hashmap_free(&ids->patches, 1); + hashmap_free_entries(&ids->patches, struct patch_id, ent); return 0; } @@ -83,7 +85,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, oidhash(&header_only_patch_id)); + hashmap_entry_init(&patch->ent, oidhash(&header_only_patch_id)); return 0; } @@ -99,7 +101,7 @@ struct patch_id *has_commit_patch_id(struct commit *commit, if (init_patch_id_entry(&patch, commit, ids)) return NULL; - return hashmap_get(&ids->patches, &patch, NULL); + return hashmap_get_entry(&ids->patches, &patch, ent, NULL); } struct patch_id *add_commit_patch_id(struct commit *commit, @@ -116,6 +118,6 @@ struct patch_id *add_commit_patch_id(struct commit *commit, return NULL; } - hashmap_add(&ids->patches, key); + hashmap_add(&ids->patches, &key->ent); return key; } diff --git a/third_party/git/path.c b/third_party/git/path.c index 25e97b8c3f..7b385e5eb2 100644 --- a/third_party/git/path.c +++ b/third_party/git/path.c @@ -11,6 +11,7 @@ #include "path.h" #include "packfile.h" #include "object-store.h" +#include "lockfile.h" static int get_st_mode_bits(const char *path, int *mode) { @@ -101,36 +102,36 @@ struct common_dir { /* Not considered garbage for report_linked_checkout_garbage */ unsigned ignore_garbage:1; unsigned is_dir:1; - /* Not common even though its parent is */ - unsigned exclude:1; - const char *dirname; + /* Belongs to the common dir, though it may contain paths that don't */ + unsigned is_common:1; + const char *path; }; static struct common_dir common_list[] = { - { 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, 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, 0, 0, NULL } }; @@ -236,30 +237,41 @@ static void *add_to_trie(struct trie *root, const char *key, void *value) return old; } -typedef int (*match_fn)(const char *unmatched, void *data, void *baton); +typedef int (*match_fn)(const char *unmatched, void *value, 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. 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. + * 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. * * The key is partially normalized: consecutive slashes are skipped. * - * 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 | - * |-----------------|------------|---------------|--------------| + * For example, consider the trie containing only [logs, + * logs/refs/bisect], both with values, but not logs/refs. * + * | 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) @@ -288,9 +300,13 @@ 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 */ - return fn(key, root->value, baton); + if (root->value) + return fn(key, root->value, baton); + else + return -1; + } /* Partial path normalization: skip consecutive slashes */ while (key[0] == '/' && key[1] == '/') @@ -320,8 +336,8 @@ static void init_common_trie(void) if (common_trie_done_setup) return; - for (p = common_list; p->dirname; p++) - add_to_trie(&common_trie, p->dirname, p); + for (p = common_list; p->path; p++) + add_to_trie(&common_trie, p->path, p); common_trie_done_setup = 1; } @@ -334,14 +350,11 @@ 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->exclude; + return dir->is_common; if (!dir->is_dir && unmatched[0] == 0) - return !dir->exclude; + return dir->is_common; return 0; } @@ -350,9 +363,14 @@ 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) @@ -365,8 +383,8 @@ void report_linked_checkout_garbage(void) return; strbuf_addf(&sb, "%s/", get_git_dir()); len = sb.len; - for (p = common_list; p->dirname; p++) { - const char *path = p->dirname; + for (p = common_list; p->path; p++) { + const char *path = p->path; if (p->ignore_garbage) continue; strbuf_setlen(&sb, len); @@ -705,7 +723,7 @@ static struct passwd *getpw_str(const char *username, size_t len) * then it is a newly allocated string. Returns NULL on getpw failure or * if path is NULL. * - * If real_home is true, real_path($HOME) is used in the expansion. + * If real_home is true, strbuf_realpath($HOME) is used in the expansion. */ char *expand_user_path(const char *path, int real_home) { @@ -832,8 +850,8 @@ const char *enter_repo(const char *path, int strict) } if (is_git_directory(".")) { - set_git_dir("."); - check_repository_format(); + set_git_dir(".", 0); + check_repository_format(NULL); return path; } @@ -1059,6 +1077,8 @@ 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) @@ -1221,31 +1241,52 @@ static inline int chomp_trailing_dir_sep(const char *path, int len) } /* - * If path ends with suffix (complete path components), returns the - * part before suffix (sans trailing directory separators). - * Otherwise returns NULL. + * 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. */ -char *strip_path_suffix(const char *path, const char *suffix) +static ssize_t stripped_path_suffix_offset(const char *path, const char *suffix) { int path_len = strlen(path), suffix_len = strlen(suffix); while (suffix_len) { if (!path_len) - return NULL; + return -1; if (is_dir_sep(path[path_len - 1])) { if (!is_dir_sep(suffix[suffix_len - 1])) - return NULL; + return -1; 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 NULL; + return -1; } if (path_len && !is_dir_sep(path[path_len - 1])) - return NULL; - return xstrndup(path, chomp_trailing_dir_sep(path, path_len)); + 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); } int daemon_avoid_alias(const char *p) @@ -1295,37 +1336,77 @@ int daemon_avoid_alias(const char *p) } } -static int only_spaces_and_periods(const char *path, size_t len, size_t skip) +/* + * 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) { - if (len < 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 return 0; - len -= skip; - path += skip; - while (len-- > 0) { - char c = *(path++); - if (c != ' ' && c != '.') + + for (;;) { + c = *(name++); + if (!c || c == '\\' || c == '/' || c == ':') + return 1; + 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, @@ -1341,7 +1422,7 @@ static int is_ntfs_dot_generic(const char *name, only_spaces_and_periods: for (;;) { char c = name[i++]; - if (!c) + if (!c || c == ':') return 1; if (c != ' ' && c != '.') return 0; @@ -1447,12 +1528,11 @@ char *xdg_cache_home(const char *filename) return NULL; } -REPO_GIT_PATH_FUNC(cherry_pick_head, "CHERRY_PICK_HEAD") -REPO_GIT_PATH_FUNC(revert_head, "REVERT_HEAD") REPO_GIT_PATH_FUNC(squash_msg, "SQUASH_MSG") REPO_GIT_PATH_FUNC(merge_msg, "MERGE_MSG") REPO_GIT_PATH_FUNC(merge_rr, "MERGE_RR") REPO_GIT_PATH_FUNC(merge_mode, "MERGE_MODE") REPO_GIT_PATH_FUNC(merge_head, "MERGE_HEAD") +REPO_GIT_PATH_FUNC(merge_autostash, "MERGE_AUTOSTASH") REPO_GIT_PATH_FUNC(fetch_head, "FETCH_HEAD") REPO_GIT_PATH_FUNC(shallow, "shallow") diff --git a/third_party/git/path.h b/third_party/git/path.h index 2ba6ca58c8..e7e77da6aa 100644 --- a/third_party/git/path.h +++ b/third_party/git/path.h @@ -170,27 +170,31 @@ void report_linked_checkout_garbage(void); } struct path_cache { - const char *cherry_pick_head; - const char *revert_head; const char *squash_msg; const char *merge_msg; const char *merge_rr; const char *merge_mode; const char *merge_head; + const char *merge_autostash; const char *fetch_head; const char *shallow; }; -#define PATH_CACHE_INIT { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } +#define PATH_CACHE_INIT \ + { \ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \ + } -const char *git_path_cherry_pick_head(struct repository *r); -const char *git_path_revert_head(struct repository *r); const char *git_path_squash_msg(struct repository *r); const char *git_path_merge_msg(struct repository *r); const char *git_path_merge_rr(struct repository *r); const char *git_path_merge_mode(struct repository *r); const char *git_path_merge_head(struct repository *r); +const char *git_path_merge_autostash(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 12c2b322b3..7a229d8d22 100644 --- a/third_party/git/pathspec.c +++ b/third_party/git/pathspec.c @@ -3,6 +3,8 @@ #include "dir.h" #include "pathspec.h" #include "attr.h" +#include "strvec.h" +#include "quote.h" /* * Finds which of the given pathspecs match items in the index. @@ -436,8 +438,13 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags, } else { match = prefix_path_gently(prefix, prefixlen, &prefixlen, copyfrom); - if (!match) - die(_("%s: '%s' is outside repository"), elt, 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)); + } } item->match = match; @@ -613,6 +620,42 @@ 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 strvec parsed_file = STRVEC_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); + } + strvec_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.v); + strvec_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 1c18a2c90c..454ce364fa 100644 --- a/third_party/git/pathspec.h +++ b/third_party/git/pathspec.h @@ -22,6 +22,11 @@ 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; @@ -73,18 +78,56 @@ 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 62c472e0ce..10df990959 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 occoured, +the user. If no *_ASKPASS variable is set or an error occurred, the terminal is tried as a fallback. If C<ISPASSWORD> is set and true, the terminal disables echo. @@ -723,6 +723,32 @@ sub config_int { return scalar _config_common({'kind' => '--int'}, @_); } +=item config_regexp ( RE ) + +Retrieve the list of configuration key names matching the regular +expression C<RE>. The return value is a list of strings matching +this regex. + +=cut + +sub config_regexp { + my ($self, $regex) = _maybe_self(@_); + try { + my @cmd = ('config', '--name-only', '--get-regexp', $regex); + unshift @cmd, $self if $self; + my @matches = command(@cmd); + return @matches; + } catch Git::Error::Command with { + my $E = shift; + if ($E->value() == 1) { + my @matches = (); + return @matches; + } else { + throw $E; + } + }; +} + # Common subroutine to implement bulk of what the config* family of methods # do. This currently wraps command('config') so it is not so fast. sub _config_common { diff --git a/third_party/git/perl/Git/IndexInfo.pm b/third_party/git/perl/Git/IndexInfo.pm index a43108c985..2a7b4908f3 100644 --- a/third_party/git/perl/Git/IndexInfo.pm +++ b/third_party/git/perl/Git/IndexInfo.pm @@ -5,13 +5,15 @@ use Git qw/command_input_pipe command_close_pipe/; sub new { my ($class) = @_; + my $hash_algo = Git::config('extensions.objectformat') || 'sha1'; my ($gui, $ctx) = command_input_pipe(qw/update-index -z --index-info/); - bless { gui => $gui, ctx => $ctx, nr => 0}, $class; + bless { gui => $gui, ctx => $ctx, nr => 0, hash_algo => $hash_algo}, $class; } sub remove { my ($self, $path) = @_; - if (print { $self->{gui} } '0 ', 0 x 40, "\t", $path, "\0") { + my $length = $self->{hash_algo} eq 'sha256' ? 64 : 40; + if (print { $self->{gui} } '0 ', 0 x $length, "\t", $path, "\0") { return ++$self->{nr}; } undef; diff --git a/third_party/git/perl/Git/SVN.pm b/third_party/git/perl/Git/SVN.pm index 76b2965905..d1c352f92b 100644 --- a/third_party/git/perl/Git/SVN.pm +++ b/third_party/git/perl/Git/SVN.pm @@ -2,7 +2,7 @@ package Git::SVN; use strict; use warnings; use Fcntl qw/:DEFAULT :seek/; -use constant rev_map_fmt => 'NH40'; +use constant rev_map_fmt => 'NH*'; use vars qw/$_no_metadata $_repack $_repack_flags $_use_svm_props $_head $_use_svnsync_props $no_reuse_existing @@ -874,7 +874,7 @@ sub assert_index_clean { command_noisy('read-tree', $treeish) unless -e $self->{index}; my $x = command_oneline('write-tree'); my ($y) = (command(qw/cat-file commit/, $treeish) =~ - /^tree ($::sha1)/mo); + /^tree ($::oid)/mo); return if $y eq $x; warn "Index mismatch: $y != $x\nrereading $treeish\n"; @@ -1020,7 +1020,7 @@ sub do_git_commit { $tree = $self->tmp_index_do(sub { command_oneline('write-tree') }); } - die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o; + die "Tree is not a valid oid $tree\n" if $tree !~ /^$::oid$/o; my @exec = ('git', 'commit-tree', $tree); foreach ($self->get_commit_parents($log_entry)) { @@ -1048,8 +1048,8 @@ sub do_git_commit { close $out_fh or croak $!; waitpid $pid, 0; croak $? if $?; - if ($commit !~ /^$::sha1$/o) { - die "Failed to commit, invalid sha1: $commit\n"; + if ($commit !~ /^$::oid$/o) { + die "Failed to commit, invalid oid: $commit\n"; } $self->rev_map_set($log_entry->{revision}, $commit, 1); @@ -1491,6 +1491,10 @@ 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)'; } @@ -2083,10 +2087,10 @@ sub rebuild_from_rev_db { open my $fh, '<', $path or croak "open: $!"; binmode $fh or croak "binmode: $!"; while (<$fh>) { - length($_) == 41 or croak "inconsistent size in ($_) != 41"; + length($_) == $::oid_length + 1 or croak "inconsistent size in ($_)"; chomp($_); ++$r; - next if $_ eq ('0' x 40); + next if $_ eq ('0' x $::oid_length); $self->rev_map_set($r, $_); print "r$r = $_\n"; } @@ -2146,7 +2150,7 @@ sub rebuild { my $svn_uuid = $self->rewrite_uuid || $self->ra_uuid; my $c; while (<$log>) { - if ( m{^commit ($::sha1)$} ) { + if ( m{^commit ($::oid)$} ) { $c = $1; next; } @@ -2192,9 +2196,9 @@ sub rebuild { # (mainly tags) # # The format is this: -# - 24 bytes for every record, +# - 24 or 36 bytes for every record, # * 4 bytes for the integer representing an SVN revision number -# * 20 bytes representing the sha1 of a git commit +# * 20 or 32 bytes representing the oid of a git commit # - No empty padding records like the old format # (except the last record, which can be overwritten) # - new records are written append-only since SVN revision numbers @@ -2203,7 +2207,7 @@ sub rebuild { # - Piping the file to xxd -c24 is a good way of dumping it for # viewing or editing (piped back through xxd -r), should the need # ever arise. -# - The last record can be padding revision with an all-zero sha1 +# - The last record can be padding revision with an all-zero oid # This is used to optimize fetch performance when using multiple # "fetch" directives in .git/config # @@ -2211,38 +2215,39 @@ sub rebuild { sub _rev_map_set { my ($fh, $rev, $commit) = @_; + my $record_size = ($::oid_length / 2) + 4; binmode $fh or croak "binmode: $!"; my $size = (stat($fh))[7]; - ($size % 24) == 0 or croak "inconsistent size: $size"; + ($size % $record_size) == 0 or croak "inconsistent size: $size"; my $wr_offset = 0; if ($size > 0) { - sysseek($fh, -24, SEEK_END) or croak "seek: $!"; - my $read = sysread($fh, my $buf, 24) or croak "read: $!"; - $read == 24 or croak "read only $read bytes (!= 24)"; + sysseek($fh, -$record_size, SEEK_END) or croak "seek: $!"; + my $read = sysread($fh, my $buf, $record_size) or croak "read: $!"; + $read == $record_size or croak "read only $read bytes (!= $record_size)"; my ($last_rev, $last_commit) = unpack(rev_map_fmt, $buf); - if ($last_commit eq ('0' x40)) { - if ($size >= 48) { - sysseek($fh, -48, SEEK_END) or croak "seek: $!"; - $read = sysread($fh, $buf, 24) or + if ($last_commit eq ('0' x $::oid_length)) { + if ($size >= ($record_size * 2)) { + sysseek($fh, -($record_size * 2), SEEK_END) or croak "seek: $!"; + $read = sysread($fh, $buf, $record_size) or croak "read: $!"; - $read == 24 or - croak "read only $read bytes (!= 24)"; + $read == $record_size or + croak "read only $read bytes (!= $record_size)"; ($last_rev, $last_commit) = unpack(rev_map_fmt, $buf); - if ($last_commit eq ('0' x40)) { + if ($last_commit eq ('0' x $::oid_length)) { croak "inconsistent .rev_map\n"; } } if ($last_rev >= $rev) { croak "last_rev is higher!: $last_rev >= $rev"; } - $wr_offset = -24; + $wr_offset = -$record_size; } } sysseek($fh, $wr_offset, SEEK_END) or croak "seek: $!"; - syswrite($fh, pack(rev_map_fmt, $rev, $commit), 24) == 24 or + syswrite($fh, pack(rev_map_fmt, $rev, $commit), $record_size) == $record_size or croak "write: $!"; } @@ -2267,7 +2272,7 @@ sub mkfile { sub rev_map_set { my ($self, $rev, $commit, $update_ref, $uuid) = @_; defined $commit or die "missing arg3\n"; - length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n"; + $commit =~ /^$::oid$/ or die "arg3 must be a full hex object ID\n"; my $db = $self->map_path($uuid); my $db_lock = "$db.lock"; my $sigmask; @@ -2340,29 +2345,30 @@ sub rev_map_max { sub rev_map_max_norebuild { my ($self, $want_commit) = @_; + my $record_size = ($::oid_length / 2) + 4; my $map_path = $self->map_path; stat $map_path or return $want_commit ? (0, undef) : 0; sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!"; binmode $fh or croak "binmode: $!"; my $size = (stat($fh))[7]; - ($size % 24) == 0 or croak "inconsistent size: $size"; + ($size % $record_size) == 0 or croak "inconsistent size: $size"; if ($size == 0) { close $fh or croak "close: $!"; return $want_commit ? (0, undef) : 0; } - sysseek($fh, -24, SEEK_END) or croak "seek: $!"; - sysread($fh, my $buf, 24) == 24 or croak "read: $!"; + sysseek($fh, -$record_size, SEEK_END) or croak "seek: $!"; + sysread($fh, my $buf, $record_size) == $record_size or croak "read: $!"; my ($r, $c) = unpack(rev_map_fmt, $buf); - if ($want_commit && $c eq ('0' x40)) { - if ($size < 48) { + if ($want_commit && $c eq ('0' x $::oid_length)) { + if ($size < $record_size * 2) { return $want_commit ? (0, undef) : 0; } - sysseek($fh, -48, SEEK_END) or croak "seek: $!"; - sysread($fh, $buf, 24) == 24 or croak "read: $!"; + sysseek($fh, -($record_size * 2), SEEK_END) or croak "seek: $!"; + sysread($fh, $buf, $record_size) == $record_size or croak "read: $!"; ($r, $c) = unpack(rev_map_fmt, $buf); - if ($c eq ('0'x40)) { + if ($c eq ('0' x $::oid_length)) { croak "Penultimate record is all-zeroes in $map_path"; } } @@ -2383,30 +2389,31 @@ sub rev_map_get { sub _rev_map_get { my ($fh, $rev) = @_; + my $record_size = ($::oid_length / 2) + 4; binmode $fh or croak "binmode: $!"; my $size = (stat($fh))[7]; - ($size % 24) == 0 or croak "inconsistent size: $size"; + ($size % $record_size) == 0 or croak "inconsistent size: $size"; if ($size == 0) { return undef; } - my ($l, $u) = (0, $size - 24); + my ($l, $u) = (0, $size - $record_size); my ($r, $c, $buf); while ($l <= $u) { - my $i = int(($l/24 + $u/24) / 2) * 24; + my $i = int(($l/$record_size + $u/$record_size) / 2) * $record_size; sysseek($fh, $i, SEEK_SET) or croak "seek: $!"; - sysread($fh, my $buf, 24) == 24 or croak "read: $!"; + sysread($fh, my $buf, $record_size) == $record_size or croak "read: $!"; my ($r, $c) = unpack(rev_map_fmt, $buf); if ($r < $rev) { - $l = $i + 24; + $l = $i + $record_size; } elsif ($r > $rev) { - $u = $i - 24; + $u = $i - $record_size; } else { # $r == $rev - return $c eq ('0' x 40) ? undef : $c; + return $c eq ('0' x $::oid_length) ? undef : $c; } } undef; diff --git a/third_party/git/perl/Git/SVN/Editor.pm b/third_party/git/perl/Git/SVN/Editor.pm index 0df16ed726..c961444d4c 100644 --- a/third_party/git/perl/Git/SVN/Editor.pm +++ b/third_party/git/perl/Git/SVN/Editor.pm @@ -63,7 +63,7 @@ sub generate_diff { my @mods; while (defined($_ = get_record($diff_fh, "\0"))) { if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s - ($::sha1)\s($::sha1)\s + ($::oid)\s($::oid)\s ([MTCRAD])\d*$/xo) { push @mods, { mode_a => $1, mode_b => $2, sha1_a => $3, sha1_b => $4, @@ -400,12 +400,12 @@ sub T { ($m->{mode_b} !~ /^120/ && $m->{mode_a} =~ /^120/)) { $self->D({ mode_a => $m->{mode_a}, mode_b => '000000', - sha1_a => $m->{sha1_a}, sha1_b => '0' x 40, + sha1_a => $m->{sha1_a}, sha1_b => '0' x $::oid_length, chg => 'D', file_b => $m->{file_b} }, $deletions); $self->A({ mode_a => '000000', mode_b => $m->{mode_b}, - sha1_a => '0' x 40, sha1_b => $m->{sha1_b}, + sha1_a => '0' x $::oid_length, sha1_b => $m->{sha1_b}, chg => 'A', file_b => $m->{file_b} }, $deletions); return; @@ -434,7 +434,7 @@ sub _chg_file_get_blob ($$$$) { $self->change_file_prop($fbat,'svn:special',undef); } my $blob = $m->{"sha1_$which"}; - return ($fh,) if ($blob =~ /^0{40}$/); + return ($fh,) if ($blob =~ /^0+$/); my $size = $::_repository->cat_blob($blob, $fh); croak "Failed to read object $blob" if ($size < 0); $fh->flush == 0 or croak $!; diff --git a/third_party/git/perl/Git/SVN/Fetcher.pm b/third_party/git/perl/Git/SVN/Fetcher.pm index 64e900a0e9..729e5337df 100644 --- a/third_party/git/perl/Git/SVN/Fetcher.pm +++ b/third_party/git/perl/Git/SVN/Fetcher.pm @@ -173,7 +173,7 @@ sub delete_entry { # remove entire directories. my ($tree) = (command('ls-tree', '-z', $self->{c}, "./$gpath") - =~ /\A040000 tree ([a-f\d]{40})\t\Q$gpath\E\0/); + =~ /\A040000 tree ($::oid)\t\Q$gpath\E\0/); if ($tree) { my ($ls, $ctx) = command_output_pipe(qw/ls-tree -r --name-only -z/, @@ -203,7 +203,7 @@ sub open_file { my $gpath = $self->git_path($path); ($mode, $blob) = (command('ls-tree', '-z', $self->{c}, "./$gpath") - =~ /\A(\d{6}) blob ([a-f\d]{40})\t\Q$gpath\E\0/); + =~ /\A(\d{6}) blob ($::oid)\t\Q$gpath\E\0/); unless (defined $mode && defined $blob) { die "$path was not found in commit $self->{c} (r$rev)\n"; } @@ -413,7 +413,7 @@ sub close_file { $hash = $::_repository->hash_and_insert_object( Git::temp_path($fh)); - $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n"; + $hash =~ /^$::oid$/ or die "not an object ID: $hash\n"; Git::temp_release($fb->{base}, 1); Git::temp_release($fh, 1); diff --git a/third_party/git/perl/Git/SVN/Log.pm b/third_party/git/perl/Git/SVN/Log.pm index 664105357c..3858fcf27d 100644 --- a/third_party/git/perl/Git/SVN/Log.pm +++ b/third_party/git/perl/Git/SVN/Log.pm @@ -285,7 +285,7 @@ sub cmd_show_log { my (@k, $c, $d, $stat); my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/; while (<$log>) { - if (/^${esc_color}commit (?:- )?($::sha1_short)/o) { + if (/^${esc_color}commit (?:- )?($::oid_short)/o) { my $cmt = $1; if ($c && cmt_showable($c) && $c->{r} != $r_last) { $r_last = $c->{r}; diff --git a/third_party/git/perl/Git/SVN/Ra.pm b/third_party/git/perl/Git/SVN/Ra.pm index 56ad9870bc..2cfe055a9a 100644 --- a/third_party/git/perl/Git/SVN/Ra.pm +++ b/third_party/git/perl/Git/SVN/Ra.pm @@ -486,11 +486,11 @@ sub gs_fetch_loop_common { $reload_ra->() if $ra_invalid; } # pre-fill the .rev_db since it'll eventually get filled in - # with '0' x40 if something new gets committed + # with '0' x $oid_length if something new gets committed foreach my $gs (@$gsv) { next if $gs->rev_map_max >= $max; next if defined $gs->rev_map_get($max); - $gs->rev_map_set($max, 0 x40); + $gs->rev_map_set($max, 0 x $::oid_length); } foreach my $g (@$globs) { my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev"; diff --git a/third_party/git/pkt-line.c b/third_party/git/pkt-line.c index a0e87b1e81..844c253ccd 100644 --- a/third_party/git/pkt-line.c +++ b/third_party/git/pkt-line.c @@ -99,6 +99,13 @@ void packet_delim(int fd) die_errno(_("unable to write delim packet")); } +void packet_response_end(int fd) +{ + packet_trace("0002", 4, 1); + if (write_in_full(fd, "0002", 4) < 0) + die_errno(_("unable to write stateless separator packet")); +} + int packet_flush_gently(int fd) { packet_trace("0000", 4, 1); @@ -306,10 +313,10 @@ static int get_packet_data(int fd, char **src_buf, size_t *src_size, return ret; } -static int packet_length(const char *linelen) +int packet_length(const char lenbuf_hex[4]) { - int val = hex2chr(linelen); - return (val < 0) ? val : (val << 8) | hex2chr(linelen + 2); + int val = hex2chr(lenbuf_hex); + return (val < 0) ? val : (val << 8) | hex2chr(lenbuf_hex + 2); } enum packet_read_status packet_read_with_status(int fd, char **src_buffer, @@ -337,6 +344,10 @@ enum packet_read_status packet_read_with_status(int fd, char **src_buffer, packet_trace("0001", 4, 0); *pktlen = 0; return PACKET_READ_DELIM; + } else if (len == 2) { + packet_trace("0002", 4, 0); + *pktlen = 0; + return PACKET_READ_RESPONSE_END; } else if (len < 4) { die(_("protocol error: bad line length %d"), len); } @@ -479,6 +490,7 @@ void packet_reader_init(struct packet_reader *reader, int fd, reader->buffer_size = sizeof(packet_buffer); reader->options = options; reader->me = "git"; + reader->hash_algo = &hash_algos[GIT_HASH_SHA1]; } enum packet_read_status packet_reader_read(struct packet_reader *reader) diff --git a/third_party/git/pkt-line.h b/third_party/git/pkt-line.h index 5c62015db4..8c90daa59e 100644 --- a/third_party/git/pkt-line.h +++ b/third_party/git/pkt-line.h @@ -22,6 +22,7 @@ */ void packet_flush(int fd); void packet_delim(int fd); +void packet_response_end(int fd); void packet_write_fmt(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3))); void packet_buf_flush(struct strbuf *buf); void packet_buf_delim(struct strbuf *buf); @@ -75,9 +76,18 @@ int packet_read(int fd, char **src_buffer, size_t *src_len, char *buffer, unsigned size, int options); /* + * Convert a four hex digit packet line length header into its numeric + * representation. + * + * If lenbuf_hex contains non-hex characters, return -1. Otherwise, return the + * numeric value of the length header. + */ +int packet_length(const char lenbuf_hex[4]); + +/* * 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 assigined to *pktlen if the status of the + * The number of bytes read will be assigned to *pktlen if the status of the * read was 'PACKET_READ_NORMAL'. */ enum packet_read_status { @@ -85,6 +95,7 @@ enum packet_read_status { PACKET_READ_NORMAL, PACKET_READ_FLUSH, PACKET_READ_DELIM, + PACKET_READ_RESPONSE_END, }; enum packet_read_status packet_read_with_status(int fd, char **src_buffer, size_t *src_len, char *buffer, @@ -166,6 +177,9 @@ struct packet_reader { unsigned use_sideband : 1; const char *me; + + /* hash algorithm in use */ + const struct git_hash_algo *hash_algo; }; /* diff --git a/third_party/git/po/TEAMS b/third_party/git/po/TEAMS index 00472a4713..2fc21adc9a 100644 --- a/third_party/git/po/TEAMS +++ b/third_party/git/po/TEAMS @@ -43,9 +43,8 @@ Members: Changwoo Ryu <cwryu@debian.org> Sihyeon Jang <uneedsihyeon@gmail.com> Language: pt_PT (Portuguese - Portugal) -Repository: https://github.com/vascool/git-po-pt/ -Leader: Vasco Almeida <vascomalmeida@sapo.pt> -Members: Marco Sousa <marcomsousa AT gmail.com> +Repository: https://github.com/git-l10n-pt-PT/git-po/ +Leader: Daniel Santos <hello@brighterdan.com> Language: ru (Russian) Repository: https://github.com/DJm00n/git-po-ru/ @@ -56,6 +55,10 @@ 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> @@ -67,3 +70,8 @@ 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 e1d10db688..c2af08224f 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 Alexander Shopov <ash@kambanaria.org>. +# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020 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. +# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020. # # ======================== # DICTIONARY TO MERGE IN GIT GUI @@ -31,7 +31,7 @@ # am ะฟัะธะปะฐะณะฐะผ ะฟะพัะตะดะธัะฐ ะพั ะบััะฟะบะธ # working directory/tree โ ะฒะธะฝะฐะณะธ ัะฐะฑะพัะฝะพ ะดััะฒะพ, git ัะปะตะดะธ ััะปะพัะพ ะดััะฒะพ, ะฐ ะฝะต ะดะธัะตะบัะพัะธะธ, ัะฐะฑะพัะฝะฐ ะดะธัะตะบัะพัะธั ะทะฐ cwd # switch to branch ะฟัะตะผะธะฝะฐะฒะฐะผ ะบัะผ ะบะปะพะฝ -# sparse entry ัะฐััะธัะฝะพ ะธะทัะตะณะปะตะฝะฐ ะดะธัะตะบัะพัะธั/ะฟัั +# sparse entry/blob ัะฐััะธัะฝะพ ะธะทัะตะณะปะตะฝะฐ ะดะธัะตะบัะพัะธั/ะฟัั/ะพะฑะตะบั-BLOB # revision range ะดะธะฐะฟะฐะทะพะฝ ะฝะฐ ะฒะตััะธะธัะต # cover letter ะฟัะธะดััะถะฐะฒะฐัะพ ะฟะธัะผะพ # reference repository ะตัะฐะปะพะฝะฝะพ ั ัะฐะฝะธะปะธัะต @@ -133,12 +133,21 @@ # hash ะบะพะฝััะพะปะฝะฐ ััะผะฐ, ะธะทัะธัะปัะฒะฐะฝะต ะฝะฐ ะบะพะฝััะพะปะฝะฐ ััะผะฐ # fanout ะพัะบัั (ัะฐะทะฟะตัะฒะฐะฝะต???) # idx - index of pack file, 1 index per 1 packfile -# midx - multi-pack index, for objects across multiple packfiles +# midx, multi-pack index - ัะฐะนะป ั ะธะฝะดะตะบัะฐ ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ # overlay mode - ะฟัะธะฟะพะบัะธะฒะฐั ัะตะถะธะผ (ะฟัะธ ะธะทัะตะณะปัะฝe) # incremental file ะฝะฐัะฐััะฒะฐั ัะฐะนะป # split (commit-graphr) ัะฐะทะดัะพะฑะตะฝ (ะณัะฐั ั ะฟะพะดะฐะฒะฐะฝะธั) # clobber (a tag) ะฟัะตะทะฐะฟะธัะฒะฐะผ (ะตัะธะบะตั) # blame ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐะฒัะพัััะฒะพ +# refname ะธะผะต ะฝะฐ ัะบะฐะทะฐัะตะป +# cone pattern matching ะฟััะตะฒะพะดะฝะพ ะฝะฐะฟะฐัะฒะฐะฝะต +# negative pattern ะพััะธัะฐัะตะปะตะฝ ัะฐะฑะปะพะฝ +# colored hunk/diff ะพัะฒะตัะตะฝะพ ะฟะฐััะต/ัะฐะทะปะธะบะฐ +# up to date ะพะฑะฝะพะฒะตะฝ, ะพัะฒะตะฝ ะบะฐัะพ ัะฐะผะพััะพัะตะปะฒะฐ ะดัะผะฐ - ะฐะบััะฐะปะตะฝ ะธะปะธ completely up to date - ะฝะฐะฟัะปะฝะพ ะฐะบััะฐะปะตะฝ +# stateless ะฑะตะท ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ััััะพัะฝะธะตัะพ +# end packet ะฟะฐะบะตั ะทะฐ ะบัะฐะน +# identity ัะฐะผะพะปะธัะฝะพัั, ะธะฝัะพัะผะฐัะธั ะทะฐ +# boundary commit ะณัะฐะฝะธัะฝะพ ะฟะพะดะฐะฒะฐะฝะต # ------------------------ # โ$varโ - ะผะพะถะต ะดะฐ ะฝะต ััะฐะฑะพัะฒะฐ ะทะฐ shell ะธะผะฐ gettext ะธ eval_gettext - ะฟัะพะฒะตัะบะฐ - ะฝะฐะผะธัะฐั ัะต ะปะตัะฝะพ ะฟะพ โ$ # ------------------------ @@ -155,10 +164,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.22\n" +"Project-Id-Version: git 2.29\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-08-10 12:25+0300\n" -"PO-Revision-Date: 2019-08-10 12:33+0300\n" +"POT-Creation-Date: 2020-10-10 09:32+0800\n" +"PO-Revision-Date: 2020-10-11 15:00+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -167,37 +176,787 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:109 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "ะะตััะฟะตัะตะฝ ะฐะฝะฐะปะธะท โ โ%sโ." + +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +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 reset.c:89 sequencer.c:3444 +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:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, 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:1738 git-add--interactive.perl:1371 +#, c-format +msgid "Only binary files changed.\n" +msgstr "ะกะฐะผะพ ะดะฒะพะธัะฝะธ ัะฐะนะปะพะฒะต ัะฐ ะฟัะพะผะตะฝะตะฝะธ.\n" + +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "ะัะผะฐ ะฟัะพะผะตะฝะธ.\n" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "ะะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะบััะฟะบะฐ" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +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:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "โโโ ะะพะผะฐะฝะดะธ โโโ" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +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:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: 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:781 git-add--interactive.perl:1805 +#, c-format +msgid "Bye.\n" +msgstr "ะะทั ะพะด.\n" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "ะะพะฑะฐะฒัะฝะต ะฝะฐ ะฟัะพะผัะฝะฐัะฐ ะฝะฐ ะฟัะฐะฒะฐัะฐ ะทะฐ ะดะพัััะฟ [y,n,q,a,d%s,?]? " + +#: add-patch.c:35 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "ะะพะฑะฐะฒัะฝะต ะฝะฐ ะธะทััะธะฒะฐะฝะตัะพ [y,n,q,a,d%s,?]? " + +#: add-patch.c:36 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "ะะพะฑะฐะฒัะฝะต ะฝะฐ ะดะพะฑะฐะฒัะฝะตัะพ [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "ะะพะฑะฐะฒัะฝะต ะฝะฐ ัะพะฒะฐ ะฟะฐััะต [y,n,q,a,d%s,?]? " + +#: add-patch.c:39 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" +"ะะบะพ ะบััะฟะบะฐัะฐ ะผะพะถะต ะดะฐ ัะต ะฟัะธะปะพะถะธ ัะธััะพ, ัะตะดะฐะบัะธัะฐะฝะพัะพ ะฟะฐััะต ัะต ะฑัะดะต ะฝะตะทะฐะฑะฐะฒะฝะพ " +"ะดะพะฑะฐะฒะตะฝะพ ะบัะผ ะธะฝะดะตะบัะฐ." + +#: add-patch.c:42 +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:56 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "ะกะบะฐัะฐะฒะฐะฝะต ะฝะฐ ะฟัะพะผัะฝะฐัะฐ ะฝะฐ ะฟัะฐะฒะฐัะฐ ะทะฐ ะดะพัััะฟ [y,n,q,a,d%s,?]? " + +#: add-patch.c:57 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "ะกะบะฐัะฐะฒะฐะฝะต ะฝะฐ ะธะทััะธะฒะฐะฝะตัะพ [y,n,q,a,d%s,?]? " + +#: add-patch.c:58 git-add--interactive.perl:1441 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "ะกะบะฐัะฐะฒะฐะฝะต ะฝะฐ ะดะพะฑะฐะฒัะฝะตัะพ [y,n,q,a,d%s,?]? " + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "ะกะบะฐัะฐะฒะฐะฝะต ะฝะฐ ัะพะฒะฐ ะฟะฐััะต [y,n,q,a,d%s,?]? " + +#: add-patch.c:61 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" +"ะะบะพ ะบััะฟะบะฐัะฐ ะผะพะถะต ะดะฐ ัะต ะฟัะธะปะพะถะธ ัะธััะพ, ัะตะดะฐะบัะธัะฐะฝะพัะพ ะฟะฐััะต ัะต ะฑัะดะต ะฝะตะทะฐะฑะฐะฒะฝะพ " +"ัะบััะฐะฝะพ." + +#: add-patch.c:64 +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:80 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "ะะทะฒะฐะถะดะฐะฝะต ะฝะฐ ะฟัะพะผัะฝะฐัะฐ ะฝะฐ ะฟัะฐะฒะฐัะฐ ะทะฐ ะดะพัััะฟ [y,n,q,a,d%s,?]? " + +#: add-patch.c:81 git-add--interactive.perl:1446 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "ะะทะฒะฐะถะดะฐะฝะต ะฝะฐ ะธะทััะธะฒะฐะฝะตัะพ [y,n,q,a,d%s,?]? " + +#: add-patch.c:82 git-add--interactive.perl:1447 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "ะะทะฒะฐะถะดะฐะฝะต ะฝะฐ ะดะพะฑะฐะฒัะฝะตัะพ [y,n,q,a,d%s,?]? " + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "ะะทะฒะฐะถะดะฐะฝะต ะฝะฐ ัะพะฒะฐ ะฟะฐััะต [y,n,q,a,d%s,?]? " + +#: add-patch.c:85 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" +"ะะบะพ ะบััะฟะบะฐัะฐ ะผะพะถะต ะดะฐ ัะต ะฟัะธะปะพะถะธ ัะธััะพ, ัะตะดะฐะบัะธัะฐะฝะพัะพ ะฟะฐััะต ัะต ะฑัะดะต ะฝะตะทะฐะฑะฐะฒะฝะพ " +"ะธะทะฒะฐะดะตะฝะพ ะพั ะธะฝะดะตะบัะฐ." + +#: add-patch.c:88 +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:103 git-add--interactive.perl:1451 +#, 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:104 git-add--interactive.perl:1452 +#, 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:105 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "ะัะธะปะฐะณะฐะฝะต ะฝะฐ ะดะพะฑะฐะฒัะฝะตัะพ ะบัะผ ะธะฝะดะตะบัะฐ [y,n,q,a,d%s,?]? " + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, 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:108 add-patch.c:176 add-patch.c:221 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" +"ะะบะพ ะบััะฟะบะฐัะฐ ะผะพะถะต ะดะฐ ัะต ะฟัะธะปะพะถะธ ัะธััะพ, ัะตะดะฐะบัะธัะฐะฝะพัะพ ะฟะฐััะต ัะต ะฑัะดะต ะฝะตะทะฐะฑะฐะฒะฝะพ " +"ะฝะฐะฑะตะปัะทะฐะฝะพ ะทะฐ ะฟัะธะปะฐะณะฐะฝะต." + +#: add-patch.c:111 +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:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, 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:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, 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:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "ะัะตะผะฐั ะฒะฐะฝะต ะฝะฐ ะดะพะฑะฐะฒัะฝะตัะพ ะพั ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ [y,n,q,a,d%s,?]? " + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, 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:131 add-patch.c:154 add-patch.c:199 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" +"ะะบะพ ะบััะฟะบะฐัะฐ ะผะพะถะต ะดะฐ ัะต ะฟัะธะปะพะถะธ ัะธััะพ, ัะตะดะฐะบัะธัะฐะฝะพัะพ ะฟะฐััะต ัะต ะฑัะดะต ะฝะตะทะฐะฑะฐะฒะฝะพ " +"ะฝะฐะฑะตะปัะทะฐะฝะพ ะทะฐ ะทะฐะฝัะปัะฒะฐะฝะต." + +#: add-patch.c:134 add-patch.c:202 +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:149 add-patch.c:194 git-add--interactive.perl:1463 +#, 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:150 add-patch.c:195 git-add--interactive.perl:1464 +#, 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:151 add-patch.c:196 git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"ะัะตะผะฐั ะฒะฐะฝะต ะฝะฐ ะดะพะฑะฐะฒัะฝะตัะพ ะพั ะธะฝะดะตะบัะฐ ะธ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ [y,n,q,a,d%s,?]? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, 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:157 +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:171 add-patch.c:216 git-add--interactive.perl:1469 +#, 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:172 add-patch.c:217 git-add--interactive.perl:1470 +#, 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:173 add-patch.c:218 git-add--interactive.perl:1471 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "ะัะธะปะฐะณะฐะฝะต ะฝะฐ ะดะพะฑะฐะฒัะฝะตัะพ ะพั ะธะฝะดะตะบัะฐ ะธ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ [y,n,q,a,d%s,?]? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, 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:179 +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:224 +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:342 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะฝะฐ ะฟะฐััะตัะพ โ%.*sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" + +#: add-patch.c:361 add-patch.c:365 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะฝะฐ ะพัะฒะตัะตะฝะพัะพ ะฟะฐััะต โ%.*sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" + +#: add-patch.c:419 +msgid "could not parse diff" +msgstr "ัะฐะทะปะธะบะฐัะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" + +#: add-patch.c:438 +msgid "could not parse colored diff" +msgstr "ะพัะฒะตัะตะฝะฐัะฐ ัะฐะทะปะธะบะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" + +#: add-patch.c:452 +#, c-format +msgid "failed to run '%s'" +msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โ%sโ" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "ะธะทั ะพะดัั ะพั โinteractive.diffFilterโ ะฝะต ะฝะฐะฟะฐัะฒะฐ" + +#: add-patch.c:612 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" +"ะะฑัะฐะฑะพัะตะฝะธัะต ัะตะดะพะฒะต ะฝะฐ ะธะทั ะพะดะฐ ะฝะฐ ะฟะพะปะทะฒะฐะฝะธั ัะธะปััั, ัััะฑะฒะฐ\n" +"ะดะฐ ัะต ะพัะฝะฐััั ะตะดะฝะพ ะบัะผ ะตะดะฝะพ ัะฟััะผะพ ัะตะดะพะฒะตัะต ะฝะฐ ะฒั ะพะดะฐ." + +#: add-patch.c:785 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"ะพัะฐะบะฒะฐ ัะต ัะตะด โ%d ะพั ะบะพะฝัะตะบััะฐ ะฒ\n" +"%.*s" + +#: add-patch.c:800 +#, 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:1076 git-add--interactive.perl:1117 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "ะ ััะฝะพ ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ะฟะฐััะตัะฐ ะบะพะด โ ะพัะดะพะปั ะธะผะฐ ะฟะพะดัะบะฐะทะบะฐ.\n" + +#: add-patch.c:1080 +#, 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:1094 git-add--interactive.perl:1131 +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:1127 +msgid "could not parse hunk header" +msgstr "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะฟะฐััะตัะพ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" + +#: add-patch.c:1172 +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:1241 git-add--interactive.perl:1244 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"ะ ะตะดะฐะบัะธัะฐะฝะพัะพ ะฟะฐััะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะธะปะพะถะธ. ะะฐ ัะต ะฟัะพะดัะปะถะธ ะปะธ ั " +"ัะตะดะฐะบัะธัะฐะฝะตัะพ? (ัะตะบััะธัะต ัะตะดะฐะบัะธะธ ัะต ัะต ะพัะผะตะฝัั ะฟัะธ ะพัะบะฐะท!): โyโ (ะดะฐ)/ " +"โnโ (ะฝะต)? " + +#: add-patch.c:1284 +msgid "The selected hunks do not apply to the index!" +msgstr "ะะทะฑัะฐะฝะธัะต ะฟะฐััะตัะฐ ะฝะต ะผะพะณะฐั ะดะฐ ัะต ะดะพะฑะฐะฒัั ะฒ ะธะฝะดะตะบัะฐ!" + +#: add-patch.c:1285 git-add--interactive.perl:1348 +msgid "Apply them to the worktree anyway? " +msgstr "ะะฐ ัะต ะฟัะธะปะพะถะฐั ะปะธ ะบัะผ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ? " + +#: add-patch.c:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "ะะธัะพ ะฝะต ะต ะฟัะธะปะพะถะตะฝะพ.\n" + +#: add-patch.c:1349 +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:1511 add-patch.c:1521 +msgid "No previous hunk" +msgstr "ะัะผะฐ ะดััะณะพ ะฟะฐััะต ะฟัะตะดะธ ัะพะฒะฐ" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No next hunk" +msgstr "ะัะผะฐ ะดััะณะพ ะฟะฐััะต ัะปะตะด ัะพะฒะฐ" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "ะัะผะฐ ะดััะณะธ ะฟะฐััะตัะฐ" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "ะบัะผ ะบะพะต ะฟะฐััะต ะดะฐ ัะต ะฟัะธะดะฒะธะถะธ (ะทะฐ ะฟะพะฒะตัะต ะฒะฐัะธะฐะฝัะธ ะฝะฐัะธัะฝะตัะต โenterโ)? " + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "ะบัะผ ะบะพะต ะฟะฐััะต ะดะฐ ัะต ะฟัะธะดะฒะธะถะธ? " + +#: add-patch.c:1555 +#, c-format +msgid "Invalid number: '%s'" +msgstr "ะะตะฟัะฐะฒะธะปะตะฝ ะฝะพะผะตั: โ%sโ" + +#: add-patch.c:1560 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "ะะผะฐ ัะฐะผะพ %d ะฟะฐััะต." +msgstr[1] "ะะผะฐ ัะฐะผะพ %d ะฟะฐััะตัะฐ." + +#: add-patch.c:1569 +msgid "No other hunks to search" +msgstr "ะัะผะฐ ะดััะณะธ ะฟะฐััะตัะฐ ะทะฐ ััััะตะฝะต" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "ะดะฐ ัะต ััััะธ ั ัะตะณัะปััะตะฝ ะธะทัะฐะท? " + +#: add-patch.c:1590 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "ะกะณัะตัะตะฝ ัะตะณัะปััะตะฝ ะธะทัะฐะท โ%sโ: %s" + +#: add-patch.c:1607 +msgid "No hunk matches the given pattern" +msgstr "ะะธะบะพะต ะฟะฐััะต ะฝะต ะฝะฐะฟะฐัะฒะฐ ะฝะฐ ัะตะณัะปััะฝะธั ะธะทัะฐะท" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "ะขะพะฒะฐ ะฟะฐััะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ัะฐะทะดะตะปะตะฝะพ" + +#: add-patch.c:1618 +#, c-format +msgid "Split into %d hunks." +msgstr "ะ ะฐะทะดะตะปัะฝะต ะฝะฐ %d ะฟะฐััะตัะฐ." + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "ะขะพะฒะฐ ะฟะฐััะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ัะตะดะฐะบัะธัะฐะฝะพ" + +#: add-patch.c:1674 +msgid "'git apply' failed" +msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โgit applyโ" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" +"\n" +"ะะฐ ะดะฐ ะธะทะบะปััะธัะต ัะพะฒะฐ ะฟัะตะดัะฟัะตะถะดะตะฝะธะต, ะธะทะฟัะปะฝะตัะต:\n" +" git config advice.%s false" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sะฟะพะดัะบะฐะทะบะฐ: %.*s%s\n" -#: advice.c:162 +#: advice.c:247 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "ะัะฑะธัะฐะฝะตัะพ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั ะต ะฑะปะพะบะธัะฐะฝะพ ะพั ะฝะตัะปะตัะธ ัะฐะนะปะพะฒะต." -#: advice.c:164 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "ะะพะดะฐะฒะฐะฝะตัะพ ะต ะฑะปะพะบะธัะฐะฝะพ ะพั ะฝะตัะปะตัะธ ัะฐะนะปะพะฒะต." -#: advice.c:166 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "ะกะปะธะฒะฐะฝะตัะพ ะต ะฑะปะพะบะธัะฐะฝะพ ะพั ะฝะตัะปะตัะธ ัะฐะนะปะพะฒะต." -#: advice.c:168 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "ะะทะดััะฟะฒะฐะฝะตัะพ ะต ะฑะปะพะบะธัะฐะฝะพ ะพั ะฝะตัะปะตัะธ ัะฐะนะปะพะฒะต." -#: advice.c:170 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "ะัะผัะฝะฐัะฐ ะต ะฑะปะพะบะธัะฐะฝะฐ ะพั ะฝะตัะปะตัะธ ัะฐะนะปะพะฒะต." -#: advice.c:172 +#: advice.c:257 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "ะะตะนััะฒะธะตัะพ โ%sโ ะต ะฑะปะพะบะธัะฐะฝะพ ะพั ะฝะตัะปะตัะธ ัะฐะนะปะพะฒะต." -#: advice.c:180 +#: advice.c:265 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." @@ -205,23 +964,23 @@ msgstr "" "ะ ะตะดะฐะบัะธัะฐะนัะต ะณะธ ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ, ะธ ัะพะณะฐะฒะฐ ะฟะพะปะทะฒะฐะนัะต โgit add/rm ะคะะะโ,\n" "ะทะฐ ะดะฐ ะพัะฑะตะปะตะถะธัะต ะบะพัะธะณะธัะฐะฝะตัะพ ะธะผ. ะกะปะตะด ัะพะฒะฐ ะธะทะฒัััะตัะต ะฟะพะดะฐะฒะฐะฝะตัะพ." -#: advice.c:188 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "ะะทั ะพะด ะพั ะฟัะพะณัะฐะผะฐัะฐ ะทะฐัะฐะดะธ ะฝะตะบะพัะธะณะธัะฐะฝ ะบะพะฝัะปะธะบั." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:278 builtin/merge.c:1349 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "ะะต ััะต ะทะฐะฒัััะธะปะธ ัะปะธะฒะฐะฝะต. (ะฃะบะฐะทะฐัะตะปัั โMERGE_HEADโ ัััะตััะฒัะฒะฐ)." -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "ะัะพะผะตะฝะธัะต ัััะฑะฒะฐ ะดะฐ ัะต ะฟะพะดะฐะดะฐั ะฟัะตะดะธ ัะปะธะฒะฐะฝะต." -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "ะะทั ะพะด ะพั ะฟัะพะณัะฐะผะฐัะฐ ะทะฐัะฐะดะธ ะฝะตะทะฐะฒัััะตะฝะพ ัะปะธะฒะฐะฝะต." -#: advice.c:202 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -262,7 +1021,7 @@ msgstr "" "\n" "ะะพะถะต ะดะฐ ัะฟัะตัะต ัะพะฒะฐ ััะพะฑัะตะฝะธะต ััั ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะฝะฐัััะพะนะบะฐัะฐ โadvice." "detachedHeadโ\n" -"ะดะฐ ะต โfalseโ.\n" +"ะดะฐ ะต โfalseโ (ะปัะถะฐฬ).\n" #: alias.c:50 msgid "cmdline ends with \\" @@ -355,17 +1114,7 @@ msgstr "ะณัะตัะตะฝ ัะตะถะธะผ ะฝะฐ ัะตะด โ%d: %s" msgid "inconsistent header lines %d and %d" msgstr "ะฝะตััะฒะผะตััะธะผะธ ะทะฐะณะปะฐะฒะฝะธ ัะฐััะธ ะฝะฐ ัะตะดะพะฒะต โ%d ะธ โ%d" -#: 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 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -380,71 +1129,81 @@ msgstr[1] "" "ะกะปะตะด ััะบัะฐัะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟััะฒะธัะต %d ัะฐััะธ ะพั ะบะพะผะฟะพะฝะตะฝัะธัะต ะฝะฐ ะฟััั, ะฒ ะทะฐะณะปะฐะฒะฝะฐัะฐ " "ัะฐัั ะฝะฐ โgit diffโ ะปะธะฟัะฒะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะธะผะต ะฝะฐ ัะฐะนะป (ัะตะด: %d)" -#: apply.c:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "ะฒ ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะฝะฐ โgit diffโ ะปะธะฟัะฒะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะธะผะต ะฝะฐ ัะฐะนะป (ัะตะด: %d)" -#: apply.c:1752 +#: 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 msgid "new file depends on old contents" msgstr "ะฝะพะฒะธัั ัะฐะนะป ะทะฐะฒะธัะธ ะพั ััะฐัะพัะพ ััะดััะถะฐะฝะธะต ะฝะฐ ัะฐะนะปะฐ" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "ะธะทััะธัะธัั ัะฐะนะป ะฝะต ะต ะฟัะฐะทะตะฝ" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "ะณัะตัะบะฐ ะฒ ะบััะฟะบะฐัะฐ ะฝะฐ ัะตะด %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "ะฝะพะฒะธัั ัะฐะนะป โ%sโ ะทะฐะฒะธัะธ ะพั ััะฐัะพัะพ ััะดััะถะฐะฝะธะต ะฝะฐ ัะฐะนะปะฐ" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "ะธะทััะธัะธัั ัะฐะนะป โ%sโ ะฝะต ะต ะฟัะฐะทะตะฝ" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "โ ะฟัะตะดัะฟัะตะถะดะตะฝะธะต: ัะฐะนะปัั โ%sโ ะฒะตัะต ะต ะฟัะฐะทะตะฝ, ะฝะพ ะฝะต ะต ะธะทััะธั" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "ะณัะตัะบะฐ ะฒ ะดะฒะพะธัะฝะฐัะฐ ะบััะฟะบะฐ ะฝะฐ ัะตะด %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "ะฝะตัะฐะทะฟะพะทะฝะฐัะฐ ะดะฒะพะธัะฝะฐัะฐ ะบััะฟะบะฐ ะฝะฐ ัะตะด %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "ะบััะฟะบะฐัะฐ ะต ั ะธะทััะปะพ ะฟะพะฒัะตะดะตะฝะธ ะดะฐะฝะฝะธ ะฝะฐ ัะตะด %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "ัะธะผะฒะพะปะฝะฐัะฐ ะฒััะทะบะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะฐ" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ ะธะปะธ ะฟัะพัะตัะตะฝ" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะฝะฐัะฐะปะพ ะฝะฐ ัะตะด: โ%cโ" -#: apply.c:3046 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -453,13 +1212,13 @@ msgstr[0] "" msgstr[1] "" "%d-ัะพ ะฟะฐััะต ะบะพะด ะฑะต ััะฟะตัะฝะพ ะฟัะธะปะพะถะตะฝะพ ะฝะฐ ัะตะด %d (ะพัะผะตััะฒะฐะฝะต ะพั %d ัะตะดะฐ)." -#: apply.c:3058 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" "ะะพะฝัะตะบัััั ะต ะฝะฐะผะฐะปะตะฝ ะฝะฐ (%ld/%ld) ะทะฐ ะฟัะธะปะฐะณะฐะฝะตัะพ ะฝะฐ ะฟะฐััะตัะพ ะบะพะด ะฝะฐ ัะตะด %d" -#: apply.c:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -468,317 +1227,312 @@ msgstr "" "ะฟัะธ ััััะตะฝะต ะทะฐ:\n" "%.*s" -#: apply.c:3086 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "ะปะธะฟัะฒะฐั ะดะฐะฝะฝะธัะต ะทะฐ ะดะฒะพะธัะฝะฐัะฐ ะบััะฟะบะฐ ะทะฐ โ%sโ" -#: apply.c:3094 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "ะดะฒะพะธัะฝะฐัะฐ ะบััะฟะบะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะธะปะพะถะธ ะฒ ะพะฑัะฐัะฝะฐ ะฟะพัะพะบะฐ, ะบะพะณะฐัะพ ะพะฑัะฐัะฝะพัะพ " "ะฟะฐััะต ะทะฐ โ%sโ ะปะธะฟัะฒะฐ" -#: apply.c:3141 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "ะบัะผ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะธะปะพะถะธ ะดะฒะพะธัะฝะฐ ะบััะฟะบะฐ ะฑะตะท ะฟัะปะตะฝ ะธะฝะดะตะบั" -#: apply.c:3151 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "ะบััะฟะบะฐัะฐ ััะพัะฒะตัััะฒะฐ ะฝะฐ โ%sโ (%s), ะบะพะนัะพ ะฝะต ััะฒะฟะฐะดะฐ ะฟะพ ััะดััะถะฐะฝะธะต." -#: apply.c:3159 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "ะบััะฟะบะฐัะฐ ััะพัะฒะตัััะฒะฐ ะฝะฐ โ%sโ, ะบะพะนัะพ ัััะฑะฒะฐ ะดะฐ ะต ะฟัะฐะทะตะฝ, ะฝะพ ะฝะต ะต" -#: apply.c:3177 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" "ะฝะตะพะฑั ะพะดะธะผะธัั ัะตะทัะปัะฐั ัะปะตะด ะพะฟะตัะฐัะธััะฐ โ โ%sโ ะทะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต " "ะฟัะพัะตัะตะฝ" -#: apply.c:3190 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "ะดะฒะพะธัะฝะฐัะฐ ะบััะฟะบะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะธะปะพะถะตะฝะฐ ะฒััั ั โ%sโ" -#: apply.c:3196 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "ะดะฒะพะธัะฝะฐัะฐ ะบััะฟะบะฐ ะทะฐ โ%sโ ะฒะพะดะธ ะดะพ ะฝะตะฟัะฐะฒะธะปะฝะธ ัะตะทัะปัะฐัะธ (ะพัะฐะบะฒะฐัะต ัะต: โ%sโ, ะฐ " "ะฑะต ะฟะพะปััะตะฝะพ: โ%sโ)" -#: apply.c:3217 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "ะฝะตััะฟะตัะฝะพ ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะบััะฟะบะฐ: โ%s:%ldโ" -#: apply.c:3340 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทัะตะณะปะธ" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 #, c-format msgid "failed to read %s" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: apply.c:3400 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "ะธะทัะธัะฐะฝะต ะฝะฐ โ%sโ ัะปะตะด ะฟัะพัะปะตะดัะฒะฐะฝะต ะฝะฐ ัะธะผะฒะพะปะฝะฐ ะฒััะทะบะฐ" -#: apply.c:3429 apply.c:3672 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "ะพะฑะตะบััั ั ะฟัั โ%sโ ะต ะฟัะตะธะผะตะฝัะฒะฐะฝ ะธะปะธ ะธะทััะธั" -#: apply.c:3515 apply.c:3687 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "โ%sโ ะฝะต ัััะตััะฒัะฒะฐ ะฒ ะธะฝะดะตะบัะฐ" -#: apply.c:3524 apply.c:3695 +#: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" msgstr "โ%sโ ะฝะต ััะพัะฒะตัััะฒะฐ ะฝะฐ ะธะฝะดะตะบัะฐ" -#: apply.c:3559 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "ะฒ ั ัะฐะฝะธะปะธัะตัะพ ะปะธะฟัะฒะฐั ะฝะตะพะฑั ะพะดะธะผะธัะต ะพะฑะตะบัะธ-BLOB, ะทะฐ ะดะฐ ัะต ะฟัะตะผะธะฝะต ะบัะผ ััะพะนะฝะพ " "ัะปะธะฒะฐะฝะต." -#: apply.c:3562 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "ะัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ ััะพะนะฝะพ ัะปะธะฒะฐะฝะตโฆ\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "ัะตะบััะพัะพ ััะดััะถะฐะฝะธะต ะฝะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะพ" -#: apply.c:3594 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "ะะตััะฟะตัะฝะพ ะฟัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ ััะพะนะฝะพ ัะปะธะฒะฐะฝะตโฆ\n" -#: apply.c:3608 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "ะะพะฝัะปะธะบัะธ ะฟัะธ ะฟัะธะปะฐะณะฐะฝะตัะพ ะฝะฐ ะบััะฟะบะฐัะฐ ะบัะผ โ%sโ.\n" -#: apply.c:3613 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "ะััะฟะบะฐัะฐ ะฑะต ะฟัะธะปะพะถะตะฝะฐ ัะธััะพ ะบัะผ โ%sโ.\n" -#: apply.c:3639 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "ะธะทััะธะฒะฐัะฐัะฐ ะบััะฟะบะฐ ะพััะฐะฒั ัะฐะนะปะฐ ะฝะตะฟัะฐะทะตะฝ" -#: apply.c:3712 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "โ%sโ: ะฝะตะฟัะฐะฒะธะปะตะฝ ะฒะธะด" -#: apply.c:3714 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "โ%sโ ะต ะพั ะฒะธะด โ%oโ, ะฐ ัะต ะพัะฐะบะฒะฐัะต โ%oโ" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟัั: โ%sโ" -#: apply.c:3923 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "โ%sโ: ะฒะตัะต ัััะตััะฒัะฒะฐ ะฒ ะธะฝะดะตะบัะฐ" -#: apply.c:3926 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "โ%sโ: ะฒะตัะต ัััะตััะฒัะฒะฐ ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: apply.c:3946 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "ะฝะพะฒะธัะต ะฟัะฐะฒะฐ ะทะฐ ะดะพัััะฟ (%o) ะฝะฐ โ%sโ ะฝะต ััะฒะฟะฐะดะฐั ััั ััะฐัะธัะต (%o)" -#: apply.c:3951 +#: apply.c:3981 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "ะฝะพะฒะธัะต ะฟัะฐะฒะฐ ะทะฐ ะดะพัััะฟ (%o) ะฝะฐ โ%sโ ะฝะต ััะฒะฟะฐะดะฐั ััั ััะฐัะธัะต (%o) ะฝะฐ โ%sโ" -#: apply.c:3971 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "ะทะฐัะตะณะฝะฐัะธัั ัะฐะนะป โ%sโ ะต ัะปะตะด ัะธะผะฒะพะปะฝะฐ ะฒััะทะบะฐ" -#: apply.c:3975 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "ะััะฟะบะฐัะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะธะปะพะถะตะฝะฐ" -#: apply.c:3990 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "ะัะพะฒะตััะฒะฐะฝะต ะฝะฐ ะบััะฟะบะฐัะฐ โ%sโโฆ" -#: apply.c:4082 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "ะธะฝัะพัะผะฐัะธััะฐ ะทะฐ ััะผะฐัะฐ ะฟะพ SHA1 ะทะฐ ะฟะพะดะผะพะดัะปะฐ ะปะธะฟัะฒะฐ ะธะปะธ ะฝะต ะต ะดะพััะฐัััะฝะฐ (%s)." -#: apply.c:4089 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "ัะผัะฝะฐ ะฝะฐ ัะตะถะธะผะฐ ะฝะฐ ะดะพัััะฟะฐ ะฝะฐ โ%sโ, ะบะพะนัะพ ะฝะต ะต ะฒ ัะตะบััะธั ะฒััั โHEADโ" -#: apply.c:4092 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "ะธะฝัะพัะผะฐัะธััะฐ ะทะฐ ััะผะฐัะฐ ะฟะพ SHA1 ะปะธะฟัะฒะฐ ะธะปะธ ะฝะต ะต ะดะพััะฐัััะฝะฐ (%s)." -#: 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 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพะฑะฐะฒะธ ะบัะผ ะฒัะตะผะตะฝะฝะธั ะธะฝะดะตะบั" -#: apply.c:4111 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "ะฒัะตะผะตะฝะฝะธัั ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะฐะทะธ ะฒ โ%sโ" -#: apply.c:4249 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒะฐะดะธ ะพั ะธะฝะดะตะบัะฐ" -#: apply.c:4283 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "ะฟะพะฒัะตะดะตะฝะฐ ะบััะฟะบะฐ ะทะฐ ะผะพะดัะปะฐ โ%sโ" -#: apply.c:4289 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปััะธ ะธะฝัะพัะผะฐัะธั ััะตะท โstatโ ะทะฐ ะฝะพะฒะพััะทะดะฐะดะตะฝะธั ัะฐะนะป โ%sโ" -#: apply.c:4297 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐ ััะทะดะฐะดะต ะผัััะพัะพ ะทะฐ ััั ัะฐะฝะตะฝะธะต ะฝะฐ ะฝะพะฒะพััะทะดะฐะดะตะฝะธั ัะฐะนะป โ%sโ" -#: apply.c:4303 apply.c:4448 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพะฑะฐะฒะธ ะทะฐะฟะธั ะฒ ะบะตัะฐ ะทะฐ โ%sโ" -#: apply.c:4346 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "ะฒ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะธัะต" -#: apply.c:4350 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "ะทะฐัะฒะฐััะฝะต ะฝะฐ ัะฐะนะปะฐ โ%sโ" -#: apply.c:4420 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัะต ั ัะตะถะธะผ ะฝะฐ ะดะพัััะฟ โ%oโ" -#: apply.c:4518 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "ะััะฟะบะฐัะฐ โ%sโ ะฑะต ะฟัะธะปะพะถะตะฝะฐ ัะธััะพ." -#: apply.c:4526 +#: apply.c:4556 msgid "internal error" msgstr "ะฒัััะตัะฝะฐ ะณัะตัะบะฐ" -#: apply.c:4529 +#: apply.c:4559 #, 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:4540 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "ััะบัะฐัะฐะฒะฐะฝะต ะฝะฐ ะธะผะตัะพ ะฝะฐ ัะฐะนะปะฐ ั ะพัั ะฒััะปะตะฝะธัะต ะฟะฐััะตัะฐ ะฝะฐ โ %.*s.rejโ" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ" -#: apply.c:4562 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "%d-ัะพ ะฟะฐััะต ะฑะต ััะฟะตัะฝะพ ะฟัะธะปะพะถะตะฝะพ." -#: apply.c:4566 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "%d-ัะพ ะฟะฐััะต ะฑะต ะพัั ะฒััะปะตะฝะพ." -#: apply.c:4676 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "ะัะพะฟััะฝะฐัะฐ ะบััะฟะบะฐ: โ%sโ" -#: apply.c:4684 +#: apply.c:4723 msgid "unrecognized input" msgstr "ะฝะตะฟะพะทะฝะฐั ะฒั ะพะด" -#: apply.c:4704 +#: apply.c:4743 msgid "unable to read index file" msgstr "ะธะฝะดะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" -#: apply.c:4859 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "ะบััะฟะบะฐัะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝะฐ: %s" -#: apply.c:4886 +#: apply.c:4927 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "ะฟัะตะฝะตะฑัะตะณะฝะฐัะฐ ะต %d ะณัะตัะบะฐ ะฒ ะทะฝะฐัะธัะต ะทะฐ ะธะฝัะตัะฒะฐะปะธ" msgstr[1] "ะฟัะตะฝะตะฑัะตะณะฝะฐัะธ ัะฐ %d ะณัะตัะบะธ ะฒ ะทะฝะฐัะธัะต ะทะฐ ะธะฝัะตัะฒะฐะปะธ" -#: apply.c:4892 apply.c:4907 +#: apply.c:4933 apply.c:4948 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ัะตะด ะดะพะฑะฐะฒั ะณัะตัะบะธ ะฒ ะทะฝะฐัะธัะต ะทะฐ ะธะฝัะตัะฒะฐะปะธ." msgstr[1] "%d ัะตะดะฐ ะดะพะฑะฐะฒัั ะณัะตัะบะธ ะฒ ะทะฝะฐัะธัะต ะทะฐ ะธะฝัะตัะฒะฐะปะธ." -#: apply.c:4900 +#: apply.c:4941 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -787,147 +1541,182 @@ msgstr[0] "" msgstr[1] "" "ะะพะฑะฐะฒะตะฝะธ ัะฐ %d ัะตะดะฐ ัะปะตะด ะบะพัะตะบัะธััะฐ ะฝะฐ ะณัะตัะบะธัะต ะฒ ะทะฝะฐัะธัะต ะทะฐ ะธะฝัะตัะฒะฐะปะธ." -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "ะะพะฒะธัั ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" -#: 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 +#: apply.c:4985 msgid "don't apply changes matching the given path" msgstr "ะฑะตะท ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต ะฝะฐะฟะฐัะฒะฐัะธ ะฝะฐ ะดะฐะดะตะฝะธั ะฟัั" -#: apply.c:4947 +#: apply.c:4988 msgid "apply changes matching the given path" msgstr "ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต ะฝะฐะฟะฐัะฒะฐัะธ ะฝะฐ ะดะฐะดะตะฝะธั ะฟัั" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "ะะ ะะ" -#: apply.c:4950 +#: apply.c:4991 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ะฟัะตะผะฐั ะฒะฐะฝะต ะฝะฐ ัะพะทะธ ะะ ะะ ะฒะพะดะตัะธ ะตะปะตะผะตะฝัะธ ะพั ะฟััะธัะฐัะฐ ะฒ ัะฐะทะปะธะบะฐัะฐ" -#: apply.c:4953 +#: apply.c:4994 msgid "ignore additions made by the patch" msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ัะตะดะพะฒะตัะต ะดะพะฑะฐะฒะตะฝะธ ะพั ัะฐะทะธ ะบััะฟะบะฐ" -#: apply.c:4955 +#: apply.c:4996 msgid "instead of applying the patch, output diffstat for the input" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะฐัะธััะธะบะฐ ะฝะฐ ะฟัะพะผะตะฝะธัะต ะฑะตะท ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะบััะฟะบะฐัะฐ" -#: apply.c:4959 +#: apply.c:5000 msgid "show number of added and deleted lines in decimal notation" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฑัะพั ะฝะฐ ะดะพะฑะฐะฒะตะฝะธัะต ะธ ะธะทััะธัะธัะต ัะตะดะพะฒะต" -#: apply.c:4961 +#: apply.c:5002 msgid "instead of applying the patch, output a summary for the input" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะฐัะธััะธะบะฐ ะฝะฐ ะฒั ะพะดะฝะธัะต ะดะฐะฝะฝะธ ะฑะตะท ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะบััะฟะบะฐัะฐ" -#: apply.c:4963 +#: apply.c:5004 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ะฟัะพะฒะตัะบะฐ ะดะฐะปะธ ะบััะฟะบะฐัะฐ ะผะพะถะต ะดะฐ ัะต ะฟัะธะปะพะถะธ, ะฑะตะท ะดะตะนััะฒะธัะตะปะฝะพ ะฟัะธะปะฐะณะฐะฝะต" -#: apply.c:4965 +#: apply.c:5006 msgid "make sure the patch is applicable to the current index" msgstr "ะฟัะพะฒะตัะบะฐ ะดะฐะปะธ ะบััะฟะบะฐัะฐ ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะธะปะพะถะตะฝะฐ ะบัะผ ัะตะบััะธั ะธะฝะดะตะบั" -#: apply.c:4967 +#: apply.c:5008 msgid "mark new files with `git add --intent-to-add`" msgstr "ะพัะฑะตะปัะทะฒะฐะฝะต ะฝะฐ ะฝะพะฒะธัะต ัะฐะนะปะพะฒะต ั โgit add --intent-to-addโ" -#: apply.c:4969 +#: apply.c:5010 msgid "apply a patch without touching the working tree" msgstr "ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะบััะฟะบะฐัะฐ ะฑะตะท ะฟัะพะผัะฝะฐ ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: apply.c:4971 +#: apply.c:5012 msgid "accept a patch that touches outside the working area" msgstr "ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะบััะฟะบะฐ, ะบะพััะพ ะฟัะพะผะตะฝั ะธ ัะฐะนะปะพะฒะต ะธะทะฒัะฝ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: apply.c:4974 +#: apply.c:5015 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "ะบััะฟะบะฐัะฐ ะดะฐ ะฑัะดะต ะฟัะธะปะพะถะตะฝะฐ. ะะฟัะธััะฐ ัะต ะบะพะผะฑะธะฝะธัะฐ ั โ--checkโ/โ--statโ/โ--" "summaryโ" -#: apply.c:4976 +#: apply.c:5017 msgid "attempt three-way merge if a patch does not apply" msgstr "ะฟัะพะฑะฒะฐะฝะต ั ััะพะนะฝะพ ัะปะธะฒะฐะฝะต, ะฐะบะพ ะบััะฟะบะฐัะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะธะปะพะถะธ ะดะธัะตะบัะฝะพ" -#: apply.c:4978 +#: apply.c:5019 msgid "build a temporary index based on embedded index information" msgstr "" "ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะฒัะตะผะตะฝะตะฝ ะธะฝะดะตะบั ะฝะฐ ะฑะฐะทะฐ ะฝะฐ ะฒะบะปััะตะฝะฐัะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะธะฝะดะตะบัะฐ" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "ัะฐะทะดะตะปัะฝะต ะฝะฐ ะฟััะธัะฐัะฐ ั ะฝัะปะตะฒะธั ะทะฝะฐะบ โNULโ" -#: apply.c:4983 +#: apply.c:5024 msgid "ensure at least <n> lines of context match" msgstr "ะดะฐ ัะต ะพัะธะณััะธ ะบะพะฝัะตะบัั ะพั ะฟะพะฝะต ัะฐะบัะฒ ะะ ะะ ััะฒะฟะฐะดะฐัะธ ัะตะดะพะฒะต" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "ะดะตะนััะฒะธะต" -#: apply.c:4985 +#: apply.c:5026 msgid "detect new or modified lines that have whitespace errors" msgstr "ะทะฐัะธัะฐะฝะต ะฝะฐ ะฝะพะฒะธ ะธะปะธ ะฟัะพะผะตะฝะตะฝะธ ัะตะดะพะฒะต ั ะณัะตัะบะธ ะฒ ะทะฝะฐัะธัะต ะทะฐ ะธะฝัะตัะฒะฐะปะธ" -#: apply.c:4988 apply.c:4991 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" msgstr "" "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต ะฒ ะทะฝะฐัะธัะต ะทะฐ ะธะฝัะตัะฒะฐะปะธ ะฟัะธ ะพัะบัะธะฒะฐะฝะต ะฝะฐ ะบะพะฝัะตะบััะฐ" -#: apply.c:4994 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะบััะฟะบะฐัะฐ ะฒ ะพะฑัะฐัะฝะฐ ะฟะพัะพะบะฐ" -#: apply.c:4996 +#: apply.c:5037 msgid "don't expect at least one line of context" msgstr "ะฑะตะท ะธะทะธัะบะฒะฐะฝะต ะฝะฐ ะดะพัะธ ะธ ะตะดะธะฝ ัะตะด ะบะพะฝัะตะบัั" -#: apply.c:4998 +#: apply.c:5039 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "ะพััะฐะฒัะฝะต ะฝะฐ ะพัั ะฒััะปะตะฝะธัะต ะฟะฐััะตัะฐ ะฒัะฒ ัะฐะนะปะพะฒะต ั ัะฐะทัะธัะตะฝะธะต โ.rejโ" -#: apply.c:5000 +#: apply.c:5041 msgid "allow overlapping hunks" msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะทะฐัััะฟะฒะฐัะธ ัะต ะฟะฐััะตัะฐ" -#: 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 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ะฟะพะฒะตัะต ะฟะพะดัะพะฑะฝะพััะธ" -#: apply.c:5003 +#: apply.c:5044 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "ะฟัะตะฝะตะฑัะตะณะฒะฐะฝะต ะฝะฐ ะฝะตะฟัะฐะฒะธะปะฝะพ ะปะธะฟัะฒะฐั ะทะฝะฐะบ ะทะฐ ะฝะพะฒ ัะตะด ะฒ ะบัะฐั ะฝะฐ ัะฐะนะป" -#: apply.c:5006 +#: apply.c:5047 msgid "do not trust the line counts in the hunk headers" msgstr "ะฑะตะท ะดะพะฒะตััะฒะฐะฝะต ะฝะฐ ะฝะพะผะตัะฐัะฐ ะฝะฐ ัะตะดะพะฒะตัะต ะฒ ะทะฐะณะปะฐะฒะฝะธัะต ัะฐััะธ ะฝะฐ ะฟะฐััะตัะฐัะฐ" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "ะะะงะะะะ_ะะะ ะะะขะะ ะะฏ" -#: apply.c:5009 +#: apply.c:5050 msgid "prepend <root> to all filenames" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะฐะทะธ ะะะงะะะะ_ะะะ ะะะขะะ ะะฏ ะบัะผ ะธะผะตะฝะฐัะฐ ะฝะฐ ะฒัะธัะบะธ ัะฐะนะปะพะฒะต" +#: archive-tar.c:125 archive-zip.c:345 +#, c-format +msgid "cannot stream blob %s" +msgstr "ะพะฑะตะบััั-BLOB โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑัะฐะฑะพัะตะฝ" + +#: archive-tar.c:265 archive-zip.c:358 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "ะฝะตะฟะพะดะดััะถะฐะฝะธ ะฟัะฐะฒะฐ ะทะฐ ะดะพัััะฟ ะดะพ ัะฐะนะป: 0%o (SHA1: %s)" + +#: archive-tar.c:449 +#, c-format +msgid "unable to start '%s' filter" +msgstr "ัะธะปััััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะฐััะธัะฐะฝ" + +#: archive-tar.c:452 +msgid "unable to redirect descriptor" +msgstr "ะดะตัะบัะธะฟัะพััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะตะฝะฐัะพัะตะฝ" + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "ัะธะปััััั โ%sโ ะฒััะฝะฐ ะณัะตัะบะฐ" + +#: archive-zip.c:318 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "ะฟัััั ะฝะต ะต ะฟัะฐะฒะธะปะฝะพ ะบะพะดะธัะฐะฝ ะฒ UTF-8: %s" + +#: archive-zip.c:322 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "ัะฒััะดะต ะดัะปัะณ ะฟัั (%d ะทะฝะฐะบะฐ, SHA1: %s): %s" + +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "ะณัะตัะบะฐ ะฟัะธ ะดะตะบะพะผะฟัะตัะธัะฐะฝะต ั โdeflateโ (%d)" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "ะฒัะตะผะตะฒะฐัะฐ ััะพะนะฝะพัั ะต ัะฒััะดะต ะณะพะปัะผะฐ ะทะฐ ัะฐะทะธ ัะธััะตะผะฐ: %<PRIuMAX>" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [ะะะฆะะฏโฆ] ะฃะะะะะขะะ_ะะชะ_ะะชะ ะะ [ะะชะขโฆ]" @@ -947,182 +1736,164 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote ะฅะ ะะะะะะฉะ [--exec ะะะะะะะ] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "ะพะฑะตะบััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "ะฟัััั โ%sโ ะฝะต ััะฒะฟะฐะดะฐ ั ะฝะธะบะพะน ัะฐะนะป" -#: archive.c:396 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "ัะฐะบัะฒ ัะบะฐะทะฐัะตะป ะฝัะผะฐ: %.*s" -#: archive.c:401 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั: โ%sโ" -#: archive.c:414 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "ะฝะต ะต ะพะฑะตะบั-ะดััะฒะพ: %s" -#: archive.c:426 +#: archive.c:485 msgid "current working directory is untracked" msgstr "ัะตะบััะฐัะฐ ัะฐะฑะพัะฝะฐ ะดะธัะตะบัะพัะธั ะฝะต ะต ัะปะตะดะตะฝะฐ" -#: archive.c:457 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "ะคะฐะนะปัั โ%sโ ะปะธะฟัะฒะฐ" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "โ%sโ ะฝะต ะต ะพะฑะธะบะฝะพะฒะตะฝ ัะฐะนะป" + +#: archive.c:553 msgid "fmt" msgstr "ะคะะ ะะะข" -#: archive.c:457 +#: archive.c:553 msgid "archive format" msgstr "ะคะะ ะะะข ะฝะฐ ะฐัั ะธะฒะฐ" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "ะะ ะะคะะะก" -#: archive.c:459 +#: archive.c:555 msgid "prepend prefix to each pathname in the archive" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะพะทะธ ะะ ะะคะะะก ะบัะผ ะฒัะตะบะธ ะฟัั ะฒ ะฐัั ะธะฒะฐ" -#: 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 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 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 +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต ะบัะผ ะฐัั ะธะฒะฐ" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฐัั ะธะฒะฐ ะฒ ัะพะทะธ ะคะะะ" -#: archive.c:463 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr "ะธะทัะธัะฐะฝะต ะฝะฐ โ.gitattributesโ ะฒ ัะฐะฑะพัะฝะฐัะฐ ะดะธัะตะบัะพัะธั" -#: archive.c:464 +#: archive.c:563 msgid "report archived files on stderr" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐัั ะธะฒะธัะฐะฝะธัะต ัะฐะนะปะพะฒะต ะฝะฐ ััะฐะฝะดะฐััะฝะฐัะฐ ะณัะตัะบะฐ" -#: archive.c:465 +#: archive.c:564 msgid "store only" -msgstr "ัะฐะผะพ ััั ัะฐะฝะตะฝะธะต ะฑะตะท ะบะพะผะฟัะตัะธัะฐะฝะต" +msgstr "ััั ัะฐะฝะตะฝะธะต ะฑะตะท ะบะพะผะฟัะตัะธัะฐะฝะต" -#: archive.c:466 +#: archive.c:565 msgid "compress faster" msgstr "ะฑััะทะพ ะบะพะผะฟัะตัะธัะฐะฝะต" -#: archive.c:474 +#: archive.c:573 msgid "compress better" msgstr "ะดะพะฑัะพ ะบะพะผะฟัะตัะธัะฐะฝะต" -#: archive.c:477 +#: archive.c:576 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:1379 builtin/submodule--helper.c:1859 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "ั ัะฐะฝะธะปะธัะต" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:579 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" -msgstr "ะธะทัะตะณะปัะฝะต ะฝะฐ ะฐัั ะธะฒะฐ ะพั ะพัะดะฐะปะตัะตะฝะพัะพ ะฅะ ะะะะะะฉะ" +msgstr "ะฟะพะปััะฐะฒะฐะฝะต ะฝะฐ ะฐัั ะธะฒะฐ ะพั ะพัะดะฐะปะตัะตะฝะพัะพ ะฅะ ะะะะะะฉะ" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "ะบะพะผะฐะฝะดะฐ" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "ะฟัั ะบัะผ ะพัะดะฐะปะตัะตะฝะฐัะฐ ะบะพะผะฐะฝะดะฐ โgit-upload-archiveโ" -#: archive.c:489 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "ะะตะพัะฐะบะฒะฐะฝะฐ ะพะฟัะธั โ--remoteโ" -#: archive.c:491 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "ะะฟัะธััะฐ โ--execโ ะธะทะธัะบะฒะฐ โ--remoteโ" -#: archive.c:493 +#: archive.c:592 msgid "Unexpected option --output" msgstr "ะะตะพัะฐะบะฒะฐะฝะฐ ะพะฟัะธั โ--outputโ" -#: archive.c:515 +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" +msgstr "ะะฟัะธะธัะต โ--add-fileโ ะธ โ--remoteโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: archive.c:616 #, c-format msgid "Unknown archive format '%s'" msgstr "ะะตะฟะพะทะฝะฐั ัะพัะผะฐั ะฝะฐ ะฐัั ะธะฒ: โ%sโ" -#: archive.c:522 +#: archive.c:623 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "ะัะณัะผะตะฝััั ะฝะต ัะต ะฟะพะดะดััะถะฐ ะทะฐ ัะพัะผะฐฬัะฐ โ%sโ: -%d" -#: archive-tar.c:125 archive-zip.c:345 -#, c-format -msgid "cannot stream blob %s" -msgstr "ะพะฑะตะบััั-BLOB โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑัะฐะฑะพัะตะฝ" - -#: 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:287 archive-zip.c:353 -#, c-format -msgid "cannot read %s" -msgstr "ะพะฑะตะบััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" - -#: archive-tar.c:459 -#, c-format -msgid "unable to start '%s' filter" -msgstr "ัะธะปััััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะฐััะธัะฐะฝ" - -#: archive-tar.c:462 -msgid "unable to redirect descriptor" -msgstr "ะดะตัะบัะธะฟัะพััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะตะฝะฐัะพัะตะฝ" - -#: archive-tar.c:469 -#, c-format -msgid "'%s' filter reported error" -msgstr "ัะธะปััััั โ%sโ ะฒััะฝะฐ ะณัะตัะบะฐ" - -#: archive-zip.c:314 -#, c-format -msgid "path is not valid UTF-8: %s" -msgstr "ะฟัััั ะฝะต ะต ะฟัะฐะฒะธะปะฝะพ ะบะพะดะธัะฐะฝ ะฒ UTF-8: %s" - -#: archive-zip.c:318 -#, c-format -msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "ัะฒััะดะต ะดัะปัะณ ะฟัั (%d ะทะฝะฐะบะฐ, SHA1: %s): %s" - -#: 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:609 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "ะฒัะตะผะตะฒะฐัะฐ ััะพะนะฝะพัั ะต ัะฒััะดะต ะณะพะปัะผะฐ ะทะฐ ัะฐะทะธ ัะธััะตะผะฐ: %<PRIuMAX>" - -#: attr.c:211 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "โ%.*sโ ะต ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะทะฐ ะฐััะธะฑัั" -#: attr.c:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s: ะบะพะผะฐะฝะดะฐัะฐ ะฝะต ะต ะฟะพะทะฒะพะปะตะฝะฐ: โ%s:%dโ" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1130,22 +1901,22 @@ msgstr "" "ะััะธัะฐัะตะปะฝะธัะต ัะฐะฑะปะพะฝะธ ัะต ะธะณะฝะพัะธัะฐั ะฒ ะฐััะธะฑััะธัะต ะฝะฐ git.\n" "ะะบะพ ะฒะธ ัััะฑะฒะฐ ะฝะฐัะฐะปะฝะฐ ัะดะธะฒะธัะตะปะฝะฐ, ะฟะพะปะทะฒะฐะนัะต โ\\!โ." -#: bisect.c:468 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "ะะตะฟัะฐะฒะธะปะฝะพ ัะธัะธัะฐะฝะพ ััะดััะถะฐะฝะธะต ะฒัะฒ ัะฐะนะปะฐ โ%sโ: %s" -#: bisect.c:678 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "ะะพะฒะตัะต ะฝะต ะผะพะถะต ะดะฐ ัะต ััััะธ ะดะฒะพะธัะฝะพ!\n" -#: bisect.c:733 +#: bisect.c:753 #, c-format msgid "Not a valid commit name %s" msgstr "ะะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต โ%sโ" -#: bisect.c:758 +#: bisect.c:778 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1154,7 +1925,7 @@ msgstr "" "ะะตะฟัะฐะฒะธะปะฝะฐ ะฑะฐะทะฐ ะทะฐ ัะปะธะฒะฐะฝะต: %s.\n" "ะกะปะตะดะพะฒะฐัะตะปะฝะพ ะณัะตัะบะฐัะฐ ะต ะบะพัะธะณะธัะฐะฝะฐ ะผะตะถะดั โ%sโ ะธ [%s].\n" -#: bisect.c:763 +#: bisect.c:783 #, c-format msgid "" "The merge base %s is new.\n" @@ -1163,7 +1934,7 @@ msgstr "" "ะะพะฒะฐ ะฑะฐะทะฐ ะทะฐ ัะปะธะฒะฐะฝะต: %s.\n" "ะกะฒะพะนััะฒะพัะพ ะต ะฟัะพะผะตะฝะตะฝะพ ะผะตะถะดั โ%sโ ะธ [%s].\n" -#: bisect.c:768 +#: bisect.c:788 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1172,7 +1943,7 @@ msgstr "" "ะะฐะทะฐัะฐ ะทะฐ ัะปะธะฒะฐะฝะต โ%sโ ะต %s.\n" "ะกะปะตะดะพะฒะฐัะตะปะฝะพ ะฟััะฒะพัะพ %s ะฟะพะดะฐะฒะฐะฝะต ะต ะผะตะถะดั โ%sโ ะธ [%s].\n" -#: bisect.c:776 +#: bisect.c:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1183,7 +1954,7 @@ msgstr "" "ะะฒะพะธัะฝะพัะพ ััััะตะฝะต ั git bisect ะฝัะผะฐ ะดะฐ ัะฐะฑะพัะธ ะฟัะฐะฒะธะปะฝะพ.\n" "ะะฐะปะธ ะฝะต ััะต ะพะฑััะบะฐะปะธ ัะบะฐะทะฐัะตะปะธัะต โ%sโ ะธ โ%sโ?\n" -#: bisect.c:789 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1194,36 +1965,36 @@ msgstr "" "ะะต ะผะพะถะต ะดะฐ ัะผะต ัะธะณััะฝะธ, ัะต ะฟััะฒะพัะพ %s ะฟะพะดะฐะฒะฐะฝะต ะต ะผะตะถะดั โ%sโ ะธ โ%sโ.\n" "ะะฒะพะธัะฝะพัะพ ััััะตะฝะต ะฟัะพะดัะปะถะฐะฒะฐ." -#: bisect.c:822 +#: bisect.c:848 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "ะะฒะพะธัะฝะพ ััััะตะฝะต: ัััะฑะฒะฐ ะดะฐ ัะต ะฟัะพะฒะตัะธ ะฑะฐะทะฐ ะทะฐ ัะปะธะฒะฐะฝะต\n" -#: bisect.c:865 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "ะฝะตะพะฑั ะพะดะธะผะฐ ะต ะฒะตััะธั โ%sโ" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝ" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: bisect.c:958 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "ะฝะตััะฟะตัะฝะพ ะฟัะพัะธัะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะทะฐ ะดะฒะพะธัะฝะพ ััััะตะฝะต" -#: bisect.c:977 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "โ%sโ e ะบะฐะบัะพ โ%sโ, ัะฐะบะฐ ะธ โ%sโ\n" -#: bisect.c:985 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" @@ -1232,7 +2003,7 @@ msgstr "" "ะะธะฟัะฒะฐ ะฟะพะดั ะพะดััะพ ะทะฐ ัะตััะฒะฐะฝะต ะฟะพะดะฐะฒะฐะฝะต.\n" "ะัะพะฒะตัะตัะต ะฟะฐัะฐะผะตััะธัะต ะทะฐ ะฟััะธัะฐัะฐ.\n" -#: bisect.c:1004 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1242,48 +2013,48 @@ msgstr[1] "(ะฟัะธะฑะปะธะทะธัะตะปะฝะพ %d ัััะฟะบะธ)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1088 #, 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:2697 +#: blame.c:2778 msgid "--contents and --reverse do not blend well." msgstr "ะะฟัะธะธัะต โ--contentsโ ะธ โ--reverseโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: blame.c:2711 +#: blame.c:2792 msgid "cannot use --contents with final commit object name" msgstr "ะะฟัะธััะฐ โ--contentsโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะธะผะต ะฝะฐ ะพะฑะตะบั ะพั ะบัะฐะนะฝะพ ะฟะพะดะฐะฒะฐะฝะต" -#: blame.c:2732 +#: blame.c:2813 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "ะะดะฝะพะฒัะตะผะตะฝะฝะพัะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟัะธะธัะต โ--reverseโ ะธ โ--first-parentโ ะธะทะธัะบะฒะฐ " "ัะบะฐะทะฒะฐะฝะตัะพ ะฝะฐ ะบัะฐะนะฝะพ ะฟะพะดะฐะฒะฐะฝะต" -#: 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 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 msgid "revision walk setup failed" msgstr "ะฝะตััะฟะตัะฝะพ ะฝะฐัััะพะนะฒะฐะฝะต ะฝะฐ ะพะฑั ะพะถะดะฐะฝะตัะพ ะฝะฐ ะฒะตััะธะธัะต" -#: blame.c:2759 +#: blame.c:2840 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "ะะดะฝะพะฒัะตะผะตะฝะฝะพัะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟัะธะธัะต โ--reverseโ ะธ โ--first-parentโ ะธะทะธัะบะฒะฐ " "ัะบะฐะทะฒะฐะฝะตัะพ ะฝะฐ ะดะธะฐะฟะฐะทะพะฝ ะฟะพ ะฒะตัะธะณะฐัะฐ ะฝะฐ ะฟััะฒะธัะต ะฝะฐัะปะตะดะฝะธัะธ" -#: blame.c:2770 +#: blame.c:2851 #, c-format msgid "no such path %s in %s" msgstr "ะฝัะผะฐ ะฟัั ะฝะฐ ะธะผะต โ%sโ ะฒ โ%sโ" -#: blame.c:2781 +#: blame.c:2862 #, c-format msgid "cannot read blob %s for path %s" msgstr "ะพะฑะตะบััั-BLOB โ%sโ ะฒ ะฟััั %s ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" @@ -1416,400 +2187,368 @@ msgstr "ะะผะตัะพ ะฝะฐ ะพะฑะตะบั ะฝะต ะต ะตะดะฝะพะทะฝะฐัะฝะพ: โ%sโ" msgid "Not a valid branch point: '%s'." msgstr "ะะตะฟัะฐะฒะธะปะฝะพ ะผัััะพ ะทะฐ ะฝะฐัะฐะปะพ ะฝะฐ ะบะปะพะฝ: โ%sโ" -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "โ%sโ ะฒะตัะต ะต ะธะทัะตะณะปะตะฝ ะฒ โ%sโ" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ โ%sโ ะฝะต ะต ะพะฑะฝะพะฒะตะฝ" -#: bundle.c:36 +#: bundle.c:41 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "ะคะฐะนะปัั โ%sโ ะฝะต ะธะทะณะปะตะถะดะฐ ะดะฐ ะต ะฟัะฐัะบะฐ ะฝะฐ git ะฒะตััะธั 2" +msgid "unrecognized bundle hash algorithm: %s" +msgstr "ะฝะตะฟะพะทะฝะฐั ะฐะปะณะพัะธััะผ ะทะฐ ะบะพะฝััะพะปะฝะธ ััะผะธ ะทะฐ ะฟัะฐัะบะธ โ%sโ" -#: bundle.c:64 +#: bundle.c:45 +#, c-format +msgid "unknown capability '%s'" +msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะฒัะทะผะพะถะฝะพัั โ%sโ" + +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "ะคะฐะนะปัั โ%sโ ะฝะต ะธะทะณะปะตะถะดะฐ ะดะฐ ะต ะฟัะฐัะบะฐ ะฝะฐ git ะฒะตััะธั 2 ะธะปะธ 3" + +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะทะฐะณะปะฐะฒะฝะฐ ัะฐัั: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ" -#: bundle.c:143 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "ะ ั ัะฐะฝะธะปะธัะตัะพ ะปะธะฟัะฒะฐั ัะปะตะดะฝะธัะต ะฝะตะพะฑั ะพะดะธะผะธ ะฟะพะดะฐะฒะฐะฝะธั:" -#: bundle.c:146 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "ะทะฐ ะฟัะพะฒะตัะบะฐัะฐ ะฝะฐ ะฟัะฐัะบะฐ ะต ะฝะตะพะฑั ะพะดะธะผะพ ั ัะฐะฝะธะปะธัะต" -#: bundle.c:197 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "ะัะฐัะบะฐัะฐ ััะดััะถะฐ ัะปะตะดะฝะธั ัะบะฐะทะฐัะตะป:" msgstr[1] "ะัะฐัะบะฐัะฐ ััะดััะถะฐ ัะปะตะดะฝะธัะต %d ัะบะฐะทะฐัะตะปะธ:" -#: bundle.c:204 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "ะัะฐัะบะฐัะฐ ััะดััะถะฐ ะฟัะปะฝะฐ ะธััะพัะธั." -#: bundle.c:206 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "ะัะฐัะบะฐัะฐ ะธะทะธัะบะฒะฐ ัะปะตะดะฝะธั ัะบะฐะทะฐัะตะป:" msgstr[1] "ะัะฐัะบะฐัะฐ ะธะทะธัะบะฒะฐ ัะปะตะดะฝะธัะต %d ัะบะฐะทะฐัะตะปะธ:" -#: bundle.c:272 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "ะฝะตััะฟะตัะฝะพ ะดัะฑะปะธัะฐะฝะต ะฝะฐ ะดะตัะบัะธะฟัะพัะฐ ะฝะฐ ะฟัะฐัะบะฐัะฐ ั โdupโ" -#: bundle.c:279 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "ะะพะผะฐะฝะดะฐัะฐ โgit pack-objectsโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะฐััะธัะฐะฝะฐ" -#: bundle.c:290 +#: bundle.c:337 msgid "pack-objects died" msgstr "ะะพะผะฐะฝะดะฐัะฐ โgit pack-objectsโ ะฝะต ะทะฐะฒัััะธ ััะฟะตัะฝะพ" -#: bundle.c:332 +#: bundle.c:379 msgid "rev-list died" msgstr "ะะพะผะฐะฝะดะฐัะฐ โgit rev-listโ ะฝะต ะทะฐะฒัััะธ ััะฟะตัะฝะพ" -#: bundle.c:381 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" "ัะบะฐะทะฐัะตะปัั โ%sโ ะฝะต ะต ะฑะธะป ะฒะบะปััะตะฝ ะฟะพัะฐะดะธ ะพะฟัะธะธัะต ะทะฐะดะฐะดะตะฝะธ ะฝะฐ โgit rev-listโ" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "ะฝะตะฟะพะดะดััะถะฐะฝะฐ ะฒะตััะธั ะฝะฐ ะธะฝะดะตะบัะฐ %d" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "ะฟัะฐัะบะฐ %d ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัะต ั ะฐะปะณะพัะธััะผ %s" + +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 #, c-format msgid "unrecognized argument: %s" msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั: %s" -#: bundle.c:468 +#: bundle.c:530 msgid "Refusing to create empty bundle." msgstr "ะกัะทะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟัะฐะทะฝะฐ ะฟัะฐัะบะฐ ะต ะฝะตะฒัะทะผะพะถะฝะพ." -#: bundle.c:478 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "ะคะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝ" -#: bundle.c:503 +#: bundle.c:565 msgid "index-pack died" msgstr "ะะพะผะฐะฝะดะฐัะฐ โgit index-packโ ะฝะต ะทะฐะฒัััะธ ััะฟะตัะฝะพ" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ ัะฒัั: %.*s" -#: 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:52 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต!" - -#: commit.c:192 -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" -"ะะพะถะต ะดะฐ ะฟัะตะพะฑัะฐะทัะฒะฐัะต ะฟัะธัะฐะดะบะธัะต ะฒ ะทะฐะผะตััะฒะฐัะธ\n" -"ัะบะฐะทะฐัะตะปะธ ั ะบะพะผะฐะฝะดะฐัะฐ:\n" -"\n" -" git replace --convert-graft-file\n" -"\n" -"ะะฐ ะดะฐ ะธะทะบะปััะธัะต ัะพะฒะฐ ััะพะฑัะตะฝะธะต, ะฟะพะปะทะฒะฐะนัะต ะบะพะผะฐะฝะดะฐัะฐ:\n" -"\n" -" git config advice.graftFileDeprecated false" - -#: commit.c:1127 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "" -"ะะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะต ั ะฝะตะดะพะฒะตัะตะฝ ะฟะพะดะฟะธั ะพั GPG, ะบะพะนัะพ ัะฒััะดะธ, ัะต ะต ะฝะฐ โ%sโ." - -#: commit.c:1130 -#, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "" -"ะะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะต ั ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟะพะดะฟะธั ะพั GPG, ะบะพะนัะพ ัะฒััะดะธ, ัะต ะต ะฝะฐ โ%sโ." - -#: commit.c:1133 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "ะะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะต ะฑะตะท ะฟะพะดะฟะธั ะพั GPG." +#: commit-graph.c:188 midx.c:46 +msgid "invalid hash version" +msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฒะตััะธั ะฝะฐ ะบะพะฝััะพะปะฝะฐ ััะผะฐ" -#: commit.c:1136 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "ะะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะต ั ะบะพัะตะบัะตะฝ ะฟะพะดะฟะธั ะพั GPG ะฝะฐ โ%sโ.\n" - -#: 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 "" -"ะะ ะะะฃะะ ะะะะะะะ: ััะพะฑัะตะฝะธะตัะพ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะต ะบะพะดะธัะฐะฝะพ ั UTF-8.\n" -"ะะพะถะต ะดะฐ ะฟะพะฟัะฐะฒะธัะต ะฟะพะดะฐะฒะฐะฝะตัะพ ะทะฐะตะดะฝะพ ััั ััะพะฑัะตะฝะธะตัะพ ะธะปะธ ะผะพะถะต ะดะฐ\n" -"ะทะฐะดะฐะดะตัะต ะฟะพะปะทะฒะฐะฝะพัะพ ะบะพะดะธัะฐะฝะต ะฒ ะฝะฐัััะพะนะบะฐัะฐ โi18n.commitencodingโ.\n" - -#: commit-graph.c:127 +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "ัะฐะนะปัั ั ะณัะฐฬัะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต ัะฒััะดะต ะผะฐะปัะบ" -#: commit-graph.c:192 +#: commit-graph.c:311 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "ะพัะฟะตัะฐััะบัั ะฝะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ %X ะฝะต ััะฒะฟะฐะดะฐ ั %X" -#: commit-graph.c:199 +#: commit-graph.c:318 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "ะฒะตััะธััะฐ ะฝะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ %X ะฝะต ััะฒะฟะฐะดะฐ ั %X" -#: commit-graph.c:206 +#: commit-graph.c:325 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "ะฒะตััะธััะฐ ะฝะฐ ะบะพะฝััะพะปะฝะฐัะฐ ััะผะฐ ะฝะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ %X ะฝะต ััะฒะฟะฐะดะฐ ั %X" -#: commit-graph.c:229 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" -msgstr "" -"ะทะฐะฟะธััั ะฒ ัะฐะฑะปะธัะฐัะฐ ะทะฐ ะพัะบััะธ ะปะธะฟัะฒะฐ, ัะฐะนะปัั ะทะฐ ะณัะฐฬัะฐ ะผะพะถะต ะดะฐ ะต ะฝะตะฟัะปะตะฝ" +#: commit-graph.c:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "ัะฐะนะปัั ั ะณัะฐฬัะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต ัะฒััะดะต ะผะฐะปัะบ, ะทะฐ ะดะฐ ััะดััะถะฐ %u ะพัะบััะธ" -#: commit-graph.c:240 +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะพัะผะตััะฒะฐะฝะต ะฝะฐ ะพัะบัั: %08x%08x" -#: commit-graph.c:283 +#: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "ะพัะบัััั %08x ัะต ัะฒัะฒะฐ ะผะฝะพะณะพะบัะฐัะฝะพ" -#: commit-graph.c:347 +#: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" msgstr "ะฑะฐะทะพะฒะธัั ะพัะบัั ะปะธะฟัะฒะฐ ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ" -#: commit-graph.c:357 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "ะฒะตัะธะณะฐัะฐ ะฝะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะต ััะฒะฟะฐะดะฐ" -#: commit-graph.c:404 +#: commit-graph.c:557 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" "ะณัะตัะบะฐ ะฒัะฒ ะฒะตัะธะณะฐัะฐ ะฝะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ: ัะตะด โ%sโ ะฝะต ะต ะบะพะฝััะพะปะฝะฐ ััะผะฐ" -#: commit-graph.c:430 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "ะฝัะบะพะธ ัะฐะนะปะพะฒะต ะฝะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะพัะบัะธัะธ" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:721 commit-graph.c:785 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฟะพะทะธัะธั ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ. ะะตัะพััะฝะพ ะณัะฐััั ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต ะฟะพะฒัะตะดะตะฝ" -#: commit-graph.c:575 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะพ" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:1042 builtin/am.c:1306 +#, c-format +msgid "unable to parse commit %s" +msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝะพ: %s" + +#: commit-graph.c:1265 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "ะฒะธะดัั ะฝะฐ ะพะฑะตะบัะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฟัะตะดะตะปะตะฝ" -#: commit-graph.c:1034 +#: commit-graph.c:1301 msgid "Loading known commits in commit graph" msgstr "ะะฐัะตะถะดะฐะฝะต ะฝะฐ ะฟะพะทะฝะฐัะธัะต ะฟะพะดะฐะฒะฐะฝะธั ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ" -#: commit-graph.c:1051 +#: commit-graph.c:1318 msgid "Expanding reachable commits in commit graph" msgstr "ะ ะฐะทัะธััะฒะฐะฝะต ะฝะฐ ะดะพััะธะถะธะผะธัะต ะฟะพะดะฐะฒะฐะฝะธั ะฒ ะณัะฐฬัะฐ" -#: commit-graph.c:1070 +#: commit-graph.c:1338 msgid "Clearing commit marks in commit graph" msgstr "ะะทัะธััะฒะฐะฝะต ะฝะฐ ะพัะฑะตะปัะทะฒะฐะฝะธััะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ" -#: commit-graph.c:1089 +#: commit-graph.c:1357 msgid "Computing commit graph generation numbers" msgstr "ะะทัะธัะปัะฒะฐะฝะต ะฝะฐ ะฝะพะผะตัะฐัะฐ ะฝะฐ ะฟะพะบะพะปะตะฝะธััะฐ ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ" -#: commit-graph.c:1163 +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "ะะทัะธัะปัะฒะฐะฝะต ะฝะฐ ัะธะปััะธัะต ะฝะฐ ะะปัะผ ะฝะฐ ะฟััะธัะฐัะฐ ั ะฟัะพะผัะฝะฐ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะตัะพ" + +#: commit-graph.c:1501 +msgid "Collecting referenced commits" +msgstr "ะกัะฑะธัะฐะฝะต ะฝะฐ ัะฒััะทะฐะฝะธัะต ะฟะพะดะฐะฒะฐะฝะธั" + +#: commit-graph.c:1526 #, 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:1176 +#: commit-graph.c:1539 #, c-format msgid "error adding pack %s" msgstr "ะณัะตัะบะฐ ะฟัะธ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะฐะบะตัะตะฝ ัะฐะนะป โ%sโ" -#: commit-graph.c:1180 +#: commit-graph.c:1543 #, c-format msgid "error opening index for %s" msgstr "ะณัะตัะบะฐ ะฟัะธ ะพัะฒะฐััะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ ะฝะฐ โ%sโ" -#: 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:1238 +#: commit-graph.c:1582 msgid "Finding commits for commit graph among packed objects" msgstr "ะัะบัะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฒ ะณัะฐฬัะฐ ะธะทะผะตะถะดั ะฟะฐะบะตัะธัะฐะฝะธัะต ะพะฑะตะบัะธ" -#: commit-graph.c:1253 +#: commit-graph.c:1597 msgid "Counting distinct commits in commit graph" msgstr "ะัะตะฑัะพัะฒะฐะฝะต ะฝะฐ ัะฐะทะปะธัะฝะธัะต ะฟะพะดะฐะฒะฐะฝะธั ะฒ ะณัะฐฬัะฐ" -#: commit-graph.c:1284 +#: commit-graph.c:1629 msgid "Finding extra edges in commit graph" msgstr "ะัะบัะธะฒะฐะฝะต ะฝะฐ ะพัะต ะฒััั ะพะฒะต ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ" -#: commit-graph.c:1332 +#: commit-graph.c:1678 msgid "failed to write correct number of base graph ids" msgstr "ะฟัะฐะฒะธะปะฝะธัั ะฑัะพะน ะฝะฐ ะฑะฐะทะพะฒะธัะต ะธะดะตะฝัะธัะธะบะฐัะพัะธ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัะต" -#: commit-graph.c:1365 midx.c:811 +#: commit-graph.c:1720 midx.c:826 #, c-format msgid "unable to create leading directories of %s" msgstr "ัะพะดะธัะตะปัะบะธัะต ะดะธัะตะบัะพัะธะธ ะฝะฐ โ%sโ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ััะทะดะฐะดะตะฝะธ" -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1733 +msgid "unable to create temporary graph layer" +msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝ ะฒัะตะผะตะฝะตะฝ ัะปะพะน ะทะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ" + +#: commit-graph.c:1738 #, c-format -msgid "unable to create '%s'" -msgstr "ะฟะฐะบะตัะฝะธัั ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝ" +msgid "unable to adjust shared permissions for '%s'" +msgstr "ะฟัะฐะฒะฐัะฐ ะทะฐ ัะฟะพะดะตะปะตะฝ ะดะพัััะฟ ะดะพ โ%sโ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะทะฐะดะฐะดะตะฝะธ" -#: commit-graph.c:1437 +#: commit-graph.c:1808 #, 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:1478 +#: commit-graph.c:1853 msgid "unable to open commit-graph chain file" msgstr "ัะฐะนะปัั ั ะฒะตัะธะณะฐัะฐ ะฝะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ" -#: commit-graph.c:1490 +#: commit-graph.c:1869 msgid "failed to rename base commit-graph file" msgstr "ะพัะฝะพะฒะฝะธัั ัะฐะนะป ะฝะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะตะธะผะตะฝัะฒะฐะฝ" -#: commit-graph.c:1510 +#: commit-graph.c:1889 msgid "failed to rename temporary commit-graph file" msgstr "ะฒัะตะผะตะฝะฝะธัั ัะฐะนะป ะฝะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะตะธะผะตะฝัะฒะฐะฝ" -#: commit-graph.c:1621 +#: commit-graph.c:2015 msgid "Scanning merged commits" msgstr "ะขัััะตะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ััั ัะปะธะฒะฐะฝะธั" -#: commit-graph.c:1632 +#: commit-graph.c:2026 #, c-format msgid "unexpected duplicate commit id %s" msgstr "ะฝะตะพัะฐะบะฒะฐะฝ, ะฟะพะฒัะฐััั ัะต ะธะดะตะฝัะธัะธะบะฐัะพั ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต: %s" -#: commit-graph.c:1657 +#: commit-graph.c:2049 msgid "Merging commit-graph" msgstr "ะกะปะธะฒะฐะฝะต ะฝะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ" -#: commit-graph.c:1844 +#: commit-graph.c:2259 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "ัะพัะผะฐััั ะฝะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะต ะผะพะถะต ะดะฐ ะทะฐะฟะธัะต %d ะฟะพะดะฐะฒะฐะฝะธั" -#: commit-graph.c:1855 +#: commit-graph.c:2270 msgid "too many commits to write graph" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฟะพะดะฐะฒะฐะฝะธั ะทะฐ ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะณัะฐฬัะฐ" -#: commit-graph.c:1945 +#: commit-graph.c:2363 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "ะณัะฐััั ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต ั ะณัะตัะฝะฐ ััะผะฐ ะทะฐ ะฟัะพะฒะตัะบะฐ โ ะฒะตัะพััะฝะพ ะต ะฟะพะฒัะตะดะตะฝ" -#: commit-graph.c:1955 +#: commit-graph.c:2373 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฟะพะดัะตะดะฑะฐ ะฝะฐ ะพะฑะตะบัะธัะต ะฟะพ ะธะดะตะฝัะธัะธะบะฐัะพั ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ: โ%sโ " "ะต ะฟัะตะดะธ โ%sโ, ะฐ ะฝะต ัััะฑะฒะฐ" -#: commit-graph.c:1965 commit-graph.c:1980 +#: commit-graph.c:2383 commit-graph.c:2398 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ ะพัะบัั ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ: fanout[%d] = %u, ะฐ " "ัััะฑะฒะฐ ะดะฐ ะต %u" -#: commit-graph.c:1972 +#: commit-graph.c:2390 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "ะฟะพะดะฐะฒะฐะฝะต โ%sโ ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" -#: commit-graph.c:1989 +#: commit-graph.c:2408 msgid "Verifying commits in commit graph" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฒ ะณัะฐฬัะฐ" -#: commit-graph.c:2002 +#: commit-graph.c:2423 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "ะฟะพะดะฐะฒะฐะฝะต โ%sโ ะฒ ะฑะฐะทะฐัะฐ ะพั ะดะฐะฝะฝะธ ะบัะผ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต " "ะฐะฝะฐะปะธะทะธัะฐ" -#: commit-graph.c:2009 +#: commit-graph.c:2430 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "ะธะดะตะฝัะธัะธะบะฐัะพััั ะฝะฐ ะพะฑะตะบั ะทะฐ ะบะพัะตะฝะพะฒะพัะพ ะดััะฒะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต โ%sโ ะฒ ะณัะฐฬัะฐ ั " "ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต โ%sโ, ะฐ ัััะฑะฒะฐ ะดะฐ ะต โ%sโ" -#: commit-graph.c:2019 +#: commit-graph.c:2440 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "ัะฟะธััะบัั ั ัะพะดะธัะตะปะธ ะฝะฐ โ%sโ ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต ะฟัะตะบะฐะปะตะฝะพ ะดัะปัะณ" -#: commit-graph.c:2028 +#: commit-graph.c:2449 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "ัะพะดะธัะตะปัั ะฝะฐ โ%sโ ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต โ%sโ, ะฐ ัััะฑะฒะฐ ะดะฐ ะต โ%sโ" -#: commit-graph.c:2041 +#: commit-graph.c:2463 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "ัะฟะธััะบัั ั ัะพะดะธัะตะปะธ ะฝะฐ โ%sโ ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต ะฟัะตะบะฐะปะตะฝะพ ะบัั" -#: commit-graph.c:2046 +#: commit-graph.c:2468 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1817,7 +2556,7 @@ msgstr "" "ะฝะพะผะตััั ะฝะฐ ะฟะพะบะพะปะตะฝะธะตัะพ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต โ%sโ ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต 0, ะฐ ะดััะณะฐะดะต " "ะฝะต ะต" -#: commit-graph.c:2050 +#: commit-graph.c:2472 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1825,25 +2564,91 @@ msgstr "" "ะฝะพะผะตััั ะฝะฐ ะฟะพะบะพะปะตะฝะธะตัะพ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต โ%sโ ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะต ะต 0, ะฐ " "ะดััะณะฐะดะต ะต" -#: commit-graph.c:2065 +#: commit-graph.c:2488 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" "ะฝะพะผะตััั ะฝะฐ ะฟะพะบะพะปะตะฝะธะตัะพ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต โ%sโ ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต %u, ะฐ " "ะดััะณะฐะดะต ะต %u" -#: commit-graph.c:2071 +#: commit-graph.c:2494 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "ะดะฐัะฐัะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ โ%sโ ะฒ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต %<PRIuMAX>, ะฐ ัััะฑะฒะฐ ะดะฐ ะต " "%<PRIuMAX>" +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต!" + +#: commit.c:194 +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" +"ะะพะถะต ะดะฐ ะฟัะตะพะฑัะฐะทัะฒะฐัะต ะฟัะธัะฐะดะบะธัะต ะฒ ะทะฐะผะตััะฒะฐัะธ\n" +"ัะบะฐะทะฐัะตะปะธ ั ะบะพะผะฐะฝะดะฐัะฐ:\n" +"\n" +" git replace --convert-graft-file\n" +"\n" +"ะะฐ ะดะฐ ะธะทะบะปััะธัะต ัะพะฒะฐ ััะพะฑัะตะฝะธะต, ะธะทะฟัะปะฝะตัะต:\n" +"\n" +" git config advice.graftFileDeprecated false" + +#: commit.c:1172 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" +"ะะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะต ั ะฝะตะดะพะฒะตัะตะฝ ะฟะพะดะฟะธั ะพั GPG, ะบะพะนัะพ ัะฒััะดะธ, ัะต ะต ะฝะฐ โ%sโ." + +#: commit.c:1176 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" +"ะะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะต ั ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟะพะดะฟะธั ะพั GPG, ะบะพะนัะพ ัะฒััะดะธ, ัะต ะต ะฝะฐ โ%sโ." + +#: commit.c:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "ะะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะต ะฑะตะท ะฟะพะดะฟะธั ะพั GPG." + +#: commit.c:1182 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "ะะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะต ั ะบะพัะตะบัะตะฝ ะฟะพะดะฟะธั ะพั GPG ะฝะฐ โ%sโ.\n" + +#: commit.c:1436 +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" +"ะะพะถะต ะดะฐ ะฟะพะฟัะฐะฒะธัะต ะฟะพะดะฐะฒะฐะฝะตัะพ ะทะฐะตะดะฝะพ ััั ััะพะฑัะตะฝะธะตัะพ ะธะปะธ ะผะพะถะต ะดะฐ\n" +"ะทะฐะดะฐะดะตัะต ะฟะพะปะทะฒะฐะฝะพัะพ ะบะพะดะธัะฐะฝะต ะฒ ะฝะฐัััะพะนะบะฐัะฐ โi18n.commitencodingโ.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "ะฟะฐะผะตััะฐ ัะฒัััะธ" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1858,162 +2663,162 @@ msgstr "" " %s\n" "ะขะพะฒะฐ ะผะพะถะต ะดะฐ ัะต ะดัะปะถะธ ะฝะฐ ะทะฐัะธะบะปัะฝะต ะฟัะธ ะฒะผัะบะฒะฐะฝะตัะพ." -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "ะฟัััั ะทะฐ ะฒะผัะบะฒะฐะฝะต โ%sโะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ัะฐะทัะธัะตะฝ" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "ะพัะฝะพัะธัะตะปะฝะธัะต ะฒะผัะบะฒะฐะฝะธั ะฝะฐ ะบะพะฝัะธะณััะฐัะธะธ ัััะฑะฒะฐ ะดะฐ ะธะดะฒะฐั ะพั ัะฐะนะปะพะฒะต" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "ะพัะฝะพัะธัะตะปะฝะธัะต ััะปะพะฒะฝะธ ะธะทัะฐะทะธ ะทะฐ ะฒะผัะบะฒะฐะฝะต ัััะฑะฒะฐ ะดะฐ ะธะดะฒะฐั ะพั ัะฐะนะปะพะฒะต" -#: config.c:376 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "ะบะปัััั ะฝะต ััะดััะถะฐ ัะฐะทะดะตะป: โ%sโ" -#: config.c:382 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "ะบะปัััั ะฝะต ััะดััะถะฐ ะธะผะต ะฝะฐ ะฟัะพะผะตะฝะปะธะฒะฐ: โ%sโ" -#: config.c:406 sequencer.c:2463 +#: config.c:408 sequencer.c:2547 #, c-format msgid "invalid key: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะบะปัั: โ%sโ" -#: config.c:412 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะบะปัั (ะฝะพะฒ ัะตะด): โ%sโ" -#: config.c:448 config.c:460 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะบะพะฝัะธะณััะฐัะธะพะฝะตะฝ ะฟะฐัะฐะผะตััั: โ%sโ" -#: config.c:495 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะพัะผะฐั ะฒ โ%sโ" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะด ะทะฐ ะฝะฐัััะพะนะบะธ %d ะฒ BLOB โ%sโ" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะด ะทะฐ ะฝะฐัััะพะนะบะธ %d ะฒัะฒ ัะฐะนะปะฐ โ%sโ" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะด ะทะฐ ะฝะฐัััะพะนะบะธ %d ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะด ะทะฐ ะฝะฐัััะพะนะบะธ %d ะฒ BLOB ะทะฐ ะฟะพะดะผะพะดัะป โ%sโ" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะด ะทะฐ ะฝะฐัััะพะนะบะธ %d ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ัะตะด โ%sโ" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะด ะทะฐ ะฝะฐัััะพะนะบะธ %d ะฒ โ%sโ" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "ะธะทะฒัะฝ ะดะธะฐะฟะฐะทะพะฝะฐ" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะผะตัะฝะฐ ะตะดะธะฝะธัะฐ" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ัะธัะปะพะฒะฐ ััะพะนะฝะพัั โ%sโ ะทะฐ โ%sโ: %s" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ัะธัะปะพะฒะฐ ััะพะนะฝะพัั โ%sโ ะทะฐ โ%sโ ะฒ BLOB โ%sโ: %s" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ัะธัะปะพะฒะฐ ััะพะนะฝะพัั โ%sโ ะทะฐ โ%sโ ะฒัะฒ ัะฐะนะปะฐ โ%sโ: %s" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ัะธัะปะพะฒะฐ ััะพะนะฝะพัั โ%sโ ะทะฐ โ%sโ ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด: %s" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ัะธัะปะพะฒะฐ ััะพะนะฝะพัั โ%sโ ะทะฐ โ%sโ ะฒ BLOB ะพั ะฟะพะดะผะพะดัะป โ%sโ: %s" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ัะธัะปะพะฒะฐ ััะพะนะฝะพัั โ%sโ ะทะฐ โ%sโ ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ัะตะด โ%sโ: %s" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ัะธัะปะพะฒะฐ ััะพะนะฝะพัั โ%sโ ะทะฐ โ%sโ ะฒ %s: %s" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "ะดะพะผะฐัะฝะฐัะฐ ะฟะฐะฟะบะฐ ะฝะฐ ะฟะพััะตะฑะธัะตะปั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะฐ: โ%sโ" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "โ%sโ ะฝะต ะต ะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ ะฒัะตะผะต ะทะฐ โ%sโ" -#: config.c:1208 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "ะดัะปะถะธะฝะฐัะฐ ะฝะฐ ััะบัะฐัะฐะฒะฐะฝะต ะต ะธะทะฒัะฝ ะธะฝัะตัะฒะฐะปะฐ ([4; 40]): %d" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะฝะธะฒะพ ะฝะฐ ะบะพะผะฟัะตัะธัะฐะฝะต: %d" -#: config.c:1325 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "ะฝะฐัััะพะนะบะฐัะฐ โcore.commentCharโ ัััะฑะฒะฐ ะดะฐ ะต ัะฐะผะพ ะตะดะธะฝ ะทะฝะฐะบ" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะถะธะผ ะทะฐ ััะทะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะพะฑะตะบัะธ: %s" -#: config.c:1430 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โ%sโ" -#: config.c:1456 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โ%sโ: โ%sโ" -#: config.c:1457 +#: config.c:1472 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" "ัััะฑะฒะฐ ะดะฐ ะต ะตะดะฝะฐ ะพั ัะปะตะดะฝะธัะต ััะพะนะฝะพััะธ: โnothingโ (ะฑะตะท ะธะทัะปะฐัะบะฒะฐะฝะต ะฟัะธ ะปะธะฟัะฐ " @@ -2021,139 +2826,132 @@ msgstr "" "โsimpleโ (ะบะปะพะฝัั ััั ัััะพัะพ ะธะผะต, ะพั ะบะพะนัะพ ัะต ะธะทะดััะฟะฒะฐ), โupstreamโ (ะบะปะพะฝัั, " "ะพั ะบะพะนัะพ ัะต ะธะทะดััะฟะฒะฐ) ะธะปะธ โcurrentโ (ะบะปะพะฝัั ััั ัััะพัะพ ะธะผะต)" -#: config.c:1518 builtin/pack-objects.c:3410 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะฝะธะฒะพ ะฝะฐ ะบะพะผะฟัะตัะธัะฐะฝะต ะฟัะธ ะฟะฐะบะตัะธัะฐะฝะต: %d" -#: config.c:1639 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "ะพะฑะตะบััั-BLOB โ%sโ ั ะบะพะฝัะธะณััะฐัะธะธ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐัะตะดะธ" -#: config.c:1642 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "ัะบะฐะทะฐัะตะปัั โ%sโ ะฝะต ัะพัะธ ะบัะผ ะพะฑะตะบั-BLOB" -#: config.c:1659 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "ะพะฑะตะบััั-BLOB โ%sโ ั ะบะพะฝัะธะณััะฐัะธะธ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธั" -#: config.c:1689 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝ" -#: config.c:1745 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะธ ะฝะฐัััะพะนะบะธ ะพั ะบะพะผะฐะฝะดะฝะธั ัะตะด" -#: config.c:2094 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "ะฝะตะพัะฐะบะฒะฐะฝะฐ ะณัะตัะบะฐ ะฟัะธ ะธะทัะธัะฐะฝะตัะพ ะฝะฐ ะบะพะฝัะธะณััะฐัะธะพะฝะฝะธัะต ัะฐะนะปะพะฒะต" -#: config.c:2264 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "ะะตะฟัะฐะฒะธะปะตะฝ %s: โ%sโ" -#: config.c:2307 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "" -"ะฝะตะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั โ%sโ ะทะฐ ะฝะฐัััะพะนะบะฐัะฐ โcore.untrackedCacheโ. ะฉะต ัะต ะฟะพะปะทะฒะฐ " -"ััะฐะฝะดะฐััะฝะฐัะฐ ััะพะนะฝะพัั โkeepโ (ะทะฐะฟะฐะทะฒะฐะฝะต)" - -#: config.c:2333 +#: config.c:2341 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "ััะพะนะฝะพัััะฐ ะฝะฐ โsplitIndex.maxPercentChangeโ ัััะฑะฒะฐ ะดะฐ ะต ะผะตะถะดั 1 ะธ 100, ะฐ ะฝะต " "%d" -#: config.c:2379 +#: config.c:2387 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "ะฝะตัะฐะทะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั โ%sโ ะพั ะบะพะผะฐะฝะดะฝะธั ัะตะด" -#: config.c:2381 +#: config.c:2389 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฝะฐัััะพะนะบะฐ โ%sโ ะฒัะฒ ัะฐะนะปะฐ โ%sโ ะฝะฐ ัะตะด โ%d" -#: config.c:2462 +#: config.c:2470 #, c-format msgid "invalid section name '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ัะฐะทะดะตะป: โ%sโ" -#: config.c:2494 +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "ะทะฐะดะฐะดะตะฝะธ ัะฐ ะฝัะบะพะปะบะพ ััะพะนะฝะพััะธ ะทะฐ โ%sโ" -#: config.c:2523 +#: config.c:2531 #, c-format msgid "failed to write new configuration file %s" msgstr "ะฝะพะฒะธัั ะบะพะฝัะธะณััะฐัะธะพะฝะตะฝ ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝ" -#: config.c:2775 config.c:3099 +#: config.c:2783 config.c:3107 #, c-format msgid "could not lock config file %s" msgstr "ะบะพะฝัะธะณััะฐัะธะพะฝะฝะธัั ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะบะปััะตะฝ" -#: config.c:2786 +#: config.c:2794 #, c-format msgid "opening %s" msgstr "ะพัะฒะฐััะฝะต ะฝะฐ โ%sโ" -#: config.c:2821 builtin/config.c:328 +#: config.c:2829 builtin/config.c:354 #, c-format msgid "invalid pattern: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะฐะฑะปะพะฝ: %s" -#: config.c:2846 +#: config.c:2854 #, c-format msgid "invalid config file %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะบะพะฝัะธะณััะฐัะธะพะฝะตะฝ ัะฐะนะป: โ%sโ" -#: config.c:2859 config.c:3112 +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โfstatโ ะฒััั ั โ%sโ" -#: config.c:2870 +#: config.c:2878 #, c-format msgid "unable to mmap '%s'" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โmmapโ ะฒััั ั โ%sโ" -#: config.c:2879 config.c:3117 +#: config.c:2887 config.c:3125 #, c-format msgid "chmod on %s failed" msgstr "ะฝะตััะฟะตัะฝะฐ ัะผัะฝะฐ ะฝะฐ ะฟัะฐะฒะฐ ั โchmodโ ะฒััั ั โ%sโ" -#: config.c:2964 config.c:3214 +#: config.c:2972 config.c:3222 #, c-format msgid "could not write config file %s" msgstr "ะบะพะฝัะธะณััะฐัะธะพะฝะฝะธัั ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" -#: config.c:2998 +#: config.c:3006 #, c-format msgid "could not set '%s' to '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะดะฐ ะต โ%sโ" -#: config.c:3000 builtin/remote.c:782 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะตะผะฐั ะฝะต" -#: config.c:3090 +#: config.c:3098 #, c-format msgid "invalid section name: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ัะฐะทะดะตะป: %s" -#: config.c:3257 +#: config.c:3265 #, c-format msgid "missing value for '%s'" msgstr "ะปะธะฟัะฒะฐ ััะพะนะฝะพัั ะทะฐ โ%sโ" @@ -2179,73 +2977,82 @@ msgstr "" msgid "server doesn't support '%s'" msgstr "ัััะฒัััั ะฝะต ะฟะพะดะดััะถะฐ โ%sโ" -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "ัััะฒัััั ะฝะต ะฟะพะดะดััะถะฐ โ%sโ" -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" msgstr "" "ัะปะตะด ะฟััะฒะพะฝะฐัะฐะปะฝะฐัะฐ ะพะฑัะฒะฐ ะฝะฐ ะฒัะทะผะพะถะฝะพััะธัะต ัะต ะพัะฐะบะฒะฐ ะธะทัะธััะฒะฐะฝะต ะฝะฐ ะฑััะตัะธัะต" -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "ะฟัะพะฟััะบะฐะฝะต ะฝะฐ ะฒัะทะผะพะถะฝะพััะธัะต ัะปะตะด ะฟััะฒะธั ัะตะด โ%sโ" -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "ะฟัะพัะพะบะพะปะฝะฐ ะณัะตัะบะฐ: ะฝะตะพัะฐะบะฒะฐะฝะธ ะฒัะทะผะพะถะฝะพััะธ^{}" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "ะฟัะพัะพะบะพะปะฝะฐ ะณัะตัะบะฐ: ะพัะฐะบะฒะฐ ัะต SHA1 ะฝะฐ ะฟะปะธััะบ ะพะฑะตะบั, ะฐ ะฑะต ะฟะพะปััะตะฝะพ: โ%sโ" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "ะพัััะตัะฝะพัะพ ั ัะฐะฝะธะปะธัะต ะฝะต ะผะพะถะต ะดะฐ ะต ะฟะปะธัะบะพ" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟะฐะบะตั" -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "ะฟัะพัะพะบะพะปะฝะฐ ะณัะตัะบะฐ: ะฝะตะพัะฐะบะฒะฐะฝะพ โ%sโ" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "ัััะฒัััั ัะบะฐะทะฐ ะฝะตะฟะพะทะฝะฐั ัะพัะผะฐั ะฝะฐ ะพะฑะตะบั: โ%sโ" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะพัะณะพะฒะพั ะฝะฐ โls-refsโ: โ%sโ" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" -msgstr "ะพัะฐะบะฒะฐัะต ัะต ะธะทัะธััะฒะฐะฝะต ะฝะฐ ะฑััะตัะธัะต ัะปะตะด ะธะทะฑัะพัะฒะฐะฝะตัะพ ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต" +msgstr "ัะปะตะด ะธะทะฑัะพัะฒะฐะฝะตัะพ ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ัะต ะพัะฐะบะฒะฐ ะธะทัะธััะฒะฐะฝะต ะฝะฐ ะฑััะตัะธัะต" + +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "ัะปะตะด ะธะทะฑัะพัะฒะฐะฝะตัะพ ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ัะต ะพัะฐะบะฒะฐ ะฟะฐะบะตั ะทะฐ ะบัะฐะน" -#: connect.c:544 +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" msgstr "ะฟัะพัะพะบะพะป โ%sโ ะฝะต ัะต ะฟะพะดะดััะถะฐ" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" msgstr "ะฝะตััะฟะตัะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ โSO_KEEPALIVEโ ะฝะฐ ะณะฝะตะทะดะพ" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "ะขัััะตะฝะต ะฝะฐ โ%sโโฆ " -#: connect.c:639 +#: connect.c:735 #, 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 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" @@ -2254,7 +3061,7 @@ msgstr "" "ะณะพัะพะฒะพ.\n" "ะกะฒััะทะฒะฐะฝะต ะบัะผ โ%sโ (ะฟะพัั %s)โฆ" -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -2264,91 +3071,91 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "ะดะตะนััะฒะธะตัะพ ะทะฐะฒัััะธ." -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะบัะธะต (%s)" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "ะฝะตะฟะพะทะฝะฐั ะฟะพัั โ%sโ" -#: connect.c:845 connect.c:1171 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "ะฝะตะพะฑะธัะฐะนะฝะพัะพ ะธะผะต ะฝะฐ ั ะพัั โ%sโ ะต ะฑะปะพะบะธัะฐะฝะพ" -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "ะฝะตะพะฑะธัะฐะนะฝะธัั ะฟะพัั โ%sโ ะต ะฑะปะพะบะธัะฐะฝ" -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "ะฟะพััะตะดะฝะธะบัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ััะฐััะธัะฐ" -#: connect.c:924 +#: connect.c:1024 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "ะฝะต ะต ัะบะฐะทะฐะฝ ะฟัั. ะัะพะฒะตัะตัะต ัะธะฝัะฐะบัะธัะฐ ั ะบะพะผะฐะฝะดะฐัะฐ:\n" "\n" " git help pull" -#: connect.c:1119 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" msgstr "ะฒะฐัะธะฐะฝััั ะทะฐ โsshโ โ โsimpleโ (ะพะฟัะพััะตะฝ), ะฝะต ะฟะพะดะดััะถะฐ ะพะฟัะธััะฐ โ-4โ" -#: connect.c:1131 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" msgstr "ะฒะฐัะธะฐะฝััั ะทะฐ โsshโ โ โsimpleโ (ะพะฟัะพััะตะฝ), ะฝะต ะฟะพะดะดััะถะฐ ะพะฟัะธััะฐ โ-6โ" -#: connect.c:1148 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" msgstr "" "ะฒะฐัะธะฐะฝััั ะทะฐ โsshโ โ โsimpleโ (ะพะฟัะพััะตะฝ), ะฝะต ะฟะพะดะดััะถะฐ ะทะฐะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟะพัั" -#: connect.c:1260 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" msgstr "ะฝะตะพะฑะธัะฐะนะฝะธัั ะฟัั โ%sโ ะต ะฑะปะพะบะธัะฐะฝ" -#: connect.c:1307 +#: connect.c:1408 msgid "unable to fork" msgstr "ะฝะตััะฟะตัะฝะพ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟัะพัะตั" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ัะฒััะทะฐะฝะพัััะฐ" -#: connected.c:98 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "ะะพะผะฐะฝะดะฐัะฐ โgit rev-listโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทะฟัะปะฝะตะฝะฐ." -#: connected.c:118 +#: connected.c:144 msgid "failed write to rev-list" msgstr "ะฝะตััะฟะตัะตะฝ ะทะฐะฟะธั ะฝะฐ ัะฟะธััะบะฐ ั ะฒะตััะธะธัะต" -#: connected.c:125 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "ััะฐะฝะดะฐััะฝะธัั ะฒั ะพะด ะฝะฐ ัะฟะธััะบะฐ ั ะฒะตััะธะธัะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐัะฒะพัะตะฝ" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะดะตะนััะฒะธะต ะทะฐ ะบัะฐะน ะฝะฐ ัะตะด: %d" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "ะััะบะฐ ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะพัั ะพั ะทะฝะฐัะธ โCRLFโ ัะต ะฑัะดe ะทะฐะผะตะฝะตะฝะฐ ั โLFโ ะฒ โ%sโ." -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2358,13 +3165,13 @@ msgstr "" "ะคะฐะนะปัั ัะต ะพััะฐะฝะต ั ะฟััะฒะพะฝะฐัะฐะปะฝะธัะต ะทะฝะฐัะธ ะทะฐ ะบัะฐะน ะฝะฐ ัะตะด ะฒ ัะฐะฑะพัะฝะฐัะฐ ะฒะธ " "ะดะธัะตะบัะพัะธั." -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" "ะัะตะบะธ ะทะฝะฐะบ โLFโ ัะต ะฑัะดe ะทะฐะผะตะฝะตะฝ ั ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะพัััะฐ ะพั ะทะฝะฐัะธ โCRLFโ ะฒ โ%sโ." -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2375,21 +3182,21 @@ msgstr "" "ะคะฐะนะปัั ัะต ะพััะฐะฝะต ั ะฟััะฒะพะฝะฐัะฐะปะฝะธัะต ะทะฝะฐัะธ ะทะฐ ะบัะฐะน ะฝะฐ ัะตะด ะฒ ัะฐะฑะพัะฝะฐัะฐ ะฒะธ " "ะดะธัะตะบัะพัะธั." -#: convert.c:279 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" "โ%sโ ะฝะต ัััะฑะฒะฐ ะดะฐ ััะดััะถะฐ ะผะฐัะบะตั ะทะฐ ะฟะพัะตะดะฝะพัััะฐ ะฝะฐ ะฑะฐะนัะพะฒะตัะต (BOM) ะฟัะธ " "ะบะพะดะธัะฐะฝะต โ%sโ" -#: convert.c:286 +#: convert.c:291 #, 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 @@ -2408,50 +3215,50 @@ msgstr "" "ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะธะทะฟะพะปะทะฒะฐะนัะต UTF-%sBE ะธะปะธ UTF-%sLE (ะฒ ะทะฐะฒะธัะธะผะพัั ะพั " "ะฟะพัะตะดะฝะพัััะฐ ะฝะฐ ะฑะฐะนัะพะฒะตัะต)." -#: convert.c:424 convert.c:495 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "ะฝะตััะฟะตัะฝะพ ะฟัะตะบะพะดะธัะฐะฝะต ะฝะฐ โ%sโ ะพั โ%sโ ะบัะผ โ%sโ" -#: convert.c:467 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "ะัะตะบะพะดะธัะฐะฝะตัะพ ะฝะฐ โ%sโ ะพั โ%sโ ะบัะผ โ%sโ ะธ ะพะฑัะฐัะฝะพ ะฟัะพะผะตะฝั ัะฐะนะปะฐ" -#: convert.c:673 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "ะฝะตััะฟะตัะฝะพ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟัะพัะตั ะทะฐ ะฒัะฝัะตะฝ ัะธะปััั โ%sโ" -#: convert.c:693 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "ะฒั ะพะดัั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะดะฐะดะตะฝ ะฝะฐ ะฒัะฝัะฝะธั ัะธะปััั โ%sโ" -#: convert.c:700 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะฒัะฝัะฝะธั ัะธะปััั โ%sโ: %d" -#: convert.c:735 convert.c:738 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "ะฝะตััะฟะตัะฝะพ ัะตัะตะฝะต ะพั ะฒัะฝัะฝะธั ัะธะปััั โ%sโ" -#: convert.c:741 convert.c:796 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะฒัะฝัะฝะธั ัะธะปััั โ%sโ" -#: convert.c:844 +#: convert.c:837 msgid "unexpected filter type" msgstr "ะฝะตะพัะฐะบะฒะฐะฝ ะฒะธะด ัะธะปััั" -#: convert.c:855 +#: convert.c:848 msgid "path name too long for external filter" msgstr "ะฟัััั ะต ะฟัะตะบะฐะปะตะฝะพ ะดัะปัะณ ะทะฐ ะฒัะฝัะตะฝ ัะธะปััั" -#: convert.c:929 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2460,67 +3267,96 @@ msgstr "" "ะฒัะฝัะฝะธัั ัะธะปััั โ%sโ ะฒะตัะต ะฝะต ะต ะฝะฐะปะธัะตะฝ, ะฒัะฟัะตะบะธ ัะต ะฝะต ะฒัะธัะบะธ ะฟััะธัะฐ ัะฐ " "ัะธะปััะธัะฐะฝะธ" -#: convert.c:1228 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" -msgstr "โtrueโ/โfalseโ ะฝะต ะผะพะถะต ะดะฐ ัะฐ ะบะพะดะธัะฐะฝะธั ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" +msgstr "" +"โtrueโ/โfalseโ (ะธััะธะฝะฐ/ะปัะถะฐฬ) ะฝะต ะผะพะถะต ะดะฐ ัะฐ ะบะพะดะธัะฐะฝะธั ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: convert.c:1398 convert.c:1432 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะดะตะบะพะดะธัะฐั ัะธะปััั โ%sโ" -#: convert.c:1476 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะบะพะดะธัะฐั ัะธะปััั โ%sโ" -#: date.c:137 +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ััััะตะฝะตัะพ ะฝะฐ ะธะดะตะฝัะธัะธะบะฐัะธั ัะฟะพัะตะด ะบะปััะฐ: โcredential.%sโ" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "ะฐะดัะตััั ัััะฑะฒะฐ ะทะฐะดัะปะถะธัะตะปะฝะพ ะดะฐ ััะดััะถะฐ ั ะพัั" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "ะฐะดัะตััั ัััะฑะฒะฐ ะทะฐะดัะปะถะธัะตะปะฝะพ ะดะฐ ััะดััะถะฐ ะฟัะพัะพะบะพะป" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "ะฐะดัะตััั ััะดััะถะฐ ะฝะพะฒ ัะตะด ะฒ ัะฐัััะฐ ะทะฐ %s: %s" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "ะฐะดัะตััั ะต ะฑะตะท ัั ะตะผะฐ: %s" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "ะฐะดัะตััั ะทะฐ ะธะดะตะฝัะธัะธะบะฐัะธั ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ: โ%sโ" + +#: date.c:138 msgid "in the future" msgstr "ะฒ ะฑัะดะตัะตัะพ" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "ะฟัะตะดะธ %<PRIuMAX> ัะตะบัะฝะดะฐ" msgstr[1] "ะฟัะตะดะธ %<PRIuMAX> ัะตะบัะฝะดะธ" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "ะฟัะตะดะธ %<PRIuMAX> ะผะธะฝััะฐ" msgstr[1] "ะฟัะตะดะธ %<PRIuMAX> ะผะธะฝััะธ" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "ะฟัะตะดะธ %<PRIuMAX> ัะฐั" msgstr[1] "ะฟัะตะดะธ %<PRIuMAX> ัะฐัะฐ" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "ะฟัะตะดะธ %<PRIuMAX> ะดะตะฝ" msgstr[1] "ะฟัะตะดะธ %<PRIuMAX> ะดะตะฝะฐ" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "ะฟัะตะดะธ %<PRIuMAX> ัะตะดะผะธัะฐ" msgstr[1] "ะฟัะตะดะธ %<PRIuMAX> ัะตะดะผะธัะธ" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "ะฟัะตะดะธ %<PRIuMAX> ะผะตัะตั" msgstr[1] "ะฟัะตะดะธ %<PRIuMAX> ะผะตัะตัะฐ" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2528,14 +3364,14 @@ msgstr[0] "%<PRIuMAX> ะณะพะดะธะฝะฐ" msgstr[1] "%<PRIuMAX> ะณะพะดะธะฝะธ" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "ะฟัะตะดะธ %s ะธ %<PRIuMAX> ะผะตัะตั" msgstr[1] "ะฟัะตะดะธ %s ะธ %<PRIuMAX> ะผะตัะตัะฐ" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2568,15 +3404,6 @@ msgstr "" 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:544 -msgid "Performing inexact rename detection" -msgstr "ะขัััะตะฝะต ะฝะฐ ะฟัะตะธะผะตะฝัะฒะฐะฝะธั ะฝะฐ ะพะฑะตะบัะธ ัััะตัะฐะฝะธ ั ะฟัะพะผะตะฝะธ" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [ะะะฆะะฏโฆ] ะะชะข ะะชะข" @@ -2589,19 +3416,19 @@ msgstr "" "ะะต ะต ั ัะฐะฝะธะปะธัะต ะฝะฐ git. ะะพะปะทะฒะฐะนัะต ะพะฟัะธััะฐ โ--no-indexโ, ะทะฐ ะดะฐ ััะฐะฒะฝะธัะต " "ะฟััะธัะฐ ะธะทะฒัะฝ ัะฐะฑะพัะฝะพ ะดััะฒะพ" -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " ะะตััะฟะตัะฝะพ ัะฐะทะฟะพะทะฝะฐะฒะฐะฝะต ะฝะฐ โ%sโ ะบะฐัะพ ะฟัะพัะตะฝั-ะฟัะฐะณ ะทะฐ ััะฐัะธััะธะบะฐัะฐ ะฟะพ " "ะดะธัะตะบัะพัะธะธ\n" -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " ะะตะฟะพะทะฝะฐั ะฟะฐัะฐะผะตััั โ%sโ ะทะฐ ััะฐัะธััะธะบะฐัะฐ ะฟะพ ะดะธัะตะบัะพัะธะธ'\n" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2610,7 +3437,7 @@ msgstr "" "โdefaultโ (ััะฐะฝะดะฐััะฝะพ), โblocksโ (ะฟะฐััะตัะฐ), โzebraโ (ัะฐะนะต), " "โdimmed_zebraโ (ััะผะฝะพ ัะฐะนะต), โplainโ (ะพะฑะธะบะฝะพะฒะตะฝะพ)" -#: diff.c:324 +#: diff.c:325 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -2623,7 +3450,7 @@ msgstr "" "โallow-indentation-changeโ (ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต ะฒ ะฟัะฐะทะฝะธัะต ะทะฝะฐัะธ ะทะฐ " "ัะพัะผะฐัะธัะฐะฝะต)" -#: diff.c:332 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -2631,12 +3458,12 @@ msgstr "" "โcolor-moved-wsโ: โallow-indentation-changeโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะดััะณะธัะต ัะตะถะธะผะธ " "ะทะฐ ะฟัะฐะทะฝะธ ะทะฝะฐัะธ" -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "ะะตะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั โ%sโ ะทะฐ ะฝะฐัััะพะนะบะฐัะฐ โdiff.submoduleโ" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2645,38 +3472,38 @@ msgstr "" "ะัะตัะบะธ ะฒ ะฝะฐัััะพะนะบะฐัะฐ โdiff.dirstatโ:\n" "%s" -#: diff.c:4215 +#: diff.c:4269 #, c-format msgid "external diff died, stopping at %s" msgstr "" "ะฒัะฝัะฝะฐัะฐ ะฟัะพะณัะฐะผะฐ ะทะฐ ัะฐะทะปะธะบะธ ะทะฐะฒัััะธ ะฝะตััะฟะตัะฝะพ. ะกะฟะธัะฐะฝะต ะฝะฐ ัะฐะฑะพัะฐัะฐ ะฟัะธ โ%sโ" -#: diff.c:4560 +#: diff.c:4618 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "ะะฟัะธะธัะต โ--name-onlyโ, โ--name-statusโ, โ--checkโ ะธ โ-sโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ " "ะตะดะฝะฐ ั ะดััะณะฐ" -#: diff.c:4563 +#: diff.c:4621 msgid "-G, -S and --find-object are mutually exclusive" msgstr "ะะฟัะธะธัะต โ-Gโ, โ-Sโ ะธ โ--find-objectโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ะตะดะฝะฐ ั ะดััะณะฐ" -#: diff.c:4641 +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "ะะฟัะธััะฐ โ--followโ ะธะทะธัะบะฒะฐ ัะพัะฝะพ ะตะดะธะฝ ะฟัั" -#: diff.c:4689 +#: diff.c:4747 #, c-format msgid "invalid --stat value: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โ--statโ: %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "ะพะฟัะธััะฐ โ%sโ ะพัะฐะบะฒะฐ ัะธัะปะพ ะทะฐ ะฐัะณัะผะตะฝั" -#: diff.c:4726 +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2685,44 +3512,44 @@ msgstr "" "ะะตัะฐะทะฟะพะทะฝะฐั ะฟะฐัะฐะผะตััั ะบัะผ ะพะฟัะธััะฐ โ--dirstat/-Xโ:\n" "%s" -#: diff.c:4811 +#: diff.c:4869 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "ะฝะตะฟะพะทะฝะฐั ะฒะธะด ะฟัะพะผัะฝะฐ: โ%cโ ะฒ โ--diff-filter=%sโ" -#: diff.c:4835 +#: diff.c:4893 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั ัะปะตะด โws-error-highlight=%.*sโ" -#: diff.c:4849 +#: diff.c:4907 #, c-format msgid "unable to resolve '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะบัะธะต" -#: diff.c:4899 diff.c:4905 +#: diff.c:4957 diff.c:4963 #, c-format msgid "%s expects <n>/<m> form" msgstr "" "ะพะฟัะธััะฐ โ%sโ ะธะทะธัะบะฒะฐ ััะพะนะฝะพััะธ ะทะฐ ะะะะะะะะะ_%%_ะะ ะะะฏะะ_ะะ_ะะะขะะงะะะ_/" "ะะะะกะะะะะะ_%%_ะะ ะะะฏะะ_ะะ_ะะะะฏะะ ะพั" -#: diff.c:4917 +#: diff.c:4975 #, c-format msgid "%s expects a character, got '%s'" msgstr "ะพะฟัะธััะฐ โ%sโ ะธะทะธัะบะฒะฐ ะทะฝะฐะบ, ะฐ ะฝะต: โ%sโ" -#: diff.c:4938 +#: diff.c:4996 #, c-format msgid "bad --color-moved argument: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฐัะณัะผะตะฝั ะทะฐ โ--color-movedโ: โ%sโ" -#: diff.c:4957 +#: diff.c:5015 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะถะธะผ โ%sโ ะทะฐ โ --color-moved-wsโ" -#: diff.c:4997 +#: diff.c:5055 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2731,153 +3558,153 @@ msgstr "" "ะะฐะนะตัั), โminimalโ (ะผะธะฝะธะผะธะทะธัะฐะฝะต ะฝะฐ ัะฐะทะปะธะบะธัะต), โpatienceโ (ะฟะฐัะธะฐะฝั) ะธ " "โhistogramโ (ั ะธััะพะณัะฐะผะตะฝ)" -#: diff.c:5033 diff.c:5053 +#: diff.c:5091 diff.c:5111 #, c-format msgid "invalid argument to %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฐัะณัะผะตะฝั ะบัะผ โ%sโ" -#: diff.c:5191 +#: diff.c:5248 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "ะฝะตัะฐะทะฟะพะทะฝะฐั ะฟะฐัะฐะผะตััั ะบัะผ ะพะฟัะธััะฐ โ--submoduleโ: โ%sโ" -#: diff.c:5247 +#: diff.c:5304 #, c-format msgid "bad --word-diff argument: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฐัะณัะผะตะฝั ะบัะผ โ--word-diffโ: โ%sโ" -#: diff.c:5270 +#: diff.c:5327 msgid "Diff output format options" msgstr "ะคะพัะผะฐั ะฝะฐ ะธะทั ะพะดะฐ ะทะฐ ัะฐะทะปะธะบะธัะต" -#: diff.c:5272 diff.c:5278 +#: diff.c:5329 diff.c:5335 msgid "generate patch" msgstr "ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะบััะฟะบะธ" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5332 builtin/log.c:176 msgid "suppress diff output" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฐะทะปะธะบะธัะต" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5337 diff.c:5451 diff.c:5458 msgid "<n>" msgstr "ะะ ะะ" -#: diff.c:5281 diff.c:5284 +#: diff.c:5338 diff.c:5341 msgid "generate diffs with <n> lines context" msgstr "ัะฐะนะปะพะฒะตัะต ั ัะฐะทะปะธะบะธ ะดะฐ ัะฐ ั ะบะพะฝัะตะบัั ั ัะฐะบัะฒ ะะ ะะ ัะตะดะพะฒะต" -#: diff.c:5286 +#: diff.c:5343 msgid "generate the diff in raw format" msgstr "ัะฐะนะปะพะฒะตัะต ั ัะฐะทะปะธะบะธ ะดะฐ ัะฐ ะฒ ัััะพะฒ ัะพัะผะฐั" -#: diff.c:5289 +#: diff.c:5346 msgid "synonym for '-p --raw'" msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ-p --statโ" -#: diff.c:5293 +#: diff.c:5350 msgid "synonym for '-p --stat'" msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ-p --statโ" -#: diff.c:5297 +#: diff.c:5354 msgid "machine friendly --stat" msgstr "โ--statโ ะฒัะฒ ัะพัะผะฐั ะทะฐ ัะตัะตะฝะต ะพั ะฟัะพะณัะฐะผะฐ" -#: diff.c:5300 +#: diff.c:5357 msgid "output only the last line of --stat" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะฟะพัะปะตะดะฝะธั ัะตะด ะฝะฐ โ--statโ" -#: diff.c:5302 diff.c:5310 +#: diff.c:5359 diff.c:5367 msgid "<param1,param2>..." msgstr "ะะะ ะะะะขะชะ _1, ะะะ ะะะะขะชะ _2, โฆ" -#: diff.c:5303 +#: diff.c:5360 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฐะทะฟัะตะดะตะปะตะฝะธะตัะพ ะฝะฐ ะฟัะพะผะตะฝะธัะต ะทะฐ ะฒััะบะฐ ะฟะพะดะดะธัะตะบัะพัะธั" -#: diff.c:5307 +#: diff.c:5364 msgid "synonym for --dirstat=cumulative" msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ--dirstat=cumulativeโ" -#: diff.c:5311 +#: diff.c:5368 msgid "synonym for --dirstat=files,param1,param2..." msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ--dirstat=ะคะะะะะะ,ะะะ ะะะะขะชะ _1,ะะะ ะะะะขะชะ _2,โฆโ" -#: diff.c:5315 +#: diff.c:5372 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "ะฟัะตะดัะฟัะตะถะดะฐะฒะฐะฝะต, ะฐะบะพ ะฟัะพะผะตะฝะธัะต ะฒะพะดัั ะดะพ ะผะฐัะบะตัะธ ะทะฐ ะบะพะฝัะปะธะบั ะธะปะธ ะณัะตัะบะธ ะฒ " "ะฟัะฐะทะฝะธัะต ะทะฝะฐัะธ" -#: diff.c:5318 +#: diff.c:5375 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "ััะบัะฐัะตะฝะพ ัะตะทัะผะต ะฝะฐ ััะทะดะฐะดะตะฝะธัะต, ะฟัะตะธะผะตะฝัะฒะฐะฝะธัะต ะธ ัะฐะนะปะพะฒะตัะต ั ะฟัะพะผัะฝะฐ ะฝะฐ " "ัะตะถะธะผะฐ ะฝะฐ ะดะพัััะฟ" -#: diff.c:5321 +#: diff.c:5378 msgid "show only names of changed files" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ะฟัะพะผะตะฝะตะฝะธัะต ัะฐะนะปะพะฒะต" -#: diff.c:5324 +#: diff.c:5381 msgid "show only names and status of changed files" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะผะตะฝะฐัะฐ ะธ ััะฐัะธััะธะบะฐัะฐ ะทะฐ ะฟัะพะผะตะฝะตะฝะธัะต ัะฐะนะปะพะฒะต" -#: diff.c:5326 +#: diff.c:5383 msgid "<width>[,<name-width>[,<count>]]" msgstr "ะจะะ ะะงะะะ[,ะะะ-ะจะะ ะะงะะะ[,ะะ ะะ]]" -#: diff.c:5327 +#: diff.c:5384 msgid "generate diffstat" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะฐัะธััะธะบะฐ ะทะฐ ะฟัะพะผะตะฝะธัะต" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5386 diff.c:5389 diff.c:5392 msgid "<width>" msgstr "ะจะะ ะะงะะะ" -#: diff.c:5330 +#: diff.c:5387 msgid "generate diffstat with a given width" msgstr "ััะฐัะธััะธะบะฐ ั ัะฐะบะฐะฒะฐ ะจะะ ะะงะะะ ะทะฐ ะฟัะพะผะตะฝะธัะต" -#: diff.c:5333 +#: diff.c:5390 msgid "generate diffstat with a given name width" msgstr "ััะฐัะธััะธะบะฐ ะทะฐ ะฟัะพะผะตะฝะธัะต ั ัะฐะบะฐะฒะฐ ะจะะ ะะงะะะ ะฝะฐ ะธะผะตะฝะฐัะฐ" -#: diff.c:5336 +#: diff.c:5393 msgid "generate diffstat with a given graph width" msgstr "ััะฐัะธััะธะบะฐ ะทะฐ ะฟัะพะผะตะฝะธัะต ั ัะฐะบะฐะฒะฐ ะจะะ ะะงะะะ ะฝะฐ ะณัะฐฬัะฐ" -#: diff.c:5338 +#: diff.c:5395 msgid "<count>" msgstr "ะะ ะะ" -#: diff.c:5339 +#: diff.c:5396 msgid "generate diffstat with limited lines" msgstr "ะพะณัะฐะฝะธัะฐะฒะฐะฝะต ะฝะฐ ะะ ะั ะฝะฐ ัะตะดะพะฒะตัะต ะฒ ััะฐัะธััะธะบะฐัะฐ ะทะฐ ะฟัะพะผะตะฝะธัะต" -#: diff.c:5342 +#: diff.c:5399 msgid "generate compact summary in diffstat" msgstr "ะบัะฐัะบะพ ัะตะทัะผะต ะฒ ััะฐัะธััะธะบะฐัะฐ ะทะฐ ะฟัะพะผะตะฝะธัะต" -#: diff.c:5345 +#: diff.c:5402 msgid "output a binary diff that can be applied" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะดะฒะพะธัะฝะฐ ัะฐะทะปะธะบะฐ ะฒัะฒ ะฒะธะด ะทะฐ ะฟัะธะปะฐะณะฐะฝะต" -#: diff.c:5348 +#: diff.c:5405 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฟัะปะฝะธัะต ะธะผะตะฝะฐ ะฝะฐ ะพะฑะตะบัะธ ะฒ ัะตะดะพะฒะตัะต ะทะฐ ะธะฝะดะตะบัะฐ ะฟัะธ ะฒะฐัะธะฐะฝัะธัะต " "ะฟัะตะดะธ ะธ ัะปะตะด ะฟัะพะผัะฝะฐัะฐ" -#: diff.c:5350 +#: diff.c:5407 msgid "show colored diff" msgstr "ัะฐะทะปะธะบะธ ะฒ ัะฒัั" -#: diff.c:5351 +#: diff.c:5408 msgid "<kind>" msgstr "ะะะ" -#: diff.c:5352 +#: diff.c:5409 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2885,7 +3712,7 @@ msgstr "" "ะณัะตัะบะธัะต ะฒ ะฟัะฐะทะฝะธัะต ะทะฝะฐัะธ ะดะฐ ัะต ัะบะฐะทะฒะฐั ะฒ ัะตะดะพะฒะตัะต ะทะฐ ะบะพะฝัะตะบััะฐ, ะฒะฐัะธะฐะฝัะธัะต " "ะฟัะตะดะธ ะธ ัะปะตะด ัะฐะทะปะธะบะฐัะฐ," -#: diff.c:5355 +#: diff.c:5412 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2893,257 +3720,257 @@ msgstr "" "ะฑะตะท ะฟัะตะธะผะตะฝัะฒะฐะฝะต ะฝะฐ ะฟััะธัะฐัะฐ. ะะฐ ัะต ะธะทะฟะพะปะทะฒะฐั ะฝัะปะตะฒะธ ะฑะฐะนัะพะฒะต ะทะฐ ัะฐะทะดะตะปะธัะตะปะธ " "ะฝะฐ ะฟะพะปะตัะฐ ะฒ ะธะทั ะพะดะฐ ะฟัะธ ะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะพะฟัะธััะฐ โ--rawโ ะธะปะธ โ--numstatโ" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 msgid "<prefix>" msgstr "ะะ ะะคะะะก" -#: diff.c:5359 +#: diff.c:5416 msgid "show the given source prefix instead of \"a/\"" msgstr "ะฟัะตัะธะบั ะฒะผะตััะพ โa/โ ะทะฐ ะธะทัะพัะฝะธะบ" -#: diff.c:5362 +#: diff.c:5419 msgid "show the given destination prefix instead of \"b/\"" msgstr "ะฟัะตัะธะบั ะฒะผะตััะพ โb/โ ะทะฐ ัะตะป" -#: diff.c:5365 +#: diff.c:5422 msgid "prepend an additional prefix to every line of output" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะดะพะฟัะปะฝะธัะตะปะตะฝ ะฟัะตัะธะบั ะทะฐ ะฒัะตะบะธ ัะตะด ะฝะฐ ะธะทั ะพะดะฐ" -#: diff.c:5368 +#: diff.c:5425 msgid "do not show any source or destination prefix" msgstr "ะฑะตะท ะฟัะตัะธะบั ะทะฐ ะธะทัะพัะฝะธะบะฐ ะธ ัะตะปัะฐ" -#: diff.c:5371 +#: diff.c:5428 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะบะพะฝัะตะบัั ะผะตะถะดั ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะธัะต ะฟะฐััะตัะฐ ั ัะฐะทะปะธะบะธ ะพั ัะบะฐะทะฐะฝะธั " "ะะ ะะ ัะตะดะพะฒะต" -#: diff.c:5375 diff.c:5380 diff.c:5385 +#: diff.c:5432 diff.c:5437 diff.c:5442 msgid "<char>" msgstr "ะะะะ" -#: diff.c:5376 +#: diff.c:5433 msgid "specify the character to indicate a new line instead of '+'" msgstr "ะทะฝะฐะบ ะฒะผะตััะพ โ+โ ะทะฐ ะฝะพะฒ ะฒะฐัะธะฐะฝั ะฝะฐ ัะตะด" -#: diff.c:5381 +#: diff.c:5438 msgid "specify the character to indicate an old line instead of '-'" msgstr "ะทะฝะฐะบ ะฒะผะตััะพ โ-โ ะทะฐ ััะฐั ะฒะฐัะธะฐะฝั ะฝะฐ ัะตะด" -#: diff.c:5386 +#: diff.c:5443 msgid "specify the character to indicate a context instead of ' '" msgstr "ะทะฝะฐะบ ะฒะผะตััะพ โ โ ะทะฐ ะบะพะฝัะตะบัั" -#: diff.c:5389 +#: diff.c:5446 msgid "Diff rename options" msgstr "ะะฐัััะพะนะบะธ ะทะฐ ัะฐะทะปะธะบะธ ั ะฟัะตะธะผะตะฝัะฒะฐะฝะต" -#: diff.c:5390 +#: diff.c:5447 msgid "<n>[/<m>]" msgstr "ะะะะะะะะะ_%_ะะ ะะะฏะะ_ะะ_ะะะขะะงะะะ[/ะะะะกะะะะEะ_%_ะะ ะะะฏะะ_ะะ_ะะะะฏะะ]" -#: diff.c:5391 +#: diff.c:5448 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "ะทะฐะผะตััะฒะฐะฝะต ะฝะฐ ะฟัะปะฝะธัะต ะฟัะพะผะตะฝะธ ั ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะพัั ะพั ะธะทััะธะฒะฐะฝะต ะธ ััะทะดะฐะฒะฐะฝะต" -#: diff.c:5395 +#: diff.c:5452 msgid "detect renames" msgstr "ะทะฐัะธัะฐะฝะต ะฝะฐ ะฟัะตะธะผะตะฝัะฒะฐะฝะธััะฐ" -#: diff.c:5399 +#: diff.c:5456 msgid "omit the preimage for deletes" msgstr "ะฑะตะท ะฟัะตะดะฒะฐัะธัะตะปะตะฝ ะฒะฐัะธะฐะฝั ะฟัะธ ะธะทััะธะฒะฐะฝะต" -#: diff.c:5402 +#: diff.c:5459 msgid "detect copies" msgstr "ะทะฐัะธัะฐะฝะต ะฝะฐ ะบะพะฟะธัะฐะฝะธััะฐ" -#: diff.c:5406 +#: diff.c:5463 msgid "use unmodified files as source to find copies" msgstr "ััััะตะฝะต ะฝะฐ ะบะพะฟะธัะฐะฝะพ ะธ ะพั ะฝะตะฟัะพะผะตะฝะตะฝะธัะต ัะฐะนะปะพะฒะต" -#: diff.c:5408 +#: diff.c:5465 msgid "disable rename detection" msgstr "ะฑะตะท ััััะตะฝะต ะฝะฐ ะฟัะตะธะผะตะฝัะฒะฐะฝะธั" -#: diff.c:5411 +#: diff.c:5468 msgid "use empty blobs as rename source" msgstr "ะฟัะฐะทะฝะธ ะพะฑะตะบัะธ ะบะฐัะพ ะธะทัะพัะฝะธะบ ะฟัะธ ะฟัะตะธะผะตะฝัะฒะฐะฝะธั" -#: diff.c:5413 +#: diff.c:5470 msgid "continue listing the history of a file beyond renames" msgstr "" "ะฟัะพะดัะปะถะฐะฒะฐะฝะต ะฝะฐ ะธะทะฒะตะถะดะฐะฝะตัะพ ะฝะฐ ะธััะพัะธััะฐ โ ะฑะตะท ะพัััะทะฒะฐะฝะตัะพ ะฟัะธ ะฟัะตะธะผะตะฝัะฒะฐะฝะธั " "ะฝะฐ ัะฐะนะป" -#: diff.c:5416 +#: diff.c:5473 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" "ะฑะตะท ะทะฐัะธัะฐะฝะต ะฝะฐ ะฟัะตะธะผะตะฝัะฒะฐะฝะธั/ะบะพะฟะธัะฐะฝะธั, ะฐะบะพ ะฑัะพัั ะธะผ ะฝะฐะดะฒะธัะฐะฒะฐ ัะฐะทะธ ััะพะนะฝะพัั" -#: diff.c:5418 +#: diff.c:5475 msgid "Diff algorithm options" msgstr "ะะฟัะธะธ ะบัะผ ะฐะปะณะพัะธััะผะฐ ะทะฐ ัะฐะทะปะธะบะธ" -#: diff.c:5420 +#: diff.c:5477 msgid "produce the smallest possible diff" msgstr "ััััะตะฝะต ะฝะฐ ะฒัะทะผะพะถะฝะพ ะฝะฐะน-ะผะฐะปะบะฐ ัะฐะทะปะธะบะฐ" -#: diff.c:5423 +#: diff.c:5480 msgid "ignore whitespace when comparing lines" msgstr "ะฑะตะท ะฟัะพะผะตะฝะธ ะฒ ะฟัะฐะทะฝะธัะต ะทะฝะฐัะธ ะฟัะธ ััะฐะฒะฝัะฒะฐะฝะต ะฝะฐ ัะตะดะพะฒะต" -#: diff.c:5426 +#: diff.c:5483 msgid "ignore changes in amount of whitespace" msgstr "ะฑะตะท ะฟัะพะผะตะฝะธ ะฒ ะฟัะฐะทะฝะธัะต ะทะฝะฐัะธ" -#: diff.c:5429 +#: diff.c:5486 msgid "ignore changes in whitespace at EOL" msgstr "ะฑะตะท ะฟัะพะผะตะฝะธ ะฒ ะฟัะฐะทะฝะธัะต ะทะฝะฐัะธ ะฒ ะบัะฐั ะฝะฐ ัะตะดะพะฒะตัะต" -#: diff.c:5432 +#: diff.c:5489 msgid "ignore carrier-return at the end of line" msgstr "ะฑะตะท ะฟัะพะผะตะฝะธ ะฒ ะทะฝะฐัะธัะต ะทะฐ ะบัะฐะน ะฝะฐ ัะตะด" -#: diff.c:5435 +#: diff.c:5492 msgid "ignore changes whose lines are all blank" msgstr "ะฑะตะท ะฟัะพะผะตะฝะธ ะฒ ัะตะดะพะฒะตัะต, ะบะพะธัะพ ัะฐ ะธะทััะปะพ ะพั ะฟัะฐะทะฝะธ ะทะฝะฐัะธ" -#: diff.c:5438 +#: diff.c:5495 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "ะตะฒัะธััะธะบะฐ ะทะฐ ะฟัะตะผะตััะฒะฐะฝะต ะฝะฐ ะณัะฐะฝะธัะธัะต ะฝะฐ ะฟะฐััะตัะฐัะฐ ะทะฐ ัะปะตัะฝัะฒะฐะฝะต ะฝะฐ ัะตัะตะฝะตัะพ" -#: diff.c:5441 +#: diff.c:5498 msgid "generate diff using the \"patience diff\" algorithm" msgstr "ัะฐะทะปะธะบะฐ ััะตะท ะฐะปะณะพัะธััะผ ะทะฐ ะฟะพะดัะตะดะฑะฐ ะบะฐัะพ ะฟะฐัะธะฐะฝั" -#: diff.c:5445 +#: diff.c:5502 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "ัะฐะทะปะธะบะฐ ะฟะพ ั ะธััะพะณัะฐะผะฝะธั ะฐะปะณะพัะธััะผ" -#: diff.c:5447 +#: diff.c:5504 msgid "<algorithm>" msgstr "ะะะะะ ะะขะชะ" -#: diff.c:5448 +#: diff.c:5505 msgid "choose a diff algorithm" msgstr "ะธะทะฑะพั ะฝะฐ ะะะะะ ะะขะชะะฐ ะทะฐ ัะฐะทะปะธะบะธ" -#: diff.c:5450 +#: diff.c:5507 msgid "<text>" msgstr "ะขะะะกะข" -#: diff.c:5451 +#: diff.c:5508 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "ัะฐะทะปะธะบะฐ ััะตะท ะฐะปะณะพัะธััะผะฐ ััั ะทะฐะบะพัะฒัะฝะต" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5510 diff.c:5519 diff.c:5522 msgid "<mode>" msgstr "ะ ะะะะ" -#: diff.c:5454 +#: diff.c:5511 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "ัะฐะทะปะธะบะฐ ะฟะพ ะดัะผะธ, ะบะฐัะพ ัะต ะฟะพะปะทะฒะฐ ัะพะทะธ ะ ะะะะ ะทะฐ ะพัะดะตะปัะฝะตัะพ ะฝะฐ ะฟัะพะผะตะฝะตะฝะธัะต ะดัะผะธ" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5513 diff.c:5516 diff.c:5561 msgid "<regex>" msgstr "ะ ะะะฃะะฏะ ะะ_ะะะ ะะ" -#: diff.c:5457 +#: diff.c:5514 msgid "use <regex> to decide what a word is" msgstr "ะ ะะะฃะะฏะ ะะ_ะะะ ะะ ะทะฐ ัะฐะทะดะตะปัะฝะต ะฟะพ ะดัะผะธ" -#: diff.c:5460 +#: diff.c:5517 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ--word-diff=color --word-diff-regex=ะ ะะะฃะะฏะ ะะ_ะะะ ะะโ" -#: diff.c:5463 +#: diff.c:5520 msgid "moved lines of code are colored differently" msgstr "ัะฐะทะปะธัะตะฝ ัะฒัั ะทะฐ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัะตะผะตััะตะฝะธัะต ัะตะดะพะฒะต" -#: diff.c:5466 +#: diff.c:5523 msgid "how white spaces are ignored in --color-moved" msgstr "" "ัะตะถะธะผ ะทะฐ ะฟัะตัะบะฐัะฐะฝะตัะพ ะฝะฐ ะฟัะฐะทะฝะธัะต ะทะฝะฐัะธ ะฟัะธ ะทะฐะดะฐะฒะฐะฝะตัะพ ะฝะฐ โ--color-movedโ" -#: diff.c:5469 +#: diff.c:5526 msgid "Other diff options" msgstr "ะััะณะธ ะพะฟัะธะธ ะทะฐ ัะฐะทะปะธะบะธ" -#: diff.c:5471 +#: diff.c:5528 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "ะฟัะธ ะธะทะฟัะปะฝะตะฝะธะต ะพั ะฟะพะดะดะธัะตะบัะพัะธั ะดะฐ ัะต ะฟัะตะฝะตะฑัะตะณะฒะฐั ัะฐะทะปะธะบะธัะต ะธะทะฒัะฝ ะฝะตั ะธ ะดะฐ " "ัะต ะฟะพะปะทะฒะฐั ะพัะฝะพัะธัะตะปะฝะธ ะฟััะธัะฐ" -#: diff.c:5475 +#: diff.c:5532 msgid "treat all files as text" msgstr "ะพะฑัะฐะฑะพัะบะฐ ะฝะฐ ะฒัะธัะบะธ ัะฐะนะปะพะฒะต ะบะฐัะพ ัะตะบััะพะฒะธ" -#: diff.c:5477 +#: diff.c:5534 msgid "swap two inputs, reverse the diff" msgstr "ัะฐะทะผัะฝะฐ ะฝะฐ ะดะฒะฐัะฐ ะฒั ะพะดะฐ โ ะพะฑัััะฐะฝะต ะฝะฐ ัะฐะทะปะธะบะฐัะฐ" -#: diff.c:5479 +#: diff.c:5536 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" "ะทะฐะฒัััะฒะฐะฝะต ั ะบะพะด ะทะฐ ััััะพัะฝะธะต 1 ะฟัะธ ะฝะฐะปะธัะธะตัะพ ะฝะฐ ัะฐะทะปะธะบะธ, ะฐ ะฒ ะฟัะพัะธะฒะตะฝ " "ัะปััะฐะน โ ั 0" -#: diff.c:5481 +#: diff.c:5538 msgid "disable all output of the program" msgstr "ะฑะตะท ะฒััะบะฐะบัะฒ ะธะทั ะพะด ะพั ะฟัะพะณัะฐะผะฐัะฐ" -#: diff.c:5483 +#: diff.c:5540 msgid "allow an external diff helper to be executed" msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะฒัะฝัะฝะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ ะทะฐ ัะฐะทะปะธะบะธ" -#: diff.c:5485 +#: diff.c:5542 msgid "run external text conversion filters when comparing binary files" msgstr "" "ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะฒัะฝัะฝะธ ะฟัะพะณัะฐะผะธ-ัะธะปััะธ ะฟัะธ ััะฐะฒะฝะตะฝะธะตัะพ ะฝะฐ ะดะฒะพะธัะฝะธ ัะฐะนะปะพะฒะต" -#: diff.c:5487 +#: diff.c:5544 msgid "<when>" msgstr "ะะะะ" -#: diff.c:5488 +#: diff.c:5545 msgid "ignore changes to submodules in the diff generation" msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต ะฒ ะฟะพะดะผะพะดัะปะธัะต ะฟัะธ ะธะทะฒะตะถะดะฐะฝะตัะพ ะฝะฐ ัะฐะทะปะธะบะธัะต" -#: diff.c:5491 +#: diff.c:5548 msgid "<format>" msgstr "ะคะะ ะะะข" -#: diff.c:5492 +#: diff.c:5549 msgid "specify how differences in submodules are shown" msgstr "ะฝะฐัะธะฝ ะทะฐ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต ะฒ ะฟะพะดะผะพะดัะปะธัะต" -#: diff.c:5496 +#: diff.c:5553 msgid "hide 'git add -N' entries from the index" msgstr "ะฑะตะท ะฒะบะปััะฒะฐะฝะต ะฒ ะธะฝะดะตะบัะฐ ะฝะฐ ะทะฐะฟะธัะธัะต, ะดะพะฑะฐะฒะตะฝะธ ั โgit add -Nโ" -#: diff.c:5499 +#: diff.c:5556 msgid "treat 'git add -N' entries as real in the index" msgstr "ะฒะบะปััะฒะฐะฝะต ะฒ ะธะฝะดะตะบัะฐ ะฝะฐ ะทะฐะฟะธัะธัะต, ะดะพะฑะฐะฒะตะฝะธ ั โgit add -Nโ" -#: diff.c:5501 +#: diff.c:5558 msgid "<string>" msgstr "ะะะ" -#: diff.c:5502 +#: diff.c:5559 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "ััััะตะฝะต ะฝะฐ ัะฐะทะปะธะบะธ, ะบะพะธัะพ ะฟัะพะผะตะฝัั ะฑัะพั ะฝะฐ ะฟะพัะฒะฐ ะฝะฐ ัะบะฐะทะฐะฝะธัะต ะฝะธะทะพะฒะต" -#: diff.c:5505 +#: diff.c:5562 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3151,111 +3978,141 @@ msgstr "" "ััััะตะฝะต ะฝะฐ ัะฐะทะปะธะบะธ, ะบะพะธัะพ ะฟัะพะผะตะฝัั ะฑัะพั ะฝะฐ ะฟะพัะฒะฐ ะฝะฐ ะฝะธะทะพะฒะตัะต, ะบะพะธัะพ ะฝะฐะฟะฐัะฒะฐั " "ะฝะฐ ัะตะณัะปััะฝะธั ะธะทัะฐะท" -#: diff.c:5508 +#: diff.c:5565 msgid "show all changes in the changeset with -S or -G" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะฟัะพะผะตะฝะธ ั โ-Gโ/โ-Sโ" -#: diff.c:5511 +#: diff.c:5568 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "ะะะัั ะบัะผ โ-Sโ ะดะฐ ัะต ััะปะบัะฒะฐ ะบะฐัะพ ัะฐะทัะธัะตะฝ ัะตะณัะปััะตะฝ ะธะทัะฐะท ะฟะพ POSIX" -#: diff.c:5514 +#: diff.c:5571 msgid "control the order in which files appear in the output" msgstr "ัะฟัะฐะฒะปะตะฝะธะต ะฝะฐ ะฟะพะดัะตะดะฑะฐัะฐ ะฝะฐ ัะฐะนะปะพะฒะตัะต ะฒ ะธะทั ะพะดะฐ" -#: diff.c:5515 +#: diff.c:5572 msgid "<object-id>" msgstr "ะะะะะขะะคะะะะขะะ _ะะ_ะะะะะข" -#: diff.c:5516 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "ััััะตะฝะต ะฝะฐ ัะฐะทะปะธะบะธ, ะบะพะธัะพ ะฟัะพะผะตะฝัั ะฑัะพั ะฝะฐ ะฟะพัะฒะฐ ะฝะฐ ัะบะฐะทะฐะฝะธั ะพะฑะตะบั" -#: diff.c:5518 +#: diff.c:5575 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)โฆ[*]]" -#: diff.c:5519 +#: diff.c:5576 msgid "select files by diff type" msgstr "ะธะทะฑะพั ะฝะฐ ัะฐะนะปะพะฒะตัะต ะฟะพ ะฒะธะด ัะฐะทะปะธะบะฐ" -#: diff.c:5521 +#: diff.c:5578 msgid "<file>" msgstr "ะคะะะ" -#: diff.c:5522 +#: diff.c:5579 msgid "Output to a specific file" msgstr "ะะทั ะพะด ะบัะผ ัะบะฐะทะฐะฝะธั ัะฐะนะป" -#: diff.c:6177 +#: diff.c:6236 msgid "inexact rename detection was skipped due to too many files." msgstr "" "ััััะตะฝะตัะพ ะฝะฐ ะฟัะตะธะผะตะฝัะฒะฐะฝะธั ะฝะฐ ะพะฑะตะบัะธ ัััะตัะฐะฝะธ ั ะฟัะพะผะตะฝะธ ัะต ะฟัะตัะบะฐัะฐ ะฟะพัะฐะดะธ " "ะผะฝะพะณะพัะพ ัะฐะนะปะพะฒะต." -#: diff.c:6180 +#: diff.c:6239 msgid "only found copies from modified paths due to too many files." msgstr "" "ัััะฐะฝะพะฒะตะฝะธ ัะฐ ัะฐะผะพ ัะพัะฝะธัะต ะบะพะฟะธั ะฝะฐ ะฟัะพะผะตะฝะตะฝะธัะต ะฟััะธัะฐ ะฟะพัะฐะดะธ ะผะฝะพะณะพัะพ " "ัะฐะนะปะพะฒะต." -#: diff.c:6183 +#: diff.c:6242 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "ะทะฐะดะฐะนัะต ะฟัะพะผะตะฝะปะธะฒะฐัะฐ โ%sโ ะดะฐ ะต ะฟะพะฝะต %d ะธ ะพัะฝะพะฒะพ ะธะทะฟัะปะฝะตัะต ะบะพะผะฐะฝะดะฐัะฐ." -#: dir.c:537 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "ัะฐะนะปัั ั ะฟะพะดัะตะดะฑะฐัะฐ ะฝะฐ ััะพัะฒะตัััะฒะธััะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "ะขัััะตะฝะต ะฝะฐ ะฟัะตะธะผะตะฝัะฒะฐะฝะธั ะฝะฐ ะพะฑะตะบัะธ ัััะตัะฐะฝะธ ั ะฟัะพะผะตะฝะธ" + +#: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "ะฟัััั โ%sโ ะฝะต ััะฒะฟะฐะดะฐ ั ะฝะธะบะพะน ัะฐะนะป ะฒ git" -#: dir.c:926 +#: dir.c:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "ะฝะตะฟะพะทะฝะฐั ัะฐะฑะปะพะฝ: โ%sโ" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "ะฝะตะฟะพะทะฝะฐั ะพััะธัะฐัะตะปะตะฝ ัะฐะฑะปะพะฝ: โ%sโ" + +#: dir.c:809 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" +"ัะฐะนะปัั ะพะฟัะตะดะตะปัั ัะฐััะธัะฝะพัััะฐ ะฝะฐ ะธะทัะตะณะปะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต ะผะพะถะต ะดะฐ ะธะผะฐ ะฟัะพะฑะปะตะผ: " +"ัะฐะฑะปะพะฝัั โ%sโ ัะต ะฟะพะฒัะฐัั" + +#: dir.c:819 +msgid "disabling cone pattern matching" +msgstr "ะธะทะบะปััะฒะฐะฝะต ะฝะฐ ะฟััะตะฒะพะดะฝะพัะพ ะฝะฐะฟะฐัะฒะฐะฝะต" + +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะทะฐ ะธะณะฝะพัะธัะฐะฝะธัะต ัะฐะนะปะพะฒะต (ะบะฐัะพ gitignore)" -#: dir.c:1843 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "ะดะธัะตะบัะพัะธััะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝะฐ" -#: dir.c:2085 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "ะธะผะตัะพ ะธ ะฒะตััะธััะฐ ะฝะฐ ัะดัะพัะพ ะฝะต ะฑัั ะฐ ะฟะพะปััะตะฝะธ" -#: dir.c:2209 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "" "ะบะตััั ะทะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต ะต ะธะทะบะปััะตะฝ ะฝะฐ ัะฐะทะธ ัะธััะตะผะฐ ะธะปะธ ะผะตััะพะฟะพะปะพะถะตะฝะธะต" -#: dir.c:3013 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "ัะฐะนะปัั ั ะธะฝะดะตะบัะฐ ะต ะฟะพะฒัะตะดะตะฝ ะฒ ั ัะฐะฝะธะปะธัะตัะพ โ%sโ" -#: dir.c:3058 dir.c:3063 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "ะดะธัะตะบัะพัะธะธัะต ะทะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะฐั ััะทะดะฐะดะตะฝะธ" -#: dir.c:3092 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "ะดะธัะตะบัะพัะธััะฐ ะฝะฐ git ะฝะต ะผะพะถะต ะดะฐ ัะต ะผะธะณัะธัะฐ ะพั โ%sโ ะดะพ โ%sโ" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "ะะพะดัะบะฐะทะบะฐ: ัะฐะบะฐ ัะต ัะตะดะฐะบัะพััั ะฒะธ ะดะฐ ะทะฐัะฒะพัะธ ัะฐะนะปะฐ โฆ%c" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "ะคะธะปััะธัะฐะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ" -#: entry.c:476 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โstatโ ะฒััั ั ัะฐะนะปะฐ โ%sโ" @@ -3265,7 +4122,7 @@ msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โstatโ ะฒััั ั ัะฐะ msgid "bad git namespace path \"%s\"" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟัั ะบัะผ ะฟัะพัััะฐะฝััะฒะฐ ะพั ะธะผะตะฝะฐ โ%sโ" -#: environment.c:332 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "GIT_DIR ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะดะฐ ะต โ%sโ" @@ -3275,269 +4132,291 @@ msgstr "GIT_DIR ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะดะฐ ะต โ%sโ" msgid "too many args to run %s" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฐัะณัะผะตะฝัะธ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต โ%sโ" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "ะะธะฟัะฒะฐ ะฐะดัะตั ะทะฐ ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต" - -#: fetch-pack.c:151 +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: ะพัะฐะบะฒะฐ ัะต ะฟะปะธััะบ ัะฟะธััะบ" -#: fetch-pack.c:154 +#: fetch-pack.c:179 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: ัะปะตะด ะฟะปะธััะบ ัะฟะธััะบ ัะต ะพัะฐะบะฒะฐ ะธะทัะธััะฒะฐั ะฟะฐะบะตั โflushโ" -#: fetch-pack.c:165 +#: fetch-pack.c:190 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" "git fetch-pack: ะพัะฐะบะฒะฐ ัะต โACKโ/โNAKโ, ะฐ ะฑะต ะฟะพะปััะตะฝ ะธะทัะธััะฒะฐั ะฟะฐะบะตั โflushโ" -#: fetch-pack.c:185 +#: fetch-pack.c:210 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ะพัะฐะบะฒะฐ ัะต โACKโ/โNAKโ, ะฐ ะฑะต ะฟะพะปััะตะฝะพ โ%sโ" -#: fetch-pack.c:196 +#: fetch-pack.c:221 msgid "unable to write to remote" msgstr "ะฝะตะฒัะทะผะพะถะฝะพ ะฟะธัะฐะฝะต ะบัะผ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต" -#: fetch-pack.c:258 +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "ะพะฟัะธััะฐ โ--stateless-rpcโ ะธะทะธัะบะฒะฐ โmulti_ack_detailedโ" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟะปะธััะบ ัะตะด: โ%sโ" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฝะตะฟะปะธััะบ ัะตะด: โ%sโ" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "ะพะฑะตะบััั โ%sโ ะปะธะฟัะฒะฐ" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "ะณัะตัะบะฐ ะฒ ะพะฑะตะบัะฐ: โ%sโ" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "ะฝะต ะต ะพัะบัะธั ะฟะปะธััะบ ะพะฑะตะบั: %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "ะพัะฐะบะฒะฐ ัะต ะฟะปะธััะบ ะธะปะธ ะฝะต ะพะฑะตะบั, ะฐ ะฑะต ะฟะพะปััะตะฝะพ: โ%sโ" -#: fetch-pack.c:417 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "ะฟะพะปััะตะฝะพ ะฑะต %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:448 #, c-format msgid "invalid commit %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต: โ%sโ" -#: fetch-pack.c:465 +#: fetch-pack.c:479 msgid "giving up" msgstr "ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:492 progress.c:339 msgid "done" msgstr "ะดะตะนััะฒะธะตัะพ ะทะฐะฒัััะธ" -#: fetch-pack.c:489 +#: fetch-pack.c:504 #, c-format msgid "got %s (%d) %s" msgstr "ะฟะพะปััะตะฝะพ ะฑะต %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:540 #, c-format msgid "Marking %s as complete" msgstr "ะัะฑะตะปัะทะฒะฐะฝะต ะฝะฐ โ%sโ ะบะฐัะพ ะฟัะปะฝะพ" -#: fetch-pack.c:744 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "ะฒะตัะต ะธะผะฐ โ%sโ (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:824 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฟัะพัะตั ะทะฐ ะดะตะผัะปัะธะฟะปะตะบัะพัะฐ" -#: fetch-pack.c:791 +#: fetch-pack.c:832 msgid "protocol error: bad pack header" msgstr "ะฟัะพัะพะบะพะปะฝะฐ ะณัะตัะบะฐ: ะฝะตะฟัะฐะฒะธะปะฝะฐ ะทะฐะณะปะฐะฒะฝะฐ ัะฐัั ะฝะฐ ะฟะฐะบะตั" -#: fetch-pack.c:859 +#: fetch-pack.c:916 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฟัะพัะตั ะทะฐ โ%sโ" -#: fetch-pack.c:875 +#: fetch-pack.c:933 #, c-format msgid "%s failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โ%sโ" -#: fetch-pack.c:877 +#: fetch-pack.c:935 msgid "error in sideband demultiplexer" msgstr "ะณัะตัะบะฐ ะฒ ะดะตะผัะปัะธะฟะปะตะบัะพัะฐ" -#: fetch-pack.c:908 +#: fetch-pack.c:978 #, c-format msgid "Server version is %.*s" msgstr "ะะตััะธััะฐ ะฝะฐ ัััะฒััะฐ ะต: %.*s" -#: 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 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 #, c-format msgid "Server supports %s" msgstr "ะกััะฒัััั ะฟะพะดะดััะถะฐ โ%sโ" -#: fetch-pack.c:915 +#: fetch-pack.c:985 msgid "Server does not support shallow clients" msgstr "ะกััะฒัััั ะฝะต ะฟะพะดะดััะถะฐ ะฟะปะธัะบะธ ะบะปะธะตะฝัะธ" -#: fetch-pack.c:975 +#: fetch-pack.c:1045 msgid "Server does not support --shallow-since" msgstr "ะกััะฒัััั ะฝะต ะฟะพะดะดััะถะฐ ะพะฟัะธััะฐ โ--shallow-sinceโ" -#: fetch-pack.c:980 +#: fetch-pack.c:1050 msgid "Server does not support --shallow-exclude" msgstr "ะกััะฒัััั ะฝะต ะฟะพะดะดััะถะฐ ะพะฟัะธััะฐ โ--shallow-excludeโ" -#: fetch-pack.c:984 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "ะกััะฒัััั ะฝะต ะฟะพะดะดััะถะฐ ะพะฟัะธััะฐ โ--deepenโ" -#: fetch-pack.c:1001 +#: fetch-pack.c:1056 +msgid "Server does not support this repository's object format" +msgstr "ะกััะฒัััั ะฝะต ะฟะพะดะดััะถะฐ ัะพัะผะฐฬัะฐ ะฝะฐ ะพะฑะตะบัะธัะต ะฝะฐ ัะพะฒะฐ ั ัะฐะฝะธะปะธัะต" + +#: fetch-pack.c:1069 msgid "no common commits" msgstr "ะฝัะผะฐ ะพะฑัะธ ะฟะพะดะฐะฒะฐะฝะธั" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1081 fetch-pack.c:1619 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: ะฝะตััะฟะตัะฝะพ ะดะพััะฐะฒัะฝะต." -#: fetch-pack.c:1151 +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "ัะฐะทะปะธัะฝะธ ะฐะปะณะพัะธัะผะธ โ ะฝะฐ ะบะปะธะตะฝัะฐ: โ%sโ, ะฝะฐ ัััะฒััะฐ: โ%sโ" + +#: fetch-pack.c:1209 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "ัััะฒัััั ะฝะต ะฟะพะดะดััะถะฐ ะฐะปะณะพัะธััะผ โ%sโ" + +#: fetch-pack.c:1229 msgid "Server does not support shallow requests" msgstr "ะกััะฒัััั ะฝะต ะฟะพะดะดััะถะฐ ะฟะปะธัะบะธ ะทะฐัะฒะบะธ" -#: fetch-pack.c:1157 +#: fetch-pack.c:1236 msgid "Server supports filter" msgstr "ะกััะฒัััั ะฟะพะดะดััะถะฐ ัะธะปััะธ" -#: fetch-pack.c:1184 +#: fetch-pack.c:1275 msgid "unable to write request to remote" msgstr "ะฝะตะฒัะทะผะพะถะฝะพ ะฟะธัะฐะฝะต ะบัะผ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต" -#: fetch-pack.c:1202 +#: fetch-pack.c:1293 #, c-format msgid "error reading section header '%s'" msgstr "ะณัะตัะบะฐ ะฟัะธ ะฟัะพัะธัะฐะฝะต ะฝะฐ ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะฝะฐ ัะฐะทะดะตะป โ%sโ" -#: fetch-pack.c:1208 +#: fetch-pack.c:1299 #, c-format msgid "expected '%s', received '%s'" msgstr "ะพัะฐะบะฒะฐ ัะต โ%sโ, ะฐ ะฑะต ะฟะพะปััะตะฝะพ โ%sโ" -#: fetch-pack.c:1247 +#: fetch-pack.c:1360 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ะฝะตะพัะฐะบะฒะฐะฝ ัะตะด ะทะฐ ะฟะพัะฒััะถะดะตะฝะธะต: โ%sโ" -#: fetch-pack.c:1252 +#: fetch-pack.c:1365 #, c-format msgid "error processing acks: %d" msgstr "ะณัะตัะบะฐ ะฟัะธ ะพะฑัะฐะฑะพัะบะฐ ะฝะฐ ะฟะพัะฒััะถะดะตะฝะธััะฐ: %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1375 msgid "expected packfile to be sent after 'ready'" msgstr "" "ะพัะฐะบะฒะฐัะต ัะต ะฟะฐะบะตัะฝะธัั ัะฐะนะป ะดะฐ ะฑัะดะต ะธะทะฟัะฐัะตะฝ ัะปะตะด ะพัะณะพะฒะพั ะทะฐ ะณะพัะพะฒะฝะพัั (ready)" -#: fetch-pack.c:1264 +#: fetch-pack.c:1377 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "ะพัะฐะบะฒะฐัะต ัะต ัะปะตะด ะปะธะฟัะฐ ะฝะฐ ะพัะณะพะฒะพั ะทะฐ ะณะพัะพะฒะฝะพัั (ready) ะดะฐ ะฝะต ัะต ัะต ะฟัะฐัะฐั " "ะดััะณะธ ัะฐะทะดะตะปะธ" -#: fetch-pack.c:1306 +#: fetch-pack.c:1419 #, c-format msgid "error processing shallow info: %d" msgstr "ะณัะตัะบะฐ ะฟัะธ ะพะฑัะฐะฑะพัะบะฐ ะฝะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะดัะปะฑะพัะธะฝะฐัะฐ/ะฟะปะธัะบะพัััะฐ: %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1466 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "ะพัะฐะบะฒะฐ ัะต ะธัะบะฐะฝ ัะบะฐะทะฐัะตะป, ะฐ ะฑะต ะฟะพะปััะตะฝะพ: โ%sโ" -#: fetch-pack.c:1358 +#: fetch-pack.c:1471 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "ะฝะตะพัะฐะบะฒะฐะฝ ะธัะบะฐะฝ ัะบะฐะทะฐัะตะป: โ%sโ" -#: fetch-pack.c:1363 +#: fetch-pack.c:1476 #, c-format msgid "error processing wanted refs: %d" msgstr "ะณัะตัะบะฐ ะฟัะธ ะพะฑัะฐะฑะพัะบะฐัะฐ ะฝะฐ ะธัะบะฐะฝะธัะต ัะบะฐะทะฐัะตะปะธ: %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1506 +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack: ะพัะฐะบะฒะฐ ัะต ะฟะฐะบะตั ะทะฐ ะบัะฐะน ะฝะฐ ะพัะณะพะฒะพัะฐ" + +#: fetch-pack.c:1887 msgid "no matching remote head" msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธั ะฟะพะดั ะพะดัั ะฒััั ะพั ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1910 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต ะฝะต ะธะทะฟัะฐัะธ ะฒัะธัะบะธ ะฝะตะพะฑั ะพะดะธะผะธ ะพะฑะตะบัะธ." -#: fetch-pack.c:1739 +#: fetch-pack.c:1937 #, c-format msgid "no such remote ref %s" msgstr "ัะฐะบัะฒ ะพัะดะฐะปะตัะตะฝ ัะบะฐะทะฐัะตะป ะฝัะผะฐ: %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1940 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "ะกััะฒัััั ะฝะต ะฟะพะทะฒะพะปัะฒะฐ ะทะฐัะฒะบะฐ ะทะฐ ะฝะตะพะฑัะฒะตะฝ ะพะฑะตะบั โ%sโ" -#: gpg-interface.c:321 -msgid "gpg failed to sign the data" -msgstr "ะัะพะณัะฐะผะฐัะฐ โgpgโ ะฝะต ะฟะพะดะฟะธัะฐ ะดะฐะฝะฝะธัะต." - -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฒัะตะผะตะฝะตะฝ ัะฐะนะป" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "ะัะพะณัะฐะผะฐัะฐ ะฝะต ััะฟั ะดะฐ ะทะฐะฟะธัะต ัะฐะผะพััะพััะตะปะฝะธั ะฟะพะดะฟะธั ะฒ โ%sโ" -#: graph.c:97 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "ะัะพะณัะฐะผะฐัะฐ โgpgโ ะฝะต ะฟะพะดะฟะธัะฐ ะดะฐะฝะฝะธัะต." + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ะฝะตะฟัะฐะฒะธะปะฝะธั ัะฒัั โ%.*sโ ะฒ โlog.graphColorsโ" -#: grep.c:2117 +#: 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 #, c-format msgid "'%s': unable to read %s" msgstr "โ%sโ: ัะฐะนะปัั ัะพัะตะฝ ะพั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะปััะตะฝะฐ ะธะฝัะพัะผะฐัะธั ััะตะท โstatโ ะทะฐ โ%sโ" -#: grep.c:2145 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "โ%sโ: ะธะทัะธัะฐะฝะตัะพ ะฒััะฝะฐ ะฟะพ-ะผะฐะปะบะพ ะฑะฐะนัะพะฒะต ะพั ะพัะฐะบะฒะฐะฝะพัะพ" @@ -3568,11 +4447,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" @@ -3580,55 +4459,55 @@ 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 / Synching Repositories" -msgstr "ะะพะผะฐะฝะดะธ ะพั ะฝะธัะบะพ ะฝะธะฒะพ/ะกะธะฝั ัะพะฝะธะทะฐัะธั ะฝะฐ ั ัะฐะฝะธะปะธัะฐ" +msgid "Low-level Commands / Syncing Repositories" +msgstr "ะะพะผะฐะฝะดะธ ะพั ะฝะธัะบะพ ะฝะธะฒะพ / ะกะธะฝั ัะพะฝะธะทะฐัะธั ะฝะฐ ั ัะฐะฝะธะปะธัะฐ" #: help.c:38 msgid "Low-level Commands / Internal Helpers" -msgstr "ะะพะผะฐะฝะดะธ ะพั ะฝะธัะบะพ ะฝะธะฒะพ/ะะพะฟัะปะฝะธัะตะปะฝะธ ะธะฝััััะผะตะฝัะธ" +msgstr "ะะพะผะฐะฝะดะธ ะพั ะฝะธัะบะพ ะฝะธะฒะพ / ะะพะฟัะปะฝะธัะตะปะฝะธ ะธะฝััััะผะตะฝัะธ" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "ะฝะฐะปะธัะฝะธ ะบะพะผะฐะฝะดะธ ะฝะฐ git ะพั โ%sโ" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "ะบะพะผะฐะฝะดะธ ะฝะฐ git ะพั ะดััะณะธ ะดะธัะตะบัะพัะธะธ ะพั โ$PATHโ" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "ะขะพะฒะฐ ัะฐ ะฝะฐะน-ัะตััะพ ะธะทะฟะพะปะทะฒะฐะฝะธัะต ะบะพะผะฐะฝะดะธ ะฝะฐ Git:" -#: help.c:363 git.c:98 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "ะฝะตะฟะพะดะดััะถะฐะฝ ัะฟะธััะบ ะพั ะบะพะผะฐะฝะดะธ โ%sโ" -#: help.c:403 -msgid "The common Git guides are:" -msgstr "ะะพะฟัะปััะฝะธัะต ะฒัะฒะตะดะตะฝะธั ะฒ Git ัะฐ:" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "ะ ัะบะพะฒะพะดััะฒะฐัะฐ ะทะฐ ะบะพะฝัะตะฟัะธะธัะต ะฒ Git ัะฐ:" -#: help.c:512 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "ะะฐ ะฟะพะฒะตัะต ะธะฝัะพัะผะฐัะธั ะทะฐ ะะะะะะะ ะธะทะฟัะปะฝะตัะต โgit help ะะะะะะะโ" -#: help.c:517 +#: help.c:434 msgid "External commands" msgstr "ะัะฝัะฝะธ ะบะพะผะฐะฝะดะธ" -#: help.c:532 +#: help.c:449 msgid "Command aliases" msgstr "ะัะตะฒะดะพะฝะธะผะธ ะฝะฐ ะบะพะผะฐะฝะดะธัะต" -#: help.c:596 +#: help.c:513 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -3637,36 +4516,36 @@ msgstr "" "ะะทะณะปะตะถะดะฐ, ัะต โ%sโ ะต ะบะพะผะฐะฝะดะฐ ะฝะฐ git, ะฝะพ ัั ะฝะต ะผะพะถะต ะดะฐ\n" "ะฑัะดะต ะธะทะฟัะปะฝะตะฝะฐ. ะะตัะพััะฝะพ ะฟะฐะบะตััั โgit-%sโ ะต ะฟะพะฒัะตะดะตะฝ." -#: help.c:655 +#: help.c:572 msgid "Uh oh. Your system reports no Git commands at all." msgstr "ะกััะฐะฝะฝะพ, ะธะทะณะปะตะถะดะฐ, ัะต ะฝะฐ ัะธััะตะผะฐัะฐ ะฒะธ ะฝัะผะฐ ะฝะธัะพ ะตะดะฝะฐ ะบะพะผะฐะฝะดะฐ ะฝะฐ git." -#: help.c:677 +#: help.c:594 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" "ะะ ะะะฃะะ ะะะะะะะ: ะัะพะฑะฒะฐั ัะต ะดะฐ ะธะทะฟัะปะฝะธัะต ะบะพะผะฐะฝะดะฐ ะฝะฐ Git ะฝะฐ ะธะผะต โ%sโ, ะฐ ัะฐะบะฐะฒะฐ " "ะฝะต ัััะตััะฒัะฒะฐ." -#: help.c:682 +#: help.c:599 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" "ะะทะฟัะปะฝะตะฝะธะตัะพ ะฐะฒัะพะผะฐัะธัะฝะพ ะฟัะพะดัะปะถะฐะฒะฐ, ะบะฐัะพ ัะต ััะธัะฐ, ัะต ะธะผะฐัะต ะฟัะตะดะฒะธะด โ%sโ." -#: help.c:687 +#: help.c:604 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "ะะทะฟัะปะฝะตะฝะธะตัะพ ะฐะฒัะพะผะฐัะธัะฝะพ ัะต ะฟัะพะดัะปะถะธ ัะปะตะด %0.1f ัะตะบ., ะบะฐัะพ ัะต ััะธัะฐ, ัะต " "ะธะผะฐัะต ะฟัะตะดะฒะธะด โ%sโ." -#: help.c:695 +#: help.c:612 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: โ%sโ ะฝะต ะต ะบะพะผะฐะฝะดะฐ ะฝะฐ git. ะะพะณะปะตะดะฝะตัะต ะธะทั ะพะดะฐ ะพั โgit --helpโ." -#: help.c:699 +#: help.c:616 msgid "" "\n" "The most similar command is" @@ -3680,16 +4559,16 @@ msgstr[1] "" "\n" "ะะฐะน-ะฑะปะธะทะบะธัะต ะบะพะผะฐะฝะดะธ ัะฐ" -#: help.c:714 +#: help.c:656 msgid "git version [<options>]" msgstr "git version [ะะะฆะะฏโฆ]" -#: help.c:782 +#: help.c:711 #, c-format msgid "%s: %s - %s" msgstr "%s: %s โ %s" -#: help.c:786 +#: help.c:715 msgid "" "\n" "Did you mean this?" @@ -3703,7 +4582,15 @@ msgstr[1] "" "\n" "ะะพะผะฐะฝะดะธ ั ะฟะพะดะพะฑะฝะพ ะธะผะต ัะฐ:" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "ะะธะฟัะฒะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะฐะฒัะพัะฐ\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "ะะธะฟัะฒะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะฟะพะดะฐะปะธั\n" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -3730,78 +4617,100 @@ msgstr "" "ั ัะฐะฝะธะปะธัะต.\n" "\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "ะปะธะฟัะฒะฐ ะฐะดัะตั ะทะฐ ะต-ะฟะพัะฐ, ะฐ ะฐะฒัะพะผะฐัะธัะฝะพัะพ ะพัะณะฐัะฒะฐะฝะต ะต ะธะทะบะปััะตะฝะพ" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" "ะฐะดัะตััั ะทะฐ ะต-ะฟะพัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะณะฐัะฝะฐั (ะฝะฐะน-ะดะพะฑัะพัะพ ะฟัะตะดะฟะพะปะพะถะตะฝะธะต ะฑะต " "โ%sโ)" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "ะปะธะฟัะฒะฐ ะธะผะต, ะฐ ะฐะฒัะพะผะฐัะธัะฝะพัะพ ะพัะณะฐัะฒะฐะฝะต ะต ะธะทะบะปััะตะฝะพ" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "ะธะผะตัะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะณะฐัะฝะฐัะพ (ะฝะฐะน-ะดะพะฑัะพัะพ ะฟัะตะดะฟะพะปะพะถะตะฝะธะต ะฑะต โ%sโ)" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะฟัะฐะทะฝะพ ะธะผะต ะบะฐัะพ ะธะดะตะฝัะธัะธะบะฐัะพั (ะทะฐ <%s>)" -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "ะธะผะตัะพ ััะดััะถะฐ ัะฐะผะพ ะฝะตะฟะพะทะฒะพะปะตะฝะธ ะทะฝะฐัะธ: โ%sโ" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะพัะผะฐั ะฝะฐ ะดะฐัะฐ: %s" -#: 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-filter-options.c:81 +msgid "expected 'tree:<depth>'" +msgstr "ะพัะฐะบะฒะฐ ัะต โtree:ะะชะะะะงะะะโ" + +#: list-objects-filter-options.c:96 +msgid "sparse:path filters support has been dropped" +msgstr "ะฟะพะดะดััะถะบะฐัะฐ ะฝะฐ ัะธะปััะธ ััั โsparse:pathโ ะต ะฟัะตะผะฐั ะฝะฐัะฐ" -#: list-objects.c:142 +#: list-objects-filter-options.c:109 #, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "ะพะฑะตะบั โ%sโ ะฒ ะดััะฒะพัะพ โ%sโ ะต ะพัะฑะตะปัะทะฐะฝ ะบะฐัะพ BLOB, ะฝะพ ะฝะต ะต" +msgid "invalid filter-spec '%s'" +msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะธะปััั: โ%sโ" -#: list-objects.c:378 +#: list-objects-filter-options.c:125 #, c-format -msgid "unable to load root tree for commit %s" -msgstr "ะบะพัะตะฝะพะฒะพัะพ ะดััะฒะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐัะตะดะธ" +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "ะทะฝะฐะบ ะทะฐ ะตะบัะฐะฝะธัะฐะฝะต ะฒ ะฟะพะดัะธะปััั: โ%cโ" + +#: list-objects-filter-options.c:167 +msgid "expected something after combine:" +msgstr "ะดะพะฑะฐะฒะตัะต ะฝะตัะพ ัะปะตะด ะบะพะผะฑะธะฝะธัะฐะฝะตัะพ:" -#: list-objects-filter-options.c:36 +#: list-objects-filter-options.c:249 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:361 +msgid "unable to upgrade repository format to support partial clone" +msgstr "" +"ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัััะธ ัะฐััะธัะฝะพ ะบะปะพะฝะธัะฐะฝะต, ะทะฐัะพัะพ ัะพัะผะฐััั ะฝะฐ ั ัะฐะฝะธะปะธัะตัะพ ะฝะต " +"ะผะพะถะต ะดะฐ ัะต ะพะฑะฝะพะฒะธ" -#: list-objects-filter-options.c:84 -msgid "sparse:path filters support has been dropped" -msgstr "ะฟะพะดะดััะถะบะฐัะฐ ะฝะฐ ัะธะปััะธ ััั โsparse:pathโ ะต ะฟัะตะผะฐั ะฝะฐัะฐ" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "ะฝัะผะฐ ะดะพัััะฟ ะดะพ ัะฐััะธัะฝะพ ะธะทัะตะณะปะตะฝะธั ะพะฑะตะบั-BLOB ะฒ โ%sโ" -#: list-objects-filter-options.c:94 +#: list-objects-filter.c:495 #, c-format -msgid "invalid filter-spec '%s'" -msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะธะปััั: โ%sโ" +msgid "unable to parse sparse filter data in %s" +msgstr "" +"ะดะฐะฝะฝะธัะต ะพั ัะธะปัััะฐ ะทะฐ ัะฐััะธัะฝะธ ะธะทัะตะณะปัะฝะธั ะฒ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะฐั ะฐะฝะฐะปะธะทะธัะฐะฝะธ" + +#: list-objects.c:127 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "ะพะฑะตะบั โ%sโ ะฒ ะดััะฒะพัะพ โ%sโ ะต ะพัะฑะตะปัะทะฐะฝ ะบะฐัะพ ะดััะฒะพ, ะฝะพ ะฝะต ะต" + +#: list-objects.c:140 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "ะพะฑะตะบั โ%sโ ะฒ ะดััะฒะพัะพ โ%sโ ะต ะพัะฑะตะปัะทะฐะฝ ะบะฐัะพ BLOB, ะฝะพ ะฝะต ะต" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฟัะพะผะตะฝะธัะต ั ัะฐะฝะธะปะธัะตัะพ-ะณะฐัะฐะฝั ะฝะฐ ะฝะตะฟัะปะฝะพ ั ัะฐะฝะธะปะธัะต" +#: list-objects.c:375 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "ะบะพัะตะฝะพะฒะพัะพ ะดััะฒะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐัะตะดะธ" -#: lockfile.c:151 +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -3820,135 +4729,125 @@ msgstr "" "ะฟัะธัะธะฝะฐ ะต, ัะต ะฝัะบะพะน ะฟัะพัะตั ะฝะฐ git ะฒ ัะพะฒะฐ ั ัะฐะฝะธะปะธัะต ะต ะทะฐะฑะธะป. ะะฐ ะดะฐ\n" "ะฟัะพะดัะปะถะธัะต ัะฐะฑะพัะฐ, ัะต ัััะฑะฒะฐ ัััะฝะพ ะดะฐ ะธะทััะธะตัะต ัะฐะนะปะฐ:" -#: lockfile.c:159 +#: lockfile.c:160 #, 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: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 "ะฝะตััะฟะตัะฝะพ ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะฝะพะฒะธั ะธะฝะดะตะบั" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "ัะปะตะด ะฐัะณัะผะตะฝัะธัะต ะบัะผ โls-refsโ ัะต ะพัะฐะบะฒะฐ ะธะทัะธััะฒะฐะฝะต ะฝะฐ ะฑััะตัะธัะต" -#: merge-recursive.c:322 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(ะปะพัะพ ะฟะพะดะฐะฒะฐะฝะต)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โadd_cacheinfoโ ะทะฐ ะฟััั โ%sโ. ะกะปะธะฒะฐะฝะตัะพ ะต " "ะฟัะตัััะฐะฝะพะฒะตะฝะพ." -#: merge-recursive.c:354 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โadd_cacheinfoโ ะทะฐ ะพะฑะฝะพะฒัะฒะฐะฝะตัะพ ะฝะฐ ะฟััั โ%sโ. " "ะกะปะธะฒะฐะฝะตัะพ ะต ะฟัะตัััะฐะฝะพะฒะตะฝะพ." -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "ะณัะตัะบะฐ ะฟัะธ ะธะทะณัะฐะถะดะฐะฝะต ะฝะฐ ะดััะฒะตัะฐัะฐ" - -#: merge-recursive.c:863 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "ะณัะตัะบะฐ ะฟัะธ ััะทะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟััั โ%sโ%s" -#: merge-recursive.c:874 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "ะะทััะธะฒะฐะฝะต ะฝะฐ โ%sโ, ะทะฐ ะดะฐ ัะต ะพัะฒะพะฑะพะดะธ ะผัััะพ ะทะฐ ะฟะพะดะดะธัะตะบัะพัะธั\n" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": ะฒัะทะผะพะถะฝะพ ะต ะดะฐ ะธะผะฐ ะบะพะฝัะปะธะบั ะดะธัะตะบัะพัะธั/ัะฐะนะป." -#: merge-recursive.c:897 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" "ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนััะฒะธะตัะพ, ะทะฐ ะดะฐ ะฝะต ัะต ะธะทััะธะต ะฝะตัะปะตะดะตะฝะธัั ัะฐะนะป โ%sโ" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "ะพะฑะตะบััั โ%sโ (%s) ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: merge-recursive.c:941 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "ะพะฑะตะบััั โ%sโ (%s) ัะต ะพัะฐะบะฒะฐัะต ะดะฐ ะต BLOB, ะฐ ะฝะต ะต" -#: merge-recursive.c:965 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ: %s" -#: merge-recursive.c:976 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "ะฝะตััะฟะตัะฝะพ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ัะธะผะฒะพะปะฝะฐัะฐ ะฒััะทะบะฐ โ%sโ: %s" -#: merge-recursive.c:981 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" "ะฝะต ะต ััะฝะพ ะบะฐะบะฒะพ ะดะฐ ัะต ะฟัะฐะฒะธ ั ะพะฑะตะบัะฐ โ%2$sโ (%3$s) ั ะฟัะฐะฒะฐ ะทะฐ ะดะพัััะฟ โ%1$06oโ" -#: merge-recursive.c:1177 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "ะะตััะฟะตัะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ (ะฝะต ะต ะธะทัะตะณะปะตะฝ)" -#: merge-recursive.c:1184 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "ะะตััะฟะตัะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ (ะฝัะผะฐ ะฟะพะดะฐะฒะฐะฝะธั)" -#: merge-recursive.c:1191 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "ะะพะดะผะพะดัะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ัะปัั (ะฑะฐะทะฐัะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะฝะต ะฟัะตะดัะตััะฒะฐ " "ะฟะพะดะฐะฒะฐะฝะธััะฐ)" -#: merge-recursive.c:1199 merge-recursive.c:1211 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "ะัะตะฒัััะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะดะพ ัะปะตะดะฝะพัะพ ะฟะพะดะฐะฒะฐะฝะต:" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "ะัะตะฒัััะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ" -#: merge-recursive.c:1237 +#: merge-recursive.c:1251 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "ะะตััะฟะตัะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ (ะปะธะฟัะฒะฐ ัะปะธะฒะฐะฝะตัะพ, ะบะพะตัะพ ัะต ะฟัะตะดัะตััะฒะฐ " "ะพั ะฟะพะดะฐะฒะฐะฝะธััะฐ)" -#: merge-recursive.c:1241 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "ะะตััะฟะตัะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ (ะฝะต ะต ะฟัะตะฒัััะฐะฝะต)" -#: merge-recursive.c:1242 +#: merge-recursive.c:1256 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" "ะัะบัะธัะพ ะต ัะปะธะฒะฐะฝะต, ะบะพะตัะพ ะผะพะถะต ะดะฐ ัะตัะฐะฒะฐ ะฟัะพะฑะปะตะผะฐ ััั ัะปะธะฒะฐะฝะตัะพ ะฝะฐ " "ะฟะพะดะผะพะดัะปะฐ:\n" -#: merge-recursive.c:1245 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3964,31 +4863,31 @@ msgstr "" "\n" "ะขะพะฒะฐ ะฟัะธะตะผะฐ ะฟัะตะดะปะพะถะตะฝะพัะพ.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "ะะตััะฟะตัะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ (ะพัะบัะธัะธ ัะฐ ะผะฝะพะถะตััะฒะพ ัะปะธะฒะฐะฝะธั)" -#: merge-recursive.c:1327 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "ะะตััะฟะตัะฝะพ ะฒัััะตัะฝะพ ัะปะธะฒะฐะฝะต" -#: merge-recursive.c:1332 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพะฑะฐะฒะธ ะฒ ะฑะฐะทะฐัะฐ ั ะดะฐะฝะฝะธ" -#: merge-recursive.c:1364 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "ะะฒัะพะผะฐัะธัะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ โ%sโ" -#: merge-recursive.c:1387 +#: 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:1459 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3997,7 +4896,7 @@ msgstr "" "ะะะะคะะะะข (%s/ะธะทััะธะฒะฐะฝะต): โ%sโ ะต ะธะทััะธั ะฒ %s, ะฐ โ%sโ ะฒ %s. ะะตััะธั %s ะฝะฐ โ%sโ " "ะต ะพััะฐะฒะตะฝะฐ ะฒ ะดััะฒะพัะพ." -#: merge-recursive.c:1464 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4006,7 +4905,7 @@ msgstr "" "ะะะะคะะะะข (%s/ะธะทััะธะฒะฐะฝะต): โ%sโ ะต ะธะทััะธั ะฒ %s, ะฐ โ%sโ ะต ะฟัะตะธะผะตะฝัะฒะฐะฝ ะฝะฐ โ%sโ ะฒ " "%s. ะะตััะธั %s ะฝะฐ โ%sโ ะต ะพััะฐะฒะตะฝะฐ ะฒ ะดััะฒะพัะพ." -#: merge-recursive.c:1471 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4015,7 +4914,7 @@ msgstr "" "ะะะะคะะะะข (%s/ะธะทััะธะฒะฐะฝะต): โ%sโ ะต ะธะทััะธั ะฒ %s, ะฐ โ%sโ ะฒ %s. ะะตััะธั %s ะฝะฐ โ%sโ " "ะต ะพััะฐะฒะตะฝะฐ ะฒ ะดััะฒะพัะพ: %s." -#: merge-recursive.c:1476 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4024,45 +4923,45 @@ msgstr "" "ะะะะคะะะะข (%s/ะธะทััะธะฒะฐะฝะต): โ%sโ ะต ะธะทััะธั ะฒ %s, ะฐ โ%sโ ะต ะฟัะตะธะผะตะฝัะฒะฐะฝ ะฝะฐ โ%sโ ะฒ " "%s. ะะตััะธั %s ะฝะฐ โ%sโ ะต ะพััะฐะฒะตะฝะฐ ะฒ ะดััะฒะพัะพ: %s." -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "rename" msgstr "ะฟัะตะธะผะตะฝัะฒะฐะฝะต" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "renamed" msgstr "ะฟัะตะธะผะตะฝัะฒะฐะฝ" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "ะัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนััะฒะธะตัะพ, ะทะฐ ะดะฐ ะฝะต ัะต ะธะทะณัะฑะธ ะฟัะพะผะตะฝะตะฝะธัั โ%sโ" -#: merge-recursive.c:1601 +#: 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:1659 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "ะะะะคะะะะข (ะฟัะตะธะผะตะฝัะฒะฐะฝะต/ะดะพะฑะฐะฒัะฝะต): โ%sโ ะต ะฟัะตะธะผะตะฝัะฒะฐะฝ ะฝะฐ โ%sโ ะฒ ะบะปะพะฝ โ%sโ, ะฐ " "โ%sโ ะต ะดะพะฑะฐะฒะตะฝ ะฒ โ%sโ" -#: merge-recursive.c:1690 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "โ%sโ ะต ะดะธัะตะบัะพัะธั ะฒ โ%sโ, ะทะฐัะพะฒะฐ ัะต ะดะพะฑะฐะฒั ะบะฐัะพ โ%sโ" -#: merge-recursive.c:1695 +#: merge-recursive.c:1681 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "ะัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนััะฒะธะตัะพ, ะทะฐ ะดะฐ ะฝะต ัะต ะธะทะณัะฑะธ ะฝะตัะปะตะดะตะฝะธัั ัะฐะนะป โ%sโ. " "ะะผะตััะพ ะฝะตะณะพ ัะต ะดะพะฑะฐะฒั โ%sโ" -#: merge-recursive.c:1714 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4071,18 +4970,18 @@ msgstr "" "ะะะะคะะะะข (ะฟัะตะธะผะตะฝัะฒะฐะฝะต/ะฟัะตะธะผะตะฝัะฒะฐะฝะต): โ%sโ ะต ะฟัะตะธะผะตะฝัะฒะฐะฝ ะฝะฐ โ%sโ ะฒ ะบะปะพะฝ " "โ%sโ, ะฐ โ%sโ ะต ะฟัะตะธะผะตะฝัะฒะฐะฝ ะฝะฐ โ%sโ ะฒ โ%sโ/%s." -#: merge-recursive.c:1719 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (ะฝะตะบะพัะธะณะธัะฐะฝ ะบะพะฝัะปะธะบั)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1805 #, 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:2035 +#: merge-recursive.c:2068 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4093,7 +4992,7 @@ msgstr "" "ะฟะพััะฐะฒะธ โ%sโ, ะทะฐัะพัะพ ะฝัะบะพะปะบะพ ะฝะพะฒะธ ะดะธัะตะบัะพัะธะธ ะฟะพะดะตะปัั ััะดััะถะฐะฝะธะตัะพ ะฝะฐ " "ะดะธัะตะบัะพัะธั โ%sโ, ะบะฐัะพ ะฝะธะบะพั ะฝะต ััะดััะถะฐ ะผะฝะพะทะธะฝััะฒะพ ะพั ัะฐะนะปะพะฒะตัะต ั." -#: merge-recursive.c:2067 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4102,7 +5001,7 @@ msgstr "" "ะะะะคะะะะข (ะบะพัะฒะตะฝะพ ะฟัะตะธะผะตะฝัะฒะฐะฝะต ะฝะฐ ะดะธัะตะบัะพัะธั): ัะปะตะดะฝะธัั ัะฐะนะป ะธะปะธ ะดะธัะตะบัะพัะธั " "โ%sโ ะฝะต ะฟะพะทะฒะพะปัะฒะฐั ะบะพัะฒะตะฝะพัะพ ะฟัะตะธะผะตะฝัะฒะฐะฝะต ะฝะฐ ัะปะตะดะฝะธั ะฟัั/ะธัะฐ: %s." -#: merge-recursive.c:2077 +#: merge-recursive.c:2110 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4112,7 +5011,7 @@ msgstr "" "ััะพัะฒะตัััะฒะฐ ะฝะฐ โ%sโ. ะะพัะฒะตะฝะพ ะฟัะตะธะผะตะฝัะฒะฐะฝะต ะฝะฐ ะดะธัะตะบัะพัะธั ะฒะพะดะธ ะดะพ ะฟะพััะฐะฒัะฝะตัะพ " "ะฝะฐ ัะตะทะธ ะฟััะธัะฐ ัะฐะผ: %s." -#: merge-recursive.c:2169 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4121,7 +5020,7 @@ msgstr "" "ะะะะคะะะะข (ะฟัะตะธะผะตะฝัะฒะฐะฝะต/ะฟัะตะธะผะตะฝัะฒะฐะฝะต): โ%sโ ะต ะฟัะตะธะผะตะฝัะฒะฐะฝ ะฝะฐ โ%sโ ะฒ ะบะปะพะฝ " "โ%sโ, ะฐ โ%sโ ะต ะฟัะตะธะผะตะฝัะฒะฐะฝ ะฝะฐ โ%sโ ะฒ โ%sโ" -#: merge-recursive.c:2413 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4130,52 +5029,52 @@ msgstr "" "ะะ ะะะฃะะ ะะะะะะะ: ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ะฟัะตะธะผะตะฝัะฒะฐะฝะตัะพ ะฝะฐ โ%sโ ะฝะฐ โ%sโ ะฒ โ%sโ, ะทะฐัะพัะพ " "โ%sโ ัััะพ ะต ั ะฟัะพะผะตะฝะตะฝะพ ะธะผะต." -#: merge-recursive.c:2938 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "ะพะฑะตะบััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะพัะตัะต" -#: merge-recursive.c:2941 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "ะพะฑะตะบััั โ%sโ ะฝะต ะต BLOB" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modify" msgstr "ะฟัะพะผัะฝะฐ" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modified" msgstr "ะฟัะพะผะตะฝะตะฝ" -#: merge-recursive.c:3017 +#: merge-recursive.c:3052 msgid "content" msgstr "ััะดััะถะฐะฝะธะต" -#: merge-recursive.c:3021 +#: merge-recursive.c:3056 msgid "add/add" msgstr "ะดะพะฑะฐะฒัะฝะต/ะดะพะฑะฐะฒัะฝะต" -#: merge-recursive.c:3044 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "ะัะตัะบะฐัะฐะฝะต ะฝะฐ โ%sโ (ัะปะตัะธัั ัะตะทัะปัะฐั ะต ะธะดะตะฝัะธัะตะฝ ััั ัะตะณะฐัะฝะธั)" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3101 msgid "submodule" msgstr "ะะะะะะะฃะ" -#: merge-recursive.c:3067 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "ะะะะคะะะะข (%s): ะะพะฝัะปะธะบั ะฟัะธ ัะปะธะฒะฐะฝะต ะฝะฐ โ%sโ" -#: merge-recursive.c:3097 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "ะะพะฑะฐะฒัะฝะต ะบะฐัะพ โ%sโ" -#: merge-recursive.c:3179 +#: merge-recursive.c:3215 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4184,7 +5083,7 @@ msgstr "" "ะะฑะฝะพะฒะตะฝ ะฟัั: โ%sโ ะต ะดะพะฑะฐะฒะตะฝ ะฒ โ%sโ ะฒ ะดะธัะตะบัะพัะธั, ะบะพััะพ ะต ะฟัะตะธะผะตะฝัะฒะฐะฝะฐ ะฒ " "โ%sโ. ะะฑะตะบััั ัะต ะผะตััะธ ะฒ โ%sโ." -#: merge-recursive.c:3182 +#: merge-recursive.c:3218 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4193,7 +5092,7 @@ msgstr "" "ะะะะคะะะะข (ะผะตััะฐ ะฝะฐ ัะฐะนะปะพะฒะต): โ%sโ ะต ะดะพะฑะฐะฒะตะฝ ะฒ โ%sโ ะฒ ะดะธัะตะบัะพัะธั, ะบะพััะพ ะต " "ะฟัะตะธะผะตะฝัะฒะฐะฝะฐ ะฒ โ%sโ. ะัะตะดะปะพะถะตะฝะธะตัะพ ะต ะดะฐ ะฟัะตะผะตััะธัะต ะพะฑะตะบัะฐ ะฒ โ%sโ." -#: merge-recursive.c:3186 +#: merge-recursive.c:3222 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4202,7 +5101,7 @@ msgstr "" "ะะฑะฝะพะฒะตะฝ ะฟัั: โ%sโ ะต ะฟัะตะธะผะตะฝัะฒะฐะฝ ะฝะฐ โ%sโ ะฒ โ%sโ ะฒ ะดะธัะตะบัะพัะธั, ะบะพััะพ ะต " "ะฟัะตะธะผะตะฝัะฒะฐะฝะฐ ะฒ โ%sโ. ะะฑะตะบััั ัะต ะผะตััะธ ะฒ โ%sโ." -#: merge-recursive.c:3189 +#: merge-recursive.c:3225 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4211,179 +5110,207 @@ msgstr "" "ะะะะคะะะะข (ะผะตััะฐ ะฝะฐ ัะฐะนะปะพะฒะต): โ%sโ ะต ะฟัะตะธะผะตะฝัะฒะฐะฝ ะฝะฐ โ%sโ ะฒ โ%sโ ะฒ ะดะธัะตะบัะพัะธั, " "ะบะพััะพ ะต ะฟัะตะธะผะตะฝัะฒะฐะฝะฐ ะฒ โ%sโ. ะัะตะดะปะพะถะตะฝะธะตัะพ ะต ะดะฐ ะฟัะตะผะตััะธัะต ะพะฑะตะบัะฐ ะฒ โ%sโ." -#: merge-recursive.c:3303 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "ะะทััะธะฒะฐะฝะต ะฝะฐ โ%sโ" -#: merge-recursive.c:3326 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "ัะฐะนะป/ะดะธัะตะบัะพัะธั" -#: merge-recursive.c:3331 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "ะดะธัะตะบัะพัะธั/ัะฐะนะป" -#: merge-recursive.c:3338 +#: merge-recursive.c:3374 #, 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:3347 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "ะะพะฑะฐะฒัะฝะต ะฝะฐ โ%sโ" -#: merge-recursive.c:3356 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "ะะะะคะะะะข (ะดะพะฑะฐะฒัะฝะต/ะดะพะฑะฐะฒัะฝะต): ะะพะฝัะปะธะบั ะฟัะธ ัะปะธะฒะฐะฝะต ะฝะฐ โ%sโ" -#: 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 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "ะะตัะต ะต ะพะฑะฝะพะฒะตะฝะพ!" -#: merge-recursive.c:3414 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "ะฝะตััะฟะตัะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะดััะฒะตัะฐัะฐ โ%sโ ะธ โ%sโ" -#: merge-recursive.c:3513 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "ะกะปะธะฒะฐะฝะต:" -#: merge-recursive.c:3526 +#: merge-recursive.c:3563 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "ะพัะบัะธั ะต %u ะพะฑั ะฟัะตะดัะตััะฒะตะฝะธะบ:" msgstr[1] "ะพัะบัะธัะธ ัะฐ %u ะพะฑัะธ ะฟัะตะดัะตััะฒะตะฝะธัะธ:" -#: merge-recursive.c:3565 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "ัะปะธะฒะฐะฝะตัะพ ะฝะต ะฒััะฝะฐ ะฟะพะดะฐะฒะฐะฝะต" -#: merge-recursive.c:3631 +#: merge-recursive.c:3672 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"ะกะปะธะฒะฐะฝะตัะพ ัะต ะฟัะตะทะฐะฟะธัะต ะปะพะบะฐะปะฝะธัะต ะฟัะพะผะตะฝะธ ะฝะฐ ัะตะทะธ ัะฐะนะปะพะฒะต:\n" +" %s" + +#: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "ะะตััะฟะตัะตะฝ ะฐะฝะฐะปะธะท ะฝะฐ ะพะฑะตะบัะฐ โ%sโ" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 msgid "Unable to write index." msgstr "ะะฝะดะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: midx.c:69 +#: merge.c:41 +msgid "failed to read the cache" +msgstr "ะบะตััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "ะฝะตััะฟะตัะฝะพ ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะฝะพะฒะธั ะธะฝะดะตะบั" + +#: midx.c:79 #, c-format msgid "multi-pack-index file %s is too small" msgstr "ัะฐะนะปัั ั ะธะฝะดะตะบัะฐ ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ โ%sโ ะต ัะฒััะดะต ะผะฐะปัะบ" -#: midx.c:85 +#: midx.c:95 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "ะพัะฟะตัะฐััะบัั ะฝะฐ ะธะฝะดะตะบัะฐ ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ 0x%08x ะฝะต ััะฒะฟะฐะดะฐ ั 0x%08x" -#: midx.c:90 +#: midx.c:100 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะฒะตััะธั ะฝะฐ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ โ %d" -#: midx.c:95 +#: midx.c:105 #, c-format -msgid "hash version %u does not match" -msgstr "ะฒะตััะธััะฐ ะฝะฐ ะพัะฟะตัะฐััะบะฐ %u ะฝะต ััะฒะฟะฐะดะฐ" +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "" +"ะฒะตััะธััะฐ ะฝะฐ ะบะพะฝััะพะปะฝะฐัะฐ ััะผะฐ ะฝะฐ ะธะฝะดะตะบัะฐ ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ %u ะฝะต ััะฒะฟะฐะดะฐ ั " +"%u" -#: midx.c:109 +#: midx.c:122 msgid "invalid chunk offset (too large)" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ (ะฟัะตะบะฐะปะตะฝะพ ะณะพะปัะผะพ) ะพัะผะตััะฒะฐะฝะต ะฝะฐ ะพัะบัั" -#: midx.c:133 +#: midx.c:146 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "ะธะดะตะฝัะธัะธะบะฐัะพััั ะทะฐ ะบัะฐะตะฝ ะพัะบัั ะฝะฐ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ ัะต ัะฒัะฒะฐ ะฟะพ-" "ัะฐะฝะพ ะพั ะพัะฐะบะฒะฐะฝะพัะพ" -#: midx.c:146 +#: midx.c:159 msgid "multi-pack-index missing required pack-name chunk" msgstr "ะปะธะฟัะฒะฐ ะพัะบัั (pack-name) ะพั ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ" -#: midx.c:148 +#: midx.c:161 msgid "multi-pack-index missing required OID fanout chunk" msgstr "ะปะธะฟัะฒะฐ ะพัะบัั (OID fanout) ะพั ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ" -#: midx.c:150 +#: midx.c:163 msgid "multi-pack-index missing required OID lookup chunk" msgstr "ะปะธะฟัะฒะฐ ะพัะบัั (OID lookup) ะพั ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ" -#: midx.c:152 +#: midx.c:165 msgid "multi-pack-index missing required object offsets chunk" msgstr "ะปะธะฟัะฒะฐ ะพัะบัั ะทะฐ ะพัะผะตััะฒะฐะฝะธััะฐ ะฝะฐ ะพะฑะตะบัะธ ะพั ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ" -#: midx.c:166 +#: midx.c:179 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฟะพะดัะตะดะฑะฐ ะฝะฐ ะธะผะตะฝะฐัะฐ ะฒ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ: โ%sโ ัะต ะฟะพัะฒะธ " "ะฟัะตะดะธ โ%sโ" -#: midx.c:211 +#: midx.c:222 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" "ะฝะตะฟัะฐะฒะธะปะตะฝ ะธะดะตะฝัะธัะธะบะฐัะพั ะฝะฐ ะฟะฐะบะตั (pack-int-id): %u (ะพั ะพะฑัะพ %u ะฟะฐะบะตัะธ)" -#: midx.c:261 +#: midx.c:272 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "ะธะฝะดะตะบััั ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ ััะดััะถะฐ 64-ะฑะธัะพะฒะธ ะพัะผะตััะฒะฐะฝะธั, ะฝะพ ัะฐะทะผะตััั ะฝะฐ " "โoff_tโ ะต ะฝะตะดะพััะฐัััะตะฝ" -#: midx.c:289 +#: midx.c:300 msgid "error preparing packfile from multi-pack-index" msgstr "" "ะณัะตัะบะฐ ะฟัะธ ััะทะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟะฐะบะตัะตะฝ ัะฐะนะป ะฝะฐ ะฑะฐะทะฐัะฐ ะฝะฐ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตััะฒะพ " "ะฟะฐะบะตัะธ" -#: midx.c:470 +#: midx.c:485 #, c-format msgid "failed to add packfile '%s'" msgstr "ะฟะฐะบะตัะฝะธัั ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะดะพะฑะฐะฒะตะฝ" -#: midx.c:476 +#: midx.c:491 #, c-format msgid "failed to open pack-index '%s'" msgstr "ะธะฝะดะตะบััั ะทะฐ ะฟะฐะบะตัะธ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ" -#: midx.c:536 +#: midx.c:551 #, c-format msgid "failed to locate object %d in packfile" msgstr "ะพะฑะตะบั %d ะฒ ะฟะฐะบะตัะฝะธั ัะฐะนะป ะปะธะฟัะฒะฐ" -#: midx.c:865 +#: midx.c:853 +msgid "Adding packfiles to multi-pack-index" +msgstr "ะะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะฐะบะตัะฝะธ ัะฐะนะปะพะฒะต ะบัะผ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ" + +#: midx.c:886 #, c-format msgid "did not see pack-file %s to drop" msgstr "ะฟะฐะบะตัะฝะธัั ัะฐะนะป ะทะฐ ััะธะตะฝะต โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะบัะธะต" -#: midx.c:1036 +#: midx.c:938 +msgid "no pack files to index." +msgstr "ะฝัะผะฐ ะฟะฐะบะตัะฝะธ ัะฐะนะปะพะฒะต ะทะฐ ะธะฝะดะตะบัะธัะฐะฝะต" + +#: midx.c:990 +msgid "Writing chunks to multi-pack-index" +msgstr "ะะฐะฟะธั ะฝะฐ ะพัะบััะธ ะบัะผ ะธะฝะดะตะบั ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ" + +#: midx.c:1068 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "ะธะฝะดะตะบััั ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทัะธััะตะฝ ะฟัะธ โ%sโ" -#: midx.c:1091 +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "ัะฐะนะปัั ั ะธะฝะดะตะบัะฐ ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ, ะฝะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝ" + +#: midx.c:1132 msgid "Looking for referenced packfiles" msgstr "ะขัััะตะฝะต ะฝะฐ ัะบะฐะทะฐะฝะธัะต ะฟะฐะบะตัะฝะธ ัะฐะนะปะพะฒะต" -#: midx.c:1106 +#: midx.c:1147 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -4391,60 +5318,72 @@ msgstr "" "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฟะพะดัะตะดะฑะฐ ะฝะฐ ะพัะบััะธ (OID fanout): fanout[%d] = %<PRIx32> > " "%<PRIx32> = fanout[%d]" -#: midx.c:1110 -msgid "Verifying OID order in MIDX" +#: midx.c:1152 +msgid "the midx contains no oid" +msgstr "ะฒัะฒ ัะฐะนะปะฐ ั ะธะฝะดะตะบัะฐ ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ ะฝัะผะฐ ะธะดะตะฝัะธัะธะบะฐัะพัะธ ะฝะฐ ะพะฑะตะบัะธ" + +#: midx.c:1161 +msgid "Verifying OID order in multi-pack-index" msgstr "" -"ะัะพะฒะตัะบะฐ ะฝะฐ ะฟะพะดัะตะดะฑะฐัะฐ ะฝะฐ ะธะดะตะฝัะธัะธะบะฐัะพัะธ ะฝะฐ ะพะฑะตะบัะธ ะฒ MIDX (ัะฐะนะป ั ะธะฝะดะตะบั ะบัะผ " -"ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะฝะธ ัะฐะนะปะพะฒะต)" +"ะัะพะฒะตัะบะฐ ะฝะฐ ะฟะพะดัะตะดะฑะฐัะฐ ะฝะฐ ะธะดะตะฝัะธัะธะบะฐัะพัะธ ะฝะฐ ะพะฑะตะบัะธ ะฒัะฒ ัะฐะนะป ั ะธะฝะดะตะบั ะบัะผ " +"ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะฝะธ ัะฐะนะปะพะฒะต" -#: midx.c:1119 +#: midx.c:1170 #, 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:1138 +#: midx.c:1190 msgid "Sorting objects by packfile" msgstr "ะะพะดัะตะดะฑะฐ ะฝะฐ ะพะฑะตะบัะธัะต ะฟะพ ะฟะฐะบะตัะฝะธ ัะฐะนะปะพะฒะต" -#: midx.c:1144 +#: midx.c:1197 msgid "Verifying object offsets" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะพัะผะตััะฒะฐะฝะตัะพ ะฝะฐ ะพะฑะตะบัะธ" -#: midx.c:1160 +#: midx.c:1213 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "ะทะฐะฟะธััั ะฒ ะฟะฐะบะตัะฐ ะทะฐ ะพะฑะตะบัะฐ oid[%d] = %s ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐัะตะดะตะฝ" -#: midx.c:1166 +#: midx.c:1219 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "ะธะฝะดะตะบััั ะฝะฐ ะฟะฐะบะตัะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐัะตะดะตะฝ" -#: midx.c:1175 +#: midx.c:1228 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะพัะผะตััะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั ะทะฐ oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1350 +#: midx.c:1253 +msgid "Counting referenced objects" +msgstr "ะัะตะฑัะพัะฒะฐะฝะต ะฝะฐ ัะฒััะทะฐะฝะธัะต ะพะฑะตะบัะธ" + +#: midx.c:1263 +msgid "Finding and deleting unreferenced packfiles" +msgstr "ะขัััะตะฝะต ะธ ะธะทััะธะฒะฐะฝะต ะฝะฐ ะฝะตัะฒััะทะฐะฝะธัะต ะฟะฐะบะตัะฝะธ ัะฐะนะปะพะฒะต" + +#: midx.c:1454 msgid "could not start pack-objects" msgstr "ะบะพะผะฐะฝะดะฐัะฐ โpack-objectsโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะฐััะธัะฐะฝะฐ" -#: midx.c:1369 +#: midx.c:1474 msgid "could not finish pack-objects" msgstr "ะบะพะผะฐะฝะดะฐัะฐ โpack-objectsโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฒัััะตะฝะฐ" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฝะธัะบะฐ ะทะฐ ะดะธัะตะบัะพัะธะธ: %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฝะธัะบะฐ ะทะฐ ะธะผะตะฝะฐ: %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทัะฐะบะฐ ะฝะธัะบะฐ ะทะฐ ะธะผะตะฝะฐ: %s" @@ -4497,50 +5436,77 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "ะะฐะดะฐะดะตะฝะฐ ะต ะปะพัะฐ ััะพะนะฝะพัั ะฝะฐ ะฟัะพะผะตะฝะปะธะฒะฐัะฐ โ%sโ: โ%sโ" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฒะธะด ะพะฑะตะบั: โ%sโ" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "ะพะฑะตะบััั โ%sโ ะต %s, ะฐ ะฝะต %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "ะพะฑะตะบััั โ%sโ ะต ะฝะตะฟะพะทะฝะฐั ะฒะธะด: %d" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "ะพะฑะตะบััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝ" -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "ัะฐะทะปะธะบะฐ ะฒ ะบะพะฝััะพะปะฝะฐัะฐ ััะผะฐ: โ%sโ" -#: packfile.c:648 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "ัะฐะทะผะตััั ะฝะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะปััะตะฝ" + +#: packfile.c:630 msgid "offset before end of packfile (broken .idx?)" msgstr "" "ะพัะผะตััะฒะฐะฝะต ะฟัะตะดะธ ะบัะฐั ะฝะฐ ะฟะฐะบะตัะฝะธั ัะฐะนะป (ะฒัะทะผะพะถะฝะพ ะต ะธะฝะดะตะบััั ะดะฐ ะต ะฟะพะฒัะตะดะตะฝ)" -#: packfile.c:1899 +#: packfile.c:1922 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "ะพัะผะตััะฒะฐะฝะต ะฟัะตะดะธ ะฝะฐัะฐะปะพัะพ ะฝะฐ ะธะฝะดะตะบัะฐ ะฝะฐ ะฟะฐะบะตัะฝะธั ัะฐะนะป โ%sโ (ะฒัะทะผะพะถะฝะพ ะต " "ะธะฝะดะตะบััั ะดะฐ ะต ะฟะพะฒัะตะดะตะฝ)" -#: packfile.c:1903 +#: packfile.c:1926 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" 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:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั โ%sโ" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4556,7 +5522,7 @@ msgstr "ะพะฟัะธะธัะต โ%sโ ะธ โ%sโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" msgid "%s : incompatible with something else" msgstr "ะพะฟัะธััะฐ โ%sโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะฝะตัะพ" -#: parse-options.c:92 parse-options.c:96 parse-options.c:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "ะพะฟัะธััะฐ โ%sโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" @@ -4566,42 +5532,47 @@ msgstr "ะพะฟัะธััะฐ โ%sโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" msgid "%s isn't available" msgstr "ะพะฟัะธััะฐ โ%sโ ะฝะต ะต ะฝะฐะปะธัะฝะฐ" -#: parse-options.c:219 +#: 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:389 +#: 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:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, c-format -msgid "did you mean `--%s` (with two dashes ?)" +msgid "did you mean `--%s` (with two dashes)?" msgstr "โ--%sโ (ั 2 ัะธัะตัะฐ) ะปะธ ะธะผะฐั ัะต ะฟัะตะดะฒะธะด?" -#: parse-options.c:859 +#: parse-options.c:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ--%sโ" + +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะพะฟัะธั: โ%sโ" -#: parse-options.c:861 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "ะฝะตะฟะพะทะฝะฐั ัะปะฐะณ โ%cโ" -#: parse-options.c:863 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั ะธะทะฒัะฝ โasciiโ ะฒ ะฝะธะทะฐ: โ%sโ" -#: parse-options.c:887 +#: parse-options.c:890 msgid "..." msgstr "โฆ" -#: parse-options.c:906 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "ัะฟะพััะตะฑะฐ: %s" @@ -4609,75 +5580,48 @@ msgstr "ัะฟะพััะตะฑะฐ: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " ะธะปะธ: %s" -#: parse-options.c:915 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:957 msgid "-NUM" msgstr "-ะงะะกะะ" -#: parse-options.c:968 -#, 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:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "ะะต ะผะพะณะฐั ะดะฐ ัะต ะดะฐะดะฐั ะฟัะฐะฒะฐ ะทะฐ ะทะฐะฟะธั ะฒ ะดะธัะตะบัะพัะธััะฐ โ%sโ ะฝะฐ ะณััะฟะฐัะฐ" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "ะะบัะฐะฝะธัะฐัะธัั ะทะฝะฐะบ โ\\โะฝะต ะผะพะถะต ะดะฐ ะต ะฟะพัะปะตะดะตะฝ ะทะฝะฐะบ ะฒ ััะพะนะฝะพัััะฐ ะฝะฐ ะฐััะธะฑัั" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "ะะพะทะฒะพะปะตะฝะพ ะต ัะฐะผะพ ะตะดะฝะพ ัะบะฐะทะฒะฐะฝะต ะฝะฐ โattr:โ." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "โattr:โ ัััะฑะฒะฐ ะดะฐ ัะบะฐะทะฒะฐ ััะพะนะฝะพัั" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะฐััะธะฑัั: โ%sโ" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "ะณะปะพะฑะฐะปะฝะธัะต ะฝะฐัััะพะนะบะธ ะทะฐ ะฟััะธัะฐ โglobโ ะธ โnoglobโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4685,50 +5629,55 @@ msgstr "" "ะณะปะพะฑะฐะปะฝะฐัะฐ ะฝะฐัััะพะนะบะฐ ะทะฐ ะดะพัะปะพะฒะฝะธ ะฟััะธัะฐ โliteralโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะฒัะธัะบะธ " "ะดััะณะธ ะณะปะพะฑะฐะปะฝะธ ะฝะฐัััะพะนะบะธ ะทะฐ ะฟััะธัะฐ" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟะฐัะฐะผะตััั ะทะฐ ะพะฟัะธััะฐ ะทะฐ ะผะฐะณะธัะตัะบะธ ะฟััะธัะฐ โprefixโ" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ ะพะฟัะธััะฐ ะทะฐ ะผะฐะณะธัะตัะบะธ ะฟััะธัะฐ โ%.*sโ ะฒ โ%sโ" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "ะะฝะฐะบัั โ)โ ะปะธะฟัะฒะฐ ะฒ ะพะฟัะธััะฐ ะทะฐ ะผะฐะณะธัะตัะบะธ ะฟััะธัะฐ ะฒ โ%sโ" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "ะะฐะณะธัะตัะบะธัะต ะฟััะธัะฐ โ%cโ ัะฐ ะฑะตะท ัะตะฐะปะธะทะฐัะธั ะทะฐ โ%sโ" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: ะพะฟัะธะธัะต โliteralโ ะธ โglobโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: pathspec.c:440 +#: pathspec.c:445 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: โ%sโ ะต ะธะทะฒัะฝ ั ัะฐะฝะธะปะธัะตัะพ" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: โ%sโ ะต ะธะทะฒัะฝ ั ัะฐะฝะธะปะธัะตัะพ ะฟัะธ โ%sโ" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "โ%sโ (ะบะปะฐะฒะธั: โ%cโ)" -#: pathspec.c:524 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: ะผะฐะณะธัะตัะบะธัะต ะฟััะธัะฐ ะฝะต ัะต ะฟะพะดะดััะถะฐั ะพั ะบะพะผะฐะฝะดะฐัะฐ โ%sโ" -#: pathspec.c:591 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "ะฟัััั โ%sโ ะต ัะปะตะด ัะธะผะฒะพะปะฝะฐ ะฒััะทะบะฐ" +#: pathspec.c:643 +#, c-format +msgid "line is badly quoted: %s" +msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ัะธัะธัะฐะฝ ัะตะด: %s" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "ะฟะฐะบะตััั ะทะฐ ะธะทัะธััะฒะฐะฝะต ะฝะฐ ะฑััะตัะธัะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัะต" @@ -4738,46 +5687,50 @@ msgid "unable to write delim packet" msgstr "ัะฐะทะดะตะปััะธัั ะฟะฐะบะตั ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัะต" #: pkt-line.c:106 +msgid "unable to write stateless separator packet" +msgstr "ัะฐะทะดะตะปััะธัั ะฟะฐะบะตั ะฑะตะท ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ััััะพัะฝะธะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัะต" + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทัะธััะฒะฐะฝะต ะฝะฐ ะฑััะตัะธัะต ะฟัะธ ะทะฐะฟะธั ะฝะฐ ะฟะฐะบะตั" -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "ะฟัะพัะพะบะพะปะฝะฐ ะณัะตัะบะฐ: ะฟัะตะบะฐะปะตะฝะพ ะดัะปัะณ ัะตะด" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "ะฝะตััะฟะตัะตะฝ ะทะฐะฟะธั ะฝะฐ ะฟะฐะบะตั ั ัะพัะผะฐั" -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "" "ะฝะตััะฟะตัะตะฝ ะทะฐะฟะธั ะฝะฐ ะฟะฐะบะตัะตะฝ ัะฐะนะป โ ะดะฐะฝะฝะธัะต ะฝะฐะดะฒะธัะฐะฒะฐั ะผะฐะบัะธะผะฐะปะฝะธัั ัะฐะทะผะตั ะฝะฐ " "ะฟะฐะบะตั" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "ะฝะตััะฟะตัะตะฝ ะทะฐะฟะธั ะฝะฐ ะฟะฐะบะตั" -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "ะณัะตัะบะฐ ะฟัะธ ัะตัะตะฝะต" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต ะฝะตะพัะฐะบะฒะฐะฝะพ ะฟัะตะบััะฝะฐ ะฒััะทะบะฐัะฐ" -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "ะฟัะพัะพะบะพะปะฝะฐ ะณัะตัะบะฐ: ะฝะตะฟัะฐะฒะธะปeะฝ ะทะฝะฐะบ ะทะฐ ะดัะปะถะธะฝะฐ ะฝะฐ ัะตะด: %.4s" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "ะฟัะพัะพะบะพะปะฝะฐ ะณัะตัะบะฐ: ะฝะตะฟัะฐะฒะธะปะฝะฐ ะดัะปะถะธะฝะฐ ะฝะฐ ัะตะด: %d" -#: pkt-line.c:362 +#: pkt-line.c:373 sideband.c:150 #, c-format msgid "remote error: %s" msgstr "ะพัะดะฐะปะตัะตะฝะฐ ะณัะตัะบะฐ: %s" @@ -4791,85 +5744,118 @@ msgstr "ะะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ" msgid "unable to create threaded lstat: %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฝะธัะบะฐ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะตัะพ ะฝะฐ โlstatโ: %s" -#: pretty.c:966 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "ะฐัะณัะผะตะฝััั ะบัะผ ะพะฟัะธััะฐ โ--prettyโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" -#: range-diff.c:70 +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "ั ัะฐะฝะธะปะธัะต-ะณะฐัะฐะฝั: ะฝะตััะฟะตัะฝะพ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟัะพัะตั ะทะฐ ะดะพััะฐะฒัะฝะต" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "ั ัะฐะฝะธะปะธัะต-ะณะฐัะฐะฝั: ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะธัะต ะบัะผ ะฟัะพัะตัะฐ ะทะฐ ะดะพััะฐะฒัะฝะต" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" +"ั ัะฐะฝะธะปะธัะต-ะณะฐัะฐะฝั: ััะฐะฝะดะฐััะฝะธัั ะฒั ะพะด ะฝะฐ ะฟัะพัะตัะฐ ะทะฐ ะดะพััะฐะฒัะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต " +"ะทะฐัะฒะพัะธ" + +#: promisor-remote.c:53 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "" +"ะธะผะตัะพ ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต-ะณะฐัะฐะฝั ะฝะต ะผะพะถะต ะทะฐ ะทะฐะฟะพัะฒะฐ ััั ะทะฝะฐะบะฐ โ/โ: %s" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "ะะทััะธะฒะฐะฝะต ะฝะฐ ะฟะพะฒัะฐัััะธัะต ัะต ะพะฑะตะบัะธ" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "ะบะพะผะฐะฝะดะฐัะฐ ะทะฐ ะถััะฝะฐะปะฐ ั ะฟะพะดะฐะฒะฐะฝะธั โlogโ ะฝะต ะผะพะถะต ะดะฐ ัะต ััะฐััะธัะฐ" -#: range-diff.c:72 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "" "ะธะทั ะพะดัั ะพั ะบะพะผะฐะฝะดะฐัะฐ ะทะฐ ะถััะฝะฐะปะฐ ั ะฟะพะดะฐะฒะฐะฝะธั โlogโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะพัะตัะต" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:98 sequencer.c:5283 #, c-format msgid "could not parse commit '%s'" msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝะพ" -#: range-diff.c:117 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" +"ะฟััะฒะธัั ัะตะด ะพั ะธะทั ะพะดะฐ ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โlogโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ, ะทะฐัะพัะพ ะฝะต " +"ะทะฐะฟะพัะฒะฐ ั โcommit โ: โ%sโ" + +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะฝะฐ git โ%.*sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" -#: range-diff.c:274 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "ะฝะตััะฟะตัะฝะพ ััััะตะฝะต ะฝะฐ ัะฐะทะปะธะบะฐ" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "ะถััะฝะฐะปัั ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝ" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" "ะฝัะผะฐ ะดะฐ ะฑัะดะต ะดะพะฑะฐะฒะตะฝ ะฟัะตะฒะดะพะฝะธะผ ะทะฐ ัะฐะนะป โ%sโ (โ%sโ ะฒะตัะต ัััะตััะฒัะฒะฐ ะฒ ะธะฝะดะตะบัะฐ)" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "ะฒ ะฑะฐะทะฐัะฐ ะพั ะดะฐะฝะฝะธ ะทะฐ ะพะฑะตะบัะธัะต ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฟัะฐะทะตะฝ ะพะฑะตะบั-BLOB" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: ะผะพะถะต ะดะฐ ะดะพะฑะฐะฒััะต ัะฐะผะพ ะพะฑะธะบะฝะพะฒะตะฝะธ ัะฐะนะปะพะฒะต, ัะธะผะฒะพะปะฝะธ ะฒััะทะบะธ ะธ ะดะธัะตะบัะพัะธะธ " "ะฝะฐ git" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "ะฝะต ะต ะธะทัะตะณะปะตะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะฒ โ%sโ" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะฝะดะตะบัะธัะฐะฝ" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพะฑะฐะฒะธ ะฒ ะธะฝะดะตะบัะฐ" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "โstatโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ ะฒััั ั โ%sโ" -#: read-cache.c:1314 +#: read-cache.c:1318 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "โ%sโ ัััะตััะฒัะฒะฐ ะธ ะบะฐัะพ ัะฐะนะป, ะธ ะบะฐัะพ ะดะธัะตะบัะพัะธั" -#: read-cache.c:1499 +#: read-cache.c:1524 msgid "Refresh index" msgstr "ะะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ" -#: read-cache.c:1613 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4878,7 +5864,7 @@ msgstr "" "ะะฐะดะฐะดะตะฝะฐ ะต ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะฝะฐ ะฝะฐัััะพะนะบะฐัะฐ โindex.versionโ.\n" "ะฉะต ัะต ะฟะพะปะทะฒะฐ ะฒะตััะธั %i" -#: read-cache.c:1623 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4888,146 +5874,157 @@ msgstr "" "โGIT_INDEX_VERSIONโ.\n" "ะฉะต ัะต ะฟะพะปะทะฒะฐ ะฒะตััะธั %i" -#: read-cache.c:1679 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟะพะดะฟะธั: โ0x%08xโ" -#: read-cache.c:1682 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฒะตััะธั ะฝะฐ ะธะฝะดะตะบัะฐ %d" -#: read-cache.c:1691 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟะพะดะฟะธั ะทะฐ ะบะพะฝััะพะปะฝะฐ ััะผะฐ ะฟะพ SHA1 ะฝะฐ ัะฐะนะปะฐ ะฝะฐ ะธะฝะดะตะบัะฐ" -#: read-cache.c:1721 +#: read-cache.c:1747 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" "ะธะฝะดะตะบััั ะฟะพะปะทะฒะฐ ัะฐะทัะธัะตะฝะธะต โ%.4sโ, ะบะพะตัะพ ะฝะต ัะต ะฟะพะดะดััะถะฐ ะพั ัะฐะทะธ ะฒะตััะธั ะฝะฐ git" -#: read-cache.c:1723 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ัะฐะทัะธัะตะฝะธะตัะพ โ%.4sโ" -#: read-cache.c:1760 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "ะฝะตะฟะพะทะฝะฐั ัะพัะผะฐั ะฝะฐ ะทะฐะฟะธั ะฒ ะธะฝะดะตะบัะฐ: โ0x%08xโ" -#: read-cache.c:1776 +#: read-cache.c:1802 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะฟะพะปะต ะฒ ะธะฝะดะตะบัะฐ ะฑะปะธะทะพ ะดะพ ะฟััั โ%sโ" -#: read-cache.c:1833 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "ะฝะตะฟะพะดัะตะดะตะฝะธ ะทะฐะฟะธัะธ ะฒ ะธะฝะดะตะบัะฐ" -#: read-cache.c:1836 +#: read-cache.c:1862 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "ะผะฝะพะถะตััะฒะพ ะทะฐะฟะธัะธ ะทะฐ ัะปะตัะธั ัะฐะนะป โ%sโ" -#: read-cache.c:1839 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "ะฝะตะฟะพะดัะตะดะตะฝะธ ะทะฐะฟะธัะธ ะทะฐ โ%sโ" -#: 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 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "ัะฐะนะปัั ั ะธะฝะดะตะบัะฐ ะต ะฟะพะฒัะตะดะตะฝ" -#: read-cache.c:2087 +#: read-cache.c:2115 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฝะธัะบะฐ ะทะฐ ะทะฐัะตะถะดะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต ะพั ะบะตัะฐ: %s" -#: read-cache.c:2100 +#: read-cache.c:2128 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทัะฐะบะฐ ะฝะธัะบะฐ ะทะฐ ะทะฐัะตะถะดะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต ะพั ะบะตัะฐ: %s" -#: read-cache.c:2133 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "%s: ะฝะตััะฟะตัะฝะพ ะพัะฒะฐััะฝะต ะฝะฐ ัะฐะนะปะฐ ะฝะฐ ะธะฝะดะตะบัะฐ" -#: read-cache.c:2137 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปััะธ ะธะฝัะพัะผะฐัะธั ะทะฐ ะพัะฒะพัะตะฝะธั ะธะฝะดะตะบั ััั โstatโ" -#: read-cache.c:2141 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: ัะฐะนะปัั ะฝะฐ ะธะฝะดะตะบัะฐ ะต ะฟะพ-ะผะฐะปัะบ ะพั ะพัะฐะบะฒะฐะฝะพัะพ" -#: read-cache.c:2145 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "%s: ะฝะตััะฟะตัะฝะพ ะทะฐะดะตะปัะฝะต ะฝะฐ ััะพัะฒะตัััะฒะฐัะฐ ะฟะฐะผะตั ััะตะท โmmapโ ะฝะฐ ะธะฝะดะตะบัะฐ" -#: read-cache.c:2187 +#: read-cache.c:2215 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" "ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฝะธัะบะฐ ะทะฐ ะทะฐัะตะถะดะฐะฝะต ะฝะฐ ัะฐะทัะธัะตะฝะธััะฐ ะฝะฐ ะธะฝะดะตะบัะฐ: %s" -#: read-cache.c:2214 +#: read-cache.c:2242 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" "ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฝะธัะบะฐ ะทะฐ ะทะฐัะตะถะดะฐะฝะต ะฝะฐ ัะฐะทัะธัะตะฝะธััะฐ ะฝะฐ ะธะฝะดะตะบัะฐ: %s" -#: read-cache.c:2246 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "ัะฟะพะดะตะปะตะฝะธัั ะธะฝะดะตะบั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฑะฝะพะฒะธ" -#: read-cache.c:2293 +#: read-cache.c:2321 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "ะณัะตัะบะธ ะฒ ะธะฝะดะตะบัะฐ โ ะฒ โ%2$sโ ัะต ะพัะฐะบะฒะฐ โ%1$sโ, ะฐ ะฑะต ะฟะพะปััะตะฝะพ โ%3$sโ" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 #, c-format msgid "could not close '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐัะฒะพัะธ" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 #, c-format msgid "could not stat '%s'" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โstatโ ะฒััั ั โ%sโ" -#: read-cache.c:3105 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ ะดะธัะตะบัะพัะธััะฐ ะฝะฐ git: %s" -#: read-cache.c:3117 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทััะธะฒะฐะฝะต ะฝะฐ โ%sโ" -#: read-cache.c:3142 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "ะฟัะฐะฒะฐัะฐ ะทะฐ ะดะพัััะฟ ะดะพ โ%sโ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะฟะพะฟัะฐะฒะตะฝะธ" -#: read-cache.c:3291 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะตะผะธะฝะต ะบัะผ ะตัะฐะฟ โ0" -#: rebase-interactive.c:26 +#: 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." @@ -5035,7 +6032,7 @@ msgstr "" "ะะตะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั โ%sโ ะทะฐย ะฝะฐัััะพะนะบะฐัะฐ โrebase.missingCommitsCheckโ. " "ะะฐัััะพะนะบะฐัะฐ ัะต ะฟัะตัะบะฐัะฐ." -#: rebase-interactive.c:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -5082,14 +6079,14 @@ msgstr "" "ะะพะถะต ะดะฐ ะฟัะพะผะตะฝััะต ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะพัััะฐ ะฝะฐ ัะตะดะพะฒะตัะต โ ัะต ัะต ะธะทะฟัะปะฝัะฒะฐั\n" "ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะพ ะพัะณะพัะต-ะฝะฐะดะพะปั.\n" -#: rebase-interactive.c:56 +#: 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 ะบะพะผะฐะฝะดะธ)" msgstr[1] "ะัะตะฑะฐะทะธัะฐะฝะต ะฝะฐ โ%sโ ะฒััั ั โ%sโ (%d ะบะพะผะฐะฝะดะฐ)" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5098,7 +6095,7 @@ msgstr "" "ะะต ะธะทััะธะฒะฐะนัะต ัะตะดะพะฒะต. ะะพะดะฐะฒะฐะฝะธััะฐ ะผะพะณะฐั ะดะฐ ัะต ะฟัะตัะบะฐัะฐั ั ะบะพะผะฐะฝะดะฐัะฐ " "โdropโ.\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5106,7 +6103,7 @@ msgstr "" "\n" "ะะบะพ ะธะทััะธะตัะต ัะตะด, ััะพัะฒะตัััะฒะฐัะพัะพ ะผั ะฟะพะดะฐะฒะฐะฝะต ัะต ะฑัะดะต ะะะขะ ะะขะ.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5121,7 +6118,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5131,22 +6128,19 @@ msgstr "" "ะะบะพ ะธะทััะธะตัะต ะฒัะธัะบะพ, ะฟัะตะฑะฐะทะธัะฐะฝะตัะพ ัะต ะฑัะดะต ะฟัะตัััะฐะฝะพะฒะตะฝะพ.\n" "\n" -#: 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 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 #, c-format msgid "could not write '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัะต" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะบะพะฟะธัะฐ ะบะฐัะพ โ%sโ." +msgid "could not write '%s'." +msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัะต." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5155,7 +6149,7 @@ msgstr "" "ะัะตะดัะฟัะตะถะดะตะฝะธะต: ะฝัะบะพะธ ะฟะพะดะฐะฒะฐะฝะธั ะผะพะถะต ะดะฐ ัะฐ ะฟัะพะฟััะฝะฐัะธ.\n" "ะัะพะฟััะฝะฐัะธ ะฟะพะดะฐะฒะฐะฝะธั (ะฝะพะฒะธัะต ัะฐ ะฝะฐะน-ะพัะณะพัะต):\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5172,124 +6166,14 @@ msgstr "" "ะฟัะตะดัะฟัะตะถะดะตะฝะธะต)\n" "ะธะปะธ โerrorโ (ััะธัะฐะฝะต ะทะฐ ะณัะตัะบะฐ).\n" -#: 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:2092 -#, 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โ" - -#: 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 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โ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ ะทะฐ ะทะฐะฟะธั" - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "ะฝะตะพัะฐะบะฒะฐะฝ ะธะดะตะฝัะธัะธะบะฐัะพั ะฝะฐ ะพะฑะตะบั ะฟัะธ ะธะทััะธะฒะฐะฝะตัะพ ะฝะฐ โ%sโ" - -#: 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โ: %s" - -#: refs.c:2012 -#, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "ะฝะต ัะฐ ะฟะพะทะฒะพะปะตะฝะธ ะฟะพะฒะตัะต ะพั ะตะดะฝะฐ ะฟัะพะผะตะฝะธ ะฝะฐ ัะบะฐะทะฐัะตะปั โ%sโ" - -#: refs.c:2044 -msgid "ref updates forbidden inside quarantine environment" -msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะธััะฐ ะฝะฐ ัะบะฐะทะฐัะตะปะธ ัะฐ ะทะฐะฑัะฐะฝะตะฝะธ ะฒ ััะตะดะธ ะฟะพะด ะบะฐัะฐะฝัะธะฝะฐ" - -#: refs.c:2140 refs.c:2170 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "โ%sโ ัััะตััะฒัะฒะฐ, ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต โ%sโ" - -#: 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:1234 -#, c-format -msgid "could not remove reference %s" -msgstr "ะฃะบะฐะทะฐัะตะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" - -#: refs/files-backend.c:1248 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 #, c-format -msgid "could not delete reference %s: %s" -msgstr "ะฃะบะฐะทะฐัะตะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั: %s" - -#: refs/files-backend.c:1251 refs/packed-backend.c:1545 -#, c-format -msgid "could not delete references: %s" -msgstr "ะฃะบะฐะทะฐัะตะปะธัะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะฐั ะธะทััะธัะธ: %s" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะบะฐะทะฐัะตะป: โ%sโ" +msgid "could not read '%s'." +msgstr "ะพั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ัะตัะต." -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "ะธะทััะธั" @@ -5308,281 +6192,370 @@ msgstr "ะฝะฐะทะฐะด ั %d" msgid "ahead %d, behind %d" msgstr "ะฝะฐะฟัะตะด ั %d, ะฝะฐะทะฐะด ั %d" -#: ref-filter.c:162 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "ะพัะฐะบะฒะฐะฝ ัะพัะผะฐั: %%(color:ะฆะะฏะข)" -#: ref-filter.c:164 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "ะฝะตะฟะพะทะฝะฐั ัะฒัั: %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "ะพัะฐะบะฒะฐ ัะต ััะปะพ ัะธัะปะพ ะทะฐ โrefname:lstrip=%sโ" -#: ref-filter.c:190 +#: ref-filter.c:197 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "ะพัะฐะบะฒะฐ ัะต ััะปะพ ัะธัะปะพ ะทะฐ โrefname:rstrip=%sโ" -#: ref-filter.c:192 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั ะทะฐ โ%%(%s)โ: %s" -#: ref-filter.c:247 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" -#: ref-filter.c:269 +#: ref-filter.c:276 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั ะทะฐ %%(objectsize): %s" -#: ref-filter.c:277 +#: ref-filter.c:284 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" -#: ref-filter.c:289 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" -#: ref-filter.c:298 +#: ref-filter.c:309 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" +msgid "unrecognized %%(subject) argument: %s" +msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั ะทะฐ %%(subject): %s" -#: ref-filter.c:320 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั โ%%(trailers)โ: %s" -#: ref-filter.c:349 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "ะพัะฐะบะฒะฐ ัะต ะฟะพะปะพะถะธัะตะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โcontents:lines=%sโ" -#: ref-filter.c:351 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั ะทะฐ %%(contents): %s" -#: ref-filter.c:366 +#: ref-filter.c:380 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "ะพัะฐะบะฒะฐ ัะต ะฟะพะปะพะถะธัะตะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โobjectname:short=%sโ" +msgid "positive value expected '%s' in %%(%s)" +msgstr "ะพัะฐะบะฒะฐ ัะต ะฟะพะปะพะถะธัะตะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โ%sโ ะฒ %%(%s)" -#: ref-filter.c:370 +#: ref-filter.c:384 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั ะทะฐ %%(objectname): %s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั โ%sโ ะฒ %%(%s)" -#: ref-filter.c:400 +#: ref-filter.c:398 +#, c-format +msgid "unrecognized email option: %s" +msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะพะฟัะธั ะทะฐ ะต-ะฟะพัะฐ: %s" + +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "ะพัะฐะบะฒะฐะฝ ัะพัะผะฐั: %%(align:ะจะะ ะะงะะะ,ะะะะะฆะะฏ)" -#: ref-filter.c:412 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะฟะพะทะธัะธั: %s" -#: ref-filter.c:419 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ัะธัะพัะธะฝะฐ: %s" -#: ref-filter.c:428 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั ะทะฐ %%(align): %s" -#: ref-filter.c:436 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "ะพัะฐะบะฒะฐ ัะต ะฟะพะปะพะถะธัะตะปะฝะฐ ัะธัะพัะธะฝะฐ ั ะปะตะบัะตะผะฐัะฐ โ%%(align)โ" -#: ref-filter.c:454 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั ะทะฐ โ%%(if)โ: %s" -#: ref-filter.c:556 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั: โ%.*sโ" -#: ref-filter.c:583 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "ะฝะตะฟะพะทะฝะฐัะพ ะธะผะต ะฝะฐ ะพะฑะตะบั: โ%.*sโ" -#: ref-filter.c:587 +#: ref-filter.c:615 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "ะฝะต ะต ั ัะฐะฝะธะปะธัะต ะฝะฐ git, ะฐ ะฟะพะปะตัะพ โ%.*sโ ะธะทะธัะบะฒะฐ ะดะพัััะฟ ะดะฐะฝะฝะธ ะฝะฐ ะพะฑะตะบัะฝะธ" -#: ref-filter.c:711 +#: ref-filter.c:739 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "ัะพัะผะฐั: ะปะตะบัะตะผะฐัะฐ %%(if) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฑะตะท ััะพัะฒะตัะฝะฐัะฐ ั %%(then)" -#: ref-filter.c:774 +#: ref-filter.c:802 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "ัะพัะผะฐั: ะปะตะบัะตะผะฐัะฐ %%(then) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฑะตะท ััะพัะฒะตัะฝะฐัะฐ ั %%(if)" -#: ref-filter.c:776 +#: ref-filter.c:804 #, c-format msgid "format: %%(then) atom used more than once" msgstr "ัะพัะผะฐั: ะปะตะบัะตะผะฐัะฐ %%(then) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฟะพะฒะตัะต ะพั ะตะดะธะฝ ะฟัั" -#: ref-filter.c:778 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "ัะพัะผะฐั: ะปะตะบัะตะผะฐัะฐ %%(then) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ัะปะตะด %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:834 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "ัะพัะผะฐั: ะปะตะบัะตะผะฐัะฐ %%(else) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฑะตะท ััะพัะฒะตัะฝะฐัะฐ ั %%(if)" -#: ref-filter.c:808 +#: ref-filter.c:836 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "ัะพัะผะฐั: ะปะตะบัะตะผะฐัะฐ %%(else) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฑะตะท ััะพัะฒะตัะฝะฐัะฐ ั %%(then)" -#: ref-filter.c:810 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used more than once" msgstr "ัะพัะผะฐั: ะปะตะบัะตะผะฐัะฐ %%(else) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฟะพะฒะตัะต ะพั ะตะดะธะฝ ะฟัั" -#: ref-filter.c:825 +#: ref-filter.c:853 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "ัะพัะผะฐั: ะปะตะบัะตะผะฐัะฐ %%(end) ะต ะธะทะฟะพะปะทะฒะฐะฝะฐ ะฑะตะท ััะพัะฒะตัะฝะฐัะฐ ั" -#: ref-filter.c:882 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะพัะผะฐัะธัะฐั ะฝะธะท โ%sโ" -#: ref-filter.c:1485 +#: ref-filter.c:1541 #, c-format msgid "no branch, rebasing %s" msgstr "ะธะทะฒัะฝ ะบะปะพะฝ, ะฟัะตะฑะฐะทะธัะฐะฝะต ะฝะฐ โ%sโ" -#: ref-filter.c:1488 +#: ref-filter.c:1544 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "ะธะทะฒัะฝ ะบะปะพะฝ, ะฟัะตะฑะฐะทะธัะฐะฝะต ะฝะฐ ะฝะตัะฒััะทะฐะฝ ัะบะฐะทะฐัะตะป โHEADโ ะฟัะธ โ%sโ" -#: ref-filter.c:1491 +#: ref-filter.c:1547 #, c-format msgid "no branch, bisect started on %s" msgstr "ะธะทะฒัะฝ ะบะปะพะฝ, ะดะฒะพะธัะฝะพ ััััะตะฝะต ะพั โ%sโ" -#: ref-filter.c:1501 +#: ref-filter.c:1557 msgid "no branch" msgstr "ะธะทะฒัะฝ ะบะปะพะฝ" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1591 ref-filter.c:1800 #, c-format msgid "missing object %s for %s" msgstr "ะพะฑะตะบััั โ%sโ ะปะธะฟัะฒะฐ ะทะฐ โ%sโ" -#: ref-filter.c:1547 +#: ref-filter.c:1601 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "ะฝะตััะฟะตัะฝะพ ะฐะฝะฐะปะธะทะธัะฐะฝะต ััะตะท โparse_object_bufferโ ะฝะฐ โ%sโ ะทะฐ โ%sโ" -#: ref-filter.c:1998 +#: ref-filter.c:2054 #, c-format msgid "malformed object at '%s'" msgstr "ะพะฑะตะบั ััั ัะณัะตัะตะฝ ัะพัะผะฐั ะฟัะธ โ%sโ" -#: ref-filter.c:2087 +#: ref-filter.c:2143 #, c-format msgid "ignoring ref with broken name %s" msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปั ั ะณัะตัะฝะพ ะธะผะต โ%sโ" -#: ref-filter.c:2382 -#, c-format -msgid "format: %%(end) atom missing" -msgstr "ะณัะตัะบะฐ ะฒัะฒ ัะพัะผะฐฬัะฐ: ะปะธะฟัะฒะฐ ะปะตะบัะตะผะฐัะฐ %%(end)" - -#: ref-filter.c:2482 +#: ref-filter.c:2148 refs.c:657 #, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "ะพะฟัะธะธัะต โ%sโ ะธ โ--mergedโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" +msgid "ignoring broken ref %s" +msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ะฟะพะฒัะตะดะตะฝะธั ัะบะฐะทะฐัะตะป โ%sโ" -#: ref-filter.c:2485 +#: ref-filter.c:2464 #, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "ะพะฟัะธะธัะต โ%sโ ะธ โ--no-mergedโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" +msgid "format: %%(end) atom missing" +msgstr "ะณัะตัะบะฐ ะฒัะฒ ัะพัะผะฐฬัะฐ: ะปะธะฟัะฒะฐ ะปะตะบัะตะผะฐัะฐ %%(end)" -#: ref-filter.c:2495 +#: ref-filter.c:2563 #, c-format msgid "malformed object name %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั โ%sโ" -#: ref-filter.c:2500 +#: ref-filter.c:2568 #, c-format msgid "option `%s' must point to a commit" msgstr "ะพะฟัะธััะฐ โ%sโ ะฝะต ัะพัะธ ะบัะผ ะฟะพะดะฐะฒะฐะฝะต" -#: remote.c:363 +#: refs.c:264 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "โ%sโ ะฝะต ัะพัะธ ะบัะผ ะฟะพะทะฒะพะปะตะฝ ะพะฑะตะบั!" + +#: refs.c:572 +#, c-format +msgid "could not retrieve `%s`" +msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะปััะตะฝ" + +#: refs.c:579 +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะบะปะพะฝ: โ%s = %sโ" + +#: refs.c:655 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะป ะฝะฐ ะพะฑะตะบั ะธะทะฒัะฝ ะบะปะพะฝ โ%sโ" + +#: refs.c:892 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "ะธะผะฐ ะฟัะพะฟััะบะธ ะฒ ะถััะฝะฐะปะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะทะฐ ัะบะฐะทะฐัะตะปั โ%sโ ัะปะตะด โ%sโ" + +#: refs.c:898 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "ะถััะฝะฐะปัั ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะทะฐ ัะบะฐะทะฐัะตะปั โ%sโ ัะฒัััะฒะฐ ะฝะตะพัะฐะบะฒะฐะฝะพ ัะปะตะด โ%sโ" + +#: refs.c:957 +#, c-format +msgid "log for %s is empty" +msgstr "ะถััะฝะฐะปัั ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะทะฐ ัะบะฐะทะฐัะตะปั โ%sโ ะต ะฟัะฐะทะตะฝ" + +#: refs.c:1049 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "ัะบะฐะทะฐัะตะป ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฑะฝะพะฒะธ ั ะณัะตัะฝะพ ะธะผะต โ%sโ" + +#: refs.c:1120 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "ะฝะตััะฟะตัะฝะพ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปั โ%sโ: %s" + +#: refs.c:1944 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "ะฝะต ัะฐ ะฟะพะทะฒะพะปะตะฝะธ ะฟะพะฒะตัะต ะพั ะตะดะฝะฐ ะฟัะพะผะตะฝะธ ะฝะฐ ัะบะฐะทะฐัะตะปั โ%sโ" + +#: refs.c:2024 +msgid "ref updates forbidden inside quarantine environment" +msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะธััะฐ ะฝะฐ ัะบะฐะทะฐัะตะปะธ ัะฐ ะทะฐะฑัะฐะฝะตะฝะธ ะฒ ััะตะดะธ ะฟะพะด ะบะฐัะฐะฝัะธะฝะฐ" + +#: refs.c:2035 +msgid "ref updates aborted by hook" +msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะธััะฐ ะฝะฐ ัะบะฐะทะฐัะตะปะธ ัะฐ ะฟัะตัััะฐะฝะพะฒะตะฝะธ ะพั ะบัะบะฐ" + +#: refs.c:2135 refs.c:2165 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "โ%sโ ัััะตััะฒัะฒะฐ, ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต โ%sโ" + +#: refs.c:2141 refs.c:2176 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "ะฝะตะฒัะทะผะพะถะฝะพ ะต ะตะดะฝะพะฒัะตะผะตะฝะฝะพ ะดะฐ ัะต ะพะฑัะฐะฑะพัะฒะฐั โ%sโ ะธ โ%sโ" + +#: refs/files-backend.c:1228 +#, c-format +msgid "could not remove reference %s" +msgstr "ะฃะบะฐะทะฐัะตะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" + +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "ะฃะบะฐะทะฐัะตะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั: %s" + +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#, c-format +msgid "could not delete references: %s" +msgstr "ะฃะบะฐะทะฐัะตะปะธัะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะฐั ะธะทััะธัะธ: %s" + +#: refspec.c:167 +#, c-format +msgid "invalid refspec '%s'" +msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะบะฐะทะฐัะตะป: โ%sโ" + +#: remote.c:351 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" "ััะบัะฐัะตะฝะธะตัะพ ะทะฐ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต ะฝะต ะผะพะถะต ะทะฐ ะทะฐะฟะพัะฒะฐ ััั ะทะฝะฐะบะฐ โ/โ: %s" -#: remote.c:410 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "ะทะฐะดะฐะดะตะฝ ะต ะฟะพะฒะตัะต ะพั ะตะดะธะฝ ะฟะฐะบะตั ะทะฐ ะฟะพะปััะฐะฒะฐะฝะต, ัะต ัะต ะฟะพะปะทะฒะฐ ะฟััะฒะธัั" -#: remote.c:418 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "ะทะฐะดะฐะดะตะฝ ะต ะฟะพะฒะตัะต ะพั ะตะดะธะฝ ะฟะฐะบะตั ะทะฐ ะธะทะฟัะฐัะฐะฝะต, ัะต ัะต ะฟะพะปะทะฒะฐ ะฟััะฒะธัั" -#: remote.c:608 +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "ะะตะฒัะทะผะพะถะฝะพ ะต ะดะฐ ัะต ะดะพััะฐะฒัั ะตะดะฝะพะฒัะตะผะตะฝะฝะพ ะธ โ%sโ, ะธ โ%sโ ะบัะผ โ%sโ" -#: remote.c:612 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "โ%sโ ะพะฑะธะบะฝะพะฒะตะฝะพ ัะปะตะดะธ โ%sโ, ะฐ ะฝะต โ%sโ" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "โ%sโ ัะปะตะดะธ ะบะฐะบัะพ โ%sโ, ัะฐะบะฐ ะธ โ%sโ" -#: remote.c:684 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "ะบะปัั โ%sโ ะฝะฐ ัะฐะฑะปะพะฝะฐ ะฝะต ััะดััะถะฐ โ*โ" -#: remote.c:694 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "ััะพะนะฝะพัั โ%sโ ะฝะฐ ัะฐะฑะปะพะฝะฐ ะฝะต ััะดััะถะฐ โ*โ" -#: remote.c:1000 +#: remote.c:1073 #, c-format msgid "src refspec %s does not match any" msgstr "ัะบะฐะทะฐัะตะปัั ะฝะฐ ะฒะตััะธั-ะธะทัะพัะฝะธะบ โ%sโ ะฝะต ััะฒะฟะฐะดะฐ ั ะฝะธะบะพะน ะพะฑะตะบั" -#: remote.c:1005 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "ัะบะฐะทะฐัะตะปัั ะฝะฐ ะฒะตััะธั-ะธะทัะพัะฝะธะบ โ%sโ ััะฒะฟะฐะดะฐ ั ะฟะพะฒะตัะต ะพั ะตะดะธะฝ ะพะฑะตะบั" @@ -5591,7 +6564,7 @@ msgstr "ัะบะฐะทะฐัะตะปัั ะฝะฐ ะฒะตััะธั-ะธะทัะพัะฝะธะบ โ%sโ ััะฒะ #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5604,7 +6577,7 @@ msgid "" "\n" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -"ะะฐะดะฐะดะตะฝะฐัะฐ ัะตะป ะฝะต ะต ะฟัะปะตะฝ ัะบะฐะทะฐัะตะป (ะฝะต ะทะฐะฟะพัะฒะฐ ั โrefs/โ).\n" +"ะะฐะดะฐะดะตะฝะฐัะฐ ัะตะป ะฝะต ะต ะฟัะปะฝะพ ะธะผะต ะฝะฐ ัะบะฐะทะฐัะตะป (ะฝะต ะทะฐะฟะพัะฒะฐ ั โrefs/โ).\n" "ะัั ะฐ ะฟัะพะฑะฒะฐะฝะธ ัะปะตะดะฝะธัะต ะฒะฐัะธะฐะฝัะธ:\n" "\n" " โ ัะบะฐะทะฐัะตะป ะพั ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต, ะบะพะนัะพ ะดะฐ ััะพัะฒะตัััะฒะฐ ะฝะฐ โ%sโ;\n" @@ -5615,7 +6588,7 @@ msgstr "" "ะะธะบะพะน ะพั ะฒะฐัะธะฐะฝัะธัะต ะฝะต ััะฐะฑะพัะธ. ะขััะฑะฒะฐ ัะฐะผะธ ะดะฐ ัะบะฐะถะตัะต ะฟัะปะฝะพัะพ ะธะผะต ะฝะฐ\n" "ัะบะฐะทะฐัะตะปั." -#: remote.c:1040 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5626,7 +6599,7 @@ msgstr "" "ะบะฐัะพ\n" "ะธะทัะปะฐัะบะฐัะต ะบัะผ โ%s:refs/heads/%sโ?" -#: remote.c:1045 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5637,7 +6610,7 @@ msgstr "" "ะบะฐัะพ\n" "ะธะทัะปะฐัะบะฐัะต ะบัะผ โ%s:refs/tags/%sโ?" -#: remote.c:1050 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5647,7 +6620,7 @@ msgstr "" "ะะะขะะงะะะัั ะต ะพะฑะตะบั-ะดััะฒะพ. ะะต ัะตะปะธัะต ะปะธ ะฒัััะฝะพัั ะดะฐ ััะทะดะฐะดะตัะต ะฝะพะฒ ะบะปะพะฝ ะบะฐัะพ\n" "ะธะทัะปะฐัะบะฐัะต ะบัะผ โ%s:refs/tags/%sโ?" -#: remote.c:1055 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5657,118 +6630,118 @@ msgstr "" "ะะะขะะงะะะัั ะต ะพะฑะตะบั-BLOB. ะะต ัะตะปะธัะต ะปะธ ะฒัััะฝะพัั ะดะฐ ััะทะดะฐะดะตัะต ะฝะพะฒ ะบะปะพะฝ ะบะฐัะพ\n" "ะธะทัะปะฐัะบะฐัะต ะบัะผ โ%s:refs/tags/%sโ?" -#: remote.c:1091 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "ะฝะต ะต ะพัะบัะธั ะบะปะพะฝ ััะพัะฒะตัััะฒะฐั ะฝะฐ โ%sโ" -#: remote.c:1102 +#: remote.c:1175 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทััะธะต: ะพัะดะฐะปะตัะตะฝะธั ัะบะฐะทะฐัะตะป ะฝะต ัััะตััะฒัะฒะฐ" -#: remote.c:1114 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "ัะบะฐะทะฐัะตะปัั ะฝะฐ ะฒะตััะธั-ัะตะป โ%sโ ััะฒะฟะฐะดะฐ ั ะฟะพะฒะตัะต ะพั ะตะดะธะฝ ะพะฑะตะบั" -#: remote.c:1121 +#: remote.c:1194 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" "ัะบะฐะทะฐัะตะปัั ะฝะฐ ะฒะตััะธั-ัะตะป โ%sโ ััะพัะฒะตัััะฒะฐ ะธ ัะต ะฟะพะปััะฐะฒะฐ ะพั ะฟะพะฒะตัะต ะพั ะตะดะธะฝ " "ะธะทัะพัะฝะธะบ" -#: remote.c:1624 remote.c:1725 +#: remote.c:1703 remote.c:1804 msgid "HEAD does not point to a branch" msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ัะพัะธ ะบัะผ ะบะปะพะฝ" -#: remote.c:1633 +#: remote.c:1712 #, c-format msgid "no such branch: '%s'" msgstr "ะฝัะผะฐ ะบะปะพะฝ ะฝะฐ ะธะผะต โ%sโ" -#: remote.c:1636 +#: remote.c:1715 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝ ะบะปะพะฝ-ะธะทัะพัะฝะธะบ ะทะฐ ะบะปะพะฝะฐ โ%sโ" -#: remote.c:1642 +#: remote.c:1721 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "ะบะปะพะฝัั-ะธะทัะพัะฝะธะบ โ%sโ ะฝะต ะต ััั ัะฐะฝะตะฝ ะบะฐัะพ ัะปะตะดัั ะบะปะพะฝ" -#: remote.c:1657 +#: remote.c:1736 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "ะปะธะฟัะฒะฐ ะปะพะบะฐะปะตะฝ ัะปะตะดัั ะบะปะพะฝ ะทะฐ ะผะตััะพะฟะพะปะพะถะตะฝะธะตัะพ ะทะฐ ะธะทัะปะฐัะบะฒะฐะฝะต โ%sโ ะฒ " "ั ัะฐะฝะธะปะธัะตัะพ โ%sโ" -#: remote.c:1669 +#: remote.c:1748 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "ะฝัะผะฐ ะธะฝัะพัะผะฐัะธั ะบะปะพะฝัั โ%sโ ะดะฐ ัะปะตะดะธ ะฝัะบะพะน ะดััะณ" -#: remote.c:1679 +#: remote.c:1758 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "ัะบะฐะทะฐัะตะปัั ะทะฐ ะธะทัะปะฐัะบะฒะฐะฝะต ะฝะฐ โ%sโ ะฝะต ะฒะบะปััะฒะฐ โ%sโ" -#: remote.c:1692 +#: remote.c:1771 msgid "push has no destination (push.default is 'nothing')" msgstr "ัะบะฐะทะฐัะตะปัั ะทะฐ ะธะทัะปะฐัะบะฒะฐะฝะต ะฝะต ะฒะบะปััะฒะฐ ัะตะป (โpush.defaultโ ะต โnothingโ)" -#: remote.c:1714 +#: remote.c:1793 msgid "cannot resolve 'simple' push to a single destination" msgstr "ะฟัะพััะพัะพ (simple) ะธะทัะปะฐัะบะฒะฐะฝะต ะฝะต ััะพัะฒะตัััะฒะฐ ะฝะฐ ะตะดะฝะฐ ัะตะป" -#: remote.c:1840 +#: remote.c:1922 #, c-format msgid "couldn't find remote ref %s" msgstr "ะพัะดะฐะปะตัะตะฝะธัั ัะบะฐะทะฐัะตะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธั" -#: remote.c:1853 +#: remote.c:1935 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "โข ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ะฝะตะพัะฐะบะฒะฐะฝะธั ะปะพะบะฐะปะตะฝ ัะบะฐะทะฐัะตะป โ%sโ" -#: remote.c:2016 +#: remote.c:2098 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "ะขะพะทะธ ะบะปะพะฝ ัะปะตะดะธ โ%sโ, ะฝะพ ัะปะตะดะตะฝะธัั ะบะปะพะฝ ะต ะธะทััะธั.\n" -#: remote.c:2020 +#: remote.c:2102 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (ะทะฐ ะดะฐ ะบะพัะธะณะธัะฐัะต ัะพะฒะฐ, ะธะทะฟะพะปะทะฒะฐะนัะต โgit branch --unset-upstreamโ)\n" -#: remote.c:2023 +#: remote.c:2105 #, c-format msgid "Your branch is up to date with '%s'.\n" -msgstr "ะะปะพะฝัั ะต ะฐะบััะฐะปะธะทะธัะฐะฝ ะบัะผ โ%sโ.\n" +msgstr "ะะปะพะฝัั ะต ะพะฑะฝะพะฒะตะฝ ะบัะผ โ%sโ.\n" -#: remote.c:2027 +#: remote.c:2109 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "ะะปะพะฝัั ะฒะธ ะธ โ%sโ ัะพัะฐั ะบัะผ ัะฐะทะปะธัะฝะธ ะฟะพะดะฐะฒะฐะฝะธั.\n" -#: remote.c:2030 +#: remote.c:2112 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (ะทะฐ ะฟะพะฒะตัะต ะธะฝัะพัะผะฐัะธั ะฟะพะปะทะฒะฐะนัะต โ%sโ)\n" -#: remote.c:2034 +#: remote.c:2116 #, 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:2040 +#: remote.c:2122 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (ะฟัะฑะปะธะบัะฒะฐะนัะต ะปะพะบะฐะปะฝะธัะต ัะธ ะฟัะพะผะตะฝะธ ััะตะท โgit pushโ)\n" -#: remote.c:2043 +#: remote.c:2125 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5776,11 +6749,11 @@ msgid_plural "" msgstr[0] "ะะปะพะฝัั ะฒะธ ะต ั %2$d ะฟะพะดะฐะฒะฐะฝะต ะทะฐะด โ%1$sโ ะธ ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะตะฒััััะฝ.\n" msgstr[1] "ะะปะพะฝัั ะฒะธ ะต ั %2$d ะฟะพะดะฐะฒะฐะฝะธั ะทะฐะด โ%1$sโ ะธ ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะตะฒััััะฝ.\n" -#: remote.c:2051 +#: remote.c:2133 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (ะพะฑะฝะพะฒะตัะต ะปะพะบะฐะปะฝะธั ัะธ ะบะปะพะฝ ััะตะท โgit pullโ)\n" -#: remote.c:2054 +#: remote.c:2136 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5795,11 +6768,11 @@ msgstr[1] "" "ะขะตะบััะธัั ะบะปะพะฝ ัะต ะต ะพัะดะตะปะธะป ะพั โ%sโ,\n" "ะดะฒะฐัะฐ ะธะผะฐั ััะพัะฒะตัะฝะพ ะฟะพ %d ะธ %d ะฝะตััะฒะฟะฐะดะฐัะธ ะฟะพะดะฐะฒะฐะฝะธั.\n" -#: remote.c:2064 +#: remote.c:2146 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (ัะปะตะนัะต ะพัะดะฐะปะตัะตะฝะธั ะบะปะพะฝ ะฒ ะปะพะบะฐะปะฝะธั ััะตะท โgit pullโ)\n" -#: remote.c:2247 +#: remote.c:2337 #, c-format msgid "cannot parse expected object name '%s'" msgstr "ะพัะฐะบะฒะฐะฝะพัะพ ะธะผะต ะฝะฐ ะพะฑะตะบั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝะพ" @@ -5814,7 +6787,7 @@ msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ัะบะฐะทะฐัะตะป ะทะฐ ะทะฐะผัะฝะฐ: โ msgid "duplicate replace ref: %s" msgstr "ะฟะพะฒัะฐััั ัะต ัะบะฐะทะฐัะตะป ะทะฐ ะทะฐะผัะฝะฐ: โ%sโ" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "ะดัะปะฑะพัะธะฝะฐัะฐ ะฝะฐ ะทะฐะผัะฝะฐ ะต ะฟัะตะบะฐะปะตะฝะพ ะณะพะปัะผะฐ ะทะฐ ะพะฑะตะบัะฐ: โ%sโ" @@ -5880,8 +6853,8 @@ msgstr "ะธะทะปะธัะฝะธัั ะพะฑะตะบั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทััะ msgid "Recorded preimage for '%s'" msgstr "ะัะตะดะฒะฐัะธัะตะปะฝะธัั ะฒะฐัะธะฐะฝั ะฝะฐ โ%sโ ะต ะทะฐะฟะฐะทะตะฝ" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "ะะธัะตะบัะพัะธััะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝะฐ" @@ -5915,20 +6888,34 @@ msgstr "ะะฐะฟะฐะทะตะฝะฐัะฐ ะบะพัะตะบัะธั ะฝะฐ ะบะพะฝัะปะธะบั ะฟัะธ โ%s msgid "unable to open rr-cache directory" msgstr "ะดะธัะตะบัะพัะธััะฐ โrr-cacheโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ" -#: revision.c:2507 +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฟัะตะดะตะปะธ ะบัะผ ะบะฐะบะฒะพ ะดะฐ ัะพัะธ ัะบะฐะทะฐัะตะปัั โHEADโ" + +#: reset.c:70 reset.c:76 sequencer.c:3426 +#, c-format +msgid "failed to find tree of %s" +msgstr "ะดััะฒะพัะพ, ัะพัะตะฝะพ ะพั โ%sโ, ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะพ" + +#: revision.c:2344 +msgid "--unpacked=<packfile> no longer supported" +msgstr "ะพะฟัะธััะฐ โ--unpacked=ะะะะะขะะ_ะคะะะโ ะฒะตัะต ะฝะต ัะต ะฟะพะดะดััะถะฐ" + +#: revision.c:2364 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั ะทะฐ ะพะฟัะธััะฐ โ--diff-mergesโ: โ%sโ" + +#: revision.c:2702 msgid "your current branch appears to be broken" msgstr "ะขะตะบััะธัั ะบะปะพะฝ ะต ะฟะพะฒัะตะดะตะฝ" -#: revision.c:2510 +#: revision.c:2705 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "ะขะตะบััะธัั ะบะปะพะฝ โ%sโ ะต ะฑะตะท ะฟะพะดะฐะฒะฐะฝะธั " -#: revision.c:2710 -msgid "--first-parent is incompatible with --bisect" -msgstr "ะพะฟัะธะธัะต โ--first-parentโ ะธ โ--bisectโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" - -#: revision.c:2714 +#: revision.c:2915 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" "ะพะฟัะธััะฐ โ-Lโ ะฟะพะดะดััะถะฐ ะตะดะธะฝััะฒะตะฝะพ ัะพัะผะฐัะธัะฐะฝะตัะพ ะฝะฐ ัะฐะทะปะธะบะธัะต ัะฟะพัะตะด ะพะฟัะธะธัะต โ-" @@ -5938,12 +6925,12 @@ msgstr "" msgid "open /dev/null failed" msgstr "ะฝะตััะฟะตัะฝะพ ะพัะฒะฐััะฝะต ะฝะฐ โ/dev/nullโ" -#: run-command.c:1269 +#: run-command.c:1270 #, c-format msgid "cannot create async thread: %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฐัะธะฝั ัะพะฝะฝะฐ ะฝะธัะบะฐ: %s" -#: run-command.c:1333 +#: run-command.c:1334 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5953,32 +6940,37 @@ msgstr "" "ะะฐ ะดะฐ ะธะทะบะปััะธัะต ัะพะฒะฐ ะฟัะตะดัะฟัะตะถะดะตะฝะธะต, ะธะทะฟัะปะฝะตัะต:\n" " git config advice.ignoredHook false" -#: send-pack.c:141 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "ะฝะตะพัะฐะบะฒะฐะฝ ะธะทัะธััะฒะฐั ะฟะฐะบะตั โflushโ ะฟัะธ ะธะทัะธัะฐะฝะต ะฝะฐ ััััะพัะฝะธะตัะพ ะพั " "ะพัะดะฐะปะตัะตะฝะพัะพ ัะฐะทะฟะฐะบะตัะธัะฐะฝะต" -#: send-pack.c:143 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" "ััััะพัะฝะธะตัะพ ะพั ะพัะดะฐะปะตัะตะฝะพัะพ ัะฐะทะฟะฐะบะตัะธัะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝะพ: %s" -#: send-pack.c:145 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "ะฝะตััะฟะตัะฝะพ ะพัะดะฐะปะตัะตะฝะพ ัะฐะทะฟะฐะบะตัะธัะฐะฝะต: %s" -#: send-pack.c:306 +#: send-pack.c:372 msgid "failed to sign the push certificate" msgstr "ัะตััะธัะธะบะฐััั ะทะฐ ะธะทัะปะฐัะบะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะดะฟะธัะฐะฝ" -#: send-pack.c:420 +#: send-pack.c:460 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "" +"ะพัััะตัะฝะฐัะฐ ัััะฐะฝะฐ ะฝะต ะฟะพะดะดััะถะฐ ะฐะปะณะพัะธััะผะฐ ะทะฐ ะบะพะฝััะพะปะฝะธ ััะผะธ ะฝะฐ ัะพะฒะฐ ั ัะฐะฝะธะปะธัะต" + +#: send-pack.c:469 msgid "the receiving end does not support --signed push" msgstr "ะพัััะตัะฝะฐัะฐ ัััะฐะฝะฐ ะฝะต ะฟะพะดะดััะถะฐ ะธะทัะปะฐัะบะฒะฐะฝะต ั ะพะฟัะธััะฐ โ--signedโ" -#: send-pack.c:422 +#: send-pack.c:471 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5986,47 +6978,47 @@ msgstr "" "ะพัััะตัะฝะฐัะฐ ัััะฐะฝะฐ ะฝะต ะฟะพะดะดััะถะฐ ะธะทัะปะฐัะบะฒะฐะฝะต ั ะพะฟัะธััะฐ โ--signedโ, ะทะฐัะพะฒะฐ ะฝะต ัะต " "ะธะทะฟะพะปะทะฒะฐ ัะตััะธัะธะบะฐั" -#: send-pack.c:434 +#: send-pack.c:483 msgid "the receiving end does not support --atomic push" msgstr "ะฟะพะปััะฐะฒะฐัะฐัะฐ ัััะฐะฝะฐ ะฝะต ะฟะพะดะดััะถะฐ ะธะทัะปะฐัะบะฒะฐะฝะต ั ะพะฟัะธััะฐ โ--atomicโ" -#: send-pack.c:439 +#: send-pack.c:488 msgid "the receiving end does not support push options" msgstr "ะพัััะตัะฝะฐัะฐ ัััะฐะฝะฐ ะฝะต ะฟะพะดะดััะถะฐ ะพะฟัะธะธ ะฟัะธ ะธะทัะปะฐัะบะฒะฐะฝะต" -#: sequencer.c:187 +#: sequencer.c:194 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "ะฝะตัััะตััะฒัะฒะฐั ัะตะถะธะผ ะฝะฐ ะธะทัะธััะฒะฐะฝะต โ%sโ ะฝะฐ ััะพะฑัะตะฝะธะต ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต" -#: sequencer.c:292 +#: sequencer.c:308 #, c-format msgid "could not delete '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" -#: sequencer.c:321 +#: sequencer.c:339 msgid "revert" msgstr "ะพัะผัะฝะฐ" -#: sequencer.c:323 +#: sequencer.c:341 msgid "cherry-pick" msgstr "ะพัะฑะธัะฐะฝะต" -#: sequencer.c:325 -msgid "rebase -i" -msgstr "rebase -i" +#: sequencer.c:343 +msgid "rebase" +msgstr "ะฟัะตะฑะฐะทะธัะฐะฝะต" -#: sequencer.c:327 +#: sequencer.c:345 #, c-format msgid "unknown action: %d" msgstr "ะฝะตะธะทะฒะตััะฝะพ ะดะตะนััะฒะธะต: %d" -#: sequencer.c:385 +#: sequencer.c:404 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6034,7 +7026,7 @@ msgstr "" "ัะปะตะด ะบะพัะธะณะธัะฐะฝะตัะพ ะฝะฐ ะบะพะฝัะปะธะบัะธัะต, ะพัะฑะตะปะตะถะตัะต ััะพัะฒะตัะฝะธัะต\n" "ะฟััะธัะฐ ั โgit add ะะชะขโฆโ ะธะปะธ โgit rm ะะชะขโฆโ." -#: sequencer.c:388 +#: sequencer.c:407 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6044,115 +7036,109 @@ msgstr "" "ะฟััะธัะฐ ั โgit add ะะชะขโฆโ ะธะปะธ โgit rm ะะชะขโฆโ, ัะปะตะด ะบะพะตัะพ\n" "ะฟะพะดะฐะนัะต ัะตะทัะปัะฐัะฐ ั ะบะพะผะฐะฝะดะฐัะฐ โgit commit'โ." -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:420 sequencer.c:3028 #, c-format msgid "could not lock '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะบะปััะธ" -#: sequencer.c:408 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "ะฒ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะธัะต" + +#: sequencer.c:427 #, c-format msgid "could not write eol to '%s'" msgstr "ะบัะฐัั ะฝะฐ ัะตะด ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะธัะต ะฒ โ%sโ" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 #, c-format msgid "failed to finalize '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฒัััะธ" -#: 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:462 +#: sequencer.c:471 #, c-format msgid "your local changes would be overwritten by %s." msgstr "ะปะพะบะฐะปะฝะธัะต ะฒะธ ะฟัะพะผะตะฝะธ ัะต ะฑัะดะฐั ะฟัะตะทะฐะฟะธัะฐะฝะธ ะฟัะธ %s." -#: sequencer.c:466 +#: sequencer.c:475 msgid "commit your changes or stash them to proceed." msgstr "ะฟะพะดะฐะนัะต ะธะปะธ ัะบะฐัะฐะนัะต ะฟัะพะผะตะฝะธัะต, ะทะฐ ะดะฐ ะฟัะพะดัะปะถะธัะต" -#: sequencer.c:498 +#: sequencer.c:507 #, c-format msgid "%s: fast-forward" msgstr "%s: ะฟัะตะฒัััะฐะฝะต" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:546 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "ะะตัััะตััะฒัะฒะฐั ัะตะถะธะผ ะฝะฐ ะธะทัะธััะฒะฐะฝะต โ%sโ" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:632 +#: sequencer.c:640 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: ะฝะพะฒะธัั ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝ" -#: sequencer.c:649 +#: sequencer.c:657 msgid "unable to update cache tree" msgstr "ะดััะฒะพัะพ ะฝะฐ ะบะตัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝะพ" -#: sequencer.c:663 +#: sequencer.c:671 msgid "could not resolve HEAD commit" msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ, ัะพัะตะฝะพ ะพั ัะบะฐะทะฐัะตะปั โHEADโ, ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะพ" -#: sequencer.c:743 +#: sequencer.c:751 #, c-format msgid "no key present in '%.*s'" msgstr "ะฒ โ%.*sโ ะฝัะผะฐ ะบะปััะพะฒะต" -#: sequencer.c:754 +#: sequencer.c:762 #, c-format msgid "unable to dequote value of '%s'" msgstr "ัะธัะธัะฐะฝะตัะพ ะฝะฐ ััะพะนะฝะพัััะฐ ะฝะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทัะธััะตะฝะพ" -#: 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 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 #, c-format msgid "could not open '%s' for reading" msgstr "ัะฐะนะปัั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ: โ%sโ" -#: sequencer.c:801 +#: sequencer.c:809 msgid "'GIT_AUTHOR_NAME' already given" msgstr "ะฝะฐัััะพะนะบะฐัะฐ ะทะฐ ะฐะฒัะพั โGIT_AUTHOR_NAMEโ ะฒะตัะต ะต ะทะฐะดะฐะดะตะฝะฐ" -#: sequencer.c:806 +#: sequencer.c:814 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "ะฝะฐัััะพะนะบะฐัะฐ ะทะฐ ะต-ะฟะพัะฐ โGIT_AUTHOR_EMAILโ ะฒะตัะต ะต ะทะฐะดะฐะดะตะฝะฐ" -#: sequencer.c:811 +#: sequencer.c:819 msgid "'GIT_AUTHOR_DATE' already given" msgstr "ะฝะฐัััะพะนะบะฐัะฐ ะทะฐ ะดะฐัะฐ โGIT_AUTHOR_DATEโ ะฒะตัะต ะต ะทะฐะดะฐะดะตะฝะฐ" -#: sequencer.c:815 +#: sequencer.c:823 #, c-format msgid "unknown variable '%s'" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะฟัะพะผะตะฝะปะธะฒะฐ โ%sโ" -#: sequencer.c:820 +#: sequencer.c:828 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "ะฝะฐัััะพะนะบะฐัะฐ ะทะฐ ะฐะฒัะพั โGIT_AUTHOR_NAMEโ ะปะธะฟัะฒะฐ" -#: sequencer.c:822 +#: sequencer.c:830 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "ะฝะฐัััะพะนะบะฐัะฐ ะทะฐ ะต-ะฟะพัะฐ โGIT_AUTHOR_EMAILโ ะปะธะฟัะฒะฐ" -#: sequencer.c:824 +#: sequencer.c:832 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "ะฝะฐัััะพะนะบะฐัะฐ ะทะฐ ะดะฐัะฐ โGIT_AUTHOR_DATEโ ะปะธะฟัะฒะฐ" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะพัะผะฐั ะฝะฐ ะดะฐัะฐ โ%sโ ะฒ โ%sโ" - -#: sequencer.c:901 +#: sequencer.c:897 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6181,17 +7167,13 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฝะฐัะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต" - -#: sequencer.c:1216 +#: sequencer.c:1178 msgid "'prepare-commit-msg' hook failed" msgstr "" "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะบัะบะฐัะฐ ะฟัะธ ะฟัะพะผัะฝะฐ ะฝะฐ ััะพะฑัะตะฝะธะตัะพ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต " "(prepare-commit-msg)" -#: sequencer.c:1223 +#: sequencer.c:1184 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6220,7 +7202,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1197 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6246,338 +7228,351 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1239 msgid "couldn't look up newly created commit" msgstr "ัะพะบั ัะพ ััะทะดะฐะดะตะฝะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะพ" -#: sequencer.c:1280 +#: sequencer.c:1241 msgid "could not parse newly created commit" msgstr "ัะพะบั ัะพ ััะทะดะฐะดะตะฝะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝะพ" -#: sequencer.c:1326 +#: sequencer.c:1287 msgid "unable to resolve HEAD after creating commit" msgstr "" "ััััะพัะฝะธะตัะพ ัะพัะตะฝะพ ะพั ัะบะฐะทะฐัะตะปั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะพ ัะปะตะด " "ะฟะพะดะฐะฒะฐะฝะตัะพ" -#: sequencer.c:1328 +#: sequencer.c:1289 msgid "detached HEAD" msgstr "ะฝะตัะฒััะทะฐะฝ ะฒััั โHEADโ" -#: sequencer.c:1332 +#: sequencer.c:1293 msgid " (root-commit)" msgstr " (ะฝะฐัะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต)" -#: sequencer.c:1353 +#: sequencer.c:1314 msgid "could not parse HEAD" msgstr "ัะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝ" -#: sequencer.c:1355 +#: sequencer.c:1316 #, c-format msgid "HEAD %s is not a commit!" msgstr "ัะบะฐะทะฐัะตะปัั โHEADโ โ%sโ ัะพัะธ ะบัะผ ะฝะตัะพ, ะบะพะตัะพ ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต!" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "ะฒััั ะพะฒะพัะพ ะฟะพะดะฐะฒะฐะฝะต โHEADโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะพ" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1373 sequencer.c:2067 msgid "unable to parse commit author" msgstr "ะฐะฒัะพััั ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝ" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 msgid "git write-tree failed to write a tree" msgstr "ะะพะผะฐะฝะดะฐัะฐ โgit write-treeโ ะฝะต ััะฟั ะดะฐ ะทะฐะฟะธัะต ะพะฑะตะบั-ะดััะฒะพ" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1417 sequencer.c:1535 #, c-format msgid "unable to read commit message from '%s'" msgstr "ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะพ ะพั โ%sโ" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1446 sequencer.c:1478 +#, c-format +msgid "invalid author identity '%s'" +msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ัะฐะผะพะปะธัะฝะพัั ะทะฐ ะฐะฒัะพั: โ%sโ" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "ะฟะพะฒัะตะดะตะฝะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะฐะฒัะพั: ะปะธะฟัะฒะฐ ะดะฐัะฐ" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 msgid "failed to write commit object" msgstr "ะพะฑะตะบััั ะทะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" -#: sequencer.c:1526 +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฑะฝะพะฒะธ" + +#: sequencer.c:1567 #, c-format msgid "could not parse commit %s" msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝะพ" -#: sequencer.c:1531 +#: sequencer.c:1572 #, c-format msgid "could not parse parent commit %s" msgstr "ัะพะดะธัะตะปัะบะพัะพ ะฟะพะดะฐะฒะฐะฝะต โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝะพ" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1655 sequencer.c:1766 #, c-format msgid "unknown command: %d" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะบะพะผะฐะฝะดะฐ: %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1713 sequencer.c:1738 #, c-format msgid "This is a combination of %d commits." msgstr "ะขะพะฒะฐ ะต ะพะฑะตะดะธะฝะตะฝะธะต ะพั %d ะฟะพะดะฐะฒะฐะฝะธั" -#: sequencer.c:1672 +#: sequencer.c:1723 msgid "need a HEAD to fixup" msgstr "ะะฐ ะฒะบะฐัะฒะฐะฝะต ะฒ ะฟัะตะดั ะพะดะฝะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะฒะธ ัััะฑะฒะฐ ัะบะฐะทะฐัะตะป โHEADโ" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1725 sequencer.c:3338 msgid "could not read HEAD" msgstr "ัะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะพัะตัะต" -#: sequencer.c:1676 +#: sequencer.c:1727 msgid "could not read HEAD's commit message" msgstr "" "ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะบัะผ ัะบะฐะทะฐัะตะปั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะพ: %s" -#: sequencer.c:1682 +#: sequencer.c:1733 #, c-format msgid "cannot write '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟะฐะทะธ" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "ะขะพะฒะฐ ะต 1-ัะพ ััะพะฑัะตะฝะธะต ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต:" -#: sequencer.c:1697 +#: sequencer.c:1748 #, c-format msgid "could not read commit message of %s" msgstr "ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะบัะผ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะพ" -#: sequencer.c:1704 +#: sequencer.c:1755 #, c-format msgid "This is the commit message #%d:" msgstr "ะขะพะฒะฐ ะต ััะพะฑัะตะฝะธะต ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต โ%d:" -#: sequencer.c:1710 +#: sequencer.c:1761 #, c-format msgid "The commit message #%d will be skipped:" msgstr "ะกัะพะฑัะตะฝะธะต ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต โ%d ัะต ะฑัะดะต ะฟัะตัะบะพัะตะฝะพ:" -#: sequencer.c:1798 +#: sequencer.c:1849 msgid "your index file is unmerged." msgstr "ะธะฝะดะตะบััั ะฝะต ะต ัะปัั." -#: sequencer.c:1805 +#: sequencer.c:1856 msgid "cannot fixup root commit" msgstr "ะฝะฐัะฐะปะฝะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒะบะฐัะฐ ะฒ ะฟัะตะดั ะพะดะฝะพัะพ ะผั" -#: sequencer.c:1824 +#: sequencer.c:1875 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะต ัะปะธะฒะฐะฝะต, ะฝะพ ะฝะต ะต ะดะฐะดะตะฝะฐ ะพะฟัะธััะฐ โ-mโ" -#: sequencer.c:1832 sequencer.c:1840 +#: sequencer.c:1883 sequencer.c:1891 #, c-format msgid "commit %s does not have parent %d" msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะฝัะผะฐ ัะพะดะธัะตะป %d" -#: sequencer.c:1846 +#: sequencer.c:1897 #, 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:1865 +#: sequencer.c:1916 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: ะฝะตัะฐะทะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั ะทะฐ ัะพะดะธัะตะปัะบะพัะพ ะฟะพะดะฐะฒะฐะฝะต โ%sโ" -#: sequencer.c:1930 +#: sequencer.c:1981 #, c-format msgid "could not rename '%s' to '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะตะธะผะตะฝัะฒะฐ ะฝะฐ โ%sโ" -#: sequencer.c:1985 +#: sequencer.c:2038 #, c-format msgid "could not revert %s... %s" msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโโฆ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะผะตะฝะตะฝะพ: โ%sโ" -#: sequencer.c:1986 +#: sequencer.c:2039 #, c-format msgid "could not apply %s... %s" msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโโฆ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะธะปะพะถะตะฝะพ: โ%sโ" -#: sequencer.c:2045 +#: sequencer.c:2059 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ %s %s โ ะบััะฟะบะฐัะฐ ะฒะตัะต ะต ะฟัะธะปะพะถะตะฝะฐ\n" + +#: sequencer.c:2117 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: ะฝะตััะฟะตัะฝะพ ะธะทัะธัะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ" -#: sequencer.c:2052 +#: sequencer.c:2124 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: ะฝะตััะฟะตัะฝะพ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ" -#: sequencer.c:2128 +#: sequencer.c:2201 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "โ%sโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ: โ%sโ" -#: sequencer.c:2137 +#: sequencer.c:2210 #, c-format msgid "missing arguments for %s" msgstr "โ%sโ ะธะทะธัะบะฒะฐ ะฐัะณัะผะตะฝัะธ" -#: sequencer.c:2174 +#: sequencer.c:2241 #, c-format -msgid "could not parse '%.*s'" -msgstr "โ%.*sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" +msgid "could not parse '%s'" +msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" -#: sequencer.c:2228 +#: sequencer.c:2302 #, c-format msgid "invalid line %d: %.*s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะด %d: %.*s" -#: sequencer.c:2239 +#: sequencer.c:2313 #, c-format msgid "cannot '%s' without a previous commit" msgstr "ะะตะท ะฟัะตะดะธัะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ โ%sโ" -#: 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 +#: sequencer.c:2399 msgid "cancelling a cherry picking in progress" msgstr "ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะทะฒัััะฒะฐะฝะพัะพ ะฒ ะผะพะผะตะฝัะฐ ะพัะฑะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั" -#: sequencer.c:2330 +#: sequencer.c:2408 msgid "cancelling a revert in progress" msgstr "ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะทะฒัััะฒะฐะฝะพัะพ ะฒ ะผะพะผะตะฝัะฐ ะพัะผัะฝะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต" -#: sequencer.c:2364 +#: sequencer.c:2452 msgid "please fix this using 'git rebase --edit-todo'." msgstr "ะบะพัะธะณะธัะฐะนัะต ัะพะฒะฐ ััะตะท โgit rebase --edit-todoโ." -#: sequencer.c:2366 +#: sequencer.c:2454 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "ะฝะตะธะทะฟะพะปะทะฒะฐะตะผ ัะฐะนะป ั ะพะฟะธัะฐะฝะธะต ะฝะฐ ะฟัะตะดััะพััะธัะต ะดะตะนััะฒะธั: โ%sโ" -#: sequencer.c:2371 +#: sequencer.c:2459 msgid "no commits parsed." msgstr "ะฝะธะบะพะต ะพั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ัะฐะทะฟะพะทะฝะฐะต." -#: sequencer.c:2382 +#: sequencer.c:2470 msgid "cannot cherry-pick during a revert." msgstr "" "ะฟะพ ะฒัะตะผะต ะฝะฐ ะพัะผัะฝะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัััะธ ะพัะฑะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต." -#: sequencer.c:2384 +#: sequencer.c:2472 msgid "cannot revert during a cherry-pick." msgstr "ะฟะพ ะฒัะตะผะต ะฝะฐ ะพัะฑะธัะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัััะธ ะพัะผัะฝะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต." -#: sequencer.c:2466 +#: sequencer.c:2550 #, c-format msgid "invalid value for %s: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โ%sโ: โ%sโ" -#: sequencer.c:2553 +#: sequencer.c:2657 msgid "unusable squash-onto" msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ, ะฒ ะบะพะตัะพ ะดััะณะธัะต ะดะฐ ัะต ะฒะบะฐัะฐั, ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ" -#: sequencer.c:2569 +#: sequencer.c:2677 #, c-format msgid "malformed options sheet: '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะฐะนะป ั ะพะฟัะธะธ: โ%sโ" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2769 sequencer.c:4609 msgid "empty commit set passed" msgstr "ะทะฐะดะฐะดะตะฝะพ ะต ะฟัะฐะทะฝะพ ะผะฝะพะถะตััะฒะพ ะพั ะฟะพะดะฐะฒะฐะฝะธั" -#: sequencer.c:2668 +#: sequencer.c:2786 msgid "revert is already in progress" msgstr "ะฒ ะผะพะผะตะฝัะฐ ะฒะตัะต ัะต ะธะทะฒัััะฒะฐ ะพัะผัะฝะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั" -#: sequencer.c:2670 +#: sequencer.c:2788 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "ะธะทะฟะพะปะทะฒะฐะนัะต โgit cherry-pick (--continue | %s--abort | --quit)โ" -#: sequencer.c:2673 +#: sequencer.c:2791 msgid "cherry-pick is already in progress" msgstr "ะฒ ะผะพะผะตะฝัะฐ ะฒะตัะต ัะต ะธะทะฒัััะฒะฐ ะพัะฑะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั" -#: sequencer.c:2675 +#: sequencer.c:2793 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "ะธะทะฟะพะปะทะฒะฐะนัะต โgit cherry-pick (--continue | %s--abort | --quit)โ" -#: sequencer.c:2689 +#: sequencer.c:2807 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" "ะดะธัะตะบัะพัะธััะฐ ะทะฐ ะพะฟัะตะดะตะปัะฝะตัะพ ะฝะฐ ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะพัััะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต " "ััะทะดะฐะดะตะฝะฐ" -#: sequencer.c:2704 +#: sequencer.c:2822 msgid "could not lock HEAD" msgstr "ัะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะบะปััะธ" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2882 sequencer.c:4325 msgid "no cherry-pick or revert in progress" msgstr "" "ะฒ ะผะพะผะตะฝัะฐ ะฝะต ัะต ะธะทะฒัััะฒะฐ ะพัะฑะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั ะธะปะธ ะฟัะตะฑะฐะทะธัะฐะฝะต ะฝะฐ ะบะปะพะฝะฐ" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2884 sequencer.c:2895 msgid "cannot resolve HEAD" msgstr "ะะพะดะฐะฒะฐะฝะตัะพ ัะพัะตะฝะพ ะพั ัะบะฐะทะฐัะตะปั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะพ" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2886 sequencer.c:2930 msgid "cannot abort from a branch yet to be born" msgstr "" "ะดะตะนััะฒะธะตัะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะตัััะฐะฝะพะฒะตะฝะพ, ะบะพะณะฐัะพ ััะต ะฝะฐ ะบะปะพะฝ, ะบะพะนัะพ ัะตะฟััะฒะฐ " "ะฟัะตะดััะพะธ ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝ" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2916 builtin/grep.c:745 #, c-format msgid "cannot open '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ" -#: sequencer.c:2800 +#: sequencer.c:2918 #, c-format msgid "cannot read '%s': %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ: %s" -#: sequencer.c:2801 +#: sequencer.c:2919 msgid "unexpected end of file" msgstr "ะฝะตะพัะฐะบะฒะฐะฝ ะบัะฐะน ะฝะฐ ัะฐะนะป" -#: sequencer.c:2807 +#: sequencer.c:2925 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "ะทะฐะฟะฐะทะตะฝะธัั ะฟัะตะดะธ ะทะฐะฟะพัะฒะฐะฝะตัะพ ะฝะฐ ะพัะฑะธัะฐะฝะตัะพ ัะฐะนะป ะทะฐ ัะบะฐะทะฐัะตะปั โHEADโ โ โ%sโ ะต " "ะฟะพะฒัะตะดะตะฝ" -#: sequencer.c:2818 +#: sequencer.c:2936 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "ะะทะณะปะตะถะดะฐ ัะบะฐะทะฐัะตะปัั โHEADโ ะต ะฟัะพะผะตะฝะตะฝ. ะัะพะฒะตัะตัะต ะบัะผ ะบะฐะบะฒะพ ัะพัะธ.\n" "ะะต ัะต ะฟัะฐะฒัั ะฟัะพะผะตะฝะธ." -#: sequencer.c:2859 +#: sequencer.c:2977 msgid "no revert in progress" msgstr "ะฒ ะผะพะผะตะฝัะฐ ะฝะต ัะตัะต ะฟัะตะฑะฐะทะธัะฐะฝะต" -#: sequencer.c:2867 +#: sequencer.c:2986 msgid "no cherry-pick in progress" msgstr "ะฒ ะผะพะผะตะฝัะฐ ะฝะต ัะต ะธะทะฒัััะฒะฐ ะพัะฑะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั" -#: sequencer.c:2877 +#: sequencer.c:2996 msgid "failed to skip the commit" msgstr "ะฝะตััะฟะตัะฝะพ ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ" -#: sequencer.c:2884 +#: sequencer.c:3003 msgid "there is nothing to skip" msgstr "ะฝัะผะฐ ะบะฐะบะฒะพ ะดะฐ ัะต ะฟัะตัะบะพัะธ" -#: sequencer.c:2887 +#: sequencer.c:3006 #, c-format msgid "" "have you committed already?\n" @@ -6587,21 +7582,16 @@ msgstr "" "\n" " git %s --continue" -#: sequencer.c:3011 sequencer.c:4015 -#, c-format -msgid "could not update %s" -msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฑะฝะพะฒะธ" - -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3168 sequencer.c:4217 msgid "cannot read HEAD" msgstr "ัะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: sequencer.c:3066 +#: sequencer.c:3185 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะบะพะฟะธัะฐ ะบะฐัะพ โ%sโ" -#: sequencer.c:3074 +#: sequencer.c:3193 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6620,27 +7610,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3203 #, c-format msgid "Could not apply %s... %.*s" msgstr "ะะพะดะฐะฒะฐะฝะตัะพ โ%sโโฆ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะธะปะพะถะตะฝะพ: โ%.*sโ" -#: sequencer.c:3091 +#: sequencer.c:3210 #, c-format msgid "Could not merge %.*s" msgstr "ะะตะฒัะทะผะพะถะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ โ%.*sโ" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 #, 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:3240 +#, c-format +msgid "Executing: %s\n" +msgstr "ะ ะผะพะผะตะฝัะฐ ัะต ะธะทะฟัะปะฝัะฒะฐ: %s\n" -#: sequencer.c:3136 +#: sequencer.c:3255 #, c-format msgid "" "execution failed: %s\n" @@ -6655,11 +7645,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3261 msgid "and made changes to the index and/or the working tree\n" msgstr "ะธ ะฟัะพะผะตะฝั ะธะฝะดะตะบัะฐ ะธ/ะธะปะธ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ\n" -#: sequencer.c:3148 +#: sequencer.c:3267 #, c-format msgid "" "execution succeeded: %s\n" @@ -6676,111 +7666,129 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3328 #, c-format msgid "illegal label name: '%.*s'" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะตัะธะบะตั: โ%.*sโ" -#: sequencer.c:3263 +#: sequencer.c:3382 msgid "writing fake root commit" msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ัะฐะปัะธะฒะพ ะฝะฐัะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต" -#: sequencer.c:3268 +#: sequencer.c:3387 msgid "writing squash-onto" msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ, ะฒ ะบะพะตัะพ ะดััะณะธัะต ะดะฐ ัะต ะฒะบะฐัะฐั" -#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 -#, c-format -msgid "failed to find tree of %s" -msgstr "ะดััะฒะพัะพ, ัะพัะตะฝะพ ะพั โ%sโ, ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะพ" - -#: sequencer.c:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "ะธะฝะดะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" - -#: sequencer.c:3351 +#: sequencer.c:3471 #, c-format msgid "could not resolve '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธั" -#: sequencer.c:3379 +#: sequencer.c:3502 msgid "cannot merge without a current revision" msgstr "ะฑะตะท ัะตะบััะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ัะปะธะฒะฐ" -#: sequencer.c:3401 +#: sequencer.c:3524 #, c-format msgid "unable to parse '%.*s'" msgstr "โ%.*sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" -#: sequencer.c:3410 +#: sequencer.c:3533 #, c-format msgid "nothing to merge: '%.*s'" msgstr "ะฝัะผะฐ ะฝะธัะพ ะทะฐ ัะปะธะฒะฐะฝะต: โ%.*sโ" -#: sequencer.c:3422 +#: sequencer.c:3545 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "ะฒััั ั ะฝะฐัะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัััะธ ะผะฝะพะถะตััะฒะตะฝะพ ัะปะธะฒะฐะฝะต" -#: sequencer.c:3437 +#: sequencer.c:3561 #, c-format msgid "could not get commit message of '%s'" msgstr "ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะบัะผ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะปััะตะฝะพ" -#: sequencer.c:3590 +#: sequencer.c:3730 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "ัะปะธะฒะฐะฝะตัะพ ะฝะฐ โ%.*sโ ะฝะต ะผะพะถะต ะดะฐะถะต ะดะฐ ะทะฐะฟะพัะฝะต" -#: sequencer.c:3606 +#: sequencer.c:3746 msgid "merge: Unable to write new index file" msgstr "ัะปะธะฒะฐะฝะต: ะฝะพะฒะธัั ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝ" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ัะบะฐัะฐะต ะฐะฒัะพะผะฐัะธัะฝะพ" + +#: sequencer.c:3823 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "ะะตะพัะฐะบะฒะฐะฝ ัะตะทัะปัะฐั ะฟัะธ ัะบะฐัะฐะฒะฐะฝะต: โ%sโ" + +#: sequencer.c:3829 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "ะะธัะตะบัะพัะธััะฐ ะทะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝะฐ" + +#: sequencer.c:3832 +#, c-format +msgid "Created autostash: %s\n" +msgstr "ะะฒัะพะผะฐัะธัะฝะพ ัะบะฐัะฐะฝะพ: โ%sโ\n" + +#: sequencer.c:3836 +msgid "could not reset --hard" +msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โgit reset --hardโ" + +#: sequencer.c:3861 #, c-format msgid "Applied autostash.\n" msgstr "ะะฒัะพะผะฐัะธัะฝะพ ัะบะฐัะฐะฝะพัะพ ะต ะฟัะธะปะพะถะตะฝะพ.\n" -#: sequencer.c:3687 +#: sequencer.c:3873 #, c-format msgid "cannot store %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝ" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3876 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"ะัะธะปะฐะณะฐะฝะตัะพ ะฝะฐ ะฐะฒัะพะผะฐัะธัะฝะพ ัะบะฐัะฐะฝะพัะพ ะดะพะฒะตะดะต ะดะพ ะบะพะฝัะปะธะบัะธ. ะัะพะผะตะฝะธัะต ะฒะธ ัะฐ\n" -"ะฝะฐะดะตะถะดะฝะพ ัะบะฐัะฐะฝะธ. ะะพะถะตัะต ะดะฐ ะฟัะพะฑะฒะฐัะต ะดะฐ ะณะธ ะฟัะธะปะพะถะธัะต ััะตะท โgit stash popโ\n" -"ะธะปะธ ะดะฐ ะณะธ ะธะทั ะฒััะปะธัะต ััะตะท โgit stash dropโ, ะบะพะณะฐัะพ ะฟะพะธัะบะฐัะต.\n" +"%s\n" +"ะัะพะผะตะฝะธัะต ะฒะธ ัะฐ ะฝะฐะดะตะถะดะฝะพ ัะบะฐัะฐะฝะธ. ะะพะถะตัะต ะดะฐ ะฟัะพะฑะฒะฐัะต ะดะฐ ะณะธ ะฟัะธะปะพะถะธัะต ััะตะท\n" +"โgit stash popโ ะธะปะธ ะดะฐ ะณะธ ะธะทั ะฒััะปะธัะต ััะตะท โgit stash dropโ, ะบะพะณะฐัะพ " +"ะฟะพะธัะบะฐัะต.\n" -#: sequencer.c:3751 -#, c-format -msgid "could not checkout %s" -msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทัะตะณะปะธ" +#: sequencer.c:3881 +msgid "Applying autostash resulted in conflicts." +msgstr "ะะพะฝัะปะธะบัะธ ะฟัะธ ะฟัะธะปะฐะณะฐะฝะตัะพ ะฝะฐ ะฐะฒัะพะผะฐัะธัะฝะพ ัะบะฐัะฐะฝะพัะพ." -#: sequencer.c:3765 +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." +msgstr "ะะตัะต ะธะผะฐ ะทะฐะฟะธั ะทะฐ ะฐะฒัะพะผะฐัะธัะฝะพ ัะบะฐัะฐะฝะพ, ะทะฐัะพะฒะฐ ัะต ััะทะดะฐะฒะฐ ะฝะพะฒ ะทะฐะฟะธั." + +#: sequencer.c:3974 #, c-format msgid "%s: not a valid OID" msgstr "โ%sโ ะต ะฝะตะฟัะฐะฒะธะปะตะฝ ะธะดะตะฝัะธัะธะบะฐัะพั ะฝะฐ ะพะฑะตะบั" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "ัะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะดะตะปะธ" -#: sequencer.c:3785 +#: sequencer.c:3994 #, c-format msgid "Stopped at HEAD\n" msgstr "ะะต ัะฟััะฝะพ ะฟัะธ โHEADโ\n" -#: sequencer.c:3787 +#: sequencer.c:3996 #, c-format msgid "Stopped at %s\n" msgstr "ะะต ัะฟััะฝะพ ะฟัะธ โ%sโ\n" -#: sequencer.c:3795 +#: sequencer.c:4004 #, c-format msgid "" "Could not execute the todo command\n" @@ -6803,48 +7811,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "ะัะตะฑะฐะทะธัะฐะฝะต (%d/%d)%s" + +#: sequencer.c:4095 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "ะกะฟะธัะฐะฝะต ะฟัะธ โ%sโโฆ %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:4166 #, c-format msgid "unknown command %d" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะบะพะผะฐะฝะดะฐ %d" -#: sequencer.c:4003 +#: sequencer.c:4225 msgid "could not read orig-head" msgstr "ัะบะฐะทะฐัะตะปัั ะทะฐ โorig-headโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะพัะตัะต" -#: sequencer.c:4008 +#: sequencer.c:4230 msgid "could not read 'onto'" msgstr "ัะบะฐะทะฐัะตะปัั ะทะฐ โontoโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะพัะตัะต" -#: sequencer.c:4022 +#: sequencer.c:4244 #, c-format msgid "could not update HEAD to %s" msgstr "โHEADโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ ะดะพ โ%sโ" -#: sequencer.c:4115 +#: sequencer.c:4304 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "ะฃัะฟะตัะฝะพ ะฟัะตะฑะฐะทะธัะฐะฝะต ะธ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ โ%sโ.\n" + +#: sequencer.c:4337 msgid "cannot rebase: You have unstaged changes." msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฟัะตะฑะฐะทะธัะฐัะต, ะทะฐัะพัะพ ะธะผะฐ ะฟัะพะผะตะฝะธ, ะบะพะธัะพ ะฝะต ัะฐ ะฒ ะธะฝะดะตะบัะฐ." -#: sequencer.c:4124 +#: sequencer.c:4346 msgid "cannot amend non-existing commit" msgstr "ะฝะตัััะตััะฒัะฒะฐัะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะฟัะฐะฒะธ" -#: sequencer.c:4126 +#: sequencer.c:4348 #, c-format msgid "invalid file: '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะฐะนะป: โ%sโ" -#: sequencer.c:4128 +#: sequencer.c:4350 #, c-format msgid "invalid contents: '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ััะดััะถะฐะฝะธะต: โ%sโ" -#: sequencer.c:4131 +#: sequencer.c:4353 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6854,69 +7872,64 @@ msgstr "" "ะ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะธะผะฐ ะฝะตะฟะพะดะฐะดะตะฝะธ ะฟัะพะผะตะฝะธ. ะััะฒะพ ะณะธ ะฟะพะดะฐะนัะต, ะฐ ัะปะตะด ัะพะฒะฐ\n" "ะพัะฝะพะฒะพ ะธะทะฟัะปะฝะตัะต โgit rebase --continueโ." -#: sequencer.c:4167 sequencer.c:4205 +#: sequencer.c:4389 sequencer.c:4428 #, c-format msgid "could not write file: '%s'" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" -#: sequencer.c:4220 +#: sequencer.c:4444 msgid "could not remove CHERRY_PICK_HEAD" msgstr "ัะบะฐะทะฐัะตะปัั โCHERRY_PICK_HEADโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" -#: sequencer.c:4227 +#: sequencer.c:4451 msgid "could not commit staged changes." msgstr "ะฟัะพะผะตะฝะธัะต ะฒ ะธะฝะดะตะบัะฐ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะฟะพะดะฐะดะตะฝะธ." -#: sequencer.c:4328 +#: sequencer.c:4477 +#, c-format +msgid "invalid committer '%s'" +msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟะพะดะฐะฒะฐั: โ%sโ" + +#: sequencer.c:4586 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฑะตัะต โ%sโ" -#: sequencer.c:4332 +#: sequencer.c:4590 #, c-format msgid "%s: bad revision" msgstr "%s: ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฒะตััะธั" -#: sequencer.c:4367 +#: sequencer.c:4625 msgid "can't revert as initial commit" msgstr "ะฟััะฒะพะฝะฐัะฐะปะฝะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะผะตะฝะตะฝะพ" -#: sequencer.c:4810 +#: sequencer.c:5102 msgid "make_script: unhandled options" msgstr "make_script: ะฝะตะฟะพะดะดััะถะฐะฝะธ ะพะฟัะธะธ" -#: sequencer.c:4813 +#: sequencer.c:5105 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 +#: sequencer.c:5347 sequencer.c:5364 msgid "nothing to do" msgstr "ะฝัะผะฐ ะบะฐะบะฒะพ ะดะฐ ัะต ะฟัะฐะฒะธ" -#: sequencer.c:5114 +#: sequencer.c:5383 msgid "could not skip unnecessary pick commands" msgstr "ะธะทะปะธัะฝะธัะต ะบะพะผะฐะฝะดะธ ะทะฐ ะพัะฑะธัะฐะฝะต ะฝะต ะฑัั ะฐ ะฟัะตัะบะพัะตะฝะธ" -#: sequencer.c:5197 +#: sequencer.c:5480 msgid "the script was already rearranged." msgstr "ัะบัะธะฟััั ะฒะตัะต ะต ะฟัะตะฟะพะดัะตะดะตะฝ." -#: setup.c:123 +#: setup.c:133 #, c-format -msgid "'%s' is outside repository" -msgstr "โ%sโ ะต ะธะทะฒัะฝ ั ัะฐะฝะธะปะธัะตัะพ" +msgid "'%s' is outside repository at '%s'" +msgstr "โ%sโ ะต ะธะทะฒัะฝ ั ัะฐะฝะธะปะธัะตัะพ ะฟัะธ โ%sโ" -#: setup.c:173 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6927,7 +7940,7 @@ msgstr "" "\n" " git ะะะะะะะ -- ะะชะขโฆ" -#: setup.c:186 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6940,12 +7953,12 @@ msgstr "" "\n" " git ะะะะะะะ [ะะะ ะกะะฏโฆ] -- [ะคะะะโฆ]" -#: setup.c:235 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "ะพะฟัะธััะฐ โ%sโ ัััะฑะฒะฐ ะดะฐ ะต ะฟัะตะดะธ ะฟััะฒะธั ะฐัะณัะผะตะฝั, ะบะพะนัะพ ะฝะต ะต ะพะฟัะธั" -#: setup.c:254 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6957,95 +7970,99 @@ msgstr "" "\n" " git ะะะะะะะ [ะะะ ะกะะฏโฆ] -- [ะคะะะโฆ]" -#: setup.c:390 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "" "ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ัะตะบััะฐ ัะฐะฑะพัะฝะฐ ะดะธัะตะบัะพัะธั ะฟัะธ ะฝะตะฟัะฐะฒะธะปะฝะธ ะฝะฐัััะพะนะบะธ" -#: setup.c:394 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "ัะฐะทะธ ะบะพะผะฐะฝะดะฐ ัััะฑะฒะฐ ะดะฐ ัะต ะธะทะฟัะปะฝะธ ะฒ ัะฐะฑะพัะฝะพ ะดััะฒะพ" -#: setup.c:540 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "ะัะฐะบะฒะฐ ัะต ะฒะตััะธั ะฝะฐ ั ัะฐะฝะธะปะธัะตัะพ ะฝะฐ git <= %d, ะฐ ะฝะต %d" -#: setup.c:548 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "ะพัะบัะธัะธ ัะฐ ะฝะตะฟะพะทะฝะฐัะธ ัะฐะทัะธัะตะฝะธั ะฒ ั ัะฐะฝะธะปะธัะตัะพ:" -#: setup.c:567 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "ะฒะตััะธััะฐ ะฝะฐ ั ัะฐะฝะธะปะธัะตัะพ ะต 0, ะฝะพ ัะฐ ะพัะบัะธัะธ ัะฐะทัะธัะตะฝะธั ะทะฐ ะฒะตััะธั 1:" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ" -#: setup.c:569 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะณะพะปัะผ ัะฐะนะป โ.gitโ: โ%sโ" -#: setup.c:571 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "ะณัะตัะบะฐ ะฟัะธ ะฟัะพัะธัะฐะฝะต ะฝะฐ โ%sโ" -#: setup.c:573 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะพัะผะฐั ะฝะฐ gitfile: %s" -#: setup.c:575 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "ะปะธะฟัะฒะฐ ะฟัั ะฒ gitfile: โ%sโ" -#: setup.c:577 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "ะฝะต ะต ั ัะฐะฝะธะปะธัะต ะฝะฐ Git: %s" -#: setup.c:676 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "โ%sโ ะต ะฟัะตะบะฐะปะตะฝะพ ะณะพะปัะผ" -#: setup.c:690 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "ะฝะต ะต ั ัะฐะฝะธะปะธัะต ะฝะฐ git: โ%sโ" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒะปะตะทะต ะฒ ะดะธัะตะบัะพัะธััะฐ โ%sโ" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "ะฟัะพัะตััั ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒััะฝะต ะบัะผ ะฟัะตะดะธัะฝะฐัะฐ ัะฐะฑะพัะฝะฐ ะดะธัะตะบัะพัะธั" -#: setup.c:851 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะปััะตะฝะฐ ะธะฝัะพัะผะฐัะธั ััะตะท โstatโ ะทะฐ โ%*s%s%sโ" -#: setup.c:1083 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "ะขะตะบััะฐัะฐ ัะฐะฑะพัะฝะฐ ะดะธัะตะบัะพัะธั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะฐ" -#: setup.c:1092 setup.c:1098 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒะปะตะทะต ะฒ ะดะธัะตะบัะพัะธััะฐ โ%sโ" -#: setup.c:1103 +#: setup.c:1245 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" "ะฝะธัะพ ัะฐะทะธ, ะฝะธัะพ ะบะพััะพ ะธ ะดะฐ ะต ะพั ะฟะพ-ะณะพัะฝะธัะต ะดะธัะตะบัะพัะธะธ, ะฝะต ะต ั ัะฐะฝะธะปะธัะต ะฝะฐ " "git: %s" -#: setup.c:1109 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7056,7 +8073,7 @@ msgstr "" "Git ัะฐะฑะพัะธ ะฒ ัะฐะผะบะธัะต ะฝะฐ ะตะดะฝะฐ ัะฐะนะปะพะฒะฐ ัะธััะตะผะฐ, ะทะฐัะพัะพ ะฟัะพะผะตะฝะปะธะฒะฐัะฐ ะฝะฐ ััะตะดะฐัะฐ " "โGIT_DISCOVERY_ACROSS_FILESYSTEMโ ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ." -#: setup.c:1220 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7066,291 +8083,291 @@ msgstr "" "(0%.3o).\n" "ะกะพะฑััะฒะตะฝะธะบัั ะฝะฐ ัะฐะนะปะฐ ัััะฑะฒะฐ ะดะฐ ะธะผะฐ ะฟัะฐะฒะฐ ะทะฐ ะฟะธัะฐะฝะต ะธ ัะตัะตะฝะต." -#: setup.c:1264 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โopenโ ะธะปะธ โdupโ ะฒััั ั โ/dev/nullโ" -#: setup.c:1279 +#: setup.c:1424 msgid "fork failed" msgstr "ะฝะตััะฟะตัะฝะพ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟัะพัะตั ััะตะท โforkโ" -#: setup.c:1284 +#: setup.c:1429 msgid "setsid failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โsetsidโ" -#: sha1-file.c:453 +#: sha1-file.c:470 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "ะดะธัะตะบัะพัะธััะฐ ะทะฐ ะพะฑะตะบัะธ โ%sโ ะฝะต ัััะตััะฒัะฒะฐ, ะฟัะพะฒะตัะตัะต โ.git/objects/info/" "alternatesโ" -#: sha1-file.c:504 +#: sha1-file.c:521 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "ะฐะปัะตัะฝะฐัะธะฒะฝะธัั ะฟัั ะบัะผ ะพะฑะตะบัะธ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฝะพัะผะฐะปะธะทะธัะฐะฝ: โ%sโ" -#: sha1-file.c:576 +#: sha1-file.c:593 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" "%s: ะฐะปัะตัะฝะฐัะธะฒะฝะธัะต ั ัะฐะฝะธะปะธัะฐ ะทะฐ ะพะฑะตะบัะธ ัะต ะฟัะตะฝะตะฑัะตะณะฒะฐั ะฟะพัะฐะดะธ ะฟัะตะบะฐะปะตะฝะพ " "ะดัะปะฑะพะบะพ ะฒะปะฐะณะฐะฝะต" -#: sha1-file.c:583 +#: sha1-file.c:600 #, c-format msgid "unable to normalize object directory: %s" msgstr "ะดะธัะตะบัะพัะธััะฐ ะทะฐ ะพะฑะตะบัะธ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฝะพัะผะฐะปะธะทะธัะฐะฝะฐ" -#: sha1-file.c:626 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" msgstr "ะทะฐะบะปััะฒะฐัะธัั ัะฐะนะป ะทะฐ ะฐะปัะตัะฝะฐัะธะฒะธัะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ ั โfdopenโ" -#: sha1-file.c:644 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "ัะฐะนะปัั ั ะฐะปัะตัะฝะฐัะธะฒะธัะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: sha1-file.c:651 +#: sha1-file.c:668 msgid "unable to move new alternates file into place" msgstr "ะฝะพะฒะธัั ัะฐะนะป ั ะฐะปัะตัะฝะฐัะธะฒะธัะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะตะผะตััะตะฝ ะฝะฐ ะผัััะพัะพ ะผั" -#: sha1-file.c:686 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "ะฟัััั โ%sโ ะฝะต ัััะตััะฒัะฒะฐ." -#: sha1-file.c:712 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "ะฒัะต ะพัะต ะฝะต ัะต ะฟะพะดะดััะถะฐ ะตัะฐะปะพะฝะฝะพ ั ัะฐะฝะธะปะธัะต โ%sโ ะบะฐัะพ ัะฒััะทะฐะฝะพ." -#: sha1-file.c:718 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "ะตัะฐะปะพะฝะฝะพัะพ ั ัะฐะฝะธะปะธัะต โ%sโ ะฝะต ะต ะปะพะบะฐะปะฝะพ" -#: sha1-file.c:724 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "ะตัะฐะปะพะฝะฝะพัะพ ั ัะฐะฝะธะปะธัะต โ%sโ ะต ะฟะปะธัะบะพ" -#: sha1-file.c:732 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "ะตัะฐะปะพะฝะฝะพัะพ ั ัะฐะฝะธะปะธัะต โ%sโ ะต ั ะฟัะธัะฐะถะดะฐะฝะต" -#: sha1-file.c:792 +#: sha1-file.c:804 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะด ะฟัะธ ะฐะฝะฐะปะธะทะฐ ะฝะฐ ะฐะปัะตัะฝะฐัะธะฒะฝะธัะต ัะบะฐะทะฐัะตะปะธ: โ%sโ" -#: sha1-file.c:944 +#: sha1-file.c:954 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" "ะฝะตััะฟะตัะตะฝ ะพะฟะธั ะทะฐ โmmapโ %<PRIuMAX>, ะบะพะตัะพ ะต ะฝะฐะด ะฟะพะทะฒะพะปะตะฝะพัะพ %<PRIuMAX>" -#: sha1-file.c:969 +#: sha1-file.c:975 msgid "mmap failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โmmapโ" -#: sha1-file.c:1133 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "ัะฐะนะปัั ั ะพะฑะตะบัะธัะต โ%sโ ะต ะฟัะฐะทะตะฝ" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1274 sha1-file.c:2467 #, c-format msgid "corrupt loose object '%s'" msgstr "ะฝะตะฟะฐะบะตัะธัะฐะฝะธัั ะพะฑะตะบั โ%sโ ะต ะฟะพะฒัะตะดะตะฝ" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1276 sha1-file.c:2471 #, c-format msgid "garbage at end of loose object '%s'" msgstr "ะณัะตัะฝะธ ะดะฐะฝะฝะธ ะฒ ะบัะฐั ะฝะฐ ะฝะตะฟะฐะบะตัะธัะฐะฝะธั ะพะฑะตะบั โ%sโ" -#: sha1-file.c:1301 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฒะธะด ะพะฑะตะบั" -#: sha1-file.c:1385 +#: sha1-file.c:1402 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ัะฐะทะฟะฐะบะตัะธัะฐ ั ะพะฟัะธััะฐ โ--allow-unknown-" "typeโ" -#: sha1-file.c:1388 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะฝะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ัะฐะทะฟะฐะบะตัะธัะฐะฝะฐ" -#: sha1-file.c:1394 +#: sha1-file.c:1411 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ ั ะพะฟัะธััะฐ โ--allow-unknown-typeโ" -#: sha1-file.c:1397 +#: sha1-file.c:1414 #, c-format msgid "unable to parse %s header" msgstr "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะฝะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝะฐ" -#: sha1-file.c:1588 +#: sha1-file.c:1641 #, c-format msgid "failed to read object %s" msgstr "ะพะฑะตะบััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: sha1-file.c:1592 +#: sha1-file.c:1645 #, c-format msgid "replacement %s not found for %s" msgstr "ะทะฐะผะตััะธัะตะปัั โ%sโ ะฝะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธั" -#: sha1-file.c:1596 +#: sha1-file.c:1649 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "ะฝะตะฟะฐะบะตัะธัะฐะฝะธัั ะพะฑะตะบั โ%sโ (ะฒ โ%sโ) ะต ะฟะพะฒัะตะดะตะฝ" -#: sha1-file.c:1600 +#: sha1-file.c:1653 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "ะฟะฐะบะตัะธัะฐะฝะธัั ะพะฑะตะบั โ%sโ (ะฒ โ%sโ) ะต ะฟะพะฒัะตะดะตะฝ" -#: sha1-file.c:1703 +#: sha1-file.c:1758 #, c-format msgid "unable to write file %s" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" -#: sha1-file.c:1710 +#: sha1-file.c:1765 #, c-format msgid "unable to set permission to '%s'" msgstr "ะฟัะฐะฒะฐัะฐ ะทะฐ ะดะพัััะฟ ะดะพ โ%sโ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะทะฐะดะฐะดะตะฝะธ" -#: sha1-file.c:1717 +#: sha1-file.c:1772 msgid "file write error" msgstr "ะณัะตัะบะฐ ะฟัะธ ะทะฐะฟะธั ะฝะฐ ัะฐะนะป" -#: sha1-file.c:1736 +#: sha1-file.c:1792 msgid "error when closing loose object file" msgstr "ะณัะตัะบะฐ ะฟัะธ ะทะฐัะฒะฐััะฝะตัะพ ะฝะฐ ัะฐะนะปะฐ ั ะฝะตะฟะฐะบะตัะธัะฐะฝ ะพะฑะตะบั" -#: sha1-file.c:1801 +#: sha1-file.c:1857 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "ะฝัะผะฐ ะฟัะฐะฒะฐ ะทะฐ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะพะฑะตะบั ะบัะผ ะฑะฐะทะฐัะฐ ะพั ะดะฐะฝะฝะธ ะฝะฐ ั ัะฐะฝะธะปะธัะตัะพ โ%sโ" -#: sha1-file.c:1803 +#: sha1-file.c:1859 msgid "unable to create temporary file" msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝ ะฒัะตะผะตะฝะตะฝ ัะฐะนะป" -#: sha1-file.c:1827 +#: sha1-file.c:1883 msgid "unable to write loose object file" msgstr "ะณัะตัะบะฐ ะฟัะธ ะทะฐะฟะธัะฐ ะฝะฐ ัะฐะนะปะฐ ั ะฝะตะฟะฐะบะตัะธัะฐะฝ ะพะฑะตะบั" -#: sha1-file.c:1833 +#: sha1-file.c:1889 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "ะฝะพะฒะธัั ะพะฑะตะบั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะบะพะผะฟัะตัะธัะฐ ั โdeflateโ: %d" -#: sha1-file.c:1837 +#: sha1-file.c:1893 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "ะฝะตััะฟะตัะฝะพ ะฟัะธะบะปััะฒะฐะฝะต ะฝะฐ โdeflateโ ะฒััั ั โ%sโ: %d" -#: sha1-file.c:1841 +#: sha1-file.c:1897 #, c-format msgid "confused by unstable object source data for %s" msgstr "ะณัะตัะบะฐ ะฟะพัะฐะดะธ ะฝะตััะฐะฑะธะปะฝะธั ะธะทัะพัะฝะธะบ ะดะฐะฝะฝะธ ะทะฐ ะพะฑะตะบัะธัะต โ%sโ" -#: sha1-file.c:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1907 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "ะฝะตััะฟะตัะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะฒัะตะผะต ะฝะฐ ะดะพัััะฟ/ััะทะดะฐะฒะฐะฝะต ััะตะท โutimeโ ะฝะฐ โ%sโ" -#: sha1-file.c:1926 +#: sha1-file.c:1984 #, c-format msgid "cannot read object for %s" msgstr "ะพะฑะตะบััั ะทะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะพัะตัะต" -#: sha1-file.c:1966 +#: sha1-file.c:2035 msgid "corrupt commit" msgstr "ะฟะพะฒัะตะดะตะฝะพ ะฟะพะดะฐะฒะฐะฝะต" -#: sha1-file.c:1974 +#: sha1-file.c:2043 msgid "corrupt tag" msgstr "ะฟะพะฒัะตะดะตะฝ ะตัะธะบะตั" -#: sha1-file.c:2073 +#: sha1-file.c:2143 #, c-format msgid "read error while indexing %s" msgstr "ะณัะตัะบะฐ ะฟัะธ ัะตัะตะฝะต ะฟะพ ะฒัะตะผะต ะฝะฐ ะธะฝะดะตะบัะธัะฐะฝะต ะฝะฐ โ%sโ" -#: sha1-file.c:2076 +#: sha1-file.c:2146 #, c-format msgid "short read while indexing %s" msgstr "ะฝะตะฟัะปะฝะพ ะฟัะพัะธัะฐะฝะต ะฟะพ ะฒัะตะผะต ะฝะฐ ะธะฝะดะตะบัะธัะฐะฝะต ะฝะฐ โ%sโ" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2219 sha1-file.c:2229 #, c-format msgid "%s: failed to insert into database" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒะผัะบะฝะต ะฒ ะฑะฐะทะฐัะฐ ะพั ะดะฐะฝะฝะธ" -#: sha1-file.c:2164 +#: sha1-file.c:2235 #, c-format msgid "%s: unsupported file type" msgstr "ะฝะตะฟะพะดะดััะถะฐะฝ ะฒะธะด ัะฐะนะป: โ%sโ" -#: sha1-file.c:2188 +#: sha1-file.c:2259 #, c-format msgid "%s is not a valid object" msgstr "โ%sโ ะต ะฝะตะฟัะฐะฒะธะปะตะฝ ะพะฑะตะบั" -#: sha1-file.c:2190 +#: sha1-file.c:2261 #, c-format msgid "%s is not a valid '%s' object" msgstr "โ%sโ ะต ะฝะตะฟัะฐะฒะธะปะตะฝ ะพะฑะตะบั ะพั ะฒะธะด โ%sโ" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2288 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "ะพะฑะตะบััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2478 sha1-file.c:2531 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะบะพะฝััะพะปะฝะฐ ััะผะฐ ะทะฐ โ%sโ (ัััะฑะฒะฐ ะดะฐ ะต %s)" -#: sha1-file.c:2431 +#: sha1-file.c:2502 #, c-format msgid "unable to mmap %s" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โmmapโ ะฒััั ั โ%sโ" -#: sha1-file.c:2436 +#: sha1-file.c:2507 #, c-format msgid "unable to unpack header of %s" msgstr "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะฝะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ัะฐะทะฟะฐะบะตัะธัะฐะฝะฐ" -#: sha1-file.c:2442 +#: sha1-file.c:2513 #, c-format msgid "unable to parse header of %s" msgstr "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะฝะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝะฐ" -#: sha1-file.c:2453 +#: sha1-file.c:2524 #, c-format msgid "unable to unpack contents of %s" msgstr "ััะดััะถะฐะฝะธะตัะพ ะฝะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ัะฐะทะฟะฐะบะตัะธัะฐะฝะพ" -#: sha1-name.c:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "ะบััะธัั SHA1 โ%sโ ะฝะต ะต ะตะดะฝะพะทะฝะฐัะตะฝ" -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "ะัะทะผะพะถะฝะพััะธัะต ัะฐ:" -#: sha1-name.c:800 +#: 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" @@ -7362,57 +8379,122 @@ msgid "" "examine these refs and maybe delete them. Turn this message off by\n" "running \"git config advice.objectNameWarning false\"" msgstr "" -"ะัะธ ะฝะพัะผะฐะปะฝะฐ ัะฐะฑะพัะฐ Git ะฝะธะบะพะณะฐ ะฝะต ััะทะดะฐะฒะฐ ัะบะฐะทะฐัะตะปะธ, ะบะพะธัะพ ะทะฐะฒัััะฒะฐั ั 40\n" -"ัะตััะฝะฐะดะตัะตัะธัะฝะธ ะทะฝะฐะบะฐ, ะทะฐัะพัะพ ััะฐะฝะดะฐััะฝะพ ัะต ัะต ะฑัะดะฐั ะฟัะตัะบะฐัะฐะฝะธ.\n" +"ะัะธ ะฝะพัะผะฐะปะฝะฐ ัะฐะฑะพัะฐ Git ะฝะธะบะพะณะฐ ะฝะต ััะทะดะฐะฒะฐ ัะบะฐะทะฐัะตะปะธ, ะบะพะธัะพ ะทะฐะฒัััะฒะฐั\n" +"ั 40 ัะตััะฝะฐะดะตัะตัะธัะฝะธ ะทะฝะฐะบะฐ, ะทะฐัะพัะพ ััะฐะฝะดะฐััะฝะพ ัะต ัะต ะฑัะดะฐั ะฟัะตัะบะฐัะฐะฝะธ.\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:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "ะฟัััั โ%sโ ัััะตััะฒัะฒะฐ ะฝะฐ ะดะธัะบะฐ, ะฝะพ ะฝะต ะธ ะฒ โ%.*sโ" + +#: sha1-name.c:1708 +#, 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:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "ะฟัััั โ%sโ ะฝะต ัััะตััะฒัะฒะฐ ะฒ โ%.*sโ" + +#: sha1-name.c:1745 +#, 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:1761 +#, 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:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "ะฟัััั โ%sโ ัััะตััะฒัะฒะฐ ะฝะฐ ะดะธัะบะฐ, ะฝะพ ะฝะต ะต ะฒ ะธะฝะดะตะบัะฐ" + +#: sha1-name.c:1771 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "ะฟัััั โ%sโ ะฝะต ัััะตััะฒัะฒะฐ ะฝะธัะพ ะฝะฐ ะดะธัะบะฐ, ะฝะธัะพ ะฒ ะธะฝะดะตะบัะฐ" + +#: sha1-name.c:1784 +msgid "relative path syntax can't be used outside working tree" +msgstr "ะพัะฝะพัะธัะตะปะตะฝ ะฟัั ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะธะทะฒัะฝ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" + +#: sha1-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั: โ%.*sโ" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:848 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:867 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:875 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7420,13 +8502,50 @@ msgstr[0] "%u ะฑะฐะนั" msgstr[1] "%u ะฑะฐะนัะฐ" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:877 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u ะฑะฐะนั/ัะตะบ." msgstr[1] "%u ะฑะฐะนัะฐ/ัะตะบ." +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" +msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ ะทะฐ ะทะฐะฟะธั" + +#: strbuf.c:1175 +#, c-format +msgid "could not edit '%s'" +msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ัะตะดะฐะบัะธัะฐ" + +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ะฟะพะดะพะทัะธัะตะปะฝะพ ะธะผะต ะฝะฐ ะฟะพะดะผะพะดัะป: โ%sโ" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "ะฝะฐัััะพะนะบะฐัะฐ โsubmodule.fetchjobsโ ะฝะต ะฟัะธะตะผะฐ ะพััะธัะฐัะตะปะฝะธ ััะพะนะฝะพััะธ" + +#: submodule-config.c:402 +#, c-format +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgstr "" +"โ%sโ ัะต ะฟัะตัะบะฐัะฐ, ะทะฐัะพัะพ ะต ะฒัะทะผะพะถะฝะพ ะดะฐ ัะต ััะปะบัะฒะฐ ะบะฐัะพ ะพะฟัะธั ะทะฐ ะบะพะผะฐะฝะดะฝะธั " +"ัะตะด: %s" + +#: submodule-config.c:499 +#, c-format +msgid "invalid value for %s" +msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โ%sโ" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "ะะฐะฟะธััั โ%sโ ะฒัะฒ ัะฐะนะปะฐ โ.gitmodulesโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพะผะตะฝะตะฝ" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7457,51 +8576,129 @@ msgstr "ะฒ ะฝะตะฟะพะดะณะพัะฒะตะฝะธั ะฟะพะดะผะพะดัะป โ%sโ" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "ะัััั โ%sโ ะต ะฒ ะฟะพะดะผะพะดัะปะฐ โ%.*sโ" -#: submodule.c:910 +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฐัะณัะผะตะฝั ะทะฐ โ--ignore-submodulesโ: โ%sโ" + +#: submodule.c:816 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" +"ะะพะดะผะพะดัะปัั ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต %s ะฝะฐ ะฟััั โ%sโ ะต ัะฐะทะปะธัะตะฝ ะพั ะดััะณะธั ะผะพะดัะป ััั " +"ัััะพัะพ ะธะผะต, ะทะฐัะพะฒะฐ ะฟััะฒะธัั ัะต ะฟัะตัะบะฐัะฐ." + +#: submodule.c:919 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "ะทะฐะฟะธััั ะทะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ (%s) ะต %s, ะฐ ะฝะต ะฟะพะดะฐะฒะฐะฝะต!" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1004 +#, 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:1127 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "ะฟัะพัะตััั ะทะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะทะฐะฒัััะธ ะฝะตััะฟะตัะฝะพ" + +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะพัะบัะธะต ะบัะผ ะบะฐะบะฒะพ ัะพัะธ ัะบะฐะทะฐัะตะปัั โHEADโ" -#: submodule.c:1481 +#: submodule.c:1167 +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "ะะทัะปะฐัะบะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ\n" + +#: submodule.c:1170 #, c-format -msgid "Could not access submodule '%s'" -msgstr "ะะพะดะผะพะดัะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะดะพัััะฟะตะฝ" +msgid "Unable to push submodule '%s'\n" +msgstr "ะะพะดะผะพะดัะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทัะปะฐัะบะฐะฝ\n" -#: submodule.c:1651 +#: submodule.c:1462 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "ะะพััะฐะฒัะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%s%sโ\n" + +#: submodule.c:1492 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "ะะพะดะผะพะดัะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะดะพัััะฟะตะฝ\n" + +#: submodule.c:1646 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"ะัะตัะบะธ ะฟัะธ ะดะพััะฐะฒัะฝะต ะฝะฐ ะฟะพะดะผะพะดัะป:\n" +"%s" + +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" msgstr "โ%sโ ะฝะต ะต ั ัะฐะฝะธะปะธัะต ะฝะฐ git" -#: submodule.c:1789 +#: submodule.c:1688 +#, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "" +"ะะพะผะฐะฝะดะฐัะฐ โgit status --porcelain=2โ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ ะฒ ะฟะพะดะผะพะดัะปะฐ โ%sโ" + +#: submodule.c:1729 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "" +"ะบะพะผะฐะฝะดะฐัะฐ โgit status --porcelain=2โ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ ะฒ ะฟะพะดะผะพะดัะปะฐ โ%sโ" + +#: submodule.c:1804 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "ะบะพะผะฐะฝะดะฐัะฐ โgit statusโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ ะฒ ะฟะพะดะผะพะดัะปะฐ โ%sโ" -#: submodule.c:1802 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "ะบะพะผะฐะฝะดะฐัะฐ โgit statusโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ ะฒ ะฟะพะดะผะพะดัะปะฐ โ%sโ" -#: submodule.c:1817 +#: submodule.c:1832 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "ะะฐัััะพะนะบะฐัะฐ โcore.worktreeโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทััะธะต ะฒ ะฟะพะดะผะพะดัะปะฐ โ%sโ" -#: submodule.c:1907 +#: submodule.c:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "ะฝะตััะฟะตัะฝะฐ ะพะฑัะฐะฑะพัะบะฐ ะฝะฐ ะฟะพะดะดะธัะตะบัะพัะธะธัะต ะฒ ะฟะพะดะผะพะดัะปะฐ โ%sโ" + +#: submodule.c:1880 +msgid "could not reset submodule index" +msgstr "ะฝะตััะฟะตัะฝะพ ะทะฐะฝัะปัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ ะฝะฐ ะฟะพะดะผะพะดัะปะฐ" + +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "ะธะฝะดะตะบััั ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะฝะต ะต ัะธัั" -#: submodule.c:1959 +#: submodule.c:1974 #, c-format msgid "Submodule '%s' could not be updated." msgstr "ะะพะดะผะพะดัะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฑะฝะพะฒะธ." -#: submodule.c:2007 +#: submodule.c:2042 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "โ%sโ (ะดะธัะตะบัะพัะธั ะฝะฐ ะฟะพะดะผะพะดัะป) ะต ะฒ ะดะธัะตะบัะพัะธััะฐ ะฝะฐ git: โ%.*sโ" + +#: submodule.c:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7509,12 +8706,17 @@ msgstr "" "ะฝะต ัะต ะฟะพะดะดััะถะฐ โrelocate_gitdirโ ะทะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ, ะบะพะนัะพ ะธะผะฐ ะฟะพะฒะตัะต ะพั ะตะดะฝะพ " "ัะฐะฑะพัะฝะพ ะดััะฒะพ" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "ะธะผะตัะพ ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฝะฐะผะตัะตะฝะพ" -#: submodule.c:2026 +#: submodule.c:2079 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะตะผะตััะธ ะฒ ัััะตััะฒัะฒะฐัะฐ ะดะธัะตะบัะพัะธั ะฝะฐ git" + +#: submodule.c:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7525,208 +8727,85 @@ msgstr "" "โ%sโ ะบัะผ\n" "โ%sโ\n" -#: submodule.c:2109 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "ะฝะตััะฟะตัะฝะฐ ะพะฑัะฐะฑะพัะบะฐ ะฝะฐ ะฟะพะดะดะธัะตะบัะพัะธะธัะต ะฒ ะฟะพะดะผะพะดัะปะฐ โ%sโ" - -#: submodule.c:2153 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "โls-statโ ะฝะต ะผะพะถะต ะดะฐ ัะต ััะฐััะธัะฐ ะฒ โ..โ" -#: submodule.c:2192 +#: submodule.c:2254 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "โls-treeโ ะทะฐะฒัััะธ ั ะฝะตะพัะฐะบะฒะฐะฝ ะธะทั ะพะดะตะฝ ะบะพะด: %d" -#: submodule-config.c:232 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ะฟะพะดะพะทัะธัะตะปะฝะพ ะธะผะต ะฝะฐ ะฟะพะดะผะพะดัะป: โ%sโ" - -#: submodule-config.c:299 -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "ะฝะฐัััะพะนะบะฐัะฐ โsubmodule.fetchjobsโ ะฝะต ะฟัะธะตะผะฐ ะพััะธัะฐัะตะปะฝะธ ััะพะนะฝะพััะธ" - -#: 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:486 -#, c-format -msgid "invalid value for %s" -msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โ%sโ" - -#: submodule-config.c:755 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "ะะฐะฟะธััั โ%sโ ะฒัะฒ ัะฐะนะปะฐ โ.gitmodulesโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพะผะตะฝะตะฝ" - -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะทะฐะฒัััะฒะฐัะฐัะฐ ะบะพะผะฐะฝะดะฐ โ%sโ" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั โ%sโ ะทะฐ ะฝะฐัััะพะนะบะฐัะฐ โ%sโ" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "ััะพะนะฝะพัััะฐ โ%sโ ัะต ะฟะพะฒัะฐัั ะฒ ะฝะฐัััะพะนะบะธัะต" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "ะฟัะฐะทะฝะฐ ะทะฐะฒัััะฒะฐัะฐ ะปะตะบัะตะผะฐ ะฒ ะตะฟะธะปะพะณะฐ โ%.*sโ" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "ะฒั ะพะดะฝะธัั ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "ะพั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด ะฝะต ะผะพะถะต ะดะฐ ัะต ัะตัะต" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปััะธ ะธะฝัะพัะผะฐัะธั ััะตะท โstatโ ะทะฐ โ%sโ" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "โ%sโ ะฝะต ะต ะพะฑะธะบะฝะพะฒะตะฝ ัะฐะนะป" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "โ%sโ: ะฝัะผะฐ ะฟัะฐะฒะฐ ะทะฐ ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ัะฐะนะปะฐ" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "ะฒัะตะผะตะฝะฝะธัั ัะฐะนะป ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ" -#: trailer.c:1067 +#: trailer.c:1065 #, 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 "ะะปะพะฝัั โ%sโ ัะต ัะปะตะดะธ โ%sโ ะพั โ%sโ\n" - -#: transport.c:142 -#, c-format -msgid "could not read bundle '%s'" -msgstr "ะฟัะฐัะบะฐัะฐ ะฝะฐ git โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะฐ" - -#: transport.c:208 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "transport: ะฝะตะฟัะฐะฒะธะปะฝะฐ ะพะฟัะธั ะทะฐ ะดัะปะฑะพัะธะฝะฐ: %s" - -#: transport.c:259 -msgid "see protocol.version in 'git help config' for more details" -msgstr "" -"ะะฐ ะฟะพะฒะตัะต ะธะฝัะพัะผะฐัะธั ะฒะธะถัะต ัะฐะทะดะตะปะฐ โprotocol.versionโ ะฒ โgit help configโ" - -#: transport.c:260 -msgid "server options require protocol version 2 or later" -msgstr "ะพะฟัะธะธัะต ะฝะฐ ัััะฒััะฐ ะธะทะธัะบะฒะฐั ะฟะพะฝะต ะฒะตััะธั 2 ะฝะฐ ะฟัะพัะพะบะพะปะฐ" - -#: transport.c:625 -msgid "could not parse transport.color.* config" -msgstr "ััะพะนะฝะพัััะฐ ะฝะฐ ะฝะฐัััะพะนะบะฐัะฐ โtransport.color.*โ ะฝะต ะผะพะถะต ะดะฐ ัะต ัะฐะทะฟะพะทะฝะฐะต" - -#: transport.c:698 -msgid "support for protocol v2 not implemented yet" -msgstr "ะฟัะพัะพะบะพะป ะฒะตััะธั 2 ะฒัะต ะพัะต ะฝะต ัะต ะฟะพะดะดััะถะฐ" - -#: transport.c:825 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั ะทะฐ ะฝะฐัััะพะนะบะฐัะฐ โ%sโ: โ%sโ" - -#: transport.c:891 -#, c-format -msgid "transport '%s' not allowed" -msgstr "ะฟัะตะฝะพััั ะฟะพ โ%sโ ะฝะต ะต ะฟะพะทะฒะพะปะตะฝ" - -#: transport.c:945 -msgid "git-over-rsync is no longer supported" -msgstr "ะบะพะผะฐะฝะดะฐัะฐ โgit-over-rsyncโ ะฒะตัะต ะฝะต ัะต ะฟะพะดะดััะถะฐ" - -#: transport.c:1040 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "" -"ะกะปะตะดะฝะธัะต ะฟััะธัะฐ ะทะฐ ะฟะพะดะผะพะดัะปะธ ััะดััะถะฐั ะฟัะพะผะตะฝะธ,\n" -"ะบะพะธัะพ ะปะธะฟัะฒะฐั ะพั ะฒัะธัะบะธ ะพัะดะฐะปะตัะตะฝะธ ั ัะฐะฝะธะปะธัะฐ:\n" - -#: transport.c:1044 -#, 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" -" git push --recurse-submodules=on-demand\n" -"\n" -"ะธะปะธ ะพัะธะดะตัะต ะฒ ััะพัะฒะตัะฝะฐัะฐ ะดะธัะตะบัะพัะธั ะธ ะธะทะฟัะปะฝะตัะต:\n" -"\n" -" git push\n" -"\n" - -#: transport.c:1052 -msgid "Aborting." -msgstr "ะัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนััะฒะธะตัะพ." - -#: transport.c:1193 -msgid "failed to push all needed submodules" -msgstr "ะฝะตััะฟะตัะฝะพ ะธะทัะปะฐัะบะฒะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะฝะตะพะฑั ะพะดะธะผะธ ะฟะพะดะผะพะดัะปะธ" - -#: transport.c:1340 transport-helper.c:645 -msgid "operation not supported by protocol" -msgstr "ะพะฟัะธััะฐ ะฝะต ัะต ะฟะพะดะดััะถะฐ ะพั ะฟัะพัะพะบะพะปะฐ" - -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:62 transport-helper.c:91 msgid "full write to remote helper failed" msgstr "ะฝะตััะฟะตัะตะฝ ะฟัะปะตะฝ ะทะฐะฟะธั ะบัะผ ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ" -#: transport-helper.c:134 +#: transport-helper.c:145 #, c-format msgid "unable to find remote helper for '%s'" msgstr "ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ ะทะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะฐ" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" msgstr "" "ัะฐะนะปะพะฒะธัั ะดะตัะบัะธะฟัะพั ะพั ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดัะฑะปะธัะฐ ั " "โdupโ" -#: transport-helper.c:201 +#: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7735,175 +8814,281 @@ msgstr "" "ะฝะตะฟะพะทะฝะฐัะฐ ะทะฐะดัะปะถะธัะตะปะฝะฐ ัะฟะพัะพะฑะฝะพัั โ%sโ. ะะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ " "ะฒะตัะพััะฝะพ ะธะทะธัะบะฒะฐ ะฝะพะฒะฐ ะฒะตััะธั ะฝะฐ Git" -#: transport-helper.c:207 +#: transport-helper.c:220 msgid "this remote helper should implement refspec capability" msgstr "" "ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ ัััะฑะฒะฐ ะดะฐ ะฟะพะดะดััะถะฐ ัะฟะพัะพะฑะฝะพัั ะทะฐ ะธะทะฑัะพัะฒะฐะฝะต ะฝะฐ " "ัะบะฐะทะฐัะตะปะธ" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:287 transport-helper.c:429 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "โ%sโ ะฝะตะพัะฐะบะฒะฐะฝะพ ะฒััะฝะฐ: โ%sโ" -#: transport-helper.c:403 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "โ%sโ ะทะฐะบะปััะธ ะธ โ%sโ" -#: transport-helper.c:481 +#: transport-helper.c:497 msgid "couldn't run fast-import" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะฑััะทะพ ะฒะฝะฐััะฝะต" -#: transport-helper.c:504 +#: transport-helper.c:520 msgid "error while running fast-import" msgstr "ะณัะตัะบะฐ ะฟัะธ ะธะทะฟัะปะฝะตะฝะธะตัะพ ะฝะฐ ะฑััะทะพ ะฒะฝะฐััะฝะต" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:549 transport-helper.c:1226 #, c-format msgid "could not read ref %s" msgstr "ัะบะฐะทะฐัะตะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะพัะตัะต" -#: transport-helper.c:578 +#: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" msgstr "ะฝะตะพัะฐะบะฒะฐะฝ ะพัะณะพะฒะพั ะฟัะธ ัะฒััะทะฒะฐะฝะต: โ%sโ" -#: transport-helper.c:600 +#: transport-helper.c:616 msgid "setting remote service path not supported by protocol" msgstr "ะฟัะพัะพะบะพะปัั ะฝะต ะฟะพะดะดััะถะฐ ะทะฐะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟัั ะฝะฐ ะพัะดะฐะปะตัะตะฝะฐัะฐ ััะปัะณะฐ" -#: transport-helper.c:602 +#: transport-helper.c:618 msgid "invalid remote service path" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟัั ะฝะฐ ะพัะดะฐะปะตัะตะฝะฐัะฐ ััะปัะณะฐ" -#: transport-helper.c:648 +#: transport-helper.c:661 transport.c:1428 +msgid "operation not supported by protocol" +msgstr "ะพะฟัะธััะฐ ะฝะต ัะต ะฟะพะดะดััะถะฐ ะพั ะฟัะพัะพะบะพะปะฐ" + +#: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" msgstr "ะฝะตััะฟะตัะฝะพ ัะฒััะทะฒะฐะฝะต ะบัะผ ะฟะพะดััะปัะณะฐัะฐ โ%sโ" -#: transport-helper.c:720 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "ะพะฟัะธั ะฑะตะท ััะพัะฒะตัััะฒะฐัะฐ ะดะธัะตะบัะธะฒะฐ ะทะฐ ััะฟะตั ะธะปะธ ะณัะตัะบะฐ" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" "ะพัะฐะบะฒะฐ ัะต ะธะปะธ ััะฟะตั , ะธะปะธ ะณัะตัะบะฐ, ะฝะพ ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ ะฒััะฝะฐ โ%sโ" -#: transport-helper.c:773 +#: transport-helper.c:841 #, c-format msgid "helper reported unexpected status of %s" msgstr "ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ ะทะฐะฒัััะธ ั ะฝะตะพัะฐะบะฒะฐะฝ ะธะทั ะพะดะตะฝ ะบะพะด: โ%sโ" -#: transport-helper.c:834 +#: transport-helper.c:924 #, c-format msgid "helper %s does not support dry-run" msgstr "ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ โ%sโ ะฝะต ะฟะพะดะดััะถะฐ ะฟัะพะฑะธ โdry-runโ" -#: transport-helper.c:837 +#: transport-helper.c:927 #, c-format msgid "helper %s does not support --signed" msgstr "ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ โ%sโ ะฝะต ะฟะพะดะดััะถะฐ ะพะฟัะธััะฐ โ--signedโ" -#: transport-helper.c:840 +#: transport-helper.c:930 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" "ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ โ%sโ ะฝะต ะฟะพะดะดััะถะฐ ะพะฟัะธััะฐ โ--signed=if-askedโ" -#: transport-helper.c:847 +#: transport-helper.c:935 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ โ%sโ ะฝะต ะฟะพะดะดััะถะฐ ะพะฟัะธััะฐ โ--atomicโ" + +#: transport-helper.c:941 #, c-format msgid "helper %s does not support 'push-option'" msgstr "ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ โ%sโ ะฝะต ะฟะพะดะดััะถะฐ ะพะฟัะธะธ ะทะฐ ะธะทัะปะฐัะบะฒะฐะฝะต" -#: transport-helper.c:945 +#: transport-helper.c:1040 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ ะฝะต ะฟะพะดะดััะถะฐ ะธะทัะปะฐัะบะฒะฐะฝะต. ะะตะพะฑั ะพะดะธะผะพ ะต " "ะธะทะฑัะพัะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต" -#: transport-helper.c:950 +#: transport-helper.c:1045 #, c-format msgid "helper %s does not support 'force'" msgstr "" "ะฝะฐััะตัะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ ะฝะต ะฟะพะดะดััะถะฐ โ%sโ ะฟะพะดะดััะถะฐ ะพะฟัะธััะฐ โ--forceโ" -#: transport-helper.c:997 +#: transport-helper.c:1092 msgid "couldn't run fast-export" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัััะธ ะฑััะทะพ ะธะทะฝะฐััะฝะต" -#: transport-helper.c:1002 +#: transport-helper.c:1097 msgid "error while running fast-export" msgstr "ะณัะตัะบะฐ ะฟัะธ ะธะทะฟัะปะฝะตะฝะธะตัะพ ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ ะทะฐ ะฑััะทะพ ะธะทะฝะฐััะฝะต" -#: transport-helper.c:1027 +#: transport-helper.c:1122 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" msgstr "" -"ะัะผะฐ ะพะฑัะธ ัะบะฐะทะฐัะตะปะธ, ะฝะต ัะฐ ัะบะฐะทะฐะฝะธ ะฝะธะบะฐะบะฒะธ ัะบะฐะทะฐัะตะปะธ โ ะฝะธัะพ ะฝัะผะฐ ะดะฐ ะฑัะดะต\n" -"ะฝะฐะฟัะฐะฒะตะฝะพ. ะัะพะฑะฒะฐะนัะต ะดะฐ ัะบะฐะถะตัะต ะบะปะพะฝ, ะฝะฐะฟั. โmasterโ.\n" +"ะัะผะฐ ะพะฑัะธ ัะบะฐะทะฐัะตะปะธ, ะฝะต ัะฐ ัะบะฐะทะฐะฝะธ ะฝะธะบะฐะบะฒะธ ัะบะฐะทะฐัะตะปะธ โ\n" +"ะฝะธัะพ ะฝัะผะฐ ะดะฐ ะฑัะดะต ะฝะฐะฟัะฐะฒะตะฝะพ. ะัะพะฑะฒะฐะนัะต ะดะฐ ัะบะฐะถะตัะต ะบะปะพะฝ.\n" + +#: transport-helper.c:1203 +#, c-format +msgid "unsupported object format '%s'" +msgstr "ะพะฑะตะบั ั ะฝะตะฟะพะดะดััะถะฐะฝ ัะพัะผะฐั โ%sโ" -#: transport-helper.c:1091 +#: transport-helper.c:1212 #, c-format msgid "malformed response in ref list: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะพัะณะพะฒะพั ะฒ ัะฟะธััะบะฐ ั ัะบะฐะทะฐัะตะปะธ: โ%sโ" -#: transport-helper.c:1244 +#: transport-helper.c:1364 #, c-format msgid "read(%s) failed" msgstr "ะฝะตััะฟะตัะฝะพ ัะตัะตะฝะต ะฝะฐ โ%sโ" -#: transport-helper.c:1271 +#: transport-helper.c:1391 #, c-format msgid "write(%s) failed" msgstr "ะฝะตััะฟะตัะตะฝ ะทะฐะฟะธั ะฒ โ%sโ" -#: transport-helper.c:1320 +#: transport-helper.c:1440 #, c-format msgid "%s thread failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะฝะธัะบะฐัะฐ โ%sโ" -#: transport-helper.c:1324 +#: transport-helper.c:1444 #, c-format msgid "%s thread failed to join: %s" msgstr "ะทะฐะฒัััะฒะฐะฝะตัะพ ะฝะฐ ะฝะธัะบะฐัะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทัะฐะบะฐ: โ%sโ" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1463 transport-helper.c:1467 #, c-format msgid "can't start thread for copying data: %s" msgstr "ะฝะตััะฟะตัะฝะพ ััะฐััะธัะฐะฝะต ะฝะฐ ะฝะธัะบะฐ ะทะฐ ะบะพะฟะธัะฐะฝะต ะฝะฐ ะดะฐะฝะฝะธัะต: โ%sโ" -#: transport-helper.c:1384 +#: transport-helper.c:1504 #, c-format msgid "%s process failed to wait" msgstr "ะฟัะพัะตััั ะฝะฐ โ%sโ ะฝะต ััะฟั ะดะฐ ะธะทัะฐะบะฐ ััะตะท โwaitpidโ" -#: transport-helper.c:1388 +#: transport-helper.c:1508 #, c-format msgid "%s process failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โ%sโ" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1526 transport-helper.c:1535 msgid "can't start thread for copying data" msgstr "ะฝะตััะฟะตัะฝะพ ััะฐััะธัะฐะฝะต ะฝะฐ ะฝะธัะบะฐ ะทะฐ ะบะพะฟะธัะฐะฝะต ะฝะฐ ะดะฐะฝะฝะธัะต" -#: tree-walk.c:33 +#: transport.c:116 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "ะะปะพะฝัั โ%sโ ัะต ัะปะตะดะธ โ%sโ ะพั โ%sโ\n" + +#: transport.c:145 +#, c-format +msgid "could not read bundle '%s'" +msgstr "ะฟัะฐัะบะฐัะฐ ะฝะฐ git โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะฐ" + +#: transport.c:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport: ะฝะตะฟัะฐะฒะธะปะฝะฐ ะพะฟัะธั ะทะฐ ะดัะปะฑะพัะธะฝะฐ: %s" + +#: transport.c:269 +msgid "see protocol.version in 'git help config' for more details" +msgstr "" +"ะะฐ ะฟะพะฒะตัะต ะธะฝัะพัะผะฐัะธั ะฒะธะถัะต ัะฐะทะดะตะปะฐ โprotocol.versionโ ะฒ โgit help configโ" + +#: transport.c:270 +msgid "server options require protocol version 2 or later" +msgstr "ะพะฟัะธะธัะต ะฝะฐ ัััะฒััะฐ ะธะทะธัะบะฒะฐั ะฟะพะฝะต ะฒะตััะธั 2 ะฝะฐ ะฟัะพัะพะบะพะปะฐ" + +#: transport.c:712 +msgid "could not parse transport.color.* config" +msgstr "ััะพะนะฝะพัััะฐ ะฝะฐ ะฝะฐัััะพะนะบะฐัะฐ โtransport.color.*โ ะฝะต ะผะพะถะต ะดะฐ ัะต ัะฐะทะฟะพะทะฝะฐะต" + +#: transport.c:785 +msgid "support for protocol v2 not implemented yet" +msgstr "ะฟัะพัะพะบะพะป ะฒะตััะธั 2 ะฒัะต ะพัะต ะฝะต ัะต ะฟะพะดะดััะถะฐ" + +#: transport.c:919 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั ะทะฐ ะฝะฐัััะพะนะบะฐัะฐ โ%sโ: โ%sโ" + +#: transport.c:985 +#, c-format +msgid "transport '%s' not allowed" +msgstr "ะฟัะตะฝะพััั ะฟะพ โ%sโ ะฝะต ะต ะฟะพะทะฒะพะปะตะฝ" + +#: transport.c:1038 +msgid "git-over-rsync is no longer supported" +msgstr "ะบะพะผะฐะฝะดะฐัะฐ โgit-over-rsyncโ ะฒะตัะต ะฝะต ัะต ะฟะพะดะดััะถะฐ" + +#: transport.c:1140 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"ะกะปะตะดะฝะธัะต ะฟััะธัะฐ ะทะฐ ะฟะพะดะผะพะดัะปะธ ััะดััะถะฐั ะฟัะพะผะตะฝะธ,\n" +"ะบะพะธัะพ ะปะธะฟัะฒะฐั ะพั ะฒัะธัะบะธ ะพัะดะฐะปะตัะตะฝะธ ั ัะฐะฝะธะปะธัะฐ:\n" + +#: transport.c:1144 +#, 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" +" git push --recurse-submodules=on-demand\n" +"\n" +"ะธะปะธ ะพัะธะดะตัะต ะฒ ััะพัะฒะตัะฝะฐัะฐ ะดะธัะตะบัะพัะธั ะธ ะธะทะฟัะปะฝะตัะต:\n" +"\n" +" git push\n" +"\n" + +#: transport.c:1152 +msgid "Aborting." +msgstr "ะัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนััะฒะธะตัะพ." + +#: transport.c:1297 +msgid "failed to push all needed submodules" +msgstr "ะฝะตััะฟะตัะฝะพ ะธะทัะปะฐัะบะฒะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะฝะตะพะฑั ะพะดะธะผะธ ะฟะพะดะผะพะดัะปะธ" + +#: tree-walk.c:32 msgid "too-short tree object" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะบัะฐััะบ ะพะฑะตะบั-ะดััะฒะพ" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะธ ะฟัะฐะฒะฐ ะทะฐ ะดะพัััะฟ ะฒ ะทะฐะฟะธั ะฒ ะดััะฒะพ" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "ะฟัะฐะทะฝะพ ะธะผะต ะฝะฐ ัะฐะนะป ะฒ ะทะฐะฟะธั ะฒ ะดััะฒะพ" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะบัะฐััะบ ัะฐะนะป-ะดััะฒะพ" -#: unpack-trees.c:111 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7912,7 +9097,7 @@ msgstr "" "ะะทัะตะณะปัะฝะตัะพ ัะต ะฟัะตะทะฐะฟะธัะต ะปะพะบะฐะปะฝะธัะต ะฟัะพะผะตะฝะธ ะฝะฐ ัะตะทะธ ัะฐะนะปะพะฒะต:\n" "%%sะะพะดะฐะนัะต ะธะปะธ ัะบะฐัะฐะนัะต ะฟัะพะผะตะฝะธัะต, ะทะฐ ะดะฐ ะฟัะตะผะธะฝะตัะต ะบัะผ ะฝะพะฒ ะบะปะพะฝ." -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7921,7 +9106,7 @@ msgstr "" "ะะทัะตะณะปัะฝะตัะพ ัะต ะฟัะตะทะฐะฟะธัะต ะปะพะบะฐะปะฝะธัะต ะฟัะพะผะตะฝะธ ะฝะฐ ัะตะทะธ ัะฐะนะปะพะฒะต:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7930,7 +9115,7 @@ msgstr "" "ะกะปะธะฒะฐะฝะตัะพ ัะต ะฟัะตะทะฐะฟะธัะต ะปะพะบะฐะปะฝะธัะต ะฟัะพะผะตะฝะธ ะฝะฐ ัะตะทะธ ัะฐะนะปะพะฒะต:\n" "%%sะะพะดะฐะนัะต ะธะปะธ ัะบะฐัะฐะนัะต ะฟัะพะผะตะฝะธัะต, ะทะฐ ะดะฐ ัะปะตะตัะต." -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7939,7 +9124,7 @@ msgstr "" "ะกะปะธะฒะฐะฝะตัะพ ัะต ะฟัะตะทะฐะฟะธัะต ะปะพะบะฐะปะฝะธัะต ะฟัะพะผะตะฝะธ ะฝะฐ ัะตะทะธ ัะฐะนะปะพะฒะต:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7948,7 +9133,7 @@ msgstr "" "โ%sโ ัะต ะฟัะตะทะฐะฟะธัะต ะปะพะบะฐะปะฝะธัะต ะฟัะพะผะตะฝะธ ะฝะฐ ัะตะทะธ ัะฐะนะปะพะฒะต:\n" "%%sะะพะดะฐะนัะต ะธะปะธ ัะบะฐัะฐะนัะต ะฟัะพะผะตะฝะธัะต, ะทะฐ ะดะฐ ะธะทะฒัััะธัะต โ%sโ." -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7957,7 +9142,7 @@ msgstr "" "โ%sโ ัะต ะฟัะตะทะฐะฟะธัะต ะปะพะบะฐะปะฝะธัะต ะฟัะพะผะตะฝะธ ะฝะฐ ัะตะทะธ ัะฐะนะปะพะฒะต:\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7966,7 +9151,7 @@ msgstr "" "ะะฑะฝะพะฒัะฒะฐะฝะตัะพ ะฝะฐ ัะปะตะดะฝะธัะต ะดะธัะตะบัะพัะธะธ ัะต ะธะทััะธะต ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต ะฒ ััั :\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7975,7 +9160,7 @@ msgstr "" "ะะทัะตะณะปัะฝะตัะพ ัะต ะธะทััะธะต ัะตะทะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" "%%sะัะตะผะตััะตัะต ะณะธ ะธะปะธ ะณะธ ะธะทััะธะนัะต, ะทะฐ ะดะฐ ะฟัะตะผะธะฝะตัะต ะฝะฐ ะดััะณ ะบะปะพะฝ." -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7984,7 +9169,7 @@ msgstr "" "ะะทัะตะณะปัะฝะตัะพ ัะต ะธะทััะธะต ัะตะทะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7993,7 +9178,7 @@ msgstr "" "ะกะปะธะฒะฐะฝะตัะพ ัะต ะธะทััะธะต ัะตะทะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" "%%sะัะตะผะตััะตัะต ะณะธ ะธะปะธ ะณะธ ะธะทััะธะนัะต, ะทะฐ ะดะฐ ัะปะตะตัะต." -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8002,7 +9187,7 @@ msgstr "" "ะกะปะธะฒะฐะฝะตัะพ ัะต ะธะทััะธะต ัะตะทะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8011,7 +9196,7 @@ msgstr "" "โ%sโ ัะต ะธะทััะธะต ัะตะทะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" "%%sะัะตะผะตััะตัะต ะณะธ ะธะปะธ ะณะธ ะธะทััะธะนัะต, ะทะฐ ะดะฐ ะธะทะฒัััะธัะต โ%sโ." -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8020,7 +9205,7 @@ msgstr "" "โ%sโ ัะต ะธะทััะธะต ัะตะทะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8030,7 +9215,7 @@ msgstr "" "ะะทัะตะณะปัะฝะตัะพ ัะต ะฟัะตะทะฐะฟะธัะต ัะตะทะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" "%%sะัะตะผะตััะตัะต ะณะธ ะธะปะธ ะณะธ ะธะทััะธะนัะต, ะทะฐ ะดะฐ ัะผะตะฝะธัะต ะบะปะพะฝ." -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8040,7 +9225,7 @@ msgstr "" "ะะทัะตะณะปัะฝะตัะพ ัะต ะฟัะตะทะฐะฟะธัะต ัะตะทะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8049,7 +9234,7 @@ msgstr "" "ะกะปะธะฒะฐะฝะตัะพ ัะต ะฟัะตะทะฐะฟะธัะต ัะตะทะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" "%%sะัะตะผะตััะตัะต ะณะธ ะธะปะธ ะณะธ ะธะทััะธะนัะต, ะทะฐ ะดะฐ ัะปะตะตัะต." -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8058,7 +9243,7 @@ msgstr "" "ะกะปะธะฒะฐะฝะตัะพ ัะต ะฟัะตะทะฐะฟะธัะต ัะตะทะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8067,7 +9252,7 @@ msgstr "" "โ%sโ ัะต ะฟัะตะทะฐะฟะธัะต ัะตะทะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" "%%sะัะตะผะตััะตัะต ะณะธ ะธะปะธ ะณะธ ะธะทััะธะนัะต, ะทะฐ ะดะฐ ะธะทะฒัััะธัะต โ%sโ." -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8076,62 +9261,73 @@ msgstr "" "โ%sโ ัะต ะฟัะตะทะฐะฟะธัะต ัะตะทะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "ะะฐะฟะธััั ะทะฐ โ%sโ ััะฒะฟะฐะดะฐ ั ัะพะทะธ ะทะฐ โ%sโ. ะะต ะผะพะถะต ะดะฐ ัะต ะฟัะธัะฒะพะธ." -#: unpack-trees.c:173 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -"ะงะฐััะธัะฝะพัะพ ะธะทัะตะณะปัะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝะพ: ัะปะตะดะฝะธัะต ะทะฐะฟะธัะธ ะฝะต ัะฐ " -"ะฐะบััะฐะปะฝะธ:\n" -"%s" +"ะะพะดะผะพะดัะปัั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ:\n" +"โ%sโ" -#: unpack-trees.c:175 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"ะะฑะฝะพะฒัะฒะฐะฝะตัะพ ะฝะฐ ัะฐััะธัะฝะพัะพ ะธะทัะตะณะปัะฝะต ัะต ะฟัะตะทะฐะฟะธัะต ัะตะทะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ " -"ะดััะฒะพ:\n" +"ะกะปะตะดะฝะธัะต ะฟััะธัะฐ ะฝะต ะพะฑะฝะพะฒะตะฝะธ ะธ ัะฐ ะพััะฐะฒะตะฝะธ ะฒัะฟัะตะบะธ ัะฐะฑะปะพะฝะธัะต ะทะฐ ัะฐััะธัะฝะพ " +"ะธะทัะตะณะปัะฝะต:\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"ะะฑะฝะพะฒัะฒะฐะฝะตัะพ ะฝะฐ ัะฐััะธัะฝะพัะพ ะธะทัะตะณะปัะฝะต ัะต ะธะทััะธะต ัะตะทะธ ัะฐะนะปะพะฒะต ะฒ ัะฐะฑะพัะฝะพัะพ " -"ะดััะฒะพ:\n" +"ะกะปะตะดะฝะธัะต ะฟััะธัะฐ ะฝะต ัะฐ ัะปะตัะธ ะธ ัะฐ ะพััะฐะฒะตะฝะธ ะฒัะฟัะตะบะธ ัะฐะฑะปะพะฝะธัะต ะทะฐ ัะฐััะธัะฝะพ " +"ะธะทัะตะณะปัะฝะต:\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"ะะพะดะผะพะดัะปัั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ:\n" -"โ%sโ" +"ะกะปะตะดะฝะธัะต ะฟััะธัะฐ ะฒะตัะต ัััะตััะฒัะฒะฐั ะฐ ะธ ัะฐ ะพััะฐะฒะตะฝะธ ะฒัะฟัะตะบะธ ัะฐะฑะปะพะฝะธัะต ะทะฐ " +"ัะฐััะธัะฝะพ ะธะทัะตะณะปัะฝะต:\n" +"%s" -#: unpack-trees.c:256 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "ะัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนััะฒะธะตัะพ\n" -#: unpack-trees.c:318 +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" +"ะกะปะตะด ะบะพัะตะบัะธััะฐ ะฝะฐ ะณัะตัะบะธัะต ะฒ ะฟััะธัะฐัะฐ ะฟะพ-ะณะพัะต, ะฒะตัะพััะฝะพ ัะต ัััะฑะฒะฐ\n" +"ะดะฐ ะธะทะฟัะปะฝะธัะต ะบะพะผะฐะฝะดะฐัะฐ:\n" +"\n" +" git sparse-checkout reapply\n" + +#: unpack-trees.c:350 msgid "Updating files" msgstr "ะะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะต" -#: unpack-trees.c:350 +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8141,6 +9337,14 @@ msgstr "" "ะฒัะฒ ัะฐะนะปะพะฒะธ ัะธััะตะผะธ, ะบะพะธัะพ ะฝะต ัะฐะทะปะธัะฐะฒะฐั ะณะปะฐะฒะฝะธ ะพั ะผะฐะปะบะธ ะฑัะบะฒะธ)\n" "ะธ ัะฐะผะพ ะตะดะธะฝ ะพั ััะฐััะฝะธัะธัะต ะฒ ะบะพะฝัะปะธะบัะฐ ะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ:\n" +#: unpack-trees.c:1498 +msgid "Updating index flags" +msgstr "ะะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัะปะฐะณะพะฒะตัะต ะฝะฐ ะธะฝะดะตะบัะฐ" + +#: upload-pack.c:1516 +msgid "expected flush after fetch arguments" +msgstr "ัะปะตะด ะฐัะณัะผะตะฝัะธัะต ะฝะฐ โfetchโ ัะต ะพัะฐะบะฒะฐ ะธะทัะธััะฒะฐะฝะต ะฝะฐ ะฑััะตัะธัะต" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ัั ะตะผะฐ ะทะฐ ะฐะดัะตั ะธะปะธ ัััะธะบััั โ://โ ะปะธะฟัะฒะฐ" @@ -8170,48 +9374,88 @@ msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฝะพะผะตั ะฝะฐ ะฟะพัั" msgid "invalid '..' path segment" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ัะฐัั ะพั ะฟััั โ..โ" -#: worktree.c:258 builtin/am.c:2095 +#: walker.c:170 +msgid "Fetching objects" +msgstr "ะะพััะฐะฒัะฝะต ะฝะฐ ะพะฑะตะบัะธัะต" + +#: worktree.c:236 builtin/am.c:2116 #, c-format msgid "failed to read '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: worktree.c:304 +#: worktree.c:283 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "โ%sโ ะฒ ะพัะฝะพะฒะฝะพัะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ ะฝะต ะต ะดะธัะตะบัะพัะธััะฐ ะฝะฐ ั ัะฐะฝะธะปะธัะตัะพ" -#: worktree.c:315 +#: worktree.c:294 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "ัะฐะนะปัั โ%sโ ะฝะต ััะดััะถะฐ ะฐะฑัะพะปััะฝะธั ะฟัั ะบัะผ ะผะตััะพะฟะพะปะพะถะตะฝะธะตัะพ ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: worktree.c:327 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "โ%sโ ะฝะต ัััะตััะฒัะฒะฐ." -#: worktree.c:333 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "โ%sโ ะฝะต ะต ัะฐะนะป ะฝะฐ .git, ะบะพะด ะทะฐ ะณัะตัะบะฐ: %d" -#: worktree.c:341 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "โ%sโ ะฝะต ัะพัะธ ะบัะผ ะพะฑัะฐัะฝะพ ะบัะผ โ%sโ" -#: wrapper.c:223 wrapper.c:393 +#: worktree.c:587 +msgid "not a directory" +msgstr "ะฝะต ะต ะดะธัะตะบัะพัะธั" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr "โ.gitโ ะฝะต ะต ัะฐะนะป" + +#: worktree.c:598 +msgid ".git file broken" +msgstr "โ.gitโ ะต ะฟะพะฒัะตะดะตะฝ" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr "โ.gitโ ะต ะฝะตะฟัะฐะฒะธะปะตะฝ" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟัั" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะบัะธะต ั ัะฐะฝะธะปะธัะต: โ.gitโ ะฝะต ะต ัะฐะนะป" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะบัะธะต ั ัะฐะฝะธะปะธัะต: โ.gitโ ะต ะฟะพะฒัะตะดะตะฝ" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "ะดะธัะตะบัะพัะธััะฐ โgitdirโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะพัะตัะต" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะดะธัะตะบัะพัะธั โgitdirโ" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ ะธ ะทะฐ ัะตัะตะฝะต, ะธ ะทะฐ ะทะฐะฟะธั" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "ะฝัะผะฐ ะดะพัััะฟ ะดะพ โ%sโ" -#: wrapper.c:632 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "ัะตะบััะฐัะฐ ัะฐะฑะพัะฝะฐ ะดะธัะตะบัะพัะธั ะต ะฝะตะดะพัััะฟะฝะฐ" @@ -8252,11 +9496,11 @@ msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit rm ะคะะะโฆโ, ะทะฐ ะดะฐ ัะบะฐะถะตัะต ัะฐะทัะตัะฐะฒะฐะฝะตัะพ ะฝะฐ ะบะพะฝัะปะธะบัะฐ)" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "ะัะพะผะตะฝะธ, ะบะพะธัะพ ัะต ะฑัะดะฐั ะฟะพะดะฐะดะตะฝะธ:" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "ะัะพะผะตะฝะธ, ะบะพะธัะพ ะฝะต ัะฐ ะฒ ะธะฝะดะตะบัะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต:" @@ -8289,94 +9533,94 @@ msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit %s ะคะะะโฆโ, ะทะฐ ะดะฐ ะพะฟัะตะดะตะปะธัะต ะบะฐะบะฒะพ ะฒะบะปััะฒะฐัะต ะฒ ะฟะพะดะฐะฒะฐะฝะตัะพ)" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "ะธะทััะธัะธ ะฒ ะดะฒะฐัะฐ ัะปััะฐั:" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "ะดะพะฑะฐะฒะตะฝะธ ะพั ะฒะฐั:" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "ะธะทััะธัะธ ะพั ััั :" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "ะดะพะฑะฐะฒะตะฝะธ ะพั ััั :" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "ะธะทััะธัะธ ะพั ะฒะฐั:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "ะดะพะฑะฐะฒะตะฝะธ ะธ ะฒ ะดะฒะฐัะฐ ัะปััะฐั:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "ะฟัะพะผะตะฝะตะฝะธ ะธ ะฒ ะดะฒะฐัะฐ ัะปััะฐั:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "ะฝะพะฒ ัะฐะนะป:" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "ะบะพะฟะธัะฐะฝ:" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "ะธะทััะธั:" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "ะฟัะพะผะตะฝะตะฝ:" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "ะฟัะตะธะผะตะฝัะฒะฐะฝ:" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "ัะผัะฝะฐ ะฝะฐ ะฒะธะดะฐ:" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะฟัะพะผัะฝะฐ:" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "ะฝะตัะปัั:" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "ะฝะพะฒะธ ะฟะพะดะฐะฒะฐะฝะธั, " -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "ะฟัะพะผะตะฝะตะฝะพ ััะดััะถะฐะฝะธะต, " -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "ะฝะตัะปะตะดะตะฝะพ ััะดััะถะฐะฝะธะต, " -#: wt-status.c:906 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "ะะผะฐ %d ัะบะฐัะฐะฒะฐะฝะต." msgstr[1] "ะะผะฐ %d ัะบะฐัะฐะฒะฐะฝะธั." -#: wt-status.c:938 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "ะะพะดะผะพะดัะปะธัะต ัะฐ ะฟัะพะผะตะฝะตะฝะธ, ะฝะพ ะฝะต ัะฐ ะพะฑะฝะพะฒะตะฝะธ:" -#: wt-status.c:940 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "ะัะพะผะตะฝะธ ะฒ ะฟะพะดะผะพะดัะปะธัะต ะทะฐ ะฟะพะดะฐะฒะฐะฝะต:" -#: wt-status.c:1022 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -8384,7 +9628,7 @@ msgstr "" "ะะต ะฟัะพะผะตะฝัะนัะต ะธ ะฝะต ะธะทััะธะฒะฐะนัะต ะณะพัะฝะธั ัะตะด.\n" "ะัะธัะบะพ ะพัะดะพะปั ัะต ะฑัะดะต ะธะทััะธัะพ." -#: wt-status.c:1114 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -8395,195 +9639,203 @@ msgstr "" "ะะทัะธัะปัะฒะฐะฝะตัะพ ะฝะฐ ะฑัะพั ัะฐะทะปะธัะฐะฒะฐัะธ ัะต ะฟะพะดะฐะฒะฐะฝะธั ะพัะฝะต %.2f ัะตะบ.\n" "ะะฐ ะดะฐ ะธะทะฑะตะณะฝะตัะต ัะพะฒะฐ, ะฟะพะปะทะฒะฐะนัะต โ--no-ahead-behindโ.\n" -#: wt-status.c:1144 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "ะัะบะพะธ ะฟััะธัะฐ ะฝะต ัะฐ ัะปะตัะธ." -#: wt-status.c:1147 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr " (ะบะพัะธะณะธัะฐะนัะต ะบะพะฝัะปะธะบัะธัะต ะธ ะธะทะฟัะปะฝะตัะต โgit commitโ)" -#: wt-status.c:1149 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit merge --abortโ, ะทะฐ ะดะฐ ะฟัะตัััะฐะฝะพะฒะธัะต ัะปะธะฒะฐะฝะตัะพ)" -#: wt-status.c:1153 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "ะัะธัะบะธ ะบะพะฝัะปะธะบัะธ ัะฐ ัะตัะตะฝะธ, ะฝะพ ะฟัะพะดัะปะถะฐะฒะฐัะต ัะปะธะฒะฐะฝะตัะพ." -#: wt-status.c:1156 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit commitโ, ะทะฐ ะดะฐ ะทะฐะฒัััะธัะต ัะปะธะฒะฐะฝะตัะพ)" -#: wt-status.c:1165 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "ะ ะผะพะผะตะฝัะฐ ะฟัะธะปะฐะณะฐัะต ะฟะพัะตะดะธัะฐ ะพั ะบััะฟะบะธ ััะตะท โgit amโ." -#: wt-status.c:1168 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "ะขะตะบััะฐัะฐ ะบััะฟะบะฐ ะต ะฟัะฐะทะฝะฐ." -#: wt-status.c:1172 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (ะบะพัะธะณะธัะฐะนัะต ะบะพะฝัะปะธะบัะธัะต ะธ ะธะทะฟัะปะฝะตัะต โgit am --continueโ)" -#: wt-status.c:1174 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit am --skipโ, ะทะฐ ะดะฐ ะฟัะพะฟััะฝะตัะต ัะฐะทะธ ะบััะฟะบะฐ)" -#: wt-status.c:1176 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit am --abortโ, ะทะฐ ะดะฐ ะฒัะทััะฐะฝะพะฒะธัะต ะฟััะฒะพะฝะฐัะฐะปะฝะธั ะบะปะพะฝ)" -#: wt-status.c:1309 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "โgit-rebase-todoโ ะปะธะฟัะฒะฐ." -#: wt-status.c:1311 +#: wt-status.c:1307 msgid "No commands done." msgstr "ะะต ัะฐ ะธะทะฟัะปะฝะตะฝะธ ะบะพะผะฐะฝะดะธ." -#: wt-status.c:1314 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "ะะพัะปะตะดะฝะพ ะธะทะฟัะปะฝะตะฝะฐ ะบะพะผะฐะฝะดะฐ (ะธะทะฟัะปะฝะตะฝะฐ ะต ะพะฑัะพ %d ะบะพะผะฐะฝะดะฐ):" msgstr[1] "ะะพัะปะตะดะฝะพ ะธะทะฟัะปะฝะตะฝะธ ะบะพะผะฐะฝะดะธ (ะธะทะฟัะปะฝะตะฝะธ ัะฐ ะพะฑัะพ %d ะบะพะผะฐะฝะดะธ):" -#: wt-status.c:1325 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " (ะฟะพะฒะตัะต ะธะฝัะพัะผะฐัะธั ะธะผะฐ ะฒัะฒ ัะฐะนะปะฐ โ%sโ)" -#: wt-status.c:1330 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "ะะต ะพััะฐะฒะฐั ะฟะพะฒะตัะต ะบะพะผะฐะฝะดะธ." -#: wt-status.c:1333 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "ะกะปะตะดะฒะฐัะฐ ะบะพะผะฐะฝะดะฐ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต (ะพััะฐะฒะฐ ะพัะต %d ะบะพะผะฐะฝะดะฐ):" msgstr[1] "ะกะปะตะดะฒะฐัะธ ะบะพะผะฐะฝะดะธ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต (ะพััะฐะฒะฐั ะพัะต %d ะบะพะผะฐะฝะดะธ):" -#: wt-status.c:1341 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit rebase --edit-todoโ, ะทะฐ ะดะฐ ัะฐะทะณะปะตะดะฐัะต ะธ ัะตะดะฐะบัะธัะฐัะต)" -#: wt-status.c:1353 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "ะ ะผะพะผะตะฝัะฐ ะฟัะตะฑะฐะทะธัะฐัะต ะบะปะพะฝะฐ โ%sโ ะฒััั ั โ%sโ." -#: wt-status.c:1358 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "ะ ะผะพะผะตะฝัะฐ ะฟัะตะฑะฐะทะธัะฐัะต." -#: wt-status.c:1371 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (ะบะพัะธะณะธัะฐะนัะต ะบะพะฝัะปะธะบัะธัะต ะธ ะธะทะฟะพะปะทะฒะฐะนัะต โgit rebase --continueโ)" -#: wt-status.c:1373 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit rebase --skipโ, ะทะฐ ะดะฐ ะฟัะพะฟััะฝะตัะต ัะฐะทะธ ะบััะฟะบะฐ)" -#: wt-status.c:1375 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit rebase --abortโ, ะทะฐ ะดะฐ ะฒัะทััะฐะฝะพะฒะธัะต ะฟััะฒะพะฝะฐัะฐะปะฝะธั ะบะปะพะฝ)" -#: wt-status.c:1382 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (ะฒัะธัะบะธ ะบะพะฝัะปะธะบัะธ ัะฐ ะบะพัะธะณะธัะฐะฝะธ: ะธะทะฟัะปะฝะตัะต โgit rebase --continueโ)" -#: wt-status.c:1386 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "ะ ะผะพะผะตะฝัะฐ ัะฐะทะดะตะปััะต ะฟะพะดะฐะฒะฐะฝะต ะดะพะบะฐัะพ ะฟัะตะฑะฐะทะธัะฐัะต ะบะปะพะฝะฐ โ%sโ ะฒััั ั โ%sโ." -#: wt-status.c:1391 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "ะ ะผะพะผะตะฝัะฐ ัะฐะทะดะตะปััะต ะฟะพะดะฐะฒะฐะฝะต ะดะพะบะฐัะพ ะฟัะตะฑะฐะทะธัะฐัะต." -#: wt-status.c:1394 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (ะกะปะตะด ะบะฐัะพ ัะฐะฑะพัะฝะพัะพ ะฒะธ ะดััะฒะพ ััะฐะฝะต ัะธััะพ, ะธะทะฟะพะปะทะฒะฐะนัะต โgit rebase --" "continueโ)" -#: wt-status.c:1398 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "ะ ะผะพะผะตะฝัะฐ ัะตะดะฐะบัะธัะฐัะต ะฟะพะดะฐะฒะฐะฝะต ะดะพะบะฐัะพ ะฟัะตะฑะฐะทะธัะฐัะต ะบะปะพะฝะฐ โ%sโ ะฒััั ั โ%sโ." -#: wt-status.c:1403 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "ะ ะผะพะผะตะฝัะฐ ัะตะดะฐะบัะธัะฐัะต ะฟะพะดะฐะฒะฐะฝะต ะดะพะบะฐัะพ ะฟัะตะฑะฐะทะธัะฐัะต." -#: wt-status.c:1406 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit commit --amendโ, ะทะฐ ะดะฐ ัะตะดะฐะบัะธัะฐัะต ัะตะบััะพัะพ ะฟะพะดะฐะฒะฐะฝะต)" -#: wt-status.c:1408 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit rebase --continueโ, ัะปะตะด ะบะฐัะพ ะทะฐะฒัััะธัะต ะฟัะพะผะตะฝะธัะต ัะธ)" -#: wt-status.c:1419 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "ะ ะผะพะผะตะฝัะฐ ัะต ะธะทะฒัััะฒะฐ ะพัะฑะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั." -#: wt-status.c:1422 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "ะ ะผะพะผะตะฝัะฐ ะพัะฑะธัะฐัะต ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ." -#: wt-status.c:1429 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (ะบะพัะธะณะธัะฐะนัะต ะบะพะฝัะปะธะบัะธัะต ะธ ะธะทะฟัะปะฝะตัะต โgit cherry-pick --continueโ)" -#: wt-status.c:1432 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (ะทะฐ ะดะฐ ะฟัะพะดัะปะถะธัะต, ะธะทะฟัะปะฝะตัะต โgit cherry-pick --continueโ)" -#: wt-status.c:1435 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (ะฒัะธัะบะธ ะบะพะฝัะปะธะบัะธ ัะฐ ะบะพัะธะณะธัะฐะฝะธ, ะธะทะฟัะปะฝะตัะต โgit cherry-pick --continueโ)" -#: wt-status.c:1437 +#: wt-status.c:1433 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit cherry-pick --skipโ, ะทะฐ ะดะฐ ะฟัะพะฟััะฝะตัะต ัะฐะทะธ ะบััะฟะบะฐ)" + +#: wt-status.c:1435 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit cherry-pick --abortโ, ะทะฐ ะดะฐ ะพัะผะตะฝะธัะต ะฒัะธัะบะธ ะดะตะนััะฒะธั ั " "ะพัะฑะธัะฐะฝะต)" -#: wt-status.c:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "ะ ะผะพะผะตะฝัะฐ ัะตัะต ะพัะผัะฝะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต." -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "ะ ะผะพะผะตะฝัะฐ ะพัะผะตะฝััะต ะฟะพะดะฐะฒะฐะฝะต โ%sโ." -#: wt-status.c:1456 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (ะบะพัะธะณะธัะฐะนัะต ะบะพะฝัะปะธะบัะธัะต ะธ ะธะทะฟัะปะฝะตัะต โgit revert --continueโ)" -#: wt-status.c:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr " (ะทะฐ ะดะฐ ะฟัะพะดัะปะถะธัะต, ะธะทะฟัะปะฝะตัะต โgit revert --continueโ)" -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (ะฒัะธัะบะธ ะบะพะฝัะปะธะบัะธ ัะฐ ะบะพัะธะณะธัะฐะฝะธ, ะธะทะฟัะปะฝะตัะต โgit revert --continueโ)" +#: wt-status.c:1462 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit revert --skipโ, ะทะฐ ะดะฐ ะฟัะพะฟััะฝะตัะต ัะฐะทะธ ะบััะฟะบะฐ)" + #: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" @@ -8605,39 +9857,45 @@ msgstr "" " (ะธะทะฟะพะปะทะฒะฐะนัะต โgit bisect resetโ, ะทะฐ ะดะฐ ัะต ะฒััะฝะตัะต ะบัะผ ะฟััะฒะพะฝะฐัะฐะปะฝะพัะพ " "ััััะพัะฝะธะต ะธ ะบะปะพะฝ)" -#: wt-status.c:1690 +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "" +"ะะฐะผะธัะฐัะต ัะต ะฒ ัะฐััะธัะฝะพ ะธะทัะตะณะปะตะฝะพ ั ัะฐะฝะธะปะธัะต ั %d%% ะฝะฐะปะธัะฝะธ, ัะปะตะดะตะฝะธ ัะฐะนะปะฐ." + +#: wt-status.c:1731 msgid "On branch " msgstr "ะะฐ ะบะปะพะฝ " -#: wt-status.c:1697 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "ะธะทะฒัััะฒะฐัะต ะธะฝัะตัะฐะบัะธะฒะฝะพ ะฟัะตะฑะฐะทะธัะฐะฝะต ะฒััั ั " -#: wt-status.c:1699 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "ะธะทะฒัััะฒะฐัะต ะฟัะตะฑะฐะทะธัะฐะฝะต ะฒััั ั " -#: wt-status.c:1709 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "ะะทะฒัะฝ ะฒัะธัะบะธ ะบะปะพะฝะธ." -#: wt-status.c:1726 +#: wt-status.c:1767 msgid "Initial commit" msgstr "ะััะฒะพะฝะฐัะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต" -#: wt-status.c:1727 +#: wt-status.c:1768 msgid "No commits yet" msgstr "ะัะต ะพัะต ะปะธะฟัะฒะฐั ะฟะพะดะฐะฒะฐะฝะธั" -#: wt-status.c:1741 +#: wt-status.c:1782 msgid "Untracked files" msgstr "ะะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต" -#: wt-status.c:1743 +#: wt-status.c:1784 msgid "Ignored files" msgstr "ะะณะฝะพัะธัะฐะฝะธ ัะฐะนะปะพะฒะต" -#: wt-status.c:1747 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8649,32 +9907,32 @@ msgstr "" "ะธะทะฟัะปะฝะตะฝะธะตัะพ, ะฝะพ ัะต ัััะฑะฒะฐ ะดะฐ ะดะพะฑะฐะฒััะต ะฝะพะฒะธัะต ัะฐะนะปะพะฒะต ัััะฝะพ.\n" "ะะฐ ะฟะพะฒะตัะต ะฟะพะดัะพะฑะฝะพััะธ ะฟะพะณะปะตะดะฝะตัะต โgit status helpโ." -#: wt-status.c:1753 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "ะะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต ะฝะต ัะฐ ะธะทะฒะตะดะตะฝะธ%s" -#: wt-status.c:1755 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr " (ะธะทะฟะพะปะทะฒะฐะนัะต ะพะฟัะธััะฐ โ-uโ, ะทะฐ ะดะฐ ะธะทะฒะตะดะตัะต ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต)" -#: wt-status.c:1761 +#: wt-status.c:1802 msgid "No changes" msgstr "ะัะผะฐ ะฟัะพะผะตะฝะธ" -#: wt-status.c:1766 +#: wt-status.c:1807 #, 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:1769 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "ะบัะผ ะธะฝะดะตะบัะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ัะฐ ะดะพะฑะฐะฒะตะฝะธ ะฟัะพะผะตะฝะธ\n" -#: wt-status.c:1772 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8683,201 +9941,205 @@ msgstr "" "ะบัะผ ะธะฝะดะตะบัะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ัะฐ ะดะพะฑะฐะฒะตะฝะธ ะฟัะพะผะตะฝะธ, ะฝะพ ะธะผะฐ ะฝะพะฒะธ ัะฐะนะปะพะฒะต " "(ะธะทะฟะพะปะทะฒะฐะนัะต โgit addโ, ะทะฐ ะดะฐ ะทะฐะฟะพัะฝะต ััั ะฝะพัะพ ัะปะตะดะตะฝะต)\n" -#: wt-status.c:1775 +#: wt-status.c:1819 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "ะบัะผ ะธะฝะดะตะบัะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ัะฐ ะดะพะฑะฐะฒะตะฝะธ ะฟัะพะผะตะฝะธ, ะฝะพ ะธะผะฐ ะฝะพะฒะธ ัะฐะนะปะพะฒะต\n" -#: wt-status.c:1778 +#: wt-status.c:1823 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "ะปะธะฟัะฒะฐั ะบะฐะบะฒะธัะพ ะธ ะดะฐ ะต ะฟัะพะผะตะฝะธ (ััะทะดะฐะนัะต ะธะปะธ ะบะพะฟะธัะฐะนัะต ัะฐะนะปะพะฒะต ะธ ะธะทะฟะพะปะทะฒะฐะนัะต " "โgit addโ, ะทะฐ ะดะฐ ะทะฐะฟะพัะฝะต ััั ะฝะพัะพ ัะปะตะดะตะฝะต)\n" -#: wt-status.c:1781 wt-status.c:1786 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "ะปะธะฟัะฒะฐั ะบะฐะบะฒะธัะพ ะธ ะดะฐ ะต ะฟัะพะผะตะฝะธ\n" -#: wt-status.c:1784 +#: wt-status.c:1830 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "ะปะธะฟัะฒะฐั ะบะฐะบะฒะธัะพ ะธ ะดะฐ ะต ะฟัะพะผะตะฝะธ (ะธะทะฟะพะปะทะฒะฐะนัะต ะพะฟัะธััะฐ โ-uโ, ะทะฐ ะดะฐ ัะต ะธะทะฒะตะดะฐั ะธ " "ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต)\n" -#: wt-status.c:1788 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "ะปะธะฟัะฒะฐั ะบะฐะบะฒะธัะพ ะธ ะดะฐ ะต ะฟัะพะผะตะฝะธ, ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะต ัะธััะพ\n" -#: wt-status.c:1901 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "ะัะต ะพัะต ะปะธะฟัะฒะฐั ะฟะพะดะฐะฒะฐะฝะธั ะฒ " -#: wt-status.c:1905 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD (ะธะทะฒัะฝ ะบะปะพะฝ)" -#: wt-status.c:1936 +#: wt-status.c:1975 msgid "different" msgstr "ัะฐะทะปะธัะตะฝ" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "ะฝะฐะทะฐะด ั " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "ะฝะฐะฟัะตะด ั " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "ะฝะต ะผะพะถะต ะดะฐ ะธะทะฒัััะธัะต โ%sโ, ะทะฐัะพัะพ ะธะผะฐ ะฟัะพะผะตะฝะธ, ะบะพะธัะพ ะฝะต ัะฐ ะฒ ะธะฝะดะตะบัะฐ." -#: wt-status.c:2472 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "ะพัะฒะตะฝ ัะพะฒะฐ ะฒ ะธะฝะดะตะบัะฐ ะธะผะฐ ะฝะตะฟะพะดะฐะดะตะฝะธ ะฟัะพะผะตะฝะธ." -#: wt-status.c:2474 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "ะฝะต ะผะพะถะต ะดะฐ ะธะทะฒัััะธัะต โ%sโ, ะทะฐัะพัะพ ะฒ ะธะฝะดะตะบัะฐ ะธะผะฐ ะฝะตะฟะพะดะฐะดะตะฝะธ ะฟัะพะผะตะฝะธ." -#: compat/precompose_utf8.c:58 builtin/clone.c:453 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 #, c-format msgid "failed to unlink '%s'" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทััะธะฒะฐะฝะต ะฝะฐ โ%sโ" -#: builtin/add.c:25 +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [ะะะฆะะฏโฆ] [--] ะะชะขโฆ" -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "ะฝะตะพัะฐะบะฒะฐะฝ ะธะทั ะพะดะตะฝ ะบะพะด ะฟัะธ ะณะตะฝะตัะธัะฐะฝะต ะฝะฐ ัะฐะทะปะธะบะฐ: %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "ะฝะตััะฟะตัะฝะพ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะตัะต" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ โ%sโ\n" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "ะัะพะผะตะฝะธ, ะบะพะธัะพ ะธ ัะปะตะด ะพะฑะฝะพะฒัะฒะฐะฝะตัะพ ะฝะฐ ะธะฝะดะตะบัะฐ ะฝะต ัะฐ ะดะพะฑะฐะฒะตะฝะธ ะบัะผ ะฝะตะณะพ:" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:272 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "ะะฝะดะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/add.c:245 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "ะคะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ ะทะฐ ะทะฐะฟะธั." -#: builtin/add.c:249 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "ะััะฟะบะฐัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝะฐ" -#: builtin/add.c:252 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "ะฝะตััะฟะตัะฝะพ ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ะบััะฟะบะฐ" -#: builtin/add.c:255 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปััะธ ะธะฝัะพัะผะฐัะธั ััะตะท โstatโ ะทะฐ ัะฐะนะปะฐ โ%sโ" -#: builtin/add.c:257 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "ะัะฐะทะฝะฐ ะบััะฟะบะฐ, ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนััะฒะธะตัะพ." -#: builtin/add.c:262 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "ะััะฟะบะฐัะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะธะปะพะถะตะฝะฐ" -#: builtin/add.c:270 +#: builtin/add.c:308 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "ะกะปะตะดะฝะธัะต ะฟััะธัะฐ ัะต ะฑัะดะฐั ะธะณะฝะพัะธัะฐะฝะธ ัะฟะพัะตะด ะฝัะบะพะน ะพั ัะฐะนะปะพะฒะตัะต โ.gitignoreโ:\n" -#: 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 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 msgid "dry run" msgstr "ะฟัะพะฑะฝะพ ะธะทะฟัะปะฝะตะฝะธะต" -#: builtin/add.c:293 +#: builtin/add.c:331 msgid "interactive picking" msgstr "ะธะฝัะตัะฐะบัะธะฒะฝะพ ะพัะฑะธัะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธ" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 msgid "select hunks interactively" msgstr "ะธะฝัะตัะฐะบัะธะฒะตะฝ ะธะทะฑะพั ะฝะฐ ะฟะฐััะตัะฐ ะบะพะด" -#: builtin/add.c:295 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ัะตะบััะฐัะฐ ัะฐะทะปะธะบะฐ ะธ ะฟัะธะปะฐะณะฐะฝะต" -#: builtin/add.c:296 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "ะดะพะฑะฐะฒัะฝะต ะธ ะฝะฐ ะธะฝะฐัะต ะธะณะฝะพัะธัะฐะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/add.c:297 +#: builtin/add.c:335 msgid "update tracked files" msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/add.c:298 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "ัะตะดะฝะฐะบะฒัะฒะฐะฝะต ะฝะฐ ะทะฝะฐัะธัะต ะทะฐ ะบัะฐะน ะฝะฐ ัะฐะนะป (ะฒะบะปััะฒะฐ ะพะฟัะธััะฐ โ-uโ)" -#: builtin/add.c:299 +#: builtin/add.c:337 msgid "record only the fact that the path will be added later" msgstr "ะพัะฑะตะปัะทะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ัะฐะบัะฐ, ัะต ะฟัััั ัะต ะฑัะดะต ะดะพะฑะฐะฒะตะฝ ะฟะพ-ะบััะฝะพ" -#: builtin/add.c:300 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฒัะธัะบะธ ะฟัะพะผะตะฝะธ ะฒ ัะปะตะดะตะฝะธัะต ะธ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/add.c:303 +#: builtin/add.c:341 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ะฟััะธัะฐัะฐ, ะบะพะธัะพ ัะฐ ะธะทััะธัะธ ะพั ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ (ัััะพัะพ ะบะฐัะพ โ--" "no-allโ)" -#: builtin/add.c:305 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "ะฑะตะท ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฝะพะฒะธ ัะฐะนะปะพะฒะต, ัะฐะผะพ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ" -#: builtin/add.c:306 +#: builtin/add.c:344 msgid "just skip files which cannot be added because of errors" msgstr "" "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะตัะต, ะบะพะธัะพ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะดะพะฑะฐะฒะตะฝะธ ะฟะพัะฐะดะธ ะณัะตัะบะธ" -#: builtin/add.c:307 +#: builtin/add.c:345 msgid "check if - even missing - files are ignored in dry run" msgstr "" "ะฟัะพะฒะตัะบะฐ, ัะต ะฟัะธ ะฟัะพะฑะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฒัะธัะบะธ ัะฐะนะปะพะฒะต, ะดะพัะธ ะธ ะธะทััะธัะธัะต, ัะต " "ะธะณะฝะพัะธัะฐั" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "ะธะทัะธัะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ััะพะนะฝะพัััะฐ ะฝะฐ ัะปะฐะณะฐ ะดะฐะปะธ ัะฐะนะปัั ะต ะธะทะฟัะปะฝะธะผ" -#: builtin/add.c:311 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "ะฟัะตะดัะฟัะตะถะดะฐะฒะฐะฝะต ะฟัะธ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฒะณัะฐะดะตะฝะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/add.c:326 +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "ัะตะฐะปะธะทะฐัะธั ะฝะฐ โgit stash -pโ" + +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8908,151 +10170,185 @@ msgstr "" "\n" "ะะฐ ะฟะพะฒะตัะต ะธะฝัะพัะผะฐัะธั ะฟะพะณะปะตะดะฝะตัะต โgit help submoduleโ." -#: builtin/add.c:354 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฒะณัะฐะดะตะฝะพ ั ัะฐะฝะธะปะธัะต: %s" -#: builtin/add.c:372 -#, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "ะะทะฟะพะปะทะฒะฐะนัะต ะพะฟัะธััะฐ โ-fโ, ะทะฐ ะดะฐ ะณะธ ะดะพะฑะฐะฒะธัะต ะฝะฐะธััะธะฝะฐ.\n" +#: builtin/add.c:416 +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:379 +#: builtin/add.c:425 msgid "adding files failed" msgstr "ะฝะตััะฟะตัะฝะพ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะฐะนะปะพะฒะต" -#: builtin/add.c:419 +#: builtin/add.c:453 builtin/commit.c:345 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "" +"ะพะฟัะธััะฐ โ--pathspec-from-fileโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะฒััะบะฐ ะพั ะพะฟัะธะธัะต โ--" +"interactiveโ/โ--patchโ" + +#: builtin/add.c:470 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "ะพะฟัะธะธัะต โ--pathspec-from-fileโ ะธ โ--editโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "ะพะฟัะธะธัะต โ-Aโ ะธ โ-uโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/add.c:426 +#: builtin/add.c:485 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:430 +#: builtin/add.c:489 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "ะฟะฐัะฐะผะตััััั ะบัะผ โ--chmodโ โ โ%sโ ะผะพะถะต ะดะฐ ะต ะธะปะธ โ-xโ, ะธะปะธ โ+xโ" -#: builtin/add.c:445 +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "" +"ะพะฟัะธััะฐ โ--pathspec-from-fileโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะฐัะณัะผะตะฝัะธ, ัะบะฐะทะฒะฐัะธ ะฟััะธัะฐ" + +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "ะพะฟัะธััะฐ โ--pathspec-file-nulโ ะธะทะธัะบะฒะฐ ะพะฟัะธั โ--pathspec-from-fileโ" + +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "ะะธัะพ ะฝะต ะต ะทะฐะดะฐะดะตะฝะพ ะธ ะฝะธัะพ ะฝะต ะต ะดะพะฑะฐะฒะตะฝะพ.\n" -#: builtin/add.c:446 +#: builtin/add.c:520 +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/am.c:160 #, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "ะะตัะพััะฝะพ ะธัะบะฐั ัะต ะดะฐ ะธะทะฟะพะปะทะฒะฐัะต โgit add .โ?\n" +msgid "invalid committer: %s" +msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟะพะดะฐะฒะฐั: โ%sโ" -#: builtin/am.c:348 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "ัะบัะธะฟััั ะทะฐ ะฐะฒัะพั ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" -#: builtin/am.c:432 +#: builtin/am.c:450 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "โ%sโ ะฑะต ะธะทััะธั ะพั ะบัะบะฐัะฐ โapplypatch-msgโ" -#: builtin/am.c:474 +#: builtin/am.c:492 #, c-format msgid "Malformed input line: '%s'." msgstr "ะะฐะดะตะฝะธัั ะฒั ะพะดะตะฝ ัะตะด ะต ั ะฝะตะฟัะฐะฒะธะปะตะฝ ัะพัะผะฐั: โ%sโ." -#: builtin/am.c:512 +#: builtin/am.c:530 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "ะะตะปะตะถะบะฐัะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะบะพะฟะธัะฐ ะพั โ%sโ ะบัะผ โ%sโ" -#: builtin/am.c:538 +#: builtin/am.c:556 msgid "fseek failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โfseekโ" -#: builtin/am.c:726 +#: builtin/am.c:744 #, c-format msgid "could not parse patch '%s'" msgstr "ะบััะฟะบะฐัะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" -#: builtin/am.c:791 +#: builtin/am.c:809 msgid "Only one StGIT patch series can be applied at once" msgstr "" "ะกะฐะผะพ ะตะดะฝะฐ ะฟะพัะตะดะธัะฐ ะพั ะบััะฟะบะธ ะพั โStGITโ ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะธะปะฐะณะฐะฝะฐ ะฒ ะดะฐะดะตะฝ ะผะพะผะตะฝั" -#: builtin/am.c:839 +#: builtin/am.c:857 msgid "invalid timestamp" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ ะฒัะตะผะต" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:862 builtin/am.c:874 msgid "invalid Date line" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะด ะทะฐ ะดะฐัะฐ โDateโ" -#: builtin/am.c:851 +#: builtin/am.c:869 msgid "invalid timezone offset" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะพัะผะตััะฒะฐะฝะต ะฝะฐ ัะฐัะพะฒะธั ะฟะพัั" -#: builtin/am.c:944 +#: builtin/am.c:962 msgid "Patch format detection failed." msgstr "ะคะพัะผะฐััั ะฝะฐ ะบััะฟะบะฐัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฟัะตะดะตะปะตะฝ." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:967 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "ะดะธัะตะบัะพัะธััะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝะฐ" -#: builtin/am.c:954 +#: builtin/am.c:972 msgid "Failed to split patches." msgstr "ะััะฟะบะธัะต ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ัะฐะทะดะตะปะตะฝะธ." -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "ะธะฝะดะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" - -#: builtin/am.c:1098 +#: builtin/am.c:1103 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "ะกะปะตะด ะบะพัะธะณะธัะฐะฝะตัะพ ะฝะฐ ัะพะทะธ ะฟัะพะฑะปะตะผ ะธะทะฟัะปะฝะตัะต โ%s --continueโ." -#: builtin/am.c:1099 +#: builtin/am.c:1104 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "ะะบะพ ะฟัะตะดะฟะพัะธัะฐัะต ะดะฐ ะฟัะตัะบะพัะธัะต ัะฐะทะธ ะบััะฟะบะฐ, ะธะทะฟัะปะฝะตัะต โ%s --skipโ." -#: builtin/am.c:1100 +#: builtin/am.c:1105 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "ะะฐ ะดะฐ ัะต ะฒััะฝะตัะต ะบัะผ ะฟััะฒะพะฝะฐัะฐะปะฝะพัะพ ััััะพัะฝะธะต, ะธะทะฟัะปะฝะตัะต โ%s --abortโ." -#: builtin/am.c:1183 +#: builtin/am.c:1188 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "ะััะฟะบะฐัะฐ ะต ะฟัะฐัะตะฝะฐ ั ัะพัะผะฐัะธัะฐะฝะต โformat=flowedโ. ะัะฐะทะฝะธัะต ะทะฝะฐัะธ ะฒ ะบัะฐั ะฝะฐ " "ัะตะดะพะฒะตัะต ะผะพะถะต ะดะฐ ัะต ะทะฐะณัะฑัั." -#: builtin/am.c:1211 +#: builtin/am.c:1216 msgid "Patch is empty." msgstr "ะััะฟะบะฐัะฐ ะต ะฟัะฐะทะฝะฐ." -#: builtin/am.c:1277 +#: builtin/am.c:1281 #, c-format -msgid "invalid ident line: %.*s" -msgstr "ะณัะตัะตะฝ ัะตะด ั ะธะดะตะฝัะธัะฝะพัั: %.*s" +msgid "missing author line in commit %s" +msgstr "ะปะธะฟัะฒะฐ ัะตะด ะทะฐ ะฐะฒัะพัััะฒะพ ะฒ ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ" -#: builtin/am.c:1299 +#: builtin/am.c:1284 #, c-format -msgid "unable to parse commit %s" -msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝะพ: %s" +msgid "invalid ident line: %.*s" +msgstr "ะณัะตัะตะฝ ัะตะด ั ะธะดะตะฝัะธัะฝะพัั: %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1503 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "ะ ั ัะฐะฝะธะปะธัะตัะพ ะปะธะฟัะฒะฐั ะฝะตะพะฑั ะพะดะธะผะธัะต ะพะฑะตะบัะธ-BLOB, ะทะฐ ะดะฐ ัะต ะฟัะตะผะธะฝะต ะบัะผ ััะพะนะฝะพ " "ัะปะธะฒะฐะฝะต." -#: builtin/am.c:1498 +#: builtin/am.c:1505 msgid "Using index info to reconstruct a base tree..." msgstr "ะะฐะทะพะฒะพัะพ ะดััะฒะพ ัะต ัะตะบะพะฝััััะธัะฐ ะพั ะธะฝัะพัะผะฐัะธััะฐ ะฒ ะธะฝะดะตะบัะฐโฆ" -#: builtin/am.c:1517 +#: builtin/am.c:1524 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9060,24 +10356,24 @@ msgstr "" "ะััะฟะบะฐัะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะธะปะพะถะธ ะบัะผ ะพะฑะตะบัะธัะต-BLOB ะฒ ะธะฝะดะตะบัะฐ.\n" "ะะฐ ะฝะต ะฑะธ ะดะฐ ััะต ั ัะตะดะฐะบัะธัะฐะปะธ ะฝะฐ ััะบะฐ?" -#: builtin/am.c:1523 +#: builtin/am.c:1530 msgid "Falling back to patching base and 3-way merge..." msgstr "ะัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะบััะฟะบะฐ ะบัะผ ะฑะฐะทะฐัะฐ ะธ ััะพะนะฝะพ ัะปะธะฒะฐะฝะตโฆ" -#: builtin/am.c:1549 +#: builtin/am.c:1556 msgid "Failed to merge in the changes." msgstr "ะะตััะฟะตัะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต." -#: builtin/am.c:1581 +#: builtin/am.c:1588 msgid "applying to an empty history" msgstr "ะฟัะธะปะฐะณะฐะฝะต ะฒััั ั ะฟัะฐะทะฝะฐ ะธััะพัะธั" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1639 builtin/am.c:1643 #, c-format msgid "cannot resume: %s does not exist." msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะพะดัะปะถะธ โ โ%sโ ะฝะต ัััะตััะฒัะฒะฐ." -#: builtin/am.c:1650 +#: builtin/am.c:1661 msgid "Commit Body is:" msgstr "ะขัะปะพัะพ ะฝะฐ ะบััะฟะบะฐัะฐ ะทะฐ ะฟัะธะปะฐะณะฐะฝะต ะต:" @@ -9085,40 +10381,45 @@ msgstr "ะขัะปะพัะพ ะฝะฐ ะบััะฟะบะฐัะฐ ะทะฐ ะฟัะธะปะฐะณะฐะฝะต ะต:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1671 #, 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:1710 +#: builtin/am.c:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "ะธะฝะดะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" + +#: builtin/am.c:1721 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" "ะะฝะดะตะบััั ะฝะต ะต ัะธัั: ะบััะฟะบะธัะต ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะฟัะธะปะพะถะตะฝะธ (ะทะฐะผัััะตะฝะธ ัะฐ: %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1761 builtin/am.c:1829 #, c-format msgid "Applying: %.*s" msgstr "ะัะธะปะฐะณะฐะฝะต: %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1778 msgid "No changes -- Patch already applied." msgstr "ะะตะท ะฟัะพะผะตะฝะธ โ ะบััะฟะบะฐัะฐ ะฒะตัะต ะต ะฟัะธะปะพะถะตะฝะฐ." -#: builtin/am.c:1773 +#: builtin/am.c:1784 #, c-format msgid "Patch failed at %s %.*s" msgstr "ะะตััะฟะตัะฝะพ ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะบััะฟะบะฐ ะฟัะธ %s %.*sโ" -#: builtin/am.c:1777 -msgid "Use 'git am --show-current-patch' to see the failed patch" +#: builtin/am.c:1788 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -"ะะฐ ะดะฐ ะฒะธะดะธัะต ะฝะตััะฟะตัะฝะพ ะฟัะธะปะพะถะตะฝะธ ะบััะฟะบะธ, ะธะทะฟะพะปะทะฒะฐะนัะต ะพะฟัะธััะฐ โgit am --show-" -"current-patchโ to see the failed patch" +"ะะฐ ะดะฐ ะฒะธะดะธัะต ะฝะตััะฟะตัะฝะพ ะฟัะธะปะพะถะตะฝะธ ะบััะฟะบะธ, ะธะทะฟะพะปะทะฒะฐะนัะต:\n" +"\n" +" git am --show-current-patch=diff" -#: builtin/am.c:1821 +#: builtin/am.c:1832 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9128,7 +10429,7 @@ msgstr "" "ะะบะพ ะฝัะผะฐ ะดััะณะฐ ะฟัะพะผัะฝะฐ ะทะฐ ะฒะบะปััะฒะฐะฝะต ะฒ ะธะฝะดะตะบัะฐ, ะฝะฐะน-ะฒะตัะพััะฝะพ ะฝัะบะพั ะดััะณะฐ\n" "ะบััะฟะบะฐ ะต ะดะพะฒะตะปะฐ ะดะพ ัััะธัะต ะฟัะพะผะตะฝะธ ะธ ะฒ ัะฐะบัะฒ ัะปััะฐะน ะฟัะพััะพ ะฟัะพะฟััะฝะตัะต ัะฐะทะธ." -#: builtin/am.c:1828 +#: builtin/am.c:1839 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9139,17 +10440,17 @@ msgstr "" "ะกะปะตะด ะบะพัะตะบัะธั ะฝะฐ ะบะพะฝัะปะธะบัะธัะต ะธะทะฟัะปะฝะตัะต โgit addโ ะฒััั ั ะฟะพะฟัะฐะฒะตะฝะธัะต ัะฐะนะปะพะฒะต.\n" "ะะฐ ะดะฐ ะฟัะธะตะผะตัะต โะธะทััะธัะธ ะพั ััั โ, ะธะทะฟัะปะฝะตัะต โgit rmโ ะฒััั ั ะธะทััะธัะธัะต ัะฐะนะปะพะฒะต." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "โ%sโ ะฝะต ะต ัะฐะทะฟะพะทะฝะฐั ะบะฐัะพ ะพะฑะตะบั." -#: builtin/am.c:1987 +#: builtin/am.c:1998 msgid "failed to clean index" msgstr "ะธะฝะดะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทัะธััะตะฝ" -#: builtin/am.c:2031 +#: builtin/am.c:2042 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9160,149 +10461,162 @@ msgstr "" "ัะพัะธ ะบัะผ\n" "โORIG_HEADโ" -#: builtin/am.c:2128 +#: builtin/am.c:2149 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โ--patch-formatโ: โ%sโ" -#: builtin/am.c:2164 +#: builtin/am.c:2191 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โ--show-current-patchโ: โ%sโ" + +#: builtin/am.c:2195 +#, 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:2226 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [ะะะฆะะฏโฆ] [(ะคะะะ_ะก_ะะะฉะ|ะะะ ะะะขะะ ะะฏ_ะก_ะะะฉะ)โฆ]" -#: builtin/am.c:2165 +#: builtin/am.c:2227 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [ะะะฆะะฏโฆ] (--continue | --quit | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2233 msgid "run interactively" msgstr "ะธะฝัะตัะฐะบัะธะฒะฝะฐ ัะฐะฑะพัะฐ" -#: builtin/am.c:2173 +#: builtin/am.c:2235 msgid "historical option -- no-op" msgstr "ะธะทะพััะฐะฒะตะฝะฐ ะพะฟัะธั, ัััะตััะฒัะฒะฐ ะฟะพ ะธััะพัะธัะตัะบะธ ะฟัะธัะธะฝะธ, ะฝะธัะพ ะฝะต ะฟัะฐะฒะธ" -#: builtin/am.c:2175 +#: builtin/am.c:2237 msgid "allow fall back on 3way merging if needed" msgstr "ะดะฐ ัะต ะฟัะตะผะธะฝะฐะฒะฐ ะบัะผ ััะพะนะฝะพ ัะปะธะฒะฐะฝะต ะฟัะธ ะฝัะถะดะฐ." -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 msgid "be quiet" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั" -#: builtin/am.c:2178 +#: builtin/am.c:2240 msgid "add a Signed-off-by line to the commit message" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะตะด ะทะฐ ะฟะพะดะฟะธั โSigned-off-byโ ะฒ ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/am.c:2181 +#: builtin/am.c:2243 msgid "recode into utf8 (default)" msgstr "ะฟัะตะบะพะดะธัะฐะฝะต ะฒ UTF-8 (ััะฐะฝะดะฐััะฝะพ)" -#: builtin/am.c:2183 +#: builtin/am.c:2245 msgid "pass -k flag to git-mailinfo" msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟัะธััะฐ โ-kโ ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit-mailinfoโ" -#: builtin/am.c:2185 +#: builtin/am.c:2247 msgid "pass -b flag to git-mailinfo" msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟัะธััะฐ โ-bโ ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit-mailinfoโ" -#: builtin/am.c:2187 +#: builtin/am.c:2249 msgid "pass -m flag to git-mailinfo" msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟัะธััะฐ โ-mโ ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit-mailinfoโ" -#: builtin/am.c:2189 +#: builtin/am.c:2251 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟัะธััะฐ โ--keep-crโ ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit-mailsplitโ ะทะฐ ัะพัะผะฐั โmboxโ" -#: builtin/am.c:2192 +#: builtin/am.c:2254 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "ะฑะตะท ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟัะธััะฐ โ--keep-crโ ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit-mailsplitโ ะฝะตะทะฐะฒะธัะธะผะพ " "ะพั โam.keepcrโ" -#: builtin/am.c:2195 +#: builtin/am.c:2257 msgid "strip everything before a scissors line" msgstr "ะฟัะพะฟััะบะฐะฝะต ะฝะฐ ะฒัะธัะบะพ ะฟัะตะดะธ ัะตะดะฐ ะทะฐ ะพัััะทะฒะฐะฝะต" -#: 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 +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 msgid "pass it through git-apply" msgstr "ะฟัะตะบะฐัะฒะฐะฝะต ะฟัะตะท โgit-applyโ" -#: 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:141 parse-options.h:162 parse-options.h:312 +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "ะะ ะะ" -#: 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 +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "ะคะะ ะะะข" -#: builtin/am.c:2221 +#: builtin/am.c:2283 msgid "format the patch(es) are in" msgstr "ัะพัะผะฐั ะฝะฐ ะบััะฟะบะธัะต" -#: builtin/am.c:2227 +#: builtin/am.c:2289 msgid "override error message when patch failure occurs" msgstr "ะธะทะฑัะฐะฝะพ ะพั ะฒะฐั ััะพะฑัะตะฝะธะต ะทะฐ ะณัะตัะบะฐ ะฟัะธ ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะบััะฟะบะธ" -#: builtin/am.c:2229 +#: builtin/am.c:2291 msgid "continue applying patches after resolving a conflict" msgstr "ะฟัะพะดัะปะถะฐะฒะฐะฝะต ะฝะฐ ะฟัะธะปะฐะณะฐะฝะตัะพ ะฝะฐ ะบััะฟะบะธ ัะปะตะด ะบะพัะธะณะธัะฐะฝะตัะพ ะฝะฐ ะบะพะฝัะปะธะบั" -#: builtin/am.c:2232 +#: builtin/am.c:2294 msgid "synonyms for --continue" msgstr "ะฟัะตะฒะดะพะฝะธะผะธ ะฝะฐ โ--continueโ" -#: builtin/am.c:2235 +#: builtin/am.c:2297 msgid "skip the current patch" msgstr "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ัะตะบััะฐัะฐ ะบััะฟะบะฐ" -#: builtin/am.c:2238 +#: builtin/am.c:2300 msgid "restore the original branch and abort the patching operation." msgstr "" "ะฒัะทััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะฟััะฒะพะฝะฐัะฐะปะฝะพัะพ ััััะพัะฝะธะต ะฝะฐ ะบะปะพะฝะฐ ะธ ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ " "ะฟัะธะปะฐะณะฐะฝะตัะพ ะฝะฐ ะบััะฟะบะฐัะฐ." -#: builtin/am.c:2241 +#: builtin/am.c:2303 msgid "abort the patching operation but keep HEAD where it is." msgstr "" "ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะฟัะธะปะฐะณะฐะฝะตัะพ ะฝะฐ ะบััะฟะบะฐัะฐ ะฑะตะท ะฟัะพะผัะฝะฐ ะบัะผ ะบะพะต ัะพัะธ โHEADโ." -#: builtin/am.c:2244 -msgid "show the patch being applied." -msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฟัะธะปะฐะณะฐะฝะฐัะฐ ะบััะฟะบะฐ." +#: builtin/am.c:2307 +msgid "show the patch being applied" +msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฟัะธะปะฐะณะฐะฝะฐัะฐ ะบััะฟะบะฐ" -#: builtin/am.c:2248 +#: builtin/am.c:2312 msgid "lie about committer date" msgstr "ะดะฐัะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ัะฐะทะปะธัะฝะฐ ะพั ะฟััะฒะพะฝะฐัะฐะปะฝะฐัะฐ" -#: builtin/am.c:2250 +#: builtin/am.c:2314 msgid "use current timestamp for author date" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัะตะบััะพัะพ ะฒัะตะผะต ะบะฐัะพ ัะพะฒะฐ ะทะฐ ะฐะฒัะพั" -#: 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 +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "ะะะะะขะะคะะะะขะะ _ะะ_ะะะฎะง" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 msgid "GPG-sign commits" msgstr "ะฟะพะดะฟะธัะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ั GPG" -#: builtin/am.c:2256 +#: builtin/am.c:2320 msgid "(internal use for git-rebase)" msgstr "(ะฟะพะปะทะฒะฐ ัะต ะฒัััะตัะฝะพ ะทะฐ โgit-rebaseโ)" -#: builtin/am.c:2274 +#: builtin/am.c:2338 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." @@ -9310,18 +10624,18 @@ msgstr "" "ะะฟัะธะธัะต โ-bโ/โ--binaryโ ะพัะดะฐะฒะฝะฐ ะฝะต ะฟัะฐะฒัั ะฝะธัะพ ะธ\n" "ัะต ะฑัะดะฐั ะฟัะตะผะฐั ะฝะฐัะธ ะฒ ะฑัะดะตัะต. ะะต ะณะธ ะฟะพะปะทะฒะฐะนัะต." -#: builtin/am.c:2281 +#: builtin/am.c:2345 msgid "failed to read the index" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทัะธัะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ" -#: builtin/am.c:2296 +#: builtin/am.c:2360 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "ะฟัะตะดะธัะฝะฐัะฐ ะดะธัะตะบัะพัะธั ะทะฐ ะฟัะตะฑะฐะทะธัะฐะฝะต โ%sโ ะฒัะต ะพัะต ัััะตััะฒัะฒะฐ, ะฐ ะต ะทะฐะดะฐะดะตะฝ " "ัะฐะนะป โmboxโ." -#: builtin/am.c:2320 +#: builtin/am.c:2384 #, c-format msgid "" "Stray %s directory found.\n" @@ -9330,11 +10644,11 @@ msgstr "" "ะัะบัะธัะฐ ะต ะธะทะปะธัะฝะฐ ะดะธัะตะบัะพัะธั โ%sโ.\n" "ะะพะถะตัะต ะดะฐ ั ะธะทััะธะตัะต ั ะบะพะผะฐะฝะดะฐัะฐ โgit am --abortโ." -#: builtin/am.c:2326 +#: builtin/am.c:2390 msgid "Resolve operation not in progress, we are not resuming." msgstr "ะ ะผะพะผะตะฝัะฐ ะฝะต ัะตัะต ะพะฟะตัะฐัะธั ะฟะพ ะบะพัะธะณะธัะฐะฝะต ะธ ะฝัะผะฐ ะบะฐะบ ะดะฐ ัะต ะฟัะพะดัะปะถะธ." -#: builtin/am.c:2336 +#: builtin/am.c:2400 msgid "interactive mode requires patches on the command line" msgstr "ะธะฝัะตัะฐะบัะธะฒะฝะธัั ัะตะถะธะผ ะธะทะธัะบะฒะฐ ะบััะฟะบะธ ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ัะตะด" @@ -9373,40 +10687,40 @@ msgstr "git archive: ะฟัะพัะพะบะพะปะฝะฐ ะณัะตัะบะฐ" 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 --next-all" +msgstr "git bisect--helper --next-all" + +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "git bisect--helper --write-terms ะะะจะ ะะะะ ะ" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:25 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [ะะะะะะะะ]" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:27 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 +#: builtin/bisect--helper.c:28 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 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "git bisect--helper --bisect-next-check ะะะจะ ะะะะ ะ ะฃะะ ะะะะฏะะะฉะ_ะะฃะะ" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:30 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -9414,48 +10728,67 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:31 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [ะะะจะ [ะะะะ ะโฆ]] [--] [ะะชะขโฆ]" +"git bisect--helper --bisect-start [--term-{new,bad}=ะะะจะ --term-{old,good}" +"=ะะะะ ะ] [--no-checkout] [--first-parent] [ะะะจะ [ะะะะ ะโฆ]] [--] [ะะชะขโฆ]" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-auto-next" + +#: builtin/bisect--helper.c:35 +msgid "git bisect--helper --bisect-autostart" +msgstr "git bisect--helper --bisect-autostart" + +#: builtin/bisect--helper.c:97 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ ะฒ ัะตะถะธะผ โ%sโ" + +#: builtin/bisect--helper.c:104 +#, c-format +msgid "could not write to file '%s'" +msgstr "ะฒัะฒ ัะฐะนะปะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะธัะต" + +#: builtin/bisect--helper.c:143 #, c-format msgid "'%s' is not a valid term" msgstr "โ%sโ ะต ะฝะตะฟัะฐะฒะธะปะฝะฐ ัะฟัะฐะฒะปัะฒะฐัะฐ ะดัะผะฐ" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:147 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "โ%sโ ะต ะฒะณัะฐะดะตะฝะฐ ะบะพะผะฐะฝะดะฐ ะธ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ะบะฐัะพ ัะฟัะฐะฒะปัะฒะฐัะฐ ะดัะผะฐ" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะผะตะฝะธัะต ะทะฝะฐัะตะฝะธะตัะพ ะฝะฐ ัะฟัะฐะฒะปัะฒะฐัะฐัะฐ ะดัะผะฐ โ%sโ" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:167 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 +#: builtin/bisect--helper.c:207 #, c-format msgid "We are not bisecting.\n" msgstr "ะ ะผะพะผะตะฝัะฐ ะฝะต ัะต ะธะทะฒัััะฒะฐ ะดะฒะพะธัะฝะพ ััััะตะฝะต.\n" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:215 #, c-format msgid "'%s' is not a valid commit" msgstr "โ%sโ ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:224 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -9463,27 +10796,27 @@ msgstr "" "ะฟััะฒะพะฝะฐัะฐะปะฝะพ ัะบะฐะทะฐะฝะพัะพ โ%sโ ะฒ ัะบะฐะทะฐัะตะปั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต\n" "ะธะทัะตะณะปะตะฝะพ. ะัะพะฑะฒะฐะนัะต ะดะฐ ะธะทะฟัะปะฝะธัะต ะบะพะผะฐะฝะดะฐัะฐ โgit bisect reset ะะะะะะะะโ." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:268 #, c-format msgid "Bad bisect_write argument: %s" msgstr "ะะตะฟัะฐะฒะธะปะตะฝ ะฐัะณัะผะตะฝั ะฝะฐ ััะฝะบัะธััะฐ โbisect_writeโ: โ%sโ" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "ะธะดะตะฝัะธัะธะบะฐัะพััั ะฝะฐ ะพะฑะตะบั ะฝะฐ ะฒะตััะธั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะปััะตะฝ" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:285 #, c-format msgid "couldn't open the file '%s'" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:311 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ะบะพะผะฐะฝะดะฐ: ะฒ ะผะพะผะตะฝัะฐ ัะต ะธะทะฟัะปะฝัะฒะฐ ะดะฒะพะธัะฝะพ ััััะตะฝะต ะฟะพ %s/%s." -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:338 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9492,7 +10825,7 @@ msgstr "" "ะขััะฑะฒะฐ ะดะฐ ะทะฐะดะฐะดะตัะต ะฟะพะฝะต ะตะดะฝะฐ โ%sโ ะธ ะตะดะฝะฐ โ%sโ ะฒะตััะธั. (ะขะพะฒะฐ ะผะพะถะต ะดะฐ ัะต\n" "ะฝะฐะฟัะฐะฒะธ ััะพัะฒะตัะฝะพ ะธ ััะตะท ะบะพะผะฐะฝะดะธัะต โgit bisect %sโ ะธ โgit bisect %sโ.)" -#: builtin/bisect--helper.c:289 +#: builtin/bisect--helper.c:342 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9503,7 +10836,7 @@ msgstr "" "ะขััะฑะฒะฐ ะดะฐ ะทะฐะดะฐะดะตัะต ะฟะพะฝะต ะตะดะฝะฐ โ%sโ ะธ ะตะดะฝะฐ โ%sโ ะฒะตััะธั. (ะขะพะฒะฐ ะผะพะถะต ะดะฐ ัะต\n" "ะฝะฐะฟัะฐะฒะธ ััะพัะฒะตัะฝะพ ะธ ััะตะท ะบะพะผะฐะฝะดะธัะต โgit bisect %sโ ะธ โgit bisect %sโ.)" -#: builtin/bisect--helper.c:321 +#: builtin/bisect--helper.c:362 #, c-format msgid "bisecting only with a %s commit" msgstr "ะดะฒะพะธัะฝะพ ััััะตะฝะต ัะฐะผะพ ะฟะพ โ%sโ ะฟะพะดะฐะฒะฐะฝะต." @@ -9512,15 +10845,15 @@ msgstr "ะดะฒะพะธัะฝะพ ััััะตะฝะต ัะฐะผะพ ะฟะพ โ%sโ ะฟะพะดะฐะฒะฐะฝะต." #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:370 msgid "Are you sure [Y/n]? " msgstr "ะะฐ ัะต ะฟัะพะดัะปะถะธ ะปะธ? โYโ โ ะะ, โnโ โ ะฝะต" -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:431 msgid "no terms defined" msgstr "ะฝะต ัะฐ ัะบะฐะทะฐะฝะธ ัะฟัะฐะฒะปัะฒะฐัะธ ะดัะผะธ" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:434 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9529,7 +10862,7 @@ msgstr "" "ะขะตะบััะธัะต ัะฟัะฐะฒะปัะฒะฐัะธ ะดัะผะธ ัะฐ: %s ะทะฐ ััะฐัะพัะพ ััััะพัะฝะธะต\n" "ะธ %s ะทะฐ ะฝะพะฒะพัะพ ััััะพัะฝะธะต.\n" -#: builtin/bisect--helper.c:389 +#: builtin/bisect--helper.c:444 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9538,120 +10871,166 @@ msgstr "" "ะฝะฐ โgit bisect termsโ ะต ะฟะพะดะฐะดะตะฝ ะฝะตะฟัะฐะฒะธะปะตะฝ ะฐัะณัะผะตะฝั โ%sโ\n" "ะะพะดะดััะถะฐั ัะต ะพะฟัะธะธัะต โ--term-goodโ/โ--term-oldโ ะธ โ--term-badโ/โ--term-newโ." -#: builtin/bisect--helper.c:475 +#: builtin/bisect--helper.c:511 +msgid "revision walk setup failed\n" +msgstr "ะฝะตััะฟะตัะฝะพ ะฝะฐัััะพะนะฒะฐะฝะต ะฝะฐ ะพะฑั ะพะถะดะฐะฝะตัะพ ะฝะฐ ะฒะตััะธะธัะต\n" + +#: builtin/bisect--helper.c:533 +#, c-format +msgid "could not open '%s' for appending" +msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ ะทะฐ ะดะพะฑะฐะฒัะฝะต" + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +msgid "'' is not a valid term" +msgstr "โโ ะต ะฝะตะฟัะฐะฒะธะปะฝะฐ ัะฟัะฐะฒะปัะฒะฐัะฐ ะดัะผะฐ" + +#: builtin/bisect--helper.c:674 #, c-format msgid "unrecognized option: '%s'" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะพะฟัะธั: %s" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:678 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "โ%sโ ะฝะต ะธะทะณะปะตะถะดะฐ ะบะฐัะพ ัะบะฐะทะฐัะตะป ะบัะผ ะฒะตััะธั" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:709 msgid "bad HEAD - I need a HEAD" msgstr "ะะตะฟัะฐะฒะธะปะตะฝ ัะบะฐะทะฐัะตะป โHEADโ" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:724 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "ะะตััะฟะตัะฝะพ ะฟัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ โ%sโ. ะะทะฟัะปะฝะตัะต ะบะพะผะฐะฝะดะฐัะฐ โgit bisect start " "ะกะชะฉะะกะขะะฃะะะฉ_ะะะะโ." -#: builtin/bisect--helper.c:547 +#: builtin/bisect--helper.c:745 msgid "won't bisect on cg-seek'ed tree" msgstr "" "ะฝะต ะผะพะถะต ะดะฐ ัะต ััััะธ ะดะฒะพะธัะฝะพ, ะบะพะณะฐัะพ ะต ะธะทะฟัะปะฝะตะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โcg-seekโ ะพั " "โcogitoโ" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:748 msgid "bad HEAD - strange symbolic ref" msgstr "ะะตะฟัะฐะฒะธะปะตะฝ ัะบะฐะทะฐัะตะป โHEADโ โ ะฝะตะพะฑะธัะฐะตะฝ ัะธะผะฒะพะปะตะฝ ัะบะฐะทะฐัะตะป" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:775 #, c-format msgid "invalid ref: '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะบะฐะทะฐัะตะป: โ%sโ" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:827 +msgid "You need to start by \"git bisect start\"\n" +msgstr "ะะฐะฟะพัะฝะตัะต ะบะฐัะพ ะธะทะฟัะปะฝะธัะต ะบะพะผะฐะฝะดะฐัะฐ โgit bisect startโ\n" + +#. 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:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "ะะฐ ัะต ะธะทะฒัััะธ ะปะธ ะฐะฒัะพะผะฐัะธัะฝะพ? โYโ โ ะะ, โnโ โ ะฝะต" + +#: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'" msgstr "ะธะทะฒัััะฒะฐะฝะต ะฝะฐ โgit bisect nextโ" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:868 msgid "write the terms to .git/BISECT_TERMS" msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ัะฟัะฐะฒะปัะฒะฐัะธัะต ะดัะผะธ ะฒ โโ.git/BISECT_TERMSโโ" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:870 msgid "cleanup the bisection state" msgstr "ะธะทัะธััะฒะฐะฝะต ะฝะฐ ััััะพัะฝะธะตัะพ ะฝะฐ ะดะฒะพะธัะฝะพัะพ ััััะตะฝะต" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:872 msgid "check for expected revs" msgstr "ะฟัะพะฒะตัะบะฐ ะทะฐ ะพัะฐะบะฒะฐะฝะธัะต ะฒะตััะธะธ" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:874 msgid "reset the bisection state" msgstr "ะธะทัะธััะฒะฐะฝะต ะฝะฐ ััััะพัะฝะธะตัะพ ะฝะฐ ะดะฒะพะธัะฝะพัะพ ััััะตะฝะต" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:876 msgid "write out the bisection state in BISECT_LOG" msgstr "ะทะฐะฟะธั ะฝะฐ ััััะพัะฝะธะตัะพ ะฝะฐ ะดะฒะพะธัะฝะพัะพ ััััะตะฝะต ะฒ โBISECT_LOGโ" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:878 msgid "check and set terms in a bisection state" msgstr "" "ะฟัะพะฒะตัะบะฐ ะธ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ัะฟัะฐะฒะปัะฒะฐัะธ ะดัะผะธ ะบัะผ ััััะพัะฝะธะตัะพ ะฝะฐ ะดะฒะพะธัะฝะพัะพ ััััะตะฝะต" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:880 msgid "check whether bad or good terms exist" msgstr "ะฟัะพะฒะตัะบะฐ ะดะฐะปะธ ัััะตััะฒัะฒะฐั ะพะดะพะฑััะฒะฐัะธ/ะพัั ะฒััะปััะธ ัะฟัะฐะฒะปัะฒะฐัะธ ะดัะผะธ" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:882 msgid "print out the bisect terms" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฟัะฐะฒะปัะฒะฐัะธัะต ะดัะผะธ" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:884 msgid "start the bisect session" msgstr "ะฝะฐัะฐะปะพ ะฝะฐ ะดะฒะพะธัะฝะพ ััััะตะฝะต" -#: builtin/bisect--helper.c:650 -msgid "update BISECT_HEAD instead of checking out the current commit" +#: builtin/bisect--helper.c:886 +msgid "find the next bisection commit" +msgstr "ะพัะบัะธะฒะฐะฝะต ะฝะฐ ัะปะตะดะฒะฐัะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะฟัะธ ะดะฒะพะธัะฝะพ ััััะตะฝะต" + +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" msgstr "" -"ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปั โBISECT_HEADโ ะฒะผะตััะพ ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ัะตะบััะพัะพ ะฟะพะดะฐะฒะฐะฝะต" +"ะฟัะพะฒะตัะบะฐ ะฝะฐ ัะปะตะดะฒะฐัะพัะพ ััััะพัะฝะธะต ะธ ะฟัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ ัะปะตะดะฒะฐัะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะฟัะธ " +"ะดะฒะพะธัะฝะพ ััััะตะฝะต" + +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "ะฝะฐัะฐะปะพ ะฝะฐ ะดะฒะพะธัะฝะพ ััััะตะฝะต, ะฐะบะพ ะฒะตัะต ะฝะต ะต ะฟะพัะฝะฐะปะพ" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:892 msgid "no log for BISECT_WRITE" msgstr "ะปะธะฟัะฒะฐ ะทะฐะฟะธั ะทะฐ โBISECT_WRITEโ" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:910 msgid "--write-terms requires two arguments" msgstr "ะพะฟัะธััะฐ โ--write-termsโ ะธะทะธัะบะฒะฐ ัะพัะฝะพ 2 ะฐัะณัะผะตะฝัะฐ" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:914 msgid "--bisect-clean-state requires no arguments" msgstr "ะพะฟัะธััะฐ โ--bisect-clean-stateโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:921 msgid "--bisect-reset requires either no argument or a commit" msgstr "ะพะฟัะธััะฐ โ--bisect-resetโ ะธะทะธัะบะฒะฐ ะธะปะธ 0 ะฐัะณัะผะตะฝัะธ, ะธะปะธ 1 โ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:925 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "ะพะฟัะธััะฐ โ--bisect-writeโ ะธะทะธัะบะฒะฐ 4 ะธะปะธ 5 ะฐัะณัะผะตะฝัะฐ" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:931 msgid "--check-and-set-terms requires 3 arguments" msgstr "ะพะฟัะธััะฐ โ--check-and-set-termsโ ะธะทะธัะบะฒะฐ 3 ะฐัะณัะผะตะฝัะฐ" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:937 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "ะพะฟัะธััะฐ โ--bisect-next-checkโ ะธะทะธัะบะฒะฐ 2 ะธะปะธ 3 ะฐัะณัะผะตะฝัะฐ" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:943 msgid "--bisect-terms requires 0 or 1 argument" msgstr "ะพะฟัะธััะฐ โ--bisect-termsโ ะธะทะธัะบะฒะฐ 0 ะธะปะธ 1 ะฐัะณัะผะตะฝัะฐ" +#: builtin/bisect--helper.c:952 +msgid "--bisect-next requires 0 arguments" +msgstr "ะพะฟัะธััะฐ โ--bisect-nextโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" + +#: builtin/bisect--helper.c:958 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "ะพะฟัะธััะฐ โ--bisect-auto-nextโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" + +#: builtin/bisect--helper.c:964 +msgid "--bisect-autostart does not accept arguments" +msgstr "ะพะฟัะธััะฐ โ--bisect-autostartโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" + #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [ะะะฆะะฏโฆ] [ะะะฆะะฏ_ะะ_ะะะ ะกะะฏะขะโฆ] [ะะะ ะกะะฏ] [--] ะคะะะ" @@ -9678,151 +11057,147 @@ msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะฒัั โ%sโ ะฒ โcolor.blame.repeatedLinesโ msgid "invalid value for blame.coloring" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โblame.coloringโ" -#: builtin/blame.c:823 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "ะฒะตััะธััะฐ ะทะฐ ะฟัะตัะบะฐัะฐะฝะต โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะฐ" -#: builtin/blame.c:845 +#: builtin/blame.c:867 msgid "Show blame entries as we find them, incrementally" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐะฒัะพัััะฒะพัะพ ั ะฝะฐะผะธัะฐะฝะตัะพ ะผั, ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะพ" -#: builtin/blame.c:846 -msgid "Show blank SHA-1 for boundary commits (Default: off)" +#: builtin/blame.c:868 +msgid "Do not show object names of boundary commits (Default: off)" msgstr "" -"ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัะฐะทะฝะธ ััะผะธ ะฟะพ SHA1 ะทะฐ ะณัะฐะฝะธัะฝะธัะต ะฟะพะดะฐะฒะฐะฝะธั (ััะฐะฝะดะฐััะฝะพ ะพะฟัะธััะฐ " -"ะต ะธะทะบะปััะตะฝะฐ)" +"ะะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ะพะฑะตะบัะธัะต ะทะฐ ะณัะฐะฝะธัะฝะธัะต ะฟะพะดะฐะฒะฐะฝะธั (ััะฐะฝะดะฐััะฝะพ " +"ะพะฟัะธััะฐ ะต ะธะทะบะปััะตะฝะฐ)" -#: builtin/blame.c:847 +#: builtin/blame.c:869 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "ะะฐัะฐะปะฝะธัะต ะฟะพะดะฐะฒะฐะฝะธั ะดะฐ ะฝะต ัะต ััะธัะฐั ะทะฐ ะณัะฐะฝะธัะฝะธ (ััะฐะฝะดะฐััะฝะพ ะพะฟัะธััะฐ ะต " "ะธะทะบะปััะตะฝะฐ)" -#: builtin/blame.c:848 +#: builtin/blame.c:870 msgid "Show work cost statistics" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะฐัะธััะธะบะฐ ะทะฐ ะธะทะฒัััะตะฝะธัะต ะดะตะนััะฒะธั" -#: builtin/blame.c:849 +#: builtin/blame.c:871 msgid "Force progress reporting" msgstr "ะัะธะฝัะดะธัะตะปะฝะพ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟัะตะดัะบะฐ" -#: builtin/blame.c:850 +#: builtin/blame.c:872 msgid "Show output score for blame entries" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะดะพะฟัะปะฝะธัะตะปะฝะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะพะฟัะตะดะตะปัะฝะตัะพ ะฝะฐ ะฐะฒัะพัััะฒะพัะพ" -#: builtin/blame.c:851 +#: builtin/blame.c:873 msgid "Show original filename (Default: auto)" msgstr "" "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟััะฒะพะฝะฐัะฐะปะฝะพัะพ ะธะผะต ะฝะฐ ัะฐะนะป (ััะฐะฝะดะฐััะฝะพ ัะพะฒะฐ ะต ะฐะฒัะพะผะฐัะธัะฝะพ)" -#: builtin/blame.c:852 +#: builtin/blame.c:874 msgid "Show original linenumber (Default: off)" msgstr "" "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟััะฒะพะฝะฐัะฐะปะฝะธัั ะฝะพะผะตั ะฝะฐ ัะตะด (ััะฐะฝะดะฐััะฝะพ ะพะฟัะธััะฐ ะต ะธะทะบะปััะตะฝะฐ)" -#: builtin/blame.c:853 +#: builtin/blame.c:875 msgid "Show in a format designed for machine consumption" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฒัะฒ ัะพัะผะฐั ะทะฐ ะฟะพ-ะฝะฐัะฐัััะฝะฐ ะพะฑัะฐะฑะพัะบะฐ" -#: builtin/blame.c:854 +#: builtin/blame.c:876 msgid "Show porcelain format with per-line commit information" msgstr "" "ะะทะฒะตะถะดะฐะฝะต ะฒัะฒ ัะพัะผะฐั ะทะฐ ะบะพะผะฐะฝะดะธ ะพั ะฟะพััะตะฑะธัะตะปัะบะพ ะฝะธะฒะพ ั ะธะฝัะพัะผะฐัะธั ะฝะฐ ะฒัะตะบะธ " "ัะตะด" -#: builtin/blame.c:855 +#: builtin/blame.c:877 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "ะะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัััะธั ัะพัะผะฐั ะบะฐัะพ โgit-annotateโ (ััะฐะฝะดะฐััะฝะพ ะพะฟัะธััะฐ ะต " "ะธะทะบะปััะตะฝะฐ)" -#: builtin/blame.c:856 +#: builtin/blame.c:878 msgid "Show raw timestamp (Default: off)" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะตัะพัะผะฐัะธัะฐะฝะธ ะฒัะตะผะตะฝะฐ (ััะฐะฝะดะฐััะฝะพ ะพะฟัะธััะฐ ะต ะธะทะบะปััะตะฝะฐ)" -#: builtin/blame.c:857 +#: builtin/blame.c:879 msgid "Show long commit SHA1 (Default: off)" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัะปะฝะธัะต ััะผะธ ะฟะพ SHA1 (ััะฐะฝะดะฐััะฝะพ ะพะฟัะธััะฐ ะต ะธะทะบะปััะตะฝะฐ)" -#: builtin/blame.c:858 +#: builtin/blame.c:880 msgid "Suppress author name and timestamp (Default: off)" msgstr "ะะตะท ะธะผะต ะฝะฐ ะฐะฒัะพั ะธ ะฒัะตะผะต ะฝะฐ ะฟัะพะผัะฝะฐ (ััะฐะฝะดะฐััะฝะพ ะพะฟัะธััะฐ ะต ะธะทะบะปััะตะฝะฐ)" -#: builtin/blame.c:859 +#: builtin/blame.c:881 msgid "Show author email instead of name (Default: off)" msgstr "" "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะต-ะฟะพัะฐัะฐ ะฝะฐ ะฐะฒัะพัะฐ, ะฐ ะฝะต ะธะผะตัะพ ะผั (ััะฐะฝะดะฐััะฝะพ ะพะฟัะธััะฐ ะต " "ะธะทะบะปััะตะฝะฐ)" -#: builtin/blame.c:860 +#: builtin/blame.c:882 msgid "Ignore whitespace differences" msgstr "ะะตะท ัะฐะทะปะธะบะธ ะฒ ะทะฝะฐัะธัะต ะทะฐ ะธะฝัะตัะฒะฐะปะธ" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:883 builtin/log.c:1808 msgid "rev" msgstr "ะะะ ะก" -#: builtin/blame.c:861 +#: builtin/blame.c:883 msgid "Ignore <rev> when blaming" msgstr "ะัะตัะบะฐัะฐะฝะต ะฝะฐ ะะะ ะกะธััะฐ ะฟัะธ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐะฒัะพัััะฒะพัะพ" -#: builtin/blame.c:862 +#: builtin/blame.c:884 msgid "Ignore revisions from <file>" msgstr "ะัะตัะบะฐัะฐะฝะต ะฝะฐ ะฒะตััะธะธัะต ัะบะฐะทะฐะฝะธ ะฒัะฒ ะคะะะะฐ ะฟัะธ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐะฒัะพัััะฒะพัะพ" -#: builtin/blame.c:863 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "" "ะพัะฒะตััะฒะฐะฝะต ะฝะฐ ะฟะพะฒัะฐัััะธัะต ัะต ะผะตัะฐะดะฐะฝะฝะธ ะพั ะฟัะตะดะธัะฝะธั ัะตะด ะฒ ัะฐะทะปะธัะตะฝ ัะฒัั" -#: builtin/blame.c:864 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "ะพัะฒะตััะฒะฐะฝะต ะฝะฐ ัะตะดะพะฒะตัะต ะฟะพ ะฒัะทัะฐัั" -#: builtin/blame.c:871 -msgid "Use an experimental heuristic to improve diffs" -msgstr "ะะพะดะพะฑััะฒะฐะฝะต ะฝะฐ ัะฐะทะปะธะบะธัะต ััะตะท ะตะบัะฟะตัะธะผะตะฝัะฐะปะฝะฐ ะตะฒัะธััะธะบะฐ" - -#: builtin/blame.c:873 +#: builtin/blame.c:887 msgid "Spend extra cycles to find better match" msgstr "ะะพะฟัะปะฝะธัะตะปะฝะธ ะธะทัะธัะปะตะฝะธั ะทะฐ ะฟะพ-ะดะพะฑัะธ ัะตะทัะปัะฐัะธ" -#: builtin/blame.c:874 +#: builtin/blame.c:888 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "ะะทัะธัะฐะฝะต ะฝะฐ ะฒะตััะธะธัะต ะพั ะคะะะ, ะฐ ะฝะต ััะตะท ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โgit-rev-listโ" -#: builtin/blame.c:875 +#: builtin/blame.c:889 msgid "Use <file>'s contents as the final image" msgstr "ะะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะฝะฐ ะคะะะะฐ ะบะฐัะพ ะบัะฐะนะฝะพ ะฟะพะปะพะถะตะฝะธะต" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "ะฝะฐะฟะฐัะฒะฐะฝะต ะฝะฐ ัะตะดะพะฒะตัะต" -#: builtin/blame.c:876 +#: builtin/blame.c:890 msgid "Find line copies within and across files" msgstr "" "ะขัััะตะฝะต ะฝะฐ ะบะพะฟะธัะฐะฝะธ ัะตะดะพะฒะต ะบะฐะบัะพ ะฒ ัะฐะผะบะธัะต ะฝะฐ ะตะดะธะฝ ัะฐะนะป, ัะฐะบะฐ ะธ ะพั ะตะดะธะฝ ัะฐะนะป " "ะบัะผ ะดััะณ" -#: builtin/blame.c:877 +#: builtin/blame.c:891 msgid "Find line movements within and across files" msgstr "" "ะขัััะตะฝะต ะฝะฐ ะฟัะตะผะตััะตะฝะธ ัะตะดะพะฒะต ะบะฐะบัะพ ะฒ ัะฐะผะบะธัะต ะฝะฐ ะตะดะธะฝ ัะฐะนะป, ัะฐะบะฐ ะธ ะพั ะตะดะธะฝ " "ัะฐะนะป ะบัะผ ะดััะณ" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "Process only line range n,m, counting from 1" msgstr "" "ะะฝัะพัะผะฐัะธั ัะฐะผะพ ะทะฐ ัะตะดะพะฒะตัะต ะฒ ะดะธะฐะฟะฐะทะพะฝะฐ ะพั n ะดะพ m ะฒะบะปััะธัะตะปะฝะพ. ะัะพะตะฝะตัะพ " "ะทะฐะฟะพัะฒะฐ ะพั 1" -#: builtin/blame.c:929 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "ะพะฟัะธััะฐ โ--progressโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั โ--incrementalโ ะธ ัะพัะผะฐฬัะฐ ะฝะฐ ะบะพะผะฐะฝะดะธัะต " @@ -9836,24 +11211,24 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "ะฟัะตะดะธ 4 ะณะพะดะธะฝะธ ะธ 11 ะผะตัะตัะฐ" -#: builtin/blame.c:1087 +#: builtin/blame.c:1110 #, 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:1133 +#: builtin/blame.c:1156 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]" +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>]" @@ -10059,7 +11434,7 @@ msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ัะตะถะธะผะฐ ะฝะฐ ัะปะตะดะตะฝะต (ะฒะธะถ git-pull( msgid "do not use" msgstr "ะดะฐ ะฝะต ัะต ะฟะพะปะทะฒะฐ" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:526 msgid "upstream" msgstr "ะบะปะพะฝ-ะธะทัะพัะฝะธะบ" @@ -10068,8 +11443,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" @@ -10152,68 +11527,68 @@ msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะฝะตัะปะตัะธัะต ะบะปะพะฝะธ" msgid "list branches in columns" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฟะพ ะบะพะปะพะฝะธ" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 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 +#: builtin/tag.c:434 msgid "object" msgstr "ะะะะะข" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะบะปะพะฝะธัะต ะฝะฐ ะะะะะขะ" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "ะฟะพะดัะตะดะฑะฐัะฐ ะธ ัะธะปััะธัะฐะฝะตัะพ ััะตัะธัะฐั ะตะดะฝะฐะบะฒะพ ะผะฐะปะบะธัะต ะธ ะณะปะฐะฒะฝะธัะต ะฑัะบะฒะธ" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "ะคะะ ะะะข ะทะฐ ะธะทั ะพะดะฐ" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "ะ ะดะธัะตะบัะพัะธััะฐ โrefs/headsโ ะปะธะฟัะฒะฐ ัะฐะนะป โHEADโ" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "ะะฟัะธะธัะต โ--columnโ ะธ โ--verboseโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "ะะตะพะฑั ะพะดะธะผะพ ะต ะธะผะต ะฝะฐ ะบะปะพะฝ" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "ะะต ะผะพะถะต ะดะฐ ะทะฐะดะฐะดะตัะต ะพะฟะธัะฐะฝะธะต ะฝะฐ ะฝะตัะฒััะทะฐะฝ โHEADโ" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "ะะต ะผะพะถะต ะดะฐ ัะตะดะฐะบัะธัะฐัะต ะพะฟะธัะฐะฝะธะตัะพ ะฝะฐ ะฟะพะฒะตัะต ะพั ะตะดะธะฝ ะบะปะพะฝ ะตะดะฝะพะฒัะตะผะตะฝะฝะพ" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "ะ ะบะปะพะฝะฐ โ%sโ ะฒัะต ะพัะต ะฝัะผะฐ ะฟะพะดะฐะฒะฐะฝะธั." -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "ะะธะฟัะฒะฐ ะบะปะพะฝ ะฝะฐ ะธะผะต โ%sโ." -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะบะปะพะฝะธ ะทะฐ ะบะพะฟะธัะฐะฝะต" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฐัะณัะผะตะฝัะธ ะบัะผ ะบะพะผะฐะฝะดะฐัะฐ ะทะฐ ะฟัะตะธะผะตะฝัะฒะฐะฝะต" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฐัะณัะผะตะฝัะธ ะบัะผ ะบะพะผะฐะฝะดะฐัะฐ ะทะฐ ัะปะตะดะตะฝะต" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -10221,31 +11596,31 @@ msgstr "" "ะกะปะตะดะตะฝะพัะพ ะพั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะดะฐ ะต โ%sโ, ะทะฐัะพัะพ ัะพ ะฝะต ัะพัะธ ะบัะผ " "ะฝะธะบะพะน ะบะปะพะฝ." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "ะัะผะฐ ะบะปะพะฝ ะฝะฐ ะธะผะต โ%sโ." -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "ะะต ัััะตััะฒัะฒะฐ ะบะปะพะฝ ะฝะฐ ะธะผะต โ%sโ." -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฐัะณัะผะตะฝัะธ ะบัะผ ะบะพะผะฐะฝะดะฐัะฐ ะทะฐ ัะฟะธัะฐะฝะต ะฝะฐ ัะปะตะดะตะฝะต" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "ะกะปะตะดะตะฝะพัะพ ะพั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ะผะฐั ะฝะต, ะทะฐัะพัะพ ัะพ ะฝะต ัะพัะธ ะบัะผ ะฝะธะบะพะน ะบะปะพะฝ." -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "ะัะผะฐ ะธะฝัะพัะผะฐัะธั ะบะปะพะฝัั โ%sโ ะดะฐ ัะปะตะดะธ ะฝัะบะพะน ะดััะณ" -#: builtin/branch.c:841 +#: builtin/branch.c:839 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>?" @@ -10253,7 +11628,7 @@ msgstr "" "ะะฟัะธะธัะต โ-aโ ะธ โ-rโ ะฝะฐ โgit branchโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ั ะธะผะต ะฝะฐ ะบะปะพะฝ.\n" "ะัะพะฑะฒะฐะนัะต ั: โ-a|-r --list ะจะะะะะโ" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -10261,20 +11636,167 @@ msgstr "" "ะะฟัะธััะฐ โ--set-upstreamโ ะฒะตัะต ะฝะต ัะต ะฟะพะดะดััะถะฐ. ะะทะฟะพะปะทะฒะฐะนัะต โ--trackโ ะธะปะธ โ--" "set-upstream-toโ" -#: builtin/bundle.c:45 +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "ะฒะตััะธั ะฝะฐ git:\n" + +#: builtin/bugreport.c:21 #, c-format -msgid "%s is okay\n" -msgstr "ะัะฐัะบะฐัะฐ โ%sโ ะต ะฝะฐัะตะด\n" +msgid "uname() failed with error '%s' (%d)\n" +msgstr "ะณัะตัะบะฐ ะฟัะธ ะธะทะฟัะปะฝะตะฝะธะตัะพ ะฝะฐ โuname()โ โ โ%sโ (%d)\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "ะบะพะผะฟะธะปะฐัะพั: " + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "ะฑะธะฑะปะธะพัะตะบะฐ ะฝะฐ C: " + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "ะบะพะผะฐะฝะดะฐัะฐ ะต ััะฐััะธัะฐะฝะฐ ะธะทะฒัะฝ ั ัะฐะฝะธะปะธัะต ะฝะฐ Git, ะทะฐัะพะฒะฐ ะฝัะผะฐ ะบัะบะธ\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "git bugreport [-o|--output-directory ะคะะะ] [-s|--suffix ะคะะ ะะะข]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"ะะปะฐะณะพะดะฐัะธะผ, ัะต ะฟะพะฟัะปะฝะธั ัะต ะดะพะบะปะฐะด ะทะฐ ะณัะตัะบะฐ ะฒ Git!\n" +"ะะพะปะธะผ ะดะฐ ะพัะณะพะฒะพัะธัะต ะฝะฐ ัะปะตะดะฝะธัะต ะฒัะฟัะพัะธ, ะทะฐ ะดะฐ ัะฐะทะฑะตัะตะผ ะตััะตััะฒะพัะพ ะฝะฐ " +"ะฟัะพะฑะปะตะผะฐ.\n" +"\n" +"ะะฐะบะฒะพ ะฟัะฐะฒะตั ัะต, ะฟัะตะดะธ ะฟัะพะฑะปะตะผัั ะดะฐ ะฒัะทะฝะธะบะฝะต? (ะกััะฟะบะธ ะทะฐ ะฟะพะฒัะฐััะฝะต ะฝะฐ " +"ะฟัะพะฑะปะตะผะฐ)\n" +"\n" +"ะะฐะบะฒะพ ะพัะฐะบะฒะฐั ัะต ะดะฐ ัะต ัะปััะธ? (ะัะฐะบะฒะฐะฝะพ ะฟะพะฒะตะดะตะฝะธะต)\n" +"\n" +"ะะฐะบะฒะพ ัะต ัะปััะธ ะฒะผะตััะพ ัะพะฒะฐ? (ะ ะตะฐะปะฝะพ ะฟะพะฒะตะดะตะฝะธะต)\n" +"\n" +"ะะฐะบะฒะฐ ะต ัะฐะทะปะธะบะฐัะฐ ะผะตะถะดั ะพัะฐะบะฒะฐะฝะพัะพ ะธ ะดะตะนััะฒะธัะตะปะฝะพ ัะปััะธะปะพัะพ ัะต?\n" +"\n" +"ะะพะฟัะปะฝะธัะตะปะฝะฐ ะธะฝัะพัะผะฐัะธั, ะบะพััะพ ะธัะบะฐัะต ะดะฐ ะดะพะฑะฐะฒะธัะต:\n" +"\n" +"ะ ะฐะทะณะปะตะดะฐะนัะต ะพััะฐะฝะฐะปะฐัะฐ ัะฐัั ะพั ะดะพะบะปะฐะดะฐ ะทะฐ ะณัะตัะบะฐ ะฟะพ-ะดะพะปั.\n" +"ะะพะถะต ะดะฐ ะธะทััะธะตัะต ัะตะดะพะฒะตัะต, ะบะพะธัะพ ะฝะต ะธัะบะฐัะต ะดะฐ ัะฟะพะดะตะปะธัะต.\n" -#: builtin/bundle.c:58 +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "ัะบะฐะถะตัะต ัะฐะนะปะฐ, ะฒ ะบะพะนัะพ ะดะฐ ัะต ะทะฐะฟะฐะทะธ ะดะพะบะปะฐะดัั ะทะฐ ะณัะตัะบะฐ" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "ัะบะฐะถะตัะต ัััะธะบัะฐ ะฝะฐ ัะฐะนะปะฐ ะฒัะฒ ัะพัะผะฐั ะทะฐ โstrftimeโ" + +#: builtin/bugreport.c:158 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "ัะพะดะธัะตะปัะบะธัะต ะดะธัะตะบัะพัะธะธ ะฝะฐ โ%sโ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ััะทะดะฐะดะตะฝะธ" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "ะะฝัะพัะผะฐัะธั ะทะฐ ัะธััะตะผะฐัะฐ" + +#: builtin/bugreport.c:168 +msgid "Enabled Hooks" +msgstr "ะะบะปััะตะฝะธ ะบัะบะธ" + +#: builtin/bugreport.c:175 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "ะฝะพะฒะธัั ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝ" + +#: builtin/bugreport.c:178 +#, c-format +msgid "unable to write to %s" +msgstr "ะฒ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะธัะต" + +#: builtin/bugreport.c:188 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "ะะพะฒะธัั ะดะพะบะปะฐะด ะต ััะทะดะฐะดะตะฝ ะฒ โ%sโ.\n" + +#: 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:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟัะตะดัะบะฐ" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟัะตะดัะบะฐ" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +msgid "show progress meter during object writing phase" +msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟัะตะดัะบะฐ ะฒัะฒ ัะฐะทะฐัะฐ ะฝะฐ ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต" + +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +msgid "similar to --all-progress when progress meter is shown" +msgstr "" +"ัััะพัะพ ะดะตะนััะฒะธะต ะบะฐัะพ ะพะฟัะธััะฐ โ--all-progressโ ะฟัะธ ะธะทะฒะตะถะดะฐะฝะตัะพ ะฝะฐ ะฝะฐะฟัะตะดัะบะฐ" + +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "ะฒะตััะธั ะฝะฐ ะฟัะฐัะบะฐัะฐ" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "ะะฐ ััะทะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟัะฐัะบะฐ ะต ะฝะตะพะฑั ะพะดะธะผะพ ั ัะฐะฝะธะปะธัะต." -#: builtin/bundle.c:62 +#: builtin/bundle.c:107 +msgid "do not show bundle details" +msgstr "ะฑะตะท ะฟะพะดัะพะฑะฝะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะฟัะฐัะบะธัะต" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "ะัะฐัะบะฐัะฐ โ%sโ ะต ะฝะฐัะตะด\n" + +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "ะะฐ ะฟัะธะตะผะฐะฝะตัะพ ะฝะฐ ะฟัะฐัะบะฐ ะต ะฝะตะพะฑั ะพะดะธะผะพ ั ัะฐะฝะธะปะธัะต." -#: builtin/cat-file.c:594 +#: builtin/bundle.c:171 builtin/remote.c:1687 +msgid "be verbose; must be placed before a subcommand" +msgstr "ะฟะพะฒะตัะต ะฟะพะดัะพะฑะฝะพััะธ. ะะพััะฐะฒั ัะต ะฟัะตะด ะฟะพะดะบะพะผะฐะฝะดะฐ" + +#: builtin/bundle.c:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "ะะตะฟะพะทะฝะฐัะฐ ะฟะพะดะบะพะผะฐะฝะดะฐ: %s" + +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10282,87 +11804,87 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | ะะะ | --textconv --filters) [--path=ะะชะข] ะะะะะข" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:599 msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=ะคะะ ะะะข] | --batch-check[=ะคะะ ะะะข]) [--follow-symlinks] " +"[--textconv | --filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "ะผะพะถะต ะดะฐ ัะบะฐะถะตัะต ัะฐะผะพ ะตะดะฝะฐ ะฟะฐะบะตัะฝะฐ ะพะฟัะธั" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" "ะะะัั ะผะพะถะต ะดะฐ ะต: โblobโ (BLOB), โtreeโ (ะดััะฒะพ), โcommitโ (ะฟะพะดะฐะฒะฐะฝะต), " "โtagโ (ะตัะธะบะตั)" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒะธะดะฐ ะฝะฐ ะพะฑะตะบั" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฐะทะผะตัะฐ ะฝะฐ ะพะฑะตะบั" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "ะธะทั ะพะด ั 0, ะบะพะณะฐัะพ ะฝัะผะฐ ะณัะตัะบะฐ" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "ัะพัะผะฐัะธัะฐะฝะพ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะฝะฐ ะพะฑะตะบัะฐ" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" msgstr "" "ะดะฐ ัะต ััะฐััะธัะฐ ะฟัะพะณัะฐะผะฐัะฐ ะทะฐะดะฐะดะตะฝะฐ ะฒ ะฝะฐัััะพะนะบะฐัะฐ โtextconvโ ะทะฐ ะฟัะตะพะฑัะฐะทัะฒะฐะฝะต " "ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะฝะฐ ะพะฑะตะบัะฐ-BLOB" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" msgstr "" "ะดะฐ ัะต ััะฐััะธัะฐั ะฟัะพะณัะฐะผะธัะต ะทะฐ ะฟัะตะพะฑัะฐะทัะฒะฐะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะฝะฐ ะพะฑะตะบัะธัะต-BLOB" -#: builtin/cat-file.c:644 git-submodule.sh:936 +#: builtin/cat-file.c:648 msgid "blob" msgstr "ะพะฑะตะบั-BLOB" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "ะพะฟัะธะธัะต โ--textconvโ/โ--filtersโ ะธะทะธัะบะฒะฐั ะฟัั" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:651 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะพะฟัะธะธัะต โ-sโ ะธ โ-tโ ะดะฐ ัะฐะฑะพััั ั ะฟะพะฒัะตะดะตะฝะธ ะพะฑะตะบัะธ" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "ะฑััะตัะธัะฐะฝะต ะฝะฐ ะธะทั ะพะดะฐ ะพั โ--batchโ" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:654 msgid "show info and content of objects fed from the standard input" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั ะธ ััะดััะถะฐะฝะธะต ะฝะฐ ะพะฑะตะบัะธัะต ะฟะพะดะฐะดะตะฝะธ ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะพะฑะตะบัะธัะต ะฟะพะดะฐะดะตะฝะธ ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:662 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "ัะปะตะดะฒะฐะฝะต ะฝะฐ ัะธะผะฒะพะปะฝะธัะต ะฒััะทะบะธ ัะพัะตัะธ ะฒ ะดััะฒะพัะพ (ะฟะพะปะทะฒะฐ ัะต ั โ--batchโ ะธะปะธ โ--" "batch-checkโ)" -#: builtin/cat-file.c:660 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะพะฑะตะบัะธ ั โ--batchโ ะธะปะธ โ--batch-checkโ" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "ะฑะตะท ะฟะพะดัะตะถะดะฐะฝะต ะฝะฐ ะธะทั ะพะดะฐ ะพั โ--batch-all-objectsโ" @@ -10390,8 +11912,8 @@ msgstr "ะธะทัะธัะฐะฝะต ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ัะฐะนะปะพะฒะตัะต ะพั ััะฐ msgid "terminate input and output records by a NUL character" msgstr "ัะฐะทะดะตะปัะฝะต ะฝะฐ ะฒั ะพะดะฝะธัะต ะธ ะธะทั ะพะดะฝะธัะต ะทะฐะฟะธัะธ ั ะฝัะปะตะฒะธั ะทะฝะฐะบ โNULโ" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "ะฑะตะท ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฝะฐะฟัะตะดัะบะฐ" @@ -10403,27 +11925,27 @@ msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะตััะฒะฟะฐะดะฐัะธัะต ะฟััะธัะฐ" msgid "ignore index when checking" msgstr "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ ะฟัะธ ะฟัะพะฒะตัะบะฐัะฐ" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "ะพะฟัะธััะฐ โ--stdinโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะธะผะตะฝะฐ ะฝะฐ ะฟััะธัะฐ" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "ะพะฟัะธััะฐ โ-zโ ะธะทะธัะบะฒะฐ โ--stdinโ" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝ ะฟัั" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "ะพะฟัะธััะฐ โ--quietโ ะธะทะธัะบะฒะฐ ะดะฐ ะต ะฟะพะดะฐะดะตะฝ ัะพัะฝะพ ะตะดะธะฝ ะฟัั" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "ะพะฟัะธะธัะต โ--quietโ ะธ โ--verboseโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "ะพะฟัะธััะฐ โ--non-matchingโ ะธะทะธัะบะฒะฐ โ--verboseโ" @@ -10481,9 +12003,9 @@ msgid "write the content to temporary files" msgstr "ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะฒัะฒ ะฒัะตะผะตะฝะฝะธ ัะฐะนะปะพะฒะต" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 msgid "string" msgstr "ะะะ" @@ -10511,99 +12033,99 @@ msgstr "git switch [ะะะฆะะฏโฆ] ะะะะ" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [ะะะฆะะฏโฆ] [--source=ะะะะ] ะคะะะโฆ" -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "ะฒะฐัะฐัะฐ ะฒะตััะธั ะปะธะฟัะฒะฐ ะฒ ะฟััั โ%sโ" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "ััะถะดะฐัะฐ ะฒะตััะธั ะปะธะฟัะฒะฐ ะฒ ะฟััั โ%sโ" -#: builtin/checkout.c:190 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "ะฝัะบะพั ะพั ะฝะตะพะฑั ะพะดะธะผะธัะต ะฒะตััะธะธ ะปะธะฟัะฒะฐ ะฒ ะฟััั โ%sโ" -#: builtin/checkout.c:240 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "ะฝัะบะพั ะพั ะฝะตะพะฑั ะพะดะธะผะธัะต ะฒะตััะธะธ ะปะธะฟัะฒะฐ ะฒ ะฟััั โ%sโ" -#: builtin/checkout.c:258 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "ะฟัััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ัะปัะฝ" -#: builtin/checkout.c:274 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "ะ ะตะทัะปัะฐััั ะทะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ัะปัะฝ" -#: builtin/checkout.c:374 +#: builtin/checkout.c:396 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "ะัะตััะทะดะฐะดะตะฝ ะต %d ะบะพะฝัะปะธะบั ะฟัะธ ัะปะธะฒะฐะฝะต" msgstr[1] "ะัะตััะทะดะฐะดะตะฝะธ ัะฐ %d ะบะพะฝัะปะธะบัะฐ ะฟัะธ ัะปะธะฒะฐะฝะต" -#: builtin/checkout.c:379 +#: builtin/checkout.c:401 #, 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:386 +#: builtin/checkout.c:408 #, 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:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "ะพะฟัะธััะฐ โ%sโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะพะฑะฝะพะฒัะฒะฐะฝะตัะพ ะฝะฐ ะฟััะธัะฐ" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "ะพะฟัะธััะฐ โ%sโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั โ%sโ" -#: builtin/checkout.c:429 +#: builtin/checkout.c:451 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "ะะตะฒัะทะผะพะถะฝะพ ะต ะตะดะฝะพะฒัะตะผะตะฝะฝะพ ะดะฐ ะพะฑะฝะพะฒัะฒะฐัะต ะฟััะธัะฐ ะธ ะดะฐ ะฟัะตะผะธะฝะตัะต ะบัะผ ะบะปะพะฝะฐ โ%sโ." -#: builtin/checkout.c:433 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ะฝะต ะต ัะบะฐะทะฐะฝะพ ะฝะธัะพ โ%sโ, ะฝะธัะพ โ%sโ" -#: builtin/checkout.c:437 +#: builtin/checkout.c:459 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "ะพะฟัะธััะฐ โ%sโ ะต ะทะฐะดัะปะถะธัะตะปะฝะฐ, ะบะพะณะฐัะพ โ%sโ ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "ะพะฟัะธััะฐ โ%3$sโ ะต ะฝะตััะฒะผะตััะธะผะฐ ะบะฐะบัะพ ั โ%1$sโ, ัะฐะบะฐ ะธ ั โ%2$sโ" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:528 builtin/checkout.c:535 #, c-format msgid "path '%s' is unmerged" msgstr "ะฟัััั โ%sโ ะฝะต ะต ัะปัั" -#: builtin/checkout.c:679 +#: builtin/checkout.c:703 msgid "you need to resolve your current index first" msgstr "ะฟััะฒะพ ัััะฑะฒะฐ ะดะฐ ะบะพัะธะณะธัะฐัะต ะธะฝะดะตะบัะฐ ัะธ" -#: builtin/checkout.c:729 +#: builtin/checkout.c:757 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10613,55 +12135,50 @@ msgstr "" "ะธะฝะดะตะบัะฐ:\n" "%s" -#: builtin/checkout.c:736 -#, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "ะปะพะบะฐะปะฝะธัะต ะฟัะพะผะตะฝะธ ะฒ ัะตะทะธ ัะฐะนะปะพะฒะต ัะต ัะต ะฟัะตะทะฐะฟะธัะฐั: %s" - -#: builtin/checkout.c:833 +#: builtin/checkout.c:853 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "ะััะฝะฐะปัั ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะทะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะพัะปะตะดะธ: %s\n" -#: builtin/checkout.c:875 +#: builtin/checkout.c:895 msgid "HEAD is now at" msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะฒ ะผะพะผะตะฝัะฐ ัะพัะธ ะบัะผ" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:899 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ" -#: builtin/checkout.c:883 +#: builtin/checkout.c:903 #, c-format msgid "Reset branch '%s'\n" msgstr "ะะฐะฝัะปัะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะฐ โ%sโ\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:906 #, c-format msgid "Already on '%s'\n" msgstr "ะะตัะต ััะต ะฝะฐ โ%sโ\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:910 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "ะัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ ะบะปะพะฝะฐ โ%sโ ะธ ะทะฐะฝัะปัะฒะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:912 builtin/checkout.c:1338 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "ะัะตะผะธะฝะฐั ัะต ะบัะผ ะฝะพะฒะธั ะบะปะพะฝ โ%sโ\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:914 #, c-format msgid "Switched to branch '%s'\n" msgstr "ะัะตะผะธะฝะฐั ัะต ะบัะผ ะบะปะพะฝะฐ โ%sโ\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:965 #, c-format msgid " ... and %d more.\n" msgstr "โฆ ะธ ะพัะต %d.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:971 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10683,7 +12200,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:990 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10710,28 +12227,19 @@ msgstr[1] "" " git branch ะะะ_ะะ_ะะะะะฏ_ะะะะ %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1025 msgid "internal error in revision walk" msgstr "ะฒัััะตัะฝะฐ ะณัะตัะบะฐ ะฟัะธ ะพะฑั ะพะถะดะฐะฝะตัะพ ะฝะฐ ะฒะตััะธะธัะต" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1029 msgid "Previous HEAD position was" msgstr "ะัะตะดะธ ัะพะฒะฐ โHEADโ ัะพัะตัะต ะบัะผ" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1069 builtin/checkout.c:1333 msgid "You are on a branch yet to be born" msgstr "ะ ะผะพะผะตะฝัะฐ ััะต ะฝะฐ ะบะปะพะฝ, ะบะพะนัะพ ะฒัะต ะพัะต ะฝะต ะต ััะทะดะฐะดะตะฝ" -#: 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 +#: builtin/checkout.c:1146 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10740,37 +12248,73 @@ msgstr "" "โ%sโ ะผะพะถะต ะดะฐ ะต ะบะฐะบัะพ ะปะพะบะฐะปะตะฝ ัะฐะนะป, ัะฐะบะฐ ะธ ัะปะตะดัั ะบะปะพะฝ. ะะฐ ััะพัะฝัะฒะฐะฝะต\n" "ะฟะพะปะทะฒะฐะนัะต ัะฐะทะดะตะปะธัะตะปั โ--โ (ะธ ะตะฒะตะฝััะฐะปะฝะพ ะพะฟัะธััะฐ โ--no-guessโ)" -#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1153 +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:1163 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "โ%sโ ะฝะฐะฟะฐัะฒะฐ ั ะผะฝะพะถะตััะฒะพ (%d) ะพัะดะฐะปะตัะตะฝะธ ะบะปะพะฝะธ" + +#: builtin/checkout.c:1229 +msgid "only one reference expected" +msgstr "ะพัะฐะบะฒะฐ ัะต ัะฐะผะพ ะตะดะธะฝ ัะบะฐะทะฐัะตะป" + +#: builtin/checkout.c:1246 +#, c-format +msgid "only one reference expected, %d given." +msgstr "ะพัะฐะบะฒะฐ ัะต ะตะดะธะฝ ัะบะฐะทะฐัะตะป, ะฐ ััะต ะฟะพะดะฐะปะธ %d." + +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะบะฐะทะฐัะตะป: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1305 builtin/checkout.c:1671 #, c-format msgid "reference is not a tree: %s" msgstr "ัะบะฐะทะฐัะตะปัั ะฝะต ัะพัะธ ะบัะผ ะพะฑะตะบั-ะดััะฒะพ: %s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1352 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "ะพัะฐะบะฒะฐ ัะต ะบะปะพะฝ, ะฐ ะฝะต ะตัะธะบะตั โ โ%sโ" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1354 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "ะพัะฐะบะฒะฐ ัะต ะปะพะบะฐะปะตะฝ, ะฐ ะฝะต ะพัะดะฐะปะตัะตะฝ ะบะปะพะฝ โ โ%sโ" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1355 builtin/checkout.c:1363 #, c-format msgid "a branch is expected, got '%s'" msgstr "ะพัะฐะบะฒะฐ ัะต ะบะปะพะฝ, ะฐ ะฝะต โ%sโ" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1358 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "ะพัะฐะบะฒะฐ ัะต ะบะปะพะฝ, ะฐ ะฝะต ะฟะพะดะฐะฒะฐะฝะต โ โ%sโ" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1374 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10778,7 +12322,7 @@ msgstr "" "ะฟะพ ะฒัะตะผะต ะฝะฐ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฟัะตะผะธะฝะตัะต ะบัะผ ะดััะณ ะบะปะพะฝ.\n" "ะัะพะฑะฒะฐะนัะต ั โgit merge --quitโ ะธะปะธ โgit worktree addโ." -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1378 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -10787,7 +12331,7 @@ msgstr "" "ะบะปะพะฝ.\n" "ะัะพะฑะฒะฐะนัะต ั โgit am --quitโ ะธะปะธ โgit worktree addโ." -#: builtin/checkout.c:1333 +#: builtin/checkout.c:1382 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10795,7 +12339,7 @@ msgstr "" "ะฟะพ ะฒัะตะผะต ะฝะฐ ะฟัะตะฑะฐะทะธัะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฟัะตะผะธะฝะตัะต ะบัะผ ะดััะณ ะบะปะพะฝ.\n" "ะัะพะฑะฒะฐะนัะต ั โgit rebase --quitโ ะธะปะธ โgit worktree addโ." -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1386 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10803,7 +12347,7 @@ msgstr "" "ะฟะพ ะฒัะตะผะต ะฝะฐ ะพัะฑะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั ะฝะต ะผะพะถะต ะดะฐ ะฟัะตะผะธะฝะตัะต ะบัะผ ะดััะณ ะบะปะพะฝ.\n" "ะัะพะฑะฒะฐะนัะต ั โgit cherry-pick --quitโ ะธะปะธ โgit worktree addโ." -#: builtin/checkout.c:1341 +#: builtin/checkout.c:1390 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10811,139 +12355,146 @@ msgstr "" "ะฟะพ ะฒัะตะผะต ะฝะฐ ะพัะผัะฝะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั ะฝะต ะผะพะถะต ะดะฐ ะฟัะตะผะธะฝะตัะต ะบัะผ ะดััะณ ะบะปะพะฝ.\n" "ะัะพะฑะฒะฐะนัะต ั โgit revert --quitโ ะธะปะธ โgit worktree addโ." -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1394 msgid "you are switching branch while bisecting" msgstr "ะฟัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ ะดััะณ ะบะปะพะฝ ะฟะพ ะฒัะตะผะต ะฝะฐ ะดะฒะพะธัะฝะพ ััััะตะฝะต" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1401 msgid "paths cannot be used with switching branches" msgstr "ะทะฐะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟัั ะต ะฝะตััะฒะผะตััะธะผะพ ั ะฟัะตะผะธะฝะฐะฒะฐะฝะตัะพ ะพั ะตะดะธะฝ ะบะปะพะฝ ะบัะผ ะดััะณ" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "ะพะฟัะธััะฐ โ%sโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะฟัะตะผะธะฝะฐะฒะฐะฝะตัะพ ะพั ะตะดะธะฝ ะบะปะพะฝ ะบัะผ ะดััะณ" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "ะพะฟัะธััะฐ โ%sโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั โ%sโ" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1429 #, c-format msgid "'%s' cannot take <start-point>" msgstr "ะพะฟัะธััะฐ โ%sโ ะต ะฝะตััะฒะผะตััะธะผะฐ ััั ะทะฐะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะะะงะะะ" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1437 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" "ะะฐ ะดะฐ ะฟัะตะผะธะฝะตัะต ะบัะผ ะบะปะพะฝ, ะฟะพะดะฐะนัะต ัะบะฐะทะฐัะตะป, ะบะพะนัะพ ัะพัะธ ะบัะผ ะฟะพะดะฐะฒะฐะฝะต. โ%sโ " "ะฝะต ะต ัะฐะบัะฒ" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1444 msgid "missing branch or commit argument" msgstr "ะปะธะฟัะฒะฐ ะฐัะณัะผะตะฝั โ ะบะปะพะฝ ะธะปะธ ะฟะพะดะฐะฒะฐะฝะต" -#: 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 +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 msgid "force progress reporting" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟัะตะดัะบะฐ" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1487 msgid "perform a 3-way merge with the new branch" msgstr "ะธะทะฒัััะฒะฐะฝะต ะฝะฐ ััะพะนะฝะพ ัะปะธะฒะฐะฝะต ั ะฝะพะฒะธั ะบะปะพะฝ" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 msgid "style" msgstr "ะกะขะะ" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1489 msgid "conflict style (merge or diff3)" msgstr "ะดะตะนััะฒะธะต ะฟัะธ ะบะพะฝัะปะธะบั (ัะปะธะฒะฐะฝะต ะธะปะธ ััะพะนะฝะฐ ัะฐะทะปะธะบะฐ)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1501 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "ะพัะดะตะปัะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปั โHEADโ ะบัะผ ัะบะฐะทะฐะฝะพัะพ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1502 msgid "set upstream info for new branch" msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะบะพะน ะบะปะพะฝ ะฑะธะฒะฐ ัะปะตะดะตะฝ ะฟัะธ ััะทะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฝะพะฒะธั ะบะปะพะฝ" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1504 msgid "force checkout (throw away local modifications)" msgstr "ะฟัะธะฝัะดะธัะตะปะฝะพ ะธะทัะตะณะปัะฝะต (ะฒะฐัะธัะต ะฟัะพะผะตะฝะธ ัะต ะฑัะดะฐั ะทะฐะฝัะปะตะฝะธ)" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new-branch" msgstr "ะะะ_ะะะะ" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new unparented branch" msgstr "ะฝะพะฒ ะบะปะพะฝ ะฑะตะท ัะพะดะธัะตะป" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1508 builtin/merge.c:291 msgid "update ignored files (default)" msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะณะฝะพัะธัะฐะฝะธัะต ัะฐะนะปะพะฒะต (ััะฐะฝะดะฐััะฝะพ)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1511 msgid "do not check if another worktree is holding the given ref" msgstr "ะฑะตะท ะฟัะพะฒะตัะบะฐ ะดะฐะปะธ ะดััะณะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ ะดััะถะธ ัะบะฐะทะฐัะตะปั" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1524 msgid "checkout our version for unmerged files" msgstr "ะธะทัะตะณะปัะฝะต ะฝะฐ ะฒะฐัะฐัะฐ ะฒะตััะธั ะฝะฐ ะฝะตัะปะตัะธัะต ัะฐะนะปะพะฒะต" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1527 msgid "checkout their version for unmerged files" msgstr "ะธะทัะตะณะปัะฝะต ะฝะฐ ััะถะดะฐัะฐ ะฒะตััะธั ะฝะฐ ะฝะตัะปะตัะธัะต ัะฐะนะปะพะฒะต" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1531 msgid "do not limit pathspecs to sparse entries only" msgstr "ะฑะตะท ะพะณัะฐะฝะธัะฐะฒะฐะฝะต ะฝะฐ ะธะทะฑัะพะตะฝะธัะต ะฟััะธัะฐ ัะฐะผะพ ะดะพ ัะฐััะธัะฝะพ ะธะทัะตะณะปะตะฝะธัะต" -#: builtin/checkout.c:1533 -msgid "-b, -B and --orphan are mutually exclusive" -msgstr "ะะฟัะธะธัะต โ-bโ, โ-Bโ ะธ โ--orphanโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ะตะดะฝะฐ ั ะดััะณะฐ" +#: builtin/checkout.c:1586 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "ะะฟัะธะธัะต โ-%cโ, โ-%cโ ะธ โ--orphanโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ะตะดะฝะฐ ั ะดััะณะฐ" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1590 msgid "-p and --overlay are mutually exclusive" msgstr "ะพะฟัะธะธัะต โ-pโ ะธ โ--overlayโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1627 msgid "--track needs a branch name" msgstr "ะพะฟัะธััะฐ โ--trackโ ะธะทะธัะบะฒะฐ ะธะผะต ะฝะฐ ะบะปะพะฝ" -#: builtin/checkout.c:1578 -msgid "missing branch name; try -b" -msgstr "ะปะธะฟัะฒะฐ ะธะผะต ะฝะฐ ะบะปะพะฝ, ะธะทะฟะพะปะทะฒะฐะนัะต ะพะฟัะธััะฐ โ-bโ" +#: builtin/checkout.c:1632 +#, c-format +msgid "missing branch name; try -%c" +msgstr "ะปะธะฟัะฒะฐ ะธะผะต ะฝะฐ ะบะปะพะฝ, ะธะทะฟะพะปะทะฒะฐะนัะต ะพะฟัะธััะฐ โ-%cโ" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1664 #, c-format msgid "could not resolve %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธั" -#: builtin/checkout.c:1623 -msgid "you must specify path(s) to restore" -msgstr "ัััะฑะฒะฐ ะดะฐ ัะบะฐะถะตัะต ะฟะพะฝะต ะตะดะธะฝ ะฟัั ะทะฐ ะฒัะทััะฐะฝะพะฒัะฒะฐะฝะต" - -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1680 msgid "invalid path specification" msgstr "ัะบะฐะทะฐะฝ ะต ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟัั" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1687 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "โ%sโ ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต, ะทะฐัะพะฒะฐ ะพั ะฝะตะณะพ ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะบะปะพะฝ โ%sโ" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1691 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: ะพะฟัะธััะฐ โ--detachโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝั-ะฟัั โ%sโ" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1700 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "ะพะฟัะธะธัะต โ--pathspec-from-fileโ ะธ โ--detachโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "ะพะฟัะธะธัะต โ--pathspec-from-fileโ ะธ โ--patchโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/checkout.c:1716 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10951,138 +12502,113 @@ msgstr "" "git checkout: ะพะฟัะธะธัะต โ--oursโ/โ--theirsโ, โ--forceโ ะธ โ--mergeโ\n" "ัะฐ ะฝะตััะฒะผะตััะธะผะธ ั ะธะทัะตะณะปัะฝะต ะพั ะธะฝะดะตะบัะฐ." -#: 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:1721 +msgid "you must specify path(s) to restore" +msgstr "ัััะฑะฒะฐ ะดะฐ ัะบะฐะถะตัะต ะฟะพะฝะต ะตะดะธะฝ ะฟัั ะทะฐ ะฒัะทััะฐะฝะพะฒัะฒะฐะฝะต" -#: 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 +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 msgid "branch" msgstr "ะบะปะพะฝ" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1748 msgid "create and checkout a new branch" msgstr "ััะทะดะฐะฒะฐะฝะต ะธ ะฟัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ ะฝะพะฒ ะบะปะพะฝ" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1750 msgid "create/reset and checkout a branch" msgstr "ััะทะดะฐะฒะฐะฝะต/ะทะฐะฝัะปัะฒะฐะฝะต ะฝะฐ ะบะปะพะฝ ะธ ะฟัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ ะฝะตะณะพ" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1751 msgid "create reflog for new branch" msgstr "ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะถััะฝะฐะป ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะทะฐ ะฝะพะฒ ะบะปะพะฝ" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1753 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" "ะพะฟะธั ะทะฐ ะพัะณะฐัะฒะฐะฝะต ะฝะฐ ะธะผะต ะฝะฐ ะบะปะพะฝ ัะปะตะด ะฝะตััะฟะตัะตะฝ ะพะฟะธั ั โgit checkout " "ะะะกะชะฉะะกะขะะฃะะะฉ_ะะะะโ (ััะฐะฝะดะฐััะฝะพ)" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1754 msgid "use overlay mode (default)" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฟัะธะฟะพะบัะธะฒะฐั ัะตะถะธะผ (ััะฐะฝะดะฐััะฝะพ)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1799 msgid "create and switch to a new branch" msgstr "ััะทะดะฐะฒะฐะฝะต ะธ ะฟัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ ะฝะพะฒ ะบะปะพะฝ" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1801 msgid "create/reset and switch to a branch" msgstr "ััะทะดะฐะฒะฐะฝะต/ะทะฐะฝัะปัะฒะฐะฝะต ะฝะฐ ะบะปะพะฝ ะธ ะฟัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ ะฝะตะณะพ" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1803 msgid "second guess 'git switch <no-such-branch>'" msgstr "" "ะพะฟะธั ะทะฐ ะพัะณะฐัะฒะฐะฝะต ะฝะฐ ะธะผะต ะฝะฐ ะบะปะพะฝ ัะปะตะด ะฝะตััะฟะตัะตะฝ ะพะฟะธั ั โgit switch " "ะะะกะชะฉะะกะขะะฃะะะฉ_ะะะะโ" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1805 msgid "throw away local modifications" msgstr "ะทะฐะฝัะปัะฒะฐะฝะต ะฝะฐ ะปะพะบะฐะปะฝะธัะต ะฟัะพะผะตะฝะธ" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1839 msgid "which tree-ish to checkout from" msgstr "ะบัะผ ะบะพะน ัะบะฐะทะฐัะตะป ะบัะผ ะดััะฒะพ ะดะฐ ัะต ะฟัะตะผะธะฝะต" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1841 msgid "restore the index" msgstr "ะฒัะทััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1843 msgid "restore the working tree (default)" msgstr "ะฒัะทััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ (ััะฐะฝะดะฐััะฝะพ)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1845 msgid "ignore unmerged entries" msgstr "ะฟัะตะฝะตะฑัะตะณะฒะฐะฝะต ะฝะฐ ะฝะตัะปะตัะธัะต ะตะปะตะผะตะฝัะธ" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1846 msgid "use overlay mode" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฟัะธะฟะพะบัะธะฒะฐั ัะตะถะธะผ" -#: builtin/clean.c:28 +#: builtin/clean.c:29 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 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "ะะทััะธะฒะฐะฝะต ะฝะฐ โ%sโ\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "ะคะฐะนะปัั โ%sโ ัะต ะฑัะดะต ะธะทััะธั\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "ะัะตัะบะฐัะฐะฝะต ะฝะฐ ั ัะฐะฝะธะปะธัะตัะพ โ%sโ\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "ะฅัะฐะฝะธะปะธัะตัะพ โ%sโ ัะต ะฑัะดะต ะฟัะตัะบะพัะตะฝะพ\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปััะธ ะธะฝัะพัะผะฐัะธั ััะตะท โlstatโ ะทะฐ โ%sโ\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -11095,7 +12621,7 @@ msgstr "" "ะะ ะะคะะะก โ ะธะทะฑะพั ะฝะฐ ะตะดะธะฝััะฒะตะฝ ะพะฑะตะบั ะฟะพ ัะพะทะธ ัะฝะธะบะฐะปะตะฝ ะฟัะตัะธะบั\n" " โ (ะฟัะฐะทะฝะพ) ะฝะธัะพ ะดะฐ ะฝะต ัะต ะธะทะฑะธัะฐ\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -11116,39 +12642,33 @@ msgstr "" "* โ ะธะทะฑะธัะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะพะฑะตะบัะธ\n" " โ (ะฟัะฐะทะฝะพ) ะทะฐะฒัััะฒะฐะฝะต ะฝะฐ ะธะทะฑะธัะฐะฝะตัะพ\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: 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:662 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "ะจะฐะฑะปะพะฝะธ ะทะฐ ะธะณะฝะพัะธัะฐะฝะธ ะตะปะตะผะตะฝัะธโซ " -#: builtin/clean.c:699 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ะะ ะะะฃะะ ะะะะะะะ: ะะธะบะพะน ะพะฑะตะบั ะฝะต ะฝะฐะฟะฐัะฒะฐ ะฝะฐ โ%sโ" -#: builtin/clean.c:720 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "ะะทะฑะธัะฐะฝะต ะฝะฐ ะพะฑะตะบัะธ ะทะฐ ะธะทััะธะฒะฐะฝะต" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "ะะฐ ัะต ะธะทััะธะต ะปะธ โ%sโ? โyโ โ ะดะฐ, โNโ โ ะะ" -# -#: builtin/clean.c:786 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "ะะทั ะพะด.\n" - -#: builtin/clean.c:794 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11166,64 +12686,52 @@ msgstr "" "help โ ัะพะทะธ ะบัะฐะน\n" "? โ ะฟะพะดัะบะฐะทะบะฐ ะทะฐ ัะฐะฑะปะพะฝะธัะต" -#: 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 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "ะกะปะตะดะฝะธัั ะพะฑะตะบั ัะต ะฑัะดะต ะธะทััะธั:" msgstr[1] "ะกะปะตะดะฝะธัะต ะพะฑะตะบัะธ ัะต ะฑัะดะฐั ะธะทััะธัะธ:" -#: builtin/clean.c:846 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "ะคะฐะนะปะพะฒะตัะต ะทะฐ ะธะทัะธััะฒะฐะฝะต ัะฒัััะธั ะฐ. ะะทั ะพะด ะพั ะฟัะพะณัะฐะผะฐัะฐ." -#: builtin/clean.c:908 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ัะฐะนะปะพะฒะตัะต, ะบะพะธัะพ ัะต ะฑัะดะฐั ะธะทััะธัะธ" -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "force" msgstr "ะฟัะธะฝัะดะธัะตะปะฝะพ ะธะทััะธะฒะฐะฝะต" -#: builtin/clean.c:911 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "ะธะฝัะตัะฐะบัะธะฒะฝะพ ะธะทััะธะฒะฐะฝะต" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ ัะตะปะธ ะดะธัะตะบัะพัะธะธ" -#: 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/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "ะจะะะะะ" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะจะะะะะ ะพั ัะฐะนะปะพะฒะต, ะบะพะธัะพ ะดะฐ ะฝะต ัะต ััะธัั" -#: builtin/clean.c:916 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "ะธะทััะธะฒะฐะฝะต ะธ ะฝะฐ ะธะณะฝะพัะธัะฐะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "ะธะทััะธะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะณะฝะพัะธัะฐะฝะธ ัะฐะนะปะพะฒะต" -#: builtin/clean.c:936 -msgid "-x and -X cannot be used together" -msgstr "ะพะฟัะธะธัะต โ-xโ ะธ โ-Xโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" - -#: builtin/clean.c:940 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11231,7 +12739,7 @@ msgstr "" "ะะฐัััะพะนะบะฐัะฐ โclean.requireForceโ ะต ะทะฐะดะฐะดะตะฝะฐ ะบะฐัะพ ะธััะธะฝะฐ, ะบะพะตัะพ ะธะทะธัะบะฒะฐ ะฝัะบะพั " "ะพั ะพะฟัะธะธัะต โ-iโ, โ-nโ ะธะปะธ โ-fโ. ะัะผะฐ ะดะฐ ัะต ะธะทะฒัััะธ ะธะทัะธััะฒะฐะฝะต" -#: builtin/clean.c:943 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11240,7 +12748,11 @@ msgstr "" "ะบะพะตัะพ ะธะทะธัะบะฒะฐ ะฝัะบะพั ะพั ะพะฟัะธะธัะต โ-iโ, โ-nโ ะธะปะธ โ-fโ. ะัะผะฐ ะดะฐ ัะต ะธะทะฒัััะธ " "ะธะทัะธััะฒะฐะฝะต" -#: builtin/clone.c:46 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "ะพะฟัะธะธัะต โ-xโ ะธ โ-Xโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [ะะะฆะะฏโฆ] [--] ะฅะ ะะะะะะฉะ [ะะะ ะะะขะะ ะะฏ]" @@ -11248,7 +12760,7 @@ msgstr "git clone [ะะะฆะะฏโฆ] [--] ะฅะ ะะะะะะฉะ [ะะะ ะะะขะะ ะะฏ] msgid "don't create a checkout" msgstr "ะฑะตะท ััะทะดะฐะฒะฐะฝะต ะฝะฐ ัะฐะฑะพัะฝะพ ะดััะฒะพ" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 msgid "create a bare repository" msgstr "ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะณะพะปะพ ั ัะฐะฝะธะปะธัะต" @@ -11269,11 +12781,11 @@ msgstr "ะฑะตะท ัะฒััะดะธ ะฒััะทะบะธ, ัะฐะนะปะพะฒะตัะต ะฒะธะฝะฐะณะธ ะดะฐ ั msgid "setup as shared repository" msgstr "ะฝะฐัััะพะนะฒะฐะฝะต ะทะฐ ัะฟะพะดะตะปะตะฝะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "ะฟัั" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "ะธะฝะธัะธะฐะปะธะทะธัะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะธัะต ะฟัะธ ัะพะฒะฐ ะบะปะพะฝะธัะฐะฝะต" @@ -11281,26 +12793,26 @@ msgstr "ะธะฝะธัะธะฐะปะธะทะธัะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะธัะต ะฟัะธ ัะพะฒะฐ msgid "number of submodules cloned in parallel" msgstr "ะฑัะพะน ะฟะพะดะผะพะดัะปะธ, ะบะปะพะฝะธัะฐะฝะธ ะฟะฐัะฐะปะตะปะฝะพ" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:550 msgid "template-directory" msgstr "ะดะธัะตะบัะพัะธั ั ัะฐะฑะปะพะฝะธ" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:551 msgid "directory from which templates will be used" msgstr "ะดะธัะตะบัะพัะธั, ะบะพััะพ ััะดััะถะฐ ัะฐะฑะปะพะฝะธัะต, ะบะพะธัะพ ะดะฐ ัะต ะฟะพะปะทะฒะฐั" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "ะตัะฐะปะพะฝะฝะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 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:3314 builtin/repack.c:319 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 msgid "name" msgstr "ะะะ" @@ -11316,8 +12828,8 @@ msgstr "ะธะทัะตะณะปัะฝะต ะฝะฐ ัะพะทะธ ะะะะ, ะฐ ะฝะต ัะพัะตะฝะธัั ะพั msgid "path to git-upload-pack on the remote" msgstr "ะฟัั ะบัะผ ะบะพะผะฐะฝะดะฐัะฐ โgit-upload-packโ ะฝะฐ ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/pull.c:208 msgid "depth" msgstr "ะะชะะะะงะะะ" @@ -11325,7 +12837,8 @@ msgstr "ะะชะะะะงะะะ" msgid "create a shallow clone of that depth" msgstr "ะฟะปะธัะบะพ ะบะปะพะฝะธัะฐะฝะต ะดะพ ัะฐะทะธ ะะชะะะะงะะะ" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 msgid "time" msgstr "ะะ ะะะ" @@ -11333,16 +12846,17 @@ msgstr "ะะ ะะะ" msgid "create a shallow clone since a specific time" msgstr "ะฟะปะธัะบะพ ะบะปะพะฝะธัะฐะฝะต ะดะพ ะผะพะผะตะฝั ะฒัะฒ ะฒัะตะผะตัะพ" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 msgid "revision" msgstr "ะะะ ะกะะฏ" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "ะทะฐะดัะปะฑะพัะฐะฒะฐะฝะต ะฝะฐ ะธััะพัะธััะฐ ะฝะฐ ะฟะปะธัะบะพ ั ัะฐะฝะธะปะธัะต ะดะพ ะธะทะบะปััะฒะฐั ัะบะฐะทะฐัะตะป" -#: builtin/clone.c:132 +#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "" "ะบะปะพะฝะธัะฐะฝะต ัะฐะผะพ ะฝะฐ ะตะดะธะฝ ะบะปะพะฝ โ ะธะปะธ ัะพัะตะฝะธั ะพั ะพัะดะฐะปะตัะตะฝะธั โHEADโ, ะธะปะธ ะธะทัะธัะฝะพ " @@ -11357,11 +12871,11 @@ msgstr "" msgid "any cloned submodules will be shallow" msgstr "ะฒัะธัะบะธ ะบะปะพะฝะธัะฐะฝะธ ะฟะพะดะผะพะดัะปะธ ัะต ัะฐ ะฟะปะธัะบะธ" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:559 msgid "gitdir" msgstr "ะกะะฃะะะะะ_ะะะ ะะะขะะ ะะฏ" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "ะพัะดะตะปะฝะฐ ะกะะฃะะะะะ_ะะะ ะะะขะะ ะะฏ ะทะฐ git ะธะทะฒัะฝ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" @@ -11373,23 +12887,23 @@ msgstr "ะะะฎะง=ะกะขะะะะะกะข" msgid "set config inside the new repository" msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะฝะฐัััะพะนะบะธัะต ะฝะฐ ะฝะพะฒะพัะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 msgid "server-specific" msgstr "ัะฟะตัะธัะธัะฝะธ ะทะฐ ัััะฒััะฐ" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 msgid "option to transmit" msgstr "ะพะฟัะธั ะทะฐ ะฟัะตะฝะพั" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 msgid "use IPv4 addresses only" msgstr "ัะฐะผะพ ะฐะดัะตัะธ IPv4" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 msgid "use IPv6 addresses only" msgstr "ัะฐะผะพ ะฐะดัะตัะธ IPv6" @@ -11397,7 +12911,13 @@ msgstr "ัะฐะผะพ ะฐะดัะตัะธ IPv6" msgid "any cloned submodules will use their remote-tracking branch" msgstr "ะฒัะธัะบะธ ะบะปะพะฝะธัะฐะฝะธ ะฟะพะดะผะพะดัะปะธ ัะต ะฟะพะปะทะฒะฐั ัะปะตะดััะธัะต ัะธ ะบะปะพะฝะธ" -#: builtin/clone.c:285 +#: builtin/clone.c:151 +msgid "initialize sparse-checkout file to include only files at root" +msgstr "" +"ะธะฝะธัะธะฐะปะธะทะธัะฐะฝะต ะฝะฐ ัะฐะนะปะฐ ะทะฐ ัะฐััะธัะฝะพ ะธะทัะตะณะปัะฝะต (โ.git/info/sparse-checkoutโ) " +"ะดะฐ ััะดััะถะฐ ัะฐะผะพ ัะฐะนะปะพะฒะตัะต ะฒ ะพัะฝะพะฒะฝะฐัะฐ ะดะธัะตะบัะพัะธั" + +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11405,43 +12925,43 @@ msgstr "" "ะะผะตัะพ ะฝะฐ ะดะธัะตะบัะพัะธััะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะณะฐัะฝะฐัะพ.\n" "ะะฐะดะฐะนัะต ะดะธัะตะบัะพัะธััะฐ ะธะทัะธัะฝะพ ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ัะตะด" -#: builtin/clone.c:338 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" "ะะ ะะะฃะะ ะะะะะะะ: ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพะฑะฐะฒะธ ะฐะปัะตัะฝะฐัะธะฒะตะฝ ะธะทัะพัะฝะธะบ ะฝะฐ โ%sโ: %s\n" -#: builtin/clone.c:411 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "โ%sโ ัััะตััะฒัะฒะฐ ะธ ะฝะต ะต ะดะธัะตะบัะพัะธั" -#: builtin/clone.c:428 +#: builtin/clone.c:431 #, c-format msgid "failed to start iterator over '%s'" msgstr "ะฝะตััะฟะตัะฝะพ ะธัะตัะธัะฐะฝะต ะฟะพ โ%sโ" -#: builtin/clone.c:458 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "ะฒััะทะบะฐัะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝะฐ" -#: builtin/clone.c:462 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "ัะฐะนะปัั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะบะพะฟะธัะฐะฝ ะบะฐัะพ โ%sโ" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "ะฝะตััะฟะตัะฝะพ ะธัะตัะธัะฐะฝะต ะฟะพ โ%sโ" -#: builtin/clone.c:492 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "ะดะตะนััะฒะธะตัะพ ะทะฐะฒัััะธ.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:512 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11454,99 +12974,108 @@ msgstr "" "\n" " git restore --source=HEAD :/\n" -#: builtin/clone.c:583 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" "ะะปะพะฝัั โ%sโ ะพั ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต, ะบะพะตัะพ ะบะปะพะฝะธัะฐัะต,\n" "ะธ ะบะพะนัะพ ัะปะตะดะฒะฐ ะดะฐ ะฑัะดะต ะธะทัะตะณะปะตะฝ, ะฝะต ัััะตััะฒัะฒะฐ." -#: builtin/clone.c:702 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "ะพะฑะตะบััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ" -#: builtin/clone.c:752 +#: builtin/clone.c:756 +msgid "failed to initialize sparse-checkout" +msgstr "ัะฐััะธัะฝะพัะพ ะธะทัะตะณะปัะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะฝะธัะธะฐะปะธะทะธัะฐ" + +#: builtin/clone.c:779 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "ัะบะฐะทะฐัะตะปัั โHEADโ ะพั ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต ัะพัะธ ะบัะผ ะฝะตัะพ,\n" "ะบะพะตัะพ ะฝะต ัััะตััะฒัะฒะฐ. ะะต ะผะพะถะต ะดะฐ ัะต ะธะทัะตะณะปะธ ะพะฟัะตะดะตะปะตะฝ ะบะปะพะฝ.\n" -#: builtin/clone.c:783 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะดะณะพัะฒะตะฝะพ" -#: builtin/clone.c:833 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "ะฝะฐัััะพะนะบะธัะต ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะทะฐะฟะธัะฐะฝะธ ะฒ ะบะพะฝัะธะณััะฐัะธะพะฝะฝะธั ัะฐะนะป" -#: builtin/clone.c:896 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัััะธ ะฟะฐะบะตัะธัะฐะฝะต ะทะฐ ะธะทัะธััะฒะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะตัะต" -#: builtin/clone.c:898 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "ะฒัะตะผะตะฝะฝะธัั ัะฐะนะป ะทะฐ ะฐะปัะตัะฝะฐัะธะฒะฝะธ ะพะฑะตะบัะธ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:970 builtin/receive-pack.c:2434 msgid "Too many arguments." msgstr "ะัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฐัะณัะผะตะฝัะธ." -#: builtin/clone.c:942 +#: builtin/clone.c:974 msgid "You must specify a repository to clone." msgstr "ะขััะฑะฒะฐ ะดะฐ ัะบะฐะถะตัะต ะบะพะต ั ัะฐะฝะธะปะธัะต ะธัะบะฐัะต ะดะฐ ะบะปะพะฝะธัะฐัะต." -#: builtin/clone.c:955 +#: builtin/clone.c:987 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "ะพะฟัะธะธัะต โ--bareโ ะธ โ--origin %sโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ." -#: builtin/clone.c:958 +#: builtin/clone.c:990 msgid "--bare and --separate-git-dir are incompatible." msgstr "ะพะฟัะธะธัะต โ--bareโ ะธ โ--separate-git-dirโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ." -#: builtin/clone.c:971 +#: builtin/clone.c:1006 #, c-format msgid "repository '%s' does not exist" msgstr "ะฝะต ัััะตััะฒัะฒะฐ ั ัะฐะฝะธะปะธัะต โ%sโ" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:1010 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "ะดัะปะฑะพัะธะฝะฐัะฐ ัััะฑะฒะฐ ะดะฐ ะต ะฟะพะปะพะถะธัะตะปะฝะพ ััะปะพ ัะธัะปะพ, ะฐ ะฝะต โ%sโ" -#: builtin/clone.c:987 +#: builtin/clone.c:1020 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "ัะตะปะตะฒะธัั ะฟัั โ%sโ ัััะตััะฒัะฒะฐ ะธ ะฝะต ะต ะฟัะฐะทะฝะฐ ะดะธัะตะบัะพัะธั." -#: builtin/clone.c:997 +#: builtin/clone.c:1026 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "ะฟัััั ะฒ ั ัะฐะฝะธะปะธัะตัะพ โ%sโ ัััะตััะฒัะฒะฐ ะธ ะฝะต ะต ะฟัะฐะทะฝะฐ ะดะธัะตะบัะพัะธั." + +#: builtin/clone.c:1040 #, c-format msgid "working tree '%s' already exists." msgstr "ะฒ โ%sโ ะฒะตัะต ัััะตััะฒัะฒะฐ ัะฐะฑะพัะฝะพ ะดััะฒะพ." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "ัะพะดะธัะตะปัะบะธัะต ะดะธัะตะบัะพัะธะธ ะฝะฐ โ%sโ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ััะทะดะฐะดะตะฝะธ" -#: builtin/clone.c:1017 +#: builtin/clone.c:1060 #, c-format msgid "could not create work tree dir '%s'" msgstr "ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฒ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝะพ." -#: builtin/clone.c:1037 +#: builtin/clone.c:1080 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "ะะปะพะฝะธัะฐะฝะต ะธ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะณะพะปะพ ั ัะฐะฝะธะปะธัะต ะฒ โ%sโโฆ\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1082 #, c-format msgid "Cloning into '%s'...\n" msgstr "ะะปะพะฝะธัะฐะฝะต ะธ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ั ัะฐะฝะธะปะธัะต ะฒ โ%sโโฆ\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1106 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11554,44 +13083,44 @@ msgstr "" "ะะฟัะธััะฐ โ--recursiveโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะพะฟัะธะธัะต โ--referenceโ ะธ โ--reference-" "if-ableโ" -#: builtin/clone.c:1124 +#: builtin/clone.c:1170 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "ะัะธ ะปะพะบะฐะปะฝะพ ะบะปะพะฝะธัะฐะฝะต ะพะฟัะธััะฐ โ--depthโ ัะต ะฟัะตัะบะฐัะฐ. ะะพะปะทะฒะฐะนัะต ัั ะตะผะฐัะฐ " "โfile://โ." -#: builtin/clone.c:1126 +#: builtin/clone.c:1172 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "ะัะธ ะปะพะบะฐะปะฝะพ ะบะปะพะฝะธัะฐะฝะต ะพะฟัะธััะฐ โ--shallow-sinceโ ัะต ะฟัะตัะบะฐัะฐ. ะะพะปะทะฒะฐะนัะต " "ัั ะตะผะฐัะฐ โfile://โ." -#: builtin/clone.c:1128 +#: builtin/clone.c:1174 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "ะัะธ ะปะพะบะฐะปะฝะพ ะบะปะพะฝะธัะฐะฝะต ะพะฟัะธััะฐ โ--shallow-excludeโ ัะต ะฟัะตัะบะฐัะฐ. ะะพะปะทะฒะฐะนัะต " "ัั ะตะผะฐัะฐ โfile://โ." -#: builtin/clone.c:1130 +#: builtin/clone.c:1176 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" "ะัะธ ะปะพะบะฐะปะฝะพ ะบะปะพะฝะธัะฐะฝะต ะพะฟัะธััะฐ โ--filterโ ัะต ะฟัะตัะบะฐัะฐ. ะะพะปะทะฒะฐะนัะต ัั ะตะผะฐัะฐ " "โfile://โ." -#: builtin/clone.c:1133 +#: builtin/clone.c:1179 msgid "source repository is shallow, ignoring --local" msgstr "ะบะปะพะฝะธัะฐะฝะพัะพ ั ัะฐะฝะธะปะธัะต ะต ะฟะปะธัะบะพ, ะทะฐัะพะฒะฐ ะพะฟัะธััะฐ โ--localโ ัะต ะฟัะตัะบะฐัะฐ" -#: builtin/clone.c:1138 +#: builtin/clone.c:1184 msgid "--local is ignored" msgstr "ะพะฟัะธััะฐ โ--localโ ัะต ะฟัะตัะบะฐัะฐ" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1268 builtin/clone.c:1276 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "ะัะดะฐะปะตัะตะฝะธัั ะบะปะพะฝ โ%sโ ะปะธะฟัะฒะฐ ะฒ ะบะปะพะฝะธัะฐะฝะพัะพ ั ัะฐะฝะธะปะธัะต โ%sโ" -#: builtin/clone.c:1226 +#: builtin/clone.c:1279 msgid "You appear to have cloned an empty repository." msgstr "ะะทะณะปะตะถะดะฐ ะบะปะพะฝะธัะฐั ัะต ะฟัะฐะทะฝะพ ั ัะฐะฝะธะปะธัะต." @@ -11627,6 +13156,116 @@ msgstr "ะะพะปะต ะฒ ะทะฝะฐัะธ ะผะตะถะดั ะบะพะปะพะฝะธัะต" msgid "--command must be the first argument" msgstr "ะพะฟัะธััะฐ โ--commandโ ัััะฑะฒะฐ ะดะฐ ะต ะฟััะฒะธัั ะฐัะณัะผะตะฝั" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +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:14 builtin/commit-graph.c:27 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" +"git commit-graph write [--object-dir ะะะ _ะะะะะขะ] [--append] [--" +"split[=ะกะขะ ะะขะะะะฏ]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] ะะะฆะะ_ะะ_ะ ะะะะะะฏะะ" + +#: builtin/commit-graph.c:64 +#, c-format +msgid "could not find object directory matching %s" +msgstr "ะดะธัะตะบัะพัะธััะฐ ั ะพะฑะตะบัะธ, ะบะพััะพ ะพัะณะพะฒะฐัั ะฝะฐ โ%sโ, ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะฐ" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "ะดะธัะตะบัะพัะธั" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "ะะะ ะตะบัะพัะธััะฐ_ั_ะะะะะขะ ะทะฐ ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะณัะฐฬัะฐ" + +#: builtin/commit-graph.c:83 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "" +"ะฐะบะพ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต ัะฐะทะดัะพะฑะตะฝ, ะดะฐ ัะต ะฟัะพะฒะตััะฒะฐ ัะฐะผะพ ัะฐะนะปัั ะฝะฐ ะฒััั ะฐ" + +#: builtin/commit-graph.c:106 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "ะัะฐััั ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ: โ%sโ" + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั ะบัะผ โ--splitโ: %s" + +#: builtin/commit-graph.c:155 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "ะฝะตะพัะฐะบะฒะฐะฝ, ะฝะตัะตััะฝะฐะนัะตัะธัะตะฝ ะธะดะตะฝัะธัะธะบะฐัะพั ะฝะฐ ะพะฑะตะบั: %s" + +#: builtin/commit-graph.c:160 +#, c-format +msgid "invalid object: %s" +msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะพะฑะตะบั: โ%sโ" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "ะพะฑั ะพะถะดะฐะฝะตัะพ ะดะฐ ะทะฐะฟะพัะฝะต ะพั ะฒัะธัะบะธ ัะบะฐะทะฐัะตะปะธ" + +#: builtin/commit-graph.c:215 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "" +"ะฟัะพะฒะตัะบะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะทะฐ ะธะฝะดะตะบัะธัะต ะฝะฐ ะฟะฐะบะตัะธัะต ะธะทะฑัะพะตะฝะธ ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ัะตะด" + +#: builtin/commit-graph.c:217 +msgid "start walk at commits listed by stdin" +msgstr "ะทะฐะฟะพัะฒะฐะฝะต ะฝะฐ ะพะฑั ะพะถะดะฐะฝะตัะพ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฟะพะดะฐะดะตะฝะธ ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" + +#: builtin/commit-graph.c:219 +msgid "include all commits already in the commit-graph file" +msgstr "" +"ะฒะบะปััะฒะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะฟะพะดะฐะฒะฐะฝะธั, ะบะพะธัะพ ะฒะตัะต ัะฐ ะฒัะฒ ัะฐะนะปะฐ ั ะณัะฐฬัะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ" + +#: builtin/commit-graph.c:221 +msgid "enable computation for changed paths" +msgstr "ะฒะบะปััะฒะฐะฝะต ะฝะฐ ะธะทัะธัะปะตะฝะธััะฐ ะทะฐ ะฟัะพะผะตะฝะตะฝะธัะต ะฟััะธัะฐ" + +#: builtin/commit-graph.c:224 +msgid "allow writing an incremental commit-graph file" +msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะทะฐะฟะธั ะฝะฐ ะฝะฐัะฐััะฒะฐั ัะฐะนะป ั ะณัะฐฬัะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ" + +#: builtin/commit-graph.c:228 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "ะผะฐะบัะธะผะฐะปะตะฝ ะฑัะพะน ะฟะพะดะฐะฒะฐะฝะธั ะฒ ะฝะตะฑะฐะทะพะฒะพ ะฝะธะฒะพ ะฝะฐ ัะฐะทะดัะพะฑะตะฝ ะณัะฐั" + +#: builtin/commit-graph.c:230 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "" +"ะผะฐะบัะธะผะฐะปะฝะพ ะพัะฝะพัะตะฝะธะต ะฝะฐ ะฑัะพั ะฟะพะดะฐะฒะฐะฝะธั ะฒ ะดะฒะต ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะธ ะฝะธะฒะฐ ะฒ ัะฐะทะดัะพะฑะตะฝ " +"ะณัะฐั" + +#: builtin/commit-graph.c:232 +msgid "only expire files older than a given date-time" +msgstr "ะพะฑัะฒัะฒะฐะฝะต ะทะฐ ะพััะฐัะตะปะธ ัะฐะผะพ ะฝะฐ ัะฐะนะปะพะฒะตัะต ะฟะพ-ััะฐัะธ ะพั ัะพะฒะฐ ะะ ะะะ" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "ะผะฐะบัะธะผะฐะปะตะฝ ะฑัะพะน ะฟัะพะผะตะฝะธ ะฒ ะฟััะธัะฐัะฐ ัะปะตะดะตะฝะธ ะพั ัะธะปััะธัะต ะฝะฐ ะะปัะผ" + +#: builtin/commit-graph.c:255 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "" +"ะพะฟัะธะธัะต โ--reachableโ, โ--stdin-commitsโ ะธ โ--stdin-packsโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "ะะพะปััะฐะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะพั ะฒั ะพะดะฐ" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -11640,7 +13279,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ะฟะพะฒัะฐััั ัะต ัะพะดะธัะตะป: โ%sโ" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 #, c-format msgid "not a valid object name %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั: โ%sโ" @@ -11668,13 +13307,13 @@ msgstr "ัะพะดะธัะตะป" msgid "id of a parent commit object" msgstr "ะะะะะขะะคะะะะขะะ ะฝะฐ ะพะฑะตะบัะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ-ัะพะดะธัะตะป" -#: 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 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 msgid "message" msgstr "ะกะชะะะฉะะะะ" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "ะกะชะะะฉะะะะ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต" @@ -11682,8 +13321,8 @@ msgstr "ะกะชะะะฉะะะะ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต" msgid "read commit log message from file" msgstr "ะธะทัะธัะฐะฝะต ะฝะฐ ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะพั ะคะะะ" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "ะฟะพะดะฟะธัะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ ั GPG" @@ -11731,13 +13370,20 @@ msgstr "" "\n" #: builtin/commit.c:63 +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "" +"ะ ะฟัะพัะธะฒะตะฝ ัะปััะฐะน ะธะทะฟะพะปะทะฒะฐะนัะต ะบะพะผะฐะฝะดะฐัะฐ:\n" +"\n" +" git rebase --skip\n" + +#: builtin/commit.c:66 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "" "ะ ะฟัะพัะธะฒะตะฝ ัะปััะฐะน ะธะทะฟะพะปะทะฒะฐะนัะต ะบะพะผะฐะฝะดะฐัะฐ:\n" "\n" " git cherry-pick --skip\n" -#: builtin/commit.c:66 +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -11759,61 +13405,73 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "ะฒััั ะพะฒะพัะพ ะดััะฒะพ (HEAD tree object) ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทะฒะฐะดะตะฝะพ ะพั ะฟะฐะบะตั" -#: builtin/commit.c:356 +#: builtin/commit.c:348 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "ะพะฟัะธะธัะต โ-aโ ะธ โ--pathspec-from-fileโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/commit.c:361 +msgid "No paths with --include/--only does not make sense." +msgstr "ะะฟัะธะธัะต โ--includeโ ะธ โ--onlyโ ะธะทะธัะบะฒะฐั ะฐัะณัะผะตะฝัะธ." + +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "ะฒัะตะผะตะฝะฝะธัั ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝ" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะฝัะตัะฐะบัะธะฒะฝะพ ะดะพะฑะฐะฒัะฝะต" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "ะฒัะตะผะตะฝะฝะธัั ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ" -#: builtin/commit.c:378 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "ะััะฒะพัะพ ะฝะฐ ะพัะฝะพะฒะฝะธั ะบะตั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝะพ" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "ะฝะพะฒะธัั ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" -#: builtin/commit.c:455 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "ะฟะพ ะฒัะตะผะต ะฝะฐ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัััะธ ัะฐััะธัะฝะพ ะฟะพะดะฐะฒะฐะฝะต." -#: builtin/commit.c:457 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "ะฟะพ ะฒัะตะผะต ะฝะฐ ะพัะฑะธัะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัััะธ ัะฐััะธัะฝะพ ะฟะพะดะฐะฒะฐะฝะต." -#: builtin/commit.c:465 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "ะฟะพ ะฒัะตะผะต ะฝะฐ ะฟัะตะฑะฐะทะธัะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัััะธ ัะฐััะธัะฝะพ ะฟะพะดะฐะฒะฐะฝะต." + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "ะธะฝะดะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "ะฒัะตะผะตะฝะฝะธัั ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะทะฐ ะฐะฒัะพั ะฒ ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะปะธะฟัะฒะฐ" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะทะฐ ะฐะฒัะพั ะฒ ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะต ะฝะตะฟัะฐะฒะธะปะฝะฐ" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟะฐัะฐะผะตััั ะบัะผ ะพะฟัะธััะฐ โ--authorโ" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11821,69 +13479,68 @@ msgstr "" "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฑะตัะต ะทะฝะฐะบ ะทะฐ ะบะพะผะตะฝัะฐั โ ะฒ ัะตะบััะพัะพ ััะพะฑัะตะฝะธะต ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ัะฐ " "ะธะทะฟะพะปะทะฒะฐะฝะธ ะฒัะธัะบะธ ะฟะพะดะพะฑะฝะธ ะทะฝะฐัะธ" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "ัะปะตะดะฝะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะพ: %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:478 #, c-format msgid "(reading log message from standard input)\n" msgstr "(ะธะทัะธัะฐะฝะต ะฝะฐ ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะพั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะฑะต ะฟัะพัะตัะตะฝะพ ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" -#: builtin/commit.c:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "ัะฐะนะปัั ััั ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฒะบะฐัะฒะฐะฝะต SQUASH_MSG ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะพ" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "ััะพะฑัะตะฝะธะตัะพ ะทะฐ ัะปะธะฒะฐะฝะต MERGE_MSG ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะพ" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "ัะฐะฑะปะพะฝัั ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝ" -#: builtin/commit.c:829 -#, c-format +#: builtin/commit.c:853 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" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" -"ะะทะณะปะตะถะดะฐ, ัะต ะฟะพะดะฐะฒะฐัะต ัะปะธะฒะฐะฝะต. ะะบะพ ัะพะฒะฐ ะฝะต ะต ัะฐะบะฐ, ะธะทััะธะนัะต ัะฐะนะปะฐ:\n" +"ะะทะณะปะตะถะดะฐ, ัะต ะฟะพะดะฐะฒะฐัะต ัะปะธะฒะฐะฝะต.\n" +"ะะบะพ ัะพะฒะฐ ะฝะต ะต ัะฐะบะฐ, ะธะทะฟัะปะฝะตัะต:\n" "\n" -" %s\n" +" git update-ref -d MERGE_HEAD\n" "ะธ ะพะฟะธัะฐะนัะต ะพัะฝะพะฒะพ.\n" -#: builtin/commit.c:834 -#, c-format +#: builtin/commit.c:858 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" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" -"ะะทะณะปะตะถะดะฐ, ัะต ะธะทะฒัััะฒะฐัะต ะพัะฑัะฐะฝะพ ะฟะพะดะฐะฒะฐะฝะต. ะะบะพ ัะพะฒะฐ ะฝะต ะต ัะฐะบะฐ, ะธะทััะธะนัะต " -"ัะฐะนะปะฐ:\n" +"ะะทะณะปะตะถะดะฐ, ัะต ะพัะฑะธัะฐัะต ะฟะพะดะฐะฒะฐะฝะต.\n" +"ะะบะพ ัะพะฒะฐ ะฝะต ะต ัะฐะบะฐ, ะธะทะฟัะปะฝะตัะต:\n" "\n" -" %s\n" +" git update-ref -d CHERRY_PICK_HEAD\n" "ะธ ะพะฟะธัะฐะนัะต ะพัะฝะพะฒะพ.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11892,7 +13549,7 @@ msgstr "" "ะัะฒะตะดะตัะต ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต. ะ ะตะดะพะฒะตัะต, ะบะพะธัะพ ะทะฐะฟะพัะฒะฐั\n" "ั โ%cโ, ัะต ะฑัะดะฐั ะฟัะพะฟััะฝะฐัะธ, ะฐ ะฟัะฐะทะฝะพ ััะพะฑัะตะฝะธะต ะฟัะตัััะฐะฝะพะฒัะฒะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11903,151 +13560,151 @@ msgstr "" "ั โ%cโ, ัััะพ ัะต ะฑัะดะฐั ะฒะบะปััะตะฝะธ โ ะผะพะถะต ะดะฐ ะณะธ ะธะทััะธะตัะต ะฒะธะต. ะัะฐะทะฝะพ \n" "ััะพะฑัะตะฝะธะต ะฟัะตัััะฐะฝะพะฒัะฒะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ.\n" -#: builtin/commit.c:872 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sะะฒัะพั: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sะะฐัะฐ: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sะะพะดะฐะฒะฐั: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "ะะฝะดะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/commit.c:972 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "ะัะตัะบะฐ ะฟัะธ ะธะทะณัะฐะถะดะฐะฝะต ะฝะฐ ะดััะฒะตัะฐัะฐ" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "ะะพะดะฐะนัะต ััะพะฑัะตะฝะธะตัะพ ั ะฝัะบะพั ะพั ะพะฟัะธะธัะต โ-mโ ะธะปะธ โ-Fโ.\n" -#: builtin/commit.c:1030 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "ะะฟัะธััะฐ โ--author '%s'โ ะฝะต ะพัะณะพะฒะฐัั ะฝะฐ ัะพัะผะฐฬัะฐ โะะผะต <ะต-ะฟะพัะฐ>โ ะธ ะฝะต ััะฒะฟะฐะดะฐ ั " "ะฝะธะบะพะน ะฐะฒัะพั" -#: builtin/commit.c:1044 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "ะะตะฟัะฐะฒะธะปะตะฝ ัะตะถะธะผ ะทะฐ ะธะณะฝะพัะธัะฐะฝะธัะต ัะฐะนะปะพะฒะต: โ%sโ" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "ะะตะฟัะฐะฒะธะปะตะฝ ัะตะถะธะผ ะทะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต: โ%sโ" -#: builtin/commit.c:1102 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "ะะฟัะธะธัะต โ--longโ ะธ โ-zโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ." -#: builtin/commit.c:1146 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "ะะฟัะธะธัะต โ--reset-authorโ ะธ โ--authorโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ." -#: builtin/commit.c:1155 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "ะัะผะฐ ะบะฐะบะฒะพ ะดะฐ ะฑัะดะต ะฟะพะฟัะฐะฒะตะฝะพ." -#: builtin/commit.c:1158 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "ะ ะผะพะผะตะฝัะฐ ัะต ะธะทะฒัััะฒะฐ ัะปะธะฒะฐะฝะต, ะฝะต ะผะพะถะตัะต ะดะฐ ะฟะพะฟัะฐะฒััะต." -#: builtin/commit.c:1160 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "ะ ะผะพะผะตะฝัะฐ ัะต ะธะทะฒัััะฒะฐ ะพัะฑะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต, ะฝะต ะผะพะถะตัะต ะดะฐ ะฟะพะฟัะฐะฒััะต." -#: builtin/commit.c:1163 +#: builtin/commit.c:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "ะ ะผะพะผะตะฝัะฐ ัะต ะธะทะฒัััะฒะฐ ะฟัะตะฑะฐะทะธัะฐะฝะต, ะฝะต ะผะพะถะตัะต ะดะฐ ะฟะพะฟัะฐะฒััะต." + +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "ะะฟัะธะธัะต โ--squashโ ะธ โ--fixupโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ." -#: builtin/commit.c:1173 +#: builtin/commit.c:1200 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "ะะฟัะธะธัะต โ-cโ, โ-Cโ, โ-Fโ ะธ โ--fixupโโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ." -#: builtin/commit.c:1175 +#: builtin/commit.c:1202 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "ะะฟัะธััะฐ โ-mโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั โ-cโ, โ-Cโ ะธ โ-Fโ." -#: builtin/commit.c:1183 +#: builtin/commit.c:1211 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "ะะฟัะธััะฐ โ--reset-authorโ ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ัะฐะผะพ ะทะฐะตะดะฝะพ ั โ-Cโ, โ-cโ ะธะปะธ\n" "โ--amendโ." -#: builtin/commit.c:1200 +#: builtin/commit.c:1229 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "ะะฟัะธะธัะต โ--includeโ, โ--onlyโ, โ--allโ, โ--interactiveโ ะธ โ--patchโ ัะฐ\n" "ะฝะตััะฒะผะตััะธะผะธ." -#: builtin/commit.c:1202 -msgid "No paths with --include/--only does not make sense." -msgstr "ะะฟัะธะธัะต โ--includeโ ะธ โ--onlyโ ะธะทะธัะบะฒะฐั ะฐัะณัะผะตะฝัะธ." - -#: builtin/commit.c:1208 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "ะพะฟัะธััะฐ โ-aโ ะต ะฝะตััะฒะผะตััะธะผะฐ ััั ะทะฐะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟััะธัะฐ: โ%sโฆโ" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "ะบัะฐัะบะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ััััะพัะฝะธะตัะพ" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "ะธะฝัะพัะผะฐัะธั ะทะฐ ะบะปะพะฝะธัะต" -#: builtin/commit.c:1343 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "ะธะฝัะพัะผะฐัะธั ะทะฐ ัะบะฐัะฐะฝะพัะพ" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "ะธะทัะธัะปัะฒะฐะฝะต ะฝะฐ ัะพัะฝะธัะต ััะพะนะฝะพััะธ ะฝะฐะฟัะตะด/ะฝะฐะทะฐะด" -#: builtin/commit.c:1347 +#: builtin/commit.c:1374 msgid "version" msgstr "ะฒะตััะธั" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "ัะพัะผะฐั ะฝะฐ ะธะทั ะพะดะฐ ะทะฐ ัะตัะตะฝะต ะพั ะฟัะพะณัะฐะผะฐ" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "ะฟะพะดัะพะฑะฝะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ััััะพัะฝะธะตัะพ (ััะฐะฝะดะฐััะฝะพ)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "ัะฐะทะดะตะปัะฝะต ะฝะฐ ะตะปะตะผะตะฝัะธัะต ั ะฝัะปะตะฒะธั ะทะฝะฐะบ โNULโ" -#: 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 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 msgid "mode" msgstr "ะ ะะะะ" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1383 builtin/commit.c:1541 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต. ะัะทะผะพะถะฝะธัะต ะ ะะะะะธ ัะฐ โallโ (ะฟะพะดัะพะฑะฝะฐ " "ะธะฝัะพัะผะฐัะธั), โnormalโ (ะบัะฐัะบะฐ ะธะฝัะพัะผะฐัะธั), โnoโ (ะฑะตะท ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต). " "ะกัะฐะฝะดะฐััะฝะธัั ะ ะะะะ ะต: โallโ." -#: builtin/commit.c:1360 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12056,11 +13713,11 @@ msgstr "" "โtraditionalโ (ััะฐะดะธัะธะพะฝะตะฝ), โmatchingโ (ะฝะฐะฟะฐัะฒะฐัะธ), โnoโ (ะฑะตะท ะธะณะฝะพัะธัะฐะฝะธัะต " "ัะฐะนะปะพะฒะต). ะกัะฐะฝะดะฐััะฝะธัั ะ ะะะะ ะต: โtraditionalโ." -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "ะะะะ" -#: builtin/commit.c:1363 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12069,176 +13726,176 @@ msgstr "" "ะตะดะฝะฐ ะพั โallโ (ะฒัะธัะบะธ), โdirtyโ (ัะตะทะธ ั ะฝะตะฟะพะดะฐะดะตะฝะธ ะฟัะพะผะตะฝะธ), " "โuntrackedโ (ะฝะตัะปะตะดะตะฝะธ)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต ะฒ ะบะพะปะพะฝะธ" -#: builtin/commit.c:1366 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "ะฑะตะท ะทะฐัะธัะฐะฝะต ะฝะฐ ะฟัะตะธะผะตะฝัะฒะฐะฝะธััะฐ" -#: builtin/commit.c:1368 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "ะทะฐัะธัะฐะฝะต ะฝะฐ ะฟัะตะธะผะตะฝัะฒะฐะฝะธััะฐ, ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะบะพะตัะธัะธะตะฝั ะฝะฐ ะฟัะธะปะธะบะฐ" -#: builtin/commit.c:1388 +#: builtin/commit.c:1415 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "ะะตะฟะพะดะดััะถะฐะฝะฐ ะบะพะผะฑะธะฝะฐัะธั ะพั ะฐัะณัะผะตะฝัะธ ะทะฐ ะธะณะฝะพัะธัะฐะฝะธ ะธ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต" -#: builtin/commit.c:1493 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "ะฑะตะท ะธะฝัะพัะผะฐัะธั ัะปะตะด ััะฟะตัะฝะพ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/commit.c:1494 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะฐะทะปะธะบะฐัะฐ ะบัะผ ัะฐะฑะปะพะฝะฐ ะทะฐ ััะพะฑัะตะฝะธะตัะพ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/commit.c:1496 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "ะะฟัะธะธ ะทะฐ ััะพะฑัะตะฝะธะตัะพ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 msgid "read message from file" msgstr "ะฒะทะธะผะฐะฝะต ะฝะฐ ััะพะฑัะตะฝะธะตัะพ ะพั ะคะะะ" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "author" msgstr "ะะะขะะ " -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะะะขะะ ะทะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:539 msgid "date" msgstr "ะะะขะ" -#: builtin/commit.c:1499 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะะะขะ ะทะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "ะะะะะะะะ" -#: builtin/commit.c:1501 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "ะฟัะตะธะทะฟะพะปะทะฒะฐะฝะต ะธ ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ััะพะฑัะตะฝะธะตัะพ ะพั ัะบะฐะทะฐะฝะพัะพ ะะะะะะะะ" -#: builtin/commit.c:1502 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "ะฟัะตะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ััะพะฑัะตะฝะธะตัะพ ะพั ัะบะฐะทะฐะฝะพัะพ ะะะะะะะะ" -#: builtin/commit.c:1503 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฐะฒัะพะผะฐัะธัะฝะพัะพ ััะพะฑัะตะฝะธะต ะทะฐ ะฒะบะฐัะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐะฝะพัะพ ะะะะะะะะ ะฒ " "ะฟัะตะดั ะพะดะฝะพัะพ ะฑะตะท ัะปะตะดะฐ" -#: builtin/commit.c:1504 +#: builtin/commit.c:1508 msgid "use autosquash formatted message to squash specified commit" msgstr "" "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฐะฒัะพะผะฐัะธัะฝะพัะพ ััะพะฑัะตะฝะธะต ะทะฐ ะฒะบะฐัะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐะฝะพัะพ ะะะะะะะะ ะฒ " "ะฟัะตะดะฝะพัะพ" -#: builtin/commit.c:1505 +#: builtin/commit.c:1509 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "ัะผัะฝะฐ ะฝะฐ ะฐะฒัะพัะฐ ะดะฐ ััะฒะฟะฐะดะฐ ั ะฟะพะดะฐะฒะฐัะธั (ะธะทะฟะพะปะทะฒะฐ ัะต ั โ-Cโ/โ-cโ/โ--amendโ)" -#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะพะปะต ะทะฐ ะฟะพะดะฟะธั โ โSigned-off-by:โ" -#: builtin/commit.c:1507 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐะฝะธั ัะฐะฑะปะพะฝะตะฝ ะคะะะ" -#: builtin/commit.c:1508 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/commit.c:1510 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "ะฒะผัะบะฒะฐะฝะต ะฝะฐ ััััะพัะฝะธะตัะพ ะฒ ัะฐะฑะปะพะฝะฐ ะทะฐ ััะพะฑัะตะฝะธะตัะพ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/commit.c:1515 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "ะะฟัะธะธ ะทะฐ ะธะทะฑะพั ะฝะฐ ัะฐะนะปะพะฒะต ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/commit.c:1516 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะฟัะพะผะตะฝะตะฝะธ ัะฐะนะปะพะฒะต" -#: builtin/commit.c:1517 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะบะฐะทะฐะฝะธัะต ัะฐะนะปะพะฒะต ะบัะผ ะธะฝะดะตะบัะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/commit.c:1518 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "ะธะฝัะตัะฐะบัะธะฒะฝะพ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะฐะนะปะพะฒะต" -#: builtin/commit.c:1519 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "ะธะฝัะตัะฐะบัะธะฒะฝะพ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟัะพะผะตะฝะธ" -#: builtin/commit.c:1520 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "ะฟะพะดะฐะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ัะบะฐะทะฐะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/commit.c:1521 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "" "ะฑะตะท ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะบัะบะธัะต ะฟัะตะดะธ ะฟะพะดะฐะฒะฐะฝะต ะธ ะฟัะธ ะฟัะพะผัะฝะฐ ะฝะฐ ััะพะฑัะตะฝะธะตัะพ ะทะฐ " "ะฟะพะดะฐะฒะฐะฝะต (pre-commit ะธ commit-msg)" -#: builtin/commit.c:1522 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "ะพัะฟะตัะฐัะฒะฐะฝะต ะฝะฐ ัะพะฒะฐ, ะบะพะตัะพ ะฑะธ ะฑะธะปะพ ะฟะพะดะฐะดะตะฝะพ" -#: builtin/commit.c:1535 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "ะฟะพะฟัะฐะฒัะฝะต ะฝะฐ ะฟัะตะดะธัะฝะพัะพ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/commit.c:1536 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "ะฑะตะท ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะบัะบะฐัะฐ ัะปะตะด ะฟัะตะทะฐะฟะธัะฒะฐะฝะต (post-rewrite)" -#: builtin/commit.c:1541 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟัะฐะทะฝะธ ะฟะพะดะฐะฒะฐะฝะธั" -#: builtin/commit.c:1543 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั ั ะฟัะฐะทะฝะธ ััะพะฑัะตะฝะธั" -#: builtin/commit.c:1616 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "ะะพะฒัะตะดะตะฝ ัะฐะนะป ะทะฐ ะฒััั ะฐ ะทะฐ ัะปะธะฒะฐะฝะตัะพ โMERGE_HEADโ (%s)" -#: builtin/commit.c:1623 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "ัะตะถะธะผัั ะฝะฐ ัะปะธะฒะฐะฝะต โMERGE_MODEโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/commit.c:1642 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะพ: %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "ะะตะธะทะฒัััะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต ะฟะพัะฐะดะธ ะฟัะฐะทะฝะพ ััะพะฑัะตะฝะธะต.\n" -#: builtin/commit.c:1654 +#: builtin/commit.c:1662 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "ะะตะธะทะฒัััะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต ะฟะพัะฐะดะธ ะฝะตัะตะดะฐะบัะธัะฐะฝะพ ััะพะฑัะตะฝะธะต.\n" -#: builtin/commit.c:1688 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12250,294 +13907,227 @@ msgstr "" "\n" " git restore --staged :/" -#: 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: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] <split options>" -msgstr "" -"git commit-graph write [--object-dir ะะะ _ะะะะะขะ] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] ะะะฆะะ_ะะ_ะ ะะะะะะฏะะ" - -#: 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: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:57 -msgid "if the commit-graph is split, only verify the tip file" -msgstr "" -"ะฐะบะพ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะต ัะฐะทะดัะพะฑะตะฝ, ะดะฐ ัะต ะฟัะพะฒะตััะฒะฐ ัะฐะผะพ ัะฐะนะปัั ะฝะฐ ะฒััั ะฐ" - -#: 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:164 -msgid "start walk at all refs" -msgstr "ะพะฑั ะพะถะดะฐะฝะตัะพ ะดะฐ ะทะฐะฟะพัะฝะต ะพั ะฒัะธัะบะธ ัะบะฐะทะฐัะตะปะธ" - -#: builtin/commit-graph.c:166 -msgid "scan pack-indexes listed by stdin for commits" -msgstr "" -"ะฟัะพะฒะตัะบะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะทะฐ ะธะฝะดะตะบัะธัะต ะฝะฐ ะฟะฐะบะตัะธัะต ะธะทะฑัะพะตะฝะธ ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ัะตะด" - -#: builtin/commit-graph.c:168 -msgid "start walk at commits listed by stdin" -msgstr "ะทะฐะฟะพัะฒะฐะฝะต ะฝะฐ ะพะฑั ะพะถะดะฐะฝะตัะพ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฟะพะดะฐะดะตะฝะธ ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" - -#: builtin/commit-graph.c:170 -msgid "include all commits already in the commit-graph file" -msgstr "" -"ะฒะบะปััะฒะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะฟะพะดะฐะฒะฐะฝะธั, ะบะพะธัะพ ะฒะตัะต ัะฐ ะฒัะฒ ัะฐะนะปะฐ ั ะณัะฐฬัะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ" - -#: builtin/commit-graph.c:172 -msgid "allow writing an incremental commit-graph file" -msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะทะฐะฟะธั ะฝะฐ ะฝะฐัะฐััะฒะฐั ัะฐะนะป ั ะณัะฐฬัะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ" - -#: 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:176 -msgid "maximum ratio between two levels of a split commit-graph" -msgstr "" -"ะผะฐะบัะธะผะฐะปะฝะพ ะพัะฝะพัะตะฝะธะต ะฝะฐ ะฑัะพั ะฟะพะดะฐะฒะฐะฝะธั ะฒ ะดะฒะต ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะธ ะฝะธะฒะฐ ะฒ ัะฐะทะดัะพะฑะตะฝ " -"ะณัะฐั" - -#: builtin/commit-graph.c:191 -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:103 builtin/env--helper.c:23 +#: builtin/config.c:107 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" -msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั โ--typeโ: %s" +msgstr "ะฝะตะฟะพะทะฝะฐั ะฐัะณัะผะตะฝั ะบัะผ โ--typeโ: %s" -#: builtin/config.c:115 +#: builtin/config.c:119 msgid "only one type at a time" msgstr "ัะฐะผะพ ะฟะพ ะตะดะธะฝ ะฒะธะด" -#: builtin/config.c:124 +#: builtin/config.c:128 msgid "Config file location" msgstr "ะะตััะพะฟะพะปะพะถะตะฝะธะต ะฝะฐ ะบะพะฝัะธะณััะฐัะธะพะฝะฝะธั ัะฐะนะป" -#: builtin/config.c:125 +#: builtin/config.c:129 msgid "use global config file" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะณะปะพะฑะฐะปะฝะธั ะบะพะฝัะธะณััะฐัะธะพะฝะตะฝ ัะฐะนะป" -#: builtin/config.c:126 +#: builtin/config.c:130 msgid "use system config file" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัะธััะตะผะฝะธั ะบะพะฝัะธะณััะฐัะธะพะฝะตะฝ ัะฐะนะป" -#: builtin/config.c:127 +#: builtin/config.c:131 msgid "use repository config file" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะบะพะฝัะธะณััะฐัะธะพะฝะฝะธั ัะฐะนะป ะฝะฐ ั ัะฐะฝะธะปะธัะตัะพ" -#: builtin/config.c:128 +#: builtin/config.c:132 msgid "use per-worktree config file" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะบะพะฝัะธะณััะฐัะธะพะฝะฝะธั ัะฐะนะป ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะบะพะฟะธะต" -#: builtin/config.c:129 +#: builtin/config.c:133 msgid "use given config file" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะทะฐะดะฐะดะตะฝะธั ะบะพะฝัะธะณััะฐัะธะพะฝะตะฝ ะคะะะ" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "blob-id" msgstr "ะะะะะขะะคะะะะขะะ " -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "read config from given blob object" msgstr "" "ะธะทัะธัะฐะฝะต ะฝะฐ ะบะพะฝัะธะณััะฐัะธััะฐ ะพั BLOB ั ัะพะทะธ ะะะะะขะะคะะะะขะะ ะฝะฐ ััะดััะถะฐะฝะธะตัะพ" -#: builtin/config.c:131 +#: builtin/config.c:135 msgid "Action" msgstr "ะะตะนััะฒะธะต" -#: builtin/config.c:132 +#: builtin/config.c:136 msgid "get value: name [value-regex]" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะพะนะฝะพัั: ะะะ [ะ ะะะฃะะฏะ ะะ_ะะะ ะะ_ะะ_ะกะขะะะะะกะขะขะ]" -#: builtin/config.c:133 +#: builtin/config.c:137 msgid "get all values: key [value-regex]" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ััะพะนะฝะพััะธ: ะบะปัั [ะ ะะะฃะะฏะ ะะ_ะะะ ะะ_ะะ_ะกะขะะะะะกะขะขะ]" -#: builtin/config.c:134 +#: builtin/config.c:138 msgid "get values for regexp: name-regex [value-regex]" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะพะนะฝะพััะธัะต ะทะฐ ะ ะะะฃะะฏะ ะะธั_ะะะ ะะ: ะ ะะะฃะะฏะ ะะ_ะะะ ะะ_ะะ_ะะะะขะ " "[ะ ะะะฃะะฏะ ะะ_ะะะ ะะ_ะะ_ะกะขะะะะะกะขะขะ]" -#: builtin/config.c:135 +#: builtin/config.c:139 msgid "get value specific for the URL: section[.var] URL" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะพะนะฝะพัััะฐ ะทะฐ ัะบะฐะทะฐะฝะธั ะฐะดัะตั: ะ ะะะะะ[.ะะ ะะะะะะะะ] ะะะ ะะก" -#: builtin/config.c:136 +#: builtin/config.c:140 msgid "replace all matching variables: name value [value_regex]" msgstr "" "ะทะฐะผัะฝะฐ ะฝะฐ ะฒัะธัะบะธ ััะฒะฟะฐะดะฐัะธ ะฟัะพะผะตะฝะปะธะฒะธ: ะะะ ะกะขะะะะะกะข " "[ะ ะะะฃะะฏะ ะะ_ะะะ ะะ_ะะ_ะกะขะะะะะกะขะขะ]" -#: builtin/config.c:137 +#: builtin/config.c:141 msgid "add a new variable: name value" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฝะพะฒะฐ ะฟัะพะผะตะฝะปะธะฒะฐ: ะะะ ะกะขะะะะะกะข" -#: builtin/config.c:138 +#: builtin/config.c:142 msgid "remove a variable: name [value-regex]" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะปะธะฒะฐ: ะะะ [ะ ะะะฃะะฏะ ะะ_ะะะ ะะ_ะะ_ะกะขะะะะะกะขะขะ]" -#: builtin/config.c:139 +#: builtin/config.c:143 msgid "remove all matches: name [value-regex]" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ััะฒะฟะฐะดะฐัะธ: ะะะ [ะ ะะะฃะะฏะ ะะ_ะะะ ะะ_ะะ_ะกะขะะะะะกะขะขะ]" -#: builtin/config.c:140 +#: builtin/config.c:144 msgid "rename section: old-name new-name" msgstr "ะฟัะตะธะผะตะฝัะฒะฐะฝะต ะฝะฐ ัะฐะทะดะตะป: ะกะขะะ ะ_ะะะ ะะะะ_ะะะ" -#: builtin/config.c:141 +#: builtin/config.c:145 msgid "remove a section: name" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ ัะฐะทะดะตะป: ะะะ" -#: builtin/config.c:142 +#: builtin/config.c:146 msgid "list all" msgstr "ะธะทะฑัะพัะฒะฐะฝะต ะฝะฐ ะฒัะธัะบะธ" -#: builtin/config.c:143 +#: builtin/config.c:147 msgid "open an editor" msgstr "ะพัะฒะฐััะฝะต ะฝะฐ ัะตะดะฐะบัะพั" -#: builtin/config.c:144 +#: builtin/config.c:148 msgid "find the color configured: slot [default]" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะทะฐะดะฐะดะตะฝะธั ัะฒัั: ะฝะพะผะตั [ััะฐะฝะดะฐััะฝะพ]" -#: builtin/config.c:145 +#: builtin/config.c:149 msgid "find the color setting: slot [stdout-is-tty]" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะทะฐะดะฐะดะตะฝะธั ัะฒัั: ะฝะพะผะตั (ััะฐะฝะดะฐััะฝะธัั ะธะทั ะพะด ะต ัะตัะผะธะฝะฐะป)" -#: builtin/config.c:146 +#: builtin/config.c:150 msgid "Type" msgstr "ะะธะด" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:151 builtin/env--helper.c:43 msgid "value is given this type" msgstr "ััะพะนะฝะพัััะฐ ะต ะพั ัะพะทะธ ะฒะธะด" -#: builtin/config.c:148 +#: builtin/config.c:152 msgid "value is \"true\" or \"false\"" -msgstr "ะกะขะะะะะกะขะขะ ะต โtrueโ (ะธััะธะฝะฐ) ะธะปะธ โfalseโ (ะปัะถะฐ)" +msgstr "ะกะขะะะะะกะขะขะ ะต โtrueโ (ะธััะธะฝะฐ) ะธะปะธ โfalseโ (ะปัะถะฐฬ)" -#: builtin/config.c:149 +#: builtin/config.c:153 msgid "value is decimal number" msgstr "ะกะขะะะะะกะขะขะ ะต ััะปะพ, ะดะตัะตัะธัะฝะพ ัะธัะปะพ" -#: builtin/config.c:150 +#: builtin/config.c:154 msgid "value is --bool or --int" msgstr "ะกะขะะะะะกะขะขะ ะต โ--boolโ (ะฑัะปะตะฒะฐ) ะธะปะธ โ--intโ (ะดะตัะตัะธัะฝะพ ััะปะพ ัะธัะปะพ)" -#: builtin/config.c:151 +#: builtin/config.c:155 +msgid "value is --bool or string" +msgstr "ะกะขะะะะะกะขะขะ ะต โ--boolโ (ะฑัะปะตะฒะฐ) ะธะปะธ ะฝะธะท" + +#: builtin/config.c:156 msgid "value is a path (file or directory name)" msgstr "ะกะขะะะะะกะขะขะ ะต ะฟัั (ะดะพ ัะฐะนะป ะธะปะธ ะดะธัะตะบัะพัะธั)" -#: builtin/config.c:152 +#: builtin/config.c:157 msgid "value is an expiry date" msgstr "ััะพะนะฝะพัััะฐ ะต ะฟะตัะธะพะด ะฝะฐ ะฒะฐะปะธะดะฝะพัั/ะทะฐะฟะฐะทะฒะฐะฝะต" -#: builtin/config.c:153 +#: builtin/config.c:158 msgid "Other" msgstr "ะััะณะธ" -#: builtin/config.c:154 +#: builtin/config.c:159 msgid "terminate values with NUL byte" msgstr "ัะฐะทะดะตะปัะฝะต ะฝะฐ ััะพะนะฝะพััะธัะต ั ะฝัะปะตะฒะธั ะทะฝะฐะบ โNULโ" -#: builtin/config.c:155 +#: builtin/config.c:160 msgid "show variable names only" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ะฟัะพะผะตะฝะปะธะฒะธัะต" -#: builtin/config.c:156 +#: builtin/config.c:161 msgid "respect include directives on lookup" msgstr "ะฟัะธ ััััะตะฝะต ะดะฐ ัะต ัะฒะฐะถะฐั ะธ ะดะธัะตะบัะธะฒะธัะต ะทะฐ ะฒะบะปััะฒะฐะฝะต" -#: builtin/config.c:157 +#: builtin/config.c:162 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะผัััะพัะพ ะฝะฐ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะฝะฐัััะพะนะบะฐัะฐ (ัะฐะนะป, ััะฐะฝะดะฐััะตะฝ ะฒั ะพะด, " "ะพะฑะตะบั-BLOB, ะบะพะผะฐะฝะดะตะฝ ัะตะด)" -#: builtin/config.c:158 builtin/env--helper.c:40 +#: builtin/config.c:163 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" +"ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะพะฑั ะฒะฐัะฐ ะฝะฐ ะฝะฐัััะพะนะบะฐัะฐ โworktreeโ (ัะฐะฑะพัะฝะพ ะดััะฒะพ), " +"โlocalโ (ั ัะฐะฝะธะปะธัะต), โglobalโ (ะฟะพััะตะฑะธัะตะป), โsystemโ (ัะธััะตะผะฐ), " +"โcommandโ (ะบะพะผะฐะฝะดะฐ)" + +#: builtin/config.c:164 builtin/env--helper.c:45 msgid "value" msgstr "ะกะขะะะะะกะข" -#: builtin/config.c:158 +#: builtin/config.c:164 msgid "with --get, use default value when missing entry" msgstr "ั โ--getโ ัะต ะธะทะฟะพะปะทะฒะฐ ััะฐะฝะดะฐััะฝะฐ ะกะขะะะะะกะข ะฟัะธ ะปะธะฟัะฒะฐัะฐ" -#: builtin/config.c:172 +#: builtin/config.c:178 #, c-format msgid "wrong number of arguments, should be %d" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฑัะพะน ะฐัะณัะผะตะฝัะธ, ัััะฑะฒะฐ ะดะฐ ะต ัะพัะฝะพ %d" -#: builtin/config.c:174 +#: builtin/config.c:180 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฑัะพะน ะฐัะณัะผะตะฝัะธ, ัััะฑะฒะฐ ะดะฐ ะต ะพั %d ะดะพ %d ะฒะบะปััะธัะตะปะฝะพ" -#: builtin/config.c:308 +#: builtin/config.c:334 #, c-format msgid "invalid key pattern: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะฐะฑะปะพะฝ ะทะฐ ะบะปัั: โ%sโ" -#: builtin/config.c:344 +#: builtin/config.c:370 #, c-format msgid "failed to format default config value: %s" msgstr "ะฝะตััะฟะตัะฝะพ ัะพัะผะฐัะธัะฐะฝะต ะฝะฐ ััะฐะฝะดะฐััะฝะฐัะฐ ััะพะนะฝะพัั ะฝะฐ ะฝะฐัััะพะนะบะฐ: %s" -#: builtin/config.c:401 +#: builtin/config.c:434 #, c-format msgid "cannot parse color '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ ะบะฐัะพ ัะฒัั" -#: builtin/config.c:443 +#: builtin/config.c:476 msgid "unable to parse default color value" msgstr "ะฝะตัะฐะทะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั ะฝะฐ ััะฐะฝะดะฐััะฝะธั ัะฒัั" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:529 builtin/config.c:789 msgid "not in a git directory" msgstr "ะฝะต ะต ะฒ ะดะธัะตะบัะพัะธั ะฟะพะด Git" -#: builtin/config.c:499 +#: builtin/config.c:532 msgid "writing to stdin is not supported" msgstr "ะฝะต ัะต ะฟะพะดะดััะถะฐ ะทะฐะฟะธัะฒะฐะฝะต ะฒ ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" -#: builtin/config.c:502 +#: builtin/config.c:535 msgid "writing config blobs is not supported" msgstr "ะพะฑะตะบัะธ-BLOB ะฒ ะฝะฐัััะพะนะบะธัะต ะฝะต ัะต ะฟะพะดะดััะถะฐั" -#: builtin/config.c:587 +#: builtin/config.c:620 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12552,23 +14142,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:644 msgid "only one config file at a time" msgstr "ัะฐะผะพ ะฟะพ ะตะดะธะฝ ะบะพะฝัะธะณััะฐัะธะพะฝะตะฝ ัะฐะนะป" -#: builtin/config.c:616 +#: builtin/config.c:650 msgid "--local can only be used inside a git repository" msgstr "โ--localโ ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ัะฐะผะพ ะฒ ั ัะฐะฝะธะปะธัะต" -#: builtin/config.c:619 +#: builtin/config.c:652 msgid "--blob can only be used inside a git repository" msgstr "โ--blobโ ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ัะฐะผะพ ะฒ ั ัะฐะฝะธะปะธัะต" -#: builtin/config.c:638 +#: builtin/config.c:654 +msgid "--worktree can only be used inside a git repository" +msgstr "โ--worktreeโ ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ัะฐะผะพ ะฒ ั ัะฐะฝะธะปะธัะต" + +#: builtin/config.c:676 msgid "$HOME not set" msgstr "ะฟัะพะผะตะฝะปะธะฒะฐัะฐ โHOMEโ ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ" -#: builtin/config.c:658 +#: builtin/config.c:700 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -12579,20 +14173,20 @@ msgstr "" "ะฟะพะฒะตัะต ะธะฝัะพัะผะฐัะธั ะฒะธะถัะต ัะฐะทะดะตะปะฐ โCONFIGURATION FILEโ ะฒ\n" "โgit help worktreeโ" -#: builtin/config.c:688 +#: builtin/config.c:735 msgid "--get-color and variable type are incoherent" msgstr "ะพะฟัะธััะฐ โ--get-colorโ ะฝะต ััะพัะฒะตัััะฒะฐ ะฝะฐ ะฒะธะดะฐ ะฝะฐ ะฟัะพะผะตะฝะปะธะฒะฐัะฐ" -#: builtin/config.c:693 +#: builtin/config.c:740 msgid "only one action at a time" msgstr "ัะฐะผะพ ะฟะพ ะตะดะฝะพ ะดะตะนััะฒะธะต" -#: builtin/config.c:706 +#: builtin/config.c:753 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "" "ะพะฟัะธััะฐ โ--name-onlyโ ะต ะฟัะธะปะพะถะธะผะฐ ัะฐะผะพ ะบัะผ ะพะฟัะธะธัะต โ--listโ ะธ โ--get-regexpโ" -#: builtin/config.c:712 +#: builtin/config.c:759 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" @@ -12600,33 +14194,33 @@ msgstr "" "ะพะฟัะธััะฐ โ--show-originโ ะต ะฟัะธะปะพะถะธะผะฐ ัะฐะผะพ ะบัะผ ะพะฟัะธะธัะต โ--getโ, โ--get-allโ, " "โ--get-regexpโ ะธ โ--listโ" -#: builtin/config.c:718 +#: builtin/config.c:765 msgid "--default is only applicable to --get" msgstr "ะพะฟัะธััะฐ โ--defaultโ ะต ะฟัะธะปะพะถะธะผะฐ ัะฐะผะพ ะบัะผ ะพะฟัะธััะฐ โ--getโ" -#: builtin/config.c:731 +#: builtin/config.c:778 #, c-format msgid "unable to read config file '%s'" msgstr "ะบะพะฝัะธะณััะฐัะธะพะฝะฝะธัั ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/config.c:734 +#: builtin/config.c:781 msgid "error processing config file(s)" msgstr "ะณัะตัะบะฐ ะฟัะธ ะพะฑัะฐะฑะพัะบะฐัะฐ ะฝะฐ ะบะพะฝัะธะณััะฐัะธะพะฝะตะฝ ัะฐะนะป" -#: builtin/config.c:744 +#: builtin/config.c:791 msgid "editing stdin is not supported" msgstr "ะฝะต ัะต ะฟะพะดะดััะถะฐ ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" -#: builtin/config.c:746 +#: builtin/config.c:793 msgid "editing blobs is not supported" msgstr "ะฝะต ัะต ะฟะพะดะดััะถะฐ ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ะพะฑะตะบัะธ-BLOB" -#: builtin/config.c:760 +#: builtin/config.c:807 #, c-format msgid "cannot create configuration file %s" msgstr "ะบะพะฝัะธะณััะฐัะธะพะฝะฝะธัั ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝ" -#: builtin/config.c:773 +#: builtin/config.c:820 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12636,7 +14230,7 @@ msgstr "" "ะะฐ ะดะฐ ะฟัะพะผะตะฝะธัะต โ%sโ, ะฟะพะปะทะฒะฐะนัะต ัะตะณัะปััะตะฝ ะธะทัะฐะท ะธะปะธ ะพะฟัะธะธัะต โ--addโ ะธ โ--" "replace-allโ." -#: builtin/config.c:847 builtin/config.c:858 +#: builtin/config.c:894 builtin/config.c:905 #, c-format msgid "no such section: %s" msgstr "ัะฐะบัะฒ ัะฐะทะทะตะป ะฝัะผะฐ: %s" @@ -12649,11 +14243,41 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฐะทะผะตัะธัะต ะฝะฐ ะพะฑะตะบัะธัะต ะฒัะฒ ัะพัะผะฐั ะปะตัะฝะพ ัะตัะธะผ ะพั ั ะพัะฐ" -#: builtin/describe.c:27 +#: builtin/credential-cache--daemon.c:226 +#, 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 "" +"ะัะฐะฒะฐัะฐ ะทะฐ ะดะพัััะฟ ะดะพ ะดะธัะตะบัะพัะธััะฐ ะทะฐ ะฟัะพะณัะฐะผะฝะธัะต ะณะฝะตะทะดะฐ ัะฐ ะฟัะตะบะฐะปะตะฝะพ " +"ัะฒะพะฑะพะดะฝะธ โ\n" +"ะดััะณะธัะต ะฟะพััะตะฑะธัะตะปะธ ะผะพะณะฐั ะดะฐ ะฟะพะปััะฐั ะดะพัััะฟ ะดะพ ะบะตัะธัะฐะฝะธัะต ะฒะธ ะฟะฐัะพะปะธ. ะะฐ ะดะฐ\n" +"ะบะพัะธะณะธัะฐัะต ัะพะฒะฐ, ะธะทะฟัะปะฝะตัะต:\n" +"\n" +" chmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะพะฑัะตะฝะธััะฐ ะทะฐ ััะฐัะธัะฐะฝะต ะฝะฐ ััะฐะฝะดะฐััะฝะฐัะฐ ะณัะตัะบะฐ" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" +"ะดะตะผะพะฝัั ะทะฐ ะบะตัะฐ ั ะธะดะตะฝัะธัะธะบะฐัะธะธัะต ะต ะฝะตะดะพัััะฟะตะฝ โ ะปะธะฟัะฒะฐ ะฟะพะดะดััะถะบะฐ ะฝะฐ ะณะฝะตะทะดะฐ " +"ะฝะฐ unix" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "" +"ะบะตััั ั ะธะดะตะฝัะธัะธะบะฐัะธะธัะต ะต ะฝะตะดะพัััะฟะตะฝ โ ะปะธะฟัะฒะฐ ะฟะพะดะดััะถะบะฐ ะฝะฐ ะณะฝะตะทะดะฐ ะฝะฐ unix" + +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [ะะะฆะะฏโฆ] [ะฃะะะะะขะะ_ะะชะ_ะะะะะะะะโฆ]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [ะะะฆะะฏโฆ] --dirty" @@ -12669,37 +14293,32 @@ msgstr "ะบัะฐัะบะพ" msgid "annotated" msgstr "ะฐะฝะพัะธัะฐะฝะพ" -#: builtin/describe.c:273 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "ะฝะต ัััะตััะฒัะฒะฐ ะฐะฝะพัะธัะฐะฝ ะตัะธะบะตั โ%sโ" -#: builtin/describe.c:277 -#, c-format -msgid "annotated tag %s has no embedded name" -msgstr "ะฒ ะฐะฝะพัะธัะฐะฝะธั ะตัะธะบะตั โ%sโ ะปะธะฟัะฒะฐ ะฒะณัะฐะดะตะฝะพ ะธะผะต" - -#: builtin/describe.c:279 +#: builtin/describe.c:281 #, c-format -msgid "tag '%s' is really '%s' here" -msgstr "ะตัะธะบะตััั โ%sโ ััะบ ะต ะฒัััะฝะพัั โ%sโ" +msgid "tag '%s' is externally known as '%s'" +msgstr "ะตัะธะบะตััั โ%sโ ะต ะธะทะฒะตััะตะฝ ะดััะณะฐะดะต ะบะฐัะพ โ%sโ" -#: builtin/describe.c:323 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "ะฝะธะบะพะน ะตัะธะบะตั ะฝะต ะฝะฐะฟะฐัะฒะฐ ัะพัะฝะพ โ%sโ" -#: builtin/describe.c:325 +#: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "ะะธะบะพั ะฒะตััะธั ะธ ะตัะธะบะตั ะฝะต ะฝะฐะฟะฐัะฒะฐั ัะพัะฝะพ. ะขัััะธ ัะต ะฟะพ ะพะฟะธัะฐะฝะธะต\n" -#: builtin/describe.c:379 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "ััััะตะฝะตัะพ ะฟัะธะบะปััะธ ะฟัะธ โ%sโ\n" -#: builtin/describe.c:405 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12708,7 +14327,7 @@ msgstr "" "ะะธะบะพะน ะฐะฝะพัะธัะฐะฝ ะตัะธะบะตั ะฝะต ะพะฟะธัะฒะฐ โ%sโ.\n" "ะกััะตััะฒัะฒะฐั ะธ ะฝะตะฐะฝะพัะธัะฐะฝะธ ะตัะธะบะตัะธ. ะัะพะฑะฒะฐะนัะต ั ะพะฟัะธััะฐ โ--tagsโ." -#: builtin/describe.c:409 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12717,12 +14336,12 @@ msgstr "" "ะะธะบะพะน ะตัะธะบะตั ะฝะต ะพะฟะธัะฒะฐ โ%sโ.\n" "ะัะพะฑะฒะฐะนัะต ั ะพะฟัะธััะฐ โ--alwaysโ ะธะปะธ ััะทะดะฐะนัะต ะตัะธะบะตัะธ." -#: builtin/describe.c:439 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "ะฟัะตััััะตะฝะธ ัะฐ %lu ะฟะพะดะฐะฒะฐะฝะธั\n" -#: builtin/describe.c:442 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12731,150 +14350,160 @@ msgstr "" "ะพัะบัะธัะธ ัะฐ ะฝะฐะด %i ะตัะธะบะตัะฐ, ะธะทะฒะตะดะตะฝะธ ัะฐ ะฟะพัะปะตะดะฝะธัะต %i,\n" "ััััะตะฝะตัะพ ะฑะต ะฟัะตะบัะฐัะตะฝะพ ะฟัะธ โ%sโ.\n" -#: builtin/describe.c:510 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "ะพะฟะธัะฐะฝะธะต ะฝะฐ โ%sโ\n" -#: builtin/describe.c:513 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "ะะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั โ%sโ" -#: builtin/describe.c:521 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "โ%sโ ะฝะต ะต ะฝะธัะพ ะฟะพะดะฐะฒะฐะฝะต, ะฝะธัะพ ะพะฑะตะบั-BLOB" -#: builtin/describe.c:535 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "ะพัะบัะธะฒะฐะฝะต ะฝะฐ ะตัะธะบะตัะฐ, ะบะพะนัะพ ัะปะตะดะฒะฐ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/describe.c:536 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ััะฐัะธัะฐะฝะต ะฝะฐ ัััะฐัะตะณะธััะฐ ะทะฐ ััััะตะฝะต ะฝะฐ " "ััะฐะฝะดะฐััะฝะฐัะฐ ะณัะตัะบะฐ" -#: builtin/describe.c:537 +#: builtin/describe.c:556 msgid "use any ref" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฟัะพะธะทะฒะพะปะตะฝ ัะบะฐะทะฐัะตะป" -#: builtin/describe.c:538 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฒัะตะบะธ ะตัะธะบะตั โ ะฒะบะปััะธัะตะปะฝะพ ะธ ะฝะตะฐะฝะพัะธัะฐะฝะธัะต" -#: builtin/describe.c:539 +#: builtin/describe.c:558 msgid "always use long format" msgstr "ะฒะธะฝะฐะณะธ ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะดัะปะณะธัั ัะพัะผะฐั" -#: builtin/describe.c:540 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "ะฟัะพัะปะตะดัะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ะฟััะฒะธั ัะพะดะธัะตะป" -#: builtin/describe.c:543 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ัะพัะฝะธัะต ััะฒะฟะฐะดะตะฝะธั" -#: builtin/describe.c:545 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "ะดะฐ ัะต ััััะธ ัะฐะผะพ ะฒ ัะพะทะธ ะะ ะะ ะฟะพัะปะตะดะฝะธ ะตัะธะบะตัะธ (ััะฐะฝะดะฐััะฝะพ: 10)" -#: builtin/describe.c:547 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "ะดะฐ ัะต ััััะธ ัะฐะผะพ ะธะทะผะตะถะดั ะตัะธะบะตัะธัะต ะฝะฐะฟะฐัะฒะฐัะธ ัะพะทะธ ะจะะะะะ" -#: builtin/describe.c:549 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "ะดะฐ ะฝะต ัะต ััััะธ ะธะทะผะตะถะดั ะตัะธะบะตัะธัะต ะฝะฐะฟะฐัะฒะฐัะธ ัะพะทะธ ะจะะะะะ" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะบัะฐัะตะฝะพ ะธะผะต ะฝะฐ ะพะฑะตะบั ะบะฐัะพ ัะตะทะตัะฒะตะฝ ะฒะฐัะธะฐะฝั" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "ะะะ ะะะ " -#: builtin/describe.c:553 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะฐะบัะฒ ะะะ ะะะ ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ (ััะฐะฝะดะฐััะฝะพ ะต โ-dirtyโ)" -#: builtin/describe.c:556 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะฐะบัะฒ ะะะ ะะะ ะฝะฐ ัััะฟะตะฝะพัะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ (ััะฐะฝะดะฐััะฝะพ ะต โ-brokenโ)" -#: builtin/describe.c:574 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "ะะฟัะธะธัะต โ--longโ ะธ โ--abbrev=0โ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/describe.c:603 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "ะะต ัะฐ ะพัะบัะธัะธ ะธะผะตะฝะฐ โ ะฝะธัะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฟะธัะฐะฝะพ." -#: builtin/describe.c:654 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "ะพะฟัะธััะฐ โ--dirtyโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ัะบะฐะทะฐัะตะป ะบัะผ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/describe.c:656 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "ะพะฟัะธััะฐ โ--brokenโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ัะบะฐะทะฐัะตะป ะบัะผ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/diff.c:84 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "โ%sโ: ะฝะต ะต ะฝะธัะพ ะพะฑะธะบะฝะพะฒะตะฝ ัะฐะนะป, ะฝะธัะพ ัะธะผะฒะพะปะฝะฐ ะฒััะทะบะฐ" -#: builtin/diff.c:235 +#: builtin/diff.c:241 #, c-format msgid "invalid option: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะพะฟัะธั: %s" -#: builtin/diff.c:350 +#: builtin/diff.c:358 +#, c-format +msgid "%s...%s: no merge base" +msgstr "โ%s..%sโ: ะปะธะฟัะฒะฐ ะฑะฐะทะฐ ะทะฐ ัะปะธะฒะฐะฝะต" + +#: builtin/diff.c:468 msgid "Not a git repository" msgstr "ะะต ะต ั ัะฐะฝะธะปะธัะต ะฝะฐ Git" -#: builtin/diff.c:394 +#: builtin/diff.c:513 #, c-format msgid "invalid object '%s' given." msgstr "ะทะฐะดะฐะดะตะฝ ะต ะฝะตะฟัะฐะฒะธะปะตะฝ ะพะฑะตะบั โ%sโ." -#: builtin/diff.c:403 +#: builtin/diff.c:524 #, c-format msgid "more than two blobs given: '%s'" msgstr "ะทะฐะดะฐะดะตะฝะธ ัะฐ ะฟะพะฒะตัะต ะพั 2 ะพะฑะตะบัะฐ-BLOB: โ%sโ" -#: builtin/diff.c:408 +#: builtin/diff.c:529 #, c-format msgid "unhandled object '%s' given." msgstr "ะทะฐะดะฐะดะตะฝ ะต ะฝะตะฟะพะดะดััะถะฐะฝ ะพะฑะตะบั โ%sโ." +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "%s...%s: ะผะฝะพะณะพ ะฑะฐะทะธ ะทะฐ ัะปะธะฒะฐะฝะต, ัะต ัะต ะฟะพะปะทะฒะฐ โ%sโ" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [ะะะฆะะฏโฆ] [ะะะะะะะะ [ะะะะะะะะ]] [[--] ะะชะขโฆ]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "ะฝะตััะฟะตัะฝะพ ะดะตะนััะฒะธะต ั ะธะทั ะพะดะตะฝ ะบะพะด: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "ัะธะผะฒะพะปะฝะฐัะฐ ะฒััะทะบะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะฐ" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "ัะฐะนะปัั, ัะพัะตะฝ ะพั ัะธะผะฒะพะปะฝะฐัะฐ ะฒััะทะบะฐ โ%sโ, ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "ะพะฑะตะบััั โ%sโ ะทะฐ ัะธะผะฒะพะปะฝะฐัะฐ ะฒััะทะบะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/difftool.c:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12882,55 +14511,55 @@ msgstr "" "ะบะพะผะฑะธะฝะธัะฐะฝะธัะต ัะพัะผะฐัะธ ะฝะฐ ัะฐะทะปะธะบะธัะต (โ-cโ ะธ โ--ccโ) ะฝะต ัะต ะฟะพะดะดััะถะฐั\n" "ะฒ ัะตะถะธะผะฐ ะทะฐ ัะฐะทะปะธะบะธ ะฒััั ั ะดะธัะตะบัะพัะธะธ (โ-dโ ะธ โ--dir-diffโ)." -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ะธ ะดะฒะฐัะฐ ัะฐะนะปะฐ ัะฐ ะฟัะพะผะตะฝะตะฝะธ: โ%sโ ะธ โ%sโ." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะต ะธะทะพััะฐะฒะตะฝะพ." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "ะฒ โ%sโ ะธะผะฐ ะฒัะตะผะตะฝะฝะธ ัะฐะนะปะพะฒะต." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "ะฒัะทะผะพะถะฝะพ ะต ะดะฐ ะณะธ ะธะทัะธััะธัะต ะธะปะธ ะฒัะทััะฐะฝะพะฒะธัะต" -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "ะธะทะฟะพะปะทะฒะฐะนัะต โdiff.guitoolโ ะฒะผะตััะพ โdiff.toolโ" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "ัะฐะทะปะธะบะฐ ะฟะพ ะดะธัะตะบัะพัะธะธ" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "ััะฐััะธัะฐะฝะต ะฝะฐ ะะ ะะะ ะะะัะฐ ะทะฐ ัะฐะทะปะธะบะธ ะฑะตะท ะฟัะตะดัะฟัะตะถะดะตะฝะธะต" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "ัะปะตะดะฒะฐะฝะต ะฝะฐ ัะธะผะฒะพะปะฝะธัะต ะฒััะทะบะธ ะฟัะธ ัะฐะทะปะธะบะฐ ะฟะพ ะดะธัะตะบัะพัะธะธ" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "ะะ ะะะ ะะะ" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐะฝะฐัะฐ ะะ ะะะ ะะะ" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฟะธััะบ ั ะฒัะธัะบะธ ะะ ะะะ ะะะธ, ะบะพะธัะพ ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐั ั ะพะฟัะธััะฐ โ--" "toolโ" -#: builtin/difftool.c:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12938,31 +14567,31 @@ msgstr "" "โgit-difftoolโ ะดะฐ ัะฟัะต ัะฐะฑะพัะฐ, ะบะพะณะฐัะพ ััะฐััะธัะฐะฝะฐัะฐ ะะ ะะะ ะะะ ะทะฐะฒัััะธ ั " "ะฝะตะฝัะปะตะฒ ะบะพะด" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "ะบะพะผะฐะฝะดะฐ ะทะฐ ัะฐะทะณะปะตะถะดะฐะฝะต ะฝะฐ ัะฐะทะปะธะบะธ" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "ะฟะพะดะฐะฒะฐ ัะต ะบัะผ โdiffโ" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "โgit-difftoolโ ะธะทะธัะบะฒะฐ ัะฐะฑะพัะฝะพ ะดััะฒะพ ะธะปะธ ะพะฟัะธััะฐ โ--no-indexโ" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "ะพะฟัะธะธัะต โ--dir-diffโ ะธ โ--no-indexโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "ะพะฟัะธะธัะต โ--guiโ, โ--toolโ ะธ โ--extcmdโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ะตะดะฝะฐ ั ะดััะณะฐ" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ ะฟัะพะณัะฐะผะฐ ะทะฐ โ--tool=ะะ ะะะ ะะะโ" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ ะบะพะผะฐะฝะดะฐ ะทะฐ โ--extcmd=ะะะะะะะโ" @@ -12970,26 +14599,26 @@ msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ ะบะพะผะฐะฝะดะฐ ะทะฐ โ--extcmd=ะะะะะะะโ 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 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "ะะะ" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "ััะฐะฝะดะฐััะฝะฐ, ัะตะทะตัะฒะฝะฐ ััะพะนะฝะพัั ะทะฐ โgit_env_*(โฆ)โ" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "" "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั โ ััะพะนะฝะพัััะฐ ะฝะฐ โgit_env_*()โ ะดะฐ ะต ะธะทั ะพะดะตะฝ ะบะพะด" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" "ะพะฟัะธััะฐ โ--defaultโ ะธะทะธัะบะฒะฐ ะฑัะปะตะฒะฐ ััะพะนะฝะพัั ะฟัะธ โ--type=boolโ, ะฐ ะฝะต โ%sโ" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -13002,160 +14631,240 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [ะะะฆะะ_ะะ_ะกะะะกะชะะ_ะก_ะะะ ะกะะ]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:868 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" +"ะัะตัะบะฐ: ะฝะตะฟัะตะบะธัะต ะตัะธะบะตัะธ ะฝะต ัะต ะธะทะฝะฐััั, ะพัะฒะตะฝ ะฐะบะพ ะฝะต ะทะฐะดะฐะดะตัะต โ--mark-tagsโ." + +#: builtin/fast-export.c:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "ะพะฟัะธััะฐ โ--anonymize-mapโ ะธะทะธัะบะฒะฐ ะฐัะณัะผะตะฝั" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "ะกัะพะฑัะตะฝะธะต ะทะฐ ะฝะฐะฟัะตะดัะบะฐ ะฝะฐ ะฒัะตะบะธ ัะฐะบัะฒ ะะ ะะ ะพะฑะตะบัะฐ" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "ะะฐะบ ะดะฐ ัะต ะพะฑัะฐะฑะพัะฒะฐั ะฟะพะดะฟะธัะฐะฝะธัะต ะตัะธะบะตัะธ" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "ะะฐะบ ะดะฐ ัะต ะพะฑัะฐะฑะพัะฒะฐั ะตัะธะบะตัะธัะต ะฝะฐ ัะธะปััะธัะฐะฝะธัะต ะพะฑะตะบัะธ" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1206 msgid "select handling of commit messages in an alternate encoding" msgstr "" "ะบะฐะบ ะดะฐ ัะต ะพะฑัะฐะฑะพัะฒะฐั ััะพะฑัะตะฝะธััะฐ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต, ะบะพะธัะพ ัะฐ ะฒ ะดััะณะพ ะบะพะดะธัะฐะฝะต" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" msgstr "ะะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะผะฐัะบะตัะธัะต ะฒ ัะพะทะธ ะคะะะ" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" msgstr "ะะฝะฐััะฝะต ะฝะฐ ะผะฐัะบะตัะธัะต ะพั ัะพะทะธ ะคะะะ" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1215 +msgid "Import marks from this file if it exists" +msgstr "ะะฝะฐััะฝะต ะฝะฐ ะผะฐัะบะตัะธัะต ะพั ัะพะทะธ ะคะะะ, ะฐะบะพ ัััะตััะฒัะฒะฐ" + +#: builtin/fast-export.c:1217 msgid "Fake a tagger when tags lack one" msgstr "ะะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ะธะทะบัััะฒะตะฝะพ ะธะผะต ะฝะฐ ัะพะฒะตะบ ะฟัะธ ะปะธะฟัะฐ ะฝะฐ ะทะฐะดะฐะฒะฐั ะตัะธะบะตัะฐ" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1219 msgid "Output full tree for each commit" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะปะพัะพ ะดััะฒะพ ะทะฐ ะฒััะบะพ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1221 msgid "Use the done feature to terminate the stream" msgstr "ะะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะผะฐัะบะตั ะทะฐ ะทะฐะฒัััะฒะฐะฝะต ะฝะฐ ะฟะพัะพะบะฐ" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "ะะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะฝะฐ ะพะฑะตะบัะธัะต-BLOB" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1223 builtin/log.c:1811 msgid "refspec" msgstr "ะฃะะะะะขะะ_ะะ_ะะะ ะกะะฏ" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1224 msgid "Apply refspec to exported refs" msgstr "ะัะธะปะฐะณะฐะฝะต ะฝะฐ ะฃะะะะะขะะั_ะะ_ะะะ ะกะะฏ ะบัะผ ะธะทะฝะตัะตะฝะธัะต ัะบะฐะทะฐัะตะปะธ" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "ะฐะฝะพะฝะธะผะธะทะธัะฐะฝะต ะฝะฐ ะธะทะฒะตะถะดะฐะฝะฐัะฐ ะธะฝัะพัะผะฐัะธั" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "ะะข:ะะชะ" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "ะทะฐะผะตััะฒะฐะฝะต ะะข ััั ะะชะ ะฒ ะฐะฝะพะฝะธะผะธะทะธัะฐะฝะธั ะธะทั ะพะด" + +#: builtin/fast-export.c:1230 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "ะฃะบะฐะทะฒะฐะฝะต ะฝะฐ ัะพะดะธัะตะปะธัะต, ะบะพะธัะพ ะฝะต ัะฐ ะฒ ะฟะพัะพะบะฐ ะฝะฐ ะฑััะทะพ ะธะทะฝะฐััะฝะต, ั " "ะธะดะตะฝัะธัะธะบะฐัะพั ะฝะฐ ะพะฑะตะบั" -#: builtin/fast-export.c:1151 +#: builtin/fast-export.c:1232 msgid "Show original object ids of blobs/commits" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟััะฒะพะฝะฐัะฐะปะฝะธัะต ะธะดะตะฝัะธัะธะบะฐัะพัะธ ะฝะฐ ะพะฑะตะบัะธัะต BLOB/ะฟะพะดะฐะฒัะฝะธั" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1234 +msgid "Label tags with mark ids" +msgstr "ะะฐะดะฐะฒะฐะฝะต ะฝะฐ ะธะดะตะฝัะธัะธะบะฐัะพัะธ ะฝะฐ ะผะฐัะบะตัะธ ะฝะฐ ะตัะธะบะตัะธัะต" + +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "ะพะฟัะธััะฐ โ--anonymize-mapโ ะธะทะธัะบะฒะฐ โ--anonymizeโ" + +#: builtin/fast-export.c:1272 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "ะพะฟัะธะธัะต โ--import-marksโ ะธ โ--import-marks-if-existsโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/fast-import.c:3086 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "ะะธะฟัะฒะฐั ะผะฐัะบะตัะธ โะพัโ ะทะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "ะะธะฟัะฒะฐั ะผะฐัะบะตัะธ โะดะพโ ะทะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "ะัะฐะบะฒะฐ ัะต ะบะพะผะฐะฝะดะฐ โmarkโ, ะฐ ะฑะต ะฟะพะปััะตะฝะฐ: โ%sโ" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "ะัะฐะบะฒะฐ ัะต ะบะพะผะฐะฝะดะฐ โtoโ, ะฐ ะฑะต ะฟะพะปััะตะฝะฐ: โ%sโ" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "ะะฟัะธััะฐ ะทะฐ ะฟัะตะทะฐะฟะธั ะฝะฐ ะฟะพะดะผะพะดัะป ะธะทะธัะบะฒะฐ ัะพัะผะฐั: ะธะผะต:ะธะผะต_ะฝะฐ_ัะฐะนะป" + +#: builtin/fast-import.c:3374 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "โ%sโ ะธะทะธัะบะฒะฐ ะธะทัะธัะฝะพัะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟัะธััะฐ โ--allow-unsafe-featuresโ" + +#: builtin/fetch-pack.c:241 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "ะะฐะบะปััะฒะฐัะธัั ัะฐะนะป ะต ััะทะดะฐะดะตะฝ, ะฝะพ ะฝะต ะต ะดะพะบะปะฐะดะฒะฐะฝ: โ%sโ" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [ะะะฆะะฏโฆ] [ะฅะ ะะะะะะฉะ [ะฃะะะะะขะะโฆ]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [ะะะฆะะฏโฆ] ะะ ะฃะะ" -#: builtin/fetch.c:32 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [ะะะฆะะฏโฆ] [(ะฅะ ะะะะะะฉะ | ะะ ะฃะะ)โฆ]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [ะะะฆะะฏโฆ]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "ะพะฟัะธััะฐ โfetch.parallelโ ัััะฑะฒะฐ ะดะฐ ะต ะฝะตะพััะธัะฐัะตะปะฝะฐ" + +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "ะดะพััะฐะฒัะฝะต ะพั ะฒัะธัะบะธ ะพัะดะฐะปะตัะตะฝะธ ั ัะฐะฝะธะปะธัะฐ" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:144 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะบะปะพะฝ ะทะฐ ัะปะตะดะตะฝะต ะทะฐ ะธะทะดััะฟะฒะฐะฝะต/ะดะพััะฐะฒัะฝะต" + +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ะดะพะฑะฐะฒัะฝะต ะบัะผ โ.git/FETCH_HEADโ ะฒะผะตััะพ ะทะฐะผัะฝะฐ" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "ะพัะดะฐะปะตัะตะฝ ะฟัั, ะบัะดะตัะพ ะดะฐ ัะต ะบะฐัะธ ะฟะฐะบะตััั" -#: builtin/fetch.c:130 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "ะฟัะธะฝัะดะธัะตะปะฝะพ ะฟัะตะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะปะพะบะฐะปะตะฝ ัะบะฐะทะฐัะตะป" -#: builtin/fetch.c:132 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "ะดะพััะฐะฒัะฝะต ะพั ะผะฝะพะถะตััะฒะพ ะพัะดะฐะปะตัะตะฝะธ ั ัะฐะฝะธะปะธัะฐ" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "ะดะพััะฐะฒัะฝะต ะฝะฐ ะฒัะธัะบะธ ะตัะธะบะตัะธ ะธ ะฟัะธะฝะฐะดะปะตะถะฐัะธ ะพะฑะตะบัะธ" -#: builtin/fetch.c:136 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "ะฑะตะท ะดะพััะฐะฒัะฝะตัะพ ะฝะฐ ะฒัะธัะบะธ ะตัะธะบะตัะธ โ--no-tagsโ" -#: builtin/fetch.c:138 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "ะฑัะพะน ะฟะพะดะผะพะดัะปะธ ะดะพััะฐะฒะตะฝะธ ะฟะฐัะฐะปะตะปะฝะพ" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:159 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "ะพะบะฐััััะฝะต ะฝะฐ ะบะปะพะฝะธัะต ัะปะตะดััะธ ะฒะตัะต ะฝะตัััะตััะฒัะฒะฐัะธ ะพัะดะฐะปะตัะตะฝะธ ะบะปะพะฝะธ" -#: builtin/fetch.c:142 +#: builtin/fetch.c:161 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "ะพะบะฐััััะฝะต ะฝะฐ ะปะพะบะฐะปะฝะธัะต ะตัะธะบะตัะธ, ะบะพะธัะพ ะฒะตัะต ะฝะต ัััะตััะฒัะฒะฐั ะฒ ะพัะดะฐะปะตัะตะฝะพัะพ " "ั ัะฐะฝะธะปะธัะต ะธ ะฟัะตะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะตะฝะธัะต" -#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "ะะ ะ ะะฃะะะ" -#: builtin/fetch.c:144 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "ัะฟัะฐะฒะปะตะฝะธะต ะฝะฐ ัะตะบัััะธะฒะฝะพัะพ ะดะพััะฐะฒัะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะธัะต" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะดะพััะฐะฒะตะฝะธัะต ัะบะฐะทะฐัะตะปะธ ะฒัะฒ ัะฐะนะปะฐ โFETCH_HEADโ" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะธะทัะตะณะปะตะฝะธัะต ะฟะฐะบะตัะธ ั ะพะฑะตะบัะธ" -#: builtin/fetch.c:150 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะพะฑะฝะพะฒัะฒะฐะฝะตัะพ ะฝะฐ ัะบะฐะทะฐัะตะปั โHEADโ" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "ะทะฐะดัะปะฑะพัะฐะฒะฐะฝะต ะฝะฐ ะธััะพัะธััะฐ ะฝะฐ ะฟะปะธัะบะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/fetch.c:155 +#: builtin/fetch.c:176 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "ะทะฐะดัะปะฑะพัะฐะฒะฐะฝะต ะฝะฐ ะธััะพัะธััะฐ ะฝะฐ ะฟะปะธัะบะพ ั ัะฐะฝะธะปะธัะต ะดะพ ะพะฟัะตะดะตะปะตะฝะพ ะฒัะตะผะต" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "ะฟัะตะฒัััะฐะฝะต ะฒ ะฟัะปะฝะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/fetch.c:164 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะพะฒะฐ ะฟัะตะด ะฟััั ะฝะฐ ะฟะพะดะผะพะดัะปะฐ" -#: builtin/fetch.c:167 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -13163,90 +14872,98 @@ msgstr "" "ััะฐะฝะดะฐััะฝะพ ัะตะบัััะธะฒะฝะพ ะธะทัะตะณะปัะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะธัะต (ัะฐะนะปะพะฒะตัะต ั ะฝะฐัััะพะนะบะธ ัะฐ ั " "ะฟัะธะพัะธัะตั)" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "ะฟัะธะตะผะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธ, ะบะพะธัะพ ะพะฑะฝะพะฒัะฒะฐั โ.git/shallowโ" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "ะะะ ะขะ_ะก_ะฃะะะะะขะะะ" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "ัะบะฐะทะฒะฐะฝะต ะฝะฐ ะะะ ะขะัะฐ_ะก_ะฃะะะะะขะะะ ะทะฐ ะดะพััะฐะฒัะฝะต" -#: builtin/fetch.c:180 +#: builtin/fetch.c:201 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "ะดะพะบะปะฐะดะฒะฐะฝะต, ัะต ะฒัะธัะบะธ ะพะฑะตะบัะธ ะผะพะณะฐั ัะฐ ะดะพััะธะถะธะผะธ ะฟัะธ ะทะฐะฟะพัะฒะฐะฝะต ะพั ัะพะทะธ" -#: builtin/fetch.c:183 -msgid "run 'gc --auto' after fetching" -msgstr "ะธะทะฟัะปะฝัะฒะฐะฝะต ะฝะฐ โgc --autoโ ัะปะตะด ะดะพััะฐะฒัะฝะต" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "ะธะทะฟัะปะฝัะฒะฐะฝะต ะฝะฐ โmaintenance --autoโ ัะปะตะด ะดะพััะฐะฒัะฝะต" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "ะฟัะพะฒะตัะบะฐ ะทะฐ ะฟัะธะฝัะดะธัะตะปะฝะธ ะพะฑะฝะพะฒัะฒะฐะฝะธั ะฝะฐ ะฒัะธัะบะธ ะบะปะพะฝะธ" -#: builtin/fetch.c:491 +#: builtin/fetch.c:210 +msgid "write the commit-graph after fetching" +msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะณัะฐฬัะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ัะปะตะด ะดะพััะฐะฒัะฝะต" + +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "ัะตัะตะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะพั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะฒ ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธั" -#: builtin/fetch.c:630 +#: builtin/fetch.c:677 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "ะฝะฐัััะพะนะบะฐัะฐ โfetch.outputโ ะต ั ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั โ%sโ" -#: builtin/fetch.c:728 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "ะพะฑะตะบััั โ%sโ ะปะธะฟัะฒะฐ" -#: builtin/fetch.c:732 +#: builtin/fetch.c:779 msgid "[up to date]" -msgstr "[ะฐะบััะฐะปะธะทะธัะฐะฝ]" +msgstr "[ะฐะบััะฐะปะตะฝ]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[ะพัั ะฒััะปะตะฝ]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "ะฒ ัะตะบััะธั ะบะปะพะฝ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพััะฐะฒั" -#: builtin/fetch.c:756 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะตัะธะบะตัะธัะต]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "ะปะพะบะฐะปะตะฝ ัะบะฐะทะฐัะตะป ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ" -#: builtin/fetch.c:761 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "ัััะตััะฒัะฒะฐั ะตัะธะบะตั ัะต ะฑัะดะต ะฟัะตะทะฐะฟะธัะฐะฝ" -#: builtin/fetch.c:783 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[ะฝะพะฒ ะตัะธะบะตั]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[ะฝะพะฒ ะบะปะพะฝ]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[ะฝะพะฒ ัะบะฐะทะฐัะตะป]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:875 msgid "forced update" msgstr "ะฟัะธะฝัะดะธัะตะปะฝะพ ะพะฑะฝะพะฒัะฒะฐะฝะต" -#: builtin/fetch.c:833 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "ัััะธะฝัะบะพ ัะปะธะฒะฐะฝะต" -#: builtin/fetch.c:854 +#: builtin/fetch.c:901 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" @@ -13257,7 +14974,7 @@ msgstr "" "\n" " git config fetch.showForcedUpdates true" -#: builtin/fetch.c:858 +#: builtin/fetch.c:905 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13266,29 +14983,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:888 +#: builtin/fetch.c:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "ั ัะฐะฝะธะปะธัะตัะพ โ%sโ ะฝะต ะธะทะฟัะฐัะธ ะฒัะธัะบะธ ะฝะตะพะฑั ะพะดะธะผะธ ะพะฑะตะบัะธ\n" -#: builtin/fetch.c:909 +#: builtin/fetch.c:960 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "ะพัั ะฒััะปัะฝะต ะฝะฐ ะฒััั ะฐ โ%sโ, ะทะฐัะพัะพ ะฟะปะธัะบะธัะต ั ัะฐะฝะธะปะธัะฐ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั " "ะพะฑะฝะพะฒัะฒะฐะฝะธ" -#: builtin/fetch.c:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "ะั %.*s\n" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13298,58 +15015,80 @@ msgstr "" "โgit remote prune %sโ, ะทะฐ ะดะฐ ะฟัะตะผะฐั ะฝะตัะต ะพััะฐัะตะปะธัะต ะบะปะพะฝะธ, ะบะพะธัะพ\n" "ะฟัะตะดะธะทะฒะธะบะฒะฐั ะบะพะฝัะปะธะบัะฐ" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr " (ะพะฑะตะบััั โ%sโ ัะต ัะต ะพะบะฐะถะต ะธะทะฒัะฝ ะบะปะพะฝ)" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " (ะพะฑะตะบััั โ%sโ ะฒะตัะต ะต ะธะทะฒัะฝ ะบะปะพะฝ)" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[ะธะทััะธั]" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1195 builtin/remote.c:1113 msgid "(none)" msgstr "(ะฝะธัะพ)" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1218 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "ะะต ะผะพะถะต ะดะฐ ะดะพััะฐะฒะธัะต ะฒ ัะตะบััะธั ะบะปะพะฝ โ%sโ ะฝะฐ ั ัะฐะฝะธะปะธัะต, ะบะพะตัะพ ะฝะต ะต ะณะพะปะพ" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1237 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "ะกัะพะนะฝะพัััะฐ โ%2$sโ ะทะฐ ะพะฟัะธััะฐ โ%1$sโ ะฝะต ะต ััะฒะผะตััะธะผะฐ ั โ%3$sโ" -#: builtin/fetch.c:1180 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "ะะฟัะธััะฐ โ%sโ ัะต ะฟัะตัะบะฐัะฐ ะฟัะธ โ%sโ\n" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "" +"ะทะฐัะตัะตะฝะธ ัะฐ ะผะฝะพะถะตััะฒะพ ะบะปะพะฝะธ, ัะพะฒะฐ ะต ะฝะตััะฒะผะตััะธะผะพ ั ะพะฟัะธััะฐ โ--set-upstreamโ" + +#: builtin/fetch.c:1463 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะบะฐะทะฒะฐัะต ะบะปะพะฝ ะทะฐ ัะปะตะดะตะฝะต ะฝะฐ ะพัะดะฐะปะตัะตะฝ ะตัะธะบะตั" + +#: builtin/fetch.c:1465 +msgid "not setting upstream for a remote tag" +msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะบะฐะทะฒะฐัะต ะบะปะพะฝ ะทะฐ ัะปะตะดะตะฝะต ะฝะฐ ะพัะดะฐะปะตัะตะฝ ะตัะธะบะตั" + +#: builtin/fetch.c:1467 +msgid "unknown branch type" +msgstr "ะฝะตะฟะพะทะฝะฐั ะฒะธะด ะบะปะพะฝ" + +#: builtin/fetch.c:1469 +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:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "ะะพััะฐะฒัะฝะต ะฝะฐ โ%sโ\n" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพััะฐะฒะธ" -#: builtin/fetch.c:1532 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" -msgstr "" -"ะพะฟัะธััะฐ โ--filterโ ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ัะฐะผะพ ั ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต ัะบะฐะทะฐะฝะพ ะฒ " -"ะฝะฐัััะพะนะบะฐัะฐ โextensions.partialCloneโ" +#: builtin/fetch.c:1620 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพััะฐะฒะธ (ะธะทั ะพะดะฝะธัั ะบะพะด ะต: %d)\n" -#: builtin/fetch.c:1556 +#: builtin/fetch.c:1724 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13357,45 +15096,45 @@ msgstr "" "ะะต ััะต ัะบะฐะทะฐะปะธ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต. ะะฐะดะฐะนัะต ะธะปะธ ะฐะดัะตั, ะธะปะธ ะธะผะต\n" "ะฝะฐ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต, ะพัะบัะดะตัะพ ะดะฐ ัะต ะดะพััะฐะฒัั ะฝะพะฒะธัะต ะฒะตััะธะธ." -#: builtin/fetch.c:1593 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "ะขััะฑะฒะฐ ะดะฐ ัะบะฐะถะตัะต ะธะผะต ะฝะฐ ะตัะธะบะตั." -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "ะััะธัะฐัะตะปะฝะฐ ะดัะปะฑะพัะธะฝะฐ ะบะฐัะพ ะฐัะณัะผะตะฝั ะฝะฐ โ--deepenโ ะฝะต ัะต ะฟะพะดะดััะถะฐ" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" -msgstr "ะะฟัะธะธัะต โ--deepenโ ะธ โ--depthโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ะตะดะฝะฐ ั ะดััะณะฐ" +msgstr "ะพะฟัะธะธัะต โ--deepenโ ะธ โ--depthโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "ะพะฟัะธะธัะต โ--depthโ ะธ โ--unshallowโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "ะฝะต ะผะพะถะตัะต ะดะฐ ะธะทะฟะพะปะทะฒะฐัะต ะพะฟัะธััะฐ โ--unshallowโ ะฒััั ั ะฟัะปะฝะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/fetch.c:1669 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "ะบัะผ โgit fetch --allโ ะฝะต ะผะพะถะตัะต ะดะฐ ะดะพะฑะฐะฒะธัะต ะฐัะณัะผะตะฝั โ ั ัะฐะฝะธะปะธัะต" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "" "ะบัะผ โgit fetch --allโ ะฝะต ะผะพะถะตัะต ะดะฐ ะดะพะฑะฐะฒะธัะต ะฐัะณัะผะตะฝั โ ัะบะฐะทะฐัะตะป ะฝะฐ ะฒะตััะธั" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "ะัะผะฐ ะฝะธัะพ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต, ะฝะธัะพ ะณััะฟะฐ ะพั ั ัะฐะฝะธะปะธัะฐ ะฝะฐ ะธะผะต โ%sโ" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1869 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "ะฃะบะฐะทะฒะฐะฝะตัะพ ะฝะฐ ะณััะฟะฐ ะธ ัะบะฐะทะฒะฐะฝะตัะพ ะฝะฐ ะฒะตััะธั ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/fetch.c:1703 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13403,31 +15142,35 @@ msgstr "" "ะพะฟัะธััะฐ โ--filterโ ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ัะฐะผะพ ั ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต ัะบะฐะทะฐะฝะพ ะฒ " "ะฝะฐัััะพะนะบะฐัะฐ โextensions.partialCloneโ" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "ะพะฟัะธััะฐ โ--stdinโ ะฟะพะดะดััะถะฐ ะดะพััะฐะฒัะฝะต ัะฐะผะพ ะพั ะตะดะฝะพ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต" + +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m ะกะชะะะฉะะะะ] [--log[=ะะ ะะ] | --no-log] [--file ะคะะะ]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 msgid "populate log with at most <n> entries from shortlog" msgstr "" "ะฒะผัะบะฒะฐะฝะต ะฝะฐ ะถััะฝะฐะป ััััะพัั ัะต ะพั ะฝะต ะฟะพะฒะตัะต ะพั ะะ ะะ ะทะฐะฟะธัะฐ ะพั ััะบัะฐัะตะฝะธั " "ะถััะฝะฐะป" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" -msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ--logโ (ะพััะฐััะปะพ)" +msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ--logโ (ะะกะขะะ ะฏะะ)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "ะขะะะกะข" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "ะทะฐ ะฝะฐัะฐะปะพ ะฝะฐ ััะพะฑัะตะฝะธะตัะพ ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะขะะะกะข" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "ัะฐะนะป, ะพั ะบะพะนัะพ ะดะฐ ัะต ัะตัะต" @@ -13440,8 +15183,8 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points ะะะะะข]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref[(--merged | --no-merged) [ะะะะะะะะ]]" +msgid "git for-each-ref [--merged [<commit>]] [--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>]]" @@ -13467,7 +15210,7 @@ msgstr "ัะธัะธัะฐะฝะต ะฟะพะดั ะพะดััะพ ะทะฐ tcl" msgid "show only <n> matched refs" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ัะพะทะธ ะะ ะะ ะฝะฐะฟะฐัะฝะฐัะธ ัะบะฐะทะฐัะตะปะธ" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "ัะฟะฐะทะฒะฐะฝะต ะฝะฐ ัะฒะตัะพะฒะตัะต ะฝะฐ ัะพัะผะฐฬัะฐ" @@ -13491,32 +15234,32 @@ msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต, ะบะพะธัะพ ัั msgid "print only refs which don't contain the commit" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต, ะบะพะธัะพ ะฝะต ััะดััะถะฐั ัะพะฒะฐ ะะะะะะะะ" -#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "ะฝะตะฟะพะทะฝะฐั" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, c-format msgid "error in %s %s: %s" msgstr "ะณัะตัะบะฐ ะฒ %s โ%sโ: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:131 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" msgstr "ะฟัะตะดัะฟัะตะถะดะตะฝะธะต ะทะฐ %s โ%sโ: %s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "ัะบััะฐะฝะฐ ะฒััะทะบะฐ ะพั %7s %s" -#: builtin/fsck.c:168 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฒะธะด ะพะฑะตะบั ะฒัะฒ ะฒััะทะบะฐัะฐ" -#: builtin/fsck.c:184 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" @@ -13525,236 +15268,236 @@ msgstr "" "ัะบััะฐะฝะฐ ะฒััะทะบะฐ ะพั %7s %s\n" " ะบัะผ %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "ะปะธะฟัะฒะฐั ะพะฑะตะบั: %s โ%sโ" -#: builtin/fsck.c:321 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "ะฝะตะดะพััะธะถะธะผ ะพะฑะตะบั: %s โ%sโ" -#: builtin/fsck.c:340 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "ะธะทะฒัะฝ ะบะปะพะฝ: %s โ%sโ" -#: builtin/fsck.c:349 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "โlost-foundโ ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต" -#: builtin/fsck.c:360 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฒัััะธ" -#: builtin/fsck.c:377 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ โ%sโ" -#: builtin/fsck.c:415 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ัะฒััะทะฐะฝะพัััะฐ (%d ะพะฑะตะบัะฐ)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "ะัะพะฒะตััะฒะฐะฝะต ะฝะฐ %s โ%sโ" -#: builtin/fsck.c:438 +#: builtin/fsck.c:430 msgid "broken links" msgstr "ัะบััะฐะฝะธ ะฒััะทะบะธ" -#: builtin/fsck.c:447 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "ะฝะฐัะฐะปะฝะฐ ะดะธัะตะบัะพัะธั โ%sโ" -#: builtin/fsck.c:455 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "ะฟัะธะปะพะถะตะฝ ะตัะธะบะตั โ%sโ ะฒััั ั โ%sโ (%s) ะฒ โ%sโ" -#: builtin/fsck.c:484 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: ะปะธะฟัะฒะฐั ะธะปะธ ะฟะพะฒัะตะดะตะฝ ะพะฑะตะบั" -#: builtin/fsck.c:509 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: ะฝะตะฟัะฐะฒะธะปะตะฝ ะทะฐะฟะธั ะฒ ะถััะฝะฐะปะฐ ะทะฐ ัะบะฐะทะฐัะตะปะธ โ%sโ" -#: builtin/fsck.c:523 +#: builtin/fsck.c:515 #, c-format msgid "Checking reflog %s->%s" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะถััะฝะฐะปะฐ ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต: โ%sโ ะดะพ โ%sโ" -#: builtin/fsck.c:557 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "โ%sโ: ะฝะตะฟัะฐะฒะธะปะตะฝ ัะบะฐะทะฐัะตะป ะทะฐ SHA1: โ%sโ" -#: builtin/fsck.c:564 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "%s: ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต!" -#: builtin/fsck.c:619 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "ะฒะฝะธะผะฐะฝะธะต: ะฝัะผะฐ ัะบะฐะทะฐัะตะปะธ ะฟะพ ะฟะพะดัะฐะทะฑะธัะฐะฝะต" -#: builtin/fsck.c:634 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "โ%sโ: ะปะธะฟัะฒะฐั ะพะฑะตะบั: โ%sโ" -#: builtin/fsck.c:647 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "โ%sโ: ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ: โ%sโ" -#: builtin/fsck.c:667 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะด ั ะบะพะฝััะพะปะฝะฐ ััะผะฐ ะฟะพ SHA1: โ%sโ" -#: builtin/fsck.c:682 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะดะธัะตะบัะพัะธั ั ะพะฑะตะบัะธ" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะดะธัะตะบัะพัะธะธัะต ั ะพะฑะตะบัะธ" -#: builtin/fsck.c:700 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะฒััะทะบะธัะต ะฝะฐ โ%sโ" # -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะบะฐะทะฐัะตะป โ%sโ" -#: builtin/fsck.c:712 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "โ%sโ ัะพัะธ ะบัะผ ะฝะตัะพ ะฝะตะพะฑะธัะฐะนะฝะพ (%s)" -#: builtin/fsck.c:718 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: ะฝะตัะฒััะทะฐะฝะธัั ะฒััั โHEADโ ะฝะต ัะพัะธ ะบัะผ ะฝะธัะพ" -#: builtin/fsck.c:722 +#: builtin/fsck.c:713 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "ะฟัะตะดัะฟัะตะถะดะตะฝะธะต: โ%sโ ัะพัะธ ะบัะผ ะฒัะต ะพัะต ะฝะตัััะตััะฒัะฒะฐั ะบะปะพะฝ (%s)" -#: builtin/fsck.c:734 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะดััะฒะพัะพ ะฝะฐ ะบะตัะฐ" -#: builtin/fsck.c:739 +#: builtin/fsck.c:730 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "โ%sโ: ะฝะตะฟัะฐะฒะธะปะตะฝ ัะบะฐะทะฐัะตะป ะทะฐ SHA1 ะฒ ะดััะฒะพัะพ ะฝะฐ ะบะตัะฐ" -#: builtin/fsck.c:750 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "ะฒ ะดััะฒะพัะพ ะฝะฐ ะบะตัะฐ ะธะผะฐ ะฝะตัะพ, ะบะพะตัะพ ะฝะต ะต ะดััะฒะพ" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [ะะะฆะะฏโฆ] [ะะะะะขโฆ]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฝะตะดะพััะธะถะธะผะธัะต ะพะฑะตะบัะธ" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต ะธะทะฒัะฝ ะบะปะพะฝะธัะต" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะตัะธะบะตัะธัะต" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะบะพัะตะฝะพะฒะธัะต ะฒัะทะปะธ" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธ ะพั ะธะฝะดะตะบัะฐ ะดะฐ ัะฐ ะบะพัะตะฝะพะฒะธ" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "ะฟัะพัะปะตะดัะฒะฐะฝะต ะธ ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะพั ะถััะฝะฐะปะฐ ั ัะบะฐะทะฐัะตะปะธัะต (ััะฐะฝะดะฐััะฝะพ)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "ะดะพะฟัะปะฝะธัะตะปะฝะพ ะดะฐ ัะต ะฟัะพะฒะตััะฒะฐั ะฟะฐะบะตัะธัะต ะธ ะฐะปัะตัะฝะฐัะธะฒะฝะธัะต ะพะฑะตะบัะธ" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "ะฟัะพะฒะตัะบะฐ ัะฐะผะพ ะฝะฐ ะฒััะทะบะฐัะฐ" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "ะฟะพ-ัััะพะณะธ ะฟัะพะฒะตัะบะธ" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต ะธะทะฒัะฝ ะบะปะพะฝะธัะต ะฒ ะดะธัะตะบัะพัะธััะฐ โ.git/lost-foundโ" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฝะฐะฟัะตะดัะบะฐ" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฟะพะดัะพะฑะฝะธ ะธะผะตะฝะฐ ะฝะฐ ะดะพััะธะถะธะผะธัะต ะพะฑะตะบัะธ" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะพะฑะตะบัะธัะต" -#: builtin/fsck.c:887 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "โ%sโ: ะปะธะฟัะฒะฐั ะพะฑะตะบั" -#: builtin/fsck.c:899 +#: builtin/fsck.c:886 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟะฐัะฐะผะตััั: ะพัะฐะบะฒะฐ ัะต SHA1, ะฐ ะฑะต ะฟะพะปััะตะฝะพ: โ%sโ" -#: builtin/gc.c:34 +#: builtin/gc.c:36 msgid "git gc [<options>]" msgstr "git gc [ะะะฆะะฏโฆ]" -#: builtin/gc.c:90 +#: builtin/gc.c:91 #, c-format msgid "Failed to fstat %s: %s" msgstr "ะะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โfstatโ ะฒััั ั โ%sโ: %s" -#: builtin/gc.c:126 +#: builtin/gc.c:127 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "ััะพะนะฝะพัััะฐ ะฝะฐ โ%sโ โ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปััะธ ะธะฝัะพัะผะฐัะธั ััะตะท โstatโ ะทะฐ ะดะธัะตะบัะพัะธััะฐ โ%sโ" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" @@ -13843,7 +15586,60 @@ msgstr "" "ะะผะฐ ะฟัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฝะตะดะพััะธะถะธะผะธ, ะฝะตะฟะฐะบะตัะธัะฐะฝะธ ะพะฑะตะบัะธ.\n" "ะะทะฟะพะปะทะฒะฐะนัะต โgit pruneโ, ะทะฐ ะดะฐ ะณะธ ะพะบะฐัััะธัะต." -#: builtin/grep.c:29 +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=ะะะะะงะ]" + +#: builtin/gc.c:812 +msgid "failed to write commit-graph" +msgstr "ะณัะฐััั ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "ะทะฐะบะปััะฒะฐัะธัั ัะฐะนะป โ%sโ ัััะตััะฒัะฒะฐ. ะะตะนััะฒะธะตัะพ ัะต ะฟัะตัะบะฐัะฐ" + +#: builtin/gc.c:932 +#, c-format +msgid "task '%s' failed" +msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะทะฐะดะฐัะฐัะฐ โ%sโ" + +#: builtin/gc.c:979 +#, c-format +msgid "'%s' is not a valid task" +msgstr "โ%sโ ะฝะต ะต ะฟัะฐะฒะธะปะฝะฐ ะทะฐะดะฐัะฐ" + +#: builtin/gc.c:984 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "ะทะฐะดะฐัะฐัะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฑะตัะต ะฟะพะฒะตัะต ะพั ะฒะตะดะฝัะถ" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "ะธะทะฟัะปะฝัะฒะฐะฝะต ะฝะฐ ะทะฐะดะฐัะธ ัะฟะพัะตะด ััััะพัะฝะธะตัะพ ะฝะฐ ั ัะฐะฝะธะปะธัะตัะพ" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟัะตะดัะบะฐ ะธ ะดััะณะฐ ะธะฝัะพัะผะฐัะธั ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะธะทั ะพะด" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "ะทะฐะดะฐัะฐ" + +#: builtin/gc.c:1003 +msgid "run a specific task" +msgstr "ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะพะฟัะตะดะตะปะตะฝะฐ ะทะฐะดะฐัะฐ" + +#: builtin/gc.c:1026 +msgid "git maintenance run [<options>]" +msgstr "git maintenance run [ะะะฆะะฏโฆ]" + +#: builtin/gc.c:1037 +#, c-format +msgid "invalid subcommand: %s" +msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฟะพะดะบะพะผะฐะฝะดะฐ: โ%sโ" + +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [ะะะฆะะฏโฆ] [-e] ะจะะะะะ [ะะะ ะกะะฏโฆ] [[--] ะะชะขโฆ]" @@ -13861,272 +15657,271 @@ msgstr "ะทะฐะดะฐะดะตะฝ ะต ะฝะตะฟัะฐะฒะธะปะตะฝ ะฑัะพะน ะฝะธัะบะธ (%d) ะทะฐ %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "ะปะธะฟัะฒะฐ ะฟะพะดะดััะถะบะฐ ะทะฐ ะฝะธัะบะธ. โ%sโ ัะต ัะต ะฟัะตะฝะตะฑัะตะณะฝะต" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "ะดััะฒะพัะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะพ (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ โgrepโ ะพั ะพะฑะตะบั ะพั ะฒะธะดะฐ %s" -#: builtin/grep.c:714 +#: builtin/grep.c:725 #, c-format msgid "switch `%c' expects a numerical value" msgstr "ะพะฟัะธััะฐ โ%cโ ะพัะฐะบะฒะฐ ัะธัะปะพ ะทะฐ ะฐัะณัะผะตะฝั" -#: builtin/grep.c:813 +#: builtin/grep.c:824 msgid "search in index instead of in the work tree" msgstr "ััััะตะฝะต ะฒ ะธะฝะดะตะบัะฐ, ะฐ ะฝะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: builtin/grep.c:815 +#: builtin/grep.c:826 msgid "find in contents not managed by git" msgstr "ััััะตะฝะต ะธ ะฒัะฒ ัะฐะนะปะพะฒะตัะต, ะบะพะธัะพ ะฝะต ัะฐ ะฟะพะด ัะฟัะฐะฒะปะตะฝะธะตัะพ ะฝะฐ git" -#: builtin/grep.c:817 +#: builtin/grep.c:828 msgid "search in both tracked and untracked files" msgstr "ััััะตะฝะต ะธ ะฒ ัะปะตะดะตะฝะธัะต, ะธ ะฒ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/grep.c:819 +#: builtin/grep.c:830 msgid "ignore files specified via '.gitignore'" msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะตัะต ัะบะฐะทะฐะฝะธ ะฒ โ.gitignoreโ" -#: builtin/grep.c:821 +#: builtin/grep.c:832 msgid "recursively search in each submodule" msgstr "ัะตะบัััะธะฒะฝะพ ััััะตะฝะต ะฒัะฒ ะฒัะธัะบะธ ะฟะพะดะผะพะดัะปะธ" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "show non-matching lines" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะตะดะพะฒะตัะต, ะบะพะธัะพ ะฝะต ััะฒะฟะฐะดะฐั" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "case insensitive matching" msgstr "ะฑะตะท ะทะฝะฐัะตะฝะธะต ะฝะฐ ัะตะณะธััััะฐ ะฝะฐ ะฑัะบะฒะธัะต (ะณะปะฐะฒะฝะธ/ะผะฐะปะบะธ)" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "match patterns only at word boundaries" msgstr "ะฝะฐะฟะฐัะฒะฐะฝะต ะฝะฐ ัะฐะฑะปะพะฝะธัะต ัะฐะผะพ ะฟะพ ะณัะฐะฝะธัะธัะต ะฝะฐ ะดัะผะธัะต" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "process binary files as text" msgstr "ะพะฑัะฐะฑะพัะฒะฐะฝะต ะฝะฐ ะดะฒะพะธัะฝะธัะต ัะฐะนะปะพะฒะต ะบะฐัะพ ัะตะบััะพะฒะธ" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "don't match patterns in binary files" msgstr "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ะดะฒะพะธัะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "process binary files with textconv filters" msgstr "" "ะพะฑัะฐะฑะพัะฒะฐะฝะต ะฝะฐ ะดะฒะพะธัะฝะธัะต ัะฐะนะปะพะฒะต ััะตะท ัะธะปััะธ ะทะฐ ะฟัะตะพะฑัะฐะทัะฒะฐะฝะต ะบัะผ ัะตะบัั" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "search in subdirectories (default)" msgstr "ััััะตะฝะต ะฒ ะฟะพะดะดะธัะตะบัะพัะธะธัะต (ััะฐะฝะดะฐััะฝะพ)" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "descend at most <depth> levels" msgstr "ะฝะฐะฒะปะธะทะฐะฝะต ะผะฐะบัะธะผะฐะปะฝะพ ะฝะฐ ัะฐะทะธ ะะชะะะะงะะะ ะฒ ะดััะฒะพัะพ" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "use extended POSIX regular expressions" msgstr "ัะฐะทัะธัะตะฝะธ ัะตะณัะปััะฝะธ ะธะทัะฐะทะธ ะฟะพ POSIX" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "use basic POSIX regular expressions (default)" msgstr "ะพัะฝะพะฒะฝะธ ัะตะณัะปััะฝะธ ะธะทัะฐะทะธ ะฟะพ POSIX (ััะฐะฝะดะฐััะฝะพ)" -#: builtin/grep.c:849 +#: builtin/grep.c:860 msgid "interpret patterns as fixed strings" msgstr "ัะฐะฑะปะพะฝะธัะต ัะฐ ะดะพัะปะพะฒะฝะธ ะฝะธะทะพะฒะต" -#: builtin/grep.c:852 +#: builtin/grep.c:863 msgid "use Perl-compatible regular expressions" msgstr "ัะตะณัะปััะฝะธ ะธะทัะฐะทะธ ะฝะฐ Perl" -#: builtin/grep.c:855 +#: builtin/grep.c:866 msgid "show line numbers" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะพะผะตัะฐัะฐ ะฝะฐ ัะตะดะพะฒะตัะต" -#: builtin/grep.c:856 +#: builtin/grep.c:867 msgid "show column number of first match" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะพะผะตัะฐ ะฝะฐ ะบะพะปะพะฝะฐัะฐ ะฝะฐ ะฟััะฒะพัะพ ะฝะฐะฟะฐัะฒะฐะฝะต" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "don't show filenames" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ัะฐะนะปะพะฒะตัะต" -#: builtin/grep.c:858 +#: builtin/grep.c:869 msgid "show filenames" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ัะฐะนะปะพะฒะตัะต" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "show filenames relative to top directory" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะพัะฝะพัะธัะตะปะฝะธัะต ะธะผะตะฝะฐ ะฝะฐ ัะฐะนะปะพะฒะตัะต ัะฟััะผะพ ะพัะฝะพะฒะฝะฐัะฐ ะดะธัะตะบัะพัะธั ะฝะฐ " "ั ัะฐะฝะธะปะธัะตัะพ" -#: builtin/grep.c:862 +#: builtin/grep.c:873 msgid "show only filenames instead of matching lines" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ัะฐะนะปะพะฒะตัะต ะฑะตะท ะฝะฐะฟะฐัะฒะฐัะธัะต ัะตะดะพะฒะต" -#: builtin/grep.c:864 +#: builtin/grep.c:875 msgid "synonym for --files-with-matches" msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ--files-with-matchesโ" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show only the names of files without match" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ัะฐะนะปะพะฒะตัะต, ะบะพะธัะพ ะฝะต ััะดััะถะฐั ัะตะด, ะฝะฐะฟะฐัะฒะฐั ะฝะฐ " "ัะฐะฑะปะพะฝะฐ" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "print NUL after filenames" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝัะปะตะฒะธั ะทะฝะฐะบ โNULโ ัะปะตะด ะฒััะบะพ ะธะผะต ะฝะฐ ัะฐะนะป" -#: builtin/grep.c:872 +#: builtin/grep.c:883 msgid "show only matching parts of a line" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ัะฐััะธัะต ะฝะฐ ัะตะดะพะฒะตัะต, ะบะพะธัะพ ััะฒะฟะฐะดะฐั" -#: builtin/grep.c:874 +#: builtin/grep.c:885 msgid "show the number of matches instead of matching lines" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฑัะพั ะฝะฐ ััะฒะฟะฐะดะตะฝะธััะฐ ะฒะผะตััะพ ะฝะฐะฟะฐัะฒะฐัะธัะต ัะตะดะพะฒะต" -#: builtin/grep.c:875 +#: builtin/grep.c:886 msgid "highlight matches" msgstr "ะพัะฒะตััะฒะฐะฝะต ะฝะฐ ะฝะฐะฟะฐัะฒะฐะฝะธััะฐ" -#: builtin/grep.c:877 +#: builtin/grep.c:888 msgid "print empty line between matches from different files" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัะฐะทะตะฝ ัะตะด ะผะตะถะดั ะฝะฐะฟะฐัะฒะฐะฝะธััะฐ ะพั ัะฐะทะปะธัะฝะธ ัะฐะนะปะพะฒะต" -#: builtin/grep.c:879 +#: builtin/grep.c:890 msgid "show filename only once above matches from same file" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตัะพ ะฝะฐ ัะฐะนะปะฐ ัะฐะผะพ ะฒะตะดะฝัะถ ะทะฐ ะฒัะธัะบะธ ะฝะฐะฟะฐัะฒะฐะฝะธั ะพั ัะพะทะธ ัะฐะนะป" -#: builtin/grep.c:882 +#: builtin/grep.c:893 msgid "show <n> context lines before and after matches" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฐะบัะฒ ะะ ะะ ัะตะดะพะฒะต ะฟัะตะดะธ ะธ ัะปะตะด ะฝะฐะฟะฐัะฒะฐะฝะธััะฐ" -#: builtin/grep.c:885 +#: builtin/grep.c:896 msgid "show <n> context lines before matches" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฐะบัะฒ ะะ ะะ ัะตะดะพะฒะต ะฟัะตะดะธ ะฝะฐะฟะฐัะฒะฐะฝะธััะฐ" -#: builtin/grep.c:887 +#: builtin/grep.c:898 msgid "show <n> context lines after matches" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฐะบัะฒ ะะ ะะ ัะตะดะพะฒะต ัะปะตะด ะฝะฐะฟะฐัะฒะฐะฝะธััะฐ" -#: builtin/grep.c:889 +#: builtin/grep.c:900 msgid "use <n> worker threads" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัะฐะบัะฒ ะะ ะะ ัะฐะฑะพัะตัะธ ะฝะธัะบะธ" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "shortcut for -C NUM" msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ-C ะะ ะะโ" -#: builtin/grep.c:893 +#: builtin/grep.c:904 msgid "show a line with the function name before matches" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะตะด ั ะธะผะตัะพ ะฝะฐ ััะฝะบัะธััะฐ, ะฒ ะบะพััะพ ะต ะฝะฐะฟะฐัะฝะฐั ัะฐะฑะปะพะฝะฐ" -#: builtin/grep.c:895 +#: builtin/grep.c:906 msgid "show the surrounding function" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะพะฑั ะฒะฐัะฐัะฐัะฐ ััะฝะบัะธั" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "read patterns from file" msgstr "ะธะทัะธัะฐะฝะต ะฝะฐ ัะฐะฑะปะพะฝะธัะต ะพั ะคะะะ" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "match <pattern>" msgstr "ะฝะฐะฟะฐัะฒะฐะฝะต ะฝะฐ ะจะะะะะ" -#: builtin/grep.c:902 +#: builtin/grep.c:913 msgid "combine patterns specified with -e" msgstr "ะบะพะผะฑะธะฝะธัะฐะฝะต ะฝะฐ ัะฐะฑะปะพะฝะธัะต ัะบะฐะทะฐะฝะธ ั ะพะฟัะธััะฐ โ-eโ" -#: builtin/grep.c:914 +#: builtin/grep.c:925 msgid "indicate hit with exit status without output" msgstr "" "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะธะทั ะพะด. ะะทั ะพะดะฝะธัั ะบะพะด ัะบะฐะทะฒะฐ ะฝะฐะปะธัะธะตัะพ ะฝะฐ " "ะฝะฐะฟะฐัะฒะฐะฝะต" -#: builtin/grep.c:916 +#: builtin/grep.c:927 msgid "show only matches from files that match all patterns" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะตะดะพะฒะต ัะฐะผะพ ะพั ัะฐะนะปะพะฒะตัะต, ะบะพะธัะพ ะฝะฐะฟะฐัะฒะฐั ะฝะฐ ะฒัะธัะบะธ ัะฐะฑะปะพะฝะธ" -#: builtin/grep.c:918 +#: builtin/grep.c:929 msgid "show parse tree for grep expression" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะดััะฒะพัะพ ะทะฐ ะฐะฝะฐะปะธะท ะฝะฐ ัะตะณัะปััะฝะธั ะธะทัะฐะท" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "pager" msgstr "ะฟัะพะณัะฐะผะฐ ะทะฐ ะฟัะตะณะปะตะด ะฟะพ ัััะฐะฝะธัะธ" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "show matching files in the pager" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะฒะฟะฐะดะฐัะธัะต ัะฐะนะปะพะฒะต ะฒ ะฟัะพะณัะฐะผะฐ ะทะฐ ะฟัะตะณะปะตะด ะฟะพ ัััะฐะฝะธัะธ" -#: builtin/grep.c:926 +#: builtin/grep.c:937 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ััะฐััะธัะฐะฝะตัะพ ะฝะฐ grep(1) (ัะตะบััะธัั ะบะพะผะฟะธะปะฐั ะฟัะตะฝะตะฑัะตะณะฒะฐ ัะฐะทะธ " "ะพะฟัะธั)" -#: builtin/grep.c:990 +#: builtin/grep.c:1004 msgid "no pattern given" msgstr "ะฝะต ััะต ะทะฐะดะฐะปะธ ัะฐะฑะปะพะฝ" -#: builtin/grep.c:1026 +#: builtin/grep.c:1040 msgid "--no-index or --untracked cannot be used with revs" msgstr "ะพะฟัะธะธัะต โ--cachedโ ะธ โ--untrackedโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ั ะฒะตััะธะธ." -#: builtin/grep.c:1034 +#: builtin/grep.c:1048 #, c-format msgid "unable to resolve revision: %s" msgstr "ะฒะตััะธััะฐ โ%sโ ะฝะต ะผะพะถะต ะฑัะดะต ะพัะบัะธัะฐ" -#: builtin/grep.c:1065 +#: builtin/grep.c:1078 +msgid "--untracked not supported with --recurse-submodules" +msgstr "ะพะฟัะธะธัะต โ--untrackedโ ะธ โ--recurse-submodulesโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/grep.c:1082 msgid "invalid option combination, ignoring --threads" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะบะพะผะฑะธะฝะฐัะธั ะพั ะพะฟัะธะธ, โ--threadsโ ัะต ัะต ะฟัะตะฝะตะฑัะตะณะฝะต" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "ะปะธะฟัะฒะฐ ะฟะพะดะดััะถะบะฐ ะทะฐ ะฝะธัะบะธ. โ--threadsโ ัะต ัะต ะฟัะตะฝะตะฑัะตะณะฝะต" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ะทะฐะดะฐะดะตะฝ ะต ะฝะตะฟัะฐะฒะธะปะตะฝ ะฑัะพะน ะฝะธัะบะธ: %d" -#: builtin/grep.c:1094 +#: builtin/grep.c:1122 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:1123 +#: builtin/grep.c:1148 msgid "--cached or --untracked cannot be used with --no-index" msgstr "ะพะฟัะธะธัะต โ--cachedโ ะธ โ--untrackedโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ั โ--no-indexโ" -#: builtin/grep.c:1129 +#: builtin/grep.c:1154 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" "ะพะฟัะธะธัะต โ--(no-)exclude-standardโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ั ััััะตะฝะต ะฟะพ ัะปะตะดะตะฝะธ " "ัะฐะนะปะพะฒะต" -#: builtin/grep.c:1137 +#: builtin/grep.c:1162 msgid "both --cached and trees are given" msgstr "ะพะฟัะธััะฐ โ--cachedโ ะต ะฝะตััะฒะผะตััะธะผะฐ ััั ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะดััะฒะพ" @@ -14169,66 +15964,66 @@ msgstr "" msgid "process file as it were from this path" msgstr "ะพะฑัะฐะฑะพัะฒะฐะฝะต ะฝะฐ ะคะะะะฐ ะฒัะต ะตะดะฝะพ ะต ั ัะพะทะธ ะฟัั" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะฝะฐะปะธัะฝะธ ะบะพะผะฐะฝะดะธ" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "ะฑะตะท ะฒัะฒะตะดะตะฝะธั" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ัะฟะธััะบ ั ะฒัะฒะตะดะตะฝะธั" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ะฒัะธัะบะธ ะบะพะฝัะธะณััะธัะฐัะธ ะฟัะพะผะตะฝะปะธะฒะธ" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ัััะฐะฝะธัะฐ ะพั ััะบะพะฒะพะดััะฒะพัะพ" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ัััะฐะฝะธัะฐ ะพั ััะบะพะฒะพะดััะฒะพัะพ ะฒ ัะตะฑ ะฑัะฐัะทัั" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธะพะฝะฝะฐ ัััะฐะฝะธัะฐ" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะพะฟะธัะฐะฝะธะตัะพ ะฝะฐ ะบะพะผะฐะฝะดะฐ" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [ะะะะะะะ]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "ะฝะตะฟะพะทะฝะฐั ัะพัะผะฐั ะฝะฐ ะฟะพะผะพััะฐ โ%sโ" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "ะะตััะฟะตัะฝะพ ััะฐััะธัะฐะฝะต ะฝะฐ โemacsclientโ." -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "ะะตััะธััะฐ ะฝะฐ โemacsclientโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ." -#: builtin/help.c:125 +#: builtin/help.c:211 #, 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 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โ%sโ" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -14237,7 +16032,7 @@ msgstr "" "โ%sโ: ะฟัั ะบัะผ ะฝะตะฟะพะดะดััะถะฐะฝะฐ ะฟัะพะณัะฐะผะฐ ะทะฐ ะฟัะตะณะปะตะด ะฝะฐ\n" " ััะบะพะฒะพะดััะฒะพัะพ. ะะผะตััะพ ะฝะตั ะฟัะพะฑะฒะฐะนัะต โman.<tool>.cmdโ." -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -14246,408 +16041,438 @@ msgstr "" "โ%sโ: ะบะพะผะฐะฝะดะฐ ะทะฐ ะฟะพะดะดััะถะฐะฝะฐ ะฟัะพะณัะฐะผะฐ ะทะฐ ะฟัะตะณะปะตะด ะฝะฐ\n" " ััะบะพะฒะพะดััะฒะพัะพ. ะะผะตััะพ ะฝะตั ะฟัะพะฑะฒะฐะนัะต โman.<tool>.pathโ." -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "โ%sโ: ะฝะตะฟะพะทะฝะฐัะฐ ะฟัะพะณัะฐะผะฐ ะทะฐ ะฟัะตะณะปะตะด ะฝะฐ ััะบะพะฒะพะดััะฒะพัะพ." -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "ะฝะธะบะพั ะฟัะพะณัะฐะผะฐ ะทะฐ ะฟัะตะณะปะตะด ะฝะฐ ััะบะพะฒะพะดััะฒะพ ะฝะต ััะฟั ะดะฐ ะพะฑัะฐะฑะพัะธ ะทะฐัะฒะบะฐัะฐ" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "" "ะฝะธะบะพั ะฟัะพะณัะฐะผะฐ ะทะฐ ะฟัะตะณะปะตะด ะฝะฐ ะธะฝัะพัะผะฐัะธะพะฝะฝะธัะต ัััะฐะฝะธัะธ ะฝะต ััะฟั ะดะฐ ะพะฑัะฐะฑะพัะธ " "ะทะฐัะฒะบะฐัะฐ" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "โ%sโ ะต ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ%sโ" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฝะธะท ะทะฐ ะฝะฐัััะพะนะบะฐัะฐ โalias.%sโ: โ%sโ" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "ัะฟะพััะตะฑะฐ: %s%s" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "ะะฐ ะฟะพะฒะตัะต ะธะฝัะพัะผะฐัะธั ะธะทะฟัะปะฝะตัะต โgit help configโ" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฒะธะด ะฝะฐ ะพะฑะตะบัะฐ โ%sโ" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "ะพัะฐะบะฒะฐะฝะธัั ะพะฑะตะบั โ%sโ ะฝะต ะฑะต ะฟะพะปััะตะฝ" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฒะธะด ะฝะฐ ะพะฑะตะบัะฐ โ%sโ: ะพัะฐะบะฒะฐัะต ัะต โ%sโ, ะฐ ะฑะต ะฟะพะปััะตะฝ โ%sโ" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟัะปะฝะธ %d ะฑะฐะนั" msgstr[1] "ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะฟัะปะฝัั %d ะฑะฐะนัะฐ" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "ะฝะตะพัะฐะบะฒะฐะฝ ะบัะฐะน ะฝะฐ ัะฐะนะป" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "ะณัะตัะบะฐ ะฟัะธ ัะตัะตะฝะต ะฝะฐ ะฒั ะพะดะฝะธัะต ะดะฐะฝะฝะธ" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะธ ัะฐ ะฟะพะฒะตัะต ะพั ะฝะฐะปะธัะฝะธัะต ะฑะฐะนัะพะฒะต" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 msgid "pack too large for current definition of off_t" msgstr "ะฟะฐะบะตัะฝะธัั ัะฐะนะป ะต ะฟัะตะบะฐะปะตะฝะพ ะณะพะปัะผ ะทะฐ ัะตะบััะฐัะฐ ััะพะนะฝะพัั ะฝะฐ ัะธะฟะฐ โoff_tโ" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "ะฟะฐะบะตัะฝะธัั ัะฐะนะป ะฝะฐะดะฒะธัะฐะฒะฐ ะผะฐะบัะธะผะฐะปะฝะธั ะฒัะทะผะพะถะตะฝ ัะฐะทะผะตั" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:342 builtin/repack.c:254 +#, c-format +msgid "unable to create '%s'" +msgstr "ะฟะฐะบะตัะฝะธัั ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝ" + +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "ะฟะฐะบะตัะฝะธัั ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "ะฝะตััะพัะฒะตัััะฒะธะต ะฒ ะฟะพะดะฟะธัะฐ ะบัะผ ะฟะฐะบะตัะฝะธั ัะฐะนะป" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "ะฝะต ัะต ะฟะพะดะดััะถะฐ ะฟะฐะบะตัะธัะฐะฝะต ะฒeััะธั โ%<PRIu32>โ" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "ะฟะพะฒัะตะดะตะฝ ะพะฑะตะบั ะฒ ะฟะฐะบะตัะฝะธั ัะฐะนะป ะฟัะธ ะพัะผะตััะฒะฐะฝะต %<PRIuMAX>: %s" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "ะดะตะบะพะผะฟัะตัะธัะฐะฝะตัะพ ั โinflateโ ะฒััะฝะฐ %d" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "ััะพะนะฝะพัััะฐ ะฝะฐ ะพัะผะตััะฒะฐะฝะตัะพ ะทะฐ ะพะฑะตะบัะฐ-ัะฐะทะปะธะบะฐ ะฒะพะดะธ ะดะพ ะฟัะตะฟัะปะฒะฐะฝะต" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "ััะพะนะฝะพัััะฐ ะฝะฐ ะพัะผะตััะฒะฐะฝะตัะพ ะทะฐ ะพะฑะตะบัะฐ-ัะฐะทะปะธะบะฐ ะต ะธะทะฒัะฝ ะดะธะฐะฟะฐะทะพะฝะฐ" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "ะฝะตะฟะพะทะฝะฐั ะฒะธะด ะพะฑะตะบั %d" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "ะฟะฐะบะตัะฝะธัั ัะฐะนะป ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "ะฝะตะพัะฐะบะฒะฐะฝ ะบัะฐะน ะฝะฐ ัะฐะนะป, ะปะธะฟัะฒะฐ %<PRIuMAX> ะฑะฐะนั" msgstr[1] "ะฝะตะพัะฐะบะฒะฐะฝ ะบัะฐะน ะฝะฐ ัะฐะนะป, ะปะธะฟัะฒะฐั %<PRIuMAX> ะฑะฐะนัะฐ" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "ัะตัะธะพะทะฝะฐ ะณัะตัะบะฐ ะฟัะธ ะดะตะบะพะผะฟัะตัะธัะฐะฝะต ั โinflateโ" -#: 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 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" "ะกะชะะะะะะะะ ะะ ะกะขะะะะะกะขะะขะ ะะ ะกะฃะะะขะ ะะ SHA1: โ%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:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "ะพะฑะตะบััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "ัััะตััะฒัะฒะฐัะธัั ะพะฑะตะบั ะฒ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "ัััะตััะฒัะฒะฐัะธัั ะพะฑะตะบั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะพะฑะตะบั-BLOB โ%sโ" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "ะณัะตัะบะฐ ะฟัะธ ะฟัะพะฒะตัะบะฐัะฐ ะฝะฐ ะฟะฐะบะตัะธัะฐะฝะธ ะพะฑะตะบัะธ" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:870 #, c-format msgid "Not all child objects of %s are reachable" msgstr "ะัะบะพะธ ะพะฑะตะบัะธ, ะฝะฐัะปะตะดะฝะธัะธ ะฝะฐ โ%sโ, ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะดะพััะธะณะฝะฐัะธ" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "ัะฐะทะปะธะบะฐัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะธะปะพะถะตะฝะฐ" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "ะะพะปััะฐะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธ" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "ะะฝะดะตะบัะธัะฐะฝะต ะฝะฐ ะพะฑะตะบัะธ" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "ะฟะฐะบะตัะฝะธัั ัะฐะนะป ะต ะฟะพะฒัะตะดะตะฝ (ะฝะตะตะดะฝะฐะบะฒะธ ััะผะธ ะฟะพ SHA1)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปััะธ ะธะฝัะพัะผะฐัะธั ะทะฐ ะฟะฐะบะตัะฝะธั ัะฐะนะป ั โfstatโ" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "ะฒ ะบัะฐั ะฝะฐ ะฟะฐะบะตัะฝะธั ัะฐะนะป ะธะผะฐ ะฟะพะฒัะตะดะตะฝะธ ะดะฐะฝะฝะธ" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" "ัะฐัะฐะปะฝะฐ ะณัะตัะบะฐ ะฒัะฒ ััะฝะบัะธััะฐ โparse_pack_objectsโ. ะขะพะฒะฐ ะต ะณัะตัะบะฐ ะฒ Git, " "ะดะพะบะปะฐะดะฒะฐะนัะต ั ะฝะฐ ัะฐะทัะฐะฑะพััะธัะธัะต, ะบะฐัะพ ะฟัะฐัะธัะต ะต-ะฟะธัะผะพ ะฝะฐ ะฐะดัะตั: โgit@vger." "kernel.orgโ." -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "ะัะบัะธะฒะฐะฝะต ะฝะฐ ััะพัะฒะตัะฝะธัะต ัะฐะทะปะธะบะธ" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฝะธัะบะฐ: %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "" "ัะฐัะฐะปะฝะฐ ะณัะตัะบะฐ ะฒัะฒ ััะฝะบัะธััะฐ โconclude_packโ. ะขะพะฒะฐ ะต ะณัะตัะบะฐ ะฒ Git, " "ะดะพะบะปะฐะดะฒะฐะนัะต ั ะฝะฐ ัะฐะทัะฐะฑะพััะธัะธัะต, ะบะฐัะพ ะฟัะฐัะธัะต ะต-ะฟะธัะผะพ ะฝะฐ ะฐะดัะตั: โgit@vger." "kernel.orgโ." -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1288 #, 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:1264 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "ะะตะพัะฐะบะฒะฐะฝะฐ ะฟะพัะปะตะดะฒะฐัะฐ ััะผะฐ ะทะฐ ะณัะตัะบะธ ะทะฐ โ%sโ (ะฟัะธัะธะฝะฐัะฐ ะผะพะถะต ะดะฐ ะต ะณัะตัะบะฐ ะฒ " "ะดะธัะบะฐ)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1304 #, 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:1292 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "ะดะพะฑะฐะฒะตะฝะธัั ะพะฑะตะบั ะฝะต ะผะพะถะต ะดะฐ ัะต ะบะพะผะฟัะตัะธัะฐ ั โdeflateโ: %d" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "ะปะพะบะฐะปะฝะธัั ะพะฑะตะบั โ%sโ ะต ะฟะพะฒัะตะดะตะฝ" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "ะธะผะตัะพ ะฝะฐ ะฟะฐะบะตัะฝะธั ัะฐะนะป โ%sโ ะฝะต ะทะฐะฒัััะฒะฐ ะฝะฐ โ.packโ" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "ะณัะตัะบะฐ ะฟัะธ ะทะฐะฟะธั ะฝะฐ ัะฐะนะปะฐ โ%sโ โ%sโ" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "ะณัะตัะบะฐ ะฟัะธ ะทะฐัะฒะฐััะฝะตัะพ ะฝะฐ ะทะฐะฟะธัะฐะฝะธั ัะฐะนะป โ%sโ โ%sโ" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "ะณัะตัะบะฐ ะฟัะธ ะทะฐัะฒะฐััะฝะตัะพ ะฝะฐ ะฟะฐะบะตัะฝะธั ัะฐะนะป" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "ะฟะฐะบะตัะฝะธัั ัะฐะนะป ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝ" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "ัะฐะนะปัั ะทะฐ ะธะฝะดะตะบัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััั ัะฐะฝะตะฝ" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "ะทะฐะดะฐะดะตะฝะฐ ะต ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฒะตััะธั ะฟะฐะบะตัะธัะฐะฝะต: โpack.indexversion=%<PRIu32>โ" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "ะกััะตััะฒัะฒะฐัะธัั ะฟะฐะบะตัะตะฝ ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1633 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "ะกััะตััะฒัะฒะฐัะธัั ะธะฝะดะตะบั ะทะฐ ะฟะฐะบะตัะฝะธั ัะฐะนะป โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1681 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d ะพะฑะตะบั ะฝะต ะต ัะฐะทะปะธะบะฐ" msgstr[1] "%d ะพะฑะตะบัะฐ ะฝะต ัะฐ ัะฐะทะปะธะบะฐ" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1688 #, 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:1689 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "ะัะพัะตััั ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒััะฝะต ะบัะผ ะฟัะตะดะธัะฝะฐัะฐ ัะฐะฑะพัะฝะฐ ะดะธัะตะบัะพัะธั" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั โ%sโ" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "ะฝะตะฟะพะทะฝะฐั ะฐะปะณะพัะธััะผ ะทะฐ ะบะพะฝััะพะปะฝะธ ััะผะธ โ%sโ" + +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "ะพะฟัะธััะฐ โ--fix-thinโ ะธะทะธัะบะฒะฐ โ--stdinโ" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "โ--stdinโ ะธะทะธัะบะฒะฐ ั ัะฐะฝะธะปะธัะต ะฝะฐ git" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1825 +msgid "--object-format cannot be used with --stdin" +msgstr "ะพะฟัะธััะฐ โ--object-formatโ ะธ โ--stdinโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "ะพะฟัะธััะฐ โ--verifyโ ะธะทะธัะบะฒะฐ ะธะผะต ะฝะฐ ะฟะฐะบะตัะตะฝ ัะฐะนะป" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "ะณัะตัะบะฐ ะฟัะธ ะฟัะพะฒะตัะบะฐ ั โfsckโ ะฝะฐ ะฟะฐะบะตัะฝะธัะต ะพะฑะตะบัะธ" -#: builtin/init-db.c:61 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปััะธ ะธะฝัะพัะผะฐัะธั ััะตะท โstatโ ะทะฐ ัะฐะฑะปะพะฝะฐ โ%sโ" -#: builtin/init-db.c:66 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "ะดะธัะตะบัะพัะธััะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝะฐ" -#: builtin/init-db.c:78 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "ะฒััะทะบะฐัะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝะฐ" -#: builtin/init-db.c:80 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ัะธะผะฒะพะปะฝะฐ ะฒััะทะบะฐ โ%sโ ะฒ โ%sโ" -#: builtin/init-db.c:86 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะบะพะฟะธัะฐ ะฒ โ%sโ" -#: builtin/init-db.c:90 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ัะฐะฑะปะพะฝะฐ โ%sโ" -#: builtin/init-db.c:121 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "ะฝัะผะฐ ัะฐะฑะปะพะฝะธ ะฒ โ%sโ" -#: builtin/init-db.c:136 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "ัะฐะฑะปะพะฝะธัะต ะฝัะผะฐ ะดะฐ ะฑัะดะฐั ะบะพะฟะธัะฐะฝะธ ะพั โ%sโ: โ%sโ" -#: builtin/init-db.c:334 +#: builtin/init-db.c:274 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะฟััะฒะพะฝะฐัะฐะปะฝะธั ะบะปะพะฝ: โ%sโ" + +#: builtin/init-db.c:366 #, c-format msgid "unable to handle file type %d" msgstr "ัะฐะนะปะพะฒะต ะพั ะฒะธะด %d ะฝะต ัะต ะฟะพะดะดััะถะฐั" -#: builtin/init-db.c:337 +#: builtin/init-db.c:369 #, c-format msgid "unable to move %s to %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะตะผะตััะธ ะฒ โ%sโ" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "" +"ะพะฟะธั ะทะฐ ะฟะพะฒัะพัะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะฟััะฒะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะฒ ั ัะฐะฝะธะปะธัะตัะพ ั ัะฐะทะปะธัะฝะฐ " +"ะบะพะฝััะพะปะฝะฐ ััะผะฐ" + +#: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format msgid "%s already exists" msgstr "ะะธัะตะบัะพัะธััะฐ โ%sโ ะฒะตัะต ัััะตััะฒัะฒะฐ" -#: builtin/init-db.c:413 +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: โ--initial-branch=%sโ ัะต ะฟัะพะฟััะบะฐ" + +#: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" "ะะฝะธัะธะฐะปะธะทะธัะฐะฝะต ะฝะฐะฝะพะฒะพ ะฝะฐ ัััะตััะฒัะฒะฐัะพ, ัะฟะพะดะตะปะตะฝะพ ั ัะฐะฝะธะปะธัะต ะฝะฐ Git ะฒ โ%s%sโ\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "ะะฝะธัะธะฐะปะธะทะธัะฐะฝะต ะฝะฐะฝะพะฒะพ ะฝะฐ ัััะตััะฒัะฒะฐัะพ ั ัะฐะฝะธะปะธัะต ะฝะฐ Git ะฒ โ%s%sโ\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "ะะฝะธัะธะฐะปะธะทะธัะฐะฝะต ะฝะฐ ะฟัะฐะทะฝะพ, ัะฟะพะดะตะปะตะฝะพ ั ัะฐะฝะธะปะธัะต ะฝะฐ Git ะฒ โ%s%sโ\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "ะะฝะธัะธะฐะปะธะทะธัะฐะฝะต ะฝะฐ ะฟัะฐะทะฝะพ ั ัะฐะฝะธะปะธัะต ะฝะฐ Git ะฒ โ%s%sโ\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:529 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -14655,27 +16480,43 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=ะะะ ะะะขะะ ะะฏ_ะก_ะจะะะะะะ] [--" "shared[=ะะ ะะะ]] [ะะะ ะะะขะะ ะะฏ]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:555 msgid "permissions" msgstr "ะฟัะฐะฒะฐ" -#: builtin/init-db.c:492 +#: builtin/init-db.c:556 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 +#: builtin/init-db.c:562 +msgid "override the name of the initial branch" +msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะธะผะตัะพ ะฝะฐ ะฟััะฒะพะฝะฐัะฐะปะฝะธั ะบะปะพะฝ" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +msgid "hash" +msgstr "ะฐะปะณะพัะธััะผ" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "ัะบะฐะทะฒะฐะฝะต ะฝะฐ ะฐะปะณะพัะธััะผ ะทะฐ ะบะพะฝััะพะปะฝะฐ ััะผะฐ" + +#: builtin/init-db.c:571 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "ะพะฟัะธะธัะต โ--separate-git-dirโ ะธ โ--bareโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format msgid "cannot mkdir %s" msgstr "ะดะธัะตะบัะพัะธััะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝะฐ" -#: builtin/init-db.c:538 +#: builtin/init-db.c:609 builtin/init-db.c:664 #, c-format msgid "cannot chdir to %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒะปะตะทะต ะฒ ะดะธัะตะบัะพัะธััะฐ โ%sโ" -#: builtin/init-db.c:559 +#: builtin/init-db.c:636 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -14684,11 +16525,15 @@ msgstr "" "%s (ะธะปะธ --work-tree=ะะะ ะะะขะะ ะะฏ) ะธะทะธัะบะฒะฐ ัะบะฐะทะฒะฐะฝะตัะพ ะฝะฐ %s (ะธะปะธ --git-" "dir=ะะะ ะะะขะะ ะะฏ)" -#: builtin/init-db.c:587 +#: builtin/init-db.c:688 #, c-format msgid "Cannot access work tree '%s'" msgstr "ะ ะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฒ โ%sโ ะต ะฝะตะดะพัััะฟะฝะพ" +#: builtin/init-db.c:693 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "ะพะฟัะธััะฐ โ--separate-git-dirโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะณะพะปะพ ั ัะฐะฝะธะปะธัะต" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -14753,125 +16598,130 @@ msgstr "ะพะฟัะธััะฐ โ--trailerโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั โ--name- msgid "no input file given for in-place editing" msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝ ะฒั ะพะดะตะฝ ัะฐะนะป ะทะฐ ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ะผัััะพ" -#: builtin/log.c:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [ะะะฆะะฏโฆ] [ะะะะะะะะ_ะะ_ะะะ ะกะะะขะ] [[--] ะะชะขโฆ]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [ะะะฆะะฏโฆ] ะะะะะขโฆ" -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะพะฟัะธั โ--decorateโ: %s" -#: builtin/log.c:173 +#: builtin/log.c:177 msgid "show source" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะทั ะพะดะฝะธั ะบะพะด" -#: builtin/log.c:174 +#: builtin/log.c:178 msgid "Use mail map file" msgstr "" "ะะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัะฐะนะป ะทะฐ ััะพัะฒะตัััะฒะธััะฐ ะฝะฐ ะธะผะตะฝะฐัะฐ ะธ ะฐะดัะตัะธัะต ะฝะฐ ะต-ะฟะพัะฐ (โ." "mailmapโ)" -#: builtin/log.c:176 +#: builtin/log.c:181 msgid "only decorate refs that match <pattern>" msgstr "ัะฟะตัะธะฐะปะตะฝ ัะพัะผะฐั ัะฐะผะพ ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะฝะฐะฟะฐัะฒะฐัะธ ะฝะฐ ะจะะะะะะฐ" -#: builtin/log.c:178 +#: builtin/log.c:183 msgid "do not decorate refs that match <pattern>" msgstr "ะฑะตะท ัะฟะตัะธะฐะปะตะฝ ัะพัะผะฐั ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะฝะฐะฟะฐัะฒะฐัะธ ะฝะฐ ะจะะะะะะฐ" -#: builtin/log.c:179 +#: builtin/log.c:184 msgid "decorate options" msgstr "ะฝะฐัััะพะนะบะธ ะฝะฐ ัะพัะผะฐฬัะฐ ะฝะฐ ะธะทะฒะตะถะดะฐะฝะฐัะฐ ะธะฝัะพัะผะฐัะธั" -#: builtin/log.c:182 +#: builtin/log.c:187 msgid "Process line range n,m in file, counting from 1" msgstr "" "ะะฑัะฐะฑะพัะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ัะตะดะพะฒะตัะต ะฒัะฒ ัะฐะนะปะฐ ะฒ ะดะธะฐะฟะฐะทะพะฝะฐ ะพั n ะดะพ m ะฒะบะปััะธัะตะปะฝะพ. " "ะัะพะตะฝะตัะพ ะทะฐะฟะพัะฒะฐ ะพั 1" -#: builtin/log.c:280 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "ะ ะตะทัะปัะฐั: %d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:555 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ะฟะพะฒัะตะดะตะฝ ัะฐะนะป" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:570 builtin/log.c:665 #, c-format msgid "could not read object %s" msgstr "ะพะฑะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ: %s" -#: builtin/log.c:668 +#: builtin/log.c:690 #, c-format msgid "unknown type: %d" msgstr "ะฝะตะธะทะฒะตััะตะฝ ะฒะธะด: %d" -#: builtin/log.c:791 +#: builtin/log.c:839 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%s: ะฝะตะฟัะฐะฒะธะปะฝะพ ะฟัะธะดััะถะฐะฒะฐัะพ ะฟะธัะผะพ ะพั ัะตะถะธะผะฐ ะฝะฐ ะพะฟะธัะฐะฝะธะต" + +#: builtin/log.c:846 msgid "format.headers without value" msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ ััะพะนะฝะพัั ะฝะฐ โformat.headersโ" -#: builtin/log.c:908 +#: builtin/log.c:965 msgid "name of output directory is too long" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะดัะปะณะพ ะธะผะต ะฝะฐ ะดะธัะตะบัะพัะธััะฐ ะทะฐ ะธะทั ะพะดะฝะฐัะฐ ะธะฝัะพัะผะฐัะธั" -#: builtin/log.c:924 +#: builtin/log.c:981 #, c-format msgid "cannot open patch file %s" msgstr "ัะฐะนะปัั-ะบััะฟะบะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ" -#: builtin/log.c:941 +#: builtin/log.c:998 msgid "need exactly one range" msgstr "ัััะฑะฒะฐ ะดะฐ ะทะฐะดะฐะดะตัะต ัะพัะฝะพ ะตะดะธะฝ ะดะธะฐะฟะฐะทะพะฝ" -#: builtin/log.c:951 +#: builtin/log.c:1008 msgid "not a range" msgstr "ะฝะต ะต ะดะธะฐะฟะฐะทะพะฝ" -#: builtin/log.c:1074 +#: builtin/log.c:1172 msgid "cover letter needs email format" msgstr "ะฟัะธะดััะถะฐะฒะฐัะพัะพ ะฟะธัะผะพ ัััะฑะฒะฐ ะดะฐ ะต ัะพัะผะฐัะธัะฐะฝะพ ะบะฐัะพ ะต-ะฟะธัะผะพ" -#: builtin/log.c:1080 +#: builtin/log.c:1178 msgid "failed to create cover-letter file" msgstr "ะฝะตััะฟะตัะฝะพ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟัะธะดััะถะฐะฒะฐัะพ ะฟะธัะผะพ" -#: builtin/log.c:1159 +#: builtin/log.c:1259 #, c-format msgid "insane in-reply-to: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะพัะผะฐั ะฝะฐ ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะทะฐ ะพัะณะพะฒะพั โin-reply-toโ: %s" -#: builtin/log.c:1186 +#: builtin/log.c:1286 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [ะะะฆะะฏโฆ] [ะะข | ะะะะะะะะ_ะะ_ะะะ ะกะะะขะ]" -#: builtin/log.c:1244 +#: builtin/log.c:1344 msgid "two output directories?" msgstr "ะผะพะถะต ะดะฐ ัะบะฐะถะตัะต ะผะฐะบัะธะผัะผ ะตะดะฝะฐ ะดะธัะตะบัะพัะธั ะทะฐ ะธะทั ะพะด" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 #, c-format msgid "unknown commit %s" msgstr "ะฝะตะฟะพะทะฝะฐัะพ ะฟะพะดะฐะฒะฐะฝะต: โ%sโ" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1506 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:1370 +#: builtin/log.c:1515 msgid "could not find exact merge base" msgstr "ัะพัะฝะฐัะฐ ะฑะฐะทะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะฐ" -#: builtin/log.c:1374 +#: builtin/log.c:1525 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" @@ -14881,281 +16731,298 @@ msgstr "" "ะทะฐะดะฐะดะตัะต, ะธะทะฟะพะปะทะฒะฐะนัะต โgit branch --set-upstream-toโ.\n" "ะะพะถะตัะต ัััะฝะพ ะดะฐ ะทะฐะดะฐะดะตัะต ะฑะฐะทะพะฒะพ ะฟะพะดะฐะฒะฐะฝะต ััะตะท โ--base=<base-commit-id>โ." -#: builtin/log.c:1394 +#: builtin/log.c:1548 msgid "failed to find exact merge base" msgstr "ัะพัะฝะฐัะฐ ะฑะฐะทะฐ ะฟัะธ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะฐ" -#: builtin/log.c:1405 +#: builtin/log.c:1565 msgid "base commit should be the ancestor of revision list" msgstr "ะฑะฐะทะพะฒะพัะพ ะฟะพะดะฐะฒะฐะฝะต ัััะฑะฒะฐ ะดะฐ ะต ะฟัะตะดัะตััะฒะตะฝะธะบัั ะฝะฐ ัะฟะธััะบะฐ ั ะฒะตััะธะธัะต" -#: builtin/log.c:1409 +#: builtin/log.c:1575 msgid "base commit shouldn't be in revision list" msgstr "ะฑะฐะทะพะฒะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะต ะฒ ัะฟะธััะบะฐ ั ะฒะตััะธะธัะต" -#: builtin/log.c:1462 +#: builtin/log.c:1633 msgid "cannot get patch id" msgstr "ะธะดะตะฝัะธัะธะบะฐัะพััั ะฝะฐ ะบััะฟะบะฐัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะปััะตะฝ" -#: builtin/log.c:1514 -msgid "failed to infer range-diff ranges" -msgstr "ะฝะตััะฟะตัะฝะพ ะพะฟัะตะดะตะปัะฝะต ะฝะฐ ะดะธะฐะฟะฐะทะพะฝะธัะต ะทะฐ ัะฐะทะปะธะบะฐ" +#: builtin/log.c:1690 +msgid "failed to infer range-diff origin of current series" +msgstr "" +"ะฝะตััะฟะตัะฝะพ ะพะฟัะตะดะตะปัะฝะต ะฝะฐ ะฝะฐัะฐะปะพัะพ ะฝะฐ ะดะธะฐะฟะฐะทะพะฝะฝะฐัะฐ ัะฐะทะปะธะบะฐ ะฝะฐ ัะตะบััะฐัะฐ ะฟะพัะตะดะธัะฐ" + +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "" +"โ%sโ ัะต ะฟะพะปะทะฒะฐ ะบะฐัะพ ะฝะฐัะฐะปะพัะพ ะฝะฐ ะดะธะฐะฟะฐะทะพะฝะฝะฐัะฐ ัะฐะทะปะธะบะฐ ะฝะฐ ัะตะบััะฐัะฐ ะฟะพัะตะดะธัะฐ" -#: builtin/log.c:1559 +#: builtin/log.c:1736 msgid "use [PATCH n/m] even with a single patch" msgstr "ะฝะพะผะตัะฐัะธั โ[PATCH n/m]โ ะดะพัะธ ะธ ะฟัะธ ะตะดะธะฝััะฒะตะฝะฐ ะบััะฟะบะฐ" -#: builtin/log.c:1562 +#: builtin/log.c:1739 msgid "use [PATCH] even with multiple patches" msgstr "ะฝะพะผะตัะฐัะธั โ[PATCH]โ ะดะพัะธ ะธ ะฟัะธ ะผะฝะพะถะตััะฒะพ ะบััะฟะบะธ" -#: builtin/log.c:1566 +#: builtin/log.c:1743 msgid "print patches to standard out" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะบััะฟะบะธัะต ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะธะทั ะพะด" -#: builtin/log.c:1568 +#: builtin/log.c:1745 msgid "generate a cover letter" msgstr "ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟัะธะดััะถะฐะฒะฐัะพ ะฟะธัะผะพ" -#: builtin/log.c:1570 +#: builtin/log.c:1747 msgid "use simple number sequence for output file names" msgstr "ะฟัะพััะฐ ัะธัะปะพะฒะฐ ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะพัั ะทะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ัะฐะนะปะพะฒะตัะต-ะบััะฟะบะธ" -#: builtin/log.c:1571 +#: builtin/log.c:1748 msgid "sfx" msgstr "ะะะะฆะ" -#: builtin/log.c:1572 +#: builtin/log.c:1749 msgid "use <sfx> instead of '.patch'" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัะตะทะธ ะะะะฆะ ะทะฐ ัััะธะบั ะฒะผะตััะพ โ.patchโ" -#: builtin/log.c:1574 +#: builtin/log.c:1751 msgid "start numbering patches at <n> instead of 1" msgstr "ะฝะพะผะตัะธัะฐะฝะตัะพ ะฝะฐ ะบััะฟะบะธัะต ะดะฐ ะทะฐะฟะพัะฒะฐ ะพั ัะพะทะธ ะะ ะะ, ะฐ ะฝะต ั 1" -#: builtin/log.c:1576 +#: builtin/log.c:1753 msgid "mark the series as Nth re-roll" msgstr "ะพัะฑะตะปัะทะฒะฐะฝะต, ัะต ัะพะฒะฐ ะต N-ัะฐัะฐ ะฟะพัะตะดะฝะฐ ัะตะดะฐะบัะธั ะฝะฐ ะฟะพัะตะดะธัะฐัะฐ ะพั ะบััะฟะบะธ" -#: builtin/log.c:1578 +#: builtin/log.c:1755 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "ะะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ โ[RFC PATCH]โ ะฒะผะตััะพ โ[PATCH]โ" -#: builtin/log.c:1581 +#: builtin/log.c:1758 +msgid "cover-from-description-mode" +msgstr "ัะตะถะธะผ-ะฟัะธะดััะถะฐะฒะฐัะพ-ะฟะธัะผะพ-ะฟะพ-ะพะฟะธัะฐะฝะธะต" + +#: builtin/log.c:1759 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" +"ะณะตะฝะตัะธัะฐะฝะต ะฝะฐ ัะฐััะธัะต ะฝะฐ ะฟัะธะดััะถะฐะฒะฐัะพัะพ ะฟะธัะผะพ ะฝะฐ ะฑะฐะทะฐัะฐ ะฝะฐ ะพะฟะธัะฐะฝะธะตัะพ ะฝะฐ " +"ะบะปะพะฝะฐ" + +#: builtin/log.c:1761 msgid "Use [<prefix>] instead of [PATCH]" msgstr "ะะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัะพะทะธ โ[ะะ ะะคะะะก]โ ะฒะผะตััะพ โ[PATCH]โ" -#: builtin/log.c:1584 +#: builtin/log.c:1764 msgid "store resulting files in <dir>" msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะธะทั ะพะดะฝะธัะต ัะฐะนะปะพะฒะต ะฒ ัะฐะทะธ ะะะ ะะะขะะ ะะฏ" -#: builtin/log.c:1587 +#: builtin/log.c:1767 msgid "don't strip/add [PATCH]" msgstr "ะฑะตะท ะดะพะฑะฐะฒัะฝะต/ะผะฐั ะฐะฝะต ะฝะฐ ะฟัะตัะธะบัะฐ โ[PATCH]โ" -#: builtin/log.c:1590 +#: builtin/log.c:1770 msgid "don't output binary diffs" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฐะทะปะธะบะธ ะผะตะถะดั ะดะฒะพะธัะฝะธ ัะฐะนะปะพะฒะต" -#: builtin/log.c:1592 +#: builtin/log.c:1772 msgid "output all-zero hash in From header" msgstr "ะฒ ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั โFrom:โ (ะพั) ะบะพะฝััะพะปะฝะฐัะฐ ััะผะฐ ะดะฐ ะต ัะฐะผะพ ะพั ะฝัะปะธ" -#: builtin/log.c:1594 +#: builtin/log.c:1774 msgid "don't include a patch matching a commit upstream" msgstr "ะฑะตะท ะบััะฟะบะธ, ะบะพะธัะพ ะฟัะธััััะฒะฐั ะฒ ัะปะตะดะตะฝะธั ะบะปะพะฝ" -#: builtin/log.c:1596 +#: builtin/log.c:1776 msgid "show patch format instead of default (patch + stat)" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฒัะฒ ัะพัะผะฐั ะทะฐ ะบััะฟะบะธ, ะฐ ะฝะฐ ะฒ ััะฐะฝะดะฐััะฝะธั (ะบััะฟะบะฐ ะธ ััะฐัะธััะธะบะฐ)" -#: builtin/log.c:1598 +#: builtin/log.c:1778 msgid "Messaging" msgstr "ะะฟัะธะธ ะฟัะธ ะธะทะฟัะฐัะฐะฝะต" -#: builtin/log.c:1599 +#: builtin/log.c:1779 msgid "header" msgstr "ะะะะะะะะ_ะงะะกะข" -#: builtin/log.c:1600 +#: builtin/log.c:1780 msgid "add email header" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะฐะทะธ ะะะะะะะะ_ะงะะกะข" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1781 builtin/log.c:1782 msgid "email" msgstr "ะ-ะะะฉะ" -#: builtin/log.c:1601 +#: builtin/log.c:1781 msgid "add To: header" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะทะฐะณะปะฐะฒะฝะฐ ัะฐัั โTo:โ (ะดะพ)" -#: builtin/log.c:1603 +#: builtin/log.c:1782 msgid "add Cc: header" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะทะฐะณะปะฐะฒะฝะฐ ัะฐัั โCc:โ (ะธ ะดะพ)" -#: builtin/log.c:1605 +#: builtin/log.c:1783 msgid "ident" msgstr "ะะะะะขะะงะะะกะข" -#: builtin/log.c:1606 +#: builtin/log.c:1784 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะฐะดัะตัะฐ ะฒ ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั โFromโ (ะพั) ะดะฐ ะต ัะฐะทะธ ะะะะะขะะงะะะกะข. ะะบะพ " "ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ ัะฐะบะฐะฒะฐ, ัะต ะฒะทะธะผะฐ ะฐะดัะตัะฐ ะฝะฐ ะฟะพะดะฐะฒะฐัะธั" -#: builtin/log.c:1608 +#: builtin/log.c:1786 msgid "message-id" msgstr "ะะะะะขะะคะะะะขะะ _ะะ_ะกะชะะะฉะะะะ" -#: builtin/log.c:1609 +#: builtin/log.c:1787 msgid "make first mail a reply to <message-id>" msgstr "" "ะฟััะฒะพัะพ ััะพะฑัะตะฝะธะต ะดะฐ ะต ะฒ ะพัะณะพะฒะพั ะฝะฐ ะต-ะฟะธัะผะพัะพ ั ัะพะทะธ " "ะะะะะขะะคะะะะขะะ _ะะ_ะกะชะะะฉะะะะ" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1788 builtin/log.c:1791 msgid "boundary" msgstr "ะณัะฐะฝะธัะฐ" -#: builtin/log.c:1611 +#: builtin/log.c:1789 msgid "attach the patch" msgstr "ะฟัะธะบัะตะฟัะฝะต ะฝะฐ ะบััะฟะบะฐัะฐ" -#: builtin/log.c:1614 +#: builtin/log.c:1792 msgid "inline the patch" msgstr "ะฒะบะปััะฒะฐะฝะต ะฝะฐ ะบััะฟะบะฐัะฐ ะฒ ัะตะบััะฐ ะฝะฐ ะฟะธัะผะฐัะฐ" -#: builtin/log.c:1618 +#: builtin/log.c:1796 msgid "enable message threading, styles: shallow, deep" msgstr "" "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฝะธัะบะธ ะทะฐ ััะพะฑัะตะฝะธััะฐ. ะกะขะะัั ะต โshallowโ (ะฟะปะธััะบ) ะธะปะธ " "โdeepโ (ะดัะปะฑะพะบ)" -#: builtin/log.c:1620 +#: builtin/log.c:1798 msgid "signature" msgstr "ะฟะพะดะฟะธั" -#: builtin/log.c:1621 +#: builtin/log.c:1799 msgid "add a signature" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะพะปะต ะทะฐ ะฟะพะดะฟะธั" -#: builtin/log.c:1622 +#: builtin/log.c:1800 msgid "base-commit" msgstr "ะะะะะะ_ะะะะะะะะ" -#: builtin/log.c:1623 +#: builtin/log.c:1801 msgid "add prerequisite tree info to the patch series" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฝะตะพะฑั ะพะดะธะผะพัะพ ะะะะพะฒะพ ะดััะฒะพ ะบัะผ ะฟะพัะตะดะธัะฐัะฐ ะพั ะบััะฟะบะธ" -#: builtin/log.c:1625 +#: builtin/log.c:1804 msgid "add a signature from a file" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะพะดะฟะธั ะพั ัะฐะนะป" -#: builtin/log.c:1626 +#: builtin/log.c:1805 msgid "don't print the patch filenames" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ะบััะฟะบะธัะต" -#: builtin/log.c:1628 +#: builtin/log.c:1807 msgid "show progress while generating patches" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟัะตะดัะบะฐ ะฒัะฒ ัะฐะทะฐัะฐ ะฝะฐ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะบััะฟะบะธัะต" -#: builtin/log.c:1630 +#: builtin/log.c:1809 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต ัะฟััะผะพ ะะะ ะกะธััะฐ ะฒ ะฟัะธะดััะถะฐะฒะฐัะพัะพ ะฟะธัะผะพ ะธะปะธ ะตะดะธะฝััะฒะตะฝะฐ " "ะบััะฟะบะฐ" -#: builtin/log.c:1633 +#: builtin/log.c:1812 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต ัะฟััะผะพ ัะบะฐะทะฐัะตะปั ะฝะฐ ะะะ ะกะธััะฐ ะฒ ะฟัะธะดััะถะฐะฒะฐัะพัะพ ะฟะธัะผะพ " "ะธะปะธ ะตะดะธะฝััะฒะตะฝะฐ ะบััะฟะบะฐ" -#: builtin/log.c:1635 +#: builtin/log.c:1814 msgid "percentage by which creation is weighted" msgstr "ะฟัะพัะตะฝั ะทะฐ ะฟัะตัะตะณะปัะฝะต ะฟัะธ ะพัะตะฝะบะฐ ะฝะฐ ััะทะดะฐะฒะฐะฝะตัะพ" -#: builtin/log.c:1710 +#: builtin/log.c:1896 #, c-format msgid "invalid ident line: %s" msgstr "ะณัะตัะฝะฐ ะธะดะตะฝัะธัะฝะพัั: %s" -#: builtin/log.c:1725 +#: builtin/log.c:1911 msgid "-n and -k are mutually exclusive" msgstr "ะพะฟัะธะธัะต โ-nโ ะธ โ-kโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/log.c:1727 +#: builtin/log.c:1913 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "ะพะฟัะธะธัะต โ--subject-prefixโ/โ-rfcโ ะธ โ-kโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/log.c:1735 +#: builtin/log.c:1921 msgid "--name-only does not make sense" msgstr "ะพะฟัะธััะฐ โ--name-onlyโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะณะตะฝะตัะธัะฐะฝะตัะพ ะฝะฐ ะบััะฟะบะธ" -#: builtin/log.c:1737 +#: builtin/log.c:1923 msgid "--name-status does not make sense" msgstr "ะพะฟัะธััะฐ โ--name-statusโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะณะตะฝะตัะธัะฐะฝะตัะพ ะฝะฐ ะบััะฟะบะธ" -#: builtin/log.c:1739 +#: builtin/log.c:1925 msgid "--check does not make sense" msgstr "ะพะฟัะธััะฐ โ--checkโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะณะตะฝะตัะธัะฐะฝะตัะพ ะฝะฐ ะบััะฟะบะธ" -#: builtin/log.c:1771 +#: builtin/log.c:1958 msgid "standard output, or directory, which one?" msgstr "" "ะธะทั ะพะดัั ะผะพะถะต ะดะฐ ะธะปะธ ััะฐะฝะดะฐััะฝะธัั, ะธะปะธ ะดะฐ ะต ะฒ ะดะธัะตะบัะพัะธั, ะฝะพ ะฝะต ะธ ะดะฒะตัะต." -#: builtin/log.c:1860 +#: builtin/log.c:2062 msgid "--interdiff requires --cover-letter or single patch" msgstr "" "ะพะฟัะธััะฐ โ--interdiffโ ะธะทะธัะบะฒะฐ ะพะฟัะธั โ--cover-letterโ ะธะปะธ ะตะดะธะฝััะฒะตะฝะฐ ะบััะฟะบะฐ" -#: builtin/log.c:1864 +#: builtin/log.c:2066 msgid "Interdiff:" msgstr "ะ ะฐะทะปะธะบะฐ ะฒ ัะฐะทะปะธะบะธัะต:" -#: builtin/log.c:1865 +#: builtin/log.c:2067 #, c-format msgid "Interdiff against v%d:" msgstr "ะ ะฐะทะปะธะบะฐ ะฒ ัะฐะทะปะธะบะธัะต ัะฟััะผะพ v%d:" -#: builtin/log.c:1871 +#: builtin/log.c:2073 msgid "--creation-factor requires --range-diff" msgstr "ะพะฟัะธััะฐ โ--creation-factorโ ะธะทะธัะบะฒะฐ ะพะฟัะธั โ--range-diffโ" -#: builtin/log.c:1875 +#: builtin/log.c:2077 msgid "--range-diff requires --cover-letter or single patch" msgstr "" "ะพะฟัะธััะฐ โ--range-diffโ ะธะทะธัะบะฒะฐ ะพะฟัะธั โ--cover-letterโ ะธะปะธ ะตะดะธะฝััะฒะตะฝะฐ ะบััะฟะบะฐ" -#: builtin/log.c:1883 +#: builtin/log.c:2085 msgid "Range-diff:" msgstr "ะะธะฐะฟะฐะทะพะฝะฝะฐ ัะฐะทะปะธะบะฐ:" -#: builtin/log.c:1884 +#: builtin/log.c:2086 #, c-format msgid "Range-diff against v%d:" msgstr "ะะธะฐะฟะฐะทะพะฝะฝะฐ ัะฐะทะปะธะบะฐ ัะฟััะผะพ v%d:" -#: builtin/log.c:1895 +#: builtin/log.c:2097 #, c-format msgid "unable to read signature file '%s'" msgstr "ัะฐะนะปัั โ%sโ ั ะฟะพะดะฟะธั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/log.c:1931 +#: builtin/log.c:2133 msgid "Generating patches" msgstr "ะกัะทะดะฐะฒะฐะฝะต ะฝะฐ ะบััะฟะบะธ" -#: builtin/log.c:1975 +#: builtin/log.c:2177 msgid "failed to create output files" msgstr "ะฝะตััะฟะตัะฝะพ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะธะทั ะพะดะฝะธ ัะฐะนะปะพะฒะต" -#: builtin/log.c:2034 +#: builtin/log.c:2236 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [ะะขะะะะะงะะ_ะะะะ [ะะ ะชะฅ [ะะ ะะะะ]]]" -#: builtin/log.c:2088 +#: builtin/log.c:2290 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15163,109 +17030,109 @@ msgstr "" "ะกะปะตะดะตะฝะธัั ะพัะดะฐะปะตัะตะฝ ะบะปะพะฝ ะฝะต ะฑะต ะพัะบัะธั, ะทะฐัะพะฒะฐ ะธะทัะธัะฝะพ ะทะฐะดะฐะนัะต " "ะะขะะะะะงะะ_ะะะะ.\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [ะะะฆะะฏโฆ] [ะคะะะโฆ]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััััะพัะฝะธะตัะพ ะฝะฐ ัะฐะนะปะพะฒะตัะต ั ะตะดะฝะพะฑัะบะฒะตะฝะธ ัะปะฐะณะพะฒะต" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "ะผะฐะปะบะธ ะฑัะบะฒะธ ะทะฐ ัะฐะนะปะพะฒะตัะต, ะบะพะธัะพ ะดะฐ ัะต ััะตัะฐั ะทะฐ ะฝะตะฟัะพะผะตะฝะตะฝะธ" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "ะผะฐะปะบะธ ะฑัะบะฒะธ ะทะฐ ัะฐะนะปะพะฒะตัะต ะทะฐ ะบะพะผะฐะฝะดะฐัะฐ โfsmonitor cleanโ" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะบะตัะธัะฐะฝะธัะต ัะฐะนะปะพะฒะต (ััะฐะฝะดะฐััะฝะพ)" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะทััะธัะธัะต ัะฐะนะปะพะฒะต" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะตะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะดััะณะธัะต ัะฐะนะปะพะฒะต" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะณะฝะพัะธัะฐะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตัะพ ะฝะฐ ะพะฑะตะบัะฐ ะทะฐ ััะดััะถะฐะฝะธะตัะพ ะฝะฐ ะธะฝะดะตะบัะฐ" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะตัะต, ะบะพะธัะพ ัััะฑะฒะฐ ะดะฐ ะฑัะดะฐั ะธะทััะธัะธ" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะผะตัะพ ะฝะฐ ะดััะณะธัะต (ะฝะตัะปะตะดะตะฝะธัะต) ะดะธัะตะบัะพัะธะธ" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะทะฝะฐัะธัะต ะทะฐ ะบัะฐะน ะฝะฐ ัะตะด ะฒัะฒ ัะฐะนะปะพะฒะตัะต" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัะฐะทะฝะธัะต ะดะธัะตะบัะพัะธะธ" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะตัะปะตัะธัะต ัะฐะนะปะพะฒะต" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธััะฐ ะทะฐ ะพัะผัะฝะฐ ะฝะฐ ัะฐะทัะตัะตะฝะธัะต ะฟะพะดะฐะฒะฐะฝะธั" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะตัะต ะฝะฐะฟะฐัะฒะฐัะธ ะจะะะะะะฐ" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "ัะฐะฑะปะพะฝะธัะต ะทะฐ ะธะณะฝะพัะธัะฐะฝะต ะดะฐ ัะต ะฟัะพัะตัะฐั ะพั ัะพะทะธ ะคะะะ" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "ะธะทัะธัะฐะฝะต ะฝะฐ ะดะพะฟัะปะฝะธัะตะปะฝะธัะต ัะฐะฑะปะพะฝะธ ะทะฐ ะธะณะฝะพัะธัะฐะฝะต ะฟะพ ะดะธัะตะบัะพัะธั ะพั ัะพะทะธ ะคะะะ" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ััะฐะฝะดะฐััะฝะพ ะธะณะฝะพัะธัะฐะฝะธัะต ะพั Git ัะฐะนะปะพะฒะต" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "ะฟััะธัะฐัะฐ ะดะฐ ัะฐ ะพัะฝะพัะธัะตะปะฝะธ ัะฟััะผะพ ะพัะฝะพะฒะฝะฐัะฐ ะดะธัะตะบัะพัะธั ะฝะฐ ะฟัะพะตะบัะฐ" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "ัะตะบัััะธะฒะฝะพ ะพะฑั ะพะถะดะฐะฝะต ะฟะพะดะผะพะดัะปะธัะต" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "ะณัะตัะบะฐ, ะฐะบะพ ะฝัะบะพะน ะพั ัะตะทะธ ะคะะะะพะฒะต ะฝะต ะต ะฒ ะธะฝะดะตะบัะฐ" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "ะฃะะะะะขะะ_ะะชะ_ะะชะ ะะ" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "ััะธัะฐะฝะต, ัะต ะฟััะธัะฐัะฐ ะธะทััะธัะธ ัะปะตะด ะฃะะะะะขะะั_ะะชะ_ะะชะ ะะ ะฒัะต ะพัะต ัััะตััะฒัะฒะฐั" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธััะฐ ะทะฐ ะธะทัะธััะฒะฐะฝะต ะฝะฐ ะณัะตัะบะธ" @@ -15283,7 +17150,7 @@ msgstr "" msgid "do not print remote URL" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐะดัะตัะธัะต ะฝะฐ ะพัะดะฐะปะตัะตะฝะธัะต ั ัะฐะฝะธะปะธัะฐ" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 msgid "exec" msgstr "ะะะะะะะ" @@ -15358,195 +17225,308 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "ะฟัะฐะทะฝะฐ ะฟะพัะตะฝัะบะฐ ะบััะธั mbox: โ%sโ" -#: builtin/merge.c:55 +#: 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 ะะะะะะะะ_1 ะะะะะะะะ_2" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point ะฃะะะะะขะะ [ะะะะะะะะ]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะพะฑัะธ ะฟัะตะดัะตััะฒะตะฝะธัะธ" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "" +"ะพัะบัะธะฒะฐะฝะต ะฝะฐ ะฟัะตะดัะตััะฒะตะฝะธัะธัะต ะทะฐ ะตะดะฝะพะบัะฐัะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะผะฝะพะถะตััะฒะพ ะธััะพัะธะธ" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะตะดะพััะธะถะธะผะธัะต ะพั ะดััะณะธัะต ัะบะฐะทะฐัะตะปะธ" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "ะะะะะะะะ_1 ะฟัะตะดัะตััะฒะตะฝะธะบ ะปะธ ะต ะฝะฐ ะะะะะะะะ_2?" + +#: builtin/merge-base.c:151 +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โ ัะต ะฟัะตัะบะฐัะฐ." +msgstr[1] "ะฝะต ัะต ะฟะพะดะดััะถะฐั ะฟะพะฒะตัะต ะพั %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/merge.c:56 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [ะะะฆะะฏโฆ] [ะะะะะะะะโฆ]" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:120 msgid "switch `m' requires a value" msgstr "ะพะฟัะธััะฐ โ-mโ ะธะทะธัะบะฒะฐ ััะพะนะฝะพัั" -#: builtin/merge.c:141 +#: builtin/merge.c:143 #, c-format msgid "option `%s' requires a value" msgstr "ะพะฟัะธััะฐ โ%sโ ะธะทะธัะบะฒะฐ ััะพะนะฝะพัั" -#: builtin/merge.c:187 +#: builtin/merge.c:189 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "ะัะผะฐ ัะฐะบะฐะฒะฐ ัััะฐัะตะณะธั ะทะฐ ัะปะธะฒะฐะฝะต: โ%sโ.\n" -#: builtin/merge.c:188 +#: builtin/merge.c:190 #, c-format msgid "Available strategies are:" msgstr "ะะฐะปะธัะฝะธัะต ัััะฐัะตะณะธะธ ัะฐ:" -#: builtin/merge.c:193 +#: builtin/merge.c:195 #, c-format msgid "Available custom strategies are:" msgstr "ะะพะฟัะปะฝะธัะตะปะฝะธัะต ัััะฐัะตะณะธะธ ัะฐ:" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:246 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะฐัะธััะธะบะฐัะฐ ัะปะตะด ะทะฐะฒัััะฒะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะต" -#: builtin/merge.c:247 builtin/pull.c:154 +#: builtin/merge.c:249 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะฐัะธััะธะบะฐัะฐ ัะปะตะด ะทะฐะฒัััะฒะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะต" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:250 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ--statโ)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:252 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ะดะพะฑะฐะฒัะฝะต (ะฝะฐ ะผะฐะบัะธะผัะผ ัะฐะบัะฒ ะะ ะะ) ะทะฐะฟะธัะธ ะพั ััะบัะฐัะตะฝะธั ะถััะฝะฐะป ะฒ ััะพะฑัะตะฝะธะตัะพ " "ะทะฐ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/merge.c:253 builtin/pull.c:166 +#: builtin/merge.c:255 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะตะดะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะฒะผะตััะพ ะธะทะฒัััะฒะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะต" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:257 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "ะธะทะฒัััะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต ะฟัะธ ััะฟะตัะฝะพ ัะปะธะฒะฐะฝะต (ััะฐะฝะดะฐััะฝะพ ะดะตะนััะฒะธะต)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:259 builtin/pull.c:154 msgid "edit message before committing" msgstr "ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ััะพะฑัะตะฝะธะตัะพ ะฟัะตะดะธ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/merge.c:259 +#: builtin/merge.c:261 msgid "allow fast-forward (default)" msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟัะตะฒัััะฐะฝะต (ััะฐะฝะดะฐััะฝะพ ะดะตะนััะฒะธะต)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:263 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต, ะฐะบะพ ะฟัะตะฒัััะฐะฝะตัะพ ะต ะฝะตะฒัะทะผะพะถะฝะพ" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:267 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "ะฟัะพะฒะตัะบะฐ, ัะต ัะบะฐะทะฐะฝะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะต ั ะฟัะฐะฒะธะปะตะฝ ะฟะพะดะฟะธั ะฝะฐ GPG" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 msgid "strategy" msgstr "ะกะขะ ะะขะะะะฏ" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:269 builtin/pull.c:169 msgid "merge strategy to use" msgstr "ะกะขะ ะะขะะะะฏ ะทะฐ ัะปะธะฒะฐะฝะต, ะบะพััะพ ะดะฐ ัะต ะฟะพะปะทะฒะฐ" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option=value" msgstr "ะะะฆะะฏ=ะกะขะะะะะกะข" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "ะะะฆะะฏ ะทะฐ ะธะทะฑัะฐะฝะฐัะฐ ัััะฐัะตะณะธั ะทะฐ ัะปะธะฒะฐะฝะต" -#: builtin/merge.c:271 +#: builtin/merge.c:273 msgid "merge commit message (for a non-fast-forward merge)" msgstr "ะกะชะะะฉะะะะ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะตัะพ ััั ัะปะธะฒะฐะฝะต (ะฟัะธ ัััะธะฝัะบะธ ัะปะธะฒะฐะฝะธั)" -#: builtin/merge.c:278 +#: builtin/merge.c:280 msgid "abort the current in-progress merge" msgstr "ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัะตะบััะพัะพ ัะปะธะฒะฐะฝะต" -#: builtin/merge.c:280 +#: builtin/merge.c:282 msgid "--abort but leave index and working tree alone" msgstr "ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฑะตะท ะฟัะพะผัะฝะฐ ะฝะฐ ะธะฝะดะตะบัะฐ ะธ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: builtin/merge.c:282 +#: builtin/merge.c:284 msgid "continue the current in-progress merge" msgstr "ะฟัะพะดัะปะถะฐะฒะฐะฝะต ะฝะฐ ัะตะบััะพัะพ ัะปะธะฒะฐะฝะต" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:286 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะต ะฝะฐ ะฝะตะทะฐะฒะธัะธะผะธ ะธััะพัะธะธ" -#: builtin/merge.c:290 -msgid "verify commit-msg hook" +#: builtin/merge.c:293 +msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" -"ะฟัะพะฒะตัะบะฐ ะฝะฐ ะบัะบะฐัะฐ ะฟัะธ ะฟัะพะผัะฝะฐ ะฝะฐ ััะพะฑัะตะฝะธะตัะพ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต (commit-msg)" +"ะฑะตะท ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะบัะบะธัะต ะฟัะตะดะธ ะฟะพะดะฐะฒะฐะฝะต ะธ ัะปะธะฒะฐะฝะต ะธ ะฟัะธ ะฟัะพะผัะฝะฐ ะฝะฐ " +"ััะพะฑัะตะฝะธะตัะพ ะทะฐ ะฟะพะดะฐะฒะฐะฝะต (pre-merge-commit ะธ commit-msg)" -#: builtin/merge.c:307 +#: builtin/merge.c:310 msgid "could not run stash." msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัััะธ ัะบะฐัะฐะฒะฐะฝะต" -#: builtin/merge.c:312 +#: builtin/merge.c:315 msgid "stash failed" msgstr "ะฝะตััะฟะตัะฝะพ ัะบะฐัะฐะฒะฐะฝะต" -#: builtin/merge.c:317 +#: builtin/merge.c:320 #, c-format msgid "not a valid object: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะพะฑะตะบั: โ%sโ" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:342 builtin/merge.c:359 msgid "read-tree failed" msgstr "ะฝะตััะฟะตัะฝะพ ะฟัะพัะธัะฐะฝะต ะฝะฐ ะพะฑะตะบั-ะดััะฒะพ" -#: builtin/merge.c:386 +#: builtin/merge.c:389 msgid " (nothing to squash)" msgstr " (ะฝัะผะฐ ะบะฐะบะฒะพ ะดะฐ ัะต ะฒะบะฐัะฐ)" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "ะะบะฐัะฐะฝะพ ะฟะพะดะฐะฒะฐะฝะต โ ัะบะฐะทะฐัะตะปัั โHEADโ ะฝัะผะฐ ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ\n" -#: builtin/merge.c:447 +#: builtin/merge.c:450 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" "ะะธะฟัะฒะฐ ััะพะฑัะตะฝะธะต ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต โ ัะบะฐะทะฐัะตะปัั โHEADโ ะฝัะผะฐ ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ\n" -#: builtin/merge.c:498 +#: builtin/merge.c:501 #, c-format msgid "'%s' does not point to a commit" msgstr "โ%sโ ะฝะต ัะพัะธ ะบัะผ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/merge.c:585 +#: builtin/merge.c:588 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "ะะตะฟัะฐะฒะธะปะตะฝ ะฝะธะท ะทะฐ ะฝะฐัััะพะนะบะฐัะฐ โbranch.%s.mergeoptionsโ: โ%sโ" -#: builtin/merge.c:708 +#: builtin/merge.c:713 msgid "Not handling anything other than two heads merge." msgstr "ะะพะดะดััะถะฐ ัะต ัะฐะผะพ ัะปะธะฒะฐะฝะต ะฝะฐ ัะพัะฝะพ ะดะฒะต ะธััะพัะธะธ." -#: builtin/merge.c:722 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "ะะตะฟะพะทะฝะฐัะฐ ะพะฟัะธั ะทะฐ ัะตะบัััะธะฒะฝะพัะพ ัะปะธะฒะฐะฝะต โmerge-recursiveโ: โ-X%sโ" -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ" -#: builtin/merge.c:789 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "ะั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ัะตัะต" -#: builtin/merge.c:798 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "ะกะปะธะฒะฐะฝะตัะพ ะฝัะผะฐ ะดะฐ ะฑัะดะต ะฟะพะดะฐะดะตะฝะพ. ะะฐ ะทะฐะฒัััะฒะฐะฝะตัะพ ะผั ะธ ะฟะพะดะฐะฒะฐะฝะตัะพ ะผั " "ะธะทะฟะพะปะทะฒะฐะนัะต ะบะพะผะฐะฝะดะฐัะฐ โgit commitโ.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:808 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" @@ -15555,11 +17535,11 @@ msgstr "" "ะ ััะพะฑัะตะฝะธะตัะพ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต ะดะพะฑะฐะฒะตัะต ะธะฝัะพัะผะฐัะธั ะทะฐ ะฟัะธัะธะฝะฐัะฐ ะทะฐ\n" "ัะปะธะฒะฐะฝะตัะพ, ะพัะพะฑะตะฝะพ ะฐะบะพ ัะปะธะฒะฐัะต ะพะฑะฝะพะฒะตะฝ ะพัะดะฐะปะตัะตะฝ ะบะปะพะฝ ะฒ ัะตะผะฐัะธัะตะฝ ะบะปะพะฝ.\n" -#: builtin/merge.c:809 +#: builtin/merge.c:813 msgid "An empty message aborts the commit.\n" msgstr "ะัะฐะทะฝะพ ััะพะฑัะตะฝะธะต ะฟัะตะดะพัะฒัะฐััะฒะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:816 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15568,76 +17548,76 @@ msgstr "" "ะ ะตะดะพะฒะตัะต, ะบะพะธัะพ ะทะฐะฟะพัะฒะฐั ั โ%cโ, ัะต ะฑัะดะฐั ะฟัะพะฟััะฝะฐัะธ, ะฐ ะฟัะฐะทะฝะพ\n" "ััะพะฑัะตะฝะธะต ะฟัะตัััะฐะฝะพะฒัะฒะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:869 msgid "Empty commit message." msgstr "ะัะฐะทะฝะพ ััะพะฑัะตะฝะธะต ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต." -#: builtin/merge.c:872 +#: builtin/merge.c:884 #, c-format msgid "Wonderful.\n" msgstr "ะััะฒะธัั ะตัะฐะฟ ะฝะฐ ัะปะธะฒะฐะฝะตัะพ ะทะฐะฒัััะธ.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:945 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "ะะตััะฟะตัะฝะพ ะฐะฒัะพะผะฐัะธัะฝะพ ัะปะธะฒะฐะฝะต โ ะบะพัะธะณะธัะฐะนัะต ะบะพะฝัะปะธะบัะธัะต ะธ ะฟะพะดะฐะนัะต " "ัะตะทัะปัะฐัะฐ.\n" -#: builtin/merge.c:972 +#: builtin/merge.c:984 msgid "No current branch." msgstr "ะัะผะฐ ัะตะบัั ะบะปะพะฝ." -#: builtin/merge.c:974 +#: builtin/merge.c:986 msgid "No remote for the current branch." msgstr "ะขะตะบััะธัั ะบะปะพะฝ ะฝะต ัะปะตะดะธ ะฝะธะบะพะน." -#: builtin/merge.c:976 +#: builtin/merge.c:988 msgid "No default upstream defined for the current branch." msgstr "ะขะตะบััะธัั ะบะปะพะฝ ะฝะต ัะปะตะดะธ ะฝะธะบะพะน ะบะปะพะฝ." -#: builtin/merge.c:981 +#: builtin/merge.c:993 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "ะะธะบะพะน ะบะปะพะฝ ะฝะต ัะปะตะดะธ ะบะปะพะฝะฐ โ%sโ ะพั ั ัะฐะฝะธะปะธัะตัะพ โ%sโ" -#: builtin/merge.c:1038 +#: builtin/merge.c:1050 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั โ%sโ ะฒ ััะตะดะฐัะฐ โ%sโ" -#: builtin/merge.c:1141 +#: builtin/merge.c:1153 #, c-format msgid "not something we can merge in %s: %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ัะปะตะต ะฒ โ%sโ: %s" -#: builtin/merge.c:1175 +#: builtin/merge.c:1187 msgid "not something we can merge" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ัะปะตะต" -#: builtin/merge.c:1278 +#: builtin/merge.c:1291 msgid "--abort expects no arguments" msgstr "ะพะฟัะธััะฐ โ--abortโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" -#: builtin/merge.c:1282 +#: builtin/merge.c:1295 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "ะะต ะผะพะถะต ะดะฐ ะฟัะตัััะฐะฝะพะฒะธัะต ัะปะธะฒะฐะฝะต, ะทะฐัะพัะพ ะฒ ะผะพะผะตะฝัะฐ ะฝะต ัะต ะธะทะฒัััะฒะฐ ัะฐะบะพะฒะฐ " "(ะปะธะฟัะฒะฐ ัะบะฐะทะฐัะตะป โMERGE_HEADโ)." -#: builtin/merge.c:1291 +#: builtin/merge.c:1313 msgid "--quit expects no arguments" msgstr "ะพะฟัะธััะฐ โ--quitโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" -#: builtin/merge.c:1304 +#: builtin/merge.c:1326 msgid "--continue expects no arguments" msgstr "ะพะฟัะธััะฐ โ--continueโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" -#: builtin/merge.c:1308 +#: builtin/merge.c:1330 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "ะ ะผะพะผะตะฝัะฐ ะฝะต ัะต ะธะทะฒัััะฒะฐ ัะปะธะฒะฐะฝะต (ะปะธะฟัะฒะฐ ัะบะฐะทะฐัะตะป โMERGE_HEADโ)." -#: builtin/merge.c:1324 +#: builtin/merge.c:1346 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15645,7 +17625,7 @@ msgstr "" "ะะต ััะต ะทะฐะฒัััะธะปะธ ัะปะธะฒะฐะฝะต. (ะฃะบะฐะทะฐัะตะปัั โMERGE_HEADโ ัััะตััะฒัะฒะฐ).\n" "ะะพะดะฐะนัะต ะฟัะพะผะตะฝะธัะต ัะธ, ะฟัะตะดะธ ะดะฐ ะทะฐะฟะพัะฝะตัะต ะฝะพะฒะพ ัะปะธะฒะฐะฝะต." -#: builtin/merge.c:1331 +#: builtin/merge.c:1353 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15653,221 +17633,109 @@ msgstr "" "ะะต ััะต ะทะฐะฒัััะธะปะธ ะพัะฑะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต (ัะบะฐะทะฐัะตะปัั โCHERRY_PICK_HEADโ\n" "ัััะตััะฒัะฒะฐ). ะะพะดะฐะนัะต ะฟัะพะผะตะฝะธัะต ัะธ, ะฟัะตะดะธ ะดะฐ ะทะฐะฟะพัะฝะตัะต ะฝะพะฒะพ ัะปะธะฒะฐะฝะต." -#: builtin/merge.c:1334 +#: builtin/merge.c:1356 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "ะะต ััะต ะทะฐะฒัััะธะปะธ ะพัะฑะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต (ัะบะฐะทะฐัะตะปัั โCHERRY_PICK_HEADโ\n" "ัััะตััะฒัะฒะฐ)." -#: builtin/merge.c:1348 +#: builtin/merge.c:1370 msgid "You cannot combine --squash with --no-ff." msgstr "ะะฟัะธััะฐ โ--squashโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั โ--no-ffโ." -#: builtin/merge.c:1350 +#: builtin/merge.c:1372 msgid "You cannot combine --squash with --commit." msgstr "ะะฟัะธััะฐ โ--squashโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั โ--commitโ." -#: builtin/merge.c:1366 +#: builtin/merge.c:1388 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "ะะต ะต ัะบะฐะทะฐะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะธ ะฝะฐัััะพะนะบะฐัะฐ โmerge.defaultToUpstreamโ ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ." -#: builtin/merge.c:1383 +#: builtin/merge.c:1405 msgid "Squash commit into empty head not supported yet" msgstr "ะะบะฐัะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต ะฒัะฒ ะฒััั ะฑะตะท ะธััะพัะธั ะฒัะต ะพัะต ะฝะต ัะต ะฟะพะดะดััะถะฐ" -#: builtin/merge.c:1385 +#: builtin/merge.c:1407 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "ะะพะฝะตะถะต ะฒััั ัั ะต ะฑะตะท ะธััะพัะธั, ะฒัะธัะบะธ ัะปะธะฒะฐะฝะธั ัะฐ ะฟัะตะฒัััะฐะฝะธั, ะฝะต ะผะพะถะต ะดะฐ ัะต " "ะธะทะฒัััะธ ัััะธะฝัะบะพ ัะปะธะฒะฐะฝะต ะธะทะธัะบะฒะฐะฝะพ ะพั ะพะฟัะธััะฐ โ--no-ffโ" -#: builtin/merge.c:1390 +#: builtin/merge.c:1412 #, c-format msgid "%s - not something we can merge" msgstr "โ%sโ โ ะฝะต ะต ะฝะตัะพ, ะบะพะตัะพ ะผะพะถะต ะดะฐ ัะต ัะปะตะต" -#: builtin/merge.c:1392 +#: builtin/merge.c:1414 msgid "Can merge only exactly one commit into empty head" msgstr "ะะพะถะตัะต ะดะฐ ัะปะตะตัะต ัะพัะฝะพ ะตะดะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะฒัะฒ ะฒััั ะฑะตะท ะธััะพัะธั" -#: builtin/merge.c:1471 +#: builtin/merge.c:1495 msgid "refusing to merge unrelated histories" msgstr "ะฝะตะทะฐะฒะธัะธะผะธ ะธััะพัะธะธ ะฝะต ะผะพะถะต ะดะฐ ัะต ัะปะตัั" -#: builtin/merge.c:1480 +#: builtin/merge.c:1504 msgid "Already up to date." msgstr "ะะตัะต ะต ะพะฑะฝะพะฒะตะฝะพ." -#: builtin/merge.c:1490 +#: builtin/merge.c:1514 #, c-format msgid "Updating %s..%s\n" msgstr "ะะฑะฝะพะฒัะฒะฐะฝะต โ%s..%sโ\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1560 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "ะัะพะฑะฐ ััั ัะปะธะฒะฐะฝะต ะฒ ัะฐะผะบะธัะต ะฝะฐ ะธะฝะดะตะบัะฐโฆ\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1567 #, c-format msgid "Nope.\n" msgstr "ะะตััะฟะตัะฝะพ ัะปะธะฒะฐะฝะต.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1592 msgid "Already up to date. Yeeah!" msgstr "ะะตัะต ะต ะพะฑะฝะพะฒะตะฝะพ!" -#: builtin/merge.c:1570 +#: builtin/merge.c:1598 msgid "Not possible to fast-forward, aborting." msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัััะธ ะฟัะตะฒัััะฐะฝะต, ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะดะตะนััะฒะธะตัะพ." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1626 builtin/merge.c:1691 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "ะัะธะฒะตะถะดะฐะฝะต ะฝะฐ ะดััะฒะพัะพ ะบัะผ ะฟััะฒะพะฝะฐัะฐะปะฝะพัะพโฆ\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1630 #, c-format msgid "Trying merge strategy %s...\n" msgstr "ะัะพะฑะฒะฐะฝะต ััั ัััะฐัะตะณะธััะฐ ะทะฐ ัะปะธะฒะฐะฝะต โ%sโโฆ\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1682 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "ะะธะบะพั ัััะฐัะตะณะธั ะทะฐ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะธะทะฒัััะธ ัะปะธะฒะฐะฝะตัะพ.\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1684 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "ะะตััะฟะตัะฝะพ ัะปะธะฒะฐะฝะต ััั ัััะฐัะตะณะธั โ%sโ.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1693 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "ะะพะปะทะฒะฐ ัะต ัััะฐัะตะณะธััะฐ โ%sโ, ะบะพััะพ ัะต ะฟะพะดะณะพัะฒะธ ะดััะฒะพัะพ ะทะฐ ะบะพัะธะณะธัะฐะฝะต ะฝะฐ " "ััะบะฐ.\n" -#: builtin/merge.c:1672 +#: builtin/merge.c:1707 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "ะะฒัะพะผะฐัะธัะฝะพัะพ ัะปะธะฒะฐะฝะต ะทะฐะฒัััะธ ััะฟะตัะฝะพ. ะกะฐะผะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะต ะธะทะฒัััะตะฝะพ, " "ะทะฐัะพัะพ ะฑะต ะทะฐะดะฐะดะตะฝะฐ ะพะฟัะธััะฐ โ--no-commitโ.\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 ะะะะะะะะ_1 ะะะะะะะะ_2" - -#: 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 "ะะะะะะะะ_1 ะฟัะตะดัะตััะฒะตะฝะธะบ ะปะธ ะต ะฝะฐ ะะะะะะะะ_2?" - -#: 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:46 -#, c-format -msgid "unknown option %s" -msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะพะฟัะธั: โ%sโ" - -#: builtin/merge-recursive.c:52 -#, c-format -msgid "could not parse object '%s'" -msgstr "ะฝะตััะฟะตัะตะฝ ะฐะฝะฐะปะธะท ะฝะฐ ะพะฑะตะบัะฐ โ%sโ" - -#: 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:64 -msgid "not handling anything other than two heads merge." -msgstr "ะฟะพะดะดััะถะฐ ัะต ัะฐะผะพ ัะปะธะฒะฐะฝะต ะฝะฐ ัะพัะฝะพ ะดะฒะต ะธััะพัะธะธ." - -#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 -#, c-format -msgid "could not resolve ref '%s'" -msgstr "ัะบะฐะทะฐัะตะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" - -#: builtin/merge-recursive.c:78 -#, 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]" @@ -15886,19 +17754,19 @@ msgstr "ัะฐะทัะตัะฐะฒะฐะฝะต ะฝะฐ ััะทะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟะพะฒะตัะต ะพั #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -"git multi-pack-index [--object-dir=ะะะ _ะะะะะข] (write|verify|expire|repack --" -"batch-size=ะ ะะะะะ )" +"git multi-pack-index [ะะะฆะะฏโฆ] (write|verify|expire|repack --batch-" +"size=ะ ะะะะะ )" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "ะะะ ะตะบัะพัะธััะฐ_ั_ะะะะะขะธ ััะดััะถะฐ ะผะฝะพะถะตััะฒะพ ะดะฒะพะนะบะธ ะฟะฐะบะตัะฝะธ ัะฐะนะปะพะฒะต ััั " "ััะพัะฒะตัะฝะธั ะธะผ ะธะฝะดะตะบั" -#: builtin/multi-pack-index.c:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -15906,15 +17774,15 @@ msgstr "" "ะฟัะธ ะฟัะตะฟะฐะบะตัะธัะฐะฝะต ะฟะฐะบะตัะฝะธัะต ัะฐะนะปะพะฒะต, ะบะพะธัะพ ัะฐ ั ะฟะพ-ะผะฐะปัะบ ะพั ัะพะทะธ ัะฐะทะผะตั, ะดะฐ " "ัะต ะพะฑะตะดะธะฝัะฒะฐั ะฒ ะฟะฐะบะตัะธ ั ะฟะพ-ะณะพะปัะผ ะพั ัะพะทะธ ัะฐะทะผะตั" -#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฐัะณัะผะตะฝัะธ" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 msgid "--batch-size option is only for 'repack' subcommand" msgstr "ะพะฟัะธััะฐ โ--batch-sizeโ ะธะทะธัะบะฒะฐ ะฟะพะดะบะพะผะฐะฝะดะฐัะฐ โrepackโ" -#: builtin/multi-pack-index.c:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะฟะพะดะบะพะผะฐะฝะดะฐ: %s" @@ -15947,115 +17815,119 @@ msgstr "ะฟัะธะฝัะดะธัะตะปะฝะพ ะฟัะตะผะตััะฒะฐะฝะต/ะฟัะตะธะผะตะฝัะฒะฐะฝะต msgid "skip move/rename errors" msgstr "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ะณัะตัะบะธัะต ะฟัะธ ะฟัะตะผะตััะฒะฐะฝะต/ะฟัะตะธะผะตะฝัะฒะฐะฝะต" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "ัะตะปัะฐ โ%sโ ัััะตััะฒัะฒะฐ ะธ ะฝะต ะต ะดะธัะตะบัะพัะธั" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะฟัะตะธะผะตะฝัะฒะฐะฝะตัะพ ะฝะฐ ะพะฑะตะบั ะพั โ%sโ ะฝะฐ โ%sโ\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะพะฑะตะบั" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "ะดะธัะตะบัะพัะธั ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะตะผะตััะธ ะฒ ัะตะฑะต ัะธ" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "ะดะธัะตะบัะพัะธั ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะตะผะตััะธ ะฒััั ั ัะฐะนะป" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "ะฟััะฒะพะฝะฐัะฐะปะฝะฐัะฐ ะดะธัะตะบัะพัะธั ะต ะฟัะฐะทะฝะฐ" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "ะฝะต ะต ะฟะพะด ะบะพะฝััะพะปะฐ ะฝะฐ Git" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "ะบะพะฝัะปะธะบั" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "ัะตะปัะฐ ัััะตััะฒัะฒะฐ" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "ะฟัะตะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ โ%sโ" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "ะัะตะทะฐะฟะธัะฒะฐะฝะตัะพ ะต ะฝะตะฒัะทะผะพะถะฝะพ" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "ะผะฝะพะถะตััะฒะพ ะธะทัะพัะฝะธัะธ ะทะฐ ะตะดะฝะฐ ัะตะป" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "ัะตะปะตะฒะฐัะฐ ะดะธัะตะบัะพัะธั ะฝะต ัััะตััะฒัะฒะฐ" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, ะพะฑะตะบั: โ%sโ, ัะตะป: โ%sโ" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "ะัะตะธะผะตะฝัะฒะฐะฝะต ะฝะฐ โ%sโ ะฝะฐ โ%sโ\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "ะฝะตััะฟะตัะฝะพ ะฟัะตะธะผะตะฝัะฒะฐะฝะต ะฝะฐ โ%sโ" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [ะะะฆะะฏโฆ] ะะะะะะะะโฆ" -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [ะะะฆะะฏโฆ] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [ะะะฆะะฏโฆ] --stdin" -#: builtin/name-rev.c:411 -msgid "print only names (no SHA-1)" -msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะผะตะฝะฐัะฐ (ะฑะตะท ััะผะธัะต ะฟะพ SHA1)" +#: builtin/name-rev.c:524 +msgid "print only ref-based names (no object names)" +msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะธะผะตะฝะฐ ะฝะฐ ะฑะฐะทะฐัะฐ ะฝะฐ ัะบะฐะทะฐัะตะปะธ (ะฐ ะฝะต ะธะผะตะฝะฐ ะฝะฐ ะพะฑะตะบัะธ)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ะตัะธะบะตัะธัะต ะทะฐ ะธะผะตะฝัะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะฝะฐะฟะฐัะฒะฐัะธ ะฝะฐ ะจะะะะะะฐ" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะฝะฐะฟะฐัะฒะฐัะธ ะฝะฐ ะจะะะะะะฐ" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะฟะพะดะฐะฒะฐะฝะธั, ะบะพะธัะพ ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะดะพััะธะณะฝะฐัะธ ะพั ะฒัะธัะบะธ " "ัะบะฐะทะฐัะตะปะธ" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "ัะตัะตะฝะต ะพั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "ะดะฐ ัะต ะธะทะฒะตะถะดะฐั ะธ ะฝะตะดะตัะธะฝะธัะฐะฝะธัะต ะธะผะตะฝะฐ (ััะฐะฝะดะฐััะฝะฐ ััะพะนะฝะพัั ะฝะฐ ะพะฟัะธััะฐ)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะดะตะฝัะธัะธะบะฐัะพัะธัะต ะฝะฐ ะพะฑะตะบัะธ-ะตัะธะบะตัะธ (ะทะฐ ะฒัััะตัะฝะธ ะฝัะถะดะธ)" @@ -16202,7 +18074,7 @@ msgstr "ะพะฑะตะบััั-ะฑะตะปะตะถะบะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ msgid "the note contents have been left in %s" msgstr "ััะดััะถะฐะฝะธะตัะพ ะฝะฐ ะฑะตะปะตะถะบะฐัะฐ ะต ะฒัะฒ ัะฐะนะปะฐ โ%sโ" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ ะธะปะธ ะฟัะพัะตัะตะฝ" @@ -16443,7 +18315,7 @@ msgstr "" "ัะตะทัะปัะฐัะฐ ั โgit notes merge --commitโ ะธะปะธ ะฟัะตัััะฐะฝะพะฒะตัะต ัะปะธะฒะฐะฝะตัะพ ั " "ะบะพะผะฐะฝะดะฐัะฐ โgit notes merge --abortโ.\n" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะพัะบัะธะต ะบัะผ ะบะฐะบะฒะพ ัะพัะธ โ%sโ." @@ -16461,7 +18333,7 @@ msgstr "ะพะฟะธััั ะทะฐ ะธะทััะธะฒะฐะฝะตัะพ ะฝะฐ ะฝะตัััะตััะฒัะฒะฐั msgid "read object names from the standard input" msgstr "ะธะทัะธัะฐะฝะต ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ะพะฑะตะบัะธัะต ะพั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "ัะฐะผะพ ะธะทะฒะตะถะดะฐะฝะต ะฑะตะท ะดะตะนััะฒะธัะตะปะฝะพ ะพะบะฐััััะฝะต" @@ -16477,148 +18349,142 @@ msgstr "ะฃะะะะะขะะ_ะะ_ะะะะะะะ" msgid "use notes from <notes-ref>" msgstr "ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ะฑะตะปะตะถะบะฐัะฐ ัะพัะตะฝะฐ ะพั ัะพะทะธ ะฃะะะะะขะะ_ะะ_ะะะะะะะ" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1605 #, c-format msgid "unknown subcommand: %s" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะฟะพะดะบะพะผะฐะฝะดะฐ: %s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [ะะะฆะะฏโฆ] [< ะกะะะกะชะ_ะก_ะฃะะะะะขะะะ | < ะกะะะกะชะ_ะก_ะะะะะขะ]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [ะะะฆะะฏโฆ] ะะ ะะคะะะก_ะะ_ะะะะขะ [< ะกะะะกะชะ_ะก_ะฃะะะะะขะะะ | < " "ะกะะะกะชะ_ะก_ะะะะะขะ]" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "ะปะพัะฐ ะบะพะฝััะพะปะฝะฐ ััะผะฐ ะทะฐ ะฟะฐะบะตัะธัะฐะฝะธั ะพะฑะตะบั โ%sโ" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "ะฟะฐะบะตัะธัะฐะฝ ะพะฑะตะบั ั ะณัะตัะบะธ ะทะฐ โ%sโ" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "ัะตะบัััะธะฒะฝะฐ ัะฐะทะปะธะบะฐ ะทะฐ ะพะฑะตะบั โ%sโ" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "ะฟะพะดัะตะดะตะฝะธ ะฑัั ะฐ %u ะพะฑะตะบัะฐ, ะฐ ัะต ะพัะฐะบะฒะฐั ะฐ %<PRIu32>" -#: 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 +#: builtin/pack-objects.c:1004 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "ะธะทะบะปััะฒะฐะฝะต ะฝะฐ ะทะฐะฟะธัะฒะฐะฝะตัะพ ะฝะฐ ะฑะธัะพะฒะฐัะฐ ะผะฐัะบะฐ, ะฟะฐะบะตัะธัะต ัะฐ ัะฐะทะดะตะปะตะฝะธ ะฟะพัะฐะดะธ " "ััะพะนะฝะพัััะฐ ะฝะฐ โpack.packSizeLimitโ" -#: builtin/pack-objects.c:854 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "ะะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะปััะตะฝะฐ ะธะฝัะพัะผะฐัะธั ััะตะท โstatโ ะทะฐ โ%sโ" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "ะฑัั ะฐ ะทะฐะฟะธัะฐะฝะธ %<PRIu32> ะพะฑะตะบัะธ, ะฐ ัะต ะพัะฐะบะฒะฐั ะฐ %<PRIu32>" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1348 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "ะธะทะบะปััะฒะฐะฝะต ะฝะฐ ะทะฐะฟะธัะฒะฐะฝะตัะพ ะฝะฐ ะฑะธัะพะฒะฐัะฐ ะผะฐัะบะฐ, ะทะฐัะพัะพ ะฝัะบะพะธ ะพะฑะตะบัะธ ะฝัะผะฐ ะดะฐ ัะต " "ะฟะฐะบะตัะธัะฐั" -#: builtin/pack-objects.c:1597 +#: builtin/pack-objects.c:1796 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะดะฐะปะตัะฝะพ ะฝะฐัะฐะปะพ ะฝะฐ ะพัะผะตััะฒะฐะฝะตัะพ ะทะฐ ะพะฑะตะบัะธัะต-ัะฐะทะปะธะบะฐ ะทะฐ โ%sโ" -#: builtin/pack-objects.c:1606 +#: builtin/pack-objects.c:1805 #, c-format msgid "delta base offset out of bound for %s" msgstr "ะฝะตะดะพััะธะถะธะผะพ ะฝะฐัะฐะปะพ ะฝะฐ ะพัะผะตััะฒะฐะฝะตัะพ ะทะฐ ะพะฑะตะบัะธัะต-ัะฐะทะปะธะบะฐ ะทะฐ โ%sโ" -#: builtin/pack-objects.c:1875 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "ะัะตะฑัะพัะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต" -#: builtin/pack-objects.c:2005 -#, c-format -msgid "unable to get size of %s" -msgstr "ัะฐะทะผะตััั ะฝะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะปััะตะฝ" - -#: builtin/pack-objects.c:2020 +#: builtin/pack-objects.c:2231 #, c-format msgid "unable to parse object header of %s" msgstr "ะทะฐะณะปะฐะฒะฝะฐัะฐ ัะฐัั ะฝะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝะฐ" -#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "ะพะฑะตะบััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะพัะตัะต" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "ะพะฑะตะบััั โ%sโ ะต ั ะฝะตะฟัะฐะฒะธะปะฝะฐ ะดัะปะถะธะฝะฐ (%<PRIuMAX>, ะฐ ะฝะต %<PRIuMAX>)" -#: builtin/pack-objects.c:2130 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "ะฝะตะพะฟัะธะผะธะทะธัะฐะฝ ะฟะฐะบะตั โ ะฟะฐะผะตััะฐ ัะฒัััะธ" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2656 #, c-format msgid "Delta compression using up to %d threads" msgstr "ะะตะปัะฐ ะบะพะผะฟัะตัะธััะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ะดะพ %d ะฝะธัะบะธ" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2795 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" "ะพะฑะตะบัะธัะต, ะบะพะธัะพ ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะดะพััะธะณะฝะฐัะธ ะพั ะตัะธะบะตัะฐ โ%sโ, ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะฐั " "ะฟะฐะบะตัะธัะฐะฝะธ" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "ะะพะผะฟัะตัะธัะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฑัะพะน ัะฐะทะปะธะบะธ" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" +"ััะพะนะฝะพัััะฐ ะฝะฐ โuploadpack.blobpackfileuriโ ัััะฑะฒะฐ ะดะฐ ะต ะฒัะฒ ัะพัะผะฐั " +"โะกะฃะะ_ะะ_ะะะะะข ะกะฃะะ_ะะ_ะะะะะข ะะะ ะะกโ (ะฟะพะปััะตะฝะฐ ะต โ%sโ)" + +#: builtin/pack-objects.c:2964 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" +"ะฒะตัะต ะธะผะฐ ะฝะฐัััะพะนะบะฐ ะทะฐ ะพะฑะตะบัะฐ ะฒ ะดััะณ ัะตะด โuploadpack." +"blobpackfileuriโ (ะฟะพะปััะตะฝะฐ ะต โ%sโ)" + +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16627,7 +18493,7 @@ msgstr "" "ะพัะฐะบะฒะฐ ัะต ะธะดะตะฝัะธัะธะบะฐัะพั ะฝะฐ ะบัะฐะตะฝ ะพะฑะตะบั, ะฐ ะฝะต:\n" " %s" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16636,267 +18502,260 @@ msgstr "" "ะพัะฐะบะฒะฐ ัะต ะธะดะตะฝัะธัะธะบะฐัะพั ะฝะฐ ะพะฑะตะบั, ะฐ ะฝะต:\n" " %s" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โ--missingโ" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "ะธะฝะดะตะบััั ะฝะฐ ะฟะฐะบะตัะฝะธั ัะฐะนะป ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:3187 #, c-format msgid "loose object at %s could not be examined" msgstr "ะฝะตะฟะฐะบะตัะธัะฐะฝะธัั ะพะฑะตะบั ะฒ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฐะฝะฐะปะธะทะธัะฐะฝ" -#: builtin/pack-objects.c:3041 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "ะพััะฐะฒะฐะฝะตัะพ ะฝะฐ ะพะฑะตะบัะฐ ะฝะตะฟะฐะบะตัะธัะฐะฝ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฝะฐะปะพะถะตะฝะพ" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "โ%sโ ะฝะต ะต ะฒะตััะธั" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฒะตััะธั โ%sโ" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "ัะบะพัะพัะฝะธัะต ะพะฑะตะบัะธ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะดะพะฑะฐะฒะตะฝะธ" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "ะฝะตะฟะพะดะดััะถะฐะฝะฐ ะฒะตััะธั ะฝะฐ ะธะฝะดะตะบัะฐ โ%sโ" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ะฒะตััะธั ะฝะฐ ะธะฝะดะตะบัะฐ โ%sโ" -#: 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 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "ะะะ ะกะะฏ[,ะะขะะะกะขะะะะ]" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3489 msgid "write the pack index file in the specified idx format version" msgstr "" "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ ะฝะฐ ะฟะฐะบะตัะฝะธัะต ัะฐะนะปะพะฒะต ะฒัะฒ ัะพัะผะฐฬัะฐ ั ัะบะฐะทะฐะฝะฐัะฐ ะฒะตััะธั" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "ะผะฐะบัะธะผะฐะปะตะฝ ัะฐะทะผะตั ะฝะฐ ะฒัะตะบะธ ะฟะฐะบะตัะตะฝ ัะฐะนะป" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต ะทะฐะตัะธ ะพั ะดััะณะธ ั ัะฐะฝะธะปะธัะฐ ะฝะฐ ะพะฑะตะบัะธ" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ะฟะฐะบะตัะธัะฐะฝะธัะต ะพะฑะตะบัะธ" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "ะพะณัะฐะฝะธัะฐะฒะฐะฝะต ะฝะฐ ะฟัะพะทะพัะตัะฐ ะทะฐ ะฟะฐะบะตัะธัะฐะฝะต ะฟะพ ะฑัะพะน ะพะฑะตะบัะธ" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3500 msgid "limit pack window by memory in addition to object limit" msgstr "" "ะพะณัะฐะฝะธัะฐะฒะฐะฝะต ะฝะฐ ะฟัะพะทะพัะตัะฐ ะทะฐ ะฟะฐะบะตัะธัะฐะฝะต ะธ ะฟะพ ะฟะฐะผะตั ะพัะฒะตะฝ ะฟะพ ะฑัะพะน ะพะฑะตะบัะธ" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3502 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "ะผะฐะบัะธะผะฐะปะฝะฐ ะดัะปะถะธะฝะฐ ะฝะฐ ะฒะตัะธะณะฐัะฐ ะพั ัะฐะทะปะธะบะธ, ะบะพััะพ ะต ะฟะพะทะฒะพะปะตะฝะฐ ะฒ ะฟะฐะบะตัะฝะธั ัะฐะนะป" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "ะฟัะตะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัััะตััะฒัะฒะฐัะธัะต ัะฐะทะปะธะบะธ" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "ะฟัะตะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัััะตััะฒัะฒะฐัะธัะต ะพะฑะตะบัะธ" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธ โOFS_DELTAโ" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3510 msgid "use threads when searching for best delta matches" msgstr "" "ััะฐััะธัะฐะฝะต ะฝะฐ ะฝะธัะบะธ ะทะฐ ะฟัะตััััะฒะฐะฝะต ะฝะฐ ะฝะฐะน-ะดะพะฑัะธัะต ััะฒะฟะฐะดะตะฝะธั ะฝะฐ ัะฐะทะปะธะบะธัะต" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "ะฑะตะท ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟัะฐะทะตะฝ ะฟะฐะบะตัะตะฝ ัะฐะนะป" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "ะธะทัะธัะฐะฝะต ะฝะฐ ะฒะตััะธะธัะต ะพั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3516 msgid "limit the objects to those that are not yet packed" msgstr "ะพะณัะฐะฝะธัะฐะฒะฐะฝะต ะดะพ ะฒัะต ะพัะต ะฝะตะฟะฐะบะตัะธัะฐะฝะธัะต ะพะฑะตะบัะธ" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "" "ะฒะบะปััะฒะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะพะฑะตะบัะธ, ะบะพะธัะพ ะผะพะณะฐั ะดะฐ ัะต ะดะพััะธะณะฝะฐั ะพั ะฟัะพะธะทะฒะพะปะตะฝ " "ัะบะฐะทะฐัะตะป" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "ะฒะบะปััะฒะฐะฝะต ะธ ะฝะฐ ะพะฑะตะบัะธัะต ัะพัะตะฝะธ ะพั ะทะฐะฟะธัะธัะต ะฒ ะถััะฝะฐะปะฐ ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "ะฒะบะปััะฒะฐะฝะต ะธ ะฝะฐ ะพะฑะตะบัะธัะต ัะพัะตะฝะธ ะพั ะธะฝะดะตะบัะฐ" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟะฐะบะตัะฐ ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะธะทั ะพะด" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3530 msgid "include tag objects that refer to objects to be packed" msgstr "" "ะฒะบะปััะฒะฐะฝะต ะธ ะฝะฐ ะพะฑะตะบัะธัะต-ะตัะธะบะตัะธ, ะบะพะธัะพ ัะพัะฐั ะบัะผ ะพะฑะตะบัะธัะต, ะบะพะธัะพ ัะต ะฑัะดะฐั " "ะฟะฐะบะตัะธัะฐะฝะธ" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฝะตะดะพััะธะถะธะผะธัะต ะพะฑะตะบัะธ" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "ะฟะฐะบะตัะธัะฐะฝะต ะธ ะฝะฐ ะฝะตะดะพััะธะถะธะผะธัะต ะพะฑะตะบัะธ" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "ัะฐะทะฟะฐะบะตัะธัะฐะฝะต ะฝะฐ ะฝะตะดะพััะธะถะธะผะธัะต ะพะฑะตะบัะธ, ะบะพะธัะพ ัะฐ ะฟะพ-ะฝะพะฒะธ ะพั ัะพะฒะฐ ะะ ะะะ" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฐะปะณะพัะธััะผ ะทะฐ ัะฐััะธัะฝะฐ ะดะพััะธะถะธะผะพัั" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "ััะทะดะฐะฒะฐะฝะต ะฝะฐ ััะบัะฐัะตะฝะธ ะฟะฐะบะตัะธ" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "ะฟะฐะบะตัะธัะฐะฝะต ะฟะพะดั ะพะดััะพ ะทะฐ ะฟะปะธัะบะพ ะดะพััะฐะฒัะฝะต" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ะฟะฐะบะตัะธัะต, ะบะพะธัะพ ัะฐ ะฟัะธะดััะถะตะฝะธ ะพั ัะฐะนะป โ.keepโ" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "ะฟัะพะฟััะบะฐะฝะต ะฝะฐ ัะพะทะธ ะฟะฐะบะตั" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "ะฝะธะฒะพ ะฝะฐ ะบะพะผะฟัะตัะธัะฐะฝะต ะฟัะธ ะฟะฐะบะตัะธัะฐะฝะต" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ัะพะดะธัะตะปะธ โ ะดะพัะธ ะธ ัะตะทะธ, ะบะพะธัะพ ะฝะพัะผะฐะปะฝะพ ัะฐ ัะบัะธัะธ ะฟัะธ " "ะฟัะธัะฐะถะดะฐะฝะธััะฐ" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3553 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัััะตััะฒัะฒะฐัะธ ะธะฝะดะตะบัะธ ะฝะฐ ะฑะฐะทะฐ ะฑะธัะพะฒะธ ะผะฐัะบะธ ะทะฐ ััะบะพััะฒะฐะฝะต ะฝะฐ " "ะฟัะตะฑัะพัะฒะฐะฝะตัะพ ะฝะฐ ะพะฑะตะบัะธัะต" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3555 msgid "write a bitmap index together with the pack index" msgstr "" "ะทะฐะฟะฐะทะฒะฐะฝะต ะธ ะฝะฐ ะธะฝะดะตะบั ะฝะฐ ะฑะฐะทะฐ ะฟะพะฑะธัะพะฒะฐ ะผะฐัะบะฐ, ะทะฐะตะดะฝะพ ั ะธะฝะดะตะบัะฐ ะทะฐ ะฟะฐะบะตัะฐ" -#: builtin/pack-objects.c:3327 +#: builtin/pack-objects.c:3559 msgid "write a bitmap index if possible" msgstr "ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะธ ะฝะฐ ะฑะฐะทะฐ ะฑะธัะพะฒะธ ะผะฐัะบะธ ะฟัะธ ะฒัะทะผะพะถะฝะพัั" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "ะบะฐะบ ะดะฐ ัะต ะพะฑัะฐะฑะพัะฒะฐั ะปะธะฟัะฒะฐัะธัะต ะพะฑะตะบัะธ" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3566 msgid "do not pack objects in promisor packfiles" msgstr "ะฑะตะท ะฟะฐะบะตัะธัะฐะฝะต ะฝะฐ ะพะฑะตะบัะธ ะฒ ะณะฐัะฐะฝัะธัะฐัะธ ะฟะฐะบะตัะธ" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3568 msgid "respect islands during delta compression" msgstr "ะฑะตะท ะฟัะพะผัะฝะฐ ะฝะฐ ะณััะฟะธัะต ะฟัะธ ะดะตะปัะฐ ะบะพะผะฟัะตัะธั" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "ะฟัะพัะพะบะพะป" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "ะฑะตะท ะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฝะฐัััะพะนะบะธ โuploadpack.blobpackfileuriโ ั ัะพะทะธ ะฟัะพัะพะบะพะป" + +#: builtin/pack-objects.c:3600 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "ะฒะตัะธะณะฐัะฐ ั ัะฐะทะปะธะบะธ ะต ะฟัะตะบะฐะปะตะฝะพ ะดัะปะฑะพะบะฐ โ %d, ัะต ัะต ะฟะพะปะทะฒะฐ %d" -#: builtin/pack-objects.c:3366 +#: builtin/pack-objects.c:3605 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" "ะกัะพะนะฝะพัััะฐ ะฝะฐ ะฝะฐัััะพะนะบะฐัะฐ โpack.deltaCacheLimitโ ะต ะฟัะตะบะฐะปะตะฝะพ ะณะพะปัะผะฐ. ะฉะต ัะต " "ะฟะพะปะทะฒะฐ %d" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3659 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "ะพะฟัะธััะฐ โ--max-pack-sizeโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ะทะฐ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟะฐะบะตัะฝะธ " "ัะฐะนะปะพะฒะต ะทะฐ ะฟัะตะฝะพั" -#: builtin/pack-objects.c:3422 +#: builtin/pack-objects.c:3661 msgid "minimum pack size limit is 1 MiB" msgstr "ะผะธะฝะธะผะฐะปะฝะธัั ัะฐะทะผะตั ะฝะฐ ะฟะฐะบะตัะธัะต ะต 1โMiB" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3666 msgid "--thin cannot be used to build an indexable pack" msgstr "" "ะพะฟัะธััะฐ โ--thinโะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ะทะฐ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟะฐะบะตัะฝะธ ัะฐะนะปะพะฒะต ั " "ะธะฝะดะตะบั" -#: builtin/pack-objects.c:3430 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "ะพะฟัะธะธัะต โ--keep-unreachableโ ะธ โ--unpack-unreachableโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3675 msgid "cannot use --filter without --stdout" msgstr "ะพะฟัะธััะฐ โ-filterโ ะธะทะธัะบะฒะฐ โ-stdoutโ" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "ะะทะฑัะพัะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3766 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" msgstr "" -"ะะฑัะพ %<PRIu32> (ัะฐะทะปะธะบะธ %<PRIu32>), ะฟัะตะธะทะฟะพะปะทะฒะฐะฝะธ %<PRIu32> (ัะฐะทะปะธะบะธ " -"%<PRIu32>)" +"ะะฑัะพ: %<PRIu32> (ัะฐะทะปะธะบะธ: %<PRIu32>), ะฟัะตะธะทะฟะพะปะทะฒะฐะฝะธ: %<PRIu32> (ัะฐะทะปะธะบะธ: " +"%<PRIu32>), ะฟัะตะธะทะฟะพะปะทะฒะฐะฝะธ ะฟัะธ ะฟะฐะบะตัะธัะฐะฝะต: %<PRIu32>" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -16910,81 +18769,106 @@ msgstr "ะฟะฐะบะตัะธัะฐะฝะต ะฝะฐ ะฒัะธัะบะพ" msgid "prune loose refs (default)" msgstr "ะพะบะฐััััะฝะต ะฝะฐ ะฝะตะดะพััะธะถะธะผะธัะต ัะบะฐะทะฐัะตะปะธ (ััะฐะฝะดะฐััะฝะพ)" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 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 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire ะะ ะะะ] [--] [ะะ ะชะฅโฆ]" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "ะธะฝัะพัะผะฐัะธั ะทะฐ ะพะบะฐัััะตะฝะธัะต ะพะฑะตะบัะธ" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" -msgstr "ะพะบะฐััััะฝะต ะฝะฐ ะพะฑะตะบัะธัะต ะฟะพ-ััะฐัะธ ะพั ัะพะฒะฐ ะะ ะะะ" +msgstr "ะพะฑัะฒัะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต ะฟะพ-ััะฐัะธ ะพั ัะพะฒะฐ ะะ ะะะ ะทะฐ ะพััะฐัะตะปะธ" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "ะพะณัะฐะฝะธัะฐะฒะฐะฝะต ะฝะฐ ะพะฑั ะพะถะดะฐะฝะตัะพ ะดะพ ะพะฑะตะบัะธ ะธะทะฒัะฝ ะณะฐัะฐะฝัะธัะฐัะธ ะฟะฐะบะตัะธ" -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "ั ัะฐะฝะธะปะธัะต ั ะฒะฐะถะฝะธ ะพะฑะตะบัะธ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะบะฐัััั" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โ%sโ: โ%sโ" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git push [ะะะฆะะฏโฆ] [ะฅะ ะะะะะะฉะ [ะฃะะะะะขะะ_ะะ_ะะะ ะกะะฏโฆ]]" -#: builtin/pull.c:141 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "ัะฟัะฐะฒะปะตะฝะธะต ะฝะฐ ัะตะบัััะธะฒะฝะพัะพ ะดะพััะฐะฒัะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะธัะต" -#: builtin/pull.c:145 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "ะะฟัะธะธ ะฟัะธ ัะปะธะฒะฐะฝะต" -#: builtin/pull.c:148 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "ะฒะฝะฐััะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต ััะตะท ะฟัะตะฑะฐะทะธัะฐะฝะต, ะฐ ะฝะต ััะตะท ัะปะธะฒะฐะฝะต" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 msgid "allow fast-forward" msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟัะตะฒัััะฐะฝะธั" -#: builtin/pull.c:185 -msgid "automatically stash/stash pop before and after rebase" +#: builtin/pull.c:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" msgstr "ะฐะฒัะพะผะฐัะธัะฝะพ ัะบะฐัะฐะฒะฐะฝะต/ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ัะบะฐัะฐะฝะพัะพ ะฟัะตะดะธ ะธ ัะปะตะด ะฟัะตะฑะฐะทะธัะฐะฝะต" -#: builtin/pull.c:201 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "ะะฟัะธะธ ะฟัะธ ะดะพััะฐะฒัะฝะต" -#: builtin/pull.c:211 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "ะฟัะธะฝัะดะธัะตะปะฝะพ ะฟัะตะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะปะพะบะฐะปะฝะธั ะบะปะพะฝ" -#: builtin/pull.c:219 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "ะฑัะพะน ะฟะพะดะผะพะดัะปะธ ะธะทะดััะฟะฐะฝะธ ะฟะฐัะฐะปะตะปะฝะพ" -#: builtin/pull.c:316 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โpull.ffโ: โ%sโ" -#: builtin/pull.c:433 +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"ะะต ัะต ะฝะฐััััะฐะฒะฐ ะธะทะดััะฟะฒะฐะฝะต ะฑะตะท ัะบะฐะทะฒะฐะฝะต ะฝะฐ ัััะฐัะตะณะธััะฐ ะทะฐ ััะณะปะฐััะฒะฐะฝะต ะฝะฐ\n" +"ะบะปะพะฝะธัะต. ะะฐ ะดะฐ ะทะฐะณะปััะธัะต ัะพะฒะฐ ััะพะฑัะตะฝะธะต, ะธะทะฟัะปะฝะตัะต ะฝัะบะพั ะพั ัะปะตะดะฝะธัะต\n" +"ะบะพะผะฐะฝะดะธ ะฟัะตะดะธ ัะปะตะดะฒะฐัะพัะพ ะธะทะดััะฟะฒะฐะฝะต:\n" +"\n" +" git config pull.rebase false # ัะปะธะฒะฐะฝะต (ััะฐะฝะดะฐััะฝะฐ ัััะฐัะตะณะธั)\n" +" git config pull.rebase true # ะฟัะตะฑะฐะทะธัะฐะฝะต\n" +" git config pull.ff only # ัะฐะผะพ ะฟัะตะฒัััะฐะฝะต\n" +"\n" +"ะะฐ ะดะฐ ะทะฐะดะฐะดะตัะต ััะฐะฝะดะฐััะฝะฐัะฐ ะฝะฐัััะพะนะบะฐ ะทะฐ ะฒัะธัะบะธ ัะฒะพะธ ั ัะฐะฝะธะปะธัะฐ, ะดะพะฑะฐะฒะตัะต ะธ\n" +"ะพะฟัะธััะฐ โ--globalโ. ะะฐ ะดะฐ ัะบะฐะถะตัะต ัััะฐัะตะณะธั ะฟัะธ ะบะพะฝะบัะตัะฝะพ ะธะทะดััะฟะฒะฐะฝะต,\n" +"ะธะทะฟะพะปะทะฒะฐะนัะต ะพะฟัะธะธัะต โ--rebaseโ, โ--no-rebaseโ, โ--ff-onlyโ. ะขะต ัะฐ ั\n" +"ะฟัะธะพัะธัะตั ะฟัะตะด ะฝะฐัััะพะนะบะธัะต.\n" + +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16992,14 +18876,14 @@ msgstr "" "ะะตะถะดั ัะบะฐะทะฐัะตะปะธัะต, ะบะพะธัะพ ัะพะบั ัะพ ะดะพััะฐะฒะธั ัะต, ะฝัะผะฐ ะฟะพะดั ะพะดัั ะบะฐะฝะดะธะดะฐั, ะฒััั ั " "ะบะพะนัะพ ะดะฐ ะฟัะตะฑะฐะทะธัะฐัะต." -#: builtin/pull.c:435 +#: builtin/pull.c:460 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "ะะตะถะดั ัะบะฐะทะฐัะตะปะธัะต, ะบะพะธัะพ ัะพะบั ัะพ ะดะพััะฐะฒะธั ัะต, ะฝัะผะฐ ะฟะพะดั ะพะดัั ะบะฐะฝะดะธะดะฐั, ะบะพะนัะพ " "ะดะฐ ัะปะตะตัะต." -#: builtin/pull.c:436 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17007,7 +18891,7 @@ msgstr "" "ะะฐะน ะฒะตัะพััะฝะพ ััะต ะฟะพะดะฐะปะธ ัะฐะฑะปะพะฝ ะทะฐ ัะบะฐะทะฐัะตะปะธ, ะบะพะนัะพ ะฝะต ะต ะฝะฐะฟะฐัะฝะฐะป ั ะฝะธัะพ ะฒ " "ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต." -#: builtin/pull.c:439 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17018,44 +18902,44 @@ msgstr "" "ะะพะฝะตะถะต ัะพะฒะฐ ะฝะต ะต ั ัะฐะฝะธะปะธัะตัะพ ะฟะพ ะฟะพะดัะฐะทะฑะธัะฐะฝะต ะฝะฐ ัะตะบััะธั ะบะปะพะฝ, ัััะฑะฒะฐ\n" "ะดะฐ ัะบะฐะถะตัะต ะพัะดะฐะปะตัะตะฝะธั ะบะปะพะฝ ะฝะฐ ะบะพะผะฐะฝะดะฝะธั ัะตะด." -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "ะะทะฒัะฝ ะฒัะธัะบะธ ะบะปะพะฝะธ." -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "ะฃะบะฐะถะตัะต ะฒััั ั ะบะพะน ะบะปะพะฝ ะธัะบะฐัะต ะดะฐ ะฟัะตะฑะฐะทะธัะฐัะต." -#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "ะฃะบะฐะถะตัะต ะบะพะน ะบะปะพะฝ ะธัะบะฐัะต ะดะฐ ัะปะตะตัะต." -#: builtin/pull.c:449 builtin/pull.c:464 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "ะะฐ ะฟะพะฒะตัะต ะธะฝัะพัะผะฐัะธั ะฟะพะณะปะตะดะฝะตัะต ััะบะพะฒะพะดััะฒะพัะพ โgit-pull(1)โ" -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 msgid "<remote>" msgstr "ะะขะะะะะงะะะ_ะฅะ ะะะะะะฉะ" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "ะะะะ" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "ะขะตะบััะธัั ะบะปะพะฝ ะฝะต ัะปะตะดะธ ะฝะธะบะพะน." -#: builtin/pull.c:468 git-parse-remote.sh:95 +#: builtin/pull.c:493 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:473 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17064,32 +18948,28 @@ msgstr "" "ะะฐ ัะปะธะฒะฐะฝะต ะต ัะบะฐะทะฐะฝ ะพัะดะฐะปะตัะตะฝะธัั ัะบะฐะทะฐัะตะป โ%sโ,\n" "ะฝะพ ัะฐะบัะฒ ะฝะต ะต ะดะพััะฐะฒะตะฝ." -#: builtin/pull.c:581 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "ะฝะตะดะพัััะฟะฝะพ ะฟะพะดะฐะฒะฐะฝะต: %s" -#: builtin/pull.c:861 +#: builtin/pull.c:894 msgid "ignoring --verify-signatures for rebase" msgstr "ะฑะตะท โ--verify-signaturesโ ะฟัะธ ะฟัะตะฑะฐะทะธัะฐะฝะต" -#: builtin/pull.c:916 -msgid "--[no-]autostash option is only valid with --rebase." -msgstr "ะพะฟัะธััะฐ โ--[no-]autostashโ ะธะทะธัะบะฒะฐ โ--rebaseโ" - -#: builtin/pull.c:924 +#: builtin/pull.c:954 msgid "Updating an unborn branch with changes added to the index." msgstr "ะะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะฒัะต ะพัะต ะฝะตััะทะดะฐะดะตะฝ ะบะปะพะฝ ั ะฟัะพะผะตะฝะธัะต ะพั ะธะฝะดะตะบัะฐ" -#: builtin/pull.c:928 +#: builtin/pull.c:958 msgid "pull with rebase" msgstr "ะธะทะดััะฟะฒะฐะฝะต ั ะฟัะตะฑะฐะทะธัะฐะฝะต" -#: builtin/pull.c:929 +#: builtin/pull.c:959 msgid "please commit or stash them." msgstr "ัััะฑะฒะฐ ะดะฐ ะฟะพะดะฐะดะตัะต ะธะปะธ ัะบะฐัะฐะตัะต ะฟัะพะผะตะฝะธัะต." -#: builtin/pull.c:954 +#: builtin/pull.c:984 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17099,7 +18979,7 @@ msgstr "" "ะดะพััะฐะฒัะฝะตัะพ ะพะฑะฝะพะฒะธ ะฒััั ะฐ ะฝะฐ ัะตะบััะธั ะบะปะพะฝ. ะ ะฐะฑะพัะฝะพัะพ\n" "ะฒะธ ะบะพะฟะธะต ะฑะต ะฟัะตะฒััััะฝะพ ะพั ะฟะพะดะฐะฒะฐะฝะต โ%sโ." -#: builtin/pull.c:960 +#: builtin/pull.c:990 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17116,15 +18996,15 @@ msgstr "" " git reset --hard\n" "ะทะฐ ะฒัััะฐะฝะต ะบัะผ ะฝะพัะผะฐะปะฝะพ ััััะพัะฝะธะต." -#: builtin/pull.c:975 +#: builtin/pull.c:1005 msgid "Cannot merge multiple branches into empty head." msgstr "ะะต ะผะพะถะต ะดะฐ ัะปะธะฒะฐัะต ะผะฝะพะถะตััะฒะพ ะบะปะพะฝะธ ะฒ ะฟัะฐะทะตะฝ ะฒััั ะพะฒ ัะบะฐะทะฐัะตะป." -#: builtin/pull.c:979 +#: builtin/pull.c:1009 msgid "Cannot rebase onto multiple branches." msgstr "ะะต ะผะพะถะต ะดะฐ ะฟัะตะฑะฐะทะธัะฐัะต ะฒััั ั ะฟะพะฒะตัะต ะพั ะตะดะธะฝ ะบะปะพะฝ." -#: builtin/pull.c:986 +#: builtin/pull.c:1017 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "ะฟัะตะฑะฐะทะธัะฐะฝะตัะพ ะต ะฝะตะฒัะทะผะพะถะฝะพ ะทะฐัะฐะดะธ ะปะพะบะฐะปะฝะพ ะทะฐะฟะธัะฐะฝะธัะต ะฟัะพะผะตะฝะธ ะฟะพ ะฟะพะดะผะพะดัะปะธัะต" @@ -17137,11 +19017,11 @@ msgstr "git push [ะะะฆะะฏโฆ] [ะฅะ ะะะะะะฉะ [ะฃะะะะะขะะ_ะะ_ะะ msgid "tag shorthand without <tag>" msgstr "ััะบัะฐัะตะฝะธะต ะทะฐ ะตัะธะบะตั ะฑะตะท ะะขะะะะข" -#: builtin/push.c:121 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "ะพะฟัะธััะฐ โ--deleteโ ะฟัะธะตะผะฐ ะทะฐ ัะตะป ัะฐะผะพ ะฟัะพััะธ ะธะผะตะฝะฐ ะฝะฐ ัะบะฐะทะฐัะตะปะธ" -#: builtin/push.c:167 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -17150,7 +19030,7 @@ msgstr "" "ะะฐ ะดะฐ ะฒะบะปััะธัะต ัะฐะทะธ ะพะฟัะธั ะทะฐ ะฟะพััะพัะฝะฝะพ, ะฟะพะณะปะตะดะฝะตัะต ะดะพะบัะผะตะฝัะฐัะธััะฐ ะทะฐ " "ะฝะฐัััะพะนะบะฐัะฐ โpush.defaultโ ะฒ โgit help configโ." -#: builtin/push.c:170 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -17175,7 +19055,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -17189,7 +19069,7 @@ msgstr "" "\n" " git push %s HEAD:ะะะ_ะะ_ะะขะะะะะงะะะะฏ_ะะะะ\n" -#: builtin/push.c:199 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -17203,14 +19083,14 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:202 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "ะขะตะบััะธัั ะบะปะพะฝ โ%sโ ัะปะตะดะธ ะฝัะบะพะปะบะพ ะพัะดะฐะปะตัะตะฝะธ ะบะปะพะฝะฐ, ะฝะต ะผะพะถะตัะต ะฟัะพััะพ ะดะฐ " "ะธะทัะปะฐัะบะฐัะต." -#: builtin/push.c:210 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -17222,14 +19102,14 @@ msgstr "" "ะขััะฑะฒะฐ ะดะฐ ัะบะฐะถะตัะต ะบะพั ะฒะตััะธั ะดะฐ ัะต ะธะทัะปะฐัะบะฐ, ะทะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะพัะดะฐะปะตัะตะฝะธั " "ะบะปะพะฝ." -#: builtin/push.c:269 +#: builtin/push.c:260 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "ะะต ััะต ัะบะฐะทะฐะปะธ ะฒะตััะธั ะทะฐ ะฟะพะดะฐะฒะฐะฝะต, ะฐ ะฝะฐัััะพะนะบะฐัะฐ โpush.defaultโ ะต " "โnothingโ (ะฝะธัะพ ะฑะตะท ะธะทัะธัะฝะพ ัะบะฐะทะฐะฝะฐ ะฒะตััะธั ะดะฐ ะฝะต ัะต ะธะทัะปะฐัะบะฒะฐ)" -#: builtin/push.c:276 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -17243,7 +19123,7 @@ msgstr "" "ะฟัะตะดะธ ะพัะฝะพะฒะพ ะดะฐ ะธะทัะปะฐัะบะฐัะต ะฟัะพะผะตะฝะธัะต. ะะฐ ะฟะพะฒะตัะต ะธะฝัะพัะผะฐัะธั ะฒะธะถัะต ัะฐะทะดะตะปะฐ\n" "โNote about fast-forwardsโ ะฒ ัััะฐะฝะธัะฐัะฐ ะพั ััะบะพะฒะพะดััะฒะพัะพ โgit push --helpโ." -#: builtin/push.c:282 +#: builtin/push.c:273 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" @@ -17257,7 +19137,7 @@ msgstr "" "ะธะฝัะพัะผะฐัะธั ะฟะพะณะปะตะดะฝะตัะต ัะฐะทะดะตะปะฐ โNote about fast-forwardsโ ะฒ ัััะฐะฝะธัะฐัะฐ ะพั\n" "ััะบะพะฒะพะดััะฒะพัะพ โgit push --helpโ." -#: builtin/push.c:288 +#: builtin/push.c:279 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" @@ -17276,14 +19156,14 @@ msgstr "" "ัััะฐะฝะธัะฐัะฐ\n" "ะพั ััะบะพะฒะพะดััะฒะพัะพ โgit push --helpโ." -#: builtin/push.c:295 +#: builtin/push.c:286 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "ะะทัะปะฐัะบะฒะฐะฝะตัะพ ะต ะพัั ะฒััะปะตะฝะพ, ะทะฐัะพัะพ ะฒ ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต ัััะตััะฒัะฒะฐ " "ะตัะธะบะตั,\n" "ะบะพะนัะพ ัะต ะฟัะธะฟะพะบัะธะตัะต ั ะตัะธะบะตั ะพั ะฒะฐัะตัะพ ั ัะฐะฝะธะปะธัะต." -#: builtin/push.c:298 +#: builtin/push.c:289 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" @@ -17293,144 +19173,144 @@ msgstr "" "ัะบะฐะทะฐัะตะป, ะบะพะนัะพ ะฒะตัะต ัะพัะธ ะบัะผ ะพะฑะตะบั, ะบะพะนัะพ ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต, ะบะฐะบัะพ ะธ ัะตะฟััะฒะฐ\n" "ะดะฐ ะณะพ ะฟัะพะผะตะฝะธัะต ะดะฐ ัะพัะธ ะบัะผ ะฟะพะดะพะฑะตะฝ ะพะฑะตะบั.\n" -#: builtin/push.c:359 +#: builtin/push.c:351 #, c-format msgid "Pushing to %s\n" msgstr "ะะทัะปะฐัะบะฒะฐะฝะต ะบัะผ โ%sโ\n" -#: builtin/push.c:364 +#: builtin/push.c:358 #, c-format msgid "failed to push some refs to '%s'" msgstr "ัะฐัั ะพั ัะบะฐะทะฐัะตะปะธัะต ะฝะต ะฑัั ะฐ ะธะทัะปะฐัะบะฐะฝะธ ะบัะผ โ%sโ" -#: 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 +#: builtin/push.c:532 msgid "repository" msgstr "ั ัะฐะฝะธะปะธัะต" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:533 builtin/send-pack.c:183 msgid "push all refs" msgstr "ะธะทัะปะฐัะบะฒะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ัะบะฐะทะฐัะตะปะธ" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:534 builtin/send-pack.c:185 msgid "mirror all refs" msgstr "ะพะณะปะตะดะฐะปะฝะพ ะบะพะฟะธะต ะฝะฐ ะฒัะธัะบะธ ัะบะฐะทะฐัะตะปะธ" -#: builtin/push.c:558 +#: builtin/push.c:536 msgid "delete refs" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต" -#: builtin/push.c:559 +#: builtin/push.c:537 msgid "push tags (can't be used with --all or --mirror)" msgstr "ะธะทัะปะฐัะบะฒะฐะฝะต ะฝะฐ ะตัะธะบะตัะธัะต (ะฝะตััะฒะผะตััะธะผะพ ั ะพะฟัะธะธัะต โ--allโ ะธ โ--mirrorโ)" -#: builtin/push.c:562 builtin/send-pack.c:167 +#: builtin/push.c:540 builtin/send-pack.c:186 msgid "force updates" msgstr "ะฟัะธะฝัะดะธัะตะปะฝะพ ะพะฑะฝะพะฒัะฒะฐะฝะต" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:541 builtin/send-pack.c:198 msgid "<refname>:<expect>" -msgstr "ะฃะะะะะขะะ:ะะงะะะะะะ_ะกะขะะะะะกะข" +msgstr "ะะะ_ะะ_ะฃะะะะะขะะ:ะะงะะะะะะ_ะกะขะะะะะกะข" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:542 builtin/send-pack.c:199 msgid "require old value of ref to be at this value" msgstr "ะฃะะะะะขะะัั ัััะฑะฒะฐ ะฟััะฒะพะฝะฐัะฐะปะฝะพ ะดะฐ ะต ั ัะฐะทะธ ะะงะะะะะะ_ะกะขะะะะะกะข" -#: builtin/push.c:568 +#: builtin/push.c:545 msgid "control recursive pushing of submodules" msgstr "ัะฟัะฐะฒะปะตะฝะธะต ะฝะฐ ัะตะบัััะธะฒะฝะพัะพ ะธะทัะปะฐัะบะฒะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะธัะต" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:546 builtin/send-pack.c:193 msgid "use thin pack" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ััะบัะฐัะตะฝะธ ะฟะฐะบะตัะธ" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 msgid "receive pack program" msgstr "ะฟัะพะณัะฐะผะฐ ะทะฐ ะฟะพะปััะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟะฐะบะตัะธ" -#: builtin/push.c:573 +#: builtin/push.c:549 msgid "set upstream for git pull/status" msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต ะทะฐ ะบะพะผะฐะฝะดะธัะต โgit pull/statusโ" -#: builtin/push.c:576 +#: builtin/push.c:552 msgid "prune locally removed refs" msgstr "ะพะบะฐััััะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต, ะบะพะธัะพ ัะฐ ะฟัะตะผะฐั ะฝะฐัะธ ะพั ะปะพะบะฐะปะฝะพัะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/push.c:578 +#: builtin/push.c:554 msgid "bypass pre-push hook" msgstr "ะฑะตะท ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะบัะบะฐัะฐ ะฟัะตะดะธ ะธะทัะปะฐัะบะฒะฐะฝะต (pre-push)" -#: builtin/push.c:579 +#: builtin/push.c:555 msgid "push missing but relevant tags" msgstr "" "ะธะทัะปะฐัะบะฒะฐะฝะต ะฝะฐ ะปะธะฟัะฒะฐัะธัะต ะฒ ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต, ะฝะพ ัะฒััะทะฐะฝะธ ั ัะตะบััะพัะพ " "ะธะทัะปะฐัะบะฒะฐะฝะต, ะตัะธะบะตัะธ" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:557 builtin/send-pack.c:187 msgid "GPG sign the push" msgstr "ะฟะพะดะฟะธัะฒะฐะฝะต ะฝะฐ ะธะทัะปะฐัะบะฒะฐะฝะตัะพ ั GPG" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:559 builtin/send-pack.c:194 msgid "request atomic transaction on remote side" msgstr "ะธะทะธัะบะฒะฐะฝะต ะฝะฐ ะฐัะพะผะฐัะฝะธ ะพะฟะตัะฐัะธะธ ะพั ะพัััะตัะฝะฐัะฐ ัััะฐะฝะฐ" -#: builtin/push.c:602 +#: builtin/push.c:577 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" "ะพะฟัะธััะฐ โ--deleteโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะพะฟัะธะธัะต โ--allโ, โ--mirrorโ ะธ โ--tagsโ" -#: builtin/push.c:604 +#: builtin/push.c:579 msgid "--delete doesn't make sense without any refs" msgstr "ะพะฟัะธััะฐ โ--deleteโ ะธะทะธัะบะฒะฐ ะฟะพะฝะต ะตะดะธะฝ ัะบะฐะทะฐัะตะป ะฝะฐ ะฒะตััะธั" -#: builtin/push.c:607 +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ัะบะฐะทะฐะฝะพ ั ัะฐะฝะธะปะธัะต โ%sโ" + +#: builtin/push.c:600 +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:615 msgid "--all and --tags are incompatible" msgstr "ะพะฟัะธะธัะต โ--allโ ะธ โ--tagsโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/push.c:609 +#: builtin/push.c:617 msgid "--all can't be combined with refspecs" msgstr "ะพะฟัะธััะฐ โ--allโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ัะบะฐะทะฒะฐะฝะตัะพ ะฝะฐ ะฒะตััะธั" -#: builtin/push.c:613 +#: builtin/push.c:621 msgid "--mirror and --tags are incompatible" msgstr "ะพะฟัะธะธัะต โ--mirrorโ ะธ โ--tagsโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/push.c:615 +#: builtin/push.c:623 msgid "--mirror can't be combined with refspecs" msgstr "ะพะฟัะธััะฐ โ--mirrorโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ัะบะฐะทะฒะฐะฝะตัะพ ะฝะฐ ะฒะตััะธั" -#: builtin/push.c:618 +#: builtin/push.c:626 msgid "--all and --mirror are incompatible" msgstr "ะพะฟัะธะธัะต โ--allโ ะธ โ--mirrorโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/push.c:637 +#: builtin/push.c:630 msgid "push options must not have new line characters" msgstr "ะพะฟัะธะธัะต ะทะฐ ะธะทัะปะฐัะบะฒะฐะฝะต ะฝะต ัััะฑะฒะฐ ะดะฐ ััะดััะถะฐั ะทะฝะฐะบ ะทะฐ ะฝะพะฒ ัะตะด" @@ -17446,24 +19326,32 @@ msgstr "git range-diff [ะะะฆะะฏโฆ] ะกะขะะ _ะะ ะชะฅ...ะะะ_ะะ ะชะฅ" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [ะะะฆะะฏโฆ] ะะะะ ะกะขะะ _ะะ ะชะฅ ะะะ_ะะ ะชะฅ" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "ะัะพัะตะฝั ะทะฐ ะพัะตะฝะบะฐ ะฝะฐ ััะทะดะฐะฒะฐะฝะตัะพ" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฟัะพััะธ ัะฒะตัะพะฒะต ะทะฐ ัะฐะทะปะธะบะธัะต" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: 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:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "ะฒะฐัะธะฐะฝััั ั ะตะดะธะฝััะฒะตะฝ ะฐัะณัะผะตะฝั ะธะทะธัะบะฒะฐ ัะธะผะตััะธัะตะฝ ะดะธะฐะฟะฐะทะพะฝ" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "ะฝะตะพะฑั ะพะดะธะผะธ ัะฐ ะดะฒะฐ ะดะธะฐะฟะฐะทะพะฝะฐ ั ะฟะพะดะฐะฒะฐะฝะธั" @@ -17546,238 +19434,219 @@ msgstr "ะธะทัะธััะฒะฐะฝะต ะฝะฐ ะณัะตัะบะธ ะฒ ะบะพะผะฐะฝะดะฐัะฐ โunpack-t msgid "suppress feedback messages" msgstr "ะฑะตะท ะธะฝัะพัะผะฐัะธะพะฝะฝะธ ััะพะฑัะตะฝะธั" -#: builtin/rebase.c:32 +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "ะััะฒะพ ัััะฑะฒะฐ ะดะฐ ะบะพัะธะณะธัะฐัะต ะธะฝะดะตะบัะฐ ัะธ" + +#: builtin/rebase.c:35 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [ะะะฆะะฏโฆ] [--exec ะะะะะะะ] [--onto ะะะะ_ะะะะ] [ะะะะ_ะะะขะะงะะะ] " -"[ะะะะ]" +"git rebase [-i] [ะะะฆะะฏโฆ] [--exec ะะะะะะะ] [--onto ะะะะ_ะะะะ | --keep-base] " +"[ะะะะ_ะะะขะะงะะะ [ะะะะ]]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [ะะะฆะะฏโฆ] [--exec ะะะะะะะ] [--onto ะะะะ_ะะะะ] --root [ะะะะ]" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 #, c-format msgid "unusable todo list: '%s'" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทััะธะฒะฐะฝะต ะฝะฐ ัะฟะธััะบะฐ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต: โ%sโ" -#: 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 +#: builtin/rebase.c:304 #, c-format msgid "could not create temporary %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฒัะตะผะตะฝะฝะฐ ะดะธัะตะบัะพัะธั โ%sโ" -#: builtin/rebase.c:285 +#: builtin/rebase.c:310 msgid "could not mark as interactive" msgstr "ะฝะตะฒัะทะผะพะถะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะธะฝัะตัะฐะบัะธะฒะฝะฐ ัะฐะฑะพัะฐ" -#: builtin/rebase.c:343 +#: builtin/rebase.c:364 msgid "could not generate todo list" msgstr "ัะฐะนะปัั ั ะบะพะผะฐะฝะดะธัะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะณะตะฝะตัะธัะฐ" -#: builtin/rebase.c:382 +#: builtin/rebase.c:405 msgid "a base commit must be provided with --upstream or --onto" msgstr "ะพะฟัะธะธัะต โ--upstreamโ ะธ โ--ontoโ ะธะทะธัะบะฒะฐั ะฑะฐะทะพะฒะพ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/rebase.c:437 +#: builtin/rebase.c:474 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [ะะะฆะะฏโฆ]" -#: builtin/rebase.c:449 -msgid "keep empty commits" -msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฟัะฐะทะฝะธัะต ะฟะพะดะฐะฒะฐะฝะธั" +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" +msgstr "ะทะฐะฟะฐะทะฒะฐะฝe ะฝะฐ ะฟััะฒะพะฝะฐัะฐะปะฝะพ ะฟัะฐะทะฝะธัะต ะฟะพะดะฐะฒะฐะฝะธั" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:491 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟัะฐะทะฝะธ ััะพะฑัะตะฝะธั ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/rebase.c:452 +#: builtin/rebase.c:493 msgid "rebase merge commits" msgstr "ะฟัะตะฑะฐะทะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ััั ัะปะธะฒะฐะฝะธั" -#: builtin/rebase.c:454 +#: builtin/rebase.c:495 msgid "keep original branch points of cousins" msgstr "" "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฟััะฒะพะฝะฐัะฐะปะฝะธัะต ัะพัะบะธ ะฝะฐ ัะฐะทะบะปะพะฝัะฒะฐะฝะต ะฝะฐ ัะตัััะธะฝัะบะธัะต ะบะปะพะฝะธ" -#: builtin/rebase.c:456 +#: builtin/rebase.c:497 msgid "move commits that begin with squash!/fixup!" msgstr "ะฟัะตะผะตััะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ, ะบะพะธัะพ ะทะฐะฟะพัะฒะฐั ััั โsquash!โ/โfixup!โ" -#: builtin/rebase.c:457 +#: builtin/rebase.c:498 msgid "sign commits" msgstr "ะฟะพะดะฟะธัะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:500 builtin/rebase.c:1321 msgid "display a diffstat of what changed upstream" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะฐัะธััะธะบะฐ ั ะฟัะพะผะตะฝะธัะต ะฒ ัะปะตะดะตะฝะธั ะบะปะพะฝ" -#: builtin/rebase.c:461 +#: builtin/rebase.c:502 msgid "continue rebase" msgstr "ะฟัะพะดัะปะถะฐะฒะฐะฝะต ะฝะฐ ะฟัะตะฑะฐะทะธัะฐะฝะตัะพ" -#: builtin/rebase.c:463 +#: builtin/rebase.c:504 msgid "skip commit" msgstr "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/rebase.c:464 +#: builtin/rebase.c:505 msgid "edit the todo list" msgstr "ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ัะฟะธััะบะฐ ั ะบะพะผะฐะฝะดะธ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต" -#: builtin/rebase.c:466 +#: builtin/rebase.c:507 msgid "show the current patch" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะตะบััะฐัะฐ ะบััะฟะบะฐ" -#: builtin/rebase.c:469 +#: builtin/rebase.c:510 msgid "shorten commit ids in the todo list" msgstr "ััะบัะฐัะตะฝะธ ะธะดะตะฝัะธัะธะบะฐัะพัะธ ะฒ ัะฟะธััะบะฐ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต" -#: builtin/rebase.c:471 +#: builtin/rebase.c:512 msgid "expand commit ids in the todo list" msgstr "ะฟัะปะฝะธ ะธะดะตะฝัะธัะธะบะฐัะพัะธ ะฒ ัะฟะธััะบะฐ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต" -#: builtin/rebase.c:473 +#: builtin/rebase.c:514 msgid "check the todo list" msgstr "ะฟัะพะฒะตัะบะฐ ะฝะฐ ัะฟะธััะบะฐ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต" -#: builtin/rebase.c:475 +#: builtin/rebase.c:516 msgid "rearrange fixup/squash lines" msgstr "" "ะฟัะตะฟะพะดัะตะถะดะฐะฝะต ะฝะฐ ัะตะดะพะฒะตัะต ะทะฐ ะฒะบะฐัะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฒ " "ะฟัะตะดั ะพะดะฝะธัะต ะธะผ ััั ะธ ะฑะตะท ัะผะตะฝะธ ะฝะฐ ััะพะฑัะตะฝะธะตัะพ" -#: builtin/rebase.c:477 +#: builtin/rebase.c:518 msgid "insert exec commands in todo list" msgstr "ะฒะผัะบะฒะฐะฝะต ะฝะฐ ะบะพะผะฐะฝะดะธัะต ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต ะฒ ัะฟะธััะบะฐ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต" -#: builtin/rebase.c:478 +#: builtin/rebase.c:519 msgid "onto" msgstr "ะฒััั ั" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict-revision" msgstr "ะพะณัะฐะฝะธัะตะฝะฐ ะฒะตััะธั" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict revision" msgstr "ะพะณัะฐะฝะธัะตะฝะฐ ะฒะตััะธั" -#: builtin/rebase.c:483 +#: builtin/rebase.c:524 msgid "squash-onto" msgstr "ะฟะพะดะฐะฒะฐะฝะต, ะฒ ะบะพะตัะพ ะดััะณะธัะต ะดะฐ ัะต ะฒะบะฐัะฐั" -#: builtin/rebase.c:484 +#: builtin/rebase.c:525 msgid "squash onto" msgstr "ะฟะพะดะฐะฒะฐะฝะต, ะฒ ะบะพะตัะพ ะดััะณะธัะต ะดะฐ ัะต ะฒะบะฐัะฐั" -#: builtin/rebase.c:486 +#: builtin/rebase.c:527 msgid "the upstream commit" msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะธะทัะพัะฝะธะบะฐ" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head-name" msgstr "ะธะผะต ะฝะฐ ะฒััั ะฐ" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head name" msgstr "ะธะผะต ะฝะฐ ะฒััั ะฐ" -#: builtin/rebase.c:493 +#: builtin/rebase.c:534 msgid "rebase strategy" msgstr "ัััะฐัะตะณะธั ะฝะฐ ะฟัะตะฑะฐะทะธัะฐะฝะต" -#: builtin/rebase.c:494 +#: builtin/rebase.c:535 msgid "strategy-opts" msgstr "ะพะฟัะธะธ ะฝะฐ ัััะฐัะตะณะธััะฐ" -#: builtin/rebase.c:495 +#: builtin/rebase.c:536 msgid "strategy options" msgstr "ะพะฟัะธะธ ะฝะฐ ัััะฐัะตะณะธััะฐ" -#: builtin/rebase.c:496 +#: builtin/rebase.c:537 msgid "switch-to" msgstr "ะฟัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ" -#: builtin/rebase.c:497 +#: builtin/rebase.c:538 msgid "the branch or commit to checkout" msgstr "ะบะปะพะฝัั, ะบัะผ ะบะพะนัะพ ะดะฐ ัะต ะฟัะตะผะธะฝะต" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto-name" msgstr "ะธะผะต ะฝะฐ ะฑะฐะทะฐ" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto name" msgstr "ะธะผะต ะฝะฐ ะฑะฐะทะฐ" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "cmd" msgstr "ะบะพะผะฐะฝะดะฐ" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "the command to run" msgstr "ะบะพะผะฐะฝะดะฐ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:543 builtin/rebase.c:1415 msgid "automatically re-schedule any `exec` that fails" msgstr "" "ะฐะฒัะพะผะฐัะธัะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะทะฐ ะฟะพะฒัะพัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะบะพะผะฐะฝะดะธัะต ะทะฐะฒัััะธะปะธ ั ะฝะตััะฟะตั " -#: builtin/rebase.c:518 +#: builtin/rebase.c:559 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "ะพะฟัะธะธัะต โ--[no-]rebase-cousinsโ ะธะทะธัะบะฒะฐั ะพะฟัะธััะฐ โ--rebase-mergesโ" -#: builtin/rebase.c:534 +#: builtin/rebase.c:575 #, c-format -msgid "%s requires an interactive rebase" -msgstr "โ%sโ ะธะทะธัะบะฒะฐ ะธะฝัะตัะฐะบัะธะฒะฝะพ ะฟัะตะฑะฐะทะธัะฐะฝะต" +msgid "%s requires the merge backend" +msgstr "โ%sโ ะธะทะธัะบะฒะฐ ะฟัะตะฑะฐะทะธัะฐะฝะต" -#: builtin/rebase.c:586 +#: builtin/rebase.c:618 #, c-format msgid "could not get 'onto': '%s'" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะตะผะธะฝะต ะบัะผ ะฝะพะฒะฐัะฐ ะฑะฐะทะฐ, ะทะฐะดะฐะดะตะฝะฐ ั โontoโ: โ%sโ" -#: builtin/rebase.c:601 +#: builtin/rebase.c:635 #, c-format msgid "invalid orig-head: '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะบะฐะทะฐัะตะป ะบัะผ ะฟััะฒะพะฝะฐัะฐะปะตะฝ ะฒััั โorig-headโ: โ%sโ" -#: builtin/rebase.c:626 +#: builtin/rebase.c:660 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐัะฐ ััะพะนะฝะพัั ะฝะฐ โallow_rerere_autoupdateโ ัะต ะฟัะตัะบะฐัะฐ: โ%sโ" -#: builtin/rebase.c:702 -#, c-format -msgid "Could not read '%s'" -msgstr "ะัััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" - -#: builtin/rebase.c:720 -#, c-format -msgid "Cannot store %s" -msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝ" - -#: builtin/rebase.c:827 -msgid "could not determine HEAD revision" -msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฟัะตะดะตะปะธ ะบัะผ ะบะฐะบะฒะพ ะดะฐ ัะพัะธ ัะบะฐะทะฐัะตะปัั โHEADโ" - -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:805 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" @@ -17791,7 +19660,7 @@ msgstr "" "ะะฐ ะดะฐ ะพัะบะฐะถะตัะต ะฟัะตะฑะฐะทะธัะฐะฝะตัะพ ะธ ะดะฐ ัะต ะฒััะฝะตัะต ะบัะผ ะฟััะฒะพะฝะฐัะฐะปะฝะพัะพ ััััะพัะฝะธะต,\n" "ะธะทะฟัะปะฝะตัะต โgit rebase --abortโ." -#: builtin/rebase.c:1031 +#: builtin/rebase.c:888 #, c-format msgid "" "\n" @@ -17809,7 +19678,16 @@ msgstr "" "\n" "ะ ัะตะทัะปัะฐั ัะต ะฝะต ะผะพะณะฐั ะดะฐ ัะต ะฟัะตะฑะฐะทะธัะฐั." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1214 +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "" +"ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั โ%sโ: ะฒะฐัะธะฐะฝัะธัะต ัะฐ โdropโ (ะฟัะตัะบะฐัะฐะฝะต), " +"โkeepโ (ะทะฐะฟะฐะทะฒะฐะฝะต) ะธ โaskโ (ะฟะธัะฐะฝะต)" + +#: builtin/rebase.c:1232 #, c-format msgid "" "%s\n" @@ -17826,7 +19704,7 @@ msgstr "" " git rebase ะะะะ\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1248 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17839,135 +19717,155 @@ msgstr "" "\n" " git branch --set-upstream-to=%s/ะะะะ %s\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1278 msgid "exec commands cannot contain newlines" msgstr "ะบะพะผะฐะฝะดะธัะต ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต ะฝะต ะผะพะถะต ะดะฐ ััะดััะถะฐั ะฝะพะฒะธ ัะตะดะพะฒะต" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1282 msgid "empty exec command" msgstr "ะฟัะฐะทะฝะฐ ะบะพะผะฐะฝะดะฐ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1312 msgid "rebase onto given branch instead of upstream" msgstr "ะฟัะตะฑะฐะทะธัะฐะฝะต ะฒััั ั ะทะฐะดะฐะดะตะฝะธั, ะฐ ะฝะต ัะปะตะดะตะฝะธั ะบะปะพะฝ" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1314 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "ะทะฐ ัะตะบััะฐ ะฑะฐะทะฐ ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะฑะฐะทะฐัะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะฐ ะธ ัะปะตะดะตะฝะพัะพ" + +#: builtin/rebase.c:1316 msgid "allow pre-rebase hook to run" msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะบัะบะฐัะฐ ะฟัะตะดะธ ะฟัะตะฑะฐะทะธัะฐะฝะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1318 msgid "be quiet. implies --no-stat" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั. ะะบะปััะฒะฐ ะพะฟัะธััะฐ โ--no-statโ" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1324 msgid "do not show diffstat of what changed upstream" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะฐัะธััะธะบะฐ ั ะฟัะพะผะตะฝะธัะต ะฒ ัะปะตะดะตะฝะธั ะบะปะพะฝ" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1327 msgid "add a Signed-off-by: line to each commit" msgstr "" "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะตะด ะทะฐ ะฟะพะดะฟะธั โSigned-off-byโ ะฒ ััะพะฑัะตะฝะธะตัะพ ะฝะฐ ะฒััะบะพ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 -msgid "passed to 'git am'" -msgstr "ะฟะพะดะฐะฒะฐ ัะต ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit amโ" +#: builtin/rebase.c:1330 +msgid "make committer date match author date" +msgstr "ะดะฐัะฐัะฐ ะฝะฐ ะฟะพะดะฐะฒะฐัะธั ะดะฐ ะพัะณะพะฒะฐัั ะฝะฐ ะดะฐัะฐัะฐ ะฝะฐ ะฐะฒัะพัะฐ" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1332 +msgid "ignore author date and use current date" +msgstr "ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะดะฝะตัะฝะฐ ะดะฐัะฐ, ะฐ ะฝะต ัะฐะทะธ ะฝะฐ ะฐะฒัะพัะฐ" + +#: builtin/rebase.c:1334 +msgid "synonym of --reset-author-date" +msgstr "ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ โ--reset-author-dateโ" + +#: builtin/rebase.c:1336 builtin/rebase.c:1340 msgid "passed to 'git apply'" msgstr "ะฟะพะดะฐะฒะฐ ัะต ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit applyโ" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1338 +msgid "ignore changes in whitespace" +msgstr "ะฑะตะท ะฟัะพะผะตะฝะธ ะฒ ะฟัะฐะทะฝะธัะต ะทะฝะฐัะธ" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 msgid "cherry-pick all commits, even if unchanged" msgstr "ะพัะฑะธัะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะฟะพะดะฐะฒะฐะฝะธั ะดะพัะธ ะดะฐ ะฝัะผะฐ ะฟัะพะผะตะฝะธ" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1347 msgid "continue" msgstr "ะฟัะพะดัะปะถะฐะฒะฐะฝะต" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1350 msgid "skip current patch and continue" msgstr "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ัะตะบััะฐัะฐ ะบััะฟะบะฐ ะธ ะฟัะพะดัะปะถะฐะฒะฐะฝะต" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1352 msgid "abort and check out the original branch" msgstr "ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะธ ะฒัะทััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะฟััะฒะพะฝะฐัะฐะปะฝะธั ะบะปะพะฝ" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1355 msgid "abort but keep HEAD where it is" msgstr "ะฟัะตัััะฐะฝะพะฒัะฒะฐะฝะต ะฑะตะท ะฟัะพะผัะฝะฐ ะบัะผ ะบะฐะบะฒะพ ัะพัะธ โHEADโ" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1356 msgid "edit the todo list during an interactive rebase" msgstr "ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ัะฐะนะปะฐ ั ะบะพะผะฐะฝะดะธ ะฟัะธ ะธะฝัะตัะฐะบัะธะฒะฝะพ ะฟัะตะฑะฐะทะธัะฐะฝะต" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1359 msgid "show the patch file being applied or merged" msgstr "ะฟะพะบะฐะทะฒะฐะฝะต ะฝะฐ ะบััะฟะบะฐัะฐ, ะบะพััะพ ัะต ะฟัะธะปะฐะณะฐ ะธะปะธ ัะปะธะฒะฐ" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1362 +msgid "use apply strategies to rebase" +msgstr "ะฟัะธ ะฟัะตะฑะฐะทะธัะฐะฝะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ัััะฐัะตะณะธั ั ะฟัะธะปะฐะณะฐะฝะต" + +#: builtin/rebase.c:1366 msgid "use merging strategies to rebase" -msgstr "ะฟัะธ ะฟัะตะฑะฐะทะธัะฐะฝะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ัััะฐัะตะณะธั ะทะฐ ัะปะธะฒะฐะฝะต" +msgstr "ะฟัะธ ะฟัะตะฑะฐะทะธัะฐะฝะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ัััะฐัะตะณะธั ััั ัะปะธะฒะฐะฝะต" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1370 msgid "let the user edit the list of commits to rebase" msgstr "" "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟะพััะตะฑะธัะตะปั ะดะฐ ัะตะดะฐะบัะธัะฐ ัะฟะธััะบะฐ ั ะฟะพะดะฐะฒะฐะฝะธั ะทะฐ ะฟัะตะฑะฐะทะธัะฐะฝะต" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1374 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" -msgstr "(ะพััะฐััะปะพ) ะฟัะตััะทะดะฐะฒะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะธััะฐ ะฒะผะตััะพ ะดะฐ ัะต ะฟัะตัะบะฐัะฐั" +msgstr "(ะะกะขะะ ะฏะะ) ะฟัะตััะทะดะฐะฒะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะธััะฐ ะฒะผะตััะพ ะดะฐ ัะต ะฟัะตัะบะฐัะฐั" -#: builtin/rebase.c:1455 -msgid "preserve empty commits during rebase" -msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฟัะฐะทะฝะธัะต ะฟะพะดะฐะฒะฐะฝะธั ะฟัะธ ะฟัะตะฑะฐะทะธัะฐะฝะต" +#: builtin/rebase.c:1379 +msgid "how to handle commits that become empty" +msgstr "ะบะฐะบ ะดะฐ ัะต ะพะฑัะฐะฑะพัะฒะฐั ะพะบะฐะทะฐะปะธัะต ัะต ะฟัะฐะทะฝะธ ะฟะพะดะฐะฒะฐะฝะธั" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1386 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" "ะฟัะตะผะตััะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ, ะบะพะธัะพ ะทะฐะฟะพัะฒะฐั ััั โsquash!โ/โfixup!โ ะฟัะธ โ-iโ" -#: builtin/rebase.c:1463 -msgid "automatically stash/stash pop before and after" -msgstr "ะฐะฒัะพะผะฐัะธัะฝะพ ัะบะฐัะฐะฒะฐะฝะต/ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ัะบะฐัะฐะฝะพัะพ ะฟัะตะดะธ ะธ ัะปะตะด ะฟัะตะฑะฐะทะธัะฐะฝะต" - -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1393 msgid "add exec lines after each commit of the editable list" msgstr "" "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะตะดะพะฒะต ั ะบะพะผะฐะฝะดะธ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต ัะปะตะด ะฒััะบะพ ะฟะพะดะฐะฒะฐะฝะต ะฒ " "ัะตะดะฐะบัะธัะฐะฝะธั ัะฟะธััะบ" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1397 msgid "allow rebasing commits with empty messages" msgstr "ะฟะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ะฟัะตะฑะฐะทะธัะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั ั ะฟัะฐะทะฝะธ ััะพะฑัะตะฝะธั" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1401 msgid "try to rebase merges instead of skipping them" msgstr "ะพะฟะธั ะทะฐ ะฟัะตะฑะฐะทะธัะฐะฝะต ะฝะฐ ัะปะธะฒะฐะฝะธััะฐ ะฒะผะตััะพ ัะต ะดะฐ ัะต ะฟัะตัะบะฐัะฐั" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1404 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "ะทะฐ ะดะพััะพัะฝัะฒะฐะฝะตัะพ ะฝะฐ ัะปะตะดะตะฝะธั ะบะปะพะฝ, ะธะทะฟะพะปะทะฒะฐะนัะต:\n" "\n" " git merge-base --fork-point" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1406 msgid "use the given merge strategy" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะทะฐะดะฐะดะตะฝะฐัะฐ ัััะฐัะตะณะธััะฐ ะฝะฐ ัะปะธะฒะฐะฝะต" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1408 builtin/revert.c:115 msgid "option" msgstr "ะพะฟัะธั" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1409 msgid "pass the argument through to the merge strategy" msgstr "ะฐัะณัะผะตะฝััั ะดะฐ ัะต ะฟะพะดะฐะดะต ะฝะฐ ัััะฐัะตะณะธััะฐ ะทะฐ ัะปะธะฒะฐะฝะต" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1412 msgid "rebase all reachable commits up to the root(s)" msgstr "ะฟัะตะฑะฐะทะธัะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะดะพััะธะถะธะผะธ ะฟะพะดะฐะฒะฐะฝะธั ะดะพ ะฝะฐัะฐะปะฝะพัะพ ะธะผ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะฟัะพะผะตะฝะธ, ะดะพัะธ ะธ ะฝะฐะปะธัะฝะธัะต ะฒะตัะต ะฒ ัะปะตะดะตะฝะพัะพ" + +#: builtin/rebase.c:1434 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17975,33 +19873,45 @@ msgstr "" "ะฟะพะดะดััะถะบะฐัะฐ ะฝะฐ โrebase.useBuiltinโ ะต ะฟัะตะผะฐั ะฝะฐัะฐ.\n" "ะะฐ ะฟะพะฒะตัะต ะธะฝัะพัะผะฐัะธั ะฒะธะถัะต โgit help configโ." -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1440 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" "ะะทะณะปะตะถะดะฐ, ัะต ัะตะณะฐ ัะต ะฟัะธะปะฐะณะฐั ะบััะฟะบะธ ััะตะท ะบะพะผะฐะฝะดะฐัะฐ โgit-amโ. ะะต ะผะพะถะต ะดะฐ " "ะฟัะตะฑะฐะทะธัะฐัะต ะฒ ะผะพะผะตะฝัะฐ." -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1481 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "ะะฟัะธััะฐ โ--preserve-mergesโ ะต ะพััะฐััะปะฐ. ะะพะปะทะฒะฐะนัะต โ--rebase-mergesโ ะฒะผะตััะพ " "ะฝะตั." -#: builtin/rebase.c:1551 +#: builtin/rebase.c:1486 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "ะพะฟัะธะธัะต โ--keep-baseโ ะธ โ--ontoโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/rebase.c:1488 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "ะพะฟัะธะธัะต โ--keep-baseโ ะธ โ--rootโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/rebase.c:1492 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "ะพะฟัะธะธัะต โ--rootโ ะธ โ--fork-pointโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/rebase.c:1495 msgid "No rebase in progress?" msgstr "ะะทะณะปะตะถะดะฐ ะฒ ะผะพะผะตะฝัะฐ ะฝะต ัะตัะต ะฟัะตะฑะฐะทะธัะฐะฝะต" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1499 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "ะะฟัะธััะฐ โ--edit-todoโ ะต ะดะพัััะฟะฝะฐ ัะฐะผะพ ะฟะพ ะฒัะตะผะต ะฝะฐ ะธะฝัะตัะฐะบัะธะฒะฝะพ ะฟัะตะฑะฐะทะธัะฐะฝะต." -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1522 msgid "Cannot read HEAD" msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1534 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18009,16 +19919,16 @@ msgstr "" "ะขััะฑะฒะฐ ะดะฐ ัะตะดะฐะบัะธัะฐัะต ะฒัะธัะบะธ ะบะพะฝัะปะธะบัะธ ะฟัะธ ัะปะธะฒะฐะฝะตัะพ. ะกะปะตะด ัะพะฒะฐ\n" "ะพัะฑะตะปะตะถะตัะต ะบะพัะธะณะธัะฐะฝะตัะพ ะธะผ ััะตะท ะบะพะผะฐะฝะดะฐัะฐ โgit addโ" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1553 msgid "could not discard worktree changes" msgstr "ะฟัะพะผะตะฝะธัะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะทะฐะฝัะปะตะฝะธ" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1572 #, c-format msgid "could not move back to %s" msgstr "ะฒัััะฐะฝะตัะพ ะบัะผ โ%sโ ะต ะฝะตะฒัะทะผะพะถะฝะพ" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1618 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18039,180 +19949,147 @@ msgstr "" "ะทะฐ\n" "ะดะฐ ะฝะต ะทะฐะณัะฑะธัะต ัะปััะฐะนะฝะพ ะฟัะพะผะตะฝะธ.\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1646 msgid "switch `C' expects a numerical value" msgstr "ะพะฟัะธััะฐ โCโ ะพัะฐะบะฒะฐ ัะธัะปะพ ะทะฐ ะฐัะณัะผะตะฝั" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1688 #, c-format msgid "Unknown mode: %s" msgstr "ะะตะธะทะฒะตััะฝะฐ ัััะฐัะตะณะธั: โ%sโ" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1727 msgid "--strategy requires --merge or --interactive" msgstr "" "ะพะฟัะธััะฐ โ--strategyโ ะธะทะธัะบะฒะฐ ะฝัะบะพั ะพั ะพะฟัะธะธัะต โ--mergeโ ะธะปะธ โ--interactiveโ" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1757 +msgid "cannot combine apply options with merge options" +msgstr "ะพะฟัะธะธัะต ะทะฐ โapplyโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ั ะพะฟัะธะธัะต ะทะฐ ัะปะธะฒะฐะฝะต" + +#: builtin/rebase.c:1770 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "ะะตะฟะพะทะฝะฐัะฐ ัะตะฐะปะธะทะฐัะธั ะฝะฐ ะฟัะตะฑะฐะทะธัะฐะฝะต: %s" + +#: builtin/rebase.c:1795 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" "ะพะฟัะธััะฐ โ--reschedule-failed-execโ ะธะทะธัะบะฒะฐ ะฝัะบะพั ะพั ะพะฟัะธะธัะต โ--execโ ะธะปะธ โ--" "interactiveโ" -#: builtin/rebase.c:1809 -msgid "cannot combine am options with either interactive or merge options" -msgstr "" -"ะพะฟัะธะธัะต ะทะฐ โamโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ั ะพะฟัะธะธัะต ะทะฐ ัะปะธะฒะฐะฝะต ะธะปะธ ะทะฐ ะธะฝัะตัะฐะบัะธะฒะฝะฐ " -"ัะฐะฑะพัะฐ" - -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1815 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "ะพะฟัะธะธัะต โ--preserve-mergesโ ะธ โ--rebase-mergesโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1819 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "ะะ ะะจะะ: ะพะฟัะธะธัะต โ--preserve-mergesโ ะธ โ--reschedule-failed-execโ ัะฐ " "ะฝะตััะฒะผะตััะธะผะธ" -#: 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 +#: builtin/rebase.c:1843 #, c-format msgid "invalid upstream '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะปะตะดะตะฝ ะบะปะพะฝ: โ%sโ" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1849 msgid "Could not create new root commit" msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ััะทะดะฐะดะต ะฝะพะฒะพ ะฝะฐัะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1875 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "โ%sโ: ะธะทะธัะบะฒะฐ ัะต ัะพัะฝะพ ะตะดะฝะฐ ะฑะฐะทะฐ ะทะฐ ัะปะธะฒะฐะฝะต ั ะบะปะพะฝะฐ" + +#: builtin/rebase.c:1878 #, c-format msgid "'%s': need exactly one merge base" msgstr "โ%sโ: ะธะทะธัะบะฒะฐ ัะต ัะพัะฝะพ ะตะดะฝะฐ ะฑะฐะทะฐ ะทะฐ ะฟัะตะฑะฐะทะธัะฐะฝะต" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1886 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "ะฃะบะฐะทะฐัะตะปัั โ%sโ ะฝะต ัะพัะธ ะบัะผ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1912 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ะคะะขะะะะ ะะ ะะจะะ: ะฝะต ัััะตััะฒัะฒะฐ ะบะปะพะฝ โ%sโ" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "ะขะฐะบัะฒ ัะบะฐะทะฐัะตะป ะฝัะผะฐ: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1931 msgid "Could not resolve HEAD to a revision" msgstr "ะะพะดะฐะฒะฐะฝะตัะพ, ัะพัะตะฝะพ ะพั ัะบะฐะทะฐัะตะปั โHEADโ, ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะพ" -#: builtin/rebase.c:1981 -msgid "Cannot autostash" -msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ัะบะฐัะฐะต ะฐะฒัะพะผะฐัะธัะฝะพ" - -#: builtin/rebase.c:1984 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "ะะตะพัะฐะบะฒะฐะฝ ัะตะทัะปัะฐั ะฟัะธ ัะบะฐัะฐะฒะฐะฝะต: โ%sโ" - -#: builtin/rebase.c:1990 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "ะะธัะตะบัะพัะธััะฐ ะทะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝะฐ" - -#: builtin/rebase.c:1993 -#, c-format -msgid "Created autostash: %s\n" -msgstr "ะะฒัะพะผะฐัะธัะฝะพ ัะบะฐัะฐะฝะพ: โ%sโ\n" - -#: builtin/rebase.c:1996 -msgid "could not reset --hard" -msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โgit reset --hardโ" - -#: builtin/rebase.c:1997 builtin/reset.c:114 -#, c-format -msgid "HEAD is now at %s" -msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ัะพัะธ ะบัะผ โ%sโ" - -#: builtin/rebase.c:2013 +#: builtin/rebase.c:1952 msgid "Please commit or stash them." msgstr "ะัะพะผะตะฝะธัะต ัััะฑะฒะฐ ะธะปะธ ะดะฐ ัะต ะฟะพะดะฐะดะฐั, ะธะปะธ ะดะฐ ัะต ัะบะฐัะฐัั." -#: builtin/rebase.c:2040 -#, c-format -msgid "could not parse '%s'" -msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ" - -#: builtin/rebase.c:2053 +#: builtin/rebase.c:1988 #, c-format msgid "could not switch to %s" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะตะผะธะฝะต ะบัะผ โ%sโ" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:1999 msgid "HEAD is up to date." msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะต ะฝะฐะฟัะปะฝะพ ะฐะบััะฐะปะตะฝ." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2001 #, c-format msgid "Current branch %s is up to date.\n" msgstr "ะขะตะบััะธัั ะบะปะพะฝ โ%sโ ะต ะฝะฐะฟัะปะฝะพ ะฐะบััะฐะปะตะฝ.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2009 msgid "HEAD is up to date, rebase forced." msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะต ะฝะฐะฟัะปะฝะพ ะฐะบััะฐะปะตะฝ โ ะฟัะธะฝัะดะธัะตะปะฝะพ ะฟัะตะฑะฐะทะธัะฐะฝะต" -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2011 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "ะขะตะบััะธัั ะบะปะพะฝ โ%sโ ะต ะฝะฐะฟัะปะฝะพ ะฐะบััะฐะปะตะฝ โ ะฟัะธะฝัะดะธัะตะปะฝะพ ะฟัะตะฑะฐะทะธัะฐะฝะต\n" -#: builtin/rebase.c:2084 +#: builtin/rebase.c:2019 msgid "The pre-rebase hook refused to rebase." msgstr "ะัะบะฐัะฐ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะต ะฟัะตะดะธ ะฟัะตะฑะฐะทะธัะฐะฝะต ะพัั ะฒััะปะธ ะฟัะตะฑะฐะทะธัะฐะฝะตัะพ." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2026 #, c-format msgid "Changes to %s:\n" msgstr "ะัะพะผะตะฝะธัะต ะฒ โ%sโ:\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2029 #, c-format msgid "Changes from %s to %s:\n" msgstr "ะัะพะผะตะฝะธัะต ะพั โ%sโ ะบัะผ โ%sโ:\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2054 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "ะััะฒะพ, ัะบะฐะทะฐัะตะปัั โHEADโ ะทะฐะฟะพัะฒะฐ ะดะฐ ัะพัะธ ะบัะผ ะฑะฐะทะฐัะฐ, ะฒััั ั ะบะพััะพ " "ะฟัะตะฑะฐะทะธัะฐัะตโฆ\n" -#: builtin/rebase.c:2128 +#: builtin/rebase.c:2063 msgid "Could not detach HEAD" msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะดะตะปั" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2072 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "ะัะตะฒัััะฐะฝะต ะฝะฐ โ%sโ ะบัะผ โ%sโ.\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack ะะะ ะะะขะะ ะะฏ_ะะ_GIT" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:1224 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" @@ -18245,7 +20122,7 @@ msgstr "" "ะะฐ ะดะฐ ะทะฐะณะปััะธัะต ัะพะฒะฐ ััะพะฑัะตะฝะธะต, ะบะฐัะพ ะทะฐะฟะฐะทะธัะต ััะฐะฝะดะฐััะฝะพัะพ ะฟะพะฒะตะดะตะฝะธะต,\n" "ะทะฐะดะฐะนัะต ะฝะฐัััะพะนะบะฐัะฐ โreceive.denyCurrentBranchโ ะดะฐ ะต โrefuseโ (ะพัะบะฐะท)." -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:1244 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" @@ -18266,11 +20143,11 @@ msgstr "" "ะะฐ ะดะฐ ะทะฐะณะปััะธัะต ัะพะฒะฐ ััะพะฑัะตะฝะธะต, ะทะฐะดะฐะนัะต ะฝะฐัััะพะนะบะฐัะฐ\n" "โreceive.denyDeleteCurrentโ ะดะฐ ะต โrefuseโ (ะพัะบะฐะท)." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:2422 msgid "quiet" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:2436 msgid "You must specify a directory." msgstr "ะขััะฑะฒะฐ ะดะฐ ัะบะฐะถะตัะต ะดะธัะตะบัะพัะธั." @@ -18295,49 +20172,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists ะฃะะะะะขะะ" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "โ%sโ ะฝะต ะต ะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ ะฒัะตะผะต" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "ะัะฑะตะปัะทะฒะฐะฝะต ะฝะฐ ะดะพััะธะถะธะผะธัะต ะพะฑะตะบัะธโฆ" -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "โ%sโ ะฝะต ัะพัะธ ะฝะฐะฝะธะบัะดะต!" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "ะฝะต ะต ัะบะฐะทะฐะฝ ะถััะฝะฐะป ั ะฟะพะดะฐะฒะฐะฝะธั ะทะฐ ะธะทััะธะฒะฐะฝะต" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "โ%sโ ะฝะต ะต ะถััะฝะฐะป ั ะฟะพะดะฐะฒะฐะฝะธั" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "ะปะธะฟัะฒะฐ ะถััะฝะฐะป ั ะฟะพะดะฐะฒะฐะฝะธััะฐ ะทะฐ โ%sโ" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะพัะผะฐั ะฝะฐ ัะบะฐะทะฐัะตะป: %s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -18345,83 +20222,83 @@ msgstr "" "git remote add [-t ะะะะ] [-m ะะกะะะะะ_ะะะะ] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] ะะะ ะะะ ะะก" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename ะกะขะะ ะ_ะะะ ะะะะ_ะะะ" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove ะะะ" -#: builtin/remote.c:20 builtin/remote.c:48 +#: 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:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] ะะะ" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] ะะะ" -#: builtin/remote.c:23 +#: 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:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] ะะะ ะะะะโฆ" -#: builtin/remote.c:25 builtin/remote.c:74 +#: 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:26 builtin/remote.c:79 +#: 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:27 builtin/remote.c:80 +#: 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:28 builtin/remote.c:81 +#: 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:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [ะะะฆะะฏโฆ] ะะะ ะะะ ะะก" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches ะะะ ะะะะโฆ" -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add ะะะ ะะะะโฆ" -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [ะะะฆะะฏโฆ] ะะะ" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [ะะะฆะะฏโฆ] ะะะ" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [ะะะฆะะฏโฆ] [ะะ ะฃะะ | ะะขะะะะะงะะะ_ะฅะ ะะะะะะฉะโฆ]" -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "ะะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ โ%sโ" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -18429,86 +20306,102 @@ msgstr "" "ะะทะฟะพะปะทะฒะฐะฝะตัะพ ัะฐะผะพ ะฝะฐ โ--mirrorโ ะต ะพะฟะฐัะฝะพ. ะะผะตััะพ ัะพะฒะฐ\n" "ะฟะพะปะทะฒะฐะนัะต โ--mirror=fetchโ ะธะปะธ โ--mirror=pushโ" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โ--mirrorโ: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "ะพัะดะฐะปะตัะตะฝะธัะต ะบะปะพะฝะธ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะดะพััะฐะฒะตะฝะธ" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "ะฒะฝะฐััะฝะต ะฝะฐ ะฒัะธัะบะธ ะตัะธะบะตัะธ ะธ ะฟัะธะฝะฐะดะปะตะถะฐัะธัะต ะธะผ ะพะฑะตะบัะธ ะฟัะธ ะดะพััะฐะฒัะฝะต" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "ะผะพะถะต ะธ ะดะฐ ะฝะต ัะต ะดะพััะฐะฒัั ะฝะธะบะฐะบะฒะธ ะตัะธะบะตัะธ (ััะตะท ะพะฟัะธััะฐ โ--no-tagsโ)" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "ะบะปะพะฝ/ะธ ะทะฐ ัะปะตะดะตะฝะต" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "ะพัะฝะพะฒะตะฝ ะบะปะพะฝ" -#: builtin/remote.c:173 +#: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "ะฝะฐัััะพะนะฒะฐะฝะต ะฝะฐ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต, ะพั ะบะพะตัะพ ะดะฐ ัะต ะธะทะดััะฟะฒะฐ ะธะปะธ ะดะพััะฐะฒั" -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "" "ะฝัะผะฐ ัะผะธััะป ะดะฐ ัะต ัะบะฐะทะฒะฐ ะพัะฝะพะฒะตะฝ ะบะปะพะฝ ะฟัะธ ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะพะฟัะธััะฐ โ--mirrorโ" -#: builtin/remote.c:187 +#: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "ัะบะฐะทะฒะฐะฝะตัะพ ะฝะฐ ัะปะตะดะตะฝะธ ะบะปะพะฝะธ ะต ัะผะธัะปะตะฝะพ ัะฐะผะพ ะทะฐ ะพัะดะฐะปะตัะตะฝะธ ั ัะฐะฝะธะปะธัะฐ, ะพั " "ะบะพะธัะพ ัะต ะดะพััะฐะฒั" -#: builtin/remote.c:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:697 #, c-format msgid "remote %s already exists." msgstr "ะฒะตัะต ัััะตััะฒัะฒะฐ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต ั ะธะผะต โ%sโ." -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:701 #, c-format msgid "'%s' is not a valid remote name" msgstr "โ%sโ ะต ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะทะฐ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "ะัะฝะพะฒะฝะธัั ะบะปะพะฝ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฝะฐัััะพะตะฝ" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "ะะฑะตะบัะธัะต ะทะฐ ะดะพััะฐะฒัะฝะต ะทะฐ ัะบะฐะทะฐัะตะปั โ%sโ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะฟะพะปััะตะฝะธ" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(ััะฒะฟะฐะดะฐัะธ)" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(ะทะฐ ะธะทััะธะฒะฐะฝะต)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:654 +#, c-format +msgid "could not set '%s'" +msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต" + +#: builtin/remote.c:659 +#, 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:690 builtin/remote.c:833 builtin/remote.c:941 #, c-format msgid "No such remote: '%s'" msgstr "ะัะผะฐ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต ะฝะฐ ะธะผะต โ%sโ" -#: builtin/remote.c:646 +#: builtin/remote.c:707 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "ะ ะฐะทะดะตะปัั โ%sโ ะฒ ะฝะฐัััะพะนะบะธัะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะตะธะผะตะฝัะฒะฐะฝ ะฝะฐ โ%sโ" -#: builtin/remote.c:666 +#: builtin/remote.c:727 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18519,17 +20412,17 @@ msgstr "" " %s\n" " ะัะพะผะตะฝะตัะต ะฝะฐัััะพะนะบะธัะต ัััะฝะพ, ะฐะบะพ ะต ะฝะตะพะฑั ะพะดะธะผะพ." -#: builtin/remote.c:702 +#: builtin/remote.c:767 #, c-format msgid "deleting '%s' failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทััะธะฒะฐะฝะต ะฝะฐ โ%sโ" -#: builtin/remote.c:736 +#: builtin/remote.c:801 #, c-format msgid "creating '%s' failed" msgstr "ะฝะตััะฟะตัะฝะพ ััะทะดะฐะฒะฐะฝะต ะฝะฐ โ%sโ" -#: builtin/remote.c:802 +#: builtin/remote.c:877 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18543,121 +20436,121 @@ msgstr[1] "" "ะะตะปะตะถะบะฐ: ะัะบะพะปะบะพ ะบะปะพะฝะฐ ะธะทะฒัะฝ ะนะตัะฐัั ะธััะฐ โrefs/remotes/โ ะฝะต ะฑัั ะฐ ะธะทััะธัะธ.\n" "ะะทััะธะนัะต ะณะธ ััะตะท ะบะพะผะฐะฝะดะฐัะฐ:" -#: builtin/remote.c:816 +#: builtin/remote.c:891 #, c-format msgid "Could not remove config section '%s'" msgstr "ะ ะฐะทะดะตะปัั โ%sโ ะฒ ะฝะฐัััะพะนะบะธัะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" -#: builtin/remote.c:917 +#: builtin/remote.c:994 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ะฝะพะฒ (ัะปะตะดะฒะฐัะพัะพ ะดะพััะฐะฒัะฝะต ัะต ะณะพ ัะฐะทะฟะพะปะพะถะธ ะฒ โremotes/%sโ)" -#: builtin/remote.c:920 +#: builtin/remote.c:997 msgid " tracked" msgstr " ัะปะตะดะตะฝ" -#: builtin/remote.c:922 +#: builtin/remote.c:999 msgid " stale (use 'git remote prune' to remove)" msgstr " ััะฐั (ะธะทััะธะนัะต ััะตะท โgit remote pruneโ)" -#: builtin/remote.c:924 +#: builtin/remote.c:1001 msgid " ???" msgstr " ะฝะตััะฝะพ ััััะพัะฝะธะต" # CHECK -#: builtin/remote.c:965 +#: builtin/remote.c:1042 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "ะฝะตะฟัะฐะฒะธะปะตะฝ ะบะปะพะฝ ะทะฐ ัะปะธะฒะฐะฝะต โ%sโ. ะะตะฒัะทะผะพะถะฝะพ ะต ะดะฐ ะฟัะตะฑะฐะทะธัะฐัะต ะฒััั ั ะฟะพะฒะตัะต " "ะพั 1 ะบะปะพะฝ" -#: builtin/remote.c:974 +#: builtin/remote.c:1051 #, c-format msgid "rebases interactively onto remote %s" msgstr "ะธะฝัะตัะฐะบัะธะฒะฝะพ ะฟัะตะฑะฐะทะธัะฐะฝะต ะฒััั ั ะพัะดะฐะปะตัะตะฝะธั ะบะปะพะฝ โ%sโ" -#: builtin/remote.c:976 +#: builtin/remote.c:1053 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "ะธะฝัะตัะฐะบัะธะฒะฝะพ ะฟัะตะฑะฐะทะธัะฐะฝะต (ััั ัะปะธะฒะฐะฝะธั) ะฒััั ั ะพัะดะฐะปะตัะตะฝะธั ะบะปะพะฝ โ%sโ" -#: builtin/remote.c:979 +#: builtin/remote.c:1056 #, c-format msgid "rebases onto remote %s" msgstr "ะฟัะตะฑะฐะทะธัะฐะฝะต ะฒััั ั ะพัะดะฐะปะตัะตะฝะธั ะบะปะพะฝ โ%sโ" -#: builtin/remote.c:983 +#: builtin/remote.c:1060 #, c-format msgid " merges with remote %s" msgstr " ัะปะธะฒะฐะฝะต ั ะพัะดะฐะปะตัะตะฝะธั ะบะปะพะฝ โ%sโ" -#: builtin/remote.c:986 +#: builtin/remote.c:1063 #, c-format msgid "merges with remote %s" msgstr "ัะปะธะฒะฐะฝะต ั ะพัะดะฐะปะตัะตะฝะธั ะบะปะพะฝ โ%sโ" -#: builtin/remote.c:989 +#: builtin/remote.c:1066 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s ะธ ั ะพัะดะฐะปะตัะตะฝะธั ะบะปะพะฝ โ%sโ\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1109 msgid "create" msgstr "ััะทะดะฐะดะตะฝ" -#: builtin/remote.c:1035 +#: builtin/remote.c:1112 msgid "delete" msgstr "ะธะทััะธั" -#: builtin/remote.c:1039 +#: builtin/remote.c:1116 msgid "up to date" msgstr "ะฐะบััะฐะปะตะฝ" -#: builtin/remote.c:1042 +#: builtin/remote.c:1119 msgid "fast-forwardable" msgstr "ะผะพะถะต ะดะฐ ัะต ะฟัะตะฒัััะธ" -#: builtin/remote.c:1045 +#: builtin/remote.c:1122 msgid "local out of date" msgstr "ะปะพะบะฐะปะฝะธัั ะต ะธะทะพััะฐะฝะฐะป" -#: builtin/remote.c:1052 +#: builtin/remote.c:1129 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s ะฟัะธะฝัะดะธัะตะปะฝะพ ะธะทัะปะฐัะบะฒะฐ ะบัะผ %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1132 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s ะธะทัะปะฐัะบะฒะฐ ะบัะผ %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1136 #, c-format msgid " %-*s forces to %s" msgstr " %-*s ะฟัะธะฝัะดะธัะตะปะฝะพ ะธะทัะปะฐัะบะฒะฐ ะบัะผ %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1139 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s ะธะทัะปะฐัะบะฒะฐ ะบัะผ %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1207 msgid "do not query remotes" msgstr "ะฑะตะท ะทะฐัะฒะบะธ ะบัะผ ะพัะดะฐะปะตัะตะฝะธัะต ั ัะฐะฝะธะปะธัะฐ" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid "* remote %s" msgstr "โ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต โ%sโ" -#: builtin/remote.c:1158 +#: builtin/remote.c:1235 #, c-format msgid " Fetch URL: %s" msgstr " ะะดัะตั ะทะฐ ะดะพััะฐะฒัะฝะต: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 msgid "(no URL)" msgstr "(ะฑะตะท ะฐะดัะตั)" @@ -18665,25 +20558,25 @@ msgstr "(ะฑะตะท ะฐะดัะตั)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1250 builtin/remote.c:1252 #, c-format msgid " Push URL: %s" msgstr " ะะดัะตั ะทะฐ ะธะทัะปะฐัะบะฒะฐะฝะต: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 #, c-format msgid " HEAD branch: %s" msgstr " ะบะปะพะฝ ัะพัะตะฝ ะพั HEAD: %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1254 msgid "(not queried)" msgstr "(ะฑะตะท ะฟัะพะฒะตัะบะฐ)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1256 msgid "(unknown)" msgstr "(ะฝะตะฟะพะทะฝะฐั)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1260 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -18692,170 +20585,161 @@ msgstr "" "ั ัะฐะฝะธะปะธัะต\n" " ะฝะต ะต ะตะดะฝะพะทะฝะฐัะตะฝ ะธ ะต ะฝัะบะพะน ะพั ัะปะตะดะฝะธัะต):\n" -#: builtin/remote.c:1195 +#: builtin/remote.c:1272 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " ะัะดะฐะปะตัะตะฝ ะบะปะพะฝ:%s" msgstr[1] " ะัะดะฐะปะตัะตะฝะธ ะบะปะพะฝะธ:%s" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1275 builtin/remote.c:1301 msgid " (status not queried)" msgstr " (ััััะพัะฝะธะตัะพ ะฝะต ะฑะต ะฟัะพะฒะตัะตะฝะพ)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1284 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:1215 +#: builtin/remote.c:1292 msgid " Local refs will be mirrored by 'git push'" msgstr " ะะพะบะฐะปะฝะธัะต ัะบะฐะทะฐัะตะปะธ ัะต ะฑัะดะฐั ะฟัะตะฝะตัะตะฝะธ ััะตะท โ pushโ" -#: builtin/remote.c:1221 +#: builtin/remote.c:1298 #, 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:1242 +#: builtin/remote.c:1319 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ refs/remotes/ะะะ/HEAD ัะฟะพัะตะด ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/remote.c:1244 +#: builtin/remote.c:1321 msgid "delete refs/remotes/<name>/HEAD" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ refs/remotes/ะะะ/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1336 msgid "Cannot determine remote HEAD" msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ัััะฐะฝะพะฒะธ ะพัะดะฐะปะตัะตะฝะธัั ะฒััั " -#: builtin/remote.c:1261 +#: builtin/remote.c:1338 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "ะะฝะพะถะตััะฒะพ ะบะปะพะฝะธ ั ะฒััั ะพะฒะต. ะะทะฑะตัะตัะต ะธะทัะธัะฝะพ ะฝัะบะพะน ะพั ััั ััะตะท ะบะพะผะฐะฝะดะฐัะฐ:" -#: builtin/remote.c:1271 +#: builtin/remote.c:1348 #, c-format msgid "Could not delete %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" -#: builtin/remote.c:1279 +#: builtin/remote.c:1356 #, c-format msgid "Not a valid ref: %s" msgstr "ะะตะฟัะฐะฒะธะปะตะฝ ัะบะฐะทะฐัะตะป: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1358 #, c-format msgid "Could not setup %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฝะฐัััะพะธ" -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, c-format msgid " %s will become dangling!" msgstr "โ%sโ ัะต ัะต ะฟัะตะฒััะฝะต ะฒ ะพะฑะตะบั ะธะทะฒัะฝ ะบะปะพะฝะธัะต!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1377 #, c-format msgid " %s has become dangling!" msgstr "โ%sโ ัะต ะฟัะตะฒััะฝะฐ ะฒ ะพะฑะตะบั ะธะทะฒัะฝ ะบะปะพะฝะธัะต!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "Pruning %s" msgstr "ะะบะฐััััะฝะต ะฝะฐ โ%sโ" -#: builtin/remote.c:1311 +#: builtin/remote.c:1388 #, c-format msgid "URL: %s" msgstr "ะฐะดัะตั: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1404 #, c-format msgid " * [would prune] %s" msgstr " โ [ัะต ะฑัะดะต ะพะบะฐัััะตะฝะพ] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1407 #, c-format msgid " * [pruned] %s" msgstr " โ [ะพะบะฐัััะตะฝะพ] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1452 msgid "prune remotes after fetching" msgstr "ะพะบะฐััััะฝะต ะฝะฐ ะพะณะปะตะดะฐะปะฐัะฐ ะฝะฐ ะพัะดะฐะปะตัะตะฝะธัะต ั ัะฐะฝะธะปะธัะฐ ัะปะตะด ะดะพััะฐะฒัะฝะต" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 #, c-format msgid "No such remote '%s'" msgstr "ะัะผะฐ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต ะฝะฐ ะธะผะต โ%sโ" -#: builtin/remote.c:1454 +#: builtin/remote.c:1531 msgid "add branch" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะบะปะพะฝ" -#: builtin/remote.c:1461 +#: builtin/remote.c:1538 msgid "no remote specified" msgstr "ะฝะต ะต ัะบะฐะทะฐะฝะพ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/remote.c:1478 +#: builtin/remote.c:1555 msgid "query push URLs rather than fetch URLs" msgstr "ะทะฐะฟะธัะฒะฐะฝะต ะบัะผ ะฐะดัะตัะธัะต ะทะฐ ะธะทัะปะฐัะบะฒะฐะฝะต, ะฐ ะฝะต ะทะฐ ะดะพััะฐะฒัะฝะต" -#: builtin/remote.c:1480 +#: builtin/remote.c:1557 msgid "return all URLs" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ะฐะดัะตัะธ" -#: builtin/remote.c:1508 +#: builtin/remote.c:1585 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ะฝะต ะต ะทะฐะดะฐะดะตะฝ ะฐะดัะตั ะทะฐ ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต โ%sโ" -#: builtin/remote.c:1534 +#: builtin/remote.c:1611 msgid "manipulate push URLs" msgstr "ะฟัะพะผัะฝะฐ ะฝะฐ ะฐะดัะตัะธัะต ะทะฐ ะธะทัะปะฐัะบะฒะฐะฝะต" -#: builtin/remote.c:1536 +#: builtin/remote.c:1613 msgid "add URL" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฐะดัะตัะธ" -#: builtin/remote.c:1538 +#: builtin/remote.c:1615 msgid "delete URLs" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ ะฐะดัะตัะธ" -#: builtin/remote.c:1545 +#: builtin/remote.c:1622 msgid "--add --delete doesn't make sense" msgstr "ะพะฟัะธะธัะต โ--addโ ะธ โ--deleteโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/remote.c:1584 +#: builtin/remote.c:1661 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ะะตะฟัะฐะฒะธะปะตะฝ (ััะฐั) ัะพัะผะฐั ะทะฐ ะฐะดัะตั: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1669 #, c-format msgid "No such URL found: %s" msgstr "ะขะฐะบัะฒ ะฐะดัะตั ะฝะต ะต ะพัะบัะธั: %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1671 msgid "Will not delete all non-push URLs" msgstr "ะะธะบะพะน ะพั ะฐะดัะตัะธัะต, ะบะพะธัะพ ะฝะต ัะฐ ะทะฐ ะธะทัะปะฐัะบะฒะฐะฝะต, ะฝัะผะฐ ะดะฐ ัะต ะธะทััะธะต" -#: 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 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [ะะะฆะะฏโฆ]" -#: builtin/repack.c:27 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18864,126 +20748,126 @@ msgstr "" "ะะพะปะทะฒะฐะนัะต ะพะฟัะธััะฐ --no-write-bitmap-index ะธะปะธ ะธะทะบะปััะตัะต ะฝะฐัััะพะนะบะฐัะฐ\n" "โpack.writebitmapsโ." -#: builtin/repack.c:190 +#: builtin/repack.c:197 msgid "could not start pack-objects to repack promisor objects" msgstr "" "ะบะพะผะฐะฝะดะฐัะฐ โpack-objectsโ ะฝะต ะผะพะถะต ะดะฐ ัะต ััะฐััะธัะฐ ะทะฐ ะฟัะตะฟะฐะบะตัะธัะฐะฝะตัะพ ะฝะฐ " "ะณะฐัะฐะฝัะธัะฐัะธัะต ะพะฑะตะบัะธ" -#: builtin/repack.c:229 builtin/repack.c:408 +#: builtin/repack.c:236 builtin/repack.c:421 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -"repack: ะพั โpack-objectsโ ัะต ะพัะฐะบะฒะฐั ัะตะดะพะฒะต ัะฐะผะพ ั ะฟัะปะฝะธ ัะตััะฝะฐะนัะตัะธัะฝะธ " +"repack: ะพั โpack-objectsโ ัะต ะธะทะธัะบะฒะฐั ัะตะดะพะฒะต ัะฐะผะพ ั ะฟัะปะฝะธ ัะตััะฝะฐะนัะตัะธัะฝะธ " "ัะบะฐะทะฐัะตะปะธ." -#: builtin/repack.c:246 +#: builtin/repack.c:260 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "ะบะพะผะฐะฝะดะฐัะฐ โpack-objectsโ ะฝะต ะผะพะถะต ะดะฐ ะทะฐะฒัััะธ ะทะฐ ะฟัะตะฟะฐะบะตัะธัะฐะฝะตัะพ ะฝะฐ " "ะณะฐัะฐะฝัะธัะฐัะธัะต ะพะฑะตะบัะธ" -#: builtin/repack.c:284 +#: builtin/repack.c:297 msgid "pack everything in a single pack" msgstr "ะฟะฐะบะตัะธัะฐะฝะต ะฝะฐ ะฒัะธัะบะพ ะฒ ะฟะฐะบะตั" -#: builtin/repack.c:286 +#: builtin/repack.c:299 msgid "same as -a, and turn unreachable objects loose" msgstr "" "ัััะพัะพ ะบะฐัะพ ะพะฟัะธััะฐ โ-aโ. ะะพะฟัะปะฝะธัะตะปะฝะพ โ ะฝะตะดะพััะธะถะธะผะธัะต ะพะฑะตะบัะธ ะดะฐ ััะฐะฝะฐั " "ะฝะตะฟะฐะบะตัะธัะฐะฝะธ" -#: builtin/repack.c:289 +#: builtin/repack.c:302 msgid "remove redundant packs, and run git-prune-packed" msgstr "" "ะฟัะตะผะฐั ะฒะฐะฝะต ะฝะฐ ะฝะตะฝัะถะฝะธัะต ะฟะฐะบะตัะธัะฐะฝะธ ัะฐะนะปะพะฒะต ะธ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit-" "prune-packedโ" -#: builtin/repack.c:291 +#: builtin/repack.c:304 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟัะธััะฐ โ--no-reuse-deltaโ ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit-pack-objectsโ" -#: builtin/repack.c:293 +#: builtin/repack.c:306 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟัะธััะฐ โ--no-reuse-objectโ ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit-pack-objectsโ" -#: builtin/repack.c:295 +#: builtin/repack.c:308 msgid "do not run git-update-server-info" msgstr "ะฑะตะท ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit-update-server-infoโ" -#: builtin/repack.c:298 +#: builtin/repack.c:311 msgid "pass --local to git-pack-objects" msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟัะธััะฐ โ--localโ ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit-pack-objectsโ" -#: builtin/repack.c:300 +#: builtin/repack.c:313 msgid "write bitmap index" msgstr "ััะทะดะฐะฒะฐะฝะต ะธ ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะธ ะฝะฐ ะฑะฐะทะฐ ะฑะธัะพะฒะธ ะผะฐัะบะธ" -#: builtin/repack.c:302 +#: builtin/repack.c:315 msgid "pass --delta-islands to git-pack-objects" msgstr "ะฟะพะดะฐะฒะฐะฝะต ะฝะฐ ะพะฟัะธััะฐ โ--delta-islandsโ ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โgit-pack-objectsโ" -#: builtin/repack.c:303 +#: builtin/repack.c:316 msgid "approxidate" msgstr "ะตะฒัะธััะธัะฝะฐ ะดะฐัะฐ" -#: builtin/repack.c:304 +#: builtin/repack.c:317 msgid "with -A, do not loosen objects older than this" msgstr "" "ะฟัะธ ะบะพะผะฑะธะฝะธัะฐะฝะตัะพ ั ะพะฟัะธััะฐ โ-Aโ โ ะฑะตะท ัะฐะทะฟะฐะบะตัะธัะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต ะฟะพ ััะฐัะธ ะพั " "ัะพะฒะฐ" -#: builtin/repack.c:306 +#: builtin/repack.c:319 msgid "with -a, repack unreachable objects" msgstr "ั โ-aโ โ ะฟัะตะฟะฐะบะตัะธัะฐะฝะต ะฝะฐ ะฝะตะดะพััะธะถะธะผะธัะต ะพะฑะตะบัะธ" -#: builtin/repack.c:308 +#: builtin/repack.c:321 msgid "size of the window used for delta compression" msgstr "ัะฐะทะผะตั ะฝะฐ ะฟัะพะทะพัะตัะฐ ะทะฐ ะดะตะปัะฐ ะบะพะผะฟัะตัะธััะฐ" -#: builtin/repack.c:309 builtin/repack.c:315 +#: builtin/repack.c:322 builtin/repack.c:328 msgid "bytes" msgstr "ะฑะฐะนัะพะฒะต" -#: builtin/repack.c:310 +#: builtin/repack.c:323 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "ัััะพัะพ ะบะฐัะพ ะณะพัะฝะฐัะฐ ะพะฟัะธั, ะฝะพ ะพะณัะฐะฝะธัะตะฝะธะตัะพ ะดะฐ ะต ะฟะพ ัะฐะทะผะตั ะฝะฐ ะฟะฐะผะตััะฐ, ะฐ ะฝะต " "ะฟะพ ะฑัะพั ะฝะฐ ะพะฑะตะบัะธัะต" -#: builtin/repack.c:312 +#: builtin/repack.c:325 msgid "limits the maximum delta depth" msgstr "ะพะณัะฐะฝะธัะฐะฒะฐะฝะต ะฝะฐ ะผะฐะบัะธะผะฐะปะฝะฐัะฐ ะดัะปะฑะพัะธะฝะฐ ะฝะฐ ะดะตะปัะฐัะฐ" -#: builtin/repack.c:314 +#: builtin/repack.c:327 msgid "limits the maximum number of threads" msgstr "ะพะณัะฐะฝะธัะฐะฒะฐะฝะต ะฝะฐ ะผะฐะบัะธะผะฐะปะฝะธั ะฑัะพะน ะฝะธัะบะธ" -#: builtin/repack.c:316 +#: builtin/repack.c:329 msgid "maximum size of each packfile" msgstr "ะผะฐะบัะธะผะฐะปะตะฝ ัะฐะทะผะตั ะฝะฐ ะฒัะตะบะธ ะฟะฐะบะตั" -#: builtin/repack.c:318 +#: builtin/repack.c:331 msgid "repack objects in packs marked with .keep" msgstr "ะฟัะตะฟะฐะบะตัะธัะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต ะฒ ะฟะฐะบะตัะธ ะฑะตะปัะทะฐะฝะธ ั โ.keepโ" -#: builtin/repack.c:320 +#: builtin/repack.c:333 msgid "do not repack this pack" msgstr "ะฑะตะท ะฟัะตะฟะฐะบะตัะธัะฐะฝะต ะฝะฐ ัะพะทะธ ะฟะฐะบะตั" -#: builtin/repack.c:330 +#: builtin/repack.c:343 msgid "cannot delete packs in a precious-objects repo" msgstr "ะฟะฐะบะตัะธัะต ะฒ ั ัะฐะฝะธะปะธัะต ั ะฒะฐะถะฝะธ ะพะฑะตะบัะธ ะฝะต ะผะพะถะต ะดะฐ ัะต ััะธัั" -#: builtin/repack.c:334 +#: builtin/repack.c:347 msgid "--keep-unreachable and -A are incompatible" msgstr "ะะฟัะธะธัะต โ--keep-unreachableโ ะธ โ-Aโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/repack.c:417 +#: builtin/repack.c:430 msgid "Nothing new to pack." msgstr "ะะธัะพ ะฝะพะฒะพ ะทะฐ ะฟะฐะบะตัะธัะฐะฝะต" -#: builtin/repack.c:478 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19001,7 +20885,7 @@ msgstr "" "ะะ ะะะฃะะ ะะะะะะะ: ะธฬ โ ะทะฐ ะฒัััะฐะฝะตัะพ ะฝะฐ ะฟััะฒะพะฝะฐัะฐะปะฝะธัะต ะธะผะตะฝะฐ.\n" "ะะ ะะะฃะะ ะะะะะะะ: ะัะตะธะผะตะฝัะฒะฐะนัะต ัะฐะนะปะพะฒะตัะต ะฒ โ%sโ ัััะฝะพ:\n" -#: builtin/repack.c:526 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "ะดะธัะตะบัะพัะธััะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธัะฐ" @@ -19109,8 +20993,8 @@ msgstr "โfstatโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ ะฒััั ั โ%sโ" msgid "unable to write object to database" msgstr "ะพะฑะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ ะฒ ะฑะฐะทะฐัะฐ ะพั ะดะฐะฝะฝะธ" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: 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โ" @@ -19129,22 +21013,22 @@ msgstr "ะฝะตััะฟะตัะฝะพ ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ัะฐะนะปะฐ ั ะพะฑะตะบัะ msgid "new object is the same as the old one: '%s'" msgstr "ะฝะพะฒะธัั ะธ ััะฐัะธัั ะพะฑะตะบั ัะฐ ะตะดะธะฝ ะธ ััั: โ%sโ" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฐะฝะฐะปะธะทะธัะฐ ะบะฐัะพ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/replace.c:414 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "ะตัะธะบะตััั ะฟัะธ ัะปะธะฒะฐะฝะต ะฒ ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ e ะฝะตะฟัะฐะฒะธะปะตะฝ" -#: builtin/replace.c:416 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "ะตัะธะบะตััั ะฟัะธ ัะปะธะฒะฐะฝะต ะฒ ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ e ะฝะตะฟัะฐะฒะธะปะตะฝ" -#: builtin/replace.c:428 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -19153,31 +21037,31 @@ msgstr "" "ะััะฒะพะฝะฐัะฐะปะฝะพัะพ ะฟะพะดะฐะฒะฐะฝะต โ%sโ ััะดััะถะฐ ะตัะธะบะตัะฐ ะฟัะธ ัะปะธะฒะฐะฝะต โ%sโ, ะบะพะนัะพ ะต " "ะธะทั ะฒััะปะตะฝ, ะทะฐัะพะฒะฐ ะธะทะฟะพะปะทะฒะฐะนัะต ะพะฟัะธััะฐ โ--editโ, ะฐ ะฝะต โ--graftโ." -#: builtin/replace.c:467 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "ะฟััะฒะพะฝะฐัะฐะปะฝะพัะพ ะฟะพะดะฐะฒะฐะฝะต โ%sโ ะต ั ะฟะพะดะฟะธั ะฝะฐ GPG" -#: builtin/replace.c:468 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "ะะพะดะฟะธััั ัะต ะฑัะดะต ะฟัะตะผะฐั ะฝะฐั ะฒ ะทะฐะผะตะฝััะพัะพ ะฟะพะดะฐะฒะฐะฝะต!" -#: builtin/replace.c:478 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "ะทะฐะผะตะฝััะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะทะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝะพ" -#: builtin/replace.c:486 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "ะฟัะธัะฐะดะบะฐัะฐ ะทะฐ โ%sโ ะต ะธะทะปะธัะฝะฐ" -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "ะฝะพะฒะพัะพ ะธ ััะฐัะพัะพ ะฟะพะดะฐะฒะฐะฝะต ัะฐ ะตะดะฝะพ ะธ ัััะพ: โ%sโ" -#: builtin/replace.c:525 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -19186,71 +21070,71 @@ msgstr "" "ัะปะตะดะฝะธัะต ะฟัะธัะฐะดะบะธ ะฝะต ะผะพะณะฐั ะดะฐ ัะต ะฟัะตะพะฑัะฐะทัะฒะฐั:\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฟะธััะบะฐ ั ัะบะฐะทะฐัะตะปะธัะต ะทะฐ ะทะฐะผัะฝะฐ" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะทะฐ ะทะฐะผัะฝะฐ" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ัััะตััะฒัะฒะฐั ะพะฑะตะบั" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "ัะผัะฝะฐ ะฝะฐ ัะพะดะธัะตะปะธัะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/replace.c:550 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "ะฟัะตะพะฑัะฐะทัะฒะฐะฝะต ะฝะฐ ัะฐะนะปะฐ ะทะฐ ะฟัะธัะฐะดะบะธัะต" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "ะทะฐะผัะฝะฐ ะฝะฐ ัะบะฐะทะฐัะตะปั, ะฐะบะพ ัััะตััะฒัะฒะฐ" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "ะฑะตะท ัะพัะผะฐัะธัะฐะฝะพ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ โ ะทะฐ ะพะฟัะธััะฐ โ--editโ" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัะพะทะธ ะคะะ ะะะข" -#: builtin/replace.c:567 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "ะพะฟัะธััะฐ โ--formatโ ะธะทะธัะบะฒะฐ ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฟะธััะบ" -#: builtin/replace.c:575 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "ะพะฟัะธััะฐ โ-fโ ะธะทะธัะบะฒะฐ ะทะฐะฟะฐะทะฒะฐะฝะตัะพ ะฝะฐ ะทะฐะผะตััะธัะตะป" -#: builtin/replace.c:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "ะพะฟัะธััะฐ โ--rawโ ะธะทะธัะบะฒะฐ โ--editโ" -#: builtin/replace.c:585 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "ะพะฟัะธััะฐ โ-dโ ะธะทะธัะบะฒะฐ ะฟะพะฝะต ะตะดะธะฝ ะฐัะณัะผะตะฝั" -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฑัะพะน ะฐัะณัะผะตะฝัะธ" -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "ะพะฟัะธััะฐ โ-eโ ะธะทะธัะบะฒะฐ ะฟะพะฝะต ะตะดะธะฝ ะฐัะณัะผะตะฝั" -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "ะพะฟัะธััะฐ โ-gโ ะธะทะธัะบะฒะฐ ะฟะพะฝะต ะตะดะธะฝ ะฐัะณัะผะตะฝั" -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "ะพะฟัะธััะฐ โ--convert-graft-fileโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" -#: builtin/replace.c:615 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "ะพะฟัะธััะฐ โ-lโ ะฟัะธะตะผะฐ ัะพัะฝะพ ะตะดะธะฝ ัะฐะฑะปะพะฝ" @@ -19278,117 +21162,130 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ะะะะะะะะ]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] ะฃะะะะะขะะ_ะะชะ_ะะชะ ะะ [--] ะะชะขะะฉะโฆ" +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "git reset [-q] [ะฃะะะะะขะะ_ะะชะ_ะะชะ ะะ] [--] ะะชะขะะฉะโฆ" #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +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:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "ัะผะตัะตะฝะพ (mixed)" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "ะผะตะบะพ (soft)" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "ะฟัะปะฝะพ (hard)" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "ัะปััะพ (merge)" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "ะทะฐะฟะฐะทะฒะฐัะพ (keep)" -#: builtin/reset.c:81 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะต ะฟะพะฒัะตะดะตะฝ." -#: builtin/reset.c:83 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "ะััะฒะพัะพ, ัะพัะตะฝะพ ะพั ัะบะฐะทะฐัะตะปั โHEADโ, ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะพ." -#: builtin/reset.c:89 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "ะััะฒะพัะพ, ัะพัะตะฝะพ ะพั โ%sโ, ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธัะพ." -#: builtin/reset.c:193 +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ัะพัะธ ะบัะผ โ%sโ" + +#: builtin/reset.c:195 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒัััะธ %s ะทะฐะฝัะปัะฒะฐะฝะต ะฟะพ ะฒัะตะผะต ะฝะฐ ัะปะธะฒะฐะฝะต." -#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "ะฟะพ-ะผะฐะปะบะพ ะฟะพะดัะพะฑะฝะพััะธ, ะดะฐ ัะต ะธะทะฒะตะถะดะฐั ัะฐะผะพ ะณัะตัะบะธัะต" -#: builtin/reset.c:295 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "ะธะฝะดะตะบัะฐ ะธ ัะบะฐะทะฐัะตะปั โHEADโ, ะฑะตะท ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: builtin/reset.c:296 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "ัะฐะผะพ ัะบะฐะทะฐัะตะปั โHEADโ, ะฑะตะท ะธะฝะดะตะบัะฐ ะธ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "ัะบะฐะทะฐัะตะปั โHEADโ, ะธะฝะดะตะบัะฐ ะธ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: builtin/reset.c:302 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "ะทะฐะฝัะปัะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปั โHEADโ, ะฝะพ ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะปะพะบะฐะปะฝะธัะต ะฟัะพะผะตะฝะธ" -#: builtin/reset.c:308 +#: builtin/reset.c:310 msgid "record only the fact that removed paths will be added later" msgstr "" "ะพัะฑะตะปัะทะฒะฐะฝะต ัะฐะผะพ ะฝะฐ ัะฐะบัะฐ, ัะต ะธะทััะธัะธัะต ะฟััะธัะฐ ัะต ะฑัะดะฐั ะดะพะฑะฐะฒะตะฝะธ ะฟะพ-ะบััะฝะพ" -#: builtin/reset.c:326 +#: builtin/reset.c:344 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "ะกัะพะนะฝะพัััะฐ โ%sโ ะฝะต ะต ัะฐะทะฟะพะทะฝะฐัะฐ ะบะฐัะพ ัััะตััะฒัะฒะฐัะฐ ะฒะตััะธั." -#: builtin/reset.c:334 +#: builtin/reset.c:352 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "โ%sโ ะฝะต ะต ัะฐะทะฟะพะทะฝะฐั ะบะฐัะพ ะดััะฒะพ." -#: builtin/reset.c:343 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -"ะพะฟัะธััะฐ โ--patchโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะฒััะบะฐ ะพั ะพะฟัะธะธัะต โ--hard/--mixed/--softโ" +"ะพะฟัะธััะฐ โ--patchโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะฒััะบะฐ ะพั ะพะฟัะธะธัะต โ--hardโ/โ--mixedโ/โ--" +"softโ" -#: builtin/reset.c:353 +#: builtin/reset.c:371 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "ะพะฟัะธััะฐ โ--mixedโ ะฝะต ะฑะธะฒะฐ ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ะทะฐะตะดะฝะพ ั ะฟััะธัะฐ. ะะผะตััะพ ัะพะฒะฐ " "ะธะทะฟัะปะฝะตัะต โgit reset -- ะะชะขโฆโ." -#: builtin/reset.c:355 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "ะะต ะผะพะถะต ะดะฐ ะธะทะฒัััะธัะต %s ะทะฐะฝัะปัะฒะฐะฝะต, ะบะพะณะฐัะพ ััะต ะทะฐะดะฐะปะธ ะะชะข." -#: builtin/reset.c:370 +#: builtin/reset.c:388 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "ะ ะณะพะปะพ ั ัะฐะฝะธะปะธัะต ะฝะต ะผะพะถะต ะดะฐ ะธะทะฒัััะธัะต %s ะทะฐะฝัะปัะฒะฐะฝะต" -#: builtin/reset.c:374 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" -msgstr "ะะฟัะธััะฐ โ-Nโ ะต ััะฒะผะตััะธะผะฐ ัะฐะผะพ ั โ--mixedโ" +msgstr "ะะฟัะธััะฐ โ-Nโ ะธะทะธัะบะฒะฐ ะพะฟัะธััะฐ โ--mixedโ" -#: builtin/reset.c:395 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "ะัะพะผะตะฝะธ ะธะทะฒัะฝ ะธะฝะดะตะบัะฐ ัะปะตะด ะทะฐะฝัะปัะฒะฐะฝะตัะพ:" -#: builtin/reset.c:398 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -19401,53 +21298,48 @@ msgstr "" "ะะฟัะธััะฐ โ--quietโ ะทะฐะณะปััะฐะฒะฐ ัะพะฒะฐ ััะพะฑัะตะฝะธะต ะตะดะฝะพะบัะฐัะฝะพ. ะะฐ ะฟะพััะพัะฝะฝะพ\n" "ะทะฐะณะปััะฐะฒะฐะฝะต ะทะฐะดะฐะนัะต ะฝะฐัััะพะนะบะฐัะฐ โreset.quietโ ะดะฐ ะต โtrueโ (ะธััะธะฝะฐ).\n" -#: builtin/reset.c:408 +#: builtin/reset.c:434 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "ะะฝะดะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฝัะปะตะฝ ะบัะผ ะฒะตััะธั โ%sโ." -#: builtin/reset.c:412 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "ะะพะฒะธัั ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะธัะฐะฝ." -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "ะพะฟัะธะธัะต โ--exclude-promisor-objectsโ ะธ โ--missingโ ะธ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "ัะธะปััะธัะฐะฝะตัะพ ะฝะฐ ะพะฑะตะบัะธ ะธะทะธัะบะฒะฐ ะพะฟัะธััะฐ โ--objectsโ" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "ะฝะตะฟัะฐะฒะธะปะฝะฐ ัะฐััะธัะฝะฐ ััะพะนะฝะพัั: %s" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "ะบะพะผะฐะฝะดะฐัะฐ โrev-listโ ะฝะต ะฟะพะดะดััะถะฐ ะธะทะฒะตะถะดะฐะฝะตัะพ ะฝะฐ ะฑะตะปะตะถะบะธ" -#: builtin/rev-list.c:530 -msgid "cannot combine --use-bitmap-index with object filtering" -msgstr "ะพะฟัะธััะฐ โ--use-bitmap-indexโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ัะธะปััะธัะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต" +#: builtin/rev-list.c:615 +msgid "marked counting is incompatible with --objects" +msgstr "ะพะฟัะธััะฐ โ--objectsโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะธะทะฑัะพัะฒะฐะฝะตัะพ" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [ะะะฆะะฏโฆ] -- [ะะ ะะฃะะะะขโฆ]" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "ะทะฐะดะฐะดะตะฝะธัั ะฝะธะท โ--โ ะดะฐ ัะต ััะปะบัะฒะฐ ะบะฐัะพ ะฐัะณัะผะตะฝั" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "ัะฟะธัะฐะฝะต ะฝะฐ ะฐะฝะฐะปะธะทะฐ ัะปะตะด ะฟััะฒะธั ะฐัะณัะผะตะฝั, ะบะพะนัะพ ะฝะต ะต ะพะฟัะธั" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "ะธะทั ะพะด ะฒ ะดัะปะณะธั ัะพัะผะฐั" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -19597,40 +21489,44 @@ msgid_plural "the following files have local modifications:" msgstr[0] "ัะปะตะดะฝะธัั ัะฐะนะป ะต ั ะฟัะพะผะตะฝะตะฝะพ ััะดััะถะฐะฝะธะต" msgstr[1] "ัะปะตะดะฝะธัะต ัะฐะนะปะพะฒะต ัะฐ ั ะฟัะพะผะตะฝะตะฝะพ ััะดััะถะฐะฝะธะต" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "ะดะฐ ะฝะต ัะต ะธะทะฒะตะถะดะฐั ะธะทััะธัะธัะต ัะฐะนะปะพะฒะต" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "ะธะทััะธะฒะฐะฝะต ัะฐะผะพ ะพั ะธะฝะดะตะบัะฐ" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "ะฒัะฟัะตะบะธ ะฟัะพะฒะตัะบะฐัะฐ ะทะฐ ะฐะบััะฐะปะฝะพัััะฐ ะฝะฐ ััะดััะถะฐะฝะธะตัะพ" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "ัะตะบัััะธะฒะฝะพ ะธะทััะธะฒะฐะฝะต" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "" "ะธะทั ะพะดะฝะธัั ะบะพะด ะดะฐ ะต 0, ะดะพัะธ ะฐะบะพ ะฝะธะบะพะน ัะฐะนะป ะฝe e ะฝะฐะฟะฐัะฝะฐะป ั ัะฐะฑะปะพะฝะฐ ะทะฐ " "ะธะทััะธะฒะฐะฝะต" -#: builtin/rm.c:289 +#: 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โ ะฒ ะธะฝะดะตะบัะฐ,\n" "ะธะปะธ ะณะธ ัะบะฐัะฐะนัะต" -#: builtin/rm.c:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "ะฑะตะท ะธะทะฟะพะปะทะฒะฐะฝะตัะพ ะฝะฐ ะพะฟัะธััะฐ โ-rโ โ%sโ ะฝัะผะฐ ะดะฐ ัะต ะธะทััะธะต ัะตะบัััะธะฒะฝะพ" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทััะธะต" @@ -19646,57 +21542,78 @@ msgstr "" "pack=ะะะะะข] [--verbose] [--thin] [--atomic] [ะฅะะกะข:]ะะะ ะะะขะะ ะะฏ [ะฃะะะะะขะะโฆ]\n" " ะพะฟัะธััะฐ โ--allโ ะธ ะธะทัะธัะฝะพัะพ ะฟะพัะพัะฒะฐะฝะต ะฝะฐ ะฃะะะะะขะะ ัะฐ ะฒะทะฐะธะผะฝะพ ะฝะตััะฒะผะตััะธะผะธ." -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:182 msgid "remote name" msgstr "ะธะผะต ะฝะฐ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:195 msgid "use stateless RPC protocol" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฟัะพัะพะบะพะป ะฑะตะท ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ััััะพัะฝะธะตัะพ ะทะฐ RPC" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:196 msgid "read refs from stdin" msgstr "ัะตัะตะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะพั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:197 msgid "print status from remote helper" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััััะพัะฝะธะตัะพ ะพั ะพัะดะฐะปะตัะตะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ััะฝะบัะธั" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:15 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [ะะะฆะะฏโฆ] [ะะะะะะะะ_ะะ_ะะะ ะกะะะขะ] [[--] [ะะชะขโฆ]]" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [ะะะฆะะฏโฆ]" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:134 +msgid "using multiple --group options with stdin is not supported" +msgstr "ะฟะพะฒะตัะต ะพั ะตะดะฝะฐ ะพะฟัะธะธ โ--groupโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ััั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" + +#: builtin/shortlog.c:144 +msgid "using --group=trailer with stdin is not supported" +msgstr "ะพะฟัะธััะฐ โ--group=trailerโ ะต ะฝะตััะฒะผะตััะธะผะฐ ััั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" + +#: builtin/shortlog.c:388 +#, c-format +msgid "unknown group type: %s" +msgstr "ะฝะตะธะทะฒะตััะตะฝ ะฒะธะด ะณััะฟะฐ: %s" + +#: builtin/shortlog.c:416 msgid "Group by committer rather than author" msgstr "ะััะฟะธัะฐะฝะต ะฟะพ ะฟะพะดะฐะฒะฐั, ะฐ ะฝะต ะฟะพ ะฐะฒัะพั" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:419 msgid "sort output according to the number of commits per author" msgstr "ะฟะพะดัะตะดะฑะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฟะพ ะฑัะพั ะฟะพะดะฐะฒะฐะฝะธั ะพั ะฐะฒัะพั" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:421 msgid "Suppress commit descriptions, only provides commit count" msgstr "ะะตะท ะพะฟะธัะฐะฝะธั ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ โ ะดะฐ ัะต ะฟะพะบะฐะทะฒะฐ ัะฐะผะพ ะฑัะพั ะฟะพะดะฐะฒะฐะฝะธั" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:423 msgid "Show the email address of each author" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฐะดัะตัะฐ ะฝะฐ ะต-ะฟะพัะฐ ะทะฐ ะฒัะตะบะธ ะฐะฒัะพั" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:424 msgid "<w>[,<i1>[,<i2>]]" msgstr "<ะจะะ ะะงะะะ>[,<ะะขะกะขะชะ_1>[,<ะะขะกะขะชะ_2>]]" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:425 msgid "Linewrap output" msgstr "" "ะัะตะฝะฐััะฝะต ะฝะฐ ัะตะดะพะฒะตัะต ะดะพ ัะฐะทะธ ะพะฑัะฐ ะจะะ ะะงะะะ (76), ั ะะขะกะขะชะ_1 (6) ะทะฐ ะฟััะฒะธั " "ัะตะด ะธ ะะขะกะขะชะ_2 (9) ะทะฐ ะพััะฐะฝะฐะปะธัะต" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:427 +msgid "field" +msgstr "ะฟะพะปะต" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "ะััะฟะธัะฐะฝะต ะฟะพ ะฟะพะปะต" + +#: builtin/shortlog.c:456 msgid "too many arguments given outside repository" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฐัะณัะผะตะฝัะธ ะธะทะฒัะฝ ั ัะฐะฝะธะปะธัะต" @@ -19838,6 +21755,14 @@ msgstr "โ%sโ ะต ะฝะตะฟัะฐะฒะธะปะตะฝ ัะบะฐะทะฐัะตะป." msgid "cannot find commit %s (%s)" msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ (%s) ะปะธะฟัะฒะฐ" +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "ะฐะปะณะพัะธััะผ" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "ะะตะฟะพะทะฝะฐั ะฐะปะณะพัะธััะผ ะทะฐ ะบะพะฝััะพะปะฝะธ ััะผะธ" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -19886,15 +21811,89 @@ msgstr "" "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะฟัะธะตัะธ ะพั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด, ะบะพะธัะพ ะปะธะฟัะฒะฐั ะฒ " "ะปะพะบะฐะปะฝะพัะพ ั ัะฐะฝะธะปะธัะต" -#: builtin/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|reapply|disable) ะะะฆะะฏโฆ" + +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:76 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "" +"ัะพะฒะฐ ะฝะต ะต ัะฐััะธัะฝะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ (ะฒะตัะพััะฝะพ ะปะธะฟัะฒะฐ ัะฐะนะป โsparse-checkoutโ)" + +#: builtin/sparse-checkout.c:228 +msgid "failed to create directory for sparse-checkout file" +msgstr "ะดะธัะตะบัะพัะธััะฐ ะทะฐ ัะฐััะธัะฝะพ ะธะทัะตะณะปัะฝะต โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝะฐ" + +#: builtin/sparse-checkout.c:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "" +"ะฝะฐัััะพะนะบะฐัะฐ โworktreeConfigโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฒะบะปััะธ, ะทะฐัะพัะพ ัะพัะผะฐััั ะฝะฐ " +"ั ัะฐะฝะธะปะธัะตัะพ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฑะฝะพะฒะธ" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "ะฝะตััะฟะตัะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะฝะฐัััะพะนะบะฐัะฐ โextensions.worktreeConfigโ" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "ะธะฝะธัะธะฐะปะธะทะธัะฐะฝะต ะฝะฐ ัะฐััะธัะฝะพัะพ ะธะทัะตะณะปัะฝะต ะฒ ะฟััะตะฒะพะดะตะฝ ัะตะถะธะผ" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ" + +#: builtin/sparse-checkout.c:401 +#, c-format +msgid "could not normalize path %s" +msgstr "ะฟัััั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฝะพัะผะฐะปะธะทะธัะฐ" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | ะจะะะะะโฆ)" + +#: builtin/sparse-checkout.c:438 +#, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "ัะธัะธัะฐะฝะตัะพ ะฝะฐ ะฝะธะท, ัะพัะผะฐัะธัะฐะฝ ะทะฐ C โ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทัะธััะตะฝะพ" + +#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +msgid "unable to load existing sparse-checkout patterns" +msgstr "ัะฐะฑะปะพะฝะธัะต ะทะฐ ัะฐััะธัะฝะพ ะธะทัะตะณะปัะฝะต ะฝะต ะผะพะณะฐั ะดะฐ ัะต ะทะฐัะตะดัั" + +#: builtin/sparse-checkout.c:561 +msgid "read patterns from standard in" +msgstr "ะธะทัะธัะฐะฝะต ะฝะฐ ัะฐะฑะปะพะฝะธัะต ะพั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" + +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:623 +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:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [ะะะฆะะฏโฆ] [ะกะะะขะะะ]" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [ะกะะะขะะะ]" @@ -19902,25 +21901,27 @@ 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:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch ะะะะ [ะกะะะขะะะ]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: 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:31 builtin/stash.c:84 +#: 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>]" @@ -19928,191 +21929,203 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [ะกะชะะะฉะะะะ]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [ะกะะะขะะะ]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [ะกะะะขะะะ]" -#: builtin/stash.c:72 +#: 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:127 +#: 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:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "ะฃะบะฐะทะฐะฝะธ ัะฐ ะฟัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฒะตััะธะธ:%s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "ะะต ะต ะพัะบัะธัะพ ะฝะธัะพ ัะบะฐัะฐะฝะพ." -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "โ%sโ ะต ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะทะฐ ัะบะฐะทะฐัะตะป" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "ะบะพะผะฐะฝะดะฐัะฐ โgit stash clearโ ะฝะต ะฟะพะดะดััะถะฐ ะฐัะณัะผะตะฝัะธ" -#: builtin/stash.c:403 +#: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" msgstr "ะฟะพ ะฒัะตะผะต ะฝะฐ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฟัะธะปะพะถะธัะต ะฝะตัะพ ัะบะฐัะฐะฝะพ" -#: builtin/stash.c:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "ัะฐะนะปัั ั ัะฐะทะปะธะบะธัะต โ%s^!โ ะฝะต ะผะพะถะต ะดะฐ ัะต ะณะตะฝะตัะธัะฐ" -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "" "ะฒ ะธะฝะดะตะบัะฐ ะธะผะฐ ะบะพะฝัะปะธะบัะธ. ะัะพะฑะฒะฐะนัะต ะดะฐ ะธะทะฟัะปะฝะธัะต ะบะพะผะฐะฝะดะฐัะฐ ะฑะตะท ะพะฟัะธััะฐ โ--" "indexโ." -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "ะดััะฒะพัะพ ัะพัะตะฝะพ ะพั ะธะฝะดะตะบัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝะพ" -#: builtin/stash.c:434 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฝะต ะผะพะณะฐั ะดะฐ ัะต ะฒัะทััะฐะฝะพะฒัั ะพั ัะบะฐัะฐะฝะพัะพ" -#: builtin/stash.c:448 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "ะกะปะธะฒะฐะฝะต ะฝะฐ โ%sโ ั โ%sโ" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "ะะฝะดะตะบััั ะฝะต ะต ะธะทะฒะฐะดะตะฝ ะพั ัะบะฐัะฐะฝะพัะพ." -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "ะพะฟะธั ะทะฐ ะฟะพะฒัะพัะฝะพ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "ะะทััะธัะพ: โ%sโ (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "ะกะบะฐัะฐะฝะพัะพ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธัะพ" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "โ%sโ ะฝะต ะต ัะบะฐะทะฐัะตะป ะบัะผ ะฝะตัะพ ัะบะฐัะฐะฝะพ" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 msgid "The stash entry is kept in case you need it again." msgstr "ะกะบะฐัะฐะฝะพัะพ ะต ะทะฐะฟะฐะทะตะฝะพ ะฒ ัะปััะฐะน, ัะต ะฒะธ ะฟะพัััะฑะฒะฐ ะพัะฝะพะฒะพ." -#: builtin/stash.c:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "ะะต ะต ัะบะฐะทะฐะฝะพ ะธะผะต ะฝะฐ ะบะปะพะฝ" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "ะฃะบะฐะทะฐัะตะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ ะดะฐ ัะพัะธ ะบัะผ โ%sโ" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 msgid "stash message" msgstr "ััะพะฑัะตะฝะธะต ะฟัะธ ัะบะฐัะฐะฒะฐะฝะต" -#: builtin/stash.c:818 +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" msgstr "ะบะพะผะฐะฝะดะฐัะฐ โgit stash storeโ ะธะทะธัะบะฒะฐ ัะพัะฝะพ ะตะดะธะฝ ะฐัะณัะผะตะฝั-ะะะะะะะะ" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1043 msgid "No changes selected" msgstr "ะะต ัะฐ ะธะทะฑัะฐะฝะธ ะฝะธะบะฐะบะฒะธ ะฟัะพะผะตะฝะธ" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1143 msgid "You do not have the initial commit yet" msgstr "ะัะต ะพัะต ะปะธะฟัะฒะฐ ะฟััะฒะพะฝะฐัะฐะปะฝะพ ะฟะพะดะฐะฒะฐะฝะต" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1170 msgid "Cannot save the current index state" msgstr "ะกัััะพัะฝะธะตัะพ ะฝะฐ ัะตะบััะธั ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝะพ" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1179 msgid "Cannot save the untracked files" msgstr "ะะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต ะฝะต ะผะพะณะฐั ะดะฐ ัะต ะทะฐะฟะฐะทัั" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1190 builtin/stash.c:1199 msgid "Cannot save the current worktree state" msgstr "ะกัััะพัะฝะธะตัะพ ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝะพ" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1227 msgid "Cannot record working tree state" msgstr "ะกัััะพัะฝะธะตัะพ ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝะพ" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1276 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "ะะฟัะธััะฐ โ--patchโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั โ--include-untrackedโ ะธ โ--allโ" -#: builtin/stash.c:1285 +#: builtin/stash.c:1292 msgid "Did you forget to 'git add'?" msgstr "ะัะพะฑะฒะฐะนัะต ะดะฐ ะธะทะฟะพะปะทะฒะฐัะต โgit addโ" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1307 msgid "No local changes to save" msgstr "ะัะผะฐ ะฝะธะบะฐะบะฒะธ ะปะพะบะฐะปะฝะธ ะฟัะพะผะตะฝะธ ะทะฐ ัะบะฐัะฐะฒะฐะฝะต" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1314 msgid "Cannot initialize stash" msgstr "ะกะบะฐัะฐะฒะฐะฝะตัะพ ะฝะต ะผะพะถะต ะดะฐ ััะฐััะธัะฐ" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1329 msgid "Cannot save the current status" msgstr "ะขะตะบััะพัะพ ััััะพัะฝะธะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝะพ" -#: builtin/stash.c:1327 +#: builtin/stash.c:1334 #, c-format msgid "Saved working directory and index state %s" msgstr "ะกัััะพัะฝะธะตัะพ ะฝะฐ ัะฐะฑะพัะฝะฐัะฐ ะดะธัะตะบัะพัะธั ะธ ะธะฝะดะตะบัะฐ e ะทะฐะฟะฐะทะตะฝะพ: โ%sโ" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1424 msgid "Cannot remove worktree changes" msgstr "ะัะพะผะตะฝะธัะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะทะฐะฝัะปะตะฝะธ" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1463 builtin/stash.c:1528 msgid "keep index" msgstr "ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "stash in patch mode" msgstr "ัะบะฐัะฐะฒะฐะฝะต ะฒ ัะตะถะธะผ ะทะฐ ะบััะฟะบะธ" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "quiet mode" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "include untracked files in stash" msgstr "ัะบะฐัะฐะฒะฐะฝะต ะธ ะฝะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1470 builtin/stash.c:1535 msgid "include ignore files" msgstr "ัะบะฐัะฐะฒะฐะฝะต ะธ ะฝะฐ ะธะณะฝะพัะธัะฐะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/stash.c:1555 -#, c-format -msgid "could not exec %s" -msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ" +#: builtin/stash.c:1570 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"ะฟะพะดะดััะถะบะฐัะฐ ะฝะฐ โstash.useBuiltinโ ะต ะฟัะตะผะฐั ะฝะฐัะฐ.\n" +"ะะฐ ะฟะพะฒะตัะต ะธะฝัะพัะผะฐัะธั ะฒะธะถัะต โgit help configโ." #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -20130,41 +22143,41 @@ msgstr "ะฟัะพะฟััะบะฐะฝะต ะฝะฐ ะฒัะธัะบะธ ัะตะดะพะฒะต, ะบะพะธัะพ ะทะฐะฟะพ msgid "prepend comment character and space to each line" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ โ# โ ะฒ ะฝะฐัะฐะปะพัะพ ะฝะฐ ะฒัะตะบะธ ัะตะด" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "ะัะฐะบะฒะฐ ัะต ะฟัะปะฝะพ ะธะผะต ะฝะฐ ัะบะฐะทะฐัะตะป, ะฐ ะฝะต โ%sโ" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "" "ะบะพะผะฐะฝะดะฐัะฐ โprint-default-remoteโ ะฝะฐ โsubmodule--helperโ ะฝะต ะฟัะธะตะผะฐ ะฐัะณัะผะตะฝัะธ" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะผะฐั ะฝะต ะบะพะผะฟะพะฝะตะฝั ะพั ะฐะดัะตัะฐ โ%sโ" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "ะดะธัะตะบัะพัะธั ะทะฐ ะพะฟัะตะดะตะปัะฝะตัะพ ะฝะฐ ะพัะฝะพัะธัะตะปะฝะธัะต ะฟััะธัะฐ" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=ะะชะข] [ะะชะขโฆ]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "ะัะฒ ัะฐะนะปะฐ โ.gitmodulesโ ะฝะต ะต ะพัะบัะธั ะฐะดัะตั ะทะฐ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ%sโ" -#: builtin/submodule--helper.c:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "ะะปะธะทะฐะฝะต ะฒ โ%sโ\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -20173,7 +22186,7 @@ msgstr "" "ะธะทะฟัะปะฝะตะฝะฐัะฐ ะบะพะผะฐะฝะดะฐ ะทะฐะฒัััะธ ั ะฝะตะฝัะปะตะฒ ะธะทั ะพะด ะทะฐ โ%sโ\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -20184,19 +22197,19 @@ msgstr "" "ะฒะปะพะถะตะฝะธ ะฒ โ%sโ\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "ะะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะทั ะพะด ะฟัะธ ะฒัะฒะตะถะดะฐะฝะตัะพ ะฝะฐ ะฒััะบะฐ ะบะพะผะฐะฝะดะฐ ะทะฐ ะฟะพะดะผะพะดัะปะธ" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" msgstr "ะ ะตะบัััะธะฒะฝะพ ะพะฑั ะพะถะดะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะธัะต" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] ะะะะะะะ" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -20205,55 +22218,55 @@ msgstr "" "ะฝะฐัััะพะนะบะฐัะฐ โ%sโ ะปะธะฟัะฒะฐ. ะัะธะตะผะฐ ัะต, ัะต ัะพะฒะฐ ั ัะฐะฝะธะปะธัะต ะต ะฟัะฐะฒะธะปะฝะธัั ะธะทัะพัะฝะธะบ " "ะทะฐ ัะตะฑะต ัะธ." -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "ะะตััะฟะตัะฝะพ ัะตะณะธัััะธัะฐะฝะต ะฝะฐ ะฐะดัะตั ะทะฐ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ%sโ" -#: builtin/submodule--helper.c:669 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "ะ ะตะณะธัััะธัะฐะฝ ะต ะฟะพะดะผะพะดัะป โ%sโ (%s) ะทะฐ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ%sโ\n" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "ะะ ะะะฃะะ ะะะะะะะ: ะฟัะตะฟะพัััะฒะฐ ัะต ัะตะถะธะผ ะฝะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต ะทะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ\n" -#: builtin/submodule--helper.c:686 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "ะะตััะฟะตัะฝะพ ัะตะณะธัััะธัะฐะฝะต ะฝะฐ ัะตะถะธะผะฐ ะฝะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต ะทะฐ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ%sโ" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "ะะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั ะฟัะธ ะธะฝะธัะธะฐะปะธะทะธัะฐะฝะตัะพ ะฝะฐ ะฟะพะดะผะพะดัะป" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [ะะะฆะะฏโฆ] [ะะชะข]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "ะัะฒ ัะฐะนะปะฐ โ.gitmodulesโ ะปะธะฟัะฒะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะฟััั โ%sโ" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:835 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "ัะบะฐะทะฐัะตะปัั ัะพัะตะฝ ะพั โHEADโ ะฒ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธั" -#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "ะฝะตััะฟะตัะฝะพ ัะตะบัััะธะฒะฝะพ ะพะฑั ะพะถะดะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "ะะฐะณะปััะฐะฒะฐะฝะต ะฝะฐ ะธะทั ะพะดะฐ ะทะฐ ััััะพัะฝะธะตัะพ ะฝะฐ ะฟะพะดะผะพะดัะปะฐ" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:887 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -20261,47 +22274,104 @@ msgstr "" "ะะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ ัะบะฐะทะฐะฝะพ ะฒ ะธะฝะดะตะบัะฐ, ะฐ ะฝะต ัะพะฒะฐ ะพั ัะบะฐะทะฐัะตะปั โHEADโ ะฝะฐ " "ะฟะพะดะผะพะดัะปะฐ" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" msgstr "ัะตะบัััะธะฒะฝะพ ะพะฑั ะพะถะดะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะธัะต" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [ะะชะขโฆ]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name ะะชะข" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "โ %s %s(ะพะฑะตะบั-BLOB)โ%s(ะฟะพะดะผะพะดัะป)" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "โ %s %s(ะฟะพะดะผะพะดัะป)โ%s(ะพะฑะตะบั-BLOB)" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "ะฝะตััะฟะตัะฝะพ ะธะทัะธัะปัะฒะฐะฝะต ะฝะฐ ะบะพะฝััะพะปะฝะฐัะฐ ััะผะฐ ะฝะฐ ะพะฑะตะบั ะพั โ%sโ" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "ะฝะตะพัะฐะบะฒะฐะฝ ัะตะถะธะผ โ%oโ\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "" +"ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ ัะบะฐะทะฐะฝะพ ะฒ ะธะฝะดะตะบัะฐ, ะฐ ะฝะต ัะพะฒะฐ ะพั ัะบะฐะทะฐัะตะปั โHEADโ ะฝะฐ " +"ะฟะพะดะผะพะดัะปะฐ" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" +"ะทะฐ ััะฐะฒะฝะตะฝะธะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ ัะบะฐะทะฐะฝะพ ะฒ ะธะฝะดะตะบัะฐ ั ัะพะฒะฐ ะพั ัะบะฐะทะฐัะตะปั โHEADโ ะฝะฐ " +"ะฟะพะดะผะพะดัะปะฐ" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "ะฟัะตัะบะฐัะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะธ, ัะธััะพ ะฝะฐัััะพะนะบะฐ โignore_configโ ะต โallโ" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "ะพะณัะฐะฝะธัะฐะฒะฐะฝะต ะฝะฐ ัะฐะทะผะตัะฐ ะฝะฐ ะพะฑะพะฑัะตะฝะธะตัะพ" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule--helper summary [ะะะฆะะฏโฆ] [ะะะะะะะะ] -- [ะะชะข]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพััะฐะฒะธ ะฒะตััะธั ะทะฐ โHEADโ" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "ะพะฟัะธะธัะต โ--cachedโ ะธ โ--filesโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "ะกะธะฝั ัะพะฝะธะทะธัะฐะฝะต ะฝะฐ ะฐะดัะตัะฐ ะฝะฐ ะฟะพะดะผะพะดัะป ะทะฐ โ%sโ\n" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "ะฝะตััะฟะตัะฝะพ ัะตะณะธัััะธัะฐะฝะต ะฝะฐ ะฐะดัะตั ะทะฐ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ%sโ" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "ะพัะดะฐะปะตัะตะฝะธัั ะฐะดัะตั ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะปััะตะฝ" -#: builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "ะพัะดะฐะปะตัะตะฝะธัั ะฐะดัะตั ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพะผะตะฝะตะฝ" -#: builtin/submodule--helper.c:1048 +#: builtin/submodule--helper.c:1485 msgid "Suppress output of synchronizing submodule url" msgstr "ะะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั ะฟัะธ ัะธะฝั ัะพะฝะธะทะธัะฐะฝะตัะพ ะฝะฐ ะฟะพะดะผะพะดัะป" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [ะะชะข]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20310,7 +22380,7 @@ msgstr "" "ะ ะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฝะฐ ะฟะพะดะผะพะดัะป โ%sโ ััะดััะถะฐ ะดะธัะตะบัะพัะธั โ.gitโ.\n" "(ะฐะบะพ ะธัะบะฐัะต ะดะฐ ะณะธ ะธะทััะธะตัะต ะทะฐะตะดะฝะพ ั ััะปะฐัะฐ ะธะผ ะธััะพัะธั, ะธะทะฟะพะปะทะฒะฐะนัะต โrm -rfโ)" -#: builtin/submodule--helper.c:1121 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -20319,180 +22389,209 @@ msgstr "" "ะ ะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฝะฐ ะฟะพะดะผะพะดัะป โ%sโ ััะดััะถะฐ ะปะพะบะฐะปะฝะธ ะฟัะพะผะตะฝะธ. ะะพะถะตัะต ะดะฐ ะณะธ " "ะพัั ะฒััะปะธัะต ั ะพะฟัะธััะฐ โ-fโ" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "ะะธัะตะบัะพัะธััะฐ โ%sโ ะต ะธะทัะธััะตะฝะฐ\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "" "ะะธัะตะบัะพัะธััะฐ ะบัะผ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธัะฐ\n" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "ะฟัะฐะทะฝะฐัะฐ ะดะธัะตะบัะพัะธั ะทะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝะฐ" -#: builtin/submodule--helper.c:1158 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "ะ ะตะณะธัััะฐัะธััะฐ ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ (%s) ะทะฐ ะฟััั โ%sโ ะต ะฟัะตะผะฐั ะฝะฐัะฐ\n" -#: builtin/submodule--helper.c:1187 +#: builtin/submodule--helper.c:1624 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "ะะทััะธะฒะฐะฝะต ะฝะฐ ัะฐะฑะพัะฝะธัะต ะดััะฒะตัะฐ ะฝะฐ ะฟะพะดะผะพะดัะปะธัะต, ะดะพัะธ ะบะพะณะฐัะพ ัะต ััะดััะถะฐั " "ะปะพะบะฐะปะฝะธ ะฟัะพะผะตะฝะธ" -#: builtin/submodule--helper.c:1188 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "ะัะตะผะฐั ะฒะฐะฝะต ะฝะฐ ัะตะณะธัััะฐัะธะธัะต ะฝะฐ ะฒัะธัะบะธ ะฟะพะดะผะพะดัะปะธ" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ะะชะขโฆ]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "ะะทะฟะพะปะทะฒะฐะนัะต โ--allโ, ะทะฐ ะดะฐ ะฟัะตะผะฐั ะฝะตัะต ะฒัะธัะบะธ ะฟะพะดะผะพะดัะปะธ" -#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1713 +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:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "ะบัะผ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะดะพะฑะฐะฒะธ ะฐะปัะตัะฝะฐัะธะฒะตะฝ ะธะทัะพัะฝะธะบ: %s" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "ะะตะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั โ%sโ ะทะฐ ะฝะฐัััะพะนะบะฐัะฐ โsubmodule.alternateErrorStrategyโ" -#: builtin/submodule--helper.c:1348 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "ะะตะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั โ%sโ ะทะฐ ะฝะฐัััะพะนะบะฐัะฐ โsubmodule.alternateLocationโ" -#: builtin/submodule--helper.c:1371 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "ะบัะดะต ะดะฐ ัะต ะบะปะพะฝะธัะฐ ะฝะพะฒะธัั ะฟะพะดะผะพะดัะป" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "ะธะผะต ะฝะฐ ะฝะพะฒะธั ะฟะพะดะผะพะดัะป" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "ะฐะดัะตั, ะพั ะบะพะนัะพ ะดะฐ ัะต ะบะปะพะฝะธัะฐ ะฝะพะฒะธัั ะฟะพะดะผะพะดัะป" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "ะดัะปะฑะพัะธะฝะฐ ะฝะฐ ะฟะปะธัะบะธัะต ั ัะฐะฝะธะปะธัะฐ" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟัะตะดัะบะฐ ะฝะฐ ะบะปะพะฝะธัะฐะฝะตัะพ" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +msgid "disallow cloning into non-empty directory" +msgstr "ะฟัะตะดะพัะฒัะฐััะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะธัะฐะฝะต ะฒ ะฝะตะฟัะฐะทะฝะฐ ะธััะพัะธั" + +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=ะะชะข] [--quiet] [--reference ะฅะ ะะะะะะฉะ] " -"[--name ะะะ] [--depth ะะชะะะะงะะะ] --url ะะะ ะะก --path ะะชะขโฆ" +"[--name ะะะ] [--depth ะะชะะะะงะะะ] [--single-branch] --url ะะะ ะะก --path ะะชะข" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1873 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "" +"โ%sโ ะฝะต ะผะพะถะต ะฝะธัะพ ะดะฐ ัะต ััะทะดะฐะดะต, ะฝะธัะพ ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะฒ ะดะธัะตะบัะพัะธััะฐ ะฝะฐ git ะฝะฐ " +"ะดััะณ ะฟะพะดะผะพะดัะป" + +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "ะะตััะฟะตัะฝะพ ะบะปะพะฝะธัะฐะฝะต ะฝะฐ ะฐะดัะตัะฐ โ%sโ ะฒ ะฟััั โ%sโ ะบะฐัะพ ะฟะพะดะผะพะดัะป" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "ะดะธัะตะบัะพัะธััะฐ ะฝะต ะต ะฟัะฐะทะฝะฐ: โ%sโ" + +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "ะดะธัะตะบัะพัะธััะฐ ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟะพะปััะตะฝะฐ" -#: builtin/submodule--helper.c:1474 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "ะะตะฟัะฐะฒะธะปะตะฝ ัะตะถะธะผ ะฝะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต โ%sโ ะทะฐ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ%sโ" -#: builtin/submodule--helper.c:1478 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "ะะฐัััะพะตะฝ ะต ะฝะตะฟัะฐะฒะธะปะตะฝ ัะตะถะธะผ ะฝะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต โ%sโ ะทะฐ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ%sโ" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "ะัััั ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะฝะต ะต ะธะฝะธัะธะฐะปะธะทะธัะฐะฝ" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "ะะตัะพััะฝะพ ะธัะบะฐั ัะต ะดะฐ ะธะทะฟะพะปะทะฒะฐัะต โupdate --initโ?" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "ะัะตัะบะฐัะฐะฝะต ะฝะฐ ะฝะตัะปะตัะธั ะฟะพะดะผะพะดัะป โ%sโ" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "ะัะตัะบะฐัะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "ะะตััะฟะตัะตะฝ ะพะฟะธั ะทะฐ ะบะปะพะฝะธัะฐะฝะต ะฝะฐ โ%sโ. ะะฐััะพัะตะฝ ะต ะฒัะพัะธ ะพะฟะธั" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" "ะัะพัะธ ะฝะตััะฟะตัะตะฝ ะพะฟะธั ะทะฐ ะบะปะพะฝะธัะฐะฝะต ะฝะฐ โ%sโ. ะะตะนััะฒะธะตัะพ ัะต ะฟัะตัััะฐะฝะพะฒัะฒะฐ" -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "ะฟัั ะบัะผ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "ะฟัั ะบัะผ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ, ะฟัะตะท ะณัะฐะฝะธัะธัะต ะฝะฐ ะฒะปะพะถะตะฝะธัะต ะฟะพะดะผะพะดัะปะธ" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "" "โrebaseโ (ะฟัะตะฑะฐะทะธัะฐะฝะต), โmergeโ (ัะปะธะฒะฐะฝะต), โcheckoutโ (ะธะทัะตะณะปัะฝะต) ะธะปะธ " "โnoneโ (ะฝะธัะพ ะดะฐ ะฝะต ัะต ะฟัะฐะฒะธ)" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:2340 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "ะะปะธัะบะพ ะบะปะพะฝะธัะฐะฝะต, ะพัััะทะฐะฝะพ ะดะพ ัะบะฐะทะฐะฝะธั ะฑัะพะน ะฒะตััะธะธ" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "ะฑัะพะน ะฟะฐัะฐะปะตะปะฝะธ ะฟัะพัะตัะธ" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "ะดะฐะปะธ ะฟััะฒะพะฝะฐัะฐะปะฝะพัะพ ะบะปะพะฝะธัะฐะฝะต ะดะฐ ะต ะฟะปะธัะบะพ, ะบะฐะบัะพ ัะต ะฟัะตะฟะพัััะฒะฐ" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "ะฑะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะฐะฟัะตะดัะบะฐ ะฝะฐ ะบะปะพะฝะธัะฐะฝะตัะพ" -#: 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:2357 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=ะะชะข] [ะะชะขโฆ]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฟะฐัะฐะผะตััั ะบัะผ ะพะฟัะธััะฐ โ--updateโ" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -20501,50 +22600,83 @@ msgstr "" "ะะปะพะฝัั ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ ะต ะฝะฐัััะพะตะฝ ะดะฐ ะฝะฐัะปะตะดัะฒะฐ ะบะปะพะฝะฐ ะพั ะพะฑั ะฒะฐัะฐัะธั ะฟัะพะตะบั, " "ะฝะพ ัะพะน ะฝะต ะต ะฝะฐ ะฝะธะบะพะน ะบะปะพะฝ" -#: builtin/submodule--helper.c:2061 +#: builtin/submodule--helper.c:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปััะธ ะฒััะทะบะฐ ะบัะผ ั ัะฐะฝะธะปะธัะต ะทะฐ ะฟะพะดะผะพะดัะปะฐ โ%sโ" -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "ัะตะบัััะธะฒะฝะพ ะพะฑั ะพะถะดะฐะฝะต ะฟะพะดะผะพะดัะปะธัะต" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [ะะะฆะะฏโฆ] [ะะชะขโฆ]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "ะฟัะพะฒะตัะบะฐ ะดะฐะปะธ ะฟะธัะฐะฝะตัะพ ะฒัะฒ ัะฐะนะปะฐ โ.gitmodulesโ ะต ะฑะตะทะพะฟะฐัะฝะพ" -#: builtin/submodule--helper.c:2159 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ ะฝะฐัััะพะนะบะฐ ะฒัะฒ ัะฐะนะปะฐ โ.gitmodulesโ" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config ะะะ [ะกะขะะะะะกะข]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset ะะะ" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "ัะฐะนะปัั โ.gitmodulesโ ัััะฑะฒะฐ ะดะฐ ะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2681 +msgid "Suppress output for setting url of a submodule" +msgstr "ะะตะท ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั ะฟัะธ ะทะฐะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฐะดัะตัะฐ ะฝะฐ ะฟะพะดะผะพะดัะป" + +#: builtin/submodule--helper.c:2685 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper set-url [--quiet] [ะะชะข] [ะะะ_ะะชะข]" + +#: builtin/submodule--helper.c:2718 +msgid "set the default tracking branch to master" +msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ััะฐะฝะดะฐััะฝะธั ัะปะตะดัั ะบะปะพะฝ ะดะฐ ะต โmasterโ" + +#: builtin/submodule--helper.c:2720 +msgid "set the default tracking branch" +msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ััะฐะฝะดะฐััะฝะธั ัะปะตะดัั ะบะปะพะฝ" + +#: builtin/submodule--helper.c:2724 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) ะะชะข" + +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule--helper set-branch [-q|--quiet] (-b|--branch) ะะะะ ะะชะข" + +#: builtin/submodule--helper.c:2732 +msgid "--branch or --default required" +msgstr "ะฝะตะพะฑั ะพะดะธะผะพ ะต ะตะดะฝะฐ ะพั ะพะฟัะธะธัะต โ--branchโ ะธ โ--defaultโ" + +#: builtin/submodule--helper.c:2735 +msgid "--branch and --default are mutually exclusive" +msgstr "ะพะฟัะธะธัะต โ--branchโ ะธ โ--defaultโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 #, c-format msgid "%s doesn't support --super-prefix" msgstr "โ%sโ ะฝะต ะฟะพะดะดััะถะฐ ะพะฟัะธััะฐ โ--super-prefixโ" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "โ%sโ ะฝะต ะต ะฟะพะดะบะพะผะฐะฝะดะฐ ะฝะฐ โsubmodule--helperโ" @@ -20569,11 +22701,11 @@ msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ ัะธะผะฒะพะปะตะฝ ัะบะฐะทะฐัะตะป" msgid "shorten ref output" msgstr "ะบัะฐัะบะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ัะบะฐะทะฐัะตะปั" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "ะฟัะธัะธะฝะฐ" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "ะฟัะธัะธะฝะฐ ะทะฐ ะพะฑะฝะพะฒัะฒะฐะฝะตัะพ" @@ -20593,10 +22725,12 @@ msgstr "git tag -d ะะขะะะะขโฆ" msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" -"git tag -l [-n[ะะ ะะ]] [--contains ะะะะะะะะ] [--points-at ะะะะะข]\n" -" [--format=ะคะะ ะะะข] [--[no-]merged [ะะะะะะะะ]] [ะจะะะะะโฆ]" +"git tag -l [-n[ะะ ะะ]] [--contains ะะะะะะะะ] [--no-contains ะะะะะะะะ]\n" +" [--points-at ะะะะะข] [--format=ะคะะ ะะะข] [--merged ะะะะะะะะ]\n" +" [--no-merged ะะะะะะะะ] [ะจะะะะะโฆ]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -20666,362 +22800,366 @@ msgstr "" msgid "bad object type." msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะฒะธะด ะพะฑะตะบั." -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "ะปะธะฟัะฒะฐ ััะพะฑัะตะฝะธะต ะทะฐ ะตัะธะบะตัะฐ" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "ะกัะพะฑัะตะฝะธะตัะพ ะทะฐ ะตัะธะบะตัะฐ ะต ะทะฐะฟะฐะทะตะฝะพ ะฒัะฒ ัะฐะนะปะฐ โ%sโ\n" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐัะฐ ะฝะฐ ะตัะธะบะตัะธัะต" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะพะทะธ ะะ ะะ ัะตะดะพะฒะต ะพั ะฒััะบะพ ััะพะฑัะตะฝะธะต ะทะฐ ะตัะธะบะตั" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ ะตัะธะบะตัะธ" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "ะฟัะพะฒะตัะบะฐ ะฝะฐ ะตัะธะบะตัะธ" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "ะะฟัะธะธ ะฟัะธ ััะทะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะตัะธะบะตัะธ" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "ะฐะฝะพัะธัะฐะฝะตัะพ ะฝะฐ ะตัะธะบะตัะธ ะธะทะธัะบะฒะฐ ััะพะฑัะตะฝะธะต" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "ะกะชะะะฉะะะะ ะทะฐ ะตัะธะบะตั" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "ะฟัะธะฝัะดะธัะตะปะฝะพ ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ััะพะฑัะตะฝะธะต ะทะฐ ะตัะธะบะตั" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "ะฐะฝะพัะธัะฐะฝ ะตัะธะบะตั ั ะฟะพะดะฟะธั ะฟะพ GPG" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "ะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะดััะณ ะบะปัั ะทะฐ ะฟะพะดะฟะธัะฒะฐะฝะตัะพ ะฝะฐ ะตัะธะบะตั" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "ะทะฐะผัะฝะฐ ะฝะฐ ะตัะธะบะตัะฐ, ะฐะบะพ ัััะตััะฒัะฒะฐ" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะถััะฝะฐะป ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "ะะฟัะธะธ ะทะฐ ะธะทะฒะตะถะดะฐะฝะตัะพ ะฝะฐ ะตัะธะบะตัะธ" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฟะธััะบะฐ ะฝะฐ ะตัะธะบะตัะธัะต ะฟะพ ะบะพะปะพะฝะธ" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะตัะธะบะตัะธัะต, ะบะพะธัะพ ััะดััะถะฐั ะฟะพะดะฐะฒะฐะฝะตัะพ" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะตัะธะบะตัะธัะต, ะบะพะธัะพ ะฝะต ััะดััะถะฐั ะฟะพะดะฐะฒะฐะฝะตัะพ" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ัะปะตัะธัะต ะตัะธะบะตัะธ" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะฝะตัะปะตัะธัะต ะตัะธะบะตัะธ" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ะตัะธะบะตัะธัะต ะฝะฐ ะะะะะขะ" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "ะะฟัะธะธัะต โ--columnโ ะธ โ-nโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "ะะฟัะธััะฐ โ-nโ ะธะทะธัะบะฒะฐ ัะตะถะธะผ ะฝะฐ ัะฟะธััะบ." -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "ะะฟัะธััะฐ โ-containsโ ะธะทะธัะบะฒะฐ ัะตะถะธะผ ะฝะฐ ัะฟะธััะบ." -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "ะะฟัะธััะฐ โ-containsโ ะธะทะธัะบะฒะฐ ัะตะถะธะผ ะฝะฐ ัะฟะธััะบ." -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "ะะฟัะธััะฐ โ-points-atโ ะธะทะธัะบะฒะฐ ัะตะถะธะผ ะฝะฐ ัะฟะธััะบ." -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "ะะฟัะธะธัะต โ--mergedโ ะธ โ--no-mergedโ ะธะทะธัะบะฒะฐั ัะตะถะธะผ ะฝะฐ ัะฟะธััะบ." -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "ะะฟัะธะธัะต โ-Fโ ะธ โ-mโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ." -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "ะัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฐัะณัะผะตะฝัะธ" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "โ%sโ ะต ะฝะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะทะฐ ะตัะธะบะตั." -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "ะตัะธะบะตััั โ%sโ ะฒะตัะต ัััะตััะฒัะฒะฐ" -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "ะะฑะฝะพะฒะตะฝ ะตัะธะบะตั โ%sโ (ะฑะต โ%sโ)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "ะ ะฐะทะฟะฐะบะตัะธัะฐะฝะต ะฝะฐ ะพะฑะตะบัะธัะต" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "ะดะธัะตะบัะพัะธััะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝะฐ" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝ" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "ะดะธัะตะบัะพัะธััะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธัะฐ" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะฒัะตะผะตัะพ ะฝะฐ ะฟัะพะผัะฝะฐ (mtime) ะฝะฐ ัะฐะนะปะฐ โ%sโ" -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "" "ะธะฝัะพัะผะฐัะธััะฐ ะฟะพะปััะตะฝะฐ ััะตะท โstatโ ะทะฐ ะดะธัะตะบัะพัะธััะฐ ะฝะต ัะต ะฟัะพะผะตะฝั ัะปะตะด " "ะดะพะฑะฐะฒัะฝะตัะพ ะฝะฐ ะฝะพะฒ ัะฐะนะป" -#: builtin/update-index.c:166 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "" "ะธะฝัะพัะผะฐัะธััะฐ ะฟะพะปััะตะฝะฐ ััะตะท โstatโ ะทะฐ ะดะธัะตะบัะพัะธััะฐ ะฝะต ัะต ะฟัะพะผะตะฝั ัะปะตะด " "ะดะพะฑะฐะฒัะฝะตัะพ ะฝะฐ ะฝะพะฒะฐ ะดะธัะตะบัะพัะธั" -#: builtin/update-index.c:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "" "ะธะฝัะพัะผะฐัะธััะฐ ะฟะพะปััะตะฝะฐ ััะตะท โstatโ ะทะฐ ะดะธัะตะบัะพัะธััะฐ ัะต ะฟัะพะผะตะฝั ัะปะตะด " "ะพะฑะฝะพะฒัะฒะฐะฝะตัะพ ะฝะฐ ะฝะพะฒ ัะฐะนะป" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "ะธะฝัะพัะผะฐัะธััะฐ ะฟะพะปััะตะฝะฐ ััะตะท โstatโ ะทะฐ ะดะธัะตะบัะพัะธััะฐ ัะต ะฟัะพะผะตะฝั ัะปะตะด ะดะพะฑะฐะฒัะฝะตัะพ " "ะฝะฐ ัะฐะนะป ะฒ ะฟะพะดะดะธัะตะบัะพัะธั" -#: builtin/update-index.c:201 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "" "ะธะฝัะพัะผะฐัะธััะฐ ะฟะพะปััะตะฝะฐ ััะตะท โstatโ ะทะฐ ะดะธัะตะบัะพัะธััะฐ ะฝะต ัะต ะฟัะพะผะตะฝั ัะปะตะด " "ะธะทััะธะฒะฐะฝะตัะพ ะฝะฐ ัะฐะนะป" -#: builtin/update-index.c:214 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "" "ะธะฝัะพัะผะฐัะธััะฐ ะฟะพะปััะตะฝะฐ ััะตะท โstatโ ะทะฐ ะดะธัะตะบัะพัะธััะฐ ะฝะต ัะต ะฟัะพะผะตะฝั ัะปะตะด " "ะธะทััะธะฒะฐะฝะตัะพ ะฝะฐ ะดะธัะตะบัะพัะธั" -#: builtin/update-index.c:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " ะะพะฑัะต" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [ะะะฆะะฏโฆ] [--] [ะคะะะโฆ]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "" "ะฟัะพะดัะปะถะฐะฒะฐะฝะต ั ะพะฑะฝะพะฒัะฒะฐะฝะตัะพ, ะดะพัะธ ะบะพะณะฐัะพ ะธะฝะดะตะบััั ัััะฑะฒะฐ ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ" -#: builtin/update-index.c:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "ะฟะพะดะผะพะดัะปะธัะต ะดะฐ ัะต ะธะณะฝะพัะธัะฐั ะฟัะธ ะพะฑะฝะพะฒัะฒะฐะฝะตัะพ" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "ะฝะพะฒะธัะต ัะฐะนะปะพะฒะต ะดะฐ ะฝะต ัะต ะธะณะฝะพัะธัะฐั" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "ัะฐะนะปะพะฒะต ะดะฐ ะผะพะณะฐั ะดะฐ ะทะฐะผะตะฝัั ะดะธัะตะบัะพัะธะธ ะธ ะพะฑัะฐัะฝะพ" -#: builtin/update-index.c:981 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "ะฟัะตะดัะฟัะตะถะดะฐะฒะฐะฝะต ะฟัะธ ะปะธะฟัะฒะฐัะธ ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ัะฐะนะปะพะฒะต" -#: builtin/update-index.c:983 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะต ะดะพัะธ ะธ ะธะฝะดะตะบััั ะดะฐ ััะดััะถะฐ ะฝะตัะปะตัะธ ะพะฑะตะบัะธ" -#: builtin/update-index.c:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธััะฐ ะพั ััะฝะบัะธััะฐ โstatโ" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" "ะบะฐัะพ ะพะฟัะธััะฐ โ--refreshโ, ะฝะพ ะดะฐ ัะต ะฟัะพะฒะตััั ะธ ะพะฑะตะบัะธัะต, ะบะพะธัะพ ัะฐ ะฑะธะปะธ ะฟัะธะตัะธ " "ะทะฐ ะฝะตะฟัะพะผะตะฝะตะฝะธ" -#: builtin/update-index.c:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "ะ ะะะะ,ะะะะะข,ะะชะข" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะธะทะฑัะพะตะฝะธัะต ะพะฑะตะบัะธ ะบัะผ ะธะฝะดะตะบัะฐ" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ัะปะฐะณ, ัะต ัะฐะนะปัั ะฝะต ัะต ะฟัะพะผะตะฝั" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "ะธะทัะธััะฒะฐะฝะต ะฝะฐ ัะปะฐะณะฐ, ัะต ัะฐะนะปัั ะฝะต ัะต ะฟัะพะผะตะฝั" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ัะปะฐะณ, ัะต ัะฐะนะปะพะฒะตัะต ัะฐ ัะฐะผะพ ะทะฐ ะธะฝะดะตะบัะฐ" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" -msgstr "ะธะทัะธััะฒะฐะฝะต ะฝะฐ ัะปะฐะณะฐ, ัะต ัะฐะนะปะพะฒะตัะต ัะฐ ัะฐะผะพ ะทะฐ ะธะฝะดะตะบัะฐ" +msgstr "ะธะทัะธััะฒะฐะฝะต ะฝะฐ ัะปะฐะณะฐ, ัะต ัะฐะนะปะพะฒะตัะต ัะฐ ัะฐะผะพ ะทะฐ ะธะฝะดะตะบัะฐ" -#: builtin/update-index.c:1017 +#: 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:1019 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐะฝะธัะต ะฟััะธัะฐ, ะดะพัะธ ะธ ะดะฐ ัััะตััะฒัะฒะฐั ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" "ะฟัะธ ะบะพะผะฑะธะฝะธัะฐะฝะต ั ะพะฟัะธััะฐ โ--stdinโ โ ะฒั ะพะดะฝะธัะต ัะตะดะพะฒะต ัะฐ ัะฐะทะดะตะปะตะฝะธ ั ะฝัะปะตะฒะธั " "ะฑะฐะนั" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "ะธะทัะธัะฐะฝะต ะฝะฐ ัะฟะธััะบะฐ ั ะฟััะธัะฐ ะทะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต ะพั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" -#: builtin/update-index.c:1027 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะตะปะตะผะตะฝัะธัะต ะพั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด ะบัะผ ะธะฝะดะตะบัะฐ" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "ะฒัะทััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ััััะพัะฝะธะตัะพ ะฟัะตะดะธ ัะปะธะฒะฐะฝะต ะธะปะธ ะฝัะถะดะฐ ะพั ะพะฑะฝะพะฒัะฒะฐะฝะต ะทะฐ " "ะธะทะฑัะพะตะฝะธัะต ะฟััะธัะฐ" -#: builtin/update-index.c:1035 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "ะดะพะฑะฐะฒัะฝะต ัะฐะผะพ ะฝะฐ ััะดััะถะฐะฝะธะตัะพ, ะบะพะตัะพ ัะต ัะฐะทะปะธัะฐะฒะฐ ะพั ัะพะฒะฐ ะฒ โHEADโ" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ะธะณะฝะพัะธัะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะตัะต, ะบะพะธัะพ ะปะธะฟัะฒะฐั ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะดะตะนััะฒะธััะฐ ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะธะทั ะพะด" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "ะทะฐะฑัะฐะฒัะฝะต ะฝะฐ ะทะฐะฟะธัะฐะฝะฐัะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะฝะตัะฐะทัะตัะตะฝะธ ะบะพะฝัะปะธะบัะธ โ ะทะฐ ะบะพะผะฐะฝะดะธัะต " "ะพั ะฟะพััะตะฑะธัะตะปัะบะพ ะฝะธะฒะพ" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "ะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ ะฒ ัะพะทะธ ัะพัะผะฐั" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "ะฒะบะปััะฒะฐะฝะต ะธะปะธ ะธะทะบะปััะฒะฐะฝะต ะฝะฐ ัะฐะทะดะตะปัะฝะตัะพ ะฝะฐ ะธะฝะดะตะบัะฐ" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "ะฒะบะปััะฒะฐะฝะต/ะธะทะบะปััะฒะฐะฝะต ะฝะฐ ะบะตัะฐ ะทะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "ะฟัะพะฒะตัะบะฐ ะดะฐะปะธ ัะฐะนะปะพะฒะฐัะฐ ัะธััะตะผะฐ ะฟะพะดะดััะถะฐ ะบะตั ะทะฐ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "" "ะฒะบะปััะฒะฐะฝะต ะฝะฐ ะบะตัะฐ ะทะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต ะฑะตะท ะฟัะพะฒะตัะบะฐ ะฝะฐ ัะฐะนะปะพะฒะฐัะฐ ัะธััะตะผะฐ" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "ะทะฐะฟะธั ะฝะฐ ะธะฝะดะตะบัะฐ, ะดะพัะธ ะดะฐ ะฝะต ะต ะพัะฑะตะปัะทะฐะฝ ะบะฐัะพ ะฟัะพะผะตะฝะตะฝ" -#: builtin/update-index.c:1060 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "ะฒะบะปััะฒะฐะฝะต ะธะปะธ ะธะทะบะปััะฒะฐะฝะต ะฝะฐ ะฝะฐะฑะปัะดะตะฝะธะตัะพ ะฝะฐ ัะฐะนะปะพะฒะฐัะฐ ัะธััะตะผะฐ" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "ะพัะฑะตะปัะทะฒะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะตัะต, ัะต ะผะพะณะฐั ะดะฐ ัะต ัะปะตะดัั ััะตะท ัะฐะนะปะพะฒะฐัะฐ ัะธััะตะผะฐ" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "ะธะทัะธััะฒะฐะฝะต ะฝะฐ ัะปะฐะณะฐ ะทะฐ ัะปะตะดะตะฝะตัะพ ััะตะท ัะฐะนะปะพะฒะฐัะฐ ัะธััะตะผะฐ" -#: builtin/update-index.c:1168 +#: 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โ (ะปัะถะฐ). ะกะผะตะฝะตัะต ั ะธะปะธ ั " +"ะะฐัััะพะนะบะฐัะฐ โcore.splitIndexโ ะต ะทะฐะดะฐะดะตะฝะฐ ะฝะฐ โfalseโ (ะปัะถะฐฬ). ะกะผะตะฝะตัะต ั ะธะปะธ ั " "ะธะทััะธะนัะต, ะทะฐ ะดะฐ ะฒะบะปััะธัะต ัะฐะทะดะตะปัะฝะตัะพ ะฝะฐ ะธะฝะดะตะบัะฐ" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -21029,7 +23167,7 @@ msgstr "" "ะะฐัััะพะนะบะฐัะฐ โcore.splitIndexโ ะต ะทะฐะดะฐะดะตะฝะฐ ะฝะฐ โtrueโ (ะธััะธะฝะฐ). ะกะผะตะฝะตัะต ั ะธะปะธ " "ั ะธะทััะธะนัะต, ะทะฐ ะดะฐ ะธะทะบะปััะธัะต ัะฐะทะดะตะปัะฝะตัะพ ะฝะฐ ะธะฝะดะตะบัะฐ." -#: builtin/update-index.c:1188 +#: 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" @@ -21037,41 +23175,41 @@ msgstr "" "ะะฐัััะพะนะบะฐัะฐ โcore.untrackedCacheโ ะต ะทะฐะดะฐะดะตะฝะฐ ะฝะฐ โtrueโ (ะธััะธะฝะฐ). ะกะผะตะฝะตัะต ั " "ะธะปะธ ั ะธะทััะธะนัะต, ะทะฐ ะดะฐ ะธะทะบะปััะธัะต ะบะตัะฐ ะทะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "ะะตััั ะทะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต ะต ะธะทะบะปััะตะฝ" -#: builtin/update-index.c:1200 +#: 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โ (ะปัะถะฐ). ะกะผะตะฝะตัะต ั " +"ะะฐัััะพะนะบะฐัะฐ โcore.untrackedCacheโ ะต ะทะฐะดะฐะดะตะฝะฐ ะฝะฐ โfalseโ (ะปัะถะฐฬ). ะกะผะตะฝะตัะต ั " "ะธะปะธ ั ะธะทััะธะนัะต, ะทะฐ ะดะฐ ะฒะบะปััะธัะต ะบะตัะฐ ะทะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "ะะตััั ะทะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต ะต ะฒะบะปััะตะฝ ะทะฐ โ%sโ" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "ะะฐัััะพะนะบะฐัะฐ โcore.fsmonitorโ ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ. ะะฐะดะฐะนัะต ั, ะทะฐ ะดะฐ ะฒะบะปััะธัะต " "ัะปะตะดะตะฝะตัะพ ััะตะท ัะฐะนะปะพะฒะฐัะฐ ัะธััะตะผะฐ." -#: builtin/update-index.c:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "ัะปะตะดะตะฝะตัะพ ััะตะท ัะฐะนะปะพะฒะฐัะฐ ัะธััะตะผะฐ ะต ะฒะบะปััะตะฝะพ" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "ะะฐัััะพะนะบะฐัะฐ โcore.fsmonitorโ ะต ะทะฐะดะฐะดะตะฝะฐ. ะะทััะธะนัะต ั, ะทะฐ ะดะฐ ะธะทะบะปััะธัะต " "ัะปะตะดะตะฝะตัะพ ััะตะท ัะฐะนะปะพะฒะฐัะฐ ัะธััะตะผะฐ." -#: builtin/update-index.c:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "ัะปะตะดะตะฝะตัะพ ััะตะท ัะฐะนะปะพะฒะฐัะฐ ัะธััะตะผะฐ ะต ะธะทะบะปััะตะฝะพ" @@ -21087,21 +23225,21 @@ msgstr "git update-ref [ะะะฆะะฏโฆ] ะะะ_ะะ_ะฃะะะะะขะะ ะะะะ_ะกะ msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [ะะะฆะะฏโฆ] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "ะธะทััะธะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปั" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะะะัะพ_ะะ_ะฃะะะะะขะะั, ะฐ ะฝะต ัะพะฒะฐ, ะบัะผ ะบะพะตัะพ ัะพัะธ" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "" "ะฝัะบะพะธ ะพั ะตะปะตะผะตะฝัะธัะต ะฟะพะดะฐะดะตะฝะธ ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด ะทะฐะฒัััะฒะฐั ั ะฝัะปะตะฒะธั ะทะฝะฐะบ " "โNULโ" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "ะธะทัะธัะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะพั ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด" @@ -21146,15 +23284,15 @@ msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตั msgid "print raw gpg status output" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฝะตะพะฑัะฐะฑะพัะตะฝะธั ะธะทั ะพะด ะพั ััััะพัะฝะธะตัะพ ะฝะฐ โgpgโ" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] ะะะะะขโฆ" -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟะพะดัะพะฑะฝะฐ ะธะฝัะพัะผะฐัะธั" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "ะธะทะฒะตะถะดะฐะฝะต ัะฐะผะพ ะฝะฐ ััะฐัะธััะธะบะฐัะฐ" @@ -21166,233 +23304,224 @@ msgstr "git verify-tag [-v | --verbose] [--format=ะคะะ ะะะข] ะะขะะะะขโฆ" msgid "print tag contents" msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะฝะฐ ะะขะะะะขะธ" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [ะะะฆะะฏโฆ] ะะชะข [ะฃะะะะะขะะ_ะะชะ_ะะะะะะะะ]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [ะะะฆะะฏโฆ]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [ะะะฆะะฏโฆ] [ะะชะข]" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move [ะะชะ ะะ] [ะะะ_ะะชะข]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [ะะะฆะะฏโฆ]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [ะะะฆะะฏโฆ] [ะะชะ ะะ]" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock [ะะชะข]" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:970 #, c-format msgid "failed to delete '%s'" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทััะธะฒะฐะฝะต ะฝะฐ โ%sโ" -#: builtin/worktree.c:80 -#, c-format -msgid "Removing worktrees/%s: not a valid directory" -msgstr "ะะทััะธะฒะฐะฝะต ะฝะฐ โworktrees/%sโ: ะฝะต ะต ะฟัะฐะฒะธะปะฝะฐ ะฟะพะดะดะธัะตะบัะพัะธั" +#: builtin/worktree.c:85 +msgid "not a valid directory" +msgstr "ะฝะต ะต ะฒะฐะปะธะดะฝะฐ ะดะธัะตะบัะพัะธั" -#: builtin/worktree.c:86 -#, c-format -msgid "Removing worktrees/%s: gitdir file does not exist" -msgstr "ะะทััะธะฒะฐะฝะต ะฝะฐ โworktrees/%sโ: ัะฐะนะปัั โgitdirโ ะฝะต ัััะตััะฒัะฒะฐ" +#: builtin/worktree.c:91 +msgid "gitdir file does not exist" +msgstr "ัะฐะนะปัั โgitdirโ ะฝะต ัััะตััะฒัะฒะฐ" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:96 builtin/worktree.c:105 #, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -msgstr "" -"ะะทััะธะฒะฐะฝะต ะฝะฐ โworktrees/%sโ: ัะฐะนะปัั โgitdirโ (%s) ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ" +msgid "unable to read gitdir file (%s)" +msgstr "ัะฐะนะปัั โgitdirโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ (%s)" -#: builtin/worktree.c:110 +#: builtin/worktree.c:115 #, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "" -"ะะทััะธะฒะฐะฝะต ะฝะฐ โworktrees/%sโ: ะธะทัะธัะฐะฝะตัะพ ะฒััะฝะฐ ะฟะพ-ะผะฐะปะบะพ ะฑะฐะนัะพะฒะต ะพั ะพัะฐะบะฒะฐะฝะพัะพ " -"(ะพัะฐะบะฒะฐะฝะธ: %<PRIuMAX> ะฑะฐะนัะฐ, ะฟะพะปััะตะฝะธ: %<PRIuMAX>)" +"ะธะทัะธัะฐะฝะตัะพ ะฒััะฝะฐ ะฟะพ-ะผะฐะปะบะพ ะฑะฐะนัะพะฒะต ะพั ะพัะฐะบะฒะฐะฝะพัะพ (ะพัะฐะบะฒะฐะฝะธ: %<PRIuMAX> ะฑะฐะนัะฐ, " +"ะฟะพะปััะตะฝะธ: %<PRIuMAX>)" -#: builtin/worktree.c:118 -#, c-format -msgid "Removing worktrees/%s: invalid gitdir file" -msgstr "ะะทััะธะฒะฐะฝะต ะฝะฐ โworktrees/%sโ: ะฝะตะฟัะฐะฒะธะปะตะฝ ัะฐะนะป โgitdirโ" +#: builtin/worktree.c:123 +msgid "invalid gitdir file" +msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ัะฐะนะป โgitdirโ" + +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "ัะฐะนะปัั โgitdirโ ัะพัะธ ะฝะตัััะตััะฒัะฒะฐัะพ ะผะตััะพะฟะพะปะพะถะตะฝะธะต" -#: builtin/worktree.c:127 +#: builtin/worktree.c:146 #, c-format -msgid "Removing worktrees/%s: gitdir file points to non-existent location" -msgstr "" -"ะะทััะธะฒะฐะฝะต ะฝะฐ โworktrees/%sโ: ัะฐะนะปัั โgitdirโ ัะพัะธ ะฝะตัััะตััะฒัะฒะฐัะพ " -"ะผะตััะพะฟะพะปะพะถะตะฝะธะต" +msgid "Removing %s/%s: %s" +msgstr "ะะทััะธะฒะฐะฝะต ะฝะฐ โ%s/%sโ: %s" -#: builtin/worktree.c:166 +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "ะดะพะบะปะฐะดะฒะฐะฝะต ะฝะฐ ะพะบะฐัััะตะฝะธัะต ัะฐะฑะพัะฝะธ ะดััะฒะตัะฐ" -#: builtin/worktree.c:168 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "ะพะฑัะฒัะฒะฐะฝะต ะฝะฐ ัะฐะฑะพัะฝะธัะต ะบะพะฟะธั ะฟะพ-ััะฐัะธ ะพั ัะพะฒะฐ ะะ ะะะ ะทะฐ ะพััะฐัะตะปะธ" -#: builtin/worktree.c:235 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "โ%sโ ะฒะตัะต ัััะตััะฒัะฒะฐ" -#: builtin/worktree.c:252 +#: builtin/worktree.c:302 #, c-format -msgid "unable to re-add worktree '%s'" -msgstr "ะดััะฒะพัะพ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะดะพะฑะฐะฒะตะฝะพ ะฝะฐะฝะพะฒะพ" +msgid "unusable worktree destination '%s'" +msgstr "ัะตะปัะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ะทะฐ ัะฐะฑะพัะฝะพ ะดััะฒะพ: โ%sโ" -#: builtin/worktree.c:257 +#: builtin/worktree.c:307 #, 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" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" "โ%sโ ะปะธะฟัะฒะฐ, ะฝะพ ะต ะทะฐะบะปััะตะฝะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ.\n" -"ะะฐ ะธะทัะธัะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฟะพะปะทะฒะฐะนัะต โadd -fโ, ะฐ ะทะฐ ะธะทัะธััะฒะฐะฝะต โ โpruneโ ะธะปะธ " -"โremoveโ" +"ะะฐ ะธะทัะธัะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฟะพะปะทะฒะฐะนัะต โ%s -f -fโ, ะฐ ะทะฐ ะธะทัะธััะฒะฐะฝะต โ\n" +"โunlockโ, โpruneโ ะธะปะธ โremoveโ" -#: builtin/worktree.c:259 +#: builtin/worktree.c:309 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" "โ%sโ ะปะธะฟัะฒะฐ, ะฝะพ ะต ัะตะณะธัััะธัะฐะฝะพ ะบะฐัะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ.\n" -"ะะฐ ะธะทัะธัะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฟะพะปะทะฒะฐะนัะต โadd -fโ, ะฐ ะทะฐ ะธะทัะธััะฒะฐะฝะต โ โpruneโ ะธะปะธ " -"โremoveโ" +"ะะฐ ะธะทัะธัะฝะพ ะทะฐะดะฐะฒะฐะฝะต ะฟะพะปะทะฒะฐะนัะต โ%s -fโ, ะฐ ะทะฐ ะธะทัะธััะฒะฐะฝะต โ\n" +"โpruneโ ะธะปะธ โremoveโ" -#: builtin/worktree.c:309 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "ะดะธัะตะบัะพัะธััะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝะฐ" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "ะัะธะณะพัะฒัะฝะต ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ (ะฝะพะฒ ะบะปะพะฝ โ%sโ)" -#: builtin/worktree.c:442 +#: builtin/worktree.c:496 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" "ะัะธะณะพัะฒัะฝะต ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ (ะทะฐะฝัะปัะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะฐ โ%sโ, ะบะพะนัะพ ัะพัะตัะต ะบัะผ " "โ%sโ)" -#: builtin/worktree.c:451 +#: builtin/worktree.c:505 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "ะัะธะณะพัะฒัะฝะต ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ (ะธะทัะตะณะปัะฝะต ะฝะฐ โ%sโ)" -#: builtin/worktree.c:457 +#: builtin/worktree.c:511 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "ะะพะดะณะพัะฒัะฝะต ะฝะฐ ัะฐะฑะพัะฝะพ ะดััะฒะพ (ัะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ัะฒััะทะฐะฝ: %s)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:552 msgid "checkout <branch> even if already checked out in other worktree" msgstr "ะะทัะตะณะปัะฝะต ะะะะะฐ, ะดะพัะธ ะธ ะดะฐ ะต ะธะทัะตะณะปะตะฝ ะฒ ะดััะณะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ" -#: builtin/worktree.c:501 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะฝะพะฒ ะบะปะพะฝ" -#: builtin/worktree.c:503 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "ััะทะดะฐะฒะฐะฝะต ะธะปะธ ะทะฐะฝัะปัะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะธ" -#: builtin/worktree.c:505 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "ะฟะพะดะณะพัะฒัะฝะต ะฝะฐ ะฝะพะฒะพัะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ" -#: builtin/worktree.c:506 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "ะฝะพะฒะพัะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ ะดะฐ ะพััะฐะฝะต ะทะฐะบะปััะตะฝะพ" -#: builtin/worktree.c:509 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ัะตะถะธะผะฐ ะฝะฐ ัะปะตะดะตะฝะต (ะฒะธะถ git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:566 msgid "try to match the new branch name with a remote-tracking branch" msgstr "ะพะฟะธั ะทะฐ ะฝะฐะฟะฐัะฒะฐะฝะต ะฝะฐ ะธะผะตัะพ ะฝะฐ ะฝะพะฒะธั ะบะปะพะฝ ั ัะพะฒะฐ ะฝะฐ ัะปะตะดัั ะบะปะพะฝ" -#: builtin/worktree.c:520 +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "ะะฟัะธะธัะต โ-bโ, โ-Bโ ะธ โ--detachโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ ะตะดะฝะฐ ั ะดััะณะฐ" -#: builtin/worktree.c:581 +#: builtin/worktree.c:635 msgid "--[no-]track can only be used if a new branch is created" msgstr "โ--[no-]trackโ ะผะพะถะต ะดะฐ ัะต ะธะทะฟะพะปะทะฒะฐ ัะฐะผะพ ะฟัะธ ััะทะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฝะพะฒ ะบะปะพะฝ" -#: builtin/worktree.c:681 +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "ะฟัะธัะธะฝะฐ ะทะฐ ะทะฐะบะปััะฒะฐะฝะต" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 #, c-format msgid "'%s' is not a working tree" msgstr "โ%sโ ะฝะต ะต ัะฐะฑะพัะฝะพ ะดััะฒะพ" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:769 builtin/worktree.c:802 msgid "The main working tree cannot be locked or unlocked" msgstr "ะัะฝะพะฒะฝะพัะพ ะดััะฒะพ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะบะปััะธ ะธะปะธ ะทะฐะบะปััะธ" -#: builtin/worktree.c:700 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "โ%sโ ะฒะตัะต ะต ะทะฐะบะปััะตะฝะพ, ะทะฐัะพัะพ โ%sโ" -#: builtin/worktree.c:702 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "โ%sโ ะฒะตัะต ะต ะทะฐะบะปััะตะฝะพ" -#: builtin/worktree.c:730 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "โ%sโ ะฝะต ะต ะทะฐะบะปััะตะฝะพ" -#: builtin/worktree.c:771 +#: builtin/worktree.c:845 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "ะฝะต ะผะพะถะต ะดะฐ ะผะตััะธัะต ะธะปะธ ะธะทััะธะฒะฐัะต ัะฐะฑะพัะฝะธ ะดััะฒะตัะฐ, ะฒ ะบะพะธัะพ ะธะผะฐ ะฟะพะดะผะพะดัะปะธ" -#: builtin/worktree.c:779 +#: builtin/worktree.c:853 msgid "force move even if worktree is dirty or locked" msgstr "" "ะฟัะธะฝัะดะธัะตะปะฝะพ ะฟัะตะผะตััะฒะฐะฝะต, ะดะพัะธ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะดะฐ ะฝะต ะต ัะธััะพ ะธะปะธ ะดะฐ ะต " "ะทะฐะบะปััะตะฝะพ" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:876 builtin/worktree.c:1000 #, c-format msgid "'%s' is a main working tree" msgstr "โ%sโ ะต ะพัะฝะพะฒะฝะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ" -#: builtin/worktree.c:807 +#: builtin/worktree.c:881 #, c-format msgid "could not figure out destination name from '%s'" msgstr "ะธะผะตัะพ ะฝะฐ ัะตะปัะฐ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฟัะตะดะตะปะธ ะพั โ%sโ" -#: builtin/worktree.c:813 -#, c-format -msgid "target '%s' already exists" -msgstr "ัะตะปัะฐ โ%sโ ะฒะตัะต ัััะตััะฒัะฒะฐ" - -#: builtin/worktree.c:821 +#: builtin/worktree.c:894 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21401,7 +23530,7 @@ msgstr "" "ะฝะต ะผะพะถะต ะดะฐ ะฟัะตะผะตััะธัะต ะทะฐะบะปััะตะฝะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ, ะฟัะธัะธะฝะฐ ะทะฐ ะทะฐะบะปััะฒะฐะฝะตัะพ: %s\n" "ะธะปะธ ะณะพ ะพัะบะปััะตัะต, ะธะปะธ ะณะพ ะฟัะตะผะตััะตัะต ะฟัะธะฝัะดะธัะตะปะฝะพ ั โmove -f -fโ" -#: builtin/worktree.c:823 +#: builtin/worktree.c:896 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21409,41 +23538,41 @@ msgstr "" "ะฝะต ะผะพะถะต ะดะฐ ะฟัะตะผะตััะธัะต ะทะฐะบะปััะตะฝะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ:\n" "ะธะปะธ ะณะพ ะพัะบะปััะตัะต, ะธะปะธ ะณะพ ะฟัะตะผะตััะตัะต ะฟัะธะฝัะดะธัะตะปะฝะพ ั โmove -f -fโ" -#: builtin/worktree.c:826 +#: builtin/worktree.c:899 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" "ะฟัะพะฒะตัะบะธัะต ัะฐ ะฝะตััะฟะตัะฝะธ, ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะตะผะตััะตะฝะพ: %s" -#: builtin/worktree.c:831 +#: builtin/worktree.c:904 #, c-format msgid "failed to move '%s' to '%s'" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฟัะตะผะตััะธ ะฒ โ%sโ" -#: builtin/worktree.c:879 +#: builtin/worktree.c:950 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "ะฝะต ะผะพะถะต ะดะฐ ะธะทะฟัะปะฝะธ โgit statusโ ะฒััั ั โ%sโ" -#: builtin/worktree.c:883 +#: builtin/worktree.c:954 #, c-format -msgid "'%s' is dirty, use --force to delete it" +msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -"ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ โ%sโ ะฝะต ะต ัะธััะพ, ะทะฐ ะฟัะธะฝัะดะธัะตะปะฝะพ ะธะทััะธะฒะฐะฝะต ะต ะฝะตะพะฑั ะพะดะธะผะฐ " -"ะพะฟัะธััะฐ โ--forceโ " +"โ%sโ ััะดััะถะฐ ะฟัะพะผะตะฝะตะฝะธ ะธะปะธ ะฝะพะฒะธ ัะฐะนะปะพะฒะต, ะทะฐ ะฟัะธะฝัะดะธัะตะปะฝะพ ะธะทััะธะฒะฐะฝะต ะต " +"ะฝะตะพะฑั ะพะดะธะผะฐ ะพะฟัะธััะฐ โ--forceโ" -#: builtin/worktree.c:888 +#: builtin/worktree.c:959 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" "ะบะพะผะฐะฝะดะฐัะฐ โgit statusโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ ะทะฐ โ%sโ, ะบะพะด ะทะฐ ะณัะตัะบะฐ: %d" -#: builtin/worktree.c:911 +#: builtin/worktree.c:982 msgid "force removal even if worktree is dirty or locked" msgstr "" "ะฟัะธะฝัะดะธัะตะปะฝะพ ะธะทััะธะฒะฐะฝะต, ะดะพัะธ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะดะฐ ะฝะต ะต ัะธััะพ ะธะปะธ ะดะฐ ะต ะทะฐะบะปััะตะฝะพ" -#: builtin/worktree.c:934 +#: builtin/worktree.c:1005 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21452,7 +23581,7 @@ msgstr "" "ะฝะต ะผะพะถะต ะดะฐ ะธะทััะธะตัะต ะทะฐะบะปััะตะฝะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ, ะฟัะธัะธะฝะฐ ะทะฐ ะทะฐะบะปััะฒะฐะฝะตัะพ: %s\n" "ะธะปะธ ะณะพ ะพัะบะปััะตัะต, ะธะปะธ ะณะพ ะธะทััะธะนัะต ะฟัะธะฝัะดะธัะตะปะฝะพ ั โremove -f -fโ" -#: builtin/worktree.c:936 +#: builtin/worktree.c:1007 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21460,11 +23589,21 @@ msgstr "" "ะฝะต ะผะพะถะต ะดะฐ ะธะทััะธะตัะต ะทะฐะบะปััะตะฝะพ ัะฐะฑะพัะฝะพ ะดััะฒะพ:\n" "ะธะปะธ ะณะพ ะพัะบะปััะตัะต, ะธะปะธ ะณะพ ะธะทััะธะนัะต ะฟัะธะฝัะดะธัะตะปะฝะพ ั โremove -f -fโ" -#: builtin/worktree.c:939 +#: builtin/worktree.c:1010 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "ะฟัะพะฒะตัะบะธัะต ัะฐ ะฝะตััะฟะตัะฝะธ, ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธัะพ: %s" +#: builtin/worktree.c:1034 +#, c-format +msgid "repair: %s: %s" +msgstr "ะฟะพะฟัะฐะฒัะฝะต: %s: โ%sโ" + +#: builtin/worktree.c:1037 +#, c-format +msgid "error: %s: %s" +msgstr "ะณัะตัะบะฐ: %s: โ%sโ" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=ะะ ะะคะะะก/]" @@ -21481,31 +23620,21 @@ msgstr "ะทะฐะฟะธั ะฝะฐ ะพะฑะตะบั-ะดััะฒะพ ะทะฐ ะฟะพะดะดะธัะตะบัะพัะธััะ msgid "only useful for debugging" msgstr "ัะฐะผะพ ะทะฐ ะธะทัะธััะฒะฐะฝะต ะฝะฐ ะณัะตัะบะธ" -#: credential-cache--daemon.c:223 +#: http-fetch.c:114 #, 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 "" -"ะัะฐะฒะฐัะฐ ะทะฐ ะดะพัััะฟ ะดะพ ะดะธัะตะบัะพัะธััะฐ ะทะฐ ะฟัะพะณัะฐะผะฝะธัะต ะณะฝะตะทะดะฐ ัะฐ ะฟัะตะบะฐะปะตะฝะพ " -"ัะฒะพะฑะพะดะฝะธ โ\n" -"ะดััะณะธัะต ะฟะพััะตะฑะธัะตะปะธ ะผะพะณะฐั ะดะฐ ะฟะพะปััะฐั ะดะพัััะฟ ะดะพ ะบะตัะธัะฐะฝะธัะต ะฒะธ ะฟะฐัะพะปะธ. ะะฐ ะดะฐ\n" -"ะบะพัะธะณะธัะฐัะต ัะพะฒะฐ, ะธะทะฟัะปะฝะตัะต:\n" -"\n" -" chmod 0700 %s" +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "ะพะฟัะธััะฐ โ--packfileโ ะธะทะธัะบะฒะฐ ะฒะฐะปะธะดะฝะฐ ะบะพะฝััะพะปะฝะฐ ััะผะฐ (ะฐ ะฝะต โ%sโ)" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "ะธะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะพะฑัะตะฝะธััะฐ ะทะฐ ััะฐัะธัะฐะฝะต ะฝะฐ ััะฐะฝะดะฐััะฝะฐัะฐ ะณัะตัะบะฐ" +#: http-fetch.c:122 +msgid "not a git repository" +msgstr "ะฝะต ะต ั ัะฐะฝะธะปะธัะต ะฝะฐ Git" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "ะฟะพะดะฐะฒะฐะฝะตัะพ โ%sโ ะฝะต ะต ะพัะฑะตะปัะทะฐะฝะพ ะบะฐัะพ ะดะพััะธะถะธะผะพ" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "ะฟัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฟะพะดะฐะฒะฐะฝะธั ัะฐ ะพัะฑะตะปัะทะฐะฝะธ ะบะฐัะพ ะดะพััะธะถะธะผะธ" @@ -21517,7 +23646,7 @@ msgstr "test-tool serve-v2 [ะะะฆะะฏโฆ]" msgid "exit immediately after advertising capabilities" msgstr "ะธะทั ะพะด ัะปะตะด ะฟััะฒะพะฝะฐัะฐะปะฝะฐัะฐ ะพะฑัะฒะฐ ะฝะฐ ะฒัะทะผะพะถะฝะพััะธัะต" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -21532,7 +23661,7 @@ msgstr "" " [--git-dir=ะะชะข] [--work-tree=ะะชะข] [--namespace=ะะะ]\n" " ะะะะะะะ [ะะ ะโฆ]" -#: git.c:34 +#: git.c:35 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" @@ -21544,52 +23673,49 @@ msgstr "" "ะฒัะฒะตะดะตะฝะธั. ะะฐ ะฟะพะผะพั ะทะฐ ัะฟะตัะธัะธัะฝะฐ ะะะะะะะ ะฟะพะปะทะฒะฐะนัะต โgit help ะะะะะะะโ, ะฐ " "ะทะฐ\n" "ะฝัะบะพะต ะพะฟัะตะดะตะปะตะฝะพ ะะะะฏะขะะ ะธะทะฟะพะปะทะฒะฐะนัะต โgit help ะะะะฏะขะะโ. ะะฐ ะฟัะตะณะปะตะด ะฝะฐ\n" -"ัะธััะตะผะฐัะฐ ะทะฐ ะฟะพะผะพั ะธะทะฟะพะปะทะฒะฐะนัะต โgit help gitโ.\n" -"\n" -"ะัะปะณะฐััะบะธ ะฟัะตะฒะพะด ะฝะฐ ะบะฝะธะณะฐัะฐ โPro Gitโ ะพั ะงะฐะบัะฝ ะธ ะกััะฐัะฑ:\n" -"http://i-can.eu/progit2-bg/progit.html" +"ัะธััะตะผะฐัะฐ ะทะฐ ะฟะพะผะพั ะธะทะฟะพะปะทะฒะฐะนัะต โgit help gitโ." -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "ะพะฟัะธััะฐ โ--git-dirโ ะธะทะธัะบะฒะฐ ะดะธัะตะบัะพัะธั\n" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "ะพะฟัะธััะฐ โ--namespaceโ ะธะทะธัะบะฒะฐ ะธะผะต\n" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "ะพะฟัะธััะฐ โ--work-treeโ ะธะทะธัะบะฒะฐ ะดะธัะตะบัะพัะธั\n" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "ะพะฟัะธััะฐ โ--super-prefixโ ะธะทะธัะบะฒะฐ ะฟัะตัะธะบั\n" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "ะพะฟัะธััะฐ โ-cโ ะธะทะธัะบะฒะฐ ะฝะธะท ะทะฐ ะฝะฐัััะพะนะบะฐ\n" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "ะพะฟัะธััะฐ โ-Cโ ะธะทะธัะบะฒะฐ ะดะธัะตะบัะพัะธั\n" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะพะฟัะธั: โ%sโ\n" -#: git.c:360 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "ะฟัะธ ะทะฐะผะตััะฒะฐะฝะตัะพ ะฝะฐ ะฟัะตะฒะดะพะฝะธะผ โ%sโ: โ%sโ" -#: git.c:369 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -21598,39 +23724,39 @@ msgstr "" "ะฟัะตะฒะดะพะฝะธะผัั โ%sโ ะฟัะพะผะตะฝั ะฟัะพะผะตะฝะปะธะฒะธ ะฝะฐ ััะตะดะฐัะฐ.\n" "ะะฐ ัะพะฒะฐ ะผะพะถะต ะดะฐ ะฟะพะปะทะฒะฐัะต โ!gitโ ะฒ ะฟัะตะฒะดะพะฝะธะผะฐ" -#: git.c:377 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "ะฟัะฐะทะตะฝ ะฟัะตะฒะดะพะฝะธะผ ะทะฐ โ%sโ" -#: git.c:380 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "ะทะฐัะธะบะปะตะฝ ะฟัะตะฒะดะพะฝะธะผ: โ%sโ" -#: git.c:460 +#: git.c:465 msgid "write failure on standard output" msgstr "ะณัะตัะบะฐ ะฟัะธ ะทะฐะฟะธั ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะธะทั ะพะด" -#: git.c:462 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "ะฝะตะธะทะฒะตััะฝะฐ ะณัะตัะบะฐ ะฟัะธ ะทะฐะฟะธั ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะธะทั ะพะด" -#: git.c:464 +#: git.c:469 msgid "close failed on standard output" msgstr "ะณัะตัะบะฐ ะฟัะธ ะทะฐัะฒะฐััะฝะต ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะธะทั ะพะด" -#: git.c:793 +#: git.c:819 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "ะทะฐัะธะบะปัะฝะต ะฒ ะฟัะตะฒะดะพะฝะธะผะธัะต: ะทะฐะผะตััะฒะฐะฝะธััะฐ ะฝะฐ โ%sโ ะฝะต ะฟัะธะบะปััะฒะฐั:%s" -#: git.c:843 +#: git.c:869 #, c-format msgid "cannot handle %s as a builtin" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพะฑัะฐะฑะพัะธ ะบะฐัะพ ะฒะณัะฐะดะตะฝะฐ ะบะพะผะฐะฝะดะฐ" -#: git.c:856 +#: git.c:882 #, c-format msgid "" "usage: %s\n" @@ -21639,60 +23765,60 @@ msgstr "" "ัะฟะพััะตะฑะฐ: %s\n" "\n" -#: git.c:876 +#: git.c:902 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "ะฝะตััะฟะตัะฝะพ ะทะฐะผะตััะฒะฐะฝะต ะฝะฐ ะฟัะตะฒะดะพะฝะธะผะฐ โ%sโ โ ัะตะทัะปัะฐััั โ%sโ ะฝะต ะต ะบะพะผะฐะฝะดะฐ ะฝะฐ " "git\n" -#: git.c:888 +#: git.c:914 #, c-format msgid "failed to run command '%s': %s\n" msgstr "ะบะพะผะฐะฝะดะฐัะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ: %s\n" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" "ะพััะธัะฐัะตะปะฝะฐ ััะพะนะฝะพัั ะทะฐ โhttp.postbufferโ. ะฉะต ัะต ะฟะพะปะทะฒะฐ ััะฐะฝะดะฐััะฝะฐัะฐ: %d" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "ะฃะฟัะฐะฒะปะตะฝะธะตัะพ ะฝะฐ ะดะตะปะตะณะธัะฐะฝะตัะพ ะฝะต ัะต ะฟะพะดะดััะถะฐ ะพั cURL < 7.22.0" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "ะะฐะดะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟะพััะพัะฝะตะฝ ะฟัะฑะปะธัะตะฝ ะบะปัั ะฝะต ัะต ะฟะพะดะดััะถะฐ ะพั cURL < 7.44.0" -#: http.c:876 +#: http.c:910 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "โCURLSSLOPT_NO_REVOKEโ ะฝะต ัะต ะฟะพะดะดััะถะฐ ะพั cURL < 7.44.0" -#: http.c:949 +#: http.c:989 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "ะะณัะฐะฝะธัะฐะฒะฐะฝะตัะพ ะฝะฐ ะฟัะพัะพะบะพะปะธัะต ะฝะต ัะต ะฟะพะดะดััะถะฐ ะพั cURL < 7.44.0" -#: http.c:1085 +#: http.c:1132 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "ะะตะฟะพะดะดััะถะฐะฝะฐ ัะตะฐะปะธะทะฐัะธั ะฝะฐ SSL โ%sโ. ะะพะดะดััะถะฐั ัะต:" -#: http.c:1092 +#: http.c:1139 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "ะ ะตะฐะปะธะทะฐัะธััะฐ ะฝะฐ SSL ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะดะฐ ะต โ%sโ: cURL ะต ะบะพะผะฟะธะปะธัะฐะฝ ะฑะตะท " "ะฟะพะดะดััะถะบะฐ ะฝะฐ SSL" -#: http.c:1096 +#: http.c:1143 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "" "ะ ะตะฐะปะธะทะฐัะธััะฐ ะฝะฐ SSL ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐะดะฐะดะต ะดะฐ ะต โ%sโ, ะทะฐัะพัะพ ะฒะตัะต ะต ะทะฐะดะฐะดะตะฝะฐ " "ะดััะณะฐ" -#: http.c:1965 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21703,161 +23829,203 @@ msgstr "" " โ ะทะฐัะฒะตะฝ ะฐะดัะตั: %s\n" " โ ะฟัะตะฝะฐัะพัะฒะฐะฝะต: %s" -#: remote-curl.c:157 +#: remote-curl.c:174 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "" "ะฝะตะฟัะฐะฒะธะปะฝะพ ะตะบัะฐะฝะธัะฐะฝะต ะธะปะธ ัะธัะธัะฐะฝะต ะฒ ััะพะนะฝะพัััะฐ ะบัะผ ะพะฟัะธั ะทะฐ ะธะทัะปะฐัะบะฒะฐะฝะต: " "โ%sโ" -#: remote-curl.c:254 +#: remote-curl.c:298 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "โ%sinfo/refsโ ะต ะฝะตะธะทะฟะพะปะทะฒะฐะตะผะพ, ะฟัะพะฒะตัะตัะต ะดะฐะปะธ ะต ั ัะฐะฝะธะปะธัะต ะฝะฐ git" -#: remote-curl.c:355 +#: remote-curl.c:399 msgid "invalid server response; expected service, got flush packet" msgstr "" "ะฝะตะฟัะฐะฒะธะปะตะฝ ะพัะณะพะฒะพั ะพั ัััะฒััะฐ: ะพัะฐะบะฒะฐัะต ัะต ััะปัะณะฐ, ะฐ ะฑะต ะฟะพะปััะตะฝ ะธะทัะธััะฒะฐั " "ะฟะฐะบะตั โflushโ" -#: remote-curl.c:386 +#: remote-curl.c:430 #, c-format msgid "invalid server response; got '%s'" msgstr "ะฝะตะฟัะฐะฒะธะปะตะฝ ะพัะณะพะฒะพั ะพั ัััะฒััะฐ, ะฑะต ะฟะพะปััะตะฝะพ: โ%sโ" -#: remote-curl.c:446 +#: remote-curl.c:490 #, c-format msgid "repository '%s' not found" msgstr "ั ัะฐะฝะธะปะธัะตัะพ โ%sโ ะปะธะฟัะฒะฐ" -#: remote-curl.c:450 +#: remote-curl.c:494 #, c-format msgid "Authentication failed for '%s'" msgstr "ะะตััะฟะตัะฝะฐ ะธะดะตะฝัะธัะธะบะฐัะธั ะบัะผ โ%sโ" -#: remote-curl.c:454 +#: remote-curl.c:498 #, c-format msgid "unable to access '%s': %s" msgstr "ะฝัะผะฐ ะดะพัััะฟ ะดะพ โ%sโ: %s" -#: remote-curl.c:460 +#: remote-curl.c:504 #, c-format msgid "redirecting to %s" msgstr "ะฟัะตะฝะฐัะพัะฒะฐะฝะต ะบัะผ โ%sโ" -#: remote-curl.c:584 +#: remote-curl.c:633 msgid "shouldn't have EOF when not gentle on EOF" msgstr "ะฟะพะปััะตะฝ ะต EOF, ะฒ ัะตะถะธะผ ะฑะตะท ะฟะพะดะดััะถะบะฐ ะทะฐ ัะพะฒะฐ" -#: remote-curl.c:664 +#: remote-curl.c:645 +msgid "remote server sent stateless separator" +msgstr "ะพัะดะฐะปะตัะตะฝะธัั ัััะฒัั ะธะทะฟัะฐัะธ ัะฐะทะดะตะปะธัะตะป ะฑะตะท ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ััััะพัะฝะธะตัะพ" + +#: remote-curl.c:715 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "ะดะฐะฝะฝะธัะต ะทะฐ POST ะฝะต ะผะพะณะฐั ะดะฐ ัะต ะฟัะพัะตัะฐั ะฝะฐะฝะพะฒะพ, ะฟัะพะฑะฒะฐะนัะต ะดะฐ ัะฒะตะปะธัะธัะต " "ะฝะฐัััะพะนะบะฐัะฐ โhttp.postBufferโ" -#: remote-curl.c:724 +#: remote-curl.c:745 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curl: ะฝะตะฟัะฐะฒะธะปeะฝ ะทะฝะฐะบ ะทะฐ ะดัะปะถะธะฝะฐ ะฝะฐ ัะตะด: %.4s" + +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curl: ะฝะตะพัะฐะบะฒะฐะฝ ะฟะฐะบะตั ะทะฐ ะบัะฐะน ะฝะฐ ะพัะณะพะฒะพั" + +#: remote-curl.c:823 #, c-format msgid "RPC failed; %s" msgstr "ะะตััะฟะตัะฝะพ ะพัะดะฐะปะตัะตะฝะพ ะธะทะฒะธะบะฒะฐะฝะต. %s" -#: remote-curl.c:764 +#: remote-curl.c:863 msgid "cannot handle pushes this big" msgstr "ัะพะปะบะพะฒะฐ ะณะพะปะตะผะธ ะธะทัะปะฐัะบะฒะฐะฝะธั ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝัั" -#: remote-curl.c:879 +#: remote-curl.c:978 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" "ะทะฐัะฒะบะฐัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะดะตะบะพะผะฟัะตัะธัะฐะฝะฐ, ะณัะตัะบะฐ ะพั โzlibโ ะฟัะธ " "ะดะตะบะพะผะฟัะตัะธัะฐะฝะต: %d" -#: remote-curl.c:883 +#: remote-curl.c:982 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" "ะทะฐัะฒะบะฐัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะดะตะบะพะผะฟัะตัะธัะฐะฝะฐ; ะณัะตัะบะฐ ะพั โzlibโ ะฟัะธ ะทะฐะฒัััะฒะฐะฝะต: %d<" -#: remote-curl.c:1014 +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" +msgstr "ะฟะพะปััะตะฝะธ ัะฐ %d ะฑะฐะนัะฐ ะพั ะทะฐะณะปะฐะฒะฝะฐ ัะฐัั" + +#: remote-curl.c:1034 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "ะพัะฐะบะฒะฐั ัะต ะพัะต %d ะฑะฐะนัะฐ ะพั ััะปะพัะพ ะฝะฐ ะพัะณะพะฒะพัะฐ" + +#: remote-curl.c:1123 msgid "dumb http transport does not support shallow capabilities" msgstr "ะพะฟัะพััะตะฝะธัั ััะฐะฝัะฟะพัั ะฟะพ http ะฝะต ะฟะพะดะดััะถะฐ ะฟะปะธัะบะธ ะบะปะธะตะฝัะธ" -#: remote-curl.c:1028 +#: remote-curl.c:1138 msgid "fetch failed." msgstr "ะฝะตััะฟะตัะฝะพ ะดะพััะฐะฒัะฝะต." -#: remote-curl.c:1076 +#: remote-curl.c:1184 msgid "cannot fetch by sha1 over smart http" msgstr "ัะผะฝะธัั ะฒะฐัะธะฐะฝั ะฝะฐ http ะฝะต ะผะพะถะต ะดะฐ ะดะพััะฐะฒั ะฟะพ SHA1" -#: remote-curl.c:1120 remote-curl.c:1126 +#: remote-curl.c:1228 remote-curl.c:1234 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "ะฟัะพัะพะบะพะปะฝะฐ ะณัะตัะบะฐ: ะพัะฐะบะฒะฐ ัะต SHA1 ะธะปะธ ัะบะฐะทะฐัะตะป, ะฐ ะฑะต ะฟะพะปััะตะฝะพ: โ%sโ" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1246 remote-curl.c:1361 #, c-format msgid "http transport does not support %s" msgstr "ััะฐะฝัะฟะพัััั ะฟะพ http ะฝะต ะฟะพะดะดััะถะฐ โ%sโ" -#: remote-curl.c:1174 +#: remote-curl.c:1282 msgid "git-http-push failed" msgstr "ะฝะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ โgit-http-pushโ" -#: remote-curl.c:1360 +#: remote-curl.c:1467 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: ัะฟะพััะตะฑะฐ: git remote-curl ะฅะ ะะะะะะฉะ [ะะะ ะะก]" -#: remote-curl.c:1392 +#: remote-curl.c:1499 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: ะณัะตัะบะฐ ะฟัะธ ะธะทัะธัะฐะฝะตัะพ ะฝะฐ ะฟะพัะพะบะฐ ะบะพะผะฐะฝะดะธ ะพั git" -#: remote-curl.c:1399 +#: remote-curl.c:1506 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: ะพะฟะธั ะทะฐ ะดะพััะฐะฒัะฝะต ะฑะตะท ะปะพะบะฐะปะฝะพ ั ัะฐะฝะธะปะธัะต" -#: remote-curl.c:1439 +#: remote-curl.c:1547 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: ะฝะตะฟะพะทะฝะฐัะฐ ะบะพะผะฐะฝะดะฐ โ%sโ ะพั git" -#: list-objects-filter-options.h:61 +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "ะปะธะฟัะฒะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะบะพะผะฟะธะปะฐัะพัะฐ\n" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "ะปะธะฟัะฒะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะฑะธะฑะปะธะพัะตะบะฐัะฐ ะฝะฐ C\n" + +#: list-objects-filter-options.h:91 msgid "args" msgstr "ะะ ะะฃะะะะขะ" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "ัะธะปััะธัะฐะฝะต ะฟะพ ะฒะธะด ะฝะฐ ะพะฑะตะบัะฐ" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "ะฟะตัะธะพะด ะฝะฐ ะฒะฐะปะธะดะฝะพัั/ะทะฐะฟะฐะทะฒะฐะฝะต" -#: parse-options.h:184 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "ะฝัะปะตะฒะฐ ะพะฟะตัะฐัะธั (ะทะฐ ััะฒะผะตััะธะผะพัั ั ะฟัะตะดะธัะฝะธ ะฒะตััะธะธ)" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "ะฟะพะฒะตัะต ะฟะพะดัะพะฑะฝะพััะธ" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "ะฟะพ-ะผะฐะปะบะพ ะฟะพะดัะพะฑะฝะพััะธ" -#: parse-options.h:313 -msgid "use <n> digits to display SHA-1s" -msgstr "ะดะฐ ัะต ะฟะพะบะฐะทะฒะฐั ัะฐะบัะฒ ะะ ะะ ัะธััะธ ะพั ััะผะธัะต ะฟะพ SHA1" +#: parse-options.h:317 +msgid "use <n> digits to display object names" +msgstr "ะดะฐ ัะต ะฟะพะบะฐะทะฒะฐั ัะฐะบัะฒ ะะ ะะ ัะธััะธ ะพั ะธะผะตะฝะฐัะฐ ะฝะฐ ะพะฑะตะบัะธัะต" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "ะบะพะธ ะฟัะฐะทะฝะธ ะทะฝะฐัะธ ะธ #ะบะพะผะตะฝัะฐัะธ ะดะฐ ัะต ะผะฐั ะฐั ะพั ััะพะฑัะตะฝะธััะฐ" -#: ref-filter.h:101 +#: 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:96 msgid "key" msgstr "ะะะฎะง" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "ะธะผะต ะฝะฐ ะฟะพะปะตัะพ, ะฟะพ ะบะพะตัะพ ะดะฐ ะต ะฟะพะดัะตะดะฑะฐัะฐ" @@ -21867,11 +24035,11 @@ msgstr "" "ะฟัะธ ะฒัะทะผะพะถะฝะพัั ะฟัะตะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัะตัะตะฝะธะตัะพ ะฝะฐ ะบะพะฝัะปะธะบัะฐ ะทะฐ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ " "ะธะฝะดะตะบัะฐ" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ะต ัะฒััะทะฐะฝ ะธ ะต ะฟัะธ " -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ะต ัะฒััะทะฐะฝ ะธ ะต ะพัะดะตะปะตฬะฝ ะพั " @@ -21914,686 +24082,703 @@ msgid "List, create, or delete branches" msgstr "ะะทะฒะตะถะดะฐะฝะต, ััะทะดะฐะฒะฐะฝะต, ะธะทััะธะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะธ" #: command-list.h:59 +msgid "Collect information for user to file a bug report" +msgstr "ะกัะฑะธัะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะฟะพััะตะฑะธัะตะปั ะทะฐ ะดะพะบะปะฐะด ะทะฐ ะณัะตัะบะฐ" + +#: command-list.h:60 msgid "Move objects and refs by archive" msgstr "ะะตััะตะฝะต ะฝะฐ ะพะฑะตะบัะธ ะธ ัะบะฐะทะฐัะตะปะธ ะฟะพ ะฐัั ะธะฒะธ" -#: command-list.h:60 +#: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "" "ะัะตะดะพััะฐะฒัะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะธะปะธ ะฒะธะดะฐ ะธ ัะฐะทะผะตัะธัะต ะฝะฐ ะพะฑะตะบัะธ ะพั ั ัะฐะฝะธะปะธัะต" -#: command-list.h:61 +#: command-list.h:62 msgid "Display gitattributes information" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธััะฐ ะทะฐ ะฐััะธะฑััะธัะต ะฝะฐ git (gitattributes)" -#: command-list.h:62 +#: command-list.h:63 msgid "Debug gitignore / exclude files" msgstr "ะะทัะธััะฒะฐะฝะต ะฝะฐ ะณัะตัะบะธ ะฒ ะธะณะฝะพัะธัะฐะฝะธัะต ัะฐะนะปะพะฒะต (gitignore)" -#: command-list.h:63 +#: command-list.h:64 msgid "Show canonical names and email addresses of contacts" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะบะฐะฝะพะฝะธัะฝะธัะต ะธะผะต ะธ ะฐะดัะตั ะฝะฐ ะต-ะฟะพัะฐ ะฝะฐ ะบะพะฝัะฐะบัะธัะต" -#: command-list.h:64 +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "" "ะัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ ะดััะณ ะบะปะพะฝ ะธะปะธ ะฒัะทััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะตัะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: command-list.h:65 +#: command-list.h:66 msgid "Copy files from the index to the working tree" msgstr "ะะพะฟะธัะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะต ะพั ะธะฝะดะตะบัะฐ ะบัะผ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: command-list.h:66 +#: command-list.h:67 msgid "Ensures that a reference name is well formed" msgstr "ะัะพะฒะตัะบะฐ ะดะฐะปะธ ะธะผะตัะพ ะฝะฐ ัะบะฐะทะฐัะตะปั ะต ะฟะพ ะฟัะฐะฒะธะปะฐัะฐ" -#: command-list.h:67 +#: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "" "ะัะบัะธะฒะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธั, ะบะพะธัะพ ะพัะต ะฝะต ัะฐ ะฟะพะดะฐะดะตะฝะธ ะบัะผ ะพัะดะฐะปะตัะตะฝะพัะพ ั ัะฐะฝะธะปะธัะต" -#: command-list.h:68 +#: command-list.h:69 msgid "Apply the changes introduced by some existing commits" msgstr "ะัะธะปะฐะณะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต ะพั ัััะตััะฒัะฒะฐัะธ ะฟะพะดะฐะฒะฐะฝะธั" -#: command-list.h:69 +#: command-list.h:70 msgid "Graphical alternative to git-commit" msgstr "ะัะฐัะธัะฝะฐ ะฐะปัะตัะฝะฐัะธะฒะฐ ะฝะฐ โgit-commitโ" -#: command-list.h:70 +#: command-list.h:71 msgid "Remove untracked files from the working tree" msgstr "ะะทััะธะฒะฐะฝะต ะฝะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต ะพั ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: command-list.h:71 +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "ะะปะพะฝะธัะฐะฝะต ะฝะฐ ั ัะฐะฝะธะปะธัะต ะฒ ะฝะพะฒะฐ ะดะธัะตะบัะพัะธั" -#: command-list.h:72 +#: command-list.h:73 msgid "Display data in columns" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฟะพ ะบะพะปะพะฝะธ" -#: command-list.h:73 +#: command-list.h:74 msgid "Record changes to the repository" msgstr "ะะพะดะฐะฒะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธ ะฒ ั ัะฐะฝะธะปะธัะตัะพ" -#: command-list.h:74 +#: command-list.h:75 msgid "Write and verify Git commit-graph files" msgstr "ะะฐะฟะธั ะธ ะฟัะพะฒะตัะบะฐ ะฝะฐ ัะฐะนะปะพะฒะตัะต ั ะณัะฐฬัะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฝะฐ Git" -#: command-list.h:75 +#: command-list.h:76 msgid "Create a new commit object" msgstr "ะกัะทะดะฐะฒะฐะฝะต ะฝะฐ ะฝะพะฒ ะพะฑะตะบั-ะฟะพะดะฐะฒะฐะฝะต" -#: command-list.h:76 +#: command-list.h:77 msgid "Get and set repository or global options" msgstr "" "ะะทะฒะตะถะดะฐะฝะต ะธ ะทะฐะดะฐะฒะฐะฝะต ะฝะฐ ะณะปะพะฑะฐะปะฝะธ ะฝะฐัััะพะนะบะธ ะธะปะธ ะฝะฐัััะพะนะบะธ ะฝะฐ ะพะฟัะตะดะตะปะตะฝะพ " "ั ัะฐะฝะธะปะธัะต" -#: command-list.h:77 +#: command-list.h:78 msgid "Count unpacked number of objects and their disk consumption" msgstr "" "ะัะตะฑัะพัะฒะฐะฝะต ะฝะฐ ะฝะตะฟะฐะบะตัะธัะฐะฝะธัะต ะพะฑะตะบัะธ ะธ ะบะพะปะบะพ ะดะธัะบะพะฒะพ ะฟัะพัััะฐะฝััะฒะพ ะทะฐะตะผะฐั" -#: command-list.h:78 +#: command-list.h:79 msgid "Retrieve and store user credentials" msgstr "ะะพะปััะฐะฒะฐะฝะต ะธ ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะธะดะตะฝัะธัะธะบะฐัะธััะฐ ะฝะฐ ะฟะพััะตะฑะธัะตะป" -#: command-list.h:79 +#: command-list.h:80 msgid "Helper to temporarily store passwords in memory" msgstr "ะะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ ะทะฐ ะฒัะตะผะตะฝะฝะพ ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะฟะฐัะพะปะธ ะฒ ะฟะฐะผะตััะฐ" -#: command-list.h:80 +#: command-list.h:81 msgid "Helper to store credentials on disk" msgstr "" "ะะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ ะทะฐ ะทะฐะฟะฐะทะฒะฐะฝะต ะฝะฐ ะธะดะตะฝัะธัะธะบะฐัะธััะฐ ะฝะฐ ะฟะพััะตะฑะธัะตะป ะฝะฐ ะดะธัะบะฐ" -#: command-list.h:81 +#: command-list.h:82 msgid "Export a single commit to a CVS checkout" msgstr "ะะทะฝะฐััะฝะต ะฝะฐ ะตะดะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะบะฐัะพ ะธะทัะตะณะปัะฝะต ะฒ CVS" -#: command-list.h:82 +#: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" msgstr "ะะทะฝะฐััะฝะต ะฝะฐ ะดะฐะฝะฝะธัะต ะฒะธ ะพั ะดััะณะฐ ัะธััะตะผะฐ ะทะฐ ะบะพะฝััะพะป ะฝะฐ ะฒะตััะธะธัะต" -#: command-list.h:83 +#: command-list.h:84 msgid "A CVS server emulator for Git" msgstr "ะะผัะปะฐัะธั ะฝะฐ ัััะฒัั ะทะฐ CVS ะทะฐ Git" -#: command-list.h:84 +#: command-list.h:85 msgid "A really simple server for Git repositories" msgstr "ะกะธะปะฝะพ ะพะฟัะพััะตะฝ ัััะฒัั ะทะฐ ั ัะฐะฝะธะปะธัะฐ ะฝะฐ Git" -#: command-list.h:85 +#: command-list.h:86 msgid "Give an object a human readable name based on an available ref" msgstr "" "ะะฐะดะฐะฒะฐะฝะต ะฝะฐ ะธะผะต ัะดะพะฑะฝะพ ะทะฐ ะฟะพััะตะฑะธัะตะปะธัะต ะฝะฐ ะพะฑะตะบั ะฒัะท ะพัะฝะพะฒะฐ ะฝะฐ ะฝะฐะปะธัะตะฝ " "ัะบะฐะทะฐัะตะป" -#: command-list.h:86 +#: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฐะทะปะธะบะธัะต ะผะตะถะดั ะฟะพะดะฐะฒะฐะฝะธััะฐ, ะฒะตััะธะธัะต, ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: command-list.h:87 +#: command-list.h:88 msgid "Compares files in the working tree and the index" msgstr "ะกัะฐะฒะฝัะฒะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะต ะพั ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะธ ะธะฝะดะตะบัะฐ" -#: command-list.h:88 +#: command-list.h:89 msgid "Compare a tree to the working tree or index" msgstr "ะกัะฐะฒะฝัะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธ-ะดััะฒะพ ั ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะธ ะธะฝะดะตะบัะฐ" -#: command-list.h:89 +#: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" msgstr "" "ะกัะฐะฒะฝัะฒะฐะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะธ ะฟัะฐะฒะฐัะฐ ะทะฐ ะดะพัััะฟ ะฝะฐ ะพะฑะตะบัะธัะต-BLOB ััะตะท ะดะฒะฐ " "ะพะฑะตะบัะฐ-ะดััะฒะพ" -#: command-list.h:90 +#: command-list.h:91 msgid "Show changes using common diff tools" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต ััะตะท ััะฐะฝะดะฐััะฝะธัะต ะธะฝััััะผะตะฝัะธ ะทะฐ ัะพะฒะฐ" -#: command-list.h:91 +#: command-list.h:92 msgid "Git data exporter" msgstr "ะ ะฐะทะณะปะตะถะดะฐะฝะต ะฝะฐ ะดะฐะฝะฝะธัะต ะพั Git" -#: command-list.h:92 +#: command-list.h:93 msgid "Backend for fast Git data importers" msgstr "ะฏะดัะพ ะทะฐ ะฑััะทะพ ะฒะฝะฐััะฝะต ะฝะฐ ะดะฐะฝะฝะธ ะฒ Git" -#: command-list.h:93 +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "ะะทัะตะณะปัะฝะต ะฝะฐ ะพะฑะตะบัะธ ะธ ัะบะฐะทะฐัะตะปะธ ะพั ะดััะณะพ ั ัะฐะฝะธะปะธัะต" -#: command-list.h:94 +#: command-list.h:95 msgid "Receive missing objects from another repository" msgstr "ะะพะปััะฐะฒะฐะฝะต ะฝะฐ ะปะธะฟัะฒะฐัะธ ะพะฑะตะบัะธ ะพั ะดััะณะพ ั ัะฐะฝะธะปะธัะต" -#: command-list.h:95 +#: command-list.h:96 msgid "Rewrite branches" msgstr "ะัะตะทะฐะฟะธัะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะธ" -#: command-list.h:96 +#: command-list.h:97 msgid "Produce a merge commit message" msgstr "ะกัะทะดะฐะฒะฐะฝะต ะฝะฐ ััะพะฑัะตะฝะธะต ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต ััั ัะปะธะฒะฐะฝะต" -#: command-list.h:97 +#: command-list.h:98 msgid "Output information on each ref" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธััะฐ ะทะฐ ะฒัะตะบะธ ัะบะฐะทะฐัะตะป" -#: command-list.h:98 +#: command-list.h:99 msgid "Prepare patches for e-mail submission" msgstr "ะะพะดะณะพัะฒัะฝะต ะฝะฐ ะบััะฟะบะธ ะทะฐ ะธะทะฟัะฐัะฐะฝะต ะฟะพ ะต-ะฟะพัะฐ" -#: command-list.h:99 +#: command-list.h:100 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะพะฑะตะบัะธัะต ะธ ะฒััะทะบะธัะต ััั ะฒ ะฑะฐะทะฐัะฐ ะพั ะดะฐะฝะฝะธ ะทะฐ ะพะฑะตะบัะธัะต" -#: command-list.h:100 +#: command-list.h:101 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "ะะทัะธััะฒะฐะฝะต ะฝะฐ ะฝะตะฝัะถะฝะธัะต ัะฐะนะปะพะฒะต ะธ ะพะฟัะธะผะธะทะธัะฐะฝะต ะฝะฐ ะปะพะบะฐะปะฝะพัะพ ั ัะฐะฝะธะปะธัะต" -#: command-list.h:101 +#: command-list.h:102 msgid "Extract commit ID from an archive created using git-archive" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะดะตะฝัะธัะธะบะฐัะพัะฐ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต ะพั ะฐัั ะธะฒ ะฝะฐ โgit-archiveโ" -#: command-list.h:102 +#: command-list.h:103 msgid "Print lines matching a pattern" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะตะดะพะฒะตัะต ะฝะฐะฟะฐัะฒะฐัะธ ะฝะฐ ัะฐะฑะปะพะฝ" -#: command-list.h:103 +#: command-list.h:104 msgid "A portable graphical interface to Git" msgstr "ะัะฐัะธัะตะฝ ะธะฝัะตััะตะนั ะบัะผ Git" -#: command-list.h:104 +#: command-list.h:105 msgid "Compute object ID and optionally creates a blob from a file" msgstr "" "ะะทัะธัะปัะฒะฐะฝะต ะฝะฐ ะธะดะตะฝัะธัะธะบะฐัะพั ะฝะฐ ะพะฑะตะบั ะธ ะตะฒะตะฝััะฐะปะฝะพ ััะทะดะฐะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั-BLOB " "ะพั ัะฐะนะป" -#: command-list.h:105 +#: command-list.h:106 msgid "Display help information about Git" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟะพะผะพััะฐ ะทะฐ Git" -#: command-list.h:106 +#: command-list.h:107 msgid "Server side implementation of Git over HTTP" msgstr "ะกััะฒััะฝะฐ ัะตะฐะปะธะทะฐัะธั ะฝะฐ Git ะฟะพ HTTP" -#: command-list.h:107 +#: command-list.h:108 msgid "Download from a remote Git repository via HTTP" msgstr "ะะทัะตะณะปัะฝะต ะฝะฐ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต ะฟะพ HTTP" -#: command-list.h:108 +#: command-list.h:109 msgid "Push objects over HTTP/DAV to another repository" msgstr "ะะทัะปะฐัะบะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธ ะฟะพ HTTP/DAV ะบัะผ ะดััะณะพ ั ัะฐะฝะธะปะธัะต" -#: command-list.h:109 +#: command-list.h:110 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "ะะทะฟัะฐัะฐะฝะต ะฝะฐ ะฟะพัะตะดะธัะฐ ะพั ะบััะฟะบะธ ะฝะฐ ััะฐะฝะดะฐััะฝะธั ะฒั ะพะด ะบัะผ ะฟะฐะฟะบะฐ ะฟะพ IMAP" -#: command-list.h:110 +#: command-list.h:111 msgid "Build pack index file for an existing packed archive" msgstr "ะกัะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟะฐะบะตัะตะฝ ะธะฝะดะตะบั ะทะฐ ัััะตััะฒัะฒะฐั ะฟะฐะบะตัะธัะฐะฝ ะฐัั ะธะฒ" -#: command-list.h:111 +#: command-list.h:112 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "ะกัะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟัะฐะทะฝะพ ั ัะฐะฝะธะปะธัะต ะฝะฐ Git ะธะปะธ ะทะฐะฝัะปัะฒะฐะฝะต ะฝะฐ ัััะตััะฒัะฒะฐัะพ" -#: command-list.h:112 +#: command-list.h:113 msgid "Instantly browse your working repository in gitweb" msgstr "ะะตะทะฐะฑะฐะฒะฝะพ ัะฐะทะณะปะตะถะดะฐะฝะต ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะฒะธ ั ัะฐะฝะธะปะธัะต ััะตะท โgitwebโ" -#: command-list.h:113 +#: command-list.h:114 msgid "Add or parse structured information in commit messages" msgstr "" "ะะพะฑะฐะฒัะฝะต ะธะปะธ ะพะฑัะฐะฑะพัะบะฐ ะฝะฐ ััััะบัััะธัะฐะฝะฐ ะธะฝัะพัะผะฐัะธั ะฒ ััะพะฑัะตะฝะธััะฐ ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต" -#: command-list.h:114 +#: command-list.h:115 msgid "The Git repository browser" msgstr "ะ ะฐะทะณะปะตะถะดะฐะฝะต ะฝะฐ ั ัะฐะฝะธะปะธัะต ะฝะฐ Git" -#: command-list.h:115 +#: command-list.h:116 msgid "Show commit logs" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะถััะฝะฐะปะฐ ั ะฟะพะดะฐะฒะฐะฝะธััะฐ" -#: command-list.h:116 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ัะฐะนะปะพะฒะตัะต ะฒ ะธะฝะดะตะบัะฐ ะธ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: command-list.h:117 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะฒ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต" -#: command-list.h:118 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะฝะฐ ะพะฑะตะบั-ะดััะฒะพ" -#: command-list.h:119 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "ะะทะฒะฐะถะดะฐะฝะต ะฝะฐ ะบััะฟะบะฐ ะธ ะฐะฒัะพัััะฒะพัะพ ะพั ะต-ะฟะธัะผะพ" -#: command-list.h:120 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "ะัะพััะฐ ะฟัะพะณัะฐะผะฐ ะทะฐ ัะฐะทะดะตะปัะฝะต ะฝะฐ ัะฐะนะปะพะฒะต ะฒัะฒ ัะพัะผะฐั UNIX mbox" -#: command-list.h:121 +#: command-list.h:122 +msgid "Run tasks to optimize Git repository data" +msgstr "ะะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะทะฐะดะฐัะธ ะทะฐ ะพะฟัะธะผะธะทะธัะฐะฝะต ะฝะฐ ั ัะฐะฝะธะปะธัะตัะพ ะฝะฐ Git" + +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "ะกะปะธะฒะฐะฝะต ะฝะฐ ะดะฒะต ะธะปะธ ะฟะพะฒะตัะต ะฟะพัะตะดะธัะธ/ะธััะพัะธะธ ะพั ะฟัะพะผะตะฝะธ" -#: command-list.h:122 +#: command-list.h:124 msgid "Find as good common ancestors as possible for a merge" msgstr "ะัะบัะธะฒะฐะฝะต ะฝะฐ ะฝะฐะน-ะฟะพะดั ะพะดััะธัะต ะพะฑัะธ ะฟัะตะดัะตััะฒะตะฝะธัะธ ะทะฐ ัะปะธะฒะฐะฝะต" -#: command-list.h:123 +#: command-list.h:125 msgid "Run a three-way file merge" msgstr "ะะทะฟัะปะฝะตะฝะธะต ะฝะฐ ััะพะนะฝะพ ัะปะธะฒะฐะฝะต" -#: command-list.h:124 +#: command-list.h:126 msgid "Run a merge for files needing merging" msgstr "ะกะปะธะฒะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะตัะต, ะบะพะธัะพ ัะต ะฝัะถะดะฐัั ะพั ัะพะฒะฐ" -#: command-list.h:125 +#: command-list.h:127 msgid "The standard helper program to use with git-merge-index" msgstr "ะกัะฐะฝะดะฐััะฝะฐัะฐ ะฟะพะผะพัะฝะฐ ะฟัะพะณัะฐะผะฐ ะทะฐ โgit-merge-indexโ" -#: command-list.h:126 +#: command-list.h:128 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "ะะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะฟัะพะณัะฐะผะธัะต ะทะฐ ะบะพัะธะณะธัะฐะฝะต ะฝะฐ ะบะพะฝัะปะธะบัะธัะต ะฟัะธ ัะปะธะฒะฐะฝะต" -#: command-list.h:127 +#: command-list.h:129 msgid "Show three-way merge without touching index" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ััะพะนะฝะพ ัะปะธะฒะฐะฝะต ะฑะตะท ะฟัะพะผัะฝะฐ ะฝะฐ ะธะฝะดะตะบัะฐ" -#: command-list.h:128 +#: command-list.h:130 msgid "Write and verify multi-pack-indexes" msgstr "ะะฐะฟะธั ะธ ะฟัะพะฒะตัะบะฐ ะฝะฐ ะธะฝะดะตะบัะธัะต ะทะฐ ะผะฝะพะถะตััะฒะพ ะฟะฐะบะตัะธ" -#: command-list.h:129 +#: command-list.h:131 msgid "Creates a tag object" msgstr "ะกัะทะดะฐะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั-ะตัะธะบะตั" -#: command-list.h:130 +#: command-list.h:132 msgid "Build a tree-object from ls-tree formatted text" msgstr "ะกัะทะดะฐะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั-ะดััะฒะพ ะพั ัะตะบัั ะฒัะฒ ัะพัะผะฐั โls-treeโ" -#: command-list.h:131 +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "ะัะตะผะตััะฒะฐะฝะต ะธะปะธ ะฟัะตะธะผะตะฝัะฒะฐะฝะต ะฝะฐ ัะฐะนะป, ะดะธัะตะบัะพัะธั ะธะปะธ ัะธะผะฒะพะปะฝะฐ ะฒััะทะบะฐ" -#: command-list.h:132 +#: command-list.h:134 msgid "Find symbolic names for given revs" msgstr "ะัะบัะธะฒะฐะฝะต ะฝะฐ ะธะผะตะฝะฐัะฐ ะดะฐะดะตะฝะธ ะฝะฐ ะฒะตััะธั" -#: command-list.h:133 +#: command-list.h:135 msgid "Add or inspect object notes" msgstr "ะะพะฑะฐะฒัะฝะต ะธะปะธ ะฟัะตะณะปะตะด ะฝะฐ ะฑะตะปะตะถะบะธ ะบัะผ ะพะฑะตะบั" -#: command-list.h:134 +#: command-list.h:136 msgid "Import from and submit to Perforce repositories" msgstr "ะะฝะฐััะฝะต ะธ ะฟะพะดะฐะฒะฐะฝะต ะบัะผ ั ัะฐะฝะธะปะธัะฐ ะฝะฐ Perforce" -#: command-list.h:135 +#: command-list.h:137 msgid "Create a packed archive of objects" msgstr "ะกัะทะดะฐะฒะฐะฝะต ะฝะฐ ะฟะฐะบะตัะธัะฐะฝ ะฐัั ะธะฒ ะพั ะพะฑะตะบัะธ" -#: command-list.h:136 +#: command-list.h:138 msgid "Find redundant pack files" msgstr "ะะฐะผะธัะฐะฝะต ะฝะฐ ะฟะพะฒัะฐัััะธ ัะต ะฟะฐะบะตัะฝะธ ัะฐะนะปะพะฒะต" -#: command-list.h:137 +#: command-list.h:139 msgid "Pack heads and tags for efficient repository access" msgstr "ะะฐะบะตัะธัะฐะฝะต ะฝะฐ ะฒััั ะพะฒะตัะต ะธ ะตัะธะบะตัะธัะต ะทะฐ ะฑััะท ะดะพัััะฟ ะดะพ ั ัะฐะฝะธะปะธัะต" -#: command-list.h:138 +#: command-list.h:140 msgid "Routines to help parsing remote repository access parameters" msgstr "" "ะะพะผะพัะฝะธ ะฟัะพะณัะฐะผะธ ะทะฐ ะฐะฝะฐะปะธะทะฐ ะฝะฐ ะฟะฐัะฐะผะตััะธัะต ะทะฐ ะดะพัััะฟ ะดะพ ะพัะดะฐะปะตัะตะฝะพ ั ัะฐะฝะธะปะธัะต" -#: command-list.h:139 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "ะะตะฝะตัะธัะฐะฝะต ะฝะฐ ัะฝะธะบะฐะปะตะฝ ะธะดะตะฝัะธัะธะบะฐัะพั ะฝะฐ ะบััะฟะบะฐ" -#: command-list.h:140 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "ะะบะฐััััะฝะต ะฝะฐ ะฒัะธัะบะธ ะฝะตะดะพััะธะถะธะผะธ ะพะฑะตะบัะธ ะฒ ะฑะฐะทะฐัะฐ ะพั ะดะฐะฝะฝะธ ะทะฐ ะพะฑะตะบัะธัะต" -#: command-list.h:141 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "ะะทััะธะฒะฐะฝะต ะฝะฐ ะดะพะฟัะปะฝะธัะตะปะฝะธัะต ะพะฑะตะบัะธ, ะบะพะธัะพ ะฒะตัะต ัะฐ ะฒ ะฟะฐะบะตัะฝะธ ัะฐะนะปะพะฒะต" -#: command-list.h:142 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "ะะพััะฐะฒัะฝะต ะธ ะฒะฝะฐััะฝะต ะฝะฐ ะฟัะพะผะตะฝะธัะต ะพั ะดััะณะพ ั ัะฐะฝะธะปะธัะต ะธะปะธ ะบะปะพะฝ" -#: command-list.h:143 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "ะะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะพัะดะฐะปะตัะตะฝะธัะต ัะบะฐะทะฐัะตะปะธ ะธ ัะฒััะทะฐะฝะธัะต ั ััั ะพะฑะตะบัะธ" -#: command-list.h:144 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "ะัะธะปะฐะณะฐะฝะต ะฝะฐ ะฟะพัะตะดะธัะฐ ะพั ะบััะฟะบะธ ะพั quilt ะบัะผ ัะตะบััะธั ะบะปะพะฝ" -#: command-list.h:145 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "ะกัะฐะฒะฝัะฒะฐะฝะต ะฝะฐ ะดะฒะฐ ะดะธะฐะฟะฐะทะพะฝะฐ ะพั ะฟะพะดะฐะฒะฐะฝะธั (ะฝะฐะฟั. ะดะฒะต ะฒะตััะธะธ ะฝะฐ ะบะปะพะฝ)" -#: command-list.h:146 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "ะะทัะธัะฐะฝะต ะฝะฐ ะธะฝัะพัะผะฐัะธั ะทะฐ ะพะฑะตะบั-ะดััะฒะพ ะฒ ะธะฝะดะตะบัะฐ" -#: command-list.h:147 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "ะัะธะปะฐะณะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฒััั ั ะดััะณ ะฒััั " -#: command-list.h:148 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "ะะพะปััะฐะฒะฐะฝะต ะฝะฐ ะธะทัะปะฐัะบะฐะฝะพัะพ ะฒ ั ัะฐะฝะธะปะธัะตัะพ" -#: command-list.h:149 +#: command-list.h:151 msgid "Manage reflog information" msgstr "ะฃะฟัะฐะฒะปะตะฝะธะต ะฝะฐ ะธะฝัะพัะผะฐัะธััะฐ ะฒ ะถััะฝะฐะปะฐ ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต" -#: command-list.h:150 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "ะฃะฟัะฐะฒะปะตะฝะธะต ะฝะฐ ะฝะฐะฑะพั ะพั ัะปะตะดะตะฝะธ ั ัะฐะฝะธะปะธัะฐ" -#: command-list.h:151 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "ะะฐะบะตัะธัะฐะฝะต ะฝะฐ ะฝะตะฟะฐะบะตัะธัะฐะฝะธัะต ะพะฑะตะบัะธ ะฒ ั ัะฐะฝะธะปะธัะต" -#: command-list.h:152 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "ะกัะทะดะฐะฒะฐะฝะต, ะธะทะฒะตะถะดะฐะฝะต, ะธะทััะธะฒะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธ ะทะฐ ะทะฐะผัะฝะฐ ะฝะฐ ะพะฑะตะบัะธ" -#: command-list.h:153 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "ะะฑะพะฑัะตะฝะธะต ะฝะฐ ะฟัะตะดััะพััะธัะต ะฟัะพะผะตะฝะธ" -#: command-list.h:154 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "ะัะตะธะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฒะตัะต ะทะฐะฟะฐะทะตะฝะพ ะบะพัะธะณะธัะฐะฝะต ะฝะฐ ะบะพะฝัะปะธะบั ะฟัะธ ัะปะธะฒะฐะฝะต" -#: command-list.h:155 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "ะัะธะฒะตะถะดะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปั โHEADโ ะบัะผ ะทะฐะดะฐะดะตะฝะพัะพ ััััะพัะฝะธะต" -#: command-list.h:156 +#: command-list.h:158 msgid "Restore working tree files" msgstr "ะัะทััะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะตัะต ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: command-list.h:157 +#: command-list.h:159 msgid "Revert some existing commits" msgstr "ะัะผะตะฝัะฝะต ะฝะฐ ัััะตััะฒัะฒะฐัะธ ะฟะพะดะฐะฒะฐะฝะธั" -#: command-list.h:158 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฒ ะพะฑัะฐัะฝะฐ ั ัะพะฝะพะปะพะณะธัะตัะบะฐ ะฟะพะดัะตะดะฑะฐ" -#: command-list.h:159 +#: command-list.h:161 msgid "Pick out and massage parameters" msgstr "ะะทะฑะพั ะธ ะฟัะพะผัะฝะฐ ะฝะฐ ะฟะฐัะฐะผะตััะธ" -#: command-list.h:160 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "ะะทััะธะฒะฐะฝะต ะฝะฐ ัะฐะนะปะพะฒะต ะพั ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะธ ะธะฝะดะตะบัะฐ" -#: command-list.h:161 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "ะะทะฟัะฐัะฐะฝะต ะฝะฐ ะฟะพัะตะดะธัะฐ ะพั ะบััะฟะบะธ ะฟะพ ะต-ะฟะพัะฐ" -#: command-list.h:162 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "ะะทัะปะฐัะบะฒะฐะฝะต ะฝะฐ ะพะฑะตะบัะธ ะฟะพ ะฟัะพัะพะบะพะปะฐ ะฝะฐ Git ะบัะผ ะดััะณะพ ั ัะฐะฝะธะปะธัะต" -#: command-list.h:163 +#: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" msgstr "ะะณัะฐะฝะธัะตะฝะฐ ะฒั ะพะดะฝะฐ ะพะฑะฒะธะฒะบะฐ ะทะฐ ะดะพัััะฟ ะฟัะตะท SSH ัะฐะผะพ ะดะพ Git" -#: command-list.h:164 +#: command-list.h:166 msgid "Summarize 'git log' output" msgstr "ะะฑะพะฑัะตะฝ ะธะทั ะพะด ะพั โgit logโ" -#: command-list.h:165 +#: command-list.h:167 msgid "Show various types of objects" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะฐะทะปะธัะฝะธัะต ะฒะธะดะพะฒะต ะพะฑะตะบัะธ ะฒ Git" -#: command-list.h:166 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะบะปะพะฝะธัะต ะธ ะฟะพะดะฐะฒะฐะฝะธััะฐ ะฒ ััั " -#: command-list.h:167 +#: command-list.h:169 msgid "Show packed archive index" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะธะฝะดะตะบัะฐ ะฝะฐ ะฟะฐะบะตัะธัะฐะฝะธั ะฐัั ะธะฒ" -#: command-list.h:168 +#: command-list.h:170 msgid "List references in a local repository" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ัะบะฐะทะฐัะตะปะธัะต ะฒ ะปะพะบะฐะปะฝะพ ั ัะฐะฝะธะปะธัะต" -#: command-list.h:169 +#: command-list.h:171 msgid "Git's i18n setup code for shell scripts" msgstr "ะะฐัััะพะนะบะธ ะฝะฐ Git ะทะฐ ะธะฝัะตัะฝะฐัะธะพะฝะฐะปะธะทะฐัะธั ะฝะฐ ัะบัะธะฟัะพะฒะตัะต ะฝะฐ ะพะฑะฒะธะฒะบะฐัะฐ" -#: command-list.h:170 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "ะะฐัััะพะนะบะธ ะฝะฐ Git ะทะฐ ัะบัะธะฟัะพะฒะตัะต ะฝะฐ ะพะฑะฒะธะฒะบะฐัะฐ" -#: command-list.h:171 +#: command-list.h:173 +msgid "Initialize and modify the sparse-checkout" +msgstr "ะะฝะธัะธะฐะปะธะทะธัะฐะฝะต ะธ ะฟัะพะผัะฝะฐ ะฝะฐ ัะฐััะธัะฝะพัะพ ะธะทัะตะณะปัะฝะต" + +#: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "ะกะบะฐัะฐะฒะฐะฝะต ะฝะฐ ะฝะตะฟะพะดะฐะดะตะฝะธัะต ะฟัะพะผะตะฝะธ ะฒ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: command-list.h:172 +#: command-list.h:175 msgid "Add file contents to the staging area" msgstr "ะะพะฑะฐะฒัะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะฝะฐ ัะฐะนะปะฐ ะบัะผ ะธะฝะดะตะบัะฐ" -#: command-list.h:173 +#: command-list.h:176 msgid "Show the working tree status" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ััััะพัะฝะธะตัะพ ะฝะฐ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: command-list.h:174 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "ะัะตะผะฐั ะฒะฐะฝะต ะฝะฐ ะธะทะปะธัะฝะธัะต ะทะฝะฐัะธ ะทะฐ ะธะฝัะตัะฒะฐะปะธ" -#: command-list.h:175 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "ะะฝะธัะธะฐะปะธะทะธัะฐะฝะต, ะพะฑะฝะพะฒัะฒะฐะฝะต ะธะปะธ ัะฐะทะณะปะตะถะดะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะธ" -#: command-list.h:176 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "ะะฒัะฟะพัะพัะฝะฐ ัะฐะฑะพัะฐ ะผะตะถะดั ั ัะฐะฝะธะปะธัะฐ ะฟะพะด Subversion ะธ Git" -#: command-list.h:177 +#: command-list.h:180 msgid "Switch branches" msgstr "ะัะตะผะธะฝะฐะฒะฐะฝะต ะบัะผ ะดััะณ ะบะปะพะฝ" -#: command-list.h:178 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "ะะทะฒะตะถะดะฐะฝะต, ะฟัะพะผัะฝะฐ ะธ ะธะทััะธะฒะฐะฝะต ะฝะฐ ัะธะผะฒะพะปะฝะธ ัะบะฐะทะฐัะตะปะธ" -#: command-list.h:179 +#: command-list.h:182 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "ะะทะฒะตะถะดะฐะฝะต, ััะทะดะฐะฒะฐะฝะต, ะธะทััะธะฒะฐะฝะต, ะฟัะพะฒะตัะบะฐ ะฝะฐ ะตัะธะบะตัะธ ะฟะพะดะฟะธัะฐะฝะธ ั GPG" -#: command-list.h:180 +#: command-list.h:183 msgid "Creates a temporary file with a blob's contents" msgstr "ะกัะทะดะฐะฒะฐะฝะต ะฝะฐ ะฒัะตะผะตะฝะตะฝ ัะฐะนะป ััั ัััะพัะพ ััะดััะถะฐะฝะธะต ะบะฐัะพ ะพะฑะตะบััั-BLOB" -#: command-list.h:181 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "ะ ะฐะทะฟะฐะบะตัะธัะฐะฝะต ะฝะฐ ะพะฑะตะบัะธ ะพั ะฟะฐะบะตัะธัะฐะฝ ะฐัั ะธะฒ" -#: command-list.h:182 +#: command-list.h:185 msgid "Register file contents in the working tree to the index" msgstr "ะ ะตะณะธัััะธัะฐะฝะต ะฝะฐ ััะดััะถะฐะฝะธะตัะพ ะฝะฐ ัะฐะนะปะพะฒะตัะต ะพั ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะฒ ะธะฝะดะตะบัะฐ" -#: command-list.h:183 +#: command-list.h:186 msgid "Update the object name stored in a ref safely" msgstr "ะะตะทะพะฟะฐัะฝะพ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะธะผะตัะพ ะฝะฐ ะพะฑะตะบั ะฒ ัะบะฐะทะฐัะตะป" -#: command-list.h:184 +#: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" msgstr "" "ะะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ัะฐะนะปะฐ ั ะดะพะฟัะปะฝะธัะตะปะฝะฐ ะธะฝัะพัะผะฐัะธั ะฒ ะฟะพะผะพั ะฝะฐ ะพะฟัะพััะตะฝะธัะต ัััะฒััะธ" -#: command-list.h:185 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "ะะทะฟัะฐัะฐะฝะต ะฝะฐ ะฐัั ะธะฒะฐ ะพะฑัะฐัะฝะพ ะบัะผ โgit-archiveโ" -#: command-list.h:186 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "ะะทะฟัะฐัะฐะฝะต ะฝะฐ ะฟะฐะบะตัะธัะฐะฝะธัะต ะพะฑะตะบัะธ ะพะฑัะฐัะฝะพ ะบัะผ โgit-fetch-packโ" -#: command-list.h:187 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะปะพะณะธัะตัะบะฐ ะฟัะพะผะตะฝะปะธะฒะฐ ะฝะฐ Git" -#: command-list.h:188 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะฟะพะดะฟะธัะธัะต GPG ะฒััั ั ะฟะพะดะฐะฒะฐะฝะธััะฐ" -#: command-list.h:189 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะฟะฐะบะตัะธัะฐะฝะธัะต ะฐัั ะธะฒะฝะธ ัะฐะนะปะพะฒะต ะฝะฐ Git" -#: command-list.h:190 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "ะัะพะฒะตัะบะฐ ะฝะฐ ะฟะพะดะฟะธัะธัะต GPG ะฒััั ั ะตัะธะบะตัะธัะต" -#: command-list.h:191 +#: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" msgstr "ะฃะตะฑ ะธะฝัะตััะตะนั ะฝะฐ Git" -#: command-list.h:192 +#: command-list.h:195 msgid "Show logs with difference each commit introduces" msgstr "ะะทะฒะตะถะดะฐะฝะต ะฝะฐ ะถััะฝะฐะป ั ัะฐะทะปะธะบะธัะต, ะฒัะฒะตะดะตะฝะธ ั ะฒััะบะพ ะฟะพะดะฐะฒะฐะฝะต" -#: command-list.h:193 +#: command-list.h:196 msgid "Manage multiple working trees" msgstr "ะฃะฟัะฐะฒะปะตะฝะธะต ะฝะฐ ะผะฝะพะถะตััะฒะพ ัะฐะฑะพัะฝะธ ะดััะฒะตัะฐ" -#: command-list.h:194 +#: command-list.h:197 msgid "Create a tree object from the current index" msgstr "ะกัะทะดะฐะฒะฐะฝะต ะฝะฐ ะพะฑะตะบั-ะดััะฒะพ ะพั ัะตะบััะธั ะธะฝะดะตะบั" -#: command-list.h:195 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "ะฃะบะฐะทะฒะฐะฝะต ะฝะฐ ะฐััะธะฑััะธ ะบัะผ ะฟัั" -#: command-list.h:196 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "ะะพะผะฐะฝะดะตะฝ ัะตะด ะธ ะบะพะฝะฒะตะฝัะธะธ ะฝะฐ Git" -#: command-list.h:197 +#: command-list.h:200 msgid "A Git core tutorial for developers" msgstr "ะัะฒะตะถะดะฐั ััะพะบ ะฒ Git ะทะฐ ัะฐะทัะฐะฑะพััะธัะธ" -#: command-list.h:198 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "ะัะฒะตะถะดะฐะฝะต ะฝะฐ ะธะผะตะฝะฐ ะธ ะฟะฐัะพะปะธ ะบัะผ Git" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "Git ะทะฐ ะฟะพััะตะฑะธัะตะปะธ ะฝะฐ CVS" -#: command-list.h:199 +#: command-list.h:203 msgid "Tweaking diff output" msgstr "ะะฐัััะพะนะฒะฐะฝะต ะฝะฐ ะธะทะณะปะตะดะฐ ะฝะฐ ัะฐะทะปะธะบะธัะต" -#: command-list.h:200 +#: command-list.h:204 msgid "A useful minimum set of commands for Everyday Git" msgstr "ะะพะปะตะทะตะฝ ะผะธะฝะธะผะฐะปะตะฝ ะฝะฐะฑะพั ะพั ะบะพะผะฐะฝะดะธ ะทะฐ ะตะถะตะดะฝะตะฒะฝะฐัะฐ ัะฐะฑะพัะฐ ั Git" -#: command-list.h:201 +#: command-list.h:205 +msgid "Frequently asked questions about using Git" +msgstr "ะงะตััะพ ะทะฐะดะฐะฒะฐะฝะธ ะฒัะฟัะพัะธ ะทะฐ ัะฟะพััะตะฑะฐัะฐ ะฝะฐ Git" + +#: command-list.h:206 msgid "A Git Glossary" msgstr "ะ ะตัะฝะธะบ ั ัะตัะผะธะฝะธัะต ะฝะฐ Git" -#: command-list.h:202 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "ะัะบะธ ะฝะฐ Git" -#: command-list.h:203 +#: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "ะฃะบะฐะทะฒะฐะฝะต ะฝะฐ ะฝะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต, ะบะพะธัะพ ะดะฐ ะฑัะดะฐั ะฝะฐัะพัะฝะพ ะฟัะตะฝะตะฑัะตะณะฒะฐะฝะธ" -#: command-list.h:204 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "ะะตัะธะฝะธัะฐะฝะต ะฝะฐ ัะฒะพะนััะฒะฐัะฐ ะฝะฐ ะฟะพะดะผะพะดัะปะธัะต" -#: command-list.h:205 +#: command-list.h:210 msgid "Git namespaces" msgstr "ะัะพัััะฐะฝััะฒะฐ ะพั ะธะผะตะฝะฐ ะฝะฐ Git" -#: command-list.h:206 +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "ะะพะผะพัะฝะธ ะฟัะพะณัะฐะผะธ ะทะฐ ัะฐะฑะพัะฐ ั ะพัะดะฐะปะตัะตะฝะธัะต ั ัะฐะฝะธะปะธัะฐ" + +#: command-list.h:212 msgid "Git Repository Layout" msgstr "ะฃัััะพะนััะฒะพ ะฝะฐ ั ัะฐะฝะธะปะธัะตัะพ ะฝะฐ Git" -#: command-list.h:207 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "ะฃะบะฐะทะฒะฐะฝะต ะฝะฐ ะฒะตััะธะธ ะธ ะดะธะฐะฟะฐะทะพะฝะธ ะฒ Git" -#: command-list.h:208 +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "ะะพะฝัะธัะฐะฝะต ะฝะฐ ะตะดะฝะพ ั ัะฐะฝะธะปะธัะต ะฒ ะดััะณะพ" + +#: command-list.h:215 msgid "A tutorial introduction to Git: part two" msgstr "ะัะฒะตะถะดะฐั ััะพะบ ะทะฐ Git: ะฒัะพัะฐ ัะฐัั" -#: command-list.h:209 +#: command-list.h:216 msgid "A tutorial introduction to Git" msgstr "ะัะฒะตะถะดะฐั ััะพะบ ะทะฐ Git" -#: command-list.h:210 +#: command-list.h:217 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 +#: git-bisect.sh:79 #, sh-format msgid "Bad rev input: $arg" msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ะฒะตััะธั: โ${arg}โ" -#: git-bisect.sh:121 +#: git-bisect.sh:99 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ะฒะตััะธั: โ$bisected_headโ" -#: git-bisect.sh:130 +#: git-bisect.sh:108 #, sh-format msgid "Bad rev input: $rev" msgstr "ะะตะฟัะฐะฒะธะปะฝะฐ ะฒะตััะธั: โ${rev}โ" -#: git-bisect.sh:139 +#: git-bisect.sh:117 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "ะะพะผะฐะฝะดะฐัะฐ โgit bisect ${TERM_BAD}โ ะฟัะธะตะผะฐ ัะฐะผะพ ะตะดะธะฝ ะฐัะณัะผะตะฝั." -#: git-bisect.sh:209 +#: git-bisect.sh:149 msgid "No logfile given" msgstr "ะะต ะต ะทะฐะดะฐะดะตะฝ ะถััะฝะฐะปะตะฝ ัะฐะนะป" -#: git-bisect.sh:210 +#: git-bisect.sh:150 #, sh-format msgid "cannot read $file for replaying" msgstr "" "ะััะฝะฐะปะฝะธัั ัะฐะนะป โ${file}โ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะฟัะพัะตัะตะฝ, ะทะฐ ะดะฐ ัะต ะธะทะฟัะปะฝัั " "ะบะพะผะฐะฝะดะธัะต ะพั ะฝะตะณะพ ะฝะฐะฝะพะฒะพ" -#: git-bisect.sh:232 +#: git-bisect.sh:173 msgid "?? what are you talking about?" msgstr "" "ะะตะฟะพะทะฝะฐัะฐ ะบะพะผะฐะฝะดะฐ. ะัะทะผะพะถะฝะธัะต ะฒะฐัะธะฐะฝัะธ ัะฐ: โstartโ, โgoodโ, โbadโ, โskipโ" -#: git-bisect.sh:241 +#: git-bisect.sh:183 msgid "bisect run failed: no command provided." msgstr "ะฝะตััะฟะตัะฝะพ ะดะฒะพะธัะฝะพ ััััะตะฝะต, ะฝะต ะต ะทะฐะดะฐะดะตะฝะฐ ะบะพะผะฐะฝะดะฐ." -#: git-bisect.sh:246 +#: git-bisect.sh:188 #, sh-format msgid "running $command" msgstr "ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โ${command}โ" -#: git-bisect.sh:253 +#: git-bisect.sh:195 #, sh-format msgid "" "bisect run failed:\n" @@ -22603,11 +24788,11 @@ msgstr "" "ะธะทั ะพะดะฝะธัั ะบะพะด ะพั ะบะพะผะฐะฝะดะฐัะฐ โ${command}โ ะต ${res} โ ัะพะฒะฐ ะต ะธะทะฒัะฝ ะธะฝัะตัะฒะฐะปะฐ " "[0, 128)" -#: git-bisect.sh:279 +#: git-bisect.sh:221 msgid "bisect run cannot continue any more" msgstr "ะดะฒะพะธัะฝะพัะพ ััััะตะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฟัะพะดัะปะถะธ" -#: git-bisect.sh:285 +#: git-bisect.sh:227 #, sh-format msgid "" "bisect run failed:\n" @@ -22616,11 +24801,11 @@ msgstr "" "ะฝะตััะฟะตัะฝะพ ะดะฒะพะธัะฝะพ ััััะตะฝะต:\n" "ััะฝะบัะธััะฐ โbisect_state ${state}โ ะทะฐะฒัััะธ ั ะบะพะด ะทะฐ ะณัะตัะบะฐ ${res}" -#: git-bisect.sh:292 +#: git-bisect.sh:234 msgid "bisect run success" msgstr "ััะฟะตัะฝะพ ะดะฒะพะธัะฝะพ ััััะตะฝะต" -#: git-bisect.sh:300 +#: git-bisect.sh:242 msgid "We are not bisecting." msgstr "ะ ะผะพะผะตะฝัะฐ ะฝะต ัะต ะธะทะฒัััะฒะฐ ะดะฒะพะธัะฝะพ ััััะตะฝะต." @@ -22662,149 +24847,52 @@ msgstr "ะะฟะธั ะทะฐ ะฟัะพััะพ ัะปะธะฒะฐะฝะต ั โ$pretty_nameโ" msgid "Simple merge did not work, trying automatic merge." msgstr "ะัะพััะพัะพ ัะปะธะฒะฐะฝะต ะฝะต ััะฐะฑะพัะธ, ะฟัะพะฑะฒะฐ ัะต ะฐะฒัะพะผะฐัะธัะฝะพ ัะปะธะฒะฐะฝะต." -#: git-legacy-stash.sh:220 -msgid "Cannot remove temporary index (can't happen)" -msgstr "ะัะตะผะตะฝะฝะธัั ะธะฝะดะตะบั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" - -#: git-legacy-stash.sh:271 -#, sh-format -msgid "Cannot update $ref_stash with $w_commit" -msgstr "" -"ะฃะบะฐะทะฐัะตะปัั โ${ref_stash}โ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ ะดะฐ ัะพัะธ ะบัะผ โ${w_commit}โ" - -#: git-legacy-stash.sh:323 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "ะะ ะะจะะ: ะบะพะผะฐะฝะดะฐัะฐ โstash pushโ ะฝะต ะฟัะธะตะผะฐ ะพะฟัะธััะฐ โ$optionโ" - -#: git-legacy-stash.sh:355 -#, sh-format -msgid "Saved working directory and index state $stash_msg" -msgstr "" -"ะกัััะพัะฝะธะตัะพ ะฝะฐ ัะฐะฑะพัะฝะฐัะฐ ะดะธัะตะบัะพัะธั ะธ ะธะฝะดะตะบัะฐ ัะฐ ะทะฐะฟะฐะทะตะฝะธ: โ$stash_msgโ" - -#: git-legacy-stash.sh:535 -#, sh-format -msgid "unknown option: $opt" -msgstr "ะฝะตะฟะพะทะฝะฐัะฐ ะพะฟัะธั: ${opt}" - -#: git-legacy-stash.sh:555 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "ะฃะบะฐะทะฐะฝะธ ัะฐ ะฟัะตะบะฐะปะตะฝะพ ะผะฝะพะณะพ ะฒะตััะธะธ: โ${REV}โ" - -#: git-legacy-stash.sh:570 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "ะฃะบะฐะทะฐัะตะปัั โ${reference}โ ะต ะณัะตัะตะฝ" - -#: git-legacy-stash.sh:598 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "โ${args}โ ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต, ะฟัะธะปะธัะฐัะพ ะฝะฐ ะฝะตัะพ ัะบะฐัะฐะฝะพ" - -#: git-legacy-stash.sh:609 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "โ${args}โ ะฝะต ะต ัะบะฐะทะฐัะตะป ะบัะผ ะฝะตัะพ ัะบะฐัะฐะฝะพ" - -#: git-legacy-stash.sh:617 -msgid "unable to refresh index" -msgstr "ะธะฝะดะตะบััั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพะฑะฝะพะฒะตะฝ" - -#: git-legacy-stash.sh:621 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "ะะพ ะฒัะตะผะต ะฝะฐ ัะปะธะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฟัะธะปะพะถะธัะต ะฝะตัะพ ัะบะฐัะฐะฝะพ" - -#: git-legacy-stash.sh:629 -msgid "Conflicts in index. Try without --index." -msgstr "" -"ะ ะธะฝะดะตะบัะฐ ะธะผะฐ ะบะพะฝัะปะธะบัะธ. ะัะพะฑะฒะฐะนัะต ะดะฐ ะธะทะฟัะปะฝะธัะต ะบะพะผะฐะฝะดะฐัะฐ ะฑะตะท ะพะฟัะธััะฐ โ--" -"indexโ." - -#: git-legacy-stash.sh:631 -msgid "Could not save index tree" -msgstr "ะััะฒะพัะพ ัะพัะตะฝะพ ะพั ะธะฝะดะตะบัะฐ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝะพ" - -#: git-legacy-stash.sh:640 -msgid "Could not restore untracked files from stash entry" -msgstr "ะะตัะปะตะดะตะฝะธ ัะฐะนะปะพะฒะต ะฝะต ะผะพะณะฐั ะดะฐ ัะต ะฒัะทััะฐะฝะพะฒัั ะพั ัะบะฐัะฐะฝะพัะพ" - -#: git-legacy-stash.sh:665 -msgid "Cannot unstage modified files" -msgstr "ะัะพะผะตะฝะตะฝะธัะต ัะฐะนะปะพะฒะต ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะธะทะฒะฐะดะตะฝะธ ะพั ะธะฝะดะตะบัะฐ" - -#: git-legacy-stash.sh:703 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "ะะทััะธัะพ ะต ัะบะฐัะฐะฝะพัะพ โ${REV}โ ($s)" - -#: git-legacy-stash.sh:704 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "ะกะบะฐัะฐะฝะพัะพ โ${REV}โ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธัะพ" - -#: git-legacy-stash.sh:791 -msgid "(To restore them type \"git stash apply\")" -msgstr "(ะะฐ ะดะฐ ะณะธ ะฒัะทััะฐะฝะพะฒะธัะต, ะธะทะฟัะปะฝะตัะต ะบะพะผะฐะฝะดะฐัะฐ โgit stash applyโ)" - -#: git-submodule.sh:200 +#: git-submodule.sh:180 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "ะัะฝะพัะธัะตะปะตะฝ ะฟัั ะผะพะถะต ะดะฐ ัะต ะฟะพะปะทะฒะฐ ัะฐะผะพ ะพั ะพัะฝะพะฒะฝะฐัะฐ ะดะธัะตะบัะพัะธั ะฝะฐ ัะฐะฑะพัะฝะพัะพ " "ะดััะฒะพ" -#: git-submodule.sh:210 +#: git-submodule.sh:190 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" "ะฐะดัะตั ะฝะฐ ั ัะฐะฝะธะปะธัะต: โ${repo}โ ัััะฑะฒะฐ ะธะปะธ ะดะฐ ะต ะฐะฑัะพะปััะตะฝ, ะธะปะธ ะดะฐ ะทะฐะฟะพัะฒะฐ ั " "โ./โ ะธะปะธ โ../โ" -#: git-submodule.sh:229 +#: git-submodule.sh:209 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "โ${sm_path}โ ะฒะตัะต ัััะตััะฒัะฒะฐ ะฒ ะธะฝะดะตะบัะฐ" -#: git-submodule.sh:232 +#: git-submodule.sh:212 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "โ${sm_path}โ ะฒะตัะต ัััะตััะฒัะฒะฐ ะฒ ะธะฝะดะตะบัะฐ ะธ ะฝะต ะต ะฟะพะดะผะพะดัะป" -#: git-submodule.sh:239 +#: git-submodule.sh:219 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "ะฒ โ${sm_path}โ ะฝะต ะต ะธะทัะตะณะปะตะฝะพ ะฟะพะดะฐะฒะฐะฝะต" -#: 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 +#: git-submodule.sh:250 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "ะะพะฑะฐะฒัะฝะต ะฝะฐ ัััะตััะฒัะฒะฐัะพัะพ ั ัะฐะฝะธะปะธัะต ะฒ โ${sm_path}โ ะบัะผ ะธะฝะดะตะบัะฐ" -#: git-submodule.sh:270 +#: git-submodule.sh:252 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "โ${sm_path}โ ัััะตััะฒัะฒะฐ, ะฐ ะฝะต ะต ั ัะฐะฝะธะปะธัะต ะฝะฐ Git" -#: git-submodule.sh:278 +#: git-submodule.sh:260 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "ะัะบัะธัะฐ ะต ะปะพะบะฐะปะฝะฐ ะดะธัะตะบัะพัะธั ะฝะฐ Git โ โ${sm_name}โ, ะบะพััะพ ัะพัะธ ะบัะผ " "ะพัะดะฐะปะตัะตะฝะธัะต ั ัะฐะฝะธะปะธัะฐ:" -#: git-submodule.sh:280 +#: git-submodule.sh:262 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22821,37 +24909,37 @@ msgstr "" "ะฟัะฐะฒะธะปะฝะพัะพ ั ัะฐะฝะธะปะธัะต ะธะปะธ ะฐะบะพ ะฝะต ะทะฝะฐะตัะต ะบะฐะบะฒะพ ะพะทะฝะฐัะฐะฒะฐ ัะพะฒะฐ, ะธะทะฟะพะปะทะฒะฐะนัะต\n" "ะดััะณะพ ะธะผะต ะบะฐัะพ ะฐัะณัะผะตะฝั ะบัะผ ะพะฟัะธััะฐ โ--nameโ." -#: git-submodule.sh:286 +#: git-submodule.sh:268 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "ะะบัะธะฒะธัะฐะฝะต ะฝะฐ ะปะพะบะฐะปะฝะพัะพ ั ัะฐะฝะธะปะธัะต ะทะฐ ะฟะพะดะผะพะดัะปะฐ โ${sm_name}โ ะฝะฐะฝะพะฒะพ." -#: git-submodule.sh:298 +#: git-submodule.sh:280 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "ะะพะดะผะพะดัะปัั โ${sm_path}โ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทัะตะณะปะตะฝ" -#: git-submodule.sh:303 +#: git-submodule.sh:285 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "ะะตััะฟะตัะฝะพ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ${sm_path}โ" -#: git-submodule.sh:312 +#: git-submodule.sh:294 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "ะะตััะฟะตัะฝะพ ัะตะณะธัััะธัะฐะฝะต ะฝะฐ ะฟะพะดะผะพะดัะปะฐ โ${sm_path}โ" -#: git-submodule.sh:573 +#: git-submodule.sh:567 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "ะขะตะบััะฐัะฐ ะฒะตััะธั ะทะฐ ะฟะพะดะผะพะดัะปะฐ ะฒ โ${displaypath}โ ะปะธะฟัะฒะฐ" -#: git-submodule.sh:583 +#: git-submodule.sh:577 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "ะะตััะฟะตัะฝะพ ะดะพััะฐะฒัะฝะต ะฒ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ${sm_path}โ" -#: git-submodule.sh:588 +#: git-submodule.sh:582 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -22860,7 +24948,7 @@ msgstr "" "ะขะตะบััะฐัะฐ ะฒะตััะธั โ${remote_name}/${branch}โ ะฒ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ${sm_path}โ " "ะปะธะฟัะฒะฐ" -#: git-submodule.sh:606 +#: git-submodule.sh:600 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -22869,7 +24957,7 @@ msgstr "" "ะะตััะฟะตัะฝะพ ะดะพััะฐะฒัะฝะต ะฒ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ${displaypath}โ, ะพะฟะธั ะทะฐ ะดะธัะตะบัะฝะพ " "ะดะพััะฐะฒัะฝะต ะฝะฐ โ${sha1}โ" -#: git-submodule.sh:612 +#: git-submodule.sh:606 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -22878,86 +24966,58 @@ msgstr "" "ะะพะดะผะพะดัะปัั ะฒ ะฟััั โ$displaypathโ ะต ะดะพััะฐะฒะตะฝ, ะฝะพ ะฝะต ััะดััะถะฐ ะพะฑะตะบัะฐ ััั ััะผะฐ\n" "โ${sha1}โ. ะะธัะตะบัะฝะพัะพ ะดะพััะฐะฒัะฝะต ะฝะฐ ัะพะฒะฐ ะฟะพะดะฐะฒะฐะฝะต ะต ะฝะตััะฟะตัะฝะพ." -#: git-submodule.sh:619 +#: git-submodule.sh:613 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "ะะตััะฟะตัะฝะพ ะธะทัะตะณะปัะฝะต ะฝะฐ ะฒะตััะธั โ${sha1}โ ะฒ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ${displaypath}โ'" -#: git-submodule.sh:620 +#: git-submodule.sh:614 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "ะัั ะบัะผ ะฟะพะดะผะพะดัะป โ${displaypath}โ: ะธะทัะตะณะปะตะฝะฐ ะต ะฒะตััะธั โ${sha1}โ" -#: git-submodule.sh:624 +#: git-submodule.sh:618 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "ะะตััะฟะตัะฝะพ ะฟัะตะฑะฐะทะธัะฐะฝะต ะฝะฐ ะฒะตััะธั โ${sha1}โ ะฒ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป " "โ${displaypath}โ" -#: git-submodule.sh:625 +#: git-submodule.sh:619 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "ะัั ะบัะผ ะฟะพะดะผะพะดัะป โ${displaypath}โ: ะฟัะตะฑะฐะทะธัะฐะฝะต ะฒััั ั ะฒะตััะธั โ${sha1}โ" -#: git-submodule.sh:630 +#: git-submodule.sh:624 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "ะะตััะฟะตัะฝะพ ัะปะธะฒะฐะฝะต ะฝะฐ ะฒะตััะธั โ${sha1}โ ะฒ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ${displaypath}โ" -#: git-submodule.sh:631 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "ะัั ะบัะผ ะฟะพะดะผะพะดัะป โ${displaypath}โ: ัะปะธะฒะฐะฝะต ั ะฒะตััะธั โ${sha1}โ" -#: git-submodule.sh:636 +#: git-submodule.sh:630 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "ะะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ ะบะพะผะฐะฝะดะฐัะฐ โ${command} ${sha1}โ ะฒ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป " "โ${displaypath}โ" -#: git-submodule.sh:637 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "ะัั ะบัะผ ะฟะพะดะผะพะดัะป โ${displaypath}โ: โ${command} ${sha1}โ" -#: git-submodule.sh:668 +#: git-submodule.sh:662 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "ะะตััะฟะตัะฝะฐ ะพะฑัะฐะฑะพัะบะฐ ะฝะฐ ะฟะพะดะดะธัะตะบัะพัะธะธัะต ะฒ ะฟััั ะบัะผ ะฟะพะดะผะพะดัะป โ${displaypath}โ" -#: git-submodule.sh:830 -msgid "The --cached option cannot be used with the --files option" -msgstr "ะะฟัะธะธัะต โ--cachedโ ะธ โ--filesโ ัะฐ ะฝะตััะฒะผะตััะธะผะธ" - -#: git-submodule.sh:882 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "ะฝะตะพัะฐะบะฒะฐะฝ ัะตะถะธะผ โ${mod_dst}โ" - -#: git-submodule.sh:902 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr "" -" ะะ ะะะฃะะ ะะะะะะะ: โ${display_name}โ ะฝะต ััะดััะถะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ โ${sha1_src}โ" - -#: git-submodule.sh:905 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr "" -" ะะ ะะะฃะะ ะะะะะะะ: โ${display_name}โ ะฝะต ััะดััะถะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ โ${sha1_dst}โ" - -#: 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}โ" - #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." @@ -22972,12 +25032,22 @@ msgstr "ะะฒัะพะผะฐัะธัะฝะพ ัะบะฐัะฐะฝะพัะพ ะต ะฟัะธะปะพะถะตะฝะพ." msgid "Cannot store $stash_sha1" msgstr "โ$stash_sha1โ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝ" +#: git-rebase--preserve-merges.sh:113 +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 "" +"ะัะธะปะฐะณะฐะฝะตัะพ ะฝะฐ ะฐะฒัะพะผะฐัะธัะฝะพ ัะบะฐัะฐะฝะพัะพ ะดะพะฒะตะดะต ะดะพ ะบะพะฝัะปะธะบัะธ. ะัะพะผะตะฝะธัะต ะฒะธ ัะฐ\n" +"ะฝะฐะดะตะถะดะฝะพ ัะบะฐัะฐะฝะธ. ะะพะถะตัะต ะดะฐ ะฟัะพะฑะฒะฐัะต ะดะฐ ะณะธ ะฟัะธะปะพะถะธัะต ััะตะท โgit stash popโ\n" +"ะธะปะธ ะดะฐ ะณะธ ะธะทั ะฒััะปะธัะต ััะตะท โgit stash dropโ, ะบะพะณะฐัะพ ะฟะพะธัะบะฐัะต.\n" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "ะัะตะฑะฐะทะธัะฐะฝะต ($new_count/$total)" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -23021,7 +25091,7 @@ msgstr "" "ะะพะถะต ะดะฐ ะฟัะพะผะตะฝััะต ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะพัััะฐ ะฝะฐ ัะตะดะพะฒะตัะต โ ัะต ัะต ะธะทะฟัะปะฝัะฒะฐั\n" "ะฟะพัะปะตะดะพะฒะฐัะตะปะฝะพ ะพัะณะพัะต-ะฝะฐะดะพะปั.\n" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -23040,84 +25110,84 @@ msgstr "" "\n" " git rebase --continue" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: ัะพะฒะฐ ะฝะต ะต ะฟะพะดะฐะฒะฐะฝะต, ะบะพะตัะพ ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฑัะฐะฝะพ" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "ะะตะฟัะฐะฒะธะปะฝะพ ะธะผะต ะฝะฐ ะฟะพะดะฐะฒะฐะฝะต: โ$sha1โ" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "" "ะะฐะผะตััะฒะฐัะฐัะฐ ััะผะฐ ะฟะพ SHA1 ะทะฐ ัะตะบััะพัะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝะฐ" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "ะัะตะฒัััะฐะฝะต ะดะพ โ$sha1โ" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะฟัะตะฒัััะธ ะดะพ โ$sha1โ" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "ะฃะบะฐะทะฐัะตะปัั โHEADโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะฝะฐัะพัะธ ะบัะผ โ$first_parentโ" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "ะะพะดะฐะฒะฐะฝะตัะพ ะฝะต ะผะพะถะต ะดะฐ ัะต ัะผะฐัะบะฐ: โ$sha1โ" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "ะัะตัะบะฐ ะฟัะธ ะฟะพะฒัะฐััะฝะตัะพ ะฝะฐ ัะปะธะฒะฐะฝะตัะพ ะฝะฐ โ$sha1โ" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "โ$sha1โ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฑะตัะต." -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "ะขะพะฒะฐ ะต ััะพะฑัะตะฝะธะต ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต โ${n}:" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "ะกัะพะฑัะตะฝะธะต ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต โ${n} ัะต ะฑัะดะต ะฟัะตัะบะพัะตะฝะพ." -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "ะขะพะฒะฐ ะต ะพะฑะตะดะธะฝะตะฝะธะต ะพั $count ะฟะพะดะฐะฒะฐะฝะต." msgstr[1] "ะขะพะฒะฐ ะต ะพะฑะตะดะธะฝะตะฝะธะต ะพั $count ะฟะพะดะฐะฒะฐะฝะธั." -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "ะะพะฒะพัะพ ััะพะฑัะตะฝะธะต ะฟัะธ ะฟะพะดะฐะฒะฐะฝะต โ$fixup_msgโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะทะฐะฟะฐะทะตะฝะพ" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 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 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "ะะต ะผะพะถะต ะดะฐ ัะต ะฟะพะดะฐะดะต $sha1โฆ $rest" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -23133,31 +25203,31 @@ msgstr "" "ะบะพัะธะณะธัะฐัะต,\n" "ะฟัะตะดะธ ะดะฐ ะผะพะถะตัะต ะดะฐ ะฟัะพะผะตะฝะธัะต ะฟะพะดะฐะฒะฐะฝะตัะพ." -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "ะกะฟะธัะฐะฝะต ะฟัะธ โ$sha1_abbrevโฆโ $rest" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "ะะตะท ะฟัะตะดั ะพะดะฝะพ ะฟะพะดะฐะฒะฐะฝะต ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ โ$squash_styleโ" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "ะ ะผะพะผะตะฝัะฐ ัะต ะธะทะฟัะปะฝัะฒะฐ: $rest" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "ะะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต: $rest" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "ะธ ะฟัะพะผะตะฝะธ ะธะฝะดะตะบัะฐ ะธ/ะธะปะธ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -23168,7 +25238,7 @@ msgstr "" " git rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -23183,25 +25253,25 @@ msgstr "" "\n" " git rebase --continue" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "ะะตะฟะพะทะฝะฐัะฐ ะบะพะผะฐะฝะดะฐ: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "ะะพัะธะณะธัะฐะนัะต ัะพะฒะฐ ััะตะท โgit rebase --edit-todoโ." -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "ะฃัะฟะตัะฝะพ ะฟัะตะฑะฐะทะธัะฐะฝะต ะธ ะพะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ โ$head_nameโ." -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "ะฃะบะฐะทะฐัะตะปัั โCHERRY_PICK_HEADโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทััะธั" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -23231,11 +25301,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "ะะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะบัะธั ะฐะฒัะพั ะทะฐ ะฟะพะฟัะฐะฒัะฝะตัะพ ะฝะฐ ะฟะพะดะฐะฒะฐะฝะตัะพ" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -23243,33 +25313,33 @@ msgstr "" "ะ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ ะธะผะฐ ะฝะตะฟะพะดะฐะดะตะฝะธ ะฟัะพะผะตะฝะธ. ะััะฒะพ ะณะธ ะฟะพะดะฐะนัะต, ะฐ ัะปะตะด ัะพะฒะฐ\n" "ะพัะฝะพะฒะพ ะธะทะฟัะปะฝะตัะต โgit rebase --continueโ." -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "ะัะพะผะตะฝะธัะต ะฒ ะธะฝะดะตะบัะฐ ะฝะต ะผะพะณะฐั ะดะฐ ะฑัะดะฐั ะฟะพะดะฐะดะตะฝะธ." -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "ะขะตะบััะพะฒะธัั ัะตะดะฐะบัะพั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะฐััะธัะฐะฝ" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "โ$switch_toโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทัะตะณะปะธ" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "ะะธะฟัะฒะฐ ัะบะฐะทะฐัะตะป โHEADโ" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "ะัะตะผะตะฝะฝะฐัะฐ ะดะธัะตะบัะพัะธั โ$state_dirโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝะฐ" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "ะัะตะฑะฐะทะธัะฐะฝะตัะพ ะฝะต ะต ะธะฝัะตัะฐะบัะธะฒะฝะพ" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" @@ -23278,7 +25348,11 @@ msgstr[0] "" msgstr[1] "" "ะัะตะฑะฐะทะธัะฐะฝะต ะฝะฐ $shortrevisions ะฒััั ั $shortonto ($todocount ะบะพะผะฐะฝะดะธ)" -#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:945 +msgid "Note that empty commits are commented out" +msgstr "ะัะฐะทะฝะธัะต ะฟะพะดะฐะฒะฐะฝะธั ัะฐ ะบะพะผะตะฝัะธัะฐะฝะธ" + +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "ะกะฟะธััะบัั ั ะฟัะตะทะฐะฟะธัะฐะฝะธัะต ะฟะพะดะฐะฒะฐะฝะธั ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ััะทะดะฐะดะตะฝ" @@ -23350,81 +25424,19 @@ 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:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%14s %14s %s" -#: 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 +#: git-add--interactive.perl:634 #, 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: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 +#: git-add--interactive.perl:1058 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -23433,7 +25445,7 @@ msgstr "" "ะฝะตะทะฐะฑะฐะฒะฝะพ\n" "ะดะพะฑะฐะฒะตะฝะพ ะบัะผ ะธะฝะดะตะบัะฐ" -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1061 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -23442,7 +25454,7 @@ msgstr "" "ะฝะตะทะฐะฑะฐะฒะฝะพ\n" "ัะบััะฐะฝะพ" -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1064 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -23451,8 +25463,8 @@ msgstr "" "ะฝะตะทะฐะฑะฐะฒะฝะพ\n" "ะธะทะฒะฐะดะตะฝะพ ะพั ะธะฝะดะตะบัะฐ." -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -23461,8 +25473,8 @@ msgstr "" "ะฝะตะทะฐะฑะฐะฒะฝะพ\n" "ะฝะฐะฑะตะปัะทะฐะฝะพ ะทะฐ ะฟัะธะปะฐะณะฐะฝะต." -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -23471,16 +25483,12 @@ msgstr "" "ะฝะตะทะฐะฑะฐะฒะฝะพ\n" "ะฝะฐะฑะตะปัะทะฐะฝะพ ะทะฐ ะทะฐะฝัะปัะฒะฐะฝะต." -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1116 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "ัะฐะนะปัั ะทะฐ ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ะฟะฐััะตัะพ ะบะพะด ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ: โ%sโ" -#: git-add--interactive.perl:1110 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "ะ ััะฝะพ ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ะฟะฐััะตัะฐ ะบะพะด โ ะพัะดะพะปั ะธะผะฐ ะฟะพะดัะบะฐะทะบะฐ.\n" - -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1123 #, perl-format msgid "" "---\n" @@ -23494,38 +25502,13 @@ msgstr "" "ะะฐ ะดะฐ ะฟัะพะฟััะฝะตัะต ัะตะดะพะฒะตัะต ะทะฐะฟะพัะฒะฐัะธ ั โ%sโ โ ะธะทััะธะนัะต ะณะธ.\n" "ะ ะตะดะพะฒะตัะต, ะบะพะธัะพ ะทะฐะฟะพัะฒะฐั ั โ%sโ ัะต ะฑัะดะฐั ะฟัะพะฟััะฝะฐัะธ.\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 "" -"ะะบะพ ะต ะฝะตะฒัะทะผะพะถะฝะพ ัะธััะพ ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะบะพะดะฐ, ัะต ะผะพะถะต ะฟะฐะบ ะดะฐ ัะตะดะฐะบัะธัะฐัะต. ะะบะพ\n" -"ะธะทััะธะตัะต ะฒัะธัะบะธ ัะตะดะพะฒะต ะพั ะฟะฐััะตัะพ ะบะพะด, ัะพ ัะต ะฑัะดะต ะพััะฐะฒะตะฝะพ ะฝะตะฟัะพะผะตะฝะตะฝะพ, ะฐ\n" -"ัะตะดะฐะบัะธัะฐะฝะตัะพ โ ะพัะบะฐะทะฐะฝะพ.\n" - -#: git-add--interactive.perl:1138 +#: git-add--interactive.perl:1145 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" "ัะฐะนะปัั ะทะฐ ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ะฟะฐััะตัะพ ะบะพะด ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ ะทะฐ ัะตัะตะฝะต: โ%sโ" -#. 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 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -23539,7 +25522,7 @@ msgstr "" "a โ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ ะฒ ะธะฝะดะตะบัะฐ\n" "d โ ะฑะตะท ะดะพะฑะฐะฒัะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ ะฒ ะธะฝะดะตะบัะฐ" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -23553,7 +25536,7 @@ msgstr "" "a โ ัะบะฐัะฐะฒะฐะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ\n" "d โ ะฑะตะท ัะบะฐัะฐะฒะฐะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -23567,7 +25550,7 @@ msgstr "" "a โ ะธะทะฒะฐะถะดะฐะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ ะพั ะธะฝะดะตะบัะฐ\n" "d โ ะฑะตะท ะธะทะฒะฐะถะดะฐะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ ะพั ะธะฝะดะตะบัะฐ" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -23581,7 +25564,7 @@ msgstr "" "a โ ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ ะบัะผ ะธะฝะดะตะบัะฐ\n" "d โ ะฑะตะท ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ ะบัะผ ะธะฝะดะตะบัะฐ" -#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -23598,7 +25581,7 @@ msgstr "" "d โ ะฑะตะท ะฟัะตะผะฐั ะฒะฐะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ ะพั ัะฐะฑะพัะฝะพัะพ " "ะดััะฒะพ" -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23615,7 +25598,7 @@ msgstr "" "d โ ะฑะตะท ะฟัะตะผะฐั ะฒะฐะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ ะพั ะธะฝะดะตะบัะฐ ะธ " "ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: git-add--interactive.perl:1282 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23632,7 +25615,7 @@ msgstr "" "d โ ะฑะตะท ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ ะพั ะธะฝะดะตะบัะฐ ะธ " "ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ" -#: git-add--interactive.perl:1294 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23646,7 +25629,7 @@ msgstr "" "a โ ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ\n" "d โ ะฑะตะท ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ัะพะฒะฐ ะธ ะฒัะธัะบะธ ัะปะตะดะฒะฐัะธ ะฟะฐััะตัะฐ ะพั ัะฐะนะปะฐ" -#: git-add--interactive.perl:1309 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23668,237 +25651,92 @@ msgstr "" "e โ ัััะฝะพ ัะตะดะฐะบัะธัะฐะฝะต ะฝะฐ ัะตะบััะพัะพ ะฟะฐััะต\n" "? โ ะธะทะฒะตะถะดะฐะฝะต ะฝะต ะฟะพะผะพััะฐ\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1347 msgid "The selected hunks do not apply to the index!\n" msgstr "ะะทะฑัะฐะฝะธัะต ะฟะฐััะตัะฐ ะฝะต ะผะพะณะฐั ะดะฐ ัะต ะดะพะฑะฐะฒัั ะฒ ะธะฝะดะตะบัะฐ!\n" -#: 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 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ะฟัะตะฝะตะฑัะตะณะฒะฐะฝะต ะฝะฐ ะฝะตัะปััะพัะพ: โ%sโ\n" -#: 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 +#: git-add--interactive.perl:1481 #, 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:1467 +#: git-add--interactive.perl:1482 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "ะัะธะปะฐะณะฐะฝะต ะฝะฐ ะธะทััะธะฒะฐะฝะตัะพ ะบัะผ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1483 +#, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "ะัะธะปะฐะณะฐะฝะต ะฝะฐ ะดะพะฑะฐะฒัะฝะตัะพ ะบัะผ ัะฐะฑะพัะฝะพัะพ ะดััะฒะพ [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1484 #, 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:1568 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "ะัะผะฐ ะดััะณะธ ะฟะฐััะตัะฐ\n" -#: 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 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "ะะตะฟัะฐะฒะธะปะตะฝ ะฝะพะผะตั: โ%sโ\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1624 #, 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:1617 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "ะัะผะฐ ะดััะณะธ ะฟะฐััะตัะฐ ะทะฐ ััััะตะฝะต\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "ะดะฐ ัะต ััััะธ ั ัะตะณัะปััะตะฝ ะธะทัะฐะท? " - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "ะกะณัะตัะตะฝ ัะตะณัะปััะตะฝ ะธะทัะฐะท โ%sโ: %s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "ะะธะบะพะต ะฟะฐััะต ะฝะต ะฝะฐะฟะฐัะฒะฐ ะฝะฐ ัะตะณัะปััะฝะธั ะธะทัะฐะท\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "ะัะผะฐ ะดััะณะพ ะฟะฐััะต ะฟัะตะดะธ ัะพะฒะฐ\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "ะัะผะฐ ะดััะณะพ ะฟะฐััะต ัะปะตะด ัะพะฒะฐ\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "ะขะพะฒะฐ ะฟะฐััะต ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ัะฐะทะดะตะปะตะฝะพ\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1738 #, 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:1706 +#: git-add--interactive.perl:1748 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:1771 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23919,19 +25757,19 @@ msgstr "" " ะธ ะธะฝะดะตะบัะฐ\n" "add untracked โ ะดะพะฑะฐะฒัะฝะต ะฝะฐ ะฝะตัะปะตะดะตะฝะธัะต ัะฐะนะปะพะฒะต ะบัะผ ะฟัะพะผะตะฝะธัะต ะฒ ะธะฝะดะตะบัะฐ\n" -#: 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 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 msgid "missing --" msgstr "โ--โ ะปะธะฟัะฒะฐ" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1861 #, perl-format msgid "unknown --patch mode: %s" msgstr "ะฝะตะธะทะฒะตััะฝะฐ ัััะฐัะตะณะธั ะทะฐ ะฟัะธะปะฐะณะฐะฝะต ะฝะฐ ะบััะฟะบะฐ: โ%sโ" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 #, perl-format msgid "invalid argument %s, expecting --" msgstr "ัะบะฐะทะฐะฝ ะต ะฝะตะฟัะฐะฒะธะปะตะฝ ะฐัะณัะผะตะฝั โ%sโ, ะฐ ัะต ะพัะฐะบะฒะฐ โ--โ." @@ -23951,26 +25789,37 @@ msgid "the editor exited uncleanly, aborting everything" msgstr "" "ัะตะบััะพะฒะธัั ัะตะดะฐะบัะพั ะฟัะธะบะปััะธ ัะฐะฑะพัะฐัะฐ ั ะณัะตัะบะฐ, ะฒัะธัะบะพ ัะต ะฟัะตัััะฐะฝะพะฒัะฒะฐ" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "โ%sโ ััะดััะถะฐ ะฒัะตะผะตะฝะฝะฐ ะฒะตััะธั ะฝะฐ ะฟะพะดะณะพัะฒัะฝะพัะพ ะต-ะฟะธัะผะพ.\n" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "โ%s.finalโ ััะดััะถะฐ ะฟะพะดะณะพัะฒะตะฝะพัะพ ะต-ะฟะธัะผะพ.\n" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "ะพะฟัะธััะฐ โ--dump-aliasesโ ะต ะฝะตััะฒะผะตััะธะผะฐ ั ะดััะณะธัะต ะพะฟัะธะธ\n" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"ะคะะขะะะะ ะะ ะะจะะ: ะพัะบัะธัะธ ัะฐ ะฝะฐัััะพะนะบะธ ะฝะฐ โsendmailโ\n" +"โgit-send-emailโ ะต ะบะพะฝัะธะณััะธัะฐะฝ ั ะฝะฐัััะพะนะบะธ โsendemail.*โ โ\n" +"ะทะฐะฑะตะปะตะถะตัะต ะทะฝะฐะบะฐ โeโ. ะะฐ ะดะฐ ะธะทะบะปััะธัะต ัะฐะทะธ ะฟัะพะฒะตัะบะฐ, ะทะฐะดะฐะนัะต\n" +"ะฝะฐัััะพะนะบะฐัะฐ โsendemail.forbidSendmailVariablesโ ะดะฐ ะต โfalseโ (ะปัะถะฐฬ).\n" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "ะะพะผะฐะฝะดะฐัะฐ โgit format-patchโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะปะฝะธ ะธะทะฒัะฝ ั ัะฐะฝะธะปะธัะต\n" -#: git-send-email.perl:484 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -23978,40 +25827,40 @@ msgstr "" "โbatch-sizeโ ะธ โreloginโ ัััะฑะฒะฐ ะดะฐ ัะต ัะบะฐะทะฒะฐั ะทะฐะตะดะฝะพ (ะธะปะธ ััะตะท ะบะพะผะฐะฝะดะฝะธั " "ัะตะด, ะธะปะธ ััะตะท ะฝะฐัััะพะนะบะธัะต)\n" -#: git-send-email.perl:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "ะะตะฟะพะทะฝะฐัะพ ะฟะพะปะต ะทะฐ ะพะฟัะธััะฐ โ--suppress-ccโ: โ%sโ\n" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "ะะตะฟะพะทะฝะฐัะฐ ััะพะนะฝะพัั ะทะฐ โ--confirmโ: %s\n" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" "ะะ ะะะฃะะ ะะะะะะะ: ะฟัะตะฒะดะพะฝะธะผะธ ะทะฐ sendmail ััะดััะถะฐัะธ ะบะฐะฒะธัะบะธ (โ\"โ) ะฝะต ัะต " "ะฟะพะดะดััะถะฐั: %s\n" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "ะะ ะะะฃะะ ะะะะะะะ: โ:include:โ ะฝะต ัะต ะฟะพะดะดััะถะฐ: %s\n" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" "ะะ ะะะฃะะ ะะะะะะะ: ะฟัะตะฝะฐัะพัะฒะฐะฝะธั โ/fileโ ะธะปะธ โ|pipeโ ะฝะต ัะต ะฟะพะดะดััะถะฐั: %s\n" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "ะะ ะะะฃะะ ะะะะะะะ: ัะตะดัั ะทะฐ โsendmailโ ะฝะต ะต ัะฐะทะฟะพะทะฝะฐั: %s\n" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -24026,12 +25875,12 @@ msgstr "" " โ ัะบะฐะถะตัะต โ./%sโ ะทะฐ ัะฐะนะป;\n" " โ ะธะทะฟะพะปะทะฒะฐัะต ะพะฟัะธััะฐ โ--format-patchโ ะทะฐ ะดะธะฐะฟะฐะทะพะฝ.\n" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "ะะธัะตะบัะพัะธััะฐ โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ: %s" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -24040,7 +25889,7 @@ msgstr "" "ะคะะขะะะะ ะะ ะะจะะ: %s: %s\n" "ะะ ะะะฃะะ ะะะะะะะ: ะฝะต ัะฐ ะฟัะฐัะตะฝะธ ะฝะธะบะฐะบะฒะธ ะบััะฟะบะธ\n" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -24050,17 +25899,17 @@ msgstr "" "ะะต ัะฐ ัะบะฐะทะฐะฝะธ ะบััะฟะบะธ!\n" "\n" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "ะ โ%sโ ะปะธะฟัะฒะฐ ัะตะผะฐ" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ ะทะฐ ะทะฐะฟะธั: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -24075,27 +25924,27 @@ msgstr "" "\n" "ะะทััะธะนัะต ะฒัะธัะบะพ, ะฐะบะพ ะฝะต ะธัะบะฐัะต ะดะฐ ะธะทะฟัะฐัะธัะต ะพะฑะพะฑัะฐะฒะฐัะพ ะฟะธัะผะพ.\n" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ: %s" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "โ%s.finalโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ: %s" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "ะะฑะพะฑัะฐะฒะฐัะพัะพ ะฟะธัะผะพ ะต ะฟัะฐะทะฝะพ ะธ ัะต ะฟัะตัะบะฐัะฐ\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "ะกะธะณััะฝะธ ะปะธ ััะต, ัะต ะธัะบะฐัะต ะดะฐ ะฟะพะปะทะฒะฐัะต โ%sโ [y/N]? " -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -24103,11 +25952,11 @@ msgstr "" "ะกะปะตะดะฝะธัะต ัะฐะนะปะพะฒะต ัะฐ 8 ะฑะธัะพะฒะธ, ะฝะพ ะฝะต ัะฐ ั ะพะฑัะฒะตะฝะฐ ะทะฐะณะปะฐะฒะฝะฐ ัะฐัั โContent-" "Transfer-Encodingโ.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "ะะพะต 8 ะฑะธัะพะฒะพ ะบะพะดะธัะฐะฝะต ัะต ะฟะพะปะทะฒะฐ [ััะฐะฝะดะฐััะฝะพ: UTF-8]? " -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -24120,22 +25969,22 @@ msgstr "" "ะฒัะต ะพัะต ะต ั ัะฐะฑะปะพะฝะฝะพัะพ ะทะฐะณะปะฐะฒะธะต โ*** SUBJECT HERE ***โ. ะะพะปะทะฒะฐะนัะต ะพะฟัะธััะฐ\n" "โ--forceโ, ะฐะบะพ ััะต ัะธะณััะฝะธ, ัะต ัะพัะฝะพ ัะพะฒะฐ ะธัะบะฐัะต ะดะฐ ะธะทะฟัะฐัะธัะต.\n" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "ะะฐ ะบะพะน ะดะฐ ัะต ะฟัะฐััั ะต-ะฟะธัะผะฐัะฐ (ะฝะตะทะฐะดัะปะถะธัะตะปะฝะพ ะฟะพะปะต)" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "ะคะะขะะะะ ะะ ะะจะะ: โ%sโ ะต ะฟัะตะฒะดะพะฝะธะผ ะฝะฐ ัะตะฑะต ัะธ\n" -#: git-send-email.perl:975 +#: git-send-email.perl:983 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 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "ะะ ะะจะะ: ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒะปะตัะต ะฐะดัะตั ะพั โ%sโ\n" @@ -24143,18 +25992,18 @@ msgstr "ะะ ะะจะะ: ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฒะปะตัะต ะฐะดัะตั ะพั โ #. 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 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" "ะะฐะบะฒะพ ะดะฐ ัะต ะฝะฐะฟัะฐะฒะธ ั ัะพะทะธ ะฐะดัะตั? โqโ (ัะฟะธัะฐะฝะต), โdโ (ะธะทััะธะฒะฐะฝะต), " "โeโ (ัะตะดะฐะบัะธัะฐะฝะต): " -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "ะัััั ะบัะผ ัะตััะธัะธะบะฐั โ%sโ ะฝะต ัััะตััะฒัะฒะฐ." -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -24182,132 +26031,132 @@ msgstr "" #. 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 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" "ะะทะฟัะฐัะฐะฝะต ะฝะฐ ะต-ะฟะธัะผะพัะพ? โyโ (ะดะฐ), โnโ (ะฝะต), โeโ (ัะตะดะฐะบัะธัะฐะฝะต), โqโ (ะธะทั ะพะด), " "โaโ (ะฒัะธัะบะพ): " -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "ะะทะธัะบะฒะฐะฝะต ะฝะฐ ะพัะณะพะฒะพั ะบัะผ ัะพะฒะฐ ะต-ะฟะธัะผะพ" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "ะกััะฒัััั ะทะฐ SMTP ะฝะต ะต ะฝะฐัััะพะตะฝ ะฟัะฐะฒะธะปะฝะพ." -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "ะกััะฒัััั ะฝะต ะฟะพะดะดััะถะฐ โSTARTTLSโ! %s" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "ะะตััะฟะตัะฝะพ ะธะทะฟัะปะฝะตะฝะธะต ะฝะฐ STARTTLS! %s" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "ะะพะดัะธััะตะผะฐัะฐ ะทะฐ SMTP ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะฝะธัะธะฐะปะธะทะธัะฐ. ะัะพะฒะตัะตัะต ะฝะฐัััะพะนะบะธัะต ะธ " "ะธะทะฟะพะปะทะฒะฐะนัะต ะพะฟัะธััะฐ: โ--smtp-debugโ." -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะธะทะฟัะฐัะตะฝ\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "ะัะพะฑะฐ ะทะฐ ะธะทะฟัะฐัะฐะฝะต ะฝะฐ โ%sโ\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "ะะทะฟัะฐัะฐะฝะต ะฝะฐ โ%sโ\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "ะฃัะฟะตั ะฟัะธ ะฟัะพะฑะฐัะฐ. ะั ะถััะฝะฐะปะฐ:\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "ะฃัะฟะตั . ะั ะถััะฝะฐะปะฐ:\n" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "ะ ะตะทัะปัะฐั: " -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "ะ ะตะทัะปัะฐั: ััะฟะตั \n" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "ัะฐะนะปัั โ%sโ ะฝะต ะผะพะถะต ะดะฐ ะฑัะดะต ะพัะฒะพัะตะฝ" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) ะะพะฑะฐะฒัะฝะต ะฝะฐ โัะบ: %sโ ะพั ัะตะด โ%sโ\n" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) ะะพะฑะฐะฒัะฝะต ะฝะฐ โะดะพ: %sโ ะพั ัะตะด โ%sโ\n" -#: git-send-email.perl:1718 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(ะฝะต-mbox) ะะพะฑะฐะฒัะฝะต ะฝะฐ โัะบ: %sโ ะพั ัะตะด โ%sโ\n" -#: git-send-email.perl:1753 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(ััะปะพ) ะะพะฑะฐะฒัะฝะต ะฝะฐ โัะบ: %sโ ะพั ัะตะด โ%sโ\n" -#: git-send-email.perl:1864 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) ะะต ะผะพะถะต ะดะฐ ะฑัะดะต ัะต ะธะทะฟัะปะฝะธ โ%sโ" -#: git-send-email.perl:1871 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) ะะพะฑะฐะฒัะฝะต ะฝะฐ โ%s: %sโ ะพั: โ%sโ\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) ะฟัะพะณัะฐะผะฝะธัั ะบะฐะฝะฐะป ะฝะต ะผะพะถะต ะดะฐ ัะต ะทะฐัะฒะพัะธ ะทะฐ ะธะทะฟัะปะฝะตะฝะธะตัะพ ะฝะฐ โ%sโ" -#: git-send-email.perl:1905 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "ััะพะฑัะตะฝะธะตัะพ ะฝะต ะผะพะถะต ะดะฐ ัะต ะธะทะฟัะฐัะธ ััะตะท 7 ะฑะธัะพะฒะธ ะทะฝะฐัะธ" -#: git-send-email.perl:1913 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "ะฝะตะฟัะฐะฒะธะปะฝะพ ะบะพะดะธัะฐะฝะต ะทะฐ ะฟัะตะฝะพั" -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "โ%sโ ะฝะต ะผะพะถะต ะดะฐ ัะต ะพัะฒะพัะธ: %s\n" -#: git-send-email.perl:1957 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "โ%sโ: ะบััะฟะบะฐัะฐ ััะดััะถะฐ ัะตะด ั ะฝะฐะด 988 ะทะฝะฐะบะฐ" -#: git-send-email.perl:1974 +#: git-send-email.perl:1986 #, 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 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "ะะฐะธััะธะฝะฐ ะปะธ ะธัะบะฐัะต ะดะฐ ะธะทะฟัะฐัะธัะต โ%sโ? [y|N]: " diff --git a/third_party/git/po/ca.po b/third_party/git/po/ca.po index 73a08242c3..17392473fb 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-2019 +# Jordi Mas i Hernร ndez <jmas@softcatala.org>, 2016-2020 # # Terminologia i criteris utilitzats # @@ -15,6 +15,7 @@ # deprecated | en desรบs # dry | simulaciรณ # fatal | fatal +# flush | buidar / buidatge # hook | lligam # hunk | tros # not supported | no estร admรจs @@ -49,8 +50,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-07-30 09:59+0800\n" -"PO-Revision-Date: 2019-07-30 08:23+0200\n" +"POT-Creation-Date: 2020-10-06 09:14+0800\n" +"PO-Revision-Date: 2020-05-28 18:14+0200\n" "Last-Translator: Jordi Mas <jmas@softcatala.org>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -58,65 +59,795 @@ 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.1\n" +"X-Generator: Poedit 2.3.1\n" -#: advice.c:109 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "Perdรณ (%s)?" + +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +msgid "could not read index" +msgstr "no s'ha pogut llegir l'รญndex" + +#: add-interactive.c:576 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "binari" + +#: add-interactive.c:634 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 +msgid "nothing" +msgstr "res" + +#: add-interactive.c:635 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 +msgid "unchanged" +msgstr "sense canvis" + +#: add-interactive.c:672 git-add--interactive.perl:643 +msgid "Update" +msgstr "Actualitza" + +#: add-interactive.c:689 add-interactive.c:877 +#, c-format +msgid "could not stage '%s'" +msgstr "no s'ha pogut fer ยซstageยป ยซ%sยป" + +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444 +msgid "could not write index" +msgstr "no s'ha pogut escriure l'รญndex" + +#: 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] "actualitzat %d camรญ\n" +msgstr[1] "actualitzats %d camins\n" + +#: add-interactive.c:716 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:721 apply.c:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry ha fallat per al camรญ ยซ%sยป" + +#: add-interactive.c:751 git-add--interactive.perl:655 +msgid "Revert" +msgstr "Reverteix" + +#: add-interactive.c:767 +msgid "Could not parse HEAD^{tree}" +msgstr "No s'ha pogut analitzar 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] "revertit %d camรญ\n" +msgstr[1] "revertits %d camins\n" + +#: add-interactive.c:856 git-add--interactive.perl:695 +#, c-format +msgid "No untracked files.\n" +msgstr "Sense fitxers no seguits.\n" + +#: add-interactive.c:860 git-add--interactive.perl:689 +msgid "Add untracked" +msgstr "Afegeix sense seguiment" + +#: 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] "afegit %d camรญ\n" +msgstr[1] "afegits %d camins\n" + +#: add-interactive.c:917 +#, c-format +msgid "ignoring unmerged: %s" +msgstr "s'estร ignorant allรฒ no fusionat: %s" + +#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Nomรฉs s'han canviat els fitxers binaris.\n" + +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "Sense canvis.\n" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "Actualitzaciรณ del pedaรง" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +msgid "Review diff" +msgstr "Reviseu les diferรจncies" + +#: add-interactive.c:1002 +msgid "show paths with changes" +msgstr "mostra els camins amb canvis" + +#: add-interactive.c:1004 +msgid "add working tree state to the staged set of changes" +msgstr "afegeix l'estat de l'arbre de treball al conjunt de canvis ยซstagedยป" + +#: add-interactive.c:1006 +msgid "revert staged set of changes back to the HEAD version" +msgstr "reverteix el conjunt de canvis ยซstagedยป a la versiรณ HEAD" + +#: add-interactive.c:1008 +msgid "pick hunks and update selectively" +msgstr "selecciona els trossos i actualitza selectivament" + +#: add-interactive.c:1010 +msgid "view diff between HEAD and index" +msgstr "visualitza les diferรจncies entre HEAD i l'รญndex" + +#: add-interactive.c:1012 +msgid "add contents of untracked files to the staged set of changes" +msgstr "afegeix contingut de fitxers no seguits al conjunt de canvis ยซstagedยป" + +#: add-interactive.c:1020 add-interactive.c:1069 +msgid "Prompt help:" +msgstr "Mostra ajuda:" + +#: add-interactive.c:1022 +msgid "select a single item" +msgstr "seleccioneu un รบnic รญtem" + +#: add-interactive.c:1024 +msgid "select a range of items" +msgstr "seleccioneu un rang d'รญtems" + +#: add-interactive.c:1026 +msgid "select multiple ranges" +msgstr "seleccioneu rangs mรบltiples" + +#: add-interactive.c:1028 add-interactive.c:1073 +msgid "select item based on unique prefix" +msgstr "seleccioneu un รญtem basant-se en un prefix รบnic" + +#: add-interactive.c:1030 +msgid "unselect specified items" +msgstr "desselecciona els รญtems especificats" + +#: add-interactive.c:1032 +msgid "choose all items" +msgstr "trieu tots els รญtems" + +#: add-interactive.c:1034 +msgid "(empty) finish selecting" +msgstr "(buit) finalitza la selecciรณ" + +#: add-interactive.c:1071 +msgid "select a numbered item" +msgstr "seleccioneu un รญtem numerat" + +#: add-interactive.c:1075 +msgid "(empty) select nothing" +msgstr "(buit) no seleccionis res" + +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "*** Ordres ***" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +msgid "What now" +msgstr "I ara quรจ" + +#: add-interactive.c:1136 git-add--interactive.perl:213 +msgid "staged" +msgstr "staged" + +#: add-interactive.c:1136 git-add--interactive.perl:213 +msgid "unstaged" +msgstr "unstaged" + +#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: git-add--interactive.perl:213 +msgid "path" +msgstr "camรญ" + +#: add-interactive.c:1143 +msgid "could not refresh index" +msgstr "no s'ha pogut actualitzar l'รญndex" + +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805 +#, c-format +msgid "Bye.\n" +msgstr "Adรฉu.\n" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Canvia el mode de ยซstageยป [y,n,q,a,d%s,?]? " + +#: add-patch.c:35 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Suprimeix ยซstageยป [y,n,q,a,d%s,?]? " + +#: add-patch.c:36 git-add--interactive.perl:1435 +#, fuzzy, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "Suprimeix ยซstageยป [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, c-format, 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,?]? " + +#: add-patch.c:39 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" +"Si el pedaรง s'aplica netament, el tros editat es marcarร immediatament per a " +"ยซstagingยป." + +#: add-patch.c:42 +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 - fes ยซstageยป d'aquest tros\n" +"n - no facis ยซstageยป d'aquest tros\n" +"q - surt; no facis ยซstageยป d'aquest tros ni 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 ni de cap altre restant del fitxer\n" + +#: add-patch.c:56 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Canvia el mode de ยซstashยป [y,n,q,a,d%s,?]? " + +#: add-patch.c:57 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Suprimeix ยซstashยป [y,n,q,a,d%s,?]? " + +#: add-patch.c:58 git-add--interactive.perl:1441 +#, fuzzy, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "Suprimeix ยซstashยป [y,n,q,a,d%s,?]? " + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, c-format, 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,?]? " + +#: add-patch.c:61 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" +"Si el pedaรง s'aplica de forma neta, el tros editat es marcarร immediatament " +"per a ยซstashingยป." + +#: add-patch.c:64 +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 - fes ยซstashยป d'aquest tros\n" +"n - no facis ยซstashยป d'aquest tros\n" +"q - surt; no facis ยซstashยป d'aquest tros ni de cap altre restant\n" +"a - fes ยซstashยป d'aquest tros i de tota la resta de trossos del fitxer\n" +"d - no facis ยซstashยป d'aquest tros ni de cap altre restant del fitxer\n" + +#: add-patch.c:80 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Canvia el mode de ยซunstageยป [y,n,q,a,d%s,?]? " + +#: add-patch.c:81 git-add--interactive.perl:1446 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Suprimeix ยซUnstageยป [y,n,q,a,d%s,?]? " + +#: add-patch.c:82 git-add--interactive.perl:1447 +#, fuzzy, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "Suprimeix ยซUnstageยป [y,n,q,a,d%s,?]? " + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, c-format, 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,?]? " + +#: add-patch.c:85 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" +"Si el pedaรง s'aplica netament, el tros editat es marcarร immediatament per a " +"ยซunstagingยป." + +#: add-patch.c:88 +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 - fes ยซunstageยป d'aquest tros\n" +"n - no facis ยซunstageยป d'aquest tros\n" +"q - surt; no facis ยซunstageยป d'aquest tros ni de cap altre restant\n" +"a - fes ยซunstageยป d'aquest tros i de tota la resta de trossos del fitxer\n" +"d - no facis ยซunstageยป d'aquest tros ni de cap altre restant del fitxer\n" + +#: add-patch.c:103 git-add--interactive.perl:1451 +#, c-format, 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,?]? " + +#: add-patch.c:104 git-add--interactive.perl:1452 +#, c-format, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Aplica la supressiรณ a l'รญndex [y,n,q,a,d%s,?]? " + +#: add-patch.c:105 git-add--interactive.perl:1453 +#, fuzzy, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "Aplica la supressiรณ a l'รญndex [y,n,q,a,d%s,?]? " + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, c-format, 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,?]? " + +#: add-patch.c:108 add-patch.c:176 add-patch.c:221 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" +"Si el pedaรง s'aplica netament, el tros editat es marcarร immediatament per " +"aplicar-lo." + +#: add-patch.c:111 +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 - aplica aquest tros a l'รญndex\n" +"n - no apliquis aquest tros a l'รญndex\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\n" + +#: add-patch.c:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, c-format, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Descarta el canvi de mode de l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, c-format, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Descarta suprimir de l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, fuzzy, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "Descarta suprimir de l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, c-format, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Descarta aquest tros de l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:131 add-patch.c:154 add-patch.c:199 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" +"Si el pedaรง s'aplica netament, el tros editat es marcarร immediatament per a " +"ser descartat." + +#: add-patch.c:134 add-patch.c:202 +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 - descarta aquest tros de l'arbre de treball\n" +"n - no descartis aquest tros de l'arbre de treball\n" +"q - surt; no apliquis aquest tros ni cap dels pendents\n" +"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\n" + +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 +#, c-format, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Descarta el canvi de mode de l'รญndex i de l'arbre de treball [y,n,q,a,d" +"%s,?]? " + +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 +#, c-format, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Descarta suprimir de l'รญndex i de l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 +#, fuzzy, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Descarta suprimir de l'รญndex i de l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, c-format, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Descarta aquest tros de l'รญndex i de l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:157 +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 - descarta aquest tros de l'รญndex i de l'arbre de treball\n" +"n - no descartis aquest tros de l'รญndex ni de l'arbre de treball\n" +"q - surt; no apliquis aquest tros ni cap dels pendents\n" +"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\n" + +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 +#, c-format, 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 a l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 +#, c-format, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Aplica la supressiรณ a l'รญndex i a l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 +#, fuzzy, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Aplica la supressiรณ a l'รญndex i a l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, c-format, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Aplica aquest tros a l'รญndex i a l'arbre de treball [y,n,q,a,d%s,?]? " + +#: add-patch.c:179 +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 - aplica aquest tros a l'รญndex i a l'arbre de treball\n" +"n - no apliquis aquest tros a l'รญndex ni a 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\n" + +#: add-patch.c:224 +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 - aplica aquest tros a l'arbre de treball\n" +"n - no apliquis aquest tros a 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\n" + +#: add-patch.c:342 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "no s'ha pogut analitzar la capรงalera del tros ยซ%.*sยป" + +#: add-patch.c:361 add-patch.c:365 +#, 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:419 +msgid "could not parse diff" +msgstr "no s'ha pogut analitzar el diff" + +#: add-patch.c:438 +msgid "could not parse colored diff" +msgstr "no s'ha pogut analitzar el diff acolorit" + +#: add-patch.c:452 +#, c-format +msgid "failed to run '%s'" +msgstr "no s'ha pogut executar ยซ%sยป" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "sortida no coincident des d'interactive.diffFilter" + +#: add-patch.c:612 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" +"El filtre ha de mantenir una correspondรจncia d'un a un\n" +"entre les lรญnies d'entrada i sortida." + +#: add-patch.c:785 +#, 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:800 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" +"els trossos no se superposen:\n" +"%.*s\n" +"\tno acaben amb:\n" +"%.*s" + +#: add-patch.c:1076 git-add--interactive.perl:1117 +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:1080 +#, 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 a eliminar les lรญnies ยซ%cยป, convertiu-les en lรญnies ' ' (context).\n" +"Per a eliminar les lรญnies ยซ%cยป, suprimiu-les.\n" +"Les lรญnies que comencin per %c s'eliminaran.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: add-patch.c:1094 git-add--interactive.perl:1131 +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 s'eliminen totes les lรญnies del tros, llavors l'ediciรณ s'avorta\n" +"i el tros es deixa sense cap canvi.\n" + +#: add-patch.c:1127 +msgid "could not parse hunk header" +msgstr "no s'ha pogut analitzar la capรงalera del tros" + +#: add-patch.c:1172 +msgid "'git apply --cached' failed" +msgstr "ยซgit apply --cachedยป ha fallat" + +#. 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:1241 git-add--interactive.perl:1244 +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:1284 +msgid "The selected hunks do not apply to the index!" +msgstr "Els trossos seleccionats no s'apliquen a l'รญndex!" + +#: add-patch.c:1285 git-add--interactive.perl:1348 +msgid "Apply them to the worktree anyway? " +msgstr "Voleu aplicar-los igualment a l'arbre de treball? " + +#: add-patch.c:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "No s'ha aplicat res.\n" + +#: add-patch.c:1349 +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:1511 add-patch.c:1521 +msgid "No previous hunk" +msgstr "Sense tros previ" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No next hunk" +msgstr "No hi ha tros segรผent" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "No hi ha altres trossos on anar-hi" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "vรฉs a quin tros (<ret> per a veure'n mรฉs)? " + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "vรฉs a quin tros? " + +#: add-patch.c:1555 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Nรบmero no vร lid: ยซ%sยป" + +#: add-patch.c:1560 +#, 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:1569 +msgid "No other hunks to search" +msgstr "No hi ha cap altre tros a cercar" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "cerca per expressiรณ regular? " + +#: add-patch.c:1590 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Expressiรณ regular de cerca mal formada %s: %s" + +#: add-patch.c:1607 +msgid "No hunk matches the given pattern" +msgstr "No hi ha trossos que coincideixin amb el patrรณ donat" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "No es pot dividir aquest tros" + +#: add-patch.c:1618 +#, c-format +msgid "Split into %d hunks." +msgstr "Divideix en %d trossos." + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "No es pot editar aquest tros" + +#: add-patch.c:1674 +msgid "'git apply' failed" +msgstr "ยซgit applyยป ha fallat" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "%spista: %.*s%s\n" -#: advice.c:162 +#: advice.c:247 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:164 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "Cometre no รฉs possible perquรจ teniu fitxers sense fusionar." -#: advice.c:166 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "Fusionar no รฉs possible perquรจ teniu fitxers sense fusionar." -#: advice.c:168 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "Baixar no รฉs possible perquรจ teniu fitxers sense fusionar." -#: advice.c:170 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "Revertir no รฉs possible perquรจ teniu fitxers sense fusionar." -#: advice.c:172 +#: advice.c:257 #, 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:180 +#: advice.c:265 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 "" "Arregleu-los en l'arbre de treball, i desprรฉs useu\n" -"'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n" +"ยซgit add/rm <fitxer>ยป segons sigui apropiat per a marcar la\n" "resoluciรณ i feu una comissiรณ." -#: advice.c:188 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "S'estร sortint a causa d'un conflicte no resolt." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:278 builtin/merge.c:1349 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu conclรฒs la vostra fusiรณ (MERGE_HEAD existeix)." -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "Cometeu els vostres canvis abans de fusionar." -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "S'estร sortint a causa d'una fusiรณ no terminada." -#: advice.c:202 -#, fuzzy, c-format +#: advice.c:287 +#, c-format msgid "" "Note: switching to '%s'.\n" "\n" @@ -137,17 +868,24 @@ msgid "" "false\n" "\n" msgstr "" -"Avรญs: s'estร agafant ยซ%sยป.\n" +"Avรญs: s'estร canviant a ยซ%sยป.\n" "\n" -"Esteu en un estat de ยซHEAD separatยป. Podeu mirar al voltant, fer canvis\n" +"Esteu en un estat de ยซHEAD separatยป. Podeu donar un cop d'ull, fer canvis\n" "experimentals i cometre'ls, i podeu descartar qualsevol comissiรณ que feu\n" -"en aquest estat sense cap branca realitzant un altre agafament.\n" +"en aquest estat sense impactar a cap branca tornant a una branca.\n" "\n" "Si voleu crear una branca nova per a conservar les comissions que creeu,\n" -"poder fer-ho (ara o mรฉs tard) usant -b de nou amb l'ordre checkout.\n" -"Exemple:\n" +"poder fer-ho (ara o mรฉs tard) usant -c amb l'ordre switch. Exemple:\n" +"\n" +" git switch -c <nom-de-branca-nova>\n" +"\n" +"O desfer aquesta operaciรณ amb:\n" +"\n" +" git switch -\n" +"\n" +"Desactiveu aquest consell configurant la variable advice.detachedHead a " +"ยซfalseยป\n" "\n" -" git checkout -b <nom-de-branca-nova>\n" #: alias.c:50 msgid "cmdline ends with \\" @@ -155,7 +893,7 @@ msgstr "la lรญnia d'ordres acaba amb \\" #: alias.c:51 msgid "unclosed quote" -msgstr "" +msgstr "cita no tancada" #: apply.c:69 #, c-format @@ -238,17 +976,7 @@ 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: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 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -263,83 +991,93 @@ 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:1564 +#: apply.c:1385 #, 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:1752 +#: 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 msgid "new file depends on old contents" msgstr "el fitxer nou depรจn dels continguts antics" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "el fitxer suprimit encara tรฉ continguts" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "pedaรง malmรจs a la lรญnia %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "el fitxer nou %s depรจn dels continguts antics" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "el fitxer suprimit %s encara tรฉ continguts" -#: apply.c:1830 +#: apply.c:1831 #, 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:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "pedaรง binari malmรจs a la lรญnia %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "pedaรง binari no reconegut a la lรญnia %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "pedaรง amb nomรฉs escombraries a la lรญnia %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "no s'ha pogut llegir l'enllaรง simbรฒlic %s" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "no s'ha pogut obrir o llegir %s" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "inici de lรญnia no vร lid: ยซ%cยป" -#: apply.c:3046 +#: 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] "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:3058 +#: apply.c:3069 #, 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:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -348,23 +1086,23 @@ msgstr "" "tot cercant:\n" "%.*s" -#: apply.c:3086 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "manquen les dades de pedaรง binari de ยซ%sยป" -#: apply.c:3094 +#: apply.c:3105 #, 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:3141 +#: apply.c:3152 #, 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:3151 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -372,289 +1110,284 @@ msgstr "" "el pedaรง s'aplica a ยซ%sยป (%s), el qual no coincideix amb els continguts " "actuals." -#: apply.c:3159 +#: apply.c:3171 #, 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:3177 +#: apply.c:3189 #, 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:3190 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el pedaรง binari no s'aplica a ยซ%sยป" -#: apply.c:3196 +#: apply.c:3209 #, 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:3217 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "el pedaรง ha fallat: %s:%ld" -#: apply.c:3340 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 #, c-format msgid "failed to read %s" msgstr "s'ha produรฏt un error en llegir %s" -#: apply.c:3400 +#: apply.c:3413 #, 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:3429 apply.c:3672 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "el camรญ %s s'ha canviat de nom / s'ha suprimit" -#: apply.c:3515 apply.c:3687 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existeix en l'รญndex" -#: apply.c:3524 apply.c:3695 +#: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" msgstr "%s: no coincideix amb l'รญndex" -#: apply.c:3559 +#: apply.c:3572 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:3562 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "S'estร retrocedint a una fusiรณ de 3 vies...\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no es poden llegir els continguts actuals de ยซ%sยป" -#: apply.c:3594 +#: apply.c:3607 #, 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:3608 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "S'ha aplicat el pedaรง a ยซ%sยป amb conflictes.\n" -#: apply.c:3613 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "S'ha aplicat el pedaรง a ยซ%sยป netament.\n" -#: apply.c:3639 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "el pedaรง d'eliminaciรณ deixa els continguts dels fitxers" -#: apply.c:3712 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: tipus erroni" -#: apply.c:3714 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s รฉs del tipus %o, s'esperava %o" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "camรญ no vร lid: ยซ%sยป" -#: apply.c:3923 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s: ja existeix en l'รญndex" -#: apply.c:3926 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ja existeix en el directori de treball" -#: apply.c:3946 +#: apply.c:3976 #, 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:3951 +#: apply.c:3981 #, 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:3971 +#: apply.c:4001 #, 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:3975 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s: el pedaรง no s'aplica" -#: apply.c:3990 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "S'estร comprovant el pedaรง %s..." -#: apply.c:4082 +#: apply.c:4112 #, 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:4089 +#: apply.c:4119 #, 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:4092 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta informaciรณ sha1 o รฉs inรบtil (%s)." -#: 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 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "no s'ha pogut afegir %s a l'รญndex temporal" -#: apply.c:4111 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "no s'ha pogut escriure l'รญndex temporal a %s" -#: apply.c:4249 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "no s'ha pogut eliminar %s de l'รญndex" -#: apply.c:4283 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "pedaรง malmรจs per al submรฒdul %s" -#: apply.c:4289 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no s'ha pogut fer stat al fitxer novament creat ยซ%sยป" -#: apply.c:4297 +#: apply.c:4327 #, 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:4303 apply.c:4448 +#: apply.c:4333 apply.c:4478 #, 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:4346 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "no s'ha pogut escriure a ยซ%sยป" -#: apply.c:4350 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "s'estร tancant el fitxer ยซ%sยป" -#: apply.c:4420 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no s'ha pogut escriure el fitxer ยซ%sยป mode %o" -#: apply.c:4518 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "El pedaรง %s s'ha aplicat netament." -#: apply.c:4526 +#: apply.c:4556 msgid "internal error" msgstr "error intern" -#: apply.c:4529 +#: apply.c:4559 #, 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:4540 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "s'estร truncant el nom del fitxer .rej a %.*s.rej" -#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "no es pot obrir %s" -#: apply.c:4562 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "El tros #%d s'ha aplicat netament." -#: apply.c:4566 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "S'ha rebutjat el tros #%d." -#: apply.c:4676 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "S'ha omรจs el pedaรง ยซ%sยป." -#: apply.c:4684 +#: apply.c:4723 msgid "unrecognized input" msgstr "entrada no reconeguda" -#: apply.c:4704 +#: apply.c:4743 msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'รญndex" -#: apply.c:4859 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "no es pot obrir el pedaรง ยซ%sยป: %s" -#: apply.c:4886 +#: apply.c:4927 #, 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:4892 apply.c:4907 +#: apply.c:4933 apply.c:4948 #, 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:4900 +#: apply.c:4941 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -663,147 +1396,182 @@ msgstr[0] "" msgstr[1] "" "S'han aplicat %d lรญnies desprรฉs d'arreglar els errors d'espai en blanc." -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "No s'ha pogut escriure un fitxer d'รญndex nou" -#: 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 +#: apply.c:4985 msgid "don't apply changes matching the given path" msgstr "no apliquis els canvis que coincideixin amb el camรญ donat" -#: apply.c:4947 +#: apply.c:4988 msgid "apply changes matching the given path" msgstr "aplica els canvis que coincideixin amb el camรญ donat" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "nรบmero" -#: apply.c:4950 +#: apply.c:4991 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "elimina <nombre> barres obliqรผes inicials dels camins de diferรจncia " "tradicionals" -#: apply.c:4953 +#: apply.c:4994 msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaรง" -#: apply.c:4955 +#: apply.c:4996 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:4959 +#: apply.c:5000 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:4961 +#: apply.c:5002 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:4963 +#: apply.c:5004 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:4965 +#: apply.c:5006 msgid "make sure the patch is applicable to the current index" msgstr "assegura que el pedaรง sigui aplicable a l'รญndex actual" -#: apply.c:4967 +#: apply.c:5008 msgid "mark new files with `git add --intent-to-add`" -msgstr "" +msgstr "marca els fitxers nous amb ยซgit add --intent-to-addยป" -#: apply.c:4969 +#: apply.c:5010 msgid "apply a patch without touching the working tree" msgstr "aplica un pedaรง sense tocar l'arbre de treball" -#: apply.c:4971 +#: apply.c:5012 msgid "accept a patch that touches outside the working area" msgstr "accepta un pedaรง que toqui fora de l'ร rea de treball" -#: apply.c:4974 +#: apply.c:5015 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplica el pedaรง tambรฉ (useu amb --stat/--summary/--check)" -#: apply.c:4976 +#: apply.c:5017 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:4978 +#: apply.c:5019 msgid "build a temporary index based on embedded index information" msgstr "construeix un รญndex temporal basat en la informaciรณ d'รญndex incrustada" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "els camins se separen amb el carร cter NUL" -#: apply.c:4983 +#: apply.c:5024 msgid "ensure at least <n> lines of context match" msgstr "assegura't que almenys <n> lรญnies de context coincideixin" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3319 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "acciรณ" -#: apply.c:4985 +#: apply.c:5026 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:4988 apply.c:4991 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc en cercar context" -#: apply.c:4994 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "aplica el pedaรง al revรฉs" -#: apply.c:4996 +#: apply.c:5037 msgid "don't expect at least one line of context" msgstr "no esperis almenys una lรญnia de context" -#: apply.c:4998 +#: apply.c:5039 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents" -#: apply.c:5000 +#: apply.c:5041 msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" -#: 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 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "sigues detallat" -#: apply.c:5003 +#: apply.c:5044 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:5006 +#: apply.c:5047 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:5008 builtin/am.c:2205 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "arrel" -#: apply.c:5009 +#: apply.c:5050 msgid "prepend <root> to all filenames" msgstr "anteposa <arrel> a tots els noms de fitxer" +#: archive-tar.c:125 archive-zip.c:345 +#, c-format +msgid "cannot stream blob %s" +msgstr "no es pot transmetre el blob %s" + +#: archive-tar.c:265 archive-zip.c:358 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)" + +#: archive-tar.c:449 +#, c-format +msgid "unable to start '%s' filter" +msgstr "no s'ha pogut iniciar el filtre ยซ%sยป" + +#: archive-tar.c:452 +msgid "unable to redirect descriptor" +msgstr "no s'ha pogut redirigir el descriptor" + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "ยซ%sยป error reportat pel filtre" + +#: archive-zip.c:318 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "el camรญ no รฉs vร lid en UTF-8: %s" + +#: archive-zip.c:322 +#, 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:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "error de deflaciรณ (%d)" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<opcions>] <arbre> [<camรญ>...]" @@ -823,205 +1591,189 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dipรฒsit> [--exec <ordre>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "no es pot llegir ยซ%sยป" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "no s'ha pogut llegir ยซ%sยป" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "l'especificaciรณ de camรญ ยซ%sยป no ha coincidit amb cap fitxer" -#: archive.c:396 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "no existeix la referรจncia: %.*s" -#: archive.c:401 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "no รฉs un nom d'objecte vร lid: %s" -#: archive.c:414 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "no รฉs un objecte d'arbre: %s" -#: archive.c:426 +#: archive.c:485 msgid "current working directory is untracked" -msgstr "no es segueix el directori de treball actual" +msgstr "no se segueix el directori de treball actual" + +#: archive.c:526 +#, fuzzy, c-format +msgid "File not found: %s" +msgstr "objecte no trobat: %s" + +#: archive.c:528 +#, fuzzy, c-format +msgid "Not a regular file: %s" +msgstr "no รฉs un registre de referรจncia" -#: archive.c:457 +#: archive.c:553 msgid "fmt" msgstr "format" -#: archive.c:457 +#: archive.c:553 msgid "archive format" msgstr "format d'arxiu" -#: archive.c:458 builtin/log.c:1597 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "prefix" -#: archive.c:459 +#: archive.c:555 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: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 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "fitxer" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:557 +#, fuzzy +msgid "add untracked file to archive" +msgstr "inclou els fitxers no seguits a ยซstashยป" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "escriu l'arxiu a aquest fitxer" -#: archive.c:463 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr "llegeix .gitattributes en el directori de treball" -#: archive.c:464 +#: archive.c:563 msgid "report archived files on stderr" msgstr "informa de fitxers arxivats en stderr" -#: archive.c:465 +#: archive.c:564 msgid "store only" msgstr "nomรฉs emmagatzema" -#: archive.c:466 +#: archive.c:565 msgid "compress faster" msgstr "comprimeix mรฉs rร pidament" -#: archive.c:474 +#: archive.c:573 msgid "compress better" msgstr "comprimeix millor" -#: archive.c:477 +#: archive.c:576 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:1379 builtin/submodule--helper.c:1859 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "dipรฒsit" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:579 builtin/archive.c:92 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:707 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "ordre" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "camรญ a l'ordre git-upload-archive remota" -#: archive.c:489 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "Opciรณ inesperada --remote" -#: archive.c:491 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "L'opciรณ --exec nomรฉs es pot usar juntament amb --remote" -#: archive.c:493 +#: archive.c:592 msgid "Unexpected option --output" msgstr "Opciรณ inesperada --output" -#: archive.c:515 +#: archive.c:594 +#, fuzzy +msgid "Options --add-file and --remote cannot be used together" +msgstr "Les opcions --squash i --fixup no es poden usar juntes" + +#: archive.c:616 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'arxiu desconegut ยซ%sยป" -#: archive.c:522 +#: archive.c:623 #, c-format 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:345 -#, fuzzy, c-format -msgid "cannot stream blob %s" -msgstr "no es pot emmagatzemar %s" - -#: 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:287 archive-zip.c:353 -#, c-format -msgid "cannot read %s" -msgstr "no es pot llegir ยซ%sยป" - -#: archive-tar.c:459 -#, c-format -msgid "unable to start '%s' filter" -msgstr "no s'ha pogut iniciar el filtre ยซ%sยป" - -#: archive-tar.c:462 -msgid "unable to redirect descriptor" -msgstr "no s'ha pogut redirigir el descriptor" - -#: archive-tar.c:469 -#, c-format -msgid "'%s' filter reported error" -msgstr "ยซ%sยป error reportat pel filtre" - -#: 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:318 -#, c-format -msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "el camรญ รฉs massa llarg (%d carร cters, SHA1: %s): %s" +msgstr "Argument no admรจs per al format ยซ%sยป: -%d" -#: 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:609 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>" - -#: attr.c:211 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s no รฉs un nom d'atribut vร lid" -#: attr.c:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s no estร permรจs: %s:%d" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" "Els patrons negatius s'ignoren en els atributs de git\n" -"Useu '\\!' per exclamaciรณ capdavantera literal." +"Useu ยซ\\!ยป per exclamaciรณ capdavantera literal." -#: bisect.c:468 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Comentari amb cometes errรฒnies en el fitxer ยซ%sยป: %s" -#: bisect.c:678 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "No podem bisecar mรฉs!\n" -#: bisect.c:733 +#: bisect.c:753 #, c-format msgid "Not a valid commit name %s" msgstr "No รฉs un nom de comissiรณ vร lid %s" -#: bisect.c:758 +#: bisect.c:778 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1030,7 +1782,7 @@ msgstr "" "La base de fusiรณ %s รฉs errรฒnia.\n" "Aixรฒ vol dir que el defecte s'ha arreglat entre %s i [%s].\n" -#: bisect.c:763 +#: bisect.c:783 #, c-format msgid "" "The merge base %s is new.\n" @@ -1039,7 +1791,7 @@ msgstr "" "La base de fusiรณ %s รฉs nova.\n" "La propietat s'ha canviat entre %s i [%s].\n" -#: bisect.c:768 +#: bisect.c:788 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1048,7 +1800,7 @@ msgstr "" "La base de fusiรณ %s รฉs %s.\n" "Aixรฒ vol dir que la primera comissiรณ ยซ%sยป รฉs entre %s i [%s].\n" -#: bisect.c:776 +#: bisect.c:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1059,7 +1811,7 @@ msgstr "" "git bisect no pot funcionar correctament en aquest cas.\n" "Potser heu confรณs les revisions %s i %s?\n" -#: bisect.c:789 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1071,36 +1823,36 @@ msgstr "" "%s.\n" "Continuem de totes maneres." -#: bisect.c:822 +#: bisect.c:848 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisecant: s'ha de provar una base de fusiรณ\n" -#: bisect.c:865 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "es necessita una revisiรณ %s" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "no s'ha pogut crear el fitxer ยซ%sยป" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "no s'ha pogut llegir el fitxer ยซ%sยป" -#: bisect.c:958 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "la lectura de les referรจncies de bisecciรณ ha fallat" -#: bisect.c:977 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "%s era ambdรณs %s i %s\n" -#: bisect.c:985 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" @@ -1109,7 +1861,7 @@ msgstr "" "No s'ha trobat cap comissiรณ comprovable.\n" "Potser heu comenรงat amb parร metres de camรญ incorrectes?\n" -#: bisect.c:1004 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1119,48 +1871,48 @@ msgstr[1] "(aproximadament %d passos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1088 #, 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] "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:2697 +#: blame.c:2778 msgid "--contents and --reverse do not blend well." msgstr "--contents i --reverse no funcionen bรฉ juntes." -#: blame.c:2711 +#: blame.c:2792 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:2732 +#: blame.c:2813 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse i --first-parent-together requereixen una รบltima comissiรณ " "especificada" -#: 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 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 msgid "revision walk setup failed" msgstr "la configuraciรณ del passeig per revisions ha fallat" -#: blame.c:2759 +#: blame.c:2840 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:2770 +#: blame.c:2851 #, c-format msgid "no such path %s in %s" msgstr "no hi ha tal camรญ %s en %s" -#: blame.c:2781 +#: blame.c:2862 #, c-format msgid "cannot read blob %s for path %s" msgstr "no es pot llegir el blob %s per al camรญ %s" @@ -1176,7 +1928,7 @@ msgstr "" "\n" "Desprรฉs de corregir la causa de l'error, podeu\n" "intentar corregir la informaciรณ de seguiment remot\n" -"invocant \"git branch --set-upstream-to=%s%s%s\"." +"invocant ยซgit branch --set-upstream-to=%s%s%sยป." #: branch.c:67 #, c-format @@ -1304,404 +2056,465 @@ msgstr "Nom d'objecte ambigu: ยซ%sยป." msgid "Not a valid branch point: '%s'." msgstr "No รฉs un punt de ramificaciรณ vร lid: ยซ%sยป." -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "ยซ%sยป ja s'ha agafat a ยซ%sยป" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD de l'arbre de treball %s no estร actualitzat" -#: bundle.c:36 -#, c-format -msgid "'%s' does not look like a v2 bundle file" +#: bundle.c:41 +#, fuzzy, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "variable ยซ%sยป desconeguda" + +#: bundle.c:45 +#, fuzzy, c-format +msgid "unknown capability '%s'" +msgstr "variable ยซ%sยป desconeguda" + +#: bundle.c:71 +#, fuzzy, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "ยซ%sยป no sembla un fitxer de farcell v2" -#: bundle.c:64 +#: bundle.c:110 #, c-format 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:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir ยซ%sยป" -#: bundle.c:143 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" -msgstr "Al dipรฒsit li manquen aquestes comissions prerequisits:" +msgstr "Al dipรฒsit li manquen aquestes comissions prerequerides:" -#: bundle.c:146 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "cal un dipรฒsit per verificar un farcell" -#: bundle.c:197 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "El farcell contรฉ aquesta referรจncia:" msgstr[1] "El farcell contรฉ aquestes %d referรจncies:" -#: bundle.c:204 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "El farcell registra una histรฒria completa." -#: bundle.c:206 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" 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:272 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "no s'ha pogut duplicar el descriptor del farcell" -#: bundle.c:279 +#: bundle.c:326 msgid "Could not spawn pack-objects" -msgstr "No s'ha pogut executar el pack-objects" +msgstr "No s'ha pogut generar el pack-objects" -#: bundle.c:290 +#: bundle.c:337 msgid "pack-objects died" msgstr "El pack-objects s'ha mort" -#: bundle.c:332 +#: bundle.c:379 msgid "rev-list died" msgstr "El rev-list s'ha mort" -#: bundle.c:381 +#: bundle.c:428 #, 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:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306 +#: bundle.c:498 +#, fuzzy, c-format +msgid "unsupported bundle version %d" +msgstr "versiรณ d'รญndex no compatible %s" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "" + +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 #, c-format msgid "unrecognized argument: %s" -msgstr "parร metre no reconegut: %s" +msgstr "argument no reconegut: %s" -#: bundle.c:468 +#: bundle.c:530 msgid "Refusing to create empty bundle." msgstr "S'estร refusant crear un farcell buit." -#: bundle.c:478 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "no es pot crear ยซ%sยป" -#: bundle.c:503 +#: bundle.c:565 msgid "index-pack died" msgstr "L'index-pack s'ha mort" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "valor de color no vร lid: %.*s" -#: 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:52 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s no รฉs una comissiรณ!" - -#: commit.c:192 -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 "" - -#: 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: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:1133 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "La comissiรณ %s no tรฉ signatura GPG." - -#: 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: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 "" -"Advertรจncia: el missatge de comissiรณ no รฉs compatible amb UTF-8.\n" -"Potser voleu esmenar-lo desprรฉs de corregir el missatge, o establir\n" -"la variable de configuraciรณ i18n.commitencoding a la codificaciรณ que\n" -"usi el vostre projecte.\n" +#: commit-graph.c:188 midx.c:46 +#, fuzzy +msgid "invalid hash version" +msgstr "especificaciรณ de camรญ no vร lida" -#: commit-graph.c:127 +#: commit-graph.c:246 msgid "commit-graph file is too small" -msgstr "" +msgstr "el fitxer del graf de comissions รฉs massa petit" -#: commit-graph.c:192 +#: commit-graph.c:311 #, 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:199 +#: commit-graph.c:318 #, 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:206 +#: commit-graph.c:325 #, 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" - -#: commit-graph.c:229 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" +"la versiรณ del hash del graf de comissions %X no coincideix amb la versiรณ %X" -#: commit-graph.c:240 +#: commit-graph.c:342 +#, fuzzy, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "el fitxer del graf de comissions รฉs massa petit" + +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" -msgstr "" +msgstr "desplaรงament %08x%08x del grร fic de comissions incorrecte" -#: commit-graph.c:283 +#: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" -msgstr "" +msgstr "id %08x del graf de comissions apareix mรบltiples vegades" -#: commit-graph.c:347 +#: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" -msgstr "" +msgstr "el graf de comissions no tรฉ grafs de base" -#: commit-graph.c:357 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "la cadena del graf de comissions no coincideix" -#: commit-graph.c:404 +#: commit-graph.c:557 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" +"la cadena del graf de comissions no รฉs vร lida: la lรญnia ยซ%sยป no รฉs un hash" -#: commit-graph.c:430 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "no es poden trobar tots els fitxers del graf de comissions" -#: commit-graph.c:553 commit-graph.c:613 +#: commit-graph.c:721 commit-graph.c:785 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:574 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "no s'ha pogut trobar la comissiรณ %s" -#: commit-graph.c:1001 builtin/pack-objects.c:2651 +#: commit-graph.c:1042 builtin/am.c:1306 +#, c-format +msgid "unable to parse commit %s" +msgstr "no s'ha pogut analitzar la comissiรณ %s" + +#: commit-graph.c:1265 builtin/pack-objects.c:2864 #, 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:1033 +#: commit-graph.c:1301 msgid "Loading known commits in commit graph" msgstr "S'estan carregant comissions conegudes al graf de comissions" -#: commit-graph.c:1050 +#: commit-graph.c:1318 msgid "Expanding reachable commits in commit graph" msgstr "S'estan expandint les comissions abastables al graf de comissions" -#: commit-graph.c:1069 +#: commit-graph.c:1338 msgid "Clearing commit marks in commit graph" -msgstr "S'estan netejant les marques de comissions al graf de comissions" +msgstr "S'estan esborrant les marques de comissions al graf de comissions" -#: commit-graph.c:1088 +#: commit-graph.c:1357 msgid "Computing commit graph generation numbers" msgstr "S'estan calculant els nombres de generaciรณ del graf de comissions" -#: commit-graph.c:1162 +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "" +"S'estan calculant els canvis les rutes de la comissiรณ en els filtres Bloom" + +#: commit-graph.c:1501 +#, fuzzy +msgid "Collecting referenced commits" +msgstr "S'estan comptant els objectes referenciats" + +#: commit-graph.c:1526 #, 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:1175 +#: commit-graph.c:1539 #, c-format msgid "error adding pack %s" msgstr "error en afegir paquet %s" -#: commit-graph.c:1179 +#: commit-graph.c:1543 #, c-format msgid "error opening index for %s" msgstr "s'ha produรฏt un error en obrir l'รญndex per ยซ%sยป" -#: 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:1237 +#: commit-graph.c:1582 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:1252 +#: commit-graph.c:1597 msgid "Counting distinct commits in commit graph" -msgstr "S'estant comptant les comissions diferents al graf de comissions" +msgstr "S'estan comptant les comissions diferents al graf de comissions" -#: commit-graph.c:1283 +#: commit-graph.c:1629 msgid "Finding extra edges in commit graph" msgstr "S'estan cercant les vores addicionals al graf de comissions" -#: commit-graph.c:1331 +#: commit-graph.c:1678 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:1364 midx.c:811 +#: commit-graph.c:1720 midx.c:826 #, c-format msgid "unable to create leading directories of %s" msgstr "no s'han pogut crear els directoris inicials de ยซ%sยป" -#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251 +#: commit-graph.c:1733 +msgid "unable to create temporary graph layer" +msgstr "no s'ha pogut crear una capa de graf temporal" + +#: commit-graph.c:1738 #, c-format -msgid "unable to create '%s'" -msgstr "no s'ha pogut crear ยซ%sยป" +msgid "unable to adjust shared permissions for '%s'" +msgstr "no s'han pogut ajustar els permisos compartits per a ยซ%sยป" -#: commit-graph.c:1436 +#: commit-graph.c:1808 #, 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:1477 +#: commit-graph.c:1853 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:1489 +#: commit-graph.c:1869 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:1509 +#: commit-graph.c:1889 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:1620 +#: commit-graph.c:2015 msgid "Scanning merged commits" msgstr "S'estan escanejant les comissions fusionades" -#: commit-graph.c:1631 +#: commit-graph.c:2026 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de comissiรณ duplicat %s no esperat" -#: commit-graph.c:1656 +#: commit-graph.c:2049 msgid "Merging commit-graph" msgstr "S'estร fusionant el graf de comissions" -#: commit-graph.c:1842 +#: commit-graph.c:2259 #, 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:1853 +#: commit-graph.c:2270 msgid "too many commits to write graph" msgstr "massa comissions per escriure un graf" -#: commit-graph.c:1943 +#: commit-graph.c:2363 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:1953 +#: commit-graph.c:2373 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" -msgstr "" +msgstr "el grร fic de comissions tรฉ una ordre OID incorrecta; %s llavors %s" -#: commit-graph.c:1963 commit-graph.c:1978 +#: commit-graph.c:2383 commit-graph.c:2398 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" +"el graf de comissions tรฉ un valor de ยซfanoutยป incorrecte: fanout[%d] = %u != " +"%u" -#: commit-graph.c:1970 +#: commit-graph.c:2390 #, 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:1987 +#: commit-graph.c:2408 msgid "Verifying commits in commit graph" msgstr "S'estan verificant les comissions al graf de comissions" -#: commit-graph.c:2000 +#: commit-graph.c:2423 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" +"no s'han pogut analitzar la comissiรณ %s de la base de dades d'objectes per " +"al graf de comissions" -#: commit-graph.c:2007 +#: commit-graph.c:2430 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" +"OID de l'arbre arrel per a comissions %s en el graf de comissions รฉs %s != %s" -#: commit-graph.c:2017 +#: commit-graph.c:2440 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" +"la llista de pares del graf de comissions per a la comissiรณ %s รฉs massa " +"llarga" -#: commit-graph.c:2026 +#: commit-graph.c:2449 #, c-format msgid "commit-graph parent for %s is %s != %s" -msgstr "" +msgstr "el pare pel graf de comissions %s รฉs %s != %s" -#: commit-graph.c:2039 +#: commit-graph.c:2463 #, c-format msgid "commit-graph parent list for commit %s terminates early" -msgstr "" +msgstr "la llista pare del graf de comissions per %s acaba aviat" -#: commit-graph.c:2044 +#: commit-graph.c:2468 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" +"El graf de comissions tรฉ nombre de generaciรณ zero per a la comissiรณ %s, perรฒ " +"tรฉ no zero en altres llocs" -#: commit-graph.c:2048 +#: commit-graph.c:2472 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" +"El graf de comissions tรฉ un nombre de generaciรณ diferent de zero per a " +"comissiรณ %s perรฒ tรฉ zero en altres llocs" -#: commit-graph.c:2063 +#: commit-graph.c:2488 #, c-format msgid "commit-graph generation for commit %s is %u != %u" -msgstr "" +msgstr "La generaciรณ del graf de comissions per la comissiรณ %s รฉs %u != %u" -#: commit-graph.c:2069 +#: commit-graph.c:2494 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" +"La data d'enviament per a la comissiรณ %s en el graf de comissions รฉs " +"%<PRIuMAX> != %<PRIuMAX>" + +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "no s'ha pogut analitzar %s" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s no รฉs una comissiรณ!" + +#: commit.c:194 +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 "" + +#: commit.c:1172 +#, 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:1176 +#, 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:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "La comissiรณ %s no tรฉ signatura GPG." + +#: commit.c:1182 +#, 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:1436 +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 "" +"Advertรจncia: el missatge de comissiรณ no รฉs compatible amb UTF-8.\n" +"Potser voleu esmenar-lo desprรฉs de corregir el missatge, o establir\n" +"la variable de configuraciรณ i18n.commitencoding a la codificaciรณ que\n" +"usi el vostre projecte.\n" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "memรฒria esgotada" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1710,303 +2523,303 @@ msgid "" "\t%s\n" "This might be due to circular includes." msgstr "" +"s'ha superat la profunditat mร xima d'inclusiรณ (%d) mentre s'incloรฏen\n" +"\t%s\n" +"des de\n" +"\t%s\n" +"Aixรฒ pot ser degut a inclusions circulars." -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "no s'ha pogut expandir el camรญ d'inclusiรณ ยซ%sยป" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "les inclusions de configuraciรณ relatives han de venir de fitxers" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "" "els condicionals d'inclusiรณ de configuraciรณ relatius han de venir de fitxers" -#: config.c:375 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "la clau no contรฉ una secciรณ: ยซ%sยป" -#: config.c:381 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "la clau no contรฉ un nom de variable: ยซ%sยป" -#: config.c:405 sequencer.c:2463 +#: config.c:408 sequencer.c:2547 #, c-format msgid "invalid key: %s" msgstr "clau no vร lida: %s" -#: config.c:411 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" -msgstr "clau no vร lida (lรญnea nova): %s" +msgstr "clau no vร lida (lรญnia nova): %s" -#: config.c:447 config.c:459 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "parร metre de configuraciรณ erroni: %s" -#: config.c:494 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "format erroni a %s" -#: config.c:820 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "lรญnia de configuraciรณ %d errรฒnia en el blob %s" -#: config.c:824 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "lรญnia de configuraciรณ %d errรฒnia en el fitxer %s" -#: config.c:828 +#: config.c:844 #, 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:832 +#: config.c:848 #, 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:836 +#: config.c:852 #, 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:840 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "lรญnia de configuraciรณ %d errรฒnia en %s" -#: config.c:977 +#: config.c:993 msgid "out of range" msgstr "fora de rang" -#: config.c:977 +#: config.c:993 msgid "invalid unit" msgstr "unitat no vร lida" -#: config.c:978 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valor de configuraciรณ numรจric erroni ยซ%sยป per ยซ%sยป: %s" -#: config.c:997 +#: config.c:1013 #, 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:1000 +#: config.c:1016 #, 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:1003 +#: config.c:1019 #, 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:1006 +#: config.c:1022 #, 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 " +"valor de configuraciรณ numรจric ยซ%sยป erroni per ยซ%sยป en el blob de submรฒdul " "%s: %s" -#: config.c:1009 +#: config.c:1025 #, 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:1012 +#: config.c:1028 #, 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:1107 +#: config.c:1123 #, 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:1116 +#: config.c:1132 #, 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:1207 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" -msgstr "" +msgstr "la longitud d'ยซabbrevยป estร fora de rang: %d" -#: config.c:1221 config.c:1232 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "nivell de compressiรณ de zlib incorrecte %d" -#: config.c:1324 +#: config.c:1340 msgid "core.commentChar should only be one character" -msgstr "" +msgstr "core.commentChar nomรฉs hauria de ser un carร cter" -#: config.c:1357 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode de creaciรณ d'objecte no vร lid: %s" -#: config.c:1429 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "valor no vร lid per a %s" -#: config.c:1455 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "valor no vร lid per a %s: %s" -#: config.c:1456 +#: config.c:1472 +#, fuzzy msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" +"ha de ser un dels elements que no coincideixen amb la font simple o l'actual" -#: config.c:1517 builtin/pack-objects.c:3399 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "nivell de compressiรณ de paquet %d Erroni" -#: config.c:1638 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "no s'ha pogut carregar l'objecte blob de configuraciรณ ยซ%sยป" -#: config.c:1641 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "la referรจncia ยซ%sยป no assenyala a un blob" -#: config.c:1658 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "no s'ha pogut resoldre el blob de configuraciรณ: ยซ%sยป" -#: config.c:1688 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "s'ha produรฏt un error en analitzar %s" -#: config.c:1744 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "no s'ha pogut analitzar la configuraciรณ de la lรญnia d'ordres" -#: config.c:2093 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuraciรณ" -#: config.c:2263 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "%s no vร lid: ยซ%sยป" -#: 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 +#: config.c:2341 #, 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:2378 +#: config.c:2387 #, 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:2380 +#: config.c:2389 #, 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:2461 +#: config.c:2470 #, c-format msgid "invalid section name '%s'" msgstr "nom de secciรณ no vร lid ยซ%sยป" -#: config.c:2493 +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "%s tรฉ mรบltiples valors" -#: config.c:2522 +#: config.c:2531 #, c-format msgid "failed to write new configuration file %s" msgstr "no es pot escriure un nou fitxer de configuraciรณ %s" -#: config.c:2774 config.c:3098 +#: config.c:2783 config.c:3107 #, c-format msgid "could not lock config file %s" msgstr "no s'ha pogut blocar el fitxer de configuraciรณ %s" -#: config.c:2785 +#: config.c:2794 #, c-format msgid "opening %s" msgstr "s'estร obrint %s" -#: config.c:2820 builtin/config.c:328 +#: config.c:2829 builtin/config.c:354 #, c-format msgid "invalid pattern: %s" msgstr "patrรณ no vร lid: %s" -#: config.c:2845 +#: config.c:2854 #, c-format msgid "invalid config file %s" msgstr "fitxer de configuraciรณ no vร lid %s" -#: config.c:2858 config.c:3111 +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "ha fallat ยซfstatยป a %s" -#: config.c:2869 +#: config.c:2878 #, c-format msgid "unable to mmap '%s'" msgstr "no s'ha pogut fer ยซmmapยป ยซ%sยป" -#: config.c:2878 config.c:3116 +#: config.c:2887 config.c:3125 #, c-format msgid "chmod on %s failed" msgstr "ha fallat chmod a %s" -#: config.c:2963 config.c:3213 +#: config.c:2972 config.c:3222 #, c-format msgid "could not write config file %s" msgstr "no s'ha pogut escriure el fitxer de configuraciรณ ยซ%sยป" -#: config.c:2997 +#: config.c:3006 #, c-format msgid "could not set '%s' to '%s'" msgstr "no s'ha pogut establir ยซ%sยป a ยซ%sยป" -#: config.c:2999 builtin/remote.c:782 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "no s'ha pogut desassignar ยซ%sยป" -#: config.c:3089 +#: config.c:3098 #, c-format msgid "invalid section name: %s" msgstr "nom de secciรณ no vร lida: %s" -#: config.c:3256 +#: config.c:3265 #, c-format msgid "missing value for '%s'" msgstr "falta el valor per ยซ%sยป" @@ -2032,73 +2845,83 @@ msgstr "" msgid "server doesn't support '%s'" msgstr "el servidor no รฉs compatible amb ยซ%sยป" -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "el servidor no รฉs compatible amb la caracterรญstica ยซ%sยป" -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" -msgstr "" +msgstr "s'esperava un buidatge desprรฉs de les capacitats" -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" -msgstr "" +msgstr "ignora les capacitats desprรฉs de la primera lรญnia ยซ%sยป" -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" -msgstr "" +msgstr "error de protocol: unexpected capabilities^{}" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "" "s'ha produรฏt un error de protocol: s'esperava shallow sha-1, s'ha rebut ยซ%sยป" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" -msgstr "" +msgstr "el dipรฒsit de l'altre extrem no pot ser shallow" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" msgstr "paquet no vร lid" -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "s'ha produรฏt un error de protocol: no s'esperava ยซ%sยป" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" msgstr "resposta de ls-refs no vร lida: %s" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" -msgstr "" +msgstr "s'esperava una neteja desprรฉs del llistat de referรจncies" -#: connect.c:544 +#: connect.c:507 +#, fuzzy +msgid "expected response end packet after ref listing" +msgstr "s'esperava una neteja desprรฉs del llistat de referรจncies" + +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" msgstr "el protocol ยซ%sยป no รฉs compatible" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" msgstr "no s'ha pogut establir SO_KEEPALIVE al sรฒcol" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "S'estร cercant %s..." -#: connect.c:639 +#: connect.c:735 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "no s'ha pogut trobar %s (port %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" @@ -2107,7 +2930,7 @@ msgstr "" "fet.\n" "S'estร connectant a %s (port %s) ... " -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -2117,87 +2940,89 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "fet." -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "no s'ha pogut trobar %s (%s)" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "port desconegut %s" -#: connect.c:845 connect.c:1171 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "s'ha bloquejat el nom estrany d'amfitriรณ ยซ%sยป" -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "s'ha bloquejat el port estrany ยซ%sยป" -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "no s'ha pogut iniciar servidor intermediari ยซ%sยป" -#: connect.c:924 +#: connect.c:1024 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 sintaxis vร lida per URL" +msgstr "" +"no s'ha especificat un camรญ; vegeu ยซgit help pullยป per la sintaxi vร lida per " +"URL" -#: connect.c:1119 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" -msgstr "la variant ยซsimpleยป d'ssh no รฉs compatible amb -4" +msgstr "la variant ยซsimpleยป de ssh no รฉs compatible amb -4" -#: connect.c:1131 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" -msgstr "la variant ยซsimpleยป d'ssh no รฉs compatible amb -6" +msgstr "la variant ยซsimpleยป de ssh no รฉs compatible amb -6" -#: connect.c:1148 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" -msgstr "la variant ยซsimpleยป d'ssh no permet definir el port" +msgstr "la variant ยซsimpleยป de ssh no permet definir el port" -#: connect.c:1260 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" -msgstr "s'ha bloquejat el nom de fitxer extrany ยซ%sยป" +msgstr "s'ha bloquejat el nom de fitxer estrany ยซ%sยป" -#: connect.c:1307 +#: connect.c:1408 msgid "unable to fork" msgstr "no s'ha pogut bifurcar" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "S'estร comprovant la connectivitat" -#: connected.c:98 +#: connected.c:120 msgid "Could not run 'git rev-list'" -msgstr "No s'ha pogut executar 'git rev-list'" +msgstr "No s'ha pogut executar ยซgit rev-listยป" -#: connected.c:118 +#: connected.c:144 msgid "failed write to rev-list" msgstr "escriptura fallada al rev-list" -#: connected.c:125 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "s'ha produรฏt un error en tancar l'stdin del rev-list" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" -msgstr "" +msgstr "crlf_action %d ilยทlegal" -#: convert.c:206 +#: convert.c:207 #, 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:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2205,14 +3030,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:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" -msgstr "LF es reemplaรงร per LF en %s" +msgstr "LF es reemplaรงร per CRLF en %s" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2220,24 +3045,26 @@ 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:279 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" -msgstr "" +msgstr "BOM estร prohibida a ยซ%sยป si estร codificada com a %s" -#: convert.c:286 +#: convert.c:291 #, 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 fitxer ยซ%sยป contรฉ una marca d'ordre de byte (BOM). Utilitzeu UTF-%.*s com " +"a codificacions d'arbre de treball." #: convert.c:304 #, c-format msgid "BOM is required in '%s' if encoded as %s" -msgstr "" +msgstr "La BOM รฉs necessร ria en ยซ%sยป si estร codificada com a %s" #: convert.c:306 #, c-format @@ -2245,118 +3072,150 @@ 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 "" +"Falta una marca d'ordre de byte (BOM) al fitxer ยซ%sยป. Useu UTF-%sBE o UTF-" +"%sLE (depenent de l'ordre de byte) com a codificacions d'arbre de treball." -#: convert.c:424 convert.c:495 +#: convert.c:419 convert.c:490 #, 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:467 +#: convert.c:462 #, 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:673 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "no es pot bifurcar per a executar el filtre extern ยซ%sยป" -#: convert.c:693 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "no es pot alimentar l'entrada al filtre extern ยซ%sยป" -#: convert.c:700 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "el filtre extern ยซ%sยป ha fallat %d" -#: convert.c:735 convert.c:738 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "la lectura del filtre extern ยซ%sยป ha fallat" -#: convert.c:741 convert.c:796 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "el filtre extern ยซ%sยป ha fallat" -#: convert.c:844 +#: convert.c:837 msgid "unexpected filter type" msgstr "tipus de filtre inesperat" -#: convert.c:855 +#: convert.c:848 msgid "path name too long for external filter" -msgstr "" +msgstr "el nom del camรญ รฉs massa gran per al filtre extern" -#: convert.c:929 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" +"el filtre extern ยซ%sยป ja no estร disponible encara que no s'han filtrat tots " +"els camins" -#: convert.c:1228 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" -msgstr "" +msgstr "cert/fals no sรณn codificacions d'arbre de treball vร lides" -#: convert.c:1398 convert.c:1432 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: el filtre de netejat ยซ%sยป ha fallat" -#: convert.c:1476 +#: convert.c:1508 #, fuzzy, c-format msgid "%s: smudge filter %s failed" -msgstr "s'ha produรฏt un error en actualitzar els fitxers" +msgstr "percentatges Ha fallat el filtre de l'esborronat" -#: date.c:137 +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "l'url no tรฉ esquema: %s" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "no s'ha pogut analitzar l'URL de credencials: %s" + +#: date.c:138 msgid "in the future" msgstr "en el futur" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "fa %<PRIuMAX> segon" msgstr[1] "fa %<PRIuMAX> segons" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "fa %<PRIuMAX> minut" msgstr[1] "fa %<PRIuMAX> minuts" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "fa %<PRIuMAX> hora" msgstr[1] "fa %<PRIuMAX> hores" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "fa %<PRIuMAX> dia" msgstr[1] "fa %<PRIuMAX> dies" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "fa %<PRIuMAX> setmana" msgstr[1] "fa %<PRIuMAX> setmanes" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "fa %<PRIuMAX> mes" msgstr[1] "fa %<PRIuMAX> mesos" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2364,14 +3223,14 @@ msgstr[0] "%<PRIuMAX> any" msgstr[1] "%<PRIuMAX> anys" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, 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:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2405,15 +3264,6 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Marcades %d illes, fet.\n" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "s'ha produรฏt un error en llegir el fitxer d'ordres ยซ%sยป" - -#: diffcore-rename.c:544 -msgid "Performing inexact rename detection" -msgstr "S'estร realitzant una detecciรณ inexacta de canvis de nom" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<opcions>] <camรญ> <camรญ>" @@ -2426,20 +3276,19 @@ msgstr "" "No รฉs un dipรฒsit Git. Useu --no-index per a comparar dos camins fora del " "directori de treball" - -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " S'ha produรฏt un error en analitzar el percentatge limitant de dirstat " "ยซ%sยป\n" -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Parร metre de dirstat desconegut ยซ%sยป\n" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2447,63 +3296,68 @@ msgstr "" "el parร metre de color en moviment ha de ser ยซnoยป, ยซdefaultยป, ยซblocksยป, " "ยซzebraยป, ยซdimmed-zebraยป o ยซplainยป" -#: diff.c:324 -#, c-format +#: diff.c:325 +#, fuzzy, 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 "" +"el mode ยซ%sยป de ยซcolor-moved-wsยป รฉs ยซignore-space-changeยป ยซignore-space-at-" +"eolยป ยซignore-all-spaceยป ยซallow-indentation-changeยป" -#: diff.c:332 +#: diff.c:333 +#, fuzzy msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "" +"color-moved-ws allow-indentation-change no es pot combinar amb altres modes " +"d'espai en blanc" -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -"Valor desconegut de la variable de configuraciรณ de 'diff.submodule': ยซ%sยป" +"Valor desconegut de la variable de configuraciรณ de ยซdiff.submoduleยป: ยซ%sยป" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -"S'han trobat errors en la variable de configuraciรณ 'diff.dirstat':\n" +"S'han trobat errors en la variable de configuraciรณ ยซdiff.dirstatยป:\n" "%s" -#: diff.c:4215 +#: diff.c:4269 #, c-format msgid "external diff died, stopping at %s" msgstr "el diff external s'ha mort, s'estร aturant a %s" -#: diff.c:4560 +#: diff.c:4618 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:4563 +#: diff.c:4621 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S and --find-object sรณn mรบtuament excloents" -#: diff.c:4641 +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "--follow requereix exactament una especificaciรณ de camรญ" -#: diff.c:4689 -#, c-format +#: diff.c:4747 +#, c-format msgid "invalid --stat value: %s" msgstr "valor --stat no vร lid: %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numรจric" -#: diff.c:4726 +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2512,499 +3366,523 @@ msgstr "" "S'ha produรฏt un error en analitzar el parร metre d'opciรณ de --dirstat/-X:\n" "%s" -#: diff.c:4811 +#: diff.c:4869 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de canvi ยซ%cยป desconeguda a --diff-filter=%s" -#: diff.c:4835 +#: diff.c:4893 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valor desconegut desprรฉs de ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4907 #, c-format msgid "unable to resolve '%s'" msgstr "no s'ha pogut resoldre ยซ%sยป" -#: diff.c:4899 diff.c:4905 +#: diff.c:4957 diff.c:4963 #, c-format msgid "%s expects <n>/<m> form" -msgstr "" +msgstr "%s espera una forma <n>/<m>" -#: diff.c:4917 +#: diff.c:4975 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s esperava un carร cter, s'ha rebut ยซ%sยป" -#: diff.c:4938 +#: diff.c:4996 #, c-format msgid "bad --color-moved argument: %s" -msgstr "parร metre --color-moved incorrecte: %s" +msgstr "argument --color-moved incorrecte: %s" -#: diff.c:4957 +#: diff.c:5015 #, c-format msgid "invalid mode '%s' in --color-moved-ws" -msgstr "mode ยซ%sยป no vร lid en -color-moved-ws" +msgstr "mode ยซ%sยป no vร lid en --color-moved-ws" -#: diff.c:4997 +#: diff.c:5055 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -"l'opciรณ diff-algorithm accepta ยซmyersยป, ยซminimalminimalยป, \"patience\" and " -"ยซhistogramยป" +"l'opciรณ diff-algorithm accepta ยซmyersยป, ยซminimalยป, ยซpatienceยป i ยซhistogramยป" -#: diff.c:5033 diff.c:5053 +#: diff.c:5091 diff.c:5111 #, c-format msgid "invalid argument to %s" msgstr "argument no vร lid a %s" -#: diff.c:5191 +#: diff.c:5248 #, 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:5247 +#: diff.c:5304 #, c-format msgid "bad --word-diff argument: %s" -msgstr "parร metre --word-diff incorrecte: %s" +msgstr "argument --word-diff incorrecte: %s" -#: diff.c:5270 +#: diff.c:5327 msgid "Diff output format options" msgstr "Opcions del format de sortida del diff" -#: diff.c:5272 diff.c:5278 +#: diff.c:5329 diff.c:5335 msgid "generate patch" msgstr "generant pedaรง" -#: diff.c:5275 builtin/log.c:182 +#: diff.c:5332 builtin/log.c:176 msgid "suppress diff output" msgstr "omet la sortida de diferรจncies" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5337 diff.c:5451 diff.c:5458 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5338 diff.c:5341 msgid "generate diffs with <n> lines context" msgstr "genera diffs amb <n> lรญnies de context" -#: diff.c:5286 +#: diff.c:5343 msgid "generate the diff in raw format" msgstr "genera el diff en format cru" -#: diff.c:5289 +#: diff.c:5346 msgid "synonym for '-p --raw'" -msgstr "sinรฒnim de per a ยซ-p --rawยป" +msgstr "sinรฒnim de ยซ-p --rawยป" -#: diff.c:5293 +#: diff.c:5350 msgid "synonym for '-p --stat'" -msgstr "sinรฒnim de per a ยซ-p --statยป" +msgstr "sinรฒnim de ยซ-p --statยป" -#: diff.c:5297 +#: diff.c:5354 msgid "machine friendly --stat" msgstr "llegible per mร quina --stat" -#: diff.c:5300 +#: diff.c:5357 msgid "output only the last line of --stat" msgstr "mostra nomรฉs l'รบltima lรญnia de --stat" -#: diff.c:5302 diff.c:5310 +#: diff.c:5359 diff.c:5367 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5303 +#: diff.c:5360 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" +"genera la distribuciรณ de la quantitat relativa de canvis per a cada " +"subdirectori" -#: diff.c:5307 +#: diff.c:5364 msgid "synonym for --dirstat=cumulative" -msgstr "sinรฒnim per -dirstat=cumulative" +msgstr "sinรฒnim de --dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5368 msgid "synonym for --dirstat=files,param1,param2..." -msgstr "sinรฒnim per --dirstat=files,param1,param2..." +msgstr "sinรฒnim de --dirstat=files,param1,param2..." -#: diff.c:5315 +#: diff.c:5372 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" +"avisa si els canvis introdueixen marcadors en conflicte o errors d'espai en " +"blanc" -#: diff.c:5318 +#: diff.c:5375 msgid "condensed summary such as creations, renames and mode changes" -msgstr "" +msgstr "resum condensat com ara creacions, canvis de nom i mode" -#: diff.c:5321 +#: diff.c:5378 msgid "show only names of changed files" msgstr "mostra nomรฉs els noms de fitxers canviats" -#: diff.c:5324 +#: diff.c:5381 msgid "show only names and status of changed files" msgstr "mostra nomรฉs els noms i l'estat dels fitxers canviats" -#: diff.c:5326 +#: diff.c:5383 msgid "<width>[,<name-width>[,<count>]]" -msgstr "" +msgstr "<amplada>[<amplada-nom>[,<recompte>]]" -#: diff.c:5327 +#: diff.c:5384 msgid "generate diffstat" msgstr "genera diffstat" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5386 diff.c:5389 diff.c:5392 msgid "<width>" msgstr "<amplada>" -#: diff.c:5330 +#: diff.c:5387 msgid "generate diffstat with a given width" msgstr "genera diffstat amb una amplada donada" -#: diff.c:5333 +#: diff.c:5390 msgid "generate diffstat with a given name width" msgstr "genera diffstat amb un nom d'amplada donat" -#: diff.c:5336 +#: diff.c:5393 msgid "generate diffstat with a given graph width" msgstr "genera diffstat amb una amplada de graf donada" -#: diff.c:5338 +#: diff.c:5395 msgid "<count>" msgstr "<comptador>" -#: diff.c:5339 +#: diff.c:5396 msgid "generate diffstat with limited lines" msgstr "genera diffstat amb lรญnies limitades" -#: diff.c:5342 +#: diff.c:5399 msgid "generate compact summary in diffstat" msgstr "genera un resum compacte a diffstat" -#: diff.c:5345 +#: diff.c:5402 msgid "output a binary diff that can be applied" -msgstr "diff amb sortida binaria que pot ser aplicada" +msgstr "diff amb sortida binร ria que pot ser aplicada" -#: diff.c:5348 +#: diff.c:5405 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" +"mostra els noms complets dels objectes pre i post-imatge a les lรญnies ยซindexยป" -#: diff.c:5350 +#: diff.c:5407 msgid "show colored diff" msgstr "mostra un diff amb colors" -#: diff.c:5351 +#: diff.c:5408 msgid "<kind>" -msgstr "" +msgstr "<kind>" -#: diff.c:5352 +#: diff.c:5409 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" +"ressalta els errors d'espai en blanc a les lรญnies ยซcontextยป, ยซoldยป o ยซnewยป " +"al diff" -#: diff.c:5355 +#: diff.c:5412 +#, fuzzy msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" +"no munge noms de camรญ i utilitza NULs com a terminadors de camp de sortida " +"en --raw o --numstat" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5359 +#: diff.c:5416 msgid "show the given source prefix instead of \"a/\"" -msgstr "" +msgstr "mostra el prefix d'origen donat en lloc de ยซa/ยป" -#: diff.c:5362 +#: diff.c:5419 msgid "show the given destination prefix instead of \"b/\"" -msgstr "" +msgstr "mostra el prefix de destinaciรณ indicat en lloc de ยซb/ยป" -#: diff.c:5365 +#: diff.c:5422 msgid "prepend an additional prefix to every line of output" msgstr "afegir un prefix addicional per a cada lรญnia de sortida" -#: diff.c:5368 +#: diff.c:5425 msgid "do not show any source or destination prefix" msgstr "no mostris cap prefix d'origen o destรญ" -#: diff.c:5371 -#, fuzzy +#: diff.c:5428 msgid "show context between diff hunks up to the specified number of lines" -msgstr "Crea un clon superficial truncat al nombre de revisions especificat" +msgstr "" +"mostra el context entre trossos de diferรจncia fins al nombre especificat de " +"lรญnies" -#: diff.c:5375 diff.c:5380 diff.c:5385 +#: diff.c:5432 diff.c:5437 diff.c:5442 msgid "<char>" msgstr "<char>" -#: diff.c:5376 +#: diff.c:5433 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:5381 +#: diff.c:5438 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:5386 +#: diff.c:5443 msgid "specify the character to indicate a context instead of ' '" msgstr "especifiqueu el carร cter per a indicar context en comptes de ยซ ยป" -#: diff.c:5389 +#: diff.c:5446 msgid "Diff rename options" msgstr "Opcions de canvi de nom del diff" -#: diff.c:5390 +#: diff.c:5447 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5448 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:5395 +#: diff.c:5452 msgid "detect renames" msgstr "detecta els canvis de noms" -#: diff.c:5399 +#: diff.c:5456 msgid "omit the preimage for deletes" msgstr "omet les preimatges per les supressions" -#: diff.c:5402 +#: diff.c:5459 msgid "detect copies" msgstr "detecta cรฒpies" -#: diff.c:5406 +#: diff.c:5463 msgid "use unmodified files as source to find copies" msgstr "usa els fitxers no modificats com a font per trobar cรฒpies" -#: diff.c:5408 +#: diff.c:5465 msgid "disable rename detection" msgstr "inhabilita la detecciรณ de canvis de nom" -#: diff.c:5411 +#: diff.c:5468 msgid "use empty blobs as rename source" msgstr "usa els blobs buits com a font de canvi de nom" -#: diff.c:5413 +#: diff.c:5470 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 fitxer mรฉs enllร dels canvis de nom" -#: diff.c:5416 +#: diff.c:5473 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" +"Evita la detecciรณ de canvi de nom/cรฒpia si el nombre d'objectius de canvi de " +"nom/cรฒpia supera el lรญmit indicat" -#: diff.c:5418 +#: diff.c:5475 msgid "Diff algorithm options" -msgstr "Opcions d'algorisme Diff" +msgstr "Opcions de l'algorisme Diff" -#: diff.c:5420 +#: diff.c:5477 msgid "produce the smallest possible diff" msgstr "produeix el diff mรฉs petit possible" -#: diff.c:5423 +#: diff.c:5480 msgid "ignore whitespace when comparing lines" -msgstr "ignora els espai en blanc en comparar lรญnies" +msgstr "ignora els espais en blanc en comparar lรญnies" -#: diff.c:5426 +#: diff.c:5483 msgid "ignore changes in amount of whitespace" msgstr "ignora els canvis en la quantitat d'espai en blanc" -#: diff.c:5429 +#: diff.c:5486 msgid "ignore changes in whitespace at EOL" msgstr "ignora els canvis d'espai en blanc al final de la lรญnia" -#: diff.c:5432 +#: diff.c:5489 msgid "ignore carrier-return at the end of line" msgstr "ignora els retorns de lรญnia al final de la lรญnia" -#: diff.c:5435 +#: diff.c:5492 msgid "ignore changes whose lines are all blank" msgstr "ignora els canvis en lรญnies que estan en blanc" -#: diff.c:5438 +#: diff.c:5495 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" +"heurรญstica per a desplaรงar els lรญmits del tros de diferรจncia per a una " +"lectura fร cil" -#: diff.c:5441 +#: diff.c:5498 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera diff usant l'algorisme ยซpatience diffยป" -#: diff.c:5445 +#: diff.c:5502 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera diff usant l'algorisme ยซhistogram diffยป" -#: diff.c:5447 +#: diff.c:5504 msgid "<algorithm>" msgstr "<algorisme>" -#: diff.c:5448 +#: diff.c:5505 msgid "choose a diff algorithm" -msgstr "escolliu un algorisme pel diff" +msgstr "trieu un algorisme per al diff" -#: diff.c:5450 +#: diff.c:5507 msgid "<text>" msgstr "<text>" -#: diff.c:5451 +#: diff.c:5508 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera diff usant l'algorisme ยซanchored diffยป" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5510 diff.c:5519 diff.c:5522 msgid "<mode>" msgstr "<mode>" -#: diff.c:5454 +#: diff.c:5511 +#, fuzzy msgid "show word diff, using <mode> to delimit changed words" msgstr "" +"mostra el diff de paraules usant <mode> per delimitar les paraules " +"modificades" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5513 diff.c:5516 diff.c:5561 msgid "<regex>" msgstr "<regex>" -#: diff.c:5457 +#: diff.c:5514 msgid "use <regex> to decide what a word is" -msgstr "" +msgstr "utilitza <regex> per a decidir quรจ รฉs una paraula" -#: diff.c:5460 +#: diff.c:5517 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5463 +#: diff.c:5520 msgid "moved lines of code are colored differently" -msgstr "" +msgstr "les lรญnies de codi que s'ha mogut s'acoloreixen diferent" -#: diff.c:5466 +#: diff.c:5523 msgid "how white spaces are ignored in --color-moved" -msgstr "" +msgstr "com s'ignoren els espais en blanc a --color-moved" -#: diff.c:5469 -#, fuzzy +#: diff.c:5526 msgid "Other diff options" -msgstr "Opcions genรจriques" +msgstr "Altres opcions diff" -#: diff.c:5471 +#: diff.c:5528 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" -#: diff.c:5475 +#: diff.c:5532 msgid "treat all files as text" msgstr "tracta tots els fitxers com a text" -#: diff.c:5477 +#: diff.c:5534 msgid "swap two inputs, reverse the diff" -msgstr "" +msgstr "intercanvia les dues entrades, inverteix el diff" -#: diff.c:5479 +#: diff.c:5536 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:5481 +#: diff.c:5538 msgid "disable all output of the program" msgstr "inhabilita totes les sortides del programa" -#: diff.c:5483 +#: diff.c:5540 msgid "allow an external diff helper to be executed" -msgstr "" +msgstr "permet executar un ajudant de diff extern" -#: diff.c:5485 +#: diff.c:5542 msgid "run external text conversion filters when comparing binary files" msgstr "" +"executa els filtres externs de conversiรณ de text en comparar fitxers binaris" -#: diff.c:5487 +#: diff.c:5544 msgid "<when>" msgstr "<quan>" -#: diff.c:5488 +#: diff.c:5545 msgid "ignore changes to submodules in the diff generation" msgstr "ignora els canvis als submรฒduls en la generaciรณ del diff" -#: diff.c:5491 +#: diff.c:5548 msgid "<format>" msgstr "<format>" -#: diff.c:5492 +#: diff.c:5549 msgid "specify how differences in submodules are shown" msgstr "especifiqueu com es mostren els canvis als submรฒduls" -#: diff.c:5496 -#, fuzzy +#: diff.c:5553 msgid "hide 'git add -N' entries from the index" -msgstr "usa .gitattributes nomรฉs des de l'รญndex" +msgstr "amaga les entrades ยซgit add -Nยป de l'รญndex" -#: diff.c:5499 +#: diff.c:5556 msgid "treat 'git add -N' entries as real in the index" -msgstr "" +msgstr "tracta les entrades ยซgit add -Nยป com a reals a l'รญndex" -#: diff.c:5501 +#: diff.c:5558 msgid "<string>" msgstr "<cadena>" -#: diff.c:5502 +#: diff.c:5559 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" +"cerca les diferรจncies que canvien el nombre d'ocurrรจncies de la cadena " +"especificada" -#: diff.c:5505 +#: diff.c:5562 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" +"cerca les diferรจncies que canvien el nombre d'ocurrรจncies de l'expressiรณ " +"regular especificada" -#: diff.c:5508 -#, fuzzy +#: diff.c:5565 msgid "show all changes in the changeset with -S or -G" -msgstr "mostra els fitxers coincidents en el paginador" +msgstr "mostra tots els canvis amb el conjunt de canvis amb -S o -G" -#: diff.c:5511 -#, fuzzy +#: diff.c:5568 msgid "treat <string> in -S as extended POSIX regular expression" -msgstr "usa les expressions regulars POSIX ampliades" +msgstr "tracta <cadena> a -S com a expressiรณ regular POSIX ampliada" -#: diff.c:5514 -#, fuzzy +#: diff.c:5571 msgid "control the order in which files appear in the output" -msgstr "mostra en la sortida els altres fitxers" +msgstr "controla l'ordre amb el qual els fitxers apareixen en la sortida" -#: diff.c:5515 -#, fuzzy +#: diff.c:5572 msgid "<object-id>" -msgstr "objecte" +msgstr "<id de l'objecte>" -#: diff.c:5516 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" +"cerca les diferรจncies que canvien el nombre d'ocurrรจncies de l'objecte " +"especificat" -#: diff.c:5518 +#: diff.c:5575 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5576 msgid "select files by diff type" -msgstr "seleccioneu els fitxer per tipus de diff" +msgstr "seleccioneu els fitxers per tipus de diff" -#: diff.c:5521 +#: diff.c:5578 msgid "<file>" msgstr "<fitxer>" -#: diff.c:5522 +#: diff.c:5579 msgid "Output to a specific file" msgstr "Sortida a un fitxer especรญfic" -#: diff.c:6177 +#: diff.c:6236 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:6180 +#: diff.c:6239 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:6183 +#: diff.c:6242 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3012,56 +3890,86 @@ msgstr "" "potser voleu establir la vostra variable %s a almenys %d i tornar a intentar " "l'ordre." -#: dir.c:537 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "s'ha produรฏt un error en llegir el fitxer d'ordres ยซ%sยป" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "S'estร realitzant una detecciรณ inexacta de canvis de nom" + +#: dir.c:578 #, 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:926 +#: dir.c:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "patrรณ no reconegut: ยซ%sยป" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "patrรณ negatiu no reconegut: ยซ%sยป" + +#: dir.c:809 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" +"el vostre fitxer ยซsparse-checkoutยป pot tenir problemes el patrรณ ยซ%sยป es " +"repeteix" + +#: dir.c:819 +msgid "disabling cone pattern matching" +msgstr "inhabilita la coincidรจncia de patrons ยซconeยป" + +#: dir.c:1198 #, 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:1843 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "no s'ha pogut obrir el directori ยซ%sยป" -#: dir.c:2085 +#: dir.c:2605 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:2209 +#: dir.c:2729 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:3013 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "el fitxer d'รญndex al dipรฒsit %s รฉs malmรจs" -#: dir.c:3058 dir.c:3063 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "no s'han pogut crear directoris per %s" -#: dir.c:3092 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no s'ha pogut migrar el directori de ยซ%sยป a ยซ%sยป" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" -msgstr "" +msgstr "pista: s'estร esperant que el vostre editor tanqui el fitxer...%c" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "S'estร filtrant el contingut" -#: entry.c:476 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "no s'ha pogut fer ยซstatยป sobre el fitxer ยซ%sยป" @@ -3069,9 +3977,9 @@ msgstr "no s'ha pogut fer ยซstatยป sobre el fitxer ยซ%sยป" #: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" -msgstr "" +msgstr "camรญ d'espai de noms git incorrecte ยซ%sยป" -#: environment.c:332 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "no s'ha pogut establir GIT_DIR a ยซ%sยป" @@ -3081,266 +3989,292 @@ 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-object.c:17 -msgid "Remote with no URL" -msgstr "Remot sense URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: llista superficial esperada" -#: fetch-pack.c:154 +#: fetch-pack.c:179 #, fuzzy msgid "git fetch-pack: expected a flush packet after shallow list" -msgstr "git fetch-pack: llista superficial esperada" +msgstr "" +"git fetch-pack s'esperava un paquet de buidatge desprรฉs d'una llista " +"superficial" -#: fetch-pack.c:165 +#: fetch-pack.c:190 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" +msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de buidatge" -#: fetch-pack.c:185 +#: fetch-pack.c:210 #, 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:196 +#: fetch-pack.c:221 msgid "unable to write to remote" msgstr "no s'ha pogut escriure al remot" -#: fetch-pack.c:258 +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requereix multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "lรญnia de shallow no vร lida: %s" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "lรญnia d'unshallow no vร lida: %s" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "objecte no trobat: %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "error en objecte: %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "no s'ha trobat cap shallow: %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: fetch-pack.c:417 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "s'ha rebut %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:448 #, c-format msgid "invalid commit %s" msgstr "comissiรณ no vร lida %s" -#: fetch-pack.c:465 +#: fetch-pack.c:479 msgid "giving up" msgstr "s'abandona" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:492 progress.c:339 msgid "done" msgstr "fet" -#: fetch-pack.c:489 +#: fetch-pack.c:504 #, c-format msgid "got %s (%d) %s" msgstr "s'ha rebut %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:540 #, c-format msgid "Marking %s as complete" msgstr "S'estร marcant %s com a complet" -#: fetch-pack.c:744 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "ja es tรฉ %s (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:824 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:791 +#: fetch-pack.c:832 msgid "protocol error: bad pack header" msgstr "error de protocol: capรงalera de paquet errรฒnia" -#: fetch-pack.c:859 +#: fetch-pack.c:916 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no es pot bifurcar de %s" -#: fetch-pack.c:875 +#: fetch-pack.c:933 #, c-format msgid "%s failed" msgstr "%s ha fallat" -#: fetch-pack.c:877 +#: fetch-pack.c:935 msgid "error in sideband demultiplexer" msgstr "error en desmultiplexor de banda lateral" -#: fetch-pack.c:908 +#: fetch-pack.c:978 #, c-format msgid "Server version is %.*s" msgstr "La versiรณ del servidor รฉs %.*s" -#: 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 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 #, c-format msgid "Server supports %s" msgstr "El servidor accepta %s" -#: fetch-pack.c:915 +#: fetch-pack.c:985 msgid "Server does not support shallow clients" msgstr "El servidor no permet clients superficials" -#: fetch-pack.c:975 +#: fetch-pack.c:1045 msgid "Server does not support --shallow-since" msgstr "El servidor no admet --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:1050 msgid "Server does not support --shallow-exclude" msgstr "El servidor no admet --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "El servidor no admet --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1056 +#, fuzzy +msgid "Server does not support this repository's object format" +msgstr "El servidor no permet solยทlicituds superficials" + +#: fetch-pack.c:1069 msgid "no common commits" msgstr "cap comissiรณ en comรบ" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1081 fetch-pack.c:1619 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: l'obtenciรณ ha fallat." -#: fetch-pack.c:1151 +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "" + +#: fetch-pack.c:1209 +#, fuzzy, c-format +msgid "the server does not support algorithm '%s'" +msgstr "el servidor no รฉs compatible amb ยซ%sยป" + +#: fetch-pack.c:1229 msgid "Server does not support shallow requests" -msgstr "El servidor no permet peticions superficials" +msgstr "El servidor no permet solยทlicituds superficials" -#: fetch-pack.c:1157 +#: fetch-pack.c:1236 msgid "Server supports filter" msgstr "El servidor accepta filtratge" -#: fetch-pack.c:1184 +#: fetch-pack.c:1275 msgid "unable to write request to remote" -msgstr "no s'ha pogut escriure la peticiรณ al remot" +msgstr "no s'ha pogut escriure la solยทlicitud al remot" -#: fetch-pack.c:1202 +#: fetch-pack.c:1293 #, c-format msgid "error reading section header '%s'" msgstr "error en llegir la capรงalera de la secciรณ ยซ%sยป" -#: fetch-pack.c:1208 +#: fetch-pack.c:1299 #, c-format msgid "expected '%s', received '%s'" msgstr "s'esperava ยซ%sยป, s'ha rebut ยซ%sยป" -#: fetch-pack.c:1247 +#: fetch-pack.c:1360 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "lรญnia de confirmaciรณ inesperada: ยซ%sยป" -#: fetch-pack.c:1252 -#, fuzzy, c-format +#: fetch-pack.c:1365 +#, c-format msgid "error processing acks: %d" -msgstr "error en llegir %s" +msgstr "s'ha produรฏt un error en processar els acks: %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1375 msgid "expected packfile to be sent after 'ready'" -msgstr "s'espera l'enviament del fitxer de paquet desprรฉs de ยซreadyยป" +msgstr "s'esperava l'enviament del fitxer de paquet desprรฉs de ยซreadyยป" -#: fetch-pack.c:1264 +#: fetch-pack.c:1377 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ยป" +msgstr "s'esperava que no s'enviรฉs cap altra secciรณ desprรฉs de no ยซreadyยป" -#: fetch-pack.c:1306 +#: fetch-pack.c:1419 #, c-format msgid "error processing shallow info: %d" msgstr "s'ha produรฏt un error en processar la informaciรณ superficial: %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1466 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "s'esperava wanted-ref, s'ha rebut ยซ%sยป" -#: fetch-pack.c:1358 +#: fetch-pack.c:1471 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inesperat: ยซ%sยป" -#: fetch-pack.c:1363 +#: fetch-pack.c:1476 #, 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:1689 +#: fetch-pack.c:1506 +#, fuzzy +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack: llista superficial esperada" + +#: fetch-pack.c:1887 msgid "no matching remote head" msgstr "no hi ha cap HEAD remot coincident" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1910 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "el remot no ha enviat tots els objectes necessaris" -#: fetch-pack.c:1739 +#: fetch-pack.c:1937 #, c-format msgid "no such remote ref %s" msgstr "no existeix la referรจncia remota %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1940 #, 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:321 -msgid "gpg failed to sign the data" -msgstr "gpg ha fallat en signar les dades" - -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "no s'ha pogut crear el fitxer temporal" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "s'ha produรฏt un error en escriure la signatura separada a ยซ%sยป" -#: graph.c:97 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg ha fallat en signar les dades" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora el color no vร lid ยซ%.*sยป en log.graphColors" -#: grep.c:2117 +#: grep.c:668 +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" +"el patrรณ indicat contรฉ byte NULL (via -f <fitxer>). Aixรฒ nomรฉs รฉs compatible " +"amb -P sota PCRE v2" + +#: grep.c:2128 #, c-format msgid "'%s': unable to read %s" msgstr "ยซ%sยป: no s'ha pogut llegir %s" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 #: 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:2145 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "ยซ%sยป: lectura curta" @@ -3367,15 +4301,15 @@ msgstr "colยทlaborar (vegeu tambรฉ: git help workflow)" #: help.c:31 msgid "Main Porcelain Commands" -msgstr "" +msgstr "Ordres principals de porcellana" #: help.c:32 msgid "Ancillary Commands / Manipulators" -msgstr "" +msgstr "Ordres auxiliars / manipuladors" #: help.c:33 msgid "Ancillary Commands / Interrogators" -msgstr "" +msgstr "Ordres auxiliars / interrogadors" #: help.c:34 msgid "Interacting with Others" @@ -3390,7 +4324,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Ordres de baix nivell / Interrogadors" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Ordres de baix nivell / Sincronitzaciรณ de dipรฒsits" #: help.c:38 @@ -3411,63 +4345,64 @@ msgid "These are common Git commands used in various situations:" msgstr "" "Aquestes sรณn ordres del Git habitualment usades en diverses situacions:" -#: help.c:363 git.c:98 +#: help.c:363 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "tipus de llistat de l'ordre no compatible ยซ%sยป" #: help.c:403 -msgid "The common Git guides are:" +#, fuzzy +msgid "The Git concept guides are:" msgstr "Les guies de Git comunes sรณn:" -#: help.c:512 +#: help.c:427 msgid "See 'git help <command>' to read about a specific subcommand" -msgstr "Vegeu ยซgit help <ordre>ยป per llegir sobre un subordre especรญfic" +msgstr "Vegeu ยซgit help <ordre>ยป per llegir sobre una subordre especรญfica" -#: help.c:517 +#: help.c:432 msgid "External commands" msgstr "Ordres externes" -#: help.c:532 +#: help.c:447 msgid "Command aliases" msgstr "รlies d'ordres" -#: help.c:596 +#: help.c:511 #, 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ยป sembla un ordre de git, perรฒ no hem pogut\n" +"ยซ%sยป sembla una ordre de git, perรฒ no hem pogut\n" "executar-la. Pot ser que git-%s estigui malmรจs?" -#: help.c:655 +#: help.c:570 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ai. El vostre sistema no informa de cap ordre de Git." -#: help.c:677 +#: help.c:592 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -"ADVERTรNCIA: Heu invocat un ordre de Git amb nom ยซ%sยป, la qual no existeix." +"ADVERTรNCIA: Heu invocat una ordre de Git amb nom ยซ%sยป, la qual no existeix." -#: help.c:682 +#: help.c:597 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "El procรฉs continuarร , pressuposant que volรญeu dir ยซ%sยป." -#: help.c:687 +#: help.c:602 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "El procรฉs continuarร en %0.1f segons, pressuposant que volรญeu dir ยซ%sยป." -#: help.c:695 +#: help.c:610 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: ยซ%sยป no รฉs un ordre de git. Vegeu ยซgit --helpยป." +msgstr "git: ยซ%sยป no รฉs una ordre de git. Vegeu ยซgit --helpยป." -#: help.c:699 +#: help.c:614 msgid "" "\n" "The most similar command is" @@ -3481,16 +4416,16 @@ msgstr[1] "" "\n" "Les ordres mรฉs similars sรณn" -#: help.c:714 +#: help.c:654 msgid "git version [<options>]" msgstr "git version [<opcions>]" -#: help.c:782 +#: help.c:709 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:713 msgid "" "\n" "Did you mean this?" @@ -3504,7 +4439,15 @@ msgstr[1] "" "\n" "Volรญeu dir un d'aquests?" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -3529,81 +4472,103 @@ msgstr "" "per a establir la identitat predeterminada del vostre compte.\n" "Ometeu --global per a establir la identitat nomรฉs en aquest dipรฒsit.\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "" "no s'ha proporcionat cap adreรงa electrรฒnica i la detecciรณ automร tica estร " "inhabilitada" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" "no s'ha pogut detectar automร ticament una adreรงa electrรฒnica vร lida (s'ha " "rebut ยซ%sยป)" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "" "no s'ha proporcionat cap nom i la detecciรณ automร tica estร inhabilitada" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "no s'ha pogut detectar automร ticament el nom (s'ha rebut ยซ%sยป)" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "nom d'identitat buit (per <%s>) no รฉs permรจs" -#: ident.c:421 +#: ident.c:439 #, c-format 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:611 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "format de data no vร lid: %s" -#: 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-filter-options.c:81 +msgid "expected 'tree:<depth>'" +msgstr "s'esperava ยซtree:<profunditat>ยป" -#: 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-filter-options.c:96 +#, fuzzy +msgid "sparse:path filters support has been dropped" +msgstr "s'ha eliminat la implementaciรณ de filtres sparsepath" -#: list-objects.c:378 +#: list-objects-filter-options.c:109 #, 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" +msgid "invalid filter-spec '%s'" +msgstr "filtre d'especificaciรณ no vร lid: ยซ%sยป" + +#: list-objects-filter-options.c:125 +#, fuzzy, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "ha d'escapar el carร cter en el subfiltratge '%c'" + +#: list-objects-filter-options.c:167 +#, fuzzy +msgid "expected something after combine:" +msgstr "s'esperava alguna cosa desprรฉs de combinar" -#: list-objects-filter-options.c:36 +#: list-objects-filter-options.c:249 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:361 +#, fuzzy +msgid "unable to upgrade repository format to support partial clone" +msgstr "no s'ha pogut analitzar la cadena de format" -#: list-objects-filter-options.c:84 -msgid "sparse:path filters support has been dropped" -msgstr "" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "no s'ha pogut accedir a un blob dispers en ยซ%sยป" -#: list-objects-filter-options.c:94 +#: list-objects-filter.c:495 #, c-format -msgid "invalid filter-spec '%s'" -msgstr "filtre d'especificaciรณ no vร lid: ยซ%sยป" +msgid "unable to parse sparse filter data in %s" +msgstr "no s'han pogut analitzar les dades disperses filtrades %s" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "" +#: list-objects.c:127 +#, 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 +#, 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 +#, 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" -#: lockfile.c:151 +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -3614,7 +4579,7 @@ msgid "" "may have crashed in this repository earlier:\n" "remove the file manually to continue." msgstr "" -"No s'ha pogut crear '%s.lock': %s.\n" +"No s'ha pogut crear ยซ%s.lockยป: %s.\n" "\n" "Sembla que un altre procรฉs de git s'estร executant en aquest\n" "dipรฒsit, per exemple, un editor obert per ยซgit commitยป. \n" @@ -3623,127 +4588,120 @@ msgstr "" "git ha tingut un error:\n" "elimineu el fitxer manualment per a continuar." -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "No s'ha pogut crear ยซ%s.lockยป: %s" -#: merge.c:41 -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: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" +#: ls-refs.c:109 +#, fuzzy +msgid "expected flush after ls-refs arguments" +msgstr "s'esperava una neteja desprรฉs del llistat de referรจncies" -#: merge-recursive.c:322 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(comissiรณ errรฒnia)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, 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:354 +#: merge-recursive.c:388 #, 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รณ." - -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "error en construir arbres" +msgstr "" +"addinfo_cache ha fallat al refrescar el camรญ ยซ%sยป; interrompent la fusiรณ." -#: merge-recursive.c:863 +#: merge-recursive.c:874 #, 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:874 +#: merge-recursive.c:885 #, 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:888 merge-recursive.c:907 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": potser un conflicte D/F?" -#: merge-recursive.c:897 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "s'estร refusant perdre el fitxer no seguit a ยซ%sยป" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s ยซ%sยป" -#: merge-recursive.c:941 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "blob esperat per a %s ยซ%sยป" -#: merge-recursive.c:965 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "s'ha produรฏt un error en obrir ยซ%sยป: %s" -#: merge-recursive.c:976 +#: merge-recursive.c:990 #, 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:981 +#: merge-recursive.c:995 #, 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:1177 +#: merge-recursive.c:1191 #, 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:1184 +#: merge-recursive.c:1198 #, 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:1191 +#: merge-recursive.c:1205 #, 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:1199 merge-recursive.c:1211 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, 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:1202 merge-recursive.c:1214 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avanรงament rร pid al submรฒdul %s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1251 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" +"Ha fallat en fusionar el submรฒdul %s (no s'ha trobat les comissions segรผents)" -#: merge-recursive.c:1241 +#: merge-recursive.c:1255 #, 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:1242 +#: merge-recursive.c:1256 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:1245 -#, c-format +#: merge-recursive.c:1259 +#, fuzzy, c-format msgid "" "If this is correct simply add it to the index for example\n" "by using:\n" @@ -3752,34 +4710,39 @@ msgid "" "\n" "which will accept this suggestion.\n" msgstr "" +"Si aixรฒ รฉs correcte simplement afegiu-ho a l'รญndex per exemple utilitzant " +"git update-index --cacheinfo 160000 per cents \"%s\" que acceptaran aquest " +"suggeriment.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1268 #, 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:1327 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "S'ha produรฏt un error en executar la fusiรณ interna" -#: merge-recursive.c:1332 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "No s'ha pogut afegir %s a la base de dades" -#: merge-recursive.c:1364 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "S'estร autofusionant %s" -#: merge-recursive.c:1387 +#: merge-recursive.c:1402 #, 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:1459 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3788,7 +4751,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:1464 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3797,7 +4760,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:1471 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3806,7 +4769,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:1476 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3815,398 +4778,478 @@ 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:1511 +#: merge-recursive.c:1526 msgid "rename" msgstr "canvi de nom" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "renamed" msgstr "canviat de nom" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "S'estร refusant a perdre el fitxer brut a %s" -#: merge-recursive.c:1601 +#: merge-recursive.c:1587 #, 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:1659 +#: merge-recursive.c:1645 #, 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:1690 +#: merge-recursive.c:1676 #, 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:1695 +#: merge-recursive.c:1681 #, 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 " +"S'estร refusant perdre el fitxer no seguit a %s; en comptes, s'estร afegint " "com a %s" -#: merge-recursive.c:1714 +#: merge-recursive.c:1708 #, 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:1719 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (deixat sense resoluciรณ)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1805 #, 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:2035 -#, c-format +#: merge-recursive.c:2068 +#, fuzzy, 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 "" +"CONFLICT (divisiรณ de canvi de nom de directori) Onclear on colยทlocar-los " +"perquรจ els nivells de directori s'han reanomenat a mรบltiples altres " +"directoris sense destinaciรณ obtenint la majoria dels fitxers." -#: merge-recursive.c:2067 -#, c-format +#: merge-recursive.c:2100 +#, fuzzy, 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 "" +"CONFLICT (implicit dir rename) El fitxer/directori existent at%s en forma de " +"directori implรญcit reanomena(s) posant-hi els camins segรผents." -#: merge-recursive.c:2077 -#, c-format +#: merge-recursive.c:2110 +#, fuzzy, 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 "" +"CONFLICT (nom abreujat reanomena) No es pot assignar mรฉs d'un camรญ als " +"percentatges; noms de directori implรญcits s'ha intentat posar aquests camins " +"segons" -#: merge-recursive.c:2169 -#, fuzzy, c-format +#: merge-recursive.c:2202 +#, 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 %s->%s en %s" +"CONFLICTE (canvi de nom/canvi de nom): canvi de nom %s->%s en %s. Canvi de " +"nom de directori %s->%s en %s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2447 #, 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:2937 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "no es pot llegir l'objecte %s" -#: merge-recursive.c:2940 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "l'objecte %s no รฉs un blob" -#: merge-recursive.c:3004 +#: merge-recursive.c:3040 msgid "modify" msgstr "modificaciรณ" -#: merge-recursive.c:3004 +#: merge-recursive.c:3040 msgid "modified" msgstr "modificat" -#: merge-recursive.c:3016 +#: merge-recursive.c:3052 msgid "content" msgstr "contingut" -#: merge-recursive.c:3020 +#: merge-recursive.c:3056 msgid "add/add" msgstr "afegiment/afegiment" -#: merge-recursive.c:3043 +#: merge-recursive.c:3079 #, 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:3065 git-submodule.sh:937 +#: merge-recursive.c:3101 msgid "submodule" msgstr "submรฒdul" -#: merge-recursive.c:3066 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTE (%s): Conflicte de fusiรณ en %s" -#: merge-recursive.c:3096 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "S'estร afegint com a %s en lloc d'aixรฒ" -#: merge-recursive.c:3178 -#, c-format +#: merge-recursive.c:3215 +#, fuzzy, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" +"La ruta va actualitzar els percentatges afegits dins d'un directori que va " +"ser rebatejat en percentatges; es va traslladar a percentatges." -#: merge-recursive.c:3181 -#, c-format +#: merge-recursive.c:3218 +#, fuzzy, 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 "" +"CONFLICT (ubicaciรณ de l'arxiu) els percentatges afegits dins d'un directori " +"que va ser rebatejat en percentatges suggerint que potser hauria de ser " +"traslladat als percentatges." -#: merge-recursive.c:3185 -#, c-format +#: merge-recursive.c:3222 +#, fuzzy, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" +"El camรญ va actualitzar els percentatges de canvi de nom a percentatges " +"d'incens dins d'un directori que es va canviar de nom en percentatges, " +"passant-lo a percentatges." -#: merge-recursive.c:3188 -#, c-format +#: merge-recursive.c:3225 +#, fuzzy, 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 "" +"CONFLICT (ubicaciรณ de l'arxiu) per cents redenominats a un 1% dins d'un " +"directori que va ser rebatejat en percentatges, suggerint que potser hauria " +"de canviar-se a percentatges." -#: merge-recursive.c:3302 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "S'estร eliminant %s" -#: merge-recursive.c:3325 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "fitxer/directori" -#: merge-recursive.c:3330 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "directori/fitxer" -#: merge-recursive.c:3337 +#: merge-recursive.c:3374 #, 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:3346 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "S'estร afegint %s" -#: merge-recursive.c:3355 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusiรณ en %s" -#: 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 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "Ja estร al dia!" -#: merge-recursive.c:3413 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "la fusiรณ dels arbres %s i %s ha fallat" -#: merge-recursive.c:3512 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "S'estร fusionant:" -#: merge-recursive.c:3525 +#: merge-recursive.c:3563 #, 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:3564 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "la fusiรณ no ha retornat cap comissiรณ" -#: merge-recursive.c:3630 +#: merge-recursive.c:3672 +#, 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:3769 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte ยซ%sยป" -#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 msgid "Unable to write index." msgstr "No s'ha pogut escriure l'รญndex." -#: midx.c:69 -#, c-format +#: merge.c:41 +msgid "failed to read the cache" +msgstr "s'ha produรฏt un error en llegir la memรฒria cau" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "no s'ha pogut escriure un fitxer d'รญndex nou" + +#: midx.c:79 +#, fuzzy, c-format msgid "multi-pack-index file %s is too small" -msgstr "" +msgstr "l'รญndex mรบltiple รฉs massa petit" -#: midx.c:85 -#, c-format +#: midx.c:95 +#, fuzzy, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" +"signatura d'รญndex mรบltiple 0x%08x no coincideix amb la signatura 0x%08x" -#: midx.c:90 -#, c-format +#: midx.c:100 +#, fuzzy, c-format msgid "multi-pack-index version %d not recognized" -msgstr "" +msgstr "multi-index no reconegut" -#: midx.c:95 +#: midx.c:105 #, fuzzy, c-format -msgid "hash version %u does not match" -msgstr "el camรญ ยซ%sยป no tรฉ la seva versiรณ" +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "" +"la versiรณ del hash del graf de comissions %X no coincideix amb la versiรณ %X" -#: midx.c:109 +#: midx.c:122 +#, fuzzy msgid "invalid chunk offset (too large)" -msgstr "" +msgstr "desplaรงament no vร lid (massa gran)" -#: midx.c:133 +#: midx.c:146 +#, fuzzy msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" +"s'ha acabat l'identificador de fragment multi-index apareix abans del que " +"s'esperava" -#: midx.c:146 +#: midx.c:159 +#, fuzzy msgid "multi-pack-index missing required pack-name chunk" -msgstr "" +msgstr "multi-index falta un fragment de nom de paquet" -#: midx.c:148 +#: midx.c:161 +#, fuzzy msgid "multi-pack-index missing required OID fanout chunk" -msgstr "" +msgstr "multi-index falta un tros de ventilador OID requerit" -#: midx.c:150 +#: midx.c:163 +#, fuzzy msgid "multi-pack-index missing required OID lookup chunk" -msgstr "" +msgstr "multi-index falta el fragment de cerca OID necessari" -#: midx.c:152 +#: midx.c:165 +#, fuzzy msgid "multi-pack-index missing required object offsets chunk" -msgstr "" +msgstr "multi-index falta el tros d'objecte necessari" -#: midx.c:166 -#, c-format +#: midx.c:179 +#, fuzzy, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" -msgstr "" +msgstr "noms de paquet d'รญndex mรบltiple fora de l'ordre ยซ%sยป abans de ยซ%sยป" -#: midx.c:211 -#, c-format +#: midx.c:222 +#, fuzzy, c-format msgid "bad pack-int-id: %u (%u total packs)" -msgstr "" +msgstr "pack-int-id%u incorrecte (%u total packs)" -#: midx.c:261 +#: midx.c:272 +#, fuzzy msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" +"multi-index emmagatzema un desplaรงament de 64 bits perรฒ deft รฉs massa petit" -#: midx.c:289 +#: midx.c:300 +#, fuzzy msgid "error preparing packfile from multi-pack-index" -msgstr "" +msgstr "error en preparar el fitxer de paquet des d'un รญndex mรบltiple" -#: midx.c:470 +#: midx.c:485 #, fuzzy, c-format msgid "failed to add packfile '%s'" -msgstr "s'ha produรฏt un error en llegir el fitxer d'ordres ยซ%sยป" +msgstr "no s'ha pogut afegir el fitxer de paquet ยซ%sยป" -#: midx.c:476 +#: midx.c:491 #, fuzzy, c-format msgid "failed to open pack-index '%s'" -msgstr "s'ha produรฏt un error en obrir ยซ%sยป" +msgstr "no s'ha pogut obrir l'รญndex del paquet ยซ%sยป" -#: midx.c:536 +#: midx.c:551 #, fuzzy, c-format msgid "failed to locate object %d in packfile" -msgstr "s'ha produรฏt un error en llegir l'objecte ยซ%sยป." +msgstr "no s'ha pogut localitzar l'objecte en el fitxer de paquet" -#: midx.c:865 -#, c-format +#: midx.c:853 +#, fuzzy +msgid "Adding packfiles to multi-pack-index" +msgstr "Afegint fitxers de paquets a multi-index" + +#: midx.c:886 +#, fuzzy, c-format msgid "did not see pack-file %s to drop" -msgstr "" +msgstr "no s'han vist caure els paquets del fitxer" + +#: midx.c:938 +msgid "no pack files to index." +msgstr "no hi ha fitxers empaquetats a indexar." + +#: midx.c:990 +#, fuzzy +msgid "Writing chunks to multi-pack-index" +msgstr "Escrivint trossos a multi-index" -#: midx.c:1036 +#: midx.c:1068 #, fuzzy, c-format msgid "failed to clear multi-pack-index at %s" -msgstr "s'ha produรฏt un error en netejar l'รญndex" +msgstr "no s'han pogut netejar els percentatges multi-paquet" + +#: midx.c:1124 +#, fuzzy +msgid "multi-pack-index file exists, but failed to parse" +msgstr "l'รญndex mรบltiple รฉs massa petit" -#: midx.c:1091 +#: midx.c:1132 msgid "Looking for referenced packfiles" -msgstr "S'estan cercant fitxers de paquets referenciats" +msgstr "S'estan cercant fitxers empaquetats referenciats" -#: midx.c:1106 -#, c-format +#: midx.c:1147 +#, fuzzy, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" +"od fanout fora de l'ordre fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1110 -msgid "Verifying OID order in MIDX" +#: midx.c:1152 +msgid "the midx contains no oid" msgstr "" -#: midx.c:1119 -#, c-format +#: midx.c:1161 +#, fuzzy +msgid "Verifying OID order in multi-pack-index" +msgstr "Verificant l'ordre OID en multi-index" + +#: midx.c:1170 +#, fuzzy, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" -msgstr "" +msgstr "oid lookup fora d'ordre oid[%d] = per cents >= %s = oid[%d]" -#: midx.c:1138 +#: midx.c:1190 msgid "Sorting objects by packfile" msgstr "S'estan ordenant els objectes per fitxer de paquet" -#: midx.c:1144 +#: midx.c:1197 msgid "Verifying object offsets" msgstr "S'estan verificant els desplaรงaments dels objectes" -#: midx.c:1160 +#: midx.c:1213 #, 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" +msgstr "" +"no s'ha pogut carregar l'entrada del paquet per a oid[%d] = percentatges" -#: midx.c:1166 +#: midx.c:1219 #, 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ยป" +msgstr "no s'ha pogut carregar l'รญndex del paquet per als fitxers del paquet" -#: midx.c:1175 -#, c-format +#: midx.c:1228 +#, fuzzy, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" +"desplaรงament incorrecte de l'objecte per a oid[%d] =%s%<PRIx64> !=%<PRIx64>" -#: midx.c:1350 +#: midx.c:1253 +msgid "Counting referenced objects" +msgstr "S'estan comptant els objectes referenciats" + +#: midx.c:1263 +msgid "Finding and deleting unreferenced packfiles" +msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats" + +#: midx.c:1454 msgid "could not start pack-objects" -msgstr "no s'ha pogut executar el pack-objects" +msgstr "no s'ha pogut iniciar el pack-objects" -#: midx.c:1369 +#: midx.c:1474 msgid "could not finish pack-objects" msgstr "no s'ha pogut finalitzar el pack-objects" -#: name-hash.c:532 +#: name-hash.c:537 #, fuzzy, c-format msgid "unable to create lazy_dir thread: %s" -msgstr "no s'ha pogut crear fil: %s" +msgstr "no s'ha pogut crear el fil per cent mandrรณs" -#: name-hash.c:554 +#: name-hash.c:559 #, fuzzy, c-format msgid "unable to create lazy_name thread: %s" -msgstr "no s'ha pogut crear fil: %s" +msgstr "no s'ha pogut crear un fil percent" -#: name-hash.c:560 +#: name-hash.c:565 #, fuzzy, c-format msgid "unable to join lazy_name thread: %s" -msgstr "no s'ha pogut crear fil: %s" +msgstr "no s'ha pogut unir als fil per cents de nom mandrรณs" #: notes-merge.c:277 #, c-format @@ -4247,47 +5290,72 @@ 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:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "tipus d'objecte ยซ%sยป no vร lid" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "l'objecte %s รฉs %s, no pas %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "l'objecte %s tรฉ un identificador de tipus %d desconegut" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" -msgstr "" +msgstr "el resum no coincideix %s" -#: packfile.c:648 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "no s'ha pogut obtenir la mida de %s" + +#: packfile.c:630 msgid "offset before end of packfile (broken .idx?)" msgstr "desplaรงament abans de la fi del fitxer de paquet (.idx trencat?)" -#: packfile.c:1899 +#: packfile.c:1922 #, 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:1903 +#: packfile.c:1926 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "desplaรงament mรฉs enllร de la fi d'รญndex de paquet per a %s (รญndex truncat?)" +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "l'opciรณ ยซ%sยป espera un valor numรจric" + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "data de venciment ยซ%sยป mal formada" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "l'opciรณ ยซ%sยป espera ยซalwaysยป, ยซautoยป o ยซneverยป" + +#: parse-options-cb.c:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "nom d'objecte ยซ%sยป mal format" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4303,7 +5371,7 @@ msgstr "%s รฉs incompatible amb %s" msgid "%s : incompatible with something else" msgstr "%s: รฉs incompatible amb alguna altra cosa" -#: parse-options.c:92 parse-options.c:96 parse-options.c:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "%s no accepta cap valor" @@ -4313,41 +5381,46 @@ msgstr "%s no accepta cap valor" msgid "%s isn't available" msgstr "%s no รฉs disponible" -#: parse-options.c:219 +#: parse-options.c:217 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" -msgstr "" +msgstr "%s espera un valor enter no negatiu amb un sufix opcional k/m/g" -#: parse-options.c:389 +#: parse-options.c:386 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" -msgstr "" +msgstr "opciรณ ambigua: %s (pot ser --%s%s o --%s%s)" -#: parse-options.c:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, c-format -msgid "did you mean `--%s` (with two dashes ?)" -msgstr "" +msgid "did you mean `--%s` (with two dashes)?" +msgstr "voleu dir ยซ--%sยป (amb dos traรงos)?" + +#: parse-options.c:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "ร lies de --%s" -#: parse-options.c:859 +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "opciรณ desconeguda ยซ%sยป" -#: parse-options.c:861 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "ยซswitchยป ยซ%cยป desconegut" -#: parse-options.c:863 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opciรณ no ascii desconeguda en la cadena: ยซ%sยป" -#: parse-options.c:887 +#: parse-options.c:890 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "รบs: %s" @@ -4355,76 +5428,51 @@ msgstr "รบs: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:915 #, c-format msgid " or: %s" -msgstr " o: %s" +msgstr " o: %s" -#: parse-options.c:915 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:957 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:968 -#, c-format -msgid "alias of --%s" -msgstr "ร lies de --%s" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "l'opciรณ ยซ%sยป espera un valor numรจric" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "data de venciment ยซ%sยป mal formada" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "l'opciรณ ยซ%sยป espera ยซalwaysยป, ยซautoยป o ยซneverยป" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "nom d'objecte ยซ%sยป mal format" - -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "No s'ha pogut fer %s escrivible pel grup" -#: pathspec.c:128 +#: pathspec.c:130 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:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Nomรฉs es permet una especificaciรณ ยซattr:ยป." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "una especificaciรณ d'atribut no pot estar buida" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "nom d'atribut no vร lid %s" -#: pathspec.c:257 +#: pathspec.c:259 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:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4432,51 +5480,56 @@ 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:304 +#: pathspec.c:306 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:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "Mร gia d'especificaciรณ de camรญ no vร lida '%.*s' en ยซ%sยป" +msgstr "Mร gia d'especificaciรณ de camรญ no vร lida ยซ%.*sยป en ยซ%sยป" -#: pathspec.c:330 +#: pathspec.c:332 #, 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:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Mร gia d'especificaciรณ de camรญ no implementada ยซ%cยป en ยซ%sยป" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: ยซliteralยป i ยซglobยป sรณn incompatibles" -#: pathspec.c:440 +#: pathspec.c:445 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: ยซ%sยป รฉs fora del dipรฒsit" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: ยซ%sยป estร fora del dipรฒsit en ยซ%sยป" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "ยซ%sยป (mnemรฒnic: ยซ%cยป)" -#: pathspec.c:524 +#: pathspec.c:531 #, 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:591 +#: pathspec.c:598 #, 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:643 +#, c-format +msgid "line is badly quoted: %s" +msgstr "la lรญnia estร mal citada: %s" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "no s'ha pogut escriure el paquet de buidatge" @@ -4486,46 +5539,51 @@ msgid "unable to write delim packet" msgstr "no s'ha pogut escriure el paquet delim" #: pkt-line.c:106 +#, fuzzy +msgid "unable to write stateless separator packet" +msgstr "no s'ha pogut escriure el paquet de buidatge" + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "s'ha produรฏt un error en escriure el paquet de buidatge" -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "error de protocol: longitud de lรญnia impossible" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "ha fallat l'escriptura del paquet amb format" -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "" "no s'ha pogut escriure el paquet - les dades excedeixen la mida mร xima del " "paquet" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "no s'ha pogut escriure el paquet" -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "error de lectura" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "el remot ha penjat inesperadament" -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "error de protocol: carร cter de longitud de lรญnia erroni: %.4s" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "error de protocol: longitud de lรญnia errรฒnia %d" -#: pkt-line.c:362 +#: pkt-line.c:373 sideband.c:150 #, c-format msgid "remote error: %s" msgstr "error remot: %s" @@ -4537,83 +5595,112 @@ msgstr "S'estร actualitzant l'รญndex" #: preload-index.c:138 #, fuzzy, c-format msgid "unable to create threaded lstat: %s" -msgstr "no s'ha pogut crear fil: %s" +msgstr "no s'han pogut crear lstat per fil" -#: pretty.c:966 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "no s'ha pogut analitzar el format --pretty" -#: range-diff.c:70 +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" + +#: promisor-remote.c:53 +#, fuzzy, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "el nom remot ยซpromisorยป no pot comenรงar amb ยซ/ยป per cents" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "S'estan eliminant objectes duplicats" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "no s'ha pogut iniciar ยซlogยป" -#: range-diff.c:72 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "no s'ha pogut llegir la sortida de ยซlogยป" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:98 sequencer.c:5283 #, c-format msgid "could not parse commit '%s'" msgstr "no s'ha pogut analitzar la comissiรณ ยซ%sยป" -#: range-diff.c:117 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" + +#: range-diff.c:137 #, 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:274 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "s'ha produรฏt un error en generar el diff" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "no s'ha pogut llegir el fitxer de registre per ยซ%sยป" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "no s'afegirร l'ร lies ยซ%sยป: (ยซ%sยป ja existeix en l'รญndex)" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "no es pot crear un blob buit a la base de dades d'objectes" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "%s: nomรฉs pot afegir fitxers normals, enllaรงos simbolics o directoris git" +msgstr "" +"%s: nomรฉs pot afegir fitxers normals, enllaรงos simbรฒlics o directoris git" -#: read-cache.c:723 +#: read-cache.c:725 #, fuzzy, c-format msgid "'%s' does not have a commit checked out" -msgstr "ยซ%sยป no assenyala una comissiรณ" +msgstr "\"%s\" no tรฉ una comissiรณ comprovada" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "no es pot llegir indexar el fitxer ยซ%sยป" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "no s'ha pogut afegir ยซ%sยป a l'รญndex" -#: read-cache.c:805 -#, fuzzy, c-format +#: read-cache.c:807 +#, c-format msgid "unable to stat '%s'" -msgstr "no s'ha pogut actualitzar %s" +msgstr "no s'ha pogut fer ยซstatยป a ยซ%sยป" -#: read-cache.c:1314 -#, fuzzy, c-format +#: read-cache.c:1318 +#, c-format msgid "'%s' appears as both a file and as a directory" -msgstr "%s existeix i no รฉs directori" +msgstr "ยซ%sยป apareix com a fitxer i com a directori" -#: read-cache.c:1499 +#: read-cache.c:1524 msgid "Refresh index" msgstr "Actualitza l'รญndex" -#: read-cache.c:1613 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4622,7 +5709,7 @@ msgstr "" "index.version estร establerta, perรฒ el valor no รฉs vร lid.\n" "S'estร usant la versiรณ %i" -#: read-cache.c:1623 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4631,151 +5718,163 @@ msgstr "" "GIT_INDEX_VERSION estร establerta, perรฒ el valor no รฉs vร lid.\n" "S'estร usant la versiรณ %i" -#: read-cache.c:1679 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "signatura malmesa 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "versiรณ d'รญndex incorrecta %d" -#: read-cache.c:1691 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "signatura sha1 malmesa al fitxer d'รญndex" -#: read-cache.c:1721 +#: read-cache.c:1747 #, 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:1723 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "s'estร ignorant l'extensiรณ %.4s" -#: read-cache.c:1760 +#: read-cache.c:1786 #, 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:1776 +#: read-cache.c:1802 #, 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:1833 +#: read-cache.c:1859 +#, fuzzy msgid "unordered stage entries in index" -msgstr "" +msgstr "entrades d'escenari no ordenades en l'รญndex" -#: read-cache.c:1836 +#: read-cache.c:1862 #, fuzzy, c-format msgid "multiple stage entries for merged file '%s'" -msgstr "nom d'identitat buit (per <%s>) no รฉs permรจs" +msgstr "mรบltiples entrades d'etapa per al fitxer fusionat ยซ%sยป" -#: read-cache.c:1839 +#: read-cache.c:1865 #, fuzzy, c-format msgid "unordered stage entries for '%s'" -msgstr "no s'han pogut crear directoris per %s" - -#: 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 +msgstr "entrades d'etapa no ordenades per ยซ%sยป" + +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "fitxer d'รญndex malmรจs" -#: read-cache.c:2087 +#: read-cache.c:2115 #, fuzzy, c-format msgid "unable to create load_cache_entries thread: %s" -msgstr "no s'ha pogut crear fil: %s" +msgstr "no s'ha pogut crear loadcacheentries fil%s" -#: read-cache.c:2100 +#: read-cache.c:2128 #, fuzzy, c-format msgid "unable to join load_cache_entries thread: %s" -msgstr "no s'ha pogut crear fil: %s" +msgstr "no s'ha pogut unir a ยซloadcacheentriesยป fil%s" -#: read-cache.c:2133 +#: read-cache.c:2161 #, fuzzy, c-format msgid "%s: index file open failed" -msgstr "s'ha produรฏt un error en actualitzar els fitxers" +msgstr "ha fallat l'obertura del fitxer d'รญndex de percentatges" -#: read-cache.c:2137 +#: read-cache.c:2165 #, fuzzy, c-format msgid "%s: cannot stat the open index" -msgstr "no es pot llegir l'รญndex" +msgstr "percentatges no poden fer ยซstatยป a l'รญndex obert" -#: read-cache.c:2141 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: fitxer d'รญndex mรฉs petit que s'esperava" -#: read-cache.c:2145 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "%s: no es pot mapar el fitxer d'รญndex" -#: read-cache.c:2187 +#: read-cache.c:2215 #, fuzzy, c-format msgid "unable to create load_index_extensions thread: %s" -msgstr "no s'ha pogut crear fil: %s" +msgstr "no s'ha pogut crear loadindexextensions fil%s" -#: read-cache.c:2214 +#: read-cache.c:2242 #, fuzzy, c-format msgid "unable to join load_index_extensions thread: %s" -msgstr "no s'ha pogut crear fil: %s" +msgstr "no s'ha pogut unir a loadindexextensions fil%s" -#: read-cache.c:2246 -#, fuzzy, c-format +#: read-cache.c:2274 +#, c-format msgid "could not freshen shared index '%s'" -msgstr "no s'ha pogut llegir el fitxer ยซ%sยป" +msgstr "no s'ha pogut refrescar l'รญndex compartit ยซ%sยป" -#: read-cache.c:2293 +#: read-cache.c:2321 #, 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:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 #, c-format msgid "could not close '%s'" msgstr "no s'ha pogut tancar ยซ%sยป" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 #, c-format msgid "could not stat '%s'" msgstr "no s'ha pogut fer stat a ยซ%sยป" -#: read-cache.c:3105 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "no s'ha pogut obrir el directori git: %s" -#: read-cache.c:3117 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "no s'ha pogut desenllaรงar: %s" -#: read-cache.c:3142 -#, fuzzy, c-format +#: read-cache.c:3170 +#, c-format msgid "cannot fix permission bits on '%s'" -msgstr "no s'ha pogut resoldre la revisiรณ: %s" +msgstr "no s'han pogut corregir els bits de permisos en ยซ%sยป" -#: read-cache.c:3291 +#: read-cache.c:3319 #, fuzzy, c-format msgid "%s: cannot drop to stage #0" -msgstr "no es pot canviar de directori a %s" +msgstr "els percentatges no poden descendir a l'escenari #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 "" +"Podeu arreglar-ho amb ยซgit rebase --edit-todoยป i desprรฉs ยซgit rebase --" +"continueยป.\n" +"O bรฉ, podeu avortar el ยซrebaseยป amb ยซgit rebase --abortยป.\n" -#: rebase-interactive.c:26 +#: rebase-interactive.c:33 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -"No s'ha reconegut el parร metre %s per rebase.missingCommitsCheck. S'estร " +"no s'ha reconegut el parร metre %s per rebase.missingCommitsCheck. S'estร " "ignorant." -#: rebase-interactive.c:35 +#: rebase-interactive.c:42 #, fuzzy msgid "" "\n" @@ -4799,26 +5898,37 @@ msgid "" msgstr "" "\n" "Ordres:\n" -" 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" -" d, drop = elimina la comissiรณ\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-la a la comissiรณ " +"prรจvia\n" +" f, fixup <comissiรณ> = com a ยซsquashยป, perรฒ descarta el missatge de registre " +"d'aquesta comissiรณ\n" +"x, exec <comissiรณ> = executa l'ordre (la resta de la lรญnia) usant " +"l'intรจrpret d'ordres\n" +"b, break = atura't aquรญ (continua fent ยซrebaseยป desprรฉs amb ยซgit rebase --" +"continueยป)\n" +"d, drop <comissiรณ> = elimina la comissiรณ\n" +"l, label <etiqueta> = etiqueta la HEAD actual amb un nom\n" +"t, reset <etiqueta> = reinicia HEAD a una etiqueta \n" +"m, merge [-C <comissiรณ> | -c <comissiรณ>] <etiqueta> [# <oneline>]\n" +". crea una comissiรณ de fusiรณ usant el missatge de la comissiรณ\n" +". de fusiรณ original (o lรญnia รบnica, si no hi ha cap comissiรณ de fusiรณ " +"original\n" +". especificada). Useu -c <comissiรณ> per a reescriure el missatge de " +"publicaciรณ.\n" "\n" "Es pot canviar l'ordre d'aquestes lรญnies; s'executen de dalt a baix.\n" -#: rebase-interactive.c:56 -#, fuzzy, c-format +#: rebase-interactive.c:63 +#, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" -msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)" -msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)" +msgstr[0] "" +msgstr[1] "" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4827,7 +5937,7 @@ msgstr "" "No elimineu cap lรญnia. Useu ยซdropยป explรญcitament per a eliminar una " "comissiรณ.\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4835,7 +5945,7 @@ msgstr "" "\n" "Si elimineu una lรญnia aquรญ, ES PERDRร AQUELLA COMISSIร.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4849,7 +5959,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4859,22 +5969,19 @@ msgstr "" "No obstant, si elimineu tot, s'avortarร el ยซrebaseยป.\n" "\n" -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 -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:3447 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 #, c-format msgid "could not write '%s'" msgstr "no s'ha pogut escriure ยซ%sยป" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "no s'ha pogut copiar ยซ%sยป a ยซ%sยป." +msgid "could not write '%s'." +msgstr "no s'ha pogut escriure a ยซ%sยป." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -4884,7 +5991,7 @@ msgstr "" "accidentalment.\n" "Les comissions descartades (mรฉs nova a mรฉs vella):\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -4894,131 +6001,21 @@ msgid "" "The possible behaviours are: ignore, warn, error.\n" "\n" msgstr "" -"Per a evitar aquest missatge, useu \"drop\" per a eliminar explรญcitament una " +"Per a evitar aquest missatge, useu ยซdropยป per a eliminar explรญcitament una " "comissiรณ.\n" "\n" -"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell " +"Useu ยซgit config rebase.missingCommitsCheckยป per a canviar el nivell " "d'advertรจncies.\n" "Els comportaments possibles sรณn: ignore, warn, error.\n" -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -msgstr "%s no apunta a un objecte vร lid" - -#: refs.c:667 -#, fuzzy, c-format -msgid "ignoring dangling symref %s" -msgstr "s'estร ignorant la referรจncia trencada %s" - -#: refs.c:669 ref-filter.c:2092 -#, c-format -msgid "ignoring broken ref %s" -msgstr "s'estร ignorant la referรจncia trencada %s" - -#: refs.c:804 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "no s'ha pogut obrir ยซ%sยป per a escriptura: %s" - -#: refs.c:814 refs.c:865 -#, c-format -msgid "could not read ref '%s'" -msgstr "no s'ha pogut llegir la referรจncia ยซ%sยป" - -#: refs.c:820 -#, c-format -msgid "ref '%s' already exists" -msgstr "la referรจncia ยซ%sยป ja existeix" - -#: refs.c:825 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "ID d'objecte no esperat en escriure ยซ%sยป" - -#: 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 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" - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "ID d'objecte no esperat en suprimir ยซ%sยป" - -#: refs.c:998 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "" - -#: refs.c:1004 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "" - -#: refs.c:1063 -#, c-format -msgid "log for %s is empty" -msgstr "" - -#: refs.c:1155 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 #, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "s'estร refusant la referรจncia amb nom malmรจs ยซ%sยป" - -#: refs.c:1231 -#, fuzzy, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "s'ha produรฏt un error en obrir ยซ%sยป: %s" - -#: 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:2044 -msgid "ref updates forbidden inside quarantine environment" -msgstr "no estร permรจs actualitzar les referรจncies en un entorn de quarantena" - -#: refs.c:2140 refs.c:2170 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "ยซ%sยป existeix; no es pot crear ยซ%sยป" - -#: 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" - -#: refs/files-backend.c:1234 -#, c-format -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: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:1545 -#, c-format -msgid "could not delete references: %s" -msgstr "no s'han pogut suprimir les referรจncies: %s" - -#: refspec.c:137 -#, fuzzy, c-format -msgid "invalid refspec '%s'" -msgstr "fitxer no vร lid: ยซ%sยป" +msgid "could not read '%s'." +msgstr "no s'ha pogut llegir ยซ%sยป." -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "no hi รฉs" @@ -5037,290 +6034,383 @@ msgstr "darrere per %d" msgid "ahead %d, behind %d" msgstr "davant per %d, darrere per %d" -#: ref-filter.c:162 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format esperat: %%(color:<color>)" -#: ref-filter.c:164 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconegut: %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:193 #, 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:190 +#: ref-filter.c:197 #, 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:192 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" -msgstr "parร metre %%(%s) desconegut: %s" +msgstr "argument %%(%s) desconegut: %s" -#: ref-filter.c:247 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" -msgstr "%%(subject) no accepta parร metres" +msgstr "%%(objecttype) no accepta arguments" -#: ref-filter.c:269 -#, fuzzy, c-format +#: ref-filter.c:276 +#, c-format msgid "unrecognized %%(objectsize) argument: %s" -msgstr "parร metre %%(objectname) no reconegut: %s" +msgstr "argument %%(objectsize) no reconegut: %s" -#: ref-filter.c:277 -#, fuzzy, c-format +#: ref-filter.c:284 +#, c-format msgid "%%(deltabase) does not take arguments" -msgstr "%%(objectsize) no accepta parร metres" +msgstr "%%(deltabase) no accepta arguments" -#: ref-filter.c:289 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" -msgstr "%%(body) no accepta parร metres" +msgstr "%%(body) no accepta arguments" -#: ref-filter.c:298 -#, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) no accepta parร metres" +#: ref-filter.c:309 +#, fuzzy, c-format +msgid "unrecognized %%(subject) argument: %s" +msgstr "argument %%(objectsize) no reconegut: %s" -#: ref-filter.c:320 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" -msgstr "parร metre %%(trailers) desconegut: %s" +msgstr "argument %%(trailers) desconegut: %s" -#: ref-filter.c:349 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positiu esperat contรฉ:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" -msgstr "parร metre %%(contents) no reconegut: %s" +msgstr "argument %%(contents) no reconegut: %s" -#: 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:380 +#, fuzzy, c-format +msgid "positive value expected '%s' in %%(%s)" +msgstr "valor positiu esperat contรฉ:lines=%s" -#: ref-filter.c:370 -#, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "parร metre %%(objectname) no reconegut: %s" +#: ref-filter.c:384 +#, fuzzy, c-format +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "argument no reconegut: %s" -#: ref-filter.c:400 +#: ref-filter.c:398 +#, fuzzy, c-format +msgid "unrecognized email option: %s" +msgstr "opciรณ no reconeguda: ยซ%sยป" + +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format esperat: %%(align:<amplada>,<posiciรณ>)" -#: ref-filter.c:412 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "posiciรณ no reconeguda:%s" -#: ref-filter.c:419 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "amplada no reconeguda:%s" -#: ref-filter.c:428 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" -msgstr "parร metre %%(align) no reconegut: %s" +msgstr "argument %%(align) no reconegut: %s" -#: ref-filter.c:436 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "amplada positiva esperada amb l'ร tom %%(align)" -#: ref-filter.c:454 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" -msgstr "parร metre %%(if) no reconegut: %s" +msgstr "argument %%(if) no reconegut: %s" -#: ref-filter.c:556 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "nom de camp mal format: %.*s" -#: ref-filter.c:583 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "nom de camp desconegut: %.*s" -#: ref-filter.c:587 -#, c-format +#: ref-filter.c:615 +#, fuzzy, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" +"no รฉs un dipรฒsit git perรฒ el camp '%.*s' requereix accรฉs a les dades de " +"l'objecte" -#: ref-filter.c:711 +#: ref-filter.c:739 #, 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:774 +#: ref-filter.c:802 #, 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:776 +#: ref-filter.c:804 #, 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:778 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: s'ha usat l'ร tom %%(then) desprรฉs de %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:834 #, 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:808 +#: ref-filter.c:836 #, 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:810 +#: ref-filter.c:838 #, 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:825 +#: ref-filter.c:853 #, 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:882 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "cadena de format mal format %s" -#: ref-filter.c:1485 -#, fuzzy, c-format +#: ref-filter.c:1541 +#, c-format msgid "no branch, rebasing %s" -msgstr "(cap branca, s'estร fent ยซrebaseยป %s)" +msgstr "sense branca, s'estร fent ยซrebaseยป %s" -#: ref-filter.c:1488 -#, fuzzy, c-format +#: ref-filter.c:1544 +#, c-format msgid "no branch, rebasing detached HEAD %s" -msgstr "(cap branca, s'estร fent ยซrebaseยป d'un ยซHEADยป %s no adjuntat)" +msgstr "sense branca, s'estร fent ยซrebaseยป d'un ยซHEADยป %s no adjuntat" -#: ref-filter.c:1491 +#: ref-filter.c:1547 #, c-format msgid "no branch, bisect started on %s" -msgstr "(cap branca, bisecciรณ comenรงada en %s)" +msgstr "(sense branca, bisecciรณ comenรงada en %s)" -#: ref-filter.c:1501 +#: ref-filter.c:1557 msgid "no branch" msgstr "sense branca" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1591 ref-filter.c:1800 #, c-format msgid "missing object %s for %s" msgstr "manca l'objecte %s per a %s" -#: ref-filter.c:1547 +#: ref-filter.c:1601 #, 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:1998 +#: ref-filter.c:2054 #, c-format msgid "malformed object at '%s'" msgstr "objecte mal format a ยซ%sยป" -#: ref-filter.c:2087 +#: ref-filter.c:2143 #, c-format msgid "ignoring ref with broken name %s" msgstr "s'estร ignorant la referรจncia amb nom malmรจs %s" -#: ref-filter.c:2382 -#, c-format -msgid "format: %%(end) atom missing" -msgstr "format: manca l'ร tom %%(end)" - -#: ref-filter.c:2482 +#: ref-filter.c:2148 refs.c:657 #, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "l'opciรณ ยซ%sยป รฉs incompatible amb --merged" +msgid "ignoring broken ref %s" +msgstr "s'estร ignorant la referรจncia trencada %s" -#: ref-filter.c:2485 +#: ref-filter.c:2464 #, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "l'opciรณ ยซ%sยป รฉs incompatible amb --no-merged" +msgid "format: %%(end) atom missing" +msgstr "format: manca l'ร tom %%(end)" -#: ref-filter.c:2495 +#: ref-filter.c:2563 #, c-format msgid "malformed object name %s" msgstr "nom d'objecte %s mal format" -#: ref-filter.c:2500 +#: ref-filter.c:2568 #, c-format msgid "option `%s' must point to a commit" msgstr "l'opciรณ ยซ%sยป ha d'apuntar a una comissiรณ" -#: remote.c:363 +#: refs.c:264 #, c-format -msgid "config remote shorthand cannot begin with '/': %s" +msgid "%s does not point to a valid object!" +msgstr "%s no apunta a un objecte vร lid" + +#: refs.c:572 +#, fuzzy, c-format +msgid "could not retrieve `%s`" +msgstr "no es poden resoldre els percentatges" + +#: refs.c:579 +#, fuzzy, c-format +msgid "invalid branch name: %s = %s" +msgstr "Nom de branca no vร lid: ยซ%sยป" + +#: refs.c:655 +#, fuzzy, c-format +msgid "ignoring dangling symref %s" +msgstr "ignorant symref per sota" + +#: refs.c:892 +#, fuzzy, c-format +msgid "log for ref %s has gap after %s" +msgstr "log for ref%s have gap desprรฉs de percentatges" + +#: refs.c:898 +#, fuzzy, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "registre per als ref%s inesperadament ha acabat en percentatges" + +#: refs.c:957 +#, fuzzy, c-format +msgid "log for %s is empty" +msgstr "el registre dels percentatges รฉs buit" + +#: refs.c:1049 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "s'estร refusant la referรจncia amb nom malmรจs ยซ%sยป" + +#: refs.c:1120 +#, fuzzy, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "ha fallat updateref per al ref '%s'%s" + +#: refs.c:1944 +#, fuzzy, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "no es permeten mรบltiples actualitzacions per a ref '%s'" + +#: refs.c:2024 +msgid "ref updates forbidden inside quarantine environment" +msgstr "no estร permรจs actualitzar les referรจncies en un entorn de quarantena" + +#: refs.c:2035 +msgid "ref updates aborted by hook" msgstr "" -#: remote.c:410 +#: refs.c:2135 refs.c:2165 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "ยซ%sยป existeix; no es pot crear ยซ%sยป" + +#: refs.c:2141 refs.c:2176 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "no es poden processar ยซ%sยป i ยซ%sยป a la vegada" + +#: refs/files-backend.c:1228 +#, c-format +msgid "could not remove reference %s" +msgstr "no s'ha pogut eliminar la referรจncia %s" + +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "no s'ha pogut suprimir la referรจncia %s: %s" + +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#, c-format +msgid "could not delete references: %s" +msgstr "no s'han pogut suprimir les referรจncies: %s" + +#: refspec.c:167 +#, c-format +msgid "invalid refspec '%s'" +msgstr "refspec no vร lida: ยซ%sยป" + +#: remote.c:351 +#, fuzzy, c-format +msgid "config remote shorthand cannot begin with '/': %s" +msgstr "config remote abreviation no pot comenรงar amb ยซ/ยป per cents" + +#: remote.c:399 +#, fuzzy msgid "more than one receivepack given, using the first" -msgstr "" +msgstr "mรฉs d'un paquet de recepciรณ donat usant el primer" -#: remote.c:418 +#: remote.c:407 +#, fuzzy msgid "more than one uploadpack given, using the first" -msgstr "" +msgstr "s'ha especificat mรฉs d'un paquet de cร rrega utilitzant el primer" -#: remote.c:608 +#: remote.c:590 #, 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:612 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s generalment segueix %s, no %s" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s segueix ambdรณs %s i %s" -#: remote.c:684 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" -msgstr "" +msgstr "la clau ยซ%sยป del patrรณ no tรฉ ยซ*ยป" -#: remote.c:694 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" -msgstr "" +msgstr "el valor ยซ%sยป del patrรณ no tรฉ ยซ*ยป" -#: remote.c:1000 -#, fuzzy, c-format +#: remote.c:1073 +#, c-format msgid "src refspec %s does not match any" -msgstr "%s: no coincideix amb l'รญndex" +msgstr "l'especificaciรณ de referรจncia src %s no coincideix amb cap" -#: remote.c:1005 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" -msgstr "" +msgstr "l'especificaciรณ de referรจncia de src %s coincideix amb mรฉs d'un" #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 -#, c-format +#: remote.c:1093 +#, fuzzy, 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" @@ -5332,148 +6422,161 @@ msgid "" "\n" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" +"La destinaciรณ que heu proporcionat no รฉs un nom de referรจncia complet (รฉs a " +"dir comenรงant per \"refs/\"). Hem intentat endevinar el que voleu dir amb - " +"Buscant una referรจncia que coincideixi amb '%s' al costat remot. - Comprovar " +"si el <src> ser empรจs ('%s') รฉs una referรจncia a \"refs/{headtags}/\". Si รฉs " +"aixรญ afegirem un refs/{headstags que no ha funcionat completament." -#: remote.c:1040 -#, c-format +#: remote.c:1113 +#, fuzzy, 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 "" +"La part <src> de l'especificaciรณ de referรจncia รฉs un objecte de comissiรณ. " +"Voleu crear una branca nova empenyent a '%srefs/heads/%s'?" -#: remote.c:1045 -#, c-format +#: remote.c:1118 +#, fuzzy, 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 "" +"La part <src> de l'especificaciรณ de referรจncia รฉs un objecte d'etiqueta. " +"Voleu crear una etiqueta nova empenyent a '%srefs/tags/%s'?" -#: remote.c:1050 -#, c-format +#: remote.c:1123 +#, fuzzy, 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 "" +"La part <src> de l'especificaciรณ de referรจncia รฉs un objecte d'arbre. Voleu " +"marcar un nou arbre empenyent a '%srefs/tags/%s'?" -#: remote.c:1055 -#, c-format +#: remote.c:1128 +#, fuzzy, 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 "" +"La part <src> de l'especificaciรณ de referรจncia รฉs un objecte blob. Voleu " +"marcar un nou blob empenyent a '%srefs/tags/%s'?" -#: remote.c:1091 -#, c-format +#: remote.c:1164 +#, c-format msgid "%s cannot be resolved to branch" msgstr "ยซ%sยป no es pot resoldre a una branca" -#: remote.c:1102 +#: remote.c:1175 #, 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:1114 -#, c-format +#: remote.c:1187 +#, fuzzy, c-format msgid "dst refspec %s matches more than one" -msgstr "" +msgstr "dst les especificacions de rendiment coincideixen mรฉs d'un" -#: remote.c:1121 -#, c-format +#: remote.c:1194 +#, fuzzy, c-format msgid "dst ref %s receives from more than one src" -msgstr "" +msgstr "dst ref%s rep de mรฉs d'un src" -#: remote.c:1624 remote.c:1725 +#: remote.c:1703 remote.c:1804 msgid "HEAD does not point to a branch" msgstr "HEAD no assenyala cap branca" -#: remote.c:1633 +#: remote.c:1712 #, c-format msgid "no such branch: '%s'" msgstr "no existeix la branca: ยซ%sยป" -#: remote.c:1636 +#: remote.c:1715 #, c-format msgid "no upstream configured for branch '%s'" msgstr "cap font configurada per a la branca ยซ%sยป" -#: remote.c:1642 +#: remote.c:1721 #, 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:1657 +#: remote.c:1736 #, 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:1669 +#: remote.c:1748 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branca ยซ%sยป no tรฉ cap remot al qual pujar" -#: remote.c:1679 +#: remote.c:1758 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les especificacions de referรจncia de ยซ%sยป no inclouen ยซ%sยป" -#: remote.c:1692 +#: remote.c:1771 msgid "push has no destination (push.default is 'nothing')" -msgstr "push no tรฉ destรญ (push.default รฉs ยซnothing)" +msgstr "push no tรฉ destรญ (push.default รฉs ยซnothingยป)" -#: remote.c:1714 +#: remote.c:1793 msgid "cannot resolve 'simple' push to a single destination" -msgstr "no es pot resoldre una pujada 'simple' a un sol destรญ" +msgstr "no es pot resoldre una pujada ยซsimpleยป a un sol destรญ" -#: remote.c:1840 +#: remote.c:1922 #, c-format msgid "couldn't find remote ref %s" msgstr "no s'ha pogut trobar la referรจncia remota %s" -#: remote.c:1853 -#, c-format +#: remote.c:1935 +#, fuzzy, c-format msgid "* Ignoring funny ref '%s' locally" -msgstr "" +msgstr "* Ignorant les referรจncies divertides ยซ%sยป localment" -#: remote.c:2016 +#: remote.c:2098 #, 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:2020 +#: remote.c:2102 msgid " (use \"git branch --unset-upstream\" to fixup)\n" -msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n" +msgstr " (useu ยซgit branch --unset-upstreamยป per a arreglar-ho)\n" -#: remote.c:2023 +#: remote.c:2105 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "La vostra branca estร al dia amb ยซ%sยป.\n" -#: remote.c:2027 +#: remote.c:2109 #, 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:2030 +#: remote.c:2112 #, c-format msgid " (use \"%s\" for details)\n" -msgstr "" +msgstr " (useu ยซ%sยป per a detalls)\n" -#: remote.c:2034 +#: remote.c:2116 #, 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:2040 +#: remote.c:2122 msgid " (use \"git push\" to publish your local commits)\n" -msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" +msgstr " (useu ยซgit pushยป per a publicar les vostres comissions locals)\n" -#: remote.c:2043 +#: remote.c:2125 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5485,11 +6588,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:2051 +#: remote.c:2133 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (useu ยซgit pullยป per a actualitzar la vostra branca local)\n" -#: remote.c:2054 +#: remote.c:2136 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5504,91 +6607,90 @@ msgstr[1] "" "La vostra branca i ยซ%sยป han divergit,\n" "i tenen %d i %d comissions distintes cada una, respectivament.\n" -#: remote.c:2064 +#: remote.c:2146 msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " (useu ยซgit pullยป per a fusionar la branca remota a la vostra)\n" +msgstr " (useu ยซgit pullยป per a fusionar la branca remota amb la vostra)\n" -#: remote.c:2247 +#: remote.c:2337 #, 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 -#, fuzzy, c-format +#, c-format msgid "bad replace ref name: %s" -msgstr "suprimeix les referรจncies reemplaรงades" +msgstr "nom de la referรจncia reemplaรงada incorrecte: %s" #: replace-object.c:30 -#, fuzzy, c-format +#, c-format msgid "duplicate replace ref: %s" -msgstr "suprimeix les referรจncies reemplaรงades" +msgstr "duplica les referรจncies reemplaรงades: %s" -#: replace-object.c:73 -#, fuzzy, c-format +#: replace-object.c:82 +#, c-format msgid "replace depth too high for object %s" -msgstr "reemplaรงa l'etiqueta si existeix" +msgstr "la profunditat de reemplaรงament รฉs massa alta per l'objecte %s" #: rerere.c:217 rerere.c:226 rerere.c:229 msgid "corrupt MERGE_RR" -msgstr "" +msgstr "MERGE_RR corrupte" #: rerere.c:264 rerere.c:269 -#, fuzzy msgid "unable to write rerere record" -msgstr "no s'ha pogut escriure l'objecte de nota" +msgstr "no s'ha pogut escriure el registre ยซrerereยป" #: rerere.c:495 -#, fuzzy, c-format +#, c-format msgid "there were errors while writing '%s' (%s)" -msgstr "error en llegir %s" +msgstr "s'han produรฏt errors en escriure ยซ%sยป (%s)" #: rerere.c:498 -#, fuzzy, c-format +#, c-format msgid "failed to flush '%s'" -msgstr "s'ha produรฏt un error en fer stat a ยซ%sยป" +msgstr "no s'ha pogut buidar ยซ%sยป" #: rerere.c:503 rerere.c:1039 -#, fuzzy, c-format +#, c-format msgid "could not parse conflict hunks in '%s'" -msgstr "no s'ha pogut analitzar la comissiรณ ยซ%sยป" +msgstr "no s'han pogut analitzar els pedaรงos en conflicte a ยซ%sยป" #: rerere.c:684 -#, fuzzy, c-format +#, c-format msgid "failed utime() on '%s'" -msgstr "s'ha produรฏt un error en obrir ยซ%sยป" +msgstr "s'ha produรฏt un error en fer ยซfailed utime()ยป a ยซ%sยป" #: rerere.c:694 -#, fuzzy, c-format +#, c-format msgid "writing '%s' failed" -msgstr "la creaciรณ de ยซ%sยป ha fallat" +msgstr "s'ha produรฏt un error en escriure ยซ%sยป" #: rerere.c:714 -#, c-format +#, fuzzy, c-format msgid "Staged '%s' using previous resolution." -msgstr "" +msgstr "Fased '%s' utilitzant resoluciรณ anterior." #: rerere.c:753 #, c-format msgid "Recorded resolution for '%s'." -msgstr "" +msgstr "Es recorda la resoluciรณ per a ยซ%sยป." #: rerere.c:788 #, c-format msgid "Resolved '%s' using previous resolution." -msgstr "" +msgstr "S'ha resolt ยซ%sยป usant una resoluciรณ anterior." #: rerere.c:803 #, fuzzy, c-format msgid "cannot unlink stray '%s'" -msgstr "no es pot fer symlink en ยซ%sยป ยซ%sยป" +msgstr "no es pot desenllaรงar ยซ%sยป extraviats" #: rerere.c:807 #, fuzzy, c-format msgid "Recorded preimage for '%s'" -msgstr "no s'ha pogut llegir el fitxer de registre ยซ%sยป" +msgstr "Imatge prรจvia registrada per ยซ%sยป" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "no s'ha pogut crear el directori ยซ%sยป" @@ -5596,91 +6698,112 @@ msgstr "no s'ha pogut crear el directori ยซ%sยป" #: rerere.c:1057 #, fuzzy, c-format msgid "failed to update conflicted state in '%s'" -msgstr "no s'ha pogut escriure a ยซ%sยป" +msgstr "no s'ha pogut actualitzar l'estat en conflicte a ยซ%sยป" #: rerere.c:1068 rerere.c:1075 #, fuzzy, c-format msgid "no remembered resolution for '%s'" -msgstr "No s'ha pogut afegir el resultat de fusiรณ per a ยซ%sยป" +msgstr "no hi ha cap resoluciรณ recordada per ยซ%sยป" #: rerere.c:1077 -#, fuzzy, c-format +#, c-format msgid "cannot unlink '%s'" -msgstr "no es pot fer readlink en ยซ%sยป" +msgstr "no es pot fer ยซunlinkยป de ยซ%sยป" #: rerere.c:1087 #, fuzzy, c-format msgid "Updated preimage for '%s'" -msgstr "suprimeix les referรจncies reemplaรงades" +msgstr "Imatge prรจvia actualitzada per a ยซ%sยป" #: rerere.c:1096 #, fuzzy, c-format msgid "Forgot resolution for '%s'\n" -msgstr "no s'ha pogut llegir el fitxer de registre ยซ%sยป" +msgstr "He oblidat la resoluciรณ per ยซ%sยป" #: rerere.c:1199 -#, fuzzy msgid "unable to open rr-cache directory" -msgstr "no s'ha pogut actualitzar l'arbre cau" +msgstr "no s'ha pogut obrir el directori rr-cache" + +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "no s'ha pogut determinar la revisiรณ de HEAD" + +#: reset.c:70 reset.c:76 sequencer.c:3426 +#, c-format +msgid "failed to find tree of %s" +msgstr "s'ha produรฏt un error en cercar l'arbre de %s" + +#: revision.c:2344 +#, fuzzy +msgid "--unpacked=<packfile> no longer supported" +msgstr "git-over-rsync ja no รฉs compatible" + +#: revision.c:2364 +#, fuzzy, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "valor desconegut per config ยซ%sยป%s" -#: revision.c:2507 +#: revision.c:2702 msgid "your current branch appears to be broken" msgstr "la vostra branca actual sembla malmesa" -#: revision.c:2510 +#: revision.c:2705 #, 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:2710 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent รฉs incompatible amb --bisect" - -#: revision.c:2714 +#: revision.c:2915 msgid "-L does not yet support diff formats besides -p and -s" -msgstr "" +msgstr "-L no รฉs encara compatible amb formats que no siguin ยซ-pยป o ยซ-sยป" #: run-command.c:763 msgid "open /dev/null failed" msgstr "s'ha produรฏt un error en obrir /dev/null" -#: run-command.c:1269 -#, fuzzy, c-format +#: run-command.c:1270 +#, c-format msgid "cannot create async thread: %s" -msgstr "no s'ha pogut crear fil: %s" +msgstr "no s'ha pogut crear fil ยซasyncยป: %s" -#: run-command.c:1333 -#, c-format +#: run-command.c:1334 +#, fuzzy, 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 "" +"El ganxo ยซ%sยป s'ha ignorat perquรจ no s'ha establert com a executable. Podeu " +"desactivar aquest avรญs amb `git config aconsell.ignoredHook false`." -#: send-pack.c:141 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -"paquet de neteja no esperat quan estava llegint l'estat del desempaquetament " -"remot" +"paquet de buidatge no esperat quan estava llegint l'estat del " +"desempaquetament remot" -#: send-pack.c:143 +#: send-pack.c:147 #, 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:145 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "s'ha produรฏt un error en el desempaquetament remot: %s" -#: send-pack.c:306 +#: send-pack.c:372 msgid "failed to sign the push certificate" msgstr "s'ha produรฏt un error en signar el certificat de pujada" -#: send-pack.c:420 +#: send-pack.c:460 +#, fuzzy +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "el destรญ receptor no admet opcions de pujada" + +#: send-pack.c:469 msgid "the receiving end does not support --signed push" msgstr "el destรญ receptor no admet pujar --signed" -#: send-pack.c:422 +#: send-pack.c:471 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5688,173 +6811,168 @@ msgstr "" "no s'estร enviant una certificaciรณ de pujada perquรจ el destรญ receptor no " "admet pujar --signed" -#: send-pack.c:434 +#: send-pack.c:483 msgid "the receiving end does not support --atomic push" msgstr "el destรญ receptor no admet pujar --atomic" -#: send-pack.c:439 +#: send-pack.c:488 msgid "the receiving end does not support push options" msgstr "el destรญ receptor no admet opcions de pujada" -#: sequencer.c:187 +#: sequencer.c:194 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mode de neteja ยซ%sยป no vร lid en la comissiรณ del missatge" -#: sequencer.c:292 -#, fuzzy, c-format +#: sequencer.c:308 +#, c-format msgid "could not delete '%s'" -msgstr "No s'ha pogut suprimir %s" +msgstr "no s'ha pogut suprimir ยซ%sยป" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" -msgstr "no s'ha pogut suprimir ยซ%sยป" +msgstr "no s'ha pogut eliminar ยซ%sยป" -#: sequencer.c:321 +#: sequencer.c:339 msgid "revert" msgstr "revertir" -#: sequencer.c:323 +#: sequencer.c:341 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:325 -msgid "rebase -i" -msgstr "rebase -i" +#: sequencer.c:343 +#, fuzzy +msgid "rebase" +msgstr "rebase" -#: sequencer.c:327 -#, fuzzy, c-format +#: sequencer.c:345 +#, c-format msgid "unknown action: %d" -msgstr "Acciรณ desconeguda: %d" +msgstr "acciรณ desconeguda: %d" -#: sequencer.c:385 +#: sequencer.c:404 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" "desprรฉs de resoldre els conflictes, marqueu els camins\n" -"corregits amb 'git add <camins>' o 'git rm <camins>'" +"corregits amb ยซgit add <camins>ยป o ยซgit rm <camins>ยป" -#: sequencer.c:388 +#: sequencer.c:407 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 "" "desprรฉs de resoldre els conflictes, marqueu els camins\n" -"corregits amb 'git add <camins>' o 'git rm <camins>'\n" -"i cometeu el resultat amb 'git commit'" +"corregits amb ยซgit add <camins>ยป o ยซgit rm <camins>ยป\n" +"i cometeu el resultat amb ยซgit commitยป" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:420 sequencer.c:3028 #, c-format msgid "could not lock '%s'" msgstr "no s'ha pogut bloquejar ยซ%sยป" -#: sequencer.c:408 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "no s'ha pogut escriure a ยซ%sยป" + +#: sequencer.c:427 #, c-format msgid "could not write eol to '%s'" msgstr "no s'ha pogut escriure el terminador de lรญnia a ยซ%sยป" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 #, c-format msgid "failed to finalize '%s'" msgstr "s'ha produรฏt un error en finalitzar ยซ%sยป" -#: 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:462 +#: sequencer.c:471 #, c-format msgid "your local changes would be overwritten by %s." msgstr "els vostres canvis locals se sobreescriurien per %s." -#: sequencer.c:466 +#: sequencer.c:475 msgid "commit your changes or stash them to proceed." msgstr "cometeu els vostres canvis o feu un ยซstashยป per a procedir." -#: sequencer.c:498 +#: sequencer.c:507 #, c-format msgid "%s: fast-forward" msgstr "%s: avanรง rร pid" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:546 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no vร lid %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:632 +#: sequencer.c:640 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'รญndex nou" -#: sequencer.c:649 +#: sequencer.c:657 msgid "unable to update cache tree" msgstr "no s'ha pogut actualitzar l'arbre cau" -#: sequencer.c:663 +#: sequencer.c:671 msgid "could not resolve HEAD commit" msgstr "no s'ha pogut resoldre la comissiรณ HEAD" -#: sequencer.c:743 -#, fuzzy, c-format +#: sequencer.c:751 +#, c-format msgid "no key present in '%.*s'" -msgstr "no s'ha pogut analitzar ยซ%.*sยป" +msgstr "no hi ha una clau a ยซ%.*sยป" -#: sequencer.c:754 +#: sequencer.c:762 #, fuzzy, c-format msgid "unable to dequote value of '%s'" -msgstr "No s'ha pogut afegir el resultat de fusiรณ per a ยซ%sยป" +msgstr "no s'ha pogut delinear el valor de cometes de ยซ%sยป" -#: 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 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir ยซ%sยป per a lectura" -#: sequencer.c:801 +#: sequencer.c:809 msgid "'GIT_AUTHOR_NAME' already given" msgstr "Ja s'ha donat ยซGIT_AUTHOR_NAMEยป" -#: sequencer.c:806 +#: sequencer.c:814 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "Ja s'ha donat ยซGIT_AUTHOR_EMAILยป" -#: sequencer.c:811 +#: sequencer.c:819 msgid "'GIT_AUTHOR_DATE' already given" msgstr "Ja s'ha donat ยซGIT_AUTHOR_DATEยป" -#: sequencer.c:815 +#: sequencer.c:823 #, c-format msgid "unknown variable '%s'" -msgstr "variable ยซ%sยป desconeguda" +msgstr "variable ยซ%sยป desconeguda" -#: sequencer.c:820 +#: sequencer.c:828 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta ยซGIT_AUTHOR_NAMEยป" -#: sequencer.c:822 +#: sequencer.c:830 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta ยซGIT_AUTHOR_EMAILยป" -#: sequencer.c:824 +#: sequencer.c:832 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta ยซGIT_AUTHOR_DATEยป" -#: sequencer.c:884 -#, fuzzy, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "format de data no vร lid: %s" - -#: sequencer.c:901 +#: sequencer.c:897 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5884,16 +7002,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -#, fuzzy -msgid "writing root commit" -msgstr "no hi ha res a cometre\n" - -#: sequencer.c:1216 +#: sequencer.c:1178 msgid "'prepare-commit-msg' hook failed" msgstr "el lligam ยซprepare-commit-msgยป ha fallat" -#: sequencer.c:1223 +#: sequencer.c:1184 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5920,7 +7033,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1197 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5938,363 +7051,364 @@ msgstr "" "Comproveu que siguin correctes. Podeu suprimir aquest\n" "missatge establint-los explรญcitament:\n" "\n" -" git config --global user.name \"El Vostre Nom\"\n" -" git config --global user.email tu@example.com\n" +" git config --global user.name \"El vostre nom\"\n" +" git config --global user.email usuari@example.com\n" "\n" "Desprรฉs de fer aixรฒ, podeu arreglar la identitat usada per a aquesta\n" "comissiรณ amb:\n" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1239 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissiรณ novament creada" -#: sequencer.c:1280 +#: sequencer.c:1241 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissiรณ novament creada" -#: sequencer.c:1326 +#: sequencer.c:1287 msgid "unable to resolve HEAD after creating commit" msgstr "no s'ha pogut resoldre HEAD desprรฉs de crear la comissiรณ" -#: sequencer.c:1328 +#: sequencer.c:1289 msgid "detached HEAD" msgstr "HEAD separat" -#: sequencer.c:1332 +#: sequencer.c:1293 msgid " (root-commit)" -msgstr " (comissiรณ d'arrel)" +msgstr " (comissiรณ arrel)" -#: sequencer.c:1353 +#: sequencer.c:1314 msgid "could not parse HEAD" msgstr "no s'ha pogut analitzar HEAD" -#: sequencer.c:1355 +#: sequencer.c:1316 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s no รฉs una comissiรณ!" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissiรณ HEAD" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1373 sequencer.c:2067 msgid "unable to parse commit author" msgstr "no s'ha pogut analitzar l'autor de la comissiรณ" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 msgid "git write-tree failed to write a tree" msgstr "git write-tree ha fallat en escriure un arbre" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1417 sequencer.c:1535 #, 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:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1446 sequencer.c:1478 +#, fuzzy, c-format +msgid "invalid author identity '%s'" +msgstr "camรญ no vร lid: ยซ%sยป" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 msgid "failed to write commit object" msgstr "s'ha produรฏt un error en escriure l'objecte de comissiรณ" -#: sequencer.c:1526 +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "no s'ha pogut actualitzar %s" + +#: sequencer.c:1567 #, c-format msgid "could not parse commit %s" msgstr "no s'ha pogut analitzar la comissiรณ %s" -#: sequencer.c:1531 +#: sequencer.c:1572 #, c-format msgid "could not parse parent commit %s" msgstr "no s'ha pogut analitzar la comissiรณ pare %s" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1655 sequencer.c:1766 #, c-format msgid "unknown command: %d" msgstr "ordre desconeguda: %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1713 sequencer.c:1738 #, c-format msgid "This is a combination of %d commits." msgstr "Aixรฒ รฉs una combinaciรณ de %d comissions." -#: sequencer.c:1672 +#: sequencer.c:1723 msgid "need a HEAD to fixup" msgstr "cal un HEAD per reparar-ho" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1725 sequencer.c:3338 msgid "could not read HEAD" msgstr "no s'ha pogut llegir HEAD" -#: sequencer.c:1676 +#: sequencer.c:1727 msgid "could not read HEAD's commit message" msgstr "no s'ha pogut llegir el missatge de comissiรณ de HEAD" -#: sequencer.c:1682 +#: sequencer.c:1733 #, c-format msgid "cannot write '%s'" msgstr "no es pot escriure ยซ%sยป" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Aquest รฉs el 1r missatge de comissiรณ:" -#: sequencer.c:1697 +#: sequencer.c:1748 #, c-format msgid "could not read commit message of %s" msgstr "no s'ha pogut llegir el missatge de comissiรณ: %s" -#: sequencer.c:1704 +#: sequencer.c:1755 #, c-format msgid "This is the commit message #%d:" msgstr "Aquest รฉs el missatge de comissiรณ #%d:" -#: sequencer.c:1710 +#: sequencer.c:1761 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El missatge de comissiรณ nรบm. #%d s'ometrร :" -#: sequencer.c:1798 +#: sequencer.c:1849 msgid "your index file is unmerged." msgstr "el vostre fitxer d'รญndex estร sense fusionar." -#: sequencer.c:1805 -#, fuzzy +#: sequencer.c:1856 msgid "cannot fixup root commit" -msgstr "no es pot trobar la comissiรณ %s (%s)" +msgstr "no es pot arreglar la comissiรณ arrel" -#: sequencer.c:1824 +#: sequencer.c:1875 #, 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:1832 sequencer.c:1840 +#: sequencer.c:1883 sequencer.c:1891 #, c-format msgid "commit %s does not have parent %d" msgstr "la comissiรณ %s no tรฉ pare %d" -#: sequencer.c:1846 +#: sequencer.c:1897 #, 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:1865 +#: sequencer.c:1916 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no es pot analitzar la comissiรณ pare %s" -#: sequencer.c:1930 +#: sequencer.c:1981 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no s'ha pogut canviar el nom ยซ%sยป a ยซ%sยป" -#: sequencer.c:1985 +#: sequencer.c:2038 #, c-format msgid "could not revert %s... %s" msgstr "no s'ha pogut revertir %s... %s" -#: sequencer.c:1986 +#: sequencer.c:2039 #, c-format msgid "could not apply %s... %s" msgstr "no s'ha pogut aplicar %s... %s" -#: sequencer.c:2045 +#: sequencer.c:2059 +#, fuzzy, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "" +"deixant anar per cents per cents -- el contingut del pedaรง ja s'ha avanรงat" + +#: sequencer.c:2117 #, 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:2052 +#: sequencer.c:2124 #, 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:2128 +#: sequencer.c:2201 #, c-format msgid "%s does not accept arguments: '%s'" -msgstr "%s no accepta parร metres: ยซ%sยป" +msgstr "%s no accepta arguments: ยซ%sยป" -#: sequencer.c:2137 +#: sequencer.c:2210 #, c-format msgid "missing arguments for %s" -msgstr "falten els arguments per %s" +msgstr "falten els arguments per a %s" -#: sequencer.c:2174 -#, fuzzy, c-format -msgid "could not parse '%.*s'" +#: sequencer.c:2241 +#, c-format +msgid "could not parse '%s'" msgstr "no s'ha pogut analitzar ยซ%sยป" -#: sequencer.c:2228 +#: sequencer.c:2302 #, c-format msgid "invalid line %d: %.*s" msgstr "lรญnia no vร lida %d: %.*s" -#: sequencer.c:2239 +#: sequencer.c:2313 #, c-format msgid "cannot '%s' without a previous commit" -msgstr "No es pot ยซ%sยป sense una comissiรณ prรจvia" - -#: 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ยป." +msgstr "no es pot ยซ%sยป sense una comissiรณ prรจvia" -#: sequencer.c:2323 -#, fuzzy +#: sequencer.c:2399 msgid "cancelling a cherry picking in progress" -msgstr "ni hi ha cap ยซcherry pickยป ni cap reversiรณ en curs" +msgstr "s'estร cancelยทlant un ยซcherry pickยป en curs" -#: sequencer.c:2330 -#, fuzzy +#: sequencer.c:2408 msgid "cancelling a revert in progress" -msgstr "ni hi ha cap ยซcherry pickยป ni cap reversiรณ en curs" +msgstr "s'estร cancelยทlant la reversiรณ en curs" -#: sequencer.c:2364 +#: sequencer.c:2452 msgid "please fix this using 'git rebase --edit-todo'." msgstr "corregiu-ho usant ยซgit rebase --edit-todoยป." -#: sequencer.c:2366 +#: sequencer.c:2454 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "full d'instruccions inusable: ยซ%sยป" -#: sequencer.c:2371 +#: sequencer.c:2459 msgid "no commits parsed." msgstr "no s'ha analitzat cap comissiรณ." -#: sequencer.c:2382 +#: sequencer.c:2470 msgid "cannot cherry-pick during a revert." msgstr "no es pot fer ยซcherry pickยป durant una reversiรณ." -#: sequencer.c:2384 +#: sequencer.c:2472 msgid "cannot revert during a cherry-pick." msgstr "no es pot revertir durant un ยซcherry pickยป." -#: sequencer.c:2466 +#: sequencer.c:2550 #, c-format msgid "invalid value for %s: %s" msgstr "valor no vร lid per a %s: %s" -#: sequencer.c:2553 +#: sequencer.c:2657 msgid "unusable squash-onto" -msgstr "" +msgstr "ยซsquash-ontoยป no usable" -#: sequencer.c:2569 +#: sequencer.c:2677 #, c-format msgid "malformed options sheet: '%s'" msgstr "full d'opcions mal format: ยซ%sยป" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2769 sequencer.c:4609 msgid "empty commit set passed" msgstr "conjunt de comissions buit passat" -#: sequencer.c:2668 -#, fuzzy +#: sequencer.c:2786 msgid "revert is already in progress" -msgstr "un ยซcherry pickยป o una reversiรณ ja estร en curs" +msgstr "una reversiรณ ja estร en curs" -#: sequencer.c:2670 -#, fuzzy, c-format +#: sequencer.c:2788 +#, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" -msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "intenteu ยซgit revert (--continue | %s--abort | --quit)ยป" -#: sequencer.c:2673 -#, fuzzy +#: sequencer.c:2791 msgid "cherry-pick is already in progress" -msgstr "un ยซcherry pickยป o una reversiรณ ja estร en curs" +msgstr "un ยซcherry pickยป ja estร en curs" -#: sequencer.c:2675 -#, fuzzy, c-format +#: sequencer.c:2793 +#, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" -msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "intenteu ยซgit cherry-pick (--continue | %s--abort | --quit)ยป" -#: sequencer.c:2689 +#: sequencer.c:2807 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no s'ha pogut crear el directori de seqรผenciador ยซ%sยป" -#: sequencer.c:2704 +#: sequencer.c:2822 msgid "could not lock HEAD" msgstr "no s'ha pogut bloquejar HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2882 sequencer.c:4325 msgid "no cherry-pick or revert in progress" msgstr "ni hi ha cap ยซcherry pickยป ni cap reversiรณ en curs" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2884 sequencer.c:2895 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2886 sequencer.c:2930 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:2798 builtin/grep.c:734 +#: sequencer.c:2916 builtin/grep.c:745 #, c-format msgid "cannot open '%s'" msgstr "no es pot obrir ยซ%sยป" -#: sequencer.c:2800 +#: sequencer.c:2918 #, c-format msgid "cannot read '%s': %s" msgstr "no es pot llegir ยซ%sยป: %s" -#: sequencer.c:2801 +#: sequencer.c:2919 msgid "unexpected end of file" msgstr "final de fitxer inesperat" -#: sequencer.c:2807 +#: sequencer.c:2925 #, 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:2818 +#: sequencer.c:2936 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:2859 -#, fuzzy +#: sequencer.c:2977 msgid "no revert in progress" -msgstr "No hi ha un ยซrebaseยป en curs?" +msgstr "no hi ha cap reversiรณ en curs" -#: sequencer.c:2867 -#, fuzzy +#: sequencer.c:2986 msgid "no cherry-pick in progress" -msgstr "ni hi ha cap ยซcherry pickยป ni cap reversiรณ en curs" +msgstr "ni hi ha cap ยซcherry pickยป en curs" -#: sequencer.c:2877 -#, fuzzy +#: sequencer.c:2996 msgid "failed to skip the commit" -msgstr "s'ha produรฏt un error en escriure l'objecte de comissiรณ" +msgstr "s'ha produรฏt un error en ometre la comissiรณ" -#: sequencer.c:2884 +#: sequencer.c:3003 msgid "there is nothing to skip" -msgstr "" +msgstr "no hi ha res a ometre" -#: sequencer.c:2887 -#, c-format +#: sequencer.c:3006 +#, fuzzy, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" -msgstr "" +msgstr "ja ho heu fet? proveu \"git perds --continue\"" -#: sequencer.c:3011 sequencer.c:4015 -#, c-format -msgid "could not update %s" -msgstr "no s'ha pogut actualitzar %s" - -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3168 sequencer.c:4217 msgid "cannot read HEAD" -msgstr "No es pot llegir HEAD" +msgstr "no es pot llegir HEAD" -#: sequencer.c:3066 +#: sequencer.c:3185 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no s'ha pogut copiar ยซ%sยป a ยซ%sยป" -#: sequencer.c:3074 -#, fuzzy, c-format +#: sequencer.c:3193 +#, c-format msgid "" "You can amend the commit now, with\n" "\n" @@ -6306,33 +7420,33 @@ msgid "" msgstr "" "Podeu esmenar la comissiรณ ara, amb\n" "\n" -"\tgit commit --amend $gpg_sign_opt_quoted\n" +" git commit --amend %s\n" "\n" "Una vegada que estigueu satisfet amb els vostres canvis, executeu\n" "\n" -"\tgit rebase --continue" +" git rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3203 #, c-format msgid "Could not apply %s... %.*s" msgstr "No s'ha pogut aplicar %s... %.*s" -#: sequencer.c:3091 +#: sequencer.c:3210 #, c-format msgid "Could not merge %.*s" msgstr "No s'ha pogut fusionar %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no s'ha pogut copiar ยซ%sยป a ยซ%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 "no s'ha pogut llegir l'รญndex" +#: sequencer.c:3240 +#, fuzzy, c-format +msgid "Executing: %s\n" +msgstr "S'estร executant: $rest" -#: sequencer.c:3136 +#: sequencer.c:3255 #, c-format msgid "" "execution failed: %s\n" @@ -6347,11 +7461,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3261 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:3148 +#: sequencer.c:3267 #, c-format msgid "" "execution succeeded: %s\n" @@ -6367,82 +7481,96 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3209 +#: sequencer.c:3328 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom d'etiqueta no permรจs: ยซ%.*sยป" -#: sequencer.c:3263 -#, fuzzy +#: sequencer.c:3382 msgid "writing fake root commit" -msgstr "no hi ha res a cometre\n" +msgstr "s'estร escrivint una comissiรณ arrel falsa" -#: sequencer.c:3268 +#: sequencer.c:3387 msgid "writing squash-onto" -msgstr "" - -#: 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." - -#: sequencer.c:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "no s'ha pogut escriure l'รญndex" +msgstr "s'estร escrivint ยซsquash-ontoยป" -#: sequencer.c:3351 +#: sequencer.c:3471 #, c-format msgid "could not resolve '%s'" msgstr "no s'ha pogut resoldre ยซ%sยป" -#: sequencer.c:3379 -#, fuzzy +#: sequencer.c:3502 msgid "cannot merge without a current revision" -msgstr "No es pot ยซ%sยป sense una comissiรณ prรจvia" +msgstr "no es pot fusionar sense una revisiรณ actual" -#: sequencer.c:3401 +#: sequencer.c:3524 #, c-format msgid "unable to parse '%.*s'" msgstr "no s'ha pogut analitzar ยซ%.*sยป" -#: sequencer.c:3410 +#: sequencer.c:3533 #, c-format msgid "nothing to merge: '%.*s'" msgstr "no hi ha res per fusionar ยซ%.*sยป" -#: sequencer.c:3422 +#: sequencer.c:3545 +#, fuzzy msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" +"no es pot executar la fusiรณ del pop a la part superior d'una [arrel nova]" -#: sequencer.c:3437 -#, fuzzy, c-format +#: sequencer.c:3561 +#, c-format msgid "could not get commit message of '%s'" -msgstr "no s'ha pogut llegir el missatge de comissiรณ: %s" +msgstr "no s'ha pogut llegir el missatge de comissiรณ de ยซ%sยป" -#: sequencer.c:3590 +#: sequencer.c:3730 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no s'ha pogut fusionar ยซ%.*sยป" -#: sequencer.c:3606 -#, fuzzy +#: sequencer.c:3746 msgid "merge: Unable to write new index file" -msgstr "%s: No s'ha pogut escriure un fitxer d'รญndex nou" +msgstr "fusiรณ: no s'ha pogut escriure un fitxer d'รญndex nou" + +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "No es pot emmagatzemar automร ticament" + +#: sequencer.c:3823 +#, fuzzy, c-format +msgid "Unexpected stash response: '%s'" +msgstr "Resposta inesperada ยซ%sยป de ยซstashยป" + +#: sequencer.c:3829 +#, fuzzy, c-format +msgid "Could not create directory for '%s'" +msgstr "No s'ha pogut crear el directori per a ยซ%sยป" + +#: sequencer.c:3832 +#, fuzzy, c-format +msgid "Created autostash: %s\n" +msgstr "Percentatges creats automร ticament" + +#: sequencer.c:3836 +#, fuzzy +msgid "could not reset --hard" +msgstr "no s'ha pogut restablir --hard" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3861 #, c-format msgid "Applied autostash.\n" msgstr "S'ha aplicat el ยซstashยป automร ticament.\n" -#: sequencer.c:3687 +#: sequencer.c:3873 #, c-format msgid "cannot store %s" msgstr "no es pot emmagatzemar %s" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 -#, c-format +#: sequencer.c:3876 +#, fuzzy, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" @@ -6450,32 +7578,36 @@ 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:3751 -#, fuzzy, c-format -msgid "could not checkout %s" -msgstr "no es pot agafar %s" +#: sequencer.c:3881 +#, fuzzy +msgid "Applying autostash resulted in conflicts." +msgstr "S'ha aplicat el pedaรง a ยซ%sยป amb conflictes.\n" -#: sequencer.c:3765 -#, fuzzy, c-format +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." +msgstr "" + +#: sequencer.c:3974 +#, c-format msgid "%s: not a valid OID" -msgstr "ยซ%sยป no รฉs un terme vร lid" +msgstr "%s: no รฉs un OID vร lid" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "no s'ha pogut separar HEAD" -#: sequencer.c:3785 -#, fuzzy, c-format +#: sequencer.c:3994 +#, c-format msgid "Stopped at HEAD\n" -msgstr "Aturat a %s... %.*s\n" +msgstr "Aturat a HEAD\n" -#: sequencer.c:3787 -#, fuzzy, c-format +#: sequencer.c:3996 +#, c-format msgid "Stopped at %s\n" -msgstr "Aturat a %s... %.*s\n" +msgstr "Aturat a %s\n" -#: sequencer.c:3795 -#, c-format +#: sequencer.c:4004 +#, fuzzy, c-format msgid "" "Could not execute the todo command\n" "\n" @@ -6486,49 +7618,62 @@ msgid "" " git rebase --edit-todo\n" " git rebase --continue\n" msgstr "" +"No s'ha pogut executar l'ordre de tasques pendents.*s S'ha reprogramat; Per " +"editar l'ordre abans de continuar editeu primer la llista de tasques " +"pendents git rebase --edit-todo git rebase --continue" + +#: sequencer.c:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "" -#: sequencer.c:3877 +#: sequencer.c:4095 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Aturat a %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:4166 #, c-format msgid "unknown command %d" msgstr "ordre %d desconeguda" -#: sequencer.c:4003 +#: sequencer.c:4225 msgid "could not read orig-head" -msgstr "No s'ha pogut llegir orig-head" +msgstr "no s'ha pogut llegir orig-head" -#: sequencer.c:4008 +#: sequencer.c:4230 msgid "could not read 'onto'" -msgstr "no s'ha pogut llegir 'onto'" +msgstr "no s'ha pogut llegir ยซontoยป" -#: sequencer.c:4022 +#: sequencer.c:4244 #, c-format msgid "could not update HEAD to %s" msgstr "no s'ha pogut actualitzar HEAD a %s" -#: sequencer.c:4115 +#: sequencer.c:4304 +#, fuzzy, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "S'ha fet ยซrebaseยป i actualitzat $head_name amb รจxit." + +#: sequencer.c:4337 msgid "cannot rebase: You have unstaged changes." msgstr "No es pot fer ยซrebaseยป: teniu canvis ยซunstagedยป." -#: sequencer.c:4124 +#: sequencer.c:4346 msgid "cannot amend non-existing commit" msgstr "no es pot esmenar una comissiรณ no existent" -#: sequencer.c:4126 +#: sequencer.c:4348 #, c-format msgid "invalid file: '%s'" msgstr "fitxer no vร lid: ยซ%sยป" -#: sequencer.c:4128 +#: sequencer.c:4350 #, c-format msgid "invalid contents: '%s'" msgstr "contingut no vร lid: ยซ%sยป" -#: sequencer.c:4131 +#: sequencer.c:4353 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6536,70 +7681,66 @@ msgid "" msgstr "" "\n" "Teniu canvis no comesos en el vostre arbre de treball. \n" -"Primer cometeu-los i desprรฉs executeu 'git rebase --continue' de nou." +"Cometeu-los primer i desprรฉs executeu ยซgit rebase --continueยป de nou." -#: sequencer.c:4167 sequencer.c:4205 -#, fuzzy, c-format +#: sequencer.c:4389 sequencer.c:4428 +#, c-format msgid "could not write file: '%s'" -msgstr "no s'ha pogut crear el fitxer ยซ%sยป" +msgstr "no s'ha pogut escriure el fitxer: ยซ%sยป" -#: sequencer.c:4220 +#: sequencer.c:4444 msgid "could not remove CHERRY_PICK_HEAD" msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4451 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:4477 +#, fuzzy, c-format +msgid "invalid committer '%s'" +msgstr "comissiรณ no vร lida %s" -#: sequencer.c:4328 +#: sequencer.c:4586 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no es pot fer ยซcherry pickยป a %s" -#: sequencer.c:4332 +#: sequencer.c:4590 #, c-format msgid "%s: bad revision" msgstr "%s: revisiรณ incorrecta" -#: sequencer.c:4367 +#: sequencer.c:4625 msgid "can't revert as initial commit" msgstr "no es pot revertir com a comissiรณ inicial" -#: sequencer.c:4810 +#: sequencer.c:5102 msgid "make_script: unhandled options" msgstr "make_script: opcions no gestionades" -#: sequencer.c:4813 +#: sequencer.c:5105 msgid "make_script: error preparing revisions" msgstr "make_script: s'ha produรฏt un error en preparar les revisions" -#: 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 "" -"Podeu arreglar aixรฒ amb 'git rebase --edit-todo' i desprรฉs 'git rebase --" -"continue'.\n" - -#: sequencer.c:5083 sequencer.c:5100 +#: sequencer.c:5347 sequencer.c:5364 msgid "nothing to do" msgstr "res a fer" -#: sequencer.c:5114 +#: sequencer.c:5383 msgid "could not skip unnecessary pick commands" msgstr "no s'han pogut ometre les ordres ยซpicksยป no necessร ries" -#: sequencer.c:5197 +#: sequencer.c:5480 msgid "the script was already rearranged." msgstr "l'script ja estava endreรงat." -#: setup.c:123 -#, c-format -msgid "'%s' is outside repository" -msgstr "ยซ%sยป รฉs fora del dipรฒsit" +#: setup.c:133 +#, fuzzy, c-format +msgid "'%s' is outside repository at '%s'" +msgstr "'%s' estร fora del dipรฒsit a '%s'" -#: setup.c:173 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6609,132 +7750,137 @@ msgstr "" "Useu ยซgit <ordre> -- <camรญ>...ยป per a especificar camins que no existeixin " "localment." -#: setup.c:186 +#: setup.c:198 #, 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 "" -"parร metre ambigu ยซ%sยป: revisiรณ no coneguda o el camรญ no รฉs en l'arbre de " +"argument ambigu ยซ%sยป: revisiรณ no coneguda o el camรญ no รฉs en l'arbre de " "treball.\n" "Useu ยซ--ยป per a separar els camins de les revisions:\n" -"'git <ordre> [<revisiรณ>...] -- [<fitxer>...]'" +"ยซgit <ordre> [<revisiรณ>...] -- [<fitxer>...]ยป" -#: setup.c:235 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" -msgstr "l'opciรณ ยซ%sยป ha de venir abans dels arguments opcionals" +msgstr "l'opciรณ ยซ%sยป ha d'aparรจixer abans que els arguments opcionals" -#: setup.c:254 +#: setup.c:283 #, 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 "" -"parร metre ambigu ยซ%sยป: ambdรณs una revisiรณ i un nom de fitxer\n" -"Useu '--' per a separar els camins de les revisions:\n" -"'git <ordre> [<revisiรณ>...] -- [<fitxer>...]'" +"argument ambigu ยซ%sยป: ambdรณs una revisiรณ i un nom de fitxer\n" +"Useu ยซ--ยป per a separar els camins de les revisions:\n" +"ยซgit <ordre> [<revisiรณ>...] -- [<fitxer>...]ยป" -#: setup.c:390 +#: setup.c:419 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:394 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "aquesta operaciรณ s'ha d'executar en un arbre de treball" -#: setup.c:540 +#: setup.c:661 #, 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:548 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "s'han trobat extensions de dipรฒsit desconegudes:" -#: setup.c:567 +#: setup.c:681 +#, fuzzy +msgid "repo version is 0, but v1-only extensions found:" +msgstr "s'han trobat extensions de dipรฒsit desconegudes:" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "s'ha produรฏt un error en obrir ยซ%sยป" -#: setup.c:569 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" -msgstr "massa larg per a ser un fitxer .git: ยซ%sยป" +msgstr "massa gran per a ser un fitxer .git: ยซ%sยป" -#: setup.c:571 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "error en llegir %s" -#: setup.c:573 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "format gitfile no vร lid: %s" -#: setup.c:575 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "sense camรญ al gitfile: %s" -#: setup.c:577 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "no รฉs un dipรฒsit de git: %s" -#: setup.c:676 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "ยซ$%sยป massa gran" -#: setup.c:690 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "no รฉs un dipรฒsit de git: ยซ%sยป" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "no es pot canviar de directori a ยซ%sยป" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "no es pot tornar al directori de treball actual" -#: setup.c:851 +#: setup.c:987 #, 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:1083 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "No s'ha pogut llegir el directori de treball actual" -#: setup.c:1092 setup.c:1098 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "no es pot canviar a ยซ%sยป" -#: setup.c:1103 +#: setup.c:1245 #, 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:1109 +#: setup.c:1251 #, 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 un dipรฒsit de git (ni cap pare fins al punt de muntatge %s)\n" +"no รฉs 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:1220 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6745,294 +7891,290 @@ msgstr "" "El propietari dels fitxers sempre ha de tenir permisos de lectura i " "escriptura." -#: setup.c:1264 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "s'ha produรฏt un error en obrir /dev/null o dup" -#: setup.c:1279 +#: setup.c:1424 msgid "fork failed" msgstr "el ยซforkยป ha fallat" -#: setup.c:1284 +#: setup.c:1429 msgid "setsid failed" -msgstr "l'ยซstashยป ha fallat" +msgstr "ยซsetsidยป ha fallat" -#: sha1-file.c:453 +#: sha1-file.c:470 #, 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" -#: sha1-file.c:504 -#, fuzzy, c-format +#: sha1-file.c:521 +#, c-format msgid "unable to normalize alternate object path: %s" -msgstr "no s'ha pogut analitzar l'objecte: %s" +msgstr "no s'ha pogut normalitzar el camรญ a l'objecte alternatiu: %s" -#: sha1-file.c:576 -#, c-format +#: sha1-file.c:593 +#, fuzzy, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" +"percentatges ignorant botigues alternatives d'objectes imbricaciรณ massa " +"profunda" -#: sha1-file.c:583 -#, fuzzy, c-format +#: sha1-file.c:600 +#, c-format msgid "unable to normalize object directory: %s" -msgstr "no s'ha pogut analitzar l'objecte: %s" +msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s" -#: sha1-file.c:626 +#: sha1-file.c:643 #, fuzzy msgid "unable to fdopen alternates lockfile" -msgstr "no s'han pogut escriure els parร metres al fitxer de configuraciรณ" +msgstr "no s'ha pogut obrir el fitxer de bloqueig alternatiu ยซfdopenยป" -#: sha1-file.c:644 -#, fuzzy +#: sha1-file.c:661 msgid "unable to read alternates file" -msgstr "no es pot llegir el fitxer d'รญndex" +msgstr "no es pot llegir el fitxer ยซalternatesยป" -#: sha1-file.c:651 -#, fuzzy +#: sha1-file.c:668 msgid "unable to move new alternates file into place" -msgstr "no s'ha pogut escriure un fitxer d'รญndex nou" +msgstr "no s'ha pogut moure el nou fitxer ยซalternatesยป al lloc" -#: sha1-file.c:686 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "el camรญ ยซ%sยป no existeix" -#: sha1-file.c:712 +#: sha1-file.c:724 #, 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." +"encara no s'admet el dipรฒsit de referรจncia ยซ%sยป com a agafament enllaรงat." -#: sha1-file.c:718 +#: sha1-file.c:730 #, 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:724 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "el dipรฒsit de referรจncia ยซ%sยป รฉs superficial" -#: sha1-file.c:732 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "el dipรฒsit de referรจncia ยซ%sยป รฉs empeltat" -#: sha1-file.c:792 +#: sha1-file.c:804 #, 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" -#: sha1-file.c:943 -#, c-format +#: sha1-file.c:954 +#, fuzzy, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" -msgstr "" +msgstr "intentar mmap %<PRIuMAX> mรฉs del lรญmit <PRIuMAX>" -#: sha1-file.c:968 +#: sha1-file.c:975 msgid "mmap failed" msgstr "mmap ha fallat" -#: sha1-file.c:1132 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "el tipus d'objecte %s รฉs buit" -#: sha1-file.c:1256 sha1-file.c:2395 -#, fuzzy, c-format +#: sha1-file.c:1274 sha1-file.c:2467 +#, c-format msgid "corrupt loose object '%s'" -msgstr "no s'ha pogut analitzar l'objecte ยซ%sยป" +msgstr "objecte solt corrupte ยซ%sยป" -#: sha1-file.c:1258 sha1-file.c:2399 -#, fuzzy, c-format +#: sha1-file.c:1276 sha1-file.c:2471 +#, c-format msgid "garbage at end of loose object '%s'" -msgstr "no s'ha pogut analitzar l'objecte: %s" +msgstr "brossa al final de l'objecte solt ยซ%sยป" -#: sha1-file.c:1300 -#, fuzzy +#: sha1-file.c:1318 msgid "invalid object type" -msgstr "el tipus d'objecte รฉs incorrecte." +msgstr "tipus d'objecte รฉs incorrecte" -#: sha1-file.c:1384 +#: sha1-file.c:1402 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "" +msgstr "no s'ha pogut desempaquetar la capรงalera %s amb --allow-unknown-type" -#: sha1-file.c:1387 -#, fuzzy, c-format +#: sha1-file.c:1405 +#, c-format msgid "unable to unpack %s header" -msgstr "no s'ha pogut actualitzar %s" +msgstr "no s'ha pogut desempaquetar la capรงalera %s" -#: sha1-file.c:1393 +#: sha1-file.c:1411 #, c-format msgid "unable to parse %s header with --allow-unknown-type" -msgstr "" +msgstr "no s'ha pogut analitzar la capรงalera %s amb --allow-unknown-type" -#: sha1-file.c:1396 -#, fuzzy, c-format +#: sha1-file.c:1414 +#, c-format msgid "unable to parse %s header" -msgstr "no s'ha pogut actualitzar %s" +msgstr "no s'ha pogut analitzar la capรงalera %s" -#: sha1-file.c:1587 -#, fuzzy, c-format +#: sha1-file.c:1641 +#, 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:1591 -#, fuzzy, c-format +#: sha1-file.c:1645 +#, c-format msgid "replacement %s not found for %s" -msgstr "no s'han trobat les plantilles %s" +msgstr "no s'ha trobat el reemplaรงament %s per a %s" -#: sha1-file.c:1595 -#, fuzzy, c-format +#: sha1-file.c:1649 +#, c-format msgid "loose object %s (stored in %s) is corrupt" -msgstr "l'objecte local %s รฉs malmรจs" +msgstr "l'objecte solt %s (emmagatzemat a %s) รฉs corrupte" -#: sha1-file.c:1599 -#, fuzzy, c-format +#: sha1-file.c:1653 +#, c-format msgid "packed object %s (stored in %s) is corrupt" -msgstr "l'objecte local %s รฉs malmรจs" +msgstr "l'objecte empaquetat %s (emmagatzemat a %s) รฉs corrupte" -#: sha1-file.c:1702 -#, fuzzy, c-format +#: sha1-file.c:1758 +#, c-format msgid "unable to write file %s" -msgstr "no s'ha pogut escriure %s" +msgstr "no s'ha pogut escriure al fitxer %s" -#: sha1-file.c:1709 -#, fuzzy, c-format +#: sha1-file.c:1765 +#, c-format msgid "unable to set permission to '%s'" -msgstr "no s'ha pogut resoldre la revisiรณ: %s" +msgstr "no s'ha pogut establir el permรญs a ยซ%sยป" -#: sha1-file.c:1716 -#, fuzzy +#: sha1-file.c:1772 msgid "file write error" -msgstr "escriptura fallada al rev-list" +msgstr "s'ha produรฏt un error en escriure al fitxer" -#: sha1-file.c:1735 -#, fuzzy +#: sha1-file.c:1792 msgid "error when closing loose object file" -msgstr "error en tancar el fitxer de paquet" +msgstr "error en tancar el fitxer d'objecte solt" -#: sha1-file.c:1800 +#: sha1-file.c:1857 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" +"permisos insuficients per a afegir un objecte a la base de dades del dipรฒsit " +"%s" -#: sha1-file.c:1802 -#, fuzzy +#: sha1-file.c:1859 msgid "unable to create temporary file" -msgstr "no s'ha pogut crear un รญndex temporal" +msgstr "no s'ha pogut crear un fitxer temporal" -#: sha1-file.c:1826 -#, fuzzy +#: sha1-file.c:1883 msgid "unable to write loose object file" -msgstr "no s'ha pogut escriure l'objecte de nota" +msgstr "no s'ha pogut escriure el fitxer d'objecte solt" -#: sha1-file.c:1832 -#, fuzzy, c-format +#: sha1-file.c:1889 +#, c-format msgid "unable to deflate new object %s (%d)" -msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" +msgstr "no s'ha pogut desinflar l'object nou %s (%d)" -#: sha1-file.c:1836 -#, fuzzy, c-format +#: sha1-file.c:1893 +#, c-format msgid "deflateEnd on object %s failed (%d)" -msgstr "ha fallat fstat a %s" +msgstr "ha fallat deflateEnd a l'objecte %s(%d)" -#: sha1-file.c:1840 +#: sha1-file.c:1897 #, c-format msgid "confused by unstable object source data for %s" -msgstr "" +msgstr "confรณs per la font de dades inestable de l'objecte per a %s" -#: sha1-file.c:1850 builtin/pack-objects.c:920 +#: sha1-file.c:1907 builtin/pack-objects.c:1086 #, fuzzy, c-format msgid "failed utime() on %s" -msgstr "s'ha produรฏt un error en obrir ยซ%sยป" +msgstr "ha fallat utime() sobre els percentatges" -#: sha1-file.c:1925 +#: sha1-file.c:1984 #, fuzzy, c-format msgid "cannot read object for %s" -msgstr "no es pot llegir l'objecte %s" +msgstr "no es pot llegir l'objecte per un percentatge" -#: sha1-file.c:1965 -#, fuzzy +#: sha1-file.c:2035 msgid "corrupt commit" -msgstr "autor corregit de la comissiรณ" +msgstr "comissiรณ corrupta" -#: sha1-file.c:1973 -#, fuzzy +#: sha1-file.c:2043 msgid "corrupt tag" -msgstr "informa de les etiquetes" +msgstr "etiqueta corrupta" -#: sha1-file.c:2072 +#: sha1-file.c:2143 #, fuzzy, c-format msgid "read error while indexing %s" -msgstr "error en llegir %s" +msgstr "error de lectura mentre s'indexaven els percentatges" -#: sha1-file.c:2075 +#: sha1-file.c:2146 #, fuzzy, c-format msgid "short read while indexing %s" -msgstr "no es pot llegir l'รญndex" +msgstr "lectura curta mentre s'indexen els percentatges" -#: sha1-file.c:2148 sha1-file.c:2157 +#: sha1-file.c:2219 sha1-file.c:2229 #, fuzzy, c-format msgid "%s: failed to insert into database" -msgstr "gpg ha fallat en signar les dades" +msgstr "percentatges no s'han pogut inserir a la base de dades" -#: sha1-file.c:2163 +#: sha1-file.c:2235 #, fuzzy, c-format msgid "%s: unsupported file type" -msgstr "versiรณ d'รญndex no compatible %s" +msgstr "percentatges tipus de fitxer no suportat" -#: sha1-file.c:2187 +#: sha1-file.c:2259 #, fuzzy, c-format msgid "%s is not a valid object" -msgstr "ยซ%sยป no รฉs una terme vร lid" +msgstr "els percentatges no sรณn un objecte vร lid" -#: sha1-file.c:2189 +#: sha1-file.c:2261 #, fuzzy, c-format msgid "%s is not a valid '%s' object" msgstr "%s no รฉs un objecte de ยซ%sยป vร lid" -#: sha1-file.c:2216 builtin/index-pack.c:155 +#: sha1-file.c:2288 builtin/index-pack.c:197 #, c-format msgid "unable to open %s" msgstr "no s'ha pogut obrir %s" -#: sha1-file.c:2406 sha1-file.c:2458 +#: sha1-file.c:2478 sha1-file.c:2531 #, c-format msgid "hash mismatch for %s (expected %s)" -msgstr "" +msgstr "no coincideix la suma per a %s (s'esperava %s)" -#: sha1-file.c:2430 -#, fuzzy, c-format +#: sha1-file.c:2502 +#, c-format msgid "unable to mmap %s" -msgstr "no s'ha pogut obrir %s" +msgstr "no s'ha pogut fer ยซmmapยป %s" -#: sha1-file.c:2435 -#, fuzzy, c-format +#: sha1-file.c:2507 +#, c-format msgid "unable to unpack header of %s" -msgstr "no s'ha pogut actualitzar %s" +msgstr "no s'ha pogut desempaquetar la capรงalera de %s" -#: sha1-file.c:2441 -#, fuzzy, c-format +#: sha1-file.c:2513 +#, c-format msgid "unable to parse header of %s" -msgstr "no s'ha pogut llegir %s" +msgstr "no s'ha pogut analitzar la capรงalera de %s" -#: sha1-file.c:2452 -#, fuzzy, c-format +#: sha1-file.c:2524 +#, c-format msgid "unable to unpack contents of %s" -msgstr "no s'ha pogut analitzar el contacte: %s" +msgstr "no s'han pogut desempaquetar els continguts de %s" -#: sha1-name.c:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "l'SHA1 %s curt รฉs ambigu" -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Els candidats sรณn:" -#: sha1-name.c:800 -#, fuzzy +#: 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" @@ -7049,64 +8191,167 @@ msgstr "" "hexadecimals. Aquestes referรจncies es poden crear per error. Per\n" "exemple,\n" "\n" -" git checkout -b $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" -"on ยซ$brยป รฉs d'alguna manera buida i una referรจncia de 40 carร cters\n" +"on ยซ$brยป รฉs buida per algun motiu i es crea 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ยป" +#: sha1-name.c:916 +#, fuzzy, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "log per ยซ%.*sยป nomรฉs retorna als percentatges" + +#: sha1-name.c:924 +#, fuzzy, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "log per a ยซ%.*sยป nomรฉs tรฉ entrades per cent" + +#: sha1-name.c:1702 +#, fuzzy, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "el camรญ ยซ%sยป existeix al disc perรฒ no a ยซ%.*sยป" + +#: sha1-name.c:1708 +#, fuzzy, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" +"path '%s' existeix perรฒ no insinuacions '%s' vol dir '%.*s%s' aka '%.*s./%s'?" + +#: sha1-name.c:1717 +#, fuzzy, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "el camรญ ยซ%sยป no existeix en ยซ%.*sยป" + +#: sha1-name.c:1745 +#, fuzzy, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" +"La ruta \"%s\" estร en l'รญndex perรฒ no en la indicaciรณ de l'etapa per cent." + +#: sha1-name.c:1761 +#, fuzzy, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" +"el camรญ '%s' estร en l'รญndex perรฒ no en la indicaciรณ '%s' vol dir '%ds' aka " +"'%d./%s'?" + +#: sha1-name.c:1769 +#, fuzzy, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "el camรญ ยซ%ยป existeix al disc perรฒ no a l'รญndex" + +#: sha1-name.c:1771 +#, fuzzy, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "el camรญ ยซ%sยป no existeix (ni al disc ni a l'รญndex)" + +#: sha1-name.c:1784 +#, fuzzy +msgid "relative path syntax can't be used outside working tree" +msgstr "" +"la sintaxi relativa del camรญ no es pot utilitzar fora de l'arbre de treball" + +#: sha1-name.c:1922 +#, fuzzy, c-format +msgid "invalid object name '%.*s'." +msgstr "nom d'objecte no vร lid ยซ%.*sยป." + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:848 #, c-format msgid "%u.%2.2u GiB" -msgstr "" +msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB/s" -msgstr "" +msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u MiB" -msgstr "" +msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB/s" -msgstr "" +msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:867 #, c-format msgid "%u.%2.2u KiB" -msgstr "" +msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB/s" -msgstr "" +msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 -#, fuzzy, c-format +#: strbuf.c:875 +#, 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:850 -#, fuzzy, c-format +#: strbuf.c:877 +#, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" -msgstr[0] "octets" -msgstr[1] "octets" +msgstr[0] "%u byte/s" +msgstr[1] "%u bytes/s" + +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" +msgstr "no s'ha pogut obrir ยซ%sยป per a escriptura" + +#: strbuf.c:1175 +#, c-format +msgid "could not edit '%s'" +msgstr "no s'ha pogut editar ยซ%sยป" + +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "s'estร ignorant el nom de submรฒdul sospitรณs %s" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "no es permeten els valors negatius a submodule.fetchjobs" + +#: submodule-config.c:402 +#, fuzzy, c-format +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgstr "" +"ignorant \"%s\" que poden interpretar-se com una opciรณ de lรญnia d'ordres per " +"cent" + +#: submodule-config.c:499 +#, c-format +msgid "invalid value for %s" +msgstr "valor no vร lid per a %s" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s" #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" @@ -7138,51 +8383,128 @@ msgstr "al submรฒdul sense popular ยซ%sยป" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "L'especificaciรณ ยซ%sยป รฉs en el submรฒdul ยซ%.*sยป" -#: submodule.c:910 +#: submodule.c:434 +#, fuzzy, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "argument incorrecte --ignore-submodules percentatges" + +#: submodule.c:816 +#, fuzzy, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" +"El submรฒdul en ยซcommit%sยป al camรญ ยซ%sยป colยทlideix amb un submรฒdul anomenat " +"el mateix. Ometent-lo." + +#: submodule.c:919 #, c-format 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:1989 +#: submodule.c:1004 +#, c-format +msgid "" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" +msgstr "" +"No s'ha pogut executar l'ordre ยซgit rev-list <commits> --not --remotes -n 1ยป " +"en el submรฒdul %s" + +#: submodule.c:1127 +#, fuzzy, c-format +msgid "process for submodule '%s' failed" +msgstr "ha fallat el procรฉs per al submรฒdul ยซ%sยป" + +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 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 +#: submodule.c:1167 #, fuzzy, c-format -msgid "Could not access submodule '%s'" -msgstr "s'ha produรฏt un error en cercar recursivament al camรญ de submรฒdul ยซ%sยป" +msgid "Pushing submodule '%s'\n" +msgstr "Subjecting submodule '%s'" + +#: submodule.c:1170 +#, fuzzy, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "No s'ha pogut prรฉmer el submรฒdul ยซ%sยป" + +#: submodule.c:1462 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "S'estร obtenint el submรฒdul %s%s\n" + +#: submodule.c:1492 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "No s'ha pogut accedir al submรฒdul ยซ%sยป\n" + +#: submodule.c:1646 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"Errors durant l'obtenciรณ de submรฒduls:\n" +"%s" -#: submodule.c:1651 +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" msgstr "ยซ%sยป no reconegut com un dipรฒsit git" -#: submodule.c:1789 +#: submodule.c:1688 +#, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "No s'ha pogut executar ยซgit status --porcelain=2ยป en el submรฒdul %s" + +#: submodule.c:1729 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "ยซgit status --porcelain=2ยป ha fallat en el submรฒdul %s" + +#: submodule.c:1804 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "no s'ha pogut iniciar ยซgit statusยป al submรฒdul ยซ%sยป" -#: submodule.c:1802 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" -msgstr "no s'ha pogut executar 'git status' al submรฒdul ยซ%sยป" +msgstr "no s'ha pogut executar ยซgit statusยป al submรฒdul ยซ%sยป" -#: submodule.c:1817 +#: submodule.c:1832 #, fuzzy, c-format msgid "Could not unset core.worktree setting in submodule '%s'" -msgstr "no s'ha pogut executar 'git status' al submรฒdul ยซ%sยป" +msgstr "No s'ha pogut desassignar el parร metre core.worktree al submรฒdul ยซ%sยป" + +#: submodule.c:1859 submodule.c:2169 +#, 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:1907 +#: submodule.c:1880 +#, fuzzy +msgid "could not reset submodule index" +msgstr "no s'ha pogut restablir l'รญndex del submรฒdul" + +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "el submรฒdul ยซ%sยป tรฉ l'รญndex brut" -#: submodule.c:1959 -#, fuzzy, c-format +#: submodule.c:1974 +#, c-format msgid "Submodule '%s' could not be updated." -msgstr "Submรฒduls canviats perรฒ no actualitzats:" +msgstr "No s'ha pogut actualitzar el submรฒdul ยซ%sยป." -#: submodule.c:2007 +#: submodule.c:2042 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "submodule git dir ยซ%sยป estร dins git dir ยซ%.*sยป" + +#: submodule.c:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7190,12 +8512,17 @@ msgstr "" "no estร admรจs relocate_gitdir per al submรฒdul ยซ%sยป amb mรฉs d'un arbre de " "treball" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no s'ha trobat el nom pel submรฒdul ยซ%sยป" -#: submodule.c:2026 +#: submodule.c:2079 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "s'ha refusat moure ยซ%sยป a un directori git existent" + +#: submodule.c:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7206,379 +8533,376 @@ msgstr "" "ยซ%sยป a\n" "ยซ%sยป\n" -#: 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:2153 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "no s'ha pogut iniciar ls-files a .." -#: submodule.c:2192 +#: submodule.c:2254 #, 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:232 -#, fuzzy, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "s'estร ignorant la referรจncia amb nom malmรจs %s" - -#: 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:397 -#, c-format -msgid "ignoring '%s' which may be interpreted as a command-line option: %s" -msgstr "" - -#: submodule-config.c:486 -#, c-format -msgid "invalid value for %s" -msgstr "valor no vร lid per a %s" - -#: submodule-config.c:755 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s" - -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "l'execuciรณ de l'ordre de remolc ยซ%sยป ha fallat" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valor desconegut ยซ%sยป per a la clau ยซ%sยป" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "mรฉs d'un %s" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" -msgstr "testimoni de remolc buit en el remolc '%.*s'" +msgstr "testimoni de remolc buit en el remolc ยซ%.*sยป" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "no s'ha pogut llegir el fitxer d'entrada ยซ%sยป" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "no s'ha pogut llegir des de stdin" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "no s'ha pogut fer stat a %s" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "el fitxer %s no รฉs un fitxer regular" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "el fitxer %s no รฉs gravable per l'usuari" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "no s'ha pogut obrir el fitxer temporal" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s" -#: transport.c:116 -#, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "Canviaria la font de ยซ%sยป a ยซ%sยป de ยซ%sยป\n" - -#: transport.c:142 -#, fuzzy, c-format -msgid "could not read bundle '%s'" -msgstr "no s'ha pogut llegir el fitxer ยซ%sยป" - -#: transport.c:208 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "transport: opciรณ de profunditat no vร lida ยซ%sยป" - -#: transport.c:259 -msgid "see protocol.version in 'git help config' for more details" -msgstr "" - -#: transport.c:260 -msgid "server options require protocol version 2 or later" -msgstr "" - -#: transport.c:625 -#, fuzzy -msgid "could not parse transport.color.* config" -msgstr "no s'ha pogut analitzar l'script d'autor" - -#: transport.c:698 -msgid "support for protocol v2 not implemented yet" -msgstr "" - -#: transport.c:825 -#, fuzzy, c-format -msgid "unknown value for config '%s': %s" -msgstr "valor desconegut ยซ%sยป per a la clau ยซ%sยป" - -#: transport.c:891 -#, fuzzy, c-format -msgid "transport '%s' not allowed" -msgstr "no s'ha trobat la branca ยซ%sยป." - -#: transport.c:945 -msgid "git-over-rsync is no longer supported" -msgstr "" - -#: transport.c:1040 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "" -"Els camins de submรฒdul segรผents contenen canvis que no\n" -"es poden trobar en cap remot:\n" - -#: transport.c:1044 -#, 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" -"Intenteu\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"o canviar de directori al camรญ i useu\n" -"\n" -"\tgit push\n" -"\n" -"per a pujar-los a un remot.\n" - -#: transport.c:1052 -msgid "Aborting." -msgstr "S'estร avortant." - -#: 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:1340 transport-helper.c:645 -#, fuzzy -msgid "operation not supported by protocol" -msgstr "opciรณ no admesa amb --recurse-submodules." - -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:62 transport-helper.c:91 #, fuzzy msgid "full write to remote helper failed" -msgstr "imprimeix l'estat des de l'ajudant remot" +msgstr "l'escriptura completa a l'ajudant remot ha fallat" -#: transport-helper.c:134 -#, fuzzy, c-format +#: transport-helper.c:145 +#, c-format msgid "unable to find remote helper for '%s'" -msgstr "No s'ha pogut afegir el resultat de fusiรณ per a ยซ%sยป" +msgstr "no s'ha pogut trobar l'ajudant remot per a ยซ%sยป" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:161 transport-helper.c:575 +#, fuzzy msgid "can't dup helper output fd" -msgstr "" +msgstr "no es pot duplicar la sortida de l'ajudant ยซfdยป" -#: transport-helper.c:201 -#, c-format +#: transport-helper.c:214 +#, fuzzy, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "" +"capacitat obligatรฒria desconeguda; aquest ajudant remot probablement " +"necessita una versiรณ mรฉs nova del Git" -#: transport-helper.c:207 +#: transport-helper.c:220 +#, fuzzy msgid "this remote helper should implement refspec capability" -msgstr "" +msgstr "aquest ajudant remot ha d'implementar la capacitat de refspec" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:287 transport-helper.c:429 #, fuzzy, c-format msgid "%s unexpectedly said: '%s'" -msgstr "blob esperat per a %s ยซ%sยป" +msgstr "deien inesperadament \"%s\"" -#: transport-helper.c:403 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "%s tambรฉ ha bloquejat %s" -#: transport-helper.c:481 -#, fuzzy +#: transport-helper.c:497 msgid "couldn't run fast-import" -msgstr "no s'ha pogut executar ยซstashยป." +msgstr "no s'ha pogut executar ยซfast-importยป" -#: transport-helper.c:504 +#: transport-helper.c:520 #, fuzzy msgid "error while running fast-import" -msgstr "error en tancar el fitxer de paquet" +msgstr "error en executar la importaciรณ rร pida" -#: transport-helper.c:533 transport-helper.c:1105 -#, fuzzy, c-format +#: transport-helper.c:549 transport-helper.c:1226 +#, 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:578 +#: transport-helper.c:594 #, fuzzy, c-format msgid "unknown response to connect: %s" -msgstr "opciรณ desconeguda: %s\n" +msgstr "resposta desconeguda per connectar els percentatges" -#: transport-helper.c:600 +#: transport-helper.c:616 +#, fuzzy msgid "setting remote service path not supported by protocol" -msgstr "" +msgstr "el protocol no permet establir el camรญ del servei remot" -#: transport-helper.c:602 +#: transport-helper.c:618 #, fuzzy msgid "invalid remote service path" -msgstr "referรจncia no vร lida: %s" +msgstr "el camรญ del servei remot no รฉs vร lid" -#: transport-helper.c:648 +#: transport-helper.c:661 transport.c:1428 +msgid "operation not supported by protocol" +msgstr "opciรณ no admesa pel protocol" + +#: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" +msgstr "no es pot connectar al subservei %s" + +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" msgstr "" -#: transport-helper.c:720 +#: transport-helper.c:788 #, fuzzy, c-format msgid "expected ok/error, helper said '%s'" -msgstr "blob esperat per a %s ยซ%sยป" +msgstr "s'esperava un ajudant d'error/OK ha dit \"%s\"" -#: transport-helper.c:773 +#: transport-helper.c:841 #, fuzzy, c-format msgid "helper reported unexpected status of %s" -msgstr "ls-tree ha retornat un codi de retorn %d no esperat" +msgstr "l'ajudant ha informat d'un estat inesperat dels percentatges" -#: transport-helper.c:834 +#: transport-helper.c:924 #, fuzzy, c-format msgid "helper %s does not support dry-run" -msgstr "El servidor no admet --deepen" +msgstr "els ajudants no donen suport a l'execuciรณ seca" -#: transport-helper.c:837 +#: transport-helper.c:927 #, fuzzy, c-format msgid "helper %s does not support --signed" -msgstr "El servidor no admet --shallow-since" +msgstr "els ajudants per cents no sรณn compatibles --signed" -#: transport-helper.c:840 +#: transport-helper.c:930 #, fuzzy, c-format msgid "helper %s does not support --signed=if-asked" -msgstr "el destรญ receptor no admet pujar --signed" +msgstr "l'ajudant per cents no admet --signed=if-asked" + +#: transport-helper.c:935 +#, fuzzy, c-format +msgid "helper %s does not support --atomic" +msgstr "els ajudants no admeten --atomic" -#: transport-helper.c:847 +#: transport-helper.c:941 #, fuzzy, c-format msgid "helper %s does not support 'push-option'" -msgstr "el destรญ receptor no admet opcions de pujada" +msgstr "els ajudants no donen suport a ยซpush-optionยป" -#: transport-helper.c:945 +#: transport-helper.c:1040 +#, fuzzy msgid "remote-helper doesn't support push; refspec needed" msgstr "" +"remot-helper no permet prรฉmer; es necessiten especificacions de referรจncia" -#: transport-helper.c:950 +#: transport-helper.c:1045 #, fuzzy, c-format msgid "helper %s does not support 'force'" -msgstr "El servidor no admet --deepen" +msgstr "els ajudants no donen suport a ยซforceยป" -#: transport-helper.c:997 +#: transport-helper.c:1092 #, fuzzy msgid "couldn't run fast-export" -msgstr "no s'ha pogut executar ยซstashยป." +msgstr "no s'ha pogut executar ยซfast-exportยป" -#: transport-helper.c:1002 +#: transport-helper.c:1097 #, fuzzy msgid "error while running fast-export" -msgstr "error en tancar el fitxer de paquet" +msgstr "error en executar l'exportaciรณ rร pida" -#: transport-helper.c:1027 -#, c-format +#: transport-helper.c:1122 +#, fuzzy, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" msgstr "" +"No hi ha referรจncies en comรบ i no n'hi ha cap especificat. Potser haurรญeu " +"d'especificar una branca com ara ยซmasterยป." -#: transport-helper.c:1091 +#: transport-helper.c:1203 +#, fuzzy, c-format +msgid "unsupported object format '%s'" +msgstr "objecte mal format a ยซ%sยป" + +#: transport-helper.c:1212 #, fuzzy, c-format msgid "malformed response in ref list: %s" -msgstr "full d'opcions mal format: ยซ%sยป" +msgstr "resposta mal formada en la llista de referรจncies" -#: transport-helper.c:1244 +#: transport-helper.c:1364 #, fuzzy, c-format msgid "read(%s) failed" -msgstr "%s ha fallat" +msgstr "ha fallat read(%)" -#: transport-helper.c:1271 +#: transport-helper.c:1391 #, fuzzy, c-format msgid "write(%s) failed" -msgstr "%s ha fallat" +msgstr "ha fallat write(%)" -#: transport-helper.c:1320 +#: transport-helper.c:1440 #, fuzzy, c-format msgid "%s thread failed" -msgstr "%s ha fallat" +msgstr "ha fallat el fil per cents" -#: transport-helper.c:1324 +#: transport-helper.c:1444 #, fuzzy, c-format msgid "%s thread failed to join: %s" -msgstr "s'ha produรฏt un error en obrir ยซ%sยป" +msgstr "el fil per cents no s'ha pogut unir als percentatges" -#: transport-helper.c:1343 transport-helper.c:1347 -#, c-format +#: transport-helper.c:1463 transport-helper.c:1467 +#, fuzzy, c-format msgid "can't start thread for copying data: %s" -msgstr "" +msgstr "no es pot iniciar el fil per copiar dades per cent" -#: transport-helper.c:1384 -#, c-format +#: transport-helper.c:1504 +#, fuzzy, c-format msgid "%s process failed to wait" -msgstr "" +msgstr "el procรฉs de percentatges no ha pogut esperar" -#: transport-helper.c:1388 +#: transport-helper.c:1508 #, fuzzy, c-format msgid "%s process failed" -msgstr "%s ha fallat" +msgstr "el procรฉs de percentatges ha fallat" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1526 transport-helper.c:1535 +#, fuzzy msgid "can't start thread for copying data" +msgstr "no es pot iniciar el fil per copiar dades" + +#: transport.c:116 +#, c-format +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 +#, fuzzy, c-format +msgid "could not read bundle '%s'" +msgstr "no s'ha pogut llegir el paquet ยซ%sยป" + +#: transport.c:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport: opciรณ de profunditat no vร lida ยซ%sยป" + +#: transport.c:269 +#, fuzzy +msgid "see protocol.version in 'git help config' for more details" +msgstr "vegeu protocol.version a ยซgit help configยป per a mรฉs detalls" + +#: transport.c:270 +#, fuzzy +msgid "server options require protocol version 2 or later" +msgstr "les opcions del servidor requereixen el protocol versiรณ 2 o posterior" + +#: transport.c:712 +#, fuzzy +msgid "could not parse transport.color.* config" +msgstr "no s'ha pogut analitzar la configuraciรณ de transport.color.*" + +#: transport.c:785 +#, fuzzy +msgid "support for protocol v2 not implemented yet" +msgstr "encara no s'ha implementat la implementaciรณ del protocol v2" + +#: transport.c:919 +#, fuzzy, c-format +msgid "unknown value for config '%s': %s" +msgstr "valor desconegut per config ยซ%sยป%s" + +#: transport.c:985 +#, c-format +msgid "transport '%s' not allowed" +msgstr "no es permet el transport ยซ%sยป" + +#: transport.c:1038 +#, fuzzy +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync ja no รฉs compatible" + +#: transport.c:1140 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"Els camins de submรฒdul segรผents contenen canvis que no\n" +"es poden trobar en cap remot:\n" + +#: transport.c:1144 +#, 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" +"Intenteu\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"o canviar de directori al camรญ i useu\n" +"\n" +"\tgit push\n" +"\n" +"per a pujar-los a un remot.\n" + +#: transport.c:1152 +msgid "Aborting." +msgstr "S'estร avortant." -#: tree-walk.c:33 +#: transport.c:1297 +#, fuzzy +msgid "failed to push all needed submodules" +msgstr "no s'ha pogut prรฉmer tots els submรฒduls necessaris" + +#: tree-walk.c:32 msgid "too-short tree object" msgstr "objecte d'arbre massa curt" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "mode mal format en entrada d'arbre" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "nom de fitxer buit en una entrada d'arbre" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "fitxer d'arbre massa curt" -#: unpack-trees.c:111 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7588,7 +8912,7 @@ msgstr "" "agafar:\n" "%%sCometeu els vostres canvis o feu ยซstashยป abans de canviar de branca." -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7598,7 +8922,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7608,7 +8932,7 @@ msgstr "" "fusionar:\n" "%%sCometeu els vostres canvis o feu ยซstashยป abans de fusionar." -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7618,7 +8942,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7627,7 +8951,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:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7636,7 +8960,7 @@ msgstr "" "Els vostres canvis locals als fitxers segรผents se sobreescriurien per %s:\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7645,7 +8969,7 @@ msgstr "" "En actualitzar els directoris segรผents perdria fitxers no seguits en el:\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7655,7 +8979,7 @@ msgstr "" "agafar:\n" "%%sMoveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7665,7 +8989,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7675,7 +8999,7 @@ msgstr "" "fusionar:\n" "%%sMoveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7685,7 +9009,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7694,7 +9018,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:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7703,7 +9027,7 @@ msgstr "" "Els segรผents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7714,7 +9038,7 @@ msgstr "" "agafar:\n" "%%sMoveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7725,7 +9049,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7735,7 +9059,7 @@ msgstr "" "fusionar:\n" "%%sMoveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7745,7 +9069,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7755,7 +9079,7 @@ msgstr "" "%s:\n" "%%sMoveu-los o elimineu-los abans de %s." -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7765,72 +9089,85 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrada ยซ%sยป encavalca amb ยซ%sยป. No es pot vincular." -#: unpack-trees.c:173 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -"No es pot actualitzar l'agafament parcial: les entrades segรผents no estan al " -"dia:\n" +"No es pot actualitzar el submรฒdul:\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"Els fitxers segรผents en l'arbre de treball se sobreescriurien per " -"actualitzar l'agafament parcial:\n" -"%s" -#: unpack-trees.c:177 -#, c-format +#: unpack-trees.c:180 +#, fuzzy, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"Els fitxers segรผents en l'arbre de treball s'eliminarien per actualitzar " -"l'agafament parcial:\n" -"%s" +"Els camins segรผents s'ignoren per un dels vostres fitxers .gitignore:\n" -#: unpack-trees.c:179 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"No es pot actualitzar el submรฒdul:\n" -"%s" -#: unpack-trees.c:256 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "S'estร avortant\n" -#: unpack-trees.c:318 -#, fuzzy -msgid "Updating files" -msgstr "S'estร actualitzant %s" +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" #: unpack-trees.c:350 +msgid "Updating files" +msgstr "S'estan actualitzant els fitxers" + +#: unpack-trees.c:382 +#, fuzzy 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 "" +"els camins segรผents han xocat (p. ex. camins sensibles a majรบscules i " +"minรบscules en un sistema de fitxers que no distingeix entre majรบscules i " +"minรบscules) i nomรฉs un del mateix grup de colยทlisiรณ es troba a l'arbre de " +"treball" + +#: unpack-trees.c:1498 +#, fuzzy +msgid "Updating index flags" +msgstr "Actualitzant els indicadors dโรญndex" + +#: upload-pack.c:1516 +#, fuzzy +msgid "expected flush after fetch arguments" +msgstr "s'esperava una neteja desprรฉs de les capacitats" #: 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 '://'" +msgstr "l'esquema d'URL no รฉs vร lid o li manca el sufix ยซ://ยป" #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 #, c-format @@ -7839,11 +9176,11 @@ msgstr "seqรผรจncia d'escapament %XX no vร lida" #: urlmatch.c:215 msgid "missing host and scheme is not 'file:'" -msgstr "manca la mร quina i l'esquema no รฉs 'file:'" +msgstr "manca la mร quina i l'esquema no รฉs ยซfile:ยป" #: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" -msgstr "un URL 'file:' no pot tenir nรบmero de port" +msgstr "un URL ยซfile:ยป no pot tenir nรบmero de port" #: urlmatch.c:247 msgid "invalid characters in host name" @@ -7855,49 +9192,97 @@ msgstr "nรบmero de port no vร lid" #: urlmatch.c:371 msgid "invalid '..' path segment" -msgstr "segment de camรญ '..' no vร lid" +msgstr "segment de camรญ ยซ..ยป no vร lid" -#: worktree.c:258 builtin/am.c:2095 +#: walker.c:170 +#, fuzzy +msgid "Fetching objects" +msgstr "Obtenint objectes" + +#: worktree.c:236 builtin/am.c:2116 #, c-format msgid "failed to read '%s'" msgstr "s'ha produรฏt un error en llegir ยซ%sยป" -#: worktree.c:304 -#, c-format +#: worktree.c:283 +#, fuzzy, c-format msgid "'%s' at main working tree is not the repository directory" -msgstr "" +msgstr "'%s' a l'arbre de treball principal no รฉs el directori del repositori" -#: worktree.c:315 -#, c-format +#: worktree.c:294 +#, fuzzy, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" +"El fitxer ยซ%sยป no contรฉ el camรญ absolut a la ubicaciรณ de l'arbre de treball" -#: worktree.c:327 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "ยซ%sยป no existeix" -#: worktree.c:333 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "ยซ%sยป no รฉs un fitxer .git, codi d'error %d" -#: worktree.c:341 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "ยซ%sยป no assenyala de tornada a ยซ%sยป" -#: wrapper.c:223 wrapper.c:393 +#: worktree.c:587 +#, fuzzy +msgid "not a directory" +msgstr "no รฉs en un directori git" + +#: worktree.c:596 +#, fuzzy +msgid ".git is not a file" +msgstr "git show %s: fitxer incorrecte" + +#: worktree.c:598 +msgid ".git file broken" +msgstr "" + +#: worktree.c:600 +#, fuzzy +msgid ".git file incorrect" +msgstr "fitxer d'รญndex malmรจs" + +#: worktree.c:670 +#, fuzzy +msgid "not a valid path" +msgstr "%s: no รฉs un OID vร lid" + +#: worktree.c:676 +#, fuzzy +msgid "unable to locate repository; .git is not a file" +msgstr "no s'ha pogut crear un fitxer temporal" + +#: worktree.c:679 +#, fuzzy +msgid "unable to locate repository; .git file broken" +msgstr "no s'ha pogut crear un fitxer temporal" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "" + +#: wrapper.c:197 wrapper.c:367 #, 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:424 wrapper.c:624 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "no s'ha pogut accedir a ยซ%sยป" -#: wrapper.c:632 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "no s'ha pogut obtenir el directori de treball actual" @@ -7908,54 +9293,54 @@ msgstr "Camins sense fusionar:" #: wt-status.c:187 wt-status.c:219 #, fuzzy msgid " (use \"git restore --staged <file>...\" to unstage)" -msgstr " (useu \"git reset %s <fitxer>...\" per a fer ยซunstageยป)" +msgstr "(useu \"git restitution --staged <file>\" per a unstage)" #: wt-status.c:190 wt-status.c:222 #, fuzzy, c-format msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" -msgstr " (useu \"git reset %s <fitxer>...\" per a fer ยซunstageยป)" +msgstr "(useu \"git restitution --source=%s --staged <file>\" per a unstage)" #: wt-status.c:193 wt-status.c:225 msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " (useu \"git rm --cached <fitxer>...\" per a fer ยซunstageยป)" +msgstr " (useu ยซgit rm --cached <fitxer>...ยป per a fer ยซunstageยป)" #: wt-status.c:197 msgid " (use \"git add <file>...\" to mark resolution)" -msgstr " (useu \"git add <fitxer>...\" per a senyalar resoluciรณ)" +msgstr " (useu ยซgit add <fitxer>...ยป per a senyalar resoluciรณ)" #: wt-status.c:199 wt-status.c:203 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -" (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar " +" (useu ยซgit add/rm <fitxer>...ยป segons sigui apropiat per a senyalar " "resoluciรณ)" #: wt-status.c:201 msgid " (use \"git rm <file>...\" to mark resolution)" -msgstr " (useu \"git rm <fitxer>...\" per a senyalar resoluciรณ)" +msgstr " (useu ยซgit rm <fitxer>...ยป per a senyalar resoluciรณ)" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "Canvis a cometre:" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "Canvis no ยซstagedยป per a cometre:" #: wt-status.c:238 msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr " (useu \"git add <fitxer>...\" per a actualitzar quรจ es cometrร )" +msgstr " (useu ยซgit add <fitxer>...ยป per a actualitzar quรจ es cometrร )" #: wt-status.c:240 msgid " (use \"git add/rm <file>...\" to update what will be committed)" -msgstr " (useu \"git add/rm <fitxer>...\" per a actualitzar quรจ es cometrร )" +msgstr " (useu ยซgit add/rm <fitxer>...ยป per a actualitzar quรจ es cometrร )" #: wt-status.c:241 #, fuzzy msgid "" " (use \"git restore <file>...\" to discard changes in working directory)" msgstr "" -" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el " -"directori de treball)" +"(useu \"git restore <file>\" per descartar els canvis en el directori de " +"treball)" #: wt-status.c:243 msgid " (commit or discard the untracked or modified content in submodules)" @@ -7965,214 +9350,215 @@ msgstr "" #: wt-status.c:254 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en el que es cometrร )" +msgstr " (useu ยซgit %s <fitxer>...ยป per a incloure-ho en la comissiรณ)" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "suprimit per ambdรณs:" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "afegit per nosaltres:" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "suprimit per ells:" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "afegit per ells:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "suprimit per nosaltres:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "afegit per ambdรณs:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "modificat per ambdรณs:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "fitxer nou:" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "copiat:" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "suprimit:" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "modificat:" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "canviat de nom:" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "canviat de tipus:" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "desconegut:" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "sense fusionar:" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "comissions noves, " -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "contingut modificat, " -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "contingut no seguit, " -#: wt-status.c:906 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "L'ยซstashยป tรฉ actualment %d entrada" msgstr[1] "L'ยซstashยป tรฉ actualment %d entrades" -#: wt-status.c:938 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "Submรฒduls canviats perรฒ no actualitzats:" -#: wt-status.c:940 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "Canvis de submรฒdul a cometre:" -#: wt-status.c:1022 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -"No modifiqueu o suprimiu la lรญnia de dalt.\n" +"No modifiqueu ni elimineu la lรญnia de dalt.\n" "Tot el que hi ha a sota s'ignorarร ." -#: wt-status.c:1114 -#, c-format +#: wt-status.c:1110 +#, fuzzy, 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 "" +"S'ha trigat un 2%f segons a calcular la branca endavant/darrere dels valors. " +"Podeu utilitzar ยซ--no-perhead-behindยป per evitar-ho." -#: wt-status.c:1144 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "Teniu camins sense fusionar." -#: wt-status.c:1147 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" -msgstr " (arregleu els conflictes i executeu \"git commit\")" +msgstr " (arregleu els conflictes i executeu ยซgit commitยป)" -#: wt-status.c:1149 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" -msgstr " (useu \"git merge --abort\" per a avortar la fusiรณ)" +msgstr " (useu ยซgit merge --abortยป per a avortar la fusiรณ)" -#: wt-status.c:1153 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "Tots els conflictes estan arreglats perรฒ encara esteu fusionant." -#: wt-status.c:1156 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" -msgstr " (useu \"git commit\" per a concloure la fusiรณ)" +msgstr " (useu ยซgit commitยป per a concloure la fusiรณ)" -#: wt-status.c:1165 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "Esteu enmig d'una sessiรณ am." -#: wt-status.c:1168 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "El pedaรง actual estร buit." -#: wt-status.c:1172 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" -msgstr " (arregleu els conflictes i desprรฉs executeu \"git am --continue\")" +msgstr " (arregleu els conflictes i desprรฉs executeu ยซgit am --continueยป)" -#: wt-status.c:1174 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" -msgstr " (useu \"git am --skip\" per a ometre aquest pedaรง)" +msgstr " (useu ยซgit am --skipยป per a ometre aquest pedaรง)" -#: wt-status.c:1176 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" -msgstr " (useu \"git am --abort\" per a restaurar la branca original)" +msgstr " (useu ยซgit am --abortยป per a restaurar la branca original)" -#: wt-status.c:1309 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "Manca git-rebase-todo." -#: wt-status.c:1311 +#: wt-status.c:1307 msgid "No commands done." msgstr "No s'ha fet cap ordre." -#: wt-status.c:1314 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "รltima ordre feta (%d ordre feta):" msgstr[1] "รltimes ordres fetes (%d ordres fetes):" -#: wt-status.c:1325 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " (vegeu mรฉs en el fitxer %s)" -#: wt-status.c:1330 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "No manca cap ordre." -#: wt-status.c:1333 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Ordre segรผent a fer (manca %d ordre):" msgstr[1] "Ordres segรผents a fer (manquen %d ordres):" -#: wt-status.c:1341 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" -msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)" +msgstr " (useu ยซgit rebase --edit-todoยป per a veure i editar)" -#: wt-status.c:1353 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Actualment esteu fent ยซrebaseยป de la branca ยซ%sยป en ยซ%sยป." -#: wt-status.c:1358 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "Actualment esteu fent ยซrebaseยป." -#: wt-status.c:1371 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" -msgstr "" -" (arregleu els conflictes i desprรฉs executeu \"git rebase --continue\")" +msgstr " (arregleu els conflictes i desprรฉs executeu ยซgit rebase --continueยป)" -#: wt-status.c:1373 +#: wt-status.c:1369 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 +#: wt-status.c:1371 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 +#: wt-status.c:1378 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 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -8180,97 +9566,100 @@ msgstr "" "Actualment esteu dividint una comissiรณ mentre es fa ยซrebaseยป de la branca " "ยซ%sยป en ยซ%sยป." -#: wt-status.c:1391 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "Actualment esteu dividint una comissiรณ durant un ยซrebaseยป." -#: wt-status.c:1394 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -" (Una vegada que el vostre directori de treball sigui net, executeu \"git " -"rebase --continue\")" +" (Una vegada que el vostre directori de treball sigui net, executeu ยซgit " +"rebase --continueยป)" -#: wt-status.c:1398 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Actualment esteu editant una comissiรณ mentre es fa ยซrebaseยป de la branca " "ยซ%sยป en ยซ%sยป." -#: wt-status.c:1403 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "Actualment esteu editant una comissiรณ durant un ยซrebaseยป." -#: wt-status.c:1406 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" -msgstr " (useu \"git commit --amend\" per a esmenar la comissiรณ actual)" +msgstr " (useu ยซgit commit --amendยป per a esmenar la comissiรณ actual)" -#: wt-status.c:1408 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -" (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els " +" (useu ยซgit rebase --continueยป una vegada que estigueu satisfet amb els " "vostres canvis)" -#: wt-status.c:1419 -#, fuzzy +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." -msgstr "ni hi ha cap ยซcherry pickยป ni cap reversiรณ en curs" +msgstr "Hi ha ยซcherry pickยป actualment en curs." -#: wt-status.c:1422 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Actualment esteu fent ยซcherry pickยป a la comissiรณ %s." -#: wt-status.c:1429 +#: wt-status.c:1425 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 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" -msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" +msgstr " (executeu ยซgit cherry-pick --continueยป per a continuar)" -#: wt-status.c:1435 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -" (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue" -"\")" +" (tots els conflictes estan arreglats: executeu ยซgit cherry-pick --" +"continueยป)" + +#: wt-status.c:1433 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (useu ยซgit cherry-pick --skipยป per a ometre aquest pedaรง)" -#: wt-status.c:1437 +#: wt-status.c:1435 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 " +" (useu ยซgit cherry-pick --abortยป per a cancelยทlar l'operaciรณ de ยซcherry " "pickยป)" -#: wt-status.c:1447 -#, fuzzy +#: wt-status.c:1445 msgid "Revert currently in progress." -msgstr "avorta la fusiรณ en curs actual" +msgstr "Una reversiรณ estร actualment en curs." -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "Actualment esteu revertint la comissiรณ %s." -#: wt-status.c:1456 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" -msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" +msgstr " (arregleu els conflictes i executeu ยซgit revert --continueยป)" -#: wt-status.c:1459 -#, fuzzy +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" -msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" +msgstr " (executeu ยซgit revert --continueยป per a continuar)" -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -" (tots els conflictes estan arreglats: executeu \"git revert --continue\")" +" (tots els conflictes estan arreglats: executeu ยซgit revert --continueยป)" + +#: wt-status.c:1462 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (useu ยซgit revert --skipยป per a ometre aquest pedaรง)" #: 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รณ)" +msgstr " (useu ยซgit revert --abortยป per a cancelยทlar l'operaciรณ de reversiรณ)" #: wt-status.c:1474 #, c-format @@ -8283,271 +9672,286 @@ msgstr "Actualment esteu bisecant." #: 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)" +msgstr " (useu ยซgit bisect resetยป per a tornar a la branca original)" + +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "" -#: wt-status.c:1690 +#: wt-status.c:1731 msgid "On branch " msgstr "En la branca " -#: wt-status.c:1697 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "ยซrebaseยป interactiu en curs; sobre " -#: wt-status.c:1699 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "ยซrebaseยป en curs; sobre " -#: wt-status.c:1709 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "Actualment no s'รฉs en cap branca." -#: wt-status.c:1726 +#: wt-status.c:1767 msgid "Initial commit" msgstr "Comissiรณ inicial" -#: wt-status.c:1727 +#: wt-status.c:1768 msgid "No commits yet" -msgstr "No s'ha fet cap comissiรณ encara." +msgstr "No s'ha fet cap comissiรณ encara" -#: wt-status.c:1741 +#: wt-status.c:1782 msgid "Untracked files" msgstr "Fitxers no seguits" -#: wt-status.c:1743 +#: wt-status.c:1784 msgid "Ignored files" msgstr "Fitxers ignorats" -#: wt-status.c:1747 +#: wt-status.c:1788 #, 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 "" -"Ha trigat %.2f segons enumerar els fitxers no seguits.\n" -"'status -uno' pot accelerar-ho, perรฒ heu d'anar amb compte de no\n" +"S'ha trigat %.2f segons enumerar els fitxers no seguits.\n" +"ยซstatus -unoยป pot accelerar-ho, perรฒ heu d'anar amb compte de no\n" "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n" -"'git help status')." +"ยซgit help statusยป)." -#: wt-status.c:1753 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "Els fitxers no seguits no estan llistats%s" -#: wt-status.c:1755 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr " (useu l'opciรณ -u per a mostrar els fitxers no seguits)" -#: wt-status.c:1761 +#: wt-status.c:1802 msgid "No changes" msgstr "Sense canvis" -#: wt-status.c:1766 +#: wt-status.c:1807 #, 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" +msgstr "no hi ha canvis afegits a cometre (useu ยซgit addยป o ยซgit commit -aยป)\n" -#: wt-status.c:1769 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "no hi ha canvis afegits a cometre\n" -#: wt-status.c:1772 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -"no hi ha res afegit a cometre perรฒ hi ha fitxers no seguits (useu \"git add" -"\" per a seguir-los)\n" +"no hi ha res afegit a cometre perรฒ hi ha fitxers no seguits (useu ยซgit addยป " +"per a seguir-los)\n" -#: wt-status.c:1775 +#: wt-status.c:1819 #, 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:1778 +#: wt-status.c:1823 #, 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-" +"no hi ha res a cometre (creeu/copieu fitxers i useu ยซgit addยป per a seguir-" "los)\n" -#: wt-status.c:1781 wt-status.c:1786 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "no hi ha res a cometre\n" -#: wt-status.c:1784 +#: wt-status.c:1830 #, 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:1788 +#: wt-status.c:1835 #, 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:1901 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "No s'ha fet cap comissiรณ encara a " -#: wt-status.c:1905 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD (sense branca)" -#: wt-status.c:1936 +#: wt-status.c:1975 msgid "different" msgstr "diferent" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "darrere " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "davant per " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no es pot %s: Teniu canvis ยซunstagedยป." -#: wt-status.c:2472 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "addicionalment, el vostre รญndex contรฉ canvis sense cometre." -#: wt-status.c:2474 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no es pot %s: El vostre รญndex contรฉ canvis sense cometre." -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#, c-format +msgid "failed to unlink '%s'" +msgstr "s'ha produรฏt un error en desenllaรงar ยซ%sยป" + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opcions>] [--] <especificaciรณ-de-camรญ>..." -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "estat de diff inesperat %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "s'ha produรฏt un error en actualitzar els fitxers" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "elimina ยซ%sยป\n" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Canvis ยซunstagedยป desprรฉs d'actualitzar l'รญndex:" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:272 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "No s'ha pogut llegir l'รญndex" -#: builtin/add.c:245 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "No s'ha pogut obrir ยซ%sยป per a escriptura." -#: builtin/add.c:249 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "No s'ha pogut escriure el pedaรง" -#: builtin/add.c:252 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "l'ediciรณ del pedaรง ha fallat" -#: builtin/add.c:255 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "No s'ha pogut fer stat a ยซ%sยป" -#: builtin/add.c:257 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "El pedaรง รฉs buit. S'ha avortat." -#: builtin/add.c:262 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "No s'ha pogut aplicar ยซ%sยป" -#: builtin/add.c:270 +#: builtin/add.c:308 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: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 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 msgid "dry run" msgstr "marxa en sec" -#: builtin/add.c:293 +#: builtin/add.c:331 msgid "interactive picking" msgstr "recull interactiu" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" -#: builtin/add.c:295 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "edita la diferรจncia actual i aplica-la" -#: builtin/add.c:296 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "permet afegir fitxers que d'altra manera s'ignoren" -#: builtin/add.c:297 +#: builtin/add.c:335 msgid "update tracked files" msgstr "actualitza els fitxers seguits" -#: builtin/add.c:298 +#: builtin/add.c:336 +#, fuzzy msgid "renormalize EOL of tracked files (implies -u)" -msgstr "" +msgstr "torna a normalitzar EOL dels fitxers seguits (implica -u)" -#: builtin/add.c:299 +#: builtin/add.c:337 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:300 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "afegeix els canvis de tots els fitxers seguits i no seguits" -#: builtin/add.c:303 +#: builtin/add.c:341 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:305 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "no afegeixis, nomรฉs actualitza l'รญndex" -#: builtin/add.c:306 +#: builtin/add.c:344 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:307 +#: builtin/add.c:345 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:309 builtin/update-index.c:1001 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "passa per alt el bit executable dels fitxers llistats" -#: builtin/add.c:311 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "avisa'm quan s'afegeixi un dipรฒsit incrustat" -#: builtin/add.c:326 +#: builtin/add.c:351 +#, fuzzy +msgid "backend for `git stash -p`" +msgstr "backend per a `git stash -p`" + +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8565,164 +9969,198 @@ 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 de\n" +"Els clons de dipรฒsits externs no contindran els continguts\n" "del dipรฒsit incrustat i no sabran com obtenir-ho.\n" "Si volรญeu afegir un submรฒdul, useu:\n" "\n" "\tgit submodule add <url> %s\n" "\n" -"Si heu afegit aquest camรญ per error, podeu suprimir-lo de\n" +"Si heu afegit aquest camรญ per error, podeu eliminar-lo de\n" "l'รญndex amb:\n" "\n" "\tgit rm --cached %s\n" "\n" -"Vegeu \"git help submodule\" per a mรฉs informaciรณ." +"Vegeu ยซgit help submoduleยป per a mรฉs informaciรณ." -#: builtin/add.c:354 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "s'estร afegint un dipรฒsit incrustat: %s" -#: 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:416 +#, fuzzy +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" +msgstr "" +"Utilitzeu -f si realment voleu afegir-los. Desactiveu aquest missatge " +"executant ยซgit config aconsell.addIgnoredFile falseยป" -#: builtin/add.c:379 +#: builtin/add.c:425 msgid "adding files failed" msgstr "l'afegiment de fitxers ha fallat" -#: builtin/add.c:419 +#: builtin/add.c:453 builtin/commit.c:345 +#, fuzzy +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--pathspec-from-file รฉs incompatible amb --interactive/-patch" + +#: builtin/add.c:470 +#, fuzzy +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file รฉs incompatible amb --edit" + +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "-A i -u sรณn mรบtuament incompatibles" -#: builtin/add.c:426 +#: builtin/add.c:485 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:430 +#: builtin/add.c:489 #, 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:445 +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +#, fuzzy +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "--pathspec-from-file รฉs incompatible amb els arguments de ยซpathspecยป" + +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +#, fuzzy +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul requereix --pathspec-from-file" + +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "No s'ha especificat res, no s'ha afegit res.\n" -#: builtin/add.c:446 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Potser volรญeu dir ยซgit add .ยป?\n" +#: builtin/add.c:520 +#, fuzzy +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" +"Potser voleu dir ยซgit add .ยป? Voleu desactivar aquest missatge executant " +"ยซgit config aconsell.addEmptyPathspec falseยป" + +#: builtin/am.c:160 +#, fuzzy, c-format +msgid "invalid committer: %s" +msgstr "comissiรณ no vร lida %s" -#: builtin/am.c:348 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "no s'ha pogut analitzar l'script d'autor" -#: builtin/am.c:432 +#: builtin/am.c:450 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "s'ha suprimit ยซ%sยป pel lligam applypatch-msg" -#: builtin/am.c:474 +#: builtin/am.c:492 #, c-format msgid "Malformed input line: '%s'." msgstr "Lรญnia d'entrada mal formada: ยซ%sยป." -#: builtin/am.c:512 +#: builtin/am.c:530 #, 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:538 +#: builtin/am.c:556 msgid "fseek failed" msgstr "fseek ha fallat" -#: builtin/am.c:726 +#: builtin/am.c:744 #, c-format msgid "could not parse patch '%s'" msgstr "no s'ha pogut analitzar el pedaรง ยซ%sยป" -#: builtin/am.c:791 +#: builtin/am.c:809 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:839 +#: builtin/am.c:857 msgid "invalid timestamp" msgstr "marca de temps no vร lida" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:862 builtin/am.c:874 msgid "invalid Date line" msgstr "lรญnia Date no vร lida" -#: builtin/am.c:851 +#: builtin/am.c:869 msgid "invalid timezone offset" msgstr "desplaรงament de zona de temps no vร lid" -#: builtin/am.c:944 +#: builtin/am.c:962 msgid "Patch format detection failed." msgstr "La detecciรณ de format de pedaรง ha fallat." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:967 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "s'ha produรฏt un error en crear el directori ยซ%sยป" -#: builtin/am.c:954 +#: builtin/am.c:972 msgid "Failed to split patches." msgstr "S'ha produรฏt un error en dividir els pedaรงos." -#: 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 +#: builtin/am.c:1103 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." -msgstr "Quan hร giu resolt aquest problema, executeu \"%s --continue\"." +msgstr "Quan hร giu resolt aquest problema, executeu ยซ%s --continueยป." -#: builtin/am.c:1099 +#: builtin/am.c:1104 #, 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รฒ." +msgstr "Si preferiu ometre aquest pedaรง, executeu ยซ%s --skipยป en lloc d'aixรฒ." -#: builtin/am.c:1100 +#: builtin/am.c:1105 #, 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" -"\"." +"Per a restaurar la branca original i deixar d'apedaรงar, executeu ยซ%s --" +"abortยป." -#: builtin/am.c:1183 +#: builtin/am.c:1188 +#, fuzzy msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" +"Pedaรง enviat amb format=flux; es pot perdre espai al final de les lรญnies." -#: builtin/am.c:1211 +#: builtin/am.c:1216 msgid "Patch is empty." msgstr "El pedaรง estร buit." -#: builtin/am.c:1277 +#: builtin/am.c:1281 +#, fuzzy, c-format +msgid "missing author line in commit %s" +msgstr "manca la lรญnia d'autor a les comissions" + +#: builtin/am.c:1284 #, c-format msgid "invalid ident line: %.*s" msgstr "lรญnia d'identitat no vร lida: %.*s" -#: 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 +#: builtin/am.c:1503 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:1498 +#: builtin/am.c:1505 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:1517 +#: builtin/am.c:1524 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8730,24 +10168,24 @@ msgstr "" "Heu editat el vostre pedaรง a mร ?\n" "No s'aplica als blobs recordats en el seu รญndex." -#: builtin/am.c:1523 +#: builtin/am.c:1530 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:1549 +#: builtin/am.c:1556 msgid "Failed to merge in the changes." msgstr "S'ha produรฏt un error en fusionar els canvis." -#: builtin/am.c:1581 +#: builtin/am.c:1588 msgid "applying to an empty history" msgstr "s'estร aplicant a una histรฒria buida" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1639 builtin/am.c:1643 #, c-format msgid "cannot resume: %s does not exist." msgstr "no es pot reprendre: %s no existeix." -#: builtin/am.c:1650 +#: builtin/am.c:1661 msgid "Commit Body is:" msgstr "El cos de la comissiรณ รฉs:" @@ -8755,47 +10193,52 @@ msgstr "El cos de la comissiรณ รฉs:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1671 #, 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:1710 +#: builtin/am.c:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "no s'ha pogut escriure el fitxer d'รญndex" + +#: builtin/am.c:1721 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "รndex brut: no es poden aplicar pedaรงos (bruts: %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1761 builtin/am.c:1829 #, c-format msgid "Applying: %.*s" msgstr "S'estร aplicant: %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1778 msgid "No changes -- Patch already applied." msgstr "Sense canvis -- El pedaรง ja s'ha aplicat." -#: builtin/am.c:1773 +#: builtin/am.c:1784 #, c-format msgid "Patch failed at %s %.*s" msgstr "El pedaรง ha fallat a %s %.*s" -#: builtin/am.c:1777 -msgid "Use 'git am --show-current-patch' to see the failed patch" -msgstr "" +#: builtin/am.c:1788 +#, fuzzy +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +msgstr "Utilitzeu 'git am --show-current-patch=diff' per veure el pedaรง fallit" -#: builtin/am.c:1821 +#: builtin/am.c:1832 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 "" -"Cap canvi - heu oblidat d'usar 'git add'?\n" +"Cap canvi - heu oblidat d'usar ยซgit addยป?\n" "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:1828 +#: builtin/am.c:1839 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8803,167 +10246,181 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" "Encara teniu camins sense fusionar a l'รญndex.\n" -"Heu de fer 'git add' a cada fitxer amb conflictes resolts per marcar-los com " -"a tal.\n" -"Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel " +"Heu de fer ยซgit addยป a cada fitxer amb conflictes resolts per a marcar-los " +"com a tal.\n" +"Podeu executar ยซgit rmยป en un fitxer per a acceptar ยซsuprimit per ellsยป pel " "fitxer." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "No s'ha pogut analitzar l'objecte ยซ%sยป." -#: builtin/am.c:1987 +#: builtin/am.c:1998 msgid "failed to clean index" msgstr "s'ha produรฏt un error en netejar l'รญndex" -#: builtin/am.c:2031 +#: builtin/am.c:2042 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -"Sembla que heu mogut HEAD desprรฉs de l'รบltima fallada de 'am'.\n" +"Sembla que heu mogut HEAD desprรฉs de l'รบltima fallada de ยซamยป.\n" "No s'estร rebobinant a ORIG_HEAD" -#: builtin/am.c:2128 +#: builtin/am.c:2149 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor no vร lid per a --patch-format: %s" -#: builtin/am.c:2164 +#: builtin/am.c:2191 +#, fuzzy, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "Valor no vร lid per --show-current-patch%s" + +#: builtin/am.c:2195 +#, fuzzy, c-format +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +msgstr "--show-current-patch=%s รฉs incompatible amb --show-current-patch=%s" + +#: builtin/am.c:2226 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opcions>] [(<bรบstia> | <directori-de-correu>)...]" -#: builtin/am.c:2165 +#: builtin/am.c:2227 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opcions>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2233 msgid "run interactively" msgstr "executa interactivament" -#: builtin/am.c:2173 +#: builtin/am.c:2235 msgid "historical option -- no-op" msgstr "opciรณ histรฒrica -- no-op" -#: builtin/am.c:2175 +#: builtin/am.c:2237 msgid "allow fall back on 3way merging if needed" msgstr "permet retrocedir a una fusiรณ de 3 vies si รฉs necessari" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:307 builtin/stash.c:806 +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 msgid "be quiet" msgstr "silenciรณs" -#: builtin/am.c:2178 +#: builtin/am.c:2240 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:2181 +#: builtin/am.c:2243 msgid "recode into utf8 (default)" msgstr "recodifica en utf8 (per defecte)" -#: builtin/am.c:2183 +#: builtin/am.c:2245 msgid "pass -k flag to git-mailinfo" msgstr "passa l'indicador -k a git-mailinfo" -#: builtin/am.c:2185 +#: builtin/am.c:2247 msgid "pass -b flag to git-mailinfo" msgstr "passa l'indicador -b a git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2249 msgid "pass -m flag to git-mailinfo" msgstr "passa l'indicador -m a git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2251 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:2192 +#: builtin/am.c:2254 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:2195 +#: builtin/am.c:2257 msgid "strip everything before a scissors line" msgstr "elimina tot abans d'una lรญnia de tisores" -#: 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 +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 msgid "pass it through git-apply" msgstr "passa-ho a travรฉs de git-apply" -#: 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:141 parse-options.h:162 parse-options.h:312 +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: 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 +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2221 +#: builtin/am.c:2283 msgid "format the patch(es) are in" msgstr "el format en el qual estan els pedaรงos" -#: builtin/am.c:2227 +#: builtin/am.c:2289 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:2229 +#: builtin/am.c:2291 msgid "continue applying patches after resolving a conflict" msgstr "segueix aplicant pedaรงos desprรฉs de resoldre un conflicte" -#: builtin/am.c:2232 +#: builtin/am.c:2294 msgid "synonyms for --continue" msgstr "sinรฒnims de --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2297 msgid "skip the current patch" msgstr "omet el pedaรง actual" -#: builtin/am.c:2238 +#: builtin/am.c:2300 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:2241 +#: builtin/am.c:2303 +#, fuzzy msgid "abort the patching operation but keep HEAD where it is." -msgstr "" +msgstr "avorta l'operaciรณ de pedaรง perรฒ mantรฉ HEAD on รฉs." -#: builtin/am.c:2244 -msgid "show the patch being applied." -msgstr "mostra el pedaรง que s'estร aplicant." +#: builtin/am.c:2307 +#, fuzzy +msgid "show the patch being applied" +msgstr "mostra el pedaรง que s'estร aplicant" -#: builtin/am.c:2248 +#: builtin/am.c:2312 msgid "lie about committer date" msgstr "menteix sobre la data del comitent" -#: builtin/am.c:2250 +#: builtin/am.c:2314 msgid "use current timestamp for author date" msgstr "usa el marc de temps actual per la data d'autor" -#: 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 +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "ID de clau" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 msgid "GPG-sign commits" msgstr "signa les comissions amb GPG" -#: builtin/am.c:2256 +#: builtin/am.c:2320 msgid "(internal use for git-rebase)" msgstr "(รบs intern per a git-rebase)" -#: builtin/am.c:2274 +#: builtin/am.c:2338 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." @@ -8971,33 +10428,34 @@ msgstr "" "Fa molt que l'opciรณ -b/--binary no ha fet res, i\n" "s'eliminarร . No l'useu mรฉs." -#: builtin/am.c:2281 +#: builtin/am.c:2345 msgid "failed to read the index" msgstr "S'ha produรฏt un error en llegir l'รญndex" -#: builtin/am.c:2296 +#: builtin/am.c:2360 #, 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:2320 +#: builtin/am.c:2384 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" "S'ha trobat un directori %s extraviat.\n" -"Useu \"git am --abort\" per a eliminar-lo." +"Useu ยซgit am --abortยป per a eliminar-lo." -#: builtin/am.c:2326 +#: builtin/am.c:2390 msgid "Resolve operation not in progress, we are not resuming." msgstr "Una operaciรณ de resoluciรณ no estร en curs; no reprenem." -#: builtin/am.c:2336 +#: builtin/am.c:2400 +#, fuzzy msgid "interactive mode requires patches on the command line" -msgstr "" +msgstr "el mode interactiu requereix pedaรงos a la lรญnia d'ordres" #: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" @@ -9018,7 +10476,7 @@ msgstr "git archive: Remot sense URL" #: builtin/archive.c:61 msgid "git archive: expected ACK/NAK, got a flush packet" -msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de neteja" +msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de buidatge" #: builtin/archive.c:64 #, c-format @@ -9033,292 +10491,375 @@ msgstr "git archive: error de protocol" msgid "git archive: expected a flush" msgstr "git archive: s'esperava una neteja" -#: builtin/bisect--helper.c:22 -msgid "git bisect--helper --next-all [--no-checkout]" +#: builtin/bisect--helper.c:23 +#, fuzzy +msgid "git bisect--helper --next-all" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:23 +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:25 -#, fuzzy +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-clean-state" +msgstr "git bisect--helper --bisect-reset [<comissiรณ>]" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:27 #, fuzzy msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" -msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>" +msgstr "" +"git bisect--helper --bisect-write [--no-log] <state> <revision> <goodterm> " +"<badterm>" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:28 #, fuzzy msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" -msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>" +msgstr "" +"git bisect--helper --bisect-check-and-set-terms <command> <goodterm> " +"<badterm>" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:29 #, fuzzy msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" -msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>" +msgstr "git bisect--helper --bisect-next-check <goodterm> <badterm> [<term>]" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:30 #, fuzzy msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" msgstr "" -"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." +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-bad | --term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:31 +#, fuzzy msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" +"git bisect--helper --bisect-start [---term-{oldgood}=<term> --term-{newbad}" +"=<term>][--no-checkout] [<bad> [<good>]] [-] [<paths>]" + +#: builtin/bisect--helper.c:33 +#, fuzzy +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-clean-state" + +#: builtin/bisect--helper.c:34 +#, fuzzy +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-clean-state" + +#: builtin/bisect--helper.c:35 +#, fuzzy +msgid "git bisect--helper --bisect-autostart" +msgstr "git bisect--helper --bisect-clean-state" + +#: builtin/bisect--helper.c:97 +#, fuzzy, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "no es pot copiar ยซ%sยป a ยซ%sยป" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:104 +#, fuzzy, c-format +msgid "could not write to file '%s'" +msgstr "no s'ha pogut escriure el fitxer: ยซ%sยป" + +#: builtin/bisect--helper.c:143 #, c-format msgid "'%s' is not a valid term" msgstr "ยซ%sยป no รฉs un terme vร lid" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:147 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "no es pot usar l'ordre interna ยซ%sยป com a terme" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "no es pot canviar el significat del terme ยซ%sยป" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:167 msgid "please use two different terms" msgstr "useu dos termes distintes" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "no s'ha pogut obrir el BISECT_TERMS" - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:207 #, fuzzy, c-format msgid "We are not bisecting.\n" msgstr "No estem bisecant." -#: builtin/bisect--helper.c:163 -#, fuzzy, c-format +#: builtin/bisect--helper.c:215 +#, c-format msgid "'%s' is not a valid commit" -msgstr "ยซ%sยป no รฉs un terme vร lid" +msgstr "ยซ%sยป no รฉs una comissiรณ vร lida" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:224 #, fuzzy, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" -"No s'ha pogut agafar la HEAD original '$branch'.\n" -"Proveu 'git bisect reset <comissiรณ>'." +"no s'ha pogut comprovar l'original HEAD ยซ%sยป. Proveu ยซgit bisect reset " +"<commit>ยป." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:268 #, fuzzy, c-format msgid "Bad bisect_write argument: %s" -msgstr "Parร metre bisect_write incorrecte: $state" +msgstr "Arguments de bisectriu incorrectes" -#: builtin/bisect--helper.c:220 -#, fuzzy, c-format +#: builtin/bisect--helper.c:273 +#, c-format msgid "couldn't get the oid of the rev '%s'" -msgstr "no es pot canviar el significat del terme ยซ%sยป" +msgstr "no s'ha pogut obtenir l'oid de la revisiรณ ยซ%sยป" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:285 #, fuzzy, c-format msgid "couldn't open the file '%s'" -msgstr "no s'ha pogut crear el fitxer ยซ%sยป" +msgstr "no s'ha pogut obrir el fitxer ยซ%sยป" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:311 #, 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." +msgstr "Ordre no vร lida esteu actualment en un percentatge/%s bisect" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:338 #, fuzzy, 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 "" -"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รฒ.)" +"Heu de donar-me com a mรญnim un per cents i un per cents de revisiรณ. Podeu " +"utilitzar ยซgit bisectriusยป i ยซgit bisectrisยป per a aixรฒ." -#: builtin/bisect--helper.c:289 +#: builtin/bisect--helper.c:342 #, fuzzy, 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 "" -"Cal comenรงar amb \"git bisect start\".\n" -"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รฒ.)" +"Heu de comenรงar per ยซgit bisect startยป. \n" +"Desprรฉs heu de donar-me com a mรญnim un per cents i per cents revisiรณ. Podeu " +"utilitzar ยซgit bisect %sยป i ยซgit bisect %sยป per a aixรฒ." -#: builtin/bisect--helper.c:321 -#, fuzzy, c-format +#: builtin/bisect--helper.c:362 +#, c-format msgid "bisecting only with a %s commit" -msgstr "Advertรจncia: bisecant amb nomรฉs comissiรณ $TERM_BAD." +msgstr "bisecant amb nomรฉs una comissiรณ %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:329 +#: builtin/bisect--helper.c:370 msgid "Are you sure [Y/n]? " msgstr "N'esteu segur [Y/n]? " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:431 msgid "no terms defined" msgstr "cap terme definit" -#: builtin/bisect--helper.c:379 -#, c-format +#: builtin/bisect--helper.c:434 +#, fuzzy, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" +"Els seus actuals termes sรณn percentatges per al vell Estat i percentatges " +"per al nou Estat." -#: builtin/bisect--helper.c:389 -#, fuzzy, c-format +#: builtin/bisect--helper.c:444 +#, 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 $arg per a 'git bisect terms'.\n" +"argument no vร lid %s per a ยซgit bisect termsยป.\n" "Les opcions admeses sรณn: --term-good|--term-old i --term-bad|--term-new." -#: builtin/bisect--helper.c:475 +#: builtin/bisect--helper.c:511 +#, fuzzy +msgid "revision walk setup failed\n" +msgstr "la configuraciรณ del passeig per revisions ha fallat" + +#: builtin/bisect--helper.c:533 #, fuzzy, c-format +msgid "could not open '%s' for appending" +msgstr "no s'ha pogut obrir ยซ%sยป per a lectura" + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +#, fuzzy +msgid "'' is not a valid term" +msgstr "ยซ%sยป no รฉs un terme vร lid" + +#: builtin/bisect--helper.c:674 +#, c-format msgid "unrecognized option: '%s'" -msgstr "posiciรณ no reconeguda:%s" +msgstr "opciรณ no reconeguda: ยซ%sยป" -#: builtin/bisect--helper.c:479 -#, fuzzy, c-format +#: builtin/bisect--helper.c:678 +#, c-format msgid "'%s' does not appear to be a valid revision" -msgstr "'$arg' no sembla una revisiรณ vร lida" +msgstr "ยซ%sยป no sembla ser una revisiรณ vร lida" -#: builtin/bisect--helper.c:511 -#, fuzzy +#: builtin/bisect--helper.c:709 msgid "bad HEAD - I need a HEAD" msgstr "HEAD incorrecte - Cal un HEAD" -#: builtin/bisect--helper.c:526 -#, fuzzy, c-format +#: builtin/bisect--helper.c:724 +#, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-" -"vร lida>'." +"l'agafament de ยซ%sยป ha fallat. Proveu ยซgit bisect start <branca-vร lida>ยป." -#: builtin/bisect--helper.c:547 +#: builtin/bisect--helper.c:745 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:550 +#: builtin/bisect--helper.c:748 #, fuzzy msgid "bad HEAD - strange symbolic ref" msgstr "HEAD incorrecte - referรจncia simbรฒlica estranya" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:775 #, fuzzy, c-format msgid "invalid ref: '%s'" -msgstr "fitxer no vร lid: ยซ%sยป" +msgstr "ref '%s' no รฉs vร lid" + +#: builtin/bisect--helper.c:827 +#, fuzzy +msgid "You need to start by \"git bisect start\"\n" +msgstr "Cal comenรงar per ยซgit bisect startยป" + +#. 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:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Voleu que ho faci per vostรจ [Y/n]? " -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'" -msgstr "realitza 'git bisect next'" +msgstr "realitza ยซgit bisect nextยป" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:868 msgid "write the terms to .git/BISECT_TERMS" msgstr "escriu els termes a .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:870 msgid "cleanup the bisection state" msgstr "neteja l'estat de la bisecciรณ" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:872 msgid "check for expected revs" msgstr "comprova les revisions esperades" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:874 #, fuzzy msgid "reset the bisection state" -msgstr "neteja l'estat de la bisecciรณ" +msgstr "restableix l'estat de la bisecciรณ" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:876 #, fuzzy msgid "write out the bisection state in BISECT_LOG" -msgstr "neteja l'estat de la bisecciรณ" +msgstr "escriu l'estat de la bisecciรณ a BISECTLOG" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:878 #, fuzzy msgid "check and set terms in a bisection state" -msgstr "neteja l'estat de la bisecciรณ" +msgstr "comprova i defineix els termes en un estat de bisecciรณ" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:880 +#, fuzzy msgid "check whether bad or good terms exist" -msgstr "" +msgstr "comprova si existeixen termes incorrectes o bons" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:882 #, fuzzy msgid "print out the bisect terms" -msgstr "imprimeix nomรฉs les etiquetes de l'objecte" +msgstr "imprimeix els termes de la bisectriu" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:884 +#, fuzzy msgid "start the bisect session" +msgstr "inicia la sessiรณ bisect" + +#: builtin/bisect--helper.c:886 +#, fuzzy +msgid "find the next bisection commit" +msgstr "no es pot esmenar una comissiรณ no existent" + +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" msgstr "" -#: 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:890 +msgid "start the bisection if it has not yet been started" +msgstr "" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:892 +#, fuzzy msgid "no log for BISECT_WRITE" -msgstr "" +msgstr "no hi ha registre per BISECTWRITE" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:910 msgid "--write-terms requires two arguments" -msgstr "--write-terms requereix dos parร metres" +msgstr "--write-terms requereix dos arguments" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:914 msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state no accepta parร metres" +msgstr "--bisect-clean-state no requereix cap argument" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:921 #, fuzzy msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-clean-state no accepta parร metres" +msgstr "--bisect-reset no requereix cap argument ni una comissiรณ" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:925 #, fuzzy msgid "--bisect-write requires either 4 or 5 arguments" -msgstr "--bisect-clean-state no accepta parร metres" +msgstr "--bisect-write requereix 4 o 5 arguments" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:931 #, fuzzy msgid "--check-and-set-terms requires 3 arguments" -msgstr "--bisect-clean-state no accepta parร metres" +msgstr "--check-and-set-terms requereix 3 arguments" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:937 #, fuzzy msgid "--bisect-next-check requires 2 or 3 arguments" -msgstr "--bisect-clean-state no accepta parร metres" +msgstr "--bisect-next-check requereix 2 o 3 arguments" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:943 #, fuzzy msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--write-terms requereix dos parร metres" +msgstr "--bisect-terms requereix 0 o 1 argument" + +#: builtin/bisect--helper.c:952 +#, fuzzy +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next-check requereix 2 o 3 arguments" + +#: builtin/bisect--helper.c:958 +#, fuzzy +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--bisect-terms requereix 0 o 1 argument" + +#: builtin/bisect--helper.c:964 +#, fuzzy +msgid "--bisect-autostart does not accept arguments" +msgstr "--bisect-clean-state no requereix cap argument" #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" @@ -9331,156 +10872,156 @@ msgstr "es documenten les <opcions-de-revisiรณ> en git-rev-list(1)" #: builtin/blame.c:410 #, fuzzy, c-format msgid "expecting a color: %s" -msgstr "respecta els colors del format" +msgstr "esperant un color per cent" #: builtin/blame.c:417 +#, fuzzy msgid "must end with a color" -msgstr "" +msgstr "ha d'acabar amb un color" #: 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" +msgstr "color ยซ%sยป no vร lid en color.blame.repeatLines" #: builtin/blame.c:748 #, fuzzy msgid "invalid value for blame.coloring" -msgstr "valor no vร lid per a --missing" +msgstr "valor no vร lid per a ยซtage.coloringยป" -#: builtin/blame.c:823 +#: builtin/blame.c:845 #, fuzzy, c-format msgid "cannot find revision %s to ignore" -msgstr "no s'ha pogut resoldre la revisiรณ: %s" +msgstr "no s'han pogut trobar els revisors per ignorar" -#: builtin/blame.c:845 +#: builtin/blame.c:867 msgid "Show blame entries as we find them, incrementally" msgstr "Mostra les entrades ยซblameยป mentre les trobem, incrementalment" -#: builtin/blame.c:846 -msgid "Show blank SHA-1 for boundary commits (Default: off)" +#: builtin/blame.c:868 +#, fuzzy +msgid "Do not show object names of boundary commits (Default: off)" msgstr "" "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: " "desactivat)" -#: builtin/blame.c:847 +#: builtin/blame.c:869 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:848 +#: builtin/blame.c:870 msgid "Show work cost statistics" msgstr "Mostra les estadรญstiques de preu de treball" -#: builtin/blame.c:849 +#: builtin/blame.c:871 msgid "Force progress reporting" msgstr "Forรงa l'informe de progrรฉs" -#: builtin/blame.c:850 +#: builtin/blame.c:872 msgid "Show output score for blame entries" msgstr "Mostra la puntuaciรณ de sortida de les entrades ยซblameยป" -#: builtin/blame.c:851 +#: builtin/blame.c:873 msgid "Show original filename (Default: auto)" msgstr "Mostra el nom de fitxer original (Per defecte: automร tic)" -#: builtin/blame.c:852 +#: builtin/blame.c:874 msgid "Show original linenumber (Default: off)" msgstr "Mostra el nรบmero de lรญnia original (Per defecte: desactivat)" -#: builtin/blame.c:853 +#: builtin/blame.c:875 msgid "Show in a format designed for machine consumption" msgstr "Presenta en un format dissenyat per consumpciรณ per mร quina" -#: builtin/blame.c:854 +#: builtin/blame.c:876 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:855 +#: builtin/blame.c:877 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:856 +#: builtin/blame.c:878 msgid "Show raw timestamp (Default: off)" msgstr "Mostra la marca de temps crua (Per defecte: desactivat)" -#: builtin/blame.c:857 +#: builtin/blame.c:879 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostra l'SHA1 de comissiรณ llarg (Per defecte: desactivat)" -#: builtin/blame.c:858 +#: builtin/blame.c:880 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:859 +#: builtin/blame.c:881 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:860 +#: builtin/blame.c:882 msgid "Ignore whitespace differences" msgstr "Ignora les diferรจncies d'espai en blanc" -#: builtin/blame.c:861 builtin/log.c:1646 +#: builtin/blame.c:883 builtin/log.c:1808 msgid "rev" msgstr "rev" -#: builtin/blame.c:861 +#: builtin/blame.c:883 #, fuzzy msgid "Ignore <rev> when blaming" -msgstr "ignora l'รญndex en comprovar" +msgstr "Ignora <rev> en culpar" -#: builtin/blame.c:862 +#: builtin/blame.c:884 #, fuzzy msgid "Ignore revisions from <file>" -msgstr "llegiu el missatge des d'un fitxer" +msgstr "Ignora les revisions des de <file>" -#: builtin/blame.c:863 +#: builtin/blame.c:885 +#, fuzzy msgid "color redundant metadata from previous line differently" -msgstr "" +msgstr "color les metadades redundants de la lรญnia anterior de manera diferent" -#: builtin/blame.c:864 +#: builtin/blame.c:886 +#, fuzzy msgid "color lines by age" -msgstr "" +msgstr "lรญnies de color per edat" -#: 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 +#: builtin/blame.c:887 msgid "Spend extra cycles to find better match" msgstr "Gasta cicles extres per a trobar una coincidรจncia millor" -#: builtin/blame.c:874 +#: builtin/blame.c:888 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:875 +#: builtin/blame.c:889 msgid "Use <file>'s contents as the final image" msgstr "Usa els continguts de <fitxer> com a la imatge final" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "puntuaciรณ" -#: builtin/blame.c:876 +#: builtin/blame.c:890 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:877 +#: builtin/blame.c:891 msgid "Find line movements within and across files" msgstr "Troba moviments de lรญnia dins i a travรฉs dels fitxers" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:892 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:929 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "no es pot usar --progress amb els formats --incremental o de porcellana" @@ -9493,23 +11034,24 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" -#: builtin/blame.c:1087 +#: builtin/blame.c:1110 #, 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:1133 +#: builtin/blame.c:1156 msgid "Blaming lines" msgstr "S'estร fent un ยซblameยป" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +#, fuzzy +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:30 @@ -9568,7 +11110,7 @@ msgid "" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" "La branca ยซ%sยป no estร totalment fusionada.\n" -"Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'." +"Si esteu segur que la voleu suprimir, executeu ยซgit branch -D %sยป." #: builtin/branch.c:189 msgid "Update of config-file failed" @@ -9624,12 +11166,12 @@ msgstr "no s'ha pogut analitzar la cadena de format" #: builtin/branch.c:460 #, fuzzy msgid "could not resolve HEAD" -msgstr "no s'ha pogut resoldre la comissiรณ HEAD" +msgstr "no s'ha pogut resoldre HEAD" #: builtin/branch.c:466 #, fuzzy, c-format msgid "HEAD (%s) points outside of refs/heads/" -msgstr "HEAD no trobat sota refs/heads!" +msgstr "HEAD (%) punts fora de les referรจncies/caps/" #: builtin/branch.c:481 #, c-format @@ -9720,7 +11262,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:485 +#: builtin/branch.c:626 builtin/rebase.c:526 msgid "upstream" msgstr "font" @@ -9729,8 +11271,9 @@ msgid "change the upstream info" msgstr "canvia la informaciรณ de font" #: builtin/branch.c:627 -msgid "Unset the upstream info" -msgstr "Desassigna la informaciรณ de font" +#, fuzzy +msgid "unset the upstream info" +msgstr "treu la informaciรณ de la font" #: builtin/branch.c:628 msgid "use colored output" @@ -9787,7 +11330,7 @@ msgstr "llista els noms de branca" #: builtin/branch.c:647 #, fuzzy msgid "show current branch name" -msgstr "No hi ha cap branca actual." +msgstr "mostra el nom de la branca actual" #: builtin/branch.c:648 msgid "create the branch's reflog" @@ -9813,128 +11356,266 @@ msgstr "imprimeix nomรฉs les branques que no s'han fusionat" msgid "list branches in columns" msgstr "llista les branques en columnes" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 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 +#: builtin/tag.c:434 msgid "object" msgstr "objecte" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "imprimeix nomรฉs les branques de l'objecte" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 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:39 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format a usar en la sortida" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "--column i --verbose sรณn incompatibles" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "cal el nom de branca" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "No es pot donar descripciรณ a un HEAD separat" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "no es pot editar la descripciรณ de mรฉs d'una branca" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "Encara no hi ha cap comissiรณ en la branca ยซ%sยป." -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "No hi ha cap branca amb nom ยซ%sยป." -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "hi ha massa branques per a una operaciรณ de cรฒpia" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" -msgstr "hi ha massa arguments per a una operaciรณ remota" +msgstr "hi ha massa arguments per a una operaciรณ de canvi de nom" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "hi ha massa arguments per a establir una nova font" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "no existeix la branca ยซ%sยป" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "la branca ยซ%sยป no existeix" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "hi ha massa arguments per a desassignar la font" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "no s'ha pogut desassignar la font de HEAD perquรจ no assenyala cap branca." -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branca ยซ%sยป no tรฉ informaciรณ de font" -#: builtin/branch.c:841 +#: builtin/branch.c:839 #, fuzzy 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 "" -"les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca" +"Les opcions -a i -r a ยซgit branchยป no prenen un nom de branca. Voleu usar -" +"a|-r --list <pattern>?" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" -"L'opciรณ --set-upstream ja no estร suportada. Useu en comptes --track o --set-" -"upstream-to." +"L'opciรณ --set-upstream ja no s'admet. En lloc seu, useu ยซ--trackยป o ยซ--set-" +"upstream-toยป." -#: builtin/bundle.c:45 +#: builtin/bugreport.c:15 +#, fuzzy +msgid "git version:\n" +msgstr "versiรณ" + +#: builtin/bugreport.c:21 #, c-format -msgid "%s is okay\n" -msgstr "%s estร bรฉ\n" +msgid "uname() failed with error '%s' (%d)\n" +msgstr "" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "" + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "" + +#: builtin/bugreport.c:80 +#, fuzzy +msgid "not run from a git repository - no hooks to show\n" +msgstr "no รฉs un dipรฒsit de git: %s" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "" + +#: builtin/bugreport.c:158 +#, fuzzy, c-format +msgid "could not create leading directories for '%s'" +msgstr "no s'han pogut crear els directoris inicials de ยซ%sยป" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "" + +#: builtin/bugreport.c:168 +#, fuzzy +msgid "Enabled Hooks" +msgstr "no s'ha pogut bifurcar" + +#: builtin/bugreport.c:175 +#, fuzzy, c-format +msgid "couldn't create a new file at '%s'" +msgstr "no s'ha pogut crear el fitxer ยซ%sยป" + +#: builtin/bugreport.c:178 +#, fuzzy, c-format +msgid "unable to write to %s" +msgstr "no s'ha pogut escriure %s" + +#: builtin/bugreport.c:188 +#, fuzzy, c-format +msgid "Created new report at '%s'.\n" +msgstr "S'ha netejat el directori ยซ%sยป\n" + +#: builtin/bundle.c:15 builtin/bundle.c:23 +#, fuzzy +msgid "git bundle create [<options>] <file> <git-rev-list args>" +msgstr "git pack create [<opcions>] <file> <git-rev-list args>" + +#: builtin/bundle.c:16 builtin/bundle.c:28 +#, fuzzy +msgid "git bundle verify [<options>] <file>" +msgstr "git pack verify [<opcions>] <file>" + +#: builtin/bundle.c:17 builtin/bundle.c:33 +#, fuzzy +msgid "git bundle list-heads <file> [<refname>...]" +msgstr "git pack list-heads <file> [<refname>]" + +#: builtin/bundle.c:18 builtin/bundle.c:38 +#, fuzzy +msgid "git bundle unbundle <file> [<refname>...]" +msgstr "git bundle <file> [<refname>]" + +#: builtin/bundle.c:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "no mostris l'indicador de progrรฉs" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "mostra l'indicador de progrรฉs" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +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:74 builtin/pack-objects.c:3487 +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:58 +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "Cal un dipรฒsit per a fer un farcell." -#: builtin/bundle.c:62 +#: builtin/bundle.c:107 +#, fuzzy +msgid "do not show bundle details" +msgstr "no mostris els detalls del paquet" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "%s estร bรฉ\n" + +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "Cal un dipรฒsit per a desfer un farcell." -#: builtin/cat-file.c:594 +#: builtin/bundle.c:171 builtin/remote.c:1687 +msgid "be verbose; must be placed before a subcommand" +msgstr "sigues detallat; s'ha de colยทlocar abans d'una subordre" + +#: builtin/bundle.c:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Subordre desconeguda: %s" + +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -9942,85 +11623,87 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipus> | --textconv | --filters [--path=<camรญ>]) <objecte>" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:599 +#, fuzzy msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:620 #, fuzzy msgid "only one batch option may be specified" -msgstr "Cap nom de branca especificat" +msgstr "nomรฉs es pot especificar una opciรณ per lots" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipus> pot ser un de: blob, tree, commit, tag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "mostra el tipus de l'objecte" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "mostra la mida de l'objecte" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "surt amb zero quan no hi ha error" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "imprimeix bellament el contingut de l'objecte" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:645 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:643 +#: builtin/cat-file.c:647 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:644 git-submodule.sh:936 +#: builtin/cat-file.c:648 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "usa un camรญ especรญfic per a --textconv/--filters" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:651 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:648 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "posa la sortida de --batch en memรฒria intermรจdia" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:654 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:654 +#: builtin/cat-file.c:658 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:658 +#: builtin/cat-file.c:662 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:660 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "mostra tots els objectes amb --batch o --batch-check" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:666 +#, fuzzy msgid "do not order --batch-all-objects output" -msgstr "" +msgstr "no ordenar la sortida --batch-all-objects" #: builtin/check-attr.c:13 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." @@ -10046,8 +11729,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:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "omet els informes de progrรฉs" @@ -10059,27 +11742,27 @@ msgstr "mostra els camins d'entrada que no coincideixin" msgid "ignore index when checking" msgstr "ignora l'รญndex en comprovar" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "no es poden especificar noms de camรญ amb --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z nomรฉs tรฉ sentit amb --stdin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "cap camรญ especificat" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "--quiet nomรฉs รฉs vร lid amb un sol nom de camรญ" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "no es poden especificar --quiet i --verbose alhora" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching รฉs vร lid nomรฉs amb --verbose" @@ -10138,9 +11821,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:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 msgid "string" msgstr "cadena" @@ -10163,163 +11846,158 @@ msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..." #: builtin/checkout.c:37 #, fuzzy msgid "git switch [<options>] [<branch>]" -msgstr "git checkout [<opcions>] <branca>" +msgstr "git interruptor [<opcions>] [<branch>]" #: builtin/checkout.c:42 #, fuzzy msgid "git restore [<options>] [--source=<branch>] <file>..." -msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..." +msgstr "git restore [<opcions>] [--source=<branch>] <file>" -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "el camรญ ยซ%sยป no tรฉ la nostra versiรณ" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "el camรญ ยซ%sยป no tรฉ la seva versiรณ" -#: builtin/checkout.c:190 +#: builtin/checkout.c:206 #, 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:240 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "el camรญ ยซ%sยป no tรฉ les versions necessร ries" -#: builtin/checkout.c:258 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "camรญ ยซ%sยป: no es pot fusionar" -#: builtin/checkout.c:274 +#: builtin/checkout.c:291 #, 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:374 -#, fuzzy, c-format +#: builtin/checkout.c:396 +#, 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ยป" +msgstr[0] "" +msgstr[1] "" -#: builtin/checkout.c:379 -#, fuzzy, c-format +#: builtin/checkout.c:401 +#, 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" +msgstr[0] "" +msgstr[1] "" -#: builtin/checkout.c:386 -#, fuzzy, c-format +#: builtin/checkout.c:408 +#, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" -msgstr[0] "S'ha produรฏt un error en llegir l'รญndex" -msgstr[1] "S'ha produรฏt un error en llegir l'รญndex" +msgstr[0] "S'ha actualitzat un camรญ des de l'รญndex" +msgstr[1] "S'ha actualitzat %d camins des de l'รญndex" -#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "ยซ%sยป no es pot usar amb actualitzaciรณ de camins" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "ยซ%sยป no es pot usar amb %s" -#: builtin/checkout.c:429 +#: builtin/checkout.c:451 #, 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:433 -#, c-format +#: builtin/checkout.c:455 +#, fuzzy, c-format msgid "neither '%s' or '%s' is specified" -msgstr "" +msgstr "no s'ha especificat ni ยซ%sยป ni ยซ%sยป" -#: builtin/checkout.c:437 +#: builtin/checkout.c:459 #, fuzzy, c-format msgid "'%s' must be used when '%s' is not specified" -msgstr "ยซ%sยป no es pot usar amb ยซ%sยป" +msgstr "ยซ%sยป s'ha d'utilitzar quan no s'especifica ยซ%sยป" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, fuzzy, c-format msgid "'%s' or '%s' cannot be used with %s" -msgstr "%s: %s no es pot usar amb %s" +msgstr "\"%s\" o \"%s\" no poden utilitzar-se amb percentatges" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:528 builtin/checkout.c:535 #, c-format msgid "path '%s' is unmerged" msgstr "el camรญ ยซ%sยป estร sense fusionar" -#: builtin/checkout.c:679 +#: builtin/checkout.c:703 msgid "you need to resolve your current index first" msgstr "heu de primer resoldre el vostre รญndex actual" -#: builtin/checkout.c:729 -#, c-format +#: builtin/checkout.c:757 +#, fuzzy, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" +"no es poden continuar amb els canvis ยซstagedยป als fitxers segรผents " +"percentatges" -#: 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 +#: builtin/checkout.c:853 #, 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:875 +#: builtin/checkout.c:895 msgid "HEAD is now at" msgstr "HEAD ara รฉs a" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:899 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "no s'ha pogut actualitzar HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:903 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca ยซ%sยป\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:906 #, c-format msgid "Already on '%s'\n" -msgstr "Ja en ยซ%sยป\n" +msgstr "Ja esteu en ยซ%sยป\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:910 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "S'ha canviat i restablert a la branca ยซ%sยป\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:912 builtin/checkout.c:1338 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "S'ha canviat a la branca nova ยซ%sยป\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:914 #, c-format msgid "Switched to branch '%s'\n" msgstr "S'ha canviat a la branca ยซ%sยป\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:965 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d mรฉs.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:971 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10342,7 +12020,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:990 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10369,234 +12047,280 @@ msgstr[1] "" " git branch <nom-de-branca-nova> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1025 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1029 msgid "Previous HEAD position was" msgstr "La posiciรณ de HEAD anterior era" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1069 builtin/checkout.c:1333 msgid "You are on a branch yet to be born" msgstr "Sou en una branca que encara ha de nรฉixer" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1146 +#, fuzzy, 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\" podria ser tant un fitxer local com una branca de seguiment. Si us " +"plau useu -- (i opcionalment --no-gues) per a desambiguar" + +#: builtin/checkout.c:1153 +#, fuzzy +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 voleu comprovar una branca de seguiment remota p. ex. ยซorigenยป podeu fer-" +"ho classificant completament el nom amb l'opciรณ --track git checkout --track " +"origin/<name> Si voleu tenir sempre agafades d'un ambigu <name> preferiu un " +"remot p. ex. el parร metre remot 'origin' considereu agafar." +"defaultRemote=origin a la vostra configuraciรณ." + +#: builtin/checkout.c:1163 +#, fuzzy, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "'%s' coincideixen mรบltiples (%) branques de seguiment remotes" + +#: builtin/checkout.c:1229 #, fuzzy msgid "only one reference expected" -msgstr "s'esperava nomรฉs una referรจncia, s'han donat %d." +msgstr "nomรฉs s'esperava una referรจncia" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1246 #, c-format msgid "only one reference expected, %d given." msgstr "s'esperava nomรฉs una referรจncia, s'han donat %d." -#: 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:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "referรจncia no vร lida: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1305 builtin/checkout.c:1671 #, c-format msgid "reference is not a tree: %s" msgstr "la referรจncia no รฉs un arbre: %s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1352 #, fuzzy, c-format msgid "a branch is expected, got tag '%s'" -msgstr "no es pot llegir l'objecte %s ยซ%sยป" +msgstr "s'espera una branca amb l'etiqueta ยซ%sยป" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1354 #, 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ยป." +msgstr "s'espera una branca amb la branca remota ยซ%sยป" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1355 builtin/checkout.c:1363 #, fuzzy, c-format msgid "a branch is expected, got '%s'" -msgstr "s'esperava shallow/unshallow, s'ha rebut %s" +msgstr "s'espera que una branca tingui ยซ%sยป" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1358 #, fuzzy, c-format msgid "a branch is expected, got commit '%s'" -msgstr "La vostra branca estร al dia amb ยซ%sยป.\n" +msgstr "s'espera que una branca tingui la comissiรณ ยซ%sยป" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1374 +#, fuzzy msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" +"no es pot canviar de branca mentre es fusiona ยซgit merge --quitยป o ยซgit " +"worktree addยป." -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1378 +#, fuzzy msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" +"no es pot canviar de branca al mig d'una sessiรณ am Considereu \"git am --quit" +"\" o \"git worktree add\"." -#: builtin/checkout.c:1333 +#: builtin/checkout.c:1382 +#, fuzzy msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" +"no es pot canviar de branca mentre es rebase considera ยซgit rebase --quitยป o " +"ยซgit worktree addยป." -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1386 +#, fuzzy msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" +"no es pot canviar de branca mentre ยซcherry pickยป considera ยซgit cherry-pick " +"--quitยป o ยซgit worktree addยป." -#: builtin/checkout.c:1341 +#: builtin/checkout.c:1390 +#, fuzzy msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" +"no es pot canviar de branca mentre s'estร revertint Considera \"git revert --" +"quit\" o \"git worktree add\"." -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1394 #, fuzzy msgid "you are switching branch while bisecting" -msgstr "Actualment esteu bisecant." +msgstr "s'estร canviant la branca mentre es bisect" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1401 msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "ยซ%sยป no es pot usar amb canvi de branca" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "ยซ%sยป no es pot usar amb ยซ%sยป" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1429 #, fuzzy, c-format msgid "'%s' cannot take <start-point>" -msgstr "ยซ%sยป no es pot usar amb actualitzaciรณ de camins" +msgstr "'%s' no pot prendre <start-point>" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1437 #, 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:1395 +#: builtin/checkout.c:1444 #, fuzzy msgid "missing branch or commit argument" -msgstr "Manca el nom de branca; proveu -b" +msgstr "manca branca o argument de comissiรณ" -#: 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 +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 msgid "force progress reporting" msgstr "forรงa l'informe de progrรฉs" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1487 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusiรณ de 3 vies amb la branca nova" -#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318 +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 msgid "style" msgstr "estil" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1489 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusiรณ o diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1501 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "separa HEAD a la comissiรณ anomenada" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1502 msgid "set upstream info for new branch" msgstr "estableix la informaciรณ de font de la branca nova" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1504 msgid "force checkout (throw away local modifications)" msgstr "agafa a la forรงa (descarta qualsevol modificaciรณ local)" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new unparented branch" msgstr "branca รฒrfena nova" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1508 builtin/merge.c:291 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1511 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:1475 +#: builtin/checkout.c:1524 msgid "checkout our version for unmerged files" msgstr "agafa la versiรณ nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1527 msgid "checkout their version for unmerged files" msgstr "agafa la versiรณ seva dels fitxers sense fusionar" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1531 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camรญ nomรฉs a entrades disperses" -#: builtin/checkout.c:1533 -msgid "-b, -B and --orphan are mutually exclusive" +#: builtin/checkout.c:1586 +#, fuzzy, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-b, -B i --orphan sรณn mรบtuament excloents" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1590 #, fuzzy msgid "-p and --overlay are mutually exclusive" -msgstr "-n i -k sรณn mรบtuament excloents." +msgstr "-p i --overlay sรณn mรบtuament excloents" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1627 msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1578 -#, fuzzy -msgid "missing branch name; try -b" -msgstr "Manca el nom de branca; proveu -b" +#: builtin/checkout.c:1632 +#, fuzzy, c-format +msgid "missing branch name; try -%c" +msgstr "falta el nom de la branca; proveu -b" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1664 #, fuzzy, c-format msgid "could not resolve %s" -msgstr "no s'ha pogut resoldre ยซ%sยป" +msgstr "no es poden resoldre els percentatges" -#: builtin/checkout.c:1623 -#, fuzzy -msgid "you must specify path(s) to restore" -msgstr "Heu d'especificar un directori." - -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1680 msgid "invalid path specification" msgstr "especificaciรณ de camรญ no vร lida" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1687 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "ยซ%sยป no รฉs una comissiรณ i la branca ยซ%sยป no es pot crear a partir d'aquesta " "comissiรณ" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1691 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" -msgstr "git checkout: --detach no accepta un parร metre de camรญ ยซ%sยป" +msgstr "git checkout: --detach no accepta un argument de camรญ ยซ%sยป" + +#: builtin/checkout.c:1700 +#, fuzzy +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file รฉs incompatible amb --detach" + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +#, fuzzy +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file รฉs incompatible amb --patch" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1716 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10604,132 +12328,122 @@ msgstr "" "git checkout: --ours/--theirs, --force i --merge sรณn incompatibles en\n" "agafar de l'รญndex." -#: 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:1721 +#, fuzzy +msgid "you must specify path(s) to restore" +msgstr "heu d'especificar camins per restaurar" -#: 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 +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 msgid "branch" msgstr "branca" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1748 msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1750 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1751 msgid "create reflog for new branch" msgstr "crea un registre de referรจncia per a la branca nova" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1753 #, fuzzy msgid "second guess 'git checkout <no-such-branch>' (default)" -msgstr "dubta 'git checkout <cap-branca-aixรญ>'" +msgstr "segon conjectura ยซgit checkout <no-such-branch>ยป (per defecte)" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1754 #, fuzzy msgid "use overlay mode (default)" -msgstr "poda les referรจncies soltes (per defecte)" +msgstr "utilitza el mode superposiciรณ (per defecte)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1799 #, fuzzy msgid "create and switch to a new branch" -msgstr "crea i agafa una branca nova" +msgstr "crea i canvia a una branca nova" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1801 #, fuzzy msgid "create/reset and switch to a branch" -msgstr "crea/restableix i agafa una branca" +msgstr "crea/reestableix i canvia a una branca" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1803 #, fuzzy msgid "second guess 'git switch <no-such-branch>'" -msgstr "dubta 'git checkout <cap-branca-aixรญ>'" +msgstr "segon conjectura ยซgit switch <no-such-branch>ยป" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1805 #, fuzzy msgid "throw away local modifications" -msgstr "agafa a la forรงa (descarta qualsevol modificaciรณ local)" +msgstr "rebutjar modificacions locals" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1839 #, fuzzy -msgid "where the checkout from" -msgstr "llegeix l'objecte des de stdin" +msgid "which tree-ish to checkout from" +msgstr "de quin arbre agafar" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1841 #, fuzzy msgid "restore the index" -msgstr "S'ha produรฏt un error en llegir l'รญndex" +msgstr "restaura l'รญndex" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1843 #, fuzzy msgid "restore the working tree (default)" -msgstr "Mostra l'estat de l'arbre de treball" +msgstr "restaura l'arbre de treball (per defecte)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1845 #, fuzzy msgid "ignore unmerged entries" -msgstr "s'estร ignorant %s no fusionat\n" +msgstr "ignora les entrades sense fusionar" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1846 +#, fuzzy msgid "use overlay mode" -msgstr "" +msgstr "utilitza el mode superposiciรณ" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <patrรณ>] [-x | -X] [--] <camins>..." -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "S'estร eliminant %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "Eliminaria %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "S'estร ometent el dipรฒsit %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "Ometria el dipรฒsit %s\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "s'ha produรฏt un error en eliminar %s" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, fuzzy, c-format msgid "could not lstat %s\n" -msgstr "no s'ha pogut fer stat a %s" +msgstr "no s'han pogut lstat%s" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10742,7 +12456,7 @@ msgstr "" "foo - selecciona un รญtem basat en un prefix รบnic\n" " - (buit) no seleccionis res\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10763,38 +12477,33 @@ msgstr "" "* - tria tots els รญtems\n" " - (buit) finalitza la selecciรณ\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Perdรณ (%s)?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "Introduรฏu els patrons a ignorar>> " -#: builtin/clean.c:699 +#: builtin/clean.c:696 #, 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:720 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Selecciona els รญtems a suprimir" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Voleu eliminar %s [y/N]? " -#: builtin/clean.c:786 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "Adรฉu.\n" - -#: builtin/clean.c:794 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10805,71 +12514,59 @@ msgid "" "? - help for prompt selection" msgstr "" "clean - comenรงa a netejar\n" -"filter by pattern - exclou รญtems de supressiรณ\n" +"filter by pattern - exclou รญtems de la supressiรณ\n" "select by numbers - selecciona รญtems a suprimir per nรบmeros\n" -"ask each - confirma cada supressiรณ (com \"rm -i\")\n" +"ask each - confirma cada supressiรณ (com ยซrm -iยป)\n" "quit - deixa de netejar\n" "help - aquesta pantalla\n" "? - ajuda de selecciรณ de l'avรญs" -#: 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 +#: builtin/clean.c:825 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:846 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "No hi ha mรฉs fitxers a netejar; s'estร sortint." -#: builtin/clean.c:908 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "no imprimeixis els noms dels fitxers eliminats" -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "force" msgstr "forรงa" -#: builtin/clean.c:911 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "neteja interactiva" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "elimina directoris sencers" -#: 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/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "patrรณ" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "afegiu <patrรณ> per a ignorar les regles" -#: builtin/clean.c:916 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "elimina els fitxers ignorats, tambรฉ" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "elimina nomรฉs els fitxers ignorats" -#: builtin/clean.c:936 -msgid "-x and -X cannot be used together" -msgstr "-x i -X no es poden usar junts" - -#: builtin/clean.c:940 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -10877,7 +12574,7 @@ msgstr "" "clean.requireForce estร establerta en cert i ni -i, -n ni -f s'han indicat; " "refusant netejar" -#: builtin/clean.c:943 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -10885,7 +12582,11 @@ msgstr "" "clean.requireForce รฉs per defecte cert i ni -i, -n ni -f s'han indicat; " "refusant netejar" -#: builtin/clone.c:46 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "-x i -X no es poden usar junts" + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opcions>] [--] <dipรฒsit> [<directori>]" @@ -10893,7 +12594,7 @@ msgstr "git clone [<opcions>] [--] <dipรฒsit> [<directori>]" msgid "don't create a checkout" msgstr "no facis cap agafament" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 msgid "create a bare repository" msgstr "crea un dipรฒsit nu" @@ -10913,11 +12614,11 @@ msgstr "no usis enllaรงos durs locals, sempre copia" msgid "setup as shared repository" msgstr "configura com a dipรฒsit compartit" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "especificaciรณ de camรญ" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "inicialitza els submรฒduls en el clon" @@ -10925,32 +12626,32 @@ msgstr "inicialitza els submรฒduls en el clon" msgid "number of submodules cloned in parallel" msgstr "nombre de submรฒduls clonats en paralยทlel" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:550 msgid "template-directory" msgstr "directori-de-plantilla" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:551 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:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "dipรฒsit de referรจncia" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 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:3308 builtin/repack.c:330 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 msgid "name" msgstr "nom" #: builtin/clone.c:120 msgid "use <name> instead of 'origin' to track upstream" -msgstr "usa <nom> en lloc de 'origin' per a seguir la font" +msgstr "usa <nom> en lloc d'ยซoriginยป per a seguir la font" #: builtin/clone.c:122 msgid "checkout <branch> instead of the remote's HEAD" @@ -10960,8 +12661,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:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/pull.c:208 msgid "depth" msgstr "profunditat" @@ -10969,7 +12670,8 @@ 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:154 builtin/pack-objects.c:3297 +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 msgid "time" msgstr "hora" @@ -10977,16 +12679,17 @@ 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:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 msgid "revision" msgstr "revisiรณ" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundeix la histรฒria d'un clon superficial, excloent una revisiรณ" -#: builtin/clone.c:132 +#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "clona nomรฉs una branca, HEAD o --branch" @@ -10999,11 +12702,11 @@ msgstr "" msgid "any cloned submodules will be shallow" msgstr "qualsevol submรฒdul clonat serร superficial" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:559 msgid "gitdir" msgstr "directori de git" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "separa el directori de git de l'arbre de treball" @@ -11015,32 +12718,39 @@ 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:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 msgid "server-specific" msgstr "especรญfic al servidor" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 msgid "option to transmit" msgstr "opciรณ a transmetre" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 msgid "use IPv4 addresses only" msgstr "usa nomรฉs adreces IPv4" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 msgid "use IPv6 addresses only" msgstr "usa nomรฉs adreces IPv6" #: builtin/clone.c:149 #, fuzzy msgid "any cloned submodules will use their remote-tracking branch" -msgstr "qualsevol submรฒdul clonat serร superficial" +msgstr "qualsevol submรฒdul clonat utilitzarร la seva branca de seguiment remot" + +#: builtin/clone.c:151 +#, fuzzy +msgid "initialize sparse-checkout file to include only files at root" +msgstr "" +"inicialitza el fitxer ยซsparse-checkoutยป per incloure nomรฉs els fitxers a " +"l'arrel" -#: builtin/clone.c:285 +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11048,149 +12758,153 @@ msgstr "" "No s'ha pogut endevinar cap nom de directori.\n" "Especifiqueu un directori en la lรญnia d'ordres" -#: builtin/clone.c:338 +#: builtin/clone.c:340 #, 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:411 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s existeix i no รฉs directori" -#: builtin/clone.c:428 +#: builtin/clone.c:431 #, fuzzy, c-format msgid "failed to start iterator over '%s'" -msgstr "no s'ha pogut escriure a ยซ%sยป" - -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "s'ha produรฏt un error en desenllaรงar ยซ%sยป" +msgstr "no s'ha pogut iniciar l'iterador per sobre de ยซ%sยป" -#: builtin/clone.c:458 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "s'ha produรฏt un error en crear l'enllaรง ยซ%sยป" -#: builtin/clone.c:462 +#: builtin/clone.c:466 #, 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:467 +#: builtin/clone.c:471 #, fuzzy, c-format msgid "failed to iterate over '%s'" -msgstr "s'ha produรฏt un error en eliminar ยซ%sยป" +msgstr "no s'ha pogut iterar sobre ยซ%sยป" -#: builtin/clone.c:492 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "fet.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:512 #, fuzzy 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 "" -"El clonatge ha tingut รจxit, perรฒ l'agafament ha\n" -"fallat. Podeu inspeccionar quรจ s'ha agafat amb\n" -"'git status' i tornar a intentar l'agafament amb\n" -"'git checkout -f HEAD'\n" +"El clonatge ha tingut รจxit perรฒ ha fallat. Podeu inspeccionar el que s'ha " +"comprovat amb ยซgit statusยป i tornar-ho a provar amb ยซgit restore --" +"source=HEAD /ยป" -#: builtin/clone.c:583 +#: builtin/clone.c:589 #, 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:702 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "no s'ha pogut actualitzar %s" -#: builtin/clone.c:752 +#: builtin/clone.c:756 +#, fuzzy +msgid "failed to initialize sparse-checkout" +msgstr "no s'ha pogut inicialitzar ยซsparse-checkoutยป" + +#: builtin/clone.c:779 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:783 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" -#: builtin/clone.c:833 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "no s'han pogut escriure els parร metres al fitxer de configuraciรณ" -#: builtin/clone.c:896 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "no es pot reempaquetar per a netejar" -#: builtin/clone.c:898 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "no es pot desenllaรงar el fitxer d'alternatives temporal" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:970 builtin/receive-pack.c:2434 msgid "Too many arguments." -msgstr "Hi ha massa parร metres." +msgstr "Hi ha massa arguments." -#: builtin/clone.c:942 +#: builtin/clone.c:974 msgid "You must specify a repository to clone." msgstr "Heu d'especificar un dipรฒsit per a clonar." -#: builtin/clone.c:955 +#: builtin/clone.c:987 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les opcions --bare i --origin %s sรณn incompatibles." -#: builtin/clone.c:958 +#: builtin/clone.c:990 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare i --separate-git-dir sรณn incompatibles." -#: builtin/clone.c:971 +#: builtin/clone.c:1006 #, c-format msgid "repository '%s' does not exist" msgstr "el dipรฒsit ยซ%sยป no existeix" -#: builtin/clone.c:977 builtin/fetch.c:1653 +#: builtin/clone.c:1010 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" -msgstr "la profunditat %s no รฉs nombre positiu" +msgstr "la profunditat %s no รฉs un nombre positiu" -#: builtin/clone.c:987 +#: builtin/clone.c:1020 #, 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:997 +#: builtin/clone.c:1026 +#, fuzzy, c-format +msgid "repository 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:1040 #, c-format msgid "working tree '%s' already exists." msgstr "l'arbre de treball ยซ%sยป ja existeix." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'han pogut crear els directoris inicials de ยซ%sยป" -#: builtin/clone.c:1017 +#: builtin/clone.c:1060 #, 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:1037 +#: builtin/clone.c:1080 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "S'estร clonant al dipรฒsit nu ยซ%sยป...\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1082 #, c-format msgid "Cloning into '%s'...\n" msgstr "S'estร clonant a ยซ%sยป...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1106 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11198,41 +12912,67 @@ msgstr "" "clone --recursive no รฉs compatible amb ambdรณs --reference i --reference-if-" "able" -#: builtin/clone.c:1124 +#: builtin/clone.c:1170 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:1126 +#: builtin/clone.c:1172 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:1128 +#: builtin/clone.c:1174 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:1130 +#: builtin/clone.c:1176 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:1133 +#: builtin/clone.c:1179 msgid "source repository is shallow, ignoring --local" msgstr "el dipรฒsit font รฉs superficial, s'estร ignorant --local" -#: builtin/clone.c:1138 +#: builtin/clone.c:1184 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1268 builtin/clone.c:1276 #, 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:1226 +#: builtin/clone.c:1279 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipรฒsit buit." +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "" + +#: builtin/credential-cache--daemon.c:226 +#, 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 "" +"Els permisos en el vostre directori de sรฒcol sรณn massa liberals;\n" +"pot ser que altres usuaris poden llegir les vostres credencials.\n" +"Considereu executar:\n" +"\n" +"\tchmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "imprimeix els missatges de depuraciรณ a stderr" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" + #: builtin/column.c:10 msgid "git column [<options>]" msgstr "git column [<opcions>]" @@ -11263,38 +13003,164 @@ msgstr "Espai d'encoixinada entre columnes" #: builtin/column.c:51 msgid "--command must be the first argument" -msgstr "--command ha de ser el primer parร metre" +msgstr "--command ha de ser el primer argument" + +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +#, fuzzy +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:14 builtin/commit-graph.c:27 +#, fuzzy +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" +"git commit-graph write [--object-dir <objdir>] [--append|--split] [---" +"reachable|--stdin-packs|---stdin-commits] [-no-]progress] <opcions de " +"desglossament>" + +#: builtin/commit-graph.c:64 +#, fuzzy, c-format +msgid "could not find object directory matching %s" +msgstr "" +"no s'ha pogut trobar el directori de l'objecte que coincideixi amb els " +"percentatges" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "directori" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +#, fuzzy +msgid "The object directory to store the graph" +msgstr "El directori d'objectes per emmagatzemar el grร fic" + +#: builtin/commit-graph.c:83 +#, fuzzy +msgid "if the commit-graph is split, only verify the tip file" +msgstr "" +"si el graf de comissions estร dividit nomรฉs verifica el fitxer de consell" + +#: builtin/commit-graph.c:106 +#, fuzzy, c-format +msgid "Could not open commit-graph '%s'" +msgstr "No s'ha pogut obrir el graf de comissions ยซ%sยป" + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "argument --split no reconegut, %s" + +#: builtin/commit-graph.c:155 +#, fuzzy, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "" +"s'esperava un identificador d'objecte de vora amb brossa s'han obtingut " +"percentatges d'escombraries" + +#: builtin/commit-graph.c:160 +#, fuzzy, c-format +msgid "invalid object: %s" +msgstr "no รฉs un objecte vร lid: %s" + +#: builtin/commit-graph.c:213 +#, fuzzy +msgid "start walk at all refs" +msgstr "comenรงa a caminar en totes les referรจncies" + +#: builtin/commit-graph.c:215 +#, fuzzy +msgid "scan pack-indexes listed by stdin for commits" +msgstr "explora els รญndexs del paquet llistats per stdin" + +#: builtin/commit-graph.c:217 +#, fuzzy +msgid "start walk at commits listed by stdin" +msgstr "comenรงa a caminar a les comissions llistades per l'entrada estร ndard" + +#: builtin/commit-graph.c:219 +#, fuzzy +msgid "include all commits already in the commit-graph file" +msgstr "inclou totes les publicacions ja al fitxer del graf de comissions" + +#: builtin/commit-graph.c:221 +msgid "enable computation for changed paths" +msgstr "" + +#: builtin/commit-graph.c:224 +#, fuzzy +msgid "allow writing an incremental commit-graph file" +msgstr "permet escriure un fitxer de graf de comissions incrementals" + +#: builtin/commit-graph.c:228 +#, fuzzy +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "nombre mร xim de comissions en un graf de comissions no basat" + +#: builtin/commit-graph.c:230 +#, fuzzy +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "rร tio mร xim entre dos nivells d'un graf de comissions dividit" + +#: builtin/commit-graph.c:232 +#, fuzzy +msgid "only expire files older than a given date-time" +msgstr "fes caducar els objectes mรฉs vells que <hora>" + +#: builtin/commit-graph.c:234 +#, fuzzy +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "" +"S'estan calculant els canvis les rutes de la comissiรณ en els filtres Bloom" + +#: builtin/commit-graph.c:255 +#, fuzzy +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "usa com a mร xim un dels --reachable --stdin-commits o --stdin-packs" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "" #: builtin/commit-tree.c:18 +#, fuzzy msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " "<file>)...] <tree>" msgstr "" +"git commit-tree [(-p <parent>)] [-S[<keyid>]] [(-m <message>)] [(-F <file>)] " +"<tree>" #: builtin/commit-tree.c:31 #, fuzzy, c-format msgid "duplicate parent %s ignored" -msgstr "suprimeix les referรจncies reemplaรงades" +msgstr "s'han ignorat els progenitors duplicats" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 #, fuzzy, c-format msgid "not a valid object name %s" -msgstr "no รฉs un nom d'objecte vร lid: %s" +msgstr "no รฉs un nom d'objecte vร lid per cent" #: builtin/commit-tree.c:93 #, fuzzy, c-format msgid "git commit-tree: failed to open '%s'" -msgstr "s'ha produรฏt un error en obrir ยซ%sยป" +msgstr "git commit-tree ha fallat en obrir ยซ%sยป" #: builtin/commit-tree.c:96 #, fuzzy, c-format msgid "git commit-tree: failed to read '%s'" -msgstr "git write-tree ha fallat en escriure un arbre" +msgstr "git commit-tree ha fallat en llegir '%s'" #: builtin/commit-tree.c:98 #, fuzzy, c-format msgid "git commit-tree: failed to close '%s'" -msgstr "git write-tree ha fallat en escriure un arbre" +msgstr "git commit-tree ha fallat en tancar ยซ%sยป" #: builtin/commit-tree.c:111 #, fuzzy @@ -11304,37 +13170,37 @@ msgstr "pare" #: builtin/commit-tree.c:112 #, fuzzy msgid "id of a parent commit object" -msgstr "s'ha produรฏt un error en escriure l'objecte de comissiรณ" +msgstr "id d'un objecte de comissiรณ pare" -#: 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 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 msgid "message" msgstr "missatge" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "missatge de comissiรณ" #: builtin/commit-tree.c:118 #, fuzzy msgid "read commit log message from file" -msgstr "llegiu el missatge des d'un fitxer" +msgstr "llegeix el missatge de registre de publicaciรณ des d'un fitxer" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signa la comissiรณ amb GPG" #: builtin/commit-tree.c:133 #, fuzzy msgid "must give exactly one tree" -msgstr "Cal exactament un rang." +msgstr "ha de donar exactament un arbre" #: builtin/commit-tree.c:140 #, fuzzy msgid "git commit-tree: failed to read" -msgstr "git write-tree ha fallat en escriure un arbre" +msgstr "git commit-tree ha fallat en llegir" #: builtin/commit.c:41 msgid "git commit [<options>] [--] <pathspec>..." @@ -11352,7 +13218,7 @@ msgid "" msgstr "" "Heu demanat esmenar la comissiรณ mรฉs recent, perรฒ fer aixรฒ la\n" "deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n" -"podeu eliminar la comissiรณ per complet amb \"git reset HEAD^\".\n" +"podeu eliminar la comissiรณ per complet amb ยซgit reset HEAD^ยป.\n" #: builtin/commit.c:56 msgid "" @@ -11362,19 +13228,23 @@ msgid "" " git commit --allow-empty\n" "\n" msgstr "" -"El ยซcherry pickยป previ ja estร buit, possiblement a causa de resoluciรณ de " -"conflicte.\n" +"El ยซcherry pickยป previ estร ara buit, possiblement a causa de resoluciรณ de " +"conflictes.\n" "Si el voleu cometre de totes maneres, useu:\n" "\n" " git commit --allow-empty\n" "\n" #: builtin/commit.c:63 -#, fuzzy -msgid "Otherwise, please use 'git cherry-pick --skip'\n" -msgstr "D'altra manera, useu ยซgit resetยป\n" +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "Altrament si us plau useu ยซgit rebase --skipยป\n" #: builtin/commit.c:66 +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "Altrament si us plau useu ยซgit cherry-pick --skipยป\n" + +#: builtin/commit.c:69 +#, fuzzy msgid "" "and then use:\n" "\n" @@ -11386,62 +13256,78 @@ msgid "" " git cherry-pick --skip\n" "\n" msgstr "" +"i desprรฉs utilitzeu git cherry-pick --continue per tornar a seleccionar les " +"comissions restants. Si voleu ometre aquesta publicaciรณ utilitzeu git cherry-" +"pick --skip" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "s'ha produรฏt un error en desempaquetar l'objecte d'arbre HEAD" -#: builtin/commit.c:356 +#: builtin/commit.c:348 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "--pathspec-from-file amb -a no tรฉ sentit" + +#: builtin/commit.c:361 +msgid "No paths with --include/--only does not make sense." +msgstr "--include/--only no tรฉ sentit sense camรญ." + +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "no s'ha pogut crear un รญndex temporal" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "l'afegiment interactiu ha fallat" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "no s'ha pogut actualitzar l'รญndex temporal" -#: builtin/commit.c:378 +#: builtin/commit.c:399 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:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "no s'ha pogut escriure el fitxer new_index" -#: builtin/commit.c:455 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "no es pot fer una comissiรณ parcial durant una fusiรณ." -#: builtin/commit.c:457 +#: builtin/commit.c:478 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:465 +#: builtin/commit.c:480 +#, fuzzy +msgid "cannot do a partial commit during a rebase." +msgstr "no es pot fer una comissiรณ parcial durant una fusiรณ." + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "no es pot llegir l'รญndex" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "no s'ha pogut escriure un fitxer d'รญndex temporal" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "a la comissiรณ ยซ%sยป li manca la capรงalera d'autor" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "la comissiรณ ยซ%sยป tรฉ una lรญnia d'autor mal formada" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "parร metre --author mal format" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11449,44 +13335,44 @@ msgstr "" "no es pot seleccionar un carร cter de comentari que\n" "no sigui usat en el missatge de comissiรณ actual" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" -msgstr "no s'ha pogut trobar la comissiรณ %s" +msgstr "no s'ha pogut cercar la comissiรณ %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:478 #, 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:708 +#: builtin/commit.c:731 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:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "no s'ha pogut llegir el fitxer de registre ยซ%sยป" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "no s'ha pogut llegir SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "no s'ha pogut llegir MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissiรณ" -#: builtin/commit.c:829 -#, c-format +#: builtin/commit.c:853 +#, fuzzy 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" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" @@ -11495,13 +13381,13 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:834 -#, c-format +#: builtin/commit.c:858 +#, fuzzy 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" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" @@ -11510,7 +13396,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11520,7 +13406,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:855 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11532,146 +13418,147 @@ msgstr "" "vosaltres\n" "mateixos si voleu. Un missatge buit avorta la comissiรณ.\n" -#: builtin/commit.c:872 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sComitent: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "No es pot llegir l'รญndex" -#: builtin/commit.c:972 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Error en construir arbres" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:276 #, 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:1030 +#: builtin/commit.c:1055 #, 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:1044 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" -msgstr "mode ignorat no vร lid ยซ%sยป" +msgstr "Mode ignorat no vร lid ยซ%sยป" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits no vร lid ยซ%sยป" -#: builtin/commit.c:1102 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long i -z sรณn incompatibles" -#: builtin/commit.c:1146 +#: builtin/commit.c:1171 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:1155 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "No teniu res a esmenar." -#: builtin/commit.c:1158 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "Esteu enmig d'una fusiรณ -- no es pot esmenar." -#: builtin/commit.c:1160 +#: builtin/commit.c:1185 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:1163 +#: builtin/commit.c:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "Esteu enmig d'un ยซrebaseยป -- no es pot esmenar." + +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "Les opcions --squash i --fixup no es poden usar juntes" -#: builtin/commit.c:1173 +#: builtin/commit.c:1200 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:1175 +#: builtin/commit.c:1202 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:1183 +#: builtin/commit.c:1211 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:1200 +#: builtin/commit.c:1229 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: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 +#: builtin/commit.c:1235 +#, c-format msgid "paths '%s ...' with -a does not make sense" -msgstr "-a no tรฉ sentit amb camins." +msgstr "els camins ยซ%s ...ยป amb -a no tenen sentit" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "mostra la informaciรณ de branca" -#: builtin/commit.c:1343 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "mostra la informaciรณ de ยซstashยป" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1372 builtin/commit.c:1531 +#, fuzzy msgid "compute full ahead/behind values" -msgstr "" +msgstr "calcula els valors complets endavant/darrere" -#: builtin/commit.c:1347 +#: builtin/commit.c:1374 msgid "version" msgstr "versiรณ" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "sortida llegible per mร quina" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: 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 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 msgid "mode" msgstr "mode" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1383 builtin/commit.c:1541 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:1360 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11679,11 +13566,11 @@ msgstr "" "mostra els fitxers ignorats, modes opcionals: traditional, matching, no. " "(Per defecte: traditional, matching, no.)" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "quan" -#: builtin/commit.c:1363 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11691,463 +13578,405 @@ msgstr "" "ignora els canvis als submรฒduls, opcional quan: all, dirty, untracked. (Per " "defecte: all)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1366 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "no detectis canvis de noms" -#: builtin/commit.c:1368 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "detecta canvis de noms, i opcionalment estableix un รญndex de semblanรงa" -#: builtin/commit.c:1388 +#: builtin/commit.c:1415 +#, fuzzy msgid "Unsupported combination of ignored and untracked-files arguments" -msgstr "" +msgstr "Combinaciรณ d'arguments ignorats i no seguits" -#: builtin/commit.c:1493 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "omet el resum desprรฉs d'una comissiรณ reeixida" -#: builtin/commit.c:1494 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "mostra la diferรจncia en la plantilla de missatge de comissiรณ" -#: builtin/commit.c:1496 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "Opcions de missatge de comissiรณ" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "author" msgstr "autor" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "autor corregit de la comissiรณ" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:539 msgid "date" msgstr "data" -#: builtin/commit.c:1499 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "data corregida de la comissiรณ" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "comissiรณ" -#: builtin/commit.c:1501 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "reusa i edita el missatge de la comissiรณ especificada" -#: builtin/commit.c:1502 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "reusa el missatge de la comissiรณ especificada" -#: builtin/commit.c:1503 +#: builtin/commit.c:1507 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:1504 +#: builtin/commit.c:1508 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:1505 +#: builtin/commit.c:1509 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:1506 builtin/log.c:1581 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1507 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1508 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "forรงa l'ediciรณ de la comissiรณ" -#: builtin/commit.c:1510 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissiรณ" -#: builtin/commit.c:1515 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1516 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1517 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'รญndex per a cometre" -#: builtin/commit.c:1518 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1519 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1520 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "comet nomรฉs els fitxers especificats" -#: builtin/commit.c:1521 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "evita els lligams de precomissiรณ i missatge de comissiรณ" -#: builtin/commit.c:1522 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "mostra quรจ es cometria" -#: builtin/commit.c:1535 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "esmena la comissiรณ anterior" -#: builtin/commit.c:1536 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "evita el lligam de post escriptura" -#: builtin/commit.c:1541 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "estร bรฉ registrar un canvi buit" -#: builtin/commit.c:1543 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "estร bรฉ registrar un canvi amb missatge buit" -#: builtin/commit.c:1616 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD malmรจs (%s)" -#: builtin/commit.c:1623 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissiรณ: %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1657 #, 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:1654 +#: builtin/commit.c:1662 #, 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:1688 +#: builtin/commit.c:1696 #, fuzzy 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 "" -"s'ha actualitzat el dipรฒsit, perรฒ no es pot escriure el\n" -"fitxer new_index. Comproveu que el disc no estigui ple i\n" -"que no s'hagi excedit la quota, i desprรฉs feu \n" -"ยซgit reset HEADยป per a recuperar-ho." - -#: 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: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: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: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:57 -msgid "if the commit-graph is split, only verify the tip file" -msgstr "" - -#: 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:164 -msgid "start walk at all refs" -msgstr "" - -#: builtin/commit-graph.c:166 -msgid "scan pack-indexes listed by stdin for commits" -msgstr "" - -#: builtin/commit-graph.c:168 -msgid "start walk at commits listed by stdin" -msgstr "" - -#: builtin/commit-graph.c:170 -msgid "include all commits already in the commit-graph file" -msgstr "" - -#: 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:174 builtin/commit-graph.c:178 -msgid "maximum number of commits in a non-base split commit-graph" -msgstr "" - -#: builtin/commit-graph.c:176 -msgid "maximum ratio between two levels of a split commit-graph" -msgstr "" - -#: builtin/commit-graph.c:191 -msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" -msgstr "" +"s'ha actualitzat el repositori perรฒ no s'ha pogut escriure el fitxer " +"newindex. Comproveu que el disc no estร ple i que la quota no s'ha excedit i " +"desprรฉs ยซgit restitueix --staged /ยป per recuperar-se." #: builtin/config.c:11 msgid "git config [<options>]" msgstr "git config [<opcions>]" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:107 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" -msgstr "parร metre --type no reconegut, %s" +msgstr "argument --type no reconegut, %s" -#: builtin/config.c:115 +#: builtin/config.c:119 msgid "only one type at a time" msgstr "nomรฉs un tipus cada cop" -#: builtin/config.c:124 +#: builtin/config.c:128 msgid "Config file location" msgstr "Ubicaciรณ del fitxer de configuraciรณ" -#: builtin/config.c:125 +#: builtin/config.c:129 msgid "use global config file" msgstr "usa el fitxer de configuraciรณ global" -#: builtin/config.c:126 +#: builtin/config.c:130 msgid "use system config file" msgstr "usa el fitxer de configuraciรณ del sistema" -#: builtin/config.c:127 +#: builtin/config.c:131 msgid "use repository config file" msgstr "usa el fitxer de configuraciรณ del dipรฒsit" -#: builtin/config.c:128 +#: builtin/config.c:132 msgid "use per-worktree config file" msgstr "usa un fitxer de configuraciรณ per dipรฒsit" -#: builtin/config.c:129 +#: builtin/config.c:133 msgid "use given config file" msgstr "usa el fitxer de configuraciรณ donat" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "blob-id" msgstr "ID de blob" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "read config from given blob object" msgstr "llegeix la configuraciรณ de l'objecte de blob donat" -#: builtin/config.c:131 +#: builtin/config.c:135 msgid "Action" msgstr "Acciรณ" -#: builtin/config.c:132 +#: builtin/config.c:136 msgid "get value: name [value-regex]" msgstr "obtรฉn valor: nom [regex-de-valors]" -#: builtin/config.c:133 +#: builtin/config.c:137 msgid "get all values: key [value-regex]" msgstr "obtรฉn tots els valors: clau [regex-de-valors]" -#: builtin/config.c:134 +#: builtin/config.c:138 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtรฉn valors de regexp: regex-de-noms [regex-de-valors]" -#: builtin/config.c:135 +#: builtin/config.c:139 msgid "get value specific for the URL: section[.var] URL" msgstr "obtรฉn el valor especรญfic per a l'URL: secciรณ[.variable] URL" -#: builtin/config.c:136 +#: builtin/config.c:140 msgid "replace all matching variables: name value [value_regex]" msgstr "" "reemplaรงa totes les variables que coincideixen: nom valor [regex_de_valors]" -#: builtin/config.c:137 +#: builtin/config.c:141 msgid "add a new variable: name value" msgstr "afegeix una variable nova: nom valor" -#: builtin/config.c:138 +#: builtin/config.c:142 msgid "remove a variable: name [value-regex]" msgstr "elimina una variable: nom [regex-de-valors]" -#: builtin/config.c:139 +#: builtin/config.c:143 msgid "remove all matches: name [value-regex]" msgstr "elimina totes les coincidรจncies: nom [regex-de-valors]" -#: builtin/config.c:140 +#: builtin/config.c:144 msgid "rename section: old-name new-name" msgstr "canvia el nom de secciรณ: nom-antic nom-nou" -#: builtin/config.c:141 +#: builtin/config.c:145 msgid "remove a section: name" msgstr "elimina una secciรณ: nom" -#: builtin/config.c:142 +#: builtin/config.c:146 msgid "list all" msgstr "llista tots" -#: builtin/config.c:143 +#: builtin/config.c:147 msgid "open an editor" msgstr "obre un editor" -#: builtin/config.c:144 +#: builtin/config.c:148 msgid "find the color configured: slot [default]" msgstr "troba el color configurat: ranura [per defecte]" -#: builtin/config.c:145 +#: builtin/config.c:149 msgid "find the color setting: slot [stdout-is-tty]" msgstr "troba el parร metre de color: ranura [stdout-รฉs-tty]" -#: builtin/config.c:146 +#: builtin/config.c:150 msgid "Type" msgstr "Tipus" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:151 builtin/env--helper.c:43 msgid "value is given this type" msgstr "el valor tรฉ donat aquest tipus" -#: builtin/config.c:148 +#: builtin/config.c:152 msgid "value is \"true\" or \"false\"" -msgstr "el valor รฉs \"true\" o \"false\"" +msgstr "el valor รฉs ยซtrueยป o ยซfalseยป" -#: builtin/config.c:149 +#: builtin/config.c:153 msgid "value is decimal number" msgstr "el valor รฉs un nombre decimal" -#: builtin/config.c:150 +#: builtin/config.c:154 msgid "value is --bool or --int" msgstr "el valor รฉs --bool o --int" -#: builtin/config.c:151 +#: builtin/config.c:155 +#, fuzzy +msgid "value is --bool or string" +msgstr "el valor รฉs --bool o --int" + +#: builtin/config.c:156 msgid "value is a path (file or directory name)" msgstr "el valor รฉs un camรญ (nom de fitxer o directori)" -#: builtin/config.c:152 +#: builtin/config.c:157 msgid "value is an expiry date" msgstr "el valor รฉs una data de venciment" -#: builtin/config.c:153 +#: builtin/config.c:158 msgid "Other" msgstr "Altre" -#: builtin/config.c:154 +#: builtin/config.c:159 msgid "terminate values with NUL byte" msgstr "acaba els valors amb un octet NUL" -#: builtin/config.c:155 +#: builtin/config.c:160 msgid "show variable names only" msgstr "mostra nomรฉs els noms de variable" -#: builtin/config.c:156 +#: builtin/config.c:161 msgid "respect include directives on lookup" msgstr "respecta les directives d'inclusiรณ en cercar" -#: builtin/config.c:157 +#: builtin/config.c:162 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "mostra l'origen de la configuraciรณ (fitxer, entrada estร ndard, blob, lรญnia " "d'ordres)" -#: builtin/config.c:158 builtin/env--helper.c:40 +#: builtin/config.c:163 +#, fuzzy +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" +"mostra l'abast de la configuraciรณ (arbre de treball ordre local global del " +"sistema)" + +#: builtin/config.c:164 builtin/env--helper.c:45 msgid "value" msgstr "valor" -#: builtin/config.c:158 +#: builtin/config.c:164 +#, fuzzy msgid "with --get, use default value when missing entry" -msgstr "" +msgstr "amb --get utilitza el valor per defecte quan falta una entrada" -#: builtin/config.c:172 -#, c-format +#: builtin/config.c:178 +#, fuzzy, c-format msgid "wrong number of arguments, should be %d" -msgstr "" +msgstr "el nombre d'arguments รฉs erroni" -#: builtin/config.c:174 -#, c-format +#: builtin/config.c:180 +#, fuzzy, c-format msgid "wrong number of arguments, should be from %d to %d" -msgstr "" +msgstr "el nombre d'arguments hauria de passar d'un percentatge a un altre." -#: builtin/config.c:308 +#: builtin/config.c:334 #, c-format msgid "invalid key pattern: %s" msgstr "patrรณ de la clau no vร lid: %s" -#: builtin/config.c:344 +#: builtin/config.c:370 #, c-format msgid "failed to format default config value: %s" msgstr "" "s'ha produรฏt un error en formatar el valor per defecte de la configuraciรณ: %s" -#: builtin/config.c:401 +#: builtin/config.c:434 #, c-format msgid "cannot parse color '%s'" msgstr "no es pot analitzar el color ยซ%sยป" -#: builtin/config.c:443 +#: builtin/config.c:476 msgid "unable to parse default color value" msgstr "no s'ha pogut analitzar el valor de color per defecte" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:529 builtin/config.c:789 msgid "not in a git directory" msgstr "no รฉs en un directori git" -#: builtin/config.c:499 +#: builtin/config.c:532 msgid "writing to stdin is not supported" msgstr "no s'admet escriure a stdin" -#: builtin/config.c:502 +#: builtin/config.c:535 #, fuzzy msgid "writing config blobs is not supported" -msgstr "avรญs: el sobrenom de sendmail amb cometes no estร suportat: %s\n" +msgstr "no es poden escriure els blobs de configuraciรณ" -#: builtin/config.c:587 +#: builtin/config.c:620 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12162,75 +13991,84 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:644 msgid "only one config file at a time" msgstr "nomรฉs un fitxer de configuraciรณ cada cop" -#: builtin/config.c:616 +#: builtin/config.c:650 msgid "--local can only be used inside a git repository" msgstr "--local nomรฉs es pot usar dins d'un dipรฒsit git" -#: builtin/config.c:619 +#: builtin/config.c:652 msgid "--blob can only be used inside a git repository" msgstr "--blob nomรฉs es pot usar dins d'un dipรฒsit git" -#: builtin/config.c:638 +#: builtin/config.c:654 +#, fuzzy +msgid "--worktree can only be used inside a git repository" +msgstr "--blob nomรฉs es pot usar dins d'un dipรฒsit git" + +#: builtin/config.c:676 msgid "$HOME not set" msgstr "$HOME no estร establerta" -#: builtin/config.c:658 +#: builtin/config.c:700 +#, fuzzy 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 no es pot utilitzar amb mรบltiples arbres de treball tret que " +"l'extensiรณ de configuraciรณ worktreeConfig estigui habilitada. Llegiu la " +"secciรณ ยซCONFIGURATION FITXERยป a ยซgit help worktreeยป per als detalls" -#: builtin/config.c:688 +#: builtin/config.c:735 msgid "--get-color and variable type are incoherent" msgstr "--get-color i el tipus de variable sรณn incoherents" -#: builtin/config.c:693 +#: builtin/config.c:740 msgid "only one action at a time" msgstr "nomรฉs una acciรณ cada cop" -#: builtin/config.c:706 +#: builtin/config.c:753 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only nomรฉs รฉs aplicable a --list o --get-regexp" -#: builtin/config.c:712 +#: builtin/config.c:759 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" "--show-origin nomรฉs รฉs aplicable a --get, --get-all, --get-regexp, i --list" -#: builtin/config.c:718 +#: builtin/config.c:765 msgid "--default is only applicable to --get" msgstr "--default nomรฉs รฉs aplicable a --get" -#: builtin/config.c:731 +#: builtin/config.c:778 #, c-format msgid "unable to read config file '%s'" msgstr "no s'ha pogut llegir el fitxer de configuraciรณ ยซ%sยป" -#: builtin/config.c:734 +#: builtin/config.c:781 msgid "error processing config file(s)" -msgstr "s'ha produรฏt un error processant els fitxers de configuraciรณ" +msgstr "s'ha produรฏt un error en processar els fitxers de configuraciรณ" -#: builtin/config.c:744 +#: builtin/config.c:791 msgid "editing stdin is not supported" msgstr "no hi ha compatibilitat per a l'ediciรณ a stdin" -#: builtin/config.c:746 +#: builtin/config.c:793 msgid "editing blobs is not supported" msgstr "no hi ha compatibilitat per l'ediciรณ de blobs" -#: builtin/config.c:760 +#: builtin/config.c:807 #, c-format msgid "cannot create configuration file %s" msgstr "no es pot crear el fitxer de configuraciรณ %s" -#: builtin/config.c:773 +#: builtin/config.c:820 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12239,7 +14077,7 @@ msgstr "" "no es poden sobreescriure mรบltiples valors amb un sol valor\n" " Useu una expressiรณ regular, --add o --replace-all per a canviar %s." -#: builtin/config.c:847 builtin/config.c:858 +#: builtin/config.c:894 builtin/config.c:905 #, c-format msgid "no such section: %s" msgstr "no existeix la secciรณ: %s" @@ -12252,11 +14090,11 @@ 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:27 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opcions>] [<comissiรณ>...]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<opcions>] --dirty" @@ -12272,37 +14110,34 @@ msgstr "lleuger" msgid "annotated" msgstr "anotat" -#: builtin/describe.c:273 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "l'etiqueta anotada %s no รฉs disponible" -#: 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:279 -#, c-format -msgid "tag '%s' is really '%s' here" +#: builtin/describe.c:281 +#, fuzzy, c-format +msgid "tag '%s' is externally known as '%s'" msgstr "l'etiqueta ยซ%sยป realment รฉs ยซ%sยป aquรญ" -#: builtin/describe.c:323 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "cap etiqueta coincideix exactament amb ยซ%sยป" -#: builtin/describe.c:325 -#, c-format +#: builtin/describe.c:330 +#, fuzzy, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" +"No hi ha cap coincidรจncia exacta en la cerca de referรจncies o etiquetes per " +"descriure" -#: builtin/describe.c:379 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "s'ha finalitzat la cerca a %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12311,7 +14146,7 @@ msgstr "" "Cap etiqueta anotada pot descriure ยซ%sยป.\n" "No obstant, hi havia etiquetes no anotades: proveu --tags." -#: builtin/describe.c:409 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12320,12 +14155,12 @@ msgstr "" "Cap etiqueta pot descriure ยซ%sยป.\n" "Proveu --always, o creeu algunes etiquetes." -#: builtin/describe.c:439 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "%lu comissions travessades\n" -#: builtin/describe.c:442 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12334,419 +14169,530 @@ 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:510 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "descriu %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "%s no รฉs un nom d'objecte vร lid" -#: builtin/describe.c:521 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s no รฉs una comissiรณ o un blob" -#: builtin/describe.c:535 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "troba l'etiqueta que vingui desprรฉs de la comissiรณ" -#: builtin/describe.c:536 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "estratรจgia de cerca de depuraciรณ en stderr" -#: builtin/describe.c:537 +#: builtin/describe.c:556 msgid "use any ref" msgstr "usa qualsevol referรจncia" -#: builtin/describe.c:538 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar" -#: builtin/describe.c:539 +#: builtin/describe.c:558 msgid "always use long format" msgstr "sempre usa el format llarg" -#: builtin/describe.c:540 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "nomรฉs segueix la primera mare" -#: builtin/describe.c:543 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "emet nomรฉs coincidรจncies exactes" -#: builtin/describe.c:545 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "considera les <n> etiquetes mรฉs recents (per defecte: 10)" -#: builtin/describe.c:547 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "nomรฉs considera les etiquetes que coincideixen amb <patrรณ>" -#: builtin/describe.c:549 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "no consideris les etiquetes que no coincideixen amb <patrรณ>" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "mostra l'objecte de comissiรณ abreviat com a sistema alternatiu" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "marca" -#: builtin/describe.c:553 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" -msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")" +msgstr "annexa <marca> en l'arbre de treball brut (per defecte: ยซ-dirtyยป)" -#: builtin/describe.c:556 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" -msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")" +msgstr "annexa <marca> en l'arbre de treball brut (per defecte: ยซ-brokenยป)" -#: builtin/describe.c:574 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "--long รฉs incompatible amb --abbrev=0" -#: builtin/describe.c:603 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "No s'ha trobat cap nom, no es pot descriure res." -#: builtin/describe.c:654 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty รฉs incompatible amb les comissions" -#: builtin/describe.c:656 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "--broken รฉs incompatible amb les comissions" -#: builtin/diff.c:84 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "ยซ%sยป: no รฉs ni fitxer regular ni enllaรง simbรฒlic" -#: builtin/diff.c:235 +#: builtin/diff.c:241 #, c-format msgid "invalid option: %s" msgstr "opciรณ no vร lida: %s" -#: builtin/diff.c:350 +#: builtin/diff.c:358 +#, fuzzy, c-format +msgid "%s...%s: no merge base" +msgstr "'%s' necessita exactament una base de fusiรณ" + +#: builtin/diff.c:468 msgid "Not a git repository" msgstr "No รฉs un dipรฒsit de git" -#: builtin/diff.c:394 +#: builtin/diff.c:513 #, c-format msgid "invalid object '%s' given." msgstr "s'ha donat un objecte no vร lid ยซ%sยป." -#: builtin/diff.c:403 +#: builtin/diff.c:524 #, c-format msgid "more than two blobs given: '%s'" msgstr "s'ha donat mรฉs de dos blobs: ยซ%sยป" -#: builtin/diff.c:408 +#: builtin/diff.c:529 #, c-format msgid "unhandled object '%s' given." msgstr "s'ha donat l'objecte no gestionat ยซ%sยป." +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camรญ>...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "ha fallat: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "no s'ha pogut llegir l'enllaรง simbรฒlic %s" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, 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:305 +#: builtin/difftool.c:312 #, 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" +msgstr "no es pot llegir l'objecte %s per l'enllaรง simbรฒlic %s" -#: builtin/difftool.c:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -"els formats de diff combinats ('-c' and '--cc') no sรณn admesos \n" -"en el mode diff per directoris ('-d' and '--dir-diff')." +"els formats de diff combinats (ยซ-cยป i ยซ--ccยป) no s'admeten\n" +"en el mode diff per directoris (ยซ-dยป i ยซ--dir-diffยป)." -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "s'han modificat ambdรณs fitxers: ยซ%sยป i ยซ%sยป." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "s'ha deixat un fitxer de l'arbre de treball." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "existeix un fitxer temporal a ยซ%sยป." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "podeu netejar o recuperar-los." -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" -msgstr "utilitza `diff.guitool` en comptes de `diff.tool`" +msgstr "usa ยซdiff.guitoolยป en lloc de ยซdiff.toolยป" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "fes un diff de tot el directori" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "no preguntis abans d'executar l'eina diff" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "utilitza enllaรงos simbรฒlics en mode dir-diff" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "eina" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "utilitza l'eina de diff especificada" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 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`" +"imprimeix una llista de totes les eines diff que podeu usar amb ยซ--toolยป" -#: builtin/difftool.c:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -"fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de " +"fes que ยซgit-difftoolยป surti quan l'eina de diff invocada torna un codi de " "sortida diferent de zero" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" -msgstr "especifiqueu un ordre personalitzat per veure diffs" +msgstr "especifiqueu una ordre personalitzada per veure diffs" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "passa-ho a ยซdiffยป" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool requereix worktree o --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff รฉs incompatible amb --no-index" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool and --extcmd sรณn mรบtuament excloents" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" -msgstr "no s'ha proporcionat <tool> per --tool=<tool>" +msgstr "no s'ha proporcionat l'<eina> per a --tool=<eina>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" -msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>" +msgstr "no s'ha proporcionat l'<ordre> per a --extcmd=<ordre>" #: builtin/env--helper.c:6 msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <opcions> <env-var>" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "tipus" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 +#, fuzzy msgid "default for git_env_*(...) to fall back on" -msgstr "" +msgstr "per defecte per a gitenv*() per tornar-hi" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 +#, fuzzy msgid "be quiet only use git_env_*() value as exit code" -msgstr "" +msgstr "silenciรณs nomรฉs utilitza el valor gitenv*() com a codi de sortida" -#: builtin/env--helper.c:62 -#, c-format +#: builtin/env--helper.c:67 +#, fuzzy, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "" +msgstr "`--default' espera un valor booleร amb `-type=bool` no `%s`" -#: builtin/env--helper.c:77 -#, c-format +#: builtin/env--helper.c:82 +#, fuzzy, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" "%s`" msgstr "" +"`--default' espera un valor llarg sense signe amb `-type=ulong` no `%s`" #: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opcions-de-llista-de-revisions]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:868 +#, fuzzy +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" +"Error no es poden exportar les etiquetes niades a menys que s'especifiqui --" +"mark-tags." + +#: builtin/fast-export.c:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "mostra el progrรฉs desprรฉs de <n> objectes" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "selecciona la gestiรณ de les etiquetes signades" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "selecciona la gestiรณ de les etiquetes que etiquetin objectes filtrats" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1206 #, fuzzy msgid "select handling of commit messages in an alternate encoding" -msgstr "selecciona la gestiรณ de les etiquetes que etiquetin objectes filtrats" +msgstr "" +"selecciona la gestiรณ dels missatges de publicaciรณ en una codificaciรณ " +"alternativa" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" msgstr "Bolca les marques a aquest fitxer" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" msgstr "Importa les marques d'aquest fitxer" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1215 +#, fuzzy +msgid "Import marks from this file if it exists" +msgstr "Importa marques d'aquest fitxer si existeix" + +#: builtin/fast-export.c:1217 msgid "Fake a tagger when tags lack one" msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1219 msgid "Output full tree for each commit" msgstr "Imprimeix l'arbre complet de cada comissiรณ" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1221 msgid "Use the done feature to terminate the stream" msgstr "Usa la caracterรญstica done per a acabar el corrent" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "Omet l'emissiรณ de dades de blob" -#: builtin/fast-export.c:1145 builtin/log.c:1649 +#: builtin/fast-export.c:1223 builtin/log.c:1811 msgid "refspec" msgstr "especificaciรณ de referรจncia" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1224 msgid "Apply refspec to exported refs" msgstr "Aplica l'especificaciรณ de referรจncia a les referรจncies exportades" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "anonimitza la sortida" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "" + +#: builtin/fast-export.c:1230 +#, fuzzy msgid "Reference parents which are not in fast-export stream by object id" msgstr "" +"Referรจncia pares que no estan en flux d'exportaciรณ rร pida per identificador " +"d'objecte" -#: builtin/fast-export.c:1151 +#: builtin/fast-export.c:1232 +#, fuzzy msgid "Show original object ids of blobs/commits" +msgstr "Mostra els ID dels objectes originals dels blobs/commits" + +#: builtin/fast-export.c:1234 +#, fuzzy +msgid "Label tags with mark ids" +msgstr "Etiquetes amb identificadors de marca" + +#: builtin/fast-export.c:1257 +#, fuzzy +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "--trailer amb --only-input no tรฉ sentit" + +#: builtin/fast-export.c:1272 +#, fuzzy +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "No es poden passar tant --import-marks com --import-marks-if-exists" + +#: builtin/fast-import.c:3086 +#, fuzzy, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "Subjecting submodule '%s'" + +#: builtin/fast-import.c:3088 +#, fuzzy, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "s'ha produรฏt un error en actualitzar el remot pel submรฒdul ยซ%sยป" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "S'esperava l'ordre ยซmarkยป, s'ha rebut %s" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "S'esperava l'ordre ยซtoยป, s'ha rebut ยซ%sยป" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" msgstr "" -#: builtin/fetch.c:30 +#: builtin/fast-import.c:3374 +#, fuzzy, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "" +"caracterรญstica ยซ%sยป prohibida a l'entrada sense --allow-unsafe-features" + +#: builtin/fetch-pack.c:241 +#, fuzzy, c-format +msgid "Lockfile created but not reported: %s" +msgstr "Submรฒduls canviats perรฒ no actualitzats:" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opcions>] [<dipรฒsit> [<especificaciรณ-de-referรจncia>...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opcions>] <grup>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opcions>] [(<dipรฒsit> | <grup>)...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opcions>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.paralยทlelisme no pot ser negatiu" + +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "obtรฉn de tots els remots" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:144 builtin/pull.c:245 +#, fuzzy +msgid "set upstream for git pull/fetch" +msgstr "estableix la font per a git pull/fetch" + +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "camรญ al qual pujar el paquet al costat remot" -#: builtin/fetch.c:130 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "forรงa la sobreescriptura de la referรจncia local" -#: builtin/fetch.c:132 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "obtรฉn de mรบltiples remots" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "obtรฉn totes les etiquetes i tots els objectes associats" -#: builtin/fetch.c:136 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "no obtinguis les etiquetes (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "nombre de submรฒduls obtinguts en paralยทlel" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:159 builtin/pull.c:198 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:142 +#: builtin/fetch.c:161 +#, fuzzy msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" +"poda les etiquetes locals ja no a les remotes i el ยซclobberยป ha canviat les " +"etiquetes" -#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "sota demanda" -#: builtin/fetch.c:144 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "controla l'obtenciรณ recursiva de submรฒduls" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:168 +#, fuzzy +msgid "write fetched references to the FETCH_HEAD file" +msgstr "escriu l'arxiu a aquest fitxer" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "retรฉn el paquet baixat" -#: builtin/fetch.c:150 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "permet l'actualitzaciรณ de la referรจncia HEAD" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "aprofundeix la histรฒria d'un clon superficial" -#: builtin/fetch.c:155 +#: builtin/fetch.c:176 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "aprofundeix la histรฒria d'un clon superficial basat en temps" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "converteix en un dipรฒsit complet" -#: builtin/fetch.c:164 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "anteposa aixรฒ a la sortida de camรญ del submรฒdul" -#: builtin/fetch.c:167 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12754,190 +14700,226 @@ msgstr "" "per defecte per a l'obtenciรณ recursiva de submรฒduls (prioritat mรฉs baixa que " "els fitxers de configuraciรณ)" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "accepta les referรจncies que actualitzin .git/shallow" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "mapa de referรจncies" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" -msgstr "mostra el mapa de referรจncies d'obtenciรณ" +msgstr "especรญfica l'obtenciรณ del mapa de referรจncies" -#: builtin/fetch.c:180 +#: builtin/fetch.c:201 builtin/pull.c:240 +#, fuzzy msgid "report that we have only objects reachable from this object" -msgstr "" +msgstr "informa que nomรฉs hi ha objectes abastables des d'aquest objecte" -#: builtin/fetch.c:183 +#: builtin/fetch.c:204 builtin/fetch.c:206 #, fuzzy -msgid "run 'gc --auto' after fetching" -msgstr "poda els remots desprรฉs d'obtenir-los" +msgid "run 'maintenance --auto' after fetching" +msgstr "executa ยซgc --autoยป desprรฉs d'obtenir" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "" +"comprova si hi ha actualitzacions forรงades a totes les branques actualitzades" + +#: builtin/fetch.c:210 +msgid "write the commit-graph after fetching" +msgstr "escriu el graf de comissions desprรฉs de recollir" -#: builtin/fetch.c:491 +#: builtin/fetch.c:212 +#, fuzzy +msgid "accept refspecs from stdin" +msgstr "llegeix les referรจncies des de stdin" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "No s'ha pogut trobar la referรจncia HEAD remota" -#: builtin/fetch.c:630 +#: builtin/fetch.c:677 #, 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:728 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:732 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "[al dia]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "no es pot obtenir en la branca actual" -#: builtin/fetch.c:756 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[actualitzaciรณ d'etiqueta]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referรจncia local" -#: builtin/fetch.c:761 +#: builtin/fetch.c:808 +#, fuzzy msgid "would clobber existing tag" -msgstr "" +msgstr "es tancaria l'etiqueta existent" -#: builtin/fetch.c:783 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[branca nova]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[referรจncia nova]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:875 msgid "forced update" msgstr "actualitzaciรณ forรงada" -#: builtin/fetch.c:833 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "sense avanรง rร pid" -#: builtin/fetch.c:879 +#: builtin/fetch.c:901 +#, fuzzy +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 "" +"L'obtenciรณ normalment indica quines branques tenien una actualitzaciรณ " +"forรงada perรฒ aquesta comprovaciรณ s'ha desactivat. Per tornar a habilitar " +"utilitzeu l'indicador ยซ--show-forced-updatesยป o executeu ยซgit config fetch." +"showForcedUpdates trueยป." + +#: builtin/fetch.c:905 +#, fuzzy, 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 "" +"S'ha trigat segons de 9% a comprovar les actualitzacions forรงoses. Podeu " +"utilitzar ยซ--no-show-forced-updatesยป o executar ยซgit config fetch." +"showForcedUpdates falseยป per evitar aquesta comprovaciรณ." + +#: builtin/fetch.c:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:900 +#: builtin/fetch.c:960 #, 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:991 builtin/fetch.c:1124 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:1002 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" "algunes referรจncies locals no s'han pogut actualitzar;\n" -" intenteu executar 'git remote prune %s' per a eliminar\n" +" intenteu executar ยซgit remote prune %sยป per a eliminar\n" " qualsevol branca antiga o conflictiva" -#: 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 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarร penjant)" -#: builtin/fetch.c:1095 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha tornat penjant)" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:1128 builtin/remote.c:1036 +#: builtin/fetch.c:1195 builtin/remote.c:1113 msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:1151 +#: builtin/fetch.c:1218 #, 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:1170 +#: builtin/fetch.c:1237 #, 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:1173 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "S'ignora l'opciรณ ยซ%sยป per a %s\n" -#: builtin/fetch.c:1477 +#: builtin/fetch.c:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "s'han detectat mรบltiples branques, incompatible amb --set-upstream" + +#: builtin/fetch.c:1463 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "" +"no s'estร configurant la font per a una branca remota amb seguiment remot" + +#: builtin/fetch.c:1465 +msgid "not setting upstream for a remote tag" +msgstr "no s'estร configurant la font d'una etiqueta remota" + +#: builtin/fetch.c:1467 +msgid "unknown branch type" +msgstr "tipus de branca desconegut" + +#: builtin/fetch.c:1469 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" +"no s'ha trobat cap branca d'origen.\n" +"Heu d'especificar exactament una branca amb l'opciรณ --set-upstream." + +#: builtin/fetch.c:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "S'estร obtenint %s\n" -#: builtin/fetch.c:1479 builtin/remote.c:100 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" -#: builtin/fetch.c:1525 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" -msgstr "" +#: builtin/fetch.c:1620 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "no s'ha pogut obtenir ยซ%sยป (codi de sortida: %d)\n" -#: builtin/fetch.c:1549 +#: builtin/fetch.c:1724 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -12945,72 +14927,79 @@ 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:1586 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "Necessiteu especificar un nom d'etiqueta." -#: builtin/fetch.c:1637 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "No s'admet una profunditat negativa en --deepen" -#: builtin/fetch.c:1639 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen i --depth sรณn mรบtuament excloents" -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "--depth i --unshallow no es poden usar junts" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un dipรฒsit complet no tรฉ sentit" -#: builtin/fetch.c:1662 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" -msgstr "fetch --all no accepta un parร metre de dipรฒsit" +msgstr "fetch --all no accepta un argument de dipรฒsit" -#: builtin/fetch.c:1664 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tรฉ sentit amb especificacions de referรจncia" -#: builtin/fetch.c:1673 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "No existeix un remot ni un grup remot: %s" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1869 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:1696 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "" +"--filter nomรฉs es pot utilitzar amb el remot configurat en extensions." +"partialclone" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fetch.c:1891 +#, fuzzy +msgid "--stdin can only be used when fetching from one remote" +msgstr "L'opciรณ --exec nomรฉs es pot usar juntament amb --remote" + +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 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:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "ร lies per --log (en desรบs)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "usa <text> com a inici de missatge" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "fitxer del qual llegir" @@ -13023,7 +15012,8 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <objecte>]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" +#, fuzzy +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" msgstr "git for-each-ref [(--merged | --no-merged) [<comissiรณ>]]" #: builtin/for-each-ref.c:13 @@ -13052,7 +15042,7 @@ msgstr "posa els marcadors de posiciรณ entre cometes adequades per al Tcl" msgid "show only <n> matched refs" msgstr "mostra nomรฉs <n> referรจncies coincidents" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "respecta els colors del format" @@ -13076,268 +15066,269 @@ 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:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "desconegut" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, 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:131 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" -msgstr "" +msgstr "avรญs en %s %s: %s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" -msgstr "" +msgstr "enllaรง trencat de %7s %s" -#: builtin/fsck.c:168 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "tipus d'objecte incorrecte en l'enllaรง" -#: builtin/fsck.c:184 -#, c-format +#: builtin/fsck.c:172 +#, fuzzy, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" -msgstr "" +msgstr "enllaรง trencat del 7% al 7%" -#: builtin/fsck.c:295 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "manca %s %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "inabastable %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:330 #, fuzzy, c-format msgid "dangling %s %s" -msgstr "S'estan actualitzant %s..%s\n" +msgstr "per cent" -#: builtin/fsck.c:349 +#: builtin/fsck.c:340 #, fuzzy msgid "could not create lost-found" -msgstr "no s'ha pogut crear el fitxer ยซ%sยป" +msgstr "no s'ha pogut crear el trobat perdut" -#: builtin/fsck.c:360 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "no s'ha pogut finalitzar ยซ%sยป" -#: builtin/fsck.c:377 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "S'estร comprovant %s" -#: builtin/fsck.c:415 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "S'estร comprovant la connectivitat (%d objectes)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "S'estร comprovant %s %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:430 msgid "broken links" msgstr "enllaรงos trencats" -#: builtin/fsck.c:447 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "arrel %s" -#: builtin/fsck.c:455 -#, c-format +#: builtin/fsck.c:447 +#, fuzzy, c-format msgid "tagged %s %s (%s) in %s" -msgstr "" +msgstr "percentatges marcats" -#: builtin/fsck.c:484 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objecte corrupte o no trobat" -#: builtin/fsck.c:509 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" -msgstr " %s: entrada de referรจncia no vร lida %s" +msgstr "%s: entrada de referรจncia no vร lida %s" -#: builtin/fsck.c:523 -#, fuzzy, c-format +#: builtin/fsck.c:515 +#, c-format msgid "Checking reflog %s->%s" -msgstr "S'estร comprovant el canvi de nom de ยซ%sยป a ยซ%sยป\n" +msgstr "S'estร comprovant reflog %s->%s" -#: builtin/fsck.c:557 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" -msgstr "%s: punter sha1 no vร lid: %s" +msgstr "%s: punter %s sha1 no vร lid" -#: builtin/fsck.c:564 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "%s: no รฉs una comissiรณ" -#: builtin/fsck.c:619 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "avรญs: no hi ha referรจncies per defecte" -#: builtin/fsck.c:634 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objecte corrupte o no trobat: %s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: no s'ha pogut analitzar l'objecte: %s" -#: builtin/fsck.c:667 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "fitxer sha1 malmรจs: %s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "S'estร comprovant el directori d'objecte" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "S'estan comprovant els directoris d'objecte" -#: builtin/fsck.c:700 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "S'estร comprovant l'enllaรง %s" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:871 #, c-format msgid "invalid %s" msgstr "%s no vร lid" -#: builtin/fsck.c:712 -#, fuzzy, c-format +#: builtin/fsck.c:703 +#, c-format msgid "%s points to something strange (%s)" -msgstr "%s - no รฉs una cosa que puguem fusionar" +msgstr "%s apunta a una cosa estranya (%s)" -#: builtin/fsck.c:718 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" -msgstr "" +msgstr "%s: el HEAD separat no apunta a res" -#: builtin/fsck.c:722 +#: builtin/fsck.c:713 #, c-format msgid "notice: %s points to an unborn branch (%s)" -msgstr "" +msgstr "avรญs: %s apunta a una branca no nascuda (%s)" -#: builtin/fsck.c:734 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "S'estร comprovant l'arbre de la memรฒria cau" -#: builtin/fsck.c:739 +#: builtin/fsck.c:730 #, 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" +msgstr "percentatges d'apuntador sha1 no vร lid a l'arbre de la memรฒria cau" -#: builtin/fsck.c:750 +#: builtin/fsck.c:739 +#, fuzzy msgid "non-tree in cache-tree" -msgstr "" +msgstr "no arbre en l'arbre de la memรฒria cau" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opcions>] [<objecte>...]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "mostra els objectes inabastables" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "mostra els objectes penjants" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "informa de les etiquetes" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "informa dels nodes d'arrel" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "fes els objectes d'รญndex nodes de cap" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "fes que els registres de referรจncies siguin nodes de cap (per defecte)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "tambรฉ considera els paquets i els objectes alternatius" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "comprova nomรฉs la connectivitat" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "habilita la comprovaciรณ mรฉs estricta" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "escriu objectes penjants a .git/lost-found" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "mostra el progrรฉs" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "mostra els noms detallats dels objectes abastables" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:267 msgid "Checking objects" msgstr "S'estan comprovant els objectes" -#: builtin/fsck.c:887 -#, fuzzy, c-format +#: builtin/fsck.c:875 +#, c-format msgid "%s: object missing" -msgstr "mostra la mida de l'objecte" +msgstr "%s: falta l'objecte" -#: builtin/fsck.c:899 -#, fuzzy, c-format +#: builtin/fsck.c:886 +#, c-format msgid "invalid parameter: expected sha1, got '%s'" -msgstr "s'esperava shallow/unshallow, s'ha rebut %s" +msgstr "parร metre no vร lid: s'esperava sha1, s'ha obtingut ยซ%sยป" -#: builtin/gc.c:34 +#: builtin/gc.c:36 msgid "git gc [<options>]" msgstr "git gc [<opcions>]" -#: builtin/gc.c:90 +#: builtin/gc.c:91 #, c-format msgid "Failed to fstat %s: %s" msgstr "S'ha produรฏt un error en fer fstat %s: %s" -#: builtin/gc.c:126 -#, fuzzy, c-format +#: builtin/gc.c:127 +#, c-format msgid "failed to parse '%s' value '%s'" -msgstr "s'ha produรฏt un error en moure ยซ%sยป a ยซ%sยป" +msgstr "no s'ha pogut analitzar ยซ%sยป valor ยซ%sยป" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "no es pot fer stat en ยซ%sยป" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "no es pot llegir ยซ%sยป" @@ -13374,18 +15365,19 @@ 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:549 +#, fuzzy msgid "repack all other packs except the largest pack" -msgstr "" +msgstr "reempaqueta tots els altres paquets excepte el paquet mรฉs gran" #: 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" +msgstr "no s'ha pogut analitzar el valor de gc.logexpiry dels percentatges" #: 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" +msgstr "no s'ha pogut analitzar el valor de venciment de la poda per cent" #: builtin/gc.c:597 #, c-format @@ -13416,10 +15408,66 @@ msgstr "" msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -"Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-" +"Hi ha massa objectes solts inabastables; executeu ยซgit pruneยป per a eliminar-" "los." -#: builtin/grep.c:29 +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "" + +#: builtin/gc.c:812 +#, fuzzy +msgid "failed to write commit-graph" +msgstr "s'ha produรฏt un error en escriure l'objecte de comissiรณ" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "" + +#: builtin/gc.c:932 +#, fuzzy, c-format +msgid "task '%s' failed" +msgstr "s'ha produรฏt un error en escriure ยซ%sยป" + +#: builtin/gc.c:979 +#, fuzzy, c-format +msgid "'%s' is not a valid task" +msgstr "ยซ%sยป no รฉs un terme vร lid" + +#: builtin/gc.c:984 +#, fuzzy, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "ยซ%sยป no es pot usar amb %s" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "" + +#: builtin/gc.c:1003 +#, fuzzy +msgid "run a specific task" +msgstr "cap camรญ especificat" + +#: builtin/gc.c:1026 +#, fuzzy +msgid "git maintenance run [<options>]" +msgstr "git notes prune [<opcions>]" + +#: builtin/gc.c:1037 +#, fuzzy, c-format +msgid "invalid subcommand: %s" +msgstr "comissiรณ no vร lida %s" + +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opcions>] [-e] <patrรณ> [<revisiรณ>...] [[--] <camรญ>...]" @@ -13437,266 +15485,266 @@ msgstr "s'ha especificat un nombre de fils no vร lid (%d) per a %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2722 +#: builtin/grep.c:287 builtin/index-pack.c:1581 builtin/index-pack.c:1771 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" -msgstr "no hi ha suport de fils, s'estร ignorant %s" +msgstr "no s'admeten fils, s'ignorarร %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "no s'ha pogut llegir l'arbre (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:655 #, 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:714 +#: builtin/grep.c:725 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'opciรณ ยซ%cยป espera un valor numรจric" -#: builtin/grep.c:813 +#: builtin/grep.c:824 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:815 +#: builtin/grep.c:826 msgid "find in contents not managed by git" msgstr "cerca en continguts no gestionats per git" -#: builtin/grep.c:817 +#: builtin/grep.c:828 msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" -#: builtin/grep.c:819 +#: builtin/grep.c:830 msgid "ignore files specified via '.gitignore'" -msgstr "ignora els fitxers especificats mitjanรงant '.gitignore'" +msgstr "ignora els fitxers especificats mitjanรงant ยซ.gitignoreยป" -#: builtin/grep.c:821 +#: builtin/grep.c:832 msgid "recursively search in each submodule" msgstr "cerca recursivament a cada submรฒdul" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "show non-matching lines" msgstr "mostra les lรญnies no coincidents" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "case insensitive matching" msgstr "coincidรจncia insensible a majรบscula i minรบscula" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "match patterns only at word boundaries" msgstr "coincideix amb els patrons nomรฉs als lรญmits de paraula" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "process binary files as text" msgstr "processa els fitxers binaris com a text" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "don't match patterns in binary files" msgstr "no coincideixis amb els patrons en els fitxers binaris" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "process binary files with textconv filters" msgstr "processa els fitxers binaris amb filtres de textconv" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "search in subdirectories (default)" -msgstr "cerca als subdirectories (per defecte)" +msgstr "cerca als subdirectoris (per defecte)" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "descend at most <depth> levels" msgstr "descendeix com a mร xim <profunditat> nivells" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "use extended POSIX regular expressions" msgstr "usa les expressions regulars POSIX ampliades" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "use basic POSIX regular expressions (default)" msgstr "usa les expressions regulars POSIX bร siques (per defecte)" -#: builtin/grep.c:849 +#: builtin/grep.c:860 msgid "interpret patterns as fixed strings" msgstr "interpreta els patrons com a cadenes fixes" -#: builtin/grep.c:852 +#: builtin/grep.c:863 msgid "use Perl-compatible regular expressions" msgstr "usa les expressions regulars compatibles amb Perl" -#: builtin/grep.c:855 +#: builtin/grep.c:866 msgid "show line numbers" msgstr "mostra els nรบmeros de lรญnia" -#: builtin/grep.c:856 +#: builtin/grep.c:867 msgid "show column number of first match" msgstr "mostra el nombre de columna de la primera coincidรจncia" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "don't show filenames" msgstr "no mostris els noms de fitxer" -#: builtin/grep.c:858 +#: builtin/grep.c:869 msgid "show filenames" msgstr "mostra els noms de fitxer" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "show filenames relative to top directory" msgstr "mostra els noms de fitxer relatius al directori superior" -#: builtin/grep.c:862 +#: builtin/grep.c:873 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:864 +#: builtin/grep.c:875 msgid "synonym for --files-with-matches" msgstr "sinรฒnim de --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show only the names of files without match" msgstr "mostra nomรฉs els noms dels fitxers sense coincidรจncia" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "print NUL after filenames" msgstr "imprimeix NUL desprรฉs dels noms de fitxer" -#: builtin/grep.c:872 +#: builtin/grep.c:883 msgid "show only matching parts of a line" msgstr "mostra nomรฉs les parts de coincidents de la lรญnia" -#: builtin/grep.c:874 +#: builtin/grep.c:885 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:875 +#: builtin/grep.c:886 msgid "highlight matches" msgstr "ressalta les coincidรจncies" -#: builtin/grep.c:877 +#: builtin/grep.c:888 msgid "print empty line between matches from different files" msgstr "imprimeix una lรญnia buida entre coincidรจncies de fitxers distints" -#: builtin/grep.c:879 +#: builtin/grep.c:890 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:882 +#: builtin/grep.c:893 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:885 +#: builtin/grep.c:896 msgid "show <n> context lines before matches" msgstr "mostra <n> lรญnies de context abans d'una coincidรจncia" -#: builtin/grep.c:887 +#: builtin/grep.c:898 msgid "show <n> context lines after matches" msgstr "mostra <n> lรญnies de context desprรฉs d'una coincidรจncia" -#: builtin/grep.c:889 +#: builtin/grep.c:900 msgid "use <n> worker threads" msgstr "usa <n> fils de treball" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "shortcut for -C NUM" msgstr "drecera per -C NUM" -#: builtin/grep.c:893 +#: builtin/grep.c:904 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:895 +#: builtin/grep.c:906 msgid "show the surrounding function" msgstr "mostra la funciรณ circumdant" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "read patterns from file" msgstr "llegeix els patrons des d'un fitxer" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "match <pattern>" msgstr "coincideix amb <patrรณ>" -#: builtin/grep.c:902 +#: builtin/grep.c:913 msgid "combine patterns specified with -e" msgstr "combina els patrons especificats amb -e" -#: builtin/grep.c:914 +#: builtin/grep.c:925 msgid "indicate hit with exit status without output" msgstr "indica coincidรจncia amb estat de sortida sense sortida textual" -#: builtin/grep.c:916 +#: builtin/grep.c:927 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:918 +#: builtin/grep.c:929 msgid "show parse tree for grep expression" msgstr "mostra l'arbre d'anร lisi de l'expressiรณ grep" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "pager" msgstr "paginador" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "show matching files in the pager" msgstr "mostra els fitxers coincidents en el paginador" -#: builtin/grep.c:926 +#: builtin/grep.c:937 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocaciรณ de grep(1) (ignorat per aquesta compilaciรณ)" -#: builtin/grep.c:990 +#: builtin/grep.c:1004 msgid "no pattern given" msgstr "no s'ha donat cap patrรณ" -#: builtin/grep.c:1026 +#: builtin/grep.c:1040 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no es pot usar amb revisions" -#: builtin/grep.c:1034 +#: builtin/grep.c:1048 #, c-format msgid "unable to resolve revision: %s" msgstr "no s'ha pogut resoldre la revisiรณ: %s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1078 +msgid "--untracked not supported with --recurse-submodules" +msgstr "--untracked no s'admet amb --recurse-submodules" + +#: builtin/grep.c:1082 msgid "invalid option combination, ignoring --threads" msgstr "combinaciรณ d'opcions no vร lida, s'estร ignorant --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3405 +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" -msgstr "no hi ha suport de fils, s'estร ignorant --threads" +msgstr "no s'admeten fils, s'ignorarร --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719 +#: builtin/grep.c:1088 builtin/index-pack.c:1578 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no vร lid (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1122 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:1117 -msgid "option not supported with --recurse-submodules" -msgstr "opciรณ no admesa amb --recurse-submodules." - -#: builtin/grep.c:1123 +#: builtin/grep.c:1148 msgid "--cached or --untracked cannot be used with --no-index" -msgstr "--cached o --untracked no es pot usar amb --no-index." +msgstr "--cached o --untracked no es pot usar amb --no-index" -#: builtin/grep.c:1129 +#: builtin/grep.c:1154 #, fuzzy msgid "--[no-]exclude-standard cannot be used for tracked contents" -msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits." +msgstr "--[no-]exclude-standard no es pot utilitzar per als continguts seguits" -#: builtin/grep.c:1137 +#: builtin/grep.c:1162 #, fuzzy msgid "both --cached and trees are given" -msgstr "s'han donat ambdรณs --caches i arbres." +msgstr "es donen ambdรณs --cached i arbres" #: builtin/hash-object.c:85 msgid "" @@ -13737,202 +15785,208 @@ msgstr "" msgid "process file as it were from this path" msgstr "processa el fitxer com si fos d'aquest camรญ" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "imprimeix totes les ordres disponibles" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "exclou guies" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "imprimeix la llista de guies รบtils" -#: builtin/help.c:49 +#: builtin/help.c:50 #, fuzzy msgid "print all configuration variable names" -msgstr "no es pot crear el fitxer de configuraciรณ %s" +msgstr "imprimeix tots els noms de les variables de configuraciรณ" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "mostra la pร gina de manual" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "mostra la pร gina de manual en el navegador web" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "mostra la pร gina d'informaciรณ" -#: builtin/help.c:56 +#: builtin/help.c:57 #, fuzzy msgid "print command description" -msgstr "imprimeix els continguts de la comissiรณ" +msgstr "imprimeix la descripciรณ de l'ordre" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "format d'ajuda no reconegut ยซ%sยป" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "S'ha produรฏt un error'ha produรฏt un error en iniciar emacsclient." -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "S'ha produรฏt un error en analitzar la versiรณ d'emacsclient." -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la versiรณ d'emacsclient ยซ%dยป รฉs massa vella (< 22)." -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "s'ha produรฏt un error en executar ยซ%sยป" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" "ยซ%sยป: camรญ a un visualitzador de manuals no compatible.\n" -"Considereu usar 'man.<eina>.cmd' en lloc d'aixรฒ." +"Considereu usar ยซman.<eina>.cmdยป en lloc d'aixรฒ." -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" "ยซ%sยป: ordre per a un visualitzador de manuals compatible.\n" -"Considereu usar 'man.<eina>.path' en lloc d'aixรฒ." +"Considereu usar ยซman.<eina>.pathยป en lloc d'aixรฒ." -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "ยซ%sยป: visualitzador de manuals desconegut." -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "cap visualitzador de manuals ha gestionat la solยทlicitud" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "cap visualitzador d'informaciรณ ha gestionat la solยทlicitud" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "ยซ%sยป รฉs un ร lies de ยซ%sยป" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:369 #, fuzzy, c-format msgid "bad alias.%s string: %s" -msgstr "Cadena branch.%s.mergeoptions incorrecta: %s" +msgstr "ร lies incorrecte.%s string%s" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "รบs: %s%s" -#: builtin/help.c:491 +#: builtin/help.c:577 +#, fuzzy msgid "'git help config' for more information" -msgstr "" +msgstr "'git help config' per a mรฉs informaciรณ" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:227 #, c-format msgid "object type mismatch at %s" msgstr "hi ha una discordanรงa de tipus d'objecte a %s" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:247 #, c-format msgid "did not receive expected object %s" msgstr "no s'ha rebut l'objecte esperat %s" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:250 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:300 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "no es pot omplir %d octet" msgstr[1] "no es pot omplir %d octets" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:310 msgid "early EOF" msgstr "EOF prematur" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:311 msgid "read error on input" msgstr "error de lectura d'entrada" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:323 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:600 +#: builtin/index-pack.c:330 builtin/pack-objects.c:619 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:94 +#: builtin/index-pack.c:333 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "el paquet supera la mida mร xima permesa" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:348 builtin/repack.c:254 +#, c-format +msgid "unable to create '%s'" +msgstr "no s'ha pogut crear ยซ%sยป" + +#: builtin/index-pack.c:354 #, c-format msgid "cannot open packfile '%s'" msgstr "no es pot obrir el fitxer de paquet ยซ%sยป" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:368 msgid "pack signature mismatch" msgstr "hi ha una discordanรงa de signatura de paquet" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:370 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la versiรณ de paquet %<PRIu32> no รฉs compatible" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:388 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "el paquet tรฉ un objecte incorrecte a la posiciรณ %<PRIuMAX>: %s" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:494 #, c-format msgid "inflate returned %d" msgstr "la inflaciรณ ha retornat %d" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:543 msgid "offset value overflow for delta base object" msgstr "" "desbordament de valor de desplaรงament per a l'objecte base de diferรจncies" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:551 msgid "delta base offset is out of bound" msgstr "el desplaรงament de base de diferรจncies estร fora de lรญmits" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:559 #, c-format msgid "unknown object type %d" msgstr "tipus d'objecte desconegut %d" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:590 msgid "cannot pread pack file" msgstr "no es pot fer pread en el fitxer empaquetat" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:592 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" @@ -13940,276 +15994,300 @@ msgstr[0] "el final del fitxer empaquetat รฉs prematur, manca %<PRIuMAX> octet" msgstr[1] "" "el final del fitxer empaquetat รฉs prematur, manquen %<PRIuMAX> octets" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:618 msgid "serious inflate inconsistency" msgstr "hi ha una inconsistรจncia seriosa d'inflaciรณ" -#: 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 +#: builtin/index-pack.c:763 builtin/index-pack.c:769 builtin/index-pack.c:793 +#: builtin/index-pack.c:832 builtin/index-pack.c:841 #, c-format 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:153 -#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 +#: builtin/index-pack.c:766 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:830 #, c-format msgid "cannot read existing object info %s" msgstr "no es pot llegir la informaciรณ d'objecte existent %s" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:838 #, c-format msgid "cannot read existing object %s" msgstr "no es pot llegir l'objecte existent %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:852 #, c-format msgid "invalid blob object %s" msgstr "objecte de blob no vร lid %s" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:855 builtin/index-pack.c:874 #, fuzzy msgid "fsck error in packed object" -msgstr "ignora els objectes empaquetats" +msgstr "fsck error en un objecte empaquetat" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:876 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No tots els objectes fills de %s sรณn abastables" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:940 builtin/index-pack.c:987 msgid "failed to apply delta" msgstr "s'ha produรฏt un error en aplicar la diferรจncia" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1166 msgid "Receiving objects" msgstr "S'estan rebent objectes" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1166 msgid "Indexing objects" msgstr "S'estan indexant objectes" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1200 msgid "pack is corrupted (SHA1 mismatch)" msgstr "el paquet รฉs malmรจs (discordanรงa SHA1)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1205 msgid "cannot fstat packfile" msgstr "no es pot fer fstat en el fitxer de paquet" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1208 msgid "pack has junk at the end" msgstr "el paquet tรฉ brossa al seu final" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1220 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusiรณ mรฉs enllร de la bogeria en parse_pack_objects()" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1243 msgid "Resolving deltas" msgstr "S'estan resolent les diferรจncies" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491 +#: builtin/index-pack.c:1254 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1287 msgid "confusion beyond insanity" msgstr "confusiรณ mรฉs enllร de la bogeria" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1293 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "s'ha completat amb %d objecte local" msgstr[1] "s'ha completat amb %d objectes locals" -#: builtin/index-pack.c:1264 +#: builtin/index-pack.c:1305 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Suma de verificaciรณ final no esperada per a %s (corrupciรณ de disc?)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1309 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "El paquet tรฉ %d diferรจncia no resolta" msgstr[1] "El paquet tรฉ %d diferรจncies no resoltes" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1333 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1429 #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s รฉs malmรจs" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1449 #, c-format msgid "packfile name '%s' does not end with '.pack'" -msgstr "el nom del fitxer de paquet ยซ%sยป no acaba amb '.pack'" +msgstr "el nom del fitxer de paquet ยซ%sยป no acaba amb ยซ.packยป" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1474 #, c-format msgid "cannot write %s file '%s'" msgstr "no es pot escriure ยซ%sยป al fitxer ยซ%sยป" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1482 #, fuzzy, c-format msgid "cannot close written %s file '%s'" -msgstr "no es pot tancar el fitxer escrit a mantenir ยซ%sยป" +msgstr "no s'ha pogut tancar l'arxiu ยซ%sยป per escrit" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1506 msgid "error while closing pack file" msgstr "error en tancar el fitxer empaquetat" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1520 msgid "cannot store pack file" msgstr "no es pot emmagatzemar el fitxer empaquetat" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1528 msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'รญndex" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730 +#: builtin/index-pack.c:1572 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> incorrecte" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1636 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No es pot obrir el fitxer empaquetat existent ยซ%sยป" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1638 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No es pot obrir el fitxer d'รญndex de paquets existent de ยซ%sยป" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1686 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "sense diferรจncies: %d objecte" msgstr[1] "sense diferรจncies: %d objectes" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1693 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longitud de cadena = %d: %lu objecte" msgstr[1] "longitud de cadena = %d: %lu objectes" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1733 msgid "Cannot come back to cwd" msgstr "No es pot tornar al directori de treball actual" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1782 builtin/index-pack.c:1785 +#: builtin/index-pack.c:1801 builtin/index-pack.c:1805 #, c-format msgid "bad %s" msgstr "%s incorrecte" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1811 builtin/init-db.c:391 builtin/init-db.c:623 +#, fuzzy, c-format +msgid "unknown hash algorithm '%s'" +msgstr "variable ยซ%sยป desconeguda" + +#: builtin/index-pack.c:1826 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1828 msgid "--stdin requires a git repository" msgstr "--stdin requereix un dipรฒsit git" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1830 +#, fuzzy +msgid "--object-format cannot be used with --stdin" +msgstr "--fix-thin no es pot usar sense --stdin" + +#: builtin/index-pack.c:1836 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:580 +#: builtin/index-pack.c:1897 builtin/unpack-objects.c:582 #, fuzzy msgid "fsck error in pack objects" -msgstr "error en objecte: %s" +msgstr "error fsck als objectes del paquet" -#: builtin/init-db.c:61 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "no es pot fer stat en la plantilla ยซ%sยป" -#: builtin/init-db.c:66 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "no es pot fer opendir en el directori ยซ%sยป" -#: builtin/init-db.c:78 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "no es pot fer readlink en ยซ%sยป" -#: builtin/init-db.c:80 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "no es pot fer symlink en ยซ%sยป ยซ%sยป" -#: builtin/init-db.c:86 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "no es pot copiar ยซ%sยป a ยซ%sยป" -#: builtin/init-db.c:90 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "s'estร ignorant la plantilla %s" -#: builtin/init-db.c:121 +#: builtin/init-db.c:124 #, fuzzy, c-format msgid "templates not found in %s" -msgstr "no s'han trobat les plantilles %s" +msgstr "plantilles no trobades en percentatges" -#: builtin/init-db.c:136 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "no s'estan copiant plantilles de ยซ%sยป: %s" -#: builtin/init-db.c:334 +#: builtin/init-db.c:274 +#, fuzzy, c-format +msgid "invalid initial branch name: '%s'" +msgstr "Nom de branca no vร lid: ยซ%sยป" + +#: builtin/init-db.c:366 #, c-format msgid "unable to handle file type %d" msgstr "no s'ha pogut gestionar el tipus de fitxer %d" -#: builtin/init-db.c:337 +#: builtin/init-db.c:369 #, c-format msgid "unable to move %s to %s" msgstr "no s'ha pogut moure %s a %s" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "" + +#: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format msgid "%s already exists" msgstr "%s ja existeix" -#: builtin/init-db.c:413 +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "" + +#: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "S'ha reinicialitzat el dipรฒsit compartit existent del Git en %s%s\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "S'ha reinicialitzat el dipรฒsit existent del Git en %s%s\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "S'ha inicialitzat un dipรฒsit compartit buit del Git en %s%s\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "S'ha inicialitzat un dipรฒsit buit del Git en %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:529 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -14217,25 +16295,44 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--" "shared[=<permisos>]] [<directori>]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:555 msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:492 +#: builtin/init-db.c:556 msgid "specify that the git repository is to be shared amongst several users" msgstr "especifica que el dipรฒsit de git es compartirร entre diversos usuaris" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:562 +#, fuzzy +msgid "override the name of the initial branch" +msgstr "passa per alt el bit executable dels fitxers llistats" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +#, fuzzy +msgid "hash" +msgstr "hash" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "" + +#: builtin/init-db.c:571 +#, fuzzy +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--deepen i --depth sรณn mรบtuament excloents" + +#: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format msgid "cannot mkdir %s" msgstr "no es pot mkdir %s" -#: builtin/init-db.c:538 +#: builtin/init-db.c:609 builtin/init-db.c:664 #, c-format msgid "cannot chdir to %s" msgstr "no es pot canviar de directori a %s" -#: builtin/init-db.c:559 +#: builtin/init-db.c:636 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -14244,11 +16341,16 @@ msgstr "" "no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-" "dir=<directori>)" -#: builtin/init-db.c:587 +#: builtin/init-db.c:688 #, c-format msgid "Cannot access work tree '%s'" msgstr "No es pot accedir a l'arbre de treball ยซ%sยป" +#: builtin/init-db.c:693 +#, fuzzy +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--first-parent รฉs incompatible amb --bisect" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -14294,8 +16396,9 @@ msgid "set parsing options" msgstr "estableix les opcions d'anร lisi" #: builtin/interpret-trailers.c:110 +#, fuzzy msgid "do not treat --- specially" -msgstr "" +msgstr "no tractis --- especialment" #: builtin/interpret-trailers.c:111 msgid "trailer" @@ -14313,52 +16416,40 @@ 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:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camรญ>...]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<opcions>] <objecte>..." -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "opciรณ --decorate no vร lida: %s" -#: 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 +#: builtin/log.c:177 msgid "show source" msgstr "mostra la font" -#: builtin/log.c:184 +#: builtin/log.c:178 msgid "Use mail map file" msgstr "Usa el fitxer de mapa de correu" -#: builtin/log.c:186 +#: builtin/log.c:181 msgid "only decorate refs that match <pattern>" msgstr "nomรฉs decora les referรจncies que coincideixin amb <patrรณ>" -#: builtin/log.c:188 +#: builtin/log.c:183 msgid "do not decorate refs that match <pattern>" msgstr "no decoris les referรจncies que coincideixen amb <patrรณ>" -#: builtin/log.c:189 +#: builtin/log.c:184 msgid "decorate options" msgstr "opcions de decoraciรณ" -#: builtin/log.c:192 +#: builtin/log.c:187 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" @@ -14367,365 +16458,395 @@ msgstr "Processa el rang de lรญnies n,m en el fitxer, comptant des d'1" msgid "Final output: %d %s\n" msgstr "Sortida final: %d %s\n" -#: builtin/log.c:551 +#: builtin/log.c:555 #, c-format msgid "git show %s: bad file" msgstr "git show %s: fitxer incorrecte" -#: builtin/log.c:566 builtin/log.c:660 +#: builtin/log.c:570 builtin/log.c:665 #, fuzzy, c-format msgid "could not read object %s" -msgstr "No es pot llegir l'objecte %s" +msgstr "no s'ha pogut llegir l'objecte per cent" -#: builtin/log.c:685 +#: builtin/log.c:690 #, fuzzy, c-format msgid "unknown type: %d" -msgstr "Tipus desconegut: %d" +msgstr "tipus desconegut" -#: builtin/log.c:808 +#: builtin/log.c:839 +#, fuzzy, c-format +msgid "%s: invalid cover from description mode" +msgstr "percentatges de cobertura no vร lida des del mode descripciรณ" + +#: builtin/log.c:846 msgid "format.headers without value" msgstr "format.headers sense valor" -#: builtin/log.c:925 +#: builtin/log.c:965 msgid "name of output directory is too long" msgstr "el nom del directori de sortida รฉs massa llarg" -#: builtin/log.c:941 +#: builtin/log.c:981 #, fuzzy, c-format msgid "cannot open patch file %s" -msgstr "No es pot obrir el fitxer de pedaรง %s" +msgstr "no s'han pogut obrir els fitxers de pedaรง" -#: builtin/log.c:958 +#: builtin/log.c:998 #, fuzzy msgid "need exactly one range" -msgstr "Cal exactament un rang." +msgstr "necessita exactament un interval" -#: builtin/log.c:968 +#: builtin/log.c:1008 #, fuzzy msgid "not a range" -msgstr "No รฉs un rang." +msgstr "no รฉs un interval" -#: builtin/log.c:1091 +#: builtin/log.c:1172 #, fuzzy msgid "cover letter needs email format" -msgstr "La carta de presentaciรณ necessita el format de correu electrรฒnic" +msgstr "la lletra de la portada necessita un format de correu electrรฒnic" -#: builtin/log.c:1097 +#: builtin/log.c:1178 #, fuzzy msgid "failed to create cover-letter file" -msgstr "S'ha produรฏt un error en crear els fitxers de sortida" +msgstr "no s'ha pogut crear el fitxer de portada" -#: builtin/log.c:1176 +#: builtin/log.c:1259 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to boig: %s" -#: builtin/log.c:1203 +#: builtin/log.c:1286 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]" -#: builtin/log.c:1261 +#: builtin/log.c:1344 #, fuzzy msgid "two output directories?" -msgstr "Hi ha dos directoris de sortida?" +msgstr "dos directoris de sortida?" -#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 #, fuzzy, c-format msgid "unknown commit %s" -msgstr "Comissiรณ desconeguda %s" +msgstr "percentatge de comissiรณ desconegut" -#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1506 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:1387 +#: builtin/log.c:1515 #, fuzzy msgid "could not find exact merge base" -msgstr "No s'ha pogut trobar la base exacta de fusiรณ." +msgstr "no s'ha pogut trobar la base exacta de la fusiรณ" -#: builtin/log.c:1391 +#: builtin/log.c:1525 #, fuzzy 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 "" -"S'ha produรฏt un error en obtenir la font. Si voleu registrar la comissiรณ " -"base\n" -"automร ticament, useu git branch --set-upstream-to per a\n" -"seguir una branca remota. O podeu especificar la comissiรณ base manualment\n" -"amb --base=<id-de-comissiรณ-base>." +"no s'ha pogut obtenir la font si voleu registrar la comissiรณ base " +"automร ticament si us plau useu la branca git --set-upstream-to per al " +"seguiment d'una branca remota. O podeu especificar la comissiรณ base per --" +"base=<base-commit-id> manualment" -#: builtin/log.c:1411 +#: builtin/log.c:1548 #, fuzzy msgid "failed to find exact merge base" -msgstr "S'ha produรฏt un error en trobar la base exacta de fusiรณ." +msgstr "no s'ha pogut trobar la base exacta de la fusiรณ" -#: builtin/log.c:1422 +#: builtin/log.c:1565 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:1426 +#: builtin/log.c:1575 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:1479 +#: builtin/log.c:1633 msgid "cannot get patch id" msgstr "no es pot obtenir l'id del pedaรง" -#: builtin/log.c:1531 +#: builtin/log.c:1690 #, fuzzy -msgid "failed to infer range-diff ranges" -msgstr "s'ha produรฏt un error en executar ยซ%sยป" +msgid "failed to infer range-diff origin of current series" +msgstr "no s'ha pogut inferir l'interval-diferรจncies" -#: builtin/log.c:1576 +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "" + +#: builtin/log.c:1736 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:1579 +#: builtin/log.c:1739 msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] fins i tot amb mรบltiples pedaรงos" -#: builtin/log.c:1583 +#: builtin/log.c:1743 msgid "print patches to standard out" msgstr "imprimeix els pedaรงos a la sortida estร ndard" -#: builtin/log.c:1585 +#: builtin/log.c:1745 msgid "generate a cover letter" msgstr "genera una carta de presentaciรณ" -#: builtin/log.c:1587 +#: builtin/log.c:1747 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:1588 +#: builtin/log.c:1748 msgid "sfx" msgstr "sufix" -#: builtin/log.c:1589 +#: builtin/log.c:1749 msgid "use <sfx> instead of '.patch'" -msgstr "usa <sufix> en lloc de '.patch'" +msgstr "usa <sufix> en lloc de ยซ.patchยป" -#: builtin/log.c:1591 +#: builtin/log.c:1751 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:1593 +#: builtin/log.c:1753 msgid "mark the series as Nth re-roll" msgstr "marca la sรจrie com a l'enรจsima llanรงada" -#: builtin/log.c:1595 +#: builtin/log.c:1755 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usa [RFC PATCH] en lloc de [PATCH]" -#: builtin/log.c:1598 +#: builtin/log.c:1758 +#, fuzzy +msgid "cover-from-description-mode" +msgstr "preferences-from-description-mode" + +#: builtin/log.c:1759 +#, fuzzy +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" +"genera parts d'una lletra de portada basant-se en la descripciรณ d'una branca" + +#: builtin/log.c:1761 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Usa [<prefix>] en lloc de [PATCH]" -#: builtin/log.c:1601 +#: builtin/log.c:1764 msgid "store resulting files in <dir>" msgstr "emmagatzema els fitxers resultants a <directori>" -#: builtin/log.c:1604 +#: builtin/log.c:1767 msgid "don't strip/add [PATCH]" msgstr "no despullis/afegeixis [PATCH]" -#: builtin/log.c:1607 +#: builtin/log.c:1770 msgid "don't output binary diffs" msgstr "no emetis diferรจncies binร ries" -#: builtin/log.c:1609 +#: builtin/log.c:1772 msgid "output all-zero hash in From header" msgstr "emet un hash de tots zeros en la capรงalera From" -#: builtin/log.c:1611 +#: builtin/log.c:1774 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:1613 +#: builtin/log.c:1776 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:1615 +#: builtin/log.c:1778 msgid "Messaging" msgstr "Missatgeria" -#: builtin/log.c:1616 +#: builtin/log.c:1779 msgid "header" msgstr "capรงalera" -#: builtin/log.c:1617 +#: builtin/log.c:1780 msgid "add email header" msgstr "afegeix una capรงalera de correu electrรฒnic" -#: builtin/log.c:1618 builtin/log.c:1620 +#: builtin/log.c:1781 builtin/log.c:1782 msgid "email" msgstr "correu electrรฒnic" -#: builtin/log.c:1618 +#: builtin/log.c:1781 msgid "add To: header" msgstr "afegeix la capรงalera To:" -#: builtin/log.c:1620 +#: builtin/log.c:1782 msgid "add Cc: header" msgstr "afegeix la capรงalera Cc:" -#: builtin/log.c:1622 +#: builtin/log.c:1783 msgid "ident" msgstr "identitat" -#: builtin/log.c:1623 +#: builtin/log.c:1784 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:1625 +#: builtin/log.c:1786 msgid "message-id" msgstr "ID de missatge" -#: builtin/log.c:1626 +#: builtin/log.c:1787 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:1627 builtin/log.c:1630 +#: builtin/log.c:1788 builtin/log.c:1791 msgid "boundary" msgstr "lรญmit" -#: builtin/log.c:1628 +#: builtin/log.c:1789 msgid "attach the patch" msgstr "adjunta el pedaรง" -#: builtin/log.c:1631 +#: builtin/log.c:1792 msgid "inline the patch" msgstr "posa el pedaรง en el cos" -#: builtin/log.c:1635 +#: builtin/log.c:1796 msgid "enable message threading, styles: shallow, deep" msgstr "habilita l'enfilada de missatges, estils: shallow, deep" -#: builtin/log.c:1637 +#: builtin/log.c:1798 msgid "signature" msgstr "signatura" -#: builtin/log.c:1638 +#: builtin/log.c:1799 msgid "add a signature" msgstr "afegeix una signatura" -#: builtin/log.c:1639 +#: builtin/log.c:1800 msgid "base-commit" msgstr "comissiรณ base" -#: builtin/log.c:1640 +#: builtin/log.c:1801 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:1642 +#: builtin/log.c:1804 msgid "add a signature from a file" msgstr "afegeix una signatura des d'un fitxer" -#: builtin/log.c:1643 +#: builtin/log.c:1805 msgid "don't print the patch filenames" msgstr "no imprimeixis els noms de fitxer del pedaรง" -#: builtin/log.c:1645 +#: builtin/log.c:1807 msgid "show progress while generating patches" msgstr "mostra el progrรฉs durant la generaciรณ de pedaรงos" -#: builtin/log.c:1647 +#: builtin/log.c:1809 +#, fuzzy msgid "show changes against <rev> in cover letter or single patch" msgstr "" +"mostra els canvis contra <rev> a la lletra de la portada o a un sol pedaรง" -#: builtin/log.c:1650 +#: builtin/log.c:1812 +#, fuzzy msgid "show changes against <refspec> in cover letter or single patch" msgstr "" +"mostra els canvis contra <refspec> a la lletra de la portada o a un sol pedaรง" -#: builtin/log.c:1652 +#: builtin/log.c:1814 +#, fuzzy msgid "percentage by which creation is weighted" -msgstr "" +msgstr "percentatge pel qual la creaciรณ รฉs ponderada" -#: builtin/log.c:1727 +#: builtin/log.c:1896 #, c-format msgid "invalid ident line: %s" msgstr "lรญnia d'identitat no vร lida: %s" -#: builtin/log.c:1742 +#: builtin/log.c:1911 #, fuzzy msgid "-n and -k are mutually exclusive" -msgstr "-n i -k sรณn mรบtuament excloents." +msgstr "-n i -k sรณn mรบtuament excloents" -#: builtin/log.c:1744 +#: builtin/log.c:1913 #, fuzzy msgid "--subject-prefix/--rfc and -k are mutually exclusive" -msgstr "--subject-prefix/--rfc i -k sรณn mรบtuament excloents." +msgstr "--subject-prefix/--rfc i -k sรณn mรบtuament excloents" -#: builtin/log.c:1752 +#: builtin/log.c:1921 msgid "--name-only does not make sense" msgstr "--name-only no tรฉ sentit" -#: builtin/log.c:1754 +#: builtin/log.c:1923 msgid "--name-status does not make sense" msgstr "--name-status no tรฉ sentit" -#: builtin/log.c:1756 +#: builtin/log.c:1925 msgid "--check does not make sense" msgstr "--check no tรฉ sentit" -#: builtin/log.c:1788 +#: builtin/log.c:1958 msgid "standard output, or directory, which one?" msgstr "sortida estร ndard o directori, quin dels dos?" -#: builtin/log.c:1877 +#: builtin/log.c:2062 +#, fuzzy msgid "--interdiff requires --cover-letter or single patch" -msgstr "" +msgstr "--interdiff requereix --cover-letter o un sol pedaรง" -#: builtin/log.c:1881 +#: builtin/log.c:2066 +#, fuzzy msgid "Interdiff:" -msgstr "" +msgstr "Interdiff" -#: builtin/log.c:1882 -#, c-format +#: builtin/log.c:2067 +#, fuzzy, c-format msgid "Interdiff against v%d:" -msgstr "" +msgstr "Interdiff contra v%d" -#: builtin/log.c:1888 +#: builtin/log.c:2073 +#, fuzzy msgid "--creation-factor requires --range-diff" -msgstr "" +msgstr "--creation-factor requereix --range-diff" -#: builtin/log.c:1892 +#: builtin/log.c:2077 +#, fuzzy msgid "--range-diff requires --cover-letter or single patch" -msgstr "" +msgstr "--range-diff requereix --cover-letter o un sol pedaรง" -#: builtin/log.c:1900 +#: builtin/log.c:2085 +#, fuzzy msgid "Range-diff:" -msgstr "" +msgstr "Diferรจncia-interval" -#: builtin/log.c:1901 -#, c-format +#: builtin/log.c:2086 +#, fuzzy, c-format msgid "Range-diff against v%d:" -msgstr "" +msgstr "Diferรจncia de l'interval contra el v%d" -#: builtin/log.c:1912 +#: builtin/log.c:2097 #, c-format msgid "unable to read signature file '%s'" msgstr "no s'ha pogut llegir el fitxer de signatura ยซ%sยป" -#: builtin/log.c:1948 +#: builtin/log.c:2133 msgid "Generating patches" msgstr "S'estan generant els pedaรงos" -#: builtin/log.c:1992 +#: builtin/log.c:2177 #, fuzzy msgid "failed to create output files" -msgstr "S'ha produรฏt un error en crear els fitxers de sortida" +msgstr "no s'han pogut crear els fitxers de sortida" -#: builtin/log.c:2051 +#: builtin/log.c:2236 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<font> [<cap> [<lรญmit>]]]" -#: builtin/log.c:2105 +#: builtin/log.c:2290 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14733,109 +16854,109 @@ msgstr "" "No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> " "manualment.\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opcions>] [<fitxer>...]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "identifica l'estat de fitxer amb etiquetes" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" -msgstr "usa lletres minรบscules per als fitxers 'assume unchanged'" +msgstr "usa lletres minรบscules per als fitxers ยซassume unchangedยป" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" -msgstr "usa lletres minรบscules per als fitxers 'fsmonitor clean'" +msgstr "usa lletres minรบscules per als fitxers ยซfsmonitor cleanยป" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "" "mostra en la sortida els fitxers desats en la memรฒria cau (per defecte)" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "mostra en la sortida els fitxers suprimits" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "mostra en la sortida els fitxers modificats" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "mostra en la sortida els altres fitxers" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "mostra en la sortida els fitxers ignorats" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "mostra en la sortida el nom d'objecte dels continguts ยซstageยป" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" -msgstr "mostra nomรฉs els noms dels directoris 'other'" +msgstr "mostra nomรฉs els noms dels directoris ยซotherยป" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "mostra els terminadors de lรญnia dels fitxers" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "no mostris els directoris buits" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "mostra en la sortida els fitxers sense fusionar" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "mostra la informaciรณ de resoluciรณ de desfet" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "omet els fitxers coincidents amb el patrรณ" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "els patrons d'exclusiรณ es llegeixen de <fitxer>" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "llegeix els patrons addicionals d'exclusiรณ per directori en <fitxer>" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "afegeix les exclusions estร ndards de git" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "fes que la sortida sigui relativa al directori superior del projecte" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "inclou recursivament als submรฒduls" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "si qualsevol <fitxer> no รฉs en l'รญndex, tracta-ho com a error" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "arbre" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "pretรฉn que els camins eliminats desprรฉs de <arbre> encara siguin presents" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "mostra les dades de depuraciรณ" @@ -14854,7 +16975,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:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 msgid "exec" msgstr "executable" @@ -14884,7 +17005,7 @@ msgstr "surt amb codi de sortida 2 si no es troba cap referรจncia coincident" #: builtin/ls-remote.c:75 msgid "show underlying ref in addition to the object pointed by it" -msgstr "mostra la referรจncia subjacent a mรฉs de l'objecte que senyali" +msgstr "mostra la referรจncia subjacent a mรฉs de l'objecte que assenyali" #: builtin/ls-tree.c:30 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" @@ -14928,290 +17049,398 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "mbox buit: ยซ%sยป" -#: builtin/merge.c:55 +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <comissiรณ> <comissiรณ>..." + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <comissiรณ>..." + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <comissiรณ>..." + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <comissiรณ> <comissiรณ>" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <referรจncia> [<comissiรณ>]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "emet tots els avantpassats comuns" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "troba els avantpassats per a una sola fusiรณ d'n vies" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "llista les revisions no abastables d'altres" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "รฉs la primera un avantpassat de l'altre?" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "" +"troba on <comissiรณ> s'ha bifurcat del registre de referรจncies de <referรจncia>" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" +"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> " +"<fitxer-original> <fitxer2>" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "envia els resultats a la sortida estร ndard" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "usa una fusiรณ basada en diff3" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "en conflictes, usa la nostra versiรณ" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "en conflictes, usa la seva versiรณ" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "en conflictes, usa una versiรณ d'uniรณ" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "en conflictes, usa aquesta mida de marcador" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "no avisis de conflictes" + +#: builtin/merge-file.c:47 +msgid "set labels for file1/orig-file/file2" +msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "opciรณ desconeguda %s" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "no s'ha pogut analitzar l'objecte ยซ%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] "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 +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 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "no s'ha pogut resoldre la referรจncia ยซ%sยป" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" +msgstr "S'estร fusionant %s amb %s\n" + +#: builtin/merge.c:56 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opcions>] [<comissiรณ>...]" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:120 msgid "switch `m' requires a value" msgstr "l'opciรณ ยซmยป requereix un valor" -#: builtin/merge.c:141 +#: builtin/merge.c:143 #, fuzzy, c-format msgid "option `%s' requires a value" -msgstr "l'opciรณ ยซ%sยป requereix un valor" +msgstr "l'opciรณ `%s' requereix un valor" -#: builtin/merge.c:187 +#: builtin/merge.c:189 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No s'ha pogut trobar l'estratรจgia de fusiรณ ยซ%sยป.\n" -#: builtin/merge.c:188 +#: builtin/merge.c:190 #, c-format msgid "Available strategies are:" msgstr "Les estratรจgies disponibles sรณn:" -#: builtin/merge.c:193 +#: builtin/merge.c:195 #, c-format msgid "Available custom strategies are:" msgstr "Les estratรจgies personalitzades disponibles sรณn:" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:246 builtin/pull.c:133 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:154 +#: builtin/merge.c:249 builtin/pull.c:136 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:157 +#: builtin/merge.c:250 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(sinรฒnim de --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:252 builtin/pull.c:142 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:166 +#: builtin/merge.c:255 builtin/pull.c:148 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:169 +#: builtin/merge.c:257 builtin/pull.c:151 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:172 +#: builtin/merge.c:259 builtin/pull.c:154 msgid "edit message before committing" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:259 +#: builtin/merge.c:261 msgid "allow fast-forward (default)" msgstr "permet l'avanรง rร pid (per defecte)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:263 builtin/pull.c:161 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:182 +#: builtin/merge.c:267 builtin/pull.c:164 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:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 msgid "strategy" msgstr "estratรจgia" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:269 builtin/pull.c:169 msgid "merge strategy to use" msgstr "estratรจgia de fusiรณ a usar" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option=value" msgstr "opciรณ=valor" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "opciรณ per a l'estratรจgia de fusiรณ seleccionada" -#: builtin/merge.c:271 +#: builtin/merge.c:273 msgid "merge commit message (for a non-fast-forward merge)" msgstr "missatge de comissiรณ de fusiรณ (per a una fusiรณ no d'avanรง rร pid)" -#: builtin/merge.c:278 +#: builtin/merge.c:280 msgid "abort the current in-progress merge" msgstr "avorta la fusiรณ en curs actual" -#: builtin/merge.c:280 +#: builtin/merge.c:282 #, fuzzy msgid "--abort but leave index and working tree alone" -msgstr "restableix HEAD, l'รญndex i l'arbre de treball" +msgstr "--abort perรฒ deixa l'รญndex i l'arbre de treball sols" -#: builtin/merge.c:282 +#: builtin/merge.c:284 msgid "continue the current in-progress merge" msgstr "continua la fusiรณ en curs actual" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:286 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "permet fusionar histรฒries no relacionades" -#: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "verifica el lligam de missatge de comissiรณ" +#: builtin/merge.c:293 +#, fuzzy +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "evita els ganxos pre-combinaciรณ i missatge de comissiรณ" -#: builtin/merge.c:307 +#: builtin/merge.c:310 msgid "could not run stash." msgstr "no s'ha pogut executar ยซstashยป." -#: builtin/merge.c:312 +#: builtin/merge.c:315 msgid "stash failed" msgstr "l'ยซstashยป ha fallat" -#: builtin/merge.c:317 +#: builtin/merge.c:320 #, c-format msgid "not a valid object: %s" msgstr "no รฉs un objecte vร lid: %s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:342 builtin/merge.c:359 msgid "read-tree failed" msgstr "read-tree ha fallat" -#: builtin/merge.c:386 +#: builtin/merge.c:389 msgid " (nothing to squash)" msgstr " (res a fer ยซsquashยป)" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Comissiรณ ยซsquashยป -- no s'estร actualitzant HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:450 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Cap missatge de fusiรณ -- no s'estร actualitzant HEAD\n" -#: builtin/merge.c:498 +#: builtin/merge.c:501 #, c-format msgid "'%s' does not point to a commit" msgstr "ยซ%sยป no assenyala una comissiรณ" -#: builtin/merge.c:585 +#: builtin/merge.c:588 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Cadena branch.%s.mergeoptions incorrecta: %s" -#: builtin/merge.c:708 +#: builtin/merge.c:713 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:722 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opciรณ desconeguda de merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "no s'ha pogut escriure %s" -#: builtin/merge.c:789 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "No s'ha pogut llegir de ยซ%sยป" -#: builtin/merge.c:798 +#: builtin/merge.c:802 #, 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" +"No s'estร cometent la fusiรณ; useu ยซgit commitยป per a completar la fusiรณ.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:808 #, fuzzy 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 "" -"Introduรฏu un missatge de comissiรณ per a explicar per quรจ\n" -"aquesta fusiรณ รฉs necessร ria, especialment si fusiona una font\n" -"actualitzada a una branca temร tica.\n" -"\n" -"S'ignoraran les lรญnies que comencin amb ยซ%cยป, i un missatge buit\n" -"avorta la comissiรณ.\n" +"Introduรฏu un missatge de comissiรณ per explicar per quรจ aquesta fusiรณ รฉs " +"necessร ria especialment si fusiona una font actualitzada en una branca de " +"tema." -#: builtin/merge.c:809 +#: builtin/merge.c:813 #, fuzzy msgid "An empty message aborts the commit.\n" -msgstr "edita el missatge abans de cometre" +msgstr "Un missatge buit avorta la publicaciรณ." -#: builtin/merge.c:812 +#: builtin/merge.c:816 #, fuzzy, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -"Introduรฏu el missatge de comissiรณ dels vostres canvis.\n" -"S'ignoraran les lรญnies que comencin amb ยซ%cยป, i un missatge de\n" -"comissiรณ buit avorta la comissiรณ.\n" +"Les lรญnies que comencen amb ยซ%cยป seran ignorades i un missatge buit " +"interromp la publicaciรณ." -#: builtin/merge.c:853 +#: builtin/merge.c:869 msgid "Empty commit message." msgstr "El missatge de comissiรณ รฉs buit." -#: builtin/merge.c:872 +#: builtin/merge.c:884 #, c-format msgid "Wonderful.\n" msgstr "Meravellรณs.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:945 #, 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:972 +#: builtin/merge.c:984 msgid "No current branch." msgstr "No hi ha cap branca actual." -#: builtin/merge.c:974 +#: builtin/merge.c:986 msgid "No remote for the current branch." msgstr "No hi ha cap remot per a la branca actual." -#: builtin/merge.c:976 +#: builtin/merge.c:988 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:981 +#: builtin/merge.c:993 #, 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:1038 +#: builtin/merge.c:1050 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor incorrecte ยซ%sยป en l'entorn ยซ%sยป" -#: builtin/merge.c:1141 +#: builtin/merge.c:1153 #, c-format msgid "not something we can merge in %s: %s" msgstr "no รฉs quelcom que puguem fusionar en %s: %s" -#: builtin/merge.c:1175 +#: builtin/merge.c:1187 msgid "not something we can merge" msgstr "no รฉs quelcom que puguem fusionar" -#: builtin/merge.c:1278 +#: builtin/merge.c:1291 msgid "--abort expects no arguments" -msgstr "--abort no accepta parร metres" +msgstr "--abort no espera cap argument" -#: builtin/merge.c:1282 +#: builtin/merge.c:1295 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hi ha fusiรณ a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1291 -#, fuzzy +#: builtin/merge.c:1313 msgid "--quit expects no arguments" -msgstr "--abort no accepta parร metres" +msgstr "--quit no espera cap argument" -#: builtin/merge.c:1304 +#: builtin/merge.c:1326 msgid "--continue expects no arguments" -msgstr "--continue no accepta parร metres" +msgstr "--continue no espera cap argument" -#: builtin/merge.c:1308 +#: builtin/merge.c:1330 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hi ha cap fusiรณ en curs (manca MERGE_HEAD)." -#: builtin/merge.c:1324 +#: builtin/merge.c:1346 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15219,7 +17448,7 @@ msgstr "" "No heu conclรฒs la vostra fusiรณ (MERGE_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1331 +#: builtin/merge.c:1353 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15227,217 +17456,105 @@ msgstr "" "No heu conclรฒs el vostre ยซcherry pickยป (CHERRY_PICK_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1334 +#: builtin/merge.c:1356 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:1348 +#: builtin/merge.c:1370 msgid "You cannot combine --squash with --no-ff." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1350 +#: builtin/merge.c:1372 #, fuzzy msgid "You cannot combine --squash with --commit." -msgstr "No podeu combinar --squash amb --no-ff." +msgstr "No podeu combinar --squash amb --commit." -#: builtin/merge.c:1366 +#: builtin/merge.c:1388 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:1383 +#: builtin/merge.c:1405 msgid "Squash commit into empty head not supported yet" msgstr "Una comissiรณ ยซsquashยป a un HEAD buit encara no es permet" -#: builtin/merge.c:1385 +#: builtin/merge.c:1407 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:1390 +#: builtin/merge.c:1412 #, c-format msgid "%s - not something we can merge" msgstr "%s - no รฉs una cosa que puguem fusionar" -#: builtin/merge.c:1392 +#: builtin/merge.c:1414 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:1471 +#: builtin/merge.c:1495 msgid "refusing to merge unrelated histories" msgstr "s'estร refusant fusionar histรฒries no relacionades" -#: builtin/merge.c:1480 +#: builtin/merge.c:1504 msgid "Already up to date." msgstr "Ja estร al dia." -#: builtin/merge.c:1490 +#: builtin/merge.c:1514 #, c-format msgid "Updating %s..%s\n" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1560 #, 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:1539 +#: builtin/merge.c:1567 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1592 msgid "Already up to date. Yeeah!" msgstr "Ja estร al dia. Estupend!" -#: builtin/merge.c:1570 +#: builtin/merge.c:1598 msgid "Not possible to fast-forward, aborting." msgstr "No รฉs possible avanรงar rร pidament, s'estร avortant." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1626 builtin/merge.c:1691 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "S'estร rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1630 #, c-format msgid "Trying merge strategy %s...\n" msgstr "S'estร intentant l'estratรจgia de fusiรณ %s...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1682 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratรจgia de fusiรณ ha gestionat la fusiรณ.\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1684 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratรจgia de fusiรณ %s ha fallat.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1693 #, 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:1672 +#: builtin/merge.c:1707 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "La fusiรณ automร tica ha sortit bรฉ; s'ha aturat abans de cometre com s'havia " "demanat\n" -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <comissiรณ> <comissiรณ>..." - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <comissiรณ>..." - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <comissiรณ>..." - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <comissiรณ> <comissiรณ>" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <referรจncia> [<comissiรณ>]" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "emet tots els avantpassats comuns" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "troba els avantpassats per a una sola fusiรณ d'n vies" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "llista les revisions no abastables d'altres" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "รฉs la primera un avantpassat de l'altre?" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "" -"troba on <comissiรณ> s'ha bifurcat del registre de referรจncies de <referรจncia>" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" -"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> " -"<fitxer-original> <fitxer2>" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "envia els resultats a la sortida estร ndard" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "usa una fusiรณ basada en diff3" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "en conflictes, usa la nostra versiรณ" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "en conflictes, usa la seva versiรณ" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "en conflictes, usa una versiรณ d'uniรณ" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "en conflictes, usa aquesta mida de marcador" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "no avisis de conflictes" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2" - -#: builtin/merge-recursive.c:46 -#, c-format -msgid "unknown option %s" -msgstr "opciรณ desconeguda %s" - -#: 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: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: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: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:78 -#, c-format -msgid "Merging %s with %s\n" -msgstr "S'estร fusionant %s amb %s\n" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -15455,37 +17572,45 @@ msgid "allow creation of more than one tree" msgstr "permet la creaciรณ de mรฉs d'un arbre" #: builtin/multi-pack-index.c:9 +#, fuzzy msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" +"git multi-pack-index [<opcions>] (write|verify|expire|repack --batch-" +"size=<size>)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 +#, fuzzy msgid "object directory containing set of packfile and pack-index pairs" msgstr "" +"directori de l'objecte que contรฉ el conjunt de parells packfile i pack-index" -#: builtin/multi-pack-index.c:25 +#: builtin/multi-pack-index.c:29 +#, fuzzy msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "" +"durant el reempaquetament dels fitxers de recollida de paquets de mida mรฉs " +"petita en un lot que รฉs mรฉs gran que aquesta mida" -#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" -msgstr "hi ha massa parร metres" +msgstr "hi ha massa arguments" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 msgid "--batch-size option is only for 'repack' subcommand" -msgstr "" +msgstr "--batch-size l'opciรณ nomรฉs รฉs per a la subordre ยซrepackยป" -#: builtin/multi-pack-index.c:61 +#: builtin/multi-pack-index.c:69 #, fuzzy, c-format msgid "unrecognized subcommand: %s" -msgstr "subordre desconeguda: %s" +msgstr "subcomandes no reconeguts" #: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" -msgstr "git mv [<opcions>] <font>... <destรญ>" +msgstr "git mv [<opcions>] <origen>... <destรญ>" #: builtin/mv.c:83 #, c-format @@ -15511,113 +17636,118 @@ msgstr "forรงa el moviment / canvi de nom encara que el destรญ existeixi" msgid "skip move/rename errors" msgstr "omet els errors de moviment / canvi de nom" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "el destรญ ยซ%sยป no รฉs un directori" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "S'estร comprovant el canvi de nom de ยซ%sยป a ยซ%sยป\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" -msgstr "font incorrecta" +msgstr "origen incorrecte" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "no es pot moure un directori a dins d'ell mateix" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "no es pot moure un directori sobre un fitxer" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" -msgstr "el directori font estร buit" +msgstr "el directori d'origen estร buit" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "no estร sota control de versions" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "el destรญ existeix" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "s'estร sobreescrivint ยซ%sยป" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "No es pot sobreescriure" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" -msgstr "mรบltiples fonts per al mateix destรญ" +msgstr "mรบltiples orรญgens per al mateix destรญ" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "el directori destรญ no existeix" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, origen=%s, destรญ=%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "S'estร canviant el nom de %s a %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520 +#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de ยซ%sยป ha fallat" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opcions>] <comissiรณ>..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opcions>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opcions>] --stdin" -#: 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:524 +#, fuzzy +msgid "print only ref-based names (no object names)" +msgstr "imprimeix nomรฉs les branques de l'objecte" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "nomรฉs usa les etiquetes per a anomenar les comissions" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "nomรฉs usa les referรจncies que coincideixin amb <patrรณ>" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ignora les referรจncies que coincideixin amb <patrรณ>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "llista totes les comissions abastables de totes les referรจncies" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "llegeix de stdin" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" -msgstr "permet imprimir els noms `undefined` (per defecte)" +msgstr "permet imprimir els noms ยซundefinedยป (per defecte)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "desreferencia les etiquetes en l'entrada (รบs intern)" @@ -15741,16 +17871,16 @@ msgstr "Escriviu/editeu les notes per l'objecte segรผent:" #: builtin/notes.c:150 #, c-format msgid "unable to start 'show' for object '%s'" -msgstr "no s'ha pogut iniciar 'show' per a l'objecte ยซ%sยป" +msgstr "no s'ha pogut iniciar ยซshowยป per a l'objecte ยซ%sยป" #: builtin/notes.c:154 msgid "could not read 'show' output" -msgstr "no s'ha pogut llegir la sortida de 'show'" +msgstr "no s'ha pogut llegir la sortida de ยซshowยป" #: builtin/notes.c:162 #, c-format msgid "failed to finish 'show' for object '%s'" -msgstr "S'ha produรฏt un error en finalitzar 'show' per a l'objecte ยซ%sยป" +msgstr "S'ha produรฏt un error en finalitzar ยซshowยป per a l'objecte ยซ%sยป" #: builtin/notes.c:197 msgid "please supply the note contents using either -m or -F option" @@ -15766,7 +17896,7 @@ msgstr "no s'ha pogut escriure l'objecte de nota" msgid "the note contents have been left in %s" msgstr "s'han deixat els continguts de la nota en %s" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "no s'ha pogut obrir o llegir ยซ%sยป" @@ -15848,7 +17978,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 @@ -15880,7 +18010,7 @@ msgid "" "existing notes" msgstr "" "No es poden copiar 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:550 #, c-format @@ -15893,7 +18023,7 @@ 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 "" -"Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n" +"Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre ยซeditยป.\n" "Useu ยซgit notes add -f -m/-F/-c/-Cยป en lloc d'aixรฒ.\n" #: builtin/notes.c:698 @@ -15907,7 +18037,7 @@ msgstr "s'ha produรฏt un error en suprimir la referรจncia NOTES_MERGE_REF" #: builtin/notes.c:702 msgid "failed to remove 'git notes merge' worktree" msgstr "" -"s'ha produรฏt un error en eliminar l'arbre de treball de 'git notes merge'" +"s'ha produรฏt un error en eliminar l'arbre de treball de ยซgit notes mergeยป" #: builtin/notes.c:722 msgid "failed to read ref NOTES_MERGE_PARTIAL" @@ -15999,10 +18129,10 @@ msgid "" "abort'.\n" msgstr "" "La fusiรณ de notes automร tica ha fallat. Arregleu els conflictes en %s i " -"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusiรณ amb " -"'git notes merge --abort'.\n" +"cometeu el resultat amb ยซgit notes merge --commitยป, o avorteu la fusiรณ amb " +"ยซgit notes merge --abortยป.\n" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, 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." @@ -16020,7 +18150,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:165 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "no eliminis, nomรฉs mostra" @@ -16036,415 +18166,415 @@ 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:1598 +#: builtin/notes.c:1034 builtin/stash.c:1605 #, c-format msgid "unknown subcommand: %s" msgstr "subordre desconeguda: %s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<opcions>...] [< <llista-de-referรจncies> | < " "<llista-de-objectes>]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<opcions>...] <nom-base> [< <llista-de-referรจncies> | < " "<llista-de-objectes>]" -#: builtin/pack-objects.c:424 +#: builtin/pack-objects.c:443 #, fuzzy, c-format msgid "bad packed object CRC for %s" -msgstr "ignora els objectes empaquetats" +msgstr "objecte CRC mal empaquetat per a percentatges" -#: builtin/pack-objects.c:435 +#: builtin/pack-objects.c:454 #, fuzzy, c-format msgid "corrupt packed object for %s" -msgstr "ignora els objectes empaquetats" +msgstr "objecte empaquetat corrupte durant els percentatges" -#: builtin/pack-objects.c:566 +#: builtin/pack-objects.c:585 #, fuzzy, c-format msgid "recursive delta detected for object %s" -msgstr "no s'ha rebut l'objecte esperat %s" - -#: builtin/pack-objects.c:777 -#, c-format -msgid "ordered %u objects, expected %<PRIu32>" -msgstr "" - -#: builtin/pack-objects.c:790 -#, fuzzy, c-format -msgid "packfile is invalid: %s" -msgstr "%s no vร lid" +msgstr "delta recursiu detectat per a objectes percentuals" -#: builtin/pack-objects.c:794 +#: builtin/pack-objects.c:796 #, fuzzy, c-format -msgid "unable to open packfile for reuse: %s" -msgstr "no s'ha pogut obrir o llegir %s" - -#: 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:809 -#, fuzzy -msgid "unable to read from reused packfile" -msgstr "no es pot llegir el fitxer d'รญndex" +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "s'esperava un objecte d'un 1% <PRIu32>" -#: builtin/pack-objects.c:837 +#: builtin/pack-objects.c:1004 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:850 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "S'estan escrivint els objectes" -#: builtin/pack-objects.c:912 builtin/update-index.c:89 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "s'ha produรฏt un error en fer stat a %s" -#: builtin/pack-objects.c:965 -#, c-format +#: builtin/pack-objects.c:1131 +#, fuzzy, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" -msgstr "" +msgstr "va escriure%<PRIu32> objectes mentre s'esperava un percentatge<PRIu32>" -#: builtin/pack-objects.c:1161 +#: builtin/pack-objects.c:1348 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:1591 +#: builtin/pack-objects.c:1796 #, 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" +msgstr "desplaรงament de base delta desbordament en paquet de percentatges" -#: builtin/pack-objects.c:1600 +#: builtin/pack-objects.c:1805 #, 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" +msgstr "decalatge de base de delta fora d'enllaรง per un percentatge" -#: builtin/pack-objects.c:1869 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "S'estan comptant els objectes" -#: 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:2014 +#: builtin/pack-objects.c:2231 #, fuzzy, c-format msgid "unable to parse object header of %s" -msgstr "no s'ha pogut analitzar l'objecte: %s" +msgstr "no s'ha pogut analitzar la capรงalera de l'objecte dels percentatges" -#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100 -#: builtin/pack-objects.c:2110 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, fuzzy, c-format msgid "object %s cannot be read" -msgstr "objecte %s no trobat" +msgstr "no es poden llegir els objectes percentuals" -#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114 -#, c-format +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 +#, fuzzy, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" -msgstr "" +msgstr "objecte%s longitud d'objecte inconsistent (%<PRIuMAX> vs%<PRIuMAX>)" -#: builtin/pack-objects.c:2124 +#: builtin/pack-objects.c:2341 +#, fuzzy msgid "suboptimal pack - out of memory" -msgstr "" +msgstr "paquet subรฒptim - sense memรฒria" -#: builtin/pack-objects.c:2450 -#, c-format +#: builtin/pack-objects.c:2656 +#, fuzzy, c-format msgid "Delta compression using up to %d threads" -msgstr "" +msgstr "Compressiรณ delta usant fils de fins a un 1%" -#: builtin/pack-objects.c:2582 +#: builtin/pack-objects.c:2795 #, fuzzy, c-format msgid "unable to pack objects reachable from tag %s" -msgstr "inclou els objectes abastables de qualsevol referรจncia" +msgstr "" +"no s'han pogut empaquetar els objectes abastables des de les etiquetes per " +"cent" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "S'estan comprimint els objectes" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2889 +#, fuzzy msgid "inconsistency with delta count" +msgstr "inconsistรจncia amb el comptador de diferรจncies" + +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" msgstr "" -#: builtin/pack-objects.c:2756 +#: builtin/pack-objects.c:2964 #, c-format msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" + +#: builtin/pack-objects.c:2993 +#, fuzzy, c-format +msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" +"s'esperava un identificador d'objecte de vora amb brossa s'han obtingut " +"percentatges d'escombraries" -#: builtin/pack-objects.c:2762 -#, c-format +#: builtin/pack-objects.c:2999 +#, fuzzy, c-format msgid "" "expected object ID, got garbage:\n" " %s" -msgstr "" +msgstr "s'esperava un ID d'objecte amb brossa" -#: builtin/pack-objects.c:2860 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "valor no vร lid per a --missing" -#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 #, fuzzy msgid "cannot open pack index" -msgstr "no es pot fer pread en el fitxer de paquet" +msgstr "no s'ha pogut obrir l'รญndex del paquet" -#: builtin/pack-objects.c:2950 -#, c-format +#: builtin/pack-objects.c:3187 +#, fuzzy, c-format msgid "loose object at %s could not be examined" -msgstr "" +msgstr "no s'han pogut examinar els objectes solts" -#: builtin/pack-objects.c:3035 +#: builtin/pack-objects.c:3272 #, fuzzy msgid "unable to force loose object" -msgstr "no s'ha pogut escriure l'objecte de nota" +msgstr "no s'ha pogut forรงar l'objecte solt" -#: builtin/pack-objects.c:3127 +#: builtin/pack-objects.c:3365 #, fuzzy, c-format msgid "not a rev '%s'" -msgstr "no es pot llegir ยซ%sยป" +msgstr "no รฉs una revisiรณ \"%s\"" -#: builtin/pack-objects.c:3130 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "revisiรณ incorrecte ยซ%sยป" -#: builtin/pack-objects.c:3155 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "no s'han pogut afegir els objectes recents" -#: builtin/pack-objects.c:3208 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "versiรณ d'รญndex no compatible %s" -#: builtin/pack-objects.c:3212 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "versiรณ d'รญndex incorrecta ยซ%sยป" -#: 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 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "<versiรณ>[,<desplaรงament>]" -#: builtin/pack-objects.c:3251 +#: builtin/pack-objects.c:3489 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:3254 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "mida mร xima de cada fitxer empaquetat de sortida" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3500 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:3264 +#: builtin/pack-objects.c:3502 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:3266 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "reusa les diferรจncies existents" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3510 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:3274 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "no creรฏs una emissiรณ de paquet buida" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" -msgstr "llegeix els parร metres de revisiรณ des de l'entrada estร ndard" +msgstr "llegeix els arguments de revisiรณ des de l'entrada estร ndard" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3516 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:3281 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevol referรจncia" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3522 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:3287 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referรจncia l'รญndex" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:3292 +#: builtin/pack-objects.c:3530 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:3294 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "retรฉn els objectes inabastables" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "empaqueta els objectes inabastables solts" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "desempaqueta els objectes inabastables mรฉs nous que <hora>" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3539 +#, fuzzy msgid "use the sparse reachability algorithm" -msgstr "" +msgstr "utilitza l'algorisme d'accessibilitat dispers" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "crea paquets prims" -#: builtin/pack-objects.c:3305 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "crea paquets adequats per a les obtencions superficials" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "ignora els paquets que tinguin un fitxer .keep corresponent" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3547 #, fuzzy msgid "ignore this pack" -msgstr "usa el paquet prim" +msgstr "ignora aquest paquet" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "nivell de compressiรณ de paquet" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "no amaguis les comissions per empelt" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3553 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:3317 +#: builtin/pack-objects.c:3555 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:3320 +#: builtin/pack-objects.c:3559 +#, fuzzy +msgid "write a bitmap index if possible" +msgstr "escriu un รญndex de mapa de bits si รฉs possible" + +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "gestiรณ dels objectes absents" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3566 +#, fuzzy msgid "do not pack objects in promisor packfiles" -msgstr "" +msgstr "no empaqueta els objectes als fitxers del paquet promisor" -#: builtin/pack-objects.c:3325 +#: builtin/pack-objects.c:3568 #, fuzzy msgid "respect islands during delta compression" -msgstr "mida de la finestra que s'usa per a compressiรณ de diferรจncies" +msgstr "respecta les illes durant la compressiรณ delta" -#: builtin/pack-objects.c:3350 -#, c-format +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "" + +#: builtin/pack-objects.c:3600 +#, fuzzy, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" +"la profunditat de la cadena delta รฉs massa profunda forรงant un percentatge" -#: builtin/pack-objects.c:3355 -#, c-format +#: builtin/pack-objects.c:3605 +#, fuzzy, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" -msgstr "" +msgstr "pack.deltaCacheLimit รฉs massa alt forรงant un percentatge" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3659 +#, fuzzy msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" +"--max-pack-size no es pot utilitzar per construir un paquet per a la " +"transferรจncia" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3661 +#, fuzzy msgid "minimum pack size limit is 1 MiB" -msgstr "" +msgstr "el lรญmit mรญnim de mida del paquet รฉs 1 MiB" -#: builtin/pack-objects.c:3416 +#: builtin/pack-objects.c:3666 #, fuzzy msgid "--thin cannot be used to build an indexable pack" -msgstr "--fix-thin no es pot usar sense --stdin" +msgstr "--thin no es pot utilitzar per construir un paquet indexable" -#: builtin/pack-objects.c:3419 +#: builtin/pack-objects.c:3669 #, fuzzy msgid "--keep-unreachable and --unpack-unreachable are incompatible" -msgstr "--keep-unreachable i -A sรณn incompatibles" +msgstr "--keep-unreachable i --unpack-unreachable sรณn incompatibles" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3675 #, fuzzy msgid "cannot use --filter without --stdout" -msgstr "no es pot usar -a amb -d" +msgstr "no es pot utilitzar --filter sense --stdout" -#: builtin/pack-objects.c:3486 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "S'estan enumerant els objectes" -#: builtin/pack-objects.c:3516 -#, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +#: builtin/pack-objects.c:3766 +#, fuzzy, c-format +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" msgstr "" -"Total %<PRIu32> (diferรจncies %<PRIu32>), reusat %<PRIu32> (diferรจncies " -"%<PRIu32>)" +"Total%<PRIu32> (delta %<PRIu32>) reutilitzat%<PRIu32> (delta %<PRIu32>) pack-" +"reutilitzat%<PRIu32>" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -16458,82 +18588,96 @@ msgstr "empaqueta-ho tot" msgid "prune loose refs (default)" msgstr "poda les referรจncies soltes (per defecte)" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 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 "S'estan eliminant objectes duplicats" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <hora>] [--] [<head>...]" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "informa d'objectes podats" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "fes caducar els objectes mรฉs vells que <hora>" -#: builtin/prune.c:136 +#: builtin/prune.c:138 +#, fuzzy msgid "limit traversal to objects outside promisor packfiles" -msgstr "" +msgstr "limita el trร nsit d'objectes fora dels fitxers del paquet promisor" -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "no es pot podar en un dipรฒsit d'objectes preciosos" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor no vร lid per a %s: %s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opcions>] [<dipรฒsit> [<especificaciรณ-de-referรจncia>...]]" -#: builtin/pull.c:141 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "controla l'obtenciรณ recursiva de submรฒduls" -#: builtin/pull.c:145 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "Opcions relacionades amb fusionar" -#: builtin/pull.c:148 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "incorpora els canvis fent ยซrebaseยป en lloc de fusionar" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permet l'avanรง rร pid" -#: 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:167 parse-options.h:339 +#, fuzzy +msgid "automatically stash/stash pop before and after" +msgstr "ยซstashยป/ยซstashยป automร ticament abans i desprรฉs" -#: builtin/pull.c:201 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "Opcions relacionades amb obtenir" -#: builtin/pull.c:211 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "forรงa la sobreescriptura de la branca local" -#: builtin/pull.c:219 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "nombre de submรฒduls baixats en paralยทlel" -#: builtin/pull.c:316 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor no vร lid per a pull.ff: %s" -#: builtin/pull.c:433 +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" + +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16541,13 +18685,13 @@ msgstr "" "No hi ha cap candidat sobre el qual fer ยซrebaseยป entre les referรจncies que " "acabeu d'obtenir." -#: builtin/pull.c:435 +#: builtin/pull.c:460 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:436 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16555,7 +18699,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:439 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16566,44 +18710,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:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Actualment no sou en cap branca." -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." -msgstr "Especifiqueu sobre quรจ branca voleu fer ยซrebaseยป." +msgstr "Especifiqueu sobre quina branca voleu fer ยซrebaseยป." -#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 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:449 builtin/pull.c:464 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." -msgstr "Vegeu git-pull(1) per detalls." +msgstr "Vegeu git-pull(1) per a mรฉs informaciรณ." -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remot>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branca>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1238 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:468 git-parse-remote.sh:95 +#: builtin/pull.c:493 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:473 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16612,33 +18756,29 @@ 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:581 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "no s'ha pogut accedir a la comissiรณ %s" -#: builtin/pull.c:861 +#: builtin/pull.c:894 msgid "ignoring --verify-signatures for rebase" msgstr "s'estร ignorant --verify-signatures en fer ยซrebaseยป" -#: 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:924 +#: builtin/pull.c:954 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:928 +#: builtin/pull.c:958 msgid "pull with rebase" msgstr "baixar fent ยซrebaseยป" -#: builtin/pull.c:929 +#: builtin/pull.c:959 msgid "please commit or stash them." msgstr "cometeu-los o emmagatzemeu-los." -#: builtin/pull.c:954 +#: builtin/pull.c:984 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16649,7 +18789,7 @@ msgstr "" "s'estร avanรงant rร pidament el vostre arbre de treball des de\n" "la comissiรณ %s." -#: builtin/pull.c:960 +#: builtin/pull.c:990 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16667,15 +18807,15 @@ msgstr "" "$ git reset --hard\n" "per a recuperar." -#: builtin/pull.c:975 +#: builtin/pull.c:1005 msgid "Cannot merge multiple branches into empty head." msgstr "No es poden fusionar mรบltiples branques a un HEAD buit." -#: builtin/pull.c:979 +#: builtin/pull.c:1009 msgid "Cannot rebase onto multiple branches." msgstr "No es pot fer ยซrebaseยป sobre mรบltiples branques." -#: builtin/pull.c:986 +#: builtin/pull.c:1017 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no es pot fer ยซrebaseยป amb modificacions als submรฒduls enregistrades " @@ -16689,20 +18829,20 @@ msgstr "git push [<opcions>] [<dipรฒsit> [<especificaciรณ-de-referรจncia>...]]" msgid "tag shorthand without <tag>" msgstr "abreviatura d'etiqueta sense <tag>" -#: builtin/push.c:121 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "--delete nomรฉs accepta noms de referรจncia de destรญ senzills" -#: builtin/push.c:167 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" -"Per a triar qualsevol opciรณ permanentment, vegeu push.default a 'git help " -"config'." +"Per a triar qualsevol opciรณ permanentment, vegeu push.default a ยซgit help " +"configยป." -#: builtin/push.c:170 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16727,7 +18867,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16742,7 +18882,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-branca-remota>\n" -#: builtin/push.c:199 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16755,13 +18895,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:202 #, 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:210 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -16772,14 +18912,14 @@ msgstr "" "branca actual ยซ%sยป, sense dir-me quรจ pujar per a actualitzar\n" "quina branca remota." -#: builtin/push.c:269 +#: builtin/push.c:260 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\"." +"รฉs ยซnothingยป." -#: builtin/push.c:276 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -16788,10 +18928,11 @@ msgid "" msgstr "" "S'han rebutjat les actualitzacions perquรจ el punt de la vostra branca\n" "actual estร darrere de la seva branca remota corresponent. Integreu\n" -"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." +"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 a mรฉs " +"informaciรณ." -#: builtin/push.c:282 +#: builtin/push.c:273 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" @@ -16800,11 +18941,12 @@ msgid "" msgstr "" "S'han rebutjat les actualitzacions perquรจ un punt de branca pujada\n" "estร darrere de la seva branca remota corresponent. Agafeu aquesta\n" -"branca i integreu els canvis remots (per exemple, 'git pull ...')\n" +"branca i integreu els canvis remots (per exemple, ยซgit pull ...ยป)\n" "abans de pujar de nou.\n" -"Vegeu la 'Nota sobre avanรงos rร pids' a 'git push --help' per detalls." +"Vegeu la ยซNota sobre avanรงos rร pidsยป a ยซgit push --helpยป per a mรฉs " +"informaciรณ." -#: builtin/push.c:288 +#: builtin/push.c:279 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" @@ -16815,16 +18957,17 @@ msgstr "" "S'han rebutjat les actualitzacions perquรจ el remot contรฉ canvis\n" "que no teniu localment. Aixรฒ acostuma a ser causat per un altre dipรฒsit\n" "que ha pujat a la mateixa referรจncia. Pot ser que primer vulgueu\n" -"integrar els canvis remots (per exemple, 'git pull ...') abans de\n" +"integrar els canvis remots (per exemple, ยซgit pull ...ยป) abans de\n" "pujar de nou.\n" -"Vegeu la 'Nota sobre avanรงos rร pids' a 'git push --help' per detalls." +"Vegeu la ยซNota sobre avanรงos rร pidsยป a ยซgit push --helpยป per a mรฉs " +"informaciรณ." -#: builtin/push.c:295 +#: builtin/push.c:286 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:298 +#: builtin/push.c:289 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" @@ -16833,178 +18976,192 @@ msgstr "" "No podeu actualitzar una referรจncia remota que assenyala un\n" "objecte no de comissiรณ, ni actualitzar una referรจncia remota per\n" "fer que assenyali un objecte no de comissiรณ, sense usar l'opciรณ\n" -"'--force'.\n" +"ยซ--forceยป.\n" -#: builtin/push.c:359 +#: builtin/push.c:351 #, c-format msgid "Pushing to %s\n" msgstr "S'estร pujant a %s\n" -#: builtin/push.c:364 +#: builtin/push.c:358 #, 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: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 +#: builtin/push.c:532 msgid "repository" msgstr "dipรฒsit" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:533 builtin/send-pack.c:183 msgid "push all refs" msgstr "puja totes les referรจncies" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:534 builtin/send-pack.c:185 msgid "mirror all refs" msgstr "reflecteix totes les referรจncies" -#: builtin/push.c:558 +#: builtin/push.c:536 msgid "delete refs" msgstr "suprimeix les referรจncies" -#: builtin/push.c:559 +#: builtin/push.c:537 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:562 builtin/send-pack.c:167 +#: builtin/push.c:540 builtin/send-pack.c:186 msgid "force updates" msgstr "forรงa les actualitzacions" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:541 builtin/send-pack.c:198 msgid "<refname>:<expect>" msgstr "<nom-de-referรจncia>:<esperat>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:542 builtin/send-pack.c:199 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:568 +#: builtin/push.c:545 msgid "control recursive pushing of submodules" msgstr "controla la pujada recursiva dels submรฒduls" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:546 builtin/send-pack.c:193 msgid "use thin pack" msgstr "usa el paquet prim" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 msgid "receive pack program" msgstr "programa que rep els paquets" -#: builtin/push.c:573 +#: builtin/push.c:549 msgid "set upstream for git pull/status" msgstr "estableix la font per a git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:552 msgid "prune locally removed refs" msgstr "poda les referรจncies eliminades localment" -#: builtin/push.c:578 +#: builtin/push.c:554 msgid "bypass pre-push hook" msgstr "evita el lligam de prepujada" -#: builtin/push.c:579 +#: builtin/push.c:555 msgid "push missing but relevant tags" msgstr "puja les etiquetes absents perรฒ rellevants" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:557 builtin/send-pack.c:187 msgid "GPG sign the push" msgstr "signa la pujada amb GPG" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:559 builtin/send-pack.c:194 msgid "request atomic transaction on remote side" msgstr "demana una transacciรณ atรฒmica al costat remot" -#: builtin/push.c:602 +#: builtin/push.c:577 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete รฉs incompatible amb --all, --mirror i --tags" -#: builtin/push.c:604 +#: builtin/push.c:579 msgid "--delete doesn't make sense without any refs" msgstr "--delete no tรฉ sentit sense referรจncies" -#: builtin/push.c:607 +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "dipรฒsit incorrecte ยซ%sยป" + +#: builtin/push.c:600 +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:615 msgid "--all and --tags are incompatible" msgstr "--all i --tags sรณn incompatibles" -#: builtin/push.c:609 +#: builtin/push.c:617 msgid "--all can't be combined with refspecs" msgstr "--all no es pot combinar amb especificacions de referรจncia" -#: builtin/push.c:613 +#: builtin/push.c:621 msgid "--mirror and --tags are incompatible" msgstr "--mirror i --tags sรณn incompatibles" -#: builtin/push.c:615 +#: builtin/push.c:623 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no es pot combinar amb especificacions de referรจncia" -#: builtin/push.c:618 +#: builtin/push.c:626 msgid "--all and --mirror are incompatible" msgstr "--all i --mirror sรณn incompatibles" -#: builtin/push.c:637 +#: builtin/push.c:630 msgid "push options must not have new line characters" msgstr "les opcions de pujada no han de tenir carร cters de lรญnia nova" #: builtin/range-diff.c:8 +#, fuzzy msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" +"git range-diff [<opcions>] <old-base>..<old-tip> <new-base>.<new-tip>..<new-" +"tip>." #: builtin/range-diff.c:9 #, fuzzy msgid "git range-diff [<options>] <old-tip>...<new-tip>" -msgstr "git merge [<opcions>] [<comissiรณ>...]" +msgstr "git range-diff [<opcions>] <old-tip><new-tip>" #: builtin/range-diff.c:10 #, fuzzy msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" -msgstr "git mv [<opcions>] <font>... <destรญ>" +msgstr "git range-diff [<opcions>] <base> <old-tip> <new-tip>" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 +#, fuzzy msgid "Percentage by which creation is weighted" -msgstr "" +msgstr "Percentatge pel qual es pondera la creaciรณ" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "utilitza colors simples de diff" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: builtin/range-diff.c:26 +#, fuzzy +msgid "notes" +msgstr "notes" + +#: builtin/range-diff.c:26 +#, fuzzy +msgid "passed to 'git log'" +msgstr "passa a 'git log'" + +#: builtin/range-diff.c:50 builtin/range-diff.c:54 #, c-format msgid "no .. in range: '%s'" msgstr "cap .. en rang: ยซ%sยป" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 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:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "calen dos rangs de comissiรณ" @@ -17085,247 +19242,242 @@ msgstr "depura unpack-trees" #: builtin/read-tree.c:157 #, fuzzy msgid "suppress feedback messages" -msgstr "omet els missatges informatius" +msgstr "suprimeix els missatges de retroacciรณ" + +#: builtin/read-tree.c:188 +#, fuzzy +msgid "You need to resolve your current index first" +msgstr "Primer heu de resoldre l'รญndex actual" -#: builtin/rebase.c:32 +#: builtin/rebase.c:35 #, fuzzy msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git archive --remote <dipรฒsit> [--exec <ordre>] [<opcions>] <arbre> " -"[<camรญ>...]" +"git rebase [-i] [opcions] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 +#, fuzzy msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" +"git rebase [-i] [opcions] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 #, c-format msgid "unusable todo list: '%s'" msgstr "llista per a fer inestable: ยซ%sยป" -#: 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:252 -msgid "no HEAD?" -msgstr "no hi ha cap HEAD?" - -#: builtin/rebase.c:279 +#: builtin/rebase.c:304 #, c-format msgid "could not create temporary %s" msgstr "no s'ha pogut crear el fitxer temporal %s" -#: builtin/rebase.c:285 +#: builtin/rebase.c:310 msgid "could not mark as interactive" msgstr "no s'ha pogut marcar com a interactiu" -#: builtin/rebase.c:343 +#: builtin/rebase.c:364 msgid "could not generate todo list" msgstr "no s'ha pogut generar la llista per a fer" -#: builtin/rebase.c:382 +#: builtin/rebase.c:405 +#, fuzzy msgid "a base commit must be provided with --upstream or --onto" -msgstr "" +msgstr "s'ha de proporcionar una comissiรณ base amb --upstream o --onto" -#: builtin/rebase.c:437 +#: builtin/rebase.c:474 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<opcions>]" -#: builtin/rebase.c:449 -msgid "keep empty commits" -msgstr "mantรฉn les comissions buides" +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" +msgstr "" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:491 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permet les comissions amb missatges buits" -#: builtin/rebase.c:452 +#: builtin/rebase.c:493 msgid "rebase merge commits" msgstr "fes ยซrebaseยป de les comissions de fusiรณ" -#: builtin/rebase.c:454 +#: builtin/rebase.c:495 +#, fuzzy msgid "keep original branch points of cousins" -msgstr "" +msgstr "mantรฉn els punts de branca originals dels cosins" -#: builtin/rebase.c:456 +#: builtin/rebase.c:497 +#, fuzzy msgid "move commits that begin with squash!/fixup!" -msgstr "" +msgstr "mou les comissions que comencen amb squash!/fixup!" -#: builtin/rebase.c:457 +#: builtin/rebase.c:498 msgid "sign commits" msgstr "signa les comissions" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:500 builtin/rebase.c:1321 +#, fuzzy msgid "display a diffstat of what changed upstream" -msgstr "" +msgstr "mostra un ยซdiffstatยป de la font que ha canviat" -#: builtin/rebase.c:461 +#: builtin/rebase.c:502 msgid "continue rebase" msgstr "continua el ยซrebaseยป" -#: builtin/rebase.c:463 +#: builtin/rebase.c:504 msgid "skip commit" msgstr "omet la comissiรณ" -#: builtin/rebase.c:464 +#: builtin/rebase.c:505 msgid "edit the todo list" msgstr "edita la llista a fer" -#: builtin/rebase.c:466 +#: builtin/rebase.c:507 msgid "show the current patch" msgstr "mostra el pedaรง actual" -#: builtin/rebase.c:469 +#: builtin/rebase.c:510 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:471 +#: builtin/rebase.c:512 msgid "expand commit ids in the todo list" msgstr "expandeix els ids de les comissions en la llista per a fer" -#: builtin/rebase.c:473 +#: builtin/rebase.c:514 msgid "check the todo list" msgstr "comprova la llista a fer" -#: builtin/rebase.c:475 +#: builtin/rebase.c:516 msgid "rearrange fixup/squash lines" msgstr "reorganitza les lรญnies ยซfixup/pickยป" -#: builtin/rebase.c:477 +#: builtin/rebase.c:518 msgid "insert exec commands in todo list" msgstr "expandeix les ordres exec en la llista per a fer" -#: builtin/rebase.c:478 +#: builtin/rebase.c:519 +#, fuzzy msgid "onto" -msgstr "" +msgstr "sobre" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 #, fuzzy msgid "restrict-revision" -msgstr "revisiรณ" +msgstr "revisiรณ restringida" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 #, fuzzy msgid "restrict revision" -msgstr "revisiรณ" +msgstr "restringeix la revisiรณ" -#: builtin/rebase.c:483 +#: builtin/rebase.c:524 +#, fuzzy msgid "squash-onto" -msgstr "" +msgstr "squash-onto" -#: builtin/rebase.c:484 +#: builtin/rebase.c:525 +#, fuzzy msgid "squash onto" -msgstr "" +msgstr "carabassa a" -#: builtin/rebase.c:486 +#: builtin/rebase.c:527 #, fuzzy msgid "the upstream commit" -msgstr "Desassigna la informaciรณ de font" +msgstr "la comissiรณ principal" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 #, fuzzy msgid "head-name" -msgstr "canvi de nom" +msgstr "nom-cap" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 #, fuzzy msgid "head name" -msgstr "davant per " +msgstr "nom del cap" -#: builtin/rebase.c:493 +#: builtin/rebase.c:534 #, fuzzy msgid "rebase strategy" -msgstr "estratรจgia de fusiรณ" +msgstr "estratรจgia de rebase" -#: builtin/rebase.c:494 +#: builtin/rebase.c:535 #, fuzzy msgid "strategy-opts" -msgstr "estratรจgia" +msgstr "opcions estratรจgiques" -#: builtin/rebase.c:495 +#: builtin/rebase.c:536 #, fuzzy msgid "strategy options" -msgstr "opcions de decoraciรณ" +msgstr "opcions d'estratรจgia" -#: builtin/rebase.c:496 +#: builtin/rebase.c:537 +#, fuzzy msgid "switch-to" -msgstr "" +msgstr "canvia a" -#: builtin/rebase.c:497 +#: builtin/rebase.c:538 +#, fuzzy msgid "the branch or commit to checkout" -msgstr "" +msgstr "la branca o entrega a agafar" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 #, fuzzy msgid "onto-name" -msgstr "nom" +msgstr "ont-name" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 #, fuzzy msgid "onto name" -msgstr "nom del remot" +msgstr "al nom" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 #, fuzzy msgid "cmd" -msgstr "ordre" +msgstr "cmd" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "the command to run" msgstr "l'ordre a executar" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:543 builtin/rebase.c:1415 +#, fuzzy msgid "automatically re-schedule any `exec` that fails" -msgstr "" +msgstr "torna a planificar automร ticament qualsevol `exec` que falli" -#: builtin/rebase.c:518 +#: builtin/rebase.c:559 +#, fuzzy msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -msgstr "" +msgstr "--[no-]rebase-cosins no tรฉ cap efecte sense --rebase-merges" -#: builtin/rebase.c:534 -#, c-format -msgid "%s requires an interactive rebase" +#: builtin/rebase.c:575 +#, fuzzy, c-format +msgid "%s requires the merge backend" msgstr "%s requereix un ยซrebaseยป interactiu" -#: builtin/rebase.c:586 +#: builtin/rebase.c:618 #, fuzzy, c-format msgid "could not get 'onto': '%s'" -msgstr "no s'ha pogut establir ยซ%sยป a ยซ%sยป" +msgstr "no s'ha pogut obtenir ยซontoยป ยซ%sยป" -#: builtin/rebase.c:601 +#: builtin/rebase.c:635 #, fuzzy, c-format msgid "invalid orig-head: '%s'" -msgstr "fitxer no vร lid: ยซ%sยป" +msgstr "orig-head '%s' no รฉs vร lid" -#: builtin/rebase.c:626 -#, c-format +#: builtin/rebase.c:660 +#, fuzzy, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" -msgstr "" - -#: builtin/rebase.c:702 -#, c-format -msgid "Could not read '%s'" -msgstr "No s'ha pogut llegir ยซ%sยป" - -#: builtin/rebase.c:720 -#, c-format -msgid "Cannot store %s" -msgstr "No es pot emmagatzemar %s" - -#: builtin/rebase.c:827 -msgid "could not determine HEAD revision" -msgstr "no s'ha pogut determinar la revisiรณ de HEAD" +msgstr "s'ignorarร allowrerereautoupdate ยซ%sยป no vร lid" -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:805 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" @@ -17334,14 +19486,14 @@ 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:1031 -#, c-format +#: builtin/rebase.c:888 +#, fuzzy, c-format msgid "" "\n" "git encountered an error while preparing the patches to replay\n" @@ -17351,8 +19503,19 @@ msgid "" "\n" "As a result, git cannot rebase them." msgstr "" +"git va trobar un error en preparar els pedaรงos per a tornar a reproduir " +"aquests revisions per cent. Com a resultat git no pot refer-los." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1214 +#, fuzzy, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "" +"no es reconeix el tipus buit ยซ%sยป; els valors vร lids sรณn ยซdropยป ยซkeepยป i " +"ยซaskยป." + +#: builtin/rebase.c:1232 #, c-format msgid "" "%s\n" @@ -17363,13 +19526,13 @@ msgid "" "\n" msgstr "" "%s\n" -"Especifiqueu sobre quรจ branca voleu fer ยซrebaseยป.\n" -"Vegeu git-rebase(1) per detalls.\n" +"Especifiqueu sobre quina branca voleu fer ยซrebaseยป.\n" +"Vegeu git-rebase(1) per a mรฉs informaciรณ.\n" "\n" " git rebase '<branca>'\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1248 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17380,168 +19543,216 @@ msgstr "" "Si voleu establir informaciรณ de seguiment per a aquesta branca, podeu fer-ho " "amb:\n" "\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +" git branch --set-upstream-to=%s/<branca> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1278 #, fuzzy msgid "exec commands cannot contain newlines" -msgstr "expandeix les ordres exec en la llista per a fer" +msgstr "les ordres exec no poden contenir lรญnies noves" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1282 +#, fuzzy msgid "empty exec command" -msgstr "" +msgstr "ordre exec buida" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1312 msgid "rebase onto given branch instead of upstream" msgstr "fes un ยซrebaseยป en la branca donada en comptes de la font" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1314 +#, fuzzy +msgid "use the merge-base of upstream and branch as the current base" +msgstr "utilitza la base de fusiรณ de la font i la branca com a base actual" + +#: builtin/rebase.c:1316 msgid "allow pre-rebase hook to run" msgstr "permet al lligam pre-rebase executar-se" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1318 msgid "be quiet. implies --no-stat" msgstr "silenciรณs. Implica --no-stat" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1324 #, fuzzy msgid "do not show diffstat of what changed upstream" -msgstr "no mostris les estadรญstiques de diferรจncia al final de la fusiรณ" +msgstr "no mostris ยซdiffstatยป de quina font ha canviat" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1327 #, fuzzy msgid "add a Signed-off-by: line to each commit" -msgstr "afegeix una lรญnia ยซSigned-off-byยป al missatge de comissiรณ" +msgstr "afegeix una lรญnia signada per cada entrega" + +#: builtin/rebase.c:1330 +#, fuzzy +msgid "make committer date match author date" +msgstr "Agrupa per ยซcomitterยป en comptes de per autor" + +#: builtin/rebase.c:1332 +msgid "ignore author date and use current date" +msgstr "" -#: 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:1334 +#, fuzzy +msgid "synonym of --reset-author-date" +msgstr "sinรฒnim de --files-with-matches" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1336 builtin/rebase.c:1340 msgid "passed to 'git apply'" msgstr "passa-ho a ยซgit-applyยป" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1338 +#, fuzzy +msgid "ignore changes in whitespace" +msgstr "ignora els canvis d'espai en blanc al final de la lรญnia" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 msgid "cherry-pick all commits, even if unchanged" msgstr "ยซcherry pickยป totes les comissions, inclรบs les no canviades" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1347 msgid "continue" msgstr "continua" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1350 msgid "skip current patch and continue" msgstr "omet el pedaรง actual i continua" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1352 msgid "abort and check out the original branch" msgstr "interromp i agafa la branca original" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1355 msgid "abort but keep HEAD where it is" msgstr "interromp perรฒ mantรฉ HEAD on รฉs" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1356 msgid "edit the todo list during an interactive rebase" msgstr "edita la llista de coses a fer durant un ยซrebaseยป interactiu" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1359 msgid "show the patch file being applied or merged" msgstr "mostra el pedaรง que s'estร aplicant o fusionant" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1362 +#, fuzzy +msgid "use apply strategies to rebase" +msgstr "utilitza estratรจgies d'aplicaciรณ per fer ยซrebaseยป" + +#: builtin/rebase.c:1366 #, fuzzy msgid "use merging strategies to rebase" -msgstr "estratรจgia de fusiรณ a usar" +msgstr "utilitza estratรจgies de fusiรณ per fer ยซrebaseยป" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1370 +#, fuzzy msgid "let the user edit the list of commits to rebase" -msgstr "" +msgstr "permet a l'usuari editar la llista de ยซcommitsยป a ยซrebaseยป" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1374 #, fuzzy msgid "(DEPRECATED) try to recreate merges instead of ignoring them" -msgstr "intenta recrear les " +msgstr "(DEPRECATED) intenta recrear fusions en lloc d'ignorar-les" -#: builtin/rebase.c:1455 +#: builtin/rebase.c:1379 #, fuzzy -msgid "preserve empty commits during rebase" -msgstr "preserva les comissions inicialment buides" +msgid "how to handle commits that become empty" +msgstr "com gestionar les comissions que queden buides" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1386 +#, fuzzy msgid "move commits that begin with squash!/fixup! under -i" -msgstr "" +msgstr "mou les comissions que comencen amb squash!/fixup! sota -i" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1393 #, 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:1465 msgid "add exec lines after each commit of the editable list" -msgstr "" +msgstr "afegeix lรญnies d'exec desprรฉs de cada publicaciรณ de la llista editable" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1397 #, fuzzy msgid "allow rebasing commits with empty messages" -msgstr "permet les comissions amb missatges buits" +msgstr "permet tornar a basar les comissions amb missatges buits" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1401 +#, fuzzy msgid "try to rebase merges instead of skipping them" -msgstr "" +msgstr "intenta fer ยซrebaseยป de les fusions en lloc d'omissiรณ" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1404 #, fuzzy msgid "use 'merge-base --fork-point' to refine upstream" -msgstr "git merge-base --fork-point <referรจncia> [<comissiรณ>]" +msgstr "usa ยซmerge-base --fork-pointยป per refinar la font" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1406 msgid "use the given merge strategy" msgstr "utilitza l'estratรจgia de fusiรณ donada" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1408 builtin/revert.c:115 msgid "option" msgstr "opciรณ" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1409 msgid "pass the argument through to the merge strategy" msgstr "passa l'argument a l'estratรจgia de fusiรณ" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1412 msgid "rebase all reachable commits up to the root(s)" -msgstr "fes ยซrebaseยป de totes les comissions accessibles fins l'arrel" +msgstr "fes ยซrebaseยป de totes les comissions accessibles fins a l'arrel" + +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1434 +#, fuzzy msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" +"s'ha eliminat el suport ยซrebase.useBuiltinยป! Per a mรฉs detalls vegeu la seva " +"entrada a ยซgit help configยป." -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1440 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:1547 +#: builtin/rebase.c:1481 #, fuzzy msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." -msgstr "error: no es pot combinar ยซ--preserve-mergesยป amb ยซ--rebase-mergesยป" +msgstr "" +"git rebase --preserve-merges estร en desรบs. Utilitzeu --rebase-merges en " +"lloc seu." + +#: builtin/rebase.c:1486 +#, fuzzy +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "no es pot combinar ยซ--keep-baseยป amb ยซ--ontoยป" + +#: builtin/rebase.c:1488 +#, fuzzy +msgid "cannot combine '--keep-base' with '--root'" +msgstr "no es pot combinar ยซ--keep-baseยป amb ยซ--rootยป" -#: builtin/rebase.c:1551 +#: builtin/rebase.c:1492 +#, fuzzy +msgid "cannot combine '--root' with '--fork-point'" +msgstr "no es pot combinar ยซ--keep-baseยป amb ยซ--rootยป" + +#: builtin/rebase.c:1495 msgid "No rebase in progress?" msgstr "No hi ha un ยซrebaseยป en curs?" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1499 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:1578 +#: builtin/rebase.c:1522 msgid "Cannot read HEAD" msgstr "No es pot llegir HEAD" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1534 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17549,16 +19760,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:1609 +#: builtin/rebase.c:1553 msgid "could not discard worktree changes" msgstr "no s'han pogut descartar els canvis de l'arbre de treball" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1572 #, c-format msgid "could not move back to %s" msgstr "no s'ha pogut tornar a %s" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1618 #, fuzzy, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17570,189 +19781,152 @@ msgid "" "and run me again. I am stopping in case you still have something\n" "valuable there.\n" 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." +"Sembla que ja hi ha un directori per cent i em pregunto si estร vostรจ enmig " +"d'un altre rebase. Si รฉs aixรญ, si us plau, provi-ho si no รฉs aixรญ, si us " +"plau inciti-me." -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1646 msgid "switch `C' expects a numerical value" msgstr "ยซswitchยป ยซcยป espera un valor numรจric" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1688 #, c-format msgid "Unknown mode: %s" msgstr "Mode desconegut: %s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1727 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requereix --merge o --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1757 #, fuzzy -msgid "--reschedule-failed-exec requires --exec or --interactive" -msgstr "--strategy requereix --merge o --interactive" +msgid "cannot combine apply options with merge options" +msgstr "no es poden combinar les opcions d'aplicaciรณ amb les opcions de fusiรณ" -#: builtin/rebase.c:1809 -msgid "cannot combine am options with either interactive or merge options" -msgstr "" +#: builtin/rebase.c:1770 +#, fuzzy, c-format +msgid "Unknown rebase backend: %s" +msgstr "Rebase de system%s desconegut" + +#: builtin/rebase.c:1795 +#, fuzzy +msgid "--reschedule-failed-exec requires --exec or --interactive" +msgstr "--reschedulo-failed-exec requereix --exec o --interactive" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1815 #, fuzzy msgid "cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "error: no es pot combinar ยซ--preserve-mergesยป amb ยซ--rebase-mergesยป" +msgstr "no es poden combinar ยซ--preserve-mergesยป amb ยซ--rebase-mergesยป" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1819 #, 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: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ยป" +msgstr "" +"error no es pot combinar ยซ--preserve-mergesยป amb ยซ--reschedule-failed-execยป" -#: builtin/rebase.c:1865 +#: builtin/rebase.c:1843 #, c-format msgid "invalid upstream '%s'" msgstr "font no vร lida: ยซ%sยป" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1849 msgid "Could not create new root commit" -msgstr "no s'ha pogut crear una comissiรณ arrel nova" +msgstr "No s'ha pogut crear una comissiรณ arrel nova" + +#: builtin/rebase.c:1875 +#, fuzzy, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "'%s' necessita exactament una base de fusiรณ amb branca" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1878 #, fuzzy, c-format msgid "'%s': need exactly one merge base" -msgstr "Cal exactament un rang." +msgstr "'%s' necessita exactament una base de fusiรณ" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1886 #, fuzzy, c-format msgid "Does not point to a valid commit '%s'" -msgstr "No assenyala una comissiรณ vร lida: $onto_name" +msgstr "No apunta a una comissiรณ vร lida ยซ%sยป" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1912 #, fuzzy, c-format msgid "fatal: no such branch/commit '%s'" -msgstr "fatal: no hi ha tal branca: $branch_name" +msgstr "fatal no existeix aquesta branca/commit ยซ%sยป" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "No hi ha tal referรจncia: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1931 #, fuzzy msgid "Could not resolve HEAD to a revision" -msgstr "no s'ha pogut resoldre la comissiรณ HEAD" - -#: builtin/rebase.c:1981 -msgid "Cannot autostash" -msgstr "No es pot emmagatzemar automร ticament" - -#: builtin/rebase.c:1984 -#, fuzzy, c-format -msgid "Unexpected stash response: '%s'" -msgstr "final de fitxer inesperat" +msgstr "No s'ha pogut resoldre HEAD a una revisiรณ" -#: 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:1993 -#, fuzzy, c-format -msgid "Created autostash: %s\n" -msgstr "S'ha creat un magatzem automร tic: $stash_abbrev" - -#: builtin/rebase.c:1996 -#, fuzzy -msgid "could not reset --hard" -msgstr "No s'ha pogut llegir orig-head" - -#: 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 +#: builtin/rebase.c:1952 msgid "Please commit or stash them." msgstr "Cometeu-los o emmagatzemeu-los." -#: builtin/rebase.c:2040 -#, c-format -msgid "could not parse '%s'" -msgstr "no s'ha pogut analitzar ยซ%sยป" - -#: builtin/rebase.c:2053 +#: builtin/rebase.c:1988 #, c-format msgid "could not switch to %s" msgstr "no s'ha pogut commutar a %s" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:1999 msgid "HEAD is up to date." msgstr "HEAD estร al dia." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2001 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La branca actual %s estร al dia.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2009 msgid "HEAD is up to date, rebase forced." msgstr "La branca actual estร al dia, ยซrebaseยป forรงat." -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2011 #, 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:2084 +#: builtin/rebase.c:2019 msgid "The pre-rebase hook refused to rebase." msgstr "El lligam pre-ยซrebaseยป ha refusat a fer ยซrebaseยป." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2026 #, c-format msgid "Changes to %s:\n" -msgstr "Canvis a %s:\n" +msgstr "Canvis a %s:\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2029 #, c-format msgid "Changes from %s to %s:\n" msgstr "Canvis de %s a %s:\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2054 #, 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:2128 +#: builtin/rebase.c:2063 msgid "Could not detach HEAD" msgstr "No s'ha pogut separar HEAD" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2072 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avanรง rร pid %s a %s.\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:1224 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" @@ -17769,21 +19943,21 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" "Per defecte, es denega actualitzar la branca actual en un dipรฒsit no\n" -"nu, perquรจ faria l'รญndex i l'arbre de treball inconsistents amb el\n" -"que hร giu pujat, i requeriria 'git reset --hard' per a fer que\n" -"l'arbre de treball coincideixi amb HEAD.\n" +"nu, perquรจ faria l'รญndex i l'arbre de treball inconsistents amb allรฒ\n" +"que hร giu pujat, i requeriria ยซgit reset --hardยป per a fer que\n" +"l'arbre de treball coincidรญs amb HEAD.\n" "\n" "Podeu establir la variable de configuraciรณ\n" -"'receive.denyCurrentBranch' a 'ignore' o 'warn' en el dipรฒsit remot\n" -"per a permetre pujar a la seva branca actual; no obstant, no es\n" -"recomana aixรฒ a menys que hร giu decidit actualitzar el seu arbre en\n" -"alguna altra manera per a coincidir amb el que hร giu pujat.\n" +"ยซreceive.denyCurrentBranchยป a ยซignoreยป o ยซwarnยป en el dipรฒsit remot\n" +"per a permetre pujar a la seva branca actual; aixรฒ no obstant, no es\n" +"recomana a menys que hร giu decidit actualitzar el seu arbre de treball\n" +"per a coincidir amb allรฒ que hร giu pujat d'alguna altra manera.\n" "\n" "Per a silenciar aquest missatge i mantenir el comportament\n" -"predeterminat, establiu la variable de configuraciรณ\n" -"'receive.denyCurrentBranch' a 'refuse'." +"per defecte, establiu la variable de configuraciรณ\n" +"ยซreceive.denyCurrentBranchยป a ยซrefuseยป." -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:1244 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" @@ -17795,21 +19969,21 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" "Per defecte, es denega suprimir la branca actual, perquรจ el\n" -"'git clone' segรผent no resultarร en cap fitxer agafat, causant\n" +"ยซgit cloneยป segรผent no resultarร en cap fitxer agafat, causant\n" "confusiรณ.\n" "\n" "Podeu establir la variable de configuraciรณ\n" -"'receive.denyDeleteCurrent' a 'warn' o 'ignore' en el dipรฒsit remot\n" +"ยซreceive.denyDeleteCurrentยป a ยซwarnยป o ยซignoreยป en el dipรฒsit remot\n" "per a permetre suprimir la branca actual, amb un missatge\n" "d'advertรจncia o sense.\n" "\n" -"Per a silenciar aquest missatge, podeu establir-la a 'refuse'." +"Per a silenciar aquest missatge, podeu establir-la a ยซrefuseยป." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:2422 msgid "quiet" msgstr "silenciรณs" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:2436 msgid "You must specify a directory." msgstr "Heu d'especificar un directori." @@ -17819,61 +19993,66 @@ msgid "" "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " "<refs>..." msgstr "" +"git reflog expire [--expire=<hora>] [--expire-unreachable=<hora>] [--" +"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " +"<referรจncies>..." #: 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] " +"<referรจncies>..." #: builtin/reflog.c:25 msgid "git reflog exists <ref>" -msgstr "" +msgstr "git reflog exists <referรจncia>" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "ยซ%sยป no รฉs una marca de temps vร lida" -#: builtin/reflog.c:605 -#, fuzzy, c-format +#: builtin/reflog.c:606 +#, c-format msgid "Marking reachable objects..." -msgstr "retรฉn els objectes inabastables" +msgstr "S'estan marcant els objectes abastables..." -#: builtin/reflog.c:643 -#, c-format +#: builtin/reflog.c:644 +#, fuzzy, c-format msgid "%s points nowhere!" -msgstr "" +msgstr "els percentatges no apunten enlloc!" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 #, fuzzy msgid "no reflog specified to delete" -msgstr "cap remot especificat" +msgstr "no s'ha especificat cap registre de referรจncia per suprimir" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, fuzzy, c-format msgid "not a reflog: %s" -msgstr "no es pot llegir ยซ%sยป" +msgstr "no รฉs un registre de referรจncia" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, fuzzy, c-format msgid "no reflog for '%s'" -msgstr "no s'ha pogut llegir el fitxer de registre per ยซ%sยป" +msgstr "cap registre de referรจncia per a ยซ%sยป" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "format de referรจncia no vร lid: %s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" -msgstr "" +msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -17881,82 +20060,82 @@ msgstr "" "git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nom> <url>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <antic> <nou>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nom>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nom>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nom> <branca>..." -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nom>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nom> <url-nou> [<url-antic>]" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nom> <url-nou>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nom> <url>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opcions>] <nom> <url>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branca>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nom> <branca>..." -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<opcions>] <nom>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<opcions>] <nom>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<opcions>] [<grup> | <remot>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "S'estร actualitzant %s" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -17965,84 +20144,99 @@ msgstr "" "\t useu --mirror=fetch o\n" "\t --mirror=push en lloc d'aixรฒ" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" -msgstr "parร metre de reflexiรณ desconegut: %s" +msgstr "argument de ยซmirrorยป desconegut: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "obtรฉn les branques remotes" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "en obtenir, importa totes les etiquetes i tots els objectes" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "o no obtinguis cap etiqueta (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "branques a seguir" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "branca mestra" -#: builtin/remote.c:173 +#: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "estableix el remot com a mirall al qual pujar o del qual obtenir" -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "especificar una branca mestra no tรฉ sentit amb --mirror" -#: builtin/remote.c:187 +#: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "especificar les branques a seguir tรฉ sentit nomรฉs amb miralls d'obtenciรณ" -#: builtin/remote.c:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:697 #, c-format msgid "remote %s already exists." msgstr "el remot %s ja existeix." -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:701 #, c-format msgid "'%s' is not a valid remote name" msgstr "ยซ%sยป no รฉs un nom de remot vร lid" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "No s'ha pogut configurar la mestra ยซ%sยป" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" "No s'ha pogut obtenir el mapa d'obtenciรณ de l'especificaciรณ de referรจncia %s" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(coincident)" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(suprimir)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:654 +#, fuzzy, c-format +msgid "could not set '%s'" +msgstr "no s'ha pogut establir ยซ%sยป" + +#: builtin/remote.c:659 +#, fuzzy, c-format +msgid "" +"The %s configuration remote.pushDefault in:\n" +"\t%s:%d\n" +"now names the non-existent remote '%s'" +msgstr "" +"La configuraciรณ dels percentatges รฉs remota.pushDefault ins%d ara anomena " +"els \"%s\" remots inexistents" + +#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941 #, c-format msgid "No such remote: '%s'" msgstr "No existeix el remot ยซ%sยป" -#: builtin/remote.c:646 +#: builtin/remote.c:707 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "No s'ha pogut canviar el nom de la secciรณ de configuraciรณ ยซ%sยป a ยซ%sยป" -#: builtin/remote.c:666 +#: builtin/remote.c:727 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18054,17 +20248,17 @@ msgstr "" "\t%s\n" "\tActualitzeu la configuraciรณ manualment si รฉs necessari." -#: builtin/remote.c:702 +#: builtin/remote.c:767 #, c-format msgid "deleting '%s' failed" msgstr "la supressiรณ de ยซ%sยป ha fallat" -#: builtin/remote.c:736 +#: builtin/remote.c:801 #, c-format msgid "creating '%s' failed" msgstr "la creaciรณ de ยซ%sยป ha fallat" -#: builtin/remote.c:802 +#: builtin/remote.c:877 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18079,118 +20273,118 @@ msgstr[1] "" "eliminat;\n" "per a suprimir-les, useu:" -#: builtin/remote.c:816 +#: builtin/remote.c:891 #, c-format msgid "Could not remove config section '%s'" msgstr "No s'ha pogut eliminar la secciรณ de configuraciรณ ยซ%sยป" -#: builtin/remote.c:917 +#: builtin/remote.c:994 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nou (la prรฒxima obtenciรณ emmagatzemarร a remotes/%s)" -#: builtin/remote.c:920 +#: builtin/remote.c:997 msgid " tracked" msgstr " seguit" -#: builtin/remote.c:922 +#: builtin/remote.c:999 msgid " stale (use 'git remote prune' to remove)" -msgstr " estancat (useu 'git remote prune' per a eliminar)" +msgstr " estancat (useu ยซgit remote pruneยป per a eliminar)" -#: builtin/remote.c:924 +#: builtin/remote.c:1001 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:1042 #, 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:974 +#: builtin/remote.c:1051 #, c-format msgid "rebases interactively onto remote %s" msgstr "es fa ยซrebaseยป interactivament sobre el remot %s" -#: builtin/remote.c:976 +#: builtin/remote.c:1053 #, fuzzy, c-format msgid "rebases interactively (with merges) onto remote %s" -msgstr "es fa ยซrebaseยป interactivament sobre el remot %s" +msgstr "rebases interactivament (amb fusions) en percentatges remots" -#: builtin/remote.c:979 +#: builtin/remote.c:1056 #, c-format msgid "rebases onto remote %s" msgstr "es fa ยซrebaseยป sobre el remot %s" -#: builtin/remote.c:983 +#: builtin/remote.c:1060 #, c-format msgid " merges with remote %s" -msgstr "es fusiona amb el remot %s" +msgstr " es fusiona amb el remot %s" -#: builtin/remote.c:986 +#: builtin/remote.c:1063 #, c-format msgid "merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:989 +#: builtin/remote.c:1066 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s i amb el remot %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1109 msgid "create" msgstr "crea" -#: builtin/remote.c:1035 +#: builtin/remote.c:1112 msgid "delete" msgstr "suprimeix" -#: builtin/remote.c:1039 +#: builtin/remote.c:1116 msgid "up to date" msgstr "al dia" -#: builtin/remote.c:1042 +#: builtin/remote.c:1119 msgid "fast-forwardable" msgstr "avanรง rร pid possible" -#: builtin/remote.c:1045 +#: builtin/remote.c:1122 msgid "local out of date" msgstr "local no actualitzat" -#: builtin/remote.c:1052 +#: builtin/remote.c:1129 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s forรงa a %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1132 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s puja a %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1136 #, c-format msgid " %-*s forces to %s" msgstr " %-*s forรงa a %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1139 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s puja a %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1207 msgid "do not query remotes" msgstr "no consultis els remots" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid "* remote %s" msgstr "* remot %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1235 #, c-format msgid " Fetch URL: %s" msgstr " URL d'obtenciรณ: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 msgid "(no URL)" msgstr "(sense URL)" @@ -18198,313 +20392,313 @@ msgstr "(sense URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1250 builtin/remote.c:1252 #, c-format msgid " Push URL: %s" msgstr " URL de pujada: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 #, c-format msgid " HEAD branch: %s" msgstr " Branca de HEAD: %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1254 msgid "(not queried)" msgstr "(no consultat)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1256 msgid "(unknown)" msgstr "(desconegut)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1260 #, 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:1195 +#: builtin/remote.c:1272 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branca remota:%s" msgstr[1] " Branques remotes:%s" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1275 builtin/remote.c:1301 msgid " (status not queried)" msgstr " (estat no consultat)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1284 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:1215 +#: builtin/remote.c:1292 msgid " Local refs will be mirrored by 'git push'" msgstr " ยซgit pushยป reflectirร les referรจncies locals" -#: builtin/remote.c:1221 +#: builtin/remote.c:1298 #, 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:1242 +#: builtin/remote.c:1319 msgid "set refs/remotes/<name>/HEAD according to remote" -msgstr "estableix refs/remotes/<name>/HEAD segons el remot" +msgstr "estableix refs/remotes/<nom>/HEAD segons el remot" -#: builtin/remote.c:1244 +#: builtin/remote.c:1321 msgid "delete refs/remotes/<name>/HEAD" -msgstr "suprimeix refs/remotes/<name>/HEAD" +msgstr "suprimeix refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1336 msgid "Cannot determine remote HEAD" msgstr "No es pot determinar la HEAD remota" -#: builtin/remote.c:1261 +#: builtin/remote.c:1338 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:1271 +#: builtin/remote.c:1348 #, c-format msgid "Could not delete %s" msgstr "No s'ha pogut suprimir %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1356 #, c-format msgid "Not a valid ref: %s" msgstr "No รฉs una referรจncia vร lida: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1358 #, c-format msgid "Could not setup %s" msgstr "No s'ha pogut configurar %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, c-format msgid " %s will become dangling!" msgstr " %s es tornarร penjant!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1377 #, c-format msgid " %s has become dangling!" msgstr " %s s'ha tornat penjant!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "Pruning %s" msgstr "S'estร podant %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1388 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1404 #, c-format msgid " * [would prune] %s" msgstr " * [podaria] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1407 #, c-format msgid " * [pruned] %s" msgstr " * [podat] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1452 msgid "prune remotes after fetching" msgstr "poda els remots desprรฉs d'obtenir-los" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 #, c-format msgid "No such remote '%s'" msgstr "No hi ha tal remot ยซ%sยป" -#: builtin/remote.c:1454 +#: builtin/remote.c:1531 msgid "add branch" msgstr "afegeix branca" -#: builtin/remote.c:1461 +#: builtin/remote.c:1538 msgid "no remote specified" msgstr "cap remot especificat" -#: builtin/remote.c:1478 +#: builtin/remote.c:1555 msgid "query push URLs rather than fetch URLs" msgstr "consulta els URL de pujada en lloc dels URL d'obtenciรณ" -#: builtin/remote.c:1480 +#: builtin/remote.c:1557 msgid "return all URLs" msgstr "retorna tots els URL" -#: builtin/remote.c:1508 +#: builtin/remote.c:1585 #, c-format msgid "no URLs configured for remote '%s'" msgstr "cap URL configurat per al remot ยซ%sยป" -#: builtin/remote.c:1534 +#: builtin/remote.c:1611 msgid "manipulate push URLs" msgstr "manipula els URL de pujada" -#: builtin/remote.c:1536 +#: builtin/remote.c:1613 msgid "add URL" msgstr "afegeix URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1615 msgid "delete URLs" msgstr "suprimeix els URL" -#: builtin/remote.c:1545 +#: builtin/remote.c:1622 msgid "--add --delete doesn't make sense" msgstr "--add --delete no tรฉ sentit" -#: builtin/remote.c:1584 +#: builtin/remote.c:1661 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patrรณ d'URL antic no vร lid: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1669 #, c-format msgid "No such URL found: %s" msgstr "No s'ha trobat tal URL: %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1671 msgid "Will not delete all non-push URLs" msgstr "No se suprimiran tots els URL no de pujada" -#: 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 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [<opcions>]" -#: builtin/repack.c:27 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -"Els reempaquetaments incrementals sรณn incompatibles amb els รญndexs de " -"bitmaps. Useu\n" +"Els reempaquetaments incrementals sรณn incompatibles amb els รญndexs de mapes " +"de bits. Useu\n" "--no-write-bitmap-index o inhabiliteu el parร metre de configuraciรณ pack." "writebitmaps." -#: builtin/repack.c:201 +#: builtin/repack.c:197 +#, fuzzy msgid "could not start pack-objects to repack promisor objects" msgstr "" +"no s'han pogut iniciar pack-objects per tornar a empaquetar els objectes " +"ยซpromissorยป" -#: builtin/repack.c:240 builtin/repack.c:418 +#: builtin/repack.c:236 builtin/repack.c:421 +#, fuzzy msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" +"reempaqueta S'esperen lรญnies d'id. de l'objecte hexadecimal complet nomรฉs " +"des de pack-objects." -#: builtin/repack.c:257 +#: builtin/repack.c:260 +#, fuzzy msgid "could not finish pack-objects to repack promisor objects" msgstr "" +"no s'ha pogut finalitzar el paquet d'objectes per tornar a empaquetar " +"objectes promisor" -#: builtin/repack.c:295 +#: builtin/repack.c:297 msgid "pack everything in a single pack" msgstr "empaqueta-ho tot en un รบnic paquet" -#: builtin/repack.c:297 +#: builtin/repack.c:299 msgid "same as -a, and turn unreachable objects loose" msgstr "el mateix que -a, i solta els objectes inabastables" -#: builtin/repack.c:300 +#: builtin/repack.c:302 msgid "remove redundant packs, and run git-prune-packed" msgstr "elimina els paquets redundants, i executeu git-prune-packed" -#: builtin/repack.c:302 +#: builtin/repack.c:304 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passa --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:304 +#: builtin/repack.c:306 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passa --no-reuse-object a git-pack-objects" -#: builtin/repack.c:306 +#: builtin/repack.c:308 msgid "do not run git-update-server-info" msgstr "no executis git-update-server-info" -#: builtin/repack.c:309 +#: builtin/repack.c:311 msgid "pass --local to git-pack-objects" msgstr "passa --local a git-pack-objects" -#: builtin/repack.c:311 +#: builtin/repack.c:313 msgid "write bitmap index" msgstr "escriu รญndex de mapa de bits" -#: builtin/repack.c:313 +#: builtin/repack.c:315 #, fuzzy msgid "pass --delta-islands to git-pack-objects" -msgstr "passa --local a git-pack-objects" +msgstr "passa --delta-illes a git-pack-objects" -#: builtin/repack.c:314 +#: builtin/repack.c:316 msgid "approxidate" msgstr "data aproximada" -#: builtin/repack.c:315 +#: builtin/repack.c:317 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:317 +#: builtin/repack.c:319 msgid "with -a, repack unreachable objects" msgstr "amb -a, reempaqueta els objectes inabastables" -#: builtin/repack.c:319 +#: builtin/repack.c:321 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:320 builtin/repack.c:326 +#: builtin/repack.c:322 builtin/repack.c:328 msgid "bytes" msgstr "octets" -#: builtin/repack.c:321 +#: builtin/repack.c:323 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:323 +#: builtin/repack.c:325 msgid "limits the maximum delta depth" msgstr "limita la profunditat mร xima de les diferรจncies" -#: builtin/repack.c:325 +#: builtin/repack.c:327 msgid "limits the maximum number of threads" msgstr "limita el nombre mร xim de fils" -#: builtin/repack.c:327 +#: builtin/repack.c:329 msgid "maximum size of each packfile" msgstr "mida mร xima de cada fitxer de paquet" -#: builtin/repack.c:329 +#: builtin/repack.c:331 msgid "repack objects in packs marked with .keep" msgstr "reempaqueta els objectes en paquets marcats amb .keep" -#: builtin/repack.c:331 +#: builtin/repack.c:333 #, fuzzy msgid "do not repack this pack" -msgstr "crea paquets prims" +msgstr "no reempaqueta aquest paquet" -#: builtin/repack.c:341 +#: builtin/repack.c:343 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:345 +#: builtin/repack.c:347 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable i -A sรณn incompatibles" -#: builtin/repack.c:427 +#: builtin/repack.c:430 #, fuzzy msgid "Nothing new to pack." -msgstr "usa el paquet prim" +msgstr "Res nou per empaquetar." -#: builtin/repack.c:488 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18515,8 +20709,15 @@ msgid "" "WARNING: original names also failed.\n" "WARNING: Please rename them in %s manually:\n" msgstr "" +"AVรS: Alguns paquets en รบs han canviat de nom\n" +"AVรS: prefixant ยซold-ยป al seu nom per tal de\n" +"AVรS: reemplaรงar-los per la nova versiรณ del fitxer.\n" +"AVรS: Perรฒ l'operaciรณ ha fallat i l'intent de\n" +"AVรS: tornar-los a canviar als seus noms originals\n" +"AVรS: tambรฉ ha fallat. Canvieu-los de nom en %s\n" +"AVรS: manualment:\n" -#: builtin/repack.c:536 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "s'ha produรฏt un error en eliminar ยซ%sยป" @@ -18546,121 +20747,127 @@ msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<patrรณ>]]" #: builtin/replace.c:90 -#, c-format +#, fuzzy, c-format msgid "" "invalid replace format '%s'\n" "valid formats are 'short', 'medium' and 'long'" msgstr "" +"format de substituciรณ no vร lid ยซ%sยป els formats vร lids sรณn ยซshortยป ยซmediumยป " +"i ยซlongยป" #: builtin/replace.c:125 #, fuzzy, c-format msgid "replace ref '%s' not found" -msgstr "no s'ha trobat la branca ยซ%sยป." +msgstr "no s'ha trobat la ref '%s'" #: builtin/replace.c:141 #, fuzzy, c-format msgid "Deleted replace ref '%s'" -msgstr "suprimeix les referรจncies reemplaรงades" +msgstr "S'ha suprimit la referรจncia ยซ%sยป" #: builtin/replace.c:153 #, fuzzy, c-format msgid "'%s' is not a valid ref name" -msgstr "ยซ%sยป no รฉs un nom de remot vร lid" +msgstr "'%s' no รฉs un nom de referรจncia vร lid" #: builtin/replace.c:158 #, fuzzy, c-format msgid "replace ref '%s' already exists" -msgstr "el destรญ ยซ%sยป ja existeix" +msgstr "reemplaรงa la referรจncia ยซ%sยป ja existeix" #: builtin/replace.c:178 -#, c-format +#, fuzzy, 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 "" +"Els objectes han de ser del mateix tipus. ยซ%sยป apunta a un objecte " +"substituรฏt del tipus ยซ%sยป mentre que ยซ%sยป apunta a un objecte de substituciรณ " +"del tipus ยซ%sยป." #: builtin/replace.c:229 #, fuzzy, c-format msgid "unable to open %s for writing" -msgstr "No s'ha pogut obrir ยซ%sยป per a escriptura" +msgstr "no s'han pogut obrir els percentatges per escriure" #: builtin/replace.c:242 +#, fuzzy msgid "cat-file reported failure" -msgstr "" +msgstr "error en el fitxer de gat" #: builtin/replace.c:258 #, fuzzy, c-format msgid "unable to open %s for reading" -msgstr "no s'ha pogut obrir o llegir %s" +msgstr "no s'han pogut obrir els percentatges de lectura" #: builtin/replace.c:272 #, fuzzy msgid "unable to spawn mktree" -msgstr "no s'ha pogut llegir l'arbre (%s)" +msgstr "no s'ha pogut engendrar el mktree" #: builtin/replace.c:276 #, fuzzy msgid "unable to read from mktree" -msgstr "no s'ha pogut llegir l'arbre (%s)" +msgstr "no s'ha pogut llegir des de mktree" #: builtin/replace.c:285 #, fuzzy msgid "mktree reported failure" -msgstr "la reversiรณ ha fallat" +msgstr "mktree ha fallat" #: builtin/replace.c:289 #, fuzzy msgid "mktree did not return an object name" -msgstr "el remot no ha enviat tots els objectes necessaris" +msgstr "mktree no ha retornat un nom d'objecte" #: builtin/replace.c:298 #, fuzzy, c-format msgid "unable to fstat %s" -msgstr "no s'ha pogut actualitzar %s" +msgstr "no s'han pogut fer fstat%s" #: builtin/replace.c:303 #, fuzzy msgid "unable to write object to database" -msgstr "no s'ha pogut escriure l'objecte de nota" +msgstr "no s'ha pogut escriure l'objecte a la base de dades" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 +#: builtin/replace.c:454 #, fuzzy, c-format msgid "not a valid object name: '%s'" -msgstr "No รฉs un nom d'objecte vร lid: ยซ%sยป" +msgstr "no รฉs un nom d'objecte vร lid ยซ%sยป" #: builtin/replace.c:326 #, fuzzy, c-format msgid "unable to get object type for %s" -msgstr "no es pot fer grep des d'un objecte de tipus %s" +msgstr "no s'ha pogut obtenir el tipus d'objecte per un percentatge" #: builtin/replace.c:342 #, fuzzy msgid "editing object file failed" -msgstr "la lectura de les referรจncies de bisecciรณ ha fallat" +msgstr "l'ediciรณ del fitxer d'objecte ha fallat" #: builtin/replace.c:351 -#, c-format +#, fuzzy, c-format msgid "new object is the same as the old one: '%s'" -msgstr "" +msgstr "l'objecte nou รฉs el mateix que l'antic ยซ%sยป" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, fuzzy, c-format msgid "could not parse %s as a commit" -msgstr "no s'ha pogut analitzar la comissiรณ HEAD" +msgstr "no s'han pogut analitzar els percentatges com a comissiรณ" -#: builtin/replace.c:414 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "etiqueta de fusiรณ incorrecta en la comissiรณ ยซ%sยป" -#: builtin/replace.c:416 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "etiqueta de fusiรณ mal formada en la comissiรณ ยซ%sยป" -#: builtin/replace.c:428 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -18669,105 +20876,106 @@ msgstr "" "la comissiรณ original ยซ%sยป contรฉ l'etiqueta de fusiรณ ยซ%sยป que es descarta; " "useu --edit en lloc de --graft" -#: builtin/replace.c:467 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "la comissiรณ original ยซ%sยป tรฉ una signatura gpg" -#: builtin/replace.c:468 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "s'eliminarร la signatura en la comissiรณ de reemplaรงament!" -#: builtin/replace.c:478 +#: builtin/replace.c:480 #, 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:486 -#, c-format +#: builtin/replace.c:488 +#, fuzzy, c-format msgid "graft for '%s' unnecessary" -msgstr "" +msgstr "empelt per '%s' innecessari" -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, 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:525 +#: builtin/replace.c:527 #, fuzzy, c-format msgid "" "could not convert the following graft(s):\n" "%s" -msgstr "Eliminaria l'รญtem segรผent:" +msgstr "no s'han pogut convertir els segรผents percentatges d'empelt" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "llista les referรจncies reemplaรงades" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "suprimeix les referรจncies reemplaรงades" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "edita un objecte existent" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "canvia les mares d'una comissiรณ" -#: builtin/replace.c:550 +#: builtin/replace.c:552 #, fuzzy msgid "convert existing graft file" -msgstr "forรงa la sobreescriptura de fitxers existents" +msgstr "converteix el fitxer d'empelt existent" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "reemplaรงa la referรจncia si existeix" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "no imprimeixis bellament els continguts per a --edit" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "usa aquest format" -#: builtin/replace.c:567 +#: builtin/replace.c:569 #, fuzzy msgid "--format cannot be used when not listing" -msgstr "--fix-thin no es pot usar sense --stdin" +msgstr "no es pot utilitzar ยซ--formatยป en no llistar" -#: builtin/replace.c:575 +#: builtin/replace.c:577 #, fuzzy msgid "-f only makes sense when writing a replacement" -msgstr "-z nomรฉs tรฉ sentit amb --stdin" +msgstr "-f nomรฉs tรฉ sentit quan s'escriu un reemplaรงament" -#: builtin/replace.c:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw nomรฉs tรฉ sentit amb --edit" -#: builtin/replace.c:585 +#: builtin/replace.c:587 +#, fuzzy msgid "-d needs at least one argument" -msgstr "" +msgstr "-d necessita almenys un argument" -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "nombre incorrecte d'arguments" -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e necessita exactament un argument" -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-g necessita almenys un argument" -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file arguments" -#: builtin/replace.c:615 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "nomรฉs es pot especificar un patrรณ amb -l" @@ -18780,8 +20988,9 @@ msgid "register clean resolutions in index" msgstr "registra les resolucions netes en l'รญndex" #: builtin/rerere.c:79 +#, fuzzy msgid "'git rerere forget' without paths is deprecated" -msgstr "" +msgstr "'git rererere oblid' sense camins estร en desรบs" #: builtin/rerere.c:113 #, c-format @@ -18795,170 +21004,183 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissiรณ>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<arbre>] [--] <camins>..." +#, fuzzy +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "git reset [-q] [<tree-ish>] [--] <pathspec>" #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<arbre>] [--] [<camins>...]" +#, fuzzy +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:40 +#: builtin/reset.c:35 +#, fuzzy +msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgstr "git reset --patch [<tree-ish>] [--] [<pathspec>]" + +#: builtin/reset.c:41 msgid "mixed" msgstr "mixt" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "suau" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "dur" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "fusiรณ" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "reteniment" -#: builtin/reset.c:81 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "No teniu un HEAD vร lid." -#: builtin/reset.c:83 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "S'ha produรฏt un error en trobar l'arbre de HEAD." -#: builtin/reset.c:89 +#: builtin/reset.c:91 #, 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:193 +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ara รฉs a %s" + +#: builtin/reset.c:195 #, 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:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "sigues silenciรณs, nomรฉs informa d'errors" -#: builtin/reset.c:295 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "restableix HEAD i l'รญndex" -#: builtin/reset.c:296 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "restableix nomรฉs HEAD" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "restableix HEAD, l'รญndex i l'arbre de treball" -#: builtin/reset.c:302 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "restableix HEAD perรฒ retรฉn els canvis locals" -#: builtin/reset.c:308 +#: builtin/reset.c:310 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:326 +#: builtin/reset.c:344 #, 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:334 +#: builtin/reset.c:352 #, 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:343 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch รฉs incompatible amb --{hard,mixed,soft}" -#: builtin/reset.c:353 +#: builtin/reset.c:371 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 " +"--mixed amb camins estร en desรบs; useu ยซgit reset -- <camins>ยป en lloc " "d'aixรฒ." -#: builtin/reset.c:355 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "No es pot restablir de %s amb camins." -#: builtin/reset.c:370 +#: builtin/reset.c:388 #, 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:374 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "-N nomรฉs es pot usar amb --mixed" -#: builtin/reset.c:395 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "Canvis ยซunstagedยป desprรฉs del restabliment:" -#: builtin/reset.c:398 -#, c-format +#: builtin/reset.c:416 +#, fuzzy, 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 "" +"S'ha trigat segons de 4% a enumerar els canvis sense classificar desprรฉs del " +"reinici. Podeu utilitzar ยซ--quietยป per evitar-ho. Establiu el parร metre de " +"configuraciรณ reset.quiet a cert per fer que aixรฒ sigui el predeterminat." -#: builtin/reset.c:408 +#: builtin/reset.c:434 #, 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:412 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "No s'ha pogut escriure el fitxer d'รญndex nou." -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "no es pot combinar --exclude-promisor-objects i --missing" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "el filtratge d'objectes requereix --objects" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "valor parcial no vร lid: ยซ%sยป" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "el rev-list no permet mostrar notes" -#: 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" +#: builtin/rev-list.c:615 +#, fuzzy +msgid "marked counting is incompatible with --objects" +msgstr "el recompte marcat รฉs incompatible amb --objects" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" -msgstr "git rev-parse --parseopt [<opcions>] -- [<parร metres>...]" +msgstr "git rev-parse --parseopt [<opcions>] -- [<arguments>...]" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" -msgstr "retรฉn el ยซ--ยป passat com a parร metre" +msgstr "retรฉn el ยซ--ยป passat com a argument" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" -msgstr "deixa d'analitzar desprรฉs del primer parร metre no d'opciรณ" +msgstr "deixa d'analitzar desprรฉs del primer argument que no sigui d'opciรณ" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "emet en forma llarga enganxada" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -18966,12 +21188,12 @@ msgid "" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [<opcions>] -- [<parร metres>...]\n" -" or: git rev-parse --sq-quote [<parร metre>...]\n" -" or: git rev-parse [<opcions>] [<parร metre>...]\n" +"git rev-parse --parseopt [<opcions>] -- [<arguments>...]\n" +" o bรฉ: git rev-parse --sq-quote [<argument>...]\n" +" o bรฉ: git rev-parse [<opcions>] [<argument>...]\n" "\n" -"Executeu \"git rev-parse --parseopt -h\" per mรฉs informaciรณ sobre l'รบs " -"inicial." +"Executeu ยซgit rev-parse --parseopt -hยป per a mรฉs informaciรณ sobre el primer " +"รบs." #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." @@ -19105,39 +21327,44 @@ msgid_plural "the following files have local modifications:" msgstr[0] "el fitxer segรผent tรฉ modificacions locals:" msgstr[1] "els fitxers segรผents tenen modificacions locals:" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "no llistis els fitxers eliminats" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "nomรฉs elimina de l'รญndex" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "passa per alt la comprovaciรณ d'actualitat" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "permet l'eliminaciรณ recursiva" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "surt amb estat zero encara que res hagi coincidit" -#: builtin/rm.c:289 +#: builtin/rm.c:282 +#, fuzzy +msgid "No pathspec was given. Which files should I remove?" +msgstr "" +"No s'ha indicat cap especificaciรณ de camรญ. Quins fitxers haig de suprimir?" + +#: builtin/rm.c:305 #, fuzzy msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" -"Feu ยซstageยป dels vostres canvis a .gitmodules o feu ยซstashยป dels mateixos " -"per a procedir" +"si us plau astaqueu els canvis a .gitmodules o feu un ยซstashยป per continuar" -#: builtin/rm.c:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" -msgstr "no s'estร eliminant ยซ%sยป recursivament sense -r" +msgstr "no s'eliminarร ยซ%sยป recursivament sense -r" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: no s'ha pogut eliminar %s" @@ -19154,61 +21381,81 @@ msgstr "" "[<mร quina>:]<directori> [<referรจncia>...]\n" " --all i especificaciรณ <referรจncia> explรญcita sรณn mรบtuament excloents." -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:182 msgid "remote name" msgstr "nom del remot" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:195 msgid "use stateless RPC protocol" msgstr "usa el protocol RPC sense estat" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:196 msgid "read refs from stdin" msgstr "llegeix les referรจncies des de stdin" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:197 msgid "print status from remote helper" msgstr "imprimeix l'estat des de l'ajudant remot" -#: builtin/shortlog.c:14 -#, fuzzy +#: builtin/shortlog.c:15 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 +#: builtin/shortlog.c:16 msgid "git log --pretty=short | git shortlog [<options>]" -msgstr "git worktree list [<opcions>]" +msgstr "git log --pretty=short | git shortlog [<opcions>]" + +#: builtin/shortlog.c:134 +#, fuzzy +msgid "using multiple --group options with stdin is not supported" +msgstr "no s'admet escriure a stdin" + +#: builtin/shortlog.c:144 +#, fuzzy +msgid "using --group=trailer with stdin is not supported" +msgstr "no s'admet escriure a stdin" + +#: builtin/shortlog.c:388 +#, fuzzy, c-format +msgid "unknown group type: %s" +msgstr "tipus desconegut" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:416 msgid "Group by committer rather than author" msgstr "Agrupa per ยซcomitterยป en comptes de per autor" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:419 msgid "sort output according to the number of commits per author" msgstr "ordena la sortida segons el nombre de comissions per autor" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:421 msgid "Suppress commit descriptions, only provides commit count" msgstr "" "Omet les descripcions de comissiรณ, nomรฉs proveeix el recompte de comissions" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:423 msgid "Show the email address of each author" msgstr "Mostra l'adreรงa electrรฒnica de cada autor" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:424 msgid "<w>[,<i1>[,<i2>]]" -msgstr "" +msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:425 msgid "Linewrap output" msgstr "Ajusta les lรญnies de la sortida" -#: builtin/shortlog.c:301 -#, fuzzy +#: builtin/shortlog.c:427 +msgid "field" +msgstr "" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "" + +#: builtin/shortlog.c:456 msgid "too many arguments given outside repository" -msgstr "hi ha massa arguments per a desassignar la font" +msgstr "hi ha massa arguments donats fora del dipรฒsit" #: builtin/show-branch.c:13 msgid "" @@ -19248,7 +21495,7 @@ msgstr "mostra les branques amb seguiment remot" #: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" -msgstr "colora '*!+-' corresponent a la branca" +msgstr "colora ยซ*!+-ยป corresponent a la branca" #: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" @@ -19345,6 +21592,16 @@ msgstr "ยซ%sยป no รฉs una referรจncia vร lida." msgid "cannot find commit %s (%s)" msgstr "no es pot trobar la comissiรณ %s (%s)" +#: builtin/show-index.c:21 +#, fuzzy +msgid "hash-algorithm" +msgstr "<algorisme>" + +#: builtin/show-index.c:31 +#, fuzzy +msgid "Unknown hash algorithm" +msgstr "variable ยซ%sยป desconeguda" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -19391,241 +21648,332 @@ 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/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 #, fuzzy -msgid "git stash list [<options>]" -msgstr "git worktree list [<opcions>]" +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|disable) <opcions>" + +#: builtin/sparse-checkout.c:50 +#, fuzzy +msgid "git sparse-checkout list" +msgstr "git sparse-checkout init [--cone]" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/sparse-checkout.c:76 #, fuzzy +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "" +"aquest arbre de treball no รฉs dispers (pot ser que el fitxer sparse-checkout " +"no existeixi)" + +#: builtin/sparse-checkout.c:228 +#, fuzzy +msgid "failed to create directory for sparse-checkout file" +msgstr "no s'ha pogut crear el directori per al fitxer sparse-checkout" + +#: builtin/sparse-checkout.c:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "" + +#: builtin/sparse-checkout.c:271 +#, fuzzy +msgid "failed to set extensions.worktreeConfig setting" +msgstr "no s'ha pogut establir el parร metre extensions.worktreeConfig" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:307 +#, fuzzy +msgid "initialize the sparse-checkout in cone mode" +msgstr "inicialitza el ยซsparse-checkoutยป en mode con" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "s'ha produรฏt un error en obrir ยซ%sยป" + +#: builtin/sparse-checkout.c:401 +#, fuzzy, c-format +msgid "could not normalize path %s" +msgstr "no s'ha pogut normalitzar el camรญ" + +#: builtin/sparse-checkout.c:413 +#, fuzzy +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <patrons>)" + +#: builtin/sparse-checkout.c:438 +#, fuzzy, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "no s'ha pogut treure la cadena de l'estil C ยซ%sยป" + +#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +#, fuzzy +msgid "unable to load existing sparse-checkout patterns" +msgstr "no s'han pogut carregar els patrons de ยซsparse-checkoutยป existents" + +#: builtin/sparse-checkout.c:561 +msgid "read patterns from standard in" +msgstr "llegeix els patrons de l'entrada estร ndard" + +#: builtin/sparse-checkout.c:576 +#, fuzzy +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:595 +#, fuzzy +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:623 +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:38 +msgid "git stash list [<options>]" +msgstr "git stash list [<opcions>]" + +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" -msgstr "git remote show [<opcions>] <nom>" +msgstr "git stash show [<opcions>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 +#, fuzzy msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "" +msgstr "git stash drop [-q|--quiet] [<stash>]" #: builtin/stash.c:25 +#, fuzzy msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "" +msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:62 -#, fuzzy +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" -msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]" +msgstr "git stash branch <nom-de-branca> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" -msgstr "" +msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: builtin/stash.c:28 +#, fuzzy 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] [-u|--include-" +"untracked] [-a|-all] [-m|-message <message>] [--pathspec-from-file=<file> [--" +"path-spec-file-nul]]" -#: builtin/stash.c:31 builtin/stash.c:84 +#: 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] [<missatge>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "" +msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "" +msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" +msgstr "git stash store [-m|--message <missatge>] [-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 <missatge>]\n" +" [--] [<pathspec>...]]" -#: builtin/stash.c:127 -#, fuzzy, c-format +#: builtin/stash.c:128 +#, c-format msgid "'%s' is not a stash-like commit" -msgstr "'$args' no รฉs una comissiรณ de tipus magatzem" +msgstr "ยซ%sยป no รฉs una comissiรณ de tipus ยซstashยป" -#: builtin/stash.c:147 -#, fuzzy, c-format +#: builtin/stash.c:148 +#, c-format msgid "Too many revisions specified:%s" -msgstr "S'han especificat massa revisions: $REV" +msgstr "S'han especificat massa revisions:%s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "No s'ha trobat cap ยซstashยป." -#: builtin/stash.c:175 -#, fuzzy, c-format +#: builtin/stash.c:176 +#, c-format msgid "%s is not a valid reference" -msgstr "ยซ%sยป no รฉs un nom de remot vร lid" +msgstr "ยซ%sยป no รฉs una referรจncia vร lida" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear amb parร metres no estร implementat" -#: builtin/stash.c:403 -#, fuzzy +#: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" -msgstr "No es pot aplicar un magatzem enmig d'una fusiรณ" +msgstr "no es pot aplicar un ยซstashยป enmig d'una fusiรณ" -#: builtin/stash.c:414 -#, fuzzy, c-format +#: builtin/stash.c:415 +#, c-format msgid "could not generate diff %s^!." -msgstr "no s'ha pogut generar la llista per a fer" +msgstr "no s'ha pogut generar diff %s^!." -#: builtin/stash.c:421 -#, fuzzy +#: builtin/stash.c:422 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 +#: builtin/stash.c:428 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:434 -#, fuzzy +#: builtin/stash.c:437 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:448 -#, fuzzy, c-format +#: builtin/stash.c:451 +#, c-format msgid "Merging %s with %s" -msgstr "S'estร fusionant %s amb %s\n" +msgstr "S'estร fusionant %s amb %s" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 msgid "Index was not unstashed." -msgstr "L'รญndex no estava sense emmagatzemar." +msgstr "L'รญndex no estava ยซunstashedยป." -#: builtin/stash.c:516 builtin/stash.c:615 -#, fuzzy +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" -msgstr "S'ha produรฏt un error en llegir l'รญndex" +msgstr "intenta tornar a crear l'รญndex" -#: builtin/stash.c:549 -#, fuzzy, c-format +#: builtin/stash.c:555 +#, c-format msgid "Dropped %s (%s)" -msgstr "${REV} ($s) descartada" +msgstr "Descartat %s (%s)" -#: builtin/stash.c:552 -#, fuzzy, c-format +#: builtin/stash.c:558 +#, c-format msgid "%s: Could not drop stash entry" -msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem" +msgstr "%s: no s'ha pogut descartar l'entrada ยซstashยป" -#: builtin/stash.c:577 -#, fuzzy, c-format +#: builtin/stash.c:583 +#, c-format msgid "'%s' is not a stash reference" -msgstr "'$args' no รฉs una referรจncia de magatzem" +msgstr "ยซ%sยป no รฉs una referรจncia ยซstashยป" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 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:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "Cap nom de branca especificat" -#: builtin/stash.c:790 builtin/stash.c:827 -#, fuzzy, c-format +#: builtin/stash.c:800 builtin/stash.c:837 +#, c-format msgid "Cannot update %s with %s" -msgstr "No es pot actualitzar $ref_stash amb $w_commit" +msgstr "No es pot actualitzar %s amb %s" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 -#, fuzzy +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 msgid "stash message" -msgstr "missatge d'etiqueta" +msgstr "missatge ยซstashยป" -#: builtin/stash.c:818 -#, fuzzy +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" -msgstr "--bisect-clean-state no accepta parร metres" +msgstr "ยซgit stash storeยป requereix un argument <comissiรณ>" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1043 msgid "No changes selected" msgstr "No hi ha canvis seleccionats" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1143 msgid "You do not have the initial commit yet" msgstr "Encara no teniu la comissiรณ inicial" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1170 msgid "Cannot save the current index state" msgstr "No es pot desar l'estat d'รญndex actual" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1179 msgid "Cannot save the untracked files" msgstr "No es poden desar els fitxers no seguits" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1190 builtin/stash.c:1199 msgid "Cannot save the current worktree state" msgstr "No es pot desar l'estat d'arbre de treball actual" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1227 msgid "Cannot record working tree state" msgstr "No es pot registrar l'estat de l'arbre de treball" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1276 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:1285 -#, fuzzy +#: builtin/stash.c:1292 msgid "Did you forget to 'git add'?" -msgstr "Potser volรญeu dir ยซgit add .ยป?\n" +msgstr "Heu oblidat de fer ยซgit addยป?" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1307 msgid "No local changes to save" msgstr "No hi ha canvis locals a desar" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1314 msgid "Cannot initialize stash" msgstr "No es pot inicialitzar el magatzem" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1329 msgid "Cannot save the current status" msgstr "No es pot desar l'estat actual" -#: builtin/stash.c:1327 -#, fuzzy, c-format +#: builtin/stash.c:1334 +#, c-format msgid "Saved working directory and index state %s" -msgstr "S'han desat el directori de treball i l'estat d'รญndex $stash_msg" +msgstr "S'han desat el directori de treball i l'estat d'รญndex %s" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1424 msgid "Cannot remove worktree changes" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/stash.c:1452 builtin/stash.c:1488 -#, fuzzy +#: builtin/stash.c:1463 builtin/stash.c:1528 msgid "keep index" -msgstr "Actualitza l'รญndex" +msgstr "mantรฉn l'รญndex" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1465 builtin/stash.c:1530 +#, fuzzy msgid "stash in patch mode" -msgstr "" +msgstr "stash en mode pedaรง" -#: builtin/stash.c:1455 builtin/stash.c:1491 -#, fuzzy +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "quiet mode" -msgstr "silenciรณs" +msgstr "mode silenciรณs" -#: builtin/stash.c:1457 builtin/stash.c:1493 -#, fuzzy +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "include untracked files in stash" -msgstr "mostra els fitxers no seguits en columnes" +msgstr "inclou els fitxers no seguits a ยซstashยป" -#: builtin/stash.c:1459 builtin/stash.c:1495 -#, fuzzy +#: builtin/stash.c:1470 builtin/stash.c:1535 msgid "include ignore files" -msgstr "elimina nomรฉs els fitxers ignorats" +msgstr "inclou els fitxers ignorats" -#: builtin/stash.c:1555 -#, c-format -msgid "could not exec %s" -msgstr "no s'ha pogut executar %s" +#: builtin/stash.c:1570 +#, fuzzy +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"s'ha eliminat el suport ยซrebase.useBuiltinยป! Per a mรฉs detalls vegeu la seva " +"entrada a ยซgit help configยป." #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -19644,68 +21992,71 @@ 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:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, 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:62 +#: builtin/submodule--helper.c:64 +#, fuzzy msgid "submodule--helper print-default-remote takes no arguments" -msgstr "" +msgstr "submodule--helper print-default-remote no pren cap argument" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, 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:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "ร ncora alternativa per als camins relatius" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<camรญ>] [<camรญ>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, 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:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "S'estร entrant a ยซ%sยป\n" -#: builtin/submodule--helper.c:525 -#, c-format +#: builtin/submodule--helper.c:527 +#, fuzzy, c-format msgid "" "run_command returned non-zero status for %s\n" "." msgstr "" +"runcommand ha retornat un estat diferent de zero per als percentatges ." -#: builtin/submodule--helper.c:547 -#, c-format +#: builtin/submodule--helper.c:549 +#, fuzzy, c-format msgid "" "run_command returned non-zero status while recursing in the nested " "submodules of %s\n" "." msgstr "" +"runcommand ha retornat un estat diferent de zero mentre es repeteix als " +"submรฒduls niats de percentatges ." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "Omet la sortida en entrar l'ordre de cada submรฒdul" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" -msgstr "Inclou recursivament els submรฒduls imbrincats" +msgstr "Inclou recursivament els submรฒduls imbricats" -#: builtin/submodule--helper.c:570 -#, fuzzy +#: builtin/submodule--helper.c:572 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:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -19714,293 +22065,388 @@ 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:665 +#: builtin/submodule--helper.c:666 #, 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:669 +#: builtin/submodule--helper.c:670 #, 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:679 +#: builtin/submodule--helper.c:680 #, 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:686 +#: builtin/submodule--helper.c:687 #, 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:708 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "Omet la sortida d'inicialitzar un submรฒdul" -#: builtin/submodule--helper.c:713 -#, fuzzy +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<camรญ>]" +msgstr "git submodule--helper init [<opcions>] [<camรญ>]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, 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:824 +#: builtin/submodule--helper.c:835 #, 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:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, 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:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "Suprimeix la sortida de l'estat del submรฒdul" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:887 +#, fuzzy msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" +"Utilitza la comissiรณ emmagatzemada a l'รญndex en lloc de la emmagatzemada al " +"submรฒdul HEAD" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" -msgstr "inclou recursivament els submรฒduls imbrincats" +msgstr "inclou recursivament els submรฒduls imbricats" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camรญ>...]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <camรญ>" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "" + +#: builtin/submodule--helper.c:1055 +#, fuzzy, c-format +msgid "couldn't hash object from '%s'" +msgstr "no s'ha pogut analitzar l'objecte ยซ%sยป" + +#: builtin/submodule--helper.c:1059 +#, fuzzy, c-format +msgid "unexpected mode %o\n" +msgstr "mode inesperat $mod_dst" + +#: builtin/submodule--helper.c:1300 +#, fuzzy +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "" +"Utilitza la comissiรณ emmagatzemada a l'รญndex en lloc de la emmagatzemada al " +"submรฒdul HEAD" + +#: builtin/submodule--helper.c:1302 +#, fuzzy +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" +"Utilitza la comissiรณ emmagatzemada a l'รญndex en lloc de la emmagatzemada al " +"submรฒdul HEAD" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "" + +#: builtin/submodule--helper.c:1306 +#, fuzzy +msgid "limit the summary size" +msgstr "limita a caps" + +#: builtin/submodule--helper.c:1311 +#, fuzzy +msgid "git submodule--helper summary [<options>] [commit] [--] [<path>]" +msgstr "git submodule--helper init [<opcions>] [<camรญ>]" + +#: builtin/submodule--helper.c:1335 +#, fuzzy +msgid "could not fetch a revision for HEAD" +msgstr "no s'ha pogut separar HEAD" + +#: builtin/submodule--helper.c:1340 +#, fuzzy +msgid "--cached and --files are mutually exclusive" +msgstr "-n i -k sรณn mรบtuament excloents" + +#: builtin/submodule--helper.c:1407 #, 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:976 +#: builtin/submodule--helper.c:1413 #, 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:990 +#: builtin/submodule--helper.c:1427 #, 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:1001 +#: builtin/submodule--helper.c:1438 #, 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:1048 +#: builtin/submodule--helper.c:1485 msgid "Suppress output of synchronizing submodule url" msgstr "Omet la sortida de la sincronitzaciรณ de l'url del submรฒdul" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<camรญ>]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1546 #, 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 "" "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)" +"(useu ยซrm -rfยป si realment voleu eliminar-lo, incloent tota la seva histรฒria)" -#: builtin/submodule--helper.c:1121 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "" -"L'arbre de treball del submรฒdul ยซ%sยป contรฉ modificacions locals; useu '-f' " +"L'arbre de treball del submรฒdul ยซ%sยป contรฉ modificacions locals; useu ยซ-fยป " "per a descartar-les" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" -msgstr "S'ha netejat el directori ยซ%sยป\n" +msgstr "S'ha esborrat el directori ยซ%sยป\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1568 #, 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:1142 +#: builtin/submodule--helper.c:1579 #, 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:1158 +#: builtin/submodule--helper.c:1595 #, 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:1187 +#: builtin/submodule--helper.c:1624 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 " +"Elimina els arbres de treball dels submรฒduls fins i tot si contenen canvis " "locals" -#: builtin/submodule--helper.c:1188 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "Desregistra recursivament tots els submรฒduls" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camรญ>...]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" -msgstr "Useu '--all' si realment voleu desinicialitzar tots els submรฒduls" +msgstr "Useu ยซ--allยป si realment voleu desinicialitzar tots els submรฒduls" + +#: builtin/submodule--helper.c:1713 +#, fuzzy +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 cร lcul alternatiu d'un superprojecte no รฉs vร lid. Per permetre que Git " +"cloni sense una alternativa en aquest cas establiu submรฒdul." +"alternateErrorStrategy a 'info' o clona equivalentment amb ยซ--reference-if-" +"able' en lloc de ยซ--referenceยป." -#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "el submรฒdul ยซ%sยป no pot afegir un alternatiu: %s" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1791 #, 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:1348 +#: builtin/submodule--helper.c:1798 #, 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:1371 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "a on es clonarร el submรฒdul nou" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "nom del submรฒdul nou" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "url del qual clonar el submรฒdul" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "profunditat dels clons superficials" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "forรงa el progrรฉs del clonatge" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +msgid "disallow cloning into non-empty directory" +msgstr "no permetis clonar en un directori no buit" + +#: builtin/submodule--helper.c:1848 +#, fuzzy msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" -"git submodule--helper clone [--prefix=<camรญ>] [--quiet] [--reference " -"<dipรฒsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camรญ>" +"git submodule--helper clone [--prefix=<path>] [--quiet] [---reference " +"<repository>] [--name <name>] [--depth <] [---single-branch] --url <url> --" +"path <path>" + +#: builtin/submodule--helper.c:1873 +#, fuzzy, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "refusant crear/usar '%s' en el directori git d'un altre submรฒdul" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1884 #, 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:1438 +#: builtin/submodule--helper.c:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "directori no buit: ยซ%sยป" + +#: builtin/submodule--helper.c:1900 #, 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:1474 +#: builtin/submodule--helper.c:1936 #, 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:1478 +#: builtin/submodule--helper.c:1940 #, 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:1571 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "El camรญ de submรฒdul ยซ%sยป no estร inicialitzat" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" -msgstr "Potser voleu usar 'update --init'?" +msgstr "Potser voleu usar ยซupdate --initยป?" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "S'estร ometent el submรฒdul no fusionat %s" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "S'estร ometent el submรฒdul ยซ%sยป" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:2254 #, 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:1789 +#: builtin/submodule--helper.c:2265 #, 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:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "camรญ a l'arbre de treball" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:2330 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:1858 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:2340 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:1867 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "tasques paralยทleles" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:2345 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:1870 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "no imprimeixis el progrรฉs del clonatge" -#: 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:2357 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=<camรญ>] [<camรญ>...]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "valor incorrecte per al parร metre update" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -20009,59 +22455,97 @@ 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:2061 +#: builtin/submodule--helper.c:2541 #, 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:2094 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "inclou recursivament als submรฒduls" -#: builtin/submodule--helper.c:2100 -#, fuzzy +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper embed-git-dir [<camรญ>...]" +msgstr "git submodule--helper absorb-git-dirs [<opcions>] [<camรญ>...]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2636 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:2159 +#: builtin/submodule--helper.c:2639 #, fuzzy msgid "unset the config in the .gitmodules file" -msgstr "l'allistament del .gitmodules actualitzat ha fallat" +msgstr "no s'ha definit la configuraciรณ al fitxer .gitmodules" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2644 #, fuzzy msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config name [valor]" +msgstr "git submodule--helper config <name> [<value>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2645 #, fuzzy msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config name [valor]" +msgstr "git submodule--helper config --unset <name>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 #, 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" +msgstr "Assegureu-vos que el fitxer .gitmodules รฉs a l'arbre de treball" + +#: builtin/submodule--helper.c:2681 +#, fuzzy +msgid "Suppress output for setting url of a submodule" +msgstr "Omet la sortida d'inicialitzar un submรฒdul" + +#: builtin/submodule--helper.c:2685 +#, fuzzy +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper sync [--quiet] [--recursive] [<camรญ>]" + +#: builtin/submodule--helper.c:2718 +#, fuzzy +msgid "set the default tracking branch to master" +msgstr "mostra les branques amb seguiment remot" + +#: builtin/submodule--helper.c:2720 +#, fuzzy +msgid "set the default tracking branch" +msgstr "mostra les branques amb seguiment remot" + +#: builtin/submodule--helper.c:2724 +#, fuzzy +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule--helper sync [--quiet] [--recursive] [<camรญ>]" + +#: builtin/submodule--helper.c:2725 +#, fuzzy +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule--helper sync [--quiet] [--recursive] [<camรญ>]" + +#: builtin/submodule--helper.c:2732 +#, fuzzy +msgid "--branch or --default required" +msgstr "cal el nom de branca" -#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2735 +#, fuzzy +msgid "--branch and --default are mutually exclusive" +msgstr "--deepen i --depth sรณn mรบtuament excloents" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:691 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no admet --super-prefix" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "ยซ%sยป no รฉs un subordre vร lid de submodule--helper" +msgstr "ยซ%sยป no รฉs una subordre vร lida de submodule--helper" #: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -20083,11 +22567,11 @@ msgstr "suprimeix la referรจncia simbรฒlica" msgid "shorten ref output" msgstr "escurรงa la sortida de referรจncies" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "raรณ" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "raรณ de l'actualitzaciรณ" @@ -20097,18 +22581,20 @@ msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" "\t\t<tagname> [<head>]" msgstr "" -"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-" -"d'etiqueta> [<cap>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" #: builtin/tag.c:27 msgid "git tag -d <tagname>..." msgstr "git tag -d <nom-d'etiqueta>..." #: builtin/tag.c:28 +#, fuzzy msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" "git tag -l [-n[<nombre>]] [--contains <comissiรณ>] [--no-contains <comissiรณ>] " "[--points-at <objecte>]\n" @@ -20165,356 +22651,366 @@ msgid "unable to write tag file" msgstr "no s'ha pogut escriure el fitxer d'etiqueta" #: builtin/tag.c:216 -#, c-format +#, fuzzy, 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 "" +"Heu creat una etiqueta niada. L'objecte al qual fa referรจncia la vostra nova " +"etiqueta ja รฉs una etiqueta. Si voleu etiquetar l'objecte que apunta per " +"utilitzar l'etiqueta git -f%s%s perds^{}" #: builtin/tag.c:232 msgid "bad object type." msgstr "el tipus d'objecte รฉs incorrecte." -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "no hi ha cap missatge d'etiqueta?" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "S'ha deixat el missatge de l'etiqueta en %s\n" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "llista els noms d'etiqueta" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "imprimeix <n> lรญnies de cada missatge d'etiqueta" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "suprimeix les etiquetes" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "verifica les etiquetes" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "Opcions de creaciรณ d'etiquetes" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "etiqueta anotada, necessita un missatge" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "missatge d'etiqueta" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "forรงa l'ediciรณ del missatge de l'etiqueta" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "etiqueta anotada i signada per GPG" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "usa una altra clau per a signar l'etiqueta" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "reemplaรงa l'etiqueta si existeix" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "crea un registre de referรจncies" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "Opcions de llistat d'etiquetes" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "mostra la llista d'etiquetes en columnes" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "imprimeix nomรฉs les etiquetes que continguin la comissiรณ" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "imprimeix nomรฉs les etiquetes que no continguin la comissiรณ" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "imprimeix nomรฉs les etiquetes que s'han fusionat" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "imprimeix nomรฉs les etiquetes que no s'han fusionat" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "imprimeix nomรฉs les etiquetes de l'objecte" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "--column i -n sรณn incompatibles" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "es permet l'opciรณ -n nomรฉs amb mode llista" -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "es permet l'opciรณ --contains nomรฉs amb mode llista" -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "es permet l'opciรณ --no-contains nomรฉs amb mode llista" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "es permet --points-at option nomรฉs amb mode llista" -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "es permeten les opcions --merged i --no-merged nomรฉs amb mode llista" -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "nomรฉs es permet una opciรณ -F o -m." -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "massa parร metres" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "ยซ%sยป no รฉs un nom d'etiqueta vร lid." -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "l'etiqueta ยซ%sยป ja existeix" -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta ยซ%sยป actualitzada (era %s)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "S'estan desempaquetant els objectes" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "s'ha produรฏt un error en crear el directori %s" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "s'ha produรฏt un error en crear el fitxer %s" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "s'ha produรฏt un error en suprimir el fitxer %s" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "s'ha produรฏt un error en suprimir el directori %s" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "S'estร provant mtime en ยซ%sยป " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 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" +"la informaciรณ de stat de directori no canvia desprรฉs d'afegir un fitxer nou" -#: builtin/update-index.c:166 +#: builtin/update-index.c:167 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" +"la informaciรณ de stat de directori no canvia desprรฉs d'afegir un directori " +"nou" -#: builtin/update-index.c:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "" -"la informaciรณ d'stat de directori canvia desprรฉs d'actualitzar un fitxer" +"la informaciรณ de stat de directori canvia desprรฉs d'actualitzar un fitxer" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 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 " +"la informaciรณ de stat de directori canvia desprรฉs d'afegir un fitxer dins " "d'un subdirectori" -#: builtin/update-index.c:201 +#: builtin/update-index.c:202 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" +"la informaciรณ de stat de directori no canvia desprรฉs de suprimir un fitxer" -#: builtin/update-index.c:214 +#: builtin/update-index.c:215 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" +"la informaciรณ de stat de directori no canvia desprรฉs de suprimir un directori" -#: builtin/update-index.c:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " D'acord" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opcions>] [--] [<fitxer>...]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "" "continua l'actualitzaciรณ encara que l'รญndex necessiti una actualitzaciรณ" -#: builtin/update-index.c:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "actualitza: ignora els submรฒduls" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "no ignoris els fitxers nous" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "deixa que els fitxers reemplacin els directoris i viceversa" -#: builtin/update-index.c:981 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "tingues en compte els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:983 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "actualitza encara que l'รญndex contingui entrades no fusionades" -#: builtin/update-index.c:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "actualitza la informaciรณ d'estadรญstiques" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "com --refresh, perรฒ ignora el parร metre assume-unchanged" -#: builtin/update-index.c:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<mode>,<objecte>,<camรญ>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "afegeix l'entrada especificada a l'รญndex" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" -msgstr "marca els fitxers com a \"no canviant\"" +msgstr "marca els fitxers com a ยซno canviantยป" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" -msgstr "neteja el bit assumed-unchanged" +msgstr "esborra el bit assumed-unchanged" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" -msgstr "marca els fitxers com a \"nomรฉs รญndex\"" +msgstr "marca els fitxers com a ยซnomรฉs รญndexยป" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" -msgstr "neteja el bit skip-worktree" +msgstr "esborra el bit skip-worktree" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1020 +#, fuzzy +msgid "do not touch index-only entries" +msgstr "no toquis entrades de nomรฉs รญndex" + +#: builtin/update-index.c:1022 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:1019 +#: builtin/update-index.c:1024 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:1021 +#: builtin/update-index.c:1026 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:1023 +#: builtin/update-index.c:1028 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:1027 +#: builtin/update-index.c:1032 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:1031 +#: builtin/update-index.c:1036 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:1035 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "nomรฉs actualitza les entrades que difereixin de HEAD" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ignora els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "informa de les accions en la sortida estร ndard" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "escriu l'รญndex en aquest format" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "habilita o inhabilita l'รญndex dividit" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "habilita/inhabilita la memรฒria cau no seguida" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 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:1056 +#: builtin/update-index.c:1061 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:1058 +#: builtin/update-index.c:1063 +#, fuzzy msgid "write out the index even if is not flagged as changed" -msgstr "" +msgstr "escriu l'รญndex encara que no estigui marcat com a canviat" -#: builtin/update-index.c:1060 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "habilita o inhabilita el monitor del sistema de fitxers" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "marca els fitxers com a vร lids pel fsmonitor" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" -msgstr "neteja el bit de validesa del fsmonitor" +msgstr "esborra el bit de validesa del fsmonitor" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20522,7 +23018,7 @@ msgstr "" "core.splitIndex estร establert a fals; elimineu-lo o canviar-lo, si realment " "voleu habilitar l'รญndex dividit" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20530,7 +23026,7 @@ msgstr "" "core.splitIndex estร establert a cert; elimineu-lo o canvieu-lo, si realment " "voleu inhabilitar l'รญndex dividit" -#: builtin/update-index.c:1188 +#: 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" @@ -20538,11 +23034,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:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "La memรฒria cau no seguida estร inhabilitada" -#: builtin/update-index.c:1200 +#: 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" @@ -20550,29 +23046,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:1204 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "La memรฒria cau no seguida estร habilitada per a ยซ%sยป" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1218 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:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor habilitat" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1225 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:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor inhabilitat" @@ -20589,19 +23085,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<opcions>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "suprimeix la referรจncia" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "actualitza <nom de referรจncia>, no la que apunti" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" -msgstr "stdin tรฉ parร metres acabats amb NUL" +msgstr "stdin tรฉ arguments acabats amb NUL" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "llegeix les actualitzacions des de stdin" @@ -20634,317 +23130,343 @@ 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:20 +#: builtin/verify-commit.c:19 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <comissiรณ>..." -#: builtin/verify-commit.c:69 +#: builtin/verify-commit.c:68 msgid "print commit contents" msgstr "imprimeix els continguts de la comissiรณ" -#: builtin/verify-commit.c:70 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "imprimeix la sortida crua de l'estat gpg" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquet>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "detallat" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "mostra nomรฉs estadรญstiques" -#: builtin/verify-tag.c:19 +#: builtin/verify-tag.c:18 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<format>] <etiqueta>..." -#: builtin/verify-tag.c:37 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "imprimeix els continguts de l'etiqueta" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<opcions>] <camรญ> [<commit-ish>" +msgstr "git worktree add [<opcions>] <camรญ> [<commit-ish>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<opcions>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opcions>] <camรญ>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbre de treball> <camรญ-nou>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opcions>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree lock [<opcions>] <arbre de treball>" +msgstr "git worktree remove [<opcions>] <arbre de treball>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <camรญ>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:970 #, c-format msgid "failed to delete '%s'" msgstr "s'ha produรฏt un error en suprimir ยซ%sยป" -#: 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 +#, fuzzy +msgid "not a valid directory" +msgstr "no รฉs en un directori git" -#: builtin/worktree.c:86 -#, c-format -msgid "Removing worktrees/%s: gitdir file does not exist" +#: builtin/worktree.c:91 +#, fuzzy +msgid "gitdir file does not exist" msgstr "Eliminaciรณ de worktrees/%s: el fitxer gitdir no existeix" -#: 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:96 builtin/worktree.c:105 +#, fuzzy, c-format +msgid "unable to read gitdir file (%s)" +msgstr "no s'ha pogut llegir l'arbre (%s)" -#: builtin/worktree.c:110 -#, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" +#: builtin/worktree.c:115 +#, fuzzy, c-format +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "" -"S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven " -"%<PRIuMAX> bytes, llegits %<PRIuMAX>)" +"S'estan eliminant els arbres de treball/%s: lectura curta (s'esperaven " +"%<PRIuMAX> bytes, se n'han llegit %<PRIuMAX>)" -#: 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:123 +#, fuzzy +msgid "invalid gitdir file" +msgstr "fitxer de configuraciรณ no vร lid %s" -#: builtin/worktree.c:127 -#, c-format -msgid "Removing worktrees/%s: gitdir file points to non-existent location" +#: builtin/worktree.c:131 +#, fuzzy +msgid "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:166 +#: builtin/worktree.c:146 +#, fuzzy, c-format +msgid "Removing %s/%s: %s" +msgstr "S'estร eliminant %s" + +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "informa dels arbres de treball podats" -#: builtin/worktree.c:168 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "fes caducar els arbres de treball mรฉs vells que <hora>" -#: builtin/worktree.c:235 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "ยซ%sยป ja existeix" -#: 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:302 +#, fuzzy, c-format +msgid "unusable worktree destination '%s'" +msgstr "no s'ha pogut fer ยซstatยป a ยซ%sยป" -#: builtin/worktree.c:257 -#, c-format +#: builtin/worktree.c:307 +#, fuzzy, 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" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" +"ยซ%sยป รฉs un arbre de treball que manca perรฒ bloquejat; useu ยซadd -f -fยป per a " +"sobreescriure o ยซunlockยป i ยซpruneยป o ยซremoveยป per a netejar" -#: builtin/worktree.c:259 -#, c-format +#: builtin/worktree.c:309 +#, fuzzy, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" +"'%s' รฉs un arbre de treball que manca perรฒ ja estร registrat; useu 'add -f' " +"per sobreescriure o 'prune' o 'remove' per netejar" -#: builtin/worktree.c:309 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "no s'ha pogut crear directori de ยซ%sยป" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "S'estร preparant l'arbre de treball (branca nova ยซ%sยป)" -#: builtin/worktree.c:442 -#, c-format +#: builtin/worktree.c:496 +#, fuzzy, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" +"Preparant l'arbre de treball (la branca de reestructuraciรณ \"%s\"; estava en " +"percentatges)" -#: builtin/worktree.c:451 +#: builtin/worktree.c:505 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "S'estร preparant l'arbre de treball (s'estร agafant ยซ%sยป)" -#: builtin/worktree.c:457 +#: builtin/worktree.c:511 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "S'estร preparant l'arbre de treball (HEAD %s separat)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:552 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:501 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "crea una branca nova" -#: builtin/worktree.c:503 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "crea o restableix una branca" -#: builtin/worktree.c:505 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "emplena l'arbre de treball nou" -#: builtin/worktree.c:506 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "mantรฉn l'arbre de treball nou bloquejat" -#: builtin/worktree.c:509 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "configura el mode de seguiment (vegeu git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:566 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:520 +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B i --detach sรณn mรบtuament excloents" -#: builtin/worktree.c:581 +#: builtin/worktree.c:635 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:681 +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "raรณ per bloquejar" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 #, c-format msgid "'%s' is not a working tree" msgstr "ยซ%sยป no รฉs un arbre de treball" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:769 builtin/worktree.c:802 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:700 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "ยซ%sยป ja estร bloquejat, raรณ: ยซ%sยป" -#: builtin/worktree.c:702 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "ยซ%sยป ja estร bloquejat" -#: builtin/worktree.c:730 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "ยซ%sยป no estร bloquejat" -#: builtin/worktree.c:771 +#: builtin/worktree.c:845 msgid "working trees containing submodules cannot be moved or removed" msgstr "" +"els arbres de treball que contenen submรฒduls no es poden moure ni eliminar" -#: builtin/worktree.c:779 -#, fuzzy +#: builtin/worktree.c:853 msgid "force move even if worktree is dirty or locked" -msgstr "forรงa el moviment / canvi de nom encara que el destรญ existeixi" +msgstr "" +"forรงa el moviment encara que l'arbre de treball estigui brut o bloquejat" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:876 builtin/worktree.c:1000 #, c-format msgid "'%s' is a main working tree" msgstr "ยซ%sยป รฉs un arbre de treball principal" -#: builtin/worktree.c:807 +#: builtin/worktree.c:881 #, 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:813 -#, c-format -msgid "target '%s' already exists" -msgstr "el destรญ ยซ%sยป ja existeix" - -#: builtin/worktree.c:821 +#: builtin/worktree.c:894 #, 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" +msgstr "" +"no es pot moure un bloqueig de l'arbre de treball bloquejat el raon per cent " +"utilitza ยซmove -f -fยป per substituir o desbloquejar primer" -#: builtin/worktree.c:823 +#: builtin/worktree.c:896 #, 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" +msgstr "" +"no es pot moure un arbre de treball bloquejat; useu primer ยซmove -f -fยป per " +"sobreescriure o desbloquejar" -#: builtin/worktree.c:826 +#: builtin/worktree.c:899 #, 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:831 +#: builtin/worktree.c:904 #, c-format msgid "failed to move '%s' to '%s'" msgstr "s'ha produรฏt un error en moure ยซ%sยป a ยซ%sยป" -#: builtin/worktree.c:879 +#: builtin/worktree.c:950 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "no s'ha pogut executar ยซgit statusยป a ยซ%sยป" -#: builtin/worktree.c:883 -#, c-format -msgid "'%s' is dirty, use --force to delete it" +#: builtin/worktree.c:954 +#, fuzzy, c-format +msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" +"'%s' contรฉ fitxers modificats o no seguits useu --force per suprimir-los" -#: builtin/worktree.c:888 +#: builtin/worktree.c:959 #, 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:911 -#, fuzzy +#: builtin/worktree.c:982 msgid "force removal even if worktree is dirty or locked" -msgstr "forรงa el moviment / canvi de nom encara que el destรญ existeixi" +msgstr "" +"forรงa l'eliminaciรณ encara que l'arbre de treball estigui brut o bloquejat" -#: builtin/worktree.c:934 +#: builtin/worktree.c:1005 #, 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" +msgstr "" +"no s'ha pogut eliminar un bloqueig de l'arbre de treball bloquejat perquรจ " +"els raonadors utilitzen ยซremove -f -fยป per substituir o desbloquejar primer" -#: builtin/worktree.c:936 +#: builtin/worktree.c:1007 #, 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" +msgstr "" +"no es pot eliminar un arbre de treball bloquejat; useu primer ยซremove -f -fยป " +"per sobreescriure o desbloquejar" -#: builtin/worktree.c:939 -#, c-format +#: builtin/worktree.c:1010 +#, fuzzy, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" +"la validaciรณ ha fallat no es poden eliminar els percentatges dels arbres de " +"treball" + +#: builtin/worktree.c:1034 +#, fuzzy, c-format +msgid "repair: %s: %s" +msgstr "%s no vร lid: ยซ%sยป" + +#: builtin/worktree.c:1037 +#, fuzzy, c-format +msgid "error: %s: %s" +msgstr "error en %s %s: %s" #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" @@ -20962,44 +23484,35 @@ msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>" msgid "only useful for debugging" msgstr "nomรฉs รบtil per a la depuraciรณ" -#: credential-cache--daemon.c:223 +#: http-fetch.c:114 #, 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" +msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" -"Els permisos en el vostre directori de sรฒcol sรณn massa liberals;\n" -"pot ser que altres usuaris poden llegir les vostres credencials.\n" -"Considereu executar:\n" -"\n" -"\tchmod 0700 %s" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "imprimeix els missatges de depuraciรณ a stderr" +#: http-fetch.c:122 +#, fuzzy +msgid "not a git repository" +msgstr "No รฉs un dipรฒsit de git" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "la comissiรณ %s no estร marcada com abastable" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" -msgstr "masses comission marcades com abastable" +msgstr "hi ha massa comissions marcades com abastables" #: t/helper/test-serve-v2.c:7 -#, fuzzy msgid "test-tool serve-v2 [<options>]" -msgstr "git serve [<opcions>]" +msgstr "test-tool serve-v2 [<opcions>]" #: t/helper/test-serve-v2.c:19 -#, fuzzy msgid "exit immediately after advertising capabilities" -msgstr "surt immediatament desprรฉs de l'anunci inicial de referรจncia" +msgstr "surt immediatament desprรฉs d'anunciar les funcionalitats" -#: git.c:27 +#: git.c:28 +#, fuzzy msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -21008,8 +23521,11 @@ msgid "" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" " <command> [<args>]" msgstr "" +"git [--version] [--help] [-C <path>] [-c <name>=<value>] [--exec-" +"path[=<path>]] [---html-path] [---info-path] [--paginate | -P | --no-pager] " +"[-git-dir=<-name]" -#: git.c:34 +#: git.c:35 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" @@ -21018,89 +23534,91 @@ msgid "" msgstr "" "ยซgit help -aยป i ยซgit help -gยป llisten subordres disponibles i\n" "algunes guies de concepte. Vegeu ยซgit help <ordre>ยป o\n" -"ยซgit help <concepte>ยป per a llegir sobre un subordre o concepte especรญfic.\n" +"ยซgit help <concepte>ยป per a llegir sobre una subordre o concepte especรญfic.\n" "Vegeu ยซgit help gitยป per a una visiรณ general del sistema." -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "no s'ha especificat un directori per --git-dir\n" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "no s'ha especificat un nom d'espai per --namespace\n" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "no s'ha especificat un directori per --work-tree\n" -#: git.c:228 -#, fuzzy, c-format +#: git.c:229 +#, c-format msgid "no prefix given for --super-prefix\n" -msgstr "%s no admet --super-prefix" +msgstr "no s'ha especificat cap prefix per a --super-prefix\n" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "-c espera una cadena de configuraciรณ\n" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "no s'ha especificat un directori per -C\n" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "opciรณ desconeguda: %s\n" -#: git.c:360 -#, c-format +#: git.c:364 +#, fuzzy, c-format msgid "while expanding alias '%s': '%s'" -msgstr "" +msgstr "en expandir l'ร lies '%s' '%s'" -#: git.c:369 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" "You can use '!git' in the alias to do this" msgstr "" +"ร lies ยซ%sยป canvia variables d'entorn. Podeu utilitzar ยซ!gitยป a l'ร lies per a " +"fer-ho" -#: git.c:377 -#, c-format +#: git.c:380 +#, fuzzy, c-format msgid "empty alias for %s" -msgstr "" +msgstr "ร lies buit per a percentatges" -#: git.c:380 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "ร lies recursiu: %s" -#: git.c:460 +#: git.c:465 msgid "write failure on standard output" msgstr "fallada d'escriptura en la sortida estร ndard" -#: git.c:462 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "fallada d'escriptura desconeguda en la sortida estร ndard" -#: git.c:464 +#: git.c:469 msgid "close failed on standard output" msgstr "ha fallat el tancament en la sortida estร ndard" -#: git.c:796 -#, c-format +#: git.c:800 +#, fuzzy, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "" +msgstr "bucle d'ร lies detectat expansiรณ de ยซ%sยป no acaba%" -#: git.c:846 +#: git.c:850 #, fuzzy, c-format msgid "cannot handle %s as a builtin" -msgstr "no es pot usar %s com a fitxer d'exclusiรณ" +msgstr "no es poden gestionar els percentatges com a integrat" -#: git.c:859 +#: git.c:863 #, c-format msgid "" "usage: %s\n" @@ -21109,55 +23627,57 @@ msgstr "" "รบs: %s\n" "\n" -#: git.c:879 -#, c-format +#: git.c:883 +#, fuzzy, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" -msgstr "" +msgstr "ha fallat l'expansiรณ de l'ร lies '%s'; '%s' no รฉs una ordre git" -#: git.c:891 +#: git.c:895 #, c-format msgid "failed to run command '%s': %s\n" msgstr "s'ha produรฏt un error en executar l'ordre ยซ%sยป: %s\n" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "valor negatiu per http.postbuffer; utilitzant el valor %d" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "No s'admet el control de delegaciรณ amb el cURL < 7.22.0" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" -msgstr "No s'admet l'enganx de clau pรบblica amb cURL < 7.44.0" +msgstr "No s'admet la fixaciรณ de clau pรบblica amb cURL < 7.44.0" -#: http.c:876 +#: http.c:910 #, fuzzy msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" -msgstr "No s'admet l'enganx de clau pรบblica amb cURL < 7.44.0" +msgstr "CURLSSLOPTNOREVOKE no estร suportat amb cURL < 7.44.0" -#: http.c:949 +#: http.c:989 #, fuzzy 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" +msgstr "Restriccions de protocol no compatibles amb cURL < 7.19.4" -#: http.c:1085 -#, c-format +#: http.c:1132 +#, fuzzy, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" -msgstr "" +msgstr "El dorsal SSL ยซ%sยป no estร implementat. Els dorsals SSL compatibles" -#: http.c:1092 -#, c-format +#: http.c:1139 +#, fuzzy, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" +"No s'ha pogut establir el dorsal SSL a ยซ%sยป s'ha construรฏt cURL sense " +"dorsals SSL" -#: http.c:1096 +#: http.c:1143 #, fuzzy, c-format msgid "Could not set SSL backend to '%s': already set" -msgstr "No s'ha pogut tornar a $head_name" +msgstr "No s'ha pogut establir el dorsal SSL a ยซ%sยป ja establert" -#: http.c:1965 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21168,171 +23688,226 @@ msgstr "" " peticiรณ: %s\n" " redirecciรณ: %s" -#: remote-curl.c:157 +#: remote-curl.c:174 #, fuzzy, c-format msgid "invalid quoting in push-option value: '%s'" -msgstr "valor parcial no vร lid: ยซ%sยป" +msgstr "cita no vร lida en el valor de l'opciรณ d'empenta ยซ%sยป" -#: remote-curl.c:254 +#: remote-curl.c:298 #, fuzzy, c-format msgid "%sinfo/refs not valid: is this a git repository?" -msgstr "ยซ%sยป no reconegut com un dipรฒsit git" +msgstr "oversinfo/refs no รฉs vร lid รฉs un repositori git?" -#: remote-curl.c:355 +#: remote-curl.c:399 #, fuzzy msgid "invalid server response; expected service, got flush packet" -msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de neteja" +msgstr "" +"la resposta del servidor no รฉs vร lida; el servei esperat ha rebut el paquet " +"de neteja" -#: remote-curl.c:386 +#: remote-curl.c:430 #, fuzzy, c-format msgid "invalid server response; got '%s'" -msgstr "referรจncia no vร lida: %s" +msgstr "resposta del servidor no vร lida; s'ha obtingut ยซ%sยป" -#: remote-curl.c:446 -#, fuzzy, c-format +#: remote-curl.c:490 +#, c-format msgid "repository '%s' not found" -msgstr "no s'ha trobat la branca ยซ%sยป." +msgstr "no s'ha trobat el dipรฒsit ยซ%sยป" -#: remote-curl.c:450 -#, fuzzy, c-format +#: remote-curl.c:494 +#, c-format msgid "Authentication failed for '%s'" -msgstr "falta el valor per ยซ%sยป" +msgstr "S'ha produรฏt un error en autenticar per ยซ%sยป" -#: remote-curl.c:454 -#, fuzzy, c-format +#: remote-curl.c:498 +#, 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:460 +#: remote-curl.c:504 #, c-format msgid "redirecting to %s" msgstr "s'estร redirigint a %s" -#: remote-curl.c:584 +#: remote-curl.c:633 +#, fuzzy msgid "shouldn't have EOF when not gentle on EOF" +msgstr "No hauria de tenir EOF quan no sigui suau al EOF" + +#: remote-curl.c:645 +msgid "remote server sent stateless separator" msgstr "" -#: remote-curl.c:664 +#: remote-curl.c:715 +#, fuzzy msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" +"no s'han pogut rebobinar les dades de publicaciรณ rpc - proveu d'augmentar " +"http.postBuffer" -#: remote-curl.c:724 +#: remote-curl.c:745 +#, fuzzy, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "error de protocol: carร cter de longitud de lรญnia erroni: %.4s" + +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "" + +#: remote-curl.c:823 #, fuzzy, c-format msgid "RPC failed; %s" -msgstr "STARTTLS ha fallat! %s" +msgstr "RPC ha fallat; percentatges" -#: remote-curl.c:764 +#: remote-curl.c:863 #, fuzzy msgid "cannot handle pushes this big" -msgstr "no es pot usar %s com a fitxer d'exclusiรณ" +msgstr "no es pot gestionar empรจnyer aquest gran" -#: remote-curl.c:879 -#, c-format +#: remote-curl.c:978 +#, fuzzy, c-format msgid "cannot deflate request; zlib deflate error %d" +msgstr "no es pot desinflar la solยทlicitud; zlib deflate error%d" + +#: remote-curl.c:982 +#, fuzzy, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "no es pot desinflar la solยทlicitud; error final zlib percentatged" + +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" msgstr "" -#: remote-curl.c:883 +#: remote-curl.c:1034 #, c-format -msgid "cannot deflate request; zlib end error %d" +msgid "%d bytes of body are still expected" msgstr "" -#: remote-curl.c:1014 +#: remote-curl.c:1123 #, fuzzy msgid "dumb http transport does not support shallow capabilities" -msgstr "El servidor no permet clients superficials" +msgstr "el transport ximple http no admet capacitats superficials" -#: remote-curl.c:1028 +#: remote-curl.c:1138 #, fuzzy msgid "fetch failed." -msgstr "l'ยซstashยป ha fallat" +msgstr "el fetch ha fallat." -#: remote-curl.c:1076 +#: remote-curl.c:1184 +#, fuzzy msgid "cannot fetch by sha1 over smart http" -msgstr "" +msgstr "no sโha pogut obtenir per la sha1 a travรฉs de lโintelยทligent http" -#: remote-curl.c:1120 remote-curl.c:1126 +#: remote-curl.c:1228 remote-curl.c:1234 #, 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ยป" +msgstr "error de protocol esperat sha/ref s'ha obtingut ยซ%sยป" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1246 remote-curl.c:1361 #, fuzzy, c-format msgid "http transport does not support %s" -msgstr "la variant ยซsimpleยป d'ssh no รฉs compatible amb -4" +msgstr "El transport http no dรณna suport als percentatges" -#: remote-curl.c:1174 +#: remote-curl.c:1282 #, fuzzy msgid "git-http-push failed" -msgstr "l'ยซstashยป ha fallat" +msgstr "git-http-push ha fallat" -#: remote-curl.c:1360 +#: remote-curl.c:1467 +#, fuzzy msgid "remote-curl: usage: git remote-curl <remote> [<url>]" -msgstr "" +msgstr "รบs remot de curl git remote-curl <remote> [<url>]" -#: remote-curl.c:1392 +#: remote-curl.c:1499 +#, fuzzy msgid "remote-curl: error reading command stream from git" -msgstr "" +msgstr "error remot en llegir el flux d'ordres des de git" -#: remote-curl.c:1399 +#: remote-curl.c:1506 +#, fuzzy msgid "remote-curl: fetch attempted without a local repo" -msgstr "" +msgstr "s'ha intentat recuperar el valor remot sense un dipรฒsit local" -#: remote-curl.c:1439 -#, c-format +#: remote-curl.c:1547 +#, fuzzy, c-format msgid "remote-curl: unknown command '%s' from git" +msgstr "comandament desconegut ยซ%sยป del git" + +#: compat/compiler.h:26 +msgid "no compiler information available\n" msgstr "" -#: list-objects-filter-options.h:61 +#: compat/compiler.h:38 +#, fuzzy +msgid "no libc information available\n" +msgstr "mostra la informaciรณ de branca" + +#: list-objects-filter-options.h:91 msgid "args" -msgstr "args" +msgstr "arguments" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "filtratge d'objecte" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "data-de-caducitat" -#: parse-options.h:184 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "operaciรณ nulยทla (per a compatibilitat amb versions anteriors)" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "sigues mรฉs detallat" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" -msgstr "sigues mรฉs callat" +msgstr "sigues mรฉs discret" -#: parse-options.h:313 -msgid "use <n> digits to display SHA-1s" +#: parse-options.h:317 +#, fuzzy +msgid "use <n> digits to display object names" msgstr "usa <n> xifres per presentar els SHA-1" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "com suprimir els espais i #comentaris del missatge" -#: ref-filter.h:101 +#: parse-options.h:337 +#, fuzzy +msgid "read pathspec from file" +msgstr "llegeix l'especificaciรณ del camรญ del fitxer" + +#: parse-options.h:338 +#, fuzzy +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL character" +msgstr "" +"amb --pathspec-from-file els elements d'especificaciรณ del camรญ estan " +"separats amb carร cter NUL" + +#: ref-filter.h:96 msgid "key" msgstr "clau" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "nom del camp en el qual ordenar" #: rerere.h:44 msgid "update the index with reused conflict resolution if possible" msgstr "" -"actualitza l'รญndex amb la resoluciรณ de conflicte reusada si รฉs possible" +"actualitza l'รญndex amb la resoluciรณ de conflictes reusada si รฉs possible" -#: wt-status.h:68 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "HEAD separat a " -#: wt-status.h:69 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "HEAD separat de " @@ -21375,714 +23950,758 @@ msgid "List, create, or delete branches" msgstr "Llista, crea o suprimeix branques" #: command-list.h:59 -msgid "Move objects and refs by archive" +msgid "Collect information for user to file a bug report" msgstr "" #: command-list.h:60 +#, fuzzy +msgid "Move objects and refs by archive" +msgstr "Mou els objectes i les referรจncies per arxiu" + +#: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "" "Proveeix contingut o informaciรณ del tipus i mida per als objectes del dipรฒsit" -#: command-list.h:61 +#: command-list.h:62 msgid "Display gitattributes information" msgstr "Mostra la informaciรณ de .gitattributes" -#: command-list.h:62 +#: command-list.h:63 msgid "Debug gitignore / exclude files" msgstr "Depura gitignore / fitxers d'exclusiรณ" -#: command-list.h:63 +#: command-list.h:64 #, fuzzy msgid "Show canonical names and email addresses of contacts" -msgstr "Mostra l'adreรงa electrรฒnica de cada autor" +msgstr "Mostra els noms canรฒnics i les adreces electrรฒniques dels contactes" -#: command-list.h:64 +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "Canvia de branca o restaura els fitxers de l'arbre de treball" -#: command-list.h:65 +#: command-list.h:66 msgid "Copy files from the index to the working tree" msgstr "Copia fitxers des de l'รญndex a l'arbre de treball" -#: command-list.h:66 +#: command-list.h:67 msgid "Ensures that a reference name is well formed" msgstr "Assegura que un nom de referรจncia estร ben format" -#: command-list.h:67 +#: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "Troba les comissions que encara s'han d'aplicar a la font" -#: command-list.h:68 +#: command-list.h:69 msgid "Apply the changes introduced by some existing commits" msgstr "Aplica els canvis introduรฏts per algunes comissions existents" -#: command-list.h:69 +#: command-list.h:70 msgid "Graphical alternative to git-commit" msgstr "Alternativa grร fica a git-commit" -#: command-list.h:70 +#: command-list.h:71 msgid "Remove untracked files from the working tree" -msgstr "Suprimeix els fitxers no seguits de l'arbre de treball" +msgstr "Elimina els fitxers no seguits de l'arbre de treball" -#: command-list.h:71 +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "Clona un dipรฒsit a un directori nou" -#: command-list.h:72 +#: command-list.h:73 msgid "Display data in columns" msgstr "Mostra les dades en columnes" -#: command-list.h:73 +#: command-list.h:74 msgid "Record changes to the repository" msgstr "Registra els canvis al dipรฒsit" -#: command-list.h:74 +#: command-list.h:75 msgid "Write and verify Git commit-graph files" msgstr "Escriu i verifica els fitxers commit-graph de Git" -#: command-list.h:75 +#: command-list.h:76 msgid "Create a new commit object" msgstr "Crea un objecte de comissiรณ nou" -#: command-list.h:76 +#: command-list.h:77 msgid "Get and set repository or global options" msgstr "Obtรฉ o estableix opcions de dipรฒsit o globals" -#: command-list.h:77 +#: command-list.h:78 +#, fuzzy msgid "Count unpacked number of objects and their disk consumption" -msgstr "" +msgstr "Compta el nombre d'objectes desempaquetats i el seu consum de disc" -#: command-list.h:78 +#: command-list.h:79 +#, fuzzy msgid "Retrieve and store user credentials" -msgstr "" +msgstr "Recupera i desa les credencials d'usuari" -#: command-list.h:79 +#: command-list.h:80 +#, fuzzy msgid "Helper to temporarily store passwords in memory" -msgstr "" +msgstr "Ajudant per emmagatzemar temporalment les contrasenyes a la memรฒria" -#: command-list.h:80 +#: command-list.h:81 msgid "Helper to store credentials on disk" msgstr "Ajudant per a emmagatzemar credencials a disc" -#: command-list.h:81 +#: command-list.h:82 +#, fuzzy msgid "Export a single commit to a CVS checkout" -msgstr "" +msgstr "Exporta una sola entrega a una versiรณ de CVS" -#: command-list.h:82 +#: command-list.h:83 +#, fuzzy msgid "Salvage your data out of another SCM people love to hate" -msgstr "" +msgstr "Estalvia les teves dades d'una altra gent de SCM que li agrada odiar" -#: command-list.h:83 +#: command-list.h:84 msgid "A CVS server emulator for Git" msgstr "Un emulador de servidor CVS per al Git" -#: command-list.h:84 +#: command-list.h:85 msgid "A really simple server for Git repositories" msgstr "Un servidor realment senzill per a dipรฒsits Git" -#: command-list.h:85 +#: command-list.h:86 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 +#: command-list.h:87 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 +#: command-list.h:88 msgid "Compares files in the working tree and the index" msgstr "Compara fitxers en l'arbre de treball i l'รญndex" -#: command-list.h:88 +#: command-list.h:89 msgid "Compare a tree to the working tree or index" msgstr "Compara un arbre amb l'arbre de treball o l'รญndex" -#: command-list.h:89 +#: command-list.h:90 +#, fuzzy msgid "Compares the content and mode of blobs found via two tree objects" msgstr "" +"Compara el contingut i el mode dels blobs trobats a travรฉs de dos objectes " +"d'arbre" -#: command-list.h:90 +#: command-list.h:91 msgid "Show changes using common diff tools" msgstr "Mostra els canvis usant eines diff comunes" -#: command-list.h:91 +#: command-list.h:92 msgid "Git data exporter" msgstr "Explorador de dades del Git" -#: command-list.h:92 +#: command-list.h:93 msgid "Backend for fast Git data importers" msgstr "Rerefons per a importadors rร pids de dades de Git" -#: command-list.h:93 +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "Baixa objectes i referรจncies d'un altre dipรฒsit" -#: command-list.h:94 +#: command-list.h:95 msgid "Receive missing objects from another repository" msgstr "Rep els objectes que manquen des d'un altre dipรฒsit" -#: command-list.h:95 +#: command-list.h:96 msgid "Rewrite branches" msgstr "Torna a escriure les branques" -#: command-list.h:96 +#: command-list.h:97 msgid "Produce a merge commit message" msgstr "Produeix un missatge de comissiรณ de fusiรณ" -#: command-list.h:97 +#: command-list.h:98 msgid "Output information on each ref" msgstr "Mostra la informaciรณ en cada referรจncia" -#: command-list.h:98 +#: command-list.h:99 msgid "Prepare patches for e-mail submission" msgstr "Prepara pedaรงos per enviar-los per correu electrรฒnic" -#: command-list.h:99 +#: command-list.h:100 msgid "Verifies the connectivity and validity of the objects in the database" -msgstr "Verifica la connectivitat i validesa del objectes a la base de dades" +msgstr "Verifica la connectivitat i validesa dels objectes a la base de dades" -#: command-list.h:100 +#: command-list.h:101 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Neteja els fitxers innecessaris i optimitza el dipรฒsit local" -#: command-list.h:101 +#: command-list.h:102 +#, fuzzy msgid "Extract commit ID from an archive created using git-archive" -msgstr "" +msgstr "Extreu l'ID de la comissiรณ d'un arxiu creat amb el git-archive" -#: command-list.h:102 +#: command-list.h:103 msgid "Print lines matching a pattern" msgstr "Imprimeix les lรญnies coincidents amb un patrรณ" -#: command-list.h:103 +#: command-list.h:104 msgid "A portable graphical interface to Git" msgstr "Una interfรญcie grร fic portable per al Git" -#: command-list.h:104 +#: command-list.h:105 msgid "Compute object ID and optionally creates a blob from a file" msgstr "Calcula l'ID de l'objecte i opcionalment crea un blob des del fitxer" -#: command-list.h:105 +#: command-list.h:106 msgid "Display help information about Git" msgstr "Mostra informaciรณ d'ajuda del Git" -#: command-list.h:106 +#: command-list.h:107 +#, fuzzy msgid "Server side implementation of Git over HTTP" -msgstr "" +msgstr "Implementaciรณ del servidor del Git sobre HTTP" -#: command-list.h:107 +#: command-list.h:108 msgid "Download from a remote Git repository via HTTP" msgstr "Baixa des d'un dipรฒsit Git remot via HTTP" -#: command-list.h:108 +#: command-list.h:109 #, fuzzy msgid "Push objects over HTTP/DAV to another repository" -msgstr "Baixa objectes i referรจncies d'un altre dipรฒsit" +msgstr "Empeny objectes sobre HTTP/DAV a un altre dipรฒsit" -#: command-list.h:109 +#: command-list.h:110 +#, fuzzy msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "" +"Envia una colยทlecciรณ de pedaรงos des de l'entrada estร ndard a una carpeta IMAP" -#: command-list.h:110 +#: command-list.h:111 +#, fuzzy msgid "Build pack index file for an existing packed archive" msgstr "" +"Construeix el fitxer d'รญndex del paquet per a un arxiu empaquetat existent" -#: command-list.h:111 +#: command-list.h:112 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Crea un dipรฒsit de Git buit o reinicialitza un existent" -#: command-list.h:112 +#: command-list.h:113 +#, fuzzy msgid "Instantly browse your working repository in gitweb" -msgstr "" +msgstr "Navegueu instantร niament pel vostre dipรฒsit de treball a gitweb" -#: command-list.h:113 +#: command-list.h:114 +#, fuzzy msgid "Add or parse structured information in commit messages" -msgstr "" +msgstr "Afegir o analitzar informaciรณ estructurada en missatges de publicaciรณ" -#: command-list.h:114 +#: command-list.h:115 msgid "The Git repository browser" msgstr "El navegador de dipรฒsits Git" -#: command-list.h:115 +#: command-list.h:116 msgid "Show commit logs" msgstr "Mostra els registres de comissiรณ" -#: command-list.h:116 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" -msgstr "Mostra informaciรณ sobre els fitxer a l'รญndex i a l'arbre de treball" +msgstr "Mostra informaciรณ sobre els fitxers a l'รญndex i a l'arbre de treball" -#: command-list.h:117 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "Mostra les referรจncies d'un dipรฒsit remot" -#: command-list.h:118 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "Mostra els continguts d'un objecte de l'arbre" -#: command-list.h:119 +#: command-list.h:120 +#, fuzzy msgid "Extracts patch and authorship from a single e-mail message" -msgstr "" +msgstr "Extreu pedaรง i autoria d'un sol missatge de correu electrรฒnic" -#: command-list.h:120 +#: command-list.h:121 +#, fuzzy msgid "Simple UNIX mbox splitter program" +msgstr "Programa de divisor mbox simple per a UNIX" + +#: command-list.h:122 +msgid "Run tasks to optimize Git repository data" msgstr "" -#: command-list.h:121 +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "Uneix dues o mรฉs histรฒries de desenvolupament" -#: command-list.h:122 +#: command-list.h:124 #, fuzzy msgid "Find as good common ancestors as possible for a merge" -msgstr "troba els avantpassats per a una sola fusiรณ d'n vies" +msgstr "Troba els millors avantpassats comuns possibles per a una fusiรณ" -#: command-list.h:123 +#: command-list.h:125 #, fuzzy msgid "Run a three-way file merge" -msgstr "S'estร retrocedint a una fusiรณ de 3 vies...\n" +msgstr "Executa una fusiรณ de fitxers de tres vies" -#: command-list.h:124 +#: command-list.h:126 #, fuzzy msgid "Run a merge for files needing merging" -msgstr "fusiรณ de 3 vies si no cal fusiรณ a nivell de fitxers" +msgstr "Executa una fusiรณ per als fitxers que cal fusionar" -#: command-list.h:125 +#: command-list.h:127 +#, fuzzy msgid "The standard helper program to use with git-merge-index" -msgstr "" +msgstr "El programa d'ajuda estร ndard a utilitzar amb git-merge-index" -#: command-list.h:126 +#: command-list.h:128 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 fusiรณ" -#: command-list.h:127 +#: command-list.h:129 +#, fuzzy msgid "Show three-way merge without touching index" -msgstr "" +msgstr "Mostra la fusiรณ de tres vies sense l'รญndex tร ctil" -#: command-list.h:128 +#: command-list.h:130 +#, fuzzy msgid "Write and verify multi-pack-indexes" -msgstr "" +msgstr "Escriu i verifica els multi-รญndexs" -#: command-list.h:129 +#: command-list.h:131 msgid "Creates a tag object" msgstr "Crea un objecte etiqueta" -#: command-list.h:130 +#: command-list.h:132 +#, fuzzy msgid "Build a tree-object from ls-tree formatted text" -msgstr "" +msgstr "Construeix un objecte en arbre a partir de text formatat amb ls-tree" -#: command-list.h:131 +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "Mou o canvia de nom a un fitxer, directori o enllaรง simbรฒlic" -#: command-list.h:132 +#: command-list.h:134 +#, fuzzy msgid "Find symbolic names for given revs" -msgstr "" +msgstr "Cerca noms simbรฒlics per a les revisions donades" -#: command-list.h:133 +#: command-list.h:135 msgid "Add or inspect object notes" msgstr "Afegeix o inspecciona notes de l'objecte" -#: command-list.h:134 +#: command-list.h:136 msgid "Import from and submit to Perforce repositories" msgstr "Importa des de i envia a dipรฒsits Perforce" -#: command-list.h:135 +#: command-list.h:137 msgid "Create a packed archive of objects" msgstr "Crea un arxiu empaquetat d'objectes" -#: command-list.h:136 +#: command-list.h:138 msgid "Find redundant pack files" msgstr "Troba fitxers empaquetats redundants" -#: command-list.h:137 +#: command-list.h:139 +#, fuzzy msgid "Pack heads and tags for efficient repository access" msgstr "" +"Empaqueta els caps i les etiquetes per a un accรฉs eficient al repositori" -#: command-list.h:138 +#: command-list.h:140 +#, fuzzy msgid "Routines to help parsing remote repository access parameters" -msgstr "" +msgstr "Rutines per ajudar a analitzar els parร metres d'accรฉs al dipรฒsit remot" -#: command-list.h:139 +#: command-list.h:141 msgid "Compute unique ID for a patch" -msgstr "Calcula un identificador รบnica per a cada pedaรง" +msgstr "Calcula un identificador รบnic per a cada pedaรง" -#: command-list.h:140 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "Poda tots els objectes no accessibles de la base de dades d'objectes" -#: command-list.h:141 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" -msgstr "" +msgstr "Elimina els objectes extres que ja estan en fitxers empaquetats" -#: command-list.h:142 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Obtรฉn i integra amb un altre dipรฒsit o una branca local" -#: command-list.h:143 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "" "Actualitza les referรจncies remotes juntament amb els objectes associats" -#: command-list.h:144 +#: command-list.h:146 #, fuzzy msgid "Applies a quilt patchset onto the current branch" -msgstr "No hi ha cap font per defecte definida per a la branca actual." +msgstr "Aplica un conjunt de pedaรงos cobert a la branca actual" -#: command-list.h:145 +#: command-list.h:147 +#, fuzzy msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "" +"Compara dos intervals de comissions (p. ex. dues versions d'una branca)" -#: command-list.h:146 -#, fuzzy +#: command-list.h:148 msgid "Reads tree information into the index" -msgstr "actualitza la informaciรณ d'estadรญstiques en el fitxer d'รญndex" +msgstr "Llegeix la informaciรณ de l'arbre a l'รญndex" -#: command-list.h:147 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "Torna a aplicar les comissions sobre un altre punt de basament" -#: command-list.h:148 +#: command-list.h:150 #, fuzzy msgid "Receive what is pushed into the repository" -msgstr "Registra els canvis al dipรฒsit" +msgstr "Rep el que s'envia al repositori" -#: command-list.h:149 -#, fuzzy +#: command-list.h:151 msgid "Manage reflog information" -msgstr "mostra la informaciรณ de resoluciรณ de desfet" +msgstr "Gestiona la informaciรณ del registre de referรจncies" -#: command-list.h:150 -#, fuzzy +#: command-list.h:152 msgid "Manage set of tracked repositories" -msgstr "Registra els canvis al dipรฒsit" +msgstr "Gestiona el conjunt de dipรฒsits seguits" -#: command-list.h:151 -#, fuzzy +#: command-list.h:153 msgid "Pack unpacked objects in a repository" -msgstr "--cached fora d'un dipรฒsit" +msgstr "Empaqueta els objectes desempaquetats en un dipรฒsit" -#: command-list.h:152 +#: command-list.h:154 #, fuzzy msgid "Create, list, delete refs to replace objects" -msgstr "" -"Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG" +msgstr "Crea una llista suprimeix les referรจncies per substituir els objectes" -#: command-list.h:153 +#: command-list.h:155 msgid "Generates a summary of pending changes" -msgstr "" +msgstr "Genera un resum dels canvis pendents" -#: command-list.h:154 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" -msgstr "" +msgstr "Reutilitza la resoluciรณ registrada dels conflictes de fusiรณ" -#: command-list.h:155 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "Restableix la HEAD actual a l'estat especificat" -#: command-list.h:156 +#: command-list.h:158 msgid "Restore working tree files" msgstr "Restaura els fitxers de l'arbre de treball" -#: command-list.h:157 +#: command-list.h:159 msgid "Revert some existing commits" msgstr "Reverteix comissions existents" -#: command-list.h:158 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "Mostra les comissions en ordre topolรฒgic invers" -#: command-list.h:159 +#: command-list.h:161 msgid "Pick out and massage parameters" -msgstr "Escolleix i personalitza els parร metres" +msgstr "Trieu i personalitzeu els parร metres" -#: command-list.h:160 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "Elimina fitxers de l'arbre de treball i de l'รญndex" -#: command-list.h:161 +#: command-list.h:163 msgid "Send a collection of patches as emails" -msgstr "Envia una colยทleciรณ de pedaรงos com a correus electrรฒnics" +msgstr "Envia una colยทlecciรณ de pedaรงos com a correus electrรฒnics" -#: command-list.h:162 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "Puja objectes sobre el protocol Git a un altre dipรฒsit" -#: command-list.h:163 +#: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" -msgstr "" +msgstr "Intรจrpret d'ordres d'entrada restringit nomรฉs per a accรฉs SSH al Git" -#: command-list.h:164 +#: command-list.h:166 msgid "Summarize 'git log' output" -msgstr "" +msgstr "Resumeix la sortida ยซgit logยป" -#: command-list.h:165 +#: command-list.h:167 msgid "Show various types of objects" msgstr "Mostra diversos tipus d'objectes" -#: command-list.h:166 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "Mostra les branques i les seves comissions" -#: command-list.h:167 +#: command-list.h:169 msgid "Show packed archive index" msgstr "Mostra l'รญndex d'arxius empaquetat" -#: command-list.h:168 +#: command-list.h:170 msgid "List references in a local repository" msgstr "Llista les referรจncies en un dipรฒsit local" -#: command-list.h:169 +#: command-list.h:171 msgid "Git's i18n setup code for shell scripts" msgstr "" +"Codi de configuraciรณ i18n del Git per als scripts de l'intรจrpret d'ordres" -#: command-list.h:170 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "Codi de scripts de configuraciรณ comuns pel Git shell" -#: command-list.h:171 +#: command-list.h:173 #, fuzzy -msgid "Stash the changes in a dirty working directory away" -msgstr "%s: ja existeix en el directori de treball" +msgid "Initialize and modify the sparse-checkout" +msgstr "Inicialitza i modifica la comprovaciรณ ยซsparseยป" -#: command-list.h:172 +#: command-list.h:174 #, fuzzy +msgid "Stash the changes in a dirty working directory away" +msgstr "Desa els canvis en un directori de treball brut" + +#: command-list.h:175 msgid "Add file contents to the staging area" -msgstr "Afegeix els continguts dels fitxers a l'รญndex" +msgstr "Afegeix el contingut del fitxer a l'ร rea de ยซstagingยป" -#: command-list.h:173 +#: command-list.h:176 msgid "Show the working tree status" msgstr "Mostra l'estat de l'arbre de treball" -#: command-list.h:174 +#: command-list.h:177 msgid "Remove unnecessary whitespace" -msgstr "Suprimeix l'espai en blanc innecessari" +msgstr "Elimina l'espai en blanc innecessari" -#: command-list.h:175 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "Inicialitza, actualitza o inspecciona submรฒduls" -#: command-list.h:176 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Operaciรณ bidireccional entre un dipรฒsit a Subversion i Git" -#: command-list.h:177 +#: command-list.h:180 msgid "Switch branches" msgstr "Commuta branques" -#: command-list.h:178 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "Llegeix, modifica i suprimeix referรจncies simbรฒliques" -#: command-list.h:179 +#: command-list.h:182 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:180 +#: command-list.h:183 msgid "Creates a temporary file with a blob's contents" msgstr "Crea un fitxer temporal amb els continguts dels blobs" -#: command-list.h:181 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "Desempaqueta objectes d'un arxiu empaquetat" -#: command-list.h:182 +#: command-list.h:185 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:183 +#: command-list.h:186 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" +"Actualitza el nom de l'objecte emmagatzemat en una referรจncia de forma segura" -#: command-list.h:184 +#: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" msgstr "" +"Actualitza el fitxer d'informaciรณ auxiliar per a ajudar als servidors ximples" -#: command-list.h:185 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "Envia l'arxiu de tornada al git-archive" -#: command-list.h:186 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "Envia els objectes empaquetats de tornada al git-fetch-pack" -#: command-list.h:187 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "Mostra una variable lรฒgica del Git" -#: command-list.h:188 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "Verifica la signatura GPG de les comissions" -#: command-list.h:189 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "Valida els fitxers d'arxius Git empaquetats" -#: command-list.h:190 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "Verifica la signatura GPG de les etiquetes" -#: command-list.h:191 +#: command-list.h:194 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:192 +#: command-list.h:195 msgid "Show logs with difference each commit introduces" msgstr "Mostra registres amb la diferรจncia introduรฏda per cada comissiรณ" -#: command-list.h:193 +#: command-list.h:196 msgid "Manage multiple working trees" msgstr "Gestiona mรบltiples arbres de treball" -#: command-list.h:194 +#: command-list.h:197 msgid "Create a tree object from the current index" msgstr "Crea un objecte arbre des de l'รญndex actual" -#: command-list.h:195 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "La definiciรณ d'atributs per camรญ" -#: command-list.h:196 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "Interfรญcie i convencions de la lรญnia d'ordres del Git" -#: command-list.h:197 +#: command-list.h:200 msgid "A Git core tutorial for developers" msgstr "Un tutorial bร sic del Git per a desenvolupadors" -#: command-list.h:198 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "Git per a usuaris del CVS" -#: command-list.h:199 -#, fuzzy +#: command-list.h:203 msgid "Tweaking diff output" -msgstr "omet la sortida de diferรจncies" +msgstr "Ajustament de la sortida de diferรจncies" -#: command-list.h:200 +#: command-list.h:204 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:201 +#: command-list.h:205 +msgid "Frequently asked questions about using Git" +msgstr "" + +#: command-list.h:206 msgid "A Git Glossary" msgstr "Un glossari de Git" -#: command-list.h:202 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "Lligams utilitzats pel Git" -#: command-list.h:203 +#: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "Especifica els fitxers intencionalment no seguits a ignorar" -#: command-list.h:204 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "La definiciรณ de les propietats de submรฒduls" -#: command-list.h:205 +#: command-list.h:210 msgid "Git namespaces" msgstr "Espais de noms del Git" -#: command-list.h:206 +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "" + +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Disposiciรณ del dipรฒsit del Git" -#: command-list.h:207 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "L'especificaciรณ de revisions i rangs per al Git" -#: command-list.h:208 +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "Muntant un dipรฒsit dins un altre" + +#: command-list.h:215 msgid "A tutorial introduction to Git: part two" msgstr "Un tutorial d'introducciรณ al Git: segona part" -#: command-list.h:209 +#: command-list.h:216 msgid "A tutorial introduction to Git" msgstr "Un tutorial d'introducciรณ al Git" -#: command-list.h:210 +#: command-list.h:217 msgid "An overview of recommended workflows with Git" msgstr "Una visiรณ de conjunt de fluxos de treball recomanats amb Git" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "Cal comenรงar per \"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 "Voleu que ho faci per vostรจ [Y/n]? " - -#: git-bisect.sh:101 +#: git-bisect.sh:79 #, sh-format msgid "Bad rev input: $arg" msgstr "Introducciรณ de revisiรณ errรฒnia: $arg" -#: git-bisect.sh:121 +#: git-bisect.sh:99 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Entrada de revisiรณ errรฒnia: $bisected_head" -#: git-bisect.sh:130 +#: git-bisect.sh:108 #, sh-format msgid "Bad rev input: $rev" msgstr "Introducciรณ de revisiรณ errรฒnia: $rev" -#: git-bisect.sh:139 +#: git-bisect.sh:117 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." -msgstr "'git bisect $TERM_BAD' pot acceptar nomรฉs un parร metre." +msgstr "ยซgit bisect $TERM_BADยป pot acceptar nomรฉs un argument." -#: git-bisect.sh:209 +#: git-bisect.sh:149 msgid "No logfile given" msgstr "Cap fitxer de registre donat" -#: git-bisect.sh:210 +#: git-bisect.sh:150 #, sh-format msgid "cannot read $file for replaying" msgstr "no es pot llegir $file per a reproducciรณ" -#: git-bisect.sh:232 +#: git-bisect.sh:173 msgid "?? what are you talking about?" msgstr "?? de quรจ parleu?" -#: git-bisect.sh:241 +#: git-bisect.sh:183 msgid "bisect run failed: no command provided." -msgstr "" +msgstr "ha fallat l'execuciรณ de bisect: no s'ha proporcionat cap ordre." -#: git-bisect.sh:246 +#: git-bisect.sh:188 #, sh-format msgid "running $command" msgstr "s'estร executant $command" -#: git-bisect.sh:253 +#: git-bisect.sh:195 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" "el pas de bisecciรณ ha fallat:\n" -"el codi de sortida $res de '$command' รฉs < 0 o >= 128" +"el codi de sortida $res de ยซ$commandยป รฉs < 0 o bรฉ >= 128" -#: git-bisect.sh:279 +#: git-bisect.sh:221 msgid "bisect run cannot continue any more" msgstr "el pas de bisecciรณ no pot continuar mรฉs" -#: git-bisect.sh:285 +#: git-bisect.sh:227 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" "el pas de bisecciรณ ha fallat:\n" -"'bisect_state $state' ha sortit amb el codi d'error $res" +"ยซbisect_state $stateยป ha sortit amb el codi d'error $res" -#: git-bisect.sh:292 +#: git-bisect.sh:234 msgid "bisect run success" msgstr "pas de bisecciรณ reeixit" -#: git-bisect.sh:300 +#: git-bisect.sh:242 msgid "We are not bisecting." msgstr "No estem bisecant." @@ -22127,142 +24746,49 @@ 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: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: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:323 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "" - -#: 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:535 -#, sh-format -msgid "unknown option: $opt" -msgstr "opciรณ desconeguda: $opt" - -#: git-legacy-stash.sh:555 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "S'han especificat massa revisions: $REV" - -#: 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:598 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "'$args' no รฉs una comissiรณ de tipus magatzem" - -#: 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:617 -msgid "unable to refresh index" -msgstr "no s'ha pogut actualitzar l'รญndex" - -#: 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:629 -msgid "Conflicts in index. Try without --index." -msgstr "Hi ha conflictes en l'รญndex. Proveu-ho sense --index." - -#: 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: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:665 -msgid "Cannot unstage modified files" -msgstr "No es pot fer ยซunstageยป dels fitxers modificats" - -#: git-legacy-stash.sh:703 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "${REV} ($s) descartada" - -#: 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:791 -msgid "(To restore them type \"git stash apply\")" -msgstr "(Per restaurar-les teclegeu \"git stash apply\")" - -#: git-submodule.sh:200 +#: git-submodule.sh:180 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:210 +#: git-submodule.sh:190 #, 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 ./|../" +msgstr "URL de dipรฒsit: ยซ$repoยป ha de ser absolut o comenรงar amb ./|../" -#: git-submodule.sh:229 +#: git-submodule.sh:209 #, sh-format msgid "'$sm_path' already exists in the index" -msgstr "'$sm_path' ja existeix en l'รญndex" +msgstr "ยซ$sm_pathยป ja existeix en l'รญndex" -#: git-submodule.sh:232 +#: git-submodule.sh:212 #, 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:239 -#, fuzzy, sh-format -msgid "'$sm_path' does not have a commit checked out" -msgstr "el camรญ ยซ%sยป no tรฉ la seva versiรณ" +msgstr "ยซ$sm_pathยป ja existeix en l'รญndex i no รฉs submรฒdul" -#: git-submodule.sh:245 +#: git-submodule.sh:219 #, 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 "" -"El camรญ segรผent s'ignora per un dels vostres fitxers .gitignore:\n" -"$sm_path\n" -"Useu -f si realment voleu afegir-lo." +msgid "'$sm_path' does not have a commit checked out" +msgstr "ยซ$sm_pathยป no tรฉ una comissiรณ agafada" -#: git-submodule.sh:268 +#: git-submodule.sh:250 #, 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" +msgstr "S'estร afegint el dipรฒsit existent a ยซ$sm_pathยป a l'รญndex" -#: git-submodule.sh:270 +#: git-submodule.sh:252 #, 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" +msgstr "ยซ$sm_pathยป ja existeix i no รฉs un dipรฒsit de git vร lid" -#: git-submodule.sh:278 +#: git-submodule.sh:260 #, 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:" +"S'ha trobat un directori de git per a ยซ$sm_nameยป localment amb els remots:" -#: git-submodule.sh:280 +#: git-submodule.sh:262 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22274,164 +24800,150 @@ msgid "" msgstr "" "Si voleu reusar aquest directori de git local en lloc de clonar de nou de\n" " $realrepo\n" -"useu l'opciรณ '--force'. Si el directori de git local no รฉs el dipรฒsit " +"useu l'opciรณ ยซ--forceยป. Si el directori de git local no รฉs el dipรฒsit " "correcte\n" -"o no esteu segur de quรจ vol dir aixรฒ, trieu un altre nom amb l'opciรณ '--" -"name'." +"o no esteu segur de quรจ vol dir aixรฒ, trieu un altre nom amb l'opciรณ ยซ--" +"nameยป." -#: git-submodule.sh:286 +#: git-submodule.sh:268 #, 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'." +"S'estร reactivant el directori de git local per al submรฒdul ยซ$sm_nameยป." -#: git-submodule.sh:298 +#: git-submodule.sh:280 #, sh-format msgid "Unable to checkout submodule '$sm_path'" -msgstr "No s'ha pogut agafar el submรฒdul '$sm_path'" +msgstr "No s'ha pogut agafar el submรฒdul ยซ$sm_pathยป" -#: git-submodule.sh:303 +#: git-submodule.sh:285 #, sh-format msgid "Failed to add submodule '$sm_path'" -msgstr "S'ha produรฏt un error en afegir el submรฒdul '$sm_path'" +msgstr "S'ha produรฏt un error en afegir el submรฒdul ยซ$sm_pathยป" -#: git-submodule.sh:312 +#: git-submodule.sh:294 #, sh-format msgid "Failed to register submodule '$sm_path'" -msgstr "S'ha produรฏt un error en registrar el submรฒdul '$sm_path'" +msgstr "S'ha produรฏt un error en registrar el submรฒdul ยซ$sm_pathยป" -#: git-submodule.sh:573 +#: git-submodule.sh:567 #, 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'" +"No s'ha pogut trobar la revisiรณ actual en el camรญ de submรฒdul ยซ$displaypathยป" -#: git-submodule.sh:583 +#: git-submodule.sh:577 #, 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'" +msgstr "No s'ha pogut obtenir en el camรญ de submรฒdul ยซ$sm_pathยป" -#: git-submodule.sh:588 +#: git-submodule.sh:582 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" "No s'ha pogut trobar la revisiรณ actual de ${remote_name}/${branch} en el " -"camรญ de submรฒdul '$sm_path'" +"camรญ de submรฒdul ยซ$sm_pathยป" -#: git-submodule.sh:606 -#, fuzzy, sh-format +#: git-submodule.sh:600 +#, 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'" +msgstr "" +"No s'ha pogut obtenir en el camรญ de submรฒdul ยซ$displaypathยป; s'estร " +"intentant obtenir directament $sha1:" -#: git-submodule.sh:612 +#: git-submodule.sh:606 #, 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:619 +#: git-submodule.sh:613 #, 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:620 +#: git-submodule.sh:614 #, 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:624 +#: git-submodule.sh:618 #, 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:625 +#: git-submodule.sh:619 #, 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:630 +#: git-submodule.sh:624 #, 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:631 +#: git-submodule.sh:625 #, 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:636 +#: git-submodule.sh:630 #, 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:637 +#: git-submodule.sh:631 #, 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:668 +#: git-submodule.sh:662 #, 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'" - -#: 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:882 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "mode inesperat $mod_dst" - -#: 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: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: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" +"S'ha produรฏt un error en recรณrrer recursivament dins del camรญ de submรฒdul " +"ยซ$displaypathยป" #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." -msgstr "Vegeu git-${cmd}(1) per detalls." +msgstr "Vegeu git-${cmd}(1) per a mรฉs informaciรณ." #: git-rebase--preserve-merges.sh:109 -#, fuzzy msgid "Applied autostash." -msgstr "S'ha aplicat el magatzem automร tic." +msgstr "S'ha aplicat l'ยซautostashยป." #: git-rebase--preserve-merges.sh:112 -#, fuzzy, sh-format +#, sh-format msgid "Cannot store $stash_sha1" msgstr "No es pot emmagatzemar $stash_sha1" +#: git-rebase--preserve-merges.sh:113 +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 "" +"L'aplicaciรณ del ยซstashยป automร tic ha resultat en conflictes.\n" +"Els vostres canvis estan segurs en el ยซstashยป.\n" +"Podeu executar ยซgit stash popยป o ยซgit stash dropยป en qualsevol moment.\n" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "S'estร fent ยซrebaseยป ($new_count/$total)" -#: git-rebase--preserve-merges.sh:207 -#, fuzzy +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -22453,19 +24965,28 @@ msgid "" msgstr "" "\n" "Ordres:\n" -" 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" -" d, drop = elimina la comissiรณ\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-la a la comissiรณ " +"prรจvia\n" +" f, fixup <comissiรณ> = com a ยซsquashยป, perรฒ descarta el missatge de registre " +"d'aquesta comissiรณ\n" +"x, exec <comissiรณ> = executa l'ordre (la resta de la lรญnia) usant " +"l'intรจrpret d'ordres\n" +"d, drop <comissiรณ> = elimina la comissiรณ\n" +"l, label <etiqueta> = etiqueta la HEAD actual amb un nom\n" +"t, reset <etiqueta> = reinicia HEAD a una etiqueta \n" +"m, merge [-C <comissiรณ> | -c <comissiรณ>] <etiqueta> [# <oneline>]\n" +". crea una comissiรณ de fusiรณ usant el missatge de la comissiรณ\n" +". de fusiรณ original (o lรญnia รบnica, si no hi ha cap comissiรณ de fusiรณ " +"original\n" +". especificada). Useu -c <comissiรณ> per a reescriure el missatge de " +"publicaciรณ.\n" "\n" "Es pot canviar l'ordre d'aquestes lรญnies; s'executen de dalt a baix.\n" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -22484,83 +25005,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" -msgstr "$sha1: no รฉs una comissiรณ que es pugui escollir" +msgstr "$sha1: no รฉs una comissiรณ que es pugui triar" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nom de comissiรณ no vร lid: $sha1" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "No es pot escriure el sha1 reemplaรงant de la comissiรณ actual" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "Avanรง rร pid a $sha1" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "No es pot avanรงar rร pidament a $sha1" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "No es pot moure HEAD a $first_parent" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "S'estร refusant fer ยซsquashยป a una fusiรณ: $sha1" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "Error en refer la fusiรณ $sha1" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" -msgstr "No s'ha pogut escollir $sha1" +msgstr "No s'ha pogut triar $sha1" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "Aquest รฉs el missatge de comissiรณ nรบm. ${n}:" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "El missatge de comissiรณ nรบm. ${n} s'ometrร :" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." -msgstr[0] "Aixรฒ รฉs una combinaciรณ de $count comissiรณ." +msgstr[0] "Aixรฒ รฉs una combinaciรณ d'$count comissiรณ." msgstr[1] "Aixรฒ รฉs una combinaciรณ de $count comissions." -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "No es pot escriure $fixup_msg" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "Aixรฒ รฉs una combinaciรณ de 2 comissions." -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "No s'ha pogut aplicar $sha1... $rest" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -22569,38 +25090,38 @@ msgid "" "before\n" "you are able to reword the commit." msgstr "" -"No s'ha pogut esmenar la comissiรณ desprรฉs d'escollir amb รจxit $sha1... " +"No s'ha pogut esmenar la comissiรณ desprรฉs de triar correctament $sha1... " "$rest\n" "Aixรฒ รฉs probablement a causa d'un missatge de comissiรณ buit, o el lligam de\n" "precomissiรณ ha fallat. Si el lligam de precomissiรณ ha fallat, pot ser que\n" "necessiteu resoldre el problema abans que pugueu canviar el missatge de\n" "comissiรณ." -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "S'ha aturat a $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" -msgstr "No es pot '$squash_style' sense una comissiรณ prรจvia" +msgstr "No es pot fer ยซ$squash_styleยป sense una comissiรณ prรจvia" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "S'estร executant: $rest" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "L'execuciรณ ha fallat: $rest" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "i ha fet canvis a l'รญndex o l'arbre de treball" -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -22611,7 +25132,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -22626,25 +25147,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Ordre desconeguda: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Corregiu-ho usant ยซgit rebase --edit-todoยป." -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "S'ha fet ยซrebaseยป i actualitzat $head_name amb รจxit." -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -22675,13 +25196,13 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "" "Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar " "la comissiรณ" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -22689,40 +25210,44 @@ msgstr "" "Teniu canvis no comesos en el vostre arbre de treball. \n" "Primer cometeu-los i desprรฉs executeu ยซgit rebase --continueยป de nou." -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "No s'han pogut cometre els canvis ยซstagedยป." -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "No s'ha pogut executar l'editor" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "No s'ha pogut agafar $switch_to" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "No hi ha cap HEAD?" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "No s'ha pogut crear el $state_dir temporal" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "No s'ha pogut marcar com a interactiu" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)" -msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)" +msgstr[0] "Fes ยซrebaseยป $shortrevisions sobre $shortonto ($todocount ordre)" +msgstr[1] "Fes ยซrebaseยป $shortrevisions sobre $shortonto ($todocount ordres)" + +#: git-rebase--preserve-merges.sh:945 +msgid "Note that empty commits are commented out" +msgstr "Tingueu en compte que les comissions buides estan comentades" -#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "No s'han pogut iniciar les comissions reescrites" @@ -22788,81 +25313,19 @@ 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:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: 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 +#: git-add--interactive.perl:634 #, 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: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 +#: git-add--interactive.perl:1058 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -22870,7 +25333,7 @@ msgstr "" "Si el pedaรง s'aplica correctament, el tros editat es marcarร immediatament\n" "per ยซstagingยป." -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1061 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -22878,7 +25341,7 @@ msgstr "" "Si el pedaรง s'aplica correctament, el tros editat es marcarร immediatament\n" "per ยซstashingยป." -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1064 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -22886,8 +25349,8 @@ msgstr "" "Si el pedaรง s'aplica correctament, el tros editat es marcarร immediatament\n" "per ยซunstagingยป." -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -22895,8 +25358,8 @@ msgstr "" "Si el pedaรง s'aplica correctament, el tros editat es marcarร immediatament\n" "per aplicar-se." -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -22904,17 +25367,12 @@ msgstr "" "Si el pedaรง s'aplica correctament, el tros editat es marcarร immediatament\n" "per descartar-se." -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1116 #, 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: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 +#: git-add--interactive.perl:1123 #, perl-format msgid "" "---\n" @@ -22923,41 +25381,16 @@ msgid "" "Lines starting with %s will be removed.\n" msgstr "" "---\n" -"Per suprimir ยซ%sยป lรญnies, feu-les lรญnies ' ' (context).\n" -"Per suprimir ยซ%sยป lรญnies, suprimiu-les.\n" -"Les lรญnies que comencin per %s seran suprimides.\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 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" +"Per a eliminar les lรญnies ยซ%sยป, convertiu-les en lรญnies ' ' (context).\n" +"Per a eliminar les lรญnies ยซ%sยป, suprimiu-les.\n" +"Les lรญnies que comencin per %s s'eliminaran.\n" -#: git-add--interactive.perl:1138 +#: git-add--interactive.perl:1145 #, 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" -#. 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 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -22971,7 +25404,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:1252 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -22985,7 +25418,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:1258 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -22999,7 +25432,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:1264 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -23013,7 +25446,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:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -23027,7 +25460,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:1276 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23041,7 +25474,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:1282 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23055,8 +25488,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:1294 -#, fuzzy +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23064,13 +25496,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'รญndex i l'arbre de treball\n" -"n - no apliquis aquest tros des de l'รญndex i de l'arbre de treball\n" +"y - aplica aquest tros a l'arbre de treball\n" +"n - no apliquis aquest tros a 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:1309 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23092,232 +25524,90 @@ msgstr "" "e - edita manualment el tros actual\n" "? - mostra l'ajuda\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1347 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:1341 -msgid "Apply them to the worktree anyway? " -msgstr "Voleu aplicar-los igualment a l'arbre de treball? " - -#: git-add--interactive.perl:1344 -msgid "Nothing was applied.\n" -msgstr "No s'ha aplicat res.\n" - -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "s'estร ignorant %s no fusionat\n" -#: 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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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:1453 +#: git-add--interactive.perl:1481 #, 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: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: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: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:1466 -#, fuzzy, perl-format msgid "Apply mode change to 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,?]? " +msgstr "Aplica el canvi de mode a l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1467 -#, fuzzy, perl-format +#: git-add--interactive.perl:1482 +#, perl-format msgid "Apply deletion to 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,?]? " +msgstr "Aplica la supressiรณ a l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1483 #, fuzzy, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Aplica la supressiรณ a l'arbre de treball [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1484 +#, perl-format msgid "Apply this hunk to 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,?]? " +msgstr "Aplica aquest tros a l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "No hi ha altres trossos on anar-hi\n" -#: 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 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Nรบmero no vร lid: ยซ%sยป\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1624 #, 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:1617 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "No hi ha cap altre tros a cercar\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "Cerca per expressiรณ regular? " - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Expressiรณ regular de cerca mal formada %s: %s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "No hi ha trossos que coincideixin amb el patrรณ donat\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "Sense tros previ\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "No hi ha tros segรผent\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "No es pot dividir aquest tros\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1738 #, 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:1706 +#: git-add--interactive.perl:1748 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:1771 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23336,19 +25626,19 @@ msgstr "" "add untracked - afegeix el contingut dels fitxers no seguits al conjunt de " "canvis ยซstagedยป\n" -#: 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 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 msgid "missing --" msgstr "manca --" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1861 #, perl-format msgid "unknown --patch mode: %s" msgstr "desconegut --patch mode: %s" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument %s no vร lid, s'esperava --" @@ -23365,62 +25655,72 @@ msgstr "el desplaรงament de la zona local รฉs mรฉs gran o igual a 24 hores\n" msgid "the editor exited uncleanly, aborting everything" msgstr "l'editor no ha sortit correctament, avortant-ho tot" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "ยซ%sยป contรฉ una versiรณ intermรจdia del correu que estร veu redactant.\n" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" -msgstr "'%s.final' contรฉ el correu redactat.\n" +msgstr "ยซ%s.finalยป contรฉ el correu redactat.\n" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases รฉs incompatible amb altres opcions\n" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "No es pot executar git format-patch des de fora del dipรฒsit\n" -#: git-send-email.perl:484 +#: git-send-email.perl:492 +#, fuzzy msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "" +"`batch-size` i `relogin` s'han d'especificar junts (a travรฉs de la lรญnia " +"d'ordres o l'opciรณ de configuraciรณ)" -#: git-send-email.perl:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Camp --suppress-cc desconegut: ยซ%sยป\n" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" -msgstr "--confirm setting desconegut: ยซ%sยป\n" +msgstr "Parร metre --confirm desconegut: ยซ%sยป\n" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" -msgstr "avรญs: el sobrenom de sendmail amb cometes no estร suportat: %s\n" +msgstr "avรญs: no s'admet l'ร lies de sendmail amb cometes: %s\n" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" -msgstr "avรญs: `:include:` no estร suportat: %s\n" +msgstr "avรญs: ยซ:include:ยป no s'admet: %s\n" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" -msgstr "avรญs: les redireccions `/file` or `|pipe no sรณn admeses: %s\n" +msgstr "avรญs: les redireccions ยซ/fileยป ni ยซ|pipeยป no s'admeten: %s\n" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "avรญs: no es pot reconรจixer la lรญnia sendmail: %s\n" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -23429,18 +25729,18 @@ msgid "" " * Saying \"./%s\" if you mean a file; or\n" " * Giving --format-patch option if you mean a range.\n" msgstr "" -"El fitxer ยซ%sยป existeix perรฒ tambรฉ pot ser un rang de comissions\n" -"per produir pedaรงos. Desambigรผeu...\n" +"El fitxer ยซ%sยป existeix, perรฒ tambรฉ pot ser un rang de comissions\n" +"per produir pedaรงos. Desambigรผeu-ho...\n" "\n" -" * Dient \"./%s\" si volรญeu especificar aquest fitxer; o\n" -" * Proporcionant l'opciรณ --format-patch si volรญeu especificar un rang.\n" +" * Dient ยซ./%sยป si volรญeu especificar un fitxer; o\n" +" * Proporcionant l'opciรณ ยซ--format-patchยป si volรญeu especificar un rang.\n" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "S'ha produรฏt un error en obrir el directori %s: %s" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -23449,7 +25749,7 @@ msgstr "" "fatal: %s: %s\n" "avรญs: no s'han enviat pedaรงos\n" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -23459,17 +25759,17 @@ msgstr "" "No s'han especificat fitxers de pedaรง\n" "\n" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "Sense assumpte a %s?" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "S'ha produรฏt un error en obrir per escriptura %s: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -23477,33 +25777,33 @@ msgid "" "\n" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -"Se suprimiran les lรญnies que comencen amb \"GIT:\".\n" +"S'eliminaran les lรญnies que comencen amb ยซGIT:ยป.\n" "Considereu incloure un diffstat global o una taula de continguts\n" -"per cada pedaรง que esteu escrivint.\n" +"per al pedaรง que esteu escrivint.\n" "\n" -"Netegeu el contingut del cos si no voleu enviar un resum.\n" +"Esborreu el contingut del cos si no voleu enviar cap resum.\n" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "S'ha produรฏt un error en obrir %s: %s" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "S'ha produรฏt un error en obrir %s.final: %s" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "El correu electrรฒnic de resum estร buit, s'omet\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Esteu segur que voleu usar <%s> [y/N]? " -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -23511,11 +25811,11 @@ msgstr "" "Els fitxers segรผents sรณn 8bit, perรฒ no declaren un Content-Transfer-" "Encoding.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Quina codificaciรณ de 8 bits hauria de declarar [UTF-8]? " -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -23525,26 +25825,26 @@ msgid "" msgstr "" "S'ha refusat a enviar perquรจ el pedaรง\n" "\t%s\n" -"perquรจ la plantilla tรฉ l'assumpte '*** SUBJECT HERE ***'. Passeu --force si " -"realment voleu enviar-lo.\n" +"perquรจ la plantilla tรฉ l'assumpte ยซ*** SUBJECT HERE ***ยป. Passeu --force si " +"realment voleu enviar-ho.\n" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "" "A qui s'haurien d'enviar els correus electrรฒnics (si s'han d'enviar a algรบ)?" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: l'ร lies ยซ%sยป s'expandeix a si mateix\n" -#: git-send-email.perl:975 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha " "cap)? " -#: git-send-email.perl:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "error: no s'ha pogut extreure una adreรงa vร lida de: %s\n" @@ -23552,16 +25852,16 @@ msgstr "error: no s'ha pogut extreure una adreรงa vร lida de: %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 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Quรจ cal fer amb aquesta adreรงa? ([q]surt|[d]escarta|[e]dita): " -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "el camรญ CA ยซ%sยป no existeix" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -23580,290 +25880,234 @@ msgstr "" " Aquest comportament estร controlat pel parร metre de configuraciรณ\n" " sendemail.confirm.\n" "\n" -" Per a informaciรณ addicional, executeu 'git send-email --help'.\n" +" Per a informaciรณ addicional, executeu ยซgit send-email --helpยป.\n" " Per mantenir el comportament actual, perรฒ silenciar aquest\n" -" missatge, executeu 'git config --global sendemail.confirm auto'.\n" +" missatge, executeu ยซgit config --global 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 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" "Voleu enviar aquest correu electrรฒnic? ([y]sรญ|[n]o|[e]dita|[q]surt|[a]tot): " -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "Requereix resposta en enviar el correu" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "El servidor SMTP requerit no estร correctament definit." -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "El servidor no admet STARTTLS! %s" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS ha fallat! %s" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuraciรณ i " "useu --smtp-debug." -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "S'ha produรฏt un error en enviar %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "Simulaciรณ d'enviament %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "Enviat %s\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "Simulaciรณ de correcte. El registre diu:\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "Correcte. El registre diu: \n" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "Resultat: correcte\n" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "no es pot obrir el fitxer %s" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) S'estร afegint cc: %s des de la lรญnia ยซ%sยป\n" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) S'estร afegint a: %s des de la lรญnia ยซ%sยป\n" -#: git-send-email.perl:1718 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(no mbox) S'estร afegint cc: %s des de la lรญnia ยซ%sยป\n" -#: git-send-email.perl:1753 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(cos) S'estร afegint cc: %s des de la lรญnia ยซ%sยป\n" -#: git-send-email.perl:1864 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no s'ha pogut executar ยซ%sยป" -#: git-send-email.perl:1871 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) S'estร afegint %s: %s des de: ยซ%sยป\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) s'ha produรฏt un error en tancar el conducte ยซ%sยป" -#: git-send-email.perl:1905 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "no es pot enviar el missatge en 7 bits" -#: git-send-email.perl:1913 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "codificaciรณ de transferรจncia no vร lida" -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "no s'ha pogut obrir %s: %s\n" -#: git-send-email.perl:1957 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: el pedaรง contรฉ una lรญnia mรฉs gran de 998 carร cters" -#: git-send-email.perl:1974 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "S'estร ometent %s amb el sufix de cรฒpia de seguretat ยซ%sยป.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1978 +#: git-send-email.perl:1990 #, 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 "" +#~ "commit-graph chunk lookup table entry missing; file may be incomplete" +#~ msgstr "" +#~ "manca l'entrada de la taula de cerca del graf de comissions; el fitxer " +#~ "pot ser incomplet" -#~ msgid "(HEAD detached at %s)" -#~ msgstr "(HEAD separat a %s)" +#~ 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" -#~ msgid "(HEAD detached from %s)" -#~ msgstr "(HEAD separat de %s)" +#~ msgid "invalid commit object id: %s" +#~ msgstr "identificador d'objecte de comissiรณ no vร lid: %s" -#~ msgid "could not transform the todo list" -#~ msgstr "no s'ha pogut transformar la llista per a fer" +#~ msgid "hash version %u does not match" +#~ msgstr "la versiรณ del hash version %u no coincideix" -#~ msgid "Checking out files" -#~ msgstr "S'estan agafant fitxers" +#~ msgid "Remote with no URL" +#~ msgstr "Remot sense URL" -#~ 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 "%%(subject) does not take arguments" +#~ msgstr "%%(subject) no accepta arguments" -#~ msgid "failed to stat %s\n" -#~ msgstr "s'ha produรฏt un error en fer stat a '%s'\n" +#~ msgid "positive value expected objectname:short=%s" +#~ msgstr "valor positiu esperat nom d'objecte:curt=%s" -#~ 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 "unrecognized %%(objectname) argument: %s" +#~ msgstr "argument %%(objectname) no reconegut: %s" -#~ msgid "default" -#~ msgstr "per defecte" +#~ msgid "option `%s' is incompatible with --merged" +#~ msgstr "l'opciรณ ยซ%sยป รฉs incompatible amb --merged" -#~ msgid "Could not create directory '%s'" -#~ msgstr "No s'ha pogut crear el directori ยซ%sยป" +#~ msgid "option `%s' is incompatible with --no-merged" +#~ msgstr "l'opciรณ ยซ%sยป รฉs incompatible amb --no-merged" -#~ msgid "unrecognized verb: %s" -#~ msgstr "parร metre no reconegut: %s" +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "no s'ha pogut obrir ยซ%sยป per a escriptura: %s" -#~ msgid "could not open %s" -#~ msgstr "no s'ha pogut obrir ยซ%sยป" +#~ msgid "could not read ref '%s'" +#~ msgstr "no s'ha pogut llegir la referรจncia ยซ%sยป" -#~ msgid "Could not move back to $head_name" -#~ msgstr "No s'ha pogut tornar a $head_name" +#~ msgid "ref '%s' already exists" +#~ msgstr "la referรจncia ยซ%sยป ja existeix" -#~ 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 "unexpected object ID when writing '%s'" +#~ msgstr "ID d'objecte no esperat en escriure ยซ%sยป" -#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'" -#~ msgstr "fatal: no es pot combinar ยซ--signoffยป amb ยซ--preserve-mergesยป" +#~ msgid "unexpected object ID when deleting '%s'" +#~ msgstr "ID d'objecte no esperat en suprimir ยซ%sยป" -#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'" -#~ msgstr "fatal: no es pot combinar ยซ--preserve-mergesยป amb ยซ--rebase-mergesยป" +#~ msgid "could not open the file BISECT_TERMS" +#~ msgstr "no s'ha pogut obrir el BISECT_TERMS" -#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'" -#~ msgstr "fatal: no es pot combinar ยซ--rebase-mergesยป amb ยซ--strategy-optionยป" +#~ msgid "update BISECT_HEAD instead of checking out the current commit" +#~ msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissiรณ actual" -#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'" -#~ msgstr "fatal: no es pot combinar ยซ--rebase-mergesยป amb ยซ--strategyยป" +#~ msgid "print only names (no SHA-1)" +#~ msgstr "imprimeix nomรฉs els noms (sense SHA-1)" #, 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 "passed to 'git am'" +#~ msgstr "passa-ho a ยซgit amยป" -#~ msgid "$onto_name: there is no merge base" -#~ msgstr "$onto_name: no hi ha cap base de fusiรณ" +#~ msgid "Removing worktrees/%s: not a valid directory" +#~ msgstr "Eliminaciรณ de worktrees/%s: no รฉs un directori vร lid" -#~ 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 "Removing worktrees/%s: unable to read gitdir file (%s)" +#~ msgstr "" +#~ "Eliminaciรณ de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)" -#~ msgid "Created autostash: $stash_abbrev" -#~ msgstr "S'ha creat un magatzem automร tic: $stash_abbrev" +#~ msgid "Removing worktrees/%s: invalid gitdir file" +#~ msgstr "Eliminaciรณ de worktrees/%s: fitxer gitdir no vร lid" -#~ msgid "Current branch $branch_name is up to date." -#~ msgstr "La branca actual $branch_name estร al dia." +#~ msgid "unable to re-add worktree '%s'" +#~ msgstr "no s'ha pogut tornar a afegir a l'arbre de treball ยซ%sยป" -#~ msgid "Current branch $branch_name is up to date, rebase forced." -#~ msgstr "La branca actual $branch_name estร al dia; ยซrebaseยป forรงat." +#~ msgid "target '%s' already exists" +#~ msgstr "el destรญ ยซ%sยป ja existeix" -#~ msgid "Changes to $onto:" -#~ msgstr "Canvis a $onto:" +#~ msgid "The --cached option cannot be used with the --files option" +#~ msgstr "L'opciรณ --cached no es pot usar amb l'opciรณ --files" -#~ msgid "Changes from $mb to $onto:" -#~ msgstr "Canvis de $mb a $onto:" +#~ msgid " Warn: $display_name doesn't contain commit $sha1_src" +#~ msgstr " Avรญs: $display_name no contรฉ la comissiรณ $sha1_src" -#~ msgid "Fast-forwarded $branch_name to $onto_name." -#~ msgstr "S'ha avanรงat $branch_name rร pidament a $onto_name." +#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst" +#~ msgstr " Avรญs: $display_name no contรฉ la comissiรณ $sha1_dst" -#~ 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..." +#~ 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" diff --git a/third_party/git/po/de.po b/third_party/git/po/de.po index 6d80cfb158..17f93326cf 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. +# Matthias Rรผster <matthias.ruester@gmail.com>, 2019-2020. # 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: 2019-08-10 20:12+0800\n" -"PO-Revision-Date: 2016-11-28 18:10+0100\n" +"POT-Creation-Date: 2020-10-10 09:32+0800\n" +"PO-Revision-Date: 2020-10-15 19:16+0200\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,43 +18,794 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: advice.c:109 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "Wie bitte (%s)?" + +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +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 reset.c:89 sequencer.c:3444 +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:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, 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:1738 git-add--interactive.perl:1371 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Nur Binรคrdateien geรคndert.\n" + +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "Keine รnderungen.\n" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "Patch Aktualisierung" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +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:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "*** Befehle ***" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +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:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: 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:781 git-add--interactive.perl:1805 +#, c-format +msgid "Bye.\n" +msgstr "Tschรผss.\n" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, 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:35 git-add--interactive.perl:1434 +#, 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:36 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "Ergรคnzung der Staging-Area hinzufรผgen [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, 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:39 +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:42 +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:56 git-add--interactive.perl:1439 +#, 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:57 git-add--interactive.perl:1440 +#, 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:58 git-add--interactive.perl:1441 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "Ergรคnzung stashen [y,n,q,a,d%s,?]? " + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, 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:61 +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:64 +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:80 git-add--interactive.perl:1445 +#, 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:81 git-add--interactive.perl:1446 +#, 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:82 git-add--interactive.perl:1447 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "Ergรคnzung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, 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:85 +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:88 +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:103 git-add--interactive.perl:1451 +#, 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:104 git-add--interactive.perl:1452 +#, 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:105 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "Ergรคnzung auf Index anwenden [y,n,q,a,d%s,?]? " + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, 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:108 add-patch.c:176 add-patch.c:221 +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:111 +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:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, 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:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, 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:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "Ergรคnzung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, 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:131 add-patch.c:154 add-patch.c:199 +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:134 add-patch.c:202 +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:149 add-patch.c:194 git-add--interactive.perl:1463 +#, 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:150 add-patch.c:195 git-add--interactive.perl:1464 +#, 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:151 add-patch.c:196 git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Ergรคnzung im Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, 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:157 +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:171 add-patch.c:216 git-add--interactive.perl:1469 +#, 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:172 add-patch.c:217 git-add--interactive.perl:1470 +#, 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:173 add-patch.c:218 git-add--interactive.perl:1471 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Ergรคnzung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, 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:179 +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:224 +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:342 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "Konnte Block-Header '%.*s' nicht parsen." + +#: add-patch.c:361 add-patch.c:365 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "Konnte farbigen Block-Header '%.*s' nicht parsen." + +#: add-patch.c:419 +msgid "could not parse diff" +msgstr "Konnte Differenz nicht parsen." + +#: add-patch.c:438 +msgid "could not parse colored diff" +msgstr "Konnte farbige Differenz nicht parsen." + +#: add-patch.c:452 +#, c-format +msgid "failed to run '%s'" +msgstr "'%s' konnte nicht ausgefรผhrt werden" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "nicht รผbereinstimmende Ausgabe von interactive.diffFilter" + +#: add-patch.c:612 +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:785 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"Erwartete Kontextzeile #%d in\n" +"%.*s" + +#: add-patch.c:800 +#, 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:1076 git-add--interactive.perl:1117 +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:1080 +#, 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:1094 git-add--interactive.perl:1131 +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:1127 +msgid "could not parse hunk header" +msgstr "Konnte Block-Header nicht parsen." + +#: add-patch.c:1172 +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:1241 git-add--interactive.perl:1244 +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:1284 +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:1285 git-add--interactive.perl:1348 +msgid "Apply them to the worktree anyway? " +msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? " + +#: add-patch.c:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "Nichts angewendet.\n" + +#: add-patch.c:1349 +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:1511 add-patch.c:1521 +msgid "No previous hunk" +msgstr "Kein vorheriger Patch-Block" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No next hunk" +msgstr "Kein folgender Patch-Block" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "Keine anderen Patch-Blรถcke verbleibend" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "zu welchem Patch-Block springen (<Enter> fรผr mehr Informationen)? " + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "zu welchem Patch-Block springen? " + +#: add-patch.c:1555 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Ungรผltige Nummer: '%s'" + +#: add-patch.c:1560 +#, 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:1569 +msgid "No other hunks to search" +msgstr "Keine anderen Patch-Blรถcke zum Durchsuchen" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "Suche nach regulรคrem Ausdruck? " + +#: add-patch.c:1590 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Fehlerhafter regulรคrer Ausdruck fรผr Suche %s: %s" + +#: add-patch.c:1607 +msgid "No hunk matches the given pattern" +msgstr "Kein Patch-Block entspricht dem angegebenen Muster" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen" + +#: add-patch.c:1618 +#, c-format +msgid "Split into %d hunks." +msgstr "In %d Patch-Block aufgeteilt." + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten" + +#: add-patch.c:1674 +msgid "'git apply' failed" +msgstr "'git apply' schlug fehl" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" +"\n" +"Deaktivieren Sie diese Nachricht mit \"git config advice.%s false\"" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sHinweis: %.*s%s\n" -#: advice.c:162 +#: advice.c:247 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:164 +#: advice.c:249 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:166 +#: advice.c:251 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:168 +#: advice.c:253 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:170 +#: advice.c:255 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:172 +#: advice.c:257 #, 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:180 +#: advice.c:265 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." @@ -63,23 +814,23 @@ msgstr "" "dann 'git add/rm <Datei>', um die Auflรถsung entsprechend zu markieren\n" "und zu committen." -#: advice.c:188 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "Beende wegen unaufgelรถstem Konflikt." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:278 builtin/merge.c:1349 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "Bitte committen Sie Ihre รnderungen, bevor Sie mergen." -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "Beende wegen nicht abgeschlossenem Merge." -#: advice.c:202 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -212,17 +963,7 @@ msgstr "Ungรผltiger Modus in Zeile %d: %s" msgid "inconsistent header lines %d and %d" msgstr "Inkonsistente Kopfzeilen %d und %d." -#: 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 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -237,72 +978,82 @@ msgstr[1] "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" -#: apply.c:1564 +#: apply.c:1385 #, 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:1752 +#: 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 msgid "new file depends on old contents" msgstr "neue Datei hรคngt von alten Inhalten ab" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hรคngt von alten Inhalten ab" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "fehlerhafter Binรคr-Patch bei Zeile %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binรคr-Patch bei Zeile %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolische Verknรผpfung %s nicht lesen" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht รถffnen oder lesen" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungรผltiger Zeilenanfang: '%c'" -#: apply.c:3046 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -310,12 +1061,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:3058 +#: apply.c:3069 #, 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:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -324,25 +1075,25 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: apply.c:3086 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binรคr-Patch fรผr '%s'" -#: apply.c:3094 +#: apply.c:3105 #, 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:3141 +#: apply.c:3152 #, 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:3151 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -350,444 +1101,474 @@ msgstr "" "der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n" "entspricht" -#: apply.c:3159 +#: apply.c:3171 #, 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:3177 +#: apply.c:3189 #, 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:3190 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binรคr-Patch nicht auf '%s' anwenden" -#: apply.c:3196 +#: apply.c:3209 #, 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:3217 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: apply.c:3340 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 #, c-format msgid "failed to read %s" msgstr "Fehler beim Lesen von %s" -#: apply.c:3400 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "'%s' ist hinter einer symbolischen Verknรผpfung" -#: apply.c:3429 apply.c:3672 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelรถscht" -#: apply.c:3515 apply.c:3687 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht im Index" -#: apply.c:3524 apply.c:3695 +#: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Version im Index" -#: apply.c:3559 +#: apply.c:3572 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:3562 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Falle zurรผck auf 3-Wege-Merge ...\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kann aktuelle Inhalte von '%s' nicht lesen" -#: apply.c:3594 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Fehler beim Zurรผckfallen auf 3-Wege-Merge...\n" -#: apply.c:3608 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch auf '%s' mit Konflikten angewendet.\n" -#: apply.c:3613 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch auf '%s' sauber angewendet.\n" -#: apply.c:3639 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "Lรถsch-Patch hinterlรคsst Dateiinhalte" -#: apply.c:3712 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: apply.c:3714 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "Ungรผltiger Pfad '%s'" -#: apply.c:3923 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: apply.c:3926 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: apply.c:3946 +#: apply.c:3976 #, 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:3951 +#: apply.c:3981 #, 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:3971 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknรผpfung" -#: apply.c:3975 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: apply.c:3990 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "Prรผfe Patch %s ..." -#: apply.c:4082 +#: apply.c:4112 #, 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:4089 +#: apply.c:4119 #, 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:4092 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)." -#: 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 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "konnte %s nicht zum temporรคren Index hinzufรผgen" -#: apply.c:4111 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "konnte temporรคren Index nicht nach %s schreiben" -#: apply.c:4249 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus dem Index entfernen" -#: apply.c:4283 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "fehlerhafter Patch fรผr Submodul %s" -#: apply.c:4289 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: apply.c:4297 +#: apply.c:4327 #, 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:4303 apply.c:4448 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "kann fรผr %s keinen Eintrag in den Zwischenspeicher hinzufรผgen" -#: apply.c:4346 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "Fehler beim Schreiben nach '%s'" -#: apply.c:4350 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "schlieรe Datei '%s'" -#: apply.c:4420 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: apply.c:4518 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: apply.c:4526 +#: apply.c:4556 msgid "internal error" msgstr "interner Fehler" -#: apply.c:4529 +#: apply.c:4559 #, 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:4540 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkรผrze Name von .rej Datei zu %.*s.rej" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "kann '%s' nicht รถffnen" -#: apply.c:4562 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: apply.c:4566 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Block #%d zurรผckgewiesen." -#: apply.c:4676 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ausgelassen." -#: apply.c:4684 +#: apply.c:4723 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: apply.c:4704 +#: apply.c:4743 msgid "unable to read index file" msgstr "Konnte Index-Datei nicht lesen" -#: apply.c:4859 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "kann Patch '%s' nicht รถffnen: %s" -#: apply.c:4886 +#: apply.c:4927 #, 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:4892 apply.c:4907 +#: apply.c:4933 apply.c:4948 #, 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:4900 +#: apply.c:4941 #, 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:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: 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 +#: apply.c:4985 msgid "don't apply changes matching the given path" msgstr "keine รnderungen im angegebenen Pfad anwenden" -#: apply.c:4947 +#: apply.c:4988 msgid "apply changes matching the given path" msgstr "รnderungen nur im angegebenen Pfad anwenden" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "Anzahl" -#: apply.c:4950 +#: apply.c:4991 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "<Anzahl> vorangestellte Schrรคgstriche von herkรถmmlichen Differenzpfaden " "entfernen" -#: apply.c:4953 +#: apply.c:4994 msgid "ignore additions made by the patch" msgstr "hinzugefรผgte Zeilen des Patches ignorieren" -#: apply.c:4955 +#: apply.c:4996 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:4959 +#: apply.c:5000 msgid "show number of added and deleted lines in decimal notation" msgstr "" "die Anzahl von hinzugefรผgten/entfernten Zeilen in Dezimalnotation anzeigen" -#: apply.c:4961 +#: apply.c:5002 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:4963 +#: apply.c:5004 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:4965 +#: apply.c:5006 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:4967 +#: apply.c:5008 msgid "mark new files with `git add --intent-to-add`" msgstr "neue Dateien mit `git add --intent-to-add` markieren" -#: apply.c:4969 +#: apply.c:5010 msgid "apply a patch without touching the working tree" msgstr "Patch anwenden, ohne รnderungen im Arbeitsverzeichnis vorzunehmen" -#: apply.c:4971 +#: apply.c:5012 msgid "accept a patch that touches outside the working area" msgstr "" "Patch anwenden, der รnderungen auรerhalb des Arbeitsverzeichnisses vornimmt" -#: apply.c:4974 +#: apply.c:5015 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)" -#: apply.c:4976 +#: apply.c:5017 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:4978 +#: apply.c:5019 msgid "build a temporary index based on embedded index information" msgstr "" "einen temporรคren Index, basierend auf den integrierten Index-Informationen, " "erstellen" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: apply.c:4983 +#: apply.c:5024 msgid "ensure at least <n> lines of context match" msgstr "" "sicher stellen, dass mindestens <n> Zeilen des Kontextes รผbereinstimmen" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "Aktion" -#: apply.c:4985 +#: apply.c:5026 msgid "detect new or modified lines that have whitespace errors" msgstr "neue oder geรคnderte Zeilen, die Whitespace-Fehler haben, ermitteln" -#: apply.c:4988 apply.c:4991 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" msgstr "รnderungen im Whitespace bei der Suche des Kontextes ignorieren" -#: apply.c:4994 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "den Patch in umgekehrter Reihenfolge anwenden" -#: apply.c:4996 +#: apply.c:5037 msgid "don't expect at least one line of context" msgstr "keinen Kontext erwarten" -#: apply.c:4998 +#: apply.c:5039 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "zurรผckgewiesene Patch-Blรถcke in entsprechenden *.rej Dateien hinterlassen" -#: apply.c:5000 +#: apply.c:5041 msgid "allow overlapping hunks" msgstr "sich รผberlappende Patch-Blรถcke erlauben" -#: 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 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "erweiterte Ausgaben" -#: apply.c:5003 +#: apply.c:5044 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren" -#: apply.c:5006 +#: apply.c:5047 msgid "do not trust the line counts in the hunk headers" msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "Wurzelverzeichnis" -#: apply.c:5009 +#: apply.c:5050 msgid "prepend <root> to all filenames" msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen" +#: archive-tar.c:125 archive-zip.c:345 +#, c-format +msgid "cannot stream blob %s" +msgstr "Kann Blob %s nicht streamen." + +#: archive-tar.c:265 archive-zip.c:358 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "Nicht unterstรผtzter Dateimodus: 0%o (SHA1: %s)" + +#: archive-tar.c:449 +#, c-format +msgid "unable to start '%s' filter" +msgstr "Konnte '%s' Filter nicht starten." + +#: archive-tar.c:452 +msgid "unable to redirect descriptor" +msgstr "Konnte Descriptor nicht umleiten." + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "'%s' Filter meldete Fehler." + +#: archive-zip.c:318 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "Pfad ist kein gรผltiges UTF-8: %s" + +#: archive-zip.c:322 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s" + +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "Fehler beim Komprimieren (%d)" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "Timestamp zu groร fรผr dieses System: %<PRIuMAX>" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]" @@ -807,182 +1588,165 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <Repository> [--exec <Programm>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "Kann %s nicht lesen." + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "Konnte '%s' nicht lesen" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien รผberein" -#: archive.c:396 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "Keine solche Referenz: %.*s" -#: archive.c:401 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "Kein gรผltiger Objektname: %s" -#: archive.c:414 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "Kein Tree-Objekt: %s" -#: archive.c:426 +#: archive.c:485 msgid "current working directory is untracked" msgstr "Aktuelles Arbeitsverzeichnis ist unversioniert." -#: archive.c:457 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "Datei nicht gefunden: %s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "Keine regulรคre Datei: %s" + +#: archive.c:553 msgid "fmt" msgstr "Format" -#: archive.c:457 +#: archive.c:553 msgid "archive format" msgstr "Archivformat" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "Prรคfix" -#: archive.c:459 +#: archive.c:555 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: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 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "Datei" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "unversionierte Datei zum Archiv hinzufรผgen" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "das Archiv in diese Datei schreiben" -#: archive.c:463 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen" -#: archive.c:464 +#: archive.c:563 msgid "report archived files on stderr" msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben" -#: archive.c:465 +#: archive.c:564 msgid "store only" msgstr "nur speichern" -#: archive.c:466 +#: archive.c:565 msgid "compress faster" msgstr "schneller komprimieren" -#: archive.c:474 +#: archive.c:573 msgid "compress better" msgstr "besser komprimieren" -#: archive.c:477 +#: archive.c:576 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:1379 builtin/submodule--helper.c:1859 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "Repository" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:579 builtin/archive.c:92 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:707 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "Programm" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "Pfad zum externen \"git-upload-archive\"-Programm" -#: archive.c:489 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "Unerwartete Option --remote" -#: archive.c:491 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden." -#: archive.c:493 +#: archive.c:592 msgid "Unexpected option --output" msgstr "Unerwartete Option --output" -#: archive.c:515 +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" +msgstr "" +"Die Optionen --add-file und --remote kรถnnen nicht gemeinsam verwendet werden." + +#: archive.c:616 #, c-format msgid "Unknown archive format '%s'" msgstr "Unbekanntes Archivformat '%s'" -#: archive.c:522 +#: archive.c:623 #, c-format 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:345 -#, c-format -msgid "cannot stream blob %s" -msgstr "Kann Blob %s nicht streamen." - -#: 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:287 archive-zip.c:353 -#, c-format -msgid "cannot read %s" -msgstr "Kann %s nicht lesen." - -#: archive-tar.c:459 -#, c-format -msgid "unable to start '%s' filter" -msgstr "Konnte '%s' Filter nicht starten." - -#: archive-tar.c:462 -msgid "unable to redirect descriptor" -msgstr "Konnte Descriptor nicht umleiten." - -#: archive-tar.c:469 -#, c-format -msgid "'%s' filter reported error" -msgstr "'%s' Filter meldete Fehler." - -#: 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:318 -#, c-format -msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s" - -#: 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:609 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "Timestamp zu groร fรผr dieses System: %<PRIuMAX>" - -#: attr.c:211 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s ist kein gรผltiger Attributname" -#: attr.c:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s nicht erlaubt: %s:%d" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -990,22 +1754,22 @@ msgstr "" "Verneinende Muster werden in Git-Attributen ignoriert.\n" "Benutzen Sie '\\!' fรผr fรผhrende Ausrufezeichen." -#: bisect.c:468 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Ungรผltiger Inhalt bzgl. Anfรผhrungszeichen in Datei '%s': %s" -#: bisect.c:678 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "Keine binรคre Suche mehr mรถglich!\n" -#: bisect.c:733 +#: bisect.c:753 #, c-format msgid "Not a valid commit name %s" msgstr "%s ist kein gรผltiger Commit-Name" -#: bisect.c:758 +#: bisect.c:778 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1014,7 +1778,7 @@ msgstr "" "Die Merge-Basis %s ist fehlerhaft.\n" "Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n" -#: bisect.c:763 +#: bisect.c:783 #, c-format msgid "" "The merge base %s is new.\n" @@ -1023,7 +1787,7 @@ msgstr "" "Die Merge-Basis %s ist neu.\n" "Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geรคndert.\n" -#: bisect.c:768 +#: bisect.c:788 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1032,7 +1796,7 @@ msgstr "" "Die Merge-Basis %s ist %s.\n" "Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n" -#: bisect.c:776 +#: bisect.c:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1043,7 +1807,7 @@ msgstr "" "git bisect kann in diesem Fall nicht richtig arbeiten.\n" "Vielleicht verwechselten Sie %s und %s Commits?\n" -#: bisect.c:789 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1055,36 +1819,36 @@ msgstr "" "erste %s Commit zwischen %s und %s befindet.\n" "Es wird dennoch fortgesetzt." -#: bisect.c:822 +#: bisect.c:848 #, 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:865 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "ein %s Commit wird benรถtigt" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei '%s' nicht erstellen" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "Konnte Datei '%s' nicht lesen" -#: bisect.c:958 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "Lesen von Referenzen fรผr binรคre Suche fehlgeschlagen" -#: bisect.c:977 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "%s war sowohl %s als auch %s\n" -#: bisect.c:985 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" @@ -1093,7 +1857,7 @@ msgstr "" "Kein testbarer Commit gefunden.\n" "Vielleicht starteten Sie mit falschen Pfad-Parametern?\n" -#: bisect.c:1004 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1103,50 +1867,50 @@ msgstr[1] "(ungefรคhr %d Schritte)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1088 #, 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:2697 +#: blame.c:2778 msgid "--contents and --reverse do not blend well." msgstr "--contents und --reverse funktionieren gemeinsam nicht." -#: blame.c:2711 +#: blame.c:2792 msgid "cannot use --contents with final commit object name" msgstr "" "kann --contents nicht mit endgรผltigem Namen des Commit-Objektes benutzen" -#: blame.c:2732 +#: blame.c:2813 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: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 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" -#: blame.c:2759 +#: blame.c:2840 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:2770 +#: blame.c:2851 #, c-format msgid "no such path %s in %s" msgstr "Pfad %s nicht in %s" -#: blame.c:2781 +#: blame.c:2862 #, c-format msgid "cannot read blob %s for path %s" msgstr "kann Blob %s fรผr Pfad '%s' nicht lesen" @@ -1283,393 +2047,361 @@ msgstr "mehrdeutiger Objekt-Name: '%s'" msgid "Not a valid branch point: '%s'." msgstr "Ungรผltiger Branchpunkt: '%s'" -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' ist bereits in '%s' ausgecheckt" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert." -#: bundle.c:36 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "unbekannter Paket-Hash-Algorithmus: %s" + +#: bundle.c:45 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" +msgid "unknown capability '%s'" +msgstr "unbekannte Fรคhigkeit '%s'" -#: bundle.c:64 +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' sieht nicht wie eine v2 oder v3 Paketdatei aus" + +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht รถffnen" -#: bundle.c:143 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" -#: bundle.c:146 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "Um ein Paket zu รผberprรผfen wird ein Repository benรถtigt." -#: bundle.c:197 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Das Paket enthรคlt diese Referenz:" msgstr[1] "Das Paket enthรคlt diese %d Referenzen:" -#: bundle.c:204 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "Das Paket speichert eine komplette Historie." -#: bundle.c:206 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" 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:272 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "Konnte dup fรผr Descriptor des Pakets nicht ausfรผhren." -#: bundle.c:279 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "Konnte Paketobjekte nicht erstellen" -#: bundle.c:290 +#: bundle.c:337 msgid "pack-objects died" msgstr "Erstellung der Paketobjekte abgebrochen" -#: bundle.c:332 +#: bundle.c:379 msgid "rev-list died" msgstr "\"rev-list\" abgebrochen" -#: bundle.c:381 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "nicht unterstรผtzte Paket-Version %d" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "kann Paket-Version %d nicht mit Algorithmus %s schreiben" + +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" -#: bundle.c:468 +#: bundle.c:530 msgid "Refusing to create empty bundle." msgstr "Erstellung eines leeren Pakets zurรผckgewiesen." -#: bundle.c:478 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "kann '%s' nicht erstellen" -#: bundle.c:503 +#: bundle.c:565 msgid "index-pack died" msgstr "Erstellung der Paketindexdatei abgebrochen" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "Ungรผltiger Farbwert: %.*s" -#: 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:52 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s ist kein Commit!" - -#: commit.c:192 -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 "" -"Die Unterstรผtzung fรผr <GIT_DIR>/info/grafts ist veraltet\n" -"und wird in zukรผnftigen Git Versionen entfernt.\n" -"\n" -"Bitte benutzen Sie \"git replace --convert-graft-file\"\n" -"zum Konvertieren der kรผnstlichen Vorgรคnger (\"grafts\")\n" -"in ersetzende Referenzen.<\n" -"\n" -"Sie kรถnnen diese Meldung unterdrรผcken, indem Sie\n" -"\"git config advice.graftFileDeprecated false\" ausfรผhren." - -#: 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: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:1133 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "Commit %s hat keine GPG-Signatur." - -#: 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: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 "" -"Warnung: Die Commit-Beschreibung ist nicht UTF-8 konform.\n" -"Sie kรถnnen das nachbessern, nachdem Sie die Beschreibung korrigiert haben,\n" -"oder Sie setzen die Konfigurationsvariable i18n.commitencoding auf das " -"Encoding,\n" -"welches von ihrem Projekt verwendet wird.\n" +#: commit-graph.c:188 midx.c:46 +msgid "invalid hash version" +msgstr "ungรผltige Hash-Version" -#: commit-graph.c:127 +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "Commit-Graph-Datei ist zu klein." -#: commit-graph.c:192 +#: commit-graph.c:311 #, 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:199 +#: commit-graph.c:318 #, 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:206 +#: commit-graph.c:325 #, 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: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:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "Commit-Graph-Datei ist zu klein, um %u Chunks zu enthalten" -#: commit-graph.c:240 +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "Unzulรคssiger Commit-Graph Chunk-Offset %08x%08x" -#: commit-graph.c:283 +#: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "Commit-Graph Chunk-Id %08x kommt mehrfach vor." -#: commit-graph.c:347 +#: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" msgstr "Commit-Graph hat keinen Basis-Graph-Chunk" -#: commit-graph.c:357 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "Commit-Graph Verkettung stimmt nicht รผberein." -#: commit-graph.c:404 +#: commit-graph.c:557 #, 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:430 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "Konnte nicht alle Commit-Graph-Dateien finden." -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:721 commit-graph.c:785 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "Ungรผltige Commit-Position. Commit-Graph ist wahrscheinlich beschรคdigt." -#: commit-graph.c:575 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "Konnte Commit %s nicht finden." -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:1042 builtin/am.c:1306 +#, c-format +msgid "unable to parse commit %s" +msgstr "Konnte Commit '%s' nicht parsen." + +#: commit-graph.c:1265 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "Konnte Art von Objekt '%s' nicht bestimmen." -#: commit-graph.c:1034 +#: commit-graph.c:1301 msgid "Loading known commits in commit graph" msgstr "Lade bekannte Commits in Commit-Graph" -#: commit-graph.c:1051 +#: commit-graph.c:1318 msgid "Expanding reachable commits in commit graph" msgstr "Erweitere erreichbare Commits in Commit-Graph" -#: commit-graph.c:1070 +#: commit-graph.c:1338 msgid "Clearing commit marks in commit graph" msgstr "Lรถsche Commit-Markierungen in Commit-Graph" -#: commit-graph.c:1089 +#: commit-graph.c:1357 msgid "Computing commit graph generation numbers" -msgstr "Commit-Graph Generierungsnummern berechnen" +msgstr "Commit-Graph Generationsnummern berechnen" + +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "Berechnung der Bloom-Filter fรผr verรคnderte Pfade des Commits" -#: commit-graph.c:1163 +#: commit-graph.c:1501 +msgid "Collecting referenced commits" +msgstr "Sammle referenzierte Commits" + +#: commit-graph.c:1526 #, 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:1176 +#: commit-graph.c:1539 #, c-format msgid "error adding pack %s" msgstr "Fehler beim Hinzufรผgen von Paket %s." -#: commit-graph.c:1180 +#: commit-graph.c:1543 #, c-format msgid "error opening index for %s" msgstr "Fehler beim รffnen des Index fรผr %s." -#: 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:1238 +#: commit-graph.c:1582 msgid "Finding commits for commit graph among packed objects" msgstr "Suche Commits fรผr Commit-Graph in gepackten Objekten" -#: commit-graph.c:1253 +#: commit-graph.c:1597 msgid "Counting distinct commits in commit graph" msgstr "Zรคhle Commits in Commit-Graph" -#: commit-graph.c:1284 +#: commit-graph.c:1629 msgid "Finding extra edges in commit graph" msgstr "Suche zusรคtzliche Rรคnder in Commit-Graph" -#: commit-graph.c:1332 +#: commit-graph.c:1678 msgid "failed to write correct number of base graph ids" msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs." -#: commit-graph.c:1365 midx.c:811 +#: commit-graph.c:1720 midx.c:826 #, c-format msgid "unable to create leading directories of %s" msgstr "Konnte fรผhrende Verzeichnisse von '%s' nicht erstellen." -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1733 +msgid "unable to create temporary graph layer" +msgstr "konnte temporรคre Graphen-Schicht nicht erstellen" + +#: commit-graph.c:1738 #, c-format -msgid "unable to create '%s'" -msgstr "konnte '%s' nicht erstellen" +msgid "unable to adjust shared permissions for '%s'" +msgstr "konnte geteilte Zugriffsberechtigungen fรผr '%s' nicht รคndern" -#: commit-graph.c:1437 +#: commit-graph.c:1808 #, 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:1478 +#: commit-graph.c:1853 msgid "unable to open commit-graph chain file" msgstr "Konnte Commit-Graph Chain-Datei nicht รถffnen." -#: commit-graph.c:1490 +#: commit-graph.c:1869 msgid "failed to rename base commit-graph file" msgstr "Konnte Basis-Commit-Graph-Datei nicht umbenennen." -#: commit-graph.c:1510 +#: commit-graph.c:1889 msgid "failed to rename temporary commit-graph file" msgstr "Konnte temporรคre Commit-Graph-Datei nicht umbenennen." -#: commit-graph.c:1621 +#: commit-graph.c:2015 msgid "Scanning merged commits" msgstr "Durchsuche zusammengefรผhrte Commits" -#: commit-graph.c:1632 +#: commit-graph.c:2026 #, c-format msgid "unexpected duplicate commit id %s" msgstr "Unerwartete doppelte Commit-ID %s" -#: commit-graph.c:1657 +#: commit-graph.c:2049 msgid "Merging commit-graph" msgstr "Zusammenfรผhren von Commit-Graph" -#: commit-graph.c:1844 +#: commit-graph.c:2259 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "Das Commit-Graph Format kann nicht %d Commits schreiben." -#: commit-graph.c:1855 +#: commit-graph.c:2270 msgid "too many commits to write graph" msgstr "Zu viele Commits zum Schreiben des Graphen." -#: commit-graph.c:1945 +#: commit-graph.c:2363 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:1955 +#: commit-graph.c:2373 #, 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:1965 commit-graph.c:1980 +#: commit-graph.c:2383 commit-graph.c:2398 #, 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:1972 +#: commit-graph.c:2390 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "Konnte Commit %s von Commit-Graph nicht parsen." -#: commit-graph.c:1989 +#: commit-graph.c:2408 msgid "Verifying commits in commit graph" msgstr "Commit in Commit-Graph รผberprรผfen" -#: commit-graph.c:2002 +#: commit-graph.c:2423 #, 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:2009 +#: commit-graph.c:2430 #, 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:2019 +#: commit-graph.c:2440 #, 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:2028 +#: commit-graph.c:2449 #, 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:2041 +#: commit-graph.c:2463 #, 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:2046 +#: commit-graph.c:2468 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1677,7 +2409,7 @@ msgstr "" "Commit-Graph hat Generationsnummer null fรผr Commit %s, aber sonst ungleich " "null" -#: commit-graph.c:2050 +#: commit-graph.c:2472 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1685,22 +2417,87 @@ msgstr "" "Commit-Graph hat Generationsnummer ungleich null fรผr Commit %s, aber sonst " "null" -#: commit-graph.c:2065 +#: commit-graph.c:2488 #, 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:2071 +#: commit-graph.c:2494 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "Commit-Datum fรผr Commit %s in Commit-Graph ist %<PRIuMAX> != %<PRIuMAX>" +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "konnte %s nicht parsen" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s ist kein Commit!" + +#: commit.c:194 +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 "" +"Die Unterstรผtzung fรผr <GIT_DIR>/info/grafts ist veraltet\n" +"und wird in zukรผnftigen Git Versionen entfernt.\n" +"\n" +"Bitte benutzen Sie \"git replace --convert-graft-file\"\n" +"zum Konvertieren der kรผnstlichen Vorgรคnger (\"grafts\")\n" +"in ersetzende Referenzen.<\n" +"\n" +"Sie kรถnnen diese Meldung unterdrรผcken, indem Sie\n" +"\"git config advice.graftFileDeprecated false\" ausfรผhren." + +#: commit.c:1172 +#, 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:1176 +#, 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:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "Commit %s hat keine GPG-Signatur." + +#: commit.c:1182 +#, 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:1436 +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 "" +"Warnung: Die Commit-Beschreibung ist nicht UTF-8 konform.\n" +"Sie kรถnnen das nachbessern, nachdem Sie die Beschreibung korrigiert haben,\n" +"oder Sie setzen die Konfigurationsvariable i18n.commitencoding auf das " +"Encoding,\n" +"welches von ihrem Projekt verwendet wird.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "Speicher verbraucht" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1716,312 +2513,306 @@ msgstr "" "รผberschritten.\n" "Das kรถnnte durch zirkulare Includes entstanden sein." -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "Konnte Include-Pfad '%s' nicht erweitern." -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "Relative Includes von Konfigurationen mรผssen aus Dateien kommen." -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "" "Bedingungen fรผr das Einbinden von Konfigurationen aus relativen Pfaden " "mรผssen\n" "aus Dateien kommen." -#: config.c:376 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "Schlรผssel enthรคlt keine Sektion: %s" -#: config.c:382 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "Schlรผssel enthรคlt keinen Variablennamen: %s" -#: config.c:406 sequencer.c:2463 +#: config.c:408 sequencer.c:2547 #, c-format msgid "invalid key: %s" msgstr "Ungรผltiger Schlรผssel: %s" -#: config.c:412 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "Ungรผltiger Schlรผssel (neue Zeile): %s" -#: config.c:448 config.c:460 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "Fehlerhafter Konfigurationsparameter: %s" -#: config.c:495 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "Fehlerhaftes Format in %s" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "Ungรผltige Konfigurationszeile %d in Blob %s" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "Ungรผltige Konfigurationszeile %d in Datei %s" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "Ungรผltige Konfigurationszeile %d in Standard-Eingabe" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "Ungรผltige Konfigurationszeile %d in Submodul-Blob %s" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "Ungรผltige Konfigurationszeile %d in Kommandozeile %s" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "Ungรผltige Konfigurationszeile %d in %s" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "Auรerhalb des Bereichs" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "Ungรผltige Einheit" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "Ungรผltiger numerischer Wert '%s' fรผr Konfiguration '%s': %s" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "Ungรผltiger numerischer Wert '%s' fรผr Konfiguration '%s' in Blob %s: %s" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "Ungรผltiger numerischer Wert '%s' fรผr Konfiguration '%s' in Datei %s: %s" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "Ungรผltiger numerischer Wert '%s' fรผr Konfiguration '%s' in Standard-Eingabe: " "%s" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "Ungรผltiger numerischer Wert '%s' fรผr Konfiguration '%s' in Submodul-Blob %s: " "%s" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "Ungรผltiger numerischer Wert '%s' fรผr Konfiguration '%s' in Befehlszeile %s: " "%s" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "Ungรผltiger numerischer Wert '%s' fรผr Konfiguration '%s' in %s: %s" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' ist kein gรผltiger Zeitstempel fรผr '%s'" -#: config.c:1208 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "Lรคnge fรผr Abkรผrzung von Commit-IDs auรerhalb des Bereichs: %d" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "ungรผltiger zlib Komprimierungsgrad %d" -#: config.c:1325 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "core.commentChar sollte nur ein Zeichen sein" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "Ungรผltiger Modus fรผr Objekterstellung: %s" -#: config.c:1430 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "Ungรผltiger Wert fรผr %s." -#: config.c:1456 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "Ungรผltiger Wert fรผr %s: %s" -#: config.c:1457 +#: config.c:1472 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:3410 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "ungรผltiger Komprimierungsgrad (%d) fรผr Paketierung" -#: config.c:1639 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "Konnte Blob-Objekt '%s' fรผr Konfiguration nicht laden." -#: config.c:1642 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "Referenz '%s' zeigt auf keinen Blob." -#: config.c:1659 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "Konnte Blob '%s' fรผr Konfiguration nicht auflรถsen." -#: config.c:1689 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "Fehler beim Parsen von %s." -#: config.c:1745 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "" "Konnte die รผber die Befehlszeile angegebene Konfiguration nicht parsen." -#: config.c:2094 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "" "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." -#: config.c:2264 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "Ungรผltiger %s: '%s'" -#: 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 +#: config.c:2341 #, 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:2379 +#: config.c:2387 #, 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:2381 +#: config.c:2389 #, 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:2462 +#: config.c:2470 #, c-format msgid "invalid section name '%s'" msgstr "Ungรผltiger Sektionsname '%s'" -#: config.c:2494 +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "%s hat mehrere Werte" -#: config.c:2523 +#: config.c:2531 #, c-format msgid "failed to write new configuration file %s" msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben." -#: config.c:2775 config.c:3099 +#: config.c:2783 config.c:3107 #, c-format msgid "could not lock config file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht sperren." -#: config.c:2786 +#: config.c:2794 #, c-format msgid "opening %s" msgstr "รffne %s" -#: config.c:2821 builtin/config.c:328 +#: config.c:2829 builtin/config.c:354 #, c-format msgid "invalid pattern: %s" msgstr "Ungรผltiges Muster: %s" -#: config.c:2846 +#: config.c:2854 #, c-format msgid "invalid config file %s" msgstr "Ungรผltige Konfigurationsdatei %s" -#: config.c:2859 config.c:3112 +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "fstat auf %s fehlgeschlagen" -#: config.c:2870 +#: config.c:2878 #, c-format msgid "unable to mmap '%s'" msgstr "mmap fรผr '%s' fehlgeschlagen" -#: config.c:2879 config.c:3117 +#: config.c:2887 config.c:3125 #, c-format msgid "chmod on %s failed" msgstr "chmod auf %s fehlgeschlagen" -#: config.c:2964 config.c:3214 +#: config.c:2972 config.c:3222 #, c-format msgid "could not write config file %s" msgstr "Konnte Konfigurationsdatei %s nicht schreiben." -#: config.c:2998 +#: config.c:3006 #, c-format msgid "could not set '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' setzen." -#: config.c:3000 builtin/remote.c:782 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "Konnte '%s' nicht aufheben." -#: config.c:3090 +#: config.c:3098 #, c-format msgid "invalid section name: %s" msgstr "Ungรผltiger Sektionsname: %s" -#: config.c:3257 +#: config.c:3265 #, c-format msgid "missing value for '%s'" msgstr "Fehlender Wert fรผr '%s'" @@ -2048,74 +2839,83 @@ msgstr "" msgid "server doesn't support '%s'" msgstr "Der Server unterstรผtzt kein '%s'." -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "Der Server unterstรผtzt das Feature '%s' nicht." -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" msgstr "Erwartete Flush nach Fรคhigkeiten." -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "Ignoriere Fรคhigkeiten nach der ersten Zeile '%s'." -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "Protokollfehler: unerwartetes capabilities^{}" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "Protokollfehler: shallow SHA-1 erwartet, '%s' bekommen" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "" "Repository auf der Gegenseite kann keine unvollstรคndige Historie (shallow) " "enthalten" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" -msgstr "Ungรผltiges Paket." +msgstr "ungรผltiges Paket" -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "Protokollfehler: unerwartetes '%s'" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "unbekanntes Objekt-Format '%s' vom Server angegeben" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" -msgstr "Ungรผltige ls-refs Antwort: %s" +msgstr "ungรผltige ls-refs Antwort: %s" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" -msgstr "Erwartete Flush nach Auflistung der Referenzen." +msgstr "Flush nach Auflistung der Referenzen erwartet" + +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "Antwort-Endpaket nach Auflistung der Referenzen erwartet" -#: connect.c:544 +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" -msgstr "Protokoll '%s' wird nicht unterstรผtzt." +msgstr "Protokoll '%s' wird nicht unterstรผtzt" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" -msgstr "Kann SO_KEEPALIVE bei Socket nicht setzen." +msgstr "kann SO_KEEPALIVE bei Socket nicht setzen" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "Suche nach %s ..." -#: connect.c:639 +#: connect.c:735 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "Fehler bei Suche nach %s (Port %s) (%s)." #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" @@ -2124,7 +2924,7 @@ msgstr "" "Fertig.\n" "Verbinde nach %s (Port %s) ... " -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -2134,88 +2934,88 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "Fertig." -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "Fehler bei der Suche nach %s (%s)" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "Unbekannter Port %s" -#: connect.c:845 connect.c:1171 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "Merkwรผrdigen Hostnamen '%s' blockiert." -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "Merkwรผrdigen Port '%s' blockiert." -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "Kann Proxy %s nicht starten." -#: connect.c:924 +#: connect.c:1024 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:1119 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" msgstr "SSH-Variante 'simple' unterstรผtzt kein -4." -#: connect.c:1131 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" msgstr "SSH-Variante 'simple' unterstรผtzt kein -6." -#: connect.c:1148 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" msgstr "SSH-Variante 'simple' unterstรผtzt nicht das Setzen eines Ports." -#: connect.c:1260 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" msgstr "Merkwรผrdigen Pfadnamen '%s' blockiert." -#: connect.c:1307 +#: connect.c:1408 msgid "unable to fork" msgstr "Kann Prozess nicht starten." -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Prรผfe Konnektivitรคt" -#: connected.c:98 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "Konnte 'git rev-list' nicht ausfรผhren" -#: connected.c:118 +#: connected.c:144 msgid "failed write to rev-list" msgstr "Fehler beim Schreiben nach rev-list" -#: connected.c:125 +#: connected.c:149 msgid "failed to close rev-list's stdin" -msgstr "Fehler beim Schlieรen von rev-list's Standard-Eingabe" +msgstr "Fehler beim Schlieรen von rev-lists Standard-Eingabe" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "Unerlaubte crlf_action %d" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF wรผrde in %s durch LF ersetzt werden." -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2225,12 +3025,12 @@ msgstr "" "Die Datei wird ihre ursprรผnglichen Zeilenenden im Arbeitsverzeichnis " "behalten." -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF wรผrde in %s durch CRLF ersetzt werden." -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2240,19 +3040,19 @@ msgstr "" "Die Datei wird ihre ursprรผnglichen Zeilenenden im Arbeitsverzeichnis " "behalten." -#: convert.c:279 +#: convert.c:284 #, 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:286 +#: convert.c:291 #, 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 UTF-%s\n" -"als Codierung im Arbeitsverzeichnis." +"Die Datei '%s' enthรคlt ein Byte-Order-Mark (BOM). Bitte benutzen Sie\n" +"UTF-%.*s als Codierung im Arbeitsverzeichnis." #: convert.c:304 #, c-format @@ -2269,50 +3069,50 @@ msgstr "" "oder UTF-%sLE (abhรคngig von der Byte-Reihenfolge) als Codierung im\n" "Arbeitsverzeichnis." -#: convert.c:424 convert.c:495 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "Fehler beim Codieren von '%s' von %s nach %s." -#: convert.c:467 +#: convert.c:462 #, 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:673 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "Kann externen Filter '%s' nicht starten." -#: convert.c:693 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "Kann Eingaben nicht an externen Filter '%s' รผbergeben." -#: convert.c:700 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "Externer Filter '%s' fehlgeschlagen %d" -#: convert.c:735 convert.c:738 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "Lesen von externem Filter '%s' fehlgeschlagen." -#: convert.c:741 convert.c:796 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "Externer Filter '%s' fehlgeschlagen." -#: convert.c:844 +#: convert.c:837 msgid "unexpected filter type" msgstr "Unerwartete Filterart." -#: convert.c:855 +#: convert.c:848 msgid "path name too long for external filter" msgstr "Pfadname zu lang fรผr externen Filter." -#: convert.c:929 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2320,67 +3120,95 @@ msgid "" msgstr "" "Externer Filter '%s' nicht mehr verfรผgbar. Nicht alle Pfade wurden gefiltert." -#: convert.c:1228 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "true/false sind keine gรผltigen Codierungen im Arbeitsverzeichnis." -#: convert.c:1398 convert.c:1432 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: clean-Filter '%s' fehlgeschlagen." -#: convert.c:1476 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: smudge-Filter '%s' fehlgeschlagen." -#: date.c:137 +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "รผberspringe Suche nach Zugangsdaten fรผr Schlรผssel: credential.%s" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "Weigerung, mit fehlendem Hostnamen in Zugangsdaten zu arbeiten" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "Weigerung, mit fehlendem Protokoll in Zugangsdaten zu arbeiten" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "URL enthรคlt Zeilenumbruch in der %s Komponente: %s" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "URL hat kein Schema: %s" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "URL mit Zugangsdaten konnte nicht geparst werden: %s" + +#: date.c:138 msgid "in the future" msgstr "in der Zukunft" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "vor %<PRIuMAX> Sekunde" msgstr[1] "vor %<PRIuMAX> Sekunden" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "vor %<PRIuMAX> Minute" msgstr[1] "vor %<PRIuMAX> Minuten" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "vor %<PRIuMAX> Stunde" msgstr[1] "vor %<PRIuMAX> Stunden" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "vor %<PRIuMAX> Tag" msgstr[1] "vor %<PRIuMAX> Tagen" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "vor %<PRIuMAX> Woche" msgstr[1] "vor %<PRIuMAX> Wochen" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "vor %<PRIuMAX> Monat" msgstr[1] "vor %<PRIuMAX> Monaten" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2388,14 +3216,14 @@ msgstr[0] "vor %<PRIuMAX> Jahr" msgstr[1] "vor %<PRIuMAX> Jahren" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, 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:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2429,15 +3257,6 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "%d Delta-Islands markiert, fertig.\n" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." - -#: diffcore-rename.c:544 -msgid "Performing inexact rename detection" -msgstr "Fรผhre Erkennung fรผr ungenaue Umbenennung aus" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<Optionen>] <Pfad> <Pfad>" @@ -2450,18 +3269,18 @@ msgstr "" "Kein Git-Repository. Nutzen Sie --no-index, um zwei Pfade auรerhalb des " "Arbeitsverzeichnisses zu vergleichen." -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n" -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Unbekannter \"dirstat\" Parameter '%s'\n" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2469,7 +3288,7 @@ msgstr "" "\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', " "'blocks', 'zebra', 'dimmed_zebra', 'plain'" -#: diff.c:324 +#: diff.c:325 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -2478,7 +3297,7 @@ msgstr "" "Unbekannter color-moved-ws Modus '%s', mรถgliche Werte sind 'ignore-space-" "change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-identation-change'" -#: diff.c:332 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -2486,12 +3305,12 @@ msgstr "" "color-moved-ws: allow-indentation-change kann nicht mit anderen\n" "Whitespace-Modi kombiniert werden." -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2500,36 +3319,36 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:4215 +#: diff.c:4269 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:4560 +#: diff.c:4618 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:4563 +#: diff.c:4621 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S und --find-object schlieรen sich gegenseitig aus" -#: diff.c:4641 +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:4689 +#: diff.c:4747 #, c-format msgid "invalid --stat value: %s" msgstr "Ungรผltiger --stat Wert: %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s erwartet einen numerischen Wert." -#: diff.c:4726 +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2538,42 +3357,42 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:4811 +#: diff.c:4869 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "Unbekannte รnderungsklasse '%c' in --diff-filter=%s" -#: diff.c:4835 +#: diff.c:4893 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "Unbekannter Wert nach ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4907 #, c-format msgid "unable to resolve '%s'" msgstr "konnte '%s' nicht auflรถsen" -#: diff.c:4899 diff.c:4905 +#: diff.c:4957 diff.c:4963 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s erwartet die Form <n>/<m>" -#: diff.c:4917 +#: diff.c:4975 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s erwartet ein Zeichen, '%s' bekommen" -#: diff.c:4938 +#: diff.c:4996 #, c-format msgid "bad --color-moved argument: %s" msgstr "Ungรผltiges --color-moved Argument: %s" -#: diff.c:4957 +#: diff.c:5015 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "Ungรผltiger Modus '%s' in --color-moved-ws" -#: diff.c:4997 +#: diff.c:5055 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2581,152 +3400,152 @@ msgstr "" "Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" -#: diff.c:5033 diff.c:5053 +#: diff.c:5091 diff.c:5111 #, c-format msgid "invalid argument to %s" msgstr "Ungรผltiges Argument fรผr %s" -#: diff.c:5191 +#: diff.c:5248 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" -#: diff.c:5247 +#: diff.c:5304 #, c-format msgid "bad --word-diff argument: %s" msgstr "Ungรผltiges --word-diff Argument: %s" -#: diff.c:5270 +#: diff.c:5327 msgid "Diff output format options" msgstr "Diff-Optionen zu Ausgabeformaten" -#: diff.c:5272 diff.c:5278 +#: diff.c:5329 diff.c:5335 msgid "generate patch" msgstr "Erzeuge Patch" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5332 builtin/log.c:176 msgid "suppress diff output" msgstr "Ausgabe der Unterschiede unterdrรผcken" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5337 diff.c:5451 diff.c:5458 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5338 diff.c:5341 msgid "generate diffs with <n> lines context" msgstr "Erstelle Unterschiede mit <n> Zeilen des Kontextes" -#: diff.c:5286 +#: diff.c:5343 msgid "generate the diff in raw format" msgstr "Erstelle Unterschiede im Rohformat" -#: diff.c:5289 +#: diff.c:5346 msgid "synonym for '-p --raw'" msgstr "Synonym fรผr '-p --raw'" -#: diff.c:5293 +#: diff.c:5350 msgid "synonym for '-p --stat'" msgstr "Synonym fรผr '-p --stat'" -#: diff.c:5297 +#: diff.c:5354 msgid "machine friendly --stat" msgstr "maschinenlesbare Ausgabe von --stat" -#: diff.c:5300 +#: diff.c:5357 msgid "output only the last line of --stat" msgstr "nur die letzte Zeile von --stat ausgeben" -#: diff.c:5302 diff.c:5310 +#: diff.c:5359 diff.c:5367 msgid "<param1,param2>..." msgstr "<Parameter1,Parameter2>..." -#: diff.c:5303 +#: diff.c:5360 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:5307 +#: diff.c:5364 msgid "synonym for --dirstat=cumulative" msgstr "Synonym fรผr --dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5368 msgid "synonym for --dirstat=files,param1,param2..." msgstr "Synonym fรผr --dirstat=files,Parameter1,Parameter2..." -#: diff.c:5315 +#: diff.c:5372 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "Warnen, wenn รnderungen Konfliktmarker oder Whitespace-Fehler einbringen" -#: diff.c:5318 +#: diff.c:5375 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:5321 +#: diff.c:5378 msgid "show only names of changed files" msgstr "nur Dateinamen der geรคnderten Dateien anzeigen" -#: diff.c:5324 +#: diff.c:5381 msgid "show only names and status of changed files" msgstr "nur Dateinamen und Status der geรคnderten Dateien anzeigen" -#: diff.c:5326 +#: diff.c:5383 msgid "<width>[,<name-width>[,<count>]]" msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]" -#: diff.c:5327 +#: diff.c:5384 msgid "generate diffstat" msgstr "Generiere Zusammenfassung der Unterschiede" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5386 diff.c:5389 diff.c:5392 msgid "<width>" msgstr "<Breite>" -#: diff.c:5330 +#: diff.c:5387 msgid "generate diffstat with a given width" msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Breite" -#: diff.c:5333 +#: diff.c:5390 msgid "generate diffstat with a given name width" msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Namens-Breite" -#: diff.c:5336 +#: diff.c:5393 msgid "generate diffstat with a given graph width" msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Graph-Breite" -#: diff.c:5338 +#: diff.c:5395 msgid "<count>" msgstr "<Anzahl>" -#: diff.c:5339 +#: diff.c:5396 msgid "generate diffstat with limited lines" msgstr "Erzeuge Zusammenfassung der Unterschiede mit begrenzten Zeilen" -#: diff.c:5342 +#: diff.c:5399 msgid "generate compact summary in diffstat" msgstr "Erzeuge kompakte Zusammenstellung in Zusammenfassung der Unterschiede" -#: diff.c:5345 +#: diff.c:5402 msgid "output a binary diff that can be applied" msgstr "Gebe eine binรคre Differenz aus, dass angewendet werden kann" -#: diff.c:5348 +#: diff.c:5405 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:5350 +#: diff.c:5407 msgid "show colored diff" msgstr "Zeige farbige Unterschiede" -#: diff.c:5351 +#: diff.c:5408 msgid "<kind>" msgstr "<Art>" -#: diff.c:5352 +#: diff.c:5409 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2734,7 +3553,7 @@ msgstr "" "Hebe Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den " "Unterschieden hervor" -#: diff.c:5355 +#: diff.c:5412 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2742,91 +3561,91 @@ msgstr "" "Verschleiere nicht die Pfadnamen und nutze NUL-Zeichen als Schlusszeichen in " "Ausgabefeldern bei --raw oder --numstat" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 msgid "<prefix>" msgstr "<Prรคfix>" -#: diff.c:5359 +#: diff.c:5416 msgid "show the given source prefix instead of \"a/\"" msgstr "Zeige den gegebenen Quell-Prรคfix statt \"a/\"" -#: diff.c:5362 +#: diff.c:5419 msgid "show the given destination prefix instead of \"b/\"" msgstr "Zeige den gegebenen Ziel-Prรคfix statt \"b/\"" -#: diff.c:5365 +#: diff.c:5422 msgid "prepend an additional prefix to every line of output" msgstr "Stelle einen zusรคtzlichen Prรคfix bei jeder Ausgabezeile voran" -#: diff.c:5368 +#: diff.c:5425 msgid "do not show any source or destination prefix" msgstr "Zeige keine Quell- oder Ziel-Prรคfixe an" -#: diff.c:5371 +#: diff.c:5428 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:5375 diff.c:5380 diff.c:5385 +#: diff.c:5432 diff.c:5437 diff.c:5442 msgid "<char>" msgstr "<Zeichen>" -#: diff.c:5376 +#: diff.c:5433 msgid "specify the character to indicate a new line instead of '+'" msgstr "Das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')" -#: diff.c:5381 +#: diff.c:5438 msgid "specify the character to indicate an old line instead of '-'" msgstr "Das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')" -#: diff.c:5386 +#: diff.c:5443 msgid "specify the character to indicate a context instead of ' '" msgstr "Das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')" -#: diff.c:5389 +#: diff.c:5446 msgid "Diff rename options" msgstr "Diff-Optionen zur Umbenennung" -#: diff.c:5390 +#: diff.c:5447 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5448 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:5395 +#: diff.c:5452 msgid "detect renames" msgstr "Umbenennungen erkennen" -#: diff.c:5399 +#: diff.c:5456 msgid "omit the preimage for deletes" msgstr "Preimage fรผr Lรถschungen weglassen." -#: diff.c:5402 +#: diff.c:5459 msgid "detect copies" msgstr "Kopien erkennen" -#: diff.c:5406 +#: diff.c:5463 msgid "use unmodified files as source to find copies" msgstr "Nutze ungeรคnderte Dateien als Quelle zum Finden von Kopien" -#: diff.c:5408 +#: diff.c:5465 msgid "disable rename detection" msgstr "Erkennung von Umbenennungen deaktivieren" -#: diff.c:5411 +#: diff.c:5468 msgid "use empty blobs as rename source" msgstr "Nutze leere Blobs als Quelle von Umbennungen" -#: diff.c:5413 +#: diff.c:5470 msgid "continue listing the history of a file beyond renames" msgstr "Fortfรผhren der Auflistung der Historie einer Datei nach Umbennung" -#: diff.c:5416 +#: diff.c:5473 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2834,159 +3653,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:5418 +#: diff.c:5475 msgid "Diff algorithm options" msgstr "Diff Algorithmus-Optionen" -#: diff.c:5420 +#: diff.c:5477 msgid "produce the smallest possible diff" msgstr "Erzeuge die kleinstmรถglichen รnderungen" -#: diff.c:5423 +#: diff.c:5480 msgid "ignore whitespace when comparing lines" msgstr "Whitespace-รnderungen beim Vergleich von Zeilen ignorieren" -#: diff.c:5426 +#: diff.c:5483 msgid "ignore changes in amount of whitespace" msgstr "รnderungen bei der Anzahl von Whitespace ignorieren" -#: diff.c:5429 +#: diff.c:5486 msgid "ignore changes in whitespace at EOL" msgstr "Whitespace-รnderungen am Zeilenende ignorieren" -#: diff.c:5432 +#: diff.c:5489 msgid "ignore carrier-return at the end of line" msgstr "Ignoriere den Zeilenumbruch am Ende der Zeile" -#: diff.c:5435 +#: diff.c:5492 msgid "ignore changes whose lines are all blank" msgstr "Ignoriere รnderungen in leeren Zeilen" -#: diff.c:5438 +#: diff.c:5495 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:5441 +#: diff.c:5498 msgid "generate diff using the \"patience diff\" algorithm" msgstr "Erzeuge รnderungen durch Nutzung des Algorithmus \"Patience Diff\"" -#: diff.c:5445 +#: diff.c:5502 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "Erzeuge รnderungen durch Nutzung des Algorithmus \"Histogram Diff\"" -#: diff.c:5447 +#: diff.c:5504 msgid "<algorithm>" msgstr "<Algorithmus>" -#: diff.c:5448 +#: diff.c:5505 msgid "choose a diff algorithm" msgstr "Ein Algorithmus fรผr รnderungen wรคhlen" -#: diff.c:5450 +#: diff.c:5507 msgid "<text>" msgstr "<Text>" -#: diff.c:5451 +#: diff.c:5508 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "Erzeuge รnderungen durch Nutzung des Algorithmus \"Anchored Diff\"" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5510 diff.c:5519 diff.c:5522 msgid "<mode>" msgstr "<Modus>" -#: diff.c:5454 +#: diff.c:5511 msgid "show word diff, using <mode> to delimit changed words" msgstr "Zeige Wort-รnderungen, nutze <Modus>, um Wรถrter abzugrenzen" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5513 diff.c:5516 diff.c:5561 msgid "<regex>" msgstr "<Regex>" -#: diff.c:5457 +#: diff.c:5514 msgid "use <regex> to decide what a word is" msgstr "Nutze <Regex>, um zu entscheiden, was ein Wort ist" -#: diff.c:5460 +#: diff.c:5517 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "Entsprechend wie --word-diff=color --word-diff-regex=<Regex>" -#: diff.c:5463 +#: diff.c:5520 msgid "moved lines of code are colored differently" msgstr "Verschobene Codezeilen sind andersfarbig" -#: diff.c:5466 +#: diff.c:5523 msgid "how white spaces are ignored in --color-moved" msgstr "Wie Whitespaces in --color-moved ignoriert werden" -#: diff.c:5469 +#: diff.c:5526 msgid "Other diff options" msgstr "Andere Diff-Optionen" -#: diff.c:5471 +#: diff.c:5528 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:5475 +#: diff.c:5532 msgid "treat all files as text" msgstr "alle Dateien als Text behandeln" -#: diff.c:5477 +#: diff.c:5534 msgid "swap two inputs, reverse the diff" msgstr "Vertausche die beiden Eingaben und drehe die รnderungen um" -#: diff.c:5479 +#: diff.c:5536 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:5481 +#: diff.c:5538 msgid "disable all output of the program" msgstr "Keine Ausgaben vom Programm" -#: diff.c:5483 +#: diff.c:5540 msgid "allow an external diff helper to be executed" msgstr "Erlaube die Ausfรผhrung eines externes Programms fรผr รnderungen" -#: diff.c:5485 +#: diff.c:5542 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:5487 +#: diff.c:5544 msgid "<when>" msgstr "<wann>" -#: diff.c:5488 +#: diff.c:5545 msgid "ignore changes to submodules in the diff generation" msgstr "" "รnderungen in Submodulen wรคhrend der Erstellung der Unterschiede ignorieren" -#: diff.c:5491 +#: diff.c:5548 msgid "<format>" msgstr "<Format>" -#: diff.c:5492 +#: diff.c:5549 msgid "specify how differences in submodules are shown" msgstr "Angeben, wie Unterschiede in Submodulen gezeigt werden" -#: diff.c:5496 +#: diff.c:5553 msgid "hide 'git add -N' entries from the index" msgstr "verstecke 'git add -N' Eintrรคge vom Index" -#: diff.c:5499 +#: diff.c:5556 msgid "treat 'git add -N' entries as real in the index" msgstr "Behandle 'git add -N' Eintrรคge im Index als echt" -#: diff.c:5501 +#: diff.c:5558 msgid "<string>" msgstr "<Zeichenkette>" -#: diff.c:5502 +#: diff.c:5559 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -2994,7 +3813,7 @@ msgstr "" "Suche nach Unterschieden, welche die Anzahl des Vorkommens der angegebenen " "Zeichenkette verรคndern" -#: diff.c:5505 +#: diff.c:5562 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3002,25 +3821,25 @@ msgstr "" "Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen " "regulรคren Ausdrucks verรคndern" -#: diff.c:5508 +#: diff.c:5565 msgid "show all changes in the changeset with -S or -G" msgstr "zeige alle รnderungen im Changeset mit -S oder -G" -#: diff.c:5511 +#: diff.c:5568 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "behandle <Zeichenkette> bei -S als erweiterten POSIX regulรคren Ausdruck" -#: diff.c:5514 +#: diff.c:5571 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:5515 +#: diff.c:5572 msgid "<object-id>" msgstr "<Objekt-ID>" -#: diff.c:5516 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3028,33 +3847,33 @@ msgstr "" "Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen " "Objektes verรคndern" -#: diff.c:5518 +#: diff.c:5575 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5576 msgid "select files by diff type" msgstr "Wรคhle Dateien anhand der Art der รnderung" -#: diff.c:5521 +#: diff.c:5578 msgid "<file>" msgstr "<Datei>" -#: diff.c:5522 +#: diff.c:5579 msgid "Output to a specific file" msgstr "Ausgabe zu einer bestimmten Datei" -#: diff.c:6177 +#: diff.c:6236 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:6180 +#: diff.c:6239 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:6183 +#: diff.c:6242 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3062,57 +3881,87 @@ msgstr "" "Sie kรถnnten die Variable %s auf mindestens %d setzen und den Befehl\n" "erneut versuchen." -#: dir.c:537 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "Fรผhre Erkennung fรผr ungenaue Umbenennung aus" + +#: dir.c:578 #, 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:926 +#: dir.c:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "Unbekanntes Muster: '%s'" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "Unbekanntes verneinendes Muster: '%s'" + +#: dir.c:809 +#, 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:819 +msgid "disabling cone pattern matching" +msgstr "Deaktiviere Cone-Muster-รbereinstimmung" + +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "Kann %s nicht als exclude-Filter benutzen." -#: dir.c:1843 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht รถffnen." -#: dir.c:2085 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel" -#: dir.c:2209 +#: dir.c:2729 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:3013 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "Index-Datei in Repository %s beschรคdigt." -#: dir.c:3058 dir.c:3063 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "Konnte Verzeichnisse fรผr '%s' nicht erstellen." -#: dir.c:3092 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren." -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "Hinweis: Warte auf das Schlieรen der Datei durch Ihren Editor...%c" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "Filtere Inhalt" -#: entry.c:476 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "Konnte Datei '%s' nicht lesen." @@ -3122,7 +3971,7 @@ msgstr "Konnte Datei '%s' nicht lesen." msgid "bad git namespace path \"%s\"" msgstr "Ungรผltiger Git-Namespace-Pfad \"%s\"" -#: environment.c:332 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "Konnte GIT_DIR nicht zu '%s' setzen." @@ -3132,265 +3981,287 @@ 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-object.c:17 -msgid "Remote with no URL" -msgstr "Remote-Repository ohne URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: erwartete shallow-Liste" -#: fetch-pack.c:154 +#: fetch-pack.c:179 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:165 +#: fetch-pack.c:190 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen" -#: fetch-pack.c:185 +#: fetch-pack.c:210 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen" -#: fetch-pack.c:196 +#: fetch-pack.c:221 msgid "unable to write to remote" msgstr "konnte nicht zum Remote schreiben" -#: fetch-pack.c:258 +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc benรถtigt multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "Ungรผltige shallow-Zeile: %s" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "Ungรผltige unshallow-Zeile: %s" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "Objekt nicht gefunden: %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "Fehler in Objekt: %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "Kein shallow-Objekt gefunden: %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "shallow/unshallow erwartet, %s bekommen" -#: fetch-pack.c:417 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "%s %d %s bekommen" -#: fetch-pack.c:434 +#: fetch-pack.c:448 #, c-format msgid "invalid commit %s" msgstr "Ungรผltiger Commit %s" -#: fetch-pack.c:465 +#: fetch-pack.c:479 msgid "giving up" msgstr "Gebe auf" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:492 progress.c:339 msgid "done" msgstr "Fertig" -#: fetch-pack.c:489 +#: fetch-pack.c:504 #, c-format msgid "got %s (%d) %s" msgstr "%s (%d) %s bekommen" -#: fetch-pack.c:535 +#: fetch-pack.c:540 #, c-format msgid "Marking %s as complete" msgstr "Markiere %s als vollstรคndig" -#: fetch-pack.c:744 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "habe %s (%s) bereits" -#: fetch-pack.c:783 +#: fetch-pack.c:824 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer" -#: fetch-pack.c:791 +#: fetch-pack.c:832 msgid "protocol error: bad pack header" msgstr "Protokollfehler: ungรผltiger Pack-Header" -#: fetch-pack.c:859 +#: fetch-pack.c:916 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: konnte %s nicht starten" -#: fetch-pack.c:875 +#: fetch-pack.c:933 #, c-format msgid "%s failed" msgstr "%s fehlgeschlagen" -#: fetch-pack.c:877 +#: fetch-pack.c:935 msgid "error in sideband demultiplexer" msgstr "Fehler in sideband demultiplexer" -#: fetch-pack.c:908 +#: fetch-pack.c:978 #, c-format msgid "Server version is %.*s" msgstr "Server-Version ist %.*s" -#: 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 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 #, c-format msgid "Server supports %s" msgstr "Server unterstรผtzt %s" -#: fetch-pack.c:915 +#: fetch-pack.c:985 msgid "Server does not support shallow clients" msgstr "Server unterstรผtzt keine shallow-Clients" -#: fetch-pack.c:975 +#: fetch-pack.c:1045 msgid "Server does not support --shallow-since" msgstr "Server unterstรผtzt kein --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:1050 msgid "Server does not support --shallow-exclude" msgstr "Server unterstรผtzt kein --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "Server unterstรผtzt kein --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1056 +msgid "Server does not support this repository's object format" +msgstr "Server unterstรผtzt das Objekt-Format dieses Repositories nicht" + +#: fetch-pack.c:1069 msgid "no common commits" msgstr "keine gemeinsamen Commits" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1081 fetch-pack.c:1619 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: Abholen fehlgeschlagen." -#: fetch-pack.c:1151 +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "Algorithmen stimmen nicht รผberein: Client %s; Server %s" + +#: fetch-pack.c:1209 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "der Server unterstรผtzt Algorithmus '%s' nicht" + +#: fetch-pack.c:1229 msgid "Server does not support shallow requests" -msgstr "Server unterstรผtzt keine shallow-Anfragen." +msgstr "Server unterstรผtzt keine shallow-Anfragen" -#: fetch-pack.c:1157 +#: fetch-pack.c:1236 msgid "Server supports filter" msgstr "Server unterstรผtzt Filter" -#: fetch-pack.c:1184 +#: fetch-pack.c:1275 msgid "unable to write request to remote" msgstr "konnte Anfrage nicht zum Remote schreiben" -#: fetch-pack.c:1202 +#: fetch-pack.c:1293 #, c-format msgid "error reading section header '%s'" msgstr "Fehler beim Lesen von Sektionskopf '%s'." -#: fetch-pack.c:1208 +#: fetch-pack.c:1299 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' erwartet, '%s' empfangen" -#: fetch-pack.c:1247 +#: fetch-pack.c:1360 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "Unerwartete Acknowledgment-Zeile: '%s'" -#: fetch-pack.c:1252 +#: fetch-pack.c:1365 #, c-format msgid "error processing acks: %d" msgstr "Fehler beim Verarbeiten von ACKS: %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1375 msgid "expected packfile to be sent after 'ready'" msgstr "Erwartete Versand einer Packdatei nach 'ready'." -#: fetch-pack.c:1264 +#: fetch-pack.c:1377 msgid "expected no other sections to be sent after no 'ready'" msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'." -#: fetch-pack.c:1306 +#: fetch-pack.c:1419 #, c-format msgid "error processing shallow info: %d" msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1466 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref erwartet, '%s' bekommen" -#: fetch-pack.c:1358 +#: fetch-pack.c:1471 #, c-format msgid "unexpected wanted-ref: '%s'" -msgstr "Unerwartetes wanted-ref: '%s'" +msgstr "unerwartetes wanted-ref: '%s'" -#: fetch-pack.c:1363 +#: fetch-pack.c:1476 #, c-format msgid "error processing wanted refs: %d" msgstr "Fehler beim Verarbeiten von wanted-refs: %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1506 +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack: Antwort-Endpaket erwartet" + +#: fetch-pack.c:1887 msgid "no matching remote head" msgstr "kein รผbereinstimmender Remote-Branch" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1910 builtin/clone.c:692 msgid "remote did not send all necessary objects" -msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." +msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet" -#: fetch-pack.c:1739 +#: fetch-pack.c:1937 #, c-format msgid "no such remote ref %s" msgstr "keine solche Remote-Referenz %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1940 #, 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:321 -msgid "gpg failed to sign the data" -msgstr "gpg beim Signieren der Daten fehlgeschlagen" - -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "konnte temporรคre Datei nicht erstellen" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "Fehler beim Schreiben der losgelรถsten Signatur nach '%s'" -#: graph.c:97 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg beim Signieren der Daten fehlgeschlagen" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "Ignoriere ungรผltige Farbe '%.*s' in log.graphColors" -#: grep.c:2117 +#: 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 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': konnte %s nicht lesen" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "Konnte '%s' nicht lesen" -#: grep.c:2145 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "'%s': read() zu kurz" @@ -3440,50 +4311,50 @@ msgid "Low-level Commands / Interrogators" msgstr "Systembefehle / Abfragen" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Systembefehle / Repositories synchronisieren" #: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "Systembefehle / Interne Hilfsbefehle" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "Vorhandene Git-Befehle in '%s'" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:" -#: help.c:363 git.c:98 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "Nicht unterstรผtzte Art zur Befehlsauflistung '%s'." -#: help.c:403 -msgid "The common Git guides are:" -msgstr "Die allgemeinen Git-Anleitungen sind:" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Die Git-Konzeptanleitungen sind:" -#: help.c:512 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "" "Siehe 'git help <Befehl>', um mehr รผber einen spezifischen Unterbefehl zu " "lesen." -#: help.c:517 +#: help.c:434 msgid "External commands" msgstr "Externe Befehle" -#: help.c:532 +#: help.c:449 msgid "Command aliases" msgstr "Alias-Befehle" -#: help.c:596 +#: help.c:513 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -3492,32 +4363,32 @@ msgstr "" "'%s' scheint ein git-Befehl zu sein, konnte aber\n" "nicht ausgefรผhrt werden. Vielleicht ist git-%s fehlerhaft?" -#: help.c:655 +#: help.c:572 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden." -#: help.c:677 +#: help.c:594 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" "WARNUNG: Sie haben Git-Befehl '%s' ausgefรผhrt, welcher nicht existiert." -#: help.c:682 +#: help.c:599 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten." -#: help.c:687 +#: help.c:604 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Setze in %0.1f Sekunden fort unter der Annahme, dass Sie '%s' meinten." -#: help.c:695 +#: help.c:612 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'." -#: help.c:699 +#: help.c:616 msgid "" "\n" "The most similar command is" @@ -3531,16 +4402,16 @@ msgstr[1] "" "\n" "Die รคhnlichsten Befehle sind" -#: help.c:714 +#: help.c:656 msgid "git version [<options>]" msgstr "git version [<Optionen>]" -#: help.c:782 +#: help.c:711 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:715 msgid "" "\n" "Did you mean this?" @@ -3554,7 +4425,15 @@ msgstr[1] "" "\n" "Haben Sie eines von diesen gemeint?" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "Identitรคt des Autors unbekannt\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "Identitรคt des Commit-Erstellers unbekannt\n" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -3580,77 +4459,98 @@ msgstr "" "Lassen Sie die Option \"--global\" weg, um die Identitรคt nur\n" "fรผr dieses Repository zu setzen.\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "keine E-Mail angegeben und automatische Erkennung ist deaktiviert" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "Konnte die E-Mail-Adresse nicht automatisch erkennen ('%s' erhalten)" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "kein Name angegeben und automatische Erkennung ist deaktiviert" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "konnte Namen nicht automatisch erkennen ('%s' erhalten)" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "Leerer Name in Identifikation (fรผr <%s>) nicht erlaubt." -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "Ungรผltiges Datumsformat: %s" -#: list-objects.c:129 +#: list-objects-filter-options.c:81 +msgid "expected 'tree:<depth>'" +msgstr "'tree:<Tiefe>' erwartet" + +#: list-objects-filter-options.c:96 +msgid "sparse:path filters support has been dropped" +msgstr "Keine Unterstรผtzung fรผr sparse:path Filter mehr" + +#: list-objects-filter-options.c:109 +#, c-format +msgid "invalid filter-spec '%s'" +msgstr "Ungรผltige filter-spec '%s'" + +#: list-objects-filter-options.c:125 +#, 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:167 +msgid "expected something after combine:" +msgstr "erwartete etwas nach 'combine:'" + +#: list-objects-filter-options.c:249 +msgid "multiple filter-specs cannot be combined" +msgstr "mehrere filter-specs kรถnnen nicht kombiniert werden" + +#: list-objects-filter-options.c:361 +msgid "unable to upgrade repository format to support partial clone" +msgstr "" +"Repository-Format konnte nicht erweitert werden, um partielles Klonen zu " +"unterstรผtzen" + +#: 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.c:127 #, 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:142 +#: list-objects.c:140 #, 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:378 +#: list-objects.c:375 #, 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-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:84 -msgid "sparse:path filters support has been dropped" -msgstr "Keine Unterstรผtzung fรผr sparse:path Filter mehr" - -#: list-objects-filter-options.c:94 -#, c-format -msgid "invalid filter-spec '%s'" -msgstr "Ungรผltige filter-spec '%s'" - -#: 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 +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -3670,127 +4570,117 @@ msgstr "" "ein frรผherer Git-Prozess in diesem Repository abgestรผrzt sein:\n" "Lรถschen Sie die Datei manuell um fortzufahren." -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Konnte '%s.lock' nicht erstellen: %s" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "Lesen des Zwischenspeichers fehlgeschlagen" - -#: 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." +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "erwartete Flush nach Argumenten fรผr die Auflistung der Referenzen" -#: merge-recursive.c:322 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(ungรผltiger Commit)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, 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:354 +#: merge-recursive.c:388 #, 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:437 -msgid "error building trees" -msgstr "Fehler beim Erstellen der \"Tree\"-Objekte" - -#: merge-recursive.c:863 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "Fehler beim Erstellen des Pfades '%s'%s" -#: merge-recursive.c:874 +#: merge-recursive.c:885 #, 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:888 merge-recursive.c:907 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?" -#: merge-recursive.c:897 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen wรผrden" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "kann Objekt %s '%s' nicht lesen" -#: merge-recursive.c:941 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "Blob erwartet fรผr %s '%s'" -#: merge-recursive.c:965 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "Fehler beim รffnen von '%s': %s" -#: merge-recursive.c:976 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "Fehler beim Erstellen einer symbolischen Verknรผpfung fรผr '%s': %s" -#: merge-recursive.c:981 +#: merge-recursive.c:995 #, 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:1177 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)." -#: merge-recursive.c:1184 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)." -#: merge-recursive.c:1191 +#: merge-recursive.c:1205 #, 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:1199 merge-recursive.c:1211 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Spule Submodul %s zu dem folgenden Commit vor:" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Spule Submodul %s vor" -#: merge-recursive.c:1237 +#: merge-recursive.c:1251 #, 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:1241 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)" -#: merge-recursive.c:1242 +#: merge-recursive.c:1256 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:1245 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3807,33 +4697,33 @@ msgstr "" "\n" "hinzu, um diesen Vorschlag zu akzeptieren.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)" -#: merge-recursive.c:1327 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "Fehler bei Ausfรผhrung des internen Merges" -#: merge-recursive.c:1332 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "Konnte %s nicht zur Datenbank hinzufรผgen" -#: merge-recursive.c:1364 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "automatischer Merge von %s" -#: merge-recursive.c:1387 +#: merge-recursive.c:1402 #, 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:1459 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3842,7 +4732,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:1464 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3851,7 +4741,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:1471 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3860,7 +4750,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:1476 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3869,46 +4759,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:1511 +#: merge-recursive.c:1526 msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "renamed" msgstr "umbenannt" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Verweigere geรคnderte Datei bei %s zu verlieren." -#: merge-recursive.c:1601 +#: merge-recursive.c:1587 #, 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:1659 +#: merge-recursive.c:1645 #, 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:1690 +#: merge-recursive.c:1676 #, 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:1695 +#: merge-recursive.c:1681 #, 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:1714 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3917,18 +4807,18 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" " "und \"%s\"->\"%s\" in Branch \"%s\"%s" -#: merge-recursive.c:1719 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (bleibt unaufgelรถst)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1805 #, 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:2035 +#: merge-recursive.c:2068 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3941,7 +4831,7 @@ msgstr "" "wobei\n" "keines dieser Ziele die Mehrheit der Dateien erhielt." -#: merge-recursive.c:2067 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3952,7 +4842,7 @@ msgstr "" "Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n" "Pfade dahin zu setzen: %s." -#: merge-recursive.c:2077 +#: merge-recursive.c:2110 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3963,7 +4853,7 @@ msgstr "" "%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n" "zu setzen: %s" -#: merge-recursive.c:2169 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3972,7 +4862,7 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n" "Benenne Verzeichnis um %s->%s in %s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3981,52 +4871,52 @@ msgstr "" "WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt " "wurde." -#: merge-recursive.c:2938 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "kann Objekt %s nicht lesen" -#: merge-recursive.c:2941 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "Objekt %s ist kein Blob" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modify" msgstr "รคndern" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modified" msgstr "geรคndert" -#: merge-recursive.c:3017 +#: merge-recursive.c:3052 msgid "content" msgstr "Inhalt" -#: merge-recursive.c:3021 +#: merge-recursive.c:3056 msgid "add/add" msgstr "hinzufรผgen/hinzufรผgen" -#: merge-recursive.c:3044 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3101 msgid "submodule" msgstr "Submodul" -#: merge-recursive.c:3067 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Merge-Konflikt in %s" -#: merge-recursive.c:3097 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Fรผge stattdessen als %s hinzu" -#: merge-recursive.c:3179 +#: merge-recursive.c:3215 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4035,7 +4925,7 @@ msgstr "" "Pfad aktualisiert: %s hinzugefรผgt in %s innerhalb eines Verzeichnisses, das " "umbenannt wurde in %s; Verschiebe es nach %s." -#: merge-recursive.c:3182 +#: merge-recursive.c:3218 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4044,7 +4934,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:3186 +#: merge-recursive.c:3222 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4053,7 +4943,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:3189 +#: merge-recursive.c:3225 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4063,173 +4953,199 @@ msgstr "" "Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s " "verschoben werden." -#: merge-recursive.c:3303 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "Entferne %s" -#: merge-recursive.c:3326 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "Datei/Verzeichnis" -#: merge-recursive.c:3331 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "Verzeichnis/Datei" -#: merge-recursive.c:3338 +#: merge-recursive.c:3374 #, 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:3347 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "Fรผge %s hinzu" -#: merge-recursive.c:3356 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (hinzufรผgen/hinzufรผgen): Merge-Konflikt in %s" -#: 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 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:3414 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenfรผhren der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:3513 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:3526 +#: merge-recursive.c:3563 #, 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:3565 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurรผckgegeben" -#: merge-recursive.c:3631 +#: merge-recursive.c:3672 +#, 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:3769 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 msgid "Unable to write index." msgstr "Konnte Index nicht schreiben." -#: midx.c:69 +#: merge.c:41 +msgid "failed to read the cache" +msgstr "Lesen des Zwischenspeichers fehlgeschlagen" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "Konnte neue Index-Datei nicht schreiben." + +#: midx.c:79 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-index-Datei %s ist zu klein." -#: midx.c:85 +#: midx.c:95 #, 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:90 +#: midx.c:100 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index-Version %d nicht erkannt." -#: midx.c:95 +#: midx.c:105 #, c-format -msgid "hash version %u does not match" -msgstr "Hash-Version %u stimmt nicht รผberein." +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "multi-pack-index Hash-Version %u stimmt nicht mit Version %u รผberein" -#: midx.c:109 +#: midx.c:122 msgid "invalid chunk offset (too large)" msgstr "Ungรผltiger Chunk-Offset (zu groร)" -#: midx.c:133 +#: midx.c:146 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:146 +#: midx.c:159 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index fehlt erforderlicher pack-name Chunk." -#: midx.c:148 +#: midx.c:161 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk." -#: midx.c:150 +#: midx.c:163 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk." -#: midx.c:152 +#: midx.c:165 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index fehlt erforderlicher object offset Chunk." -#: midx.c:166 +#: midx.c:179 #, 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:211 +#: midx.c:222 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "Ungรผltige pack-int-id: %u (%u Pakete insgesamt)" -#: midx.c:261 +#: midx.c:272 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:289 +#: midx.c:300 msgid "error preparing packfile from multi-pack-index" msgstr "Fehler bei Vorbereitung der Packdatei aus multi-pack-index." -#: midx.c:470 +#: midx.c:485 #, c-format msgid "failed to add packfile '%s'" msgstr "Fehler beim Hinzufรผgen von Packdatei '%s'." -#: midx.c:476 +#: midx.c:491 #, c-format msgid "failed to open pack-index '%s'" msgstr "Fehler beim รffnen von pack-index '%s'" -#: midx.c:536 +#: midx.c:551 #, c-format msgid "failed to locate object %d in packfile" msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei." -#: midx.c:865 +#: midx.c:853 +msgid "Adding packfiles to multi-pack-index" +msgstr "Packdateien zum multi-pack-index hinzufรผgen" + +#: midx.c:886 #, c-format msgid "did not see pack-file %s to drop" msgstr "Pack-Datei %s zum Weglassen nicht gefunden" -#: midx.c:1036 +#: midx.c:938 +msgid "no pack files to index." +msgstr "keine Packdateien zum Indizieren." + +#: midx.c:990 +msgid "Writing chunks to multi-pack-index" +msgstr "Chunks zum multi-pack-index schreiben" + +#: midx.c:1068 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "Fehler beim Lรถschen des multi-pack-index bei %s" -#: midx.c:1091 +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "multi-pack-index-Datei existiert, aber das Parsen schlug fehl" + +#: midx.c:1132 msgid "Looking for referenced packfiles" msgstr "Suche nach referenzierten Pack-Dateien" -#: midx.c:1106 +#: midx.c:1147 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -4237,57 +5153,69 @@ msgstr "" "Ungรผltige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = " "fanout[%d]" -#: midx.c:1110 -msgid "Verifying OID order in MIDX" -msgstr "Verifiziere OID-Reihenfolge in MIDX" +#: midx.c:1152 +msgid "the midx contains no oid" +msgstr "das midx enthรคlt keine oid" + +#: midx.c:1161 +msgid "Verifying OID order in multi-pack-index" +msgstr "Verifiziere OID-Reihenfolge im multi-pack-index" -#: midx.c:1119 +#: midx.c:1170 #, 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:1138 +#: midx.c:1190 msgid "Sorting objects by packfile" msgstr "Sortiere Objekte nach Pack-Datei" -#: midx.c:1144 +#: midx.c:1197 msgid "Verifying object offsets" msgstr "รberprรผfe Objekt-Offsets" -#: midx.c:1160 +#: midx.c:1213 #, 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:1166 +#: midx.c:1219 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "Fehler beim Laden des Pack-Index fรผr Packdatei %s" -#: midx.c:1175 +#: midx.c:1228 #, 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:1350 +#: midx.c:1253 +msgid "Counting referenced objects" +msgstr "Referenzierte Objekte zรคhlen" + +#: midx.c:1263 +msgid "Finding and deleting unreferenced packfiles" +msgstr "Suchen und Lรถschen von unreferenzierten Pack-Dateien" + +#: midx.c:1454 msgid "could not start pack-objects" msgstr "Konnte 'pack-objects' nicht ausfรผhren" -#: midx.c:1369 +#: midx.c:1474 msgid "could not finish pack-objects" msgstr "Konnte 'pack-objects' nicht beenden" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "Kann lazy_dir Thread nicht erzeugen: %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "Kann lazy_name Thread nicht erzeugen: %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "Kann lazy_name Thread nicht beitreten: %s" @@ -4337,45 +5265,70 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "Ungรผltiger %s Wert: '%s'" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "Ungรผltiger Objekttyp \"%s\"" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "Objekt %s ist ein %s, kein %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "Objekt %s hat eine unbekannte Typ-Identifikation %d" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "Konnte Objekt '%s' nicht parsen." -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "Hash stimmt nicht mit %s รผberein." -#: packfile.c:648 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "Konnte Grรถรe von %s nicht bestimmen." + +#: packfile.c:630 msgid "offset before end of packfile (broken .idx?)" msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)" -#: packfile.c:1899 +#: packfile.c:1922 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "Offset vor Beginn des Pack-Index fรผr %s (beschรคdigter Index?)" -#: packfile.c:1903 +#: packfile.c:1926 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "Offset hinter Ende des Pack-Index fรผr %s (abgeschnittener Index?)" +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "Option `%s' erwartet einen numerischen Wert." + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "Fehlerhaftes Ablaufdatum '%s'" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "Option `%s' erwartet \"always\", \"auto\" oder \"never\"." + +#: parse-options-cb.c:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "fehlerhafter Objekt-Name '%s'" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4391,7 +5344,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:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "%s erwartet keinen Wert" @@ -4401,43 +5354,48 @@ msgstr "%s erwartet keinen Wert" msgid "%s isn't available" msgstr "%s ist nicht verfรผgbar." -#: parse-options.c:219 +#: parse-options.c:217 #, 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:389 +#: parse-options.c:386 #, 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:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, 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:859 +#: parse-options.c:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "Alias fรผr --%s" + +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "Unbekannte Option: `%s'" -#: parse-options.c:861 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "Unbekannter Schalter `%c'" -#: parse-options.c:863 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "Unbekannte nicht-Ascii Option in String: `%s'" -#: parse-options.c:887 +#: parse-options.c:890 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "Verwendung: %s" @@ -4445,74 +5403,49 @@ msgstr "Verwendung: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " oder: %s" -#: parse-options.c:915 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:957 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:968 -#, c-format -msgid "alias of --%s" -msgstr "Alias fรผr --%s" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "Option `%s' erwartet einen numerischen Wert." - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "Fehlerhaftes Ablaufdatum '%s'" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "Option `%s' erwartet \"always\", \"auto\" oder \"never\"." - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "fehlerhafter Objekt-Name '%s'" - -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "Konnte Gruppenschreibrecht fรผr %s nicht setzen." -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Es ist nur eine Angabe von 'attr:' erlaubt." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "Angabe von 'attr:' darf nicht leer sein" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "Ungรผltiger Attributname %s" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind " "inkompatibel." -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4520,99 +5453,108 @@ msgstr "" "Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n" "mit allen anderen Optionen." -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ungรผltiger Parameter fรผr Pfadspezifikationsangabe 'prefix'" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "ungรผltige Pfadspezifikationsangabe '%.*s' in '%s'" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "nicht unterstรผtzte Pfadspezifikationsangabe '%c' in '%s'" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' und 'glob' sind inkompatibel" -#: pathspec.c:440 +#: pathspec.c:445 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: '%s' liegt auรerhalb des Repositories" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: '%s' liegt auรerhalb des Repositories von '%s'" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (Kรผrzel: '%c')" -#: pathspec.c:524 +#: pathspec.c:531 #, 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:591 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknรผpfung" +#: pathspec.c:643 +#, 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." +msgstr "konnte Flush-Paket nicht schreiben" #: pkt-line.c:99 msgid "unable to write delim packet" -msgstr "Konnte Delim-Paket nicht schreiben." +msgstr "konnte Delim-Paket nicht schreiben" #: pkt-line.c:106 +msgid "unable to write stateless separator packet" +msgstr "konnte zustandsloses Separator-Paket nicht schreiben" + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "Flush beim Schreiben des Pakets fehlgeschlagen." -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "Protokollfehler: unmรถglich lange Zeile" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "Schreiben des Pakets mit Format fehlgeschlagen." -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "" "Schreiben des Pakets fehlgeschlagen - Daten รผberschreiten maximale Paketgrรถรe" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "Schreiben des Pakets fehlgeschlagen." -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "Lesefehler" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "Die Gegenseite hat unerwartet abgebrochen." -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "Protokollfehler: ungรผltiges Zeichen fรผr Zeilenlรคnge: %.4s" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "Protokollfehler: ungรผltige Zeilenlรคnge %d" -#: pkt-line.c:362 +#: pkt-line.c:373 sideband.c:150 #, c-format msgid "remote error: %s" msgstr "Fehler am anderen Ende: %s" @@ -4626,84 +5568,116 @@ msgstr "Aktualisiere Index" msgid "unable to create threaded lstat: %s" msgstr "Kann Thread fรผr lstat nicht erzeugen: %s" -#: pretty.c:966 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "Konnte --pretty Format nicht parsen." -#: range-diff.c:70 +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "Promisor-Remote: konnte Fetch-Subprozess nicht abspalten" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "Promisor-Remote: konnte nicht zum Fetch-Subprozess schreiben" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" +"Promisor-Remote: konnte Standard-Eingabe des Fetch-Subprozesses nicht " +"schlieรen" + +#: promisor-remote.c:53 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "Promisor-Remote-Name kann nicht mit '/' beginnen: %s" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "Lรถsche doppelte Objekte" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "Konnte `log` nicht starten." -#: range-diff.c:72 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "Konnte Ausgabe von `log` nicht lesen." -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:98 sequencer.c:5283 #, c-format msgid "could not parse commit '%s'" msgstr "Konnte Commit '%s' nicht parsen." -#: range-diff.c:117 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" +"konnte erste Zeile der Ausgabe von `log` nicht parsen: fรคngt nicht mit " +"'commit ' an: '%s'" + +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "Konnte Git-Header '%.*s' nicht parsen." -#: range-diff.c:274 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "Fehler beim Generieren des Diffs." -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "Konnte Log fรผr '%s' nicht parsen." -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" "Dateialias '%s' wird nicht hinzugefรผgt ('%s' existiert bereits im Index)." -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "Kann keinen leeren Blob in die Objektdatenbank schreiben." -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: Kann nur regulรคre Dateien, symbolische Links oder Git-Verzeichnisse " "hinzufรผgen." -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' hat keinen Commit ausgecheckt" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "Konnte Datei '%s' nicht indizieren." -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "Konnte '%s' nicht dem Index hinzufรผgen." -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "Konnte '%s' nicht lesen." -#: read-cache.c:1314 +#: read-cache.c:1318 #, 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:1499 +#: read-cache.c:1524 msgid "Refresh index" msgstr "Aktualisiere Index" -#: read-cache.c:1613 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4712,7 +5686,7 @@ msgstr "" "index.version gesetzt, aber Wert ungรผltig.\n" "Verwende Version %i" -#: read-cache.c:1623 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4721,143 +5695,154 @@ msgstr "" "GIT_INDEX_VERSION gesetzt, aber Wert ungรผltig.\n" "Verwende Version %i" -#: read-cache.c:1679 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "Ungรผltige Signatur 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "Ungรผltige Index-Version %d" -#: read-cache.c:1691 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "Ungรผltige SHA1-Signatur der Index-Datei." -#: read-cache.c:1721 +#: read-cache.c:1747 #, 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:1723 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "Ignoriere Erweiterung %.4s" -#: read-cache.c:1760 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "Unbekanntes Format fรผr Index-Eintrag 0x%08x" -#: read-cache.c:1776 +#: read-cache.c:1802 #, 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:1833 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "Ungeordnete Stage-Eintrรคge im Index." -#: read-cache.c:1836 +#: read-cache.c:1862 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "Mehrere Stage-Eintrรคge fรผr zusammengefรผhrte Datei '%s'." -#: read-cache.c:1839 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "Ungeordnete Stage-Eintrรคge fรผr '%s'." -#: 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 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "Index-Datei beschรคdigt" -#: read-cache.c:2087 +#: read-cache.c:2115 #, 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:2100 +#: read-cache.c:2128 #, 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:2133 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "%s: รffnen der Index-Datei fehlgeschlagen." -#: read-cache.c:2137 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: Kann geรถffneten Index nicht lesen." -#: read-cache.c:2141 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: Index-Datei ist kleiner als erwartet." -#: read-cache.c:2145 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "%s: Konnte Index-Datei nicht einlesen." -#: read-cache.c:2187 +#: read-cache.c:2215 #, 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:2214 +#: read-cache.c:2242 #, 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:2246 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "Konnte geteilten Index '%s' nicht aktualisieren." -#: read-cache.c:2293 +#: read-cache.c:2321 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s." -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 #, c-format msgid "could not close '%s'" msgstr "Konnte '%s' nicht schlieรen." -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 #, c-format msgid "could not stat '%s'" msgstr "Konnte '%s' nicht lesen." -#: read-cache.c:3105 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "konnte Git-Verzeichnis nicht รถffnen: %s" -#: read-cache.c:3117 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "Konnte '%s' nicht entfernen." -#: read-cache.c:3142 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." -#: read-cache.c:3291 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: Kann nicht auf Stufe #0 wechseln." -#: rebase-interactive.c:26 +#: 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 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." @@ -4865,7 +5850,7 @@ msgstr "" "Nicht erkannte Einstellung %s fรผr Option rebase.missingCommitsCheck. " "Ignoriere." -#: rebase-interactive.c:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -4910,14 +5895,14 @@ msgstr "" "Diese Zeilen kรถnnen umsortiert werden; Sie werden von oben nach unten\n" "ausgefรผhrt.\n" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, 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:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4926,7 +5911,7 @@ msgstr "" "Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n" "entfernen.\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4934,7 +5919,7 @@ msgstr "" "\n" "Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4948,7 +5933,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4958,22 +5943,19 @@ msgstr "" "Wenn Sie jedoch alles lรถschen, wird der Rebase abgebrochen.\n" "\n" -#: 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 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 #, c-format msgid "could not write '%s'" msgstr "Konnte '%s' nicht schreiben." -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "Konnte '%s' nicht nach '%s' kopieren." +msgid "could not write '%s'." +msgstr "Konnte '%s' nicht schreiben." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -4982,7 +5964,7 @@ msgstr "" "Warnung: Einige Commits kรถnnten aus Versehen entfernt worden sein.\n" "Entfernte Commits (neu zu alt):\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -4999,126 +5981,14 @@ msgstr "" "Warnungen zu รคndern.\n" "Die mรถglichen Verhaltensweisen sind: ignore, warn, error.\n" -#: refs.c:262 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 #, c-format -msgid "%s does not point to a valid object!" -msgstr "%s zeigt auf kein gรผltiges Objekt!" - -#: refs.c:667 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "Ignoriere unreferenzierte symbolische Referenz %s" - -#: refs.c:669 ref-filter.c:2092 -#, c-format -msgid "ignoring broken ref %s" -msgstr "Ignoriere fehlerhafte Referenz %s" - -#: refs.c:804 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "Konnte '%s' nicht zum Schreiben รถffnen: %s" - -#: refs.c:814 refs.c:865 -#, c-format -msgid "could not read ref '%s'" -msgstr "Konnte Referenz '%s' nicht lesen." - -#: refs.c:820 -#, c-format -msgid "ref '%s' already exists" -msgstr "Referenz '%s' existiert bereits." - -#: refs.c:825 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "Unerwartete Objekt-ID beim Schreiben von '%s'." - -#: 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 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." - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "Unerwartete Objekt-ID beim Lรถschen von '%s'." - -#: refs.c:998 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "Log fรผr Referenz %s hat eine Lรผcke nach %s." - -#: refs.c:1004 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "Log fรผr Referenz %s unerwartet bei %s beendet." - -#: refs.c:1063 -#, c-format -msgid "log for %s is empty" -msgstr "Log fรผr %s ist leer." - -#: refs.c:1155 -#, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "Verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'." - -#: refs.c:1231 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "update_ref fรผr Referenz '%s' fehlgeschlagen: %s" - -#: refs.c:2012 -#, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "Mehrere Aktualisierungen fรผr Referenz '%s' nicht erlaubt." - -#: refs.c:2044 -msgid "ref updates forbidden inside quarantine environment" -msgstr "" -"Aktualisierungen von Referenzen ist innerhalb der Quarantรคne-Umgebung " -"verboten." - -#: refs.c:2140 refs.c:2170 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "'%s' existiert; kann '%s' nicht erstellen" - -#: 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:1234 -#, c-format -msgid "could not remove reference %s" -msgstr "Konnte Referenz %s nicht lรถschen" - -#: 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:1251 refs/packed-backend.c:1545 -#, c-format -msgid "could not delete references: %s" -msgstr "Konnte Referenzen nicht entfernen: %s" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "Ungรผltige Refspec '%s'" +msgid "could not read '%s'." +msgstr "Konnte '%s' nicht lesen." -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "entfernt" @@ -5137,283 +6007,374 @@ msgstr "%d hinterher" msgid "ahead %d, behind %d" msgstr "%d voraus, %d hinterher" -#: ref-filter.c:162 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "Erwartetes Format: %%(color:<Farbe>)" -#: ref-filter.c:164 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "nicht erkannte Farbe: %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Positiver Wert erwartet refname:lstrip=%s" -#: ref-filter.c:190 +#: ref-filter.c:197 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Positiver Wert erwartet refname:rstrip=%s" -#: ref-filter.c:192 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "nicht erkanntes %%(%s) Argument: %s" -#: ref-filter.c:247 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) akzeptiert keine Argumente" -#: ref-filter.c:269 +#: ref-filter.c:276 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "nicht erkanntes %%(objectsize) Argument: %s" -#: ref-filter.c:277 +#: ref-filter.c:284 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) akzeptiert keine Argumente" -#: ref-filter.c:289 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) akzeptiert keine Argumente" -#: ref-filter.c:298 +#: ref-filter.c:309 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) akzeptiert keine Argumente" +msgid "unrecognized %%(subject) argument: %s" +msgstr "nicht erkanntes %%(subject) Argument: %s" -#: ref-filter.c:320 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "unbekanntes %%(trailers) Argument: %s" -#: ref-filter.c:349 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "Positiver Wert erwartet contents:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "nicht erkanntes %%(contents) Argument: %s" -#: ref-filter.c:366 +#: ref-filter.c:380 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "Positiver Wert erwartet objectname:short=%s" +msgid "positive value expected '%s' in %%(%s)" +msgstr "positiver Wert erwartet '%s' in %%(%s)" -#: ref-filter.c:370 +#: ref-filter.c:384 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "nicht erkanntes %%(objectname) Argument: %s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "nicht erkanntes Argument '%s' in %%(%s)" -#: ref-filter.c:400 +#: ref-filter.c:398 +#, c-format +msgid "unrecognized email option: %s" +msgstr "nicht erkannte E-Mail Option: %s" + +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" -msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)" +msgstr "erwartetes Format: %%(align:<Breite>,<Position>)" -#: ref-filter.c:412 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "nicht erkannte Position:%s" -#: ref-filter.c:419 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "nicht erkannte Breite:%s" -#: ref-filter.c:428 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "nicht erkanntes %%(align) Argument: %s" -#: ref-filter.c:436 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "Positive Breitenangabe fรผr %%(align) erwartet" -#: ref-filter.c:454 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "nicht erkanntes %%(if) Argument: %s" -#: ref-filter.c:556 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "Fehlerhafter Feldname: %.*s" -#: ref-filter.c:583 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "Unbekannter Feldname: %.*s" -#: ref-filter.c:587 +#: ref-filter.c:615 #, 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:711 +#: ref-filter.c:739 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:774 +#: ref-filter.c:802 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:776 +#: ref-filter.c:804 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: %%(then) Atom mehr als einmal verwendet" -#: ref-filter.c:778 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: %%(then) Atom nach %%(else) verwendet" -#: ref-filter.c:806 +#: ref-filter.c:834 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:808 +#: ref-filter.c:836 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:810 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used more than once" msgstr "Format: %%(end) Atom mehr als einmal verwendet" -#: ref-filter.c:825 +#: ref-filter.c:853 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "Format: %%(end) Atom ohne zugehรถriges Atom verwendet" -#: ref-filter.c:882 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "Fehlerhafter Formatierungsstring %s" -#: ref-filter.c:1485 +#: ref-filter.c:1541 #, c-format msgid "no branch, rebasing %s" msgstr "kein Branch, Rebase von %s" -#: ref-filter.c:1488 +#: ref-filter.c:1544 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "kein Branch, Rebase von losgelรถstem HEAD %s" -#: ref-filter.c:1491 +#: ref-filter.c:1547 #, c-format msgid "no branch, bisect started on %s" msgstr "kein Branch, binรคre Suche begonnen bei %s" -#: ref-filter.c:1501 +#: ref-filter.c:1557 msgid "no branch" msgstr "kein Branch" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1591 ref-filter.c:1800 #, c-format msgid "missing object %s for %s" msgstr "Objekt %s fehlt fรผr %s" -#: ref-filter.c:1547 +#: ref-filter.c:1601 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer bei %s fรผr %s fehlgeschlagen" -#: ref-filter.c:1998 +#: ref-filter.c:2054 #, c-format msgid "malformed object at '%s'" msgstr "fehlerhaftes Objekt bei '%s'" -#: ref-filter.c:2087 +#: ref-filter.c:2143 #, c-format msgid "ignoring ref with broken name %s" msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s" -#: ref-filter.c:2382 +#: ref-filter.c:2148 refs.c:657 +#, c-format +msgid "ignoring broken ref %s" +msgstr "Ignoriere fehlerhafte Referenz %s" + +#: ref-filter.c:2464 #, c-format msgid "format: %%(end) atom missing" msgstr "Format: %%(end) Atom fehlt" -#: ref-filter.c:2482 +#: ref-filter.c:2563 #, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "Die Option `%s' ist inkompatibel mit --merged." +msgid "malformed object name %s" +msgstr "missgebildeter Objektname %s" -#: ref-filter.c:2485 +#: ref-filter.c:2568 #, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "Die Option `%s' ist inkompatibel mit --no-merged." +msgid "option `%s' must point to a commit" +msgstr "die Option `%s' muss auf einen Commit zeigen" -#: ref-filter.c:2495 +#: refs.c:264 #, c-format -msgid "malformed object name %s" -msgstr "Missgebildeter Objektname %s" +msgid "%s does not point to a valid object!" +msgstr "%s zeigt auf kein gรผltiges Objekt!" -#: ref-filter.c:2500 +#: refs.c:572 #, c-format -msgid "option `%s' must point to a commit" -msgstr "Die Option `%s' muss auf einen Commit zeigen." +msgid "could not retrieve `%s`" +msgstr "konnte `%s` nicht abrufen" + +#: refs.c:579 +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "ungรผltiger Branchname: %s = %s" + +#: refs.c:655 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "Ignoriere unreferenzierte symbolische Referenz %s" + +#: refs.c:892 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "Log fรผr Referenz %s hat eine Lรผcke nach %s." + +#: refs.c:898 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "Log fรผr Referenz %s unerwartet bei %s beendet." + +#: refs.c:957 +#, c-format +msgid "log for %s is empty" +msgstr "Log fรผr %s ist leer." + +#: refs.c:1049 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'" + +#: refs.c:1120 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "update_ref fรผr Referenz '%s' fehlgeschlagen: %s" + +#: refs.c:1944 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "mehrere Aktualisierungen fรผr Referenz '%s' nicht erlaubt" + +#: refs.c:2024 +msgid "ref updates forbidden inside quarantine environment" +msgstr "" +"Aktualisierungen von Referenzen ist innerhalb der Quarantรคne-Umgebung " +"verboten" + +#: refs.c:2035 +msgid "ref updates aborted by hook" +msgstr "Aktualisierungen von Referenzen durch Hook abgebrochen" + +#: refs.c:2135 refs.c:2165 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "'%s' existiert; kann '%s' nicht erstellen" + +#: refs.c:2141 refs.c:2176 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "kann '%s' und '%s' nicht zur selben Zeit verarbeiten" -#: remote.c:363 +#: refs/files-backend.c:1228 +#, c-format +msgid "could not remove reference %s" +msgstr "konnte Referenz %s nicht lรถschen" + +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "konnte Referenz %s nicht entfernen: %s" + +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#, c-format +msgid "could not delete references: %s" +msgstr "konnte Referenzen nicht entfernen: %s" + +#: refspec.c:167 +#, c-format +msgid "invalid refspec '%s'" +msgstr "ungรผltige Refspec '%s'" + +#: remote.c:351 #, 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:410 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "Mehr als ein receivepack-Befehl angegeben, benutze den ersten." -#: remote.c:418 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "Mehr als ein uploadpack-Befehl angegeben, benutze den ersten." -#: remote.c:608 +#: remote.c:590 #, 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:612 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s folgt รผblicherweise %s, nicht %s" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s folgt sowohl %s als auch %s" -#: remote.c:684 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "Schlรผssel '%s' des Musters hatte kein '*'." -#: remote.c:694 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "Wert '%s' des Musters hat kein '*'." -#: remote.c:1000 +#: remote.c:1073 #, c-format msgid "src refspec %s does not match any" msgstr "Src-Refspec %s entspricht keiner Referenz." -#: remote.c:1005 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "Src-Refspec %s entspricht mehr als einer Referenz." @@ -5422,7 +6383,7 @@ msgstr "Src-Refspec %s entspricht mehr als einer Referenz." #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5449,7 +6410,7 @@ msgstr "" "Keines hat funktioniert, sodass wir aufgegeben haben. Sie mรผssen die\n" "Referenz mit vollqualifizierten Namen angeben." -#: remote.c:1040 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5460,7 +6421,7 @@ msgstr "" "Meinten Sie, einen neuen Branch mittels Push nach\n" "'%s:refs/heads/%s' zu erstellen?" -#: remote.c:1045 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5471,7 +6432,7 @@ msgstr "" "Meinten Sie, einen neuen Tag mittels Push nach\n" "'%s:refs/tags/%s' zu erstellen?" -#: remote.c:1050 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5482,7 +6443,7 @@ msgstr "" "Meinten Sie, einen Tag fรผr ein neues Tree-Objekt\n" "mittels Push nach '%s:refs/tags/'%s' zu erstellen?" -#: remote.c:1055 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5493,117 +6454,117 @@ msgstr "" "Meinten Sie, einen Tag fรผr ein neues Blob-Objekt\n" "mittels Push nach '%s:refs/tags/%s' zu erstellen?" -#: remote.c:1091 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s kann nicht zu Branch aufgelรถst werden." -#: remote.c:1102 +#: remote.c:1175 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "Konnte '%s' nicht lรถschen: Remote-Referenz existiert nicht." -#: remote.c:1114 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "Dst-Refspec %s entspricht mehr als einer Referenz." -#: remote.c:1121 +#: remote.c:1194 #, 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:1624 remote.c:1725 +#: remote.c:1703 remote.c:1804 msgid "HEAD does not point to a branch" msgstr "HEAD zeigt auf keinen Branch" -#: remote.c:1633 +#: remote.c:1712 #, c-format msgid "no such branch: '%s'" msgstr "Kein solcher Branch: '%s'" -#: remote.c:1636 +#: remote.c:1715 #, c-format msgid "no upstream configured for branch '%s'" msgstr "Kein Upstream-Branch fรผr Branch '%s' konfiguriert." -#: remote.c:1642 +#: remote.c:1721 #, 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:1657 +#: remote.c:1736 #, 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:1669 +#: remote.c:1748 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: remote.c:1679 +#: remote.c:1758 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "Push-Refspecs fรผr '%s' beinhalten nicht '%s'" -#: remote.c:1692 +#: remote.c:1771 msgid "push has no destination (push.default is 'nothing')" msgstr "kein Ziel fรผr \"push\" (push.default ist 'nothing')" -#: remote.c:1714 +#: remote.c:1793 msgid "cannot resolve 'simple' push to a single destination" msgstr "kann einzelnes Ziel fรผr \"push\" im Modus 'simple' nicht auflรถsen" -#: remote.c:1840 +#: remote.c:1922 #, c-format msgid "couldn't find remote ref %s" msgstr "Konnte Remote-Referenz %s nicht finden." -#: remote.c:1853 +#: remote.c:1935 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignoriere sonderbare Referenz '%s' lokal" -#: remote.c:2016 +#: remote.c:2098 #, 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:2020 +#: remote.c:2102 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" -#: remote.c:2023 +#: remote.c:2105 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n" -#: remote.c:2027 +#: remote.c:2109 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n" -#: remote.c:2030 +#: remote.c:2112 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (benutzen Sie \"%s\" fรผr Details)\n" -#: remote.c:2034 +#: remote.c:2116 #, 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:2040 +#: remote.c:2122 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" -#: remote.c:2043 +#: remote.c:2125 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5613,12 +6574,12 @@ msgstr[0] "" msgstr[1] "" "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n" -#: remote.c:2051 +#: remote.c:2133 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n" -#: remote.c:2054 +#: remote.c:2136 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5633,13 +6594,13 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -#: remote.c:2064 +#: remote.c:2146 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:2247 +#: remote.c:2337 #, c-format msgid "cannot parse expected object name '%s'" msgstr "Kann erwarteten Objektnamen '%s' nicht parsen." @@ -5654,7 +6615,7 @@ msgstr "ungรผltiger Name fรผr ersetzende Referenz: %s" msgid "duplicate replace ref: %s" msgstr "doppelte ersetzende Referenz: %s" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "Ersetzungstiefe zu hoch fรผr Objekt %s" @@ -5717,8 +6678,8 @@ msgstr "Kann '%s' nicht lรถschen." msgid "Recorded preimage for '%s'" msgstr "Preimage fรผr '%s' aufgezeichnet." -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." @@ -5752,20 +6713,34 @@ 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:2507 +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "Konnte HEAD-Commit nicht bestimmen." + +#: reset.c:70 reset.c:76 sequencer.c:3426 +#, c-format +msgid "failed to find tree of %s" +msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." + +#: revision.c:2344 +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<Pack-Datei> wird nicht lรคnger unterstรผtzt" + +#: revision.c:2364 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "unbekannter Wert fรผr --diff-merges: %s" + +#: revision.c:2702 msgid "your current branch appears to be broken" msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein." -#: revision.c:2510 +#: revision.c:2705 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Ihr aktueller Branch '%s' hat noch keine Commits." -#: revision.c:2710 -msgid "--first-parent is incompatible with --bisect" -msgstr "Die Optionen --first-parent und --bisect sind inkompatibel." - -#: revision.c:2714 +#: revision.c:2915 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" @@ -5773,12 +6748,12 @@ msgstr "-L unterstรผtzt noch keine anderen Diff-Formate auรer -p und -s" msgid "open /dev/null failed" msgstr "รffnen von /dev/null fehlgeschlagen" -#: run-command.c:1269 +#: run-command.c:1270 #, c-format msgid "cannot create async thread: %s" msgstr "Konnte Thread fรผr async nicht erzeugen: %s" -#: run-command.c:1333 +#: run-command.c:1334 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5788,30 +6763,35 @@ msgstr "" "Sie kรถnnen diese Warnung mit `git config advice.ignoredHook false` " "deaktivieren." -#: send-pack.c:141 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status." -#: send-pack.c:143 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s" -#: send-pack.c:145 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s" -#: send-pack.c:306 +#: send-pack.c:372 msgid "failed to sign the push certificate" msgstr "Fehler beim Signieren des \"push\"-Zertifikates" -#: send-pack.c:420 +#: send-pack.c:460 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "" +"die Gegenseite unterstรผtzt nicht den Hash-Algorithmus dieses Repositories" + +#: send-pack.c:469 msgid "the receiving end does not support --signed push" msgstr "" "die Gegenseite unterstรผtzt keinen signierten Versand (\"--signed push\")" -#: send-pack.c:422 +#: send-pack.c:471 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5819,47 +6799,47 @@ msgstr "" "kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n" "Versand (\"--signed push\") unterstรผtzt" -#: send-pack.c:434 +#: send-pack.c:483 msgid "the receiving end does not support --atomic push" msgstr "die Gegenseite unterstรผtzt keinen atomaren Versand (\"--atomic push\")" -#: send-pack.c:439 +#: send-pack.c:488 msgid "the receiving end does not support push options" msgstr "die Gegenseite unterstรผtzt keine Push-Optionen" -#: sequencer.c:187 +#: sequencer.c:194 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "Ungรผltiger \"cleanup\"-Modus '%s' fรผr Commit-Beschreibungen." -#: sequencer.c:292 +#: sequencer.c:308 #, c-format msgid "could not delete '%s'" msgstr "Konnte '%s' nicht lรถschen." -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "Konnte '%s' nicht lรถschen" -#: sequencer.c:321 +#: sequencer.c:339 msgid "revert" msgstr "Revert" -#: sequencer.c:323 +#: sequencer.c:341 msgid "cherry-pick" msgstr "Cherry-Pick" -#: sequencer.c:325 -msgid "rebase -i" -msgstr "interaktives Rebase" +#: sequencer.c:343 +msgid "rebase" +msgstr "Rebase" -#: sequencer.c:327 +#: sequencer.c:345 #, c-format msgid "unknown action: %d" msgstr "Unbekannte Aktion: %d" -#: sequencer.c:385 +#: sequencer.c:404 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5867,7 +6847,7 @@ msgstr "" "nach Auflรถsung der Konflikte markieren Sie die korrigierten Pfade\n" "mit 'git add <Pfade>' oder 'git rm <Pfade>'" -#: sequencer.c:388 +#: sequencer.c:407 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5877,116 +6857,110 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:420 sequencer.c:3028 #, c-format msgid "could not lock '%s'" msgstr "Konnte '%s' nicht sperren" -#: sequencer.c:408 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "Konnte nicht nach '%s' schreiben." + +#: sequencer.c:427 #, c-format msgid "could not write eol to '%s'" msgstr "Konnte EOL nicht nach '%s' schreiben." -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 #, c-format msgid "failed to finalize '%s'" msgstr "Fehler beim Fertigstellen von '%s'." -#: 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:462 +#: sequencer.c:471 #, c-format msgid "your local changes would be overwritten by %s." msgstr "Ihre lokalen รnderungen wรผrden durch den %s รผberschrieben werden." -#: sequencer.c:466 +#: sequencer.c:475 msgid "commit your changes or stash them to proceed." msgstr "" "Committen Sie Ihre รnderungen oder benutzen Sie \"stash\", um fortzufahren." -#: sequencer.c:498 +#: sequencer.c:507 #, c-format msgid "%s: fast-forward" msgstr "%s: Vorspulen" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:546 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungรผltiger \"cleanup\" Modus %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:632 +#: sequencer.c:640 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Konnte neue Index-Datei nicht schreiben" -#: sequencer.c:649 +#: sequencer.c:657 msgid "unable to update cache tree" msgstr "Konnte Cache-Verzeichnis nicht aktualisieren." -#: sequencer.c:663 +#: sequencer.c:671 msgid "could not resolve HEAD commit" msgstr "Konnte HEAD-Commit nicht auflรถsen." -#: sequencer.c:743 +#: sequencer.c:751 #, c-format msgid "no key present in '%.*s'" msgstr "Kein Schlรผssel in '%.*s' vorhanden." -#: sequencer.c:754 +#: sequencer.c:762 #, c-format msgid "unable to dequote value of '%s'" msgstr "Konnte Anfรผhrungszeichen von '%s' nicht entfernen." -#: 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 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen รถffnen." -#: sequencer.c:801 +#: sequencer.c:809 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' bereits angegeben." -#: sequencer.c:806 +#: sequencer.c:814 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben." -#: sequencer.c:811 +#: sequencer.c:819 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' bereits angegeben." -#: sequencer.c:815 +#: sequencer.c:823 #, c-format msgid "unknown variable '%s'" msgstr "Unbekannte Variable '%s'" -#: sequencer.c:820 +#: sequencer.c:828 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' fehlt." -#: sequencer.c:822 +#: sequencer.c:830 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' fehlt." -#: sequencer.c:824 +#: sequencer.c:832 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' fehlt." -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "Ungรผltiges Datumsformat '%s' in '%s'" - -#: sequencer.c:901 +#: sequencer.c:897 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6017,15 +6991,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "Root-Commit schreiben" - -#: sequencer.c:1216 +#: sequencer.c:1178 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' Hook fehlgeschlagen." -#: sequencer.c:1223 +#: sequencer.c:1184 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6053,7 +7023,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1197 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6079,327 +7049,340 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1239 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: sequencer.c:1280 +#: sequencer.c:1241 msgid "could not parse newly created commit" msgstr "Konnte neu erstellten Commit nicht analysieren." -#: sequencer.c:1326 +#: sequencer.c:1287 msgid "unable to resolve HEAD after creating commit" msgstr "Konnte HEAD nicht auflรถsen, nachdem der Commit erstellt wurde." -#: sequencer.c:1328 +#: sequencer.c:1289 msgid "detached HEAD" msgstr "losgelรถster HEAD" -#: sequencer.c:1332 +#: sequencer.c:1293 msgid " (root-commit)" msgstr " (Root-Commit)" -#: sequencer.c:1353 +#: sequencer.c:1314 msgid "could not parse HEAD" msgstr "Konnte HEAD nicht parsen." -#: sequencer.c:1355 +#: sequencer.c:1316 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s ist kein Commit!" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1373 sequencer.c:2067 msgid "unable to parse commit author" msgstr "Konnte Commit-Autor nicht parsen." -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1417 sequencer.c:1535 #, c-format msgid "unable to read commit message from '%s'" msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen." -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1446 sequencer.c:1478 +#, c-format +msgid "invalid author identity '%s'" +msgstr "ungรผltige Autor-Identitรคt '%s'" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "unbrauchbarer Autor: Datumsinformationen fehlen" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: sequencer.c:1526 +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "Konnte %s nicht aktualisieren." + +#: sequencer.c:1567 #, c-format msgid "could not parse commit %s" msgstr "Konnte Commit %s nicht parsen." -#: sequencer.c:1531 +#: sequencer.c:1572 #, c-format msgid "could not parse parent commit %s" msgstr "Konnte Eltern-Commit %s nicht parsen." -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1655 sequencer.c:1766 #, c-format msgid "unknown command: %d" msgstr "Unbekannter Befehl: %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1713 sequencer.c:1738 #, c-format msgid "This is a combination of %d commits." msgstr "Das ist eine Kombination aus %d Commits." -#: sequencer.c:1672 +#: sequencer.c:1723 msgid "need a HEAD to fixup" msgstr "benรถtige HEAD fรผr fixup" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1725 sequencer.c:3338 msgid "could not read HEAD" msgstr "Konnte HEAD nicht lesen" -#: sequencer.c:1676 +#: sequencer.c:1727 msgid "could not read HEAD's commit message" msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen" -#: sequencer.c:1682 +#: sequencer.c:1733 #, c-format msgid "cannot write '%s'" msgstr "kann '%s' nicht schreiben" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Das ist die erste Commit-Beschreibung:" -#: sequencer.c:1697 +#: sequencer.c:1748 #, c-format msgid "could not read commit message of %s" msgstr "Konnte Commit-Beschreibung von %s nicht lesen." -#: sequencer.c:1704 +#: sequencer.c:1755 #, c-format msgid "This is the commit message #%d:" msgstr "Das ist Commit-Beschreibung #%d:" -#: sequencer.c:1710 +#: sequencer.c:1761 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Die Commit-Beschreibung #%d wird ausgelassen:" -#: sequencer.c:1798 +#: sequencer.c:1849 msgid "your index file is unmerged." msgstr "Ihre Index-Datei ist nicht zusammengefรผhrt." -#: sequencer.c:1805 +#: sequencer.c:1856 msgid "cannot fixup root commit" msgstr "kann fixup nicht auf Root-Commit anwenden" -#: sequencer.c:1824 +#: sequencer.c:1875 #, 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:1832 sequencer.c:1840 +#: sequencer.c:1883 sequencer.c:1891 #, c-format msgid "commit %s does not have parent %d" msgstr "Commit %s hat keinen Eltern-Commit %d" -#: sequencer.c:1846 +#: sequencer.c:1897 #, 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:1865 +#: sequencer.c:1916 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Eltern-Commit %s nicht parsen" -#: sequencer.c:1930 +#: sequencer.c:1981 #, c-format msgid "could not rename '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' umbenennen." -#: sequencer.c:1985 +#: sequencer.c:2038 #, c-format msgid "could not revert %s... %s" msgstr "Konnte \"revert\" nicht auf %s... (%s) ausfรผhren" -#: sequencer.c:1986 +#: sequencer.c:2039 #, c-format msgid "could not apply %s... %s" msgstr "Konnte %s... (%s) nicht anwenden" -#: sequencer.c:2045 +#: sequencer.c:2059 +#, 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:2117 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen des Index" -#: sequencer.c:2052 +#: sequencer.c:2124 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren des Index" -#: sequencer.c:2128 +#: sequencer.c:2201 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s akzeptiert keine Argumente: '%s'" -#: sequencer.c:2137 +#: sequencer.c:2210 #, c-format msgid "missing arguments for %s" msgstr "Fehlende Argumente fรผr %s." -#: sequencer.c:2174 +#: sequencer.c:2241 #, c-format -msgid "could not parse '%.*s'" -msgstr "Konnte '%.*s' nicht parsen." +msgid "could not parse '%s'" +msgstr "Konnte '%s' nicht parsen." -#: sequencer.c:2228 +#: sequencer.c:2302 #, c-format msgid "invalid line %d: %.*s" msgstr "Ungรผltige Zeile %d: %.*s" -#: sequencer.c:2239 +#: sequencer.c:2313 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Kann '%s' nicht ohne vorherigen Commit ausfรผhren" -#: 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 +#: sequencer.c:2399 msgid "cancelling a cherry picking in progress" msgstr "Abbrechen eines laufenden \"cherry-pick\"" -#: sequencer.c:2330 +#: sequencer.c:2408 msgid "cancelling a revert in progress" msgstr "Abbrechen eines laufenden \"revert\"" -#: sequencer.c:2364 +#: sequencer.c:2452 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausfรผhren." -#: sequencer.c:2366 +#: sequencer.c:2454 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "Unbenutzbares Instruktionsblatt: '%s'" -#: sequencer.c:2371 +#: sequencer.c:2459 msgid "no commits parsed." msgstr "Keine Commits geparst." -#: sequencer.c:2382 +#: sequencer.c:2470 msgid "cannot cherry-pick during a revert." msgstr "Kann Cherry-Pick nicht wรคhrend eines Reverts ausfรผhren." -#: sequencer.c:2384 +#: sequencer.c:2472 msgid "cannot revert during a cherry-pick." msgstr "Kann Revert nicht wรคhrend eines Cherry-Picks ausfรผhren." -#: sequencer.c:2466 +#: sequencer.c:2550 #, c-format msgid "invalid value for %s: %s" msgstr "Ungรผltiger Wert fรผr %s: %s" -#: sequencer.c:2553 +#: sequencer.c:2657 msgid "unusable squash-onto" msgstr "Unbenutzbares squash-onto." -#: sequencer.c:2569 +#: sequencer.c:2677 #, c-format msgid "malformed options sheet: '%s'" msgstr "Fehlerhaftes Optionsblatt: '%s'" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2769 sequencer.c:4609 msgid "empty commit set passed" msgstr "leere Menge von Commits รผbergeben" -#: sequencer.c:2668 +#: sequencer.c:2786 msgid "revert is already in progress" msgstr "\"revert\" ist bereits im Gange" -#: sequencer.c:2670 +#: sequencer.c:2788 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "Versuchen Sie \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2673 +#: sequencer.c:2791 msgid "cherry-pick is already in progress" msgstr "\"cherry-pick\" wird bereits durchgefรผhrt" -#: sequencer.c:2675 +#: sequencer.c:2793 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "Versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2689 +#: sequencer.c:2807 #, c-format msgid "could not create sequencer directory '%s'" msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen." -#: sequencer.c:2704 +#: sequencer.c:2822 msgid "could not lock HEAD" msgstr "Konnte HEAD nicht sperren" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2882 sequencer.c:4325 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gange" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2884 sequencer.c:2895 msgid "cannot resolve HEAD" msgstr "kann HEAD nicht auflรถsen" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2886 sequencer.c:2930 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:2798 builtin/grep.c:734 +#: sequencer.c:2916 builtin/grep.c:745 #, c-format msgid "cannot open '%s'" msgstr "kann '%s' nicht รถffnen" -#: sequencer.c:2800 +#: sequencer.c:2918 #, c-format msgid "cannot read '%s': %s" msgstr "Kann '%s' nicht lesen: %s" -#: sequencer.c:2801 +#: sequencer.c:2919 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:2807 +#: sequencer.c:2925 #, 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:2818 +#: sequencer.c:2936 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:2859 +#: sequencer.c:2977 msgid "no revert in progress" msgstr "Kein Revert im Gange" -#: sequencer.c:2867 +#: sequencer.c:2986 msgid "no cherry-pick in progress" msgstr "kein \"cherry-pick\" im Gange" -#: sequencer.c:2877 +#: sequencer.c:2996 msgid "failed to skip the commit" msgstr "รberspringen des Commits fehlgeschlagen" -#: sequencer.c:2884 +#: sequencer.c:3003 msgid "there is nothing to skip" msgstr "Nichts zum รberspringen vorhanden" -#: sequencer.c:2887 +#: sequencer.c:3006 #, c-format msgid "" "have you committed already?\n" @@ -6408,21 +7391,16 @@ msgstr "" "Haben Sie bereits committet?\n" "Versuchen Sie \"git %s --continue\"" -#: sequencer.c:3011 sequencer.c:4015 -#, c-format -msgid "could not update %s" -msgstr "Konnte %s nicht aktualisieren." - -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3168 sequencer.c:4217 msgid "cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: sequencer.c:3066 +#: sequencer.c:3185 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: sequencer.c:3074 +#: sequencer.c:3193 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6441,27 +7419,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3203 #, c-format msgid "Could not apply %s... %.*s" msgstr "Konnte %s... (%.*s) nicht anwenden" -#: sequencer.c:3091 +#: sequencer.c:3210 #, c-format msgid "Could not merge %.*s" msgstr "Konnte \"%.*s\" nicht zusammenfรผhren." -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: 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:3240 +#, c-format +msgid "Executing: %s\n" +msgstr "Fรผhre aus: %s\n" -#: sequencer.c:3136 +#: sequencer.c:3255 #, c-format msgid "" "execution failed: %s\n" @@ -6477,11 +7455,11 @@ msgstr "" "\n" "ausfรผhren.\n" -#: sequencer.c:3142 +#: sequencer.c:3261 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:3148 +#: sequencer.c:3267 #, c-format msgid "" "execution succeeded: %s\n" @@ -6499,112 +7477,129 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3328 #, c-format msgid "illegal label name: '%.*s'" msgstr "Unerlaubter Beschriftungsname: '%.*s'" -#: sequencer.c:3263 +#: sequencer.c:3382 msgid "writing fake root commit" msgstr "unechten Root-Commit schreiben" -#: sequencer.c:3268 +#: sequencer.c:3387 msgid "writing squash-onto" msgstr "squash-onto schreiben" -#: 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:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "Konnte Index nicht schreiben." - -#: sequencer.c:3351 +#: sequencer.c:3471 #, c-format msgid "could not resolve '%s'" msgstr "Konnte '%s' nicht auflรถsen." -#: sequencer.c:3379 +#: sequencer.c:3502 msgid "cannot merge without a current revision" msgstr "Kann nicht ohne einen aktuellen Commit mergen." -#: sequencer.c:3401 +#: sequencer.c:3524 #, c-format msgid "unable to parse '%.*s'" msgstr "Konnte '%.*s' nicht parsen." -#: sequencer.c:3410 +#: sequencer.c:3533 #, c-format msgid "nothing to merge: '%.*s'" msgstr "Nichts zum Zusammenfรผhren: '%.*s'" -#: sequencer.c:3422 +#: sequencer.c:3545 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." +"Oktopus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgefรผhrt werden." -#: sequencer.c:3437 +#: sequencer.c:3561 #, c-format msgid "could not get commit message of '%s'" msgstr "Konnte keine Commit-Beschreibung von '%s' bekommen." -#: sequencer.c:3590 +#: sequencer.c:3730 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "Konnte nicht einmal versuchen '%.*s' zu mergen." -#: sequencer.c:3606 +#: sequencer.c:3746 msgid "merge: Unable to write new index file" msgstr "merge: Konnte neue Index-Datei nicht schreiben." -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "Kann automatischen Stash nicht erzeugen." + +#: sequencer.c:3823 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "Unerwartete 'stash'-Antwort: '%s'" + +#: sequencer.c:3829 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "Konnte Verzeichnis fรผr '%s' nicht erstellen." + +#: sequencer.c:3832 +#, c-format +msgid "Created autostash: %s\n" +msgstr "Automatischen Stash erzeugt: %s\n" + +#: sequencer.c:3836 +msgid "could not reset --hard" +msgstr "Konnte 'reset --hard' nicht ausfรผhren." + +#: sequencer.c:3861 #, c-format msgid "Applied autostash.\n" msgstr "Automatischen Stash angewendet.\n" -#: sequencer.c:3687 +#: sequencer.c:3873 #, c-format msgid "cannot store %s" msgstr "kann %s nicht speichern" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3876 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"Anwendung des automatischen Stash resultierte in Konflikten.\n" +"%s\n" "Ihre รnderungen sind im Stash sicher.\n" "Sie kรถnnen jederzeit \"git stash pop\" oder \"git stash drop\" ausfรผhren.\n" -#: sequencer.c:3751 -#, c-format -msgid "could not checkout %s" -msgstr "Konnte %s nicht auschecken." +#: sequencer.c:3881 +msgid "Applying autostash resulted in conflicts." +msgstr "Beim Anwenden des automatischen Stash traten Konflikte auf." -#: sequencer.c:3765 +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." +msgstr "Automatischer Stash existiert; ein neuer Stash-Eintrag wird erstellt." + +#: sequencer.c:3974 #, c-format msgid "%s: not a valid OID" msgstr "%s: keine gรผltige OID" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "Konnte HEAD nicht loslรถsen" -#: sequencer.c:3785 +#: sequencer.c:3994 #, c-format msgid "Stopped at HEAD\n" msgstr "Angehalten bei HEAD\n" -#: sequencer.c:3787 +#: sequencer.c:3996 #, c-format msgid "Stopped at %s\n" msgstr "Angehalten bei %s\n" -#: sequencer.c:3795 +#: sequencer.c:4004 #, c-format msgid "" "Could not execute the todo command\n" @@ -6626,50 +7621,60 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "Rebase (%d/%d)%s" + +#: sequencer.c:4095 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Angehalten bei %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:4166 #, c-format msgid "unknown command %d" msgstr "Unbekannter Befehl %d" -#: sequencer.c:4003 +#: sequencer.c:4225 msgid "could not read orig-head" msgstr "Konnte orig-head nicht lesen." -#: sequencer.c:4008 +#: sequencer.c:4230 msgid "could not read 'onto'" msgstr "Konnte 'onto' nicht lesen." -#: sequencer.c:4022 +#: sequencer.c:4244 #, c-format msgid "could not update HEAD to %s" msgstr "Konnte HEAD nicht auf %s aktualisieren." -#: sequencer.c:4115 +#: sequencer.c:4304 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "Erfolgreich Rebase ausgefรผhrt und %s aktualisiert.\n" + +#: sequencer.c:4337 msgid "cannot rebase: You have unstaged changes." msgstr "" "Rebase nicht mรถglich: Sie haben รnderungen, die nicht zum Commit\n" "vorgemerkt sind." -#: sequencer.c:4124 +#: sequencer.c:4346 msgid "cannot amend non-existing commit" msgstr "Kann nicht existierenden Commit nicht nachbessern." -#: sequencer.c:4126 +#: sequencer.c:4348 #, c-format msgid "invalid file: '%s'" msgstr "Ungรผltige Datei: '%s'" -#: sequencer.c:4128 +#: sequencer.c:4350 #, c-format msgid "invalid contents: '%s'" msgstr "Ungรผltige Inhalte: '%s'" -#: sequencer.c:4131 +#: sequencer.c:4353 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6680,69 +7685,64 @@ msgstr "" "committen Sie diese zuerst und fรผhren Sie dann 'git rebase --continue'\n" "erneut aus." -#: sequencer.c:4167 sequencer.c:4205 +#: sequencer.c:4389 sequencer.c:4428 #, c-format msgid "could not write file: '%s'" msgstr "Konnte Datei nicht schreiben: '%s'" -#: sequencer.c:4220 +#: sequencer.c:4444 msgid "could not remove CHERRY_PICK_HEAD" msgstr "Konnte CHERRY_PICK_HEAD nicht lรถschen." -#: sequencer.c:4227 +#: sequencer.c:4451 msgid "could not commit staged changes." msgstr "Konnte รnderungen aus der Staging-Area nicht committen." -#: sequencer.c:4328 +#: sequencer.c:4477 +#, c-format +msgid "invalid committer '%s'" +msgstr "ungรผltiger Commit-Ersteller '%s'" + +#: sequencer.c:4586 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:4332 +#: sequencer.c:4590 #, c-format msgid "%s: bad revision" msgstr "%s: ungรผltiger Commit" -#: sequencer.c:4367 +#: sequencer.c:4625 msgid "can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausfรผhren." -#: sequencer.c:4810 +#: sequencer.c:5102 msgid "make_script: unhandled options" msgstr "make_script: unbehandelte Optionen" -#: sequencer.c:4813 +#: sequencer.c:5105 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 +#: sequencer.c:5347 sequencer.c:5364 msgid "nothing to do" msgstr "Nichts zu tun." -#: sequencer.c:5114 +#: sequencer.c:5383 msgid "could not skip unnecessary pick commands" msgstr "Konnte unnรถtige \"pick\"-Befehle nicht auslassen." -#: sequencer.c:5197 +#: sequencer.c:5480 msgid "the script was already rearranged." msgstr "Das Script wurde bereits umgeordnet." -#: setup.c:123 +#: setup.c:133 #, c-format -msgid "'%s' is outside repository" -msgstr "'%s' liegt auรerhalb des Repositories." +msgid "'%s' is outside repository at '%s'" +msgstr "'%s' liegt auรerhalb des Repositories von '%s'" -#: setup.c:173 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6752,7 +7752,7 @@ msgstr "" "Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n" "nicht existieren." -#: setup.c:186 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6764,13 +7764,13 @@ msgstr "" "Benutzen Sie '--', um Pfade und Commits zu trennen, รคhnlich wie:\n" "'git <Befehl> [<Commit>...] -- [<Datei>...]'" -#: setup.c:235 +#: setup.c:264 #, 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:254 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6781,93 +7781,97 @@ msgstr "" "Benutzen Sie '--', um Pfade und Commits zu trennen, รคhnlich wie:\n" "'git <Befehl> [<Commit>...] -- [<Datei>...]'" -#: setup.c:390 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "" "Konnte Arbeitsverzeichnis mit ungรผltiger Konfiguration nicht einrichten." -#: setup.c:394 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgefรผhrt werden." -#: setup.c:540 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden" -#: setup.c:548 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "Unbekannte Repository-Erweiterungen gefunden:" -#: setup.c:567 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "Repository-Version ist 0, aber Erweiterungen nur fรผr v1 gefunden:" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "Fehler beim รffnen von '%s'." -#: setup.c:569 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "Zu groร, um eine .git-Datei zu sein: '%s'" -#: setup.c:571 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "Fehler beim Lesen von '%s'." -#: setup.c:573 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "Ungรผltiges gitfile-Format: %s" -#: setup.c:575 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "Kein Pfad in gitfile: %s" -#: setup.c:577 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "Kein Git-Repository: %s" -#: setup.c:676 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "'$%s' zu groร" -#: setup.c:690 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "Kein Git-Repository: '%s'" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "Kann nicht in Verzeichnis '%s' wechseln." -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurรผckwechseln." -#: setup.c:851 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "Konnte '%*s%s%s' nicht lesen." -#: setup.c:1083 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen." -#: setup.c:1092 setup.c:1098 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "Kann nicht nach '%s' wechseln." -#: setup.c:1103 +#: setup.c:1245 #, 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:1109 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6877,7 +7881,7 @@ msgstr "" "%s)\n" "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)." -#: setup.c:1220 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6886,290 +7890,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:1264 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "รffnen von /dev/null oder dup fehlgeschlagen." -#: setup.c:1279 +#: setup.c:1424 msgid "fork failed" msgstr "fork fehlgeschlagen" -#: setup.c:1284 +#: setup.c:1429 msgid "setsid failed" msgstr "setsid fehlgeschlagen" -#: sha1-file.c:453 +#: sha1-file.c:470 #, 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:504 +#: sha1-file.c:521 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren." -#: sha1-file.c:576 +#: sha1-file.c:593 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief" -#: sha1-file.c:583 +#: sha1-file.c:600 #, c-format msgid "unable to normalize object directory: %s" msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren." -#: sha1-file.c:626 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" msgstr "Konnte fdopen nicht auf Lock-Datei fรผr \"alternates\" aufrufen." -#: sha1-file.c:644 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "Konnte \"alternates\"-Datei nicht lesen." -#: sha1-file.c:651 +#: sha1-file.c:668 msgid "unable to move new alternates file into place" msgstr "Konnte neue \"alternates\"-Datei nicht รผbernehmen." -#: sha1-file.c:686 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "Pfad '%s' existiert nicht" -#: sha1-file.c:712 +#: sha1-file.c:724 #, 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:718 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Referenziertes Repository '%s' ist kein lokales Repository." -#: sha1-file.c:724 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "" "Referenziertes Repository '%s' hat eine unvollstรคndige Historie (shallow)." -#: sha1-file.c:732 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "" "Referenziertes Repository '%s' ist mit kรผnstlichen Vorgรคngern (\"grafts\") " "eingehรคngt." -#: sha1-file.c:792 +#: sha1-file.c:804 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "Ungรผltige Zeile beim Parsen alternativer Referenzen: %s" -#: sha1-file.c:944 +#: sha1-file.c:954 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "Versuche mmap %<PRIuMAX> รผber Limit %<PRIuMAX>." -#: sha1-file.c:969 +#: sha1-file.c:975 msgid "mmap failed" msgstr "mmap fehlgeschlagen" -#: sha1-file.c:1133 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "Objektdatei %s ist leer." -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1274 sha1-file.c:2467 #, c-format msgid "corrupt loose object '%s'" msgstr "Fehlerhaftes loses Objekt '%s'." -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1276 sha1-file.c:2471 #, c-format msgid "garbage at end of loose object '%s'" msgstr "Nutzlose Daten am Ende von losem Objekt '%s'." -#: sha1-file.c:1301 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "ungรผltiger Objekt-Typ" -#: sha1-file.c:1385 +#: sha1-file.c:1402 #, 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:1388 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "Konnte %s Kopfbereich nicht entpacken." -#: sha1-file.c:1394 +#: sha1-file.c:1411 #, 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:1397 +#: sha1-file.c:1414 #, c-format msgid "unable to parse %s header" msgstr "Konnte %s Kopfbereich nicht parsen." -#: sha1-file.c:1588 +#: sha1-file.c:1641 #, c-format msgid "failed to read object %s" msgstr "Konnte Objekt %s nicht lesen." -#: sha1-file.c:1592 +#: sha1-file.c:1645 #, c-format msgid "replacement %s not found for %s" msgstr "Ersetzung %s fรผr %s nicht gefunden." -#: sha1-file.c:1596 +#: sha1-file.c:1649 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "Loses Objekt %s (gespeichert in %s) ist beschรคdigt." -#: sha1-file.c:1600 +#: sha1-file.c:1653 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschรคdigt." -#: sha1-file.c:1703 +#: sha1-file.c:1758 #, c-format msgid "unable to write file %s" msgstr "Konnte Datei %s nicht schreiben." -#: sha1-file.c:1710 +#: sha1-file.c:1765 #, c-format msgid "unable to set permission to '%s'" msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." -#: sha1-file.c:1717 +#: sha1-file.c:1772 msgid "file write error" msgstr "Fehler beim Schreiben einer Datei." -#: sha1-file.c:1736 +#: sha1-file.c:1792 msgid "error when closing loose object file" msgstr "Fehler beim Schlieรen der Datei fรผr lose Objekte." -#: sha1-file.c:1801 +#: sha1-file.c:1857 #, 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:1803 +#: sha1-file.c:1859 msgid "unable to create temporary file" msgstr "Konnte temporรคre Datei nicht erstellen." -#: sha1-file.c:1827 +#: sha1-file.c:1883 msgid "unable to write loose object file" msgstr "Fehler beim Schreiben der Datei fรผr lose Objekte." -#: sha1-file.c:1833 +#: sha1-file.c:1889 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "Konnte neues Objekt %s (%d) nicht komprimieren." -#: sha1-file.c:1837 +#: sha1-file.c:1893 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)" -#: sha1-file.c:1841 +#: sha1-file.c:1897 #, c-format msgid "confused by unstable object source data for %s" msgstr "Fehler wegen instabilen Objektquelldaten fรผr %s" -#: sha1-file.c:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1907 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "Fehler beim Aufruf von utime() auf '%s'." -#: sha1-file.c:1926 +#: sha1-file.c:1984 #, c-format msgid "cannot read object for %s" msgstr "Kann Objekt fรผr %s nicht lesen." -#: sha1-file.c:1966 +#: sha1-file.c:2035 msgid "corrupt commit" msgstr "fehlerhafter Commit" -#: sha1-file.c:1974 +#: sha1-file.c:2043 msgid "corrupt tag" msgstr "fehlerhaftes Tag" -#: sha1-file.c:2073 +#: sha1-file.c:2143 #, c-format msgid "read error while indexing %s" msgstr "Lesefehler beim Indizieren von '%s'." -#: sha1-file.c:2076 +#: sha1-file.c:2146 #, c-format msgid "short read while indexing %s" msgstr "read() zu kurz beim Indizieren von '%s'." -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2219 sha1-file.c:2229 #, c-format msgid "%s: failed to insert into database" msgstr "%s: Fehler beim Einfรผgen in die Datenbank" -#: sha1-file.c:2164 +#: sha1-file.c:2235 #, c-format msgid "%s: unsupported file type" msgstr "%s: nicht unterstรผtzte Dateiart" -#: sha1-file.c:2188 +#: sha1-file.c:2259 #, c-format msgid "%s is not a valid object" msgstr "%s ist kein gรผltiges Objekt" -#: sha1-file.c:2190 +#: sha1-file.c:2261 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s ist kein gรผltiges '%s' Objekt" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2288 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "kann %s nicht รถffnen" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2478 sha1-file.c:2531 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "Hash fรผr %s stimmt nicht รผberein (%s erwartet)." -#: sha1-file.c:2431 +#: sha1-file.c:2502 #, c-format msgid "unable to mmap %s" msgstr "Konnte mmap nicht auf %s ausfรผhren." -#: sha1-file.c:2436 +#: sha1-file.c:2507 #, c-format msgid "unable to unpack header of %s" msgstr "Konnte Kopfbereich von %s nicht entpacken." -#: sha1-file.c:2442 +#: sha1-file.c:2513 #, c-format msgid "unable to parse header of %s" msgstr "Konnte Kopfbereich von %s nicht parsen." -#: sha1-file.c:2453 +#: sha1-file.c:2524 #, c-format msgid "unable to unpack contents of %s" msgstr "Konnte Inhalt von %s nicht entpacken." -#: sha1-name.c:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "Kurzer SHA-1 %s ist mehrdeutig." -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Die Kandidaten sind:" -#: sha1-name.c:800 +#: 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" @@ -7194,44 +8198,112 @@ 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:1702 +#, 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:1708 +#, 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:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "Pfad '%s' existiert nicht in '%.*s'" + +#: sha1-name.c:1745 +#, 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:1761 +#, 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:1769 +#, 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:1771 +#, 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:1784 +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:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "ungรผltiger Objektname '%.*s'." + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:848 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:867 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:875 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7239,13 +8311,50 @@ msgstr[0] "%u Byte" msgstr[1] "%u Bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:877 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u Byte/s" msgstr[1] "%u Bytes/s" +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" +msgstr "Konnte '%s' nicht zum Schreiben รถffnen." + +#: strbuf.c:1175 +#, c-format +msgid "could not edit '%s'" +msgstr "Konnte '%s' nicht editieren." + +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "Ignoriere verdรคchtigen Submodulnamen: %s" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "Negative Werte fรผr submodule.fetchjobs nicht erlaubt." + +#: submodule-config.c:402 +#, 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:499 +#, c-format +msgid "invalid value for %s" +msgstr "Ungรผltiger Wert fรผr %s" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7276,51 +8385,128 @@ msgstr "In nicht ausgechecktem Submodul '%s'." msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'" -#: submodule.c:910 +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "ungรผltiges --ignore-submodules Argument: %s" + +#: submodule.c:816 +#, 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:919 #, 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:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1004 +#, 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:1127 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "Prozess fรผr Submodul '%s' fehlgeschlagen" + +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gรผltige Referenz auflรถsen." -#: submodule.c:1481 +#: submodule.c:1167 +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "Pushe Submodul '%s'\n" + +#: submodule.c:1170 #, c-format -msgid "Could not access submodule '%s'" -msgstr "Konnte nicht auf Submodul '%s' zugreifen." +msgid "Unable to push submodule '%s'\n" +msgstr "Kann Push fรผr Submodul '%s' nicht ausfรผhren\n" -#: submodule.c:1651 +#: submodule.c:1462 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "Anfordern des Submoduls %s%s\n" + +#: submodule.c:1492 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "Konnte nicht auf Submodul '%s' zugreifen\n" + +#: submodule.c:1646 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"Fehler wรคhrend des Anforderns der Submodule:\n" +"%s" + +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' nicht als Git-Repository erkannt" -#: submodule.c:1789 +#: submodule.c:1688 +#, 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:1729 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "'git status --porcelain=2' ist in Submodul %s fehlgeschlagen" + +#: submodule.c:1804 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht starten." -#: submodule.c:1802 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht ausfรผhren." -#: submodule.c:1817 +#: submodule.c:1832 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben." -#: submodule.c:1907 +#: submodule.c:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'" + +#: submodule.c:1880 +msgid "could not reset submodule index" +msgstr "konnte Index des Submoduls nicht zurรผcksetzen" + +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "Submodul '%s' hat einen geรคnderten Index." -#: submodule.c:1959 +#: submodule.c:1974 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submodule '%s' konnte nicht aktualisiert werden." -#: submodule.c:2007 +#: submodule.c:2042 +#, 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:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7328,12 +8514,17 @@ msgstr "" "relocate_gitdir fรผr Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n" "wird nicht unterstรผtzt" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" -msgstr "konnte Name fรผr Submodul '%s' nicht nachschlagen" +msgstr "Konnte Name fรผr Submodul '%s' nicht nachschlagen." + +#: submodule.c:2079 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "Verschieben von '%s' in ein existierendes Git-Verzeichnis verweigert." -#: submodule.c:2026 +#: submodule.c:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7344,209 +8535,85 @@ msgstr "" "'%s' nach\n" "'%s'\n" -#: submodule.c:2109 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'" - -#: submodule.c:2153 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "Konnte 'ls-files' nicht in .. starten" -#: submodule.c:2192 +#: submodule.c:2254 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree mit unerwartetem Rรผckgabewert %d beendet" -#: submodule-config.c:232 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "Ignoriere verdรคchtigen Submodulnamen: %s" - -#: submodule-config.c:299 -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "Negative Werte fรผr submodule.fetchjobs nicht erlaubt." - -#: 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:486 -#, c-format -msgid "invalid value for %s" -msgstr "Ungรผltiger Wert fรผr %s" - -#: submodule-config.c:755 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren" - -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "Ausfรผhren des Anhang-Befehls '%s' fehlgeschlagen" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format 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:295 +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "mehr als ein %s" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "leerer Anhang-Token in Anhang '%.*s'" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "Konnte Eingabe-Datei '%s' nicht lesen" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "konnte nicht von der Standard-Eingabe lesen" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "Konnte '%s' nicht lesen" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "Datei '%s' ist keine regulรคre Datei" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "Datei %s ist vom Benutzer nicht beschreibbar." -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "konnte temporรคre Datei '%s' nicht รถffnen" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "konnte temporรคre Datei nicht zu %s umbenennen" -#: transport.c:116 -#, c-format -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:142 -#, c-format -msgid "could not read bundle '%s'" -msgstr "Konnte Paket '%s' nicht lesen." - -#: transport.c:208 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "transport: ungรผltige --depth Option '%s'" - -#: 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:260 -msgid "server options require protocol version 2 or later" -msgstr "Server-Optionen benรถtigen Protokoll-Version 2 oder hรถher" - -#: transport.c:625 -msgid "could not parse transport.color.* config" -msgstr "Konnte transport.color.* Konfiguration nicht parsen." - -#: transport.c:698 -msgid "support for protocol v2 not implemented yet" -msgstr "Unterstรผtzung fรผr Protokoll v2 noch nicht implementiert." - -#: transport.c:825 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "Unbekannter Wert fรผr Konfiguration '%s': %s" - -#: transport.c:891 -#, c-format -msgid "transport '%s' not allowed" -msgstr "รbertragungsart '%s' nicht erlaubt." - -#: transport.c:945 -msgid "git-over-rsync is no longer supported" -msgstr "git-over-rsync wird nicht lรคnger unterstรผtzt." - -#: transport.c:1040 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "" -"Die folgenden Submodul-Pfade enthalten รnderungen, die in keinem\n" -"Remote-Repository gefunden wurden:\n" - -#: transport.c:1044 -#, 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" -"Bitte versuchen Sie\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"oder wechseln Sie in das Verzeichnis und benutzen Sie\n" -"\n" -"\tgit push\n" -"\n" -"zum Versenden zu einem Remote-Repository.\n" -"\n" - -#: transport.c:1052 -msgid "Aborting." -msgstr "Abbruch." - -#: transport.c:1193 -msgid "failed to push all needed submodules" -msgstr "Fehler beim Versand aller erforderlichen Submodule." - -#: 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:51 transport-helper.c:80 +#: transport-helper.c:62 transport-helper.c:91 msgid "full write to remote helper failed" msgstr "Vollstรคndiges Schreiben zu Remote-Helper fehlgeschlagen." -#: transport-helper.c:134 +#: transport-helper.c:145 #, c-format msgid "unable to find remote helper for '%s'" msgstr "Konnte Remote-Helper fรผr '%s' nicht finden." -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" msgstr "" "Konnte dup() auf Dateideskriptor fรผr Ausgaben des Remote-Helpers nicht " "ausfรผhren." -#: transport-helper.c:201 +#: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7555,169 +8622,276 @@ msgstr "" "Unbekannte erforderliche Fรคhigkeit %s; dieser Remote-Helper benรถtigt\n" "wahrscheinlich eine neuere Version von Git." -#: transport-helper.c:207 +#: transport-helper.c:220 msgid "this remote helper should implement refspec capability" msgstr "Dieser Remote-Helper sollte die \"refspec\"-Fรคhigkeit implementieren." -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:287 transport-helper.c:429 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "unerwartete Ausgabe von %s: '%s'" -#: transport-helper.c:403 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "%s sperrte auch %s" -#: transport-helper.c:481 +#: transport-helper.c:497 msgid "couldn't run fast-import" msgstr "Konnte \"fast-import\" nicht ausfรผhren." -#: transport-helper.c:504 +#: transport-helper.c:520 msgid "error while running fast-import" msgstr "Fehler beim Ausfรผhren von 'fast-import'." -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:549 transport-helper.c:1226 #, c-format msgid "could not read ref %s" msgstr "Konnte Referenz %s nicht lesen." -#: transport-helper.c:578 +#: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" msgstr "Unbekannte Antwort auf 'connect': %s" -#: transport-helper.c:600 +#: transport-helper.c:616 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:602 +#: transport-helper.c:618 msgid "invalid remote service path" msgstr "Ungรผltiger Remote-Service Pfad." -#: transport-helper.c:648 +#: transport-helper.c:661 transport.c:1428 +msgid "operation not supported by protocol" +msgstr "Die Operation wird von dem Protokoll nicht unterstรผtzt." + +#: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" msgstr "Kann keine Verbindung zu Subservice %s herstellen." -#: transport-helper.c:720 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "'option' ohne passende 'ok/error' Direktive" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "Erwartete ok/error, Remote-Helper gab '%s' aus." -#: transport-helper.c:773 +#: transport-helper.c:841 #, c-format msgid "helper reported unexpected status of %s" msgstr "Remote-Helper meldete unerwarteten Status von %s." -#: transport-helper.c:834 +#: transport-helper.c:924 #, c-format msgid "helper %s does not support dry-run" msgstr "Remote-Helper %s unterstรผtzt kein Trockenlauf." -#: transport-helper.c:837 +#: transport-helper.c:927 #, c-format msgid "helper %s does not support --signed" msgstr "Remote-Helper %s unterstรผtzt kein --signed." -#: transport-helper.c:840 +#: transport-helper.c:930 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "Remote-Helper %s unterstรผtzt kein --signed=if-asked." -#: transport-helper.c:847 +#: transport-helper.c:935 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "Remote-Helper %s unterstรผtzt kein --atomic." + +#: transport-helper.c:941 #, c-format msgid "helper %s does not support 'push-option'" msgstr "Remote-Helper %s unterstรผtzt nicht 'push-option'." -#: transport-helper.c:945 +#: transport-helper.c:1040 msgid "remote-helper doesn't support push; refspec needed" msgstr "Remote-Helper unterstรผtzt kein Push; Refspec benรถtigt" -#: transport-helper.c:950 +#: transport-helper.c:1045 #, c-format msgid "helper %s does not support 'force'" msgstr "Remote-Helper %s unterstรผtzt kein 'force'." -#: transport-helper.c:997 +#: transport-helper.c:1092 msgid "couldn't run fast-export" msgstr "Konnte \"fast-export\" nicht ausfรผhren." -#: transport-helper.c:1002 +#: transport-helper.c:1097 msgid "error while running fast-export" msgstr "Fehler beim Ausfรผhren von \"fast-export\"." -#: transport-helper.c:1027 +#: transport-helper.c:1122 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" msgstr "" "Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausfรผhrung.\n" -"Vielleicht sollten Sie einen Branch wie 'master' angeben.\n" +"Vielleicht sollten Sie einen Branch angeben.\n" + +#: transport-helper.c:1203 +#, c-format +msgid "unsupported object format '%s'" +msgstr "nicht unterstรผtztes Objekt-Format '%s'" -#: transport-helper.c:1091 +#: transport-helper.c:1212 #, c-format msgid "malformed response in ref list: %s" msgstr "Ungรผltige Antwort in Referenzliste: %s" -#: transport-helper.c:1244 +#: transport-helper.c:1364 #, c-format msgid "read(%s) failed" msgstr "Lesen von %s fehlgeschlagen." -#: transport-helper.c:1271 +#: transport-helper.c:1391 #, c-format msgid "write(%s) failed" msgstr "Schreiben von %s fehlgeschlagen." -#: transport-helper.c:1320 +#: transport-helper.c:1440 #, c-format msgid "%s thread failed" msgstr "Thread %s fehlgeschlagen." -#: transport-helper.c:1324 +#: transport-helper.c:1444 #, c-format msgid "%s thread failed to join: %s" msgstr "Fehler beim Beitreten zu Thread %s: %s" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1463 transport-helper.c:1467 #, c-format msgid "can't start thread for copying data: %s" msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s" -#: transport-helper.c:1384 +#: transport-helper.c:1504 #, c-format msgid "%s process failed to wait" msgstr "Fehler beim Warten von Prozess %s." -#: transport-helper.c:1388 +#: transport-helper.c:1508 #, c-format msgid "%s process failed" msgstr "Prozess %s fehlgeschlagen" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1526 transport-helper.c:1535 msgid "can't start thread for copying data" msgstr "Kann Thread zum Kopieren von Daten nicht starten." -#: tree-walk.c:33 +#: transport.c:116 +#, c-format +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 +#, c-format +msgid "could not read bundle '%s'" +msgstr "Konnte Paket '%s' nicht lesen." + +#: transport.c:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport: ungรผltige --depth Option '%s'" + +#: transport.c:269 +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:270 +msgid "server options require protocol version 2 or later" +msgstr "Server-Optionen benรถtigen Protokoll-Version 2 oder hรถher" + +#: transport.c:712 +msgid "could not parse transport.color.* config" +msgstr "Konnte transport.color.* Konfiguration nicht parsen." + +#: transport.c:785 +msgid "support for protocol v2 not implemented yet" +msgstr "Unterstรผtzung fรผr Protokoll v2 noch nicht implementiert." + +#: transport.c:919 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "Unbekannter Wert fรผr Konfiguration '%s': %s" + +#: transport.c:985 +#, c-format +msgid "transport '%s' not allowed" +msgstr "รbertragungsart '%s' nicht erlaubt." + +#: transport.c:1038 +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync wird nicht lรคnger unterstรผtzt." + +#: transport.c:1140 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"Die folgenden Submodul-Pfade enthalten รnderungen, die in keinem\n" +"Remote-Repository gefunden wurden:\n" + +#: transport.c:1144 +#, 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" +"Bitte versuchen Sie\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"oder wechseln Sie in das Verzeichnis und benutzen Sie\n" +"\n" +"\tgit push\n" +"\n" +"zum Versenden zu einem Remote-Repository.\n" +"\n" + +#: transport.c:1152 +msgid "Aborting." +msgstr "Abbruch." + +#: transport.c:1297 +msgid "failed to push all needed submodules" +msgstr "Fehler beim Versand aller erforderlichen Submodule." + +#: tree-walk.c:32 msgid "too-short tree object" msgstr "zu kurzes Tree-Objekt" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "fehlerhafter Modus in Tree-Eintrag" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "leerer Dateiname in Tree-Eintrag" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "zu kurze Tree-Datei" -#: unpack-trees.c:111 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7728,7 +8902,7 @@ msgstr "" "%%sBitte committen oder stashen Sie Ihre รnderungen, bevor Sie Branches\n" "wechseln." -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7738,7 +8912,7 @@ msgstr "" "รผberschrieben werden:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7748,7 +8922,7 @@ msgstr "" "รผberschrieben werden:\n" "%%sBitte committen oder stashen Sie Ihre รnderungen, bevor Sie mergen." -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7758,7 +8932,7 @@ msgstr "" "รผberschrieben werden:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7768,7 +8942,7 @@ msgstr "" "รผberschrieben werden:\n" "%%sBitte committen oder stashen Sie Ihre รnderungen, bevor Sie %s ausfรผhren." -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7777,7 +8951,7 @@ msgstr "" "Ihre lokalen รnderungen wรผrden durch %s รผberschrieben werden.\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7787,7 +8961,7 @@ msgstr "" "Dateien in diesen Verzeichnissen verloren gehen:\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7797,7 +8971,7 @@ msgstr "" "den Checkout entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7808,7 +8982,7 @@ msgstr "" "Checkout entfernt werden:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7818,7 +8992,7 @@ msgstr "" "den Merge entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen." -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7829,7 +9003,7 @@ msgstr "" "Merge entfernt werden:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7839,7 +9013,7 @@ msgstr "" "den %s entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausfรผhren." -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7849,7 +9023,7 @@ msgstr "" "den %s entfernt werden:\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7860,7 +9034,7 @@ msgstr "" "den Checkout รผberschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7872,7 +9046,7 @@ msgstr "" "Checkout รผberschrieben werden:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7882,7 +9056,7 @@ msgstr "" "den Merge รผberschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen." -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7892,7 +9066,7 @@ msgstr "" "den Merge รผberschrieben werden:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7902,7 +9076,7 @@ msgstr "" "den %s รผberschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausfรผhren." -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7913,62 +9087,71 @@ msgstr "" "%s รผberschrieben werden:\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Eintrag '%s' รผberschneidet sich mit '%s'. Kann nicht verbinden." -#: unpack-trees.c:173 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -"Kann partiellen Checkout nicht aktualisieren: die folgenden Eintrรคge\n" -"sind nicht aktuell:\n" +"Kann Submodul nicht aktualisieren:\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"Die folgenden Dateien im Arbeitsverzeichnis wรผrden durch die Aktualisierung\n" -"รผber einen partiellen Checkout รผberschrieben werden:\n" +"Die folgenden Pfade sind nicht aktuell und wurden trotz partieller Muster\n" +"รผbrig gelassen:\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"Die folgenden Dateien im Arbeitsverzeichnis wรผrden durch die Aktualisierung\n" -"รผber einen partiellen Checkout entfernt werden:\n" +"Die folgenden Pfade sind nicht zusammengefรผhrt und wurden trotz\n" +"partieller Muster รผbrig gelassen:\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"Kann Submodul nicht aktualisieren:\n" +"Die folgenden Pfade waren bereits vorhanden und wurden deshalb trotz\n" +"partieller Muster nicht aktualisiert:\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "Abbruch\n" -#: unpack-trees.c:318 +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" +"Nachdem die obigen Pfade behoben sind, kรถnnen Sie `git sparse-checkout " +"reapply` ausfรผhren.\n" + +#: unpack-trees.c:350 msgid "Updating files" msgstr "Aktualisiere Dateien" -#: unpack-trees.c:350 +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7978,6 +9161,14 @@ msgstr "" "auf einem case-insensitiven Dateisystem) und nur einer von der\n" "selben Kollissionsgruppe ist im Arbeitsverzeichnis:\n" +#: unpack-trees.c:1498 +msgid "Updating index flags" +msgstr "Aktualisiere Index-Markierungen" + +#: upload-pack.c:1516 +msgid "expected flush after fetch arguments" +msgstr "erwartete Flush nach Abrufen der Argumente" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "Ungรผltiges URL-Schema oder Suffix '://' fehlt" @@ -8007,49 +9198,89 @@ msgstr "ungรผltige Portnummer" msgid "invalid '..' path segment" msgstr "ungรผltiges '..' Pfadsegment" -#: worktree.c:258 builtin/am.c:2095 +#: walker.c:170 +msgid "Fetching objects" +msgstr "Anfordern der Objekte" + +#: worktree.c:236 builtin/am.c:2116 #, c-format msgid "failed to read '%s'" msgstr "Fehler beim Lesen von '%s'" -#: worktree.c:304 +#: worktree.c:283 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis." -#: worktree.c:315 +#: worktree.c:294 #, 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:327 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "'%s' existiert nicht." -#: worktree.c:333 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' ist keine .git-Datei, Fehlercode %d" -#: worktree.c:341 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' zeigt nicht zurรผck auf '%s'" -#: wrapper.c:223 wrapper.c:393 +#: worktree.c:587 +msgid "not a directory" +msgstr "kein Verzeichnis" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr ".git ist keine Datei" + +#: worktree.c:598 +msgid ".git file broken" +msgstr ".git-Datei kaputt" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr ".git-Datei fehlerhaft" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "kein gรผltiger Pfad" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "Konnte Repository nicht finden; .git ist keine Datei" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "Konnte Repository nicht finden; .git-Datei ist kaputt" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "gitdir nicht lesbar" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "gitdir fehlerhaft" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" -msgstr "Konnte '%s' nicht zum Lesen und Schreiben รถffnen." +msgstr "konnte '%s' nicht zum Lesen und Schreiben รถffnen" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "konnte nicht auf '%s' zugreifen" -#: wrapper.c:632 +#: wrapper.c:607 msgid "unable to get current working directory" -msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen." +msgstr "konnte aktuelles Arbeitsverzeichnis nicht bekommen" #: wt-status.c:158 msgid "Unmerged paths:" @@ -8090,11 +9321,11 @@ msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflรถsung zu markieren)" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "Zum Commit vorgemerkte รnderungen:" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "รnderungen, die nicht zum Commit vorgemerkt sind:" @@ -8130,94 +9361,94 @@ msgstr "" " (benutzen Sie \"git %s <Datei>...\", um die รnderungen zum Commit " "vorzumerken)" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "beide gelรถscht:" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "von uns hinzugefรผgt:" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "von denen gelรถscht:" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "von denen hinzugefรผgt:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "von uns gelรถscht:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "von beiden hinzugefรผgt:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "von beiden geรคndert:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "neue Datei:" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "kopiert:" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "gelรถscht:" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "geรคndert:" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "umbenannt:" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "Typรคnderung:" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "unbekannt:" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "nicht gemerged:" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "neue Commits, " -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "geรคnderter Inhalt, " -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "unversionierter Inhalt, " -#: wt-status.c:906 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Ihr Stash hat gerade %d Eintrag" msgstr[1] "Ihr Stash hat gerade %d Eintrรคge" -#: wt-status.c:938 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "Submodule geรคndert, aber nicht aktualisiert:" -#: wt-status.c:940 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "รnderungen in Submodul zum Committen:" -#: wt-status.c:1022 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -8225,7 +9456,7 @@ msgstr "" "รndern oder entfernen Sie nicht die obige Zeile.\n" "Alles unterhalb von ihr wird ignoriert." -#: wt-status.c:1114 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -8237,114 +9468,114 @@ msgstr "" "berechnen.\n" "Sie kรถnnen '--no-ahead-behind' benutzen, um das zu verhindern.\n" -#: wt-status.c:1144 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengefรผhrte Pfade." -#: wt-status.c:1147 +#: wt-status.c:1143 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 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)" -#: wt-status.c:1153 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:1156 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\", um den Merge abzuschlieรen)" -#: wt-status.c:1165 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:1168 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:1172 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" " (beheben Sie die Konflikte und fรผhren Sie dann \"git am --continue\" aus)" -#: wt-status.c:1174 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1176 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (benutzen Sie \"git am --abort\", um den ursprรผnglichen Branch " "wiederherzustellen)" -#: wt-status.c:1309 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo fehlt." -#: wt-status.c:1311 +#: wt-status.c:1307 msgid "No commands done." msgstr "Keine Befehle ausgefรผhrt." -#: wt-status.c:1314 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Zuletzt ausgefรผhrter Befehl (%d Befehl ausgefรผhrt):" msgstr[1] "Zuletzt ausgefรผhrte Befehle (%d Befehle ausgefรผhrt):" -#: wt-status.c:1325 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " (mehr Informationen in Datei %s)" -#: wt-status.c:1330 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "Keine Befehle verbleibend." -#: wt-status.c:1333 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nรคchster auszufรผhrender Befehl (%d Befehle verbleibend):" msgstr[1] "Nรคchste auszufรผhrende Befehle (%d Befehle verbleibend):" -#: wt-status.c:1341 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)" -#: wt-status.c:1353 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'." -#: wt-status.c:1358 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "Sie sind gerade beim Rebase." -#: wt-status.c:1371 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (beheben Sie die Konflikte und fรผhren Sie dann \"git rebase --continue\" " "aus)" -#: wt-status.c:1373 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1375 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (benutzen Sie \"git rebase --abort\", um den ursprรผnglichen Branch " "auszuchecken)" -#: wt-status.c:1382 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alle Konflikte behoben: fรผhren Sie \"git rebase --continue\" aus)" -#: wt-status.c:1386 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -8352,93 +9583,102 @@ msgstr "" "Sie teilen gerade einen Commit auf, wรคhrend ein Rebase von Branch '%s' auf " "'%s' im Gange ist." -#: wt-status.c:1391 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "Sie teilen gerade einen Commit wรคhrend eines Rebase auf." -#: wt-status.c:1394 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Sobald Ihr Arbeitsverzeichnis unverรคndert ist, fรผhren Sie \"git rebase --" "continue\" aus)" -#: wt-status.c:1398 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Sie editieren gerade einen Commit wรคhrend eines Rebase von Branch '%s' auf " "'%s'." -#: wt-status.c:1403 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "Sie editieren gerade einen Commit wรคhrend eines Rebase." -#: wt-status.c:1406 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (benutzen Sie \"git commit --amend\", um den aktuellen Commit " "nachzubessern)" -#: wt-status.c:1408 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (benutzen Sie \"git rebase --continue\" sobald Ihre รnderungen " "abgeschlossen sind)" -#: wt-status.c:1419 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick zurzeit im Gange." -#: wt-status.c:1422 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Sie fรผhren gerade \"cherry-pick\" von Commit %s aus." -#: wt-status.c:1429 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (beheben Sie die Konflikte und fรผhren Sie dann \"git cherry-pick --continue" "\" aus)" -#: wt-status.c:1432 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (Fรผhren Sie \"git cherry-pick --continue\" aus, um weiterzumachen)" -#: wt-status.c:1435 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (alle Konflikte behoben: fรผhren Sie \"git cherry-pick --continue\" aus)" -#: wt-status.c:1437 +#: wt-status.c:1433 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr "" +" (benutzen Sie \"git cherry-pick --skip\", um diesen Patch auszulassen)" + +#: wt-status.c:1435 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:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "Revert zurzeit im Gange." -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "Sie sind gerade beim Revert von Commit '%s'." -#: wt-status.c:1456 +#: wt-status.c:1454 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:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr " (Fรผhren Sie \"git revert --continue\", um weiterzumachen)" -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alle Konflikte behoben: fรผhren Sie \"git revert --continue\" aus)" +#: wt-status.c:1462 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (benutzen Sie \"git revert --skip\", um diesen Patch auszulassen)" + #: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" @@ -8459,39 +9699,46 @@ msgstr "" " (benutzen Sie \"git bisect reset\", um zum ursprรผnglichen Branch " "zurรผckzukehren)" -#: wt-status.c:1690 +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "" +"Sie sind in einem partiellen Checkout mit %d%% vorhandenen versionierten " +"Dateien." + +#: wt-status.c:1731 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1697 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "interaktives Rebase im Gange; auf " -#: wt-status.c:1699 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1709 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1726 +#: wt-status.c:1767 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1727 +#: wt-status.c:1768 msgid "No commits yet" msgstr "Noch keine Commits" -#: wt-status.c:1741 +#: wt-status.c:1782 msgid "Untracked files" msgstr "Unversionierte Dateien" -#: wt-status.c:1743 +#: wt-status.c:1784 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1747 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8502,32 +9749,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:1753 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "Unversionierte Dateien nicht aufgelistet%s" -#: wt-status.c:1755 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)" -#: wt-status.c:1761 +#: wt-status.c:1802 msgid "No changes" msgstr "Keine รnderungen" -#: wt-status.c:1766 +#: wt-status.c:1807 #, 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:1769 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "keine รnderungen zum Commit vorgemerkt\n" -#: wt-status.c:1772 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8536,200 +9783,209 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" "(benutzen Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1775 +#: wt-status.c:1819 #, 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:1778 +#: wt-status.c:1823 #, 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:1781 wt-status.c:1786 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1784 +#: wt-status.c:1830 #, 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:1788 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverรคndert\n" -#: wt-status.c:1901 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "Noch keine Commits in " -#: wt-status.c:1905 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1936 +#: wt-status.c:1975 msgid "different" msgstr "unterschiedlich" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "hinterher " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "voraus " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2505 #, 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:2472 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "Zusรคtzlich enthรคlt die Staging-Area nicht committete รnderungen." -#: wt-status.c:2474 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "%s nicht mรถglich: Die Staging-Area enthรคlt nicht committete รnderungen." -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#, c-format +msgid "failed to unlink '%s'" +msgstr "Konnte '%s' nicht entfernen." + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..." -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "lรถsche '%s'\n" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht zum Commit vorgemerkte รnderungen nach Aktualisierung der Staging-Area:" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:272 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "Konnte den Index nicht lesen" -#: builtin/add.c:245 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "Konnte '%s' nicht zum Schreiben รถffnen." -#: builtin/add.c:249 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "Konnte Patch nicht schreiben" -#: builtin/add.c:252 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "Bearbeitung des Patches fehlgeschlagen" -#: builtin/add.c:255 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "Konnte Verzeichnis '%s' nicht lesen" -#: builtin/add.c:257 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "Leerer Patch. Abgebrochen." -#: builtin/add.c:262 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "Konnte '%s' nicht anwenden." -#: builtin/add.c:270 +#: builtin/add.c:308 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: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 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 msgid "dry run" msgstr "Probelauf" -#: builtin/add.c:293 +#: builtin/add.c:331 msgid "interactive picking" msgstr "interaktives Auswรคhlen" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 msgid "select hunks interactively" msgstr "Blรถcke interaktiv auswรคhlen" -#: builtin/add.c:295 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "aktuelle Unterschiede editieren und anwenden" -#: builtin/add.c:296 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "das Hinzufรผgen andernfalls ignorierter Dateien erlauben" -#: builtin/add.c:297 +#: builtin/add.c:335 msgid "update tracked files" msgstr "versionierte Dateien aktualisieren" -#: builtin/add.c:298 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" "erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert " "-u)" -#: builtin/add.c:299 +#: builtin/add.c:337 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:300 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "" "รnderungen von allen versionierten und unversionierten Dateien hinzufรผgen" -#: builtin/add.c:303 +#: builtin/add.c:341 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:305 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "nichts hinzufรผgen, nur den Index aktualisieren" -#: builtin/add.c:306 +#: builtin/add.c:344 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:307 +#: builtin/add.c:345 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:309 builtin/update-index.c:1001 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "das \"ausfรผhrbar\"-Bit der aufgelisteten Dateien รผberschreiben" -#: builtin/add.c:311 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "warnen wenn eingebettetes Repository hinzugefรผgt wird" -#: builtin/add.c:326 +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "Backend fรผr `git stash -p`" + +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8763,158 +10019,191 @@ msgstr "" "\n" "Siehe \"git help submodule\" fรผr weitere Informationen." -#: builtin/add.c:354 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "Fรผge eingebettetes Repository hinzu: %s" -#: 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:416 +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:379 +#: builtin/add.c:425 msgid "adding files failed" msgstr "Hinzufรผgen von Dateien fehlgeschlagen" -#: builtin/add.c:419 +#: builtin/add.c:453 builtin/commit.c:345 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "" +"Die Optionen --pathspec-from-file und --interactive/--patch sind " +"inkompatibel." + +#: builtin/add.c:470 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "Die Optionen --pathspec-from-file und --edit sind inkompatibel." + +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "Die Optionen -A und -u sind zueinander inkompatibel." -#: builtin/add.c:426 +#: builtin/add.c:485 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:430 +#: builtin/add.c:489 #, 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:445 +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "" +"Die Option --pathspec-from-file ist inkompatibel mit\n" +"Pfadspezifikation-Argumenten." + +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "Die Option --pathspec-file-nul benรถtigt --pathspec-from-file" + +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nichts spezifiziert, nichts hinzugefรผgt.\n" -#: builtin/add.c:446 +#: builtin/add.c:520 +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/am.c:160 #, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Meinten Sie vielleicht 'git add .'?\n" +msgid "invalid committer: %s" +msgstr "ungรผltiger Commit-Ersteller: %s" -#: builtin/am.c:348 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "konnte Autor-Skript nicht parsen" -#: builtin/am.c:432 +#: builtin/am.c:450 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' wurde durch den applypatch-msg Hook entfernt" -#: builtin/am.c:474 +#: builtin/am.c:492 #, c-format msgid "Malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." -#: builtin/am.c:512 +#: builtin/am.c:530 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" -#: builtin/am.c:538 +#: builtin/am.c:556 msgid "fseek failed" msgstr "\"fseek\" fehlgeschlagen" -#: builtin/am.c:726 +#: builtin/am.c:744 #, c-format msgid "could not parse patch '%s'" msgstr "konnte Patch '%s' nicht parsen" -#: builtin/am.c:791 +#: builtin/am.c:809 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:839 +#: builtin/am.c:857 msgid "invalid timestamp" msgstr "ungรผltiger Zeitstempel" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:862 builtin/am.c:874 msgid "invalid Date line" msgstr "Ungรผltige \"Date\"-Zeile" -#: builtin/am.c:851 +#: builtin/am.c:869 msgid "invalid timezone offset" msgstr "Ungรผltiger Offset in der Zeitzone" -#: builtin/am.c:944 +#: builtin/am.c:962 msgid "Patch format detection failed." msgstr "Patch-Formaterkennung fehlgeschlagen." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:967 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/am.c:954 +#: builtin/am.c:972 msgid "Failed to split patches." msgstr "Fehler beim Aufteilen der Patches." -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "Konnte Index-Datei nicht schreiben." - -#: builtin/am.c:1098 +#: builtin/am.c:1103 #, 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:1099 +#: builtin/am.c:1104 #, 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:1100 +#: builtin/am.c:1105 #, 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:1183 +#: builtin/am.c:1188 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:1211 +#: builtin/am.c:1216 msgid "Patch is empty." msgstr "Patch ist leer." -#: builtin/am.c:1277 +#: builtin/am.c:1281 #, c-format -msgid "invalid ident line: %.*s" -msgstr "Ungรผltige Identifikationszeile: %.*s" +msgid "missing author line in commit %s" +msgstr "Autor-Zeile fehlt in Commit %s" -#: builtin/am.c:1299 +#: builtin/am.c:1284 #, c-format -msgid "unable to parse commit %s" -msgstr "Konnte Commit '%s' nicht parsen." +msgid "invalid ident line: %.*s" +msgstr "Ungรผltige Identifikationszeile: %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1503 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:1498 +#: builtin/am.c:1505 msgid "Using index info to reconstruct a base tree..." msgstr "" "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen ..." -#: builtin/am.c:1517 +#: builtin/am.c:1524 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8922,24 +10211,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:1523 +#: builtin/am.c:1530 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:1549 +#: builtin/am.c:1556 msgid "Failed to merge in the changes." msgstr "Merge der รnderungen fehlgeschlagen." -#: builtin/am.c:1581 +#: builtin/am.c:1588 msgid "applying to an empty history" msgstr "auf leere Historie anwenden" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1639 builtin/am.c:1643 #, c-format msgid "cannot resume: %s does not exist." msgstr "Kann nicht fortsetzen: %s existiert nicht" -#: builtin/am.c:1650 +#: builtin/am.c:1661 msgid "Commit Body is:" msgstr "Commit-Beschreibung ist:" @@ -8947,37 +10236,41 @@ msgstr "Commit-Beschreibung ist:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1671 #, 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:1710 +#: builtin/am.c:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "Konnte Index-Datei nicht schreiben." + +#: builtin/am.c:1721 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Geรคnderter Index: kann Patches nicht anwenden (geรคndert: %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1761 builtin/am.c:1829 #, c-format msgid "Applying: %.*s" msgstr "Wende an: %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1778 msgid "No changes -- Patch already applied." msgstr "Keine รnderungen -- Patches bereits angewendet." -#: builtin/am.c:1773 +#: builtin/am.c:1784 #, c-format msgid "Patch failed at %s %.*s" msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s" -#: builtin/am.c:1777 -msgid "Use 'git am --show-current-patch' to see the failed patch" +#: builtin/am.c:1788 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -"Benutzen Sie 'git am --show-current-patch', um den\n" -"fehlgeschlagenen Patch zu sehen." +"Benutzen Sie 'git am --show-current-patch=diff', um den\n" +"fehlgeschlagenen Patch zu sehen" -#: builtin/am.c:1821 +#: builtin/am.c:1832 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8988,7 +10281,7 @@ msgstr "" "diese bereits anderweitig eingefรผgt worden sein; Sie kรถnnten diesen Patch\n" "auslassen." -#: builtin/am.c:1828 +#: builtin/am.c:1839 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9001,17 +10294,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:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Konnte Objekt '%s' nicht parsen." -#: builtin/am.c:1987 +#: builtin/am.c:1998 msgid "failed to clean index" msgstr "Fehler beim Bereinigen des Index" -#: builtin/am.c:2031 +#: builtin/am.c:2042 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9019,144 +10312,156 @@ msgstr "" "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geรคndert zu haben.\n" "Keine Zurรผcksetzung zu ORIG_HEAD." -#: builtin/am.c:2128 +#: builtin/am.c:2149 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Ungรผltiger Wert fรผr --patch-format: %s" -#: builtin/am.c:2164 +#: builtin/am.c:2191 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "Ungรผltiger Wert fรผr --show-current-patch: %s" + +#: builtin/am.c:2195 +#, 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:2226 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]" -#: builtin/am.c:2165 +#: builtin/am.c:2227 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<Optionen>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2233 msgid "run interactively" msgstr "interaktiv ausfรผhren" -#: builtin/am.c:2173 +#: builtin/am.c:2235 msgid "historical option -- no-op" msgstr "historische Option -- kein Effekt" -#: builtin/am.c:2175 +#: builtin/am.c:2237 msgid "allow fall back on 3way merging if needed" msgstr "erlaube, falls notwendig, das Zurรผckfallen auf einen 3-Wege-Merge" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 msgid "be quiet" msgstr "weniger Ausgaben" -#: builtin/am.c:2178 +#: builtin/am.c:2240 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:2181 +#: builtin/am.c:2243 msgid "recode into utf8 (default)" msgstr "nach UTF-8 umkodieren (Standard)" -#: builtin/am.c:2183 +#: builtin/am.c:2245 msgid "pass -k flag to git-mailinfo" msgstr "-k an git-mailinfo รผbergeben" -#: builtin/am.c:2185 +#: builtin/am.c:2247 msgid "pass -b flag to git-mailinfo" msgstr "-b an git-mailinfo รผbergeben" -#: builtin/am.c:2187 +#: builtin/am.c:2249 msgid "pass -m flag to git-mailinfo" msgstr "-m an git-mailinfo รผbergeben" -#: builtin/am.c:2189 +#: builtin/am.c:2251 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:2192 +#: builtin/am.c:2254 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:2195 +#: builtin/am.c:2257 msgid "strip everything before a scissors line" msgstr "alles vor einer Scheren-Zeile entfernen" -#: 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 +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 msgid "pass it through git-apply" msgstr "an git-apply รผbergeben" -#: 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:141 parse-options.h:162 parse-options.h:312 +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "Anzahl" -#: 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 +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "Format" -#: builtin/am.c:2221 +#: builtin/am.c:2283 msgid "format the patch(es) are in" msgstr "Patch-Format" -#: builtin/am.c:2227 +#: builtin/am.c:2289 msgid "override error message when patch failure occurs" msgstr "Meldung bei fehlerhafter Patch-Anwendung รผberschreiben" -#: builtin/am.c:2229 +#: builtin/am.c:2291 msgid "continue applying patches after resolving a conflict" msgstr "Anwendung der Patches nach Auflรถsung eines Konfliktes fortsetzen" -#: builtin/am.c:2232 +#: builtin/am.c:2294 msgid "synonyms for --continue" msgstr "Synonyme fรผr --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2297 msgid "skip the current patch" msgstr "den aktuellen Patch auslassen" -#: builtin/am.c:2238 +#: builtin/am.c:2300 msgid "restore the original branch and abort the patching operation." msgstr "" "ursprรผnglichen Branch wiederherstellen und Anwendung der Patches abbrechen" -#: builtin/am.c:2241 +#: builtin/am.c:2303 msgid "abort the patching operation but keep HEAD where it is." msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen" -#: builtin/am.c:2244 -msgid "show the patch being applied." +#: builtin/am.c:2307 +msgid "show the patch being applied" msgstr "den Patch, der gerade angewendet wird, anzeigen" -#: builtin/am.c:2248 +#: builtin/am.c:2312 msgid "lie about committer date" msgstr "Autor-Datum als Commit-Datum verwenden" -#: builtin/am.c:2250 +#: builtin/am.c:2314 msgid "use current timestamp for author date" msgstr "aktuellen Zeitstempel als Autor-Datum verwenden" -#: 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 +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "GPG-Schlรผsselkennung" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 msgid "GPG-sign commits" msgstr "Commits mit GPG signieren" -#: builtin/am.c:2256 +#: builtin/am.c:2320 msgid "(internal use for git-rebase)" msgstr "(intern fรผr git-rebase verwendet)" -#: builtin/am.c:2274 +#: builtin/am.c:2338 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." @@ -9164,16 +10469,16 @@ msgstr "" "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n" "entfernt. Bitte verwenden Sie diese nicht mehr." -#: builtin/am.c:2281 +#: builtin/am.c:2345 msgid "failed to read the index" msgstr "Fehler beim Lesen des Index" -#: builtin/am.c:2296 +#: builtin/am.c:2360 #, 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:2320 +#: builtin/am.c:2384 #, c-format msgid "" "Stray %s directory found.\n" @@ -9182,11 +10487,11 @@ msgstr "" "Stray %s Verzeichnis gefunden.\n" "Benutzen Sie \"git am --abort\", um es zu entfernen." -#: builtin/am.c:2326 +#: builtin/am.c:2390 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:2336 +#: builtin/am.c:2400 msgid "interactive mode requires patches on the command line" msgstr "Interaktiver Modus benรถtigt Patches รผber die Kommandozeile" @@ -9224,23 +10529,23 @@ msgstr "git archive: Protokollfehler" msgid "git archive: expected a flush" msgstr "git archive: erwartete eine Spรผlung (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 --next-all" +msgstr "git bisect--helper --next-all" + +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "git bisect--helper --write-terms <bad_term> <good_term>" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:25 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<Commit>]" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" @@ -9248,7 +10553,7 @@ msgstr "" "git bisect--helper --bisect-write [--no-log] <Zustand> <Revision> " "<Begriff_gut> <Begriff_schlecht>" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:28 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" @@ -9256,13 +10561,13 @@ msgstr "" "git bisect--helper --bisect-check-and-set-terms <Befehl> <Begriff_gut> " "<Begriff_schlecht>" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" "git bisect--helper --bisect-next-check <Begriff_gut> <Begriff_schlecht> " "[<Begriff>]" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:30 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -9270,48 +10575,68 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:31 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<Begriff> --term-{new," -"bad}=<Begriff>][--no-checkout] [<schlecht> [<gut>...]] [--] [<Pfade>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<Begriff> --term-{old," +"good}=<Begriff>] [--no-checkout] [--first-parent] [<schlecht> [<gut>...]] " +"[--] [<Pfade>...]" + +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-auto-next" + +#: builtin/bisect--helper.c:35 +msgid "git bisect--helper --bisect-autostart" +msgstr "git bisect--helper --bisect-autostart" + +#: builtin/bisect--helper.c:97 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "kann Datei '%s' nicht im Modus '%s' รถffnen" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:104 +#, c-format +msgid "could not write to file '%s'" +msgstr "konnte nicht in Datei '%s' schreiben" + +#: builtin/bisect--helper.c:143 #, c-format msgid "'%s' is not a valid term" -msgstr "'%s' ist kein gรผltiger Begriff." +msgstr "'%s' ist kein gรผltiger Begriff" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:147 #, c-format msgid "can't use the builtin command '%s' as a term" -msgstr "Kann den eingebauten Befehl '%s' nicht als Begriff verwenden." +msgstr "kann den eingebauten Befehl '%s' nicht als Begriff verwenden" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't change the meaning of the term '%s'" -msgstr "Kann die Bedeutung von dem Begriff '%s' nicht รคndern." +msgstr "kann die Bedeutung von dem Begriff '%s' nicht รคndern" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:167 msgid "please use two different terms" -msgstr "Bitte verwenden Sie zwei verschiedene Begriffe." +msgstr "bitte verwenden Sie zwei verschiedene Begriffe" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "Konnte die Datei BISECT_TERMS nicht รถffnen." - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:207 #, c-format msgid "We are not bisecting.\n" msgstr "Keine binรคre Suche im Gange.\n" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:215 #, c-format msgid "'%s' is not a valid commit" -msgstr "'%s' ist kein gรผltiger Commit." +msgstr "'%s' ist kein gรผltiger Commit" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:224 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -9319,27 +10644,27 @@ msgstr "" "Konnte den ursprรผnglichen HEAD '%s' nicht auschecken.\n" "Versuchen Sie 'git bisect reset <Commit>'." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:268 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Ungรผltiges \"bisect_write\" Argument: %s" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:273 #, 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:232 +#: builtin/bisect--helper.c:285 #, c-format msgid "couldn't open the file '%s'" msgstr "Konnte die Datei '%s' nicht รถffnen." -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:311 #, 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:285 +#: builtin/bisect--helper.c:338 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9348,7 +10673,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:289 +#: builtin/bisect--helper.c:342 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9359,7 +10684,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:321 +#: builtin/bisect--helper.c:362 #, c-format msgid "bisecting only with a %s commit" msgstr "Binรคre Suche nur mit einem %s Commit." @@ -9368,15 +10693,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:329 +#: builtin/bisect--helper.c:370 msgid "Are you sure [Y/n]? " msgstr "Sind Sie sicher [Y/n]? " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:431 msgid "no terms defined" msgstr "Keine Begriffe definiert." -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:434 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9385,7 +10710,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:389 +#: builtin/bisect--helper.c:444 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9394,116 +10719,163 @@ 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:475 +#: builtin/bisect--helper.c:511 +msgid "revision walk setup failed\n" +msgstr "Einrichtung des Revisionsgangs fehlgeschlagen\n" + +#: builtin/bisect--helper.c:533 +#, c-format +msgid "could not open '%s' for appending" +msgstr "konnte '%s' nicht zum Anhรคngen รถffnen" + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +msgid "'' is not a valid term" +msgstr "'' ist kein gรผltiger Begriff" + +#: builtin/bisect--helper.c:674 #, c-format msgid "unrecognized option: '%s'" -msgstr "Nicht erkannte Position: '%s'" +msgstr "nicht erkannte Option: '%s'" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:678 #, c-format msgid "'%s' does not appear to be a valid revision" -msgstr "'%s' scheint kein gรผltiger Commit zu sein." +msgstr "'%s' scheint kein gรผltiger Commit zu sein" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:709 msgid "bad HEAD - I need a HEAD" -msgstr "Ungรผltiger HEAD - HEAD wird benรถtigt." +msgstr "ungรผltiger HEAD - HEAD wird benรถtigt" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:724 #, 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:547 +#: builtin/bisect--helper.c:745 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:550 +#: builtin/bisect--helper.c:748 msgid "bad HEAD - strange symbolic ref" -msgstr "Ungรผltiger HEAD - merkwรผrdige symbolische Referenz." +msgstr "ungรผltiger HEAD - merkwรผrdige symbolische Referenz" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:775 #, c-format msgid "invalid ref: '%s'" -msgstr "Ungรผltige Referenz: '%s'" +msgstr "ungรผltige Referenz: '%s'" + +#: builtin/bisect--helper.c:827 +msgid "You need to start by \"git bisect start\"\n" +msgstr "Sie mรผssen mit \"git bisect start\" beginnen\n" -#: builtin/bisect--helper.c:630 +#. 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:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Wollen Sie, dass ich es fรผr Sie mache [Y/n]? " + +#: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'" msgstr "'git bisect next' ausfรผhren" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:868 msgid "write the terms to .git/BISECT_TERMS" msgstr "die Begriffe nach .git/BISECT_TERMS schreiben" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:870 msgid "cleanup the bisection state" msgstr "den Zustand der binรคren Suche aufrรคumen" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:872 msgid "check for expected revs" msgstr "auf erwartete Commits prรผfen" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:874 msgid "reset the bisection state" msgstr "den Zustand der binรคren Suche zurรผcksetzen" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:876 msgid "write out the bisection state in BISECT_LOG" msgstr "den Zustand der binรคren Suche nach BISECT_LOG schreiben" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:878 msgid "check and set terms in a bisection state" msgstr "Begriffe innerhalb einer binรคren Suche prรผfen und setzen" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:880 msgid "check whether bad or good terms exist" msgstr "prรผfen, ob Begriffe fรผr gute und schlechte Commits existieren" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:882 msgid "print out the bisect terms" msgstr "die Begriffe fรผr die binรคre Suche ausgeben" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:884 msgid "start the bisect session" msgstr "Sitzung fรผr binรคre Suche starten" -#: 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:886 +msgid "find the next bisection commit" +msgstr "nรคchsten Commit fรผr die binรคre Suche finden" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" +msgstr "" +"รผberprรผfe den nรคchsten Zustand der binรคren Suche, checke dann den nรคchsten " +"Commit der binรคren Suche aus" + +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "starte die binรคre Suche, wenn diese noch nicht begonnen hat" + +#: builtin/bisect--helper.c:892 msgid "no log for BISECT_WRITE" msgstr "kein Log fรผr BISECT_WRITE" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:910 msgid "--write-terms requires two arguments" -msgstr "--write-terms benรถtigt zwei Argumente." +msgstr "--write-terms benรถtigt zwei Argumente" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:914 msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state erwartet keine Argumente." +msgstr "--bisect-clean-state erwartet keine Argumente" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:921 msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset benรถtigt entweder kein Argument oder ein Commit." +msgstr "--bisect-reset benรถtigt entweder kein Argument oder ein Commit" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:925 msgid "--bisect-write requires either 4 or 5 arguments" -msgstr "--bisect-write benรถtigt entweder 4 oder 5 Argumente." +msgstr "--bisect-write benรถtigt entweder 4 oder 5 Argumente" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:931 msgid "--check-and-set-terms requires 3 arguments" -msgstr "--check-and-set-terms benรถtigt 3 Argumente." +msgstr "--check-and-set-terms benรถtigt 3 Argumente" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:937 msgid "--bisect-next-check requires 2 or 3 arguments" -msgstr "--bisect-next-check benรถtigt 2 oder 3 Argumente." +msgstr "--bisect-next-check benรถtigt 2 oder 3 Argumente" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:943 msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms benรถtigt 0 oder 1 Argument." +msgstr "--bisect-terms benรถtigt 0 oder 1 Argument" + +#: builtin/bisect--helper.c:952 +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next benรถtigt 0 Argumente" + +#: builtin/bisect--helper.c:958 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--bisect-auto-next benรถtigt 0 Argumente" + +#: builtin/bisect--helper.c:964 +msgid "--bisect-autostart does not accept arguments" +msgstr "--bisect-autostart erwartet keine Argumente" #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" @@ -9516,152 +10888,146 @@ msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" #: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" -msgstr "Erwarte eine Farbe: %s" +msgstr "erwarte eine Farbe: %s" #: builtin/blame.c:417 msgid "must end with a color" -msgstr "Muss mit einer Farbe enden." +msgstr "muss mit einer Farbe enden" #: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" -msgstr "Ungรผltige Farbe '%s' in color.blame.repeatedLines." +msgstr "ungรผltige Farbe '%s' in color.blame.repeatedLines" #: builtin/blame.c:748 msgid "invalid value for blame.coloring" -msgstr "Ungรผltiger Wert fรผr blame.coloring." +msgstr "ungรผltiger Wert fรผr blame.coloring" -#: builtin/blame.c:823 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" -msgstr "Konnte Commit %s zum Ignorieren nicht finden" +msgstr "konnte Commit %s zum Ignorieren nicht finden" -#: builtin/blame.c:845 +#: builtin/blame.c:867 msgid "Show blame entries as we find them, incrementally" msgstr "\"blame\"-Eintrรคge schrittweise anzeigen, wรคhrend wir sie generieren" -#: 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:868 +msgid "Do not show object names of boundary commits (Default: off)" +msgstr "Zeige keine Objektnamen fรผr Grenz-Commits an (Standard: aus)" -#: builtin/blame.c:847 +#: builtin/blame.c:869 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)" -#: builtin/blame.c:848 +#: builtin/blame.c:870 msgid "Show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:849 +#: builtin/blame.c:871 msgid "Force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/blame.c:850 +#: builtin/blame.c:872 msgid "Show output score for blame entries" msgstr "Ausgabebewertung fรผr \"blame\"-Eintrรคge anzeigen" -#: builtin/blame.c:851 +#: builtin/blame.c:873 msgid "Show original filename (Default: auto)" msgstr "ursprรผnglichen Dateinamen anzeigen (Standard: auto)" -#: builtin/blame.c:852 +#: builtin/blame.c:874 msgid "Show original linenumber (Default: off)" msgstr "ursprรผngliche Zeilennummer anzeigen (Standard: aus)" -#: builtin/blame.c:853 +#: builtin/blame.c:875 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format fรผr maschinelle Auswertung" -#: builtin/blame.c:854 +#: builtin/blame.c:876 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format fรผr Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:855 +#: builtin/blame.c:877 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:856 +#: builtin/blame.c:878 msgid "Show raw timestamp (Default: off)" msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" -#: builtin/blame.c:857 +#: builtin/blame.c:879 msgid "Show long commit SHA1 (Default: off)" msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" -#: builtin/blame.c:858 +#: builtin/blame.c:880 msgid "Suppress author name and timestamp (Default: off)" msgstr "Den Namen des Autors und den Zeitstempel unterdrรผcken (Standard: aus)" -#: builtin/blame.c:859 +#: builtin/blame.c:881 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:860 +#: builtin/blame.c:882 msgid "Ignore whitespace differences" msgstr "Unterschiede im Whitespace ignorieren" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:883 builtin/log.c:1808 msgid "rev" msgstr "Commit" -#: builtin/blame.c:861 +#: builtin/blame.c:883 msgid "Ignore <rev> when blaming" msgstr "Ignoriere <rev> beim Ausfรผhren von 'blame'" -#: builtin/blame.c:862 +#: builtin/blame.c:884 msgid "Ignore revisions from <file>" msgstr "Ignoriere Commits aus <Datei>" -#: builtin/blame.c:863 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfรคrben" -#: builtin/blame.c:864 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "Zeilen nach Alter einfรคrben" -#: 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 +#: builtin/blame.c:887 msgid "Spend extra cycles to find better match" msgstr "Lรคnger arbeiten, um bessere รbereinstimmungen zu finden" -#: builtin/blame.c:874 +#: builtin/blame.c:888 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:875 +#: builtin/blame.c:889 msgid "Use <file>'s contents as the final image" msgstr "Inhalte der <Datei>en als endgรผltiges Abbild benutzen" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:876 +#: builtin/blame.c:890 msgid "Find line copies within and across files" msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:877 +#: builtin/blame.c:891 msgid "Find line movements within and across files" msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:892 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:929 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress kann nicht mit --incremental oder Formaten fรผr Fremdprogramme\n" @@ -9675,24 +11041,24 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "vor 4 Jahren und 11 Monaten" -#: builtin/blame.c:1087 +#: builtin/blame.c:1110 #, 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:1133 +#: builtin/blame.c:1156 msgid "Blaming lines" msgstr "Verarbeite Zeilen" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" +msgstr "git branch [<Optionen>] [-r | -a] [--merged] [--no-merged]" #: builtin/branch.c:30 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" @@ -9903,7 +11269,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:485 +#: builtin/branch.c:626 builtin/rebase.c:526 msgid "upstream" msgstr "Upstream" @@ -9912,7 +11278,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 @@ -9996,68 +11362,68 @@ msgstr "nur nicht zusammengefรผhrte Branches ausgeben" msgid "list branches in columns" msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 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 +#: builtin/tag.c:434 msgid "object" msgstr "Objekt" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "nur Branches von diesem Objekt ausgeben" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "Sortierung und Filterung sind unabhรคngig von Groร- und Kleinschreibung" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "fรผr die Ausgabe zu verwendendes Format" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "zu losgelรถstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "zu viele Branches fรผr eine Kopieroperation angegeben" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "zu viele Argumente fรผr eine Umbenennen-Operation angegeben" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -10065,34 +11431,34 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "" "zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu " "entfernen" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n" "auf keinen Branch zeigt." -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:841 +#: builtin/branch.c:839 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>?" @@ -10101,7 +11467,7 @@ msgstr "" "verwendet werden.\n" "Wollten Sie -a|-r --list <Muster> benutzen?" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -10109,20 +11475,167 @@ msgstr "" "Die '--set-upstream' Option wird nicht lรคnger unterstรผtzt.\n" "Bitte benutzen Sie stattdessen '--track' oder '--set-upstream-to'." -#: builtin/bundle.c:45 +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "git Version:\n" + +#: builtin/bugreport.c:21 #, c-format -msgid "%s is okay\n" -msgstr "%s ist in Ordnung\n" +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() ist fehlgeschlagen mit Fehler '%s' (%d)\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "Compiler Info: " + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "libc Info: " + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "nicht in einem Git-Repository ausgefรผhrt - keine Hooks zum Anzeigen\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "git bugreport [-o|--output-directory <Datei>] [-s|--suffix <Format>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"Vielen Dank fรผr das Ausfรผllen eines Git-Fehlerberichts!\n" +"Bitte antworten Sie auf die folgenden Fragen, um uns dabei zu helfen, Ihr\n" +"Problem zu verstehen.\n" +"\n" +"Was haben Sie gemacht, bevor der Fehler auftrat? (Schritte, um Ihr Fehler\n" +"zu reproduzieren)\n" +"\n" +"Was haben Sie erwartet, was passieren soll? (Erwartetes Verhalten)\n" +"\n" +"Was ist stattdessen passiert? (Wirkliches Verhalten)\n" +"\n" +"Was ist der Unterschied zwischen dem, was Sie erwartet haben und was\n" +"wirklich passiert ist?\n" +"\n" +"Sonstige Anmerkungen, die Sie hinzufรผgen mรถchten:\n" +"\n" +"Bitte รผberprรผfen Sie den restlichen Teil des Fehlerberichts unten.\n" +"Sie kรถnnen jede Zeile lรถschen, die Sie nicht mitteilen mรถchten.\n" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "Speicherort fรผr die Datei des Fehlerberichts angeben" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "Dateiendung im strftime-Format fรผr den Dateinamen angeben" + +#: builtin/bugreport.c:158 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "konnte vorangehende Verzeichnisse fรผr '%s' nicht erstellen" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "System Info" + +#: builtin/bugreport.c:168 +msgid "Enabled Hooks" +msgstr "Aktivierte Hooks" + +#: builtin/bugreport.c:175 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "konnte keine neue Datei unter '%s' erstellen" + +#: builtin/bugreport.c:178 +#, c-format +msgid "unable to write to %s" +msgstr "konnte nicht nach %s schreiben" + +#: builtin/bugreport.c:188 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "Neuer Bericht unter '%s' erstellt.\n" + +#: 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:58 +#: builtin/bundle.c:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "keine Fortschrittsanzeige anzeigen" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "Fortschrittsanzeige anzeigen" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +msgid "show progress meter during object writing phase" +msgstr "Forschrittsanzeige wรคhrend des Schreibens von Objekten anzeigen" + +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +msgid "similar to --all-progress when progress meter is shown" +msgstr "รคhnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" + +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "Version des Paket-Formats angeben" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "Um ein Paket zu erstellen wird ein Repository benรถtigt." -#: builtin/bundle.c:62 +#: builtin/bundle.c:107 +msgid "do not show bundle details" +msgstr "Keine Bundle-Details anzeigen" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "%s ist in Ordnung\n" + +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "Zum Entpacken wird ein Repository benรถtigt." -#: builtin/cat-file.c:594 +#: builtin/bundle.c:171 builtin/remote.c:1687 +msgid "be verbose; must be placed before a subcommand" +msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden" + +#: builtin/bundle.c:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Unbekannter Unterbefehl: %s" + +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10130,84 +11643,84 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:599 msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<Format>] | --batch-check[=<Format>]) [--follow-" +"symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "Nur eine Batch-Option erlaubt." -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<Art> kann sein: blob, tree, commit, tag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "Objektart anzeigen" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "Objektgrรถรe anzeigen" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "mit Rรผckgabewert 0 beenden, wenn kein Fehler aufgetreten ist" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "ansprechende Anzeige des Objektinhaltes" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:645 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:643 +#: builtin/cat-file.c:647 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:644 git-submodule.sh:936 +#: builtin/cat-file.c:648 msgid "blob" msgstr "Blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "einen bestimmten Pfad fรผr --textconv/--filters verwenden" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:651 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "-s und -t mit beschรคdigten Objekten erlauben" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "Ausgabe von --batch puffern" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:654 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:654 +#: builtin/cat-file.c:658 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:658 +#: builtin/cat-file.c:662 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:660 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "alle Objekte mit --batch oder --batch-check anzeigen" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "Ausgabe von --batch-all-objects nicht ordnen" @@ -10235,8 +11748,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:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrรผcken" @@ -10248,28 +11761,28 @@ msgstr "Eingabe-Pfade ohne รbereinstimmungen anzeigen" msgid "ignore index when checking" msgstr "Index bei der Prรผfung ignorieren" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "Die Option -z kann nur mit --stdin verwendet werden." -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "kein Pfad angegeben" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 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:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "" "Die Optionen --quiet und --verbose kรถnnen nicht gemeinsam verwendet werden." -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching ist nur mit --verbose zulรคssig" @@ -10329,9 +11842,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:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 msgid "string" msgstr "Zeichenkette" @@ -10360,99 +11873,99 @@ msgstr "git switch [<Optionen>] [<Branch>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<Optionen>] [--source=<Branch>] <Datei>..." -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "Pfad '%s' hat nicht unsere Version." -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "Pfad '%s' hat nicht deren Version." -#: builtin/checkout.c:190 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "Pfad '%s' hat nicht alle notwendigen Versionen." -#: builtin/checkout.c:240 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "Pfad '%s' hat nicht die notwendigen Versionen." -#: builtin/checkout.c:258 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "Pfad '%s': kann nicht zusammenfรผhren" -#: builtin/checkout.c:274 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufรผgen." -#: builtin/checkout.c:374 +#: builtin/checkout.c:396 #, 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:379 +#: builtin/checkout.c:401 #, 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:386 +#: builtin/checkout.c:408 #, 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:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:429 +#: builtin/checkout.c:451 #, 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:433 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "Weder '%s' noch '%s' ist angegeben" -#: builtin/checkout.c:437 +#: builtin/checkout.c:459 #, 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:442 builtin/checkout.c:447 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' oder '%s' kann nicht mit %s verwendet werden" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:528 builtin/checkout.c:535 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengefรผhrt." -#: builtin/checkout.c:679 +#: builtin/checkout.c:703 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:729 +#: builtin/checkout.c:757 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10461,57 +11974,50 @@ msgstr "" "Kann nicht mit vorgemerkten รnderungen in folgenden Dateien fortsetzen:\n" "%s" -#: 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 +#: builtin/checkout.c:853 #, 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:875 +#: builtin/checkout.c:895 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:899 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "Konnte HEAD nicht aktualisieren." -#: builtin/checkout.c:883 +#: builtin/checkout.c:903 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:906 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:910 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:912 builtin/checkout.c:1338 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:914 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:965 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:971 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10534,7 +12040,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:990 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10561,28 +12067,19 @@ msgstr[1] "" " git branch <neuer-Branchname> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1025 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1029 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1069 builtin/checkout.c:1333 msgid "You are on a branch yet to be born" msgstr "Sie sind auf einem Branch, der noch nicht geboren ist" -#: 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 +#: builtin/checkout.c:1146 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10592,37 +12089,74 @@ msgstr "" "Bitte benutzen Sie -- (und optional --no-guess), um diese\n" "eindeutig voneinander zu unterscheiden." -#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1153 +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:1163 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "'%s' entspricht mehreren (%d) Remote-Tracking-Branches" + +#: builtin/checkout.c:1229 +msgid "only one reference expected" +msgstr "nur eine Referenz erwartet" + +#: builtin/checkout.c:1246 +#, c-format +msgid "only one reference expected, %d given." +msgstr "nur eine Referenz erwartet, %d gegeben." + +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "Ungรผltige Referenz: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1305 builtin/checkout.c:1671 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1352 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "Ein Branch wird erwartet, Tag '%s' bekommen" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1354 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1355 builtin/checkout.c:1363 #, c-format msgid "a branch is expected, got '%s'" msgstr "Ein Branch wird erwartet, '%s' bekommen" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1358 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "Ein Branch wird erwartet, Commit '%s' bekommen" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1374 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10630,7 +12164,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:1329 +#: builtin/checkout.c:1378 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -10639,7 +12173,7 @@ msgstr "" "werden.\n" "Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1333 +#: builtin/checkout.c:1382 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10648,7 +12182,7 @@ msgstr "" "werden.\n" "Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1386 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10657,7 +12191,7 @@ msgstr "" "gewechselt werden.\n" "Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1341 +#: builtin/checkout.c:1390 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10666,140 +12200,147 @@ msgstr "" "werden.\n" "Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1394 msgid "you are switching branch while bisecting" msgstr "Sie wechseln den Branch wรคhrend einer binรคren Suche" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1401 msgid "paths cannot be used with switching branches" msgstr "Pfade kรถnnen nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1429 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' kann nicht <Startpunkt> bekommen" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1437 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1444 msgid "missing branch or commit argument" msgstr "Branch- oder Commit-Argument fehlt" -#: 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 +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 msgid "force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1487 msgid "perform a 3-way merge with the new branch" msgstr "einen 3-Wege-Merge mit dem neuen Branch ausfรผhren" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1489 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1501 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "HEAD bei benanntem Commit loslรถsen" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1502 msgid "set upstream info for new branch" msgstr "Informationen zum Upstream-Branch fรผr den neuen Branch setzen" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1504 msgid "force checkout (throw away local modifications)" msgstr "Auschecken erzwingen (verwirft lokale รnderungen)" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1508 builtin/merge.c:291 msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1511 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:1475 +#: builtin/checkout.c:1524 msgid "checkout our version for unmerged files" msgstr "unsere Variante fรผr nicht zusammengefรผhrte Dateien auschecken" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1527 msgid "checkout their version for unmerged files" msgstr "ihre Variante fรผr nicht zusammengefรผhrte Dateien auschecken" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1531 msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschrรคnkung bei Pfadspezifikationen zum partiellen Auschecken" -#: 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:1586 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "die Optionen -%c, -%c und --orphan schlieรen sich gegenseitig aus" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1590 msgid "-p and --overlay are mutually exclusive" msgstr "-p und --overlay schlieรen sich gegenseitig aus." -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1627 msgid "--track needs a branch name" msgstr "Bei der Option --track muss ein Branchname angegeben werden." -#: builtin/checkout.c:1578 -msgid "missing branch name; try -b" -msgstr "Kein Branchname; versuchen Sie -b." +#: builtin/checkout.c:1632 +#, c-format +msgid "missing branch name; try -%c" +msgstr "kein Branchname; versuchen Sie -%c" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1664 #, c-format msgid "could not resolve %s" msgstr "Konnte %s nicht auflรถsen." -#: 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 +#: builtin/checkout.c:1680 msgid "invalid path specification" msgstr "ungรผltige Pfadspezifikation" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1687 #, 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:1642 +#: builtin/checkout.c:1691 #, 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:1646 +#: builtin/checkout.c:1700 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "Die Optionen --pathspec-from-file und --detach sind inkompatibel." + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "Die Optionen --pathspec-from-file und --patch sind inkompatibel." + +#: builtin/checkout.c:1716 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10807,138 +12348,110 @@ msgstr "" "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n" "Sie aus dem Index auschecken." -#: 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:1721 +msgid "you must specify path(s) to restore" +msgstr "Sie mรผssen Pfad(e) zur Wiederherstellung angeben." -#: 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 +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 msgid "branch" msgstr "Branch" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1748 msgid "create and checkout a new branch" msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1750 msgid "create/reset and checkout a branch" msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1751 msgid "create reflog for new branch" msgstr "das Reflog fรผr den neuen Branch erzeugen" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1753 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:1698 +#: builtin/checkout.c:1754 msgid "use overlay mode (default)" msgstr "benutze Overlay-Modus (Standard)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1799 msgid "create and switch to a new branch" msgstr "einen neuen Branch erzeugen und dahin wechseln" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1801 msgid "create/reset and switch to a branch" msgstr "einen Branch erstellen/umsetzen und dahin wechseln" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1803 msgid "second guess 'git switch <no-such-branch>'" msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1805 msgid "throw away local modifications" msgstr "lokale รnderungen verwerfen" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1839 msgid "which tree-ish to checkout from" msgstr "Von welcher Commit-Referenz ausgecheckt werden soll" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1841 msgid "restore the index" msgstr "Index wiederherstellen" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1843 msgid "restore the working tree (default)" msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1845 msgid "ignore unmerged entries" msgstr "ignoriere nicht zusammengefรผhrte Eintrรคge" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1846 msgid "use overlay mode" msgstr "benutze Overlay-Modus" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <Muster>] [-x | -X] [--] <Pfade>..." -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "Lรถsche %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "Wรผrde %s lรถschen\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "รberspringe Repository %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "Wรผrde Repository %s รผberspringen\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "Fehler beim Lรถschen von %s" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "Konnte 'lstat' nicht fรผr %s ausfรผhren\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10951,7 +12464,7 @@ msgstr "" "foo - Element anhand eines eindeutigen Prรคfix auswรคhlen\n" " - (leer) nichts auswรคhlen\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10972,38 +12485,33 @@ msgstr "" "* - alle Elemente auswรคhlen\n" " - (leer) Auswahl beenden\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Wie bitte (%s)?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "Ignorier-Muster eingeben>> " -#: builtin/clean.c:699 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "WARNUNG: Kann keine Eintrรคge finden die Muster entsprechen: %s" -#: builtin/clean.c:720 +#: builtin/clean.c:717 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:761 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "'%s' lรถschen [y/N]? " -#: builtin/clean.c:786 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "Tschรผss.\n" - -#: builtin/clean.c:794 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11021,64 +12529,52 @@ msgstr "" "help - diese Meldung anzeigen\n" "? - Hilfe zur Auswahl mittels Eingabe anzeigen" -#: 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 +#: builtin/clean.c:825 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:846 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "Keine Dateien mehr zum Lรถschen, beende." -#: builtin/clean.c:908 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "keine Namen von gelรถschten Dateien ausgeben" -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "force" msgstr "Aktion erzwingen" -#: builtin/clean.c:911 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "interaktives Clean" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "ganze Verzeichnisse lรถschen" -#: 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/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "Muster" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "<Muster> zu den Regeln fรผr ignorierte Pfade hinzufรผgen" -#: builtin/clean.c:916 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "auch ignorierte Dateien lรถschen" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "nur ignorierte Dateien lรถschen" -#: 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:940 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11086,7 +12582,7 @@ msgstr "" "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; " "\"clean\" verweigert" -#: builtin/clean.c:943 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11094,7 +12590,11 @@ msgstr "" "clean.requireForce standardmรครig auf \"true\" gesetzt und weder -i, -n noch -" "f gegeben; \"clean\" verweigert" -#: builtin/clone.c:46 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "Die Optionen -x und -X kรถnnen nicht gemeinsam verwendet werden." + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" @@ -11102,7 +12602,7 @@ msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" msgid "don't create a checkout" msgstr "kein Auschecken" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 msgid "create a bare repository" msgstr "ein Bare-Repository erstellen" @@ -11122,11 +12622,11 @@ msgstr "lokal keine harten Verweise verwenden, immer Kopien" msgid "setup as shared repository" msgstr "als verteiltes Repository einrichten" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "Pfadspezifikation" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "Submodule im Klon initialisieren" @@ -11134,26 +12634,26 @@ msgstr "Submodule im Klon initialisieren" msgid "number of submodules cloned in parallel" msgstr "Anzahl der parallel zu klonenden Submodule" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:550 msgid "template-directory" msgstr "Vorlagenverzeichnis" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:551 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:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "Repository referenzieren" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 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:3314 builtin/repack.c:319 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 msgid "name" msgstr "Name" @@ -11169,8 +12669,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:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/pull.c:208 msgid "depth" msgstr "Tiefe" @@ -11179,7 +12679,8 @@ 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:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 msgid "time" msgstr "Zeit" @@ -11190,18 +12691,19 @@ msgstr "" "Zeit\n" "erstellen" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 msgid "revision" msgstr "Commit" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 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/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "nur einen Branch klonen, HEAD oder --branch" @@ -11213,11 +12715,11 @@ msgstr "keine Tags klonen, und auch bei spรคteren Abrufen nicht beachten" msgid "any cloned submodules will be shallow" msgstr "jedes geklonte Submodul mit unvollstรคndiger Historie (shallow)" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:559 msgid "gitdir" msgstr ".git-Verzeichnis" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren" @@ -11229,23 +12731,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:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 msgid "server-specific" msgstr "serverspezifisch" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 msgid "option to transmit" msgstr "Option รผbertragen" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 msgid "use IPv4 addresses only" msgstr "nur IPv4-Adressen benutzen" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 msgid "use IPv6 addresses only" msgstr "nur IPv6-Adressen benutzen" @@ -11253,7 +12755,13 @@ 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:285 +#: 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 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11261,47 +12769,42 @@ msgstr "" "Konnte keinen Verzeichnisnamen erraten.\n" "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an." -#: builtin/clone.c:338 +#: builtin/clone.c:340 #, 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:411 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" -#: builtin/clone.c:428 +#: builtin/clone.c:431 #, c-format msgid "failed to start iterator over '%s'" msgstr "Fehler beim Starten der Iteration รผber '%s'" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "Konnte '%s' nicht entfernen." - -#: builtin/clone.c:458 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "Konnte Verweis '%s' nicht erstellen" -#: builtin/clone.c:462 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "Konnte Datei nicht nach '%s' kopieren" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "Fehler beim Iterieren รผber '%s'" -#: builtin/clone.c:492 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "Fertig.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:512 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11311,97 +12814,107 @@ 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:583 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." -#: builtin/clone.c:702 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "kann %s nicht aktualisieren" -#: builtin/clone.c:752 +#: builtin/clone.c:756 +msgid "failed to initialize sparse-checkout" +msgstr "Fehler beim Initialisieren vom partiellen Checkout." + +#: builtin/clone.c:779 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:783 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" -#: builtin/clone.c:833 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben" -#: builtin/clone.c:896 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "Kann \"repack\" zum Aufrรคumen nicht aufrufen" -#: builtin/clone.c:898 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "Kann temporรคre \"alternates\"-Datei nicht entfernen" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:970 builtin/receive-pack.c:2434 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:942 +#: builtin/clone.c:974 msgid "You must specify a repository to clone." msgstr "Sie mรผssen ein Repository zum Klonen angeben." -#: builtin/clone.c:955 +#: builtin/clone.c:987 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Die Optionen --bare und --origin %s sind inkompatibel." -#: builtin/clone.c:958 +#: builtin/clone.c:990 msgid "--bare and --separate-git-dir are incompatible." msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:971 +#: builtin/clone.c:1006 #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:1010 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" -#: builtin/clone.c:987 +#: builtin/clone.c:1020 #, 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:997 +#: builtin/clone.c:1026 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "" +"Pfad des Repositories '%s' existiert bereits und ist kein leeres Verzeichnis." + +#: builtin/clone.c:1040 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte fรผhrende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:1017 +#: builtin/clone.c:1060 #, c-format msgid "could not create work tree dir '%s'" msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:1037 +#: builtin/clone.c:1080 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1082 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1106 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11409,45 +12922,45 @@ msgstr "" "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-" "able" -#: builtin/clone.c:1124 +#: builtin/clone.c:1170 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:1126 +#: builtin/clone.c:1172 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:1128 +#: builtin/clone.c:1174 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:1130 +#: builtin/clone.c:1176 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" "--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://" -#: builtin/clone.c:1133 +#: builtin/clone.c:1179 msgid "source repository is shallow, ignoring --local" msgstr "" "Quelle ist ein Repository mit unvollstรคndiger Historie (shallow),\n" "ignoriere --local" -#: builtin/clone.c:1138 +#: builtin/clone.c:1184 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1268 builtin/clone.c:1276 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:1226 +#: builtin/clone.c:1279 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." @@ -11483,6 +12996,117 @@ msgstr "Abstand zwischen Spalten" msgid "--command must be the first argument" msgstr "Die Option --command muss an erster Stelle stehen." +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +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:14 builtin/commit-graph.c:27 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" +"git commit-graph write [--object-dir <Objektverzeichnis>] [--append] [--" +"split[=<Strategie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <Anzahl>] [--[no-]progress] <Split-Optionen>" + +#: builtin/commit-graph.c:64 +#, c-format +msgid "could not find object directory matching %s" +msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "Verzeichnis" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "Das Objektverzeichnis zum Speichern des Graphen." + +#: builtin/commit-graph.c:83 +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:106 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "Konnte Commit-Graph '%s' nicht รถffnen." + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "nicht erkanntes --split Argument, %s" + +#: builtin/commit-graph.c:155 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "unerwartete nicht-hexadezimale Objekt-ID: %s" + +#: builtin/commit-graph.c:160 +#, c-format +msgid "invalid object: %s" +msgstr "ungรผltiges Objekt: %s" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "Durchlauf auf allen Referenzen beginnen" + +#: builtin/commit-graph.c:215 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen" + +#: builtin/commit-graph.c:217 +msgid "start walk at commits listed by stdin" +msgstr "Lauf bei Commits beginnen, die รผber die Standard-Eingabe gelistet sind" + +#: builtin/commit-graph.c:219 +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:221 +msgid "enable computation for changed paths" +msgstr "Berechnung fรผr verรคnderte Pfade aktivieren" + +#: builtin/commit-graph.c:224 +msgid "allow writing an incremental commit-graph file" +msgstr "erlaube das Schreiben einer inkrementellen Commit-Graph-Datei" + +#: builtin/commit-graph.c:228 +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:230 +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:232 +msgid "only expire files older than a given date-time" +msgstr "nur Objekte รคlter als angegebene Zeit verfallen lassen" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "maximale Anzahl der zu berechnenden Bloom-Filter fรผr verรคnderte Pfade" + +#: builtin/commit-graph.c:255 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "" +"benutzen Sie mindestens eine der folgenden Optionen: --reachable, " +"--stdin-commits, oder --stdin-packs" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "Sammle Commits von der Standard-Eingabe" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -11496,7 +13120,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:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 #, c-format msgid "not a valid object name %s" msgstr "Kein gรผltiger Objektname: %s" @@ -11524,13 +13148,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:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 -#: builtin/tag.c:412 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 msgid "message" msgstr "Beschreibung" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "Commit-Beschreibung" @@ -11538,8 +13162,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:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Commit mit GPG signieren" @@ -11585,10 +13209,14 @@ msgstr "" "\n" #: builtin/commit.c:63 +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "Andernfalls benutzen Sie bitte 'git rebase --skip'\n" + +#: builtin/commit.c:66 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Andernfalls benutzen Sie bitte 'git cherry-pick --skip'\n" -#: builtin/commit.c:66 +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -11610,62 +13238,74 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD." -#: builtin/commit.c:356 +#: builtin/commit.c:348 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "Option --pathspec-from-file mit -a ist nicht sinnvoll." + +#: builtin/commit.c:361 +msgid "No paths with --include/--only does not make sense." +msgstr "Keine Pfade mit der Option --include/--only ist nicht sinnvoll." + +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "Konnte temporรคren Index nicht erstellen." -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "interaktives Hinzufรผgen fehlgeschlagen" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "Konnte temporรคren Index nicht aktualisieren." -#: builtin/commit.c:378 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "Konnte new_index Datei nicht schreiben" -#: builtin/commit.c:455 +#: builtin/commit.c:476 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:457 +#: builtin/commit.c:478 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:465 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "kann keinen Teil-Commit durchfรผhren, wรคhrend ein Rebase im Gange ist." + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "Konnte temporรคre Index-Datei nicht schreiben." -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "Commit '%s' fehlt Autor-Kopfbereich" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "Commit '%s' hat fehlerhafte Autor-Zeile" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11673,68 +13313,66 @@ msgstr "" "Konnte kein Kommentar-Zeichen auswรคhlen, das nicht in\n" "der aktuellen Commit-Beschreibung verwendet wird." -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:478 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "Konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "Konnte Commit-Vorlage nicht schreiben" -#: builtin/commit.c:829 -#, c-format +#: builtin/commit.c:853 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" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" "Es sieht so aus, als committen Sie einen Merge.\n" -"Falls das nicht korrekt ist, lรถschen Sie bitte die Datei\n" -"\t%s\n" -"und versuchen Sie es erneut.\n" +"Falls das nicht korrekt ist, fรผhren Sie bitte\n" +"\tgit update-ref -d MERGE_HEAD\n" +"aus und versuchen Sie es erneut.\n" -#: builtin/commit.c:834 -#, c-format +#: builtin/commit.c:858 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" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" "Es sieht so aus, als committen Sie einen \"cherry-pick\".\n" -"Falls das nicht korrekt ist, lรถschen Sie bitte die Datei\n" -"\t%s\n" -"und versuchen Sie es erneut.\n" +"Falls das nicht korrekt ist, fรผhren Sie bitte\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"aus und versuchen Sie es erneut.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11744,7 +13382,7 @@ msgstr "" "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11757,155 +13395,153 @@ msgstr "" "entfernen.\n" "Eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/commit.c:872 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommit-Ersteller: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:972 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:276 #, 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:1030 +#: builtin/commit.c:1055 #, 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:1044 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ungรผltiger ignored-Modus '%s'." -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungรผltiger Modus '%s' fรผr unversionierte Dateien" -#: builtin/commit.c:1102 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "Die Optionen --long und -z sind inkompatibel." -#: builtin/commit.c:1146 +#: builtin/commit.c:1171 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:1155 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "Sie haben nichts fรผr \"--amend\"." -#: builtin/commit.c:1158 +#: builtin/commit.c:1183 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:1160 +#: builtin/commit.c:1185 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:1163 +#: builtin/commit.c:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "Ein Rebase ist im Gange -- kann \"--amend\" nicht ausfรผhren." + +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup kรถnnen nicht gemeinsam verwendet werden." -#: builtin/commit.c:1173 +#: builtin/commit.c:1200 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:1175 +#: builtin/commit.c:1202 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:1183 +#: builtin/commit.c:1211 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:1200 +#: builtin/commit.c:1229 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: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 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "Pfade '%s ...' mit -a sind nicht sinnvoll" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "Status im Kurzformat anzeigen" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "Branchinformationen anzeigen" -#: builtin/commit.c:1343 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "Stashinformationen anzeigen" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "voraus/hinterher-Werte berechnen" -#: builtin/commit.c:1347 +#: builtin/commit.c:1374 msgid "version" msgstr "Version" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "Status im Langformat anzeigen (Standard)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "Eintrรคge mit NUL-Zeichen abschlieรen" -#: 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 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 msgid "mode" msgstr "Modus" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1383 builtin/commit.c:1541 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:1360 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11913,11 +13549,11 @@ msgstr "" "ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. " "(Standard: traditional)" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "wann" -#: builtin/commit.c:1363 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11925,174 +13561,174 @@ msgstr "" "รnderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. " "(Standard: all)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "unversionierte Dateien in Spalten auflisten" -#: builtin/commit.c:1366 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "keine Umbenennungen ermitteln" -#: builtin/commit.c:1368 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "Umbenennungen erkennen, optional Index fรผr Gleichheit setzen" -#: builtin/commit.c:1388 +#: builtin/commit.c:1415 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Nicht unterstรผtzte Kombination von ignored und untracked-files Argumenten." -#: builtin/commit.c:1493 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "Zusammenfassung nach erfolgreichem Commit unterdrรผcken" -#: builtin/commit.c:1494 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" -#: builtin/commit.c:1496 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "Optionen fรผr Commit-Beschreibung" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 msgid "read message from file" msgstr "Beschreibung von Datei lesen" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "author" msgstr "Autor" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "Autor eines Commits รผberschreiben" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:539 msgid "date" msgstr "Datum" -#: builtin/commit.c:1499 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "Datum eines Commits รผberschreiben" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "Commit" -#: builtin/commit.c:1501 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren" -#: builtin/commit.c:1502 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden" -#: builtin/commit.c:1503 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des " "angegebenen Commits verwenden" -#: builtin/commit.c:1504 +#: builtin/commit.c:1508 msgid "use autosquash formatted message to squash specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des " "angegebenen Commits verwenden" -#: builtin/commit.c:1505 +#: builtin/commit.c:1509 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:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "'Signed-off-by:'-Zeile hinzufรผgen" -#: builtin/commit.c:1507 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "angegebene Vorlagendatei verwenden" -#: builtin/commit.c:1508 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "Bearbeitung des Commits erzwingen" -#: builtin/commit.c:1510 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "Status in die Commit-Beschreibungsvorlage einfรผgen" -#: builtin/commit.c:1515 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "Optionen fรผr Commit-Inhalt" -#: builtin/commit.c:1516 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "alle geรคnderten Dateien committen" -#: builtin/commit.c:1517 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "die angegebenen Dateien zusรคtzlich zum Commit vormerken" -#: builtin/commit.c:1518 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "interaktives Hinzufรผgen von Dateien" -#: builtin/commit.c:1519 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "interaktives Hinzufรผgen von รnderungen" -#: builtin/commit.c:1520 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "nur die angegebenen Dateien committen" -#: builtin/commit.c:1521 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "Hooks pre-commit und commit-msg umgehen" -#: builtin/commit.c:1522 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "anzeigen, was committet werden wรผrde" -#: builtin/commit.c:1535 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "vorherigen Commit รคndern" -#: builtin/commit.c:1536 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "\"post-rewrite hook\" umgehen" -#: builtin/commit.c:1541 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "Aufzeichnung einer leeren รnderung erlauben" -#: builtin/commit.c:1543 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "Aufzeichnung einer รnderung mit einer leeren Beschreibung erlauben" -#: builtin/commit.c:1616 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschรคdigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1623 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1642 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1654 +#: builtin/commit.c:1662 #, 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:1688 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12103,291 +13739,222 @@ 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 -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: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] <split options>" -msgstr "" -"git commit-graph write [--object-dir <Objektverzeichnis>] [--append|split] " -"[--reachable|--stdin-packs|--stdin-commits] <Split-Optionen>" - -#: 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: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: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: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:164 -msgid "start walk at all refs" -msgstr "Durchlauf auf allen Referenzen beginnen" - -#: 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: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: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:172 -msgid "allow writing an incremental commit-graph file" -msgstr "Erlaube das Schreiben einer inkrementellen Commit-Graph-Datei" - -#: 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: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:191 -msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" -msgstr "" -"Benutzen Sie mindestens eins von --reachable, --stdin-commits, oder --stdin-" -"packs." - #: builtin/config.c:11 msgid "git config [<options>]" msgstr "git config [<Optionen>]" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:107 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "nicht erkanntes --type Argument, %s" -#: builtin/config.c:115 +#: builtin/config.c:119 msgid "only one type at a time" msgstr "nur ein Typ erlaubt" -#: builtin/config.c:124 +#: builtin/config.c:128 msgid "Config file location" msgstr "Ort der Konfigurationsdatei" -#: builtin/config.c:125 +#: builtin/config.c:129 msgid "use global config file" msgstr "globale Konfigurationsdatei verwenden" -#: builtin/config.c:126 +#: builtin/config.c:130 msgid "use system config file" msgstr "systemweite Konfigurationsdatei verwenden" -#: builtin/config.c:127 +#: builtin/config.c:131 msgid "use repository config file" msgstr "Konfigurationsdatei des Repositories verwenden" -#: builtin/config.c:128 +#: builtin/config.c:132 msgid "use per-worktree config file" msgstr "Konfigurationsdatei pro Arbeitsverzeichnis verwenden" -#: builtin/config.c:129 +#: builtin/config.c:133 msgid "use given config file" msgstr "die angegebene Konfigurationsdatei verwenden" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "blob-id" msgstr "Blob-Id" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "read config from given blob object" msgstr "Konfiguration von angegebenem Blob-Objekt lesen" -#: builtin/config.c:131 +#: builtin/config.c:135 msgid "Action" msgstr "Aktion" -#: builtin/config.c:132 +#: builtin/config.c:136 msgid "get value: name [value-regex]" msgstr "Wert zurรผckgeben: Name [Wert-regex]" -#: builtin/config.c:133 +#: builtin/config.c:137 msgid "get all values: key [value-regex]" msgstr "alle Werte zurรผckgeben: Schlรผssel [Wert-regex]" -#: builtin/config.c:134 +#: builtin/config.c:138 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:135 +#: builtin/config.c:139 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:136 +#: builtin/config.c:140 msgid "replace all matching variables: name value [value_regex]" msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] " -#: builtin/config.c:137 +#: builtin/config.c:141 msgid "add a new variable: name value" msgstr "neue Variable hinzufรผgen: Name Wert" -#: builtin/config.c:138 +#: builtin/config.c:142 msgid "remove a variable: name [value-regex]" msgstr "eine Variable entfernen: Name [Wert-regex]" -#: builtin/config.c:139 +#: builtin/config.c:143 msgid "remove all matches: name [value-regex]" msgstr "alle รbereinstimmungen entfernen: Name [Wert-regex]" -#: builtin/config.c:140 +#: builtin/config.c:144 msgid "rename section: old-name new-name" msgstr "eine Sektion umbenennen: alter-Name neuer-Name" -#: builtin/config.c:141 +#: builtin/config.c:145 msgid "remove a section: name" msgstr "eine Sektion entfernen: Name" -#: builtin/config.c:142 +#: builtin/config.c:146 msgid "list all" msgstr "alles auflisten" -#: builtin/config.c:143 +#: builtin/config.c:147 msgid "open an editor" msgstr "einen Editor รถffnen" -#: builtin/config.c:144 +#: builtin/config.c:148 msgid "find the color configured: slot [default]" msgstr "die konfigurierte Farbe finden: Slot [Standard]" -#: builtin/config.c:145 +#: builtin/config.c:149 msgid "find the color setting: slot [stdout-is-tty]" msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]" -#: builtin/config.c:146 +#: builtin/config.c:150 msgid "Type" msgstr "Typ" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:151 builtin/env--helper.c:43 msgid "value is given this type" msgstr "Wert ist mit diesem Typ angegeben" -#: builtin/config.c:148 +#: builtin/config.c:152 msgid "value is \"true\" or \"false\"" msgstr "Wert ist \"true\" oder \"false\"" -#: builtin/config.c:149 +#: builtin/config.c:153 msgid "value is decimal number" msgstr "Wert ist eine Dezimalzahl" -#: builtin/config.c:150 +#: builtin/config.c:154 msgid "value is --bool or --int" msgstr "Wert ist --bool oder --int" -#: builtin/config.c:151 +#: builtin/config.c:155 +msgid "value is --bool or string" +msgstr "Wert ist --bool oder string" + +#: builtin/config.c:156 msgid "value is a path (file or directory name)" msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)" -#: builtin/config.c:152 +#: builtin/config.c:157 msgid "value is an expiry date" msgstr "Wert ist ein Verfallsdatum" -#: builtin/config.c:153 +#: builtin/config.c:158 msgid "Other" msgstr "Sonstiges" -#: builtin/config.c:154 +#: builtin/config.c:159 msgid "terminate values with NUL byte" msgstr "schlieรt Werte mit NUL-Byte ab" -#: builtin/config.c:155 +#: builtin/config.c:160 msgid "show variable names only" msgstr "nur Variablennamen anzeigen" -#: builtin/config.c:156 +#: builtin/config.c:161 msgid "respect include directives on lookup" msgstr "beachtet \"include\"-Direktiven beim Nachschlagen" -#: builtin/config.c:157 +#: builtin/config.c:162 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, " "Befehlszeile)" -#: builtin/config.c:158 builtin/env--helper.c:40 +#: builtin/config.c:163 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" +"Zeige Geltungsbereich der Konfiguration (Arbeitsverzeichnis, lokal, global, " +"systemweit, Befehl)" + +#: builtin/config.c:164 builtin/env--helper.c:45 msgid "value" msgstr "Wert" -#: builtin/config.c:158 +#: builtin/config.c:164 msgid "with --get, use default value when missing entry" msgstr "mit --get, benutze den Standardwert, wenn der Eintrag fehlt" -#: builtin/config.c:172 +#: builtin/config.c:178 #, c-format msgid "wrong number of arguments, should be %d" msgstr "Falsche Anzahl von Argumenten - sollte %d sein." -#: builtin/config.c:174 +#: builtin/config.c:180 #, c-format msgid "wrong number of arguments, should be from %d to %d" -msgstr "Falsche Anzahl von Argumenten - sollte zwischen %d und %d sein." +msgstr "falsche Anzahl von Argumenten - sollte zwischen %d und %d sein" -#: builtin/config.c:308 +#: builtin/config.c:334 #, c-format msgid "invalid key pattern: %s" msgstr "Ungรผltiges Schlรผsselmuster: %s" -#: builtin/config.c:344 +#: builtin/config.c:370 #, c-format msgid "failed to format default config value: %s" msgstr "Fehler beim Formatieren des Standardkonfigurationswertes: %s" -#: builtin/config.c:401 +#: builtin/config.c:434 #, c-format msgid "cannot parse color '%s'" -msgstr "Kann Farbe '%s' nicht parsen." +msgstr "kann Farbe '%s' nicht parsen" -#: builtin/config.c:443 +#: builtin/config.c:476 msgid "unable to parse default color value" msgstr "konnte Standard-Farbwert nicht parsen" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:529 builtin/config.c:789 msgid "not in a git directory" -msgstr "Nicht in einem Git-Repository." +msgstr "nicht in einem Git-Repository" -#: builtin/config.c:499 +#: builtin/config.c:532 msgid "writing to stdin is not supported" -msgstr "Das Schreiben in die Standard-Eingabe wird nicht unterstรผtzt." +msgstr "das Schreiben in die Standard-Eingabe wird nicht unterstรผtzt" -#: builtin/config.c:502 +#: builtin/config.c:535 msgid "writing config blobs is not supported" msgstr "" -"Das Schreiben von Blob-Objekten fรผr Konfigurationen wird nicht unterstรผtzt." +"das Schreiben von Blob-Objekten fรผr Konfigurationen wird nicht unterstรผtzt" -#: builtin/config.c:587 +#: builtin/config.c:620 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12396,29 +13963,33 @@ msgid "" "#\tname = %s\n" "#\temail = %s\n" msgstr "" -"# Das ist Git's benutzerspezifische Konfigurationsdatei.\n" +"# Das ist Gits benutzerspezifische Konfigurationsdatei.\n" "[user]\n" "# Bitte passen Sie die folgenden Zeilen an und kommentieren Sie diese aus:\n" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:644 msgid "only one config file at a time" -msgstr "Nur eine Konfigurationsdatei zu einer Zeit mรถglich." +msgstr "nur eine Konfigurationsdatei zu einer Zeit mรถglich" -#: builtin/config.c:616 +#: builtin/config.c:650 msgid "--local can only be used inside a git repository" -msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden." +msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden" -#: builtin/config.c:619 +#: builtin/config.c:652 msgid "--blob can only be used inside a git repository" -msgstr "--blob kann nur innerhalb eines Git-Repositories verwendet werden." +msgstr "--blob kann nur innerhalb eines Git-Repositories verwendet werden" + +#: builtin/config.c:654 +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree kann nur innerhalb eines Git-Repositories verwendet werden" -#: builtin/config.c:638 +#: builtin/config.c:676 msgid "$HOME not set" -msgstr "$HOME nicht gesetzt." +msgstr "$HOME nicht gesetzt" -#: builtin/config.c:658 +#: builtin/config.c:700 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -12429,52 +14000,52 @@ msgstr "" "lesen Sie die Sektion \"CONFIGURATION_FILE\" in \"git help worktree\" fรผr " "Details" -#: builtin/config.c:688 +#: builtin/config.c:735 msgid "--get-color and variable type are incoherent" msgstr "Angabe von --get-color und Variablentyp sind ungรผltig." -#: builtin/config.c:693 +#: builtin/config.c:740 msgid "only one action at a time" msgstr "Nur eine Aktion erlaubt." -#: builtin/config.c:706 +#: builtin/config.c:753 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:712 +#: builtin/config.c:759 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:718 +#: builtin/config.c:765 msgid "--default is only applicable to --get" msgstr "--default ist nur anwendbar auf --get" -#: builtin/config.c:731 +#: builtin/config.c:778 #, c-format msgid "unable to read config file '%s'" msgstr "Konnte Konfigurationsdatei '%s' nicht lesen." -#: builtin/config.c:734 +#: builtin/config.c:781 msgid "error processing config file(s)" msgstr "Fehler beim Verarbeiten der Konfigurationsdatei(en)." -#: builtin/config.c:744 +#: builtin/config.c:791 msgid "editing stdin is not supported" msgstr "Das Bearbeiten der Standard-Eingabe wird nicht unterstรผtzt." -#: builtin/config.c:746 +#: builtin/config.c:793 msgid "editing blobs is not supported" msgstr "Das Bearbeiten von Blobs wird nicht unterstรผtzt." -#: builtin/config.c:760 +#: builtin/config.c:807 #, c-format msgid "cannot create configuration file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen." -#: builtin/config.c:773 +#: builtin/config.c:820 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12484,7 +14055,7 @@ msgstr "" " Benutzen Sie einen regulรคren Ausdruck, --add oder --replace, um %s\n" " zu รคndern." -#: builtin/config.c:847 builtin/config.c:858 +#: builtin/config.c:894 builtin/config.c:905 #, c-format msgid "no such section: %s" msgstr "Keine solche Sektion: %s" @@ -12497,11 +14068,40 @@ 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:27 +#: builtin/credential-cache--daemon.c:226 +#, 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 "" +"Die Berechtigungen auf Ihr Socket-Verzeichnis sind zu schwach; andere\n" +"Nutzer kรถnnten Ihre zwischengespeicherten Anmeldeinformationen lesen.\n" +"Ziehen Sie in Betracht\n" +"\n" +"\tchmod 0700 %s\n" +"\n" +"auszufรผhren." + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" +"credential-cache--daemon nicht verfรผgbar; Unix-Socket wird nicht unterstรผtzt" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache nicht verfรผgbar; Unix-Socket wird nicht unterstรผtzt" + +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<Optionen>] [<Commit-Angabe>...]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<Optionen>] --dirty" @@ -12517,39 +14117,34 @@ msgstr "nicht-annotiert" msgid "annotated" msgstr "annotiert" -#: builtin/describe.c:273 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "annotiertes Tag %s ist nicht verfรผgbar" -#: builtin/describe.c:277 +#: builtin/describe.c:281 #, c-format -msgid "annotated tag %s has no embedded name" -msgstr "annotiertes Tag %s hat keinen eingebetteten Namen" +msgid "tag '%s' is externally known as '%s'" +msgstr "Tag '%s' ist extern bekannt als '%s'" -#: builtin/describe.c:279 -#, c-format -msgid "tag '%s' is really '%s' here" -msgstr "Tag '%s' ist eigentlich '%s' hier" - -#: builtin/describe.c:323 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "kein Tag entspricht exakt '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:330 #, 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:379 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "beendete Suche bei %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12558,7 +14153,7 @@ msgstr "" "Keine annotierten Tags kรถnnen '%s' beschreiben.\n" "Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags." -#: builtin/describe.c:409 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12567,12 +14162,12 @@ msgstr "" "Keine Tags kรถnnen '%s' beschreiben.\n" "Versuchen Sie --always oder erstellen Sie einige Tags." -#: builtin/describe.c:439 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "%lu Commits durchlaufen\n" -#: builtin/describe.c:442 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12581,151 +14176,160 @@ msgstr "" "mehr als %i Tags gefunden; fรผhre die ersten %i auf\n" "Suche bei %s aufgegeben\n" -#: builtin/describe.c:510 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "Beschreibe %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "%s ist kein gรผltiger Objekt-Name" -#: builtin/describe.c:521 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s ist weder ein Commit, noch ein Blob." -#: builtin/describe.c:535 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "das Tag finden, das nach dem Commit kommt" -#: builtin/describe.c:536 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren" -#: builtin/describe.c:537 +#: builtin/describe.c:556 msgid "use any ref" msgstr "alle Referenzen verwenden" -#: builtin/describe.c:538 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "jedes Tag verwenden, auch nicht-annotierte" -#: builtin/describe.c:539 +#: builtin/describe.c:558 msgid "always use long format" msgstr "immer langes Format verwenden" -#: builtin/describe.c:540 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "nur erstem Elternteil folgen" -#: builtin/describe.c:543 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "nur exakte รbereinstimmungen ausgeben" -#: builtin/describe.c:545 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "die jรผngsten <n> Tags betrachten (Standard: 10)" -#: builtin/describe.c:547 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "nur Tags, die <Muster> entsprechen, betrachten" -#: builtin/describe.c:549 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "keine Tags betrachten, die <Muster> entsprechen" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "gekรผrztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" -msgstr "Kennzeichen" +msgstr "Markierung" -#: builtin/describe.c:553 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -"<Kennzeichen> bei geรคndertem Arbeitsverzeichnis anhรคngen (Standard: \"-dirty" +"<Markierung> bei geรคndertem Arbeitsverzeichnis anhรคngen (Standard: \"-dirty" "\")" -#: builtin/describe.c:556 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -"<Kennzeichen> bei defektem Arbeitsverzeichnis anhรคngen (Standard: \"-broken" -"\")" +"<Markierung> bei defektem Arbeitsverzeichnis anhรคngen (Standard: \"-broken\")" -#: builtin/describe.c:574 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel." -#: builtin/describe.c:603 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "Keine Namen gefunden, kann nichts beschreiben." -#: builtin/describe.c:654 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "Die Option --dirty kann nicht mit Commits verwendet werden." -#: builtin/describe.c:656 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "Die Option --broken kann nicht mit Commits verwendet werden." -#: builtin/diff.c:84 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': keine regulรคre Datei oder symbolische Verknรผpfung" -#: builtin/diff.c:235 +#: builtin/diff.c:241 #, c-format msgid "invalid option: %s" msgstr "Ungรผltige Option: %s" -#: builtin/diff.c:350 +#: builtin/diff.c:358 +#, c-format +msgid "%s...%s: no merge base" +msgstr "%s...%s: keine Merge-Basis" + +#: builtin/diff.c:468 msgid "Not a git repository" msgstr "Kein Git-Repository" -#: builtin/diff.c:394 +#: builtin/diff.c:513 #, c-format msgid "invalid object '%s' given." msgstr "Objekt '%s' ist ungรผltig." -#: builtin/diff.c:403 +#: builtin/diff.c:524 #, c-format msgid "more than two blobs given: '%s'" msgstr "Mehr als zwei Blobs angegeben: '%s'" -#: builtin/diff.c:408 +#: builtin/diff.c:529 #, c-format msgid "unhandled object '%s' given." msgstr "unbehandeltes Objekt '%s' angegeben" +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "%s...%s: mehrere Merge-Basen, nutze %s" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "fehlgeschlagen: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "konnte symbolische Verknรผpfung %s nicht lesen" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "Konnte Datei von symbolischer Verknรผpfung '%s' nicht lesen." -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, 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:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12733,54 +14337,54 @@ msgstr "" "Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n" "Diff-Modus('-d' und '--dir-diff') nicht unterstรผtzt." -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "beide Dateien geรคndert: '%s' und '%s'." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "Datei im Arbeitsverzeichnis belassen." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "Es existieren temporรคre Dateien in '%s'." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "Sie kรถnnten diese aufrรคumen oder wiederherstellen." -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "`diff.guitool` anstatt `diff.tool` benutzen" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "Diff รผber ganzes Verzeichnis ausfรผhren" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "keine Eingabeaufforderung vor Ausfรผhrung eines Diff-Tools" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "symbolische Verknรผpfungen im dir-diff Modus verwenden" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "Tool" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "das angegebene Diff-Tool benutzen" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 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:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12789,31 +14393,31 @@ msgstr "" "Rรผckkehrwert\n" "verschieden 0 ausgefรผhrt wurde" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "an 'diff' รผbergeben" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool benรถtigt Arbeitsverzeichnis oder --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff kann nicht mit --no-index verwendet werden" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool und --extcmd schlieรen sich gegenseitig aus" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "kein <Tool> fรผr --tool=<Tool> angegeben" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "kein <Programm> fรผr --extcmd=<Programm> angegeben" @@ -12821,26 +14425,26 @@ msgstr "kein <Programm> fรผr --extcmd=<Programm> angegeben" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <Optionen> <Umgebungsvariable>" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "Art" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "Standard fรผr git_env_*(...), um darauf zurรผckzugreifen" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "Ausgaben unterdrรผcken; nur git_env_*() Werte als Exit-Code verwenden" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" "Option `--default' erwartet einen booleschen Wert bei `--type=bool', nicht `" "%s`" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -12853,166 +14457,249 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:868 +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:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "Token fรผr --anonymize-map kann nicht leer sein" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "Fortschritt nach <n> Objekten anzeigen" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "Behandlung von signierten Tags wรคhlen" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "Behandlung von Tags wรคhlen, die gefilterte Objekte markieren" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1206 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:1135 +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" -msgstr "Kennzeichen in diese Datei schreiben" +msgstr "Markierungen in diese Datei schreiben" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" -msgstr "Kennzeichen von dieser Datei importieren" +msgstr "Markierungen von dieser Datei importieren" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1215 +msgid "Import marks from this file if it exists" +msgstr "Markierungen von dieser Datei importieren, wenn diese existiert" + +#: builtin/fast-export.c:1217 msgid "Fake a tagger when tags lack one" msgstr "kรผnstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1219 msgid "Output full tree for each commit" msgstr "fรผr jeden Commit das gesamte Verzeichnis ausgeben" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1221 msgid "Use the done feature to terminate the stream" msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschlieรen" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "Ausgabe von Blob-Daten รผberspringen" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1223 builtin/log.c:1811 msgid "refspec" msgstr "Refspec" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1224 msgid "Apply refspec to exported refs" msgstr "Refspec auf exportierte Referenzen anwenden" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "Ausgabe anonymisieren" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "von:nach" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "konvertiere <von> zu <nach> in anonymisierter Ausgabe" + +#: builtin/fast-export.c:1230 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:1151 +#: builtin/fast-export.c:1232 msgid "Show original object ids of blobs/commits" msgstr "originale Objekt-IDs von Blobs/Commits anzeigen" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1234 +msgid "Label tags with mark ids" +msgstr "Tags mit Markierungs-IDs beschriften" + +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "--anonymize-map ohne --anonymize ist nicht sinnvoll" + +#: builtin/fast-export.c:1272 +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/fast-import.c:3086 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "Fehlende 'from'-Markierungen fรผr Submodul '%s'" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "Fehlende 'to'-Markierungen fรผr Submodul '%s'" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "'mark' Befehl erwartet, '%s' bekommen" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "'to' Befehl erwartet, '%s' bekommen" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "Format 'Name:Dateiname' fรผr Submodul-Rewrite-Option erwartet" + +#: builtin/fast-import.c:3374 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "Feature '%s' verboten in Eingabe ohne Option --allow-unsafe-features" + +#: builtin/fetch-pack.c:241 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "Lock-Datei erstellt, aber nicht gemeldet: %s" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [<Optionen>] <Gruppe>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<Optionen>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel kann nicht negativ sein" + +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "fordert von allen Remote-Repositories an" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:144 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "Upstream fรผr \"git pull/fetch\" setzen" + +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "an .git/FETCH_HEAD anhรคngen, anstatt zu รผberschreiben" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" -#: builtin/fetch.c:130 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "das รberschreiben einer lokalen Referenz erzwingen" -#: builtin/fetch.c:132 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "von mehreren Remote-Repositories anfordern" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "alle Tags und verbundene Objekte anfordern" -#: builtin/fetch.c:136 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "nicht alle Tags anfordern (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "Anzahl der parallel anzufordernden Submodule" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:159 builtin/pull.c:198 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:142 +#: builtin/fetch.c:161 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:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "bei-Bedarf" -#: builtin/fetch.c:144 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "schreibe angeforderte Referenzen in die FETCH_HEAD-Datei" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "heruntergeladenes Paket behalten" -#: builtin/fetch.c:150 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "" "die Historie eines Klons mit unvollstรคndiger Historie (shallow) vertiefen" -#: builtin/fetch.c:155 +#: builtin/fetch.c:176 builtin/pull.c:212 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:161 builtin/pull.c:230 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "zu einem vollstรคndigen Repository konvertieren" -#: builtin/fetch.c:164 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" -#: builtin/fetch.c:167 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -13020,92 +14707,100 @@ msgstr "" "Standard fรผr die rekursive Anforderung von Submodulen (geringere Prioritรคt\n" "als Konfigurationsdateien)" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "Refmap" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "Refmap fรผr 'fetch' angeben" -#: builtin/fetch.c:180 +#: builtin/fetch.c:201 builtin/pull.c:240 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:183 -msgid "run 'gc --auto' after fetching" -msgstr "Fรผhre 'gc --auto' nach \"fetch\" aus" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "fรผhre 'maintenance --auto' nach \"fetch\" aus" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "Prรผfe auf erzwungene Aktualisierungen in allen aktualisierten Branches" -#: builtin/fetch.c:491 +#: builtin/fetch.c:210 +msgid "write the commit-graph after fetching" +msgstr "Schreibe den Commit-Graph nach \"fetch\"" + +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "akzeptiere Refspecs von der Standard-Eingabe" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz von HEAD nicht finden." -#: builtin/fetch.c:630 +#: builtin/fetch.c:677 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "Konfiguration fetch.output enthรคlt ungรผltigen Wert %s" -#: builtin/fetch.c:728 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:732 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[zurรผckgewiesen]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "kann \"fetch\" im aktuellen Branch nicht ausfรผhren" -#: builtin/fetch.c:756 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[Tag Aktualisierung]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:761 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "wรผrde bestehende Tags verรคndern" -#: builtin/fetch.c:783 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[neues Tag]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[neuer Branch]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:875 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:833 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "kein Vorspulen" -#: builtin/fetch.c:854 +#: builtin/fetch.c:901 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" @@ -13116,7 +14811,7 @@ msgstr "" "aktivieren, nutzen Sie die Option '--show-forced-updated' oder fรผhren\n" "Sie 'git config fetch.showForcedUpdates true' aus." -#: builtin/fetch.c:858 +#: builtin/fetch.c:905 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13129,12 +14824,12 @@ msgstr "" "'git config fetch.showForcedUpdates false' ausfรผhren, um diese รberprรผfung\n" "zu umgehen.\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:909 +#: builtin/fetch.c:960 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" @@ -13142,12 +14837,12 @@ msgstr "" "unvollstรคndiger\n" "Historie (shallow) nicht aktualisiert werden dรผrfen." -#: builtin/fetch.c:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13156,60 +14851,81 @@ 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:1101 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr " (%s wird unreferenziert)" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " (%s wurde unreferenziert)" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[gelรถscht]" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1195 builtin/remote.c:1113 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1218 #, 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:1177 +#: builtin/fetch.c:1237 #, 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:1180 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert fรผr %s\n" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "Mehrere Branches erkannt, inkompatibel mit --set-upstream" + +#: builtin/fetch.c:1463 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "Setze keinen Upstream fรผr einen entfernten Remote-Tracking-Branch." + +#: builtin/fetch.c:1465 +msgid "not setting upstream for a remote tag" +msgstr "Setze keinen Upstream fรผr einen Tag eines Remote-Repositories." + +#: builtin/fetch.c:1467 +msgid "unknown branch type" +msgstr "Unbekannter Branch-Typ" + +#: builtin/fetch.c:1469 +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:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: 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:1620 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "Konnte '%s' nicht anfordern (Exit-Code: %d)\n" -#: builtin/fetch.c:1556 +#: builtin/fetch.c:1724 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13218,80 +14934,86 @@ msgstr "" "oder den Namen des Remote-Repositories an, von welchem neue\n" "Commits angefordert werden sollen." -#: builtin/fetch.c:1593 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "Sie mรผssen den Namen des Tags angeben." -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "Negative Tiefe wird von --deepen nicht unterstรผtzt." -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen und --depth schlieรen sich gegenseitig aus" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "" "Die Optionen --depth und --unshallow kรถnnen nicht gemeinsam verwendet werden." -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1834 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:1669 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kann nicht mit Refspecs verwendet werden." -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1869 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:1703 +#: builtin/fetch.c:1887 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." +"die in extensions.partialclone konfiguriert sind" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "" +"die Option --stdin kann nur verwendet werden, wenn nur von einem Remote-\n" +"Repository abgefragt wird" + +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file " "<Datei>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 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:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "Alias fรผr --log (veraltet)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "Text" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "<Text> als Beschreibungsanfang verwenden" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "Datei zum Einlesen" @@ -13304,8 +15026,8 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <Objekt>]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<Commit>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +msgstr "git for-each-ref [--merged [<Commit>]] [--no-merged [<Commit>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" @@ -13331,7 +15053,7 @@ msgstr "Platzhalter als Tcl-String formatieren" msgid "show only <n> matched refs" msgstr "nur <n> passende Referenzen anzeigen" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "Formatfarben beachten" @@ -13355,32 +15077,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:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "unbekannt" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, 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:131 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" msgstr "Warnung in %s %s: %s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "Fehlerhafte Verknรผpfung von %7s %s" -#: builtin/fsck.c:168 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "Falscher Objekttyp in Verknรผpfung." -#: builtin/fsck.c:184 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" @@ -13389,235 +15111,235 @@ msgstr "" "Fehlerhafte Verknรผpfung von %7s %s\n" " nach %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "%s %s fehlt" -#: builtin/fsck.c:321 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "%s %s nicht erreichbar" -#: builtin/fsck.c:340 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "%s %s unreferenziert" -#: builtin/fsck.c:349 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "Konnte lost-found nicht erstellen." -#: builtin/fsck.c:360 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "Konnte '%s' nicht abschlieรen." -#: builtin/fsck.c:377 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "Prรผfe %s" -#: builtin/fsck.c:415 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Prรผfe Konnektivitรคt (%d Objekte)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "Prรผfe %s %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:430 msgid "broken links" msgstr "Fehlerhafte Verknรผpfungen" -#: builtin/fsck.c:447 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "Wurzel %s" -#: builtin/fsck.c:455 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "%s %s (%s) in %s getaggt" -#: builtin/fsck.c:484 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: Objekt fehlerhaft oder nicht vorhanden" -#: builtin/fsck.c:509 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: Ungรผltiger Reflog-Eintrag %s" -#: builtin/fsck.c:523 +#: builtin/fsck.c:515 #, c-format msgid "Checking reflog %s->%s" msgstr "Prรผfe Reflog %s->%s" -#: builtin/fsck.c:557 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: Ungรผltiger SHA1-Zeiger %s" -#: builtin/fsck.c:564 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "%s: kein Commit" -#: builtin/fsck.c:619 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "Notiz: Keine Standardreferenzen" -#: builtin/fsck.c:634 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: Objekt konnte nicht geparst werden: %s" -#: builtin/fsck.c:667 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "Ungรผltige SHA1-Datei: %s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "Prรผfe Objekt-Verzeichnis" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "Prรผfe Objekt-Verzeichnisse" -#: builtin/fsck.c:700 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "Prรผfe %s Verknรผpfung" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "Ungรผltiger Objekt-Typ %s" -#: builtin/fsck.c:712 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "%s zeigt auf etwas seltsames (%s)" -#: builtin/fsck.c:718 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: losgelรถster HEAD zeigt auf nichts" -#: builtin/fsck.c:722 +#: builtin/fsck.c:713 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)" -#: builtin/fsck.c:734 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "Prรผfe Cache-Verzeichnis" -#: builtin/fsck.c:739 +#: builtin/fsck.c:730 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: Ungรผltiger SHA1-Zeiger in Cache-Verzeichnis" -#: builtin/fsck.c:750 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "non-tree in Cache-Verzeichnis" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<Optionen>] [<Objekt>...]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "unerreichbare Objekte anzeigen" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "unreferenzierte Objekte anzeigen" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "Tags melden" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "Hauptwurzeln melden" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "Index-Objekte in Erreichbarkeitsprรผfung einbeziehen" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "Reflogs in Erreichbarkeitsprรผfung einbeziehen (Standard)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "ebenso Pakete und alternative Objekte betrachten" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "nur Konnektivitรคt prรผfen" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "genauere Prรผfung aktivieren" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "unreferenzierte Objekte nach .git/lost-found schreiben" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "ausfรผhrliche Namen fรผr erreichbare Objekte anzeigen" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Prรผfe Objekte" -#: builtin/fsck.c:887 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "%s: Objekt nicht vorhanden" -#: builtin/fsck.c:899 +#: builtin/fsck.c:886 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "Ungรผltiger Parameter: SHA-1 erwartet, '%s' bekommen" -#: builtin/gc.c:34 +#: builtin/gc.c:36 msgid "git gc [<options>]" msgstr "git gc [<Optionen>]" -#: builtin/gc.c:90 +#: builtin/gc.c:91 #, c-format msgid "Failed to fstat %s: %s" msgstr "Konnte '%s' nicht lesen: %s" -#: builtin/gc.c:126 +#: builtin/gc.c:127 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "Fehler beim Parsen von '%s' mit dem Wert '%s'" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "Kann '%s' nicht lesen" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" @@ -13704,7 +15426,60 @@ msgstr "" "Es gibt zu viele unerreichbare lose Objekte; fรผhren Sie 'git prune' aus, um " "diese zu lรถschen." -#: builtin/grep.c:29 +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<Aufgabe>]" + +#: builtin/gc.c:812 +msgid "failed to write commit-graph" +msgstr "Fehler beim Schreiben des Commit-Graph" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "Sperrdatei '%s' existiert, Wartung wird รผbersprungen" + +#: builtin/gc.c:932 +#, c-format +msgid "task '%s' failed" +msgstr "Aufgabe '%s' fehlgeschlagen" + +#: builtin/gc.c:979 +#, c-format +msgid "'%s' is not a valid task" +msgstr "'%s' ist keine gรผltige Aufgabe" + +#: builtin/gc.c:984 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "Aufgabe '%s' kann nicht mehrfach ausgewรคhlt werden" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "Aufgaben abhรคngig vom Zustand des Repositories ausfรผhren" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "zeige keinen Fortschritt oder andere Informationen รผber stderr" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "Aufgabe" + +#: builtin/gc.c:1003 +msgid "run a specific task" +msgstr "eine bestimmte Aufgabe ausfรผhren" + +#: builtin/gc.c:1026 +msgid "git maintenance run [<options>]" +msgstr "git maintenance run [<Optionen>]" + +#: builtin/gc.c:1037 +#, c-format +msgid "invalid subcommand: %s" +msgstr "ungรผltiger Unterbefehl: %s" + +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]" @@ -13722,266 +15497,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:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "keine Unterstรผtzung von Threads, '%s' wird ignoriert" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen" -#: builtin/grep.c:648 +#: builtin/grep.c:655 #, 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:714 +#: builtin/grep.c:725 #, c-format msgid "switch `%c' expects a numerical value" msgstr "Schalter '%c' erwartet einen numerischen Wert" -#: builtin/grep.c:813 +#: builtin/grep.c:824 msgid "search in index instead of in the work tree" msgstr "im Index anstatt im Arbeitsverzeichnis suchen" -#: builtin/grep.c:815 +#: builtin/grep.c:826 msgid "find in contents not managed by git" msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden" -#: builtin/grep.c:817 +#: builtin/grep.c:828 msgid "search in both tracked and untracked files" msgstr "in versionierten und unversionierten Dateien suchen" -#: builtin/grep.c:819 +#: builtin/grep.c:830 msgid "ignore files specified via '.gitignore'" msgstr "Dateien, die รผber '.gitignore' angegeben sind, ignorieren" -#: builtin/grep.c:821 +#: builtin/grep.c:832 msgid "recursively search in each submodule" msgstr "rekursive Suche in jedem Submodul" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "show non-matching lines" msgstr "Zeilen ohne รbereinstimmungen anzeigen" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "case insensitive matching" msgstr "รbereinstimmungen unabhรคngig von Groร- und Kleinschreibung finden" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "match patterns only at word boundaries" msgstr "nur ganze Wรถrter suchen" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "process binary files as text" msgstr "binรคre Dateien als Text verarbeiten" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "don't match patterns in binary files" msgstr "keine Muster in Binรคrdateien finden" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "process binary files with textconv filters" msgstr "binรคre Dateien mit \"textconv\"-Filtern verarbeiten" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "search in subdirectories (default)" msgstr "in Unterverzeichnissen suchen (Standard)" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "descend at most <depth> levels" msgstr "hรถchstens <Tiefe> Ebenen durchlaufen" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "use extended POSIX regular expressions" msgstr "erweiterte regulรคre Ausdrรผcke aus POSIX verwenden" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "use basic POSIX regular expressions (default)" msgstr "grundlegende regulรคre Ausdrรผcke aus POSIX verwenden (Standard)" -#: builtin/grep.c:849 +#: builtin/grep.c:860 msgid "interpret patterns as fixed strings" msgstr "Muster als feste Zeichenketten interpretieren" -#: builtin/grep.c:852 +#: builtin/grep.c:863 msgid "use Perl-compatible regular expressions" msgstr "Perl-kompatible regulรคre Ausdrรผcke verwenden" -#: builtin/grep.c:855 +#: builtin/grep.c:866 msgid "show line numbers" msgstr "Zeilennummern anzeigen" -#: builtin/grep.c:856 +#: builtin/grep.c:867 msgid "show column number of first match" msgstr "Nummer der Spalte des ersten Treffers anzeigen" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "don't show filenames" msgstr "keine Dateinamen anzeigen" -#: builtin/grep.c:858 +#: builtin/grep.c:869 msgid "show filenames" msgstr "Dateinamen anzeigen" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "show filenames relative to top directory" msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen" -#: builtin/grep.c:862 +#: builtin/grep.c:873 msgid "show only filenames instead of matching lines" msgstr "nur Dateinamen anzeigen anstatt รผbereinstimmende Zeilen" -#: builtin/grep.c:864 +#: builtin/grep.c:875 msgid "synonym for --files-with-matches" msgstr "Synonym fรผr --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show only the names of files without match" msgstr "nur die Dateinamen ohne รbereinstimmungen anzeigen" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "print NUL after filenames" msgstr "NUL-Zeichen nach Dateinamen ausgeben" -#: builtin/grep.c:872 +#: builtin/grep.c:883 msgid "show only matching parts of a line" msgstr "nur รผbereinstimmende Teile der Zeile anzeigen" -#: builtin/grep.c:874 +#: builtin/grep.c:885 msgid "show the number of matches instead of matching lines" msgstr "anstatt der Zeilen, die Anzahl der รผbereinstimmenden Zeilen anzeigen" -#: builtin/grep.c:875 +#: builtin/grep.c:886 msgid "highlight matches" msgstr "รbereinstimmungen hervorheben" -#: builtin/grep.c:877 +#: builtin/grep.c:888 msgid "print empty line between matches from different files" msgstr "" "eine Leerzeile zwischen รbereinstimmungen in verschiedenen Dateien ausgeben" -#: builtin/grep.c:879 +#: builtin/grep.c:890 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:882 +#: builtin/grep.c:893 msgid "show <n> context lines before and after matches" msgstr "<n> Zeilen vor und nach den รbereinstimmungen anzeigen" -#: builtin/grep.c:885 +#: builtin/grep.c:896 msgid "show <n> context lines before matches" msgstr "<n> Zeilen vor den รbereinstimmungen anzeigen" -#: builtin/grep.c:887 +#: builtin/grep.c:898 msgid "show <n> context lines after matches" msgstr "<n> Zeilen nach den รbereinstimmungen anzeigen" -#: builtin/grep.c:889 +#: builtin/grep.c:900 msgid "use <n> worker threads" msgstr "<n> Threads benutzen" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "shortcut for -C NUM" msgstr "Kurzform fรผr -C NUM" -#: builtin/grep.c:893 +#: builtin/grep.c:904 msgid "show a line with the function name before matches" msgstr "eine Zeile mit dem Funktionsnamen vor รbereinstimmungen anzeigen" -#: builtin/grep.c:895 +#: builtin/grep.c:906 msgid "show the surrounding function" msgstr "die umgebende Funktion anzeigen" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "read patterns from file" msgstr "Muster von einer Datei lesen" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "match <pattern>" msgstr "<Muster> finden" -#: builtin/grep.c:902 +#: builtin/grep.c:913 msgid "combine patterns specified with -e" msgstr "Muster kombinieren, die mit -e angegeben wurden" -#: builtin/grep.c:914 +#: builtin/grep.c:925 msgid "indicate hit with exit status without output" msgstr "รbereinstimmungen nur durch Beendigungsstatus anzeigen" -#: builtin/grep.c:916 +#: builtin/grep.c:927 msgid "show only matches from files that match all patterns" msgstr "" "nur รbereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen" -#: builtin/grep.c:918 +#: builtin/grep.c:929 msgid "show parse tree for grep expression" msgstr "geparstes Verzeichnis fรผr \"grep\"-Ausdruck anzeigen" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "pager" msgstr "Anzeigeprogramm" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "show matching files in the pager" msgstr "Dateien mit รbereinstimmungen im Anzeigeprogramm anzeigen" -#: builtin/grep.c:926 +#: builtin/grep.c:937 msgid "allow calling of grep(1) (ignored by this build)" msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)" -#: builtin/grep.c:990 +#: builtin/grep.c:1004 msgid "no pattern given" msgstr "Kein Muster angegeben." -#: builtin/grep.c:1026 +#: builtin/grep.c:1040 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:1034 +#: builtin/grep.c:1048 #, c-format msgid "unable to resolve revision: %s" msgstr "Konnte Commit nicht auflรถsen: %s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1078 +msgid "--untracked not supported with --recurse-submodules" +msgstr "--untracked zusammen mit --recurse-submodules wird nicht unterstรผtzt" + +#: builtin/grep.c:1082 msgid "invalid option combination, ignoring --threads" msgstr "Ungรผltige Kombination von Optionen, --threads wird ignoriert." -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "Keine Unterstรผtzung fรผr Threads, --threads wird ignoriert." -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungรผltige Anzahl von Threads angegeben (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1122 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:1117 -msgid "option not supported with --recurse-submodules" -msgstr "Die Option wird mit --recurse-submodules nicht unterstรผtzt." - -#: builtin/grep.c:1123 +#: builtin/grep.c:1148 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:1129 +#: builtin/grep.c:1154 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" "--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet " "werden." -#: builtin/grep.c:1137 +#: builtin/grep.c:1162 msgid "both --cached and trees are given" msgstr "--cached und \"Tree\"-Objekte angegeben" @@ -14024,66 +15799,66 @@ msgstr "" msgid "process file as it were from this path" msgstr "Datei verarbeiten, als ob sie von diesem Pfad wรคre" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "alle vorhandenen Befehle anzeigen" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "Anleitungen ausschlieรen" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "Liste von allgemein verwendeten Anleitungen anzeigen" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "alle Namen der Konfigurationsvariablen ausgeben" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "Handbuch anzeigen" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "Handbuch in einem Webbrowser anzeigen" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "Info-Seite anzeigen" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "Beschreibung des Befehls ausgeben" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<Befehl>]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "nicht erkanntes Hilfeformat: %s" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "Konnte emacsclient nicht starten." -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "Konnte Version des emacsclient nicht parsen." -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "Version des emacsclient '%d' ist zu alt (< 22)." -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "Fehler beim Ausfรผhren von '%s'" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -14092,7 +15867,7 @@ msgstr "" "'%s': Pfad fรผr nicht unterstรผtzten Handbuchbetrachter.\n" "Sie kรถnnten stattdessen 'man.<Werkzeug>.cmd' benutzen." -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -14101,397 +15876,425 @@ msgstr "" "'%s': Programm fรผr unterstรผtzten Handbuchbetrachter.\n" "Sie kรถnnten stattdessen 'man.<Werkzeug>.path' benutzen." -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': unbekannter Handbuch-Betrachter." -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "Fรผr '%s' wurde der Alias '%s' angelegt." -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "Ungรผltiger alias.%s String: %s" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "Verwendung: %s%s" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "'git help config' fรผr weitere Informationen" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "Objekt-Typen passen bei %s nicht zusammen" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "konnte erwartetes Objekt %s nicht empfangen" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "Objekt %s: erwarteter Typ %s, %s gefunden" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kann %d Byte nicht lesen" msgstr[1] "kann %d Bytes nicht lesen" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "zu frรผhes Dateiende" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "Fehler beim Lesen der Eingabe" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "verwendete mehr Bytes als verfรผgbar waren" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 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:94 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "Paket รผberschreitet die maximal erlaubte Grรถรe" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:342 builtin/repack.c:254 +#, c-format +msgid "unable to create '%s'" +msgstr "konnte '%s' nicht erstellen" + +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "Kann Paketdatei '%s' nicht รถffnen" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "Paketsignatur stimmt nicht รผberein" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "Paketversion %<PRIu32> nicht unterstรผtzt" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "Paket hat ein ungรผltiges Objekt bei Versatz %<PRIuMAX>: %s" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "Dekomprimierung gab %d zurรผck" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "Wert fรผr Versatz bei Differenzobjekt รผbergelaufen" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "" "Wert fรผr Versatz bei Differenzobjekt liegt auรerhalb des gรผltigen Bereichs" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "Unbekannter Objekt-Typ %d" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "Kann Paketdatei %s nicht lesen" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "frรผhzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte" msgstr[1] "frรผhzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" -#: 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 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "kann %s nicht lesen" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "Kann existierende Informationen zu Objekt %s nicht lesen." -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "Kann existierendes Objekt %s nicht lesen." -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "ungรผltiges Blob-Objekt %s" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "fsck Fehler in gepacktem Objekt" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:870 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Nicht alle Kind-Objekte von %s sind erreichbar" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "Konnte Dateiunterschied nicht anwenden" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "Empfange Objekte" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "Indiziere Objekte" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "Paket ist beschรคdigt (SHA1 unterschiedlich)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "kann Paketdatei nicht lesen" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "Paketende enthรคlt nicht verwendbaren Inhalt" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "Fehler beim Ausfรผhren von \"parse_pack_objects()\"" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "Lรถse Unterschiede auf" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "kann Thread nicht erzeugen: %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "Fehler beim Auflรถsen der Unterschiede" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1288 #, 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:1264 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Unerwartete Prรผfsumme fรผr %s (Festplattenfehler?)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1304 #, 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:1292 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehรคngtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschรคdigt" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "Kann %s Datei '%s' nicht schreiben." -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "Kann eben geschriebene %s Datei '%s' nicht schlieรen." -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "Fehler beim Schlieรen der Paketdatei" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungรผltig" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht รถffnen" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1633 #, 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:1643 +#: builtin/index-pack.c:1681 #, 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:1650 +#: builtin/index-pack.c:1688 #, 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:1689 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "Kann nicht zurรผck zum Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "%s ist ungรผltig" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "unbekannter Hash-Algorithmus '%s'" + +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "--stdin erfordert ein Git-Repository" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1825 +msgid "--object-format cannot be used with --stdin" +msgstr "Die Option --object-format kann nicht mit --stdin verwendet werden." + +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "fsck Fehler beim Packen von Objekten" -#: builtin/init-db.c:61 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "kann Vorlage '%s' nicht lesen" -#: builtin/init-db.c:66 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "kann Verzeichnis '%s' nicht รถffnen" -#: builtin/init-db.c:78 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "kann Verweis '%s' nicht lesen" -#: builtin/init-db.c:80 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kann symbolische Verknรผpfung '%s' auf '%s' nicht erstellen" -#: builtin/init-db.c:86 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kann '%s' nicht nach '%s' kopieren" -#: builtin/init-db.c:90 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "ignoriere Vorlage %s" -#: builtin/init-db.c:121 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "Keine Vorlagen in %s gefunden." -#: builtin/init-db.c:136 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "kopiere keine Vorlagen von '%s': %s" -#: builtin/init-db.c:334 +#: builtin/init-db.c:274 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "ungรผltiger initialer Branchname: '%s'" + +#: builtin/init-db.c:366 #, c-format msgid "unable to handle file type %d" msgstr "kann nicht mit Dateityp %d umgehen" -#: builtin/init-db.c:337 +#: builtin/init-db.c:369 #, c-format msgid "unable to move %s to %s" msgstr "Konnte %s nicht nach %s verschieben" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "Versuch, das Repository mit einem anderen Hash zu reinitialisieren" + +#: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format msgid "%s already exists" msgstr "%s existiert bereits" -#: builtin/init-db.c:413 +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "Neu-Initialisierung: --initial-branch=%s ignoriert" + +#: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Leeres Git-Repository in %s%s initialisiert\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:529 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -14499,25 +16302,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--" "shared[=<Berechtigungen>]] [<Verzeichnis>]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:555 msgid "permissions" msgstr "Berechtigungen" -#: builtin/init-db.c:492 +#: builtin/init-db.c:556 msgid "specify that the git repository is to be shared amongst several users" msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:562 +msgid "override the name of the initial branch" +msgstr "den Namen des initialen Branches รผberschreiben" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +msgid "hash" +msgstr "Hash" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "den zu verwendenen Hash-Algorithmus angeben" + +#: builtin/init-db.c:571 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--separate-git-dir und --bare schlieรen sich gegenseitig aus" + +#: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format msgid "cannot mkdir %s" msgstr "kann Verzeichnis %s nicht erstellen" -#: builtin/init-db.c:538 +#: builtin/init-db.c:609 builtin/init-db.c:664 #, c-format msgid "cannot chdir to %s" msgstr "kann nicht in Verzeichnis %s wechseln" -#: builtin/init-db.c:559 +#: builtin/init-db.c:636 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -14526,11 +16345,15 @@ msgstr "" "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s " "(oder --git-dir=<Verzeichnis>)" -#: builtin/init-db.c:587 +#: builtin/init-db.c:688 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen." +#: builtin/init-db.c:693 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separate-git-dir nicht kompatibel mit Bare-Repository" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -14597,121 +16420,127 @@ msgstr "" msgid "no input file given for in-place editing" msgstr "keine Datei zur direkten Bearbeitung angegeben" -#: builtin/log.c:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<Optionen>] <Objekt>..." -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "Ungรผltige Option fรผr --decorate: %s" -#: builtin/log.c:173 +#: builtin/log.c:177 msgid "show source" msgstr "Quelle anzeigen" -#: builtin/log.c:174 +#: builtin/log.c:178 msgid "Use mail map file" msgstr "\"mailmap\"-Datei verwenden" -#: builtin/log.c:176 +#: builtin/log.c:181 msgid "only decorate refs that match <pattern>" msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen" -#: builtin/log.c:178 +#: builtin/log.c:183 msgid "do not decorate refs that match <pattern>" msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen" -#: builtin/log.c:179 +#: builtin/log.c:184 msgid "decorate options" msgstr "decorate-Optionen" -#: builtin/log.c:182 +#: builtin/log.c:187 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:280 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "letzte Ausgabe: %d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:555 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ungรผltige Datei" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:570 builtin/log.c:665 #, c-format msgid "could not read object %s" msgstr "Konnte Objekt %s nicht lesen." -#: builtin/log.c:668 +#: builtin/log.c:690 #, c-format msgid "unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:791 +#: builtin/log.c:839 +#, 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:846 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:908 +#: builtin/log.c:965 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:924 +#: builtin/log.c:981 #, c-format msgid "cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht รถffnen" -#: builtin/log.c:941 +#: builtin/log.c:998 msgid "need exactly one range" msgstr "Brauche genau einen Commit-Bereich." -#: builtin/log.c:951 +#: builtin/log.c:1008 msgid "not a range" msgstr "Kein Commit-Bereich." -#: builtin/log.c:1074 +#: builtin/log.c:1172 msgid "cover letter needs email format" msgstr "Anschreiben benรถtigt E-Mail-Format" -#: builtin/log.c:1080 +#: builtin/log.c:1178 msgid "failed to create cover-letter file" msgstr "Fehler beim Erstellen der Datei fรผr das Anschreiben." -#: builtin/log.c:1159 +#: builtin/log.c:1259 #, c-format msgid "insane in-reply-to: %s" msgstr "ungรผltiges in-reply-to: %s" -#: builtin/log.c:1186 +#: builtin/log.c:1286 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]" -#: builtin/log.c:1244 +#: builtin/log.c:1344 msgid "two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 #, c-format msgid "unknown commit %s" msgstr "Unbekannter Commit %s" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1506 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:1370 +#: builtin/log.c:1515 msgid "could not find exact merge base" msgstr "Konnte keine exakte Merge-Basis finden." -#: builtin/log.c:1374 +#: builtin/log.c:1525 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" @@ -14722,272 +16551,286 @@ 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:1394 +#: builtin/log.c:1548 msgid "failed to find exact merge base" msgstr "Fehler beim Finden einer exakten Merge-Basis." -#: builtin/log.c:1405 +#: builtin/log.c:1565 msgid "base commit should be the ancestor of revision list" msgstr "Basis-Commit sollte der Vorgรคnger der Revisionsliste sein." -#: builtin/log.c:1409 +#: builtin/log.c:1575 msgid "base commit shouldn't be in revision list" msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein." -#: builtin/log.c:1462 +#: builtin/log.c:1633 msgid "cannot get patch id" msgstr "kann Patch-Id nicht lesen" -#: builtin/log.c:1514 -msgid "failed to infer range-diff ranges" -msgstr "Fehler beim Ableiten des range-diff-Bereichs." +#: builtin/log.c:1690 +msgid "failed to infer range-diff origin of current series" +msgstr "Fehler beim Ableiten des range-diff Ursprungs der aktuellen Serie" -#: builtin/log.c:1559 +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "nutze '%s' als range-diff Ursprung der aktuellen Serie" + +#: builtin/log.c:1736 msgid "use [PATCH n/m] even with a single patch" msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden" -#: builtin/log.c:1562 +#: builtin/log.c:1739 msgid "use [PATCH] even with multiple patches" msgstr "[PATCH] auch mit mehreren Patches verwenden" -#: builtin/log.c:1566 +#: builtin/log.c:1743 msgid "print patches to standard out" msgstr "Ausgabe der Patches in Standard-Ausgabe" -#: builtin/log.c:1568 +#: builtin/log.c:1745 msgid "generate a cover letter" msgstr "ein Deckblatt erzeugen" -#: builtin/log.c:1570 +#: builtin/log.c:1747 msgid "use simple number sequence for output file names" msgstr "einfache Nummernfolge fรผr die Namen der Ausgabedateien verwenden" -#: builtin/log.c:1571 +#: builtin/log.c:1748 msgid "sfx" msgstr "Dateiendung" -#: builtin/log.c:1572 +#: builtin/log.c:1749 msgid "use <sfx> instead of '.patch'" msgstr "<Dateiendung> anstatt '.patch' verwenden" -#: builtin/log.c:1574 +#: builtin/log.c:1751 msgid "start numbering patches at <n> instead of 1" msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen" -#: builtin/log.c:1576 +#: builtin/log.c:1753 msgid "mark the series as Nth re-roll" msgstr "die Serie als n-te Fassung kennzeichnen" -#: builtin/log.c:1578 +#: builtin/log.c:1755 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "[RFC PATCH] anstatt [PATCH] verwenden" -#: builtin/log.c:1581 +#: builtin/log.c:1758 +msgid "cover-from-description-mode" +msgstr "Modus fรผr Erstellung des Deckblattes aus der Beschreibung" + +#: builtin/log.c:1759 +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:1761 msgid "Use [<prefix>] instead of [PATCH]" -msgstr "[<Prรคfix>] anstatt [PATCH] verwenden" +msgstr "Nutze [<Prรคfix>] statt [PATCH]" -#: builtin/log.c:1584 +#: builtin/log.c:1764 msgid "store resulting files in <dir>" msgstr "erzeugte Dateien in <Verzeichnis> speichern" -#: builtin/log.c:1587 +#: builtin/log.c:1767 msgid "don't strip/add [PATCH]" msgstr "[PATCH] nicht entfernen/hinzufรผgen" -#: builtin/log.c:1590 +#: builtin/log.c:1770 msgid "don't output binary diffs" msgstr "keine binรคren Unterschiede ausgeben" -#: builtin/log.c:1592 +#: builtin/log.c:1772 msgid "output all-zero hash in From header" msgstr "Hash mit Nullen in \"From\"-Header ausgeben" -#: builtin/log.c:1594 +#: builtin/log.c:1774 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:1596 +#: builtin/log.c:1776 msgid "show patch format instead of default (patch + stat)" msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)" -#: builtin/log.c:1598 +#: builtin/log.c:1778 msgid "Messaging" msgstr "E-Mail-Einstellungen" -#: builtin/log.c:1599 +#: builtin/log.c:1779 msgid "header" msgstr "Header" -#: builtin/log.c:1600 +#: builtin/log.c:1780 msgid "add email header" msgstr "E-Mail-Header hinzufรผgen" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1781 builtin/log.c:1782 msgid "email" msgstr "E-Mail" -#: builtin/log.c:1601 +#: builtin/log.c:1781 msgid "add To: header" msgstr "\"To:\"-Header hinzufรผgen" -#: builtin/log.c:1603 +#: builtin/log.c:1782 msgid "add Cc: header" msgstr "\"Cc:\"-Header hinzufรผgen" -#: builtin/log.c:1605 +#: builtin/log.c:1783 msgid "ident" msgstr "Ident" -#: builtin/log.c:1606 +#: builtin/log.c:1784 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:1608 +#: builtin/log.c:1786 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1609 +#: builtin/log.c:1787 msgid "make first mail a reply to <message-id>" msgstr "aus erster E-Mail eine Antwort zu <message-id> machen" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1788 builtin/log.c:1791 msgid "boundary" msgstr "Grenze" -#: builtin/log.c:1611 +#: builtin/log.c:1789 msgid "attach the patch" msgstr "den Patch anhรคngen" -#: builtin/log.c:1614 +#: builtin/log.c:1792 msgid "inline the patch" msgstr "den Patch direkt in die Nachricht einfรผgen" -#: builtin/log.c:1618 +#: builtin/log.c:1796 msgid "enable message threading, styles: shallow, deep" msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep" -#: builtin/log.c:1620 +#: builtin/log.c:1798 msgid "signature" msgstr "Signatur" -#: builtin/log.c:1621 +#: builtin/log.c:1799 msgid "add a signature" msgstr "eine Signatur hinzufรผgen" -#: builtin/log.c:1622 +#: builtin/log.c:1800 msgid "base-commit" msgstr "Basis-Commit" -#: builtin/log.c:1623 +#: builtin/log.c:1801 msgid "add prerequisite tree info to the patch series" msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufรผgen" -#: builtin/log.c:1625 +#: builtin/log.c:1804 msgid "add a signature from a file" msgstr "eine Signatur aus einer Datei hinzufรผgen" -#: builtin/log.c:1626 +#: builtin/log.c:1805 msgid "don't print the patch filenames" msgstr "keine Dateinamen der Patches anzeigen" -#: builtin/log.c:1628 +#: builtin/log.c:1807 msgid "show progress while generating patches" msgstr "Forschrittsanzeige wรคhrend der Erzeugung der Patches" -#: builtin/log.c:1630 +#: builtin/log.c:1809 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:1633 +#: builtin/log.c:1812 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:1635 +#: builtin/log.c:1814 msgid "percentage by which creation is weighted" msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird" -#: builtin/log.c:1710 +#: builtin/log.c:1896 #, c-format msgid "invalid ident line: %s" msgstr "Ungรผltige Identifikationszeile: %s" -#: builtin/log.c:1725 +#: builtin/log.c:1911 msgid "-n and -k are mutually exclusive" msgstr "-n und -k schlieรen sich gegenseitig aus." -#: builtin/log.c:1727 +#: builtin/log.c:1913 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc und -k schlieรen sich gegenseitig aus." -#: builtin/log.c:1735 +#: builtin/log.c:1921 msgid "--name-only does not make sense" msgstr "Die Option --name-only kann nicht verwendet werden." -#: builtin/log.c:1737 +#: builtin/log.c:1923 msgid "--name-status does not make sense" msgstr "Die Option --name-status kann nicht verwendet werden." -#: builtin/log.c:1739 +#: builtin/log.c:1925 msgid "--check does not make sense" msgstr "Die Option --check kann nicht verwendet werden." -#: builtin/log.c:1771 +#: builtin/log.c:1958 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1860 +#: builtin/log.c:2062 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch." -#: builtin/log.c:1864 +#: builtin/log.c:2066 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1865 +#: builtin/log.c:2067 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff gegen v%d:" -#: builtin/log.c:1871 +#: builtin/log.c:2073 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor erfordert --range-diff" -#: builtin/log.c:1875 +#: builtin/log.c:2077 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch." -#: builtin/log.c:1883 +#: builtin/log.c:2085 msgid "Range-diff:" msgstr "Range-Diff:" -#: builtin/log.c:1884 +#: builtin/log.c:2086 #, c-format msgid "Range-diff against v%d:" msgstr "Range-Diff gegen v%d:" -#: builtin/log.c:1895 +#: builtin/log.c:2097 #, c-format msgid "unable to read signature file '%s'" msgstr "Konnte Signatur-Datei '%s' nicht lesen" -#: builtin/log.c:1931 +#: builtin/log.c:2133 msgid "Generating patches" msgstr "Erzeuge Patches" -#: builtin/log.c:1975 +#: builtin/log.c:2177 msgid "failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:2034 +#: builtin/log.c:2236 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]" -#: builtin/log.c:2088 +#: builtin/log.c:2290 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14995,112 +16838,112 @@ msgstr "" "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> " "manuell an.\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<Optionen>] [<Datei>...]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "den Dateistatus mit Tags anzeigen" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "Kleinbuchstaben fรผr Dateien mit 'assume unchanged' Markierung verwenden" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "Kleinbuchstaben fรผr 'fsmonitor clean' Dateien verwenden" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "entfernte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "geรคnderte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "sonstige Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "ignorierte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "" "Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe " "anzeigen" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "Dateien im Dateisystem, die gelรถscht werden mรผssen, anzeigen" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "Zeilenenden von Dateien anzeigen" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "keine leeren Verzeichnisse anzeigen" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "nicht zusammengefรผhrte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "'resolve-undo' Informationen anzeigen" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "Dateien auslassen, die einem Muster entsprechen" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "Muster, gelesen von <Datei>, ausschlieรen" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "zusรคtzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "die standardmรครigen Git-Ausschlรผsse hinzufรผgen" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "Ausgabe relativ zum Projektverzeichnis" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "Rekursion in Submodulen durchfรผhren" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "als Fehler behandeln, wenn sich eine <Datei> nicht im Index befindet" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "Commit-Referenz" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "vorgeben, dass Pfade, die seit <Commit-Referenz> gelรถscht wurden, immer noch " "vorhanden sind" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "Ausgaben zur Fehlersuche anzeigen" @@ -15118,7 +16961,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:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 msgid "exec" msgstr "Programm" @@ -15195,194 +17038,305 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "Leere mbox: '%s'" -#: builtin/merge.c:55 +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <Commit> <Commit>..." + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <Commit>..." + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <Commit>..." + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <Commit> <Commit>" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <Referenz> [<Commit>]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "Ausgabe aller gemeinsamen Vorgรคnger-Commits" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "Vorgรคnger-Commits fรผr einen einzelnen n-Wege-Merge finden" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "Commits auflisten, die nicht durch Andere erreichbar sind" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "ist der Erste ein Vorgรคnger-Commit des Anderen?" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" +"git merge-file [<Optionen>] [-L <Name1> [-L <orig> [-L <Name2>]]] <Datei1> " +"<orig-Datei> <Datei2>" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "Ergebnisse zur Standard-Ausgabe senden" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "einen diff3 basierten Merge verwenden" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "bei Konflikten unsere Variante verwenden" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "bei Konflikten ihre Variante verwenden" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "bei Konflikten eine gemeinsame Variante verwenden" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "bei Konflikten diese Kennzeichnungslรคnge verwenden" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "keine Warnung bei Konflikten" + +#: builtin/merge-file.c:47 +msgid "set labels for file1/orig-file/file2" +msgstr "Beschriftung fรผr Datei1/orig-Datei/Datei2 setzen" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "unbekannte Option: %s" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "Konnte Objekt '%s' nicht parsen." + +#: 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] "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 +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 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "Konnte Referenz '%s' nicht auflรถsen" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Fรผhre %s mit %s zusammen\n" + +#: builtin/merge.c:56 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<Optionen>] [<Commit>...]" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:120 msgid "switch `m' requires a value" msgstr "Schalter 'm' erfordert einen Wert." -#: builtin/merge.c:141 +#: builtin/merge.c:143 #, c-format msgid "option `%s' requires a value" msgstr "Option `%s' erfordert einen Wert." -#: builtin/merge.c:187 +#: builtin/merge.c:189 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" -#: builtin/merge.c:188 +#: builtin/merge.c:190 #, c-format msgid "Available strategies are:" msgstr "Verfรผgbare Strategien sind:" -#: builtin/merge.c:193 +#: builtin/merge.c:195 #, c-format msgid "Available custom strategies are:" msgstr "Verfรผgbare benutzerdefinierte Strategien sind:" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:246 builtin/pull.c:133 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:247 builtin/pull.c:154 +#: builtin/merge.c:249 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:250 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(Synonym fรผr --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:252 builtin/pull.c:142 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:253 builtin/pull.c:166 +#: builtin/merge.c:255 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "einen einzelnen Commit anstatt eines Merges erzeugen" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:257 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "einen Commit durchfรผhren, wenn der Merge erfolgreich war (Standard)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:259 builtin/pull.c:154 msgid "edit message before committing" msgstr "Bearbeitung der Beschreibung vor dem Commit" -#: builtin/merge.c:259 +#: builtin/merge.c:261 msgid "allow fast-forward (default)" msgstr "Vorspulen erlauben (Standard)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:263 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "abbrechen, wenn kein Vorspulen mรถglich ist" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:267 builtin/pull.c:164 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:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 msgid "strategy" msgstr "Strategie" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:269 builtin/pull.c:169 msgid "merge strategy to use" msgstr "zu verwendende Merge-Strategie" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option=value" msgstr "Option=Wert" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "Option fรผr ausgewรคhlte Merge-Strategie" -#: builtin/merge.c:271 +#: builtin/merge.c:273 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:278 +#: builtin/merge.c:280 msgid "abort the current in-progress merge" msgstr "den sich im Gange befindlichen Merge abbrechen" -#: builtin/merge.c:280 +#: builtin/merge.c:282 msgid "--abort but leave index and working tree alone" msgstr "--abort, aber Index und Arbeitsverzeichnis unverรคndert lassen" -#: builtin/merge.c:282 +#: builtin/merge.c:284 msgid "continue the current in-progress merge" msgstr "den sich im Gange befindlichen Merge fortsetzen" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:286 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "erlaube das Zusammenfรผhren von nicht zusammenhรคngenden Historien" -#: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "commit-msg Hook รผberprรผfen" +#: builtin/merge.c:293 +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "Hooks pre-merge-commit und commit-msg umgehen" -#: builtin/merge.c:307 +#: builtin/merge.c:310 msgid "could not run stash." msgstr "Konnte \"stash\" nicht ausfรผhren." -#: builtin/merge.c:312 +#: builtin/merge.c:315 msgid "stash failed" msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:317 +#: builtin/merge.c:320 #, c-format msgid "not a valid object: %s" msgstr "kein gรผltiges Objekt: %s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:342 builtin/merge.c:359 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:386 +#: builtin/merge.c:389 msgid " (nothing to squash)" msgstr " (nichts zu quetschen)" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:447 +#: builtin/merge.c:450 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:498 +#: builtin/merge.c:501 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:585 +#: builtin/merge.c:588 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungรผltiger branch.%s.mergeoptions String: %s" -#: builtin/merge.c:708 +#: builtin/merge.c:713 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur der Merge von zwei Branches behandelt." -#: builtin/merge.c:722 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option fรผr merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:789 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:798 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge " "abzuschlieรen.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:808 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" @@ -15393,11 +17347,11 @@ msgstr "" "Upstream-Branch mit einem Thema-Branch zusammenfรผhrt.\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:813 msgid "An empty message aborts the commit.\n" msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:816 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15406,75 +17360,75 @@ msgstr "" "Zeilen, die mit '%c' beginnen, werden ignoriert,\n" "und eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:869 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:872 +#: builtin/merge.c:884 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:945 #, 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:972 +#: builtin/merge.c:984 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:974 +#: builtin/merge.c:986 msgid "No remote for the current branch." msgstr "Kein Remote-Repository fรผr den aktuellen Branch." -#: builtin/merge.c:976 +#: builtin/merge.c:988 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:981 +#: builtin/merge.c:993 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch fรผr %s von %s" -#: builtin/merge.c:1038 +#: builtin/merge.c:1050 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'" -#: builtin/merge.c:1141 +#: builtin/merge.c:1153 #, 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:1175 +#: builtin/merge.c:1187 msgid "not something we can merge" msgstr "nichts was wir zusammenfรผhren kรถnnen" -#: builtin/merge.c:1278 +#: builtin/merge.c:1291 msgid "--abort expects no arguments" msgstr "--abort akzeptiert keine Argumente" -#: builtin/merge.c:1282 +#: builtin/merge.c:1295 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1291 +#: builtin/merge.c:1313 msgid "--quit expects no arguments" msgstr "--quit erwartet keine Argumente" -#: builtin/merge.c:1304 +#: builtin/merge.c:1326 msgid "--continue expects no arguments" msgstr "--continue erwartet keine Argumente" -#: builtin/merge.c:1308 +#: builtin/merge.c:1330 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)." -#: builtin/merge.c:1324 +#: builtin/merge.c:1346 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15482,7 +17436,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:1331 +#: builtin/merge.c:1353 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15490,216 +17444,105 @@ 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:1334 +#: builtin/merge.c:1356 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:1348 +#: builtin/merge.c:1370 msgid "You cannot combine --squash with --no-ff." msgstr "Sie kรถnnen --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1350 +#: builtin/merge.c:1372 msgid "You cannot combine --squash with --commit." msgstr "Sie kรถnnen --squash nicht mit --commit kombinieren." -#: builtin/merge.c:1366 +#: builtin/merge.c:1388 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1383 +#: builtin/merge.c:1405 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:1385 +#: builtin/merge.c:1407 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:1390 +#: builtin/merge.c:1412 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenfรผhren kรถnnen" -#: builtin/merge.c:1392 +#: builtin/merge.c:1414 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:1471 +#: builtin/merge.c:1495 msgid "refusing to merge unrelated histories" msgstr "Verweigere den Merge von nicht zusammenhรคngenden Historien." -#: builtin/merge.c:1480 +#: builtin/merge.c:1504 msgid "Already up to date." msgstr "Bereits aktuell." -#: builtin/merge.c:1490 +#: builtin/merge.c:1514 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1560 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1567 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1592 msgid "Already up to date. Yeeah!" msgstr "Bereits aktuell." -#: builtin/merge.c:1570 +#: builtin/merge.c:1598 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht mรถglich, breche ab." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1626 builtin/merge.c:1691 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rรผcklauf des Verzeichnisses bis zum Ursprung ...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1630 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s ...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1682 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1684 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1693 #, 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:1672 +#: builtin/merge.c:1707 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatischer Merge abgeschlossen; halte, wie gewรผnscht, vor dem Commit an\n" -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <Commit> <Commit>..." - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <Commit>..." - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <Commit>..." - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <Commit> <Commit>" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <Referenz> [<Commit>]" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "Ausgabe aller gemeinsamen Vorgรคnger-Commits" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "Vorgรคnger-Commits fรผr einen einzelnen n-Wege-Merge finden" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "Commits auflisten, die nicht durch Andere erreichbar sind" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "ist der Erste ein Vorgรคnger-Commit des Anderen?" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" -"git merge-file [<Optionen>] [-L <Name1> [-L <orig> [-L <Name2>]]] <Datei1> " -"<orig-Datei> <Datei2>" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "Ergebnisse zur Standard-Ausgabe senden" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "einen diff3 basierten Merge verwenden" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "bei Konflikten unsere Variante verwenden" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "bei Konflikten ihre Variante verwenden" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "bei Konflikten eine gemeinsame Variante verwenden" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "bei Konflikten diese Kennzeichnungslรคnge verwenden" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "keine Warnung bei Konflikten" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "Beschriftung fรผr Datei1/orig-Datei/Datei2 setzen" - -#: builtin/merge-recursive.c:46 -#, c-format -msgid "unknown option %s" -msgstr "unbekannte Option: %s" - -#: builtin/merge-recursive.c:52 -#, c-format -msgid "could not parse object '%s'" -msgstr "Konnte Objekt '%s' nicht parsen." - -#: 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:64 -msgid "not handling anything other than two heads merge." -msgstr "Es wird nur der Merge von zwei Branches behandelt." - -#: 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:78 -#, c-format -msgid "Merging %s with %s\n" -msgstr "Fรผhre %s mit %s zusammen\n" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -15718,18 +17561,18 @@ msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -"git multi-pack-index [--object-dir=<Verzeichnis>] (write|verify|expire|" -"repack --batch-size=<Grรถรe>)" +"git multi-pack-index [<Optionen>] (write|verify|expire|repack --batch-" +"size=<Grรถรe>)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 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:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -15737,15 +17580,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:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "Zu viele Argumente." -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 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:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "Nicht erkannter Unterbefehl: %s" @@ -15779,113 +17622,117 @@ msgstr "Verschieben/Umbenennen erzwingen, auch wenn das Ziel existiert" msgid "skip move/rename errors" msgstr "Fehler beim Verschieben oder Umbenennen รผberspringen" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "Ziel '%s' ist kein Verzeichnis" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Prรผfe Umbenennung von '%s' nach '%s'\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "ungรผltige Quelle" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "kann Verzeichnis nicht in sich selbst verschieben" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "kann Verzeichnis nicht รผber Datei verschieben" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "Quellverzeichnis ist leer" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "nicht unter Versionskontrolle" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "in Konflikt" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "Ziel existiert bereits" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "รผberschreibe '%s'" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "Kann nicht รผberschreiben" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "mehrere Quellen fรผr dasselbe Ziel" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "Zielverzeichnis existiert nicht" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, Quelle=%s, Ziel=%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<Optionen>] <Commit>..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<Optionen>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<Optionen>] --stdin" -#: builtin/name-rev.c:411 -msgid "print only names (no SHA-1)" -msgstr "nur Namen anzeigen (keine SHA-1)" +#: builtin/name-rev.c:524 +msgid "print only ref-based names (no object names)" +msgstr "nur Referenzen-basierte Namen ausgeben (keine Objektnamen)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "nur Tags verwenden, um die Commits zu benennen" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "nur Referenzen verwenden, die <Muster> entsprechen" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ignoriere Referenzen die <Muster> entsprechen" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "von der Standard-Eingabe lesen" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)" @@ -16033,7 +17880,7 @@ msgstr "Konnte Notiz-Objekt nicht schreiben" msgid "the note contents have been left in %s" msgstr "Die Notiz-Inhalte wurden in %s belassen." -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht รถffnen oder lesen" @@ -16273,7 +18120,7 @@ msgstr "" "commit',\n" "oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gรผltige Referenz auflรถsen." @@ -16291,7 +18138,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:165 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "nicht lรถschen, nur anzeigen" @@ -16307,420 +18154,410 @@ msgstr "Notiz-Referenz" msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1605 #, c-format msgid "unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < " "<Objektliste>]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < " "<Objektliste>]" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "Ungรผltiges CRC fรผr gepacktes Objekt %s." -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "Fehlerhaftes gepacktes Objekt fรผr %s." -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "Rekursiver Unterschied fรผr Objekt %s festgestellt." -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u Objekte geordnet, %<PRIu32> erwartet." -#: 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 +#: builtin/pack-objects.c:1004 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:854 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "Konnte '%s' nicht lesen" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "Schrieb %<PRIu32> Objekte wรคhrend %<PRIu32> erwartet waren." -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1348 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:1597 +#: builtin/pack-objects.c:1796 #, 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:1606 +#: builtin/pack-objects.c:1805 #, 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:1875 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "Zรคhle Objekte" -#: 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 +#: builtin/pack-objects.c:2231 #, c-format msgid "unable to parse object header of %s" msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen." -#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "Objekt %s kann nicht gelesen werden." -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, 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:2130 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "ungรผnstiges Packet - Speicher voll" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2656 #, c-format msgid "Delta compression using up to %d threads" msgstr "Delta-Kompression verwendet bis zu %d Threads." -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2795 #, 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:2675 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "Inkonsistenz mit der Anzahl von Deltas" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" +"Wert fรผr uploadpack.blobpackfileuri muss in der Form '<Objekt-Hash> <Pack-" +"Hash> <URI>' vorliegen ('%s' erhalten)" + +#: builtin/pack-objects.c:2964 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" +"Objekt bereits in einem anderen uploadpack.blobpackfileuri konfiguriert " +"('%s' erhalten)" + +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -"Erwartete Randobjekt-ID, erhielt nutzlose Daten:\n" +"erwartete Randobjekt-ID, erhielt nutzlose Daten:\n" " %s" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -"Erwartete Objekt-ID, erhielt nutzlose Daten:\n" +"erwartete Objekt-ID, erhielt nutzlose Daten:\n" " %s" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" -msgstr "Ungรผltiger Wert fรผr --missing." +msgstr "ungรผltiger Wert fรผr --missing" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" -msgstr "Kann Paketindex nicht รถffnen." +msgstr "kann Paketindex nicht รถffnen" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:3187 #, c-format msgid "loose object at %s could not be examined" -msgstr "Loses Objekt bei %s konnte nicht untersucht werden." +msgstr "loses Objekt bei %s konnte nicht untersucht werden" -#: builtin/pack-objects.c:3041 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" -msgstr "Konnte loses Objekt nicht erzwingen." +msgstr "konnte loses Objekt nicht erzwingen" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" -msgstr "'%s' ist kein Commit." +msgstr "'%s' ist kein Commit" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" -msgstr "Ungรผltiger Commit '%s'." +msgstr "ungรผltiger Commit '%s'" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" -msgstr "Konnte jรผngste Objekte nicht hinzufรผgen." +msgstr "konnte neuere Objekte nicht hinzufรผgen" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" -msgstr "Nicht unterstรผtzte Index-Version %s" +msgstr "nicht unterstรผtzte Index-Version %s" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" -msgstr "Ungรผltige Index-Version '%s'" +msgstr "ungรผltige Index-Version '%s'" -#: 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 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "<Version>[,<Offset>]" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3489 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:3260 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "maximale Grรถรe fรผr jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3500 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusรคtzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3502 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:3272 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3510 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:3280 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "Argumente bezรผglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3516 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:3287 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "Objekte einschlieรen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschlieรen, die von Eintrรคgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "Objekte einschlieรen, die vom Index referenziert werden" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3530 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:3300 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "nicht erreichbare lose Objekte packen" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "dรผnnere Pakete erzeugen" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet fรผr Abholung mit unvollstรคndiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "dieses Paket ignorieren" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "Komprimierungsgrad fรผr Paketierung" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "keine kรผnstlichen Vorgรคnger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3553 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:3323 +#: builtin/pack-objects.c:3555 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:3327 +#: builtin/pack-objects.c:3559 msgid "write a bitmap index if possible" msgstr "Bitmap-Index schreiben, wenn mรถglich" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "Behandlung fรผr fehlende Objekte" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3566 msgid "do not pack objects in promisor packfiles" msgstr "" "keine Objekte aus Packdateien von partiell geklonten Remote-Repositories " "packen" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3568 msgid "respect islands during delta compression" msgstr "Delta-Islands bei Delta-Kompression beachten" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "Protokoll" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "" +"jegliche konfigurierte uploadpack.blobpackfileuri fรผr dieses Protkoll " +"ausschlieรen" + +#: builtin/pack-objects.c:3600 #, 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:3366 +#: builtin/pack-objects.c:3605 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3659 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:3422 +#: builtin/pack-objects.c:3661 msgid "minimum pack size limit is 1 MiB" msgstr "Minimales Limit fรผr die Paketgrรถรe ist 1 MiB." -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3666 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:3430 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3675 msgid "cannot use --filter without --stdout" msgstr "Kann --filter nicht ohne --stdout benutzen." -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "Objekte aufzรคhlen" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3766 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" msgstr "" "Gesamt %<PRIu32> (Delta %<PRIu32>), Wiederverwendet %<PRIu32> (Delta " -"%<PRIu32>)" +"%<PRIu32>), Pack wiederverwendet %<PRIu32>" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -16734,83 +18571,109 @@ msgstr "alles packen" msgid "prune loose refs (default)" msgstr "lose Referenzen entfernen (Standard)" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 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 "Lรถsche doppelte Objekte" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <Zeit>] [--] [<Branch>...]" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "gelรถschte Objekte melden" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "Objekte รคlter als <Zeit> verfallen lassen" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "" "Traversierung auf Objekte auรerhalb von Packdateien aus partiell geklonten " "Remote-Repositories einschrรคnken" -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "kann \"prune\" in precious-objects Repository nicht ausfรผhren" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Ungรผltiger Wert fรผr %s: %s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/pull.c:141 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/pull.c:145 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "Optionen bezogen auf Merge" -#: builtin/pull.c:148 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "Integration von รnderungen durch Rebase statt Merge" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 msgid "allow fast-forward" msgstr "Vorspulen erlauben" -#: 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:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" +msgstr "automatischer Stash/Stash-Pop davor und danach" -#: builtin/pull.c:201 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "Optionen bezogen auf Fetch" -#: builtin/pull.c:211 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "das รberschreiben von lokalen Branches erzwingen" -#: builtin/pull.c:219 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule" -#: builtin/pull.c:316 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Ungรผltiger Wert fรผr pull.ff: %s" -#: builtin/pull.c:433 +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"Es wird davon abgeraten zu Pullen, ohne anzugeben, wie mit abweichenden\n" +"Branches umgegangen werden soll. Sie kรถnnen diese Nachricht unterdrรผcken,\n" +"indem Sie einen der folgenden Befehle ausfรผhren, bevor der nรคchste Pull\n" +"ausgefรผhrt wird:\n" +"\n" +" git config pull.rebase false # Merge (Standard-Strategie)\n" +" git config pull.rebase true # Rebase\n" +" git config pull.ff only # ausschlieรlich Vorspulen\n" +"\n" +"Sie kรถnnen statt \"git config\" auch \"git config --global\" nutzen, um\n" +"einen Standard fรผr alle Repositories festzulegen. Sie kรถnnen auch die\n" +"Option --rebase, --no-rebase oder --ff-only auf der Kommandozeile nutzen,\n" +"um das konfigurierte Standardverhalten pro Aufruf zu รผberschreiben.\n" + +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16818,14 +18681,14 @@ msgstr "" "Es gibt keinen Kandidaten fรผr Rebase innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:435 +#: builtin/pull.c:460 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:436 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16833,7 +18696,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:439 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16845,39 +18708,39 @@ msgstr "" "Repository fรผr den aktuellen Branch ist, mรผssen Sie einen Branch auf\n" "der Befehlszeile angeben." -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Im Moment auf keinem Branch." -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 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:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 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:449 builtin/pull.c:464 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "Siehe git-pull(1) fรผr weitere Details." -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 msgid "<remote>" msgstr "<Remote-Repository>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<Branch>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1238 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:468 git-parse-remote.sh:95 +#: builtin/pull.c:493 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" @@ -16885,7 +18748,7 @@ msgstr "" "Sie\n" "dies tun mit:" -#: builtin/pull.c:473 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16895,34 +18758,30 @@ msgstr "" "des Remote-Repositories durchzufรผhren, aber diese Referenz\n" "wurde nicht angefordert." -#: builtin/pull.c:581 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "Konnte nicht auf Commit '%s' zugreifen." -#: builtin/pull.c:861 +#: builtin/pull.c:894 msgid "ignoring --verify-signatures for rebase" msgstr "Ignoriere --verify-signatures fรผr Rebase" -#: 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:924 +#: builtin/pull.c:954 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:928 +#: builtin/pull.c:958 msgid "pull with rebase" msgstr "Pull mit Rebase" -#: builtin/pull.c:929 +#: builtin/pull.c:959 msgid "please commit or stash them." msgstr "Bitte committen Sie die รnderungen oder benutzen Sie \"stash\"." -#: builtin/pull.c:954 +#: builtin/pull.c:984 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16932,7 +18791,7 @@ msgstr "" "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n" "Spule Ihr Arbeitsverzeichnis von Commit %s vor." -#: builtin/pull.c:960 +#: builtin/pull.c:990 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16949,15 +18808,15 @@ msgstr "" "$ git reset --hard\n" "zur Wiederherstellung aus." -#: builtin/pull.c:975 +#: builtin/pull.c:1005 msgid "Cannot merge multiple branches into empty head." msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenfรผhren." -#: builtin/pull.c:979 +#: builtin/pull.c:1009 msgid "Cannot rebase onto multiple branches." msgstr "Kann Rebase nicht auf mehrere Branches ausfรผhren." -#: builtin/pull.c:986 +#: builtin/pull.c:1017 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "Kann Rebase nicht mit lokal aufgezeichneten รnderungen in Submodulen " @@ -16971,11 +18830,11 @@ msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]" msgid "tag shorthand without <tag>" msgstr "Kurzschrift fรผr Tag ohne <Tag>" -#: builtin/push.c:121 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel." -#: builtin/push.c:167 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -16984,7 +18843,7 @@ msgstr "" "Um eine Variante permanent zu verwenden, siehe push.default in 'git help " "config'." -#: builtin/push.c:170 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -17010,7 +18869,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -17025,7 +18884,7 @@ msgstr "" "\n" " git push %s HEAD:<Name-des-Remote-Branches>\n" -#: builtin/push.c:199 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -17039,13 +18898,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:202 #, 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:210 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -17056,14 +18915,14 @@ msgstr "" "Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n" "Remote-Branch zu aktualisieren." -#: builtin/push.c:269 +#: builtin/push.c:260 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:276 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -17077,7 +18936,7 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "fรผr weitere Details." -#: builtin/push.c:282 +#: builtin/push.c:273 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" @@ -17091,7 +18950,7 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "fรผr weitere Details." -#: builtin/push.c:288 +#: builtin/push.c:279 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" @@ -17110,13 +18969,13 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "fรผr weitere Details." -#: builtin/push.c:295 +#: builtin/push.c:286 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:298 +#: builtin/push.c:289 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" @@ -17126,141 +18985,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:359 +#: builtin/push.c:351 #, c-format msgid "Pushing to %s\n" -msgstr "Versende nach %s\n" +msgstr "Push nach %s\n" -#: builtin/push.c:364 +#: builtin/push.c:358 #, c-format msgid "failed to push some refs to '%s'" msgstr "Fehler beim Versenden einiger Referenzen nach '%s'" -#: 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 +#: builtin/push.c:532 msgid "repository" msgstr "Repository" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:533 builtin/send-pack.c:183 msgid "push all refs" msgstr "alle Referenzen versenden" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:534 builtin/send-pack.c:185 msgid "mirror all refs" msgstr "alle Referenzen spiegeln" -#: builtin/push.c:558 +#: builtin/push.c:536 msgid "delete refs" msgstr "Referenzen lรถschen" -#: builtin/push.c:559 +#: builtin/push.c:537 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:562 builtin/send-pack.c:167 +#: builtin/push.c:540 builtin/send-pack.c:186 msgid "force updates" msgstr "Aktualisierung erzwingen" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:541 builtin/send-pack.c:198 msgid "<refname>:<expect>" msgstr "<Referenzname>:<Erwartungswert>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:542 builtin/send-pack.c:199 msgid "require old value of ref to be at this value" msgstr "Referenz muss sich auf dem angegebenen Wert befinden" -#: builtin/push.c:568 +#: builtin/push.c:545 msgid "control recursive pushing of submodules" msgstr "rekursiven \"push\" von Submodulen steuern" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:546 builtin/send-pack.c:193 msgid "use thin pack" msgstr "kleinere Pakete verwenden" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 msgid "receive pack program" msgstr "'receive pack' Programm" -#: builtin/push.c:573 +#: builtin/push.c:549 msgid "set upstream for git pull/status" msgstr "Upstream fรผr \"git pull/status\" setzen" -#: builtin/push.c:576 +#: builtin/push.c:552 msgid "prune locally removed refs" msgstr "lokal gelรถschte Referenzen entfernen" -#: builtin/push.c:578 +#: builtin/push.c:554 msgid "bypass pre-push hook" msgstr "\"pre-push hook\" umgehen" -#: builtin/push.c:579 +#: builtin/push.c:555 msgid "push missing but relevant tags" msgstr "fehlende, aber relevante Tags versenden" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:557 builtin/send-pack.c:187 msgid "GPG sign the push" msgstr "signiert \"push\" mit GPG" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:559 builtin/send-pack.c:194 msgid "request atomic transaction on remote side" msgstr "Referenzen atomar versenden" -#: builtin/push.c:602 +#: builtin/push.c:577 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags." -#: builtin/push.c:604 +#: builtin/push.c:579 msgid "--delete doesn't make sense without any refs" msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." -#: builtin/push.c:607 +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "ungรผltiges Repository '%s'" + +#: builtin/push.c:600 +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:615 msgid "--all and --tags are incompatible" msgstr "Die Optionen --all und --tags sind inkompatibel." -#: builtin/push.c:609 +#: builtin/push.c:617 msgid "--all can't be combined with refspecs" msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden." -#: builtin/push.c:613 +#: builtin/push.c:621 msgid "--mirror and --tags are incompatible" msgstr "Die Optionen --mirror und --tags sind inkompatibel." -#: builtin/push.c:615 +#: builtin/push.c:623 msgid "--mirror can't be combined with refspecs" msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden." -#: builtin/push.c:618 +#: builtin/push.c:626 msgid "--all and --mirror are incompatible" msgstr "Die Optionen --all und --mirror sind inkompatibel." -#: builtin/push.c:637 +#: builtin/push.c:630 msgid "push options must not have new line characters" msgstr "Push-Optionen dรผrfen keine Zeilenvorschubzeichen haben" @@ -17278,24 +19137,32 @@ 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:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "einfache Diff-Farben benutzen" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: 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 #, c-format msgid "no .. in range: '%s'" msgstr "Kein .. im Bereich: '%s'" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "Format mit einfachem Argument muss symmetrischer Bereich sein." -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "Benรถtige zwei Commit-Bereiche." @@ -17378,236 +19245,217 @@ msgstr "unpack-trees protokollieren" msgid "suppress feedback messages" msgstr "Rรผckmeldungen unterdrรผcken" -#: builtin/rebase.c:32 +#: 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:35 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] " -"[<Upstream>] [<Branch>]" +"git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis> | --" +"keep-base] [<Upstream> [<Branch>]]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] --" "root [<Branch>]" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 #, c-format msgid "unusable todo list: '%s'" msgstr "Unbenutzbare TODO-Liste: '%s'" -#: 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 +#: builtin/rebase.c:304 #, c-format msgid "could not create temporary %s" msgstr "Konnte temporรคres Verzeichnis '%s' nicht erstellen." -#: builtin/rebase.c:285 +#: builtin/rebase.c:310 msgid "could not mark as interactive" msgstr "Markierung auf interaktiven Rebase fehlgeschlagen." -#: builtin/rebase.c:343 +#: builtin/rebase.c:364 msgid "could not generate todo list" msgstr "Konnte TODO-Liste nicht erzeugen." -#: builtin/rebase.c:382 +#: builtin/rebase.c:405 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:437 +#: builtin/rebase.c:474 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<Optionen>]" -#: builtin/rebase.c:449 -msgid "keep empty commits" -msgstr "leere Commits behalten" +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" +msgstr "behalte Commits, die leer beginnen" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:491 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "Commits mit leerer Beschreibung erlauben" -#: builtin/rebase.c:452 +#: builtin/rebase.c:493 msgid "rebase merge commits" msgstr "Rebase auf Merge-Commits ausfรผhren" -#: builtin/rebase.c:454 +#: builtin/rebase.c:495 msgid "keep original branch points of cousins" msgstr "originale Branch-Punkte der Cousins behalten" -#: builtin/rebase.c:456 +#: builtin/rebase.c:497 msgid "move commits that begin with squash!/fixup!" msgstr "Commits verschieben, die mit squash!/fixup! beginnen" -#: builtin/rebase.c:457 +#: builtin/rebase.c:498 msgid "sign commits" msgstr "Commits signieren" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:500 builtin/rebase.c:1321 msgid "display a diffstat of what changed upstream" msgstr "" "Zusammenfassung der Unterschiede gegenรผber dem Upstream-Branch anzeigen" -#: builtin/rebase.c:461 +#: builtin/rebase.c:502 msgid "continue rebase" msgstr "Rebase fortsetzen" -#: builtin/rebase.c:463 +#: builtin/rebase.c:504 msgid "skip commit" msgstr "Commit auslassen" -#: builtin/rebase.c:464 +#: builtin/rebase.c:505 msgid "edit the todo list" msgstr "die TODO-Liste bearbeiten" -#: builtin/rebase.c:466 +#: builtin/rebase.c:507 msgid "show the current patch" msgstr "den aktuellen Patch anzeigen" -#: builtin/rebase.c:469 +#: builtin/rebase.c:510 msgid "shorten commit ids in the todo list" msgstr "Commit-IDs in der TODO-Liste verkรผrzen" -#: builtin/rebase.c:471 +#: builtin/rebase.c:512 msgid "expand commit ids in the todo list" msgstr "Commit-IDs in der TODO-Liste erweitern" -#: builtin/rebase.c:473 +#: builtin/rebase.c:514 msgid "check the todo list" msgstr "die TODO-Liste prรผfen" -#: builtin/rebase.c:475 +#: builtin/rebase.c:516 msgid "rearrange fixup/squash lines" msgstr "fixup/squash-Zeilen umordnen" -#: builtin/rebase.c:477 +#: builtin/rebase.c:518 msgid "insert exec commands in todo list" msgstr "\"exec\"-Befehle in TODO-Liste einfรผgen" -#: builtin/rebase.c:478 +#: builtin/rebase.c:519 msgid "onto" msgstr "auf" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict-revision" msgstr "Begrenzungscommit" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict revision" msgstr "Begrenzungscommit" -#: builtin/rebase.c:483 +#: builtin/rebase.c:524 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:484 +#: builtin/rebase.c:525 msgid "squash onto" msgstr "squash onto" -#: builtin/rebase.c:486 +#: builtin/rebase.c:527 msgid "the upstream commit" msgstr "der Upstream-Commit" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head-name" msgstr "head-Name" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head name" msgstr "head-Name" -#: builtin/rebase.c:493 +#: builtin/rebase.c:534 msgid "rebase strategy" msgstr "Rebase-Strategie" -#: builtin/rebase.c:494 +#: builtin/rebase.c:535 msgid "strategy-opts" msgstr "Strategie-Optionen" -#: builtin/rebase.c:495 +#: builtin/rebase.c:536 msgid "strategy options" msgstr "Strategie-Optionen" -#: builtin/rebase.c:496 +#: builtin/rebase.c:537 msgid "switch-to" msgstr "wechseln zu" -#: builtin/rebase.c:497 +#: builtin/rebase.c:538 msgid "the branch or commit to checkout" msgstr "der Branch oder Commit zum Auschecken" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto-name" msgstr "onto-Name" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto name" msgstr "onto-Name" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "cmd" msgstr "Befehl" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "the command to run" msgstr "auszufรผhrender Befehl" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:543 builtin/rebase.c:1415 msgid "automatically re-schedule any `exec` that fails" msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen" -#: builtin/rebase.c:518 +#: builtin/rebase.c:559 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung" -#: builtin/rebase.c:534 +#: builtin/rebase.c:575 #, c-format -msgid "%s requires an interactive rebase" -msgstr "%s erfordert ein interaktives Rebase" +msgid "%s requires the merge backend" +msgstr "%s erfordert das Merge-Backend" -#: builtin/rebase.c:586 +#: builtin/rebase.c:618 #, c-format msgid "could not get 'onto': '%s'" msgstr "Konnte 'onto' nicht bestimmen: '%s'" -#: builtin/rebase.c:601 +#: builtin/rebase.c:635 #, c-format msgid "invalid orig-head: '%s'" msgstr "Ungรผltiges orig-head: '%s'" -#: builtin/rebase.c:626 +#: builtin/rebase.c:660 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "Ignoriere ungรผltiges allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:702 -#, c-format -msgid "Could not read '%s'" -msgstr "Konnte '%s' nicht lesen." - -#: builtin/rebase.c:720 -#, c-format -msgid "Cannot store %s" -msgstr "Kann %s nicht speichern." - -#: builtin/rebase.c:827 -msgid "could not determine HEAD revision" -msgstr "Konnte HEAD-Commit nicht bestimmen." - -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:805 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" @@ -17623,7 +19471,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:1031 +#: builtin/rebase.c:888 #, c-format msgid "" "\n" @@ -17643,7 +19491,16 @@ msgstr "" "Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n" "ausfรผhren." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1214 +#, 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:1232 #, c-format msgid "" "%s\n" @@ -17661,7 +19518,7 @@ msgstr "" " git rebase '<Branch>'\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1248 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17675,132 +19532,154 @@ msgstr "" " git branch --set-upstream-to=%s/<Branch> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1278 msgid "exec commands cannot contain newlines" msgstr "\"exec\"-Befehle kรถnnen keine neuen Zeilen enthalten" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1282 msgid "empty exec command" msgstr "Leerer \"exec\"-Befehl." -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1312 msgid "rebase onto given branch instead of upstream" msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausfรผhren" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1314 +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:1316 msgid "allow pre-rebase hook to run" msgstr "Ausfรผhrung des pre-rebase-Hooks erlauben" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1318 msgid "be quiet. implies --no-stat" msgstr "weniger Ausgaben (impliziert --no-stat)" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1324 msgid "do not show diffstat of what changed upstream" msgstr "" "Zusammenfassung der Unterschiede gegenรผber dem Upstream-Branch verbergen" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1327 msgid "add a Signed-off-by: line to each commit" msgstr "eine \"Signed-off-by:\"-Zeile zu jedem Commit hinzufรผgen" -#: 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:1330 +msgid "make committer date match author date" +msgstr "Datum des Commit-Erstellers soll mit Datum des Autors รผbereinstimmen" + +#: builtin/rebase.c:1332 +msgid "ignore author date and use current date" +msgstr "ignoriere Autor-Datum und nutze aktuelles Datum" + +#: builtin/rebase.c:1334 +msgid "synonym of --reset-author-date" +msgstr "Synonym fรผr --reset-author-date" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1336 builtin/rebase.c:1340 msgid "passed to 'git apply'" msgstr "an 'git apply' รผbergeben" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1338 +msgid "ignore changes in whitespace" +msgstr "Whitespace-รnderungen ignorieren" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 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:1428 +#: builtin/rebase.c:1347 msgid "continue" msgstr "fortsetzen" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1350 msgid "skip current patch and continue" msgstr "den aktuellen Patch auslassen und fortfahren" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1352 msgid "abort and check out the original branch" msgstr "abbrechen und den ursprรผnglichen Branch auschecken" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1355 msgid "abort but keep HEAD where it is" msgstr "abbrechen, aber HEAD an aktueller Stelle belassen" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1356 msgid "edit the todo list during an interactive rebase" msgstr "TODO-Liste wรคhrend eines interaktiven Rebase bearbeiten" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1359 msgid "show the patch file being applied or merged" msgstr "den Patch, der gerade angewendet oder zusammengefรผhrt wird, anzeigen" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1362 +msgid "use apply strategies to rebase" +msgstr "Strategien von 'git am' bei Rebase verwenden" + +#: builtin/rebase.c:1366 msgid "use merging strategies to rebase" msgstr "Merge-Strategien beim Rebase verwenden" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1370 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:1451 +#: builtin/rebase.c:1374 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" "(VERALTET) Versuche, Merges wiederherzustellen anstatt sie zu ignorieren" -#: builtin/rebase.c:1455 -msgid "preserve empty commits during rebase" -msgstr "leere Commits wรคhrend des Rebase erhalten" +#: builtin/rebase.c:1379 +msgid "how to handle commits that become empty" +msgstr "wie sollen Commits behandelt werden, die leer werden" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1386 msgid "move commits that begin with squash!/fixup! under -i" msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen" -#: builtin/rebase.c:1463 -msgid "automatically stash/stash pop before and after" -msgstr "automatischer Stash/Stash-Pop davor und danach" - -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1393 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:1469 +#: builtin/rebase.c:1397 msgid "allow rebasing commits with empty messages" msgstr "Rebase von Commits mit leerer Beschreibung erlauben" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1401 msgid "try to rebase merges instead of skipping them" msgstr "" "versuchen, Rebase mit Merges auszufรผhren, anstatt diese zu รผberspringen" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1404 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "'git merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1406 msgid "use the given merge strategy" msgstr "angegebene Merge-Strategie verwenden" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1408 builtin/revert.c:115 msgid "option" msgstr "Option" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1409 msgid "pass the argument through to the merge strategy" msgstr "Argument zur Merge-Strategie durchreichen" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1412 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:1500 +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "" +"alle รnderungen anwenden, auch jene, die bereits im Upstream-Branch " +"vorhanden sind" + +#: builtin/rebase.c:1434 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17808,32 +19687,44 @@ msgstr "" "Die Unterstรผtzung fรผr rebase.useBuiltin wurde entfernt!\n" "Siehe dessen Eintrag in 'git help config' fรผr Details." -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1440 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:1547 +#: builtin/rebase.c:1481 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:1551 +#: builtin/rebase.c:1486 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "'--keep-base' kann nicht mit '--onto' kombiniert werden" + +#: builtin/rebase.c:1488 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "'--keep-base' kann nicht mit '--root' kombiniert werden" + +#: builtin/rebase.c:1492 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "'--root' kann nicht mit '--fork-point' kombiniert werden" + +#: builtin/rebase.c:1495 msgid "No rebase in progress?" msgstr "Kein Rebase im Gange?" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1499 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:1578 +#: builtin/rebase.c:1522 msgid "Cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1534 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17841,16 +19732,16 @@ msgstr "" "Sie mรผssen alle Merge-Konflikte editieren und diese dann\n" "mittels \"git add\" als aufgelรถst markieren" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1553 msgid "could not discard worktree changes" msgstr "Konnte รnderungen im Arbeitsverzeichnis nicht verwerfen." -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1572 #, c-format msgid "could not move back to %s" msgstr "Konnte nicht zu %s zurรผckgehen." -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1618 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17871,179 +19762,147 @@ msgstr "" "und fรผhren Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n" "etwas Schรผtzenswertes vorhanden ist.\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1646 msgid "switch `C' expects a numerical value" msgstr "Schalter `C' erwartet einen numerischen Wert." -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1688 #, c-format msgid "Unknown mode: %s" msgstr "Unbekannter Modus: %s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1727 msgid "--strategy requires --merge or --interactive" msgstr "--strategy erfordert --merge oder --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1757 +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:1770 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "Unbekanntes Rebase-Backend: %s" + +#: builtin/rebase.c:1795 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec erfordert --exec oder --interactive" -#: 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 +#: builtin/rebase.c:1815 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" "'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden." -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1819 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: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 +#: builtin/rebase.c:1843 #, c-format msgid "invalid upstream '%s'" msgstr "Ungรผltiger Upstream '%s'" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1849 msgid "Could not create new root commit" msgstr "Konnte neuen Root-Commit nicht erstellen." -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1875 +#, 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:1878 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': benรถtige genau eine Merge-Basis" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1886 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "'%s' zeigt auf keinen gรผltigen Commit." -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1912 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: Branch/Commit '%s' nicht gefunden" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Referenz nicht gefunden: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1931 msgid "Could not resolve HEAD to a revision" msgstr "Konnte HEAD zu keinem Commit auflรถsen." -#: builtin/rebase.c:1981 -msgid "Cannot autostash" -msgstr "Kann automatischen Stash nicht erzeugen." - -#: builtin/rebase.c:1984 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "Unerwartete 'stash'-Antwort: '%s'" - -#: builtin/rebase.c:1990 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "Konnte Verzeichnis fรผr '%s' nicht erstellen." - -#: builtin/rebase.c:1993 -#, c-format -msgid "Created autostash: %s\n" -msgstr "Automatischen Stash erzeugt: %s\n" - -#: builtin/rebase.c:1996 -msgid "could not reset --hard" -msgstr "Konnte 'reset --hard' nicht ausfรผhren." - -#: 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 +#: builtin/rebase.c:1952 msgid "Please commit or stash them." msgstr "Bitte committen Sie die รnderungen oder benutzen Sie \"stash\"." -#: builtin/rebase.c:2040 -#, c-format -msgid "could not parse '%s'" -msgstr "Konnte '%s' nicht parsen." - -#: builtin/rebase.c:2053 +#: builtin/rebase.c:1988 #, c-format msgid "could not switch to %s" msgstr "Konnte nicht zu %s wechseln." -#: builtin/rebase.c:2064 +#: builtin/rebase.c:1999 msgid "HEAD is up to date." msgstr "HEAD ist aktuell." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2001 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2009 msgid "HEAD is up to date, rebase forced." msgstr "HEAD ist aktuell, Rebase erzwungen." -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2011 #, 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:2084 +#: builtin/rebase.c:2019 msgid "The pre-rebase hook refused to rebase." msgstr "Der \"pre-rebase hook\" hat den Rebase zurรผckgewiesen." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2026 #, c-format msgid "Changes to %s:\n" msgstr "รnderungen zu %s:\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2029 #, c-format msgid "Changes from %s to %s:\n" msgstr "รnderungen von %s zu %s:\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2054 #, 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:2128 +#: builtin/rebase.c:2063 msgid "Could not detach HEAD" msgstr "Konnte HEAD nicht loslรถsen." -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2072 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Spule %s vor zu %s.\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <Git-Verzeichnis>" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:1224 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" @@ -18075,7 +19934,7 @@ msgstr "" "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n" "'refuse'." -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:1244 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" @@ -18096,11 +19955,11 @@ msgstr "" "\n" "Um diese Meldung zu unterdrรผcken, setzen Sie die Variable auf 'refuse'." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:2422 msgid "quiet" msgstr "weniger Ausgaben" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:2436 msgid "You must specify a directory." msgstr "Sie mรผssen ein Repository angeben." @@ -18126,49 +19985,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <Referenz>" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' ist kein gรผltiger Zeitstempel" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "Markiere nicht erreichbare Objekte..." -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "%s zeigt auf nichts!" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "Kein Reflog zum Lรถschen angegeben." -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "Kein Reflog: %s" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "Kein Reflog fรผr '%s'." -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "Ungรผltiges Format fรผr Referenzen: %s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -18176,82 +20035,82 @@ msgstr "" "git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <Name> <URL>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <alt> <neu>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <Name>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 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:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <Name>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <Name>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | <Remote>)...]" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <Name> <Branch>..." -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <Name>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <Name> <neueURL>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <Name> <URL>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<Optionen>] <Name> <URL>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <Name> <Branch>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <Name> <Branch>..." -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<Optionen>] <Name>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<Optionen>] <Name>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "Aktualisiere %s" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -18259,88 +20118,104 @@ msgstr "" "--mirror ist gefรคhrlich und veraltet; bitte\n" "\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "unbekanntes Argument fรผr Option --mirror: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "die Remote-Branches anfordern" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "alle Tags und verbundene Objekte beim Anfordern importieren" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "oder fordere gar keine Tags an (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "Branch(es) zur รbernahme" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "Hauptbranch" -#: builtin/remote.c:173 +#: builtin/remote.c:174 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:185 +#: builtin/remote.c:186 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:187 +#: builtin/remote.c:188 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:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:697 #, c-format msgid "remote %s already exists." msgstr "externes Repository %s existiert bereits" -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:701 #, 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:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "Konnte symbolische Referenz fรผr Hauptbranch von '%s' nicht einrichten" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Konnte Fetch-Map fรผr Refspec %s nicht bekommen" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(รผbereinstimmend)" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(lรถsche)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:654 +#, c-format +msgid "could not set '%s'" +msgstr "konnte '%s' nicht setzen" + +#: builtin/remote.c:659 +#, 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:690 builtin/remote.c:833 builtin/remote.c:941 #, c-format msgid "No such remote: '%s'" msgstr "Kein solches Remote-Repository: '%s'" -#: builtin/remote.c:646 +#: builtin/remote.c:707 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen" -#: builtin/remote.c:666 +#: builtin/remote.c:727 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18351,17 +20226,17 @@ msgstr "" "\t%s\n" "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell." -#: builtin/remote.c:702 +#: builtin/remote.c:767 #, c-format msgid "deleting '%s' failed" msgstr "Konnte '%s' nicht lรถschen" -#: builtin/remote.c:736 +#: builtin/remote.c:801 #, c-format msgid "creating '%s' failed" msgstr "Konnte '%s' nicht erstellen" -#: builtin/remote.c:802 +#: builtin/remote.c:877 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18377,118 +20252,118 @@ msgstr[1] "" "entfernt;\n" "um diese zu entfernen, benutzen Sie:" -#: builtin/remote.c:816 +#: builtin/remote.c:891 #, c-format msgid "Could not remove config section '%s'" msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen" -#: builtin/remote.c:917 +#: builtin/remote.c:994 #, 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:920 +#: builtin/remote.c:997 msgid " tracked" msgstr " gefolgt" -#: builtin/remote.c:922 +#: builtin/remote.c:999 msgid " stale (use 'git remote prune' to remove)" msgstr " veraltet (benutzen Sie 'git remote prune' zum Lรถschen)" -#: builtin/remote.c:924 +#: builtin/remote.c:1001 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:1042 #, 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:974 +#: builtin/remote.c:1051 #, c-format msgid "rebases interactively onto remote %s" msgstr "interaktiver Rebase auf Remote-Branch %s" -#: builtin/remote.c:976 +#: builtin/remote.c:1053 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "interaktiver Rebase (mit Merges) auf Remote-Branch %s" -#: builtin/remote.c:979 +#: builtin/remote.c:1056 #, c-format msgid "rebases onto remote %s" msgstr "Rebase auf Remote-Branch %s" -#: builtin/remote.c:983 +#: builtin/remote.c:1060 #, c-format msgid " merges with remote %s" msgstr " fรผhrt mit Remote-Branch %s zusammen" -#: builtin/remote.c:986 +#: builtin/remote.c:1063 #, c-format msgid "merges with remote %s" msgstr "fรผhrt mit Remote-Branch %s zusammen" -#: builtin/remote.c:989 +#: builtin/remote.c:1066 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s und mit Remote-Branch %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1109 msgid "create" msgstr "erstellt" -#: builtin/remote.c:1035 +#: builtin/remote.c:1112 msgid "delete" msgstr "gelรถscht" -#: builtin/remote.c:1039 +#: builtin/remote.c:1116 msgid "up to date" msgstr "aktuell" -#: builtin/remote.c:1042 +#: builtin/remote.c:1119 msgid "fast-forwardable" msgstr "vorspulbar" -#: builtin/remote.c:1045 +#: builtin/remote.c:1122 msgid "local out of date" msgstr "lokal nicht aktuell" -#: builtin/remote.c:1052 +#: builtin/remote.c:1129 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s erzwingt Versandt nach %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1132 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s versendet nach %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1136 #, c-format msgid " %-*s forces to %s" msgstr " %-*s erzwingt Versand nach %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1139 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s versendet nach %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1207 msgid "do not query remotes" msgstr "keine Abfrage von Remote-Repositories" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid "* remote %s" msgstr "* Remote-Repository %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1235 #, c-format msgid " Fetch URL: %s" msgstr " URL zum Abholen: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 msgid "(no URL)" msgstr "(keine URL)" @@ -18496,25 +20371,25 @@ msgstr "(keine URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1250 builtin/remote.c:1252 #, c-format msgid " Push URL: %s" msgstr " URL zum Versenden: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 #, c-format msgid " HEAD branch: %s" msgstr " Hauptbranch: %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1254 msgid "(not queried)" msgstr "(nicht abgefragt)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1256 msgid "(unknown)" msgstr "(unbekannt)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1260 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -18522,172 +20397,163 @@ msgstr "" " Hauptbranch (externer HEAD ist mehrdeutig, kรถnnte einer der folgenden " "sein):\n" -#: builtin/remote.c:1195 +#: builtin/remote.c:1272 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Remote-Branch:%s" msgstr[1] " Remote-Branches:%s" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1275 builtin/remote.c:1301 msgid " (status not queried)" msgstr " (Zustand nicht abgefragt)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1284 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:1215 +#: builtin/remote.c:1292 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokale Referenzen werden von 'git push' gespiegelt" -#: builtin/remote.c:1221 +#: builtin/remote.c:1298 #, 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:1242 +#: builtin/remote.c:1319 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "setzt refs/remotes/<Name>/HEAD gemรคร dem Remote-Repository" -#: builtin/remote.c:1244 +#: builtin/remote.c:1321 msgid "delete refs/remotes/<name>/HEAD" msgstr "entfernt refs/remotes/<Name>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1336 msgid "Cannot determine remote HEAD" msgstr "Kann HEAD des Remote-Repositories nicht bestimmen" -#: builtin/remote.c:1261 +#: builtin/remote.c:1338 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:1271 +#: builtin/remote.c:1348 #, c-format msgid "Could not delete %s" msgstr "Konnte %s nicht entfernen" -#: builtin/remote.c:1279 +#: builtin/remote.c:1356 #, c-format msgid "Not a valid ref: %s" msgstr "keine gรผltige Referenz: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1358 #, c-format msgid "Could not setup %s" msgstr "Konnte %s nicht einrichten" -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, c-format msgid " %s will become dangling!" msgstr " %s wird unreferenziert!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1377 #, c-format msgid " %s has become dangling!" msgstr " %s wurde unreferenziert!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "Pruning %s" msgstr "entferne veraltete Branches von %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1388 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1404 #, c-format msgid " * [would prune] %s" msgstr " * [wรผrde veralteten Branch entfernen] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1407 #, c-format msgid " * [pruned] %s" msgstr "* [veralteten Branch entfernt] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1452 msgid "prune remotes after fetching" msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\"" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 #, c-format msgid "No such remote '%s'" msgstr "Kein solches Remote-Repository '%s'" -#: builtin/remote.c:1454 +#: builtin/remote.c:1531 msgid "add branch" msgstr "Branch hinzufรผgen" -#: builtin/remote.c:1461 +#: builtin/remote.c:1538 msgid "no remote specified" msgstr "kein Remote-Repository angegeben" -#: builtin/remote.c:1478 +#: builtin/remote.c:1555 msgid "query push URLs rather than fetch URLs" msgstr "nur URLs fรผr Push ausgeben" -#: builtin/remote.c:1480 +#: builtin/remote.c:1557 msgid "return all URLs" msgstr "alle URLs ausgeben" -#: builtin/remote.c:1508 +#: builtin/remote.c:1585 #, c-format msgid "no URLs configured for remote '%s'" msgstr "Keine URLs fรผr Remote-Repository '%s' konfiguriert." -#: builtin/remote.c:1534 +#: builtin/remote.c:1611 msgid "manipulate push URLs" msgstr "URLs fรผr \"push\" manipulieren" -#: builtin/remote.c:1536 +#: builtin/remote.c:1613 msgid "add URL" msgstr "URL hinzufรผgen" -#: builtin/remote.c:1538 +#: builtin/remote.c:1615 msgid "delete URLs" msgstr "URLs lรถschen" -#: builtin/remote.c:1545 +#: builtin/remote.c:1622 msgid "--add --delete doesn't make sense" msgstr "" "Die Optionen --add und --delete kรถnnen nicht gemeinsam verwendet werden." -#: builtin/remote.c:1584 +#: builtin/remote.c:1661 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ungรผltiges altes URL Format: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1669 #, c-format msgid "No such URL found: %s" msgstr "Keine solche URL gefunden: %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1671 msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht fรผr \"push\" bestimmt sind" -#: 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 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [<Optionen>]" -#: builtin/repack.c:27 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18696,119 +20562,119 @@ msgstr "" "--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n" "Konfiguration." -#: builtin/repack.c:190 +#: builtin/repack.c:197 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:229 builtin/repack.c:408 +#: builtin/repack.c:236 builtin/repack.c:421 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:246 +#: builtin/repack.c:260 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:284 +#: builtin/repack.c:297 msgid "pack everything in a single pack" msgstr "alles in eine einzige Pack-Datei packen" -#: builtin/repack.c:286 +#: builtin/repack.c:299 msgid "same as -a, and turn unreachable objects loose" msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelรถscht" -#: builtin/repack.c:289 +#: builtin/repack.c:302 msgid "remove redundant packs, and run git-prune-packed" msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausfรผhren" -#: builtin/repack.c:291 +#: builtin/repack.c:304 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "--no-reuse-delta an git-pack-objects รผbergeben" -#: builtin/repack.c:293 +#: builtin/repack.c:306 msgid "pass --no-reuse-object to git-pack-objects" msgstr "--no-reuse-object an git-pack-objects รผbergeben" -#: builtin/repack.c:295 +#: builtin/repack.c:308 msgid "do not run git-update-server-info" msgstr "git-update-server-info nicht ausfรผhren" -#: builtin/repack.c:298 +#: builtin/repack.c:311 msgid "pass --local to git-pack-objects" msgstr "--local an git-pack-objects รผbergeben" -#: builtin/repack.c:300 +#: builtin/repack.c:313 msgid "write bitmap index" msgstr "Bitmap-Index schreiben" -#: builtin/repack.c:302 +#: builtin/repack.c:315 msgid "pass --delta-islands to git-pack-objects" msgstr "--delta-islands an git-pack-objects รผbergeben" -#: builtin/repack.c:303 +#: builtin/repack.c:316 msgid "approxidate" msgstr "Datumsangabe" -#: builtin/repack.c:304 +#: builtin/repack.c:317 msgid "with -A, do not loosen objects older than this" msgstr "mit -A, keine Objekte รคlter als dieses Datum lรถschen" -#: builtin/repack.c:306 +#: builtin/repack.c:319 msgid "with -a, repack unreachable objects" msgstr "mit -a, nicht erreichbare Objekte neu packen" -#: builtin/repack.c:308 +#: builtin/repack.c:321 msgid "size of the window used for delta compression" msgstr "Grรถรe des Fensters fรผr die Delta-Kompression" -#: builtin/repack.c:309 builtin/repack.c:315 +#: builtin/repack.c:322 builtin/repack.c:328 msgid "bytes" msgstr "Bytes" -#: builtin/repack.c:310 +#: builtin/repack.c:323 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:312 +#: builtin/repack.c:325 msgid "limits the maximum delta depth" msgstr "die maximale Delta-Tiefe limitieren" -#: builtin/repack.c:314 +#: builtin/repack.c:327 msgid "limits the maximum number of threads" msgstr "maximale Anzahl von Threads limitieren" -#: builtin/repack.c:316 +#: builtin/repack.c:329 msgid "maximum size of each packfile" msgstr "maximale Grรถรe fรผr jede Paketdatei" -#: builtin/repack.c:318 +#: builtin/repack.c:331 msgid "repack objects in packs marked with .keep" msgstr "" "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden" -#: builtin/repack.c:320 +#: builtin/repack.c:333 msgid "do not repack this pack" msgstr "dieses Paket nicht neu packen" -#: builtin/repack.c:330 +#: builtin/repack.c:343 msgid "cannot delete packs in a precious-objects repo" msgstr "kann Pack-Dateien in precious-objects Repository nicht lรถschen" -#: builtin/repack.c:334 +#: builtin/repack.c:347 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable und -A sind inkompatibel" -#: builtin/repack.c:417 +#: builtin/repack.c:430 msgid "Nothing new to pack." msgstr "Nichts Neues zum Packen." -#: builtin/repack.c:478 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18827,7 +20693,7 @@ msgstr "" "WARNUNG: ebenfalls fehl.\n" "WARNUNG: Bitte benennen Sie diese manuell nach %s um:\n" -#: builtin/repack.c:526 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "Fehler beim Lรถschen von '%s'" @@ -18936,8 +20802,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:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: 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 "Kein gรผltiger Objektname: '%s'" @@ -18956,22 +20822,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:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "Konnte nicht %s als Commit parsen." -#: builtin/replace.c:414 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "ungรผltiger Merge-Tag in Commit '%s'" -#: builtin/replace.c:416 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "fehlerhafter Merge-Tag in Commit '%s'" -#: builtin/replace.c:428 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -18980,31 +20846,31 @@ msgstr "" "Der ursprรผngliche Commit '%s' enthรคlt Merge-Tag '%s', der verworfen\n" "wird; benutzen Sie --edit anstatt --graft" -#: builtin/replace.c:467 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "Der originale Commit '%s' hat eine GPG-Signatur." -#: builtin/replace.c:468 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!" -#: builtin/replace.c:478 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Konnte Ersetzungs-Commit fรผr '%s' nicht schreiben" -#: builtin/replace.c:486 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "Kรผnstlicher Vorgรคnger (\"graft\") fรผr '%s' nicht notwendig." -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, 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:525 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -19013,71 +20879,71 @@ msgstr "" "Konnte die folgenden kรผnstlichen Vorgรคnger (\"grafts\") nicht konvertieren:\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "ersetzende Referenzen auflisten" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "ersetzende Referenzen lรถschen" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "existierendes Objekt bearbeiten" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "Eltern-Commits eines Commits รคndern" -#: builtin/replace.c:550 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "existierende Datei des kรผnstlichen Vorgรคngers (\"graft\") konvertieren" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "die Referenz ersetzen, wenn sie existiert" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "keine ansprechende Anzeige des Objektinhaltes fรผr --edit" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "das angegebene Format benutzen" -#: builtin/replace.c:567 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "--format kann nicht beim Auflisten verwendet werden." -#: builtin/replace.c:575 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "-f macht nur beim Schreiben einer Ersetzung Sinn." -#: builtin/replace.c:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw macht nur mit --edit Sinn." -#: builtin/replace.c:585 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "-d benรถtigt mindestens ein Argument." -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "Ungรผltige Anzahl von Argumenten." -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e benรถtigt genau ein Argument." -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-g benรถtigt mindestens ein Argument." -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file erwartet keine Argumente" -#: builtin/replace.c:615 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "Mit -l kann nur ein Muster angegeben werden." @@ -19105,115 +20971,127 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfade>..." +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfadspezifikation>..." #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfade>...]" +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>...]" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "mixed" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "soft" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "hard" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "zusammenfรผhren" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "keep" -#: builtin/reset.c:81 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "Sie haben keinen gรผltigen HEAD." -#: builtin/reset.c:83 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD." -#: builtin/reset.c:89 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." -#: builtin/reset.c:193 +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ist jetzt bei %s" + +#: builtin/reset.c:195 #, 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:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "weniger Ausgaben, nur Fehler melden" -#: builtin/reset.c:295 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "HEAD und Index umsetzen" -#: builtin/reset.c:296 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "nur HEAD umsetzen" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen" -#: builtin/reset.c:302 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "HEAD umsetzen, aber lokale รnderungen behalten" -#: builtin/reset.c:308 +#: builtin/reset.c:310 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:326 +#: builtin/reset.c:344 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Konnte '%s' nicht als gรผltigen Commit auflรถsen." -#: builtin/reset.c:334 +#: builtin/reset.c:352 #, 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:343 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}" -#: builtin/reset.c:353 +#: builtin/reset.c:371 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:355 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "Ein '%s'-Reset mit Pfaden ist nicht mรถglich." -#: builtin/reset.c:370 +#: builtin/reset.c:388 #, 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:374 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "-N kann nur mit -mixed benutzt werden" -#: builtin/reset.c:395 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "Nicht zum Commit vorgemerkte รnderungen nach Zurรผcksetzung:" -#: builtin/reset.c:398 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -19227,56 +21105,50 @@ msgstr "" "das zu verhindern. Setzen Sie die Konfigurationseinstellung reset.quiet\n" "auf \"true\", um das zum Standard zu machen.\n" -#: builtin/reset.c:408 +#: builtin/reset.c:434 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen." -#: builtin/reset.c:412 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "Konnte neue Index-Datei nicht schreiben." -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" "--exclude-promisor-objects und --missing kรถnnen nicht kombiniert werden." -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "Das Filtern von Objekten erfordert --objects." -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "Ungรผltiger \"sparse\"-Wert '%s'." - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "rev-list unterstรผtzt keine Anzeige von Notizen" -#: 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-list.c:615 +msgid "marked counting is incompatible with --objects" +msgstr "markiertes Zรคhlen ist inkompatibel mit der Option --objects" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "`--` als Argument lassen" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "" "Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -19425,38 +21297,44 @@ 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:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "keine gelรถschten Dateien auflisten" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "nur aus dem Index entfernen" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "die \"up-to-date\" Prรผfung รผberschreiben" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "rekursives Entfernen erlauben" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "mit Rรผckgabewert 0 beenden, wenn keine รbereinstimmung gefunden wurde" -#: builtin/rm.c:289 +#: 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 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:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "'%s' wird nicht ohne -r rekursiv entfernt" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: konnte %s nicht lรถschen" @@ -19474,55 +21352,77 @@ msgstr "" " --all und die explizite Angabe einer <Referenz> schlieรen sich gegenseitig " "aus." -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:182 msgid "remote name" msgstr "Name des Remote-Repositories" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:195 msgid "use stateless RPC protocol" msgstr "zustandsloses RPC-Protokoll verwenden" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:196 msgid "read refs from stdin" msgstr "Referenzen von der Standard-Eingabe lesen" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:197 msgid "print status from remote helper" msgstr "Status des Remote-Helpers ausgeben" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:15 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<Optionen>]" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:134 +msgid "using multiple --group options with stdin is not supported" +msgstr "mehrere Optionen --group mit Standard-Eingabe wird nicht unterstรผtzt" + +#: builtin/shortlog.c:144 +msgid "using --group=trailer with stdin is not supported" +msgstr "" +"Nutzung von --group=trailer mit Standard-Eingabe wird nicht unterstรผtzt" + +#: builtin/shortlog.c:388 +#, c-format +msgid "unknown group type: %s" +msgstr "unbekannter Gruppen-Typ: %s" + +#: builtin/shortlog.c:416 msgid "Group by committer rather than author" msgstr "รผber Commit-Ersteller anstatt Autor gruppieren" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:419 msgid "sort output according to the number of commits per author" msgstr "die Ausgabe entsprechend der Anzahl von Commits pro Autor sortieren" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:421 msgid "Suppress commit descriptions, only provides commit count" msgstr "Commit-Beschreibungen unterdrรผcken, nur Anzahl der Commits liefern" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:423 msgid "Show the email address of each author" msgstr "die E-Mail-Adresse von jedem Autor anzeigen" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:424 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:425 msgid "Linewrap output" msgstr "Ausgabe mit Zeilenumbrรผchen" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:427 +msgid "field" +msgstr "Feld" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "Gruppieren รผber Feld" + +#: builtin/shortlog.c:456 msgid "too many arguments given outside repository" msgstr "zu viele Argumente auรerhalb des Repositories angegeben" @@ -19663,6 +21563,14 @@ msgstr "'%s' ist keine gรผltige Referenz." msgid "cannot find commit %s (%s)" msgstr "kann Commit %s (%s) nicht finden" +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "Hash-Algorithmus" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "Unbekannter Hash-Algorithmus" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -19711,15 +21619,92 @@ msgstr "" "Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen " "Repository befinden" -#: builtin/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <Optionen>" + +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:76 +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:228 +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:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "" +"Repository-Format konnte nicht erweitert werden, um worktreeConfig zu " +"aktivieren" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "Einstellung fรผr extensions.worktreeConfig konnte nicht gesetzt werden" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "initialisiere den partiellen Checkout im Cone-Modus" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "Fehler beim รffnen von '%s'" + +#: builtin/sparse-checkout.c:401 +#, c-format +msgid "could not normalize path %s" +msgstr "konnte Pfad '%s' nicht normalisieren" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <Muster>)" + +#: builtin/sparse-checkout.c:438 +#, 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:492 builtin/sparse-checkout.c:516 +msgid "unable to load existing sparse-checkout patterns" +msgstr "konnte die existierenden Muster des partiellen Checkouts nicht laden" + +#: builtin/sparse-checkout.c:561 +msgid "read patterns from standard in" +msgstr "Muster von der Standard-Eingabe lesen" + +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:623 +msgid "error while refreshing working directory" +msgstr "Fehler wรคhrend der Aktualisierung des Arbeitsverzeichnisses." + +#: builtin/stash.c:22 builtin/stash.c:38 msgid "git stash list [<options>]" msgstr "git stash list [<Optionen>]" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<Optionen>] [<Stash>]" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<Stash>]" @@ -19727,25 +21712,27 @@ 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:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <Branch> [<Stash>]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: 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 <Nachricht>]\n" +" [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n" " [--] [<Pfadspezifikation>...]]" -#: builtin/stash.c:31 builtin/stash.c:84 +#: 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>]" @@ -19753,192 +21740,204 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<Nachricht>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<Stash>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<Stash>]" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <Nachricht>] [-q|--quiet] <Commit>" -#: builtin/stash.c:127 +#: 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 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' ist kein \"stash\"-artiger Commit" -#: builtin/stash.c:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "Zu viele Commits angegeben:%s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "Keine Stash-Eintrรคge gefunden." -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "'%s' ist kein gรผltiger Referenzname." -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear mit Parametern ist nicht implementiert" -#: builtin/stash.c:403 +#: builtin/stash.c:404 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:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "Konnte keinen Diff erzeugen %s^!." -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "Konflikte im Index. Versuchen Sie es ohne --index." -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "Konnte Index-Verzeichnis nicht speichern" -#: builtin/stash.c:434 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen." -#: builtin/stash.c:448 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "Fรผhre %s mit %s zusammen" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "Index wurde nicht aus dem Stash zurรผckgeladen." -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "Versuche Index wiederherzustellen." -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "%s (%s) gelรถscht" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Konnte Stash-Eintrag nicht lรถschen" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' ist keine Stash-Referenz" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 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:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "Kein Branchname spezifiziert" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "Kann nicht %s mit %s aktualisieren." -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 msgid "stash message" msgstr "Stash-Beschreibung" -#: builtin/stash.c:818 +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" erwartet ein Argument <Commit>" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1043 msgid "No changes selected" msgstr "Keine รnderungen ausgewรคhlt" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1143 msgid "You do not have the initial commit yet" msgstr "Sie haben bisher noch keinen initialen Commit" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1170 msgid "Cannot save the current index state" msgstr "Kann den aktuellen Zustand des Index nicht speichern" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1179 msgid "Cannot save the untracked files" msgstr "Kann die unversionierten Dateien nicht speichern" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1190 builtin/stash.c:1199 msgid "Cannot save the current worktree state" msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1227 msgid "Cannot record working tree state" msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1276 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:1285 +#: builtin/stash.c:1292 msgid "Did you forget to 'git add'?" msgstr "Haben Sie vielleicht 'git add' vergessen?" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1307 msgid "No local changes to save" msgstr "Keine lokalen รnderungen zum Speichern" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1314 msgid "Cannot initialize stash" msgstr "Kann \"stash\" nicht initialisieren" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1329 msgid "Cannot save the current status" msgstr "Kann den aktuellen Status nicht speichern" -#: builtin/stash.c:1327 +#: builtin/stash.c:1334 #, c-format msgid "Saved working directory and index state %s" msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert." -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1424 msgid "Cannot remove worktree changes" msgstr "Kann รnderungen im Arbeitsverzeichnis nicht lรถschen" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1463 builtin/stash.c:1528 msgid "keep index" msgstr "behalte Index" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "stash in patch mode" msgstr "Stash in Patch-Modus" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "quiet mode" msgstr "weniger Ausgaben" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "include untracked files in stash" msgstr "unversionierte Dateien in Stash einbeziehen" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1470 builtin/stash.c:1535 msgid "include ignore files" msgstr "ignorierte Dateien einbeziehen" -#: builtin/stash.c:1555 -#, c-format -msgid "could not exec %s" -msgstr "Konnte 'exec %s' nicht ausfรผhren." +#: builtin/stash.c:1570 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"Die Unterstรผtzung fรผr stash.useBuiltin wurde entfernt!\n" +"Siehe dessen Eintrag in 'git help config' fรผr Details." #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -19958,40 +21957,40 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Vollstรคndiger Referenzname erwartet, %s erhalten" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "'submodule--helper print-default-remote' erwartet keine Argumente." -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "Kann eine Komponente von URL '%s' nicht extrahieren" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "Alternativer Anker fรผr relative Pfade" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, 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:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Betrete '%s'\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -20000,7 +21999,7 @@ msgstr "" "run_command gab nicht-Null Status fรผr '%s' zurรผck.\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -20012,21 +22011,21 @@ msgstr "" "nicht-Null Status zurรผck.\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 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:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" msgstr "Rekursion in verschachtelte Submodule durchfรผhren" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -20035,104 +22034,159 @@ msgstr "" "Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n" "Repository sein eigenes verbindliches Upstream-Repository ist." -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:666 #, 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:669 +#: builtin/submodule--helper.c:670 #, 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:679 +#: builtin/submodule--helper.c:680 #, 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:686 +#: builtin/submodule--helper.c:687 #, 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:708 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrรผcken" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<Optionen>] [<Pfad>]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, 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:824 +#: builtin/submodule--helper.c:835 #, 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:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "Fehler bei Rekursion in Submodul '%s'." -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "Ausgabe รผber Submodul-Status unterdrรผcken" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:887 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:877 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" msgstr "Rekursion in verschachtelte Submodule durchfรผhren" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <Pfad>" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "* %s %s(blob)->%s(submodule)" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "* %s %s(submodule)->%s(blob)" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "Hash eines Objektes von '%s' konnte nicht erzeugt werden" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "unerwarteter Modus %o\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "" +"benutze den Commit, der im Index gespeichert ist, statt vom Submodul HEAD" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "um den Commit aus dem Index mit dem im Submodul HEAD zu vergleichen" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "" +"รผberspringe Submodule, wo der 'ignore_config' Wert auf 'all' gesetzt ist" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "Grรถรe der Zusammenfassung begrenzen" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule--helper summary [<Optionen>] [<Commit>] [--] [<Pfad>]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "konnte keinen Commit fรผr HEAD holen" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "--cached und --files schlieรen sich gegenseitig aus" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synchronisiere Submodul-URL fรผr '%s'\n" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" -msgstr "Fehler beim Registrieren der URL fรผr Submodul-Pfad '%s'." +msgstr "Fehler beim Registrieren der URL fรผr Submodul-Pfad '%s'" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" -msgstr "Fehler beim Lesen des Standard-Remote-Repositories fรผr Submodul '%s'." +msgstr "Fehler beim Lesen des Standard-Remote-Repositories fรผr Submodul '%s'" -#: builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" -msgstr "Fehler beim Aktualisieren des Remote-Repositories fรผr Submodul '%s'." +msgstr "Fehler beim Aktualisieren des Remote-Repositories fรผr Submodul '%s'" -#: builtin/submodule--helper.c:1048 +#: builtin/submodule--helper.c:1485 msgid "Suppress output of synchronizing submodule url" msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrรผcken" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20142,7 +22196,7 @@ msgstr "" "(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n" "lรถschen mรถchten)" -#: builtin/submodule--helper.c:1121 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -20151,185 +22205,215 @@ msgstr "" "Arbeitsverzeichnis von Submodul in '%s' enthรคlt lokale รnderungen;\n" "verwenden Sie '-f', um diese zu verwerfen." -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "Verzeichnis '%s' bereinigt.\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1568 #, 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:1142 +#: builtin/submodule--helper.c:1579 #, 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:1158 +#: builtin/submodule--helper.c:1595 #, 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:1187 +#: builtin/submodule--helper.c:1624 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:1188 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "alle Submodule austragen" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1644 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:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1713 +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:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "Submodul '%s' kann Alternative nicht hinzufรผgen: %s" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1791 #, 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:1348 +#: builtin/submodule--helper.c:1798 #, 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:1371 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "Pfad fรผr neues Submodul" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "Name des neuen Submoduls" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "URL von der das Submodul geklont wird" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "Tiefe des Klons mit unvollstรคndiger Historie (shallow)" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "Fortschrittsanzeige beim Klonen erzwingen" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +msgid "disallow cloning into non-empty directory" +msgstr "Klonen in ein nicht leeres Verzeichnis verbieten" + +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference " -"<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth " -"<Tiefe>] --url <URL> --path <Pfad>" +"<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] --url " +"<URL> --path <Pfad>" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1873 +#, 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." + +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" -msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen" +msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen." -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "Verzeichnis ist nicht leer: '%s'" + +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden." -#: builtin/submodule--helper.c:1474 +#: builtin/submodule--helper.c:1936 #, 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:1478 +#: builtin/submodule--helper.c:1940 #, 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:1571 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Submodul-Pfad '%s' nicht initialisiert" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "Meinten Sie vielleicht 'update --init'?" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "รberspringe nicht zusammengefรผhrtes Submodul %s" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "รberspringe Submodul '%s'" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab." -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "Pfad zum Arbeitsverzeichnis" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "Pfad zum Arbeitsverzeichnis, รผber verschachtelte Submodul-Grenzen hinweg" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout oder none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:2340 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:1867 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "Parallele Ausfรผhrungen" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:2345 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:1870 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "keine Fortschrittsanzeige beim Klonen" -#: 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:2357 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "Fehlerhafter Wert fรผr --update Parameter" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -20338,52 +22422,86 @@ 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:2061 +#: builtin/submodule--helper.c:2541 #, 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:2094 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "Rekursion in Submodule durchfรผhren" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2636 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:2159 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "Konfiguration in der .gitmodules-Datei entfernen" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <name> [<Wert>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <Name>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 #, 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:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2681 +msgid "Suppress output for setting url of a submodule" +msgstr "Ausgaben beim Setzen der URL eines Submoduls unterdrรผcken" + +#: builtin/submodule--helper.c:2685 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper set-url [--quiet] <Pfad> <neue URL>" + +#: builtin/submodule--helper.c:2718 +msgid "set the default tracking branch to master" +msgstr "Standard-Tracking-Branch auf master setzen" + +#: builtin/submodule--helper.c:2720 +msgid "set the default tracking branch" +msgstr "Standard-Tracking-Branch setzen" + +#: builtin/submodule--helper.c:2724 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) [<Pfad>]" + +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <Branch> <Pfad>" + +#: builtin/submodule--helper.c:2732 +msgid "--branch or --default required" +msgstr "Option --branch oder --default erforderlich" + +#: builtin/submodule--helper.c:2735 +msgid "--branch and --default are mutually exclusive" +msgstr "--branch und --default schlieรen sich gegenseitig aus" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s unterstรผtzt kein --super-prefix" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' ist kein gรผltiger Unterbefehl von submodule--helper" @@ -20409,11 +22527,11 @@ msgstr "symbolische Referenzen lรถschen" msgid "shorten ref output" msgstr "verkรผrzte Ausgabe der Referenzen" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "Grund" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "Grund fรผr die Aktualisierung" @@ -20433,11 +22551,13 @@ msgstr "git tag -d <Tagname>..." msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" "git tag -l [-n[<Nummer>]] [--contains <Commit>] [--no-contains <Commit>] [--" "points-at <Objekt>]\n" -"\t\t[--format=<Muster>] [--[no-]merged [<Commit>]] [<Muster>...]" +"\t\t[--format=<format>] [--merged <Commit>] [--no-merged <Commit>] " +"[<Muster>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -20507,351 +22627,355 @@ msgstr "" msgid "bad object type." msgstr "ungรผltiger Objekt-Typ" -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "keine Tag-Beschreibung?" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "Die Tag-Beschreibung wurde in %s gelassen\n" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "Tagnamen auflisten" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "Tags lรถschen" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "Tags รผberprรผfen" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "Optionen fรผr Erstellung von Tags" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "annotiertes Tag, benรถtigt eine Beschreibung" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "Tag-Beschreibung" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "Bearbeitung der Tag-Beschreibung erzwingen" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "annotiertes und GPG-signiertes Tag" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "einen anderen Schlรผssel verwenden, um das Tag zu signieren" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "das Tag ersetzen, wenn es existiert" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "Reflog erstellen" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "Optionen fรผr Auflistung der Tags" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "Liste der Tags in Spalten anzeigen" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "nur Tags ausgeben, die diesen Commit beinhalten" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "nur Tags ausgeben, die gemerged wurden" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "nur Tags ausgeben, die nicht gemerged wurden" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "nur Tags von dem Objekt ausgeben" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "--column und -n sind inkompatibel" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "Die Option -n ist nur im Listenmodus erlaubt." -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "Die Option --contains ist nur im Listenmodus erlaubt." -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt." -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "Die Option --points-at ist nur im Listenmodus erlaubt." -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt." -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "nur eine -F oder -m Option ist erlaubt." -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "zu viele Parameter" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gรผltiger Tagname." -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "Tag '%s' existiert bereits" -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "Entpacke Objekte" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "Konnte Datei '%s' nicht erstellen" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "Konnte Datei '%s' nicht lรถschen" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "Konnte Verzeichnis '%s' nicht lรถschen" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "Prรผfe mtime in '%s' " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 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:166 +#: builtin/update-index.c:167 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:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "" "Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geรคndert" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 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:201 +#: builtin/update-index.c:202 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:214 +#: builtin/update-index.c:215 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:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<Optionen>] [--] [<Datei>...]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "" "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss" -#: builtin/update-index.c:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "Aktualisierung: ignoriert Submodule" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "keine neuen Dateien ignorieren" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht" -#: builtin/update-index.c:981 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis beachten" -#: builtin/update-index.c:983 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "" "aktualisieren, auch wenn der Index nicht zusammengefรผhrte Eintrรคge beinhaltet" -#: builtin/update-index.c:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "Dateiinformationen aktualisieren" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung" -#: builtin/update-index.c:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<Modus>,<Objekt>,<Pfad>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "den angegebenen Eintrag zum Commit vormerken" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "diese Datei immer als unverรคndert betrachten" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "\"assumed-unchanged\"-Bit lรถschen" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "Dateien als \"index-only\" markieren" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "\"skip-worktree\"-Bit lรถschen" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1020 +msgid "do not touch index-only entries" +msgstr "\"index-only\" Eintrรคge รผberspringen" + +#: builtin/update-index.c:1022 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:1019 +#: builtin/update-index.c:1024 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:1021 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1028 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:1027 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "Eintrรคge von der Standard-Eingabe zum Commit vormerken" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1036 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:1035 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "nur Eintrรคge aktualisieren, die unterschiedlich zu HEAD sind" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "die Aktionen in der Standard-Ausgabe ausgeben" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(fรผr Fremdprogramme) keine gespeicherten, nicht aufgelรถste Konflikte" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "Index-Datei in diesem Format schreiben" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "Splitting des Index aktivieren oder deaktivieren" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "Cache fรผr unversionierte Dateien aktivieren oder deaktivieren" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 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:1056 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "" "Cache fรผr unversionierte Dateien ohne Prรผfung des Dateisystems aktivieren" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1063 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:1060 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "Dateisystem-Monitor aktivieren oder deaktivieren" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "Dateien als \"fsmonitor valid\" markieren" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "\"fsmonitor valid\"-Bit lรถschen" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20859,7 +22983,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:1177 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20867,7 +22991,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:1188 +#: 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" @@ -20875,11 +22999,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:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Cache fรผr unversionierte Dateien deaktiviert" -#: builtin/update-index.c:1200 +#: 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" @@ -20888,23 +23012,23 @@ msgstr "" "dies,\n" "wenn sie wirklich den Cache fรผr unversionierte Dateien aktivieren mรถchten." -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cache fรผr unversionierte Dateien fรผr '%s' aktiviert" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1218 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:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "Dateisystem-Monitor aktiviert" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" @@ -20912,7 +23036,7 @@ msgstr "" "Monitor\n" "wirklich deaktivieren mรถchten." -#: builtin/update-index.c:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "Dateisystem-Monitor deaktiviert" @@ -20929,19 +23053,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<Optionen>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "diese Referenz lรถschen" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "<Referenzname> aktualisieren, nicht den Verweis" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "Aktualisierungen von der Standard-Eingabe lesen" @@ -20987,15 +23111,15 @@ msgstr "Commit-Inhalte ausgeben" msgid "print raw gpg status output" msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 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 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "erweiterte Ausgaben" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "nur Statistiken anzeigen" @@ -21007,234 +23131,226 @@ msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..." msgid "print tag contents" msgstr "Tag-Inhalte ausgeben" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<Optionen>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<Optionen>] <Pfad>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<Optionen>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <Pfad>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:970 #, c-format msgid "failed to delete '%s'" msgstr "Fehler beim Lรถschen von '%s'" -#: 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 +msgid "not a valid directory" +msgstr "kein gรผltiges Verzeichnis" -#: 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:91 +msgid "gitdir file does not exist" +msgstr "gitdir-Datei existiert nicht" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:96 builtin/worktree.c:105 #, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -msgstr "Lรถsche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen" +msgid "unable to read gitdir file (%s)" +msgstr "konnte gitdir-Datei nicht lesen (%s)" -#: builtin/worktree.c:110 +#: builtin/worktree.c:115 #, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" -msgstr "" -"Lรถsche worktrees/%s: read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> " -"gelesen)" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> gelesen)" -#: 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:123 +msgid "invalid gitdir file" +msgstr "ungรผltige gitdir-Datei" + +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "gitdir-Datei verweist auf nicht existierenden Ort" -#: builtin/worktree.c:127 +#: builtin/worktree.c:146 #, 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" +msgid "Removing %s/%s: %s" +msgstr "Entferne %s/%s: %s" -#: builtin/worktree.c:166 +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "entfernte Arbeitsverzeichnisse ausgeben" -#: builtin/worktree.c:168 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "Arbeitsverzeichnisse รคlter als <Zeit> verfallen lassen" -#: builtin/worktree.c:235 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "'%s' existiert bereits" -#: builtin/worktree.c:252 +#: builtin/worktree.c:302 #, c-format -msgid "unable to re-add worktree '%s'" -msgstr "Konnte Arbeitsverzeichnis '%s' nicht neu hinzufรผgen." +msgid "unusable worktree destination '%s'" +msgstr "nicht nutzbares Ziel des Arbeitsverzeichnisses '%s'" -#: builtin/worktree.c:257 +#: builtin/worktree.c:307 #, 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" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" "'%s' ist ein fehlendes, aber gesperrtes Arbeitsverzeichnis;\n" -"Benutzen Sie 'add -f -f' zum รberschrieben, oder 'unlock' und 'prune'\n" +"Benutzen Sie '%s -f -f' zum รberschreiben, oder 'unlock' und 'prune'\n" "oder 'remove' zum Lรถschen." -#: builtin/worktree.c:259 +#: builtin/worktree.c:309 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" "'%s' ist ein fehlendes, aber bereits registriertes Arbeitsverzeichnis;\n" -"Benutzen Sie 'add -f' zum รberschreiben, oder 'prune' oder 'remove' zum\n" +"Benutzen Sie '%s -f' zum รberschreiben, oder 'prune' oder 'remove' zum\n" "Lรถschen." -#: builtin/worktree.c:309 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')" -#: builtin/worktree.c:442 +#: builtin/worktree.c:496 #, 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:451 +#: builtin/worktree.c:505 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)" -#: builtin/worktree.c:457 +#: builtin/worktree.c:511 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Bereite Arbeitsverzeichnis vor (losgelรถster HEAD %s)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:552 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:501 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "neuen Branch erstellen" -#: builtin/worktree.c:503 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "Branch erstellen oder umsetzen" -#: builtin/worktree.c:505 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "das neue Arbeitsverzeichnis auschecken" -#: builtin/worktree.c:506 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "das neue Arbeitsverzeichnis gesperrt lassen" -#: builtin/worktree.c:509 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:566 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:520 +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B und --detach schlieรen sich gegenseitig aus" -#: builtin/worktree.c:581 +#: builtin/worktree.c:635 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:681 +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "Sperrgrund" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' ist kein Arbeitsverzeichnis" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:769 builtin/worktree.c:802 msgid "The main working tree cannot be locked or unlocked" msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden." -#: builtin/worktree.c:700 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ist bereits gesperrt, Grund: %s" -#: builtin/worktree.c:702 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "'%s' ist bereits gesperrt" -#: builtin/worktree.c:730 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "'%s' ist nicht gesperrt" -#: builtin/worktree.c:771 +#: builtin/worktree.c:845 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:779 +#: builtin/worktree.c:853 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:802 builtin/worktree.c:929 +#: builtin/worktree.c:876 builtin/worktree.c:1000 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' ist ein Hauptarbeitsverzeichnis" -#: builtin/worktree.c:807 +#: builtin/worktree.c:881 #, c-format msgid "could not figure out destination name from '%s'" msgstr "Konnte Zielname aus '%s' nicht bestimmen." -#: builtin/worktree.c:813 -#, c-format -msgid "target '%s' already exists" -msgstr "Ziel '%s' existiert bereits." - -#: builtin/worktree.c:821 +#: builtin/worktree.c:894 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21244,7 +23360,7 @@ msgstr "" "Benutzen Sie 'move -f -f' zum รberschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:823 +#: builtin/worktree.c:896 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21253,38 +23369,40 @@ msgstr "" "Benutzen Sie 'move -f -f' zum รberschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:826 +#: builtin/worktree.c:899 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s" -#: builtin/worktree.c:831 +#: builtin/worktree.c:904 #, c-format msgid "failed to move '%s' to '%s'" msgstr "Fehler beim Verschieben von '%s' nach '%s'" -#: builtin/worktree.c:879 +#: builtin/worktree.c:950 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "Fehler beim Ausfรผhren von 'git status' auf '%s'" -#: builtin/worktree.c:883 +#: builtin/worktree.c:954 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "'%s' ist verรคndert, benutzen Sie --force zum Lรถschen" +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" -#: builtin/worktree.c:888 +#: builtin/worktree.c:959 #, 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:911 +#: builtin/worktree.c:982 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:934 +#: builtin/worktree.c:1005 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21294,7 +23412,7 @@ msgstr "" "Benutzen Sie 'remove -f -f' zum รberschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:936 +#: builtin/worktree.c:1007 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21303,11 +23421,21 @@ msgstr "" "Benutzen Sie 'remove -f -f' zum รberschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:939 +#: builtin/worktree.c:1010 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht lรถschen: %s" +#: builtin/worktree.c:1034 +#, c-format +msgid "repair: %s: %s" +msgstr "repariere: %s: %s" + +#: builtin/worktree.c:1037 +#, c-format +msgid "error: %s: %s" +msgstr "Fehler: %s: %s" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<Prรคfix>/]" @@ -21324,32 +23452,21 @@ msgstr "das Tree-Objekt fรผr ein Unterverzeichnis <Prรคfix> schreiben" msgid "only useful for debugging" msgstr "nur nรผtzlich fรผr Fehlersuche" -#: credential-cache--daemon.c:223 +#: http-fetch.c:114 #, 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 "" -"Die Berechtigungen auf Ihr Socket-Verzeichnis sind zu schwach; andere\n" -"Nutzer kรถnnten Ihre zwischengespeicherten Anmeldeinformationen lesen.\n" -"Ziehen Sie in Betracht\n" -"\n" -"\tchmod 0700 %s\n" -"\n" -"auszufรผhren." +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "Argument fรผr --packfile muss ein gรผltiger Hash sein ('%s' erhalten)" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben" +#: http-fetch.c:122 +msgid "not a git repository" +msgstr "kein Git-Repository" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "Commit %s ist nicht als erreichbar gekennzeichnet." -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "Zu viele Commits als erreichbar gekennzeichnet." @@ -21361,7 +23478,7 @@ msgstr "test-tool serve-v2 [<Optionen>]" msgid "exit immediately after advertising capabilities" msgstr "direkt nach Anzeige der angebotenen Fรคhigkeiten beenden" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -21377,7 +23494,7 @@ msgstr "" " [--git-dir=<Pfad>] [--work-tree=<Pfad>] [--namespace=<Name>]\n" " <Befehl> [<Argumente>]" -#: git.c:34 +#: git.c:35 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" @@ -21390,47 +23507,47 @@ msgstr "" "Konzept zu erfahren.\n" "Benutzen Sie 'git help git' fรผr einen รberblick des Systems." -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "Kein Verzeichnis fรผr --git-dir angegeben.\n" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "Kein Namespace fรผr --namespace angegeben.\n" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "Kein Verzeichnis fรผr --work-tree angegeben.\n" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "Kein Prรคfix fรผr --super-prefix angegeben.\n" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "-c erwartet einen Konfigurationsstring.\n" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "Kein Verzeichnis fรผr -C angegeben.\n" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "Unbekannte Option: %s\n" -#: git.c:360 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "beim Erweitern von Alias '%s': '%s'" -#: git.c:369 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -21439,39 +23556,39 @@ msgstr "" "Alias '%s' รคndert Umgebungsvariablen.\n" "Sie kรถnnen '!git' im Alias benutzen, um dies zu tun." -#: git.c:377 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "leerer Alias fรผr %s" -#: git.c:380 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "rekursiver Alias: %s" -#: git.c:460 +#: git.c:465 msgid "write failure on standard output" msgstr "Fehler beim Schreiben in die Standard-Ausgabe." -#: git.c:462 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe." -#: git.c:464 +#: git.c:469 msgid "close failed on standard output" msgstr "Fehler beim Schlieรen der Standard-Ausgabe." -#: git.c:793 +#: git.c:819 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "Alias-Schleife erkannt: Erweiterung von '%s' schlieรt nicht ab:%s" -#: git.c:843 +#: git.c:869 #, c-format msgid "cannot handle %s as a builtin" msgstr "Kann %s nicht als eingebauten Befehl behandeln." -#: git.c:856 +#: git.c:882 #, c-format msgid "" "usage: %s\n" @@ -21480,56 +23597,56 @@ msgstr "" "Verwendung: %s\n" "\n" -#: git.c:876 +#: git.c:902 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl.\n" -#: git.c:888 +#: git.c:914 #, c-format msgid "failed to run command '%s': %s\n" msgstr "Fehler beim Ausfรผhren von Befehl '%s': %s\n" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "negativer Wert fรผr http.postbuffer; benutze Standardwert %d" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Kontrolle รผber Delegation wird mit cURL < 7.22.0 nicht unterstรผtzt" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" "Das Anheften des รถffentlichen Schlรผssels wird mit cURL < 7.44.0\n" "nicht unterstรผtzt." -#: http.c:876 +#: http.c:910 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE wird mit cURL < 7.44.0 nicht unterstรผtzt." -#: http.c:949 +#: http.c:989 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Protokollbeschrรคnkungen werden mit cURL < 7.19.4 nicht unterstรผtzt." -#: http.c:1085 +#: http.c:1132 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Nicht unterstรผtztes SSL-Backend '%s'. Unterstรผtzte SSL-Backends:" -#: http.c:1092 +#: http.c:1139 #, 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:1096 +#: http.c:1143 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Konnte SSL-Backend nicht zu '%s' setzen: bereits gesetzt" -#: http.c:1965 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21540,155 +23657,196 @@ msgstr "" " gefragt nach: %s\n" " umgeleitet: %s" -#: remote-curl.c:157 +#: remote-curl.c:174 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "Ungรผltiges Quoting beim \"push-option\"-Wert: '%s'" -#: remote-curl.c:254 +#: remote-curl.c:298 #, 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:355 +#: remote-curl.c:399 msgid "invalid server response; expected service, got flush packet" msgstr "Ungรผltige Antwort des Servers. Service erwartet, Flush-Paket bekommen" -#: remote-curl.c:386 +#: remote-curl.c:430 #, c-format msgid "invalid server response; got '%s'" msgstr "Ungรผltige Serverantwort; '%s' bekommen" -#: remote-curl.c:446 +#: remote-curl.c:490 #, c-format msgid "repository '%s' not found" msgstr "Repository '%s' nicht gefunden." -#: remote-curl.c:450 +#: remote-curl.c:494 #, c-format msgid "Authentication failed for '%s'" msgstr "Authentifizierung fehlgeschlagen fรผr '%s'" -#: remote-curl.c:454 +#: remote-curl.c:498 #, c-format msgid "unable to access '%s': %s" msgstr "konnte nicht auf '%s' zugreifen: %s" -#: remote-curl.c:460 +#: remote-curl.c:504 #, c-format msgid "redirecting to %s" -msgstr "Leite nach %s um" +msgstr "Umleitung nach %s" -#: remote-curl.c:584 +#: remote-curl.c:633 msgid "shouldn't have EOF when not gentle on EOF" msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF" -#: remote-curl.c:664 +#: remote-curl.c:645 +msgid "remote server sent stateless separator" +msgstr "Server sendete zustandslosen Separator" + +#: remote-curl.c:715 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -"Konnte nicht RPC-POST-Daten zurรผckspulen - Versuchen Sie http.postBuffer zu " +"konnte nicht RPC-POST-Daten zurรผckspulen - Versuchen Sie http.postBuffer zu " "erhรถhen" -#: remote-curl.c:724 +#: remote-curl.c:745 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curl: ungรผltiges Zeichen fรผr Zeilenlรคnge: %.4s" + +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curl: unerwartetes Antwort-Endpaket" + +#: remote-curl.c:823 #, c-format msgid "RPC failed; %s" msgstr "RPC fehlgeschlagen; %s" -#: remote-curl.c:764 +#: remote-curl.c:863 msgid "cannot handle pushes this big" msgstr "Kann solche groรen รbertragungen nicht verarbeiten." -#: remote-curl.c:879 +#: remote-curl.c:978 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "Kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d" -#: remote-curl.c:883 +#: remote-curl.c:982 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "Kann Request nicht komprimieren; \"zlib end\"-Fehler %d" -#: remote-curl.c:1014 +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" +msgstr "%d Bytes des Lรคngen-Headers wurden empfangen" + +#: remote-curl.c:1034 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "%d Bytes des Bodys werden noch erwartet" + +#: remote-curl.c:1123 msgid "dumb http transport does not support shallow capabilities" msgstr "Dumb HTTP-Transport unterstรผtzt keine shallow-Funktionen" -#: remote-curl.c:1028 +#: remote-curl.c:1138 msgid "fetch failed." msgstr "\"fetch\" fehlgeschlagen." -#: remote-curl.c:1076 +#: remote-curl.c:1184 msgid "cannot fetch by sha1 over smart http" msgstr "Kann SHA-1 nicht รผber Smart-HTTP anfordern" -#: remote-curl.c:1120 remote-curl.c:1126 +#: remote-curl.c:1228 remote-curl.c:1234 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1246 remote-curl.c:1361 #, c-format msgid "http transport does not support %s" msgstr "HTTP-Transport unterstรผtzt nicht %s" -#: remote-curl.c:1174 +#: remote-curl.c:1282 msgid "git-http-push failed" msgstr "\"git-http-push\" fehlgeschlagen" -#: remote-curl.c:1360 +#: remote-curl.c:1467 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]" -#: remote-curl.c:1392 +#: remote-curl.c:1499 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git" -#: remote-curl.c:1399 +#: remote-curl.c:1506 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht" -#: remote-curl.c:1439 +#: remote-curl.c:1547 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: Unbekannter Befehl '%s' von Git" -#: list-objects-filter-options.h:61 +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "keine Compiler-Information verfรผgbar\n" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "keine libc Informationen verfรผgbar\n" + +#: list-objects-filter-options.h:91 msgid "args" msgstr "Argumente" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "Filtern nach Objekten" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "Verfallsdatum" -#: parse-options.h:184 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "Kein Effekt (Rรผckwรคrtskompatibilitรคt)" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "erweiterte Ausgaben" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "weniger Ausgaben" -#: parse-options.h:313 -msgid "use <n> digits to display SHA-1s" -msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" +#: parse-options.h:317 +msgid "use <n> digits to display object names" +msgstr "benutze <Anzahl> Ziffern zur Anzeige von Objektnamen" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" -#: ref-filter.h:101 +#: 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:96 msgid "key" msgstr "Schรผssel" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" @@ -21697,11 +23855,11 @@ msgid "update the index with reused conflict resolution if possible" msgstr "" "Index, wenn mรถglich, mit wiederverwendeter Konfliktauflรถsung aktualisieren" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "HEAD losgelรถst bei " -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "HEAD losgelรถst von " @@ -21746,696 +23904,714 @@ msgid "List, create, or delete branches" msgstr "Branches anzeigen, erstellen oder entfernen" #: command-list.h:59 +msgid "Collect information for user to file a bug report" +msgstr "" +"Informationen fรผr den Benutzer zum Einreichen eines Fehlerberichts sammeln" + +#: command-list.h:60 msgid "Move objects and refs by archive" msgstr "Objekte und Referenzen รผber ein Archiv verteilen" -#: command-list.h:60 +#: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "" "Inhalt oder Informationen zu Typ und Grรถรe fรผr Repository-Objekte " "bereitstellen" -#: command-list.h:61 +#: command-list.h:62 msgid "Display gitattributes information" msgstr "gitattributes Informationen darstellen" -#: command-list.h:62 +#: command-list.h:63 msgid "Debug gitignore / exclude files" msgstr "Fehlersuche in gitignore / exclude Dateien" -#: command-list.h:63 +#: command-list.h:64 msgid "Show canonical names and email addresses of contacts" msgstr "Name und E-Mail-Adresse von Kontakten anzeigen" -#: command-list.h:64 +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "Branches wechseln oder Dateien im Arbeitsverzeichnis wiederherstellen" -#: command-list.h:65 +#: command-list.h:66 msgid "Copy files from the index to the working tree" msgstr "Dateien von dem Index ins Arbeitsverzeichnis kopieren" -#: command-list.h:66 +#: command-list.h:67 msgid "Ensures that a reference name is well formed" msgstr "Sicherstellen, dass ein Referenzname wohlgeformt ist" -#: command-list.h:67 +#: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "" "Commits finden, die noch auf dem Upstream-Branch angewendet werden mรผssen" -#: command-list.h:68 +#: command-list.h:69 msgid "Apply the changes introduced by some existing commits" msgstr "รnderungen eines existierenden Commits anwenden" -#: command-list.h:69 +#: command-list.h:70 msgid "Graphical alternative to git-commit" msgstr "grafische Alternative zu git-commit" -#: command-list.h:70 +#: command-list.h:71 msgid "Remove untracked files from the working tree" msgstr "unversionierte Dateien vom Arbeitsverzeichnis entfernen" -#: command-list.h:71 +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "ein Repository in einem neuen Verzeichnis klonen" -#: command-list.h:72 +#: command-list.h:73 msgid "Display data in columns" msgstr "Daten in Spalten anzeigen" -#: command-list.h:73 +#: command-list.h:74 msgid "Record changes to the repository" msgstr "รnderungen in das Repository eintragen" -#: command-list.h:74 +#: command-list.h:75 msgid "Write and verify Git commit-graph files" msgstr "Git Commit-Graph-Dateien schreiben und รผberprรผfen" -#: command-list.h:75 +#: command-list.h:76 msgid "Create a new commit object" msgstr "ein neues Commit-Objekt erstellen" -#: command-list.h:76 +#: command-list.h:77 msgid "Get and set repository or global options" msgstr "repositoryweite oder globale Optionen lesen oder setzen" -#: command-list.h:77 +#: command-list.h:78 msgid "Count unpacked number of objects and their disk consumption" msgstr "Anzahl und Speicherverbrauch ungepackter Objekte zรคhlen" -#: command-list.h:78 +#: command-list.h:79 msgid "Retrieve and store user credentials" msgstr "Zugangsdaten des Benutzers empfangen und speichern" -#: command-list.h:79 +#: command-list.h:80 msgid "Helper to temporarily store passwords in memory" msgstr "" "Hilfsprogramm zum temporรคren Speichern von Zugangsdaten im Hauptspeicher" -#: command-list.h:80 +#: command-list.h:81 msgid "Helper to store credentials on disk" msgstr "Hilfsprogramm zum Speichern von Zugangsdaten auf der Festplatte" -#: command-list.h:81 +#: command-list.h:82 msgid "Export a single commit to a CVS checkout" msgstr "einzelnen Commit zu einem ausgecheckten CSV-Repository exportieren" -#: command-list.h:82 +#: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" msgstr "Ihre Daten aus einem anderen SCM รผbernehmen" -#: command-list.h:83 +#: command-list.h:84 msgid "A CVS server emulator for Git" msgstr "ein CSV Server Emulator fรผr Git" -#: command-list.h:84 +#: command-list.h:85 msgid "A really simple server for Git repositories" msgstr "ein wirklich einfacher Server fรผr Git Repositories" -#: command-list.h:85 +#: command-list.h:86 msgid "Give an object a human readable name based on an available ref" msgstr "" "einem Objekt einen fรผr Menschen lesbaren Namen basierend auf\n" "einer verfรผgbaren Referenz geben" -#: command-list.h:86 +#: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "รnderungen zwischen Commits, Commit und Arbeitsverzeichnis, etc. anzeigen" -#: command-list.h:87 +#: command-list.h:88 msgid "Compares files in the working tree and the index" msgstr "Dateien von dem Arbeitsverzeichnis und dem Index vergleichen" -#: command-list.h:88 +#: command-list.h:89 msgid "Compare a tree to the working tree or index" msgstr "ein Verzeichnis von dem Arbeitsverzeichnis und dem Index vergleichen" -#: command-list.h:89 +#: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" msgstr "" "den Inhalt und Modus von Blobs aus zwei Verzeichnisobjekten vergleichen" -#: command-list.h:90 +#: command-list.h:91 msgid "Show changes using common diff tools" msgstr "รnderungen mittels den allgemeinen Diff-Tools anzeigen" -#: command-list.h:91 +#: command-list.h:92 msgid "Git data exporter" msgstr "Export Tool fรผr Git Daten" -#: command-list.h:92 +#: command-list.h:93 msgid "Backend for fast Git data importers" msgstr "Backend fรผr schnelle Git Daten Import Tools" -#: command-list.h:93 +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "Objekte und Referenzen von einem anderen Repository herunterladen" -#: command-list.h:94 +#: command-list.h:95 msgid "Receive missing objects from another repository" msgstr "fehlende Objekte von einem anderen Repository empfangen" -#: command-list.h:95 +#: command-list.h:96 msgid "Rewrite branches" msgstr "Branches umschreiben" -#: command-list.h:96 +#: command-list.h:97 msgid "Produce a merge commit message" msgstr "Beschreibung eines Merge-Commits erzeugen" -#: command-list.h:97 +#: command-list.h:98 msgid "Output information on each ref" msgstr "Informationen fรผr jede Referenz ausgeben" -#: command-list.h:98 +#: command-list.h:99 msgid "Prepare patches for e-mail submission" msgstr "Patches fรผr E-Mail-Versand vorbereiten" -#: command-list.h:99 +#: command-list.h:100 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" "stellt die Verbundenheit und Gรผltigkeit der Objekte in der Datenbank sicher" -#: command-list.h:100 +#: command-list.h:101 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "nicht benรถtigte Dateien entfernen und das lokale Repository optimieren" -#: command-list.h:101 +#: command-list.h:102 msgid "Extract commit ID from an archive created using git-archive" msgstr "" "Commit-ID eines Archivs extrahieren, welches mit git-archive erstellt wurde" -#: command-list.h:102 +#: command-list.h:103 msgid "Print lines matching a pattern" msgstr "Zeilen darstellen, die einem Muster entsprechen" -#: command-list.h:103 +#: command-list.h:104 msgid "A portable graphical interface to Git" msgstr "eine portable grafische Schnittstelle zu Git" -#: command-list.h:104 +#: command-list.h:105 msgid "Compute object ID and optionally creates a blob from a file" msgstr "" "von einer Datei die Objekt-ID berechnen und optional ein Blob erstellen" -#: command-list.h:105 +#: command-list.h:106 msgid "Display help information about Git" msgstr "Hilfsinformationen รผber Git anzeigen" -#: command-list.h:106 +#: command-list.h:107 msgid "Server side implementation of Git over HTTP" msgstr "serverseitige Implementierung von Git รผber HTTP" -#: command-list.h:107 +#: command-list.h:108 msgid "Download from a remote Git repository via HTTP" msgstr "von einem Remote-Git-Repository รผber HTTP herunterladen" -#: command-list.h:108 +#: command-list.h:109 msgid "Push objects over HTTP/DAV to another repository" msgstr "Objekte รผber HTTP/DAV zu einem anderen Repository รผbertragen" -#: command-list.h:109 +#: command-list.h:110 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "" "eine Sammlung von Patches von der Standard-Eingabe zu einem IMAP-Ordner " "senden" -#: command-list.h:110 +#: command-list.h:111 msgid "Build pack index file for an existing packed archive" msgstr "Pack-Index-Datei fรผr ein existierendes gepacktes Archiv erzeugen" -#: command-list.h:111 +#: command-list.h:112 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" "ein leeres Git-Repository erstellen oder ein bestehendes neuinitialisieren" -#: command-list.h:112 +#: command-list.h:113 msgid "Instantly browse your working repository in gitweb" msgstr "Ihr aktuelles Repository sofort in gitweb betrachten" -#: command-list.h:113 +#: command-list.h:114 msgid "Add or parse structured information in commit messages" msgstr "" "Strukturierte Informationen in Commit-Beschreibungen hinzufรผgen oder parsen" -#: command-list.h:114 +#: command-list.h:115 msgid "The Git repository browser" msgstr "der Git-Repository-Browser" -#: command-list.h:115 +#: command-list.h:116 msgid "Show commit logs" msgstr "Commit-Historie anzeigen" -#: command-list.h:116 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "" "Informationen รผber Dateien in dem Index und im Arbeitsverzeichnis anzeigen" -#: command-list.h:117 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "Referenzen in einem Remote-Repository auflisten" -#: command-list.h:118 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "Inhalte eines Tree-Objektes auflisten" -#: command-list.h:119 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "" "Patch und Urheberschaft von einer einzelnen E-Mail-Nachricht extrahieren" -#: command-list.h:120 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "einfaches UNIX mbox Splitter-Programm" -#: command-list.h:121 +#: command-list.h:122 +msgid "Run tasks to optimize Git repository data" +msgstr "Aufgaben ausfรผhren, um Git-Repository-Daten zu optimieren" + +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "zwei oder mehr Entwicklungszweige zusammenfรผhren" -#: command-list.h:122 +#: command-list.h:124 msgid "Find as good common ancestors as possible for a merge" msgstr "mรถglichst besten gemeinsamen Vorgรคnger-Commit fรผr einen Merge finden" -#: command-list.h:123 +#: command-list.h:125 msgid "Run a three-way file merge" msgstr "einen 3-Wege-Datei-Merge ausfรผhren" -#: command-list.h:124 +#: command-list.h:126 msgid "Run a merge for files needing merging" msgstr "einen Merge fรผr zusammenzufรผhrende Dateien ausfรผhren" -#: command-list.h:125 +#: command-list.h:127 msgid "The standard helper program to use with git-merge-index" msgstr "das Standard-Hilfsprogramm fรผr die Verwendung mit git-merge-index" -#: command-list.h:126 +#: command-list.h:128 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" "Ausfรผhren von Tools zur Auflรถsung von Merge-Konflikten zur Behebung dieser" -#: command-list.h:127 +#: command-list.h:129 msgid "Show three-way merge without touching index" msgstr "3-Wege-Merge anzeigen ohne den Index zu verรคndern" -#: command-list.h:128 +#: command-list.h:130 msgid "Write and verify multi-pack-indexes" msgstr "multi-pack-indexes schreiben und รผberprรผfen" -#: command-list.h:129 +#: command-list.h:131 msgid "Creates a tag object" msgstr "ein Tag-Objekt erstellen" -#: command-list.h:130 +#: command-list.h:132 msgid "Build a tree-object from ls-tree formatted text" msgstr "Tree-Objekt aus ls-tree formattiertem Text erzeugen" -#: command-list.h:131 +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "" "eine Datei, ein Verzeichnis, oder eine symbolische Verknรผpfung verschieben " "oder umbenennen" -#: command-list.h:132 +#: command-list.h:134 msgid "Find symbolic names for given revs" msgstr "symbolische Namen fรผr die gegebenen Commits finden" -#: command-list.h:133 +#: command-list.h:135 msgid "Add or inspect object notes" msgstr "Objekt-Notizen hinzufรผgen oder รผberprรผfen" -#: command-list.h:134 +#: command-list.h:136 msgid "Import from and submit to Perforce repositories" msgstr "von Perforce Repositories importieren und nach diese senden" -#: command-list.h:135 +#: command-list.h:137 msgid "Create a packed archive of objects" msgstr "ein gepacktes Archiv von Objekten erstellen" -#: command-list.h:136 +#: command-list.h:138 msgid "Find redundant pack files" msgstr "redundante Paketdateien finden" -#: command-list.h:137 +#: command-list.h:139 msgid "Pack heads and tags for efficient repository access" msgstr "Branches und Tags fรผr effizienten Zugriff auf das Repository packen" -#: command-list.h:138 +#: command-list.h:140 msgid "Routines to help parsing remote repository access parameters" msgstr "" "Routinen als Hilfe zum Parsen von Zugriffsparametern von Remote-Repositories" -#: command-list.h:139 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "eindeutige ID fรผr einen Patch berechnen" -#: command-list.h:140 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "alle nicht erreichbaren Objekte von der Objektdatenbank entfernen" -#: command-list.h:141 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "" "zusรคtzliche Objekte, die sich bereits in Paketdateien befinden, entfernen" -#: command-list.h:142 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "" "Objekte von einem externen Repository anfordern und sie mit einem anderen " "Repository oder einem lokalen Branch zusammenfรผhren" -#: command-list.h:143 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "Remote-Referenzen mitsamt den verbundenen Objekten aktualisieren" -#: command-list.h:144 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "Patches aus quilt auf aktuellen Branch anwenden" -#: command-list.h:145 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "zwei Commit-Bereiche vergleichen (zwei Versionen eines Branches)" -#: command-list.h:146 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "Verzeichnisinformationen in den Index einlesen" -#: command-list.h:147 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "Wiederholtes Anwenden von Commits auf anderem Basis-Commit" -#: command-list.h:148 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "Empfangen was in das Repository รผbertragen wurde" -#: command-list.h:149 +#: command-list.h:151 msgid "Manage reflog information" msgstr "Reflog Informationen verwalten" -#: command-list.h:150 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "Menge von hinterlegten Repositories verwalten" -#: command-list.h:151 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "ungepackte Objekte in einem Repository packen" -#: command-list.h:152 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "Referenzen fรผr ersetzende Objekte erstellen, auflisten, lรถschen" -#: command-list.h:153 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "eine รbersicht รผber ausstehende รnderungen generieren" -#: command-list.h:154 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "aufgezeichnete Auflรถsung von Merge-Konflikten wiederverwenden" -#: command-list.h:155 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "aktuellen HEAD zu einem spezifizierten Zustand setzen" -#: command-list.h:156 +#: command-list.h:158 msgid "Restore working tree files" msgstr "Dateien im Arbeitsverzeichnis wiederherstellen" -#: command-list.h:157 +#: command-list.h:159 msgid "Revert some existing commits" msgstr "einige bestehende Commits rรผckgรคngig machen" -#: command-list.h:158 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "Commit-Objekte in umgekehrter chronologischer Ordnung auflisten" -#: command-list.h:159 +#: command-list.h:161 msgid "Pick out and massage parameters" msgstr "Parameter herauspicken und รคndern" -#: command-list.h:160 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "Dateien im Arbeitsverzeichnis und vom Index lรถschen" -#: command-list.h:161 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "eine Sammlung von Patches als E-Mails versenden" -#: command-list.h:162 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "Objekte รผber das Git Protokoll zu einem anderen Repository รผbertragen" -#: command-list.h:163 +#: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" msgstr "Login-Shell beschrรคnkt fรผr Nur-Git SSH-Zugriff" -#: command-list.h:164 +#: command-list.h:166 msgid "Summarize 'git log' output" msgstr "Ausgabe von 'git log' zusammenfassen" -#: command-list.h:165 +#: command-list.h:167 msgid "Show various types of objects" msgstr "verschiedene Arten von Objekten anzeigen" -#: command-list.h:166 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "Branches und ihre Commits ausgeben" -#: command-list.h:167 +#: command-list.h:169 msgid "Show packed archive index" msgstr "gepackten Archiv-Index anzeigen" -#: command-list.h:168 +#: command-list.h:170 msgid "List references in a local repository" msgstr "Referenzen in einem lokales Repository auflisten" -#: command-list.h:169 +#: command-list.h:171 msgid "Git's i18n setup code for shell scripts" -msgstr "Git's i18n-Konfigurationscode fรผr Shell-Skripte" +msgstr "Gits i18n-Konfigurationscode fรผr Shell-Skripte" -#: command-list.h:170 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "allgemeiner Git Shell-Skript Konfigurationscode" -#: command-list.h:171 +#: command-list.h:173 +msgid "Initialize and modify the sparse-checkout" +msgstr "Initialisiere und verรคndere den partiellen Checkout" + +#: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "รnderungen in einem Arbeitsverzeichnis aufbewahren" -#: command-list.h:172 +#: command-list.h:175 msgid "Add file contents to the staging area" msgstr "Dateiinhalte der Staging-Area hinzufรผgen" -#: command-list.h:173 +#: command-list.h:176 msgid "Show the working tree status" msgstr "den Zustand des Arbeitsverzeichnisses anzeigen" -#: command-list.h:174 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "nicht erforderlichen Whitespace entfernen" -#: command-list.h:175 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "Submodule initialisieren, aktualisieren oder inspizieren" -#: command-list.h:176 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "" "Bidirektionale Operationen zwischen einem Subversion Repository und Git" -#: command-list.h:177 +#: command-list.h:180 msgid "Switch branches" msgstr "Branches wechseln" -#: command-list.h:178 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "symbolische Referenzen lesen, รคndern und lรถschen" -#: command-list.h:179 +#: command-list.h:182 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:180 +#: command-list.h:183 msgid "Creates a temporary file with a blob's contents" msgstr "eine temporรคre Datei mit den Inhalten eines Blobs erstellen" -#: command-list.h:181 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "Objekte von einem gepackten Archiv entpacken" -#: command-list.h:182 +#: command-list.h:185 msgid "Register file contents in the working tree to the index" msgstr "Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren" -#: command-list.h:183 +#: command-list.h:186 msgid "Update the object name stored in a ref safely" msgstr "" "den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren" -#: command-list.h:184 +#: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren" -#: command-list.h:185 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "Archiv zurรผck zu git-archive senden" -#: command-list.h:186 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "Objekte gepackt zurรผck an git-fetch-pack senden" -#: command-list.h:187 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "eine logische Variable von Git anzeigen" -#: command-list.h:188 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "die GPG-Signatur von Commits prรผfen" -#: command-list.h:189 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "gepackte Git-Archivdateien validieren" -#: command-list.h:190 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "die GPG-Signatur von Tags prรผfen" -#: command-list.h:191 +#: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git Web Interface (Web-Frontend fรผr Git-Repositories)" -#: command-list.h:192 +#: command-list.h:195 msgid "Show logs with difference each commit introduces" msgstr "Logs mit dem Unterschied, den jeder Commit einfรผhrt, anzeigen" -#: command-list.h:193 +#: command-list.h:196 msgid "Manage multiple working trees" msgstr "mehrere Arbeitsverzeichnisse verwalten" -#: command-list.h:194 +#: command-list.h:197 msgid "Create a tree object from the current index" msgstr "Tree-Objekt vom aktuellen Index erstellen" -#: command-list.h:195 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "Definition von Attributen pro Pfad" -#: command-list.h:196 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "Git Kommandozeilenschnittstelle und Konventionen" -#: command-list.h:197 +#: command-list.h:200 msgid "A Git core tutorial for developers" msgstr "eine Git Anleitung fรผr Entwickler" -#: command-list.h:198 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "Bereitstellung von Benutzernamen und Passwรถrtern fรผr Git" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "Git fรผr CVS Benutzer" -#: command-list.h:199 +#: command-list.h:203 msgid "Tweaking diff output" msgstr "Diff-Ausgabe optimieren" -#: command-list.h:200 +#: command-list.h:204 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:201 +#: command-list.h:205 +msgid "Frequently asked questions about using Git" +msgstr "Hรคufig gestellte Fragen รผber die Nutzung von Git" + +#: command-list.h:206 msgid "A Git Glossary" msgstr "ein Git-Glossar" -#: command-list.h:202 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "von Git verwendete Hooks" -#: command-list.h:203 +#: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien" -#: command-list.h:204 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "Definition von Submodul-Eigenschaften" -#: command-list.h:205 +#: command-list.h:210 msgid "Git namespaces" msgstr "Git Namensbereiche" -#: command-list.h:206 +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "Hilfsprogramme zur Interaktion mit Remote-Repositories" + +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Git Repository Aufbau" -#: command-list.h:207 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "Spezifikation von Commits und Bereichen fรผr Git" -#: command-list.h:208 +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "Einbinden eines Repositories in ein anderes" + +#: command-list.h:215 msgid "A tutorial introduction to Git: part two" msgstr "eine einfรผhrende Anleitung zu Git: Teil zwei" -#: command-list.h:209 +#: command-list.h:216 msgid "A tutorial introduction to Git" msgstr "eine einfรผhrende Anleitung zu Git" -#: command-list.h:210 +#: command-list.h:217 msgid "An overview of recommended workflows with Git" msgstr "Eine รbersicht รผber empfohlene Arbeitsablรคufe mit Git" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "Sie mรผssen mit \"git bisect start\" beginnen." - -#. 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 "Wollen Sie, dass ich es fรผr Sie mache [Y/n]? " - -#: git-bisect.sh:101 +#: git-bisect.sh:79 #, sh-format msgid "Bad rev input: $arg" msgstr "Ungรผltige Referenz-Eingabe: $arg" -#: git-bisect.sh:121 +#: git-bisect.sh:99 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Ungรผltige Referenz-Eingabe: $bisected_head" -#: git-bisect.sh:130 +#: git-bisect.sh:108 #, sh-format msgid "Bad rev input: $rev" msgstr "Ungรผltige Referenz-Eingabe: $rev" -#: git-bisect.sh:139 +#: git-bisect.sh:117 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' kann nur ein Argument entgegennehmen." -#: git-bisect.sh:209 +#: git-bisect.sh:149 msgid "No logfile given" msgstr "Keine Log-Datei gegeben" -#: git-bisect.sh:210 +#: git-bisect.sh:150 #, sh-format msgid "cannot read $file for replaying" msgstr "kann $file nicht fรผr das Abspielen lesen" -#: git-bisect.sh:232 +#: git-bisect.sh:173 msgid "?? what are you talking about?" msgstr "?? Was reden Sie da?" -#: git-bisect.sh:241 +#: git-bisect.sh:183 msgid "bisect run failed: no command provided." msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben." -#: git-bisect.sh:246 +#: git-bisect.sh:188 #, sh-format msgid "running $command" msgstr "fรผhre $command aus" -#: git-bisect.sh:253 +#: git-bisect.sh:195 #, sh-format msgid "" "bisect run failed:\n" @@ -22444,11 +24620,11 @@ msgstr "" "'bisect run' fehlgeschlagen:\n" "Exit-Code $res von '$command' ist < 0 oder >= 128" -#: git-bisect.sh:279 +#: git-bisect.sh:221 msgid "bisect run cannot continue any more" msgstr "'bisect run' kann nicht mehr fortgesetzt werden" -#: git-bisect.sh:285 +#: git-bisect.sh:227 #, sh-format msgid "" "bisect run failed:\n" @@ -22457,11 +24633,11 @@ msgstr "" "'bisect run' fehlgeschlagen:\n" "'bisect_state $state' wurde mit Fehlerwert $res beendet" -#: git-bisect.sh:292 +#: git-bisect.sh:234 msgid "bisect run success" msgstr "'bisect run' erfolgreich ausgefรผhrt" -#: git-bisect.sh:300 +#: git-bisect.sh:242 msgid "We are not bisecting." msgstr "keine binรคre Suche im Gange" @@ -22480,7 +24656,7 @@ msgstr "Automatischer Merge hat nicht funktioniert." #: git-merge-octopus.sh:62 msgid "Should not be doing an octopus." -msgstr "Sollte keinen Octopus-Merge ausfรผhren." +msgstr "Sollte keinen Oktopus-Merge ausfรผhren." #: git-merge-octopus.sh:73 #, sh-format @@ -22506,144 +24682,50 @@ 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:220 -msgid "Cannot remove temporary index (can't happen)" -msgstr "Kann temporรคren Index nicht lรถschen (kann nicht passieren)" - -#: 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:323 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "Fehler: unbekannte Option fรผr 'stash push': $option" - -#: 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:535 -#, sh-format -msgid "unknown option: $opt" -msgstr "unbekannte Option: $opt" - -#: git-legacy-stash.sh:555 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "Zu viele Commits angegeben: $REV" - -#: 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:598 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "'$args' ist kein \"stash\"-artiger Commit" - -#: git-legacy-stash.sh:609 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "'$args' ist keine \"stash\"-Referenz" - -#: git-legacy-stash.sh:617 -msgid "unable to refresh index" -msgstr "Konnte den Index nicht aktualisieren." - -#: 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:629 -msgid "Conflicts in index. Try without --index." -msgstr "Konflikte im Index. Versuchen Sie es ohne --index." - -#: git-legacy-stash.sh:631 -msgid "Could not save index tree" -msgstr "Konnte Index-Verzeichnis nicht speichern" - -#: 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:665 -msgid "Cannot unstage modified files" -msgstr "Kann geรคnderte Dateien nicht aus dem Index entfernen" - -#: git-legacy-stash.sh:703 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "${REV} ($s) gelรถscht" - -#: 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:791 -msgid "(To restore them type \"git stash apply\")" -msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)" - -#: git-submodule.sh:200 +#: git-submodule.sh:180 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:210 +#: git-submodule.sh:190 #, 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:229 +#: git-submodule.sh:209 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ist bereits zum Commit vorgemerkt" -#: git-submodule.sh:232 +#: git-submodule.sh:212 #, 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:239 +#: git-submodule.sh:219 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' hat keinen Commit ausgecheckt" -#: 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 +#: git-submodule.sh:250 #, 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:270 +#: git-submodule.sh:252 #, 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:278 +#: git-submodule.sh:260 #, 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:280 +#: git-submodule.sh:262 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22661,37 +24743,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:286 +#: git-submodule.sh:268 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Reaktiviere lokales Git-Verzeichnis fรผr Submodul '$sm_name'." -#: git-submodule.sh:298 +#: git-submodule.sh:280 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kann Submodul '$sm_path' nicht auschecken" -#: git-submodule.sh:303 +#: git-submodule.sh:285 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Hinzufรผgen von Submodul '$sm_path' fehlgeschlagen" -#: git-submodule.sh:312 +#: git-submodule.sh:294 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration." -#: git-submodule.sh:573 +#: git-submodule.sh:567 #, 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:583 +#: git-submodule.sh:577 #, 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:588 +#: git-submodule.sh:582 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -22700,7 +24782,7 @@ msgstr "" "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n" "'$sm_path' nicht finden." -#: git-submodule.sh:606 +#: git-submodule.sh:600 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -22709,7 +24791,7 @@ msgstr "" "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausfรผhren. Versuche " "$sha1 direkt anzufordern:" -#: git-submodule.sh:612 +#: git-submodule.sh:606 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -22718,79 +24800,53 @@ msgstr "" "\"fetch\" in Submodul-Pfad '$displaypath' ausgefรผhrt, aber $sha1 nicht\n" "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen." -#: git-submodule.sh:619 +#: git-submodule.sh:613 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken." -#: git-submodule.sh:620 +#: git-submodule.sh:614 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt" -#: git-submodule.sh:624 +#: git-submodule.sh:618 #, 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:625 +#: git-submodule.sh:619 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'" -#: git-submodule.sh:630 +#: git-submodule.sh:624 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:631 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Submodul-Pfad '$displaypath': zusammengefรผhrt in '$sha1'" -#: git-submodule.sh:636 +#: git-submodule.sh:630 #, 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:637 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Submodul-Pfad '$displaypath': '$command $sha1'" -#: git-submodule.sh:668 +#: git-submodule.sh:662 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'" -#: 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:882 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "unerwarteter Modus $mod_dst" - -#: 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: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:908 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" -" Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst" - #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." @@ -22805,12 +24861,22 @@ msgstr "Automatischen Stash angewendet." msgid "Cannot store $stash_sha1" msgstr "Kann $stash_sha1 nicht speichern." +#: git-rebase--preserve-merges.sh:113 +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 "" +"Anwendung des automatischen Stash resultierte in Konflikten.\n" +"Ihre รnderungen sind im Stash sicher.\n" +"Sie kรถnnen jederzeit \"git stash pop\" oder \"git stash drop\" ausfรผhren.\n" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Fรผhre Rebase aus ($new_count/$total)" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -22852,7 +24918,7 @@ msgstr "" "Diese Zeilen kรถnnen umsortiert werden; Sie werden von oben nach unten\n" "ausgefรผhrt.\n" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -22871,83 +24937,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: kein Commit der gepickt werden kann" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Ungรผltiger Commit-Name: $sha1" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "Kann ersetzenden SHA-1 des aktuellen Commits nicht schreiben" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "Spule vor zu $sha1" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Kann nicht zu $sha1 vorspulen" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Kann HEAD nicht auf $first_parent setzen" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "\"squash\" eines Merges ($sha1) zurรผckgewiesen." -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "Fehler beim Wiederholen des Merges von $sha1" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "Konnte $sha1 nicht picken" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "Das ist Commit-Beschreibung #${n}:" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Commit-Beschreibung #${n} wird ausgelassen:" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Das ist eine Kombination aus $count Commit." msgstr[1] "Das ist eine Kombination aus $count Commits." -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Kann $fixup_msg nicht schreiben" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "Das ist eine Kombination aus 2 Commits." -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Konnte $sha1... ($rest) nicht anwenden" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -22964,31 +25030,31 @@ msgstr "" "sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung รคndern " "kรถnnen." -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Angehalten bei $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Kann nicht '$squash_style' ohne vorherigen Commit" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "Fรผhre aus: $rest" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "Ausfรผhrung fehlgeschlagen: $rest" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geรคndert." -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -23001,7 +25067,7 @@ msgstr "" "ausfรผhren." #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -23017,25 +25083,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Unbekannter Befehl: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausfรผhren." -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Erfolgreich Rebase ausgefรผhrt und $head_name aktualisiert." -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Konnte CHERRY_PICK_HEAD nicht lรถschen" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -23067,13 +25133,13 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "" "Fehler beim Versuch die Identitรคt des Authors zum Verbessern des Commits zu\n" "finden" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -23083,40 +25149,44 @@ msgstr "" "erneut\n" "aus." -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "Konnte รnderungen aus der Staging-Area nicht committen." -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "Konnte Editor nicht ausfรผhren." -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "Konnte $switch_to nicht auschecken." -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "Kein HEAD?" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Konnte temporรคres Verzeichnis $state_dir nicht erstellen." -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "Konnte nicht als interaktiven Rebase markieren." -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" 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:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:945 +msgid "Note that empty commits are commented out" +msgstr "Leere Commits sind auskommentiert." + +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "Konnte neu geschriebene Commits nicht initialisieren." @@ -23198,140 +25268,67 @@ 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:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%28s %25s %s" -#: 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 +#: git-add--interactive.perl:634 #, 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: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 +#: git-add--interactive.perl:1058 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 Patch-" -"Block\n" -"direkt als zum Hinzufรผgen zur Staging-Area markiert." +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" +"Patch-Block direkt zum Hinzufรผgen zur Staging-Area markiert." -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1061 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 Patch-" -"Block\n" -"direkt als zum Hinzufรผgen zum Stash markiert." +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" +"Patch-Block direkt zum Hinzufรผgen zum Stash markiert." -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1064 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 Patch-" -"Block\n" -"direkt als zum Entfernen aus der Staging-Area markiert." +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" +"Patch-Block direkt zum Entfernen aus der Staging-Area markiert." -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 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 Patch-" -"Block\n" -"direkt als zum Anwenden markiert." +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" +"Patch-Block direkt zum Anwenden markiert." -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 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 Patch-" -"Block\n" -"direkt als zum Verwerfen markiert." +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" +"Patch-Block direkt zum Verwerfen markiert." -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1116 #, 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: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 +#: git-add--interactive.perl:1123 #, perl-format msgid "" "---\n" @@ -23344,37 +25341,12 @@ msgstr "" "Um '%s' Zeilen zu entfernen, lรถschen Sie diese.\n" "Zeilen, die mit %s beginnen, werden entfernt.\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 "" -"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 +#: git-add--interactive.perl:1145 #, 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" -#. 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 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -23390,7 +25362,7 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blรถcke in dieser Datei nicht zum Commit " "vormerken" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -23404,7 +25376,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:1258 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -23418,7 +25390,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:1264 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -23435,7 +25407,7 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blรถcke dieser Datei nicht auf den Index " "anwenden" -#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -23452,7 +25424,7 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blรถcke dieser Datei nicht im " "Arbeitsverzeichnis verwerfen" -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23467,7 +25439,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:1282 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23481,7 +25453,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:1294 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23495,7 +25467,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:1309 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23519,234 +25491,92 @@ msgstr "" "e - aktuellen Patch-Block manuell editieren\n" "? - Hilfe anzeigen\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1347 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: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 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignoriere nicht zusammengefรผhrte Datei: %s\n" -#: 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 +#: git-add--interactive.perl:1481 #, 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:1467 +#: git-add--interactive.perl:1482 #, 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:1468 +#: git-add--interactive.perl:1483 +#, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Ergรคnzung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1484 #, 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:1568 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "Keine anderen Patch-Blรถcke verbleibend\n" -#: 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 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ungรผltige Nummer: '%s'\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1624 #, 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:1617 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "Keine anderen Patch-Blรถcke zum Durchsuchen\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "Suche nach regulรคrem Ausdruck? " - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Fehlerhafter regulรคrer Ausdruck fรผr Suche %s: %s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "Kein vorheriger Patch-Block\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "Kein folgender Patch-Block\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1738 #, 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:1706 +#: git-add--interactive.perl:1748 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:1771 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23765,19 +25595,19 @@ msgstr "" "diff - Unterschiede zwischen HEAD und Index anzeigen\n" "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n" -#: 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 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 msgid "missing --" msgstr "-- fehlt" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1861 #, perl-format msgid "unknown --patch mode: %s" msgstr "Unbekannter --patch Modus: %s" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 #, perl-format msgid "invalid argument %s, expecting --" msgstr "ungรผltiges Argument %s, erwarte --" @@ -23795,28 +25625,40 @@ msgstr "lokaler Zeit-Offset grรถรer oder gleich 24 Stunden\n" msgid "the editor exited uncleanly, aborting everything" msgstr "Der Editor wurde unsauber beendet, breche alles ab." -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "'%s' enthรคlt eine Zwischenversion der E-Mail, die Sie gerade verfassen.\n" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' enthรคlt die verfasste E-Mail.\n" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"fatal: Konfigurations-Optionen fรผr 'sendmail' gefunden\n" +"git-send-email wird รผber die Optionen sendemail.* konfiguriert - beachten " +"Sie das 'e'.\n" +"Setzen Sie sendemail.forbidSendmailVariables auf 'false', um diese Prรผfung " +"zu deaktivieren.\n" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "" "Kann 'git format-patch' nicht auรerhalb eines Repositories ausfรผhren.\n" -#: git-send-email.perl:484 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -23825,38 +25667,38 @@ msgstr "" "Kommandozeile\n" "oder Konfigurationsoption)\n" -#: git-send-email.perl:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Unbekanntes --suppress-cc Feld: '%s'\n" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Unbekannte --confirm Einstellung: '%s'\n" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" "Warnung: sendemail-Alias mit Anfรผhrungszeichen wird nicht unterstรผtzt: %s\n" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "Warnung: `:include:` wird nicht unterstรผtzt: %s\n" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "Warnung: `/file` oder `|pipe` Umleitung wird nicht unterstรผtzt: %s\n" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -23873,12 +25715,12 @@ msgstr "" " * die Option --format-patch angeben, wenn Sie einen Commit-Bereich " "meinen\n" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Fehler beim รffnen von %s: %s" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -23887,7 +25729,7 @@ msgstr "" "fatal: %s: %s\n" "Warnung: Es wurden keine Patches versendet.\n" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -23897,17 +25739,17 @@ msgstr "" "keine Patch-Dateien angegeben!\n" "\n" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "Keine Betreffzeile in %s?" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Fehler beim รffnen von '%s' zum Schreiben: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -23922,27 +25764,27 @@ msgstr "" "Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden " "mรถchten.\n" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "Fehler beim รffnen von %s: %s" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Fehler beim รffnen von %s.final: %s" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "E-Mail mit Zusammenfassung ist leer, wird ausgelassen\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Sind Sie sich sicher, <%s> zu benutzen [y/N]? " -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -23950,11 +25792,11 @@ msgstr "" "Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n" "Content-Transfer-Encoding.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? " -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -23968,22 +25810,22 @@ msgstr "" "an,\n" "wenn Sie den Patch wirklich versenden wollen.\n" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "An wen sollen die E-Mails versendet werden (wenn รผberhaupt jemand)?" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n" -#: git-send-email.perl:975 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID zur Verwendung als In-Reply-To fรผr die erste E-Mail (wenn eine " "existiert)? " -#: git-send-email.perl:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "Fehler: konnte keine gรผltige Adresse aus %s extrahieren\n" @@ -23991,18 +25833,18 @@ msgstr "Fehler: konnte keine gรผltige Adresse aus %s extrahieren\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 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" "Was soll mit dieser Adresse geschehen? (Beenden [q]|Lรถschen [d]|Bearbeiten " "[e]): " -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA Pfad \"%s\" existiert nicht" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -24031,232 +25873,133 @@ msgstr "" #. 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 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" "Diese E-Mail versenden? (Ja [y]|Nein [n]|Bearbeiten [e]|Beenden [q]|Alle " "[a]): " -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich." -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert." -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Server unterstรผtzt kein STARTTLS! %s" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS fehlgeschlagen! %s" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Konnte SMTP nicht korrekt initialisieren. Bitte prรผfen Sie Ihre " "Konfiguration\n" "und benutzen Sie --smtp-debug." -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "Fehler beim Senden %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "Probeversand %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "%s gesendet\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "Probeversand OK. Log enthรคlt:\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "OK. Log enthรคlt:\n" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "Ergebnis: " -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "Ergebnis: OK\n" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "Kann Datei %s nicht รถffnen" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Fรผge cc: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Fรผge to: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1718 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Fรผge cc: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1753 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Fรผge cc: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1864 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Konnte '%s' nicht ausfรผhren" -#: git-send-email.perl:1871 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Fรผge %s: %s hinzu von: '%s'\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) Fehler beim Schlieรen der Pipe nach '%s'" -#: git-send-email.perl:1905 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "Kann Nachricht nicht als 7bit versenden." -#: git-send-email.perl:1913 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "Ungรผltiges Transfer-Encoding" -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "konnte %s nicht รถffnen: %s\n" -#: git-send-email.perl:1957 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: Patch enthรคlt eine Zeile, die lรคnger als 998 Zeichen ist" -#: git-send-email.perl:1974 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1978 +#: git-send-email.perl:1990 #, 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 87c77ff993..41a72ca6fb 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: 2019-08-10 20:12+0800\n" -"PO-Revision-Date: 2019-08-10 12:55-0500\n" +"POT-Creation-Date: 2020-07-10 09:53+0800\n" +"PO-Revision-Date: 2020-07-26 10:11-0500\n" "Last-Translator: christopher.diaz.riv@gmail.com\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -16,40 +16,774 @@ 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\n" +"X-Generator: Poedit 2.3\n" -#: advice.c:109 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "ยฟAhh (%s)?" + +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 +#: builtin/rebase.c:1919 +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 reset.c:89 sequencer.c:3336 +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:294 +#: builtin/reset.c:145 +#, 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:1691 git-add--interactive.perl:1368 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Solo cambiaron archivos binarios.\n" + +#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370 +#, c-format +msgid "No changes.\n" +msgstr "Sin cambios.\n" + +#: add-interactive.c:935 git-add--interactive.perl:1378 +msgid "Patch update" +msgstr "Actualizaciรณn del parche" + +#: add-interactive.c:974 git-add--interactive.perl:1771 +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:816 git-add--interactive.perl:1868 +msgid "*** Commands ***" +msgstr "*** Comandos ***" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865 +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:2250 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 +#: builtin/merge.c:276 builtin/pull.c:190 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 bugreport.c:135 +#: 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:781 git-add--interactive.perl:1782 +#, c-format +msgid "Bye.\n" +msgstr "Adiรณs.\n" + +#: add-patch.c:34 git-add--interactive.perl:1430 +#, 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:35 git-add--interactive.perl:1431 +#, 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:36 git-add--interactive.perl:1432 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "ยฟAgregar al stage [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 git-add--interactive.perl:1433 +#, 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:39 +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:42 +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:56 git-add--interactive.perl:1436 +#, 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:57 git-add--interactive.perl:1437 +#, 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:58 git-add--interactive.perl:1438 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "ยฟAgregar al stash [y,n,q,a,d%s,?]? " + +#: add-patch.c:59 git-add--interactive.perl:1439 +#, 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:61 +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:64 +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:80 git-add--interactive.perl:1442 +#, 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:81 git-add--interactive.perl:1443 +#, 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:82 git-add--interactive.perl:1444 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "ยฟQuitar adiciรณn al stage [y,n,q,a,d%s,?]? " + +#: add-patch.c:83 git-add--interactive.perl:1445 +#, 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:85 +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:88 +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:103 git-add--interactive.perl:1448 +#, 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:104 git-add--interactive.perl:1449 +#, 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:105 git-add--interactive.perl:1450 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "ยฟAplicar adiciรณn al รญndice [y,n,q,a,d%s,?]? " + +#: add-patch.c:106 git-add--interactive.perl:1451 +#, 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:108 add-patch.c:176 add-patch.c:221 +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:111 +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:126 git-add--interactive.perl:1454 +#: git-add--interactive.perl:1472 +#, 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:127 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 +#, 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:128 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "ยฟDescartar adiciรณn del รกrbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:129 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, 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:131 add-patch.c:154 add-patch.c:199 +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:134 add-patch.c:202 +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:149 add-patch.c:194 git-add--interactive.perl:1460 +#, 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:150 add-patch.c:195 git-add--interactive.perl:1461 +#, 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:151 add-patch.c:196 git-add--interactive.perl:1462 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "ยฟDescartar adiciรณn del รญndice y el รกrbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463 +#, 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:157 +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:171 add-patch.c:216 git-add--interactive.perl:1466 +#, 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:172 add-patch.c:217 git-add--interactive.perl:1467 +#, 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:173 add-patch.c:218 git-add--interactive.perl:1468 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "ยฟAplicar adiciรณn al รญndice y al รกrbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469 +#, 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:179 +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:224 +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:328 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "no se puede analizar hunk header '%.*s'" + +#: add-patch.c:347 add-patch.c:351 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "no se puede analizar hunk header '%.*s'" + +#: add-patch.c:405 +msgid "could not parse diff" +msgstr "no se puede analizar diff" + +#: add-patch.c:424 +msgid "could not parse colored diff" +msgstr "no se pudo analizar diff a colores" + +#: add-patch.c:438 +#, c-format +msgid "failed to run '%s'" +msgstr "fallรณ al ejecutar '%s'" + +#: add-patch.c:602 +msgid "mismatched output from interactive.diffFilter" +msgstr "output de interactive.diffFilter no concuerda" + +#: add-patch.c:603 +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:776 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"se esperaba lรญnea de contexto #%d en\n" +"%.*s" + +#: add-patch.c:791 +#, 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:1067 git-add--interactive.perl:1114 +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:1071 +#, 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:1085 git-add--interactive.perl:1128 +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:1118 +msgid "could not parse hunk header" +msgstr "no se puede analizar hunk header" + +#: add-patch.c:1163 +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:1232 git-add--interactive.perl:1241 +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:1275 +msgid "The selected hunks do not apply to the index!" +msgstr "ยกLos hunks seleccionados no aplican al รญndice!" + +#: add-patch.c:1276 git-add--interactive.perl:1345 +msgid "Apply them to the worktree anyway? " +msgstr "ยฟAplicarlos al รกrbol de trabajo de todas maneras? " + +#: add-patch.c:1283 git-add--interactive.perl:1348 +msgid "Nothing was applied.\n" +msgstr "Nada fue aplicado.\n" + +#: add-patch.c:1340 +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:1463 add-patch.c:1473 +msgid "No previous hunk" +msgstr "No el anterior hunk" + +#: add-patch.c:1468 add-patch.c:1478 +msgid "No next hunk" +msgstr "No el siguiente hunk" + +#: add-patch.c:1484 +msgid "No other hunks to goto" +msgstr "No hay mรกs pedazos para el ir" + +#: add-patch.c:1495 git-add--interactive.perl:1594 +msgid "go to which hunk (<ret> to see more)? " +msgstr "ยฟa que hunk ir (<enter> para ver mรกs)? " + +#: add-patch.c:1496 git-add--interactive.perl:1596 +msgid "go to which hunk? " +msgstr "ยฟa que hunk ir? " + +#: add-patch.c:1507 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Numero invรกlido: '%s'" + +#: add-patch.c:1512 +#, 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:1521 +msgid "No other hunks to search" +msgstr "No hay mรกs pedazos para buscar" + +#: add-patch.c:1527 git-add--interactive.perl:1640 +msgid "search for regex? " +msgstr "ยฟbuscar para regexp? " + +#: add-patch.c:1542 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Regexp para la bรบsqueda mal formado %s: %s" + +#: add-patch.c:1559 +msgid "No hunk matches the given pattern" +msgstr "No hay hunks que concuerden con el patrรณn entregado." + +#: add-patch.c:1566 +msgid "Sorry, cannot split this hunk" +msgstr "Perdรณn, no se puede dividir este pedazo" + +#: add-patch.c:1570 +#, c-format +msgid "Split into %d hunks." +msgstr "Cortar en %d hunk." + +#: add-patch.c:1574 +msgid "Sorry, cannot edit this hunk" +msgstr "Perdรณn, no se puede editar este pedazo" + +#: add-patch.c:1625 +msgid "'git apply' failed" +msgstr "fallรณ 'git apply'" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" +"\n" +"Desactivar este mensaje con \"git config advice.%s false\"" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sayuda: %.*s%s\n" -#: advice.c:162 +#: advice.c:247 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:164 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." -#: advice.c:166 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "No es posible hacer merge porque tienes archivos sin fusionar." -#: advice.c:168 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "No es posible hacer pull porque tienes archivos sin fusionar." -#: advice.c:170 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "No es posible revertir porque tienes archivos sin fusionar." -#: advice.c:172 +#: advice.c:257 #, 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:180 +#: advice.c:265 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." @@ -57,23 +791,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:188 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:278 builtin/merge.c:1353 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusiรณn (MERGE_HEAD existe)." -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "Por favor, realiza un commit antes de fusionar." -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "Saliendo por una fusiรณn inconclusa." -#: advice.c:202 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -112,7 +846,7 @@ msgstr "" "\n" " git switch -\n" "\n" -"Apaga este aviso mediante la variable de config advice.detachedHead en " +"Desactiva este aviso poniendo la variable de config advice.detachedHead en " "false\n" "\n" @@ -206,17 +940,7 @@ 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: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 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -231,83 +955,94 @@ 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:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -"el header de git diff carece de informaciรณn del nombre del archivo (lรญnea %d)" +"la cabecera de git diff carece de informaciรณn del nombre del archivo (lรญnea " +"%d)" -#: apply.c:1752 +#: 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" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "el nuevo archivo depende de contenidos viejos" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "el archivo eliminado todavรญa tiene contenido" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "parche corrupto en la lรญnea %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "nuevo archivo %s depende en contenidos viejos" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "el archivo borrado %s todavรญa tiene contenido" -#: apply.c:1830 +#: apply.c:1831 #, 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:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "parche binario corrupto en la lรญnea %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "parche binario no reconocido en la lรญnea %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "parche que solo contiene basura en la lรญnea %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "no es posible leer el enlace simbรณlico %s" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "no es posible abrir o leer %s" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "comienzo invรกlido de lรญnea: '%c'" -#: apply.c:3046 +#: 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] "Hunk #%d tuvo รฉxito en %d (%d lรญnea compensada)." msgstr[1] "Hunk #%d tuvo รฉxito en %d (%d lรญneas compensadas)." -#: apply.c:3058 +#: apply.c:3069 #, 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:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -316,23 +1051,23 @@ msgstr "" "mientras se busca:\n" "%.*s" -#: apply.c:3086 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "data perdida en parche binario para '%s'" -#: apply.c:3094 +#: apply.c:3105 #, 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:3141 +#: apply.c:3152 #, 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:3151 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -340,289 +1075,284 @@ msgstr "" "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos " "actuales." -#: apply.c:3159 +#: apply.c:3171 #, 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:3177 +#: apply.c:3189 #, 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:3190 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el parche binario no aplica para '%s'" -#: apply.c:3196 +#: apply.c:3209 #, 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:3217 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "el parche fallรณ: %s:%ld" -#: apply.c:3340 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "no se puede hacer checkout a %s" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308 #, c-format msgid "failed to read %s" msgstr "no se pudo leer %s" -#: apply.c:3400 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "leyendo de '%s' tras un enlace simbรณlico" -#: apply.c:3429 apply.c:3672 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "la ruta %s ha sido renombrada/suprimida" -#: apply.c:3515 apply.c:3687 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existe en el รญndice" -#: apply.c:3524 apply.c:3695 +#: apply.c:3537 apply.c:3708 #, c-format msgid "%s: does not match index" msgstr "%s: no concuerda con el รญndice" -#: apply.c:3559 +#: apply.c:3572 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:3562 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retrocediendo en un merge de tres-vรญas...\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no se pueden leer los contenidos actuales de '%s'" -#: apply.c:3594 +#: apply.c:3607 #, 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:3608 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Parche aplicado a '%s' con conflictos.\n" -#: apply.c:3613 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Parche aplicado a '%s' limpiamente\n" -#: apply.c:3639 +#: apply.c:3652 msgid "removal patch leaves file contents" -msgstr "parche de remociรณn deja contenidos en el archivo" +msgstr "parche de eliminaciรณn deja contenidos en el archivo" -#: apply.c:3712 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: tipo incorrecto" -#: apply.c:3714 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s tiene tipo %o, se esperaba %o" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: 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 "ruta invรกlida '%s'" -#: apply.c:3923 +#: apply.c:3936 #, c-format msgid "%s: already exists in index" msgstr "%s: ya existe en el รญndice" -#: apply.c:3926 +#: apply.c:3939 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ya existe en el directorio de trabajo" -#: apply.c:3946 +#: apply.c:3959 #, 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:3951 +#: apply.c:3964 #, 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:3971 +#: apply.c:3984 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "archivo afectado '%s' estรก tras un enlace simbรณlico" -#: apply.c:3975 +#: apply.c:3988 #, c-format msgid "%s: patch does not apply" msgstr "%s: el parche no aplica" -#: apply.c:3990 +#: apply.c:4003 #, c-format msgid "Checking patch %s..." msgstr "Revisando el parche %s..." -#: apply.c:4082 +#: apply.c:4095 #, 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:4089 +#: apply.c:4102 #, 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:4092 +#: apply.c:4105 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta informaciรณn sha1 o es inรบtil (%s)." -#: 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 +#: apply.c:4114 #, c-format msgid "could not add %s to temporary index" msgstr "no se pudo aรฑadir %s al รญndice temporal" -#: apply.c:4111 +#: apply.c:4124 #, c-format msgid "could not write temporary index to %s" msgstr "no se pudo escribir un รญndice temporal para %s" -#: apply.c:4249 +#: apply.c:4262 #, c-format msgid "unable to remove %s from index" msgstr "no se puede eliminar %s del รญndice" -#: apply.c:4283 +#: apply.c:4296 #, c-format msgid "corrupt patch for submodule %s" msgstr "parche corrupto para el submรณdulo %s" -#: apply.c:4289 +#: apply.c:4302 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no es posible establecer el archivo reciรฉn creado '%s'" -#: apply.c:4297 +#: apply.c:4310 #, 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:4303 apply.c:4448 +#: apply.c:4316 apply.c:4461 #, c-format msgid "unable to add cache entry for %s" msgstr "no es posible agregar una entrada en el cache para %s" -#: apply.c:4346 +#: apply.c:4359 #, c-format msgid "failed to write to '%s'" msgstr "fallรณ escribir para '%s'" -#: apply.c:4350 +#: apply.c:4363 #, c-format msgid "closing file '%s'" msgstr "cerrando archivo '%s'" -#: apply.c:4420 +#: apply.c:4433 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no es posible escribir el archivo '%s' modo %o" -#: apply.c:4518 +#: apply.c:4531 #, c-format msgid "Applied patch %s cleanly." msgstr "Parche %s aplicado limpiamente." -#: apply.c:4526 +#: apply.c:4539 msgid "internal error" msgstr "error interno" -#: apply.c:4529 +#: apply.c:4542 #, 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:4540 +#: apply.c:4553 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncando el nombre de archivo .rej a %.*s.rej" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 #, c-format msgid "cannot open %s" msgstr "no se puede abrir %s" -#: apply.c:4562 +#: apply.c:4575 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Hunk #%d aplicado limpiamente." -#: apply.c:4566 +#: apply.c:4579 #, c-format msgid "Rejected hunk #%d." msgstr "Hunk #%d rechazado." -#: apply.c:4676 +#: apply.c:4698 #, c-format msgid "Skipped patch '%s'." msgstr "Parche '%s' saltado." -#: apply.c:4684 +#: apply.c:4706 msgid "unrecognized input" msgstr "input no reconocido" -#: apply.c:4704 +#: apply.c:4726 msgid "unable to read index file" msgstr "no es posible leer el archivo รญndice" -#: apply.c:4859 +#: apply.c:4883 #, c-format msgid "can't open patch '%s': %s" msgstr "no se puede abrir el parche '%s': %s" -#: apply.c:4886 +#: apply.c:4910 #, 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:4892 apply.c:4907 +#: apply.c:4916 apply.c:4931 #, 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:4900 +#: apply.c:4924 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -631,149 +1361,189 @@ msgstr[0] "" msgstr[1] "" "%d lรญneas aplicadas despuรฉs de arreglar los errores de espacios en blanco." -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "No es posible escribir el archivo รญndice" -#: 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 +#: apply.c:4968 msgid "don't apply changes matching the given path" msgstr "no aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4947 +#: apply.c:4971 msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4973 builtin/am.c:2259 msgid "num" msgstr "num" -#: apply.c:4950 +#: apply.c:4974 msgid "remove <num> leading slashes from traditional diff paths" msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales" -#: apply.c:4953 +#: apply.c:4977 msgid "ignore additions made by the patch" msgstr "ignorar adiciones hechas por el parche" -#: apply.c:4955 +#: apply.c:4979 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:4959 +#: apply.c:4983 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:4961 +#: apply.c:4985 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:4963 +#: apply.c:4987 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:4965 +#: apply.c:4989 msgid "make sure the patch is applicable to the current index" msgstr "asegurar que el parche es aplicable al รญndice actual" -#: apply.c:4967 +#: apply.c:4991 msgid "mark new files with `git add --intent-to-add`" msgstr "marca los nuevos archivos con `git add --intent-to-add`" -#: apply.c:4969 +#: apply.c:4993 msgid "apply a patch without touching the working tree" msgstr "aplicar un parche sin tocar el รกrbol de trabajo" -#: apply.c:4971 +#: apply.c:4995 msgid "accept a patch that touches outside the working area" msgstr "aceptar un parche que toca fuera del รกrea de trabajo" -#: apply.c:4974 +#: apply.c:4998 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tambiรฉn aplicar el parche ( usar con --stat/--summary/--check" -#: apply.c:4976 +#: apply.c:5000 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:4978 +#: apply.c:5002 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:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "rutas estรกn separadas con un carรกcter NULL" -#: apply.c:4983 +#: apply.c:5007 msgid "ensure at least <n> lines of context match" -msgstr "asegure que por lo menos <n> lรญneas del contexto concuerden" +msgstr "asegurar que al menos concuerden <n> lรญneas del contexto concuerden" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3530 builtin/rebase.c:1332 msgid "action" msgstr "acciรณn" -#: apply.c:4985 +#: apply.c:5009 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:4988 apply.c:4991 +#: apply.c:5012 apply.c:5015 msgid "ignore changes in whitespace when finding context" msgstr "" "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" -#: apply.c:4994 +#: apply.c:5018 msgid "apply the patch in reverse" msgstr "aplicar el parche en reversa" -#: apply.c:4996 +#: apply.c:5020 msgid "don't expect at least one line of context" msgstr "no espera al menos una lรญnea del contexto" -#: apply.c:4998 +#: apply.c:5022 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" -#: apply.c:5000 +#: apply.c:5024 msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" -#: 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 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5003 +#: apply.c:5027 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:5006 +#: apply.c:5030 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:5008 builtin/am.c:2205 +#: apply.c:5032 builtin/am.c:2247 msgid "root" msgstr "raรญz" -#: apply.c:5009 +#: apply.c:5033 msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" +#: archive-tar.c:125 archive-zip.c:351 +#, c-format +msgid "cannot stream blob %s" +msgstr "no se puede transmitir el blob %s" + +#: archive-tar.c:266 archive-zip.c:369 +#, 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 +#, c-format +msgid "cannot read %s" +msgstr "no se puede leer %s" + +#: archive-tar.c:465 +#, c-format +msgid "unable to start '%s' filter" +msgstr "no se puede comenzar filtro '%s'" + +#: archive-tar.c:468 +msgid "unable to redirect descriptor" +msgstr "incapaz de redirigir descriptor" + +#: archive-tar.c:475 +#, c-format +msgid "'%s' filter reported error" +msgstr "filtro '%s' reportรณ un error" + +#: archive-zip.c:319 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "ruta no vรกlida UTF-8: %s" + +#: archive-zip.c:323 +#, 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:243 builtin/pack-objects.c:246 +#, c-format +msgid "deflate error (%d)" +msgstr "error al desinflar (%d)" + +#: archive-zip.c:615 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "timestamp muy largo para este sistema: %<PRIuMAX>" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<opciones>] <parte-del-รกrbol> [<ruta>...]" @@ -793,182 +1563,134 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <comando>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "ruta especificada '%s' no concordรณ con ninguna carpeta" -#: archive.c:396 +#: archive.c:401 #, c-format msgid "no such ref: %.*s" msgstr "no existe el ref: %.*s" -#: archive.c:401 +#: archive.c:407 #, c-format msgid "not a valid object name: %s" msgstr "nombre de objeto no vรกlido: %s" -#: archive.c:414 +#: archive.c:420 #, c-format msgid "not a tree object: %s" msgstr "no es un objeto tree: %s" -#: archive.c:426 +#: archive.c:432 msgid "current working directory is untracked" msgstr "directorio de trabajo actual no rastreado" -#: archive.c:457 +#: archive.c:464 msgid "fmt" msgstr "fmt" -#: archive.c:457 +#: archive.c:464 msgid "archive format" msgstr "formato del archivo" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:465 builtin/log.c:1674 msgid "prefix" msgstr "prefijo" -#: archive.c:459 +#: archive.c:466 msgid "prepend prefix to each pathname in the archive" msgstr "anteponer prefijo a cada ruta en el archivo" -#: 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 +#: archive.c:467 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:1208 +#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907 +#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 +#: parse-options.h:190 msgid "file" msgstr "carpeta" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:468 builtin/archive.c:90 msgid "write the archive to this file" msgstr "escribe el archivo en esta carpeta" -#: archive.c:463 +#: archive.c:470 msgid "read .gitattributes in working directory" msgstr "leer .gitattributes en el directorio de trabajo" -#: archive.c:464 +#: archive.c:471 msgid "report archived files on stderr" msgstr "reportar archivos archivados por stderr" -#: archive.c:465 +#: archive.c:472 msgid "store only" msgstr "solo guardar" -#: archive.c:466 +#: archive.c:473 msgid "compress faster" msgstr "comprimir mรกs rรกpido" -#: archive.c:474 +#: archive.c:481 msgid "compress better" msgstr "comprimir mejor" -#: archive.c:477 +#: archive.c:484 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:1379 builtin/submodule--helper.c:1859 +#: archive.c:486 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 "repo" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:487 builtin/archive.c:92 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:707 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "comando" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:489 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "ruta para el comando git-upload-archivo remoto" -#: archive.c:489 +#: archive.c:496 msgid "Unexpected option --remote" msgstr "Opciรณn inesperada --remote" -#: archive.c:491 +#: archive.c:498 msgid "Option --exec can only be used together with --remote" msgstr "Opciรณn --exec solo puede ser utilizada con --remote" -#: archive.c:493 +#: archive.c:500 msgid "Unexpected option --output" msgstr "Opciรณn inesperada --output" -#: archive.c:515 +#: archive.c:522 #, c-format msgid "Unknown archive format '%s'" msgstr "Formato de carpeta desconocido '%s'" -#: archive.c:522 +#: archive.c:529 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumento no soportado para formato '%s': -%d" -#: 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: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:287 archive-zip.c:353 -#, c-format -msgid "cannot read %s" -msgstr "no se puede leer %s" - -#: archive-tar.c:459 -#, c-format -msgid "unable to start '%s' filter" -msgstr "no se puede comenzar filtro '%s'" - -#: archive-tar.c:462 -msgid "unable to redirect descriptor" -msgstr "incapaz de redirigir descriptor" - -#: archive-tar.c:469 -#, c-format -msgid "'%s' filter reported error" -msgstr "filtro '%s' reportรณ un error" - -#: 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:318 -#, c-format -msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "ruta muy larga (%d chars, SHA1: %s): %s" - -#: 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:609 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "timestamp muy largo para este sistema: %<PRIuMAX>" - -#: attr.c:211 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s no es un nombre de atributo vรกlido" -#: attr.c:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s no permitido: %s:%d" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -986,12 +1708,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:733 +#: bisect.c:745 #, c-format msgid "Not a valid commit name %s" msgstr "No es un nombre de commit vรกlido %s" -#: bisect.c:758 +#: bisect.c:770 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1000,7 +1722,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:763 +#: bisect.c:775 #, c-format msgid "" "The merge base %s is new.\n" @@ -1009,7 +1731,7 @@ msgstr "" "La base de fisiรณn %s es nueva.\n" "Esta propiedad ha cambiado entre %s y [%s].\n" -#: bisect.c:768 +#: bisect.c:780 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1018,7 +1740,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:776 +#: bisect.c:788 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1027,9 +1749,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:789 +#: bisect.c:801 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1040,36 +1762,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:822 +#: bisect.c:840 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Biseccionando: una base de fisiรณn debe ser probada\n" -#: bisect.c:865 +#: bisect.c:890 #, c-format msgid "a %s revision is needed" msgstr "una %s revisiรณn es necesaria" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "no se pudo crear el archivo '%s'" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:966 builtin/merge.c:151 #, c-format msgid "could not read file '%s'" msgstr "no se pudo leer el archivo '%s'" -#: bisect.c:958 +#: bisect.c:997 msgid "reading bisect refs failed" msgstr "fallรณ leer las refs de bisect" -#: bisect.c:977 +#: bisect.c:1019 #, c-format msgid "%s was both %s and %s\n" msgstr "%s fue tanto %s como %s\n" -#: bisect.c:985 +#: bisect.c:1028 #, c-format msgid "" "No testable commit found.\n" @@ -1078,7 +1800,7 @@ msgstr "" "No se encontrรณ commit que se pueda probar.\n" "ยฟQuizรกs iniciaste con parรกmetros de rutas incorrectos?\n" -#: bisect.c:1004 +#: bisect.c:1057 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1088,47 +1810,47 @@ msgstr[1] "(aproximadamente %d pasos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: 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] "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:2697 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "--contents y --reverse no se mezclan bien." -#: blame.c:2711 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "no se puede usar --contents con el nombre de objeto commit final" -#: blame.c:2732 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse y --first-parent juntos requieren especificar el รบltimo commit" -#: 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 +#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 +#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 +#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 +#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "fallรณ la configuraciรณn del camino de revisiรณn" -#: blame.c:2759 +#: blame.c:2839 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:2770 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "no hay una ruta %s en %s" -#: blame.c:2781 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "no se puede leer el blob %s para la ruta %s" @@ -1272,419 +1994,441 @@ msgstr "Nombre de objeto ambiguo: '%s'." msgid "Not a valid branch point: '%s'." msgstr "Punto de rama no vรกlido: '%s'." -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' ya ha sido marcado en '%s'" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD del รกrbol de trabajo %s no estรก actualizada" -#: bundle.c:36 +#: bundle.c:47 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' no se ve como un archivo bundle v2" -#: bundle.c:64 +#: bundle.c:69 +msgid "unknown hash algorithm length" +msgstr "largo del algoritmo hash desconocido" + +#: bundle.c:84 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "header no reconocido %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" -#: bundle.c:143 +#: bundle.c:163 msgid "Repository lacks these prerequisite commits:" msgstr "Al repositorio le falta estos commits prerrequisito:" -#: bundle.c:146 +#: bundle.c:166 msgid "need a repository to verify a bundle" msgstr "se necesita un repositorio para verificar un bundle" -#: bundle.c:197 +#: bundle.c:217 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "El bundle contiene esta referencia:" msgstr[1] "El bundle contiene estas %d referencias:" -#: bundle.c:204 +#: bundle.c:224 msgid "The bundle records a complete history." msgstr "El bundle registra una historia completa." -#: bundle.c:206 +#: bundle.c:226 #, c-format msgid "The bundle requires this ref:" 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:272 +#: bundle.c:293 msgid "unable to dup bundle descriptor" msgstr "incapaz de duplicar bundle descriptor" -#: bundle.c:279 +#: bundle.c:300 msgid "Could not spawn pack-objects" msgstr "No se pudo crear los pack-objetcts" -#: bundle.c:290 +#: bundle.c:311 msgid "pack-objects died" msgstr "pack-objects muriรณ" -#: bundle.c:332 +#: bundle.c:353 msgid "rev-list died" msgstr "rev-list muriรณ" -#: bundle.c:381 +#: bundle.c:402 #, 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:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argumento no reconocido: %s" -#: bundle.c:468 +#: bundle.c:489 msgid "Refusing to create empty bundle." msgstr "Rechazando crear un bundle vacรญo." -#: bundle.c:478 +#: bundle.c:499 #, c-format msgid "cannot create '%s'" msgstr "no se puede crear '%s'" -#: bundle.c:503 +#: bundle.c:524 msgid "index-pack died" msgstr "index-pack muriรณ" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "color invรกlido: %.*s" -#: 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:52 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s no es un commit!" - -#: commit.c:192 -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 "" -"El soporte para <GIT_DIR>/info/grafts ha sido deprecado\n" -"y serรก eliminado en una versiรณn futura de Git.\n" -"\n" -"Por favor use \"git replace --convert-graft-file\"\n" -"para convertir los grafts en refs.\n" -"\n" -"Apapa este mensaje ejecutando\n" -"\"git config advice.graftFileDeprecated false\"" - -#: 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: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:1133 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "Commit %s no tiene una firma GPG." - -#: 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: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 "" -"Peligro: el mensaje del commit no se ajusta a UTF-8.\n" -"Tal vez quieras enmendarlo despuรฉs de arreglar el mensaje, o arreglar la\n" -"variable de configuraciรณn i18n.commitencoding para la codificaciรณn que usa " -"tu proyecto.\n" - -#: commit-graph.c:127 +#: commit-graph.c:238 msgid "commit-graph file is too small" msgstr "archivo commit-graph es muy pequeรฑo" -#: commit-graph.c:192 +#: commit-graph.c:303 #, 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:199 +#: commit-graph.c:310 #, 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:206 +#: commit-graph.c:317 #, 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:229 +#: commit-graph.c:339 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:240 +#: commit-graph.c:349 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "offset del chunk de commit-graph inapropiado %08x%08x" -#: commit-graph.c:283 +#: commit-graph.c:417 #, 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:347 +#: commit-graph.c:491 msgid "commit-graph has no base graphs chunk" msgstr "commit-graph no tiene una chunk base de graphs" -#: commit-graph.c:357 +#: commit-graph.c:501 msgid "commit-graph chain does not match" msgstr "cadena commit-graph no concuerda" -#: commit-graph.c:404 +#: commit-graph.c:549 #, 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:430 +#: commit-graph.c:573 msgid "unable to find all commit-graph files" msgstr "no es posible encontrar los archivos commit-graph" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:706 commit-graph.c:770 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "posiciรณn de commit invรกlida. commit-graph estรก probablemente corrupto" -#: commit-graph.c:575 +#: commit-graph.c:727 #, c-format msgid "could not find commit %s" msgstr "no se pudo encontrar commit %s" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:1009 builtin/am.c:1292 +#, c-format +msgid "unable to parse commit %s" +msgstr "no es posible analizar el commit %s" + +#: commit-graph.c:1157 +msgid "Writing changed paths Bloom filters index" +msgstr "Escribiendo cambios de ruta del รญndice de filtros Bloom" + +#: commit-graph.c:1182 +msgid "Writing changed paths Bloom filters data" +msgstr "Escribiendo cambios de ruta de datos de filtros Bloom" + +#: commit-graph.c:1221 builtin/pack-objects.c:2832 #, c-format msgid "unable to get type of object %s" msgstr "incapaz de obtener el tipo de objeto: %s" -#: commit-graph.c:1034 +#: commit-graph.c:1257 msgid "Loading known commits in commit graph" msgstr "Cargando commits conocidos en commit graph" -#: commit-graph.c:1051 +#: commit-graph.c:1274 msgid "Expanding reachable commits in commit graph" msgstr "Expandiendo commits alcanzables en commit graph" -#: commit-graph.c:1070 +#: commit-graph.c:1294 msgid "Clearing commit marks in commit graph" msgstr "Limpiando marcas de commits en commit graph" -#: commit-graph.c:1089 +#: commit-graph.c:1313 msgid "Computing commit graph generation numbers" msgstr "Calculando nรบmeros de generaciรณn de commit graph" -#: commit-graph.c:1163 +#: commit-graph.c:1367 +msgid "Computing commit changed paths Bloom filters" +msgstr "Calculando nรบmeros de generaciรณn de commit graph" + +#: commit-graph.c:1423 +msgid "Collecting referenced commits" +msgstr "Recolectando commits referenciados" + +#: commit-graph.c:1447 #, 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:1176 +#: commit-graph.c:1460 #, c-format msgid "error adding pack %s" msgstr "error agregando pack %s" -#: commit-graph.c:1180 +#: commit-graph.c:1464 #, c-format msgid "error opening index for %s" msgstr "error abriendo index para %s" -#: 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:1238 +#: commit-graph.c:1503 msgid "Finding commits for commit graph among packed objects" msgstr "Encontrando commits para commit graph entre los objetos empaquetados" -#: commit-graph.c:1253 +#: commit-graph.c:1518 msgid "Counting distinct commits in commit graph" msgstr "Contando commits distintos en commit graph" -#: commit-graph.c:1284 +#: commit-graph.c:1550 msgid "Finding extra edges in commit graph" msgstr "Encontrando esquinas extra en commit graph" -#: commit-graph.c:1332 +#: commit-graph.c:1599 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:1365 midx.c:811 +#: commit-graph.c:1633 midx.c:812 #, c-format msgid "unable to create leading directories of %s" msgstr "no se pudo crear directorios principales para %s" -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1646 +msgid "unable to create temporary graph layer" +msgstr "no es posible crear un una capa de grรกfico temporal" + +#: commit-graph.c:1651 #, c-format -msgid "unable to create '%s'" -msgstr "no se puede crear '%s'" +msgid "unable to adjust shared permissions for '%s'" +msgstr "no se pudo poner permisos a '%s'" -#: commit-graph.c:1437 +#: commit-graph.c:1728 #, 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:1478 +#: commit-graph.c:1773 msgid "unable to open commit-graph chain file" msgstr "no se pudo abrir la cadena de archivos commit-graph" -#: commit-graph.c:1490 +#: commit-graph.c:1789 msgid "failed to rename base commit-graph file" msgstr "no se pudo renombrar el archivo base commit-graph" -#: commit-graph.c:1510 +#: commit-graph.c:1809 msgid "failed to rename temporary commit-graph file" msgstr "fallรณ al renombrar el archivo temporal commit-graph" -#: commit-graph.c:1621 +#: commit-graph.c:1935 msgid "Scanning merged commits" msgstr "Escaneando commits fusionados" -#: commit-graph.c:1632 +#: commit-graph.c:1946 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de commit duplicado inesperado %s" -#: commit-graph.c:1657 +#: commit-graph.c:1969 msgid "Merging commit-graph" msgstr "Fusionando commit-graph" -#: commit-graph.c:1844 +#: commit-graph.c:2156 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "el formato de grรกficos de commit no pudede escribir %d commits" -#: commit-graph.c:1855 +#: commit-graph.c:2167 msgid "too many commits to write graph" msgstr "demasiados commits para escribir el grรกfico" -#: commit-graph.c:1945 +#: commit-graph.c:2260 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:1955 +#: commit-graph.c:2270 #, 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:1965 commit-graph.c:1980 +#: commit-graph.c:2280 commit-graph.c:2295 #, 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:1972 +#: commit-graph.c:2287 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "fallรณ al analizar commit %s para commit-graph" -#: commit-graph.c:1989 +#: commit-graph.c:2305 msgid "Verifying commits in commit graph" msgstr "Verificando commits en commit graph" -#: commit-graph.c:2002 +#: commit-graph.c:2320 #, 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:2009 +#: commit-graph.c:2327 #, 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:2019 +#: commit-graph.c:2337 #, 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:2028 +#: commit-graph.c:2346 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "padre de commit-graph para %s es %s != %s" -#: commit-graph.c:2041 +#: commit-graph.c:2360 #, 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:2046 +#: commit-graph.c:2365 #, 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:2050 +#: commit-graph.c:2369 #, 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:2065 +#: commit-graph.c:2385 #, 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:2071 +#: commit-graph.c:2391 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "fecha de commit para commit %s en commit-graph es %<PRIuMAX> != %<PRIuMAX>" +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "no se puede analizar %s" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "ยก%s %s no es un commit!" + +#: commit.c:194 +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 "" +"El soporte para <GIT_DIR>/info/grafts ha sido deprecado\n" +"y serรก eliminado en una versiรณn futura de Git.\n" +"\n" +"Por favor use \"git replace --convert-graft-file\"\n" +"para convertir los grafts en refs.\n" +"\n" +"Apapa este mensaje ejecutando\n" +"\"git config advice.graftFileDeprecated false\"" + +#: commit.c:1172 +#, 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:1176 +#, 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:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "Commit %s no tiene una firma GPG." + +#: commit.c:1182 +#, 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:1436 +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 "" +"Peligro: el mensaje del commit no se ajusta a UTF-8.\n" +"Tal vez quieras enmendarlo despuรฉs de arreglar el mensaje, o arreglar la\n" +"variable de configuraciรณn i18n.commitencoding para la codificaciรณn que usa " +"tu proyecto.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "memoria agotada" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1699,300 +2443,293 @@ msgstr "" "\t%s\n" "Esto puede ser causado por inclusiones circulares." -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "no se pudo expandir rutas de inclusiรณn '%s'" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "inclusiones de configuraciรณn relativas tienen que venir de archivos" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "" "la configuraciรณn relativa incluye condicionales que deben venir de archivos" -#: config.c:376 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "llave no contiene una secciรณn: %s" -#: config.c:382 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "llave no contiene el nombre de variable: %s" -#: config.c:406 sequencer.c:2463 +#: config.c:408 sequencer.c:2456 #, c-format msgid "invalid key: %s" msgstr "llave invรกlida: %s" -#: config.c:412 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "llave invรกlida (nueva lรญnea): %s" -#: config.c:448 config.c:460 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "parรกmetro de configuraciรณn malogrado: %s" -#: config.c:495 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "formato malogrado en %s" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "mala lรญnea de config %d en el blob %s" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "mala lรญnea de config %d en el archivo %s" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "mala lรญnea de config %d en la entrada standard" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "mala lรญnea de config %d en el submรณdulo-blob %s" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "mala lรญnea de config %d en la lรญnea de comando %s" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "mala lรญnea de config %d en %s" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "fuera de rango" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "unidad invรกlida" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "mal valor de config numรฉrica '%s' para '%s': %s" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "mal valor de config numรฉrica '%s' para '%s' en el blob %s: %s" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "mal valor de config numรฉrica '%s' para '%s' en el archivo %s: %s" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "mal valor de config numรฉrica '%s' para '%s' en la entrada standard: %s" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "mal valor de config numรฉrica '%s' para '%s' en el submรณdulo-blob %s: %s" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "mal valor de config numรฉrica '%s' para '%s' en la lรญnea de comando %s: %s" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "mal valor de config numรฉrica '%s' para '%s' en %s: %s" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "fallรณ al expandir el directorio de usuario en: '%s'" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' para '%s' no es una marca de tiempo vรกlida" -#: config.c:1208 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "largo de abreviatura fuera de rango: %d" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "nivel de compresiรณn de zlib errรณneo %d" -#: config.c:1325 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "core.commentChar deberรญa tener solo un caracter" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo invรกlido de creaciรณn de objetos: %s" -#: config.c:1430 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "valor malformado para %s" -#: config.c:1456 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "valor malformado para %s: %s" -#: config.c:1457 +#: config.c:1472 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:3410 +#: config.c:1533 builtin/pack-objects.c:3617 #, c-format msgid "bad pack compression level %d" msgstr "nivel de compresiรณn de pack errรณneo %d" -#: config.c:1639 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "incapaz de cargar configuraciรณn de objeto blob '%s'" -#: config.c:1642 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referencia '%s' no apunta a un blob" -#: config.c:1659 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "no se posible resolver configuraciรณn de blob '%s'" -#: config.c:1689 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "no se pudo analizar %s" -#: config.c:1745 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "no es posible analizar la configuraciรณn de la lรญnea de comando" -#: config.c:2094 +#: config.c:2113 msgid "unknown error occurred while reading the configuration files" msgstr "" "error desconocido ocurriรณ mientras se leรญan los archivos de configuraciรณn" -#: config.c:2264 +#: config.c:2283 #, c-format msgid "Invalid %s: '%s'" msgstr "Invรกlido %s: '%s'" -#: 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 +#: config.c:2328 #, 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:2379 +#: config.c:2374 #, 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:2381 +#: config.c:2376 #, 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:2462 +#: config.c:2457 #, c-format msgid "invalid section name '%s'" msgstr "nombre de secciรณn invรกlido '%s'" -#: config.c:2494 +#: config.c:2489 #, c-format msgid "%s has multiple values" msgstr "%s tiene mรบltiples valores" -#: config.c:2523 +#: config.c:2518 #, c-format msgid "failed to write new configuration file %s" msgstr "fallรณ al escribir nuevo archivo de configuraciรณn %s" -#: config.c:2775 config.c:3099 +#: config.c:2770 config.c:3094 #, c-format msgid "could not lock config file %s" msgstr "no se pudo bloquear archivo de configuraciรณn %s" -#: config.c:2786 +#: config.c:2781 #, c-format msgid "opening %s" msgstr "abriendo %s" -#: config.c:2821 builtin/config.c:328 +#: config.c:2816 builtin/config.c:344 #, c-format msgid "invalid pattern: %s" msgstr "patrรณn invรกlido: %s" -#: config.c:2846 +#: config.c:2841 #, c-format msgid "invalid config file %s" msgstr "archivo de configuraciรณn invรกlido: %s" -#: config.c:2859 config.c:3112 +#: config.c:2854 config.c:3107 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s fallรณ" -#: config.c:2870 +#: config.c:2865 #, c-format msgid "unable to mmap '%s'" msgstr "no es posible hacer mmap '%s'" -#: config.c:2879 config.c:3117 +#: config.c:2874 config.c:3112 #, c-format msgid "chmod on %s failed" msgstr "chmod en %s fallรณ" -#: config.c:2964 config.c:3214 +#: config.c:2959 config.c:3209 #, c-format msgid "could not write config file %s" msgstr "no se pudo escribir el archivo de configuraciรณn %s" -#: config.c:2998 +#: config.c:2993 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:3000 builtin/remote.c:782 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" -#: config.c:3090 +#: config.c:3085 #, c-format msgid "invalid section name: %s" msgstr "secciรณn de nombre invรกlida: %s" -#: config.c:3257 +#: config.c:3252 #, c-format msgid "missing value for '%s'" msgstr "valor faltante para '%s'" @@ -2018,72 +2755,81 @@ msgstr "" msgid "server doesn't support '%s'" msgstr "servidor no soporta '%s'" -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "servidor no soporta feature '%s'" -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" msgstr "se espera flush tras capacidades" -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "ignorando capacidades tras primera lรญnea '%s'" -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "error de protocolo: capacidades imprevistas^{}" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "el repositorio en el otro final no puede ser superficial" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" msgstr "paquete invรกlido" -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "error de protocolo: '%s' inesperado" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" msgstr "respuesta de referencias ls-refs invรกlida: %s" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" msgstr "flush esperado tras listado de refs" -#: connect.c:544 +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "se esperaba un paquete final luego del ref listing" + +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" msgstr "protocolo '%s' no es soportado" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" msgstr "no es posible configurar SO_KEEPALIVE en el socket" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "Revisando %s... " -#: connect.c:639 +#: connect.c:735 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "no se puede revisar %s (puerto %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" @@ -2092,7 +2838,7 @@ msgstr "" "hecho.\n" "Conectando a %s (puerto %s) ... " -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -2102,88 +2848,88 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "hecho." -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "no es posible revisar %s (%s)" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "puerto desconocido %s" -#: connect.c:845 connect.c:1171 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "hostname extraรฑo '%s' bloqueado" -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "puerto extraรฑo '%s' bloqueado" -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "no se puede comenzar proxy %s" -#: connect.c:924 +#: connect.c:1024 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:1119 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" msgstr "variante 'simple' de ssh no soporta -4" -#: connect.c:1131 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" msgstr "variante 'simple' de ssh no soporta -6" -#: connect.c:1148 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" msgstr "variante ssh 'simple' no soporta configurar puerto" -#: connect.c:1260 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" msgstr "ruta extraรฑa '%s' bloqueada" -#: connect.c:1307 +#: connect.c:1407 msgid "unable to fork" msgstr "no es posible hacer fork" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Verificando conectividad" -#: connected.c:98 +#: connected.c:121 msgid "Could not run 'git rev-list'" msgstr "No se pudo correr 'git rev-list'" -#: connected.c:118 +#: connected.c:141 msgid "failed write to rev-list" msgstr "fallรณ escribir a rev-list" -#: connected.c:125 +#: connected.c:148 msgid "failed to close rev-list's stdin" msgstr "fallรณ al cerrar la entrada standard de rev-list" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action %d ilegal" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF serรก reemplazado por LF en %s" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2192,12 +2938,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:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF serรก reemplazado por CRLF en %s" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2206,19 +2952,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:279 +#: convert.c:284 #, 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:286 +#: convert.c:291 #, c-format msgid "" -"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 " +"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." #: convert.c:304 #, c-format @@ -2234,50 +2980,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:424 convert.c:495 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "fallรณ al codificar '%s' de %s a %s" -#: convert.c:467 +#: convert.c:462 #, 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:673 +#: convert.c:668 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "no se puede hacer fork para ejecutar filtros externos '%s'" -#: convert.c:693 +#: convert.c:688 #, 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:700 +#: convert.c:695 #, c-format msgid "external filter '%s' failed %d" msgstr "filtro externo '%s' fallรณ %d" -#: convert.c:735 convert.c:738 +#: convert.c:730 convert.c:733 #, c-format msgid "read from external filter '%s' failed" msgstr "lectura de filtro externo '%s' fallรณ" -#: convert.c:741 convert.c:796 +#: convert.c:736 convert.c:791 #, c-format msgid "external filter '%s' failed" msgstr "filtro externo '%s' fallรณ" -#: convert.c:844 +#: convert.c:840 msgid "unexpected filter type" msgstr "tipo de filtro inesperado" -#: convert.c:855 +#: convert.c:851 msgid "path name too long for external filter" msgstr "nombre de ruta muy largo para filtro externo" -#: convert.c:929 +#: convert.c:943 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2286,67 +3032,95 @@ msgstr "" "filtro externo '%s' ya no estรก disponible aunque no todas las rutas han sido " "filtradas" -#: convert.c:1228 +#: convert.c:1243 msgid "true/false are no valid working-tree-encodings" msgstr "true/false no son working-tree-encodings vรกlidos" -#: convert.c:1398 convert.c:1432 +#: convert.c:1431 convert.c:1465 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: fallรณ al limpiar filtro '%s'" -#: convert.c:1476 +#: convert.c:1511 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: filtro smudge %s fallรณ" -#: date.c:137 +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "saltando revisiรณn de credenciales para llave: credencial. %s" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "rehusando trabajar con credenciales faltantes en el campo host" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "rehusando trabajar con credenciales faltantes en el campo protocolo" + +#: credential.c:396 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "url contiene un espace de lรญnea en su componente %s: %s" + +#: credential.c:440 +#, c-format +msgid "url has no scheme: %s" +msgstr "url no tiene scheme: %s" + +#: credential.c:513 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "url credencial no puede ser analizada: %s" + +#: date.c:138 msgid "in the future" msgstr "en el futuro" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "hace %<PRIuMAX> segundo" msgstr[1] "hace %<PRIuMAX> segundos" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "hace %<PRIuMAX> minuto" msgstr[1] "hace %<PRIuMAX> minutos" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "hace %<PRIuMAX> hora" msgstr[1] "hace %<PRIuMAX> horas" -#: date.c:164 +#: date.c:165 #, 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:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "hace %<PRIuMAX> semana" msgstr[1] "hace %<PRIuMAX> semanas" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "hace %<PRIuMAX> mes" msgstr[1] "hace %<PRIuMAX> meses" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2354,14 +3128,14 @@ msgstr[0] "%<PRIuMAX> aรฑo" msgstr[1] "%<PRIuMAX> aรฑos" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, 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:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2392,15 +3166,6 @@ msgstr "regex isla de config tiene muchos grupos de captura (max=%d)" msgid "Marked %d islands, done.\n" msgstr "%d islas marcadas, listo.\n" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "fallรณ al leer orden de archivos '%s'" - -#: diffcore-rename.c:544 -msgid "Performing inexact rename detection" -msgstr "Realizando una detecciรณn de cambios de nombre inexacta" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<opciones>] <path> <path>" @@ -2413,17 +3178,17 @@ msgstr "" "No es un repositorio git. Use --no-index para comparar dos paths fuera del " "รกrbol de trabajo" -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Fallรณ al analizar dirstat porcentaje de corte '%s'\n" -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " parรกmetro '%s' de dirstat desconocido\n" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2431,7 +3196,7 @@ msgstr "" "opciรณn de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', " "'dimmed_zebra', 'plain'" -#: diff.c:324 +#: diff.c:325 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -2441,7 +3206,7 @@ msgstr "" "change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-" "change'" -#: diff.c:332 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -2449,13 +3214,13 @@ msgstr "" "color-moved-ws: allow-indentation-change no puede ser combinado con otros " "modos de espacios en blanco" -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valor para la variable de configuraciรณn 'diff.submodule' desconocido: '%s'" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2464,35 +3229,35 @@ msgstr "" "Errores en la variable de config 'diff.dirstat' encontrados:\n" "%s" -#: diff.c:4215 +#: diff.c:4243 #, c-format msgid "external diff died, stopping at %s" msgstr "diff externo muriรณ, deteniendo en %s" -#: diff.c:4560 +#: diff.c:4589 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" -#: diff.c:4563 +#: diff.c:4592 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S y --find-object son mutuamente exclusivas" -#: diff.c:4641 +#: diff.c:4670 msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" -#: diff.c:4689 +#: diff.c:4718 #, c-format msgid "invalid --stat value: %s" msgstr "valor --stat invรกlido: %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250 +#: parse-options.c:197 parse-options.c:201 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numรฉrico" -#: diff.c:4726 +#: diff.c:4755 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2501,42 +3266,42 @@ msgstr "" "Fallรณ al analizar parรกmetro de opciรณn --dirstat/-X:\n" "%s" -#: diff.c:4811 +#: diff.c:4840 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "cambio de clase desconocido '%c' en --diff-filter=%s" -#: diff.c:4835 +#: diff.c:4864 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valor desconocido luego de ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4878 #, c-format msgid "unable to resolve '%s'" msgstr "no se puede resolver '%s'" -#: diff.c:4899 diff.c:4905 +#: diff.c:4928 diff.c:4934 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s espera forma <n>/<m>" -#: diff.c:4917 +#: diff.c:4946 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s esperaba un char, se obtuvo '%s'" -#: diff.c:4938 +#: diff.c:4967 #, c-format msgid "bad --color-moved argument: %s" msgstr "mal argumento --color-moved: %s" -#: diff.c:4957 +#: diff.c:4986 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modo invรกlido '%s' en --color-moved-ws" -#: diff.c:4997 +#: diff.c:5026 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2544,154 +3309,154 @@ msgstr "" "opciรณn diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e " "\"histogram\"" -#: diff.c:5033 diff.c:5053 +#: diff.c:5062 diff.c:5082 #, c-format msgid "invalid argument to %s" msgstr "argumento invรกlido para %s" -#: diff.c:5191 +#: diff.c:5219 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "fallรณ al analizar parรกmetro de opciรณn --submodule: '%s'" -#: diff.c:5247 +#: diff.c:5275 #, c-format msgid "bad --word-diff argument: %s" msgstr "mal argumento --word-diff: %s" -#: diff.c:5270 +#: diff.c:5298 msgid "Diff output format options" msgstr "Opciones de formato de salida para diff" -#: diff.c:5272 diff.c:5278 +#: diff.c:5300 diff.c:5306 msgid "generate patch" msgstr "generar parche" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5303 builtin/log.c:177 msgid "suppress diff output" msgstr "suprimir salida de diff" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5308 diff.c:5422 diff.c:5429 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5309 diff.c:5312 msgid "generate diffs with <n> lines context" msgstr "genera diffs con <n> lรญneas de contexto" -#: diff.c:5286 +#: diff.c:5314 msgid "generate the diff in raw format" msgstr "genera el diff en formato raw" -#: diff.c:5289 +#: diff.c:5317 msgid "synonym for '-p --raw'" msgstr "sinรณnimo para '-p --stat'" -#: diff.c:5293 +#: diff.c:5321 msgid "synonym for '-p --stat'" msgstr "sinรณnimo para '-p --stat'" -#: diff.c:5297 +#: diff.c:5325 msgid "machine friendly --stat" msgstr "--stat amigable para mรกquina" -#: diff.c:5300 +#: diff.c:5328 msgid "output only the last line of --stat" msgstr "mostrar solo la รบltima lรญnea para --stat" -#: diff.c:5302 diff.c:5310 +#: diff.c:5330 diff.c:5338 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5303 +#: diff.c:5331 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:5307 +#: diff.c:5335 msgid "synonym for --dirstat=cumulative" msgstr "sinรณnimo para --dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5339 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonimo para --dirstat=archivos,param1,param2..." -#: diff.c:5315 +#: diff.c:5343 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:5318 +#: diff.c:5346 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "resumen condensado de creaciones, cambios de nombres y cambios de modos" -#: diff.c:5321 +#: diff.c:5349 msgid "show only names of changed files" msgstr "mostrar solo nombres de archivos cambiados" -#: diff.c:5324 +#: diff.c:5352 msgid "show only names and status of changed files" msgstr "mostrar solo nombres y estados de archivos cambiados" -#: diff.c:5326 +#: diff.c:5354 msgid "<width>[,<name-width>[,<count>]]" msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]" -#: diff.c:5327 +#: diff.c:5355 msgid "generate diffstat" msgstr "generar diffstat" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5357 diff.c:5360 diff.c:5363 msgid "<width>" msgstr "<ancho>" -#: diff.c:5330 +#: diff.c:5358 msgid "generate diffstat with a given width" msgstr "genera diffstat con un ancho dado" -#: diff.c:5333 +#: diff.c:5361 msgid "generate diffstat with a given name width" msgstr "genera diffstat con un nombre de ancho dado" -#: diff.c:5336 +#: diff.c:5364 msgid "generate diffstat with a given graph width" msgstr "genera diffstat con un ancho de graph dado" -#: diff.c:5338 +#: diff.c:5366 msgid "<count>" msgstr "<cantidad>" -#: diff.c:5339 +#: diff.c:5367 msgid "generate diffstat with limited lines" msgstr "genera diffstat con lรญneas limitadas" -#: diff.c:5342 +#: diff.c:5370 msgid "generate compact summary in diffstat" msgstr "genera un resumen compacto de diffstat" -#: diff.c:5345 +#: diff.c:5373 msgid "output a binary diff that can be applied" msgstr "muestra un diff binario que puede ser aplicado" -#: diff.c:5348 +#: diff.c:5376 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:5350 +#: diff.c:5378 msgid "show colored diff" msgstr "mostrar diff colorido" -#: diff.c:5351 +#: diff.c:5379 msgid "<kind>" msgstr "<tipo>" -#: diff.c:5352 +#: diff.c:5380 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2699,7 +3464,7 @@ msgstr "" "resaltar errores de espacios en blanco en las lรญneas 'context', 'old' o " "'new' del diff" -#: diff.c:5355 +#: diff.c:5383 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2707,89 +3472,89 @@ msgstr "" "no consolidar los pathnames y usar NULs como terminadores de campos en --raw " "o --numstat" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498 msgid "<prefix>" msgstr "<prefijo>" -#: diff.c:5359 +#: diff.c:5387 msgid "show the given source prefix instead of \"a/\"" msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\"" -#: diff.c:5362 +#: diff.c:5390 msgid "show the given destination prefix instead of \"b/\"" msgstr "mostrar el prefijo de destino en lugar de \"b/\"" -#: diff.c:5365 +#: diff.c:5393 msgid "prepend an additional prefix to every line of output" msgstr "anteponer un prefijo adicional a cada lรญnea mostrada" -#: diff.c:5368 +#: diff.c:5396 msgid "do not show any source or destination prefix" msgstr "no mostrar ningรบn prefijo de fuente o destino" -#: diff.c:5371 +#: diff.c:5399 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:5375 diff.c:5380 diff.c:5385 +#: diff.c:5403 diff.c:5408 diff.c:5413 msgid "<char>" msgstr "<char>" -#: diff.c:5376 +#: diff.c:5404 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:5381 +#: diff.c:5409 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:5386 +#: diff.c:5414 msgid "specify the character to indicate a context instead of ' '" msgstr "especifica el char para indicar un contexto en lugar de ' '" -#: diff.c:5389 +#: diff.c:5417 msgid "Diff rename options" msgstr "Opciones de diff rename" -#: diff.c:5390 +#: diff.c:5418 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5419 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:5395 +#: diff.c:5423 msgid "detect renames" msgstr "detectar renombrados" -#: diff.c:5399 +#: diff.c:5427 msgid "omit the preimage for deletes" msgstr "omite la preimage para borrados" -#: diff.c:5402 +#: diff.c:5430 msgid "detect copies" msgstr "detectar copias" -#: diff.c:5406 +#: diff.c:5434 msgid "use unmodified files as source to find copies" msgstr "usa archivos no modificados como fuente para encontrar copias" -#: diff.c:5408 +#: diff.c:5436 msgid "disable rename detection" msgstr "deshabilita detecciรณn de renombres" -#: diff.c:5411 +#: diff.c:5439 msgid "use empty blobs as rename source" msgstr "usa blobs vacรญos como fuente de renombre" -#: diff.c:5413 +#: diff.c:5441 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:5416 +#: diff.c:5444 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2797,155 +3562,155 @@ msgstr "" "previene detecciรณn de renombre/copias si el nรบmero de objetivos para " "renombres/copias excede el lรญmite dado" -#: diff.c:5418 +#: diff.c:5446 msgid "Diff algorithm options" msgstr "Opciones de algoritmos de diff" -#: diff.c:5420 +#: diff.c:5448 msgid "produce the smallest possible diff" msgstr "produce el diff mรกs pequeรฑo posible" -#: diff.c:5423 +#: diff.c:5451 msgid "ignore whitespace when comparing lines" msgstr "ignorar espacios en blanco cuando comparando lรญneas" -#: diff.c:5426 +#: diff.c:5454 msgid "ignore changes in amount of whitespace" msgstr "ignorar cambios en la cantidad de lรญneas en blanco" -#: diff.c:5429 +#: diff.c:5457 msgid "ignore changes in whitespace at EOL" msgstr "ignorar cambios en espacios en blanco en EOL" -#: diff.c:5432 +#: diff.c:5460 msgid "ignore carrier-return at the end of line" msgstr "ignora carrier-return al final de la lรญnea" -#: diff.c:5435 +#: diff.c:5463 msgid "ignore changes whose lines are all blank" msgstr "ignora cambios cuyas lรญneas son todas en blanco" -#: diff.c:5438 +#: diff.c:5466 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:5441 +#: diff.c:5469 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera un diff usando algoritmo \"patience diff\"" -#: diff.c:5445 +#: diff.c:5473 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera un diff usando algoritmo \"histogram diff\"" -#: diff.c:5447 +#: diff.c:5475 msgid "<algorithm>" msgstr "<algoritmo>" -#: diff.c:5448 +#: diff.c:5476 msgid "choose a diff algorithm" msgstr "escoge un algoritmo para diff" -#: diff.c:5450 +#: diff.c:5478 msgid "<text>" msgstr "<texto>" -#: diff.c:5451 +#: diff.c:5479 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera un diff usando algoritmo \"anchored diff\"" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5481 diff.c:5490 diff.c:5493 msgid "<mode>" msgstr "<modo>" -#: diff.c:5454 +#: diff.c:5482 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5484 diff.c:5487 diff.c:5532 msgid "<regex>" msgstr "<regex>" -#: diff.c:5457 +#: diff.c:5485 msgid "use <regex> to decide what a word is" msgstr "usa <regex> para decidir que palabra es" -#: diff.c:5460 +#: diff.c:5488 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5463 +#: diff.c:5491 msgid "moved lines of code are colored differently" msgstr "lรญneas movidas de cรณdigo estรกn coloreadas diferente" -#: diff.c:5466 +#: diff.c:5494 msgid "how white spaces are ignored in --color-moved" msgstr "como espacios en blanco son ignorados en --color-moved" -#: diff.c:5469 +#: diff.c:5497 msgid "Other diff options" msgstr "Otras opciones de diff" -#: diff.c:5471 +#: diff.c:5499 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:5475 +#: diff.c:5503 msgid "treat all files as text" msgstr "tratar todos los archivos como texto" -#: diff.c:5477 +#: diff.c:5505 msgid "swap two inputs, reverse the diff" msgstr "cambia dos inputs, invierte el diff" -#: diff.c:5479 +#: diff.c:5507 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0" -#: diff.c:5481 +#: diff.c:5509 msgid "disable all output of the program" msgstr "deshabilita todo el output del programa" -#: diff.c:5483 +#: diff.c:5511 msgid "allow an external diff helper to be executed" msgstr "permite la ejecuciรณn de un diff helper externo" -#: diff.c:5485 +#: diff.c:5513 msgid "run external text conversion filters when comparing binary files" msgstr "" "ejecuta filtros de conversiรณn de texto externos cuando comparando binarios" -#: diff.c:5487 +#: diff.c:5515 msgid "<when>" msgstr "<cuando>" -#: diff.c:5488 +#: diff.c:5516 msgid "ignore changes to submodules in the diff generation" msgstr "ignorar cambios a submรณdulos en la generaciรณn de diff" -#: diff.c:5491 +#: diff.c:5519 msgid "<format>" msgstr "<formato>" -#: diff.c:5492 +#: diff.c:5520 msgid "specify how differences in submodules are shown" msgstr "especifica como son mostradas las diferencias en submรณdulos" -#: diff.c:5496 +#: diff.c:5524 msgid "hide 'git add -N' entries from the index" msgstr "ocultar entradas 'git add -N' del index" -#: diff.c:5499 +#: diff.c:5527 msgid "treat 'git add -N' entries as real in the index" msgstr "trata entradas 'git add -N' como reales en el index" -#: diff.c:5501 +#: diff.c:5529 msgid "<string>" msgstr "<string>" -#: diff.c:5502 +#: diff.c:5530 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -2953,7 +3718,7 @@ msgstr "" "busca por diferencias que cambien el nรบmero de ocurrencias para el string " "especificado" -#: diff.c:5505 +#: diff.c:5533 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -2961,23 +3726,23 @@ msgstr "" "busca por diferencias que cambien el nรบmero de ocurrencias para el regex " "especificado" -#: diff.c:5508 +#: diff.c:5536 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:5511 +#: diff.c:5539 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:5514 +#: diff.c:5542 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:5515 +#: diff.c:5543 msgid "<object-id>" msgstr "<id-objeto>" -#: diff.c:5516 +#: diff.c:5544 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -2985,33 +3750,33 @@ msgstr "" "busca por diferencias que cambien el nรบmero de ocurrencias para el objeto " "especificado" -#: diff.c:5518 +#: diff.c:5546 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5547 msgid "select files by diff type" msgstr "selecciona archivos por tipo de diff" -#: diff.c:5521 +#: diff.c:5549 msgid "<file>" msgstr "<archivo>" -#: diff.c:5522 +#: diff.c:5550 msgid "Output to a specific file" msgstr "Output a un archivo especรญfico" -#: diff.c:6177 +#: diff.c:6205 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:6180 +#: diff.c:6208 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:6183 +#: diff.c:6211 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3019,55 +3784,84 @@ msgstr "" "tal vez quieras configurar la variable %s para por lo menos %d y volver a " "intentar el comando." -#: dir.c:537 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "fallรณ al leer orden de archivos '%s'" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "Realizando una detecciรณn de cambios de nombre inexacta" + +#: dir.c:573 #, 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:926 +#: dir.c:713 dir.c:742 dir.c:755 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "patrรณn desconocido: '%s'" + +#: dir.c:772 dir.c:786 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "patrรณn negativo no reconocido: '%s'" + +#: dir.c:804 +#, 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:814 +msgid "disabling cone pattern matching" +msgstr "deshabilitar coincidencia de patrรณnes cono" + +#: dir.c:1191 #, c-format msgid "cannot use %s as an exclude file" msgstr "no se puede usar %s como archivo de exclusiรณn" -#: dir.c:1843 +#: dir.c:2296 #, c-format msgid "could not open directory '%s'" msgstr "no se pudo abrir el directorio '%s'" -#: dir.c:2085 +#: dir.c:2596 msgid "failed to get kernel name and information" msgstr "fallรณ al conseguir la informaciรณn y nombre del kernel" -#: dir.c:2209 +#: dir.c:2720 msgid "untracked cache is disabled on this system or location" msgstr "untracked cache estรก desactivado en este sistema o ubicaciรณn" -#: dir.c:3013 +#: dir.c:3502 #, c-format msgid "index file corrupt in repo %s" msgstr "archivo รญndice corrompido en repositorio %s" -#: dir.c:3058 dir.c:3063 +#: dir.c:3547 dir.c:3552 #, c-format msgid "could not create directories for %s" msgstr "no se pudo crear directorios para %s" -#: dir.c:3092 +#: dir.c:3581 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no se pudo migrar el directorio git de '%s' a '%s'" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "Filtrando contenido" -#: entry.c:476 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "no se pudo establecer el archivo '%s'" @@ -3077,7 +3871,7 @@ msgstr "no se pudo establecer el archivo '%s'" msgid "bad git namespace path \"%s\"" msgstr "ruta de namespace de git mala \"%s\"" -#: environment.c:332 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "no se pudo configurar GIT_DIR a '%s'" @@ -3087,81 +3881,77 @@ msgstr "no se pudo configurar GIT_DIR a '%s'" msgid "too many args to run %s" msgstr "demasiados argumentos para correr %s" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "Remoto sin URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:152 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: lista poco profunda esperada" -#: fetch-pack.c:154 +#: fetch-pack.c:155 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:165 +#: fetch-pack.c:166 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:185 +#: fetch-pack.c:186 #, 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:196 +#: fetch-pack.c:197 msgid "unable to write to remote" msgstr "no se puede escribir al remoto" -#: fetch-pack.c:258 +#: fetch-pack.c:259 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requiere multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:358 fetch-pack.c:1408 #, c-format msgid "invalid shallow line: %s" msgstr "lรญnea poco profunda invรกlida: %s" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:364 fetch-pack.c:1414 #, c-format msgid "invalid unshallow line: %s" msgstr "lรญnea superficial invรกlida: %s" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:366 fetch-pack.c:1416 #, c-format msgid "object not found: %s" msgstr "objeto no encontrado: %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:369 fetch-pack.c:1419 #, c-format msgid "error in object: %s" msgstr "error en objeto: %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:371 fetch-pack.c:1421 #, c-format msgid "no shallow found: %s" msgstr "superficie no encontrada: %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:374 fetch-pack.c:1425 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "se esperaba shallow/unshallow, se obtuvo %s" -#: fetch-pack.c:417 +#: fetch-pack.c:416 #, c-format msgid "got %s %d %s" msgstr "se obtuvo %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:433 #, c-format msgid "invalid commit %s" msgstr "commit invรกlido %s" -#: fetch-pack.c:465 +#: fetch-pack.c:464 msgid "giving up" msgstr "rindiรฉndose" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:477 progress.c:336 msgid "done" msgstr "listo" @@ -3175,178 +3965,204 @@ msgstr "se obtuvo %s (%d) %s" msgid "Marking %s as complete" msgstr "Marcando %s como completa" -#: fetch-pack.c:744 +#: fetch-pack.c:756 #, c-format msgid "already have %s (%s)" msgstr "ya se tiene %s (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:821 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral" -#: fetch-pack.c:791 +#: fetch-pack.c:829 msgid "protocol error: bad pack header" msgstr "error de protocolo: paquete de header errรณneo" -#: fetch-pack.c:859 +#: fetch-pack.c:910 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no se puede quitar %s" -#: fetch-pack.c:875 +#: fetch-pack.c:927 #, c-format msgid "%s failed" msgstr "%s fallรณ" -#: fetch-pack.c:877 +#: fetch-pack.c:929 msgid "error in sideband demultiplexer" msgstr "error en demultiplexor de banda lateral" -#: fetch-pack.c:908 +#: fetch-pack.c:976 #, c-format msgid "Server version is %.*s" msgstr "Versiรณn de servidor es %.*s" -#: 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 +#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996 +#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012 +#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028 +#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050 #, c-format msgid "Server supports %s" msgstr "El servidor soporta %s" -#: fetch-pack.c:915 +#: fetch-pack.c:983 msgid "Server does not support shallow clients" msgstr "El servidor no soporta clientes superficiales" -#: fetch-pack.c:975 +#: fetch-pack.c:1043 msgid "Server does not support --shallow-since" msgstr "El servidor no soporta --shalow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:1048 msgid "Server does not support --shallow-exclude" msgstr "El servidor no soporta --shalow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:1052 msgid "Server does not support --deepen" msgstr "El servidor no soporta --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1054 +msgid "Server does not support this repository's object format" +msgstr "El servidor no soporta el formato de objetos de este repositorio" + +#: fetch-pack.c:1071 msgid "no common commits" msgstr "no hay commits comunes" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1083 fetch-pack.c:1639 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch fallรณ." -#: fetch-pack.c:1151 +#: fetch-pack.c:1211 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "algoritmos no compatibles: cliente %s; servidor %s" + +#: fetch-pack.c:1215 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "servidor no soporta el algoritmo '%s'" + +#: fetch-pack.c:1235 msgid "Server does not support shallow requests" msgstr "El servidor no soporta peticiones superficiales" -#: fetch-pack.c:1157 +#: fetch-pack.c:1242 msgid "Server supports filter" msgstr "El servidor soporta filtro" -#: fetch-pack.c:1184 +#: fetch-pack.c:1286 msgid "unable to write request to remote" msgstr "no se puede escribir request al remoto" -#: fetch-pack.c:1202 +#: fetch-pack.c:1304 #, c-format msgid "error reading section header '%s'" msgstr "error leyendo secciรณn header '%s'" -#: fetch-pack.c:1208 +#: fetch-pack.c:1310 #, c-format msgid "expected '%s', received '%s'" msgstr "se esperaba '%s', se recibiรณ '%s'" -#: fetch-pack.c:1247 +#: fetch-pack.c:1371 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "lรญnea de confirmaciรณn inesperada: '%s'" -#: fetch-pack.c:1252 +#: fetch-pack.c:1376 #, c-format msgid "error processing acks: %d" msgstr "error procesando acks: %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1386 msgid "expected packfile to be sent after 'ready'" msgstr "espere que el packfile sea mandado luego del 'listo'" -#: fetch-pack.c:1264 +#: fetch-pack.c:1388 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:1306 +#: fetch-pack.c:1430 #, c-format msgid "error processing shallow info: %d" msgstr "error procesando informaciรณn superficial: %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1477 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "se esperaba wanted-ref, se obtuvo '%s'" -#: fetch-pack.c:1358 +#: fetch-pack.c:1482 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inesperado: '%s'" -#: fetch-pack.c:1363 +#: fetch-pack.c:1487 #, c-format msgid "error processing wanted refs: %d" msgstr "error procesando refs deseadas: %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1517 +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack: se espera un paquete final de respuesta" + +#: fetch-pack.c:1921 msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1944 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "remoto no mando todos los objetos necesarios" -#: fetch-pack.c:1739 +#: fetch-pack.c:1971 #, c-format msgid "no such remote ref %s" msgstr "no existe ref remota %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1974 #, 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:321 -msgid "gpg failed to sign the data" -msgstr "gpg fallรณ al firmar la data" - -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "no se pudo crear archivo temporal" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "fallรณ al escribir la firma separada para '%s'" -#: graph.c:97 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg fallรณ al firmar la data" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora color invรกlido '%.*s' en log.graphColors" -#: grep.c:2117 +#: 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 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "fallรณ al marcar '%s'" -#: grep.c:2145 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "'%s': lectura corta" @@ -3396,7 +4212,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Comandos de bajo nivel / Interrogadores" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Comandos de bajo nivel / Sincronizaciรณn de repositorios" #: help.c:38 @@ -3416,7 +4232,7 @@ msgstr "comandos disponibles de git desde otro lugar en tu $PATH" msgid "These are common Git commands used in various situations:" msgstr "Estos son comandos comunes de Git usados en varias situaciones:" -#: help.c:363 git.c:98 +#: help.c:363 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "comando de listado de tipos no soportado '%s'" @@ -3425,52 +4241,52 @@ msgstr "comando de listado de tipos no soportado '%s'" msgid "The common Git guides are:" msgstr "Las guรญas comunes de Git son:" -#: help.c:512 +#: help.c:427 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "Vea 'git help <comando>' para leer sobre los subcomandos especรญficos" -#: help.c:517 +#: help.c:432 msgid "External commands" msgstr "Comandos externos" -#: help.c:532 +#: help.c:447 msgid "Command aliases" msgstr "Aliases de comando" -#: help.c:596 +#: help.c:511 #, 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' 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 +#: help.c:570 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oh oh. Tu sistema no reporta ningรบn comando de Git." -#: help.c:677 +#: help.c:592 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe." -#: help.c:682 +#: help.c:597 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Continuando asumiendo que quisiste decir '%s'." -#: help.c:687 +#: help.c:602 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'." -#: help.c:695 +#: help.c:610 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s'no es un comando de git. Mira 'git --help'." -#: help.c:699 +#: help.c:614 msgid "" "\n" "The most similar command is" @@ -3484,16 +4300,16 @@ msgstr[1] "" "\n" "Los comandos mรกs similares son" -#: help.c:714 +#: help.c:654 msgid "git version [<options>]" msgstr "git versiรณn [<opciones>]" -#: help.c:782 +#: help.c:709 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:713 msgid "" "\n" "Did you mean this?" @@ -3561,48 +4377,69 @@ 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:611 +#: ident.c:436 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "formato de fecha invรกlido: %s" -#: 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-filter-options.c:58 +msgid "expected 'tree:<depth>'" +msgstr "se esperaba 'tree:<depth>'" -#: list-objects.c:142 +#: list-objects-filter-options.c:73 +msgid "sparse:path filters support has been dropped" +msgstr "soporte para filtros sparse:path ha sido discontinuado" + +#: list-objects-filter-options.c:86 #, 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" +msgid "invalid filter-spec '%s'" +msgstr "filtro -spec invรกlido '%s'" -#: list-objects.c:378 +#: list-objects-filter-options.c:102 #, c-format -msgid "unable to load root tree for commit %s" -msgstr "no se puede cargar รกrbol raรญz para commit %s" +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:36 +#: 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:58 -msgid "expected 'tree:<depth>'" -msgstr "se esperaba 'tree:<depth>'" +#: list-objects-filter-options.c:330 +msgid "unable to upgrade repository format to support partial clone" +msgstr "" +"no es posible actualizar el formato del repositorio para soportar clonado " +"parcial" -#: 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.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "no es posible acceder al blob en '%s'" -#: list-objects-filter-options.c:94 +#: list-objects-filter.c:495 #, c-format -msgid "invalid filter-spec '%s'" -msgstr "filtro -spec invรกlido '%s'" +msgid "unable to parse sparse filter data in %s" +msgstr "incapaz de analizar filtro de data en %s" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "no se puede cambiar un clon parcial remoto promisor" +#: list-objects.c:127 +#, 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 +#, 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" -#: lockfile.c:151 +#: list-objects.c:375 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "no se puede cargar รกrbol raรญz para commit %s" + +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -3622,124 +4459,114 @@ msgstr "" "puede haber roto el repositorio antes:\n" "borra el archivo manualmente para continuar." -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "No se pudo crear '%s.lock': %s" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "fallรณ al leer la cache" - -#: 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" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "se esperaba un flush luego de argumentos ls-refs" -#: merge-recursive.c:322 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(commit errรณneo)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, 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:354 +#: merge-recursive.c:388 #, 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:437 -msgid "error building trees" -msgstr "error construyendo รกrboles" - -#: merge-recursive.c:863 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "fallรณ al crear la ruta '%s'%s" -#: merge-recursive.c:874 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Removiendo %s para hacer espacio para un subdirectorio\n" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" -msgstr ": tal vez un conflicto D/F?" +msgstr ": ยฟtal vez un conflicto D/F?" -#: merge-recursive.c:897 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "rehusando perder el archivo rastreado en '%s'" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "no se puede leer el objeto %s '%s'" -#: merge-recursive.c:941 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "se esperaba blob para %s '%s'" -#: merge-recursive.c:965 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "fallรณ al abrir '%s': %s" -#: merge-recursive.c:976 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "fallรณ al crear el enlace simbรณlico '%s': %s" -#: merge-recursive.c:981 +#: merge-recursive.c:995 #, 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:1177 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Fallรณ al fusionar el submรณdulo %s (no revisado)" -#: merge-recursive.c:1184 +#: merge-recursive.c:1198 #, 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:1191 +#: merge-recursive.c:1205 #, 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:1199 merge-recursive.c:1211 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, 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:1202 merge-recursive.c:1214 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rรกpido en submรณdulo %s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1251 #, 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:1241 +#: merge-recursive.c:1255 #, 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:1242 +#: merge-recursive.c:1256 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:1245 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3756,33 +4583,33 @@ msgstr "" "\n" "el cual aceptarรก esta sugerencia.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1268 #, 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:1327 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "Fallรณ al ejecutar la fusiรณn interna" -#: merge-recursive.c:1332 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "No es posible agregar %s a la base de datos" -#: merge-recursive.c:1364 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "Auto-fusionando %s" -#: merge-recursive.c:1387 +#: merge-recursive.c:1402 #, 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:1459 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3791,7 +4618,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:1464 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3800,7 +4627,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:1471 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3809,7 +4636,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:1476 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3818,44 +4645,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:1511 +#: merge-recursive.c:1526 msgid "rename" msgstr "renombrar" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "renamed" msgstr "renombrado" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Rehusando perder el archivo sucio en %s" -#: merge-recursive.c:1601 +#: merge-recursive.c:1587 #, 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:1659 +#: merge-recursive.c:1645 #, 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:1690 +#: merge-recursive.c:1676 #, 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:1695 +#: merge-recursive.c:1681 #, 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:1714 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3864,18 +4691,18 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" " "renombrar \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1719 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (dejado sin resolver)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1805 #, 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:2035 +#: merge-recursive.c:2068 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3886,7 +4713,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:2067 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3896,7 +4723,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:2077 +#: merge-recursive.c:2110 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3905,7 +4732,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:2169 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3914,7 +4741,7 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. " "Renombrar directorio %s->%s en %s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3923,52 +4750,52 @@ msgstr "" "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " "renombrado." -#: merge-recursive.c:2938 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "no se pudo leer el objeto %s" -#: merge-recursive.c:2941 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "objeto %s no es un blob" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modify" msgstr "modificar" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modified" msgstr "modificado" -#: merge-recursive.c:3017 +#: merge-recursive.c:3052 msgid "content" msgstr "contenido" -#: merge-recursive.c:3021 +#: merge-recursive.c:3056 msgid "add/add" msgstr "agregar/agregar" -#: merge-recursive.c:3044 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Saltado %s (fusionado como existente)" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3101 git-submodule.sh:959 msgid "submodule" msgstr "submรณdulo" -#: merge-recursive.c:3067 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTO (%s): Conflicto de fusiรณn en %s" -#: merge-recursive.c:3097 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Agregando mรกs bien como %s" -#: merge-recursive.c:3179 +#: merge-recursive.c:3215 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -3977,7 +4804,7 @@ msgstr "" "Path actualizado: %s agregado en %s dentro de un directorio que fue " "renombrado en %s; moviรฉndolo a %s." -#: merge-recursive.c:3182 +#: merge-recursive.c:3218 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -3986,7 +4813,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:3186 +#: merge-recursive.c:3222 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -3995,7 +4822,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:3189 +#: merge-recursive.c:3225 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4005,140 +4832,150 @@ msgstr "" "directorio que fue renombrado en %s, sugiriendo que tal vez deberรญa ser " "movido a %s." -#: merge-recursive.c:3303 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: merge-recursive.c:3326 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "archivo/directorio" -#: merge-recursive.c:3331 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "directorio/archivo" -#: merge-recursive.c:3338 +#: merge-recursive.c:3374 #, 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:3347 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "Agregando %s" -#: merge-recursive.c:3356 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTO (add/add): Conflicto de merge en %s" -#: 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 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "ยกYa estรก actualizado!" -#: merge-recursive.c:3414 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "fallรณ la fusiรณn de los รกrboles %s y %s" -#: merge-recursive.c:3513 +#: merge-recursive.c:3549 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:3526 +#: merge-recursive.c:3562 #, 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:3565 +#: merge-recursive.c:3612 msgid "merge returned no commit" msgstr "la fusiรณn no devolviรณ ningรบn commit" -#: merge-recursive.c:3631 +#: merge-recursive.c:3671 +#, 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:3768 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 msgid "Unable to write index." msgstr "Incapaz de escribir el รญndice." -#: midx.c:69 +#: merge.c:41 +msgid "failed to read the cache" +msgstr "fallรณ al leer la cache" + +#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 +#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "no es posible escribir el archivo รญndice" + +#: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" msgstr "archivo multi-pack-index %s es muy pequeรฑo" -#: midx.c:85 +#: midx.c:84 #, 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:90 +#: midx.c:89 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versiรณn %d de multi-pack-index no reconocida" -#: midx.c:95 +#: midx.c:94 #, c-format msgid "hash version %u does not match" msgstr "versiรณn de hash %u no concuerda" -#: midx.c:109 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "offset invรกlido del conjunto (muy grande)" -#: midx.c:133 +#: midx.c:132 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:146 +#: midx.c:145 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index le falta el conjunto pack-name requerido" -#: midx.c:148 +#: midx.c:147 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:150 +#: midx.c:149 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:152 +#: midx.c:151 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido" -#: midx.c:166 +#: midx.c:165 #, 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:211 +#: midx.c:208 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mal pack-int-id: %u (%u paquetes totales)" -#: midx.c:261 +#: midx.c:258 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:289 +#: midx.c:286 msgid "error preparing packfile from multi-pack-index" msgstr "error preparando packfile de multi-pack-index" @@ -4157,78 +4994,102 @@ msgstr "fallรณ al abrir pack-index '%s'" msgid "failed to locate object %d in packfile" msgstr "fallรณ al ubicar objeto %d en packfile" -#: midx.c:865 +#: midx.c:840 +msgid "Adding packfiles to multi-pack-index" +msgstr "Agregando packfiles a multi-pack-index" + +#: midx.c:873 #, c-format msgid "did not see pack-file %s to drop" msgstr "no se viรณ pack-file %s caer" -#: midx.c:1036 +#: midx.c:925 +msgid "no pack files to index." +msgstr "no hay archivos pack para indexar." + +#: midx.c:977 +msgid "Writing chunks to multi-pack-index" +msgstr "Escribiendo chunks a multi-pack-index" + +#: midx.c:1056 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "fallรณ al limpiar multi-pack-index en %s" -#: midx.c:1091 +#: midx.c:1112 msgid "Looking for referenced packfiles" msgstr "Buscando por packfiles referidos" -#: midx.c:1106 +#: midx.c:1127 #, 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:1110 -msgid "Verifying OID order in MIDX" -msgstr "Verificando orden de OID en MIDX" +#: midx.c:1132 +msgid "the midx contains no oid" +msgstr "el midx no contiene oid" + +#: midx.c:1141 +msgid "Verifying OID order in multi-pack-index" +msgstr "Verificando orden de OID en multi-pack-index" -#: midx.c:1119 +#: midx.c:1150 #, 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:1138 +#: midx.c:1170 msgid "Sorting objects by packfile" msgstr "Ordenando objetos por packfile" -#: midx.c:1144 +#: midx.c:1177 msgid "Verifying object offsets" msgstr "Verificando offsets de objetos" -#: midx.c:1160 +#: midx.c:1193 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "fallo al cargar entrada pack para oid[%d] = %s" -#: midx.c:1166 +#: midx.c:1199 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "fallรณ al cargar el pack-index para packfile %s" -#: midx.c:1175 +#: midx.c:1208 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1350 +#: midx.c:1233 +msgid "Counting referenced objects" +msgstr "Contando objetos no referenciados" + +#: midx.c:1243 +msgid "Finding and deleting unreferenced packfiles" +msgstr "Encontrando y borrando packfiles sin referencias" + +#: midx.c:1433 msgid "could not start pack-objects" msgstr "no se pudo empezar los pack-objetcts" -#: midx.c:1369 +#: midx.c:1452 msgid "could not finish pack-objects" msgstr "no se pudo finalizar pack-objetcts" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "no es posible crear hilo lazy_dir: %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "no es posible crear hilo lazy_name: %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "no es posible unir hilo lazy_name: %s" @@ -4275,46 +5136,71 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Valor errรณneo para %s: '%s'" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "tipo de objeto \"%s\" invรกlido" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "objeto %s es un %s, no un %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "el objeto %s tiene un id de tipo desconocido %d" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "incapaz de analizar objeto: %s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "hash no concuerda %s" -#: packfile.c:648 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184 +#, c-format +msgid "unable to get size of %s" +msgstr "no se pudo obtener el tamaรฑo de %s" + +#: packfile.c:630 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes del final del paquete (broken .idx?)" -#: packfile.c:1899 +#: packfile.c:1900 #, 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 +#: packfile.c:1904 #, 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?)" +"offset mรกs allรก del รญndice de fin de paquete para %s (ยฟรญndice truncado?)" + +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "opciรณn `%s' espera un valor numรฉrico" + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "fecha de expiraciรณn mal formada: '%s'" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "opciรณn `%s' puede usar \"always\", \"auto\", o \"never\"" + +#: parse-options-cb.c:130 parse-options-cb.c:147 +#, c-format +msgid "malformed object name '%s'" +msgstr "nombre de objeto mal formado '%s'" #: parse-options.c:38 #, c-format @@ -4331,7 +5217,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:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "%s no toma valores" @@ -4341,41 +5227,46 @@ msgstr "%s no toma valores" msgid "%s isn't available" msgstr "%s no estรก disponible" -#: parse-options.c:219 +#: parse-options.c:217 #, 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:389 +#: parse-options.c:386 #, 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:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, 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:859 +#: parse-options.c:663 parse-options.c:963 +#, c-format +msgid "alias of --%s" +msgstr "alias de --%s" + +#: parse-options.c:854 #, c-format msgid "unknown option `%s'" msgstr "opciรณn `%s' desconocida" -#: parse-options.c:861 +#: parse-options.c:856 #, c-format msgid "unknown switch `%c'" msgstr "switch desconocido `%c'" -#: parse-options.c:863 +#: parse-options.c:858 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opciรณn desconocida en string no ascii: `%s'" -#: parse-options.c:887 +#: parse-options.c:882 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:901 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -4383,74 +5274,49 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:907 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:915 +#: parse-options.c:910 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:949 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:968 -#, c-format -msgid "alias of --%s" -msgstr "alias de --%s" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "opciรณn `%s' espera un valor numรฉrico" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "fecha de expiraciรณn mal formada: '%s'" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "opciรณn `%s' puede usar \"always\", \"auto\", o \"never\"" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "nombre de objeto mal formado '%s'" - -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "No se pudo hacer que %s fuera escribible por el grupo" -#: pathspec.c:128 +#: pathspec.c:130 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:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Solo una especificaciรณn 'attr' es permitida." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "especificaciรณn attr no puede estar vacรญa" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "nombre de atributo %s invรกlido" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4458,50 +5324,55 @@ 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:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "parรกmetro no vรกlido para el prefijo 'magic pathspec'" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Magic pathspec invรกlido '%.*s' en '%s'" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Falta ')' al final del magic pathspec en '%s'" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Magic pathspec '%c' no implementado en '%s'" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' y 'glob' son incompatibles" -#: pathspec.c:440 +#: pathspec.c:445 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: '%s' estรก fuera del repositorio" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: '%s' estรก fuera del repositorio en '%s'" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (nemotรฉcnico: '%c')" -#: pathspec.c:524 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: magic pathspec no soportado por este comando: %s" -#: pathspec.c:591 +#: pathspec.c:598 #, 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:643 +#, 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" @@ -4511,44 +5382,48 @@ msgid "unable to write delim packet" msgstr "no es posible escribir delim packet" #: pkt-line.c:106 +msgid "unable to write stateless separator packet" +msgstr "no es posible escribir un paquete separador sin estado (stateless)" + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "limpieza de escritura de paquetes fallรณ" -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "error de protocolo: lรญnea imposiblemente larga" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "escritura de paquetes con formato fallรณ" -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "fallo al escribir paquete - la data excede al tamaรฑo mรกximo de paquete" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "escritura de paquetes fallรณ" -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "error de lectura" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "el remoto se colgรณ de manera inesperada" -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "error de protocolo: mal caracter de largo de lรญnea: %.4s" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "error de protocolo: mal largo de lรญnea %d" -#: pkt-line.c:362 +#: pkt-line.c:373 #, c-format msgid "remote error: %s" msgstr "error remoto: %s" @@ -4562,33 +5437,55 @@ msgstr "Refrescando index" msgid "unable to create threaded lstat: %s" msgstr "no es posible crear lstat hilado: %s" -#: pretty.c:966 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "incapaz de analizar el formato --pretty" -#: range-diff.c:70 +#: 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" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "Removiendo objetos duplicados" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "no se pudo comenzar `log`" -#: range-diff.c:72 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "no se pudo leer output de `log`" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:98 sequencer.c:5143 #, c-format msgid "could not parse commit '%s'" msgstr "no se pudo analizar commit '%s'" -#: range-diff.c:117 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" +"no se pudo leer la primera lรญnea de salida `log`: no comienza con 'commit ': " +"'%s'" + +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "no se puede analizar git header '%.*s'" -#: range-diff.c:274 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "fallรณ al generar diff" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "no se pudo leer el log para '%s'" @@ -4628,16 +5525,16 @@ msgstr "no es posible agregar '%s' al index" msgid "unable to stat '%s'" msgstr "incapaz de correr stat en '%s'" -#: read-cache.c:1314 +#: read-cache.c:1330 #, 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:1499 +#: read-cache.c:1536 msgid "Refresh index" msgstr "Refrescar index" -#: read-cache.c:1613 +#: read-cache.c:1651 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4646,7 +5543,7 @@ msgstr "" "index.version configurado, pero el valor no es vรกlido.\n" "Usando versiรณn %i" -#: read-cache.c:1623 +#: read-cache.c:1661 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4655,150 +5552,161 @@ msgstr "" "GIT_INDEX_VERSION configurado, pero el valor no es vรกlido.\n" "Usando versiรณn %i" -#: read-cache.c:1679 +#: read-cache.c:1717 #, c-format msgid "bad signature 0x%08x" msgstr "mala firma 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1720 #, c-format msgid "bad index version %d" msgstr "mala versiรณn del รญndice %d" -#: read-cache.c:1691 +#: read-cache.c:1729 msgid "bad index file sha1 signature" msgstr "mala firma sha1 del archivo index" -#: read-cache.c:1721 +#: read-cache.c:1759 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "index usa %.4s extensiones, cosa que no entendemos" -#: read-cache.c:1723 +#: read-cache.c:1761 #, c-format msgid "ignoring %.4s extension" msgstr "ignorando extensiรณn %.4s" -#: read-cache.c:1760 +#: read-cache.c:1798 #, c-format msgid "unknown index entry format 0x%08x" msgstr "formato de index desconocido 0x%08x" -#: read-cache.c:1776 +#: read-cache.c:1814 #, 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:1833 +#: read-cache.c:1871 msgid "unordered stage entries in index" msgstr "entradas en stage desordenadas en index" -#: read-cache.c:1836 +#: read-cache.c:1874 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "mรบltiples entradas extraรฑas para archivo fusionado '%s'" -#: read-cache.c:1839 +#: read-cache.c:1877 #, c-format msgid "unordered stage entries for '%s'" msgstr "entradas de stage desordenadas para '%s'" -#: 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 +#: 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:488 builtin/checkout.c:674 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "archivo รญndice corrompido" -#: read-cache.c:2087 +#: read-cache.c:2124 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "no es posible crear hilo load_cache_entries: %s" -#: read-cache.c:2100 +#: read-cache.c:2137 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "no es posible unir hilo load_cache_entires: %s" -#: read-cache.c:2133 +#: read-cache.c:2170 #, c-format msgid "%s: index file open failed" msgstr "%s: fallรณ al abrir el archivo index" -#: read-cache.c:2137 +#: read-cache.c:2174 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: no se puede hacer stat del index abierto" -#: read-cache.c:2141 +#: read-cache.c:2178 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: archivo index mรกs pequeรฑo de lo esperado" -#: read-cache.c:2145 +#: read-cache.c:2182 #, c-format msgid "%s: unable to map index file" msgstr "%s: no se pudo mapear el archivo index" -#: read-cache.c:2187 +#: read-cache.c:2224 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "no es posible crear hilo load_index_extensions: %s" -#: read-cache.c:2214 +#: read-cache.c:2251 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "no es posible unir hilo load_index_extensions: %s" -#: read-cache.c:2246 +#: read-cache.c:2283 #, c-format msgid "could not freshen shared index '%s'" msgstr "no se pudo refrescar el index compartido '%s'" -#: read-cache.c:2293 +#: read-cache.c:2330 #, 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:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066 #, c-format msgid "could not stat '%s'" msgstr "no se pudo definir '%s'" -#: read-cache.c:3105 +#: read-cache.c:3142 #, c-format msgid "unable to open git dir: %s" msgstr "no es posible abrir el directorio de git: %s" -#: read-cache.c:3117 +#: read-cache.c:3154 #, c-format msgid "unable to unlink: %s" msgstr "no es posible eliminar el vinculo: %s" -#: read-cache.c:3142 +#: read-cache.c:3179 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "no se pudo arreglar bits de permisos en '%s'" -#: read-cache.c:3291 +#: read-cache.c:3328 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: no se puede eliminar a stage #0" -#: rebase-interactive.c:26 +#: 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 #, 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:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -4840,14 +5748,14 @@ msgstr "" "Estas lรญneas pueden ser reordenadas; son ejecutadas desde arriba hacia " "abajo.\n" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, 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:65 git-rebase--preserve-merges.sh:228 +#: 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" @@ -4855,15 +5763,15 @@ msgstr "" "\n" "No eliminar ninguna lรญnea. Usa 'drop' explรญcitamente para borrar un commit \n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: 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" -"Si remueves una lรญnea aquรญ EL COMMIT SE PERDERร.\n" +"Si eliminas una lรญnea aquรญ EL COMMIT SE PERDERร.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4877,7 +5785,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4887,22 +5795,19 @@ msgstr "" "Como sea, si quieres borrar todo, el rebase serรก abortado.\n" "\n" -#: 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 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463 +#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258 #, c-format msgid "could not write '%s'" msgstr "no se pudo escribir '%s'" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216 +#: builtin/rebase.c:240 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "no se pudo copiar '%s' a '%s'." +msgid "could not write '%s'." +msgstr "no se pudo escribir '%s'." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -4911,7 +5816,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:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -4929,124 +5834,14 @@ msgstr "" "Los posibles comportamientos son: ignore,warn,error.\n" "\n" -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -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:2092 -#, c-format -msgid "ignoring broken ref %s" -msgstr "ignorando referencia rota %s" - -#: refs.c:804 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "no se pudo abrir '%s' para escritura: %s" - -#: refs.c:814 refs.c:865 -#, c-format -msgid "could not read ref '%s'" -msgstr "no se pudo leer la referencia '%s'" - -#: refs.c:820 -#, c-format -msgid "ref '%s' already exists" -msgstr "ref '%s' ya existe" - -#: refs.c:825 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "ID de objecto inesperado cuando se escribรญa '%s'" - -#: 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 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" - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "ID de objecto inesperado cuando se borraba '%s'" - -#: refs.c:998 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "log de ref %s tiene un vacรญo tras %s" - -#: refs.c:1004 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "log de ref %s finalizado inesperadamente en %s" - -#: refs.c:1063 -#, c-format -msgid "log for %s is empty" -msgstr "log de %s estรก vacรญo" - -#: refs.c:1155 -#, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "rehusando actualizar ref con mal nombre '%s'" - -#: refs.c:1231 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "update_ref fallรณ para ref '%s': %s" - -#: refs.c:2012 -#, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "mรบltiples actualizaciones para ref '%s' no permitidas" - -#: refs.c:2044 -msgid "ref updates forbidden inside quarantine environment" -msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" - -#: refs.c:2140 refs.c:2170 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "'%s' existe; no se puede crear '%s'" - -#: 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:1234 -#, c-format -msgid "could not remove reference %s" -msgstr "no se pudo eliminar la referencia %s" - -#: 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:1251 refs/packed-backend.c:1545 -#, c-format -msgid "could not delete references: %s" -msgstr "no se pudo eliminar la referencia: %s" - -#: refspec.c:137 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 +#: builtin/rebase.c:252 #, c-format -msgid "invalid refspec '%s'" -msgstr "refspec invรกlido: '%s'" +msgid "could not read '%s'." +msgstr "no se puede leer '%s'." -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1977 msgid "gone" msgstr "desaparecido" @@ -5065,281 +5860,413 @@ msgstr "detrรกs %d" msgid "ahead %d, behind %d" msgstr "delante %d, detrรกs %d" -#: ref-filter.c:162 +#: ref-filter.c:165 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato esperado: %%(color:<color>)" -#: ref-filter.c:164 +#: ref-filter.c:167 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconocido: %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:189 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valor entero esperado refname:lstrip=%s" -#: ref-filter.c:190 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valor entero esperado refname:rstrip=%s" -#: ref-filter.c:192 +#: ref-filter.c:195 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argumento: %s no reconocido %%(%s)" -#: ref-filter.c:247 +#: ref-filter.c:250 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) no toma ningรบn argumento" -#: ref-filter.c:269 +#: ref-filter.c:272 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "%%(objectsize) no reconocido argumento: %s" -#: ref-filter.c:277 +#: ref-filter.c:280 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) no toma argumentos" -#: ref-filter.c:289 +#: ref-filter.c:292 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no toma ningรบn argumento" -#: ref-filter.c:298 +#: ref-filter.c:301 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) no toma ningรบn argumento" -#: ref-filter.c:320 +#: ref-filter.c:323 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "%%(trailers) desconocidos, argumento: %s" -#: ref-filter.c:349 +#: ref-filter.c:352 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:354 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argumento %s no reconocido %%(contents)" -#: ref-filter.c:366 +#: ref-filter.c:369 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valor positivo esperado objectname:short=%s" -#: ref-filter.c:370 +#: ref-filter.c:373 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argumento: %s no reconocido %%(objectname)" -#: ref-filter.c:400 +#: ref-filter.c:403 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato esperado: %%(align:<ancho>,<posiciรณn>)" -#: ref-filter.c:412 +#: ref-filter.c:415 #, c-format msgid "unrecognized position:%s" msgstr "posiciรณn desconocida: %s" -#: ref-filter.c:419 +#: ref-filter.c:422 #, c-format msgid "unrecognized width:%s" msgstr "ancho desconocido: %s" -#: ref-filter.c:428 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argumento no reconocido para %%(align): %s" -#: ref-filter.c:436 +#: ref-filter.c:439 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "se esperaba un ancho positivo con el รกtomo %%(align)" -#: ref-filter.c:454 +#: ref-filter.c:457 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argumento: %s no reconocido %%(if)" -#: ref-filter.c:556 +#: ref-filter.c:559 #, c-format msgid "malformed field name: %.*s" msgstr "nombre mal formado de campo: %.*s" -#: ref-filter.c:583 +#: ref-filter.c:586 #, c-format msgid "unknown field name: %.*s" msgstr "nombre de campo desconocido: %.*s" -#: ref-filter.c:587 +#: ref-filter.c:590 #, 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:711 +#: ref-filter.c:714 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: รกtomo %%(if) usado sin un รกtomo %%(then)" -#: ref-filter.c:774 +#: ref-filter.c:777 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: รกtomo %%(then) usado sin รกtomo %%(if)" -#: ref-filter.c:776 +#: ref-filter.c:779 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: รกtomo %%(then) usado mรกs de una vez" -#: ref-filter.c:778 +#: ref-filter.c:781 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: รกtomo %%(then) usado despuรฉs de %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:809 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: รกtomo %%(else) usado sin un รกtomo %%(if)" -#: ref-filter.c:808 +#: ref-filter.c:811 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: รกtomo %%(else) usado sin un รกtomo %%(then)" -#: ref-filter.c:810 +#: ref-filter.c:813 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: รกtomo %%(else) usado mรกs de una vez" -#: ref-filter.c:825 +#: ref-filter.c:828 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: รกtomo %%(end) usado sin รกtomo correspondiente" -#: ref-filter.c:882 +#: ref-filter.c:885 #, c-format msgid "malformed format string %s" msgstr "formato de cadena mal formado %s" -#: ref-filter.c:1485 +#: ref-filter.c:1486 #, c-format msgid "no branch, rebasing %s" msgstr "no hay rama, rebasando %s" -#: ref-filter.c:1488 +#: ref-filter.c:1489 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "(o hay rama, rebasando con HEAD desacoplado %s" -#: ref-filter.c:1491 +#: ref-filter.c:1492 #, c-format msgid "no branch, bisect started on %s" msgstr "no hay rama, comenzando biseccรณn en %s" -#: ref-filter.c:1501 +#: ref-filter.c:1502 msgid "no branch" msgstr "sin rama" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1538 ref-filter.c:1747 #, c-format msgid "missing object %s for %s" msgstr "falta objeto %s para %s" -#: ref-filter.c:1547 +#: ref-filter.c:1548 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer fallรณ en %s para %s" -#: ref-filter.c:1998 +#: ref-filter.c:2001 #, c-format msgid "malformed object at '%s'" msgstr "objeto mal formado en '%s'" -#: ref-filter.c:2087 +#: ref-filter.c:2090 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorando referencia con nombre roto %s" -#: ref-filter.c:2382 +#: ref-filter.c:2095 refs.c:657 +#, c-format +msgid "ignoring broken ref %s" +msgstr "ignorando referencia rota %s" + +#: ref-filter.c:2395 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta รกtomo %%(end)" -#: ref-filter.c:2482 +#: ref-filter.c:2495 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "opciรณn `%s' es incompatible con --merged" -#: ref-filter.c:2485 +#: ref-filter.c:2498 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "opciรณn `%s' es incompatible con --no-merged" -#: ref-filter.c:2495 +#: ref-filter.c:2508 #, c-format msgid "malformed object name %s" msgstr "nombre de objeto mal formado %s" -#: ref-filter.c:2500 +#: ref-filter.c:2513 #, c-format msgid "option `%s' must point to a commit" msgstr "opciรณn '%s' debe apuntar a un commit" -#: remote.c:363 +#: refs.c:264 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "ยก%s no apunta a ningรบn objeto vรกlido!" + +#: refs.c:572 +#, c-format +msgid "could not retrieve `%s`" +msgstr "no se pudo recibir `%s`" + +#: refs.c:579 +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "Nombre de rama invรกlido: %s = %s" + +#: refs.c:655 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "ignorando referencia rota %s" + +#: refs.c:792 +#, c-format +msgid "could not open '%s' for writing: %s" +msgstr "no se pudo abrir '%s' para escritura: %s" + +#: refs.c:802 refs.c:853 +#, c-format +msgid "could not read ref '%s'" +msgstr "no se pudo leer la referencia '%s'" + +#: refs.c:808 +#, c-format +msgid "ref '%s' already exists" +msgstr "ref '%s' ya existe" + +#: refs.c:813 +#, c-format +msgid "unexpected object ID when writing '%s'" +msgstr "ID de objecto inesperado al escribir '%s'" + +#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168 +#: wrapper.c:628 +#, c-format +msgid "could not write to '%s'" +msgstr "no se pudo escribir en '%s'" + +#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719 +#: builtin/rebase.c:852 +#, c-format +msgid "could not open '%s' for writing" +msgstr "no se pudo abrir '%s' para escritura" + +#: refs.c:855 +#, c-format +msgid "unexpected object ID when deleting '%s'" +msgstr "ID de objecto inesperado al borrar '%s'" + +#: refs.c:986 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "log de ref %s tiene un vacรญo tras %s" + +#: refs.c:992 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "log de ref %s finalizado inesperadamente en %s" + +#: refs.c:1051 +#, c-format +msgid "log for %s is empty" +msgstr "log de %s estรก vacรญo" + +#: refs.c:1143 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "rehusando actualizar ref con mal nombre '%s'" + +#: refs.c:1219 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "update_ref fallรณ para ref '%s': %s" + +#: refs.c:2011 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "mรบltiples actualizaciones para ref '%s' no permitidas" + +#: refs.c:2098 +msgid "ref updates forbidden inside quarantine environment" +msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" + +#: refs.c:2109 +msgid "ref updates aborted by hook" +msgstr "ref update abortado por el hook" + +#: refs.c:2209 refs.c:2239 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "'%s' existe; no se puede crear '%s'" + +#: refs.c:2215 refs.c:2250 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "could not delete references: %s" +msgstr "no se pudo eliminar la referencia: %s" + +#: refspec.c:137 +#, c-format +msgid "invalid refspec '%s'" +msgstr "refspec invรกlido: '%s'" + +#: remote.c:355 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "config remote shorthand no puede comenzar con '/': %s" -#: remote.c:410 +#: remote.c:403 msgid "more than one receivepack given, using the first" msgstr "mรกs de un receivepack dado, usando el primero" -#: remote.c:418 +#: remote.c:411 msgid "more than one uploadpack given, using the first" msgstr "mรกs de un uploadpack dado, usando el primero" -#: remote.c:608 +#: remote.c:594 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No se pueden traer ambos %s y %s a %s" -#: remote.c:612 +#: remote.c:598 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s por lo general hace seguimiento a %s, no a %s" -#: remote.c:616 +#: remote.c:602 #, c-format msgid "%s tracks both %s and %s" msgstr "%s hace seguimiento tanto a %s como a %s" -#: remote.c:684 +#: remote.c:670 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "llave '%s' de patrรณn no tuvo '*'" -#: remote.c:694 +#: remote.c:680 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "valor '%s' del patrรณn no tiene '*'" -#: remote.c:1000 +#: remote.c:986 #, c-format msgid "src refspec %s does not match any" msgstr "src refsoec %s: no concuerda con ninguno" -#: remote.c:1005 +#: remote.c:991 #, c-format msgid "src refspec %s matches more than one" msgstr "src refspec %s concuerda con mรกs de uno" @@ -5348,7 +6275,7 @@ msgstr "src refspec %s concuerda con mรกs de uno" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1006 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5372,7 +6299,7 @@ msgstr "" "Ninguno funcionรณ asรญ que nos dimos por vencidos. Tienes que especificar el " "full ref." -#: remote.c:1040 +#: remote.c:1026 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5383,7 +6310,7 @@ msgstr "" "ยฟQuisiste crear un branch nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1045 +#: remote.c:1031 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5394,7 +6321,7 @@ msgstr "" "Did you mean to create a new tag by pushing to\n" "'%s:refs/tags/%s'?" -#: remote.c:1050 +#: remote.c:1036 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5405,7 +6332,7 @@ msgstr "" "ยฟQuisiste crear un tag nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1055 +#: remote.c:1041 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5416,115 +6343,115 @@ msgstr "" "ยฟQuisiste crear un tag nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1091 +#: remote.c:1077 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s no puede ser resolver a un branch" -#: remote.c:1102 +#: remote.c:1088 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "no es posible borrar '%s': ref remoto no existe" -#: remote.c:1114 +#: remote.c:1100 #, c-format msgid "dst refspec %s matches more than one" msgstr "dst refspec %s concuerda con mรกs de uno" -#: remote.c:1121 +#: remote.c:1107 #, 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:1624 remote.c:1725 +#: remote.c:1610 remote.c:1711 msgid "HEAD does not point to a branch" msgstr "HEAD no apunta a ninguna rama" -#: remote.c:1633 +#: remote.c:1619 #, c-format msgid "no such branch: '%s'" msgstr "no existe tal rama: '%s'" -#: remote.c:1636 +#: remote.c:1622 #, c-format msgid "no upstream configured for branch '%s'" msgstr "no se ha configurado upstream para la rama '%s'" -#: remote.c:1642 +#: remote.c:1628 #, 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:1657 +#: remote.c:1643 #, 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:1669 +#: remote.c:1655 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la rama '%s' no tiene remoto para enviar" -#: remote.c:1679 +#: remote.c:1665 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "refspecs del push para '%s' no incluyen '%s'" -#: remote.c:1692 +#: remote.c:1678 msgid "push has no destination (push.default is 'nothing')" msgstr "push no tiene destino (push.default es 'nada')" -#: remote.c:1714 +#: remote.c:1700 msgid "cannot resolve 'simple' push to a single destination" msgstr "no se puede resolver push 'simple' para un destino รบnico" -#: remote.c:1840 +#: remote.c:1826 #, c-format msgid "couldn't find remote ref %s" msgstr "no se puedo encontrar ref remota %s" -#: remote.c:1853 +#: remote.c:1839 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorando ref graciosa '%s' localmente" -#: remote.c:2016 +#: remote.c:2002 #, 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:2020 +#: remote.c:2006 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n" -#: remote.c:2023 +#: remote.c:2009 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Tu rama estรก actualizada con '%s'.\n" -#: remote.c:2027 +#: remote.c:2013 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Tu rama y '%s' refieren a commits diferentes.\n" -#: remote.c:2030 +#: remote.c:2016 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (usa \"%s\" para detalles)\n" -#: remote.c:2034 +#: remote.c:2020 #, 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:2040 +#: remote.c:2026 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" para publicar tus commits locales)\n" -#: remote.c:2043 +#: remote.c:2029 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5534,11 +6461,11 @@ msgstr[0] "" msgstr[1] "" "Tu rama estรก detrรกs de '%s' por %d commits, y puede ser avanzada rรกpido.\n" -#: remote.c:2051 +#: remote.c:2037 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" para actualizar tu rama local)\n" -#: remote.c:2054 +#: remote.c:2040 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5553,11 +6480,11 @@ msgstr[1] "" "Tu rama y '%s' han divergido,\n" "y tienen %d y %d commits diferentes cada una respectivamente.\n" -#: remote.c:2064 +#: remote.c:2050 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:2247 +#: remote.c:2241 #, c-format msgid "cannot parse expected object name '%s'" msgstr "no se puede leer el nombre de objeto '%s'" @@ -5572,11 +6499,16 @@ msgstr "mal nombre de ref de reemplazo: %s" msgid "duplicate replace ref: %s" msgstr "duplicar ref de reemplazo: %s" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "remplazar profundiad muy elevada para objeto %s" +#: repository.c:94 builtin/init-db.c:188 +#, c-format +msgid "The hash algorithm %s is not supported in this build." +msgstr "El algoritmo hash %s no estรก soportado en este build." + #: rerere.c:217 rerere.c:226 rerere.c:229 msgid "corrupt MERGE_RR" msgstr "MERGE_RR corrupto" @@ -5635,8 +6567,8 @@ msgstr "no se puede desvincular stray '%s'" msgid "Recorded preimage for '%s'" msgstr "Resoluciรณn precargada para '%s'" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" @@ -5670,20 +6602,29 @@ 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:2507 +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "no se pudo determinar revisiรณn HEAD" + +#: reset.c:70 reset.c:76 sequencer.c:3318 +#, c-format +msgid "failed to find tree of %s" +msgstr "fallรณ al encontrar รกrbol de %s" + +#: revision.c:2661 msgid "your current branch appears to be broken" msgstr "tu rama actual parece estar rota" -#: revision.c:2510 +#: revision.c:2664 #, 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:2710 +#: revision.c:2873 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent es incompatible con --bisect" -#: revision.c:2714 +#: revision.c:2877 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" @@ -5706,30 +6647,34 @@ msgstr "" "Puedes desactivar esta advertencias con `git config advice.ignoredHook " "false`." -#: send-pack.c:141 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "flush packet inesperado mientras se leรญa estatus de desempaquetado remoto" -#: send-pack.c:143 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "no es posible analizar el estado de desempaquetado remoto: %s" -#: send-pack.c:145 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "desempaquetado remoto fallรณ: %s" -#: send-pack.c:306 +#: send-pack.c:308 msgid "failed to sign the push certificate" msgstr "fallรณ al firmar el certificado de push" -#: send-pack.c:420 +#: send-pack.c:394 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "el destino no soporta el algoritmo de hash de este repositorio" + +#: send-pack.c:403 msgid "the receiving end does not support --signed push" msgstr "el final receptor no soporta --signed push" -#: send-pack.c:422 +#: send-pack.c:405 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5737,47 +6682,47 @@ msgstr "" "no se manda un certificado de push ya que el destino no soporta push firmado " "(--signed )" -#: send-pack.c:434 +#: send-pack.c:417 msgid "the receiving end does not support --atomic push" msgstr "el destino no soporta push atรณmicos (--atomic)" -#: send-pack.c:439 +#: send-pack.c:422 msgid "the receiving end does not support push options" msgstr "el destino no soporta opciones de push" -#: sequencer.c:187 +#: sequencer.c:192 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mensaje de commit invรกlido, modo cleanup '%s'" -#: sequencer.c:292 +#: sequencer.c:297 #, c-format msgid "could not delete '%s'" msgstr "no se pudo borrar '%s'" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "no se pudo eliminar'%s'" -#: sequencer.c:321 +#: sequencer.c:326 msgid "revert" msgstr "revertir" -#: sequencer.c:323 +#: sequencer.c:328 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:325 -msgid "rebase -i" -msgstr "rebase -i" +#: sequencer.c:330 +msgid "rebase" +msgstr "rebase" -#: sequencer.c:327 +#: sequencer.c:332 #, c-format msgid "unknown action: %d" msgstr "acciรณn desconocida: %d" -#: sequencer.c:385 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5785,7 +6730,7 @@ msgstr "" "despuรฉs de resolver los conflictos, marca las rutas corregidas\n" "con 'git add <rutas>' o 'git rm <rutas>'" -#: sequencer.c:388 +#: sequencer.c:393 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5795,115 +6740,109 @@ msgstr "" "con 'git add <rutas>' o 'git rm <rutas>'\n" "y haz un commit del resultado con 'git commit'" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:406 sequencer.c:2921 #, c-format msgid "could not lock '%s'" msgstr "no se pudo bloquear '%s'" -#: sequencer.c:408 +#: sequencer.c:413 #, c-format msgid "could not write eol to '%s'" msgstr "no se pudo escribir EOL en '%s'" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 +#: sequencer.c:3203 #, c-format msgid "failed to finalize '%s'" msgstr "fallรณ al finalizar '%s'" -#: 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 +#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 +#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 #, c-format msgid "could not read '%s'" msgstr "no se pudo leer '%s'" -#: sequencer.c:462 +#: sequencer.c:457 #, c-format msgid "your local changes would be overwritten by %s." msgstr "tus cambios locales serรกn sobreescritos por %s." -#: sequencer.c:466 +#: sequencer.c:461 msgid "commit your changes or stash them to proceed." msgstr "realiza un commit con tus cambios o aplica un stash para proceder." -#: sequencer.c:498 +#: sequencer.c:493 #, c-format msgid "%s: fast-forward" msgstr "%s: avance rรกpido" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:532 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo cleanup invรกlido %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:632 +#: sequencer.c:626 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escribir el nuevo archivo รญndice" -#: sequencer.c:649 +#: sequencer.c:643 msgid "unable to update cache tree" msgstr "no es posible actualizar el รกrbol de la cachรฉ" -#: sequencer.c:663 +#: sequencer.c:657 msgid "could not resolve HEAD commit" msgstr "no se pudo resolver el commit de HEAD" -#: sequencer.c:743 +#: sequencer.c:737 #, c-format msgid "no key present in '%.*s'" msgstr "no hay llave presente en '%.*s'" -#: sequencer.c:754 +#: sequencer.c:748 #, c-format msgid "unable to dequote value of '%s'" msgstr "no es posible dequote para '%s'" -#: 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 +#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" -#: sequencer.c:801 +#: sequencer.c:795 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' ya proporcionado" -#: sequencer.c:806 +#: sequencer.c:800 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado" -#: sequencer.c:811 +#: sequencer.c:805 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' ya proporcionado" -#: sequencer.c:815 +#: sequencer.c:809 #, c-format msgid "unknown variable '%s'" msgstr "variable desconocida '%s'" -#: sequencer.c:820 +#: sequencer.c:814 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta 'GIT_AUTHOR_NAME'" -#: sequencer.c:822 +#: sequencer.c:816 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:824 +#: sequencer.c:818 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta 'GIT_AUTHOR_DATE'" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "formato de fecha invรกlido '%s' en '%s'" - -#: sequencer.c:901 +#: sequencer.c:867 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5933,15 +6872,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "escribiendo commit raรญz" - -#: sequencer.c:1216 +#: sequencer.c:1141 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' fallรณ" -#: sequencer.c:1223 +#: sequencer.c:1147 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5968,7 +6903,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1160 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5992,325 +6927,329 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1202 msgid "couldn't look up newly created commit" msgstr "no se pudo revisar el commit reciรฉn creado" -#: sequencer.c:1280 +#: sequencer.c:1204 msgid "could not parse newly created commit" msgstr "no se pudo analizar el commit reciรฉn creado" -#: sequencer.c:1326 +#: sequencer.c:1250 msgid "unable to resolve HEAD after creating commit" msgstr "no se pudo resolver HEAD tras crear el commit" -#: sequencer.c:1328 +#: sequencer.c:1252 msgid "detached HEAD" msgstr "HEAD desacoplado" -#: sequencer.c:1332 +#: sequencer.c:1256 msgid " (root-commit)" msgstr " (commit-raรญz)" -#: sequencer.c:1353 +#: sequencer.c:1277 msgid "could not parse HEAD" msgstr "no se pudo analizar HEAD" -#: sequencer.c:1355 +#: sequencer.c:1279 #, 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:1359 builtin/commit.c:1571 +#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 msgid "could not parse HEAD commit" msgstr "no se pudo analizar el commit de HEAD" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1335 sequencer.c:1980 msgid "unable to parse commit author" msgstr "no es posible analizar el autor del commit" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 msgid "git write-tree failed to write a tree" msgstr "git write-tree fallรณ al escribir el รกrbol" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1379 sequencer.c:1450 #, c-format msgid "unable to read commit message from '%s'" msgstr "no se puede leer el mensaje del commit de '%s'" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 +#: builtin/merge.c:919 msgid "failed to write commit object" msgstr "fallรณ al escribir el objeto commit" -#: sequencer.c:1526 +#: sequencer.c:1433 sequencer.c:4118 +#, c-format +msgid "could not update %s" +msgstr "no se puede actualizar %s" + +#: sequencer.c:1481 #, c-format msgid "could not parse commit %s" msgstr "no se pudo analizar commit %s" -#: sequencer.c:1531 +#: sequencer.c:1486 #, c-format msgid "could not parse parent commit %s" msgstr "no se pudo analizar el commit padre %s" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1569 sequencer.c:1680 #, c-format msgid "unknown command: %d" msgstr "comando desconocido: %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1627 sequencer.c:1652 #, c-format msgid "This is a combination of %d commits." msgstr "Esta es una combinaciรณn de %d commits." -#: sequencer.c:1672 +#: sequencer.c:1637 msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1639 sequencer.c:3230 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" -#: sequencer.c:1676 +#: sequencer.c:1641 msgid "could not read HEAD's commit message" msgstr "no se pudo leer el mensaje de commit de HEAD" -#: sequencer.c:1682 +#: sequencer.c:1647 #, c-format msgid "cannot write '%s'" msgstr "no se puede escribir '%s'" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Este es el mensaje del 1er commit:" -#: sequencer.c:1697 +#: sequencer.c:1662 #, c-format msgid "could not read commit message of %s" msgstr "no se puede leer el mensaje del commit de %s" -#: sequencer.c:1704 +#: sequencer.c:1669 #, c-format msgid "This is the commit message #%d:" msgstr "Este es el mensaje del commit #%d:" -#: sequencer.c:1710 +#: sequencer.c:1675 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El mensaje del commit #%d serรก saltado:" -#: sequencer.c:1798 +#: sequencer.c:1763 msgid "your index file is unmerged." msgstr "tu archivo รญndice no estรก fusionado." -#: sequencer.c:1805 +#: sequencer.c:1770 msgid "cannot fixup root commit" msgstr "no se puede arreglar el commit raรญz" -#: sequencer.c:1824 +#: sequencer.c:1789 #, 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:1832 sequencer.c:1840 +#: sequencer.c:1797 sequencer.c:1805 #, c-format msgid "commit %s does not have parent %d" msgstr "el commit %s no tiene un padre %d" -#: sequencer.c:1846 +#: sequencer.c:1811 #, 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:1865 +#: sequencer.c:1830 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no se puede analizar el commit padre %s" -#: sequencer.c:1930 +#: sequencer.c:1895 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no se puede renombrar '%s' a '%s'" -#: sequencer.c:1985 +#: sequencer.c:1952 #, c-format msgid "could not revert %s... %s" msgstr "no se pudo revertir %s... %s" -#: sequencer.c:1986 +#: sequencer.c:1953 #, c-format msgid "could not apply %s... %s" msgstr "no se pudo aplicar %s... %s" -#: sequencer.c:2045 +#: sequencer.c:1972 +#, 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:2030 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: fallรณ al leer el รญndice" -#: sequencer.c:2052 +#: sequencer.c:2037 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: fallรณ al refrescar el รญndice" -#: sequencer.c:2128 +#: sequencer.c:2114 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no acepta los argumentos: '%s'" -#: sequencer.c:2137 +#: sequencer.c:2123 #, c-format msgid "missing arguments for %s" msgstr "faltan argumentos para para %s" -#: sequencer.c:2174 +#: sequencer.c:2154 #, 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:2228 +#: sequencer.c:2215 #, c-format msgid "invalid line %d: %.*s" msgstr "lรญnea invรกlida %d: %.*s" -#: sequencer.c:2239 +#: sequencer.c:2226 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no se puede '%s' sin un commit previo" -#: 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 +#: sequencer.c:2310 msgid "cancelling a cherry picking in progress" msgstr "cancelando cherry-pick en progreso" -#: sequencer.c:2330 +#: sequencer.c:2317 msgid "cancelling a revert in progress" msgstr "cancelando revert en progreso" -#: sequencer.c:2364 +#: sequencer.c:2361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "por favor arregle esto usando 'git rebase --edit-todo'." -#: sequencer.c:2366 +#: sequencer.c:2363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "hoja de instrucciones inutilizable: '%s'" -#: sequencer.c:2371 +#: sequencer.c:2368 msgid "no commits parsed." msgstr "ningรบn commit analizado." -#: sequencer.c:2382 +#: sequencer.c:2379 msgid "cannot cherry-pick during a revert." msgstr "no se puede realizar cherry-pick durante un revert." -#: sequencer.c:2384 +#: sequencer.c:2381 msgid "cannot revert during a cherry-pick." msgstr "no se puede realizar un revert durante un cherry-pick." -#: sequencer.c:2466 +#: sequencer.c:2459 #, c-format msgid "invalid value for %s: %s" msgstr "valor invรกlido para %s: %s" -#: sequencer.c:2553 +#: sequencer.c:2556 msgid "unusable squash-onto" msgstr "squash-onto inservible" -#: sequencer.c:2569 +#: sequencer.c:2576 #, c-format msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2664 sequencer.c:4469 msgid "empty commit set passed" msgstr "conjunto de commits vacรญo entregado" -#: sequencer.c:2668 +#: sequencer.c:2680 msgid "revert is already in progress" msgstr "revert ya estรก en progreso" -#: sequencer.c:2670 +#: sequencer.c:2682 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "intenta \"git revert (--continue | --quit | %s --abort)\"" -#: sequencer.c:2673 +#: sequencer.c:2685 msgid "cherry-pick is already in progress" msgstr "cherry-pick ya estรก en progreso" -#: sequencer.c:2675 +#: sequencer.c:2687 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\"" -#: sequencer.c:2689 +#: sequencer.c:2701 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no se pudo crear un directorio secuenciador '%s'" -#: sequencer.c:2704 +#: sequencer.c:2716 msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2776 sequencer.c:4206 msgid "no cherry-pick or revert in progress" msgstr "ningรบn cherry-pick o revert en progreso" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2778 sequencer.c:2789 msgid "cannot resolve HEAD" msgstr "no se puede resolver HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2780 sequencer.c:2824 msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2810 builtin/grep.c:744 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#: sequencer.c:2800 +#: sequencer.c:2812 #, c-format msgid "cannot read '%s': %s" msgstr "no se puede leer '%s': %s" -#: sequencer.c:2801 +#: sequencer.c:2813 msgid "unexpected end of file" msgstr "final de archivo inesperado" -#: sequencer.c:2807 +#: sequencer.c:2819 #, 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:2818 +#: sequencer.c:2830 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:2859 +#: sequencer.c:2871 msgid "no revert in progress" msgstr "no hay revert en progreso" -#: sequencer.c:2867 +#: sequencer.c:2879 msgid "no cherry-pick in progress" msgstr "ningรบn cherry-pick en progreso" -#: sequencer.c:2877 +#: sequencer.c:2889 msgid "failed to skip the commit" msgstr "fallรณ al escribir el commit" -#: sequencer.c:2884 +#: sequencer.c:2896 msgid "there is nothing to skip" msgstr "no hay nada que saltar" -#: sequencer.c:2887 +#: sequencer.c:2899 #, c-format msgid "" "have you committed already?\n" @@ -6319,21 +7258,16 @@ msgstr "" "ยฟya has hecho el commit?\n" "intenta \"git %s --continue\"" -#: sequencer.c:3011 sequencer.c:4015 -#, c-format -msgid "could not update %s" -msgstr "no se puede actualizar %s" - -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3060 sequencer.c:4098 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" -#: sequencer.c:3066 +#: sequencer.c:3077 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3074 +#: sequencer.c:3085 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6352,27 +7286,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3095 #, c-format msgid "Could not apply %s... %.*s" msgstr "No se pudo aplicar %s... %.*s" -#: sequencer.c:3091 +#: sequencer.c:3102 #, c-format msgid "Could not merge %.*s" msgstr "No se pudo fusionar %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%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 "no se pudo leer รญndice" +#: sequencer.c:3132 +#, c-format +msgid "Executing: %s\n" +msgstr "Ejecutando: %s\n" -#: sequencer.c:3136 +#: sequencer.c:3147 #, c-format msgid "" "execution failed: %s\n" @@ -6387,11 +7321,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3153 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:3148 +#: sequencer.c:3159 #, c-format msgid "" "execution succeeded: %s\n" @@ -6408,112 +7342,129 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3220 #, c-format msgid "illegal label name: '%.*s'" msgstr "nombre de label ilegal: '%.*s'" -#: sequencer.c:3263 +#: sequencer.c:3274 msgid "writing fake root commit" msgstr "escribiendo commit raรญz falso" -#: sequencer.c:3268 +#: sequencer.c:3279 msgid "writing squash-onto" msgstr "escribiendo squash-onto" -#: 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:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "no se pudo escribir รญndice" - -#: sequencer.c:3351 +#: sequencer.c:3363 #, c-format msgid "could not resolve '%s'" msgstr "no se pudo resolver '%s'" -#: sequencer.c:3379 +#: sequencer.c:3394 msgid "cannot merge without a current revision" msgstr "no se puede fusionar sin una versiรณn actual" -#: sequencer.c:3401 +#: sequencer.c:3416 #, c-format msgid "unable to parse '%.*s'" msgstr "no se puede analizar '%.*s'" -#: sequencer.c:3410 +#: sequencer.c:3425 #, c-format msgid "nothing to merge: '%.*s'" msgstr "nada para fusionar: '%.*s'" -#: sequencer.c:3422 +#: sequencer.c:3437 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:3437 +#: sequencer.c:3453 #, c-format msgid "could not get commit message of '%s'" msgstr "no se puede leer el mensaje del commit '%s'" -#: sequencer.c:3590 +#: sequencer.c:3613 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no se pudo intentar fusionar '%.*s'" -#: sequencer.c:3606 +#: sequencer.c:3629 msgid "merge: Unable to write new index file" msgstr "fusiรณn: No se puede escribir el nuevo archivo รญndice" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3703 +msgid "Cannot autostash" +msgstr "No se puede ejecutar autostash" + +#: sequencer.c:3706 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "Respuesta de stash inesperada: '%s'" + +#: sequencer.c:3712 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "No se pudo crear el directorio para '%s'" + +#: sequencer.c:3715 +#, c-format +msgid "Created autostash: %s\n" +msgstr "Autostash creado: %s\n" + +#: sequencer.c:3719 +msgid "could not reset --hard" +msgstr "no se pudo reset --hard" + +#: sequencer.c:3744 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:3687 +#: sequencer.c:3756 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3759 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"Aplicando autostash resultรณ en conflictos.\n" +"%s\n" "Tus cambios estรกn seguros en el stash.\n" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:3751 -#, c-format -msgid "could not checkout %s" -msgstr "no se puede hacer checkout a %s" +#: sequencer.c:3764 +msgid "Applying autostash resulted in conflicts." +msgstr "Apicar autostash resultรณ en conflictos." #: sequencer.c:3765 +msgid "Autostash exists; creating a new stash entry." +msgstr "Autostash existe; creando una nueva entrada stash." + +#: sequencer.c:3857 #, c-format msgid "%s: not a valid OID" msgstr "%s no es OID vรกlido" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3862 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "no se puede desacoplar HEAD" -#: sequencer.c:3785 +#: sequencer.c:3877 #, c-format msgid "Stopped at HEAD\n" msgstr "Detenido en HEAD\n" -#: sequencer.c:3787 +#: sequencer.c:3879 #, c-format msgid "Stopped at %s\n" msgstr "Detenido en %s\n" -#: sequencer.c:3795 +#: sequencer.c:3887 #, c-format msgid "" "Could not execute the todo command\n" @@ -6534,48 +7485,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:3931 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "Aplicando rebase (%d/%d)%s" + +#: sequencer.c:3976 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:4047 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:4003 +#: sequencer.c:4106 msgid "could not read orig-head" msgstr "no se puede leer orig-head" -#: sequencer.c:4008 +#: sequencer.c:4111 msgid "could not read 'onto'" msgstr "no se puede leer 'onto'" -#: sequencer.c:4022 +#: sequencer.c:4125 #, c-format msgid "could not update HEAD to %s" msgstr "no se puede actualizar HEAD a %s" -#: sequencer.c:4115 +#: sequencer.c:4185 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n" + +#: sequencer.c:4218 msgid "cannot rebase: You have unstaged changes." msgstr "no se puede realizar rebase: Tienes cambios fuera del รกrea de stage." -#: sequencer.c:4124 +#: sequencer.c:4227 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:4126 +#: sequencer.c:4229 #, c-format msgid "invalid file: '%s'" msgstr "archivo invรกlido: '%s'" -#: sequencer.c:4128 +#: sequencer.c:4231 #, c-format msgid "invalid contents: '%s'" msgstr "contenido invรกlido: '%s'" -#: sequencer.c:4131 +#: sequencer.c:4234 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6586,69 +7547,59 @@ msgstr "" "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:4167 sequencer.c:4205 +#: sequencer.c:4270 sequencer.c:4309 #, c-format msgid "could not write file: '%s'" msgstr "no se pudo escribir el archivo: '%s'" -#: sequencer.c:4220 +#: sequencer.c:4324 msgid "could not remove CHERRY_PICK_HEAD" msgstr "no se puede eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4331 msgid "could not commit staged changes." msgstr "no se pudo realizar el commit con los cambios en el รกrea de stage." -#: sequencer.c:4328 +#: sequencer.c:4446 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:4332 +#: sequencer.c:4450 #, c-format msgid "%s: bad revision" msgstr "%s: revisiรณn errรณnea" -#: sequencer.c:4367 +#: sequencer.c:4485 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:4810 +#: sequencer.c:4962 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:4813 +#: sequencer.c:4965 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 +#: sequencer.c:5206 sequencer.c:5223 msgid "nothing to do" msgstr "nada que hacer" -#: sequencer.c:5114 +#: sequencer.c:5242 msgid "could not skip unnecessary pick commands" msgstr "no se pudo saltar los comandos pick innecesarios" -#: sequencer.c:5197 +#: sequencer.c:5336 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." -#: setup.c:123 +#: setup.c:133 #, c-format -msgid "'%s' is outside repository" -msgstr "'%s' estรก fuera del repositorio" +msgid "'%s' is outside repository at '%s'" +msgstr "'%s' estรก fuera del repositorio en '%s'" -#: setup.c:173 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6658,7 +7609,7 @@ msgstr "" "Use 'git <comando> -- <ruta>...' para especificar rutas que no existen " "localmente." -#: setup.c:186 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6670,12 +7621,12 @@ msgstr "" "Use '--' para separar las rutas de las revisiones, de esta manera:\n" "'git <comando> [<revisiรณn>...] -- [<archivo>...]'" -#: setup.c:235 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "opciรณn '%s' debe venir antes de argumentos no opcionales" -#: setup.c:254 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6686,95 +7637,95 @@ msgstr "" "Use '--' para separar rutas de revisiones, de esta manera:\n" "'git <comando> [<revisiรณn>...] -- [<archivo>...]'" -#: setup.c:390 +#: setup.c:419 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:394 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "esta operaciรณn debe ser realizada en un รกrbol de trabajo" -#: setup.c:540 +#: setup.c:604 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Se esperaba versiรณn de git repo <= %d, encontrada %d" -#: setup.c:548 +#: setup.c:612 msgid "unknown repository extensions found:" msgstr "se encontrรณ extensiรณn de repositorio desconocida:" -#: setup.c:567 +#: setup.c:631 #, c-format msgid "error opening '%s'" msgstr "error abriendo '%s'" -#: setup.c:569 +#: setup.c:633 #, c-format msgid "too large to be a .git file: '%s'" msgstr "muy grande para ser un archivo .git: '%s'" -#: setup.c:571 +#: setup.c:635 #, c-format msgid "error reading %s" msgstr "error leyendo %s" -#: setup.c:573 +#: setup.c:637 #, c-format msgid "invalid gitfile format: %s" msgstr "formato gitfile invรกlido: %s" -#: setup.c:575 +#: setup.c:639 #, c-format msgid "no path in gitfile: %s" msgstr "no hay ruta en gitfile: %s" -#: setup.c:577 +#: setup.c:641 #, c-format msgid "not a git repository: %s" msgstr "no es un repositorio git: %s" -#: setup.c:676 +#: setup.c:743 #, c-format msgid "'$%s' too big" msgstr "'$%s' muy grande" -#: setup.c:690 +#: setup.c:757 #, c-format msgid "not a git repository: '%s'" msgstr "no es un repositorio git: '%s'" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:786 setup.c:788 setup.c:819 #, c-format msgid "cannot chdir to '%s'" msgstr "no se puede aplicar chdir a '%s'" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904 msgid "cannot come back to cwd" msgstr "no se puede volver a cwd" -#: setup.c:851 +#: setup.c:918 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "fallรณ al determinar '%*s%s%s'" -#: setup.c:1083 +#: setup.c:1156 msgid "Unable to read current working directory" msgstr "Incapaz de leer el directorio de trabajo actual" -#: setup.c:1092 setup.c:1098 +#: setup.c:1165 setup.c:1171 #, c-format msgid "cannot change to '%s'" msgstr "no se puede cambiar a '%s'" -#: setup.c:1103 +#: setup.c:1176 #, 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:1109 +#: setup.c:1182 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6784,7 +7735,7 @@ msgstr "" "Parando en el lรญmite del sistema de archivos " "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)." -#: setup.c:1220 +#: setup.c:1293 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6793,286 +7744,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:1264 +#: setup.c:1340 msgid "open /dev/null or dup failed" msgstr "fallรณ al abrir /dev/null o dup" -#: setup.c:1279 +#: setup.c:1355 msgid "fork failed" msgstr "fallรณ fork" -#: setup.c:1284 +#: setup.c:1360 msgid "setsid failed" msgstr "fallรณ setsid" -#: sha1-file.c:453 +#: sha1-file.c:470 #, 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:504 +#: sha1-file.c:521 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "incapaz de normalizar la ruta de objeto alterno: %s" -#: sha1-file.c:576 +#: sha1-file.c:593 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo" -#: sha1-file.c:583 +#: sha1-file.c:600 #, c-format msgid "unable to normalize object directory: %s" msgstr "incapaz de normalizar directorio de objeto: %s" -#: sha1-file.c:626 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" msgstr "no es posible hacer fdopen en lockfile alternos" -#: sha1-file.c:644 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "no es posible leer archivos alternos" -#: sha1-file.c:651 +#: sha1-file.c:668 msgid "unable to move new alternates file into place" msgstr "no es posible mover archivos alternos en el lugar" -#: sha1-file.c:686 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "ruta '%s' no existe" -#: sha1-file.c:712 +#: sha1-file.c:724 #, 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:718 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "repositorio de referencia '%s' no es un repositorio local." -#: sha1-file.c:724 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "repositorio de referencia '%s' es superficial (shallow)" -#: sha1-file.c:732 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "repositorio de referencia '% s' estรก injertado" -#: sha1-file.c:792 +#: sha1-file.c:804 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "lรญnea invรกlida mientras se analizaban refs alternas: %s" -#: sha1-file.c:944 +#: sha1-file.c:954 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "intentando usar mmap %<PRIuMAX> sobre lรญmite %<PRIuMAX>" -#: sha1-file.c:969 +#: sha1-file.c:975 msgid "mmap failed" msgstr "mmap fallรณ" -#: sha1-file.c:1133 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "archivo de objeto %s estรก vacรญo" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1274 sha1-file.c:2454 #, c-format msgid "corrupt loose object '%s'" msgstr "objeto perdido corrupto '%s'" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1276 sha1-file.c:2458 #, c-format msgid "garbage at end of loose object '%s'" msgstr "basura al final del objeto perdido '%s'" -#: sha1-file.c:1301 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "tipo de objeto invรกlido" -#: sha1-file.c:1385 +#: sha1-file.c:1402 #, 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:1388 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "incapaz de desempaquetar header %s" -#: sha1-file.c:1394 +#: sha1-file.c:1411 #, 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:1397 +#: sha1-file.c:1414 #, c-format msgid "unable to parse %s header" msgstr "incapaz de analizar header %s" -#: sha1-file.c:1588 +#: sha1-file.c:1640 #, c-format msgid "failed to read object %s" msgstr "fallรณ al leer objeto %s" -#: sha1-file.c:1592 +#: sha1-file.c:1644 #, c-format msgid "replacement %s not found for %s" msgstr "reemplazo %s no encontrado para %s" -#: sha1-file.c:1596 +#: sha1-file.c:1648 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "objeto perdido %s (guardado en %s) estรก corrompido" -#: sha1-file.c:1600 +#: sha1-file.c:1652 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "paquete de objeto %s (guardado en %s) estรก corrompido" -#: sha1-file.c:1703 +#: sha1-file.c:1757 #, c-format msgid "unable to write file %s" msgstr "no es posible escribir archivo %s" -#: sha1-file.c:1710 +#: sha1-file.c:1764 #, c-format msgid "unable to set permission to '%s'" msgstr "no se pudo poner permisos a '%s'" -#: sha1-file.c:1717 +#: sha1-file.c:1771 msgid "file write error" msgstr "fallรณ de escritura" -#: sha1-file.c:1736 +#: sha1-file.c:1791 msgid "error when closing loose object file" msgstr "error cerrando el archivo de objeto suelto" -#: sha1-file.c:1801 +#: sha1-file.c:1856 #, 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:1803 +#: sha1-file.c:1858 msgid "unable to create temporary file" msgstr "no es posible crear un archivo temporal" -#: sha1-file.c:1827 +#: sha1-file.c:1882 msgid "unable to write loose object file" msgstr "no es posible escribir el archivo de objeto suelto" -#: sha1-file.c:1833 +#: sha1-file.c:1888 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "no es posible desinflar el objeto nuevo %s (%d)" -#: sha1-file.c:1837 +#: sha1-file.c:1892 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd en objeto %s fallรณ (%d)" -#: sha1-file.c:1841 +#: sha1-file.c:1896 #, 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:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1906 builtin/pack-objects.c:1085 #, c-format msgid "failed utime() on %s" msgstr "fallรณ utime() en %s" -#: sha1-file.c:1926 +#: sha1-file.c:1983 #, c-format msgid "cannot read object for %s" msgstr "no se pudo leer el objeto para %s" -#: sha1-file.c:1966 +#: sha1-file.c:2022 msgid "corrupt commit" msgstr "commit corrupto" -#: sha1-file.c:1974 +#: sha1-file.c:2030 msgid "corrupt tag" msgstr "tag corrupto" -#: sha1-file.c:2073 +#: sha1-file.c:2130 #, c-format msgid "read error while indexing %s" msgstr "error leyendo al indexar %s" -#: sha1-file.c:2076 +#: sha1-file.c:2133 #, c-format msgid "short read while indexing %s" msgstr "lectura corta al indexar %s" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2206 sha1-file.c:2216 #, c-format msgid "%s: failed to insert into database" msgstr "%s: fallรณ al insertar en la base de datos" -#: sha1-file.c:2164 +#: sha1-file.c:2222 #, c-format msgid "%s: unsupported file type" msgstr "%s: tipo de archivo no soportado" -#: sha1-file.c:2188 +#: sha1-file.c:2246 #, c-format msgid "%s is not a valid object" msgstr "%s no es objeto vรกlido" -#: sha1-file.c:2190 +#: sha1-file.c:2248 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s no es un objeto '%s' vรกlido" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2275 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "no es posible abrir %s" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2465 sha1-file.c:2518 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash no concuerda para %s (se esperaba %s)" -#: sha1-file.c:2431 +#: sha1-file.c:2489 #, c-format msgid "unable to mmap %s" msgstr "no es posible hacer mmap a %s" -#: sha1-file.c:2436 +#: sha1-file.c:2494 #, c-format msgid "unable to unpack header of %s" msgstr "incapaz de desempaquetar header de %s" -#: sha1-file.c:2442 +#: sha1-file.c:2500 #, c-format msgid "unable to parse header of %s" msgstr "incapaz de analizar header de %s" -#: sha1-file.c:2453 +#: sha1-file.c:2511 #, c-format msgid "unable to unpack contents of %s" msgstr "no es posible desempaquetar contenidos de %s" -#: sha1-name.c:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "SHA1 %s corto es ambiguo" -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Los candidatos son:" -#: sha1-name.c:800 +#: 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" @@ -7095,44 +8046,111 @@ 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:821 +#: strbuf.c:848 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:867 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:875 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7140,13 +8158,44 @@ msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:877 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u bytes/s" msgstr[1] "%u bytes/s" +#: strbuf.c:1175 +#, c-format +msgid "could not edit '%s'" +msgstr "no se pudo editar '%s'" + +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "ignorando submรณdulo sospechoso: %s" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "no se permiten valores negativos para submodule.fetchjobs" + +#: submodule-config.c:402 +#, 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:499 +#, c-format +msgid "invalid value for %s" +msgstr "valor invรกlido para %s" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "No se pudo actualizar la entrada %s de .gitmodules" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7176,51 +8225,127 @@ 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:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: 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:678 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "Fallรณ al resolver HEAD como un ref vรกlido." -#: submodule.c:1481 +#: submodule.c:1158 #, c-format -msgid "Could not access submodule '%s'" -msgstr "no pudo acceder al submรณdulo '%s'" +msgid "Pushing submodule '%s'\n" +msgstr "Empujando submรณdulo '%s'\n" -#: submodule.c:1651 +#: submodule.c:1161 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "No es posible hacer push al submรณdulo '%s'\n" + +#: 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 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' no reconocido como un repositorio git" -#: submodule.c:1789 +#: 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 #, 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:1802 +#: submodule.c:1813 #, 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:1817 +#: submodule.c:1828 #, 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:1907 +#: 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 #, c-format msgid "submodule '%s' has dirty index" msgstr "submรณdulo '%s' tiene un รญndice corrupto" -#: submodule.c:1959 +#: submodule.c:1970 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submรณdulo '%s' no pudo ser actualizado." -#: submodule.c:2007 +#: 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 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7228,12 +8353,17 @@ msgstr "" "relocate_gitdir para el submรณdulo '%s' con mรกs de un รกrbol de trabajo no " "soportado" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2071 submodule.c:2130 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el submรณdulo '%s'" -#: submodule.c:2026 +#: 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 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7244,46 +8374,15 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:2109 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "no pudo recursar en el submรณdulo '%s'" - -#: submodule.c:2153 +#: submodule.c:2210 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:2192 +#: submodule.c:2250 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree devolviรณ un cรณdigo %d inesperado" -#: submodule-config.c:232 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "ignorando submรณdulo sospechoso: %s" - -#: submodule-config.c:299 -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "no se permiten valores negativos para submodule.fetchjobs" - -#: 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:486 -#, c-format -msgid "invalid value for %s" -msgstr "valor invรกlido para %s" - -#: submodule-config.c:755 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "No se pudo actualizar la entrada %s de .gitmodules" - #: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" @@ -7295,7 +8394,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:295 +#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "mรกs de un %s" @@ -7314,7 +8413,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:701 +#: trailer.c:1011 wrapper.c:673 #, c-format msgid "could not stat %s" msgstr "no se pudo definir %s" @@ -7338,113 +8437,20 @@ msgstr "no se pudo abrir el archivo temporal" msgid "could not rename temporary file to %s" msgstr "no se pudo renombrar el archivo temporal a %s" -#: transport.c:116 -#, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "Configurarรก upstream de '%s' a '%s' de '%s'\n" - -#: transport.c:142 -#, c-format -msgid "could not read bundle '%s'" -msgstr "no se pudo leer el conjunto '%s'" - -#: transport.c:208 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "transport: opciรณn invรกlida '%s'" - -#: 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:260 -msgid "server options require protocol version 2 or later" -msgstr "opciones del servidor requieren protocolo versiรณn 2 o posterior" - -#: transport.c:625 -msgid "could not parse transport.color.* config" -msgstr "no se pudo analizar valor de configuraciรณn transport.color.*" - -#: transport.c:698 -msgid "support for protocol v2 not implemented yet" -msgstr "soporte para protocolo v2 no implementado todavรญa" - -#: transport.c:825 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "valor desconocido para configuraciรณn '%s': %s" - -#: transport.c:891 -#, c-format -msgid "transport '%s' not allowed" -msgstr "transporte '%s' no permitido" - -#: transport.c:945 -msgid "git-over-rsync is no longer supported" -msgstr "git-over-rsync ya no es soportado" - -#: transport.c:1040 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "" -"La siguiente ruta de submรณdulo contiene cambios que no\n" -"pueden ser encontrados en ningรบn remoto:\n" - -#: transport.c:1044 -#, 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" -"Por favor intenta\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"o cd a la ruta y usa\n" -"\n" -"\tgit push\n" -"\n" -"para hacer un push al remoto.\n" -"\n" - -#: transport.c:1052 -msgid "Aborting." -msgstr "Abortando." - -#: transport.c:1193 -msgid "failed to push all needed submodules" -msgstr "fallรณ al hacer push a todos los submรณdulos necesarios" - -#: transport.c:1340 transport-helper.c:645 -msgid "operation not supported by protocol" -msgstr "operaciรณn no soportada por protocolo" - -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:62 transport-helper.c:91 msgid "full write to remote helper failed" msgstr "escritura total al helper remoto fallรณ" -#: transport-helper.c:134 +#: transport-helper.c:145 #, c-format msgid "unable to find remote helper for '%s'" msgstr "no es posible encontrar helper remoto para '%s'" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" msgstr "no se puede duplicar output de fd del helper" -#: transport-helper.c:201 +#: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7453,168 +8459,271 @@ msgstr "" "capacidad mandatoria desconocida %s; este helper remoto probablemente " "necesita una nueva versiรณn de Git" -#: transport-helper.c:207 +#: transport-helper.c:220 msgid "this remote helper should implement refspec capability" msgstr "este helper remoto deberรญa implementar capacidad refspec" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:287 transport-helper.c:429 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s dijo inesperadamente: '%s'" -#: transport-helper.c:403 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "%s tambiรฉn bloqueรณ %s" -#: transport-helper.c:481 +#: transport-helper.c:497 msgid "couldn't run fast-import" msgstr "no se pudo ejecutar fast-import" -#: transport-helper.c:504 +#: transport-helper.c:520 msgid "error while running fast-import" msgstr "error al ejecutar fast-import" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:549 transport-helper.c:1156 #, c-format msgid "could not read ref %s" msgstr "no se pudo leer la referencia %s" -#: transport-helper.c:578 +#: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" msgstr "respuesta para conectar desconocida: %s" -#: transport-helper.c:600 +#: transport-helper.c:616 msgid "setting remote service path not supported by protocol" msgstr "configurando servicio de ruta remota no soportado por el protocolo" -#: transport-helper.c:602 +#: transport-helper.c:618 msgid "invalid remote service path" msgstr "ruta de servicio remoto invรกlida" -#: transport-helper.c:648 +#: transport-helper.c:661 transport.c:1347 +msgid "operation not supported by protocol" +msgstr "operaciรณn no soportada por protocolo" + +#: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" msgstr "no se puede conectar al subservicio %s" -#: transport-helper.c:720 +#: transport-helper.c:740 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "se esperaba ok/error, helper dijo '%s'" -#: transport-helper.c:773 +#: transport-helper.c:793 #, c-format msgid "helper reported unexpected status of %s" msgstr "helper reportรณ estado inesperado de %s" -#: transport-helper.c:834 +#: transport-helper.c:854 #, c-format msgid "helper %s does not support dry-run" msgstr "helper %s no soporta dry-run" -#: transport-helper.c:837 +#: transport-helper.c:857 #, c-format msgid "helper %s does not support --signed" msgstr "helper %s no soporta --signed" -#: transport-helper.c:840 +#: transport-helper.c:860 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "helper %s no soporta --signed=if-asked" -#: transport-helper.c:847 +#: transport-helper.c:865 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "helper %s no soporta --atomic" + +#: transport-helper.c:871 #, c-format msgid "helper %s does not support 'push-option'" msgstr "helper %s no soporta 'push-option'" -#: transport-helper.c:945 +#: transport-helper.c:970 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-helper no soporta push; se necesita refspec" -#: transport-helper.c:950 +#: transport-helper.c:975 #, c-format msgid "helper %s does not support 'force'" msgstr "helper %s no soporta 'force'" -#: transport-helper.c:997 +#: transport-helper.c:1022 msgid "couldn't run fast-export" msgstr "no se pudo ejecutar fast-export" -#: transport-helper.c:1002 +#: transport-helper.c:1027 msgid "error while running fast-export" msgstr "error al ejecutar fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1052 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" msgstr "" "No hay refs comunes y ninguno especificado; no se hace nada.\n" -"Tal vez deberรญas especificar un branch como 'master'.\n" +"Tal vez deberรญas especificar un branch.\n" -#: transport-helper.c:1091 +#: transport-helper.c:1133 +#, c-format +msgid "unsupported object format '%s'" +msgstr "formado de objeto no soportado '%s'" + +#: transport-helper.c:1142 #, c-format msgid "malformed response in ref list: %s" msgstr "respuesta malformada en lista de refs: %s" -#: transport-helper.c:1244 +#: transport-helper.c:1294 #, c-format msgid "read(%s) failed" msgstr "leer(%s) fallรณ" -#: transport-helper.c:1271 +#: transport-helper.c:1321 #, c-format msgid "write(%s) failed" msgstr "escribir(%s) fallรณ" -#: transport-helper.c:1320 +#: transport-helper.c:1370 #, c-format msgid "%s thread failed" msgstr "hilo %s fallรณ" -#: transport-helper.c:1324 +#: transport-helper.c:1374 #, c-format msgid "%s thread failed to join: %s" msgstr "hilo %s fallรณ al unirse: %s" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1393 transport-helper.c:1397 #, 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:1384 +#: transport-helper.c:1434 #, c-format msgid "%s process failed to wait" msgstr "proceso %s fallรณ al esperar" -#: transport-helper.c:1388 +#: transport-helper.c:1438 #, c-format msgid "%s process failed" msgstr "proceso %s fallรณ" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1456 transport-helper.c:1465 msgid "can't start thread for copying data" msgstr "no se puede iniciar hilo para copiar data" -#: tree-walk.c:33 +#: transport.c:116 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "Configurarรก upstream de '%s' a '%s' de '%s'\n" + +#: transport.c:145 +#, c-format +msgid "could not read bundle '%s'" +msgstr "no se pudo leer el conjunto '%s'" + +#: transport.c:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport: opciรณn invรกlida '%s'" + +#: transport.c:272 +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:273 +msgid "server options require protocol version 2 or later" +msgstr "opciones del servidor requieren protocolo versiรณn 2 o posterior" + +#: transport.c:631 +msgid "could not parse transport.color.* config" +msgstr "no se pudo analizar valor de configuraciรณn transport.color.*" + +#: transport.c:704 +msgid "support for protocol v2 not implemented yet" +msgstr "soporte para protocolo v2 no implementado todavรญa" + +#: transport.c:838 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "valor desconocido para configuraciรณn '%s': %s" + +#: transport.c:904 +#, c-format +msgid "transport '%s' not allowed" +msgstr "transporte '%s' no permitido" + +#: transport.c:957 +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync ya no es soportado" + +#: transport.c:1059 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"La siguiente ruta de submรณdulo contiene cambios que no\n" +"pueden ser encontrados en ningรบn remoto:\n" + +#: transport.c:1063 +#, 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" +"Por favor intenta\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"o cd a la ruta y usa\n" +"\n" +"\tgit push\n" +"\n" +"para hacer un push al remoto.\n" +"\n" + +#: transport.c:1071 +msgid "Aborting." +msgstr "Abortando." + +#: transport.c:1216 +msgid "failed to push all needed submodules" +msgstr "fallรณ al hacer push a todos los submรณdulos necesarios" + +#: tree-walk.c:32 msgid "too-short tree object" msgstr "objeto de รกrbol muy corto" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "modo mal formado en la entrada de รกrbol" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "nombre de archivo vacรญo en la entrada de รกrbol" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "archivo de รกrbol muy corto" -#: unpack-trees.c:111 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7625,7 +8734,7 @@ msgstr "" "%%sPor favor realiza un commit con los cambios o un stash antes de cambiar " "ramas." -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7635,7 +8744,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7645,7 +8754,7 @@ msgstr "" "fusionar:\n" "%%sPor favor, confirma tus cambios o aguรกrdalos antes de fusionar." -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7655,7 +8764,7 @@ msgstr "" "merge:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7664,7 +8773,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:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7673,7 +8782,7 @@ msgstr "" "Los cambios locales de los siguientes archivos serรกn sobreescritos por %s:\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7683,7 +8792,7 @@ msgstr "" "seguimiento en ellos:\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7693,7 +8802,7 @@ msgstr "" "eliminados al actualizar el รกrbol de trabajo:\n" "%%sPor favor, muรฉvelos o elimรญnalos antes de intercambiar ramas." -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7703,7 +8812,7 @@ msgstr "" "eliminadosal actualizar el รกrbol de trabajo:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7713,7 +8822,7 @@ msgstr "" "eliminados al fusionar:\n" "%%sPor favor, muรฉvelos o elimรญnalos antes de fusionar." -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7723,7 +8832,7 @@ msgstr "" "eliminadosal fusionar:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7733,7 +8842,7 @@ msgstr "" "eliminados al %s:\n" "%%sPor favor, muรฉvelos o elimรญnalos antes de %s." -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7743,7 +8852,7 @@ msgstr "" "eliminados al ejecutar %s:\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7754,7 +8863,7 @@ msgstr "" "sobrescritos al actualizar el รกrbol de trabajo:\n" "%%sPor favor, muรฉvelos o elimรญnalos antes de intercambiar ramas." -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7765,7 +8874,7 @@ msgstr "" "sobrescritos al actualizar el รกrbol de trabajo:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7775,7 +8884,7 @@ msgstr "" "sobrescritos al fusionar:\n" "%%sPor favor, muรฉvelos o elimรญnalos antes de fusionar." -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7785,7 +8894,7 @@ msgstr "" "sobrescritos al fusionar:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7795,7 +8904,7 @@ msgstr "" "sobrescritos al %s:\n" "%%sPor favor, muรฉvelos o elimรญnalos antes de %s." -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7805,62 +8914,71 @@ msgstr "" "eliminadospor %s:\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir." -#: unpack-trees.c:173 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -"No se puede actualizar el sparse checkout: las siguientes entradas no estรกn " -"actualizadas:\n" +"No se puede actualizar le submรณdulo:\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"Los siguientes archivos del รกrbol de trabajo serรกn sobrescritos por la " -"actualizaciรณn sparse checkout:\n" +"La siguientes rutas no estรกn actualizadas y fueron dejadas a pesar del " +"patrรณn especificado:\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"Los siguientes archivos del รกrbol de trabajo serรกn eliminados por la " -"actualizaciรณn sparse checkout:\n" +"Las siguientes rutas son ignoradas y fueron dejadas a pesar de los patrones " +"sparse:\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"No se puede actualizar le submรณdulo:\n" +"Las siguientes rutas ya estaban presentes y por eso no fueron actualizadas a " +"pesar del patrรณn especificado:\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "Abortando\n" -#: unpack-trees.c:318 +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" +"Luego de arreglar las rutas mostradas, puede que quieras ejecutar `git " +"sparse-checkout reapply`.\n" + +#: unpack-trees.c:350 msgid "Updating files" msgstr "Actualizando archivos" -#: unpack-trees.c:350 +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7870,6 +8988,14 @@ msgstr "" "en un filesystem case-insensitive) y solo una del grupo\n" "colisionando estรก en el รกrbol de trabajo:\n" +#: unpack-trees.c:1498 +msgid "Updating index flags" +msgstr "Actualizando flags del index" + +#: upload-pack.c:1415 +msgid "expected flush after fetch arguments" +msgstr "se espera flush tras argumentos fetch" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "nombre de URL invรกlido oย sufijo '://' faltante" @@ -7899,50 +9025,54 @@ msgstr "numero de puertoย invรกlido" msgid "invalid '..' path segment" msgstr "segmento de ruta '..' invรกlido" -#: worktree.c:258 builtin/am.c:2095 +#: walker.c:170 +msgid "Fetching objects" +msgstr "Haciendo fetch a objetos" + +#: worktree.c:248 builtin/am.c:2098 #, c-format msgid "failed to read '%s'" msgstr "fallรณ al leer '%s'" -#: worktree.c:304 +#: worktree.c:295 #, 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:315 +#: worktree.c:306 #, 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:327 +#: worktree.c:318 #, c-format msgid "'%s' does not exist" msgstr "'%s' no existe" -#: worktree.c:333 +#: worktree.c:324 #, 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:341 +#: worktree.c:333 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' no apunta de vuelta a '%s'" -#: wrapper.c:223 wrapper.c:393 +#: wrapper.c:194 wrapper.c:364 #, c-format msgid "could not open '%s' for reading and writing" msgstr "no se pudo abrir '%s' para lectura y escritura" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:395 wrapper.c:596 #, c-format msgid "unable to access '%s'" msgstr "no es posible acceder '%s'" -#: wrapper.c:632 +#: wrapper.c:604 msgid "unable to get current working directory" msgstr "no es posible obtener el directorio de trabajo actual" @@ -7980,11 +9110,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (usa \"git rm <file>...\" para marcar la resoluciรณn)" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1072 msgid "Changes to be committed:" msgstr "Cambios a ser confirmados:" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1081 msgid "Changes not staged for commit:" msgstr "Cambios no rastreados para el commit:" @@ -8090,22 +9220,22 @@ msgstr "contenido modificado, " msgid "untracked content, " msgstr "contenido no rastreado, " -#: wt-status.c:906 +#: wt-status.c:904 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Tu stash actualmente tiene %d entrada" msgstr[1] "Tu stash actualmente tiene %d entradas" -#: wt-status.c:938 +#: wt-status.c:936 msgid "Submodules changed but not updated:" msgstr "Submรณdulos cambiados pero no actualizados:" -#: wt-status.c:940 +#: wt-status.c:938 msgid "Submodule changes to be committed:" msgstr "Submรณdulos cambiados listos para realizar commit:" -#: wt-status.c:1022 +#: wt-status.c:1020 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -8113,7 +9243,7 @@ msgstr "" "No modifique o borre la lรญnea de encima.\n" "Todo lo que este por abajo serรก eliminado." -#: wt-status.c:1114 +#: wt-status.c:1112 #, c-format msgid "" "\n" @@ -8124,107 +9254,107 @@ msgstr "" "Tomรณ %.2f segundos para calcular los valores anterior/posterior del branch.\n" "Puedes usar '--no-ahead-behind' para evitar esto.\n" -#: wt-status.c:1144 +#: wt-status.c:1142 msgid "You have unmerged paths." msgstr "Tienes rutas no fusionadas." -#: wt-status.c:1147 +#: wt-status.c:1145 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregla los conflictos y corre \"git commit\"" -#: wt-status.c:1149 +#: wt-status.c:1147 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (usa \"git merge --abort\" para abortar la fusion)" -#: wt-status.c:1153 +#: wt-status.c:1151 msgid "All conflicts fixed but you are still merging." msgstr "Todos los conflictos resueltos pero sigues fusionando." -#: wt-status.c:1156 +#: wt-status.c:1154 msgid " (use \"git commit\" to conclude merge)" msgstr " (usa \"git commit\" para concluir la fusiรณn)" -#: wt-status.c:1165 +#: wt-status.c:1163 msgid "You are in the middle of an am session." msgstr "Estรกs en medio de una sesiรณn am." -#: wt-status.c:1168 +#: wt-status.c:1166 msgid "The current patch is empty." msgstr "El parche actual estรก vacรญo." -#: wt-status.c:1172 +#: wt-status.c:1170 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregla los conflictos y luego corre \"git am --continue\"" -#: wt-status.c:1174 +#: wt-status.c:1172 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (usa \"git am --skip\" para saltar este parche)" -#: wt-status.c:1176 +#: wt-status.c:1174 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (usa \"git am --abort\" para restaurar la rama original)" -#: wt-status.c:1309 +#: wt-status.c:1307 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo no estรก presente." -#: wt-status.c:1311 +#: wt-status.c:1309 msgid "No commands done." msgstr "No se realizaron los comandos." -#: wt-status.c:1314 +#: wt-status.c:1312 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "El รบltimo comando realizado (%d comando realizado):" msgstr[1] "Los รบltimos comandos realizados (%d comandos realizados):" -#: wt-status.c:1325 +#: wt-status.c:1323 #, c-format msgid " (see more in file %s)" msgstr " (ver mรกs en el archivo %s)" -#: wt-status.c:1330 +#: wt-status.c:1328 msgid "No commands remaining." msgstr "No quedan mรกs comandos." -#: wt-status.c:1333 +#: wt-status.c:1331 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Siguiente comando a realizarย (%d comando restante):" msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):" -#: wt-status.c:1341 +#: wt-status.c:1339 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (usa \"git rebase --edit-todo\" para ver y editar)" -#: wt-status.c:1353 +#: wt-status.c:1351 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Estรกs aplicando un rebase de la rama '%s' en '%s." -#: wt-status.c:1358 +#: wt-status.c:1356 msgid "You are currently rebasing." msgstr "Estรกs aplicando un rebase." -#: wt-status.c:1371 +#: wt-status.c:1369 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")" -#: wt-status.c:1373 +#: wt-status.c:1371 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (usa \"git rebase --skip\" para omitir este parche)" -#: wt-status.c:1375 +#: wt-status.c:1373 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (usa \"git rebase --abort\" para volver a tu rama original)" -#: wt-status.c:1382 +#: wt-status.c:1380 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")" -#: wt-status.c:1386 +#: wt-status.c:1384 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -8232,60 +9362,64 @@ msgstr "" "Estรกs dividiendo un commit mientras aplicas un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1391 +#: wt-status.c:1389 msgid "You are currently splitting a commit during a rebase." msgstr "Estรกs dividiendo un commit durante un rebase." -#: wt-status.c:1394 +#: wt-status.c:1392 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una vez que tu directorio de trabajo estรฉ limpio, ejecuta \"git rebase --" "continue\")" -#: wt-status.c:1398 +#: wt-status.c:1396 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Estรกs editando un commit mientras se aplica un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1403 +#: wt-status.c:1401 msgid "You are currently editing a commit during a rebase." msgstr "Estรกs editando un commit durante un rebase." -#: wt-status.c:1406 +#: wt-status.c:1404 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (usa \"git commit --amend\" para enmendar el commit actual)" -#: wt-status.c:1408 +#: wt-status.c:1406 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (usa \"git rebase --continue\" una vez que estรฉs satisfecho con tus " "cambios)" -#: wt-status.c:1419 +#: wt-status.c:1417 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick en progreso actualmente." -#: wt-status.c:1422 +#: wt-status.c:1420 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Estรกs realizando un cherry-picking en el commit %s." -#: wt-status.c:1429 +#: wt-status.c:1427 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1432 +#: wt-status.c:1430 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (ejecuta \"git cherry-pick --continue\" para continuar)" -#: wt-status.c:1435 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")" +#: wt-status.c:1435 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (usa \"git cherry-pick --skip\" para saltar este parche)" + #: wt-status.c:1437 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" @@ -8313,55 +9447,64 @@ msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")" #: wt-status.c:1464 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (usa \"git revert --skip\" para omitir este parche)" + +#: wt-status.c:1466 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:1474 +#: wt-status.c:1476 #, 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:1478 +#: wt-status.c:1480 msgid "You are currently bisecting." msgstr "Estรกs aplicando un bisect." -#: wt-status.c:1481 +#: wt-status.c:1483 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:1690 +#: wt-status.c:1494 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "Estas en un checkout de sparse con %d%% archivos rastreados presentes." + +#: wt-status.c:1733 msgid "On branch " msgstr "En la rama " -#: wt-status.c:1697 +#: wt-status.c:1740 msgid "interactive rebase in progress; onto " msgstr "rebase interactivo en progreso; en " -#: wt-status.c:1699 +#: wt-status.c:1742 msgid "rebase in progress; onto " msgstr "rebase en progreso; en " -#: wt-status.c:1709 +#: wt-status.c:1752 msgid "Not currently on any branch." msgstr "Actualmente no estรกs en ninguna rama." -#: wt-status.c:1726 +#: wt-status.c:1769 msgid "Initial commit" msgstr "Confirmaciรณn inicial" -#: wt-status.c:1727 +#: wt-status.c:1770 msgid "No commits yet" msgstr "No hay commits todavรญa" -#: wt-status.c:1741 +#: wt-status.c:1784 msgid "Untracked files" msgstr "Archivos sin seguimiento" -#: wt-status.c:1743 +#: wt-status.c:1786 msgid "Ignored files" msgstr "Archivos ignorados" -#: wt-status.c:1747 +#: wt-status.c:1790 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8372,31 +9515,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:1753 +#: wt-status.c:1796 #, c-format msgid "Untracked files not listed%s" msgstr "Archivos no rastreados no son mostrados %s" -#: wt-status.c:1755 +#: wt-status.c:1798 msgid " (use -u option to show untracked files)" msgstr " (usa la opciรณn -u para mostrar los archivos sin seguimiento)" -#: wt-status.c:1761 +#: wt-status.c:1804 msgid "No changes" msgstr "Sin cambios" -#: wt-status.c:1766 +#: wt-status.c:1809 #, 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:1769 +#: wt-status.c:1812 #, c-format msgid "no changes added to commit\n" msgstr "no se agregaron cambios al commit\n" -#: wt-status.c:1772 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8405,192 +9548,202 @@ msgstr "" "no hay nada agregado al commit pero hay archivos sin seguimiento presentes " "(usa \"git add\" para hacerles seguimiento)\n" -#: wt-status.c:1775 +#: wt-status.c:1818 #, 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:1778 +#: wt-status.c:1821 #, 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:1781 wt-status.c:1786 +#: wt-status.c:1824 wt-status.c:1829 #, c-format msgid "nothing to commit\n" msgstr "nada para hacer commit\n" -#: wt-status.c:1784 +#: wt-status.c:1827 #, 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:1788 +#: wt-status.c:1831 #, 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:1901 +#: wt-status.c:1944 msgid "No commits yet on " msgstr "No hay commits todavรญa en " -#: wt-status.c:1905 +#: wt-status.c:1948 msgid "HEAD (no branch)" msgstr "HEAD (sin rama)" -#: wt-status.c:1936 +#: wt-status.c:1979 msgid "different" msgstr "diferente" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1981 wt-status.c:1989 msgid "behind " msgstr "detrรกs " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1984 wt-status.c:1987 msgid "ahead " msgstr "adelante " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2509 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no se puede %s: Tienes cambios sin marcar." -#: wt-status.c:2472 +#: wt-status.c:2515 msgid "additionally, your index contains uncommitted changes." msgstr "adicionalmente, tu รญndice contiene cambios que no estรกn en un commit." -#: wt-status.c:2474 +#: wt-status.c:2517 #, 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." -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#, c-format +msgid "failed to unlink '%s'" +msgstr "fallรณ al desvincular '%s'" + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opciรณn>] [--] <especificaciรณn-de-ruta>..." -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "fallรณ la actualizaciรณn de carpetas" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "eliminar '%s'\n" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Cambios fuera del รกrea de stage tras refrescar el รญndice:" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:266 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "No se pudo leer el รญndice" -#: builtin/add.c:245 +#: builtin/add.c:277 #, c-format msgid "Could not open '%s' for writing." msgstr "No se pudo abrir '%s' para escritura." -#: builtin/add.c:249 +#: builtin/add.c:281 msgid "Could not write patch" msgstr "No se puede escribir el parche" -#: builtin/add.c:252 +#: builtin/add.c:284 msgid "editing patch failed" msgstr "fallรณ la ediciรณn del parche" -#: builtin/add.c:255 +#: builtin/add.c:287 #, c-format msgid "Could not stat '%s'" msgstr "No se pudo definir '%s'" -#: builtin/add.c:257 +#: builtin/add.c:289 msgid "Empty patch. Aborted." msgstr "Parche vacรญo. Abortado." -#: builtin/add.c:262 +#: builtin/add.c:294 #, c-format msgid "Could not apply '%s'" msgstr "No se pudo aplicar '%s'" -#: builtin/add.c:270 +#: builtin/add.c:302 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: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 +#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "dry run ( ejecuciรณn en seco)" -#: builtin/add.c:293 +#: builtin/add.c:325 msgid "interactive picking" msgstr "selecciรณn interactiva" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308 msgid "select hunks interactively" msgstr "elegir hunks de forma interactiva" -#: builtin/add.c:295 +#: builtin/add.c:327 msgid "edit current diff and apply" msgstr "editar diff actual y aplicar" -#: builtin/add.c:296 +#: builtin/add.c:328 msgid "allow adding otherwise ignored files" msgstr "permitir agregar caso contrario ignorar archivos" -#: builtin/add.c:297 +#: builtin/add.c:329 msgid "update tracked files" msgstr "actualizado las carpetas rastreadas" -#: builtin/add.c:298 +#: builtin/add.c:330 msgid "renormalize EOL of tracked files (implies -u)" msgstr "renormalizar EOL de los archivos rastreados (implica -u)" -#: builtin/add.c:299 +#: builtin/add.c:331 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:300 +#: builtin/add.c:332 msgid "add changes from all tracked and untracked files" msgstr "agregar los cambios de todas las carpetas con y sin seguimiento" -#: builtin/add.c:303 +#: builtin/add.c:335 msgid "ignore paths removed in the working tree (same as --no-all)" -msgstr "ignorar rutas removidas en el รกrbol de trabajo (lo mismo que --no-all)" +msgstr "" +"ignorar rutas eliminadas en el รกrbol de trabajo (lo mismo que --no-all)" -#: builtin/add.c:305 +#: builtin/add.c:337 msgid "don't add, only refresh the index" msgstr "no agregar, solo actualizar el รญndice" -#: builtin/add.c:306 +#: builtin/add.c:338 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:307 +#: builtin/add.c:339 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:309 builtin/update-index.c:1001 +#: builtin/add.c:341 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "sobrescribir el bit ejecutable de los archivos listados" -#: builtin/add.c:311 +#: builtin/add.c:343 msgid "warn when adding an embedded repository" msgstr "avisar cuando se agrega un repositorio incrustado" -#: builtin/add.c:326 +#: builtin/add.c:345 +msgid "backend for `git stash -p`" +msgstr "backend para `git stash -p`" + +#: builtin/add.c:363 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8621,177 +9774,201 @@ msgstr "" "\n" "Vea \"git help submodule\" para mรกs informaciรณn." -#: builtin/add.c:354 +#: builtin/add.c:391 #, c-format msgid "adding embedded git repository: %s" msgstr "agregando repositorio embebido: %s" -#: 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: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:379 +#: builtin/add.c:419 msgid "adding files failed" msgstr "fallรณ al agregar archivos" -#: builtin/add.c:419 +#: builtin/add.c:447 builtin/commit.c:345 +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 msgid "-A and -u are mutually incompatible" msgstr "-A y -u son mutuamente incompatibles" -#: builtin/add.c:426 +#: builtin/add.c:479 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:430 +#: builtin/add.c:483 #, 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:445 +#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506 +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:1713 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul requiere --pathspec-from-file" + +#: builtin/add.c:512 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nada especificado, nada agregado.\n" -#: builtin/add.c:446 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Tal vez quiso decir 'git add .'?\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/am.c:348 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "no se pudo analizar el script del autor" -#: builtin/am.c:432 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' fue borrado por el hook de applypatch-msg" -#: builtin/am.c:474 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "Lรญnea mal formada: '%s'." -#: builtin/am.c:512 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Fallรณ al copiar notas de '%s' a '%s'" -#: builtin/am.c:538 +#: builtin/am.c:542 msgid "fseek failed" msgstr "fall de fseek" -#: builtin/am.c:726 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "no se pudo analizar el parche '%s'" -#: builtin/am.c:791 +#: builtin/am.c:795 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:839 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "timestamp invรกlido" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "lรญnea Date invรกlida" -#: builtin/am.c:851 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "offset de zona horaria invรกlido" -#: builtin/am.c:944 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "Fallรณ al detectar el formato del parche." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:953 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "fallรณ al crear el directorio '%s'" -#: builtin/am.c:954 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "Fallรณ al dividir parches." -#: 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 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"." -#: builtin/am.c:1099 +#: builtin/am.c:1090 #, 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:1100 +#: builtin/am.c:1091 #, 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:1183 +#: builtin/am.c:1174 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:1211 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "El parche estรก vacรญo." -#: builtin/am.c:1277 +#: builtin/am.c:1267 #, c-format -msgid "invalid ident line: %.*s" -msgstr "sangrรญa no vรกlida: %.*s" +msgid "missing author line in commit %s" +msgstr "falta lรญnea autor en commit %s" -#: builtin/am.c:1299 +#: builtin/am.c:1270 #, c-format -msgid "unable to parse commit %s" -msgstr "no es posible analizar el commit %s" +msgid "invalid ident line: %.*s" +msgstr "sangrรญa no vรกlida: %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1489 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:1498 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "Usando la informaciรณn del รญndice para reconstruir un รกrbol base..." -#: builtin/am.c:1517 +#: builtin/am.c:1510 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:1523 +#: builtin/am.c:1516 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:1549 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "Fallรณ al fusionar en los cambios." -#: builtin/am.c:1581 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "aplicando a un historial vacรญo" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1621 builtin/am.c:1625 #, c-format msgid "cannot resume: %s does not exist." msgstr "no se puede continuar: %s no existe." -#: builtin/am.c:1650 +#: builtin/am.c:1643 msgid "Commit Body is:" msgstr "Cuerpo de commit es:" @@ -8799,45 +9976,49 @@ msgstr "Cuerpo de commit es:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1653 #, 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:1699 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "no es posible escribir en el archivo รญndice" -#: builtin/am.c:1710 +#: builtin/am.c:1703 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "รndice sucio: no se puede aplicar parches (sucio: %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1743 builtin/am.c:1811 #, c-format msgid "Applying: %.*s" msgstr "Aplicando: %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1760 msgid "No changes -- Patch already applied." msgstr "Sin cambios -- parche ya aplicado." -#: builtin/am.c:1773 +#: builtin/am.c:1766 #, c-format msgid "Patch failed at %s %.*s" msgstr "El parche fallรณ en %s %.*s" -#: 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:1770 +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:1821 +#: builtin/am.c:1814 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:1828 +#: builtin/am.c:1821 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8850,17 +10031,17 @@ msgstr "" "Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" " "en รฉl." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." -#: builtin/am.c:1987 +#: builtin/am.c:1980 msgid "failed to clean index" msgstr "fallรณ al limpiar el รญndice" -#: builtin/am.c:2031 +#: builtin/am.c:2024 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8868,161 +10049,173 @@ msgstr "" "Parece haber movido HEAD desde el รบltimo fallรณ 'am'.\n" "No rebobinando a ORIG_HEAD" -#: builtin/am.c:2128 +#: builtin/am.c:2131 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor invรกlido para --patch-format: %s" -#: builtin/am.c:2164 +#: builtin/am.c:2171 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "Valor invรกlido para --show-current-patch: %s" + +#: builtin/am.c:2175 +#, 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:2206 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" -#: builtin/am.c:2165 +#: builtin/am.c:2207 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opciones>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2213 msgid "run interactively" msgstr "ejecutar de manera interactiva" -#: builtin/am.c:2173 +#: builtin/am.c:2215 msgid "historical option -- no-op" msgstr "opciรณn histรณrica -- no-op" -#: builtin/am.c:2175 +#: builtin/am.c:2217 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:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16 +#: builtin/repack.c:306 builtin/stash.c:816 msgid "be quiet" msgstr "ser silencioso" -#: builtin/am.c:2178 +#: builtin/am.c:2220 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:2181 +#: builtin/am.c:2223 msgid "recode into utf8 (default)" msgstr "recodificar en utf8 (default)" -#: builtin/am.c:2183 +#: builtin/am.c:2225 msgid "pass -k flag to git-mailinfo" msgstr "pasar flag -k a git-mailinfo" -#: builtin/am.c:2185 +#: builtin/am.c:2227 msgid "pass -b flag to git-mailinfo" msgstr "pasar flag -b a git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2229 msgid "pass -m flag to git-mailinfo" msgstr "pasar flag -m a git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2231 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:2192 +#: builtin/am.c:2234 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:2195 +#: builtin/am.c:2237 msgid "strip everything before a scissors line" msgstr "descubrir todo antes de una lรญnea de tijeras" -#: 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 +#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 +#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/am.c:2266 msgid "pass it through git-apply" msgstr "pasarlo a travรฉs de git-apply" -#: 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:141 parse-options.h:162 parse-options.h:312 +#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321 +#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: 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 +#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 +#: bugreport.c:137 msgid "format" msgstr "formato" -#: builtin/am.c:2221 +#: builtin/am.c:2263 msgid "format the patch(es) are in" msgstr "formatear el parche(s)" -#: builtin/am.c:2227 +#: builtin/am.c:2269 msgid "override error message when patch failure occurs" msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" -#: builtin/am.c:2229 +#: builtin/am.c:2271 msgid "continue applying patches after resolving a conflict" msgstr "continuar aplicando los parches tras resolver conflictos" -#: builtin/am.c:2232 +#: builtin/am.c:2274 msgid "synonyms for --continue" msgstr "sinรณnimos para --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2277 msgid "skip the current patch" msgstr "saltar el parche actual" -#: builtin/am.c:2238 +#: builtin/am.c:2280 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:2241 +#: builtin/am.c:2283 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:2244 -msgid "show the patch being applied." -msgstr "muestra el parche siendo aplicado." +#: builtin/am.c:2287 +msgid "show the patch being applied" +msgstr "muestra el parche siendo aplicado" -#: builtin/am.c:2248 +#: builtin/am.c:2292 msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" -#: builtin/am.c:2250 +#: builtin/am.c:2294 msgid "use current timestamp for author date" msgstr "usar el timestamp actual para la fecha del autor" -#: 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 +#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 +#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 +#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381 msgid "GPG-sign commits" msgstr "Commits con firma GPG" -#: builtin/am.c:2256 +#: builtin/am.c:2300 msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" -#: builtin/am.c:2274 +#: builtin/am.c:2318 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รก removida. Por favor no la use mรกs." +"serรก eliminada. Por favor no la use mรกs." -#: builtin/am.c:2281 +#: builtin/am.c:2325 msgid "failed to read the index" msgstr "fallรณ al leer el รญndice" -#: builtin/am.c:2296 +#: builtin/am.c:2340 #, 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:2320 +#: builtin/am.c:2364 #, c-format msgid "" "Stray %s directory found.\n" @@ -9031,11 +10224,11 @@ msgstr "" "Directorio extraviado %s encontrado.\n" "Use \"git am --abort\" para borrarlo." -#: builtin/am.c:2326 +#: builtin/am.c:2370 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:2336 +#: builtin/am.c:2380 msgid "interactive mode requires patches on the command line" msgstr "modo interactivo requiere parches en la lรญnea de comando" @@ -9158,7 +10351,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:174 +#: builtin/bisect--helper.c:172 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -9166,27 +10359,27 @@ msgstr "" "no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset " "<commit>'." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:216 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mal argumento bisect_write: %s" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:221 #, 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:232 +#: builtin/bisect--helper.c:233 #, c-format msgid "couldn't open the file '%s'" msgstr "no se pudo abrir el archivo '%s'" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:259 #, 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:285 +#: builtin/bisect--helper.c:286 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9195,7 +10388,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:289 +#: builtin/bisect--helper.c:290 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9206,7 +10399,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:321 +#: builtin/bisect--helper.c:310 #, c-format msgid "bisecting only with a %s commit" msgstr "haciendo bisect solo con un commit %s" @@ -9215,15 +10408,15 @@ msgstr "haciendo bisect solo con un commit %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:318 msgid "Are you sure [Y/n]? " msgstr "ยฟEstรกs seguro [Y/n]? " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:379 msgid "no terms defined" msgstr "no hay tรฉrminos definidos" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:382 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9232,7 +10425,7 @@ msgstr "" "Tus tรฉrminos actuales son %s para el estado viejo\n" "y %s para el estado nuevo.\n" -#: builtin/bisect--helper.c:389 +#: builtin/bisect--helper.c:392 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9241,267 +10434,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:475 +#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473 +msgid "'' is not a valid term" +msgstr "'' no es un tรฉrmino vรกlido" + +#: builtin/bisect--helper.c:483 #, c-format msgid "unrecognized option: '%s'" msgstr "opciรณn desconocida: '%s'" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:487 #, 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:511 +#: builtin/bisect--helper.c:519 msgid "bad HEAD - I need a HEAD" msgstr "mal HEAD - Necesito un HEAD" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:534 #, 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:547 +#: builtin/bisect--helper.c:555 msgid "won't bisect on cg-seek'ed tree" msgstr "no se bisecarรก en un รกrbol con cg-seek" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:558 msgid "bad HEAD - strange symbolic ref" msgstr "mal HEAD - ref simbรณlico extraรฑo" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:582 #, c-format msgid "invalid ref: '%s'" msgstr "ref invรกlido: '%s'" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:638 msgid "perform 'git bisect next'" msgstr "realiza 'git bisect next'" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:640 msgid "write the terms to .git/BISECT_TERMS" msgstr "escribe los tรฉrminos a .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:642 msgid "cleanup the bisection state" msgstr "limpiar el estado de bisecciรณn" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:644 msgid "check for expected revs" msgstr "revisar por revs esperados" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:646 msgid "reset the bisection state" msgstr "reiniciar el estado de bisect" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:648 msgid "write out the bisection state in BISECT_LOG" msgstr "escribir el estado de bisect en BISECT_LOG" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:650 msgid "check and set terms in a bisection state" msgstr "revisar y configurar los terms en el estado de bisect" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:652 msgid "check whether bad or good terms exist" msgstr "revisar si existen tรฉrminos malos o buenos" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:654 msgid "print out the bisect terms" msgstr "imprimir los terms del bisect" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:656 msgid "start the bisect session" msgstr "comenzar la sesiรณn de bisect" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:658 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:652 +#: builtin/bisect--helper.c:660 msgid "no log for BISECT_WRITE" msgstr "no hay log para BISECT_WRITE" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:678 msgid "--write-terms requires two arguments" msgstr "--write-terms requiere dos argumentos" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:682 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state no requiere argumentos" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:689 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset requiere un commit o ningรบn argumento" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:693 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write requiere entre 4 o 5 argumentos" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:699 msgid "--check-and-set-terms requires 3 arguments" msgstr "--bisect-clean-state no requiere argumentos" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:705 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check requiere 2 o 3 argumentos" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:711 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms requiere 0 o 1 argumentos" -#: builtin/blame.c:32 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" -#: builtin/blame.c:37 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> estรกn documentadas en git-rev-list(1)" -#: builtin/blame.c:410 +#: builtin/blame.c:409 #, c-format msgid "expecting a color: %s" msgstr "esperando un color: %s" -#: builtin/blame.c:417 +#: builtin/blame.c:416 msgid "must end with a color" msgstr "tiene que terminar con un color" -#: builtin/blame.c:730 +#: builtin/blame.c:729 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "color invรกlido '%s' en color.blame.repeatedLines" -#: builtin/blame.c:748 +#: builtin/blame.c:747 msgid "invalid value for blame.coloring" msgstr "valor invรกlido para blame.coloring" -#: builtin/blame.c:823 +#: builtin/blame.c:822 #, c-format msgid "cannot find revision %s to ignore" msgstr "no se pudo encontrar revision %s para ignorar" -#: builtin/blame.c:845 +#: builtin/blame.c:844 msgid "Show blame entries as we find them, incrementally" msgstr "Mostrar las entradas blame como las encontramos, incrementalmente" -#: builtin/blame.c:846 +#: builtin/blame.c:845 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)" -#: builtin/blame.c:847 +#: builtin/blame.c:846 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "No tratar commits raรญces como extremos (Default: off)" -#: builtin/blame.c:848 +#: builtin/blame.c:847 msgid "Show work cost statistics" msgstr "Mostrar estadรญsticas de costo de trabajo" -#: builtin/blame.c:849 +#: builtin/blame.c:848 msgid "Force progress reporting" msgstr "Forzar el reporte de progreso" -#: builtin/blame.c:850 +#: builtin/blame.c:849 msgid "Show output score for blame entries" msgstr "Mostrar la puntuaciรณn de salida de las entradas de blame" -#: builtin/blame.c:851 +#: builtin/blame.c:850 msgid "Show original filename (Default: auto)" msgstr "Mostrar nombre original del archivo (Default: auto)" -#: builtin/blame.c:852 +#: builtin/blame.c:851 msgid "Show original linenumber (Default: off)" msgstr "Mostrar nรบmero de lรญnea original (Default: off)" -#: builtin/blame.c:853 +#: builtin/blame.c:852 msgid "Show in a format designed for machine consumption" msgstr "Mostrar en un formato diseรฑado para consumo de mรกquina" -#: builtin/blame.c:854 +#: builtin/blame.c:853 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:855 +#: builtin/blame.c:854 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:856 +#: builtin/blame.c:855 msgid "Show raw timestamp (Default: off)" msgstr "Mostrar timestamp en formato raw (Default: off)" -#: builtin/blame.c:857 +#: builtin/blame.c:856 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostrar SHA1 del commit en formato largo (Default: off)" -#: builtin/blame.c:858 +#: builtin/blame.c:857 msgid "Suppress author name and timestamp (Default: off)" msgstr "Suprimir nombre del autor y timestamp (Default: off)" -#: builtin/blame.c:859 +#: builtin/blame.c:858 msgid "Show author email instead of name (Default: off)" msgstr "Mostrar en cambio el email del autor (Default: off)" -#: builtin/blame.c:860 +#: builtin/blame.c:859 msgid "Ignore whitespace differences" msgstr "Ignorar diferencias de espacios en blanco" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:860 builtin/log.c:1721 msgid "rev" msgstr "rev" -#: builtin/blame.c:861 +#: builtin/blame.c:860 msgid "Ignore <rev> when blaming" -msgstr "ignorar <rev> durante el blame" +msgstr "Ignorar <rev> durante el blame" -#: builtin/blame.c:862 +#: builtin/blame.c:861 msgid "Ignore revisions from <file>" -msgstr "ignorar revisiones de <archivo>" +msgstr "Ignorar revisiones de <archivo>" -#: builtin/blame.c:863 +#: builtin/blame.c:862 msgid "color redundant metadata from previous line differently" msgstr "colorear metadata redundante de lรญneas previas de manera diferente" -#: builtin/blame.c:864 +#: builtin/blame.c:863 msgid "color lines by age" msgstr "colorear lรญneas por edad" -#: 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 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "Ocupo mรกs ciclos para encontrar mejoras resultados" -#: builtin/blame.c:874 +#: builtin/blame.c:865 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:875 +#: builtin/blame.c:866 msgid "Use <file>'s contents as the final image" msgstr "Usar contenido de <archivo> como imagen final" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "puntaje" -#: builtin/blame.c:876 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "Encontrar copias de lรญneas entre y a travรฉs de archivos" -#: builtin/blame.c:877 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "Encontrar movimientos de lรญneas entre y a travรฉs de archivos" -#: builtin/blame.c:878 +#: builtin/blame.c:869 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:869 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:929 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress no puede ser usado con --incremental o formatos porcelana" @@ -9513,7 +10706,7 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "hace 4 aรฑos, 11 meses" @@ -9715,7 +10908,7 @@ msgid "" msgstr "" "Por favor, edita la descripciรณn para la rama\n" "%s\n" -"Las lรญneas que comiencen con '%c' serรกn removidas.\n" +"Las lรญneas que comiencen con '%c' serรกn eliminadas.\n" #: builtin/branch.c:618 msgid "Generic options" @@ -9737,7 +10930,7 @@ msgstr "configurando modo tracking (mirar git-pull(1))" msgid "do not use" msgstr "no usar" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:520 msgid "upstream" msgstr "upstream" @@ -9746,8 +10939,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" @@ -9829,68 +11022,68 @@ msgstr "muestra solo ramas que no han sido fusionadas" msgid "list branches in columns" msgstr "muestra las ramas en columnas" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 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 +#: builtin/tag.c:434 msgid "object" msgstr "objeto" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "imprimir sรณlo las ramas del objeto" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "ordenamiento y filtrado son case-insensitive" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "formato para usar para el output" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:682 builtin/clone.c:789 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 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "--column y --verbose son incompatibles" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "se necesita el nombre de la rama" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "No se puede dar descripciรณn al HEAD desacoplado" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "no se puede editar la descripciรณn de mรกs de una rama" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aรบn no hay commits en la rama '%s'." -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "No hay ninguna rama llamada '%s'." -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "demasiadas ramas para una operaciรณn de copiado" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "demasiados argumentos para una operaciรณn de renombrado" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "demasiados argumentos para configurar un nuevo upstream" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -9898,32 +11091,32 @@ msgstr "" "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "no hay tal rama '%s'" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "la rama '%s' no existe" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "demasiados argumentos para desconfigurar upstream" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Rama '%s' no tiene informaciรณn de upstream" -#: builtin/branch.c:841 +#: builtin/branch.c:839 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>?" @@ -9931,7 +11124,7 @@ msgstr "" "Las opciones -a, y -r, de 'git branch' no toman un nombre de rama.\n" "ยฟQuisiste usar: -a|-r --list <patrรณn>?" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -9939,20 +11132,65 @@ msgstr "" "la opciรณn '--set-upstream' ya no es soportada. Considere usar '--track' o '--" "set-upstream-to' en cambio." -#: builtin/bundle.c:45 -#, c-format -msgid "%s is okay\n" -msgstr "%s estรก bien\n" +#: 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:58 +#: builtin/bundle.c:66 builtin/pack-objects.c:3448 +msgid "do not show progress meter" +msgstr "no mostrar medidor de progreso" + +#: builtin/bundle.c:68 builtin/pack-objects.c:3450 +msgid "show progress meter" +msgstr "mostrar medidor de progreso" + +#: builtin/bundle.c:70 builtin/pack-objects.c:3452 +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:3455 +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:62 +#: builtin/bundle.c:104 +msgid "do not show bundle details" +msgstr "no mostrar detalles del bundle" + +#: builtin/bundle.c:119 +#, c-format +msgid "%s is okay\n" +msgstr "%s estรก bien\n" + +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "Se necesita un repositorio para desagrupar." -#: builtin/cat-file.c:594 +#: 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:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -9960,80 +11198,80 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:599 msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<formato>] | --batch-check[=<formato>]) [--follow-" +"symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "solo se puede especificar una opciรณn batch" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> puede ser: blob, tree, commit, tag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "mostrar el tipo del objeto" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "mostrar el tamaรฑo del objeto" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "salir con cero cuando no haya error" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "realizar pretty-print del contenido del objeto" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:645 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:643 +#: builtin/cat-file.c:647 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:644 git-submodule.sh:936 +#: builtin/cat-file.c:648 git-submodule.sh:958 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "use una ruta especรญfica para --textconv/--filters" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:651 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:648 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "salida buffer --batch" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:654 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:654 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "mostrar info de los objetos alimentados por standard input" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:662 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:660 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "mostrar todos los objetos con --batch o --batch-check" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "no ordenar el output de --batch-all-objects" @@ -10061,8 +11299,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:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" @@ -10074,27 +11312,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:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "no se puede especificar los nombres de rutas con --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z sรณlo tiene sentido con --stdin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "ruta no especificada" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 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:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "no se puede tener ambos --quiet y --verbose" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching sรณlo es vรกlida con --verbose" @@ -10154,9 +11392,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:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 +#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 +#: builtin/worktree.c:754 msgid "string" msgstr "string" @@ -10184,98 +11422,98 @@ msgstr "git switch [<opciones>] [<rama>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<opciones>] [--source=<rama>] -- <archivo>..." -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "ruta '%s' no tiene nuestra versiรณn" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "ruta '%s' no tiene su versiรณn" -#: builtin/checkout.c:190 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "ruta '%s' no tiene todas las versiones necesarias" -#: builtin/checkout.c:240 +#: builtin/checkout.c:256 #, c-format msgid "path '%s' does not have necessary versions" msgstr "ruta '%s' no tiene versiones necesarias" -#: builtin/checkout.c:258 +#: builtin/checkout.c:274 #, c-format msgid "path '%s': cannot merge" msgstr "ruta '%s': no se puede fusionar" -#: builtin/checkout.c:274 +#: builtin/checkout.c:290 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Incapaz de agregar resultados de fusiรณn a '%s'" -#: builtin/checkout.c:374 +#: builtin/checkout.c:395 #, 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:379 +#: builtin/checkout.c:400 #, 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:386 +#: builtin/checkout.c:407 #, 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:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 +#: builtin/checkout.c:440 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no puede ser usada con rutas actualizadas" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:443 builtin/checkout.c:446 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no puede ser usado con %s" -#: builtin/checkout.c:429 +#: builtin/checkout.c:450 #, 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:433 +#: builtin/checkout.c:454 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s' o '%s' estรกn especificados" -#: builtin/checkout.c:437 +#: builtin/checkout.c:458 #, 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:442 builtin/checkout.c:447 +#: builtin/checkout.c:463 builtin/checkout.c:468 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' o '%s' no puede ser usado con %s" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:527 builtin/checkout.c:534 #, c-format msgid "path '%s' is unmerged" msgstr "ruta '%s' no esta fusionada" -#: builtin/checkout.c:679 +#: builtin/checkout.c:702 msgid "you need to resolve your current index first" msgstr "necesitas resolver tu รญndice actual primero" -#: builtin/checkout.c:729 +#: builtin/checkout.c:756 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10284,56 +11522,50 @@ msgstr "" "no se puede continuar con los cambios en stage en los siguientes archivos:\n" "%s" -#: 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 +#: builtin/checkout.c:859 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:875 +#: builtin/checkout.c:901 msgid "HEAD is now at" msgstr "HEAD estรก ahora en" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:905 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:909 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:912 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:916 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:918 builtin/checkout.c:1342 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:920 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:971 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d mรกs.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:977 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10356,7 +11588,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:996 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10383,28 +11615,19 @@ msgstr[1] "" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1031 msgid "internal error in revision walk" msgstr "error interno en camino de revisiรณn" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1035 msgid "Previous HEAD position was" msgstr "La posiciรณn previa de HEAD era" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1075 builtin/checkout.c:1337 msgid "You are on a branch yet to be born" msgstr "Estรกs en una rama por nacer" -#: 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 +#: builtin/checkout.c:1150 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10413,37 +11636,72 @@ 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:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1157 +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:1167 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "'%s' concordรณ con multiples (%d) ramas de rastreo remoto" + +#: builtin/checkout.c:1233 +msgid "only one reference expected" +msgstr "solo una referencia esperada" + +#: builtin/checkout.c:1250 +#, c-format +msgid "only one reference expected, %d given." +msgstr "solo una referencia esperada, %d entregadas." + +#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "referencia invรกlida: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1309 builtin/checkout.c:1675 #, c-format msgid "reference is not a tree: %s" msgstr "la referencia no es n รกrbol: %s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1356 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "se esperaba un branch, se obtuvo tag '%s'" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1358 #, 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:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1359 builtin/checkout.c:1367 #, c-format msgid "a branch is expected, got '%s'" msgstr "se esperaba branch, se obuto '%s'" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1362 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "se espera una rama, se obtuvo commit '%s'" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1378 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10451,7 +11709,7 @@ msgstr "" "no se puede cambiar de branch durante un merge\n" "Considera \"git merge --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1382 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -10459,7 +11717,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:1333 +#: builtin/checkout.c:1386 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10467,7 +11725,7 @@ msgstr "" "no se puede cambiar de branch durante un rebase\n" "Considera \"git rebase --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1390 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10475,7 +11733,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:1341 +#: builtin/checkout.c:1394 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10483,137 +11741,144 @@ msgstr "" "no se puede cambiar de branch durante un revert\n" "Considera \"git revert --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1398 msgid "you are switching branch while bisecting" msgstr "estรกs cambiando ramas durante un bisect" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1405 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426 +#: builtin/checkout.c:1431 builtin/checkout.c:1436 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1433 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' no puede tomar <punto de partida>" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1441 #, 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:1395 +#: builtin/checkout.c:1448 msgid "missing branch or commit argument" msgstr "falta branch o commit como argumento" -#: 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 +#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82 +#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "forzar el reporte de progreso" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1491 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:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1493 msgid "conflict style (merge or diff3)" msgstr "conflicto de estilos (merge o diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1505 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1506 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1508 msgid "force checkout (throw away local modifications)" msgstr "forzar el checkout (descartar modificaciones locales)" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1510 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1510 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1512 builtin/merge.c:292 msgid "update ignored files (default)" msgstr "actualizar archivos ignorados (default)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1515 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:1475 +#: builtin/checkout.c:1528 msgid "checkout our version for unmerged files" msgstr "hacer checkout a nuestra versiรณn para archivos sin fusionar" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1531 msgid "checkout their version for unmerged files" msgstr "hacer checkout a su versiรณn para los archivos sin fusionar" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1535 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a dispersar entradas solamente" -#: builtin/checkout.c:1533 -msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-b, -B y --orphan son mutuamente exclusivas" +#: builtin/checkout.c:1590 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "-%c, -%c y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1594 msgid "-p and --overlay are mutually exclusive" msgstr "-p y --overlay son mutuamente exclusivas" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1631 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1578 -msgid "missing branch name; try -b" -msgstr "falta nombre de rama; prueba -b" +#: builtin/checkout.c:1636 +#, c-format +msgid "missing branch name; try -%c" +msgstr "falta nombre de rama; prueba -%c" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1668 #, c-format msgid "could not resolve %s" msgstr "no se pudo resolver %s" -#: builtin/checkout.c:1623 -msgid "you must specify path(s) to restore" -msgstr "debes especificar path(s) para restaurar" - -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1684 msgid "invalid path specification" msgstr "especificaciรณn de ruta invรกlida" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1691 #, 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:1642 +#: builtin/checkout.c:1695 #, 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:1646 +#: builtin/checkout.c:1704 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file es incompatible con --detach" + +#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file es incompatible con --patch" + +#: builtin/checkout.c:1718 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10621,135 +11886,110 @@ msgstr "" "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n" "se revisa fuera del รญndice." -#: 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 +msgid "you must specify path(s) to restore" +msgstr "debes especificar path(s) para restaurar" -#: 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 +#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800 +#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554 +#: builtin/worktree.c:556 msgid "branch" msgstr "rama" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1750 msgid "create and checkout a new branch" msgstr "crear y hacer checkout a una nueva rama" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1752 msgid "create/reset and checkout a branch" msgstr "crear/reiniciar y hacer checkout a una rama" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1753 msgid "create reflog for new branch" msgstr "crear un reflog para una nueva rama" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1755 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "adivinar segunda opciรณn 'git checkout <no-hay-tal-rama>' (default)" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1756 msgid "use overlay mode (default)" msgstr "usar modo overlay (default)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1801 msgid "create and switch to a new branch" msgstr "crear y hacer switch a una nueva rama" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1803 msgid "create/reset and switch to a branch" msgstr "crear/reiniciar y hacer switch a una rama" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1805 msgid "second guess 'git switch <no-such-branch>'" msgstr "adivinar segunda opciรณn 'git checkout <no-hay-tal-rama>'" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1807 msgid "throw away local modifications" msgstr "descartar modificaciones locales" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1841 msgid "which tree-ish to checkout from" msgstr "de quรฉ รกrbol hacer el checkout" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1843 msgid "restore the index" msgstr "restaurar el index" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1845 msgid "restore the working tree (default)" msgstr "restaurar el รกrbol de trabajo (default)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1847 msgid "ignore unmerged entries" msgstr "ignorar entradas no fusionadas" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1848 msgid "use overlay mode" msgstr "usar modo overlay" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <patrรณn>] [-x | -X] [--] <rutas>..." -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "Borrando %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "Sera borrado %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "Saltando repositorio %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "Se saltara repositorio %s\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "fallรณ al borrar %s" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "no se pudo lstat %s\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10762,7 +12002,7 @@ msgstr "" "foo - selecciona un objeto basado en un prefijo รบnico\n" " - (vacรญo) no elegir nada\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10783,38 +12023,33 @@ msgstr "" "* - escoger todos los objetos\n" " - (vacรญo) terminar selecciรณn\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" -msgstr "Ahh (%s)?\n" +msgstr "ยฟAhh (%s)?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "Input ignora los patrones >> " -#: builtin/clean.c:699 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s" -#: builtin/clean.c:720 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Seleccionar objetos para borrar" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:758 #, c-format msgid "Remove %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" +msgstr "ยฟBorrar %s [y/N]? " -#: builtin/clean.c:794 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10832,64 +12067,52 @@ msgstr "" "help - esta ventana\n" "? - ayuda para selecciรณn de opciones" -#: 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 +#: builtin/clean.c:825 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:846 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "No hay mรกs archivos para limpiar, saliendo." -#: builtin/clean.c:908 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "no imprimir nombres de archivos borrados" -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "force" msgstr "forzar" -#: builtin/clean.c:911 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "limpieza interactiva" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "borrar directorios completos" -#: 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/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "patrรณn" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "agregar <patrรณn> para ignorar reglas" -#: builtin/clean.c:916 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "borrar archivos ignorados, tambiรฉn" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "borrar solo archivos ignorados" -#: builtin/clean.c:936 -msgid "-x and -X cannot be used together" -msgstr "-x y -X no pueden ser usadas juntas" - -#: builtin/clean.c:940 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -10897,7 +12120,7 @@ msgstr "" "clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; " "rehusando el clean" -#: builtin/clean.c:943 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -10905,7 +12128,11 @@ msgstr "" "clean.requireForce default en true y ninguno -i, -n, ni -f entregados; " "rehusando el clean" -#: builtin/clone.c:46 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "-x y -X no pueden ser usadas juntas" + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opciones>] [--] <repo> [<directorio>]" @@ -10913,7 +12140,7 @@ msgstr "git clone [<opciones>] [--] <repo> [<directorio>]" msgid "don't create a checkout" msgstr "no crear checkout" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554 msgid "create a bare repository" msgstr "crear un repositorio vacรญo" @@ -10933,11 +12160,11 @@ msgstr "no usar hardlinks, siempre copiar" msgid "setup as shared repository" msgstr "configurar como repositorio compartido" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "pathspec" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "inicializar submรณdulos en el clonado" @@ -10945,26 +12172,26 @@ msgstr "inicializar submรณdulos en el clonado" msgid "number of submodules cloned in parallel" msgstr "numero de submรณdulos clonados en paralelo" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:551 msgid "template-directory" msgstr "directorio-template" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:552 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:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1912 msgid "reference repository" msgstr "repositorio de referencia" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1914 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:3314 builtin/repack.c:319 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329 msgid "name" msgstr "nombre" @@ -10980,8 +12207,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:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848 +#: builtin/pull.c:208 msgid "depth" msgstr "profundidad" @@ -10989,7 +12216,8 @@ 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:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503 +#: builtin/pull.c:211 msgid "time" msgstr "tiempo" @@ -10997,16 +12225,17 @@ 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:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 msgid "revision" msgstr "revision" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "ahondando historia de clon superficial, excluyendo rev" -#: builtin/clone.c:132 +#: builtin/clone.c:132 builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1928 msgid "clone only one branch, HEAD or --branch" msgstr "clonar solo una rama,HEAD o --branch" @@ -11018,11 +12247,11 @@ msgstr "no clonar ningรบn tag, y hacer que los subsiguientes fetch no los sigan" msgid "any cloned submodules will be shallow" msgstr "cualquier submรณdulo clonado serรก superficial" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:560 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:561 msgid "separate git dir from working tree" msgstr "separa git dir del รกrbol de trabajo" @@ -11034,23 +12263,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:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171 msgid "server-specific" msgstr "especifico-de-servidor" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172 msgid "option to transmit" msgstr "opciรณn para trasmitir" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234 +#: builtin/push.c:571 msgid "use IPv4 addresses only" msgstr "solo usar direcciones IPv4" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237 +#: builtin/push.c:573 msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" @@ -11058,7 +12287,12 @@ 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:285 +#: 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 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11066,47 +12300,42 @@ 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:338 +#: builtin/clone.c:340 #, 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:411 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe pero no es un directorio" -#: builtin/clone.c:428 +#: builtin/clone.c:431 #, c-format msgid "failed to start iterator over '%s'" msgstr "fallรณ al iniciar el iterador sobre '%s'" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "fallรณ al desvincular '%s'" - -#: builtin/clone.c:458 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "fallรณ al crear link '%s'" -#: builtin/clone.c:462 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "fallรณ al copiar archivo a '%s'" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "fallรณ al iterar sobre '%s'" -#: builtin/clone.c:492 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "hecho.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:512 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11116,96 +12345,100 @@ 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:583 +#: builtin/clone.c:589 #, 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:702 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: builtin/clone.c:752 +#: builtin/clone.c:756 +msgid "failed to initialize sparse-checkout" +msgstr "fallรณ al inicializar sparse-checkout" + +#: builtin/clone.c:779 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:783 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "no es posible realizar checkout en el รกrbol de trabajo" -#: builtin/clone.c:833 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "no es posible escribir parรกmetros al archivo config" -#: builtin/clone.c:896 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "no se puede reempaquetar para limpiar" -#: builtin/clone.c:898 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "no se puede desvincular archivos alternos temporales" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:971 builtin/receive-pack.c:1982 msgid "Too many arguments." msgstr "Muchos argumentos." -#: builtin/clone.c:942 +#: builtin/clone.c:975 msgid "You must specify a repository to clone." msgstr "Tienes que especificar un repositorio para clonar." -#: builtin/clone.c:955 +#: builtin/clone.c:988 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Las opciones --bare y --origin %s son incompatibles." -#: builtin/clone.c:958 +#: builtin/clone.c:991 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare y --separate-git-dir son incompatibles." -#: builtin/clone.c:971 +#: builtin/clone.c:1007 #, c-format msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:1011 builtin/fetch.c:1794 #, c-format msgid "depth %s is not a positive number" msgstr "profundidad %s no es un numero positivo" -#: builtin/clone.c:987 +#: builtin/clone.c:1021 #, 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:997 +#: builtin/clone.c:1033 #, c-format msgid "working tree '%s' already exists." msgstr "directorio de trabajo '%s' ya existe." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271 +#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" -#: builtin/clone.c:1017 +#: builtin/clone.c:1053 #, c-format msgid "could not create work tree dir '%s'" msgstr "no se pudo crear un รกrbol de trabajo '%s'" -#: builtin/clone.c:1037 +#: builtin/clone.c:1073 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonando en un repositorio vacรญo '%s'...\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1075 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonando en '%s'...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1099 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11213,36 +12446,36 @@ msgstr "" "clone --recursive no es compatible con --reference y --reference-if-able al " "mismo tiempo" -#: builtin/clone.c:1124 +#: builtin/clone.c:1164 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:1126 +#: builtin/clone.c:1166 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:1128 +#: builtin/clone.c:1168 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude es ignorado en clones locales; use file://." -#: builtin/clone.c:1130 +#: builtin/clone.c:1170 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:1133 +#: builtin/clone.c:1173 msgid "source repository is shallow, ignoring --local" msgstr "repositorio fuente es superficial, ignorando --local" -#: builtin/clone.c:1138 +#: builtin/clone.c:1178 msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1262 builtin/clone.c:1270 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1226 +#: builtin/clone.c:1273 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -11278,6 +12511,105 @@ msgstr "Realizando padding entre columnas" msgid "--command must be the first argument" msgstr "--command debe ser el primer argumento" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:21 +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:14 builtin/commit-graph.c:26 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]progress] <split options>" +msgstr "" +"git commit-graph write [--object-dir <objeto dir>] [--append] [--" +"split[=<estrategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]progress] <opciones de split>" + +#: builtin/commit-graph.c:62 +#, c-format +msgid "could not find object directory matching %s" +msgstr "no se pudo entoncrar el objeto directorio concordante con %s" + +#: builtin/commit-graph.c:78 builtin/commit-graph.c:177 +#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678 +msgid "dir" +msgstr "dir" + +#: builtin/commit-graph.c:79 builtin/commit-graph.c:178 +#: builtin/commit-graph.c:277 +msgid "The object directory to store the graph" +msgstr "El directorio de objetos para guardar el grรกfico" + +#: builtin/commit-graph.c:81 +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:104 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "No se pudo abrir commit-graph '%s'" + +#: builtin/commit-graph.c:138 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "argumento --split no reconocido, %s" + +#: builtin/commit-graph.c:151 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "ID de objeto no hex inesperado :%s" + +#: builtin/commit-graph.c:156 +#, c-format +msgid "invalid object: %s" +msgstr "no es un objeto vรกlido: %s" + +#: builtin/commit-graph.c:180 +msgid "start walk at all refs" +msgstr "comenzar caminata en todas las refs" + +#: builtin/commit-graph.c:182 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "escanear paquete de รญndices por stdin por commits" + +#: builtin/commit-graph.c:184 +msgid "start walk at commits listed by stdin" +msgstr "comenzar a caminar a los commits listados por stdin" + +#: builtin/commit-graph.c:186 +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:188 +msgid "enable computation for changed paths" +msgstr "habilitar computaciรณn para rutas cambiadas" + +#: builtin/commit-graph.c:191 +msgid "allow writing an incremental commit-graph file" +msgstr "permitir escribir un archivo commit-graph incremental" + +#: builtin/commit-graph.c:195 +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:197 +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:199 +msgid "only expire files older than a given date-time" +msgstr "expirar objetos mรกs viejos a una fecha dada" + +#: builtin/commit-graph.c:215 +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" + +#: builtin/commit-graph.c:245 +msgid "Collecting commits from input" +msgstr "Recolectando commits del input" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -11291,7 +12623,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:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547 #, c-format msgid "not a valid object name %s" msgstr "no es un nombre de objeto vรกlido %s" @@ -11319,13 +12651,13 @@ msgstr "padre" msgid "id of a parent commit object" msgstr "id del objeto commit padre" -#: 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 +#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 +#: builtin/tag.c:413 msgid "message" msgstr "mensaje" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1506 msgid "commit message" msgstr "mensaje del commit" @@ -11333,8 +12665,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:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Firmar commit con GPG" @@ -11380,10 +12712,14 @@ msgstr "" "\n" #: builtin/commit.c:63 +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "Caso contrario, por favor usa 'git rebase --skip'\n" + +#: builtin/commit.c:66 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Caso contrario, por favor usa 'git cherry-pick --skip'\n" -#: builtin/commit.c:66 +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -11405,61 +12741,73 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "fallรณ al desempaquetar objeto del รกrbol HEAD" -#: builtin/commit.c:356 +#: builtin/commit.c:348 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "--pathspec-from-file con -a no tiene sentido" + +#: builtin/commit.c:361 +msgid "No paths with --include/--only does not make sense." +msgstr "No hay rutas con --include/--only no tiene sentido." + +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "no es posible crear un รญndice temporal" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "adiciรณn interactiva fallida" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "no es posible actualizar el รญndice temporal" -#: builtin/commit.c:378 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "Fallรณ al actualizar el cache principal del รกrbol" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "no es posible escribir archivo new_index" -#: builtin/commit.c:455 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "no se puede realizar un commit parcial durante una fusiรณn." -#: builtin/commit.c:457 +#: builtin/commit.c:478 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:465 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "no se puede realizar un commit parcial durante un rebase." + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "no se puede leer el รญndice" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "no es posible escribir el รญndice temporal" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "commit '%s' requiere cabecera de autor" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "el commit '%s' tiene una lรญnea de autor mal formada" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "parรกmetro --author mal formado" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11467,38 +12815,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:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 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:708 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "no se pudo leer log desde standard input" -#: builtin/commit.c:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "no se pudo leer el log '%s'" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "no se pudo leer SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "no se pudo leer MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "no se pudo escribir el template del commit" -#: builtin/commit.c:829 +#: builtin/commit.c:852 #, c-format msgid "" "\n" @@ -11509,11 +12857,11 @@ msgid "" msgstr "" "\n" "Parece que estรกs haciendo un commit con una fusiรณn dentro.\n" -"Si esto no es correcto, por favor remueve el archivo\n" +"Si esto no es correcto, por favor elimina el archivo\n" "\t%s\n" "y vuelve a intentar.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:857 #, c-format msgid "" "\n" @@ -11528,169 +12876,169 @@ msgstr "" "\t%s\n" "y vuelve a intentar.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:870 #, 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 lรญneas que " -"comiencen\n" -"con '%c' serรกn ignoradas, y un mensaje vacรญo aborta el commit.\n" +"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" -#: builtin/commit.c:855 +#: builtin/commit.c:878 #, 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 lรญneas que " -"comiencen\n" -"con '%c' serรกn guardadas; puede eliminarlas usted mismo si desea.\n" +"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" "Un mensaje vacรญo aborta el commit.\n" -#: builtin/commit.c:872 +#: builtin/commit.c:895 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:903 #, c-format msgid "%sDate: %s" msgstr "%sFecha: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:910 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:928 msgid "Cannot read index" msgstr "No se puede leer el รญndice" -#: builtin/commit.c:972 +#: builtin/commit.c:999 msgid "Error building trees" msgstr "Error al construir los รกrboles" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1013 builtin/tag.c:276 #, 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:1030 +#: builtin/commit.c:1057 #, 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:1044 +#: builtin/commit.c:1071 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo ignorado invรกlido '%s'" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1089 builtin/commit.c:1333 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo invรกlido de los archivos no rastreados '%s'" -#: builtin/commit.c:1102 +#: builtin/commit.c:1129 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1146 +#: builtin/commit.c:1173 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambos --reset-author y --author no tiene sentido" -#: builtin/commit.c:1155 +#: builtin/commit.c:1182 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1158 +#: builtin/commit.c:1185 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:1160 +#: builtin/commit.c:1187 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:1163 +#: builtin/commit.c:1189 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "Estรกs en medio de una fusiรณn -- no puedes enmendar." + +#: builtin/commit.c:1192 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1173 +#: builtin/commit.c:1202 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:1175 +#: builtin/commit.c:1204 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:1183 +#: builtin/commit.c:1213 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:1200 +#: builtin/commit.c:1231 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: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 +#: builtin/commit.c:1237 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "paths '%s ...' con -a no tiene sentido" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1370 builtin/commit.c:1531 msgid "show branch information" msgstr "mostrar informaciรณn de la rama" -#: builtin/commit.c:1343 +#: builtin/commit.c:1372 msgid "show stash information" msgstr "mostrar informaciรณn del stash" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1374 builtin/commit.c:1533 msgid "compute full ahead/behind values" msgstr "calcular todos los valores delante/atrรกs" -#: builtin/commit.c:1347 +#: builtin/commit.c:1376 msgid "version" msgstr "version" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "output formato-maquina" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1379 builtin/commit.c:1537 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1382 builtin/commit.c:1540 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: 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 +#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336 msgid "mode" msgstr "modo" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1385 builtin/commit.c:1543 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:1360 +#: builtin/commit.c:1389 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11698,11 +13046,11 @@ msgstr "" "mostrar archivos ignorados, modos opcionales: traditional, matching, no. " "(Predeterminado: traditional)" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1391 parse-options.h:192 msgid "when" msgstr "cuando" -#: builtin/commit.c:1363 +#: builtin/commit.c:1392 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11710,173 +13058,173 @@ msgstr "" "ignorar cambios en submรณdulos, opcional cuando: all,dirty,untracked. " "(Default: all)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1394 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1366 +#: builtin/commit.c:1395 msgid "do not detect renames" msgstr "no detectar renombrados" -#: builtin/commit.c:1368 +#: builtin/commit.c:1397 msgid "detect renames, optionally set similarity index" msgstr "detectar renombres, opcionalmente configurar similaridad de รญndice" -#: builtin/commit.c:1388 +#: builtin/commit.c:1417 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:1493 +#: builtin/commit.c:1499 msgid "suppress summary after successful commit" msgstr "suprime summary tras un commit exitoso" -#: builtin/commit.c:1494 +#: builtin/commit.c:1500 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1496 +#: builtin/commit.c:1502 msgid "Commit message options" msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1498 +#: builtin/commit.c:1504 msgid "author" msgstr "autor" -#: builtin/commit.c:1498 +#: builtin/commit.c:1504 msgid "override author for commit" msgstr "sobrescribe el autor del commit" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1505 builtin/gc.c:538 msgid "date" msgstr "fecha" -#: builtin/commit.c:1499 +#: builtin/commit.c:1505 msgid "override date for commit" msgstr "sobrescribe la fecha del commit" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 +#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1501 +#: builtin/commit.c:1507 msgid "reuse and edit message from specified commit" msgstr "reusar y editar el mensaje de un commit especifico" -#: builtin/commit.c:1502 +#: builtin/commit.c:1508 msgid "reuse message from specified commit" msgstr "reusar el mensaje de un commit especifico" -#: builtin/commit.c:1503 +#: builtin/commit.c:1509 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensaje de formato autosquashย para arreglar el commit especificado" -#: builtin/commit.c:1504 +#: builtin/commit.c:1510 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:1505 +#: builtin/commit.c:1511 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:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "agregar Signed-off-by: (firmado por)" -#: builtin/commit.c:1507 +#: builtin/commit.c:1513 msgid "use specified template file" msgstr "usar archivo de template especificado" -#: builtin/commit.c:1508 +#: builtin/commit.c:1514 msgid "force edit of commit" msgstr "forzar la ediciรณn del commit" -#: builtin/commit.c:1510 +#: builtin/commit.c:1516 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1515 +#: builtin/commit.c:1521 msgid "Commit contents options" msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1516 +#: builtin/commit.c:1522 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1517 +#: builtin/commit.c:1523 msgid "add specified files to index for commit" msgstr "agregar archivos especรญficos al รญndice para confirmar" -#: builtin/commit.c:1518 +#: builtin/commit.c:1524 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1519 +#: builtin/commit.c:1525 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1520 +#: builtin/commit.c:1526 msgid "commit only specified files" msgstr "sรณlo confirmar archivos especรญficos" -#: builtin/commit.c:1521 +#: builtin/commit.c:1527 msgid "bypass pre-commit and commit-msg hooks" msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1522 +#: builtin/commit.c:1528 msgid "show what would be committed" msgstr "mostrar lo que serรญa incluido en el commit" -#: builtin/commit.c:1535 +#: builtin/commit.c:1541 msgid "amend previous commit" msgstr "enmendar commit previo" -#: builtin/commit.c:1536 +#: builtin/commit.c:1542 msgid "bypass post-rewrite hook" msgstr "gancho bypass post reescritura" -#: builtin/commit.c:1541 +#: builtin/commit.c:1549 msgid "ok to record an empty change" msgstr "ok al grabar un cambio vacรญo" -#: builtin/commit.c:1543 +#: builtin/commit.c:1551 msgid "ok to record a change with an empty message" msgstr "ok al grabar un cambio con un mensaje vacรญo" -#: builtin/commit.c:1616 +#: builtin/commit.c:1624 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1623 +#: builtin/commit.c:1631 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1652 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1659 #, 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:1654 +#: builtin/commit.c:1664 #, 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:1688 +#: builtin/commit.c:1698 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -11886,282 +13234,216 @@ 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 -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 <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] <split options>" -msgstr "" -"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <split options>" - -#: 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: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: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: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:164 -msgid "start walk at all refs" -msgstr "comenzar caminata en todas las refs" - -#: 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:168 -msgid "start walk at commits listed by stdin" -msgstr "comenzar a caminar a los commits listados por stdin" - -#: 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:172 -msgid "allow writing an incremental commit-graph file" -msgstr "permitir escribir un archivo commit-graph incremental" - -#: 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: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: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" - #: builtin/config.c:11 msgid "git config [<options>]" msgstr "git config [<opciones>]" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:104 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "argumento --type no reconocido, %s" -#: builtin/config.c:115 +#: builtin/config.c:116 msgid "only one type at a time" msgstr "solo un tipo a la vez" -#: builtin/config.c:124 +#: builtin/config.c:125 msgid "Config file location" msgstr "Ubicaciรณn del archivo configuraciรณn" -#: builtin/config.c:125 +#: builtin/config.c:126 msgid "use global config file" msgstr "usar archivo de config global" -#: builtin/config.c:126 +#: builtin/config.c:127 msgid "use system config file" msgstr "usar archivo de config del sistema" -#: builtin/config.c:127 +#: builtin/config.c:128 msgid "use repository config file" msgstr "usar archivo de config del repositorio" -#: builtin/config.c:128 +#: builtin/config.c:129 msgid "use per-worktree config file" msgstr "usar un archivo de config por รกrbol de trabajo" -#: builtin/config.c:129 +#: builtin/config.c:130 msgid "use given config file" msgstr "usar archivo config especificado" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "read config from given blob object" msgstr "leer config del objeto blob suministrado" -#: builtin/config.c:131 +#: builtin/config.c:132 msgid "Action" msgstr "Acciรณn" -#: builtin/config.c:132 +#: builtin/config.c:133 msgid "get value: name [value-regex]" msgstr "obtener valor: nombre [valor-regex]" -#: builtin/config.c:133 +#: builtin/config.c:134 msgid "get all values: key [value-regex]" msgstr "obtener todos los valores: llave [valores-regex]" -#: builtin/config.c:134 +#: builtin/config.c:135 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtener valores para una regexp: nombre-regex [valor-regex]" -#: builtin/config.c:135 +#: builtin/config.c:136 msgid "get value specific for the URL: section[.var] URL" msgstr "obtener valor especifico para el URL: secciรณn[.var] URL" -#: builtin/config.c:136 +#: builtin/config.c:137 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplazar todas las variables que concuerden: nombre valor [valor_regex]" -#: builtin/config.c:137 +#: builtin/config.c:138 msgid "add a new variable: name value" msgstr "agregar nueva variable: nombre valor" -#: builtin/config.c:138 +#: builtin/config.c:139 msgid "remove a variable: name [value-regex]" msgstr "borrar una variable. nombre [valor-regex]" -#: builtin/config.c:139 +#: builtin/config.c:140 msgid "remove all matches: name [value-regex]" msgstr "borrar todas las concurrencias: nombre [valor-regex]" -#: builtin/config.c:140 +#: builtin/config.c:141 msgid "rename section: old-name new-name" msgstr "renombrar secciรณn: nombre-viejo nombre-nuevo" -#: builtin/config.c:141 +#: builtin/config.c:142 msgid "remove a section: name" msgstr "borrar una secciรณn: nombre" -#: builtin/config.c:142 +#: builtin/config.c:143 msgid "list all" msgstr "listar todo" -#: builtin/config.c:143 +#: builtin/config.c:144 msgid "open an editor" msgstr "abrir el editor" -#: builtin/config.c:144 +#: builtin/config.c:145 msgid "find the color configured: slot [default]" msgstr "encontrar el color configurado: slot [default]" -#: builtin/config.c:145 +#: builtin/config.c:146 msgid "find the color setting: slot [stdout-is-tty]" msgstr "encontrar las opciones del color: slot [stdout-es-tty]" -#: builtin/config.c:146 +#: builtin/config.c:147 msgid "Type" msgstr "Tipo" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:148 builtin/env--helper.c:38 msgid "value is given this type" msgstr "al valor se ha dado este tipo" -#: builtin/config.c:148 +#: builtin/config.c:149 msgid "value is \"true\" or \"false\"" msgstr "valor es \"true\" o \"false\"" -#: builtin/config.c:149 +#: builtin/config.c:150 msgid "value is decimal number" msgstr "valor es un numero decimal" -#: builtin/config.c:150 +#: builtin/config.c:151 msgid "value is --bool or --int" msgstr "valor es --bool o --int" -#: builtin/config.c:151 +#: builtin/config.c:152 msgid "value is a path (file or directory name)" msgstr "valor es una ruta (archivo o nombre de directorio)" -#: builtin/config.c:152 +#: builtin/config.c:153 msgid "value is an expiry date" msgstr "valor es una fecha de expiraciรณn" -#: builtin/config.c:153 +#: builtin/config.c:154 msgid "Other" msgstr "Otro" -#: builtin/config.c:154 +#: builtin/config.c:155 msgid "terminate values with NUL byte" msgstr "terminar valores con un byte NULL" -#: builtin/config.c:155 +#: builtin/config.c:156 msgid "show variable names only" msgstr "mostrar solo nombres de variables" -#: builtin/config.c:156 +#: builtin/config.c:157 msgid "respect include directives on lookup" msgstr "respetar directivas include en la bรบsqueda" -#: builtin/config.c:157 +#: builtin/config.c:158 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:158 builtin/env--helper.c:40 +#: 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 msgid "value" msgstr "valor" -#: builtin/config.c:158 +#: builtin/config.c:160 msgid "with --get, use default value when missing entry" msgstr "con --get, usa el valor por defecto cuando falta una entrada" -#: builtin/config.c:172 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be %d" msgstr "nรบmero de argumentos invรกlidos, deberรญan ser %d" -#: builtin/config.c:174 +#: builtin/config.c:176 #, 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:308 +#: builtin/config.c:324 #, c-format msgid "invalid key pattern: %s" msgstr "patrรณn de llave invรกlido: %s" -#: builtin/config.c:344 +#: builtin/config.c:360 #, 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:401 +#: builtin/config.c:417 #, c-format msgid "cannot parse color '%s'" msgstr "no se analizar color '%s'" -#: builtin/config.c:443 +#: builtin/config.c:459 msgid "unable to parse default color value" msgstr "no es posible analizar el valor por defecto de color" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:512 builtin/config.c:768 msgid "not in a git directory" msgstr "no en un directorio git" -#: builtin/config.c:499 +#: builtin/config.c:515 msgid "writing to stdin is not supported" msgstr "escribir en stdin no estรก soportado" -#: builtin/config.c:502 +#: builtin/config.c:518 msgid "writing config blobs is not supported" msgstr "escribir blobs de configuraciรณn no estรก soportado" -#: builtin/config.c:587 +#: builtin/config.c:603 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12176,23 +13458,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:627 msgid "only one config file at a time" msgstr "solo un archivo de configuraciรณn a la vez" -#: builtin/config.c:616 +#: builtin/config.c:632 msgid "--local can only be used inside a git repository" msgstr "--local solo puedo ser usado dentro de un repositorio" -#: builtin/config.c:619 +#: builtin/config.c:635 msgid "--blob can only be used inside a git repository" msgstr "--blob solo puede ser usado dentro de un repositorio" -#: builtin/config.c:638 +#: builtin/config.c:655 msgid "$HOME not set" msgstr "$HOME no estรก configurado" -#: builtin/config.c:658 +#: 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" @@ -12204,52 +13486,52 @@ msgstr "" "\"\n" "en \"git help worktree\" para mรกs detalles" -#: builtin/config.c:688 +#: builtin/config.c:714 msgid "--get-color and variable type are incoherent" msgstr "--get-color y tipo de variable incoherente" -#: builtin/config.c:693 +#: builtin/config.c:719 msgid "only one action at a time" msgstr "solo una acciรณn a la vez" -#: builtin/config.c:706 +#: builtin/config.c:732 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:712 +#: builtin/config.c:738 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:718 +#: builtin/config.c:744 msgid "--default is only applicable to --get" msgstr "--default solo es aplicable para --get" -#: builtin/config.c:731 +#: builtin/config.c:757 #, c-format msgid "unable to read config file '%s'" msgstr "no se puede leer el archivo de configuraciรณn '%s'" -#: builtin/config.c:734 +#: builtin/config.c:760 msgid "error processing config file(s)" msgstr "error al procesar archivo(s) de configuraciรณn" -#: builtin/config.c:744 +#: builtin/config.c:770 msgid "editing stdin is not supported" msgstr "editar stdin no estรก soportado" -#: builtin/config.c:746 +#: builtin/config.c:772 msgid "editing blobs is not supported" msgstr "editar blobs no estรก soportado" -#: builtin/config.c:760 +#: builtin/config.c:786 #, c-format msgid "cannot create configuration file %s" msgstr "no se puede crear el archivo de configuraciรณn %s" -#: builtin/config.c:773 +#: builtin/config.c:799 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12258,7 +13540,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:847 builtin/config.c:858 +#: builtin/config.c:873 builtin/config.c:884 #, c-format msgid "no such section: %s" msgstr "no existe la secciรณn: %s" @@ -12271,11 +13553,11 @@ 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:27 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opciones>] [<commit-ish>...]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<opciones>] --dirty" @@ -12291,37 +13573,32 @@ msgstr "ligero" msgid "annotated" msgstr "anotado" -#: builtin/describe.c:273 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "tag anotado %s no disponible" -#: builtin/describe.c:277 +#: builtin/describe.c:281 #, c-format -msgid "annotated tag %s has no embedded name" -msgstr "tag anotado %s no tiene nombre embebido" +msgid "tag '%s' is externally known as '%s'" +msgstr "tag '%s' es literalmente conocida como '%s'" -#: builtin/describe.c:279 -#, c-format -msgid "tag '%s' is really '%s' here" -msgstr "tag '%s' es realmente '%s' aquรญ" - -#: builtin/describe.c:323 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "no hay tag que concuerde exactamente con '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:330 #, 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:379 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "bรบsqueda finalizada a las %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12330,7 +13607,7 @@ msgstr "" "No hay tags anotados que puedan describir '%s'.\n" "Sin embargo, hubieron tags no anotados: intente --tags." -#: builtin/describe.c:409 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12339,12 +13616,12 @@ msgstr "" "Ningรบn tag puede describit '%s'.\n" "Intente --always, o cree algunos tags." -#: builtin/describe.c:439 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits cruzados\n" -#: builtin/describe.c:442 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12353,147 +13630,157 @@ 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:510 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "describe %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "Nombre de objeto %s no vรกlido" -#: builtin/describe.c:521 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s no es un commit ni un blob" -#: builtin/describe.c:535 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "encontrar el tag que viene despuรฉs del commit" -#: builtin/describe.c:536 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "hacer debug a la estrategia de bรบsqueda en stderr" -#: builtin/describe.c:537 +#: builtin/describe.c:556 msgid "use any ref" msgstr "use cualquier ref" -#: builtin/describe.c:538 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "use cualquier tag, incluso los no anotados" -#: builtin/describe.c:539 +#: builtin/describe.c:558 msgid "always use long format" msgstr "siempre usar formato largo" -#: builtin/describe.c:540 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "solo seguir el primer patrรณn" -#: builtin/describe.c:543 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "solo mostrar concordancias exactas" -#: builtin/describe.c:545 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "considerar <n> tags mรกs recientes (default:10)" -#: builtin/describe.c:547 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "solo considerar tags que concuerden con <patrรณn>" -#: builtin/describe.c:549 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "no considerar tags que concuerden con <patrรณn>" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "mostrar el objeto commit abreviado como fallback" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "marca" -#: builtin/describe.c:553 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "adjuntar <marca> en el รกrbol de trabajo sucio (default: \"-dirty\")" -#: builtin/describe.c:556 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "adjuntar <marca> en un รกrbol de trabajo roto (default: \"-broken\")" -#: builtin/describe.c:574 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "--long es incompatible con --abbrev=0" -#: builtin/describe.c:603 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "No se encontraron nombres, no se puede describir nada." -#: builtin/describe.c:654 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty es incompatible con commit-ismos" -#: builtin/describe.c:656 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "--broken es incompatible con commit-ismos" -#: builtin/diff.c:84 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': no es un archivo regular o un enlace simbรณlico" -#: builtin/diff.c:235 +#: builtin/diff.c:242 #, c-format msgid "invalid option: %s" msgstr "opciรณn invรกlida: %s" -#: builtin/diff.c:350 +#: builtin/diff.c:359 +#, c-format +msgid "%s...%s: no merge base" +msgstr "%s...%s: se neceista una base de fusiรณn" + +#: builtin/diff.c:469 msgid "Not a git repository" msgstr "No es un repositorio git" -#: builtin/diff.c:394 +#: builtin/diff.c:514 #, c-format msgid "invalid object '%s' given." msgstr "objeto '%s' entregado no es vรกlido." -#: builtin/diff.c:403 +#: builtin/diff.c:525 #, c-format msgid "more than two blobs given: '%s'" msgstr "mรกs de dos blobs entregados: '%s'" -#: builtin/diff.c:408 +#: builtin/diff.c:530 #, c-format msgid "unhandled object '%s' given." msgstr "objeto no manejado '%s' entregado." +#: builtin/diff.c:564 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "%s...%s: mรบltiples bases de fusiรณn, usando %s" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "fallรณ: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "no se pudo leer el symlink %s" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "no se pudo leer el archivo symlink %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, 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:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12501,54 +13788,54 @@ msgstr "" "formatos combinados de diff ('-c' y '--cc') no soportados en\n" "modo diff para directorio('-d' y '--dir-diff')." -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ambos archivos modificados: '%s' y '%s'." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "archivo del รกrbol de trabajo ha sido dejado." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "archivo temporal existe en '%s'." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "tal vez desees limpiar o recuperar estos." -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "use `diff.guitool` en lugar de `diff.tool`" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "realizar un diff de todo el directorio" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "no mostrar antes de lanzar una herramienta de diff" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "usar enlaces simbรณlicos en modo dir-diff" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "herramienta" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "usar la herramienta de diff especificada" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 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:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12556,31 +13843,31 @@ msgstr "" "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un " "cรณdigo de salida distinto de cero" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "especificar un comando personalizado para ver diffs" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "pasado a `diff`" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool requiere un รกrbol de trabajo o --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dirty-diff es incompatible con --no-index" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool y --extcmd son mutuamente exclusivas" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no se ha entregado <comando> para --extcmd=<comando>" @@ -12617,158 +13904,206 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:868 +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:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "token --anonymize-map no puede estar vacรญo" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "mostrar progreso despuรฉs de <n> objetos" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "seleccionar el manejo de tags firmados" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1203 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:1132 +#: builtin/fast-export.c:1206 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:1135 +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" msgstr "Volcar marcas a este archivo" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" msgstr "Importar marcas de este archivo" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1215 +msgid "Import marks from this file if it exists" +msgstr "Importar marcas de este archivo si existe" + +#: builtin/fast-export.c:1217 msgid "Fake a tagger when tags lack one" msgstr "Falsificar un tagger cuando les falta uno" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1219 msgid "Output full tree for each commit" msgstr "Mostrar todo el รกrbol para cada commit" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1221 msgid "Use the done feature to terminate the stream" msgstr "Use el feature done para terminar el stream" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "Saltar el output de data blob" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1223 builtin/log.c:1724 msgid "refspec" msgstr "refspec" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1224 msgid "Apply refspec to exported refs" msgstr "Aplicar refspec para los refs exportados" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "anonimizar la salida" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "de:para" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "convertir <de> a <para> en output anonimizado" + +#: builtin/fast-export.c:1230 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:1151 +#: builtin/fast-export.c:1232 msgid "Show original object ids of blobs/commits" msgstr "Mostrar ids de objetos originales para blobs/commits" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1234 +msgid "Label tags with mark ids" +msgstr "Marcar tags con ids de mark" + +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "--anonymize-map sin --anonymize no tiene sentido" + +#: builtin/fast-export.c:1272 +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-pack.c:245 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "Lockfile creado pero no reportado: %s" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opciones>] <grupo>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opciones>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:117 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel no puede ser negativo" + +#: builtin/fetch.c:140 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "extraer de todos los remotos" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:142 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "configurar upstream para git pulll/fetch" + +#: builtin/fetch.c:144 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:146 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "ruta para cargar el paquete al final del remoto" -#: builtin/fetch.c:130 +#: builtin/fetch.c:147 msgid "force overwrite of local reference" msgstr "forzar sobrescritura de referencia local" -#: builtin/fetch.c:132 +#: builtin/fetch.c:149 msgid "fetch from multiple remotes" msgstr "extraer de mรบltiples remotos" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:151 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "extraer todos los tags y objetos asociados" -#: builtin/fetch.c:136 +#: builtin/fetch.c:153 msgid "do not fetch all tags (--no-tags)" msgstr "no extraer todos los tags (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:155 msgid "number of submodules fetched in parallel" msgstr "nรบmero de submรณdulos extraรญdos en paralelo" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:157 builtin/pull.c:198 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:142 +#: builtin/fetch.c:159 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:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 msgid "on-demand" msgstr "en demanda" -#: builtin/fetch.c:144 +#: builtin/fetch.c:161 msgid "control recursive fetching of submodules" msgstr "controlar extracciรณn recursiva de submรณdulos" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:165 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "mantener el paquete descargado" -#: builtin/fetch.c:150 +#: builtin/fetch.c:167 msgid "allow updating of HEAD ref" msgstr "permitir actualizar la ref HEAD" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "historia profunda de un clon superficial" -#: builtin/fetch.c:155 +#: builtin/fetch.c:172 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "historia profunda de un repositorio superficial basado en tiempo" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:178 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "convertir a un repositorio completo" -#: builtin/fetch.c:164 +#: builtin/fetch.c:181 msgid "prepend this to submodule path output" msgstr "anteponer esto a salida de la ruta del submรณdulo" -#: builtin/fetch.c:167 +#: builtin/fetch.c:184 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12776,90 +14111,94 @@ msgstr "" "default para extracciรณn recursiva de submรณdulos (menor prioridad que " "archivos de configuraciรณn)" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:188 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "aceptar refs que actualicen .git/shallow" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:189 builtin/pull.c:226 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:190 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "especificar extracciรณn de refmap" -#: builtin/fetch.c:180 +#: builtin/fetch.c:197 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "reporta que solo tenemos objetos alcanzables de este objeto" -#: builtin/fetch.c:183 +#: builtin/fetch.c:200 msgid "run 'gc --auto' after fetching" msgstr "ejecutar 'gc --auto' tras el fetch" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:202 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "verificar updates forzados en todos los branch actualizados" -#: builtin/fetch.c:491 +#: builtin/fetch.c:204 +msgid "write the commit-graph after fetching" +msgstr "escribir commit-graph luego del fetch" + +#: builtin/fetch.c:514 msgid "Couldn't find remote ref HEAD" msgstr "No se puedo encontrar ref remota HEAD" -#: builtin/fetch.c:630 +#: builtin/fetch.c:654 #, 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:728 +#: builtin/fetch.c:752 #, c-format msgid "object %s not found" msgstr "objeto %s no encontrado" -#: builtin/fetch.c:732 +#: builtin/fetch.c:756 msgid "[up to date]" msgstr "[actualizado]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 msgid "[rejected]" msgstr "[rechazado]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:770 msgid "can't fetch in current branch" msgstr "no se puede traer en la rama actual" -#: builtin/fetch.c:756 +#: builtin/fetch.c:780 msgid "[tag update]" msgstr "[actualizaciรณn de tag]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 +#: builtin/fetch.c:852 msgid "unable to update local ref" msgstr "no se posible actualizar el ref local" -#: builtin/fetch.c:761 +#: builtin/fetch.c:785 msgid "would clobber existing tag" msgstr "podrรญa golpear tag existente" -#: builtin/fetch.c:783 +#: builtin/fetch.c:807 msgid "[new tag]" msgstr "[nuevo tag]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:810 msgid "[new branch]" msgstr "[nueva rama]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:813 msgid "[new ref]" msgstr "[nueva referencia]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:852 msgid "forced update" msgstr "actualizaciรณn forzada" -#: builtin/fetch.c:833 +#: builtin/fetch.c:857 msgid "non-fast-forward" msgstr "avance lento" -#: builtin/fetch.c:854 +#: builtin/fetch.c:878 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" @@ -12870,7 +14209,7 @@ msgstr "" "show-forced-updates'\n" "o ejecute 'git config fetch.showForcedUpdates true'." -#: builtin/fetch.c:858 +#: builtin/fetch.c:882 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -12883,22 +14222,22 @@ msgstr "" "false'\n" "para evitar esta validaciรณn.\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:914 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no enviรณ todos los objetos necesarios\n" -#: builtin/fetch.c:909 +#: builtin/fetch.c:935 #, 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:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1020 builtin/fetch.c:1158 #, c-format msgid "From %.*s\n" msgstr "Desde %.*s\n" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1031 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -12907,58 +14246,79 @@ 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:1101 +#: builtin/fetch.c:1128 #, c-format msgid " (%s will become dangling)" msgstr " (%s se pondrรก colgado)" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1129 #, c-format msgid " (%s has become dangling)" msgstr " (%s se ha colgado)" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1161 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1162 builtin/remote.c:1112 msgid "(none)" msgstr "(nada)" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1185 #, 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:1177 +#: builtin/fetch.c:1204 #, 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:1180 +#: builtin/fetch.c:1207 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opciรณn \"%s\" es ignorada por %s\n" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1415 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "mรบltiples ramas detectadas, incompatible con --set-upstream" + +#: builtin/fetch.c:1430 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "no configurar upstream para una rama de rastreo remoto" + +#: builtin/fetch.c:1432 +msgid "not setting upstream for a remote tag" +msgstr "no configurar upstream para un tag remoto" + +#: builtin/fetch.c:1434 +msgid "unknown branch type" +msgstr "tipo de branch desconocido" + +#: builtin/fetch.c:1436 +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:1562 builtin/fetch.c:1625 #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "No se pudo extraer %s" -#: 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:1584 +#, 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:1556 +#: builtin/fetch.c:1687 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -12966,44 +14326,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:1593 +#: builtin/fetch.c:1724 msgid "You need to specify a tag name." msgstr "Tienes que especificar un nombre de tag." -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1778 msgid "Negative depth in --deepen is not supported" msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1780 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1785 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1787 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:1669 +#: builtin/fetch.c:1800 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1802 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1811 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1818 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:1703 +#: builtin/fetch.c:1836 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13011,29 +14371,29 @@ msgstr "" "--filter solo puede ser usado con el remoto configurado en extensions." "partialClone" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 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:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "alias para --log (deprecado)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "texto" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "use <text> como comienzo de mensaje" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "archivo del cual leer" @@ -13073,7 +14433,7 @@ msgstr "cite los marcadores de posiciรณn adecuadamente para Tcl" msgid "show only <n> matched refs" msgstr "mostrar solo <n> refs encontradas" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "respetar el formato de colores" @@ -13097,32 +14457,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:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "desconocido" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, 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:131 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" msgstr "peligro en %s %s: %s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "link roto de %7s %s" -#: builtin/fsck.c:168 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "tipo de objeto equivocado en link" -#: builtin/fsck.c:184 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" @@ -13131,216 +14491,216 @@ msgstr "" "link roto de %7s %s\n" " a %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "faltan %s %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "inalcanzable %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "actualizando %s %s" -#: builtin/fsck.c:349 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "no se pudo crear lost-found" -#: builtin/fsck.c:360 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "no se pudo finalizar '%s'" -#: builtin/fsck.c:377 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "Revisando %s" -#: builtin/fsck.c:415 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Verificando conectividad (%d objetos)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "Revisando %s %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:430 msgid "broken links" msgstr "links rotos" -#: builtin/fsck.c:447 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "raรญz %s" -#: builtin/fsck.c:455 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "tag %s %s (%s) en %s" -#: builtin/fsck.c:484 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objecto corrupto o faltante" -#: builtin/fsck.c:509 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: referencia invรกlida %s" -#: builtin/fsck.c:523 +#: builtin/fsck.c:515 #, c-format msgid "Checking reflog %s->%s" msgstr "Revisando reflog %s->%s" -#: builtin/fsck.c:557 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: puntero sha1 invรกlido %s" -#: builtin/fsck.c:564 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "%s: no es un commit" -#: builtin/fsck.c:619 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "aviso: No hay referencias por defecto" -#: builtin/fsck.c:634 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objeto corrupto o no encontrado: %s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: no se puede analizar objeto: %s" -#: builtin/fsck.c:667 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "mal sha1 de archivo: %s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "Revisando directorio de objetos" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "Revisando objetos directorios" -#: builtin/fsck.c:700 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "Revisando link %s" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:843 #, c-format msgid "invalid %s" msgstr "%s invรกlido" -#: builtin/fsck.c:712 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "%s apunta a algo extraรฑo (%s)" -#: builtin/fsck.c:718 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: HEAD desacoplado apunta a nada" -#: builtin/fsck.c:722 +#: builtin/fsck.c:713 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "aviso: %s apunta a un branch no nacido (%s)" -#: builtin/fsck.c:734 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "Revisando el cache tree" -#: builtin/fsck.c:739 +#: builtin/fsck.c:730 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: puntero invรกlido sha1 en cache-tree" -#: builtin/fsck.c:750 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "non-tree en cache-tree" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opciones>] [<objeto>...]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "mostrar objetos ilegibles" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "mostrar objetos colgados" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "reportar tags" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "reportar nodos raรญz" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "hacer objetos รญndices cabezas de nodos" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "hacer reflogs cabeza de nodos (default)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "tambiรฉn considerar paquetes y objetos alternos" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "revisar solo conectividad" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "habilitar revisiรณn mรกs estricta" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "escribir objetos colgados en .git/lost-found" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "mostrar progreso" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "mostrar nombres verboso para objetos alcanzables" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Revisando objetos" -#: builtin/fsck.c:887 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "%s: objeto faltante" -#: builtin/fsck.c:899 +#: builtin/fsck.c:886 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "parรกmetro invรกlido: sha1 esperado, se obtuvo '%s'" -#: builtin/gc.c:34 +#: builtin/gc.c:35 msgid "git gc [<options>]" msgstr "git gc [<opciones>]" @@ -13354,17 +14714,17 @@ msgstr "Fallรณ el fstat %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "fallรณ al analizar '%s' valor '%s'" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "no se pudo definir '%s'" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "no se puede leer '%s'" -#: builtin/gc.c:492 +#: builtin/gc.c:491 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -13374,59 +14734,59 @@ msgid "" "%s" msgstr "" "El รบltimo gc reportรณ lo siguiente. Por favor corrige la causa\n" -"y remueva %s.\n" +"y elimine %s.\n" "Limpieza automรกtica no se realizarรก hasta que el archivo sea eliminado.\n" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:539 msgid "prune unreferenced objects" msgstr "limpiar objetos no referenciados" -#: builtin/gc.c:542 +#: builtin/gc.c:541 msgid "be more thorough (increased runtime)" msgstr "ser mรกs exhaustivo (aumentar runtime)" -#: builtin/gc.c:543 +#: builtin/gc.c:542 msgid "enable auto-gc mode" msgstr "habilitar modo auto-gc" -#: builtin/gc.c:546 +#: builtin/gc.c:545 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:549 +#: builtin/gc.c:548 msgid "repack all other packs except the largest pack" msgstr "reempaquetar todos los otros paquetes excepto el paquete mรกs grande" -#: builtin/gc.c:566 +#: builtin/gc.c:565 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "fallรณ al analizar valor %s de gc.logexpirity" -#: builtin/gc.c:577 +#: builtin/gc.c:576 #, c-format msgid "failed to parse prune expiry value %s" msgstr "fallรณ al analizar valor %s de prune expiry" -#: builtin/gc.c:597 +#: builtin/gc.c:596 #, 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:599 +#: builtin/gc.c:598 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Auto empaquetado del repositorio para performance รณptimo.\n" -#: builtin/gc.c:600 +#: builtin/gc.c:599 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vea \"git help gc\" para limpieza manual.\n" -#: builtin/gc.c:640 +#: builtin/gc.c:639 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -13434,14 +14794,14 @@ msgstr "" "gc ya estรก ejecutรกndose en la mรกquina '%s' pid %<PRIuMAX> (use --force so no " "es asรญ)" -#: builtin/gc.c:695 +#: builtin/gc.c:694 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:29 +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opciones>] [-e] <patrรณn> [<rev>...] [[--] <ruta>...]" @@ -13459,262 +14819,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:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2904 #, c-format msgid "no threads support, ignoring %s" msgstr "no hay soporte para hilos, ignorando %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "no es posible leer el รกrbol (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:655 #, 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:714 +#: builtin/grep.c:724 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch `%c' espera un valor numรฉrico" -#: builtin/grep.c:813 +#: builtin/grep.c:823 msgid "search in index instead of in the work tree" msgstr "buscar en el รญndice en lugar del รกrbol de trabajo" -#: builtin/grep.c:815 +#: builtin/grep.c:825 msgid "find in contents not managed by git" msgstr "encontrar en contenidos no manejados por git" -#: builtin/grep.c:817 +#: builtin/grep.c:827 msgid "search in both tracked and untracked files" msgstr "buscar en archivos rastreados y no rastreados" -#: builtin/grep.c:819 +#: builtin/grep.c:829 msgid "ignore files specified via '.gitignore'" msgstr "ignorar archivos especificados via '.gitignore'" -#: builtin/grep.c:821 +#: builtin/grep.c:831 msgid "recursively search in each submodule" msgstr "bรบsqueda recursiva en cada submรณdulo" -#: builtin/grep.c:824 +#: builtin/grep.c:834 msgid "show non-matching lines" msgstr "mostrar lรญneas que no concuerdan" -#: builtin/grep.c:826 +#: builtin/grep.c:836 msgid "case insensitive matching" msgstr "bรบsqueda insensible a mayรบsculas" -#: builtin/grep.c:828 +#: builtin/grep.c:838 msgid "match patterns only at word boundaries" msgstr "concordar patrรณn solo a los lรญmites de las palabras" -#: builtin/grep.c:830 +#: builtin/grep.c:840 msgid "process binary files as text" msgstr "procesar archivos binarios como texto" -#: builtin/grep.c:832 +#: builtin/grep.c:842 msgid "don't match patterns in binary files" msgstr "no concordar patrones en archivos binarios" -#: builtin/grep.c:835 +#: builtin/grep.c:845 msgid "process binary files with textconv filters" msgstr "procesar archivos binarios con filtros textconv" -#: builtin/grep.c:837 +#: builtin/grep.c:847 msgid "search in subdirectories (default)" msgstr "buscar en subdirectorios (default)" -#: builtin/grep.c:839 +#: builtin/grep.c:849 msgid "descend at most <depth> levels" msgstr "descender como mรกximo <valor-de-profundiad> niveles" -#: builtin/grep.c:843 +#: builtin/grep.c:853 msgid "use extended POSIX regular expressions" msgstr "usar expresiones regulares POSIX extendidas" -#: builtin/grep.c:846 +#: builtin/grep.c:856 msgid "use basic POSIX regular expressions (default)" msgstr "usar expresiones regulares POSIX (default)" -#: builtin/grep.c:849 +#: builtin/grep.c:859 msgid "interpret patterns as fixed strings" msgstr "interpretar patrones como strings arreglados" -#: builtin/grep.c:852 +#: builtin/grep.c:862 msgid "use Perl-compatible regular expressions" msgstr "usar expresiones regulares compatibles con Perl" -#: builtin/grep.c:855 +#: builtin/grep.c:865 msgid "show line numbers" msgstr "mostrar nรบmeros de lรญnea" -#: builtin/grep.c:856 +#: builtin/grep.c:866 msgid "show column number of first match" msgstr "mostrar el nรบmero de columna de la primer coincidencia" -#: builtin/grep.c:857 +#: builtin/grep.c:867 msgid "don't show filenames" msgstr "no mostrar nombres de archivo" -#: builtin/grep.c:858 +#: builtin/grep.c:868 msgid "show filenames" msgstr "mostrar nombres de archivo" -#: builtin/grep.c:860 +#: builtin/grep.c:870 msgid "show filenames relative to top directory" msgstr "mostrar nombres de archivo relativos al directorio superior" -#: builtin/grep.c:862 +#: builtin/grep.c:872 msgid "show only filenames instead of matching lines" msgstr "mostrar solo nombres de archivos en lugar de lรญneas encontradas" -#: builtin/grep.c:864 +#: builtin/grep.c:874 msgid "synonym for --files-with-matches" msgstr "sinรณnimo para --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:877 msgid "show only the names of files without match" msgstr "mostrar solo los nombres de archivos sin coincidencias" -#: builtin/grep.c:869 +#: builtin/grep.c:879 msgid "print NUL after filenames" msgstr "imprimir NUL despuรฉs del nombre de archivo" -#: builtin/grep.c:872 +#: builtin/grep.c:882 msgid "show only matching parts of a line" msgstr "mostrar solo partes que concuerdan de una lรญnea" -#: builtin/grep.c:874 +#: builtin/grep.c:884 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:875 +#: builtin/grep.c:885 msgid "highlight matches" msgstr "resaltar concordancias" -#: builtin/grep.c:877 +#: builtin/grep.c:887 msgid "print empty line between matches from different files" msgstr "imprimir una lรญnea vacรญa entre coincidencias de diferentes archivos" -#: builtin/grep.c:879 +#: builtin/grep.c:889 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:882 +#: builtin/grep.c:892 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:885 +#: builtin/grep.c:895 msgid "show <n> context lines before matches" msgstr "mostrar <n> lรญneas de contexto antes de las concordancias" -#: builtin/grep.c:887 +#: builtin/grep.c:897 msgid "show <n> context lines after matches" msgstr "mostrar <n> lรญneas de context despuรฉs de las concordancias" -#: builtin/grep.c:889 +#: builtin/grep.c:899 msgid "use <n> worker threads" msgstr "usar <n> hilos de trabajo" -#: builtin/grep.c:890 +#: builtin/grep.c:900 msgid "shortcut for -C NUM" msgstr "atajo para -C NUM" -#: builtin/grep.c:893 +#: builtin/grep.c:903 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:895 +#: builtin/grep.c:905 msgid "show the surrounding function" msgstr "mostrar la funciรณn circundante" -#: builtin/grep.c:898 +#: builtin/grep.c:908 msgid "read patterns from file" msgstr "leer patrones del archivo" -#: builtin/grep.c:900 +#: builtin/grep.c:910 msgid "match <pattern>" msgstr "concordar <patrรณn>" -#: builtin/grep.c:902 +#: builtin/grep.c:912 msgid "combine patterns specified with -e" msgstr "combinar patrones especificados con -e" -#: builtin/grep.c:914 +#: builtin/grep.c:924 msgid "indicate hit with exit status without output" msgstr "indicar concordancia con exit status sin output" -#: builtin/grep.c:916 +#: builtin/grep.c:926 msgid "show only matches from files that match all patterns" msgstr "" "mostrar solo concordancias con archivos que concuerdan todos los patrones" -#: builtin/grep.c:918 +#: builtin/grep.c:928 msgid "show parse tree for grep expression" msgstr "mostrar รกrbol analizado para la expresiรณn grep" -#: builtin/grep.c:922 +#: builtin/grep.c:932 msgid "pager" msgstr "paginador" -#: builtin/grep.c:922 +#: builtin/grep.c:932 msgid "show matching files in the pager" msgstr "mostrar archivos concordantes en el paginador" -#: builtin/grep.c:926 +#: builtin/grep.c:936 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" -#: builtin/grep.c:990 +#: builtin/grep.c:1003 msgid "no pattern given" msgstr "no se ha entregado patrรณn" -#: builtin/grep.c:1026 +#: builtin/grep.c:1039 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no se puede usar con revs" -#: builtin/grep.c:1034 +#: builtin/grep.c:1047 #, c-format msgid "unable to resolve revision: %s" msgstr "no se posible resolver revisiรณn: %s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1077 +msgid "--untracked not supported with --recurse-submodules" +msgstr "--untracked no es soportada con --recurse-submodules" + +#: builtin/grep.c:1081 msgid "invalid option combination, ignoring --threads" msgstr "combinaciรณn de opciones invรกlida, ignorando --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1084 builtin/pack-objects.c:3623 msgid "no threads support, ignoring --threads" msgstr "no se soportan hilos, ignorando --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nรบmero invรกlido de hilos especificado (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1121 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:1117 -msgid "option not supported with --recurse-submodules" -msgstr "opciรณn no soportada con --recurse-submodules" - -#: builtin/grep.c:1123 +#: builtin/grep.c:1147 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no pueden ser usadas con --no-index" -#: builtin/grep.c:1129 +#: builtin/grep.c:1153 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado" -#: builtin/grep.c:1137 +#: builtin/grep.c:1161 msgid "both --cached and trees are given" msgstr "--cached y รกrboles han sido entregados" @@ -13757,66 +15117,66 @@ msgstr "" msgid "process file as it were from this path" msgstr "procesar el archivo como si fuera de esta ruta" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "mostrar todos los comandos disponibles" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "excluir las guias" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "mostrar una lista de nociones utiles" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "imprimir todos los nombres de variables de configuraciรณn" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "mostrar la pagina del manual" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "mostrar la pagina del manual en un navegador web" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "mostrar la pagina de info" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "imprimir descripciรณn del comando" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "formato help no reconocido '%s'" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "Fallรณ al iniciar emacsclient." -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "Fallรณ al analizar la versiรณn de emacsclient." -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la versiรณn '%d' de emacsclient es muy antigua (<22)." -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "fallรณ al ejecutar '%s'" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -13825,7 +15185,7 @@ msgstr "" "'%s': ruta para el visualizador del manual no soportada.\n" "Por favor considere usar 'man.<herramienta.cmd'." -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -13834,35 +15194,35 @@ msgstr "" "'%s': comando no soportado para man viewer.\n" "Por favor considere usar 'man.<herramienta>.path." -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': visualizador de man desconocido." -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "ningรบn visualizador de manual proceso la peticiรณn" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "ningรบn visor de info manejo la peticiรณn" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' tiene el alias '%s'" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:367 #, c-format msgid "bad alias.%s string: %s" msgstr "mal alias.%s string: %s" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "uso: %s%s" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "'git help config' para mรกs informaciรณn" @@ -13900,14 +15260,19 @@ 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:604 +#: builtin/index-pack.c:288 builtin/pack-objects.c:618 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:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paquete excede el mรกximo tamaรฑo permitido" +#: builtin/index-pack.c:306 builtin/repack.c:250 +#, c-format +msgid "unable to create '%s'" +msgstr "no se puede crear '%s'" + #: builtin/index-pack.c:312 #, c-format msgid "cannot open packfile '%s'" @@ -13960,162 +15325,162 @@ 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:764 -#: builtin/index-pack.c:803 builtin/index-pack.c:812 +#: 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 "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:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:738 builtin/pack-objects.c:170 +#: builtin/pack-objects.c:230 builtin/pack-objects.c:325 #, c-format msgid "unable to read %s" msgstr "no se posible leer %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:802 #, 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:809 +#: builtin/index-pack.c:810 #, c-format msgid "cannot read existing object %s" msgstr "no se puede leer el objeto existente %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:824 #, c-format msgid "invalid blob object %s" msgstr "objeto blob %s invรกlido" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:827 builtin/index-pack.c:846 msgid "fsck error in packed object" msgstr "error de fsck en el objeto empaquetado" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:848 #, 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:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:920 builtin/index-pack.c:951 msgid "failed to apply delta" msgstr "fallรณ al aplicar delta" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Receiving objects" msgstr "Recibiendo objetos" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Indexing objects" msgstr "Indexando objetos" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paquete estรก corrompido (SHA1 no concuerda)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "no se puede fstat al archivo de paquete" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "el paquete tiene basura al final" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1175 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:1195 +#: builtin/index-pack.c:1198 msgid "Resolving deltas" msgstr "Resolviendo deltas" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665 #, c-format msgid "unable to create thread: %s" msgstr "no es posible crear hilo: %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "confusiรณn mรกs allรก de la locura" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 #, 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:1264 +#: builtin/index-pack.c:1267 #, 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:1268 +#: builtin/index-pack.c:1271 #, 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:1292 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no es posible desinflar el objeto adjunto (%d)" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1391 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s estรก corrompido" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1405 #, 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:1427 +#: builtin/index-pack.c:1430 #, c-format msgid "cannot write %s file '%s'" msgstr "no se puede escribir %s en el archivo '%s'" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1438 #, c-format msgid "cannot close written %s file '%s'" msgstr "no se puede cerrar escrito %s en archivo '%s'" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1462 msgid "error while closing pack file" msgstr "error mientras se cierra el archivo paquete" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1476 msgid "cannot store pack file" msgstr "no se puede guardar el archivo paquete" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1484 msgid "cannot store index file" msgstr "no se puede guardar el archivo รญndice" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mal pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1592 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No se puede abrir el archivo paquete existente '%s'" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1594 #, 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:1643 +#: builtin/index-pack.c:1642 #, 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:1650 +#: builtin/index-pack.c:1649 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -14132,98 +15497,121 @@ msgstr "No se puede regresar a cwd" msgid "bad %s" msgstr "mal %s" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "algoritmo hash desconocido '%s'" + +#: builtin/index-pack.c:1782 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no puede ser usada sin --stdin" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1784 msgid "--stdin requires a git repository" msgstr "--stdin requiere un repositorio git" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1786 +msgid "--object-format cannot be used with --stdin" +msgstr "--object-format no se puede usar con --stdin" + +#: builtin/index-pack.c:1792 msgid "--verify with no packfile name given" msgstr "--verify no recibiรณ ningรบn nombre de archivo de paquete" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "error de fsck en objetos paquete" -#: builtin/init-db.c:61 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "no se pudo definir template '%s'" -#: builtin/init-db.c:66 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "no se puede abrir directorio '%s'" -#: builtin/init-db.c:78 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "no se puede leer link '%s'" -#: builtin/init-db.c:80 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "no se puede crear symlink '%s' '%s'" -#: builtin/init-db.c:86 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "no se puede copiar '%s' a '%s'" -#: builtin/init-db.c:90 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "ignorando template %s" -#: builtin/init-db.c:121 +#: builtin/init-db.c:123 #, c-format msgid "templates not found in %s" msgstr "template no encontrado en %s" -#: builtin/init-db.c:136 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "no se copian templates de '%s': %s" -#: builtin/init-db.c:334 +#: builtin/init-db.c:276 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "nombre de rama inicial invรกlido: '%s'" + +#: builtin/init-db.c:368 #, c-format msgid "unable to handle file type %d" msgstr "no es posible manejar el tipo de archivo %d" -#: builtin/init-db.c:337 +#: builtin/init-db.c:371 #, c-format msgid "unable to move %s to %s" msgstr "no se puede mover %s a %s" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:386 +msgid "attempt to reinitialize repository with different hash" +msgstr "intentar reinicializar el repositorio con un hash diferente" + +#: builtin/init-db.c:410 builtin/init-db.c:413 #, c-format msgid "%s already exists" msgstr "%s ya existe" -#: builtin/init-db.c:413 +#: builtin/init-db.c:444 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: ignorando --initial-branch=%s" + +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:476 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Reinicializado el repositorio Git existente en %s%s\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Inicializado repositorio Git compartido vacรญo en %s%s\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:481 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Inicializado repositorio Git vacรญo en %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:530 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -14231,26 +15619,38 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--" "shared[=<permisos>]] [<directorio>]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:556 msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:492 +#: builtin/init-db.c:557 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "especifica que el repositorio de git serรก compartido entre varios usuarios" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:563 +msgid "override the name of the initial branch" +msgstr "sobrescribir el nombre de la rama inicial" + +#: builtin/init-db.c:564 +msgid "hash" +msgstr "hash" + +#: builtin/init-db.c:565 builtin/show-index.c:22 +msgid "specify the hash algorithm to use" +msgstr "especificar el algoritmo hash a usar" + +#: builtin/init-db.c:598 builtin/init-db.c:603 #, c-format msgid "cannot mkdir %s" msgstr "no se pude crear directorio %s" -#: builtin/init-db.c:538 +#: builtin/init-db.c:607 #, c-format msgid "cannot chdir to %s" msgstr "no se puede aplicar chdir a %s" -#: builtin/init-db.c:559 +#: builtin/init-db.c:634 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -14259,7 +15659,7 @@ msgstr "" "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-" "dir=<directorio>)" -#: builtin/init-db.c:587 +#: builtin/init-db.c:662 #, c-format msgid "Cannot access work tree '%s'" msgstr "No se puede acceder al รกrbol de trabajo '%s'" @@ -14328,121 +15728,126 @@ 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:55 +#: builtin/log.c:57 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opciones>] [<rango-de-revisiรณn>] [[--] <ruta>...]" -#: builtin/log.c:56 +#: builtin/log.c:58 msgid "git show [<options>] <object>..." msgstr "git show [<opciones>] <objeto>..." -#: builtin/log.c:109 +#: builtin/log.c:111 #, c-format msgid "invalid --decorate option: %s" msgstr "opciรณn --decorate invรกlida: %s" -#: builtin/log.c:173 +#: builtin/log.c:178 msgid "show source" msgstr "mostrar fuente" -#: builtin/log.c:174 +#: builtin/log.c:179 msgid "Use mail map file" msgstr "Usar archivo de mapa de mail" -#: builtin/log.c:176 +#: builtin/log.c:182 msgid "only decorate refs that match <pattern>" msgstr "solo decorar refs que concuerden con <patrรณn>" -#: builtin/log.c:178 +#: builtin/log.c:184 msgid "do not decorate refs that match <pattern>" msgstr "no decorar refs que concuerden con <patrรณn>" -#: builtin/log.c:179 +#: builtin/log.c:185 msgid "decorate options" msgstr "opciones de decorado" -#: builtin/log.c:182 +#: builtin/log.c:188 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:280 +#: builtin/log.c:298 #, c-format msgid "Final output: %d %s\n" msgstr "Salida final: %d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:556 #, c-format msgid "git show %s: bad file" msgstr "git show %s: mal archivo" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:571 builtin/log.c:666 #, c-format msgid "could not read object %s" msgstr "no se pudo leer objeto %s" -#: builtin/log.c:668 +#: builtin/log.c:691 #, c-format msgid "unknown type: %d" msgstr "tipo desconocido: %d" -#: builtin/log.c:791 +#: builtin/log.c:835 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%s: modo cover from description invรกlido" + +#: builtin/log.c:842 msgid "format.headers without value" msgstr "formate.headers. sin valor" -#: builtin/log.c:908 +#: builtin/log.c:957 msgid "name of output directory is too long" msgstr "nombre del directorio de salida es muy largo" -#: builtin/log.c:924 +#: builtin/log.c:973 #, c-format msgid "cannot open patch file %s" msgstr "no se puede abrir archivo patch %s" -#: builtin/log.c:941 +#: builtin/log.c:990 msgid "need exactly one range" msgstr "necesita exactamente un rango" -#: builtin/log.c:951 +#: builtin/log.c:1000 msgid "not a range" msgstr "no es un rango" -#: builtin/log.c:1074 +#: builtin/log.c:1164 msgid "cover letter needs email format" msgstr "letras de portada necesita formato email" -#: builtin/log.c:1080 +#: builtin/log.c:1170 msgid "failed to create cover-letter file" msgstr "fallรณ al crear los archivos cover-letter" -#: builtin/log.c:1159 +#: builtin/log.c:1249 #, c-format msgid "insane in-reply-to: %s" msgstr "insano in-reply-to: %s" -#: builtin/log.c:1186 +#: builtin/log.c:1276 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" -#: builtin/log.c:1244 +#: builtin/log.c:1334 msgid "two output directories?" -msgstr "dos directorios de salida?" +msgstr "ยฟdos directorios de salida?" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231 #, c-format msgid "unknown commit %s" msgstr "commit desconocido %s" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1455 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:1370 +#: builtin/log.c:1460 msgid "could not find exact merge base" msgstr "no se pudo encontrar una base de fusiรณn exacta" -#: builtin/log.c:1374 +#: builtin/log.c:1464 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" @@ -14454,271 +15859,281 @@ msgstr "" "O puedes especificar un commit base mediante --base=<id-commit-base> " "manualmente" -#: builtin/log.c:1394 +#: builtin/log.c:1484 msgid "failed to find exact merge base" msgstr "fallรณ al encontrar una base de fusiรณn exacta" -#: builtin/log.c:1405 +#: builtin/log.c:1495 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:1409 +#: builtin/log.c:1499 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:1462 +#: builtin/log.c:1552 msgid "cannot get patch id" msgstr "no se puede obtener id de patch" -#: builtin/log.c:1514 +#: builtin/log.c:1604 msgid "failed to infer range-diff ranges" msgstr "fallรณ al inferir rangos range-diff" -#: builtin/log.c:1559 +#: builtin/log.c:1650 msgid "use [PATCH n/m] even with a single patch" msgstr "use [PATCH n/m] incluso con un รบnico parche" -#: builtin/log.c:1562 +#: builtin/log.c:1653 msgid "use [PATCH] even with multiple patches" msgstr "use [PATCH] incluso con mรบltiples parches" -#: builtin/log.c:1566 +#: builtin/log.c:1657 msgid "print patches to standard out" msgstr "mostrar parches en standard out" -#: builtin/log.c:1568 +#: builtin/log.c:1659 msgid "generate a cover letter" msgstr "generar letra de cover" -#: builtin/log.c:1570 +#: builtin/log.c:1661 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:1571 +#: builtin/log.c:1662 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1572 +#: builtin/log.c:1663 msgid "use <sfx> instead of '.patch'" msgstr "use <sfx> en lugar de '.patch'" -#: builtin/log.c:1574 +#: builtin/log.c:1665 msgid "start numbering patches at <n> instead of 1" msgstr "comenzar a numerar los parches desde <n> en lugar de 1" -#: builtin/log.c:1576 +#: builtin/log.c:1667 msgid "mark the series as Nth re-roll" msgstr "marcar las series como Nth re-roll" -#: builtin/log.c:1578 +#: builtin/log.c:1669 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Use [RFC PATCH] en lugar de [PATCH]" -#: builtin/log.c:1581 +#: builtin/log.c:1672 +msgid "cover-from-description-mode" +msgstr "modo-cover-from-description" + +#: builtin/log.c:1673 +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:1675 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Use [<prefijo>] en lugar de [PATCH]" -#: builtin/log.c:1584 +#: builtin/log.c:1678 msgid "store resulting files in <dir>" msgstr "guardar archivos resultantes en <dir>" -#: builtin/log.c:1587 +#: builtin/log.c:1681 msgid "don't strip/add [PATCH]" msgstr "no cortar/agregar [PATCH]" -#: builtin/log.c:1590 +#: builtin/log.c:1684 msgid "don't output binary diffs" msgstr "no mostrar diffs binarios" -#: builtin/log.c:1592 +#: builtin/log.c:1686 msgid "output all-zero hash in From header" msgstr "salida como hash de todos-ceros en la cabecera From" -#: builtin/log.c:1594 +#: builtin/log.c:1688 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:1596 +#: builtin/log.c:1690 msgid "show patch format instead of default (patch + stat)" msgstr "mostrar formato de parche en lugar del default (parche + stat)" -#: builtin/log.c:1598 +#: builtin/log.c:1692 msgid "Messaging" msgstr "Mensajeando" -#: builtin/log.c:1599 +#: builtin/log.c:1693 msgid "header" msgstr "cabezal" -#: builtin/log.c:1600 +#: builtin/log.c:1694 msgid "add email header" msgstr "agregar cabecera email" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1695 builtin/log.c:1696 msgid "email" msgstr "email" -#: builtin/log.c:1601 +#: builtin/log.c:1695 msgid "add To: header" msgstr "agregar cabecera To:" -#: builtin/log.c:1603 +#: builtin/log.c:1696 msgid "add Cc: header" msgstr "agregar cabecera Cc:" -#: builtin/log.c:1605 +#: builtin/log.c:1697 msgid "ident" msgstr "ident" -#: builtin/log.c:1606 +#: builtin/log.c:1698 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:1608 +#: builtin/log.c:1700 msgid "message-id" msgstr "id de mensaje" -#: builtin/log.c:1609 +#: builtin/log.c:1701 msgid "make first mail a reply to <message-id>" msgstr "hacer primer mail una respuesta a <id de mensaje>" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1702 builtin/log.c:1705 msgid "boundary" msgstr "lรญmite" -#: builtin/log.c:1611 +#: builtin/log.c:1703 msgid "attach the patch" msgstr "adjuntar el parche" -#: builtin/log.c:1614 +#: builtin/log.c:1706 msgid "inline the patch" msgstr "poner el parche en lรญnea" -#: builtin/log.c:1618 +#: builtin/log.c:1710 msgid "enable message threading, styles: shallow, deep" msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" -#: builtin/log.c:1620 +#: builtin/log.c:1712 msgid "signature" msgstr "firma" -#: builtin/log.c:1621 +#: builtin/log.c:1713 msgid "add a signature" msgstr "agregar una firma" -#: builtin/log.c:1622 +#: builtin/log.c:1714 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1623 +#: builtin/log.c:1715 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:1625 +#: builtin/log.c:1717 msgid "add a signature from a file" msgstr "agregar una firma de un archivo" -#: builtin/log.c:1626 +#: builtin/log.c:1718 msgid "don't print the patch filenames" msgstr "no mostrar los nombres de archivos de los parches" -#: builtin/log.c:1628 +#: builtin/log.c:1720 msgid "show progress while generating patches" msgstr "mostrar medidor de progreso mientras se generan los parches" -#: builtin/log.c:1630 +#: builtin/log.c:1722 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:1633 +#: builtin/log.c:1725 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:1635 +#: builtin/log.c:1727 msgid "percentage by which creation is weighted" msgstr "porcentaje por el cual la creaciรณn es pesada" -#: builtin/log.c:1710 +#: builtin/log.c:1812 #, c-format msgid "invalid ident line: %s" msgstr "lรญnea de identificaciรณn invรกlida: %s" -#: builtin/log.c:1725 +#: builtin/log.c:1827 msgid "-n and -k are mutually exclusive" msgstr "-n y -k son mutuamente exclusivas" -#: builtin/log.c:1727 +#: builtin/log.c:1829 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos" -#: builtin/log.c:1735 +#: builtin/log.c:1837 msgid "--name-only does not make sense" msgstr "--name-only no tiene sentido" -#: builtin/log.c:1737 +#: builtin/log.c:1839 msgid "--name-status does not make sense" msgstr "--name-status no tiene sentido" -#: builtin/log.c:1739 +#: builtin/log.c:1841 msgid "--check does not make sense" msgstr "--check no tiene sentido" -#: builtin/log.c:1771 +#: builtin/log.c:1874 msgid "standard output, or directory, which one?" -msgstr "salida standard, o directorio, cual?" +msgstr "ยฟsalida standard, o directorio, cual?" -#: builtin/log.c:1860 +#: builtin/log.c:1978 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiere --cover-letter o un parche รบnico" -#: builtin/log.c:1864 +#: builtin/log.c:1982 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1865 +#: builtin/log.c:1983 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contra v%d:" -#: builtin/log.c:1871 +#: builtin/log.c:1989 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiere --range-diff" -#: builtin/log.c:1875 +#: builtin/log.c:1993 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiere --cover-letter o parche รบnico" -#: builtin/log.c:1883 +#: builtin/log.c:2001 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:1884 +#: builtin/log.c:2002 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff contra v%d:" -#: builtin/log.c:1895 +#: builtin/log.c:2013 #, c-format msgid "unable to read signature file '%s'" msgstr "no se puede leer la firma del archivo '%s'" -#: builtin/log.c:1931 +#: builtin/log.c:2049 msgid "Generating patches" msgstr "Generando parches" -#: builtin/log.c:1975 +#: builtin/log.c:2093 msgid "failed to create output files" msgstr "fallรณ al crear los archivos de salida" -#: builtin/log.c:2034 +#: builtin/log.c:2152 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<lรญmite>]]]" -#: builtin/log.c:2088 +#: builtin/log.c:2206 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14726,111 +16141,111 @@ msgstr "" "No se pudo encontrar una rama remota rastreada, por favor especifique " "<upstream> manualmente.\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opciones>] [<archivo>...]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "identifique el estado del archivo con tags" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usar letras minรบsculas para archivos 'asumidos sin cambios'" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "usar letras minรบsculas para archivos de 'fsmonitor clean'" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "mostrar archivos en cachรฉ en la salida (default)" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "mostrar archivos borrados en la salida" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "mostrar archivos modificados en la salida" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "mostrar otros archivos en la salida" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "mostrar archivos ignorados en la salida" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "" "mostrar contenido de nombres de objetos en el รกrea de stage en la salida" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "mostrar archivos en el filesystem que necesitan ser borrados" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "mostrar solo nombres de 'directorios otros'" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "mostrar finales de lรญnea de archivos" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "no mostrar directorios vacรญos" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "mostrar archivos no fusionados en la salida" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "mostrar informaciรณn resolver-deshacer" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "saltar archivos que concuerden con el patrรณn" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "excluir patrones leรญdos de <archivo>" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "leer patrones de exclusiรณn de manera adicional por directorio en <archivo>" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "agregar las exclusiones standard de git" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "hacer la salida relativa al directorio principal del proyecto" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "recurrir a travรฉs de submรณdulos" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "si cualquier <archivo> no estรก en el รญndice, tratarlo como un error" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "รกrbol-ismo" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "fingir que las rutas han sido borradas ya que todavรญa hay <รกrbol-ismos> " "presentes" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "mostrar data de debug" @@ -14848,7 +16263,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:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384 msgid "exec" msgstr "ejecutar" @@ -14922,193 +16337,304 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "mbox vacรญo: '%s'" -#: builtin/merge.c:55 +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <commit> <commit>..." + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <commit>..." + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <commit>..." + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <commit> <commit>" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <ref> [<commit>]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "mostrar todos los ancestros comunes" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "encontrar ancestros para una รบnica fusiรณn de n-vรญas" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "listar revs no alcanzables desde otros" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "ยฟes el primer ancestro del otro?" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "encontrar donde <commit> forjรณ del reflog de <ref>" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" +"git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] " +"<archivo1> <archivo-origen> <archivo2>" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "mandar resultados a standard output" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "usar un fusiรณn basada en diff3" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "por conflictos, usar nuestra versiรณn" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "por conflictos, usar la versiรณn de ellos" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "por conflictos, usar una versiรณn de uniรณn" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "por conflictos, usar el tamaรฑo de este marcador" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "no advertir sobre conflictos" + +#: builtin/merge-file.c:47 +msgid "set labels for file1/orig-file/file2" +msgstr "configurar labels para archivo1/orig-archivo/archivo2" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "opciรณn %s desconocida" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "no se pudo analizar el objeto '%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] "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 +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 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "no se pudo resolver ref '%s'" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Fusionando %s con %s\n" + +#: builtin/merge.c:56 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opciones>] [<commit>...]" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:121 msgid "switch `m' requires a value" msgstr "cambiar `m' requiere un valor" -#: builtin/merge.c:141 +#: builtin/merge.c:144 #, c-format msgid "option `%s' requires a value" msgstr "opciรณn `%s' requiere un valor" -#: builtin/merge.c:187 +#: builtin/merge.c:190 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No se pudo encontrar estrategia de fusiรณn '%s'.\n" -#: builtin/merge.c:188 +#: builtin/merge.c:191 #, c-format msgid "Available strategies are:" msgstr "Estrategias disponibles son:" -#: builtin/merge.c:193 +#: builtin/merge.c:196 #, c-format msgid "Available custom strategies are:" msgstr "Estrategias personalizadas disponibles son:" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:247 builtin/pull.c:133 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:247 builtin/pull.c:154 +#: builtin/merge.c:250 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "mostrar un diffstat al final de la fusiรณn" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:251 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(sinรณnimo para --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:253 builtin/pull.c:142 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:253 builtin/pull.c:166 +#: builtin/merge.c:256 builtin/pull.c:148 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:255 builtin/pull.c:169 +#: builtin/merge.c:258 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar un commit si la fusiรณn es exitosa (default)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:260 builtin/pull.c:154 msgid "edit message before committing" msgstr "editar mensaje antes de realizar commit" -#: builtin/merge.c:259 +#: builtin/merge.c:262 msgid "allow fast-forward (default)" msgstr "permitir fast-forwars (default)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:264 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "abortar si fast-forward no es posible" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:268 builtin/pull.c:164 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:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114 msgid "strategy" msgstr "estrategia" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:270 builtin/pull.c:169 msgid "merge strategy to use" msgstr "estrategia de fusiรณn para usar" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:271 builtin/pull.c:172 msgid "option=value" msgstr "opciรณn=valor" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:272 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "opciรณn para la estrategia de fusiรณn seleccionada" -#: builtin/merge.c:271 +#: builtin/merge.c:274 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:278 +#: builtin/merge.c:281 msgid "abort the current in-progress merge" msgstr "abortar la fusiรณn en progreso actual" -#: builtin/merge.c:280 +#: builtin/merge.c:283 msgid "--abort but leave index and working tree alone" msgstr "--abort pero deja el รญndice y el รกrbol de trabajo solos" -#: builtin/merge.c:282 +#: builtin/merge.c:285 msgid "continue the current in-progress merge" msgstr "continuar la fusiรณn en progreso actual" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:287 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "permitir fusionar historias no relacionadas" -#: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "verificar el hook commit-msg" +#: builtin/merge.c:294 +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg" -#: builtin/merge.c:307 +#: builtin/merge.c:311 msgid "could not run stash." msgstr "no se pudo ejecutar stash." -#: builtin/merge.c:312 +#: builtin/merge.c:316 msgid "stash failed" msgstr "stash fallรณ" -#: builtin/merge.c:317 +#: builtin/merge.c:321 #, c-format msgid "not a valid object: %s" msgstr "no es un objeto vรกlido: %s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:343 builtin/merge.c:360 msgid "read-tree failed" msgstr "lectura de รกrbol fallรณ" -#: builtin/merge.c:386 +#: builtin/merge.c:390 msgid " (nothing to squash)" msgstr " (nada para hacer squash)" -#: builtin/merge.c:397 +#: builtin/merge.c:401 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit de squash -- no actualizando HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:451 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "No hay mensaje de fusiรณn -- no actualizando HEAD\n" -#: builtin/merge.c:498 +#: builtin/merge.c:502 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no apunta a ningรบn commit" -#: builtin/merge.c:585 +#: builtin/merge.c:589 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mal string branch.%s.mergeoptions: %s" -#: builtin/merge.c:708 +#: builtin/merge.c:716 msgid "Not handling anything other than two heads merge." msgstr "No manejando nada mรกs que fusiรณn de dos heads." -#: builtin/merge.c:722 +#: builtin/merge.c:730 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opciรณn desconocida para merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:745 #, c-format msgid "unable to write %s" msgstr "no es posible escribir %s" -#: builtin/merge.c:789 +#: builtin/merge.c:797 #, c-format msgid "Could not read from '%s'" msgstr "No se puedo leer de '%s'" -#: builtin/merge.c:798 +#: builtin/merge.c:806 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "No se realiza commit de la fusiรณn; use 'git commit' para completar la " "fusiรณn.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:812 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" @@ -15120,11 +16646,11 @@ msgstr "" "tรณpico.\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:817 msgid "An empty message aborts the commit.\n" msgstr "Un mensaje vacรญo aborta el commit.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:820 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15133,74 +16659,74 @@ msgstr "" "Lรญneas comenzando con '%c' serรกn ignoradas, y un mensaje vacรญo aborta\n" " el commit.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:873 msgid "Empty commit message." msgstr "Mensaje de commit vacรญo." -#: builtin/merge.c:872 +#: builtin/merge.c:888 #, c-format msgid "Wonderful.\n" msgstr "Maravilloso.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:949 #, 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:972 +#: builtin/merge.c:988 msgid "No current branch." msgstr "No rama actual." -#: builtin/merge.c:974 +#: builtin/merge.c:990 msgid "No remote for the current branch." msgstr "No hay remoto para la rama actual." -#: builtin/merge.c:976 +#: builtin/merge.c:992 msgid "No default upstream defined for the current branch." msgstr "Por defecto, no hay un upstream definido para la rama actual." -#: builtin/merge.c:981 +#: builtin/merge.c:997 #, 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:1038 +#: builtin/merge.c:1054 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor errรณneo '%s' en el entorno '%s'" -#: builtin/merge.c:1141 +#: builtin/merge.c:1157 #, c-format msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -#: builtin/merge.c:1175 +#: builtin/merge.c:1191 msgid "not something we can merge" msgstr "nada que podamos fusionar" -#: builtin/merge.c:1278 +#: builtin/merge.c:1295 msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" -#: builtin/merge.c:1282 +#: builtin/merge.c:1299 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hay una fusiรณn para abortar (falta MERGE_HEAD)" -#: builtin/merge.c:1291 +#: builtin/merge.c:1317 msgid "--quit expects no arguments" msgstr "--quit no espera argumentos" -#: builtin/merge.c:1304 +#: builtin/merge.c:1330 msgid "--continue expects no arguments" msgstr "--continue no espera argumentos" -#: builtin/merge.c:1308 +#: builtin/merge.c:1334 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hay fusiรณn en progreso (falta MERGE_HEAD)." -#: builtin/merge.c:1324 +#: builtin/merge.c:1350 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15208,7 +16734,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:1331 +#: builtin/merge.c:1357 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15216,213 +16742,102 @@ 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:1334 +#: builtin/merge.c:1360 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:1348 +#: builtin/merge.c:1374 msgid "You cannot combine --squash with --no-ff." msgstr "No se puede combinar --squash con --no-ff." -#: builtin/merge.c:1350 +#: builtin/merge.c:1376 msgid "You cannot combine --squash with --commit." msgstr "No se puede combinar --squash con --commit." -#: builtin/merge.c:1366 +#: builtin/merge.c:1392 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hay commit especificado y merge.defaultToUpstream no estรก configurado." -#: builtin/merge.c:1383 +#: builtin/merge.c:1409 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:1385 +#: builtin/merge.c:1411 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:1390 +#: builtin/merge.c:1416 #, c-format msgid "%s - not something we can merge" msgstr "%s - nada que podamos fusionar" -#: builtin/merge.c:1392 +#: builtin/merge.c:1418 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:1471 +#: builtin/merge.c:1499 msgid "refusing to merge unrelated histories" msgstr "rehusando fusionar historias no relacionadas" -#: builtin/merge.c:1480 +#: builtin/merge.c:1508 msgid "Already up to date." msgstr "Ya estรก actualizado." -#: builtin/merge.c:1490 +#: builtin/merge.c:1518 #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1564 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusiรณn en รญndice realmente trivial...\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1571 #, c-format msgid "Nope.\n" msgstr "Nop.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1596 msgid "Already up to date. Yeeah!" msgstr "Ya estรก actualizado. ยกOh, yeaahh!" -#: builtin/merge.c:1570 +#: builtin/merge.c:1602 msgid "Not possible to fast-forward, aborting." msgstr "No es posible hacer fast-forward, abortando." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1630 builtin/merge.c:1695 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinando el รกrbol a original...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1634 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentando estrategia de fusiรณn %s...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1686 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ninguna estrategia de fusiรณn manejรณ la fusiรณn.\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1688 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Fusionar con estrategia %s fallรณ.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1697 #, 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:1672 +#: builtin/merge.c:1711 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Fusiรณn automรกtica fue bien; detenida antes del commit como se solicitรณ\n" -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <commit> <commit>..." - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <commit>..." - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <commit>..." - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <commit> <commit>" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <ref> [<commit>]" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "mostrar todos los ancestros comunes" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "encontrar ancestros para una รบnica fusiรณn de n-vรญas" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -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?" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "encontrar donde <commit> forjรณ del reflog de <ref>" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" -"git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] " -"<archivo1> <archivo-origen> <archivo2>" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "mandar resultados a standard output" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "usar un fusiรณn basada en diff3" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "por conflictos, usar nuestra versiรณn" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "por conflictos, usar la versiรณn de ellos" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "por conflictos, usar una versiรณn de uniรณn" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "por conflictos, usar el tamaรฑo de este marcador" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "no advertir sobre conflictos" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "configurar labels para archivo1/orig-archivo/archivo2" - -#: builtin/merge-recursive.c:46 -#, c-format -msgid "unknown option %s" -msgstr "opciรณn %s desconocida" - -#: 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: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:64 -msgid "not handling anything other than two heads merge." -msgstr "no manejando nada distinto a fusiones de dos heads." - -#: 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:78 -#, c-format -msgid "Merging %s with %s\n" -msgstr "Fusionando %s con %s\n" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -15441,17 +16856,17 @@ msgstr "permitir la creaciรณn de mรกs de un รกrbol" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<tamaรฑo>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<tamaรฑo>)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 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:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -15459,15 +16874,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:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "muchos argumentos" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 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:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "subcomando desconocido: %s" @@ -15479,7 +16894,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" @@ -15561,52 +16976,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:717 builtin/repack.c:510 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 #, c-format msgid "renaming '%s' failed" msgstr "renombrando '%s' fallรณ" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opciones>] <commit>..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opciones>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opciones>] --stdin" -#: builtin/name-rev.c:411 +#: builtin/name-rev.c:524 msgid "print only names (no SHA-1)" msgstr "imprimir sรณlo nombres (sin SHA-1)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "sรณlo usar tags para nombrar commits" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "solo usar refs que concuerden con <patrรณn>" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ignorar refs que concuerden con <patrรณn>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "listar todos los commits alcanzables desde todas las referencias" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "leer desde stdin" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "permitir imprimir nombres `undefined` (predeterminado)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "desreferenciar tags en la entrada (uso interno)" @@ -15755,7 +17170,7 @@ msgstr "incapaz de escribir el objeto de nota" msgid "the note contents have been left in %s" msgstr "los contenidos de nota han sido dejados en %s" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "no se pudo abrir o leer '%s'" @@ -15988,7 +17403,7 @@ msgstr "" "commit con el resultado 'git notes merge --commit', o aborte la fusiรณn con " "'git notes merge --abort'.\n" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Fallรณ al resolver '%s' como una ref vรกlida." @@ -16006,7 +17421,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:165 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "no eliminar, solo mostrar" @@ -16022,148 +17437,142 @@ msgstr "referencia-de-notas" msgid "use notes from <notes-ref>" msgstr "usar notas desde <referencia-de-notas>" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1608 #, c-format msgid "unknown subcommand: %s" msgstr "subcomando desconocido: %s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-" "objetos>]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-" "de-objetos>]" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:442 #, c-format msgid "bad packed object CRC for %s" msgstr "mal paquete de objeto CRC para %s" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:453 #, c-format msgid "corrupt packed object for %s" msgstr "objeto empaquetado corrupto para %s" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:584 #, c-format msgid "recursive delta detected for object %s" msgstr "delta recursivo encontrado para objeto %s" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:795 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objetos ordenados, esperados %<PRIu32>" -#: 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 +#: builtin/pack-objects.c:1003 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:854 +#: builtin/pack-objects.c:1016 msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:1077 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "fallรณ al iniciar %s" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1130 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1347 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:1597 +#: builtin/pack-objects.c:1774 #, 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:1606 +#: builtin/pack-objects.c:1783 #, 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:1875 +#: builtin/pack-objects.c:2054 msgid "Counting objects" msgstr "Contando objetos" -#: 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 +#: builtin/pack-objects.c:2199 #, c-format msgid "unable to parse object header of %s" msgstr "incapaz de analizar header del objeto %s" -#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2269 builtin/pack-objects.c:2285 +#: builtin/pack-objects.c:2295 #, c-format msgid "object %s cannot be read" msgstr "objeto %s no puede ser leรญdo" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2272 builtin/pack-objects.c:2299 #, 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:2130 +#: builtin/pack-objects.c:2309 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - fuera de memoria" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2624 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compresiรณn delta usando hasta %d hilos" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2763 #, 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:2675 +#: builtin/pack-objects.c:2851 msgid "Compressing objects" msgstr "Comprimiendo objetos" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2857 msgid "inconsistency with delta count" msgstr "inconsistencia con la cuenta de delta" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2929 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" +"valor para uploadpack.blobpackfileuri tiene que ser de la forma '<hash-de-" +"objeto> <hash-de-pack> <uri>' (se tuvo '%s')" + +#: builtin/pack-objects.c:2932 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" +"objeto ya estรก configurado en otro uploadpack.blobpackfileuri (se obtuvo " +"'%s')" + +#: builtin/pack-objects.c:2961 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16172,7 +17581,7 @@ msgstr "" "se espseraba ID de objeto al borde, se obtuvo basura:\n" "%s" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2967 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16181,249 +17590,247 @@ msgstr "" "se esperaba ID de objeto, se obtuvo basuta:\n" "%s" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:3065 msgid "invalid value for --missing" msgstr "valor invรกlido para --missing" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3124 builtin/pack-objects.c:3232 msgid "cannot open pack index" msgstr "no se puede abrir รญndice de paquetes" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:3155 #, c-format msgid "loose object at %s could not be examined" msgstr "objeto perdido en %s no pudo ser examinado" -#: builtin/pack-objects.c:3041 +#: builtin/pack-objects.c:3240 msgid "unable to force loose object" msgstr "incapaz de forzar un objeto perdido" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3333 #, c-format msgid "not a rev '%s'" msgstr "no es una rev '%s'" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3336 #, c-format msgid "bad revision '%s'" msgstr "mala revisiรณn '%s'" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3361 msgid "unable to add recent objects" msgstr "incapaz de aรฑadir objetos recientes" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3414 #, c-format msgid "unsupported index version %s" msgstr "versiรณn de รญndice no soportada %s" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3418 #, c-format msgid "bad index version '%s'" msgstr "mala versiรณn del รญndice '%s'" -#: 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 +#: builtin/pack-objects.c:3456 msgid "<version>[,<offset>]" msgstr "<versiรณn>[,<offset>]" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3457 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:3260 +#: builtin/pack-objects.c:3460 msgid "maximum size of each output pack file" msgstr "tamaรฑo mรกximo de cada paquete resultante" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3462 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos prestados de otros almacenes de objetos" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3464 msgid "ignore packed objects" msgstr "ignorar objetos paquete" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3466 msgid "limit pack window by objects" msgstr "limitar ventana de paquete por objetos" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3468 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:3270 +#: builtin/pack-objects.c:3470 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:3272 +#: builtin/pack-objects.c:3472 msgid "reuse existing deltas" msgstr "reusar deltas existentes" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3474 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3476 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3478 msgid "use threads when searching for best delta matches" msgstr "usar hilos cuando se busque para mejores concordancias de delta" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3480 msgid "do not create an empty pack output" msgstr "no crear un paquete resultante vacรญo" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3482 msgid "read revision arguments from standard input" msgstr "leer argumentos de revisiรณn de standard input" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3484 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:3287 +#: builtin/pack-objects.c:3487 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanzables por cualquier referencia" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3490 msgid "include objects referred by reflog entries" msgstr "incluir objetos referidos por entradas de reflog" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3493 msgid "include objects referred to by the index" msgstr "incluir objetos referidos por el รญndice" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3496 msgid "output pack to stdout" msgstr "mostrar paquete en stdout" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3498 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:3300 +#: builtin/pack-objects.c:3500 msgid "keep unreachable objects" msgstr "mantener objetos inalcanzables" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3502 msgid "pack loose unreachable objects" msgstr "empaquetar objetos sueltos inalcanzables" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3504 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables mรกs nuevos que <tiempo>" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3507 msgid "use the sparse reachability algorithm" msgstr "usar el algoritmo sparse reachability" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3509 msgid "create thin packs" msgstr "crear paquetes delgados" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3511 msgid "create packs suitable for shallow fetches" msgstr "crear paquetes adecuados para fetches superficiales" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3513 msgid "ignore packs that have companion .keep file" msgstr "ignorar paquetes que tienen un archivo .keep acompaรฑante" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3515 msgid "ignore this pack" msgstr "ignorar este paquete" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3517 msgid "pack compression level" msgstr "nivel de compresiรณn del paquete" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3519 msgid "do not hide commits by grafts" msgstr "no ocultar commits por injertos" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3521 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:3323 +#: builtin/pack-objects.c:3523 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:3327 +#: builtin/pack-objects.c:3527 msgid "write a bitmap index if possible" msgstr "escribir un รญndice de bitmap si es posible" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3531 msgid "handling for missing objects" msgstr "manejo de objetos perdidos" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3534 msgid "do not pack objects in promisor packfiles" msgstr "no se puede empaquetar objetos en packfiles promisores" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3536 msgid "respect islands during delta compression" msgstr "respetar islas durante la compresiรณn delta" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3538 +msgid "protocol" +msgstr "protocolo" + +#: builtin/pack-objects.c:3539 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "" +"excluyendo cualquier uploadpack.blobpackfileuri configurado con este " +"protocolo" + +#: builtin/pack-objects.c:3568 #, 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:3366 +#: builtin/pack-objects.c:3573 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit es muy grande, forzando %d" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3627 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:3422 +#: builtin/pack-objects.c:3629 msgid "minimum pack size limit is 1 MiB" msgstr "tamaรฑo mรญnimo del paquete es 1 MiB" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3634 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:3430 +#: builtin/pack-objects.c:3637 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable y --unpack-unreachable son incompatibles" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3643 msgid "cannot use --filter without --stdout" msgstr "no se puede usar--filter sin --stdout" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3703 msgid "Enumerating objects" msgstr "Enumerando objetos" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3734 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" -msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" +msgstr "" +"Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>), pack-" +"reusado %<PRIu32>" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -16437,94 +17844,120 @@ msgstr "empaquetar todo" msgid "prune loose refs (default)" msgstr "recortar refs perdidos (default)" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 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 "Removiendo objetos duplicados" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "reportar objetos recortados" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "expirar objetos mรกs viejos a <tiempo>" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor" -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "no se puede recortar en un repositorio de objetos-preciosos" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor invรกlido para %s: %s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" "git pull [<opciones>] [<repositorio> [<especificaciรณn-de-referencia>...]]" -#: builtin/pull.c:141 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "control de fetch recursivo en submรณdulos" -#: builtin/pull.c:145 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "Opciones relacionadas a fusiรณn" -#: builtin/pull.c:148 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar cambios por rebase en lugar de fusiรณn" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permitir fast-forward" -#: 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:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" +msgstr "ejecutar automรกticamente stash/stash pop antes y despuรฉs" -#: builtin/pull.c:201 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "Opciones relacionadas a fetch" -#: builtin/pull.c:211 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "forzar sobrescritura de la rama local" -#: builtin/pull.c:219 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "nรบmero de submรณdulos que realizan pull en paralelo" -#: builtin/pull.c:316 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor invรกlido para pull.ff: %s" -#: builtin/pull.c:433 +#: builtin/pull.c:349 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"Hacer un pull sin especificar cรณmo reconciliar las ramas es poco\n" +"recomendable. Puedes eliminar este mensaje usando uno de los\n" +"siguientes comandos antes de tu siguiente pull:\n" +"\n" +" git config pull.rebase false # hacer merge (estrategia por defecto)\n" +" git config pull.rebase true # aplicar rebase\n" +" git config pull.ff only # aplicar solo fast-forward\n" +"\n" +"Puedes reemplazar \"git config\" con \"git config --global\" para aplicar\n" +"la preferencia en todos los repositorios. Puedes tambiรฉn pasar --rebase,\n" +"--no-rebase, o --ff-only en el comando para sobreescribir la configuraciรณn\n" +"por defecto en cada invocaciรณn.\n" +"\n" + +#: builtin/pull.c:459 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:435 +#: builtin/pull.c:461 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:436 +#: builtin/pull.c:462 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16533,7 +17966,7 @@ msgstr "" "tiene\n" "concordancia en el final remoto." -#: builtin/pull.c:439 +#: builtin/pull.c:465 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16544,44 +17977,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:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:470 builtin/rebase.c:1234 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "No te encuentras actualmente en la rama." -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:472 builtin/pull.c:487 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:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:474 builtin/pull.c:489 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:449 builtin/pull.c:464 +#: builtin/pull.c:475 builtin/pull.c:490 msgid "See git-pull(1) for details." msgstr "Ver git-pull(1) para detalles." -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492 +#: builtin/rebase.c:1240 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<rama>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:485 builtin/rebase.c:1232 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:468 git-parse-remote.sh:95 +#: builtin/pull.c:494 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:473 +#: builtin/pull.c:499 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16590,32 +18023,28 @@ 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:581 +#: builtin/pull.c:610 #, c-format msgid "unable to access commit %s" msgstr "no es posible acceder al commit %s" -#: builtin/pull.c:861 +#: builtin/pull.c:895 msgid "ignoring --verify-signatures for rebase" msgstr "ignorando --verify-signatures para rebase" -#: 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:924 +#: builtin/pull.c:955 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:928 +#: builtin/pull.c:959 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:929 +#: builtin/pull.c:960 msgid "please commit or stash them." msgstr "por favor realiza un commit o un stash con ellos." -#: builtin/pull.c:954 +#: builtin/pull.c:985 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16626,7 +18055,7 @@ msgstr "" "realizando fast-forward al รกrbol de trabajo\n" "desde commit %s." -#: builtin/pull.c:960 +#: builtin/pull.c:991 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16643,15 +18072,15 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:975 +#: builtin/pull.c:1006 msgid "Cannot merge multiple branches into empty head." msgstr "No se puede fusionar mรบltiples ramas en un head vacรญo." -#: builtin/pull.c:979 +#: builtin/pull.c:1010 msgid "Cannot rebase onto multiple branches." msgstr "No se puede rebasar en mรบltiples ramas." -#: builtin/pull.c:986 +#: builtin/pull.c:1018 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no se puede rebasar con modificaciones de submรณdulos grabadas localmente" @@ -16661,15 +18090,15 @@ msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" "git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]" -#: builtin/push.c:111 +#: builtin/push.c:112 msgid "tag shorthand without <tag>" msgstr "taquigrafรญa de tag sin <tag>" -#: builtin/push.c:121 +#: builtin/push.c:122 msgid "--delete only accepts plain target ref names" msgstr "--delete solo acepta como objetivos nombres de ref planos" -#: builtin/push.c:167 +#: builtin/push.c:168 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -16678,7 +18107,7 @@ msgstr "" "Para elegir si la opciรณn es permanente, mira push.default en 'git help " "config'." -#: builtin/push.c:170 +#: builtin/push.c:171 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16703,7 +18132,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:186 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16718,7 +18147,7 @@ msgstr "" "\n" "\tgit push %s HEAD:<nombre-de-rama-remota>\n" -#: builtin/push.c:199 +#: builtin/push.c:200 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16732,12 +18161,12 @@ msgstr "" "\n" "\tgit push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:208 #, 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:210 +#: builtin/push.c:211 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -16748,13 +18177,13 @@ msgstr "" "la rama actual '%s', sin decirme quรฉ poner en el push\n" "para actualizar en quรฉ rama de remoto." -#: builtin/push.c:269 +#: builtin/push.c:270 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:276 +#: 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" @@ -16766,7 +18195,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:282 +#: 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" @@ -16779,7 +18208,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:288 +#: 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" @@ -16793,12 +18222,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:295 +#: builtin/push.c:296 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:298 +#: 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" @@ -16808,141 +18237,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:359 +#: builtin/push.c:361 #, c-format msgid "Pushing to %s\n" msgstr "Haciendo push a %s\n" -#: builtin/push.c:364 +#: builtin/push.c:368 #, c-format msgid "failed to push some refs to '%s'" msgstr "fallรณ el push de algunas referencias a '%s'" -#: 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 +#: builtin/push.c:542 msgid "repository" msgstr "repositorio" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:543 builtin/send-pack.c:164 msgid "push all refs" msgstr "realizar push a todas las refs" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:544 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "realizar mirror a todas las refs" -#: builtin/push.c:558 +#: builtin/push.c:546 msgid "delete refs" msgstr "borrar refs" -#: builtin/push.c:559 +#: builtin/push.c:547 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:562 builtin/send-pack.c:167 +#: builtin/push.c:550 builtin/send-pack.c:167 msgid "force updates" msgstr "forzar actualizaciones" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:551 builtin/send-pack.c:179 msgid "<refname>:<expect>" msgstr "<refname>:<expect>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:552 builtin/send-pack.c:180 msgid "require old value of ref to be at this value" msgstr "requiere haber valor viejo de ref en este valor" -#: builtin/push.c:568 +#: builtin/push.c:555 msgid "control recursive pushing of submodules" msgstr "controlar push recursivo de submรณdulos" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:556 builtin/send-pack.c:174 msgid "use thin pack" msgstr "usar empaquetado delgado" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 +#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "recibir programa de paquete" -#: builtin/push.c:573 +#: builtin/push.c:559 msgid "set upstream for git pull/status" msgstr "configurar upstream para git pulll/status" -#: builtin/push.c:576 +#: builtin/push.c:562 msgid "prune locally removed refs" -msgstr "recortando refs removidas localmente" +msgstr "recortando refs eliminadas localmente" -#: builtin/push.c:578 +#: builtin/push.c:564 msgid "bypass pre-push hook" msgstr "hacer un bypass al hook pre-push" -#: builtin/push.c:579 +#: builtin/push.c:565 msgid "push missing but relevant tags" msgstr "realizar push de tags faltantes pero relevantes" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:567 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "Firmar con GPG el push" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:569 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "solicitar transacciรณn atรณmica en el lado remoto" -#: builtin/push.c:602 +#: builtin/push.c:587 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete es incompatible con --all, --mirror y --tags" -#: builtin/push.c:604 +#: builtin/push.c:589 msgid "--delete doesn't make sense without any refs" msgstr "--delete no tiene sentido sin ninguna referencia" -#: builtin/push.c:607 +#: builtin/push.c:609 +#, c-format +msgid "bad repository '%s'" +msgstr "mal repositorio '%s'" + +#: builtin/push.c:610 +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:625 msgid "--all and --tags are incompatible" msgstr "--all y --tags son incompatibles" -#: builtin/push.c:609 +#: builtin/push.c:627 msgid "--all can't be combined with refspecs" msgstr "--all no puede ser combinada con refspecs" -#: builtin/push.c:613 +#: builtin/push.c:631 msgid "--mirror and --tags are incompatible" msgstr "--mirror y --tags son incompatibles" -#: builtin/push.c:615 +#: builtin/push.c:633 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no puede ser combinado con refspecs" -#: builtin/push.c:618 +#: builtin/push.c:636 msgid "--all and --mirror are incompatible" msgstr "--all y --mirror son incompatibles" -#: builtin/push.c:637 +#: builtin/push.c:640 msgid "push options must not have new line characters" msgstr "opciones de push no pueden tener caracteres de lรญnea nueva" @@ -16960,24 +18389,32 @@ 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:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "Porcentaje por el cual la creaciรณn es pesada" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "usar colores simples de diff" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: 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 #, c-format msgid "no .. in range: '%s'" msgstr "no .. en rango: '%s'" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "argumento รบnico de formato debe ser un rango simรฉtrico" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "se necesitan dos rangos de commits" @@ -17060,234 +18497,215 @@ msgstr "debug de รกrboles-desempacados" msgid "suppress feedback messages" msgstr "suprimir mensajes de feedback" -#: builtin/rebase.c:32 +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "Necesitas resolver tu รญndice actual primero" + +#: builtin/rebase.c:35 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] --root[<rama>]" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 #, c-format msgid "unusable todo list: '%s'" msgstr "lista de pendientes inutilizable: '%s'" -#: 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 +#: builtin/rebase.c:298 #, c-format msgid "could not create temporary %s" msgstr "no se pudo crear archivo temporal %s" -#: builtin/rebase.c:285 +#: builtin/rebase.c:304 msgid "could not mark as interactive" msgstr "no se pudo marcar como interactivo" -#: builtin/rebase.c:343 +#: builtin/rebase.c:358 msgid "could not generate todo list" msgstr "no se pudo generar lista de pendientes" -#: builtin/rebase.c:382 +#: builtin/rebase.c:399 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:437 +#: builtin/rebase.c:468 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<opciones>]" -#: builtin/rebase.c:449 -msgid "keep empty commits" -msgstr "mantener commits vacรญos" +#: builtin/rebase.c:481 builtin/rebase.c:1374 +msgid "keep commits which start empty" +msgstr "mantener commits que comienzan con vacรญo" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:485 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permitir commits con mensajes vacรญos" -#: builtin/rebase.c:452 +#: builtin/rebase.c:487 msgid "rebase merge commits" msgstr "rebasando commits de fusiรณn" -#: builtin/rebase.c:454 +#: builtin/rebase.c:489 msgid "keep original branch points of cousins" msgstr "mantener puntos originales de la rama de sus primos" -#: builtin/rebase.c:456 +#: builtin/rebase.c:491 msgid "move commits that begin with squash!/fixup!" msgstr "mover commits que comienzan con squash!/fixup!" -#: builtin/rebase.c:457 +#: builtin/rebase.c:492 msgid "sign commits" msgstr "firmar commits" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:494 builtin/rebase.c:1314 msgid "display a diffstat of what changed upstream" msgstr "mostrar un diffstat de lo que cambiรณ en upstream" -#: builtin/rebase.c:461 +#: builtin/rebase.c:496 msgid "continue rebase" msgstr "continuar rebase" -#: builtin/rebase.c:463 +#: builtin/rebase.c:498 msgid "skip commit" msgstr "saltar commit" -#: builtin/rebase.c:464 +#: builtin/rebase.c:499 msgid "edit the todo list" msgstr "editar la lista de pendientes" -#: builtin/rebase.c:466 +#: builtin/rebase.c:501 msgid "show the current patch" msgstr "mostrar el parche actual" -#: builtin/rebase.c:469 +#: builtin/rebase.c:504 msgid "shorten commit ids in the todo list" msgstr "ids de commits cortos en la lista de pendientes" -#: builtin/rebase.c:471 +#: builtin/rebase.c:506 msgid "expand commit ids in the todo list" msgstr "expandir ids de commits en la lista de pendientes" -#: builtin/rebase.c:473 +#: builtin/rebase.c:508 msgid "check the todo list" msgstr "revisar la lista de pendientes" -#: builtin/rebase.c:475 +#: builtin/rebase.c:510 msgid "rearrange fixup/squash lines" msgstr "reorganizar lรญneas fixup/squash" -#: builtin/rebase.c:477 +#: builtin/rebase.c:512 msgid "insert exec commands in todo list" msgstr "insertar comando exec en la lista de pendientes" -#: builtin/rebase.c:478 +#: builtin/rebase.c:513 msgid "onto" msgstr "hacia" -#: builtin/rebase.c:481 +#: builtin/rebase.c:516 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:481 +#: builtin/rebase.c:516 msgid "restrict revision" msgstr "restringir revision" -#: builtin/rebase.c:483 +#: builtin/rebase.c:518 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:484 +#: builtin/rebase.c:519 msgid "squash onto" msgstr "squash hacia" -#: builtin/rebase.c:486 +#: builtin/rebase.c:521 msgid "the upstream commit" msgstr "el commit de upstream" -#: builtin/rebase.c:488 +#: builtin/rebase.c:523 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:488 +#: builtin/rebase.c:523 msgid "head name" msgstr "nombre de head" -#: builtin/rebase.c:493 +#: builtin/rebase.c:528 msgid "rebase strategy" msgstr "estrategia de rebase" -#: builtin/rebase.c:494 +#: builtin/rebase.c:529 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:495 +#: builtin/rebase.c:530 msgid "strategy options" msgstr "opciones de estrategia" -#: builtin/rebase.c:496 +#: builtin/rebase.c:531 msgid "switch-to" msgstr "cambiar a" -#: builtin/rebase.c:497 +#: builtin/rebase.c:532 msgid "the branch or commit to checkout" msgstr "la rama o commit para hacer checkout" -#: builtin/rebase.c:498 +#: builtin/rebase.c:533 msgid "onto-name" msgstr "hacia-nombre" -#: builtin/rebase.c:498 +#: builtin/rebase.c:533 msgid "onto name" msgstr "hacia nombre" -#: builtin/rebase.c:499 +#: builtin/rebase.c:534 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:499 +#: builtin/rebase.c:534 msgid "the command to run" msgstr "el comando para ejecutar" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:537 builtin/rebase.c:1407 msgid "automatically re-schedule any `exec` that fails" msgstr "reprogramar automaticamente cualquier `exec` que falle" -#: builtin/rebase.c:518 +#: builtin/rebase.c:553 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges" -#: builtin/rebase.c:534 +#: builtin/rebase.c:569 #, c-format -msgid "%s requires an interactive rebase" -msgstr "%s requiere un rebase interactivo" +msgid "%s requires the merge backend" +msgstr "%s requiere un backend de fusiรณn" -#: builtin/rebase.c:586 +#: builtin/rebase.c:612 #, c-format msgid "could not get 'onto': '%s'" msgstr "no se pudo conseguir 'onto': '%s'" -#: builtin/rebase.c:601 +#: builtin/rebase.c:629 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head invรกlido: '%s'" -#: builtin/rebase.c:626 +#: builtin/rebase.c:654 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorando invรกlido allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:702 -#, c-format -msgid "Could not read '%s'" -msgstr "No se pudo leer '%s'" - -#: builtin/rebase.c:720 -#, c-format -msgid "Cannot store %s" -msgstr "No se puede guardar %s" - -#: builtin/rebase.c:827 -msgid "could not determine HEAD revision" -msgstr "no se pudo determinar revisiรณn HEAD" - -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:799 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" @@ -17302,7 +18720,7 @@ msgstr "" "Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git " "rebase --abort\"." -#: builtin/rebase.c:1031 +#: builtin/rebase.c:882 #, c-format msgid "" "\n" @@ -17321,7 +18739,16 @@ msgstr "" "\n" "Como resultado, git no puede hacer rebase con ellos." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1208 +#, 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:1226 #, c-format msgid "" "%s\n" @@ -17338,7 +18765,7 @@ msgstr "" " git rebase '<rama>'\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1242 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17351,158 +18778,180 @@ msgstr "" " git branch --set-upstream-to=%s/<rama> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1272 msgid "exec commands cannot contain newlines" msgstr "comandos exec no pueden contener newlines" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1276 msgid "empty exec command" msgstr "comando exec vacรญo" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1305 msgid "rebase onto given branch instead of upstream" msgstr "haciendo rebase hacia rama dada en lugar de upstream" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1307 +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:1309 msgid "allow pre-rebase hook to run" msgstr "permitir ejecutar hook pre-rebase" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1311 msgid "be quiet. implies --no-stat" msgstr "ser silencioso implica --no-stat" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1317 msgid "do not show diffstat of what changed upstream" msgstr "no mostrar un diffstat de lo que cambiรณ en upstream" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1320 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:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 +#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328 msgid "passed to 'git am'" msgstr "pasado a 'git am'" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1330 builtin/rebase.c:1332 msgid "passed to 'git apply'" msgstr "pasado a 'git-apply'" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1334 builtin/rebase.c:1337 msgid "cherry-pick all commits, even if unchanged" msgstr "cherry-pick todos los commits, incluso si no han cambiado" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1339 msgid "continue" msgstr "continuar" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1342 msgid "skip current patch and continue" msgstr "saltar el parche y continuar" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1344 msgid "abort and check out the original branch" msgstr "aborta y revisa la rama original" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1347 msgid "abort but keep HEAD where it is" msgstr "aborta pero mantiene HEAD donde estรก" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1348 msgid "edit the todo list during an interactive rebase" msgstr "editar la lista de pendientes durante el rebase interactivo" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1351 msgid "show the patch file being applied or merged" msgstr "muestra el archivo parche siendo aplicado o fusionado" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1354 +msgid "use apply strategies to rebase" +msgstr "usar estrategias de apply para el rebase" + +#: builtin/rebase.c:1358 msgid "use merging strategies to rebase" msgstr "usar estrategias de fusiรณn para el rebase" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1362 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:1451 +#: builtin/rebase.c:1366 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos" -#: builtin/rebase.c:1455 -msgid "preserve empty commits during rebase" -msgstr "preservar commits vacรญos durante el rebase" +#: builtin/rebase.c:1371 +msgid "how to handle commits that become empty" +msgstr "como manejar commits que se vuelven vacรญos" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1378 msgid "move commits that begin with squash!/fixup! under -i" msgstr "mover commits que comienzan con squash!/fixup! bajo -i" -#: 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:1465 +#: builtin/rebase.c:1385 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:1469 +#: builtin/rebase.c:1389 msgid "allow rebasing commits with empty messages" msgstr "permitir rebase commits con mensajes vacรญos" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1393 msgid "try to rebase merges instead of skipping them" msgstr "intentar fusiones por rebase en lugar de saltarlas" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1396 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "use 'merge-base --fork-point' para refinar upstream" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1398 msgid "use the given merge strategy" msgstr "usar la estrategia de merge dada" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1400 builtin/revert.c:115 msgid "option" msgstr "opciรณn" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1401 msgid "pass the argument through to the merge strategy" msgstr "pasar el argumento para la estrategia de fusiรณn" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1404 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:1500 +#: builtin/rebase.c:1409 +msgid "apply all changes, even those already present upstream" +msgstr "" +"aplicar todos los cambios, incluso aquellos que ya estรกn presentes en " +"upstream" + +#: builtin/rebase.c:1426 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 removido!\n" +"el soporte para rebase.useBuiltin ha sido eliminado!\n" "Vea su entrada en 'git help config' para detalles." -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1432 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:1547 +#: builtin/rebase.c:1473 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:1551 +#: builtin/rebase.c:1478 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "no se puede combinar '--keep-base' con '--onto'" + +#: builtin/rebase.c:1480 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "no se puede combinar '--keep-base' con '--root'" + +#: builtin/rebase.c:1484 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "no se puede combinar '--root' con '--fork-point'" + +#: builtin/rebase.c:1487 msgid "No rebase in progress?" -msgstr "No hay rebase en progreso?" +msgstr "ยฟNo hay rebase en progreso?" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1491 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:1578 +#: builtin/rebase.c:1514 msgid "Cannot read HEAD" msgstr "No se puede leer el HEAD" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1526 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17510,16 +18959,16 @@ msgstr "" "Tienes que editar todos los conflictos de fusiรณn y luego\n" "marcarlos como resueltos usando git add" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1545 msgid "could not discard worktree changes" msgstr "no se pudo descartar los cambios del รกrbol de trabajo" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1564 #, c-format msgid "could not move back to %s" msgstr "no se puede regresar a %s" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1610 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17540,176 +18989,144 @@ msgstr "" "y ejecรบtame nuevamente. Me estoy deteniendo en caso de que tengas\n" "algo de valor ahรญ.\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1638 msgid "switch `C' expects a numerical value" msgstr "switch `C' espera un valor numรฉrico" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1680 #, c-format msgid "Unknown mode: %s" msgstr "Modo desconocido: %s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1702 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiere --merge o --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1732 +msgid "cannot combine apply options with merge options" +msgstr "no se pueden combinar opciones de apply con opciones de merge" + +#: builtin/rebase.c:1745 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "Backend de rebase desconocido: %s" + +#: builtin/rebase.c:1770 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiere --exec o --interactive" -#: 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 +#: builtin/rebase.c:1790 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1794 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: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 +#: builtin/rebase.c:1818 #, c-format msgid "invalid upstream '%s'" msgstr "upstream invรกlido '%s'" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1824 msgid "Could not create new root commit" msgstr "No se pudo crear commit raรญz nuevo" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1850 +#, 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:1853 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': necesita exactamente una base de fusiรณn" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1861 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "No apunta a un commit vรกlido '%s'" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1887 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: no existe la rama/commit: '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1895 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:1990 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1906 msgid "Could not resolve HEAD to a revision" msgstr "No se pudo resolver HEAD a una revisiรณn" -#: builtin/rebase.c:1981 -msgid "Cannot autostash" -msgstr "No se puede ejecutar autostash" - -#: builtin/rebase.c:1984 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "Respuesta de stash inesperada: '%s'" - -#: 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:1993 -#, c-format -msgid "Created autostash: %s\n" -msgstr "Autostash creado: %s\n" - -#: builtin/rebase.c:1996 -msgid "could not reset --hard" -msgstr "no se pudo reset --hard" - -#: 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 +#: builtin/rebase.c:1927 msgid "Please commit or stash them." msgstr "Por favor, confรญrmalos o guรกrdalos." -#: builtin/rebase.c:2040 -#, c-format -msgid "could not parse '%s'" -msgstr "no se puede analizar '%s'" - -#: builtin/rebase.c:2053 +#: builtin/rebase.c:1963 #, c-format msgid "could not switch to %s" msgstr "no se pudo cambiar a %s" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:1974 msgid "HEAD is up to date." msgstr "HEAD estรก actualizado." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:1976 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La rama actual %s estรก actualizada.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:1984 msgid "HEAD is up to date, rebase forced." msgstr "HEAD estรก actualizado, rebase forzado." -#: builtin/rebase.c:2076 +#: builtin/rebase.c:1986 #, 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:2084 +#: builtin/rebase.c:1994 msgid "The pre-rebase hook refused to rebase." msgstr "El hook pre-rebase rechazรณ el rebase." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2001 #, c-format msgid "Changes to %s:\n" msgstr "Cambios a %s:\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2004 #, c-format msgid "Changes from %s to %s:\n" msgstr "Cambios desde %s a %s:\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2029 #, 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:2128 +#: builtin/rebase.c:2038 msgid "Could not detach HEAD" msgstr "No se puede desacoplar HEAD" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2047 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rรกpido de %s a %s.\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:844 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" @@ -17735,14 +19152,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:852 +#: builtin/receive-pack.c:864 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" @@ -17763,11 +19180,11 @@ msgstr "" "\n" "Para suprimir este mensaje, puedes configurarlo en 'refuse'." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:1970 msgid "quiet" msgstr "tranquilo" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:1984 msgid "You must specify a directory." msgstr "Se tiene que especificar un directorio." @@ -17793,49 +19210,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog existe <ref>" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' no es una marca de tiempo vรกlida" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "Marcando objectos alcanzables..." -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" -msgstr "%s apunta a ningรบn lado!" +msgstr "ยก%s apunta a ningรบn lado!" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "no reflog especificado para borrar" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "no es una reflog: %s" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "no reflog para '%s'" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "formato invรกlido: %s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -17843,82 +19260,82 @@ msgstr "" "git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nombre> <url>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <viejo> <nuevo>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <nombre>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 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:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nombre>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nombre>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nombre> <rama>..." -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nombre>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nombre> <nuevo-url>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nombre> <url>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opciones>] <nombre> <url>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nombre> <rama>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nombre> <rama>..." -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<opciones>] <nombre>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<opciones>] <nombre>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "Actualizando %s" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -17926,84 +19343,100 @@ msgstr "" "Usar --mirror es peligroso y estรก desaprobado;\n" "\t usa mรกs bien --mirror=fetch o --mirror=push" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "argumento mirror desconocido: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "realizar fetch a las ramas remotas" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "importar todos los tags y objetos asociados cuando realiza el fetch" -#: builtin/remote.c:168 +#: builtin/remote.c:169 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:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "rama(s) para rastrear" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "rama master" -#: builtin/remote.c:173 +#: builtin/remote.c:174 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:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "especificar una rama master no tiene sentido con --mirror" -#: builtin/remote.c:187 +#: builtin/remote.c:188 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:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:696 #, c-format msgid "remote %s already exists." msgstr "remoto %s ya existe." -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:700 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' no es un nombre remoto vรกlido" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "No se pudo configurar master '%s'" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, 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:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(concordando)" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(eliminar)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: 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 #, c-format msgid "No such remote: '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:646 +#: builtin/remote.c:706 #, 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:666 +#: builtin/remote.c:726 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18014,17 +19447,17 @@ msgstr "" "\t%s\n" "\tPor favor actualice la configuraciรณn manualmente si es necesario." -#: builtin/remote.c:702 +#: builtin/remote.c:766 #, c-format msgid "deleting '%s' failed" msgstr "borrando '%s' fallรณ" -#: builtin/remote.c:736 +#: builtin/remote.c:800 #, c-format msgid "creating '%s' failed" msgstr "creando '%s' fallรณ" -#: builtin/remote.c:802 +#: builtin/remote.c:876 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18032,125 +19465,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 removida;\n" +"Nota: Una rama fuera de la jerarquรญa refs/remotes/ no fue eliminada;\n" "para borrarla, use:" msgstr[1] "" "Nota: Algunas ramas fuera de la jerarquรญa refs/remotes/ no fueron " -"removidas;\n" +"eliminadas;\n" "para borrarlas, use:" -#: builtin/remote.c:816 +#: builtin/remote.c:890 #, c-format msgid "Could not remove config section '%s'" msgstr "No se pudo borrar la secciรณn de configuraciรณn '%s'" -#: builtin/remote.c:917 +#: builtin/remote.c:993 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nuevo (siguiente fetch se guardarรก en remotes/%s)" -#: builtin/remote.c:920 +#: builtin/remote.c:996 msgid " tracked" msgstr " rastreada" -#: builtin/remote.c:922 +#: builtin/remote.c:998 msgid " stale (use 'git remote prune' to remove)" msgstr " viejo ( use 'git remote prune' para eliminar)" -#: builtin/remote.c:924 +#: builtin/remote.c:1000 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:1041 #, 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:974 +#: builtin/remote.c:1050 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebasa interactivamente en remoto %s" -#: builtin/remote.c:976 +#: builtin/remote.c:1052 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebasa interactivamente (con fusiones) en remoto %s" -#: builtin/remote.c:979 +#: builtin/remote.c:1055 #, c-format msgid "rebases onto remote %s" msgstr "rebasa sobre el remoto %s" -#: builtin/remote.c:983 +#: builtin/remote.c:1059 #, c-format msgid " merges with remote %s" msgstr " se fusiona con remoto %s" -#: builtin/remote.c:986 +#: builtin/remote.c:1062 #, c-format msgid "merges with remote %s" msgstr "fusiona con remoto %s" -#: builtin/remote.c:989 +#: builtin/remote.c:1065 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s y con el remoto %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1108 msgid "create" msgstr "crear" -#: builtin/remote.c:1035 +#: builtin/remote.c:1111 msgid "delete" msgstr "borrar" -#: builtin/remote.c:1039 +#: builtin/remote.c:1115 msgid "up to date" msgstr "actualizado" -#: builtin/remote.c:1042 +#: builtin/remote.c:1118 msgid "fast-forwardable" msgstr "puede realizar fast-forward" -#: builtin/remote.c:1045 +#: builtin/remote.c:1121 msgid "local out of date" msgstr "desactualizado local" -#: builtin/remote.c:1052 +#: builtin/remote.c:1128 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s fuerza a %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1131 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s publica a %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1135 #, c-format msgid " %-*s forces to %s" msgstr " %-*s fuerza a %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1138 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s publica a %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1206 msgid "do not query remotes" msgstr "no consultar remotos" -#: builtin/remote.c:1157 +#: builtin/remote.c:1233 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1234 #, c-format msgid " Fetch URL: %s" msgstr " URL para obtener: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 msgid "(no URL)" msgstr "(sin URL)" @@ -18158,194 +19591,185 @@ msgstr "(sin URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1249 builtin/remote.c:1251 #, c-format msgid " Push URL: %s" msgstr " URL para publicar: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " HEAD branch: %s" msgstr " Rama HEAD: %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1253 msgid "(not queried)" msgstr "(no consultado)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1255 msgid "(unknown)" msgstr "(desconocido)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1259 #, 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:1195 +#: builtin/remote.c:1271 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Rama remota:%s" msgstr[1] " Ramas remotas:%s" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1274 builtin/remote.c:1300 msgid " (status not queried)" msgstr " (estado no consultado)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1283 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:1215 +#: builtin/remote.c:1291 msgid " Local refs will be mirrored by 'git push'" msgstr " Las referencias locales serรกn reflejadas por 'git push'" -#: builtin/remote.c:1221 +#: 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] " Referencia local configurada para 'git push'%s:" msgstr[1] " Referencias locales configuradas para 'git push'%s:" -#: builtin/remote.c:1242 +#: builtin/remote.c:1318 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto" -#: builtin/remote.c:1244 +#: builtin/remote.c:1320 msgid "delete refs/remotes/<name>/HEAD" msgstr "borrar refs/remotos/<nombre>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1335 msgid "Cannot determine remote HEAD" msgstr "No se puede determinar el HEAD remoto" -#: builtin/remote.c:1261 +#: builtin/remote.c:1337 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:1271 +#: builtin/remote.c:1347 #, c-format msgid "Could not delete %s" msgstr "No se pudo borrar %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1355 #, c-format msgid "Not a valid ref: %s" msgstr "No es un ref vรกlido: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1357 #, c-format msgid "Could not setup %s" msgstr "No se pudo configurar %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1375 #, c-format msgid " %s will become dangling!" -msgstr " %s serรก colgado!" +msgstr " ยก%s serรก colgado!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1376 #, c-format msgid " %s has become dangling!" -msgstr " %s ha sido colgado!" +msgstr " ยก%s ha sido colgado!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1386 #, c-format msgid "Pruning %s" msgstr "Recortando %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1387 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1403 #, c-format msgid " * [would prune] %s" msgstr " * [ejecutarรก prune] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1406 #, c-format msgid " * [pruned] %s" msgstr " * [prune realizado] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1451 msgid "prune remotes after fetching" msgstr "recortar remotos tras realizar fetch" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 #, c-format msgid "No such remote '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:1454 +#: builtin/remote.c:1530 msgid "add branch" msgstr "agregar rama" -#: builtin/remote.c:1461 +#: builtin/remote.c:1537 msgid "no remote specified" msgstr "no hay remotos especificados" -#: builtin/remote.c:1478 +#: builtin/remote.c:1554 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de push en lugar de URLs de fetch" -#: builtin/remote.c:1480 +#: builtin/remote.c:1556 msgid "return all URLs" msgstr "retornar todos los URLs" -#: builtin/remote.c:1508 +#: builtin/remote.c:1584 #, c-format msgid "no URLs configured for remote '%s'" msgstr "no hay URLs configurados para remoto '%s'" -#: builtin/remote.c:1534 +#: builtin/remote.c:1610 msgid "manipulate push URLs" msgstr "manipular URLs de push" -#: builtin/remote.c:1536 +#: builtin/remote.c:1612 msgid "add URL" msgstr "agregar URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1614 msgid "delete URLs" msgstr "borrar URLs" -#: builtin/remote.c:1545 +#: builtin/remote.c:1621 msgid "--add --delete doesn't make sense" msgstr "--add --delete no tiene sentido" -#: builtin/remote.c:1584 +#: builtin/remote.c:1660 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patrรณn de URL viejo invรกlido: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1668 #, c-format msgid "No such URL found: %s" msgstr "No se encontrรณ URL: %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1670 msgid "Will not delete all non-push URLs" msgstr "No borrarรก todos los URLs de no-push" -#: 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 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [<opciones>]" -#: builtin/repack.c:27 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18353,115 +19777,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:190 +#: builtin/repack.c:193 msgid "could not start pack-objects to repack promisor objects" msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:229 builtin/repack.c:408 +#: builtin/repack.c:232 builtin/repack.c:418 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:246 +#: builtin/repack.c:256 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "no se puede finalizar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:284 +#: builtin/repack.c:294 msgid "pack everything in a single pack" msgstr "empaquetar todo en un รบnico paquete" -#: builtin/repack.c:286 +#: builtin/repack.c:296 msgid "same as -a, and turn unreachable objects loose" msgstr "lo mismo que -a, y pierde objetos inaccesibles" -#: builtin/repack.c:289 +#: builtin/repack.c:299 msgid "remove redundant packs, and run git-prune-packed" msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed" -#: builtin/repack.c:291 +#: builtin/repack.c:301 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "pasar --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:293 +#: builtin/repack.c:303 msgid "pass --no-reuse-object to git-pack-objects" msgstr "pasar --no-reuse-object a git-pack-objects" -#: builtin/repack.c:295 +#: builtin/repack.c:305 msgid "do not run git-update-server-info" msgstr "no ejecutar git-update-server-info" -#: builtin/repack.c:298 +#: builtin/repack.c:308 msgid "pass --local to git-pack-objects" msgstr "pasar --local a git-pack-objects" -#: builtin/repack.c:300 +#: builtin/repack.c:310 msgid "write bitmap index" msgstr "escribir un รญndice de bitmap" -#: builtin/repack.c:302 +#: builtin/repack.c:312 msgid "pass --delta-islands to git-pack-objects" msgstr "pasar --delta-islands a git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:313 msgid "approxidate" msgstr "aproxime" -#: builtin/repack.c:304 +#: builtin/repack.c:314 msgid "with -A, do not loosen objects older than this" msgstr "con -A, no perder objetos mรกs antiguos que este" -#: builtin/repack.c:306 +#: builtin/repack.c:316 msgid "with -a, repack unreachable objects" msgstr "con -a, re empaquetar objetos inalcanzables" -#: builtin/repack.c:308 +#: builtin/repack.c:318 msgid "size of the window used for delta compression" msgstr "tamaรฑo de la ventana usado para la compresiรณn delta" -#: builtin/repack.c:309 builtin/repack.c:315 +#: builtin/repack.c:319 builtin/repack.c:325 msgid "bytes" msgstr "bytes" -#: builtin/repack.c:310 +#: builtin/repack.c:320 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:312 +#: builtin/repack.c:322 msgid "limits the maximum delta depth" msgstr "limita la profundidad mรกxima del delta" -#: builtin/repack.c:314 +#: builtin/repack.c:324 msgid "limits the maximum number of threads" msgstr "limita el nรบmero mรกximo de hilos" -#: builtin/repack.c:316 +#: builtin/repack.c:326 msgid "maximum size of each packfile" msgstr "tamaรฑo mรกximo de cada paquete" -#: builtin/repack.c:318 +#: builtin/repack.c:328 msgid "repack objects in packs marked with .keep" msgstr "re-empaquetar objetos en paquetes marcados con .keep" -#: builtin/repack.c:320 +#: builtin/repack.c:330 msgid "do not repack this pack" msgstr "no reempaquetar este paquete" -#: builtin/repack.c:330 +#: builtin/repack.c:340 msgid "cannot delete packs in a precious-objects repo" msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos" -#: builtin/repack.c:334 +#: builtin/repack.c:344 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable y -A son incompatibles" -#: builtin/repack.c:417 +#: builtin/repack.c:427 msgid "Nothing new to pack." msgstr "Nada nuevo para empaquetar." -#: builtin/repack.c:478 +#: builtin/repack.c:488 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18480,7 +19904,7 @@ msgstr "" "WARNING: tambiรฉn fallรณ.\n" "WARNING: Por favor renombralos en %s manualmente:\n" -#: builtin/repack.c:526 +#: builtin/repack.c:536 #, c-format msgid "failed to remove '%s'" msgstr "fallรณ al eliminar'%s'" @@ -18588,8 +20012,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:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: 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 "nombre de objeto no vรกlido: '%s'" @@ -18608,22 +20032,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:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "no se pudo analizar %s como un commit" -#: builtin/replace.c:414 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mal mergetag en commit '%s'" -#: builtin/replace.c:416 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "mergetag mal formado en commit '%s'" -#: builtin/replace.c:428 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -18632,31 +20056,31 @@ msgstr "" "commit original '%s' contiene un mergetag '%s' que es descartado; use --edit " "en lugar de --graft" -#: builtin/replace.c:467 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "el commit original '%s' tiene una firma gpg" -#: builtin/replace.c:468 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" -msgstr "la firma serรก removida en el commit de reemplazo!" +msgstr "la firma serรก eliminada en el commit de reemplazo!" -#: builtin/replace.c:478 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "no se pudo escribir el commit de reemplazo: '%s'" -#: builtin/replace.c:486 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft para '%s' innecesario" -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, 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:525 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -18665,71 +20089,71 @@ msgstr "" "no se pudo convertir el siguiente graft(s):\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "listar replace refs" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "borrar replace refs" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "editar objeto existente" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "cambiar un padre de commit" -#: builtin/replace.c:550 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "convertir archivo graft existente" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "reemplazar el ref si este existe" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "no se puede imprimir contenidos para --edit" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "usar este formato" -#: builtin/replace.c:567 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "--format no puede ser usado cuando no se hace listing" -#: builtin/replace.c:575 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "-f solo tiene sentido cuando se escribe un reemplazo" -#: builtin/replace.c:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw solo tiene sentido con --edit" -#: builtin/replace.c:585 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "-d necesita al menos un argumento" -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "mal nรบmero de argumentos" -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e necesita exactamente un argumento" -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-g necesita al menos un argumento" -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file no toma argumentos" -#: builtin/replace.c:615 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "solo se puede dar un patrรณn con -l" @@ -18757,115 +20181,126 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<รกrbol-ismo>] [--] <rutas>..." +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "git reset [-q] [<รกrbol-ismo>] [--] <pathspec>..." #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<รกrbol-ismo>] [--] [<rutas>...]" +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +msgstr "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<รกrbol-ismo>]" + +#: builtin/reset.c:35 +msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgstr "git reset --patch [<รกrbol-ismo>] [--] [<pathspec>...]" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "mezclado" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "suave" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "duro" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "fusionar" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "mantener" -#: builtin/reset.c:81 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "No hay un HEAD vรกlido." -#: builtin/reset.c:83 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "Fallรณ al encontrar el HEAD del รกrbol." -#: builtin/reset.c:89 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "Fallรณ al encontrar รกrbol de %s." -#: builtin/reset.c:193 +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD estรก ahora en %s" + +#: builtin/reset.c:195 #, 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:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "ser silencioso, solo reportar errores" -#: builtin/reset.c:295 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "reiniciar HEAD e index" -#: builtin/reset.c:296 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "reiniciar solo HEAD" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "reiniciar HEAD, รญndice y รกrbol de trabajo" -#: builtin/reset.c:302 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "reiniciar HEAD pero mantener cambios locales" -#: builtin/reset.c:308 +#: builtin/reset.c:310 msgid "record only the fact that removed paths will be added later" msgstr "" -"grabar solo el hecho de que las rutas removidas serรกn agregadas despuรฉs" +"grabar solo el hecho de que las rutas eliminadas serรกn agregadas despuรฉs" -#: builtin/reset.c:326 +#: builtin/reset.c:344 #, 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:334 +#: builtin/reset.c:352 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Fallรณ al resolver '%s' como un รกrbol vรกlido." -#: builtin/reset.c:343 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch es incompatible con --{hard,mixed,soft}" -#: builtin/reset.c:353 +#: builtin/reset.c:371 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:355 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "No se puede hacer un reset %s con rutas." -#: builtin/reset.c:370 +#: builtin/reset.c:388 #, 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:374 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "-N sรณlo puede ser usada con --mixed" -#: builtin/reset.c:395 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "Cambios fuera del รกrea de stage tras el reset:" -#: builtin/reset.c:398 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -18879,53 +20314,48 @@ msgstr "" "usar '--quiet' para evitar esto. Configura la opciรณn reset.quiet a true\n" "para volverlo en el default.\n" -#: builtin/reset.c:408 +#: builtin/reset.c:434 #, 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:412 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "No se puede escribir un nuevo archivo รญndice." -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "no se puede combinar --exclude-promisor-objects y --missing" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "filtrado de objetos requiere --objects" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "valor disperso invรกlido: '%s'" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "rev-list no soporta mostrar notas" -#: 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-list.c:615 +msgid "marked counting is incompatible with --objects" +msgstr "conteo de marcas es incompatible con --objects" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "mantener el `--` pasado como un arg" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "detener anรกlisis tras el primer argumento que no es opciรณn" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "salida en formulario largo de atasco" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -19072,38 +20502,42 @@ 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:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "no listar archivos eliminado" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "solo eliminar del รญndice" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "sobrescribir el check de actualizado" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "permitir eliminar de forma recursiva" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "salir con estado cero incluso si nada coincide" -#: builtin/rm.c:289 +#: 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 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:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" -msgstr "no removiendo '%s' de manera recursiva sin -r" +msgstr "no eliminando '%s' de manera recursiva sin -r" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: no es posible eliminar %s" @@ -19124,15 +20558,15 @@ msgstr "" msgid "remote name" msgstr "nombre remoto" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:176 msgid "use stateless RPC protocol" msgstr "usar protocolo RPC sin estado" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:177 msgid "read refs from stdin" msgstr "leer refs de stdin" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:178 msgid "print status from remote helper" msgstr "mostrar status del remote helper" @@ -19307,6 +20741,14 @@ msgstr "'%s' no es una ref vรกlida." msgid "cannot find commit %s (%s)" msgstr "no se puede encontrar el commit %s (%s)" +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "algoritmo-hash" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "Algoritmo hash desconocido" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -19351,15 +20793,78 @@ 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/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|reapply|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:216 +msgid "failed to create directory for sparse-checkout file" +msgstr "fallรณ al crear directorio para el archivo sparse-checkout" + +#: builtin/sparse-checkout.c:257 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "" +"no es posible actualizar el formato de repositorio para habilitar " +"worktreeConfig" + +#: builtin/sparse-checkout.c:259 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "fallรณ al configurar opciรณn extensions.worktreeConfig" + +#: builtin/sparse-checkout.c:276 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:295 +msgid "initialize the sparse-checkout in cone mode" +msgstr "inicializa el sparse-checkout en modo cono" + +#: builtin/sparse-checkout.c:332 +#, c-format +msgid "failed to open '%s'" +msgstr "fallรณ al abrir '%s'" + +#: builtin/sparse-checkout.c:389 +#, c-format +msgid "could not normalize path %s" +msgstr "no se pudo normalizar la ruta %s" + +#: builtin/sparse-checkout.c:401 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)" + +#: builtin/sparse-checkout.c:426 +#, 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:480 builtin/sparse-checkout.c:504 +msgid "unable to load existing sparse-checkout patterns" +msgstr "no se pudo cargar patrones de sparse-checkout existentes" + +#: builtin/sparse-checkout.c:549 +msgid "read patterns from standard in" +msgstr "leer patrones de standard in" + +#: builtin/sparse-checkout.c:586 +msgid "error while refreshing working directory" +msgstr "error al refrescar directorio de trabajo" + +#: builtin/stash.c:22 builtin/stash.c:38 msgid "git stash list [<options>]" msgstr "git stash list [<opciones>]" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<opciones>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -19367,25 +20872,27 @@ 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:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nombre-rama> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: 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 <mensaje>]\n" +" [--pathspec-from-file=<archivo> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" -#: builtin/stash.c:31 builtin/stash.c:84 +#: 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>]" @@ -19393,189 +20900,201 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<mensaje>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <mensaje>] [-q|--quiet] <commit>" -#: builtin/stash.c:127 +#: 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 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' no es un commit estilo stash" -#: builtin/stash.c:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "Se especificaron demasiadas revisiones: %s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "No se encontraron entradas de stash." -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "%s no es una referencia vรกlida" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear con parรกmetros no estรก implementado" -#: builtin/stash.c:403 +#: builtin/stash.c:404 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:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "no se pudo generar diff %s^!." -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "conflictos en รญndice. Intente sin --index." -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "no se puede guardar el รญndice del รกrbol" -#: builtin/stash.c:434 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "no se pueden restaurar archivos no rastreados de la entrada stash" -#: builtin/stash.c:448 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "Fusionando %s con %s" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "El รญndice no fue sacado de stash." -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "intento de recrear el index" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "Botado %s (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: No se pudo borrar entrada stash" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' no es una referencia stash" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 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:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "No se especificรณ el nombre de la rama" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "No se puede actualizar %s con %s" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540 msgid "stash message" msgstr "mensaje de stash" -#: builtin/stash.c:818 +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" requiere un argumento <commit>" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1046 msgid "No changes selected" msgstr "Sin cambios seleccionados" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1146 msgid "You do not have the initial commit yet" msgstr "Aรบn no tienes un commit inicial" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1173 msgid "Cannot save the current index state" msgstr "No se puede guardar el estado actual del รญndice" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1182 msgid "Cannot save the untracked files" msgstr "No se pueden guardar los archivos no rastreados" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1193 builtin/stash.c:1202 msgid "Cannot save the current worktree state" msgstr "No se puede guardar el estado actual del รกrbol de trabajo" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1230 msgid "Cannot record working tree state" msgstr "No se puede grabar el estado del รกrbol de trabajo" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1279 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:1285 +#: builtin/stash.c:1295 msgid "Did you forget to 'git add'?" -msgstr "Olvidaste 'git add'?" +msgstr "ยฟOlvidaste 'git add'?" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1310 msgid "No local changes to save" msgstr "No hay cambios locales para guardar" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1317 msgid "Cannot initialize stash" msgstr "No se puede inicializar stash" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1332 msgid "Cannot save the current status" msgstr "No se puede guardar el estado actual" -#: builtin/stash.c:1327 +#: builtin/stash.c:1337 #, c-format msgid "Saved working directory and index state %s" msgstr "Directorio de trabajo guardado y estado de รญndice %s" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1427 msgid "Cannot remove worktree changes" msgstr "No se pueden eliminar cambios del รกrbol de trabajo" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "keep index" msgstr "mantener index" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "stash in patch mode" msgstr "stash en modo patch" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "quiet mode" msgstr "modo tranquilo" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1471 builtin/stash.c:1536 msgid "include untracked files in stash" msgstr "incluir archivos sin seguimiento en stash" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1473 builtin/stash.c:1538 msgid "include ignore files" msgstr "incluir archivos ignorados" -#: builtin/stash.c:1555 -#, c-format -msgid "could not exec %s" -msgstr "no se pudo ejecutar %s" +#: builtin/stash.c:1573 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"el soporte para stash.useBuiltin ha sido eliminado!\n" +"Vea su entrada en 'git help config' para detalles." #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -19594,40 +21113,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:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 #, 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:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "subomdule--helper print-default-remote no toma argumentos" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "no se puede quitar un componente del url '%s'" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: 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 "No se encontrรณ url para la ruta del submรณdulo '%s' en .gitmodules" -#: builtin/submodule--helper.c:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Entrando '%s'\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -19636,7 +21155,7 @@ msgstr "" "run_command devolviรณ estado no-cero para %s\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19647,19 +21166,19 @@ msgstr "" "anidados de %s\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "Suprime la salida al inicializar cada comando de submรณdulo" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 msgid "Recurse into nested submodules" msgstr "Recursar en submรณdulos anidados" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -19668,57 +21187,57 @@ msgstr "" "no se pudo encontrar configuraciรณn '%s'. Asumiendo que este repositorio es " "su propio upstream autoritativo." -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, 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:669 +#: builtin/submodule--helper.c:671 #, 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:679 +#: builtin/submodule--helper.c:681 #, 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:686 +#: builtin/submodule--helper.c:688 #, 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:708 +#: builtin/submodule--helper.c:710 msgid "Suppress output for initializing a submodule" msgstr "Suprime la salida para inicializar un submรณdulo" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:715 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opciones>] [<path>]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, 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:824 +#: builtin/submodule--helper.c:837 #, 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:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "fallรณ al recursar en el submรณdulo '%s'" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 msgid "Suppress submodule status output" msgstr "Suprimir output del estado del submรณdulo" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:889 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -19726,47 +21245,47 @@ msgstr "" "Usar el commit guardado en el รญndice en lugar del guardado en el submรณdulo " "HEAD" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:890 msgid "recurse into nested submodules" msgstr "recursar en submรณdulos anidados" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ruta>" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:983 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizando url del submรณdulo para '%s'\n" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:989 #, 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:990 +#: builtin/submodule--helper.c:1003 #, 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:1001 +#: builtin/submodule--helper.c:1014 #, 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:1048 +#: builtin/submodule--helper.c:1061 msgid "Suppress output of synchronizing submodule url" msgstr "Suprime la salida del url del submรณdulo que se sincroniza" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1068 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1122 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -19775,7 +21294,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:1121 +#: builtin/submodule--helper.c:1134 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -19784,177 +21303,206 @@ msgstr "" "El รกrbol de trabajo del submรณdulo '%s' contiene modificaciones locales; usa " "'-f' para descartarlas" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1142 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directorio '%s' limpiado\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1144 #, 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:1142 +#: builtin/submodule--helper.c:1155 #, 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:1158 +#: builtin/submodule--helper.c:1171 #, 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:1187 +#: builtin/submodule--helper.c:1200 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:1188 +#: builtin/submodule--helper.c:1201 msgid "Unregister all submodules" msgstr "Quitar todos los submรณdulos" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1206 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1220 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:1302 builtin/submodule--helper.c:1305 +#: 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 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submรณdulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1367 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:1348 +#: builtin/submodule--helper.c:1374 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:1371 +#: builtin/submodule--helper.c:1398 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submรณdulo serรก clonado" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1401 msgid "name of the new submodule" msgstr "nombre del nuevo submรณdulo" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1404 msgid "url where to clone the submodule from" msgstr "url de dรณnde clonar el submรณdulo" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1412 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 msgid "force cloning progress" msgstr "forzar el proceso de clonado" -#: builtin/submodule--helper.c:1393 +#: 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 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference " -"<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path " -"<ruta>" +"<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --" +"url <url> --path <ruta>" -#: builtin/submodule--helper.c:1424 +#: 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" + +#: builtin/submodule--helper.c:1460 #, 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:1438 +#: builtin/submodule--helper.c:1464 +#, c-format +msgid "directory not empty: '%s'" +msgstr "directorio no estรก vacรญo: '%s'" + +#: builtin/submodule--helper.c:1476 #, 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:1474 +#: builtin/submodule--helper.c:1512 #, 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:1478 +#: builtin/submodule--helper.c:1516 #, 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:1571 +#: builtin/submodule--helper.c:1617 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de submรณdulo '%s' no inicializada" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:1621 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:1605 +#: builtin/submodule--helper.c:1651 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando submรณdulo %s no fusionado" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:1680 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando submรณdulo '%s'" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:1830 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Fallรณ al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:1841 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Fallรณ al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 msgid "path into the working tree" msgstr "ruta hacia el รกrbol de trabajo" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1906 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:1858 +#: builtin/submodule--helper.c:1910 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1916 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:1867 +#: builtin/submodule--helper.c:1919 msgid "parallel jobs" msgstr "trabajos paralelos" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1921 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:1870 +#: builtin/submodule--helper.c:1922 msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonado" -#: 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:1933 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1946 msgid "bad value for update parameter" msgstr "mal valor para parรกmetro update" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:1994 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -19963,51 +21511,85 @@ msgstr "" "Rama de submรณdulo (%s) configurada para heredar rama del superproyecto, pero " "el superproyecto no estรก en ninguna rama" -#: builtin/submodule--helper.c:2061 +#: builtin/submodule--helper.c:2117 #, 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:2094 +#: builtin/submodule--helper.c:2150 msgid "recurse into submodules" msgstr "recurrir a submรณdulos" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2156 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2212 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:2159 +#: builtin/submodule--helper.c:2215 msgid "unset the config in the .gitmodules file" msgstr "desconfigura la opciรณn en elarchivo .gitmodules" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2220 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nombre> [<valor>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2221 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nombre>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2222 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2241 git-submodule.sh:176 #, 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:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2257 +msgid "Suppress output for setting url of a submodule" +msgstr "Suprime la salida para inicializar la url de un submรณdulo" + +#: builtin/submodule--helper.c:2261 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>" + +#: builtin/submodule--helper.c:2294 +msgid "set the default tracking branch to master" +msgstr "configurar la rama de rastreo por defecto a master" + +#: builtin/submodule--helper.c:2296 +msgid "set the default tracking branch" +msgstr "configurar la rama de rastreo por defecto" + +#: builtin/submodule--helper.c:2300 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ruta>" + +#: builtin/submodule--helper.c:2301 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <rama> <ruta>" + +#: builtin/submodule--helper.c:2308 +msgid "--branch or --default required" +msgstr "--branch o --default requeridos" + +#: builtin/submodule--helper.c:2311 +msgid "--branch and --default are mutually exclusive" +msgstr "--branch y --default son mutuamente exclusivos" + +#: builtin/submodule--helper.c:2367 git.c:436 git.c:683 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no soporta --super-prefix" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2373 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no es un comando submodule--helper vรกlido" @@ -20032,11 +21614,11 @@ msgstr "eliminar referencia simbรณlica" msgid "shorten ref output" msgstr "salida de referencia mรกs corta" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "razรณn" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "razรณn de la actualizaciรณn" @@ -20129,339 +21711,343 @@ msgstr "" msgid "bad object type." msgstr "tipo de objeto errรณneo." -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "ยฟSin mensaje de tag?" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "El mensaje del tag ha sido dejado en %s\n" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "listar nombres de tags" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "imprimir <n> lรญneas de cada mensaje de tag" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "eliminar tags" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "verificar tags" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "Opciones de creaciรณn de tags" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "tags anotadas necesitan un mensaje" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "mensaje de tag" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "forzar la ediciรณn del mensaje de tag" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "tag anotado y firmado con GPG" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "usar otra clave para firmar el tag" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "remplazar tag si existe" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "crear un reflog" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "Opciones de listado de tag" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "mostrar lista de tags en columnas" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "mostrar solo tags que contienen el commit" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "mostrar solo tags que no contienen el commit" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "sรณlo imprimir las tags que estรกn fusionadas" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "sรณlo imprimir las tags que no estรกn fusionadas" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "sรณlo imprimir tags de el objeto" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "--column y -n son incompatibles" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "opciรณn -n solo es permitida en modo lista" -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "opciรณn --contains solo es permitido en modo lista" -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "opciรณn --no-contains solo es permitida en modo lista" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "opciรณn --points-at solo es permitida en modo lista" -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "opciones --merged y --no-merged solo estรกn permitidas en modo lista" -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "sรณlo se permite una de las opciones, -m รณ -F." -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "demasiados parรกmetros" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' no es un nombre de tag vรกlido." -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "el tag '%s' ya existe" -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualizada (era %s)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "Desempaquetando objetos" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "fallรณ al crear directorio %s" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "fallรณ al crear el archivo %s" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "fallรณ al eliminar el archivo %s" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "fallรณ al eliminar directorio %s" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "Probando mtime en '%s' " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 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:166 +#: builtin/update-index.c:167 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:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "info de estado del directorio cambia tras actualizar un archivo" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 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:201 +#: builtin/update-index.c:202 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:214 +#: builtin/update-index.c:215 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:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opciones>] [--] [<archivo>...]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "" "continuar refresh (Actualizaciรณn) incluso cuando el รญndice necesita " "actualizaciรณn" -#: builtin/update-index.c:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "refresh: ignora submรณdulos" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "no ignorar archivos nuevos" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "permitir que archivos remplacen directorios y vice-versa" -#: builtin/update-index.c:981 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "avisar de archivos faltando en el รกrbol de trabajo" -#: builtin/update-index.c:983 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "ejecutar refresh incluso si el รญndice contiene entradas sin cambios" -#: builtin/update-index.c:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "refresh informaciรณn de estado" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "como --refresh, pero ignora configuraciรณn assume-unchanged" -#: builtin/update-index.c:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<modo>,<objeto>,<ruta>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "agregar la entrada especificada al รญndice" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "marcar archivos como \"not changing\"" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "limpiar bit assumed-unchanged" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "marcar archivos como \"index-only\"" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "limpiar bit skip-worktree" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1020 +msgid "do not touch index-only entries" +msgstr "no tocar entradas index-only" + +#: builtin/update-index.c:1022 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:1019 +#: builtin/update-index.c:1024 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:1021 +#: builtin/update-index.c:1026 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:1023 +#: builtin/update-index.c:1028 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:1027 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "agregar entradas de standard input al รญndice" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repoblar stages #2 y #3 para las rutas listadas" -#: builtin/update-index.c:1035 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "solo actualizar entradas que difieren de HEAD" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ignorar archivos faltantes en el รกrbol de trabajo" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "reportar acciones por standard output" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(para porcelanas) olvidar conflictos sin resolver guardados" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "escribir รญndice en este formato" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "activar o desactivar รญndice dividido" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "habilitar o deshabilitar cachรฉ no rastreado" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "probar si el filesystem soporta cachรฉ no rastreado" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "habilitar cachรฉ no rastreado sin probar el filesystem" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1063 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:1060 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "activar o desactivar monitor de sistema de archivos" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "marcar archivos como vรกlidos para fsmonitor" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "limpia el bit de validaciรณn fsmonitor" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20469,7 +22055,7 @@ msgstr "" "core.splitIndex estรก configurado en false; remuรฉvelo o cรกmbialo, si " "realmente quieres habilitar el รญndice partido" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20477,7 +22063,7 @@ msgstr "" "core.splitIndex estรก configurado en true; remuรฉvelo o cรกmbialo, si realmente " "quieres deshabilitar el รญndice partido" -#: builtin/update-index.c:1188 +#: 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" @@ -20485,11 +22071,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:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Cachรฉ no rastreado deshabilitado" -#: builtin/update-index.c:1200 +#: 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" @@ -20497,29 +22083,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:1204 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cachรฉ no rastreado habilitado para '%s'" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1218 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:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor activado" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1225 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:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor desactivado" @@ -20537,19 +22123,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<opciones>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "eliminar la referencia" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "actualiza <refname> no a lo que apunta" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "stdin tiene argumentos terminados en NUL" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "lee actualizaciones de stdin" @@ -20613,229 +22199,220 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." msgid "print tag contents" msgstr "imprimir contenido del tag" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<opciones>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opciones>] <ruta>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <worktree> <nueva-ruta>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opciones>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<opciones>] <worktree>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:972 #, c-format msgid "failed to delete '%s'" msgstr "fallรณ al borrar '%s'" -#: 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 +msgid "not a valid directory" +msgstr "no en un directorio vรกlido" -#: 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:91 +msgid "gitdir file does not exist" +msgstr "archivo gitdir no existe" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:96 builtin/worktree.c:105 #, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)" +msgid "unable to read gitdir file (%s)" +msgstr "no es posible leer archivo gitdir (%s)" -#: builtin/worktree.c:110 +#: builtin/worktree.c:115 #, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" -msgstr "" -"Removiendo รกrboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> " -"bytes, %<PRIuMAX> leรญdos)" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "lectura corta (se esperaba %<PRIuMAX> bytes, se leyรณ %<PRIuMAX>)" -#: builtin/worktree.c:118 -#, c-format -msgid "Removing worktrees/%s: invalid gitdir file" -msgstr "Removiendo worktrees/%s: archivo gitdir invรกlido" +#: builtin/worktree.c:123 +msgid "invalid gitdir file" +msgstr "archivo gitdir invรกlido" + +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "archivo gitdir apunta a una ubicaciรณn inexistente" -#: builtin/worktree.c:127 +#: builtin/worktree.c:146 #, 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" +msgid "Removing %s/%s: %s" +msgstr "Eliminando %s/%s: %s" -#: builtin/worktree.c:166 +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "reporta รกrboles de trabajo recortados" -#: builtin/worktree.c:168 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "expirar รกrboles de trabajo mรกs viejos a <tiempo>" -#: builtin/worktree.c:235 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "'%s' ya existe" -#: builtin/worktree.c:252 +#: builtin/worktree.c:302 #, c-format -msgid "unable to re-add worktree '%s'" -msgstr "no es posible volver a agregar el รกrbol '%s'" +msgid "unusable worktree destination '%s'" +msgstr "destino de worktree inutilizable '%s'" -#: builtin/worktree.c:257 +#: builtin/worktree.c:307 #, 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" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" "'%s' es un รกrbol de trabajo faltante pero bloqueado;\n" -"usa 'add -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para " +"usa '%s -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para " "limpiar" -#: builtin/worktree.c:259 +#: builtin/worktree.c:309 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" "'%s' es un รกrbol de trabajo faltante pero ya registrado;\n" -"usa 'add -f' para sobreescribir, o 'prune' o 'remove' para limpiar" +"usa '%s -f' para sobreescribir, o 'prune' o 'remove' para limpiar" -#: builtin/worktree.c:309 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "no se pudo crear directorio de '%s'" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparando รกrbol de trabajo (nueva rama '%s')" -#: builtin/worktree.c:442 +#: builtin/worktree.c:496 #, 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:451 +#: builtin/worktree.c:505 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparando รกrbol de trabajo (haciendo checkout a '%s')" -#: builtin/worktree.c:457 +#: builtin/worktree.c:511 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparando รกrbol de trabajo (HEAD desacoplado %s)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:552 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:501 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "crear una nueva rama" -#: builtin/worktree.c:503 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "crear o restablecer una rama" -#: builtin/worktree.c:505 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "popular el nuevo รกrbol de trabajo" -#: builtin/worktree.c:506 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "mantener el nuevo รกrbol de trabajo bloqueado" -#: builtin/worktree.c:509 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "configurando modo tracking (mirar git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:566 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:520 +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, y --detach son mutuamente exclusivas" -#: builtin/worktree.c:581 +#: builtin/worktree.c:635 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:681 +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "razรณn para bloquear" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:1000 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no es un รกrbol de trabajo" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:769 builtin/worktree.c:802 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:700 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ya estรก bloqueado; razรณn: %s" -#: builtin/worktree.c:702 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "'%s' ya estรก bloqueado" -#: builtin/worktree.c:730 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "'%s' no estรก bloqueado" -#: builtin/worktree.c:771 +#: builtin/worktree.c:845 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:779 +#: builtin/worktree.c:853 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:802 builtin/worktree.c:929 +#: builtin/worktree.c:876 builtin/worktree.c:1002 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' es un รกrbol de trabajo principal" -#: builtin/worktree.c:807 +#: builtin/worktree.c:881 #, 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:813 -#, c-format -msgid "target '%s' already exists" -msgstr "el objetivo '%s' ya existe" - -#: builtin/worktree.c:821 +#: builtin/worktree.c:894 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -20844,7 +22421,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:823 +#: builtin/worktree.c:896 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -20852,36 +22429,37 @@ msgstr "" "no se puede mover un รกrbol de trabajo bloqueado;\n" "use 'move -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:826 +#: builtin/worktree.c:899 #, 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:831 +#: builtin/worktree.c:904 #, c-format msgid "failed to move '%s' to '%s'" msgstr "fallรณ al mover '%s' a '%s'" -#: builtin/worktree.c:879 +#: builtin/worktree.c:952 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "fallรณ al ejecutar 'git status' en '%s'" -#: builtin/worktree.c:883 +#: builtin/worktree.c:956 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "'%s' estรก sucio, use --force para borrarlo" +msgid "'%s' contains modified or untracked files, use --force to delete it" +msgstr "" +"'%s' contiene archivos no rastreados o modificados, use --force para borrarlo" -#: builtin/worktree.c:888 +#: builtin/worktree.c:961 #, 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:911 +#: builtin/worktree.c:984 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:934 +#: builtin/worktree.c:1007 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -20890,7 +22468,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:936 +#: builtin/worktree.c:1009 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -20898,7 +22476,7 @@ msgstr "" "no se pueden eliminar รกrbol de trabajo bloqueado;\n" "use 'remove -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:939 +#: builtin/worktree.c:1012 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "fallรณ validaciรณn, no se puede eliminar รกrbol de trabajo: %s" @@ -20919,6 +22497,140 @@ msgstr "escribir objeto de รกrbol para un subdirectorio <prefijo>" msgid "only useful for debugging" msgstr "sรณlo รบtil para depurar" +#: bugreport.c:15 +msgid "git version:\n" +msgstr "versiรณn de git:\n" + +#: bugreport.c:21 +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() fallรณ con error '%s' (%d)\n" + +#: bugreport.c:31 +msgid "compiler info: " +msgstr "informaciรณn del compilador: " + +#: bugreport.c:34 +msgid "libc info: " +msgstr "informaciรณn de libc: " + +#: bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "no ejecutado desde un repositorio git - no hay hooks para mostrar\n" + +#: bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "" +"git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]" + +#: bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"ยกGracias por prepara un reporte de bug de Git!\n" +"Por favor responde las siguientes preguntas para ayudarnos a entender el " +"problema.\n" +"\n" +"ยฟQuรฉ hiciste antes de que sucediera el bug? (Pasos para reproducir el " +"problema)\n" +"\n" +"ยฟQuรฉ esperabas que sucediera? (Comportamiento esperado)\n" +"\n" +"ยฟQuรฉ sucedio en lugar de eso? (Comportamiento real)\n" +"\n" +"ยฟQuรฉ es diferente entre lo que esperabas y lo que pasรณ?\n" +"\n" +"Cualquier cosa que quieras agregar:\n" +"\n" +"Por favor revisa el resto del reporte abajo.\n" +"Puedes borrar cualquier lรญnea que no desees compartir.\n" + +#: bugreport.c:136 +msgid "specify a destination for the bugreport file" +msgstr "especificar el destino para el archivo de reporte de bug" + +#: bugreport.c:138 +msgid "specify a strftime format suffix for the filename" +msgstr "especificar el sufijo formato strftime para el nombre del archivo." + +#: bugreport.c:162 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "no se pudo crear directorios principales para '%s'" + +#: bugreport.c:169 +msgid "System Info" +msgstr "Informaciรณn del sistema" + +#: bugreport.c:172 +msgid "Enabled Hooks" +msgstr "Activar Hooks" + +#: bugreport.c:180 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "no se pudo crear un archivo en '%s'" + +#: bugreport.c:184 +#, c-format +msgid "unable to write to %s" +msgstr "no es posible escribir en %s" + +#: bugreport.c:194 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "Crear un nuevo reporte en '%s'.\n" + +#: fast-import.c:3100 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "Faltan marcas from para el submรณdulo '%s'" + +#: fast-import.c:3102 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "Faltan marcas to para el submรณdulo '%s'" + +#: fast-import.c:3237 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "Se esperaba comando 'mark', se obtuvo %s" + +#: fast-import.c:3242 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "Se esperaba comando 'to', se obtuvo %s" + +#: fast-import.c:3334 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "" +"Formato esperado de nombre:nombre de archivo para la opciรณn de sobreescribir " +"submรณdulo" + +#: fast-import.c:3388 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "caracterรญstica '%s' prohibida en input sin --allow-unsafe-features" + +#: http-fetch.c:111 +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "argumento para --packfile tiene que se un hash vรกlido (se obtuvo '%s')" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -20954,7 +22666,7 @@ msgstr "test-tool serve-v2 [<opciones>]" msgid "exit immediately after advertising capabilities" msgstr "salir inmediatamente tras anunciar capacidades" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -20970,7 +22682,7 @@ msgstr "" " [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n" " <comando> [<args>]" -#: git.c:34 +#: git.c:35 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" @@ -20982,47 +22694,47 @@ msgstr "" "para leer sobre un subcomando o concepto especรญfico.\n" "Mira 'git help git' para una vista general del sistema." -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "no se entregรณ directorio para --git-dir\n" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "no se entregรณ namespace para --namespace\n" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "no se entregรณ directorio para --work-tree\n" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "no se entregรณ prefijo para --super-prefix\n" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "-c espera un string de configuraciรณn\n" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "no se entregรณ directorio para -C\n" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "opciรณn %s desconocida\n" -#: git.c:360 +#: git.c:362 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "al expandir el alias '%s':'%s'" -#: git.c:369 +#: git.c:371 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -21031,39 +22743,39 @@ msgstr "" "alias '%s' cambia las variables de entorno.\n" "Puedes usar '!git' en el alias para hacer esto" -#: git.c:377 +#: git.c:378 #, c-format msgid "empty alias for %s" msgstr "alias vacรญo para %s" -#: git.c:380 +#: git.c:381 #, c-format msgid "recursive alias: %s" msgstr "alias recursivo: %s" -#: git.c:460 +#: git.c:463 msgid "write failure on standard output" msgstr "error de escritura en standard output" -#: git.c:462 +#: git.c:465 msgid "unknown write failure on standard output" msgstr "error desconocido de escritura en standard output" -#: git.c:464 +#: git.c:467 msgid "close failed on standard output" msgstr "cierre fallรณ en standard output" -#: git.c:793 +#: git.c:792 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "bucle de alias detectado: expansiรณn de '%s' no termina: %s" -#: git.c:843 +#: git.c:842 #, c-format msgid "cannot handle %s as a builtin" msgstr "no se puede manejar %s como un builtin" -#: git.c:856 +#: git.c:855 #, c-format msgid "" "usage: %s\n" @@ -21074,55 +22786,55 @@ msgstr "" "\n" "\n" -#: git.c:876 +#: git.c:875 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "expansiรณn del alias '%s' fallรณ; '%s' no es un comando de git\n" -#: git.c:888 +#: git.c:887 #, c-format msgid "failed to run command '%s': %s\n" msgstr "fallรณ al ejecutar comando '%s': %s\n" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "valor negativo para http.postbuffer; poniendo el default a %d" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegaciรณn de control no es soportada con cURL < 7.22.0" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Fijaciรณn de llave pรบblica no es soportada con cURL < 7.44.0" -#: http.c:876 +#: http.c:910 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0" -#: http.c:949 +#: http.c:989 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Restricciรณn de protocolo no soportada con cURL < 7.19.4" -#: http.c:1085 +#: http.c:1132 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:" -#: http.c:1092 +#: http.c:1139 #, 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:1096 +#: http.c:1143 #, 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:1965 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21133,150 +22845,192 @@ msgstr "" " preguntaba por: %s\n" " redireccionamiento: %s" -#: remote-curl.c:157 +#: remote-curl.c:168 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "quoting invรกlido en valor de push-option: '%s'" -#: remote-curl.c:254 +#: remote-curl.c:295 #, 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:355 +#: remote-curl.c:396 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:386 +#: remote-curl.c:427 #, c-format msgid "invalid server response; got '%s'" msgstr "respuesta de servidor invรกlida; se obtuvo '%s'" -#: remote-curl.c:446 +#: remote-curl.c:487 #, c-format msgid "repository '%s' not found" msgstr "repositorio '%s' no encontrado" -#: remote-curl.c:450 +#: remote-curl.c:491 #, c-format msgid "Authentication failed for '%s'" msgstr "Autenticaciรณn fallรณ para '%s'" -#: remote-curl.c:454 +#: remote-curl.c:495 #, c-format msgid "unable to access '%s': %s" msgstr "no es posible acceder '%s':%s" -#: remote-curl.c:460 +#: remote-curl.c:501 #, c-format msgid "redirecting to %s" msgstr "redirigiendo a %s" -#: remote-curl.c:584 +#: remote-curl.c:630 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:664 +#: remote-curl.c:642 +msgid "remote server sent stateless separator" +msgstr "el servidor remoto enviรณ un separador sin estado (stateless)" + +#: remote-curl.c:712 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:724 +#: remote-curl.c:742 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curl: mal caracter de largo de lรญnea: %.4s" + +#: remote-curl.c:744 +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curl: packet de respuesta final inesperado" + +#: remote-curl.c:820 #, c-format msgid "RPC failed; %s" msgstr "RPC fallรณ; %s" -#: remote-curl.c:764 +#: remote-curl.c:860 msgid "cannot handle pushes this big" msgstr "no se puede manejar pushes tan grandes" -#: remote-curl.c:879 +#: remote-curl.c:975 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "no se puede desinflar el request; zlib deflate error %d" -#: remote-curl.c:883 +#: remote-curl.c:979 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "no se puede desinflar el request; zlib end error %d" -#: remote-curl.c:1014 +#: remote-curl.c:1029 +#, c-format +msgid "%d bytes of length header were received" +msgstr "%d bytes de header de longitud fueron recibidos" + +#: remote-curl.c:1031 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "%d bytes de cuerpo se siguen esperando" + +#: remote-curl.c:1120 msgid "dumb http transport does not support shallow capabilities" msgstr "dump http transport no soporta capacidades superficiales" -#: remote-curl.c:1028 +#: remote-curl.c:1135 msgid "fetch failed." msgstr "fetch fallรณ." -#: remote-curl.c:1076 +#: remote-curl.c:1183 msgid "cannot fetch by sha1 over smart http" msgstr "no se puede hacer fetch por sha1 sobre smart http" -#: remote-curl.c:1120 remote-curl.c:1126 +#: remote-curl.c:1227 remote-curl.c:1233 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1245 remote-curl.c:1360 #, c-format msgid "http transport does not support %s" msgstr "http transport no soporta %s" -#: remote-curl.c:1174 +#: remote-curl.c:1281 msgid "git-http-push failed" msgstr "git-http-push fallรณ" -#: remote-curl.c:1360 +#: remote-curl.c:1466 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: uso: git remote-curl <remote> [<url>]" -#: remote-curl.c:1392 +#: remote-curl.c:1498 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: error leyendo command stream de git" -#: remote-curl.c:1399 +#: remote-curl.c:1505 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: fetch intentado sin un repositorio local" -#: remote-curl.c:1439 +#: remote-curl.c:1546 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: comando '%s' desconocido de git" -#: list-objects-filter-options.h:61 +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "no hay informaciรณn disponible del compilador\n" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "no hay informaciรณn disponible de libc\n" + +#: list-objects-filter-options.h:85 msgid "args" msgstr "args" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:86 msgid "object filtering" msgstr "filtrado de objeto" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "fecha de expiraciรณn" -#: parse-options.h:184 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "no-op (compatibilidad con versiones anteriores)" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "ser mรกs verboso" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "ser mรกs discreto" -#: parse-options.h:313 +#: parse-options.h:317 msgid "use <n> digits to display SHA-1s" msgstr "usa <n> dรญgitos para mostrar SHA-1s" -#: parse-options.h:332 +#: parse-options.h:336 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" @@ -21291,11 +23045,11 @@ msgstr "" "actualizar el รญndice con la resoluciรณn de conflictos reutilizada si es " "posible" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "HEAD desacoplada en " -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "HEAD desacoplada de " @@ -21337,625 +23091,641 @@ msgid "List, create, or delete branches" msgstr "Lista, crea, o borra ramas" #: command-list.h:59 +msgid "Collect information for user to file a bug report" +msgstr "Recolectar informaciรณn para el usuario para generar un reporte de bug" + +#: command-list.h:60 msgid "Move objects and refs by archive" msgstr "Mover objetos y referencias por archivo" -#: command-list.h:60 +#: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "" "Proveer contenido o tipo y tamaรฑo de informaciรณn para objetos de repositorio" -#: command-list.h:61 +#: command-list.h:62 msgid "Display gitattributes information" msgstr "Mostrar informaciรณn de gitattributes" -#: command-list.h:62 +#: command-list.h:63 msgid "Debug gitignore / exclude files" msgstr "Debug a gitignore / excluir archivos" -#: command-list.h:63 +#: command-list.h:64 msgid "Show canonical names and email addresses of contacts" msgstr "Mostrar nombres canรณnicos y direcciones de correo de contactos" -#: command-list.h:64 +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "Cambia ramas o restaura los archivos de tu รกrbol de trabajo" -#: command-list.h:65 +#: command-list.h:66 msgid "Copy files from the index to the working tree" msgstr "Copiar archivos del รญndice al รกrbol de trabajo" -#: command-list.h:66 +#: command-list.h:67 msgid "Ensures that a reference name is well formed" msgstr "Asegura que un nombre de referencia estรฉ bien formado" -#: command-list.h:67 +#: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "Encuentra commits que faltan aplicar en upstream" -#: command-list.h:68 +#: command-list.h:69 msgid "Apply the changes introduced by some existing commits" msgstr "Aplica los cambios introducidos por algunos commits existentes" -#: command-list.h:69 +#: command-list.h:70 msgid "Graphical alternative to git-commit" msgstr "Opciรณn grรกfica a git-commit" -#: command-list.h:70 +#: command-list.h:71 msgid "Remove untracked files from the working tree" msgstr "Remueve archivos del รกrbol de trabajo no rastreados" -#: command-list.h:71 +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "Clona un repositorio dentro de un nuevo directorio" -#: command-list.h:72 +#: command-list.h:73 msgid "Display data in columns" msgstr "Mostrar data en columnas" -#: command-list.h:73 +#: command-list.h:74 msgid "Record changes to the repository" msgstr "Graba los cambios en tu repositorio" -#: command-list.h:74 +#: command-list.h:75 msgid "Write and verify Git commit-graph files" msgstr "Escribe y verifica los archivos de Git commit-graph" -#: command-list.h:75 +#: command-list.h:76 msgid "Create a new commit object" msgstr "Crea un nuevo objeto commit" -#: command-list.h:76 +#: command-list.h:77 msgid "Get and set repository or global options" msgstr "Configurar repositorio u opciones globales" -#: command-list.h:77 +#: command-list.h:78 msgid "Count unpacked number of objects and their disk consumption" msgstr "Contar nรบmero de objetos no empaquetados y su consumo en disco" -#: command-list.h:78 +#: command-list.h:79 msgid "Retrieve and store user credentials" msgstr "Obtener y guardar credenciales de usuario" -#: command-list.h:79 +#: command-list.h:80 msgid "Helper to temporarily store passwords in memory" msgstr "Auxiliar para almacenar temporalmente claves en memoria" -#: command-list.h:80 +#: command-list.h:81 msgid "Helper to store credentials on disk" msgstr "Auxiliar para guardar credenciales en disco" -#: command-list.h:81 +#: command-list.h:82 msgid "Export a single commit to a CVS checkout" msgstr "Exporta un commit รบnico a CVS checkout" -#: command-list.h:82 +#: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" msgstr "Salva tus datos de otro SCM que la gente adora odiar" -#: command-list.h:83 +#: command-list.h:84 msgid "A CVS server emulator for Git" msgstr "Un servidor emulador de CVS para Git" -#: command-list.h:84 +#: command-list.h:85 msgid "A really simple server for Git repositories" msgstr "Un servidor realmente simple para repositorios Git" -#: command-list.h:85 +#: command-list.h:86 msgid "Give an object a human readable name based on an available ref" msgstr "" "Dar a un objeto un nombre legible por humanos basado en una referencia " "disponible" -#: command-list.h:86 +#: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" msgstr "Muestra los cambios entre commits, commit y รกrbol de trabajo, etc" -#: command-list.h:87 +#: command-list.h:88 msgid "Compares files in the working tree and the index" msgstr "Compara archivos del รกrbol de trabajo y del รญndice" -#: command-list.h:88 +#: command-list.h:89 msgid "Compare a tree to the working tree or index" msgstr "Compara un รกrbol con el รกrbol de trabajo o รญndice" -#: command-list.h:89 +#: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" msgstr "" "Compara el contenido y el modo de blobs encontrados a travรฉs de dos objetos " "de รกrbol" -#: command-list.h:90 +#: command-list.h:91 msgid "Show changes using common diff tools" msgstr "Mostrar cambios usando herramientas de diff comunes" -#: command-list.h:91 +#: command-list.h:92 msgid "Git data exporter" msgstr "Exportador de data Git" -#: command-list.h:92 +#: command-list.h:93 msgid "Backend for fast Git data importers" msgstr "Backend para importadores de data de Git rรกpidos" -#: command-list.h:93 +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "Descarga objetos y referencias de otro repositorio" -#: command-list.h:94 +#: command-list.h:95 msgid "Receive missing objects from another repository" msgstr "Descarga objetos faltantes de otro repositorio" -#: command-list.h:95 +#: command-list.h:96 msgid "Rewrite branches" msgstr "Reescribir ramas" -#: command-list.h:96 +#: command-list.h:97 msgid "Produce a merge commit message" msgstr "Produce un mensaje de commit para fusiรณn" -#: command-list.h:97 +#: command-list.h:98 msgid "Output information on each ref" msgstr "Informaciรณn de output en cada ref" -#: command-list.h:98 +#: command-list.h:99 msgid "Prepare patches for e-mail submission" msgstr "Prepara parches para ser enviados por e-mail" -#: command-list.h:99 +#: command-list.h:100 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" "Verifica la conectividad y disponibilidad de los objetos en la base de datos" -#: command-list.h:100 +#: command-list.h:101 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Limpia archivos innecesarios y optimiza el repositorio local" -#: command-list.h:101 +#: command-list.h:102 msgid "Extract commit ID from an archive created using git-archive" msgstr "Extrae el ID de commit de un archivo creado usando git-archive" -#: command-list.h:102 +#: command-list.h:103 msgid "Print lines matching a pattern" msgstr "Imprime las lรญneas que concuerdan con el patron" -#: command-list.h:103 +#: command-list.h:104 msgid "A portable graphical interface to Git" msgstr "Una interfaz grรกfica portรกtil para Git" -#: command-list.h:104 +#: command-list.h:105 msgid "Compute object ID and optionally creates a blob from a file" msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo" -#: command-list.h:105 +#: command-list.h:106 msgid "Display help information about Git" msgstr "Mostrar informaciรณn sobre Git" -#: command-list.h:106 +#: command-list.h:107 msgid "Server side implementation of Git over HTTP" msgstr "Implementaciรณn de lado de servidor de Git por HTTP" -#: command-list.h:107 +#: command-list.h:108 msgid "Download from a remote Git repository via HTTP" msgstr "Descarga de un repositorio Git remoto vรญa HTTP" -#: command-list.h:108 +#: command-list.h:109 msgid "Push objects over HTTP/DAV to another repository" msgstr "Empuja objetos por HTTP/DAV a otro repositorio" -#: command-list.h:109 +#: command-list.h:110 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "Enviar una colecciรณn de parches de stdin a una carpeta IMAP" -#: command-list.h:110 +#: command-list.h:111 msgid "Build pack index file for an existing packed archive" msgstr "Constuye un archivo de รญndice para un archivo empaquetado existente" -#: command-list.h:111 +#: command-list.h:112 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Crea un repositorio de Git vacรญo o reinicia el que ya existe" -#: command-list.h:112 +#: command-list.h:113 msgid "Instantly browse your working repository in gitweb" msgstr "Buscar instantรกneamente tu repositorio de trabajo en gitweb" -#: command-list.h:113 +#: command-list.h:114 msgid "Add or parse structured information in commit messages" msgstr "Agregar o analizar informaciรณn estructurada en mensajes de commit" -#: command-list.h:114 +#: command-list.h:115 msgid "The Git repository browser" msgstr "El navegador de repositorio Git" -#: command-list.h:115 +#: command-list.h:116 msgid "Show commit logs" msgstr "Muestra los logs de los commits" -#: command-list.h:116 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "Muestra informaciรณn sobre archivos in el รญndice y el รกrbol de trabajo" -#: command-list.h:117 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "Lista referencias en un repositorio remoto" -#: command-list.h:118 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "Lista los contenidos de un objeto รกrbol" -#: command-list.h:119 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "Extraer parche y autorรญa de un รบnico mensaje de e-mail" -#: command-list.h:120 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "Programa divisor de mbox simple de UNIX" -#: command-list.h:121 +#: command-list.h:122 msgid "Join two or more development histories together" msgstr "Junta dos o mรกs historiales de desarrollo juntos" -#: command-list.h:122 +#: command-list.h:123 msgid "Find as good common ancestors as possible for a merge" msgstr "Encuentra un ancestro comรบn bueno para una posible fusiรณn" -#: command-list.h:123 +#: command-list.h:124 msgid "Run a three-way file merge" msgstr "Ejecuta una fusiรณn de tres vรญas en un archivo" -#: command-list.h:124 +#: command-list.h:125 msgid "Run a merge for files needing merging" msgstr "Ejecuta una fusiรณn para archivos que la necesitan" -#: command-list.h:125 +#: command-list.h:126 msgid "The standard helper program to use with git-merge-index" msgstr "El programa de ayuda estรกndar para usar con git-merge-index" -#: command-list.h:126 +#: command-list.h:127 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" "Ejecuta las herramientas de fusiรณn de resoluciรณn de conflictos para resolver " "conflictos de fusiรณn" -#: command-list.h:127 +#: command-list.h:128 msgid "Show three-way merge without touching index" msgstr "Mostrar fusiรณn de tres vรญas sin tocar el รญndice" -#: command-list.h:128 +#: command-list.h:129 msgid "Write and verify multi-pack-indexes" msgstr "Escribe y verifica archivos multi-pack-index" -#: command-list.h:129 +#: command-list.h:130 msgid "Creates a tag object" msgstr "Crea un objeto tag" -#: command-list.h:130 +#: command-list.h:131 msgid "Build a tree-object from ls-tree formatted text" msgstr "Construir un objeto รกrbol de un texto en formato ls-tree" -#: command-list.h:131 +#: command-list.h:132 msgid "Move or rename a file, a directory, or a symlink" msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbรณlicos" -#: command-list.h:132 +#: command-list.h:133 msgid "Find symbolic names for given revs" msgstr "Encontrar nombres simbรณlicos para revs dados" -#: command-list.h:133 +#: command-list.h:134 msgid "Add or inspect object notes" msgstr "Agrega o inspecciona objetos nota" -#: command-list.h:134 +#: command-list.h:135 msgid "Import from and submit to Perforce repositories" msgstr "Importar desde y enviar a repositorios Perforce" -#: command-list.h:135 +#: command-list.h:136 msgid "Create a packed archive of objects" msgstr "Crea un archivo de objetos empaquetados" -#: command-list.h:136 +#: command-list.h:137 msgid "Find redundant pack files" msgstr "Encuentra archivos empaquetados de manera redundante" -#: command-list.h:137 +#: command-list.h:138 msgid "Pack heads and tags for efficient repository access" msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio" -#: command-list.h:138 +#: command-list.h:139 msgid "Routines to help parsing remote repository access parameters" msgstr "" "Rutinas para ayudar a analizar los parรกmetros de acceso del repositorio " "remoto" -#: command-list.h:139 +#: command-list.h:140 msgid "Compute unique ID for a patch" msgstr "Calcular ID รบnico para un parche" -#: command-list.h:140 +#: command-list.h:141 msgid "Prune all unreachable objects from the object database" msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos" -#: command-list.h:141 +#: command-list.h:142 msgid "Remove extra objects that are already in pack files" msgstr "Remover objetos extra que ya estรกn en archivos empaquetados" -#: command-list.h:142 +#: command-list.h:143 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Realiza un fetch e integra con otro repositorio o rama local" -#: command-list.h:143 +#: command-list.h:144 msgid "Update remote refs along with associated objects" msgstr "Actualiza referencias remotas junto con sus objetos asociados" -#: command-list.h:144 +#: command-list.h:145 msgid "Applies a quilt patchset onto the current branch" msgstr "Aplica un parche quilt en la rama actual" -#: command-list.h:145 +#: command-list.h:146 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)" -#: command-list.h:146 +#: command-list.h:147 msgid "Reads tree information into the index" msgstr "Lee informaciรณn del รกbol en el รญndice" -#: command-list.h:147 +#: command-list.h:148 msgid "Reapply commits on top of another base tip" msgstr "Vuelve a aplicar commits en la punta de otra rama" -#: command-list.h:148 +#: command-list.h:149 msgid "Receive what is pushed into the repository" msgstr "Recibir lo que es empujado en el respositorio" -#: command-list.h:149 +#: command-list.h:150 msgid "Manage reflog information" msgstr "Gestionar informaciรณn de reflog" -#: command-list.h:150 +#: command-list.h:151 msgid "Manage set of tracked repositories" msgstr "Gestiona un conjunto de repositorios rastreados" -#: command-list.h:151 +#: command-list.h:152 msgid "Pack unpacked objects in a repository" msgstr "Empaquetar objetos no empaquetados en un repositorio" -#: command-list.h:152 +#: command-list.h:153 msgid "Create, list, delete refs to replace objects" msgstr "Crea, lista, borra referencias para reemplazar objetos" -#: command-list.h:153 +#: command-list.h:154 msgid "Generates a summary of pending changes" msgstr "Genera un resumen de cambios pendientes" -#: command-list.h:154 +#: command-list.h:155 msgid "Reuse recorded resolution of conflicted merges" msgstr "Reutilizar la resoluciรณn registrada de fusiones conflictivas" -#: command-list.h:155 +#: command-list.h:156 msgid "Reset current HEAD to the specified state" msgstr "Reinicia el HEAD actual a un estado especifico" -#: command-list.h:156 +#: command-list.h:157 msgid "Restore working tree files" msgstr "Restaurar archivos de รกrboles de trabajo" -#: command-list.h:157 +#: command-list.h:158 msgid "Revert some existing commits" msgstr "Revierte algunos commits existentes" -#: command-list.h:158 +#: command-list.h:159 msgid "Lists commit objects in reverse chronological order" msgstr "Lista objetos commit en orden cronolรณgico inverso" -#: command-list.h:159 +#: command-list.h:160 msgid "Pick out and massage parameters" msgstr "Seleccionar y masajear los parรกmetros" -#: command-list.h:160 +#: command-list.h:161 msgid "Remove files from the working tree and from the index" msgstr "Borra archivos del รกrbol de trabajo y del รญndice" -#: command-list.h:161 +#: command-list.h:162 msgid "Send a collection of patches as emails" msgstr "Envรญa una colecciรณn de parches como e-mails" -#: command-list.h:162 +#: command-list.h:163 msgid "Push objects over Git protocol to another repository" msgstr "Empujar objetos por protocolo Git a otro repositorio" -#: command-list.h:163 +#: command-list.h:164 msgid "Restricted login shell for Git-only SSH access" msgstr "Shell de inicio de sesiรณn restringido para acceso SSH exclusivo de Git" -#: command-list.h:164 +#: command-list.h:165 msgid "Summarize 'git log' output" msgstr "Resumir la salida 'git log'" -#: command-list.h:165 +#: command-list.h:166 msgid "Show various types of objects" msgstr "Muestra varios tipos de objetos" -#: command-list.h:166 +#: command-list.h:167 msgid "Show branches and their commits" msgstr "Mostrar ramas y sus commits" -#: command-list.h:167 +#: command-list.h:168 msgid "Show packed archive index" msgstr "Mostrar el รญndice de archivo empaquetado" -#: command-list.h:168 +#: command-list.h:169 msgid "List references in a local repository" msgstr "Listar referencias en el repositorio local" -#: command-list.h:169 +#: command-list.h:170 msgid "Git's i18n setup code for shell scripts" msgstr "El cรณdigo de configuraciรณn i18n de Git para scripts de shell" -#: command-list.h:170 +#: command-list.h:171 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 +#: command-list.h:172 +msgid "Initialize and modify the sparse-checkout" +msgstr "Inicializa y modifica el sparse-checkout" + +#: command-list.h:173 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:172 +#: command-list.h:174 msgid "Add file contents to the staging area" msgstr "Agrega contenidos de un archivo al รกrea de staging" -#: command-list.h:173 +#: command-list.h:175 msgid "Show the working tree status" msgstr "Muestra el estado del รกrbol de trabajo" -#: command-list.h:174 +#: command-list.h:176 msgid "Remove unnecessary whitespace" msgstr "Eliminar el espacio en blanco innecesario" -#: command-list.h:175 +#: command-list.h:177 msgid "Initialize, update or inspect submodules" msgstr "Inicializa, actualiza o inspecciona submรณdulos" -#: command-list.h:176 +#: command-list.h:178 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Operaciรณn bidireccional entre un repositorio Subversion y Git" -#: command-list.h:177 +#: command-list.h:179 msgid "Switch branches" msgstr "Cambiar branches" -#: command-list.h:178 +#: command-list.h:180 msgid "Read, modify and delete symbolic refs" msgstr "Lee, modifica y borra referencias simbรณlicas" -#: command-list.h:179 +#: command-list.h:181 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:180 +#: command-list.h:182 msgid "Creates a temporary file with a blob's contents" msgstr "Crea un archivo temporal con contenidos de un blob" -#: command-list.h:181 +#: command-list.h:183 msgid "Unpack objects from a packed archive" msgstr "Desempaqueta objetos de un archivo empaquetado" -#: command-list.h:182 +#: command-list.h:184 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:183 +#: command-list.h:185 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:184 +#: command-list.h:186 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:185 +#: command-list.h:187 msgid "Send archive back to git-archive" msgstr "Enviar archivo a git-archive" -#: command-list.h:186 +#: command-list.h:188 msgid "Send objects packed back to git-fetch-pack" msgstr "Enviar objetos empaquetados a git-fetch-pack" -#: command-list.h:187 +#: command-list.h:189 msgid "Show a Git logical variable" msgstr "Mostrar una variable lรณgica de Git" -#: command-list.h:188 +#: command-list.h:190 msgid "Check the GPG signature of commits" msgstr "Verificar firma GPG de commits" -#: command-list.h:189 +#: command-list.h:191 msgid "Validate packed Git archive files" msgstr "Valida archivos Git empaquetados" -#: command-list.h:190 +#: command-list.h:192 msgid "Check the GPG signature of tags" msgstr "Verifica la firma GPG de etiquetas" -#: command-list.h:191 +#: command-list.h:193 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interfaz web Git (interfaz web para repositorios Git)" -#: command-list.h:192 +#: command-list.h:194 msgid "Show logs with difference each commit introduces" msgstr "Muestra logs con las diferencias que cada commit introduce" -#: command-list.h:193 +#: command-list.h:195 msgid "Manage multiple working trees" msgstr "Gestiona mรบltiples รกrboles de trabajo" -#: command-list.h:194 +#: command-list.h:196 msgid "Create a tree object from the current index" msgstr "Crea un objeto รกrbol del รญndice actual" -#: command-list.h:195 +#: command-list.h:197 msgid "Defining attributes per path" msgstr "Definiendo atributos por ruta" -#: command-list.h:196 +#: command-list.h:198 msgid "Git command-line interface and conventions" msgstr "Interfaz y convenciones de lรญnea de comandos de Git" -#: command-list.h:197 +#: command-list.h:199 msgid "A Git core tutorial for developers" msgstr "Un tutorial bรกsico de Git para desarrolladores" -#: command-list.h:198 +#: command-list.h:200 msgid "Git for CVS users" msgstr "Git para usuarios CVS" -#: command-list.h:199 +#: command-list.h:201 msgid "Tweaking diff output" msgstr "Afinar la salida de diff" -#: command-list.h:200 +#: command-list.h:202 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un conjunto mรญnimo รบtil de comandos diarios de Git" -#: command-list.h:201 +#: command-list.h:203 +msgid "Frequently asked questions about using Git" +msgstr "Preguntas frecuentes sobre el uso de Git" + +#: command-list.h:204 msgid "A Git Glossary" msgstr "Un Glosario de Git" -#: command-list.h:202 +#: command-list.h:205 msgid "Hooks used by Git" msgstr "Hooks utilizados por Git" -#: command-list.h:203 +#: command-list.h:206 msgid "Specifies intentionally untracked files to ignore" msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar" -#: command-list.h:204 +#: command-list.h:207 msgid "Defining submodule properties" msgstr "Definiendo las propiedades del submรณdulo" -#: command-list.h:205 +#: command-list.h:208 msgid "Git namespaces" msgstr "Namespaces de Git" -#: command-list.h:206 +#: command-list.h:209 msgid "Git Repository Layout" msgstr "Disposiciรณn del repositorio Git" -#: command-list.h:207 +#: command-list.h:210 msgid "Specifying revisions and ranges for Git" msgstr "Especificando revisiones y rangos para Git" -#: command-list.h:208 +#: command-list.h:211 +msgid "Mounting one repository inside another" +msgstr "Montando un repositorio dentro de otro" + +#: command-list.h:212 msgid "A tutorial introduction to Git: part two" msgstr "Un tutorial de introducciรณn a Git: parte dos" -#: command-list.h:209 +#: command-list.h:213 msgid "A tutorial introduction to Git" msgstr "Un tutorial de introducciรณn para Git" -#: command-list.h:210 +#: command-list.h:214 msgid "An overview of recommended workflows with Git" msgstr "Una visiรณn general de flujos de trabajo recomendados con Git" @@ -21999,20 +23769,20 @@ msgstr "Ningรบn logfile proporcionado" msgid "cannot read $file for replaying" msgstr "no se puede leer $file para reproducir" -#: git-bisect.sh:232 +#: git-bisect.sh:233 msgid "?? what are you talking about?" msgstr "?? ยฟDe quรฉ estรกs hablando?" -#: git-bisect.sh:241 +#: git-bisect.sh:243 msgid "bisect run failed: no command provided." msgstr "bisect fallรณ: no se proveyรณ comando." -#: git-bisect.sh:246 +#: git-bisect.sh:248 #, sh-format msgid "running $command" msgstr "ejecutando $command" -#: git-bisect.sh:253 +#: git-bisect.sh:255 #, sh-format msgid "" "bisect run failed:\n" @@ -22021,11 +23791,11 @@ msgstr "" "bisect fallรณ:\n" "cรณdigo de salida $res de '$command' es <0 o >=128" -#: git-bisect.sh:279 +#: git-bisect.sh:281 msgid "bisect run cannot continue any more" msgstr "bisect no puede seguir continuando" -#: git-bisect.sh:285 +#: git-bisect.sh:287 #, sh-format msgid "" "bisect run failed:\n" @@ -22034,11 +23804,11 @@ msgstr "" "bisect fallรณ:\n" "'bisect_state $state' saliรณ con cรณdigo de error $res" -#: git-bisect.sh:292 +#: git-bisect.sh:294 msgid "bisect run success" msgstr "bisect exitoso" -#: git-bisect.sh:300 +#: git-bisect.sh:302 msgid "We are not bisecting." msgstr "No estamos bisecando." @@ -22082,143 +23852,50 @@ 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:220 -msgid "Cannot remove temporary index (can't happen)" -msgstr "No se puede eliminar el รญndice temporal (no puede suceder)" - -#: 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:323 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "error: opciรณn desconocida para 'stash pus': $option" - -#: 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:535 -#, sh-format -msgid "unknown option: $opt" -msgstr "opciรณn desconocida: $opt" - -#: git-legacy-stash.sh:555 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "Se especificaron demasiadas revisiones: $REV" - -#: 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:598 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "'$args' no es un commit estilo stash" - -#: 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:617 -msgid "unable to refresh index" -msgstr "incapaz de refrescar el รญndice" - -#: 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:629 -msgid "Conflicts in index. Try without --index." -msgstr "Conflictos en รญndice. Intente sin --index." - -#: git-legacy-stash.sh:631 -msgid "Could not save index tree" -msgstr "No se puede guardar el รญndice del รกrbol" - -#: 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:665 -msgid "Cannot unstage modified files" -msgstr "No se puede sacar de stage archivos modificados" - -#: git-legacy-stash.sh:703 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "Botado ${REV} ($s)" - -#: 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:791 -msgid "(To restore them type \"git stash apply\")" -msgstr "(Para restaurarlos, escribe \"git stash apply\")" - -#: git-submodule.sh:200 +#: git-submodule.sh:205 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:210 +#: git-submodule.sh:215 #, 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:229 +#: git-submodule.sh:234 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ya existe en el รญndice" -#: git-submodule.sh:232 +#: git-submodule.sh:237 #, 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:239 +#: git-submodule.sh:244 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' no tiene un commit checked out" -#: 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 +#: git-submodule.sh:275 #, 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:270 +#: git-submodule.sh:277 #, 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:278 +#: git-submodule.sh:285 #, 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:280 +#: git-submodule.sh:287 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22235,39 +23912,39 @@ msgstr "" "o no estรกs seguro de lo que esto significa, escoge otro nombre con la opciรณn " "'--name'." -#: git-submodule.sh:286 +#: git-submodule.sh:293 #, 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:298 +#: git-submodule.sh:305 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "No es posible hacer checkout al submรณdulo '$sm_path'" -#: git-submodule.sh:303 +#: git-submodule.sh:310 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Fallรณ al agregar el submรณdulo '$sm_path'" -#: git-submodule.sh:312 +#: git-submodule.sh:319 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Fallรณ al registrar el submรณdulo '$sm_path'" -#: git-submodule.sh:573 +#: git-submodule.sh:592 #, 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:583 +#: git-submodule.sh:602 #, 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:588 +#: git-submodule.sh:607 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -22276,7 +23953,7 @@ msgstr "" "No es posible encontrar revisiรณn actual ${remote_name}/${branch} en la ruta " "de submรณdulo '$sm_path'" -#: git-submodule.sh:606 +#: git-submodule.sh:625 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -22285,7 +23962,7 @@ msgstr "" "No es posible realizar fetch en la ruta de submรณdulo '$displaypath'; " "intentando hacer un fetch directo $sha1:" -#: git-submodule.sh:612 +#: git-submodule.sh:631 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -22294,75 +23971,75 @@ msgstr "" "Fetch realizado en ruta de submรณdulo '$displaypath', pero no contenรญa $sha1. " "Fetch directo del commit fallรณ." -#: git-submodule.sh:619 +#: git-submodule.sh:638 #, 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:620 +#: git-submodule.sh:639 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Ruta de submรณdulo '$displaypath': check out realizado a '$sha1'" -#: git-submodule.sh:624 +#: git-submodule.sh:643 #, 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:625 +#: git-submodule.sh:644 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Ruta de submรณdulo '$displaypath': rebasada en '$sha1'" -#: git-submodule.sh:630 +#: git-submodule.sh:649 #, 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:631 +#: git-submodule.sh:650 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Ruta de submรณdulo '$displaypath': fusionada en '$sha1'" -#: git-submodule.sh:636 +#: git-submodule.sh:655 #, 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:637 +#: git-submodule.sh:656 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Ruta de submรณdulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:668 +#: git-submodule.sh:687 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fallรณ al recurrir en la ruta de submรณdulo '$displaypath'" -#: git-submodule.sh:830 +#: git-submodule.sh:852 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:882 +#: git-submodule.sh:904 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modo $mod_dst inesperado" -#: git-submodule.sh:902 +#: git-submodule.sh:924 #, 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:905 +#: git-submodule.sh:927 #, 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:908 +#: git-submodule.sh:930 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -22382,6 +24059,17 @@ msgstr "Autostash aplicado." msgid "Cannot store $stash_sha1" msgstr "No se puede almacenar $stash_sha1" +#: git-rebase--preserve-merges.sh:113 +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 "" +"Aplicando autostash resultรณ en conflictos.\n" +"Tus cambios estรกn seguros en el stash.\n" +"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " +"momento.\n" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" @@ -22684,6 +24372,10 @@ 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" @@ -22758,81 +24450,19 @@ 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:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: 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 +#: git-add--interactive.perl:634 #, 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: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 +#: git-add--interactive.perl:1055 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -22840,7 +24470,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para el รกrea de stage." -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1058 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -22848,7 +24478,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para aplicar stash." -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1061 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -22856,8 +24486,8 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para sacar del รกrea de stage." -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1064 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -22865,8 +24495,8 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado \n" "inmediatamente para aplicar." -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1067 git-add--interactive.perl:1070 +#: git-add--interactive.perl:1076 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -22874,16 +24504,12 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado\n" "inmediatamente para descarte." -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1113 #, 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: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 +#: git-add--interactive.perl:1120 #, perl-format msgid "" "---\n" @@ -22894,37 +24520,14 @@ 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 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" +"Lineas comenzando con %s serรกn eliminadas.\n" -#: git-add--interactive.perl:1138 +#: git-add--interactive.perl:1142 #, 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" -#. 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 +#: git-add--interactive.perl:1250 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -22939,7 +24542,7 @@ msgstr "" "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " "archivo" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1256 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -22953,7 +24556,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:1258 +#: git-add--interactive.perl:1262 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -22968,7 +24571,7 @@ msgstr "" "d - no sacar del area de stage este hunk o ninguno de los posteriores en el " "archivo" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1268 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -22982,7 +24585,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:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1274 git-add--interactive.perl:1292 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -22996,7 +24599,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:1276 +#: git-add--interactive.perl:1280 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23010,7 +24613,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:1282 +#: git-add--interactive.perl:1286 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23024,7 +24627,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:1294 +#: git-add--interactive.perl:1298 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23038,7 +24641,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:1309 +#: git-add--interactive.perl:1313 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23060,228 +24663,90 @@ msgstr "" "e - editar manualmente el hunk actual\n" "? - imprimir ayuda\n" -#: 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" - -#: 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" +msgid "The selected hunks do not apply to the index!\n" +msgstr "ยกLos hunks seleccionados no aplican al รญndice!\n" -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1359 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorando lo no fusionado: %s\n" -#: 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 +#: git-add--interactive.perl:1478 #, 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:1467 +#: git-add--interactive.perl:1479 #, 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:1480 +#, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "ยฟAplicar adiciรณn al รกrbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1481 #, 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:1568 +#: git-add--interactive.perl:1587 msgid "No other hunks to goto\n" msgstr "No hay mรกs pedazos para el ir\n" -#: 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 +#: git-add--interactive.perl:1605 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Numero invรกlido: '%s'\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1610 #, 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:1617 +#: git-add--interactive.perl:1636 msgid "No other hunks to search\n" msgstr "No hay mรกs pedazos para buscar\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "buscar para regexp? " - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1653 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regexp para la bรบsqueda mal formado %s: %s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1663 msgid "No hunk matches the given pattern\n" msgstr "No hay hunks que concuerden con el patrรณn entregado.\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1675 git-add--interactive.perl:1697 msgid "No previous hunk\n" msgstr "No el anterior hunk\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1684 git-add--interactive.perl:1703 msgid "No next hunk\n" msgstr "No el siguiente hunk\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1709 msgid "Sorry, cannot split this hunk\n" msgstr "Perdรณn, no se puede dividir este pedazo\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1715 #, 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:1706 +#: git-add--interactive.perl:1725 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:1771 +#: git-add--interactive.perl:1790 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23301,19 +24766,19 @@ msgstr "" "add untracked - agrega contenidos de archivos no rastreados al grupo de " "cambios del area de stage\n" -#: 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 +#: git-add--interactive.perl:1807 git-add--interactive.perl:1812 +#: git-add--interactive.perl:1815 git-add--interactive.perl:1822 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1832 +#: git-add--interactive.perl:1836 git-add--interactive.perl:1842 msgid "missing --" msgstr "falta --" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1838 #, perl-format msgid "unknown --patch mode: %s" msgstr "modo --patch desconocido: %s" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1844 git-add--interactive.perl:1850 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argumento invรกlido %s, se esperaba --" @@ -23430,7 +24895,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 @@ -23445,7 +24910,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 removidas.\n" +"Lineas que comienzan en \"GIT:\" serรกn eliminadas.\n" "Considere incluir un diffstat global o una tabla de contenidos\n" "para el parche que estรกs escribiendo.\n" "\n" @@ -23469,7 +24934,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 "" @@ -23481,7 +24946,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 @@ -23498,7 +24963,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 @@ -23508,7 +24973,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 @@ -23521,7 +24986,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 @@ -23558,7 +25023,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" @@ -23571,12 +25036,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." @@ -23630,59 +25095,375 @@ msgstr "(mbox) Agregando cc: %s de lรญnea '%s'\n" msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Agregando para: %s de la lรญnea '%s'\n" -#: git-send-email.perl:1718 +#: git-send-email.perl:1722 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Agregando cc: %s de la lรญnea '%s'\n" -#: git-send-email.perl:1753 +#: git-send-email.perl:1757 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Agregando cc: %s de la lรญnea '%s'\n" -#: git-send-email.perl:1864 +#: git-send-email.perl:1868 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no se pudo ejecutar '%s'" -#: git-send-email.perl:1871 +#: git-send-email.perl:1875 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Agregando %s: %s de: '%s'\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1879 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) fallรณ al cerrar el pipe para '%s'" -#: git-send-email.perl:1905 +#: git-send-email.perl:1909 msgid "cannot send message as 7bit" msgstr "no se puede mandar mensaje como 7bit" -#: git-send-email.perl:1913 +#: git-send-email.perl:1917 msgid "invalid transfer encoding" msgstr "codificaciรณn de transferencia invรกlida" -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 +#: git-send-email.perl:1958 git-send-email.perl:2010 git-send-email.perl:2020 #, perl-format msgid "unable to open %s: %s\n" msgstr "no es posible abrir %s: %s\n" -#: git-send-email.perl:1957 +#: git-send-email.perl:1961 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: el parche contiene una lรญnea con mรกs de 998 caracteres" -#: git-send-email.perl:1974 +#: git-send-email.perl:1978 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Saltando %s con el sufijo de backup '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1978 +#: git-send-email.perl:1982 #, perl-format msgid "Do you really want to send %s? [y|N]: " -msgstr "Realmente deseas mandar %s?[y|N]: " +msgstr "ยฟRealmente deseas mandar %s?[y|N]: " + +#, 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" + +#, c-format +#~ msgid "invalid commit object id: %s" +#~ msgstr "id de objeto commit: %s invรกlido" + +#, c-format +#~ msgid "Removing worktrees/%s: not a valid directory" +#~ msgstr "Removiendo el worktrees/%s: no es un directorio vรกlido" + +#, c-format +#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +#~ msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)" + +#, c-format +#~ msgid "Removing worktrees/%s: invalid gitdir file" +#~ msgstr "Removiendo worktrees/%s: archivo gitdir invรกlido" + +#, c-format +#~ msgid "unable to re-add worktree '%s'" +#~ msgstr "no es posible volver a agregar el รกrbol '%s'" + +#, c-format +#~ msgid "target '%s' already exists" +#~ msgstr "el objetivo '%s' ya existe" + +#, c-format +#~ msgid "" +#~ "Cannot update sparse checkout: the following entries are not up to date:\n" +#~ "%s" +#~ msgstr "" +#~ "No se puede actualizar el sparse checkout: las siguientes entradas no " +#~ "estรกn actualizadas:\n" +#~ "%s" + +#, c-format +#~ msgid "" +#~ "The following working tree files would be overwritten by sparse checkout " +#~ "update:\n" +#~ "%s" +#~ msgstr "" +#~ "Los siguientes archivos del รกrbol de trabajo serรกn sobrescritos por la " +#~ "actualizaciรณn sparse checkout:\n" +#~ "%s" + +#, c-format +#~ msgid "" +#~ "The following working tree files would be removed by sparse checkout " +#~ "update:\n" +#~ "%s" +#~ msgstr "" +#~ "Los siguientes archivos del รกrbol de trabajo serรกn eliminados por la " +#~ "actualizaciรณn sparse checkout:\n" +#~ "%s" + +#, c-format +#~ msgid "annotated tag %s has no embedded name" +#~ msgstr "tag anotado %s no tiene nombre embebido" + +#~ msgid "automatically stash/stash pop before and after rebase" +#~ msgstr "ejecutar automรกticamente stash/stash pop antes y despuรฉs de rebase" + +#~ msgid "--[no-]autostash option is only valid with --rebase." +#~ msgstr "La opciรณn --[no-]autostash sรณlo es vรกlida con --rebase." + +#~ msgid "(DEPRECATED) keep empty commits" +#~ msgstr "(DEPRECADO) mantener commits vacรญos" + +#, c-format +#~ msgid "Could not read '%s'" +#~ msgstr "No se pudo leer '%s'" + +#, c-format +#~ msgid "Cannot store %s" +#~ msgstr "No se puede guardar %s" + +#~ msgid "initialize sparse-checkout" +#~ msgstr "inicializar sparse-checkout" + +#~ msgid "set sparse-checkout patterns" +#~ msgstr "configurar patrones de sparse-checkout" + +#~ msgid "disable sparse-checkout" +#~ msgstr "deshabilitar sparse-checkout" + +#, c-format +#~ msgid "could not exec %s" +#~ msgstr "no se pudo ejecutar %s" + +#~ msgid "Cannot remove temporary index (can't happen)" +#~ msgstr "No se puede eliminar el รญndice temporal (no puede suceder)" + +#, sh-format +#~ msgid "Cannot update $ref_stash with $w_commit" +#~ msgstr "No se puede actualizar $ref_stash con $w_commit" + +#, sh-format +#~ msgid "error: unknown option for 'stash push': $option" +#~ msgstr "error: opciรณn desconocida para 'stash pus': $option" + +#, sh-format +#~ msgid "Saved working directory and index state $stash_msg" +#~ msgstr "Directorio de trabajo guardado y estado de รญndice $stash_msg" + +#, sh-format +#~ msgid "unknown option: $opt" +#~ msgstr "opciรณn desconocida: $opt" + +#, sh-format +#~ msgid "Too many revisions specified: $REV" +#~ msgstr "Se especificaron demasiadas revisiones: $REV" + +#, sh-format +#~ msgid "$reference is not a valid reference" +#~ msgstr "$reference no es una referencia vรกlida" + +#, sh-format +#~ msgid "'$args' is not a stash-like commit" +#~ msgstr "'$args' no es un commit estilo stash" + +#, sh-format +#~ msgid "'$args' is not a stash reference" +#~ msgstr "'$args' no es una referencia stash" + +#~ msgid "unable to refresh index" +#~ msgstr "incapaz de refrescar el รญndice" + +#~ msgid "Cannot apply a stash in the middle of a merge" +#~ msgstr "No se puede aplicar un stash en medio de una fusiรณn" + +#~ msgid "Conflicts in index. Try without --index." +#~ msgstr "Conflictos en รญndice. Intente sin --index." + +#~ msgid "Could not save index tree" +#~ msgstr "No se puede guardar el รญndice del รกrbol" + +#~ msgid "Could not restore untracked files from stash entry" +#~ msgstr "No se pueden restaurar archivos no rastreados de la entrada stash" + +#~ msgid "Cannot unstage modified files" +#~ msgstr "No se puede sacar de stage archivos modificados" + +#, sh-format +#~ msgid "Dropped ${REV} ($s)" +#~ msgstr "Botado ${REV} ($s)" + +#, sh-format +#~ msgid "${REV}: Could not drop stash entry" +#~ msgstr "${REV}: No se pudo borrar entrada stash" + +#~ msgid "(To restore them type \"git stash apply\")" +#~ msgstr "(Para restaurarlos, escribe \"git stash apply\")" + +#, 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'" #~ msgid "Server supports multi_ack_detailed" #~ msgstr "El servidor soporta ulti_ack_detailed" @@ -23720,9 +25501,6 @@ 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" @@ -23906,9 +25684,6 @@ msgstr "Realmente deseas mandar %s?[y|N]: " #~ msgid "make rebase script" #~ msgstr "generar script de rebase" -#~ msgid "No such remote: %s" -#~ msgstr "No existe el remoto: %s" - #~ msgid "cannot move a locked working tree" #~ msgstr "no se puede mover un รกrbol de trabajo encerrado" diff --git a/third_party/git/po/fr.po b/third_party/git/po/fr.po index 55c7db6aa6..f510f0bc6f 100644 --- a/third_party/git/po/fr.po +++ b/third_party/git/po/fr.po @@ -57,6 +57,7 @@ # revision | rรฉvision # shallow | superficiel # shell | interprรฉteur de commandes +# sparse | clairsemรฉ # stash | remisage # to stash | remiser # tag | รฉtiquette @@ -69,14 +70,14 @@ # upstream | amont # viewer | visualiseur # worktree / | -# work(ing) tree | copie de travail +# work(ing) tree | arbre de travail # msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-08-10 20:12+0800\n" -"PO-Revision-Date: 2019-08-10 18:17+0200\n" +"POT-Creation-Date: 2020-10-10 09:32+0800\n" +"PO-Revision-Date: 2020-10-10 13:10+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,37 +87,776 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" "X-Generator: Poedit 2.2.3\n" -#: advice.c:109 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "Hein (%s)ย ?" + +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +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 reset.c:89 sequencer.c:3444 +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:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, 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:1738 git-add--interactive.perl:1371 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Seuls des fichiers binaires ont changรฉ.\n" + +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "Aucune modification.\n" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "Mise ร jour par patch" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +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:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "*** Commandes ***" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +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:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: 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:781 git-add--interactive.perl:1805 +#, c-format +msgid "Bye.\n" +msgstr "Au revoir.\n" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, 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:35 git-add--interactive.perl:1434 +#, 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:36 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "Indexer l'ajout [y,n,q,a,d%s,?]ย ? " + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, 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:39 +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:42 +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:56 git-add--interactive.perl:1439 +#, 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:57 git-add--interactive.perl:1440 +#, 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:58 git-add--interactive.perl:1441 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "Remiser l'ajout [y,n,q,a,d%s,?]ย ? " + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, 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:61 +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:64 +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:80 git-add--interactive.perl:1445 +#, 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:81 git-add--interactive.perl:1446 +#, 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:82 git-add--interactive.perl:1447 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "Dรฉsindexer l'ajout [y,n,q,a,d%s,?]ย ? " + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, 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:85 +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:88 +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:103 git-add--interactive.perl:1451 +#, 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:104 git-add--interactive.perl:1452 +#, 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:105 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "Appliquer l'ajout ร l'index [y,n,q,a,d%s,?]ย ? " + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, 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:108 add-patch.c:176 add-patch.c:221 +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:111 +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:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, 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:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, 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:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "Abandonner l'ajout dans l'arbre [y,n,q,a,d%s,?]ย ? " + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, 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:131 add-patch.c:154 add-patch.c:199 +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:134 add-patch.c:202 +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:149 add-patch.c:194 git-add--interactive.perl:1463 +#, 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:150 add-patch.c:195 git-add--interactive.perl:1464 +#, 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:151 add-patch.c:196 git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Abandonner l'ajout de l'index et de l'arbre [y,n,q,a,d%s,?]ย ? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, 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:157 +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:171 add-patch.c:216 git-add--interactive.perl:1469 +#, 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:172 add-patch.c:217 git-add--interactive.perl:1470 +#, 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:173 add-patch.c:218 git-add--interactive.perl:1471 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?]ย ? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, 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:179 +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:224 +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:342 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "impossible d'analyser l'entรชte de section '%.*s'" + +#: add-patch.c:361 add-patch.c:365 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "impossible d'analyser l'entรชte colorรฉ de section '%.*s'" + +#: add-patch.c:419 +msgid "could not parse diff" +msgstr "impossible d'analyser la diff" + +#: add-patch.c:438 +msgid "could not parse colored diff" +msgstr "impossible d'analyser la diff colorรฉe" + +#: add-patch.c:452 +#, c-format +msgid "failed to run '%s'" +msgstr "รฉchec pour lancer '%s'" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "sortie sans correspondance depuis interactive.diffFilter" + +#: add-patch.c:612 +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:785 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"ligne de contexte attendue #%d dans\n" +"%.*s" + +#: add-patch.c:800 +#, 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:1076 git-add--interactive.perl:1117 +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:1080 +#, 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:1094 git-add--interactive.perl:1131 +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:1127 +msgid "could not parse hunk header" +msgstr "impossible d'analyser l'entรชte de section" + +#: add-patch.c:1172 +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:1241 git-add--interactive.perl:1244 +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:1284 +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:1285 git-add--interactive.perl:1348 +msgid "Apply them to the worktree anyway? " +msgstr "Les appliquer quand mรชme ร l'arbre de travailย ? " + +#: add-patch.c:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "Rien n'a รฉtรฉ appliquรฉ.\n" + +#: add-patch.c:1349 +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:1511 add-patch.c:1521 +msgid "No previous hunk" +msgstr "Pas de section prรฉcรฉdente" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No next hunk" +msgstr "Pas de section suivante" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "Aucune autre section ร atteindre" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "aller ร quelle section (<ret> pour voir plus)ย ? " + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "aller ร quelle sectionย ? " + +#: add-patch.c:1555 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Numรฉro invalide : '%s'" + +#: add-patch.c:1560 +#, 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:1569 +msgid "No other hunks to search" +msgstr "aucune autre section ร rechercher" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "rechercher la regexย ? " + +#: add-patch.c:1590 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Regex de recherche malformรฉe %sย : %s" + +#: add-patch.c:1607 +msgid "No hunk matches the given pattern" +msgstr "Aucune section ne correspond au motif donnรฉ" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "Dรฉsolรฉ, impossible de dรฉcouper cette section" + +#: add-patch.c:1618 +#, c-format +msgid "Split into %d hunks." +msgstr "Dรฉcoupรฉe en %d sections." + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "Dรฉsolรฉ, impossible d'รฉditer cette section" + +#: add-patch.c:1674 +msgid "'git apply' failed" +msgstr "'git apply' a รฉchouรฉ" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" +"\n" +"Dรฉsactivez ce message avec \"git config advice.%s false\"" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sastuce: %.*s%s\n" -#: advice.c:162 +#: advice.c:247 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:164 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnรฉs." -#: advice.c:166 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnรฉs." -#: advice.c:168 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnรฉs." -#: advice.c:170 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnรฉs." -#: advice.c:172 +#: advice.c:257 #, 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:180 +#: advice.c:265 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." @@ -124,23 +864,23 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nรฉcessaire pour marquer la rรฉsolution et valider." -#: advice.c:188 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "Abandon ร cause de conflit non rรฉsolu." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:278 builtin/merge.c:1349 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminรฉ votre fusion (MERGE_HEAD existe)." -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "Abandon ร cause d'une fusion non terminรฉe." -#: advice.c:202 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -275,17 +1015,7 @@ 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: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 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -300,83 +1030,93 @@ 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:1564 +#: apply.c:1385 #, 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:1752 +#: 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 msgid "new file depends on old contents" msgstr "le nouveau fichier dรฉpend de contenus anciens" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "le fichier supprimรฉ a encore du contenu" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu ร la ligne %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dรฉpend de contenus anciens" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimรฉ %s a encore du contenu" -#: apply.c:1830 +#: apply.c:1831 #, 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:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu ร la ligne %d : %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu ร la ligne %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incomprรฉhensible ร la ligne %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "dรฉbut de ligne invalide : '%c'" -#: apply.c:3046 +#: 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] "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:3058 +#: apply.c:3069 #, 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:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -385,466 +1125,496 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: apply.c:3086 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "donnรฉes de patch binaire manquantes pour '%s'" -#: apply.c:3094 +#: apply.c:3105 #, 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:3141 +#: apply.c:3152 #, 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:3151 +#: apply.c:3163 #, 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:3159 +#: apply.c:3171 #, 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:3177 +#: apply.c:3189 #, 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:3190 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement ร '%s'" -#: apply.c:3196 +#: apply.c:3209 #, 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:3217 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a รฉchouรฉ : %s:%ld" -#: apply.c:3340 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 #, c-format msgid "failed to read %s" msgstr "รฉchec de la lecture de %s" -#: apply.c:3400 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delร d'un lien symbolique" -#: apply.c:3429 apply.c:3672 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a รฉtรฉ renommรฉ/supprimรฉ" -#: apply.c:3515 apply.c:3687 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3524 apply.c:3695 +#: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas ร l'index" -#: apply.c:3559 +#: apply.c:3572 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:3562 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retour ร une fusion ร 3 pointsโฆ\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossible de lire le contenu actuel de '%s'" -#: apply.c:3594 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "รchec du retour ร une fusion ร 3 pointsโฆ\n" -#: apply.c:3608 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliquรฉ avec des conflits.\n" -#: apply.c:3613 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliquรฉ proprement.\n" -#: apply.c:3639 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: apply.c:3712 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s : type erronรฉ" -#: apply.c:3714 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: apply.c:3923 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s : existe dรฉjร dans l'index" -#: apply.c:3926 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe dรฉjร dans la copie de travail" -#: apply.c:3946 +#: apply.c:3976 #, 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:3951 +#: apply.c:3981 #, 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:3971 +#: apply.c:4001 #, 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:3975 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:3990 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "Vรฉrification du patch %s..." -#: apply.c:4082 +#: apply.c:4112 #, 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:4089 +#: apply.c:4119 #, 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:4092 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: 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 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s ร l'index temporaire" -#: apply.c:4111 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'รฉcrire l'index temporaire dans %s" -#: apply.c:4249 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4283 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4289 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement crรฉรฉ '%s' impossible" -#: apply.c:4297 +#: apply.c:4327 #, 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:4303 apply.c:4448 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'รฉlรฉment de cache %s impossible" -#: apply.c:4346 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "รฉchec de l'รฉcriture dans '%s'" -#: apply.c:4350 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4420 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "รฉcriture du fichier '%s' mode %o impossible" -#: apply.c:4518 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliquรฉ proprement." -#: apply.c:4526 +#: apply.c:4556 msgid "internal error" msgstr "erreur interne" -#: apply.c:4529 +#: apply.c:4559 #, 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:4540 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4562 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section nยฐ%d appliquรฉe proprement." -#: apply.c:4566 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "Section nยฐ%d rejetรฉe." -#: apply.c:4676 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traitรฉ." -#: apply.c:4684 +#: apply.c:4723 msgid "unrecognized input" msgstr "entrรฉe non reconnue" -#: apply.c:4704 +#: apply.c:4743 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4859 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s'ย :%s" -#: apply.c:4886 +#: apply.c:4927 #, 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:4892 apply.c:4907 +#: apply.c:4933 apply.c:4948 #, 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:4900 +#: apply.c:4941 #, 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:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Impossible d'รฉcrire le nouveau fichier d'index" -#: 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 +#: apply.c:4985 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donnรฉ" -#: apply.c:4947 +#: apply.c:4988 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donnรฉ" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "num" -#: apply.c:4950 +#: apply.c:4991 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:4953 +#: apply.c:4994 msgid "ignore additions made by the patch" msgstr "ignorer les additions rรฉalisรฉes par le patch" -#: apply.c:4955 +#: apply.c:4996 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:4959 +#: apply.c:5000 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:4961 +#: apply.c:5002 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:4963 +#: apply.c:5004 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:4965 +#: apply.c:5006 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:4967 +#: apply.c:5008 msgid "mark new files with `git add --intent-to-add`" msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" -#: apply.c:4969 +#: apply.c:5010 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher ร la copie de travail" -#: apply.c:4971 +#: apply.c:5012 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:4974 +#: apply.c:5015 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (ร utiliser avec --stat/--summary/--check)" -#: apply.c:4976 +#: apply.c:5017 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:4978 +#: apply.c:5019 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:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "les chemins sont sรฉparรฉs par un caractรจre NUL" -#: apply.c:4983 +#: apply.c:5024 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "action" -#: apply.c:4985 +#: apply.c:5026 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:4988 apply.c:4991 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:4994 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:4996 +#: apply.c:5037 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre ร au moins une ligne de contexte" -#: apply.c:4998 +#: apply.c:5039 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetรฉes dans les fichiers *.rej correspondants" -#: apply.c:5000 +#: apply.c:5041 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: 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 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:5003 +#: apply.c:5044 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:5006 +#: apply.c:5047 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:5008 builtin/am.c:2205 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "racine" -#: apply.c:5009 +#: apply.c:5050 msgid "prepend <root> to all filenames" msgstr "prรฉfixer tous les noms de fichier avec <root>" +#: 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:265 archive-zip.c:358 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "mode de fichier non supportรฉย :0%o (SHA1: %s)" + +#: archive-tar.c:449 +#, c-format +msgid "unable to start '%s' filter" +msgstr "impossible de dรฉmarrer le filtre '%s'" + +#: archive-tar.c:452 +msgid "unable to redirect descriptor" +msgstr "impossible de rediriger un descripteur" + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "le filtre '%s' a retournรฉ une erreur" + +#: archive-zip.c:318 +#, 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:322 +#, 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:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "erreur de compression (%d)" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "l'horodatage est trop grand pour ce systรจmeย : %<PRIuMAX>" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<options>] <arbre ou apparentรฉ> [<chemin>...]" @@ -864,182 +1634,165 @@ 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:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "impossible de lire %s" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "impossible de lire '%s'" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond ร aucun fichier" -#: archive.c:396 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "rรฉfรฉrence inexistanteย : %.*s" -#: archive.c:401 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "nom d'objet invalide : %s" -#: archive.c:414 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "objet arbre invalideย : %s" -#: archive.c:426 +#: archive.c:485 msgid "current working directory is untracked" msgstr "l'arbre de travail actuel est non-suivi" -#: archive.c:457 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "Fichier non trouvรฉย : %s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "'%s' n'est pas un fichier normal" + +#: archive.c:553 msgid "fmt" msgstr "fmt" -#: archive.c:457 +#: archive.c:553 msgid "archive format" msgstr "format d'archive" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "prรฉfixe" -#: archive.c:459 +#: archive.c:555 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: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 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "fichier" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "ajouter les fichiers non suivis ร l'archive" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "รฉcrire l'archive dans ce fichier" -#: archive.c:463 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le rรฉpertoire de travail" -#: archive.c:464 +#: archive.c:563 msgid "report archived files on stderr" msgstr "afficher les fichiers archivรฉs sur stderr" -#: archive.c:465 +#: archive.c:564 msgid "store only" msgstr "stockage seulement" -#: archive.c:466 +#: archive.c:565 msgid "compress faster" msgstr "compression rapide" -#: archive.c:474 +#: archive.c:573 msgid "compress better" msgstr "compression efficace" -#: archive.c:477 +#: archive.c:576 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:1379 builtin/submodule--helper.c:1859 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "dรฉpรดt" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:579 builtin/archive.c:92 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:707 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "commande" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: archive.c:489 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "Option --remote inattendue" -#: archive.c:491 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "L'option --exec ne peut รชtre utilisรฉe qu'en complรฉment de --remote" -#: archive.c:493 +#: archive.c:592 msgid "Unexpected option --output" msgstr "Option --output inattendue" -#: archive.c:515 +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" +msgstr "" +"Les options --add-file et --remote ne peuvent pas รชtre utilisรฉes ensemble" + +#: archive.c:616 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'archive inconnu '%s'" -#: archive.c:522 +#: archive.c:623 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument non supportรฉ pour le format '%s'ย : -%d" -#: 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: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:287 archive-zip.c:353 -#, c-format -msgid "cannot read %s" -msgstr "impossible de lire %s" - -#: archive-tar.c:459 -#, c-format -msgid "unable to start '%s' filter" -msgstr "impossible de dรฉmarrer le filtre '%s'" - -#: archive-tar.c:462 -msgid "unable to redirect descriptor" -msgstr "impossible de rediriger un descripteur" - -#: archive-tar.c:469 -#, c-format -msgid "'%s' filter reported error" -msgstr "le filtre '%s' a retournรฉ une erreur" - -#: 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: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: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:609 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "l'horodatage est trop grand pour ce systรจmeย : %<PRIuMAX>" - -#: attr.c:211 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s n'est pas un nom valide d'attribut" -#: attr.c:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s non permis : %s : %d" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1047,22 +1800,22 @@ msgstr "" "Les motifs de nรฉgation sont ignorรฉs dans les attributs git\n" "Utilisez '\\!' pour un point d'exclamation littรฉral." -#: bisect.c:468 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenu mal citรฉ dans le fichier '%s'ย : %s" -#: bisect.c:678 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "Impossible de pousser la bissection plus loinย !\n" -#: bisect.c:733 +#: bisect.c:753 #, c-format msgid "Not a valid commit name %s" msgstr "%s n'est pas un nom de commit valide" -#: bisect.c:758 +#: bisect.c:778 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1071,7 +1824,7 @@ msgstr "" "La base de fusion %s est mauvaise.\n" "Cela signifie que le bogue รฉtรฉ corrigรฉ entre %s et [%s].\n" -#: bisect.c:763 +#: bisect.c:783 #, c-format msgid "" "The merge base %s is new.\n" @@ -1080,7 +1833,7 @@ msgstr "" "La base de fusion %s est nouvelle.\n" "La propriรฉtรฉ a changรฉ entre %s et [%s].\n" -#: bisect.c:768 +#: bisect.c:788 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1089,7 +1842,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:776 +#: bisect.c:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1100,7 +1853,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:789 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1112,36 +1865,36 @@ msgstr "" "et %s.\n" "On continue tout de mรชme." -#: bisect.c:822 +#: bisect.c:848 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bissectionย : une base de fusion doit รชtre testรฉe\n" -#: bisect.c:865 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "une rรฉvision %s est nรฉcessaire" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "impossible de crรฉer le fichier '%s'" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" -#: bisect.c:958 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "impossible de lire les rรฉfรฉrences de bissection" -#: bisect.c:977 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "%s รฉtait ร la fois %s et %s\n" -#: bisect.c:985 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" @@ -1150,7 +1903,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:1004 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1160,48 +1913,48 @@ msgstr[1] "(ร peu prรจs %d รฉtapes)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1088 #, 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:2697 +#: blame.c:2778 msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon mรฉnage." -#: blame.c:2711 +#: blame.c:2792 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:2732 +#: blame.c:2813 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: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 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 msgid "revision walk setup failed" msgstr "รฉchec de la prรฉparation du parcours des rรฉvisions" -#: blame.c:2759 +#: blame.c:2840 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:2770 +#: blame.c:2851 #, c-format msgid "no such path %s in %s" msgstr "pas de chemin %s dans %s" -#: blame.c:2781 +#: blame.c:2862 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" @@ -1344,404 +2097,374 @@ msgstr "Nom d'objet ambigu : '%s'." msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' est dรฉjร extrait dans '%s'" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "la HEAD de la copie de travail %s n'est pas mise ร jour" -#: bundle.c:36 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "algorithme d'empreinte du colis inconnu : %s" + +#: bundle.c:45 +#, c-format +msgid "unknown capability '%s'" +msgstr "capacitรฉ inconnue '%s'" + +#: bundle.c:71 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' ne semble pas รชtre un fichier bundle v2" +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' ne semble pas รชtre un fichier colis v2 our v3" -#: bundle.c:64 +#: bundle.c:110 #, c-format 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:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" -#: bundle.c:143 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "Le dรฉpรดt ne dispose pas des commits prรฉrequis suivants :" -#: bundle.c:146 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "la vรฉrification d'un colis requiert un dรฉpรดt" -#: bundle.c:197 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Le colis contient cette rรฉfรฉrence :" msgstr[1] "Le colis contient ces %d rรฉfรฉrences :" -#: bundle.c:204 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "Le colis enregistre l'historique complet." -#: bundle.c:206 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" 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:272 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "impossible de dupliquer le descripteur de liasse" -#: bundle.c:279 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "Impossible de crรฉer des objets groupรฉs" -#: bundle.c:290 +#: bundle.c:337 msgid "pack-objects died" msgstr "les objets groupรฉs ont disparu" -#: bundle.c:332 +#: bundle.c:379 msgid "rev-list died" msgstr "rev-list a disparu" -#: bundle.c:381 +#: bundle.c:428 #, 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:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "version de colis non supportรฉe %d" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "impossible d'รฉcrire une version de colis %d avec l'algorithme %s" + +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:468 +#: bundle.c:530 msgid "Refusing to create empty bundle." msgstr "Refus de crรฉer un colis vide." -#: bundle.c:478 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "impossible de crรฉer '%s'" -#: bundle.c:503 +#: bundle.c:565 msgid "index-pack died" msgstr "l'index de groupe a disparu" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: 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:52 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s n'est pas un commit !" - -#: commit.c:192 -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 "" -"Le support de <GIT_DIR>/info/grafts est dรฉconseillรฉ\n" -"et sera supprimรฉ dans une version future de Git.\n" -"\n" -"Veuillez utiliser \"git replace --convert-graft-file\"\n" -"pour convertir les grafts en rรฉfรฉrence de remplacement.\n" -"\n" -"Supprimez ce message en lanรงant\n" -"\"git config advice.graftFileDeprecated false\"" - -#: 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-graph.c:188 midx.c:46 +msgid "invalid hash version" +msgstr "version d'empreinte invalide" -#: 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:1133 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "La validation %s n'a pas de signature GPG." - -#: 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: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 "" -"Avertissementย : le message de validation ne se conforme pas ร UTF-8.\n" -"Vous souhaitez peut-รชtre le modifier aprรจs correction du message ou rรฉgler " -"la\n" -"variable de configuration i18n.commitencoding ร l'encodage utilisรฉ par votre " -"projet.\n" - -#: commit-graph.c:127 +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "le graphe de commit est trop petit" -#: commit-graph.c:192 +#: commit-graph.c:311 #, 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:199 +#: commit-graph.c:318 #, 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:206 +#: commit-graph.c:325 #, 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: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:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "le graphe de commit est trop petit pour contenir %u sections" -#: commit-graph.c:240 +#: commit-graph.c:361 #, 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:283 +#: commit-graph.c:433 #, 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:347 +#: commit-graph.c:499 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:357 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "la chaรฎne de graphe de commit ne correspond pas" -#: commit-graph.c:404 +#: commit-graph.c:557 #, 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:430 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "impossible de trouver tous les fichiers du graphe de commit" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:721 commit-graph.c:785 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "position de commit invalide. Le graphe de commit est vraisemblablement " "corrompu" -#: commit-graph.c:575 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "impossible de trouver le commit %s" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:1042 builtin/am.c:1306 +#, c-format +msgid "unable to parse commit %s" +msgstr "impossible d'analyser le commit %s" + +#: commit-graph.c:1265 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" -#: commit-graph.c:1034 +#: commit-graph.c:1301 msgid "Loading known commits in commit graph" msgstr "Lecture des commits connus dans un graphe de commit" -#: commit-graph.c:1051 +#: commit-graph.c:1318 msgid "Expanding reachable commits in commit graph" msgstr "Expansion des commits joignables dans un graphe de commit" -#: commit-graph.c:1070 +#: commit-graph.c:1338 msgid "Clearing commit marks in commit graph" msgstr "Suppression les marques de commit dans le graphe de commits" -#: commit-graph.c:1089 +#: commit-graph.c:1357 msgid "Computing commit graph generation numbers" msgstr "Calcul des chiffres de gรฉnรฉration du graphe de commits" -#: commit-graph.c:1163 +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "Calcul des filtres Bloom des chemins modifiรฉs du commit" + +#: commit-graph.c:1501 +msgid "Collecting referenced commits" +msgstr "Collecte des commits rรฉfรฉrencรฉs" + +#: commit-graph.c:1526 #, 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:1176 +#: commit-graph.c:1539 #, c-format msgid "error adding pack %s" msgstr "erreur ร l'ajout du packet %s" -#: commit-graph.c:1180 +#: commit-graph.c:1543 #, c-format msgid "error opening index for %s" msgstr "erreur ร l'ouverture de l'index pour %s" -#: 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:1238 +#: commit-graph.c:1582 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:1253 +#: commit-graph.c:1597 msgid "Counting distinct commits in commit graph" msgstr "Comptage des commits distincts dans un graphe de commit" -#: commit-graph.c:1284 +#: commit-graph.c:1629 msgid "Finding extra edges in commit graph" msgstr "Recherche d'arรชtes supplรฉmentaires dans un graphe de commits" -#: commit-graph.c:1332 +#: commit-graph.c:1678 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:1365 midx.c:811 +#: commit-graph.c:1720 midx.c:826 #, 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:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1733 +msgid "unable to create temporary graph layer" +msgstr "impossible de crรฉer une couche de graphe temporaire" + +#: commit-graph.c:1738 #, c-format -msgid "unable to create '%s'" -msgstr "impossible de crรฉer '%s'" +msgid "unable to adjust shared permissions for '%s'" +msgstr "impossible de rรฉgler les droits partagรฉs pour '%s'" -#: commit-graph.c:1437 +#: commit-graph.c:1808 #, 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:1478 +#: commit-graph.c:1853 msgid "unable to open commit-graph chain file" msgstr "impossible d'ouvrir le fichier de graphe de commit" -#: commit-graph.c:1490 +#: commit-graph.c:1869 msgid "failed to rename base commit-graph file" msgstr "รฉchec du renommage du fichier de graphe de commits" -#: commit-graph.c:1510 +#: commit-graph.c:1889 msgid "failed to rename temporary commit-graph file" msgstr "impossible de renommer le fichier temporaire de graphe de commits" -#: commit-graph.c:1621 +#: commit-graph.c:2015 msgid "Scanning merged commits" msgstr "Analyse des commits de fusion" -#: commit-graph.c:1632 +#: commit-graph.c:2026 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de commit %s dupliquรฉ inattendu" -#: commit-graph.c:1657 +#: commit-graph.c:2049 msgid "Merging commit-graph" msgstr "fusion du graphe de commits" -#: commit-graph.c:1844 +#: commit-graph.c:2259 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "le graphe de commits ne peut pas รฉcrire %d commits" -#: commit-graph.c:1855 +#: commit-graph.c:2270 msgid "too many commits to write graph" msgstr "trop de commits pour รฉcrire un graphe" -#: commit-graph.c:1945 +#: commit-graph.c:2363 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:1955 +#: commit-graph.c:2373 #, 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:1965 commit-graph.c:1980 +#: commit-graph.c:2383 commit-graph.c:2398 #, 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:1972 +#: commit-graph.c:2390 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "รฉchec de l'analyse le commit %s depuis le graphe de commits" -#: commit-graph.c:1989 +#: commit-graph.c:2408 msgid "Verifying commits in commit graph" msgstr "Verification des commits dans le graphe de commits" -#: commit-graph.c:2002 +#: commit-graph.c:2423 #, 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:2009 +#: commit-graph.c:2430 #, 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:2019 +#: commit-graph.c:2440 #, 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:2028 +#: commit-graph.c:2449 #, 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:2041 +#: commit-graph.c:2463 #, 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:2046 +#: commit-graph.c:2468 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1749,7 +2472,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:2050 +#: commit-graph.c:2472 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1757,23 +2480,86 @@ 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:2065 +#: commit-graph.c:2488 #, 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:2071 +#: commit-graph.c:2494 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "la date de validation pour le commit %s dans le graphe de commit est " "%<PRIuMAX> != %<PRIuMAX>" +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "impossible d'analyser %s" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s n'est pas un commit !" + +#: commit.c:194 +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 "" +"Le support de <GIT_DIR>/info/grafts est dรฉconseillรฉ\n" +"et sera supprimรฉ dans une version future de Git.\n" +"\n" +"Veuillez utiliser \"git replace --convert-graft-file\"\n" +"pour convertir les grafts en rรฉfรฉrence de remplacement.\n" +"\n" +"Supprimez ce message en lanรงant\n" +"\"git config advice.graftFileDeprecated false\"" + +#: commit.c:1172 +#, 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:1176 +#, 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:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "La validation %s n'a pas de signature GPG." + +#: commit.c:1182 +#, 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:1436 +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 "" +"Avertissementย : le message de validation ne se conforme pas ร UTF-8.\n" +"Vous souhaitez peut-รชtre le modifier aprรจs correction du message ou rรฉgler " +"la\n" +"variable de configuration i18n.commitencoding ร l'encodage utilisรฉ par votre " +"projet.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "plus de mรฉmoire" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1788,313 +2574,306 @@ msgstr "" "\t%s\n" "possibilitรฉ d'inclusions multiples." -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "expansion impossible du chemin d'inclusion '%s'" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "les inclusions de configuration relatives doivent venir de fichiers" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "" "les conditions d'inclusion de configuration relative doivent venir de " "fichiers" -#: config.c:376 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "la clรฉ ne contient pas de section: %s" -#: config.c:382 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "la clรฉ ne contient pas de nom de variableย : %s" -#: config.c:406 sequencer.c:2463 +#: config.c:408 sequencer.c:2547 #, c-format msgid "invalid key: %s" msgstr "clรฉ invalideย : %s" -#: config.c:412 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "clรฉ invalide (retour chariot)ย : %s" -#: config.c:448 config.c:460 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "paramรจtre de configuration mal formรฉ: %s" -#: config.c:495 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "formatage mal formรฉ dans %s" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "ligne %d de config incorrecte dans le blob %s" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "ligne %d de config incorrecte dans le fichier %s" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "ligne %d de config incorrecte dans l'entrรฉe standard" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ligne %d de config incorrecte dans le blob de sous-module %s" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "ligne %d de config incorrecte dans la ligne de commande %s" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "ligne %d de config incorrecte dans %s" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "hors plage" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "unitรฉ invalide" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numรฉrique de configuration invalide '%s' pour '%s'ย : %s" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "valeur numรฉrique de configuration incorrecte '%s' pour '%s' dans le blob " "%sย : %s" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "valeur numรฉrique de configuration incorrecte '%s' pour '%s' dans le fichier " "%sย : %s" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valeur numรฉrique de configuration incorrecte '%s' pour '%s' dans l'entrรฉe " "standardย : %s" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valeur numรฉrique de configuration incorrecte '%s' pour '%s' dans le blob de " "sous-module %sย : %s" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valeur numรฉrique de configuration incorrecte '%s' pour '%s' dans la ligne de " "commande %sย : %s" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "valeur numรฉrique de configuration incorrecte '%s' pour '%s' dans %sย : %s" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'รฉtendre le rรฉpertoire utilisateur dans : '%s'" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' pour '%s' n'est pas un horodatage valide" -#: config.c:1208 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "longueur d'abbrev hors plageย : %d" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:1325 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "core.commentChar ne devrait รชtre qu'un unique caractรจre" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la crรฉation d'objet : %s" -#: config.c:1430 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "valeur mal formรฉe pour %s" -#: config.c:1456 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "valeur mal formรฉe pour %sย : %s" -#: config.c:1457 +#: config.c:1472 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:3410 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" -#: config.c:1639 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "impossible de charger l'objet blob de config '%s'" -#: config.c:1642 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "la rรฉfรฉrence '%s' ne pointe pas sur un blob" -#: config.c:1659 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "impossible de rรฉsoudre le blob de config '%s'" -#: config.c:1689 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "รฉchec de l'analyse de %s" -#: config.c:1745 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:2094 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:2264 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: 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 +#: config.c:2341 #, 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:2379 +#: config.c:2387 #, 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:2381 +#: config.c:2389 #, 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:2462 +#: config.c:2470 #, c-format msgid "invalid section name '%s'" msgstr "nom de section invalide '%s'" -#: config.c:2494 +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2523 +#: config.c:2531 #, c-format msgid "failed to write new configuration file %s" msgstr "impossible d'รฉcrire le fichier de configuration %s" -#: config.c:2775 config.c:3099 +#: config.c:2783 config.c:3107 #, c-format msgid "could not lock config file %s" msgstr "impossible de verrouiller le fichier de configuration %s" -#: config.c:2786 +#: config.c:2794 #, c-format msgid "opening %s" msgstr "ouverture de %s" -#: config.c:2821 builtin/config.c:328 +#: config.c:2829 builtin/config.c:354 #, c-format msgid "invalid pattern: %s" msgstr "motif invalide : %s" -#: config.c:2846 +#: config.c:2854 #, c-format msgid "invalid config file %s" msgstr "fichier de configuration invalide %s" -#: config.c:2859 config.c:3112 +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "รฉchec de fstat sur %s" -#: config.c:2870 +#: config.c:2878 #, c-format msgid "unable to mmap '%s'" msgstr "impossible de rรฉaliser un map de '%s'" -#: config.c:2879 config.c:3117 +#: config.c:2887 config.c:3125 #, c-format msgid "chmod on %s failed" msgstr "รฉchec de chmod sur %s" -#: config.c:2964 config.c:3214 +#: config.c:2972 config.c:3222 #, c-format msgid "could not write config file %s" msgstr "impossible d'รฉcrire le fichier de configuration %s" -#: config.c:2998 +#: config.c:3006 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de rรฉgler '%s' ร '%s'" -#: config.c:3000 builtin/remote.c:782 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "impossible de dรฉsinitialiser '%s'" -#: config.c:3090 +#: config.c:3098 #, c-format msgid "invalid section name: %s" msgstr "nom de section invalideย : %s" -#: config.c:3257 +#: config.c:3265 #, c-format msgid "missing value for '%s'" msgstr "valeur manquante pour '%s'" @@ -2120,72 +2899,81 @@ msgstr "" msgid "server doesn't support '%s'" msgstr "Le serveur ne supporte pas '%s'" -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "Le serveur ne supporte pas la fonctionnalitรฉ '%s'" -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" msgstr "vidage attendu aprรจs les capacitรฉs" -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "capacitรฉs ignorรฉes aprรจs la premiรจre ligne '%s'" -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "erreur de protocoleย : capabilities^{} inattendu" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "erreur de protocoleย : shallow sha-1 attendu, '%s' trouvรฉ" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "le dรฉpรดt distant ne peut pas รชtre superficiel" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" msgstr "paquet invalide" -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "erreur de protocoleย : '%s' attendu" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "format d'objet spรฉcifiรฉ par le serveur inconnu '%s'" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" msgstr "rรฉponse ร ls-ref invalide : %s" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" msgstr "vidage attendu aprรจs le listage de rรฉfรฉrences" -#: connect.c:544 +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "paquet de fin de rรฉponse attendu aprรจs le listage de rรฉfรฉrences" + +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" msgstr "le protocole '%s' n'est pas supportรฉ" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" msgstr "impossible de positionner SO_KEEPALIVE sur la socket" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "Recherche de %sโฆ " -#: connect.c:639 +#: connect.c:735 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "impossible de rechercher %s (port %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" @@ -2194,7 +2982,7 @@ msgstr "" "fait.\n" "Connexion ร %s (port %s)โฆ " -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -2204,89 +2992,89 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "fait." -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "impossible de rechercher %s (%s)" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "port inconnu %s" -#: connect.c:845 connect.c:1171 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "nom d'hรดte รฉtrange '%s' bloquรฉ" -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "port รฉtrange '%s' bloquรฉ" -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "impossible de dรฉmarrer un proxy %s" -#: connect.c:924 +#: connect.c:1024 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:1119 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" msgstr "la variante ssh 'simple' ne supporte pas -4" -#: connect.c:1131 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" msgstr "la variante ssh 'simple' ne supporte pas -6" -#: connect.c:1148 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" msgstr "la variante ssh 'simple' ne supporte pas de spรฉcifier le port" -#: connect.c:1260 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" msgstr "chemin รฉtrange '%s' bloquรฉ" -#: connect.c:1307 +#: connect.c:1408 msgid "unable to fork" msgstr "fork impossible" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Vรฉrification de la connectivitรฉ" -#: connected.c:98 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" -#: connected.c:118 +#: connected.c:144 msgid "failed write to rev-list" msgstr "impossible d'รฉcrire dans la rev-list" -#: connected.c:125 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "impossible de fermer l'entrรฉe standard du rev-list" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action illรฉgal %d" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "Les CRLF seraient remplacรฉs par des LF dans %s" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2295,12 +3083,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:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "Les LF seraient remplacรฉs par des CRLF dans %s" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2309,19 +3097,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:279 +#: convert.c:284 #, 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:286 +#: convert.c:291 #, 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 @@ -2338,52 +3126,52 @@ msgstr "" "utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre dรฉsirรฉ) comme encodage d'arbre " "de travail." -#: convert.c:424 convert.c:495 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "รฉchec de l'encodage de '%s' de %s vers %s" -#: convert.c:467 +#: convert.c:462 #, 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:673 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "impossible de forker pour lancer le filtre externe '%s'" -#: convert.c:693 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "impossible de fournir l'entrรฉe au filtre externe '%s'" -#: convert.c:700 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "le filtre externe '%s' a รฉchouรฉ %d" -#: convert.c:735 convert.c:738 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "la lecture depuis le filtre externe '%s' a รฉchouรฉ" -#: convert.c:741 convert.c:796 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "le filtre externe '%s' a รฉchouรฉ" -#: convert.c:844 +#: convert.c:837 msgid "unexpected filter type" msgstr "type de filtre inattendu" -#: convert.c:855 +#: convert.c:848 msgid "path name too long for external filter" msgstr "nom de chemin trop long pour un filtre externe" -#: convert.c:929 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2392,67 +3180,98 @@ msgstr "" "le filtre externe '%s' n'est plus disponible bien que tous les chemins " "n'aient pas รฉtรฉ filtrรฉs" -#: convert.c:1228 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "true/false ne sont pas des encodages d'arbre de travail valides" -#: convert.c:1398 convert.c:1432 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%sย : le filtre clean '%s' a รฉchouรฉ" -#: convert.c:1476 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "%sย : le filtre smudge '%s' a รฉchouรฉ" -#: date.c:137 +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "" +"vรฉrification des informations d'identification sautรฉe pour la clรฉย : " +"credential.%s" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "refus de travailler avec un champ host manquant dans l'identification" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "" +"refus de travailler avec un champ protocol manquant dans l'identification" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "L'url contient un retour chariot dans composant %sย : %s" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "l'url n'a pas de schรฉmaย : %s" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "impossible d'analyser l'url d'identificationย : %s" + +#: date.c:138 msgid "in the future" msgstr "dans le futur" -#: date.c:143 +#: date.c:144 #, 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:150 +#: date.c:151 #, 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:157 +#: date.c:158 #, 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:164 +#: date.c:165 #, 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:170 +#: date.c:171 #, 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:177 +#: date.c:178 #, 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:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2460,14 +3279,14 @@ msgstr[0] "%<PRIuMAX> an" msgstr[1] "%<PRIuMAX> ans" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, 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:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2500,15 +3319,6 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Marquage de %d รฎlots, fait.\n" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "impossible de lire le fichier de commande '%s'" - -#: diffcore-rename.c:544 -msgid "Performing inexact rename detection" -msgstr "Dรฉtection de renommage inexact en cours" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<options>] <chemin> <chemin>" @@ -2521,18 +3331,18 @@ msgstr "" "Pas un dรฉpรดt git. Utilisez --no-index pour comparer deux chemins hors d'un " "arbre de travail" -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n" -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paramรจtre dirstat inconnu '%s'\n" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2540,7 +3350,7 @@ msgstr "" "le paramรจtre de couleur de dรฉplacement doit รชtre parmi 'no', 'default', " "'blocks', 'zebra', 'dimmed_zebra' ou 'plain'" -#: diff.c:324 +#: diff.c:325 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -2550,7 +3360,7 @@ msgstr "" "space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-" "change'" -#: diff.c:332 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -2558,13 +3368,13 @@ msgstr "" "color-moved-wsย : allow-indentation-change ne peut pas รชtre combinรฉ avec " "d'autres modes d'espace" -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2573,35 +3383,35 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:4215 +#: diff.c:4269 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrรชt ร %s" -#: diff.c:4560 +#: diff.c:4618 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4563 +#: diff.c:4621 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4641 +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spรฉcification de chemin unique" -#: diff.c:4689 +#: diff.c:4747 #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --statย : %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s attend une valeur numรฉrique" -#: diff.c:4726 +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2610,42 +3420,42 @@ msgstr "" "Impossible d'analyser le paramรจtre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4811 +#: diff.c:4869 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s" -#: diff.c:4835 +#: diff.c:4893 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valeur inconnue aprรจs ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4907 #, c-format msgid "unable to resolve '%s'" msgstr "impossible de rรฉsoudre '%s'" -#: diff.c:4899 diff.c:4905 +#: diff.c:4957 diff.c:4963 #, c-format msgid "%s expects <n>/<m> form" msgstr "forme <n>/<m> attendue par %s" -#: diff.c:4917 +#: diff.c:4975 #, c-format msgid "%s expects a character, got '%s'" msgstr "caractรจre attendu par %s, '%s' trouvรฉ" -#: diff.c:4938 +#: diff.c:4996 #, c-format msgid "bad --color-moved argument: %s" msgstr "mauvais argument --color-movedย : %s" -#: diff.c:4957 +#: diff.c:5015 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -#: diff.c:4997 +#: diff.c:5055 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2653,155 +3463,155 @@ msgstr "" "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " "\"histogram\"" -#: diff.c:5033 diff.c:5053 +#: diff.c:5091 diff.c:5111 #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" -#: diff.c:5191 +#: diff.c:5248 #, 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:5247 +#: diff.c:5304 #, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diffย : %s" -#: diff.c:5270 +#: diff.c:5327 msgid "Diff output format options" msgstr "Options de format de sortie de diff" -#: diff.c:5272 diff.c:5278 +#: diff.c:5329 diff.c:5335 msgid "generate patch" msgstr "gรฉnรฉrer la rustine" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5332 builtin/log.c:176 msgid "suppress diff output" msgstr "supprimer la sortie des diffรฉrences" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5337 diff.c:5451 diff.c:5458 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5338 diff.c:5341 msgid "generate diffs with <n> lines context" msgstr "gรฉnรฉrer les diffs avec <n> lignes de contexte" -#: diff.c:5286 +#: diff.c:5343 msgid "generate the diff in raw format" msgstr "gรฉnรฉrer le diff en format brut" -#: diff.c:5289 +#: diff.c:5346 msgid "synonym for '-p --raw'" msgstr "synonyme de '-p --raw'" -#: diff.c:5293 +#: diff.c:5350 msgid "synonym for '-p --stat'" msgstr "synonyme de '-p --stat'" -#: diff.c:5297 +#: diff.c:5354 msgid "machine friendly --stat" msgstr "--stat pour traitement automatique" -#: diff.c:5300 +#: diff.c:5357 msgid "output only the last line of --stat" msgstr "afficher seulement la derniรจre ligne de --stat" -#: diff.c:5302 diff.c:5310 +#: diff.c:5359 diff.c:5367 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5303 +#: diff.c:5360 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:5307 +#: diff.c:5364 msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5368 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonyme pour --dirstat=files,param1,param2..." -#: diff.c:5315 +#: diff.c:5372 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:5318 +#: diff.c:5375 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:5321 +#: diff.c:5378 msgid "show only names of changed files" msgstr "n'afficher que les noms de fichiers modifiรฉs" -#: diff.c:5324 +#: diff.c:5381 msgid "show only names and status of changed files" msgstr "n'afficher que les noms et les status des fichiers modifiรฉs" -#: diff.c:5326 +#: diff.c:5383 msgid "<width>[,<name-width>[,<count>]]" msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]" -#: diff.c:5327 +#: diff.c:5384 msgid "generate diffstat" msgstr "gรฉnรฉrer un diffstat" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5386 diff.c:5389 diff.c:5392 msgid "<width>" msgstr "<largeur>" -#: diff.c:5330 +#: diff.c:5387 msgid "generate diffstat with a given width" msgstr "gรฉnรฉrer un diffstat avec la largeur indiquรฉe" -#: diff.c:5333 +#: diff.c:5390 msgid "generate diffstat with a given name width" msgstr "gรฉnerer un diffstat avec la largeur de nom indiquรฉe" -#: diff.c:5336 +#: diff.c:5393 msgid "generate diffstat with a given graph width" msgstr "gรฉnerer un diffstat avec la largeur de graphe indiquรฉe" -#: diff.c:5338 +#: diff.c:5395 msgid "<count>" msgstr "<compte>" -#: diff.c:5339 +#: diff.c:5396 msgid "generate diffstat with limited lines" msgstr "gรฉnรฉrer un diffstat avec des lignes limitรฉes" -#: diff.c:5342 +#: diff.c:5399 msgid "generate compact summary in diffstat" msgstr "gรฉnรฉrer une rรฉsumรฉ compact dans le diffstat" -#: diff.c:5345 +#: diff.c:5402 msgid "output a binary diff that can be applied" msgstr "produire un diff binaire qui peut รชtre appliquรฉ" -#: diff.c:5348 +#: diff.c:5405 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:5350 +#: diff.c:5407 msgid "show colored diff" msgstr "afficher un diff colorรฉ" -#: diff.c:5351 +#: diff.c:5408 msgid "<kind>" msgstr "<sorte>" -#: diff.c:5352 +#: diff.c:5409 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2809,7 +3619,7 @@ msgstr "" "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', " "'nouveau' dans le diff" -#: diff.c:5355 +#: diff.c:5412 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2817,93 +3627,93 @@ msgstr "" "ne pas compresser les chemins et utiliser des NULs comme terminateurs de " "champs dans --raw ou --numstat" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 msgid "<prefix>" msgstr "<prรฉfixe>" -#: diff.c:5359 +#: diff.c:5416 msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le prรฉfixe de source indiquรฉ au lieu de \"a/\"" -#: diff.c:5362 +#: diff.c:5419 msgid "show the given destination prefix instead of \"b/\"" msgstr "afficher le prรฉfixe de destination indiquรฉ au lieu de \"b/\"" -#: diff.c:5365 +#: diff.c:5422 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:5368 +#: diff.c:5425 msgid "do not show any source or destination prefix" msgstr "n'afficher aucun prรฉfixe, ni de source, ni de destination" -#: diff.c:5371 +#: diff.c:5428 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:5375 diff.c:5380 diff.c:5385 +#: diff.c:5432 diff.c:5437 diff.c:5442 msgid "<char>" msgstr "<caractรจre>" -#: diff.c:5376 +#: diff.c:5433 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:5381 +#: diff.c:5438 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:5386 +#: diff.c:5443 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:5389 +#: diff.c:5446 msgid "Diff rename options" msgstr "Options de renommage de diff" -#: diff.c:5390 +#: diff.c:5447 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5448 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:5395 +#: diff.c:5452 msgid "detect renames" msgstr "dรฉtecter les renommages" -#: diff.c:5399 +#: diff.c:5456 msgid "omit the preimage for deletes" msgstr "supprimer la prรฉ-image pour les suppressions" -#: diff.c:5402 +#: diff.c:5459 msgid "detect copies" msgstr "dรฉtecter les copies" -#: diff.c:5406 +#: diff.c:5463 msgid "use unmodified files as source to find copies" msgstr "" "utiliser les fichiers non-modifiรฉs comme sources pour trouver des copies" -#: diff.c:5408 +#: diff.c:5465 msgid "disable rename detection" msgstr "dรฉsactiver la dรฉtection de renommage" -#: diff.c:5411 +#: diff.c:5468 msgid "use empty blobs as rename source" msgstr "utiliser des blobs vides comme source de renommage" -#: diff.c:5413 +#: diff.c:5470 msgid "continue listing the history of a file beyond renames" msgstr "continuer ร afficher l'historique d'un fichier au delร des renommages" -#: diff.c:5416 +#: diff.c:5473 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2911,161 +3721,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:5418 +#: diff.c:5475 msgid "Diff algorithm options" msgstr "Options de l'algorithme de diff" -#: diff.c:5420 +#: diff.c:5477 msgid "produce the smallest possible diff" msgstr "produire le diff le plus petit possible" -#: diff.c:5423 +#: diff.c:5480 msgid "ignore whitespace when comparing lines" msgstr "ignorer les espaces lors de la comparaison de ligne" -#: diff.c:5426 +#: diff.c:5483 msgid "ignore changes in amount of whitespace" msgstr "ignorer des modifications du nombre d'espaces" -#: diff.c:5429 +#: diff.c:5486 msgid "ignore changes in whitespace at EOL" msgstr "ignorer des modifications d'espace en fin de ligne" -#: diff.c:5432 +#: diff.c:5489 msgid "ignore carrier-return at the end of line" msgstr "ignore le retour chariot en fin de ligne" -#: diff.c:5435 +#: diff.c:5492 msgid "ignore changes whose lines are all blank" msgstr "ignorer les modifications dont les lignes sont vides" -#: diff.c:5438 +#: diff.c:5495 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:5441 +#: diff.c:5498 msgid "generate diff using the \"patience diff\" algorithm" msgstr "gรฉnรฉrer un diff en utilisant l'algorithme de diffรฉrence \"patience\"" -#: diff.c:5445 +#: diff.c:5502 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" "gรฉnรฉrer un diff en utilisant l'algorithme de diffรฉrence \"histogramme\"" -#: diff.c:5447 +#: diff.c:5504 msgid "<algorithm>" msgstr "<algorithme>" -#: diff.c:5448 +#: diff.c:5505 msgid "choose a diff algorithm" msgstr "choisir un algorithme de diffรฉrence" -#: diff.c:5450 +#: diff.c:5507 msgid "<text>" msgstr "<texte>" -#: diff.c:5451 +#: diff.c:5508 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "gรฉnรฉrer un diff en utilisant l'algorithme de diffรฉrence \"ancrรฉ\"" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5510 diff.c:5519 diff.c:5522 msgid "<mode>" msgstr "<mode>" -#: diff.c:5454 +#: diff.c:5511 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:5456 diff.c:5459 diff.c:5504 +#: diff.c:5513 diff.c:5516 diff.c:5561 msgid "<regex>" msgstr "<regex>" -#: diff.c:5457 +#: diff.c:5514 msgid "use <regex> to decide what a word is" msgstr "utiliser <regex> pour dรฉcider ce qu'est un mot" -#: diff.c:5460 +#: diff.c:5517 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "รฉquivalent ร --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5463 +#: diff.c:5520 msgid "moved lines of code are colored differently" msgstr "les lignes dรฉplacรฉes sont colorรฉes diffรฉremment" -#: diff.c:5466 +#: diff.c:5523 msgid "how white spaces are ignored in --color-moved" msgstr "comment les espaces sont ignorรฉs dans --color-moved" -#: diff.c:5469 +#: diff.c:5526 msgid "Other diff options" msgstr "Autres options diff" -#: diff.c:5471 +#: diff.c:5528 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:5475 +#: diff.c:5532 msgid "treat all files as text" msgstr "traiter les fichiers comme texte" -#: diff.c:5477 +#: diff.c:5534 msgid "swap two inputs, reverse the diff" msgstr "รฉchanger les entrรฉes, inverser le diff" -#: diff.c:5479 +#: diff.c:5536 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:5481 +#: diff.c:5538 msgid "disable all output of the program" msgstr "dรฉsactiver tous les affichages du programme" -#: diff.c:5483 +#: diff.c:5540 msgid "allow an external diff helper to be executed" msgstr "autoriser l'exรฉcution d'un assistant externe de diff" -#: diff.c:5485 +#: diff.c:5542 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:5487 +#: diff.c:5544 msgid "<when>" msgstr "<quand>" -#: diff.c:5488 +#: diff.c:5545 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:5491 +#: diff.c:5548 msgid "<format>" msgstr "<format>" -#: diff.c:5492 +#: diff.c:5549 msgid "specify how differences in submodules are shown" msgstr "spรฉcifier comment les diffรฉrences dans les sous-modules sont affichรฉes" -#: diff.c:5496 +#: diff.c:5553 msgid "hide 'git add -N' entries from the index" msgstr "masquer les entrรฉes 'git add -N' de l'index" -#: diff.c:5499 +#: diff.c:5556 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:5501 +#: diff.c:5558 msgid "<string>" msgstr "<chaรฎne>" -#: diff.c:5502 +#: diff.c:5559 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3073,7 +3883,7 @@ msgstr "" "rechercher les diffรฉrences qui modifient le nombre d'occurrences de la " "chaรฎne spรฉcifiรฉe" -#: diff.c:5505 +#: diff.c:5562 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3081,26 +3891,26 @@ msgstr "" "rechercher les diffรฉrences qui modifient le nombre d'occurrences de la regex " "spรฉcifiรฉe" -#: diff.c:5508 +#: diff.c:5565 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:5511 +#: diff.c:5568 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "traiter <chaรฎne> dans -S comme une expression rationnelle POSIX รฉtendue" -#: diff.c:5514 +#: diff.c:5571 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:5515 +#: diff.c:5572 msgid "<object-id>" msgstr "<id-objet>" -#: diff.c:5516 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3108,35 +3918,35 @@ msgstr "" "rechercher les diffรฉrences qui modifient le nombre d'occurrences de l'objet " "indiquรฉ" -#: diff.c:5518 +#: diff.c:5575 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5576 msgid "select files by diff type" msgstr "sรฉlectionner les fichiers par types de diff" -#: diff.c:5521 +#: diff.c:5578 msgid "<file>" msgstr "<fichier>" -#: diff.c:5522 +#: diff.c:5579 msgid "Output to a specific file" msgstr "Sortie vers un fichier spรฉcifiรฉ" -#: diff.c:6177 +#: diff.c:6236 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:6180 +#: diff.c:6239 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:6183 +#: diff.c:6242 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3144,57 +3954,87 @@ msgstr "" "vous souhaitez peut-รชtre rรฉgler la variable %s ร au moins %d et rรฉessayer le " "commande." -#: dir.c:537 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "impossible de lire le fichier de commande '%s'" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "Dรฉtection de renommage inexact en cours" + +#: dir.c:578 #, 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:926 +#: dir.c:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "motif non reconnuย : '%s'" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "motif nรฉgatif non reconnuย : '%s'" + +#: dir.c:809 +#, 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:819 +msgid "disabling cone pattern matching" +msgstr "dรฉsactivation de la correspondance de motif de cone" + +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossible d'utiliser %s comme fichier d'exclusion" -#: dir.c:1843 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "impossible d'ouvrir le rรฉpertoire '%s'" -#: dir.c:2085 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2209 +#: dir.c:2729 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:3013 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "fichier d'index corrompu dans le dรฉpรดt %s" -#: dir.c:3058 dir.c:3063 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "impossible de crรฉer les rรฉpertoires pour %s" -#: dir.c:3092 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le rรฉpertoire git de '%s' vers '%s'" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" "suggestionย : en attente de la fermeture du fichier par votre รฉditeur de " "texteโฆ%c" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "Filtrage du contenu" -#: entry.c:476 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "impossible de stat le fichier '%s'" @@ -3204,7 +4044,7 @@ msgstr "impossible de stat le fichier '%s'" msgid "bad git namespace path \"%s\"" msgstr "Espaces de nom de Git \"%s\"" -#: environment.c:332 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "impossible de rรฉgler GIT_DIR ร '%s'" @@ -3214,266 +4054,288 @@ msgstr "impossible de rรฉgler GIT_DIR ร '%s'" msgid "too many args to run %s" msgstr "trop d'arguments pour lancer %s" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "Dรฉpรดt distant sans URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack : liste superficielle attendue" -#: fetch-pack.c:154 +#: fetch-pack.c:179 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:165 +#: fetch-pack.c:190 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:185 +#: fetch-pack.c:210 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack : ACK/NACK attendu, '%s' reรงu" -#: fetch-pack.c:196 +#: fetch-pack.c:221 msgid "unable to write to remote" msgstr "impossible d'รฉcrire sur un distant" -#: fetch-pack.c:258 +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nรฉcessite multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalideย : %s" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "objet non trouvรฉย : %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objetย : %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvรฉย : %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvรฉ" -#: fetch-pack.c:417 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "rรฉponse %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:448 #, c-format msgid "invalid commit %s" msgstr "commit invalide %s" -#: fetch-pack.c:465 +#: fetch-pack.c:479 msgid "giving up" msgstr "abandon" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:492 progress.c:339 msgid "done" msgstr "fait" -#: fetch-pack.c:489 +#: fetch-pack.c:504 #, c-format msgid "got %s (%d) %s" msgstr "%s trouvรฉ (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:540 #, c-format msgid "Marking %s as complete" msgstr "Marquage de %s comme terminรฉ" -#: fetch-pack.c:744 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "%s dรฉjร possรฉdรฉ (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:824 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-packย : impossible de dupliquer le dรฉmultiplexeur latรฉral" -#: fetch-pack.c:791 +#: fetch-pack.c:832 msgid "protocol error: bad pack header" msgstr "erreur de protocoleย : mauvais entรชte de paquet" -#: fetch-pack.c:859 +#: fetch-pack.c:916 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:875 +#: fetch-pack.c:933 #, c-format msgid "%s failed" msgstr "รฉchec de %s" -#: fetch-pack.c:877 +#: fetch-pack.c:935 msgid "error in sideband demultiplexer" msgstr "erreur dans le dรฉmultiplexer latรฉral" -#: fetch-pack.c:908 +#: fetch-pack.c:978 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: 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 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 #, c-format msgid "Server supports %s" msgstr "Le serveur supporte %s" -#: fetch-pack.c:915 +#: fetch-pack.c:985 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:975 +#: fetch-pack.c:1045 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gรจre pas --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:1050 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gรจre pas --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "Le receveur ne gรจre pas --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1056 +msgid "Server does not support this repository's object format" +msgstr "Le serveur ne supporte pas ce format d'objets de ce dรฉpรดt" + +#: fetch-pack.c:1069 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1081 fetch-pack.c:1619 msgid "git fetch-pack: fetch failed." msgstr "git fetch-packย : รฉchec de le rรฉcupรฉration." -#: fetch-pack.c:1151 +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "non-correspondance des algorithmesย : client %sย ; serveur %s" + +#: fetch-pack.c:1209 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "Le serveur ne supporte pas l'algorithme '%s'" + +#: fetch-pack.c:1229 msgid "Server does not support shallow requests" -msgstr "Le serveur ne supporte les requรชtes superficielles" +msgstr "Le serveur ne supporte pas les requรชtes superficielles" -#: fetch-pack.c:1157 +#: fetch-pack.c:1236 msgid "Server supports filter" msgstr "Le serveur supporte filter" -#: fetch-pack.c:1184 +#: fetch-pack.c:1275 msgid "unable to write request to remote" msgstr "impossible d'รฉcrire la requรชte sur le distant" -#: fetch-pack.c:1202 +#: fetch-pack.c:1293 #, c-format msgid "error reading section header '%s'" msgstr "erreur ร la lecture de l'entรชte de section '%s'" -#: fetch-pack.c:1208 +#: fetch-pack.c:1299 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' attendu, '%s' reรงu" -#: fetch-pack.c:1247 +#: fetch-pack.c:1360 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ligne d'acquittement inattendueย : '%s'" -#: fetch-pack.c:1252 +#: fetch-pack.c:1365 #, c-format msgid "error processing acks: %d" msgstr "erreur lors du traitement des acquittementsย : %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1375 msgid "expected packfile to be sent after 'ready'" msgstr "fichier paquet attendu ร envoyer aprรจs 'ready'" -#: fetch-pack.c:1264 +#: fetch-pack.c:1377 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:1306 +#: fetch-pack.c:1419 #, c-format msgid "error processing shallow info: %d" msgstr "erreur lors du traitement de l'information de superficialitรฉย : %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1466 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref attendu, '%s' trouvรฉ" -#: fetch-pack.c:1358 +#: fetch-pack.c:1471 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inattenduย : '%s'" -#: fetch-pack.c:1363 +#: fetch-pack.c:1476 #, c-format msgid "error processing wanted refs: %d" msgstr "erreur lors du traitement des rรฉfรฉrences vouluesย : %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1506 +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack : paquet de fin de rรฉponse attendu" + +#: fetch-pack.c:1887 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1910 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyรฉ tous les objets nรฉcessaires" -#: fetch-pack.c:1739 +#: fetch-pack.c:1937 #, c-format msgid "no such remote ref %s" msgstr "rรฉfรฉrence distante inconnue %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1940 #, 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:321 -msgid "gpg failed to sign the data" -msgstr "gpg n'a pas pu signer les donnรฉes" - -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "impossible de crรฉer un fichier temporaire" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "impossible d'รฉcrire la signature dรฉtachรฉe dans '%s'" -#: graph.c:97 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg n'a pas pu signer les donnรฉes" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "couleur invalide '%.*s' ignorรฉe dans log.graphColors" -#: grep.c:2117 +#: 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 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "รฉchec du stat de '%s'" -#: grep.c:2145 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquรฉe" @@ -3524,50 +4386,50 @@ msgid "Low-level Commands / Interrogators" msgstr "Commandes bas niveau / Interrogateurs" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Commandes bas niveau / Synchronisation de dรฉpรดts" #: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "Commandes bas niveau / Assistants internes" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "commandes git disponibles dans '%s'" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "Ci-dessous les commandes Git habituelles dans diverses situationsย :" -#: help.c:363 git.c:98 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "type de liste de commandes non supportรฉ '%s'" -#: help.c:403 -msgid "The common Git guides are:" -msgstr "Les guides Git populaires sont :" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Les guides des concepts de Git sont :" -#: help.c:512 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "" "Rรฉfรฉrez-vous ร 'git help <commande>' pour des informations sur une sous-" "commande spรฉcifique" -#: help.c:517 +#: help.c:434 msgid "External commands" msgstr "Commandes externes" -#: help.c:532 +#: help.c:449 msgid "Command aliases" msgstr "Alias de commande" -#: help.c:596 +#: help.c:513 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -3576,33 +4438,33 @@ msgstr "" "'%s' semble รชtre une commande git, mais elle n'a pas pu\n" "รชtre exรฉcutรฉe. Peut-รชtre git-%s est-elle cassรฉe ?" -#: help.c:655 +#: help.c:572 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ahem. Votre systรจme n'indique aucune commande Git." -#: help.c:677 +#: help.c:594 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" "ATTENTION : vous avez invoquรฉ une commande Git nommรฉe '%s' qui n'existe pas." -#: help.c:682 +#: help.c:599 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Continuons en supposant que vous avez voulu dire '%s'." -#: help.c:687 +#: help.c:604 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'." -#: help.c:695 +#: help.c:612 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'." -#: help.c:699 +#: help.c:616 msgid "" "\n" "The most similar command is" @@ -3616,16 +4478,16 @@ msgstr[1] "" "\n" "Les commandes les plus ressemblantes sont" -#: help.c:714 +#: help.c:656 msgid "git version [<options>]" msgstr "git version [<options>]" -#: help.c:782 +#: help.c:711 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:715 msgid "" "\n" "Did you mean this?" @@ -3639,7 +4501,15 @@ msgstr[1] "" "\n" "Vouliez-vous dire un de ceux-lร ?" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "Identitรฉ d'auteur inconnue\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "Indentitรฉ de validateur inconnue\n" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -3665,78 +4535,100 @@ msgstr "" "รliminez --global pour ne faire les rรฉglages que dans ce dรฉpรดt.\n" "\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "aucun courriel fourni et l'auto-dรฉtection est dรฉsactivรฉe" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "impossible de dรฉtecter automatiquement l'adresse ('%s' trouvรฉ)" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "aucun nom fourni et l'auto-dรฉtection est dรฉsactivรฉe" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "impossible de dรฉtecter automatiquement le nom ('%s' trouvรฉ)" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "nom d'identifiant vide (pour <%s>) non permis" -#: ident.c:421 +#: ident.c:439 #, c-format 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:611 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: list-objects.c:129 +#: list-objects-filter-options.c:81 +msgid "expected 'tree:<depth>'" +msgstr "attenduย : 'tree:<profondeur>'" + +#: list-objects-filter-options.c:96 +msgid "sparse:path filters support has been dropped" +msgstr "sparseย : le support des filtres de chemin a รฉtรฉ abandonnรฉ" + +#: list-objects-filter-options.c:109 #, 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" +msgid "invalid filter-spec '%s'" +msgstr "spรฉcificateur de filtre invalide '%s'" -#: list-objects.c:142 +#: list-objects-filter-options.c:125 #, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgid "must escape char in sub-filter-spec: '%c'" msgstr "" -"l'entrรฉe '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob" +"le caractรจre doit รชtre รฉchappรฉ dans le spรฉcificateur de sous-filtreย : '%c'" -#: 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-options.c:167 +msgid "expected something after combine:" +msgstr "quelque chose attendu aprรจs combineย :" -#: list-objects-filter-options.c:36 +#: list-objects-filter-options.c:249 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:361 +msgid "unable to upgrade repository format to support partial clone" +msgstr "" +"impossible de mettre ร jour le format de dรฉpรดt pour supporter les clones " +"partiels" -#: 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.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-options.c:94 +#: list-objects-filter.c:495 #, c-format -msgid "invalid filter-spec '%s'" -msgstr "spรฉcificateur de filtre invalide '%s'" +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:158 -msgid "cannot change partial clone promisor remote" -msgstr "impossible de modifier le prometteur distant de clone partiel" +#: list-objects.c:127 +#, 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" -#: lockfile.c:151 +#: list-objects.c:140 +#, 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 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "impossible de charger l'arbre racine pour le commit %s" + +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -3755,126 +4647,116 @@ msgstr "" "un processus git peut avoir plantรฉย :\n" "supprimez le fichier manuellement pour poursuivre." -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Impossible de crรฉer '%s.lock'ย : %s" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "impossible de lire le cache" - -#: 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" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "vidage attendu aprรจs les arguments ls-refs" -#: merge-recursive.c:322 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, 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:354 +#: merge-recursive.c:388 #, 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:437 -msgid "error building trees" -msgstr "erreur de construction des arbres" - -#: merge-recursive.c:863 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de crรฉer le chemin '%s' %s" -#: merge-recursive.c:874 +#: merge-recursive.c:885 #, 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:888 merge-recursive.c:907 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": peut-รชtre un conflit D/F ?" -#: merge-recursive.c:897 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:941 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:965 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "รฉchec ร l'ouverture de '%s'ย : %s" -#: merge-recursive.c:976 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "รฉchec ร la crรฉation du lien symbolique '%s'ย : %s" -#: merge-recursive.c:981 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:1177 +#: merge-recursive.c:1191 #, 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:1184 +#: merge-recursive.c:1198 #, 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:1191 +#: merge-recursive.c:1205 #, 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:1199 merge-recursive.c:1211 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Avance rapide du sous-module %s au commit suivantย :" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rapide du sous-module %s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1251 #, 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:1241 +#: merge-recursive.c:1255 #, 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:1242 +#: merge-recursive.c:1256 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:1245 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3891,33 +4773,33 @@ msgstr "" "\n" "qui acceptera cette suggestion.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1268 #, 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:1327 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "รchec ร l'exรฉcution de la fusion interne" -#: merge-recursive.c:1332 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s ร la base de donnรฉes" -#: merge-recursive.c:1364 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1387 +#: merge-recursive.c:1402 #, 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:1459 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3926,7 +4808,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:1464 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3935,7 +4817,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:1471 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3944,7 +4826,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:1476 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3953,41 +4835,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:1511 +#: merge-recursive.c:1526 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "renamed" msgstr "renommรฉ" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Refus de perdre le fichier modifiรฉ %s" -#: merge-recursive.c:1601 +#: merge-recursive.c:1587 #, 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:1659 +#: merge-recursive.c:1645 #, 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:1690 +#: merge-recursive.c:1676 #, 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:1695 +#: merge-recursive.c:1681 #, 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:1714 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3996,18 +4878,18 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1719 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (laissรฉ non rรฉsolu)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1805 #, 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:2035 +#: merge-recursive.c:2068 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4018,7 +4900,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:2067 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4027,7 +4909,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:2077 +#: merge-recursive.c:2110 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4036,7 +4918,7 @@ msgstr "" "CONFLIT (renommage implicite de rรฉpertoire)ย : impossible de transformer " "plusieurs chemins sur %sย ; les chemins concernรฉs sontย : %s" -#: merge-recursive.c:2169 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4045,7 +4927,7 @@ msgstr "" "CONFLIT (renommage/renommage) : renommage du rรฉpertoire %s->%s dans %s. " "Renommage de rรฉpertoire %s->%s dans %s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4054,52 +4936,52 @@ msgstr "" "AVERTISSEMENTย : ne renomme pas %s->%s dans %s, parce que %s lui-mรชme a รฉtรฉ " "renommรฉ." -#: merge-recursive.c:2938 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:2941 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modify" msgstr "modification" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modified" msgstr "modifiรฉ" -#: merge-recursive.c:3017 +#: merge-recursive.c:3052 msgid "content" msgstr "contenu" -#: merge-recursive.c:3021 +#: merge-recursive.c:3056 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:3044 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sautรฉ (fusion identique ร l'existant)" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3101 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:3067 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:3097 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutรดt comme %s" -#: merge-recursive.c:3179 +#: merge-recursive.c:3215 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4108,7 +4990,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:3182 +#: merge-recursive.c:3218 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4118,7 +5000,7 @@ msgstr "" "a รฉtรฉ renommรฉ dans %s, ce qui suggรจre qu'il devrait peut-รชtre รชtre dรฉplacรฉ " "vers %s." -#: merge-recursive.c:3186 +#: merge-recursive.c:3222 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4127,7 +5009,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:3189 +#: merge-recursive.c:3225 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4137,176 +5019,204 @@ 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:3303 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:3326 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "fichier/rรฉpertoire" -#: merge-recursive.c:3331 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "rรฉpertoire/fichier" -#: merge-recursive.c:3338 +#: merge-recursive.c:3374 #, 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:3347 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:3356 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLIT (ajout/ajout)ย : Conflit de fusion dans %s" -#: 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 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "Dรฉjร ร jour !" -#: merge-recursive.c:3414 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "รฉchec de fusion des arbres %s et %s" -#: merge-recursive.c:3513 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:3526 +#: merge-recursive.c:3563 #, 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:3565 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "la fusion n'a pas retournรฉ de commit" -#: merge-recursive.c:3631 +#: merge-recursive.c:3672 +#, 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:3769 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 msgid "Unable to write index." msgstr "Impossible d'รฉcrire l'index." -#: midx.c:69 +#: merge.c:41 +msgid "failed to read the cache" +msgstr "impossible de lire le cache" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "impossible d'รฉcrire le nouveau fichier d'index" + +#: midx.c:79 #, c-format msgid "multi-pack-index file %s is too small" msgstr "le fichier d'index multi-paquet %s est trop petit" -#: midx.c:85 +#: midx.c:95 #, 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:90 +#: midx.c:100 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "la version d'index multi-paquet %d n'est pas reconnue" -#: midx.c:95 +#: midx.c:105 #, c-format -msgid "hash version %u does not match" -msgstr "la version %u du condensรฉ ne correspond pas" +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "" +"la version d'empreinte d'index multi-paquet %u ne correspond pas ร la " +"version %u" -#: midx.c:109 +#: midx.c:122 msgid "invalid chunk offset (too large)" msgstr "dรฉcalage de section invalide (trop grand)" -#: midx.c:133 +#: midx.c:146 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:146 +#: midx.c:159 msgid "multi-pack-index missing required pack-name chunk" msgstr "index multi-paquet manque de tronรงon de nom de paquet" -#: midx.c:148 +#: midx.c:161 msgid "multi-pack-index missing required OID fanout chunk" msgstr "index multi-paquet manque de tronรงon de d'รฉtalement OID requis" -#: midx.c:150 +#: midx.c:163 msgid "multi-pack-index missing required OID lookup chunk" msgstr "index multi-paquet manque de tronรงon de recherche OID" -#: midx.c:152 +#: midx.c:165 msgid "multi-pack-index missing required object offsets chunk" msgstr "index multi-paquet manque de tronรงon de dรฉcalage d'objet" -#: midx.c:166 +#: midx.c:179 #, 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:211 +#: midx.c:222 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mauvais pack-int-idย : %u (%u paquets au total)" -#: midx.c:261 +#: midx.c:272 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" +"l'index multi-paquet stock un dรฉcalage en 64-bit, mais off_t est trop petit" -#: midx.c:289 +#: midx.c:300 msgid "error preparing packfile from multi-pack-index" msgstr "erreur ร la prรฉparation du fichier paquet depuis un index multi-paquet" -#: midx.c:470 +#: midx.c:485 #, c-format msgid "failed to add packfile '%s'" msgstr "รฉchec de l'ajout du fichier paquet '%s'" -#: midx.c:476 +#: midx.c:491 #, c-format msgid "failed to open pack-index '%s'" msgstr "รฉchec ร l'ouverture du fichier paquet '%s'" -#: midx.c:536 +#: midx.c:551 #, c-format msgid "failed to locate object %d in packfile" msgstr "รฉchec de localisation de l'objet %d dans le fichier paquet" -#: midx.c:865 +#: midx.c:853 +msgid "Adding packfiles to multi-pack-index" +msgstr "Ajout de fichiers paquet ร un index multi-paquet" + +#: midx.c:886 #, c-format msgid "did not see pack-file %s to drop" msgstr "fichier paquet ร รฉliminer %s non trouvรฉ" -#: midx.c:1036 +#: midx.c:938 +msgid "no pack files to index." +msgstr "Aucun fichier paquet ร l'index." + +#: midx.c:990 +msgid "Writing chunks to multi-pack-index" +msgstr "รcriture des sections dans l'index multi-paquet" + +#: midx.c:1068 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "รฉchec du nettoyage de l'index de multi-paquet ร %s" -#: midx.c:1091 +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "le fichier d'index multi-paquet existe mais n'a pu รชtre analysรฉ" + +#: midx.c:1132 msgid "Looking for referenced packfiles" msgstr "Recherche de fichiers paquets rรฉfรฉrencรฉs" -#: midx.c:1106 +#: midx.c:1147 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -4314,57 +5224,69 @@ msgstr "" "รฉtalement oid en dรฉsordreย : รฉtalement[%d] = %<PRIx32> > %<PRIx32> = " "รฉtalement[%d]" -#: midx.c:1110 -msgid "Verifying OID order in MIDX" -msgstr "Vรฉrification de l'ordre des OID dans MIDX" +#: midx.c:1152 +msgid "the midx contains no oid" +msgstr "le midx ne contient aucun oid" -#: midx.c:1119 +#: midx.c:1161 +msgid "Verifying OID order in multi-pack-index" +msgstr "Vรฉrification de l'ordre des OID dans l'index multi-paquet" + +#: midx.c:1170 #, 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:1138 +#: midx.c:1190 msgid "Sorting objects by packfile" msgstr "Classement des objets par fichier paquet" -#: midx.c:1144 +#: midx.c:1197 msgid "Verifying object offsets" msgstr "Vรฉrification des dรฉcalages des objets" -#: midx.c:1160 +#: midx.c:1213 #, 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:1166 +#: midx.c:1219 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "impossible de lire le fichier paquet %s" -#: midx.c:1175 +#: midx.c:1228 #, 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:1350 +#: midx.c:1253 +msgid "Counting referenced objects" +msgstr "Comptage des objets rรฉfรฉrencรฉs" + +#: midx.c:1263 +msgid "Finding and deleting unreferenced packfiles" +msgstr "Recherche et effacement des fichiers paquets non-rรฉfรฉrencรฉs" + +#: midx.c:1454 msgid "could not start pack-objects" msgstr "Impossible de dรฉmarrer le groupement d'objets" -#: midx.c:1369 +#: midx.c:1474 msgid "could not finish pack-objects" msgstr "Impossible de finir le groupement d'objets" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "impossible de crรฉer le fil lazy_dir : %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "impossible de crรฉer le fil lazy_name : %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "impossible de joindre le fil lazy_name : %s" @@ -4408,46 +5330,71 @@ 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:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "type d'objet invalide \"%s\"" -#: object.c:174 +#: object.c:173 #, 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:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "l'objet %s a un id de type inconnu %d" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "incohรฉrence de hachage %s" -#: packfile.c:648 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "impossible de rรฉcupรฉrer la taille de %s" + +#: packfile.c:630 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassรฉย ?)" -#: packfile.c:1899 +#: packfile.c:1922 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset avant le dรฉbut de l'index de paquet pour %s (index corrompuย ?)" -#: packfile.c:1903 +#: packfile.c:1926 #, c-format 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รฉย ?)" +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "l'option '%s' attend une valeur numรฉrique" + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "date d'expiration malformรฉeย : '%s'" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\"" + +#: parse-options-cb.c:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "nom d'objet malformรฉ '%s'" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4463,7 +5410,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:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "%s n'accepte aucune valeur" @@ -4473,41 +5420,46 @@ msgstr "%s n'accepte aucune valeur" msgid "%s isn't available" msgstr "%s n'est pas disponible" -#: parse-options.c:219 +#: parse-options.c:217 #, 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:389 +#: parse-options.c:386 #, 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:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, 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:859 +#: parse-options.c:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "alias pour --%s" + +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "option inconnue ยซย %sย ยป" -#: parse-options.c:861 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "bascule inconnue ยซย %cย ยป" -#: parse-options.c:863 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "option non-ascii inconnue dans la chaรฎneย : '%s'" -#: parse-options.c:887 +#: parse-options.c:890 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "usage : %s" @@ -4515,76 +5467,51 @@ msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:915 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:957 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:968 -#, c-format -msgid "alias of --%s" -msgstr "alias pour --%s" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "l'option '%s' attend une valeur numรฉrique" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "date d'expiration malformรฉeย : '%s'" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\"" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "nom d'objet malformรฉ '%s'" - -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "Impossible de rendre %s inscriptible pour le groupe" -#: pathspec.c:128 +#: pathspec.c:130 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:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Une seule spรฉcification 'attr:' est autorisรฉe." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "un spรฉcificateur d'attribut ne peut pas รชtre vide" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "nom d'attribut invalide %s" -#: pathspec.c:257 +#: pathspec.c:259 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:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4592,52 +5519,57 @@ 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:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "paramรจtre invalide pour le spรฉcificateur magique de chemin 'prefix'" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "La spรฉcification magique de chemin '%.*s' est invalide dans '%s'" -#: pathspec.c:330 +#: pathspec.c:332 #, 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:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Spรฉcificateur magique '%c' non implรฉmentรฉ dans '%s'" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s : 'literal' et 'glob' sont incompatibles" -#: pathspec.c:440 +#: pathspec.c:445 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s : '%s' est hors du dรฉpรดt" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s : '%s' est hors du dรฉpรดt ร '%s'" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (mnรฉmoniqueย : '%c')" -#: pathspec.c:524 +#: pathspec.c:531 #, 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:591 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "le chemin '%s' est au-delร d'un lien symbolique" +#: pathspec.c:643 +#, 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" @@ -4647,46 +5579,50 @@ msgid "unable to write delim packet" msgstr "impossible d'รฉcrire le paquet de dรฉlimitation" #: pkt-line.c:106 +msgid "unable to write stateless separator packet" +msgstr "impossible d'รฉcrire le paquet de sรฉparateur sans รฉtat" + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "รฉchec de l'รฉcriture du vidage de paquet" -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "erreur de protocoleย : ligne impossiblement trop longue" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "รฉchec de l'รฉcriture d'un paquet avec format" -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "" "รฉchec de l'รฉcriture d'un paquetย โ les donnรฉes dรฉpassent la taille maximale " "d'un paquet" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "รฉchec de l'รฉcriture d'un paquet" -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "erreur de lecture" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "L'hรดte distant a fermรฉ la connexion de maniรจre inattendue" -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "erreur de protocoleย : mauvais caractรจre de longueur de ligneย : %.4s" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "erreur de protocoleย : mauvaise longueur de ligne %d" -#: pkt-line.c:362 +#: pkt-line.c:373 sideband.c:150 #, c-format msgid "remote error: %s" msgstr "erreur distante : %s" @@ -4700,83 +5636,117 @@ 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:966 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: range-diff.c:70 +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "" +"promisor-remoteย : impossible de crรฉer un sous-processus de rรฉcupรฉration" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "" +"promisor-remoteย : impossible d'รฉcrire vers un sous-processus de rรฉcupรฉration" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" +"promisor-remoteย : impossible de fermer l'entrรฉe standard du sous-processus " +"de rรฉcupรฉration" + +#: promisor-remote.c:53 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "un nom de prometteur distant ne peut pas commencer par '/'ย : %s" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "Suppression des objets dupliquรฉs" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "impossible de dรฉmarrer `log`" -#: range-diff.c:72 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "impossible de lire la sortie de `log`" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:98 sequencer.c:5283 #, c-format msgid "could not parse commit '%s'" msgstr "impossible d'analyser le commit '%s'" -#: range-diff.c:117 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" +"impossible d'analyser la premiรจre ligne de la sortie de `log`ย : ne commence " +"pas par 'commit'ย : '%s'" + +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "impossible d'analyser l'entรชte git '%.*s'" -#: range-diff.c:274 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "รฉchec de la gรฉnรฉration de diff" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "pas d'ajout d'alias de fichier '%s'(ยซย %sย ยป existe dรฉjร dans l'index)" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "impossible de crรฉer un blob vide dans la base de donnรฉe d'objets" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%sย : ne peut ajouter que des fichiers normaux, des liens symboliques ou des " "rรฉpertoires git" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' n'a pas de commit extrait" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "indexation du fichier '%s' impossible" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "impossible d'ajouter '%s' ร l'index" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "fstat de '%s' impossible" -#: read-cache.c:1314 +#: read-cache.c:1318 #, 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:1499 +#: read-cache.c:1524 msgid "Refresh index" msgstr "Rafraรฎchir l'index" -#: read-cache.c:1613 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4785,7 +5755,7 @@ msgstr "" "version d'index renseignรฉe, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1623 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4794,150 +5764,161 @@ msgstr "" "GIT_INDEX_VERSION est renseignรฉ, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1679 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "signature incorrecte 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "mauvaise version d'index %d" -#: read-cache.c:1691 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "mauvaise signature sha1 d'index" -#: read-cache.c:1721 +#: read-cache.c:1747 #, 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:1723 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "extension %.4s ignorรฉe" -#: read-cache.c:1760 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "format d'entrรฉe d'index inconnu 0x%08x" -#: read-cache.c:1776 +#: read-cache.c:1802 #, 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:1833 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "entrรฉes de prรฉparation non ordonnรฉes dans l'index" -#: read-cache.c:1836 +#: read-cache.c:1862 #, 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:1839 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "entrรฉes de prรฉparation non ordonnรฉes pour '%s'" -#: 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 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: read-cache.c:2087 +#: read-cache.c:2115 #, 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:2100 +#: read-cache.c:2128 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "impossible de joindre le fil load_cach_entries : %s" -#: read-cache.c:2133 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "%sย : l'ouverture du fichier d'index a รฉchouรฉ" -#: read-cache.c:2137 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "%sย : impossible de faire un stat sur l'index ouvert" -#: read-cache.c:2141 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "%sย : fichier d'index plus petit qu'attendu" -#: read-cache.c:2145 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "%sย : impossible de mapper le fichier d'index" -#: read-cache.c:2187 +#: read-cache.c:2215 #, 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:2214 +#: read-cache.c:2242 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "impossible de joindre le fil load_index_extensions : %s" -#: read-cache.c:2246 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "impossible de rafraรฎchir l'index partagรฉ '%s'" -#: read-cache.c:2293 +#: read-cache.c:2321 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "index cassรฉ, %s attendu dans %s, %s obtenu" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" -#: read-cache.c:3105 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "impossible d'ouvrir le rรฉpertoire gitย : %s" -#: read-cache.c:3117 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "รฉchec lors de l'unlinkย : %s" -#: read-cache.c:3142 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "impossible de rรฉgler les bits de droit de '%s'" -#: read-cache.c:3291 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s : impossible de revenir ร l'รฉtape 0" -#: rebase-interactive.c:26 +#: 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 #, 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:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -4979,14 +5960,14 @@ msgstr "" "\n" "Vous pouvez rรฉordonner ces lignesย ; elles sont exรฉcutรฉes de haut en bas.\n" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, 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:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4995,7 +5976,7 @@ msgstr "" "Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un " "commit.\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5003,7 +5984,7 @@ msgstr "" "\n" "Si vous รฉliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5018,7 +5999,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5028,22 +6009,19 @@ msgstr "" "Cependant, si vous effacez tout, le rebasage sera annulรฉ.\n" "\n" -#: 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 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 #, c-format msgid "could not write '%s'" msgstr "impossible d'รฉcrire '%s'" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "impossible de copier '%s' vers '%s'." +msgid "could not write '%s'." +msgstr "impossible d'รฉcrire '%s'." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5052,7 +6030,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:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5070,125 +6048,15 @@ msgstr "" "Les comportements disponibles sontย : ignore, warn, error.\n" "\n" -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -msgstr "%s ne pointe pas sur un objet valide!" - -#: refs.c:667 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "symref pendant %s ignorรฉ" - -#: refs.c:669 ref-filter.c:2092 -#, c-format -msgid "ignoring broken ref %s" -msgstr "rรฉf cassรฉ %s ignorรฉ" - -#: refs.c:804 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "impossible d'ouvrir '%s' en รฉcritureย : %s" - -#: refs.c:814 refs.c:865 -#, c-format -msgid "could not read ref '%s'" -msgstr "impossible de lire la rรฉf '%s'" - -#: refs.c:820 -#, c-format -msgid "ref '%s' already exists" -msgstr "la rรฉfรฉrence '%s' existe dรฉjร " - -#: refs.c:825 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "id d'objet inattendu pendant l'รฉcriture de '%s'" - -#: 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 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" - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "id d'objet inattendu pendant la suppression de '%s'" - -#: refs.c:998 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "le journal pour la rรฉf %s contient un trou aprรจs %s" - -#: refs.c:1004 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "le journal pour la rรฉf %s s'arrรชte de maniรจre inattendue sur %s" - -#: refs.c:1063 -#, c-format -msgid "log for %s is empty" -msgstr "le journal pour la rรฉf %s est vide" - -#: refs.c:1155 -#, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "refus de mettre ร jour une rรฉf avec un nom cassรฉ '%s'" - -#: refs.c:1231 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "รฉchec de update_ref pour la rรฉf '%s'ย : %s" - -#: 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:2044 -msgid "ref updates forbidden inside quarantine environment" -msgstr "mises ร jour des rรฉfรฉrences interdites en environnement de quarantaine" - -#: refs.c:2140 refs.c:2170 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "'%s' existeย ; impossible de crรฉer '%s'" - -#: refs.c:2146 refs.c:2181 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 #, 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:1234 -#, c-format -msgid "could not remove reference %s" -msgstr "impossible de supprimer la rรฉfรฉrence %s" - -#: 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:1251 refs/packed-backend.c:1545 -#, c-format -msgid "could not delete references: %s" -msgstr "impossible de supprimer les rรฉfรฉrencesย : %s" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "spรฉcificateur de rรฉference invalideย : '%s'" +msgid "could not read '%s'." +msgstr "impossible de lire '%s'." # ร priori on parle d'une branche ici -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "disparue" @@ -5207,283 +6075,372 @@ msgstr "en retard de %d" msgid "ahead %d, behind %d" msgstr "en avance de %d, en retard de %d" -#: ref-filter.c:162 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format attenduย : %%(color:<couleur>)" -#: ref-filter.c:164 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "couleur non reconnue : %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valeur entiรจre attendue refname:lstrip=%s" -#: ref-filter.c:190 +#: ref-filter.c:197 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valeur entiรจre attendue refname:rstrip=%s" -#: ref-filter.c:192 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argument %%(%s) non reconnuย : %s" -#: ref-filter.c:247 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) n'accepte pas d'argument" -#: ref-filter.c:269 +#: ref-filter.c:276 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "argument %%(objectsize) non reconnu : %s" -#: ref-filter.c:277 +#: ref-filter.c:284 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) n'accepte pas d'argument" -#: ref-filter.c:289 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) n'accepte pas d'argument" -#: ref-filter.c:298 +#: ref-filter.c:309 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) n'accepte pas d'argument" +msgid "unrecognized %%(subject) argument: %s" +msgstr "argument %%(subject) non reconnu : %s" -#: ref-filter.c:320 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argument %%(trailers) inconnuย : %s" -#: ref-filter.c:349 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argument %%(contents) non reconnu : %s" -#: ref-filter.c:366 +#: ref-filter.c:380 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "valeur positive attendue objectname:short=%s" +msgid "positive value expected '%s' in %%(%s)" +msgstr "valeur positive attendue '%s' dans %%(%s)" -#: ref-filter.c:370 +#: ref-filter.c:384 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "argument %%(objectname) non reconnu : %s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "argument '%s' non reconnu dans %%(%s)" -#: ref-filter.c:400 +#: ref-filter.c:398 +#, c-format +msgid "unrecognized email option: %s" +msgstr "option de courriel non reconnueย : %s" + +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format attenduย : %%(align:<largeur>,<position>)" -#: ref-filter.c:412 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "position non reconnueย : %s" -#: ref-filter.c:419 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "largeur non reconnueย : %s" -#: ref-filter.c:428 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argument %%(align) non reconnu : %s" -#: ref-filter.c:436 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" -#: ref-filter.c:454 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argument %%(if) non reconnuย : %s" -#: ref-filter.c:556 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformรฉ %.*s" -#: ref-filter.c:583 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "nom de champ inconnu : %.*s" -#: ref-filter.c:587 +#: ref-filter.c:615 #, 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:711 +#: ref-filter.c:739 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formatย : atome %%(if) utilisรฉ sans un atome %%(then)" -#: ref-filter.c:774 +#: ref-filter.c:802 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formatย : atome %%(then) utilisรฉ sans un atome %%(if)" -#: ref-filter.c:776 +#: ref-filter.c:804 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formatย : atome %%(then) utilisรฉ plus d'une fois" -#: ref-filter.c:778 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atome %%(then) utilisรฉ aprรจs %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:834 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formatย : atome %%(else) utilisรฉ sans un atome %%(if)" -#: ref-filter.c:808 +#: ref-filter.c:836 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formatย : atome %%(else) utilisรฉ sans un atome %%(then)" -#: ref-filter.c:810 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formatย : atome %%(else) utilisรฉ plus d'une fois" -#: ref-filter.c:825 +#: ref-filter.c:853 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formatย : atome %%(end) utilisรฉ sans atome correspondant" -#: ref-filter.c:882 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "Chaรฎne de formatage mal formรฉe %s" -#: ref-filter.c:1485 +#: ref-filter.c:1541 #, c-format msgid "no branch, rebasing %s" msgstr "aucune branche, rebasage de %s" -#: ref-filter.c:1488 +#: ref-filter.c:1544 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "aucune branche, rebasage de la HEAD dรฉtachรฉe %s" -#: ref-filter.c:1491 +#: ref-filter.c:1547 #, c-format msgid "no branch, bisect started on %s" msgstr "aucune branche, bisect a dรฉmarrรฉ sur %s" -#: ref-filter.c:1501 +#: ref-filter.c:1557 msgid "no branch" msgstr "aucune branche" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1591 ref-filter.c:1800 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1547 +#: ref-filter.c:1601 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "รฉchec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:1998 +#: ref-filter.c:2054 #, c-format msgid "malformed object at '%s'" msgstr "objet malformรฉ ร '%s'" -#: ref-filter.c:2087 +#: ref-filter.c:2143 #, c-format msgid "ignoring ref with broken name %s" msgstr "rรฉf avec un nom cassรฉ %s ignorรฉ" -#: ref-filter.c:2382 +#: ref-filter.c:2148 refs.c:657 #, c-format -msgid "format: %%(end) atom missing" -msgstr "format: atome %%(end) manquant" - -#: ref-filter.c:2482 -#, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "l'option ยซย %sย ยป est incompatible avec --merged" +msgid "ignoring broken ref %s" +msgstr "rรฉf cassรฉ %s ignorรฉ" -#: ref-filter.c:2485 +#: ref-filter.c:2464 #, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "l'option ยซย %sย ยป est incompatible avec --no-merged" +msgid "format: %%(end) atom missing" +msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2495 +#: ref-filter.c:2563 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformรฉ %s" -#: ref-filter.c:2500 +#: ref-filter.c:2568 #, c-format msgid "option `%s' must point to a commit" msgstr "l'option '%s' doit pointer sur un commit" -#: remote.c:363 +#: refs.c:264 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "%s ne pointe pas sur un objet valide!" + +#: refs.c:572 +#, c-format +msgid "could not retrieve `%s`" +msgstr "impossible de rรฉcupรฉrer `%s`" + +#: refs.c:579 +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "Nom de branche invalide : %s = %s" + +#: refs.c:655 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "symref pendant %s ignorรฉ" + +#: refs.c:892 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "le journal pour la rรฉf %s contient un trou aprรจs %s" + +#: refs.c:898 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "le journal pour la rรฉf %s s'arrรชte de maniรจre inattendue sur %s" + +#: refs.c:957 +#, c-format +msgid "log for %s is empty" +msgstr "le journal pour la rรฉf %s est vide" + +#: refs.c:1049 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "refus de mettre ร jour une rรฉf avec un nom cassรฉ '%s'" + +#: refs.c:1120 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "รฉchec de update_ref pour la rรฉf '%s'ย : %s" + +#: refs.c:1944 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "mises ร jour multiples pour la rรฉf '%s' non permises" + +#: refs.c:2024 +msgid "ref updates forbidden inside quarantine environment" +msgstr "mises ร jour des rรฉfรฉrences interdites en environnement de quarantaine" + +#: refs.c:2035 +msgid "ref updates aborted by hook" +msgstr "mises ร jour des rรฉfรฉrences annulรฉes par le crochet" + +#: refs.c:2135 refs.c:2165 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "'%s' existeย ; impossible de crรฉer '%s'" + +#: refs.c:2141 refs.c:2176 +#, 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:1228 +#, c-format +msgid "could not remove reference %s" +msgstr "impossible de supprimer la rรฉfรฉrence %s" + +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "Impossible de supprimer la rรฉfรฉrence %sย : %s" + +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#, c-format +msgid "could not delete references: %s" +msgstr "impossible de supprimer les rรฉfรฉrencesย : %s" + +#: refspec.c:167 +#, c-format +msgid "invalid refspec '%s'" +msgstr "spรฉcificateur de rรฉference invalideย : '%s'" + +#: remote.c:351 #, 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:410 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "plus d'un receivepack fournis, utilisation du premier" -#: remote.c:418 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "plus d'un uploadpack fournis, utilisation du premier" -#: remote.c:608 +#: remote.c:590 #, 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:612 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit ร la fois %s et %s" -#: remote.c:684 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "la clรฉ '%s' du modรจle n'a pas de '*'" -#: remote.c:694 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "la valeur '%s' du modรจle n'a pas de '*'" -#: remote.c:1000 +#: remote.c:1073 #, 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:1005 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5493,7 +6450,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5517,7 +6474,7 @@ msgstr "" "Aucune n'a fonctionnรฉ, donc abandon. Veuillez spรฉcifier une rรฉfรฉrence " "totalement qualifiรฉe." -#: remote.c:1040 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5528,7 +6485,7 @@ msgstr "" "Souhaitiez-vous crรฉer une nouvelle branche en poussant sur\n" "'%s:refs/heads/%s'ย ?" -#: remote.c:1045 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5539,7 +6496,7 @@ msgstr "" "Souhaitiez-vous crรฉer une nouvelle รฉtiquette en poussant sur\n" "'%s:refs/tags/%s'ย ?" -#: remote.c:1050 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5550,7 +6507,7 @@ msgstr "" "Souhaitiez-vous crรฉer un nouvel arbre en poussant sur\n" "'%s:refs/tags/%s'ย ?" -#: remote.c:1055 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5561,119 +6518,119 @@ msgstr "" "Souhaitiez-vous crรฉer un nouveau blob en poussant sur\n" "'%s:refs/tags/%s'ย ?" -#: remote.c:1091 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "'%s' ne peut pas รชtre rรฉsolue comme une branche" -#: remote.c:1102 +#: remote.c:1175 #, 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" +msgstr "suppression de '%s' impossibleย : la rรฉfรฉrence distante n'existe pas" -#: remote.c:1114 +#: remote.c:1187 #, 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:1121 +#: remote.c:1194 #, 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:1624 remote.c:1725 +#: remote.c:1703 remote.c:1804 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1633 +#: remote.c:1712 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1636 +#: remote.c:1715 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurรฉe pour la branche '%s'" -#: remote.c:1642 +#: remote.c:1721 #, 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:1657 +#: remote.c:1736 #, 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:1669 +#: remote.c:1748 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussรฉe" -#: remote.c:1679 +#: remote.c:1758 #, 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:1692 +#: remote.c:1771 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussรฉe n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1714 +#: remote.c:1793 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de rรฉsoudre une poussรฉe 'simple' pour une destination unique" -#: remote.c:1840 +#: remote.c:1922 #, c-format msgid "couldn't find remote ref %s" msgstr "impossible de trouver la rรฉfรฉrence distante %s" -#: remote.c:1853 +#: remote.c:1935 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Rรฉfรฉrence bizarre '%s' ignorรฉe localement" -#: remote.c:2016 +#: remote.c:2098 #, 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:2020 +#: remote.c:2102 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2023 +#: remote.c:2105 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Votre branche est ร jour avec '%s'.\n" -#: remote.c:2027 +#: remote.c:2109 #, 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:2030 +#: remote.c:2112 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (utilisez \"%s\" pour plus de dรฉtails)\n" -#: remote.c:2034 +#: remote.c:2116 #, 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:2040 +#: remote.c:2122 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2043 +#: remote.c:2125 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5685,11 +6642,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut รชtre mise ร jour " "en avance rapide.\n" -#: remote.c:2051 +#: remote.c:2133 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre ร jour votre branche locale)\n" -#: remote.c:2054 +#: remote.c:2136 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5704,12 +6661,12 @@ msgstr[1] "" "Votre branche et '%s' ont divergรฉ,\n" "et ont %d et %d commits diffรฉrents chacune respectivement.\n" -#: remote.c:2064 +#: remote.c:2146 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:2247 +#: remote.c:2337 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossible d'analyser le nom attendu d'objet '%s'" @@ -5724,7 +6681,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:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "profondeur de remplacement trop grande pour l'objet %s" @@ -5787,8 +6744,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:2023 builtin/log.c:1773 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "impossible de crรฉer le rรฉpertoire '%s'" @@ -5822,20 +6779,34 @@ 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:2507 +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "impossible de dรฉterminer la rรฉvision HEAD" + +#: reset.c:70 reset.c:76 sequencer.c:3426 +#, c-format +msgid "failed to find tree of %s" +msgstr "impossible de trouver l'arbre de %s" + +#: revision.c:2344 +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<fichier-paquet> n'est plus gรฉrรฉ" + +#: revision.c:2364 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "valeur inconnue pour --diff-mergesย : %s" + +#: revision.c:2702 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassรฉe" -#: revision.c:2510 +#: revision.c:2705 #, 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:2710 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent est incompatible avec --bisect" - -#: revision.c:2714 +#: revision.c:2915 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" @@ -5843,12 +6814,12 @@ msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s" msgid "open /dev/null failed" msgstr "รฉchec de l'ouverture de /dev/null" -#: run-command.c:1269 +#: run-command.c:1270 #, c-format msgid "cannot create async thread: %s" msgstr "impossible de crรฉer un fil asynchrone : %s" -#: run-command.c:1333 +#: run-command.c:1334 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5858,31 +6829,35 @@ msgstr "" "Vous pouvez dรฉsactiver cet avertissement avec `git config advice.ignoredHook " "false`." -#: send-pack.c:141 +#: send-pack.c:145 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:143 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "impossible d'analyser l'รฉtat de dรฉpaquetage distantย : %s" -#: send-pack.c:145 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "le dรฉpaquetage a รฉchouรฉย : %s" -#: send-pack.c:306 +#: send-pack.c:372 msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussรฉe" -#: send-pack.c:420 +#: send-pack.c:460 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "Le receveur ne gรจre pas l'algorithme d'empreinte de ce dรฉpรดt" + +#: send-pack.c:469 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gรจre pas les poussรฉes avec --signed" -#: send-pack.c:422 +#: send-pack.c:471 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5890,47 +6865,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:434 +#: send-pack.c:483 msgid "the receiving end does not support --atomic push" msgstr "Le receveur ne gรจre pas les poussรฉes avec --atomic" -#: send-pack.c:439 +#: send-pack.c:488 msgid "the receiving end does not support push options" msgstr "Le receveur ne gรจre pas les options de poussรฉes" -#: sequencer.c:187 +#: sequencer.c:194 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mode de nettoyage invalide de message de validation '%s'" -#: sequencer.c:292 +#: sequencer.c:308 #, c-format msgid "could not delete '%s'" msgstr "Impossible de supprimer '%s'" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "impossible de supprimer '%s'" -#: sequencer.c:321 +#: sequencer.c:339 msgid "revert" msgstr "revert" -#: sequencer.c:323 +#: sequencer.c:341 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:325 -msgid "rebase -i" -msgstr "rebase -i" +#: sequencer.c:343 +msgid "rebase" +msgstr "rebase" -#: sequencer.c:327 +#: sequencer.c:345 #, c-format msgid "unknown action: %d" msgstr "action inconnueย : %d" -#: sequencer.c:385 +#: sequencer.c:404 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5938,7 +6913,7 @@ msgstr "" "aprรจs rรฉsolution des conflits, marquez les chemins corrigรฉs\n" "avec 'git add <chemins>' ou 'git rm <chemins>'" -#: sequencer.c:388 +#: sequencer.c:407 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5948,115 +6923,109 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le rรฉsultat avec 'git commit'" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:420 sequencer.c:3028 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:408 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "impossible d'รฉcrire dans '%s'" + +#: sequencer.c:427 #, c-format msgid "could not write eol to '%s'" msgstr "impossible d'รฉcrire la fin de ligne dans '%s'" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 #, c-format msgid "failed to finalize '%s'" msgstr "รฉchec lors de la finalisation de '%s'" -#: 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:462 +#: sequencer.c:471 #, c-format msgid "your local changes would be overwritten by %s." msgstr "vos modifications locales seraient รฉcrasรฉes par %s." -#: sequencer.c:466 +#: sequencer.c:475 msgid "commit your changes or stash them to proceed." msgstr "validez vos modifications ou les remiser pour continuer." -#: sequencer.c:498 +#: sequencer.c:507 #, c-format msgid "%s: fast-forward" msgstr "%sย : avance rapide" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:546 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:632 +#: sequencer.c:640 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'รฉcrire le nouveau fichier index" -#: sequencer.c:649 +#: sequencer.c:657 msgid "unable to update cache tree" msgstr "impossible de mettre ร jour l'arbre de cache" -#: sequencer.c:663 +#: sequencer.c:671 msgid "could not resolve HEAD commit" msgstr "impossible de rรฉsoudre le commit HEAD" -#: sequencer.c:743 +#: sequencer.c:751 #, c-format msgid "no key present in '%.*s'" msgstr "aucune clรฉ prรฉsente dans '%.*s'" -#: sequencer.c:754 +#: sequencer.c:762 #, c-format msgid "unable to dequote value of '%s'" msgstr "Impossible de dรฉcoter la valeur de '%s'" -#: 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 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: sequencer.c:801 +#: sequencer.c:809 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' dรฉjร fourni" -#: sequencer.c:806 +#: sequencer.c:814 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' dรฉjร fourni" -#: sequencer.c:811 +#: sequencer.c:819 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' dรฉjร fourni" -#: sequencer.c:815 +#: sequencer.c:823 #, c-format msgid "unknown variable '%s'" msgstr "variable inconnue '%s'" -#: sequencer.c:820 +#: sequencer.c:828 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' manquant" -#: sequencer.c:822 +#: sequencer.c:830 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' manquant" -#: sequencer.c:824 +#: sequencer.c:832 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' manquant" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "format de date invalide '%s' dans '%s'" - -#: sequencer.c:901 +#: sequencer.c:897 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6085,15 +7054,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "รฉcriture du commit racine" - -#: sequencer.c:1216 +#: sequencer.c:1178 msgid "'prepare-commit-msg' hook failed" msgstr "รฉchec du crochet 'prepare-commit-msg'" -#: sequencer.c:1223 +#: sequencer.c:1184 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6122,7 +7087,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1197 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6148,326 +7113,339 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1239 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement crรฉรฉ" -#: sequencer.c:1280 +#: sequencer.c:1241 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement crรฉรฉ" -#: sequencer.c:1326 +#: sequencer.c:1287 msgid "unable to resolve HEAD after creating commit" msgstr "impossible de rรฉsoudre HEAD aprรจs crรฉation du commit" -#: sequencer.c:1328 +#: sequencer.c:1289 msgid "detached HEAD" msgstr "HEAD dรฉtachรฉe" -#: sequencer.c:1332 +#: sequencer.c:1293 msgid " (root-commit)" msgstr " (commit racine)" -#: sequencer.c:1353 +#: sequencer.c:1314 msgid "could not parse HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1355 +#: sequencer.c:1316 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s n'est pas un commit !" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1373 sequencer.c:2067 msgid "unable to parse commit author" msgstr "impossible d'analyser l'auteur du commit" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 msgid "git write-tree failed to write a tree" msgstr "git write-tree a รฉchouรฉ ร รฉcrire un arbre" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1417 sequencer.c:1535 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1446 sequencer.c:1478 +#, c-format +msgid "invalid author identity '%s'" +msgstr "identitรฉ d'auteur invalide '%s'" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "auteur corrompuย : information de date manquante" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 msgid "failed to write commit object" msgstr "รฉchec de l'รฉcriture de l'objet commit" -#: sequencer.c:1526 +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "impossible de mettre ร jour %s" + +#: sequencer.c:1567 #, c-format msgid "could not parse commit %s" msgstr "impossible d'analyser le commit %s" -#: sequencer.c:1531 +#: sequencer.c:1572 #, c-format msgid "could not parse parent commit %s" msgstr "impossible d'analyser le commit parent %s" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1655 sequencer.c:1766 #, c-format msgid "unknown command: %d" msgstr "commande inconnueย : %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1713 sequencer.c:1738 #, c-format msgid "This is a combination of %d commits." msgstr "Ceci est la combinaison de %d commits." -#: sequencer.c:1672 +#: sequencer.c:1723 msgid "need a HEAD to fixup" msgstr "une HEAD est nรฉcessaire ร la correction" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1725 sequencer.c:3338 msgid "could not read HEAD" msgstr "Impossible de lire HEAD" -#: sequencer.c:1676 +#: sequencer.c:1727 msgid "could not read HEAD's commit message" msgstr "impossible de lire le message de validation de HEAD" -#: sequencer.c:1682 +#: sequencer.c:1733 #, c-format msgid "cannot write '%s'" msgstr "impossible d'รฉcrire '%s'" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Ceci est le premier message de validationย :" -#: sequencer.c:1697 +#: sequencer.c:1748 #, c-format msgid "could not read commit message of %s" msgstr "impossible de lire le message de validation de %s" -#: sequencer.c:1704 +#: sequencer.c:1755 #, c-format msgid "This is the commit message #%d:" msgstr "Ceci est le message de validation numรฉro %dย :" -#: sequencer.c:1710 +#: sequencer.c:1761 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Le message de validation %d sera ignorรฉย :" -#: sequencer.c:1798 +#: sequencer.c:1849 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionnรฉ." -#: sequencer.c:1805 +#: sequencer.c:1856 msgid "cannot fixup root commit" msgstr "impossible de rรฉparer le commit racine" -#: sequencer.c:1824 +#: sequencer.c:1875 #, 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:1832 sequencer.c:1840 +#: sequencer.c:1883 sequencer.c:1891 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:1846 +#: sequencer.c:1897 #, 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:1865 +#: sequencer.c:1916 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:1930 +#: sequencer.c:1981 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:1985 +#: sequencer.c:2038 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:1986 +#: sequencer.c:2039 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:2045 +#: sequencer.c:2059 +#, 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:2117 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : รฉchec ร la lecture de l'index" -#: sequencer.c:2052 +#: sequencer.c:2124 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : รฉchec du rafraรฎchissement de l'index" -#: sequencer.c:2128 +#: sequencer.c:2201 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s n'accepte pas d'argumentย : '%s'" -#: sequencer.c:2137 +#: sequencer.c:2210 #, c-format msgid "missing arguments for %s" msgstr "argument manquant pour %s" -#: sequencer.c:2174 +#: sequencer.c:2241 #, c-format -msgid "could not parse '%.*s'" -msgstr "impossible d'analyser '%.*s'" +msgid "could not parse '%s'" +msgstr "impossible d'analyser '%s'" -#: sequencer.c:2228 +#: sequencer.c:2302 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalideย : %.*s" -#: sequencer.c:2239 +#: sequencer.c:2313 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit prรฉcรฉdent" -#: 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 +#: sequencer.c:2399 msgid "cancelling a cherry picking in progress" msgstr "annulation d'un picorage en cours" -#: sequencer.c:2330 +#: sequencer.c:2408 msgid "cancelling a revert in progress" msgstr "annulation d'un retour en cours" -#: sequencer.c:2364 +#: sequencer.c:2452 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:2366 +#: sequencer.c:2454 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisableย : '%s'" -#: sequencer.c:2371 +#: sequencer.c:2459 msgid "no commits parsed." msgstr "aucun commit analysรฉ." -#: sequencer.c:2382 +#: sequencer.c:2470 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:2384 +#: sequencer.c:2472 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:2466 +#: sequencer.c:2550 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %sย : %s" -#: sequencer.c:2553 +#: sequencer.c:2657 msgid "unusable squash-onto" msgstr "\"รฉcrase-sur\" inutilisable" -#: sequencer.c:2569 +#: sequencer.c:2677 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformรฉeย : %s" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2769 sequencer.c:4609 msgid "empty commit set passed" msgstr "l'ensemble de commits spรฉcifiรฉ est vide" -#: sequencer.c:2668 +#: sequencer.c:2786 msgid "revert is already in progress" msgstr "un retour est dรฉjร en cours" -#: sequencer.c:2670 +#: sequencer.c:2788 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "essayez \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2673 +#: sequencer.c:2791 msgid "cherry-pick is already in progress" msgstr "un picorage est dรฉjร en cours" -#: sequencer.c:2675 +#: sequencer.c:2793 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2689 +#: sequencer.c:2807 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de crรฉer le rรฉpertoire de sรฉquenceur '%s'" -#: sequencer.c:2704 +#: sequencer.c:2822 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2882 sequencer.c:4325 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2884 sequencer.c:2895 msgid "cannot resolve HEAD" msgstr "impossible de rรฉsoudre HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2886 sequencer.c:2930 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore crรฉรฉe" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2916 builtin/grep.c:745 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:2800 +#: sequencer.c:2918 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s'ย : %s" -#: sequencer.c:2801 +#: sequencer.c:2919 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:2807 +#: sequencer.c:2925 #, 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:2818 +#: sequencer.c:2936 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:2859 +#: sequencer.c:2977 msgid "no revert in progress" msgstr "Pas de retour en cours ?" -#: sequencer.c:2867 +#: sequencer.c:2986 msgid "no cherry-pick in progress" msgstr "aucun picorage en cours" -#: sequencer.c:2877 +#: sequencer.c:2996 msgid "failed to skip the commit" msgstr "รฉchec du saut de commit" -#: sequencer.c:2884 +#: sequencer.c:3003 msgid "there is nothing to skip" msgstr "il n'y a rien ร sauter" -#: sequencer.c:2887 +#: sequencer.c:3006 #, c-format msgid "" "have you committed already?\n" @@ -6476,21 +7454,16 @@ msgstr "" "Avez-vous dรฉjร validรฉย ?\n" "essayez \"git %s -continue\"" -#: sequencer.c:3011 sequencer.c:4015 -#, c-format -msgid "could not update %s" -msgstr "impossible de mettre ร jour %s" - -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3168 sequencer.c:4217 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:3066 +#: sequencer.c:3185 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3074 +#: sequencer.c:3193 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6509,27 +7482,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3203 #, c-format msgid "Could not apply %s... %.*s" msgstr "impossible d'appliquer %s... %.*s" -#: sequencer.c:3091 +#: sequencer.c:3210 #, c-format msgid "Could not merge %.*s" msgstr "Impossible de fusionner %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%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 "impossible de lire l'index" +#: sequencer.c:3240 +#, c-format +msgid "Executing: %s\n" +msgstr "Exรฉcutionย : %s\n" -#: sequencer.c:3136 +#: sequencer.c:3255 #, c-format msgid "" "execution failed: %s\n" @@ -6544,11 +7517,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3261 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:3148 +#: sequencer.c:3267 #, c-format msgid "" "execution succeeded: %s\n" @@ -6565,112 +7538,130 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3328 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom de label illรฉgal '%.*s'" -#: sequencer.c:3263 +#: sequencer.c:3382 msgid "writing fake root commit" msgstr "รฉcriture d'un commit racine bidon" -#: sequencer.c:3268 +#: sequencer.c:3387 msgid "writing squash-onto" msgstr "รฉcriture de 'รฉcraser-sur'" -#: 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:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "impossible d'รฉcrire l'index" - -#: sequencer.c:3351 +#: sequencer.c:3471 #, c-format msgid "could not resolve '%s'" msgstr "impossible de rรฉsoudre '%s'" -#: sequencer.c:3379 +#: sequencer.c:3502 msgid "cannot merge without a current revision" msgstr "impossible de fusionner avec une rรฉvision courante" -#: sequencer.c:3401 +#: sequencer.c:3524 #, c-format msgid "unable to parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:3410 +#: sequencer.c:3533 #, c-format msgid "nothing to merge: '%.*s'" msgstr "rien ร fusionnerย : '%.*s'" -#: sequencer.c:3422 +#: sequencer.c:3545 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:3437 +#: sequencer.c:3561 #, c-format msgid "could not get commit message of '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:3590 +#: sequencer.c:3730 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "impossible de seulement essayer de fusionner '%.*s'" -#: sequencer.c:3606 +#: sequencer.c:3746 msgid "merge: Unable to write new index file" msgstr "fusionย : Impossible d'รฉcrire le nouveau fichier index" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "Autoremisage impossible" + +#: sequencer.c:3823 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "rรฉponse de remisage inattendueย : '%s'" + +#: sequencer.c:3829 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "Impossible de crรฉer le rรฉpertoire pour '%s'" + +#: sequencer.c:3832 +#, c-format +msgid "Created autostash: %s\n" +msgstr "Autoremisage crรฉรฉ : %s\n" + +#: sequencer.c:3836 +msgid "could not reset --hard" +msgstr "impossible de rรฉinitialiser --hard" + +#: sequencer.c:3861 #, c-format msgid "Applied autostash.\n" msgstr "Autoremisage appliquรฉ.\n" -#: sequencer.c:3687 +#: sequencer.c:3873 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3876 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"L'application de l'autoremisage a provoquรฉ des conflits\n" +"%s\n" "Vos modifications sont ร l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" ร tout moment.\n" -#: sequencer.c:3751 -#, c-format -msgid "could not checkout %s" -msgstr "extraction de %s impossible" +#: sequencer.c:3881 +msgid "Applying autostash resulted in conflicts." +msgstr "L'application du remisage automatique a crรฉรฉ des conflits." -#: sequencer.c:3765 +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." +msgstr "" +"Un remisage automatique existeย ; crรฉation d'une nouvelle entrรฉe de remisage." + +#: sequencer.c:3974 #, c-format msgid "%s: not a valid OID" msgstr "%s n'est pas un OID valide" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "Impossible de dรฉtacher HEAD" -#: sequencer.c:3785 +#: sequencer.c:3994 #, c-format msgid "Stopped at HEAD\n" msgstr "arrรชt ร HEAD\n" -#: sequencer.c:3787 +#: sequencer.c:3996 #, c-format msgid "Stopped at %s\n" msgstr "Arrรชtรฉ ร %s\n" -#: sequencer.c:3795 +#: sequencer.c:4004 #, c-format msgid "" "Could not execute the todo command\n" @@ -6691,48 +7682,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "Rebasage (%d/%d)%s" + +#: sequencer.c:4095 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "arrรชt ร %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:4166 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:4003 +#: sequencer.c:4225 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:4008 +#: sequencer.c:4230 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:4022 +#: sequencer.c:4244 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre ร jour HEAD sur %s" -#: sequencer.c:4115 +#: sequencer.c:4304 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "Rebasage et mise ร jour de %s avec succรจs.\n" + +#: sequencer.c:4337 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaserย : vous avez des modifications non indexรฉes." -#: sequencer.c:4124 +#: sequencer.c:4346 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:4126 +#: sequencer.c:4348 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalideย : '%s'" -#: sequencer.c:4128 +#: sequencer.c:4350 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:4131 +#: sequencer.c:4353 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6742,69 +7743,64 @@ 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:4167 sequencer.c:4205 +#: sequencer.c:4389 sequencer.c:4428 #, c-format msgid "could not write file: '%s'" msgstr "impossible d'รฉcrire le fichierย : '%s'" -#: sequencer.c:4220 +#: sequencer.c:4444 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4451 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexรฉes." -#: sequencer.c:4328 +#: sequencer.c:4477 +#, c-format +msgid "invalid committer '%s'" +msgstr "validateur invalide '%s'" + +#: sequencer.c:4586 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:4332 +#: sequencer.c:4590 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise rรฉvision" -#: sequencer.c:4367 +#: sequencer.c:4625 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:4810 +#: sequencer.c:5102 msgid "make_script: unhandled options" msgstr "make_scriptย : options non gรฉrรฉes" -#: sequencer.c:4813 +#: sequencer.c:5105 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 +#: sequencer.c:5347 sequencer.c:5364 msgid "nothing to do" msgstr "rien ร faire" -#: sequencer.c:5114 +#: sequencer.c:5383 msgid "could not skip unnecessary pick commands" msgstr "impossible d'รฉviter les commandes de picorage non nรฉcessaires" -#: sequencer.c:5197 +#: sequencer.c:5480 msgid "the script was already rearranged." msgstr "le script a dรฉjร รฉtรฉ rรฉarrangรฉ." -#: setup.c:123 +#: setup.c:133 #, c-format -msgid "'%s' is outside repository" -msgstr "'%s' est hors du dรฉpรดt" +msgid "'%s' is outside repository at '%s'" +msgstr "'%s' est hors du dรฉpรดt ร '%s'" -#: setup.c:173 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6814,7 +7810,7 @@ msgstr "" "Utilisez 'git <commande> -- <chemin>...' pour spรฉcifier des chemins qui " "n'existent pas localement." -#: setup.c:186 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6825,14 +7821,14 @@ msgstr "" "Utilisez '--' pour sรฉparer les chemins des rรฉvisions, comme ceciย :\n" "'git <commande> [<rรฉvision>...] -- [<chemin>...]'" -#: setup.c:235 +#: setup.c:264 #, 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:254 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6843,94 +7839,99 @@ msgstr "" "Utilisez '--' pour sรฉparer les chemins des rรฉvisions, comme ceciย :\n" "'git <commande> [<rรฉvision>...] -- [<chemin>...]'" -#: setup.c:390 +#: setup.c:419 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:394 +#: setup.c:423 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:540 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dรฉpรดt git <= %d, %d trouvรฉe" -#: setup.c:548 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "extensions de dรฉpรดt inconnues trouvรฉesย :" -#: setup.c:567 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "" +"la version du dรฉpรดt est 0, mais des extensions uniquement v1 trouvรฉesย :" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "erreur ร l'ouverture de '%s'" -#: setup.c:569 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "trop gros pour รชtre une fichier .gitย : '%s'" -#: setup.c:571 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "erreur ร la lecture de %s" -#: setup.c:573 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "format de fichier git invalide : %s" -#: setup.c:575 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "aucun chemin dans le fichier gitย : %s" -#: setup.c:577 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "ce n'est pas un dรฉpรดt gitย : %s" -#: setup.c:676 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "'$%s' trop gros" -#: setup.c:690 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "ce n'est pas un dรฉpรดt git : '%s'" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "impossible de se dรฉplacer vers le rรฉpertoire (chdir) '%s'" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "impossible de revenir au rรฉpertoire de travail courant" -#: setup.c:851 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "รฉchec du stat de '%*s%s%s'" -#: setup.c:1083 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "Impossible d'accรฉder au rรฉpertoire de travail courant" -#: setup.c:1092 setup.c:1098 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "impossible de modifier en '%s'" -#: setup.c:1103 +#: setup.c:1245 #, 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:1109 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6941,7 +7942,7 @@ msgstr "" "Arrรชt ร la limite du systรจme de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "n'est pas dรฉfini)." -#: setup.c:1220 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6951,286 +7952,286 @@ msgstr "" "Le propriรฉtaire des fichiers doit toujours avoir les droits en lecture et " "รฉcriture." -#: setup.c:1264 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "รฉchec de l'ouverture ou au dup de /dev/null" -#: setup.c:1279 +#: setup.c:1424 msgid "fork failed" msgstr "รฉchec de la bifurcation" -#: setup.c:1284 +#: setup.c:1429 msgid "setsid failed" msgstr "รฉchec du setsid" -#: sha1-file.c:453 +#: sha1-file.c:470 #, 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:504 +#: sha1-file.c:521 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossible de normaliser le chemin d'objet alternatifย : %s" -#: sha1-file.c:576 +#: sha1-file.c:593 #, 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:583 +#: sha1-file.c:600 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossible de normaliser le rรฉpertoire d'objetย : %s" -#: sha1-file.c:626 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives" -#: sha1-file.c:644 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "lecture du fichier d'alternatives impossible" -#: sha1-file.c:651 +#: sha1-file.c:668 msgid "unable to move new alternates file into place" msgstr "impossible de dรฉplacer le nouveau fichier d'alternative" -#: sha1-file.c:686 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "le chemin '%s' n'existe pas" -#: sha1-file.c:712 +#: sha1-file.c:724 #, 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:718 +#: sha1-file.c:730 #, 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:724 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dรฉpรดt de rรฉfรฉrence '%s' est superficiel" -#: sha1-file.c:732 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dรฉpรดt de rรฉfรฉrence '%s' est greffรฉ" -#: sha1-file.c:792 +#: sha1-file.c:804 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "ligne invalide pendant l'analyse des refs alternativesย : %s" -#: sha1-file.c:944 +#: sha1-file.c:954 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "essai de mmap %<PRIuMAX> au delร de la limite %<PRIuMAX>" -#: sha1-file.c:969 +#: sha1-file.c:975 msgid "mmap failed" msgstr "รฉchec de mmap" -#: sha1-file.c:1133 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "le fichier objet %s est vide" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1274 sha1-file.c:2467 #, c-format msgid "corrupt loose object '%s'" msgstr "objet libre corrompu '%s'" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1276 sha1-file.c:2471 #, c-format msgid "garbage at end of loose object '%s'" msgstr "donnรฉes incorrectes ร la fin de l'objet libre '%s'" -#: sha1-file.c:1301 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "type d'objet invalide" -#: sha1-file.c:1385 +#: sha1-file.c:1402 #, 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:1388 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "impossible de dรฉpaqueter l'entรชte %s" -#: sha1-file.c:1394 +#: sha1-file.c:1411 #, 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:1397 +#: sha1-file.c:1414 #, c-format msgid "unable to parse %s header" msgstr "impossible d'analyser l'entรชte %s" -#: sha1-file.c:1588 +#: sha1-file.c:1641 #, c-format msgid "failed to read object %s" msgstr "impossible de lire l'objet %s" -#: sha1-file.c:1592 +#: sha1-file.c:1645 #, c-format msgid "replacement %s not found for %s" msgstr "remplacement %s non trouvรฉ pour %s" -#: sha1-file.c:1596 +#: sha1-file.c:1649 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objet libre %s (stockรฉ dans %s) est corrompu" -#: sha1-file.c:1600 +#: sha1-file.c:1653 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objet empaquetรฉ %s (stockรฉ dans %s) est corrompu" -#: sha1-file.c:1703 +#: sha1-file.c:1758 #, c-format msgid "unable to write file %s" msgstr "impossible d'รฉcrire le fichier %s" -#: sha1-file.c:1710 +#: sha1-file.c:1765 #, c-format msgid "unable to set permission to '%s'" msgstr "impossible de rรฉgler les droits de '%s'" -#: sha1-file.c:1717 +#: sha1-file.c:1772 msgid "file write error" msgstr "erreur d'รฉcriture d'un fichier" -#: sha1-file.c:1736 +#: sha1-file.c:1792 msgid "error when closing loose object file" msgstr "erreur en fermeture du fichier d'objet esseulรฉ" -#: sha1-file.c:1801 +#: sha1-file.c:1857 #, 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:1803 +#: sha1-file.c:1859 msgid "unable to create temporary file" msgstr "impossible de crรฉer un fichier temporaire" -#: sha1-file.c:1827 +#: sha1-file.c:1883 msgid "unable to write loose object file" msgstr "impossible d'รฉcrire le fichier d'objet esseulรฉ" -#: sha1-file.c:1833 +#: sha1-file.c:1889 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossible de compresser le nouvel objet %s (%d)" -#: sha1-file.c:1837 +#: sha1-file.c:1893 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "รฉchec de deflateEnd sur l'objet %s (%d)" -#: sha1-file.c:1841 +#: sha1-file.c:1897 #, c-format msgid "confused by unstable object source data for %s" msgstr "donnรฉes de source d'objet instable pour %s" -#: sha1-file.c:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1907 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "รฉchec de utime() sur %s" -#: sha1-file.c:1926 +#: sha1-file.c:1984 #, c-format msgid "cannot read object for %s" msgstr "impossible de lire l'objet pour %s" -#: sha1-file.c:1966 +#: sha1-file.c:2035 msgid "corrupt commit" msgstr "commit corrompu" -#: sha1-file.c:1974 +#: sha1-file.c:2043 msgid "corrupt tag" msgstr "รฉtiquette corrompue" -#: sha1-file.c:2073 +#: sha1-file.c:2143 #, c-format msgid "read error while indexing %s" msgstr "erreur de lecture ร l'indexation de %s" -#: sha1-file.c:2076 +#: sha1-file.c:2146 #, c-format msgid "short read while indexing %s" msgstr "lecture tronquรฉe pendant l'indexation de %s" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2219 sha1-file.c:2229 #, c-format msgid "%s: failed to insert into database" msgstr "%sย : รฉchec de l'insertion dans la base de donnรฉes" -#: sha1-file.c:2164 +#: sha1-file.c:2235 #, c-format msgid "%s: unsupported file type" msgstr "%sย : type de fichier non supportรฉ" -#: sha1-file.c:2188 +#: sha1-file.c:2259 #, c-format msgid "%s is not a valid object" msgstr "%s n'est pas un objet valide" -#: sha1-file.c:2190 +#: sha1-file.c:2261 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2288 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2478 sha1-file.c:2531 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "incohรฉrence de hachage pour %s (%s attendu)" -#: sha1-file.c:2431 +#: sha1-file.c:2502 #, c-format msgid "unable to mmap %s" msgstr "impossible de mmap %s" -#: sha1-file.c:2436 +#: sha1-file.c:2507 #, c-format msgid "unable to unpack header of %s" msgstr "impossible de dรฉpaqueter l'entรชte de %s" -#: sha1-file.c:2442 +#: sha1-file.c:2513 #, c-format msgid "unable to parse header of %s" msgstr "impossible d'analyser l'entรชte de %s" -#: sha1-file.c:2453 +#: sha1-file.c:2524 #, c-format msgid "unable to unpack contents of %s" msgstr "impossible de dรฉpaqueter le contenu de %s" -#: sha1-name.c:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "le SHA1 court %s est ambigu" -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Les candidats sontย :" -#: sha1-name.c:800 +#: 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" @@ -7254,44 +8255,112 @@ 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:1702 +#, 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:1708 +#, 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:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "le chemin '%s' n'existe pas dnas '%.*s'" + +#: sha1-name.c:1745 +#, 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:1761 +#, 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:1769 +#, 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:1771 +#, 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:1784 +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:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "nom d'objet invalide : '%.*s'." + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:848 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u Gio" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u Gio/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u Mio" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u Mio/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:867 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u Kio" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u Kio/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:875 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7299,13 +8368,50 @@ msgstr[0] "%u octet" msgstr[1] "%u octets" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:877 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u octet/s" msgstr[1] "%u octets/s" +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" +msgstr "impossible d'ouvrir '%s' en รฉcriture" + +#: strbuf.c:1175 +#, c-format +msgid "could not edit '%s'" +msgstr "impossible d'รฉditer '%s'" + +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "nom de sous-module suspicieux %s ignorรฉ" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "les valeurs nรฉgatives ne sont pas permises pour submodule.fetchJobs" + +#: submodule-config.c:402 +#, 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:499 +#, c-format +msgid "invalid value for %s" +msgstr "Valeur invalide pour %s" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "Impossible de mettre ร jour l'รฉlรฉment %s de .gitmodules" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7337,51 +8443,129 @@ 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:910 +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "mauvais argument --ignore-submodulesย : %s" + +#: submodule.c:816 +#, 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:919 #, 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:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1004 +#, 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:1127 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "le processus pour le sous-module '%s' a รฉchouรฉ" + +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "รchec de rรฉsolution de HEAD comme rรฉfรฉrence valide." -#: submodule.c:1481 +#: submodule.c:1167 +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "Poussรฉe du sous-module '%s'\n" + +#: submodule.c:1170 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "Impossible de pousser le sous-module '%s'\n" + +#: submodule.c:1462 #, c-format -msgid "Could not access submodule '%s'" -msgstr "Impossible d'accรฉder au sous-module '%s'" +msgid "Fetching submodule %s%s\n" +msgstr "Rรฉcupรฉration du sous-module %s%s\n" -#: submodule.c:1651 +#: submodule.c:1492 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "Impossible d'accรฉder au sous-module '%s'\n" + +#: submodule.c:1646 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"Erreurs pendant la rรฉcupรฉration du sous-moduleย :\n" +"%s" + +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' n'est pas reconnu comme dรฉpรดt git" -#: submodule.c:1789 +#: submodule.c:1688 +#, 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:1729 +#, 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:1804 #, 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:1802 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "impossible de lancer 'git status' dans le sous-module '%s'" -#: submodule.c:1817 +#: submodule.c:1832 #, 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:1907 +#: submodule.c:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "rรฉcursion impossible dans le sous-module '%s'" + +#: submodule.c:1880 +msgid "could not reset submodule index" +msgstr "impossible de rรฉinitialiser l'index du sous-module" + +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "le sous-module '%s' a un index sale" -#: submodule.c:1959 +#: submodule.c:1974 #, c-format msgid "Submodule '%s' could not be updated." msgstr "le sous-module '%s' n'a pas pu รชtre mis ร jour." -#: submodule.c:2007 +#: submodule.c:2042 +#, 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:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7389,12 +8573,17 @@ msgstr "" "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail " "n'est pas supportรฉ" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossible de trouve le nom pour le sous-module '%s'" -#: submodule.c:2026 +#: submodule.c:2079 +#, 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:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7405,208 +8594,84 @@ msgstr "" "'%s' sur\n" "'%s'\n" -#: submodule.c:2109 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "rรฉcursion impossible dans le sous-module '%s'" - -#: submodule.c:2153 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "impossible de dรฉmarrer ls-files dans .." -#: submodule.c:2192 +#: submodule.c:2254 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree a renvoyรฉ un code de retour inattendu %d" -#: submodule-config.c:232 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "nom de sous-module suspicieux %s ignorรฉ" - -#: 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: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:486 -#, c-format -msgid "invalid value for %s" -msgstr "Valeur invalide pour %s" - -#: submodule-config.c:755 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "Impossible de mettre ร jour l'รฉlรฉment %s de .gitmodules" - -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "รฉchec de la commande trailer '%s'" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valeur inconnue '%s' pour la clรฉ '%s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "plus d'un %s" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "symbole vide dans la ligne de fin '%.*s'" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "impossible de lire le fichier d'entrรฉe '%s'" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrรฉe standard" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "stat impossible de %s" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "%s n'est pas un fichier rรฉgulier" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "le fichier %s n'est pas inscriptible par l'utilisateur" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "impossible de crรฉer un fichier temporaire" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "impossible de renommer un fichier temporaire en %s" -#: transport.c:116 -#, c-format -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:142 -#, c-format -msgid "could not read bundle '%s'" -msgstr "impossible de lire la liasse '%s'" - -#: transport.c:208 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "transportย : option de profondeur invalide '%s'" - -#: 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:260 -msgid "server options require protocol version 2 or later" -msgstr "les options de serveur exigent une version 2 ou supรฉrieure" - -#: transport.c:625 -msgid "could not parse transport.color.* config" -msgstr "impossible d'analyser la configuration transport.color.*" - -#: transport.c:698 -msgid "support for protocol v2 not implemented yet" -msgstr "le support du protocole v2 n'est pas encore implantรฉ" - -#: transport.c:825 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "valeur inconnue pour la config '%s'ย : %s" - -#: transport.c:891 -#, c-format -msgid "transport '%s' not allowed" -msgstr "transport '%s' non permis" - -#: transport.c:945 -msgid "git-over-rsync is no longer supported" -msgstr "git-over-rsync n'est plus supportรฉ" - -#: transport.c:1040 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "" -"Les chemins suivants de sous-module contiennent des modifications\n" -"qui ne peuvent รชtre trouvรฉes sur aucun distantย :\n" - -#: transport.c:1044 -#, 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" -"Veuillez essayer\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"ou bien changez de rรฉpertoire et utilisez\n" -"\n" -"\tgit push\n" -"\n" -"pour les pousser vers un serveur distant.\n" -"\n" - -#: transport.c:1052 -msgid "Aborting." -msgstr "Abandon." - -#: 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:1340 transport-helper.c:645 -msgid "operation not supported by protocol" -msgstr "option non supportรฉe par le protocole" - -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:62 transport-helper.c:91 msgid "full write to remote helper failed" msgstr "รฉchec de l'รฉcriture totale sur l'assistant distant" -#: transport-helper.c:134 +#: transport-helper.c:145 #, c-format msgid "unable to find remote helper for '%s'" msgstr "Impossible de trouver un assistant distant pour '%s'" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" msgstr "" "impossible de dupliquer le descripteur de flux de sortie de l'assistant" -#: transport-helper.c:201 +#: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7615,172 +8680,279 @@ msgstr "" "capacitรฉ obligatoire inconnue %sย ; cet assistant distant requiert " "probablement une une nouvelle version de Git" -#: transport-helper.c:207 +#: transport-helper.c:220 msgid "this remote helper should implement refspec capability" msgstr "cet assistant distant devrait supporter la capacitรฉ refspec" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:287 transport-helper.c:429 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s a dit de maniรจre inattendueย : '%s'" -#: transport-helper.c:403 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "%s a aussi verrouillรฉ %s" -#: transport-helper.c:481 +#: transport-helper.c:497 msgid "couldn't run fast-import" msgstr "impossible de lancer fast-import" -#: transport-helper.c:504 +#: transport-helper.c:520 msgid "error while running fast-import" msgstr "erreur au lancement de fast-import" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:549 transport-helper.c:1226 #, c-format msgid "could not read ref %s" msgstr "impossible de lire la rรฉf %s" -#: transport-helper.c:578 +#: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" msgstr "rรฉponse inconnue ร connectย : %s" -#: transport-helper.c:600 +#: transport-helper.c:616 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:602 +#: transport-helper.c:618 msgid "invalid remote service path" msgstr "chemin de service distant invalide" -#: transport-helper.c:648 +#: transport-helper.c:661 transport.c:1428 +msgid "operation not supported by protocol" +msgstr "option non supportรฉe par le protocole" + +#: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" msgstr "impossible de se connecter au sous-service %s" -#: transport-helper.c:720 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "'option' sans directive 'ok/error' correspondante" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "ok/error attendu, l'assistant a dit '%s'" -#: transport-helper.c:773 +#: transport-helper.c:841 #, c-format msgid "helper reported unexpected status of %s" msgstr "l'assistant a renvoyรฉ un statut de retour inattendu %s" -#: transport-helper.c:834 +#: transport-helper.c:924 #, c-format msgid "helper %s does not support dry-run" msgstr "l'assistant %s ne gรจre pas dry-run" -#: transport-helper.c:837 +#: transport-helper.c:927 #, c-format msgid "helper %s does not support --signed" msgstr "l'assistant %s ne gรจre pas --signed" -#: transport-helper.c:840 +#: transport-helper.c:930 #, 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:847 +#: transport-helper.c:935 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "l'assistant %s ne gรจre pas --atomic" + +#: transport-helper.c:941 #, c-format msgid "helper %s does not support 'push-option'" msgstr "l'assistant %s ne gรจre pas 'push-option'" -#: transport-helper.c:945 +#: transport-helper.c:1040 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:950 +#: transport-helper.c:1045 #, c-format msgid "helper %s does not support 'force'" msgstr "l'assistant %s ne gรจre pas 'force'" -#: transport-helper.c:997 +#: transport-helper.c:1092 msgid "couldn't run fast-export" msgstr "impossible de lancer fast-export" -#: transport-helper.c:1002 +#: transport-helper.c:1097 msgid "error while running fast-export" msgstr "erreur au lancement de fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1122 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" 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" +"Vous devriez peut-รชtre spรฉcifier une branche.\n" + +#: transport-helper.c:1203 +#, c-format +msgid "unsupported object format '%s'" +msgstr "format d'objet non gรฉrรฉ '%s'" -#: transport-helper.c:1091 +#: transport-helper.c:1212 #, c-format msgid "malformed response in ref list: %s" msgstr "rรฉponse malformรฉe dans le liste de rรฉfsย : %s" -#: transport-helper.c:1244 +#: transport-helper.c:1364 #, c-format msgid "read(%s) failed" msgstr "รฉchec de read(%s)" -#: transport-helper.c:1271 +#: transport-helper.c:1391 #, c-format msgid "write(%s) failed" msgstr "รฉchec de write(%s)" -#: transport-helper.c:1320 +#: transport-helper.c:1440 #, c-format msgid "%s thread failed" msgstr "รฉchec du fil d'exรฉcution %s" -#: transport-helper.c:1324 +#: transport-helper.c:1444 #, c-format msgid "%s thread failed to join: %s" msgstr "รฉchec de jonction du fil d'exรฉcution %sย : %s" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1463 transport-helper.c:1467 #, 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:1384 +#: transport-helper.c:1504 #, c-format msgid "%s process failed to wait" msgstr "รฉchec du processus %s pour l'attente" -#: transport-helper.c:1388 +#: transport-helper.c:1508 #, c-format msgid "%s process failed" msgstr "รฉchec du processus %s" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1526 transport-helper.c:1535 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:33 +#: transport.c:116 +#, c-format +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 +#, c-format +msgid "could not read bundle '%s'" +msgstr "impossible de lire la liasse '%s'" + +#: transport.c:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transportย : option de profondeur invalide '%s'" + +#: transport.c:269 +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:270 +msgid "server options require protocol version 2 or later" +msgstr "les options de serveur exigent une version 2 ou supรฉrieure" + +#: transport.c:712 +msgid "could not parse transport.color.* config" +msgstr "impossible d'analyser la configuration transport.color.*" + +#: transport.c:785 +msgid "support for protocol v2 not implemented yet" +msgstr "le support du protocole v2 n'est pas encore implantรฉ" + +#: transport.c:919 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "valeur inconnue pour la config '%s'ย : %s" + +#: transport.c:985 +#, c-format +msgid "transport '%s' not allowed" +msgstr "transport '%s' non permis" + +#: transport.c:1038 +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync n'est plus supportรฉ" + +#: transport.c:1140 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"Les chemins suivants de sous-module contiennent des modifications\n" +"qui ne peuvent รชtre trouvรฉes sur aucun distantย :\n" + +#: transport.c:1144 +#, 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" +"Veuillez essayer\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"ou bien changez de rรฉpertoire et utilisez\n" +"\n" +"\tgit push\n" +"\n" +"pour les pousser vers un serveur distant.\n" +"\n" + +#: transport.c:1152 +msgid "Aborting." +msgstr "Abandon." + +#: transport.c:1297 +msgid "failed to push all needed submodules" +msgstr "รฉchec de la poussรฉe de tous les sous-modules nรฉcessaires" + +#: tree-walk.c:32 msgid "too-short tree object" msgstr "objet arbre trop court" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "mode invalide dans l'entrรฉe d'arbre" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "nom de fichier vide dans une entrรฉe de l'arbre" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "fichier arbre trop court" -#: unpack-trees.c:111 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7791,7 +8963,7 @@ msgstr "" "%%sVeuillez valider ou remiser vos modifications avant de basculer de " "branche." -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7801,7 +8973,7 @@ msgstr "" "l'extractionย :\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7811,7 +8983,7 @@ msgstr "" "fusionย :\n" "%%sVeuillez valider ou remiser vos modifications avant la fusion." -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7821,7 +8993,7 @@ msgstr "" "fusionย :\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7830,7 +9002,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:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7839,7 +9011,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient รฉcrasรฉes par %sย :\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7849,7 +9021,7 @@ msgstr "" "contenusย :\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7859,7 +9031,7 @@ msgstr "" "l'extractionย :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7868,7 +9040,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacรฉs par l'extractionย :\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7878,7 +9050,7 @@ msgstr "" "la fusionย :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7887,7 +9059,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacรฉs par la fusionย :\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7897,7 +9069,7 @@ msgstr "" "%sย :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7906,7 +9078,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacรฉs par %sย :\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7917,7 +9089,7 @@ msgstr "" "l'extractionย :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7927,7 +9099,7 @@ msgstr "" "Les fichiers suivants non suivis seraient รฉcrasรฉs par l'extractionย :\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7937,7 +9109,7 @@ msgstr "" "la fusionย :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7946,7 +9118,7 @@ msgstr "" "Les fichiers suivants non suivis seraient รฉcrasรฉs par la fusionย :\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7956,7 +9128,7 @@ msgstr "" "%sย :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7965,62 +9137,71 @@ msgstr "" "Les fichiers suivants non suivis seraient รฉcrasรฉs par %sย :\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrรฉe '%s' surcharge avec '%s'. Affectation impossible." -#: unpack-trees.c:173 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -"Mise ร jour d'extraction creuse impossibleย : les entrรฉes suivantes ne sont " -"pas ร jourย :\n" +"Mise ร jour impossible pour le sous-moduleย :\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"Les fichiers suivants de la copie de travail seraient รฉcrasรฉs par la mise ร " -"jour par l'extraction creuseย :\n" +"Les chemins suivants ne sont pas ร jour et ont รฉtรฉ laissรฉs malgrรฉ les motifs " +"clairsemรฉsย :\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"Les fichiers suivants de la copie de travail seraient supprimรฉs par la mise " -"ร jour par extraction creuseย :\n" +"Les chemins suivants ne sont pas fusionnรฉs et ont รฉtรฉ laissรฉs malgrรฉ les " +"motifs clairsemรฉsย :\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"Mise ร jour impossible pour le sous-moduleย :\n" +"Les chemins suivants รฉtaient dรฉjร prรฉsents et ont รฉtรฉ laissรฉs malgrรฉ les " +"motifs clairsemรฉsย :\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "Abandon\n" -#: unpack-trees.c:318 +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" +"Aprรจs correction des chemins ci-dessus, vous voulez peut-รชtre lancer `git " +"sparse-checkout reapply`.\n" + +#: unpack-trees.c:350 msgid "Updating files" msgstr "Mise ร jour des fichiers" -#: unpack-trees.c:350 +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8030,6 +9211,14 @@ 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:1498 +msgid "Updating index flags" +msgstr "Mise ร jour des drapeaux de l'index" + +#: upload-pack.c:1516 +msgid "expected flush after fetch arguments" +msgstr "vidage attendu aprรจs les arguments de rรฉcupรฉration" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "nom de schรฉma d'URL invalide ou suffixe '://' manquant" @@ -8059,50 +9248,90 @@ msgstr "numรฉro de port invalide" msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" -#: worktree.c:258 builtin/am.c:2095 +#: walker.c:170 +msgid "Fetching objects" +msgstr "Rรฉcupรฉration des objets" + +#: worktree.c:236 builtin/am.c:2116 #, c-format msgid "failed to read '%s'" msgstr "รฉchec de la lecture de '%s'" -#: worktree.c:304 +#: worktree.c:283 #, 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:315 +#: worktree.c:294 #, 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:327 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "'%s' n'existe pas" -#: worktree.c:333 +#: worktree.c:312 #, 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:341 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' ne pointe pas en retour sur '%s'" -#: wrapper.c:223 wrapper.c:393 +#: worktree.c:587 +msgid "not a directory" +msgstr "pas un rรฉpertoire" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr ".git n'est pas un fichier" + +#: worktree.c:598 +msgid ".git file broken" +msgstr "fichier .git cassรฉ" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr "fichier .git incorrect" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "pas un chemin valide" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "impossible de localiser le dรฉpรดtย ; .git n'est pas un fichier" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "impossible de localiser le dรฉpรดtย ; fichier .git cassรฉ" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "gitdir non lisible" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "gitdir incorrect" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "impossible d'ouvrir '%s' en lecture/รฉcriture" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accรฉder ร '%s'" -#: wrapper.c:632 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "impossible d'accรฉder au rรฉpertoire de travail courant" @@ -8139,11 +9368,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme rรฉsolu)" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "Modifications qui seront validรฉes :" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validรฉes :" @@ -8176,94 +9405,94 @@ msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validรฉ)" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "supprimรฉ des deux cรดtรฉs :" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "ajoutรฉ par nous :" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "supprimรฉ par eux :" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "ajoutรฉ par eux :" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "supprimรฉ par nous :" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "ajoutรฉ de deux cรดtรฉs :" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "modifiรฉ des deux cรดtรฉs :" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "nouveau fichierย :" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "copiรฉย :" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "supprimรฉย :" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "modifiรฉย :" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "renommรฉย :" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "modif. typeย :" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "inconnuย :" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "non fusionnรฉย :" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "nouveaux commits, " -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "contenu modifiรฉ, " -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:906 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Votre remisage contient actuellement %d entrรฉe" msgstr[1] "Votre remisage contient actuellement %d entrรฉes" -#: wt-status.c:938 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiรฉs mais non mis ร jour :" -#: wt-status.c:940 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module ร valider :" -#: wt-status.c:1022 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -8271,7 +9500,7 @@ msgstr "" "Ne touchez pas ร la ligne ci-dessus.\n" "Tout ce qui suit sera รฉliminรฉ." -#: wt-status.c:1114 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -8283,107 +9512,107 @@ msgstr "" "de la branche.\n" "Vous pouvez utiliser '--no-ahead-behind' pour รฉviter ceci.\n" -#: wt-status.c:1144 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnรฉs." -#: wt-status.c:1147 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr " (rรฉglez les conflits puis lancez \"git commit\")" -#: wt-status.c:1149 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)" -#: wt-status.c:1153 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont rรฉglรฉs mais la fusion n'est pas terminรฉe." -#: wt-status.c:1156 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:1165 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "Vous รชtes au milieu d'une session am." -#: wt-status.c:1168 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:1172 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rรฉglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:1174 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:1176 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1309 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo est manquant." -#: wt-status.c:1311 +#: wt-status.c:1307 msgid "No commands done." msgstr "Aucune commande rรฉalisรฉe." -#: wt-status.c:1314 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Derniรจre commande effectuรฉe (%d commande effectuรฉe)ย :" msgstr[1] "Derniรจres commandes effectuรฉes (%d commandes effectuรฉes)ย :" -#: wt-status.c:1325 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " (voir plus dans le fichier %s)" -#: wt-status.c:1330 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "Aucune commande restante." -#: wt-status.c:1333 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prochaine commande ร effectuer (%d commande restante)ย :" msgstr[1] "Prochaines commandes ร effectuer (%d commandes restantes)ย :" -#: wt-status.c:1341 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (utilisez \"git rebase --edit-todo\" pour voir et รฉditer)" -#: wt-status.c:1353 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous รชtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1358 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "Vous รชtes en train de rebaser." -#: wt-status.c:1371 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rรฉglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1373 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1375 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1382 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont rรฉglรฉs : lancez \"git rebase --continue\")" -#: wt-status.c:1386 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -8391,86 +9620,94 @@ msgstr "" "Vous รชtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1391 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous รชtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1394 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyรฉe, lancez \"git rebase --continue\")" -#: wt-status.c:1398 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous รชtes actuellement en train d'รฉditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:1403 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous รชtes actuellement en train d'รฉditer un commit pendant un rebasage." -#: wt-status.c:1406 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1408 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous avez effectuรฉ toutes vos " "modifications)" -#: wt-status.c:1419 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "Picorage en cours." -#: wt-status.c:1422 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous รชtes actuellement en train de picorer le commit %s." -#: wt-status.c:1429 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rรฉglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1432 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (lancez \"git cherry-pick --continue\" pour continuer)" -#: wt-status.c:1435 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont rรฉglรฉs : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1437 +#: wt-status.c:1433 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (utilisez \"git cherry-pick --skip\" pour sauter ce patch)" + +#: wt-status.c:1435 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:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "Rรฉtablissement en cours." -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous รชtes actuellement en train de rรฉtablir le commit %s." -#: wt-status.c:1456 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rรฉglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr " (lancez \"git revert --continue\" pour continuer)" -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont rรฉglรฉs : lancez \"git revert --continue\")" +#: wt-status.c:1462 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (utilisez \"git revert --skip\" pour sauter ce patch)" + #: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rรฉtablissement)" @@ -8488,39 +9725,46 @@ msgstr "Vous รชtes en cours de bissection." 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:1690 +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "" +"Vous รชtes dans une extraction partielle avec %dย %% de fichiers suivis " +"prรฉsents." + +#: wt-status.c:1731 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1697 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1699 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1709 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1726 +#: wt-status.c:1767 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1727 +#: wt-status.c:1768 msgid "No commits yet" msgstr "Aucun commit" -#: wt-status.c:1741 +#: wt-status.c:1782 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1743 +#: wt-status.c:1784 msgid "Ignored files" msgstr "Fichiers ignorรฉs" -#: wt-status.c:1747 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8532,32 +9776,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-mรชme (voir 'git help " "status')." -#: wt-status.c:1753 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichรฉs%s" -#: wt-status.c:1755 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1761 +#: wt-status.c:1802 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1766 +#: wt-status.c:1807 #, 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:1769 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutรฉe ร la validation\n" -#: wt-status.c:1772 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8566,195 +9810,204 @@ 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:1775 +#: wt-status.c:1819 #, 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:1778 +#: wt-status.c:1823 #, 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:1781 wt-status.c:1786 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "rien ร valider\n" -#: wt-status.c:1784 +#: wt-status.c:1830 #, 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:1788 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien ร valider, la copie de travail est propre\n" -#: wt-status.c:1901 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "Encore aucun commit sur " -#: wt-status.c:1905 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1936 +#: wt-status.c:1975 msgid "different" msgstr "diffรฉrent" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "derriรจre " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "Impossible de %sย : vous avez des modifications non indexรฉes." -#: wt-status.c:2472 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validรฉes." -#: wt-status.c:2474 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossibleย : votre index contient des modifications non validรฉes." -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#, c-format +msgid "failed to unlink '%s'" +msgstr "รฉchec pour dรฉlier '%s'" + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<options>] [--] <chemin>..." -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "รฉtat de diff inattendu %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "รฉchec de la mise ร jour des fichiers" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "suppression de '%s'\n" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexรฉes aprรจs rafraรฎchissement de l'index :" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:272 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "Impossible de lire l'index" -#: builtin/add.c:245 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossible d'ouvrir '%s' en รฉcriture." -#: builtin/add.c:249 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "Impossible d'รฉcrire le patch" -#: builtin/add.c:252 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "รฉchec de l'รฉdition du patch" -#: builtin/add.c:255 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" -#: builtin/add.c:257 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." -#: builtin/add.c:262 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" -#: builtin/add.c:270 +#: builtin/add.c:308 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: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 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:293 +#: builtin/add.c:331 msgid "interactive picking" msgstr "sรฉlection interactive" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 msgid "select hunks interactively" msgstr "sรฉlection interactive des sections" -#: builtin/add.c:295 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "รฉdition du diff actuel et application" -#: builtin/add.c:296 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorรฉs" -#: builtin/add.c:297 +#: builtin/add.c:335 msgid "update tracked files" msgstr "mettre ร jour les fichiers suivis" -#: builtin/add.c:298 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)" -#: builtin/add.c:299 +#: builtin/add.c:337 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:300 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" -#: builtin/add.c:303 +#: builtin/add.c:341 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:305 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraรฎchir l'index" -#: builtin/add.c:306 +#: builtin/add.c:344 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:307 +#: builtin/add.c:345 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:309 builtin/update-index.c:1001 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exรฉcutable pour les fichiers listรฉs" -#: builtin/add.c:311 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "avertir lors de l'ajout d'un dรฉpรดt embarquรฉ" -#: builtin/add.c:326 +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "backend pour `git stash -p`" + +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8785,154 +10038,183 @@ msgstr "" "\n" "Rรฉfรฉrez-vous ร \"git help submodule\" pour plus d'information." -#: builtin/add.c:354 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "dรฉpรดt git embarquรฉ ajoutรฉย : %s" -#: 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:416 +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:379 +#: builtin/add.c:425 msgid "adding files failed" msgstr "รฉchec de l'ajout de fichiers" -#: builtin/add.c:419 +#: builtin/add.c:453 builtin/commit.c:345 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--pathspec-from-file est incompatible avec --interactive/--patch" + +#: builtin/add.c:470 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file est incompatible avec --edit" + +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "-A et -u sont mutuellement incompatibles" -#: builtin/add.c:426 +#: builtin/add.c:485 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:430 +#: builtin/add.c:489 #, 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:445 +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "--pathspec-from-file est incompatible avec pathspec arguments" + +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul nรฉcessite --pathspec-from-file" + +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spรฉcifiรฉ, rien n'a รฉtรฉ ajoutรฉ.\n" -#: builtin/add.c:446 +#: builtin/add.c:520 +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/am.c:160 #, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Vous vouliez sรปrement dire 'git add .' ?\n" +msgid "invalid committer: %s" +msgstr "validateur invalideย : %s" -#: builtin/am.c:348 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "impossible d'analyser l'auteur du script" -#: builtin/am.c:432 +#: builtin/am.c:450 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' a รฉtรฉ effacรฉ par le crochet applypatch-msg" -#: builtin/am.c:474 +#: builtin/am.c:492 #, c-format msgid "Malformed input line: '%s'." msgstr "Ligne en entrรฉe malformรฉe : '%s'." -#: builtin/am.c:512 +#: builtin/am.c:530 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Impossible de copier les notes de '%s' vers '%s'" -#: builtin/am.c:538 +#: builtin/am.c:556 msgid "fseek failed" msgstr "รฉchec de fseek" -#: builtin/am.c:726 +#: builtin/am.c:744 #, c-format msgid "could not parse patch '%s'" msgstr "impossible d'analyser le patch '%s'" -#: builtin/am.c:791 +#: builtin/am.c:809 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:839 +#: builtin/am.c:857 msgid "invalid timestamp" msgstr "horodatage invalide" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:862 builtin/am.c:874 msgid "invalid Date line" msgstr "ligne de Date invalide" -#: builtin/am.c:851 +#: builtin/am.c:869 msgid "invalid timezone offset" msgstr "dรฉcalage horaire invalide" -#: builtin/am.c:944 +#: builtin/am.c:962 msgid "Patch format detection failed." msgstr "รchec de dรฉtection du format du patch." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:967 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "รฉchec de la crรฉation du rรฉpertoire '%s'" -#: builtin/am.c:954 +#: builtin/am.c:972 msgid "Failed to split patches." msgstr "รchec de dรฉcoupage des patchs." -#: 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 +#: builtin/am.c:1103 #, 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:1099 +#: builtin/am.c:1104 #, 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:1100 +#: builtin/am.c:1105 #, 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:1183 +#: builtin/am.c:1188 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:1211 +#: builtin/am.c:1216 msgid "Patch is empty." msgstr "Le patch actuel est vide." -#: builtin/am.c:1277 +#: builtin/am.c:1281 #, c-format -msgid "invalid ident line: %.*s" -msgstr "ligne d'identification invalide : %.*s" +msgid "missing author line in commit %s" +msgstr "ligne d'auteur manquante dans le commit %s" -#: builtin/am.c:1299 +#: builtin/am.c:1284 #, c-format -msgid "unable to parse commit %s" -msgstr "impossible d'analyser le commit %s" +msgid "invalid ident line: %.*s" +msgstr "ligne d'identification invalide : %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1503 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:1498 +#: builtin/am.c:1505 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:1517 +#: builtin/am.c:1524 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8940,24 +10222,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:1523 +#: builtin/am.c:1530 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour ร un patch de la base et fusion ร 3 points..." -#: builtin/am.c:1549 +#: builtin/am.c:1556 msgid "Failed to merge in the changes." msgstr "รchec d'intรฉgration des modifications." -#: builtin/am.c:1581 +#: builtin/am.c:1588 msgid "applying to an empty history" msgstr "application ร un historique vide" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1639 builtin/am.c:1643 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1650 +#: builtin/am.c:1661 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -8965,36 +10247,40 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1671 #, 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:1710 +#: builtin/am.c:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "impossible d'รฉcrire le fichier d'index" + +#: builtin/am.c:1721 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1761 builtin/am.c:1829 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1778 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch dรฉjร appliquรฉ." -#: builtin/am.c:1773 +#: builtin/am.c:1784 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a รฉchouรฉ ร %s %.*s" -#: builtin/am.c:1777 -msgid "Use 'git am --show-current-patch' to see the failed patch" +#: builtin/am.c:1788 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -"Utilisez 'git am --show-current-patch' pour visualiser le patch en รฉchec" +"Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en รฉchec" -#: builtin/am.c:1821 +#: builtin/am.c:1832 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9005,7 +10291,7 @@ msgstr "" "introduit les mรชmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1828 +#: builtin/am.c:1839 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9018,17 +10304,17 @@ msgstr "" "Vous pouvez lancer 'git rm' sur un fichier \"supprimรฉ par eux\" pour " "accepter son รฉtat." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:1987 +#: builtin/am.c:1998 msgid "failed to clean index" msgstr "รฉchec du nettoyage de l'index" -#: builtin/am.c:2031 +#: builtin/am.c:2042 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9036,145 +10322,157 @@ msgstr "" "Vous semblez avoir dรฉplacรฉ la HEAD depuis le dernier รฉchec de 'am'.\n" "Pas de retour ร ORIG_HEAD" -#: builtin/am.c:2128 +#: builtin/am.c:2149 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2164 +#: builtin/am.c:2191 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "Valeur invalide pour --show-current-patch : %s" + +#: builtin/am.c:2195 +#, 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:2226 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2165 +#: builtin/am.c:2227 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2233 msgid "run interactively" msgstr "exรฉcution interactive" -#: builtin/am.c:2173 +#: builtin/am.c:2235 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2175 +#: builtin/am.c:2237 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir ร une fusion ร 3 points si nรฉcessaire" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 msgid "be quiet" msgstr "รชtre silencieux" -#: builtin/am.c:2178 +#: builtin/am.c:2240 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:2181 +#: builtin/am.c:2243 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par dรฉfaut)" -#: builtin/am.c:2183 +#: builtin/am.c:2245 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k ร git-mailinfo" -#: builtin/am.c:2185 +#: builtin/am.c:2247 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b ร git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2249 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m ร git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2251 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:2192 +#: builtin/am.c:2254 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:2195 +#: builtin/am.c:2257 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: 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 +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 msgid "pass it through git-apply" msgstr "le passer jusqu'ร git-apply" -#: 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:141 parse-options.h:162 parse-options.h:312 +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: 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 +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2221 +#: builtin/am.c:2283 msgid "format the patch(es) are in" msgstr "format de prรฉsentation des patchs" -#: builtin/am.c:2227 +#: builtin/am.c:2289 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:2229 +#: builtin/am.c:2291 msgid "continue applying patches after resolving a conflict" msgstr "continuer ร appliquer les patchs aprรจs rรฉsolution d'un conflit" -#: builtin/am.c:2232 +#: builtin/am.c:2294 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2297 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2238 +#: builtin/am.c:2300 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2241 +#: builtin/am.c:2303 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:2244 -msgid "show the patch being applied." -msgstr "afficher le patch en cours d'application." +#: builtin/am.c:2307 +msgid "show the patch being applied" +msgstr "afficher le patch en cours d'application" -#: builtin/am.c:2248 +#: builtin/am.c:2312 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2250 +#: builtin/am.c:2314 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: 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 +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "id-clรฉ" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2256 +#: builtin/am.c:2320 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2274 +#: builtin/am.c:2338 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." @@ -9182,17 +10480,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:2281 +#: builtin/am.c:2345 msgid "failed to read the index" msgstr "รฉchec ร la lecture de l'index" -#: builtin/am.c:2296 +#: builtin/am.c:2360 #, 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:2320 +#: builtin/am.c:2384 #, c-format msgid "" "Stray %s directory found.\n" @@ -9201,13 +10499,13 @@ msgstr "" "Rรฉpertoire abandonnรฉ %s trouvรฉ.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2326 +#: builtin/am.c:2390 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:2336 +#: builtin/am.c:2400 msgid "interactive mode requires patches on the command line" msgstr "le mode interactif requiert des rustines sur la ligne de commande" @@ -9245,23 +10543,23 @@ msgstr "git archive : erreur de protocole" msgid "git archive: expected a flush" msgstr "git archive : vidage attendu" -#: 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 --next-all" +msgstr "git bisect--helper --next-all" + +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "git bisect--helper --write-terms <terme-pour-mauvais> <terme-pour-bon>" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:25 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<commit>]" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" @@ -9269,7 +10567,7 @@ msgstr "" "git bisect--helper --bisect-write [--no-log] <รฉtat> <rรฉvision> <terme-pour-" "bon> <terme-pour-mauvais>" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:28 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" @@ -9277,13 +10575,13 @@ msgstr "" "git bisect--helper --bisect-check-and-set-terms <commande> <terme-pour-bon> " "<terme-pour-mauvais>" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" "git bisect--helper --bisect-next-check <terme-pour-bon> <terme-pour-mauvais> " "[<term>]" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:30 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -9291,48 +10589,68 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:31 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<terme> --term-{new,bad}" -"=<terme>][--no-checkout] [<mauvais> [<bon>...]] [--] [<chemins>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<terme> --term-{old,good}" +"=<terme>][--no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] " +"[<chemins>...]" + +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-auto-next" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:35 +msgid "git bisect--helper --bisect-autostart" +msgstr "git bisect--helper --bisect-autostart" + +#: builtin/bisect--helper.c:97 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "impossible d'ouvrir le fichier '%s' en mode '%s'" + +#: builtin/bisect--helper.c:104 +#, c-format +msgid "could not write to file '%s'" +msgstr "impossible d'รฉcrire le fichier '%s'" + +#: builtin/bisect--helper.c:143 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' n'est pas un terme valide" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:147 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "impossible d'utiliser la commande incluse '%s' comme terme" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "impossible de modifier la signification du terme '%s'" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:167 msgid "please use two different terms" msgstr "veuillez utiliser deux termes diffรฉrents" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "impossible d'ouvrir le fichier BISECT_TERMS" - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:207 #, c-format msgid "We are not bisecting.\n" msgstr "Pas de bissection en cours.\n" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:215 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' n'est pas un commit valide" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:224 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -9340,27 +10658,27 @@ msgstr "" "รchec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset " "<commit>'." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:268 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mauvais argument pour bisect_writeย : %s" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:273 #, 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:232 +#: builtin/bisect--helper.c:285 #, c-format msgid "couldn't open the file '%s'" msgstr "impossible d'ouvrir le fichier '%s'" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:311 #, 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:285 +#: builtin/bisect--helper.c:338 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9369,7 +10687,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:289 +#: builtin/bisect--helper.c:342 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9380,7 +10698,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:321 +#: builtin/bisect--helper.c:362 #, c-format msgid "bisecting only with a %s commit" msgstr "Attention : bissection avec seulement une validation %s" @@ -9389,15 +10707,15 @@ msgstr "Attention : bissection avec seulement une validation %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:370 msgid "Are you sure [Y/n]? " msgstr "Confirmez-vous [Y/n] ? " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:431 msgid "no terms defined" msgstr "aucun terme dรฉfini" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:434 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9406,7 +10724,7 @@ msgstr "" "Vos termes actuels sont %s pour l'รฉtat ancien\n" "et %s pour le nouvel รฉtat.\n" -#: builtin/bisect--helper.c:389 +#: builtin/bisect--helper.c:444 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9416,115 +10734,162 @@ msgstr "" "Les options supportรฉes sontย : --term-good|--term-old et --term-bad|--term-" "new." -#: builtin/bisect--helper.c:475 +#: builtin/bisect--helper.c:511 +msgid "revision walk setup failed\n" +msgstr "รฉchec de la prรฉparation du parcours des rรฉvisions\n" + +#: builtin/bisect--helper.c:533 +#, c-format +msgid "could not open '%s' for appending" +msgstr "impossible d'ouvrir '%s' en ajout" + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +msgid "'' is not a valid term" +msgstr "'' n'est pas un terme valide" + +#: builtin/bisect--helper.c:674 #, c-format msgid "unrecognized option: '%s'" -msgstr "option non reconnueย : %s" +msgstr "option non reconnueย : '%s'" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:678 #, 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:511 +#: builtin/bisect--helper.c:709 msgid "bad HEAD - I need a HEAD" msgstr "mauvaise HEAD - j'ai besoin d'une HEAD" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:724 #, 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:547 +#: builtin/bisect--helper.c:745 msgid "won't bisect on cg-seek'ed tree" msgstr "refus de bissecter sur un arbre 'cg-seeked'" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:748 msgid "bad HEAD - strange symbolic ref" msgstr "mauvaise HEAD - rรฉfรฉrence symbolique douteuse" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:775 #, c-format msgid "invalid ref: '%s'" msgstr "rรฉference invalideย : '%s'" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:827 +msgid "You need to start by \"git bisect start\"\n" +msgstr "Vous devez dรฉmarrer avec \"git bisect start\"\n" + +#. 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:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? " + +#: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'" msgstr "effectuer 'git bisect next'" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:868 msgid "write the terms to .git/BISECT_TERMS" msgstr "รฉcrire les termes dans .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:870 msgid "cleanup the bisection state" msgstr "vรฉrifier l'รฉtat de la bissection" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:872 msgid "check for expected revs" msgstr "vรฉrifier si des rรฉvisions sont attendues" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:874 msgid "reset the bisection state" msgstr "rรฉinitialiser l'รฉtat de la bissection" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:876 msgid "write out the bisection state in BISECT_LOG" msgstr "รฉcrire l'รฉtat de la bissection dans BISECT_LOG" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:878 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:644 +#: builtin/bisect--helper.c:880 msgid "check whether bad or good terms exist" msgstr "vรฉrifier si les termes bons ou mauvais existent" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:882 msgid "print out the bisect terms" msgstr "afficher les termes de bissection" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:884 msgid "start the bisect session" msgstr "dรฉmarrer une session de bissection" -#: 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:886 +msgid "find the next bisection commit" +msgstr "trouver le prochain commit de bissection" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" +msgstr "" +"vรฉrifier le prochain รฉtat de bissection puis extraire le prochain commit de " +"bissection" + +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "commencer la bissection si elle n'a pas dรฉjร รฉtรฉ commencรฉe" + +#: builtin/bisect--helper.c:892 msgid "no log for BISECT_WRITE" msgstr "pas de journal pour BISECT_WRITE" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:910 msgid "--write-terms requires two arguments" msgstr "--write-terms exige deux arguments" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:914 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state ne supporte aucun argument" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:921 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset supporte soit aucun argument, soit un commit" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:925 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write supporte soit 4 arguments, soit 5 arguments" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:931 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms exige 3 arguments" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:937 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check exige 2 ou 3 arguments" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:943 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms exige 0 ou 1 argument" +#: builtin/bisect--helper.c:952 +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next exige 0 argument" + +#: builtin/bisect--helper.c:958 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--bisect-auto-next exige 0 argument" + +#: builtin/bisect--helper.c:964 +msgid "--bisect-autostart does not accept arguments" +msgstr "--bisect-autostart ne supporte aucun argument" + #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>" @@ -9551,139 +10916,137 @@ msgstr "couleur invalide '%s' dans color.blame.repeatedlines" msgid "invalid value for blame.coloring" msgstr "valeur invalide pour blame.coloring" -#: builtin/blame.c:823 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "rรฉfรฉrence ร ignorer %s introuvable" -#: builtin/blame.c:845 +#: builtin/blame.c:867 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: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:868 +msgid "Do not show object names of boundary commits (Default: off)" +msgstr "" +"Ne pas montrer les noms des objets pour les commits de limite (Dรฉfaut : " +"dรฉsactivรฉ)" -#: builtin/blame.c:847 +#: builtin/blame.c:869 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:848 +#: builtin/blame.c:870 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coรปt d'activitรฉ" -#: builtin/blame.c:849 +#: builtin/blame.c:871 msgid "Force progress reporting" msgstr "Forcer l'affichage de l'รฉtat d'avancement" -#: builtin/blame.c:850 +#: builtin/blame.c:872 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les รฉlรฉments de blรขme" -#: builtin/blame.c:851 +#: builtin/blame.c:873 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Dรฉfaut : auto)" -#: builtin/blame.c:852 +#: builtin/blame.c:874 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numรฉros de lignes originaux (Dรฉfaut : dรฉsactivรฉ)" -#: builtin/blame.c:853 +#: builtin/blame.c:875 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice ร la consommation par machine" -#: builtin/blame.c:854 +#: builtin/blame.c:876 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:855 +#: builtin/blame.c:877 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:856 +#: builtin/blame.c:878 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Dรฉfaut : dรฉsactivรฉ)" -#: builtin/blame.c:857 +#: builtin/blame.c:879 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Dรฉfaut : dรฉsactivรฉ)" -#: builtin/blame.c:858 +#: builtin/blame.c:880 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:859 +#: builtin/blame.c:881 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:860 +#: builtin/blame.c:882 msgid "Ignore whitespace differences" msgstr "Ignorer les diffรฉrences d'espace" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:883 builtin/log.c:1808 msgid "rev" msgstr "rรฉv" -#: builtin/blame.c:861 +#: builtin/blame.c:883 msgid "Ignore <rev> when blaming" msgstr "ignore <rev> pendant le blรขme" -#: builtin/blame.c:862 +#: builtin/blame.c:884 msgid "Ignore revisions from <file>" msgstr "ignorer les rรฉvisions listรฉes dans <fichier>" -#: builtin/blame.c:863 +#: builtin/blame.c:885 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:864 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "colorier les lignes par รขge" -#: 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 +#: builtin/blame.c:887 msgid "Spend extra cycles to find better match" msgstr "" "Dรฉpenser des cycles supplรฉmentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:874 +#: builtin/blame.c:888 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:875 +#: builtin/blame.c:889 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "score" -#: builtin/blame.c:876 +#: builtin/blame.c:890 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:877 +#: builtin/blame.c:891 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:892 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:929 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress ne peut pas รชtre utilisรฉ avec --incremental ou les formats " @@ -9697,23 +11060,23 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/blame.c:1087 +#: builtin/blame.c:1110 #, 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:1133 +#: builtin/blame.c:1156 msgid "Blaming lines" msgstr "Assignation de blรขme aux lignes" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:30 @@ -9923,7 +11286,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:485 +#: builtin/branch.c:626 builtin/rebase.c:526 msgid "upstream" msgstr "amont" @@ -9932,8 +11295,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" @@ -10015,68 +11378,68 @@ msgstr "afficher seulement les branches qui ne sont pas fusionnรฉes" msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 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 +#: builtin/tag.c:434 msgid "object" msgstr "objet" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "le tri et le filtrage sont non-sensibles ร la casse" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format ร utiliser pour la sortie" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvรฉe sous refs/heads !" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "Impossible de dรฉcrire une HEAD dรฉtachรฉe" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "impossible d'รฉditer la description de plus d'une branche" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommรฉe '%s'." -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "trop de branches pour une opรฉration de copie" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "trop d'arguments pour une opรฉration de renommage" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "trop d'arguments pour spรฉcifier une branche amont" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -10084,32 +11447,32 @@ msgstr "" "impossible de spรฉcifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "trop d'arguments pour dรฉsactiver un amont" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossible de dรฉsactiver une branche amont de HEAD quand elle ne pointe sur " "aucune branche." -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:841 +#: builtin/branch.c:839 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>?" @@ -10118,7 +11481,7 @@ msgstr "" "branche.\n" "Vouliez-vous plutรดt dire -a|-r --list <motif>ย ?" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -10126,20 +11489,167 @@ msgstr "" "l'option '--set-upstream' est obsolรจte. Utilisez '--track' ou '--set-" "upstream-to' ร la place." -#: builtin/bundle.c:45 +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "version gitย ::\n" + +#: builtin/bugreport.c:21 #, c-format -msgid "%s is okay\n" -msgstr "%s est correct\n" +msgid "uname() failed with error '%s' (%d)\n" +msgstr "รฉchec de uname() avec l'erreur '%s' (%d)\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "info compilateurย : " + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "info libcย : " + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "lancรฉ hors d'un dรฉpรดt gitย - aucun crochet ร montrer\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "git bugreport [-o|--output-directory <fichier>] [-s|--suffix <format>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"Merci de remplir le rapport de bogue Gitย !\n" +"Veuillez rรฉpondre aux questions suivantes pour nous aider ร comprendre votre " +"problรจme.\n" +"\n" +"Qu'avez-vous fait avant l'apparition du bogueย ? (รtapes pour reproduire " +"votre problรจme)\n" +"\n" +"Quel รฉtait le rรฉsultat attenduย ? (comportement attendu)\n" +"\n" +"Que s'est-il passรฉ ร la placeย ? (comportement observรฉ)\n" +"\n" +"Quelle diffรฉrence y a-t-il entre ce que vous attendiez et ce qu'il s'est " +"passรฉย ?\n" +"\n" +"Autres remarquesย :\n" +"\n" +"Veuillez relire le rapport de bogue ci-dessous.\n" +"Vous pouvez supprimer toute ligne que vous ne souhaitez pas envoyer.\n" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "spรฉcifier la destination du fichier de rapport de bogue" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "spรฉcifier une suffixe au format strftime pour le nom de fichier" + +#: builtin/bugreport.c:158 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "impossible de crรฉer les rรฉpertoires de premier niveau pour '%s'" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "Info systรจme" + +#: builtin/bugreport.c:168 +msgid "Enabled Hooks" +msgstr "Crochets activรฉs" + +#: builtin/bugreport.c:175 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "impossible de crรฉer un fichier nouveau ร '%s'" + +#: builtin/bugreport.c:178 +#, c-format +msgid "unable to write to %s" +msgstr "impossible d'รฉcrire dans %s" + +#: builtin/bugreport.c:188 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "Nouveau rapport crรฉรฉ ร '%s'.\n" + +#: 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:58 +#: 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:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "ne pas afficher la barre de progression" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "afficher la barre de progression" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +msgid "show progress meter during object writing phase" +msgstr "afficher la barre de progression durant la phase d'รฉcrite des objets" + +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +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:76 +msgid "specify bundle format version" +msgstr "spรฉcifier la version du format de colis" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "La crรฉation d'un colis requiert un dรฉpรดt." -#: builtin/bundle.c:62 +#: builtin/bundle.c:107 +msgid "do not show bundle details" +msgstr "ne pas afficher les dรฉtails du colis" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "%s est correct\n" + +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "Le dรฉpaquetage d'un colis requiert un dรฉpรดt." -#: builtin/cat-file.c:594 +#: builtin/bundle.c:171 builtin/remote.c:1687 +msgid "be verbose; must be placed before a subcommand" +msgstr "รชtre verbeux : doit รชtre placรฉ avant une sous-commande" + +#: builtin/bundle.c:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Sous-commande inconnue : %s" + +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10147,82 +11657,82 @@ msgstr "" "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p " "| <type> | --textconv | --filters) [--path=<chemin>] <objet>" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:599 msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:620 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:634 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut รชtre : blob, tree, commit ou tag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:642 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:639 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:645 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:643 +#: builtin/cat-file.c:647 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:644 git-submodule.sh:936 +#: builtin/cat-file.c:648 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "utiliser un chemin spรฉcifique pour --textconv/--filters" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:651 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:648 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "bufferiser la sortie de --batch" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:654 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:654 +#: builtin/cat-file.c:658 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:658 +#: builtin/cat-file.c:662 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:660 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "montrer tous les objets avec --batch ou --batch-check" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "ne pas ordonner la sortie de --batch-all-objects" @@ -10251,8 +11761,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:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "supprimer l'รฉtat d'avancement" @@ -10264,27 +11774,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:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "impossible de spรฉcifier les chemins avec --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z n'a de sens qu'avec l'option --stdin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "aucun chemin spรฉcifiรฉ" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "--quiet n'est valide qu'avec un seul chemin" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "impossible d'avoir --quiet et --verbose" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching n'est valide qu'avec --verbose" @@ -10344,9 +11854,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:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 msgid "string" msgstr "chaรฎne" @@ -10374,100 +11884,100 @@ msgstr "git switch [<options>] <branche>" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<options>] [--source=<branche>] <fichier>..." -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" -#: builtin/checkout.c:190 +#: builtin/checkout.c:206 #, 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:240 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nรฉcessaires" -#: builtin/checkout.c:258 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" -#: builtin/checkout.c:274 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le rรฉsultat de fusion pour '%s'" -#: builtin/checkout.c:374 +#: builtin/checkout.c:396 #, 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:379 +#: builtin/checkout.c:401 #, 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:386 +#: builtin/checkout.c:408 #, 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:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, 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:422 builtin/checkout.c:425 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas รชtre utilisรฉ avec %s" -#: builtin/checkout.c:429 +#: builtin/checkout.c:451 #, 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:433 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s', ni '%s' spรฉcifiรฉ" -#: builtin/checkout.c:437 +#: builtin/checkout.c:459 #, 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:442 builtin/checkout.c:447 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, 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:506 builtin/checkout.c:513 +#: builtin/checkout.c:528 builtin/checkout.c:535 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionnรฉ" -#: builtin/checkout.c:679 +#: builtin/checkout.c:703 msgid "you need to resolve your current index first" msgstr "vous devez d'abord rรฉsoudre votre index courant" -#: builtin/checkout.c:729 +#: builtin/checkout.c:757 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10477,56 +11987,50 @@ msgstr "" "suivants :\n" "%s" -#: 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 +#: builtin/checkout.c:853 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s'ย : %s\n" -#: builtin/checkout.c:875 +#: builtin/checkout.c:895 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:899 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "impossible de mettre ร jour HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:903 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise ร zรฉro de la branche '%s'\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:906 #, c-format msgid "Already on '%s'\n" msgstr "Dรฉjร sur '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:910 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise ร zรฉro de la branche '%s'\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:912 builtin/checkout.c:1338 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:914 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:965 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:971 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10549,7 +12053,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:990 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10578,28 +12082,19 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1025 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des rรฉvisions" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1029 msgid "Previous HEAD position was" msgstr "La position prรฉcรฉdente de HEAD รฉtait sur" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1069 builtin/checkout.c:1333 msgid "You are on a branch yet to be born" msgstr "Vous รชtes sur une branche qui doit encore naรฎtre" -#: 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 +#: builtin/checkout.c:1146 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10608,37 +12103,71 @@ 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:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1153 +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:1163 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "'%s' correspond ร plusieurs (%d) branches de suivi ร distance" + +#: builtin/checkout.c:1229 +msgid "only one reference expected" +msgstr "une seule rรฉfรฉrence attendue" + +#: builtin/checkout.c:1246 +#, c-format +msgid "only one reference expected, %d given." +msgstr "une seule rรฉfรฉrence attendue, %d fournies." + +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "rรฉfรฉrence invalide : %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1305 builtin/checkout.c:1671 #, c-format msgid "reference is not a tree: %s" msgstr "la rรฉfรฉrence n'est pas un arbre : %s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1352 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "branche attendue, mais รฉtiquette '%s' reรงue" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1354 #, 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:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1355 builtin/checkout.c:1363 #, c-format msgid "a branch is expected, got '%s'" msgstr "une branche est attendue, mais '%s' a รฉtรฉ reรงue" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1358 #, 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:1325 +#: builtin/checkout.c:1374 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10646,7 +12175,7 @@ msgstr "" "impossible de basculer de branche pendant une fusion\n" "Envisagez \"git merge --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1378 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -10654,7 +12183,7 @@ msgstr "" "impossible de basculer de branche pendant une session am\n" "Envisagez \"git am --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1333 +#: builtin/checkout.c:1382 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10662,7 +12191,7 @@ msgstr "" "impossible de basculer de branche pendant un rebasage\n" "Envisagez \"git rebase --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1386 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10670,7 +12199,7 @@ msgstr "" "impossible de basculer de branche pendant un picorage\n" "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1341 +#: builtin/checkout.c:1390 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10678,139 +12207,146 @@ msgstr "" "impossible de basculer de branche pendant un retour\n" "Envisagez \"git revert --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1394 msgid "you are switching branch while bisecting" msgstr "Vous basculez de branche en cours de bissection" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1401 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 #, 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:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas รชtre utilisรฉ avec '%s'" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1429 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' n'accepte pas <point-de-dรฉpart>" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1437 #, 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:1395 +#: builtin/checkout.c:1444 msgid "missing branch or commit argument" msgstr "argument de branche ou de commit manquant" -#: 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 +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 msgid "force progress reporting" msgstr "forcer l'affichage de l'รฉtat d'avancement" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1487 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion ร 3 points avec la nouvelle branche" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 msgid "style" msgstr "style" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1489 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1501 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "dรฉtacher la HEAD au commit nommรฉ" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1502 msgid "set upstream info for new branch" msgstr "paramรฉtrer les coordonnรฉes de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1504 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1508 builtin/merge.c:291 msgid "update ignored files (default)" msgstr "mettre ร jour les fichiers ignorรฉs (par dรฉfaut)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1511 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:1475 +#: builtin/checkout.c:1524 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnรฉs" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1527 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnรฉs" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1531 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:1533 -msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-b, -B et --orphan sont mutuellement exclusifs" +#: builtin/checkout.c:1586 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "-%c, -%c et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1590 msgid "-p and --overlay are mutually exclusive" msgstr "-p et --overlay sont mutuellement exclusifs" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1627 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1578 -msgid "missing branch name; try -b" -msgstr "nom de branche manquant ; essayez -b" +#: builtin/checkout.c:1632 +#, c-format +msgid "missing branch name; try -%c" +msgstr "nom de branche manquant ; essayez -%c" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1664 #, c-format msgid "could not resolve %s" msgstr "impossible de rรฉsoudre %s" -#: 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 +#: builtin/checkout.c:1680 msgid "invalid path specification" msgstr "spรฉcification de chemin invalide" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1687 #, 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:1642 +#: builtin/checkout.c:1691 #, 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:1646 +#: builtin/checkout.c:1700 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file est incompatible avec --detach" + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file est incompatible avec --patch" + +#: builtin/checkout.c:1716 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10818,135 +12354,111 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: 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:1721 +msgid "you must specify path(s) to restore" +msgstr "Vous devez spรฉcifier un ou des chemins ร restaurer" -#: 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 +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1748 msgid "create and checkout a new branch" msgstr "crรฉer et extraire une nouvelle branche" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1750 msgid "create/reset and checkout a branch" msgstr "crรฉer/rรฉinitialiser et extraire une branche" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1751 msgid "create reflog for new branch" msgstr "crรฉer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1753 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" "essayer d'interprรฉter 'git checkout <branche-inexistante>' (par dรฉfaut)" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1754 msgid "use overlay mode (default)" msgstr "utiliser le mode de superposition (dรฉfaut)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1799 msgid "create and switch to a new branch" msgstr "crรฉer et basculer sur une nouvelle branche" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1801 msgid "create/reset and switch to a branch" msgstr "crรฉer/rรฉinitialiser et basculer sur une branche" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1803 msgid "second guess 'git switch <no-such-branch>'" msgstr "interprรฉter 'git switch <branche-inexistante>'" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1805 msgid "throw away local modifications" msgstr "laisser tomber les modifications locales" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1839 msgid "which tree-ish to checkout from" msgstr "de quel <arbre-esque> faire l'extraction" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1841 msgid "restore the index" msgstr "restaurer l'index" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1843 msgid "restore the working tree (default)" msgstr "restaurer l'arbre de travail (par dรฉfaut)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1845 msgid "ignore unmerged entries" msgstr "ignorer les entrรฉes non-fusionnรฉes" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1846 msgid "use overlay mode" msgstr "utiliser le mode de superposition" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..." -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "Suppression de %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "Supprimerait %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "Ignore le dรฉpรดt %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "Ignorerait le dรฉpรดt %s\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "รฉchec de la suppression de %s" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "lstat de %s impossible\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10959,7 +12471,7 @@ msgstr "" "foo - sรฉlectionner un รฉlรฉment par un prรฉfixe unique\n" " - (vide) ne rien sรฉlectionner\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10980,38 +12492,33 @@ msgstr "" "* - choisir tous les รฉlรฉments\n" " - (vide) terminer la sรฉlection\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hein (%s)ย ?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs ร ignorer>> " -#: builtin/clean.c:699 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les รฉlรฉments correspondant ร : %s" -#: builtin/clean.c:720 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Sรฉlectionner les รฉlรฉments ร supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:786 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "Au revoir.\n" - -#: builtin/clean.c:794 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11029,64 +12536,52 @@ msgstr "" "help - cet รฉcran\n" "? - aide pour la sรฉlection en ligne" -#: 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 +#: builtin/clean.c:825 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:846 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "Plus de fichier ร nettoyer, sortie." -#: builtin/clean.c:908 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimรฉs" -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "force" msgstr "forcer" -#: builtin/clean.c:911 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "supprimer les rรฉpertoires entiers" -#: 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/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "motif" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux rรจgles ignore" -#: builtin/clean.c:916 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorรฉs, aussi" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorรฉs" -#: 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:940 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11094,7 +12589,7 @@ msgstr "" "clean.requireForce positionnรฉ ร true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:943 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11102,7 +12597,11 @@ msgstr "" "clean.requireForce ร true par dรฉfaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clone.c:46 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "-x et -X ne peuvent pas รชtre utilisรฉs ensemble" + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dรฉpรดt> [<rรฉpertoire>]" @@ -11110,7 +12609,7 @@ msgstr "git clone [<options>] [--] <dรฉpรดt> [<rรฉpertoire>]" msgid "don't create a checkout" msgstr "ne pas crรฉer d'extraction" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 msgid "create a bare repository" msgstr "crรฉer un dรฉpรดt nu" @@ -11130,11 +12629,11 @@ msgstr "ne pas utiliser de liens durs locaux, toujours copier" msgid "setup as shared repository" msgstr "rรฉgler comme dรฉpรดt partagรฉ" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "spรฉcificateur de chemin" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" @@ -11142,26 +12641,26 @@ msgstr "initialiser les sous-modules dans le clone" msgid "number of submodules cloned in parallel" msgstr "nombre de sous-modules clonรฉs en parallรจle" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:550 msgid "template-directory" msgstr "rรฉpertoire-modรจle" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:551 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:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "dรฉpรดt de rรฉfรฉrence" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 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:3314 builtin/repack.c:319 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 msgid "name" msgstr "nom" @@ -11177,8 +12676,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:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/pull.c:208 msgid "depth" msgstr "profondeur" @@ -11186,7 +12685,8 @@ 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:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 msgid "time" msgstr "heure" @@ -11194,17 +12694,18 @@ 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:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 msgid "revision" msgstr "rรฉvision" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 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/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" @@ -11218,11 +12719,11 @@ msgstr "" msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonรฉs seront superficiels" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:559 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "sรฉparer le rรฉpertoire git de la copie de travail" @@ -11234,23 +12735,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:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 msgid "server-specific" msgstr "spรฉcifique au serveur" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 msgid "option to transmit" msgstr "option ร transmettre" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" @@ -11259,7 +12760,13 @@ 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:285 +#: 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 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11267,47 +12774,42 @@ 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:338 +#: builtin/clone.c:340 #, 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:411 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un rรฉpertoire" -#: builtin/clone.c:428 +#: builtin/clone.c:431 #, c-format msgid "failed to start iterator over '%s'" msgstr "รฉchec du dรฉmarrage un itรฉrateur sur '%s'" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "รฉchec pour dรฉlier '%s'" - -#: builtin/clone.c:458 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "รฉchec de la crรฉation du lien '%s'" -#: builtin/clone.c:462 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "รฉchec de la copie vers '%s'" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "รฉchec de l'itรฉration sur '%s'" -#: builtin/clone.c:492 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:512 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11317,98 +12819,107 @@ 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:583 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' ร cloner." -#: builtin/clone.c:702 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "impossible de mettre ร jour %s" -#: builtin/clone.c:752 +#: builtin/clone.c:756 +msgid "failed to initialize sparse-checkout" +msgstr "รฉchec lors de l'initialisation l'extraction partielle" + +#: builtin/clone.c:779 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:783 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:833 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "impossible d'รฉcrire les paramรจtres dans le fichier de configuration" -#: builtin/clone.c:896 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:898 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "impossible de dรฉlier le fichier temporaire alternates" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:970 builtin/receive-pack.c:2434 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:942 +#: builtin/clone.c:974 msgid "You must specify a repository to clone." msgstr "Vous devez spรฉcifier un dรฉpรดt ร cloner." -#: builtin/clone.c:955 +#: builtin/clone.c:987 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:958 +#: builtin/clone.c:990 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:971 +#: builtin/clone.c:1006 #, c-format msgid "repository '%s' does not exist" msgstr "le dรฉpรดt '%s' n'existe pas" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:1010 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:987 +#: builtin/clone.c:1020 #, 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:997 +#: builtin/clone.c:1026 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "le chemin du dรฉpรดt '%s' existe dรฉjร et n'est pas un rรฉpertoire vide." + +#: builtin/clone.c:1040 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe dรฉjร ." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 #, 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:1017 +#: builtin/clone.c:1060 #, 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:1037 +#: builtin/clone.c:1080 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dรฉpรดt nu '%s'\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1082 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1106 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11416,41 +12927,41 @@ msgstr "" "clone --recursive n'est pas compatible avec ร la fois --reference et --" "reference-if-able" -#: builtin/clone.c:1124 +#: builtin/clone.c:1170 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:1126 +#: builtin/clone.c:1172 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:1128 +#: builtin/clone.c:1174 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:1130 +#: builtin/clone.c:1176 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:1133 +#: builtin/clone.c:1179 msgid "source repository is shallow, ignoring --local" msgstr "le dรฉpรดt source est superficiel, option --local ignorรฉe" -#: builtin/clone.c:1138 +#: builtin/clone.c:1184 msgid "--local is ignored" msgstr "--local est ignorรฉ" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1268 builtin/clone.c:1276 #, 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:1226 +#: builtin/clone.c:1279 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir clonรฉ un dรฉpรดt vide." @@ -11486,6 +12997,112 @@ msgstr "Remplissage d'espace entre les colonnes" msgid "--command must be the first argument" msgstr "--command doit รชtre le premier argument" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +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:14 builtin/commit-graph.c:27 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" +"git commit-graph write [--object-dir <rรฉpertoire-d'objet>] [--append] [--" +"split[=<stratรฉgie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <options de division>" + +#: builtin/commit-graph.c:64 +#, c-format +msgid "could not find object directory matching %s" +msgstr "impossible de trouver le rรฉpertoire objet correspondant ร %s" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "rรฉpertoire" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "Le rรฉpertoire d'objet oรน stocker le graphe" + +#: builtin/commit-graph.c:83 +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:106 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "impossible d'ouvrir le graphe de commit '%s'" + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "argument de --split non reconnu, %s" + +#: builtin/commit-graph.c:155 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "ID d'objet non hexadรฉcimal inattenduย : %s" + +#: builtin/commit-graph.c:160 +#, c-format +msgid "invalid object: %s" +msgstr "objet invalide : %s" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "commencer le parcours ร toutes les rรฉfs" + +#: builtin/commit-graph.c:215 +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:217 +msgid "start walk at commits listed by stdin" +msgstr "commencer le parcours aux commits listรฉs sur stdin" + +#: builtin/commit-graph.c:219 +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:221 +msgid "enable computation for changed paths" +msgstr "activer le calcul pour les chemins modifiรฉs" + +#: builtin/commit-graph.c:224 +msgid "allow writing an incremental commit-graph file" +msgstr "permettre d'รฉcrire un fichier incrรฉmental de graphe de commit" + +#: builtin/commit-graph.c:228 +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:230 +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:232 +msgid "only expire files older than a given date-time" +msgstr "ne faire expirer que les fichiers plus vieux qu'une date-time donnรฉe" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "nombre maximum des filtres Bloom des chemins modifiรฉs ร calculer" + +#: builtin/commit-graph.c:255 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "Collecte des commits depuis l'entrรฉe" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -11499,7 +13116,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:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 #, c-format msgid "not a valid object name %s" msgstr "nom d'objet invalide %s" @@ -11527,13 +13144,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:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 -#: builtin/tag.c:412 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 msgid "message" msgstr "message" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "message de validation" @@ -11541,8 +13158,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:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signer la validation avec GPG" @@ -11589,10 +13206,14 @@ msgstr "" "\n" #: builtin/commit.c:63 +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "Sinon, veuillez utiliser 'git rebase --skip'\n" + +#: builtin/commit.c:66 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Sinon, veuillez utiliser 'git cherry-pick --skip'\n" -#: builtin/commit.c:66 +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -11614,61 +13235,73 @@ msgstr "" " git cherry-pick --skipped\n" "\n" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "รฉchec du dรฉpaquetage de l'objet arbre HEAD" -#: builtin/commit.c:356 +#: builtin/commit.c:348 +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:361 +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:373 msgid "unable to create temporary index" msgstr "impossible de crรฉer l'index temporaire" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "รฉchec de l'ajout interactif" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "impossible de mettre ร jour l'index temporaire" -#: builtin/commit.c:378 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "Impossible de mettre ร jour l'arbre de cache principal" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "impossible d'รฉcrire le fichier new_index" -#: builtin/commit.c:455 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:457 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:465 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "impossible de faire une validation partielle pendant un rebasage." + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "impossible d'รฉcrire le fichier d'index temporaire" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "entรชte d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformรฉe" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "paramรจtre --author mal formรฉ" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11676,68 +13309,66 @@ 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:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:478 #, 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:708 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrรฉe standard" -#: builtin/commit.c:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "impossible d'รฉcrire le modรจle de commit" -#: builtin/commit.c:829 -#, c-format +#: builtin/commit.c:853 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" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" "Il semble que vous validiez une fusion.\n" -"Si ce n'est pas le cas, veuillez supprimer le fichier\n" -"\t%s\n" +"Si ce n'est pas le cas, veuillez lancer\n" +"\tgit update-ref -d MERGE_HEAD\n" "et essayez ร nouveau.\n" -#: builtin/commit.c:834 -#, c-format +#: builtin/commit.c:858 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" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" "Il semble que vous validiez un picorage.\n" -"Si ce n'est pas le cas, veuillez supprimer le fichier\n" -"\t%s\n" +"Si ce n'est pas le cas, veuillez lancer\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "et essayez ร nouveau.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11747,7 +13378,7 @@ msgstr "" "commenรงant par '%c' seront ignorรฉes, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11758,148 +13389,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:872 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:887 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:972 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:276 #, 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:1030 +#: builtin/commit.c:1055 #, 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:1044 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Mode de fichier ignorรฉ invalide '%s'" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1102 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1146 +#: builtin/commit.c:1171 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:1155 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "Il n'y a rien ร corriger." -#: builtin/commit.c:1158 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous รชtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1160 +#: builtin/commit.c:1185 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:1163 +#: builtin/commit.c:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "Vous รชtes en plein rebasage -- impossible de corriger (amend)." + +#: builtin/commit.c:1190 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:1173 +#: builtin/commit.c:1200 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:1175 +#: builtin/commit.c:1202 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:1183 +#: builtin/commit.c:1211 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:1200 +#: builtin/commit.c:1229 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: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 +#: builtin/commit.c:1235 #, 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:1339 builtin/commit.c:1523 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "afficher l'รฉtat avec concision" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1343 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "afficher l'information de remisage" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "calcule les valeurs complรจtes en avance/en retard" -#: builtin/commit.c:1347 +#: builtin/commit.c:1374 msgid "version" msgstr "version" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "afficher l'รฉtat en format long (par dรฉfaut)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "terminer les รฉlรฉments par NUL" -#: 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 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 msgid "mode" msgstr "mode" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1383 builtin/commit.c:1541 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:1360 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11907,11 +13538,11 @@ msgstr "" "afficher les fichiers ignorรฉs, \"mode\" facultatif : traditional " "(traditionnel), matching (correspondant), no. (Dรฉfautย : traditional)" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "quand" -#: builtin/commit.c:1363 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11919,175 +13550,175 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Dรฉfaut : all)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1366 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "ne pas dรฉtecter les renommages" -#: builtin/commit.c:1368 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "" "dรฉtecter les renommages, en spรฉcifiant optionnellement le facteur de " "similaritรฉ" -#: builtin/commit.c:1388 +#: builtin/commit.c:1415 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:1493 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "supprimer le rรฉsumรฉ aprรจs une validation rรฉussie" -#: builtin/commit.c:1494 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "afficher les diff dans le modรจle de message de validation" -#: builtin/commit.c:1496 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "author" msgstr "auteur" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:539 msgid "date" msgstr "date" -#: builtin/commit.c:1499 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "commit" -#: builtin/commit.c:1501 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "rรฉutiliser et รฉditer le message du commit spรฉcifiรฉ" -#: builtin/commit.c:1502 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "rรฉutiliser le message du commit spรฉcifiรฉ" -#: builtin/commit.c:1503 +#: builtin/commit.c:1507 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:1504 +#: builtin/commit.c:1508 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:1505 +#: builtin/commit.c:1509 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:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "ajouter une entrรฉe Signed-off-by :" -#: builtin/commit.c:1507 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "utiliser le fichier de modรจle spรฉcifiรฉ" -#: builtin/commit.c:1508 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "forcer l'รฉdition du commit" -#: builtin/commit.c:1510 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "inclure l'รฉtat dans le modรจle de message de validation" -#: builtin/commit.c:1515 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1516 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "valider tous les fichiers modifiรฉs" -#: builtin/commit.c:1517 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spรฉcifiรฉs ร l'index pour la validation" -#: builtin/commit.c:1518 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1519 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1520 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "valider seulement les fichiers spรฉcifiรฉs" -#: builtin/commit.c:1521 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "รฉviter d'utiliser les crochets pre-commit et commit-msg" -#: builtin/commit.c:1522 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "afficher ce qui serait validรฉ" -#: builtin/commit.c:1535 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "corriger la validation prรฉcรฉdente" -#: builtin/commit.c:1536 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "รฉviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1541 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1543 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1616 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1623 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1657 #, 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:1654 +#: builtin/commit.c:1662 #, 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:1688 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12097,287 +13728,222 @@ 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 -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 <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] <split options>" -msgstr "" -"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <options de division>" - -#: 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: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: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: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:164 -msgid "start walk at all refs" -msgstr "commencer le parcours ร toutes les rรฉfs" - -#: 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:168 -msgid "start walk at commits listed by stdin" -msgstr "commencer le parcours aux commits listรฉs sur stdin" - -#: 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: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: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: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:191 -msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" -msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" - #: builtin/config.c:11 msgid "git config [<options>]" msgstr "git config [<options>]" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:107 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "argument --type non reconnu, %s" -#: builtin/config.c:115 +#: builtin/config.c:119 msgid "only one type at a time" msgstr "qu'un seul type ร la fois" -#: builtin/config.c:124 +#: builtin/config.c:128 msgid "Config file location" msgstr "Emplacement du fichier de configuration" -#: builtin/config.c:125 +#: builtin/config.c:129 msgid "use global config file" msgstr "utiliser les fichier de configuration global" -#: builtin/config.c:126 +#: builtin/config.c:130 msgid "use system config file" msgstr "utiliser le fichier de configuration du systรจme" -#: builtin/config.c:127 +#: builtin/config.c:131 msgid "use repository config file" msgstr "utiliser le fichier de configuration du dรฉpรดt" -#: builtin/config.c:128 +#: builtin/config.c:132 msgid "use per-worktree config file" msgstr "utiliser un fichier de configuration par arbre de travail" -#: builtin/config.c:129 +#: builtin/config.c:133 msgid "use given config file" msgstr "utiliser le fichier de configuration spรฉcifiรฉ" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "read config from given blob object" msgstr "lire la configuration depuis l'objet blob fourni" -#: builtin/config.c:131 +#: builtin/config.c:135 msgid "Action" msgstr "Action" -#: builtin/config.c:132 +#: builtin/config.c:136 msgid "get value: name [value-regex]" msgstr "obtenir la valeur : nom [regex-de-valeur]" -#: builtin/config.c:133 +#: builtin/config.c:137 msgid "get all values: key [value-regex]" msgstr "obtenir toutes les valeurs : clรฉ [regex-de-valeur]" -#: builtin/config.c:134 +#: builtin/config.c:138 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:135 +#: builtin/config.c:139 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:136 +#: builtin/config.c:140 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]" -#: builtin/config.c:137 +#: builtin/config.c:141 msgid "add a new variable: name value" msgstr "ajouter une nouvelle variable : nom valeur" -#: builtin/config.c:138 +#: builtin/config.c:142 msgid "remove a variable: name [value-regex]" msgstr "supprimer une variable : nom [regex-de-valeur]" -#: builtin/config.c:139 +#: builtin/config.c:143 msgid "remove all matches: name [value-regex]" msgstr "supprimer toutes les correspondances nom [regex-de-valeur]" -#: builtin/config.c:140 +#: builtin/config.c:144 msgid "rename section: old-name new-name" msgstr "renommer une section : ancien-nom nouveau-nom" -#: builtin/config.c:141 +#: builtin/config.c:145 msgid "remove a section: name" msgstr "supprimer une section : nom" -#: builtin/config.c:142 +#: builtin/config.c:146 msgid "list all" msgstr "afficher tout" -#: builtin/config.c:143 +#: builtin/config.c:147 msgid "open an editor" msgstr "ouvrir un รฉditeur" -#: builtin/config.c:144 +#: builtin/config.c:148 msgid "find the color configured: slot [default]" msgstr "trouver la couleur configurรฉe : slot [par dรฉfaut]" -#: builtin/config.c:145 +#: builtin/config.c:149 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trouver le rรฉglage de la couleur : slot [stdout-est-tty]" -#: builtin/config.c:146 +#: builtin/config.c:150 msgid "Type" msgstr "Type" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:151 builtin/env--helper.c:43 msgid "value is given this type" msgstr "ce type est assignรฉ ร la valeur" -#: builtin/config.c:148 +#: builtin/config.c:152 msgid "value is \"true\" or \"false\"" msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)" -#: builtin/config.c:149 +#: builtin/config.c:153 msgid "value is decimal number" msgstr "la valeur est un nombre dรฉcimal" -#: builtin/config.c:150 +#: builtin/config.c:154 msgid "value is --bool or --int" msgstr "la valeur est --bool ou --int" -#: builtin/config.c:151 +#: builtin/config.c:155 +msgid "value is --bool or string" +msgstr "la valeur est --bool ou une chaรฎne" + +#: builtin/config.c:156 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:152 +#: builtin/config.c:157 msgid "value is an expiry date" msgstr "la valeur est une date d'expiration" -#: builtin/config.c:153 +#: builtin/config.c:158 msgid "Other" msgstr "Autre" -#: builtin/config.c:154 +#: builtin/config.c:159 msgid "terminate values with NUL byte" msgstr "terminer les valeurs avec un caractรจre NUL" -#: builtin/config.c:155 +#: builtin/config.c:160 msgid "show variable names only" msgstr "n'afficher que les noms de variable" -#: builtin/config.c:156 +#: builtin/config.c:161 msgid "respect include directives on lookup" msgstr "respecter les directives d'inclusion lors de la recherche" -#: builtin/config.c:157 +#: builtin/config.c:162 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:158 builtin/env--helper.c:40 +#: builtin/config.c:163 +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:164 builtin/env--helper.c:45 msgid "value" msgstr "valeur" -#: builtin/config.c:158 +#: builtin/config.c:164 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:172 +#: builtin/config.c:178 #, c-format msgid "wrong number of arguments, should be %d" msgstr "mauvais nombre d'arguments, devrait รชtre %d" -#: builtin/config.c:174 +#: builtin/config.c:180 #, 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:308 +#: builtin/config.c:334 #, c-format msgid "invalid key pattern: %s" msgstr "motif de clรฉ invalideย : %s" -#: builtin/config.c:344 +#: builtin/config.c:370 #, 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:401 +#: builtin/config.c:434 #, c-format msgid "cannot parse color '%s'" msgstr "impossible d'analyser la couleur '%s'" -#: builtin/config.c:443 +#: builtin/config.c:476 msgid "unable to parse default color value" msgstr "impossible de lire la valeur de couleur par dรฉfaut" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:529 builtin/config.c:789 msgid "not in a git directory" msgstr "pas dans un rรฉpertoire git" -#: builtin/config.c:499 +#: builtin/config.c:532 msgid "writing to stdin is not supported" msgstr "l'รฉcriture sur stdin n'est pas supportรฉe" -#: builtin/config.c:502 +#: builtin/config.c:535 msgid "writing config blobs is not supported" msgstr "l'รฉcriture de blob de configuration n'est pas supportรฉe<" -#: builtin/config.c:587 +#: builtin/config.c:620 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12392,23 +13958,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:644 msgid "only one config file at a time" msgstr "un seul fichier de configuration ร la fois" -#: builtin/config.c:616 +#: builtin/config.c:650 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:619 +#: builtin/config.c:652 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:638 +#: builtin/config.c:654 +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree ne peut รชtre utilisรฉ qu'ร l'intรฉrieur d'un dรฉpรดt git" + +#: builtin/config.c:676 msgid "$HOME not set" msgstr "$HOME n'est pas dรฉfini" -#: builtin/config.c:658 +#: builtin/config.c:700 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -12419,19 +13989,19 @@ msgstr "" "la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de " "dรฉtails" -#: builtin/config.c:688 +#: builtin/config.c:735 msgid "--get-color and variable type are incoherent" msgstr "--get-color et le type de la variable sont incohรฉrents" -#: builtin/config.c:693 +#: builtin/config.c:740 msgid "only one action at a time" msgstr "une seule action ร la fois" -#: builtin/config.c:706 +#: builtin/config.c:753 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:712 +#: builtin/config.c:759 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" @@ -12439,33 +14009,33 @@ msgstr "" "--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --" "list" -#: builtin/config.c:718 +#: builtin/config.c:765 msgid "--default is only applicable to --get" msgstr "--default n'est applicable qu'avec --get" -#: builtin/config.c:731 +#: builtin/config.c:778 #, c-format msgid "unable to read config file '%s'" msgstr "lecture du fichier de configuration '%s' impossible" -#: builtin/config.c:734 +#: builtin/config.c:781 msgid "error processing config file(s)" msgstr "erreur lors du traitement de fichier(s) de configuration" -#: builtin/config.c:744 +#: builtin/config.c:791 msgid "editing stdin is not supported" msgstr "l'รฉdition de stdin n'est pas supportรฉe" -#: builtin/config.c:746 +#: builtin/config.c:793 msgid "editing blobs is not supported" msgstr "l'รฉdition de blobs n'est pas supportรฉe" -#: builtin/config.c:760 +#: builtin/config.c:807 #, c-format msgid "cannot create configuration file %s" msgstr "crรฉation impossible du fichier de configuration '%s'" -#: builtin/config.c:773 +#: builtin/config.c:820 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12474,7 +14044,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:847 builtin/config.c:858 +#: builtin/config.c:894 builtin/config.c:905 #, c-format msgid "no such section: %s" msgstr "section inexistanteย : %s" @@ -12487,11 +14057,37 @@ 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:27 +#: builtin/credential-cache--daemon.c:226 +#, 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 "" +"Les permissions de votre rรฉpertoire de socket sont trop permissivesย ;\n" +"les autres utilisateurs pourraient lire vos identifiants secrets. Lancezย :\n" +"\n" +" chmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "afficher les messages de debug sur stderr" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" +"credential-cache-daemon non disponibleย ; pas de gestion des sockets unix" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache non disponibleย ; pas de gestion des socket unix" + +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<options>] <commit ou apparentรฉ>*" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<options>] --dirty" @@ -12507,39 +14103,34 @@ msgstr "lรฉger" msgid "annotated" msgstr "annotรฉ" -#: builtin/describe.c:273 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "l'รฉtiquette annotรฉe %s n'est pas disponible" -#: 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:279 +#: builtin/describe.c:281 #, c-format -msgid "tag '%s' is really '%s' here" -msgstr "l'รฉtiquette '%s' est en fait '%s'" +msgid "tag '%s' is externally known as '%s'" +msgstr "l'รฉtiquette '%s' est connue ร l'extรฉrieur comme '%s'" -#: builtin/describe.c:323 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "aucune รฉtiquette ne correspond parfaitement ร '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:330 #, 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:379 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "recherche terminรฉe ร %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12548,7 +14139,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:409 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12557,12 +14148,12 @@ msgstr "" "Aucune รฉtiquette ne peut dรฉcrire '%s'.\n" "Essayez --always, ou crรฉez des รฉtiquettes." -#: builtin/describe.c:439 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits parcourus\n" -#: builtin/describe.c:442 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12572,149 +14163,159 @@ msgstr "" "affichรฉes\n" "abandon de la recherche ร %s\n" -#: builtin/describe.c:510 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "dรฉcrire %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "%s n'est pas un nom d'objet valide" -#: builtin/describe.c:521 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s n'est ni un commit ni un blob" -#: builtin/describe.c:535 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "rechercher l'รฉtiquette qui suit le commit" -#: builtin/describe.c:536 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "dรฉboguer la stratรฉgie de recherche sur stderr" -#: builtin/describe.c:537 +#: builtin/describe.c:556 msgid "use any ref" msgstr "utiliser n'importe quelle rรฉfรฉrence" -#: builtin/describe.c:538 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "utiliser n'importe quelle รฉtiquette, mรชme non-annotรฉe" -#: builtin/describe.c:539 +#: builtin/describe.c:558 msgid "always use long format" msgstr "toujours utiliser le format long" -#: builtin/describe.c:540 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "ne suivre que le premier parent" -#: builtin/describe.c:543 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "n'afficher que les correspondances exactes" -#: builtin/describe.c:545 +#: builtin/describe.c:564 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:547 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "ne considรฉrer que les รฉtiquettes correspondant ร <motif>" -#: builtin/describe.c:549 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "ne pas considรฉrer les รฉtiquettes correspondant ร <motif>" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrรฉgรฉs en dernier recours" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "marque" -#: builtin/describe.c:553 +#: builtin/describe.c:572 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:556 +#: builtin/describe.c:575 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:574 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "--long et --abbrev=0 sont incompatibles" -#: builtin/describe.c:603 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "aucun nom trouvรฉ, impossible de dรฉcrire quoi que ce soit." -#: builtin/describe.c:654 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty est incompatible avec la spรฉcification de commits ou assimilรฉs" -#: builtin/describe.c:656 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "--broken est incompatible avec les commits ou assimilรฉs" -#: builtin/diff.c:84 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s' : n'est pas un fichier rรฉgulier ni un lien symbolique" -#: builtin/diff.c:235 +#: builtin/diff.c:241 #, c-format msgid "invalid option: %s" msgstr "option invalide : %s" -#: builtin/diff.c:350 +#: builtin/diff.c:358 +#, c-format +msgid "%s...%s: no merge base" +msgstr "%s..%s: pas de base de fusion" + +#: builtin/diff.c:468 msgid "Not a git repository" msgstr "Ce n'est pas un dรฉpรดt git !" -#: builtin/diff.c:394 +#: builtin/diff.c:513 #, c-format msgid "invalid object '%s' given." msgstr "objet spรฉcifiรฉ '%s' invalide." -#: builtin/diff.c:403 +#: builtin/diff.c:524 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spรฉcifiรฉs : '%s'" -#: builtin/diff.c:408 +#: builtin/diff.c:529 #, c-format msgid "unhandled object '%s' given." msgstr "objet non gรฉrรฉ '%s' spรฉcifiรฉ." +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "\"%s...%s\"ย : bases multiples de fusion, utilisation de %s" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "รฉchec : %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "impossible de lire le fichier symlink %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, 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:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12722,53 +14323,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:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "les deux fichiers sont modifiรฉsย : '%s' et '%s'." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "le fichier dans l'arbre de travail a รฉtรฉ laissรฉ." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "des fichiers temporaires existent dans '%s'." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "vous pourriez souhaiter les nettoyer ou les rรฉcupรฉrer." -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utiliser `diff.guitool` au lieu de `diff.tool`" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "rรฉalise un diff de rรฉpertoire complet" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "ne pas confirmer avant de lancer l'outil de diff" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "utiliser les liens symboliques en mode de diff de rรฉpertoire" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "outil" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "utiliser l'outil de diff spรฉcifiรฉ" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 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:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12776,31 +14377,31 @@ msgstr "" "provoque la fin de 'git-difftool' si l'outil de diff invoquรฉ renvoie un code " "non-nul" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "spรฉcifier une commande personnalisรฉe pour visualiser les diffรฉrences" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "passรฉ ร `diff`" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool exige un arbre de travail ou --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff est incompatible avec --no-index" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "pas d'<outil> spรฉcifiรฉ pour --tool=<outil>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "pas de <commande> spรฉcifiรฉ pour --extcmd=<commande>" @@ -12808,27 +14409,27 @@ msgstr "pas de <commande> spรฉcifiรฉ pour --extcmd=<commande>" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <options> <var d'env>" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "type" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "valeur par dรฉfaut pour git_env_*(...) en cas d'absence" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "" "mode silencieux n'utilisant la valeur de git_env_*() que pour le code de " "sortie" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" "l'option `--default` attend une valeur boolรฉenne avec `--type=bool`, pas `%s`" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -12841,164 +14442,249 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-rรฉvisions]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:868 +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:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "le jeton --anonymize-map ne peut pas รชtre vide" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "afficher la progression aprรจs <n> objets" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "sรฉlectionner la gestion des รฉtiquettes signรฉes" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1203 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:1132 +#: builtin/fast-export.c:1206 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:1135 +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1215 +msgid "Import marks from this file if it exists" +msgstr "importer les marques depuis ce fichier s'il existe" + +#: builtin/fast-export.c:1217 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:1141 +#: builtin/fast-export.c:1219 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1221 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "Sauter l'affichage de donnรฉes de blob" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1223 builtin/log.c:1811 msgid "refspec" msgstr "spรฉcificateur de rรฉfรฉrence" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1224 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:1147 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "depuis:vers" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "convertit <depuis> en <vers> dans la sortie anonymisรฉe" + +#: builtin/fast-export.c:1230 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:1151 +#: builtin/fast-export.c:1232 msgid "Show original object ids of blobs/commits" msgstr "Afficher les ids d'objet originaux des blobs/commits" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1234 +msgid "Label tags with mark ids" +msgstr "Marquer les รฉtiquettes avec des ids de marque" + +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "--anonymize-map n'a aucune signification sans --anonymize" + +#: builtin/fast-export.c:1272 +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/fast-import.c:3086 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "Champs from manquants pour le sous-module '%s'" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "champs to manquants pour le sous-module '%s'" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "commande 'mark' attendue, %s trouvรฉ" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "commande 'to' attendue, %s trouvรฉ" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "" +"Format attendu nom:<nom de fichier> pour l'option de rรฉรฉcriture de sous-" +"module" + +#: builtin/fast-import.c:3374 +#, 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" + +#: builtin/fetch-pack.c:241 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "Fichier verrou crรฉรฉ mais non reportรฉ : %s" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dรฉpรดt> [<spรฉcification-de-rรฉfรฉrence>...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dรฉpรดt> | <groupe>)...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel ne peut pas รชtre nรฉgatif" + +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "rรฉcupรฉrer depuis tous les dรฉpรดts distants" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:144 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "dรฉfinir la branche amont pour git pull/fetch" + +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter ร .git/FETCH_HEAD au lieu de l'รฉcraser" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "chemin vers lequel tรฉlรฉcharger le paquet sur le poste distant" -#: builtin/fetch.c:130 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "forcer l'รฉcrasement de la branche locale" -#: builtin/fetch.c:132 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "rรฉcupรฉrer depuis plusieurs dรฉpรดts distants" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "rรฉcupรฉrer toutes les รฉtiquettes et leurs objets associรฉs" -#: builtin/fetch.c:136 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas rรฉcupรฉrer toutes les รฉtiquettes (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules rรฉcupรฉrรฉs en parallรจle" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:159 builtin/pull.c:198 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:142 +#: builtin/fetch.c:161 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:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "ร la demande" -#: builtin/fetch.c:144 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "contrรดler la rรฉcupรฉration rรฉcursive dans les sous-modules" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "รฉcrire les rรฉfรฉrences rรฉcupรฉrรฉes dans le fichier FETCH_HEAD" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "conserver le paquet tรฉlรฉchargรฉ" -#: builtin/fetch.c:150 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "permettre la mise ร jour de la rรฉfรฉrence HEAD" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:155 +#: builtin/fetch.c:176 builtin/pull.c:212 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:161 builtin/pull.c:230 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "convertir en un dรฉpรดt complet" -#: builtin/fetch.c:164 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "prรฉfixer ceci ร la sortie du chemin du sous-module" -#: builtin/fetch.c:167 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -13006,91 +14692,99 @@ 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:171 builtin/pull.c:233 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "accepter les rรฉfรฉrences qui mettent ร jour .git/shallow" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "correspondance de rรฉfรฉrence" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "spรฉcifier une correspondance de rรฉfรฉrence pour la rรฉcupรฉration" -#: builtin/fetch.c:180 +#: builtin/fetch.c:201 builtin/pull.c:240 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:183 -msgid "run 'gc --auto' after fetching" -msgstr "lancer 'gc --auto' aprรจs la rรฉcupรฉration" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "lancer 'maintenance --auto' aprรจs la rรฉcupรฉration" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:208 builtin/pull.c:243 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:491 +#: builtin/fetch.c:210 +msgid "write the commit-graph after fetching" +msgstr "รฉcrire le graphe de commits aprรจs le rapatriement" + +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "lire les spรฉcificateurs de rรฉfรฉrence depuis l'entrรฉe standard" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la rรฉfรฉrence HEAD distante" -#: builtin/fetch.c:630 +#: builtin/fetch.c:677 #, 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:728 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "objet %s non trouvรฉ" -#: builtin/fetch.c:732 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "[ร jour]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[rejetรฉ]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "impossible de rรฉcupรฉrer dans la branche actuelle" -#: builtin/fetch.c:756 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[mise ร jour de l'รฉtiquette]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "impossible de mettre ร jour la rรฉfรฉrence locale" -#: builtin/fetch.c:761 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "รฉcraserait l'รฉtiquette existante" -#: builtin/fetch.c:783 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[nouvelle รฉtiquette]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[nouvelle rรฉfรฉrence]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:875 msgid "forced update" msgstr "mise ร jour forcรฉe" -#: builtin/fetch.c:833 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "pas en avance rapide" -#: builtin/fetch.c:854 +#: builtin/fetch.c:901 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" @@ -13100,7 +14794,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:858 +#: builtin/fetch.c:905 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13112,23 +14806,23 @@ msgstr "" "Vous pouvez utiliser '--no-show-forced-update' ou lancer\n" "'git config fetch.showForcedUpdates false' pour รฉviter ceci.\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:939 #, 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:909 +#: builtin/fetch.c:960 #, 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:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13137,58 +14831,79 @@ 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:1101 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[supprimรฉ]" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1195 builtin/remote.c:1113 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1218 #, 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:1177 +#: builtin/fetch.c:1237 #, 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:1180 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorรฉe pour %s\n" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "branches multiples dรฉtectรฉes, imcompatible avec --set-upstream" + +#: builtin/fetch.c:1463 +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:1465 +msgid "not setting upstream for a remote tag" +msgstr "dรฉpรดt amont non dรฉfini pour l'รฉtiquette distante" + +#: builtin/fetch.c:1467 +msgid "unknown branch type" +msgstr "type de branche inconnu" + +#: builtin/fetch.c:1469 +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:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "Rรฉcupรฉration de %s\n" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Impossible de rรฉcupรฉrer %s" -#: 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:1620 +#, 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:1556 +#: builtin/fetch.c:1724 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13196,46 +14911,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:1593 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "Vous devez spรฉcifier un nom d'รฉtiquette." -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "Une profondeur nรฉgative dans --deepen n'est pas supportรฉe" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen et --depth sont mutuellement exclusifs" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas รชtre utilisรฉs ensemble" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1834 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:1669 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dรฉpรดt" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1853 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:1680 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1869 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:1703 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13243,29 +14958,33 @@ msgstr "" "--filter ne peut รชtre utilisรฉ qu'avec le dรฉpรดt distant configurรฉ dans " "extensions.partialClone" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "--stdin ne peut รชtre utilisรฉe qu'en rรฉcupรฉrant depuis un seul distant" + +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 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:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "alias pour --log (obsolรจte)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "texte" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "utiliser <texte> comme dรฉbut de message" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "fichier d'oรน lire" @@ -13278,8 +14997,8 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <objet>]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" @@ -13305,7 +15024,7 @@ msgstr "รฉchapper les champs rรฉservรฉs pour compatibilitรฉ avec Tcl" msgid "show only <n> matched refs" msgstr "n'afficher que <n> rรฉfรฉrences correspondant" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "respecter les couleurs de formatage" @@ -13329,32 +15048,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:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "inconnu" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, 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:131 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" msgstr "avertissement dans l'objet %s %sย : %s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "lien cassรฉ dans l'objet %7s %s" -#: builtin/fsck.c:168 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "type d'objet inconnu dans le lien" -#: builtin/fsck.c:184 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" @@ -13363,236 +15082,236 @@ msgstr "" "lien cassรฉ depuis %7s %s\n" " vers %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "objet %s manquant %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "objet %s inatteignable %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "objet %s fantรดme %s" -#: builtin/fsck.c:349 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "impossible de crรฉer le fichier lost-found" -#: builtin/fsck.c:360 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "impossible de finir '%s'" -#: builtin/fsck.c:377 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "Vรฉrification de l'objet %s" -#: builtin/fsck.c:415 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Vรฉrification de la connectivitรฉ (%d objets)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "Vรฉrification de l'objet %s %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:430 msgid "broken links" msgstr "liens cassรฉs" -#: builtin/fsck.c:447 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "racine %s" -#: builtin/fsck.c:455 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "รฉtiquetage de l'objet %s %s (%s) dans %s" -#: builtin/fsck.c:484 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "%sย : objet corrompu ou manquant" -#: builtin/fsck.c:509 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%sย : entrรฉe %s de journal de rรฉfรฉrences invalide" -#: builtin/fsck.c:523 +#: builtin/fsck.c:515 #, c-format msgid "Checking reflog %s->%s" msgstr "Vรฉrification du journal de rรฉferences %s-> %s" -#: builtin/fsck.c:557 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%sย : pointeur de sha1 invalide %s" -#: builtin/fsck.c:564 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "l'objet %s n'est pas un commit" -#: builtin/fsck.c:619 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "Noteย : pas de rรฉfรฉrence par dรฉfaut" -#: builtin/fsck.c:634 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%sย : objet corrompu ou manquantย : %s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%sย : impossible d'analyserย : %s" -#: builtin/fsck.c:667 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "mauvais fichier de sha1ย : %s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "Vรฉrification du rรฉpertoire d'objet" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "Vรฉrification des rรฉpertoires d'objet" -#: builtin/fsck.c:700 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "Vรฉrification du lien %s" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "%s invalide" -#: builtin/fsck.c:712 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pointe sur quelque chose bizarre (%s)" -#: builtin/fsck.c:718 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%sย : la HEAD dรฉtachรฉe ne pointe sur rien" -#: builtin/fsck.c:722 +#: builtin/fsck.c:713 #, 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:734 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "Vรฉrification de l'arbre cache" -#: builtin/fsck.c:739 +#: builtin/fsck.c:730 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%sย : pointer sha1 invalide dans l'arbre de cache" -#: builtin/fsck.c:750 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "non-arbre dans l'arbre de cache" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "afficher les รฉtiquettes" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "signaler les nลuds racines" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 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:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "considรฉrer les reflogs comme nลuds tรชte (par dรฉfaut)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "ne vรฉrifier que la connectivitรฉ" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "activer une vรฉrification plus strict" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "รฉcrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "afficher les noms รฉtendus pour les objets inaccessibles" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Vรฉrification des objets" -#: builtin/fsck.c:887 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "%sย : objet manquant" -#: builtin/fsck.c:899 +#: builtin/fsck.c:886 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "paramรจtre invalideย : sha-1 attendu, '%s' trouvรฉ" -#: builtin/gc.c:34 +#: builtin/gc.c:36 msgid "git gc [<options>]" msgstr "git gc [<options>]" -#: builtin/gc.c:90 +#: builtin/gc.c:91 #, c-format msgid "Failed to fstat %s: %s" msgstr "รchec du stat de %sย : %s" -#: builtin/gc.c:126 +#: builtin/gc.c:127 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "รฉchec de l'analyse de '%s' valeur '%s'" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "impossible de faire un stat de '%s'" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" @@ -13677,7 +15396,60 @@ msgstr "" "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les " "supprimer." -#: builtin/grep.c:29 +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<tรขche>]" + +#: builtin/gc.c:812 +msgid "failed to write commit-graph" +msgstr "รฉchec de l'รฉcriture du graphe de commits" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "le fichier verrou '%s' existe, pas de maintenance" + +#: builtin/gc.c:932 +#, c-format +msgid "task '%s' failed" +msgstr "รฉchec de la tรขche '%s'" + +#: builtin/gc.c:979 +#, c-format +msgid "'%s' is not a valid task" +msgstr "'%s' n'est pas une tรขche valide" + +#: builtin/gc.c:984 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "la tรขche '%s' ne peut pas รชtre sรฉlectionnรฉe plusieurs fois" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "lancer les tรขches selon l'รฉtat du dรฉpรดt" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "ne pas afficher le progrรจs ou d'autres informations sur stderr" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "tรขche" + +#: builtin/gc.c:1003 +msgid "run a specific task" +msgstr "lancer une tรขche spรฉcifique" + +#: builtin/gc.c:1026 +msgid "git maintenance run [<options>]" +msgstr "git maintenance run [<options>]" + +#: builtin/gc.c:1037 +#, c-format +msgid "invalid subcommand: %s" +msgstr "sous-commande invalide : %s" + +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<options>] [-e] <motif> [<rรฉvision>...] [[--] <chemin>...]" @@ -13695,266 +15467,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:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:655 #, 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:714 +#: builtin/grep.c:725 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend une valeur numรฉrique" -#: builtin/grep.c:813 +#: builtin/grep.c:824 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:815 +#: builtin/grep.c:826 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gรฉrรฉs par git" -#: builtin/grep.c:817 +#: builtin/grep.c:828 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:819 +#: builtin/grep.c:830 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spรฉcifiรฉs via '.gitignore'" -#: builtin/grep.c:821 +#: builtin/grep.c:832 msgid "recursively search in each submodule" msgstr "rechercher rรฉcursivement dans chaque sous-module" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "case insensitive matching" msgstr "correspondance insensible ร la casse" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux sรฉparateurs de mots" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "search in subdirectories (default)" msgstr "rechercher dans les sous-rรฉpertoires (dรฉfaut)" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions rรฉguliรจres รฉtendues POSIX" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions rรฉguliรจres basiques POSIX (par dรฉfaut)" -#: builtin/grep.c:849 +#: builtin/grep.c:860 msgid "interpret patterns as fixed strings" msgstr "interprรฉter les motifs comme de chaรฎnes fixes" -#: builtin/grep.c:852 +#: builtin/grep.c:863 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions rรฉguliรจres compatibles avec Perl" -#: builtin/grep.c:855 +#: builtin/grep.c:866 msgid "show line numbers" msgstr "afficher les numรฉros de ligne" -#: builtin/grep.c:856 +#: builtin/grep.c:867 msgid "show column number of first match" msgstr "afficher le numรฉro de colonne de la premiรจre correspondance" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:858 +#: builtin/grep.c:869 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au rรฉpertoire de base" -#: builtin/grep.c:862 +#: builtin/grep.c:873 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:864 +#: builtin/grep.c:875 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "print NUL after filenames" msgstr "imprimer une caractรจre NUL aprรจs le noms de fichier" -#: builtin/grep.c:872 +#: builtin/grep.c:883 msgid "show only matching parts of a line" msgstr "n'afficher que les parties correspondantes d'une ligne" -#: builtin/grep.c:874 +#: builtin/grep.c:885 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:875 +#: builtin/grep.c:886 msgid "highlight matches" msgstr "mettre en รฉvidence les correspondances" -#: builtin/grep.c:877 +#: builtin/grep.c:888 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers diffรฉrents" -#: builtin/grep.c:879 +#: builtin/grep.c:890 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:882 +#: builtin/grep.c:893 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et aprรจs les correspondances" -#: builtin/grep.c:885 +#: builtin/grep.c:896 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:887 +#: builtin/grep.c:898 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte aprรจs les correspondances" -#: builtin/grep.c:889 +#: builtin/grep.c:900 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:893 +#: builtin/grep.c:904 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:895 +#: builtin/grep.c:906 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:902 +#: builtin/grep.c:913 msgid "combine patterns specified with -e" msgstr "combiner les motifs spรฉcifiรฉs par -e" -#: builtin/grep.c:914 +#: builtin/grep.c:925 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:916 +#: builtin/grep.c:927 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:918 +#: builtin/grep.c:929 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:926 +#: builtin/grep.c:937 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignorรฉ par ce build)" -#: builtin/grep.c:990 +#: builtin/grep.c:1004 msgid "no pattern given" msgstr "aucun motif fourni" -#: builtin/grep.c:1026 +#: builtin/grep.c:1040 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:1034 +#: builtin/grep.c:1048 #, c-format msgid "unable to resolve revision: %s" msgstr "impossible de rรฉsoudre la rรฉvisionย : %s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1078 +msgid "--untracked not supported with --recurse-submodules" +msgstr "--untracked non supportรฉe avec --recurse-submodules" + +#: builtin/grep.c:1082 msgid "invalid option combination, ignoring --threads" msgstr "option de combinaison invalide, ignore --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "pas de support des fils, ignore --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spรฉcifiรฉ invalide (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1122 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:1117 -msgid "option not supported with --recurse-submodules" -msgstr "option non supportรฉe avec --recurse-submodules" - -#: builtin/grep.c:1123 +#: builtin/grep.c:1148 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:1129 +#: builtin/grep.c:1154 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:1137 +#: builtin/grep.c:1162 msgid "both --cached and trees are given" msgstr "--cached et des arbres sont fournis en mรชme temps" @@ -13997,66 +15769,66 @@ msgstr "" msgid "process file as it were from this path" msgstr "traiter le fichier comme s'il venait de ce chemin" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "afficher toutes les commandes disponibles" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "exclure les guides" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "afficher une liste de guides utiles" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "afficher tous les noms de variables de configuration" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "afficher la page de manuel" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "afficher le manuel dans un navigateur web" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "afficher la page info" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "afficher la description de la commande" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "format d'aide non reconnu '%s'" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "รฉchec de dรฉmarrage d'emacsclient." -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "รฉchec d'analyse de la version d'emacsclient." -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la version d'emacsclient '%d' est trop ancienne (<22)." -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "รฉchec de l'exรฉcution de '%s'" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -14065,7 +15837,7 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel non supportรฉ.\n" "Veuillez utiliser plutรดt 'man.<outil>.cmd'." -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -14074,397 +15846,425 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel supportรฉ.\n" "Veuillez utiliser plutรดt 'man.<outil>.cmd'." -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s' : visualiseur de manuel inconnu." -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "aucun visualiseur de manuel n'a pris en charge la demande" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' est un alias de '%s'" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "Mauvais chaรฎne alias.%sย : %s" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "usage : %s%s" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "'git help config' pour plus d'information" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "type d'objet non correspondant ร %s" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "objet attendu non reรงu %s" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objet %s : type attendu %s, reรงu %s" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "impossible de remplir %d octet" msgstr[1] "impossible de remplir %d octets" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "fin de fichier prรฉmaturรฉe" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "erreur de lecture sur l'entrรฉe" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "plus d'octets utilisรฉs que disponibles" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 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:94 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "le paquet dรฉpasse la taille maximale permise" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:342 builtin/repack.c:254 +#, c-format +msgid "unable to create '%s'" +msgstr "impossible de crรฉer '%s'" + +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "impossible d'ouvrir le fichier paquet '%s'" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "la signature du paquet ne correspond pas" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la version de paquet %<PRIu32> non supportรฉe" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "le paquet a un mauvais objet ร l'offset %<PRIuMAX>ย : %s" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "la dรฉcompression (inflate) a retournรฉ %d" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "dรฉpassement de la valeur d'offset pour l'objet delta de base" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "l'objet delta de base est hors limite" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "type d'objet inconnu %d" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "impossible de lire (pread) le fichier paquet" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "fin prรฉmaturรฉe du fichier paquet, %<PRIuMAX> octet lu" msgstr[1] "fin prรฉmaturรฉe du fichier paquet, %<PRIuMAX> octets lus" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 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:764 -#: builtin/index-pack.c:803 builtin/index-pack.c:812 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVรE AVEC %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:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "impossible de lire l'information existante de l'objet %s" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "impossible de lire l'objet existant %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "objet blob invalide %s" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "erreur de fsck dans l'objet empaquetรฉ" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:870 #, 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:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "รฉchec d'application du delta" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "Rรฉception d'objets" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "Indexation d'objets" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "le paquet est corrompu (SHA1 ne correspond pas)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "le paquet est invalide ร la fin" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusion extrรชme dans parse_pack_objects()" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "Rรฉsolution des deltas" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "impossible de crรฉer le fil : %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "confusion extrรชme" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1288 #, 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:1264 +#: builtin/index-pack.c:1300 #, 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:1268 +#: builtin/index-pack.c:1304 #, 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:1292 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajoutรฉ (%d)" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1444 #, 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:1427 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "impossible d'รฉcrire le fichier %s '%s'" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "impossible de fermer le fichier %s รฉcrit '%s'" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1633 #, 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:1643 +#: builtin/index-pack.c:1681 #, 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:1650 +#: builtin/index-pack.c:1688 #, 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:1689 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au rรฉpertoire de travail courant" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "algorithme d'empreinte inconnu '%s'" + +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas รชtre utilisรฉ sans --stdin" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "--stdin requiert un dรฉpรดt git" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1825 +msgid "--object-format cannot be used with --stdin" +msgstr "--object-format ne peut pas รชtre utilisรฉ avec --stdin" + +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donnรฉ" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "erreur de fsck dans les objets paquets" -#: builtin/init-db.c:61 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "impossible de faire un stat du modรจle '%s'" -#: builtin/init-db.c:66 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "impossible d'ouvrir le rรฉpertoire '%s'" -#: builtin/init-db.c:78 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "impossible de lire le lien '%s'" -#: builtin/init-db.c:80 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "impossible de crรฉer un lien symbolique de '%s' '%s'" -#: builtin/init-db.c:86 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: builtin/init-db.c:90 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "modรจle %s ignorรฉ" -#: builtin/init-db.c:121 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "modรจles non trouvรฉs dans %s" -#: builtin/init-db.c:136 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "pas de copie des modรจles depuis '%s'ย : %s" -#: builtin/init-db.c:334 +#: builtin/init-db.c:274 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "Nom de branche initiale invalide : '%s'" + +#: builtin/init-db.c:366 #, c-format msgid "unable to handle file type %d" msgstr "impossible de traiter le fichier de type %d" -#: builtin/init-db.c:337 +#: builtin/init-db.c:369 #, c-format msgid "unable to move %s to %s" msgstr "impossible de dรฉplacer %s vers %s" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "essai de rรฉinitialisation du dรฉpรดt avec une empreinte diffรฉrente" + +#: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format msgid "%s already exists" msgstr "%s existe dรฉjร " -#: builtin/init-db.c:413 +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-initialisationย : --initial-branch=%s ignorรฉ" + +#: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Dรฉpรดt Git existant partagรฉ rรฉinitialisรฉ dans %s%s\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Dรฉpรดt Git existant rรฉinitialisรฉ dans %s%s\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Dรฉpรดt Git vide partagรฉ initialisรฉ dans %s%s\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Dรฉpรดt Git vide initialisรฉ dans %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:529 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -14472,25 +16272,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<rรฉpertoire-modรจle>] [--" "shared[=<permissions>]] [<rรฉpertoire>]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:555 msgid "permissions" msgstr "permissions" -#: builtin/init-db.c:492 +#: builtin/init-db.c:556 msgid "specify that the git repository is to be shared amongst several users" msgstr "spรฉcifier que le dรฉpรดt git sera partagรฉ entre plusieurs utilisateurs" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:562 +msgid "override the name of the initial branch" +msgstr "outrepasser le nom de la branche initiale" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +msgid "hash" +msgstr "empreinte" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "spรฉcifier l'algorithme d'empreinte ร utiliser" + +#: builtin/init-db.c:571 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--separate-git-dir et --bare sont mutuellement exclusifs" + +#: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format msgid "cannot mkdir %s" msgstr "impossible de crรฉer le rรฉpertoire (mkdir) %s" -#: builtin/init-db.c:538 +#: builtin/init-db.c:609 builtin/init-db.c:664 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se dรฉplacer vers le rรฉpertoire (chdir) %s" -#: builtin/init-db.c:559 +#: builtin/init-db.c:636 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -14499,11 +16315,15 @@ msgstr "" "%s (ou --work-tree=<rรฉpertoire>) n'est pas autorisรฉ sans spรฉcifier %s (ou --" "git-dir=<rรฉpertoire>)" -#: builtin/init-db.c:587 +#: builtin/init-db.c:688 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accรฉder ร l'arbre de travail '%s'" +#: builtin/init-db.c:693 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separate-git-dir est incompatible avec un dรฉpรดt nu" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -14568,123 +16388,128 @@ 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:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<options>] [<plage de rรฉvisions>] [[--] <chemin>...]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<options>] <objet>..." -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" -#: builtin/log.c:173 +#: builtin/log.c:177 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:174 +#: builtin/log.c:178 msgid "Use mail map file" msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:176 +#: builtin/log.c:181 msgid "only decorate refs that match <pattern>" msgstr "dรฉcorer seulement les rรฉfรฉrences correspondant ร <motif>" -#: builtin/log.c:178 +#: builtin/log.c:183 msgid "do not decorate refs that match <pattern>" msgstr "ne pas dรฉcorer les rรฉfรฉrences correspondant ร <motif>" -#: builtin/log.c:179 +#: builtin/log.c:184 msgid "decorate options" msgstr "dรฉcorer les options" -#: builtin/log.c:182 +#: builtin/log.c:187 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:280 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:555 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:570 builtin/log.c:665 #, c-format msgid "could not read object %s" msgstr "impossible de lire l'objet %s" -#: builtin/log.c:668 +#: builtin/log.c:690 #, c-format msgid "unknown type: %d" msgstr "type inconnu : %d" -#: builtin/log.c:791 +#: builtin/log.c:839 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%sย : couverture invalide pour le mode de description" + +#: builtin/log.c:846 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:908 +#: builtin/log.c:965 msgid "name of output directory is too long" msgstr "le nom du rรฉpertoire de sortie est trop long" -#: builtin/log.c:924 +#: builtin/log.c:981 #, c-format msgid "cannot open patch file %s" msgstr "impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:941 +#: builtin/log.c:998 msgid "need exactly one range" msgstr "exactement une plage nรฉcessaire" -#: builtin/log.c:951 +#: builtin/log.c:1008 msgid "not a range" msgstr "ceci n'est pas une plage" -#: builtin/log.c:1074 +#: builtin/log.c:1172 msgid "cover letter needs email format" msgstr "la lettre de motivation doit รชtre au format courriel" -#: builtin/log.c:1080 +#: builtin/log.c:1178 msgid "failed to create cover-letter file" msgstr "รฉchec de crรฉation du fichier de lettre de motivation" -#: builtin/log.c:1159 +#: builtin/log.c:1259 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1186 +#: builtin/log.c:1286 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de rรฉvisions>]" -#: builtin/log.c:1244 +#: builtin/log.c:1344 msgid "two output directories?" msgstr "deux rรฉpertoires de sortieย ?" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 #, c-format msgid "unknown commit %s" msgstr "commit inconnu %s" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1506 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:1370 +#: builtin/log.c:1515 msgid "could not find exact merge base" msgstr "impossible de trouver la base de fusion exacte" -#: builtin/log.c:1374 +#: builtin/log.c:1525 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" @@ -14697,275 +16522,293 @@ msgstr "" "Ou vous pouvez spรฉcifier le commit de base par --base=<id-du-commit-de-base> " "manuellement" -#: builtin/log.c:1394 +#: builtin/log.c:1548 msgid "failed to find exact merge base" msgstr "รฉchec ร trouver la base de fusion exacte" -#: builtin/log.c:1405 +#: builtin/log.c:1565 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:1409 +#: builtin/log.c:1575 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:1462 +#: builtin/log.c:1633 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: 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:1690 +msgid "failed to infer range-diff origin of current series" +msgstr "" +"รฉchec d'infรฉrence de l'origine de diffรฉrence d'intervalles de la sรฉrie " +"actuelle" + +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "" +"utilisation de '%s' comme une diffรฉrence d'intervalle pour la sรฉrie actuelle" -#: builtin/log.c:1559 +#: builtin/log.c:1736 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] mรชme avec un patch unique" -#: builtin/log.c:1562 +#: builtin/log.c:1739 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] mรชme avec des patchs multiples" -#: builtin/log.c:1566 +#: builtin/log.c:1743 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1568 +#: builtin/log.c:1745 msgid "generate a cover letter" msgstr "gรฉnรฉrer une lettre de motivation" -#: builtin/log.c:1570 +#: builtin/log.c:1747 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:1571 +#: builtin/log.c:1748 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1572 +#: builtin/log.c:1749 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1574 +#: builtin/log.c:1751 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:1576 +#: builtin/log.c:1753 msgid "mark the series as Nth re-roll" msgstr "marquer la sรฉrie comme une Niรจme rรฉรฉdition" -#: builtin/log.c:1578 +#: builtin/log.c:1755 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" -#: builtin/log.c:1581 +#: builtin/log.c:1758 +msgid "cover-from-description-mode" +msgstr "cover-from-description-mode" + +#: builtin/log.c:1759 +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:1761 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<prรฉfixe>] au lieu de [PATCH]" -#: builtin/log.c:1584 +#: builtin/log.c:1764 msgid "store resulting files in <dir>" msgstr "stocker les fichiers rรฉsultats dans <rรฉpertoire>" -#: builtin/log.c:1587 +#: builtin/log.c:1767 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1590 +#: builtin/log.c:1770 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1592 +#: builtin/log.c:1772 msgid "output all-zero hash in From header" msgstr "รฉcrire une empreinte ร zรฉro dans l'entรชte From" -#: builtin/log.c:1594 +#: builtin/log.c:1774 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant ร un commit amont" -#: builtin/log.c:1596 +#: builtin/log.c:1776 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:1598 +#: builtin/log.c:1778 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1599 +#: builtin/log.c:1779 msgid "header" msgstr "en-tรชte" -#: builtin/log.c:1600 +#: builtin/log.c:1780 msgid "add email header" msgstr "ajouter l'en-tรชte de courriel" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1781 builtin/log.c:1782 msgid "email" msgstr "courriel" -#: builtin/log.c:1601 +#: builtin/log.c:1781 msgid "add To: header" msgstr "ajouter l'en-tรชte \"To:\"" -#: builtin/log.c:1603 +#: builtin/log.c:1782 msgid "add Cc: header" msgstr "ajouter l'en-tรชte \"Cc:\"" -#: builtin/log.c:1605 +#: builtin/log.c:1783 msgid "ident" msgstr "ident" -#: builtin/log.c:1606 +#: builtin/log.c:1784 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:1608 +#: builtin/log.c:1786 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1609 +#: builtin/log.c:1787 msgid "make first mail a reply to <message-id>" msgstr "rรฉpondre dans le premier message ร <id-message>" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1788 builtin/log.c:1791 msgid "boundary" msgstr "limite" -#: builtin/log.c:1611 +#: builtin/log.c:1789 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1614 +#: builtin/log.c:1792 msgid "inline the patch" msgstr "patch ร l'intรฉrieur" -#: builtin/log.c:1618 +#: builtin/log.c:1796 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1620 +#: builtin/log.c:1798 msgid "signature" msgstr "signature" -#: builtin/log.c:1621 +#: builtin/log.c:1799 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1622 +#: builtin/log.c:1800 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1623 +#: builtin/log.c:1801 msgid "add prerequisite tree info to the patch series" msgstr "Ajouter un arbre prรฉrequis ร la sรฉrie de patchs" -#: builtin/log.c:1625 +#: builtin/log.c:1804 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1626 +#: builtin/log.c:1805 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1628 +#: builtin/log.c:1807 msgid "show progress while generating patches" msgstr "" "afficher la barre de progression durant la phase de gรฉnรฉration des patchs" -#: builtin/log.c:1630 +#: builtin/log.c:1809 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:1633 +#: builtin/log.c:1812 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:1635 +#: builtin/log.c:1814 msgid "percentage by which creation is weighted" msgstr "pourcentage par lequel la crรฉation est pondรฉrรฉe" -#: builtin/log.c:1710 +#: builtin/log.c:1896 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1725 +#: builtin/log.c:1911 msgid "-n and -k are mutually exclusive" msgstr "-n et -k sont mutuellement exclusifs" -#: builtin/log.c:1727 +#: builtin/log.c:1913 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs" -#: builtin/log.c:1735 +#: builtin/log.c:1921 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1737 +#: builtin/log.c:1923 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1739 +#: builtin/log.c:1925 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1771 +#: builtin/log.c:1958 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou rรฉpertoire, lequel ?" -#: builtin/log.c:1860 +#: builtin/log.c:2062 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:1864 +#: builtin/log.c:2066 msgid "Interdiff:" msgstr "Interdiffย :" -#: builtin/log.c:1865 +#: builtin/log.c:2067 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contre v%dย :" -#: builtin/log.c:1871 +#: builtin/log.c:2073 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiert --range-diff" -#: builtin/log.c:1875 +#: builtin/log.c:2077 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:1883 +#: builtin/log.c:2085 msgid "Range-diff:" msgstr "Diff-intervalleย :" -#: builtin/log.c:1884 +#: builtin/log.c:2086 #, c-format msgid "Range-diff against v%d:" msgstr "Diff-intervalle contre v%dย :" -#: builtin/log.c:1895 +#: builtin/log.c:2097 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:1931 +#: builtin/log.c:2133 msgid "Generating patches" msgstr "Gรฉnรฉration des patchs" -#: builtin/log.c:1975 +#: builtin/log.c:2177 msgid "failed to create output files" msgstr "รฉchec de crรฉation des fichiers en sortie" -#: builtin/log.c:2034 +#: builtin/log.c:2236 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:2088 +#: builtin/log.c:2290 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14973,110 +16816,110 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spรฉcifier " "<branche_amont> manuellement.\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<options>] [<fichier>...]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "identifier l'รฉtat de fichier avec les รฉtiquettes" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "utiliser des minuscules pour les fichiers 'assumรฉs inchangรฉs'" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (dรฉfaut)" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimรฉs dans la sortie" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "afficher les fichiers modifiรฉs dans la sortie" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorรฉs dans la sortie" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexรฉs dans la sortie" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "" "afficher les fichiers du systรจme de fichiers qui ont besoin d'รชtre supprimรฉs" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des rรฉpertoires 'other'" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "afficher les fins de lignes des fichiers" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "ne pas afficher les rรฉpertoires vides" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnรฉs dans la sortie" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "les motifs d'exclusion sont lus depuis <fichier>" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "lire des motifs d'exclusion additionnels par rรฉpertoire dans <fichier>" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "afficher en relatif par rapport au rรฉpertoire racine du projet" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "parcourir rรฉcursivement les sous-modules" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "arbre ou apparentรฉ" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "considรฉrer que les chemins supprimรฉs depuis <arbre ou apparentรฉ> sont " "toujours prรฉsents" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "afficher les donnรฉes de dรฉbogage" @@ -15094,7 +16937,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:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 msgid "exec" msgstr "exรฉcutable" @@ -15171,194 +17014,305 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "mbox videย : '%s'" -#: builtin/merge.c:55 +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <commit> <commit>..." + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <commit>..." + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <validation>..." + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <validation> <validation>" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <rรฉfรฉrence> [<validation>]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "afficher tous les ancรชtres communs" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "trouver les ancรชtres pour une fusion simple ร n points" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "afficher les rรฉvisions inaccessibles depuis les autres" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "est le premier ancรชtre de l'autre ?" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "trouver oรน <validation> a divergรฉ du reflog de <rรฉfรฉrence>" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" +"git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> " +"<fichier-orig> <fichier2>" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "envoyer les rรฉsultats sur la sortie standard" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "utiliser une fusion basรฉe sur diff3" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "pour les conflits, utiliser notre version (our)" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "pour les conflits, utiliser leur version (their)" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "pour les conflits, utiliser l'ensemble des versions" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "pour les conflits, utiliser cette taille de marqueur" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "ne pas avertir ร propos des conflits" + +#: builtin/merge-file.c:47 +msgid "set labels for file1/orig-file/file2" +msgstr "dรฉfinir les labels pour fichier1/fichier-orig/fichier2" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "option inconnue %s" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "Impossible d'analyser l'objet '%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] "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 +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 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "impossible de rรฉsoudre la rรฉfรฉrence '%s'" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Fusion de %s avec %s\n" + +#: builtin/merge.c:56 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<options>] [<commit>...]" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:120 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:141 +#: builtin/merge.c:143 #, c-format msgid "option `%s' requires a value" msgstr "le commutateur '%s' a besoin d'une valeur" -#: builtin/merge.c:187 +#: builtin/merge.c:189 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratรฉgie de fusion '%s'.\n" -#: builtin/merge.c:188 +#: builtin/merge.c:190 #, c-format msgid "Available strategies are:" msgstr "Les stratรฉgies disponibles sont :" -#: builtin/merge.c:193 +#: builtin/merge.c:195 #, c-format msgid "Available custom strategies are:" msgstr "Les stratรฉgies personnalisรฉes sont :" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:246 builtin/pull.c:133 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:247 builtin/pull.c:154 +#: builtin/merge.c:249 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat ร la fin de la fusion" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:250 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:252 builtin/pull.c:142 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:253 builtin/pull.c:166 +#: builtin/merge.c:255 builtin/pull.c:148 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:255 builtin/pull.c:169 +#: builtin/merge.c:257 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion rรฉussit (dรฉfaut)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:259 builtin/pull.c:154 msgid "edit message before committing" msgstr "รฉditer le message avant la validation" -#: builtin/merge.c:259 +#: builtin/merge.c:261 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (dรฉfaut)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:263 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:267 builtin/pull.c:164 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:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 msgid "strategy" msgstr "stratรฉgie" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:269 builtin/pull.c:169 msgid "merge strategy to use" msgstr "stratรฉgie de fusion ร utiliser" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "option pour la stratรฉgie de fusion sรฉlectionnรฉe" -#: builtin/merge.c:271 +#: builtin/merge.c:273 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:278 +#: builtin/merge.c:280 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:280 +#: builtin/merge.c:282 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:282 +#: builtin/merge.c:284 msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:286 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" -#: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "vรฉrifier le crochet commit-msg" +#: builtin/merge.c:293 +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg" -#: builtin/merge.c:307 +#: builtin/merge.c:310 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:312 +#: builtin/merge.c:315 msgid "stash failed" msgstr "รฉchec du remisage" -#: builtin/merge.c:317 +#: builtin/merge.c:320 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:342 builtin/merge.c:359 msgid "read-tree failed" msgstr "read-tree a รฉchouรฉ" -#: builtin/merge.c:386 +#: builtin/merge.c:389 msgid " (nothing to squash)" msgstr " (rien ร compresser)" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressรฉe -- HEAD non mise ร jour\n" -#: builtin/merge.c:447 +#: builtin/merge.c:450 #, 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:498 +#: builtin/merge.c:501 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:585 +#: builtin/merge.c:588 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaรฎne branch.%s.mergeoptions : %s" -#: builtin/merge.c:708 +#: builtin/merge.c:713 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.c:722 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "impossible d'รฉcrire %s" -#: builtin/merge.c:789 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:798 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " "fusion.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:808 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" @@ -15370,11 +17324,11 @@ msgstr "" "branche de sujet.\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:813 msgid "An empty message aborts the commit.\n" msgstr "Un message vide abandonne la validation.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:816 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15383,74 +17337,74 @@ msgstr "" "Les lignes commenรงant par '%c' seront ignorรฉes, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:869 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:872 +#: builtin/merge.c:884 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:945 #, 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:972 +#: builtin/merge.c:984 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:974 +#: builtin/merge.c:986 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:976 +#: builtin/merge.c:988 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:981 +#: builtin/merge.c:993 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1038 +#: builtin/merge.c:1050 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1141 +#: builtin/merge.c:1153 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %sย : %s" -#: builtin/merge.c:1175 +#: builtin/merge.c:1187 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1278 +#: builtin/merge.c:1291 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1282 +#: builtin/merge.c:1295 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:1291 +#: builtin/merge.c:1313 msgid "--quit expects no arguments" msgstr "--quit n'accepte pas d'argument" -#: builtin/merge.c:1304 +#: builtin/merge.c:1326 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1308 +#: builtin/merge.c:1330 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:1324 +#: builtin/merge.c:1346 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15458,7 +17412,7 @@ msgstr "" "Vous n'avez pas terminรฉ votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1331 +#: builtin/merge.c:1353 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15466,214 +17420,103 @@ msgstr "" "Vous n'avez pas terminรฉ votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1334 +#: builtin/merge.c:1356 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:1348 +#: builtin/merge.c:1370 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1350 +#: builtin/merge.c:1372 msgid "You cannot combine --squash with --commit." msgstr "Vous ne pouvez pas combiner --squash avec --commit." -#: builtin/merge.c:1366 +#: builtin/merge.c:1388 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:1383 +#: builtin/merge.c:1405 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:1385 +#: builtin/merge.c:1407 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:1390 +#: builtin/merge.c:1412 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1392 +#: builtin/merge.c:1414 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:1471 +#: builtin/merge.c:1495 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1480 +#: builtin/merge.c:1504 msgid "Already up to date." msgstr "Dรฉjร ร jour." -#: builtin/merge.c:1490 +#: builtin/merge.c:1514 #, c-format msgid "Updating %s..%s\n" msgstr "Mise ร jour %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1560 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1567 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1592 msgid "Already up to date. Yeeah!" msgstr "Dรฉjร ร jour. Ouaisย !" -#: builtin/merge.c:1570 +#: builtin/merge.c:1598 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1626 builtin/merge.c:1691 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre ร l'original...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1630 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratรฉgie de fusion %s...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1682 #, 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:1651 +#: builtin/merge.c:1684 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratรฉgie %s a รฉchouรฉ.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1693 #, 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:1672 +#: builtin/merge.c:1707 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "La fusion automatique a rรฉussi ; stoppรฉe avant la validation comme demandรฉ\n" -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <commit> <commit>..." - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <commit>..." - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <validation>..." - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <validation> <validation>" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <rรฉfรฉrence> [<validation>]" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "afficher tous les ancรชtres communs" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "trouver les ancรชtres pour une fusion simple ร n points" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "afficher les rรฉvisions inaccessibles depuis les autres" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "est le premier ancรชtre de l'autre ?" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "trouver oรน <validation> a divergรฉ du reflog de <rรฉfรฉrence>" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" -"git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> " -"<fichier-orig> <fichier2>" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "envoyer les rรฉsultats sur la sortie standard" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "utiliser une fusion basรฉe sur diff3" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "pour les conflits, utiliser notre version (our)" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "pour les conflits, utiliser leur version (their)" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "pour les conflits, utiliser l'ensemble des versions" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "pour les conflits, utiliser cette taille de marqueur" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "ne pas avertir ร propos des conflits" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "dรฉfinir les labels pour fichier1/fichier-orig/fichier2" - -#: builtin/merge-recursive.c:46 -#, c-format -msgid "unknown option %s" -msgstr "option inconnue %s" - -#: builtin/merge-recursive.c:52 -#, c-format -msgid "could not parse object '%s'" -msgstr "Impossible d'analyser l'objet '%s'" - -#: 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: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: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:78 -#, c-format -msgid "Merging %s with %s\n" -msgstr "Fusion de %s avec %s\n" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -15692,19 +17535,19 @@ msgstr "autoriser la crรฉation de plus d'un arbre" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<taille>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<taille>)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 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:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -15712,15 +17555,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:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "trop d'arguments" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 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:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "sous-commande non reconnue : %s" @@ -15753,114 +17596,119 @@ msgstr "forcer le dรฉplacement/renommage mรชme si la cible existe" msgid "skip move/rename errors" msgstr "sauter les erreurs de dรฉplacement/renommage" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "la destination '%s' n'est pas un rรฉpertoire" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Vรฉrification du renommage de '%s' en '%s'\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "mauvaise source" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "impossible de dรฉplacer un rรฉpertoire dans lui-mรชme" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "impossible de dรฉplacer un rรฉpertoire sur un fichier" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "le rรฉpertoire source est vide" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "pas sous le contrรดle de version" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "en conflit" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "la destination existe" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "รฉcrasement de '%s'" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "Impossible d'รฉcraser" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "multiples sources pour la mรชme destination" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "le rรฉpertoire de destination n'existe pas" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a รฉchouรฉ" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<options>] <validation>..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<options>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<options>] --stdin" -#: 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:524 +msgid "print only ref-based names (no object names)" +msgstr "" +"afficher seulement les noms basรฉs sur des rรฉfรฉrences (pas de nom d'objet)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "utiliser seulement les รฉtiquettes pour nommer les validations" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "utiliser seulement les rรฉfรฉrences correspondant ร <motif>" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ignorer les rรฉfรฉrences correspondant ร <motif>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les rรฉfรฉrences" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "lire depuis l'entrรฉe standard" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non dรฉfinis` (par dรฉfaut)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "dรฉrรฉfรฉrencer les รฉtiquettes en entrรฉe (usage interne)" @@ -16007,7 +17855,7 @@ msgstr "impossible d'รฉcrire l'objet note" msgid "the note contents have been left in %s" msgstr "le contenu de la note a รฉtรฉ laissรฉ dans %s" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" @@ -16241,7 +18089,7 @@ msgstr "" "validez le rรฉsultat avec 'git notes merges --commit', ou abandonnez la " "fusion avec 'git notes merge --abort'.\n" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de rรฉsoudre '%s' comme une rรฉfรฉrence valide." @@ -16260,7 +18108,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:165 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" @@ -16276,148 +18124,142 @@ 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:1598 +#: builtin/notes.c:1034 builtin/stash.c:1605 #, c-format msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [options...] [< <liste-rรฉfรฉrences> | < <liste-" "objets>]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [options...] base-name [< <liste-rรฉfรฉrences> | < <liste-" "objets>]" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "mauvais CRC d'objet empaquetรฉ pour %s" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "objet empaquetรฉ corrompu pour %s" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "delta rรฉcursif dรฉtectรฉ pour l'objet %s" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objets commandรฉs, %<PRIu32> attendus" -#: 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 +#: builtin/pack-objects.c:1004 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:854 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "รcriture des objets" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "รฉchec du stat de %s" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objets รฉcrits, %<PRIu32> attendus" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1348 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:1597 +#: builtin/pack-objects.c:1796 #, 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:1606 +#: builtin/pack-objects.c:1805 #, 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:1875 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "Dรฉcompte des objets" -#: 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 +#: builtin/pack-objects.c:2231 #, 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:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "l'objet %s ne peut รชtre lu" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, 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:2130 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "paquet sous-optimal - mรฉmoire insuffisante" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2656 #, 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:2588 +#: builtin/pack-objects.c:2795 #, 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:2675 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "inconsistance dans le compte de delta" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" +"la valeur de uploadpack.blobpackfileuri doit รชtre de la forme '<empreinte-d-" +"objet> <empreinte-de-pack> <uri>' ('%s' reรงu)" + +#: builtin/pack-objects.c:2964 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" +"l'objet est dรฉjร configurรฉ dans un autre uploadpack.blobpackfileuri ('%s' " +"reรงu)" + +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16426,7 +18268,7 @@ msgstr "" "ID d'objet de bord attendu, reรงu des donnรฉes illisiblesย :\n" "%s" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16435,256 +18277,251 @@ msgstr "" "ID d'objet attendu, reรงu des donnรฉes illisiblesย :\n" "%s" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "valeur invalide pour --missing" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "impossible d'ouvrir l'index de paquet" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:3187 #, 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:3041 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "impossible de forcer l'objet libre" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "'%s' n'est pas une rรฉvision" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "mauvaise rรฉvision '%s'" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "impossible d'ajouter les objets rรฉcents" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportรฉe %s" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: 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 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "<version>[,<dรฉcalage>]" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3489 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:3260 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntรฉs ร un autre magasin d'objets" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "ignorer les objets empaquetรฉs" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "limiter la fenรชtre d'empaquetage par objets" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3500 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:3270 +#: builtin/pack-objects.c:3502 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:3272 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "rรฉutiliser les deltas existants" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "rรฉutiliser les objets existants" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3510 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:3280 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "ne pas crรฉer un paquet vide" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "lire les paramรจtres de rรฉvision depuis l'entrรฉe standard" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3516 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:3287 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute rรฉfรฉrence" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3522 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:3293 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "inclure les objets rรฉfรฉrencรฉs par l'index" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3530 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:3300 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles dรฉtachรฉs" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "dรฉpaqueter les objets inaccessibles plus rรฉcents que <heure>" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" msgstr "utiliser l'algorithme de joignabilitรฉ creuse" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "crรฉer des paquets lรฉgers" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "crรฉer des paquets permettant des rรฉcupรฉrations superficielles" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "ignorer ce paquet" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3553 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:3323 +#: builtin/pack-objects.c:3555 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:3327 +#: builtin/pack-objects.c:3559 msgid "write a bitmap index if possible" msgstr "รฉcrire un index de bitmap si possible" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "gestion des objets manquants" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3566 msgid "do not pack objects in promisor packfiles" msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3568 msgid "respect islands during delta compression" msgstr "respecter les รฎlots pendant la compression des deltas" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "protocole" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "exclure tout uploadpack.blobpackfileuri configurรฉ avec ce protocole" + +#: builtin/pack-objects.c:3600 #, 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:3366 +#: builtin/pack-objects.c:3605 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit est trop grand, forcรฉ ร %d" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3659 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:3422 +#: builtin/pack-objects.c:3661 msgid "minimum pack size limit is 1 MiB" msgstr "la taille limite minimale d'un paquet est 1 MiB" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3666 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:3430 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3675 msgid "cannot use --filter without --stdout" msgstr "impossible d'utiliser --filter sans --stdout" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "รnumรฉration des objets" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3766 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" msgstr "" -"Total %<PRIu32> (delta %<PRIu32>), rรฉutilisรฉs %<PRIu32> (delta %<PRIu32>)" +"Total %<PRIu32> (delta %<PRIu32>), rรฉutilisรฉs %<PRIu32> (delta %<PRIu32>), " +"rรฉutilisรฉs du pack %<PRIu32>" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -16698,81 +18535,106 @@ msgstr "empaqueter tout" msgid "prune loose refs (default)" msgstr "รฉliminer les rรฉfรฉrences perdues (dรฉfaut)" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 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 "Suppression des objets dupliquรฉs" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>โฆ]" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "afficher les objets รฉliminรฉs" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "faire expirer les objets plus vieux que <heure>" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "limiter la traversรฉe aux objets hors des fichiers paquets prometteurs" -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "impossible de nettoyer dans un dรฉpรดt d'objets prรฉcieux" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<dรฉpรดt> [<spรฉcification-de-rรฉfรฉrence>...]]" -#: builtin/pull.c:141 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "contrรดler la rรฉcupรฉration rรฉcursive dans les sous-modules" -#: builtin/pull.c:145 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "Options relatives ร la fusion" -#: builtin/pull.c:148 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutรดt qu'en fusionnant" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: 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:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" +msgstr "remiser et rรฉappliquer automatiquement avant et aprรจs" -#: builtin/pull.c:201 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "Options relatives au rapatriement" -#: builtin/pull.c:211 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "forcer l'รฉcrasement de la branche locale" -#: builtin/pull.c:219 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirรฉs en parallรจle" -#: builtin/pull.c:316 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:433 +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"Tirer sans spรฉcifier comment rรฉconcilier les branches divergentes\n" +"est dรฉcouragรฉ. Vous pouvez รฉliminer ce message en lanรงant une des\n" +"commandes suivantes avant votre prochain tirageย :\n" +"\n" +" git config pull.rebase false # fusion (stratรฉgie par dรฉfaut)\n" +" git config pull.rebase true # rebasage\n" +" git config pull.ff only # avance rapide seulement\n" +"\n" +"Vous pouvez remplacer \"git config\" par \"git config --global\" pour que\n" +"ce soit l'option par dรฉfaut pour tous les dรฉpรดts. Vous pouvez aussi\n" +"passer --rebase, --no-rebase ou --ff-only sur la ligne de commande pour\n" +"remplacer ร l'invocation la valeur par dรฉfaut configurรฉe.\n" + +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16780,14 +18642,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:435 +#: builtin/pull.c:460 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:436 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16795,7 +18657,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:439 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16807,44 +18669,44 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spรฉcifier la branche avec la commande." -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Vous n'รชtes actuellement sur aucune branche." -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 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:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 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:449 builtin/pull.c:464 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "Rรฉfรฉrez-vous ร git-pull(1) pour de plus amples dรฉtails." -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1238 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:468 git-parse-remote.sh:95 +#: builtin/pull.c:493 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:473 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16854,34 +18716,30 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette rรฉfรฉrence n'a pas รฉtรฉ rรฉcupรฉrรฉe." -#: builtin/pull.c:581 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "impossible d'accรฉder le commit %s" -#: builtin/pull.c:861 +#: builtin/pull.c:894 msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignorรฉ pour un rebasage" -#: 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:924 +#: builtin/pull.c:954 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:928 +#: builtin/pull.c:958 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:929 +#: builtin/pull.c:959 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:954 +#: builtin/pull.c:984 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16892,7 +18750,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:960 +#: builtin/pull.c:990 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16909,15 +18767,15 @@ msgstr "" "$ git reset --hard\n" "pour rรฉgรฉnรฉrer." -#: builtin/pull.c:975 +#: builtin/pull.c:1005 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tรชte vide." -#: builtin/pull.c:979 +#: builtin/pull.c:1009 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/pull.c:986 +#: builtin/pull.c:1017 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossible de rebaser avec des modifications de sous-modules enregistrรฉes " @@ -16931,11 +18789,11 @@ msgstr "git push [<options>] [<dรฉpรดt> [<spรฉcification-de-rรฉfรฉrence>...]]" msgid "tag shorthand without <tag>" msgstr "raccourci d'รฉtiquette sans <รฉtiquette>" -#: builtin/push.c:121 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "--delete accepte seulement des noms entiers de rรฉfรฉrences cibles" -#: builtin/push.c:167 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -16944,7 +18802,7 @@ msgstr "" "Pour choisir l'option de maniรจre permanente, voir push.default dans 'git " "help config'." -#: builtin/push.c:170 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16969,7 +18827,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16984,7 +18842,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-la-branche-amont>\n" -#: builtin/push.c:199 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16998,13 +18856,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:202 #, 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:210 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -17015,14 +18873,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:269 +#: builtin/push.c:260 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:276 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -17037,7 +18895,7 @@ msgstr "" "Voir la 'Note ร propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:282 +#: builtin/push.c:273 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" @@ -17052,7 +18910,7 @@ msgstr "" "Voir la 'Note ร propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:288 +#: builtin/push.c:279 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" @@ -17070,13 +18928,13 @@ msgstr "" "Voir la 'Note ร propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:295 +#: builtin/push.c:286 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:298 +#: builtin/push.c:289 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" @@ -17088,142 +18946,142 @@ msgstr "" "pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:359 +#: builtin/push.c:351 #, c-format msgid "Pushing to %s\n" msgstr "Poussรฉe vers %s\n" -#: builtin/push.c:364 +#: builtin/push.c:358 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des rรฉfรฉrences vers '%s'" -#: 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 +#: builtin/push.c:532 msgid "repository" msgstr "dรฉpรดt" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:533 builtin/send-pack.c:183 msgid "push all refs" msgstr "pousser toutes les rรฉfรฉrences" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:534 builtin/send-pack.c:185 msgid "mirror all refs" msgstr "reflรฉter toutes les rรฉfรฉrences" -#: builtin/push.c:558 +#: builtin/push.c:536 msgid "delete refs" msgstr "supprimer les rรฉfรฉrences" -#: builtin/push.c:559 +#: builtin/push.c:537 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:562 builtin/send-pack.c:167 +#: builtin/push.c:540 builtin/send-pack.c:186 msgid "force updates" msgstr "forcer les mises ร jour" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:541 builtin/send-pack.c:198 msgid "<refname>:<expect>" msgstr "<nom-de-ref>:<attendu>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:542 builtin/send-pack.c:199 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:568 +#: builtin/push.c:545 msgid "control recursive pushing of submodules" msgstr "contrรดler la poussรฉe rรฉcursive des sous-modules" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:546 builtin/send-pack.c:193 msgid "use thin pack" msgstr "utiliser un empaquetage lรฉger" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:573 +#: builtin/push.c:549 msgid "set upstream for git pull/status" msgstr "dรฉfinir la branche amont pour git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:552 msgid "prune locally removed refs" msgstr "รฉliminer les rรฉfรฉrences locales supprimรฉes" -#: builtin/push.c:578 +#: builtin/push.c:554 msgid "bypass pre-push hook" msgstr "รฉviter d'utiliser le crochet pre-push" -#: builtin/push.c:579 +#: builtin/push.c:555 msgid "push missing but relevant tags" msgstr "pousser les รฉtiquettes manquantes mais pertinentes" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:557 builtin/send-pack.c:187 msgid "GPG sign the push" msgstr "signer la poussรฉe avec GPG" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:559 builtin/send-pack.c:194 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:602 +#: builtin/push.c:577 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:604 +#: builtin/push.c:579 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune rรฉfรฉrence" -#: builtin/push.c:607 +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "mauvais dรฉpรดt '%s'" + +#: builtin/push.c:600 +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:615 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:609 +#: builtin/push.c:617 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:613 +#: builtin/push.c:621 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:615 +#: builtin/push.c:623 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:618 +#: builtin/push.c:626 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:637 +#: builtin/push.c:630 msgid "push options must not have new line characters" msgstr "" "les options de poussรฉe ne peuvent pas contenir de caractรจres de nouvelle " @@ -17243,24 +19101,32 @@ 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:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "Pourcentage par lequel la crรฉation est pondรฉrรฉe" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "utiliser des couleurs de diff simples" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: 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 #, c-format msgid "no .. in range: '%s'" msgstr "pas de .. dans la plageย : '%s'" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "un format d'argument unique doit รชtre une plage symรฉtrique" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "plage entre deux commits requise" @@ -17343,235 +19209,216 @@ msgstr "dรฉboguer unpack-trees" msgid "suppress feedback messages" msgstr "supprimer les messages d'information de suivi" -#: builtin/rebase.c:32 +#: 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:35 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] [<amont>] " -"[<branche>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-" +"base] [<amont> [<branche>]]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] --root " "[<branche>]" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 #, c-format msgid "unusable todo list: '%s'" msgstr "liste ร faire inutilisableย : '%s'" -#: 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 +#: builtin/rebase.c:304 #, c-format msgid "could not create temporary %s" msgstr "impossible de crรฉer un fichier temporaire %s" -#: builtin/rebase.c:285 +#: builtin/rebase.c:310 msgid "could not mark as interactive" msgstr "impossible de marquer comme interactif" -#: builtin/rebase.c:343 +#: builtin/rebase.c:364 msgid "could not generate todo list" msgstr "impossible de gรฉnรฉrer la liste ร -faire" -#: builtin/rebase.c:382 +#: builtin/rebase.c:405 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:437 +#: builtin/rebase.c:474 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<options>]" -#: builtin/rebase.c:449 -msgid "keep empty commits" -msgstr "garder les validations vides" +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" +msgstr "conserver les commits qui commencent vides" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:491 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "autoriser les validations avec des messages vides" -#: builtin/rebase.c:452 +#: builtin/rebase.c:493 msgid "rebase merge commits" msgstr "rebaser les commits de fusion" -#: builtin/rebase.c:454 +#: builtin/rebase.c:495 msgid "keep original branch points of cousins" msgstr "conserver les points de branchement de cousins originaux" -#: builtin/rebase.c:456 +#: builtin/rebase.c:497 msgid "move commits that begin with squash!/fixup!" msgstr "dรฉplacer les commits qui commencent par squash!/fixup!" -#: builtin/rebase.c:457 +#: builtin/rebase.c:498 msgid "sign commits" msgstr "signer les commits" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:500 builtin/rebase.c:1321 msgid "display a diffstat of what changed upstream" msgstr "afficher un diffstat de ce qui a changรฉ en amont" -#: builtin/rebase.c:461 +#: builtin/rebase.c:502 msgid "continue rebase" msgstr "continuer le rebasage" -#: builtin/rebase.c:463 +#: builtin/rebase.c:504 msgid "skip commit" msgstr "sauter le commit" -#: builtin/rebase.c:464 +#: builtin/rebase.c:505 msgid "edit the todo list" msgstr "รฉditer la liste ร -faire" -#: builtin/rebase.c:466 +#: builtin/rebase.c:507 msgid "show the current patch" msgstr "afficher le patch courant" -#: builtin/rebase.c:469 +#: builtin/rebase.c:510 msgid "shorten commit ids in the todo list" msgstr "raccourcir les identifiants de commits dans la liste ร -faire" -#: builtin/rebase.c:471 +#: builtin/rebase.c:512 msgid "expand commit ids in the todo list" msgstr "รฉtendre les identifiants de commit dans la liste ร -faire" -#: builtin/rebase.c:473 +#: builtin/rebase.c:514 msgid "check the todo list" msgstr "vรฉrifier la liste ร -faire" -#: builtin/rebase.c:475 +#: builtin/rebase.c:516 msgid "rearrange fixup/squash lines" msgstr "rรฉarranger les lignes fixup/squash" -#: builtin/rebase.c:477 +#: builtin/rebase.c:518 msgid "insert exec commands in todo list" msgstr "insรฉrer les commandes exec dans la liste ร -faire" -#: builtin/rebase.c:478 +#: builtin/rebase.c:519 msgid "onto" msgstr "sur" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict revision" msgstr "restreindre la rรฉvision" -#: builtin/rebase.c:483 +#: builtin/rebase.c:524 msgid "squash-onto" msgstr "รฉcraser-sur" -#: builtin/rebase.c:484 +#: builtin/rebase.c:525 msgid "squash onto" msgstr "รฉcraser sur" -#: builtin/rebase.c:486 +#: builtin/rebase.c:527 msgid "the upstream commit" msgstr "le commit amont" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head-name" msgstr "nom du head" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head name" msgstr "nom du head" -#: builtin/rebase.c:493 +#: builtin/rebase.c:534 msgid "rebase strategy" msgstr "stratรฉgie de rebasage" -#: builtin/rebase.c:494 +#: builtin/rebase.c:535 msgid "strategy-opts" msgstr "options de stratรฉgie" -#: builtin/rebase.c:495 +#: builtin/rebase.c:536 msgid "strategy options" msgstr "options de stratรฉgie" -#: builtin/rebase.c:496 +#: builtin/rebase.c:537 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:497 +#: builtin/rebase.c:538 msgid "the branch or commit to checkout" msgstr "la branche ou le commit ร extraire" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto-name" msgstr "sur-le-nom" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto name" msgstr "sur le nom" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "the command to run" msgstr "la commande ร lancer" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:543 builtin/rebase.c:1415 msgid "automatically re-schedule any `exec` that fails" msgstr "re-planifier automatiquement tout `exec` qui รฉchoue" -#: builtin/rebase.c:518 +#: builtin/rebase.c:559 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges" -#: builtin/rebase.c:534 +#: builtin/rebase.c:575 #, c-format -msgid "%s requires an interactive rebase" -msgstr "%s requiert un rebasage interactif" +msgid "%s requires the merge backend" +msgstr "%s requiert un moteur de fusion" -#: builtin/rebase.c:586 +#: builtin/rebase.c:618 #, c-format msgid "could not get 'onto': '%s'" msgstr "impossible d'accรฉder 'onto' : '%s'" -#: builtin/rebase.c:601 +#: builtin/rebase.c:635 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head invalideย : '%s'" -#: builtin/rebase.c:626 +#: builtin/rebase.c:660 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "allow_rerere_autoupdate invalide ignorรฉย : '%s'" -#: builtin/rebase.c:702 -#, c-format -msgid "Could not read '%s'" -msgstr "Impossible de lire '%s'" - -#: builtin/rebase.c:720 -#, c-format -msgid "Cannot store %s" -msgstr "Impossible de stocker %s" - -#: builtin/rebase.c:827 -msgid "could not determine HEAD revision" -msgstr "impossible de dรฉterminer la rรฉvision HEAD" - -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:805 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" @@ -17585,7 +19432,7 @@ msgstr "" "arrรชter\n" "et revenir ร l'รฉtat antรฉrieur ร la commande, lancez \"git rebase --abort\"." -#: builtin/rebase.c:1031 +#: builtin/rebase.c:888 #, c-format msgid "" "\n" @@ -17604,7 +19451,16 @@ msgstr "" "\n" "Rรฉsultat, git ne peut pas les rebaser." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1214 +#, 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:1232 #, c-format msgid "" "%s\n" @@ -17621,7 +19477,7 @@ msgstr "" " git rebase '<branche>'\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1248 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17635,127 +19491,149 @@ msgstr "" " git branch --set-upstream-to=%s/<branche> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1278 msgid "exec commands cannot contain newlines" msgstr "les commandes exec ne peut pas contenir de retour ร la ligne" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1282 msgid "empty exec command" msgstr "commande exec vide" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1312 msgid "rebase onto given branch instead of upstream" msgstr "rebaser sur la branche %s au lieu de la branche amont" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1314 +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:1316 msgid "allow pre-rebase hook to run" msgstr "permettre le lancement du crochet pre-rebase" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1318 msgid "be quiet. implies --no-stat" msgstr "รชtre silencieux. implique --no-stat" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1324 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:1409 +#: builtin/rebase.c:1327 msgid "add a Signed-off-by: line to each commit" msgstr "ajouter une ligne Signed-off-by ร chaque message de validation" -#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 -msgid "passed to 'git am'" -msgstr "passรฉ ร 'git am'" +#: builtin/rebase.c:1330 +msgid "make committer date match author date" +msgstr "mettre la date de validateur ร la date auteur" + +#: builtin/rebase.c:1332 +msgid "ignore author date and use current date" +msgstr "ignorer la date d'auteur et utilise la date actuelle" + +#: builtin/rebase.c:1334 +msgid "synonym of --reset-author-date" +msgstr "synonyme pour --reset-author-date" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1336 builtin/rebase.c:1340 msgid "passed to 'git apply'" msgstr "passรฉ jusqu'ร git-apply" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1338 +msgid "ignore changes in whitespace" +msgstr "ignorer des modifications d'espaces" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 msgid "cherry-pick all commits, even if unchanged" msgstr "picorer tous les commits, mรชme sans modifiant" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1347 msgid "continue" msgstr "continuer" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1350 msgid "skip current patch and continue" msgstr "sauter le patch courant et continuer" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1352 msgid "abort and check out the original branch" msgstr "abandonner et extraire la branche d'origine" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1355 msgid "abort but keep HEAD where it is" msgstr "abandonne mais garde HEAD oรน il est" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1356 msgid "edit the todo list during an interactive rebase" msgstr "รฉditer la liste ร faire lors d'un rebasage interactif" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1359 msgid "show the patch file being applied or merged" msgstr "afficher le patch en cours d'application ou de fusion" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1362 +msgid "use apply strategies to rebase" +msgstr "utiliser des stratรฉgies d'application pour rebaser" + +#: builtin/rebase.c:1366 msgid "use merging strategies to rebase" msgstr "utiliser des stratรฉgies de fusion pour rebaser" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1370 msgid "let the user edit the list of commits to rebase" msgstr "laisser l'utilisateur รฉditer la liste des commits ร rebaser" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1374 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:1455 -msgid "preserve empty commits during rebase" -msgstr "prรฉserver les validations vides pendant le rebasage" +#: builtin/rebase.c:1379 +msgid "how to handle commits that become empty" +msgstr "comment gรฉrer les commits qui deviennent vides" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1386 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:1463 -msgid "automatically stash/stash pop before and after" -msgstr "remiser et rรฉappliquer automatiquement avant et aprรจs" - -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1393 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:1469 +#: builtin/rebase.c:1397 msgid "allow rebasing commits with empty messages" msgstr "autoriser les commits de rebasage avec des messages vides" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1401 msgid "try to rebase merges instead of skipping them" msgstr "essayer de rebaser les fusions au lieu de les garder" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1404 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1406 msgid "use the given merge strategy" msgstr "utiliser la stratรฉgie de fusion indiquรฉe" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1408 builtin/revert.c:115 msgid "option" msgstr "option" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1409 msgid "pass the argument through to the merge strategy" msgstr "passer les arguments jusqu'ร la stratรฉgie de fusion" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1412 msgid "rebase all reachable commits up to the root(s)" msgstr "rebaser tous les objets inatteignables depuis les racines" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "" +"appliquer toutes les modifications, mรชme celles dรฉjร prรฉsentes en amont" + +#: builtin/rebase.c:1434 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17763,32 +19641,44 @@ 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:1506 +#: builtin/rebase.c:1440 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:1547 +#: builtin/rebase.c:1481 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:1551 +#: builtin/rebase.c:1486 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "impossible de combiner '--keep-base' avec '--onto'" + +#: builtin/rebase.c:1488 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "impossible de combiner '--keep-base' avec '--root'" + +#: builtin/rebase.c:1492 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "impossible de combiner '--root' avec '--fork-point'" + +#: builtin/rebase.c:1495 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1499 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:1578 +#: builtin/rebase.c:1522 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1534 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17796,16 +19686,16 @@ msgstr "" "Vous devez รฉditer tous les conflits de fusion et\n" "les marquer comme rรฉsolus avec git add" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1553 msgid "could not discard worktree changes" msgstr "Impossible de supprimer les changements de l'arbre de travail" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1572 #, c-format msgid "could not move back to %s" msgstr "Impossible de revenir ร %s" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1618 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17827,176 +19717,145 @@ msgstr "" "chose\n" "d'important ici.\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1646 msgid "switch `C' expects a numerical value" msgstr "l'option `C' attend un valeur numรฉrique" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1688 #, c-format msgid "Unknown mode: %s" msgstr "mode inconnuย : %s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1727 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiert --merge ou --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1757 +msgid "cannot combine apply options with merge options" +msgstr "" +"impossible de combiner les options d'application avec les options de fusion" + +#: builtin/rebase.c:1770 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "backend de rebasage inconnu : %s" + +#: builtin/rebase.c:1795 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiert --exec ou --interactive" -#: 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 +#: builtin/rebase.c:1815 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1819 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "erreurย : impossible de combiner '--preserve-merges' avec '--reschedule-" "failed-exec'" -#: 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 +#: builtin/rebase.c:1843 #, c-format msgid "invalid upstream '%s'" msgstr "amont invalide '%s'" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1849 msgid "Could not create new root commit" msgstr "Impossible de crรฉer un nouveau commit racine" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1875 +#, 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:1878 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': exactement une base de fusion nรฉcessaire" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1886 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "ne pointe pas sur une validation valide : '%s'" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1912 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal : pas de branche ou commit '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Rรฉfรฉrence inexistanteย : %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1931 msgid "Could not resolve HEAD to a revision" msgstr "Impossible de rรฉsoudre le commit HEAD vers un rรฉvision" -#: builtin/rebase.c:1981 -msgid "Cannot autostash" -msgstr "Autoremisage impossible" - -#: builtin/rebase.c:1984 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "rรฉponse de remisage inattendueย : '%s'" - -#: 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:1993 -#, c-format -msgid "Created autostash: %s\n" -msgstr "Autoremisage crรฉรฉ : %s\n" - -#: builtin/rebase.c:1996 -msgid "could not reset --hard" -msgstr "impossible de rรฉinitialiser --hard" - -#: 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 +#: builtin/rebase.c:1952 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: builtin/rebase.c:2040 -#, c-format -msgid "could not parse '%s'" -msgstr "impossible d'analyser '%s'" - -#: builtin/rebase.c:2053 +#: builtin/rebase.c:1988 #, c-format msgid "could not switch to %s" msgstr "Impossible de basculer vers %s" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:1999 msgid "HEAD is up to date." msgstr "HEAD est ร jour." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2001 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La branche courante %s est ร jour.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2009 msgid "HEAD is up to date, rebase forced." msgstr "HEAD est ร jour, rebasage forcรฉ." -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2011 #, 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:2084 +#: builtin/rebase.c:2019 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusรฉ de rebaser." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2026 #, c-format msgid "Changes to %s:\n" msgstr "Changements vers %s :\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2029 #, c-format msgid "Changes from %s to %s:\n" msgstr "Changements de %s sur %s :\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2054 #, 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:2128 +#: builtin/rebase.c:2063 msgid "Could not detach HEAD" msgstr "Impossible de dรฉtacher HEAD" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2072 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rapide de %s sur %s.\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <rรฉpertoire-git>" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:1224 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" @@ -18026,7 +19885,7 @@ msgstr "" "Pour รฉliminer ce message et conserver le comportement par dรฉfaut,\n" "rรฉglez ยซย receive.denyCurrentBranchย ยป ร 'refuse'." -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:1244 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" @@ -18046,11 +19905,11 @@ msgstr "" "\n" "Pour รฉliminer ce message, rรฉglez-le ร 'refuse'." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:2422 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:2436 msgid "You must specify a directory." msgstr "Vous devez spรฉcifier un rรฉpertoire." @@ -18076,49 +19935,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <rรฉfรฉrence>" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "Marquage des objets inaccessibles..." -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "%s ne pointe nulle partย !" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "pas de journal de rรฉfรฉrences ร supprimer spรฉcifiรฉ" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "'%s' n'est pas un journal de rรฉfรฉrences" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "pas de journal de rรฉfรฉrences pour '%s'" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "format de rรฉfรฉrence invalideย : %s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -18126,83 +19985,83 @@ msgstr "" "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nom> <url>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <ancienne> <nouvelle>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 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:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nom>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nom>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | " "<distante>)...]" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nom> <branche>..." -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nom>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nom> <nouvelle-URL>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nom> <url>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<options>] <nom> <URL>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branche>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nom> <branche>..." -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<options>] <nom>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<options>] <nom>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<options>] [<groupe> | <distante>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "Mise ร jour de %s" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -18210,88 +20069,104 @@ msgstr "" "--mirror est dangereux et obsolรจte ; merci\n" "\t d'utiliser --mirror=fetch ou --mirror=push ร la place" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "argument miroir inconnu : %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "rapatrier les branches distantes" -#: builtin/remote.c:165 +#: builtin/remote.c:166 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:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "ou ne rapatrier aucune รฉtiquette (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "branche(s) ร suivre" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "branche maรฎtresse" -#: builtin/remote.c:173 +#: builtin/remote.c:174 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:185 +#: builtin/remote.c:186 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:187 +#: builtin/remote.c:188 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:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:697 #, c-format msgid "remote %s already exists." msgstr "la distante %s existe dรฉjร ." -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:701 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' n'est pas un nom valide de distante" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "Impossible de paramรฉtrer la maรฎtresse '%s'" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, 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:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(correspond)" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(supprimer)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:654 +#, c-format +msgid "could not set '%s'" +msgstr "impossible d'assigner '%s'" + +#: builtin/remote.c:659 +#, 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:690 builtin/remote.c:833 builtin/remote.c:941 #, c-format msgid "No such remote: '%s'" msgstr "Pas de serveur remoteย : '%s'" -#: builtin/remote.c:646 +#: builtin/remote.c:707 #, 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:666 +#: builtin/remote.c:727 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18302,17 +20177,17 @@ msgstr "" "\t%s\n" "\tVeuillez mettre ร jour la configuration manuellement si nรฉcessaire." -#: builtin/remote.c:702 +#: builtin/remote.c:767 #, c-format msgid "deleting '%s' failed" msgstr "รฉchec de suppression de '%s'" -#: builtin/remote.c:736 +#: builtin/remote.c:801 #, c-format msgid "creating '%s' failed" msgstr "รฉchec de crรฉation de '%s'" -#: builtin/remote.c:802 +#: builtin/remote.c:877 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18327,118 +20202,118 @@ msgstr[1] "" "supprimรฉes ;\n" "pour les supprimer, utilisez :" -#: builtin/remote.c:816 +#: builtin/remote.c:891 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossible de supprimer la section de configuration '%s'" -#: builtin/remote.c:917 +#: builtin/remote.c:994 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)" -#: builtin/remote.c:920 +#: builtin/remote.c:997 msgid " tracked" msgstr " suivi" -#: builtin/remote.c:922 +#: builtin/remote.c:999 msgid " stale (use 'git remote prune' to remove)" msgstr " dรฉpassรฉ (utilisez 'git remote prune' pour supprimer)" -#: builtin/remote.c:924 +#: builtin/remote.c:1001 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:1042 #, 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:974 +#: builtin/remote.c:1051 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebase de maniรจre interactive sur la distante %s" -#: builtin/remote.c:976 +#: builtin/remote.c:1053 #, 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:979 +#: builtin/remote.c:1056 #, c-format msgid "rebases onto remote %s" msgstr "rebase sur la distante %s" -#: builtin/remote.c:983 +#: builtin/remote.c:1060 #, c-format msgid " merges with remote %s" msgstr " fusionne avec la distante %s" -#: builtin/remote.c:986 +#: builtin/remote.c:1063 #, c-format msgid "merges with remote %s" msgstr "fusionne avec la distante %s" -#: builtin/remote.c:989 +#: builtin/remote.c:1066 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s et avec la distante %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1109 msgid "create" msgstr "crรฉer" -#: builtin/remote.c:1035 +#: builtin/remote.c:1112 msgid "delete" msgstr "supprimer" -#: builtin/remote.c:1039 +#: builtin/remote.c:1116 msgid "up to date" msgstr "ร jour" -#: builtin/remote.c:1042 +#: builtin/remote.c:1119 msgid "fast-forwardable" msgstr "peut รชtre mis ร jour en avance rapide" -#: builtin/remote.c:1045 +#: builtin/remote.c:1122 msgid "local out of date" msgstr "le local n'est pas ร jour" -#: builtin/remote.c:1052 +#: builtin/remote.c:1129 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s force vers %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1132 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s pousse vers %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1136 #, c-format msgid " %-*s forces to %s" msgstr " %-*s force vers %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1139 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s pousse vers %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1207 msgid "do not query remotes" msgstr "ne pas interroger les distantes" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid "* remote %s" msgstr "* distante %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1235 #, c-format msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 msgid "(no URL)" msgstr "(pas d'URL)" @@ -18446,25 +20321,25 @@ msgstr "(pas d'URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1250 builtin/remote.c:1252 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1254 msgid "(not queried)" msgstr "(non demandรฉ)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1256 msgid "(unknown)" msgstr "(inconnu)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1260 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -18472,171 +20347,162 @@ msgstr "" " Branche HEAD (la HEAD distante est ambiguรซ, peut รชtre l'une des " "suivantes) :\n" -#: builtin/remote.c:1195 +#: builtin/remote.c:1272 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1275 builtin/remote.c:1301 msgid " (status not queried)" msgstr " (รฉtat non demandรฉ)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1284 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:1215 +#: builtin/remote.c:1292 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:1221 +#: builtin/remote.c:1298 #, 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:1242 +#: builtin/remote.c:1319 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "dรฉfinir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1244 +#: builtin/remote.c:1321 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1336 msgid "Cannot determine remote HEAD" msgstr "Impossible de dรฉterminer la HEAD distante" -#: builtin/remote.c:1261 +#: builtin/remote.c:1338 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:1271 +#: builtin/remote.c:1348 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1356 #, c-format msgid "Not a valid ref: %s" msgstr "Rรฉfรฉrence non valide : %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1358 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramรฉtrer %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, c-format msgid " %s will become dangling!" msgstr " %s se retrouvera en suspens !" -#: builtin/remote.c:1300 +#: builtin/remote.c:1377 #, c-format msgid " %s has become dangling!" msgstr " %s se retrouve en suspens !" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "Pruning %s" msgstr "รlimination de %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1388 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1404 #, c-format msgid " * [would prune] %s" msgstr " * [serait รฉliminรฉ] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1407 #, c-format msgid " * [pruned] %s" msgstr " * [รฉliminรฉ] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1452 msgid "prune remotes after fetching" msgstr "รฉliminer les distants aprรจs le rapatriement" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1454 +#: builtin/remote.c:1531 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1461 +#: builtin/remote.c:1538 msgid "no remote specified" msgstr "pas de serveur distant spรฉcifiรฉ" -#: builtin/remote.c:1478 +#: builtin/remote.c:1555 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:1480 +#: builtin/remote.c:1557 msgid "return all URLs" msgstr "retourner toutes les URLs" -#: builtin/remote.c:1508 +#: builtin/remote.c:1585 #, c-format msgid "no URLs configured for remote '%s'" msgstr "aucune URL configurรฉe pour le dรฉpรดt distant '%s'" -#: builtin/remote.c:1534 +#: builtin/remote.c:1611 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1536 +#: builtin/remote.c:1613 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1615 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1545 +#: builtin/remote.c:1622 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1584 +#: builtin/remote.c:1661 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1669 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvรฉe : %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1671 msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: 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 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [<options>]" -#: builtin/repack.c:27 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18645,117 +20511,117 @@ msgstr "" "Utilisez\n" "--no-write-bitmap-index ou dรฉsactivez le paramรจtre pack.writebitmaps." -#: builtin/repack.c:190 +#: builtin/repack.c:197 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:229 builtin/repack.c:408 +#: builtin/repack.c:236 builtin/repack.c:421 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:246 +#: builtin/repack.c:260 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:284 +#: builtin/repack.c:297 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:286 +#: builtin/repack.c:299 msgid "same as -a, and turn unreachable objects loose" msgstr "identique ร -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:289 +#: builtin/repack.c:302 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:291 +#: builtin/repack.c:304 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta ร git-pack-objects" -#: builtin/repack.c:293 +#: builtin/repack.c:306 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object ร git-pack-objects" -#: builtin/repack.c:295 +#: builtin/repack.c:308 msgid "do not run git-update-server-info" msgstr "ne pas lancer git update-server-info" -#: builtin/repack.c:298 +#: builtin/repack.c:311 msgid "pass --local to git-pack-objects" msgstr "passer --local ร git-pack-objects" -#: builtin/repack.c:300 +#: builtin/repack.c:313 msgid "write bitmap index" msgstr "รฉcrire un index en bitmap" -#: builtin/repack.c:302 +#: builtin/repack.c:315 msgid "pass --delta-islands to git-pack-objects" msgstr "passer --delta-islands ร git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:316 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:304 +#: builtin/repack.c:317 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:306 +#: builtin/repack.c:319 msgid "with -a, repack unreachable objects" msgstr "avec -a, repaquรฉtiser les objets inaccessibles" -#: builtin/repack.c:308 +#: builtin/repack.c:321 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:309 builtin/repack.c:315 +#: builtin/repack.c:322 builtin/repack.c:328 msgid "bytes" msgstr "octets" -#: builtin/repack.c:310 +#: builtin/repack.c:323 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:312 +#: builtin/repack.c:325 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:314 +#: builtin/repack.c:327 msgid "limits the maximum number of threads" msgstr "limite le nombre maximal de fils" -#: builtin/repack.c:316 +#: builtin/repack.c:329 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:318 +#: builtin/repack.c:331 msgid "repack objects in packs marked with .keep" msgstr "rรฉempaqueter les objets dans des paquets marquรฉs avec .keep" -#: builtin/repack.c:320 +#: builtin/repack.c:333 msgid "do not repack this pack" msgstr "ne pas rempaqueter ce paquet" -#: builtin/repack.c:330 +#: builtin/repack.c:343 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:334 +#: builtin/repack.c:347 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" -#: builtin/repack.c:417 +#: builtin/repack.c:430 msgid "Nothing new to pack." msgstr "Rien de neuf ร empaqueter." -#: builtin/repack.c:478 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18774,7 +20640,7 @@ msgstr "" "ALERTEย : aussi รฉchouรฉ.\n" "ALERTEย : Veuillez les renommer manuellement dans %s :\n" -#: builtin/repack.c:526 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "รฉchec de la suppression de '%s'" @@ -18882,8 +20748,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:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: 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 "nom d'objet invalide : '%s'" @@ -18902,22 +20768,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:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "impossible d'analyser %s comme commit" -#: builtin/replace.c:414 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mauvaise รฉtiquette de fusion dans le commit '%s'" -#: builtin/replace.c:416 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "รฉtiquette de fusion malformรฉe dans le commit '%s'" -#: builtin/replace.c:428 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -18926,31 +20792,31 @@ msgstr "" "le commit original '%s' contient l'รฉtiquette de fusion '%s' qui a disparu ; " "utilisez --edit au lieu de --graft" -#: builtin/replace.c:467 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "le commit original '%s' contient une signature GPG" -#: builtin/replace.c:468 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "la signature sera รฉliminรฉe dans la validation de remplacement !" -#: builtin/replace.c:478 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Impossible d'รฉcrire le commit de remplacement pour '%s'" -#: builtin/replace.c:486 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft pour '%s' non nรฉcessaire" -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, 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:525 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -18959,71 +20825,71 @@ msgstr "" "impossible de convertir la(les) greffe(s) suivante(s) :\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "afficher les rรฉfรฉrences de remplacement" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "supprimer les rรฉfรฉrences de remplacement" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "รฉditer l'objet existant" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "Modifier les parents d'un commit" -#: builtin/replace.c:550 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "convertir le fichier de greffe existant" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "remplacer la rรฉfรฉrence si elle existe" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "afficher sans mise en forme pour --edit" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "utiliser ce format" -#: builtin/replace.c:567 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "--format ne peut pas รชtre utilisรฉ sans lister" -#: builtin/replace.c:575 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "-f n'a de sens qu'en รฉcrivant un remplacement" -#: builtin/replace.c:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw n'a de sens qu'avec l'option --edit" -#: builtin/replace.c:585 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "-d requiert au moins un argument" -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "mauvais nombre d'arguments" -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e requiert un seul argument" -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-g requiert au moins un argument" -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file ne supporte aucun argument" -#: builtin/replace.c:615 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "-l n'accepte qu'un motifs" @@ -19052,117 +20918,129 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<arbre ou apparentรฉ>] [--] <chemins>..." +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "" +"git reset [-q] [<arbre ou apparentรฉ>] [--] <spรฉcificateur-de-chemin>..." #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<arbre ou apparentรฉ>] [--] [<chemins>...]" +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +msgstr "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-esque>]" -#: builtin/reset.c:40 +#: 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 msgid "mixed" msgstr "mixed" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "soft" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "hard" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "merge" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "keep" -#: builtin/reset.c:81 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "Vous n'avez pas une HEAD valide." -#: builtin/reset.c:83 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "Impossible de trouver l'arbre pour HEAD." -#: builtin/reset.c:89 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "Impossible de trouver l'arbre pour %s." -#: builtin/reset.c:193 +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD est maintenant ร %s" + +#: builtin/reset.c:195 #, 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:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "รชtre silencieux, afficher seulement les erreurs" -#: builtin/reset.c:295 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "rรฉinitialiser HEAD et l'index" -#: builtin/reset.c:296 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "rรฉinitialiser seulement HEAD" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "rรฉinitialiser HEAD, l'index et la copie de travail" -#: builtin/reset.c:302 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "rรฉinitialiser HEAD mais garder les changements locaux" -#: builtin/reset.c:308 +#: builtin/reset.c:310 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:326 +#: builtin/reset.c:344 #, 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:334 +#: builtin/reset.c:352 #, 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:343 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch est incompatible avec --{hard,mixed,soft}" -#: builtin/reset.c:353 +#: builtin/reset.c:371 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:355 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "Impossible de faire un \"%s reset\" avec des chemins." -#: builtin/reset.c:370 +#: builtin/reset.c:388 #, 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:374 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "-N ne peut รชtre utilisรฉ qu'avec --mixed" -#: builtin/reset.c:395 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "Modifications non indexรฉes aprรจs reset :" -#: builtin/reset.c:398 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -19177,53 +21055,48 @@ msgstr "" "de\n" "config reset.quiet ร true pour avoir ce comportement en permanence.\n" -#: builtin/reset.c:408 +#: builtin/reset.c:434 #, 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:412 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "Impossible d'รฉcrire le nouveau fichier d'index." -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "impossible de combiner --exclude-promisor-objects et --missing" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "le filtrage d'objet exige --objects" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "valeur invalide de 'sparse' '%s'" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" -#: 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-list.c:615 +msgid "marked counting is incompatible with --objects" +msgstr "le comptage marquรฉ est incompatible avec --objects" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "garder le `--` passรฉ en argument" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "arrรชt de l'analyse aprรจs le premier argument qui n'est pas une option" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "sortie en forme longue fixรฉe" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -19370,38 +21243,43 @@ 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:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "ne pas afficher les fichiers supprimรฉs" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "supprimer seulement de l'index" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "outrepasser la vรฉrification des fichiers ร jour" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "autoriser la suppression rรฉcursive" -#: builtin/rm.c:247 +#: builtin/rm.c:248 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:289 +#: 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 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:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "pas de suppression rรฉcursive de '%s' sans -r" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm : impossible de supprimer %s" @@ -19419,57 +21297,79 @@ msgstr "" " --all et la spรฉcification explicite de <rรฉfรฉrence> sont mutuellement " "exclusifs." -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:182 msgid "remote name" msgstr "nom distant" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:195 msgid "use stateless RPC protocol" msgstr "utiliser un protocole RPC sans รฉtat" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:196 msgid "read refs from stdin" msgstr "lire les rรฉfรฉrences depuis l'entrรฉe standard" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:197 msgid "print status from remote helper" msgstr "afficher les messages du greffon de protocole distant" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:15 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<options>] [<intervalle-rรฉvisions>] [[--] <chemin>...]" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<options>]" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:134 +msgid "using multiple --group options with stdin is not supported" +msgstr "" +"l'utilisation de plusieurs options --group avec stdin n'est pas supportรฉe" + +#: builtin/shortlog.c:144 +msgid "using --group=trailer with stdin is not supported" +msgstr "l'utilisation de --group=trailer avec stdin n'est pas supportรฉe" + +#: builtin/shortlog.c:388 +#, c-format +msgid "unknown group type: %s" +msgstr "type de groupe inconnuย : %s" + +#: builtin/shortlog.c:416 msgid "Group by committer rather than author" msgstr "Grouper par validateur plutรดt que par auteur" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:419 msgid "sort output according to the number of commits per author" msgstr "trier la sortie sur le nombre de validations par auteur" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:421 msgid "Suppress commit descriptions, only provides commit count" msgstr "" "Supprimer les descriptions de validation, fournit seulement le nombre de " "validations" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:423 msgid "Show the email address of each author" msgstr "Afficher l'adresse courriel de chaque auteur" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:424 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:425 msgid "Linewrap output" msgstr "Couper les lignes" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:427 +msgid "field" +msgstr "champ" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "Grouper par champ" + +#: builtin/shortlog.c:456 msgid "too many arguments given outside repository" msgstr "trop d'arguments fournis hors d'un dรฉpรดt" @@ -19611,6 +21511,14 @@ msgstr "'%s' n'est pas une rรฉfรฉrence valide." msgid "cannot find commit %s (%s)" msgstr "impossible de trouver le commit %s (%s)" +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "algorithme d'empreinte" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "Algorithme d'empreinte inconnu" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -19660,15 +21568,90 @@ msgstr "" "afficher les rรฉfรฉrences de l'entrรฉe standard qui ne sont pas dans le dรฉpรดt " "local" -#: builtin/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <options>" + +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:76 +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:228 +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:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "" +"impossible de mettre ร jour le format de dรฉpรดt pour activer worktreeConfig" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "รฉchec de paramรฉtrage extensions.worktreeConfig" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "initialiser l'extraction partielle en mode cone" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "รฉchec ร l'ouverture de '%s'" + +#: builtin/sparse-checkout.c:401 +#, c-format +msgid "could not normalize path %s" +msgstr "impossible de normaliser le chemin '%s'" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)" + +#: builtin/sparse-checkout.c:438 +#, 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:492 builtin/sparse-checkout.c:516 +msgid "unable to load existing sparse-checkout patterns" +msgstr "impossible de charger les motifs de l'extraction partielle existants" + +#: builtin/sparse-checkout.c:561 +msgid "read patterns from standard in" +msgstr "lire les motifs depuis l'entrรฉe standard" + +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:623 +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 msgid "git stash list [<options>]" msgstr "git stash list [<options>]" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<options>] [<remise>]" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<remise>]" @@ -19676,25 +21659,27 @@ 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:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nom-de-branche> [<remise>]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: 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 <message>]\n" +" [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n" " [--] [<spรฉcificateur-de-chemin>...]]" -#: builtin/stash.c:31 builtin/stash.c:84 +#: 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>]" @@ -19702,191 +21687,203 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<remise>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<remise>]" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <message>] [-q|--quiet] <remise>" -#: builtin/stash.c:127 +#: 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 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' n'est pas une validation de type remisage" -#: builtin/stash.c:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "Trop de rรฉvisions spรฉcifiรฉes : %s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "Aucune entrรฉe de remisage trouvรฉe." -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "%s n'est pas une rรฉfรฉrence valide" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear avec des paramรจtres n'est pas implรฉmentรฉ" -#: builtin/stash.c:403 +#: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" msgstr "impossible d'appliquer un remisage en cours de fusion" -#: builtin/stash.c:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "impossible de gรฉnรฉrer %s^!." -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "conflits dans l'index. Essayez sans --index." -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "impossible de sauvegarder l'arbre d'index" -#: builtin/stash.c:434 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage" -#: builtin/stash.c:448 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "Fusion de %s avec %s" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "L'index n'a pas รฉtรฉ sorti de remise." -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "tentative de recrรฉer l'index" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "%s supprimรฉ (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%sย : Impossible de supprimer l'รฉlรฉment de stash" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' n'est pas une rรฉfรฉrence de remisage" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 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:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "Aucune branche spรฉcifiรฉe" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "Impossible de mettre ร jour %s avec %s" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 msgid "stash message" msgstr "message pour le remisage" -#: builtin/stash.c:818 +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" exige un argument <commit>" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1043 msgid "No changes selected" msgstr "Aucun changement sรฉlectionnรฉ" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1143 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1170 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'รฉtat courant de l'index" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1179 msgid "Cannot save the untracked files" msgstr "Impossible de sauver les fichiers non-suivis" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1190 builtin/stash.c:1199 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'รฉtat courant de la copie de travail" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1227 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'รฉtat de la copie de travail" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1276 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:1285 +#: builtin/stash.c:1292 msgid "Did you forget to 'git add'?" msgstr "Vous avez sรปrement oubliรฉ 'git add' ?" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1307 msgid "No local changes to save" msgstr "Pas de modifications locales ร sauver" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1314 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1329 msgid "Cannot save the current status" msgstr "Impossible de sauver l'รฉtat courant" -#: builtin/stash.c:1327 +#: builtin/stash.c:1334 #, 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:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1424 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1463 builtin/stash.c:1528 msgid "keep index" msgstr "conserver l'index" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "stash in patch mode" msgstr "remiser une mode rustine" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "quiet mode" msgstr "mode silencieux" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "include untracked files in stash" msgstr "inclure les fichiers non suivis dans la remise" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1470 builtin/stash.c:1535 msgid "include ignore files" msgstr "inclure les fichiers ignorรฉs" -#: builtin/stash.c:1555 -#, c-format -msgid "could not exec %s" -msgstr "impossible d'exรฉcuter %s" +#: builtin/stash.c:1570 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"la prise en charge de stash.useBuiltin a รฉtรฉ supprimรฉeย !\n" +"Voir son entrรฉe dans 'git help config' pour plus de dรฉtails." #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -19906,40 +21903,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:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Nom de rรฉfรฉrence complet attendu, %s obtenu" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote n'accepte aucun argument" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "impossible de supprimer un composant de l'URL '%s'" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "ancre alternative pour les chemins relatifs" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, 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:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Entrรฉe dans '%s'\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -19948,7 +21945,7 @@ msgstr "" "run_command a retournรฉ un statut non-nul pour %s\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19959,20 +21956,20 @@ msgstr "" "modules inclus de %s\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 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:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" msgstr "Parcourir rรฉcursivement les sous-modules" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -19981,60 +21978,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:665 +#: builtin/submodule--helper.c:666 #, 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:669 +#: builtin/submodule--helper.c:670 #, 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:679 +#: builtin/submodule--helper.c:680 #, 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:686 +#: builtin/submodule--helper.c:687 #, 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:708 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<options>] [<chemin>]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, 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:824 +#: builtin/submodule--helper.c:835 #, 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:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "rรฉcursion impossible dans le sous-module '%s'" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "supprimer la sortie d'รฉtat du sous-module" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:887 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -20042,48 +22039,104 @@ msgstr "" "Utiliser le commit stockรฉ dans l'index au lieu de celui stockรฉ dans la HEAD " "du sous-module" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" msgstr "parcourir rรฉcursivement les sous-modules" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper <nom> <chemin>" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "* %s %s(blob)->%s(submodule)" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "* %s %s(submodule)->%s(blob)" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "Impossible de calculer l'empreinte de l'objet depuis '%s'" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "mode %o inattendu\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "" +"utiliser le commit stockรฉ dans l'index au lieu de la HEAD du sous-module" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" +"pour comparer le commit dans l'index au lieu de celui dans la HEAD du sous-" +"module" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "sauter les sous-modules avec la valeur 'ignore_config' ร 'all'" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "limiter la taille du rรฉsumรฉ" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<chemin>]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "Impossible de rรฉcupรฉrer une rรฉvision pour HEAD" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "--cached et --files sont mutuellement exclusifs" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synchronisation de l'URL sous-module pour '%s'\n" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:1413 #, 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:990 +#: builtin/submodule--helper.c:1427 #, 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:1001 +#: builtin/submodule--helper.c:1438 #, 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:1048 +#: builtin/submodule--helper.c:1485 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:1055 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20093,7 +22146,7 @@ msgstr "" "'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " "historique)" -#: builtin/submodule--helper.c:1121 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -20102,179 +22155,208 @@ msgstr "" "L'arbre de travail du sous-module '%s' contient des modifications locales ; " "utilisez '-f' pour les annuler" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rรฉpertoire '%s' nettoyรฉ\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1568 #, 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:1142 +#: builtin/submodule--helper.c:1579 #, 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:1158 +#: builtin/submodule--helper.c:1595 #, 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:1187 +#: builtin/submodule--helper.c:1624 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:1188 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "Dรฉsenregistrer tous les sous-modules" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1644 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:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1713 +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:1752 builtin/submodule--helper.c:1755 #, 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:1341 +#: builtin/submodule--helper.c:1791 #, 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:1348 +#: builtin/submodule--helper.c:1798 #, 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:1371 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "emplacement oรน le sous-module sera clonรฉ" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "nom du nouveau sous-module" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "URL depuis laquelle cloner le sous-module" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "profondeur de l'historique des clones superficiels" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "forcer l'affichage de la progression du clonage" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +msgid "disallow cloning into non-empty directory" +msgstr "interdire de cloner dans un rรฉpertoire non-vide" + +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference " -"<dรฉpรดt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>" +"<dรฉpรดt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> " +"--path <chemin>" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1873 +#, 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" + +#: builtin/submodule--helper.c:1884 #, 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:1438 +#: builtin/submodule--helper.c:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "le rรฉpertoire n'est pas vide : '%s'" + +#: builtin/submodule--helper.c:1900 #, 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:1474 +#: builtin/submodule--helper.c:1936 #, 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:1478 +#: builtin/submodule--helper.c:1940 #, 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:1571 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Le chemin de sous-module '%s' n'est pas initialisรฉ" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "Vous voudriez sรปrement utiliser 'update --init'ย ?" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Sous-module non fusionnรฉ %s non traitรฉ" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "Sous-module '%s' non traitรฉ" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Impossible de cloner '%s'. Rรฉessai prรฉvu" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:2265 #, 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:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "chemin dans la copie de travail" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:2330 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:1858 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "valeurs possiblesย : rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:2340 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:1867 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "jobs parallรจles" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:2345 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:1870 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" -#: 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:2357 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "valeur invalide pour la mise ร jour du paramรจtre" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -20283,51 +22365,86 @@ 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:2061 +#: builtin/submodule--helper.c:2541 #, 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:2094 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "parcourir rรฉcursivement les sous-modules" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper embed-git-dir [<options>] [<chemin>...]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2636 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:2159 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "dรฉsactiver la configuration dans le fichier .gitmodules" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config name [<valeur>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nom>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 #, 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:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2681 +msgid "Suppress output for setting url of a submodule" +msgstr "Supprimer la sortie lors du paramรฉtrage de l'url d'un sous-module" + +#: builtin/submodule--helper.c:2685 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>" + +#: builtin/submodule--helper.c:2718 +msgid "set the default tracking branch to master" +msgstr "rรฉgler la branche de suivi par dรฉfaut ร master" + +#: builtin/submodule--helper.c:2720 +msgid "set the default tracking branch" +msgstr "rรฉgler la branche de suivi par dรฉfaut" + +#: builtin/submodule--helper.c:2724 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <chemin>" + +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branche> " +"<chemin>" + +#: builtin/submodule--helper.c:2732 +msgid "--branch or --default required" +msgstr "--branch ou --default requis" + +#: builtin/submodule--helper.c:2735 +msgid "--branch and --default are mutually exclusive" +msgstr "--branch et --default sont mutuellement exclusifs" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gรจre pas --super-prefix" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" @@ -20353,11 +22470,11 @@ msgstr "supprimer la rรฉfรฉrence symbolique" msgid "shorten ref output" msgstr "raccourcir l'affichage de la rรฉfรฉrence" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "raison" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "raison de la mise ร jour" @@ -20377,11 +22494,13 @@ msgstr "git tag -d <nomรฉtiquette>..." msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <objet>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<motif>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -20452,347 +22571,351 @@ msgstr "" msgid "bad object type." msgstr "mauvais type d'objet." -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "pas de message pour l'รฉtiquette ?" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "Le message pour l'รฉtiquette a รฉtรฉ laissรฉ dans %s\n" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "afficher les noms des รฉtiquettes" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "affiche <n> lignes de chaque message d'รฉtiquette" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "supprimer des รฉtiquettes" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "vรฉrifier des รฉtiquettes" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "Options de crรฉation de l'รฉtiquette" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "รฉtiquette annotรฉe, nรฉcessite un message" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "message pour l'รฉtiquette" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "forcer l'รฉdition du message d'รฉtiquetage" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "รฉtiquette annotรฉe et signรฉe avec GPG" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "utiliser une autre clรฉ pour signer l'รฉtiquette" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "remplacer l'รฉtiquette si elle existe" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "crรฉer un reflog" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "Options d'affichage des รฉtiquettes" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "afficher la liste des รฉtiquettes sous forme de colonnes" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "afficher seulement les รฉtiquettes qui contiennent la validation" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "afficher seulement les รฉtiquettes qui ne contiennent pas la validation" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "afficher seulement les รฉtiquettes qui sont fusionnรฉes" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "afficher seulement les รฉtiquettes qui ne sont pas fusionnรฉes" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "afficher seulement les รฉtiquettes de l'objet" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "--column et -n sont incompatibles" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "l'option -n est autorisรฉe seulement en mode de liste" -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "l'option --contains est autorisรฉe seulement en mode de liste" -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "l'option --contains est autorisรฉe seulement en mode liste" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "l'option --points-at est autorisรฉe seulement en mode liste" -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" "les options --merged et --no-merged ne sont autorisรฉes qu'en mode liste" -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisรฉe." -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "trop de paramรจtres" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'รฉtiquette valide." -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "l'รฉtiquette '%s' existe dรฉjร " -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "รtiquette '%s' mise ร jour (elle รฉtait sur %s)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "Dรฉpaquetage des objets" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "รฉchec de la crรฉation du rรฉpertoire %s" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "รฉchec de la crรฉation du fichier %s" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "รฉchec de la suppression du fichier %s" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "รฉchec de la suppression du rรฉpertoire %s" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "Test du mtime dans '%s' " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 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:166 +#: builtin/update-index.c:167 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:179 +#: builtin/update-index.c:180 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:190 +#: builtin/update-index.c:191 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:201 +#: builtin/update-index.c:202 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:214 +#: builtin/update-index.c:215 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:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<options>] [--] [<fichier>...]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:974 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:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "rafraรฎchir : ignorer les sous-modules" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des rรฉpertoires et vice-versa" -#: builtin/update-index.c:981 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:983 +#: builtin/update-index.c:986 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:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "rafraรฎchir l'information de stat" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "ajouter l'รฉlรฉment spรฉcifiรฉ dans l'index" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "mettre ร zรฉro le bit supposรฉ-non-modifiรฉ" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "mettre ร zรฉro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:1017 +#: 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 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:1019 +#: builtin/update-index.c:1024 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:1021 +#: builtin/update-index.c:1026 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:1023 +#: builtin/update-index.c:1028 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:1027 +#: builtin/update-index.c:1032 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:1031 +#: builtin/update-index.c:1036 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:1035 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "mettre ร jour seulement les รฉlรฉments qui diffรจrent de HEAD" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvรฉs et non rรฉsolus" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "รฉcrire l'index dans ce format" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "activer ou dรฉsactiver l'index divisรฉ" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "activer ou dรฉsactiver le cache de non-suivis" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 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:1056 +#: builtin/update-index.c:1061 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:1058 +#: builtin/update-index.c:1063 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:1060 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "" "activer ou dรฉsactiver la surveillance du systรจme de fichier (fsmonitor)" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "marquer les fichiers comme valides pour fsmonitor" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "effacer le bit de validitรฉ fsmonitor" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20800,7 +22923,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:1177 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20808,7 +22931,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:1188 +#: 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" @@ -20816,11 +22939,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:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Le cache non suivi est dรฉsactivรฉ" -#: builtin/update-index.c:1200 +#: 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" @@ -20828,29 +22951,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:1204 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Le cache non suivi est activรฉ pour '%s'" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1218 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:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor activรฉ" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1225 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:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor dรฉsactivรฉ" @@ -20868,19 +22991,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<options>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "supprimer la rรฉfรฉrence" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "mettre ร jour <nomrรฉfรฉrence> et non la rรฉfรฉrence pointรฉe par lui" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "l'entrรฉe standard a des arguments qui se terminent par NUL" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "lire les mises ร jour depuis l'entrรฉe standard" @@ -20907,8 +23030,7 @@ msgstr "Sortir immรฉdiatement aprรจs l'annonce initiale des rรฉfรฉrences" #: builtin/upload-pack.c:27 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" -"nes pas essayer <rรฉpertoire>/.git/ si <rรฉpertoire> n'est pas un rรฉpertoire " -"Git" +"ne pas essayer <rรฉpertoire>/.git/ si <rรฉpertoire> n'est pas un rรฉpertoire Git" #: builtin/upload-pack.c:29 msgid "interrupt transfer after <n> seconds of inactivity" @@ -20926,15 +23048,15 @@ msgstr "afficher le contenu du commit" msgid "print raw gpg status output" msgstr "afficher les messages bruts de gpg" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "verbeux" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "afficher seulement les statistiques" @@ -20946,236 +23068,226 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format>] <รฉtiquette>..." msgid "print tag contents" msgstr "afficher le contenu de l'รฉtiquette" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<options>] <chemin> [<commit>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<options>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<options>] <chemin>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<options>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<options>] <arbre-de-travail>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:970 #, c-format msgid "failed to delete '%s'" msgstr "รฉchec de la suppression de '%s'" -#: 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 +msgid "not a valid directory" +msgstr "pas un rรฉpertoire valide" -#: 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:91 +msgid "gitdir file does not exist" +msgstr "le fichier gitdir n'existe pas" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:96 builtin/worktree.c:105 #, 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)" +msgid "unable to read gitdir file (%s)" +msgstr "impossible de lire le fichier gitdir (%s)" -#: builtin/worktree.c:110 +#: builtin/worktree.c:115 #, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "" -"Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets " -"attendus, %<PRIuMAX> octets lus)" +"lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)" -#: builtin/worktree.c:118 -#, c-format -msgid "Removing worktrees/%s: invalid gitdir file" -msgstr "Suppression de worktrees/%sย : fichier gitdir invalide" +#: builtin/worktree.c:123 +msgid "invalid gitdir file" +msgstr "fichier gitdir invalide" + +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "le fichier gitdir pointe sur un endroit inexistant" -#: builtin/worktree.c:127 +#: builtin/worktree.c:146 #, 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" +msgid "Removing %s/%s: %s" +msgstr "Suppression de %s/%s : %s" -#: builtin/worktree.c:166 +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "afficher les arbres de travail รฉliminรฉs" -#: builtin/worktree.c:168 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "faire expirer les arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:235 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "'%s' existe dรฉjร " -#: builtin/worktree.c:252 +#: builtin/worktree.c:302 #, c-format -msgid "unable to re-add worktree '%s'" -msgstr "impossible de rรฉ-ajouter l'arbre de travail '%s'" +msgid "unusable worktree destination '%s'" +msgstr "arbre de travail destination '%s' inutilisable" -#: builtin/worktree.c:257 +#: builtin/worktree.c:307 #, 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" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" "'%s' est un arbre de travail manquant mais verrouillรฉย ;\n" -"utilisez 'add -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' " +"utilisez '%s -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' " "pour corriger" -#: builtin/worktree.c:259 +#: builtin/worktree.c:309 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" 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" +"utilisez '%s -f' pour passer outre, ou 'prune' ou 'remove' pour corriger" -#: builtin/worktree.c:309 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de crรฉer le rรฉpertoire de '%s'" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Prรฉparation de l'arbre de travail (nouvelle branche '%s')" -#: builtin/worktree.c:442 +#: builtin/worktree.c:496 #, 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:451 +#: builtin/worktree.c:505 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Prรฉparation de l'arbre de travail (extraction de '%s')" -#: builtin/worktree.c:457 +#: builtin/worktree.c:511 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Prรฉparation de l'arbre de travail (HEAD dรฉtachรฉe %s)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:552 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:501 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "crรฉer une nouvelle branche" -#: builtin/worktree.c:503 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "crรฉer ou rรฉinitialiser une branche" -#: builtin/worktree.c:505 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:506 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:509 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "rรฉgler le mode de suivi (voir git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:566 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:520 +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:581 +#: builtin/worktree.c:635 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:681 +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "raison du verrouillage" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:769 builtin/worktree.c:802 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:700 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est dรฉjร verrouillรฉ, car '%s'" -#: builtin/worktree.c:702 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "'%s' est dรฉjร verrouillรฉ" -#: builtin/worktree.c:730 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillรฉ" -#: builtin/worktree.c:771 +#: builtin/worktree.c:845 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:779 +#: builtin/worktree.c:853 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:802 builtin/worktree.c:929 +#: builtin/worktree.c:876 builtin/worktree.c:1000 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' est un arbre de travail principal" -#: builtin/worktree.c:807 +#: builtin/worktree.c:881 #, 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:813 -#, c-format -msgid "target '%s' already exists" -msgstr "la cible '%s' existe dรฉjร " - -#: builtin/worktree.c:821 +#: builtin/worktree.c:894 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21185,7 +23297,7 @@ msgstr "" "verrouillageย : %s\n" "utilisez 'move -f -f' pour outrepasser ou dรฉverrouiller avant" -#: builtin/worktree.c:823 +#: builtin/worktree.c:896 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21193,37 +23305,39 @@ msgstr "" "impossible de dรฉplacer un arbre de travail verrouillรฉ;\n" "utilisez 'move -f -f' pour outrepasser ou dรฉverrouiller avant" -#: builtin/worktree.c:826 +#: builtin/worktree.c:899 #, 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:831 +#: builtin/worktree.c:904 #, c-format msgid "failed to move '%s' to '%s'" msgstr "รฉchec au dรฉplacement de '%s' vers '%s'" -#: builtin/worktree.c:879 +#: builtin/worktree.c:950 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "รฉchec du lancement de 'git status' sur '%s'" -#: builtin/worktree.c:883 +#: builtin/worktree.c:954 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "'%s' est sale, utilisez --force pour le supprimer" +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" -#: builtin/worktree.c:888 +#: builtin/worktree.c:959 #, 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:911 +#: builtin/worktree.c:982 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:934 +#: builtin/worktree.c:1005 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21233,7 +23347,7 @@ msgstr "" "verrouillageย : %s\n" "utilisez 'move -f -f' pour outrepasser ou dรฉverrouiller avant" -#: builtin/worktree.c:936 +#: builtin/worktree.c:1007 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21241,12 +23355,22 @@ msgstr "" "impossible de supprimer un arbre de travail verrouillรฉ;\n" "utilisez 'move -f -f' pour outrepasser ou dรฉverrouiller avant" -#: builtin/worktree.c:939 +#: builtin/worktree.c:1010 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" "la validation a รฉchouรฉ, impossible de supprimer l'arbre de travailย : %s" +#: builtin/worktree.c:1034 +#, c-format +msgid "repair: %s: %s" +msgstr "rรฉparationย : %sย : '%s'" + +#: builtin/worktree.c:1037 +#, c-format +msgid "error: %s: %s" +msgstr "erreurย : %sย : %s" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prรฉfixe>/]" @@ -21263,29 +23387,21 @@ msgstr "รฉcrire l'objet arbre pour un sous-rรฉpertoire <prรฉfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le dรฉbogage" -#: credential-cache--daemon.c:223 +#: http-fetch.c:114 #, 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 "" -"Les permissions de votre rรฉpertoire de socket sont trop permissivesย ;\n" -"les autres utilisateurs pourraient lire vos identifiants secrets. Lancezย :\n" -"\n" -" chmod 0700 %s" +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "l'argument de --packfile doit รชtre une empreinte valide ('%s' reรงu)" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "afficher les messages de debug sur stderr" +#: http-fetch.c:122 +msgid "not a git repository" +msgstr "pas un dรฉpรดt git" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "le commit %s n'est pas marquรฉ joignable" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "trop de commits marquรฉs joignables" @@ -21297,7 +23413,7 @@ msgstr "test-tool serve-v2 [<options>]" msgid "exit immediately after advertising capabilities" msgstr "sortir immรฉdiatement aprรจs l'annonce des capacitรฉs" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -21314,7 +23430,7 @@ msgstr "" " [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n" " <commande> [<args>]" -#: git.c:34 +#: git.c:35 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" @@ -21326,47 +23442,47 @@ msgstr "" "pour en lire plus ร propos d'une commande spรฉcifique ou d'un concept.\n" "Voir 'git help git' pour un survol du systรจme." -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "aucun rรฉpertoire fourni pour --git-dir\n" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "aucun espace de nom fournit pour --namespace\n" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "aucun rรฉpertoire fourni pour --work-tree\n" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "aucun prรฉfixe fourni pour --super-prefix\n" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "-c requiert une chaรฎne de configuration\n" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "aucun rรฉpertoire fourni pour -C\n" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "option inconnueย : %s\n" -#: git.c:360 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "lors de l'expansion de l'alias '%s'ย : '%s'" -#: git.c:369 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -21375,39 +23491,39 @@ msgstr "" "l'alias '%s' modifie les variables d'environnement.\n" "Vous pouvez utiliser '!git' dans l'alias pour le faire" -#: git.c:377 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "alias vide pour %s" -#: git.c:380 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "alias recursifย : %s" -#: git.c:460 +#: git.c:465 msgid "write failure on standard output" msgstr "รฉchec d'รฉcriture sur la sortie standard" -#: git.c:462 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "รฉchec inconnu d'รฉcriture sur la sortie standard" -#: git.c:464 +#: git.c:469 msgid "close failed on standard output" msgstr "รฉchec de fermeture de la sortie standard" -#: git.c:793 +#: git.c:819 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "boucle d'alias dรฉtectรฉeย : l'expansion de '%s' ne finit jamaisย : %s" -#: git.c:843 +#: git.c:869 #, c-format msgid "cannot handle %s as a builtin" msgstr "impossible d'utiliser %s comme une fonction intรฉgrรฉe" -#: git.c:856 +#: git.c:882 #, c-format msgid "" "usage: %s\n" @@ -21416,57 +23532,57 @@ msgstr "" "usage : %s\n" "\n" -#: git.c:876 +#: git.c:902 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "l'expansion de l'alias '%s' a รฉchouรฉย : '%s' n'est pas une commande git\n" -#: git.c:888 +#: git.c:914 #, c-format msgid "failed to run command '%s': %s\n" msgstr "รฉchec au lancement de la commande '%s'ย : %s\n" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" "valeur nรฉgative pour http.postbuffer ; utilisation de la valeur par dรฉfaut %d" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "La dรฉlรฉgation de commande n'est pas supportรฉ avec cuRL < 7.22.0" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "L'รฉpinglage de clรฉ publique n'est pas supportรฉ avec cuRL < 7.44.0" -#: http.c:876 +#: http.c:910 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REMOVE n'est pas supportรฉ avec cuRL < 7.44.0" -#: http.c:949 +#: http.c:989 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:1085 +#: http.c:1132 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Dorsale SSL '%s' non supportรฉe. Dorsales SSL supportรฉesย :" -#: http.c:1092 +#: http.c:1139 #, 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:1096 +#: http.c:1143 #, 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:1965 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21477,154 +23593,196 @@ msgstr "" " demandรฉย : %s\n" " redirectionย : %s" -#: remote-curl.c:157 +#: remote-curl.c:174 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "citation invalide dans la valeur push-optionย : '%s'" -#: remote-curl.c:254 +#: remote-curl.c:298 #, 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:355 +#: remote-curl.c:399 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:386 +#: remote-curl.c:430 #, c-format msgid "invalid server response; got '%s'" msgstr "rรฉponse du serveur invalideย ; '%s' reรงu" -#: remote-curl.c:446 +#: remote-curl.c:490 #, c-format msgid "repository '%s' not found" msgstr "dรฉpรดt '%s' non trouvรฉ" -#: remote-curl.c:450 +#: remote-curl.c:494 #, c-format msgid "Authentication failed for '%s'" msgstr "รchec d'authentification pour '%s'" -#: remote-curl.c:454 +#: remote-curl.c:498 #, c-format msgid "unable to access '%s': %s" msgstr "impossible d'accรฉder ร '%s'ย : %s" -#: remote-curl.c:460 +#: remote-curl.c:504 #, c-format msgid "redirecting to %s" msgstr "redirection vers %s" -#: remote-curl.c:584 +#: remote-curl.c:633 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:664 +#: remote-curl.c:645 +msgid "remote server sent stateless separator" +msgstr "le serveur distant a envoyรฉ un sรฉparateur sans รฉtat" + +#: remote-curl.c:715 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:724 +#: remote-curl.c:745 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curlย : mauvais caractรจre de longueur de ligneย : %.4s" + +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curlย : paquet de fin de rรฉponse inattendu" + +#: remote-curl.c:823 #, c-format msgid "RPC failed; %s" msgstr "รฉchec RPCย ; %s" -#: remote-curl.c:764 +#: remote-curl.c:863 msgid "cannot handle pushes this big" msgstr "impossible de gรฉrer des poussรฉes aussi grosses" -#: remote-curl.c:879 +#: remote-curl.c:978 #, 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:883 +#: remote-curl.c:982 #, 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:1014 +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" +msgstr "%d octets de longueur d'entรชte ont รฉtรฉ reรงus" + +#: remote-curl.c:1034 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "%d octets de corps sont encore attendus" + +#: remote-curl.c:1123 msgid "dumb http transport does not support shallow capabilities" msgstr "le protocole http idiot ne supporte la capacitรฉ superficielle" -#: remote-curl.c:1028 +#: remote-curl.c:1138 msgid "fetch failed." msgstr "รฉchec du rรฉcupรฉration." -#: remote-curl.c:1076 +#: remote-curl.c:1184 msgid "cannot fetch by sha1 over smart http" msgstr "impossible de rรฉcupรฉrer par sha1 sur http intelligent" -#: remote-curl.c:1120 remote-curl.c:1126 +#: remote-curl.c:1228 remote-curl.c:1234 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "erreur de protocoleย : sha/ref attendu, '%s' trouvรฉ" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1246 remote-curl.c:1361 #, c-format msgid "http transport does not support %s" msgstr "le transport http ne supporte pas %s" -#: remote-curl.c:1174 +#: remote-curl.c:1282 msgid "git-http-push failed" msgstr "รฉchec de git-http-push" -#: remote-curl.c:1360 +#: remote-curl.c:1467 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: usage: git remote-curl <distant> [<url>]" -#: remote-curl.c:1392 +#: remote-curl.c:1499 msgid "remote-curl: error reading command stream from git" msgstr "remote-curlย : erreur de lecture du flux de commande depuis git" -#: remote-curl.c:1399 +#: remote-curl.c:1506 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:1439 +#: remote-curl.c:1547 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curlย : commande inconnue '%s' depuis git" -#: list-objects-filter-options.h:61 +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "aucune information de compilateur disponible\n" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "aucune information de libc disponible\n" + +#: list-objects-filter-options.h:91 msgid "args" msgstr "args" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "filtrage d'objet" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "date-d'expiration" -#: parse-options.h:184 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "sans action (rรฉtrocompatibilitรฉ)" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "รชtre plus verbeux" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "รชtre plus silencieux" -#: parse-options.h:313 -msgid "use <n> digits to display SHA-1s" -msgstr "utiliser <n> chiffres pour afficher les SHA-1s" +#: parse-options.h:317 +msgid "use <n> digits to display object names" +msgstr "utiliser <n> chiffres pour afficher les noms des objets" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "comment รฉliminer les espaces et les commentaires # du message" -#: ref-filter.h:101 +#: 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:96 msgid "key" msgstr "clรฉ" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "nom du champ servant ร trier" @@ -21633,11 +23791,11 @@ msgid "update the index with reused conflict resolution if possible" msgstr "" "met ร jour l'index avec les rรฉsolutions de conflit rรฉutilisรฉes si possible" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "HEAD dรฉtachรฉe sur " -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "HEAD dรฉtachรฉe depuis " @@ -21680,691 +23838,709 @@ msgid "List, create, or delete branches" msgstr "Lister, crรฉer ou supprimer des branches" #: command-list.h:59 +msgid "Collect information for user to file a bug report" +msgstr "" +"Collecter l'information pour l'utilisateur pour remplir un rapport de bogue" + +#: command-list.h:60 msgid "Move objects and refs by archive" msgstr "Dรฉplacer les objets et rรฉfรฉrences par archive" -#: command-list.h:60 +#: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "" -"Fournir les contenu ou l'information de type et taille pour les objets du " +"Fournir le contenu ou l'information de type et taille pour les objets du " "dรฉpรดt" -#: command-list.h:61 +#: command-list.h:62 msgid "Display gitattributes information" msgstr "Afficher les informations gitattributes" -#: command-list.h:62 +#: command-list.h:63 msgid "Debug gitignore / exclude files" msgstr "Dรฉboguer gitignore / les fichiers d'exclusion" -#: command-list.h:63 +#: command-list.h:64 msgid "Show canonical names and email addresses of contacts" msgstr "Afficher les noms canoniques et les adresses courriel des contacts" -#: command-list.h:64 +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "Basculer de branche ou restaurer la copie de travail" -#: command-list.h:65 +#: command-list.h:66 msgid "Copy files from the index to the working tree" msgstr "Copier les fichiers depuis l'index dans la copie de travail" -#: command-list.h:66 +#: command-list.h:67 msgid "Ensures that a reference name is well formed" -msgstr "Assure qu'un nom de rรฉfรฉrence est bien formรฉ" +msgstr "S'assurer qu'un nom de rรฉfรฉrence est bien formรฉ" -#: command-list.h:67 +#: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "Trouver les commits ร appliquer en amont" -#: command-list.h:68 +#: command-list.h:69 msgid "Apply the changes introduced by some existing commits" msgstr "Appliquer les modifications introduites par des commits existants" -#: command-list.h:69 +#: command-list.h:70 msgid "Graphical alternative to git-commit" msgstr "Alternative graphique ร git-commit" -#: command-list.h:70 +#: command-list.h:71 msgid "Remove untracked files from the working tree" msgstr "Supprimer les fichiers non-suivis de l'arbre de travail" -#: command-list.h:71 +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "Cloner un dรฉpรดt dans un nouveau rรฉpertoire" -#: command-list.h:72 +#: command-list.h:73 msgid "Display data in columns" msgstr "Afficher les donnรฉes en colonnes" -#: command-list.h:73 +#: command-list.h:74 msgid "Record changes to the repository" msgstr "Enregistrer les modifications dans le dรฉpรดt" -#: command-list.h:74 +#: command-list.h:75 msgid "Write and verify Git commit-graph files" msgstr "รcrire et vรฉrifier les fichiers de graphe de commit Git" -#: command-list.h:75 +#: command-list.h:76 msgid "Create a new commit object" msgstr "Crรฉer un nouvel objet commit" -#: command-list.h:76 +#: command-list.h:77 msgid "Get and set repository or global options" msgstr "voir et rรฉgler les options globales ou de dรฉpรดt" -#: command-list.h:77 +#: command-list.h:78 msgid "Count unpacked number of objects and their disk consumption" msgstr "" "Compter le nombre d'objets non-empaquetรฉs et leur consommation d'espace " "disque" -#: command-list.h:78 +#: command-list.h:79 msgid "Retrieve and store user credentials" msgstr "Rรฉcupรฉrer et sauvegarder les certificats d'utilisateur" -#: command-list.h:79 +#: command-list.h:80 msgid "Helper to temporarily store passwords in memory" msgstr "Assistant pour maintenir temporairement en mรฉmoire les mots de passe" -#: command-list.h:80 +#: command-list.h:81 msgid "Helper to store credentials on disk" msgstr "Assistant pour sauvegarder les certificats sur disque" -#: command-list.h:81 +#: command-list.h:82 msgid "Export a single commit to a CVS checkout" msgstr "Exporter un commit unique en extraction CVS" -#: command-list.h:82 +#: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" msgstr "Sauver vos donnรฉes depuis un autre SCM qu'on aime ร haรฏr" -#: command-list.h:83 +#: command-list.h:84 msgid "A CVS server emulator for Git" msgstr "Un รฉmulateur de serveur CVS pour Git" -#: command-list.h:84 +#: command-list.h:85 msgid "A really simple server for Git repositories" msgstr "Un serveur vraiment simple pour les dรฉpรดts Git" -#: command-list.h:85 +#: command-list.h:86 msgid "Give an object a human readable name based on an available ref" msgstr "" "Baptiser un objet avec un nom lisible ร partir d'une rรฉfรฉrence disponible" -#: command-list.h:86 +#: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Afficher les changements entre les validations, entre validation et copie de " "travail, etc" -#: command-list.h:87 +#: command-list.h:88 msgid "Compares files in the working tree and the index" msgstr "Compare des fichiers de l'arbre de travail et de l'index" -#: command-list.h:88 +#: command-list.h:89 msgid "Compare a tree to the working tree or index" msgstr "Comparer un arbre avec l'arbre de travail ou l'index" -#: command-list.h:89 +#: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" -msgstr "Compare le contenu et la mode des blobs trouvรฉs via deux objets arbre" +msgstr "Compare le contenu et le mode des blobs trouvรฉs via deux objets arbre" -#: command-list.h:90 +#: command-list.h:91 msgid "Show changes using common diff tools" msgstr "Afficher les modifications en utilisant les outils habituel de diff" -#: command-list.h:91 +#: command-list.h:92 msgid "Git data exporter" msgstr "Exporteur de donnรฉes Git" -#: command-list.h:92 +#: command-list.h:93 msgid "Backend for fast Git data importers" msgstr "Moteur pour les importateurs rapides de donnรฉes Git" -#: command-list.h:93 +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "Tรฉlรฉcharger les objets et rรฉfรฉrences depuis un autre dรฉpรดt" -#: command-list.h:94 +#: command-list.h:95 msgid "Receive missing objects from another repository" msgstr "Tรฉlรฉcharger les objets manquants depuis un autre dรฉpรดt" -#: command-list.h:95 +#: command-list.h:96 msgid "Rewrite branches" msgstr "Rรฉรฉcrire les branches" -#: command-list.h:96 +#: command-list.h:97 msgid "Produce a merge commit message" msgstr "Produire un message de validation de fusion" -#: command-list.h:97 +#: command-list.h:98 msgid "Output information on each ref" -msgstr "Afficher l'information de chaque rรฉfรฉrence" +msgstr "Afficher de l'information sur chaque rรฉfรฉrence" -#: command-list.h:98 +#: command-list.h:99 msgid "Prepare patches for e-mail submission" msgstr "Prรฉparer les patchs pour soumission par courriel" -#: command-list.h:99 +#: command-list.h:100 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" "Vรฉrifier la connectivitรฉ et la validitรฉ des objets dans la base de donnรฉes" -#: command-list.h:100 +#: command-list.h:101 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Effacer les fichiers non-nรฉcessaires et optimiser le dรฉpรดt local" -#: command-list.h:101 +#: command-list.h:102 msgid "Extract commit ID from an archive created using git-archive" msgstr "Extraire l'ID du commit depuis une archive crรฉรฉe par git-archive" -#: command-list.h:102 +#: command-list.h:103 msgid "Print lines matching a pattern" msgstr "Afficher les lignes correspondant ร un motif" -#: command-list.h:103 +#: command-list.h:104 msgid "A portable graphical interface to Git" msgstr "Une interface graphique portable pour Git" -#: command-list.h:104 +#: command-list.h:105 msgid "Compute object ID and optionally creates a blob from a file" msgstr "" "Calculer l'ID d'objet et crรฉer optionnellement un blob depuis un fichier" -#: command-list.h:105 +#: command-list.h:106 msgid "Display help information about Git" msgstr "Afficher l'information d'aide ร propos de Git" -#: command-list.h:106 +#: command-list.h:107 msgid "Server side implementation of Git over HTTP" msgstr "Implantation cรดtรฉ serveur de Git sur HTTP" -#: command-list.h:107 +#: command-list.h:108 msgid "Download from a remote Git repository via HTTP" msgstr "Tรฉlรฉcharger depuis un dรฉpรดt Git distant via HTTP" -#: command-list.h:108 +#: command-list.h:109 msgid "Push objects over HTTP/DAV to another repository" msgstr "Pousser les objets sur un autre dรฉpรดt via HTTP/DAV" -#: command-list.h:109 +#: command-list.h:110 msgid "Send a collection of patches from stdin to an IMAP folder" -msgstr "Envoyer un ensemble de patchs depuis stdin vers un rรฉpertoire IMAP" +msgstr "Envoyer un ensemble de rustines depuis stdin vers un rรฉpertoire IMAP" -#: command-list.h:110 +#: command-list.h:111 msgid "Build pack index file for an existing packed archive" msgstr "" "Construire un fichier d'index pack depuis une archive compactรฉe existante" -#: command-list.h:111 +#: command-list.h:112 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Crรฉer un dรฉpรดt Git vide ou rรฉinitialiser un existant" -#: command-list.h:112 +#: command-list.h:113 msgid "Instantly browse your working repository in gitweb" msgstr "Naviguer instantanรฉment votre dรฉpรดt de travail dans gitweb" -#: command-list.h:113 +#: command-list.h:114 msgid "Add or parse structured information in commit messages" msgstr "" "Ajouter ou analyser l'information structurรฉe dans les messages de validation" -#: command-list.h:114 +#: command-list.h:115 msgid "The Git repository browser" msgstr "Le navigateur de dรฉpรดt Git" -#: command-list.h:115 +#: command-list.h:116 msgid "Show commit logs" msgstr "Afficher l'historique des validations" -#: command-list.h:116 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "" "Afficher l'information ร propos des fichiers dans l'index ou l'arbre de " "travail" -#: command-list.h:117 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "Lister les rรฉfรฉrences dans un dรฉpรดt distant" -#: command-list.h:118 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "Afficher le contenu d'un objet arbre" -#: command-list.h:119 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "" "Extraire le patch et l'information de d'auteur depuis un simple message de " "courriel" -#: command-list.h:120 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "Programme simple de dรฉcoupage de mbox UNIX" -#: command-list.h:121 +#: command-list.h:122 +msgid "Run tasks to optimize Git repository data" +msgstr "Lancer les tรขches pour optimiser les donnรฉes du depรดt Git" + +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "Fusionner deux ou plusieurs historiques de dรฉveloppement ensemble" -#: command-list.h:122 +#: command-list.h:124 msgid "Find as good common ancestors as possible for a merge" msgstr "Trouver un ancรชtre aussi bon que possible pour une fusion" -#: command-list.h:123 +#: command-list.h:125 msgid "Run a three-way file merge" msgstr "Lancer une fusion ร 3 points" -#: command-list.h:124 +#: command-list.h:126 msgid "Run a merge for files needing merging" msgstr "Lancer une fusion ร 3 points pour les fichiers ร fusionner" -#: command-list.h:125 +#: command-list.h:127 msgid "The standard helper program to use with git-merge-index" msgstr "Le programme assistant standard ร utiliser avec git-merge-index" -#: command-list.h:126 +#: command-list.h:128 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" "Lancer les outils de rรฉsolution de conflit de fusion pour rรฉsoudre les " "conflits de fusion" -#: command-list.h:127 +#: command-list.h:129 msgid "Show three-way merge without touching index" msgstr "Afficher la fusion ร trois points sans modifier l'index" -#: command-list.h:128 +#: command-list.h:130 msgid "Write and verify multi-pack-indexes" msgstr "รcrire et vรฉrifier les index multi-paquet" -#: command-list.h:129 +#: command-list.h:131 msgid "Creates a tag object" msgstr "Crรฉer un objet รฉtiquette" -#: command-list.h:130 +#: command-list.h:132 msgid "Build a tree-object from ls-tree formatted text" msgstr "Construire un objet arbre depuis une texte formatรฉ comme ls-tree" -#: command-list.h:131 +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "Dรฉplacer ou renommer un fichier, un rรฉpertoire, ou un lien symbolique" -#: command-list.h:132 +#: command-list.h:134 msgid "Find symbolic names for given revs" msgstr "Trouver les noms symboliques pour des rรฉvisions donnรฉes" -#: command-list.h:133 +#: command-list.h:135 msgid "Add or inspect object notes" -msgstr "Ajouter ou inspecter les notes d'un objets" +msgstr "Ajouter ou inspecter les notes d'un objet" -#: command-list.h:134 +#: command-list.h:136 msgid "Import from and submit to Perforce repositories" msgstr "Importer et soumettre ร des dรฉpรดt Perforce" -#: command-list.h:135 +#: command-list.h:137 msgid "Create a packed archive of objects" msgstr "Crรฉer une archive compactรฉe d'objets" -#: command-list.h:136 +#: command-list.h:138 msgid "Find redundant pack files" msgstr "Trouver les fichiers pack redondants" -#: command-list.h:137 +#: command-list.h:139 msgid "Pack heads and tags for efficient repository access" msgstr "Empaqueter les tรชtes et les รฉtiquettes pour un accรจs efficace au dรฉpรดt" -#: command-list.h:138 +#: command-list.h:140 msgid "Routines to help parsing remote repository access parameters" msgstr "" "Routines pour aider ร analyser les paramรจtres d'accรจs aux dรฉpรดts distants" -#: command-list.h:139 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "Calculer l'ID unique d'un patch" -#: command-list.h:140 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "" "รliminer les objets inatteignables depuis la base de donnรฉes des objets" -#: command-list.h:141 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "รliminer les objets qui sont dรฉjร prรฉsents dans les fichiers pack" -#: command-list.h:142 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Rapatrier et intรฉgrer un autre dรฉpรดt ou une branche locale" -#: command-list.h:143 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "Mettre ร jour les rรฉfรฉrences distantes ainsi que les objets associรฉs" -#: command-list.h:144 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "Appliquer un patchset quilt sur la branche courante" -#: command-list.h:145 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "" "Comparer deux plages de commits (par exemple deux versions d'une branche)" -#: command-list.h:146 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "Lire l'information d'arbre dans l'index" -#: command-list.h:147 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "Rรฉapplication des commits sur le sommet de l'autre base" -#: command-list.h:148 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "Recevoir ce qui est poussรฉ dans le dรฉpรดt" -#: command-list.h:149 +#: command-list.h:151 msgid "Manage reflog information" msgstr "Gรฉrer l'information de reflog" -#: command-list.h:150 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "Gรฉrer un ensemble de dรฉpรดts suivis" -#: command-list.h:151 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "Empaqueter les objets non-empaquetรฉs d'un dรฉpรดt" -#: command-list.h:152 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "Crรฉer, lister, supprimer des rรฉfรฉrence pour remplacer des objets" -#: command-list.h:153 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "Gรฉnรฉrer une rรฉsumรฉ des modifications en attentes" -#: command-list.h:154 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "Rรฉutiliser une rรฉsolution enregistrรฉe de fusions conflictuelles" -#: command-list.h:155 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "Rรฉinitialiser la HEAD courante ร l'รฉtat spรฉcifiรฉ" -#: command-list.h:156 +#: command-list.h:158 msgid "Restore working tree files" msgstr "restaurer les fichiers l'arbre de travail" -#: command-list.h:157 +#: command-list.h:159 msgid "Revert some existing commits" msgstr "Inverser des commits existants" -#: command-list.h:158 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "Afficher les objets commit dans l'ordre chronologique inverse" -#: command-list.h:159 +#: command-list.h:161 msgid "Pick out and massage parameters" msgstr "Analyser et prรฉparer les paramรจtres" -#: command-list.h:160 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "Supprimer des fichiers de la copie de travail et de l'index" -#: command-list.h:161 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "Envoyer un ensemble de patchs comme courriels" -#: command-list.h:162 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "Pousser les objets sur un autre dรฉpรดt via le protocole Git" -#: command-list.h:163 +#: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" msgstr "shell de login restreint pour un accรจs SSH vers Git seulement" -#: command-list.h:164 +#: command-list.h:166 msgid "Summarize 'git log' output" msgstr "Rรฉsumer la sortie de 'git log'" -#: command-list.h:165 +#: command-list.h:167 msgid "Show various types of objects" msgstr "Afficher diffรฉrents types d'objets" -#: command-list.h:166 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "Afficher les branches et leurs commits" -#: command-list.h:167 +#: command-list.h:169 msgid "Show packed archive index" msgstr "Afficher l'index de l'archive empaquetรฉe" -#: command-list.h:168 +#: command-list.h:170 msgid "List references in a local repository" msgstr "Lister les rรฉfรฉrences du dรฉpรดt local" -#: command-list.h:169 +#: command-list.h:171 msgid "Git's i18n setup code for shell scripts" msgstr "Le code d'initialisation i18n pour les scripts shell" -#: command-list.h:170 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "Le code d'initialisation commun aux scripts shell Git" -#: command-list.h:171 +#: command-list.h:173 +msgid "Initialize and modify the sparse-checkout" +msgstr "Initialiser et modifier l'extraction partielle" + +#: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "Remiser les modifications d'un rรฉpertoire de travail sale" -#: command-list.h:172 +#: command-list.h:175 msgid "Add file contents to the staging area" msgstr "Ajouter le contenu de fichiers ร l'index" -#: command-list.h:173 +#: command-list.h:176 msgid "Show the working tree status" msgstr "Afficher l'รฉtat de la copie de travail" -#: command-list.h:174 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "Retirer les espaces inutiles" -#: command-list.h:175 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "Initialiser, mettre ร jour et inspecter les sous-modules" -#: command-list.h:176 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" -msgstr "Opรฉration Bidirectionnelles entre un dรฉpรดt Subversion et Git" +msgstr "Opรฉration Bidirectionnelle entre un dรฉpรดt Subversion et Git" -#: command-list.h:177 +#: command-list.h:180 msgid "Switch branches" msgstr "Basculer de branche" -#: command-list.h:178 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "Lire, modifier et supprimer les rรฉfรฉrences symboliques" -#: command-list.h:179 +#: command-list.h:182 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:180 +#: command-list.h:183 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:181 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "Dรฉpaqueter les objets depuis une archive empaquetรฉe" -#: command-list.h:182 +#: command-list.h:185 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:183 +#: command-list.h:186 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:184 +#: command-list.h:187 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:185 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "Renvoyer une archive dans git-archive" -#: command-list.h:186 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "Renvoyer des objets empaquetรฉs dans git-fetch-pack" -#: command-list.h:187 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "Afficher un variable logique de Git" -#: command-list.h:188 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "Vรฉrifier la signature GPG de commits" -#: command-list.h:189 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "Valider des fichiers d'archive Git empaquetรฉs" -#: command-list.h:190 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "Vรฉrifier la signature GPG d'รฉtiquettes" -#: command-list.h:191 +#: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interface web de Git" -#: command-list.h:192 +#: command-list.h:195 msgid "Show logs with difference each commit introduces" msgstr "Afficher les journaux avec la diffรฉrence que chaque commit introduit" -#: command-list.h:193 +#: command-list.h:196 msgid "Manage multiple working trees" -msgstr "Gรจre de arbres de travail multiples" +msgstr "Gรฉrer des arbres de travail multiples" -#: command-list.h:194 +#: command-list.h:197 msgid "Create a tree object from the current index" msgstr "Crรฉer un objet arbre depuis l'index courant" -#: command-list.h:195 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "Dรฉfinition des attributs par chemin" -#: command-list.h:196 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "interface en ligne de commande et conventions de Git" -#: command-list.h:197 +#: command-list.h:200 msgid "A Git core tutorial for developers" msgstr "Tutoriel du cลur de Git pour les dรฉveloppeurs" -#: command-list.h:198 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "Fourniture des noms d'utilisateurs et des mots de passe ร Git" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "Git pour les utilisateurs de CVS" -#: command-list.h:199 +#: command-list.h:203 msgid "Tweaking diff output" msgstr "Bidouillage de la sortie diff" -#: command-list.h:200 +#: command-list.h:204 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:201 +#: command-list.h:205 +msgid "Frequently asked questions about using Git" +msgstr "Foire aux questions sur l'utilisation de Git" + +#: command-list.h:206 msgid "A Git Glossary" msgstr "Un glossaire Git" -#: command-list.h:202 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "Crochets utilisรฉs par Git" -#: command-list.h:203 +#: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "Spรฉcifie les fichiers non-suivis ร ignorer intentionnellement" -#: command-list.h:204 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "Dรฉfinition des propriรฉtรฉs de sous-module" -#: command-list.h:205 +#: command-list.h:210 msgid "Git namespaces" msgstr "Espaces de nom de Git" -#: command-list.h:206 +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "Programmes assistants pour interagir avec des dรฉpรดts distants" + +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Disposition d'un dรฉpรดt Git" -#: command-list.h:207 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "Spรฉcification des rรฉvisions et portรฉes pour Git" -#: command-list.h:208 +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "Montage d'un dรฉpรดt dans un autre dรฉpรดt" + +#: command-list.h:215 msgid "A tutorial introduction to Git: part two" msgstr "Une introduction pratique ร Gitย : deuxiรจme partie" -#: command-list.h:209 +#: command-list.h:216 msgid "A tutorial introduction to Git" msgstr "Une introduction pratique ร Git" -#: command-list.h:210 +#: command-list.h:217 msgid "An overview of recommended workflows with Git" msgstr "Un aperรงu des flux de travail recommandรฉs avec Git" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "Vous devez dรฉmarrer avec \"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 "Souhaitez-vous que je le fasse pour vous [Y/n] ? " - -#: git-bisect.sh:101 +#: git-bisect.sh:79 #, sh-format msgid "Bad rev input: $arg" msgstr "Mauvaise rรฉvision en entrรฉe : $arg" -#: git-bisect.sh:121 +#: git-bisect.sh:99 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Mauvaise rรฉvision en entrรฉe : $bisected_head" -#: git-bisect.sh:130 +#: git-bisect.sh:108 #, sh-format msgid "Bad rev input: $rev" msgstr "Mauvaise rรฉvision en entrรฉe : $rev" -#: git-bisect.sh:139 +#: git-bisect.sh:117 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' n'accepte qu'un seul argument." -#: git-bisect.sh:209 +#: git-bisect.sh:149 msgid "No logfile given" msgstr "Pas de fichier de log donnรฉ" -#: git-bisect.sh:210 +#: git-bisect.sh:150 #, sh-format msgid "cannot read $file for replaying" msgstr "impossible de lire $file pour rejouer" -#: git-bisect.sh:232 +#: git-bisect.sh:173 msgid "?? what are you talking about?" msgstr "?? de quoi parlez-vous ?" -#: git-bisect.sh:241 +#: git-bisect.sh:183 msgid "bisect run failed: no command provided." msgstr "la bissection a รฉchouรฉย : aucune commande fournie." -#: git-bisect.sh:246 +#: git-bisect.sh:188 #, sh-format msgid "running $command" msgstr "lancement de $command" -#: git-bisect.sh:253 +#: git-bisect.sh:195 #, sh-format msgid "" "bisect run failed:\n" @@ -22373,11 +24549,11 @@ msgstr "" "la bissection a รฉchouรฉ :\n" "le code retour $res de '$command' est < 0 ou >= 128" -#: git-bisect.sh:279 +#: git-bisect.sh:221 msgid "bisect run cannot continue any more" msgstr "la bissection ne peut plus continuer" -#: git-bisect.sh:285 +#: git-bisect.sh:227 #, sh-format msgid "" "bisect run failed:\n" @@ -22386,11 +24562,11 @@ msgstr "" "la bissection a รฉchouรฉ :\n" "'bisect_state $state' a retournรฉ le code erreur $res" -#: git-bisect.sh:292 +#: git-bisect.sh:234 msgid "bisect run success" msgstr "succรจs de la bissection" -#: git-bisect.sh:300 +#: git-bisect.sh:242 msgid "We are not bisecting." msgstr "Pas de bissection en cours." @@ -22434,144 +24610,50 @@ 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: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: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:323 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "erreurย : option inconnue pour 'stash push'ย : $option" - -#: 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:535 -#, sh-format -msgid "unknown option: $opt" -msgstr "option inconnueย : $opt" - -#: 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:570 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "$reference n'est pas une rรฉfรฉrence valide" - -#: 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: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:617 -msgid "unable to refresh index" -msgstr "impossible de rafraรฎchir l'index" - -#: 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:629 -msgid "Conflicts in index. Try without --index." -msgstr "Conflits dans l'index. Essayez sans --index." - -#: git-legacy-stash.sh:631 -msgid "Could not save index tree" -msgstr "Impossible de sauvegarder l'arbre d'index" - -#: 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:665 -msgid "Cannot unstage modified files" -msgstr "Impossible de dรฉsindexer les fichiers modifiรฉs" - -#: git-legacy-stash.sh:703 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "${REV} supprimรฉ ($s)" - -#: 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:791 -msgid "(To restore them type \"git stash apply\")" -msgstr "(Pour les restaurer tapez \"git stash apply\")" - -#: git-submodule.sh:200 +#: git-submodule.sh:180 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:210 +#: git-submodule.sh:190 #, 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:229 +#: git-submodule.sh:209 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existe dรฉjร dans l'index" -#: git-submodule.sh:232 +#: git-submodule.sh:212 #, 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:239 +#: git-submodule.sh:219 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' n'a pas de commit extrait" -#: 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 +#: git-submodule.sh:250 #, 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:270 +#: git-submodule.sh:252 #, 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:278 +#: git-submodule.sh:260 #, 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:280 +#: git-submodule.sh:262 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22588,39 +24670,39 @@ msgstr "" "correct\n" "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'." -#: git-submodule.sh:286 +#: git-submodule.sh:268 #, 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:298 +#: git-submodule.sh:280 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossible d'extraire le sous-module '$sm_path'" -#: git-submodule.sh:303 +#: git-submodule.sh:285 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "รchec d'ajout du sous-module '$sm_path'" -#: git-submodule.sh:312 +#: git-submodule.sh:294 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "รchec d'enregistrement du sous-module '$sm_path'" -#: git-submodule.sh:573 +#: git-submodule.sh:567 #, 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:583 +#: git-submodule.sh:577 #, 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:588 +#: git-submodule.sh:582 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -22629,7 +24711,7 @@ msgstr "" "Impossible de trouver la rรฉvision courante ${remote_name}/${branch} dans le " "chemin de sous-module '$sm_path'" -#: git-submodule.sh:606 +#: git-submodule.sh:600 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -22638,7 +24720,7 @@ msgstr "" "Impossible de rapatrier dans le chemin de sous-module '$displaypath'ย ; essai " "de rapatriement direct de $sha1ย :" -#: git-submodule.sh:612 +#: git-submodule.sh:606 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -22647,82 +24729,56 @@ 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:619 +#: git-submodule.sh:613 #, 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:620 +#: git-submodule.sh:614 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:624 +#: git-submodule.sh:618 #, 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:625 +#: git-submodule.sh:619 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasรฉ dans '$sha1'" -#: git-submodule.sh:630 +#: git-submodule.sh:624 #, 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:631 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionnรฉ dans '$sha1'" -#: git-submodule.sh:636 +#: git-submodule.sh:630 #, 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:637 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" -#: git-submodule.sh:668 +#: git-submodule.sh:662 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "รchec de parcours dans le chemin du sous-module '$displaypath'" -#: 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:882 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "mode $mod_dst inattendu" - -#: 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: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:908 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" -" Attention : $display_name ne contient pas les validations $sha1_src et " -"$sha1_dst" - #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." @@ -22737,12 +24793,22 @@ msgstr "Autoremisage appliquรฉ." msgid "Cannot store $stash_sha1" msgstr "Impossible de stocker $stash_sha1" +#: git-rebase--preserve-merges.sh:113 +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 "" +"L'application de l'autoremisage a provoquรฉ des conflits\n" +"Vos modifications sont ร l'abri dans la remise.\n" +"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" ร tout moment.\n" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Rebasage ($new_count/$total)" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -22781,7 +24847,7 @@ msgstr "" "\n" "Vous pouvez rรฉordonner ces lignesย ; elles sont exรฉcutรฉes de haut en bas.\n" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -22800,83 +24866,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1 n'est pas un commit qui peut รชtre picorer" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nom de commit invalideย : $sha1" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "Impossible de sauver le sha1 du remplaรงant du commit en cours" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "Avance rapide sur $sha1" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Avance rapide impossible sur $sha1" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Impossible de dรฉplacer HEAD sur $first_parent" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Refus d'รฉcraser un commit de fusion: $sha1" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "Erreur lors de la rรฉapplication de la fusion $sha1" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "Impossible de picorer $sha1" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "Ceci est le ${n}iรจme message de validationย :" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Le message de validation ${n} sera ignorรฉย :" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Ceci est la combinaison de $count commit." msgstr[1] "Ceci est la combinaison de $count commits." -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Impossible d'รฉcrire $fixup_msg" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "Ceci est la combinaison de 2 commits." -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Impossible d'appliquer $sha1... $rest" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -22893,31 +24959,31 @@ msgstr "" "le\n" "problรจme avant de pouvoir reformuler le message du commit." -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Arrรชtรฉ ร $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "'$squash_style' impossible avec le commit prรฉcรฉdent" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "Exรฉcutionย : $rest" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "L'exรฉcution a รฉchouรฉย : $rest" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "et a mis ร jour l'index ou la copie de travail" -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -22928,7 +24994,7 @@ msgstr "" "git rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -22943,25 +25009,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Commande inconnueย : $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Rebasage et mise ร jour de $head_name avec succรจs." -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Impossible de supprimer CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -22992,12 +25058,12 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "" "Erreur lors de la recherche de l'identitรฉ de l'auteur pour corriger le commit" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -23005,40 +25071,44 @@ msgstr "" "Vous avez des modifications non validรฉes dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "impossible de valider les modifications indexรฉes." -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "Impossible de lancer l'รฉditeur" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "Impossible d'extraire $switch_to" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "Pas de HEADย ?" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Impossible de crรฉer un rรฉpertoire temporaire $state_dir" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "Impossible de marquer comme interactif" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" 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:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:945 +msgid "Note that empty commits are commented out" +msgstr "Veuillez noter que les commits vides sont en commentaire" + +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "Impossible d'initialiser les commits rรฉรฉcrits" @@ -23110,81 +25180,19 @@ 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:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %s12s %s" -#: 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 +#: git-add--interactive.perl:634 #, 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: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 +#: git-add--interactive.perl:1058 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -23192,7 +25200,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:1054 +#: git-add--interactive.perl:1061 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -23200,7 +25208,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:1057 +#: git-add--interactive.perl:1064 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -23208,8 +25216,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:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -23217,8 +25225,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:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -23226,17 +25234,12 @@ msgstr "" "Si le patch s'applique proprement, la section รฉditรฉe sera\n" "immรฉdiatement marquรฉe comme รฉliminรฉe." -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1116 #, 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: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 +#: git-add--interactive.perl:1123 #, perl-format msgid "" "---\n" @@ -23249,36 +25252,12 @@ msgstr "" "Pour รฉliminer les lignes '%s', effacez-les.\n" "Les lignes commenรงant par %s seront รฉliminรฉes.\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 รง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 +#: git-add--interactive.perl:1145 #, 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" -#. 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 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -23292,7 +25271,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:1252 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -23306,7 +25285,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:1258 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -23320,7 +25299,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:1264 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -23334,7 +25313,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:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -23348,7 +25327,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:1276 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23362,7 +25341,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:1282 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23376,7 +25355,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:1294 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23390,7 +25369,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:1309 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23412,234 +25391,91 @@ msgstr "" "e - รฉditer manuellement la section actuelle\n" "? - afficher l'aide\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1347 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: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 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "fichier non-fusionnรฉ ignorรฉย : %s\n" -#: 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 +#: git-add--interactive.perl:1481 #, 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:1467 +#: git-add--interactive.perl:1482 #, 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:1468 +#: git-add--interactive.perl:1483 +#, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Appliquer l'ajout dans l'arbre de travail [y,n,q,a,d%s,?]ย ? " + +#: git-add--interactive.perl:1484 #, 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:1568 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "Aucune autre section ร atteindre\n" -#: 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 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Nombre invalide : '%s'\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1624 #, 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:1617 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "aucune autre section ร rechercher\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "rechercher la regexย ? " - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regex de recherche malformรฉe %sย : %s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "Aucune section ne correspond au motif donnรฉ\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "Pas de section prรฉcรฉdente\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "Pas de section suivante\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "Dรฉsolรฉ, impossible de dรฉcouper cette section\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1738 #, 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:1706 +#: git-add--interactive.perl:1748 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:1771 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23657,19 +25493,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: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 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 msgid "missing --" msgstr "-- manquant" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1861 #, perl-format msgid "unknown --patch mode: %s" msgstr "mode de --patch inconnuย : %s" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument invalide %s, -- attendu" @@ -23687,27 +25523,39 @@ msgstr "le dรฉcalage de temps local est plus grand ou รฉgal ร 24 heures\n" msgid "the editor exited uncleanly, aborting everything" msgstr "l'รฉditeur est sorti en erreur, abandon total" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "'%s' contient une version intermรฉdiaire du courriel que vous composiez.\n" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contient le courriel composรฉ.\n" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases est incompatible avec d'autres options\n" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"fatalย : options de configuration trouvรฉes pour 'sendmail'\n" +"git-send-mail est configurรฉ avec des options sendemail.* - veuillez noter le " +"'e'.\n" +"Positionnez sendemail.forbidSendmailVariables ร false pour dรฉsactiver cette " +"vรฉrification.\n" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Lancement de git format-patch impossible ร l'extรฉrieur d'un dรฉpรดt\n" -#: git-send-email.perl:484 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -23715,39 +25563,39 @@ msgstr "" "`batch-size` et `relogin` doivent รชtre spรฉcifiรฉs ensembles (via la ligne de " "commande ou des options de configuration)\n" -#: git-send-email.perl:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Champ de --suppress-cc inconnuย : '%s'\n" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Paramรจtre de --confirm inconnuย : '%s'\n" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" "attentionย : les guillemets ne sont pas supportรฉs dans alias sendmailย : %s\n" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "attentionย : `:include:` n'est pas supportรฉย : %s\n" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" "attentionย : les redirections `/file` ou `|pipe` ne sont pas supportรฉesย : %s\n" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "attentionย : ligne sendmail non reconnueย : %s\n" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -23762,12 +25610,12 @@ msgstr "" " * en indiquant \"./%s\" si vous dรฉsignez un fichier, ou\n" " * en fournissant l'option --format-patch pour une plage.\n" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "รchec ร l'ouverture du rรฉpertoire %sย : %s" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -23776,7 +25624,7 @@ msgstr "" "fatalย : %sย : %s\n" "attentionย : aucun patch envoyรฉ\n" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -23786,17 +25634,17 @@ msgstr "" "Aucun fichier patch spรฉcifiรฉย !\n" "\n" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "Ligne de sujet non trouvรฉe dans %s ?" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Impossible d'ouvrir %s en รฉcritureย : %s" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -23810,27 +25658,27 @@ msgstr "" "\n" "Effacez le corps si vous ne souhaitez pas envoyer un rรฉsumรฉ.\n" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "รchec ร l'ouverture de %sย : %s" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "รchec ร l'ouverture de %s.finalย : %s" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "Le courriel de rรฉsumรฉ รฉtant vide, il a รฉtรฉ ignorรฉ\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "รtes-vous sur de vouloir utiliser <%s> [y/N]ย ? " -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -23838,11 +25686,11 @@ msgstr "" "Les fichiers suivants sont 8bit mais ne dรฉclarent pas de champs Content-" "Transfer-Encoding.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Quel encodage 8bit doit รชtre dรฉclarรฉ [UTF8]ย ? " -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -23855,22 +25703,22 @@ msgstr "" "a un sujet modรจle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez " "vraiment envoyer.\n" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "ร qui les courriels doivent-ils รชtre envoyรฉs (s'il y en a)ย ?" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatalย : l'alias '%s' se dรฉveloppe en lui-mรชme\n" -#: git-send-email.perl:975 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID ร utiliser comme In-Reply-To pour le premier courriel (s'il y en " "a)ย ? " -#: git-send-email.perl:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "erreurย : impossible d'extraire une adresse valide depuisย : %s\n" @@ -23878,16 +25726,16 @@ msgstr "erreurย : impossible d'extraire une adresse valide depuisย : %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 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Que faire de cette adresse ? ([q]uitter|[d]รฉlaisser|[e]diter): " -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "le chemin vers la CA \"%s\" n'existe pas" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -23914,130 +25762,209 @@ msgstr "" #. 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 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Envoyer ce courrielย ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll)ย : " -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "Une rรฉponse est nรฉcessaire" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "Le serveur SMTP nรฉcessaire n'est pas dรฉfini correctement." -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Le serveur ne supporte pas STARTTLSย ! %s" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "รฉchec de STARTTLSย ! %s" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Impossible d'initialiser SMTP. Vรฉrifiez la configuration et utilisez --smtp-" "debug." -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "รฉchec de l'envoi de %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "Envoi simulรฉ de %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "%s envoyรฉ\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "Simulation OK. Le journal indiqueย :\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "OK. Le journal indiqueย :\n" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "Rรฉsultatย : " -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "Rรฉsultatย : OK\n" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "impossible d'ouvrir le fichier %s" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1718 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1753 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1864 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Impossible d'exรฉcuter '%s'" -#: git-send-email.perl:1871 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Ajout de %sย : %s depuisย : '%s'\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) รฉchec de la fermeture du pipe vers '%s'" -#: git-send-email.perl:1905 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "impossible d'envoyer un message comme 7bit" -#: git-send-email.perl:1913 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "codage de transfert invalide" -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "impossible d'ouvrir %sย :%s\n" -#: git-send-email.perl:1957 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%sย : le patch contient une ligne plus longue que 998 caractรจres" -#: git-send-email.perl:1974 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "%s sautรฉ avec un suffix de sauvegarde '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1978 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous rรฉellement envoyer %sย ?[y|N]ย : " + +#~ msgid "unknown hash algorithm length" +#~ msgstr "longueur d'algorithme d'empreinte inconnue" + +#~ 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" + +#~ msgid "Writing changed paths Bloom filters index" +#~ msgstr "รcriture de l'index des filtres Bloom des chemins modifiรฉs" + +#~ msgid "hash version %u does not match" +#~ msgstr "la version %u du condensรฉ ne correspond pas" + +#~ msgid "Remote with no URL" +#~ msgstr "Dรฉpรดt distant sans URL" + +#~ msgid "%%(subject) does not take arguments" +#~ msgstr "%%(subject) n'accepte pas d'argument" + +#~ msgid "positive value expected objectname:short=%s" +#~ msgstr "valeur positive attendue objectname:short=%s" + +#~ msgid "unrecognized %%(objectname) argument: %s" +#~ msgstr "argument %%(objectname) non reconnu : %s" + +#~ msgid "option `%s' is incompatible with --merged" +#~ msgstr "l'option ยซย %sย ยป est incompatible avec --merged" + +#~ msgid "option `%s' is incompatible with --no-merged" +#~ msgstr "l'option ยซย %sย ยป est incompatible avec --no-merged" + +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "impossible d'ouvrir '%s' en รฉcritureย : %s" + +#~ msgid "could not read ref '%s'" +#~ msgstr "impossible de lire la rรฉf '%s'" + +#~ msgid "ref '%s' already exists" +#~ 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'" + +#~ msgid "unexpected object ID when deleting '%s'" +#~ msgstr "id d'objet inattendu pendant la suppression de '%s'" + +#~ msgid "The hash algorithm %s is not supported in this build." +#~ msgstr "" +#~ "L'algorithme d'empreinte %s n'est pas pris en charge par cette version." + +#~ msgid "could not open the file BISECT_TERMS" +#~ msgstr "impossible d'ouvrir le fichier BISECT_TERMS" + +#~ msgid "update BISECT_HEAD instead of checking out the current commit" +#~ msgstr "mettre ร jour BISECT_HEAD au lieu d'extraire le commit actuel" + +#~ msgid "print only names (no SHA-1)" +#~ msgstr "afficher seulement les noms (pas de SHA-1)" + +#~ msgid "passed to 'git am'" +#~ msgstr "passรฉ jusqu'ร 'git am'" + +#~ 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" + +#~ msgid " Warn: $display_name doesn't contain commit $sha1_src" +#~ msgstr " Attention : $display_name ne contient pas la validation $sha1_src" + +#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst" +#~ msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" + +#~ msgid "" +#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +#~ msgstr "" +#~ " Attention : $display_name ne contient pas les validations $sha1_src et " +#~ "$sha1_dst" diff --git a/third_party/git/po/git.pot b/third_party/git/po/git.pot index d799696ad0..68c84144e9 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: 2019-08-10 20:12+0800\n" +"POT-Creation-Date: 2020-10-10 09:32+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,59 +18,708 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:109 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "" + +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +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 reset.c:89 sequencer.c:3444 +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:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, 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:1738 git-add--interactive.perl:1371 +#, c-format +msgid "Only binary files changed.\n" +msgstr "" + +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +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:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +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:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: 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:781 git-add--interactive.perl:1805 +#, c-format +msgid "Bye.\n" +msgstr "" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:35 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:36 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:39 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" + +#: add-patch.c:42 +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:56 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:57 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:58 git-add--interactive.perl:1441 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:61 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" + +#: add-patch.c:64 +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:80 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:81 git-add--interactive.perl:1446 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:82 git-add--interactive.perl:1447 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:85 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" + +#: add-patch.c:88 +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:103 git-add--interactive.perl:1451 +#, c-format, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:104 git-add--interactive.perl:1452 +#, c-format, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:105 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, c-format, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:108 add-patch.c:176 add-patch.c:221 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" + +#: add-patch.c:111 +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:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, c-format, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, c-format, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, c-format, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:131 add-patch.c:154 add-patch.c:199 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" + +#: add-patch.c:134 add-patch.c:202 +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:149 add-patch.c:194 git-add--interactive.perl:1463 +#, c-format, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 +#, c-format, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, c-format, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:157 +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:171 add-patch.c:216 git-add--interactive.perl:1469 +#, c-format, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 +#, c-format, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, c-format, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:179 +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:224 +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:342 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "" + +#: add-patch.c:361 add-patch.c:365 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "" + +#: add-patch.c:419 +msgid "could not parse diff" +msgstr "" + +#: add-patch.c:438 +msgid "could not parse colored diff" +msgstr "" + +#: add-patch.c:452 +#, c-format +msgid "failed to run '%s'" +msgstr "" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "" + +#: add-patch.c:612 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" + +#: add-patch.c:785 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" + +#: add-patch.c:800 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" + +#: add-patch.c:1076 git-add--interactive.perl:1117 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" + +#: add-patch.c:1080 +#, 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:1094 git-add--interactive.perl:1131 +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:1127 +msgid "could not parse hunk header" +msgstr "" + +#: add-patch.c:1172 +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:1241 git-add--interactive.perl:1244 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" + +#: add-patch.c:1284 +msgid "The selected hunks do not apply to the index!" +msgstr "" + +#: add-patch.c:1285 git-add--interactive.perl:1348 +msgid "Apply them to the worktree anyway? " +msgstr "" + +#: add-patch.c:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "" + +#: add-patch.c:1349 +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:1511 add-patch.c:1521 +msgid "No previous hunk" +msgstr "" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No next hunk" +msgstr "" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "" + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "" + +#: add-patch.c:1555 +#, c-format +msgid "Invalid number: '%s'" +msgstr "" + +#: add-patch.c:1560 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "" +msgstr[1] "" + +#: add-patch.c:1569 +msgid "No other hunks to search" +msgstr "" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "" + +#: add-patch.c:1590 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "" + +#: add-patch.c:1607 +msgid "No hunk matches the given pattern" +msgstr "" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "" + +#: add-patch.c:1618 +#, c-format +msgid "Split into %d hunks." +msgstr "" + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "" + +#: add-patch.c:1674 +msgid "'git apply' failed" +msgstr "" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:162 +#: advice.c:247 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:164 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:166 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:168 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:170 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:172 +#: advice.c:257 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:180 +#: advice.c:265 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:188 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:278 builtin/merge.c:1349 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:202 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -176,17 +825,7 @@ msgstr "" msgid "inconsistent header lines %d and %d" msgstr "" -#: 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 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -197,530 +836,570 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1752 +#: 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 msgid "new file depends on old contents" msgstr "" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3046 +#: 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] "" msgstr[1] "" -#: apply.c:3058 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3086 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3094 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3141 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3151 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3159 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3177 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3190 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3196 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3217 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3340 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3400 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3429 apply.c:3672 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3515 apply.c:3687 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3524 apply.c:3695 +#: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3559 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3562 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3578 apply.c:3582 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3594 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3608 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3613 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3639 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3712 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3714 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3923 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3926 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3946 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3951 +#: apply.c:3981 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3971 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3975 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:3990 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4082 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4089 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4092 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: 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 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4111 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4249 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4283 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4289 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4297 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4303 apply.c:4448 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4346 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4350 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4420 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4518 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4526 +#: apply.c:4556 msgid "internal error" msgstr "" -#: apply.c:4529 +#: apply.c:4559 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4540 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4562 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4566 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4676 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4684 +#: apply.c:4723 msgid "unrecognized input" msgstr "" -#: apply.c:4704 +#: apply.c:4743 msgid "unable to read index file" msgstr "" -#: apply.c:4859 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4886 +#: apply.c:4927 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4892 apply.c:4907 +#: apply.c:4933 apply.c:4948 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4900 +#: apply.c:4941 #, 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:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "" -#: 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 +#: apply.c:4985 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4947 +#: apply.c:4988 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "" -#: apply.c:4950 +#: apply.c:4991 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4953 +#: apply.c:4994 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4955 +#: apply.c:4996 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4959 +#: apply.c:5000 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4961 +#: apply.c:5002 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4963 +#: apply.c:5004 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4965 +#: apply.c:5006 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4967 +#: apply.c:5008 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:4969 +#: apply.c:5010 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4971 +#: apply.c:5012 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4974 +#: apply.c:5015 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4976 +#: apply.c:5017 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4978 +#: apply.c:5019 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4983 +#: apply.c:5024 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "" -#: apply.c:4985 +#: apply.c:5026 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:4988 apply.c:4991 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:4994 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "" -#: apply.c:4996 +#: apply.c:5037 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:4998 +#: apply.c:5039 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5000 +#: apply.c:5041 msgid "allow overlapping hunks" msgstr "" -#: 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 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5003 +#: apply.c:5044 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5006 +#: apply.c:5047 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "" -#: apply.c:5009 +#: apply.c:5050 msgid "prepend <root> to all filenames" msgstr "" +#: archive-tar.c:125 archive-zip.c:345 +#, c-format +msgid "cannot stream blob %s" +msgstr "" + +#: archive-tar.c:265 archive-zip.c:358 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "" + +#: archive-tar.c:449 +#, c-format +msgid "unable to start '%s' filter" +msgstr "" + +#: archive-tar.c:452 +msgid "unable to redirect descriptor" +msgstr "" + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "" + +#: archive-zip.c:318 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "" + +#: archive-zip.c:322 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "" + +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "" @@ -738,224 +1417,206 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:396 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "" -#: archive.c:401 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "" -#: archive.c:414 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "" -#: archive.c:426 +#: archive.c:485 msgid "current working directory is untracked" msgstr "" -#: archive.c:457 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "" + +#: archive.c:553 msgid "fmt" msgstr "" -#: archive.c:457 +#: archive.c:553 msgid "archive format" msgstr "" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "" -#: archive.c:459 +#: archive.c:555 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: 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 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 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 +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "" -#: archive.c:463 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:464 +#: archive.c:563 msgid "report archived files on stderr" msgstr "" -#: archive.c:465 +#: archive.c:564 msgid "store only" msgstr "" -#: archive.c:466 +#: archive.c:565 msgid "compress faster" msgstr "" -#: archive.c:474 +#: archive.c:573 msgid "compress better" msgstr "" -#: archive.c:477 +#: archive.c:576 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:1379 builtin/submodule--helper.c:1859 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:579 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:489 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "" -#: archive.c:491 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:493 +#: archive.c:592 msgid "Unexpected option --output" msgstr "" -#: archive.c:515 -#, c-format -msgid "Unknown archive format '%s'" -msgstr "" - -#: archive.c:522 -#, c-format -msgid "Argument not supported for format '%s': -%d" -msgstr "" - -#: archive-tar.c:125 archive-zip.c:345 -#, c-format -msgid "cannot stream blob %s" -msgstr "" - -#: archive-tar.c:260 archive-zip.c:363 -#, c-format -msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "" - -#: archive-tar.c:287 archive-zip.c:353 -#, c-format -msgid "cannot read %s" -msgstr "" - -#: archive-tar.c:459 -#, c-format -msgid "unable to start '%s' filter" -msgstr "" - -#: archive-tar.c:462 -msgid "unable to redirect descriptor" -msgstr "" - -#: archive-tar.c:469 -#, c-format -msgid "'%s' filter reported error" -msgstr "" - -#: archive-zip.c:314 -#, c-format -msgid "path is not valid UTF-8: %s" +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" msgstr "" -#: archive-zip.c:318 +#: archive.c:616 #, c-format -msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "" - -#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 -#, c-format -msgid "deflate error (%d)" +msgid "Unknown archive format '%s'" msgstr "" -#: archive-zip.c:609 +#: archive.c:623 #, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" +msgid "Argument not supported for format '%s': -%d" msgstr "" -#: attr.c:211 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:468 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:678 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:733 +#: bisect.c:753 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:758 +#: bisect.c:778 #, 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:763 +#: bisect.c:783 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:768 +#: bisect.c:788 #, 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:776 +#: bisect.c:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -963,7 +1624,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:789 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -971,43 +1632,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:822 +#: bisect.c:848 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:865 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:958 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:977 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:985 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:1004 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1017,44 +1678,44 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1088 #, 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:2697 +#: blame.c:2778 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2711 +#: blame.c:2792 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2732 +#: blame.c:2813 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: 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 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 msgid "revision walk setup failed" msgstr "" -#: blame.c:2759 +#: blame.c:2840 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2770 +#: blame.c:2851 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2781 +#: blame.c:2862 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1173,398 +1834,433 @@ msgstr "" msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" -#: bundle.c:36 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "" + +#: bundle.c:45 +#, c-format +msgid "unknown capability '%s'" +msgstr "" + +#: bundle.c:71 #, c-format -msgid "'%s' does not look like a v2 bundle file" +msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "" -#: bundle.c:64 +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "" -#: bundle.c:143 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:146 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "" -#: bundle.c:197 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:204 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:206 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:272 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "" -#: bundle.c:279 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:290 +#: bundle.c:337 msgid "pack-objects died" msgstr "" -#: bundle.c:332 +#: bundle.c:379 msgid "rev-list died" msgstr "" -#: bundle.c:381 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:498 #, c-format -msgid "unrecognized argument: %s" -msgstr "" - -#: bundle.c:468 -msgid "Refusing to create empty bundle." +msgid "unsupported bundle version %d" msgstr "" -#: bundle.c:478 +#: bundle.c:500 #, c-format -msgid "cannot create '%s'" +msgid "cannot write bundle version %d with algorithm %s" msgstr "" -#: bundle.c:503 -msgid "index-pack died" -msgstr "" - -#: color.c:296 -#, c-format -msgid "invalid color value: %.*s" -msgstr "" - -#: 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 +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 #, c-format -msgid "could not parse %s" -msgstr "" - -#: commit.c:52 -#, c-format -msgid "%s %s is not a commit!" -msgstr "" - -#: commit.c:192 -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\"" +msgid "unrecognized argument: %s" msgstr "" -#: commit.c:1127 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +#: bundle.c:530 +msgid "Refusing to create empty bundle." msgstr "" -#: commit.c:1130 +#: bundle.c:540 #, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." +msgid "cannot create '%s'" msgstr "" -#: commit.c:1133 -#, c-format -msgid "Commit %s does not have a GPG signature." +#: bundle.c:565 +msgid "index-pack died" msgstr "" -#: commit.c:1136 +#: color.c:329 #, c-format -msgid "Commit %s has a good GPG signature by %s\n" +msgid "invalid color value: %.*s" msgstr "" -#: 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" +#: commit-graph.c:188 midx.c:46 +msgid "invalid hash version" msgstr "" -#: commit-graph.c:127 +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:192 +#: commit-graph.c:311 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:199 +#: commit-graph.c:318 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "" -#: commit-graph.c:206 +#: commit-graph.c:325 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" -#: commit-graph.c:229 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" +#: commit-graph.c:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" msgstr "" -#: commit-graph.c:240 +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:283 +#: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:347 +#: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:357 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:404 +#: commit-graph.c:557 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:430 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:721 commit-graph.c:785 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:575 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:1042 builtin/am.c:1306 +#, c-format +msgid "unable to parse commit %s" +msgstr "" + +#: commit-graph.c:1265 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1034 +#: commit-graph.c:1301 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1051 +#: commit-graph.c:1318 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1070 +#: commit-graph.c:1338 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1089 +#: commit-graph.c:1357 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1163 +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "" + +#: commit-graph.c:1501 +msgid "Collecting referenced commits" +msgstr "" + +#: commit-graph.c:1526 #, 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:1176 +#: commit-graph.c:1539 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1180 +#: commit-graph.c:1543 #, c-format msgid "error opening index for %s" msgstr "" -#: 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:1238 +#: commit-graph.c:1582 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1253 +#: commit-graph.c:1597 msgid "Counting distinct commits in commit graph" msgstr "" -#: commit-graph.c:1284 +#: commit-graph.c:1629 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1332 +#: commit-graph.c:1678 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1365 midx.c:811 +#: commit-graph.c:1720 midx.c:826 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1733 +msgid "unable to create temporary graph layer" +msgstr "" + +#: commit-graph.c:1738 #, c-format -msgid "unable to create '%s'" +msgid "unable to adjust shared permissions for '%s'" msgstr "" -#: commit-graph.c:1437 +#: commit-graph.c:1808 #, 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:1478 +#: commit-graph.c:1853 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1490 +#: commit-graph.c:1869 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1510 +#: commit-graph.c:1889 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:1621 +#: commit-graph.c:2015 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:1632 +#: commit-graph.c:2026 #, c-format msgid "unexpected duplicate commit id %s" msgstr "" -#: commit-graph.c:1657 +#: commit-graph.c:2049 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:1844 +#: commit-graph.c:2259 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:1855 +#: commit-graph.c:2270 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:1945 +#: commit-graph.c:2363 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:1955 +#: commit-graph.c:2373 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:1965 commit-graph.c:1980 +#: commit-graph.c:2383 commit-graph.c:2398 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:1972 +#: commit-graph.c:2390 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:1989 +#: commit-graph.c:2408 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2002 +#: commit-graph.c:2423 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2009 +#: commit-graph.c:2430 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2019 +#: commit-graph.c:2440 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2028 +#: commit-graph.c:2449 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2041 +#: commit-graph.c:2463 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2046 +#: commit-graph.c:2468 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2050 +#: commit-graph.c:2472 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2065 +#: commit-graph.c:2488 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2071 +#: commit-graph.c:2494 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "" + +#: commit.c:194 +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 "" + +#: commit.c:1172 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" + +#: commit.c:1176 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" + +#: commit.c:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "" + +#: commit.c:1182 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "" + +#: commit.c:1436 +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 "" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1574,294 +2270,289 @@ msgid "" "This might be due to circular includes." msgstr "" -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:376 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "" -#: config.c:382 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "" -#: config.c:406 sequencer.c:2463 +#: config.c:408 sequencer.c:2547 #, c-format msgid "invalid key: %s" msgstr "" -#: config.c:412 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "" -#: config.c:448 config.c:460 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "" -#: config.c:495 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: config.c:1208 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1325 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1430 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "" -#: config.c:1456 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "" -#: config.c:1457 +#: config.c:1472 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1518 builtin/pack-objects.c:3410 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1639 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1642 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1659 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1689 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1745 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "" -#: config.c:2094 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2264 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2307 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "" - -#: config.c:2333 +#: config.c:2341 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2379 +#: config.c:2387 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2381 +#: config.c:2389 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2462 +#: config.c:2470 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2494 +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2523 +#: config.c:2531 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2775 config.c:3099 +#: config.c:2783 config.c:3107 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2786 +#: config.c:2794 #, c-format msgid "opening %s" msgstr "" -#: config.c:2821 builtin/config.c:328 +#: config.c:2829 builtin/config.c:354 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2846 +#: config.c:2854 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2859 config.c:3112 +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2870 +#: config.c:2878 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2879 config.c:3117 +#: config.c:2887 config.c:3125 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2964 config.c:3214 +#: config.c:2972 config.c:3222 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:2998 +#: config.c:3006 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:3000 builtin/remote.c:782 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3090 +#: config.c:3098 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3257 +#: config.c:3265 #, c-format msgid "missing value for '%s'" msgstr "" @@ -1883,79 +2574,88 @@ msgstr "" msgid "server doesn't support '%s'" msgstr "" -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "" -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" msgstr "" -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "" -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" msgstr "" -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" msgstr "" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" msgstr "" -#: connect.c:544 +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "" + +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" msgstr "" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" msgstr "" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "" -#: connect.c:639 +#: connect.c:735 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" "Connecting to %s (port %s) ... " msgstr "" -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -1963,115 +2663,115 @@ msgid "" msgstr "" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "" -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "" -#: connect.c:845 connect.c:1171 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "" -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "" -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "" -#: connect.c:924 +#: connect.c:1024 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -#: connect.c:1119 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" msgstr "" -#: connect.c:1131 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" msgstr "" -#: connect.c:1148 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" msgstr "" -#: connect.c:1260 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1307 +#: connect.c:1408 msgid "unable to fork" msgstr "" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "" -#: connected.c:98 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:118 +#: connected.c:144 msgid "failed write to rev-list" msgstr "" -#: connected.c:125 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "" -#: convert.c:208 +#: 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 "" -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" -#: convert.c:218 +#: 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 "" -#: convert.c:279 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:286 +#: convert.c:291 #, 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 @@ -2086,117 +2786,145 @@ msgid "" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -#: convert.c:424 convert.c:495 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "" -#: convert.c:467 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" -#: convert.c:673 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "" -#: convert.c:693 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "" -#: convert.c:700 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "" -#: convert.c:735 convert.c:738 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "" -#: convert.c:741 convert.c:796 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "" -#: convert.c:844 +#: convert.c:837 msgid "unexpected filter type" msgstr "" -#: convert.c:855 +#: convert.c:848 msgid "path name too long for external filter" msgstr "" -#: convert.c:929 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1228 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1398 convert.c:1432 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1476 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "" -#: date.c:137 +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "" + +#: date.c:138 msgid "in the future" msgstr "" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "" msgstr[1] "" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "" msgstr[1] "" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "" msgstr[1] "" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "" msgstr[1] "" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "" msgstr[1] "" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "" msgstr[1] "" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2204,14 +2932,14 @@ msgstr[0] "" msgstr[1] "" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "" msgstr[1] "" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2242,15 +2970,6 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "" - -#: diffcore-rename.c:544 -msgid "Performing inexact rename detection" -msgstr "" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "" @@ -2261,617 +2980,645 @@ msgid "" "tree" msgstr "" -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" -#: diff.c:324 +#: diff.c:325 #, 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 "" -#: diff.c:332 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "" -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:4215 +#: diff.c:4269 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4560 +#: diff.c:4618 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4563 +#: diff.c:4621 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4641 +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4689 +#: diff.c:4747 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4726 +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4811 +#: diff.c:4869 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4835 +#: diff.c:4893 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4849 +#: diff.c:4907 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4899 diff.c:4905 +#: diff.c:4957 diff.c:4963 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4917 +#: diff.c:4975 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:4938 +#: diff.c:4996 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:4957 +#: diff.c:5015 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:4997 +#: diff.c:5055 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5033 diff.c:5053 +#: diff.c:5091 diff.c:5111 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5191 +#: diff.c:5248 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5247 +#: diff.c:5304 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5270 +#: diff.c:5327 msgid "Diff output format options" msgstr "" -#: diff.c:5272 diff.c:5278 +#: diff.c:5329 diff.c:5335 msgid "generate patch" msgstr "" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5332 builtin/log.c:176 msgid "suppress diff output" msgstr "" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5337 diff.c:5451 diff.c:5458 msgid "<n>" msgstr "" -#: diff.c:5281 diff.c:5284 +#: diff.c:5338 diff.c:5341 msgid "generate diffs with <n> lines context" msgstr "" -#: diff.c:5286 +#: diff.c:5343 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5289 +#: diff.c:5346 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5293 +#: diff.c:5350 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5297 +#: diff.c:5354 msgid "machine friendly --stat" msgstr "" -#: diff.c:5300 +#: diff.c:5357 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5302 diff.c:5310 +#: diff.c:5359 diff.c:5367 msgid "<param1,param2>..." msgstr "" -#: diff.c:5303 +#: diff.c:5360 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5307 +#: diff.c:5364 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5311 +#: diff.c:5368 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5315 +#: diff.c:5372 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5318 +#: diff.c:5375 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5321 +#: diff.c:5378 msgid "show only names of changed files" msgstr "" -#: diff.c:5324 +#: diff.c:5381 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5326 +#: diff.c:5383 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5327 +#: diff.c:5384 msgid "generate diffstat" msgstr "" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5386 diff.c:5389 diff.c:5392 msgid "<width>" msgstr "" -#: diff.c:5330 +#: diff.c:5387 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5333 +#: diff.c:5390 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5336 +#: diff.c:5393 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5338 +#: diff.c:5395 msgid "<count>" msgstr "" -#: diff.c:5339 +#: diff.c:5396 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5342 +#: diff.c:5399 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5345 +#: diff.c:5402 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5348 +#: diff.c:5405 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5350 +#: diff.c:5407 msgid "show colored diff" msgstr "" -#: diff.c:5351 +#: diff.c:5408 msgid "<kind>" msgstr "" -#: diff.c:5352 +#: diff.c:5409 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5355 +#: diff.c:5412 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 msgid "<prefix>" msgstr "" -#: diff.c:5359 +#: diff.c:5416 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5362 +#: diff.c:5419 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5365 +#: diff.c:5422 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5368 +#: diff.c:5425 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5371 +#: diff.c:5428 msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: diff.c:5375 diff.c:5380 diff.c:5385 +#: diff.c:5432 diff.c:5437 diff.c:5442 msgid "<char>" msgstr "" -#: diff.c:5376 +#: diff.c:5433 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5381 +#: diff.c:5438 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5386 +#: diff.c:5443 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5389 +#: diff.c:5446 msgid "Diff rename options" msgstr "" -#: diff.c:5390 +#: diff.c:5447 msgid "<n>[/<m>]" msgstr "" -#: diff.c:5391 +#: diff.c:5448 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5395 +#: diff.c:5452 msgid "detect renames" msgstr "" -#: diff.c:5399 +#: diff.c:5456 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5402 +#: diff.c:5459 msgid "detect copies" msgstr "" -#: diff.c:5406 +#: diff.c:5463 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5408 +#: diff.c:5465 msgid "disable rename detection" msgstr "" -#: diff.c:5411 +#: diff.c:5468 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5413 +#: diff.c:5470 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5416 +#: diff.c:5473 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5418 +#: diff.c:5475 msgid "Diff algorithm options" msgstr "" -#: diff.c:5420 +#: diff.c:5477 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5423 +#: diff.c:5480 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5426 +#: diff.c:5483 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5429 +#: diff.c:5486 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5432 +#: diff.c:5489 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5435 +#: diff.c:5492 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5438 +#: diff.c:5495 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5441 +#: diff.c:5498 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5445 +#: diff.c:5502 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5447 +#: diff.c:5504 msgid "<algorithm>" msgstr "" -#: diff.c:5448 +#: diff.c:5505 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5450 +#: diff.c:5507 msgid "<text>" msgstr "" -#: diff.c:5451 +#: diff.c:5508 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5510 diff.c:5519 diff.c:5522 msgid "<mode>" msgstr "" -#: diff.c:5454 +#: diff.c:5511 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5513 diff.c:5516 diff.c:5561 msgid "<regex>" msgstr "" -#: diff.c:5457 +#: diff.c:5514 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5460 +#: diff.c:5517 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" -#: diff.c:5463 +#: diff.c:5520 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5466 +#: diff.c:5523 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5469 +#: diff.c:5526 msgid "Other diff options" msgstr "" -#: diff.c:5471 +#: diff.c:5528 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5475 +#: diff.c:5532 msgid "treat all files as text" msgstr "" -#: diff.c:5477 +#: diff.c:5534 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5479 +#: diff.c:5536 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5481 +#: diff.c:5538 msgid "disable all output of the program" msgstr "" -#: diff.c:5483 +#: diff.c:5540 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5485 +#: diff.c:5542 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5487 +#: diff.c:5544 msgid "<when>" msgstr "" -#: diff.c:5488 +#: diff.c:5545 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5491 +#: diff.c:5548 msgid "<format>" msgstr "" -#: diff.c:5492 +#: diff.c:5549 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5496 +#: diff.c:5553 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5499 +#: diff.c:5556 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5501 +#: diff.c:5558 msgid "<string>" msgstr "" -#: diff.c:5502 +#: diff.c:5559 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5505 +#: diff.c:5562 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5508 +#: diff.c:5565 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5511 +#: diff.c:5568 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5514 +#: diff.c:5571 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5515 +#: diff.c:5572 msgid "<object-id>" msgstr "" -#: diff.c:5516 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5518 +#: diff.c:5575 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5519 +#: diff.c:5576 msgid "select files by diff type" msgstr "" -#: diff.c:5521 +#: diff.c:5578 msgid "<file>" msgstr "" -#: diff.c:5522 +#: diff.c:5579 msgid "Output to a specific file" msgstr "" -#: diff.c:6177 +#: diff.c:6236 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6180 +#: diff.c:6239 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6183 +#: diff.c:6242 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:537 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "" + +#: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" -#: dir.c:926 +#: dir.c:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "" + +#: dir.c:809 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" + +#: dir.c:819 +msgid "disabling cone pattern matching" +msgstr "" + +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:1843 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2085 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2209 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3013 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3058 dir.c:3063 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3092 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "" -#: entry.c:476 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "" @@ -2881,7 +3628,7 @@ msgstr "" msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:332 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "" @@ -2891,265 +3638,285 @@ msgstr "" msgid "too many args to run %s" msgstr "" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "" - -#: fetch-pack.c:151 +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:154 +#: fetch-pack.c:179 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:165 +#: fetch-pack.c:190 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:185 +#: fetch-pack.c:210 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:196 +#: fetch-pack.c:221 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:258 +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:417 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:434 +#: fetch-pack.c:448 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:465 +#: fetch-pack.c:479 msgid "giving up" msgstr "" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:492 progress.c:339 msgid "done" msgstr "" -#: fetch-pack.c:489 +#: fetch-pack.c:504 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:535 +#: fetch-pack.c:540 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:744 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:783 +#: fetch-pack.c:824 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:791 +#: fetch-pack.c:832 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:859 +#: fetch-pack.c:916 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:875 +#: fetch-pack.c:933 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:877 +#: fetch-pack.c:935 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:908 +#: fetch-pack.c:978 #, c-format msgid "Server version is %.*s" msgstr "" -#: 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 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 #, c-format msgid "Server supports %s" msgstr "" -#: fetch-pack.c:915 +#: fetch-pack.c:985 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:975 +#: fetch-pack.c:1045 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:980 +#: fetch-pack.c:1050 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:984 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1001 +#: fetch-pack.c:1056 +msgid "Server does not support this repository's object format" +msgstr "" + +#: fetch-pack.c:1069 msgid "no common commits" msgstr "" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1081 fetch-pack.c:1619 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1151 +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "" + +#: fetch-pack.c:1209 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "" + +#: fetch-pack.c:1229 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1157 +#: fetch-pack.c:1236 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1184 +#: fetch-pack.c:1275 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1202 +#: fetch-pack.c:1293 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1208 +#: fetch-pack.c:1299 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1247 +#: fetch-pack.c:1360 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1252 +#: fetch-pack.c:1365 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1262 +#: fetch-pack.c:1375 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1264 +#: fetch-pack.c:1377 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1306 +#: fetch-pack.c:1419 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1353 +#: fetch-pack.c:1466 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1358 +#: fetch-pack.c:1471 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1363 +#: fetch-pack.c:1476 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1689 +#: fetch-pack.c:1506 +msgid "git fetch-pack: expected response end packet" +msgstr "" + +#: fetch-pack.c:1887 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1910 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:1739 +#: fetch-pack.c:1937 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1742 +#: fetch-pack.c:1940 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:321 -msgid "gpg failed to sign the data" -msgstr "" - -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" -#: graph.c:97 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:2117 +#: 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 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2145 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "" @@ -3199,79 +3966,79 @@ msgid "Low-level Commands / Interrogators" msgstr "" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "" #: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:363 git.c:98 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "" -#: help.c:403 -msgid "The common Git guides are:" +#: help.c:405 +msgid "The Git concept guides are:" msgstr "" -#: help.c:512 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "" -#: help.c:517 +#: help.c:434 msgid "External commands" msgstr "" -#: help.c:532 +#: help.c:449 msgid "Command aliases" msgstr "" -#: help.c:596 +#: help.c:513 #, 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 "" -#: help.c:655 +#: help.c:572 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:677 +#: help.c:594 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:682 +#: help.c:599 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:687 +#: help.c:604 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:695 +#: help.c:612 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:699 +#: help.c:616 msgid "" "\n" "The most similar command is" @@ -3281,16 +4048,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:714 +#: help.c:656 msgid "git version [<options>]" msgstr "" -#: help.c:782 +#: help.c:711 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:786 +#: help.c:715 msgid "" "\n" "Did you mean this?" @@ -3300,7 +4067,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -3315,76 +4090,95 @@ msgid "" "\n" msgstr "" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "" -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "" -#: list-objects.c:129 -#, c-format -msgid "entry '%s' in tree %s has tree mode, but is not a tree" +#: list-objects-filter-options.c:81 +msgid "expected 'tree:<depth>'" msgstr "" -#: list-objects.c:142 +#: list-objects-filter-options.c:96 +msgid "sparse:path filters support has been dropped" +msgstr "" + +#: list-objects-filter-options.c:109 #, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgid "invalid filter-spec '%s'" msgstr "" -#: list-objects.c:378 +#: list-objects-filter-options.c:125 #, c-format -msgid "unable to load root tree for commit %s" +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "" + +#: list-objects-filter-options.c:167 +msgid "expected something after combine:" msgstr "" -#: list-objects-filter-options.c:36 +#: list-objects-filter-options.c:249 msgid "multiple filter-specs cannot be combined" msgstr "" -#: list-objects-filter-options.c:58 -msgid "expected 'tree:<depth>'" +#: list-objects-filter-options.c:361 +msgid "unable to upgrade repository format to support partial clone" msgstr "" -#: list-objects-filter-options.c:84 -msgid "sparse:path filters support has been dropped" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" msgstr "" -#: list-objects-filter-options.c:94 +#: list-objects-filter.c:495 #, c-format -msgid "invalid filter-spec '%s'" +msgid "unable to parse sparse filter data in %s" +msgstr "" + +#: list-objects.c:127 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" +#: list-objects.c:140 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" -#: lockfile.c:151 +#: list-objects.c:375 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "" + +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -3396,123 +4190,113 @@ msgid "" "remove the file manually to continue." msgstr "" -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "" -#: merge.c:41 -msgid "failed to read the cache" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" msgstr "" -#: 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:322 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:354 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "" - -#: merge-recursive.c:863 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:874 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:897 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:941 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:965 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:976 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:981 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1177 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-recursive.c:1184 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-recursive.c:1191 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-recursive.c:1199 merge-recursive.c:1211 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1237 +#: merge-recursive.c:1251 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1241 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1242 +#: merge-recursive.c:1256 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1245 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3523,108 +4307,108 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1254 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1327 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:1332 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1364 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1387 +#: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1459 +#: 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 "" -#: merge-recursive.c:1464 +#: 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 "" -#: merge-recursive.c:1471 +#: 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 "" -#: merge-recursive.c:1476 +#: 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 "" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "rename" msgstr "" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "renamed" msgstr "" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1601 +#: merge-recursive.c:1587 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" -#: merge-recursive.c:1659 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -#: merge-recursive.c:1690 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1695 +#: merge-recursive.c:1681 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1714 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1719 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1828 +#: merge-recursive.c:1805 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:2035 +#: merge-recursive.c:2068 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3632,323 +4416,361 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2067 +#: merge-recursive.c:2100 #, 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:2077 +#: merge-recursive.c:2110 #, 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:2169 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-recursive.c:2413 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-recursive.c:2938 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:2941 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modify" msgstr "" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modified" msgstr "" -#: merge-recursive.c:3017 +#: merge-recursive.c:3052 msgid "content" msgstr "" -#: merge-recursive.c:3021 +#: merge-recursive.c:3056 msgid "add/add" msgstr "" -#: merge-recursive.c:3044 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3101 msgid "submodule" msgstr "" -#: merge-recursive.c:3067 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3097 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:3179 +#: merge-recursive.c:3215 #, 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:3182 +#: merge-recursive.c:3218 #, 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:3186 +#: merge-recursive.c:3222 #, 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:3189 +#: merge-recursive.c:3225 #, 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:3303 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3326 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "" -#: merge-recursive.c:3331 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "" -#: merge-recursive.c:3338 +#: merge-recursive.c:3374 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3347 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3356 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: 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 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:3414 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3513 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "" -#: merge-recursive.c:3526 +#: merge-recursive.c:3563 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3565 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3631 +#: merge-recursive.c:3672 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" + +#: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 msgid "Unable to write index." msgstr "" -#: midx.c:69 +#: merge.c:41 +msgid "failed to read the cache" +msgstr "" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "" + +#: midx.c:79 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:85 +#: midx.c:95 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:90 +#: midx.c:100 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:95 +#: midx.c:105 #, c-format -msgid "hash version %u does not match" +msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -#: midx.c:109 +#: midx.c:122 msgid "invalid chunk offset (too large)" msgstr "" -#: midx.c:133 +#: midx.c:146 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" -#: midx.c:146 +#: midx.c:159 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:148 +#: midx.c:161 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:150 +#: midx.c:163 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:152 +#: midx.c:165 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:166 +#: midx.c:179 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:211 +#: midx.c:222 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:261 +#: midx.c:272 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:289 +#: midx.c:300 msgid "error preparing packfile from multi-pack-index" msgstr "" -#: midx.c:470 +#: midx.c:485 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:476 +#: midx.c:491 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:536 +#: midx.c:551 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:865 +#: midx.c:853 +msgid "Adding packfiles to multi-pack-index" +msgstr "" + +#: midx.c:886 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:1036 +#: midx.c:938 +msgid "no pack files to index." +msgstr "" + +#: midx.c:990 +msgid "Writing chunks to multi-pack-index" +msgstr "" + +#: midx.c:1068 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1091 +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "" + +#: midx.c:1132 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1106 +#: midx.c:1147 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1110 -msgid "Verifying OID order in MIDX" +#: midx.c:1152 +msgid "the midx contains no oid" +msgstr "" + +#: midx.c:1161 +msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1119 +#: midx.c:1170 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1138 +#: midx.c:1190 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1144 +#: midx.c:1197 msgid "Verifying object offsets" msgstr "" -#: midx.c:1160 +#: midx.c:1213 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1166 +#: midx.c:1219 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1175 +#: midx.c:1228 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1350 +#: midx.c:1253 +msgid "Counting referenced objects" +msgstr "" + +#: midx.c:1263 +msgid "Finding and deleting unreferenced packfiles" +msgstr "" + +#: midx.c:1454 msgid "could not start pack-objects" msgstr "" -#: midx.c:1369 +#: midx.c:1474 msgid "could not finish pack-objects" msgstr "" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "" @@ -3989,45 +4811,70 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "" -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "" -#: packfile.c:648 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "" + +#: packfile.c:630 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1899 +#: packfile.c:1922 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1903 +#: packfile.c:1926 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "" + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "" + +#: parse-options-cb.c:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4043,7 +4890,7 @@ msgstr "" msgid "%s : incompatible with something else" msgstr "" -#: parse-options.c:92 parse-options.c:96 parse-options.c:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "" @@ -4053,41 +4900,46 @@ msgstr "" msgid "%s isn't available" msgstr "" -#: parse-options.c:219 +#: parse-options.c:217 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" -#: parse-options.c:389 +#: parse-options.c:386 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "" -#: parse-options.c:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, c-format -msgid "did you mean `--%s` (with two dashes ?)" +msgid "did you mean `--%s` (with two dashes)?" msgstr "" -#: parse-options.c:859 +#: parse-options.c:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "" + +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:861 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:863 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:887 +#: parse-options.c:890 msgid "..." msgstr "" -#: parse-options.c:906 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "" @@ -4095,121 +4947,101 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:915 +#: parse-options.c:918 #, c-format msgid " %s" msgstr "" -#: parse-options.c:954 +#: parse-options.c:957 msgid "-NUM" msgstr "" -#: parse-options.c:968 -#, c-format -msgid "alias of --%s" -msgstr "" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "" - -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "" -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:440 +#: pathspec.c:445 #, c-format -msgid "%s: '%s' is outside repository" +msgid "%s: '%s' is outside repository at '%s'" msgstr "" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:524 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:591 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" +#: pathspec.c:643 +#, c-format +msgid "line is badly quoted: %s" +msgstr "" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "" @@ -4219,44 +5051,48 @@ msgid "unable to write delim packet" msgstr "" #: pkt-line.c:106 +msgid "unable to write stateless separator packet" +msgstr "" + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "" -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "" -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "" -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "" -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "" -#: pkt-line.c:362 +#: pkt-line.c:373 sideband.c:150 #, c-format msgid "remote error: %s" msgstr "" @@ -4270,237 +5106,273 @@ msgstr "" msgid "unable to create threaded lstat: %s" msgstr "" -#: pretty.c:966 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "" -#: range-diff.c:70 +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" + +#: promisor-remote.c:53 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "" -#: range-diff.c:72 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:98 sequencer.c:5283 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: range-diff.c:117 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" + +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "" -#: range-diff.c:274 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "" -#: read-cache.c:1314 +#: read-cache.c:1318 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1499 +#: read-cache.c:1524 msgid "Refresh index" msgstr "" -#: read-cache.c:1613 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1623 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1679 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1682 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1691 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1721 +#: read-cache.c:1747 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1723 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1760 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1776 +#: read-cache.c:1802 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1833 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1836 +#: read-cache.c:1862 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1839 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: 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 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "" -#: read-cache.c:2087 +#: read-cache.c:2115 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2100 +#: read-cache.c:2128 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2133 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2137 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2141 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2145 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "" -#: read-cache.c:2187 +#: read-cache.c:2215 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2214 +#: read-cache.c:2242 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2246 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2293 +#: read-cache.c:2321 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3105 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3117 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3142 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3291 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" -#: rebase-interactive.c:26 +#: 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 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: rebase-interactive.c:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -4522,26 +5394,26 @@ msgid "" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "" msgstr[1] "" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4550,36 +5422,33 @@ msgid "" "\n" msgstr "" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "" -#: 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 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 #, c-format msgid "could not write '%s'" msgstr "" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 #, c-format -msgid "could not copy '%s' to '%s'." +msgid "could not write '%s'." msgstr "" -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -4590,416 +5459,395 @@ msgid "" "\n" msgstr "" -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -msgstr "" - -#: refs.c:667 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 #, c-format -msgid "ignoring dangling symref %s" +msgid "could not read '%s'." msgstr "" -#: refs.c:669 ref-filter.c:2092 -#, c-format -msgid "ignoring broken ref %s" +#: ref-filter.c:42 wt-status.c:1973 +msgid "gone" msgstr "" -#: refs.c:804 +#: ref-filter.c:43 #, c-format -msgid "could not open '%s' for writing: %s" +msgid "ahead %d" msgstr "" -#: refs.c:814 refs.c:865 +#: ref-filter.c:44 #, c-format -msgid "could not read ref '%s'" +msgid "behind %d" msgstr "" -#: refs.c:820 +#: ref-filter.c:45 #, c-format -msgid "ref '%s' already exists" +msgid "ahead %d, behind %d" msgstr "" -#: refs.c:825 +#: ref-filter.c:169 #, c-format -msgid "unexpected object ID when writing '%s'" +msgid "expected format: %%(color:<color>)" msgstr "" -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 +#: ref-filter.c:171 #, c-format -msgid "could not write to '%s'" +msgid "unrecognized color: %%(color:%s)" msgstr "" -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 -#: builtin/rebase.c:1003 +#: ref-filter.c:193 #, c-format -msgid "could not open '%s' for writing" +msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: refs.c:867 +#: ref-filter.c:197 #, c-format -msgid "unexpected object ID when deleting '%s'" +msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: refs.c:998 +#: ref-filter.c:199 #, c-format -msgid "log for ref %s has gap after %s" +msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: refs.c:1004 +#: ref-filter.c:254 #, c-format -msgid "log for ref %s unexpectedly ended on %s" +msgid "%%(objecttype) does not take arguments" msgstr "" -#: refs.c:1063 +#: ref-filter.c:276 #, c-format -msgid "log for %s is empty" +msgid "unrecognized %%(objectsize) argument: %s" msgstr "" -#: refs.c:1155 +#: ref-filter.c:284 #, c-format -msgid "refusing to update ref with bad name '%s'" +msgid "%%(deltabase) does not take arguments" msgstr "" -#: refs.c:1231 +#: ref-filter.c:296 #, c-format -msgid "update_ref failed for ref '%s': %s" +msgid "%%(body) does not take arguments" msgstr "" -#: refs.c:2012 +#: ref-filter.c:309 #, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "" - -#: refs.c:2044 -msgid "ref updates forbidden inside quarantine environment" +msgid "unrecognized %%(subject) argument: %s" msgstr "" -#: refs.c:2140 refs.c:2170 +#: ref-filter.c:330 #, c-format -msgid "'%s' exists; cannot create '%s'" +msgid "unknown %%(trailers) argument: %s" msgstr "" -#: refs.c:2146 refs.c:2181 +#: ref-filter.c:363 #, c-format -msgid "cannot process '%s' and '%s' at the same time" +msgid "positive value expected contents:lines=%s" msgstr "" -#: refs/files-backend.c:1234 +#: ref-filter.c:365 #, c-format -msgid "could not remove reference %s" +msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: refs/files-backend.c:1248 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: ref-filter.c:380 #, c-format -msgid "could not delete reference %s: %s" +msgid "positive value expected '%s' in %%(%s)" msgstr "" -#: refs/files-backend.c:1251 refs/packed-backend.c:1545 +#: ref-filter.c:384 #, c-format -msgid "could not delete references: %s" +msgid "unrecognized argument '%s' in %%(%s)" msgstr "" -#: refspec.c:137 +#: ref-filter.c:398 #, c-format -msgid "invalid refspec '%s'" +msgid "unrecognized email option: %s" msgstr "" -#: ref-filter.c:42 wt-status.c:1934 -msgid "gone" -msgstr "" - -#: ref-filter.c:43 +#: ref-filter.c:428 #, c-format -msgid "ahead %d" +msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:44 +#: ref-filter.c:440 #, c-format -msgid "behind %d" +msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:45 +#: ref-filter.c:447 #, c-format -msgid "ahead %d, behind %d" +msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:162 +#: ref-filter.c:456 #, c-format -msgid "expected format: %%(color:<color>)" +msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:164 +#: ref-filter.c:464 #, c-format -msgid "unrecognized color: %%(color:%s)" +msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:186 +#: ref-filter.c:482 #, c-format -msgid "Integer value expected refname:lstrip=%s" +msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:190 +#: ref-filter.c:584 #, c-format -msgid "Integer value expected refname:rstrip=%s" +msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:192 +#: ref-filter.c:611 #, c-format -msgid "unrecognized %%(%s) argument: %s" +msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:247 +#: ref-filter.c:615 #, c-format -msgid "%%(objecttype) does not take arguments" +msgid "" +"not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:269 +#: ref-filter.c:739 #, c-format -msgid "unrecognized %%(objectsize) argument: %s" +msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:277 +#: ref-filter.c:802 #, c-format -msgid "%%(deltabase) does not take arguments" +msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:289 +#: ref-filter.c:804 #, c-format -msgid "%%(body) does not take arguments" +msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:298 +#: ref-filter.c:806 #, c-format -msgid "%%(subject) does not take arguments" +msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:320 +#: ref-filter.c:834 #, c-format -msgid "unknown %%(trailers) argument: %s" +msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:349 +#: ref-filter.c:836 #, c-format -msgid "positive value expected contents:lines=%s" +msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:351 +#: ref-filter.c:838 #, c-format -msgid "unrecognized %%(contents) argument: %s" +msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:366 +#: ref-filter.c:853 #, c-format -msgid "positive value expected objectname:short=%s" +msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:370 +#: ref-filter.c:910 #, c-format -msgid "unrecognized %%(objectname) argument: %s" +msgid "malformed format string %s" msgstr "" -#: ref-filter.c:400 +#: ref-filter.c:1541 #, c-format -msgid "expected format: %%(align:<width>,<position>)" +msgid "no branch, rebasing %s" msgstr "" -#: ref-filter.c:412 +#: ref-filter.c:1544 #, c-format -msgid "unrecognized position:%s" +msgid "no branch, rebasing detached HEAD %s" msgstr "" -#: ref-filter.c:419 +#: ref-filter.c:1547 #, c-format -msgid "unrecognized width:%s" +msgid "no branch, bisect started on %s" msgstr "" -#: ref-filter.c:428 -#, c-format -msgid "unrecognized %%(align) argument: %s" +#: ref-filter.c:1557 +msgid "no branch" msgstr "" -#: ref-filter.c:436 +#: ref-filter.c:1591 ref-filter.c:1800 #, c-format -msgid "positive width expected with the %%(align) atom" +msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:454 +#: ref-filter.c:1601 #, c-format -msgid "unrecognized %%(if) argument: %s" +msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:556 +#: ref-filter.c:2054 #, c-format -msgid "malformed field name: %.*s" +msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:583 +#: ref-filter.c:2143 #, c-format -msgid "unknown field name: %.*s" +msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:587 +#: ref-filter.c:2148 refs.c:657 #, c-format -msgid "" -"not a git repository, but the field '%.*s' requires access to object data" +msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:711 +#: ref-filter.c:2464 #, c-format -msgid "format: %%(if) atom used without a %%(then) atom" +msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:774 +#: ref-filter.c:2563 #, c-format -msgid "format: %%(then) atom used without an %%(if) atom" +msgid "malformed object name %s" msgstr "" -#: ref-filter.c:776 +#: ref-filter.c:2568 #, c-format -msgid "format: %%(then) atom used more than once" +msgid "option `%s' must point to a commit" msgstr "" -#: ref-filter.c:778 +#: refs.c:264 #, c-format -msgid "format: %%(then) atom used after %%(else)" +msgid "%s does not point to a valid object!" msgstr "" -#: ref-filter.c:806 +#: refs.c:572 #, c-format -msgid "format: %%(else) atom used without an %%(if) atom" +msgid "could not retrieve `%s`" msgstr "" -#: ref-filter.c:808 +#: refs.c:579 #, c-format -msgid "format: %%(else) atom used without a %%(then) atom" +msgid "invalid branch name: %s = %s" msgstr "" -#: ref-filter.c:810 +#: refs.c:655 #, c-format -msgid "format: %%(else) atom used more than once" +msgid "ignoring dangling symref %s" msgstr "" -#: ref-filter.c:825 +#: refs.c:892 #, c-format -msgid "format: %%(end) atom used without corresponding atom" +msgid "log for ref %s has gap after %s" msgstr "" -#: ref-filter.c:882 +#: refs.c:898 #, c-format -msgid "malformed format string %s" +msgid "log for ref %s unexpectedly ended on %s" msgstr "" -#: ref-filter.c:1485 +#: refs.c:957 #, c-format -msgid "no branch, rebasing %s" +msgid "log for %s is empty" msgstr "" -#: ref-filter.c:1488 +#: refs.c:1049 #, c-format -msgid "no branch, rebasing detached HEAD %s" +msgid "refusing to update ref with bad name '%s'" msgstr "" -#: ref-filter.c:1491 +#: refs.c:1120 #, c-format -msgid "no branch, bisect started on %s" -msgstr "" - -#: ref-filter.c:1501 -msgid "no branch" +msgid "update_ref failed for ref '%s': %s" msgstr "" -#: ref-filter.c:1537 ref-filter.c:1743 +#: refs.c:1944 #, c-format -msgid "missing object %s for %s" +msgid "multiple updates for ref '%s' not allowed" msgstr "" -#: ref-filter.c:1547 -#, c-format -msgid "parse_object_buffer failed on %s for %s" +#: refs.c:2024 +msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: ref-filter.c:1998 -#, c-format -msgid "malformed object at '%s'" +#: refs.c:2035 +msgid "ref updates aborted by hook" msgstr "" -#: ref-filter.c:2087 +#: refs.c:2135 refs.c:2165 #, c-format -msgid "ignoring ref with broken name %s" +msgid "'%s' exists; cannot create '%s'" msgstr "" -#: ref-filter.c:2382 +#: refs.c:2141 refs.c:2176 #, c-format -msgid "format: %%(end) atom missing" +msgid "cannot process '%s' and '%s' at the same time" msgstr "" -#: ref-filter.c:2482 +#: refs/files-backend.c:1228 #, c-format -msgid "option `%s' is incompatible with --merged" +msgid "could not remove reference %s" msgstr "" -#: ref-filter.c:2485 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 #, c-format -msgid "option `%s' is incompatible with --no-merged" +msgid "could not delete reference %s: %s" msgstr "" -#: ref-filter.c:2495 +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 #, c-format -msgid "malformed object name %s" +msgid "could not delete references: %s" msgstr "" -#: ref-filter.c:2500 +#: refspec.c:167 #, c-format -msgid "option `%s' must point to a commit" +msgid "invalid refspec '%s'" msgstr "" -#: remote.c:363 +#: remote.c:351 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" -#: remote.c:410 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "" -#: remote.c:418 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "" -#: remote.c:608 +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:612 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:684 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "" -#: remote.c:694 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:1000 +#: remote.c:1073 #, c-format msgid "src refspec %s does not match any" msgstr "" -#: remote.c:1005 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5008,7 +5856,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5022,7 +5870,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1040 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5030,7 +5878,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1045 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5038,7 +5886,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1050 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5046,7 +5894,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1055 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5054,114 +5902,114 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1091 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "" -#: remote.c:1102 +#: remote.c:1175 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "" -#: remote.c:1114 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1121 +#: remote.c:1194 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1624 remote.c:1725 +#: remote.c:1703 remote.c:1804 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1633 +#: remote.c:1712 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1636 +#: remote.c:1715 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1642 +#: remote.c:1721 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1657 +#: remote.c:1736 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1669 +#: remote.c:1748 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1679 +#: remote.c:1758 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1692 +#: remote.c:1771 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1714 +#: remote.c:1793 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:1840 +#: remote.c:1922 #, c-format msgid "couldn't find remote ref %s" msgstr "" -#: remote.c:1853 +#: remote.c:1935 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2016 +#: remote.c:2098 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2020 +#: remote.c:2102 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2023 +#: remote.c:2105 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2027 +#: remote.c:2109 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2030 +#: remote.c:2112 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2034 +#: remote.c:2116 #, 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:2040 +#: remote.c:2122 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2043 +#: remote.c:2125 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5169,11 +6017,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2051 +#: remote.c:2133 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2054 +#: remote.c:2136 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5184,11 +6032,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2064 +#: remote.c:2146 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: remote.c:2247 +#: remote.c:2337 #, c-format msgid "cannot parse expected object name '%s'" msgstr "" @@ -5203,7 +6051,7 @@ msgstr "" msgid "duplicate replace ref: %s" msgstr "" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "" @@ -5266,8 +6114,8 @@ msgstr "" msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "" @@ -5301,20 +6149,34 @@ msgstr "" msgid "unable to open rr-cache directory" msgstr "" -#: revision.c:2507 -msgid "your current branch appears to be broken" +#: reset.c:42 +msgid "could not determine HEAD revision" msgstr "" -#: revision.c:2510 +#: reset.c:70 reset.c:76 sequencer.c:3426 #, c-format -msgid "your current branch '%s' does not have any commits yet" +msgid "failed to find tree of %s" +msgstr "" + +#: revision.c:2344 +msgid "--unpacked=<packfile> no longer supported" msgstr "" -#: revision.c:2710 -msgid "--first-parent is incompatible with --bisect" +#: revision.c:2364 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "" + +#: revision.c:2702 +msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2714 +#: revision.c:2705 +#, c-format +msgid "your current branch '%s' does not have any commits yet" +msgstr "" + +#: revision.c:2915 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" @@ -5322,208 +6184,206 @@ msgstr "" msgid "open /dev/null failed" msgstr "" -#: run-command.c:1269 +#: run-command.c:1270 #, c-format msgid "cannot create async thread: %s" msgstr "" -#: run-command.c:1333 +#: run-command.c:1334 #, 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:141 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:143 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:145 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:306 +#: send-pack.c:372 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:420 +#: send-pack.c:460 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "" + +#: send-pack.c:469 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:422 +#: send-pack.c:471 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:434 +#: send-pack.c:483 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:439 +#: send-pack.c:488 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:187 +#: sequencer.c:194 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:292 +#: sequencer.c:308 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "" -#: sequencer.c:321 +#: sequencer.c:339 msgid "revert" msgstr "" -#: sequencer.c:323 +#: sequencer.c:341 msgid "cherry-pick" msgstr "" -#: sequencer.c:325 -msgid "rebase -i" +#: sequencer.c:343 +msgid "rebase" msgstr "" -#: sequencer.c:327 +#: sequencer.c:345 #, c-format msgid "unknown action: %d" msgstr "" -#: sequencer.c:385 +#: sequencer.c:404 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:388 +#: sequencer.c:407 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:401 sequencer.c:2909 +#: sequencer.c:420 sequencer.c:3028 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:408 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 #, c-format -msgid "could not write eol to '%s'" +msgid "could not write to '%s'" msgstr "" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:427 #, c-format -msgid "failed to finalize '%s'" +msgid "could not write eol to '%s'" msgstr "" -#: 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 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 #, c-format -msgid "could not read '%s'" +msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:462 +#: sequencer.c:471 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:466 +#: sequencer.c:475 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:498 +#: sequencer.c:507 #, c-format msgid "%s: fast-forward" msgstr "" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:546 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:632 +#: sequencer.c:640 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:649 +#: sequencer.c:657 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:663 +#: sequencer.c:671 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:743 +#: sequencer.c:751 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:754 +#: sequencer.c:762 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: 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 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: sequencer.c:801 +#: sequencer.c:809 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:806 +#: sequencer.c:814 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:811 +#: sequencer.c:819 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:815 +#: sequencer.c:823 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:820 +#: sequencer.c:828 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:822 +#: sequencer.c:830 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:824 +#: sequencer.c:832 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "" - -#: sequencer.c:901 +#: sequencer.c:897 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5540,15 +6400,11 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "" - -#: sequencer.c:1216 +#: sequencer.c:1178 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1223 +#: sequencer.c:1184 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5563,7 +6419,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1236 +#: sequencer.c:1197 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5577,346 +6433,354 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1278 +#: sequencer.c:1239 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1280 +#: sequencer.c:1241 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1326 +#: sequencer.c:1287 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1328 +#: sequencer.c:1289 msgid "detached HEAD" msgstr "" -#: sequencer.c:1332 +#: sequencer.c:1293 msgid " (root-commit)" msgstr "" -#: sequencer.c:1353 +#: sequencer.c:1314 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1355 +#: sequencer.c:1316 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1373 sequencer.c:2067 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1417 sequencer.c:1535 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1446 sequencer.c:1478 +#, c-format +msgid "invalid author identity '%s'" +msgstr "" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1526 +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "" + +#: sequencer.c:1567 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1531 +#: sequencer.c:1572 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1655 sequencer.c:1766 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1713 sequencer.c:1738 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1672 +#: sequencer.c:1723 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1725 sequencer.c:3338 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1676 +#: sequencer.c:1727 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1682 +#: sequencer.c:1733 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1697 +#: sequencer.c:1748 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1704 +#: sequencer.c:1755 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1710 +#: sequencer.c:1761 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1798 +#: sequencer.c:1849 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1805 +#: sequencer.c:1856 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1824 +#: sequencer.c:1875 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1832 sequencer.c:1840 +#: sequencer.c:1883 sequencer.c:1891 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1846 +#: sequencer.c:1897 #, 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:1865 +#: sequencer.c:1916 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1930 +#: sequencer.c:1981 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1985 +#: sequencer.c:2038 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1986 +#: sequencer.c:2039 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:2045 +#: sequencer.c:2059 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "" + +#: sequencer.c:2117 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:2052 +#: sequencer.c:2124 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2128 +#: sequencer.c:2201 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2137 +#: sequencer.c:2210 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2174 +#: sequencer.c:2241 #, c-format -msgid "could not parse '%.*s'" +msgid "could not parse '%s'" msgstr "" -#: sequencer.c:2228 +#: sequencer.c:2302 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2239 +#: sequencer.c:2313 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: 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 +#: sequencer.c:2399 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2330 +#: sequencer.c:2408 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2364 +#: sequencer.c:2452 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2366 +#: sequencer.c:2454 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2371 +#: sequencer.c:2459 msgid "no commits parsed." msgstr "" -#: sequencer.c:2382 +#: sequencer.c:2470 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2384 +#: sequencer.c:2472 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2466 +#: sequencer.c:2550 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2553 +#: sequencer.c:2657 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2569 +#: sequencer.c:2677 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2769 sequencer.c:4609 msgid "empty commit set passed" msgstr "" -#: sequencer.c:2668 +#: sequencer.c:2786 msgid "revert is already in progress" msgstr "" -#: sequencer.c:2670 +#: sequencer.c:2788 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2673 +#: sequencer.c:2791 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:2675 +#: sequencer.c:2793 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2689 +#: sequencer.c:2807 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2704 +#: sequencer.c:2822 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2882 sequencer.c:4325 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2884 sequencer.c:2895 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2886 sequencer.c:2930 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2916 builtin/grep.c:745 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2800 +#: sequencer.c:2918 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2801 +#: sequencer.c:2919 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2807 +#: sequencer.c:2925 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2818 +#: sequencer.c:2936 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2859 +#: sequencer.c:2977 msgid "no revert in progress" msgstr "" -#: sequencer.c:2867 +#: sequencer.c:2986 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:2877 +#: sequencer.c:2996 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:2884 +#: sequencer.c:3003 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:2887 +#: sequencer.c:3006 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3011 sequencer.c:4015 -#, c-format -msgid "could not update %s" -msgstr "" - -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3168 sequencer.c:4217 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3066 +#: sequencer.c:3185 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3074 +#: sequencer.c:3193 #, c-format msgid "" "You can amend the commit now, with\n" @@ -5928,27 +6792,27 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3084 +#: sequencer.c:3203 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3091 +#: sequencer.c:3210 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: 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" +#: sequencer.c:3240 +#, c-format +msgid "Executing: %s\n" msgstr "" -#: sequencer.c:3136 +#: sequencer.c:3255 #, c-format msgid "" "execution failed: %s\n" @@ -5958,11 +6822,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3142 +#: sequencer.c:3261 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3148 +#: sequencer.c:3267 #, c-format msgid "" "execution succeeded: %s\n" @@ -5973,108 +6837,125 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3209 +#: sequencer.c:3328 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3263 +#: sequencer.c:3382 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3268 +#: sequencer.c:3387 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 -#, c-format -msgid "failed to find tree of %s" -msgstr "" - -#: sequencer.c:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "" - -#: sequencer.c:3351 +#: sequencer.c:3471 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3379 +#: sequencer.c:3502 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3401 +#: sequencer.c:3524 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3410 +#: sequencer.c:3533 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3422 +#: sequencer.c:3545 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3437 +#: sequencer.c:3561 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3590 +#: sequencer.c:3730 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3606 +#: sequencer.c:3746 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "" + +#: sequencer.c:3823 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "" + +#: sequencer.c:3829 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "" + +#: sequencer.c:3832 +#, c-format +msgid "Created autostash: %s\n" +msgstr "" + +#: sequencer.c:3836 +msgid "could not reset --hard" +msgstr "" + +#: sequencer.c:3861 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3687 +#: sequencer.c:3873 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3876 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3751 -#, c-format -msgid "could not checkout %s" +#: sequencer.c:3881 +msgid "Applying autostash resulted in conflicts." +msgstr "" + +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." msgstr "" -#: sequencer.c:3765 +#: sequencer.c:3974 #, c-format msgid "%s: not a valid OID" msgstr "" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:3785 +#: sequencer.c:3994 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:3787 +#: sequencer.c:3996 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:3795 +#: sequencer.c:4004 #, c-format msgid "" "Could not execute the todo command\n" @@ -6087,121 +6968,129 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3877 +#: sequencer.c:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "" + +#: sequencer.c:4095 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:3958 +#: sequencer.c:4166 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:4003 +#: sequencer.c:4225 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4008 +#: sequencer.c:4230 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4022 +#: sequencer.c:4244 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4115 +#: sequencer.c:4304 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "" + +#: sequencer.c:4337 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4124 +#: sequencer.c:4346 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4126 +#: sequencer.c:4348 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4128 +#: sequencer.c:4350 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4131 +#: sequencer.c:4353 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:4167 sequencer.c:4205 +#: sequencer.c:4389 sequencer.c:4428 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4220 +#: sequencer.c:4444 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4227 +#: sequencer.c:4451 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4328 +#: sequencer.c:4477 +#, c-format +msgid "invalid committer '%s'" +msgstr "" + +#: sequencer.c:4586 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4332 +#: sequencer.c:4590 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4367 +#: sequencer.c:4625 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:4810 +#: sequencer.c:5102 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:4813 +#: sequencer.c:5105 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 +#: sequencer.c:5347 sequencer.c:5364 msgid "nothing to do" msgstr "" -#: sequencer.c:5114 +#: sequencer.c:5383 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5197 +#: sequencer.c:5480 msgid "the script was already rearranged." msgstr "" -#: setup.c:123 +#: setup.c:133 #, c-format -msgid "'%s' is outside repository" +msgid "'%s' is outside repository at '%s'" msgstr "" -#: setup.c:173 +#: setup.c:185 #, 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:186 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6209,12 +7098,12 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:235 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:254 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6222,381 +7111,385 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:390 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:394 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:540 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:548 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:567 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:569 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:571 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:573 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:575 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:577 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:676 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:690 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "" -#: setup.c:851 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1083 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1092 setup.c:1098 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1103 +#: setup.c:1245 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:1109 +#: setup.c:1251 #, 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:1220 +#: setup.c:1362 #, 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:1264 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1279 +#: setup.c:1424 msgid "fork failed" msgstr "" -#: setup.c:1284 +#: setup.c:1429 msgid "setsid failed" msgstr "" -#: sha1-file.c:453 +#: sha1-file.c:470 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: sha1-file.c:504 +#: sha1-file.c:521 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: sha1-file.c:576 +#: sha1-file.c:593 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: sha1-file.c:583 +#: sha1-file.c:600 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: sha1-file.c:626 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" msgstr "" -#: sha1-file.c:644 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "" -#: sha1-file.c:651 +#: sha1-file.c:668 msgid "unable to move new alternates file into place" msgstr "" -#: sha1-file.c:686 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1-file.c:712 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1-file.c:718 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1-file.c:724 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1-file.c:732 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1-file.c:792 +#: sha1-file.c:804 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: sha1-file.c:944 +#: sha1-file.c:954 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" -#: sha1-file.c:969 +#: sha1-file.c:975 msgid "mmap failed" msgstr "" -#: sha1-file.c:1133 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1274 sha1-file.c:2467 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1276 sha1-file.c:2471 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: sha1-file.c:1301 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "" -#: sha1-file.c:1385 +#: sha1-file.c:1402 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1388 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "" -#: sha1-file.c:1394 +#: sha1-file.c:1411 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1397 +#: sha1-file.c:1414 #, c-format msgid "unable to parse %s header" msgstr "" -#: sha1-file.c:1588 +#: sha1-file.c:1641 #, c-format msgid "failed to read object %s" msgstr "" -#: sha1-file.c:1592 +#: sha1-file.c:1645 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: sha1-file.c:1596 +#: sha1-file.c:1649 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1600 +#: sha1-file.c:1653 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1703 +#: sha1-file.c:1758 #, c-format msgid "unable to write file %s" msgstr "" -#: sha1-file.c:1710 +#: sha1-file.c:1765 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: sha1-file.c:1717 +#: sha1-file.c:1772 msgid "file write error" msgstr "" -#: sha1-file.c:1736 +#: sha1-file.c:1792 msgid "error when closing loose object file" msgstr "" -#: sha1-file.c:1801 +#: sha1-file.c:1857 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1803 +#: sha1-file.c:1859 msgid "unable to create temporary file" msgstr "" -#: sha1-file.c:1827 +#: sha1-file.c:1883 msgid "unable to write loose object file" msgstr "" -#: sha1-file.c:1833 +#: sha1-file.c:1889 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: sha1-file.c:1837 +#: sha1-file.c:1893 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: sha1-file.c:1841 +#: sha1-file.c:1897 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1907 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "" -#: sha1-file.c:1926 +#: sha1-file.c:1984 #, c-format msgid "cannot read object for %s" msgstr "" -#: sha1-file.c:1966 +#: sha1-file.c:2035 msgid "corrupt commit" msgstr "" -#: sha1-file.c:1974 +#: sha1-file.c:2043 msgid "corrupt tag" msgstr "" -#: sha1-file.c:2073 +#: sha1-file.c:2143 #, c-format msgid "read error while indexing %s" msgstr "" -#: sha1-file.c:2076 +#: sha1-file.c:2146 #, c-format msgid "short read while indexing %s" msgstr "" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2219 sha1-file.c:2229 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: sha1-file.c:2164 +#: sha1-file.c:2235 #, c-format msgid "%s: unsupported file type" msgstr "" -#: sha1-file.c:2188 +#: sha1-file.c:2259 #, c-format msgid "%s is not a valid object" msgstr "" -#: sha1-file.c:2190 +#: sha1-file.c:2261 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2288 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2478 sha1-file.c:2531 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: sha1-file.c:2431 +#: sha1-file.c:2502 #, c-format msgid "unable to mmap %s" msgstr "" -#: sha1-file.c:2436 +#: sha1-file.c:2507 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: sha1-file.c:2442 +#: sha1-file.c:2513 #, c-format msgid "unable to parse header of %s" msgstr "" -#: sha1-file.c:2453 +#: sha1-file.c:2524 #, c-format msgid "unable to unpack contents of %s" msgstr "" -#: sha1-name.c:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "" -#: sha1-name.c:800 +#: 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" @@ -6609,44 +7502,104 @@ 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:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "" + +#: sha1-name.c:1708 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" + +#: sha1-name.c:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "" + +#: sha1-name.c:1745 +#, 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:1761 +#, 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:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "" + +#: sha1-name.c:1771 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "" + +#: sha1-name.c:1784 +msgid "relative path syntax can't be used outside working tree" +msgstr "" + +#: sha1-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:848 #, c-format msgid "%u.%2.2u GiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u MiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:867 #, c-format msgid "%u.%2.2u KiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:875 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6654,547 +7607,642 @@ msgstr[0] "" msgstr[1] "" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:877 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "" msgstr[1] "" -#: submodule.c:114 submodule.c:143 -msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" msgstr "" -#: submodule.c:118 submodule.c:147 +#: strbuf.c:1175 #, c-format -msgid "Could not find section in .gitmodules where path=%s" +msgid "could not edit '%s'" msgstr "" -#: submodule.c:154 +#: submodule-config.c:237 #, c-format -msgid "Could not remove .gitmodules entry for %s" +msgid "ignoring suspicious submodule name: %s" msgstr "" -#: submodule.c:165 -msgid "staging updated .gitmodules failed" +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" msgstr "" -#: submodule.c:327 +#: submodule-config.c:402 #, c-format -msgid "in unpopulated submodule '%s'" +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" -#: submodule.c:358 +#: submodule-config.c:499 #, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" +msgid "invalid value for %s" msgstr "" -#: submodule.c:910 +#: submodule-config.c:766 #, c-format -msgid "submodule entry '%s' (%s) is a %s, not a commit" -msgstr "" - -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 -msgid "Failed to resolve HEAD as a valid ref." +msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:1481 -#, c-format -msgid "Could not access submodule '%s'" +#: submodule.c:114 submodule.c:143 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:1651 +#: submodule.c:118 submodule.c:147 #, c-format -msgid "'%s' not recognized as a git repository" +msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:1789 +#: submodule.c:154 #, c-format -msgid "could not start 'git status' in submodule '%s'" +msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:1802 -#, c-format -msgid "could not run 'git status' in submodule '%s'" +#: submodule.c:165 +msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:1817 +#: submodule.c:327 #, c-format -msgid "Could not unset core.worktree setting in submodule '%s'" +msgid "in unpopulated submodule '%s'" msgstr "" -#: submodule.c:1907 +#: submodule.c:358 #, c-format -msgid "submodule '%s' has dirty index" +msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:1959 +#: submodule.c:434 #, c-format -msgid "Submodule '%s' could not be updated." +msgid "bad --ignore-submodules argument: %s" msgstr "" -#: submodule.c:2007 +#: submodule.c:816 #, c-format msgid "" -"relocate_gitdir for submodule '%s' with more than one worktree not supported" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." msgstr "" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:919 #, c-format -msgid "could not lookup name for submodule '%s'" +msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:2026 +#: submodule.c:1004 #, c-format msgid "" -"Migrating git directory of '%s%s' from\n" -"'%s' to\n" -"'%s'\n" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" msgstr "" -#: submodule.c:2109 +#: submodule.c:1127 #, c-format -msgid "could not recurse into submodule '%s'" +msgid "process for submodule '%s' failed" msgstr "" -#: submodule.c:2153 -msgid "could not start ls-files in .." +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 +msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:2192 +#: submodule.c:1167 #, c-format -msgid "ls-tree returned unexpected return code %d" +msgid "Pushing submodule '%s'\n" msgstr "" -#: submodule-config.c:232 +#: submodule.c:1170 #, c-format -msgid "ignoring suspicious submodule name: %s" +msgid "Unable to push submodule '%s'\n" msgstr "" -#: submodule-config.c:299 -msgid "negative values not allowed for submodule.fetchjobs" +#: submodule.c:1462 +#, c-format +msgid "Fetching submodule %s%s\n" msgstr "" -#: submodule-config.c:397 +#: submodule.c:1492 #, c-format -msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgid "Could not access submodule '%s'\n" msgstr "" -#: submodule-config.c:486 +#: submodule.c:1646 #, c-format -msgid "invalid value for %s" +msgid "" +"Errors during submodule fetch:\n" +"%s" msgstr "" -#: submodule-config.c:755 +#: submodule.c:1671 #, c-format -msgid "Could not update .gitmodules entry %s" +msgid "'%s' not recognized as a git repository" msgstr "" -#: trailer.c:238 +#: submodule.c:1688 #, c-format -msgid "running trailer command '%s' failed" +msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: submodule.c:1729 #, c-format -msgid "unknown value '%s' for key '%s'" +msgid "'git status --porcelain=2' failed in submodule %s" msgstr "" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: submodule.c:1804 #, c-format -msgid "more than one %s" +msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: trailer.c:730 +#: submodule.c:1817 #, c-format -msgid "empty trailer token in trailer '%.*s'" +msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: trailer.c:750 +#: submodule.c:1832 #, c-format -msgid "could not read input file '%s'" +msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "" -#: trailer.c:753 -msgid "could not read from stdin" +#: submodule.c:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" msgstr "" -#: trailer.c:1011 wrapper.c:701 -#, c-format -msgid "could not stat %s" +#: submodule.c:1880 +msgid "could not reset submodule index" msgstr "" -#: trailer.c:1013 +#: submodule.c:1922 #, c-format -msgid "file %s is not a regular file" +msgid "submodule '%s' has dirty index" msgstr "" -#: trailer.c:1015 +#: submodule.c:1974 #, c-format -msgid "file %s is not writable by user" +msgid "Submodule '%s' could not be updated." msgstr "" -#: trailer.c:1027 -msgid "could not open temporary file" +#: submodule.c:2042 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "" -#: trailer.c:1067 +#: submodule.c:2063 #, c-format -msgid "could not rename temporary file to %s" +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: transport.c:116 +#: submodule.c:2075 submodule.c:2134 #, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgid "could not lookup name for submodule '%s'" msgstr "" -#: transport.c:142 +#: submodule.c:2079 #, c-format -msgid "could not read bundle '%s'" +msgid "refusing to move '%s' into an existing git dir" msgstr "" -#: transport.c:208 +#: submodule.c:2086 #, c-format -msgid "transport: invalid depth option '%s'" +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" msgstr "" -#: transport.c:259 -msgid "see protocol.version in 'git help config' for more details" +#: submodule.c:2214 +msgid "could not start ls-files in .." msgstr "" -#: transport.c:260 -msgid "server options require protocol version 2 or later" +#: submodule.c:2254 +#, c-format +msgid "ls-tree returned unexpected return code %d" msgstr "" -#: transport.c:625 -msgid "could not parse transport.color.* config" +#: trailer.c:236 +#, c-format +msgid "running trailer command '%s' failed" msgstr "" -#: transport.c:698 -msgid "support for protocol v2 not implemented yet" +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 +#, c-format +msgid "unknown value '%s' for key '%s'" msgstr "" -#: transport.c:825 +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 #, c-format -msgid "unknown value for config '%s': %s" +msgid "more than one %s" msgstr "" -#: transport.c:891 +#: trailer.c:728 #, c-format -msgid "transport '%s' not allowed" +msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: transport.c:945 -msgid "git-over-rsync is no longer supported" +#: trailer.c:748 +#, c-format +msgid "could not read input file '%s'" +msgstr "" + +#: trailer.c:751 +msgid "could not read from stdin" msgstr "" -#: transport.c:1040 +#: trailer.c:1009 wrapper.c:676 #, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" +msgid "could not stat %s" msgstr "" -#: transport.c:1044 +#: trailer.c:1011 #, 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" +msgid "file %s is not a regular file" msgstr "" -#: transport.c:1052 -msgid "Aborting." +#: trailer.c:1013 +#, c-format +msgid "file %s is not writable by user" msgstr "" -#: transport.c:1193 -msgid "failed to push all needed submodules" +#: trailer.c:1025 +msgid "could not open temporary file" msgstr "" -#: transport.c:1340 transport-helper.c:645 -msgid "operation not supported by protocol" +#: trailer.c:1065 +#, c-format +msgid "could not rename temporary file to %s" msgstr "" -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:62 transport-helper.c:91 msgid "full write to remote helper failed" msgstr "" -#: transport-helper.c:134 +#: transport-helper.c:145 #, c-format msgid "unable to find remote helper for '%s'" msgstr "" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" msgstr "" -#: transport-helper.c:201 +#: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "" -#: transport-helper.c:207 +#: transport-helper.c:220 msgid "this remote helper should implement refspec capability" msgstr "" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:287 transport-helper.c:429 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "" -#: transport-helper.c:403 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "" -#: transport-helper.c:481 +#: transport-helper.c:497 msgid "couldn't run fast-import" msgstr "" -#: transport-helper.c:504 +#: transport-helper.c:520 msgid "error while running fast-import" msgstr "" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:549 transport-helper.c:1226 #, c-format msgid "could not read ref %s" msgstr "" -#: transport-helper.c:578 +#: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" msgstr "" -#: transport-helper.c:600 +#: transport-helper.c:616 msgid "setting remote service path not supported by protocol" msgstr "" -#: transport-helper.c:602 +#: transport-helper.c:618 msgid "invalid remote service path" msgstr "" -#: transport-helper.c:648 +#: transport-helper.c:661 transport.c:1428 +msgid "operation not supported by protocol" +msgstr "" + +#: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:720 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" -#: transport-helper.c:773 +#: transport-helper.c:841 #, c-format msgid "helper reported unexpected status of %s" msgstr "" -#: transport-helper.c:834 +#: transport-helper.c:924 #, c-format msgid "helper %s does not support dry-run" msgstr "" -#: transport-helper.c:837 +#: transport-helper.c:927 #, c-format msgid "helper %s does not support --signed" msgstr "" -#: transport-helper.c:840 +#: transport-helper.c:930 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" -#: transport-helper.c:847 +#: transport-helper.c:935 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "" + +#: transport-helper.c:941 #, c-format msgid "helper %s does not support 'push-option'" msgstr "" -#: transport-helper.c:945 +#: transport-helper.c:1040 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:950 +#: transport-helper.c:1045 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:997 +#: transport-helper.c:1092 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:1002 +#: transport-helper.c:1097 msgid "error while running fast-export" msgstr "" -#: transport-helper.c:1027 +#: transport-helper.c:1122 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" msgstr "" -#: transport-helper.c:1091 +#: transport-helper.c:1203 +#, c-format +msgid "unsupported object format '%s'" +msgstr "" + +#: transport-helper.c:1212 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1244 +#: transport-helper.c:1364 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1271 +#: transport-helper.c:1391 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1320 +#: transport-helper.c:1440 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1324 +#: transport-helper.c:1444 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1463 transport-helper.c:1467 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1384 +#: transport-helper.c:1504 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1388 +#: transport-helper.c:1508 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1526 transport-helper.c:1535 msgid "can't start thread for copying data" msgstr "" -#: tree-walk.c:33 +#: transport.c:116 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "" + +#: transport.c:145 +#, c-format +msgid "could not read bundle '%s'" +msgstr "" + +#: transport.c:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "" + +#: transport.c:269 +msgid "see protocol.version in 'git help config' for more details" +msgstr "" + +#: transport.c:270 +msgid "server options require protocol version 2 or later" +msgstr "" + +#: transport.c:712 +msgid "could not parse transport.color.* config" +msgstr "" + +#: transport.c:785 +msgid "support for protocol v2 not implemented yet" +msgstr "" + +#: transport.c:919 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "" + +#: transport.c:985 +#, c-format +msgid "transport '%s' not allowed" +msgstr "" + +#: transport.c:1038 +msgid "git-over-rsync is no longer supported" +msgstr "" + +#: transport.c:1140 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" + +#: transport.c:1144 +#, 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 "" + +#: transport.c:1152 +msgid "Aborting." +msgstr "" + +#: transport.c:1297 +msgid "failed to push all needed submodules" +msgstr "" + +#: tree-walk.c:32 msgid "too-short tree object" msgstr "" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "" -#: unpack-trees.c:111 +#: unpack-trees.c:113 #, 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:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:116 +#: unpack-trees.c:118 #, 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:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:121 +#: unpack-trees.c:123 #, 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:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:128 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:132 +#: unpack-trees.c:134 #, 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:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:137 +#: unpack-trees.c:139 #, 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:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:142 +#: unpack-trees.c:144 #, 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:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:150 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7202,7 +8250,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7210,85 +8258,100 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:155 +#: unpack-trees.c:157 #, 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:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:160 +#: unpack-trees.c:162 #, 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:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:170 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:173 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:175 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -#: unpack-trees.c:177 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -#: unpack-trees.c:179 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -#: unpack-trees.c:256 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:318 -msgid "Updating files" +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" msgstr "" #: unpack-trees.c:350 +msgid "Updating files" +msgstr "" + +#: unpack-trees.c:382 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:1498 +msgid "Updating index flags" +msgstr "" + +#: upload-pack.c:1516 +msgid "expected flush after fetch arguments" +msgstr "" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "" @@ -7318,47 +8381,87 @@ msgstr "" msgid "invalid '..' path segment" msgstr "" -#: worktree.c:258 builtin/am.c:2095 +#: walker.c:170 +msgid "Fetching objects" +msgstr "" + +#: worktree.c:236 builtin/am.c:2116 #, c-format msgid "failed to read '%s'" msgstr "" -#: worktree.c:304 +#: worktree.c:283 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:315 +#: worktree.c:294 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:327 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "" -#: worktree.c:333 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:341 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" -#: wrapper.c:223 wrapper.c:393 +#: worktree.c:587 +msgid "not a directory" +msgstr "" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr "" + +#: worktree.c:598 +msgid ".git file broken" +msgstr "" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr "" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:632 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "" @@ -7391,11 +8494,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "" @@ -7421,100 +8524,100 @@ msgstr "" msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "" -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "" -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "" -#: wt-status.c:906 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:938 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:940 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:1022 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1114 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -7522,184 +8625,192 @@ msgid "" "You can use '--no-ahead-behind' to avoid this.\n" msgstr "" -#: wt-status.c:1144 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1147 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1149 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1153 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1156 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1165 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1168 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1172 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1174 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1176 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1311 +#: wt-status.c:1307 msgid "No commands done." msgstr "" -#: wt-status.c:1314 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1325 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1330 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "" -#: wt-status.c:1333 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1341 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1358 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1373 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1375 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1382 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1386 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1391 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1394 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1398 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1403 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1406 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1408 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1419 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "" -#: wt-status.c:1422 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1429 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1432 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr "" -#: wt-status.c:1435 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1437 +#: wt-status.c:1433 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr "" + +#: wt-status.c:1435 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "" -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1456 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr "" -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" +#: wt-status.c:1462 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr "" + #: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" @@ -7717,39 +8828,44 @@ msgstr "" msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1690 +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "" + +#: wt-status.c:1731 msgid "On branch " msgstr "" -#: wt-status.c:1697 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1699 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1709 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1726 +#: wt-status.c:1767 msgid "Initial commit" msgstr "" -#: wt-status.c:1727 +#: wt-status.c:1768 msgid "No commits yet" msgstr "" -#: wt-status.c:1741 +#: wt-status.c:1782 msgid "Untracked files" msgstr "" -#: wt-status.c:1743 +#: wt-status.c:1784 msgid "Ignored files" msgstr "" -#: wt-status.c:1747 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -7757,216 +8873,225 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1753 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1755 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1761 +#: wt-status.c:1802 msgid "No changes" msgstr "" -#: wt-status.c:1766 +#: wt-status.c:1807 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1769 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1772 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1775 +#: wt-status.c:1819 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1778 +#: wt-status.c:1823 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1781 wt-status.c:1786 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1784 +#: wt-status.c:1830 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1788 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1901 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "" -#: wt-status.c:1905 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1936 +#: wt-status.c:1975 msgid "different" msgstr "" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "" -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2472 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2474 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#, c-format +msgid "failed to unlink '%s'" +msgstr "" + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "" -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:272 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "" -#: builtin/add.c:245 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:249 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "" -#: builtin/add.c:252 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "" -#: builtin/add.c:255 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:257 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:262 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:270 +#: builtin/add.c:308 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: 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 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 msgid "dry run" msgstr "" -#: builtin/add.c:293 +#: builtin/add.c:331 msgid "interactive picking" msgstr "" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:295 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:296 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:297 +#: builtin/add.c:335 msgid "update tracked files" msgstr "" -#: builtin/add.c:298 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:299 +#: builtin/add.c:337 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:300 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:303 +#: builtin/add.c:341 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:305 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:306 +#: builtin/add.c:344 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:307 +#: builtin/add.c:345 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:311 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:326 +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "" + +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -7984,169 +9109,192 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:354 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:372 -#, c-format -msgid "Use -f if you really want to add them.\n" +#: builtin/add.c:416 +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" msgstr "" -#: builtin/add.c:379 +#: builtin/add.c:425 msgid "adding files failed" msgstr "" -#: builtin/add.c:419 +#: builtin/add.c:453 builtin/commit.c:345 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "" + +#: builtin/add.c:470 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "" + +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:426 +#: builtin/add.c:485 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:430 +#: builtin/add.c:489 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:445 +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "" + +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "" + +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:446 +#: builtin/add.c:520 +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" + +#: builtin/am.c:160 #, c-format -msgid "Maybe you wanted to say 'git add .'?\n" +msgid "invalid committer: %s" msgstr "" -#: builtin/am.c:348 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "" -#: builtin/am.c:432 +#: builtin/am.c:450 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:474 +#: builtin/am.c:492 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:512 +#: builtin/am.c:530 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:538 +#: builtin/am.c:556 msgid "fseek failed" msgstr "" -#: builtin/am.c:726 +#: builtin/am.c:744 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:791 +#: builtin/am.c:809 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:839 +#: builtin/am.c:857 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:862 builtin/am.c:874 msgid "invalid Date line" msgstr "" -#: builtin/am.c:851 +#: builtin/am.c:869 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:944 +#: builtin/am.c:962 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:967 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:954 +#: builtin/am.c:972 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "" - -#: builtin/am.c:1098 +#: builtin/am.c:1103 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1099 +#: builtin/am.c:1104 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1100 +#: builtin/am.c:1105 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1183 +#: builtin/am.c:1188 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1211 +#: builtin/am.c:1216 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1277 +#: builtin/am.c:1281 #, c-format -msgid "invalid ident line: %.*s" +msgid "missing author line in commit %s" msgstr "" -#: builtin/am.c:1299 +#: builtin/am.c:1284 #, c-format -msgid "unable to parse commit %s" +msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1496 +#: builtin/am.c:1503 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1498 +#: builtin/am.c:1505 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1517 +#: builtin/am.c:1524 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1523 +#: builtin/am.c:1530 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1549 +#: builtin/am.c:1556 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1581 +#: builtin/am.c:1588 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1639 builtin/am.c:1643 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1650 +#: builtin/am.c:1661 msgid "Commit Body is:" msgstr "" @@ -8154,42 +9302,46 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1671 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1710 +#: builtin/am.c:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "" + +#: builtin/am.c:1721 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1761 builtin/am.c:1829 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1767 +#: builtin/am.c:1778 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1773 +#: builtin/am.c:1784 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1777 -msgid "Use 'git am --show-current-patch' to see the failed patch" +#: builtin/am.c:1788 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1821 +#: builtin/am.c:1832 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:1828 +#: builtin/am.c:1839 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8197,185 +9349,197 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:1987 +#: builtin/am.c:1998 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2031 +#: builtin/am.c:2042 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2128 +#: builtin/am.c:2149 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2164 +#: builtin/am.c:2191 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "" + +#: builtin/am.c:2195 +#, c-format +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +msgstr "" + +#: builtin/am.c:2226 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2165 +#: builtin/am.c:2227 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2171 +#: builtin/am.c:2233 msgid "run interactively" msgstr "" -#: builtin/am.c:2173 +#: builtin/am.c:2235 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2175 +#: builtin/am.c:2237 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 msgid "be quiet" msgstr "" -#: builtin/am.c:2178 +#: builtin/am.c:2240 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2181 +#: builtin/am.c:2243 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2183 +#: builtin/am.c:2245 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2185 +#: builtin/am.c:2247 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2187 +#: builtin/am.c:2249 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2189 +#: builtin/am.c:2251 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2192 +#: builtin/am.c:2254 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2195 +#: builtin/am.c:2257 msgid "strip everything before a scissors line" msgstr "" -#: 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 +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 msgid "pass it through git-apply" msgstr "" -#: 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:141 parse-options.h:162 parse-options.h:312 +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "" -#: 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 +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "" -#: builtin/am.c:2221 +#: builtin/am.c:2283 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2227 +#: builtin/am.c:2289 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2229 +#: builtin/am.c:2291 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2232 +#: builtin/am.c:2294 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2235 +#: builtin/am.c:2297 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2238 +#: builtin/am.c:2300 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2241 +#: builtin/am.c:2303 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2244 -msgid "show the patch being applied." +#: builtin/am.c:2307 +msgid "show the patch being applied" msgstr "" -#: builtin/am.c:2248 +#: builtin/am.c:2312 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2250 +#: builtin/am.c:2314 msgid "use current timestamp for author date" msgstr "" -#: 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 +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2256 +#: builtin/am.c:2320 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2274 +#: builtin/am.c:2338 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:2281 +#: builtin/am.c:2345 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2296 +#: builtin/am.c:2360 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2320 +#: builtin/am.c:2384 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2326 +#: builtin/am.c:2390 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2336 +#: builtin/am.c:2400 msgid "interactive mode requires patches on the command line" msgstr "" @@ -8413,117 +9577,136 @@ msgstr "" msgid "git archive: expected a flush" msgstr "" -#: builtin/bisect--helper.c:22 -msgid "git bisect--helper --next-all [--no-checkout]" +#: builtin/bisect--helper.c:23 +msgid "git bisect--helper --next-all" msgstr "" -#: builtin/bisect--helper.c:23 +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-clean-state" msgstr "" -#: builtin/bisect--helper.c:25 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" msgstr "" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:28 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" msgstr "" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:30 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" msgstr "" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:31 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" +msgstr "" + +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-next" +msgstr "" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-auto-next" +msgstr "" + +#: builtin/bisect--helper.c:35 +msgid "git bisect--helper --bisect-autostart" +msgstr "" + +#: builtin/bisect--helper.c:97 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "" + +#: builtin/bisect--helper.c:104 +#, c-format +msgid "could not write to file '%s'" msgstr "" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:143 #, c-format msgid "'%s' is not a valid term" msgstr "" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:147 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:167 msgid "please use two different terms" msgstr "" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "" - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:207 #, c-format msgid "We are not bisecting.\n" msgstr "" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:215 #, c-format msgid "'%s' is not a valid commit" msgstr "" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:224 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:268 #, c-format msgid "Bad bisect_write argument: %s" msgstr "" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:285 #, c-format msgid "couldn't open the file '%s'" msgstr "" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:311 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:338 #, 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:289 +#: builtin/bisect--helper.c:342 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -8531,7 +9714,7 @@ msgid "" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:321 +#: builtin/bisect--helper.c:362 #, c-format msgid "bisecting only with a %s commit" msgstr "" @@ -8540,136 +9723,181 @@ msgstr "" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:370 msgid "Are you sure [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:431 msgid "no terms defined" msgstr "" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:434 #, 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:389 +#: builtin/bisect--helper.c:444 #, 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:475 +#: builtin/bisect--helper.c:511 +msgid "revision walk setup failed\n" +msgstr "" + +#: builtin/bisect--helper.c:533 +#, c-format +msgid "could not open '%s' for appending" +msgstr "" + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +msgid "'' is not a valid term" +msgstr "" + +#: builtin/bisect--helper.c:674 #, c-format msgid "unrecognized option: '%s'" msgstr "" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:678 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:709 msgid "bad HEAD - I need a HEAD" msgstr "" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:724 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -#: builtin/bisect--helper.c:547 +#: builtin/bisect--helper.c:745 msgid "won't bisect on cg-seek'ed tree" msgstr "" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:748 msgid "bad HEAD - strange symbolic ref" msgstr "" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:775 #, c-format msgid "invalid ref: '%s'" msgstr "" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:827 +msgid "You need to start by \"git bisect start\"\n" +msgstr "" + +#. 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:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "" + +#: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'" msgstr "" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:868 msgid "write the terms to .git/BISECT_TERMS" msgstr "" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:870 msgid "cleanup the bisection state" msgstr "" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:872 msgid "check for expected revs" msgstr "" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:874 msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:876 msgid "write out the bisection state in BISECT_LOG" msgstr "" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:878 msgid "check and set terms in a bisection state" msgstr "" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:880 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:882 msgid "print out the bisect terms" msgstr "" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:884 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:650 -msgid "update BISECT_HEAD instead of checking out the current commit" +#: builtin/bisect--helper.c:886 +msgid "find the next bisection commit" msgstr "" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" +msgstr "" + +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "" + +#: builtin/bisect--helper.c:892 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:910 msgid "--write-terms requires two arguments" msgstr "" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:914 msgid "--bisect-clean-state requires no arguments" msgstr "" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:921 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:925 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:931 msgid "--check-and-set-terms requires 3 arguments" msgstr "" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:937 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:943 msgid "--bisect-terms requires 0 or 1 argument" msgstr "" +#: builtin/bisect--helper.c:952 +msgid "--bisect-next requires 0 arguments" +msgstr "" + +#: builtin/bisect--helper.c:958 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "" + +#: builtin/bisect--helper.c:964 +msgid "--bisect-autostart does not accept arguments" +msgstr "" + #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" @@ -8696,132 +9924,128 @@ msgstr "" msgid "invalid value for blame.coloring" msgstr "" -#: builtin/blame.c:823 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "" -#: builtin/blame.c:845 +#: builtin/blame.c:867 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:846 -msgid "Show blank SHA-1 for boundary commits (Default: off)" +#: builtin/blame.c:868 +msgid "Do not show object names of boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:847 +#: builtin/blame.c:869 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:848 +#: builtin/blame.c:870 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:849 +#: builtin/blame.c:871 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:850 +#: builtin/blame.c:872 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:851 +#: builtin/blame.c:873 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:852 +#: builtin/blame.c:874 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:853 +#: builtin/blame.c:875 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:854 +#: builtin/blame.c:876 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:855 +#: builtin/blame.c:877 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:856 +#: builtin/blame.c:878 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:857 +#: builtin/blame.c:879 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:858 +#: builtin/blame.c:880 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:859 +#: builtin/blame.c:881 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:860 +#: builtin/blame.c:882 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:883 builtin/log.c:1808 msgid "rev" msgstr "" -#: builtin/blame.c:861 +#: builtin/blame.c:883 msgid "Ignore <rev> when blaming" msgstr "" -#: builtin/blame.c:862 +#: builtin/blame.c:884 msgid "Ignore revisions from <file>" msgstr "" -#: builtin/blame.c:863 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:864 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "" -#: builtin/blame.c:871 -msgid "Use an experimental heuristic to improve diffs" -msgstr "" - -#: builtin/blame.c:873 +#: builtin/blame.c:887 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:874 +#: builtin/blame.c:888 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:875 +#: builtin/blame.c:889 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "" -#: builtin/blame.c:876 +#: builtin/blame.c:890 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:891 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "n,m" msgstr "" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:929 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -8833,23 +10057,23 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:1087 +#: builtin/blame.c:1110 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "" msgstr[1] "" -#: builtin/blame.c:1133 +#: builtin/blame.c:1156 msgid "Blaming lines" msgstr "" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" msgstr "" #: builtin/branch.c:30 @@ -9044,7 +10268,7 @@ msgstr "" msgid "do not use" msgstr "" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:526 msgid "upstream" msgstr "" @@ -9053,7 +10277,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 @@ -9136,198 +10360,327 @@ msgstr "" msgid "list branches in columns" msgstr "" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 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 +#: builtin/tag.c:434 msgid "object" msgstr "" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:841 +#: builtin/branch.c:839 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 "" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" -#: builtin/bundle.c:45 +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "" + +#: builtin/bugreport.c:21 #, c-format -msgid "%s is okay\n" +msgid "uname() failed with error '%s' (%d)\n" +msgstr "" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "" + +#: builtin/bugreport.c:34 +msgid "libc info: " msgstr "" -#: builtin/bundle.c:58 +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "" + +#: builtin/bugreport.c:158 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "" + +#: builtin/bugreport.c:168 +msgid "Enabled Hooks" +msgstr "" + +#: builtin/bugreport.c:175 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "" + +#: builtin/bugreport.c:178 +#, c-format +msgid "unable to write to %s" +msgstr "" + +#: builtin/bugreport.c:188 +#, c-format +msgid "Created new report at '%s'.\n" +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:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +msgid "show progress meter during object writing phase" +msgstr "" + +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +msgid "similar to --all-progress when progress meter is shown" +msgstr "" + +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "" -#: builtin/bundle.c:62 +#: builtin/bundle.c:107 +msgid "do not show bundle details" +msgstr "" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "" + +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:594 +#: builtin/bundle.c:171 builtin/remote.c:1687 +msgid "be verbose; must be placed before a subcommand" +msgstr "" + +#: builtin/bundle.c:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + +#: builtin/cat-file.c:598 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:595 +#: builtin/cat-file.c:599 msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" msgstr "" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:644 git-submodule.sh:936 +#: builtin/cat-file.c:648 msgid "blob" msgstr "" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:651 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:654 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:662 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:660 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "" @@ -9355,8 +10708,8 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "" @@ -9368,27 +10721,27 @@ msgstr "" msgid "ignore index when checking" msgstr "" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "" @@ -9446,9 +10799,9 @@ msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 msgid "string" msgstr "" @@ -9476,153 +10829,148 @@ msgstr "" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "" -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:190 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:240 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:258 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:274 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:374 +#: builtin/checkout.c:396 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:379 +#: builtin/checkout.c:401 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:386 +#: builtin/checkout.c:408 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:429 +#: builtin/checkout.c:451 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:433 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:437 +#: builtin/checkout.c:459 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:528 builtin/checkout.c:535 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:679 +#: builtin/checkout.c:703 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:729 +#: builtin/checkout.c:757 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:736 -#, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "" - -#: builtin/checkout.c:833 +#: builtin/checkout.c:853 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:875 +#: builtin/checkout.c:895 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:899 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:883 +#: builtin/checkout.c:903 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:886 +#: builtin/checkout.c:906 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:890 +#: builtin/checkout.c:910 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:912 builtin/checkout.c:1338 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:894 +#: builtin/checkout.c:914 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:945 +#: builtin/checkout.c:965 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:951 +#: builtin/checkout.c:971 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -9637,7 +10985,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:970 +#: builtin/checkout.c:990 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -9654,345 +11002,357 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1025 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1029 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1069 builtin/checkout.c:1333 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1176 -msgid "only one reference expected" +#: builtin/checkout.c:1146 +#, 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:1193 +#: builtin/checkout.c:1153 +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 "" + +#: builtin/checkout.c:1163 #, c-format -msgid "only one reference expected, %d given." +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "" + +#: builtin/checkout.c:1229 +msgid "only one reference expected" msgstr "" -#: builtin/checkout.c:1230 +#: builtin/checkout.c:1246 #, c-format -msgid "" -"'%s' could be both a local file and a tracking branch.\n" -"Please use -- (and optionally --no-guess) to disambiguate" +msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1305 builtin/checkout.c:1671 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1352 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1354 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1355 builtin/checkout.c:1363 #, c-format msgid "a branch is expected, got '%s'" msgstr "" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1358 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1374 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1378 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1333 +#: builtin/checkout.c:1382 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1386 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1341 +#: builtin/checkout.c:1390 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1394 msgid "you are switching branch while bisecting" msgstr "" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1401 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1429 #, c-format msgid "'%s' cannot take <start-point>" msgstr "" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1437 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1444 msgid "missing branch or commit argument" msgstr "" -#: 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 +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1487 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 msgid "style" msgstr "" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1489 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1501 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1502 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1504 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1508 builtin/merge.c:291 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1511 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1524 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1527 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1531 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1533 -msgid "-b, -B and --orphan are mutually exclusive" +#: builtin/checkout.c:1586 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1590 msgid "-p and --overlay are mutually exclusive" msgstr "" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1627 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1578 -msgid "missing branch name; try -b" +#: builtin/checkout.c:1632 +#, c-format +msgid "missing branch name; try -%c" msgstr "" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1664 #, c-format msgid "could not resolve %s" msgstr "" -#: builtin/checkout.c:1623 -msgid "you must specify path(s) to restore" -msgstr "" - -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1680 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1687 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1691 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1700 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "" + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "" + +#: builtin/checkout.c:1716 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." 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." +#: builtin/checkout.c:1721 +msgid "you must specify path(s) to restore" msgstr "" -#: 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 +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 msgid "branch" msgstr "" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1748 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1750 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1751 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1753 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1754 msgid "use overlay mode (default)" msgstr "" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1799 msgid "create and switch to a new branch" msgstr "" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1801 msgid "create/reset and switch to a branch" msgstr "" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1803 msgid "second guess 'git switch <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1805 msgid "throw away local modifications" msgstr "" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1839 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1841 msgid "restore the index" msgstr "" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1843 msgid "restore the working tree (default)" msgstr "" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1845 msgid "ignore unmerged entries" msgstr "" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1846 msgid "use overlay mode" msgstr "" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10001,7 +11361,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10014,38 +11374,33 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:520 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:662 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:699 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:720 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:786 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "" - -#: builtin/clean.c:794 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10056,76 +11411,68 @@ msgid "" "? - help for prompt selection" msgstr "" -#: 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 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:846 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:908 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "force" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "" -#: 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/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:916 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:936 -msgid "-x and -X cannot be used together" -msgstr "" - -#: builtin/clean.c:940 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:943 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -#: builtin/clone.c:46 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "" + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" @@ -10133,7 +11480,7 @@ msgstr "" msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 msgid "create a bare repository" msgstr "" @@ -10153,11 +11500,11 @@ msgstr "" msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "" @@ -10165,26 +11512,26 @@ msgstr "" msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:550 msgid "template-directory" msgstr "" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:551 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3314 builtin/repack.c:319 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 msgid "name" msgstr "" @@ -10200,8 +11547,8 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/pull.c:208 msgid "depth" msgstr "" @@ -10209,7 +11556,8 @@ msgstr "" msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 msgid "time" msgstr "" @@ -10217,16 +11565,17 @@ msgstr "" msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 msgid "revision" msgstr "" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:132 +#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "" @@ -10238,11 +11587,11 @@ msgstr "" msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:559 msgid "gitdir" msgstr "" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "" @@ -10254,23 +11603,23 @@ msgstr "" msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 msgid "server-specific" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 msgid "option to transmit" msgstr "" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 msgid "use IPv6 addresses only" msgstr "" @@ -10278,183 +11627,191 @@ msgstr "" msgid "any cloned submodules will use their remote-tracking branch" msgstr "" -#: builtin/clone.c:285 +#: 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 "" -#: builtin/clone.c:338 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:411 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:428 +#: builtin/clone.c:431 #, c-format msgid "failed to start iterator over '%s'" msgstr "" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "" - -#: builtin/clone.c:458 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:462 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "" -#: builtin/clone.c:492 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:506 +#: builtin/clone.c:512 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:583 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:702 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:752 +#: builtin/clone.c:756 +msgid "failed to initialize sparse-checkout" +msgstr "" + +#: builtin/clone.c:779 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:783 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:833 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:896 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:898 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:970 builtin/receive-pack.c:2434 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:942 +#: builtin/clone.c:974 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:955 +#: builtin/clone.c:987 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:958 +#: builtin/clone.c:990 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:971 +#: builtin/clone.c:1006 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:1010 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:987 +#: builtin/clone.c:1020 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:997 +#: builtin/clone.c:1026 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:1040 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:1017 +#: builtin/clone.c:1060 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1037 +#: builtin/clone.c:1080 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1039 +#: builtin/clone.c:1082 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1063 +#: builtin/clone.c:1106 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1124 +#: builtin/clone.c:1170 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1126 +#: builtin/clone.c:1172 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1128 +#: builtin/clone.c:1174 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1130 +#: builtin/clone.c:1176 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1133 +#: builtin/clone.c:1179 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1138 +#: builtin/clone.c:1184 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1268 builtin/clone.c:1276 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1226 +#: builtin/clone.c:1279 msgid "You appear to have cloned an empty repository." msgstr "" @@ -10490,6 +11847,105 @@ msgstr "" msgid "--command must be the first argument" msgstr "" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" + +#: builtin/commit-graph.c:64 +#, c-format +msgid "could not find object directory matching %s" +msgstr "" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "" + +#: builtin/commit-graph.c:83 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "" + +#: builtin/commit-graph.c:106 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "" + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "" + +#: builtin/commit-graph.c:155 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "" + +#: builtin/commit-graph.c:160 +#, c-format +msgid "invalid object: %s" +msgstr "" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "" + +#: builtin/commit-graph.c:215 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "" + +#: builtin/commit-graph.c:217 +msgid "start walk at commits listed by stdin" +msgstr "" + +#: builtin/commit-graph.c:219 +msgid "include all commits already in the commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:221 +msgid "enable computation for changed paths" +msgstr "" + +#: builtin/commit-graph.c:224 +msgid "allow writing an incremental commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:228 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "" + +#: builtin/commit-graph.c:230 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "" + +#: builtin/commit-graph.c:232 +msgid "only expire files older than a given date-time" +msgstr "" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "" + +#: builtin/commit-graph.c:255 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -10501,7 +11957,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 #, c-format msgid "not a valid object name %s" msgstr "" @@ -10529,13 +11985,13 @@ msgstr "" msgid "id of a parent commit object" msgstr "" -#: 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 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 msgid "message" msgstr "" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "" @@ -10543,8 +11999,8 @@ msgstr "" msgid "read commit log message from file" msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" @@ -10581,10 +12037,14 @@ msgid "" msgstr "" #: builtin/commit.c:63 -msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "" #: builtin/commit.c:66 +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "" + +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -10597,125 +12057,135 @@ msgid "" "\n" msgstr "" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:356 +#: builtin/commit.c:348 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "" + +#: builtin/commit.c:361 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:378 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:455 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:457 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:465 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "" + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:478 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:708 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:829 -#, c-format +#: builtin/commit.c:853 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" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" -#: builtin/commit.c:834 -#, c-format +#: builtin/commit.c:858 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" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" -#: builtin/commit.c:847 +#: builtin/commit.c:868 #, 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:855 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -10723,599 +12193,537 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:872 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:880 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:887 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:905 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:972 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1030 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1044 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1102 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1146 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1155 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1158 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1160 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1163 +#: builtin/commit.c:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "" + +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1173 +#: builtin/commit.c:1200 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1175 +#: builtin/commit.c:1202 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1183 +#: builtin/commit.c:1211 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1200 +#: builtin/commit.c:1229 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1202 -msgid "No paths with --include/--only does not make sense." -msgstr "" - -#: builtin/commit.c:1208 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "" -#: builtin/commit.c:1343 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1347 +#: builtin/commit.c:1374 msgid "version" msgstr "" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "" -#: 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 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 msgid "mode" msgstr "" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1383 builtin/commit.c:1541 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1360 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "" -#: builtin/commit.c:1363 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1366 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "" -#: builtin/commit.c:1368 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "" -#: builtin/commit.c:1388 +#: builtin/commit.c:1415 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1493 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1494 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1496 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 msgid "read message from file" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "author" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:539 msgid "date" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "" -#: builtin/commit.c:1501 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1502 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1503 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1504 +#: builtin/commit.c:1508 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1505 +#: builtin/commit.c:1509 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1507 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1508 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1510 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1515 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1516 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1517 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1518 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1519 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1520 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1521 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1522 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1535 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1536 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1541 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1543 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1623 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1642 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1649 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1654 +#: builtin/commit.c:1662 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1688 +#: builtin/commit.c:1696 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 -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: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: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: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:57 -msgid "if the commit-graph is split, only verify the tip file" -msgstr "" - -#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 -#, c-format -msgid "Could not open commit-graph '%s'" -msgstr "" - -#: builtin/commit-graph.c:164 -msgid "start walk at all refs" -msgstr "" - -#: builtin/commit-graph.c:166 -msgid "scan pack-indexes listed by stdin for commits" -msgstr "" - -#: builtin/commit-graph.c:168 -msgid "start walk at commits listed by stdin" -msgstr "" - -#: builtin/commit-graph.c:170 -msgid "include all commits already in the commit-graph file" -msgstr "" - -#: builtin/commit-graph.c:172 -msgid "allow writing an incremental commit-graph file" -msgstr "" - -#: 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:176 -msgid "maximum ratio between two levels of a split commit-graph" -msgstr "" - -#: builtin/commit-graph.c:191 -msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" -msgstr "" - #: builtin/config.c:11 msgid "git config [<options>]" msgstr "" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:107 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "" -#: builtin/config.c:115 +#: builtin/config.c:119 msgid "only one type at a time" msgstr "" -#: builtin/config.c:124 +#: builtin/config.c:128 msgid "Config file location" msgstr "" -#: builtin/config.c:125 +#: builtin/config.c:129 msgid "use global config file" msgstr "" -#: builtin/config.c:126 +#: builtin/config.c:130 msgid "use system config file" msgstr "" -#: builtin/config.c:127 +#: builtin/config.c:131 msgid "use repository config file" msgstr "" -#: builtin/config.c:128 +#: builtin/config.c:132 msgid "use per-worktree config file" msgstr "" -#: builtin/config.c:129 +#: builtin/config.c:133 msgid "use given config file" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "blob-id" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:131 +#: builtin/config.c:135 msgid "Action" msgstr "" -#: builtin/config.c:132 +#: builtin/config.c:136 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:133 +#: builtin/config.c:137 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:134 +#: builtin/config.c:138 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:135 +#: builtin/config.c:139 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:136 +#: builtin/config.c:140 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:137 +#: builtin/config.c:141 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:138 +#: builtin/config.c:142 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:139 +#: builtin/config.c:143 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:140 +#: builtin/config.c:144 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:141 +#: builtin/config.c:145 msgid "remove a section: name" msgstr "" -#: builtin/config.c:142 +#: builtin/config.c:146 msgid "list all" msgstr "" -#: builtin/config.c:143 +#: builtin/config.c:147 msgid "open an editor" msgstr "" -#: builtin/config.c:144 +#: builtin/config.c:148 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:145 +#: builtin/config.c:149 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:146 +#: builtin/config.c:150 msgid "Type" msgstr "" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:151 builtin/env--helper.c:43 msgid "value is given this type" msgstr "" -#: builtin/config.c:148 +#: builtin/config.c:152 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:149 +#: builtin/config.c:153 msgid "value is decimal number" msgstr "" -#: builtin/config.c:150 +#: builtin/config.c:154 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:151 +#: builtin/config.c:155 +msgid "value is --bool or string" +msgstr "" + +#: builtin/config.c:156 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:152 +#: builtin/config.c:157 msgid "value is an expiry date" msgstr "" -#: builtin/config.c:153 +#: builtin/config.c:158 msgid "Other" msgstr "" -#: builtin/config.c:154 +#: builtin/config.c:159 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:155 +#: builtin/config.c:160 msgid "show variable names only" msgstr "" -#: builtin/config.c:156 +#: builtin/config.c:161 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:157 +#: builtin/config.c:162 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:158 builtin/env--helper.c:40 +#: builtin/config.c:163 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" + +#: builtin/config.c:164 builtin/env--helper.c:45 msgid "value" msgstr "" -#: builtin/config.c:158 +#: builtin/config.c:164 msgid "with --get, use default value when missing entry" msgstr "" -#: builtin/config.c:172 +#: builtin/config.c:178 #, c-format msgid "wrong number of arguments, should be %d" msgstr "" -#: builtin/config.c:174 +#: builtin/config.c:180 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "" -#: builtin/config.c:308 +#: builtin/config.c:334 #, c-format msgid "invalid key pattern: %s" msgstr "" -#: builtin/config.c:344 +#: builtin/config.c:370 #, c-format msgid "failed to format default config value: %s" msgstr "" -#: builtin/config.c:401 +#: builtin/config.c:434 #, c-format msgid "cannot parse color '%s'" msgstr "" -#: builtin/config.c:443 +#: builtin/config.c:476 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:529 builtin/config.c:789 msgid "not in a git directory" msgstr "" -#: builtin/config.c:499 +#: builtin/config.c:532 msgid "writing to stdin is not supported" msgstr "" -#: builtin/config.c:502 +#: builtin/config.c:535 msgid "writing config blobs is not supported" msgstr "" -#: builtin/config.c:587 +#: builtin/config.c:620 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -11325,81 +12733,85 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:611 +#: builtin/config.c:644 msgid "only one config file at a time" msgstr "" -#: builtin/config.c:616 +#: builtin/config.c:650 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:619 +#: builtin/config.c:652 msgid "--blob can only be used inside a git repository" msgstr "" -#: builtin/config.c:638 +#: builtin/config.c:654 +msgid "--worktree can only be used inside a git repository" +msgstr "" + +#: builtin/config.c:676 msgid "$HOME not set" msgstr "" -#: builtin/config.c:658 +#: builtin/config.c:700 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:688 +#: builtin/config.c:735 msgid "--get-color and variable type are incoherent" msgstr "" -#: builtin/config.c:693 +#: builtin/config.c:740 msgid "only one action at a time" msgstr "" -#: builtin/config.c:706 +#: builtin/config.c:753 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "" -#: builtin/config.c:712 +#: builtin/config.c:759 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" -#: builtin/config.c:718 +#: builtin/config.c:765 msgid "--default is only applicable to --get" msgstr "" -#: builtin/config.c:731 +#: builtin/config.c:778 #, c-format msgid "unable to read config file '%s'" msgstr "" -#: builtin/config.c:734 +#: builtin/config.c:781 msgid "error processing config file(s)" msgstr "" -#: builtin/config.c:744 +#: builtin/config.c:791 msgid "editing stdin is not supported" msgstr "" -#: builtin/config.c:746 +#: builtin/config.c:793 msgid "editing blobs is not supported" msgstr "" -#: builtin/config.c:760 +#: builtin/config.c:807 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:773 +#: builtin/config.c:820 #, 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:847 builtin/config.c:858 +#: builtin/config.c:894 builtin/config.c:905 #, c-format msgid "no such section: %s" msgstr "" @@ -11412,11 +12824,32 @@ msgstr "" msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:27 +#: builtin/credential-cache--daemon.c:226 +#, 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 "" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "" + +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "" @@ -11432,285 +12865,290 @@ msgstr "" msgid "annotated" msgstr "" -#: builtin/describe.c:273 -#, c-format -msgid "annotated tag %s not available" -msgstr "" - #: builtin/describe.c:277 #, c-format -msgid "annotated tag %s has no embedded name" +msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:279 +#: builtin/describe.c:281 #, c-format -msgid "tag '%s' is really '%s' here" +msgid "tag '%s' is externally known as '%s'" msgstr "" -#: builtin/describe.c:323 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:325 +#: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:379 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:405 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:409 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:439 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:442 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:510 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "" -#: builtin/describe.c:513 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:521 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "" -#: builtin/describe.c:535 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:536 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:537 +#: builtin/describe.c:556 msgid "use any ref" msgstr "" -#: builtin/describe.c:538 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:539 +#: builtin/describe.c:558 msgid "always use long format" msgstr "" -#: builtin/describe.c:540 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:543 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:545 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:547 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:549 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "" -#: builtin/describe.c:553 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:556 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:574 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:603 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:654 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:656 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "" -#: builtin/diff.c:84 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:235 +#: builtin/diff.c:241 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:350 +#: builtin/diff.c:358 +#, c-format +msgid "%s...%s: no merge base" +msgstr "" + +#: builtin/diff.c:468 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:394 +#: builtin/diff.c:513 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:403 +#: builtin/diff.c:524 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:408 +#: builtin/diff.c:529 #, c-format msgid "unhandled object '%s' given." msgstr "" +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "" -#: builtin/difftool.c:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" @@ -11718,24 +13156,24 @@ msgstr "" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -11746,251 +13184,338 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:868 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" + +#: builtin/fast-export.c:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1206 msgid "select handling of commit messages in an alternate encoding" msgstr "" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1215 +msgid "Import marks from this file if it exists" +msgstr "" + +#: builtin/fast-export.c:1217 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1219 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1221 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1223 builtin/log.c:1811 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1224 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "" + +#: builtin/fast-export.c:1230 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1151 +#: builtin/fast-export.c:1232 msgid "Show original object ids of blobs/commits" msgstr "" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1234 +msgid "Label tags with mark ids" +msgstr "" + +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "" + +#: builtin/fast-export.c:1272 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "" + +#: builtin/fast-import.c:3086 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "" + +#: builtin/fast-import.c:3374 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "" + +#: builtin/fetch-pack.c:241 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:31 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:32 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:33 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "" + +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:144 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "" + +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:130 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "" -#: builtin/fetch.c:132 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:136 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:138 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:159 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:142 +#: builtin/fetch.c:161 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "" -#: builtin/fetch.c:144 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:150 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:155 +#: builtin/fetch.c:176 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:164 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:167 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:180 +#: builtin/fetch.c:201 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "" -#: builtin/fetch.c:183 -msgid "run 'gc --auto' after fetching" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" msgstr "" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:491 +#: builtin/fetch.c:210 +msgid "write the commit-graph after fetching" +msgstr "" + +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:630 +#: builtin/fetch.c:677 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:728 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:732 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:746 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:756 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:761 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:783 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:786 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:789 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:828 +#: builtin/fetch.c:875 msgid "forced update" msgstr "" -#: builtin/fetch.c:833 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:854 +#: builtin/fetch.c:901 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:858 +#: builtin/fetch.c:905 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -11999,148 +13524,173 @@ msgid "" " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:888 +#: builtin/fetch.c:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:909 +#: builtin/fetch.c:960 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1064 #, 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:1101 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1195 builtin/remote.c:1113 msgid "(none)" msgstr "" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1218 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1237 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1180 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "" + +#: builtin/fetch.c:1463 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "" + +#: builtin/fetch.c:1465 +msgid "not setting upstream for a remote tag" +msgstr "" + +#: builtin/fetch.c:1467 +msgid "unknown branch type" +msgstr "" + +#: builtin/fetch.c:1469 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" + +#: builtin/fetch.c:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1532 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" +#: builtin/fetch.c:1620 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" msgstr "" -#: builtin/fetch.c:1556 +#: builtin/fetch.c:1724 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:1593 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1669 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1869 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fetch.c:1703 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "" + +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "" @@ -12153,7 +13703,7 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" msgstr "" #: builtin/for-each-ref.c:13 @@ -12180,7 +13730,7 @@ msgstr "" msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "" @@ -12204,267 +13754,267 @@ msgstr "" msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, c-format msgid "error in %s %s: %s" msgstr "" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:131 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:168 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "" -#: builtin/fsck.c:184 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:295 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "" -#: builtin/fsck.c:321 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "" -#: builtin/fsck.c:340 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "" -#: builtin/fsck.c:349 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "" -#: builtin/fsck.c:360 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "" -#: builtin/fsck.c:377 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "" -#: builtin/fsck.c:415 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "" -#: builtin/fsck.c:434 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "" -#: builtin/fsck.c:438 +#: builtin/fsck.c:430 msgid "broken links" msgstr "" -#: builtin/fsck.c:447 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "" -#: builtin/fsck.c:455 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:484 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:509 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "" -#: builtin/fsck.c:523 +#: builtin/fsck.c:515 #, c-format msgid "Checking reflog %s->%s" msgstr "" -#: builtin/fsck.c:557 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "" -#: builtin/fsck.c:564 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "" -#: builtin/fsck.c:619 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "" -#: builtin/fsck.c:634 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "" -#: builtin/fsck.c:647 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "" -#: builtin/fsck.c:667 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "" -#: builtin/fsck.c:682 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:700 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "" -#: builtin/fsck.c:712 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "" -#: builtin/fsck.c:718 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:722 +#: builtin/fsck.c:713 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:734 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "" -#: builtin/fsck.c:739 +#: builtin/fsck.c:730 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "" -#: builtin/fsck.c:750 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "" -#: builtin/fsck.c:887 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "" -#: builtin/fsck.c:899 +#: builtin/fsck.c:886 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "" -#: builtin/gc.c:34 +#: builtin/gc.c:36 msgid "git gc [<options>]" msgstr "" -#: builtin/gc.c:90 +#: builtin/gc.c:91 #, c-format msgid "Failed to fstat %s: %s" msgstr "" -#: builtin/gc.c:126 +#: builtin/gc.c:127 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "" @@ -12535,7 +14085,60 @@ msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:29 +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "" + +#: builtin/gc.c:812 +msgid "failed to write commit-graph" +msgstr "" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "" + +#: builtin/gc.c:932 +#, c-format +msgid "task '%s' failed" +msgstr "" + +#: builtin/gc.c:979 +#, c-format +msgid "'%s' is not a valid task" +msgstr "" + +#: builtin/gc.c:984 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "" + +#: builtin/gc.c:1003 +msgid "run a specific task" +msgstr "" + +#: builtin/gc.c:1026 +msgid "git maintenance run [<options>]" +msgstr "" + +#: builtin/gc.c:1037 +#, c-format +msgid "invalid subcommand: %s" +msgstr "" + +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" @@ -12553,258 +14156,258 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:648 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:714 +#: builtin/grep.c:725 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:813 +#: builtin/grep.c:824 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:815 +#: builtin/grep.c:826 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:817 +#: builtin/grep.c:828 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:819 +#: builtin/grep.c:830 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:821 +#: builtin/grep.c:832 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:849 +#: builtin/grep.c:860 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:852 +#: builtin/grep.c:863 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:855 +#: builtin/grep.c:866 msgid "show line numbers" msgstr "" -#: builtin/grep.c:856 +#: builtin/grep.c:867 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:858 +#: builtin/grep.c:869 msgid "show filenames" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:873 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:864 +#: builtin/grep.c:875 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:872 +#: builtin/grep.c:883 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:874 +#: builtin/grep.c:885 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:875 +#: builtin/grep.c:886 msgid "highlight matches" msgstr "" -#: builtin/grep.c:877 +#: builtin/grep.c:888 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:879 +#: builtin/grep.c:890 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:882 +#: builtin/grep.c:893 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:896 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:898 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:889 +#: builtin/grep.c:900 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:893 +#: builtin/grep.c:904 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:895 +#: builtin/grep.c:906 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:902 +#: builtin/grep.c:913 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:914 +#: builtin/grep.c:925 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:916 +#: builtin/grep.c:927 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:918 +#: builtin/grep.c:929 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "pager" msgstr "" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:926 +#: builtin/grep.c:937 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:990 +#: builtin/grep.c:1004 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1026 +#: builtin/grep.c:1040 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1034 +#: builtin/grep.c:1048 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1065 +#: builtin/grep.c:1078 +msgid "--untracked not supported with --recurse-submodules" +msgstr "" + +#: builtin/grep.c:1082 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1094 +#: builtin/grep.c:1122 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1117 -msgid "option not supported with --recurse-submodules" -msgstr "" - -#: builtin/grep.c:1123 +#: builtin/grep.c:1148 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1129 +#: builtin/grep.c:1154 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1137 +#: builtin/grep.c:1162 msgid "both --cached and trees are given" msgstr "" @@ -12843,504 +14446,552 @@ msgstr "" msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:342 builtin/repack.c:254 +#, c-format +msgid "unable to create '%s'" +msgstr "" + +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "" -#: 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 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:870 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1288 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1264 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1304 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1633 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1681 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1688 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "" + +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1825 +msgid "--object-format cannot be used with --stdin" +msgstr "" + +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "" -#: builtin/init-db.c:61 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:66 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:78 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:80 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:86 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:90 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:121 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "" -#: builtin/init-db.c:136 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:334 +#: builtin/init-db.c:274 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "" + +#: builtin/init-db.c:366 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:337 +#: builtin/init-db.c:369 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "" + +#: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:413 +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "" + +#: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:414 +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:418 +#: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:419 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:468 +#: builtin/init-db.c:529 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:491 +#: builtin/init-db.c:555 msgid "permissions" msgstr "" -#: builtin/init-db.c:492 +#: builtin/init-db.c:556 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:562 +msgid "override the name of the initial branch" +msgstr "" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +msgid "hash" +msgstr "" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "" + +#: builtin/init-db.c:571 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "" + +#: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:538 +#: builtin/init-db.c:609 builtin/init-db.c:664 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:559 +#: builtin/init-db.c:636 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:587 +#: builtin/init-db.c:688 #, c-format msgid "Cannot access work tree '%s'" msgstr "" +#: builtin/init-db.c:693 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -13403,494 +15054,512 @@ msgstr "" msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:173 +#: builtin/log.c:177 msgid "show source" msgstr "" -#: builtin/log.c:174 +#: builtin/log.c:178 msgid "Use mail map file" msgstr "" -#: builtin/log.c:176 +#: builtin/log.c:181 msgid "only decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:178 +#: builtin/log.c:183 msgid "do not decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:179 +#: builtin/log.c:184 msgid "decorate options" msgstr "" -#: builtin/log.c:182 +#: builtin/log.c:187 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:280 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:534 +#: builtin/log.c:555 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:570 builtin/log.c:665 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:668 +#: builtin/log.c:690 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:791 +#: builtin/log.c:839 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "" + +#: builtin/log.c:846 msgid "format.headers without value" msgstr "" -#: builtin/log.c:908 +#: builtin/log.c:965 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:924 +#: builtin/log.c:981 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:941 +#: builtin/log.c:998 msgid "need exactly one range" msgstr "" -#: builtin/log.c:951 +#: builtin/log.c:1008 msgid "not a range" msgstr "" -#: builtin/log.c:1074 +#: builtin/log.c:1172 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1080 +#: builtin/log.c:1178 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1159 +#: builtin/log.c:1259 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1186 +#: builtin/log.c:1286 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1244 +#: builtin/log.c:1344 msgid "two output directories?" msgstr "" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 #, c-format msgid "unknown commit %s" msgstr "" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1506 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:1370 +#: builtin/log.c:1515 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1374 +#: builtin/log.c:1525 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:1394 +#: builtin/log.c:1548 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1405 +#: builtin/log.c:1565 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1409 +#: builtin/log.c:1575 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1462 +#: builtin/log.c:1633 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1514 -msgid "failed to infer range-diff ranges" +#: builtin/log.c:1690 +msgid "failed to infer range-diff origin of current series" +msgstr "" + +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" msgstr "" -#: builtin/log.c:1559 +#: builtin/log.c:1736 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1562 +#: builtin/log.c:1739 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1566 +#: builtin/log.c:1743 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1568 +#: builtin/log.c:1745 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1570 +#: builtin/log.c:1747 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1571 +#: builtin/log.c:1748 msgid "sfx" msgstr "" -#: builtin/log.c:1572 +#: builtin/log.c:1749 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1574 +#: builtin/log.c:1751 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1576 +#: builtin/log.c:1753 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1578 +#: builtin/log.c:1755 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1581 +#: builtin/log.c:1758 +msgid "cover-from-description-mode" +msgstr "" + +#: builtin/log.c:1759 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" + +#: builtin/log.c:1761 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1584 +#: builtin/log.c:1764 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1587 +#: builtin/log.c:1767 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1590 +#: builtin/log.c:1770 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1592 +#: builtin/log.c:1772 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1594 +#: builtin/log.c:1774 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1596 +#: builtin/log.c:1776 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1598 +#: builtin/log.c:1778 msgid "Messaging" msgstr "" -#: builtin/log.c:1599 +#: builtin/log.c:1779 msgid "header" msgstr "" -#: builtin/log.c:1600 +#: builtin/log.c:1780 msgid "add email header" msgstr "" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1781 builtin/log.c:1782 msgid "email" msgstr "" -#: builtin/log.c:1601 +#: builtin/log.c:1781 msgid "add To: header" msgstr "" -#: builtin/log.c:1603 +#: builtin/log.c:1782 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1605 +#: builtin/log.c:1783 msgid "ident" msgstr "" -#: builtin/log.c:1606 +#: builtin/log.c:1784 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1608 +#: builtin/log.c:1786 msgid "message-id" msgstr "" -#: builtin/log.c:1609 +#: builtin/log.c:1787 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1788 builtin/log.c:1791 msgid "boundary" msgstr "" -#: builtin/log.c:1611 +#: builtin/log.c:1789 msgid "attach the patch" msgstr "" -#: builtin/log.c:1614 +#: builtin/log.c:1792 msgid "inline the patch" msgstr "" -#: builtin/log.c:1618 +#: builtin/log.c:1796 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1620 +#: builtin/log.c:1798 msgid "signature" msgstr "" -#: builtin/log.c:1621 +#: builtin/log.c:1799 msgid "add a signature" msgstr "" -#: builtin/log.c:1622 +#: builtin/log.c:1800 msgid "base-commit" msgstr "" -#: builtin/log.c:1623 +#: builtin/log.c:1801 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1625 +#: builtin/log.c:1804 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1626 +#: builtin/log.c:1805 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1628 +#: builtin/log.c:1807 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1630 +#: builtin/log.c:1809 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1633 +#: builtin/log.c:1812 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1635 +#: builtin/log.c:1814 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1710 +#: builtin/log.c:1896 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1725 +#: builtin/log.c:1911 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1727 +#: builtin/log.c:1913 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1735 +#: builtin/log.c:1921 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1737 +#: builtin/log.c:1923 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1739 +#: builtin/log.c:1925 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1771 +#: builtin/log.c:1958 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1860 +#: builtin/log.c:2062 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1864 +#: builtin/log.c:2066 msgid "Interdiff:" msgstr "" -#: builtin/log.c:1865 +#: builtin/log.c:2067 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:1871 +#: builtin/log.c:2073 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:1875 +#: builtin/log.c:2077 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1883 +#: builtin/log.c:2085 msgid "Range-diff:" msgstr "" -#: builtin/log.c:1884 +#: builtin/log.c:2086 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:1895 +#: builtin/log.c:2097 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1931 +#: builtin/log.c:2133 msgid "Generating patches" msgstr "" -#: builtin/log.c:1975 +#: builtin/log.c:2177 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2034 +#: builtin/log.c:2236 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:2088 +#: builtin/log.c:2290 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "" @@ -13905,7 +15574,7 @@ msgstr "" msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 msgid "exec" msgstr "" @@ -13978,486 +15647,486 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "" -#: builtin/merge.c:55 -msgid "git merge [<options>] [<commit>...]" +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "" + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "" + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "" + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "" + +#: builtin/merge-base.c:151 +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 "" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "" + +#: 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 "" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "" + +#: 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] "" +msgstr[1] "" + +#: 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 "" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" msgstr "" #: builtin/merge.c:56 -msgid "git merge --abort" +msgid "git merge [<options>] [<commit>...]" msgstr "" #: builtin/merge.c:57 +msgid "git merge --abort" +msgstr "" + +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:118 +#: builtin/merge.c:120 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:141 +#: builtin/merge.c:143 #, c-format msgid "option `%s' requires a value" msgstr "" -#: builtin/merge.c:187 +#: builtin/merge.c:189 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:188 +#: builtin/merge.c:190 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:193 +#: builtin/merge.c:195 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:246 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:247 builtin/pull.c:154 +#: builtin/merge.c:249 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:250 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:252 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:253 builtin/pull.c:166 +#: builtin/merge.c:255 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:257 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:259 builtin/pull.c:154 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:259 +#: builtin/merge.c:261 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:263 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:267 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:269 builtin/pull.c:169 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option=value" msgstr "" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:271 +#: builtin/merge.c:273 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:278 +#: builtin/merge.c:280 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:280 +#: builtin/merge.c:282 msgid "--abort but leave index and working tree alone" msgstr "" -#: builtin/merge.c:282 +#: builtin/merge.c:284 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:286 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:290 -msgid "verify commit-msg hook" +#: builtin/merge.c:293 +msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" -#: builtin/merge.c:307 +#: builtin/merge.c:310 msgid "could not run stash." msgstr "" -#: builtin/merge.c:312 +#: builtin/merge.c:315 msgid "stash failed" msgstr "" -#: builtin/merge.c:317 +#: builtin/merge.c:320 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:342 builtin/merge.c:359 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:386 +#: builtin/merge.c:389 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:447 +#: builtin/merge.c:450 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:498 +#: builtin/merge.c:501 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:585 +#: builtin/merge.c:588 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:708 +#: builtin/merge.c:713 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:722 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:789 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:798 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:804 +#: builtin/merge.c:808 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 "" -#: builtin/merge.c:809 +#: builtin/merge.c:813 msgid "An empty message aborts the commit.\n" msgstr "" -#: builtin/merge.c:812 +#: builtin/merge.c:816 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:853 +#: builtin/merge.c:869 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:872 +#: builtin/merge.c:884 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:933 +#: builtin/merge.c:945 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:972 +#: builtin/merge.c:984 msgid "No current branch." msgstr "" -#: builtin/merge.c:974 +#: builtin/merge.c:986 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:976 +#: builtin/merge.c:988 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:981 +#: builtin/merge.c:993 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1038 +#: builtin/merge.c:1050 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1141 +#: builtin/merge.c:1153 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1175 +#: builtin/merge.c:1187 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1278 +#: builtin/merge.c:1291 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1282 +#: builtin/merge.c:1295 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1291 +#: builtin/merge.c:1313 msgid "--quit expects no arguments" msgstr "" -#: builtin/merge.c:1304 +#: builtin/merge.c:1326 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1308 +#: builtin/merge.c:1330 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1324 +#: builtin/merge.c:1346 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1331 +#: builtin/merge.c:1353 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1334 +#: builtin/merge.c:1356 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1348 +#: builtin/merge.c:1370 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1350 +#: builtin/merge.c:1372 msgid "You cannot combine --squash with --commit." msgstr "" -#: builtin/merge.c:1366 +#: builtin/merge.c:1388 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1383 +#: builtin/merge.c:1405 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1385 +#: builtin/merge.c:1407 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1390 +#: builtin/merge.c:1412 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1392 +#: builtin/merge.c:1414 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1471 +#: builtin/merge.c:1495 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1480 +#: builtin/merge.c:1504 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1490 +#: builtin/merge.c:1514 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1532 +#: builtin/merge.c:1560 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1539 +#: builtin/merge.c:1567 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1564 +#: builtin/merge.c:1592 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1570 +#: builtin/merge.c:1598 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1626 builtin/merge.c:1691 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1597 +#: builtin/merge.c:1630 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1649 +#: builtin/merge.c:1682 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1651 +#: builtin/merge.c:1684 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1660 +#: builtin/merge.c:1693 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1672 +#: builtin/merge.c:1707 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "" - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "" - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "" - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "" - -#: 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 "" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "" - -#: 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 "" - -#: builtin/merge-recursive.c:46 -#, c-format -msgid "unknown option %s" -msgstr "" - -#: builtin/merge-recursive.c:52 -#, c-format -msgid "could not parse object '%s'" -msgstr "" - -#: 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:64 -msgid "not handling anything other than two heads merge." -msgstr "" - -#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 -#, c-format -msgid "could not resolve ref '%s'" -msgstr "" - -#: builtin/merge-recursive.c:78 -#, c-format -msgid "Merging %s with %s\n" -msgstr "" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" @@ -14476,29 +16145,29 @@ msgstr "" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" -#: builtin/multi-pack-index.c:25 +#: 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 "" -#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 msgid "--batch-size option is only for 'repack' subcommand" msgstr "" -#: builtin/multi-pack-index.c:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "" @@ -14529,113 +16198,117 @@ msgstr "" msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:411 -msgid "print only names (no SHA-1)" +#: builtin/name-rev.c:524 +msgid "print only ref-based names (no object names)" msgstr "" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "" @@ -14775,7 +16448,7 @@ msgstr "" msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "" @@ -14996,7 +16669,7 @@ msgid "" "abort'.\n" msgstr "" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" @@ -15014,7 +16687,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "" @@ -15030,390 +16703,374 @@ msgstr "" msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1605 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "" -#: 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 +#: builtin/pack-objects.c:1004 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:854 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1348 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1597 +#: builtin/pack-objects.c:1796 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1606 +#: builtin/pack-objects.c:1805 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:1875 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "" -#: builtin/pack-objects.c:2005 -#, c-format -msgid "unable to get size of %s" -msgstr "" - -#: builtin/pack-objects.c:2020 +#: builtin/pack-objects.c:2231 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2130 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2656 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2795 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" + +#: builtin/pack-objects.c:2964 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" + +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:3187 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3041 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "" -#: 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 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3489 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3500 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3502 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3510 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3516 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3530 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3553 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3555 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3327 +#: builtin/pack-objects.c:3559 msgid "write a bitmap index if possible" msgstr "" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3566 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3568 msgid "respect islands during delta compression" msgstr "" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "" + +#: builtin/pack-objects.c:3600 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3366 +#: builtin/pack-objects.c:3605 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3659 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3422 +#: builtin/pack-objects.c:3661 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3666 msgid "--thin cannot be used to build an indexable pack" msgstr "" -#: builtin/pack-objects.c:3430 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3675 msgid "cannot use --filter without --stdout" msgstr "" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3766 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" msgstr "" #: builtin/pack-refs.c:8 @@ -15428,98 +17085,111 @@ msgstr "" msgid "prune loose refs (default)" msgstr "" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "" -#: builtin/prune-packed.c:42 -msgid "Removing duplicate objects" -msgstr "" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "" -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/pull.c:141 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "" -#: builtin/pull.c:145 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:148 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:185 -msgid "automatically stash/stash pop before and after rebase" +#: builtin/pull.c:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" msgstr "" -#: builtin/pull.c:201 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:211 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "" -#: builtin/pull.c:219 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:316 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:433 +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" + +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:435 +#: builtin/pull.c:460 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:436 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:439 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -15527,74 +17197,70 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:449 builtin/pull.c:464 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 msgid "<remote>" msgstr "" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:468 git-parse-remote.sh:95 +#: builtin/pull.c:493 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:473 +#: builtin/pull.c:498 #, 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:581 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "" -#: builtin/pull.c:861 +#: builtin/pull.c:894 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:916 -msgid "--[no-]autostash option is only valid with --rebase." -msgstr "" - -#: builtin/pull.c:924 +#: builtin/pull.c:954 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:928 +#: builtin/pull.c:958 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:929 +#: builtin/pull.c:959 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:954 +#: builtin/pull.c:984 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -15602,7 +17268,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:960 +#: builtin/pull.c:990 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -15613,15 +17279,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:975 +#: builtin/pull.c:1005 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:979 +#: builtin/pull.c:1009 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:986 +#: builtin/pull.c:1017 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -15633,17 +17299,17 @@ msgstr "" msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:121 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:167 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:170 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -15658,7 +17324,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:185 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -15668,7 +17334,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:199 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -15677,12 +17343,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:207 +#: builtin/push.c:202 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:210 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -15690,12 +17356,12 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:269 +#: builtin/push.c:260 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:276 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -15703,7 +17369,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:282 +#: builtin/push.c:273 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" @@ -15711,7 +17377,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:288 +#: builtin/push.c:279 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" @@ -15720,143 +17386,143 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:295 +#: builtin/push.c:286 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:298 +#: builtin/push.c:289 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:359 +#: builtin/push.c:351 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:364 +#: builtin/push.c:358 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: 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 +#: builtin/push.c:532 msgid "repository" msgstr "" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:533 builtin/send-pack.c:183 msgid "push all refs" msgstr "" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:534 builtin/send-pack.c:185 msgid "mirror all refs" msgstr "" -#: builtin/push.c:558 +#: builtin/push.c:536 msgid "delete refs" msgstr "" -#: builtin/push.c:559 +#: builtin/push.c:537 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:562 builtin/send-pack.c:167 +#: builtin/push.c:540 builtin/send-pack.c:186 msgid "force updates" msgstr "" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:541 builtin/send-pack.c:198 msgid "<refname>:<expect>" msgstr "" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:542 builtin/send-pack.c:199 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:568 +#: builtin/push.c:545 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:546 builtin/send-pack.c:193 msgid "use thin pack" msgstr "" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 msgid "receive pack program" msgstr "" -#: builtin/push.c:573 +#: builtin/push.c:549 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:576 +#: builtin/push.c:552 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:578 +#: builtin/push.c:554 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:579 +#: builtin/push.c:555 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:557 builtin/send-pack.c:187 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:559 builtin/send-pack.c:194 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:602 +#: builtin/push.c:577 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:604 +#: builtin/push.c:579 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:607 +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:600 +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:615 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:609 +#: builtin/push.c:617 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:613 +#: builtin/push.c:621 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:615 +#: builtin/push.c:623 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:618 +#: builtin/push.c:626 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:637 +#: builtin/push.c:630 msgid "push options must not have new line characters" msgstr "" @@ -15872,24 +17538,32 @@ msgstr "" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: 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 #, c-format msgid "no .. in range: '%s'" msgstr "" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "" @@ -15968,231 +17642,212 @@ msgstr "" msgid "suppress feedback messages" msgstr "" -#: builtin/rebase.c:32 +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "" + +#: builtin/rebase.c:35 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: 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 +#: builtin/rebase.c:304 #, c-format msgid "could not create temporary %s" msgstr "" -#: builtin/rebase.c:285 +#: builtin/rebase.c:310 msgid "could not mark as interactive" msgstr "" -#: builtin/rebase.c:343 +#: builtin/rebase.c:364 msgid "could not generate todo list" msgstr "" -#: builtin/rebase.c:382 +#: builtin/rebase.c:405 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:437 +#: builtin/rebase.c:474 msgid "git rebase--interactive [<options>]" msgstr "" -#: builtin/rebase.c:449 -msgid "keep empty commits" +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" msgstr "" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:491 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "" -#: builtin/rebase.c:452 +#: builtin/rebase.c:493 msgid "rebase merge commits" msgstr "" -#: builtin/rebase.c:454 +#: builtin/rebase.c:495 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:456 +#: builtin/rebase.c:497 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:457 +#: builtin/rebase.c:498 msgid "sign commits" msgstr "" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:500 builtin/rebase.c:1321 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:461 +#: builtin/rebase.c:502 msgid "continue rebase" msgstr "" -#: builtin/rebase.c:463 +#: builtin/rebase.c:504 msgid "skip commit" msgstr "" -#: builtin/rebase.c:464 +#: builtin/rebase.c:505 msgid "edit the todo list" msgstr "" -#: builtin/rebase.c:466 +#: builtin/rebase.c:507 msgid "show the current patch" msgstr "" -#: builtin/rebase.c:469 +#: builtin/rebase.c:510 msgid "shorten commit ids in the todo list" msgstr "" -#: builtin/rebase.c:471 +#: builtin/rebase.c:512 msgid "expand commit ids in the todo list" msgstr "" -#: builtin/rebase.c:473 +#: builtin/rebase.c:514 msgid "check the todo list" msgstr "" -#: builtin/rebase.c:475 +#: builtin/rebase.c:516 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/rebase.c:477 +#: builtin/rebase.c:518 msgid "insert exec commands in todo list" msgstr "" -#: builtin/rebase.c:478 +#: builtin/rebase.c:519 msgid "onto" msgstr "" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict-revision" msgstr "" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict revision" msgstr "" -#: builtin/rebase.c:483 +#: builtin/rebase.c:524 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:484 +#: builtin/rebase.c:525 msgid "squash onto" msgstr "" -#: builtin/rebase.c:486 +#: builtin/rebase.c:527 msgid "the upstream commit" msgstr "" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head-name" msgstr "" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head name" msgstr "" -#: builtin/rebase.c:493 +#: builtin/rebase.c:534 msgid "rebase strategy" msgstr "" -#: builtin/rebase.c:494 +#: builtin/rebase.c:535 msgid "strategy-opts" msgstr "" -#: builtin/rebase.c:495 +#: builtin/rebase.c:536 msgid "strategy options" msgstr "" -#: builtin/rebase.c:496 +#: builtin/rebase.c:537 msgid "switch-to" msgstr "" -#: builtin/rebase.c:497 +#: builtin/rebase.c:538 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto-name" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto name" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "cmd" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "the command to run" msgstr "" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:543 builtin/rebase.c:1415 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:518 +#: builtin/rebase.c:559 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:534 +#: builtin/rebase.c:575 #, c-format -msgid "%s requires an interactive rebase" +msgid "%s requires the merge backend" msgstr "" -#: builtin/rebase.c:586 +#: builtin/rebase.c:618 #, c-format msgid "could not get 'onto': '%s'" msgstr "" -#: builtin/rebase.c:601 +#: builtin/rebase.c:635 #, c-format msgid "invalid orig-head: '%s'" msgstr "" -#: builtin/rebase.c:626 +#: builtin/rebase.c:660 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:702 -#, c-format -msgid "Could not read '%s'" -msgstr "" - -#: builtin/rebase.c:720 -#, c-format -msgid "Cannot store %s" -msgstr "" - -#: builtin/rebase.c:827 -msgid "could not determine HEAD revision" -msgstr "" - -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:805 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" @@ -16201,7 +17856,7 @@ msgid "" "abort\"." msgstr "" -#: builtin/rebase.c:1031 +#: builtin/rebase.c:888 #, c-format msgid "" "\n" @@ -16213,7 +17868,14 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1214 +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "" + +#: builtin/rebase.c:1232 #, c-format msgid "" "%s\n" @@ -16224,7 +17886,7 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1248 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -16233,169 +17895,201 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1278 msgid "exec commands cannot contain newlines" msgstr "" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1282 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1312 msgid "rebase onto given branch instead of upstream" msgstr "" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1314 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "" + +#: builtin/rebase.c:1316 msgid "allow pre-rebase hook to run" msgstr "" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1318 msgid "be quiet. implies --no-stat" msgstr "" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1324 msgid "do not show diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1327 msgid "add a Signed-off-by: line to each commit" msgstr "" -#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 -msgid "passed to 'git am'" +#: builtin/rebase.c:1330 +msgid "make committer date match author date" +msgstr "" + +#: builtin/rebase.c:1332 +msgid "ignore author date and use current date" +msgstr "" + +#: builtin/rebase.c:1334 +msgid "synonym of --reset-author-date" msgstr "" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1336 builtin/rebase.c:1340 msgid "passed to 'git apply'" msgstr "" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1338 +msgid "ignore changes in whitespace" +msgstr "" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 msgid "cherry-pick all commits, even if unchanged" msgstr "" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1347 msgid "continue" msgstr "" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1350 msgid "skip current patch and continue" msgstr "" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1352 msgid "abort and check out the original branch" msgstr "" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1355 msgid "abort but keep HEAD where it is" msgstr "" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1356 msgid "edit the todo list during an interactive rebase" msgstr "" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1359 msgid "show the patch file being applied or merged" msgstr "" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1362 +msgid "use apply strategies to rebase" +msgstr "" + +#: builtin/rebase.c:1366 msgid "use merging strategies to rebase" msgstr "" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1370 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1374 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -#: builtin/rebase.c:1455 -msgid "preserve empty commits during rebase" +#: builtin/rebase.c:1379 +msgid "how to handle commits that become empty" msgstr "" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1386 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1463 -msgid "automatically stash/stash pop before and after" -msgstr "" - -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1393 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1397 msgid "allow rebasing commits with empty messages" msgstr "" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1401 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1404 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1406 msgid "use the given merge strategy" msgstr "" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1408 builtin/revert.c:115 msgid "option" msgstr "" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1409 msgid "pass the argument through to the merge strategy" msgstr "" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1412 msgid "rebase all reachable commits up to the root(s)" msgstr "" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "" + +#: builtin/rebase.c:1434 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1440 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1481 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" -#: builtin/rebase.c:1551 +#: builtin/rebase.c:1486 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "" + +#: builtin/rebase.c:1488 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "" + +#: builtin/rebase.c:1492 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "" + +#: builtin/rebase.c:1495 msgid "No rebase in progress?" msgstr "" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1499 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1522 msgid "Cannot read HEAD" msgstr "" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1534 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1553 msgid "could not discard worktree changes" msgstr "" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1572 #, c-format msgid "could not move back to %s" msgstr "" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1618 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -16408,171 +18102,140 @@ msgid "" "valuable there.\n" msgstr "" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1646 msgid "switch `C' expects a numerical value" msgstr "" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1688 #, c-format msgid "Unknown mode: %s" msgstr "" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1727 msgid "--strategy requires --merge or --interactive" msgstr "" -#: builtin/rebase.c:1797 -msgid "--reschedule-failed-exec requires --exec or --interactive" +#: builtin/rebase.c:1757 +msgid "cannot combine apply options with merge options" msgstr "" -#: builtin/rebase.c:1809 -msgid "cannot combine am options with either interactive or merge options" +#: builtin/rebase.c:1770 +#, c-format +msgid "Unknown rebase backend: %s" msgstr "" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1795 +msgid "--reschedule-failed-exec requires --exec or --interactive" +msgstr "" + +#: builtin/rebase.c:1815 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1819 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -#: builtin/rebase.c:1838 -msgid "cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "" - -#: builtin/rebase.c:1841 -msgid "cannot combine '--rebase-merges' with '--strategy'" -msgstr "" - -#: builtin/rebase.c:1865 +#: builtin/rebase.c:1843 #, c-format msgid "invalid upstream '%s'" msgstr "" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1849 msgid "Could not create new root commit" msgstr "" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1875 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "" + +#: builtin/rebase.c:1878 #, c-format msgid "'%s': need exactly one merge base" msgstr "" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1886 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1912 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1931 msgid "Could not resolve HEAD to a revision" msgstr "" -#: builtin/rebase.c:1981 -msgid "Cannot autostash" -msgstr "" - -#: builtin/rebase.c:1984 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "" - -#: builtin/rebase.c:1990 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "" - -#: builtin/rebase.c:1993 -#, c-format -msgid "Created autostash: %s\n" -msgstr "" - -#: builtin/rebase.c:1996 -msgid "could not reset --hard" -msgstr "" - -#: builtin/rebase.c:1997 builtin/reset.c:114 -#, c-format -msgid "HEAD is now at %s" -msgstr "" - -#: builtin/rebase.c:2013 +#: builtin/rebase.c:1952 msgid "Please commit or stash them." msgstr "" -#: builtin/rebase.c:2040 -#, c-format -msgid "could not parse '%s'" -msgstr "" - -#: builtin/rebase.c:2053 +#: builtin/rebase.c:1988 #, c-format msgid "could not switch to %s" msgstr "" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:1999 msgid "HEAD is up to date." msgstr "" -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2001 #, c-format msgid "Current branch %s is up to date.\n" msgstr "" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2009 msgid "HEAD is up to date, rebase forced." msgstr "" -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2011 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "" -#: builtin/rebase.c:2084 +#: builtin/rebase.c:2019 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2026 #, c-format msgid "Changes to %s:\n" msgstr "" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2029 #, c-format msgid "Changes from %s to %s:\n" msgstr "" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2054 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" -#: builtin/rebase.c:2128 +#: builtin/rebase.c:2063 msgid "Could not detach HEAD" msgstr "" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2072 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:1224 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" @@ -16589,7 +18252,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:1244 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" @@ -16601,11 +18264,11 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:2422 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:2436 msgid "You must specify a directory." msgstr "" @@ -16626,210 +18289,223 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "" -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "" -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "" -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "" -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "" -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "" -#: builtin/remote.c:173 +#: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "" -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "" -#: builtin/remote.c:187 +#: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:697 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:701 #, c-format msgid "'%s' is not a valid remote name" msgstr "" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:654 +#, c-format +msgid "could not set '%s'" +msgstr "" + +#: builtin/remote.c:659 +#, 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:690 builtin/remote.c:833 builtin/remote.c:941 #, c-format msgid "No such remote: '%s'" msgstr "" -#: builtin/remote.c:646 +#: builtin/remote.c:707 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:666 +#: builtin/remote.c:727 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -16837,17 +18513,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:702 +#: builtin/remote.c:767 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:736 +#: builtin/remote.c:801 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:802 +#: builtin/remote.c:877 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -16857,118 +18533,118 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:816 +#: builtin/remote.c:891 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:917 +#: builtin/remote.c:994 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:920 +#: builtin/remote.c:997 msgid " tracked" msgstr "" -#: builtin/remote.c:922 +#: builtin/remote.c:999 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:924 +#: builtin/remote.c:1001 msgid " ???" msgstr "" -#: builtin/remote.c:965 +#: builtin/remote.c:1042 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:974 +#: builtin/remote.c:1051 #, c-format msgid "rebases interactively onto remote %s" msgstr "" -#: builtin/remote.c:976 +#: builtin/remote.c:1053 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "" -#: builtin/remote.c:979 +#: builtin/remote.c:1056 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:983 +#: builtin/remote.c:1060 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:986 +#: builtin/remote.c:1063 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:989 +#: builtin/remote.c:1066 #, c-format msgid "%-*s and with remote %s\n" msgstr "" -#: builtin/remote.c:1032 +#: builtin/remote.c:1109 msgid "create" msgstr "" -#: builtin/remote.c:1035 +#: builtin/remote.c:1112 msgid "delete" msgstr "" -#: builtin/remote.c:1039 +#: builtin/remote.c:1116 msgid "up to date" msgstr "" -#: builtin/remote.c:1042 +#: builtin/remote.c:1119 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1045 +#: builtin/remote.c:1122 msgid "local out of date" msgstr "" -#: builtin/remote.c:1052 +#: builtin/remote.c:1129 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1055 +#: builtin/remote.c:1132 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1059 +#: builtin/remote.c:1136 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1062 +#: builtin/remote.c:1139 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1130 +#: builtin/remote.c:1207 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1158 +#: builtin/remote.c:1235 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 msgid "(no URL)" msgstr "" @@ -16976,303 +18652,294 @@ msgstr "" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1250 builtin/remote.c:1252 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1177 +#: builtin/remote.c:1254 msgid "(not queried)" msgstr "" -#: builtin/remote.c:1179 +#: builtin/remote.c:1256 msgid "(unknown)" msgstr "" -#: builtin/remote.c:1183 +#: builtin/remote.c:1260 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1195 +#: builtin/remote.c:1272 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1275 builtin/remote.c:1301 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1207 +#: builtin/remote.c:1284 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1215 +#: builtin/remote.c:1292 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1221 +#: builtin/remote.c:1298 #, 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:1242 +#: builtin/remote.c:1319 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1244 +#: builtin/remote.c:1321 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1259 +#: builtin/remote.c:1336 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1261 +#: builtin/remote.c:1338 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1271 +#: builtin/remote.c:1348 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1279 +#: builtin/remote.c:1356 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1281 +#: builtin/remote.c:1358 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1300 +#: builtin/remote.c:1377 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1311 +#: builtin/remote.c:1388 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1327 +#: builtin/remote.c:1404 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1330 +#: builtin/remote.c:1407 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1375 +#: builtin/remote.c:1452 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1454 +#: builtin/remote.c:1531 msgid "add branch" msgstr "" -#: builtin/remote.c:1461 +#: builtin/remote.c:1538 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1478 +#: builtin/remote.c:1555 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1480 +#: builtin/remote.c:1557 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1508 +#: builtin/remote.c:1585 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1534 +#: builtin/remote.c:1611 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1536 +#: builtin/remote.c:1613 msgid "add URL" msgstr "" -#: builtin/remote.c:1538 +#: builtin/remote.c:1615 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1545 +#: builtin/remote.c:1622 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1584 +#: builtin/remote.c:1661 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1592 +#: builtin/remote.c:1669 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1594 +#: builtin/remote.c:1671 msgid "Will not delete all non-push URLs" msgstr "" -#: 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 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "" -#: builtin/repack.c:27 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -#: builtin/repack.c:190 +#: builtin/repack.c:197 msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:229 builtin/repack.c:408 +#: builtin/repack.c:236 builtin/repack.c:421 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:246 +#: builtin/repack.c:260 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:284 +#: builtin/repack.c:297 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:286 +#: builtin/repack.c:299 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:289 +#: builtin/repack.c:302 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:291 +#: builtin/repack.c:304 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:293 +#: builtin/repack.c:306 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:295 +#: builtin/repack.c:308 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:298 +#: builtin/repack.c:311 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:300 +#: builtin/repack.c:313 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:302 +#: builtin/repack.c:315 msgid "pass --delta-islands to git-pack-objects" msgstr "" -#: builtin/repack.c:303 +#: builtin/repack.c:316 msgid "approxidate" msgstr "" -#: builtin/repack.c:304 +#: builtin/repack.c:317 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:306 +#: builtin/repack.c:319 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:308 +#: builtin/repack.c:321 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:309 builtin/repack.c:315 +#: builtin/repack.c:322 builtin/repack.c:328 msgid "bytes" msgstr "" -#: builtin/repack.c:310 +#: builtin/repack.c:323 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:312 +#: builtin/repack.c:325 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:314 +#: builtin/repack.c:327 msgid "limits the maximum number of threads" msgstr "" -#: builtin/repack.c:316 +#: builtin/repack.c:329 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:318 +#: builtin/repack.c:331 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:320 +#: builtin/repack.c:333 msgid "do not repack this pack" msgstr "" -#: builtin/repack.c:330 +#: builtin/repack.c:343 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:334 +#: builtin/repack.c:347 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:417 +#: builtin/repack.c:430 msgid "Nothing new to pack." msgstr "" -#: builtin/repack.c:478 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -17284,7 +18951,7 @@ msgid "" "WARNING: Please rename them in %s manually:\n" msgstr "" -#: builtin/repack.c:526 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "" @@ -17387,8 +19054,8 @@ msgstr "" msgid "unable to write object to database" msgstr "" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: 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 "" @@ -17407,124 +19074,124 @@ msgstr "" msgid "new object is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "" -#: builtin/replace.c:414 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:416 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:428 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" -#: builtin/replace.c:467 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "" -#: builtin/replace.c:468 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "" -#: builtin/replace.c:478 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "" -#: builtin/replace.c:486 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "" -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:525 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" "%s" msgstr "" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "" -#: builtin/replace.c:550 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "" -#: builtin/replace.c:567 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "" -#: builtin/replace.c:575 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "" -#: builtin/replace.c:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "" -#: builtin/replace.c:585 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "" -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "" -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "" -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "" -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "" -#: builtin/replace.c:615 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "" @@ -17551,113 +19218,123 @@ msgid "" msgstr "" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "" #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" msgstr "" -#: builtin/reset.c:40 +#: builtin/reset.c:35 +msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgstr "" + +#: builtin/reset.c:41 msgid "mixed" msgstr "" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "" -#: builtin/reset.c:81 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "" -#: builtin/reset.c:83 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "" -#: builtin/reset.c:89 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:193 +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "" + +#: builtin/reset.c:195 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:295 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:296 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:302 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:308 +#: builtin/reset.c:310 msgid "record only the fact that removed paths will be added later" msgstr "" -#: builtin/reset.c:326 +#: builtin/reset.c:344 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:334 +#: builtin/reset.c:352 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:343 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:353 +#: builtin/reset.c:371 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:355 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:370 +#: builtin/reset.c:388 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:374 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "" -#: builtin/reset.c:395 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:398 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -17666,53 +19343,48 @@ msgid "" "to make this the default.\n" msgstr "" -#: builtin/reset.c:408 +#: builtin/reset.c:434 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:412 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "" -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-list.c:530 -msgid "cannot combine --use-bitmap-index with object filtering" +#: builtin/rev-list.c:615 +msgid "marked counting is incompatible with --objects" msgstr "" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -17845,36 +19517,40 @@ msgid_plural "the following files have local modifications:" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:289 +#: 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 "" -#: builtin/rm.c:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "" @@ -17887,55 +19563,76 @@ msgid "" " --all and explicit <ref> specification are mutually exclusive." msgstr "" -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:182 msgid "remote name" msgstr "" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:195 msgid "use stateless RPC protocol" msgstr "" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:196 msgid "read refs from stdin" msgstr "" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:197 msgid "print status from remote helper" msgstr "" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:15 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:134 +msgid "using multiple --group options with stdin is not supported" +msgstr "" + +#: builtin/shortlog.c:144 +msgid "using --group=trailer with stdin is not supported" +msgstr "" + +#: builtin/shortlog.c:388 +#, c-format +msgid "unknown group type: %s" +msgstr "" + +#: builtin/shortlog.c:416 msgid "Group by committer rather than author" msgstr "" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:419 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:421 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:423 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:424 msgid "<w>[,<i1>[,<i2>]]" msgstr "" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:425 msgid "Linewrap output" msgstr "" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:427 +msgid "field" +msgstr "" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "" + +#: builtin/shortlog.c:456 msgid "too many arguments given outside repository" msgstr "" @@ -18069,6 +19766,14 @@ msgstr "" msgid "cannot find commit %s (%s)" msgstr "" +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -18111,15 +19816,86 @@ msgstr "" msgid "show refs from stdin that aren't in local repository" msgstr "" -#: builtin/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "" + +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "" + +#: builtin/sparse-checkout.c:76 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "" + +#: builtin/sparse-checkout.c:228 +msgid "failed to create directory for sparse-checkout file" +msgstr "" + +#: builtin/sparse-checkout.c:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "" + +#: builtin/sparse-checkout.c:401 +#, c-format +msgid "could not normalize path %s" +msgstr "" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "" + +#: builtin/sparse-checkout.c:438 +#, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "" + +#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +msgid "unable to load existing sparse-checkout patterns" +msgstr "" + +#: builtin/sparse-checkout.c:561 +msgid "read patterns from standard in" +msgstr "" + +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "" + +#: builtin/sparse-checkout.c:623 +msgid "error while refreshing working directory" +msgstr "" + +#: builtin/stash.c:22 builtin/stash.c:38 msgid "git stash list [<options>]" msgstr "" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "" @@ -18127,209 +19903,217 @@ msgstr "" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:26 builtin/stash.c:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "" -#: builtin/stash.c:28 builtin/stash.c:77 +#: 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 "" -#: builtin/stash.c:31 builtin/stash.c:84 +#: 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 "" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "" -#: builtin/stash.c:127 +#: 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 #, c-format msgid "'%s' is not a stash-like commit" msgstr "" -#: builtin/stash.c:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "" -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "" -#: builtin/stash.c:403 +#: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" msgstr "" -#: builtin/stash.c:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "" -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "" -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "" -#: builtin/stash.c:434 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "" -#: builtin/stash.c:448 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "" -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 msgid "The stash entry is kept in case you need it again." msgstr "" -#: builtin/stash.c:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 msgid "stash message" msgstr "" -#: builtin/stash.c:818 +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" msgstr "" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1043 msgid "No changes selected" msgstr "" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1143 msgid "You do not have the initial commit yet" msgstr "" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1170 msgid "Cannot save the current index state" msgstr "" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1179 msgid "Cannot save the untracked files" msgstr "" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1190 builtin/stash.c:1199 msgid "Cannot save the current worktree state" msgstr "" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1227 msgid "Cannot record working tree state" msgstr "" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1276 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: builtin/stash.c:1285 +#: builtin/stash.c:1292 msgid "Did you forget to 'git add'?" msgstr "" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1307 msgid "No local changes to save" msgstr "" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1314 msgid "Cannot initialize stash" msgstr "" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1329 msgid "Cannot save the current status" msgstr "" -#: builtin/stash.c:1327 +#: builtin/stash.c:1334 #, c-format msgid "Saved working directory and index state %s" msgstr "" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1424 msgid "Cannot remove worktree changes" msgstr "" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1463 builtin/stash.c:1528 msgid "keep index" msgstr "" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "quiet mode" msgstr "" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "include untracked files in stash" msgstr "" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1470 builtin/stash.c:1535 msgid "include ignore files" msgstr "" -#: builtin/stash.c:1555 -#, c-format -msgid "could not exec %s" +#: builtin/stash.c:1570 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." msgstr "" #: builtin/stripspace.c:18 @@ -18348,47 +20132,47 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" -#: builtin/submodule--helper.c:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" "." msgstr "" -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -18396,346 +20180,455 @@ msgid "" "." msgstr "" -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" msgstr "" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:669 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -#: builtin/submodule--helper.c:686 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:835 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:887 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" msgstr "" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1048 +#: builtin/submodule--helper.c:1485 msgid "Suppress output of synchronizing submodule url" msgstr "" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1546 #, 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:1121 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "" -#: builtin/submodule--helper.c:1158 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1187 +#: builtin/submodule--helper.c:1624 msgid "Remove submodule working trees even if they contain local changes" msgstr "" -#: builtin/submodule--helper.c:1188 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1713 +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:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" -#: builtin/submodule--helper.c:1348 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "" -#: builtin/submodule--helper.c:1371 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +msgid "disallow cloning into non-empty directory" +msgstr "" + +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1873 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "" + +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "" + +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:1474 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1478 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:2340 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:1877 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +#: builtin/submodule--helper.c:2357 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:2418 #, 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:2061 +#: builtin/submodule--helper.c:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2159 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" -#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2681 +msgid "Suppress output for setting url of a submodule" +msgstr "" + +#: builtin/submodule--helper.c:2685 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "" + +#: builtin/submodule--helper.c:2718 +msgid "set the default tracking branch to master" +msgstr "" + +#: builtin/submodule--helper.c:2720 +msgid "set the default tracking branch" +msgstr "" + +#: builtin/submodule--helper.c:2724 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "" + +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" + +#: builtin/submodule--helper.c:2732 +msgid "--branch or --default required" +msgstr "" + +#: builtin/submodule--helper.c:2735 +msgid "--branch and --default are mutually exclusive" +msgstr "" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" @@ -18760,11 +20653,11 @@ msgstr "" msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "" @@ -18782,7 +20675,8 @@ msgstr "" msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" #: builtin/tag.c:30 @@ -18839,378 +20733,382 @@ msgstr "" msgid "bad object type." msgstr "" -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "" -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "" -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "" -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "" -#: builtin/update-index.c:166 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "" -#: builtin/update-index.c:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" -#: builtin/update-index.c:201 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "" -#: builtin/update-index.c:214 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "" -#: builtin/update-index.c:221 +#: builtin/update-index.c:222 msgid " OK" msgstr "" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:971 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:981 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:983 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:1017 +#: 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:1019 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:1027 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:1035 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "" -#: builtin/update-index.c:1060 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "" -#: builtin/update-index.c:1168 +#: 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 "" -#: builtin/update-index.c:1177 +#: 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 "" -#: builtin/update-index.c:1188 +#: 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 "" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1200 +#: 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 "" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" -#: builtin/update-index.c:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -#: builtin/update-index.c:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "" @@ -19226,19 +21124,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "" @@ -19282,15 +21180,15 @@ msgstr "" msgid "print raw gpg status output" msgstr "" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "" -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "" @@ -19302,276 +21200,280 @@ msgstr "" msgid "print tag contents" msgstr "" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:970 #, c-format msgid "failed to delete '%s'" msgstr "" -#: builtin/worktree.c:80 -#, c-format -msgid "Removing worktrees/%s: not a valid directory" +#: builtin/worktree.c:85 +msgid "not a valid directory" msgstr "" -#: builtin/worktree.c:86 -#, c-format -msgid "Removing worktrees/%s: gitdir file does not exist" +#: builtin/worktree.c:91 +msgid "gitdir file does not exist" msgstr "" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:96 builtin/worktree.c:105 #, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +msgid "unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:110 +#: builtin/worktree.c:115 #, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "" -#: builtin/worktree.c:118 -#, c-format -msgid "Removing worktrees/%s: invalid gitdir file" +#: builtin/worktree.c:123 +msgid "invalid gitdir file" msgstr "" -#: builtin/worktree.c:127 +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "" + +#: builtin/worktree.c:146 #, c-format -msgid "Removing worktrees/%s: gitdir file points to non-existent location" +msgid "Removing %s/%s: %s" msgstr "" -#: builtin/worktree.c:166 +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "" -#: builtin/worktree.c:168 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "" -#: builtin/worktree.c:235 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:252 +#: builtin/worktree.c:302 #, c-format -msgid "unable to re-add worktree '%s'" +msgid "unusable worktree destination '%s'" msgstr "" -#: builtin/worktree.c:257 +#: builtin/worktree.c:307 #, 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" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:259 +#: builtin/worktree.c:309 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:309 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "" -#: builtin/worktree.c:442 +#: builtin/worktree.c:496 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:451 +#: builtin/worktree.c:505 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:457 +#: builtin/worktree.c:511 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "" -#: builtin/worktree.c:498 +#: builtin/worktree.c:552 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:501 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:503 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:505 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:506 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:509 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "" -#: builtin/worktree.c:512 +#: builtin/worktree.c:566 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" -#: builtin/worktree.c:520 +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:581 +#: builtin/worktree.c:635 msgid "--[no-]track can only be used if a new branch is created" msgstr "" -#: builtin/worktree.c:681 +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:769 builtin/worktree.c:802 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:700 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:702 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:730 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/worktree.c:771 +#: builtin/worktree.c:845 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:779 +#: builtin/worktree.c:853 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:876 builtin/worktree.c:1000 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:807 +#: builtin/worktree.c:881 #, c-format msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/worktree.c:813 -#, c-format -msgid "target '%s' already exists" -msgstr "" - -#: builtin/worktree.c:821 +#: builtin/worktree.c:894 #, 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:823 +#: builtin/worktree.c:896 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:826 +#: builtin/worktree.c:899 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:831 +#: builtin/worktree.c:904 #, c-format msgid "failed to move '%s' to '%s'" msgstr "" -#: builtin/worktree.c:879 +#: builtin/worktree.c:950 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:883 +#: builtin/worktree.c:954 #, c-format -msgid "'%s' is dirty, use --force to delete it" +msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:888 +#: builtin/worktree.c:959 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:911 +#: builtin/worktree.c:982 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:934 +#: builtin/worktree.c:1005 #, 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:936 +#: builtin/worktree.c:1007 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:939 +#: builtin/worktree.c:1010 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" +#: builtin/worktree.c:1034 +#, c-format +msgid "repair: %s: %s" +msgstr "" + +#: builtin/worktree.c:1037 +#, c-format +msgid "error: %s: %s" +msgstr "" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "" @@ -19588,25 +21490,21 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: credential-cache--daemon.c:223 +#: http-fetch.c:114 #, 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" +msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" +#: http-fetch.c:122 +msgid "not a git repository" msgstr "" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "" @@ -19618,7 +21516,7 @@ msgstr "" msgid "exit immediately after advertising capabilities" msgstr "" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -19628,7 +21526,7 @@ msgid "" " <command> [<args>]" msgstr "" -#: git.c:34 +#: git.c:35 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" @@ -19636,139 +21534,139 @@ msgid "" "See 'git help git' for an overview of the system." msgstr "" -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "" -#: git.c:360 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "" -#: git.c:369 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" "You can use '!git' in the alias to do this" msgstr "" -#: git.c:377 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "" -#: git.c:380 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "" -#: git.c:460 +#: git.c:465 msgid "write failure on standard output" msgstr "" -#: git.c:462 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "" -#: git.c:464 +#: git.c:469 msgid "close failed on standard output" msgstr "" -#: git.c:793 +#: git.c:819 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:843 +#: git.c:869 #, c-format msgid "cannot handle %s as a builtin" msgstr "" -#: git.c:856 +#: git.c:882 #, c-format msgid "" "usage: %s\n" "\n" msgstr "" -#: git.c:876 +#: git.c:902 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:888 +#: git.c:914 #, c-format msgid "failed to run command '%s': %s\n" msgstr "" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" -#: http.c:876 +#: http.c:910 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "" -#: http.c:949 +#: http.c:989 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "" -#: http.c:1085 +#: http.c:1132 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "" -#: http.c:1092 +#: http.c:1139 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" -#: http.c:1096 +#: http.c:1143 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "" -#: http.c:1965 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -19776,152 +21674,192 @@ msgid "" " redirect: %s" msgstr "" -#: remote-curl.c:157 +#: remote-curl.c:174 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "" -#: remote-curl.c:254 +#: remote-curl.c:298 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "" -#: remote-curl.c:355 +#: remote-curl.c:399 msgid "invalid server response; expected service, got flush packet" msgstr "" -#: remote-curl.c:386 +#: remote-curl.c:430 #, c-format msgid "invalid server response; got '%s'" msgstr "" -#: remote-curl.c:446 +#: remote-curl.c:490 #, c-format msgid "repository '%s' not found" msgstr "" -#: remote-curl.c:450 +#: remote-curl.c:494 #, c-format msgid "Authentication failed for '%s'" msgstr "" -#: remote-curl.c:454 +#: remote-curl.c:498 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: remote-curl.c:460 +#: remote-curl.c:504 #, c-format msgid "redirecting to %s" msgstr "" -#: remote-curl.c:584 +#: remote-curl.c:633 msgid "shouldn't have EOF when not gentle on EOF" msgstr "" -#: remote-curl.c:664 +#: remote-curl.c:645 +msgid "remote server sent stateless separator" +msgstr "" + +#: remote-curl.c:715 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -#: remote-curl.c:724 +#: remote-curl.c:745 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "" + +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "" + +#: remote-curl.c:823 #, c-format msgid "RPC failed; %s" msgstr "" -#: remote-curl.c:764 +#: remote-curl.c:863 msgid "cannot handle pushes this big" msgstr "" -#: remote-curl.c:879 +#: remote-curl.c:978 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" -#: remote-curl.c:883 +#: remote-curl.c:982 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" -#: remote-curl.c:1014 +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" +msgstr "" + +#: remote-curl.c:1034 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "" + +#: remote-curl.c:1123 msgid "dumb http transport does not support shallow capabilities" msgstr "" -#: remote-curl.c:1028 +#: remote-curl.c:1138 msgid "fetch failed." msgstr "" -#: remote-curl.c:1076 +#: remote-curl.c:1184 msgid "cannot fetch by sha1 over smart http" msgstr "" -#: remote-curl.c:1120 remote-curl.c:1126 +#: remote-curl.c:1228 remote-curl.c:1234 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1246 remote-curl.c:1361 #, c-format msgid "http transport does not support %s" msgstr "" -#: remote-curl.c:1174 +#: remote-curl.c:1282 msgid "git-http-push failed" msgstr "" -#: remote-curl.c:1360 +#: remote-curl.c:1467 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1392 +#: remote-curl.c:1499 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1399 +#: remote-curl.c:1506 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1439 +#: remote-curl.c:1547 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" -#: list-objects-filter-options.h:61 +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "" + +#: list-objects-filter-options.h:91 msgid "args" msgstr "" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "" -#: parse-options.h:184 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "" -#: parse-options.h:313 -msgid "use <n> digits to display SHA-1s" +#: parse-options.h:317 +msgid "use <n> digits to display object names" msgstr "" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "" -#: ref-filter.h:101 +#: 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:96 msgid "key" msgstr "" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "" @@ -19929,11 +21867,11 @@ msgstr "" msgid "update the index with reused conflict resolution if possible" msgstr "" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "" -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "" @@ -19974,689 +21912,706 @@ msgid "List, create, or delete branches" msgstr "" #: command-list.h:59 -msgid "Move objects and refs by archive" +msgid "Collect information for user to file a bug report" msgstr "" #: command-list.h:60 -msgid "Provide content or type and size information for repository objects" +msgid "Move objects and refs by archive" msgstr "" #: command-list.h:61 -msgid "Display gitattributes information" +msgid "Provide content or type and size information for repository objects" msgstr "" #: command-list.h:62 -msgid "Debug gitignore / exclude files" +msgid "Display gitattributes information" msgstr "" #: command-list.h:63 -msgid "Show canonical names and email addresses of contacts" +msgid "Debug gitignore / exclude files" msgstr "" #: command-list.h:64 -msgid "Switch branches or restore working tree files" +msgid "Show canonical names and email addresses of contacts" msgstr "" #: command-list.h:65 -msgid "Copy files from the index to the working tree" +msgid "Switch branches or restore working tree files" msgstr "" #: command-list.h:66 -msgid "Ensures that a reference name is well formed" +msgid "Copy files from the index to the working tree" msgstr "" #: command-list.h:67 -msgid "Find commits yet to be applied to upstream" +msgid "Ensures that a reference name is well formed" msgstr "" #: command-list.h:68 -msgid "Apply the changes introduced by some existing commits" +msgid "Find commits yet to be applied to upstream" msgstr "" #: command-list.h:69 -msgid "Graphical alternative to git-commit" +msgid "Apply the changes introduced by some existing commits" msgstr "" #: command-list.h:70 -msgid "Remove untracked files from the working tree" +msgid "Graphical alternative to git-commit" msgstr "" #: command-list.h:71 -msgid "Clone a repository into a new directory" +msgid "Remove untracked files from the working tree" msgstr "" #: command-list.h:72 -msgid "Display data in columns" +msgid "Clone a repository into a new directory" msgstr "" #: command-list.h:73 -msgid "Record changes to the repository" +msgid "Display data in columns" msgstr "" #: command-list.h:74 -msgid "Write and verify Git commit-graph files" +msgid "Record changes to the repository" msgstr "" #: command-list.h:75 -msgid "Create a new commit object" +msgid "Write and verify Git commit-graph files" msgstr "" #: command-list.h:76 -msgid "Get and set repository or global options" +msgid "Create a new commit object" msgstr "" #: command-list.h:77 -msgid "Count unpacked number of objects and their disk consumption" +msgid "Get and set repository or global options" msgstr "" #: command-list.h:78 -msgid "Retrieve and store user credentials" +msgid "Count unpacked number of objects and their disk consumption" msgstr "" #: command-list.h:79 -msgid "Helper to temporarily store passwords in memory" +msgid "Retrieve and store user credentials" msgstr "" #: command-list.h:80 -msgid "Helper to store credentials on disk" +msgid "Helper to temporarily store passwords in memory" msgstr "" #: command-list.h:81 -msgid "Export a single commit to a CVS checkout" +msgid "Helper to store credentials on disk" msgstr "" #: command-list.h:82 -msgid "Salvage your data out of another SCM people love to hate" +msgid "Export a single commit to a CVS checkout" msgstr "" #: command-list.h:83 -msgid "A CVS server emulator for Git" +msgid "Salvage your data out of another SCM people love to hate" msgstr "" #: command-list.h:84 -msgid "A really simple server for Git repositories" +msgid "A CVS server emulator for Git" msgstr "" #: command-list.h:85 -msgid "Give an object a human readable name based on an available ref" +msgid "A really simple server for Git repositories" msgstr "" #: command-list.h:86 -msgid "Show changes between commits, commit and working tree, etc" +msgid "Give an object a human readable name based on an available ref" msgstr "" #: command-list.h:87 -msgid "Compares files in the working tree and the index" +msgid "Show changes between commits, commit and working tree, etc" msgstr "" #: command-list.h:88 -msgid "Compare a tree to the working tree or index" +msgid "Compares files in the working tree and the index" msgstr "" #: command-list.h:89 -msgid "Compares the content and mode of blobs found via two tree objects" +msgid "Compare a tree to the working tree or index" msgstr "" #: command-list.h:90 -msgid "Show changes using common diff tools" +msgid "Compares the content and mode of blobs found via two tree objects" msgstr "" #: command-list.h:91 -msgid "Git data exporter" +msgid "Show changes using common diff tools" msgstr "" #: command-list.h:92 -msgid "Backend for fast Git data importers" +msgid "Git data exporter" msgstr "" #: command-list.h:93 -msgid "Download objects and refs from another repository" +msgid "Backend for fast Git data importers" msgstr "" #: command-list.h:94 -msgid "Receive missing objects from another repository" +msgid "Download objects and refs from another repository" msgstr "" #: command-list.h:95 -msgid "Rewrite branches" +msgid "Receive missing objects from another repository" msgstr "" #: command-list.h:96 -msgid "Produce a merge commit message" +msgid "Rewrite branches" msgstr "" #: command-list.h:97 -msgid "Output information on each ref" +msgid "Produce a merge commit message" msgstr "" #: command-list.h:98 -msgid "Prepare patches for e-mail submission" +msgid "Output information on each ref" msgstr "" #: command-list.h:99 -msgid "Verifies the connectivity and validity of the objects in the database" +msgid "Prepare patches for e-mail submission" msgstr "" #: command-list.h:100 -msgid "Cleanup unnecessary files and optimize the local repository" +msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" #: command-list.h:101 -msgid "Extract commit ID from an archive created using git-archive" +msgid "Cleanup unnecessary files and optimize the local repository" msgstr "" #: command-list.h:102 -msgid "Print lines matching a pattern" +msgid "Extract commit ID from an archive created using git-archive" msgstr "" #: command-list.h:103 -msgid "A portable graphical interface to Git" +msgid "Print lines matching a pattern" msgstr "" #: command-list.h:104 -msgid "Compute object ID and optionally creates a blob from a file" +msgid "A portable graphical interface to Git" msgstr "" #: command-list.h:105 -msgid "Display help information about Git" +msgid "Compute object ID and optionally creates a blob from a file" msgstr "" #: command-list.h:106 -msgid "Server side implementation of Git over HTTP" +msgid "Display help information about Git" msgstr "" #: command-list.h:107 -msgid "Download from a remote Git repository via HTTP" +msgid "Server side implementation of Git over HTTP" msgstr "" #: command-list.h:108 -msgid "Push objects over HTTP/DAV to another repository" +msgid "Download from a remote Git repository via HTTP" msgstr "" #: command-list.h:109 -msgid "Send a collection of patches from stdin to an IMAP folder" +msgid "Push objects over HTTP/DAV to another repository" msgstr "" #: command-list.h:110 -msgid "Build pack index file for an existing packed archive" +msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "" #: command-list.h:111 -msgid "Create an empty Git repository or reinitialize an existing one" +msgid "Build pack index file for an existing packed archive" msgstr "" #: command-list.h:112 -msgid "Instantly browse your working repository in gitweb" +msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" #: command-list.h:113 -msgid "Add or parse structured information in commit messages" +msgid "Instantly browse your working repository in gitweb" msgstr "" #: command-list.h:114 -msgid "The Git repository browser" +msgid "Add or parse structured information in commit messages" msgstr "" #: command-list.h:115 -msgid "Show commit logs" +msgid "The Git repository browser" msgstr "" #: command-list.h:116 -msgid "Show information about files in the index and the working tree" +msgid "Show commit logs" msgstr "" #: command-list.h:117 -msgid "List references in a remote repository" +msgid "Show information about files in the index and the working tree" msgstr "" #: command-list.h:118 -msgid "List the contents of a tree object" +msgid "List references in a remote repository" msgstr "" #: command-list.h:119 -msgid "Extracts patch and authorship from a single e-mail message" +msgid "List the contents of a tree object" msgstr "" #: command-list.h:120 -msgid "Simple UNIX mbox splitter program" +msgid "Extracts patch and authorship from a single e-mail message" msgstr "" #: command-list.h:121 -msgid "Join two or more development histories together" +msgid "Simple UNIX mbox splitter program" msgstr "" #: command-list.h:122 -msgid "Find as good common ancestors as possible for a merge" +msgid "Run tasks to optimize Git repository data" msgstr "" #: command-list.h:123 -msgid "Run a three-way file merge" +msgid "Join two or more development histories together" msgstr "" #: command-list.h:124 -msgid "Run a merge for files needing merging" +msgid "Find as good common ancestors as possible for a merge" msgstr "" #: command-list.h:125 -msgid "The standard helper program to use with git-merge-index" +msgid "Run a three-way file merge" msgstr "" #: command-list.h:126 -msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgid "Run a merge for files needing merging" msgstr "" #: command-list.h:127 -msgid "Show three-way merge without touching index" +msgid "The standard helper program to use with git-merge-index" msgstr "" #: command-list.h:128 -msgid "Write and verify multi-pack-indexes" +msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" #: command-list.h:129 -msgid "Creates a tag object" +msgid "Show three-way merge without touching index" msgstr "" #: command-list.h:130 -msgid "Build a tree-object from ls-tree formatted text" +msgid "Write and verify multi-pack-indexes" msgstr "" #: command-list.h:131 -msgid "Move or rename a file, a directory, or a symlink" +msgid "Creates a tag object" msgstr "" #: command-list.h:132 -msgid "Find symbolic names for given revs" +msgid "Build a tree-object from ls-tree formatted text" msgstr "" #: command-list.h:133 -msgid "Add or inspect object notes" +msgid "Move or rename a file, a directory, or a symlink" msgstr "" #: command-list.h:134 -msgid "Import from and submit to Perforce repositories" +msgid "Find symbolic names for given revs" msgstr "" #: command-list.h:135 -msgid "Create a packed archive of objects" +msgid "Add or inspect object notes" msgstr "" #: command-list.h:136 -msgid "Find redundant pack files" +msgid "Import from and submit to Perforce repositories" msgstr "" #: command-list.h:137 -msgid "Pack heads and tags for efficient repository access" +msgid "Create a packed archive of objects" msgstr "" #: command-list.h:138 -msgid "Routines to help parsing remote repository access parameters" +msgid "Find redundant pack files" msgstr "" #: command-list.h:139 -msgid "Compute unique ID for a patch" +msgid "Pack heads and tags for efficient repository access" msgstr "" #: command-list.h:140 -msgid "Prune all unreachable objects from the object database" +msgid "Routines to help parsing remote repository access parameters" msgstr "" #: command-list.h:141 -msgid "Remove extra objects that are already in pack files" +msgid "Compute unique ID for a patch" msgstr "" #: command-list.h:142 -msgid "Fetch from and integrate with another repository or a local branch" +msgid "Prune all unreachable objects from the object database" msgstr "" #: command-list.h:143 -msgid "Update remote refs along with associated objects" +msgid "Remove extra objects that are already in pack files" msgstr "" #: command-list.h:144 -msgid "Applies a quilt patchset onto the current branch" +msgid "Fetch from and integrate with another repository or a local branch" msgstr "" #: command-list.h:145 -msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgid "Update remote refs along with associated objects" msgstr "" #: command-list.h:146 -msgid "Reads tree information into the index" +msgid "Applies a quilt patchset onto the current branch" msgstr "" #: command-list.h:147 -msgid "Reapply commits on top of another base tip" +msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "" #: command-list.h:148 -msgid "Receive what is pushed into the repository" +msgid "Reads tree information into the index" msgstr "" #: command-list.h:149 -msgid "Manage reflog information" +msgid "Reapply commits on top of another base tip" msgstr "" #: command-list.h:150 -msgid "Manage set of tracked repositories" +msgid "Receive what is pushed into the repository" msgstr "" #: command-list.h:151 -msgid "Pack unpacked objects in a repository" +msgid "Manage reflog information" msgstr "" #: command-list.h:152 -msgid "Create, list, delete refs to replace objects" +msgid "Manage set of tracked repositories" msgstr "" #: command-list.h:153 -msgid "Generates a summary of pending changes" +msgid "Pack unpacked objects in a repository" msgstr "" #: command-list.h:154 -msgid "Reuse recorded resolution of conflicted merges" +msgid "Create, list, delete refs to replace objects" msgstr "" #: command-list.h:155 -msgid "Reset current HEAD to the specified state" +msgid "Generates a summary of pending changes" msgstr "" #: command-list.h:156 -msgid "Restore working tree files" +msgid "Reuse recorded resolution of conflicted merges" msgstr "" #: command-list.h:157 -msgid "Revert some existing commits" +msgid "Reset current HEAD to the specified state" msgstr "" #: command-list.h:158 -msgid "Lists commit objects in reverse chronological order" +msgid "Restore working tree files" msgstr "" #: command-list.h:159 -msgid "Pick out and massage parameters" +msgid "Revert some existing commits" msgstr "" #: command-list.h:160 -msgid "Remove files from the working tree and from the index" +msgid "Lists commit objects in reverse chronological order" msgstr "" #: command-list.h:161 -msgid "Send a collection of patches as emails" +msgid "Pick out and massage parameters" msgstr "" #: command-list.h:162 -msgid "Push objects over Git protocol to another repository" +msgid "Remove files from the working tree and from the index" msgstr "" #: command-list.h:163 -msgid "Restricted login shell for Git-only SSH access" +msgid "Send a collection of patches as emails" msgstr "" #: command-list.h:164 -msgid "Summarize 'git log' output" +msgid "Push objects over Git protocol to another repository" msgstr "" #: command-list.h:165 -msgid "Show various types of objects" +msgid "Restricted login shell for Git-only SSH access" msgstr "" #: command-list.h:166 -msgid "Show branches and their commits" +msgid "Summarize 'git log' output" msgstr "" #: command-list.h:167 -msgid "Show packed archive index" +msgid "Show various types of objects" msgstr "" #: command-list.h:168 -msgid "List references in a local repository" +msgid "Show branches and their commits" msgstr "" #: command-list.h:169 -msgid "Git's i18n setup code for shell scripts" +msgid "Show packed archive index" msgstr "" #: command-list.h:170 -msgid "Common Git shell script setup code" +msgid "List references in a local repository" msgstr "" #: command-list.h:171 -msgid "Stash the changes in a dirty working directory away" +msgid "Git's i18n setup code for shell scripts" msgstr "" #: command-list.h:172 -msgid "Add file contents to the staging area" +msgid "Common Git shell script setup code" msgstr "" #: command-list.h:173 -msgid "Show the working tree status" +msgid "Initialize and modify the sparse-checkout" msgstr "" #: command-list.h:174 -msgid "Remove unnecessary whitespace" +msgid "Stash the changes in a dirty working directory away" msgstr "" #: command-list.h:175 -msgid "Initialize, update or inspect submodules" +msgid "Add file contents to the staging area" msgstr "" #: command-list.h:176 -msgid "Bidirectional operation between a Subversion repository and Git" +msgid "Show the working tree status" msgstr "" #: command-list.h:177 -msgid "Switch branches" +msgid "Remove unnecessary whitespace" msgstr "" #: command-list.h:178 -msgid "Read, modify and delete symbolic refs" +msgid "Initialize, update or inspect submodules" msgstr "" #: command-list.h:179 -msgid "Create, list, delete or verify a tag object signed with GPG" +msgid "Bidirectional operation between a Subversion repository and Git" msgstr "" #: command-list.h:180 -msgid "Creates a temporary file with a blob's contents" +msgid "Switch branches" msgstr "" #: command-list.h:181 -msgid "Unpack objects from a packed archive" +msgid "Read, modify and delete symbolic refs" msgstr "" #: command-list.h:182 -msgid "Register file contents in the working tree to the index" +msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" #: command-list.h:183 -msgid "Update the object name stored in a ref safely" +msgid "Creates a temporary file with a blob's contents" msgstr "" #: command-list.h:184 -msgid "Update auxiliary info file to help dumb servers" +msgid "Unpack objects from a packed archive" msgstr "" #: command-list.h:185 -msgid "Send archive back to git-archive" +msgid "Register file contents in the working tree to the index" msgstr "" #: command-list.h:186 -msgid "Send objects packed back to git-fetch-pack" +msgid "Update the object name stored in a ref safely" msgstr "" #: command-list.h:187 -msgid "Show a Git logical variable" +msgid "Update auxiliary info file to help dumb servers" msgstr "" #: command-list.h:188 -msgid "Check the GPG signature of commits" +msgid "Send archive back to git-archive" msgstr "" #: command-list.h:189 -msgid "Validate packed Git archive files" +msgid "Send objects packed back to git-fetch-pack" msgstr "" #: command-list.h:190 -msgid "Check the GPG signature of tags" +msgid "Show a Git logical variable" msgstr "" #: command-list.h:191 -msgid "Git web interface (web frontend to Git repositories)" +msgid "Check the GPG signature of commits" msgstr "" #: command-list.h:192 -msgid "Show logs with difference each commit introduces" +msgid "Validate packed Git archive files" msgstr "" #: command-list.h:193 -msgid "Manage multiple working trees" +msgid "Check the GPG signature of tags" msgstr "" #: command-list.h:194 -msgid "Create a tree object from the current index" +msgid "Git web interface (web frontend to Git repositories)" msgstr "" #: command-list.h:195 -msgid "Defining attributes per path" +msgid "Show logs with difference each commit introduces" msgstr "" #: command-list.h:196 -msgid "Git command-line interface and conventions" +msgid "Manage multiple working trees" msgstr "" #: command-list.h:197 -msgid "A Git core tutorial for developers" +msgid "Create a tree object from the current index" msgstr "" #: command-list.h:198 -msgid "Git for CVS users" +msgid "Defining attributes per path" msgstr "" #: command-list.h:199 -msgid "Tweaking diff output" +msgid "Git command-line interface and conventions" msgstr "" #: command-list.h:200 -msgid "A useful minimum set of commands for Everyday Git" +msgid "A Git core tutorial for developers" msgstr "" #: command-list.h:201 -msgid "A Git Glossary" +msgid "Providing usernames and passwords to Git" msgstr "" #: command-list.h:202 -msgid "Hooks used by Git" +msgid "Git for CVS users" msgstr "" #: command-list.h:203 -msgid "Specifies intentionally untracked files to ignore" +msgid "Tweaking diff output" msgstr "" #: command-list.h:204 -msgid "Defining submodule properties" +msgid "A useful minimum set of commands for Everyday Git" msgstr "" #: command-list.h:205 -msgid "Git namespaces" +msgid "Frequently asked questions about using Git" msgstr "" #: command-list.h:206 -msgid "Git Repository Layout" +msgid "A Git Glossary" msgstr "" #: command-list.h:207 -msgid "Specifying revisions and ranges for Git" +msgid "Hooks used by Git" msgstr "" #: command-list.h:208 -msgid "A tutorial introduction to Git: part two" +msgid "Specifies intentionally untracked files to ignore" msgstr "" #: command-list.h:209 -msgid "A tutorial introduction to Git" +msgid "Defining submodule properties" msgstr "" #: command-list.h:210 -msgid "An overview of recommended workflows with Git" +msgid "Git namespaces" msgstr "" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" msgstr "" -#. 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]? " +#: command-list.h:212 +msgid "Git Repository Layout" msgstr "" -#: git-bisect.sh:101 +#: command-list.h:213 +msgid "Specifying revisions and ranges for Git" +msgstr "" + +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "" + +#: command-list.h:215 +msgid "A tutorial introduction to Git: part two" +msgstr "" + +#: command-list.h:216 +msgid "A tutorial introduction to Git" +msgstr "" + +#: command-list.h:217 +msgid "An overview of recommended workflows with Git" +msgstr "" + +#: git-bisect.sh:79 #, sh-format msgid "Bad rev input: $arg" msgstr "" -#: git-bisect.sh:121 +#: git-bisect.sh:99 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "" -#: git-bisect.sh:130 +#: git-bisect.sh:108 #, sh-format msgid "Bad rev input: $rev" msgstr "" -#: git-bisect.sh:139 +#: git-bisect.sh:117 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "" -#: git-bisect.sh:209 +#: git-bisect.sh:149 msgid "No logfile given" msgstr "" -#: git-bisect.sh:210 +#: git-bisect.sh:150 #, sh-format msgid "cannot read $file for replaying" msgstr "" -#: git-bisect.sh:232 +#: git-bisect.sh:173 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:241 +#: git-bisect.sh:183 msgid "bisect run failed: no command provided." msgstr "" -#: git-bisect.sh:246 +#: git-bisect.sh:188 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:253 +#: git-bisect.sh:195 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:279 +#: git-bisect.sh:221 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:285 +#: git-bisect.sh:227 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -#: git-bisect.sh:292 +#: git-bisect.sh:234 msgid "bisect run success" msgstr "" -#: git-bisect.sh:300 +#: git-bisect.sh:242 msgid "We are not bisecting." msgstr "" @@ -20698,136 +22653,46 @@ msgstr "" msgid "Simple merge did not work, trying automatic merge." msgstr "" -#: git-legacy-stash.sh:220 -msgid "Cannot remove temporary index (can't happen)" -msgstr "" - -#: git-legacy-stash.sh:271 -#, sh-format -msgid "Cannot update $ref_stash with $w_commit" -msgstr "" - -#: git-legacy-stash.sh:323 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "" - -#: git-legacy-stash.sh:355 -#, sh-format -msgid "Saved working directory and index state $stash_msg" -msgstr "" - -#: git-legacy-stash.sh:535 -#, sh-format -msgid "unknown option: $opt" -msgstr "" - -#: git-legacy-stash.sh:555 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "" - -#: git-legacy-stash.sh:570 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "" - -#: git-legacy-stash.sh:598 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "" - -#: git-legacy-stash.sh:609 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "" - -#: git-legacy-stash.sh:617 -msgid "unable to refresh index" -msgstr "" - -#: git-legacy-stash.sh:621 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "" - -#: git-legacy-stash.sh:629 -msgid "Conflicts in index. Try without --index." -msgstr "" - -#: git-legacy-stash.sh:631 -msgid "Could not save index tree" -msgstr "" - -#: git-legacy-stash.sh:640 -msgid "Could not restore untracked files from stash entry" -msgstr "" - -#: git-legacy-stash.sh:665 -msgid "Cannot unstage modified files" -msgstr "" - -#: git-legacy-stash.sh:703 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "" - -#: git-legacy-stash.sh:704 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "" - -#: git-legacy-stash.sh:791 -msgid "(To restore them type \"git stash apply\")" -msgstr "" - -#: git-submodule.sh:200 +#: git-submodule.sh:180 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:210 +#: git-submodule.sh:190 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:229 +#: git-submodule.sh:209 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:232 +#: git-submodule.sh:212 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "" -#: git-submodule.sh:239 +#: git-submodule.sh:219 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "" -#: 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 +#: git-submodule.sh:250 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:270 +#: git-submodule.sh:252 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:278 +#: git-submodule.sh:260 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:280 +#: git-submodule.sh:262 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -20838,126 +22703,102 @@ msgid "" "option." msgstr "" -#: git-submodule.sh:286 +#: git-submodule.sh:268 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:298 +#: git-submodule.sh:280 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:303 +#: git-submodule.sh:285 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:312 +#: git-submodule.sh:294 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:573 +#: git-submodule.sh:567 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:583 +#: git-submodule.sh:577 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:588 +#: git-submodule.sh:582 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:606 +#: git-submodule.sh:600 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "" -#: git-submodule.sh:612 +#: git-submodule.sh:606 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:619 +#: git-submodule.sh:613 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:620 +#: git-submodule.sh:614 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:624 +#: git-submodule.sh:618 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:625 +#: git-submodule.sh:619 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:630 +#: git-submodule.sh:624 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:631 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:636 +#: git-submodule.sh:630 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:637 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:668 +#: git-submodule.sh:662 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:830 -msgid "The --cached option cannot be used with the --files option" -msgstr "" - -#: git-submodule.sh:882 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "" - -#: git-submodule.sh:902 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr "" - -#: git-submodule.sh:905 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr "" - -#: git-submodule.sh:908 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" - #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." @@ -20972,12 +22813,19 @@ msgstr "" msgid "Cannot store $stash_sha1" msgstr "" +#: git-rebase--preserve-merges.sh:113 +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 "" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -20998,7 +22846,7 @@ msgid "" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -21010,83 +22858,83 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "" msgstr[1] "" -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "" -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -21096,31 +22944,31 @@ msgid "" "you are able to reword the commit." msgstr "" -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "" -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -21128,7 +22976,7 @@ msgid "" msgstr "" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -21138,25 +22986,25 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "" -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "" -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -21174,50 +23022,54 @@ msgid "" " git rebase --continue\n" msgstr "" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "" -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "" msgstr[1] "" -#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:945 +msgid "Note that empty commits are commented out" +msgstr "" + +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "" @@ -21279,122 +23131,56 @@ 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:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "" -#: 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 +#: git-add--interactive.perl:634 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "" msgstr[1] "" -#: 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 +#: git-add--interactive.perl:1058 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "" -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1061 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "" -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1064 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "" -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "" -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1116 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "" -#: git-add--interactive.perl:1110 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "" - -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1123 #, perl-format msgid "" "---\n" @@ -21403,31 +23189,12 @@ msgid "" "Lines starting with %s will be removed.\n" msgstr "" -#. 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 +#: git-add--interactive.perl:1145 #, perl-format msgid "failed to open hunk edit file for reading: %s" 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. -#: 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 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -21436,7 +23203,7 @@ msgid "" "d - do not stage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -21445,7 +23212,7 @@ msgid "" "d - do not stash this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -21454,7 +23221,7 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -21463,7 +23230,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -21472,7 +23239,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -21481,7 +23248,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1282 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -21490,7 +23257,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1294 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -21499,7 +23266,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1309 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -21512,226 +23279,90 @@ msgid "" "? - print help\n" msgstr "" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1347 msgid "The selected hunks do not apply to the index!\n" msgstr "" -#: 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 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "" -#: 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 +#: git-add--interactive.perl:1481 #, 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,?]? " +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1466 +#: git-add--interactive.perl:1482 #, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1467 +#: git-add--interactive.perl:1483 #, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1484 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "" -#: 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 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1624 #, 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:1617 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "" - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1738 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1748 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:1771 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -21742,19 +23373,19 @@ msgid "" "changes\n" msgstr "" -#: 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 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 msgid "missing --" msgstr "" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1861 #, perl-format msgid "unknown --patch mode: %s" msgstr "" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 #, perl-format msgid "invalid argument %s, expecting --" msgstr "" @@ -21771,62 +23402,69 @@ msgstr "" msgid "the editor exited uncleanly, aborting everything" msgstr "" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "" -#: git-send-email.perl:484 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "" -#: git-send-email.perl:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -21836,36 +23474,36 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -21874,37 +23512,37 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "" -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "" -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -21913,20 +23551,20 @@ msgid "" "want to send.\n" msgstr "" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "" -#: git-send-email.perl:975 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -#: git-send-email.perl:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "" @@ -21934,16 +23572,16 @@ msgstr "" #. 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 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -21960,128 +23598,128 @@ msgstr "" #. 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 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "" -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "" -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1718 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1753 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1864 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "" -#: git-send-email.perl:1871 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "" -#: git-send-email.perl:1875 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "" -#: git-send-email.perl:1905 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "" -#: git-send-email.perl:1913 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "" -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "" -#: git-send-email.perl:1957 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "" -#: git-send-email.perl:1974 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1978 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "" diff --git a/third_party/git/po/it.po b/third_party/git/po/it.po index 30ec99c744..8f793659f5 100644 --- a/third_party/git/po/it.po +++ b/third_party/git/po/it.po @@ -1,18 +1,18 @@ # Italian translations for Git. # Copyright (C) 2012 Marco Paolone <marcopaolone@gmail.com> -# Copyright ยฉ 2018-2019 Alessandro Menti <alessandro.menti@alessandromenti.it> +# Copyright ยฉ 2018-2020 Alessandro Menti <alessandro.menti@alessandromenti.it> # This file is distributed under the same license as the Git package. # # 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. +# Alessandro Menti <alessandro.menti@alessandromenti.it>, 2020. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-08-10 20:12+0800\n" -"PO-Revision-Date: 2019-08-11 11:48+0200\n" +"POT-Creation-Date: 2020-10-10 09:32+0800\n" +"PO-Revision-Date: 2020-10-10 09:31+0200\n" "Last-Translator: Alessandro Menti <alessandro.menti@alessandromenti.it>\n" "Language-Team: Italian <>\n" "Language: it\n" @@ -20,51 +20,805 @@ 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.04.3\n" +"X-Generator: Lokalize 20.08.1\n" -#: advice.c:109 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "Eh (%s)?" + +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +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 reset.c:89 sequencer.c:3444 +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:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, 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:1738 git-add--interactive.perl:1371 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Sono stati modificati solo file binari.\n" + +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "Nessuna modifica.\n" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "Aggiornamento patch" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +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:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "*** Comandi ***" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +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:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: 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:781 git-add--interactive.perl:1805 +#, c-format +msgid "Bye.\n" +msgstr "Ciao.\n" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, 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:35 git-add--interactive.perl:1434 +#, 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:36 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "Aggiunta stage [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, 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:39 +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:42 +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:56 git-add--interactive.perl:1439 +#, 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:57 git-add--interactive.perl:1440 +#, 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:58 git-add--interactive.perl:1441 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "Aggiunta stash [y,n,q,a,d%s,?]? " + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, 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:61 +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:64 +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:80 git-add--interactive.perl:1445 +#, 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:81 git-add--interactive.perl:1446 +#, 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:82 git-add--interactive.perl:1447 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "Rimozione aggiunta dall'area di staging [y,n,q,a,d%s,?]? " + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, 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:85 +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:88 +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:103 git-add--interactive.perl:1451 +#, 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:104 git-add--interactive.perl:1452 +#, 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:105 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "Applicare l'aggiunta all'indice [y,n,q,a,d%s,?]? " + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, 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:108 add-patch.c:176 add-patch.c:221 +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:111 +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:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, 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:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, 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:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "Scartare l'aggiunta dall'albero di lavoro [y,n,q,a,d%s,?]? " + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, 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:131 add-patch.c:154 add-patch.c:199 +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:134 add-patch.c:202 +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:149 add-patch.c:194 git-add--interactive.perl:1463 +#, 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:150 add-patch.c:195 git-add--interactive.perl:1464 +#, 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:151 add-patch.c:196 git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Scartare l'aggiunta dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, 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:157 +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:171 add-patch.c:216 git-add--interactive.perl:1469 +#, 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:172 add-patch.c:217 git-add--interactive.perl:1470 +#, 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:173 add-patch.c:218 git-add--interactive.perl:1471 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Applicare l'aggiunta all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, 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:179 +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:224 +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:342 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "impossibile analizzare l'header hunk '%.*s'" + +#: add-patch.c:361 add-patch.c:365 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "impossibile analizzare l'header hunk colorato '%.*s'" + +#: add-patch.c:419 +msgid "could not parse diff" +msgstr "impossibile analizzare il diff" + +#: add-patch.c:438 +msgid "could not parse colored diff" +msgstr "impossibile analizzare il diff colorato" + +#: add-patch.c:452 +#, c-format +msgid "failed to run '%s'" +msgstr "esecuzione di '%s' non riuscita" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "output di interactive.diffFilter non corrispondente" + +#: add-patch.c:612 +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:785 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"attesa riga contesto %d in\n" +"%.*s" + +#: add-patch.c:800 +#, 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:1076 git-add--interactive.perl:1117 +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:1080 +#, 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:1094 git-add--interactive.perl:1131 +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:1127 +msgid "could not parse hunk header" +msgstr "impossibile analizzare l'header hunk" + +#: add-patch.c:1172 +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:1241 git-add--interactive.perl:1244 +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:1284 +msgid "The selected hunks do not apply to the index!" +msgstr "Gli hunk selezionati non si applicano senza problemi all'indice!" + +#: add-patch.c:1285 git-add--interactive.perl:1348 +msgid "Apply them to the worktree anyway? " +msgstr "Vuoi comunque applicarli all'albero di lavoro? " + +#: add-patch.c:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "Non รจ stato applicato nulla.\n" + +#: add-patch.c:1349 +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:1511 add-patch.c:1521 +msgid "No previous hunk" +msgstr "Nessun hunk precedente" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No next hunk" +msgstr "Nessun hunk successivo" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "Nessun altro hunk a cui andare" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "a quale hunk desideri andare (premi <Invio> per vederne altri)? " + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "a quale hunk desideri andare? " + +#: add-patch.c:1555 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Numero non valido: '%s'" + +#: add-patch.c:1560 +#, 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:1569 +msgid "No other hunks to search" +msgstr "Nessun altro hunk in cui eseguire la ricerca" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "cercare un'espressione regolare? " + +#: add-patch.c:1590 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Espressione regolare di ricerca %s malformata: %s" + +#: add-patch.c:1607 +msgid "No hunk matches the given pattern" +msgstr "Nessun hunk corrisponde al pattern fornito" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "Mi dispiace, non posso suddividere quest'hunk" + +#: add-patch.c:1618 +#, c-format +msgid "Split into %d hunks." +msgstr "Suddiviso in %d hunk." + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "Mi dispiace, non posso modificare quest'hunk" + +#: add-patch.c:1674 +msgid "'git apply' failed" +msgstr "'git apply' non riuscito" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" +"\n" +"Per disabilitare questo messaggio, esegui \"git config advice.%s false\"" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "%ssuggerimento: %.*s%s\n" -#: advice.c:162 +#: advice.c:247 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:164 +#: advice.c:249 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:166 +#: advice.c:251 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:168 +#: advice.c:253 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:170 +#: advice.c:255 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:172 +#: advice.c:257 #, 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:180 +#: advice.c:265 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." @@ -72,23 +826,23 @@ msgstr "" "Correggili nell'albero di lavoro, quindi usa 'git add/rm <file>...' come " "appropriato per risolverli ed esegui un commit." -#: advice.c:188 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "Esco a causa di un conflitto non risolto." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:278 builtin/merge.c:1349 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Il merge non รจ stato concluso (esiste MERGE_HEAD)." -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "Esegui il commit delle modifiche prima di eseguire il merge." -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "Esco a causa di un merge non terminato." -#: advice.c:202 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -219,17 +973,7 @@ 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: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 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -244,82 +988,92 @@ msgstr[1] "" "l'intestazione git diff non riporta le informazioni sul file una volta " "rimossi %d componenti iniziali del percorso (riga %d)" -#: apply.c:1564 +#: apply.c:1385 #, 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:1752 +#: 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 msgid "new file depends on old contents" msgstr "il nuovo file dipende da vecchi contenuti" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "il file eliminato ha ancora dei contenuti" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrotta alla riga %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "il nuovo file %s dipende da vecchi contenuti" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "il file eliminato %s ha ancora dei contenuti" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attenzione: il file %s diventa vuoto ma non รจ eliminato" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaria corrotta alla riga %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaria non riconosciuta alla riga %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "patch con soli contenuti garbage alla riga %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "impossibile leggere il collegamento simbolico %s" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "impossibile aprire o leggere %s" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "inizio della riga non valido: '%c'" -#: apply.c:3046 +#: 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] "Applicazione frammento %d riuscita alla riga %d (offset: %d riga)." msgstr[1] "Applicazione frammento %d riuscita alla riga %d (offset: %d righe)." -#: apply.c:3058 +#: apply.c:3069 #, 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:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -328,26 +1082,26 @@ msgstr "" "durante la ricerca di:\n" "%.*s" -#: apply.c:3086 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "dati della patch binaria mancanti per '%s'" -#: apply.c:3094 +#: apply.c:3105 #, 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:3141 +#: apply.c:3152 #, 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:3151 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -355,435 +1109,465 @@ msgstr "" "la patch si applica a '%s' (%s), che non corrisponde ai contenuti correnti " "del file." -#: apply.c:3159 +#: apply.c:3171 #, 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:3177 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "impossibile leggere la postimmagine %s necessaria per '%s'" -#: apply.c:3190 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "la patch binaria non si applica correttamente a '%s'" -#: apply.c:3196 +#: apply.c:3209 #, 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:3217 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "patch non riuscita: %s:%ld" -#: apply.c:3340 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "impossibile eseguire il checkout di '%s'" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 #, c-format msgid "failed to read %s" msgstr "lettura di %s non riuscita" -#: apply.c:3400 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lettura di '%s' oltre un collegamento simbolico" -#: apply.c:3429 apply.c:3672 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "il percorso %s รจ stato rinominato/eliminato" -#: apply.c:3515 apply.c:3687 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s: non esiste nell'indice" -#: apply.c:3524 apply.c:3695 +#: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" msgstr "%s: non corrisponde all'indice" -#: apply.c:3559 +#: apply.c:3572 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:3562 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Ripiego sul merge a tre vie...\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossibile leggere i contenuti correnti di '%s'" -#: apply.c:3594 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Ripiego sul merge a tre vie non riuscito...\n" -#: apply.c:3608 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch applicata a '%s' con conflitti.\n" -#: apply.c:3613 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch '%s' applicata correttamente.\n" -#: apply.c:3639 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "la rimozione della patch lascia contenuti del file" -#: apply.c:3712 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: tipo errato" -#: apply.c:3714 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ha il tipo %o, atteso %o" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "percorso '%s' non valido" -#: apply.c:3923 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s: esiste giร nell'indice" -#: apply.c:3926 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s: esiste giร nella directory di lavoro" -#: apply.c:3946 +#: apply.c:3976 #, 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:3951 +#: apply.c:3981 #, 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:3971 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "il file interessato '%s' si trova oltre un collegamento simbolico" -#: apply.c:3975 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s: la patch non si applica correttamente" -#: apply.c:3990 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "Controllo della patch %s in corso..." -#: apply.c:4082 +#: apply.c:4112 #, 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:4089 +#: apply.c:4119 #, 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:4092 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "le informazioni SHA1 sono mancanti o inutili (%s)." -#: 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 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "impossibile aggiungere %s all'indice temporaneo" -#: apply.c:4111 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "impossibile scrivere l'indice temporaneo in %s" -#: apply.c:4249 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "impossibile rimuovere %s dall'indice" -#: apply.c:4283 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrotta per il sottomodulo %s" -#: apply.c:4289 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "impossibile eseguire lo stat del file appena creato '%s'" -#: apply.c:4297 +#: apply.c:4327 #, 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:4303 apply.c:4448 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "impossibile aggiungere la voce della cache per %s" -#: apply.c:4346 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "scrittura in '%s' non riuscita" -#: apply.c:4350 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "chiusura del file '%s' in corso" -#: apply.c:4420 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "impossibile scrivere il file '%s' con modo %o" -#: apply.c:4518 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s applicata correttamente." -#: apply.c:4526 +#: apply.c:4556 msgid "internal error" msgstr "errore interno" -#: apply.c:4529 +#: apply.c:4559 #, 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:4540 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "nome file .rej troncato a %.*s.rej" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "impossibile aprire %s" -#: apply.c:4562 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Frammento %d applicato correttamente." -#: apply.c:4566 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "Frammento %d respinto." -#: apply.c:4676 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ignorata." -#: apply.c:4684 +#: apply.c:4723 msgid "unrecognized input" msgstr "input non riconosciuto" -#: apply.c:4704 +#: apply.c:4743 msgid "unable to read index file" msgstr "impossibile leggere il file index" -#: apply.c:4859 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "impossibile aprire la patch '%s': %s" -#: apply.c:4886 +#: apply.c:4927 #, 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:4892 apply.c:4907 +#: apply.c:4933 apply.c:4948 #, 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:4900 +#: apply.c:4941 #, 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:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Impossibile scrivere il nuovo file index" -#: 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 +#: apply.c:4985 msgid "don't apply changes matching the given path" msgstr "non applicare le modifiche corrispondenti al percorso specificato" -#: apply.c:4947 +#: apply.c:4988 msgid "apply changes matching the given path" msgstr "applica le modifiche corrispondenti al percorso specificato" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "num" -#: apply.c:4950 +#: apply.c:4991 msgid "remove <num> leading slashes from traditional diff paths" msgstr "rimuovi <num> barre iniziali dai percorsi diff tradizionali" -#: apply.c:4953 +#: apply.c:4994 msgid "ignore additions made by the patch" msgstr "ignora le aggiunte create dalla patch" -#: apply.c:4955 +#: apply.c:4996 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:4959 +#: apply.c:5000 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:4961 +#: apply.c:5002 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:4963 +#: apply.c:5004 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:4965 +#: apply.c:5006 msgid "make sure the patch is applicable to the current index" msgstr "assicura che la patch sia applicabile all'indice corrente" -#: apply.c:4967 +#: apply.c:5008 msgid "mark new files with `git add --intent-to-add`" msgstr "contrassegna i nuovi file con `git add --intent-to-add`" -#: apply.c:4969 +#: apply.c:5010 msgid "apply a patch without touching the working tree" msgstr "applica una patch senza modificare l'albero di lavoro" -#: apply.c:4971 +#: apply.c:5012 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:4974 +#: apply.c:5015 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "applica anche la patch (da usare con --stat/--summary/--check)" -#: apply.c:4976 +#: apply.c:5017 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:4978 +#: apply.c:5019 msgid "build a temporary index based on embedded index information" msgstr "compila un index temporaneo basato sulle informazioni indice incluse" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "i percorsi sono separati con un carattere NUL" -#: apply.c:4983 +#: apply.c:5024 msgid "ensure at least <n> lines of context match" msgstr "assicura che almeno <n> righe di contesto corrispondano" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "azione" -#: apply.c:4985 +#: apply.c:5026 msgid "detect new or modified lines that have whitespace errors" msgstr "rileva righe nuove o modificate che hanno errori di spazi bianchi" -#: apply.c:4988 apply.c:4991 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" msgstr "ignora modifiche agli spazi bianchi durante la ricerca dei contesti" -#: apply.c:4994 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "applica la patch in maniera inversa" -#: apply.c:4996 +#: apply.c:5037 msgid "don't expect at least one line of context" msgstr "non aspettare almeno una riga di contesto" -#: apply.c:4998 +#: apply.c:5039 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lascia i frammenti respinti nei file *.rej corrispondenti" -#: apply.c:5000 +#: apply.c:5041 msgid "allow overlapping hunks" msgstr "consenti la sovrapposizione dei frammenti" -#: 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 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "visualizza ulteriori dettagli" -#: apply.c:5003 +#: apply.c:5044 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:5006 +#: apply.c:5047 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:5008 builtin/am.c:2205 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "radice" -#: apply.c:5009 +#: apply.c:5050 msgid "prepend <root> to all filenames" msgstr "anteponi <radice> a tutti i nomi file" +#: 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:265 archive-zip.c:358 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "modo file non supportato: 0%o (SHA1: %s)" + +#: archive-tar.c:449 +#, c-format +msgid "unable to start '%s' filter" +msgstr "impossibile avviare il filtro '%s'" + +#: archive-tar.c:452 +msgid "unable to redirect descriptor" +msgstr "impossibile ridirezionare il descrittore" + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "il filtro '%s' ha segnalato un errore" + +#: archive-zip.c:318 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "il percorso non รจ codificato validamente in UTF-8: %s" + +#: archive-zip.c:322 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "percorso troppo lungo (%d caratteri, SHA1: %s): %s" + +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "errore deflate (%d)" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "timestamp troppo grande per questo sistema: %<PRIuMAX>" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<opzioni>] <albero> [<percorso>...]" @@ -803,182 +1587,164 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repository> [--exec <comando>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "impossibile leggere %s" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "impossibile leggere '%s'" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "lo specificatore percorso '%s' non corrisponde ad alcun file" -#: archive.c:396 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "riferimento non esistente: %.*s" -#: archive.c:401 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "%s non รจ un nome oggetto valido" -#: archive.c:414 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "%s non รจ un oggetto albero valido" -#: archive.c:426 +#: archive.c:485 msgid "current working directory is untracked" msgstr "la directory di lavoro corrente non รจ tracciata" -#: archive.c:457 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "File non trovato: %s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "non รจ un file regolare: %s" + +#: archive.c:553 msgid "fmt" msgstr "fmt" -#: archive.c:457 +#: archive.c:553 msgid "archive format" msgstr "formato archivio" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "prefisso" -#: archive.c:459 +#: archive.c:555 msgid "prepend prefix to each pathname in the archive" msgstr "anteponi <prefisso> a ogni nome percorso nell'archivio" -#: 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 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "file" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "aggiungi il file non tracciato all'archivio" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "scrivi l'archivio in questo file" -#: archive.c:463 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr "leggi il file .gitattributes nella directory di lavoro" -#: archive.c:464 +#: archive.c:563 msgid "report archived files on stderr" msgstr "elenca i file archiviati sullo standard error" -#: archive.c:465 +#: archive.c:564 msgid "store only" msgstr "salva solamente" -#: archive.c:466 +#: archive.c:565 msgid "compress faster" msgstr "comprimi piรน velocemente" -#: archive.c:474 +#: archive.c:573 msgid "compress better" msgstr "comprimi meglio" -#: archive.c:477 +#: archive.c:576 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:1379 builtin/submodule--helper.c:1859 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "repository" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:579 builtin/archive.c:92 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:707 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "comando" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "percorso al comando remoto git-upload-archive" -#: archive.c:489 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "Opzione --remote inattesa" -#: archive.c:491 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "L'opzione --exec puรฒ essere usata solo con --remote" -#: archive.c:493 +#: archive.c:592 msgid "Unexpected option --output" msgstr "Opzione --output inattesa" -#: archive.c:515 +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" +msgstr "Le opzioni --add-file e --remote non possono essere usate insieme" + +#: archive.c:616 #, c-format msgid "Unknown archive format '%s'" msgstr "Formato archivio '%s' sconosciuto" -#: archive.c:522 +#: archive.c:623 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argomento non supportato per il formato '%s': -%d" -#: 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: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:287 archive-zip.c:353 -#, c-format -msgid "cannot read %s" -msgstr "impossibile leggere %s" - -#: archive-tar.c:459 -#, c-format -msgid "unable to start '%s' filter" -msgstr "impossibile avviare il filtro '%s'" - -#: archive-tar.c:462 -msgid "unable to redirect descriptor" -msgstr "impossibile ridirezionare il descrittore" - -#: archive-tar.c:469 -#, c-format -msgid "'%s' filter reported error" -msgstr "il filtro '%s' ha segnalato un errore" - -#: 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:318 -#, c-format -msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "percorso troppo lungo (%d caratteri, SHA1: %s): %s" - -#: 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:609 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "timestamp troppo grande per questo sistema: %<PRIuMAX>" - -#: attr.c:211 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s non รจ un nome attributo valido" -#: attr.c:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s non consentito: %s:%d" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -986,22 +1752,22 @@ msgstr "" "I pattern negativi sono ignorati negli attributi git\n" "Usa '\\!' per specificare letteralmente un punto esclamativo iniziale." -#: bisect.c:468 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenuto mal racchiuso fra virgolette nel file '%s': %s" -#: bisect.c:678 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "Impossibile eseguire un'ulteriore bisezione!\n" -#: bisect.c:733 +#: bisect.c:753 #, c-format msgid "Not a valid commit name %s" msgstr "%s non รจ un nome commit valido" -#: bisect.c:758 +#: bisect.c:778 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1010,7 +1776,7 @@ msgstr "" "La base del merge %s non funziona.\n" "Ciรฒ significa che il bug รจ stato corretto fra %s e [%s].\n" -#: bisect.c:763 +#: bisect.c:783 #, c-format msgid "" "The merge base %s is new.\n" @@ -1019,7 +1785,7 @@ msgstr "" "La base del merge %s รจ nuova.\n" "La proprietร รจ stata modificata fra %s e [%s].\n" -#: bisect.c:768 +#: bisect.c:788 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1028,7 +1794,7 @@ msgstr "" "La base del merge %s รจ %s.\n" "Ciรฒ significa che il primo commit '%s' รจ fra %s e [%s].\n" -#: bisect.c:776 +#: bisect.c:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1039,7 +1805,7 @@ msgstr "" "git bisect non puรฒ funzionare correttamente in questo caso.\n" "Forse hai confuso le revisioni %s con quelle %s?\n" -#: bisect.c:789 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1050,36 +1816,36 @@ msgstr "" "Non รจ possibile essere sicuri che il primo commit %s sia fra %s e %s.\n" "Continuo comunque." -#: bisect.c:822 +#: bisect.c:848 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisezione: dev'essere testata una base del merge\n" -#: bisect.c:865 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "รจ richiesta una revisione %s" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "impossibile creare il file '%s'" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "impossibile leggere il file '%s'" -#: bisect.c:958 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "lettura riferimenti della bisezione non riuscita" -#: bisect.c:977 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "%s era sia %s sia %s\n" -#: bisect.c:985 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" @@ -1088,7 +1854,7 @@ msgstr "" "Nessun commit testabile trovato.\n" "Forse hai iniziato il procedimento specificando parametri percorso errati?\n" -#: bisect.c:1004 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1098,7 +1864,7 @@ msgstr[1] "(circa %d passi)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1088 #, 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" @@ -1107,41 +1873,41 @@ msgstr[0] "" msgstr[1] "" "Bisezione in corso: %d revisioni rimanenti da testare dopo questa %s\n" -#: blame.c:2697 +#: blame.c:2778 msgid "--contents and --reverse do not blend well." msgstr "--contents e --reverse non sono compatibili." -#: blame.c:2711 +#: blame.c:2792 msgid "cannot use --contents with final commit object name" msgstr "impossibile usare --contents con il nome oggetto del commit finale" -#: blame.c:2732 +#: blame.c:2813 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: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 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 msgid "revision walk setup failed" msgstr "impostazione percorso revisioni non riuscita" -#: blame.c:2759 +#: blame.c:2840 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:2770 +#: blame.c:2851 #, c-format msgid "no such path %s in %s" msgstr "il percorso %s in %s non esiste" -#: blame.c:2781 +#: blame.c:2862 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossibile leggere il blob %s per il percorso %s" @@ -1283,400 +2049,370 @@ msgstr "Nome oggetto ambiguo: '%s'." msgid "Not a valid branch point: '%s'." msgstr "Punto di branch non valido: '%s'." -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "Il checkout di '%s' รจ giร stato eseguito in '%s'" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "L'HEAD dell'albero di lavoro %s non รจ aggiornato" -#: bundle.c:36 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "algoritmo hash bundle non riconosciuto: %s" + +#: bundle.c:45 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' non sembra essere un file bundle v2" +msgid "unknown capability '%s'" +msgstr "capacitร '%s' sconosciuta" -#: bundle.c:64 +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' non sembra essere un file bundle v2 o v3" + +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "intestazione non riconosciuta: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "impossibile aprire '%s'" -#: bundle.c:143 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "Dal repository mancano questi commit richiesti come prerequisito:" -#: bundle.c:146 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "รจ necessario un repository per verificare un bundle" -#: bundle.c:197 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Il bundle contiene questo riferimento:" msgstr[1] "Il bundle contiene questi %d riferimenti:" -#: bundle.c:204 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "Nel bundle รจ registrata una cronologia completa." -#: bundle.c:206 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" 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:272 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "impossibile duplicare il descrittore bundle" -#: bundle.c:279 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "Impossibile avviare pack-objects" -#: bundle.c:290 +#: bundle.c:337 msgid "pack-objects died" msgstr "comando pack-objects morto" -#: bundle.c:332 +#: bundle.c:379 msgid "rev-list died" msgstr "comando rev-list morto" -#: bundle.c:381 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "il riferimento '%s' รจ escluso dalle opzioni di rev-list" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "versione bundle %d non supportata" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "impossibile scrivere il bundle versione %d con l'algoritmo %s" + +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 #, c-format msgid "unrecognized argument: %s" msgstr "argomento non riconosciuto: %s" -#: bundle.c:468 +#: bundle.c:530 msgid "Refusing to create empty bundle." msgstr "Mi rifiuto di creare un bundle vuoto." -#: bundle.c:478 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "impossibile creare '%s'" -#: bundle.c:503 +#: bundle.c:565 msgid "index-pack died" msgstr "comando index-pack morto" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "valore colore non valido: %.*s" -#: 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:52 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s non รจ un commit!" +#: commit-graph.c:188 midx.c:46 +msgid "invalid hash version" +msgstr "versione hash non valida" -#: commit.c:192 -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 "" -"Il supporto per <GIT_DIR>/info/graft รจ deprecato\n" -"e sarร rimosso in una versione futura di Git.\n" -"\n" -"Usa \"git replace --convert-graft-file\"\n" -"per convertire i graft in ref sostitutivi.\n" -"\n" -"Per disabilitare questo messaggio, esegui\n" -"\"git config advice.graftFileDeprecated false\"" - -#: 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: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:1133 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "Il commit %s non ha una firma GPG." - -#: 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: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 "" -"Attenzione: il messaggio di commit non รจ conforme alla codifica UTF-8.\n" -"Potresti volerlo modificare dopo aver corretto il messaggio, o impostare\n" -"la variabile di configurazione i18n.commitencoding alla codifica usata\n" -"dal tuo progetto.\n" - -#: commit-graph.c:127 +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "il file grafo dei commit %s รจ troppo piccolo" -#: commit-graph.c:192 +#: commit-graph.c:311 #, 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:199 +#: commit-graph.c:318 #, 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:206 +#: commit-graph.c:325 #, 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: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:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "il file grafo dei commit รจ troppo piccolo per contenere %u chunk" -#: commit-graph.c:240 +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "offset blocco grafo dei commit improprio %08x%08x" -#: commit-graph.c:283 +#: commit-graph.c:433 #, 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:347 +#: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" msgstr "il grafo dei commit non ha un blocco grafi di base" -#: commit-graph.c:357 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "la catena del grafo dei commit non corrisponde" -#: commit-graph.c:404 +#: commit-graph.c:557 #, 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:430 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "impossibile trovare tutti i file grafo dei commit" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:721 commit-graph.c:785 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "posizione commit non valida. Il grafo dei commit รจ probabilmente corrotto" -#: commit-graph.c:575 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "impossibile trovare il commit %s" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:1042 builtin/am.c:1306 +#, c-format +msgid "unable to parse commit %s" +msgstr "impossibile analizzare il commit %s" + +#: commit-graph.c:1265 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "impossibile recuperare il tipo dell'oggetto %s" -#: commit-graph.c:1034 +#: commit-graph.c:1301 msgid "Loading known commits in commit graph" msgstr "Caricamento commit noti nel grafo dei commit in corso" -#: commit-graph.c:1051 +#: commit-graph.c:1318 msgid "Expanding reachable commits in commit graph" msgstr "Espansione dei commit raggiungibili nel grafo dei commit in corso" -#: commit-graph.c:1070 +#: commit-graph.c:1338 msgid "Clearing commit marks in commit graph" msgstr "Rimozione dei contrassegni commit nel grafo dei commit in corso" -#: commit-graph.c:1089 +#: commit-graph.c:1357 msgid "Computing commit graph generation numbers" msgstr "Calcolo numeri generazione del grafo dei commit in corso" -#: commit-graph.c:1163 +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "" +"Calcolo dei filtri di Bloom per i percorsi modificati nei commit in corso" + +#: commit-graph.c:1501 +msgid "Collecting referenced commits" +msgstr "Raccolta dei commit referenziati in corso" + +#: commit-graph.c:1526 #, 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:1176 +#: commit-graph.c:1539 #, c-format msgid "error adding pack %s" msgstr "errore durante l'aggiunta del pack %s" -#: commit-graph.c:1180 +#: commit-graph.c:1543 #, c-format msgid "error opening index for %s" msgstr "errore durante l'apertura dell'indice per %s" -#: 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] "" -"Ricerca dei commit per il grafo dei commit da %d riferimento in corso" -msgstr[1] "" -"Ricerca dei commit per il grafo dei commit da %d riferimenti in corso" - -#: commit-graph.c:1238 +#: commit-graph.c:1582 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:1253 +#: commit-graph.c:1597 msgid "Counting distinct commits in commit graph" msgstr "Conteggio commit distinti nel grafo dei commit in corso" -#: commit-graph.c:1284 +#: commit-graph.c:1629 msgid "Finding extra edges in commit graph" msgstr "Ricerca degli archi aggiuntivi nel grafo dei commit in corso" -#: commit-graph.c:1332 +#: commit-graph.c:1678 msgid "failed to write correct number of base graph ids" msgstr "impossibile scrivere il numero esatto degli ID grafo di base" -#: commit-graph.c:1365 midx.c:811 +#: commit-graph.c:1720 midx.c:826 #, c-format msgid "unable to create leading directories of %s" msgstr "impossibile creare le prime directory di %s" -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1733 +msgid "unable to create temporary graph layer" +msgstr "impossibile creare il livello grafico temporaneo" + +#: commit-graph.c:1738 #, c-format -msgid "unable to create '%s'" -msgstr "impossibile creare '%s'" +msgid "unable to adjust shared permissions for '%s'" +msgstr "impossibile modificare i permessi condivisi per '%s'" -#: commit-graph.c:1437 +#: commit-graph.c:1808 #, 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:1478 +#: commit-graph.c:1853 msgid "unable to open commit-graph chain file" msgstr "impossibile aprire il file catena grafo dei commit" -#: commit-graph.c:1490 +#: commit-graph.c:1869 msgid "failed to rename base commit-graph file" msgstr "impossibile ridenominare il file di base grafo dei commit" -#: commit-graph.c:1510 +#: commit-graph.c:1889 msgid "failed to rename temporary commit-graph file" msgstr "impossibile ridenominare il file temporaneo grafo dei commit" -#: commit-graph.c:1621 +#: commit-graph.c:2015 msgid "Scanning merged commits" msgstr "Scansione dei commit sottoposti a merge in corso" -#: commit-graph.c:1632 +#: commit-graph.c:2026 #, c-format msgid "unexpected duplicate commit id %s" msgstr "ID commit duplicato inatteso: %s" -#: commit-graph.c:1657 +#: commit-graph.c:2049 msgid "Merging commit-graph" msgstr "Merge del grafo dei commit in corso" -#: commit-graph.c:1844 +#: commit-graph.c:2259 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" "il formato del grafo dei commit non puรฒ essere usato per scrivere %d commit" -#: commit-graph.c:1855 +#: commit-graph.c:2270 msgid "too many commits to write graph" msgstr "troppi commit da scrivere nel grafo" -#: commit-graph.c:1945 +#: commit-graph.c:2363 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:1955 +#: commit-graph.c:2373 #, 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:1965 commit-graph.c:1980 +#: commit-graph.c:2383 commit-graph.c:2398 #, 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:1972 +#: commit-graph.c:2390 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "impossibile analizzare il commit %s nel grafo dei commit" -#: commit-graph.c:1989 +#: commit-graph.c:2408 msgid "Verifying commits in commit graph" msgstr "Verifica dei commit nel grafo dei commit in corso" -#: commit-graph.c:2002 +#: commit-graph.c:2423 #, 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:2009 +#: commit-graph.c:2430 #, 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:2019 +#: commit-graph.c:2440 #, 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:2028 +#: commit-graph.c:2449 #, 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:2041 +#: commit-graph.c:2463 #, 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:2046 +#: commit-graph.c:2468 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1684,7 +2420,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:2050 +#: commit-graph.c:2472 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1692,22 +2428,84 @@ 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:2065 +#: commit-graph.c:2488 #, 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:2071 +#: commit-graph.c:2494 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "la data per il commit %s nel grafo dei commit รจ %<PRIuMAX> != %<PRIuMAX>" +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "impossibile analizzare %s" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s non รจ un commit!" + +#: commit.c:194 +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 "" +"Il supporto per <GIT_DIR>/info/graft รจ deprecato\n" +"e sarร rimosso in una versione futura di Git.\n" +"\n" +"Usa \"git replace --convert-graft-file\"\n" +"per convertire i graft in ref sostitutivi.\n" +"\n" +"Per disabilitare questo messaggio, esegui\n" +"\"git config advice.graftFileDeprecated false\"" + +#: commit.c:1172 +#, 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:1176 +#, 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:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "Il commit %s non ha una firma GPG." + +#: commit.c:1182 +#, 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:1436 +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 "" +"Attenzione: il messaggio di commit non รจ conforme alla codifica UTF-8.\n" +"Potresti volerlo modificare dopo aver corretto il messaggio, o impostare\n" +"la variabile di configurazione i18n.commitencoding alla codifica usata\n" +"dal tuo progetto.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "memoria esaurita" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1722,306 +2520,299 @@ msgstr "" "\t%s\n" "Ciรฒ puรฒ essere dovuto a delle inclusioni circolari." -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "impossibile espandere il percorso di inclusione '%s'" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "le inclusioni configurazione relative devono provenire da file" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "" "i condizionali di inclusione configurazione relativi devono provenire da file" -#: config.c:376 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "la chiave non contiene una sezione: %s" -#: config.c:382 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "la chiave non contiene un nome variabile: %s" -#: config.c:406 sequencer.c:2463 +#: config.c:408 sequencer.c:2547 #, c-format msgid "invalid key: %s" msgstr "chiave non valida: %s" -#: config.c:412 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "chiave non valida (nuova riga): %s" -#: config.c:448 config.c:460 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "parametro configurazione fittizio: %s" -#: config.c:495 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "formato fittizio in %s" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "riga configurazione %d errata nel blob %s" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "riga configurazione %d errata nel file %s" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "riga configurazione %d errata nello standard input" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "riga configurazione %d errata nel blob sottomodulo %s" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "riga configurazione %d errata nella riga di comando %s" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "riga configurazione %d errata in %s" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "fuori intervallo" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "unitร non valida" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valore configurazione numerico '%s' errato per '%s': %s" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "valore configurazione numerico '%s' errato per '%s' nel blob %s: %s" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "valore configurazione numerico '%s' errato per '%s' nel file %s: %s" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valore configurazione numerico '%s' errato per '%s' nello standard input: %s" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valore configurazione numerico '%s' errato per '%s' nel blob sottomodulo %s: " "%s" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valore configurazione numerico '%s' errato per '%s' nella riga di comando " "%s: %s" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "valore configurazione numerico '%s' errato per '%s' in %s: %s" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "espansione directory utente in '%s' non riuscita" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' per '%s' non รจ un timestamp valido" -#: config.c:1208 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "lunghezza abbreviazione fuori intervallo: %d" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "livello compressione zlib %d non valido" -#: config.c:1325 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "core.commentChar dovrebbe essere composto da un solo carattere" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "modalitร non valida per la creazione di un oggetto: %s" -#: config.c:1430 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "valore malformato per %s" -#: config.c:1456 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "valore malformato per %s: %s" -#: config.c:1457 +#: config.c:1472 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:3410 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "livello compressione pack %d non valido" -#: config.c:1639 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "impossibile caricare l'oggetto blob configurazione '%s'" -#: config.c:1642 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "il riferimento '%s' non punta ad un blob" -#: config.c:1659 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "impossibile risolvere il blob configurazione '%s'" -#: config.c:1689 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "analisi di %s non riuscita" -#: config.c:1745 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "impossibile analizzare la configurazione a riga di comando" -#: config.c:2094 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "" "si รจ verificato un errore imprevisto durante la lettura dei file di " "configurazione" -#: config.c:2264 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "%s non valido: '%s'" -#: 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 +#: config.c:2341 #, 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:2379 +#: config.c:2387 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "impossibile analizzare '%s' dalla configurazione a riga di comando" -#: config.c:2381 +#: config.c:2389 #, 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:2462 +#: config.c:2470 #, c-format msgid "invalid section name '%s'" msgstr "nome sezione '%s' non valido" -#: config.c:2494 +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "%s ha piรน valori" -#: config.c:2523 +#: config.c:2531 #, c-format msgid "failed to write new configuration file %s" msgstr "scrittura del nuovo file di configurazione %s non riuscita" -#: config.c:2775 config.c:3099 +#: config.c:2783 config.c:3107 #, c-format msgid "could not lock config file %s" msgstr "impossibile bloccare il file di configurazione %s" -#: config.c:2786 +#: config.c:2794 #, c-format msgid "opening %s" msgstr "apertura di %s in corso" -#: config.c:2821 builtin/config.c:328 +#: config.c:2829 builtin/config.c:354 #, c-format msgid "invalid pattern: %s" msgstr "pattern non valido: %s" -#: config.c:2846 +#: config.c:2854 #, c-format msgid "invalid config file %s" msgstr "file di configurazione %s non valido" -#: config.c:2859 config.c:3112 +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "fstat di %s non riuscita" -#: config.c:2870 +#: config.c:2878 #, c-format msgid "unable to mmap '%s'" msgstr "impossibile eseguire mmap su '%s'" -#: config.c:2879 config.c:3117 +#: config.c:2887 config.c:3125 #, c-format msgid "chmod on %s failed" msgstr "esecuzione chmod su %s non riuscita" -#: config.c:2964 config.c:3214 +#: config.c:2972 config.c:3222 #, c-format msgid "could not write config file %s" msgstr "impossibile scrivere il file di configurazione %s" -#: config.c:2998 +#: config.c:3006 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossibile impostare '%s' a '%s'" -#: config.c:3000 builtin/remote.c:782 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "impossibile eliminare l'impostazione di '%s'" -#: config.c:3090 +#: config.c:3098 #, c-format msgid "invalid section name: %s" msgstr "nome sezione non valido: %s" -#: config.c:3257 +#: config.c:3265 #, c-format msgid "missing value for '%s'" msgstr "valore mancante per '%s'" @@ -2048,72 +2839,81 @@ msgstr "" msgid "server doesn't support '%s'" msgstr "il server non supporta '%s'" -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "il server non supporta la funzionalitร '%s'" -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" msgstr "atteso flush dopo lettura funzionalitร " -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "ignoro le funzionalitร dopo la prima riga '%s'" -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "errore protocollo: capabilities^{} non atteso" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "errore protocollo: atteso SHA1 shallow, ricevuto '%s'" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "il repository della controparte non puรฒ essere shallow" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" msgstr "pacchetto non valido" -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "errore protocollo: '%s' non atteso" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "formato oggetto '%s' sconosciuto specificato dal server" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" msgstr "risposta ls-refs non valida: %s" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" msgstr "atteso flush dopo elenco ref" -#: connect.c:544 +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "atteso pacchetto fine risposta dopo elenco ref" + +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" msgstr "il protocollo '%s' non รจ supportato" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" msgstr "impossibile impostare SO_KEEPALIVE sul socket" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "Risoluzione di %s in corso... " -#: connect.c:639 +#: connect.c:735 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "impossibile risolvere %s (porta %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" @@ -2122,7 +2922,7 @@ msgstr "" "fatto.\n" "Connessione a %s (porta %s) in corso... " -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -2132,89 +2932,89 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "fatto." -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "impossibile risolvere %s (%s)" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "porta %s sconosciuta" -#: connect.c:845 connect.c:1171 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "nome host strano '%s' bloccato" -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "porta strana '%s' bloccata" -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "impossibile avviare il proxy %s" -#: connect.c:924 +#: connect.c:1024 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:1119 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" msgstr "la variante SSH 'simple' non supporta -4" -#: connect.c:1131 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" msgstr "la variante SSH 'simple' non supporta -6" -#: connect.c:1148 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" msgstr "la variante SSH 'simple' non supporta l'impostazione della porta" -#: connect.c:1260 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" msgstr "percorso strano '%s' bloccato" -#: connect.c:1307 +#: connect.c:1408 msgid "unable to fork" msgstr "impossibile eseguire fork" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Controllo connessione in corso" -#: connected.c:98 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "Impossibile eseguire 'git-rev-list'" -#: connected.c:118 +#: connected.c:144 msgid "failed write to rev-list" msgstr "scrittura nella rev-list non riuscita" -#: connected.c:125 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "chiusura standard input della rev-list non riuscita" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action %d illecita" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF sarebbe sostituito da LF in %s" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2223,12 +3023,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:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF sarebbe sostituito da CRLF in %s" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2237,19 +3037,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:279 +#: convert.c:284 #, 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:286 +#: convert.c:291 #, 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 @@ -2266,51 +3066,51 @@ msgstr "" "o UTF-%sLE (a seconda dell'ordine dei byte) come codifica dell'albero di " "lavoro." -#: convert.c:424 convert.c:495 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "conversione della codifica '%s' da %s a %s non riuscita" -#: convert.c:467 +#: convert.c:462 #, 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:673 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "impossibile eseguire fork per eseguire il filtro esterno '%s'" -#: convert.c:693 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "impossibile fornire l'input al filtro esterno '%s'" -#: convert.c:700 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "esecuzione del filtro esterno '%s' non riuscita: %d" -#: convert.c:735 convert.c:738 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "lettura dal filtro esterno '%s' non riuscita" -#: convert.c:741 convert.c:796 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "esecuzione del filtro esterno '%s' non riuscita" -#: convert.c:844 +#: convert.c:837 msgid "unexpected filter type" msgstr "tipo filtro inatteso" -#: convert.c:855 +#: convert.c:848 msgid "path name too long for external filter" msgstr "nome percorso troppo lungo per il filtro esterno" -#: convert.c:929 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2319,67 +3119,96 @@ msgstr "" "il filtro esterno '%s' non รจ piรน disponibile nonostante non tutti i percorsi " "siano stati filtrati" -#: convert.c:1228 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "true/false non sono codifiche dell'albero di lavoro valide" -#: convert.c:1398 convert.c:1432 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: esecuzione del filtro clean '%s' non riuscita" -#: convert.c:1476 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: esecuzione del filtro smudge '%s' non riuscita" -#: date.c:137 +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "ignoro la ricerca delle credenziali per la chiave credential.%s" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "mi rifiuto di lavorare se il campo host della credenziale รจ mancante" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "" +"mi rifiuto di lavorare se il campo protocol della credenziale รจ mancante" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "l'URL contiene un carattere nuova riga nella sua componente %s: %s" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "l'URL non ha uno schema: %s" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "impossibile analizzare l'URL della credenziale: %s" + +#: date.c:138 msgid "in the future" msgstr "in futuro" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> secondo fa" msgstr[1] "%<PRIuMAX> secondi fa" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> minuto fa" msgstr[1] "%<PRIuMAX> minuti fa" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> ora fa" msgstr[1] "%<PRIuMAX> ore fa" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> giorno fa" msgstr[1] "%<PRIuMAX> giorni fa" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> settimana fa" msgstr[1] "%<PRIuMAX> settimane fa" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> mese fa" msgstr[1] "%<PRIuMAX> mesi fa" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2387,14 +3216,14 @@ msgstr[0] "%<PRIuMAX> anno" msgstr[1] "%<PRIuMAX> anni" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, 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:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2428,15 +3257,6 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Contrassegnate %d isole, fatto.\n" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "lettura dell'orderfile '%s' non riuscita" - -#: diffcore-rename.c:544 -msgid "Performing inexact rename detection" -msgstr "Rilevamento ridenominazione non esatta in corso" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<opzioni>] <percorso> <percorso>" @@ -2449,19 +3269,19 @@ msgstr "" "Non รจ un repository Git. Usa --no-index per confrontare due percorsi al di " "fuori di un albero di lavoro" -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Analisi della percentuale di cutoff statistiche directory '%s' non " "riuscita\n" -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Parametro statistiche directory '%s' sconosciuto\n" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2469,7 +3289,7 @@ msgstr "" "l'impostazione colore per file spostati deve essere 'no', 'default', " "'blocks', 'zebra', 'dimmed-zebra', 'plain'" -#: diff.c:324 +#: diff.c:325 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -2479,7 +3299,7 @@ msgstr "" "space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-" "change'" -#: diff.c:332 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -2487,13 +3307,13 @@ msgstr "" "color-moved-ws: allow-indentation-change non puรฒ essere combinata con altre " "modalitร spazi bianchi" -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valore sconosciuto per la variabile di configurazione 'diff.submodule': '%s'" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2502,36 +3322,36 @@ msgstr "" "Trovati errori nella variabile di configurazione 'diff.dirstat':\n" "%s" -#: diff.c:4215 +#: diff.c:4269 #, c-format msgid "external diff died, stopping at %s" msgstr "processo esterno diff morto, mi fermo a %s" -#: diff.c:4560 +#: diff.c:4618 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:4563 +#: diff.c:4621 msgid "-G, -S and --find-object are mutually exclusive" msgstr "le opzioni -G, -S e --find-object sono mutuamente esclusive" -#: diff.c:4641 +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "--follow richiede esattamente uno specificatore percorso" -#: diff.c:4689 +#: diff.c:4747 #, c-format msgid "invalid --stat value: %s" msgstr "valore non valido per --stat: %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s richiede un valore numerico" -#: diff.c:4726 +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2540,42 +3360,42 @@ msgstr "" "Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n" "%s" -#: diff.c:4811 +#: diff.c:4869 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe modifica '%c' sconosciuta in --diff-filter=%s" -#: diff.c:4835 +#: diff.c:4893 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valore sconosciuto dopo ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4907 #, c-format msgid "unable to resolve '%s'" msgstr "impossibile risolvere '%s'" -#: diff.c:4899 diff.c:4905 +#: diff.c:4957 diff.c:4963 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s richiede il formato <n>/<m>" -#: diff.c:4917 +#: diff.c:4975 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s richiede un carattere, ricevuto '%s'" -#: diff.c:4938 +#: diff.c:4996 #, c-format msgid "bad --color-moved argument: %s" msgstr "argomento --color-moved errato: %s" -#: diff.c:4957 +#: diff.c:5015 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modo non valido '%s' in --color-moved-ws" -#: diff.c:4997 +#: diff.c:5055 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2583,151 +3403,151 @@ msgstr "" "l'opzione diff-algorithm accetta i valori \"myers\", \"minimal\", \"patience" "\" e \"histogram\"" -#: diff.c:5033 diff.c:5053 +#: diff.c:5091 diff.c:5111 #, c-format msgid "invalid argument to %s" msgstr "argomento non valido per %s" -#: diff.c:5191 +#: diff.c:5248 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "analisi del parametro dell'opzione --submodule non riuscita: '%s'" -#: diff.c:5247 +#: diff.c:5304 #, c-format msgid "bad --word-diff argument: %s" msgstr "argomento --word-diff errato: %s" -#: diff.c:5270 +#: diff.c:5327 msgid "Diff output format options" msgstr "Opzioni formato output diff" -#: diff.c:5272 diff.c:5278 +#: diff.c:5329 diff.c:5335 msgid "generate patch" msgstr "genera patch" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5332 builtin/log.c:176 msgid "suppress diff output" msgstr "non visualizzare l'output del diff" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5337 diff.c:5451 diff.c:5458 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5338 diff.c:5341 msgid "generate diffs with <n> lines context" msgstr "genera diff con <n> righe di contesto" -#: diff.c:5286 +#: diff.c:5343 msgid "generate the diff in raw format" msgstr "genera il diff in formato grezzo" -#: diff.c:5289 +#: diff.c:5346 msgid "synonym for '-p --raw'" msgstr "sinonimo di '-p --raw'" -#: diff.c:5293 +#: diff.c:5350 msgid "synonym for '-p --stat'" msgstr "sinonimo di '-p --stat'" -#: diff.c:5297 +#: diff.c:5354 msgid "machine friendly --stat" msgstr "--stat leggibile da una macchina" -#: diff.c:5300 +#: diff.c:5357 msgid "output only the last line of --stat" msgstr "emetti in output solo l'ultima riga di --stat" -#: diff.c:5302 diff.c:5310 +#: diff.c:5359 diff.c:5367 msgid "<param1,param2>..." msgstr "<parametro1,parametro2>..." -#: diff.c:5303 +#: diff.c:5360 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:5307 +#: diff.c:5364 msgid "synonym for --dirstat=cumulative" msgstr "sinonimo di --dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5368 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonimo di --dirstat=files,parametro1,parametro2..." -#: diff.c:5315 +#: diff.c:5372 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "avvisa se le modifiche introducono marcatori conflitto o errori spazi bianchi" -#: diff.c:5318 +#: diff.c:5375 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "riassunto conciso (ad es. elementi creati, ridenominati e modifiche modi)" -#: diff.c:5321 +#: diff.c:5378 msgid "show only names of changed files" msgstr "visualizza solo i nomi dei file modificati" -#: diff.c:5324 +#: diff.c:5381 msgid "show only names and status of changed files" msgstr "visualizza solo i nomi e lo stato dei file modificati" -#: diff.c:5326 +#: diff.c:5383 msgid "<width>[,<name-width>[,<count>]]" msgstr "<ampiezza>[,<ampiezza nome>[,<numero>]]" -#: diff.c:5327 +#: diff.c:5384 msgid "generate diffstat" msgstr "genera diffstat" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5386 diff.c:5389 diff.c:5392 msgid "<width>" msgstr "<ampiezza>" -#: diff.c:5330 +#: diff.c:5387 msgid "generate diffstat with a given width" msgstr "genera il diffstat con un'ampiezza specificata" -#: diff.c:5333 +#: diff.c:5390 msgid "generate diffstat with a given name width" msgstr "genera il diffstat con un'ampiezza nomi specificata" -#: diff.c:5336 +#: diff.c:5393 msgid "generate diffstat with a given graph width" msgstr "genera il diffstat con un'ampiezza grafo specificata" -#: diff.c:5338 +#: diff.c:5395 msgid "<count>" msgstr "<numero>" -#: diff.c:5339 +#: diff.c:5396 msgid "generate diffstat with limited lines" msgstr "genera il diffstat con righe limitate" -#: diff.c:5342 +#: diff.c:5399 msgid "generate compact summary in diffstat" msgstr "genera riassunto conciso nel diffstat" -#: diff.c:5345 +#: diff.c:5402 msgid "output a binary diff that can be applied" msgstr "stampa in output un diff binario che puรฒ essere applicato" -#: diff.c:5348 +#: diff.c:5405 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:5350 +#: diff.c:5407 msgid "show colored diff" msgstr "visualizza diff colorato" -#: diff.c:5351 +#: diff.c:5408 msgid "<kind>" msgstr "<tipo>" -#: diff.c:5352 +#: diff.c:5409 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2735,7 +3555,7 @@ msgstr "" "evidenzia gli errori di spazi bianchi nelle righe 'contesto', 'vecchie' o " "'nuove' nel diff" -#: diff.c:5355 +#: diff.c:5412 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2743,91 +3563,91 @@ msgstr "" "non rimuovere i nomi percorso e usare caratteri NUL come terminatori campo " "in --raw o --numstat" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 msgid "<prefix>" msgstr "<prefisso>" -#: diff.c:5359 +#: diff.c:5416 msgid "show the given source prefix instead of \"a/\"" msgstr "visualizza il prefisso sorgente specificato invece di \"a/\"" -#: diff.c:5362 +#: diff.c:5419 msgid "show the given destination prefix instead of \"b/\"" msgstr "visualizza il prefisso destinazione specificato invece di \"b/\"" -#: diff.c:5365 +#: diff.c:5422 msgid "prepend an additional prefix to every line of output" msgstr "anteponi un prefisso aggiuntivo ad ogni riga dell'output" -#: diff.c:5368 +#: diff.c:5425 msgid "do not show any source or destination prefix" msgstr "non visualizzare alcun prefisso sorgente o destinazione" -#: diff.c:5371 +#: diff.c:5428 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:5375 diff.c:5380 diff.c:5385 +#: diff.c:5432 diff.c:5437 diff.c:5442 msgid "<char>" msgstr "<carattere>" -#: diff.c:5376 +#: diff.c:5433 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:5381 +#: diff.c:5438 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:5386 +#: diff.c:5443 msgid "specify the character to indicate a context instead of ' '" msgstr "specifica il carattere che indica un contesto al posto di ' '" -#: diff.c:5389 +#: diff.c:5446 msgid "Diff rename options" msgstr "Opzioni rinominazione diff" -#: diff.c:5390 +#: diff.c:5447 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5448 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "spezza modifiche di riscrittura completa in coppie eliminazione/creazione" -#: diff.c:5395 +#: diff.c:5452 msgid "detect renames" msgstr "rileva le ridenominazioni" -#: diff.c:5399 +#: diff.c:5456 msgid "omit the preimage for deletes" msgstr "ometti la preimmagine per le eliminazioni" -#: diff.c:5402 +#: diff.c:5459 msgid "detect copies" msgstr "rileva le copie" -#: diff.c:5406 +#: diff.c:5463 msgid "use unmodified files as source to find copies" msgstr "usa file non modificati come sorgente per trovare copie" -#: diff.c:5408 +#: diff.c:5465 msgid "disable rename detection" msgstr "disabilita rilevamento ridenominazione" -#: diff.c:5411 +#: diff.c:5468 msgid "use empty blobs as rename source" msgstr "usa blob vuoti come sorgente ridenominazione" -#: diff.c:5413 +#: diff.c:5470 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:5416 +#: diff.c:5473 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2835,159 +3655,159 @@ msgstr "" "impedisci il rilevamento ridenominazione/copia se il numero delle " "destinazioni ridenominazione/copia eccede il limite specificato" -#: diff.c:5418 +#: diff.c:5475 msgid "Diff algorithm options" msgstr "Opzioni algoritmo diff" -#: diff.c:5420 +#: diff.c:5477 msgid "produce the smallest possible diff" msgstr "produci il diff piรน piccolo possibile" -#: diff.c:5423 +#: diff.c:5480 msgid "ignore whitespace when comparing lines" msgstr "ignora gli spazi bianchi durante il confronto delle righe" -#: diff.c:5426 +#: diff.c:5483 msgid "ignore changes in amount of whitespace" msgstr "ignora le modifiche al numero degli spazi bianchi" -#: diff.c:5429 +#: diff.c:5486 msgid "ignore changes in whitespace at EOL" msgstr "ignora modifiche agli spazi bianchi a fine riga" -#: diff.c:5432 +#: diff.c:5489 msgid "ignore carrier-return at the end of line" msgstr "ignora carattere ritorno a capo a fine riga" -#: diff.c:5435 +#: diff.c:5492 msgid "ignore changes whose lines are all blank" msgstr "ignora modifiche che riguardano solo righe vuote" -#: diff.c:5438 +#: diff.c:5495 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:5441 +#: diff.c:5498 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera il diff usando l'algoritmo \"patience diff\"" -#: diff.c:5445 +#: diff.c:5502 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera il diff usando l'algoritmo \"histogram diff\"" -#: diff.c:5447 +#: diff.c:5504 msgid "<algorithm>" msgstr "<algoritmo>" -#: diff.c:5448 +#: diff.c:5505 msgid "choose a diff algorithm" msgstr "seleziona un algoritmo diff" -#: diff.c:5450 +#: diff.c:5507 msgid "<text>" msgstr "<testo>" -#: diff.c:5451 +#: diff.c:5508 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera il diff usando l'algoritmo \"anchored diff\"" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5510 diff.c:5519 diff.c:5522 msgid "<mode>" msgstr "<modalitร >" -#: diff.c:5454 +#: diff.c:5511 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:5456 diff.c:5459 diff.c:5504 +#: diff.c:5513 diff.c:5516 diff.c:5561 msgid "<regex>" msgstr "<espressione regolare>" -#: diff.c:5457 +#: diff.c:5514 msgid "use <regex> to decide what a word is" msgstr "usa <espressione regolare> per decidere cosa costituisce una parola" -#: diff.c:5460 +#: diff.c:5517 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" "equivalente di --word-diff=color --word-diff-regex=<espressione regolare>" -#: diff.c:5463 +#: diff.c:5520 msgid "moved lines of code are colored differently" msgstr "le righe di codice spostate sono colorate in modo diverso" -#: diff.c:5466 +#: diff.c:5523 msgid "how white spaces are ignored in --color-moved" msgstr "modo in cui sono ignorati gli spazi bianchi in --color-moved" -#: diff.c:5469 +#: diff.c:5526 msgid "Other diff options" msgstr "Altre opzioni diff" -#: diff.c:5471 +#: diff.c:5528 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:5475 +#: diff.c:5532 msgid "treat all files as text" msgstr "tratta tutti i file come se fossero di testo" -#: diff.c:5477 +#: diff.c:5534 msgid "swap two inputs, reverse the diff" msgstr "scambia i due input, genera un diff al contrario" -#: diff.c:5479 +#: diff.c:5536 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "esci con codice 1 se ci sono differenze, con 0 altrimenti" -#: diff.c:5481 +#: diff.c:5538 msgid "disable all output of the program" msgstr "disabilita l'intero output del programma" -#: diff.c:5483 +#: diff.c:5540 msgid "allow an external diff helper to be executed" msgstr "consenti l'esecuzione di un helper diff esterno" -#: diff.c:5485 +#: diff.c:5542 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:5487 +#: diff.c:5544 msgid "<when>" msgstr "<quando>" -#: diff.c:5488 +#: diff.c:5545 msgid "ignore changes to submodules in the diff generation" msgstr "ignora le modifiche ai sottomoduli durante la generazione del diff" -#: diff.c:5491 +#: diff.c:5548 msgid "<format>" msgstr "<formato>" -#: diff.c:5492 +#: diff.c:5549 msgid "specify how differences in submodules are shown" msgstr "specifica come verranno visualizzate le differenze nei sottomoduli" -#: diff.c:5496 +#: diff.c:5553 msgid "hide 'git add -N' entries from the index" msgstr "nascondi le voci 'git add -N' nell'indice" -#: diff.c:5499 +#: diff.c:5556 msgid "treat 'git add -N' entries as real in the index" msgstr "tratta le voci 'git add -N' come reali nell'indice" -#: diff.c:5501 +#: diff.c:5558 msgid "<string>" msgstr "<stringa>" -#: diff.c:5502 +#: diff.c:5559 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -2995,7 +3815,7 @@ msgstr "" "cerca differenze che modificano il numero di occorrenze della stringa " "specificata" -#: diff.c:5505 +#: diff.c:5562 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3003,24 +3823,24 @@ msgstr "" "cerca differenze che modificano il numero di occorrenze dell'espressione " "regolare specificata" -#: diff.c:5508 +#: diff.c:5565 msgid "show all changes in the changeset with -S or -G" msgstr "visualizza tutte le modifiche nel changeset con -S o -G" -#: diff.c:5511 +#: diff.c:5568 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:5514 +#: diff.c:5571 msgid "control the order in which files appear in the output" msgstr "controlla l'ordine con cui i file appariranno nell'output" -#: diff.c:5515 +#: diff.c:5572 msgid "<object-id>" msgstr "<ID oggetto>" -#: diff.c:5516 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3028,34 +3848,34 @@ msgstr "" "cerca differenze che modificano il numero di occorrenze dell'oggetto " "specificato" -#: diff.c:5518 +#: diff.c:5575 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5576 msgid "select files by diff type" msgstr "seleziona file in base al tipo diff" -#: diff.c:5521 +#: diff.c:5578 msgid "<file>" msgstr "<file>" -#: diff.c:5522 +#: diff.c:5579 msgid "Output to a specific file" msgstr "Salva l'output in un file specifico" -#: diff.c:6177 +#: diff.c:6236 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:6180 +#: diff.c:6239 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:6183 +#: diff.c:6242 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3063,56 +3883,86 @@ msgstr "" "potresti voler impostare la variabile %s ad almeno %d e riprovare ad " "eseguire il comando." -#: dir.c:537 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "lettura dell'orderfile '%s' non riuscita" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "Rilevamento ridenominazione non esatta in corso" + +#: dir.c:578 #, 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:926 +#: dir.c:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "pattern non riconosciuto: '%s'" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "pattern negativo non riconosciuto: '%s'" + +#: dir.c:809 +#, 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:819 +msgid "disabling cone pattern matching" +msgstr "disabilito il pattern matching di tipo cone" + +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossibile usare %s come file di esclusione" -#: dir.c:1843 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "impossibile aprire la directory '%s'" -#: dir.c:2085 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "impossibile ottenere il nome e le informazioni sul kernel" -#: dir.c:2209 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "la cache non tracciata รจ disabilitata su questo sistema o percorso" -#: dir.c:3013 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "file index corrotto nel repository %s" -#: dir.c:3058 dir.c:3063 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "impossibile creare le directory per %s" -#: dir.c:3092 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossibile migrare la directory git da '%s' a '%s'" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" "suggerimento: In attesa della chiusura del file da parte dell'editor...%c" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "Filtraggio contenuto in corso" -#: entry.c:476 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "impossibile eseguire stat sul file '%s'" @@ -3122,7 +3972,7 @@ msgstr "impossibile eseguire stat sul file '%s'" msgid "bad git namespace path \"%s\"" msgstr "percorso spazio dei nomi git \"%s\" non valido" -#: environment.c:332 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "impossibile impostare GIT_DIR a '%s'" @@ -3132,268 +3982,290 @@ msgstr "impossibile impostare GIT_DIR a '%s'" msgid "too many args to run %s" msgstr "troppi argomenti per eseguire %s" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "Remoto senza URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: attesa lista shallow" -#: fetch-pack.c:154 +#: fetch-pack.c:179 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: atteso pacchetto flush dopo lista shallow" -#: fetch-pack.c:165 +#: fetch-pack.c:190 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: attesi ACK/NAK, ricevuto pacchetto flush" -#: fetch-pack.c:185 +#: fetch-pack.c:210 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: attesi ACK/NAK, ricevuto '%s'" -#: fetch-pack.c:196 +#: fetch-pack.c:221 msgid "unable to write to remote" msgstr "impossibile scrivere sul remoto" -#: fetch-pack.c:258 +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc richiede multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "riga shallow non valida: '%s'" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "riga unshallow non valida: '%s'" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "oggetto non trovato: %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "errore nell'oggetto: %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "nessuno shallow trovato: %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "attesi shallow/unshallow, ricevuto %s" -#: fetch-pack.c:417 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "ricevuto %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:448 #, c-format msgid "invalid commit %s" msgstr "commit non valido: %s" -#: fetch-pack.c:465 +#: fetch-pack.c:479 msgid "giving up" msgstr "smetto di provare" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:492 progress.c:339 msgid "done" msgstr "fatto" -#: fetch-pack.c:489 +#: fetch-pack.c:504 #, c-format msgid "got %s (%d) %s" msgstr "ricevuto %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:540 #, c-format msgid "Marking %s as complete" msgstr "Contrassegno %s come completo" -#: fetch-pack.c:744 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "ho giร %s (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:824 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" "fetch-pack: impossibile eseguire il fork del demultiplexer della banda " "laterlae" -#: fetch-pack.c:791 +#: fetch-pack.c:832 msgid "protocol error: bad pack header" msgstr "errore protocollo: intestazione pack non valida" -#: fetch-pack.c:859 +#: fetch-pack.c:916 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: impossibile eseguire il fork di %s" -#: fetch-pack.c:875 +#: fetch-pack.c:933 #, c-format msgid "%s failed" msgstr "%s non riuscito" -#: fetch-pack.c:877 +#: fetch-pack.c:935 msgid "error in sideband demultiplexer" msgstr "errore nel demultiplexer della banda laterale" -#: fetch-pack.c:908 +#: fetch-pack.c:978 #, c-format msgid "Server version is %.*s" msgstr "La versione del server รจ %.*s" -#: 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 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 #, c-format msgid "Server supports %s" msgstr "Il server supporta %s" -#: fetch-pack.c:915 +#: fetch-pack.c:985 msgid "Server does not support shallow clients" msgstr "Il server non supporta client shallow" -#: fetch-pack.c:975 +#: fetch-pack.c:1045 msgid "Server does not support --shallow-since" msgstr "Il server non supporta --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:1050 msgid "Server does not support --shallow-exclude" msgstr "Il server non supporta --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "Il server non supporta --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1056 +msgid "Server does not support this repository's object format" +msgstr "Il server non supporta il formato oggetti di questo repository" + +#: fetch-pack.c:1069 msgid "no common commits" msgstr "nessun commit in comune" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1081 fetch-pack.c:1619 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: recupero non riuscito." -#: fetch-pack.c:1151 +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "algoritmi non corrispondenti: client %s; server %s" + +#: fetch-pack.c:1209 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "il server non supporta l'algoritmo '%s'" + +#: fetch-pack.c:1229 msgid "Server does not support shallow requests" msgstr "Il server non supporta le richieste shallow" -#: fetch-pack.c:1157 +#: fetch-pack.c:1236 msgid "Server supports filter" msgstr "Il server supporta filter" -#: fetch-pack.c:1184 +#: fetch-pack.c:1275 msgid "unable to write request to remote" msgstr "impossibile scrivere la richiesta sul remoto" -#: fetch-pack.c:1202 +#: fetch-pack.c:1293 #, c-format msgid "error reading section header '%s'" msgstr "errore durante la lettura dell'intestazione di sezione '%s'" -#: fetch-pack.c:1208 +#: fetch-pack.c:1299 #, c-format msgid "expected '%s', received '%s'" msgstr "atteso '%s', ricevuto '%s'" -#: fetch-pack.c:1247 +#: fetch-pack.c:1360 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "riga di conferma inattesa: '%s'" -#: fetch-pack.c:1252 +#: fetch-pack.c:1365 #, c-format msgid "error processing acks: %d" msgstr "errore durante l'elaborazione degli ack: %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1375 msgid "expected packfile to be sent after 'ready'" msgstr "ci si attendeva che il packfile fosse inviato dopo 'ready'" -#: fetch-pack.c:1264 +#: fetch-pack.c:1377 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:1306 +#: fetch-pack.c:1419 #, c-format msgid "error processing shallow info: %d" msgstr "errore durante l'elaborazione delle informazioni shallow: %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1466 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "atteso wanted-ref, ricevuto '%s'" -#: fetch-pack.c:1358 +#: fetch-pack.c:1471 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inatteso: '%s'" -#: fetch-pack.c:1363 +#: fetch-pack.c:1476 #, c-format msgid "error processing wanted refs: %d" msgstr "errore durante l'elaborazione dei riferimenti desiderati: %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1506 +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack: atteso pacchetto fine risposta" + +#: fetch-pack.c:1887 msgid "no matching remote head" msgstr "nessun head remoto corrispondente" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1910 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "il remoto non ha inviato tutti gli oggetti necessari" -#: fetch-pack.c:1739 +#: fetch-pack.c:1937 #, c-format msgid "no such remote ref %s" msgstr "riferimento remoto non esistente: %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1940 #, 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:321 -msgid "gpg failed to sign the data" -msgstr "gpg non รจ riuscito a firmare i dati" - -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "impossibile creare il file temporaneo" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "scrittura della firma separata in '%s' non riuscita" -#: graph.c:97 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg non รจ riuscito a firmare i dati" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignoro il colore non valido '%.*s' in log.graphColors" -#: grep.c:2117 +#: 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 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': impossibile leggere %s" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "stat di '%s' non riuscito" -#: grep.c:2145 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "'%s': lettura troppo breve" @@ -3443,49 +4315,49 @@ msgid "Low-level Commands / Interrogators" msgstr "Comandi / operazioni di interrogazione di basso livello" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Comandi di basso livello / Sincronizzazione repository" #: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "Comandi di basso livello / Funzioni helper interne" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "comandi git disponibili in '%s'" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "comandi git disponibili altrove nel tuo $PATH" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "Questi sono i comandi Git comuni usati in varie situazioni:" -#: help.c:363 git.c:98 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "tipo elenco comandi non supportato: '%s'" -#: help.c:403 -msgid "The common Git guides are:" -msgstr "Le guide Git comuni sono:" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Le guide Git concettuali sono:" -#: help.c:512 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "" "Vedi 'git help <comando>' per saperne di piรน su un sottocomando specifico" -#: help.c:517 +#: help.c:434 msgid "External commands" msgstr "Comandi esterni" -#: help.c:532 +#: help.c:449 msgid "Command aliases" msgstr "Alias comandi" -#: help.c:596 +#: help.c:513 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -3494,31 +4366,31 @@ msgstr "" "'%s' sembra essere un comando git, ma non รจ stato\n" "possibile eseguirlo. Forse git-%s รจ corrotto?" -#: help.c:655 +#: help.c:572 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oh oh. Il tuo sistema non riporta alcun comando Git." -#: help.c:677 +#: help.c:594 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "ATTENZIONE: hai chiamato un comando Git '%s' inesistente." -#: help.c:682 +#: help.c:599 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Continuo assumendo che intendessi '%s'." -#: help.c:687 +#: help.c:604 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Continuo fra %0.1f secondi assumendo che intendessi '%s'." -#: help.c:695 +#: help.c:612 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' non รจ un comando git. Vedi 'git --help'." -#: help.c:699 +#: help.c:616 msgid "" "\n" "The most similar command is" @@ -3532,16 +4404,16 @@ msgstr[1] "" "\n" "I comandi maggiormente simili sono" -#: help.c:714 +#: help.c:656 msgid "git version [<options>]" msgstr "git version [<opzioni>]" -#: help.c:782 +#: help.c:711 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:715 msgid "" "\n" "Did you mean this?" @@ -3555,7 +4427,15 @@ msgstr[1] "" "\n" "Intendevi uno di questi?" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "Identitร autore sconosciuta\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "Identitร autore del commit sconosciuta\n" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -3581,78 +4461,100 @@ msgstr "" "Ometti --global per impostare l'identitร solo in questo repository.\n" "\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "" "nessun indirizzo e-mail specificato e rilevamento automatico disabilitato" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" "impossibile rilevare automaticamente l'indirizzo e-mail (ho ricavato '%s')" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "nessun nome specificato e rilevamento automatico disabilitato" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "impossibile rilevare automaticamente il nome (ho ricavato '%s')" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "nome ident vuoto (per <%s>) non consentito" -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "il nome รจ composto solo da caratteri non consentiti: %s" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "formato data non valido: %s" -#: 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-filter-options.c:81 +msgid "expected 'tree:<depth>'" +msgstr "atteso 'tree:<profonditร >'" -#: list-objects.c:142 +#: list-objects-filter-options.c:96 +msgid "sparse:path filters support has been dropped" +msgstr "il supporto per i filtri sparse:percorso รจ stato rimosso" + +#: list-objects-filter-options.c:109 #, 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" +msgid "invalid filter-spec '%s'" +msgstr "specificatore filtro '%s' non valido" -#: list-objects.c:378 +#: list-objects-filter-options.c:125 #, c-format -msgid "unable to load root tree for commit %s" -msgstr "impossibile caricare l'albero radice per il commit %s" +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:167 +msgid "expected something after combine:" +msgstr "atteso qualcosa dopo la ricombinazione:" -#: list-objects-filter-options.c:36 +#: list-objects-filter-options.c:249 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:361 +msgid "unable to upgrade repository format to support partial clone" +msgstr "" +"impossibile aggiornare il formato repository per supportare il clone parziale" -#: 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.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "impossibile accedere al blob sparse in '%s'" -#: list-objects-filter-options.c:94 +#: list-objects-filter.c:495 #, c-format -msgid "invalid filter-spec '%s'" -msgstr "specificatore filtro '%s' non valido" +msgid "unable to parse sparse filter data in %s" +msgstr "impossibile analizzare i dati filtro sparse in %s" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "impossibile modificare il remoto promettente del clone parziale" +#: list-objects.c:127 +#, 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 +#, 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" -#: lockfile.c:151 +#: list-objects.c:375 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "impossibile caricare l'albero radice per il commit %s" + +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -3672,128 +4574,118 @@ msgstr "" "possibile che un processo git sia andato in crash in questo repository\n" "in precedenza: rimuovi manualmente il file per continuare." -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Impossibile creare '%s.lock': %s" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "lettura della cache non riuscita" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "atteso flush dopo argomenti ls-refs" -#: 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:322 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(commit non valido)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, 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:354 +#: merge-recursive.c:388 #, 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:437 -msgid "error building trees" -msgstr "errore durante la costruzione degli alberi" - -#: merge-recursive.c:863 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "creazione del percorso '%s' non riuscita%s" -#: merge-recursive.c:874 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Rimuovo %s per fare spazio alla sottodirectory\n" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": forse si tratta di un conflitto D/F?" -#: merge-recursive.c:897 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "mi rifiuto di perdere un file non tracciato in '%s'" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "impossibile leggere l'oggetto %s '%s'" -#: merge-recursive.c:941 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "atteso blob per %s '%s'" -#: merge-recursive.c:965 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "apertura di '%s' non riuscita: %s" -#: merge-recursive.c:976 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "creazione del collegamento simbolico '%s' non riuscita: %s" -#: merge-recursive.c:981 +#: merge-recursive.c:995 #, 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:1177 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Merge del sottomodulo %s non riuscito (checkout non eseguito)" -#: merge-recursive.c:1184 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Merge del sottomodulo %s non riuscito (commit non presenti)" -#: merge-recursive.c:1191 +#: merge-recursive.c:1205 #, 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:1199 merge-recursive.c:1211 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, 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:1202 merge-recursive.c:1214 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Eseguo il fast forward del sottomodulo %s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1251 #, 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:1241 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Merge del sottomodulo %s non riuscito (non fast forward)" -#: merge-recursive.c:1242 +#: merge-recursive.c:1256 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Trovata possibile risoluzione merge per il sottomodulo:\n" -#: merge-recursive.c:1245 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3810,32 +4702,32 @@ msgstr "" "\n" "per accettare questo suggerimento.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Merge del sottomodulo %s non riuscito (piรน merge trovati)" -#: merge-recursive.c:1327 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "Esecuzione del merge interno non riuscita" -#: merge-recursive.c:1332 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "Impossibile aggiungere %s al database" -#: merge-recursive.c:1364 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "Merge automatico di %s in corso" -#: merge-recursive.c:1387 +#: merge-recursive.c:1402 #, 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:1459 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3844,7 +4736,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di " "%s lasciata nell'albero." -#: merge-recursive.c:1464 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3853,7 +4745,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:1471 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3862,7 +4754,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:1476 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3871,43 +4763,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:1511 +#: merge-recursive.c:1526 msgid "rename" msgstr "ridenominazione" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "renamed" msgstr "rinominato" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Mi rifiuto di perdere un file sporco in %s" -#: merge-recursive.c:1601 +#: merge-recursive.c:1587 #, 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:1659 +#: merge-recursive.c:1645 #, 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:1690 +#: merge-recursive.c:1676 #, 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:1695 +#: merge-recursive.c:1681 #, 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:1714 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3916,18 +4808,18 @@ msgstr "" "CONFLITTO (ridenominazione/ridenominazione): file ridenominato \"%s\"->\"%s" "\" nel branch \"%s\", ridenominato \"%s\"->\"%s\" in \"%s\"%s" -#: merge-recursive.c:1719 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (lasciato irrisolto)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1805 #, 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:2035 +#: merge-recursive.c:2068 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3938,7 +4830,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:2067 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3948,7 +4840,7 @@ msgstr "" "%s รจ d'ostacolo alle seguenti ridenominazioni directory che spostano in tale " "posizione i seguenti percorsi: %s." -#: merge-recursive.c:2077 +#: merge-recursive.c:2110 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3958,7 +4850,7 @@ msgstr "" "un percorso in %s; delle ridenominazioni directory implicite hanno tentato " "di spostare in tale posizione i seguenti percorsi: %s" -#: merge-recursive.c:2169 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3967,7 +4859,7 @@ msgstr "" "CONFLITTO (ridenominazione/ridenominazione): directory ridenominata %s->%s " "in %s. Directory ridenominata %s->%s in %s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3976,52 +4868,52 @@ msgstr "" "ATTENZIONE: evito di applicare la ridenominazione %s -> %s a %s perchรฉ %s " "stesso รจ stato ridenominato." -#: merge-recursive.c:2938 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "impossibile leggere l'oggetto %s" -#: merge-recursive.c:2941 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "l'oggetto %s non รจ un blob" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modify" msgstr "modifica" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modified" msgstr "modificato" -#: merge-recursive.c:3017 +#: merge-recursive.c:3052 msgid "content" msgstr "contenuto" -#: merge-recursive.c:3021 +#: merge-recursive.c:3056 msgid "add/add" msgstr "aggiunta/aggiunta" -#: merge-recursive.c:3044 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Omesso %s (elemento sottoposto a merge uguale a quello esistente)" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3101 msgid "submodule" msgstr "sottomodulo" -#: merge-recursive.c:3067 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLITTO (%s): conflitto di merge in %s" -#: merge-recursive.c:3097 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Lo aggiungo come %s" -#: merge-recursive.c:3179 +#: merge-recursive.c:3215 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4030,7 +4922,7 @@ msgstr "" "Percorso aggiornato: %s aggiunto in %s in una directory ridenominata in %s; " "lo sposto in %s." -#: merge-recursive.c:3182 +#: merge-recursive.c:3218 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4039,7 +4931,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:3186 +#: merge-recursive.c:3222 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4048,7 +4940,7 @@ msgstr "" "Percorso aggiornato: %s ridenominato in %s in %s in una directory " "ridenominata in %s; lo sposto in %s." -#: merge-recursive.c:3189 +#: merge-recursive.c:3225 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4058,228 +4950,268 @@ msgstr "" "ridenominata in %s, il che suggerisce che forse dovrebbe essere spostato in " "%s." -#: merge-recursive.c:3303 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "Rimozione di %s" -#: merge-recursive.c:3326 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "file/directory" -#: merge-recursive.c:3331 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "directory/file" -#: merge-recursive.c:3338 +#: merge-recursive.c:3374 #, 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:3347 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "Aggiunta %s" -#: merge-recursive.c:3356 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLITTO (aggiungi/aggiungi): conflitto di merge in %s" -#: 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 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "Giร aggiornato!" -#: merge-recursive.c:3414 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "merge degli alberi %s e %s non riuscito" -#: merge-recursive.c:3513 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "Merge in corso:" -#: merge-recursive.c:3526 +#: merge-recursive.c:3563 #, 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:3565 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "il merge non ha restituito alcun commit" -#: merge-recursive.c:3631 +#: merge-recursive.c:3672 +#, 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:3769 #, c-format msgid "Could not parse object '%s'" msgstr "Impossibile analizzare l'oggetto '%s'" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 msgid "Unable to write index." msgstr "Impossibile scrivere l'indice." -#: midx.c:69 +#: merge.c:41 +msgid "failed to read the cache" +msgstr "lettura della cache non riuscita" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "impossibile scrivere il nuovo file index" + +#: midx.c:79 #, c-format msgid "multi-pack-index file %s is too small" msgstr "il file multi-pack-index %s รจ troppo piccolo" -#: midx.c:85 +#: midx.c:95 #, 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:90 +#: midx.c:100 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versione %d multi-pack-index non riconosciuta" -#: midx.c:95 +#: midx.c:105 #, c-format -msgid "hash version %u does not match" -msgstr "la versione dell'hash %u non corrisponde" +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "" +"la versione dell'hash multi-pack-index %u non corrisponde alla versione %u" -#: midx.c:109 +#: midx.c:122 msgid "invalid chunk offset (too large)" msgstr "offset blocco non valido (troppo grande)" -#: midx.c:133 +#: midx.c:146 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:146 +#: midx.c:159 msgid "multi-pack-index missing required pack-name chunk" msgstr "dal multi-pack-index manca il blocco richiesto pack-name" -#: midx.c:148 +#: midx.c:161 msgid "multi-pack-index missing required OID fanout chunk" msgstr "dal multi-pack-index manca il blocco richiesto fanout OID" -#: midx.c:150 +#: midx.c:163 msgid "multi-pack-index missing required OID lookup chunk" msgstr "dal multi-pack-index manca il blocco richiesto lookup OID" -#: midx.c:152 +#: midx.c:165 msgid "multi-pack-index missing required object offsets chunk" msgstr "dal multi-pack-index manca il blocco richiesto offset oggetti" -#: midx.c:166 +#: midx.c:179 #, 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:211 +#: midx.c:222 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "pack-int-id non valido: %u (%u pack totali)" -#: midx.c:261 +#: midx.c:272 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:289 +#: midx.c:300 msgid "error preparing packfile from multi-pack-index" msgstr "errore durante la preparazione del packfile dal multi-pack-index" -#: midx.c:470 +#: midx.c:485 #, c-format msgid "failed to add packfile '%s'" msgstr "aggiunta del packfile '%s' non riuscita" -#: midx.c:476 +#: midx.c:491 #, c-format msgid "failed to open pack-index '%s'" msgstr "apertura del pack-index '%s' non riuscita" -#: midx.c:536 +#: midx.c:551 #, c-format msgid "failed to locate object %d in packfile" msgstr "ricerca dell'oggetto %d nel packfile non riuscita" -#: midx.c:865 +#: midx.c:853 +msgid "Adding packfiles to multi-pack-index" +msgstr "Aggiunta dei file pack al multi-pack-index in corso" + +#: midx.c:886 #, c-format msgid "did not see pack-file %s to drop" msgstr "non ho visto il file pack %s da scartare" -#: midx.c:1036 +#: midx.c:938 +msgid "no pack files to index." +msgstr "nessun file pack da indicizzare." + +#: midx.c:990 +msgid "Writing chunks to multi-pack-index" +msgstr "Scrittura dei chunk nel multi-pack-index in corso" + +#: midx.c:1068 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "pulizia del multi-pack-index %s non riuscita" -#: midx.c:1091 +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "" +"il file multi-pack-index esiste, ma non รจ stato possibile interpretarlo" + +#: midx.c:1132 msgid "Looking for referenced packfiles" msgstr "Ricerca di file pack referenziati in corso" -#: midx.c:1106 +#: midx.c:1147 #, 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:1110 -msgid "Verifying OID order in MIDX" -msgstr "Verifica ordine OID in MIDX in corso" +#: midx.c:1152 +msgid "the midx contains no oid" +msgstr "il midx non contiene alcun OID" -#: midx.c:1119 +#: midx.c:1161 +msgid "Verifying OID order in multi-pack-index" +msgstr "Verifica ordine OID nel multi-pack-index in corso" + +#: midx.c:1170 #, 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:1138 +#: midx.c:1190 msgid "Sorting objects by packfile" msgstr "Ordinamento degli oggetti nel packfile in corso" -#: midx.c:1144 +#: midx.c:1197 msgid "Verifying object offsets" msgstr "Verifica offset oggetti in corso" -#: midx.c:1160 +#: midx.c:1213 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "caricamento voce pack per oid[%d] = %s non riuscito" -#: midx.c:1166 +#: midx.c:1219 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "caricamento pack-index per il packfile %s non riuscito" -#: midx.c:1175 +#: midx.c:1228 #, 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:1350 +#: midx.c:1253 +msgid "Counting referenced objects" +msgstr "Conteggio degli oggetti referenziati in corso" + +#: midx.c:1263 +msgid "Finding and deleting unreferenced packfiles" +msgstr "Ricerca ed eliminazione dei file pack non referenziati in corso" + +#: midx.c:1454 msgid "could not start pack-objects" msgstr "impossibile avviare pack-objects" -#: midx.c:1369 +#: midx.c:1474 msgid "could not finish pack-objects" msgstr "impossibile finire pack-objects" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "impossibile creare il thread lazy_dir: %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "impossibile creare il thread lazy_name: %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "impossibile bloccare il thread lazy_name: %s" @@ -4326,47 +5258,72 @@ 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:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "tipo oggetto \"%s\" non valido" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "l'oggetto %s รจ un %s, non un %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "l'oggetto %s ha l'ID tipo sconosciuto %d" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "impossibile analizzare l'oggetto: %s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "hash non corrispondente: %s" -#: packfile.c:648 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "impossibile recuperare le dimensioni di %s" + +#: packfile.c:630 msgid "offset before end of packfile (broken .idx?)" msgstr "offset collocato prima della fine del packfile (.idx corrotto?)" -#: packfile.c:1899 +#: packfile.c:1922 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "offset collocato prima dell'inizio dell'indice pack per %s (indice corrotto?)" -#: packfile.c:1903 +#: packfile.c:1926 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "offset collocato dopo la fine dell'indice pack per %s (indice troncato?)" +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "l'opzione `%s' richiede un valore numerico" + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "data scadenza '%s' malformata" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "l'opzione `%s' richiede \"always\", \"auto\" o \"never\"" + +#: parse-options-cb.c:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "nome oggetto '%s' malformato" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4382,7 +5339,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:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "%s non richiede un valore" @@ -4392,42 +5349,47 @@ msgstr "%s non richiede un valore" msgid "%s isn't available" msgstr "%s non รจ disponibile" -#: parse-options.c:219 +#: parse-options.c:217 #, 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:389 +#: parse-options.c:386 #, 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:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, 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:859 +#: parse-options.c:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "alias di --%s" + +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "opzione sconosciuta `%s'" -#: parse-options.c:861 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "opzione `%c` sconosciuta" -#: parse-options.c:863 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opzione non ASCII sconosciuta presente nella stringa: `%s'" -#: parse-options.c:887 +#: parse-options.c:890 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -4435,76 +5397,51 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " oppure: %s" -#: parse-options.c:915 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:957 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:968 -#, c-format -msgid "alias of --%s" -msgstr "alias di --%s" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "l'opzione `%s' richiede un valore numerico" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "data scadenza '%s' malformata" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "l'opzione `%s' richiede \"always\", \"auto\" o \"never\"" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "nome oggetto '%s' malformato" - -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "Impossibile rendere %s scrivibile dal gruppo" -#: pathspec.c:128 +#: pathspec.c:130 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:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "ร consentita solo una specifica 'attr:'." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "la specifica attr non deve essere vuota" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "nome attributo %s non valido" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "le impostazioni globali specificatore percorso 'glob' e 'noglob' non sono " "compatibili" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4512,51 +5449,56 @@ msgstr "" "l'impostazione globale specificatore percorso 'literal' รจ incompatibile con " "tutte le altre impostazioni globali specificatore percorso" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "parametro per il magic specificatore percorso 'prefix' non valido" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Magic specificatore percorso '%.*s' in '%s' non valido" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "')' mancante alla fine del magic specificatore percorso in '%s'" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Magic specificatore percorso '%c' in '%s' non implementato" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' e 'glob' non sono compatibili" -#: pathspec.c:440 +#: pathspec.c:445 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: '%s' รจ al di fuori del repository" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: '%s' รจ al di fuori del repository in '%s'" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (opzione mnemonica: '%c')" -#: pathspec.c:524 +#: pathspec.c:531 #, 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:591 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" "lo specificatore percorso '%s' si trova oltre un collegamento simbolico" +#: pathspec.c:643 +#, 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" @@ -4566,46 +5508,50 @@ msgid "unable to write delim packet" msgstr "impossibile scrivere il pacchetto delim" #: pkt-line.c:106 +msgid "unable to write stateless separator packet" +msgstr "impossibile scrivere il pacchetto separatore senza stato" + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "scrittura con flush pacchetto non riuscita" -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "errore protocollo: riga impossibilmente lunga" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "scrittura pacchetto con formato non riuscita" -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "" "scrittura pacchetto non riuscita - i dati sono piรน della dimensione massima " "pacchetto" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "scrittura pacchetto non riuscita" -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "errore di lettura" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "l'interlocutore remoto ha chiuso inaspettatamente la connessione" -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "errore protocollo: carattere lunghezza riga non valido: %.4s" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "errore protocollo: lunghezza riga non valida: %d" -#: pkt-line.c:362 +#: pkt-line.c:373 sideband.c:150 #, c-format msgid "remote error: %s" msgstr "errore remoto: %s" @@ -4619,83 +5565,116 @@ msgstr "Aggiornamento indice in corso" msgid "unable to create threaded lstat: %s" msgstr "impossibile creare lstat in versione threaded: %s" -#: pretty.c:966 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "impossibile analizzare il formato --pretty" -#: range-diff.c:70 +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "" +"promisor-remote: impossibile eseguire il fork del sottoprocesso di fetch" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "promisor-remote: impossibile scrivere sul sottoprocesso di fetch" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" +"promisor-remote: impossibile chiudere lo standard input del sottoprocesso di " +"fetch" + +#: promisor-remote.c:53 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "il nome del remoto promettente non puรฒ iniziare con '/': %s" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "Rimozione oggetti duplicati in corso" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "impossibile avviare `log`" -#: range-diff.c:72 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "impossibile leggere l'output di `log`" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:98 sequencer.c:5283 #, c-format msgid "could not parse commit '%s'" msgstr "impossibile analizzare il commit '%s'" -#: range-diff.c:117 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" +"impossibile analizzare la prima riga dell'output di `log`: non inizia con " +"'commit ': %s" + +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "impossibile analizzare l'header Git '%.*s'" -#: range-diff.c:274 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "generazione del diff non riuscita" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "impossibile analizzare il registro di '%s'" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "non aggiungerรฒ l'alias file '%s' ('%s' esiste giร nell'indice)" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "impossibile creare un blob vuoto nel database oggetti" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: รจ possibile aggiungere solo file regolari, collegamenti simbolici o " "directory Git" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' non ha un commit di cui รจ stato eseguito il checkout" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "impossibile indicizzare il file '%s'" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "impossibile aggiungere '%s' all'indice" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "impossibile eseguire stat su '%s'" -#: read-cache.c:1314 +#: read-cache.c:1318 #, 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:1499 +#: read-cache.c:1524 msgid "Refresh index" msgstr "Aggiornamento indice" -#: read-cache.c:1613 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4704,7 +5683,7 @@ msgstr "" "index.version impostato, ma il valore non รจ valido.\n" "Uso la versione %i" -#: read-cache.c:1623 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4713,143 +5692,154 @@ msgstr "" "GIT_INDEX_VERSION impostato, ma il valore non รจ valido.\n" "Uso la versione %i" -#: read-cache.c:1679 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "firma non valida: 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "versione indice non valida: %d" -#: read-cache.c:1691 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "firma SHA1 file indice non valida" -#: read-cache.c:1721 +#: read-cache.c:1747 #, 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:1723 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "estensione %.4s ignorata" -#: read-cache.c:1760 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "formato voce indice sconosciuto: 0x%08x" -#: read-cache.c:1776 +#: read-cache.c:1802 #, 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:1833 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "voci stage non ordinate nell'indice" -#: read-cache.c:1836 +#: read-cache.c:1862 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "voci stage multiple per il file sottoposto a merge '%s'" -#: read-cache.c:1839 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "voci stage non ordinate per '%s'" -#: 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 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "file indice corrotto" -#: read-cache.c:2087 +#: read-cache.c:2115 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "impossibile creare il thread load_cache_entries: %s" -#: read-cache.c:2100 +#: read-cache.c:2128 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "impossibile bloccare il thread load_cache_entries: %s" -#: read-cache.c:2133 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "%s: apertura del file indice non riuscita" -#: read-cache.c:2137 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: impossibile eseguire stat sull'indice aperto" -#: read-cache.c:2141 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: file indice piรน piccolo della dimensione attesa" -#: read-cache.c:2145 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "%s: impossibile mappare il file indice" -#: read-cache.c:2187 +#: read-cache.c:2215 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "impossibile creare il thread load_index_extensions: %s" -#: read-cache.c:2214 +#: read-cache.c:2242 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "impossibile bloccare il thread load_index_extensions: %s" -#: read-cache.c:2246 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "impossibile aggiornare l'indice condiviso '%s'" -#: read-cache.c:2293 +#: read-cache.c:2321 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "indice corrotto, atteso %s in %s, presente %s" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 #, c-format msgid "could not close '%s'" msgstr "impossibile chiudere '%s'" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 #, c-format msgid "could not stat '%s'" msgstr "impossibile eseguire lo stat di '%s'" -#: read-cache.c:3105 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "impossibile aprire la directory git: %s" -#: read-cache.c:3117 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "impossibile eseguire unlink: %s" -#: read-cache.c:3142 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "impossibile correggere i permessi di '%s'" -#: read-cache.c:3291 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: impossibile ripiegare sullo stadio 0" -#: rebase-interactive.c:26 +#: 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 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." @@ -4857,7 +5847,7 @@ msgstr "" "impostazione %s non riconosciuta per l'opzione rebase.missingCommitsCheck. " "La ignoro." -#: rebase-interactive.c:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -4902,14 +5892,14 @@ msgstr "" "Queste righe possono essere riordinate; saranno eseguite dalla prima " "all'ultima.\n" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, 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:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4918,7 +5908,7 @@ msgstr "" "Non eliminare alcuna riga. Usa esplicitamente 'drop' per rimuovere un " "commit.\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4926,7 +5916,7 @@ msgstr "" "\n" "Rimuovendo una riga da qui IL COMMIT CORRISPONDENTE ANDRร PERDUTO.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4940,7 +5930,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4950,22 +5940,19 @@ msgstr "" "Ciรฒ nonostante, se rimuovi tutto, il rebase sarร annullato.\n" "\n" -#: 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 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 #, c-format msgid "could not write '%s'" msgstr "impossibile scrivere '%s'" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "impossibile copiare '%s' in '%s'." +msgid "could not write '%s'." +msgstr "impossibile scrivere '%s'." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -4975,7 +5962,7 @@ msgstr "" "accidentalmente.\n" "Commit scartati (dal piรน al meno recente):\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -4993,124 +5980,14 @@ msgstr "" "I comportamenti possibili sono ignore, warn, error.\n" "\n" -#: refs.c:262 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 #, c-format -msgid "%s does not point to a valid object!" -msgstr "%s non punta a un oggetto valido!" - -#: refs.c:667 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "ignoro il riferimento simbolico pendente %s" - -#: refs.c:669 ref-filter.c:2092 -#, c-format -msgid "ignoring broken ref %s" -msgstr "ignoro il riferimento rotto %s" - -#: refs.c:804 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "impossibile aprire '%s' in scrittura: %s" - -#: refs.c:814 refs.c:865 -#, c-format -msgid "could not read ref '%s'" -msgstr "impossibile leggere il riferimento '%s'" - -#: refs.c:820 -#, c-format -msgid "ref '%s' already exists" -msgstr "il riferimento '%s' esiste giร " - -#: refs.c:825 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "ID oggetto inatteso durante la scrittura di '%s'" - -#: 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 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" - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "ID oggetto inatteso durante l'eliminazione di '%s'" - -#: refs.c:998 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "il registro per il riferimento %s ha delle voci mancanti dopo %s" - -#: refs.c:1004 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "il registro per il riferimento %s รจ terminato inaspettatamente a %s" - -#: refs.c:1063 -#, c-format -msgid "log for %s is empty" -msgstr "il registro per %s รจ vuoto" - -#: refs.c:1155 -#, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "mi rifiuto di aggiornare il riferimento con il nome non valido '%s'" - -#: refs.c:1231 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "update_ref per il riferimento '%s' non riuscita: %s" - -#: refs.c:2012 -#, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti" - -#: refs.c:2044 -msgid "ref updates forbidden inside quarantine environment" -msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena" - -#: refs.c:2140 refs.c:2170 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "'%s' esiste giร ; impossibile creare '%s'" - -#: 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:1234 -#, c-format -msgid "could not remove reference %s" -msgstr "impossibile rimuovere il riferimento %s" - -#: 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:1251 refs/packed-backend.c:1545 -#, c-format -msgid "could not delete references: %s" -msgstr "impossibile eliminare i riferimenti: %s" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "specificatore riferimento '%s' non valido" +msgid "could not read '%s'." +msgstr "impossibile leggere '%s'." -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "sparito" @@ -5129,122 +6006,127 @@ msgstr "prima di %d" msgid "ahead %d, behind %d" msgstr "dopo %d, prima di %d" -#: ref-filter.c:162 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato atteso: %%(color:<colore>)" -#: ref-filter.c:164 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "colore non riconosciuto: %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Atteso valore intero: refname:lstrip=%s" -#: ref-filter.c:190 +#: ref-filter.c:197 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Atteso valore intero: refname:rstrip=%s" -#: ref-filter.c:192 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argomento %%(%s) non riconosciuto: %s" -#: ref-filter.c:247 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) non accetta argomenti" -#: ref-filter.c:269 +#: ref-filter.c:276 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "argomento %%(objectsize) non riconosciuto: %s" -#: ref-filter.c:277 +#: ref-filter.c:284 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) non accetta argomenti" -#: ref-filter.c:289 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) non accetta argomenti" -#: ref-filter.c:298 +#: ref-filter.c:309 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) non accetta argomenti" +msgid "unrecognized %%(subject) argument: %s" +msgstr "argomento %%(subject) non riconosciuto: %s" -#: ref-filter.c:320 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argomento %%(trailers) sconosciuto: %s" -#: ref-filter.c:349 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "atteso valore positivo in contents:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argomento %%(contents) non riconosciuto: %s" -#: ref-filter.c:366 +#: ref-filter.c:380 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "atteso valore positivo in objectname:short=%s" +msgid "positive value expected '%s' in %%(%s)" +msgstr "atteso valore positivo '%s' in %%(%s)" -#: ref-filter.c:370 +#: ref-filter.c:384 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "argomento %%(objectname) non riconosciuto: %s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "argomento non riconosciuto '%s' in %%(%s)" -#: ref-filter.c:400 +#: ref-filter.c:398 +#, c-format +msgid "unrecognized email option: %s" +msgstr "opzione e-mail non riconosciuta: %s" + +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato atteso: %%(align:<ampiezza>,<posizione>)" -#: ref-filter.c:412 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "valore non riconosciuto: position:%s" -#: ref-filter.c:419 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "valore non riconosciuto: width:%s" -#: ref-filter.c:428 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argomento %%(align) non riconosciuto: %s" -#: ref-filter.c:436 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "attesa ampiezza positiva con l'atom %%(align)" -#: ref-filter.c:454 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argomento %%(if) non riconosciuto: %s" -#: ref-filter.c:556 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "nome campo malformato: %.*s" -#: ref-filter.c:583 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "nome campo sconosciuto: %.*s" -#: ref-filter.c:587 +#: ref-filter.c:615 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" @@ -5252,160 +6134,244 @@ msgstr "" "non รจ un repository git, ma il campo '%.*s' richiede l'accesso ai dati " "oggetto" -#: ref-filter.c:711 +#: ref-filter.c:739 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: atomo %%(if) usato senza un atomo %%(then)" -#: ref-filter.c:774 +#: ref-filter.c:802 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: atomo %%(then) usato senza un atomo %%(if)" -#: ref-filter.c:776 +#: ref-filter.c:804 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: atomo %%(then) usato piรน di una volta" -#: ref-filter.c:778 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: atomo %%(then) usato dopo %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:834 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: atomo %%(else) usato senza un atomo %%(if)" -#: ref-filter.c:808 +#: ref-filter.c:836 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: atomo %%(else) usato senza un atomo %%(then)" -#: ref-filter.c:810 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: atomo %%(else) usato piรน di una volta" -#: ref-filter.c:825 +#: ref-filter.c:853 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: atomo %%(end) usato senza l'atomo corrispondente" -#: ref-filter.c:882 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "stringa di formato %s malformata" -#: ref-filter.c:1485 +#: ref-filter.c:1541 #, c-format msgid "no branch, rebasing %s" msgstr "nessun branch, eseguo il rebase di %s" -#: ref-filter.c:1488 +#: ref-filter.c:1544 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "nessun branch, eseguo il rebase dell'HEAD scollegato %s" -#: ref-filter.c:1491 +#: ref-filter.c:1547 #, c-format msgid "no branch, bisect started on %s" msgstr "nessun branch, bisezione avviata su %s" -#: ref-filter.c:1501 +#: ref-filter.c:1557 msgid "no branch" msgstr "nessun branch" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1591 ref-filter.c:1800 #, c-format msgid "missing object %s for %s" msgstr "oggetto %s mancante per %s" -#: ref-filter.c:1547 +#: ref-filter.c:1601 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer non riuscito su %s per %s" -#: ref-filter.c:1998 +#: ref-filter.c:2054 #, c-format msgid "malformed object at '%s'" msgstr "oggetto malformato in '%s'" -#: ref-filter.c:2087 +#: ref-filter.c:2143 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignoro il riferimento con il nome malformato %s" -#: ref-filter.c:2382 -#, c-format -msgid "format: %%(end) atom missing" -msgstr "formato: atomo %%(end) mancante" - -#: ref-filter.c:2482 +#: ref-filter.c:2148 refs.c:657 #, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "l'opzione `%s' non รจ compatibile con --merged" +msgid "ignoring broken ref %s" +msgstr "ignoro il riferimento rotto %s" -#: ref-filter.c:2485 +#: ref-filter.c:2464 #, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "l'opzione `%s' non รจ compatibile con --no-merged" +msgid "format: %%(end) atom missing" +msgstr "formato: atomo %%(end) mancante" -#: ref-filter.c:2495 +#: ref-filter.c:2563 #, c-format msgid "malformed object name %s" msgstr "nome dell'oggetto %s malformato" -#: ref-filter.c:2500 +#: ref-filter.c:2568 #, c-format msgid "option `%s' must point to a commit" msgstr "l'opzione `%s' deve puntare ad un commit" -#: remote.c:363 +#: refs.c:264 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "%s non punta a un oggetto valido!" + +#: refs.c:572 +#, c-format +msgid "could not retrieve `%s`" +msgstr "impossibile recuperare `%s`" + +#: refs.c:579 +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "nome branch non valido: %s = %s" + +#: refs.c:655 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "ignoro il riferimento simbolico pendente %s" + +#: refs.c:892 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "il registro per il riferimento %s ha delle voci mancanti dopo %s" + +#: refs.c:898 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "il registro per il riferimento %s รจ terminato inaspettatamente a %s" + +#: refs.c:957 +#, c-format +msgid "log for %s is empty" +msgstr "il registro per %s รจ vuoto" + +#: refs.c:1049 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "mi rifiuto di aggiornare il riferimento con il nome non valido '%s'" + +#: refs.c:1120 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "update_ref per il riferimento '%s' non riuscita: %s" + +#: refs.c:1944 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti" + +#: refs.c:2024 +msgid "ref updates forbidden inside quarantine environment" +msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena" + +#: refs.c:2035 +msgid "ref updates aborted by hook" +msgstr "aggiornamento ref interrotto dall'hook" + +#: refs.c:2135 refs.c:2165 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "'%s' esiste giร ; impossibile creare '%s'" + +#: refs.c:2141 refs.c:2176 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "impossibile gestire '%s' e '%s' contemporaneamente" + +#: refs/files-backend.c:1228 +#, c-format +msgid "could not remove reference %s" +msgstr "impossibile rimuovere il riferimento %s" + +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "impossibile eliminare il riferimento %s: %s" + +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#, c-format +msgid "could not delete references: %s" +msgstr "impossibile eliminare i riferimenti: %s" + +#: refspec.c:167 +#, c-format +msgid "invalid refspec '%s'" +msgstr "specificatore riferimento '%s' non valido" + +#: remote.c:351 #, 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:410 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "รจ stata specificata piรน di una direttiva receivepack, uso la prima" -#: remote.c:418 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "รจ stata specificata piรน di una direttiva uploadpack, uso la prima" -#: remote.c:608 +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossibile recuperare sia %s sia %s in %s" -#: remote.c:612 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s solitamente traccia %s, non %s" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s traccia sia %s sia %s" -#: remote.c:684 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "la chiave '%s' del pattern non aveva un '*'" -#: remote.c:694 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "il valore '%s' del pattern non ha un '*'" -#: remote.c:1000 +#: remote.c:1073 #, c-format msgid "src refspec %s does not match any" msgstr "nessuna corrispondenza per lo specificatore riferimento sorgente %s" -#: remote.c:1005 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5416,7 +6382,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5442,7 +6408,7 @@ msgstr "" "Nessuna delle due opzioni ha funzionato, quindi ci siamo arresi.\n" "Devi specificare un riferimento completamente qualificato." -#: remote.c:1040 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5453,7 +6419,7 @@ msgstr "" "รจ un oggetto tag. Forse intendevi creare un nuovo\n" "branch eseguendo il push a '%s:refs/heads/%s'?" -#: remote.c:1045 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5464,7 +6430,7 @@ msgstr "" "รจ un oggetto tag. Forse intendevi creare un nuovo\n" "branch eseguendo il push a '%s:refs/tags/%s'?" -#: remote.c:1050 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5476,7 +6442,7 @@ msgstr "" "tag a un nuovo albero eseguendo il push a\n" "'%s:refs/tags/%s'?" -#: remote.c:1055 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5488,121 +6454,121 @@ msgstr "" "tag a un nuovo blob eseguendo il push a\n" "'%s:refs/tags/%s'?" -#: remote.c:1091 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s non puรฒ essere risolto in un branch" -#: remote.c:1102 +#: remote.c:1175 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "impossibile eliminare '%s': il riferimento remoto non esiste" -#: remote.c:1114 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "" "sono state trovate piรน corrispondenze per lo specificatore riferimento " "destinazione %s" -#: remote.c:1121 +#: remote.c:1194 #, 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:1624 remote.c:1725 +#: remote.c:1703 remote.c:1804 msgid "HEAD does not point to a branch" msgstr "HEAD non punta ad un branch" -#: remote.c:1633 +#: remote.c:1712 #, c-format msgid "no such branch: '%s'" msgstr "branch '%s' non esistente" -#: remote.c:1636 +#: remote.c:1715 #, c-format msgid "no upstream configured for branch '%s'" msgstr "nessun upstream configurato per il branch '%s'" -#: remote.c:1642 +#: remote.c:1721 #, 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:1657 +#: remote.c:1736 #, 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:1669 +#: remote.c:1748 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "il branch '%s' non ha un remoto per il push" -#: remote.c:1679 +#: remote.c:1758 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "gli specificatori riferimento per '%s' non includono '%s'" -#: remote.c:1692 +#: remote.c:1771 msgid "push has no destination (push.default is 'nothing')" msgstr "il push non ha una destinazione (push.default รจ 'nothing')" -#: remote.c:1714 +#: remote.c:1793 msgid "cannot resolve 'simple' push to a single destination" msgstr "impossibile risolvere il push 'simple' a una singola destinazione" -#: remote.c:1840 +#: remote.c:1922 #, c-format msgid "couldn't find remote ref %s" msgstr "impossibile trovare il riferimento remoto %s" -#: remote.c:1853 +#: remote.c:1935 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignoro localmente il riferimento strano '%s'" -#: remote.c:2016 +#: remote.c:2098 #, 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:2020 +#: remote.c:2102 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" per correggere la situazione)\n" -#: remote.c:2023 +#: remote.c:2105 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Il tuo branch รจ aggiornato rispetto a '%s'.\n" -#: remote.c:2027 +#: remote.c:2109 #, 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:2030 +#: remote.c:2112 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (usa \"%s\" per visualizzare i dettagli)\n" -#: remote.c:2034 +#: remote.c:2116 #, 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:2040 +#: remote.c:2122 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" per pubblicare i tuoi commit locali)\n" -#: remote.c:2043 +#: remote.c:2125 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5614,11 +6580,11 @@ msgstr[1] "" "Il tuo branch, rispetto a '%s', รจ indietro di %d commit e ne posso eseguire " "il fast forward.\n" -#: remote.c:2051 +#: remote.c:2133 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" per aggiornare il tuo branch locale)\n" -#: remote.c:2054 +#: remote.c:2136 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5633,11 +6599,11 @@ msgstr[1] "" "Il tuo branch e '%s' sono diventati divergenti\n" "e hanno rispettivamente %d e %d commit differenti.\n" -#: remote.c:2064 +#: remote.c:2146 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:2247 +#: remote.c:2337 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossibile analizzare il nome oggetto atteso '%s'" @@ -5652,7 +6618,7 @@ msgstr "nome riferimento sostitutivo non valido: %s" msgid "duplicate replace ref: %s" msgstr "riferimento sostitutivo duplicato: %s" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "profonditร sostituzione troppo elevata per l'oggetto %s" @@ -5715,8 +6681,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:2023 builtin/log.c:1773 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "impossibile creare la directory '%s'" @@ -5750,20 +6716,34 @@ msgstr "Risoluzione per '%s' dimenticata\n" msgid "unable to open rr-cache directory" msgstr "impossibile aprire la directory cache rr" -#: revision.c:2507 +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "impossibile determinare la revisione HEAD" + +#: reset.c:70 reset.c:76 sequencer.c:3426 +#, c-format +msgid "failed to find tree of %s" +msgstr "impossibile trovare l'albero di %s" + +#: revision.c:2344 +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<packfile> non รจ piรน supportato" + +#: revision.c:2364 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "valore sconosciuto per --diff-merges: %s" + +#: revision.c:2702 msgid "your current branch appears to be broken" msgstr "sembra che il tuo branch corrente sia rotto" -#: revision.c:2510 +#: revision.c:2705 #, 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:2710 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent non รจ compatibile con --bisect" - -#: revision.c:2714 +#: revision.c:2915 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L non supporta ancora formati diff oltre a -p e -s" @@ -5771,12 +6751,12 @@ msgstr "-L non supporta ancora formati diff oltre a -p e -s" msgid "open /dev/null failed" msgstr "apertura di /dev/null non riuscita" -#: run-command.c:1269 +#: run-command.c:1270 #, c-format msgid "cannot create async thread: %s" msgstr "impossibile creare il thread async: %s" -#: run-command.c:1333 +#: run-command.c:1334 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5785,31 +6765,35 @@ 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:141 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "pacchetto flush inatteso durante la lettura dello stato decompressione del " "remoto" -#: send-pack.c:143 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "impossibile analizzare lo stato decompressione del remoto: %s" -#: send-pack.c:145 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "decompressione sul remoto non riuscita: %s" -#: send-pack.c:306 +#: send-pack.c:372 msgid "failed to sign the push certificate" msgstr "firma del certificato per il push non riuscita" -#: send-pack.c:420 +#: send-pack.c:460 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "il ricevente non supporta l'algoritmo hash di questo repository" + +#: send-pack.c:469 msgid "the receiving end does not support --signed push" msgstr "il ricevente non supporta i push --signed" -#: send-pack.c:422 +#: send-pack.c:471 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5817,47 +6801,47 @@ msgstr "" "non invio un certificato push perchรฉ il ricevente non supporta i push --" "signed" -#: send-pack.c:434 +#: send-pack.c:483 msgid "the receiving end does not support --atomic push" msgstr "il ricevente non supporta i push --atomic" -#: send-pack.c:439 +#: send-pack.c:488 msgid "the receiving end does not support push options" msgstr "il ricevente non supporta le opzioni push" -#: sequencer.c:187 +#: sequencer.c:194 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "modalitร pulizia messaggio commit non valida: '%s'" -#: sequencer.c:292 +#: sequencer.c:308 #, c-format msgid "could not delete '%s'" msgstr "impossibile eliminare '%s'" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "impossibile rimuovere '%s'" -#: sequencer.c:321 +#: sequencer.c:339 msgid "revert" msgstr "revert" -#: sequencer.c:323 +#: sequencer.c:341 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:325 -msgid "rebase -i" -msgstr "rebase -i" +#: sequencer.c:343 +msgid "rebase" +msgstr "rebase" -#: sequencer.c:327 +#: sequencer.c:345 #, c-format msgid "unknown action: %d" msgstr "azione sconosciuta: %d" -#: sequencer.c:385 +#: sequencer.c:404 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5865,7 +6849,7 @@ msgstr "" "dopo aver risolto i conflitti, contrassegna i percorsi corretti\n" "con 'git add <path>' o 'git rm <path>'" -#: sequencer.c:388 +#: sequencer.c:407 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5875,115 +6859,109 @@ msgstr "" "con 'git add <path>' o 'git rm <path>' ed esegui\n" "il commit del risultato con 'git commit'" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:420 sequencer.c:3028 #, c-format msgid "could not lock '%s'" msgstr "impossibile bloccare '%s'" -#: sequencer.c:408 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "impossibile scrivere su '%s'" + +#: sequencer.c:427 #, c-format msgid "could not write eol to '%s'" msgstr "impossibile scrivere il carattere di fine riga in '%s'" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 #, c-format msgid "failed to finalize '%s'" msgstr "finalizzazione di '%s' non riuscita" -#: 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:462 +#: sequencer.c:471 #, c-format msgid "your local changes would be overwritten by %s." msgstr "le tue modifiche locali sarebbero sovrascritte da %s." -#: sequencer.c:466 +#: sequencer.c:475 msgid "commit your changes or stash them to proceed." msgstr "esegui il commit delle modifiche o lo stash per procedere." -#: sequencer.c:498 +#: sequencer.c:507 #, c-format msgid "%s: fast-forward" msgstr "%s: fast forward" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:546 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modalitร pulizia non valida: %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:632 +#: sequencer.c:640 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: impossibile scrivere il nuovo file indice" -#: sequencer.c:649 +#: sequencer.c:657 msgid "unable to update cache tree" msgstr "impossibile aggiornare l'albero cache" -#: sequencer.c:663 +#: sequencer.c:671 msgid "could not resolve HEAD commit" msgstr "impossibile risolvere il commit HEAD" -#: sequencer.c:743 +#: sequencer.c:751 #, c-format msgid "no key present in '%.*s'" msgstr "nessuna chiave presente in '%.*s'" -#: sequencer.c:754 +#: sequencer.c:762 #, c-format msgid "unable to dequote value of '%s'" msgstr "impossibile rimuovere gli apici dal valore di '%s'" -#: 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 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 #, c-format msgid "could not open '%s' for reading" msgstr "impossibile aprire '%s' in lettura" -#: sequencer.c:801 +#: sequencer.c:809 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' giร specificato" -#: sequencer.c:806 +#: sequencer.c:814 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' giร specificato" -#: sequencer.c:811 +#: sequencer.c:819 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' giร specificato" -#: sequencer.c:815 +#: sequencer.c:823 #, c-format msgid "unknown variable '%s'" msgstr "variabile '%s' sconosciuta" -#: sequencer.c:820 +#: sequencer.c:828 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' mancante" -#: sequencer.c:822 +#: sequencer.c:830 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' mancante" -#: sequencer.c:824 +#: sequencer.c:832 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' mancante" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "formato data '%s' non valido in '%s'" - -#: sequencer.c:901 +#: sequencer.c:897 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6013,15 +6991,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "scrittura commit radice in corso" - -#: sequencer.c:1216 +#: sequencer.c:1178 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' non riuscito" -#: sequencer.c:1223 +#: sequencer.c:1184 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6048,7 +7022,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1197 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6074,329 +7048,342 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1239 msgid "couldn't look up newly created commit" msgstr "impossibile trovare il commit appena creato" -#: sequencer.c:1280 +#: sequencer.c:1241 msgid "could not parse newly created commit" msgstr "impossibile analizzare il commit appena creato" -#: sequencer.c:1326 +#: sequencer.c:1287 msgid "unable to resolve HEAD after creating commit" msgstr "impossibile risolvere HEAD dopo la creazione del commit" -#: sequencer.c:1328 +#: sequencer.c:1289 msgid "detached HEAD" msgstr "HEAD scollegato" -#: sequencer.c:1332 +#: sequencer.c:1293 msgid " (root-commit)" msgstr " (commit radice)" -#: sequencer.c:1353 +#: sequencer.c:1314 msgid "could not parse HEAD" msgstr "impossibile analizzare HEAD" -#: sequencer.c:1355 +#: sequencer.c:1316 #, c-format msgid "HEAD %s is not a commit!" msgstr "L'HEAD %s non รจ un commit!" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "impossibile analizzare il commit HEAD" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1373 sequencer.c:2067 msgid "unable to parse commit author" msgstr "impossibile analizzare l'autore del commit" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 msgid "git write-tree failed to write a tree" msgstr "git write-tree non รจ riuscito a scrivere un albero" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1417 sequencer.c:1535 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossibile leggere il messaggio di commit da '%s'" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1446 sequencer.c:1478 +#, c-format +msgid "invalid author identity '%s'" +msgstr "identitร autore '%s' non valida" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "informazioni sull'autore corrotte: informazioni sulla data mancanti" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 msgid "failed to write commit object" msgstr "scrittura dell'oggetto del commit non riuscita" -#: sequencer.c:1526 +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "impossibile aggiornare %s" + +#: sequencer.c:1567 #, c-format msgid "could not parse commit %s" msgstr "impossibile analizzare il commit %s" -#: sequencer.c:1531 +#: sequencer.c:1572 #, c-format msgid "could not parse parent commit %s" msgstr "impossibile analizzare il commit genitore %s" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1655 sequencer.c:1766 #, c-format msgid "unknown command: %d" msgstr "comando sconosciuto: %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1713 sequencer.c:1738 #, c-format msgid "This is a combination of %d commits." msgstr "Questa รจ una combinazione di %d commit." -#: sequencer.c:1672 +#: sequencer.c:1723 msgid "need a HEAD to fixup" msgstr "รจ necessaria un'HEAD per il fixup" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1725 sequencer.c:3338 msgid "could not read HEAD" msgstr "impossibile leggere l'HEAD" -#: sequencer.c:1676 +#: sequencer.c:1727 msgid "could not read HEAD's commit message" msgstr "impossibile leggere il messaggio di commit dell'HEAD" -#: sequencer.c:1682 +#: sequencer.c:1733 #, c-format msgid "cannot write '%s'" msgstr "impossibile scrivere '%s'" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Questo รจ il primo messaggio di commit:" -#: sequencer.c:1697 +#: sequencer.c:1748 #, c-format msgid "could not read commit message of %s" msgstr "impossibile leggere il messaggio di commit di %s" -#: sequencer.c:1704 +#: sequencer.c:1755 #, c-format msgid "This is the commit message #%d:" msgstr "Questo รจ il messaggio di commit numero %d:" -#: sequencer.c:1710 +#: sequencer.c:1761 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Il messaggio di commit numero %d sarร saltato:" -#: sequencer.c:1798 +#: sequencer.c:1849 msgid "your index file is unmerged." msgstr "il file indice non รจ stato sottoposto a merge." -#: sequencer.c:1805 +#: sequencer.c:1856 msgid "cannot fixup root commit" msgstr "impossibile eseguire il fixup sul commit radice" -#: sequencer.c:1824 +#: sequencer.c:1875 #, 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:1832 sequencer.c:1840 +#: sequencer.c:1883 sequencer.c:1891 #, c-format msgid "commit %s does not have parent %d" msgstr "il commit %s non ha il genitore %d" -#: sequencer.c:1846 +#: sequencer.c:1897 #, 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:1865 +#: sequencer.c:1916 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: impossibile analizzare il commit genitore %s" -#: sequencer.c:1930 +#: sequencer.c:1981 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossibile ridenominare '%s' in '%s'" -#: sequencer.c:1985 +#: sequencer.c:2038 #, c-format msgid "could not revert %s... %s" msgstr "non รจ stato possibile eseguire il revert di %s... %s" -#: sequencer.c:1986 +#: sequencer.c:2039 #, c-format msgid "could not apply %s... %s" msgstr "non รจ stato possibile applicare %s... %s" -#: sequencer.c:2045 +#: sequencer.c:2059 +#, 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:2117 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: lettura dell'indice non riuscita" -#: sequencer.c:2052 +#: sequencer.c:2124 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: aggiornamento dell'indice non riuscito" -#: sequencer.c:2128 +#: sequencer.c:2201 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s non accetta argomenti: '%s'" -#: sequencer.c:2137 +#: sequencer.c:2210 #, c-format msgid "missing arguments for %s" msgstr "argomenti mancanti per %s" -#: sequencer.c:2174 +#: sequencer.c:2241 #, c-format -msgid "could not parse '%.*s'" -msgstr "impossibile analizzare '%.*s'" +msgid "could not parse '%s'" +msgstr "impossibile analizzare '%s'" -#: sequencer.c:2228 +#: sequencer.c:2302 #, c-format msgid "invalid line %d: %.*s" msgstr "riga %d non valida: %.*s" -#: sequencer.c:2239 +#: sequencer.c:2313 #, c-format msgid "cannot '%s' without a previous commit" msgstr "impossibile eseguire '%s' senza un commit precedente" -#: 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 +#: sequencer.c:2399 msgid "cancelling a cherry picking in progress" msgstr "annullo un'operazione di cherry-pick in corso" -#: sequencer.c:2330 +#: sequencer.c:2408 msgid "cancelling a revert in progress" msgstr "annullo un'operazione di revert in corso" -#: sequencer.c:2364 +#: sequencer.c:2452 msgid "please fix this using 'git rebase --edit-todo'." msgstr "correggi la situazione usando 'git rebase --edit-todo'." -#: sequencer.c:2366 +#: sequencer.c:2454 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "foglio istruzioni inutilizzabile: '%s'" -#: sequencer.c:2371 +#: sequencer.c:2459 msgid "no commits parsed." msgstr "nessun commit analizzato." -#: sequencer.c:2382 +#: sequencer.c:2470 msgid "cannot cherry-pick during a revert." msgstr "impossibile eseguire un cherry-pick durante un revert." -#: sequencer.c:2384 +#: sequencer.c:2472 msgid "cannot revert during a cherry-pick." msgstr "impossibile eseguire un revert durante un cherry-pick." -#: sequencer.c:2466 +#: sequencer.c:2550 #, c-format msgid "invalid value for %s: %s" msgstr "valore non valido per %s: %s" -#: sequencer.c:2553 +#: sequencer.c:2657 msgid "unusable squash-onto" msgstr "squash-onto inutilizzabile" -#: sequencer.c:2569 +#: sequencer.c:2677 #, c-format msgid "malformed options sheet: '%s'" msgstr "foglio opzioni malformati: '%s'" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2769 sequencer.c:4609 msgid "empty commit set passed" msgstr "รจ stato passato un insieme di commit vuoto" -#: sequencer.c:2668 +#: sequencer.c:2786 msgid "revert is already in progress" msgstr "un'operazione di revert รจ giร in corso" -#: sequencer.c:2670 +#: sequencer.c:2788 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "prova \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2673 +#: sequencer.c:2791 msgid "cherry-pick is already in progress" msgstr "un'operazione di cherry-pick รจ giร in corso" -#: sequencer.c:2675 +#: sequencer.c:2793 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "prova \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2689 +#: sequencer.c:2807 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossibile creare la directory sequencer '%s'" -#: sequencer.c:2704 +#: sequencer.c:2822 msgid "could not lock HEAD" msgstr "impossibile bloccare HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2882 sequencer.c:4325 msgid "no cherry-pick or revert in progress" msgstr "nessuna operazione di cherry-pick o revert in corso" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2884 sequencer.c:2895 msgid "cannot resolve HEAD" msgstr "impossibile risolvere HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2886 sequencer.c:2930 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:2798 builtin/grep.c:734 +#: sequencer.c:2916 builtin/grep.c:745 #, c-format msgid "cannot open '%s'" msgstr "impossibile aprire '%s'" -#: sequencer.c:2800 +#: sequencer.c:2918 #, c-format msgid "cannot read '%s': %s" msgstr "impossibile leggere '%s': %s" -#: sequencer.c:2801 +#: sequencer.c:2919 msgid "unexpected end of file" msgstr "fine del file inattesa" -#: sequencer.c:2807 +#: sequencer.c:2925 #, 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:2818 +#: sequencer.c:2936 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:2859 +#: sequencer.c:2977 msgid "no revert in progress" msgstr "nessun revert in corso" -#: sequencer.c:2867 +#: sequencer.c:2986 msgid "no cherry-pick in progress" msgstr "nessun cherry-pick in corso" -#: sequencer.c:2877 +#: sequencer.c:2996 msgid "failed to skip the commit" msgstr "salto del commit non riuscito" -#: sequencer.c:2884 +#: sequencer.c:3003 msgid "there is nothing to skip" msgstr "non c'รจ nulla da saltare" -#: sequencer.c:2887 +#: sequencer.c:3006 #, c-format msgid "" "have you committed already?\n" @@ -6405,21 +7392,16 @@ msgstr "" "hai giร eseguito il commit?\n" "prova \"git %s --continue\"" -#: sequencer.c:3011 sequencer.c:4015 -#, c-format -msgid "could not update %s" -msgstr "impossibile aggiornare %s" - -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3168 sequencer.c:4217 msgid "cannot read HEAD" msgstr "impossibile leggere l'HEAD" -#: sequencer.c:3066 +#: sequencer.c:3185 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossibile copiare '%s' in '%s'" -#: sequencer.c:3074 +#: sequencer.c:3193 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6438,27 +7420,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3203 #, c-format msgid "Could not apply %s... %.*s" msgstr "Impossibile applicare %s... %.*s" -#: sequencer.c:3091 +#: sequencer.c:3210 #, c-format msgid "Could not merge %.*s" msgstr "Impossibile eseguire il merge di %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossibile copiare '%s' in '%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 "impossibile leggere l'indice" +#: sequencer.c:3240 +#, c-format +msgid "Executing: %s\n" +msgstr "Eseguo %s\n" -#: sequencer.c:3136 +#: sequencer.c:3255 #, c-format msgid "" "execution failed: %s\n" @@ -6473,11 +7455,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3261 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:3148 +#: sequencer.c:3267 #, c-format msgid "" "execution succeeded: %s\n" @@ -6494,111 +7476,128 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3328 #, c-format msgid "illegal label name: '%.*s'" msgstr "nome etichetta illecito: '%.*s'" -#: sequencer.c:3263 +#: sequencer.c:3382 msgid "writing fake root commit" msgstr "scrittura commit radice falso in corso" -#: sequencer.c:3268 +#: sequencer.c:3387 msgid "writing squash-onto" msgstr "scrittura squash-onto in corso" -#: 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:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "impossibile scrivere l'indice" - -#: sequencer.c:3351 +#: sequencer.c:3471 #, c-format msgid "could not resolve '%s'" msgstr "impossibile risolvere '%s'" -#: sequencer.c:3379 +#: sequencer.c:3502 msgid "cannot merge without a current revision" msgstr "impossibile eseguire il merge senza una revisione corrente" -#: sequencer.c:3401 +#: sequencer.c:3524 #, c-format msgid "unable to parse '%.*s'" msgstr "impossibile analizzare '%.*s'" -#: sequencer.c:3410 +#: sequencer.c:3533 #, c-format msgid "nothing to merge: '%.*s'" msgstr "non c'รจ nulla di cui eseguire il merge: '%.*s'" -#: sequencer.c:3422 +#: sequencer.c:3545 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:3437 +#: sequencer.c:3561 #, c-format msgid "could not get commit message of '%s'" msgstr "impossibile ottenere il messaggio di commit per '%s'" -#: sequencer.c:3590 +#: sequencer.c:3730 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "non รจ stato nemmeno possibile tentare di eseguire il merge di '%.*s'" -#: sequencer.c:3606 +#: sequencer.c:3746 msgid "merge: Unable to write new index file" msgstr "merge: impossibile scrivere il nuovo file indice" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "Impossibile eseguire lo stash automatico" + +#: sequencer.c:3823 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "Risposta stash non attesa: '%s'" + +#: sequencer.c:3829 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "Impossibile creare la directory '%s'" + +#: sequencer.c:3832 +#, c-format +msgid "Created autostash: %s\n" +msgstr "Stash automatico creato: %s\n" + +#: sequencer.c:3836 +msgid "could not reset --hard" +msgstr "impossibile eseguire reset --hard" + +#: sequencer.c:3861 #, c-format msgid "Applied autostash.\n" msgstr "Stash automatico applicato.\n" -#: sequencer.c:3687 +#: sequencer.c:3873 #, c-format msgid "cannot store %s" msgstr "impossibile memorizzare %s" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3876 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"L'applicazione dello stash automatico ha generato conflitti.\n" +"%s\n" "Le tue modifiche sono al sicuro nello stash.\n" "Puoi eseguire \"git stash pop\" o \"git stash drop\" in qualunque momento.\n" -#: sequencer.c:3751 -#, c-format -msgid "could not checkout %s" -msgstr "impossibile eseguire il checkout di %s" +#: sequencer.c:3881 +msgid "Applying autostash resulted in conflicts." +msgstr "L'applicazione dello stash automatico ha generato dei conflitti." -#: sequencer.c:3765 +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." +msgstr "Uno stash automatica esiste giร ; creo una nuova voce stash." + +#: sequencer.c:3974 #, c-format msgid "%s: not a valid OID" msgstr "%s: non รจ un OID valido" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "impossibile scollegare l'HEAD" -#: sequencer.c:3785 +#: sequencer.c:3994 #, c-format msgid "Stopped at HEAD\n" msgstr "Fermato a HEAD\n" -#: sequencer.c:3787 +#: sequencer.c:3996 #, c-format msgid "Stopped at %s\n" msgstr "Fermato a %s\n" -#: sequencer.c:3795 +#: sequencer.c:4004 #, c-format msgid "" "Could not execute the todo command\n" @@ -6620,49 +7619,59 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "Rebase in corso (%d/%d)%s" + +#: sequencer.c:4095 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Fermato a %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:4166 #, c-format msgid "unknown command %d" msgstr "comando %d sconosciuto" -#: sequencer.c:4003 +#: sequencer.c:4225 msgid "could not read orig-head" msgstr "impossibile leggere orig-head" -#: sequencer.c:4008 +#: sequencer.c:4230 msgid "could not read 'onto'" msgstr "impossibile leggere 'onto'" -#: sequencer.c:4022 +#: sequencer.c:4244 #, c-format msgid "could not update HEAD to %s" msgstr "impossibile aggiornare l'HEAD a %s" -#: sequencer.c:4115 +#: sequencer.c:4304 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "Rebase e aggiornamento di %s eseguiti con successo.\n" + +#: sequencer.c:4337 msgid "cannot rebase: You have unstaged changes." msgstr "" "impossibile eseguire il rebase: ci sono delle modifiche non in staging." -#: sequencer.c:4124 +#: sequencer.c:4346 msgid "cannot amend non-existing commit" msgstr "impossibile modificare un commit inesistente" -#: sequencer.c:4126 +#: sequencer.c:4348 #, c-format msgid "invalid file: '%s'" msgstr "file non valido: '%s'" -#: sequencer.c:4128 +#: sequencer.c:4350 #, c-format msgid "invalid contents: '%s'" msgstr "contenuti non validi: '%s'" -#: sequencer.c:4131 +#: sequencer.c:4353 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6673,69 +7682,64 @@ msgstr "" "di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n" "--continue'." -#: sequencer.c:4167 sequencer.c:4205 +#: sequencer.c:4389 sequencer.c:4428 #, c-format msgid "could not write file: '%s'" msgstr "impossibile scrivere il file: '%s'" -#: sequencer.c:4220 +#: sequencer.c:4444 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossibile rimuovere CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4451 msgid "could not commit staged changes." msgstr "impossibile eseguire il commit delle modifiche in staging." -#: sequencer.c:4328 +#: sequencer.c:4477 +#, c-format +msgid "invalid committer '%s'" +msgstr "autore del commit non valido: '%s'" + +#: sequencer.c:4586 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: impossibile eseguire il cherry pick di un %s" -#: sequencer.c:4332 +#: sequencer.c:4590 #, c-format msgid "%s: bad revision" msgstr "%s: revisione non valida" -#: sequencer.c:4367 +#: sequencer.c:4625 msgid "can't revert as initial commit" msgstr "impossibile eseguire il revert come commit iniziale" -#: sequencer.c:4810 +#: sequencer.c:5102 msgid "make_script: unhandled options" msgstr "make_script: opzioni non gestite" -#: sequencer.c:4813 +#: sequencer.c:5105 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 +#: sequencer.c:5347 sequencer.c:5364 msgid "nothing to do" msgstr "nulla da fare" -#: sequencer.c:5114 +#: sequencer.c:5383 msgid "could not skip unnecessary pick commands" msgstr "impossibile saltare i comandi pick non necessari" -#: sequencer.c:5197 +#: sequencer.c:5480 msgid "the script was already rearranged." msgstr "lo script รจ giร stato riordinato." -#: setup.c:123 +#: setup.c:133 #, c-format -msgid "'%s' is outside repository" -msgstr "'%s' รจ al di fuori del repository" +msgid "'%s' is outside repository at '%s'" +msgstr "'%s' รจ al di fuori del repository in '%s'" -#: setup.c:173 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6745,7 +7749,7 @@ msgstr "" "Usa 'git <comando> -- <percorso>...' per specificare percorsi non esistenti " "localmente." -#: setup.c:186 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6757,14 +7761,14 @@ msgstr "" "Usa '--' per separare i percorsi dalle revisioni, come segue:\n" "'git <comando> [<revisione>...] -- [<file>...]'" -#: setup.c:235 +#: setup.c:264 #, 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:254 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6775,93 +7779,99 @@ msgstr "" "Usa '--' per separare i percorsi dalle revisioni, come segue:\n" "'git <comando> [<revisione>...] -- [<file>...]'" -#: setup.c:390 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "" "impossibile preparare l'albero di lavoro usando una configurazione non valida" -#: setup.c:394 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "quest'operazione deve essere eseguita in un albero di lavoro" -#: setup.c:540 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Attesa versione repository Git <= %d, trovata %d" -#: setup.c:548 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "trovate estensioni repository sconosciute:" -#: setup.c:567 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "" +"la versione del repository รจ 0, ma sono state trovate estensioni proprie " +"solo della versione 1:" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "errore durante l'apertura di '%s'" -#: setup.c:569 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "'%s' troppo grande per essere un file .git" -#: setup.c:571 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "errore durante la lettura di %s" -#: setup.c:573 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "formato file Git non valido: %s" -#: setup.c:575 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "nessun percorso presente nel file Git: %s" -#: setup.c:577 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "%s non รจ un repository Git" -#: setup.c:676 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "'$%s' รจ troppo grande" -#: setup.c:690 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "'%s' non รจ un repository Git" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "impossibile modificare la directory corrente in '%s'" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "impossibile tornare alla directory di lavoro corrente" -#: setup.c:851 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "stat di '%*s%s%s' non riuscito" -#: setup.c:1083 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "Impossibile leggere la directory di lavoro corrente" -#: setup.c:1092 setup.c:1098 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "impossibile entrare in '%s'" -#: setup.c:1103 +#: setup.c:1245 #, 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:1109 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6871,7 +7881,7 @@ msgstr "" "Mi fermo al limite del filesystem (l'opzione GIT_DISCOVERY_ACROSS_FILESYSTEM " "non รจ impostata)." -#: setup.c:1220 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6881,289 +7891,289 @@ msgstr "" "(0%.3o).\n" "Il proprietario dei file deve avere sempre i permessi di lettura e scrittura." -#: setup.c:1264 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "apertura di /dev/null o dup non riuscita" -#: setup.c:1279 +#: setup.c:1424 msgid "fork failed" msgstr "fork non riuscita" -#: setup.c:1284 +#: setup.c:1429 msgid "setsid failed" msgstr "setsid non riuscita" -#: sha1-file.c:453 +#: sha1-file.c:470 #, 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:504 +#: sha1-file.c:521 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossibile normalizzare il percorso alternativo oggetto: %s" -#: sha1-file.c:576 +#: sha1-file.c:593 #, 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:583 +#: sha1-file.c:600 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossibile normalizzare la directory oggetti: %s" -#: sha1-file.c:626 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" msgstr "impossibile eseguire fdopen sul file di lock alternates" -#: sha1-file.c:644 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "impossibile leggere il file alternates" -#: sha1-file.c:651 +#: sha1-file.c:668 msgid "unable to move new alternates file into place" msgstr "impossibile spostare il nuovo file alternates nella posizione corretta" -#: sha1-file.c:686 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "il percorso '%s' non esiste" -#: sha1-file.c:712 +#: sha1-file.c:724 #, 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:718 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "il repository di riferimento '%s' non รจ un repository locale." -#: sha1-file.c:724 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "il repository di riferimento '%s' รจ shallow" -#: sha1-file.c:732 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "il repository di riferimento '%s' รจ un graft" -#: sha1-file.c:792 +#: sha1-file.c:804 #, 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:944 +#: sha1-file.c:954 #, 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:969 +#: sha1-file.c:975 msgid "mmap failed" msgstr "mmap non riuscita" -#: sha1-file.c:1133 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "l'oggetto %s รจ vuoto" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1274 sha1-file.c:2467 #, c-format msgid "corrupt loose object '%s'" msgstr "oggetto sciolto '%s' corrotto" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1276 sha1-file.c:2471 #, c-format msgid "garbage at end of loose object '%s'" msgstr "dati inutilizzabili presenti alla fine dell'oggetto sciolto '%s'" -#: sha1-file.c:1301 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "tipo oggetto non valido" -#: sha1-file.c:1385 +#: sha1-file.c:1402 #, 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:1388 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "impossibile decomprimere l'intestazione %s" -#: sha1-file.c:1394 +#: sha1-file.c:1411 #, 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:1397 +#: sha1-file.c:1414 #, c-format msgid "unable to parse %s header" msgstr "impossibile analizzare l'intestazione %s" -#: sha1-file.c:1588 +#: sha1-file.c:1641 #, c-format msgid "failed to read object %s" msgstr "lettura dell'oggetto %s non riuscita" -#: sha1-file.c:1592 +#: sha1-file.c:1645 #, c-format msgid "replacement %s not found for %s" msgstr "%s sostitutivo non trovato per %s" -#: sha1-file.c:1596 +#: sha1-file.c:1649 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'oggetto sciolto %s (salvato in %s) รจ corrotto" -#: sha1-file.c:1600 +#: sha1-file.c:1653 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'oggetto archiviato %s (salvato in %s) รจ corrotto" -#: sha1-file.c:1703 +#: sha1-file.c:1758 #, c-format msgid "unable to write file %s" msgstr "impossibile scrivere il file %s" -#: sha1-file.c:1710 +#: sha1-file.c:1765 #, c-format msgid "unable to set permission to '%s'" msgstr "impossibile impostare i permessi a '%s'" -#: sha1-file.c:1717 +#: sha1-file.c:1772 msgid "file write error" msgstr "errore di scrittura del file" -#: sha1-file.c:1736 +#: sha1-file.c:1792 msgid "error when closing loose object file" msgstr "errore durante la chiusura del file oggetto sciolto" -#: sha1-file.c:1801 +#: sha1-file.c:1857 #, 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:1803 +#: sha1-file.c:1859 msgid "unable to create temporary file" msgstr "impossibile creare il file temporaneo" -#: sha1-file.c:1827 +#: sha1-file.c:1883 msgid "unable to write loose object file" msgstr "impossibile scrivere il file oggetto sciolto" -#: sha1-file.c:1833 +#: sha1-file.c:1889 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossibile comprimere con deflate il nuovo oggetto %s (%d)" -#: sha1-file.c:1837 +#: sha1-file.c:1893 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd non riuscita sull'oggetto %s (%d)" -#: sha1-file.c:1841 +#: sha1-file.c:1897 #, 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:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1907 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "utime() di %s non riuscita" -#: sha1-file.c:1926 +#: sha1-file.c:1984 #, c-format msgid "cannot read object for %s" msgstr "impossibile leggere l'oggetto per %s" -#: sha1-file.c:1966 +#: sha1-file.c:2035 msgid "corrupt commit" msgstr "commit corrotto" -#: sha1-file.c:1974 +#: sha1-file.c:2043 msgid "corrupt tag" msgstr "tag corrotto" -#: sha1-file.c:2073 +#: sha1-file.c:2143 #, c-format msgid "read error while indexing %s" msgstr "errore di lettura durante l'indicizzazione di %s" -#: sha1-file.c:2076 +#: sha1-file.c:2146 #, c-format msgid "short read while indexing %s" msgstr "lettura troppo breve durante l'indicizzazione di %s" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2219 sha1-file.c:2229 #, c-format msgid "%s: failed to insert into database" msgstr "%s: inserimento del record nel database non riuscito" -#: sha1-file.c:2164 +#: sha1-file.c:2235 #, c-format msgid "%s: unsupported file type" msgstr "%s: tipo di file non supportato" -#: sha1-file.c:2188 +#: sha1-file.c:2259 #, c-format msgid "%s is not a valid object" msgstr "%s non รจ un oggetto valido" -#: sha1-file.c:2190 +#: sha1-file.c:2261 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s non รจ un oggetto '%s' valido" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2288 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "impossibile aprire %s" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2478 sha1-file.c:2531 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "mancata corrispondenza per %s (atteso %s)" -#: sha1-file.c:2431 +#: sha1-file.c:2502 #, c-format msgid "unable to mmap %s" msgstr "impossibile eseguire mmap su %s" -#: sha1-file.c:2436 +#: sha1-file.c:2507 #, c-format msgid "unable to unpack header of %s" msgstr "impossibile decomprimere l'intestazione di %s" -#: sha1-file.c:2442 +#: sha1-file.c:2513 #, c-format msgid "unable to parse header of %s" msgstr "impossibile analizzare l'intestazione di %s" -#: sha1-file.c:2453 +#: sha1-file.c:2524 #, c-format msgid "unable to unpack contents of %s" msgstr "impossibile decomprimere i contenuti di %s" -#: sha1-name.c:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "lo SHA1 breve %s รจ ambiguo" -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "I candidati sono:" -#: sha1-name.c:800 +#: 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" @@ -7187,44 +8197,112 @@ 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:1702 +#, 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:1708 +#, 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:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "il percorso '%s' non esiste in '%.*s'" + +#: sha1-name.c:1745 +#, 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:1761 +#, 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:1769 +#, 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:1771 +#, 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:1784 +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:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "nome oggetto non valido: '%.*s'." + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:848 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:867 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:875 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7232,13 +8310,50 @@ msgstr[0] "%u byte" msgstr[1] "%u byte" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:877 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u byte/s" +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" +msgstr "impossibile aprire '%s' in scrittura" + +#: strbuf.c:1175 +#, c-format +msgid "could not edit '%s'" +msgstr "impossibile modificare '%s'" + +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "ignoro un nome sottomodulo sospetto: %s" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "i valori negativi non sono consentiti per submodule.fetchjobs" + +#: submodule-config.c:402 +#, 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:499 +#, c-format +msgid "invalid value for %s" +msgstr "valore non valido per %s" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "Impossibile aggiornare la voce .gitmodules %s" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7269,53 +8384,132 @@ msgstr "nel sottomodulo non popolato '%s'" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Lo specificatore percorso '%s' รจ nel sottomodulo '%.*s'" -#: submodule.c:910 +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "argomento --ignore-submodules errato: %s" + +#: submodule.c:816 +#, 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:919 #, 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:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1004 +#, 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:1127 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "il processo per il sottomodulo '%s' non รจ uscito con successo" + +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Impossibile risolvere HEAD come riferimento valido." -#: submodule.c:1481 +#: submodule.c:1167 +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "Push del sottomodulo '%s' in corso\n" + +#: submodule.c:1170 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "Impossibile eseguire il push del sottomodulo '%s'\n" + +#: submodule.c:1462 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "Recupero del sottomodulo %s%s in corso\n" + +#: submodule.c:1492 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "Impossibile accedere al sottomodulo '%s'\n" + +#: submodule.c:1646 #, c-format -msgid "Could not access submodule '%s'" -msgstr "Impossibile accedere al sottomodulo '%s'" +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"Errore durante il recupero del sottomodulo:\n" +"%s" -#: submodule.c:1651 +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' non riconosciuto come repository Git" -#: submodule.c:1789 +#: submodule.c:1688 +#, 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:1729 +#, 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:1804 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "impossibile avviare 'git status' nel sottomodulo '%s'" -#: submodule.c:1802 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "impossibile eseguire 'git status' nel sottomodulo '%s'" -#: submodule.c:1817 +#: submodule.c:1832 #, 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:1907 +#: submodule.c:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'" + +#: submodule.c:1880 +msgid "could not reset submodule index" +msgstr "impossibile ripristinare l'indice del sottomodulo" + +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "il sottomodulo '%s' ha l'indice sporco" -#: submodule.c:1959 +#: submodule.c:1974 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Impossibile aggiornare il sottomodulo '%s'." -#: submodule.c:2007 +#: submodule.c:2042 +#, 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:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7323,12 +8517,17 @@ msgstr "" "relocate_gitdir non รจ supportata per il sottomodulo '%s' con piรน di un " "albero di lavoro" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossibile ricercare il nome per il sottomodulo '%s'" -#: submodule.c:2026 +#: submodule.c:2079 +#, 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:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7339,207 +8538,83 @@ msgstr "" "'%s' a\n" "'%s'\n" -#: submodule.c:2109 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'" - -#: submodule.c:2153 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "impossibile avviare ls-files in .." -#: submodule.c:2192 +#: submodule.c:2254 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree ha restituito il valore di ritorno inatteso %d" -#: submodule-config.c:232 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "ignoro un nome sottomodulo sospetto: %s" - -#: 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: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:486 -#, c-format -msgid "invalid value for %s" -msgstr "valore non valido per %s" - -#: submodule-config.c:755 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "Impossibile aggiornare la voce .gitmodules %s" - -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "esecuzione del comando finale '%s' non riuscita" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valore '%s' sconosciuto per la chiave '%s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "piรน di un %s" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "token finale vuoto nella stringa finale '%.*s'" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "impossibile leggere il file di input '%s'" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "impossibile leggere dallo standard input" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "impossibile eseguire lo stat di '%s'" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "il file %s non รจ un file regolare" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "il file %s non รจ scrivibile dall'utente" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "impossibile aprire un file temporaneo" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "impossibile ridenominare il file temporaneo in %s" -#: transport.c:116 -#, c-format -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:142 -#, c-format -msgid "could not read bundle '%s'" -msgstr "impossibile leggere il bundle '%s'" - -#: transport.c:208 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "trasporto: opzione profonditร '%s' non valida" - -#: 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:260 -msgid "server options require protocol version 2 or later" -msgstr "le opzioni server richiedono la versione 2 o successiva del protocollo" - -#: transport.c:625 -msgid "could not parse transport.color.* config" -msgstr "impossibile analizzare la configurazione transport.color.*" - -#: transport.c:698 -msgid "support for protocol v2 not implemented yet" -msgstr "supporto alla versione 2 del protocollo non ancora implementato" - -#: transport.c:825 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "valore sconosciuto per la configurazione '%s': %s" - -#: transport.c:891 -#, c-format -msgid "transport '%s' not allowed" -msgstr "trasporto '%s' non consentito" - -#: transport.c:945 -msgid "git-over-rsync is no longer supported" -msgstr "git-over-rsync non รจ piรน supportato" - -#: transport.c:1040 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "" -"I seguenti percorsi sottomodulo contengono modifiche\n" -"non trovate su nessun remoto:\n" - -#: transport.c:1044 -#, 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" -"Prova\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"o esegui un cd al percorso e usa\n" -"\n" -"\tgit push\n" -"\n" -"per eseguirne il push a un remoto.\n" -"\n" - -#: transport.c:1052 -msgid "Aborting." -msgstr "Interrompo l'operazione." - -#: transport.c:1193 -msgid "failed to push all needed submodules" -msgstr "push di tutti i sottomoduli richiesti non riuscito" - -#: transport.c:1340 transport-helper.c:645 -msgid "operation not supported by protocol" -msgstr "operazione non supportata dal protocollo" - -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:62 transport-helper.c:91 msgid "full write to remote helper failed" msgstr "scrittura completa verso l'helper remoto non riuscita" -#: transport-helper.c:134 +#: transport-helper.c:145 #, c-format msgid "unable to find remote helper for '%s'" msgstr "impossibile trovare l'helper remoto per '%s'" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" msgstr "impossibile duplicare il descrittore file dell'output helper" -#: transport-helper.c:201 +#: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7548,172 +8623,279 @@ msgstr "" "capability necessaria %s sconosciuta; quest'helper remoto probabilmente " "richiede una versione di Git piรน recente" -#: transport-helper.c:207 +#: transport-helper.c:220 msgid "this remote helper should implement refspec capability" msgstr "questo helper remoto dovrebbe implementare la capability refspec" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:287 transport-helper.c:429 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s ha inviato un messaggio inatteso: '%s'" -#: transport-helper.c:403 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "%s ha bloccato anche %s" -#: transport-helper.c:481 +#: transport-helper.c:497 msgid "couldn't run fast-import" msgstr "impossibile eseguire fast-import" -#: transport-helper.c:504 +#: transport-helper.c:520 msgid "error while running fast-import" msgstr "errore durante l'esecuzione di fast-import" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:549 transport-helper.c:1226 #, c-format msgid "could not read ref %s" msgstr "impossibile leggere il riferimento %s" -#: transport-helper.c:578 +#: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" msgstr "risposta inattesa a connect: %s" -#: transport-helper.c:600 +#: transport-helper.c:616 msgid "setting remote service path not supported by protocol" msgstr "" "l'impostazione del percorso del servizio remoto non รจ supportata dal " "protocollo" -#: transport-helper.c:602 +#: transport-helper.c:618 msgid "invalid remote service path" msgstr "percorso servizio remoto non valido" -#: transport-helper.c:648 +#: transport-helper.c:661 transport.c:1428 +msgid "operation not supported by protocol" +msgstr "operazione non supportata dal protocollo" + +#: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" msgstr "impossibile connettersi al sottoservizio %s" -#: transport-helper.c:720 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "'option' senza una direttiva corrispondente 'ok/error'" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "attesi ok/error, l'helper ha inviato '%s'" -#: transport-helper.c:773 +#: transport-helper.c:841 #, c-format msgid "helper reported unexpected status of %s" msgstr "l'helper ha segnalato uno stato inatteso di %s" -#: transport-helper.c:834 +#: transport-helper.c:924 #, c-format msgid "helper %s does not support dry-run" msgstr "l'helper %s non supporta dry-run" -#: transport-helper.c:837 +#: transport-helper.c:927 #, c-format msgid "helper %s does not support --signed" msgstr "l'helper %s non supporta --signed" -#: transport-helper.c:840 +#: transport-helper.c:930 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "l'helper %s non supporta --signed=if-asked" -#: transport-helper.c:847 +#: transport-helper.c:935 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "l'helper %s non supporta --atomic" + +#: transport-helper.c:941 #, c-format msgid "helper %s does not support 'push-option'" msgstr "l'helper %s non supporta 'push-option'" -#: transport-helper.c:945 +#: transport-helper.c:1040 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "l'helper remoto non supporta il push; รจ necessario uno specificatore " "riferimento" -#: transport-helper.c:950 +#: transport-helper.c:1045 #, c-format msgid "helper %s does not support 'force'" msgstr "l'helper %s non supporta 'force'" -#: transport-helper.c:997 +#: transport-helper.c:1092 msgid "couldn't run fast-export" msgstr "impossibile eseguire fast-export" -#: transport-helper.c:1002 +#: transport-helper.c:1097 msgid "error while running fast-export" msgstr "errore durante l'esecuzione di fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1122 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" msgstr "" "Nessun riferimento in comune e nessuno specificato; non eseguo nulla.\n" -"Forse dovresti specificare un branch come 'master'.\n" +"Forse dovresti specificare un branch.\n" + +#: transport-helper.c:1203 +#, c-format +msgid "unsupported object format '%s'" +msgstr "formato oggetto non supportato: '%s'" -#: transport-helper.c:1091 +#: transport-helper.c:1212 #, c-format msgid "malformed response in ref list: %s" msgstr "risposta malformata nell'elenco riferimenti: %s" -#: transport-helper.c:1244 +#: transport-helper.c:1364 #, c-format msgid "read(%s) failed" msgstr "read(%s) non riuscita" -#: transport-helper.c:1271 +#: transport-helper.c:1391 #, c-format msgid "write(%s) failed" msgstr "write(%s) non riuscita" -#: transport-helper.c:1320 +#: transport-helper.c:1440 #, c-format msgid "%s thread failed" msgstr "thread %s non riuscito" -#: transport-helper.c:1324 +#: transport-helper.c:1444 #, c-format msgid "%s thread failed to join: %s" msgstr "join non riuscita per il thread %s: %s" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1463 transport-helper.c:1467 #, 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:1384 +#: transport-helper.c:1504 #, c-format msgid "%s process failed to wait" msgstr "wait non riuscita per il processo %s" -#: transport-helper.c:1388 +#: transport-helper.c:1508 #, c-format msgid "%s process failed" msgstr "processo %s non riuscito" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1526 transport-helper.c:1535 msgid "can't start thread for copying data" msgstr "impossibile avviare il thread per la copia dei dati" -#: tree-walk.c:33 +#: transport.c:116 +#, c-format +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 +#, c-format +msgid "could not read bundle '%s'" +msgstr "impossibile leggere il bundle '%s'" + +#: transport.c:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "trasporto: opzione profonditร '%s' non valida" + +#: transport.c:269 +msgid "see protocol.version in 'git help config' for more details" +msgstr "vedi protocol.version in 'git help config' per maggiori dettagli" + +#: transport.c:270 +msgid "server options require protocol version 2 or later" +msgstr "le opzioni server richiedono la versione 2 o successiva del protocollo" + +#: transport.c:712 +msgid "could not parse transport.color.* config" +msgstr "impossibile analizzare la configurazione transport.color.*" + +#: transport.c:785 +msgid "support for protocol v2 not implemented yet" +msgstr "supporto alla versione 2 del protocollo non ancora implementato" + +#: transport.c:919 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "valore sconosciuto per la configurazione '%s': %s" + +#: transport.c:985 +#, c-format +msgid "transport '%s' not allowed" +msgstr "trasporto '%s' non consentito" + +#: transport.c:1038 +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync non รจ piรน supportato" + +#: transport.c:1140 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"I seguenti percorsi sottomodulo contengono modifiche\n" +"non trovate su nessun remoto:\n" + +#: transport.c:1144 +#, 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" +"Prova\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"o esegui un cd al percorso e usa\n" +"\n" +"\tgit push\n" +"\n" +"per eseguirne il push a un remoto.\n" +"\n" + +#: transport.c:1152 +msgid "Aborting." +msgstr "Interrompo l'operazione." + +#: transport.c:1297 +msgid "failed to push all needed submodules" +msgstr "push di tutti i sottomoduli richiesti non riuscito" + +#: tree-walk.c:32 msgid "too-short tree object" msgstr "oggetto albero troppo corto" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "modo malformato nella voce dell'albero" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "nome file vuoto nella voce dell'albero" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "file alber troppo corto" -#: unpack-trees.c:111 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7723,7 +8905,7 @@ msgstr "" "checkout:\n" "%%sEsegui il commit o lo stash delle modifiche prima di cambiare branch." -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7733,7 +8915,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7743,7 +8925,7 @@ msgstr "" "merge:\n" "%%sEsegui il commit o lo stash delle modifiche prima di eseguire il merge." -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7753,7 +8935,7 @@ msgstr "" "merge:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7764,7 +8946,7 @@ msgstr "" "%%sEsegui il commit o lo stash delle modifiche prima di eseguire " "l'operazione di %s." -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7774,7 +8956,7 @@ msgstr "" "l'operazione di %s:\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7784,7 +8966,7 @@ msgstr "" "tracciati in esse contenuti vengano persi:\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7794,7 +8976,7 @@ msgstr "" "eliminati con il checkout:\n" "%%sSpostali o eliminali prima di cambiare branch." -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7804,7 +8986,7 @@ msgstr "" "eliminati con il checkout:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7814,7 +8996,7 @@ msgstr "" "eliminati dal merge:\n" "%%sSpostali o eliminali prima di eseguire il merge." -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7824,7 +9006,7 @@ msgstr "" "eliminati dal merge:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7834,7 +9016,7 @@ msgstr "" "eliminati con l'operazione di %s:\n" "%%sSpostali o eliminali prima di eseguire l'operazione di %s." -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7844,7 +9026,7 @@ msgstr "" "eliminati con l'operazione di %s:\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7855,7 +9037,7 @@ msgstr "" "sovrascritti con il checkout:\n" "%%sSpostali o eliminali prima di cambiare branch." -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7866,7 +9048,7 @@ msgstr "" "sovrascritti con il checkout:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7876,7 +9058,7 @@ msgstr "" "sovrascritti dal merge:\n" "%%sSpostali o eliminali prima di eseguire il merge." -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7886,7 +9068,7 @@ msgstr "" "sovrascritti dal merge:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7896,7 +9078,7 @@ msgstr "" "sovrascritti con l'operazione di %s:\n" "%%sSpostali o eliminali prima di eseguire l'operazione di %s." -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7906,63 +9088,72 @@ msgstr "" "sovrascritti con l'operazione di %s:\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:172 #, 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:173 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -"Impossibile aggiornare il checkout sparse: le seguenti voci non sono " -"aggiornate:\n" +"Impossibile aggiornare il sottomodulo:\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"I seguenti file dell'albero di lavoro sarebbero sovrascritti con " -"l'aggiornamento del checkout sparse:\n" +"I seguenti percorsi non sono aggiornati e sono stati mantenuti nonostante vi " +"siano dei pattern sparse:\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"I seguenti file dell'albero di lavoro sarebbero eliminati con " -"l'aggiornamento del checkout sparse:\n" +"I seguenti percorsi non sono stati sottoposti a merge e sono stati mantenuti " +"nonostante vi siano dei pattern sparse:\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"Impossibile aggiornare il sottomodulo:\n" +"I seguenti percorsi erano giร presenti e pertanto non sono stati aggiornati " +"nonostante vi siano dei pattern sparse:\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "Interrompo l'operazione\n" -#: unpack-trees.c:318 +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" +"Dopo aver corretto i percorsi sopra menzionati, potresti voler eseguire `git " +"sparse-checkout reapply`.\n" + +#: unpack-trees.c:350 msgid "Updating files" msgstr "Aggiornamento dei file in corso" -#: unpack-trees.c:350 +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7973,6 +9164,14 @@ 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:1498 +msgid "Updating index flags" +msgstr "Aggiornamento dei contrassegni indice in corso" + +#: upload-pack.c:1516 +msgid "expected flush after fetch arguments" +msgstr "atteso flush dopo recupero argomenti" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "nome schema URL non valido o suffisso '://' mancante" @@ -8002,50 +9201,90 @@ msgstr "numero di porta non valido" msgid "invalid '..' path segment" msgstr "parte percorso '..' non valida" -#: worktree.c:258 builtin/am.c:2095 +#: walker.c:170 +msgid "Fetching objects" +msgstr "Recupero oggetti in corso" + +#: worktree.c:236 builtin/am.c:2116 #, c-format msgid "failed to read '%s'" msgstr "lettura di '%s' non riuscita" -#: worktree.c:304 +#: worktree.c:283 #, 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:315 +#: worktree.c:294 #, 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:327 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "'%s' non esiste" -#: worktree.c:333 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' non รจ un file .git, codice d'errore %d" -#: worktree.c:341 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' non punta a '%s'" -#: wrapper.c:223 wrapper.c:393 +#: worktree.c:587 +msgid "not a directory" +msgstr "non รจ una directory" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr ".git non รจ un file" + +#: worktree.c:598 +msgid ".git file broken" +msgstr "file .git corrotto" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr "file .git non corretto" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "non รจ un percorso valido" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "impossibile trovare il repository; .git non รจ un file" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "impossibile trovare il repository; file .git corrotto" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "gitdir non leggibile" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "gitdir non corretto" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "impossibile aprire '%s' in lettura e scrittura" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "impossibile accedere a '%s'" -#: wrapper.c:632 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "impossibile ottenere la directory di lavoro corrente" @@ -8088,11 +9327,11 @@ msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (usa \"git rm <file>...\" per contrassegnare il conflitto come risolto)" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "Modifiche di cui verrร eseguito il commit:" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "Modifiche non nell'area di staging per il commit:" @@ -8128,94 +9367,94 @@ msgstr "" " (usa \"git %s <file>...\" per includere l'elemento fra quelli di cui verrร " "eseguito il commit)" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "entrambi eliminati:" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "aggiunto da noi:" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "eliminato da loro:" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "aggiunto da loro:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "eliminato da noi:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "entrambi aggiunti:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "entrambi modificati:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "nuovo file:" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "copiato:" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "eliminato:" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "modificato:" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "rinominato:" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "modifica tipo:" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "sconosciuto:" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "non sottoposto a merge:" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "nuovi commit, " -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "contenuto modificato, " -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "contenuto non tracciato, " -#: wt-status.c:906 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Lo stash attualmente ha %d voce" msgstr[1] "Lo stash attualmente ha %d voci" -#: wt-status.c:938 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "Sottomoduli modificati ma non aggiornati:" -#: wt-status.c:940 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "Modifiche ai sottomoduli di cui verrร eseguito il commit:" -#: wt-status.c:1022 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -8223,7 +9462,7 @@ msgstr "" "Non modificare o rimuovere la riga soprastante.\n" "Tutto ciรฒ che si trova al di sotto di essa sarร ignorato." -#: wt-status.c:1114 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -8235,111 +9474,111 @@ msgstr "" "precedenti/successivi nel branch.\n" "Puoi usare '--no-ahead-behind' per evitare il calcolo.\n" -#: wt-status.c:1144 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "Hai dei percorsi non sottoposti a merge." -#: wt-status.c:1147 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr " (risolvi i conflitti ed esegui \"git commit\")" -#: wt-status.c:1149 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (usa \"git merge --abort\" per interrompere il merge)" -#: wt-status.c:1153 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "Tutti i conflitti sono stati risolti ma il merge รจ ancora in corso." -#: wt-status.c:1156 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr " (usa \"git commit\" per terminare il merge)" -#: wt-status.c:1165 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "Sei nel bel mezzo di una sessione am." -#: wt-status.c:1168 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "La patch corrente รจ vuota." -#: wt-status.c:1172 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (risolvi i conflitti e quindi esegui \"git am --continue\")" -#: wt-status.c:1174 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (usa \"git am --skip\" per saltare questa patch)" -#: wt-status.c:1176 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (usa \"git am --abort\" per ripristinare il branch originario)" -#: wt-status.c:1309 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo รจ mancante." -#: wt-status.c:1311 +#: wt-status.c:1307 msgid "No commands done." msgstr "Nessun comando eseguito." -#: wt-status.c:1314 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Ultimo comando eseguito (%d comando eseguito):" msgstr[1] "Ultimi comandi eseguiti (%d comandi eseguiti):" -#: wt-status.c:1325 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " (vedi di piรน nel file %s)" -#: wt-status.c:1330 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "Nessun comando rimanente." -#: wt-status.c:1333 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prossimo comando da eseguire (%d comando rimanente):" msgstr[1] "Prossimi comandi da eseguire (%d comandi rimanenti):" -#: wt-status.c:1341 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" " (usa \"git rebase --edit-todo\" per visualizzare e modificare le " "operazioni)" -#: wt-status.c:1353 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Attualmente stai eseguendo il rebase del branch '%s' su '%s'." -#: wt-status.c:1358 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "Attualmente stai eseguendo un rebase." -#: wt-status.c:1371 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (risolvi i conflitti e quindi esegui \"git rebase --continue\")" -#: wt-status.c:1373 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (usa \"git rebase --skip\" per saltare questa patch)" -#: wt-status.c:1375 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (usa \"git rebase --abort\" per eseguire il checkout del branch originario)" -#: wt-status.c:1382 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (tutti i conflitti sono stati risolti: esegui \"git rebase --continue\")" -#: wt-status.c:1386 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -8347,87 +9586,95 @@ msgstr "" "Attualmente stai dividendo un commit durante il rebase del branch '%s' su " "'%s'." -#: wt-status.c:1391 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "Attualmente stai dividendo un commit durante un rebase." -#: wt-status.c:1394 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una volta che la tua directory di lavoro รจ pulita, esegui \"git rebase --" "continue\")" -#: wt-status.c:1398 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Attualmente stai modificando un commit durante il rebase del branch '%s' su " "'%s'." -#: wt-status.c:1403 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "Attualmente stai modificando un commit durante un rebase." -#: wt-status.c:1406 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (usa \"git commit --amend\" per correggere il commit corrente)" -#: wt-status.c:1408 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (usa \"git rebase --continue\" una volta soddisfatto delle tue modifiche)" -#: wt-status.c:1419 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick in corso." -#: wt-status.c:1422 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Attualmente stai eseguendo il cherry-pick del commit %s." -#: wt-status.c:1429 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (risolvi i conflitti ed esegui \"git cherry-pick --continue\")" -#: wt-status.c:1432 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (esegui \"git cherry-pick --continue\" per continuare)" -#: wt-status.c:1435 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tutti i conflitti sono stati risolti: esegui \"git cherry-pick --continue" "\")" -#: wt-status.c:1437 +#: wt-status.c:1433 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (usa \"git cherry-pick --skip\" per saltare questa patch)" + +#: wt-status.c:1435 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:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "Revert in corso." -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "Attualmente stai eseguendo il revert del commit %s." -#: wt-status.c:1456 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (risolvi i conflitti ed esegui \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr " (esegui \"git revert --continue\" per continuare)" -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tutti i conflitti sono stati risolti: esegui \"git revert --continue\")" +#: wt-status.c:1462 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (usa \"git revert --skip\" per saltare questa patch)" + #: 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)" @@ -8445,39 +9692,45 @@ msgstr "Attualmente stai eseguendo una bisezione." 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:1690 +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "" +"Sei in uno sparse checkout in cui รจ presente il %d%% dei file tracciati." + +#: wt-status.c:1731 msgid "On branch " msgstr "Sul branch " -#: wt-status.c:1697 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "rebase interattivo in corso su " -#: wt-status.c:1699 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "rebase in corso su " -#: wt-status.c:1709 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "Attualmente non sei su alcun branch." -#: wt-status.c:1726 +#: wt-status.c:1767 msgid "Initial commit" msgstr "Commit iniziale" -#: wt-status.c:1727 +#: wt-status.c:1768 msgid "No commits yet" msgstr "Non ci sono ancora commit" -#: wt-status.c:1741 +#: wt-status.c:1782 msgid "Untracked files" msgstr "File non tracciati" -#: wt-status.c:1743 +#: wt-status.c:1784 msgid "Ignored files" msgstr "File ignorati" -#: wt-status.c:1747 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8489,31 +9742,31 @@ msgstr "" "ma devi stare attento a non dimenticarti di aggiungere\n" "autonomamente i file nuovi (vedi 'git help status')." -#: wt-status.c:1753 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "File non tracciati non elencati%s" -#: wt-status.c:1755 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr " (usa l'opzione -u per visualizzare i file non tracciati)" -#: wt-status.c:1761 +#: wt-status.c:1802 msgid "No changes" msgstr "Nessuna modifica" -#: wt-status.c:1766 +#: wt-status.c:1807 #, 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:1769 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "nessuna modifica aggiunta al commit\n" -#: wt-status.c:1772 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8522,197 +9775,206 @@ msgstr "" "non รจ stato aggiunto nulla al commit ma sono presenti file non tracciati " "(usa \"git add\" per tracciarli)\n" -#: wt-status.c:1775 +#: wt-status.c:1819 #, 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:1778 +#: wt-status.c:1823 #, 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:1781 wt-status.c:1786 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "non c'รจ nulla di cui eseguire il commit\n" -#: wt-status.c:1784 +#: wt-status.c:1830 #, 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:1788 +#: wt-status.c:1835 #, 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:1901 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "Non ci sono ancora commit su" -#: wt-status.c:1905 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD (nessun branch)" -#: wt-status.c:1936 +#: wt-status.c:1975 msgid "different" msgstr "differente" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "indietro " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "avanti " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "impossibile eseguire %s: ci sono delle modifiche non in staging." -#: wt-status.c:2472 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "" "inoltre, l'indice contiene modifiche di cui non รจ stato eseguito il commit." -#: wt-status.c:2474 +#: wt-status.c:2513 #, 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." -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#, c-format +msgid "failed to unlink '%s'" +msgstr "unlink di '%s' non riuscito" + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opzioni>] [--] <specificatore percorso>..." -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "stato diff inatteso %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "aggiornamento dei file non riuscito" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "elimina '%s'\n" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Modifiche non nell'area di staging dopo l'aggiornamento dell'indice:" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:272 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "Impossibile leggere l'indice" -#: builtin/add.c:245 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossibile aprire '%s' in scrittura." -#: builtin/add.c:249 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "Impossibile scrivere la patch" -#: builtin/add.c:252 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "modifica della patch non riuscita" -#: builtin/add.c:255 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "Impossibile eseguire lo stat di '%s'" -#: builtin/add.c:257 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "Patch vuota. Operazione interrotta." -#: builtin/add.c:262 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "Impossibile applicare '%s'" -#: builtin/add.c:270 +#: builtin/add.c:308 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: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 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 msgid "dry run" msgstr "test controllato" -#: builtin/add.c:293 +#: builtin/add.c:331 msgid "interactive picking" msgstr "scelta interattiva" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 msgid "select hunks interactively" msgstr "seleziona gli hunk in modalitร interattiva" -#: builtin/add.c:295 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "modifica il diff corrente e applicalo" -#: builtin/add.c:296 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "consenti l'aggiunta di file altrimenti ignorati" -#: builtin/add.c:297 +#: builtin/add.c:335 msgid "update tracked files" msgstr "aggiorna i file tracciati" -#: builtin/add.c:298 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "rinormalizza i fine riga dei file tracciati (implica -u)" -#: builtin/add.c:299 +#: builtin/add.c:337 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:300 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "aggiungi le modifiche da tutti i file tracciati e non" -#: builtin/add.c:303 +#: builtin/add.c:341 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:305 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "non eseguire l'aggiunta, aggiorna solo l'indice" -#: builtin/add.c:306 +#: builtin/add.c:344 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:307 +#: builtin/add.c:345 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:309 builtin/update-index.c:1001 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "esegui l'override del bit eseguibile dei file elencati" -#: builtin/add.c:311 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "emetti un avviso quando si aggiunge un repository incorporato" -#: builtin/add.c:326 +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "backend per `git stash -p`" + +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8743,152 +10005,183 @@ msgstr "" "\n" "Vedi \"git help submodule\" per ulteriori informazioni." -#: builtin/add.c:354 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "aggiunta repository Git incorporato in corso: %s" -#: 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:416 +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:379 +#: builtin/add.c:425 msgid "adding files failed" msgstr "aggiunta dei file non riuscita" -#: builtin/add.c:419 +#: builtin/add.c:453 builtin/commit.c:345 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--pathspec-from-file non รจ compatibile con --interactive/--patch" + +#: builtin/add.c:470 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file non รจ compatibile con --edit" + +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "-A e -u non sono compatibili fra loro" -#: builtin/add.c:426 +#: builtin/add.c:485 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:430 +#: builtin/add.c:489 #, 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:445 +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "" +"--pathspec-from-file non รจ compatibile con gli argomenti specificatore " +"percorso" + +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul richiede --pathspec-from-file" + +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Non รจ stato specificato nulla, non รจ stato aggiunto nulla.\n" -#: builtin/add.c:446 +#: builtin/add.c:520 +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/am.c:160 #, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Forse intendevi dire 'git add .'?\n" +msgid "invalid committer: %s" +msgstr "autore commit non valido: %s" -#: builtin/am.c:348 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "impossibile analizzare lo script author" -#: builtin/am.c:432 +#: builtin/am.c:450 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' รจ stato eliminato dall'hook applypatch-msg" -#: builtin/am.c:474 +#: builtin/am.c:492 #, c-format msgid "Malformed input line: '%s'." msgstr "Riga di input malformata: '%s'." -#: builtin/am.c:512 +#: builtin/am.c:530 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Copia delle note da '%s' a '%s' non riuscita" -#: builtin/am.c:538 +#: builtin/am.c:556 msgid "fseek failed" msgstr "fseek non riuscita" -#: builtin/am.c:726 +#: builtin/am.c:744 #, c-format msgid "could not parse patch '%s'" msgstr "impossibile analizzare la patch '%s'" -#: builtin/am.c:791 +#: builtin/am.c:809 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:839 +#: builtin/am.c:857 msgid "invalid timestamp" msgstr "timestamp non valido" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:862 builtin/am.c:874 msgid "invalid Date line" msgstr "riga Date non valida" -#: builtin/am.c:851 +#: builtin/am.c:869 msgid "invalid timezone offset" msgstr "offset fuso orario non valido" -#: builtin/am.c:944 +#: builtin/am.c:962 msgid "Patch format detection failed." msgstr "Rilevamento del formato della patch non riuscito." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:967 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "creazione della directory '%s' non riuscita" -#: builtin/am.c:954 +#: builtin/am.c:972 msgid "Failed to split patches." msgstr "Divisione delle patch non riuscita." -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "impossibile scrivere il file indice" - -#: builtin/am.c:1098 +#: builtin/am.c:1103 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Una volta risolto questo problema, esegui \"%s --continue\"." -#: builtin/am.c:1099 +#: builtin/am.c:1104 #, 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:1100 +#: builtin/am.c:1105 #, 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:1183 +#: builtin/am.c:1188 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:1211 +#: builtin/am.c:1216 msgid "Patch is empty." msgstr "La patch รจ vuota." -#: builtin/am.c:1277 +#: builtin/am.c:1281 #, c-format -msgid "invalid ident line: %.*s" -msgstr "riga ident non valida: %.*s" +msgid "missing author line in commit %s" +msgstr "riga autore mancante nel commit %s" -#: builtin/am.c:1299 +#: builtin/am.c:1284 #, c-format -msgid "unable to parse commit %s" -msgstr "impossibile analizzare il commit %s" +msgid "invalid ident line: %.*s" +msgstr "riga ident non valida: %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1503 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:1498 +#: builtin/am.c:1505 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilizzo le informazioni dell'indice per ricostruire un albero di base..." -#: builtin/am.c:1517 +#: builtin/am.c:1524 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8896,24 +10189,24 @@ msgstr "" "Hai modificato manualmente la patch?\n" "Non puรฒ essere applicata ai blob registrati nel suo indice." -#: builtin/am.c:1523 +#: builtin/am.c:1530 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:1549 +#: builtin/am.c:1556 msgid "Failed to merge in the changes." msgstr "Merge delle modifiche non riuscito." -#: builtin/am.c:1581 +#: builtin/am.c:1588 msgid "applying to an empty history" msgstr "applicazione a una cronologia vuota" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1639 builtin/am.c:1643 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossibile riprendere l'attivitร : %s non esiste." -#: builtin/am.c:1650 +#: builtin/am.c:1661 msgid "Commit Body is:" msgstr "Il corpo del commit รจ:" @@ -8921,37 +10214,41 @@ msgstr "Il corpo del commit รจ:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1671 #, 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:1710 +#: builtin/am.c:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "impossibile scrivere il file indice" + +#: builtin/am.c:1721 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Indice sporco: impossibile applicare le patch (elemento sporco: %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1761 builtin/am.c:1829 #, c-format msgid "Applying: %.*s" msgstr "Applicazione in corso: %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1778 msgid "No changes -- Patch already applied." msgstr "Nessuna modifica -- patch giร applicata." -#: builtin/am.c:1773 +#: builtin/am.c:1784 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch non riuscita a %s %.*s" -#: builtin/am.c:1777 -msgid "Use 'git am --show-current-patch' to see the failed patch" +#: builtin/am.c:1788 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -"Usa 'git am --show-current-patch' per visualizzare la patch non riuscita" +"Usa 'git am --show-current-patch=diff' per visualizzare la patch non riuscita" -#: builtin/am.c:1821 +#: builtin/am.c:1832 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8961,7 +10258,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:1828 +#: builtin/am.c:1839 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8974,17 +10271,17 @@ msgstr "" "Potresti eseguire `git rm` su un file per accettarne la risoluzione " "\"eliminato da loro\"." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Impossibile analizzare l'oggetto '%s'." -#: builtin/am.c:1987 +#: builtin/am.c:1998 msgid "failed to clean index" msgstr "pulizia dell'indice non riuscita" -#: builtin/am.c:2031 +#: builtin/am.c:2042 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8993,148 +10290,160 @@ msgstr "" "'am'.\n" "Non ritorno indietro a ORIG_HEAD" -#: builtin/am.c:2128 +#: builtin/am.c:2149 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valore non valido per --patch-format: %s" -#: builtin/am.c:2164 +#: builtin/am.c:2191 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "Valore non valido per --show-current-patch: %s" + +#: builtin/am.c:2195 +#, 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:2226 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opzioni>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2165 +#: builtin/am.c:2227 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opzioni>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2233 msgid "run interactively" msgstr "esegui in modalitร interattiva" -#: builtin/am.c:2173 +#: builtin/am.c:2235 msgid "historical option -- no-op" msgstr "opzione storica -- non esegue nulla" -#: builtin/am.c:2175 +#: builtin/am.c:2237 msgid "allow fall back on 3way merging if needed" msgstr "consenti il ripiego sul merge a tre vie se necessario" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 msgid "be quiet" msgstr "non visualizzare messaggi" -#: builtin/am.c:2178 +#: builtin/am.c:2240 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:2181 +#: builtin/am.c:2243 msgid "recode into utf8 (default)" msgstr "converti codifica in UTF-8 (impostazione predefinita)" -#: builtin/am.c:2183 +#: builtin/am.c:2245 msgid "pass -k flag to git-mailinfo" msgstr "fornisci l'argomento -k a git-mailinfo" -#: builtin/am.c:2185 +#: builtin/am.c:2247 msgid "pass -b flag to git-mailinfo" msgstr "fornisci l'argomento -b a git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2249 msgid "pass -m flag to git-mailinfo" msgstr "fornisci l'argomento -m a git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2251 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:2192 +#: builtin/am.c:2254 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:2195 +#: builtin/am.c:2257 msgid "strip everything before a scissors line" msgstr "rimuovi tutte le righe prima di una riga \"taglia qui\"" -#: 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 +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 msgid "pass it through git-apply" msgstr "passa l'argomento a git-apply" -#: 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:141 parse-options.h:162 parse-options.h:312 +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: 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 +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2221 +#: builtin/am.c:2283 msgid "format the patch(es) are in" msgstr "il formato delle patch" -#: builtin/am.c:2227 +#: builtin/am.c:2289 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:2229 +#: builtin/am.c:2291 msgid "continue applying patches after resolving a conflict" msgstr "" "continua l'applicazione delle patch dopo la risoluzione di un conflitto" -#: builtin/am.c:2232 +#: builtin/am.c:2294 msgid "synonyms for --continue" msgstr "sinonimi di --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2297 msgid "skip the current patch" msgstr "salta la patch corrente" -#: builtin/am.c:2238 +#: builtin/am.c:2300 msgid "restore the original branch and abort the patching operation." msgstr "ripristina il branch originario e interrompi l'operazione di patching." -#: builtin/am.c:2241 +#: builtin/am.c:2303 msgid "abort the patching operation but keep HEAD where it is." msgstr "interrompi l'operazione di patching ma mantieni HEAD dov'รจ." -#: builtin/am.c:2244 -msgid "show the patch being applied." -msgstr "visualizza la patch in fase di applicazione." +#: builtin/am.c:2307 +msgid "show the patch being applied" +msgstr "visualizza la patch in fase di applicazione" -#: builtin/am.c:2248 +#: builtin/am.c:2312 msgid "lie about committer date" msgstr "menti sulla data del commit" -#: builtin/am.c:2250 +#: builtin/am.c:2314 msgid "use current timestamp for author date" msgstr "usa il timestamp corrente come data autore" -#: 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 +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "ID chiave" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 msgid "GPG-sign commits" msgstr "firma i commit con GPG" -#: builtin/am.c:2256 +#: builtin/am.c:2320 msgid "(internal use for git-rebase)" msgstr "(a uso interno per git-rebase)" -#: builtin/am.c:2274 +#: builtin/am.c:2338 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." @@ -9142,18 +10451,18 @@ msgstr "" "L'opzione -b/--binary non esegue nulla da molto tempo e\n" "sarร rimossa. Non usarla piรน." -#: builtin/am.c:2281 +#: builtin/am.c:2345 msgid "failed to read the index" msgstr "lettura dell'indice non riuscita" -#: builtin/am.c:2296 +#: builtin/am.c:2360 #, 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:2320 +#: builtin/am.c:2384 #, c-format msgid "" "Stray %s directory found.\n" @@ -9162,11 +10471,11 @@ msgstr "" "Trovata directory smarrita %s.\n" "Usa \"git am --abort\" per eliminarla." -#: builtin/am.c:2326 +#: builtin/am.c:2390 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operazione di risoluzione non in corso, non riprendiamo." -#: builtin/am.c:2336 +#: builtin/am.c:2400 msgid "interactive mode requires patches on the command line" msgstr "" "la modalitร interattiva richiede che le patch siano fornite sulla riga di " @@ -9206,25 +10515,25 @@ msgstr "git archive: errore del protocollo" msgid "git archive: expected a flush" msgstr "git archive: atteso un 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 --next-all" +msgstr "git bisect--helper --next-all" + +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "" "git bisect--helper --write-terms <termine revisione non funzionante> " "<termine revisione funzionante>" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:25 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<commit>]" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" @@ -9232,7 +10541,7 @@ msgstr "" "git bisect--helper --bisect-write [--no-log] <stato> <revisione> <termine " "revisione funzionante> <termine revisione non funzionante>" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:28 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" @@ -9240,13 +10549,13 @@ msgstr "" "git bisect--helper --bisect-check-and-set-terms <comando> <termine revisione " "funzionante> <termine revisione non funzionante>" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" "git bisect--helper --bisect-next-check <termine revisione funzionante> " "<termine revisione non funzionante> [<termine>]" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:30 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -9254,49 +10563,68 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:31 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<termine> --term-{new," -"bad}=<termine>][--no-checkout] [<non funzionante> [<funzionante>...]] [--] " -"[<percorsi>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<termine> --term-{old," +"good}=<termine>] [--no-checkout] [--first-parent] [<non funzionante> " +"[<funzionante>...]] [--] [<percorsi>...]" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-auto-next" + +#: builtin/bisect--helper.c:35 +msgid "git bisect--helper --bisect-autostart" +msgstr "git bisect--helper --bisect-autostart" + +#: builtin/bisect--helper.c:97 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "impossibile aprire il file '%s' in modalitร '%s'" + +#: builtin/bisect--helper.c:104 +#, c-format +msgid "could not write to file '%s'" +msgstr "impossibile scrivere il file '%s'" + +#: builtin/bisect--helper.c:143 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' non รจ un termine valido" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:147 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "impossibile usare il comando nativo '%s' come termine" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "impossibile cambiare il significato del termine '%s'" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:167 msgid "please use two different terms" msgstr "usa due termini differenti" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "impossibile aprire il file BISECT_TERMS" - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:207 #, c-format msgid "We are not bisecting.\n" msgstr "Non stiamo eseguendo un bisect.\n" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:215 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' non รจ un commit valido" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:224 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -9304,27 +10632,27 @@ msgstr "" "impossibile eseguire il checkout dell'HEAD originario '%s'. Prova con 'git " "bisect reset <commit>'." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:268 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Argomento bisect_write errato: %s" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "impossibile recuperare l'OID della revisione '%s'" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:285 #, c-format msgid "couldn't open the file '%s'" msgstr "impossibile aprire il file '%s'" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:311 #, 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:285 +#: builtin/bisect--helper.c:338 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9333,7 +10661,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:289 +#: builtin/bisect--helper.c:342 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9344,7 +10672,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:321 +#: builtin/bisect--helper.c:362 #, c-format msgid "bisecting only with a %s commit" msgstr "eseguo la bisezione solo con un commit %s" @@ -9353,15 +10681,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:329 +#: builtin/bisect--helper.c:370 msgid "Are you sure [Y/n]? " msgstr "Sei sicuro? [Y/n] " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:431 msgid "no terms defined" msgstr "nessun termine definito" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:434 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9370,7 +10698,7 @@ msgstr "" "I tuoi termini correnti sono %s per lo stato vecchio\n" "e %s per lo stato nuovo.\n" -#: builtin/bisect--helper.c:389 +#: builtin/bisect--helper.c:444 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9379,116 +10707,163 @@ 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:475 +#: builtin/bisect--helper.c:511 +msgid "revision walk setup failed\n" +msgstr "impostazione percorso revisioni non riuscita\n" + +#: builtin/bisect--helper.c:533 +#, c-format +msgid "could not open '%s' for appending" +msgstr "impossibile aprire '%s' per accodare dati" + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +msgid "'' is not a valid term" +msgstr "'' non รจ un termine valido" + +#: builtin/bisect--helper.c:674 #, c-format msgid "unrecognized option: '%s'" msgstr "opzione non riconosciuta: '%s'" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:678 #, 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:511 +#: builtin/bisect--helper.c:709 msgid "bad HEAD - I need a HEAD" msgstr "HEAD non valida - ho bisogno di un'HEAD" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:724 #, 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:547 +#: builtin/bisect--helper.c:745 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:550 +#: builtin/bisect--helper.c:748 msgid "bad HEAD - strange symbolic ref" msgstr "head non valida - riferimento simbolico strano" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:775 #, c-format msgid "invalid ref: '%s'" msgstr "riferimento non valido: '%s'" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:827 +msgid "You need to start by \"git bisect start\"\n" +msgstr "Devi iniziare con \"git bisect start\"\n" + +#. 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:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Vuoi che me ne occupi io [Y/n]? " + +#: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'" msgstr "esegui 'git bisect next'" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:868 msgid "write the terms to .git/BISECT_TERMS" msgstr "scrivi i termini in .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:870 msgid "cleanup the bisection state" msgstr "pulisci lo stato bisezione" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:872 msgid "check for expected revs" msgstr "controlla se le revisioni attese sono presenti" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:874 msgid "reset the bisection state" msgstr "reimposta lo stato della bisezione" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:876 msgid "write out the bisection state in BISECT_LOG" msgstr "scrivi lo stato della bisezione in BISECT_LOG" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:878 msgid "check and set terms in a bisection state" msgstr "controlla e imposta i termini in uno stato bisezione" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:880 msgid "check whether bad or good terms exist" msgstr "" "controlla se esistono termini per revisioni non funzionanti o funzionanti" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:882 msgid "print out the bisect terms" msgstr "stampa i termini della bisezione" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:884 msgid "start the bisect session" msgstr "inizia la sessione di bisezione" -#: 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:886 +msgid "find the next bisection commit" +msgstr "trova il prossimo commit della bisezione" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" +msgstr "" +"verifica il prossimo stato della bisezione, quindi esegui il checkout del " +"prossimo commit della bisezione" + +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "avvia la bisezione se non รจ giร stata avviata" + +#: builtin/bisect--helper.c:892 msgid "no log for BISECT_WRITE" msgstr "non registrare le operazioni eseguite per BISECT_WRITE" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:910 msgid "--write-terms requires two arguments" msgstr "--write-terms richiede due argomenti" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:914 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state non richiede argomenti" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:921 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset richiede o nessun argomento o un commit" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:925 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write richiede o quattro o cinque argomenti" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:931 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms richiede tre argomenti" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:937 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check richiede due o tre argomenti" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:943 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms richiede zero o un argomento" +#: builtin/bisect--helper.c:952 +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next richiede zero argomenti" + +#: builtin/bisect--helper.c:958 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--bisect-auto-next richiede zero argomenti" + +#: builtin/bisect--helper.c:964 +msgid "--bisect-autostart does not accept arguments" +msgstr "--bisect-autostart non accetta argomenti" + #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opzioni>] [<opzioni revisione>] [<revisione>] [--] <file>" @@ -9515,150 +10890,146 @@ msgstr "colore '%s' non valido in color.blame.repeatedLines" msgid "invalid value for blame.coloring" msgstr "valore non valido per blame.coloring" -#: builtin/blame.c:823 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "impossibile trovare la revisione %s da ignorare" -#: builtin/blame.c:845 +#: builtin/blame.c:867 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:846 -msgid "Show blank SHA-1 for boundary commits (Default: off)" +#: builtin/blame.c:868 +msgid "Do not show object names of boundary commits (Default: off)" msgstr "" -"Visualizza un hash SHA-1 vuoto per i commit limite (impostazione " +"Non visualizzare i nomi degli oggetti dei commit limite (impostazione " "predefinita: off)" -#: builtin/blame.c:847 +#: builtin/blame.c:869 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:848 +#: builtin/blame.c:870 msgid "Show work cost statistics" msgstr "Visualizza le statistiche sul costo dell'operazione" -#: builtin/blame.c:849 +#: builtin/blame.c:871 msgid "Force progress reporting" msgstr "Forza l'indicazione d'avanzamento dell'operazione" -#: builtin/blame.c:850 +#: builtin/blame.c:872 msgid "Show output score for blame entries" msgstr "Visualizza il punteggio di output per le voci blame" -#: builtin/blame.c:851 +#: builtin/blame.c:873 msgid "Show original filename (Default: auto)" msgstr "" "Visualizza il nome file originario (impostazione predefinita: automatico)" -#: builtin/blame.c:852 +#: builtin/blame.c:874 msgid "Show original linenumber (Default: off)" msgstr "" "Visualizza il numero di riga originario (impostazione predefinita: off)" -#: builtin/blame.c:853 +#: builtin/blame.c:875 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:854 +#: builtin/blame.c:876 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:855 +#: builtin/blame.c:877 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:856 +#: builtin/blame.c:878 msgid "Show raw timestamp (Default: off)" msgstr "Visualizza il timestamp grezzo (impostazione predefinita: off)" -#: builtin/blame.c:857 +#: builtin/blame.c:879 msgid "Show long commit SHA1 (Default: off)" msgstr "" "Visualizza l'hash SHA1 del commit in forma lunga (impostazione predefinita: " "off)" -#: builtin/blame.c:858 +#: builtin/blame.c:880 msgid "Suppress author name and timestamp (Default: off)" msgstr "" "Non visualizzare il nome autore e il timestamp (impostazione predefinita: " "off)" -#: builtin/blame.c:859 +#: builtin/blame.c:881 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:860 +#: builtin/blame.c:882 msgid "Ignore whitespace differences" msgstr "Ignora le differenze relative agli spazi bianchi" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:883 builtin/log.c:1808 msgid "rev" msgstr "revisione" -#: builtin/blame.c:861 +#: builtin/blame.c:883 msgid "Ignore <rev> when blaming" msgstr "Ignora <revisione> durante l'esecuzione del blame" -#: builtin/blame.c:862 +#: builtin/blame.c:884 msgid "Ignore revisions from <file>" msgstr "Ignora le revisioni specificate in <file>" -#: builtin/blame.c:863 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "colora in modo differente i metadati ridondanti della riga precedente" -#: builtin/blame.c:864 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "colora le righe in base all'etร " -#: 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 +#: builtin/blame.c:887 msgid "Spend extra cycles to find better match" msgstr "Usa cicli extra per trovare una corrispondenza migliore" -#: builtin/blame.c:874 +#: builtin/blame.c:888 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:875 +#: builtin/blame.c:889 msgid "Use <file>'s contents as the final image" msgstr "Usa i contenuti di <file> come immagine finale" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "punteggio" -#: builtin/blame.c:876 +#: builtin/blame.c:890 msgid "Find line copies within and across files" msgstr "Trova copie delle righe all'interno e fra file" -#: builtin/blame.c:877 +#: builtin/blame.c:891 msgid "Find line movements within and across files" msgstr "Trova righe spostate all'interno e fra file" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "Process only line range n,m, counting from 1" msgstr "Elabora solo l'intervallo righe n,m, contandole da 1" -#: builtin/blame.c:929 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress non puรฒ essere usato con --incremental o con i formati porcelain" @@ -9671,24 +11042,24 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "4 anni, 11 giorni fa" -#: builtin/blame.c:1087 +#: builtin/blame.c:1110 #, 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:1133 +#: builtin/blame.c:1156 msgid "Blaming lines" msgstr "Eseguo il blame sulle righe" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [<opzioni>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" +msgstr "git branch [<opzioni>] [-r | -a] [--merged] [--no-merged]" #: builtin/branch.c:30 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" @@ -9900,7 +11271,7 @@ msgstr "imposta la modalitร tracking (vedi git-pull(1))" msgid "do not use" msgstr "non usare" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:526 msgid "upstream" msgstr "upstream" @@ -9909,8 +11280,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" @@ -9992,73 +11363,73 @@ msgstr "stampa solo i branch non sottoposti a merge" msgid "list branches in columns" msgstr "elenca i branch in colonne" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 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 +#: builtin/tag.c:434 msgid "object" msgstr "oggetto" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "stampa solo i branch dell'oggetto" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "" "l'ordinamento e il filtraggio non fanno differenza tra maiuscole e minuscole" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "formato da usare per l'output" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trovato fra i riferimenti/head!" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "--column e --verbose non sono compatibili" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "nome branch richiesto" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "Impossibile fornire una descrizione per l'HEAD scollegato" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "impossibile modificare la descrizione per piรน di un branch" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "Non esiste ancora nessun commit sul branch '%s'." -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "Non esiste alcun branch denominato '%s'." -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "sono presenti troppi branch per consentire un'operazione di copia" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "" "sono presenti troppi argomenti per consentire un'operazione di " "ridenominazione" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "" "sono presenti troppi argomenti per consentire l'impostazione del nuovo " "upstream" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -10066,33 +11437,33 @@ msgstr "" "impossibile impostare l'upstream di HEAD a %s quando non punta ad alcun " "branch." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "branch '%s' non esistente" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "il branch '%s' non esiste" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "" "sono presenti troppi argomenti per rimuovere le informazioni sull'upstream" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossibile rimuovere le informazioni sull'upstream di HEAD quando non punta " "ad alcun branch." -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Il branch '%s' non ha informazioni sull'upstream" -#: builtin/branch.c:841 +#: builtin/branch.c:839 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>?" @@ -10100,7 +11471,7 @@ msgstr "" "Le opzioni di 'git branch' -a e -r non richiedono un nome branch.\n" "Forse volevi usare: -a|-r --list <pattern>?" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -10108,20 +11479,171 @@ msgstr "" "l'opzione '--set-upstream' non รจ piรน supportata. Usa '--track' o '--set-" "upstream-to'." -#: builtin/bundle.c:45 +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "versione di git:\n" + +#: builtin/bugreport.c:21 #, c-format -msgid "%s is okay\n" -msgstr "%s รจ corretto\n" +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() non riuscita: errore '%s' (%d)\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "informazioni sul compilatore: " + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "informazioni su libc: " + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "" +"comando non eseguito da un repository Git - nessun hook da visualizzare\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "git bugreport [-o|--output-directory <file>] [-s|--suffix <formato>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"Grazie per voler compilare una segnalazione d'errore per Git!\n" +"Rispondi alle seguenti domande per consentirci di capire il problema.\n" +"\n" +"Cos'hai fatto prima che si verificasse l'errore? (Passaggi per riprodurre " +"il\n" +"problema)\n" +"\n" +"Cosa ti aspettavi che succedesse? (Comportamento atteso)\n" +"\n" +"Cosa รจ successo invece? (Comportamento reale)\n" +"\n" +"Cosa c'รจ di diverso fra quello che ti aspettavi e ciรฒ che in realtร รจ\n" +"successo?\n" +"\n" +"Altre note che desideri aggiungere:\n" +"\n" +"Rivedi il resto della segnalazione d'errore qui sotto.\n" +"Puoi eliminare le righe che non desideri condividere.\n" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "" +"specifica una destinazione per il file contenente la segnalazione d'errore" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "specifica un suffisso in formato strftime per il nome del file" + +#: builtin/bugreport.c:158 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "impossibile creare le prime directory per '%s'" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "Informazioni di sistema" + +#: builtin/bugreport.c:168 +msgid "Enabled Hooks" +msgstr "Hook abilitati" + +#: builtin/bugreport.c:175 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "impossibile creare un nuovo file in '%s'" + +#: builtin/bugreport.c:178 +#, c-format +msgid "unable to write to %s" +msgstr "impossibile scrivere su %s" + +#: builtin/bugreport.c:188 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "Nuovo report creato in '%s'.\n" + +#: 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:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "non visualizzare la barra di avanzamento" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "visualizza la barra di avanzamento" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +msgid "show progress meter during object writing phase" +msgstr "" +"visualizza la barra di avanzamento durante la fase di scrittura oggetti" -#: builtin/bundle.c:58 +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +msgid "similar to --all-progress when progress meter is shown" +msgstr "simile a --all-progress quando รจ visualizzata la barra di avanzamento" + +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "specifica la versione del formato bundle" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "Per creare un bundle รจ necessario un repository." -#: builtin/bundle.c:62 +#: builtin/bundle.c:107 +msgid "do not show bundle details" +msgstr "non visualizzare i dettagli sul bundle" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "%s รจ corretto\n" + +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "Per decomprimere un bundle รจ necessario un repository." -#: builtin/cat-file.c:594 +#: builtin/bundle.c:171 builtin/remote.c:1687 +msgid "be verbose; must be placed before a subcommand" +msgstr "" +"visualizza ulteriori dettagli; deve essere collocato prima di un sottocomando" + +#: builtin/bundle.c:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Sottocomando sconosciuto: %s" + +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10129,83 +11651,83 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<percorso>] <oggetto>" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:599 msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<formato>] | --batch-check[=<formato>]) [--follow-" +"symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "puรฒ essere specificata solo un'opzione batch" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> puรฒ essere uno fra blob, tree, commit, tag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "visualizza tipo oggetto" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "visualizza dimensioni oggetto" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:642 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:639 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "stampa il contenuto dell'oggetto con un formato leggibile" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:645 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:643 +#: builtin/cat-file.c:647 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:644 git-submodule.sh:936 +#: builtin/cat-file.c:648 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "usa un percorso specifico per --textconv/--filters" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:651 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:648 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "esegui il buffering dell'output di --batch" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:654 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:654 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "visualizza le informazioni degli oggetti forniti nello standard input" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:662 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:660 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "visualizza tutti gli oggetti con --batch o --batch-check" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "non ordinare l'output di --batch-all-objects" @@ -10233,8 +11755,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:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "non visualizzare l'avanzamento dell'operazione" @@ -10246,27 +11768,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:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "impossibile specificare i nomi percorso con --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z ha senso solo con --stdin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "nessun percorso specificato" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "--quiet รจ valido solo con un nome percorso singolo" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "non รจ possibile usare sia --quiet sia --verbose" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching รจ valido solo con --verbose" @@ -10324,9 +11846,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:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 msgid "string" msgstr "stringa" @@ -10354,100 +11876,100 @@ msgstr "git switch [<opzioni>] <branch>" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<opzioni>] [--source=<branch>] <file>..." -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "il percorso '%s' non ha la nostra versione" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "il percorso '%s' non ha la loro versione" -#: builtin/checkout.c:190 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "il percorso '%s' non ha tutte le versioni necessarie" -#: builtin/checkout.c:240 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "il percorso '%s' non ha le versioni necessarie" -#: builtin/checkout.c:258 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "percorso '%s': impossibile eseguire il merge" -#: builtin/checkout.c:274 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossibile aggiungere il risultato del merge per '%s'" -#: builtin/checkout.c:374 +#: builtin/checkout.c:396 #, 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:379 +#: builtin/checkout.c:401 #, 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:386 +#: builtin/checkout.c:408 #, 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:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, 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:422 builtin/checkout.c:425 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' non puรฒ essere usato con %s" -#: builtin/checkout.c:429 +#: builtin/checkout.c:451 #, 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:433 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "nรฉ '%s' nรฉ '%s' sono stati specificati" -#: builtin/checkout.c:437 +#: builtin/checkout.c:459 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' dev'essere usato quando '%s' non รจ specificato" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' o '%s' non possono essere usati con %s" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:528 builtin/checkout.c:535 #, c-format msgid "path '%s' is unmerged" msgstr "il percorso '%s' non รจ stato sottoposto a merge" -#: builtin/checkout.c:679 +#: builtin/checkout.c:703 msgid "you need to resolve your current index first" msgstr "prima devi risolvere l'indice corrente" -#: builtin/checkout.c:729 +#: builtin/checkout.c:757 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10456,55 +11978,50 @@ msgstr "" "impossibile continuare con modifiche in stage nei file seguenti:\n" "%s" -#: 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 +#: builtin/checkout.c:853 #, 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:875 +#: builtin/checkout.c:895 msgid "HEAD is now at" msgstr "HEAD si trova ora a" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:899 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "impossibile aggiornare HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:903 #, c-format msgid "Reset branch '%s'\n" msgstr "Ripristina il branch '%s'\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:906 #, c-format msgid "Already on '%s'\n" msgstr "Si รจ giร su '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:910 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Si รจ passati al branch '%s' e lo si รจ reimpostato\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:912 builtin/checkout.c:1338 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Si รจ passati a un nuovo branch '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:914 #, c-format msgid "Switched to branch '%s'\n" msgstr "Si รจ passati al branch '%s'\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:965 #, c-format msgid " ... and %d more.\n" msgstr " ...e altri %d.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:971 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10527,7 +12044,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:990 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10554,28 +12071,19 @@ msgstr[1] "" " git branch <nome del nuovo branch> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1025 msgid "internal error in revision walk" msgstr "errore interno durante la visita delle revisioni" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1029 msgid "Previous HEAD position was" msgstr "La precedente posizione di HEAD era" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1069 builtin/checkout.c:1333 msgid "You are on a branch yet to be born" msgstr "Sei su un branch che deve ancora essere creato" -#: 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 +#: builtin/checkout.c:1146 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10584,37 +12092,72 @@ 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:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1153 +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:1163 +#, 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:1229 +msgid "only one reference expected" +msgstr "atteso solo un riferimento" + +#: builtin/checkout.c:1246 +#, c-format +msgid "only one reference expected, %d given." +msgstr "atteso solo un riferimento, %d specificati." + +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "riferimento non valido: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1305 builtin/checkout.c:1671 #, c-format msgid "reference is not a tree: %s" msgstr "il riferimento non รจ un albero: %s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1352 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "atteso branch, ricevuto tag '%s'" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1354 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "atteso branch, ricevuto branch remoto '%s'" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1355 builtin/checkout.c:1363 #, c-format msgid "a branch is expected, got '%s'" msgstr "atteso branch, ricevuto '%s'" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1358 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "atteso branch, ricevuto commit '%s'" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1374 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10622,7 +12165,7 @@ msgstr "" "impossibile cambiare branch durante un merge\n" "Considera l'uso di \"git merge --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1378 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -10630,7 +12173,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:1333 +#: builtin/checkout.c:1382 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10638,7 +12181,7 @@ msgstr "" "impossibile cambiare branch durante un rebase\n" "Considera l'uso di \"git rebase --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1386 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10646,7 +12189,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:1341 +#: builtin/checkout.c:1390 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10654,142 +12197,149 @@ msgstr "" "impossibile cambiare branch durante un revert\n" "Considera l'uso di \"git revert --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1394 msgid "you are switching branch while bisecting" msgstr "stai cambiando branch durante una bisezione" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1401 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:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 #, 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:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' non puรฒ essere usato con '%s'" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1429 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' non accetta l'argomento <punto di partenza>" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1437 #, 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:1395 +#: builtin/checkout.c:1444 msgid "missing branch or commit argument" msgstr "argomento branch o commit mancante" -#: 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 +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 msgid "force progress reporting" msgstr "forza l'indicazione d'avanzamento dell'operazione" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1487 msgid "perform a 3-way merge with the new branch" msgstr "esegui un merge a tre vie con il nuovo branch" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 msgid "style" msgstr "stile" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1489 msgid "conflict style (merge or diff3)" msgstr "stile conflitti (merge o diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1501 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "scollega l'HEAD al commit specificato" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1502 msgid "set upstream info for new branch" msgstr "imposta le informazioni sull'upstream per il nuovo branch" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1504 msgid "force checkout (throw away local modifications)" msgstr "esegui forzatamente il checkout (scarta le modifiche locali)" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new-branch" msgstr "nuovo branch" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new unparented branch" msgstr "nuovo branch senza genitore" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1508 builtin/merge.c:291 msgid "update ignored files (default)" msgstr "aggiorna i file ignorati (impostazione predefinita)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1511 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:1475 +#: builtin/checkout.c:1524 msgid "checkout our version for unmerged files" msgstr "" "esegui il checkout della nostra versione per i file non sottoposti a merge" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1527 msgid "checkout their version for unmerged files" msgstr "" "esegui il checkout della loro versione per i file non sottoposti a merge" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1531 msgid "do not limit pathspecs to sparse entries only" msgstr "non limitare gli specificatori percorso solo alle voci sparse" -#: 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:1586 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "le opzioni -%c, -%c e --orphan sono mutuamente esclusive" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1590 msgid "-p and --overlay are mutually exclusive" msgstr "le opzioni -p e --overlay sono mutualmente esclusive" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1627 msgid "--track needs a branch name" msgstr "--track richiede il nome di un branch" -#: builtin/checkout.c:1578 -msgid "missing branch name; try -b" -msgstr "nome del branch mancante; prova con -b" +#: builtin/checkout.c:1632 +#, c-format +msgid "missing branch name; try -%c" +msgstr "nome del branch mancante; prova con -%c" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1664 #, c-format msgid "could not resolve %s" msgstr "impossibile risolvere %s" -#: 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 +#: builtin/checkout.c:1680 msgid "invalid path specification" msgstr "specificatore percorso non valido" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1687 #, 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:1642 +#: builtin/checkout.c:1691 #, 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:1646 +#: builtin/checkout.c:1700 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file non รจ compatibile con --detach" + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file non รจ compatibile con --patch" + +#: builtin/checkout.c:1716 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10797,137 +12347,111 @@ msgstr "" "git checkout: --ours/--theirs, --force e --merge sono incompatibili quando\n" "si esegue il checkout dell'indice." -#: 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:1721 +msgid "you must specify path(s) to restore" +msgstr "devi specificare il percorso/i percorsi da ripristinare" -#: 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 +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 msgid "branch" msgstr "branch" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1748 msgid "create and checkout a new branch" msgstr "crea un nuovo branch ed eseguine il checkout" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1750 msgid "create/reset and checkout a branch" msgstr "crea/reimposta un branch ed eseguine il checkout" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1751 msgid "create reflog for new branch" msgstr "crea il registro dei riferimenti per il nuovo branch" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1753 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "prevedi 'git checkout <branch inesistente>' (impostazione predefinita)" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1754 msgid "use overlay mode (default)" msgstr "usa modalitร overlay (impostazione predefinita)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1799 msgid "create and switch to a new branch" msgstr "crea un nuovo branch e passa a quest'ultimo" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1801 msgid "create/reset and switch to a branch" msgstr "crea/reimposta un branch e passa a quest'ultimo" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1803 msgid "second guess 'git switch <no-such-branch>'" msgstr "prevedi 'git switch <branch inesistente>'" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1805 msgid "throw away local modifications" msgstr "scarta le modifiche locali" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1839 msgid "which tree-ish to checkout from" msgstr "albero da cui eseguire il checkout" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1841 msgid "restore the index" msgstr "ripristina l'indice" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1843 msgid "restore the working tree (default)" msgstr "ripristina l'albero di lavoro (impostazione predefinita)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1845 msgid "ignore unmerged entries" msgstr "ignora voci non sottoposte a merge" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1846 msgid "use overlay mode" msgstr "usa modalitร overlay" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " "<percorsi>..." -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "Eliminazione di %s in corso\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "Eliminerei %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "Salto il repository %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "Salterei il repository %s\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "eliminazione di %s non riuscita" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "impossibile eseguire l'lstat di %s\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10940,7 +12464,7 @@ msgstr "" "pippo - seleziona un elemento basandoti su un prefisso univoco\n" " - (vuoto) non selezionare niente\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10961,38 +12485,33 @@ msgstr "" "* - seleziona tutti gli elementi\n" " - (vuoto) termina il processo di selezione\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Eh (%s)?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "Immetti i pattern da ignorare>> " -#: builtin/clean.c:699 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENZIONE: Impossibile trovare elementi corrispondenti a %s" -#: builtin/clean.c:720 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Seleziona gli elementi da eliminare" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Eliminare %s [y/N]? " -#: builtin/clean.c:786 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "Ciao.\n" - -#: builtin/clean.c:794 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11011,64 +12530,52 @@ msgstr "" "help - visualizza questa schermata\n" "? - guida al prompt di selezione" -#: 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 +#: builtin/clean.c:825 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:846 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "Non ci sono piรน file da ripulire, esco." -#: builtin/clean.c:908 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "non stampare i nomi dei file eliminati" -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "force" msgstr "forza l'operazione" -#: builtin/clean.c:911 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "pulizia interattiva" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "rimuovi intere directory" -#: 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/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "pattern" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "aggiungi <pattern> alle regole usate per ignorare i file" -#: builtin/clean.c:916 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "elimina anche i file ignorati" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "elimina solo i file ignorati" -#: builtin/clean.c:936 -msgid "-x and -X cannot be used together" -msgstr "-x e -X non possono essere usati insieme" - -#: builtin/clean.c:940 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11076,7 +12583,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:943 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11084,7 +12591,11 @@ 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:46 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "-x e -X non possono essere usati insieme" + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opzioni>] [--] <repository> [<directory>]" @@ -11092,7 +12603,7 @@ msgstr "git clone [<opzioni>] [--] <repository> [<directory>]" msgid "don't create a checkout" msgstr "non creare un checkout" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 msgid "create a bare repository" msgstr "crea un repository spoglio" @@ -11112,11 +12623,11 @@ msgstr "non usare i collegamenti reali locali, copia sempre i file" msgid "setup as shared repository" msgstr "imposta il repository come condiviso" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "specificatore percorso" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "inizializza sottomoduli durante la clonazione" @@ -11124,26 +12635,26 @@ msgstr "inizializza sottomoduli durante la clonazione" msgid "number of submodules cloned in parallel" msgstr "numero di sottomoduli clonati in parallelo" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:550 msgid "template-directory" msgstr "directory modelli" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:551 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:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "repository di riferimento" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 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:3314 builtin/repack.c:319 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 msgid "name" msgstr "nome" @@ -11159,8 +12670,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:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/pull.c:208 msgid "depth" msgstr "profonditร " @@ -11168,7 +12679,8 @@ 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:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 msgid "time" msgstr "tempo" @@ -11176,18 +12688,19 @@ 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:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 msgid "revision" msgstr "revisione" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 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/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "clona solo un branch, HEAD o quello specificato con --branch" @@ -11199,11 +12712,11 @@ msgstr "non clonare alcun tag e fai sรฌ che i fetch successivi non li seguano" msgid "any cloned submodules will be shallow" msgstr "tutti i sottomoduli clonati saranno shallow" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:559 msgid "gitdir" msgstr "directory Git" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "separa la directory Git dall'albero di lavoro" @@ -11215,23 +12728,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:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 msgid "server-specific" msgstr "specifica del server" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 msgid "option to transmit" msgstr "opzione da trasmettere" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 msgid "use IPv4 addresses only" msgstr "usa solo indirizzi IPv4" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 msgid "use IPv6 addresses only" msgstr "usa solo indirizzi IPv6" @@ -11241,7 +12754,13 @@ msgstr "" "tutti i sottomoduli clonati useranno il loro rispettivo branch remoto " "tracciato" -#: builtin/clone.c:285 +#: 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 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11249,47 +12768,42 @@ msgstr "" "Non รจ stato possibile indovinare alcun nome directory.\n" "Specifica una directory tramite la riga di comando" -#: builtin/clone.c:338 +#: builtin/clone.c:340 #, 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:411 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s esiste e non รจ una directory" -#: builtin/clone.c:428 +#: builtin/clone.c:431 #, c-format msgid "failed to start iterator over '%s'" msgstr "impossibile avviare l'iteratore su '%s'" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "unlink di '%s' non riuscito" - -#: builtin/clone.c:458 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "creazione del collegamento '%s' non riuscita" -#: builtin/clone.c:462 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "copia del file in '%s' non riuscita" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "iterazione su '%s' non riuscita" -#: builtin/clone.c:492 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "fatto.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:512 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11300,98 +12814,108 @@ msgstr "" "con 'git status' e riprovare ad eseguire il checkout con\n" "'git restore --source=HEAD :/'\n" -#: builtin/clone.c:583 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossibile trovare il branch remoto %s da clonare." -#: builtin/clone.c:702 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "impossibile aggiornare %s" -#: builtin/clone.c:752 +#: builtin/clone.c:756 +msgid "failed to initialize sparse-checkout" +msgstr "inizializzazione del file sparse-checkout non riuscita" + +#: builtin/clone.c:779 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:783 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "impossibile eseguire il checkout dell'albero di lavoro" -#: builtin/clone.c:833 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "impossibile scrivere i parametri nel file di configurazione" -#: builtin/clone.c:896 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "impossibile eseguire il repack per pulire l'area di lavoro" -#: builtin/clone.c:898 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "impossibile eseguire l'unlink del file alternates temporaneo" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:970 builtin/receive-pack.c:2434 msgid "Too many arguments." msgstr "Troppi argomenti." -#: builtin/clone.c:942 +#: builtin/clone.c:974 msgid "You must specify a repository to clone." msgstr "Devi specificare un repository da clonare." -#: builtin/clone.c:955 +#: builtin/clone.c:987 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "le opzioni --bare e --origin %s non sono compatibili." -#: builtin/clone.c:958 +#: builtin/clone.c:990 msgid "--bare and --separate-git-dir are incompatible." msgstr "le opzioni --bare e --separate-git-dir non sono compatibili." -#: builtin/clone.c:971 +#: builtin/clone.c:1006 #, c-format msgid "repository '%s' does not exist" msgstr "il repository '%s' non esiste" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:1010 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "la profonditร %s non รจ un numero positivo" -#: builtin/clone.c:987 +#: builtin/clone.c:1020 #, 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:997 +#: builtin/clone.c:1026 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "" +"il percorso del repository '%s' esiste giร e non รจ una directory vuota." + +#: builtin/clone.c:1040 #, c-format msgid "working tree '%s' already exists." msgstr "l'albero di lavoro '%s' esiste giร ." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossibile creare le prime directory di '%s'" -#: builtin/clone.c:1017 +#: builtin/clone.c:1060 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossibile creare la directory dell'albero di lavoro '%s'" -#: builtin/clone.c:1037 +#: builtin/clone.c:1080 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clone nel repository spoglio '%s' in corso...\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1082 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clone in '%s' in corso...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1106 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11399,36 +12923,36 @@ msgstr "" "il clone --recursive non รจ compatibile nรฉ con --reference nรฉ con --reference-" "if-able" -#: builtin/clone.c:1124 +#: builtin/clone.c:1170 msgid "--depth is ignored in local clones; use file:// instead." msgstr "L'opzione --depth รจ ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1126 +#: builtin/clone.c:1172 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:1128 +#: builtin/clone.c:1174 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:1130 +#: builtin/clone.c:1176 msgid "--filter is ignored in local clones; use file:// instead." msgstr "L'opzione --filter รจ ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1133 +#: builtin/clone.c:1179 msgid "source repository is shallow, ignoring --local" msgstr "il repository sorgente รจ shallow, ignoro l'opzione --local" -#: builtin/clone.c:1138 +#: builtin/clone.c:1184 msgid "--local is ignored" msgstr "l'opzione --local รจ ignorata" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1268 builtin/clone.c:1276 #, 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:1226 +#: builtin/clone.c:1279 msgid "You appear to have cloned an empty repository." msgstr "Sembra che tu abbia clonato un repository vuoto." @@ -11464,6 +12988,112 @@ msgstr "Spazi vuoti fra le colonne" msgid "--command must be the first argument" msgstr "--command deve essere il primo argomento" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +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:14 builtin/commit-graph.c:27 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" +"git commit-graph write [--object-dir <directory oggetti>] [--append] [--" +"split[=<strategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opzioni split>" + +#: builtin/commit-graph.c:64 +#, c-format +msgid "could not find object directory matching %s" +msgstr "impossibile trovare la directory oggetti corrispondente a %s" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "directory" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "La directory oggetti in cui memorizzare il grafo" + +#: builtin/commit-graph.c:83 +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:106 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "Impossibile aprire il grafo dei commit '%s'" + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "argomento --split non riconosciuto, %s" + +#: builtin/commit-graph.c:155 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "ID oggetto non esadecimale inatteso: %s" + +#: builtin/commit-graph.c:160 +#, c-format +msgid "invalid object: %s" +msgstr "oggetto non valido: %s" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "inizia la visita da tutti i riferimenti" + +#: builtin/commit-graph.c:215 +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:217 +msgid "start walk at commits listed by stdin" +msgstr "inizia la visita ai commit elencati sullo standard input" + +#: builtin/commit-graph.c:219 +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:221 +msgid "enable computation for changed paths" +msgstr "abilita calcolo percorsi modificati" + +#: builtin/commit-graph.c:224 +msgid "allow writing an incremental commit-graph file" +msgstr "consenti la scrittura di un file grafo dei commit incrementale" + +#: builtin/commit-graph.c:228 +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:230 +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:232 +msgid "only expire files older than a given date-time" +msgstr "fai scadere solo i file piรน vecchi di una determinata data e ora" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "" +"numero massimo dei filtri di Bloom per i percorsi modificati da calcolare" + +#: builtin/commit-graph.c:255 +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" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "Raccolta dei commit dall'input in corso" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -11477,7 +13107,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:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 #, c-format msgid "not a valid object name %s" msgstr "%s non รจ un nome oggetto valido" @@ -11505,13 +13135,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:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 -#: builtin/tag.c:412 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 msgid "message" msgstr "messaggio" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "messaggio di commit" @@ -11519,8 +13149,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:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "firma il commit con GPG" @@ -11567,10 +13197,14 @@ msgstr "" "\n" #: builtin/commit.c:63 +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "Altrimenti, usa 'git rebase --skip'\n" + +#: builtin/commit.c:66 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Altrimenti, usa 'git cherry-pick --skip'\n" -#: builtin/commit.c:66 +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -11592,61 +13226,74 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "decompressione dell'oggetto HEAD dell'albero non riuscita" -#: builtin/commit.c:356 +#: builtin/commit.c:348 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "l'opzione --pathspec-from-file non ha senso con -a" + +#: builtin/commit.c:361 +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:373 msgid "unable to create temporary index" msgstr "impossibile creare l'indice temporaneo" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "aggiunta interattiva non riuscita" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "impossibile aggiornare l'indice temporaneo" -#: builtin/commit.c:378 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "Impossibile aggiornare l'albero cache principale" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "impossibile scrivere il file new_index" -#: builtin/commit.c:455 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "impossibile eseguire un commit parziale durante un merge." -#: builtin/commit.c:457 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossibile eseguire un commit parziale durante un cherry-pick." -#: builtin/commit.c:465 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "impossibile eseguire un commit parziale durante un rebase." + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "impossibile leggere l'indice" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "impossibile scrivere il file indice temporaneo" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "dal commit '%s' manca l'intestazione autore" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "il commit '%s' ha una riga autore malformata" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "parametro --author malformato" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11654,68 +13301,66 @@ msgstr "" "impossibile selezionare un carattere commento non usato\n" "nel messaggio di commit corrente" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "impossibile trovare il commit %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:478 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lettura del messaggio di log dallo standard input)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "impossibile leggere il log dallo standard input" -#: builtin/commit.c:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "impossibile leggere il file di log '%s'" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "impossibile leggere SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "impossibile leggere MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "impossibile scrivere il modello di commit" -#: builtin/commit.c:829 -#, c-format +#: builtin/commit.c:853 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" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" "Sembra che tu stia eseguendo il commit di un merge.\n" -"Se ciรฒ non รจ corretto, elimina il file\n" -"\t%s\n" +"Se ciรฒ non รจ corretto, esegui\n" +"\tgit update-ref -d MERGE_HEAD\n" "e riprova.\n" -#: builtin/commit.c:834 -#, c-format +#: builtin/commit.c:858 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" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" -"Sembra che tu stia eseguendo il commit di un merge.\n" -"Se ciรฒ non รจ corretto, elimina il file\n" -"\t%s\n" +"Sembra che tu stia eseguendo il commit di un cherry-pick.\n" +"Se ciรฒ non รจ corretto, esegui\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "e riprova.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11724,7 +13369,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:855 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11735,149 +13380,148 @@ msgstr "" "con '%c' saranno mantenute; puoi rimuoverle autonomamente se lo desideri.\n" "Un messaggio vuoto interromperร il commit.\n" -#: builtin/commit.c:872 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutore: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sEsecutore commit: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "Impossibile leggere l'indice" -#: builtin/commit.c:972 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Errore durante la costruzione degli alberi" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:276 #, 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:1030 +#: builtin/commit.c:1055 #, 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:1044 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo non valido ignorato: '%s'" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo file non tracciati non valido: '%s'" -#: builtin/commit.c:1102 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long e -z non sono compatibili" -#: builtin/commit.c:1146 +#: builtin/commit.c:1171 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:1155 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "Non c'รจ nulla da modificare." -#: builtin/commit.c:1158 +#: builtin/commit.c:1183 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:1160 +#: builtin/commit.c:1185 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:1163 +#: builtin/commit.c:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "Sei nel bel mezzo di un rebase - impossibile eseguire l'amend." + +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "Le opzioni --squash e --fixup non possono essere usate insieme" -#: builtin/commit.c:1173 +#: builtin/commit.c:1200 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:1175 +#: builtin/commit.c:1202 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:1183 +#: builtin/commit.c:1211 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:1200 +#: builtin/commit.c:1229 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: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 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "i percorsi '%s ...' non hanno senso con -a" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "visualizza concisamente lo stato" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "visualizza le informazioni sul branch" -#: builtin/commit.c:1343 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "visualizza le informazioni sullo stash" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "calcola tutti i valori dopo/prima di" -#: builtin/commit.c:1347 +#: builtin/commit.c:1374 msgid "version" msgstr "versione" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "output leggibile da una macchina" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "visualizza lo stato in forma lunga (impostazione predefinita)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "termina le voci con NUL" -#: 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 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 msgid "mode" msgstr "modo" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1383 builtin/commit.c:1541 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:1360 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11885,11 +13529,11 @@ msgstr "" "visualizza file ignorati, modalitร facoltative: traditional, matching, no. " "(Impostazione predefinita: traditional)" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "quando" -#: builtin/commit.c:1363 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11897,175 +13541,175 @@ msgstr "" "ignora modifiche ai sottomoduli, opzione facoltativa \"quando\": all, dirty, " "untracked. (Impostazione predefinita: all)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "elenca i file non tracciati in colonne" -#: builtin/commit.c:1366 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "non rilevare le ridenominazioni" -#: builtin/commit.c:1368 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "" "rileva le ridenominazioni, imposta facoltativamente l'indice di similaritร " -#: builtin/commit.c:1388 +#: builtin/commit.c:1415 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinazione di argomenti sui file ignorati e non tracciati non supportata" -#: builtin/commit.c:1493 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "" "ometti di visualizzare il riepilogo dopo un commit completato con successo" -#: builtin/commit.c:1494 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "visualizza il diff nel modello del messaggio di commit" -#: builtin/commit.c:1496 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "Opzioni messaggio di commit" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 msgid "read message from file" msgstr "leggi il messaggio da un file" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "author" msgstr "autore" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "sovrascrivi l'autore per il commit" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:539 msgid "date" msgstr "data" -#: builtin/commit.c:1499 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "sovrascrivi la data per il commit" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "commit" -#: builtin/commit.c:1501 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "riusa il messaggio del commit specificato per poi modificarlo" -#: builtin/commit.c:1502 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "riusa il messaggio del commit specificato" -#: builtin/commit.c:1503 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa il messaggio in formato autosquash per correggere il commit specificato" -#: builtin/commit.c:1504 +#: builtin/commit.c:1508 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:1505 +#: builtin/commit.c:1509 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:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "aggiungi Signed-off-by:" -#: builtin/commit.c:1507 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "usa il file modello specificato" -#: builtin/commit.c:1508 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "forza la modifica del commit" -#: builtin/commit.c:1510 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "includi lo stato nel modello del messaggio di commit" -#: builtin/commit.c:1515 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "Opzioni contenuto commit" -#: builtin/commit.c:1516 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "esegui il commit di tutti i file modificati" -#: builtin/commit.c:1517 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "aggiungi i file specificati all'indice per il commit" -#: builtin/commit.c:1518 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "aggiungi i file in modalitร interattiva" -#: builtin/commit.c:1519 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "aggiungi le modifiche in modalitร interattiva" -#: builtin/commit.c:1520 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "esegui il commit solo dei file specificati" -#: builtin/commit.c:1521 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "ignora gli hook pre-commit e commit-msg" -#: builtin/commit.c:1522 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "visualizza gli elementi di cui sarebbe eseguito il commit" -#: builtin/commit.c:1535 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "modifica il commit precedente" -#: builtin/commit.c:1536 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "ignora l'hook post-rewrite" -#: builtin/commit.c:1541 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "accetta di registrare una modifica vuota" -#: builtin/commit.c:1543 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "accetta di registrare una modifica con un messaggio vuoto" -#: builtin/commit.c:1616 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "File MERGE_HEAD corrotto (%s)" -#: builtin/commit.c:1623 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "impossibile leggere MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "impossibile leggere il messaggio di commit: %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1657 #, 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:1654 +#: builtin/commit.c:1662 #, 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:1688 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12077,289 +13721,226 @@ msgstr "" "superata, quindi esegui \"git restore --staged :/\" per\n" "procedere al ripristino." -#: 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: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] <split options>" -msgstr "" -"git commit-graph write [--object-dir <directory oggetti>] [--append|--split] " -"[--reachable|--stdin-packs|--stdin-commits] <opzioni split>" - -#: 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: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: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: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:164 -msgid "start walk at all refs" -msgstr "inizia la visita da tutti i riferimenti" - -#: 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:168 -msgid "start walk at commits listed by stdin" -msgstr "inizia la visita ai commit elencati sullo standard input" - -#: 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:172 -msgid "allow writing an incremental commit-graph file" -msgstr "consenti la scrittura di un file grafo dei commit incrementale" - -#: 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: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: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" - #: builtin/config.c:11 msgid "git config [<options>]" msgstr "git config [<opzioni>]" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:107 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "argomento --type non riconosciuto: %s" -#: builtin/config.c:115 +#: builtin/config.c:119 msgid "only one type at a time" msgstr "solo un tipo per volta" -#: builtin/config.c:124 +#: builtin/config.c:128 msgid "Config file location" msgstr "Percorso file di configurazione" -#: builtin/config.c:125 +#: builtin/config.c:129 msgid "use global config file" msgstr "usa il file di configurazione globale" -#: builtin/config.c:126 +#: builtin/config.c:130 msgid "use system config file" msgstr "usa il file di configurazione di sistema" -#: builtin/config.c:127 +#: builtin/config.c:131 msgid "use repository config file" msgstr "usa il file di configurazione del repository" -#: builtin/config.c:128 +#: builtin/config.c:132 msgid "use per-worktree config file" msgstr "usa il file di configurazione per albero di lavoro" -#: builtin/config.c:129 +#: builtin/config.c:133 msgid "use given config file" msgstr "usa il file di configurazione specificato" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "blob-id" msgstr "ID blob" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "read config from given blob object" msgstr "leggi la configurazione dall'oggetto blob specificato" -#: builtin/config.c:131 +#: builtin/config.c:135 msgid "Action" msgstr "Azione" -#: builtin/config.c:132 +#: builtin/config.c:136 msgid "get value: name [value-regex]" msgstr "ottieni valore: nome [espressione-regolare-valore]" -#: builtin/config.c:133 +#: builtin/config.c:137 msgid "get all values: key [value-regex]" msgstr "ottieni tutti i valori: chiave [espressione-regolare-valore]" -#: builtin/config.c:134 +#: builtin/config.c:138 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:135 +#: builtin/config.c:139 msgid "get value specific for the URL: section[.var] URL" msgstr "ottieni il valore specifico per l'URL: sezione[.variabile] URL" -#: builtin/config.c:136 +#: builtin/config.c:140 msgid "replace all matching variables: name value [value_regex]" msgstr "" "sostituisci tutte le variabili corrispondenti: nome-valore [espressione-" "regolare-valore]" -#: builtin/config.c:137 +#: builtin/config.c:141 msgid "add a new variable: name value" msgstr "aggiungi una nuova variabile: nome valore" -#: builtin/config.c:138 +#: builtin/config.c:142 msgid "remove a variable: name [value-regex]" msgstr "rimuovi una variabile: nome [espressione-regolare-valore]" -#: builtin/config.c:139 +#: builtin/config.c:143 msgid "remove all matches: name [value-regex]" msgstr "rimuovi tutte le corrispondenze: nome [espressione-regolare-valore]" -#: builtin/config.c:140 +#: builtin/config.c:144 msgid "rename section: old-name new-name" msgstr "rinomina sezione: vecchio-nome nuovo-nome" -#: builtin/config.c:141 +#: builtin/config.c:145 msgid "remove a section: name" msgstr "rimuovi una sezione: nome" -#: builtin/config.c:142 +#: builtin/config.c:146 msgid "list all" msgstr "elenca tutti" -#: builtin/config.c:143 +#: builtin/config.c:147 msgid "open an editor" msgstr "apri un editor" -#: builtin/config.c:144 +#: builtin/config.c:148 msgid "find the color configured: slot [default]" msgstr "trova il colore configurato: slot [valore-predefinito]" -#: builtin/config.c:145 +#: builtin/config.c:149 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trova l'impostazione colore: slot [standard-output-รจ-una-tty]" -#: builtin/config.c:146 +#: builtin/config.c:150 msgid "Type" msgstr "Tipo" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:151 builtin/env--helper.c:43 msgid "value is given this type" msgstr "al valore รจ assegnato questo tipo" -#: builtin/config.c:148 +#: builtin/config.c:152 msgid "value is \"true\" or \"false\"" msgstr "il valore รจ \"true\" o \"false\"" -#: builtin/config.c:149 +#: builtin/config.c:153 msgid "value is decimal number" msgstr "il valore รจ un numero decimale" -#: builtin/config.c:150 +#: builtin/config.c:154 msgid "value is --bool or --int" msgstr "il valore รจ --bool o --int" -#: builtin/config.c:151 +#: builtin/config.c:155 +msgid "value is --bool or string" +msgstr "il valore รจ --bool o una stringa" + +#: builtin/config.c:156 msgid "value is a path (file or directory name)" msgstr "il valore รจ un percorso (nome file o directory)" -#: builtin/config.c:152 +#: builtin/config.c:157 msgid "value is an expiry date" msgstr "il valore รจ una data di scadenza" -#: builtin/config.c:153 +#: builtin/config.c:158 msgid "Other" msgstr "Altro" -#: builtin/config.c:154 +#: builtin/config.c:159 msgid "terminate values with NUL byte" msgstr "termina i valori con un byte NUL" -#: builtin/config.c:155 +#: builtin/config.c:160 msgid "show variable names only" msgstr "visualizza solo i nomi delle variabili" -#: builtin/config.c:156 +#: builtin/config.c:161 msgid "respect include directives on lookup" msgstr "" "rispetta le directory di inclusione durante il recupero delle variabili" -#: builtin/config.c:157 +#: builtin/config.c:162 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:158 builtin/env--helper.c:40 +#: builtin/config.c:163 +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:164 builtin/env--helper.c:45 msgid "value" msgstr "valore" -#: builtin/config.c:158 +#: builtin/config.c:164 msgid "with --get, use default value when missing entry" msgstr "con --get, usa il valore predefinito se la voce รจ mancante" -#: builtin/config.c:172 +#: builtin/config.c:178 #, c-format msgid "wrong number of arguments, should be %d" msgstr "numero di argomenti errato, dovrebbero essere %d" -#: builtin/config.c:174 +#: builtin/config.c:180 #, 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:308 +#: builtin/config.c:334 #, c-format msgid "invalid key pattern: %s" msgstr "pattern chiave non valido: %s" -#: builtin/config.c:344 +#: builtin/config.c:370 #, c-format msgid "failed to format default config value: %s" msgstr "formattazione del valore configurazione predefinito non riuscita: %s" -#: builtin/config.c:401 +#: builtin/config.c:434 #, c-format msgid "cannot parse color '%s'" msgstr "impossibile analizzare il colore '%s'" -#: builtin/config.c:443 +#: builtin/config.c:476 msgid "unable to parse default color value" msgstr "impossibile analizzare il valore colore predefinito" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:529 builtin/config.c:789 msgid "not in a git directory" msgstr "non si รจ in una directory git" -#: builtin/config.c:499 +#: builtin/config.c:532 msgid "writing to stdin is not supported" msgstr "la scrittura su standard input non รจ supportata" -#: builtin/config.c:502 +#: builtin/config.c:535 msgid "writing config blobs is not supported" msgstr "la scrittura di blob di configurazione non รจ supportata" -#: builtin/config.c:587 +#: builtin/config.c:620 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12374,23 +13955,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:644 msgid "only one config file at a time" msgstr "solo un file di configurazione per volta" -#: builtin/config.c:616 +#: builtin/config.c:650 msgid "--local can only be used inside a git repository" msgstr "--local puรฒ essere usato solo in un repository Git" -#: builtin/config.c:619 +#: builtin/config.c:652 msgid "--blob can only be used inside a git repository" msgstr "--blob puรฒ essere usato solo in un repository Git" -#: builtin/config.c:638 +#: builtin/config.c:654 +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree puรฒ essere usato solo in un repository Git" + +#: builtin/config.c:676 msgid "$HOME not set" msgstr "$HOME non impostata" -#: builtin/config.c:658 +#: builtin/config.c:700 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -12401,52 +13986,52 @@ msgstr "" "Leggi la sezione \"FILE DI CONFIGURAZIONE\" in \"git help worktree\" per\n" "i dettagli" -#: builtin/config.c:688 +#: builtin/config.c:735 msgid "--get-color and variable type are incoherent" msgstr "--get-color e il tipo della variabile non sono coerenti" -#: builtin/config.c:693 +#: builtin/config.c:740 msgid "only one action at a time" msgstr "solo un'azione per volta" -#: builtin/config.c:706 +#: builtin/config.c:753 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only รจ applicabile solo a --list o --get-regexp" -#: builtin/config.c:712 +#: builtin/config.c:759 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:718 +#: builtin/config.c:765 msgid "--default is only applicable to --get" msgstr "--default รจ applicabile solo a --get" -#: builtin/config.c:731 +#: builtin/config.c:778 #, c-format msgid "unable to read config file '%s'" msgstr "impossibile leggere il file di configurazione '%s'" -#: builtin/config.c:734 +#: builtin/config.c:781 msgid "error processing config file(s)" msgstr "errore durante l'elaborazione del/dei file di configurazione" -#: builtin/config.c:744 +#: builtin/config.c:791 msgid "editing stdin is not supported" msgstr "la modifica dello standard input non รจ supportata" -#: builtin/config.c:746 +#: builtin/config.c:793 msgid "editing blobs is not supported" msgstr "la modifica dei blob non รจ supportata" -#: builtin/config.c:760 +#: builtin/config.c:807 #, c-format msgid "cannot create configuration file %s" msgstr "impossibile creare il file di configurazione %s" -#: builtin/config.c:773 +#: builtin/config.c:820 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12455,7 +14040,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:847 builtin/config.c:858 +#: builtin/config.c:894 builtin/config.c:905 #, c-format msgid "no such section: %s" msgstr "sezione %s non esistente" @@ -12468,11 +14053,38 @@ 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:27 +#: builtin/credential-cache--daemon.c:226 +#, 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 "" +"I permessi sulla directory del socket sono troppo laschi; altri\n" +"utenti potrebbero essere in grado di leggere le credenziali nella\n" +"cache. Valuta di eseguire:\n" +"\n" +"\tchmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "stampa i messaggi di debug sullo standard error" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" +"credential-cache--daemon non disponibile; supporto socket UNIX non presente" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache non disponibile; supporto socket UNIX non presente" + +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opzioni>] [<espressione commit>...]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<opzioni>] --dirty" @@ -12488,39 +14100,34 @@ msgstr "leggero" msgid "annotated" msgstr "annotato" -#: builtin/describe.c:273 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "il tag annotato %s non รจ disponibile" -#: builtin/describe.c:277 +#: builtin/describe.c:281 #, c-format -msgid "annotated tag %s has no embedded name" -msgstr "il tag annotato %s non ha un nome incorporato" +msgid "tag '%s' is externally known as '%s'" +msgstr "il tag '%s' รจ noto all'esterno come '%s'" -#: builtin/describe.c:279 -#, c-format -msgid "tag '%s' is really '%s' here" -msgstr "il tag '%s' in realtร qui รจ '%s'" - -#: builtin/describe.c:323 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "nessun tag corrisponde esattamente a '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:330 #, 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:379 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "ricerca terminata in %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12529,7 +14136,7 @@ msgstr "" "Nessun tag annotato puรฒ descrivere '%s'.\n" "Ciรฒ nonostante, c'erano dei tag non annotati: prova con --tags." -#: builtin/describe.c:409 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12538,12 +14145,12 @@ msgstr "" "Nessun tag puรฒ descrivere '%s'.\n" "Prova con --always o crea dei tag." -#: builtin/describe.c:439 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "ho attraversato %lu commit\n" -#: builtin/describe.c:442 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12552,151 +14159,161 @@ msgstr "" "trovati piรน di %i tag; ho elencato i %i piรน recenti\n" "ho terminato la ricerca in %s\n" -#: builtin/describe.c:510 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "descrivi %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "%s non รจ un nome oggetto valido" -#: builtin/describe.c:521 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s non รจ nรฉ un commit nรฉ un blob" -#: builtin/describe.c:535 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "trova il tag successivo al commit" -#: builtin/describe.c:536 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "esegui il debug della strategia di ricerca sullo standard error" -#: builtin/describe.c:537 +#: builtin/describe.c:556 msgid "use any ref" msgstr "usa qualunque riferimento" -#: builtin/describe.c:538 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "usa qualunque tag, anche quelli non annotati" -#: builtin/describe.c:539 +#: builtin/describe.c:558 msgid "always use long format" msgstr "usa sempre il formato lungo" -#: builtin/describe.c:540 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "segui solo il primo genitore" -#: builtin/describe.c:543 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "visualizza solo le corrispondenze esatte" -#: builtin/describe.c:545 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "considera gli <n> tag piรน recenti (impostazione predefinita: 10)" -#: builtin/describe.c:547 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "considera solo i tag corrispondenti al <pattern>" -#: builtin/describe.c:549 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "non considerare i tag corrispondenti al <pattern>" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "visualizza l'oggetto commit abbreviato come fallback" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "contrassegno" -#: builtin/describe.c:553 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" "aggiungi <contrassegno> all'albero di lavoro sporco (impostazione " "predefinita: \"-dirty\")" -#: builtin/describe.c:556 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "aggiungi <contrassegno> all'albero di lavoro rotto (impostazione " "predefinita: \"-broken\")" -#: builtin/describe.c:574 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "--long non รจ compatibile con --abbrev=0" -#: builtin/describe.c:603 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "Nessun nome trovato, non รจ possibile descrivere nulla." -#: builtin/describe.c:654 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty non รจ compatibile con le espressioni commit" -#: builtin/describe.c:656 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "--broken non รจ compatibile con le espressioni commit" -#: builtin/diff.c:84 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': non รจ un file regolare o un collegamento simbolico" -#: builtin/diff.c:235 +#: builtin/diff.c:241 #, c-format msgid "invalid option: %s" msgstr "opzione non valida: %s" -#: builtin/diff.c:350 +#: builtin/diff.c:358 +#, c-format +msgid "%s...%s: no merge base" +msgstr "%s...%s: non esiste una base per il merge" + +#: builtin/diff.c:468 msgid "Not a git repository" msgstr "Non รจ un repository Git" -#: builtin/diff.c:394 +#: builtin/diff.c:513 #, c-format msgid "invalid object '%s' given." msgstr "specificato oggetto non valido '%s'." -#: builtin/diff.c:403 +#: builtin/diff.c:524 #, c-format msgid "more than two blobs given: '%s'" msgstr "piรน di due blob specificati: '%s'" -#: builtin/diff.c:408 +#: builtin/diff.c:529 #, c-format msgid "unhandled object '%s' given." msgstr "specificato oggetto non gestito '%s'." +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "%s...%s: esistono piรน basi per il merge, utilizzo %s" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "non riuscito: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "impossibile leggere il collegamento simbolico %s" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "impossibile leggere il file collegamento simbolico %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, 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:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12704,54 +14321,54 @@ msgstr "" "i formati diff combinati ('-c' e '--cc') non sono supportati in\n" "modalitร diff directory ('-d' e '--dir-diff')." -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "entrambi i file risultano modificati: '%s' e '%s'." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "il file nell'albero di lavoro รจ stato mantenuto." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "esistono file temporanei in '%s'." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "potresti voler ripulirli o ripristinarli." -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "usa `diff.guitool` anzichรฉ `diff.tool`" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "esegui un diff directory completo" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "non chiedere conferma prima di lanciare un tool diff" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "usa collegamenti simbolici in modalitร diff directory" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "strumento" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "usa lo strumento diff specificato" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 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:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12759,31 +14376,31 @@ msgstr "" "fai sรฌ che 'git-difftool' esca quando uno strumento diff invocato " "restituisce un codice d'uscita diverso da zero" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "specifica un comando personalizzato per visualizzare i diff" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "fornito a `diff`" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool richiede un albero di lavoro o --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff non รจ compatibile con --no-index" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "le opzioni --gui, --tool ed --extcmd sono mutualmente esclusive" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "nessuno <strumento> specificato per --tool=<strumento>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "nessun <comando> specificato per --extcmd=<comando>" @@ -12791,28 +14408,28 @@ msgstr "nessun <comando> specificato per --extcmd=<comando>" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <opzioni> <variabile d'ambiente>" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "tipo" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "" "impostazione predefinita su cui ripiegheranno le chiamate git_env_*(...)" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "" "non visualizzare messaggi, usa solo il valore di git_env_*() come codice " "d'uscita" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" "l'opzione `--default' richiede un valore booleano con `--type=bool`, non `%s`" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -12825,161 +14442,246 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opzioni-elenco-rev]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:868 +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:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "il token --anonymize-map non puรฒ essere vuoto" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "visualizza l'avanzamento dopo <n> oggetti" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "seleziona la gestione dei tag firmati" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "seleziona la gestione dei tag che contrassegnano oggetti filtrati" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1206 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:1135 +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" msgstr "Esegui il dump dei contrassegni in questo file" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" msgstr "Importa i contrassegni da questo file" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1215 +msgid "Import marks from this file if it exists" +msgstr "Importa i contrassegni da questo file se esiste" + +#: builtin/fast-export.c:1217 msgid "Fake a tagger when tags lack one" msgstr "Usa un tagger falso se i tag non ne hanno uno" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1219 msgid "Output full tree for each commit" msgstr "Visualizza in output l'albero completo per ogni commit" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1221 msgid "Use the done feature to terminate the stream" msgstr "Usa la funzionalitร \"fatto\" per terminare il flusso" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "Ometti l'output dei dati dei blob" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1223 builtin/log.c:1811 msgid "refspec" msgstr "specificatore riferimento" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1224 msgid "Apply refspec to exported refs" msgstr "Applica lo specificatore riferimento ai riferimenti esportati" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "rendi anonimo l'output" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "da:a" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "converte <da> ad <a> nell'output in forma anonima" + +#: builtin/fast-export.c:1230 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:1151 +#: builtin/fast-export.c:1232 msgid "Show original object ids of blobs/commits" msgstr "Visualizza gli ID oggetto originari dei blob/commit" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1234 +msgid "Label tags with mark ids" +msgstr "Etichetta i tag con ID contrassegno" + +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "--anonymize-map senza --anonymize non ha senso" + +#: builtin/fast-export.c:1272 +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/fast-import.c:3086 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "Contrassegni Da mancanti per il sottomodulo '%s'" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "Contrassegni A mancanti per il sottomodulo '%s'" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "Atteso comando 'mark', ricevuto %s" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "Atteso comando 'to', ricevuto %s" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "" +"Per l'opzione riscrittura sottomodulo ci si attendeva un formato nome:" +"nomefile" + +#: builtin/fast-import.c:3374 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "funzionalitร '%s' vietata nell'input senza --allow-unsafe-features" + +#: builtin/fetch-pack.c:241 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "File di lock creato ma non segnalato: %s" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opzioni>] [<repository> [<specificatore riferimento>...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opzioni>] <gruppo>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opzioni>] [(<repository> | <gruppo>)...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opzioni>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel non puรฒ essere negativo" + +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "esegui il fetch da tutti i remoti" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:144 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "imposta l'upstream per git pull/fetch" + +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "aggiungi i dati a .git/FETCH_HEAD anzichรฉ sovrascriverli" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "percorso in cui caricare il pack sul remoto" -#: builtin/fetch.c:130 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "forza la sovrascrittura del riferimento locale" -#: builtin/fetch.c:132 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "esegui il fetch da piรน remoti" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "esegui il fetch di tutti i tag e degli oggetti associati" -#: builtin/fetch.c:136 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "non eseguire il fetch di alcun tag (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "numero di sottomoduli recuperati in parallelo" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:159 builtin/pull.c:198 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:142 +#: builtin/fetch.c:161 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:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "a richiesta" -#: builtin/fetch.c:144 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "controlla il recupero ricorsivo dei sottomoduli" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "scrivi i riferimenti recuperati nel file FETCH_HEAD" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "mantieni il pack scaricato" -#: builtin/fetch.c:150 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "consenti l'aggiornamento del riferimento HEAD" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "aumenta la profonditร della cronologia di un clone shallow" -#: builtin/fetch.c:155 +#: builtin/fetch.c:176 builtin/pull.c:212 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:161 builtin/pull.c:230 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "converti in un repository completo" -#: builtin/fetch.c:164 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "anteponi questo prefisso all'output del percorso del sottomodulo" -#: builtin/fetch.c:167 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12987,90 +14689,98 @@ msgstr "" "impostazione predefinita per il recupero ricorsivo dei sottomoduli (a " "prioritร minore rispetto ai file di configurazione)" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "accetta i riferimenti che aggiornano .git/shallow" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "mappa riferimenti" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "specifica la mappa dei riferimenti per il fetch" -#: builtin/fetch.c:180 +#: builtin/fetch.c:201 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "segnala che abbiamo solo oggetti raggiungibili da quest'oggetto" -#: builtin/fetch.c:183 -msgid "run 'gc --auto' after fetching" -msgstr "esegui 'gc --auto' dopo il fetch" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "esegui 'maintenance --auto' dopo il fetch" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "controlla aggiornamenti forzati su tutti i branch aggiornati" -#: builtin/fetch.c:491 +#: builtin/fetch.c:210 +msgid "write the commit-graph after fetching" +msgstr "scrivi il grafo dei commit dopo il fetch" + +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "accetta gli specificatori riferimento dallo standard input" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "Impossibile trovare l'HEAD del riferimento remoto" -#: builtin/fetch.c:630 +#: builtin/fetch.c:677 #, 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:728 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "oggetto %s non trovato" -#: builtin/fetch.c:732 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "[aggiornato]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[rifiutato]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "impossibile eseguire il fetch nel branch corrente" -#: builtin/fetch.c:756 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[tag aggiornato]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "impossibile aggiornare il riferimento locale" -#: builtin/fetch.c:761 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "sovrascriverebbe il tag esistente" -#: builtin/fetch.c:783 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[nuovo tag]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[nuovo branch]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[nuovo riferimento]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:875 msgid "forced update" msgstr "aggiornamento forzato" -#: builtin/fetch.c:833 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "non fast forward" -#: builtin/fetch.c:854 +#: builtin/fetch.c:901 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" @@ -13081,7 +14791,7 @@ msgstr "" "riabilitarlo, usa l'opzione '--show-forced-updates' o esegui 'git config\n" "fetch.showForcedUpdates true'." -#: builtin/fetch.c:858 +#: builtin/fetch.c:905 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13093,22 +14803,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:888 +#: builtin/fetch.c:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s non ha inviato tutti gli oggetti necessari\n" -#: builtin/fetch.c:909 +#: builtin/fetch.c:960 #, 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:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "Da %.*s\n" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13118,60 +14828,81 @@ msgstr "" "eseguire\n" " 'git remote prune %s' per rimuovere ogni branch vecchio in conflitto" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr " (%s diventerร pendente)" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " (%s รจ diventato pendente)" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[eliminato]" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1195 builtin/remote.c:1113 msgid "(none)" msgstr "(nessuno)" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1218 #, 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:1177 +#: builtin/fetch.c:1237 #, 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:1180 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'opzione \"%s\" รจ ignorata per %s\n" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "rilevati branch multipli, stato incompatibile con --set-upstream" + +#: builtin/fetch.c:1463 +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:1465 +msgid "not setting upstream for a remote tag" +msgstr "non imposto l'upstream per un tag remoto" + +#: builtin/fetch.c:1467 +msgid "unknown branch type" +msgstr "tipo branch sconosciuto" + +#: builtin/fetch.c:1469 +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:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "Recupero di %s in corso\n" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Impossibile recuperare %s" -#: 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:1620 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "impossibile recuperare '%s' (codice di uscita: %d)\n" -#: builtin/fetch.c:1556 +#: builtin/fetch.c:1724 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13179,45 +14910,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:1593 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "Devi specificare il nome di un tag." -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "Le profonditร negative in --deepen non sono supportate" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "le opzioni --deepen e --depth sono mutualmente esclusive" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "--depth e --unshallow non possono essere usati insieme." -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow su un repository completo non ha senso" -#: builtin/fetch.c:1669 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "fetch --all non richiede un repository come argomento" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all non ha senso con degli specificatori riferimento" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "Remoto o gruppo remoti non esistente: %s" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1869 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:1703 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13225,29 +14956,33 @@ msgstr "" "--filter puรฒ essere usato solo con il remoto configurato nelle estensioni." "partialclone" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "--stdin puรฒ essere usato solo durante il fetch da un remoto" + +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <messaggio>] [--log[=<n>] | --no-log] [--file <file>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 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:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "alias di --log (deprecato)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "testo" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "usa <testo> come stringa iniziale del messaggio" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "file da cui leggere" @@ -13260,8 +14995,8 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <oggetto>]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" @@ -13290,7 +15025,7 @@ msgstr "racchiudi i segnaposto fra virgolette in modo da poterli usare con Tcl" msgid "show only <n> matched refs" msgstr "visualizza solo <n> riferimenti corrispondenti" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "rispetta le stringhe di formato per i colori" @@ -13314,32 +15049,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:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "sconosciuto" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, 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:131 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" msgstr "avviso in %s %s: %s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "collegamento rotto da %7s %s" -#: builtin/fsck.c:168 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "tipo oggetto errato nel collegamento" -#: builtin/fsck.c:184 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" @@ -13348,235 +15083,235 @@ msgstr "" "collegamento rotto da %7s %s\n" " a %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "%s mancante %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "%s non raggiungibile %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "%s pendente %s" -#: builtin/fsck.c:349 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "impossibile creare lost-found" -#: builtin/fsck.c:360 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "impossibile terminare '%s'" -#: builtin/fsck.c:377 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "Controllo di %s in corso" -#: builtin/fsck.c:415 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Controllo connessione in corso (%d oggetti)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "Controllo di %s in corso %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:430 msgid "broken links" msgstr "collegamenti rotti" -#: builtin/fsck.c:447 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "radice %s" -#: builtin/fsck.c:455 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "eseguito tag di %s %s (%s) in %s" -#: builtin/fsck.c:484 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: oggetto corrotto o mancante" -#: builtin/fsck.c:509 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: voce registro riferimenti non valida: %s" -#: builtin/fsck.c:523 +#: builtin/fsck.c:515 #, c-format msgid "Checking reflog %s->%s" msgstr "Controllo registro riferimenti %s->%s" -#: builtin/fsck.c:557 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: puntatore SHA1 non valido: %s" -#: builtin/fsck.c:564 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "%s: non รจ un commit" -#: builtin/fsck.c:619 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "avviso: nessun riferimento predefinito" -#: builtin/fsck.c:634 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: oggetto corrotto o mancante: %s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: impossibile analizzare l'oggetto: %s" -#: builtin/fsck.c:667 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "file SHA1 non valido: %s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "Controllo directory oggetti in corso" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "Controllo directory oggetti in corso" -#: builtin/fsck.c:700 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "Controllo collegamento %s" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "%s non valido" -#: builtin/fsck.c:712 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "%s punta a qualcosa di strano (%s)" -#: builtin/fsck.c:718 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: l'HEAD scollegato non punta a niente" -#: builtin/fsck.c:722 +#: builtin/fsck.c:713 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "avviso: %s punta a un branch non nato (%s)" -#: builtin/fsck.c:734 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "Controllo cache albero in corso" -#: builtin/fsck.c:739 +#: builtin/fsck.c:730 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: puntatore SHA1 non valido nella cache alberi" -#: builtin/fsck.c:750 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "oggetto non albero nella cache alberi" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opzioni>] [<oggetto>...]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "visualizza oggetti non raggiungibili" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "visualizza oggetti pendenti" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "segnala i tag" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "segnala i nodi radice" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "rendi gli oggetti indice nodi head" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "rendi i registri dei riferimenti nodi head (impostazione predefinita)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "considera anche i pack e gli oggetti alternativi" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "controlla solo la connessione" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "abilita controlli piรน restrittivi" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "scrivi oggetti pendenti in .git/lost-found" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "visualizza l'avanzamento" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "visualizza nomi dettagliati per gli oggetti raggiungibili" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Controllo oggetti in corso" -#: builtin/fsck.c:887 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "%s: oggetto mancante" -#: builtin/fsck.c:899 +#: builtin/fsck.c:886 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "parametro non valido: atteso SHA1, presente '%s'" -#: builtin/gc.c:34 +#: builtin/gc.c:36 msgid "git gc [<options>]" msgstr "git gc [<opzioni>]" -#: builtin/gc.c:90 +#: builtin/gc.c:91 #, c-format msgid "Failed to fstat %s: %s" msgstr "fstat di %s non riuscito: %s" -#: builtin/gc.c:126 +#: builtin/gc.c:127 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "analisi dell'opzione '%s' con valore '%s' non riuscita" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "impossibile eseguire lo stat di '%s'" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "impossibile leggere '%s'" @@ -13661,7 +15396,61 @@ msgstr "" "Ci sono troppi oggetti sparsi non raggiungibili; esegui 'git prune' per " "eliminarli." -#: builtin/grep.c:29 +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<attivitร >]" + +#: builtin/gc.c:812 +msgid "failed to write commit-graph" +msgstr "scrittura del grafo dei commit non riuscita" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "il file di lock '%s' esiste, ignoro le attivitร di manutenzione" + +#: builtin/gc.c:932 +#, c-format +msgid "task '%s' failed" +msgstr "attivitร '%s' non riuscita" + +#: builtin/gc.c:979 +#, c-format +msgid "'%s' is not a valid task" +msgstr "'%s' non รจ un'attivitร valida" + +#: builtin/gc.c:984 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "l'attivitร '%s' non puรฒ essere selezionata piรน volte" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "esegui delle attivitร in base allo stato del repository" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "" +"non visualizzare l'avanzamento o altre informazioni sullo standard error" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "attivitร " + +#: builtin/gc.c:1003 +msgid "run a specific task" +msgstr "esegui un'attivitร specifica" + +#: builtin/gc.c:1026 +msgid "git maintenance run [<options>]" +msgstr "git maintenance run [<opzioni>]" + +#: builtin/gc.c:1037 +#, c-format +msgid "invalid subcommand: %s" +msgstr "sottocomando non valido: %s" + +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" "git grep [<opzioni>] [-e] <pattern> [<revisione>...] [[--] <percorso>...]" @@ -13680,263 +15469,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:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "non vi รจ supporto per i thread, ignoro %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "impossibile leggere il tree (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "impossibile eseguire grep su un oggetto di tipo %s" -#: builtin/grep.c:714 +#: builtin/grep.c:725 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch '%c' richiede un valore numerico" -#: builtin/grep.c:813 +#: builtin/grep.c:824 msgid "search in index instead of in the work tree" msgstr "cerca nell'index anzichรฉ nell'albero di lavoro" -#: builtin/grep.c:815 +#: builtin/grep.c:826 msgid "find in contents not managed by git" msgstr "la ricerca nei contenuti non รจ gestita da Git" -#: builtin/grep.c:817 +#: builtin/grep.c:828 msgid "search in both tracked and untracked files" msgstr "cerca sia nei file tracciati sia in quelli non tracciati" -#: builtin/grep.c:819 +#: builtin/grep.c:830 msgid "ignore files specified via '.gitignore'" msgstr "ignora i file specificati in '.gitignore'" -#: builtin/grep.c:821 +#: builtin/grep.c:832 msgid "recursively search in each submodule" msgstr "cerca ricorsivamente in ogni sottomodulo" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "show non-matching lines" msgstr "visualizza le righe non corrispondenti" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "case insensitive matching" msgstr "ricerca corrispondenze senza differenze maiuscole/minuscole" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "match patterns only at word boundaries" msgstr "cerca corrispondenze ai pattern solo a inizio/fine parola" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "process binary files as text" msgstr "elabora i file binari come testuali" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "don't match patterns in binary files" msgstr "non cercare corrispondenze ai pattern nei file binari" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "process binary files with textconv filters" msgstr "elabora i file binari con filtri di conversione in testo" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "search in subdirectories (default)" msgstr "cerca nelle sottodirectory (impostazione predefinita)" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "descend at most <depth> levels" msgstr "scendi al piรน di <profonditร > livelli" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "use extended POSIX regular expressions" msgstr "usa espressioni regolari POSIX estese" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "use basic POSIX regular expressions (default)" msgstr "usa espressioni regolari POSIX di base (impostazione predefinita)" -#: builtin/grep.c:849 +#: builtin/grep.c:860 msgid "interpret patterns as fixed strings" msgstr "interpreta i pattern come stringhe fisse" -#: builtin/grep.c:852 +#: builtin/grep.c:863 msgid "use Perl-compatible regular expressions" msgstr "usa espressioni regolari compatibili con Perl" -#: builtin/grep.c:855 +#: builtin/grep.c:866 msgid "show line numbers" msgstr "visualizza numeri di riga" -#: builtin/grep.c:856 +#: builtin/grep.c:867 msgid "show column number of first match" msgstr "visualizza il numero di colonna della prima corrispondenza" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "don't show filenames" msgstr "non visualizzare i nomi file" -#: builtin/grep.c:858 +#: builtin/grep.c:869 msgid "show filenames" msgstr "visualizza i nomi file" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "show filenames relative to top directory" msgstr "visualizza i nomi file relativi alla directory di primo livello" -#: builtin/grep.c:862 +#: builtin/grep.c:873 msgid "show only filenames instead of matching lines" msgstr "visualizza solo i nomi file anzichรฉ le righe corrispondenti" -#: builtin/grep.c:864 +#: builtin/grep.c:875 msgid "synonym for --files-with-matches" msgstr "sinonimo di --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show only the names of files without match" msgstr "visualizza solo i nomi dei file non corrispondenti" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "print NUL after filenames" msgstr "stampa NUL dopo i nomi file" -#: builtin/grep.c:872 +#: builtin/grep.c:883 msgid "show only matching parts of a line" msgstr "visualizza solo le parti corrispondenti di una riga" -#: builtin/grep.c:874 +#: builtin/grep.c:885 msgid "show the number of matches instead of matching lines" msgstr "visualizza il numero di corrispondenze anzichรฉ le righe corrispondenti" -#: builtin/grep.c:875 +#: builtin/grep.c:886 msgid "highlight matches" msgstr "evidenzia corrispondenze" -#: builtin/grep.c:877 +#: builtin/grep.c:888 msgid "print empty line between matches from different files" msgstr "stampa una riga vuota fra le corrispondenze in file differenti" -#: builtin/grep.c:879 +#: builtin/grep.c:890 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:882 +#: builtin/grep.c:893 msgid "show <n> context lines before and after matches" msgstr "visualizza <n> righe di contesto prima e dopo le corrispondenze" -#: builtin/grep.c:885 +#: builtin/grep.c:896 msgid "show <n> context lines before matches" msgstr "visualizza <n> righe di contesto prima delle corrispondenze" -#: builtin/grep.c:887 +#: builtin/grep.c:898 msgid "show <n> context lines after matches" msgstr "visualizza <n> righe di contesto dopo le corrispondenze" -#: builtin/grep.c:889 +#: builtin/grep.c:900 msgid "use <n> worker threads" msgstr "usa <n> thread di lavoro" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "shortcut for -C NUM" msgstr "scorciatoia per -C NUM" -#: builtin/grep.c:893 +#: builtin/grep.c:904 msgid "show a line with the function name before matches" msgstr "visualizza una riga con il nome funzione prima delle corrispondenze" -#: builtin/grep.c:895 +#: builtin/grep.c:906 msgid "show the surrounding function" msgstr "visualizza la funzione circostante" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "read patterns from file" msgstr "leggi le corrispondenze da un file" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "match <pattern>" msgstr "cerca corrispondenze con <pattern>" -#: builtin/grep.c:902 +#: builtin/grep.c:913 msgid "combine patterns specified with -e" msgstr "combina i pattern specificati con -e" -#: builtin/grep.c:914 +#: builtin/grep.c:925 msgid "indicate hit with exit status without output" msgstr "" "segnala una corrispondenza con il codice di uscita senza emettere output" -#: builtin/grep.c:916 +#: builtin/grep.c:927 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:918 +#: builtin/grep.c:929 msgid "show parse tree for grep expression" msgstr "visualizza l'albero di analisi per l'espressione grep" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "pager" msgstr "pager" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "show matching files in the pager" msgstr "visualizza i file corrispondenti nel pager" -#: builtin/grep.c:926 +#: builtin/grep.c:937 msgid "allow calling of grep(1) (ignored by this build)" msgstr "consenti" -#: builtin/grep.c:990 +#: builtin/grep.c:1004 msgid "no pattern given" msgstr "nessun pattern specificato" -#: builtin/grep.c:1026 +#: builtin/grep.c:1040 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:1034 +#: builtin/grep.c:1048 #, c-format msgid "unable to resolve revision: %s" msgstr "impossibile risolvere la revisione %s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1078 +msgid "--untracked not supported with --recurse-submodules" +msgstr "l'opzione --untracked non รจ supportata con --recurse-submodules" + +#: builtin/grep.c:1082 msgid "invalid option combination, ignoring --threads" msgstr "combinazione di opzioni non valida, ignoro --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "non vi รจ supporto per i thread, ignoro --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "specificato numero non valido di thread (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1122 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager funziona solo sull'albero di lavoro" -#: builtin/grep.c:1117 -msgid "option not supported with --recurse-submodules" -msgstr "opzione non supportata con --recurse-submodules" - -#: builtin/grep.c:1123 +#: builtin/grep.c:1148 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked non possono essere usate con --no-index" -#: builtin/grep.c:1129 +#: builtin/grep.c:1154 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:1137 +#: builtin/grep.c:1162 msgid "both --cached and trees are given" msgstr "sono specificati sia --cached sia degli alberi" @@ -13979,66 +15768,66 @@ msgstr "" msgid "process file as it were from this path" msgstr "elabora i file come se fossero in questo percorso" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "stampa tutti i comandi disponibili" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "escludi le guide" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "stampa un elenco di guide utili" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "stampa i nomi di tutte le variabili di configurazione" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "visualizza la pagina man" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "visualizza il manuale nel browser Web" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "visualizza la pagina info" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "stampa la descrizione del comando" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "formato di aiuto '%s' non riconosciuto" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "Esecuzione di emacsclient non riuscita." -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "Verifica della versione di emacsclient non riuscita." -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la versione '%d' di emacsclient รจ troppo vecchia (<22)." -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "esecuzione di '%s' non riuscita" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -14047,7 +15836,7 @@ msgstr "" "'%s': path ad un visualizzatore man pages non supportato.\n" "Usa invece 'man.<tool>.cmd'." -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -14056,396 +15845,424 @@ msgstr "" "'%s': comando per visualizzatore man pages supportato.\n" "Per favore usa 'man.<tool>.path' invece." -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': visualizzatore man sconosciuto." -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "nessun visualizzatore man ha gestito la richiesta" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "nessun visualizzatore info ha gestito la richiesta" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' รจ un alias di '%s'" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "stringa alias.%s non valida: %s" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "uso: %s%s" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "Vedi 'git help config' per maggiori informazioni" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "tipo oggetto non corrispondente in %s" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "non si รจ ricevuto l'oggetto atteso %s" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "oggetto %s: atteso tipo %s, trovato %s" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "impossibile riempire %d byte" msgstr[1] "impossibile riempire %d byte" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "EOF prematuro" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "errore di lettura in input" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "usati piรน byte di quelli disponibili" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 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:94 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "il pack supera la dimensione massima consentita" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:342 builtin/repack.c:254 +#, c-format +msgid "unable to create '%s'" +msgstr "impossibile creare '%s'" + +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "impossibile aprire il file pack '%s'" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "la firma del pack non coincide" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "versione pack %<PRIu32> non supportata" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "il pack ha un oggetto danneggiato all'offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "inflate ha restituito il codice %d" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "overflow del valore dell'offset base del delta" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "l'offset base del delta รจ fuori dall'intervallo consentito" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "tipo oggetto %d sconosciuto" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "impossibile eseguire pread sul file pack" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "fine del file pack prematura, %<PRIuMAX> byte mancante" msgstr[1] "fine del file pack prematura, %<PRIuMAX> byte mancanti" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "inconsistenza grave di inflate" -#: 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 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "TROVATA COLLISIONE SHA1 CON %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:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "impossibile leggere %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "impossibile leggere le informazioni sull'oggetto esistente: %s" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "non รจ possibile leggere l'oggetto %s esistente" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "oggetto blob %s non valido" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "errore fsck nell'oggetto sottoposto a pack" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:870 #, 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:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "applicazione del delta non riuscita" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "Ricezione degli oggetti" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "Indicizzazione degli oggetti" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "il pack รจ corrotto (SHA1 non corrisponde)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "impossibile eseguire fstat sul file pack" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "il pack ha dati inutili alla fine" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusione oltre ogni follia in parse_pack_objects()" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "Risoluzione dei delta" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "impossibile creare il thread: %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "confusione oltre ogni follia" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1288 #, 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:1264 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Checksum in coda inatteso per %s (disco corrotto?)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1304 #, 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:1292 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossibile eseguire deflate sull'oggetto aggiunto alla fine (%d)" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "l'oggetto locale %s รจ corrotto" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1444 #, 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:1427 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "impossibile scrivere il file %s '%s'" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "impossibile chiudere il file %s scritto '%s'" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "errore nella chiusura del file pack" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "impossibile archiviare il file pack" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "impossibile archiviare index file" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> non valida" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossibile aprire il file pack '%s' esistente" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1633 #, 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:1643 +#: builtin/index-pack.c:1681 #, 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:1650 +#: builtin/index-pack.c:1688 #, 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:1689 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "impossibile tornare alla directory di lavoro corrente" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "%s errato" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "algoritmo hash '%s' sconosciuto" + +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin non puรฒ essere usato senza --stdin" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "--stdin richiede un repository Git" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1825 +msgid "--object-format cannot be used with --stdin" +msgstr "--object-format non puรฒ essere usato con --stdin" + +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "--verify senza un nome del file pack specificato" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "errore fsck negli oggetti sottoposti a pack" -#: builtin/init-db.c:61 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "impossibile eseguire stat sul modello '%s'" -#: builtin/init-db.c:66 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "impossibile aprire la directory '%s'" -#: builtin/init-db.c:78 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "impossibile leggere il link '%s'" -#: builtin/init-db.c:80 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "impossibile creare il collegamento simbolico da '%s' a '%s'" -#: builtin/init-db.c:86 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "impossibile copiare '%s' in '%s'" -#: builtin/init-db.c:90 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "ignoro il modello %s" -#: builtin/init-db.c:121 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "modelli non trovati in %s" -#: builtin/init-db.c:136 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "non copio i modelli da '%s': %s" -#: builtin/init-db.c:334 +#: builtin/init-db.c:274 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "nome branch iniziale non valido: '%s'" + +#: builtin/init-db.c:366 #, c-format msgid "unable to handle file type %d" msgstr "impossibile gestire il tipo di file %d" -#: builtin/init-db.c:337 +#: builtin/init-db.c:369 #, c-format msgid "unable to move %s to %s" msgstr "impossibile spostare %s in %s" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "tentativo di reinizializzare il repository con un hash differente" + +#: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format msgid "%s already exists" msgstr "%s esiste giร " -#: builtin/init-db.c:413 +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: opzione --initial-branch=%s ignorata" + +#: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Reinizializzato repository Git condiviso esistente in %s%s\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Reinizializzato repository Git esistente in %s%s\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Inizializzato repository Git condiviso vuoto in %s%s\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Inizializzato repository Git vuoto in %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:529 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -14453,25 +16270,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<directory-modello>] [--" "shared[=<permessi>]] [<directory>]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:555 msgid "permissions" msgstr "permessi" -#: builtin/init-db.c:492 +#: builtin/init-db.c:556 msgid "specify that the git repository is to be shared amongst several users" msgstr "specifica che il repository Git deve essere condiviso con piรน utenti" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:562 +msgid "override the name of the initial branch" +msgstr "esegui l'override del nome del branch iniziale" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +msgid "hash" +msgstr "hash" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "specifica l'algoritmo hash da usare" + +#: builtin/init-db.c:571 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "le opzioni --separate-git-dir e --bare sono mutualmente esclusive" + +#: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format msgid "cannot mkdir %s" msgstr "impossibile creare la directory %s" -#: builtin/init-db.c:538 +#: builtin/init-db.c:609 builtin/init-db.c:664 #, c-format msgid "cannot chdir to %s" msgstr "impossibile modificare la directory corrente in %s" -#: builtin/init-db.c:559 +#: builtin/init-db.c:636 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -14480,11 +16313,15 @@ msgstr "" "%s (o --work-tree=<directory>) non consentito senza specificare %s (o --git-" "dir=<directory>)" -#: builtin/init-db.c:587 +#: builtin/init-db.c:688 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossibile accedere all'albero di lavoro '%s'" +#: builtin/init-db.c:693 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separate-git-dir non รจ compatibile con un repository bare" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -14549,121 +16386,126 @@ 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:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opzioni>] [<intervallo-revisioni>] [[--] <percorso>...]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<opzioni>] <oggetto>..." -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "opzione --decorate non valida: %s" -#: builtin/log.c:173 +#: builtin/log.c:177 msgid "show source" msgstr "visualizza sorgente" -#: builtin/log.c:174 +#: builtin/log.c:178 msgid "Use mail map file" msgstr "Usa il file mappatura e-mail" -#: builtin/log.c:176 +#: builtin/log.c:181 msgid "only decorate refs that match <pattern>" msgstr "decora solo i riferimenti corrispondenti a <pattern>" -#: builtin/log.c:178 +#: builtin/log.c:183 msgid "do not decorate refs that match <pattern>" msgstr "non decorare i riferimenti corrispondenti a <pattern>" -#: builtin/log.c:179 +#: builtin/log.c:184 msgid "decorate options" msgstr "opzioni decorazione" -#: builtin/log.c:182 +#: builtin/log.c:187 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:280 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "Output finale: %d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:555 #, c-format msgid "git show %s: bad file" msgstr "git show %s: file non valido" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:570 builtin/log.c:665 #, c-format msgid "could not read object %s" msgstr "impossibile leggere l'oggetto %s" -#: builtin/log.c:668 +#: builtin/log.c:690 #, c-format msgid "unknown type: %d" msgstr "tipo sconosciuto: %d" -#: builtin/log.c:791 +#: builtin/log.c:839 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%s: modo lettera da descrizione non valido" + +#: builtin/log.c:846 msgid "format.headers without value" msgstr "format.headers non ha alcun valore" -#: builtin/log.c:908 +#: builtin/log.c:965 msgid "name of output directory is too long" msgstr "il nome della directory di output รจ troppo lungo" -#: builtin/log.c:924 +#: builtin/log.c:981 #, c-format msgid "cannot open patch file %s" msgstr "impossibile aprire il file patch %s" -#: builtin/log.c:941 +#: builtin/log.c:998 msgid "need exactly one range" msgstr "รจ necessario specificare esattamente un intervallo" -#: builtin/log.c:951 +#: builtin/log.c:1008 msgid "not a range" msgstr "il valore non รจ un intervallo" -#: builtin/log.c:1074 +#: builtin/log.c:1172 msgid "cover letter needs email format" msgstr "la lettera di accompagnamento dev'essere in formato e-mail" -#: builtin/log.c:1080 +#: builtin/log.c:1178 msgid "failed to create cover-letter file" msgstr "creazione del file lettera di accompagnamento non riuscita" -#: builtin/log.c:1159 +#: builtin/log.c:1259 #, c-format msgid "insane in-reply-to: %s" msgstr "valore in-reply-to folle: %s" -#: builtin/log.c:1186 +#: builtin/log.c:1286 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opzioni>] [<da> | <intervallo revisioni>]" -#: builtin/log.c:1244 +#: builtin/log.c:1344 msgid "two output directories?" msgstr "due directory di output?" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 #, c-format msgid "unknown commit %s" msgstr "commit %s sconosciuto" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1506 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:1370 +#: builtin/log.c:1515 msgid "could not find exact merge base" msgstr "impossibile trovare esattamente la base del merge" -#: builtin/log.c:1374 +#: builtin/log.c:1525 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" @@ -14675,278 +16517,293 @@ msgstr "" "In alternativa puoi specificare manualmente il commit di base con\n" "--base=<ID commit di base>" -#: builtin/log.c:1394 +#: builtin/log.c:1548 msgid "failed to find exact merge base" msgstr "impossibile trovare esattamente la base del merge" -#: builtin/log.c:1405 +#: builtin/log.c:1565 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:1409 +#: builtin/log.c:1575 msgid "base commit shouldn't be in revision list" msgstr "il commit di base non dovrebbe essere nell'elenco revisioni" -#: builtin/log.c:1462 +#: builtin/log.c:1633 msgid "cannot get patch id" msgstr "impossibile ottenere l'ID della patch" -#: builtin/log.c:1514 -msgid "failed to infer range-diff ranges" -msgstr "inferenza degli intervalli range-diff non riuscita" +#: builtin/log.c:1690 +msgid "failed to infer range-diff origin of current series" +msgstr "inferenza dell'origine range-diff della serie corrente non riuscita" + +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "uso '%s' come origine range-diff della serie corrente" -#: builtin/log.c:1559 +#: builtin/log.c:1736 msgid "use [PATCH n/m] even with a single patch" msgstr "usa [PATCH n/m] anche con una singola patch" -#: builtin/log.c:1562 +#: builtin/log.c:1739 msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] anche con piรน patch" -#: builtin/log.c:1566 +#: builtin/log.c:1743 msgid "print patches to standard out" msgstr "stampa le patch sullo standard output" -#: builtin/log.c:1568 +#: builtin/log.c:1745 msgid "generate a cover letter" msgstr "genera una lettera di accompagnamento" -#: builtin/log.c:1570 +#: builtin/log.c:1747 msgid "use simple number sequence for output file names" msgstr "usa una sequenza numerica semplice per i nomi file di output" -#: builtin/log.c:1571 +#: builtin/log.c:1748 msgid "sfx" msgstr "suff" -#: builtin/log.c:1572 +#: builtin/log.c:1749 msgid "use <sfx> instead of '.patch'" msgstr "usa <suff> anzichรฉ '.patch'" -#: builtin/log.c:1574 +#: builtin/log.c:1751 msgid "start numbering patches at <n> instead of 1" msgstr "inizia a numerare le patch da <n> anzichรฉ da 1" -#: builtin/log.c:1576 +#: builtin/log.c:1753 msgid "mark the series as Nth re-roll" msgstr "contrassegna la serie come l'n-esima versione revisionata" -#: builtin/log.c:1578 +#: builtin/log.c:1755 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usa [RFC PATCH] anzichรฉ [PATCH]" -#: builtin/log.c:1581 +#: builtin/log.c:1758 +msgid "cover-from-description-mode" +msgstr "modo-lettera-da-descrizione" + +#: builtin/log.c:1759 +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:1761 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Usa [<prefisso>] anzichรฉ [PATCH]" -#: builtin/log.c:1584 +#: builtin/log.c:1764 msgid "store resulting files in <dir>" msgstr "salva i file risultanti in <dir>" -#: builtin/log.c:1587 +#: builtin/log.c:1767 msgid "don't strip/add [PATCH]" msgstr "non eliminare/aggiungere [PATCH]" -#: builtin/log.c:1590 +#: builtin/log.c:1770 msgid "don't output binary diffs" msgstr "non mandare in output diff binari" -#: builtin/log.c:1592 +#: builtin/log.c:1772 msgid "output all-zero hash in From header" msgstr "manda in output un hash costituito da soli zeri nell'intestazione From" -#: builtin/log.c:1594 +#: builtin/log.c:1774 msgid "don't include a patch matching a commit upstream" msgstr "non includere una patch corrispondente a un commit upstream" -#: builtin/log.c:1596 +#: builtin/log.c:1776 msgid "show patch format instead of default (patch + stat)" msgstr "" "visualizza il formato della patch anzichรฉ l'impostazione predefinita (patch " "+ stat)" -#: builtin/log.c:1598 +#: builtin/log.c:1778 msgid "Messaging" msgstr "Messaggistica" -#: builtin/log.c:1599 +#: builtin/log.c:1779 msgid "header" msgstr "intestazione" -#: builtin/log.c:1600 +#: builtin/log.c:1780 msgid "add email header" msgstr "aggiungi intestazione e-mail" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1781 builtin/log.c:1782 msgid "email" msgstr "e-mail" -#: builtin/log.c:1601 +#: builtin/log.c:1781 msgid "add To: header" msgstr "aggiungi intestazione A:" -#: builtin/log.c:1603 +#: builtin/log.c:1782 msgid "add Cc: header" msgstr "aggiungi intestazione Cc:" -#: builtin/log.c:1605 +#: builtin/log.c:1783 msgid "ident" msgstr "identitร " -#: builtin/log.c:1606 +#: builtin/log.c:1784 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:1608 +#: builtin/log.c:1786 msgid "message-id" msgstr "ID messaggio" -#: builtin/log.c:1609 +#: builtin/log.c:1787 msgid "make first mail a reply to <message-id>" msgstr "rendi la prima e-mail una risposta a <ID messaggio>" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1788 builtin/log.c:1791 msgid "boundary" msgstr "delimitatore" -#: builtin/log.c:1611 +#: builtin/log.c:1789 msgid "attach the patch" msgstr "allega la patch" -#: builtin/log.c:1614 +#: builtin/log.c:1792 msgid "inline the patch" msgstr "includi la patch nel messaggio" -#: builtin/log.c:1618 +#: builtin/log.c:1796 msgid "enable message threading, styles: shallow, deep" msgstr "" "abilita il raggruppamento messaggi per conversazione, stili: superficiale, " "profondo" -#: builtin/log.c:1620 +#: builtin/log.c:1798 msgid "signature" msgstr "firma" -#: builtin/log.c:1621 +#: builtin/log.c:1799 msgid "add a signature" msgstr "aggiungi una firma" -#: builtin/log.c:1622 +#: builtin/log.c:1800 msgid "base-commit" msgstr "commit di base" -#: builtin/log.c:1623 +#: builtin/log.c:1801 msgid "add prerequisite tree info to the patch series" msgstr "" "aggiungi le informazioni prerequisito per l'albero alla serie delle patch" -#: builtin/log.c:1625 +#: builtin/log.c:1804 msgid "add a signature from a file" msgstr "aggiungi una firma da file" -#: builtin/log.c:1626 +#: builtin/log.c:1805 msgid "don't print the patch filenames" msgstr "non stampare i nomi file delle patch" -#: builtin/log.c:1628 +#: builtin/log.c:1807 msgid "show progress while generating patches" msgstr "visualizza l'avanzamento dell'operazione di generazione patch" -#: builtin/log.c:1630 +#: builtin/log.c:1809 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:1633 +#: builtin/log.c:1812 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:1635 +#: builtin/log.c:1814 msgid "percentage by which creation is weighted" msgstr "percentuale in base a cui viene pesata la creazione" -#: builtin/log.c:1710 +#: builtin/log.c:1896 #, c-format msgid "invalid ident line: %s" msgstr "riga ident non valida: %s" -#: builtin/log.c:1725 +#: builtin/log.c:1911 msgid "-n and -k are mutually exclusive" msgstr "le opzioni -n e -k sono mutuamente esclusive" -#: builtin/log.c:1727 +#: builtin/log.c:1913 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "le opzioni --subject-prefix/--rfc e -k sono mutuamente esclusive" -#: builtin/log.c:1735 +#: builtin/log.c:1921 msgid "--name-only does not make sense" msgstr "--name-only non ha senso" -#: builtin/log.c:1737 +#: builtin/log.c:1923 msgid "--name-status does not make sense" msgstr "--name-status non ha senso" -#: builtin/log.c:1739 +#: builtin/log.c:1925 msgid "--check does not make sense" msgstr "--check non ha senso" -#: builtin/log.c:1771 +#: builtin/log.c:1958 msgid "standard output, or directory, which one?" msgstr "standard output, o directory, quale dei due?" -#: builtin/log.c:1860 +#: builtin/log.c:2062 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff richiede --cover-letter o una singola patch" -#: builtin/log.c:1864 +#: builtin/log.c:2066 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1865 +#: builtin/log.c:2067 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff rispetto alla versione %d:" -#: builtin/log.c:1871 +#: builtin/log.c:2073 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor richiede --range-diff" -#: builtin/log.c:1875 +#: builtin/log.c:2077 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff richiede --cover-letter o una singola patch" -#: builtin/log.c:1883 +#: builtin/log.c:2085 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:1884 +#: builtin/log.c:2086 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff rispetto alla versione %d:" -#: builtin/log.c:1895 +#: builtin/log.c:2097 #, c-format msgid "unable to read signature file '%s'" msgstr "impossibile leggere il file firma '%s'" -#: builtin/log.c:1931 +#: builtin/log.c:2133 msgid "Generating patches" msgstr "Generazione delle patch in corso" -#: builtin/log.c:1975 +#: builtin/log.c:2177 msgid "failed to create output files" msgstr "creazione dei file di output non riuscita" -#: builtin/log.c:2034 +#: builtin/log.c:2236 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]" -#: builtin/log.c:2088 +#: builtin/log.c:2290 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14954,113 +16811,113 @@ msgstr "" "Impossibile trovare un branch remoto tracciato, specifica <upstream> " "manualmente.\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opzioni>] [<file>...]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "identifica lo stato del file con i tag" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usa lettere minuscole per i file che si 'assumono non modificati'" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "usa lettere minuscole per i file 'fsmonitor clean'" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "visualizza file in cache nell'output (impostazione predefinita)" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "visualizza file eliminati nell'output" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "visualizza file modificati nell'output" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "visualizza altri file nell'output" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "visualizza file ignorati nell'output" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "" "visualizza il nome dell'oggetto \"contenuti nell'area di staging\" " "nell'output" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "visualizza i file nel filesystem che devono essere rimossi" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "visualizza solo i nomi delle directory 'altro'" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "visualizza i fine riga dei file" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "non visualizzare le directory vuote" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "visualizza file non sottoposti a merge nell'output" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "visualizza informazioni resolve-undo" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "salta i file corrispondenti a \"espressione regolare\"" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "le espressioni regolari di esclusione sono lette da <file>" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "leggi espressioni regolari di esclusione aggiuntive specifiche per directory " "da <file>" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "aggiungi le esclusioni standard di Git" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "rendi l'output relativo alla directory radice del progetto" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "esegui ricorsivamente sui sottomoduli" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "se dei <file> non sono nell'indice, consideralo un errore" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "espressione albero" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "fingi che i percorsi rimossi da <espressione albero> in poi siano ancora " "presenti" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "visualizza informazioni di debug" @@ -15078,7 +16935,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:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 msgid "exec" msgstr "eseguibile" @@ -15154,192 +17011,305 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "mbox vuota: '%s'" -#: builtin/merge.c:55 +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <commit> <commit>..." + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <commit>..." + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <commit>..." + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <commit> <commit>" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <riferimento> [<commit>]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "manda in output tutti gli antenati comuni" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "trova gli antenati per un singolo merge a n vie" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "elenca le revisioni non raggiungibili dalle altre" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "il primo argomento รจ antenato dell'altro?" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "" +"trova il punto di fork di <commit> dal registro dei riferimenti di " +"<riferimento>" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" +"git merge-file [<opzioni>] [-L <nome1> [-L <originale> [-L <nome2>]]] " +"<file1> <file originale> <file2>" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "invia i risultati allo standard output" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "usa un merge basato su diff3" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "per i conflitti, usa la nostra versione" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "per i conflitti, usa la loro versione" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "per i conflitti, usa una versione unita" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "per i conflitti, usa questa dimensione dei contrassegni" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "non emettere avvisi in caso di conflitti" + +#: builtin/merge-file.c:47 +msgid "set labels for file1/orig-file/file2" +msgstr "imposta etichette per file1/file originale/file2" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "opzione sconosciuta %s" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "impossibile analizzare l'oggetto '%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] "impossibile gestire piรน di %d base. Ignoro %s." +msgstr[1] "impossibile gestire piรน di %d basi. Ignoro %s." + +#: builtin/merge-recursive.c:65 +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 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "impossibile risolvere il riferimento '%s'" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Merge di %s con %s in corso\n" + +#: builtin/merge.c:56 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opzioni>] [<commit>...]" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:120 msgid "switch `m' requires a value" msgstr "lo switch 'm' richiede un valore" -#: builtin/merge.c:141 +#: builtin/merge.c:143 #, c-format msgid "option `%s' requires a value" msgstr "l'opzione `%s' richiede un valore" -#: builtin/merge.c:187 +#: builtin/merge.c:189 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Non รจ stato possibile trovare la strategia di merge '%s'.\n" -#: builtin/merge.c:188 +#: builtin/merge.c:190 #, c-format msgid "Available strategies are:" msgstr "Le strategie disponibili sono:" -#: builtin/merge.c:193 +#: builtin/merge.c:195 #, c-format msgid "Available custom strategies are:" msgstr "Le strategie personalizzate disponibili sono:" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:246 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "non visualizzare un diffstat al termine del merge" -#: builtin/merge.c:247 builtin/pull.c:154 +#: builtin/merge.c:249 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "visualizza un diffstat al termine del merge" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:250 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(sinonimo di --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:252 builtin/pull.c:142 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:253 builtin/pull.c:166 +#: builtin/merge.c:255 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "crea un singolo commit anzichรฉ eseguire un merge" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:257 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "esegui un commit se il merge ha successo (impostazione predefinita)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:259 builtin/pull.c:154 msgid "edit message before committing" msgstr "modifica il messaggio prima di eseguire il commit" -#: builtin/merge.c:259 +#: builtin/merge.c:261 msgid "allow fast-forward (default)" msgstr "consenti fast forward (impostazione predefinita)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:263 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "interrompi se il fast forward non รจ possibile" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:267 builtin/pull.c:164 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:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 msgid "strategy" msgstr "strategia" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:269 builtin/pull.c:169 msgid "merge strategy to use" msgstr "strategia di merge da usare" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option=value" msgstr "opzione=valore" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "opzione per la strategia di merge selezionata" -#: builtin/merge.c:271 +#: builtin/merge.c:273 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:278 +#: builtin/merge.c:280 msgid "abort the current in-progress merge" msgstr "interrompi il merge attualmente in corso" -#: builtin/merge.c:280 +#: builtin/merge.c:282 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:282 +#: builtin/merge.c:284 msgid "continue the current in-progress merge" msgstr "continua il merge attualmente in corso" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:286 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "consenti di unire cronologie non correlate" -#: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "verifica hook commit-msg" +#: builtin/merge.c:293 +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "ignora gli hook pre-merge-commit e commit-msg" -#: builtin/merge.c:307 +#: builtin/merge.c:310 msgid "could not run stash." msgstr "non รจ stato possibile eseguire stash." -#: builtin/merge.c:312 +#: builtin/merge.c:315 msgid "stash failed" msgstr "esecuzione di stash non riuscita" -#: builtin/merge.c:317 +#: builtin/merge.c:320 #, c-format msgid "not a valid object: %s" msgstr "non รจ un oggetto valido: %s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:342 builtin/merge.c:359 msgid "read-tree failed" msgstr "read-tree non riuscito" -#: builtin/merge.c:386 +#: builtin/merge.c:389 msgid " (nothing to squash)" msgstr " (nulla di cui eseguire lo squash)" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit di squash -- non aggiorno HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:450 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Nessun messaggio di merge -- HEAD non viene aggiornato\n" -#: builtin/merge.c:498 +#: builtin/merge.c:501 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' non punta ad un commit" -#: builtin/merge.c:585 +#: builtin/merge.c:588 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Stringa branch.%s.mergeoptions errata: %s" -#: builtin/merge.c:708 +#: builtin/merge.c:713 msgid "Not handling anything other than two heads merge." msgstr "Non gestisco nulla che non sia il merge di due head." -#: builtin/merge.c:722 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opzione sconosciuta per merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "impossibile scrivere %s" -#: builtin/merge.c:789 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "Non รจ stato possibile leggere da '%s'" -#: builtin/merge.c:798 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Non eseguo il commit del merge; usa 'git commit' per completare il merge.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:808 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" @@ -15350,11 +17320,11 @@ msgstr "" "aggiornato in un topic branch.\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:813 msgid "An empty message aborts the commit.\n" msgstr "Un messaggio vuoto interromperร il commit.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:816 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15363,74 +17333,74 @@ msgstr "" "Le righe che iniziano con '%c' saranno ignorate e un messaggio vuoto\n" "interromperร il commit.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:869 msgid "Empty commit message." msgstr "Messaggio di commit vuoto." -#: builtin/merge.c:872 +#: builtin/merge.c:884 #, c-format msgid "Wonderful.\n" msgstr "Splendido.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:945 #, 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:972 +#: builtin/merge.c:984 msgid "No current branch." msgstr "Nessun branch corrente." -#: builtin/merge.c:974 +#: builtin/merge.c:986 msgid "No remote for the current branch." msgstr "Nessun remote per il branch corrente." -#: builtin/merge.c:976 +#: builtin/merge.c:988 msgid "No default upstream defined for the current branch." msgstr "Nessun upstream di default definito per il branch corrente." -#: builtin/merge.c:981 +#: builtin/merge.c:993 #, 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:1038 +#: builtin/merge.c:1050 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valore errato '%s' nell'ambiente '%s'" -#: builtin/merge.c:1141 +#: builtin/merge.c:1153 #, 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:1175 +#: builtin/merge.c:1187 msgid "not something we can merge" msgstr "non รจ qualcosa di cui possiamo eseguire il merge" -#: builtin/merge.c:1278 +#: builtin/merge.c:1291 msgid "--abort expects no arguments" msgstr "--abort non richiede argomenti" -#: builtin/merge.c:1282 +#: builtin/merge.c:1295 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Non c'รจ nessun merge da interrompere (MERGE_HEAD mancante)." -#: builtin/merge.c:1291 +#: builtin/merge.c:1313 msgid "--quit expects no arguments" msgstr "--quit non richiede argomenti" -#: builtin/merge.c:1304 +#: builtin/merge.c:1326 msgid "--continue expects no arguments" msgstr "--continue non richiede argomenti" -#: builtin/merge.c:1308 +#: builtin/merge.c:1330 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Non c'รจ nessun merge in corso (MERGE_HEAD mancante)." -#: builtin/merge.c:1324 +#: builtin/merge.c:1346 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15438,7 +17408,7 @@ msgstr "" "Non hai concluso il merge (MERGE_HEAD esiste).\n" "Esegui il commit delle modifiche prima di eseguire il merge." -#: builtin/merge.c:1331 +#: builtin/merge.c:1353 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15446,215 +17416,102 @@ 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:1334 +#: builtin/merge.c:1356 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:1348 +#: builtin/merge.c:1370 msgid "You cannot combine --squash with --no-ff." msgstr "Non รจ possibile combinare --squash con --no-ff." -#: builtin/merge.c:1350 +#: builtin/merge.c:1372 msgid "You cannot combine --squash with --commit." msgstr "Non รจ possibile combinare --squash con --commit." -#: builtin/merge.c:1366 +#: builtin/merge.c:1388 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Nessun commit specificato e merge.defaultToUpstream non impostato." -#: builtin/merge.c:1383 +#: builtin/merge.c:1405 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:1385 +#: builtin/merge.c:1407 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:1390 +#: builtin/merge.c:1412 #, c-format msgid "%s - not something we can merge" msgstr "%s - non รจ qualcosa per cui possiamo eseguire il merge" -#: builtin/merge.c:1392 +#: builtin/merge.c:1414 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:1471 +#: builtin/merge.c:1495 msgid "refusing to merge unrelated histories" msgstr "mi rifiuto di eseguire il merge di cronologie non correlate" -#: builtin/merge.c:1480 +#: builtin/merge.c:1504 msgid "Already up to date." msgstr "Giร aggiornato." -#: builtin/merge.c:1490 +#: builtin/merge.c:1514 #, c-format msgid "Updating %s..%s\n" msgstr "Aggiornamento di %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1560 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Provo con un merge veramente banale dentro l'indice...\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1567 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1592 msgid "Already up to date. Yeeah!" msgstr "Giร aggiornato. Oh sรฌ!" -#: builtin/merge.c:1570 +#: builtin/merge.c:1598 msgid "Not possible to fast-forward, aborting." msgstr "Fast forward non possibile, interrompo l'operazione." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1626 builtin/merge.c:1691 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Ripristino l'albero in uno stato pulito...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1630 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Tentativo con la strategia di merge %s...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1682 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Nessuna strategia di merge ha gestito il merge.\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1684 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge con la strategia %s fallito.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1693 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Uso %s per preparare una risoluzione manuale.\n" -#: builtin/merge.c:1672 +#: builtin/merge.c:1707 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Il merge automatico รจ andato a buon fine; fermato prima del commit come " "richiesto\n" -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <commit> <commit>..." - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <commit>..." - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <commit>..." - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <commit> <commit>" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <riferimento> [<commit>]" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "manda in output tutti gli antenati comuni" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "trova gli antenati per un singolo merge a n vie" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "elenca le revisioni non raggiungibili dalle altre" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "il primo argomento รจ antenato dell'altro?" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "" -"trova il punto di fork di <commit> dal registro dei riferimenti di " -"<riferimento>" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" -"git merge-file [<opzioni>] [-L <nome1> [-L <originale> [-L <nome2>]]] " -"<file1> <file originale> <file2>" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "invia i risultati allo standard output" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "usa un merge basato su diff3" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "per i conflitti, usa la nostra versione" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "per i conflitti, usa la loro versione" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "per i conflitti, usa una versione unita" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "per i conflitti, usa questa dimensione dei contrassegni" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "non emettere avvisi in caso di conflitti" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "imposta etichette per file1/file originale/file2" - -#: builtin/merge-recursive.c:46 -#, c-format -msgid "unknown option %s" -msgstr "opzione sconosciuta %s" - -#: builtin/merge-recursive.c:52 -#, c-format -msgid "could not parse object '%s'" -msgstr "impossibile analizzare l'oggetto '%s'" - -#: 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: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:70 builtin/merge-recursive.c:72 -#, c-format -msgid "could not resolve ref '%s'" -msgstr "impossibile risolvere il riferimento '%s'" - -#: builtin/merge-recursive.c:78 -#, c-format -msgid "Merging %s with %s\n" -msgstr "Merge di %s con %s in corso\n" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -15673,18 +17530,18 @@ msgstr "consenti la creazione di piรน di un albero" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -"git multi-pack-index [--object-dir=<directory>] (write|verify|expire|repack " -"--batch-size=<dimensione>)" +"git multi-pack-index [<opzioni>] (write|verify|expire|repack --batch-" +"size=<dimensione>)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 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:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -15692,15 +17549,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:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "troppi argomenti" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 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:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "sottocomando sconosciuto: %s" @@ -15733,113 +17590,117 @@ msgstr "forza spostamento/ridenominazione anche se la destinazione esiste" msgid "skip move/rename errors" msgstr "salta errori spostamento/ridenominazione" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "la destinazione '%s' non รจ una directory" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Controllo la ridenominazione di '%s' in '%s'\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "sourgente errata" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "non รจ possibile spostare la directory in sรฉ stessa" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "non รจ possibile spostare la directory su un file" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "la directory sorgente รจ vuota" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "non รจ sotto controllo di versione" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "conflitto" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "la destinazione esiste" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "sovrascrittura di %s in corso" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "Impossibile sovrascrivere" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "fonti multiple per la stessa destinazione" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "la directory di destinazione non esiste" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, sorgente=%s, destinazione=%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "Rinominazione di %s in %s in corso\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "rinomina di '%s' non riuscita" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opzioni>] <commit>..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opzioni>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opzioni>] --stdin" -#: 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:524 +msgid "print only ref-based names (no object names)" +msgstr "stampa solo i nomi basati sui riferimenti (non i nomi oggetto)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "usa solo tag per denominare i commit" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "usa solo i riferimenti corrispondenti a <pattern>" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ignora i riferimenti corrispondenti a <pattern>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "elenca tutti i commit raggiungibili da tutti i riferimenti" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "leggi dallo standard input" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "consenti di stampare nomi `non definito` (impostazione predefinita)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "dereferenzia tag nell'input (uso interno)" @@ -15987,7 +17848,7 @@ msgstr "impossibile scrivere l'oggetto nota" msgid "the note contents have been left in %s" msgstr "i contenuti della nota sono stati lasciati in %s" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "non รจ stato possibile aprire o leggere '%s'" @@ -16225,7 +18086,7 @@ msgstr "" "esegui il commit del risultato con 'git notes merge --commit' o interrompi " "il merge con 'git notes merge --abort'.\n" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Risoluzione di '%s' come riferimento valido non riuscita." @@ -16243,7 +18104,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:165 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "non rimuovere, limitati a visualizzare" @@ -16259,148 +18120,142 @@ msgstr "riferimento note" msgid "use notes from <notes-ref>" msgstr "usa le note in <riferimento note>" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1605 #, c-format msgid "unknown subcommand: %s" msgstr "sottocomando sconosciuto: %s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<opzioni>...] [< <elenco riferimenti> | < <elenco " "oggetti>]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<opzioni>...] <nome base> [< <elenco riferimenti> | < " "<elenco oggetti>]" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "CRC oggetto sottoposto a pack %s errato" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "oggetto sottoposto a pack %s corrotto" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "rilevato delta ricorsivo per l'oggetto %s" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u oggetti ordinati, attesi %<PRIu32>" -#: 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 +#: builtin/pack-objects.c:1004 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:854 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "Scrittura degli oggetti in corso" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "stat di %s non riuscito" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "scritti %<PRIu32> oggetti quando me ne attendevo %<PRIu32>" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1348 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:1597 +#: builtin/pack-objects.c:1796 #, 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:1606 +#: builtin/pack-objects.c:1805 #, 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:1875 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "Conteggio degli oggetti in corso" -#: 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 +#: builtin/pack-objects.c:2231 #, c-format msgid "unable to parse object header of %s" msgstr "impossibile analizzare l'intestazione oggetto di %s" -#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "impossibile leggere l'oggetto %s" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "oggetto %s: lunghezza oggetto inconsistente (%<PRIuMAX> contro %<PRIuMAX>)" -#: builtin/pack-objects.c:2130 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "pack subottimo - memoria esaurita" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2656 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compressione delta in corso, uso fino a %d thread" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2795 #, 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:2675 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "Compressione oggetti in corso" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "inconsistenza con il numero dei delta" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" +"il valore di uploadpack.blobpackfileuri dev'essere nella forma '<hash " +"oggetto> <hash pack> <URI>' (ricevuto '%s')" + +#: builtin/pack-objects.c:2964 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" +"oggetto giร configurato in un altro uploadpack.blobpackfileuri (ricevuto " +"'%s')" + +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16409,7 +18264,7 @@ msgstr "" "atteso ID oggetto arco, ricevuti dati errati:\n" " %s" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16418,256 +18273,251 @@ msgstr "" "atteso ID oggetto, ricevuti dati errati:\n" " %s" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "valore non valido per --missing" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "impossibile aprire l'indice pack" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:3187 #, c-format msgid "loose object at %s could not be examined" msgstr "impossibile esaminare l'oggetto sciolto %s" -#: builtin/pack-objects.c:3041 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "impossibile forzare l'oggetto sciolto" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "'%s' non รจ una revisione" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "revisione '%s' errata" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "impossibile aggiungere gli oggetti recenti" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "versione %s di index non supportata" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "versione '%s' di index errata" -#: 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 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "<versione>[,<offset>]" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3489 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:3260 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "dimensione massima di ogni file pack in output" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "ignora gli oggetti presi in prestito dallo store oggetti alternativo" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "ignora gli oggetti sottoposti a pack" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "limita la finestra di pack al numero di oggetti specificato" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3500 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:3270 +#: builtin/pack-objects.c:3502 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:3272 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "riusa i delta esistenti" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "riusa gli oggetti esistenti" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "usa oggetti OFS_DELTA" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3510 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:3280 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "non creare un output pack vuoto" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "leggi gli argomenti revisione dallo standard input" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3516 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:3287 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "includi gli oggetti raggiungibili da qualunque riferimento" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "includi gli oggetti referenziati da voci del log riferimenti" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "includi gli oggetti referenziati dall'indice" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "invia il pack in output sullo standard output" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3530 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:3300 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "mantieni gli oggetti non raggiungibili" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "esegui il pack degli oggetti non raggiungibili sciolti" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "decomprimi gli oggetti non raggiungibili piรน recenti di <tempo>" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" msgstr "usa l'algoritmo di raggiungibilitร sparse" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "crea pack thin" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "crea pack adatti per fetch shallow" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "ignora i pack che hanno un file .keep che li accompagna" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "ignora questo pack" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "livello compressione pack" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "non nascondere i commit innestati" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3553 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:3323 +#: builtin/pack-objects.c:3555 msgid "write a bitmap index together with the pack index" msgstr "scrivi un indice bitmap insieme all'indice pack" -#: builtin/pack-objects.c:3327 +#: builtin/pack-objects.c:3559 msgid "write a bitmap index if possible" msgstr "scrivi un indice bitmap se possibile" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "azione da eseguire sugli oggetti mancanti" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3566 msgid "do not pack objects in promisor packfiles" msgstr "non eseguire il pack degli oggetti nei file pack promettenti" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3568 msgid "respect islands during delta compression" msgstr "rispetta le isole durante la compressione delta" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "protocollo" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "" +"escludi tutti gli uploadpack.blobpackfileuri configurati con questo " +"protocollo" + +#: builtin/pack-objects.c:3600 #, 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:3366 +#: builtin/pack-objects.c:3605 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "il valore pack.deltaCacheLimit รจ troppo elevato, forzo %d" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3659 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:3422 +#: builtin/pack-objects.c:3661 msgid "minimum pack size limit is 1 MiB" msgstr "il limite minimo delle dimensioni dei pack รจ 1 MiB" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3666 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:3430 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable e --unpack-unreachable non sono compatibili" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3675 msgid "cannot use --filter without --stdout" msgstr "impossibile usare --filter senza --stdout" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "Enumerazione degli oggetti in corso" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3766 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" msgstr "" "%<PRIu32> oggetti totali (%<PRIu32> delta), %<PRIu32> riutilizzati " -"(%<PRIu32> delta)" +"(%<PRIu32> delta), %<PRIu32> riutilizzati nel file pack" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -16681,82 +18531,109 @@ msgstr "esegui il pack di tutto" msgid "prune loose refs (default)" msgstr "elimina i riferimenti sciolti (impostazione predefinita)" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 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 "Rimozione oggetti duplicati in corso" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <tempo>] [--] [<head>...]" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "segnala gli oggetti ripuliti" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "fai scadere oggetti piรน vecchi di <tempo>" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "limita la visita agli oggetti al di fuori dei file pack promettenti" -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "" "impossibile eseguire l'eliminazione in un repository 'oggetti preziosi'" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Valore non valido per %s: %s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opzioni>] [<repository> [<specificatore riferimento>...]]" -#: builtin/pull.c:141 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "controlla il recupero ricorsivo dei sottomoduli" -#: builtin/pull.c:145 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "Opzioni relative al merge" -#: builtin/pull.c:148 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "incorpora le modifiche eseguendo un rebase anzichรฉ un merge" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 msgid "allow fast-forward" msgstr "consenti fast forward" -#: 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:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" +msgstr "esegui stash/stash pop automaticamente prima e dopo" -#: builtin/pull.c:201 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "Opzioni relative al fetch" -#: builtin/pull.c:211 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "forza la sovrascrittura del branch locale" -#: builtin/pull.c:219 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "numero di sottomoduli recuperati in parallelo" -#: builtin/pull.c:316 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valore non valido per pull.ff: %s" -#: builtin/pull.c:433 +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"L'esecuzione di un pull senza specificare come riconciliare branch\n" +"divergenti non รจ consigliata. ร possibile sopprimere questo messaggio\n" +"eseguendo uno dei seguenti comandi prima di eseguire il prossimo pull:\n" +"\n" +" git config pull.rebase false # merge (strategia predefinita)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # esegui solo fast forward\n" +"\n" +"Puoi sostituire \"git config\" con \"git config --global\" per impostare " +"una\n" +"preferenza predefinita per tutti i repository. Puoi anche passare gli\n" +"argomenti --rebase, --no-rebase o --ff-only sulla riga di comando per\n" +"eseguire l'override del valore predefinito configurato per una singola\n" +"invocazione.\n" + +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16764,14 +18641,14 @@ msgstr "" "Non ci sono candidati in base ai quali eseguire il rebase fra i riferimenti " "appena recuperati." -#: builtin/pull.c:435 +#: builtin/pull.c:460 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:436 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16779,7 +18656,7 @@ msgstr "" "In generale, questo significa che hai fornito uno specificatore\n" "riferimento che non aveva corrispondenze nel remoto." -#: builtin/pull.c:439 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16791,44 +18668,44 @@ msgstr "" "configurato come predefinito per il branch corrente, devi\n" "specificare un branch sulla riga di comando." -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Attualmente non sei su un branch." -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 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:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 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:449 builtin/pull.c:464 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "Vedi git-pull(1) per ulteriori dettagli." -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branch>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1238 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:468 git-parse-remote.sh:95 +#: builtin/pull.c:493 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:473 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16838,32 +18715,28 @@ msgstr "" "il merge con il riferimento '%s' del remoto, ma un tale\n" "riferimento non รจ stato recuperato." -#: builtin/pull.c:581 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "impossibile accedere al commit %s" -#: builtin/pull.c:861 +#: builtin/pull.c:894 msgid "ignoring --verify-signatures for rebase" msgstr "ignoro --verify-signature per il rebase" -#: 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:924 +#: builtin/pull.c:954 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:928 +#: builtin/pull.c:958 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:929 +#: builtin/pull.c:959 msgid "please commit or stash them." msgstr "eseguine il commit o lo stash." -#: builtin/pull.c:954 +#: builtin/pull.c:984 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16875,7 +18748,7 @@ msgstr "" "Eseguo il fast forward dell'albero\n" "di lavoro dal commit %s." -#: builtin/pull.c:960 +#: builtin/pull.c:990 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16894,15 +18767,15 @@ msgstr "" "$ git reset --hard\n" "per eseguire il ripristino." -#: builtin/pull.c:975 +#: builtin/pull.c:1005 msgid "Cannot merge multiple branches into empty head." msgstr "Impossibile eseguire il merge di piรน branch in un head vuoto." -#: builtin/pull.c:979 +#: builtin/pull.c:1009 msgid "Cannot rebase onto multiple branches." msgstr "Impossibile eseguire il rebase su piรน branch." -#: builtin/pull.c:986 +#: builtin/pull.c:1017 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossibile eseguire il rebase se ci sono delle modifiche registrate " @@ -16916,11 +18789,11 @@ msgstr "git push [<opzioni>] [<repository> [<specificatore riferimento>...]]" msgid "tag shorthand without <tag>" msgstr "esegui il tag della forma breve senza <tag>" -#: builtin/push.c:121 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "--delete accetta solo nomi dei ref di destinazione in chiaro" -#: builtin/push.c:167 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -16929,7 +18802,7 @@ msgstr "" "Per scegliere permanentemente una delle due opzioni, vedi push.default in " "'git help config'." -#: builtin/push.c:170 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16954,7 +18827,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16969,7 +18842,7 @@ msgstr "" "\n" " git push %s HEAD:<nome del branch remoto>\n" -#: builtin/push.c:199 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16983,13 +18856,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:202 #, 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:210 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -17000,14 +18873,14 @@ msgstr "" "branch corrente '%s', senza dirmi di cosa devo eseguire il push\n" "per aggiornare quale branch remoto." -#: builtin/push.c:269 +#: builtin/push.c:260 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:276 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -17021,7 +18894,7 @@ msgstr "" "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n" "dettagli." -#: builtin/push.c:282 +#: builtin/push.c:273 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" @@ -17036,7 +18909,7 @@ msgstr "" "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n" "dettagli." -#: builtin/push.c:288 +#: builtin/push.c:279 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" @@ -17052,12 +18925,12 @@ msgstr "" "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n" "dettagli." -#: builtin/push.c:295 +#: builtin/push.c:286 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:298 +#: builtin/push.c:289 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" @@ -17068,142 +18941,142 @@ msgstr "" "puntare a un oggetto diverso da un commit senza usare l'opzione\n" "'--force'.\n" -#: builtin/push.c:359 +#: builtin/push.c:351 #, c-format msgid "Pushing to %s\n" msgstr "Push su %s in corso\n" -#: builtin/push.c:364 +#: builtin/push.c:358 #, c-format msgid "failed to push some refs to '%s'" msgstr "push di alcuni riferimenti su '%s' non riuscito" -#: 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 +#: builtin/push.c:532 msgid "repository" msgstr "repository" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:533 builtin/send-pack.c:183 msgid "push all refs" msgstr "esegui il push di tutti i riferimenti" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:534 builtin/send-pack.c:185 msgid "mirror all refs" msgstr "esegui il mirror di tutti i riferimenti" -#: builtin/push.c:558 +#: builtin/push.c:536 msgid "delete refs" msgstr "elimina riferimenti" -#: builtin/push.c:559 +#: builtin/push.c:537 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:562 builtin/send-pack.c:167 +#: builtin/push.c:540 builtin/send-pack.c:186 msgid "force updates" msgstr "forza gli aggiornamenti" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:541 builtin/send-pack.c:198 msgid "<refname>:<expect>" msgstr "<nome riferimento>:<valore atteso>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:542 builtin/send-pack.c:199 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:568 +#: builtin/push.c:545 msgid "control recursive pushing of submodules" msgstr "controlla il push ricorsivo dei sottomoduli" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:546 builtin/send-pack.c:193 msgid "use thin pack" msgstr "usa un thin pack" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 msgid "receive pack program" msgstr "programma ricezione pack" -#: builtin/push.c:573 +#: builtin/push.c:549 msgid "set upstream for git pull/status" msgstr "imposta l'upstream per git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:552 msgid "prune locally removed refs" msgstr "elimina i riferimenti rimossi localmente" -#: builtin/push.c:578 +#: builtin/push.c:554 msgid "bypass pre-push hook" msgstr "ignora l'hook pre-push" -#: builtin/push.c:579 +#: builtin/push.c:555 msgid "push missing but relevant tags" msgstr "esegui il push dei tag mancanti ma rilevanti" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:557 builtin/send-pack.c:187 msgid "GPG sign the push" msgstr "firma il push con GPG" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:559 builtin/send-pack.c:194 msgid "request atomic transaction on remote side" msgstr "richiedi l'atomicitร della transazione al remoto" -#: builtin/push.c:602 +#: builtin/push.c:577 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete non รจ compatibile con --all, --mirror e --tags" -#: builtin/push.c:604 +#: builtin/push.c:579 msgid "--delete doesn't make sense without any refs" msgstr "--delete non ha senso senza alcun ref" -#: builtin/push.c:607 +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "repository '%s' errato" + +#: builtin/push.c:600 +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:615 msgid "--all and --tags are incompatible" msgstr "--all e --tags non sono compatibili" -#: builtin/push.c:609 +#: builtin/push.c:617 msgid "--all can't be combined with refspecs" msgstr "--all non puรฒ essere combinato con degli specificatori riferimento" -#: builtin/push.c:613 +#: builtin/push.c:621 msgid "--mirror and --tags are incompatible" msgstr "--mirror e --tags non sono compatibili" -#: builtin/push.c:615 +#: builtin/push.c:623 msgid "--mirror can't be combined with refspecs" msgstr "--mirror non puรฒ essere combinato con degli specificatori riferimento" -#: builtin/push.c:618 +#: builtin/push.c:626 msgid "--all and --mirror are incompatible" msgstr "--all e --mirror non sono compatibili" -#: builtin/push.c:637 +#: builtin/push.c:630 msgid "push options must not have new line characters" msgstr "le opzioni push non devono avere caratteri di fine riga" @@ -17224,24 +19097,32 @@ msgstr "" "git range-diff [<opzioni>] <base> <vecchio ultimo commit> <nuovo ultimo " "commit>" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "Percentuale in base a cui viene pesata la creazione" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "usa colori semplici per il diff" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: 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 #, c-format msgid "no .. in range: '%s'" msgstr "nessun .. nell'intervallo: '%s'" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "il formato dell'unico argomento dev'essere un intervallo simmetrico" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "devono essere specificati due intervalli commit" @@ -17324,236 +19205,217 @@ msgstr "esegui il debug di unpack-trees" msgid "suppress feedback messages" msgstr "non visualizzare i messaggi di feedback" -#: builtin/rebase.c:32 +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "Prima devi risolvere l'indice corrente" + +#: builtin/rebase.c:35 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [options] [--exec <comando>] [--onto <nuova base>] " -"[<upstream>] [<branch>]" +"git rebase [-i] [opzioni] [--exec <comando>] [--onto <nuova base> | --keep-" +"base] [<upstream> [<branch>]]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [options] [--exec <comando>] [--onto <nuova base>] --root " "[<branch>]" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 #, c-format msgid "unusable todo list: '%s'" msgstr "elenco todo inutilizzabile: '%s'" -#: 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 +#: builtin/rebase.c:304 #, c-format msgid "could not create temporary %s" msgstr "impossibile creare un %s temporaneo" -#: builtin/rebase.c:285 +#: builtin/rebase.c:310 msgid "could not mark as interactive" msgstr "impossibile contrassegnare come interattivo" -#: builtin/rebase.c:343 +#: builtin/rebase.c:364 msgid "could not generate todo list" msgstr "impossibile generare l'elenco todo" -#: builtin/rebase.c:382 +#: builtin/rebase.c:405 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:437 +#: builtin/rebase.c:474 msgid "git rebase--interactive [<options>]" msgstr "git rebase --interactive [<opzioni>]" -#: builtin/rebase.c:449 -msgid "keep empty commits" -msgstr "mantieni i commit vuoti" +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" +msgstr "mantieni i commit che iniziano vuoti" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:491 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "consenti commit con messaggi vuoti" -#: builtin/rebase.c:452 +#: builtin/rebase.c:493 msgid "rebase merge commits" msgstr "esegui il rebase dei commit di merge" -#: builtin/rebase.c:454 +#: builtin/rebase.c:495 msgid "keep original branch points of cousins" msgstr "mantieni i punti di branch originali dei cugini" -#: builtin/rebase.c:456 +#: builtin/rebase.c:497 msgid "move commits that begin with squash!/fixup!" msgstr "sposta i commit che iniziano con squash!/fixup!" -#: builtin/rebase.c:457 +#: builtin/rebase.c:498 msgid "sign commits" msgstr "firma i commit" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:500 builtin/rebase.c:1321 msgid "display a diffstat of what changed upstream" msgstr "visualizza un diffstat delle modifiche upstream" -#: builtin/rebase.c:461 +#: builtin/rebase.c:502 msgid "continue rebase" msgstr "continua il rebase" -#: builtin/rebase.c:463 +#: builtin/rebase.c:504 msgid "skip commit" msgstr "salta il commit" -#: builtin/rebase.c:464 +#: builtin/rebase.c:505 msgid "edit the todo list" msgstr "modifica l'elenco todo" -#: builtin/rebase.c:466 +#: builtin/rebase.c:507 msgid "show the current patch" msgstr "visualizza la patch corrente" -#: builtin/rebase.c:469 +#: builtin/rebase.c:510 msgid "shorten commit ids in the todo list" msgstr "abbrevia gli ID dei commit nell'elenco todo" -#: builtin/rebase.c:471 +#: builtin/rebase.c:512 msgid "expand commit ids in the todo list" msgstr "espandi gli ID dei commit nell'elenco todo" -#: builtin/rebase.c:473 +#: builtin/rebase.c:514 msgid "check the todo list" msgstr "controlla l'elenco todo" -#: builtin/rebase.c:475 +#: builtin/rebase.c:516 msgid "rearrange fixup/squash lines" msgstr "ridisponi le righe fixup/squash" -#: builtin/rebase.c:477 +#: builtin/rebase.c:518 msgid "insert exec commands in todo list" msgstr "inserisci i comandi exec nell'elenco todo" -#: builtin/rebase.c:478 +#: builtin/rebase.c:519 msgid "onto" msgstr "su" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict-revision" msgstr "revisioni-limite" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict revision" msgstr "limita la revisione" -#: builtin/rebase.c:483 +#: builtin/rebase.c:524 msgid "squash-onto" msgstr "squash-su" -#: builtin/rebase.c:484 +#: builtin/rebase.c:525 msgid "squash onto" msgstr "esegui lo squash su" -#: builtin/rebase.c:486 +#: builtin/rebase.c:527 msgid "the upstream commit" msgstr "il commit upstream" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head-name" msgstr "nome head" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head name" msgstr "nome head" -#: builtin/rebase.c:493 +#: builtin/rebase.c:534 msgid "rebase strategy" msgstr "strategia di rebase" -#: builtin/rebase.c:494 +#: builtin/rebase.c:535 msgid "strategy-opts" msgstr "opzioni strategia" -#: builtin/rebase.c:495 +#: builtin/rebase.c:536 msgid "strategy options" msgstr "opzioni strategia" -#: builtin/rebase.c:496 +#: builtin/rebase.c:537 msgid "switch-to" msgstr "passa a" -#: builtin/rebase.c:497 +#: builtin/rebase.c:538 msgid "the branch or commit to checkout" msgstr "il branch o il commit di cui eseguire il checkout" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto-name" msgstr "nome" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto name" msgstr "sul nome" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "cmd" msgstr "comando" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "the command to run" msgstr "il comando da eseguire" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:543 builtin/rebase.c:1415 msgid "automatically re-schedule any `exec` that fails" msgstr "schedula nuovamente le operazioni `exec` non riuscite automaticamente" -#: builtin/rebase.c:518 +#: builtin/rebase.c:559 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins non ha effetto senza --rebase-merges" -#: builtin/rebase.c:534 +#: builtin/rebase.c:575 #, c-format -msgid "%s requires an interactive rebase" -msgstr "%s richiede un rebase interattivo" +msgid "%s requires the merge backend" +msgstr "%s richiede il backend da utilizzare per il merge" -#: builtin/rebase.c:586 +#: builtin/rebase.c:618 #, c-format msgid "could not get 'onto': '%s'" msgstr "impossibile ottenere 'onto': '%s'" -#: builtin/rebase.c:601 +#: builtin/rebase.c:635 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head non valida: '%s'" -#: builtin/rebase.c:626 +#: builtin/rebase.c:660 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignoro il valore non valido per allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:702 -#, c-format -msgid "Could not read '%s'" -msgstr "Impossibile leggere '%s'" - -#: builtin/rebase.c:720 -#, c-format -msgid "Cannot store %s" -msgstr "Impossibile memorizzare %s" - -#: builtin/rebase.c:827 -msgid "could not determine HEAD revision" -msgstr "impossibile determinare la revisione HEAD" - -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:805 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" @@ -17569,7 +19431,7 @@ msgstr "" "Per interrompere l'operazione e tornare allo stato precedente\n" "il \"git rebase\", esegui \"git rebase --abort\"." -#: builtin/rebase.c:1031 +#: builtin/rebase.c:888 #, c-format msgid "" "\n" @@ -17588,7 +19450,16 @@ msgstr "" "\n" "Di conseguenza, Git non puรฒ eseguirne il rebase." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1214 +#, 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:1232 #, c-format msgid "" "%s\n" @@ -17605,7 +19476,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1248 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17619,131 +19490,153 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1278 msgid "exec commands cannot contain newlines" msgstr "i comandi exec non possono contenere caratteri di fine riga" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1282 msgid "empty exec command" msgstr "comando exec vuoto" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1312 msgid "rebase onto given branch instead of upstream" msgstr "esegui il rebase sul branch specificato anzichรฉ su quello upstream" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1314 +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:1316 msgid "allow pre-rebase hook to run" msgstr "consenti l'esecuzione dell'hook pre-rebase" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1318 msgid "be quiet. implies --no-stat" msgstr "sii silenzioso. implica --no-stat" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1324 msgid "do not show diffstat of what changed upstream" msgstr "non visualizzare un diffstat delle modifiche upstream" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1327 msgid "add a Signed-off-by: line to each commit" msgstr "aggiungi una riga Signed-off-by: a ogni commit" -#: 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:1330 +msgid "make committer date match author date" +msgstr "" +"fai corrispondere la data della persona che ha eseguito il commit alla data " +"autore" + +#: builtin/rebase.c:1332 +msgid "ignore author date and use current date" +msgstr "ignora la data autore e usa la data corrente" + +#: builtin/rebase.c:1334 +msgid "synonym of --reset-author-date" +msgstr "sinonimo di --reset-author-date" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1336 builtin/rebase.c:1340 msgid "passed to 'git apply'" msgstr "passato a 'git apply'" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1338 +msgid "ignore changes in whitespace" +msgstr "ignora modifiche agli spazi bianchi" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 msgid "cherry-pick all commits, even if unchanged" msgstr "esegui il cherry-pick di tutti i commit, anche se non modificati" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1347 msgid "continue" msgstr "continua" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1350 msgid "skip current patch and continue" msgstr "salta la patch corrente e continua" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1352 msgid "abort and check out the original branch" msgstr "interrompi ed esegui il checkout del branch originario" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1355 msgid "abort but keep HEAD where it is" msgstr "interrompi ma mantieni l'HEAD dov'รจ" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1356 msgid "edit the todo list during an interactive rebase" msgstr "modifica l'elenco todo durante un rebase interattivo" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1359 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:1443 +#: builtin/rebase.c:1362 +msgid "use apply strategies to rebase" +msgstr "usa le strategie di apply per eseguire il rebase" + +#: builtin/rebase.c:1366 msgid "use merging strategies to rebase" msgstr "usa le strategie di merge per eseguire il rebase" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1370 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:1451 +#: builtin/rebase.c:1374 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DEPRECATO) prova a ricreare i merge anzichรฉ ignorarli" -#: builtin/rebase.c:1455 -msgid "preserve empty commits during rebase" -msgstr "mantieni i commit vuoti durante il rebase" +#: builtin/rebase.c:1379 +msgid "how to handle commits that become empty" +msgstr "come gestire i commit che diventano vuoti" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1386 msgid "move commits that begin with squash!/fixup! under -i" msgstr "sposta i commit che iniziano con squash!/fixup! in -i" -#: builtin/rebase.c:1463 -msgid "automatically stash/stash pop before and after" -msgstr "esegui stash/stash pop automaticamente prima e dopo" - -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1393 msgid "add exec lines after each commit of the editable list" msgstr "aggiungi righe exec dopo ogni commit della lista modificabile" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1397 msgid "allow rebasing commits with empty messages" msgstr "consenti il rebase di commit con messaggi vuoti" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1401 msgid "try to rebase merges instead of skipping them" msgstr "prova ad eseguire il rebase dei merge anzichรฉ saltarli" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1404 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "usa 'merge-base --fork-point' per ridefinire piรน precisamente l'upstream" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1406 msgid "use the given merge strategy" msgstr "usa la strategia di merge specificata" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1408 builtin/revert.c:115 msgid "option" msgstr "opzione" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1409 msgid "pass the argument through to the merge strategy" msgstr "passa l'argomento alla strategia di merge" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1412 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:1500 +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "applica tutte le modifiche, anche quelle giร presenti upstream" + +#: builtin/rebase.c:1434 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17751,29 +19644,41 @@ msgstr "" "il supporto per rebase.useBuiltin รจ stato rimosso!\n" "Vedi la voce relativa in 'git help config' per i dettagli." -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1440 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:1547 +#: builtin/rebase.c:1481 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "git rebase --preserve-merges รจ deprecato. Usa --rebase-merges." -#: builtin/rebase.c:1551 +#: builtin/rebase.c:1486 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "impossibile combinare '--keep-base' con '--onto'" + +#: builtin/rebase.c:1488 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "impossibile combinare '--keep-base' con '--root'" + +#: builtin/rebase.c:1492 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "impossibile combinare '--root' con '--fork-point'" + +#: builtin/rebase.c:1495 msgid "No rebase in progress?" msgstr "Nessun rebase in corso?" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1499 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:1578 +#: builtin/rebase.c:1522 msgid "Cannot read HEAD" msgstr "Impossibile leggere l'HEAD" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1534 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17782,16 +19687,16 @@ msgstr "" "quindi contrassegnarli come risolti usando\n" "git add" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1553 msgid "could not discard worktree changes" msgstr "impossibile scartare le modifiche all'albero di lavoro" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1572 #, c-format msgid "could not move back to %s" msgstr "impossibile ritornare a %s" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1618 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17812,175 +19717,146 @@ msgstr "" "ed eseguimi di nuovo. Mi fermo nel caso in cui tu abbia ancora\n" "salvato qualcosa di importante lรฌ.\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1646 msgid "switch `C' expects a numerical value" msgstr "l'opzione `C` richiede un valore numerico" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1688 #, c-format msgid "Unknown mode: %s" msgstr "Modo sconosciuto: %s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1727 msgid "--strategy requires --merge or --interactive" msgstr "--strategy richiede --merge o --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1757 +msgid "cannot combine apply options with merge options" +msgstr "non รจ possibile combinare le opzioni apply con quelle merge" + +#: builtin/rebase.c:1770 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "Backend di rebase sconosciuto: %s" + +#: builtin/rebase.c:1795 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec richiede --exec o --interactive" -#: 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 +#: builtin/rebase.c:1815 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossibile combinare '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1819 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "errore: impossibile combinare '--preserve-merges' con '--reschedule-failed-" "exec'" -#: 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 +#: builtin/rebase.c:1843 #, c-format msgid "invalid upstream '%s'" msgstr "upstream non valido: '%s'" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1849 msgid "Could not create new root commit" msgstr "Impossibile creare il nuovo commit radice" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1875 +#, 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:1878 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': รจ necessario specificare esattamente una base per il merge" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1886 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "'%s' non punta a un commit valido" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1912 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "errore fatale: branch/commit '%s' inesistente" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Riferimento non esistente: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1931 msgid "Could not resolve HEAD to a revision" msgstr "Impossibile risolvere HEAD come revisione" -#: builtin/rebase.c:1981 -msgid "Cannot autostash" -msgstr "Impossibile eseguire lo stash automatico" - -#: builtin/rebase.c:1984 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "Risposta stash non attesa: '%s'" - -#: builtin/rebase.c:1990 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "Impossibile creare la directory '%s'" - -#: builtin/rebase.c:1993 -#, c-format -msgid "Created autostash: %s\n" -msgstr "Stash automatico creato: %s\n" - -#: builtin/rebase.c:1996 -msgid "could not reset --hard" -msgstr "impossibile eseguire reset --hard" - -#: 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 +#: builtin/rebase.c:1952 msgid "Please commit or stash them." msgstr "Eseguine il commit o lo stash." -#: builtin/rebase.c:2040 -#, c-format -msgid "could not parse '%s'" -msgstr "impossibile analizzare '%s'" - -#: builtin/rebase.c:2053 +#: builtin/rebase.c:1988 #, c-format msgid "could not switch to %s" msgstr "impossibile passare a %s" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:1999 msgid "HEAD is up to date." msgstr "HEAD รจ aggiornato." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2001 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Il branch corrente %s รจ aggiornato.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2009 msgid "HEAD is up to date, rebase forced." msgstr "HEAD รจ aggiornato, forzo il rebase." -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2011 #, 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:2084 +#: builtin/rebase.c:2019 msgid "The pre-rebase hook refused to rebase." msgstr "L'hook pre-rebase ha rifiutato di consentire il rebase." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2026 #, c-format msgid "Changes to %s:\n" msgstr "Modifiche a %s:\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2029 #, c-format msgid "Changes from %s to %s:\n" msgstr "Modifiche da %s a %s:\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2054 #, 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:2128 +#: builtin/rebase.c:2063 msgid "Could not detach HEAD" msgstr "Impossibile scollegare l'HEAD" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2072 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Fast forward da %s a %s eseguito.\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <directory Git>" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:1224 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" @@ -18013,7 +19889,7 @@ msgstr "" "il comportamento predefinito, imposta la variabile di\n" "configurazione 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:1244 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" @@ -18036,11 +19912,11 @@ msgstr "" "Per non visualizzare piรน questo messaggio, puoi impostarla a\n" "'refuse'." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:2422 msgid "quiet" msgstr "non visualizzare messaggi" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:2436 msgid "You must specify a directory." msgstr "Devi specificare una directory." @@ -18066,49 +19942,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <riferimento>" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' non รจ un timestamp valido" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "Contrassegno gli oggetti raggiungibili..." -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "%s non punta a niente!" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "nessun registro riferimenti da eliminare specificato" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "non รจ un registro riferimenti: %s" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "log riferimenti non esistente per '%s'" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "formato riferimento non valido: %s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -18116,82 +19992,82 @@ msgstr "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nome> <URL>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <vecchio> <nuovo>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <nome>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 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:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nome>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nome>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<gruppo> | <remoto>)...]" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nome> <branch>..." -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nome>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nome> <nuovo URL> [<vecchio URL>]" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nome> <nuovo URL>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nome> <URL>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opzioni>] <nome> <URL>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nome> <branch>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nome> <branch>..." -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<opzioni>] <nome>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<opzioni>] <nome>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<opzioni>] [<gruppo> | <remoto>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "Aggiornamento di %s" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -18199,88 +20075,104 @@ msgstr "" "--mirror รจ pericoloso e deprecato; per favore\n" "\t usa invece --mirror-fetch o --mirror-push" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "argomento di mirror sconosciuto: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "recupera i branch remoti" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "importa tutti i tag e gli oggetti associati durante il recupero" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "o non recuperare alcun tag (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "branch da tracciare" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "branch master" -#: builtin/remote.c:173 +#: builtin/remote.c:174 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:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "specificare un branch master con --mirror non ha senso" -#: builtin/remote.c:187 +#: builtin/remote.c:188 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:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:697 #, c-format msgid "remote %s already exists." msgstr "il remoto %s esiste giร ." -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:701 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' non รจ un nome di remoto valido" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "Impossibile configurare il master '%s'" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, 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:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(corrispondente)" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(elimina)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:654 +#, c-format +msgid "could not set '%s'" +msgstr "impossibile impostare '%s'" + +#: builtin/remote.c:659 +#, 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:690 builtin/remote.c:833 builtin/remote.c:941 #, c-format msgid "No such remote: '%s'" msgstr "Remoto non esistente: '%s'" -#: builtin/remote.c:646 +#: builtin/remote.c:707 #, 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:666 +#: builtin/remote.c:727 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18291,17 +20183,17 @@ msgstr "" "\t%s\n" "\tAggiorna la configurazione manualmente se necessario." -#: builtin/remote.c:702 +#: builtin/remote.c:767 #, c-format msgid "deleting '%s' failed" msgstr "eliminazione di '%s' non riuscita" -#: builtin/remote.c:736 +#: builtin/remote.c:801 #, c-format msgid "creating '%s' failed" msgstr "creazione di '%s' non riuscita" -#: builtin/remote.c:802 +#: builtin/remote.c:877 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18317,120 +20209,120 @@ msgstr[1] "" "eliminati;\n" "per eliminarli, usa:" -#: builtin/remote.c:816 +#: builtin/remote.c:891 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossibile rimuovere la sezione di configurazione '%s'" -#: builtin/remote.c:917 +#: builtin/remote.c:994 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nuovo (il prossimo fetch lo salverร in remotes/%s)" -#: builtin/remote.c:920 +#: builtin/remote.c:997 msgid " tracked" msgstr " tracciato" -#: builtin/remote.c:922 +#: builtin/remote.c:999 msgid " stale (use 'git remote prune' to remove)" msgstr " vecchio (usa 'git remote prune' per rimuoverlo)" -#: builtin/remote.c:924 +#: builtin/remote.c:1001 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:1042 #, 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:974 +#: builtin/remote.c:1051 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebase interattivo sul remoto %s" -#: builtin/remote.c:976 +#: builtin/remote.c:1053 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebase interattivo (con merge) sul remoto %s" -#: builtin/remote.c:979 +#: builtin/remote.c:1056 #, c-format msgid "rebases onto remote %s" msgstr "rebase sul remoto %s" -#: builtin/remote.c:983 +#: builtin/remote.c:1060 #, c-format msgid " merges with remote %s" msgstr " merge con il remote %s" -#: builtin/remote.c:986 +#: builtin/remote.c:1063 #, c-format msgid "merges with remote %s" msgstr "merge con il remote %s" -#: builtin/remote.c:989 +#: builtin/remote.c:1066 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s e con il remoto %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1109 msgid "create" msgstr "crea" -#: builtin/remote.c:1035 +#: builtin/remote.c:1112 msgid "delete" msgstr "elimina" -#: builtin/remote.c:1039 +#: builtin/remote.c:1116 msgid "up to date" msgstr "aggiornato" -#: builtin/remote.c:1042 +#: builtin/remote.c:1119 msgid "fast-forwardable" msgstr "fast forward possibile" -#: builtin/remote.c:1045 +#: builtin/remote.c:1122 msgid "local out of date" msgstr "locale non aggiornato" -#: builtin/remote.c:1052 +#: builtin/remote.c:1129 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s esegue un aggiornamento forzato su %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1132 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s esegue il push su %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1136 #, c-format msgid " %-*s forces to %s" msgstr " %-*s esegue un aggiornamento forzato su %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1139 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s esegue il push su %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1207 msgid "do not query remotes" msgstr "non interrogare i remoti" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1235 #, c-format msgid " Fetch URL: %s" msgstr " URL recupero: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 msgid "(no URL)" msgstr "(nessun URL)" @@ -18438,195 +20330,185 @@ msgstr "(nessun URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1250 builtin/remote.c:1252 #, c-format msgid " Push URL: %s" msgstr " URL push: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 #, c-format msgid " HEAD branch: %s" msgstr " branch HEAD: %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1254 msgid "(not queried)" msgstr "(non interrogato)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1256 msgid "(unknown)" msgstr "(sconosciuto)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1260 #, 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:1195 +#: builtin/remote.c:1272 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branch remoto:%s" msgstr[1] " Branch remoti:%s" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1275 builtin/remote.c:1301 msgid " (status not queried)" msgstr " (stato non richiesto)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1284 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:1215 +#: builtin/remote.c:1292 msgid " Local refs will be mirrored by 'git push'" msgstr " I riferimenti locali saranno copiati da 'git push'" -#: builtin/remote.c:1221 +#: builtin/remote.c:1298 #, 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:1242 +#: builtin/remote.c:1319 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "imposta refs/remotes/<nome>/HEAD in base al remoto" -#: builtin/remote.c:1244 +#: builtin/remote.c:1321 msgid "delete refs/remotes/<name>/HEAD" msgstr "elimina refs/remotes/<nome>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1336 msgid "Cannot determine remote HEAD" msgstr "Impossibile determinare l'HEAD remoto" -#: builtin/remote.c:1261 +#: builtin/remote.c:1338 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Branch HEAD remoti multipli. Scegline uno esplicitamente con:" -#: builtin/remote.c:1271 +#: builtin/remote.c:1348 #, c-format msgid "Could not delete %s" msgstr "Non รจ stato possibile eliminare %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1356 #, c-format msgid "Not a valid ref: %s" msgstr "Non รจ un ref valido: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1358 #, c-format msgid "Could not setup %s" msgstr "Non รจ stato possibile configurare %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, c-format msgid " %s will become dangling!" msgstr " %s diventerร pendente!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1377 #, c-format msgid " %s has become dangling!" msgstr " %s รจ diventato pendente!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "Pruning %s" msgstr "Eliminazione di %s in corso" -#: builtin/remote.c:1311 +#: builtin/remote.c:1388 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1404 #, c-format msgid " * [would prune] %s" msgstr " * [sarebbe eliminato] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1407 #, c-format msgid " * [pruned] %s" msgstr " * [eliminato] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1452 msgid "prune remotes after fetching" msgstr "elimina remoti dopo il fetch" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 #, c-format msgid "No such remote '%s'" msgstr "Remote '%s' non esistente" -#: builtin/remote.c:1454 +#: builtin/remote.c:1531 msgid "add branch" msgstr "aggiungi branch" -#: builtin/remote.c:1461 +#: builtin/remote.c:1538 msgid "no remote specified" msgstr "nessun remote specificato" -#: builtin/remote.c:1478 +#: builtin/remote.c:1555 msgid "query push URLs rather than fetch URLs" msgstr "interroga gli URL per il push anzichรฉ gli URL per il fetch" -#: builtin/remote.c:1480 +#: builtin/remote.c:1557 msgid "return all URLs" msgstr "restituisci tutti gli URL" -#: builtin/remote.c:1508 +#: builtin/remote.c:1585 #, c-format msgid "no URLs configured for remote '%s'" msgstr "nessun URL configurato per il remoto '%s'" -#: builtin/remote.c:1534 +#: builtin/remote.c:1611 msgid "manipulate push URLs" msgstr "manipola gli URL per il push" -#: builtin/remote.c:1536 +#: builtin/remote.c:1613 msgid "add URL" msgstr "aggiungi URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1615 msgid "delete URLs" msgstr "elimina URL" -#: builtin/remote.c:1545 +#: builtin/remote.c:1622 msgid "--add --delete doesn't make sense" msgstr "--add --delete non ha senso" -#: builtin/remote.c:1584 +#: builtin/remote.c:1661 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Pattern URL vecchio non valido: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1669 #, c-format msgid "No such URL found: %s" msgstr "Nessuna URL trovata: %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1671 msgid "Will not delete all non-push URLs" msgstr "Non eliminerรฒ tutti gli URL non push" -#: 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 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [<opzioni>]" -#: builtin/repack.c:27 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18635,118 +20517,118 @@ msgstr "" "Usa --no-write-bitmap-index o disabilita l'opzione di configurazione\n" "pack.writebitmaps." -#: builtin/repack.c:190 +#: builtin/repack.c:197 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:229 builtin/repack.c:408 +#: builtin/repack.c:236 builtin/repack.c:421 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:246 +#: builtin/repack.c:260 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:284 +#: builtin/repack.c:297 msgid "pack everything in a single pack" msgstr "esegui il pack di tutto in un singolo pack" -#: builtin/repack.c:286 +#: builtin/repack.c:299 msgid "same as -a, and turn unreachable objects loose" msgstr "come -a e rendi sciolti gli oggetti non raggiungibili" -#: builtin/repack.c:289 +#: builtin/repack.c:302 msgid "remove redundant packs, and run git-prune-packed" msgstr "rimuovi i pack ridondanti ed esegui git-prune-packed" -#: builtin/repack.c:291 +#: builtin/repack.c:304 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "fornisci l'opzione --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:293 +#: builtin/repack.c:306 msgid "pass --no-reuse-object to git-pack-objects" msgstr "fornisci l'opzione --no-reuse-object a git-pack-objects" -#: builtin/repack.c:295 +#: builtin/repack.c:308 msgid "do not run git-update-server-info" msgstr "non eseguire git-update-server-info" -#: builtin/repack.c:298 +#: builtin/repack.c:311 msgid "pass --local to git-pack-objects" msgstr "fornisci l'opzione --local a git-pack-objects" -#: builtin/repack.c:300 +#: builtin/repack.c:313 msgid "write bitmap index" msgstr "scrivi l'indice bitmap" -#: builtin/repack.c:302 +#: builtin/repack.c:315 msgid "pass --delta-islands to git-pack-objects" msgstr "fornisci l'opzione --delta-islands a git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:316 msgid "approxidate" msgstr "data approssimativa" -#: builtin/repack.c:304 +#: builtin/repack.c:317 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:306 +#: builtin/repack.c:319 msgid "with -a, repack unreachable objects" msgstr "con -a, esegui il repack degli oggetti non raggiungibili" -#: builtin/repack.c:308 +#: builtin/repack.c:321 msgid "size of the window used for delta compression" msgstr "dimensione della finestra usata per la compressione delta" -#: builtin/repack.c:309 builtin/repack.c:315 +#: builtin/repack.c:322 builtin/repack.c:328 msgid "bytes" msgstr "byte" -#: builtin/repack.c:310 +#: builtin/repack.c:323 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:312 +#: builtin/repack.c:325 msgid "limits the maximum delta depth" msgstr "limita la profonditร massima dei delta" -#: builtin/repack.c:314 +#: builtin/repack.c:327 msgid "limits the maximum number of threads" msgstr "limita il numero massimo di thread" -#: builtin/repack.c:316 +#: builtin/repack.c:329 msgid "maximum size of each packfile" msgstr "dimensione massima di ogni file pack" -#: builtin/repack.c:318 +#: builtin/repack.c:331 msgid "repack objects in packs marked with .keep" msgstr "esegui il repack degli oggetti nei pack contrassegnati con .keep" -#: builtin/repack.c:320 +#: builtin/repack.c:333 msgid "do not repack this pack" msgstr "non eseguire il repack di questo pack" -#: builtin/repack.c:330 +#: builtin/repack.c:343 msgid "cannot delete packs in a precious-objects repo" msgstr "impossibile eliminare i pack in un repository 'oggetti preziosi'" -#: builtin/repack.c:334 +#: builtin/repack.c:347 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable e -A non sono compatibili" -#: builtin/repack.c:417 +#: builtin/repack.c:430 msgid "Nothing new to pack." msgstr "Non ci sono oggetti nuovi di cui eseguire il pack." -#: builtin/repack.c:478 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18766,7 +20648,7 @@ msgstr "" "AVVISO: non รจ riuscito. Ridenominali manualmente\n" "AVVISO: entro %s:\n" -#: builtin/repack.c:526 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "eliminazione di '%s' non riuscita" @@ -18874,8 +20756,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:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: 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 "nome oggetto non valido: '%s'" @@ -18894,22 +20776,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:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "impossibile analizzare %s come commit" -#: builtin/replace.c:414 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "tag merge non valido nel commit '%s'" -#: builtin/replace.c:416 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "tag merge malformato nel commit '%s'" -#: builtin/replace.c:428 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -18918,31 +20800,31 @@ msgstr "" "il commit originario '%s' contiene il tag merge '%s' che รจ stato scartato; " "usa --edit anzichรฉ --graft" -#: builtin/replace.c:467 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "il commit originario '%s' ha una firma GPG" -#: builtin/replace.c:468 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "la firma sarร rimossa nel commit sostitutivo!" -#: builtin/replace.c:478 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "impossibile scrivere il commit sostitutivo per '%s'" -#: builtin/replace.c:486 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft per '%s' non necessario" -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, 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:525 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -18951,71 +20833,71 @@ msgstr "" "impossibile convertire i seguenti graft:\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "elenca i riferimenti sostitutivi" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "elimina i riferimenti sostitutivi" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "modifica l'oggetto esistente" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "cambia i genitori di un commit" -#: builtin/replace.c:550 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "converti un file graft esistente" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "sostituisci il riferimento se esiste" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "non stampare i contenuti in un formato leggibile (per --edit)" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "usa questo formato" -#: builtin/replace.c:567 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "--format non puรฒ essere usato quando non si elencano voci" -#: builtin/replace.c:575 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "-f ha senso solo se si sta scrivendo un oggetto sostitutivo" -#: builtin/replace.c:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw ha senso solo con --edit" -#: builtin/replace.c:585 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "-d richiede almeno un argomento" -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "numero di argomenti errato" -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e richiede esattamente un argomento" -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-g richiede almeno un argomento" -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file non richiede argomenti" -#: builtin/replace.c:615 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "con -l puรฒ essere specificato solo un pattern" @@ -19044,114 +20926,127 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<espressione albero>] [--] <percorsi>..." +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "git reset [-q] [<espressione albero>] [--] <specificatore percorso>..." #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<espressione albero>] [--] [<percorsi>...]" +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>...]" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "misto" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "soft" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "hard" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "merge" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "keep" -#: builtin/reset.c:81 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "Non hai un HEAD valido." -#: builtin/reset.c:83 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "Impossibile trovare l'albero di HEAD." -#: builtin/reset.c:89 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "Impossibile trovare l'albero di %s." -#: builtin/reset.c:193 +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ora si trova a %s" + +#: builtin/reset.c:195 #, 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:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "non visualizzare messaggi, segnala solo gli errori" -#: builtin/reset.c:295 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "reimposta l'HEAD e l'indice" -#: builtin/reset.c:296 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "reimposta solo l'HEAD" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "reimposta l'HEAD, l'indice e l'albero di lavoro" -#: builtin/reset.c:302 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "reimposta l'HEAD ma mantieni le modifiche locali" -#: builtin/reset.c:308 +#: builtin/reset.c:310 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:326 +#: builtin/reset.c:344 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Risoluzione di '%s' come revisione valida non riuscita." -#: builtin/reset.c:334 +#: builtin/reset.c:352 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Risoluzione di '%s' come albero valido non riuscita." -#: builtin/reset.c:343 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch non รจ compatibile con --{hard,mixed,soft}" -#: builtin/reset.c:353 +#: builtin/reset.c:371 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:355 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "Impossibile eseguire un %s reset con dei percorsi." -#: builtin/reset.c:370 +#: builtin/reset.c:388 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset non รจ consentito in un repository spoglio" -#: builtin/reset.c:374 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "-N puรฒ essere usato solo con --mixed" -#: builtin/reset.c:395 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "Modifiche non nell'area di staging dopo il reset:" -#: builtin/reset.c:398 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -19165,54 +21060,49 @@ msgstr "" "messaggio. Imposta l'opzione di configurazione reset.quiet a true per\n" "rendere tale comportamento quello predefinito.\n" -#: builtin/reset.c:408 +#: builtin/reset.c:434 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Impossibile ripristinare il file indice alla revisione '%s'." -#: builtin/reset.c:412 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "Impossibile scrivere il nuovo file indice." -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "impossibile combinare --exclude-promisor-objects e --missing" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "il filtraggio oggetti richiede --objects" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "valore sparse non valido: '%s'" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "rev-list non supporta la visualizzazione delle note" -#: 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-list.c:615 +msgid "marked counting is incompatible with --objects" +msgstr "il conteggio contrassegnato non รจ compatibile con --objects" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<opzioni>] -- [<argomenti>...]" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "mantieni la stringa passata `--` come argomento" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "" "termina l'analisi dopo il primo argomento non corrispondente a un'opzione" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "emetti l'output in forma \"stuck long\"" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -19360,40 +21250,45 @@ 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:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "non elencare i file rimossi" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "rimuovi solo dall'indice" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "ignora il controllo sullo stato di aggiornamento" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "consenti rimozioni ricorsive" -#: builtin/rm.c:247 +#: builtin/rm.c:248 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:289 +#: 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 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:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "non rimuovo '%s' ricorsivamente senza -r" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: non รจ possibile eliminare %s" @@ -19410,55 +21305,77 @@ msgstr "" "[<riferimento>...]\n" " --all e uno specificatore <riferimento> sono mutualmente esclusivi." -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:182 msgid "remote name" msgstr "nome remoto" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:195 msgid "use stateless RPC protocol" msgstr "usa protocollo RPC senza stato" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:196 msgid "read refs from stdin" msgstr "leggi i riferimento dallo standard input" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:197 msgid "print status from remote helper" msgstr "stampa lo stato dell'helper remoto" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:15 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<opzioni>] [<intervallo revisioni>] [[--] <percorso>...]" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<opzioni>]" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:134 +msgid "using multiple --group options with stdin is not supported" +msgstr "" +"l'utilizzo di opzioni --group multiple con lo standard input non รจ supportato" + +#: builtin/shortlog.c:144 +msgid "using --group=trailer with stdin is not supported" +msgstr "l'utilizzo di --group=trailer con lo standard input non รจ supportato" + +#: builtin/shortlog.c:388 +#, c-format +msgid "unknown group type: %s" +msgstr "tipo gruppo sconosciuto: %s" + +#: builtin/shortlog.c:416 msgid "Group by committer rather than author" msgstr "Raggruppa per persona che ha eseguito il commit anzichรฉ per autore" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:419 msgid "sort output according to the number of commits per author" msgstr "ordina l'output in base al numero di commit per autore" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:421 msgid "Suppress commit descriptions, only provides commit count" msgstr "Ometti le descrizioni dei commit, fornisci solo il numero dei commit" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:423 msgid "Show the email address of each author" msgstr "Visualizza l'indirizzo e-mail di ogni autore" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:424 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:425 msgid "Linewrap output" msgstr "Output a capo automatico" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:427 +msgid "field" +msgstr "campo" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "Raggruppa per campo" + +#: builtin/shortlog.c:456 msgid "too many arguments given outside repository" msgstr "troppi argomenti forniti oltre al repository" @@ -19600,6 +21517,14 @@ msgstr "'%s' non รจ un riferimento valido." msgid "cannot find commit %s (%s)" msgstr "impossibile trovare il commit %s (%s)" +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "algoritmo hash" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "Algoritmo hash sconosciuto" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -19648,15 +21573,89 @@ msgstr "" "visualizza i riferimenti dati sullo standard input che non sono nel " "repository locale" -#: builtin/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opzioni>" + +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:76 +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:228 +msgid "failed to create directory for sparse-checkout file" +msgstr "creazione della directory per il file sparse-checkout non riuscita" + +#: builtin/sparse-checkout.c:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "" +"impossibile aggiornare il formato repository per abilitare worktreeConfig" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "impostazione dell'opzione extensions.worktreeConfig non riuscita" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "inizializza il checkout sparse in modalitร cone" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "apertura di '%s' non riuscita" + +#: builtin/sparse-checkout.c:401 +#, c-format +msgid "could not normalize path %s" +msgstr "impossibile normalizzare il percorso '%s'" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <pattern>)" + +#: builtin/sparse-checkout.c:438 +#, 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:492 builtin/sparse-checkout.c:516 +msgid "unable to load existing sparse-checkout patterns" +msgstr "impossibile caricare i pattern sparse-checkout esistenti" + +#: builtin/sparse-checkout.c:561 +msgid "read patterns from standard in" +msgstr "leggi i pattern dallo standard input" + +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:623 +msgid "error while refreshing working directory" +msgstr "errore durante l'aggiornamento della directory di lavoro" + +#: builtin/stash.c:22 builtin/stash.c:38 msgid "git stash list [<options>]" msgstr "git stash list [<opzioni>]" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<opzioni>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -19664,25 +21663,27 @@ 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:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nome branch> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: 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 <messaggio>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<specificatore percorso>...]]" -#: builtin/stash.c:31 builtin/stash.c:84 +#: 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>]" @@ -19690,191 +21691,203 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<messaggio>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <messaggio>] [-q|--quiet] <commit>" -#: builtin/stash.c:127 +#: 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 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' non รจ un commit simile a uno stash" -#: builtin/stash.c:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "Troppe revisioni specificate:%s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "Nessuna voce di stash trovata." -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "%s non รจ un riferimento valido" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear con parametri non รจ implementato" -#: builtin/stash.c:403 +#: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" msgstr "impossibile applicare uno stash nel mezzo di un merge" -#: builtin/stash.c:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "impossibile generare il diff %s^!" -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "ci sono conflitti nell'indice. Prova senza --index." -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "impossibile salvare l'albero indice" -#: builtin/stash.c:434 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "non รจ stato possibile ripristinare i file non tracciati dallo stash" -#: builtin/stash.c:448 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "Merge di %s con %s in corso" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "L'indice non รจ stato rimosso dallo stash." -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "tenta di ricreare l'indice" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "Ho scartato %s (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Impossibile scartare la voce di stash" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' non รจ un riferimento stash" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 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:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "Nome del branch non specificato" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "Impossibile aggiornare %s con %s" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 msgid "stash message" msgstr "messaggio di stash" -#: builtin/stash.c:818 +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" richiede un argomento <commit>" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1043 msgid "No changes selected" msgstr "Nessuna modifica selezionata" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1143 msgid "You do not have the initial commit yet" msgstr "Non hai ancora un commit iniziale" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1170 msgid "Cannot save the current index state" msgstr "Impossibile salvare lo stato corrente di index" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1179 msgid "Cannot save the untracked files" msgstr "Impossibile salvare i file non tracciati" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1190 builtin/stash.c:1199 msgid "Cannot save the current worktree state" msgstr "Impossibile salvare lo stato corrente dell'albero di lavoro" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1227 msgid "Cannot record working tree state" msgstr "Impossibile registrare lo stato dell'albero di lavoro" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1276 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:1285 +#: builtin/stash.c:1292 msgid "Did you forget to 'git add'?" msgstr "Ti sei scordato di eseguire 'git add'?" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1307 msgid "No local changes to save" msgstr "Nessuna modifica locale da salvare" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1314 msgid "Cannot initialize stash" msgstr "Impossibile inizializzare stash" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1329 msgid "Cannot save the current status" msgstr "Impossibile salvare lo stato attuale" -#: builtin/stash.c:1327 +#: builtin/stash.c:1334 #, c-format msgid "Saved working directory and index state %s" msgstr "Directory di lavoro e stato indice salvati: %s" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1424 msgid "Cannot remove worktree changes" msgstr "Impossibile rimuovere le modifiche all'albero di lavoro" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1463 builtin/stash.c:1528 msgid "keep index" msgstr "mantieni l'indice" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "stash in patch mode" msgstr "esegui lo stash in modalitร patch" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "quiet mode" msgstr "modalitร silenziosa" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "include untracked files in stash" msgstr "includi i file non tracciati nello stash" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1470 builtin/stash.c:1535 msgid "include ignore files" msgstr "includi i file ignorati" -#: builtin/stash.c:1555 -#, c-format -msgid "could not exec %s" -msgstr "impossibile eseguire %s" +#: builtin/stash.c:1570 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"il supporto per stash.useBuiltin รจ stato rimosso!\n" +"Vedi la voce relativa in 'git help config' per i dettagli." #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -19892,40 +21905,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:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Atteso nome riferimento completo, ricevuto %s" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote non richiede argomenti" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "impossibile rimuovere un componente dall'URL '%s'" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "ancoraggio alternativo per i percorsi relativi" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<percorso>] [<percorso>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, 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:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Entro in '%s'\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -19934,7 +21947,7 @@ msgstr "" "run_command ha restituito un codice diverso da zero per %s\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19945,19 +21958,19 @@ msgstr "" "nei sottomoduli innestati di %s\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "Non visualizzare l'output dei comandi eseguiti in ogni sottomodulo" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" msgstr "Esegui ricorsivamente sui sottomoduli innestati" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -19966,56 +21979,56 @@ msgstr "" "impossibile trovare la configurazione '%s'. Assumo che questo repository sia " "il proprio repository autoritativo upstream." -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:666 #, 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:669 +#: builtin/submodule--helper.c:670 #, 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:679 +#: builtin/submodule--helper.c:680 #, 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:686 +#: builtin/submodule--helper.c:687 #, 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:708 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "Non visualizzare l'output dell'inizializzazione del sottomodulo" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opzioni>] [<percorso>]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, 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:824 +#: builtin/submodule--helper.c:835 #, 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:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "ricorsione nel sottomodulo '%s' non riuscita" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "Non visualizzare l'output dello stato del sottomodulo" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:887 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -20023,49 +22036,107 @@ msgstr "" "Usa il commit salvato nell'indice anzichรฉ quello salvato nell'HEAD del " "sottomodulo" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" msgstr "esegui ricorsivamente sui sottomoduli innestati" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" "git submodule status [--quiet] [--cached] [--recursive] [<percorso>...]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <percorso>" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "* %s %s(blob)->%s(sottomodulo)" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "* %s %s(sottomodulo)->%s(blob)" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "impossibile calcolare l'hash dell'oggetto da '%s'" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "modalitร %o inattesa\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "" +"usa il commit salvato nell'indice anzichรฉ quello salvato nell'HEAD del " +"sottomodulo" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" +"per confrontare il commit salvato nell'indice con quello salvato nell'HEAD " +"del sottomodulo" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "" +"ignora i sottomoduli il cui valore 'ignore_config' รจ impostato ad 'all'" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "limita le dimensioni del riassunto" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule--helper summary [<opzioni>] [<commit>] [--] [<percorso>]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "impossibile recuperare una revisione per HEAD" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "le opzioni --cached e --files sono mutualmente esclusive" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizzazione URL sottomodulo per '%s' in corso\n" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:1413 #, 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:990 +#: builtin/submodule--helper.c:1427 #, 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:1001 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "aggiornamento del remoto per il sottomodulo '%s' non riuscito" -#: builtin/submodule--helper.c:1048 +#: builtin/submodule--helper.c:1485 msgid "Suppress output of synchronizing submodule url" msgstr "" "Non visualizzare l'output della sincronizzazione dell'URL del sottomodulo" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<percorso>]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20074,7 +22145,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:1121 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -20083,182 +22154,213 @@ msgstr "" "L'albero di lavoro del sottomodulo ('%s') contiene modifiche locali; usa '-" "f' per scartarle" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directory '%s' ripulita\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1568 #, 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:1142 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "impossibile creare la directory vuota del sottomodulo %s" -#: builtin/submodule--helper.c:1158 +#: builtin/submodule--helper.c:1595 #, 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:1187 +#: builtin/submodule--helper.c:1624 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:1188 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "Annulla la registrazione di tutti i sottomoduli" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<percorso>...]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1644 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:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1713 +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:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "non รจ possibile aggiungere un alternato per il sottomodulo '%s': %s" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valore '%s' per submodule.alternateErrorStrategy non riconosciuto" -#: builtin/submodule--helper.c:1348 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valore '%s' per submodule.alternateLocation non riconosciuto" -#: builtin/submodule--helper.c:1371 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "percorso in cui sarร clonato il nuovo sottomodulo" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "nome del nuovo sottomodulo" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "URL da cui clonare il sottomodulo" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "profonditร per i cloni shallow" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "forza l'indicazione d'avanzamento della clonazione" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +msgid "disallow cloning into non-empty directory" +msgstr "disabilita il clone in una directory non vuota" + +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<percorso>] [--quiet] [--reference " -"<repository>] [--name <nome>] [--depth <profonditร >] --url <URL> --path " -"<percorso>" +"<repository>] [--name <nome>] [--depth <profonditร >] [--single-branch] --url " +"<URL> --path <percorso>" + +#: builtin/submodule--helper.c:1873 +#, 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:1424 +#: builtin/submodule--helper.c:1884 #, 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:1438 +#: builtin/submodule--helper.c:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "directory non vuota: '%s'" + +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "impossibile recuperare la directory del sottomodulo per '%s'" -#: builtin/submodule--helper.c:1474 +#: builtin/submodule--helper.c:1936 #, 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:1478 +#: builtin/submodule--helper.c:1940 #, 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:1571 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Percorso del sottomodulo ('%s') non inizializzato" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "Potresti voler usare 'update --init'." -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Ignoro il sottomodulo %s non sottoposto a merge" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "Ignoro il sottomodulo '%s'" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Clone di '%s' non riuscito. Nuovo tentativo programmato" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:2265 #, 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:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "percorso nell'albero di lavoro" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:2330 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:1858 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:2340 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:1867 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "processi da eseguire in parallelo" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "determina se il clone iniziale sarร shallow come raccomandato" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "non stampare l'indicazione di avanzamento della clonazione" -#: builtin/submodule--helper.c:1877 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +#: builtin/submodule--helper.c:2357 +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:1890 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "valore parametro aggiornamento errato" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -20267,50 +22369,86 @@ 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:2061 +#: builtin/submodule--helper.c:2541 #, 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:2094 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "esegui ricorsivamente sui sottomoduli" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opzioni>] [<percorso>...]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "controlla se รจ sicuro scrivere sul file .gitmodules" -#: builtin/submodule--helper.c:2159 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "rimuovi la configurazione nel file .gitmodules" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nome> [<valore>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nome>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 #, 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:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2681 +msgid "Suppress output for setting url of a submodule" +msgstr "Non visualizzare l'output dell'impostazione dell'URL del sottomodulo" + +#: builtin/submodule--helper.c:2685 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper set-url [--quiet] <percorso> <nuovo URL>" + +#: builtin/submodule--helper.c:2718 +msgid "set the default tracking branch to master" +msgstr "imposta il branch tracciato predefinito a master" + +#: builtin/submodule--helper.c:2720 +msgid "set the default tracking branch" +msgstr "imposta il branch tracciato predefinito" + +#: builtin/submodule--helper.c:2724 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "" +"git submodule--helper set-branch [-q|--quiet] (-d|--default) <percorso>" + +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> " +"<percorso>" + +#: builtin/submodule--helper.c:2732 +msgid "--branch or --default required" +msgstr "รจ richiesto specificare --branch o --default" + +#: builtin/submodule--helper.c:2735 +msgid "--branch and --default are mutually exclusive" +msgstr "le opzioni --branch e --default sono mutualmente esclusive" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s non supporta --super-prefix" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' non รจ un sottocomando submodule--helper valido" @@ -20337,11 +22475,11 @@ msgstr "elimina riferimento simbolico" msgid "shorten ref output" msgstr "abbrevia il riferimento nell'output" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "motivo" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "motivo dell'aggiornamento" @@ -20361,11 +22499,13 @@ msgstr "git tag -d <nome tag>..." msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" "git tag -l [-n[<numero>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <oggetto>]\n" -"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<formato>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -20435,351 +22575,355 @@ msgstr "" msgid "bad object type." msgstr "tipo oggetto errato." -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "nessun messaggio per il tag?" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "Il messaggio del tag รจ stato lasciato in %s\n" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "elenca i nomi dei tag" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "stampa le prime <n> righe di ogni messaggio tag" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "elimina tag" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "verifica tag" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "Opzioni creazione tag" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "tag annotato, richiede un messaggio" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "messaggio tag" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "forza modifica del messaggio tag" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "tag annotato e firmato con GPG" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "usa un'altra chiave per firmare il tag" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "sostituisci il tag se esiste" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "crea un registro riferimenti" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "Opzioni elenco tag" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "visualizza l'elenco dei tag in colonne" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "stampa solo i tag che contengono il commit" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "stampa solo i tag che non contengono i commit" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "stampa solo i tag sottoposti a merge" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "stampa solo i tag non sottoposti a merge" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "stampa solo i tag dell'oggetto" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "--column e -n non sono compatibili" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "l'opzione -n รจ consentita solo in modalitร elenco" -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "l'opzione --contains รจ consentita solo in modalitร elenco" -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "l'opzione --no-contains รจ consentita solo in modalitร elenco" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "l'opzione --points-at รจ consentita solo in modalitร elenco" -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" "le opzioni --merged e --no-merged sono consentite solo in modalitร elenco" -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "รจ consentita una sola opzione tra -F e -m." -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "troppi parametri" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' non รจ un nome tag valido." -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "il tag '%s' esiste giร " -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aggiornato (era %s)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "Decompressione degli oggetti in corso" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "creazione della directory %s non riuscita" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "creazione del file %s non riuscita" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "eliminazione del file %s non riuscita" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "eliminazione della directory %s non riuscita" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "Test di mtime in '%s' in corso " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 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:166 +#: builtin/update-index.c:167 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:179 +#: builtin/update-index.c:180 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:190 +#: builtin/update-index.c:191 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:201 +#: builtin/update-index.c:202 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:214 +#: builtin/update-index.c:215 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:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opzioni>] [--] [<file>...]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:974 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:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "aggiornamento: ignora i sottomoduli" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "non ignorare i nuovi file" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "consenti che dei file sostituiscano delle directory e viceversa" -#: builtin/update-index.c:981 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "nota se dei file mancano dall'albero di lavoro" -#: builtin/update-index.c:983 +#: builtin/update-index.c:986 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:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "aggiorna le informazioni stat" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "come --refresh, ma ignora l'impostazione assume-unchanged" -#: builtin/update-index.c:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<modo>,<oggetto>,<percorso>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "aggiunge la voce specificata all'indice" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "contrassegna i file come \"non saranno modificati\"" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "reimposta a zero il bit \"non saranno modificati\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "contrassegna i file come \"solamente da indicizzare\"" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "reimposta a zero il bit \"solamente da indicizzare\"" -#: builtin/update-index.c:1017 +#: 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 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:1019 +#: builtin/update-index.c:1024 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:1021 +#: builtin/update-index.c:1026 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:1023 +#: builtin/update-index.c:1028 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:1027 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "aggiungi le voci specificate sullo standard input all'indice" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1036 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:1035 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "aggiorna solo le voci differenti rispetto all'HEAD" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ignora i file mancanti nell'albero di lavoro" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "stampa le azioni sullo standard output" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "(per i comandi ad alto livello) dimentica i conflitti non risolti salvati" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "scrivi l'indice in questo formato" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "abilita o disabilita l'indice suddiviso" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "abilita/disabilita la cache non tracciata" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "verifica se il filesystem supporta la cache non tracciata" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "abilita la cache non tracciata senza testare il filesystem" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1063 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:1060 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "abilita o disabilita il monitor del filesystem" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "contrassegna i file come validi rispetto al monitor del filesystem" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "" "reimposta a zero il bit \"file validi rispetto al monitor del filesystem\"" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20787,7 +22931,7 @@ msgstr "" "core.splitIndex รจ impostato a false; rimuovilo o modificalo se vuoi " "veramente abilitare l'indice suddiviso" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20795,7 +22939,7 @@ msgstr "" "core.splitIndex รจ impostato a true; rimuovilo o modificalo se vuoi veramente " "disabilitare l'indice suddiviso" -#: builtin/update-index.c:1188 +#: 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" @@ -20803,11 +22947,11 @@ msgstr "" "core.untrackedCache รจ impostato a true; rimuovilo o modificalo se vuoi " "veramente disabilitare la cache non tracciata" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Cache non tracciata disabilitata" -#: builtin/update-index.c:1200 +#: 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" @@ -20815,29 +22959,29 @@ msgstr "" "core.untrackedCache รจ impostato a false; rimuovilo o modificalo se vuoi " "veramente abilitare la cache non tracciata" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cache non tracciata abilitata per '%s'" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1218 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:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "monitor filesystem abilitato" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1225 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:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "monitor filesystem disabilitato" @@ -20855,19 +22999,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<opzioni>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "elimina il riferimento" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "aggiorna <nome riferimento>, non ciรฒ a cui punta" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "lo standard input ha argomenti terminati da NUL" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "leggi aggiornamenti dallo standard input" @@ -20913,15 +23057,15 @@ msgstr "stampa i contenuti del commit" msgid "print raw gpg status output" msgstr "stampa l'output grezzo dello stato di GPG" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "dettagliato" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "visualizza solo le statistiche" @@ -20933,233 +23077,225 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." msgid "print tag contents" msgstr "stampa i contenuti del tag" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<opzioni>] <percorso> [<espressione commit>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<opzioni>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opzioni>] <percorso>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <albero di lavoro> <nuovo percorso>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opzioni>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<opzioni>] <albero di lavoro>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <percorso>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:970 #, c-format msgid "failed to delete '%s'" msgstr "eliminazione di '%s' non riuscita" -#: 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 +msgid "not a valid directory" +msgstr "directory non valida" -#: 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:91 +msgid "gitdir file does not exist" +msgstr "il file gitdir non esiste" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:96 builtin/worktree.c:105 #, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -msgstr "Rimuovo worktrees/%s: impossibile leggere il file gitdir (%s)" +msgid "unable to read gitdir file (%s)" +msgstr "impossibile leggere il file gitdir (%s)" -#: builtin/worktree.c:110 +#: builtin/worktree.c:115 #, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" -msgstr "" -"Rimuovo worktrees/%s: letti meno dati del previsto (attesi %<PRIuMAX>byte, " -"%<PRIuMAX> letti)" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "lettura troppo breve (attesi %<PRIuMAX> byte, letti %<PRIuMAX>)" -#: builtin/worktree.c:118 -#, c-format -msgid "Removing worktrees/%s: invalid gitdir file" -msgstr "Rimuovo worktrees/%s: file gitdir non valido" +#: builtin/worktree.c:123 +msgid "invalid gitdir file" +msgstr "file gitdir non valido" -#: builtin/worktree.c:127 +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "il file gitdir punta a un percorso non esistente" + +#: builtin/worktree.c:146 #, 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" +msgid "Removing %s/%s: %s" +msgstr "Rimuovo %s/%s: %s" -#: builtin/worktree.c:166 +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "segnala gli alberi di lavoro eliminati" -#: builtin/worktree.c:168 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "fai scadere gli alberi di lavoro piรน vecchi di <tempo>" -#: builtin/worktree.c:235 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "'%s' esiste giร " -#: builtin/worktree.c:252 +#: builtin/worktree.c:302 #, c-format -msgid "unable to re-add worktree '%s'" -msgstr "impossibile aggiungere nuovamente l'albero di lavoro '%s'" +msgid "unusable worktree destination '%s'" +msgstr "destinazione albero di lavoro non utilizzabile: '%s'" -#: builtin/worktree.c:257 +#: builtin/worktree.c:307 #, 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" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" "'%s' รจ un albero di lavoro mancante ma bloccato;\n" -"usa 'add -f -f' per eseguire l'override, o 'unlock' e 'prune' o 'remove' per " +"usa '%s -f -f' per eseguire l'override, o 'unlock' e 'prune' o 'remove' per " "rimuoverlo" -#: builtin/worktree.c:259 +#: builtin/worktree.c:309 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" "'%s' รจ un albero di lavoro mancante ma giร registrato;\n" -"usa 'add -f' per eseguire l'override, o 'prune' o 'remove' per rimuoverlo" +"usa '%s -f' per eseguire l'override, o 'prune' o 'remove' per rimuoverlo" -#: builtin/worktree.c:309 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "impossibile creare la directory di '%s'" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparazione dell'albero di lavoro in corso (nuovo branch '%s')" -#: builtin/worktree.c:442 +#: builtin/worktree.c:496 #, 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:451 +#: builtin/worktree.c:505 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparazione dell'albero di lavoro in corso (checkout di '%s')" -#: builtin/worktree.c:457 +#: builtin/worktree.c:511 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparazione dell'albero di lavoro in corso (HEAD scollegato %s)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:552 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:501 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "crea un nuovo branch" -#: builtin/worktree.c:503 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "crea o reimposta un branch" -#: builtin/worktree.c:505 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "popola il nuovo albero di lavoro" -#: builtin/worktree.c:506 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "mantieni bloccato il nuovo albero di lavoro" -#: builtin/worktree.c:509 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "imposta la modalitร tracking (vedi git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:566 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:520 +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "le opzioni -b, -B e --detach sono mutualmente esclusive" -#: builtin/worktree.c:581 +#: builtin/worktree.c:635 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:681 +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "motivo di blocco" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' non รจ un albero di lavoro" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:769 builtin/worktree.c:802 msgid "The main working tree cannot be locked or unlocked" msgstr "Non รจ possibile bloccare o sbloccare l'albero di lavoro principale" -#: builtin/worktree.c:700 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' รจ giร bloccato per questo motivo: %s" -#: builtin/worktree.c:702 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "'%s' รจ giร bloccato" -#: builtin/worktree.c:730 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "'%s' non รจ bloccato" -#: builtin/worktree.c:771 +#: builtin/worktree.c:845 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:779 +#: builtin/worktree.c:853 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:802 builtin/worktree.c:929 +#: builtin/worktree.c:876 builtin/worktree.c:1000 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' รจ un albero di lavoro principale" -#: builtin/worktree.c:807 +#: builtin/worktree.c:881 #, c-format msgid "could not figure out destination name from '%s'" msgstr "impossibile determinare il nome destinazione da '%s'" -#: builtin/worktree.c:813 -#, c-format -msgid "target '%s' already exists" -msgstr "la destinazione '%s' esiste giร " - -#: builtin/worktree.c:821 +#: builtin/worktree.c:894 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21169,7 +23305,7 @@ msgstr "" "usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:823 +#: builtin/worktree.c:896 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21178,36 +23314,37 @@ msgstr "" "usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:826 +#: builtin/worktree.c:899 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "validazione non riuscita, impossibile spostare l'albero di lavoro: %s" -#: builtin/worktree.c:831 +#: builtin/worktree.c:904 #, c-format msgid "failed to move '%s' to '%s'" msgstr "spostamento di '%s' in '%s' non riuscito" -#: builtin/worktree.c:879 +#: builtin/worktree.c:950 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "esecuzione di 'git status' su '%s' non riuscita" -#: builtin/worktree.c:883 +#: builtin/worktree.c:954 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "'%s' รจ sporco, usa --force per eliminarlo" +msgid "'%s' contains modified or untracked files, use --force to delete it" +msgstr "" +"'%s' contiene file modificati o non tracciati, usa --force per eliminarlo" -#: builtin/worktree.c:888 +#: builtin/worktree.c:959 #, 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:911 +#: builtin/worktree.c:982 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:934 +#: builtin/worktree.c:1005 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21217,7 +23354,7 @@ msgstr "" "usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:936 +#: builtin/worktree.c:1007 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21226,11 +23363,21 @@ msgstr "" "usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:939 +#: builtin/worktree.c:1010 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "validazione non riuscita, impossibile rimuovere l'albero di lavoro: %s" +#: builtin/worktree.c:1034 +#, c-format +msgid "repair: %s: %s" +msgstr "ripara: %s: %s" + +#: builtin/worktree.c:1037 +#, c-format +msgid "error: %s: %s" +msgstr "errore: %s: %s" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefisso>/]" @@ -21247,30 +23394,21 @@ msgstr "scrivi l'oggetto albero per una sottodirectory <prefisso>" msgid "only useful for debugging" msgstr "utile solo per il debug" -#: credential-cache--daemon.c:223 +#: http-fetch.c:114 #, 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 "" -"I permessi sulla directory del socket sono troppo laschi; altri\n" -"utenti potrebbero essere in grado di leggere le credenziali nella\n" -"cache. Valuta di eseguire:\n" -"\n" -"\tchmod 0700 %s" +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "l'argomento di --packfile dev'essere un hash valido (ricevuto '%s')" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "stampa i messaggi di debug sullo standard error" +#: http-fetch.c:122 +msgid "not a git repository" +msgstr "non รจ un repository Git" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "il commit %s non รจ contrassegnato come raggiungibile" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "troppi commit contrassegnati come raggiungibili" @@ -21282,7 +23420,7 @@ msgstr "test-tool serve-v2 [<opzioni>]" msgid "exit immediately after advertising capabilities" msgstr "esci subito dopo aver annunciato le funzionalitร " -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -21300,7 +23438,7 @@ msgstr "" "namespace=<nome>]\n" " <comando> [<argomenti>]" -#: git.c:34 +#: git.c:35 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" @@ -21313,47 +23451,47 @@ msgstr "" "specifici.\n" "Vedi 'git help git' per una panoramica del sistema." -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "nessuna directory specificata per --git-dir\n" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "nessuno spazio dei nomi specificato per --namespace\n" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "nessuna directory specificata per --work-tree\n" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "nessun prefisso specificato per --super-prefix\n" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "-c: attesa stringa di configurazione\n" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "nessuna directory specificata per -C\n" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "opzione sconosciuta: %s\n" -#: git.c:360 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "durante l'espansione dell'alias '%s': '%s'" -#: git.c:369 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -21362,39 +23500,39 @@ msgstr "" "l'alias '%s' modifica le variabili d'ambiente.\n" "Puoi usare '!git' nell'alias per farlo" -#: git.c:377 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "alias vuoto per %s" -#: git.c:380 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "alias ricorsivo: %s" -#: git.c:460 +#: git.c:465 msgid "write failure on standard output" msgstr "errore di scrittura sullo standard output" -#: git.c:462 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "errore di scrittura sconosciuto sullo standard output" -#: git.c:464 +#: git.c:469 msgid "close failed on standard output" msgstr "chiusura dello standard output non riuscita" -#: git.c:793 +#: git.c:819 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "rilevato ciclo alias: l'espansione di '%s' non termina:%s" -#: git.c:843 +#: git.c:869 #, c-format msgid "cannot handle %s as a builtin" msgstr "impossibile gestire %s come comando incorporato" -#: git.c:856 +#: git.c:882 #, c-format msgid "" "usage: %s\n" @@ -21403,55 +23541,55 @@ msgstr "" "uso: %s\n" "\n" -#: git.c:876 +#: git.c:902 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "espansione dell'alias '%s' non riuscita; '%s' non รจ un comando Git\n" -#: git.c:888 +#: git.c:914 #, c-format msgid "failed to run command '%s': %s\n" msgstr "esecuzione del comando '%s' non riuscita: %s\n" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "valore negativo per http.postbuffer; uso l'impostazione predefinita %d" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Il controllo delegazione non รจ supportato con cURL < 7.22.0" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Il pinning delle chiavi pubbliche non รจ supportato con cURL < 7.44.0" -#: http.c:876 +#: http.c:910 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE non รจ supportato con cURL < 7.44.0" -#: http.c:949 +#: http.c:989 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Le restrizioni protocollo non sono supportate con cURL < 7.19.4" -#: http.c:1085 +#: http.c:1132 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Backend SSL '%s' non supportato. Backend SSL supportati:" -#: http.c:1092 +#: http.c:1139 #, 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:1096 +#: http.c:1143 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Impossibile impostare il backend SSL a '%s': giร impostato" -#: http.c:1965 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21462,160 +23600,202 @@ msgstr "" " richiesta: %s\n" " redirect: %s" -#: remote-curl.c:157 +#: remote-curl.c:174 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "virgolette non valide nel valore push-option: '%s'" -#: remote-curl.c:254 +#: remote-curl.c:298 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs non valido: รจ un repository Git?" -#: remote-curl.c:355 +#: remote-curl.c:399 msgid "invalid server response; expected service, got flush packet" msgstr "" "risposta del server non valida; atteso servizio, ricevuto pacchetto flush" -#: remote-curl.c:386 +#: remote-curl.c:430 #, c-format msgid "invalid server response; got '%s'" msgstr "risposta del server non valida; ricevuto '%s'" -#: remote-curl.c:446 +#: remote-curl.c:490 #, c-format msgid "repository '%s' not found" msgstr "repository '%s' non trovato" -#: remote-curl.c:450 +#: remote-curl.c:494 #, c-format msgid "Authentication failed for '%s'" msgstr "Autenticazione non riuscita per '%s'" -#: remote-curl.c:454 +#: remote-curl.c:498 #, c-format msgid "unable to access '%s': %s" msgstr "impossibile accedere a '%s': %s" -#: remote-curl.c:460 +#: remote-curl.c:504 #, c-format msgid "redirecting to %s" msgstr "redirezione a %s in corso" -#: remote-curl.c:584 +#: remote-curl.c:633 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:664 +#: remote-curl.c:645 +msgid "remote server sent stateless separator" +msgstr "il server remoto ha inviato un separatore senza stato" + +#: remote-curl.c:715 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:724 +#: remote-curl.c:745 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curl: carattere lunghezza riga non valido: %.4s" + +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curl: pacchetto fine risposta non atteso" + +#: remote-curl.c:823 #, c-format msgid "RPC failed; %s" msgstr "RPC non riuscita; %s" -#: remote-curl.c:764 +#: remote-curl.c:863 msgid "cannot handle pushes this big" msgstr "impossibile gestire push cosรฌ grandi" -#: remote-curl.c:879 +#: remote-curl.c:978 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" "impossibile eseguire il deflate della richiesta; errore deflate zlib %d" -#: remote-curl.c:883 +#: remote-curl.c:982 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "impossibile eseguire il deflate della richiesta; errore fine zlib %d" -#: remote-curl.c:1014 +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" +msgstr "sono stati ricevuti %d byte dell'intestazione sulla lunghezza" + +#: remote-curl.c:1034 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "sono ancora attesi %d byte del corpo" + +#: remote-curl.c:1123 msgid "dumb http transport does not support shallow capabilities" msgstr "il trasporto http stupido non supporta le funzionalitร shallow" -#: remote-curl.c:1028 +#: remote-curl.c:1138 msgid "fetch failed." msgstr "recupero non riuscito." -#: remote-curl.c:1076 +#: remote-curl.c:1184 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:1120 remote-curl.c:1126 +#: remote-curl.c:1228 remote-curl.c:1234 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "errore protocollo: atteso SHA/riferimento, ricevuto '%s'" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1246 remote-curl.c:1361 #, c-format msgid "http transport does not support %s" msgstr "il trasporto HTTP non supporta %s" -#: remote-curl.c:1174 +#: remote-curl.c:1282 msgid "git-http-push failed" msgstr "git-http-push non riuscito" -#: remote-curl.c:1360 +#: remote-curl.c:1467 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: uso: git remote-curl <remoto> [<URL>]" -#: remote-curl.c:1392 +#: remote-curl.c:1499 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:1399 +#: remote-curl.c:1506 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: tentato un fetch senza un repository locale" -#: remote-curl.c:1439 +#: remote-curl.c:1547 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: ricevuto comando sconosciuto '%s' da Git" -#: list-objects-filter-options.h:61 +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "nessuna informazione sul compilatore disponibile\n" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "nessuna informazione su libc disponibile\n" + +#: list-objects-filter-options.h:91 msgid "args" msgstr "argomenti" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "filtraggio oggetti" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "data-scadenza" -#: parse-options.h:184 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "no-op (retrocompatibilitร )" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "visualizza piรน dettagli" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "visualizza meno dettagli" -#: 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:317 +msgid "use <n> digits to display object names" +msgstr "usa <n> cifre per mostrare i nomi oggetto" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "come rimuovere gli spazi e i #commenti dal messaggio" -#: ref-filter.h:101 +#: 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:96 msgid "key" msgstr "chiave" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "nome campo in base a cui ordinare" @@ -21625,11 +23805,11 @@ msgstr "" "aggiorna l'indice con la tecnica di risoluzione conflitti riutilizzata se " "possibile" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "HEAD scollegato su " -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "HEAD scollegato da " @@ -21672,688 +23852,707 @@ msgid "List, create, or delete branches" msgstr "Elenca, crea o elimina branch" #: command-list.h:59 +msgid "Collect information for user to file a bug report" +msgstr "" +"Raccogli le informazioni necessarie perchรฉ l'utente possa inviare una " +"segnalazione d'errore" + +#: command-list.h:60 msgid "Move objects and refs by archive" msgstr "Sposta oggetti e riferimenti in base a un archivio" -#: command-list.h:60 +#: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "" "Fornisci informazioni sul contenuto o sul tipo e sulle dimensioni per gli " "oggetti di un repository" -#: command-list.h:61 +#: command-list.h:62 msgid "Display gitattributes information" msgstr "Visualizza le informazioni sugli attributi Git" -#: command-list.h:62 +#: command-list.h:63 msgid "Debug gitignore / exclude files" msgstr "Esegui il debug dei file gitignore/escludi file" -#: command-list.h:63 +#: command-list.h:64 msgid "Show canonical names and email addresses of contacts" msgstr "Visualizza i nomi canonici e gli indirizzi e-mail dei contatti" -#: command-list.h:64 +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "" "Passa da un branch a un altro o ripristina i file nell'albero di lavoro" -#: command-list.h:65 +#: command-list.h:66 msgid "Copy files from the index to the working tree" msgstr "Copia dei file dall'indice all'albero di lavoro" -#: command-list.h:66 +#: command-list.h:67 msgid "Ensures that a reference name is well formed" msgstr "Si assicura che un nome riferimento sia ben formato" -#: command-list.h:67 +#: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "Trova commit che devono essere ancora applicati upstream" -#: command-list.h:68 +#: command-list.h:69 msgid "Apply the changes introduced by some existing commits" msgstr "Applica le modifiche introdotte da alcuni commit esistenti" -#: command-list.h:69 +#: command-list.h:70 msgid "Graphical alternative to git-commit" msgstr "Alternativa grafica a git-commit" -#: command-list.h:70 +#: command-list.h:71 msgid "Remove untracked files from the working tree" msgstr "Rimuove i file non tracciati dall'albero di lavoro" -#: command-list.h:71 +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "Clona un repository in una nuova directory" -#: command-list.h:72 +#: command-list.h:73 msgid "Display data in columns" msgstr "Visualizza i dati in colonne" -#: command-list.h:73 +#: command-list.h:74 msgid "Record changes to the repository" msgstr "Registra modifiche al repository" -#: command-list.h:74 +#: command-list.h:75 msgid "Write and verify Git commit-graph files" msgstr "Scrive e verifica i file grafo dei commit di Git" -#: command-list.h:75 +#: command-list.h:76 msgid "Create a new commit object" msgstr "Crea un nuovo oggetto commit" -#: command-list.h:76 +#: command-list.h:77 msgid "Get and set repository or global options" msgstr "Ottiene e imposta le opzioni a livello di repository o globali" -#: command-list.h:77 +#: command-list.h:78 msgid "Count unpacked number of objects and their disk consumption" msgstr "" "Conta il numero di oggetti non in un pack e la loro occupazione di spazio su " "disco" -#: command-list.h:78 +#: command-list.h:79 msgid "Retrieve and store user credentials" msgstr "Recupera e salva credenziali utente" -#: command-list.h:79 +#: command-list.h:80 msgid "Helper to temporarily store passwords in memory" msgstr "Helper per salvare temporaneamente password in memoria" -#: command-list.h:80 +#: command-list.h:81 msgid "Helper to store credentials on disk" msgstr "Helper per salvare credenziali su disco" -#: command-list.h:81 +#: command-list.h:82 msgid "Export a single commit to a CVS checkout" msgstr "Esporta un singolo commit in un checkout CVS" -#: command-list.h:82 +#: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" msgstr "" "Recupera i dati da un sistema di controllo di versione che le persone " "adorano odiare" -#: command-list.h:83 +#: command-list.h:84 msgid "A CVS server emulator for Git" msgstr "Un emulatore di server CVS per Git" -#: command-list.h:84 +#: command-list.h:85 msgid "A really simple server for Git repositories" msgstr "Un server veramente semplice per repository Git" -#: command-list.h:85 +#: command-list.h:86 msgid "Give an object a human readable name based on an available ref" msgstr "" "Attribuisce un nome leggibile a un oggetto basandosi su un riferimento " "disponibile" -#: command-list.h:86 +#: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Visualizza le modifiche fra commit, un commit e l'albero di lavoro, ecc." -#: command-list.h:87 +#: command-list.h:88 msgid "Compares files in the working tree and the index" msgstr "Confronta file nell'albero di lavoro e nell'indice" -#: command-list.h:88 +#: command-list.h:89 msgid "Compare a tree to the working tree or index" msgstr "Confronta un albero con l'albero di lavoro o l'indice" -#: command-list.h:89 +#: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" msgstr "" "Confronta il contenuto e i mode dei blob trovati tramite due oggetti albero" -#: command-list.h:90 +#: command-list.h:91 msgid "Show changes using common diff tools" msgstr "" "Visualizza le modifiche usando tool comuni per la visualizzazione dei diff" -#: command-list.h:91 +#: command-list.h:92 msgid "Git data exporter" msgstr "Esportatore di dati Git" -#: command-list.h:92 +#: command-list.h:93 msgid "Backend for fast Git data importers" msgstr "Backend per importatori di dati Git veloci" -#: command-list.h:93 +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "Scarica oggetti e riferimenti da un altro repository" -#: command-list.h:94 +#: command-list.h:95 msgid "Receive missing objects from another repository" msgstr "Riceve oggetti mancanti da un altro repository" -#: command-list.h:95 +#: command-list.h:96 msgid "Rewrite branches" msgstr "Riscrive branch" -#: command-list.h:96 +#: command-list.h:97 msgid "Produce a merge commit message" msgstr "Genera un messaggio di commit del merge" -#: command-list.h:97 +#: command-list.h:98 msgid "Output information on each ref" msgstr "Visualizza in output le informazioni su ogni riferimento" -#: command-list.h:98 +#: command-list.h:99 msgid "Prepare patches for e-mail submission" msgstr "Prepara patch per il loro invio tramite e-mail" -#: command-list.h:99 +#: command-list.h:100 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "Verifica la connessione e la validitร degli oggetti nel database" -#: command-list.h:100 +#: command-list.h:101 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Ripulisce file non necessari e ottimizza il repository locale" -#: command-list.h:101 +#: command-list.h:102 msgid "Extract commit ID from an archive created using git-archive" msgstr "Estrae l'ID del commit da un archivio creato usando git-archive" -#: command-list.h:102 +#: command-list.h:103 msgid "Print lines matching a pattern" msgstr "Stampa le righe corrispondenti a un'espressione regolare" -#: command-list.h:103 +#: command-list.h:104 msgid "A portable graphical interface to Git" msgstr "Un'interfaccia grafica portabile per Git" -#: command-list.h:104 +#: command-list.h:105 msgid "Compute object ID and optionally creates a blob from a file" msgstr "Calcola l'ID oggetto e crea facoltativamente un blob da un file" -#: command-list.h:105 +#: command-list.h:106 msgid "Display help information about Git" msgstr "Visualizza una guida a Git" -#: command-list.h:106 +#: command-list.h:107 msgid "Server side implementation of Git over HTTP" msgstr "Implementazione lato server di Git su HTTP" -#: command-list.h:107 +#: command-list.h:108 msgid "Download from a remote Git repository via HTTP" msgstr "Scarica dati da un repository Git remoto tramite HTTP" -#: command-list.h:108 +#: command-list.h:109 msgid "Push objects over HTTP/DAV to another repository" msgstr "Esegue il push di oggetti su un altro repository tramite HTTP/DAV" -#: command-list.h:109 +#: command-list.h:110 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "Invia un insieme di patch dallo standard input a una cartella IMAP" -#: command-list.h:110 +#: command-list.h:111 msgid "Build pack index file for an existing packed archive" msgstr "Genera il file indice pack per un archivio esistente sottoposto a pack" -#: command-list.h:111 +#: command-list.h:112 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Crea un repository Git vuoto o ne reinizializza uno esistente" -#: command-list.h:112 +#: command-list.h:113 msgid "Instantly browse your working repository in gitweb" msgstr "Sfoglia istantaneamente il tuo repository di lavoro su gitweb" -#: command-list.h:113 +#: command-list.h:114 msgid "Add or parse structured information in commit messages" msgstr "Aggiunge o analizza informazioni strutturate nei messaggi di commit" -#: command-list.h:114 +#: command-list.h:115 msgid "The Git repository browser" msgstr "Il browser per i repository Git" -#: command-list.h:115 +#: command-list.h:116 msgid "Show commit logs" msgstr "Visualizza i log dei commit" -#: command-list.h:116 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "Visualizza informazioni sui file nell'indice e nell'albero di lavoro" -#: command-list.h:117 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "Elenca i riferimenti in un repository remoto" -#: command-list.h:118 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "Elenca i contenuti di un oggetto albero" -#: command-list.h:119 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "" "Estrae la patch e le informazioni sull'autore da un singolo messaggio e-mail" -#: command-list.h:120 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "Un semplice programma per suddividere i file UNIX mbox" -#: command-list.h:121 +#: command-list.h:122 +msgid "Run tasks to optimize Git repository data" +msgstr "Esegui delle attivitร per ottimizzare i dati dei repository Git" + +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "Unisce due o piรน cronologie di sviluppo" -#: command-list.h:122 +#: command-list.h:124 msgid "Find as good common ancestors as possible for a merge" msgstr "Trova il maggior numero possibile di antenati comuni per un merge" -#: command-list.h:123 +#: command-list.h:125 msgid "Run a three-way file merge" msgstr "Esegue un merge a tre vie su file" -#: command-list.h:124 +#: command-list.h:126 msgid "Run a merge for files needing merging" msgstr "Esegue un merge per i file che lo richiedono" -#: command-list.h:125 +#: command-list.h:127 msgid "The standard helper program to use with git-merge-index" msgstr "Il programma helper standard da usare con git-merge-index" -#: command-list.h:126 +#: command-list.h:128 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" "Esegue gli strumenti di risoluzione conflitti di merge per risolvere i " "conflitti di merge" -#: command-list.h:127 +#: command-list.h:129 msgid "Show three-way merge without touching index" msgstr "Visualizza un merge a tre vie senza modificare l'indice" -#: command-list.h:128 +#: command-list.h:130 msgid "Write and verify multi-pack-indexes" msgstr "Scrive e verifica indici multi-pack" -#: command-list.h:129 +#: command-list.h:131 msgid "Creates a tag object" msgstr "Crea un oggetto tag" -#: command-list.h:130 +#: command-list.h:132 msgid "Build a tree-object from ls-tree formatted text" msgstr "Genera un oggetto albero da testo in formato ls-tree" -#: command-list.h:131 +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "Sposta o rinomina un file, una directory o un collegamento simbolico" -#: command-list.h:132 +#: command-list.h:134 msgid "Find symbolic names for given revs" msgstr "Trova i nomi simbolici per le revisioni date" -#: command-list.h:133 +#: command-list.h:135 msgid "Add or inspect object notes" msgstr "Aggiunge o esamina le note agli oggetti" -#: command-list.h:134 +#: command-list.h:136 msgid "Import from and submit to Perforce repositories" msgstr "Importa dati da, o invia dati a, repository Perforce" -#: command-list.h:135 +#: command-list.h:137 msgid "Create a packed archive of objects" msgstr "Crea un archivio di oggetti sottoposto a pack" -#: command-list.h:136 +#: command-list.h:138 msgid "Find redundant pack files" msgstr "Trova file pack ridondanti" -#: command-list.h:137 +#: command-list.h:139 msgid "Pack heads and tags for efficient repository access" msgstr "Esegue il pack di head e tag per un accesso efficiente al repository" -#: command-list.h:138 +#: command-list.h:140 msgid "Routines to help parsing remote repository access parameters" msgstr "" "Routine che aiutano ad analizzare i parametri di accesso ai repository remoti" -#: command-list.h:139 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "Calcola l'ID univoco per una patch" -#: command-list.h:140 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "Elimina tutti gli oggetti non raggiungibili dal database oggetti" -#: command-list.h:141 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "Rimuove gli oggetti aggiuntivi giร presenti nei file pack" -#: command-list.h:142 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "" "Esegue il fetch e l'integrazione con un altro repository o un branch locale" -#: command-list.h:143 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "Aggiorna i riferimenti remoti insieme agli oggetti associati" -#: command-list.h:144 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "Applica un insieme di patch quilt sul branch corrente" -#: command-list.h:145 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "Compara due intervalli di commit (ad es. due versioni di un branch)" -#: command-list.h:146 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "Legge le informazioni su un albero dall'indice" -#: command-list.h:147 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "Riapplica dei commit dopo l'ultimo commit di un branch" -#: command-list.h:148 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "Riceve quanto sottoposto a push nel repository" -#: command-list.h:149 +#: command-list.h:151 msgid "Manage reflog information" msgstr "Gestisce le informazioni del registro dei riferimenti" -#: command-list.h:150 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "Gestisce l'insieme dei repository tracciati" -#: command-list.h:151 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "Esegue il pack degli oggetti non sottoposti a pack in un repository" -#: command-list.h:152 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "Crea, elenca, elimina i riferimenti per sostituire oggetti" -#: command-list.h:153 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "Genera un riassunto delle modifiche in sospeso" -#: command-list.h:154 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "Riusa la risoluzione registrata dei merge che hanno generato conflitti" -#: command-list.h:155 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "Ripristina l'HEAD corrente allo stato specificato" -#: command-list.h:156 +#: command-list.h:158 msgid "Restore working tree files" msgstr "Ripristina i file nell'albero di lavoro" -#: command-list.h:157 +#: command-list.h:159 msgid "Revert some existing commits" msgstr "Esegue il revert di alcuni commit esistenti" -#: command-list.h:158 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "Elenca gli oggetti commit in ordine cronologico inverso" -#: command-list.h:159 +#: command-list.h:161 msgid "Pick out and massage parameters" msgstr "Sceglie e altera i parametri" -#: command-list.h:160 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "Rimuove file dall'albero di lavoro e dall'indice" -#: command-list.h:161 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "Invia un insieme di patch come e-mail" -#: command-list.h:162 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "" "Esegue il push di oggetti su un altro repository tramite il protocollo Git" -#: command-list.h:163 +#: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" msgstr "Shell di login limitata per concedere accesso SSH solo per Git" -#: command-list.h:164 +#: command-list.h:166 msgid "Summarize 'git log' output" msgstr "Riassume l'output di 'git log'" -#: command-list.h:165 +#: command-list.h:167 msgid "Show various types of objects" msgstr "Visualizza vari tipi di oggetti" -#: command-list.h:166 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "Visualizza i branch e i loro commit" -#: command-list.h:167 +#: command-list.h:169 msgid "Show packed archive index" msgstr "Visualizza l'indice di un archivio sottoposto a pack" -#: command-list.h:168 +#: command-list.h:170 msgid "List references in a local repository" msgstr "Elenca i riferimenti in un repository locale" -#: command-list.h:169 +#: command-list.h:171 msgid "Git's i18n setup code for shell scripts" msgstr "" "Codice di inizializzazione dell'internazionalizzazione di Git per gli script " "shell" -#: command-list.h:170 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "Codice comune di inizializzazione di Git per gli script shell" -#: command-list.h:171 +#: command-list.h:173 +msgid "Initialize and modify the sparse-checkout" +msgstr "Inizializza e modifica sparse-checkout" + +#: command-list.h:174 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:172 +#: command-list.h:175 msgid "Add file contents to the staging area" msgstr "Aggiunge i contenuti dei file all'area di staging" -#: command-list.h:173 +#: command-list.h:176 msgid "Show the working tree status" msgstr "Visualizza lo stato dell'albero di lavoro" -#: command-list.h:174 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "Rimuove spazi bianchi non necessari" -#: command-list.h:175 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "Inizializza, aggiorna o esamina sottomoduli" -#: command-list.h:176 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Operativitร bidirezionale tra un repository Subversion e Git" -#: command-list.h:177 +#: command-list.h:180 msgid "Switch branches" msgstr "Passa da un branch a un altro" -#: command-list.h:178 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "Legge, modifica ed elimina riferimenti simbolici" -#: command-list.h:179 +#: command-list.h:182 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:180 +#: command-list.h:183 msgid "Creates a temporary file with a blob's contents" msgstr "Crea un file temporaneo con i contenuti di un blob" -#: command-list.h:181 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "Decomprime gli oggetti da un archivio sottoposto a pack" -#: command-list.h:182 +#: command-list.h:185 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:183 +#: command-list.h:186 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:184 +#: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" msgstr "Aggiorna il file informazioni aggiuntive per aiutare i server stupidi" -#: command-list.h:185 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "Reinvia l'archivio a git-archive" -#: command-list.h:186 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "Reinvia gli oggetti sottoposti a pack a git-fetch-pack" -#: command-list.h:187 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "Visualizza una variabile logica di Git" -#: command-list.h:188 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "Verifica la firma GPG dei commit" -#: command-list.h:189 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "Convalida i file archivio sottoposti a pack di Git" -#: command-list.h:190 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "Verifica la firma GPG dei tag" -#: command-list.h:191 +#: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interfaccia Web per Git (frontend Web ai repository Git)" -#: command-list.h:192 +#: command-list.h:195 msgid "Show logs with difference each commit introduces" msgstr "" "Visualizza i registri insieme alle differenze introdotte da ciascun commit" -#: command-list.h:193 +#: command-list.h:196 msgid "Manage multiple working trees" msgstr "Gestisce alberi di lavoro multipli" -#: command-list.h:194 +#: command-list.h:197 msgid "Create a tree object from the current index" msgstr "Crea un oggetto albero dall'indice corrente" -#: command-list.h:195 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "Definizione di attributi per percorso" -#: command-list.h:196 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "Interfaccia a riga di comando di Git e convenzioni" -#: command-list.h:197 +#: command-list.h:200 msgid "A Git core tutorial for developers" msgstr "Un tutorial Git di base per gli sviluppatori" -#: command-list.h:198 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "Fornire nomi utente e password a Git" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "Git per utenti CVS" -#: command-list.h:199 +#: command-list.h:203 msgid "Tweaking diff output" msgstr "Messa a punto dell'output di diff" -#: command-list.h:200 +#: command-list.h:204 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:201 +#: command-list.h:205 +msgid "Frequently asked questions about using Git" +msgstr "Domande frequenti sull'utilizzo di Git" + +#: command-list.h:206 msgid "A Git Glossary" msgstr "Un glossario di Git" -#: command-list.h:202 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "Hook usati da Git" -#: command-list.h:203 +#: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "Specifica i file intenzionalmente non tracciati da ignorare" -#: command-list.h:204 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "Definizione proprietร sottomodulo" -#: command-list.h:205 +#: command-list.h:210 msgid "Git namespaces" msgstr "Spazi dei nomi Git" -#: command-list.h:206 +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "Programmi helper per interagire con repository remoti" + +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Struttura repository Git" -#: command-list.h:207 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "Come specificare revisioni e intervalli in Git" -#: command-list.h:208 +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "Monto un repository dentro un altro" + +#: command-list.h:215 msgid "A tutorial introduction to Git: part two" msgstr "Un tutorial introduttivo per Git: seconda parte" -#: command-list.h:209 +#: command-list.h:216 msgid "A tutorial introduction to Git" msgstr "Un tutorial introduttivo per Git" -#: command-list.h:210 +#: command-list.h:217 msgid "An overview of recommended workflows with Git" msgstr "Una panoramica dei flussi di lavoro raccomandati in Git" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "Devi iniziare con \"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 "Vuoi che me ne occupi io [Y/n]? " - -#: git-bisect.sh:101 +#: git-bisect.sh:79 #, sh-format msgid "Bad rev input: $arg" msgstr "Revisione fornita non valida: $arg" -#: git-bisect.sh:121 +#: git-bisect.sh:99 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Revisione fornita non valida: $bisected_head" -#: git-bisect.sh:130 +#: git-bisect.sh:108 #, sh-format msgid "Bad rev input: $rev" msgstr "Revisione fornita non valida: $rev" -#: git-bisect.sh:139 +#: git-bisect.sh:117 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' richiede un solo argomento." -#: git-bisect.sh:209 +#: git-bisect.sh:149 msgid "No logfile given" msgstr "Nessun file di log specificato" -#: git-bisect.sh:210 +#: git-bisect.sh:150 #, sh-format msgid "cannot read $file for replaying" msgstr "impossibile leggere $file per rieseguire i comandi contenuti" -#: git-bisect.sh:232 +#: git-bisect.sh:173 msgid "?? what are you talking about?" msgstr "?? di cosa stai parlando?" -#: git-bisect.sh:241 +#: git-bisect.sh:183 msgid "bisect run failed: no command provided." msgstr "esecuzione di bisect non riuscita: nessun comando fornito." -#: git-bisect.sh:246 +#: git-bisect.sh:188 #, sh-format msgid "running $command" msgstr "esecuzione di $command in corso" -#: git-bisect.sh:253 +#: git-bisect.sh:195 #, sh-format msgid "" "bisect run failed:\n" @@ -22362,11 +24561,11 @@ msgstr "" "esecuzione di bisect non riuscita:\n" "il codice di uscita $res da '$command' รจ < 0 oppure >= 128" -#: git-bisect.sh:279 +#: git-bisect.sh:221 msgid "bisect run cannot continue any more" msgstr "l'esecuzione di bisect non puรฒ piรน proseguire" -#: git-bisect.sh:285 +#: git-bisect.sh:227 #, sh-format msgid "" "bisect run failed:\n" @@ -22375,11 +24574,11 @@ msgstr "" "esecuzione di bisect non riuscita:\n" "'bisect_state $state' รจ uscito con il codice di errore $res" -#: git-bisect.sh:292 +#: git-bisect.sh:234 msgid "bisect run success" msgstr "esecuzione di bisect completata con successo" -#: git-bisect.sh:300 +#: git-bisect.sh:242 msgid "We are not bisecting." msgstr "Non stiamo eseguendo una bisezione." @@ -22423,144 +24622,50 @@ 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:220 -msgid "Cannot remove temporary index (can't happen)" -msgstr "Impossibile rimuovere l'indice temporaneo (non puรฒ succedere)" - -#: 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:323 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "errore: opzione sconosciuta per 'stash push': $option" - -#: 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:535 -#, sh-format -msgid "unknown option: $opt" -msgstr "opzione sconosciuta: $opt" - -#: git-legacy-stash.sh:555 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "Troppe revisioni specificate: $REV" - -#: git-legacy-stash.sh:570 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "$reference non รจ un riferimento valido" - -#: 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:609 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "'$args' non รจ un riferimento a uno stash" - -#: git-legacy-stash.sh:617 -msgid "unable to refresh index" -msgstr "impossibile aggiornare l'indice" - -#: 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:629 -msgid "Conflicts in index. Try without --index." -msgstr "Ci sono conflitti in index. Prova senza --index." - -#: git-legacy-stash.sh:631 -msgid "Could not save index tree" -msgstr "Non รจ stato possibile salvare l'albero indice" - -#: 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:665 -msgid "Cannot unstage modified files" -msgstr "Non รจ stato possibile rimuovere i file modificati dall'area di staging" - -#: git-legacy-stash.sh:703 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "${REV} eliminata ($s)" - -#: 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:791 -msgid "(To restore them type \"git stash apply\")" -msgstr "(Per ripristinarli digita \"git stash apply\")" - -#: git-submodule.sh:200 +#: git-submodule.sh:180 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:210 +#: git-submodule.sh:190 #, 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:229 +#: git-submodule.sh:209 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' esiste giร nell'indice" -#: git-submodule.sh:232 +#: git-submodule.sh:212 #, 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:239 +#: git-submodule.sh:219 #, 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: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 +#: git-submodule.sh:250 #, 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:270 +#: git-submodule.sh:252 #, 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:278 +#: git-submodule.sh:260 #, 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:280 +#: git-submodule.sh:262 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22577,39 +24682,39 @@ msgstr "" "altro\n" "nome con l'opzione '--name'." -#: git-submodule.sh:286 +#: git-submodule.sh:268 #, 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:298 +#: git-submodule.sh:280 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossibile eseguire il checkout del sottomodulo '$sm_path'" -#: git-submodule.sh:303 +#: git-submodule.sh:285 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Aggiunta del sottomodulo '$sm_path' non riuscita" -#: git-submodule.sh:312 +#: git-submodule.sh:294 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Registrazione del sottomodulo '$sm_path' non riuscita" -#: git-submodule.sh:573 +#: git-submodule.sh:567 #, 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:583 +#: git-submodule.sh:577 #, 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:588 +#: git-submodule.sh:582 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -22618,7 +24723,7 @@ msgstr "" "Impossibile trovare la revisione corrente per ${remote_name}/${branch} nel " "percorso del sottomodulo '$sm_path'" -#: git-submodule.sh:606 +#: git-submodule.sh:600 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -22627,7 +24732,7 @@ msgstr "" "Impossibile eseguire il fetch nel percorso del sottomodulo '$displaypath'; " "provo a recuperare direttamente $sha1:" -#: git-submodule.sh:612 +#: git-submodule.sh:606 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -22636,84 +24741,59 @@ msgstr "" "Fetch eseguito nel percorso del sottomodulo '$displaypath', ma non conteneva " "$sha1. Fetch diretto di tale commit non riuscito." -#: git-submodule.sh:619 +#: git-submodule.sh:613 #, 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:620 +#: git-submodule.sh:614 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Percorso del sottomodulo '$displaypath': eseguito checkout di '$sha1'" -#: git-submodule.sh:624 +#: git-submodule.sh:618 #, 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:625 +#: git-submodule.sh:619 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Percorso del sottomodulo '$displaypath': eseguito rebase su '$sha1'" -#: git-submodule.sh:630 +#: git-submodule.sh:624 #, 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:631 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Percorso del sottomodulo '$displaypath': eseguito merge in '$sha1'" -#: git-submodule.sh:636 +#: git-submodule.sh:630 #, 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:637 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Percorso del sottomodulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:668 +#: git-submodule.sh:662 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Ricorsione nel percorso del sottomodulo '$displaypath' non riuscita" -#: 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:882 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "modalitร $mod_dst inattesa" - -#: 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: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:908 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" -" Attenzione: $display_name non contiene i commit $sha1_src e $sha1_dst" - #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." @@ -22728,12 +24808,22 @@ msgstr "Stash automatico applicato." msgid "Cannot store $stash_sha1" msgstr "Impossibile memorizzare $stash_sha1" +#: git-rebase--preserve-merges.sh:113 +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 "" +"L'applicazione dello stash automatico ha generato conflitti.\n" +"Le tue modifiche sono al sicuro nello stash.\n" +"Puoi eseguire \"git stash pop\" o \"git stash drop\" in qualunque momento.\n" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Rebase in corso ($new_count/$total)" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -22775,7 +24865,7 @@ msgstr "" "Queste righe possono essere riordinate; saranno eseguite dalla prima " "all'ultima.\n" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -22794,85 +24884,85 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: non รจ un commit che possa essere scelto" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nome commit non valido: $sha1" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "" "Impossibile scrivere lo SHA1 del commit che dovrebbe sostituire quello " "corrente" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "Fast forward a $sha1" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Impossibile eseguire il fast forward a $sha1" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Impossibile spostare l'HEAD a $first_parent" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Mi rifiuto di eseguire lo squash di un merge: $sha1" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "Errore durante la riesecuzione del merge di $sha1" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "Impossibile scegliere $sha1" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "Questo รจ il messaggio di commit numero ${n}:" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Il messaggio di commit numero ${n} sarร saltato:" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Questa รจ una combinazione di $count commit." msgstr[1] "Questa รจ una combinazione di $count commit." -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Impossibile scrivere $fixup_msg" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "Questa รจ una combinazione di 2 commit." -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Impossibile applicare $sha1... $rest" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -22887,31 +24977,31 @@ msgstr "" "potrebbe essere necessario risolvere il problema evidenziato per essere in\n" "grado di modificare il messaggio di commit." -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Fermato a $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Impossibile eseguire '$squash_style' senza un commit precedente" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "Eseguo $rest" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "Esecuzione non riuscita: $rest" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "e sono state apportate modifiche all'indice e/o all'albero di lavoro" -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -22922,7 +25012,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -22937,25 +25027,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Comando sconosciuto: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Correggi la situazione usando 'git rebase --edit-todo'." -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Rebase e aggiornamento di $head_name eseguiti con successo." -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "impossibile rimuovere CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -22986,13 +25076,13 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "" "Errore durante la ricerca dell'identitร dell'autore per la modifica del " "commit" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -23001,40 +25091,44 @@ msgstr "" "di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n" "--continue'." -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "Impossibile eseguire il commit delle modifiche in staging." -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "Impossibile eseguire l'editor" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "Impossibile eseguire il checkout di $switch_to" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "Nessun'HEAD?" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Impossibile creare la directory temporanea $state_dir" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "Impossibile contrassegnare come interattivo" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" 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:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:945 +msgid "Note that empty commits are commented out" +msgstr "Nota che i commit vuoti sono commentati" + +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "Impossibile inizializzare i commit riscritti" @@ -23110,81 +25204,19 @@ 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:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%20s %32s %s" -#: 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 +#: git-add--interactive.perl:634 #, 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: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 +#: git-add--interactive.perl:1058 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -23192,7 +25224,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:1054 +#: git-add--interactive.perl:1061 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -23200,7 +25232,7 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarร \n" "contrassegnato immediatamente per lo stash." -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1064 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -23208,8 +25240,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:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -23217,8 +25249,8 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarร \n" "contrassegnato immediatamente per l'applicazione." -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -23226,18 +25258,12 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarร \n" "contrassegnato immediatamente per la rimozione." -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1116 #, 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: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 +#: git-add--interactive.perl:1123 #, perl-format msgid "" "---\n" @@ -23250,36 +25276,12 @@ msgstr "" "Per rimuovere '%s' righe, eliminale.\n" "Le righe che iniziano con %s saranno rimosse.\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 "" -"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 +#: git-add--interactive.perl:1145 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "apertura del file di modifica hunk in lettura non riuscita: %s" -#. 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 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -23296,7 +25298,7 @@ msgstr "" "d - non aggiungere nรฉ quest'hunk nรฉ quelli successivi nel file all'area di " "staging" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -23310,7 +25312,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:1258 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -23327,7 +25329,7 @@ msgstr "" "d - non rimuovere nรฉ quest'hunk nรฉ quelli successivi nel file dall'area di " "staging" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -23341,7 +25343,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:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -23355,7 +25357,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:1276 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23369,7 +25371,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:1282 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23383,7 +25385,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:1294 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23397,7 +25399,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:1309 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23421,234 +25423,90 @@ msgstr "" "e - modifica manualmente l'hunk corrente\n" "? - stampa una guida\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1347 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: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 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignoro ciรฒ che non รจ stato sottoposto a merge: %s\n" -#: 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 +#: git-add--interactive.perl:1481 #, 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:1467 +#: git-add--interactive.perl:1482 #, 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:1468 +#: git-add--interactive.perl:1483 +#, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Applicare l'aggiunta all'albero di lavoro [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1484 #, 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:1568 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "Nessun altro hunk a cui andare\n" -#: 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 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Numero non valido: '%s'\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1624 #, 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:1617 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "Nessun altro hunk in cui ricercare\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "cercare un'espressione regolare? " - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Espressione regolare di ricerca %s malformata: %s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "Nessun hunk corrisponde al pattern fornito\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "Nessun hunk precedente\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "Nessun hunk successivo\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "Mi dispiace, non posso suddividere quest'hunk\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1738 #, 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:1706 +#: git-add--interactive.perl:1748 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:1771 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23668,19 +25526,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: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 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 msgid "missing --" msgstr "-- mancante" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1861 #, perl-format msgid "unknown --patch mode: %s" msgstr "modalitร --patch sconosciuta: %s" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argomento %s non valido, atteso --" @@ -23699,27 +25557,38 @@ msgstr "l'offset del fuso orario locale รจ maggiore o uguale a 24 ore\n" msgid "the editor exited uncleanly, aborting everything" msgstr "l'editor non รจ terminato regolarmente, interrompo tutte le operazioni" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "'%s' contiene una versione intermedia dell'e-mail che stavi componendo.\n" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contiene l'e-mail composta.\n" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases non รจ compatibile con altre opzioni\n" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"errore fatale: sono state trovate opzioni di configurazione per 'sendmail'\n" +"git-send-email รจ configurato con le opzioni sendemail.* - nota la 'e'.\n" +"Imposta sendemail.forbidSendmailVariables a false per disabilitare questo " +"controllo.\n" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Impossibile eseguire git format-patch al di fuori di un repository\n" -#: git-send-email.perl:484 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -23727,37 +25596,37 @@ msgstr "" "`batch-size` e `relogin` devono essere specificati insieme (sulla riga di " "comando o tramite un'opzione di configurazione)\n" -#: git-send-email.perl:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Campo --suppress-cc sconosciuto: '%s'\n" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Impostazione --confirm sconosciuta: '%s'\n" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "attenzione: non sono supportati alias sendmail con virgolette: %s\n" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "attenzione: `:include:` non supportato: %s\n" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "attenzione: redirezioni `/file` o `|pipe` non supportate: %s\n" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "attenzione: riga sendmail non riconosciuta: %s\n" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -23774,12 +25643,12 @@ msgstr "" " * ...fornendo l'opzione --format-patch se ti riferisci\n" " a un intervallo.\n" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "opendir di %s non riuscita: %s" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -23788,7 +25657,7 @@ msgstr "" "errore fatale: %s: %s\n" "attenzione: non รจ stata inviata alcuna patch\n" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -23798,17 +25667,17 @@ msgstr "" "Nessun file patch specificato!\n" "\n" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "Riga oggetto assente in %s?" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Apertura di %s in scrittura non riuscita: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -23822,27 +25691,27 @@ msgstr "" "\n" "Rimuovi il corpo se non vuoi inviare un sommario.\n" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "Apertura di %s non riuscita: %s" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Apertura di %s.final non riuscita: %s" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "E-mail riassuntiva vuota, la ometto\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Usare <%s> [y/N]? " -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -23850,11 +25719,11 @@ msgstr "" "I seguenti file sono codificati a 8 bit ma non dichiarano un Content-" "Transfer-Encoding.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Che codifica a 8 bit devo dichiarare [UTF-8]? " -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -23867,24 +25736,24 @@ msgstr "" "ha come oggetto nel modello '*** SUBJECT HERE ***'. Fornisci l'opzione --" "force se vuoi veramente procedere con l'invio.\n" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "" "A chi dovranno essere inviate le e-mail (se devono essere inviate a " "qualcuno)?" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "errore fatale: l'alias '%s' si espande in se stesso\n" -#: git-send-email.perl:975 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID da usare nell'intestazione In-Reply-To per la prima e-mail (se " "dev'essere usato)? " -#: git-send-email.perl:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "errore: impossibile estrarre un indirizzo valido da %s\n" @@ -23892,17 +25761,17 @@ msgstr "errore: impossibile estrarre un indirizzo valido da %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 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" "Cosa devo fare con quest'indirizzo? (Esci [q]|scarta [d]|modifica [e]): " -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Il percorso CA \"%s\" non esiste" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -23931,135 +25800,543 @@ msgstr "" #. 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 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" "Inviare quest'e-mail? (Sรฌ [y]|[n]o|modifica [e]|esci [q]|invia tutte [a]): " -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "ร richiesta una risposta alla richiesta di invio e-mail" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "Il server SMTP richiesto non รจ definito in modo adeguato." -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Il server non supporta STARTTLS! %s" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS non riuscito! %s" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Impossibile inizializzare SMTP in modo adeguato. Controlla la configurazione " "e usa --smtp-debug." -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "Invio di %s non riuscito\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test invio %s riuscito\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "%s inviato\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "Esecuzione di prova riuscita. Il registro รจ il seguente:\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "Operazione riuscita. Il registro รจ il seguente:\n" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "Risultato: " -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "Risultato: OK\n" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "impossibile aprire il file %s" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Aggiungo cc: %s dalla riga '%s'\n" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Aggiungo to: %s dalla riga '%s'\n" -#: git-send-email.perl:1718 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non mbox) Aggiungo cc: %s dalla riga '%s'\n" -#: git-send-email.perl:1753 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(corpo) Aggiungo cc: %s dalla riga '%s'\n" -#: git-send-email.perl:1864 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Impossibile eseguire '%s'" -#: git-send-email.perl:1871 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Aggiungo %s: %s da: '%s'\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) chiusura della pipe a '%s' non riuscita" -#: git-send-email.perl:1905 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "impossibile inviare il messaggio con codifica a 7 bit" -#: git-send-email.perl:1913 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "codifica di trasferimento non valida" -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "impossibile aprire %s: %s\n" -#: git-send-email.perl:1957 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: la patch contiene una riga piรน lunga di 998 caratteri" -#: git-send-email.perl:1974 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Salto %s con il suffisso di backup '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1978 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Inviare %s? [y|N]: " +#~ msgid "unknown hash algorithm length" +#~ msgstr "lunghezza algoritmo hash sconosciuta" + +#~ 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" + +#~ msgid "Writing changed paths Bloom filters index" +#~ msgstr "" +#~ "Scrittura dell'indice dei filtri di Bloom per i percorsi modificati in " +#~ "corso" + +#, c-format +#~ msgid "hash version %u does not match" +#~ msgstr "la versione dell'hash %u non corrisponde" + +#~ msgid "Remote with no URL" +#~ msgstr "Remoto senza URL" + +#, c-format +#~ msgid "%%(subject) does not take arguments" +#~ msgstr "%%(subject) non accetta argomenti" + +#, c-format +#~ msgid "positive value expected objectname:short=%s" +#~ msgstr "atteso valore positivo in objectname:short=%s" + +#, c-format +#~ msgid "unrecognized %%(objectname) argument: %s" +#~ msgstr "argomento %%(objectname) non riconosciuto: %s" + +#, c-format +#~ msgid "option `%s' is incompatible with --merged" +#~ msgstr "l'opzione `%s' non รจ compatibile con --merged" + +#, c-format +#~ msgid "option `%s' is incompatible with --no-merged" +#~ msgstr "l'opzione `%s' non รจ compatibile con --no-merged" + +#, c-format +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "impossibile aprire '%s' in scrittura: %s" + +#, c-format +#~ msgid "could not read ref '%s'" +#~ msgstr "impossibile leggere il riferimento '%s'" + +#, c-format +#~ msgid "ref '%s' already exists" +#~ msgstr "il riferimento '%s' esiste giร " + +#, c-format +#~ msgid "unexpected object ID when writing '%s'" +#~ msgstr "ID oggetto inatteso durante la scrittura di '%s'" + +#, c-format +#~ msgid "unexpected object ID when deleting '%s'" +#~ msgstr "ID oggetto inatteso durante l'eliminazione di '%s'" + +#, c-format +#~ msgid "The hash algorithm %s is not supported in this build." +#~ msgstr "L'algoritmo hash %s non รจ supportato in questa compilazione." + +#~ msgid "could not open the file BISECT_TERMS" +#~ msgstr "impossibile aprire il file BISECT_TERMS" + +#~ msgid "update BISECT_HEAD instead of checking out the current commit" +#~ msgstr "" +#~ "aggiorna BISECT_HEAD anzichรฉ eseguire il checkout del commit corrente" + +#~ msgid "print only names (no SHA-1)" +#~ msgstr "stampa solo i nomi (non lo SHA-1)" + +#~ msgid "passed to 'git am'" +#~ msgstr "passato a 'git am'" + +#~ msgid "The --cached option cannot be used with the --files option" +#~ msgstr "L'opzione --cached non puรฒ essere usata con l'opzione --files" + +#, sh-format +#~ msgid " Warn: $display_name doesn't contain commit $sha1_src" +#~ msgstr " Attenzione: $display_name non contiene il commit $sha1_src" + +#, sh-format +#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst" +#~ msgstr " Attenzione: $display_name non contiene il commit $sha1_dst" + +#, sh-format +#~ msgid "" +#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +#~ msgstr "" +#~ " Attenzione: $display_name non contiene i commit $sha1_src e $sha1_dst" + +#, c-format +#~ msgid "Finding commits for commit graph from %d ref" +#~ msgid_plural "Finding commits for commit graph from %d refs" +#~ msgstr[0] "" +#~ "Ricerca dei commit per il grafo dei commit da %d riferimento in corso" +#~ msgstr[1] "" +#~ "Ricerca dei commit per il grafo dei commit da %d riferimenti in corso" + +#, c-format +#~ msgid "invalid commit object id: %s" +#~ msgstr "ID oggetto commit non valido: %s" + +#, c-format +#~ msgid "Removing worktrees/%s: not a valid directory" +#~ msgstr "Rimuovo worktrees/%s: non รจ una directory valida" + +#, c-format +#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +#~ msgstr "Rimuovo worktrees/%s: impossibile leggere il file gitdir (%s)" + +#, c-format +#~ msgid "Removing worktrees/%s: invalid gitdir file" +#~ msgstr "Rimuovo worktrees/%s: file gitdir non valido" + +#, c-format +#~ msgid "unable to re-add worktree '%s'" +#~ msgstr "impossibile aggiungere nuovamente l'albero di lavoro '%s'" + +#, c-format +#~ msgid "target '%s' already exists" +#~ msgstr "la destinazione '%s' esiste giร " + +#, c-format +#~ msgid "" +#~ "Cannot update sparse checkout: the following entries are not up to date:\n" +#~ "%s" +#~ msgstr "" +#~ "Impossibile aggiornare il checkout sparse: le seguenti voci non sono " +#~ "aggiornate:\n" +#~ "%s" + +#, c-format +#~ msgid "" +#~ "The following working tree files would be overwritten by sparse checkout " +#~ "update:\n" +#~ "%s" +#~ msgstr "" +#~ "I seguenti file dell'albero di lavoro sarebbero sovrascritti con " +#~ "l'aggiornamento del checkout sparse:\n" +#~ "%s" + +#, c-format +#~ msgid "" +#~ "The following working tree files would be removed by sparse checkout " +#~ "update:\n" +#~ "%s" +#~ msgstr "" +#~ "I seguenti file dell'albero di lavoro sarebbero eliminati con " +#~ "l'aggiornamento del checkout sparse:\n" +#~ "%s" + +#, c-format +#~ msgid "annotated tag %s has no embedded name" +#~ msgstr "il tag annotato %s non ha un nome incorporato" + +#~ msgid "automatically stash/stash pop before and after rebase" +#~ msgstr "esegui stash/stash pop automaticamente prima e dopo il rebase" + +#~ msgid "--[no-]autostash option is only valid with --rebase." +#~ msgstr "l'opzione --[no-]autostash option รจ valida solo con --rebase." + +#~ msgid "(DEPRECATED) keep empty commits" +#~ msgstr "(DEPRECATO) mantieni i commit vuoti" + +#, c-format +#~ msgid "Could not read '%s'" +#~ msgstr "Impossibile leggere '%s'" + +#, c-format +#~ msgid "Cannot store %s" +#~ msgstr "Impossibile memorizzare %s" + +#~ msgid "initialize sparse-checkout" +#~ msgstr "inizializza sparse-checkout" + +#~ msgid "set sparse-checkout patterns" +#~ msgstr "imposta i pattern sparse-checkout" + +#~ msgid "disable sparse-checkout" +#~ msgstr "disabilita sparse-checkout" + +#, c-format +#~ msgid "could not exec %s" +#~ msgstr "impossibile eseguire %s" + +#~ msgid "Cannot remove temporary index (can't happen)" +#~ msgstr "Impossibile rimuovere l'indice temporaneo (non puรฒ succedere)" + +#, sh-format +#~ msgid "Cannot update $ref_stash with $w_commit" +#~ msgstr "Impossibile aggiornare $ref_stash con $w_commit" + +#, sh-format +#~ msgid "error: unknown option for 'stash push': $option" +#~ msgstr "errore: opzione sconosciuta per 'stash push': $option" + +#, sh-format +#~ msgid "Saved working directory and index state $stash_msg" +#~ msgstr "Directory di lavoro e stato indice salvati: $stash_msg" + +#, sh-format +#~ msgid "unknown option: $opt" +#~ msgstr "opzione sconosciuta: $opt" + +#, sh-format +#~ msgid "Too many revisions specified: $REV" +#~ msgstr "Troppe revisioni specificate: $REV" + +#, sh-format +#~ msgid "$reference is not a valid reference" +#~ msgstr "$reference non รจ un riferimento valido" + +#, sh-format +#~ msgid "'$args' is not a stash-like commit" +#~ msgstr "'$args' non รจ un commit di tipo stash" + +#, sh-format +#~ msgid "'$args' is not a stash reference" +#~ msgstr "'$args' non รจ un riferimento a uno stash" + +#~ msgid "unable to refresh index" +#~ msgstr "impossibile aggiornare l'indice" + +#~ msgid "Cannot apply a stash in the middle of a merge" +#~ msgstr "Impossibile applicare uno stash nel mezzo di un merge" + +#~ msgid "Conflicts in index. Try without --index." +#~ msgstr "Ci sono conflitti in index. Prova senza --index." + +#~ msgid "Could not save index tree" +#~ msgstr "Non รจ stato possibile salvare l'albero indice" + +#~ msgid "Could not restore untracked files from stash entry" +#~ msgstr "" +#~ "Non รจ stato possibile ripristinare i file non tracciati dalla voce stash" + +#~ msgid "Cannot unstage modified files" +#~ msgstr "" +#~ "Non รจ stato possibile rimuovere i file modificati dall'area di staging" + +#, sh-format +#~ msgid "Dropped ${REV} ($s)" +#~ msgstr "${REV} eliminata ($s)" + +#, sh-format +#~ msgid "${REV}: Could not drop stash entry" +#~ msgstr "${REV}: non รจ stato possibile rimuovere la voce di stash" + +#~ msgid "(To restore them type \"git stash apply\")" +#~ msgstr "(Per ripristinarli digita \"git stash apply\")" + +#~ 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" + +#, 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 "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." @@ -24133,9 +26410,6 @@ 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" @@ -24157,9 +26431,6 @@ msgstr "Inviare %s? [y|N]: " #~ msgid "unrecognized verb: %s" #~ msgstr "verbo non riconosciuto: %s" -#~ msgid "hash version %X does not match version %X" -#~ msgstr "la versione dell'hash %X non corrisponde alla versione %X" - #~ msgid "option '%s' requires a value" #~ msgstr "l'opzione '%s' richiede un valore" @@ -24242,9 +26513,6 @@ msgstr "Inviare %s? [y|N]: " #~ msgid "Can't stat %s" #~ msgstr "impossibile eseguire lo stat di '%s'" -#~ msgid "No such remote: %s" -#~ msgstr "Remote non esistente: %s" - #~ msgid " %d file changed" #~ msgid_plural " %d files changed" #~ msgstr[0] " %d file modificato" diff --git a/third_party/git/po/pt_PT.po b/third_party/git/po/pt_PT.po index 8a2d55a8b6..61ff13f028 100644 --- a/third_party/git/po/pt_PT.po +++ b/third_party/git/po/pt_PT.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-04-23 09:54+0800\n" +"POT-Creation-Date: 2020-10-10 09:32+0800\n" "PO-Revision-Date: 2017-05-01 21:17+0000\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese\n" @@ -20,38 +20,797 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Virtaal 0.7.1\n" -#: advice.c:55 +#: add-interactive.c:368 +#, fuzzy, c-format +msgid "Huh (%s)?" +msgstr "O quรช (%s)?\n" + +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +msgid "could not read index" +msgstr "nรฃo foi possรญvel ler o รญndice" + +#: add-interactive.c:576 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "binรกrio" + +#: 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 "nรฃo alterado" + +#: add-interactive.c:672 git-add--interactive.perl:643 +msgid "Update" +msgstr "Atualizar" + +#: add-interactive.c:689 add-interactive.c:877 +#, fuzzy, c-format +msgid "could not stage '%s'" +msgstr "nรฃo foi possรญvel obter stat de '%s'" + +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444 +#, fuzzy +msgid "could not write index" +msgstr "nรฃo foi possรญvel ler o รญ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] "%d caminho atualizado\n" +msgstr[1] "%d caminhos atualizados\n" + +#: add-interactive.c:716 git-add--interactive.perl:678 +#, c-format, perl-format +msgid "note: %s is untracked now.\n" +msgstr "nota: %s รฉ agora nรฃo controlado.\n" + +#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "falha ao invocar make_cache_entry em '%s'" + +#: add-interactive.c:751 git-add--interactive.perl:655 +msgid "Revert" +msgstr "Reverter" + +#: add-interactive.c:767 +#, fuzzy +msgid "Could not parse HEAD^{tree}" +msgstr "nรฃo foi possรญvel analisar o commit 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 caminho revertido\n" +msgstr[1] "%d caminhos revertidos\n" + +#: add-interactive.c:856 git-add--interactive.perl:695 +#, c-format +msgid "No untracked files.\n" +msgstr "Nenhum ficheiros nรฃo controlado.\n" + +#: add-interactive.c:860 git-add--interactive.perl:689 +msgid "Add untracked" +msgstr "Adicionar nรฃo controlados" + +#: 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 caminho adicionar\n" +msgstr[1] "%d caminhos adicionados\n" + +#: add-interactive.c:917 +#, fuzzy, c-format +msgid "ignoring unmerged: %s" +msgstr "ignorado nรฃo integrado: %s\n" + +#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Apenas ficheiros binรกrios alterados.\n" + +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "Sem alteraรงรตes.\n" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "Atualizar patch" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +msgid "Review diff" +msgstr "Rever diff" + +#: add-interactive.c:1002 +#, fuzzy +msgid "show paths with changes" +msgstr "mostrar ficheiros com correspondรชncias no paginador" + +#: 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 +#, fuzzy +msgid "pick hunks and update selectively" +msgstr "selecionar blocos interativamente" + +#: add-interactive.c:1010 +#, fuzzy +msgid "view diff between HEAD and index" +msgstr "repor HEAD e รญndice" + +#: 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 +#, fuzzy +msgid "select a single item" +msgstr "selecionar pai principal" + +#: add-interactive.c:1024 +#, fuzzy +msgid "select a range of items" +msgstr "selecionar o tratamento de tags assinadas" + +#: add-interactive.c:1026 +#, fuzzy +msgid "select multiple ranges" +msgstr "%s tem mรบltiplos valores" + +#: add-interactive.c:1028 add-interactive.c:1073 +msgid "select item based on unique prefix" +msgstr "" + +#: add-interactive.c:1030 +#, fuzzy +msgid "unselect specified items" +msgstr "usar ficheiro de modelo especificado" + +#: 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:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "*** Comandos ***" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +msgid "What now" +msgstr "E agora" + +#: add-interactive.c:1136 git-add--interactive.perl:213 +msgid "staged" +msgstr "preparado" + +#: add-interactive.c:1136 git-add--interactive.perl:213 +msgid "unstaged" +msgstr "nรฃo preparado" + +#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: git-add--interactive.perl:213 +msgid "path" +msgstr "caminho" + +#: add-interactive.c:1143 +#, fuzzy +msgid "could not refresh index" +msgstr "nรฃo foi possรญvel ler o รญndice" + +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805 #, c-format -msgid "hint: %.*s\n" +msgid "Bye.\n" +msgstr "Adeus.\n" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, fuzzy, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Preparar alteraรงรฃo de modo [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:35 git-add--interactive.perl:1434 +#, fuzzy, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Preparar eliminaรงรฃo [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:36 git-add--interactive.perl:1435 +#, fuzzy, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "Preparar eliminaรงรฃo [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, fuzzy, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Preparar este excerto [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:39 +#, fuzzy +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" +"Se o patch se aplicar corretamente, o excerto editado serรก marcado\n" +"como preparado imediatamente." + +#: add-patch.c:42 +#, fuzzy +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 - preparar este excerto\n" +"n - nรฃo preparar este excerto\n" +"q - sair; nรฃo preparar este excerto nem os restantes\n" +"a - preparar este excerto e todos os excertos seguintes no ficheiro\n" +"d - nรฃo preparar este excerto nem os excertos seguintes no ficheiro" + +#: add-patch.c:56 git-add--interactive.perl:1439 +#, fuzzy, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Esconder alteraรงรฃo de modo [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:57 git-add--interactive.perl:1440 +#, fuzzy, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Esconder eliminaรงรฃo [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:58 git-add--interactive.perl:1441 +#, fuzzy, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "Esconder eliminaรงรฃo [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, fuzzy, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Esconder este excerto [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:61 +#, fuzzy +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" +"Se o patch se aplicar corretamente, o excerto editado serรก marcado\n" +"como escondido imediatamente." + +#: add-patch.c:64 +#, fuzzy +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 - esconder este excerto\n" +"n - nรฃo esconder este excerto\n" +"q - sair; nรฃo esconder este excerto nem os restantes\n" +"a - esconder este excerto e todos os seguintes no ficheiro\n" +"d - nรฃo esconder este excerto nem os excertos seguintes no ficheiro" + +#: add-patch.c:80 git-add--interactive.perl:1445 +#, fuzzy, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Nรฃo preparar alteraรงรฃo de modo [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:81 git-add--interactive.perl:1446 +#, fuzzy, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Nรฃo preparar eliminaรงรฃo [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:82 git-add--interactive.perl:1447 +#, fuzzy, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "Nรฃo preparar eliminaรงรฃo [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, fuzzy, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Nรฃo preparar este excerto [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:85 +#, fuzzy +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" +"Se o patch se aplicar corretamente, o excerto editado serรก marcado\n" +"como nรฃo preparado imediatamente." + +#: add-patch.c:88 +#, fuzzy +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 - despreparar este excerto\n" +"n - nรฃo despreparar este excerto\n" +"q - sair; nรฃo despreparar este excerto nem outros restantes\n" +"a - despreparar este excerto e todos os excertos seguintes no ficheiro\n" +"d - nรฃo despreparar este excerto nem os excertos seguintes no ficheiro" + +#: add-patch.c:103 git-add--interactive.perl:1451 +#, fuzzy, c-format, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Aplicar alteraรงรฃo de modo ao รญndice [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:104 git-add--interactive.perl:1452 +#, fuzzy, c-format, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Aplicar eliminaรงรฃo ao รญndice [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:105 git-add--interactive.perl:1453 +#, fuzzy, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "Aplicar eliminaรงรฃo ao รญndice [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, fuzzy, c-format, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Aplicar este excerto ao รญndice [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:108 add-patch.c:176 add-patch.c:221 +#, fuzzy +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" +"Se o patch se aplicar corretamente, o excerto editado serรก marcado\n" +"para ser aplicado imediatamente." + +#: add-patch.c:111 +#, fuzzy +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 excerto ao รญndice\n" +"n - nรฃo aplicar este excerto ao รญndice\n" +"q - sair; nรฃo aplicar este excerto nem os restantes\n" +"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" +"d - nรฃo aplicar este excerto nem os excertos seguintes no ficheiro" + +#: add-patch.c:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, fuzzy, c-format, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Descartar alteraรงรฃo de modo da รกrvore de trabalho [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, fuzzy, c-format, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Descartar eliminaรงรฃo da รกrvore de trabalho [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, fuzzy, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "Descartar eliminaรงรฃo da รกrvore de trabalho [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, fuzzy, c-format, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Descartar este excerto da รกrvore de trabalho [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:131 add-patch.c:154 add-patch.c:199 +#, fuzzy +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" +"Se o patch se aplicar corretamente, o excerto editado serรก marcado\n" +"para ser descartado imediatamente." + +#: add-patch.c:134 add-patch.c:202 +#, fuzzy +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 excerto da รกrvore de trabalho\n" +"n - nรฃo descartar este excerto da รกrvore de trabalho\n" +"q - sair; nรฃo descartar este excerto nem os restantes\n" +"a - descartar este excerto e todos os excertos seguintes no ficheiro\n" +"d - nรฃo descartar este excerto nem os excertos seguintes no ficheiro" + +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 +#, fuzzy, c-format, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Descartar alteraรงรฃo de modo do รญndice e da รกrvore de trabalho [y,n,q,a,d,/" +"%s,?]? " + +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 +#, fuzzy, c-format, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Descartar eliminaรงรฃo do รญndice e da รกrvore de trabalho [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 +#, fuzzy, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Descartar eliminaรงรฃo do รญndice e da รกrvore de trabalho [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, fuzzy, c-format, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Descartar este excerto do รญndice e da รกrvore de trabalho [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:157 +#, fuzzy +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 excerto do รญndice e da รกrvore de trabalho\n" +"n - nรฃo descartar este excerto do รญndice nem da รกrvore de trabalho\n" +"q - sair; nรฃo descartar este excerto nem nenhum dos restantes\n" +"a - descartar este excerto e todos os excertos seguintes no ficheiro\n" +"d - nรฃo descartar este excerto nem os excertos seguintes no ficheiro" + +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 +#, fuzzy, c-format, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Aplicar alteraรงรฃo de modo ao รญndice e ร รกrvore de trabalho [y,n,q,a,d,/" +"%s,?]? " + +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 +#, fuzzy, c-format, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Aplicar eliminaรงรฃo ao รญndice e ร รกrvore de trabalho [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 +#, fuzzy, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Aplicar eliminaรงรฃo ao รญndice e ร รกrvore de trabalho [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, fuzzy, c-format, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Aplicar este excerto ao รญndice e ร รกrvore de trabalho [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:179 +#, fuzzy +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 excerto ao รญndice e ร รกrvore de trabalho\n" +"n - nรฃo aplicar este excerto ao รญndice e ร รกrvore de trabalho\n" +"q - sair; nรฃo aplicar este excerto ou restantes\n" +"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" +"d - nรฃo aplicar este excerto nem os excertos seguintes no ficheiro" + +#: add-patch.c:224 +#, fuzzy +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 excerto ao รญndice e ร รกrvore de trabalho\n" +"n - nรฃo aplicar este excerto ao รญndice e ร รกrvore de trabalho\n" +"q - sair; nรฃo aplicar este excerto ou restantes\n" +"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" +"d - nรฃo aplicar este excerto nem os excertos seguintes no ficheiro" + +#: add-patch.c:342 +#, fuzzy, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "nรฃo foi possรญvel analisar o patch '%s'" + +#: add-patch.c:361 add-patch.c:365 +#, fuzzy, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "nรฃo foi possรญvel abrir ou ler '%s'" + +#: add-patch.c:419 +#, fuzzy +msgid "could not parse diff" +msgstr "nรฃo foi possรญvel analisar %s" + +#: add-patch.c:438 +#, fuzzy +msgid "could not parse colored diff" +msgstr "Nรฃo foi possรญvel analisar a linha %d." + +#: add-patch.c:452 +#, fuzzy, c-format +msgid "failed to run '%s'" +msgstr "falha ao invocar unlink de '%s'" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "" + +#: add-patch.c:612 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" + +#: add-patch.c:785 +#, fuzzy, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "linha de configuraรงรฃo %d incorreta em %s" + +#: add-patch.c:800 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" + +#: add-patch.c:1076 git-add--interactive.perl:1117 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Modo de ediรงรฃo manual de excerto -- ver guia rรกpido abaixo no final.\n" + +#: add-patch.c:1080 +#, fuzzy, 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 remover linhas '%s', torne-as linhas ' ' (contexto).\n" +"Para remover linhas '%s', elimine-as.\n" +"Linhas comeรงadas com %s serรฃo removidas.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: add-patch.c:1094 git-add--interactive.perl:1131 +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 nรฃo se aplicar corretamente, ser-lhe-รก dada oportunidade para editar\n" +"de novo. Se todas as linhas do excerto forem removidas, a ediรงรฃo รฉ\n" +"abortada e o exceto รฉ deixado inalterado.\n" + +#: add-patch.c:1127 +#, fuzzy +msgid "could not parse hunk header" +msgstr "nรฃo foi possรญvel analisar %s" + +#: add-patch.c:1172 +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:1241 git-add--interactive.perl:1244 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"O excerto que editou nรฃo aplica.\n" +"Edite de novo (responder \"nรฃo\" descarta!) [y/n]? " + +#: add-patch.c:1284 +#, fuzzy +msgid "The selected hunks do not apply to the index!" +msgstr "Os excertos selecionados nรฃo aplicam ao รญndice!\n" + +#: add-patch.c:1285 git-add--interactive.perl:1348 +msgid "Apply them to the worktree anyway? " +msgstr "Aplicรก-los ร รกrvore de trabalho mesmo assim? " + +#: add-patch.c:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "Nรฃo foi aplicado nada.\n" + +#: add-patch.c:1349 +#, fuzzy +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 "" +"g - selecionar um excerto para ir\n" +"/ - procurar por um excerto correspondendo ร regex dada\n" +"j - deixar este excerto indecidido, ver excerto seguinte indecidido\n" +"J - deixar este excerto indecidido, ver excerto seguinte\n" +"k - deixar este excerto indecidido, ver excerto anterior indecidido\n" +"K - deixar este excerto indecidido, ver excerto anterior\n" +"s - dividir o excerto atual em excertos mais pequenos\n" +"e - editar manualmente o excerto atual\n" +"? - imprimir ajuda\n" + +#: add-patch.c:1511 add-patch.c:1521 +#, fuzzy +msgid "No previous hunk" +msgstr "Nenhum excerto anterior\n" + +#: add-patch.c:1516 add-patch.c:1526 +#, fuzzy +msgid "No next hunk" +msgstr "Nenhum excerto seguinte\n" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "ir para que excerto (<ret> para ver mais)? " + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "ir para que excerto? " + +#: add-patch.c:1555 +#, fuzzy, c-format +msgid "Invalid number: '%s'" +msgstr "Nรบmero invรกlido: '%s'\n" + +#: add-patch.c:1560 +#, fuzzy, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "Lamento, apenas %d excerto disponรญvel.\n" +msgstr[1] "Lamento, apenas %d excertos disponรญveis.\n" + +#: add-patch.c:1569 +msgid "No other hunks to search" +msgstr "" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "procurar por regex? " + +#: add-patch.c:1590 +#, fuzzy, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Regexp de pesquisa malformada %s: %s\n" + +#: add-patch.c:1607 +#, fuzzy +msgid "No hunk matches the given pattern" +msgstr "Nenhum excerto corresponde ao padrรฃo fornecido\n" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "" + +#: add-patch.c:1618 +#, fuzzy, c-format +msgid "Split into %d hunks." +msgstr "Dividir em %d excerto.\n" + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "" + +#: add-patch.c:1674 +#, fuzzy +msgid "'git apply' failed" +msgstr "falha ao executar o comando stash" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" + +#: advice.c:156 +#, fuzzy, c-format +msgid "%shint: %.*s%s\n" msgstr "dica: %.*s\n" -#: advice.c:83 +#: advice.c:247 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Nรฃo รฉ possรญvel efetuar cherry-pick porque tem ficheiros nรฃo integrados." -#: advice.c:85 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "Nรฃo รฉ possรญvel submeter porque tem ficheiros nรฃo integrados." -#: advice.c:87 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "Nรฃo รฉ possรญvel integrar porque tem ficheiros nรฃo integrados." -#: advice.c:89 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "Nรฃo รฉ possรญvel puxar porque tem ficheiros nรฃo integrados." -#: advice.c:91 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "Nรฃo รฉ possรญvel reverte porque tem ficheiros nรฃo integrados." -#: advice.c:93 +#: advice.c:257 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "Nรฃo รฉ possรญvel efetuar %s porque tem ficheiros nรฃo integrados." -#: advice.c:101 +#: advice.c:265 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." @@ -59,35 +818,42 @@ msgstr "" "Corrija-os na รกrvore de trabalho e use 'git add/rm <ficheiro>'\n" "conforme apropriado para marcรก-los como resolvidos e submeta." -#: advice.c:109 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "A terminar devido a conflito nรฃo resolvido." -#: advice.c:114 builtin/merge.c:1185 +#: advice.c:278 builtin/merge.c:1349 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Nรฃo concluรญdo a integraรงรฃo (MERGE_HEAD presente)." -#: advice.c:116 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "Submeta as suas alteraรงรตes antes de integrar." -#: advice.c:117 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "A terminar devido a integraรงรฃo incompleta." -#: advice.c:123 -#, c-format +#: advice.c:287 +#, fuzzy, c-format msgid "" -"Note: checking out '%s'.\n" +"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 performing another checkout.\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 -b with the checkout command again. Example:\n" +"do so (now or later) by using -c with the switch command. Example:\n" +"\n" +" git switch -c <new-branch-name>\n" "\n" -" git checkout -b <new-branch-name>\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 "" "Nota: a extrair '%s'.\n" @@ -102,88 +868,97 @@ msgstr "" " git checkout -b <novo-nome-ramo>\n" "\n" -#: apply.c:57 +#: alias.c:50 +#, fuzzy +msgid "cmdline ends with \\" +msgstr "terminar entradas com NUL" + +#: alias.c:51 +msgid "unclosed quote" +msgstr "" + +#: apply.c:69 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "opรงรฃo de espaรงo em branco nรฃo reconhecida '%s'" -#: apply.c:73 +#: apply.c:85 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "opรงรฃo de ignorar espaรงo em branco nรฃo reconhecida '%s'" -#: apply.c:125 +#: apply.c:135 msgid "--reject and --3way cannot be used together." msgstr "--reject e --3way nรฃo podem ser usados juntos." -#: apply.c:127 +#: apply.c:137 msgid "--cached and --3way cannot be used together." msgstr "--cached e --3way nรฃo podem ser usados juntos." -#: apply.c:130 +#: apply.c:140 msgid "--3way outside a repository" msgstr "--3way fora de um repositรณrio" -#: apply.c:141 +#: apply.c:151 msgid "--index outside a repository" msgstr "--index fora de um repositรณrio" -#: apply.c:144 +#: apply.c:154 msgid "--cached outside a repository" msgstr "--cached fora de um repositรณrio" -#: apply.c:845 +#: apply.c:801 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Nรฃo รฉ possรญvel preparar a regexp de carimbo de data/hora %s" -#: apply.c:854 +#: apply.c:810 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec retornou %d para a entra: %s" -#: apply.c:938 +#: apply.c:884 #, c-format msgid "unable to find filename in patch at line %d" msgstr "nรฃo foi possรญvel encontrar o nome do ficheiro no patch na linha %d" -#: apply.c:977 +#: apply.c:922 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff incorreto - esperava-se /dev/null, obteve-se %s na linha " "%d" -#: apply.c:983 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: git-diff incorreto - o nome do novo ficheiro na linha %d รฉ " "inconsistente" -#: apply.c:984 +#: apply.c:929 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: git-diff incorreto - o nome do ficheiro antigo na linha %d รฉ " "inconsistente" -#: apply.c:990 +#: apply.c:934 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff incorreto - esperava-se /dev/null na linha %d" -#: apply.c:1488 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recontagem: linha inesperada: %.*s" +#: apply.c:963 +#, fuzzy, c-format +msgid "invalid mode on line %d: %s" +msgstr "linha de identidade invรกlida: %s" -#: apply.c:1557 +#: apply.c:1282 #, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "fragmento de patch sem cabeรงalho na linha %d: %.*s" +msgid "inconsistent header lines %d and %d" +msgstr "" -#: apply.c:1577 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -198,82 +973,92 @@ msgstr[1] "" "o cabeรงalho do git diff nรฃo revelou o nome do ficheiro depois de se remover " "%d componentes de caminho (linha %d)" -#: apply.c:1589 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "o cabeรงalho do git diff nรฃo revela o nome do ficheiro (linha %d)" -#: apply.c:1759 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recontagem: linha inesperada: %.*s" + +#: apply.c:1550 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "fragmento de patch sem cabeรงalho na linha %d: %.*s" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "o novo ficheiro depende de conteรบdos antigos" -#: apply.c:1761 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "o ficheiro eliminado ainda tem conteรบdos" -#: apply.c:1795 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompido na linha %d" -#: apply.c:1832 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "o novo ficheiro %s depende de conteรบdos antigos" -#: apply.c:1834 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "o ficheiro eliminado %s ainda tem conteรบdos" -#: apply.c:1837 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** aviso: o ficheiro %s ficarรก vazio, mas nรฃo serรก eliminado" -#: apply.c:1984 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binรกrio corrompido na linha %d: %.*s" -#: apply.c:2021 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binรกrio nรฃo reconhecido na linha %d" -#: apply.c:2182 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "patch incompreensรญvel na linha %d" -#: apply.c:2265 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "nรฃo รฉ possรญvel ler a ligaรงรฃo simbรณlica %s" -#: apply.c:2269 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "nรฃo รฉ possรญvel abrir ou ler %s" -#: apply.c:2922 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "inรญcio de linha invรกlido: '%c'" -#: apply.c:3041 +#: 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] "Excerto nยบ%d bem sucedido na linha %d (%d linha deslocada)." msgstr[1] "Excerto nยบ%d bem sucedido na linha %d (%d linhas deslocadas)." -#: apply.c:3053 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexto reduzido para (%ld/%ld) para aplicar o fragmento em %d" -#: apply.c:3059 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -282,563 +1067,655 @@ msgstr "" "ao procura por:\n" "%.*s" -#: apply.c:3081 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "falta de dados do patch binรกrio '%s'" -#: apply.c:3089 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "nรฃo รฉ possรญvel aplicar o reverso de um patch binรกrio a '%s' sem o excerto " "reverso" -#: apply.c:3135 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "nรฃo รฉ possรญvel aplicar patch binรกrio a '%s' sem linha de รญndice completa" -#: apply.c:3145 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" "o patch aplica-se a '%s' (%s), que nรฃo corresponde aos conteรบdos atuais." -#: apply.c:3153 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "o patch aplica-se a um '%s' vazio mas nรฃo estรก vazio" -#: apply.c:3171 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "nรฃo รฉ possรญvel ler a postimage necessรกria %s de '%s'" -#: apply.c:3184 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "o patch binรกrio nรฃo foi aplicado corretamente a '%s'" -#: apply.c:3190 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "o patch binรกrio aplicado a '%s' gera resultados incorretos (esperava-se %s, " "obteve-se %s)" -#: apply.c:3211 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "falha ao aplicar o patch: %s:%ld" -#: apply.c:3333 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "nรฃo รฉ possรญvel extrair %s" -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 #, c-format msgid "failed to read %s" msgstr "falha ao ler %s" -#: apply.c:3389 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "a ler '%s' indicado por uma ligaรงรฃo simbรณlica" -#: apply.c:3418 apply.c:3658 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "o caminho %s foi eliminado ou mudou de nome" -#: apply.c:3501 apply.c:3672 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s: nรฃo existe no รญndice" -#: apply.c:3510 apply.c:3680 +#: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" msgstr "%s: nรฃo tem correspondรชncia no รญndice" -#: apply.c:3545 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "o repositรณrio nรฃo tem o blob necessรกrio para recorrer a integraรงรฃo com 3 " "pontos." -#: apply.c:3548 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "A recorrer a integraรงรฃo com 3 pontos...\n" -#: apply.c:3564 apply.c:3568 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "nรฃo รฉ possรญvel ler o conteรบdo atual de '%s'" -#: apply.c:3580 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Falha a recorrer a integraรงรฃo com 3 pontos...\n" -#: apply.c:3594 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch aplicado a '%s' com conflitos.\n" -#: apply.c:3599 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch aplicado a '%s' com sucesso.\n" -#: apply.c:3625 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "patch de remoรงรฃo deixa conteรบdos no ficheiro" -#: apply.c:3697 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: tipo errado" -#: apply.c:3699 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s รฉ do tipo %o, esperado %o" -#: apply.c:3850 apply.c:3852 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "caminho invรกlido '%s'" -#: apply.c:3908 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s: jรก existe no รญndice" -#: apply.c:3911 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s: jรก existe no diretรณrio de trabalho" -#: apply.c:3931 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "o novo modo (%o) de %s nรฃo corresponde ao modo antigo (%o)" -#: apply.c:3936 +#: apply.c:3981 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "o novo modo (%o) de %s nรฃo corresponde ao modo antigo (%o) de %s" -#: apply.c:3956 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "o ficheiro afetado '%s' รฉ indicado por uma ligaรงรฃo simbรณlica" -#: apply.c:3960 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s: patch nรฃo se aplica com sucesso" -#: apply.c:3975 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "A verificar o patch %s..." -#: apply.c:4066 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "falta informaรงรฃo de sha1 ou nรฃo รฉ รบtil para o submรณdulo %s" -#: apply.c:4073 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "alteraรงรฃo de modo de %s que nรฃo estรก na HEAD atual" -#: apply.c:4076 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta informaรงรฃo de sha1 ou nรฃo รฉ รบtil (%s)." -#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "falha ao invocar make_cache_entry em '%s'" - -#: apply.c:4085 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "nรฃo foi possรญvel adicionar %s ao รญndice temporรกrio" -#: apply.c:4095 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "nรฃo foi possรญvel escrever รญndice temporรกrio para %s" -#: apply.c:4233 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "nรฃo รฉ possรญvel remover %s do รญndice" -#: apply.c:4268 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompido no submรณdulo %s" -#: apply.c:4274 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "nรฃo รฉ possรญvel obter estado do novo ficheiro criado '%s'" -#: apply.c:4282 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "nรฃo รฉ possรญvel criar armazenamento de seguranรงa do ficheiro recรฉm-criado %s" -#: apply.c:4288 apply.c:4432 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "nรฃo รฉ possรญvel adicionar %s ร cache" -#: apply.c:4329 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "falha ao escrever para '%s'" -#: apply.c:4333 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "a fechar o ficheiro '%s'" -#: apply.c:4403 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "nรฃo รฉ possรญvel escrever o ficheiro '%s' com o modo %o" -#: apply.c:4501 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s aplicado com sucesso." -#: apply.c:4509 +#: apply.c:4556 msgid "internal error" msgstr "erro interno" -#: apply.c:4512 +#: apply.c:4559 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "A aplicar patch %%s com %d rejeiรงรฃo..." msgstr[1] "A aplicar patch %%s com %d rejeiรงรตes..." -#: apply.c:4523 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "a truncar o nome do ficheiro .rej em %.*s.rej" -#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "nรฃo รฉ possรญvel abrir %s" -#: apply.c:4545 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Excerto nยบ%d aplicado com sucesso." -#: apply.c:4549 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "Excerto nยบ%d rejeitado." -#: apply.c:4659 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ignorado." -#: apply.c:4667 +#: apply.c:4723 msgid "unrecognized input" msgstr "entrada nรฃo reconhecida" -#: apply.c:4686 +#: apply.c:4743 msgid "unable to read index file" msgstr "nรฃo foi possรญvel ler o ficheiro de รญndice" -#: apply.c:4823 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "nรฃo รฉ possรญvel abrir o patch '%s': %s" -#: apply.c:4850 +#: apply.c:4927 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erro de espaรงo em branco reprimido" msgstr[1] "%d erros de espaรงo em branco reprimidos" -#: apply.c:4856 apply.c:4871 +#: apply.c:4933 apply.c:4948 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d linha adiciona erros de espaรงo em branco." msgstr[1] "%d linhas adicionam erros de espaรงo em branco." -#: apply.c:4864 +#: apply.c:4941 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d linha aplicada depois de corrigir erros de espaรงo em branco." msgstr[1] "%d linhas aplicadas depois de corrigir erros de espaรงo em branco." -#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Nรฃo foi possรญvel escrever novo ficheiro de รญndice" -#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 -#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 -#: git-add--interactive.perl:239 -msgid "path" -msgstr "caminho" - -#: apply.c:4912 +#: apply.c:4985 msgid "don't apply changes matching the given path" msgstr "nรฃo aplicar alteraรงรตes que correspondam ao caminho fornecido" -#: apply.c:4915 +#: apply.c:4988 msgid "apply changes matching the given path" msgstr "aplicar alteraรงรตes que correspondam ao caminho fornecido" -#: apply.c:4917 builtin/am.c:2286 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "num" -#: apply.c:4918 +#: apply.c:4991 msgid "remove <num> leading slashes from traditional diff paths" msgstr "remover <num> barras ร esquerda dos caminhos de diff tradicional" -#: apply.c:4921 +#: apply.c:4994 msgid "ignore additions made by the patch" msgstr "ignorar adiรงรตes feitas pelo patch" -#: apply.c:4923 +#: apply.c:4996 msgid "instead of applying the patch, output diffstat for the input" msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada" -#: apply.c:4927 +#: apply.c:5000 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar nรบmero de linhas adicionadas e removidas em notaรงรฃo decimal" -#: apply.c:4929 +#: apply.c:5002 msgid "instead of applying the patch, output a summary for the input" msgstr "em vez de aplicar o patch, mostrar um resumo da entrada" -#: apply.c:4931 +#: apply.c:5004 msgid "instead of applying the patch, see if the patch is applicable" msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado" -#: apply.c:4933 +#: apply.c:5006 msgid "make sure the patch is applicable to the current index" msgstr "garantir que o patch pode ser aplicado ao รญndice atual" -#: apply.c:4935 +#: apply.c:5008 +msgid "mark new files with `git add --intent-to-add`" +msgstr "" + +#: apply.c:5010 msgid "apply a patch without touching the working tree" msgstr "aplicar um patch sem tocar na รกrvore de trabalho" -#: apply.c:4937 +#: apply.c:5012 msgid "accept a patch that touches outside the working area" msgstr "aceitar patches que alteram ficheiros fora da รกrea de trabalho" -#: apply.c:4939 +#: apply.c:5015 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplicar o patch tambรฉm (use com --stat/--summary/--check)" -#: apply.c:4941 +#: apply.c:5017 msgid "attempt three-way merge if a patch does not apply" msgstr "tentar integraรงรฃo com trรชs pontos se um patch nรฃo se aplica com รชxito" -#: apply.c:4943 +#: apply.c:5019 msgid "build a temporary index based on embedded index information" msgstr "" "construir um รญndice temporรกrio baseado na informaรงรฃo incorporada do รญndice" -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "os caminhos estรฃo separados por caracteres NUL" -#: apply.c:4948 +#: apply.c:5024 msgid "ensure at least <n> lines of context match" msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem" -#: apply.c:4949 builtin/am.c:2265 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "aรงรฃo" -#: apply.c:4950 +#: apply.c:5026 msgid "detect new or modified lines that have whitespace errors" msgstr "detetar linhas novas ou modificadas que tenham espaรงos em branco" -#: apply.c:4953 apply.c:4956 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" msgstr "ignorar alteraรงรตes de espaรงo em branco ao procurar contexto" -#: apply.c:4959 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "aplicar o patch em reverso" -#: apply.c:4961 +#: apply.c:5037 msgid "don't expect at least one line of context" msgstr "nรฃo esperar nenhuma linha de contexto" -#: apply.c:4963 +#: apply.c:5039 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej" -#: apply.c:4965 +#: apply.c:5041 msgid "allow overlapping hunks" msgstr "permitir a sobreposiรงรฃo de excertos" -#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 -#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" -#: apply.c:4968 +#: apply.c:5044 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolerar deteรงรตes incorretas de falta de nova linha no final do ficheiro" -#: apply.c:4971 +#: apply.c:5047 msgid "do not trust the line counts in the hunk headers" msgstr "nรฃo confiar na contagem de linhas no cabeรงalho dos excertos" -#: apply.c:4973 builtin/am.c:2274 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "raiz" -#: apply.c:4974 +#: apply.c:5050 msgid "prepend <root> to all filenames" msgstr "preceder <root> a todos os nomes de ficheiro" -#: archive.c:12 +#: archive-tar.c:125 archive-zip.c:345 +#, fuzzy, c-format +msgid "cannot stream blob %s" +msgstr "nรฃo รฉ possรญvel guardar %s" + +#: archive-tar.c:265 archive-zip.c:358 +#, fuzzy, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "versรฃo de รญndice %s nรฃo suportada" + +#: archive-tar.c:449 +#, fuzzy, c-format +msgid "unable to start '%s' filter" +msgstr "nรฃo foi possรญvel criar '%s'" + +#: archive-tar.c:452 +#, fuzzy +msgid "unable to redirect descriptor" +msgstr "nรฃo foi possรญvel refrescar o รญndice" + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "" + +#: archive-zip.c:318 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "" + +#: archive-zip.c:322 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "" + +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "erro ao compactar (%d)" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "" + +#: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<opรงรตes>] <รกrvore-etc> [<caminho>...]" -#: archive.c:13 +#: archive.c:15 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:14 +#: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <repo> [--exec <cmd>] [<opรงรตes>] <รกrvore-etc> " "[<caminho>...]" -#: archive.c:15 +#: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <cmd>] --list" -#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 +#: archive.c:192 +#, fuzzy, c-format +msgid "cannot read %s" +msgstr "nรฃo รฉ possรญvel ler '%s'" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "nรฃo foi possรญvel ler '%s'" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "o especificador de caminho '%s' nรฃo corresponde a nenhum ficheiro" -#: archive.c:417 +#: archive.c:454 +#, fuzzy, c-format +msgid "no such ref: %.*s" +msgstr "referรชncia inexistente %s" + +#: archive.c:460 +#, fuzzy, c-format +msgid "not a valid object name: %s" +msgstr "%s nรฃo รฉ um nome de objeto vรกlido" + +#: archive.c:473 +#, fuzzy, c-format +msgid "not a tree object: %s" +msgstr "nome de objeto invรกlido: %s" + +#: archive.c:485 +#, fuzzy +msgid "current working directory is untracked" +msgstr "nรฃo รฉ possรญvel de obter o diretรณrio de trabalho atual" + +#: archive.c:526 +#, fuzzy, c-format +msgid "File not found: %s" +msgstr "objeto nรฃo encontrado: %s" + +#: archive.c:528 +#, fuzzy, c-format +msgid "Not a regular file: %s" +msgstr "o ficheiro %s nรฃo รฉ um ficheiro regular" + +#: archive.c:553 msgid "fmt" msgstr "fmt" -#: archive.c:417 +#: archive.c:553 msgid "archive format" msgstr "formato do arquivo" -#: archive.c:418 builtin/log.c:1436 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "prefixo" -#: archive.c:419 +#: archive.c:555 msgid "prepend prefix to each pathname in the archive" msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo" -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 -#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 -#: parse-options.h:153 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "ficheiro" -#: archive.c:421 builtin/archive.c:89 +#: archive.c:557 +#, fuzzy +msgid "add untracked file to archive" +msgstr "Modo invรกlido de ficheiros nรฃo controlados '%s'" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "escrever o arquivo para este ficheiro" -#: archive.c:423 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr "ler .gitattributes do diretรณrio de trabalho" -#: archive.c:424 +#: archive.c:563 msgid "report archived files on stderr" msgstr "listar ficheiros arquivados para stderr" -#: archive.c:425 +#: archive.c:564 msgid "store only" msgstr "armazenar apenas" -#: archive.c:426 +#: archive.c:565 msgid "compress faster" msgstr "compressรฃo rรกpida" -#: archive.c:434 +#: archive.c:573 msgid "compress better" msgstr "compressรฃo รณtima" -#: archive.c:437 +#: archive.c:576 msgid "list supported archive formats" msgstr "listar formatos de arquivo suportados" -#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106 -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "repo" -#: archive.c:440 builtin/archive.c:91 +#: archive.c:579 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "obter o arquivo a partir do repositรณrio remoto <repo>" -#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 +#: builtin/notes.c:498 msgid "command" msgstr "comando" -#: archive.c:442 builtin/archive.c:93 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "caminho para o comando git-upload-archive no remoto" -#: archive.c:449 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "Opรงรฃo inesperada --remote" -#: archive.c:451 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "A opรงรฃo --exec sรณ pode ser usada em conjunto com --remote" -#: archive.c:453 +#: archive.c:592 msgid "Unexpected option --output" msgstr "Opรงรฃo inesperada --output" -#: archive.c:475 +#: archive.c:594 +#, fuzzy +msgid "Options --add-file and --remote cannot be used together" +msgstr "As opรงรตes --squash e --fixup nรฃo podem ser usadas juntas" + +#: archive.c:616 #, c-format msgid "Unknown archive format '%s'" msgstr "Formato de arquivo desconhecido '%s'" -#: archive.c:482 +#: archive.c:623 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumento nรฃo suportado para o formato '%s': -%d" @@ -848,7 +1725,12 @@ msgstr "Argumento nรฃo suportado para o formato '%s': -%d" msgid "%.*s is not a valid attribute name" msgstr "%.*s nรฃo รฉ um nome de atributo vรกlido" -#: attr.c:408 +#: attr.c:369 +#, fuzzy, c-format +msgid "%s not allowed: %s:%d" +msgstr "falha ao aplicar o patch: %s:%ld" + +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -856,27 +1738,22 @@ msgstr "" "Os padrรตes negativos sรฃo ignorados nos atributos do git\n" "Use '\\!' para uma exclamaรงรฃo literal ร esquerda." -#: bisect.c:443 -#, c-format -msgid "Could not open file '%s'" -msgstr "Nรฃo foi possรญvel abrir o ficheiro '%s'" - -#: bisect.c:448 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Conteรบdo incorretamente citado no ficheiro '%s': %s" -#: bisect.c:656 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "Nรฃo se estรก a bissetar mais!\n" -#: bisect.c:709 +#: bisect.c:753 #, c-format msgid "Not a valid commit name %s" msgstr "%s nรฃo รฉ um nome de commit vรกlido" -#: bisect.c:733 +#: bisect.c:778 #, c-format msgid "" "The merge base %s is bad.\n" @@ -885,7 +1762,7 @@ msgstr "" "A base de integraรงรฃo %s รฉ mรก (bad).\n" "Significa que o bug foi corrigido entre %s e [%s].\n" -#: bisect.c:738 +#: bisect.c:783 #, c-format msgid "" "The merge base %s is new.\n" @@ -894,7 +1771,7 @@ msgstr "" "A base de integraรงรฃo %s รฉ nova (new).\n" "A propriedade foi mudada entre %s e [%s].\n" -#: bisect.c:743 +#: bisect.c:788 #, c-format msgid "" "The merge base %s is %s.\n" @@ -903,7 +1780,7 @@ msgstr "" "A base de integraรงรฃo %s รฉ %s.\n" "Significa que o primeiro commit '%s' estรก entre %s e [%s].\n" -#: bisect.c:751 +#: bisect.c:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -914,7 +1791,7 @@ msgstr "" "git bisect nรฃo pode funcionar corretamente nesta situaรงรฃo.\n" "Talvez confundiu revisรตes %s e %s?\n" -#: bisect.c:764 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -926,36 +1803,36 @@ msgstr "" "%s.\n" "Continua-se de qualquer maneira." -#: bisect.c:799 +#: bisect.c:848 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "A bissetar: uma base de integraรงรฃo tem de ser testada\n" -#: bisect.c:850 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "precisa-se de uma revisรฃo %s" -#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "nรฃo foi possรญvel criar o ficheiro '%s'" -#: bisect.c:918 +#: bisect.c:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "nรฃo foi possรญvel ler o ficheiro '%s'" -#: bisect.c:948 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "falha ao ler referรชncias bissetadas" -#: bisect.c:968 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "%s era %s e %s em simultรขneo\n" -#: bisect.c:976 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" @@ -964,22 +1841,60 @@ msgstr "" "Nenhum commit testรกvel encontrado.\n" "Talvez tenha comeรงado com parรขmetros de caminho incorretos?\n" -#: bisect.c:995 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" msgstr[0] "(aproximadamente %d passo)" msgstr[1] "(aproximadamente %d passos)" -#. TRANSLATORS: the last %s will be replaced with -#. "(roughly %d steps)" translation -#: bisect.c:999 +#. TRANSLATORS: the last %s will be replaced with "(roughly %d +#. steps)" translation. +#. +#: bisect.c:1088 #, 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] "A bissetar: falta %d revisรฃo para testar depois desta %s\n" msgstr[1] "A bissetar: faltam %d revisรตes para testar depois desta %s\n" +#: blame.c:2778 +msgid "--contents and --reverse do not blend well." +msgstr "--contents e --reverse nรฃo se misturam bem." + +#: blame.c:2792 +msgid "cannot use --contents with final commit object name" +msgstr "nรฃo รฉ possรญvel usar --contents com nome de objeto commit final" + +#: blame.c:2813 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" +"--reverse e --first-parent juntos requer que se especifique o รบltimo commit" + +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 +msgid "revision walk setup failed" +msgstr "falha ao configurar percurso de revisรตes" + +#: blame.c:2840 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse --first-parent juntos requer intervalo ao longo do primeiro-pai" + +#: blame.c:2851 +#, c-format +msgid "no such path %s in %s" +msgstr "o caminho %s nรฃo existe em %s" + +#: blame.c:2862 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "nรฃo รฉ possรญvel ler o blob %s do caminho %s" + #: branch.c:53 #, c-format msgid "" @@ -999,43 +1914,43 @@ msgid "Not setting branch %s as its own upstream." msgstr "O ramo %s nรฃo foi configurado com ramo a montante dele prรณprio." #: branch.c:93 -#, c-format -msgid "Branch %s set up to track remote branch %s from %s by rebasing." +#, fuzzy, c-format +msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s por rebase." #: branch.c:94 -#, c-format -msgid "Branch %s set up to track remote branch %s from %s." +#, fuzzy, c-format +msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s." #: branch.c:98 -#, c-format -msgid "Branch %s set up to track local branch %s by rebasing." +#, fuzzy, c-format +msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "Ramo %s configurado para seguir o ramo local %s por rebase." #: branch.c:99 -#, c-format -msgid "Branch %s set up to track local branch %s." +#, fuzzy, c-format +msgid "Branch '%s' set up to track local branch '%s'." msgstr "Ramo %s configurado para seguir o ramo local %s." #: branch.c:104 -#, c-format -msgid "Branch %s set up to track remote ref %s by rebasing." +#, fuzzy, c-format +msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "Ramo %s configurado para seguir a referรชncia remota %s por rebase." #: branch.c:105 -#, c-format -msgid "Branch %s set up to track remote ref %s." +#, fuzzy, c-format +msgid "Branch '%s' set up to track remote ref '%s'." msgstr "Ramo %s configurado para seguir a referรชncia remota %s." #: branch.c:109 -#, c-format -msgid "Branch %s set up to track local ref %s by rebasing." +#, fuzzy, c-format +msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "Ramo %s configurado para seguir a referรชncia local %s por rebase." #: branch.c:110 -#, c-format -msgid "Branch %s set up to track local ref %s." +#, fuzzy, c-format +msgid "Branch '%s' set up to track local ref '%s'." msgstr "Ramo %s configurado para seguir a referรชncia local %s." #: branch.c:119 @@ -1047,32 +1962,32 @@ msgstr "Nรฃo foi possรญvel escrever a configuraรงรฃo do ramo a montante" msgid "Not tracking: ambiguous information for ref %s" msgstr "Nรฃo seguido: informaรงรฃo da referรชncia %s ambรญgua" -#: branch.c:185 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' nรฃo รฉ um nome vรกlido para um ramo." -#: branch.c:190 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "Jรก existe um ramo designado '%s'." -#: branch.c:198 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "Nรฃo รฉ possรญvel forรงar a atualizaรงรฃo do ramo atual." -#: branch.c:218 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Nรฃo รฉ possรญvel configurar ramo a seguir; o ponto inicial '%s' nรฃo รฉ um ramo." -#: branch.c:220 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "o ramo a montante solicitado '%s' nรฃo existe" -#: branch.c:222 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1092,127 +2007,451 @@ msgstr "" "o seu homรณlogo remoto, pode usar \"git push -u\" para configurar\n" "o respetivo ramo a montante, ao mesmo tempo que publica." -#: branch.c:265 +#: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nome de objeto invรกlido: '%s'." -#: branch.c:285 +#: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nome de objeto ambรญguo: '%s'." -#: branch.c:290 +#: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Ponto no ramo invรกlido: '%s'." -#: branch.c:344 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' foi jรก extraรญdo em '%s'" -#: branch.c:364 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD da รกrvore de trabalho %s nรฃo estรก atualizada" -#: bundle.c:34 -#, c-format -msgid "'%s' does not look like a v2 bundle file" +#: bundle.c:41 +#, fuzzy, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "patch binรกrio nรฃo reconhecido na linha %d" + +#: bundle.c:45 +#, fuzzy, c-format +msgid "unknown capability '%s'" +msgstr "Commit desconhecido %s" + +#: bundle.c:71 +#, fuzzy, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' nรฃo parece ser um ficheiro bundle v2" -#: bundle.c:61 +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "cabeรงalho nรฃo reconhecido: %s%s (%d)" -#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "nรฃo foi possรญvel abrir '%s'" -#: bundle.c:139 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "O repositรณrio nรฃo possuรญ estes commits prรฉ-requisitados:" -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299 -#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 -#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 -#: builtin/merge.c:359 builtin/shortlog.c:176 -msgid "revision walk setup failed" -msgstr "falha ao configurar percurso de revisรตes" +#: bundle.c:192 +#, fuzzy +msgid "need a repository to verify a bundle" +msgstr "ร necessรกrio um repositรณrio para criar um bundle." -#: bundle.c:185 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "O bundle contรฉm esta referรชncia:" msgstr[1] "O bundle contรฉm estas %d referรชncias:" -#: bundle.c:192 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "O pacote regista um histรณrico completo." -#: bundle.c:194 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "O bundle requer esta referรชncia:" msgstr[1] "O bundle requer estas %d referรชncias:" -#: bundle.c:253 +#: bundle.c:319 +#, fuzzy +msgid "unable to dup bundle descriptor" +msgstr "nรฃo foi possรญvel atualizar %s" + +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "Nรฃo foi possรญvel lanรงar pack-objects" -#: bundle.c:264 +#: bundle.c:337 msgid "pack-objects died" msgstr "pack-objects terminou inesperadamente" -#: bundle.c:304 +#: bundle.c:379 msgid "rev-list died" msgstr "rev-list terminou inesperadamente" -#: bundle.c:353 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "a referรชncia '%s' รฉ excluรญda pelas opรงรตes de rev-list" -#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281 +#: bundle.c:498 +#, fuzzy, c-format +msgid "unsupported bundle version %d" +msgstr "versรฃo de รญndice %s nรฃo suportada" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "" + +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 #, c-format msgid "unrecognized argument: %s" msgstr "argumento nรฃo reconhecido: %s" -#: bundle.c:451 +#: bundle.c:530 msgid "Refusing to create empty bundle." msgstr "Criaรงรฃo de bundle vazio recusada." -#: bundle.c:463 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "nรฃo รฉ possรญvel criar '%s'" -#: bundle.c:491 +#: bundle.c:565 msgid "index-pack died" msgstr "index-pack terminou inesperadamente" -#: color.c:300 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "valor de cor invรกlido: %.*s" -#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457 -#: builtin/am.c:1493 builtin/am.c:2127 +#: commit-graph.c:188 midx.c:46 +#, fuzzy +msgid "invalid hash version" +msgstr "especificaรงรฃo de caminho invรกlida" + +#: commit-graph.c:246 +msgid "commit-graph file is too small" +msgstr "" + +#: commit-graph.c:311 +#, fuzzy, c-format +msgid "commit-graph signature %X does not match signature %X" +msgstr "O commit %s nรฃo tem uma assinatura GPG." + +#: commit-graph.c:318 +#, fuzzy, c-format +msgid "commit-graph version %X does not match version %X" +msgstr "o commit %s nรฃo tem o pai %d" + +#: commit-graph.c:325 +#, c-format +msgid "commit-graph hash version %X does not match version %X" +msgstr "" + +#: commit-graph.c:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "" + +#: commit-graph.c:361 +#, c-format +msgid "commit-graph improper chunk offset %08x%08x" +msgstr "" + +#: commit-graph.c:433 +#, c-format +msgid "commit-graph chunk id %08x appears multiple times" +msgstr "" + +#: commit-graph.c:499 +msgid "commit-graph has no base graphs chunk" +msgstr "" + +#: commit-graph.c:509 +msgid "commit-graph chain does not match" +msgstr "" + +#: commit-graph.c:557 +#, c-format +msgid "invalid commit-graph chain: line '%s' not a hash" +msgstr "" + +#: commit-graph.c:581 +#, fuzzy +msgid "unable to find all commit-graph files" +msgstr "nรฃo foi possรญvel analisar o commit %s" + +#: commit-graph.c:721 commit-graph.c:785 +msgid "invalid commit position. commit-graph is likely corrupt" +msgstr "" + +#: commit-graph.c:742 +#, fuzzy, c-format +msgid "could not find commit %s" +msgstr "nรฃo foi possรญvel analisar o commit %s\n" + +#: commit-graph.c:1042 builtin/am.c:1306 +#, c-format +msgid "unable to parse commit %s" +msgstr "nรฃo foi possรญvel analisar o commit %s" + +#: commit-graph.c:1265 builtin/pack-objects.c:2864 +#, fuzzy, c-format +msgid "unable to get type of object %s" +msgstr "nรฃo foi possรญvel analisar o objeto: %s" + +#: commit-graph.c:1301 +msgid "Loading known commits in commit graph" +msgstr "" + +#: commit-graph.c:1318 +msgid "Expanding reachable commits in commit graph" +msgstr "" + +#: commit-graph.c:1338 +msgid "Clearing commit marks in commit graph" +msgstr "" + +#: commit-graph.c:1357 +msgid "Computing commit graph generation numbers" +msgstr "" + +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "" + +#: commit-graph.c:1501 +#, fuzzy +msgid "Collecting referenced commits" +msgstr "Nรฃo foi possรญvel inicializar commits reescritos" + +#: commit-graph.c:1526 +#, 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:1539 +#, fuzzy, c-format +msgid "error adding pack %s" +msgstr "Erro ao rematar %s." + +#: commit-graph.c:1543 +#, c-format +msgid "error opening index for %s" +msgstr "" + +#: commit-graph.c:1582 +msgid "Finding commits for commit graph among packed objects" +msgstr "" + +#: commit-graph.c:1597 +msgid "Counting distinct commits in commit graph" +msgstr "" + +#: commit-graph.c:1629 +msgid "Finding extra edges in commit graph" +msgstr "" + +#: commit-graph.c:1678 +msgid "failed to write correct number of base graph ids" +msgstr "" + +#: commit-graph.c:1720 midx.c:826 +#, fuzzy, c-format +msgid "unable to create leading directories of %s" +msgstr "nรฃo foi possรญvel criar os diretรณrios superiores de '%s'" + +#: commit-graph.c:1733 +#, fuzzy +msgid "unable to create temporary graph layer" +msgstr "nรฃo foi possรญvel criar รญndice temporรกrio" + +#: commit-graph.c:1738 +#, fuzzy, c-format +msgid "unable to adjust shared permissions for '%s'" +msgstr "Nรฃo รฉ possรญvel adicionar os resultados da integraรงรฃo de '%s'" + +#: commit-graph.c:1808 +#, 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:1853 +#, fuzzy +msgid "unable to open commit-graph chain file" +msgstr "nรฃo รฉ possรญvel abrir ou ler %s" + +#: commit-graph.c:1869 +#, fuzzy +msgid "failed to rename base commit-graph file" +msgstr "Falha ao criar os ficheiros de saรญda" + +#: commit-graph.c:1889 +#, fuzzy +msgid "failed to rename temporary commit-graph file" +msgstr "nรฃo รฉ possรญvel escrever ficheiro de รญndice temporรกrio" + +#: commit-graph.c:2015 +#, fuzzy +msgid "Scanning merged commits" +msgstr "A adicionar %s integrado" + +#: commit-graph.c:2026 +#, fuzzy, c-format +msgid "unexpected duplicate commit id %s" +msgstr "nรฃo foi possรญvel analisar o commit %s" + +#: commit-graph.c:2049 +msgid "Merging commit-graph" +msgstr "" + +#: commit-graph.c:2259 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "" + +#: commit-graph.c:2270 +#, fuzzy +msgid "too many commits to write graph" +msgstr "mostrar apenas commits nรฃo presentes no primeiro ramo" + +#: commit-graph.c:2363 +msgid "the commit-graph file has incorrect checksum and is likely corrupt" +msgstr "" + +#: commit-graph.c:2373 +#, c-format +msgid "commit-graph has incorrect OID order: %s then %s" +msgstr "" + +#: commit-graph.c:2383 commit-graph.c:2398 +#, c-format +msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" +msgstr "" + +#: commit-graph.c:2390 +#, fuzzy, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "nรฃo foi possรญvel analisar o commit %s" + +#: commit-graph.c:2408 +msgid "Verifying commits in commit graph" +msgstr "" + +#: commit-graph.c:2423 +#, c-format +msgid "failed to parse commit %s from object database for commit-graph" +msgstr "" + +#: commit-graph.c:2430 +#, c-format +msgid "root tree OID for commit %s in commit-graph is %s != %s" +msgstr "" + +#: commit-graph.c:2440 +#, c-format +msgid "commit-graph parent list for commit %s is too long" +msgstr "" + +#: commit-graph.c:2449 +#, c-format +msgid "commit-graph parent for %s is %s != %s" +msgstr "" + +#: commit-graph.c:2463 +#, c-format +msgid "commit-graph parent list for commit %s terminates early" +msgstr "" + +#: commit-graph.c:2468 +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "" + +#: commit-graph.c:2472 +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "" + +#: commit-graph.c:2488 +#, c-format +msgid "commit-graph generation for commit %s is %u != %u" +msgstr "" + +#: commit-graph.c:2494 +#, c-format +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "" + +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "nรฃo foi possรญvel analisar %s" -#: commit.c:42 +#: commit.c:54 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s nรฃo รฉ um commit!" -#: commit.c:1511 +#: commit.c:194 +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 "" + +#: commit.c:1172 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" +"A assinatura GPG do commit %s, alegadamente assinada por %s, nรฃo รฉ de " +"confianรงa." + +#: commit.c:1176 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" +"A assinatura GPG do commit %s, alegadamente assinada por %s, estรก incorreta." + +#: commit.c:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "O commit %s nรฃo tem uma assinatura GPG." + +#: commit.c:1182 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "A assinatura GPG do commit %s por %s estรก correta\n" + +#: commit.c:1436 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" @@ -1227,167 +2466,317 @@ msgstr "" msgid "memory exhausted" msgstr "memรณria esgotada" -#: config.c:191 +#: config.c:125 +#, 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 "" + +#: config.c:141 +#, fuzzy, c-format +msgid "could not expand include path '%s'" +msgstr "nรฃo foi possรญvel analisar o patch '%s'" + +#: config.c:152 +#, fuzzy +msgid "relative config includes must come from files" +msgstr "" +"configuraรงรฃo relativa com inclusรฃo condicional deve provir de ficheiros" + +#: config.c:198 msgid "relative config include conditionals must come from files" -msgstr "configuraรงรฃo relativa com inclusรฃo condicional deve provir de ficheiros" +msgstr "" +"configuraรงรฃo relativa com inclusรฃo condicional deve provir de ficheiros" + +#: config.c:378 +#, fuzzy, c-format +msgid "key does not contain a section: %s" +msgstr "Nรฃo foi possรญvel remover a secรงรฃo de configuraรงรฃo '%s'" + +#: config.c:384 +#, c-format +msgid "key does not contain variable name: %s" +msgstr "" -#: config.c:701 +#: config.c:408 sequencer.c:2547 +#, c-format +msgid "invalid key: %s" +msgstr "chave invรกlida: %s" + +#: config.c:414 +#, fuzzy, c-format +msgid "invalid key (newline): %s" +msgstr "linha de identidade invรกlida: %s" + +#: config.c:450 config.c:462 +#, fuzzy, c-format +msgid "bogus config parameter: %s" +msgstr "parรขmetros insuficientes" + +#: config.c:497 +#, fuzzy, c-format +msgid "bogus format in %s" +msgstr "cadeia malformada %s" + +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "linha de configuraรงรฃo %d incorreta no blob %s" -#: config.c:705 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "linha de configuraรงรฃo %d incorreta no ficheiro %s" -#: config.c:709 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "linha de configuraรงรฃo %d incorreta na entrada padrรฃo" -#: config.c:713 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "linha de configuraรงรฃo %d incorreta no submรณdulo-blob %s" -#: config.c:717 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "linha de configuraรงรฃo %d incorreta na linha de comandos %s" -#: config.c:721 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "linha de configuraรงรฃo %d incorreta em %s" -#: config.c:840 +#: config.c:993 msgid "out of range" msgstr "fora de intervalo" -#: config.c:840 +#: config.c:993 msgid "invalid unit" msgstr "unidade invรกlida" -#: config.c:846 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valor numรฉrico '%s' da configuraรงรฃo '%s' incorreto: %s" -#: config.c:851 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "valor numรฉrico '%s' da configuraรงรฃo '%s' incorreto no blob %s: %s" -#: config.c:854 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "valor numรฉrico '%s' da configuraรงรฃo '%s' incorreto no ficheiro %s: %s" -#: config.c:857 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valor numรฉrico '%s' da configuraรงรฃo '%s' incorreto na entrada padrรฃo: %s" -#: config.c:860 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valor numรฉrico '%s' da configuraรงรฃo '%s' incorreto no submรณdulo-blob %s: %s" -#: config.c:863 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valor numรฉrico '%s' da configuraรงรฃo '%s' incorreto na linha de comandos %s: " "%s" -#: config.c:866 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "valor numรฉrico '%s' da configuraรงรฃo '%s' incorreto em %s: %s" -#: config.c:953 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "falha ao expandir diretรณrio de utilizador em: '%s'" -#: config.c:1048 config.c:1059 +#: config.c:1132 +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "'%s' em '%s' nรฃo รฉ um carimbo de data/hora vรกlido" + +#: config.c:1223 +#, c-format +msgid "abbrev length out of range: %d" +msgstr "" + +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "nรญvel de compressรฃo zlib %d incorreto" -#: config.c:1176 +#: config.c:1340 +msgid "core.commentChar should only be one character" +msgstr "" + +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo invรกlido para criaรงรฃo de objeto: %s" -#: config.c:1332 +#: config.c:1445 +#, fuzzy, c-format +msgid "malformed value for %s" +msgstr "valor invรกlido de %s" + +#: config.c:1471 +#, fuzzy, c-format +msgid "malformed value for %s: %s" +msgstr "valor invรกlido de %s: %s" + +#: config.c:1472 +msgid "must be one of nothing, matching, simple, upstream or current" +msgstr "" + +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "nรญvel de compactaรงรฃo do pacote %d incorreto" -#: config.c:1522 +#: config.c:1655 +#, fuzzy, c-format +msgid "unable to load config blob object '%s'" +msgstr "nรฃo foi possรญvel iniciar o comando 'show' sobre o objeto '%s'" + +#: config.c:1658 +#, fuzzy, c-format +msgid "reference '%s' does not point to a blob" +msgstr "'%s' nรฃo aponta para um commit" + +#: config.c:1675 +#, fuzzy, c-format +msgid "unable to resolve config blob '%s'" +msgstr "nรฃo foi possรญvel resolver revisรฃo: %s" + +#: config.c:1705 +#, fuzzy, c-format +msgid "failed to parse %s" +msgstr "falha ao ler %s" + +#: config.c:1759 msgid "unable to parse command-line config" msgstr "nรฃo รฉ possรญvel analisar configuraรงรฃo de linha de comandos" -#: config.c:1572 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "" "ocorreu um erro desconhecido durante a leitura dos ficheiros de configuraรงรฃo" -#: config.c:1931 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "Invรกlido %s: '%s'" -#: config.c:1952 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "" -"valor '%s' de core.untrackedCache desconhecido; usar 'keep' valor por omissรฃo" - -#: config.c:1978 +#: config.c:2341 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "o valor '%d' de splitIndex.maxPercentChange deve estar entre 0 e 100" -#: config.c:1989 +#: config.c:2387 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "nรฃo รฉ possรญvel analisar '%s' da configuraรงรฃo de linha de comandos" -#: config.c:1991 +#: config.c:2389 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variรกvel de configuraรงรฃo '%s' incorreta no ficheiro '%s' na linha %d" -#: config.c:2050 +#: config.c:2470 +#, fuzzy, c-format +msgid "invalid section name '%s'" +msgstr "conteรบdo invรกlido: '%s'" + +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "%s tem mรบltiplos valores" -#: config.c:2384 config.c:2609 +#: config.c:2531 +#, fuzzy, c-format +msgid "failed to write new configuration file %s" +msgstr "nรฃo รฉ possรญvel criar o ficheiro de configuraรงรฃo %s" + +#: config.c:2783 config.c:3107 +#, fuzzy, c-format +msgid "could not lock config file %s" +msgstr "nรฃo รฉ possรญvel fechar o ficheiro %s" + +#: config.c:2794 +#, fuzzy, c-format +msgid "opening %s" +msgstr "A eliminar %s" + +#: config.c:2829 builtin/config.c:354 +#, fuzzy, c-format +msgid "invalid pattern: %s" +msgstr "opรงรฃo invรกlida: %s" + +#: config.c:2854 +#, fuzzy, c-format +msgid "invalid config file %s" +msgstr "ficheiro invรกlido: '%s'" + +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "falha de fstat de %s" -#: config.c:2502 +#: config.c:2878 +#, fuzzy, c-format +msgid "unable to mmap '%s'" +msgstr "nรฃo รฉ possรญvel aceder a '%s'" + +#: config.c:2887 config.c:3125 +#, fuzzy, c-format +msgid "chmod on %s failed" +msgstr "falha de fstat de %s" + +#: config.c:2972 config.c:3222 +#, fuzzy, c-format +msgid "could not write config file %s" +msgstr "nรฃo รฉ possรญvel ler o ficheiro de log '%s'" + +#: config.c:3006 #, c-format msgid "could not set '%s' to '%s'" msgstr "nรฃo foi possรญvel definir '%s' como '%s'" -#: config.c:2504 builtin/remote.c:774 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "nรฃo foi possรญvel reiniciar '%s'" -#: connect.c:49 -msgid "The remote end hung up upon initial contact" +#: config.c:3098 +#, fuzzy, c-format +msgid "invalid section name: %s" +msgstr "opรงรฃo invรกlida: %s" + +#: config.c:3265 +#, fuzzy, c-format +msgid "missing value for '%s'" +msgstr "valor invรกlido de %s" + +#: connect.c:61 +#, fuzzy +msgid "the remote end hung up upon initial contact" msgstr "O remoto desligou apรณs contacto inicial" -#: connect.c:51 +#: connect.c:63 msgid "" "Could not read from remote repository.\n" "\n" @@ -1399,148 +2788,462 @@ msgstr "" "Certifica-se que tem os direitos de acesso corretos\n" "e que o repositรณrio existe." -#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 +#: connect.c:81 +#, fuzzy, c-format +msgid "server doesn't support '%s'" +msgstr "O servidor nรฃo suporta STARTTLS! %s" + +#: connect.c:118 +#, fuzzy, c-format +msgid "server doesn't support feature '%s'" +msgstr "O servidor nรฃo suporta --deepen" + +#: connect.c:129 +msgid "expected flush after capabilities" +msgstr "" + +#: connect.c:263 +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "" + +#: connect.c:284 +msgid "protocol error: unexpected capabilities^{}" +msgstr "" + +#: connect.c:306 +#, fuzzy, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "esperava-se raso/aprofundar, obteve-se %s" + +#: connect.c:308 +msgid "repository on the other end cannot be shallow" +msgstr "" + +#: connect.c:347 +#, fuzzy +msgid "invalid packet" +msgstr "caminho invรกlido '%s'" + +#: connect.c:367 +#, fuzzy, c-format +msgid "protocol error: unexpected '%s'" +msgstr "erro de protocolo: cabeรงalho de pacote incorreto" + +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "" + +#: connect.c:500 +#, fuzzy, c-format +msgid "invalid ls-refs response: %s" +msgstr "referรชncia invรกlida: %s" + +#: connect.c:504 +msgid "expected flush after ref listing" +msgstr "" + +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "" + +#: connect.c:640 +#, fuzzy, c-format +msgid "protocol '%s' is not supported" +msgstr "'%s' nรฃo estรก trancada" + +#: connect.c:691 +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "" + +#: connect.c:731 connect.c:794 +#, fuzzy, c-format +msgid "Looking up %s ... " +msgstr "A verificar o patch %s..." + +#: connect.c:735 +#, fuzzy, c-format +msgid "unable to look up %s (port %s) (%s)" +msgstr "nรฃo foi possรญvel mover %s para %s" + +#. TRANSLATORS: this is the end of "Looking up %s ... " +#: connect.c:739 connect.c:810 +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" + +#: connect.c:761 connect.c:838 +#, fuzzy, c-format +msgid "" +"unable to connect to %s:\n" +"%s" +msgstr "nรฃo รฉ possรญvel abrir %s: %s\n" + +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " +#: connect.c:767 connect.c:844 +#, fuzzy +msgid "done." +msgstr "concluรญdo.\n" + +#: connect.c:798 +#, fuzzy, c-format +msgid "unable to look up %s (%s)" +msgstr "nรฃo รฉ possรญvel abrir %s: %s\n" + +#: connect.c:804 +#, fuzzy, c-format +msgid "unknown port %s" +msgstr "opรงรฃo desconhecido %s" + +#: connect.c:941 connect.c:1271 +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "" + +#: connect.c:943 +#, c-format +msgid "strange port '%s' blocked" +msgstr "" + +#: connect.c:953 +#, fuzzy, c-format +msgid "cannot start proxy %s" +msgstr "nรฃo รฉ possรญvel invocar stat sobre '%s'" + +#: connect.c:1024 +msgid "no path specified; see 'git help pull' for valid url syntax" +msgstr "" + +#: connect.c:1219 +msgid "ssh variant 'simple' does not support -4" +msgstr "" + +#: connect.c:1231 +msgid "ssh variant 'simple' does not support -6" +msgstr "" + +#: connect.c:1248 +#, fuzzy +msgid "ssh variant 'simple' does not support setting port" +msgstr "o recetor nรฃo suporta publicaรงรฃo com --signed" + +#: connect.c:1360 +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "" + +#: connect.c:1408 +#, fuzzy +msgid "unable to fork" +msgstr "nรฃo foi possรญvel analisar o formato" + +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "A verificar conectividade" -#: connected.c:75 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "Nรฃo foi possรญvel executar 'git rev-list'" -#: connected.c:95 +#: connected.c:144 msgid "failed write to rev-list" msgstr "falha ao escrever para rev-list" -#: connected.c:102 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "falha ao fechar entrada padrรฃo de rev-list" -#: convert.c:201 +#: convert.c:194 #, c-format +msgid "illegal crlf_action %d" +msgstr "" + +#: convert.c:207 +#, fuzzy, c-format +msgid "CRLF would be replaced by LF in %s" +msgstr "CRLF serรก substituรญdo por LF em %s." + +#: convert.c:209 +#, fuzzy, c-format msgid "" "CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" "CRLF serรก substituรญdo por LF em %s.\n" "O final de linha original serรก mantido no ficheiro da sua รกrvore de trabalho." -#: convert.c:205 +#: convert.c:217 #, c-format -msgid "CRLF would be replaced by LF in %s." -msgstr "CRLF serรก substituรญdo por LF em %s." +msgid "LF would be replaced by CRLF in %s" +msgstr "LF serรก substituรญdo por CRLF em %s." -#: convert.c:211 -#, c-format +#: convert.c:219 +#, fuzzy, c-format msgid "" "LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" "LF serรก substituรญdo por CRLF em %s.\n" "O final de linha original serรก mantido no ficheiro da sua รกrvore de trabalho." -#: convert.c:215 +#: convert.c:284 #, c-format -msgid "LF would be replaced by CRLF in %s" -msgstr "LF serรก substituรญdo por CRLF em %s." +msgid "BOM is prohibited in '%s' if encoded as %s" +msgstr "" -#: date.c:97 +#: convert.c:291 +#, c-format +msgid "" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " +"working-tree-encoding." +msgstr "" + +#: convert.c:304 +#, c-format +msgid "BOM is required in '%s' if encoded as %s" +msgstr "" + +#: 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 "" + +#: convert.c:419 convert.c:490 +#, fuzzy, c-format +msgid "failed to encode '%s' from %s to %s" +msgstr "falha ao copiar notas de '%s' para '%s'" + +#: convert.c:462 +#, c-format +msgid "encoding '%s' from %s to %s and back is not the same" +msgstr "" + +#: convert.c:665 +#, fuzzy, c-format +msgid "cannot fork to run external filter '%s'" +msgstr "nรฃo รฉ possรญvel escrever o ficheiro de conservaรงรฃo '%s'" + +#: convert.c:685 +#, fuzzy, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "nรฃo รฉ possรญvel ler o conteรบdo atual de '%s'" + +#: convert.c:692 +#, fuzzy, c-format +msgid "external filter '%s' failed %d" +msgstr "falha ao mudar o nome de '%s'" + +#: convert.c:727 convert.c:730 +#, c-format +msgid "read from external filter '%s' failed" +msgstr "" + +#: convert.c:733 convert.c:788 +#, fuzzy, c-format +msgid "external filter '%s' failed" +msgstr "falha ao mudar o nome de '%s'" + +#: convert.c:837 +#, fuzzy +msgid "unexpected filter type" +msgstr "fim de ficheiro inesperado" + +#: convert.c:848 +msgid "path name too long for external filter" +msgstr "" + +#: convert.c:940 +#, c-format +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "" + +#: convert.c:1240 +msgid "true/false are no valid working-tree-encodings" +msgstr "" + +#: convert.c:1428 convert.c:1462 +#, fuzzy, c-format +msgid "%s: clean filter '%s' failed" +msgstr "falha ao criar '%s'" + +#: convert.c:1508 +#, fuzzy, c-format +msgid "%s: smudge filter %s failed" +msgstr "falha ao atualizar os ficheiros" + +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "" + +#: credential.c:438 +#, fuzzy, c-format +msgid "url has no scheme: %s" +msgstr "Remoto inexistente: %s" + +#: credential.c:511 +#, fuzzy, c-format +msgid "credential url cannot be parsed: %s" +msgstr "nรฃo foi possรญvel analisar %s" + +#: date.c:138 msgid "in the future" msgstr "no futuro" -#: date.c:103 -#, c-format -msgid "%lu second ago" -msgid_plural "%lu seconds ago" +#: date.c:144 +#, fuzzy, c-format +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "hรก %lu segundo" msgstr[1] "hรก %lu segundos" -#: date.c:110 -#, c-format -msgid "%lu minute ago" -msgid_plural "%lu minutes ago" +#: date.c:151 +#, fuzzy, c-format +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "hรก %lu minuto" msgstr[1] "hรก %lu minutos" -#: date.c:117 -#, c-format -msgid "%lu hour ago" -msgid_plural "%lu hours ago" +#: date.c:158 +#, fuzzy, c-format +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "hรก %lu hora" msgstr[1] "hรก %lu horas" -#: date.c:124 -#, c-format -msgid "%lu day ago" -msgid_plural "%lu days ago" +#: date.c:165 +#, fuzzy, c-format +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" msgstr[0] "hรก %lu dia" msgstr[1] "hรก %lu dias" -#: date.c:130 -#, c-format -msgid "%lu week ago" -msgid_plural "%lu weeks ago" +#: date.c:171 +#, fuzzy, c-format +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "hรก %lu semana" msgstr[1] "hรก %lu semanas" -#: date.c:137 -#, c-format -msgid "%lu month ago" -msgid_plural "%lu months ago" +#: date.c:178 +#, fuzzy, c-format +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" msgstr[0] "hรก %lu mรชs" msgstr[1] "hรก %lu meses" -#: date.c:148 -#, c-format -msgid "%lu year" -msgid_plural "%lu years" +#: date.c:189 +#, fuzzy, c-format +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" msgstr[0] "%lu ano" msgstr[1] "%lu anos" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:151 -#, c-format -msgid "%s, %lu month ago" -msgid_plural "%s, %lu months ago" +#: date.c:192 +#, fuzzy, c-format +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "hรก %s e %lu mรชs" msgstr[1] "hรก %s e %lu meses" -#: date.c:156 date.c:161 -#, c-format -msgid "%lu year ago" -msgid_plural "%lu years ago" +#: date.c:197 date.c:202 +#, fuzzy, c-format +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" msgstr[0] "hรก %lu ano" msgstr[1] "hรก %lu anos" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "falha ao ler o ficheiro de comando '%s'" +#: delta-islands.c:272 +msgid "Propagating island marks" +msgstr "" -#: diffcore-rename.c:536 -msgid "Performing inexact rename detection" -msgstr "Deteรงรฃo de mudanรงa de nome inexata em curso" +#: delta-islands.c:290 +#, fuzzy, c-format +msgid "bad tree object %s" +msgstr "objeto รกrvore" + +#: delta-islands.c:334 +#, fuzzy, c-format +msgid "failed to load island regex for '%s': %s" +msgstr "falha ao abrir '%s': %s" -#: diff.c:62 +#: delta-islands.c:390 #, c-format -msgid "option '%s' requires a value" -msgstr "a opรงรฃo '%s' requer um valor" +msgid "island regex from config has too many capture groups (max=%d)" +msgstr "" -#: diff.c:124 +#: delta-islands.c:467 +#, c-format +msgid "Marked %d islands, done.\n" +msgstr "" + +#: diff-no-index.c:238 +#, fuzzy +msgid "git diff --no-index [<options>] <path> <path>" +msgstr "git worktree add [<opรงรตes>] <caminho> [<ramo>]" + +#: diff-no-index.c:263 +msgid "" +"Not a git repository. Use --no-index to compare two paths outside a working " +"tree" +msgstr "" + +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Falha ao analisar percentagem limite de dirstat '%s'\n" -#: diff.c:129 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Parรขmetro de dirstat desconhecido '%s'\n" -#: diff.c:281 +#: diff.c:297 +msgid "" +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " +"'dimmed-zebra', 'plain'" +msgstr "" + +#: diff.c:325 +#, 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 "" + +#: diff.c:333 +msgid "" +"color-moved-ws: allow-indentation-change cannot be combined with other " +"whitespace modes" +msgstr "" + +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Valor desconhecido na variรกvel de configuraรงรฃo 'diff.submodule': '%s'" -#: diff.c:344 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1549,20 +3252,36 @@ msgstr "" "Erros encontrados na variรกvel de configuraรงรฃo 'diff.dirstat':\n" "%s" -#: diff.c:3102 +#: diff.c:4269 #, c-format msgid "external diff died, stopping at %s" msgstr "o diff externo terminou inesperadamente, interrompido em %s" -#: diff.c:3428 +#: diff.c:4618 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check e -s sรฃo mutuamente exclusivos" -#: diff.c:3518 +#: diff.c:4621 +#, fuzzy +msgid "-G, -S and --find-object are mutually exclusive" +msgstr "-b, -B e --detach sรฃo mutuamente exclusivos" + +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "--follow requer exatamente um รบnico especificador de caminho" -#: diff.c:3681 +#: diff.c:4747 +#, fuzzy, c-format +msgid "invalid --stat value: %s" +msgstr "valor de cor invรกlido: %.*s" + +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 +#, fuzzy, c-format +msgid "%s expects a numerical value" +msgstr "a opรงรฃo '%c' espera um valor numรฉrico" + +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1571,276 +3290,1012 @@ msgstr "" "Falha ao analisar parรขmetro da opรงรฃo --dirstat/-X:\n" "%s" -#: diff.c:3695 +#: diff.c:4869 +#, c-format +msgid "unknown change class '%c' in --diff-filter=%s" +msgstr "" + +#: diff.c:4893 +#, c-format +msgid "unknown value after ws-error-highlight=%.*s" +msgstr "" + +#: diff.c:4907 +#, fuzzy, c-format +msgid "unable to resolve '%s'" +msgstr "nรฃo foi possรญvel criar '%s'" + +#: diff.c:4957 diff.c:4963 +#, c-format +msgid "%s expects <n>/<m> form" +msgstr "" + +#: diff.c:4975 #, c-format -msgid "Failed to parse --submodule option parameter: '%s'" +msgid "%s expects a character, got '%s'" +msgstr "" + +#: diff.c:4996 +#, fuzzy, c-format +msgid "bad --color-moved argument: %s" +msgstr "argumento nรฃo reconhecido: %s" + +#: diff.c:5015 +#, fuzzy, c-format +msgid "invalid mode '%s' in --color-moved-ws" +msgstr "objeto invรกlido '%s' fornecido." + +#: diff.c:5055 +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" + +#: diff.c:5091 diff.c:5111 +#, fuzzy, c-format +msgid "invalid argument to %s" +msgstr "valor invรกlido de %s" + +#: diff.c:5248 +#, fuzzy, c-format +msgid "failed to parse --submodule option parameter: '%s'" msgstr "Falha ao analisar parรขmetro da opรงรฃo --submodule: '%s'" -#: diff.c:4719 +#: diff.c:5304 +#, c-format +msgid "bad --word-diff argument: %s" +msgstr "" + +#: diff.c:5327 +msgid "Diff output format options" +msgstr "" + +#: diff.c:5329 diff.c:5335 +#, fuzzy +msgid "generate patch" +msgstr "incorporar o patch" + +#: diff.c:5332 builtin/log.c:176 +msgid "suppress diff output" +msgstr "suprimir saรญda do diff" + +#: diff.c:5337 diff.c:5451 diff.c:5458 +msgid "<n>" +msgstr "" + +#: diff.c:5338 diff.c:5341 +#, fuzzy +msgid "generate diffs with <n> lines context" +msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem" + +#: diff.c:5343 +msgid "generate the diff in raw format" +msgstr "" + +#: diff.c:5346 +#, fuzzy +msgid "synonym for '-p --raw'" +msgstr "(sinรณnimo de --stat)" + +#: diff.c:5350 +#, fuzzy +msgid "synonym for '-p --stat'" +msgstr "(sinรณnimo de --stat)" + +#: diff.c:5354 +#, fuzzy +msgid "machine friendly --stat" +msgstr "saรญda inteligรญvel por mรกquina" + +#: diff.c:5357 +msgid "output only the last line of --stat" +msgstr "" + +#: diff.c:5359 diff.c:5367 +msgid "<param1,param2>..." +msgstr "" + +#: diff.c:5360 +msgid "" +"output the distribution of relative amount of changes for each sub-directory" +msgstr "" + +#: diff.c:5364 +#, fuzzy +msgid "synonym for --dirstat=cumulative" +msgstr "sinรณnimo de --files-with-matches" + +#: diff.c:5368 +msgid "synonym for --dirstat=files,param1,param2..." +msgstr "" + +#: diff.c:5372 +msgid "warn if changes introduce conflict markers or whitespace errors" +msgstr "" + +#: diff.c:5375 +msgid "condensed summary such as creations, renames and mode changes" +msgstr "" + +#: diff.c:5378 +#, fuzzy +msgid "show only names of changed files" +msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" + +#: diff.c:5381 +#, fuzzy +msgid "show only names and status of changed files" +msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" + +#: diff.c:5383 +msgid "<width>[,<name-width>[,<count>]]" +msgstr "" + +#: diff.c:5384 +#, fuzzy +msgid "generate diffstat" +msgstr "diff status inesperado %c" + +#: diff.c:5386 diff.c:5389 diff.c:5392 +msgid "<width>" +msgstr "" + +#: diff.c:5387 +msgid "generate diffstat with a given width" +msgstr "" + +#: diff.c:5390 +msgid "generate diffstat with a given name width" +msgstr "" + +#: diff.c:5393 +msgid "generate diffstat with a given graph width" +msgstr "" + +#: diff.c:5395 +msgid "<count>" +msgstr "" + +#: diff.c:5396 +msgid "generate diffstat with limited lines" +msgstr "" + +#: diff.c:5399 +msgid "generate compact summary in diffstat" +msgstr "" + +#: diff.c:5402 +msgid "output a binary diff that can be applied" +msgstr "" + +#: diff.c:5405 +msgid "show full pre- and post-image object names on the \"index\" lines" +msgstr "" + +#: diff.c:5407 +#, fuzzy +msgid "show colored diff" +msgstr "mostrar ficheiros ignorados" + +#: diff.c:5408 +msgid "<kind>" +msgstr "" + +#: diff.c:5409 +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" +msgstr "" + +#: diff.c:5412 +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" +msgstr "" + +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 +#, fuzzy +msgid "<prefix>" +msgstr "<prefixo>/" + +#: diff.c:5416 +msgid "show the given source prefix instead of \"a/\"" +msgstr "" + +#: diff.c:5419 +msgid "show the given destination prefix instead of \"b/\"" +msgstr "" + +#: diff.c:5422 +#, fuzzy +msgid "prepend an additional prefix to every line of output" +msgstr "preceder o nomebase do projeto pai na saรญda" + +#: diff.c:5425 +msgid "do not show any source or destination prefix" +msgstr "" + +#: diff.c:5428 +#, fuzzy +msgid "show context between diff hunks up to the specified number of lines" +msgstr "criar um clone raso, truncado ao nรบmero especificado de revisรตes" + +#: diff.c:5432 diff.c:5437 diff.c:5442 +msgid "<char>" +msgstr "" + +#: diff.c:5433 +msgid "specify the character to indicate a new line instead of '+'" +msgstr "" + +#: diff.c:5438 +msgid "specify the character to indicate an old line instead of '-'" +msgstr "" + +#: diff.c:5443 +msgid "specify the character to indicate a context instead of ' '" +msgstr "" + +#: diff.c:5446 +#, fuzzy +msgid "Diff rename options" +msgstr "Opรงรตes genรฉricas" + +#: diff.c:5447 +#, fuzzy +msgid "<n>[/<m>]" +msgstr "<n>[,<base>]" + +#: diff.c:5448 +msgid "break complete rewrite changes into pairs of delete and create" +msgstr "" + +#: diff.c:5452 +#, fuzzy +msgid "detect renames" +msgstr "nome do remoto" + +#: diff.c:5456 +msgid "omit the preimage for deletes" +msgstr "" + +#: diff.c:5459 +msgid "detect copies" +msgstr "" + +#: diff.c:5463 +msgid "use unmodified files as source to find copies" +msgstr "" + +#: diff.c:5465 +#, fuzzy +msgid "disable rename detection" +msgstr "Deteรงรฃo de mudanรงa de nome inexata em curso" + +#: diff.c:5468 +msgid "use empty blobs as rename source" +msgstr "" + +#: diff.c:5470 +msgid "continue listing the history of a file beyond renames" +msgstr "" + +#: diff.c:5473 +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" +msgstr "" + +#: diff.c:5475 +#, fuzzy +msgid "Diff algorithm options" +msgstr "opรงรฃo invรกlida: %s" + +#: diff.c:5477 +msgid "produce the smallest possible diff" +msgstr "" + +#: diff.c:5480 +#, fuzzy +msgid "ignore whitespace when comparing lines" +msgstr "ignorar alteraรงรตes de espaรงo em branco ao procurar contexto" + +#: diff.c:5483 +#, fuzzy +msgid "ignore changes in amount of whitespace" +msgstr "ignorar alteraรงรตes de espaรงo em branco ao procurar contexto" + +#: diff.c:5486 +#, fuzzy +msgid "ignore changes in whitespace at EOL" +msgstr "ignorar alteraรงรตes de espaรงo em branco ao procurar contexto" + +#: diff.c:5489 +msgid "ignore carrier-return at the end of line" +msgstr "" + +#: diff.c:5492 +msgid "ignore changes whose lines are all blank" +msgstr "" + +#: diff.c:5495 +msgid "heuristic to shift diff hunk boundaries for easy reading" +msgstr "" + +#: diff.c:5498 +msgid "generate diff using the \"patience diff\" algorithm" +msgstr "" + +#: diff.c:5502 +msgid "generate diff using the \"histogram diff\" algorithm" +msgstr "" + +#: diff.c:5504 +msgid "<algorithm>" +msgstr "" + +#: diff.c:5505 +msgid "choose a diff algorithm" +msgstr "" + +#: diff.c:5507 +#, fuzzy +msgid "<text>" +msgstr "texto" + +#: diff.c:5508 +msgid "generate diff using the \"anchored diff\" algorithm" +msgstr "" + +#: diff.c:5510 diff.c:5519 diff.c:5522 +#, fuzzy +msgid "<mode>" +msgstr "modo" + +#: diff.c:5511 +msgid "show word diff, using <mode> to delimit changed words" +msgstr "" + +#: diff.c:5513 diff.c:5516 diff.c:5561 +msgid "<regex>" +msgstr "" + +#: diff.c:5514 +msgid "use <regex> to decide what a word is" +msgstr "" + +#: diff.c:5517 +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" +msgstr "" + +#: diff.c:5520 +msgid "moved lines of code are colored differently" +msgstr "" + +#: diff.c:5523 +msgid "how white spaces are ignored in --color-moved" +msgstr "" + +#: diff.c:5526 +#, fuzzy +msgid "Other diff options" +msgstr "Opรงรตes genรฉricas" + +#: diff.c:5528 +msgid "when run from subdir, exclude changes outside and show relative paths" +msgstr "" + +#: diff.c:5532 +#, fuzzy +msgid "treat all files as text" +msgstr "processar ficheiros binรกrios como texto" + +#: diff.c:5534 +msgid "swap two inputs, reverse the diff" +msgstr "" + +#: diff.c:5536 +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "" + +#: diff.c:5538 +msgid "disable all output of the program" +msgstr "" + +#: diff.c:5540 +msgid "allow an external diff helper to be executed" +msgstr "" + +#: diff.c:5542 +msgid "run external text conversion filters when comparing binary files" +msgstr "" + +#: diff.c:5544 +#, fuzzy +msgid "<when>" +msgstr "quando" + +#: diff.c:5545 +#, fuzzy +msgid "ignore changes to submodules in the diff generation" +msgstr "" +"ignorar alteraรงรตes em submรณdulos, quando รฉ opcional: all, dirty, untracked. " +"(Predefiniรงรฃo: all)" + +#: diff.c:5548 +#, fuzzy +msgid "<format>" +msgstr "formato" + +#: diff.c:5549 +msgid "specify how differences in submodules are shown" +msgstr "" + +#: diff.c:5553 +#, fuzzy +msgid "hide 'git add -N' entries from the index" +msgstr "usar .gitattributes apenas a partir do รญndice" + +#: diff.c:5556 +msgid "treat 'git add -N' entries as real in the index" +msgstr "" + +#: diff.c:5558 +#, fuzzy +msgid "<string>" +msgstr "cadeia" + +#: diff.c:5559 +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "" + +#: diff.c:5562 +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "" + +#: diff.c:5565 +#, fuzzy +msgid "show all changes in the changeset with -S or -G" +msgstr "mostrar ficheiros com correspondรชncias no paginador" + +#: diff.c:5568 +#, fuzzy +msgid "treat <string> in -S as extended POSIX regular expression" +msgstr "usar expressรตes regulares estendidas do POSIX" + +#: diff.c:5571 +#, fuzzy +msgid "control the order in which files appear in the output" +msgstr "mostrar outros ficheiros na saรญda" + +#: diff.c:5572 +#, fuzzy +msgid "<object-id>" +msgstr "objeto" + +#: diff.c:5573 +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "" + +#: diff.c:5575 +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "" + +#: diff.c:5576 +msgid "select files by diff type" +msgstr "" + +#: diff.c:5578 +#, fuzzy +msgid "<file>" +msgstr "ficheiro" + +#: diff.c:5579 +#, fuzzy +msgid "Output to a specific file" +msgstr "submeter somente os ficheiros especificados" + +#: diff.c:6236 msgid "inexact rename detection was skipped due to too many files." msgstr "" "a deteรงรฃo mudanรงa de nome inexata foi omitida devido a demasiados ficheiros." -#: diff.c:4722 +#: diff.c:6239 msgid "only found copies from modified paths due to too many files." msgstr "" "sรณ foram encontradas cรณpias de caminhos modificados devido a demasiados " "ficheiros." -#: diff.c:4725 +#: diff.c:6242 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" "pode tentar definir a variรกvel %s para, pelo menos, %d e repetir o comando." -#: dir.c:1899 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "falha ao ler o ficheiro de comando '%s'" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "Deteรงรฃo de mudanรงa de nome inexata em curso" + +#: dir.c:578 +#, fuzzy, c-format +msgid "pathspec '%s' did not match any file(s) known to git" +msgstr "o especificador de caminho '%s' nรฃo corresponde a nenhum ficheiro" + +#: dir.c:718 dir.c:747 dir.c:760 +#, fuzzy, c-format +msgid "unrecognized pattern: '%s'" +msgstr "argumento nรฃo reconhecido: %s" + +#: dir.c:777 dir.c:791 +#, fuzzy, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "opรงรฃo de espaรงo em branco nรฃo reconhecida '%s'" + +#: dir.c:809 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" + +#: dir.c:819 +msgid "disabling cone pattern matching" +msgstr "" + +#: dir.c:1198 +#, fuzzy, c-format +msgid "cannot use %s as an exclude file" +msgstr "nรฃo รฉ possรญvel guardar o ficheiro รญndice" + +#: dir.c:2305 +#, fuzzy, c-format +msgid "could not open directory '%s'" +msgstr "nรฃo foi possรญvel criar o diretรณrio '%s'" + +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "falha ao obter nome e informaรงรฃo do kernel" -#: dir.c:2018 -msgid "Untracked cache is disabled on this system or location." +#: dir.c:2729 +#, fuzzy +msgid "untracked cache is disabled on this system or location" msgstr "A cache nรฃo controlada estรก desativada neste sistema ou localizaรงรฃo." -#: dir.c:2776 dir.c:2781 +#: dir.c:3520 +#, fuzzy, c-format +msgid "index file corrupt in repo %s" +msgstr "ficheiro de รญndice corrompido" + +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "nรฃo foi possรญvel criar o diretรณrios para %s" -#: dir.c:2806 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "nรฃo foi possรญvel migrar o diretรณrio git de '%s' para '%s'" -#: entry.c:280 +#: editor.c:74 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "" + +#: entry.c:177 +#, fuzzy +msgid "Filtering content" +msgstr "imprimir conteรบdo da tag" + +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "nรฃo foi possรญvel obter stat do ficheiro '%s'" -#: fetch-pack.c:249 +#: environment.c:150 +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "" + +#: environment.c:337 +#, fuzzy, c-format +msgid "could not set GIT_DIR to '%s'" +msgstr "nรฃo foi possรญvel definir '%s' como '%s'" + +#: exec-cmd.c:363 +#, fuzzy, c-format +msgid "too many args to run %s" +msgstr "Demasiados argumentos." + +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: esperava-se lista rasa" -#: fetch-pack.c:261 -msgid "git fetch-pack: expected ACK/NAK, got EOF" -msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se EOF" +#: fetch-pack.c:179 +#, fuzzy +msgid "git fetch-pack: expected a flush packet after shallow list" +msgstr "git fetch-pack: esperava-se lista rasa" + +#: fetch-pack.c:190 +#, fuzzy +msgid "git fetch-pack: expected ACK/NAK, got a flush packet" +msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'" -#: fetch-pack.c:279 +#: fetch-pack.c:210 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'" -#: fetch-pack.c:331 +#: fetch-pack.c:221 +#, fuzzy +msgid "unable to write to remote" +msgstr "nรฃo foi possรญvel escrever o ficheiro da tag" + +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requer multi_ack_detailed" -#: fetch-pack.c:417 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "linha rasa invรกlida: %s" -#: fetch-pack.c:423 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "linha para aprofundar invรกlida: %s" -#: fetch-pack.c:425 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "objeto nรฃo encontrado: %s" -#: fetch-pack.c:428 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "erro no objeto: %s" -#: fetch-pack.c:430 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "raso nรฃo encontrado: %s" -#: fetch-pack.c:433 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "esperava-se raso/aprofundar, obteve-se %s" -#: fetch-pack.c:472 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "obteve-se %s %d %s" -#: fetch-pack.c:486 +#: fetch-pack.c:448 #, c-format msgid "invalid commit %s" msgstr "commit invรกlido %s" -#: fetch-pack.c:519 +#: fetch-pack.c:479 msgid "giving up" msgstr "desistรชncia" -#: fetch-pack.c:529 progress.c:235 +#: fetch-pack.c:492 progress.c:339 msgid "done" msgstr "concluรญdo" -#: fetch-pack.c:541 +#: fetch-pack.c:504 #, c-format msgid "got %s (%d) %s" msgstr "obteve-se %s (%d) %s" -#: fetch-pack.c:587 +#: fetch-pack.c:540 #, c-format msgid "Marking %s as complete" msgstr "Marcado %s como completo" -#: fetch-pack.c:735 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "jรก se tem %s (%s)" -#: fetch-pack.c:773 +#: fetch-pack.c:824 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: nรฃo รฉ possรญvel efetuar fork de sideband demultiplexer" -#: fetch-pack.c:781 +#: fetch-pack.c:832 msgid "protocol error: bad pack header" msgstr "erro de protocolo: cabeรงalho de pacote incorreto" -#: fetch-pack.c:837 +#: fetch-pack.c:916 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: nรฃo รฉ possรญvel criar processo filho %s" -#: fetch-pack.c:853 +#: fetch-pack.c:933 #, c-format msgid "%s failed" msgstr "%s falhou" -#: fetch-pack.c:855 +#: fetch-pack.c:935 msgid "error in sideband demultiplexer" msgstr "erro no sideband demultiplexer" -#: fetch-pack.c:882 -msgid "Server does not support shallow clients" -msgstr "O servidor nรฃo suporta clientes rasos" - -#: fetch-pack.c:886 -msgid "Server supports multi_ack_detailed" -msgstr "O servidor suporta multi_ack_detailed" - -#: fetch-pack.c:889 -msgid "Server supports no-done" -msgstr "O servidor suporta no-done" - -#: fetch-pack.c:895 -msgid "Server supports multi_ack" -msgstr "O servidor suporta muilti_ack" - -#: fetch-pack.c:899 -msgid "Server supports side-band-64k" -msgstr "O servidor suporta side-band-64k" - -#: fetch-pack.c:903 -msgid "Server supports side-band" -msgstr "O servidor suporta side-band" - -#: fetch-pack.c:907 -msgid "Server supports allow-tip-sha1-in-want" -msgstr "O servidor suporta allow-tip-sha1-in-want" - -#: fetch-pack.c:911 -msgid "Server supports allow-reachable-sha1-in-want" -msgstr "O servidor suporta allow-reachable-sha1-in-want" - -#: fetch-pack.c:921 -msgid "Server supports ofs-delta" -msgstr "O servidor suporta ofs-delta" - -#: fetch-pack.c:928 +#: fetch-pack.c:978 #, c-format msgid "Server version is %.*s" msgstr "A versรฃo do servidor รฉ %.*s" -#: fetch-pack.c:934 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 +#, fuzzy, c-format +msgid "Server supports %s" +msgstr "O servidor suporta side-band" + +#: fetch-pack.c:985 +msgid "Server does not support shallow clients" +msgstr "O servidor nรฃo suporta clientes rasos" + +#: fetch-pack.c:1045 msgid "Server does not support --shallow-since" msgstr "O servidor nรฃo suporta --shallow-since" -#: fetch-pack.c:938 +#: fetch-pack.c:1050 msgid "Server does not support --shallow-exclude" msgstr "O servidor nรฃo suporta --shallow-exclude" -#: fetch-pack.c:940 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "O servidor nรฃo suporta --deepen" -#: fetch-pack.c:951 +#: fetch-pack.c:1056 +#, fuzzy +msgid "Server does not support this repository's object format" +msgstr "O servidor nรฃo suporta --deepen" + +#: fetch-pack.c:1069 msgid "no common commits" msgstr "nenhum commit em comum" -#: fetch-pack.c:963 +#: fetch-pack.c:1081 fetch-pack.c:1619 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: falha ao obter." -#: fetch-pack.c:1125 +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "" + +#: fetch-pack.c:1209 +#, fuzzy, c-format +msgid "the server does not support algorithm '%s'" +msgstr "O servidor nรฃo suporta clientes rasos" + +#: fetch-pack.c:1229 +#, fuzzy +msgid "Server does not support shallow requests" +msgstr "O servidor nรฃo suporta clientes rasos" + +#: fetch-pack.c:1236 +#, fuzzy +msgid "Server supports filter" +msgstr "O servidor suporta ofs-delta" + +#: fetch-pack.c:1275 +#, fuzzy +msgid "unable to write request to remote" +msgstr "nรฃo foi possรญvel escrever os parรขmetros no ficheiro de configuraรงรฃo" + +#: fetch-pack.c:1293 +#, c-format +msgid "error reading section header '%s'" +msgstr "" + +#: fetch-pack.c:1299 +#, fuzzy, c-format +msgid "expected '%s', received '%s'" +msgstr "blob para %s '%s' esperado" + +#: fetch-pack.c:1360 +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "" + +#: fetch-pack.c:1365 +#, c-format +msgid "error processing acks: %d" +msgstr "" + +#: fetch-pack.c:1375 +msgid "expected packfile to be sent after 'ready'" +msgstr "" + +#: fetch-pack.c:1377 +msgid "expected no other sections to be sent after no 'ready'" +msgstr "" + +#: fetch-pack.c:1419 +#, c-format +msgid "error processing shallow info: %d" +msgstr "" + +#: fetch-pack.c:1466 +#, fuzzy, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "esperava-se raso/aprofundar, obteve-se %s" + +#: fetch-pack.c:1471 +#, fuzzy, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "fim de ficheiro inesperado" + +#: fetch-pack.c:1476 +#, c-format +msgid "error processing wanted refs: %d" +msgstr "" + +#: fetch-pack.c:1506 +#, fuzzy +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack: esperava-se lista rasa" + +#: fetch-pack.c:1887 msgid "no matching remote head" msgstr "nenhuma cabeรงa remota correspondente" -#: fetch-pack.c:1147 +#: fetch-pack.c:1910 builtin/clone.c:692 +msgid "remote did not send all necessary objects" +msgstr "o remoto nรฃo enviou todos os objetos necessรกrios" + +#: fetch-pack.c:1937 #, c-format msgid "no such remote ref %s" msgstr "referรชncia remota %s inexistente" -#: fetch-pack.c:1150 +#: fetch-pack.c:1940 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "O servidor nรฃo permite pedido do objeto nรฃo anunciado %s" -#: gpg-interface.c:185 -msgid "gpg failed to sign the data" -msgstr "gpg nรฃo assinou os dados" - -#: gpg-interface.c:215 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "nรฃo foi possรญvel criar ficheiro temporรกrio" -#: gpg-interface.c:217 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "falha ao escrever assinatura destacada em '%s'" -#: graph.c:96 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg nรฃo assinou os dados" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorar cor invรกlida '%.*s' em log.graphColors" -#: grep.c:1796 +#: 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 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': nรฃo foi possรญvel ler %s" -#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 +#: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "falha ao invocar stat de '%s'" -#: grep.c:1824 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "'%s': leitura truncada" -#: help.c:218 +#: help.c:23 +msgid "start a working area (see also: git help tutorial)" +msgstr "iniciar uma รกrea de trabalho (consulte tambรฉm: git help tutorial)" + +#: help.c:24 +msgid "work on the current change (see also: git help everyday)" +msgstr "trabalhar na alteraรงรฃo atual (consulte tambรฉm: git help everyday)" + +#: help.c:25 +msgid "examine the history and state (see also: git help revisions)" +msgstr "examinar o histรณrico e estado (consulte tambรฉm: git help revisions)" + +#: help.c:26 +msgid "grow, mark and tweak your common history" +msgstr "aumentar, marcar e ajustar o seu histรณrico comum" + +#: help.c:27 +msgid "collaborate (see also: git help workflows)" +msgstr "colaborar (consulte tambรฉm: 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:300 #, c-format msgid "available git commands in '%s'" msgstr "comandos do git disponรญvel em '%s'" -#: help.c:225 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "comandos do git disponรญveis noutras localizaรงรตes em $PATH" -#: help.c:256 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "Estes sรฃo comandos do Git comuns usados em diversas situaรงรตes:" -#: help.c:321 +#: help.c:365 git.c:99 +#, fuzzy, c-format +msgid "unsupported command listing type '%s'" +msgstr "versรฃo de รญndice %s nรฃo suportada" + +#: help.c:405 +#, fuzzy +msgid "The Git concept guides are:" +msgstr "Os guias comuns do Git:\n" + +#: help.c:429 +msgid "See 'git help <command>' to read about a specific subcommand" +msgstr "" + +#: help.c:434 +#, fuzzy +msgid "External commands" +msgstr "a executar $command" + +#: help.c:449 +msgid "Command aliases" +msgstr "" + +#: help.c:513 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1849,30 +4304,53 @@ msgstr "" "'%s' parece ser um comando do git, mas nรฃo รฉ possรญvel\n" "executรก-lo. Talvez git-%s esteja danificado?" -#: help.c:376 +#: help.c:572 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oh nรฃo. Nรฃo hรก nenhum comando do Git disponรญvel no sistema." -#: help.c:398 -#, c-format -msgid "" -"WARNING: You called a Git command named '%s', which does not exist.\n" -"Continuing under the assumption that you meant '%s'" +#: help.c:594 +#, fuzzy, c-format +msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" "AVISO: Invocou um comando do Git designado '%s' que nรฃo existe.\n" "Continuando, assumindo que queria dizer '%s'" -#: help.c:403 +#: help.c:599 #, c-format -msgid "in %0.1f seconds automatically..." -msgstr "automaticamente em %0.1f..." +msgid "Continuing under the assumption that you meant '%s'." +msgstr "" -#: help.c:410 +#: help.c:604 +#, c-format +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." +msgstr "" + +#: help.c:612 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' nรฃo รฉ um comando do git. Consulte 'git --help'." -#: help.c:414 help.c:480 +#: help.c:616 +msgid "" +"\n" +"The most similar command is" +msgid_plural "" +"\n" +"The most similar commands are" +msgstr[0] "" +msgstr[1] "" + +#: help.c:656 +#, fuzzy +msgid "git version [<options>]" +msgstr "git column [<opรงรตes>]" + +#: help.c:711 +#, c-format +msgid "%s: %s - %s" +msgstr "%s: %s - %s" + +#: help.c:715 msgid "" "\n" "Did you mean this?" @@ -1886,12 +4364,15 @@ msgstr[1] "" "\n" "Queria dizer deste?" -#: help.c:476 -#, c-format -msgid "%s: %s - %s" -msgstr "%s: %s - %s" +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "" -#: ident.c:343 +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -1917,40 +4398,95 @@ msgstr "" "Omita --global para definir a identidade apenas neste repositรณrio.\n" "\n" -#: ident.c:367 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "nenhum e-mail indicado e a deteรงรฃo automรกtica estรก desativada" -#: ident.c:372 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" "nรฃo รฉ possรญvel detetar automaticamente endereรงo de e-mail (obteve-se '%s')" -#: ident.c:382 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "nenhum nome indicado e a deteรงรฃo automรกtica estรก desativada" -#: ident.c:388 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "nรฃo รฉ possรญvel detetar automaticamente o nome (obteve-se '%s')" -#: ident.c:396 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "nome de identificaรงรฃo vazio (de <%s>) nรฃo รฉ permitido" -#: ident.c:402 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "nome consiste apenas de caracteres nรฃo permitidos: %s" -#: ident.c:417 builtin/commit.c:611 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "formato de data invรกlido: %s" +#: list-objects-filter-options.c:81 +msgid "expected 'tree:<depth>'" +msgstr "" + +#: list-objects-filter-options.c:96 +msgid "sparse:path filters support has been dropped" +msgstr "" + +#: list-objects-filter-options.c:109 +#, fuzzy, c-format +msgid "invalid filter-spec '%s'" +msgstr "ficheiro invรกlido: '%s'" + +#: list-objects-filter-options.c:125 +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "" + +#: list-objects-filter-options.c:167 +msgid "expected something after combine:" +msgstr "" + +#: list-objects-filter-options.c:249 +msgid "multiple filter-specs cannot be combined" +msgstr "" + +#: list-objects-filter-options.c:361 +msgid "unable to upgrade repository format to support partial clone" +msgstr "" + +#: list-objects-filter.c:492 +#, fuzzy, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "nรฃo รฉ possรญvel aceder a '%s'" + +#: list-objects-filter.c:495 +#, fuzzy, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "nรฃo foi possรญvel analisar o formato de --pretty" + +#: list-objects.c:127 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "" + +#: list-objects.c:140 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "" + +#: list-objects.c:375 +#, fuzzy, c-format +msgid "unable to load root tree for commit %s" +msgstr "nรฃo foi possรญvel analisar o commit %s" + #: lockfile.c:152 #, c-format msgid "" @@ -1975,82 +4511,143 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Nรฃo รฉ foi possรญvel criar '%s.lock': %s" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "falha ao ler a cache" - -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393 -#: builtin/checkout.c:607 builtin/clone.c:749 -msgid "unable to write new index file" -msgstr "nรฃo foi possรญvel escrever novo ficheiro de รญndice" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "" -#: merge-recursive.c:209 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(commit incorreto)\n" -#: merge-recursive.c:231 merge-recursive.c:239 -#, c-format -msgid "addinfo_cache failed for path '%s'" +#: merge-recursive.c:379 +#, fuzzy, c-format +msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "addinfo_cache falhou no caminho '%s'" -#: merge-recursive.c:303 -msgid "error building trees" -msgstr "erro ao construir รกrvores" +#: merge-recursive.c:388 +#, fuzzy, c-format +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." +msgstr "addinfo_cache falhou no caminho '%s'" -#: merge-recursive.c:727 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "falha ao criar o caminho '%s'%s" -#: merge-recursive.c:738 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "A remover %s para criar espaรงo para o subdiretรณrio\n" -#: merge-recursive.c:752 merge-recursive.c:771 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": talvez um conflito D/F?" -#: merge-recursive.c:761 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "perda de ficheiro nรฃo controlado em '%s' recusada" -#: merge-recursive.c:803 builtin/cat-file.c:34 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "nรฃo รฉ possรญvel ler o objeto %s: '%s'" -#: merge-recursive.c:805 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "blob para %s '%s' esperado" -#: merge-recursive.c:829 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "falha ao abrir '%s': %s" -#: merge-recursive.c:840 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "falha ao criar a ligaรงรฃo simbรณlica '%s': %s" -#: merge-recursive.c:845 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "nรฃo sei o que fazer com %06o %s '%s'" -#: merge-recursive.c:985 +#: merge-recursive.c:1191 +#, fuzzy, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "Falha ao registar o submรณdulo '$sm_path'" + +#: merge-recursive.c:1198 +#, fuzzy, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "Falha ao registar o submรณdulo '$sm_path'" + +#: merge-recursive.c:1205 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "" + +#: merge-recursive.c:1213 merge-recursive.c:1225 +#, c-format +msgid "Fast-forwarding submodule %s to the following commit:" +msgstr "" + +#: merge-recursive.c:1216 merge-recursive.c:1228 +#, fuzzy, c-format +msgid "Fast-forwarding submodule %s" +msgstr "Avanรงo-rรกpido para $sha1" + +#: merge-recursive.c:1251 +#, c-format +msgid "Failed to merge submodule %s (merge following commits not found)" +msgstr "" + +#: merge-recursive.c:1255 +#, fuzzy, c-format +msgid "Failed to merge submodule %s (not fast-forward)" +msgstr "Falha ao registar o submรณdulo '$sm_path'" + +#: merge-recursive.c:1256 +msgid "Found a possible merge resolution for the submodule:\n" +msgstr "" + +#: 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 "" + +#: merge-recursive.c:1268 +#, c-format +msgid "Failed to merge submodule %s (multiple merges found)" +msgstr "" + +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "Falha ao executar integraรงรฃo interna" -#: merge-recursive.c:989 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "Nรฃo รฉ possรญvel adicionar %s ร base de dados" -#: merge-recursive.c:1092 +#: merge-recursive.c:1378 +#, c-format +msgid "Auto-merging %s" +msgstr "A integrar automaticamente %s" + +#: merge-recursive.c:1402 +#, fuzzy, c-format +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." +msgstr "perda de ficheiro nรฃo controlado em '%s' recusada" + +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2059,7 +4656,7 @@ msgstr "" "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versรฃo de %s de %s " "deixada na รกrvore." -#: merge-recursive.c:1097 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2068,7 +4665,7 @@ msgstr "" "CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versรฃo de %s " "de %s deixada na รกrvore." -#: merge-recursive.c:1104 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2077,7 +4674,7 @@ msgstr "" "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versรฃo de %s de %s " "deixada na รกrvore em %s." -#: merge-recursive.c:1109 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2086,20 +4683,42 @@ msgstr "" "CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versรฃo de %s " "de %s deixada na รกrvore em %s." -#: merge-recursive.c:1143 +#: merge-recursive.c:1526 msgid "rename" msgstr "mudar nome" -#: merge-recursive.c:1143 +#: merge-recursive.c:1526 msgid "renamed" msgstr "nome mudado" -#: merge-recursive.c:1200 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 +#, fuzzy, c-format +msgid "Refusing to lose dirty file at %s" +msgstr "perda de ficheiro nรฃo controlado em '%s' recusada" + +#: merge-recursive.c:1587 +#, fuzzy, c-format +msgid "Refusing to lose untracked file at %s, even though it's in the way." +msgstr "perda de ficheiro nรฃo controlado em '%s' recusada" + +#: merge-recursive.c:1645 +#, fuzzy, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" +msgstr "" +"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em " +"%s" + +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s รฉ um diretรณrio em %s adicionando %s no seu lugar" -#: merge-recursive.c:1225 +#: merge-recursive.c:1681 +#, fuzzy, c-format +msgid "Refusing to lose untracked file at %s; adding as %s instead" +msgstr "perda de ficheiro nรฃo controlado em '%s' recusada" + +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2108,142 +4727,398 @@ msgstr "" "CONFLITO (mudar nome/mudar nome): Mudar o nome \"%s\"->\"%s\" no ramo \"%s\" " "mudar o nome \"%s\"->\"%s\" em \"%s\"%s" -#: merge-recursive.c:1230 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (por resolver)" -#: merge-recursive.c:1292 +#: merge-recursive.c:1805 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome " "%s->%s em %s" -#: merge-recursive.c:1325 +#: merge-recursive.c:2068 #, c-format -msgid "Renaming %s to %s and %s to %s instead" -msgstr "A mudar o nome de %s para %s e de %s para %s, em alternativa" +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 "" -#: merge-recursive.c:1528 +#: merge-recursive.c:2100 #, c-format -msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +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 "" -"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em " -"%s" -#: merge-recursive.c:1543 +#: merge-recursive.c:2110 #, c-format -msgid "Adding merged %s" -msgstr "A adicionar %s integrado" +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:2202 +#, fuzzy, c-format +msgid "" +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" +">%s in %s" +msgstr "" +"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome " +"%s->%s em %s" -#: merge-recursive.c:1550 merge-recursive.c:1780 +#: merge-recursive.c:2447 #, c-format -msgid "Adding as %s instead" -msgstr "A adicionar como %s, em alternativa." +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" -#: merge-recursive.c:1607 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "nรฃo foi possรญvel ler o objeto %s" -#: merge-recursive.c:1610 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "o objeto %s nรฃo รฉ um blob" -#: merge-recursive.c:1679 +#: merge-recursive.c:3040 msgid "modify" msgstr "modificar" -#: merge-recursive.c:1679 +#: merge-recursive.c:3040 msgid "modified" msgstr "modificado" -#: merge-recursive.c:1689 +#: merge-recursive.c:3052 msgid "content" msgstr "conteรบdo" -#: merge-recursive.c:1696 +#: merge-recursive.c:3056 msgid "add/add" msgstr "adicionar/adicionar" -#: merge-recursive.c:1732 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ignorado (integrado รฉ igual ao existente)" -#: merge-recursive.c:1746 -#, c-format -msgid "Auto-merging %s" -msgstr "A integrar automaticamente %s" - -#: merge-recursive.c:1750 git-submodule.sh:944 +#: merge-recursive.c:3101 msgid "submodule" msgstr "submรณdulo" -#: merge-recursive.c:1751 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLITO (%s): conflito de integraรงรฃo em %s" -#: merge-recursive.c:1845 +#: merge-recursive.c:3132 +#, c-format +msgid "Adding as %s instead" +msgstr "A adicionar como %s, em alternativa." + +#: merge-recursive.c:3215 +#, 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:3218 +#, 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:3222 +#, 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:3225 +#, 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:3339 #, c-format msgid "Removing %s" msgstr "A remover %s" -#: merge-recursive.c:1871 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "ficheiro/diretรณrio" -#: merge-recursive.c:1877 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "diretรณrio/ficheiro" -#: merge-recursive.c:1883 +#: merge-recursive.c:3374 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLITO (%s): Hรก um diretรณrio designado %s em %s. A adicionar %s como %s" -#: merge-recursive.c:1892 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "A adicionar %s" -#: merge-recursive.c:1929 -msgid "Already up-to-date!" +#: merge-recursive.c:3392 +#, fuzzy, c-format +msgid "CONFLICT (add/add): Merge conflict in %s" +msgstr "CONFLITO (%s): conflito de integraรงรฃo em %s" + +#: merge-recursive.c:3436 +#, fuzzy +msgid "Already up to date!" msgstr "Jรก estรก atualizado!" -#: merge-recursive.c:1938 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "falha ao integrar as รกrvores %s e %s" -#: merge-recursive.c:2021 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "A integrar:" -#: merge-recursive.c:2034 +#: merge-recursive.c:3563 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u antecessor comum encontrado:" msgstr[1] "%u antecessores comuns encontrados:" -#: merge-recursive.c:2073 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "a integraรงรฃo nรฃo retornou nenhum commit" -#: merge-recursive.c:2136 +#: merge-recursive.c:3672 +#, fuzzy, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"As suas alteraรงรตes locais nos seguintes ficheiros seriam substituรญdas ao " +"integrar:\n" +"%%s" + +#: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "Nรฃo foi possรญvel analisar o objeto '%s'" -#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 msgid "Unable to write index." msgstr "Nรฃo รฉ possรญvel escrever no รญndice." -#: notes-merge.c:273 +#: merge.c:41 +msgid "failed to read the cache" +msgstr "falha ao ler a cache" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "nรฃo foi possรญvel escrever novo ficheiro de รญndice" + +#: midx.c:79 +#, c-format +msgid "multi-pack-index file %s is too small" +msgstr "" + +#: midx.c:95 +#, c-format +msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" +msgstr "" + +#: midx.c:100 +#, c-format +msgid "multi-pack-index version %d not recognized" +msgstr "" + +#: midx.c:105 +#, c-format +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "" + +#: midx.c:122 +msgid "invalid chunk offset (too large)" +msgstr "" + +#: midx.c:146 +msgid "terminating multi-pack-index chunk id appears earlier than expected" +msgstr "" + +#: midx.c:159 +msgid "multi-pack-index missing required pack-name chunk" +msgstr "" + +#: midx.c:161 +msgid "multi-pack-index missing required OID fanout chunk" +msgstr "" + +#: midx.c:163 +msgid "multi-pack-index missing required OID lookup chunk" +msgstr "" + +#: midx.c:165 +msgid "multi-pack-index missing required object offsets chunk" +msgstr "" + +#: midx.c:179 +#, c-format +msgid "multi-pack-index pack names out of order: '%s' before '%s'" +msgstr "" + +#: midx.c:222 +#, c-format +msgid "bad pack-int-id: %u (%u total packs)" +msgstr "" + +#: midx.c:272 +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" +msgstr "" + +#: midx.c:300 +msgid "error preparing packfile from multi-pack-index" +msgstr "" + +#: midx.c:485 +#, fuzzy, c-format +msgid "failed to add packfile '%s'" +msgstr "falha ao ler o ficheiro de comando '%s'" + +#: midx.c:491 +#, fuzzy, c-format +msgid "failed to open pack-index '%s'" +msgstr "falha ao abrir '%s'" + +#: midx.c:551 +#, fuzzy, c-format +msgid "failed to locate object %d in packfile" +msgstr "Falha ao criar os ficheiros de saรญda" + +#: midx.c:853 +msgid "Adding packfiles to multi-pack-index" +msgstr "" + +#: midx.c:886 +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "" + +#: midx.c:938 +#, fuzzy +msgid "no pack files to index." +msgstr "Nรฃo รฉ possรญvel escrever no รญndice." + +#: midx.c:990 +msgid "Writing chunks to multi-pack-index" +msgstr "" + +#: midx.c:1068 +#, fuzzy, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "falha ao limpar o รญndice" + +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "" + +#: midx.c:1132 +msgid "Looking for referenced packfiles" +msgstr "" + +#: midx.c:1147 +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" +msgstr "" + +#: midx.c:1152 +msgid "the midx contains no oid" +msgstr "" + +#: midx.c:1161 +msgid "Verifying OID order in multi-pack-index" +msgstr "" + +#: midx.c:1170 +#, c-format +msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" +msgstr "" + +#: midx.c:1190 +#, fuzzy +msgid "Sorting objects by packfile" +msgstr "A escrever objetos" + +#: midx.c:1197 +#, fuzzy +msgid "Verifying object offsets" +msgstr "A escrever objetos" + +#: midx.c:1213 +#, fuzzy, c-format +msgid "failed to load pack entry for oid[%d] = %s" +msgstr "nรฃo รฉ possรญvel adicionar %s ร cache" + +#: midx.c:1219 +#, fuzzy, c-format +msgid "failed to load pack-index for packfile %s" +msgstr "falha ao ler o ficheiro de comando '%s'" + +#: midx.c:1228 +#, c-format +msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" +msgstr "" + +#: midx.c:1253 +#, fuzzy +msgid "Counting referenced objects" +msgstr "eliminar ficheiros nรฃo referenciados" + +#: midx.c:1263 +msgid "Finding and deleting unreferenced packfiles" +msgstr "" + +#: midx.c:1454 +#, fuzzy +msgid "could not start pack-objects" +msgstr "Nรฃo foi possรญvel lanรงar pack-objects" + +#: midx.c:1474 +#, fuzzy +msgid "could not finish pack-objects" +msgstr "Nรฃo foi possรญvel lanรงar pack-objects" + +#: name-hash.c:537 +#, fuzzy, c-format +msgid "unable to create lazy_dir thread: %s" +msgstr "nรฃo foi possรญvel criar thread: %s" + +#: name-hash.c:559 +#, fuzzy, c-format +msgid "unable to create lazy_name thread: %s" +msgstr "nรฃo foi possรญvel criar thread: %s" + +#: name-hash.c:565 +#, fuzzy, c-format +msgid "unable to join lazy_name thread: %s" +msgstr "nรฃo foi possรญvel criar thread: %s" + +#: notes-merge.c:277 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2254,99 +5129,216 @@ msgstr "" "Use 'git notes merge --commit' ou 'git notes merge --abort' para submeter/" "abortar a integraรงรฃo anterior antes de comeรงar uma nova integraรงรฃo de notas." -#: notes-merge.c:280 +#: notes-merge.c:284 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "Nรฃo concluรญdo a integraรงรฃo de integraรงรฃo de notas (%s presente)." -#: notes-utils.c:41 +#: notes-utils.c:46 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" "Nรฃo รฉ possรญvel submeter รกrvore de notas nรฃo inicializada ou nรฃo referenciada" -#: notes-utils.c:100 +#: notes-utils.c:105 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Valor de notes.rewriteMode incorreto: '%s'" -#: notes-utils.c:110 +#: notes-utils.c:115 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada" -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: notes-utils.c:137 +#. 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 "Valor incorreto de %s: '%s'" -#: object.c:240 +#: object.c:53 +#, fuzzy, c-format +msgid "invalid object type \"%s\"" +msgstr "objeto blob invรกlido %s" + +#: object.c:173 +#, fuzzy, c-format +msgid "object %s is a %s, not a %s" +msgstr "o objeto %s nรฃo รฉ um blob" + +#: object.c:233 +#, fuzzy, c-format +msgid "object %s has unknown type id %d" +msgstr "objeto de tipo desconhecido" + +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "nรฃo foi possรญvel analisar o objeto: %s" -#: parse-options.c:572 +#: object.c:266 object.c:278 +#, c-format +msgid "hash mismatch %s" +msgstr "" + +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, fuzzy, c-format +msgid "unable to get size of %s" +msgstr "nรฃo foi possรญvel mover %s para %s" + +#: packfile.c:630 +msgid "offset before end of packfile (broken .idx?)" +msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)" + +#: packfile.c:1922 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "offset antes do inรญcio do รญndice do pacote %s (รญndice corrompido?)" + +#: packfile.c:1926 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "offset depois do fim do รญndice do pacote %s (รญndice truncado?)" + +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, fuzzy, c-format +msgid "option `%s' expects a numerical value" +msgstr "a opรงรฃo '%c' espera um valor numรฉrico" + +#: parse-options-cb.c:41 +#, fuzzy, c-format +msgid "malformed expiration date '%s'" +msgstr "folha de opรงรตes malformada: '%s'" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "" + +#: parse-options-cb.c:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "nome do objeto malformado '%s'" + +#: parse-options.c:38 +#, fuzzy, c-format +msgid "%s requires a value" +msgstr "a opรงรฃo '%s' requer um valor" + +#: parse-options.c:73 +#, fuzzy, c-format +msgid "%s is incompatible with %s" +msgstr "--long รฉ incompatรญvel com --abbrev=0" + +#: parse-options.c:78 +#, fuzzy, c-format +msgid "%s : incompatible with something else" +msgstr "--dirty รฉ incompatรญvel com commits ou semelhantes" + +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#, fuzzy, c-format +msgid "%s takes no value" +msgstr "%s tem mรบltiplos valores" + +#: parse-options.c:94 +#, fuzzy, c-format +msgid "%s isn't available" +msgstr "a tag anotada %s nรฃo estรก disponรญvel" + +#: parse-options.c:217 +#, c-format +msgid "%s expects a non-negative integer value with an optional k/m/g suffix" +msgstr "" + +#: parse-options.c:386 +#, c-format +msgid "ambiguous option: %s (could be --%s%s or --%s%s)" +msgstr "" + +#: parse-options.c:420 parse-options.c:428 +#, c-format +msgid "did you mean `--%s` (with two dashes)?" +msgstr "" + +#: parse-options.c:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "" + +#: parse-options.c:862 +#, fuzzy, c-format +msgid "unknown option `%s'" +msgstr "opรงรฃo desconhecido %s" + +#: parse-options.c:864 +#, fuzzy, c-format +msgid "unknown switch `%c'" +msgstr "opรงรฃo desconhecido %s" + +#: parse-options.c:866 +#, fuzzy, c-format +msgid "unknown non-ascii option in string: `%s'" +msgstr "Definidiรงรฃo --confirm desconhecida: '%s'\n" + +#: parse-options.c:890 msgid "..." msgstr "..." -#: parse-options.c:590 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "utilizaรงรฃo: %s" #. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation -#: parse-options.c:594 +#. one in "usage: %s" translation. +#. +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " ou: %s" -#: parse-options.c:597 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:631 +#: parse-options.c:957 msgid "-NUM" msgstr "-NUM" -#: parse-options-cb.c:108 -#, c-format -msgid "malformed object name '%s'" -msgstr "nome do objeto malformado '%s'" - -#: path.c:805 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "Nรฃo foi possรญvel dar permissรฃo de escrita ao grupo a %s" -#: pathspec.c:125 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "O carรกcter de escape '\\' nรฃo pode ser usado como รบltimo carรกcter no valor " "de attr" -#: pathspec.c:143 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Sรณ se pode especificar um 'attr:'." -#: pathspec.c:146 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "especificador attr nรฃo pode estar vazio" -#: pathspec.c:189 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "nome de atributo invรกlido %s" -#: pathspec.c:254 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "as definiรงรตes globais 'glob' e 'noglob' de especificador de caminho " "(pathspec) sรฃo incompatรญveis" -#: pathspec.c:261 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2354,69 +5346,237 @@ msgstr "" "a definiรงรฃo global de especificador de caminho 'literal' รฉ incompatรญvel com " "todas as outras definiรงรตes globais de especificador de caminho (pathspec)" -#: pathspec.c:301 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "parรขmetro invรกlido na mรกgica 'prefix' do especificador de caminho" -#: pathspec.c:322 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Mรกgica do especificador de caminho '%.*s' invรกlida em '%s'" -#: pathspec.c:327 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Falta um ')' no final da mรกgica do especificador de caminho em '%s'" -#: pathspec.c:365 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Mรกgica de especificador de caminho '%c' em '%s' nรฃo implementada" -#: pathspec.c:421 pathspec.c:443 -#, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "O caminho '%s' estรก dentro do submรณdulo '%.*s'" - -#: pathspec.c:483 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' e 'glob' sรฃo incompatรญveis" -#: pathspec.c:496 -#, c-format -msgid "%s: '%s' is outside repository" +#: pathspec.c:445 +#, fuzzy, c-format +msgid "%s: '%s' is outside repository at '%s'" msgstr "%s: '%s' estรก fora do repositรณrio" -#: pathspec.c:584 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (mnemรณnica: '%c')" -#: pathspec.c:594 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s: mรกgica de especificador de caminho nรฃo suportada por este comando: %s" -#: pathspec.c:644 -msgid "" -"empty strings as pathspecs will be made invalid in upcoming releases. please " -"use . instead if you meant to match all paths" -msgstr "" -"cadeias de caracteres vazias como especificadores de caminho tornar-se-รฃo " -"invรกlidas nas prรณximas versรตes. Use . para corresponder a todos os caminhos" - -#: pathspec.c:668 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "o especificador de caminho '%s' รฉ indicado por uma ligaรงรฃo simbรณlica" -#: pretty.c:982 +#: pathspec.c:643 +#, c-format +msgid "line is badly quoted: %s" +msgstr "" + +#: pkt-line.c:92 +#, fuzzy +msgid "unable to write flush packet" +msgstr "nรฃo foi possรญvel escrever %s" + +#: pkt-line.c:99 +#, fuzzy +msgid "unable to write delim packet" +msgstr "nรฃo รฉ possรญvel escrever o ficheiro de รญndice" + +#: pkt-line.c:106 +#, fuzzy +msgid "unable to write stateless separator packet" +msgstr "nรฃo รฉ possรญvel escrever o objeto de nota" + +#: pkt-line.c:113 +#, fuzzy +msgid "flush packet write failed" +msgstr "nรฃo foi possรญvel escrever o ficheiro da tag" + +#: pkt-line.c:153 pkt-line.c:239 +msgid "protocol error: impossibly long line" +msgstr "" + +#: pkt-line.c:169 pkt-line.c:171 +#, fuzzy +msgid "packet write with format failed" +msgstr "nรฃo foi possรญvel escrever o ficheiro da tag" + +#: pkt-line.c:203 +msgid "packet write failed - data exceeds max packet size" +msgstr "" + +#: pkt-line.c:210 pkt-line.c:217 +#, fuzzy +msgid "packet write failed" +msgstr "nรฃo foi possรญvel escrever o ficheiro da tag" + +#: pkt-line.c:302 +#, fuzzy +msgid "read error" +msgstr "erro do programa" + +#: pkt-line.c:310 +#, fuzzy +msgid "the remote end hung up unexpectedly" +msgstr "O remoto desligou apรณs contacto inicial" + +#: pkt-line.c:338 +#, fuzzy, c-format +msgid "protocol error: bad line length character: %.4s" +msgstr "erro de protocolo: cabeรงalho de pacote incorreto" + +#: pkt-line.c:352 pkt-line.c:357 +#, fuzzy, c-format +msgid "protocol error: bad line length %d" +msgstr "erro de protocolo: cabeรงalho de pacote incorreto" + +#: pkt-line.c:373 sideband.c:150 +#, c-format +msgid "remote error: %s" +msgstr "erro remoto: %s" + +#: preload-index.c:119 +#, fuzzy +msgid "Refreshing index" +msgstr "nรฃo foi possรญvel refrescar o รญndice" + +#: preload-index.c:138 +#, fuzzy, c-format +msgid "unable to create threaded lstat: %s" +msgstr "nรฃo foi possรญvel criar thread: %s" + +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "nรฃo foi possรญvel analisar o formato de --pretty" -#: read-cache.c:1307 +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" + +#: promisor-remote.c:53 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "A remover objetos duplicados" + +#: range-diff.c:77 +#, fuzzy +msgid "could not start `log`" +msgstr "nรฃo foi possรญvel obter stat de %s" + +#: range-diff.c:79 +#, fuzzy +msgid "could not read `log` output" +msgstr "nรฃo foi possรญvel ler a saรญda do comando 'show'" + +#: range-diff.c:98 sequencer.c:5283 +#, fuzzy, c-format +msgid "could not parse commit '%s'" +msgstr "nรฃo foi possรญvel analisar o commit %s\n" + +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" + +#: range-diff.c:137 +#, fuzzy, c-format +msgid "could not parse git header '%.*s'" +msgstr "nรฃo foi possรญvel analisar o patch '%s'" + +#: range-diff.c:301 +#, fuzzy +msgid "failed to generate diff" +msgstr "falha ao criar o ficheiro %s" + +#: range-diff.c:534 range-diff.c:536 +#, fuzzy, c-format +msgid "could not parse log for '%s'" +msgstr "nรฃo รฉ possรญvel ler o ficheiro de log '%s'" + +#: read-cache.c:682 +#, fuzzy, c-format +msgid "will not add file alias '%s' ('%s' already exists in index)" +msgstr "%s: jรก existe no รญndice" + +#: read-cache.c:698 +#, fuzzy +msgid "cannot create an empty blob in the object database" +msgstr "escrever o objeto na base de dados de objetos" + +#: read-cache.c:720 +#, c-format +msgid "%s: can only add regular files, symbolic links or git-directories" +msgstr "" + +#: read-cache.c:725 +#, fuzzy, c-format +msgid "'%s' does not have a commit checked out" +msgstr "'%s' nรฃo aponta para um commit" + +#: read-cache.c:777 +#, fuzzy, c-format +msgid "unable to index file '%s'" +msgstr "nรฃo foi possรญvel ler o ficheiro de รญndice" + +#: read-cache.c:796 +#, fuzzy, c-format +msgid "unable to add '%s' to index" +msgstr "Nรฃo รฉ possรญvel adicionar %s ร base de dados" + +#: read-cache.c:807 +#, fuzzy, c-format +msgid "unable to stat '%s'" +msgstr "nรฃo foi possรญvel criar '%s'" + +#: read-cache.c:1318 +#, fuzzy, c-format +msgid "'%s' appears as both a file and as a directory" +msgstr "%s existe e nรฃo รฉ um diretรณrio" + +#: read-cache.c:1524 +#, fuzzy +msgid "Refresh index" +msgstr "nรฃo foi possรญvel refrescar o รญndice" + +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2425,7 +5585,7 @@ msgstr "" "index.version definido, mas com valor invรกlido.\n" "A usar a versรฃo %i" -#: read-cache.c:1317 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2434,360 +5594,838 @@ msgstr "" "GIT_INDEX_VERSION definido, mas com valor invรกlido.\n" "A usar a versรฃo %i" -#: read-cache.c:2232 +#: read-cache.c:1705 +#, fuzzy, c-format +msgid "bad signature 0x%08x" +msgstr "adicionar uma assinatura" + +#: read-cache.c:1708 +#, fuzzy, c-format +msgid "bad index version %d" +msgstr "versรฃo de รญndice '%s' incorreta" + +#: read-cache.c:1717 +#, fuzzy +msgid "bad index file sha1 signature" +msgstr "adicionar uma assinatura" + +#: read-cache.c:1747 +#, c-format +msgid "index uses %.4s extension, which we do not understand" +msgstr "" + +#: read-cache.c:1749 +#, fuzzy, c-format +msgid "ignoring %.4s extension" +msgstr "modelo %s ignorado" + +#: read-cache.c:1786 +#, fuzzy, c-format +msgid "unknown index entry format 0x%08x" +msgstr "formato de %.*s desconhecido %s" + +#: read-cache.c:1802 +#, c-format +msgid "malformed name field in the index, near path '%s'" +msgstr "" + +#: read-cache.c:1859 +msgid "unordered stage entries in index" +msgstr "" + +#: read-cache.c:1862 +#, fuzzy, c-format +msgid "multiple stage entries for merged file '%s'" +msgstr "extrair a versรฃo deles dos ficheiros nรฃo integrados" + +#: read-cache.c:1865 +#, fuzzy, c-format +msgid "unordered stage entries for '%s'" +msgstr "nรฃo foi possรญvel criar o diretรณrios para %s" + +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 +msgid "index file corrupt" +msgstr "ficheiro de รญndice corrompido" + +#: read-cache.c:2115 +#, fuzzy, c-format +msgid "unable to create load_cache_entries thread: %s" +msgstr "nรฃo foi possรญvel criar thread: %s" + +#: read-cache.c:2128 +#, fuzzy, c-format +msgid "unable to join load_cache_entries thread: %s" +msgstr "nรฃo foi possรญvel criar thread: %s" + +#: read-cache.c:2161 +#, fuzzy, c-format +msgid "%s: index file open failed" +msgstr "falha ao adicionar ficheiros" + +#: read-cache.c:2165 +#, fuzzy, c-format +msgid "%s: cannot stat the open index" +msgstr "nรฃo รฉ possรญvel ler o รญndice" + +#: read-cache.c:2169 #, c-format -msgid "could not stat '%s" +msgid "%s: index file smaller than expected" +msgstr "" + +#: read-cache.c:2173 +#, fuzzy, c-format +msgid "%s: unable to map index file" +msgstr "nรฃo foi possรญvel ler o ficheiro de รญndice" + +#: read-cache.c:2215 +#, fuzzy, c-format +msgid "unable to create load_index_extensions thread: %s" +msgstr "nรฃo foi possรญvel criar thread: %s" + +#: read-cache.c:2242 +#, fuzzy, c-format +msgid "unable to join load_index_extensions thread: %s" +msgstr "nรฃo foi possรญvel criar thread: %s" + +#: read-cache.c:2274 +#, fuzzy, c-format +msgid "could not freshen shared index '%s'" +msgstr "nรฃo foi possรญvel ler o ficheiro '%s'" + +#: read-cache.c:2321 +#, c-format +msgid "broken index, expect %s in %s, got %s" +msgstr "" + +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 +#, c-format +msgid "could not close '%s'" +msgstr "nรฃo foi possรญvel fechar '%s'" + +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 +#, fuzzy, c-format +msgid "could not stat '%s'" msgstr "nรฃo foi possรญvel obter stat de '%s'" -#: read-cache.c:2245 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "nรฃo รฉ possรญvel diretรณrio git: %s" -#: read-cache.c:2257 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "nรฃo รฉ possรญvel invocar unlink: %s" -#: refs.c:619 builtin/merge.c:844 -#, c-format -msgid "Could not open '%s' for writing" -msgstr "Nรฃo foi possรญvel abrir '%s' para escrita" +#: read-cache.c:3170 +#, fuzzy, c-format +msgid "cannot fix permission bits on '%s'" +msgstr "nรฃo รฉ possรญvel abrir o ficheiro '%s'" -#: refs/files-backend.c:2531 -#, c-format -msgid "could not delete reference %s: %s" -msgstr "nรฃo foi possรญvel eliminar a referรชncia %s: %s" +#: read-cache.c:3319 +#, fuzzy, c-format +msgid "%s: cannot drop to stage #0" +msgstr "nรฃo รฉ possรญvel mudar para o diretรณrio %s" -#: refs/files-backend.c:2534 -#, c-format -msgid "could not delete references: %s" -msgstr "nรฃo foi possรญvel eliminar as referรชncias: %s" +#: rebase-interactive.c:11 +#, fuzzy +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 "" +"Pode corrรญ-lo com 'git rebase --edit-todo' e depois executar 'git rebase --" +"continue'." + +#: rebase-interactive.c:33 +#, fuzzy, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" +"Definiรงรฃo $check_level desconhecida da opรงรฃo rebase.missingCommitsCheck. " +"Ignorado." -#: refs/files-backend.c:2543 +#: rebase-interactive.c:42 +#, fuzzy +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" +"Comandos:\n" +" p, pick = usar commit\n" +" r, reword = usar commit, mas editar a mensagem de commit\n" +" e, edit = usar commit, mas parar para emendar\n" +" s, squash = usar commit, mas fundir com o commit anterior\n" +" f, fixup = como \"squash\", mas descartar a mensagem deste commit\n" +" x, exec = executar o comando (o resto da linha) usando a shell\n" +" d, drop = remover commit\n" +"\n" +"Estas linhas pode ser reordenadas; sรฃo executadas de cima para baixo.\n" + +#: rebase-interactive.c:63 +#, fuzzy, c-format +msgid "Rebase %s onto %s (%d command)" +msgid_plural "Rebase %s onto %s (%d commands)" +msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)" +msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)" + +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 +msgid "" +"\n" +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" +msgstr "" +"\n" +"Nรฃo remover nenhum linha. Use 'drop' explicitamente para remover um commit.\n" + +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 +msgid "" +"\n" +"If you remove a line here THAT COMMIT WILL BE LOST.\n" +msgstr "" +"\n" +"Se remover uma linha daqui AQUELE COMMIT SERร PERDIDO.\n" + +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 +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" +"Estรก a editar o ficheiro de tarefa de um rebase interativo em curso.\n" +"Para continuar o rebase depois de editar, execute:\n" +" git rebase --continue\n" +"\n" + +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "" +"\n" +"No entanto, se remover tudo, o rebase serรก abortado.\n" +"\n" + +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 +#, fuzzy, c-format +msgid "could not write '%s'" +msgstr "nรฃo foi possรญvel escrever em '%s'" + +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 +#, fuzzy, c-format +msgid "could not write '%s'." +msgstr "nรฃo foi possรญvel escrever em '%s'" + +#: rebase-interactive.c:193 +#, fuzzy, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"Aviso: alguns commits podem ter sido descartados acidentalmente.\n" +"Commits descartados (mais novo para o mais velho):" + +#: rebase-interactive.c:200 +#, fuzzy, 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 "" +"Para evitar esta mensagem, use \"drop\" para remover um commit " +"explicitamente.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' para mudar o nรญvel de avisos.\n" +"O comportamentos possรญveis sรฃo: ignore, warn, error." + +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 #, c-format -msgid "could not remove reference %s" -msgstr "nรฃo foi possรญvel eliminar a referรชncia %s" +msgid "could not read '%s'." +msgstr "nรฃo foi possรญvel ler '%s'." -#: ref-filter.c:35 wt-status.c:1780 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "desaparecido" -#: ref-filter.c:36 +#: ref-filter.c:43 #, c-format msgid "ahead %d" msgstr "ร frente %d" -#: ref-filter.c:37 +#: ref-filter.c:44 #, c-format msgid "behind %d" msgstr "atrรกs %d" -#: ref-filter.c:38 +#: ref-filter.c:45 #, c-format msgid "ahead %d, behind %d" msgstr "ร frente %d, atrรกs %d" -#: ref-filter.c:104 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato esperado: %%(color:<cor>)" -#: ref-filter.c:106 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "cor nรฃo reconhecida: %%(color:%s)" -#: ref-filter.c:120 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "valor inteiro esperado refname:lstrip=%s" -#: ref-filter.c:124 +#: ref-filter.c:197 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valor inteiro esperado refname:rstrip=%s" -#: ref-filter.c:126 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argumento de %%(%s) nรฃo reconhecido: %s" -#: ref-filter.c:166 +#: ref-filter.c:254 +#, fuzzy, c-format +msgid "%%(objecttype) does not take arguments" +msgstr "%%(subject) nรฃo leva argumentos" + +#: ref-filter.c:276 +#, fuzzy, c-format +msgid "unrecognized %%(objectsize) argument: %s" +msgstr "argumento de %%(objectname) nรฃo reconhecido: %s" + +#: ref-filter.c:284 +#, fuzzy, c-format +msgid "%%(deltabase) does not take arguments" +msgstr "%%(trailers) nรฃo leva argumentos" + +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) nรฃo leva argumentos" -#: ref-filter.c:173 -#, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) nรฃo leva argumentos" +#: ref-filter.c:309 +#, fuzzy, c-format +msgid "unrecognized %%(subject) argument: %s" +msgstr "argumento de %%(objectname) nรฃo reconhecido: %s" -#: ref-filter.c:180 -#, c-format -msgid "%%(trailers) does not take arguments" -msgstr "%%(trailers) nรฃo leva argumentos" +#: ref-filter.c:330 +#, fuzzy, c-format +msgid "unknown %%(trailers) argument: %s" +msgstr "argumento de mirror desconhecido: %s" -#: ref-filter.c:199 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:201 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argumento de %%(contents) nรฃo reconhecido: %s" -#: ref-filter.c:214 -#, c-format -msgid "positive value expected objectname:short=%s" -msgstr "valor positivo esperado objectname:short=%s" +#: ref-filter.c:380 +#, fuzzy, c-format +msgid "positive value expected '%s' in %%(%s)" +msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:218 -#, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "argumento de %%(objectname) nรฃo reconhecido: %s" +#: ref-filter.c:384 +#, fuzzy, c-format +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "argumento nรฃo reconhecido: %s" + +#: ref-filter.c:398 +#, fuzzy, c-format +msgid "unrecognized email option: %s" +msgstr "posiรงรฃo nรฃo reconhecida:%s" -#: ref-filter.c:245 +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato esperado: %%(align:<largura>,<posiรงรฃo>)" -#: ref-filter.c:257 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "posiรงรฃo nรฃo reconhecida:%s" -#: ref-filter.c:261 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "largura nรฃo reconhecida:%s" -#: ref-filter.c:267 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argumento de %%(align) nรฃo reconhecido: %s" -#: ref-filter.c:271 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "largura positiva esperada com o รกtomo %%(algn)" -#: ref-filter.c:286 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argumento de %%(if) nรฃo reconhecido: %s" -#: ref-filter.c:371 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "nome de ficheiro malformado: %.*s" -#: ref-filter.c:397 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "nome do campo desconhecido: %.*s" -#: ref-filter.c:501 +#: ref-filter.c:615 +#, c-format +msgid "" +"not a git repository, but the field '%.*s' requires access to object data" +msgstr "" + +#: ref-filter.c:739 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: รกtomo %%(if) utilizado sem รกtomo %%(then) correspondente" -#: ref-filter.c:561 +#: ref-filter.c:802 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: รกtomo %%(then) utilizado sem รกtomo %%(if) correspondente" -#: ref-filter.c:563 +#: ref-filter.c:804 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: รกtomo %%(then) utilizado mais que uma vez" -#: ref-filter.c:565 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: รกtomo %%(then) utilizado depois de %%(else)" -#: ref-filter.c:591 +#: ref-filter.c:834 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: รกtomo %%(else) utilizado sem รกtomo %%(if) correspondente" -#: ref-filter.c:593 +#: ref-filter.c:836 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: รกtomo %%(else) utilizado sem รกtomo %%(then) correspondente" -#: ref-filter.c:595 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: รกtomo %%(else) utilizado mais que uma vez" -#: ref-filter.c:608 +#: ref-filter.c:853 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: รกtomo %%(end) utilizado sem รกtomo correspondente" -#: ref-filter.c:663 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "cadeia malformada %s" -#: ref-filter.c:1247 -#, c-format -msgid "(no branch, rebasing %s)" +#: ref-filter.c:1541 +#, fuzzy, c-format +msgid "no branch, rebasing %s" msgstr "(nenhum ramo, a efetuar rebase de %s)" -#: ref-filter.c:1250 -#, c-format -msgid "(no branch, bisect started on %s)" -msgstr "(nenhum ramo, bissecรงรฃo iniciada em %s)" - -#. TRANSLATORS: make sure this matches -#. "HEAD detached at " in wt-status.c -#: ref-filter.c:1256 -#, c-format -msgid "(HEAD detached at %s)" -msgstr "(HEAD destacada em %s)" +#: ref-filter.c:1544 +#, fuzzy, c-format +msgid "no branch, rebasing detached HEAD %s" +msgstr "(nenhum ramo, a efetuar rebase de %s)" -#. TRANSLATORS: make sure this matches -#. "HEAD detached from " in wt-status.c -#: ref-filter.c:1261 -#, c-format -msgid "(HEAD detached from %s)" -msgstr "(HEAD destacada de %s)" +#: ref-filter.c:1547 +#, fuzzy, c-format +msgid "no branch, bisect started on %s" +msgstr "(nenhum ramo, bissecรงรฃo iniciada em %s)" -#: ref-filter.c:1265 -msgid "(no branch)" +#: ref-filter.c:1557 +#, fuzzy +msgid "no branch" msgstr "(nenhum ramo)" -#: ref-filter.c:1420 ref-filter.c:1451 +#: ref-filter.c:1591 ref-filter.c:1800 #, c-format msgid "missing object %s for %s" msgstr "falta o objeto %s de %s" -#: ref-filter.c:1423 ref-filter.c:1454 +#: ref-filter.c:1601 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "falha ao invocar parse_object_buffer sobre %s de %s" -#: ref-filter.c:1692 +#: ref-filter.c:2054 #, c-format msgid "malformed object at '%s'" msgstr "objeto malformado em '%s'" -#: ref-filter.c:1759 +#: ref-filter.c:2143 #, c-format msgid "ignoring ref with broken name %s" msgstr "a referรชncia %s com nome danificado foi ignorada" -#: ref-filter.c:1764 +#: ref-filter.c:2148 refs.c:657 #, c-format msgid "ignoring broken ref %s" msgstr "a referรชncia %s danificada foi ignorada" -#: ref-filter.c:2028 +#: ref-filter.c:2464 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta รกtomo %%(end)" -#: ref-filter.c:2109 +#: ref-filter.c:2563 #, c-format msgid "malformed object name %s" msgstr "nome de objeto malformado %s" -#: remote.c:754 +#: ref-filter.c:2568 +#, fuzzy, c-format +msgid "option `%s' must point to a commit" +msgstr "'%s' nรฃo aponta para um commit" + +#: refs.c:264 +#, fuzzy, c-format +msgid "%s does not point to a valid object!" +msgstr "'%s' nรฃo aponta para um commit" + +#: refs.c:572 +#, fuzzy, c-format +msgid "could not retrieve `%s`" +msgstr "nรฃo foi possรญvel remover '%s'" + +#: refs.c:579 +#, fuzzy, c-format +msgid "invalid branch name: %s = %s" +msgstr "Nome de ramo invรกlido: '%s'" + +#: refs.c:655 +#, fuzzy, c-format +msgid "ignoring dangling symref %s" +msgstr "a referรชncia %s danificada foi ignorada" + +#: refs.c:892 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "" + +#: refs.c:898 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "" + +#: refs.c:957 +#, c-format +msgid "log for %s is empty" +msgstr "" + +#: refs.c:1049 +#, fuzzy, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "a referรชncia %s com nome danificado foi ignorada" + +#: refs.c:1120 +#, fuzzy, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "falha ao abrir '%s': %s" + +#: refs.c:1944 +#, fuzzy, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "nome de identificaรงรฃo vazio (de <%s>) nรฃo รฉ permitido" + +#: refs.c:2024 +msgid "ref updates forbidden inside quarantine environment" +msgstr "" + +#: refs.c:2035 +msgid "ref updates aborted by hook" +msgstr "" + +#: refs.c:2135 refs.c:2165 +#, fuzzy, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "nรฃo รฉ possรญvel criar '%s'" + +#: refs.c:2141 refs.c:2176 +#, fuzzy, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "" +"Nรฃo รฉ possรญvel atualizar os caminhos e mudar para o ramo '%s' ao mesmo tempo." + +#: refs/files-backend.c:1228 +#, c-format +msgid "could not remove reference %s" +msgstr "nรฃo foi possรญvel eliminar a referรชncia %s" + +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "nรฃo foi possรญvel eliminar a referรชncia %s: %s" + +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#, c-format +msgid "could not delete references: %s" +msgstr "nรฃo foi possรญvel eliminar as referรชncias: %s" + +#: refspec.c:167 +#, fuzzy, c-format +msgid "invalid refspec '%s'" +msgstr "ficheiro invรกlido: '%s'" + +#: remote.c:351 +#, c-format +msgid "config remote shorthand cannot begin with '/': %s" +msgstr "" + +#: remote.c:399 +msgid "more than one receivepack given, using the first" +msgstr "" + +#: remote.c:407 +msgid "more than one uploadpack given, using the first" +msgstr "" + +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Nรฃo รฉ possรญvel obter %s e %s ao mesmo tempo para %s" -#: remote.c:758 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s geralmente segue %s, nรฃo %s" -#: remote.c:762 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s segue %s e %s em simultรขneo" -#: remote.c:770 -msgid "Internal error" -msgstr "Erro interno" +#: remote.c:666 +#, c-format +msgid "key '%s' of pattern had no '*'" +msgstr "" + +#: remote.c:676 +#, c-format +msgid "value '%s' of pattern has no '*'" +msgstr "" + +#: remote.c:1073 +#, fuzzy, c-format +msgid "src refspec %s does not match any" +msgstr "%s: nรฃo tem correspondรชncia no รญndice" + +#: remote.c:1078 +#, c-format +msgid "src refspec %s matches more than one" +msgstr "" + +#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push +#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is +#. the <src>. +#. +#: remote.c:1093 +#, 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 "" + +#: remote.c:1113 +#, 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 "" -#: remote.c:1685 remote.c:1787 +#: remote.c:1118 +#, 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 "" + +#: remote.c:1123 +#, 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 "" + +#: remote.c:1128 +#, 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 "" + +#: remote.c:1164 +#, fuzzy, c-format +msgid "%s cannot be resolved to branch" +msgstr "'%s' nรฃo pode ser usado ao mudar de ramo" + +#: remote.c:1175 +#, fuzzy, c-format +msgid "unable to delete '%s': remote ref does not exist" +msgstr "nรฃo รฉ possรญvel escrever o ficheiro '%s' com o modo %o" + +#: remote.c:1187 +#, c-format +msgid "dst refspec %s matches more than one" +msgstr "" + +#: remote.c:1194 +#, c-format +msgid "dst ref %s receives from more than one src" +msgstr "" + +#: remote.c:1703 remote.c:1804 msgid "HEAD does not point to a branch" msgstr "HEAD nรฃo aponta para um ramo" -#: remote.c:1694 +#: remote.c:1712 #, c-format msgid "no such branch: '%s'" msgstr "ramo inexistente: '%s'" -#: remote.c:1697 +#: remote.c:1715 #, c-format msgid "no upstream configured for branch '%s'" msgstr "nenhum ramo a montante configurado para o ramo '%s'" -#: remote.c:1703 +#: remote.c:1721 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" "o ramo a montante '%s' nรฃo estรก guardado como um ramo de monitorizaรงรฃo remoto" -#: remote.c:1718 +#: remote.c:1736 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "o destino de publicaรงรฃo '%s' no remoto '%s' nรฃo รฉ seguido por nenhum ramo " "local" -#: remote.c:1730 +#: remote.c:1748 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "o ramo '%s' nรฃo tem nenhum remoto para publicar" -#: remote.c:1741 +#: remote.c:1758 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" "'%2$s' nรฃo faz parte dos especificadores de referรชncia de '%1$s' para " "publicaรงรฃo" -#: remote.c:1754 +#: remote.c:1771 msgid "push has no destination (push.default is 'nothing')" msgstr "publicaรงรฃo sem destino (push.default รฉ 'nothing')" -#: remote.c:1776 +#: remote.c:1793 msgid "cannot resolve 'simple' push to a single destination" msgstr "nรฃo รฉ possรญvel resolver a publicaรงรฃo 'simple' num รบnico destino" -#: remote.c:2081 +#: remote.c:1922 +#, fuzzy, c-format +msgid "couldn't find remote ref %s" +msgstr "Referรชncia remota HEAD nรฃo encontrada" + +#: remote.c:1935 +#, c-format +msgid "* Ignoring funny ref '%s' locally" +msgstr "" + +#: remote.c:2098 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "A base do seu ramo รฉ '%s', mas o ramo a montante desapareceu.\n" -#: remote.c:2085 +#: remote.c:2102 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (use \"git branch --unset-upstream\" para corrigir)\n" -#: remote.c:2088 -#, c-format -msgid "Your branch is up-to-date with '%s'.\n" +#: remote.c:2105 +#, fuzzy, c-format +msgid "Your branch is up to date with '%s'.\n" msgstr "O seu ramo estรก atualizado com '%s'.\n" -#: remote.c:2092 +#: remote.c:2109 +#, fuzzy, c-format +msgid "Your branch and '%s' refer to different commits.\n" +msgstr "O seu ramo estรก ร frente de '%s' por %d commit.\n" + +#: remote.c:2112 +#, c-format +msgid " (use \"%s\" for details)\n" +msgstr "" + +#: remote.c:2116 #, 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] "O seu ramo estรก ร frente de '%s' por %d commit.\n" msgstr[1] "O seu ramo estรก ร frente de '%s' por %d commits.\n" -#: remote.c:2098 +#: remote.c:2122 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (use \"git push\" para publicar os commits locais)\n" -#: remote.c:2101 +#: remote.c:2125 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2799,11 +6437,11 @@ msgstr[1] "" "O seu ramo estรก atrรกs de '%s' por %d commits, podendo ser atualizado com " "avanรงo rรกpido.\n" -#: remote.c:2109 +#: remote.c:2133 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (use \"git pull\" para atualizar o seu ramo local)\n" -#: remote.c:2112 +#: remote.c:2136 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2818,51 +6456,202 @@ msgstr[1] "" "O seu ramo e '%s' divergiram,\n" "tendo cada um %d e %d commits diferentes, respetivamente.\n" -#: remote.c:2122 +#: remote.c:2146 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n" -#: revision.c:2158 +#: remote.c:2337 +#, fuzzy, c-format +msgid "cannot parse expected object name '%s'" +msgstr "nรฃo รฉ possรญvel ler o objeto %s: '%s'" + +#: replace-object.c:21 +#, fuzzy, c-format +msgid "bad replace ref name: %s" +msgstr "eliminar referรชncias substituรญdas" + +#: replace-object.c:30 +#, fuzzy, c-format +msgid "duplicate replace ref: %s" +msgstr "eliminar referรชncias substituรญdas" + +#: replace-object.c:82 +#, fuzzy, c-format +msgid "replace depth too high for object %s" +msgstr "substituir a tag se esta existir" + +#: rerere.c:217 rerere.c:226 rerere.c:229 +msgid "corrupt MERGE_RR" +msgstr "" + +#: rerere.c:264 rerere.c:269 +#, fuzzy +msgid "unable to write rerere record" +msgstr "nรฃo รฉ possรญvel escrever o objeto de nota" + +#: rerere.c:495 +#, c-format +msgid "there were errors while writing '%s' (%s)" +msgstr "" + +#: rerere.c:498 +#, fuzzy, c-format +msgid "failed to flush '%s'" +msgstr "falha ao invocar stat de '%s'" + +#: rerere.c:503 rerere.c:1039 +#, fuzzy, c-format +msgid "could not parse conflict hunks in '%s'" +msgstr "nรฃo foi possรญvel analisar o objeto '%s'" + +#: rerere.c:684 +#, fuzzy, c-format +msgid "failed utime() on '%s'" +msgstr "falha ao abrir '%s'" + +#: rerere.c:694 +#, fuzzy, c-format +msgid "writing '%s' failed" +msgstr "falha ao criar '%s'" + +#: rerere.c:714 +#, c-format +msgid "Staged '%s' using previous resolution." +msgstr "" + +#: rerere.c:753 +#, c-format +msgid "Recorded resolution for '%s'." +msgstr "" + +#: rerere.c:788 +#, c-format +msgid "Resolved '%s' using previous resolution." +msgstr "" + +#: rerere.c:803 +#, fuzzy, c-format +msgid "cannot unlink stray '%s'" +msgstr "nรฃo รฉ possรญvel criar a ligaรงรฃo simbรณlica '%s' '%s'" + +#: rerere.c:807 +#, c-format +msgid "Recorded preimage for '%s'" +msgstr "" + +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#, c-format +msgid "could not create directory '%s'" +msgstr "nรฃo foi possรญvel criar o diretรณrio '%s'" + +#: rerere.c:1057 +#, fuzzy, c-format +msgid "failed to update conflicted state in '%s'" +msgstr "falha ao criar a ligaรงรฃo '%s'" + +#: rerere.c:1068 rerere.c:1075 +#, fuzzy, c-format +msgid "no remembered resolution for '%s'" +msgstr "Nรฃo รฉ possรญvel adicionar os resultados da integraรงรฃo de '%s'" + +#: rerere.c:1077 +#, fuzzy, c-format +msgid "cannot unlink '%s'" +msgstr "nรฃo รฉ possรญvel ler (readlink) '%s'" + +#: rerere.c:1087 +#, c-format +msgid "Updated preimage for '%s'" +msgstr "" + +#: rerere.c:1096 +#, fuzzy, c-format +msgid "Forgot resolution for '%s'\n" +msgstr "nรฃo foi possรญvel resolver a referรชncia %s" + +#: rerere.c:1199 +#, fuzzy +msgid "unable to open rr-cache directory" +msgstr "nรฃo รฉ possรญvel de obter o diretรณrio de trabalho atual" + +#: reset.c:42 +#, fuzzy +msgid "could not determine HEAD revision" +msgstr "nรฃo foi possรญvel destacar HEAD" + +#: reset.c:70 reset.c:76 sequencer.c:3426 +#, fuzzy, c-format +msgid "failed to find tree of %s" +msgstr "Falha ao procurar รกrvore de %s." + +#: revision.c:2344 +msgid "--unpacked=<packfile> no longer supported" +msgstr "" + +#: revision.c:2364 +#, fuzzy, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "valor desconhecido '%s' da chave '%s'" + +#: revision.c:2702 msgid "your current branch appears to be broken" msgstr "o ramo atual parece estar danificado" -#: revision.c:2161 +#: revision.c:2705 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "o ramo atual '%s' ainda nรฃo contรฉm nenhum commit" -#: revision.c:2355 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent รฉ incompatรญvel com --bisect" +#: revision.c:2915 +msgid "-L does not yet support diff formats besides -p and -s" +msgstr "" -#: run-command.c:125 +#: run-command.c:763 msgid "open /dev/null failed" msgstr "falha ao abrir /dev/null" -#: run-command.c:127 +#: run-command.c:1270 +#, fuzzy, c-format +msgid "cannot create async thread: %s" +msgstr "nรฃo foi possรญvel criar thread: %s" + +#: run-command.c:1334 #, c-format -msgid "dup2(%d,%d) failed" -msgstr "dup2(%d,%d) falhou" +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:150 +#: send-pack.c:145 +#, fuzzy +msgid "unexpected flush packet while reading remote unpack status" +msgstr "nรฃo รฉ possรญvel analisar status de descompactaรงรฃo remota: %s" + +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "nรฃo รฉ possรญvel analisar status de descompactaรงรฃo remota: %s" -#: send-pack.c:152 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "descompactaรงรฃo remota falhou: %s" -#: send-pack.c:315 +#: send-pack.c:372 msgid "failed to sign the push certificate" msgstr "falha ao assinar o certificado de publicaรงรฃo" -#: send-pack.c:428 +#: send-pack.c:460 +#, fuzzy +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "o recetor nรฃo suporta opรงรตes de publicaรงรฃo" + +#: send-pack.c:469 msgid "the receiving end does not support --signed push" msgstr "o recetor nรฃo suporta publicaรงรฃo com --signed" -#: send-pack.c:430 +#: send-pack.c:471 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -2870,32 +6659,48 @@ msgstr "" "certificado de publicaรงรฃo nรฃo enviado uma vez que o recetor nรฃo suporta " "publicaรงรฃo com --signed" -#: send-pack.c:442 +#: send-pack.c:483 msgid "the receiving end does not support --atomic push" msgstr "o recetor nรฃo suporta publicaรงรฃo com --atomic" -#: send-pack.c:447 +#: send-pack.c:488 msgid "the receiving end does not support push options" msgstr "o recetor nรฃo suporta opรงรตes de publicaรงรฃo" -#: sequencer.c:215 +#: sequencer.c:194 +#, fuzzy, c-format +msgid "invalid commit message cleanup mode '%s'" +msgstr "Modo de limpeza invรกlido %s" + +#: sequencer.c:308 +#, fuzzy, c-format +msgid "could not delete '%s'" +msgstr "Nรฃo foi possรญvel eliminar %s" + +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 +#, c-format +msgid "could not remove '%s'" +msgstr "nรฃo foi possรญvel remover '%s'" + +#: sequencer.c:339 msgid "revert" msgstr "reverter" -#: sequencer.c:217 +#: sequencer.c:341 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:219 -msgid "rebase -i" +#: sequencer.c:343 +#, fuzzy +msgid "rebase" msgstr "rebase -i" -#: sequencer.c:221 -#, c-format -msgid "Unknown action: %d" +#: sequencer.c:345 +#, fuzzy, c-format +msgid "unknown action: %d" msgstr "Aรงรฃo desconhecida: %d" -#: sequencer.c:278 +#: sequencer.c:404 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2903,7 +6708,7 @@ msgstr "" "depois de resolver os conflitos, marque os caminhos corrigidos\n" "com 'git add <caminhos>' ou 'git rm <caminhos>'" -#: sequencer.c:281 +#: sequencer.c:407 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2913,63 +6718,111 @@ msgstr "" "com 'git add <caminhos>' ou 'git rm <caminhos>'\n" "e submeta o resultado com 'git commit'" -#: sequencer.c:294 sequencer.c:1675 +#: sequencer.c:420 sequencer.c:3028 #, c-format msgid "could not lock '%s'" msgstr "nรฃo foi possรญvel bloquear '%s'" -#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "nรฃo foi possรญvel escrever em '%s'" -#: sequencer.c:301 +#: sequencer.c:427 #, c-format msgid "could not write eol to '%s'" msgstr "nรฃo foi possรญvel escrever fim de linha em '%s'" -#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682 -#, c-format -msgid "failed to finalize '%s'." +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 +#, fuzzy, c-format +msgid "failed to finalize '%s'" msgstr "falha ao finalizar '%s'." -#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259 -#: builtin/commit.c:749 builtin/merge.c:1018 -#, c-format -msgid "could not read '%s'" -msgstr "nรฃo foi possรญvel ler '%s'" - -#: sequencer.c:355 +#: sequencer.c:471 #, c-format msgid "your local changes would be overwritten by %s." msgstr "as suas alteraรงรตes locais serรฃo substituรญdas ao %s." -#: sequencer.c:359 +#: sequencer.c:475 msgid "commit your changes or stash them to proceed." msgstr "submeta ou esconda as suas alteraรงรตes para continuar." -#: sequencer.c:388 +#: sequencer.c:507 #, c-format msgid "%s: fast-forward" msgstr "%s: avanรงo rรกpido" +#: sequencer.c:546 builtin/tag.c:566 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Modo de limpeza invรกlido %s" + #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. * "rebase -i". +#. "rebase". #. -#: sequencer.c:470 +#: sequencer.c:640 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Nรฃo foi possรญvel escrever novo ficheiro de รญndice" -#: sequencer.c:489 -msgid "could not resolve HEAD commit\n" +#: sequencer.c:657 +#, fuzzy +msgid "unable to update cache tree" +msgstr "nรฃo foi possรญvel atualizar a รกrvore de cache\n" + +#: sequencer.c:671 +#, fuzzy +msgid "could not resolve HEAD commit" msgstr "nรฃo foi possรญvel resolver o commit HEAD\n" -#: sequencer.c:509 -msgid "unable to update cache tree\n" -msgstr "nรฃo foi possรญvel atualizar a รกrvore de cache\n" +#: sequencer.c:751 +#, c-format +msgid "no key present in '%.*s'" +msgstr "" + +#: sequencer.c:762 +#, fuzzy, c-format +msgid "unable to dequote value of '%s'" +msgstr "nรฃo รฉ possรญvel detetar automaticamente o nome (obteve-se '%s')" -#: sequencer.c:592 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 +#, c-format +msgid "could not open '%s' for reading" +msgstr "nรฃo foi possรญvel abrir '%s' para leitura" + +#: sequencer.c:809 +msgid "'GIT_AUTHOR_NAME' already given" +msgstr "" + +#: sequencer.c:814 +msgid "'GIT_AUTHOR_EMAIL' already given" +msgstr "" + +#: sequencer.c:819 +msgid "'GIT_AUTHOR_DATE' already given" +msgstr "" + +#: sequencer.c:823 +#, fuzzy, c-format +msgid "unknown variable '%s'" +msgstr "Formato de arquivo desconhecido '%s'" + +#: sequencer.c:828 +msgid "missing 'GIT_AUTHOR_NAME'" +msgstr "" + +#: sequencer.c:830 +msgid "missing 'GIT_AUTHOR_EMAIL'" +msgstr "" + +#: sequencer.c:832 +msgid "missing 'GIT_AUTHOR_DATE'" +msgstr "" + +#: sequencer.c:897 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2998,262 +6851,458 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:694 -#, c-format -msgid "could not parse commit %s\n" -msgstr "nรฃo foi possรญvel analisar o commit %s\n" - -#: sequencer.c:699 -#, c-format -msgid "could not parse parent commit %s\n" -msgstr "nรฃo foi possรญvel analisar o commit pai %s\n" +#: sequencer.c:1178 +msgid "'prepare-commit-msg' hook failed" +msgstr "" -#: sequencer.c:821 -#, c-format +#: sequencer.c:1184 msgid "" -"unexpected 1st line of squash message:\n" +"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" -"\t%.*s" +" 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 "" -"1ยช linha inesperada da mensagem de squash:\n" +"O seu nome e endereรงo de e-mail foram configurados automaticamente com base\n" +"no seu nome de utilizador e nome de mรกquina. Verifique se estรฃo corretos.\n" +"Pode suprimir esta mensagem configurando-os explicitamente. Execute\n" +"o seguinte comando e siga as instruรงรตes no editor para editar\n" +"o ficheiro de configuraรงรฃo:\n" "\n" -"\t%.*s" +" git config --global --edit\n" +"\n" +"Apรณs fazer isto, pode corrigir a identidade usada neste commit com:\n" +"\n" +" git commit --amend --reset-author\n" -#: sequencer.c:827 -#, c-format +#: sequencer.c:1197 msgid "" -"invalid 1st line of squash message:\n" +"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" -"\t%.*s" +" 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 "" -"1ยช linha invรกlida da mensagem de squash:\n" +"O seu nome e endereรงo de e-mail foram configurados automaticamente com base\n" +"no seu nome de utilizador e nome de mรกquina. Verifique se estรฃo corretos.\n" +"Pode suprimir esta mensagem configurando-os explicitamente:\n" "\n" -"\t%.*s" +" git config --global user.name \"O Seu Nome\"\n" +" git config --global user.email utilizador@exemplo.com\n" +"\n" +"Apรณs fazer isto, pode corrigir a identidade usada neste commit com:\n" +"\n" +" git commit --amend --reset-author\n" + +#: sequencer.c:1239 +msgid "couldn't look up newly created commit" +msgstr "nรฃo foi possรญvel consultar o commit recรฉm-criado" + +#: sequencer.c:1241 +msgid "could not parse newly created commit" +msgstr "nรฃo foi possรญvel analisar o commit recรฉm-criado" + +#: sequencer.c:1287 +#, fuzzy +msgid "unable to resolve HEAD after creating commit" +msgstr "nรฃo foi possรญvel resolver o commit HEAD\n" + +#: sequencer.c:1289 +msgid "detached HEAD" +msgstr "HEAD destacada" + +#: sequencer.c:1293 +msgid " (root-commit)" +msgstr " (commit-raiz)" + +#: sequencer.c:1314 +#, fuzzy +msgid "could not parse HEAD" +msgstr "nรฃo foi possรญvel ler HEAD" + +#: sequencer.c:1316 +#, fuzzy, c-format +msgid "HEAD %s is not a commit!" +msgstr "%s %s nรฃo รฉ um commit!" + +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 +msgid "could not parse HEAD commit" +msgstr "nรฃo foi possรญvel analisar o commit HEAD" -#: sequencer.c:833 sequencer.c:858 +#: sequencer.c:1373 sequencer.c:2067 +#, fuzzy +msgid "unable to parse commit author" +msgstr "nรฃo foi possรญvel analisar o commit %s" + +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree falhou ao escrever uma รกrvore" + +#: sequencer.c:1417 sequencer.c:1535 +#, fuzzy, c-format +msgid "unable to read commit message from '%s'" +msgstr "nรฃo foi possรญvel ler a mensagem de commit de %s" + +#: sequencer.c:1446 sequencer.c:1478 +#, fuzzy, c-format +msgid "invalid author identity '%s'" +msgstr "caminho invรกlido '%s'" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 +msgid "failed to write commit object" +msgstr "falha ao escrever objeto de commit" + +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "nรฃo foi possรญvel atualizar %s" + +#: sequencer.c:1567 +#, fuzzy, c-format +msgid "could not parse commit %s" +msgstr "nรฃo foi possรญvel analisar o commit %s\n" + +#: sequencer.c:1572 +#, fuzzy, c-format +msgid "could not parse parent commit %s" +msgstr "nรฃo foi possรญvel analisar o commit pai %s\n" + +#: sequencer.c:1655 sequencer.c:1766 +#, c-format +msgid "unknown command: %d" +msgstr "comando desconhecido: %d" + +#: sequencer.c:1713 sequencer.c:1738 #, c-format msgid "This is a combination of %d commits." msgstr "Isto รฉ a combinaรงรฃo de %d commits." -#: sequencer.c:842 +#: sequencer.c:1723 msgid "need a HEAD to fixup" msgstr "necessรกria uma HEAD para fixup" -#: sequencer.c:844 +#: sequencer.c:1725 sequencer.c:3338 msgid "could not read HEAD" msgstr "nรฃo foi possรญvel ler HEAD" -#: sequencer.c:846 +#: sequencer.c:1727 msgid "could not read HEAD's commit message" msgstr "nรฃo foi possรญvel ler a mensagem de commit de HEAD" -#: sequencer.c:852 +#: sequencer.c:1733 #, c-format msgid "cannot write '%s'" msgstr "nรฃo รฉ possรญvel escrever '%s'" -#: sequencer.c:861 git-rebase--interactive.sh:445 +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Esta รฉ a 1ยช mensagem de commit:" -#: sequencer.c:869 +#: sequencer.c:1748 #, c-format msgid "could not read commit message of %s" msgstr "nรฃo foi possรญvel ler a mensagem de commit de %s" -#: sequencer.c:876 +#: sequencer.c:1755 #, c-format msgid "This is the commit message #%d:" msgstr "Esta รฉ a mensagem de commit nยบ%d:" -#: sequencer.c:881 +#: sequencer.c:1761 #, c-format msgid "The commit message #%d will be skipped:" msgstr "A mensagem de commit #%d serรก ignorada:" -#: sequencer.c:886 -#, c-format -msgid "unknown command: %d" -msgstr "comando desconhecido: %d" - -#: sequencer.c:952 +#: sequencer.c:1849 msgid "your index file is unmerged." msgstr "ficheiro de รญndice nรฃo integrado." -#: sequencer.c:970 +#: sequencer.c:1856 +#, fuzzy +msgid "cannot fixup root commit" +msgstr "nรฃo รฉ possรญvel encontrar o commit %s (%s)" + +#: sequencer.c:1875 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "o commit %s รฉ uma integraรงรฃo mas nรฃo foi fornecida a opรงรฃo -m." -#: sequencer.c:978 +#: sequencer.c:1883 sequencer.c:1891 #, c-format msgid "commit %s does not have parent %d" msgstr "o commit %s nรฃo tem o pai %d" -#: sequencer.c:982 -#, c-format -msgid "mainline was specified but commit %s is not a merge." -msgstr "" -"a linha principal foi especificada mas o commit %s nรฃo รฉ uma integraรงรฃo." - -#: sequencer.c:988 +#: sequencer.c:1897 #, c-format msgid "cannot get commit message for %s" msgstr "nรฃo รฉ possรญvel obter a mensagem de commit de %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1009 +#: sequencer.c:1916 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: nรฃo foi possรญvel analisar o commit pai %s" -#: sequencer.c:1071 sequencer.c:1820 +#: sequencer.c:1981 #, c-format msgid "could not rename '%s' to '%s'" msgstr "nรฃo foi possรญvel mudar o nome de '%s' para '%s'" -#: sequencer.c:1122 +#: sequencer.c:2038 #, c-format msgid "could not revert %s... %s" msgstr "nรฃo foi possรญvel reverter %s... %s" -#: sequencer.c:1123 +#: sequencer.c:2039 #, c-format msgid "could not apply %s... %s" msgstr "nรฃo foi possรญvel aplicar %s... %s" -#: sequencer.c:1165 -msgid "empty commit set passed" -msgstr "o conjunto de commits especificado estรก vazio" +#: sequencer.c:2059 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "" -#: sequencer.c:1175 +#: sequencer.c:2117 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: falha ao ler o รญndice" -#: sequencer.c:1182 +#: sequencer.c:2124 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: falha ao atualizar o รญndice" -#: sequencer.c:1302 +#: sequencer.c:2201 +#, fuzzy, c-format +msgid "%s does not accept arguments: '%s'" +msgstr "%%(body) nรฃo leva argumentos" + +#: sequencer.c:2210 +#, fuzzy, c-format +msgid "missing arguments for %s" +msgstr "falta o objeto %s de %s" + +#: sequencer.c:2241 +#, fuzzy, c-format +msgid "could not parse '%s'" +msgstr "nรฃo foi possรญvel analisar %s" + +#: sequencer.c:2302 #, c-format msgid "invalid line %d: %.*s" msgstr "linha %d invรกlida: %.*s" -#: sequencer.c:1310 +#: sequencer.c:2313 #, c-format msgid "cannot '%s' without a previous commit" msgstr "nรฃo รฉ possรญvel efetuar '%s' sem um commit anterior" -#: sequencer.c:1342 -#, c-format -msgid "could not read '%s'." -msgstr "nรฃo foi possรญvel ler '%s'." +#: sequencer.c:2399 +#, fuzzy +msgid "cancelling a cherry picking in progress" +msgstr "nenhum cherry-pick ou revert em curso" + +#: sequencer.c:2408 +#, fuzzy +msgid "cancelling a revert in progress" +msgstr "nenhum cherry-pick ou revert em curso" -#: sequencer.c:1349 +#: sequencer.c:2452 msgid "please fix this using 'git rebase --edit-todo'." msgstr "corrija-o usando 'git rebase --edit-todo'." -#: sequencer.c:1351 +#: sequencer.c:2454 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "folha de instruรงรตes inutilizรกvel: '%s'" -#: sequencer.c:1356 +#: sequencer.c:2459 msgid "no commits parsed." msgstr "nenhum commit analisado." -#: sequencer.c:1367 +#: sequencer.c:2470 msgid "cannot cherry-pick during a revert." msgstr "nรฃo รฉ possรญvel efetuar cherry-pick durante uma reversรฃo." -#: sequencer.c:1369 +#: sequencer.c:2472 msgid "cannot revert during a cherry-pick." msgstr "nรฃo รฉ possรญvel reverter durante um cherry-pick." -#: sequencer.c:1432 -#, c-format -msgid "invalid key: %s" -msgstr "chave invรกlida: %s" - -#: sequencer.c:1435 +#: sequencer.c:2550 #, c-format msgid "invalid value for %s: %s" msgstr "valor invรกlido de %s: %s" -#: sequencer.c:1492 +#: sequencer.c:2657 +msgid "unusable squash-onto" +msgstr "" + +#: sequencer.c:2677 #, c-format msgid "malformed options sheet: '%s'" msgstr "folha de opรงรตes malformada: '%s'" -#: sequencer.c:1530 -msgid "a cherry-pick or revert is already in progress" +#: sequencer.c:2769 sequencer.c:4609 +msgid "empty commit set passed" +msgstr "o conjunto de commits especificado estรก vazio" + +#: sequencer.c:2786 +#, fuzzy +msgid "revert is already in progress" +msgstr "cherry-pick ou revert em curso" + +#: sequencer.c:2788 +#, fuzzy, c-format +msgid "try \"git revert (--continue | %s--abort | --quit)\"" +msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\"" + +#: sequencer.c:2791 +#, fuzzy +msgid "cherry-pick is already in progress" msgstr "cherry-pick ou revert em curso" -#: sequencer.c:1531 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +#: sequencer.c:2793 +#, fuzzy, c-format +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\"" -#: sequencer.c:1534 +#: sequencer.c:2807 #, c-format msgid "could not create sequencer directory '%s'" msgstr "nรฃo foi possรญvel criar o diretรณrio do sequenciador '%s'" -#: sequencer.c:1548 +#: sequencer.c:2822 msgid "could not lock HEAD" msgstr "nรฃo foi possรญvel bloquear HEAD" -#: sequencer.c:1604 sequencer.c:2159 +#: sequencer.c:2882 sequencer.c:4325 msgid "no cherry-pick or revert in progress" msgstr "nenhum cherry-pick ou revert em curso" -#: sequencer.c:1606 +#: sequencer.c:2884 sequencer.c:2895 msgid "cannot resolve HEAD" msgstr "nรฃo รฉ possรญvel resolver HEAD" -#: sequencer.c:1608 sequencer.c:1642 +#: sequencer.c:2886 sequencer.c:2930 msgid "cannot abort from a branch yet to be born" msgstr "nรฃo รฉ possรญvel abortar um ramo ainda nรฃo criado" -#: sequencer.c:1628 builtin/grep.c:910 +#: sequencer.c:2916 builtin/grep.c:745 #, c-format msgid "cannot open '%s'" msgstr "nรฃo รฉ possรญvel abrir '%s'" -#: sequencer.c:1630 +#: sequencer.c:2918 #, c-format msgid "cannot read '%s': %s" msgstr "nรฃo รฉ possรญvel ler '%s': %s" -#: sequencer.c:1631 +#: sequencer.c:2919 msgid "unexpected end of file" msgstr "fim de ficheiro inesperado" -#: sequencer.c:1637 +#: sequencer.c:2925 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "o ficheiro HEAD de pre-cherry-pick '%s' estรก corrompido" -#: sequencer.c:1648 +#: sequencer.c:2936 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Parece que a HEAD se moveu. Nรฃo recuando, verifique a HEAD." -#: sequencer.c:1785 sequencer.c:2058 +#: sequencer.c:2977 +#, fuzzy +msgid "no revert in progress" +msgstr "Rebase nรฃo estรก em curso?" + +#: sequencer.c:2986 +#, fuzzy +msgid "no cherry-pick in progress" +msgstr "nenhum cherry-pick ou revert em curso" + +#: sequencer.c:2996 +#, fuzzy +msgid "failed to skip the commit" +msgstr "falha ao escrever objeto de commit" + +#: sequencer.c:3003 +msgid "there is nothing to skip" +msgstr "" + +#: sequencer.c:3006 +#, c-format +msgid "" +"have you committed already?\n" +"try \"git %s --continue\"" +msgstr "" + +#: sequencer.c:3168 sequencer.c:4217 msgid "cannot read HEAD" msgstr "nรฃo รฉ possรญvel ler HEAD" -#: sequencer.c:1825 builtin/difftool.c:616 +#: sequencer.c:3185 +#, fuzzy, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "nรฃo foi possรญvel copiar '%s' para '%s'" + +#: sequencer.c:3193 +#, fuzzy, 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 "" +"Pode emendar o commit agora, com\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Assim que estiver satisfeito com as alteraรงรตes, execute\n" +"\n" +"\tgit rebase --continue" + +#: sequencer.c:3203 +#, fuzzy, c-format +msgid "Could not apply %s... %.*s" +msgstr "nรฃo foi possรญvel aplicar %s... %s" + +#: sequencer.c:3210 +#, fuzzy, c-format +msgid "Could not merge %.*s" +msgstr "Nรฃo foi possรญvel ler %s." + +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "nรฃo foi possรญvel copiar '%s' para '%s'" -#: sequencer.c:1841 -msgid "could not read index" -msgstr "nรฃo foi possรญvel ler o รญndice" +#: sequencer.c:3240 +#, fuzzy, c-format +msgid "Executing: %s\n" +msgstr "A executar: $rest" -#: sequencer.c:1846 +#: sequencer.c:3255 #, c-format msgid "" "execution failed: %s\n" @@ -3268,11 +7317,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1852 +#: sequencer.c:3261 msgid "and made changes to the index and/or the working tree\n" msgstr "e fez alteraรงรตes ao รญndice e/ou ร รกrvore de trabalho\n" -#: sequencer.c:1858 +#: sequencer.c:3267 #, c-format msgid "" "execution succeeded: %s\n" @@ -3289,20 +7338,100 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1913 git-rebase.sh:168 -#, c-format -msgid "Applied autostash." +#: sequencer.c:3328 +#, fuzzy, c-format +msgid "illegal label name: '%.*s'" +msgstr "nome de ficheiro malformado: %.*s" + +#: sequencer.c:3382 +#, fuzzy +msgid "writing fake root commit" +msgstr "nรฃo hรก nada para submeter\n" + +#: sequencer.c:3387 +msgid "writing squash-onto" +msgstr "" + +#: sequencer.c:3471 +#, fuzzy, c-format +msgid "could not resolve '%s'" +msgstr "nรฃo foi possรญvel remover '%s'" + +#: sequencer.c:3502 +#, fuzzy +msgid "cannot merge without a current revision" +msgstr "nรฃo รฉ possรญvel efetuar '%s' sem um commit anterior" + +#: sequencer.c:3524 +#, fuzzy, c-format +msgid "unable to parse '%.*s'" +msgstr "nรฃo foi possรญvel criar '%s'" + +#: sequencer.c:3533 +#, fuzzy, c-format +msgid "nothing to merge: '%.*s'" +msgstr "ignorado nรฃo integrado: %s\n" + +#: sequencer.c:3545 +msgid "octopus merge cannot be executed on top of a [new root]" +msgstr "" + +#: sequencer.c:3561 +#, fuzzy, c-format +msgid "could not get commit message of '%s'" +msgstr "nรฃo foi possรญvel ler a mensagem de commit de %s" + +#: sequencer.c:3730 +#, fuzzy, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "nรฃo foi possรญvel validar a tag '%s'" + +#: sequencer.c:3746 +#, fuzzy +msgid "merge: Unable to write new index file" +msgstr "%s: Nรฃo foi possรญvel escrever novo ficheiro de รญndice" + +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "Nรฃo รฉ possรญvel empilhar automaticamente (autostash)" + +#: sequencer.c:3823 +#, fuzzy, c-format +msgid "Unexpected stash response: '%s'" +msgstr "" +"1ยช linha inesperada da mensagem de squash:\n" +"\n" +"\t%.*s" + +#: sequencer.c:3829 +#, fuzzy, c-format +msgid "Could not create directory for '%s'" +msgstr "Nรฃo foi possรญvel criar o diretรณrio '%s'" + +#: sequencer.c:3832 +#, fuzzy, c-format +msgid "Created autostash: %s\n" +msgstr "Pilha automรกtica (autostash) criada: $stash_abbrev" + +#: sequencer.c:3836 +#, fuzzy +msgid "could not reset --hard" +msgstr "nรฃo foi possรญvel ler orig-head" + +#: sequencer.c:3861 +#, fuzzy, c-format +msgid "Applied autostash.\n" msgstr "Pilha automรกtica (autostash) aplicada." -#: sequencer.c:1925 +#: sequencer.c:3873 #, c-format msgid "cannot store %s" msgstr "nรฃo รฉ possรญvel guardar %s" -#: sequencer.c:1927 git-rebase.sh:172 -#, c-format +#: sequencer.c:3876 +#, fuzzy, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" @@ -3310,57 +7439,99 @@ msgstr "" "As suas alteraรงรตes estรฃo guardadas na pilha.\n" "Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n" -#: sequencer.c:2009 +#: sequencer.c:3881 +#, fuzzy +msgid "Applying autostash resulted in conflicts." +msgstr "Patch aplicado a '%s' com conflitos.\n" + +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." +msgstr "" + +#: sequencer.c:3974 +#, fuzzy, c-format +msgid "%s: not a valid OID" +msgstr "'%s' nรฃo รฉ uma referรชncia vรกlida." + +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 +msgid "could not detach HEAD" +msgstr "nรฃo foi possรญvel destacar HEAD" + +#: sequencer.c:3994 +#, fuzzy, c-format +msgid "Stopped at HEAD\n" +msgstr "Parou a %s... %.*s\n" + +#: sequencer.c:3996 +#, fuzzy, c-format +msgid "Stopped at %s\n" +msgstr "Parou a %s... %.*s\n" + +#: sequencer.c:4004 +#, 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 "" + +#: sequencer.c:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "" + +#: sequencer.c:4095 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Parou a %s... %.*s\n" -#: sequencer.c:2036 +#: sequencer.c:4166 #, c-format msgid "unknown command %d" msgstr "comando desconhecido %d" -#: sequencer.c:2066 +#: sequencer.c:4225 msgid "could not read orig-head" msgstr "nรฃo foi possรญvel ler orig-head" -#: sequencer.c:2070 +#: sequencer.c:4230 msgid "could not read 'onto'" msgstr "nรฃo foi possรญvel ler 'onto'" -#: sequencer.c:2077 -#, c-format -msgid "could not update %s" -msgstr "nรฃo foi possรญvel atualizar %s" - -#: sequencer.c:2084 +#: sequencer.c:4244 #, c-format msgid "could not update HEAD to %s" msgstr "nรฃo foi possรญvel atualizar HEAD para %s" -#: sequencer.c:2168 +#: sequencer.c:4304 +#, fuzzy, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "$head_name rebaseado e atualizado com sucesso." + +#: sequencer.c:4337 msgid "cannot rebase: You have unstaged changes." msgstr "nรฃo รฉ possรญvel rebasear: tem alteraรงรตes nรฃo preparadas." -#: sequencer.c:2173 -msgid "could not remove CHERRY_PICK_HEAD" -msgstr "nรฃo foi possรญvel remover CHERRY_PICK_HEAD" - -#: sequencer.c:2182 +#: sequencer.c:4346 msgid "cannot amend non-existing commit" msgstr "nรฃo รฉ possรญvel emendar commit nรฃo-existente" -#: sequencer.c:2184 +#: sequencer.c:4348 #, c-format msgid "invalid file: '%s'" msgstr "ficheiro invรกlido: '%s'" -#: sequencer.c:2186 +#: sequencer.c:4350 #, c-format msgid "invalid contents: '%s'" msgstr "conteรบdo invรกlido: '%s'" -#: sequencer.c:2189 +#: sequencer.c:4353 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3370,25 +7541,66 @@ msgstr "" "Tem alteraรงรตes por submeter na รกrvore de trabalho. Submeta-as primeiro\n" "e execute 'git rebase --continue' de novo." -#: sequencer.c:2199 +#: sequencer.c:4389 sequencer.c:4428 +#, fuzzy, c-format +msgid "could not write file: '%s'" +msgstr "nรฃo foi possรญvel criar o ficheiro '%s'" + +#: sequencer.c:4444 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "nรฃo foi possรญvel remover CHERRY_PICK_HEAD" + +#: sequencer.c:4451 msgid "could not commit staged changes." msgstr "nรฃo foi possรญvel submeter as alteraรงรตes preparadas." -#: sequencer.c:2279 +#: sequencer.c:4477 +#, fuzzy, c-format +msgid "invalid committer '%s'" +msgstr "commit invรกlido %s" + +#: sequencer.c:4586 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: nรฃo รฉ possรญvel efetuar cherry-pick de %s" -#: sequencer.c:2283 +#: sequencer.c:4590 #, c-format msgid "%s: bad revision" msgstr "%s: revisรฃo incorreta" -#: sequencer.c:2316 +#: sequencer.c:4625 msgid "can't revert as initial commit" msgstr "nรฃo รฉ possรญvel reverter como commit inicial" -#: setup.c:165 +#: sequencer.c:5102 +msgid "make_script: unhandled options" +msgstr "" + +#: sequencer.c:5105 +msgid "make_script: error preparing revisions" +msgstr "" + +#: sequencer.c:5347 sequencer.c:5364 +#, fuzzy +msgid "nothing to do" +msgstr "nรฃo hรก nada para submeter\n" + +#: sequencer.c:5383 +#, fuzzy +msgid "could not skip unnecessary pick commands" +msgstr "Nรฃo foi possรญvel saltar comandos pick desnecessรกrios" + +#: sequencer.c:5480 +msgid "the script was already rearranged." +msgstr "" + +#: setup.c:133 +#, fuzzy, c-format +msgid "'%s' is outside repository at '%s'" +msgstr "%s: '%s' estรก fora do repositรณrio" + +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3398,7 +7610,7 @@ msgstr "" "Use 'git <comando> -- <caminho>...' para especificar caminhos que nรฃo " "existem localmente." -#: setup.c:178 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3410,7 +7622,12 @@ msgstr "" "Use '--' para separar caminhos de revisรตes, assim:\n" "'git <comando> [<revisรฃo>...] -- [<ficheiro>...]'" -#: setup.c:228 +#: setup.c:264 +#, fuzzy, c-format +msgid "option '%s' must come before non-option arguments" +msgstr "parar de analisar depois do primeiro argumento que nรฃo seja uma opรงรฃo" + +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3421,109 +7638,416 @@ msgstr "" "Use '--' para separar caminhos de revisรตes, assim:\n" "'git <comando> [<revisรฃo>...] -- [<ficheiro>...]'" -#: setup.c:475 +#: setup.c:419 +#, fuzzy +msgid "unable to set up work tree using invalid config" +msgstr "nรฃo รฉ possรญvel de obter o diretรณrio de trabalho atual" + +#: setup.c:423 +msgid "this operation must be run in a work tree" +msgstr "" + +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Esperava-se versรฃo do repositรณrio git <= %d, obteve-se %d" -#: setup.c:483 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "extensรตes de repositรณrio desconhecidas encontradas:" -#: setup.c:776 +#: setup.c:681 +#, fuzzy +msgid "repo version is 0, but v1-only extensions found:" +msgstr "extensรตes de repositรณrio desconhecidas encontradas:" + +#: setup.c:700 +#, fuzzy, c-format +msgid "error opening '%s'" +msgstr "falha ao abrir '%s'" + +#: setup.c:702 +#, fuzzy, c-format +msgid "too large to be a .git file: '%s'" +msgstr "nรฃo foi possรญvel ler o ficheiro de entrada '%s'" + +#: setup.c:704 +#, fuzzy, c-format +msgid "error reading %s" +msgstr "Erro ao rematar %s." + +#: setup.c:706 +#, fuzzy, c-format +msgid "invalid gitfile format: %s" +msgstr "formato de data invรกlido: %s" + +#: setup.c:708 +#, fuzzy, c-format +msgid "no path in gitfile: %s" +msgstr "Nรฃo รฉ possรญvel abrir o ficheiro de patch %s" + +#: setup.c:710 +#, fuzzy, c-format +msgid "not a git repository: %s" +msgstr "Nรฃo รฉ um repositรณrio git" + +#: setup.c:812 #, c-format -msgid "Not a git repository (or any of the parent directories): %s" -msgstr "Nรฃo รฉ um repositรณrio git (ou um dos diretรณrios pai): %s" +msgid "'$%s' too big" +msgstr "" -#: setup.c:778 builtin/index-pack.c:1646 -msgid "Cannot come back to cwd" +#: setup.c:826 +#, fuzzy, c-format +msgid "not a git repository: '%s'" +msgstr "Nรฃo รฉ um repositรณrio git" + +#: setup.c:855 setup.c:857 setup.c:888 +#, fuzzy, c-format +msgid "cannot chdir to '%s'" +msgstr "nรฃo รฉ possรญvel mudar para o diretรณrio %s" + +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#, fuzzy +msgid "cannot come back to cwd" msgstr "Nรฃo รฉ possรญvel voltar ao diretรณrio de trabalho atual" -#: setup.c:1010 +#: setup.c:987 +#, fuzzy, c-format +msgid "failed to stat '%*s%s%s'" +msgstr "falha ao invocar stat de '%s'" + +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "Nรฃo รฉ possรญvel ler o diretรณrio de trabalho atual" -#: setup.c:1022 setup.c:1028 -#, c-format -msgid "Cannot change to '%s'" +#: setup.c:1234 setup.c:1240 +#, fuzzy, c-format +msgid "cannot change to '%s'" msgstr "nรฃo รฉ possรญvel mudar para '%s'" -#: setup.c:1041 -#, c-format +#: setup.c:1245 +#, fuzzy, c-format +msgid "not a git repository (or any of the parent directories): %s" +msgstr "Nรฃo รฉ um repositรณrio git (ou um dos diretรณrios pai): %s" + +#: setup.c:1251 +#, fuzzy, c-format msgid "" -"Not a git repository (or any parent up to mount point %s)\n" +"not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" "Nรฃo รฉ um repositรณrio git (ou um diretรณrio pai atรฉ ao ponto de montagem %s)\n" "Interrompido no limite do sistema de ficheiros " "(GIT_DISCOVERY_ACROSS_FILESYSTEM nรฃo definido)." -#: setup.c:1106 -#, c-format +#: setup.c:1362 +#, fuzzy, c-format msgid "" -"Problem with core.sharedRepository filemode value (0%.3o).\n" +"problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" "Problema com o valor core.sharedRepository modo de ficheiro (0%.3o).\n" "O dono dos ficheiros tem de ter sempre permissรตes de leitura e escrita." -#: sha1_file.c:559 +#: setup.c:1409 +#, fuzzy +msgid "open /dev/null or dup failed" +msgstr "falha ao abrir /dev/null" + +#: setup.c:1424 +#, fuzzy +msgid "fork failed" +msgstr "falha ao invocar fseek" + +#: setup.c:1429 +#, fuzzy +msgid "setsid failed" +msgstr "falha ao executar o comando stash" + +#: sha1-file.c:470 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "" + +#: sha1-file.c:521 +#, fuzzy, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "nรฃo foi possรญvel analisar o objeto: %s" + +#: sha1-file.c:593 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "" + +#: sha1-file.c:600 +#, fuzzy, c-format +msgid "unable to normalize object directory: %s" +msgstr "nรฃo foi possรญvel analisar o objeto: %s" + +#: sha1-file.c:643 +#, fuzzy +msgid "unable to fdopen alternates lockfile" +msgstr "nรฃo foi possรญvel escrever os parรขmetros no ficheiro de configuraรงรฃo" + +#: sha1-file.c:661 +#, fuzzy +msgid "unable to read alternates file" +msgstr "nรฃo foi possรญvel ler o ficheiro de รญndice" + +#: sha1-file.c:668 +#, fuzzy +msgid "unable to move new alternates file into place" +msgstr "nรฃo foi possรญvel escrever novo ficheiro de รญndice" + +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "o caminho '%s' nรฃo existe" -#: sha1_file.c:585 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "ainda nรฃo รฉ suportada a funcionalidade que permite ter o repositรณrio de " "referรชncia '%s' como uma extraรงรฃo ligada." -#: sha1_file.c:591 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "o repositรณrio de referรชncia '%s' nรฃo รฉ um repositรณrio local." -#: sha1_file.c:597 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "o repositรณrio de referรชncia '%s' รฉ raso" -#: sha1_file.c:605 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "o repositรณrio de referรชncia '%s' estรก enxertado" -#: sha1_file.c:1245 -msgid "offset before end of packfile (broken .idx?)" -msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)" +#: sha1-file.c:804 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "" -#: sha1_file.c:2721 +#: sha1-file.c:954 #, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "offset antes do inรญcio do รญndice do pacote %s (รญndice corrompido?)" +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "" + +#: sha1-file.c:975 +#, fuzzy +msgid "mmap failed" +msgstr "%s falhou" + +#: sha1-file.c:1139 +#, fuzzy, c-format +msgid "object file %s is empty" +msgstr "objeto local %s corrompido" + +#: sha1-file.c:1274 sha1-file.c:2467 +#, fuzzy, c-format +msgid "corrupt loose object '%s'" +msgstr "nรฃo foi possรญvel analisar o objeto '%s'" + +#: sha1-file.c:1276 sha1-file.c:2471 +#, fuzzy, c-format +msgid "garbage at end of loose object '%s'" +msgstr "nรฃo foi possรญvel analisar o objeto: %s" -#: sha1_file.c:2725 +#: sha1-file.c:1318 +#, fuzzy +msgid "invalid object type" +msgstr "tipo de objeto incorreto." + +#: sha1-file.c:1402 #, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "offset depois do fim do รญndice do pacote %s (รญndice truncado?)" +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "" + +#: sha1-file.c:1405 +#, fuzzy, c-format +msgid "unable to unpack %s header" +msgstr "nรฃo foi possรญvel atualizar %s" + +#: sha1-file.c:1411 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "" + +#: sha1-file.c:1414 +#, fuzzy, c-format +msgid "unable to parse %s header" +msgstr "nรฃo foi possรญvel atualizar %s" + +#: sha1-file.c:1641 +#, fuzzy, c-format +msgid "failed to read object %s" +msgstr "falha ao ler o objeto '%s'." + +#: sha1-file.c:1645 +#, fuzzy, c-format +msgid "replacement %s not found for %s" +msgstr "modelos nรฃo encontrados em %s" + +#: sha1-file.c:1649 +#, fuzzy, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "objeto local %s corrompido" + +#: sha1-file.c:1653 +#, fuzzy, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "objeto local %s corrompido" + +#: sha1-file.c:1758 +#, fuzzy, c-format +msgid "unable to write file %s" +msgstr "nรฃo foi possรญvel escrever %s" -#: sha1_name.c:409 +#: sha1-file.c:1765 +#, fuzzy, c-format +msgid "unable to set permission to '%s'" +msgstr "nรฃo foi possรญvel resolver revisรฃo: %s" + +#: sha1-file.c:1772 +#, fuzzy +msgid "file write error" +msgstr "falha ao escrever para rev-list" + +#: sha1-file.c:1792 +#, fuzzy +msgid "error when closing loose object file" +msgstr "erro ao fechar ficheiro de pacote" + +#: sha1-file.c:1857 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" + +#: sha1-file.c:1859 +#, fuzzy +msgid "unable to create temporary file" +msgstr "nรฃo foi possรญvel criar รญndice temporรกrio" + +#: sha1-file.c:1883 +#, fuzzy +msgid "unable to write loose object file" +msgstr "nรฃo รฉ possรญvel escrever o objeto de nota" + +#: sha1-file.c:1889 +#, fuzzy, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "nรฃo รฉ possรญvel compactar objeto acrescentado (%d)" + +#: sha1-file.c:1893 +#, fuzzy, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "falha de fstat de %s" + +#: sha1-file.c:1897 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "" + +#: sha1-file.c:1907 builtin/pack-objects.c:1086 +#, fuzzy, c-format +msgid "failed utime() on %s" +msgstr "falha ao abrir '%s'" + +#: sha1-file.c:1984 +#, fuzzy, c-format +msgid "cannot read object for %s" +msgstr "nรฃo foi possรญvel ler o objeto %s" + +#: sha1-file.c:2035 +#, fuzzy +msgid "corrupt commit" +msgstr "substituir autor do commit" + +#: sha1-file.c:2043 +#, fuzzy +msgid "corrupt tag" +msgstr "mostrar tags" + +#: sha1-file.c:2143 +#, c-format +msgid "read error while indexing %s" +msgstr "" + +#: sha1-file.c:2146 +#, fuzzy, c-format +msgid "short read while indexing %s" +msgstr "nรฃo รฉ possรญvel ler o รญndice" + +#: sha1-file.c:2219 sha1-file.c:2229 +#, fuzzy, c-format +msgid "%s: failed to insert into database" +msgstr "gpg nรฃo assinou os dados" + +#: sha1-file.c:2235 +#, fuzzy, c-format +msgid "%s: unsupported file type" +msgstr "versรฃo de รญndice %s nรฃo suportada" + +#: sha1-file.c:2259 +#, fuzzy, c-format +msgid "%s is not a valid object" +msgstr "%s nรฃo รฉ um objeto '%s' vรกlido" + +#: sha1-file.c:2261 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s nรฃo รฉ um objeto '%s' vรกlido" + +#: sha1-file.c:2288 builtin/index-pack.c:192 +#, c-format +msgid "unable to open %s" +msgstr "nรฃo foi possรญvel abrir %s" + +#: sha1-file.c:2478 sha1-file.c:2531 +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "" + +#: sha1-file.c:2502 +#, fuzzy, c-format +msgid "unable to mmap %s" +msgstr "nรฃo foi possรญvel abrir %s" + +#: sha1-file.c:2507 +#, fuzzy, c-format +msgid "unable to unpack header of %s" +msgstr "nรฃo foi possรญvel atualizar %s" + +#: sha1-file.c:2513 +#, fuzzy, c-format +msgid "unable to parse header of %s" +msgstr "nรฃo foi possรญvel ler %s" + +#: sha1-file.c:2524 +#, fuzzy, c-format +msgid "unable to unpack contents of %s" +msgstr "nรฃo รฉ possรญvel analisar o contacto: %s" + +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "SHA1 curto %s รฉ ambรญguo" -#: sha1_name.c:420 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Os candidatos sรฃo:" -#: sha1_name.c:580 +#: sha1-name.c:796 +#, 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" "may be created by mistake. For example,\n" "\n" -" git checkout -b $br $(git rev-parse ...)\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" @@ -3542,56 +8066,303 @@ msgstr "" "Analise estas referรชncias e elimine-as se desejar. Desative esta\n" "mensagem executando \"git config advice.objectNameWarning false\"" -#: submodule.c:67 submodule.c:101 +#: 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:1702 +#, fuzzy, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "O caminho '%s' estรก dentro do submรณdulo '%.*s'" + +#: sha1-name.c:1708 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" + +#: sha1-name.c:1717 +#, fuzzy, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "o caminho '%s' nรฃo existe" + +#: sha1-name.c:1745 +#, 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:1761 +#, 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:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "" + +#: sha1-name.c:1771 +#, fuzzy, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "o caminho '%s' nรฃo tem a versรฃo deles" + +#: sha1-name.c:1784 +#, fuzzy +msgid "relative path syntax can't be used outside working tree" +msgstr "" +"Os caminhos relativos sรณ podem ser usados a partir do topo da รกrvore de " +"trabalho" + +#: sha1-name.c:1922 +#, fuzzy, c-format +msgid "invalid object name '%.*s'." +msgstr "Nome de objeto invรกlido: '%s'." + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte +#: strbuf.c:848 +#, c-format +msgid "%u.%2.2u GiB" +msgstr "" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second +#: strbuf.c:850 +#, c-format +msgid "%u.%2.2u GiB/s" +msgstr "" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte +#: strbuf.c:858 +#, c-format +msgid "%u.%2.2u MiB" +msgstr "" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second +#: strbuf.c:860 +#, c-format +msgid "%u.%2.2u MiB/s" +msgstr "" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte +#: strbuf.c:867 +#, c-format +msgid "%u.%2.2u KiB" +msgstr "" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second +#: strbuf.c:869 +#, c-format +msgid "%u.%2.2u KiB/s" +msgstr "" + +#. TRANSLATORS: IEC 80000-13:2008 byte +#: strbuf.c:875 +#, fuzzy, c-format +msgid "%u byte" +msgid_plural "%u bytes" +msgstr[0] "bytes" +msgstr[1] "bytes" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second +#: strbuf.c:877 +#, fuzzy, c-format +msgid "%u byte/s" +msgid_plural "%u bytes/s" +msgstr[0] "bytes" +msgstr[1] "bytes" + +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" +msgstr "nรฃo foi possรญvel abrir '%s' para escrita" + +#: strbuf.c:1175 +#, fuzzy, c-format +msgid "could not edit '%s'" +msgstr "nรฃo foi possรญvel ler '%s'" + +#: submodule-config.c:237 +#, fuzzy, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "a referรชncia %s com nome danificado foi ignorada" + +#: submodule-config.c:304 +#, fuzzy +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "nรฃo รฉ permitido valores negativos em submodule.fetchJobs" + +#: submodule-config.c:402 +#, c-format +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgstr "" + +#: submodule-config.c:499 +#, c-format +msgid "invalid value for %s" +msgstr "valor invรกlido de %s" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "Nรฃo foi possรญvel atualizar o elemento %s de .gitmodules" + +#: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Nรฃo รฉ possรญvel alterar .gitmodules nรฃo integrado, resolva primeiro os " "conflitos de integraรงรฃo" -#: submodule.c:71 submodule.c:105 +#: submodule.c:118 submodule.c:147 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Secรงรฃo de .gitmodules cujo path=%s nรฃo encontrada" -#: submodule.c:79 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "Nรฃo foi possรญvel atualizar o elemento %s de .gitmodules" - -#: submodule.c:112 +#: submodule.c:154 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Nรฃo foi possรญvel remover o elemento %s de .gitmodules" -#: submodule.c:123 +#: submodule.c:165 msgid "staging updated .gitmodules failed" msgstr "falha ao preparar .gitmodules atualizado" -#: submodule.c:161 -msgid "negative values not allowed for submodule.fetchJobs" -msgstr "nรฃo รฉ permitido valores negativos em submodule.fetchJobs" +#: submodule.c:327 +#, fuzzy, c-format +msgid "in unpopulated submodule '%s'" +msgstr "A ignorar submรณdulo '%s'" + +#: submodule.c:358 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "O caminho '%s' estรก dentro do submรณdulo '%.*s'" + +#: submodule.c:434 +#, fuzzy, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "Falha ao analisar parรขmetro da opรงรฃo --submodule: '%s'" + +#: submodule.c:816 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" + +#: submodule.c:919 +#, fuzzy, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "%s %s nรฃo รฉ um commit!" + +#: submodule.c:1004 +#, fuzzy, c-format +msgid "" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" +msgstr "nรฃo foi possรญvel executar 'git status' no submรณdulo '%s'" + +#: submodule.c:1127 +#, fuzzy, c-format +msgid "process for submodule '%s' failed" +msgstr "falha ao clonar '%s' no caminho de submรณdulo '%s'" + +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Falha ao resolver HEAD numa referรชncia vรกlida." + +#: submodule.c:1167 +#, fuzzy, c-format +msgid "Pushing submodule '%s'\n" +msgstr "A ignorar submรณdulo '%s'" -#: submodule.c:1194 +#: submodule.c:1170 +#, fuzzy, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "Nรฃo foi possรญvel extrair o submรณdulo '$sm_path'" + +#: submodule.c:1462 +#, fuzzy, c-format +msgid "Fetching submodule %s%s\n" +msgstr "A ignorar submรณdulo '%s'" + +#: submodule.c:1492 +#, fuzzy, c-format +msgid "Could not access submodule '%s'\n" +msgstr "nรฃo foi possรญvel percorrer recursivamente o submรณdulo '%s'" + +#: submodule.c:1646 +#, fuzzy, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "percorrer submรณdulos recursivamente" + +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' nรฃo รฉ reconhecido como um repositรณrio git" -#: submodule.c:1332 +#: submodule.c:1688 +#, fuzzy, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "nรฃo foi possรญvel executar 'git status' no submรณdulo '%s'" + +#: submodule.c:1729 +#, fuzzy, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "nรฃo foi possรญvel executar 'git status' no submรณdulo '%s'" + +#: submodule.c:1804 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "nรฃo foi possรญvel iniciar 'git status' no submรณdulo '%s'" -#: submodule.c:1345 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "nรฃo foi possรญvel executar 'git status' no submรณdulo '%s'" -#: submodule.c:1421 +#: submodule.c:1832 +#, fuzzy, c-format +msgid "Could not unset core.worktree setting in submodule '%s'" +msgstr "Nรฃo foi possรญvel definir core.worktree em %s" + +#: submodule.c:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "nรฃo foi possรญvel percorrer recursivamente o submรณdulo '%s'" + +#: submodule.c:1880 +#, fuzzy +msgid "could not reset submodule index" +msgstr "nรฃo foi possรญvel percorrer recursivamente o submรณdulo '%s'" + +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "o submรณdulo '%s' tem รญndice sujo" -#: submodule.c:1679 +#: submodule.c:1974 +#, fuzzy, c-format +msgid "Submodule '%s' could not be updated." +msgstr "Submรณdulos alterados mas nรฃo atualizados:" + +#: submodule.c:2042 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "" + +#: submodule.c:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3599,18 +8370,17 @@ msgstr "" "relocate_gitdir para submodule '%s' com mais do que uma รกrvore de trabalho " "nรฃo suportado" -#: submodule.c:1691 submodule.c:1747 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "nรฃo foi possรญvel procurar pelo submรณdulo '%s'" -#: submodule.c:1695 builtin/submodule--helper.c:678 -#: builtin/submodule--helper.c:688 +#: submodule.c:2079 #, c-format -msgid "could not create directory '%s'" -msgstr "nรฃo foi possรญvel criar o diretรณrio '%s'" +msgid "refusing to move '%s' into an existing git dir" +msgstr "" -#: submodule.c:1698 +#: submodule.c:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3621,94 +8391,304 @@ msgstr "" "'%s' para\n" "'%s'\n" -#: submodule.c:1782 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "nรฃo foi possรญvel percorrer recursivamente o submรณdulo '%s'" - -#: submodule.c:1826 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "nรฃo foi possรญvel iniciar ls-files em .." -#: submodule.c:1846 -msgid "BUG: returned path string doesn't match cwd?" -msgstr "BUG: returned path string doesn't match cwd?" - -#: submodule.c:1865 +#: submodule.c:2254 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree retornou cรณdigo de retorno inesperado %d" -#: submodule-config.c:380 -#, c-format -msgid "invalid value for %s" -msgstr "valor invรกlido de %s" - -#: trailer.c:240 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "falha ao executar o comando trailer '%s'" -#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 -#: trailer.c:543 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valor desconhecido '%s' da chave '%s'" -#: trailer.c:525 trailer.c:530 builtin/remote.c:289 +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "mais do que um %s" -#: trailer.c:702 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "token terminador vazio no terminador '%.*s'" -#: trailer.c:722 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "nรฃo foi possรญvel ler o ficheiro de entrada '%s'" -#: trailer.c:725 +#: trailer.c:751 msgid "could not read from stdin" msgstr "nรฃo foi possรญvel ler da entrada padrรฃo" -#: trailer.c:949 builtin/am.c:44 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "nรฃo foi possรญvel obter stat de %s" -#: trailer.c:951 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "o ficheiro %s nรฃo รฉ um ficheiro regular" -#: trailer.c:953 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "o ficheiro %s nรฃo pode ser escrito pelo utilizador" -#: trailer.c:965 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "nรฃo foi possรญvel abrir ficheiro temporรกrio" -#: trailer.c:1001 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "nรฃo foi possรญvel mudar o nome do ficheiro temporรกrio para %s" -#: transport.c:62 +#: transport-helper.c:62 transport-helper.c:91 +#, fuzzy +msgid "full write to remote helper failed" +msgstr "imprimir estado do programa auxiliar remoto" + +#: transport-helper.c:145 +#, fuzzy, c-format +msgid "unable to find remote helper for '%s'" +msgstr "Nรฃo รฉ possรญvel adicionar os resultados da integraรงรฃo de '%s'" + +#: transport-helper.c:161 transport-helper.c:575 +msgid "can't dup helper output fd" +msgstr "" + +#: transport-helper.c:214 +#, c-format +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "" + +#: transport-helper.c:220 +msgid "this remote helper should implement refspec capability" +msgstr "" + +#: transport-helper.c:287 transport-helper.c:429 +#, fuzzy, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "blob para %s '%s' esperado" + +#: transport-helper.c:417 +#, fuzzy, c-format +msgid "%s also locked %s" +msgstr "'%s' nรฃo estรก trancada" + +#: transport-helper.c:497 +#, fuzzy +msgid "couldn't run fast-import" +msgstr "nรฃo foi possรญvel executar o comando stash." + +#: transport-helper.c:520 +#, fuzzy +msgid "error while running fast-import" +msgstr "erro ao fechar ficheiro de pacote" + +#: transport-helper.c:549 transport-helper.c:1226 +#, fuzzy, c-format +msgid "could not read ref %s" +msgstr "Nรฃo foi possรญvel ler a referรชncia %s" + +#: transport-helper.c:594 +#, fuzzy, c-format +msgid "unknown response to connect: %s" +msgstr "Nรฃo sei como clonar %s" + +#: transport-helper.c:616 +msgid "setting remote service path not supported by protocol" +msgstr "" + +#: transport-helper.c:618 +#, fuzzy +msgid "invalid remote service path" +msgstr "referรชncia invรกlida: %s" + +#: transport-helper.c:661 transport.c:1428 +#, fuzzy +msgid "operation not supported by protocol" +msgstr "opรงรฃo nรฃo suportada com --recurse-submodules." + +#: transport-helper.c:664 +#, c-format +msgid "can't connect to subservice %s" +msgstr "" + +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "" + +#: transport-helper.c:788 +#, fuzzy, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "blob para %s '%s' esperado" + +#: transport-helper.c:841 +#, fuzzy, c-format +msgid "helper reported unexpected status of %s" +msgstr "ls-tree retornou cรณdigo de retorno inesperado %d" + +#: transport-helper.c:924 +#, fuzzy, c-format +msgid "helper %s does not support dry-run" +msgstr "O servidor nรฃo suporta --deepen" + +#: transport-helper.c:927 +#, fuzzy, c-format +msgid "helper %s does not support --signed" +msgstr "O servidor nรฃo suporta --shallow-since" + +#: transport-helper.c:930 +#, fuzzy, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "o recetor nรฃo suporta publicaรงรฃo com --signed" + +#: transport-helper.c:935 +#, fuzzy, c-format +msgid "helper %s does not support --atomic" +msgstr "O servidor nรฃo suporta --shallow-since" + +#: transport-helper.c:941 +#, fuzzy, c-format +msgid "helper %s does not support 'push-option'" +msgstr "o recetor nรฃo suporta opรงรตes de publicaรงรฃo" + +#: transport-helper.c:1040 +msgid "remote-helper doesn't support push; refspec needed" +msgstr "" + +#: transport-helper.c:1045 +#, fuzzy, c-format +msgid "helper %s does not support 'force'" +msgstr "O servidor nรฃo suporta --deepen" + +#: transport-helper.c:1092 +#, fuzzy +msgid "couldn't run fast-export" +msgstr "nรฃo foi possรญvel executar o comando stash." + +#: transport-helper.c:1097 +#, fuzzy +msgid "error while running fast-export" +msgstr "erro ao fechar ficheiro de pacote" + +#: transport-helper.c:1122 +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch.\n" +msgstr "" + +#: transport-helper.c:1203 +#, fuzzy, c-format +msgid "unsupported object format '%s'" +msgstr "objeto malformado em '%s'" + +#: transport-helper.c:1212 +#, fuzzy, c-format +msgid "malformed response in ref list: %s" +msgstr "folha de opรงรตes malformada: '%s'" + +#: transport-helper.c:1364 +#, fuzzy, c-format +msgid "read(%s) failed" +msgstr "%s falhou" + +#: transport-helper.c:1391 +#, fuzzy, c-format +msgid "write(%s) failed" +msgstr "%s falhou" + +#: transport-helper.c:1440 +#, fuzzy, c-format +msgid "%s thread failed" +msgstr "%s falhou" + +#: transport-helper.c:1444 +#, fuzzy, c-format +msgid "%s thread failed to join: %s" +msgstr "falha ao abrir '%s'" + +#: transport-helper.c:1463 transport-helper.c:1467 +#, c-format +msgid "can't start thread for copying data: %s" +msgstr "" + +#: transport-helper.c:1504 +#, c-format +msgid "%s process failed to wait" +msgstr "" + +#: transport-helper.c:1508 +#, fuzzy, c-format +msgid "%s process failed" +msgstr "%s falhou" + +#: transport-helper.c:1526 transport-helper.c:1535 +msgid "can't start thread for copying data" +msgstr "" + +#: transport.c:116 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Iria definir o ramo a montante de '%s' como '%s' de '%s'\n" -#: transport.c:151 +#: transport.c:145 +#, fuzzy, c-format +msgid "could not read bundle '%s'" +msgstr "nรฃo foi possรญvel ler o ficheiro '%s'" + +#: transport.c:220 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transporte: opรงรฃo de profundidade '%s' invรกlida" -#: transport.c:889 +#: transport.c:269 +msgid "see protocol.version in 'git help config' for more details" +msgstr "" + +#: transport.c:270 +msgid "server options require protocol version 2 or later" +msgstr "" + +#: transport.c:712 +#, fuzzy +msgid "could not parse transport.color.* config" +msgstr "nรฃo foi possรญvel analisar o autor do script" + +#: transport.c:785 +msgid "support for protocol v2 not implemented yet" +msgstr "" + +#: transport.c:919 +#, fuzzy, c-format +msgid "unknown value for config '%s': %s" +msgstr "valor desconhecido '%s' da chave '%s'" + +#: transport.c:985 +#, fuzzy, c-format +msgid "transport '%s' not allowed" +msgstr "ramo '%s' nรฃo encontrado." + +#: transport.c:1038 +msgid "git-over-rsync is no longer supported" +msgstr "" + +#: transport.c:1140 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3717,7 +8697,7 @@ msgstr "" "Os seguintes caminhos de submรณdulo contรชm alteraรงรตes que\n" "nรฃo puderam ser encontradas a nenhum remoto:\n" -#: transport.c:893 +#: transport.c:1144 #, c-format msgid "" "\n" @@ -3744,32 +8724,32 @@ msgstr "" "para publicรก-las no remoto.\n" "\n" -#: transport.c:901 +#: transport.c:1152 msgid "Aborting." msgstr "Abortado." -#: transport-helper.c:1080 -#, c-format -msgid "Could not read ref %s" -msgstr "Nรฃo foi possรญvel ler a referรชncia %s" +#: transport.c:1297 +#, fuzzy +msgid "failed to push all needed submodules" +msgstr "Falha ao adicionar o submรณdulo '$sm_path'" -#: tree-walk.c:31 +#: tree-walk.c:32 msgid "too-short tree object" msgstr "objeto รกrvore demasiado curto" -#: tree-walk.c:37 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "modo na entrada de รกrvore malformado" -#: tree-walk.c:41 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "nome de ficheiro vazio na entrada de รกrvore" -#: tree-walk.c:113 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "ficheiro de รกrvore demasiado curto" -#: unpack-trees.c:104 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3779,7 +8759,7 @@ msgstr "" "extrair:\n" "%%sSubmeta as suas alteraรงรตes ou esconda-as antes de trocar de ramo." -#: unpack-trees.c:106 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3789,7 +8769,7 @@ msgstr "" "extrair:\n" "%%s" -#: unpack-trees.c:109 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3799,7 +8779,7 @@ msgstr "" "integrar:\n" "%%sSubmeta as suas alteraรงรตes ou esconda-as antes de integrar." -#: unpack-trees.c:111 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3809,7 +8789,7 @@ msgstr "" "integrar:\n" "%%s" -#: unpack-trees.c:114 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3819,7 +8799,7 @@ msgstr "" "%s:\n" "%%sSubmeta as suas alteraรงรตes ou esconda-as antes de efetuar %s." -#: unpack-trees.c:116 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3829,7 +8809,7 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3839,7 +8819,7 @@ msgstr "" "deles:\n" "%s" -#: unpack-trees.c:125 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3849,7 +8829,7 @@ msgstr "" "removidos ao extrair:\n" "%%sMova ou remova-os antes de trocar de ramos." -#: unpack-trees.c:127 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3859,7 +8839,7 @@ msgstr "" "removidos ao extrair:\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3869,7 +8849,7 @@ msgstr "" "removidos ao integrar:\n" "%%sMova ou remova-os antes de integrar." -#: unpack-trees.c:132 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3879,7 +8859,7 @@ msgstr "" "removidos ao integrar:\n" "%%s" -#: unpack-trees.c:135 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3889,7 +8869,7 @@ msgstr "" "removidos por %s:\n" "%%sMova ou remova-os antes de efetuar %s." -#: unpack-trees.c:137 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3899,7 +8879,7 @@ msgstr "" "removidos por %s:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3910,7 +8890,7 @@ msgstr "" "substituรญdos ao extrair:\n" "%%sMova ou remova-os antes de trocar de ramos." -#: unpack-trees.c:144 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3921,7 +8901,7 @@ msgstr "" "substituรญdos ao extrair:\n" "%%s" -#: unpack-trees.c:147 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3931,7 +8911,7 @@ msgstr "" "substituรญdos ao integrar:\n" "%%sMova ou remova-os antes de integrar." -#: unpack-trees.c:149 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3941,7 +8921,7 @@ msgstr "" "substituรญdos ao integrar:\n" "%%s" -#: unpack-trees.c:152 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3951,7 +8931,7 @@ msgstr "" "substituรญdos por %s:\n" "%%sMova ou remova-os antes de efetuar %s." -#: unpack-trees.c:154 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3961,65 +8941,75 @@ msgstr "" "substituรญdos por %s:\n" "%%s" -#: unpack-trees.c:161 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "A entrada '%s' sobrepรตe-se com '%s'. Nรฃo รฉ possรญvel vincular." -#: unpack-trees.c:164 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -"Nรฃo รฉ possรญvel extrair esparsamente: as seguintes entradas nรฃo estรฃo " -"atualizadas:\n" +"Nรฃo รฉ possรญvel atualizar submรณdulo:\n" "%s" -#: unpack-trees.c:166 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"Os seguintes ficheiros na รกrvore de trabalho seriam substituรญdos ao " -"atualizar a extraรงรฃo esparsa:\n" -"%s" -#: unpack-trees.c:168 -#, c-format +#: unpack-trees.c:180 +#, fuzzy, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" -"%s" -msgstr "" -"Os seguintes ficheiros na รกrvore de trabalho seriam removidos ao atualizar a " -"extraรงรฃo esparsa:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" +msgstr "Os seguintes caminhos estรฃo ignorados por algum ficheiro .gitignore:\n" -#: unpack-trees.c:170 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"Nรฃo รฉ possรญvel atualizar submรณdulo:\n" -"%s" -#: unpack-trees.c:247 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "A abortar\n" -#: unpack-trees.c:272 +#: unpack-trees.c:289 #, c-format -msgid "submodule update strategy not supported for submodule '%s'" -msgstr "nรฃo foi possรญvel procurar pelo submรณdulo '%s'" +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" -#: unpack-trees.c:340 -msgid "Checking out files" -msgstr "A extrair ficheiros" +#: unpack-trees.c:350 +#, fuzzy +msgid "Updating files" +msgstr "A atualizar %s" + +#: unpack-trees.c:382 +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:1498 +#, fuzzy +msgid "Updating index flags" +msgstr "A atualizar %s" + +#: upload-pack.c:1516 +msgid "expected flush after fetch arguments" +msgstr "" #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" @@ -4050,299 +9040,371 @@ msgstr "nรบmero de porta invรกlido" msgid "invalid '..' path segment" msgstr "segmento de caminho '..' invรกlido" -#: worktree.c:285 +#: walker.c:170 +#, fuzzy +msgid "Fetching objects" +msgstr "A verificar objetos" + +#: worktree.c:236 builtin/am.c:2116 #, c-format msgid "failed to read '%s'" msgstr "falha ao ler '%s'" -#: wrapper.c:222 wrapper.c:392 +#: worktree.c:283 #, c-format -msgid "could not open '%s' for reading and writing" -msgstr "nรฃo foi possรญvel abrir '%s' para leitura e escrita" +msgid "'%s' at main working tree is not the repository directory" +msgstr "" -#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 +#: worktree.c:294 #, c-format -msgid "could not open '%s' for writing" -msgstr "nรฃo foi possรญvel abrir '%s' para escrita" +msgid "'%s' file does not contain absolute path to the working tree location" +msgstr "" + +#: worktree.c:306 +#, fuzzy, c-format +msgid "'%s' does not exist" +msgstr "o caminho '%s' nรฃo existe" + +#: worktree.c:312 +#, fuzzy, c-format +msgid "'%s' is not a .git file, error code %d" +msgstr "'%s' nรฃo estรก trancada" + +#: worktree.c:321 +#, fuzzy, c-format +msgid "'%s' does not point back to '%s'" +msgstr "'%s' nรฃo aponta para um commit" + +#: worktree.c:587 +#, fuzzy +msgid "not a directory" +msgstr "Nรฃo รฉ um repositรณrio git" + +#: worktree.c:596 +#, fuzzy +msgid ".git is not a file" +msgstr "git show %s: ficheiro incorreto" + +#: worktree.c:598 +msgid ".git file broken" +msgstr "" + +#: worktree.c:600 +#, fuzzy +msgid ".git file incorrect" +msgstr "ficheiro de รญndice corrompido" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015 -#: builtin/pull.c:341 +#: worktree.c:670 +#, fuzzy +msgid "not a valid path" +msgstr "nome de objeto invรกlido: %s" + +#: worktree.c:676 +#, fuzzy +msgid "unable to locate repository; .git is not a file" +msgstr "nรฃo รฉ possรญvel escrever ficheiro de รญndice temporรกrio" + +#: worktree.c:679 +#, fuzzy +msgid "unable to locate repository; .git file broken" +msgstr "nรฃo รฉ possรญvel escrever ficheiro de รญndice temporรกrio" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "" + +#: wrapper.c:197 wrapper.c:367 #, c-format -msgid "could not open '%s' for reading" -msgstr "nรฃo foi possรญvel abrir '%s' para leitura" +msgid "could not open '%s' for reading and writing" +msgstr "nรฃo foi possรญvel abrir '%s' para leitura e escrita" -#: wrapper.c:581 wrapper.c:602 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "nรฃo รฉ possรญvel aceder a '%s'" -#: wrapper.c:610 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "nรฃo รฉ possรญvel de obter o diretรณrio de trabalho atual" -#: wrapper.c:634 -#, c-format -msgid "could not write to %s" -msgstr "nรฃo foi possรญvel escrever para %s" - -#: wrapper.c:636 -#, c-format -msgid "could not close %s" -msgstr "nรฃo foi possรญvel fechar %s" - -#: wt-status.c:151 +#: wt-status.c:158 msgid "Unmerged paths:" msgstr "Caminhos nรฃo integrados:" -#: wt-status.c:178 wt-status.c:205 -#, c-format -msgid " (use \"git reset %s <file>...\" to unstage)" +#: wt-status.c:187 wt-status.c:219 +#, fuzzy +msgid " (use \"git restore --staged <file>...\" to unstage)" +msgstr " (use \"git reset %s <ficheiro>...\" para despreparar)" + +#: wt-status.c:190 wt-status.c:222 +#, fuzzy, c-format +msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" msgstr " (use \"git reset %s <ficheiro>...\" para despreparar)" -#: wt-status.c:180 wt-status.c:207 +#: wt-status.c:193 wt-status.c:225 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (use \"git rm --cached <ficheiro>...\" para despreparar)" -#: wt-status.c:184 +#: wt-status.c:197 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (use \"git add <ficheiro>...\" para marcar como resolvido)" -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:199 wt-status.c:203 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (use \"git add/rm <ficheiro>...\" conforme apropriado para marcar como " "resolvido)" -#: wt-status.c:188 +#: wt-status.c:201 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)" -#: wt-status.c:199 wt-status.c:958 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "Alteraรงรตes para serem submetidas:" -#: wt-status.c:217 wt-status.c:967 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "Alteraรงรตes nรฃo preparadas para submeter:" -#: wt-status.c:221 +#: wt-status.c:238 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (use \"git add <ficheiro>...\" para atualizar o que serรก submetido)" -#: wt-status.c:223 +#: wt-status.c:240 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (use \"git add/rm <ficheiro>...\" para atualizar o que serรก submetido)" -#: wt-status.c:224 +#: wt-status.c:241 +#, fuzzy msgid "" -" (use \"git checkout -- <file>...\" to discard changes in working directory)" +" (use \"git restore <file>...\" to discard changes in working directory)" msgstr "" " (use \"git checkout -- <ficheiro>...\" para descartar alteraรงรตes no " "diretรณrio de trabalho)" -#: wt-status.c:226 +#: wt-status.c:243 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (submeta ou descarte o conteรบdo modificado ou nรฃo controlado nos " "submรณdulos)" -#: wt-status.c:238 +#: wt-status.c:254 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (use \"git %s <ficheiro>...\" para incluir no que serรก submetido)" -#: wt-status.c:253 +#: wt-status.c:266 msgid "both deleted:" msgstr "eliminado por ambos:" -#: wt-status.c:255 +#: wt-status.c:268 msgid "added by us:" msgstr "adicionado por nรณs:" -#: wt-status.c:257 +#: wt-status.c:270 msgid "deleted by them:" msgstr "eliminado por eles:" -#: wt-status.c:259 +#: wt-status.c:272 msgid "added by them:" msgstr "adicionado por eles:" -#: wt-status.c:261 +#: wt-status.c:274 msgid "deleted by us:" msgstr "eliminado por nรณs:" -#: wt-status.c:263 +#: wt-status.c:276 msgid "both added:" msgstr "adicionado por ambos:" -#: wt-status.c:265 +#: wt-status.c:278 msgid "both modified:" msgstr "modificado por ambos:" -#: wt-status.c:275 +#: wt-status.c:288 msgid "new file:" msgstr "novo ficheiro:" -#: wt-status.c:277 +#: wt-status.c:290 msgid "copied:" msgstr "copiado:" -#: wt-status.c:279 +#: wt-status.c:292 msgid "deleted:" msgstr "eliminado:" -#: wt-status.c:281 +#: wt-status.c:294 msgid "modified:" msgstr "modificado:" -#: wt-status.c:283 +#: wt-status.c:296 msgid "renamed:" msgstr "nome mudado:" -#: wt-status.c:285 +#: wt-status.c:298 msgid "typechange:" msgstr "tipo alterado:" -#: wt-status.c:287 +#: wt-status.c:300 msgid "unknown:" msgstr "desconhecido:" -#: wt-status.c:289 +#: wt-status.c:302 msgid "unmerged:" msgstr "nรฃo integrado:" -#: wt-status.c:371 +#: wt-status.c:382 msgid "new commits, " msgstr "novos commits, " -#: wt-status.c:373 +#: wt-status.c:384 msgid "modified content, " msgstr "conteรบdo modificado, " -#: wt-status.c:375 +#: wt-status.c:386 msgid "untracked content, " msgstr "conteรบdo nรฃo controlado, " -#: wt-status.c:831 +#: wt-status.c:903 +#, fuzzy, c-format +msgid "Your stash currently has %d entry" +msgid_plural "Your stash currently has %d entries" +msgstr[0] "Estรก a rebasear neste momento." +msgstr[1] "Estรก a rebasear neste momento." + +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "Submรณdulos alterados mas nรฃo atualizados:" -#: wt-status.c:833 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "Alteraรงรตes em submรณdulos para serem submetidas:" -#: wt-status.c:914 +#: wt-status.c:1018 +#, fuzzy msgid "" -"Do not touch the line above.\n" -"Everything below will be removed." +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." msgstr "" "Nรฃo altere a linha acima.\n" "Tudo o que estiver abaixo serรก removido." -#: wt-status.c:1026 +#: wt-status.c:1110 +#, 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 "" + +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "Hรก caminhos nรฃo integrados." -#: wt-status.c:1029 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr " (corrija os conflitos e execute \"git commit\")" -#: wt-status.c:1031 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (use \"git am --abort\" para abortar a integraรงรฃo)" -#: wt-status.c:1036 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "Todos os conflitos foram corrigidos mas ainda estรก a integrar." -#: wt-status.c:1039 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr " (use \"git commit\" para concluir a integraรงรฃo)" -#: wt-status.c:1049 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "Sessรฃo am em curso." -#: wt-status.c:1052 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "O patch atual estรก vazio." -#: wt-status.c:1056 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (corrija os conflitos e execute \"git am --continue\")" -#: wt-status.c:1058 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (use \"git am --skip\" para ignorar este patch)" -#: wt-status.c:1060 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (use \"git am --abort\" para restaurar o ramo original)" -#: wt-status.c:1189 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo nรฃo existe." -#: wt-status.c:1191 +#: wt-status.c:1307 msgid "No commands done." msgstr "Nenhum comando concluรญdo." -#: wt-status.c:1194 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "รltimo comando concluรญdo (%d comando concluรญdo):" msgstr[1] "รltimos comandos concluรญdos (%d comandos concluรญdos):" -#: wt-status.c:1205 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " (veja mais no ficheiro %s)" -#: wt-status.c:1210 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "Nenhum comando por concluir." -#: wt-status.c:1213 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prรณximo comando a executar (%d comando restante):" msgstr[1] "Prรณximos comandos a executar (%d comandos restantes):" -#: wt-status.c:1221 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)" -#: wt-status.c:1234 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Estรก a realizar rebase do ramo '%s' sobre '%s'." -#: wt-status.c:1239 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "Estรก a rebasear neste momento." -#: wt-status.c:1253 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (corrija os conflitos e execute \"git rebase --continue\")" -#: wt-status.c:1255 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (use \"git rebase --skip\" para ignorar este patch)" -#: wt-status.c:1257 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (use \"git rebase --abort\" para restaurar o ramo original)" -#: wt-status.c:1263 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (todos os conflitos foram corrigidos: execute \"git rebase --continue\")" -#: wt-status.c:1267 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4350,126 +9412,158 @@ msgstr "" "Estรก a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' " "sobre '%s'." -#: wt-status.c:1272 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "Estรก a dividir um commit durante um rebase." -#: wt-status.c:1275 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Assim que o diretรณrio de trabalho estiver limpo, execute \"git rebase --" "continue\")" -#: wt-status.c:1279 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Estรก a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre " "'%s'." -#: wt-status.c:1284 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "Estรก a editar um commit durante um rebase." -#: wt-status.c:1287 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (use \"git commit --amend\" para emendar o commit atual)" -#: wt-status.c:1289 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (use \"git rebase --continue\" assim que estiver satisfeito com as " "alteraรงรตes)" -#: wt-status.c:1299 +#: wt-status.c:1415 +#, fuzzy +msgid "Cherry-pick currently in progress." +msgstr "nenhum cherry-pick ou revert em curso" + +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Estรก a realizar cherry-pick do commit %s." -#: wt-status.c:1304 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")" -#: wt-status.c:1307 +#: wt-status.c:1428 +#, fuzzy +msgid " (run \"git cherry-pick --continue\" to continue)" +msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")" + +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (todos os conflitos foram corrigidos: execute \"git cherry-pick --continue" "\")" -#: wt-status.c:1309 +#: wt-status.c:1433 +#, fuzzy +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (use \"git am --skip\" para ignorar este patch)" + +#: wt-status.c:1435 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (use \"git cherry-pick --abort\" para cancelar a operaรงรฃo de cherry-pick)" -#: wt-status.c:1318 +#: wt-status.c:1445 +#, fuzzy +msgid "Revert currently in progress." +msgstr "abortar integraรงรฃo em curso" + +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "Estรก a reverter o commit %s neste comento." -#: wt-status.c:1323 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (corrija dos conflitos e execute \"git revert --continue\")" -#: wt-status.c:1326 +#: wt-status.c:1457 +#, fuzzy +msgid " (run \"git revert --continue\" to continue)" +msgstr " (corrija dos conflitos e execute \"git revert --continue\")" + +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (todos os conflitos foram corrigidos: execute \"git revert --continue\")" -#: wt-status.c:1328 +#: wt-status.c:1462 +#, fuzzy +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (use \"git rebase --skip\" para ignorar este patch)" + +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (use \"git rever --abort\" para cancelar a operaรงรฃo de reversรฃo)" -#: wt-status.c:1339 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Estรก a bissetar, iniciado a partir do ramo '%s'." -#: wt-status.c:1343 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Estรก a bissetar neste momento." -#: wt-status.c:1346 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (use \"git bisect reset\" para voltar ao ramo original)" -#: wt-status.c:1543 +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "" + +#: wt-status.c:1731 msgid "On branch " msgstr "No ramo " -#: wt-status.c:1549 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "rebase interativo em curso; sobre " -#: wt-status.c:1551 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "rebase em curso; sobre " -#: wt-status.c:1556 -msgid "HEAD detached at " -msgstr "HEAD destacada em " - -#: wt-status.c:1558 -msgid "HEAD detached from " -msgstr "HEAD destacada de " - -#: wt-status.c:1561 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "Nรฃo se encontra em nenhum ramo neste momento." -#: wt-status.c:1579 +#: wt-status.c:1767 msgid "Initial commit" msgstr "Commit inicial" -#: wt-status.c:1593 +#: wt-status.c:1768 +#, fuzzy +msgid "No commits yet" +msgstr "nenhum commit analisado." + +#: wt-status.c:1782 msgid "Untracked files" msgstr "Ficheiros nรฃo controlados" -#: wt-status.c:1595 +#: wt-status.c:1784 msgid "Ignored files" msgstr "Ficheiros ignorados" -#: wt-status.c:1599 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4481,32 +9575,32 @@ msgstr "" "cuidado de nรฃo se esquecer de adicionar novos ficheiros\n" "(consulte 'git help status')." -#: wt-status.c:1605 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "Ficheiros nรฃo controlados nรฃo listados%s" -#: wt-status.c:1607 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr " (use a opรงรฃo -u para mostrar os ficheiros nรฃo controlados)" -#: wt-status.c:1613 +#: wt-status.c:1802 msgid "No changes" msgstr "Sem alteraรงรตes" -#: wt-status.c:1618 +#: wt-status.c:1807 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "nenhuma alteraรงรฃo adicionada para submeter (use \"git add\" e/ou \"git " "commit -a\")\n" -#: wt-status.c:1621 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "nenhuma alteraรงรฃo adicionada para submeter\n" -#: wt-status.c:1624 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4515,332 +9609,393 @@ msgstr "" "nรฃo foi adicionado nada para submeter, mas existem ficheiros nรฃo controlados " "(use \"git add\" para controlรก-los)\n" -#: wt-status.c:1627 +#: wt-status.c:1819 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "nรฃo foi adicionado nada para submeter, mas existem ficheiros nรฃo " "controlados\n" -#: wt-status.c:1630 +#: wt-status.c:1823 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "nรฃo hรก nada para submeter (crie/copie ficheiros e use \"git add\" para " "controlรก-los)\n" -#: wt-status.c:1633 wt-status.c:1638 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "nรฃo hรก nada para submeter\n" -#: wt-status.c:1636 +#: wt-status.c:1830 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nรฃo hรก nada para submeter (use -u para mostrar os ficheiros nรฃo " "controlados)\n" -#: wt-status.c:1640 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nรฃo hรก nada para submeter, รกrvore de trabalho limpa\n" -#: wt-status.c:1749 -msgid "Initial commit on " -msgstr "Commit inicial em " +#: wt-status.c:1940 +#, fuzzy +msgid "No commits yet on " +msgstr "Nenhum comando concluรญdo." -#: wt-status.c:1753 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD (nenhum ramo)" -#: wt-status.c:1782 wt-status.c:1790 +#: wt-status.c:1975 +msgid "different" +msgstr "" + +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "atrรกs " -#: wt-status.c:1785 wt-status.c:1788 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "ร frente " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2280 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "nรฃo รฉ possรญvel efetuar %s: tem alteraรงรตes nรฃo preparadas." -#: wt-status.c:2286 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "alรฉm disso, o รญndice contรฉm alteraรงรตes nรฃo submetidas." -#: wt-status.c:2288 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "nรฃo รฉ possรญvel efetuar %s: o รญndice contรฉm alteraรงรตes nรฃo submetidas." -#: compat/precompose_utf8.c:57 builtin/clone.c:432 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 #, c-format msgid "failed to unlink '%s'" msgstr "falha ao invocar unlink de '%s'" -#: builtin/add.c:22 +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opรงรตes>] [--] <caminho>..." -#: builtin/add.c:80 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:85 builtin/commit.c:291 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "falha ao atualizar os ficheiros" -#: builtin/add.c:95 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "remover '%s'\n" -#: builtin/add.c:149 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Alteraรงรตes nรฃo preparadas depois de atualizar o รญndice:" -#: builtin/add.c:209 builtin/rev-parse.c:872 +#: builtin/add.c:272 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "Nรฃo foi possรญvel ler o รญndice" -#: builtin/add.c:220 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "Nรฃo foi possรญvel abrir '%s' para escrita." -#: builtin/add.c:224 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "Nรฃo foi possรญvel escrever patch" -#: builtin/add.c:227 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "falha ao editar patch" -#: builtin/add.c:230 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "Nรฃo foi possรญvel obter stat de '%s'" -#: builtin/add.c:232 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "Patch vazio. Abortado." -#: builtin/add.c:237 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "Nรฃo foi possรญvel aplicar '%s'" -#: builtin/add.c:247 +#: builtin/add.c:308 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Os seguintes caminhos estรฃo ignorados por algum ficheiro .gitignore:\n" -#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 -#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 msgid "dry run" msgstr "simular aรงรฃo" -#: builtin/add.c:269 +#: builtin/add.c:331 msgid "interactive picking" msgstr "seleรงรฃo interativa" -#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286 +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 msgid "select hunks interactively" msgstr "selecionar blocos interativamente" -#: builtin/add.c:271 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "editar o diff atual e aplicรก-lo" -#: builtin/add.c:272 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "permitir adicionar ficheiros ignorados" -#: builtin/add.c:273 +#: builtin/add.c:335 msgid "update tracked files" msgstr "atualizar ficheiros controlados" -#: builtin/add.c:274 +#: builtin/add.c:336 +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "" + +#: builtin/add.c:337 msgid "record only the fact that the path will be added later" msgstr "registar apenas o facto de que o caminho serรก adicionado mais tarde" -#: builtin/add.c:275 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "" "adicionar alteraรงรตes de todos os ficheiros controlados ou nรฃo controlados" -#: builtin/add.c:278 +#: builtin/add.c:341 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorar caminhos removidos na รกrvore de trabalho (o mesmo que --no-all)" -#: builtin/add.c:280 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "nรฃo adicionar, apenas atualizar o รญndice" -#: builtin/add.c:281 +#: builtin/add.c:344 msgid "just skip files which cannot be added because of errors" msgstr "ignorar ficheiros que nรฃo podem ser adicionados por causa de erros" -#: builtin/add.c:282 +#: builtin/add.c:345 msgid "check if - even missing - files are ignored in dry run" msgstr "verificar quais os ficheiros ignorados na simulaรงรฃo" -#: builtin/add.c:283 builtin/update-index.c:951 -msgid "(+/-)x" -msgstr "(+/-)x" - -#: builtin/add.c:283 builtin/update-index.c:952 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "substituir o bit executรกvel dos ficheiros listados" -#: builtin/add.c:305 +#: builtin/add.c:349 +#, fuzzy +msgid "warn when adding an embedded repository" +msgstr "criar um repositรณrio nu" + +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "" + +#: builtin/add.c:369 #, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "Use -f se deseja mesmo adicionรก-los.\n" +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 "" -#: builtin/add.c:312 +#: builtin/add.c:397 +#, fuzzy, c-format +msgid "adding embedded git repository: %s" +msgstr "--stdin requer um repositรณrio git" + +#: builtin/add.c:416 +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" +msgstr "" + +#: builtin/add.c:425 msgid "adding files failed" msgstr "falha ao adicionar ficheiros" -#: builtin/add.c:348 +#: builtin/add.c:453 builtin/commit.c:345 +#, fuzzy +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--first-parent รฉ incompatรญvel com --bisect" + +#: builtin/add.c:470 +#, fuzzy +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--first-parent รฉ incompatรญvel com --bisect" + +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "-A e -u sรฃo mutuamente incompatรญveis" -#: builtin/add.c:355 +#: builtin/add.c:485 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "A opรงรฃo --ignore-missing sรณ pode ser usada em conjunto com --dry-run" -#: builtin/add.c:359 +#: builtin/add.c:489 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "o parรขmetro '%s' de --chmod tem de ser -x ou +x" -#: builtin/add.c:374 +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +#, fuzzy +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "--patch รฉ incompatรญvel com --{hard,mixed,soft}" + +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "" + +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nรฃo foi especificado nada, nada adicionado.\n" -#: builtin/add.c:375 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Queria dizer 'git add .'?\n" +#: builtin/add.c:520 +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 -#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 -#: builtin/submodule--helper.c:244 -msgid "index file corrupt" -msgstr "ficheiro de รญndice corrompido" +#: builtin/am.c:160 +#, fuzzy, c-format +msgid "invalid committer: %s" +msgstr "commit invรกlido %s" -#: builtin/am.c:414 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "nรฃo foi possรญvel analisar o autor do script" -#: builtin/am.c:491 +#: builtin/am.c:450 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' foi eliminado pelo hook applypatch-msg" -#: builtin/am.c:532 +#: builtin/am.c:492 #, c-format msgid "Malformed input line: '%s'." msgstr "Linha de entrada malformada: '%s'." -#: builtin/am.c:569 +#: builtin/am.c:530 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Falha ao copiar notas de '%s' para '%s'" -#: builtin/am.c:595 +#: builtin/am.c:556 msgid "fseek failed" msgstr "falha ao invocar fseek" -#: builtin/am.c:775 +#: builtin/am.c:744 #, c-format msgid "could not parse patch '%s'" msgstr "nรฃo foi possรญvel analisar o patch '%s'" -#: builtin/am.c:840 +#: builtin/am.c:809 msgid "Only one StGIT patch series can be applied at once" msgstr "Sรณ pode ser aplicada uma sรฉrie de patches StGIT duma sรณ vez" -#: builtin/am.c:887 +#: builtin/am.c:857 msgid "invalid timestamp" msgstr "carimbo de data/hora invรกlido" -#: builtin/am.c:890 builtin/am.c:898 +#: builtin/am.c:862 builtin/am.c:874 msgid "invalid Date line" msgstr "linha de Data invรกlida" -#: builtin/am.c:895 +#: builtin/am.c:869 msgid "invalid timezone offset" msgstr "mudanรงa de fuso horรกrio invรกlida" -#: builtin/am.c:984 +#: builtin/am.c:962 msgid "Patch format detection failed." msgstr "Falha ao detetar o formato do patch." -#: builtin/am.c:989 builtin/clone.c:397 +#: builtin/am.c:967 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "falha ao criar o diretรณrio '%s'" -#: builtin/am.c:993 +#: builtin/am.c:972 msgid "Failed to split patches." msgstr "Falha ao dividir patches." -#: builtin/am.c:1125 builtin/commit.c:376 -msgid "unable to write index file" -msgstr "nรฃo รฉ possรญvel escrever o ficheiro de รญndice" - -#: builtin/am.c:1176 +#: builtin/am.c:1103 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Apรณs resolver este problema, execute \"%s --continue\"." -#: builtin/am.c:1177 +#: builtin/am.c:1104 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Se preferir ignorar este patch, execute \"%s --skip\"." -#: builtin/am.c:1178 +#: builtin/am.c:1105 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Para restaurar o ramo original e interromper a aplicaรงรฃo dos patches, " "execute \"%s --abort\"." -#: builtin/am.c:1316 -msgid "Patch is empty. Was it split wrong?" -msgstr "O patch estรก vazio. Foi dividido incorretamente?" +#: builtin/am.c:1188 +msgid "Patch sent with format=flowed; space at the end of lines might be lost." +msgstr "" -#: builtin/am.c:1390 builtin/log.c:1557 -#, c-format -msgid "invalid ident line: %s" -msgstr "linha de identidade invรกlida: %s" +#: builtin/am.c:1216 +#, fuzzy +msgid "Patch is empty." +msgstr "O patch atual estรก vazio." -#: builtin/am.c:1417 -#, c-format -msgid "unable to parse commit %s" -msgstr "nรฃo foi possรญvel analisar o commit %s" +#: builtin/am.c:1281 +#, fuzzy, c-format +msgid "missing author line in commit %s" +msgstr "Autor em falta: %s" + +#: builtin/am.c:1284 +#, fuzzy, c-format +msgid "invalid ident line: %.*s" +msgstr "linha de identidade invรกlida: %s" -#: builtin/am.c:1610 +#: builtin/am.c:1503 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "O repositรณrio nรฃo tem os blobs necessรกrios para recorrer a integraรงรฃo com 3 " "pontos." -#: builtin/am.c:1612 +#: builtin/am.c:1505 msgid "Using index info to reconstruct a base tree..." msgstr "A usar informaรงรฃo do รญndice para reconstruir uma รกrvore de base..." -#: builtin/am.c:1631 +#: builtin/am.c:1524 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4848,41 +10003,26 @@ msgstr "" "Editou o patch manualmente?\n" "Nรฃo รฉ possรญvel aplicรก-lo aos blobs registados no รญndice." -#: builtin/am.c:1637 +#: builtin/am.c:1530 msgid "Falling back to patching base and 3-way merge..." msgstr "" "A recorrer a uma de base para aplicaรงรฃo de patches e integraรงรฃo com 3 " "pontos..." -#: builtin/am.c:1662 +#: builtin/am.c:1556 msgid "Failed to merge in the changes." msgstr "Falha ao integrar as alteraรงรตes." -#: builtin/am.c:1686 builtin/merge.c:631 -msgid "git write-tree failed to write a tree" -msgstr "git write-tree falhou ao escrever uma รกrvore" - -#: builtin/am.c:1693 +#: builtin/am.c:1588 msgid "applying to an empty history" msgstr "a aplicar a um histรณrico vazio" -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 -#: builtin/merge.c:827 -msgid "failed to write commit object" -msgstr "falha ao escrever objeto de commit" - -#: builtin/am.c:1739 builtin/am.c:1743 +#: builtin/am.c:1639 builtin/am.c:1643 #, c-format msgid "cannot resume: %s does not exist." msgstr "nรฃo รฉ possรญvel continuar: %s nรฃo existe." -#: builtin/am.c:1759 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "" -"nรฃo รฉ possรญvel entrar em modo interativo sem um entrada padrรฃo conectada a " -"um terminal." - -#: builtin/am.c:1764 +#: builtin/am.c:1661 msgid "Commit Body is:" msgstr "Corpo do commit:" @@ -4890,35 +10030,39 @@ msgstr "Corpo do commit:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1774 +#: builtin/am.c:1671 +#, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Aplicar? [y]sim/[n]รฃo/[e]ditar/[v]er patch/[a]ceitar todos: " -#: builtin/am.c:1824 +#: builtin/am.c:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "nรฃo รฉ possรญvel escrever o ficheiro de รญndice" + +#: builtin/am.c:1721 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "รndice modificado: nรฃo รฉ possรญvel aplicar patches (modificado: %s)" -#: builtin/am.c:1861 builtin/am.c:1933 +#: builtin/am.c:1761 builtin/am.c:1829 #, c-format msgid "Applying: %.*s" msgstr "A aplicar: %.*s" -#: builtin/am.c:1877 +#: builtin/am.c:1778 msgid "No changes -- Patch already applied." msgstr "Nenhuma alteraรงรฃo -- Jรก foi aplicado o patch." -#: builtin/am.c:1885 +#: builtin/am.c:1784 #, c-format msgid "Patch failed at %s %.*s" msgstr "Falha ao aplicar o patch em %s %.*s" -#: builtin/am.c:1891 -#, c-format -msgid "The copy of the patch that failed is found in: %s" -msgstr "A cรณpia do patch que falhou encontra-se em: %s" +#: builtin/am.c:1788 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +msgstr "" -#: builtin/am.c:1936 +#: builtin/am.c:1832 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4928,25 +10072,25 @@ msgstr "" "Se nรฃo hรก nada por preparar, provavelmente essas mesmas alteraรงรตes\n" "jรก foram introduzidas; pode querer ignorar este patch." -#: builtin/am.c:1943 +#: builtin/am.c:1839 msgid "" "You still have unmerged paths in your index.\n" -"Did you forget to use 'git add'?" +"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 "" -"Ainda hรก caminhos nรฃo integrados no รญndice.\n" -"Esqueceu-se de usar 'git add'?" -#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 -#: builtin/reset.c:316 +#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Nรฃo foi possรญvel analisar o objeto '%s'." -#: builtin/am.c:2103 +#: builtin/am.c:1998 msgid "failed to clean index" msgstr "falha ao limpar o รญndice" -#: builtin/am.c:2137 +#: builtin/am.c:2042 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -4954,134 +10098,157 @@ msgstr "" "Parece que a HEAD foi movida desde a รบltima vez que o 'am' falhou.\n" "Nรฃo recuando a ORIG_HEAD" -#: builtin/am.c:2200 +#: builtin/am.c:2149 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor invรกlido de --patch-format: %s" -#: builtin/am.c:2233 +#: builtin/am.c:2191 +#, fuzzy, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "Valor invรกlido de --patch-format: %s" + +#: builtin/am.c:2195 +#, fuzzy, c-format +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +msgstr "--first-parent รฉ incompatรญvel com --bisect" + +#: builtin/am.c:2226 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opรงรตes>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2234 +#: builtin/am.c:2227 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opรงรตes>] (--continue | --skip | --abort)" -#: builtin/am.c:2240 +#: builtin/am.c:2233 msgid "run interactively" msgstr "executar interativamente" -#: builtin/am.c:2242 +#: builtin/am.c:2235 msgid "historical option -- no-op" msgstr "opรงรฃo histรณrica -- sem-aรงรฃo" -#: builtin/am.c:2244 +#: builtin/am.c:2237 msgid "allow fall back on 3way merging if needed" msgstr "permitir recorrer a integraรงรฃo com 3 pontos se necessรกrio" -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:178 +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 msgid "be quiet" msgstr "silencioso" -#: builtin/am.c:2247 +#: builtin/am.c:2240 msgid "add a Signed-off-by line to the commit message" msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit" -#: builtin/am.c:2250 +#: builtin/am.c:2243 msgid "recode into utf8 (default)" msgstr "recodificar em utf8 (predefiniรงรฃo)" -#: builtin/am.c:2252 +#: builtin/am.c:2245 msgid "pass -k flag to git-mailinfo" msgstr "passar a opรงรฃo -k ao git-mailinfo" -#: builtin/am.c:2254 +#: builtin/am.c:2247 msgid "pass -b flag to git-mailinfo" msgstr "passar a opรงรฃo -b ao git-mailinfo" -#: builtin/am.c:2256 +#: builtin/am.c:2249 msgid "pass -m flag to git-mailinfo" msgstr "passar a opรงรฃo -m ao git-mailinfo" -#: builtin/am.c:2258 +#: builtin/am.c:2251 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passar a opรงรฃo --keep-cr ao gitmailsplit para formato de mbox" -#: builtin/am.c:2261 +#: builtin/am.c:2254 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "nรฃo passar a opรงรฃo --keep-cr ao git-mailsplit independentemente de am.keepcr" -#: builtin/am.c:2264 +#: builtin/am.c:2257 msgid "strip everything before a scissors line" msgstr "retirar todo o conteรบdo antes da linha de tesoura" -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 -#: builtin/am.c:2293 +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 msgid "pass it through git-apply" msgstr "transmitir ao git-apply" -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 -#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 -#: parse-options.h:132 parse-options.h:134 parse-options.h:245 +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37 -#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38 +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2290 +#: builtin/am.c:2283 msgid "format the patch(es) are in" msgstr "formato de apresentaรงรฃo de patches" -#: builtin/am.c:2296 +#: builtin/am.c:2289 msgid "override error message when patch failure occurs" msgstr "substituir a mensagem de erro quando a aplicaรงรฃo do patch falha" -#: builtin/am.c:2298 +#: builtin/am.c:2291 msgid "continue applying patches after resolving a conflict" msgstr "continuar a aplicar os patches depois de resolver os conflitos" -#: builtin/am.c:2301 +#: builtin/am.c:2294 msgid "synonyms for --continue" msgstr "sinรณnimo de --continue" -#: builtin/am.c:2304 +#: builtin/am.c:2297 msgid "skip the current patch" msgstr "ignorar o patch atual" -#: builtin/am.c:2307 +#: builtin/am.c:2300 msgid "restore the original branch and abort the patching operation." msgstr "restaurar o ramo original e abortar a operaรงรฃo de patch." -#: builtin/am.c:2311 +#: builtin/am.c:2303 +msgid "abort the patching operation but keep HEAD where it is." +msgstr "" + +#: builtin/am.c:2307 +#, fuzzy +msgid "show the patch being applied" +msgstr "mostrar linhas nรฃo correspondidas" + +#: builtin/am.c:2312 msgid "lie about committer date" msgstr "mentir sobre a data de commit" -#: builtin/am.c:2313 +#: builtin/am.c:2314 msgid "use current timestamp for author date" msgstr "usar a data e hora atual como data de autor" -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232 -#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "id-chave" -#: builtin/am.c:2316 +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 msgid "GPG-sign commits" msgstr "assinar os commits com GPG" -#: builtin/am.c:2319 +#: builtin/am.c:2320 msgid "(internal use for git-rebase)" msgstr "(uso interno de git-rebase)" -#: builtin/am.c:2334 +#: builtin/am.c:2338 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." @@ -5089,17 +10256,17 @@ msgstr "" "A opรงรฃo -b/--binary hรก muito que รฉ ignorada e serรก\n" "futuramente removida. Por favor nรฃo a use." -#: builtin/am.c:2341 +#: builtin/am.c:2345 msgid "failed to read the index" msgstr "falha ao ler o รญndice" -#: builtin/am.c:2356 +#: builtin/am.c:2360 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "o diretรณrio de rebesa anterior %s ainda existe, mas foi fornecida uma mbox." -#: builtin/am.c:2380 +#: builtin/am.c:2384 #, c-format msgid "" "Stray %s directory found.\n" @@ -5108,10 +10275,14 @@ msgstr "" "Diretรณrio abandonado %s encontrado.\n" "Use \"git am --abort\" para o remover." -#: builtin/am.c:2386 +#: builtin/am.c:2390 msgid "Resolve operation not in progress, we are not resuming." msgstr "A operaรงรฃo de resoluรงรฃo nรฃo estรก em curso, nรฃo retomando." +#: builtin/am.c:2400 +msgid "interactive mode requires patches on the command line" +msgstr "" + #: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<opรงรตes>] [<patch>...]" @@ -5129,230 +10300,593 @@ msgstr "nรฃo foi possรญvel redirecionar a saรญda" msgid "git archive: Remote with no URL" msgstr "git archive: Remoto sem URL" -#: builtin/archive.c:58 -msgid "git archive: expected ACK/NAK, got EOF" +#: builtin/archive.c:61 +#, fuzzy +msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive: esperava-se ACK/NAK, obteve-se EOF" -#: builtin/archive.c:61 +#: builtin/archive.c:64 #, c-format msgid "git archive: NACK %s" msgstr "git archive: NACK %s" -#: builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "erro remoto: %s" - -#: builtin/archive.c:64 +#: builtin/archive.c:65 msgid "git archive: protocol error" msgstr "git archive: erro de protocolo" -#: builtin/archive.c:68 +#: builtin/archive.c:69 msgid "git archive: expected a flush" msgstr "git archive: esvaziamento de cache (flush) esperado" -#: builtin/bisect--helper.c:7 -msgid "git bisect--helper --next-all [--no-checkout]" +#: builtin/bisect--helper.c:23 +#, fuzzy +msgid "git bisect--helper --next-all" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:24 +msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgstr "" + +#: builtin/bisect--helper.c:25 +#, fuzzy +msgid "git bisect--helper --bisect-clean-state" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:26 +#, fuzzy +msgid "git bisect--helper --bisect-reset [<commit>]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:27 +msgid "" +"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " +"<bad_term>" +msgstr "" + +#: builtin/bisect--helper.c:28 +msgid "" +"git bisect--helper --bisect-check-and-set-terms <command> <good_term> " +"<bad_term>" +msgstr "" + +#: builtin/bisect--helper.c:29 +msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" +msgstr "" + +#: builtin/bisect--helper.c:30 +#, fuzzy +msgid "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" +msgstr "" +"argumento invรกlido $arg de 'git bisect terms'.\n" +"Opรงรตes suportadas: --term-good|--term-old e --term-bad|--term-new." + +#: builtin/bisect--helper.c:31 +msgid "" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" +msgstr "" + +#: builtin/bisect--helper.c:33 +#, fuzzy +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:34 +#, fuzzy +msgid "git bisect--helper --bisect-auto-next" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:17 +#: builtin/bisect--helper.c:35 +#, fuzzy +msgid "git bisect--helper --bisect-autostart" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:97 +#, fuzzy, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "nรฃo รฉ possรญvel abrir o ficheiro '%s'" + +#: builtin/bisect--helper.c:104 +#, fuzzy, c-format +msgid "could not write to file '%s'" +msgstr "nรฃo foi possรญvel escrever em '%s'" + +#: builtin/bisect--helper.c:143 +#, fuzzy, c-format +msgid "'%s' is not a valid term" +msgstr "'%s' nรฃo รฉ uma referรชncia vรกlida." + +#: builtin/bisect--helper.c:147 +#, fuzzy, c-format +msgid "can't use the builtin command '%s' as a term" +msgstr "nรฃo รฉ possรญvel usar o comando '$term' como um termo" + +#: builtin/bisect--helper.c:157 +#, fuzzy, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "nรฃo รฉ possรญvel alterar o significado do termo '$term'" + +#: builtin/bisect--helper.c:167 +msgid "please use two different terms" +msgstr "use dois termos diferentes" + +#: builtin/bisect--helper.c:207 +#, fuzzy, c-format +msgid "We are not bisecting.\n" +msgstr "Nรฃo se estรก a bissetar." + +#: builtin/bisect--helper.c:215 +#, fuzzy, c-format +msgid "'%s' is not a valid commit" +msgstr "'%s' nรฃo รฉ um commit" + +#: builtin/bisect--helper.c:224 +#, fuzzy, c-format +msgid "" +"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." +msgstr "" +"Nรฃo foi possรญvel extrair a HEAD original de '$branch'.\n" +"Tente 'git bisect reset <commit>'." + +#: builtin/bisect--helper.c:268 +#, fuzzy, c-format +msgid "Bad bisect_write argument: %s" +msgstr "Argumento de bisect_write incorreto: $state" + +#: builtin/bisect--helper.c:273 +#, fuzzy, c-format +msgid "couldn't get the oid of the rev '%s'" +msgstr "nรฃo foi possรญvel criar o diretรณrio de รกrvore de trabalho '%s'" + +#: builtin/bisect--helper.c:285 +#, fuzzy, c-format +msgid "couldn't open the file '%s'" +msgstr "Nรฃo foi possรญvel abrir o ficheiro '%s'" + +#: builtin/bisect--helper.c:311 +#, fuzzy, c-format +msgid "Invalid command: you're currently in a %s/%s bisect" +msgstr "" +"Comando invรกlido: estรก-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD." + +#: builtin/bisect--helper.c:338 +#, fuzzy, 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 "" +"Deve indicar pelo menos uma revisรฃo $bad_syn e uma revisรฃo $good_syn.\n" +"(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)" + +#: builtin/bisect--helper.c:342 +#, fuzzy, 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 "" +"Deve comeรงar por executar \"git bisect start\".\n" +"Indique pelo menos uma revisรฃo $good_syn e uma revisรฃo $bad_syn.\n" +"(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)" + +#: builtin/bisect--helper.c:362 +#, fuzzy, c-format +msgid "bisecting only with a %s commit" +msgstr "Aviso: a bissetar sรณ com um commit $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:370 +msgid "Are you sure [Y/n]? " +msgstr "Tem a certeza [Y/n]? " + +#: builtin/bisect--helper.c:431 +msgid "no terms defined" +msgstr "nenhum termo definido" + +#: builtin/bisect--helper.c:434 +#, 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:444 +#, 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 "" +"argumento invรกlido $arg de 'git bisect terms'.\n" +"Opรงรตes suportadas: --term-good|--term-old e --term-bad|--term-new." + +#: builtin/bisect--helper.c:511 +#, fuzzy +msgid "revision walk setup failed\n" +msgstr "falha ao configurar percurso de revisรตes" + +#: builtin/bisect--helper.c:533 +#, fuzzy, c-format +msgid "could not open '%s' for appending" +msgstr "nรฃo foi possรญvel abrir '%s' para leitura" + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +#, fuzzy +msgid "'' is not a valid term" +msgstr "'$term' nรฃo รฉ um termo vรกlido" + +#: builtin/bisect--helper.c:674 +#, fuzzy, c-format +msgid "unrecognized option: '%s'" +msgstr "posiรงรฃo nรฃo reconhecida:%s" + +#: builtin/bisect--helper.c:678 +#, fuzzy, c-format +msgid "'%s' does not appear to be a valid revision" +msgstr "'$arg' nรฃo parecer ser uma revisรฃo vรกlida" + +#: builtin/bisect--helper.c:709 +#, fuzzy +msgid "bad HEAD - I need a HEAD" +msgstr "HEAD incorreta - รฉ necessรกrio uma HEAD" + +#: builtin/bisect--helper.c:724 +#, fuzzy, c-format +msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." +msgstr "" +"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-vรกlido>'." + +#: builtin/bisect--helper.c:745 +msgid "won't bisect on cg-seek'ed tree" +msgstr "nรฃo รฉ possรญvel bissetar numa รกrvore \"cg-seek'ed\"" + +#: builtin/bisect--helper.c:748 +#, fuzzy +msgid "bad HEAD - strange symbolic ref" +msgstr "HEAD incorreta - referรชncia simbรณlica desconhecida" + +#: builtin/bisect--helper.c:775 +#, fuzzy, c-format +msgid "invalid ref: '%s'" +msgstr "ficheiro invรกlido: '%s'" + +#: builtin/bisect--helper.c:827 +#, fuzzy +msgid "You need to start by \"git bisect start\"\n" +msgstr "Deve comeรงar por executar \"git bisect start\"" + +#. 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:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Quer que o Git o faรงa por si [Y/n]? " + +#: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'" msgstr "executar 'git bisect next'" -#: builtin/bisect--helper.c:19 -msgid "update BISECT_HEAD instead of checking out the current commit" -msgstr "atualizar BISECT_HEAD em vez de extrair o commit atual" +#: builtin/bisect--helper.c:868 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "" + +#: builtin/bisect--helper.c:870 +msgid "cleanup the bisection state" +msgstr "" + +#: builtin/bisect--helper.c:872 +msgid "check for expected revs" +msgstr "" + +#: builtin/bisect--helper.c:874 +#, fuzzy +msgid "reset the bisection state" +msgstr "remover uma secรงรฃo: nome" + +#: builtin/bisect--helper.c:876 +msgid "write out the bisection state in BISECT_LOG" +msgstr "" + +#: builtin/bisect--helper.c:878 +msgid "check and set terms in a bisection state" +msgstr "" + +#: builtin/bisect--helper.c:880 +msgid "check whether bad or good terms exist" +msgstr "" + +#: builtin/bisect--helper.c:882 +#, fuzzy +msgid "print out the bisect terms" +msgstr "imprimir apenas as tags do objeto" + +#: builtin/bisect--helper.c:884 +msgid "start the bisect session" +msgstr "" + +#: builtin/bisect--helper.c:886 +#, fuzzy +msgid "find the next bisection commit" +msgstr "nรฃo รฉ possรญvel emendar commit nรฃo-existente" + +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" +msgstr "" + +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "" + +#: builtin/bisect--helper.c:892 +msgid "no log for BISECT_WRITE" +msgstr "" + +#: builtin/bisect--helper.c:910 +#, fuzzy +msgid "--write-terms requires two arguments" +msgstr "--abort nรฃo leva argumentos" -#: builtin/blame.c:33 +#: builtin/bisect--helper.c:914 +#, fuzzy +msgid "--bisect-clean-state requires no arguments" +msgstr "--continue nรฃo leva argumentos" + +#: builtin/bisect--helper.c:921 +msgid "--bisect-reset requires either no argument or a commit" +msgstr "" + +#: builtin/bisect--helper.c:925 +#, fuzzy +msgid "--bisect-write requires either 4 or 5 arguments" +msgstr ":strip= requer um inteiro positivo como argumento" + +#: builtin/bisect--helper.c:931 +msgid "--check-and-set-terms requires 3 arguments" +msgstr "" + +#: builtin/bisect--helper.c:937 +msgid "--bisect-next-check requires 2 or 3 arguments" +msgstr "" + +#: builtin/bisect--helper.c:943 +#, fuzzy +msgid "--bisect-terms requires 0 or 1 argument" +msgstr ":strip= requer um inteiro positivo como argumento" + +#: builtin/bisect--helper.c:952 +#, fuzzy +msgid "--bisect-next requires 0 arguments" +msgstr "--continue nรฃo leva argumentos" + +#: builtin/bisect--helper.c:958 +#, fuzzy +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--continue nรฃo leva argumentos" + +#: builtin/bisect--helper.c:964 +#, fuzzy +msgid "--bisect-autostart does not accept arguments" +msgstr "%%(subject) nรฃo leva argumentos" + +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opรงรตes>] [<rev-opรงรตes>] [<rev>] [--] <ficheiro>" -#: builtin/blame.c:38 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opรงรตes> estรฃo documentadas em git-rev-list(1)" -#: builtin/blame.c:1777 -msgid "Blaming lines" -msgstr "Linhas de culpa" +#: builtin/blame.c:410 +#, fuzzy, c-format +msgid "expecting a color: %s" +msgstr "a redirecionar para %s " + +#: builtin/blame.c:417 +msgid "must end with a color" +msgstr "" + +#: builtin/blame.c:730 +#, fuzzy, c-format +msgid "invalid color '%s' in color.blame.repeatedLines" +msgstr "ignorar cor invรกlida '%.*s' em log.graphColors" + +#: builtin/blame.c:748 +#, fuzzy +msgid "invalid value for blame.coloring" +msgstr "valor invรกlido de %s" + +#: builtin/blame.c:845 +#, c-format +msgid "cannot find revision %s to ignore" +msgstr "" -#: builtin/blame.c:2573 +#: builtin/blame.c:867 msgid "Show blame entries as we find them, incrementally" msgstr "" "Mostrar entradas de culpa ร medida que forem encontradas, incrementalmente" -#: builtin/blame.c:2574 -msgid "Show blank SHA-1 for boundary commits (Default: off)" +#: builtin/blame.c:868 +#, fuzzy +msgid "Do not show object names of boundary commits (Default: off)" msgstr "Mostar SHA-1 dos commits limite em branco (Predefiniรงรฃo: desativado)" -#: builtin/blame.c:2575 +#: builtin/blame.c:869 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Nรฃo tratar os commits raiz como limites (Predefiniรงรฃo: desativado)" -#: builtin/blame.c:2576 +#: builtin/blame.c:870 msgid "Show work cost statistics" msgstr "Mostrar estatรญsticas de custo de atividade" -#: builtin/blame.c:2577 +#: builtin/blame.c:871 msgid "Force progress reporting" msgstr "Forรงar informaรงรฃo de progresso" -#: builtin/blame.c:2578 +#: builtin/blame.c:872 msgid "Show output score for blame entries" msgstr "Mostrar a pontuaรงรฃo das entradas de culpa" -#: builtin/blame.c:2579 +#: builtin/blame.c:873 msgid "Show original filename (Default: auto)" msgstr "Mostrar o nome do ficheiro original (Predefiniรงรฃo: auto)" -#: builtin/blame.c:2580 +#: builtin/blame.c:874 msgid "Show original linenumber (Default: off)" msgstr "Mostrar nรบmeros de linha originais (Predefiniรงรฃo: desativado)" -#: builtin/blame.c:2581 +#: builtin/blame.c:875 msgid "Show in a format designed for machine consumption" msgstr "Mostrar em formato prรณprio para ser consumo por uma mรกquina" -#: builtin/blame.c:2582 +#: builtin/blame.c:876 msgid "Show porcelain format with per-line commit information" msgstr "Mostrar em formato de porcelana com informaรงรตes de commit por linha" -#: builtin/blame.c:2583 +#: builtin/blame.c:877 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Usar o mesmo modo de saรญda que git-annotate (Predefiniรงรฃo: desativado)" -#: builtin/blame.c:2584 +#: builtin/blame.c:878 msgid "Show raw timestamp (Default: off)" msgstr "Mostrar carimbo de data/hora em bruto (Predefiniรงรฃo: desativado)" -#: builtin/blame.c:2585 +#: builtin/blame.c:879 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostrar SHA1 longo de commit (Predefiniรงรฃo: desativado)" -#: builtin/blame.c:2586 +#: builtin/blame.c:880 msgid "Suppress author name and timestamp (Default: off)" msgstr "" "Suprimir nome de autor e carimbo de data/hora (Predefiniรงรฃo: desativado)" -#: builtin/blame.c:2587 +#: builtin/blame.c:881 msgid "Show author email instead of name (Default: off)" msgstr "Mostrar o email do autor em vez do nome (Predefiniรงรฃo: desativado)" -#: builtin/blame.c:2588 +#: builtin/blame.c:882 msgid "Ignore whitespace differences" msgstr "Ignorar as diferenรงas de espaรงo em branco" -#: builtin/blame.c:2595 -msgid "Use an experimental heuristic to improve diffs" -msgstr "Usar um heurรญstica experimental para melhorar diffs" +#: builtin/blame.c:883 builtin/log.c:1808 +#, fuzzy +msgid "rev" +msgstr "reverter" + +#: builtin/blame.c:883 +#, fuzzy +msgid "Ignore <rev> when blaming" +msgstr "ignorar o รญndice ao verificar" + +#: builtin/blame.c:884 +#, fuzzy +msgid "Ignore revisions from <file>" +msgstr "ler mensagem de um ficheiro" + +#: builtin/blame.c:885 +msgid "color redundant metadata from previous line differently" +msgstr "" + +#: builtin/blame.c:886 +msgid "color lines by age" +msgstr "" -#: builtin/blame.c:2597 +#: builtin/blame.c:887 msgid "Spend extra cycles to find better match" msgstr "Despender ciclos extra para encontrar uma melhor correspondรชncia" -#: builtin/blame.c:2598 +#: builtin/blame.c:888 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usar revisรตes do <ficheiro> em vez de invocar git-rev-list" -#: builtin/blame.c:2599 +#: builtin/blame.c:889 msgid "Use <file>'s contents as the final image" msgstr "Usar o conteรบdo do <ficheiro> como imagem final" -#: builtin/blame.c:2600 builtin/blame.c:2601 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "pontuaรงรฃo" -#: builtin/blame.c:2600 +#: builtin/blame.c:890 msgid "Find line copies within and across files" msgstr "Localizar linhas copiadas dentro e entre ficheiros" -#: builtin/blame.c:2601 +#: builtin/blame.c:891 msgid "Find line movements within and across files" msgstr "Localizar linhas movidas dentro e entre ficheiros" -#: builtin/blame.c:2602 +#: builtin/blame.c:892 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2602 +#: builtin/blame.c:892 msgid "Process only line range n,m, counting from 1" msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1" -#: builtin/blame.c:2649 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress nรฃo pode ser usado com --incremental ou formatos de porcelana" -#. 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:2697 +#. 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:995 msgid "4 years, 11 months ago" msgstr "hรก 4 anos e 11 meses atrรกs" -#: builtin/blame.c:2777 -msgid "--contents and --reverse do not blend well." -msgstr "--contents e --reverse nรฃo se misturam bem." - -#: builtin/blame.c:2797 -msgid "cannot use --contents with final commit object name" -msgstr "nรฃo รฉ possรญvel usar --contents com nome de objeto commit final" - -#: builtin/blame.c:2802 -msgid "--reverse and --first-parent together require specified latest commit" -msgstr "" -"--reverse e --first-parent juntos requer que se especifique o รบltimo commit" - -#: builtin/blame.c:2829 -msgid "" -"--reverse --first-parent together require range along first-parent chain" -msgstr "" -"--reverse --first-parent juntos requer intervalo ao longo do primeiro-pai" - -#: builtin/blame.c:2840 -#, c-format -msgid "no such path %s in %s" -msgstr "o caminho %s nรฃo existe em %s" - -#: builtin/blame.c:2851 -#, c-format -msgid "cannot read blob %s for path %s" -msgstr "nรฃo รฉ possรญvel ler o blob %s do caminho %s" - -#: builtin/blame.c:2870 +#: builtin/blame.c:1110 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "o ficheiro %s sรณ tem %lu linha" msgstr[1] "o ficheiro %s sรณ tem %lu linhas" -#: builtin/branch.c:26 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +#: builtin/blame.c:1156 +msgid "Blaming lines" +msgstr "Linhas de culpa" + +#: builtin/branch.c:29 +#, fuzzy +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [<opรงรตes>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:27 +#: builtin/branch.c:30 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<opรงรตes>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]" -#: builtin/branch.c:28 +#: builtin/branch.c:31 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<opรงรตes>] [-r] (-d | -D) <nome-do-ramo>..." -#: builtin/branch.c:29 +#: builtin/branch.c:32 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<opรงรตes>] (-m | -M) [<ramo-antigo>] <novo-ramo>" -#: builtin/branch.c:30 +#: builtin/branch.c:33 +#, fuzzy +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" +msgstr "git branch [<opรงรตes>] (-m | -M) [<ramo-antigo>] <novo-ramo>" + +#: builtin/branch.c:34 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<opรงรตes>] [-r | -a] [--points-at]" -#: builtin/branch.c:31 +#: builtin/branch.c:35 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<opรงรตes>] [-r | -a] [--format]" -#: builtin/branch.c:144 +#: builtin/branch.c:154 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5361,7 +10895,7 @@ msgstr "" "a eliminar o ramo '%s' integrado em\n" " '%s', mas ainda nรฃo integrado em HEAD." -#: builtin/branch.c:148 +#: builtin/branch.c:158 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5370,12 +10904,12 @@ msgstr "" "ramo '%s' nรฃo eliminado, visto que ainda nรฃo foi integrado em\n" " '%s', apesar de jรก ter sido integrado em HEAD." -#: builtin/branch.c:162 +#: builtin/branch.c:172 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Nรฃo foi possรญvel pesquisar pelo objeto commit de '%s'" -#: builtin/branch.c:166 +#: builtin/branch.c:176 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5384,93 +10918,130 @@ msgstr "" "O ramo '%s' nรฃo foi totalmente integrado.\n" "Se tem a certeza que o quer eliminar, execute 'git branch -D %s'." -#: builtin/branch.c:179 +#: builtin/branch.c:189 msgid "Update of config-file failed" msgstr "Falha ao atualizar o ficheiro de configuraรงรฃo" -#: builtin/branch.c:210 +#: builtin/branch.c:220 msgid "cannot use -a with -d" msgstr "nรฃo รฉ possรญvel usar -a com -d" -#: builtin/branch.c:216 +#: builtin/branch.c:226 msgid "Couldn't look up commit object for HEAD" msgstr "Nรฃo foi possรญvel pesquisar pelo objeto commit de HEAD" -#: builtin/branch.c:230 +#: builtin/branch.c:240 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Nรฃo รฉ possรญvel eliminar o ramo '%s' extraรญdo em '%s'" -#: builtin/branch.c:245 +#: builtin/branch.c:255 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "ramo de monitorizaรงรฃo remoto '%s' nรฃo encontrado." -#: builtin/branch.c:246 +#: builtin/branch.c:256 #, c-format msgid "branch '%s' not found." msgstr "ramo '%s' nรฃo encontrado." -#: builtin/branch.c:261 +#: builtin/branch.c:271 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Erro a eliminar o ramo de monitorizaรงรฃo remoto '%s'" -#: builtin/branch.c:262 +#: builtin/branch.c:272 #, c-format msgid "Error deleting branch '%s'" msgstr "Erro a eliminar ramo '%s'" -#: builtin/branch.c:269 +#: builtin/branch.c:279 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Ramo de monitorizaรงรฃo remoto %s eliminado (era %s).\n" -#: builtin/branch.c:270 +#: builtin/branch.c:280 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Ramo %s eliminado (era %s).\n" -#: builtin/branch.c:441 +#: builtin/branch.c:429 builtin/tag.c:61 +#, fuzzy +msgid "unable to parse format string" +msgstr "nรฃo foi possรญvel analisar o formato" + +#: builtin/branch.c:460 +#, fuzzy +msgid "could not resolve HEAD" +msgstr "nรฃo foi possรญvel resolver o commit HEAD\n" + +#: builtin/branch.c:466 +#, fuzzy, c-format +msgid "HEAD (%s) points outside of refs/heads/" +msgstr "HEAD nรฃo encontrada em refs/heads!" + +#: builtin/branch.c:481 #, c-format msgid "Branch %s is being rebased at %s" msgstr "O ramo %s estรก a ser rebaseado em %s" -#: builtin/branch.c:445 +#: builtin/branch.c:485 #, c-format msgid "Branch %s is being bisected at %s" msgstr "O ramo %s estรก a ser bissetado em %s" -#: builtin/branch.c:460 +#: builtin/branch.c:502 +#, fuzzy +msgid "cannot copy the current branch while not on any." +msgstr "" +"nรฃo รฉ possรญvel mudar o nome do ramo atual vista que nรฃo se encontra num ramo." + +#: builtin/branch.c:504 msgid "cannot rename the current branch while not on any." msgstr "" "nรฃo รฉ possรญvel mudar o nome do ramo atual vista que nรฃo se encontra num ramo." -#: builtin/branch.c:470 +#: builtin/branch.c:515 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nome de ramo invรกlido: '%s'" -#: builtin/branch.c:487 +#: builtin/branch.c:542 msgid "Branch rename failed" msgstr "Falha ao mudar o nome do ramo" -#: builtin/branch.c:490 +#: builtin/branch.c:544 +#, fuzzy +msgid "Branch copy failed" +msgstr "Falha ao mudar o nome do ramo" + +#: builtin/branch.c:548 +#, fuzzy, c-format +msgid "Created a copy of a misnamed branch '%s'" +msgstr "O ramo incorretamente denominado '%s' mudou de nome" + +#: builtin/branch.c:551 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "O ramo incorretamente denominado '%s' mudou de nome" -#: builtin/branch.c:493 +#: builtin/branch.c:557 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "O nome do ramo mudou para %s, mas a HEAD nรฃo estรก atualizada!" -#: builtin/branch.c:502 +#: builtin/branch.c:566 msgid "Branch is renamed, but update of config-file failed" msgstr "" "O ramo mudou de nome, mas a atualizaรงรฃo do ficheiro de configuraรงรฃo falhou" -#: builtin/branch.c:518 +#: builtin/branch.c:568 +#, fuzzy +msgid "Branch is copied, but update of config-file failed" +msgstr "" +"O ramo mudou de nome, mas a atualizaรงรฃo do ficheiro de configuraรงรฃo falhou" + +#: builtin/branch.c:584 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5481,176 +11052,188 @@ msgstr "" " %s\n" "Linha comeรงadas com '%c' serรฃo ignoradas.\n" -#: builtin/branch.c:551 +#: builtin/branch.c:618 msgid "Generic options" msgstr "Opรงรตes genรฉricas" -#: builtin/branch.c:553 +#: builtin/branch.c:620 msgid "show hash and subject, give twice for upstream branch" msgstr "apresentar hash e assunto, duplique para ramos a montante" -#: builtin/branch.c:554 +#: builtin/branch.c:621 msgid "suppress informational messages" msgstr "suprimir mensagens informativas" -#: builtin/branch.c:555 +#: builtin/branch.c:622 msgid "set up tracking mode (see git-pull(1))" msgstr "configurar modo de seguimento (consulte git-pull(1))" -#: builtin/branch.c:557 -msgid "change upstream info" -msgstr "alterar a informaรงรฃo do ramo a montante" +#: builtin/branch.c:624 +#, fuzzy +msgid "do not use" +msgstr "esquema a usar" -#: builtin/branch.c:559 +#: builtin/branch.c:626 builtin/rebase.c:526 msgid "upstream" msgstr "a montante" -#: builtin/branch.c:559 +#: builtin/branch.c:626 msgid "change the upstream info" msgstr "alterar a informaรงรฃo do ramo a montante" -#: builtin/branch.c:560 -msgid "Unset the upstream info" +#: builtin/branch.c:627 +#, fuzzy +msgid "unset the upstream info" msgstr "Remover a informaรงรฃo do ramo a montante" -#: builtin/branch.c:561 +#: builtin/branch.c:628 msgid "use colored output" msgstr "usar saรญda colorida" -#: builtin/branch.c:562 +#: builtin/branch.c:629 msgid "act on remote-tracking branches" msgstr "atuar sobre ramos de monitorizaรงรฃo remotos" -#: builtin/branch.c:564 builtin/branch.c:566 +#: builtin/branch.c:631 builtin/branch.c:633 msgid "print only branches that contain the commit" msgstr "imprimir apenas ramos que contenham o commit" -#: builtin/branch.c:565 builtin/branch.c:567 +#: builtin/branch.c:632 builtin/branch.c:634 msgid "print only branches that don't contain the commit" msgstr "imprimir apenas ramos que nรฃo contenham o commit" -#: builtin/branch.c:570 +#: builtin/branch.c:637 msgid "Specific git-branch actions:" msgstr "Aรงรตes especรญficas do git-branch:" -#: builtin/branch.c:571 +#: builtin/branch.c:638 msgid "list both remote-tracking and local branches" msgstr "listar ramos de monitorizaรงรฃo remotos e ramos locais" -#: builtin/branch.c:573 +#: builtin/branch.c:640 msgid "delete fully merged branch" msgstr "eliminar um ramo totalmente integrado" -#: builtin/branch.c:574 +#: builtin/branch.c:641 msgid "delete branch (even if not merged)" msgstr "eliminar um ramo (mesmo que nรฃo tenha sido integrado)" -#: builtin/branch.c:575 +#: builtin/branch.c:642 msgid "move/rename a branch and its reflog" msgstr "mover ou mudar o nome de um ramo e o seu reflog" -#: builtin/branch.c:576 +#: builtin/branch.c:643 msgid "move/rename a branch, even if target exists" msgstr "mover ou mudar o nome de um ramo, mesmo que o destino jรก exista" -#: builtin/branch.c:577 +#: builtin/branch.c:644 +#, fuzzy +msgid "copy a branch and its reflog" +msgstr "mover ou mudar o nome de um ramo e o seu reflog" + +#: builtin/branch.c:645 +#, fuzzy +msgid "copy a branch, even if target exists" +msgstr "mover ou mudar o nome de um ramo, mesmo que o destino jรก exista" + +#: builtin/branch.c:646 msgid "list branch names" msgstr "listar os nomes dos ramos" -#: builtin/branch.c:578 +#: builtin/branch.c:647 +#, fuzzy +msgid "show current branch name" +msgstr "Nenhum ramo atual." + +#: builtin/branch.c:648 msgid "create the branch's reflog" msgstr "criar reflog do ramo" -#: builtin/branch.c:580 +#: builtin/branch.c:650 msgid "edit the description for the branch" msgstr "editar a descriรงรฃo do ramo" -#: builtin/branch.c:581 +#: builtin/branch.c:651 msgid "force creation, move/rename, deletion" msgstr "forรงar criaรงรฃo, mover/mudar o nome ou exclusรฃo" -#: builtin/branch.c:582 +#: builtin/branch.c:652 msgid "print only branches that are merged" msgstr "imprimir apenas os ramos que foram integrados" -#: builtin/branch.c:583 +#: builtin/branch.c:653 msgid "print only branches that are not merged" msgstr "imprimir apenas os ramos que nรฃo foram integrados" -#: builtin/branch.c:584 +#: builtin/branch.c:654 msgid "list branches in columns" msgstr "listar os ramos em colunas" -#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426 -msgid "key" -msgstr "chave" - -#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427 -msgid "field name to sort on" -msgstr "nome do campo pelo qual ordernar" - -#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 -#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:429 +#: builtin/branch.c:656 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:434 msgid "object" msgstr "objeto" -#: builtin/branch.c:589 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "imprimir apenas os ramos do objeto" -#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "ordenar e filtrar sรฃo insensรญveis a maiรบsculas" -#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "formato a usar na saรญda" -#: builtin/branch.c:611 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "Falha ao resolver HEAD numa referรชncia vรกlida." - -#: builtin/branch.c:615 builtin/clone.c:724 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "HEAD nรฃo encontrada em refs/heads!" -#: builtin/branch.c:638 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "--column e --verbose sรฃo incompatรญveis" -#: builtin/branch.c:649 builtin/branch.c:701 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "nome do ramo รฉ obrigatรณrio" -#: builtin/branch.c:677 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "Nรฃo รฉ possรญvel atribuir descriรงรฃo a HEAD destacada" -#: builtin/branch.c:682 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "nรฃo รฉ possรญvel editar a descriรงรฃo de mais do que um ramo" -#: builtin/branch.c:689 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "Ainda nรฃo hรก commits no ramo '%s'." -#: builtin/branch.c:692 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "Nรฃo hรก nenhum ramo denominado '%s'." -#: builtin/branch.c:707 -msgid "too many branches for a rename operation" +#: builtin/branch.c:781 +#, fuzzy +msgid "too many branches for a copy operation" +msgstr "demasiados ramos para uma operaรงรฃo de mudanรงa de nome" + +#: builtin/branch.c:790 +#, fuzzy +msgid "too many arguments for a rename operation" msgstr "demasiados ramos para uma operaรงรฃo de mudanรงa de nome" -#: builtin/branch.c:712 -msgid "too many branches to set new upstream" +#: builtin/branch.c:795 +#, fuzzy +msgid "too many arguments to set new upstream" msgstr "demasiados ramos para definir novo ramo a montante" -#: builtin/branch.c:716 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -5658,74 +11241,197 @@ msgstr "" "nรฃo foi possรญvel definir %s como ramo a montante de HEAD visto que esta nรฃo " "aponta para um ramo." -#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "o ramo '%s' nรฃo existe" -#: builtin/branch.c:723 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "o ramo '%s' nรฃo existe" -#: builtin/branch.c:735 -msgid "too many branches to unset upstream" +#: builtin/branch.c:819 +#, fuzzy +msgid "too many arguments to unset upstream" msgstr "demasiados ramos para remover a definiรงรฃo de ramo a montante" -#: builtin/branch.c:739 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "nรฃo foi possรญvel remover a definiรงรฃo de ramo a montante de HEAD visto que " "esta nรฃo aponta para um ramo." -#: builtin/branch.c:745 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "O ramo '%s' nรฃo tem informaรงรฃo sobre o ramo a montante" -#: builtin/branch.c:759 -msgid "it does not make sense to create 'HEAD' manually" -msgstr "nรฃo faz sentido criar 'HEAD' manualmente" - -#: builtin/branch.c:765 -msgid "-a and -r options to 'git branch' do not make sense with a branch name" +#: builtin/branch.c:839 +#, fuzzy +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 "" "as opรงรตes -a e -r de 'git branch' nรฃo fazem sentido com um nome de ramo" -#: builtin/branch.c:768 -#, c-format +#: builtin/branch.c:843 +#, fuzzy msgid "" -"The --set-upstream flag is deprecated and will be removed. Consider using --" -"track or --set-upstream-to\n" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." msgstr "" "A opรงรฃo --set-upstream รฉ obsoleta e serรก removida. Considere o uso de --" "track ou --set-upstream-to\n" -#: builtin/branch.c:785 +#: builtin/bugreport.c:15 +#, fuzzy +msgid "git version:\n" +msgstr "versรฃo" + +#: builtin/bugreport.c:21 #, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "" + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "" + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "" + +#: builtin/bugreport.c:97 msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" "\n" -"If you wanted to make '%s' track '%s', do this:\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" "\n" -msgstr "" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" "\n" -"Se quer que '%s' siga '%s', faรงa:\n" +"Anything else you want to add:\n" "\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "" -#: builtin/bundle.c:45 +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "" + +#: builtin/bugreport.c:158 +#, fuzzy, c-format +msgid "could not create leading directories for '%s'" +msgstr "nรฃo foi possรญvel criar os diretรณrios superiores de '%s'" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "" + +#: builtin/bugreport.c:168 +#, fuzzy +msgid "Enabled Hooks" +msgstr "nรฃo foi possรญvel abrir %s" + +#: builtin/bugreport.c:175 +#, fuzzy, c-format +msgid "couldn't create a new file at '%s'" +msgstr "nรฃo foi possรญvel criar o ficheiro '%s'" + +#: builtin/bugreport.c:178 +#, fuzzy, c-format +msgid "unable to write to %s" +msgstr "nรฃo foi possรญvel escrever %s" + +#: builtin/bugreport.c:188 #, c-format -msgid "%s is okay\n" -msgstr "%s estรก correto\n" +msgid "Created new report at '%s'.\n" +msgstr "" + +#: builtin/bundle.c:15 builtin/bundle.c:23 +#, fuzzy +msgid "git bundle create [<options>] <file> <git-rev-list args>" +msgstr "git remote add [<opรงรตes>] <nome> <url>" + +#: builtin/bundle.c:16 builtin/bundle.c:28 +#, fuzzy +msgid "git bundle verify [<options>] <file>" +msgstr "git rm [<opรงรตes>] [--] <ficheiro>..." + +#: 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:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "nรฃo mostrar medidor de progresso" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "mostrar medidor de progresso" -#: builtin/bundle.c:58 +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +msgid "show progress meter during object writing phase" +msgstr "mostrar medidor de progresso durante a fase de escrita de objetos" + +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +msgid "similar to --all-progress when progress meter is shown" +msgstr "semelhante a --all-progress quando o medidor de progresso รฉ mostrado" + +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "ร necessรกrio um repositรณrio para criar um bundle." -#: builtin/bundle.c:62 +#: builtin/bundle.c:107 +#, fuzzy +msgid "do not show bundle details" +msgstr "nรฃo mostrar tags descascadas" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "%s estรก correto\n" + +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "ร preciso um repositรณrio para desempacotar." -#: builtin/cat-file.c:513 +#: builtin/bundle.c:171 builtin/remote.c:1687 +msgid "be verbose; must be placed before a subcommand" +msgstr "ser verboso; deve ser colocado antes de um subcomando" + +#: builtin/bundle.c:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Subcomando desconhecido: %s" + +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -5733,314 +11439,378 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>" -#: builtin/cat-file.c:514 +#: builtin/cat-file.c:599 +#, fuzzy msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:551 +#: builtin/cat-file.c:620 +#, fuzzy +msgid "only one batch option may be specified" +msgstr "Nenhum nome de ramo especificado" + +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> pode ser um de: blob, tree, commit, tag" -#: builtin/cat-file.c:552 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "mostrar tipo do objeto" -#: builtin/cat-file.c:553 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "mostrar tamanho do objeto" -#: builtin/cat-file.c:555 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "sair com retorno zero quando nรฃo houver erros" -#: builtin/cat-file.c:556 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "mostrar conteรบdo do objeto com impressรฃo bonita" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" msgstr "executar textconv no conteรบdo de objetos blob" -#: builtin/cat-file.c:560 +#: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" msgstr "para objetos blob, correr filtros sobre o conteรบdo do objeto" -#: builtin/cat-file.c:561 git-submodule.sh:943 +#: builtin/cat-file.c:648 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "usar um caminho especรญfico para --textconv/--filters" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:651 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permitir que -s e -t funcionem com objetos danificados/corrompidos" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "carregar a saรญda de --batch" -#: builtin/cat-file.c:567 +#: builtin/cat-file.c:654 msgid "show info and content of objects fed from the standard input" msgstr "mostrar informaรงรฃo e conteรบdo dos objetos fornecidos na entrada padrรฃo" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "mostrar informaรงรฃo sobre os objetos fornecidos na entrada padrรฃo" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:662 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "seguir ligaรงรตes simbรณlica no interior da รกrvore (usado com --batch ou --" "batch-check)" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "mostrar todos os objetos com --batch ou --batch-check" -#: builtin/check-attr.c:11 +#: builtin/cat-file.c:666 +msgid "do not order --batch-all-objects output" +msgstr "" + +#: builtin/check-attr.c:13 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <atributo>...] [--] <caminho>..." -#: builtin/check-attr.c:12 +#: builtin/check-attr.c:14 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <atributo>...]" -#: builtin/check-attr.c:19 +#: builtin/check-attr.c:21 msgid "report all attributes set on file" msgstr "apresentar todos os atributos definidos no ficheiro" -#: builtin/check-attr.c:20 +#: builtin/check-attr.c:22 msgid "use .gitattributes only from the index" msgstr "usar .gitattributes apenas a partir do รญndice" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 msgid "read file names from stdin" msgstr "ler os nomes dos ficheiros da entrada padrรฃo" -#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +#: builtin/check-attr.c:25 builtin/check-ignore.c:27 msgid "terminate input and output records by a NUL character" msgstr "terminar registos da entrada e da saรญda com um carรกcter NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352 +#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "suprimir informaรงรฃo de progresso" -#: builtin/check-ignore.c:26 +#: builtin/check-ignore.c:29 msgid "show non-matching input paths" msgstr "mostrar caminhos de entrada sem correspondรชncia" -#: builtin/check-ignore.c:28 +#: builtin/check-ignore.c:31 msgid "ignore index when checking" msgstr "ignorar o รญndice ao verificar" -#: builtin/check-ignore.c:154 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "nรฃo รฉ possรญvel especificar caminhos com --stdin" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z sรณ faz sentido com --stdin" -#: builtin/check-ignore.c:159 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "nenhum caminho especificado" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "--quiet sรณ รฉ vรกlido com um รบnico caminho" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "nรฃo รฉ possรญvel usar --quiet e --verbose simultaneamente" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching sรณ รฉ vรกlido com --verbose" -#: builtin/check-mailmap.c:8 +#: builtin/check-mailmap.c:9 msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [<opรงรตes>] <contacto>..." -#: builtin/check-mailmap.c:13 +#: builtin/check-mailmap.c:14 msgid "also read contacts from stdin" msgstr "tambรฉm ler contactos da entrada padrรฃo" -#: builtin/check-mailmap.c:24 +#: builtin/check-mailmap.c:25 #, c-format msgid "unable to parse contact: %s" msgstr "nรฃo รฉ possรญvel analisar o contacto: %s" -#: builtin/check-mailmap.c:47 +#: builtin/check-mailmap.c:48 msgid "no contacts specified" msgstr "nenhum contacto especificado" -#: builtin/checkout-index.c:127 +#: builtin/checkout-index.c:131 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<opรงรตes>] [--] [<ficheiro>...]" -#: builtin/checkout-index.c:144 +#: builtin/checkout-index.c:148 msgid "stage should be between 1 and 3 or all" msgstr "stage deve ser um nรบmero entre 1 e 3 ou o parรขmetro all" -#: builtin/checkout-index.c:160 +#: builtin/checkout-index.c:164 msgid "check out all files in the index" msgstr "extrair todos os ficheiros presentes no รญndice" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:165 msgid "force overwrite of existing files" msgstr "forรงar substituiรงรฃo dos ficheiros existentes" -#: builtin/checkout-index.c:163 +#: builtin/checkout-index.c:167 msgid "no warning for existing files and files not in index" msgstr "" "nรฃo mostrar aviso para ficheiros existentes e ficheiros nรฃo presentes no " "รญndice" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:169 msgid "don't checkout new files" msgstr "nรฃo extrair novos ficheiros" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:171 msgid "update stat information in the index file" msgstr "atualizar informaรงรฃo de stat no ficheiro de รญndice" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:175 msgid "read list of paths from the standard input" msgstr "ler lista de caminhos da entrada padrรฃo" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:177 msgid "write the content to temporary files" msgstr "escrever o conteรบdo em ficheiros temporรกrios" -#: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 -#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:472 +#: builtin/checkout-index.c:178 builtin/column.c:31 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 msgid "string" msgstr "cadeia" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:179 msgid "when creating files, prepend <string>" msgstr "preceder <cadeia> ao criar ficheiros" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:181 msgid "copy out the files from named stage" msgstr "copiar os ficheiros do estรกgio indicado" -#: builtin/checkout.c:27 +#: builtin/checkout.c:31 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<opรงรตes>] <ramo>" -#: builtin/checkout.c:28 +#: builtin/checkout.c:32 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opรงรตes>] [<ramo>] -- <ficheiro>..." -#: builtin/checkout.c:153 builtin/checkout.c:186 +#: builtin/checkout.c:37 +#, fuzzy +msgid "git switch [<options>] [<branch>]" +msgstr "git checkout [<opรงรตes>] <ramo>" + +#: builtin/checkout.c:42 +#, fuzzy +msgid "git restore [<options>] [--source=<branch>] <file>..." +msgstr "git checkout [<opรงรตes>] [<ramo>] -- <ficheiro>..." + +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "o caminho '%s' nรฃo tem a nossa versรฃo" -#: builtin/checkout.c:155 builtin/checkout.c:188 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "o caminho '%s' nรฃo tem a versรฃo deles" -#: builtin/checkout.c:171 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "o caminho '%s' nรฃo tem todas as versรตes necessรกrias" -#: builtin/checkout.c:215 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "o caminho '%s' nรฃo tem as versรตes necessรกrias" -#: builtin/checkout.c:232 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "caminho '%s': nรฃo รฉ possรญvel integrar" -#: builtin/checkout.c:249 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Nรฃo รฉ possรญvel adicionar os resultados da integraรงรฃo de '%s'" -#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 -#: builtin/checkout.c:278 +#: builtin/checkout.c:396 +#, c-format +msgid "Recreated %d merge conflict" +msgid_plural "Recreated %d merge conflicts" +msgstr[0] "" +msgstr[1] "" + +#: builtin/checkout.c:401 +#, fuzzy, c-format +msgid "Updated %d path from %s" +msgid_plural "Updated %d paths from %s" +msgstr[0] "%d caminho atualizado\n" +msgstr[1] "%d caminhos atualizados\n" + +#: builtin/checkout.c:408 +#, fuzzy, c-format +msgid "Updated %d path from the index" +msgid_plural "Updated %d paths from the index" +msgstr[0] "falha ao ler o รญndice" +msgstr[1] "falha ao ler o รญndice" + +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' nรฃo pode ser usado com caminhos em atualizaรงรฃo" -#: builtin/checkout.c:281 builtin/checkout.c:284 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' nรฃo pode ser usado com %s" -#: builtin/checkout.c:287 +#: builtin/checkout.c:451 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Nรฃo รฉ possรญvel atualizar os caminhos e mudar para o ramo '%s' ao mesmo tempo." -#: builtin/checkout.c:358 builtin/checkout.c:365 +#: builtin/checkout.c:455 +#, c-format +msgid "neither '%s' or '%s' is specified" +msgstr "" + +#: builtin/checkout.c:459 +#, fuzzy, c-format +msgid "'%s' must be used when '%s' is not specified" +msgstr "'%s' nรฃo pode ser usado com '%s'" + +#: builtin/checkout.c:464 builtin/checkout.c:469 +#, fuzzy, c-format +msgid "'%s' or '%s' cannot be used with %s" +msgstr "%s: %s nรฃo pode ser usado com %s" + +#: builtin/checkout.c:528 builtin/checkout.c:535 #, c-format msgid "path '%s' is unmerged" msgstr "o caminho '%s' nรฃo foi integrado" -#: builtin/checkout.c:513 +#: builtin/checkout.c:703 msgid "you need to resolve your current index first" msgstr "primeiro deve resolver o รญndice atual" -#: builtin/checkout.c:644 +#: builtin/checkout.c:757 +#, c-format +msgid "" +"cannot continue with staged changes in the following files:\n" +"%s" +msgstr "" + +#: builtin/checkout.c:853 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Nรฃo รฉ possรญvel efetuar reflog de '%s': %s\n" -#: builtin/checkout.c:685 +#: builtin/checkout.c:895 msgid "HEAD is now at" msgstr "HEAD estรก agora em" -#: builtin/checkout.c:689 builtin/clone.c:678 +#: builtin/checkout.c:899 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "nรฃo foi possรญvel atualizar HEAD" -#: builtin/checkout.c:693 +#: builtin/checkout.c:903 #, c-format msgid "Reset branch '%s'\n" msgstr "Repor ramo '%s'\n" -#: builtin/checkout.c:696 +#: builtin/checkout.c:906 #, c-format msgid "Already on '%s'\n" msgstr "Jรก em '%s'\n" -#: builtin/checkout.c:700 +#: builtin/checkout.c:910 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Mudou para e repรดs o ramo '%s'\n" -#: builtin/checkout.c:702 builtin/checkout.c:1090 +#: builtin/checkout.c:912 builtin/checkout.c:1338 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Mudou para o novo ramo '%s'\n" -#: builtin/checkout.c:704 +#: builtin/checkout.c:914 #, c-format msgid "Switched to branch '%s'\n" msgstr "Mudou para o ramo '%s'\n" -#: builtin/checkout.c:755 +#: builtin/checkout.c:965 #, c-format msgid " ... and %d more.\n" msgstr " ... e mais %d.\n" -#: builtin/checkout.c:761 +#: builtin/checkout.c:971 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6061,7 +11831,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:780 +#: builtin/checkout.c:990 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6088,166 +11858,256 @@ msgstr[1] "" " git branch <nome-do-novo-ramo> %s\n" "\n" -#: builtin/checkout.c:816 +#: builtin/checkout.c:1025 msgid "internal error in revision walk" msgstr "erro interno durante o curso de revisรตes" -#: builtin/checkout.c:820 +#: builtin/checkout.c:1029 msgid "Previous HEAD position was" msgstr "A posiรงรฃo anterior de HEAD era" -#: builtin/checkout.c:847 builtin/checkout.c:1085 +#: builtin/checkout.c:1069 builtin/checkout.c:1333 msgid "You are on a branch yet to be born" msgstr "Estรก num ramo ainda nรฃo criado" -#: builtin/checkout.c:991 +#: builtin/checkout.c:1146 +#, 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:1153 +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 "" + +#: builtin/checkout.c:1163 +#, fuzzy, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "atuar sobre ramos de monitorizaรงรฃo remotos" + +#: builtin/checkout.c:1229 +#, fuzzy +msgid "only one reference expected" +msgstr "esperava-se apenas uma referรชncia, %d fornecidas." + +#: builtin/checkout.c:1246 #, c-format msgid "only one reference expected, %d given." msgstr "esperava-se apenas uma referรชncia, %d fornecidas." -#: builtin/checkout.c:1031 builtin/worktree.c:214 +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "referรชncia invรกlida: %s" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1305 builtin/checkout.c:1671 #, c-format msgid "reference is not a tree: %s" msgstr "a referรชncia nรฃo รฉ uma รกrvore: %s" -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1352 +#, fuzzy, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "Nรฃo รฉ possรญvel eliminar o ramo '%s' extraรญdo em '%s'" + +#: builtin/checkout.c:1354 +#, fuzzy, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s." + +#: builtin/checkout.c:1355 builtin/checkout.c:1363 +#, fuzzy, c-format +msgid "a branch is expected, got '%s'" +msgstr "O ramo %s estรก a ser bissetado em %s" + +#: builtin/checkout.c:1358 +#, fuzzy, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "O seu ramo estรก atualizado com '%s'.\n" + +#: builtin/checkout.c:1374 +msgid "" +"cannot switch branch while merging\n" +"Consider \"git merge --quit\" or \"git worktree add\"." +msgstr "" + +#: builtin/checkout.c:1378 +msgid "" +"cannot switch branch in the middle of an am session\n" +"Consider \"git am --quit\" or \"git worktree add\"." +msgstr "" + +#: builtin/checkout.c:1382 +msgid "" +"cannot switch branch while rebasing\n" +"Consider \"git rebase --quit\" or \"git worktree add\"." +msgstr "" + +#: builtin/checkout.c:1386 +msgid "" +"cannot switch branch while cherry-picking\n" +"Consider \"git cherry-pick --quit\" or \"git worktree add\"." +msgstr "" + +#: builtin/checkout.c:1390 +msgid "" +"cannot switch branch while reverting\n" +"Consider \"git revert --quit\" or \"git worktree add\"." +msgstr "" + +#: builtin/checkout.c:1394 +#, fuzzy +msgid "you are switching branch while bisecting" +msgstr "Estรก a bissetar neste momento." + +#: builtin/checkout.c:1401 msgid "paths cannot be used with switching branches" msgstr "nรฃo podem ser usados caminhos ao mudar de ramo" -#: builtin/checkout.c:1102 builtin/checkout.c:1106 +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' nรฃo pode ser usado ao mudar de ramo" -#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' nรฃo pode ser usado com '%s'" -#: builtin/checkout.c:1126 +#: builtin/checkout.c:1429 +#, fuzzy, c-format +msgid "'%s' cannot take <start-point>" +msgstr "'%s' nรฃo pode ser usado com caminhos em atualizaรงรฃo" + +#: builtin/checkout.c:1437 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Nรฃo รฉ possรญvel mudar de ramo para '%s', visto que nรฃo รฉ um commit" -#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325 -#: builtin/worktree.c:327 -msgid "branch" -msgstr "ramo" +#: builtin/checkout.c:1444 +#, fuzzy +msgid "missing branch or commit argument" +msgstr "Falta um nome dum ramo; tente -b" -#: builtin/checkout.c:1160 -msgid "create and checkout a new branch" -msgstr "criar e extrair um novo ramo" +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 +msgid "force progress reporting" +msgstr "forรงar informaรงรฃo de progresso" -#: builtin/checkout.c:1162 -msgid "create/reset and checkout a branch" -msgstr "criar/repor e extrair um ramo" +#: builtin/checkout.c:1487 +msgid "perform a 3-way merge with the new branch" +msgstr "realizar uma integraรงรฃo com 3 pontos com o novo ramo" -#: builtin/checkout.c:1163 -msgid "create reflog for new branch" -msgstr "criar reflog do novo ramo" +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 +msgid "style" +msgstr "estilo" -#: builtin/checkout.c:1164 builtin/worktree.c:329 +#: builtin/checkout.c:1489 +msgid "conflict style (merge or diff3)" +msgstr "estilo de conflito (merge ou diff3)" + +#: builtin/checkout.c:1501 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "destacar HEAD no commit indicado" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1502 msgid "set upstream info for new branch" msgstr "definir a informaรงรฃo do ramo a montante do novo ramo" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1504 +msgid "force checkout (throw away local modifications)" +msgstr "forรงar extraรงรฃo (descartar modificaรงรตes locais)" + +#: builtin/checkout.c:1506 msgid "new-branch" msgstr "novo-ramo" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1506 msgid "new unparented branch" msgstr "novo ramo sem pai" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1508 builtin/merge.c:291 +msgid "update ignored files (default)" +msgstr "atualizar ficheiros ignorados (predefiniรงรฃo)" + +#: builtin/checkout.c:1511 +msgid "do not check if another worktree is holding the given ref" +msgstr "" +"nรฃo verificar se outra รกrvore de trabalho contรฉm a referรชncia fornecida" + +#: builtin/checkout.c:1524 msgid "checkout our version for unmerged files" msgstr "extrair a nossa versรฃo dos ficheiros nรฃo integrados" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1527 msgid "checkout their version for unmerged files" msgstr "extrair a versรฃo deles dos ficheiros nรฃo integrados" -#: builtin/checkout.c:1172 -msgid "force checkout (throw away local modifications)" -msgstr "forรงar extraรงรฃo (descartar modificaรงรตes locais)" - -#: builtin/checkout.c:1173 -msgid "perform a 3-way merge with the new branch" -msgstr "realizar uma integraรงรฃo com 3 pontos com o novo ramo" - -#: builtin/checkout.c:1174 builtin/merge.c:234 -msgid "update ignored files (default)" -msgstr "atualizar ficheiros ignorados (predefiniรงรฃo)" - -#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251 -msgid "style" -msgstr "estilo" - -#: builtin/checkout.c:1176 -msgid "conflict style (merge or diff3)" -msgstr "estilo de conflito (merge ou diff3)" - -#: builtin/checkout.c:1179 +#: builtin/checkout.c:1531 msgid "do not limit pathspecs to sparse entries only" msgstr "nรฃo restringir especificadores de caminho a entradas esparsas" -#: builtin/checkout.c:1181 -msgid "second guess 'git checkout <no-such-branch>'" -msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'" - -#: builtin/checkout.c:1183 -msgid "do not check if another worktree is holding the given ref" -msgstr "" -"nรฃo verificar se outra รกrvore de trabalho contรฉm a referรชncia fornecida" - -#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 -#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539 -#: builtin/send-pack.c:172 -msgid "force progress reporting" -msgstr "forรงar informaรงรฃo de progresso" +#: builtin/checkout.c:1586 +#, fuzzy, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "-b, -B e --orphan sรฃo mutuamente exclusivos" -#: builtin/checkout.c:1224 -msgid "-b, -B and --orphan are mutually exclusive" +#: builtin/checkout.c:1590 +#, fuzzy +msgid "-p and --overlay are mutually exclusive" msgstr "-b, -B e --orphan sรฃo mutuamente exclusivos" -#: builtin/checkout.c:1241 +#: builtin/checkout.c:1627 msgid "--track needs a branch name" msgstr "--track requer um nome dum ramo" -#: builtin/checkout.c:1246 -msgid "Missing branch name; try -b" +#: builtin/checkout.c:1632 +#, fuzzy, c-format +msgid "missing branch name; try -%c" msgstr "Falta um nome dum ramo; tente -b" -#: builtin/checkout.c:1282 +#: builtin/checkout.c:1664 +#, fuzzy, c-format +msgid "could not resolve %s" +msgstr "nรฃo foi possรญvel remover '%s'" + +#: builtin/checkout.c:1680 msgid "invalid path specification" msgstr "especificaรงรฃo de caminho invรกlida" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1687 #, c-format -msgid "" -"Cannot update paths and switch to branch '%s' at the same time.\n" -"Did you intend to checkout '%s' which can not be resolved as commit?" +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -"Nรฃo รฉ possรญvel atualizar os caminho e mudar para o ramo '%s' ao mesmo " -"tempo.\n" -"Pretendia extrair '%s' o qual nรฃo pode ser resolvido como commit?" -#: builtin/checkout.c:1294 +#: builtin/checkout.c:1691 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach nรฃo aceita um caminho como argumento '%s'" -#: builtin/checkout.c:1298 +#: builtin/checkout.c:1700 +#, fuzzy +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--first-parent รฉ incompatรญvel com --bisect" + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +#, fuzzy +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--first-parent รฉ incompatรญvel com --bisect" + +#: builtin/checkout.c:1716 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6255,38 +12115,120 @@ msgstr "" "git checkout: --ours/--theirs, --force e --merge sรฃo incompatรญveis\n" "durante a extraรงรฃo do รญndice." -#: builtin/clean.c:25 +#: builtin/checkout.c:1721 +#, fuzzy +msgid "you must specify path(s) to restore" +msgstr "Deve especificar um diretรณrio." + +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 +msgid "branch" +msgstr "ramo" + +#: builtin/checkout.c:1748 +msgid "create and checkout a new branch" +msgstr "criar e extrair um novo ramo" + +#: builtin/checkout.c:1750 +msgid "create/reset and checkout a branch" +msgstr "criar/repor e extrair um ramo" + +#: builtin/checkout.c:1751 +msgid "create reflog for new branch" +msgstr "criar reflog do novo ramo" + +#: builtin/checkout.c:1753 +#, fuzzy +msgid "second guess 'git checkout <no-such-branch>' (default)" +msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'" + +#: builtin/checkout.c:1754 +#, fuzzy +msgid "use overlay mode (default)" +msgstr "eliminar referรชncias soltas (predefiniรงรฃo)" + +#: builtin/checkout.c:1799 +#, fuzzy +msgid "create and switch to a new branch" +msgstr "criar e extrair um novo ramo" + +#: builtin/checkout.c:1801 +#, fuzzy +msgid "create/reset and switch to a branch" +msgstr "criar/repor e extrair um ramo" + +#: builtin/checkout.c:1803 +#, fuzzy +msgid "second guess 'git switch <no-such-branch>'" +msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'" + +#: builtin/checkout.c:1805 +#, fuzzy +msgid "throw away local modifications" +msgstr "forรงar extraรงรฃo (descartar modificaรงรตes locais)" + +#: builtin/checkout.c:1839 +msgid "which tree-ish to checkout from" +msgstr "" + +#: builtin/checkout.c:1841 +#, fuzzy +msgid "restore the index" +msgstr "falha ao ler o รญndice" + +#: builtin/checkout.c:1843 +#, fuzzy +msgid "restore the working tree (default)" +msgstr "Mostrar o estado da รกrvores de trabalho" + +#: builtin/checkout.c:1845 +#, fuzzy +msgid "ignore unmerged entries" +msgstr "ignorado nรฃo integrado: %s\n" + +#: builtin/checkout.c:1846 +msgid "use overlay mode" +msgstr "" + +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <padrรฃo>] [-x | -X] [--] <caminhos>..." -#: builtin/clean.c:29 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "A remover %s\n" -#: builtin/clean.c:30 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "Removeria %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "A ignorar o repositรณrio %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "Ignoraria o repositรณrio %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "falha ao remover %s" -#: builtin/clean.c:297 git-add--interactive.perl:614 +#: builtin/clean.c:38 +#, fuzzy, c-format +msgid "could not lstat %s\n" +msgstr "nรฃo foi possรญvel obter stat de %s" + +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -6299,7 +12241,7 @@ msgstr "" "foo - selecionar item baseado no prefixo รบnico\n" " - (vazio) nรฃo seleciona nada\n" -#: builtin/clean.c:301 git-add--interactive.perl:623 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -6320,13 +12262,13 @@ msgstr "" "* - escolher todos os itens\n" " - (vazio) concluir seleรงรฃo\n" -#: builtin/clean.c:517 git-add--interactive.perl:589 -#: git-add--interactive.perl:594 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "O quรช (%s)?\n" -#: builtin/clean.c:659 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "Introduza padrรตes a ignorar>> " @@ -6346,12 +12288,7 @@ msgstr "Selecione itens para eliminar" msgid "Remove %s [y/N]? " msgstr "Remover %s [y/N]? " -#: builtin/clean.c:783 git-add--interactive.perl:1660 -#, c-format -msgid "Bye.\n" -msgstr "Adeus.\n" - -#: builtin/clean.c:791 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6369,63 +12306,52 @@ msgstr "" "help - esta ajuda\n" "? - ajuda para seleรงรฃo em linha de comandos" -#: builtin/clean.c:818 git-add--interactive.perl:1736 -msgid "*** Commands ***" -msgstr "*** Comandos ***" - -#: builtin/clean.c:819 git-add--interactive.perl:1733 -msgid "What now" -msgstr "E agora" - -#: builtin/clean.c:827 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Removeria o seguinte item:" msgstr[1] "Removeria os seguintes itens:" -#: builtin/clean.c:844 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "Nรฃo hรก mais ficheiros por limpar, a terminar." -#: builtin/clean.c:875 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "nรฃo imprimir os nomes dos ficheiros removidos" -#: builtin/clean.c:877 +#: builtin/clean.c:905 msgid "force" msgstr "forรงar" -#: builtin/clean.c:878 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "limpeza interativa" -#: builtin/clean.c:880 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "remover diretรณrios inteiros" -#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 -#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348 -#: builtin/name-rev.c:350 builtin/show-ref.c:176 +#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/show-ref.c:179 msgid "pattern" msgstr "padrรฃo" -#: builtin/clean.c:882 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "adicionar <padrรฃo> ร s regras ignoradas" -#: builtin/clean.c:883 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "tambรฉm remover ficheiros ignorados" -#: builtin/clean.c:885 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "remover apenas ficheiros ignorados" -#: builtin/clean.c:903 -msgid "-x and -X cannot be used together" -msgstr "-x e -X nรฃo pode ser usados juntos" - -#: builtin/clean.c:907 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6433,7 +12359,7 @@ msgstr "" "clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; " "limpeza recusada" -#: builtin/clean.c:910 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6441,138 +12367,171 @@ msgstr "" "clean.requireForce predefinido como true e nenhum -i, -n, ou -f fornecido; " "limpeza recusada" -#: builtin/clone.c:37 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "-x e -X nรฃo pode ser usados juntos" + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opรงรตes>] [--] <repo> [<dir>]" -#: builtin/clone.c:80 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "nรฃo criar uma extraรงรฃo" -#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 msgid "create a bare repository" msgstr "criar um repositรณrio nu" -#: builtin/clone.c:85 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "criar um repositรณrio espelhado (implica repositรณrio nu)" -#: builtin/clone.c:87 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "para clonar de um repositรณrio local" -#: builtin/clone.c:89 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "nรฃo usar ligaรงรตes fixas, copiar sempre" -#: builtin/clone.c:91 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "configurar como repositรณrio partilhado" -#: builtin/clone.c:93 builtin/clone.c:97 +#: builtin/clone.c:106 msgid "pathspec" msgstr "pathspec" -#: builtin/clone.c:93 builtin/clone.c:97 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "inicializar submรณdulos no clone" -#: builtin/clone.c:100 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "nรบmero de submรณdulos clonados em paralelo" -#: builtin/clone.c:101 builtin/init-db.c:475 +#: builtin/clone.c:111 builtin/init-db.c:550 msgid "template-directory" msgstr "diretรณrio-modelo" -#: builtin/clone.c:102 builtin/init-db.c:476 +#: builtin/clone.c:112 builtin/init-db.c:551 msgid "directory from which templates will be used" msgstr "diretรณrio que contรฉm os modelos usados" -#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642 -#: builtin/submodule--helper.c:983 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "repositรณrio de referรชncia" -#: builtin/clone.c:108 +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "usar --reference apenas para clonar" -#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 msgid "name" msgstr "nome" -#: builtin/clone.c:110 +#: builtin/clone.c:120 msgid "use <name> instead of 'origin' to track upstream" msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante" -#: builtin/clone.c:112 +#: builtin/clone.c:122 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extrair <ramo> em vez da HEAD do remoto" -#: builtin/clone.c:114 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "caminho para git-upload-pack no remoto" -#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 -#: builtin/pull.c:202 +#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/pull.c:208 msgid "depth" msgstr "profundidade" -#: builtin/clone.c:116 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "criar um clone raso com essa profundidade" -#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 -#: parse-options.h:142 +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 msgid "time" msgstr "hora" -#: builtin/clone.c:118 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "criar um clone raso desde uma data especรญfica" -#: builtin/clone.c:119 builtin/fetch.c:124 +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 msgid "revision" msgstr "revisรฃo" -#: builtin/clone.c:120 builtin/fetch.c:125 +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundar o histรณrico de um clone raso, excluindo a revisรฃo" -#: builtin/clone.c:122 +#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "clonar apenas um ramo, HEAD ou --branch" -#: builtin/clone.c:124 +#: 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 "qualquer submรณdulo clonado serรก raso" -#: builtin/clone.c:125 builtin/init-db.c:484 +#: builtin/clone.c:137 builtin/init-db.c:559 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:126 builtin/init-db.c:485 +#: builtin/clone.c:138 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "separar o repositรณrio git da รกrvore de trabalho" -#: builtin/clone.c:127 +#: builtin/clone.c:139 msgid "key=value" msgstr "chave=valor" -#: builtin/clone.c:128 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "definir configuraรงรฃo dentro do novo repositรณrio" -#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 +msgid "server-specific" +msgstr "especรญfico do servidor" + +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 +msgid "option to transmit" +msgstr "opรงรฃo para transmitir" + +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 msgid "use IPv4 addresses only" msgstr "usar apenas endereรงos IPv4" -#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552 +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 msgid "use IPv6 addresses only" msgstr "usar apenas endereรงos IPv6" -#: builtin/clone.c:268 +#: builtin/clone.c:149 +#, fuzzy +msgid "any cloned submodules will use their remote-tracking branch" +msgstr "qualquer submรณdulo clonado serรก raso" + +#: 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" @@ -6580,147 +12539,154 @@ msgstr "" "Nรฃo foi possรญvel adivinhar o nome do diretรณrio.\n" "Especifique um diretรณrio na linha de comandos" -#: builtin/clone.c:321 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Nรฃo foi possรญvel adicionar sobressalente de '%s': %s\n" -#: builtin/clone.c:393 -#, c-format -msgid "failed to open '%s'" -msgstr "falha ao abrir '%s'" - -#: builtin/clone.c:401 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe e nรฃo รฉ um diretรณrio" -#: builtin/clone.c:415 -#, c-format -msgid "failed to stat %s\n" -msgstr "falha ao invocar stat de %s\n" +#: builtin/clone.c:431 +#, fuzzy, c-format +msgid "failed to start iterator over '%s'" +msgstr "falha ao escrever para '%s'" -#: builtin/clone.c:437 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "falha ao criar a ligaรงรฃo '%s'" -#: builtin/clone.c:441 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "falha ao copiar o ficheiro para '%s'" -#: builtin/clone.c:466 +#: builtin/clone.c:471 +#, fuzzy, c-format +msgid "failed to iterate over '%s'" +msgstr "falha ao remover '%s'" + +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "concluรญdo.\n" -#: builtin/clone.c:478 +#: builtin/clone.c:512 +#, fuzzy msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" -"and retry the checkout with 'git checkout -f HEAD'\n" +"and retry with 'git restore --source=HEAD :/'\n" msgstr "" "Clonado com sucesso, mas a extraรงรฃo falhou.\n" "Pode inspecionar o que foi extraรญdo com 'git status'\n" "e repetir a extraรงรฃo com 'git checkout -f HEAD'\n" -#: builtin/clone.c:555 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Ramo remoto %s nรฃo encontrado para clonar." -#: builtin/clone.c:650 -msgid "remote did not send all necessary objects" -msgstr "o remoto nรฃo enviou todos os objetos necessรกrios" - -#: builtin/clone.c:666 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "nรฃo foi possรญvel atualizar %s" -#: builtin/clone.c:715 +#: builtin/clone.c:756 +#, fuzzy +msgid "failed to initialize sparse-checkout" +msgstr "falha ao finalizar integraรงรฃo de notas" + +#: builtin/clone.c:779 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "a HEAD remota referencia uma referรชncia inexistente, nรฃo รฉ possรญvel " "extrair.\n" -#: builtin/clone.c:746 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "nรฃo foi possรญvel extrair a รกrvore de trabalho" -#: builtin/clone.c:786 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "nรฃo foi possรญvel escrever os parรขmetros no ficheiro de configuraรงรฃo" -#: builtin/clone.c:849 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "nรฃo รฉ possรญvel reempacotar para limpar" -#: builtin/clone.c:851 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "" "nรฃo รฉ possรญvel invocar unlink sobre o ficheiro sobressalente temporรกrio" -#: builtin/clone.c:884 builtin/receive-pack.c:1901 +#: builtin/clone.c:970 builtin/receive-pack.c:2434 msgid "Too many arguments." msgstr "Demasiados argumentos." -#: builtin/clone.c:888 +#: builtin/clone.c:974 msgid "You must specify a repository to clone." msgstr "Deve especificar um repositรณrio para clonar." -#: builtin/clone.c:901 +#: builtin/clone.c:987 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "as opรงรตes --bare e --origin %s sรฃo incompatรญveis." -#: builtin/clone.c:904 +#: builtin/clone.c:990 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare e --separate-git-dir sรฃo incompatรญveis." -#: builtin/clone.c:917 +#: builtin/clone.c:1006 #, c-format msgid "repository '%s' does not exist" msgstr "o repositรณrio '%s' nรฃo existe" -#: builtin/clone.c:923 builtin/fetch.c:1337 +#: builtin/clone.c:1010 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "profundidade %s nรฃo รฉ um nรบmero positivo" -#: builtin/clone.c:933 +#: builtin/clone.c:1020 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "o caminho de destino '%s' jรก existe e nรฃo รฉ um diretรณrio vazio." -#: builtin/clone.c:943 +#: builtin/clone.c:1026 +#, fuzzy, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "o caminho de destino '%s' jรก existe e nรฃo รฉ um diretรณrio vazio." + +#: builtin/clone.c:1040 #, c-format msgid "working tree '%s' already exists." msgstr "a รกrvore de trabalho '%s' jรก existe." -#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 -#: builtin/worktree.c:222 builtin/worktree.c:249 +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "nรฃo foi possรญvel criar os diretรณrios superiores de '%s'" -#: builtin/clone.c:961 +#: builtin/clone.c:1060 #, c-format msgid "could not create work tree dir '%s'" msgstr "nรฃo foi possรญvel criar o diretรณrio de รกrvore de trabalho '%s'" -#: builtin/clone.c:973 +#: builtin/clone.c:1080 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "A clonar no repositรณrio nu '%s'...\n" -#: builtin/clone.c:975 +#: builtin/clone.c:1082 #, c-format msgid "Cloning into '%s'...\n" msgstr "A clonar em '%s'...\n" -#: builtin/clone.c:999 +#: builtin/clone.c:1106 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -6728,65 +12694,65 @@ msgstr "" "clone --recursive nรฃo รฉ compatรญvel com ambos --reference e --reference-if-" "able" -#: builtin/clone.c:1055 +#: builtin/clone.c:1170 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth รฉ ignorado em clones locais; use file:// ." -#: builtin/clone.c:1057 +#: builtin/clone.c:1172 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since รฉ ignorado em clones locais; use file:// ." -#: builtin/clone.c:1059 +#: builtin/clone.c:1174 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude รฉ ignorado em clones locais; use file:// ." -#: builtin/clone.c:1062 +#: builtin/clone.c:1176 +#, fuzzy +msgid "--filter is ignored in local clones; use file:// instead." +msgstr "--depth รฉ ignorado em clones locais; use file:// ." + +#: builtin/clone.c:1179 msgid "source repository is shallow, ignoring --local" msgstr "o repositรณrio de origem รฉ raso, --local ignorado" -#: builtin/clone.c:1067 +#: builtin/clone.c:1184 msgid "--local is ignored" msgstr "--local ignorado" -#: builtin/clone.c:1071 -#, c-format -msgid "Don't know how to clone %s" -msgstr "Nรฃo sei como clonar %s" - -#: builtin/clone.c:1126 builtin/clone.c:1134 +#: builtin/clone.c:1268 builtin/clone.c:1276 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "O ramo remoto %s nรฃo foi encontrado no repositรณrio a montante %s" -#: builtin/clone.c:1137 +#: builtin/clone.c:1279 msgid "You appear to have cloned an empty repository." msgstr "Parece foi clonado um repositรณrio vazio." -#: builtin/column.c:9 +#: builtin/column.c:10 msgid "git column [<options>]" msgstr "git column [<opรงรตes>]" -#: builtin/column.c:26 +#: builtin/column.c:27 msgid "lookup config vars" msgstr "pesquisar variรกveis de configuraรงรฃo" -#: builtin/column.c:27 builtin/column.c:28 +#: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" msgstr "esquema a usar" -#: builtin/column.c:29 +#: builtin/column.c:30 msgid "Maximum width" msgstr "Largura mรกxima" -#: builtin/column.c:30 +#: builtin/column.c:31 msgid "Padding space on left border" msgstr "Espaรงo de preenchimento na borda esquerda" -#: builtin/column.c:31 +#: builtin/column.c:32 msgid "Padding space on right border" msgstr "Espaรงo de preenchimento na borda direita" -#: builtin/column.c:32 +#: builtin/column.c:33 msgid "Padding space between columns" msgstr "Espaรงo de preenchimento entre colunas" @@ -6794,65 +12760,186 @@ msgstr "Espaรงo de preenchimento entre colunas" msgid "--command must be the first argument" msgstr "--command deve ser o primeiro argumento" -#: builtin/commit.c:38 -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<opรงรตes>] [--] <especificador-de-caminho>..." - -#: builtin/commit.c:43 -msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [<opรงรตes>] [--] <especificador-de-caminho>..." +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" -#: builtin/commit.c:48 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 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" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" + +#: builtin/commit-graph.c:64 +#, fuzzy, c-format +msgid "could not find object directory matching %s" +msgstr "nรฃo foi possรญvel ler o objeto %s da ligaรงรฃo simbรณlica %s" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "dir" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "" + +#: builtin/commit-graph.c:83 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "" + +#: builtin/commit-graph.c:106 +#, fuzzy, c-format +msgid "Could not open commit-graph '%s'" +msgstr "Nรฃo foi possรญvel abrir o ficheiro '%s'" + +#: builtin/commit-graph.c:142 +#, fuzzy, c-format +msgid "unrecognized --split argument, %s" +msgstr "argumento nรฃo reconhecido: %s" + +#: builtin/commit-graph.c:155 +#, fuzzy, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "reutilizar o objeto de nota especificado" + +#: builtin/commit-graph.c:160 +#, fuzzy, c-format +msgid "invalid object: %s" +msgstr "nome de objeto invรกlido: %s" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "" + +#: builtin/commit-graph.c:215 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "" + +#: builtin/commit-graph.c:217 +msgid "start walk at commits listed by stdin" msgstr "" -"O seu nome e endereรงo de e-mail foram configurados automaticamente com base\n" -"no seu nome de utilizador e nome de mรกquina. Verifique se estรฃo corretos.\n" -"Pode suprimir esta mensagem configurando-os explicitamente. Execute\n" -"o seguinte comando e siga as instruรงรตes no editor para editar\n" -"o ficheiro de configuraรงรฃo:\n" -"\n" -" git config --global --edit\n" -"\n" -"Apรณs fazer isto, pode corrigir a identidade usada neste commit com:\n" -"\n" -" git commit --amend --reset-author\n" -#: builtin/commit.c:61 +#: builtin/commit-graph.c:219 +msgid "include all commits already in the commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:221 +msgid "enable computation for changed paths" +msgstr "" + +#: builtin/commit-graph.c:224 +msgid "allow writing an incremental commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:228 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "" + +#: builtin/commit-graph.c:230 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "" + +#: builtin/commit-graph.c:232 +#, fuzzy +msgid "only expire files older than a given date-time" +msgstr "expirar objetos mais antigos que <tempo>" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "" + +#: builtin/commit-graph.c:255 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "" + +#: builtin/commit-tree.c:18 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" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " +"<file>)...] <tree>" +msgstr "" + +#: builtin/commit-tree.c:31 +#, c-format +msgid "duplicate parent %s ignored" msgstr "" -"O seu nome e endereรงo de e-mail foram configurados automaticamente com base\n" -"no seu nome de utilizador e nome de mรกquina. Verifique se estรฃo corretos.\n" -"Pode suprimir esta mensagem configurando-os explicitamente:\n" -"\n" -" git config --global user.name \"O Seu Nome\"\n" -" git config --global user.email utilizador@exemplo.com\n" -"\n" -"Apรณs fazer isto, pode corrigir a identidade usada neste commit com:\n" -"\n" -" git commit --amend --reset-author\n" -#: builtin/commit.c:73 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 +#, fuzzy, c-format +msgid "not a valid object name %s" +msgstr "%s nรฃo รฉ um nome de objeto vรกlido" + +#: builtin/commit-tree.c:93 +#, fuzzy, c-format +msgid "git commit-tree: failed to open '%s'" +msgstr "falha ao abrir '%s'" + +#: builtin/commit-tree.c:96 +#, fuzzy, c-format +msgid "git commit-tree: failed to read '%s'" +msgstr "git write-tree falhou ao escrever uma รกrvore" + +#: builtin/commit-tree.c:98 +#, fuzzy, c-format +msgid "git commit-tree: failed to close '%s'" +msgstr "git write-tree falhou ao escrever uma รกrvore" + +#: builtin/commit-tree.c:111 +#, fuzzy +msgid "parent" +msgstr "nรบmero-pai" + +#: builtin/commit-tree.c:112 +#, fuzzy +msgid "id of a parent commit object" +msgstr "falha ao escrever objeto de commit" + +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 +msgid "message" +msgstr "mensagem" + +#: builtin/commit-tree.c:115 builtin/commit.c:1504 +msgid "commit message" +msgstr "mensagem de commit" + +#: builtin/commit-tree.c:118 +#, fuzzy +msgid "read commit log message from file" +msgstr "ler mensagem de um ficheiro" + +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/pull.c:176 builtin/revert.c:118 +msgid "GPG sign commit" +msgstr "assinar o commit com GPG" + +#: builtin/commit-tree.c:133 +#, fuzzy +msgid "must give exactly one tree" +msgstr "ร necessรกrio exatamente um intervalo." + +#: builtin/commit-tree.c:140 +#, fuzzy +msgid "git commit-tree: failed to read" +msgstr "git write-tree falhou ao escrever uma รกrvore" + +#: builtin/commit.c:41 +msgid "git commit [<options>] [--] <pathspec>..." +msgstr "git commit [<opรงรตes>] [--] <especificador-de-caminho>..." + +#: builtin/commit.c:46 +msgid "git status [<options>] [--] <pathspec>..." +msgstr "git status [<opรงรตes>] [--] <especificador-de-caminho>..." + +#: 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" @@ -6862,7 +12949,7 @@ msgstr "" "vazio. Pode repetir o comando com --allow-empty, ou pode remover o\n" "commit completamente com \"git reset HEAD^\".\n" -#: builtin/commit.c:78 +#: 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" @@ -6877,81 +12964,98 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:85 -msgid "Otherwise, please use 'git reset'\n" +#: builtin/commit.c:63 +#, fuzzy +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "Caso contrรกrio, use 'git reset'\n" + +#: builtin/commit.c:66 +#, fuzzy +msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Caso contrรกrio, use 'git reset'\n" -#: builtin/commit.c:88 +#: builtin/commit.c:69 msgid "" -"If you wish to skip this commit, use:\n" +"and then use:\n" "\n" -" git reset\n" +" git cherry-pick --continue\n" "\n" -"Then \"git cherry-pick --continue\" will resume cherry-picking\n" -"the remaining commits.\n" -msgstr "" -"Se deseja ignorar este commit, use:\n" +"to resume cherry-picking the remaining commits.\n" +"If you wish to skip this commit, use:\n" "\n" -" git reset\n" +" git cherry-pick --skip\n" "\n" -"Depois \"git cherry-pick --continue\" irรก retomar o cherry-pick\n" -"dos restantes commits.\n" +msgstr "" -#: builtin/commit.c:318 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "falha ao descompactar o objeto รกrvore HEAD" -#: builtin/commit.c:359 +#: builtin/commit.c:348 +#, fuzzy +msgid "--pathspec-from-file with -a does not make sense" +msgstr "Indicar caminhos com -a nรฃo faz sentido." + +#: builtin/commit.c:361 +msgid "No paths with --include/--only does not make sense." +msgstr "As opรงรตes --include/--only nรฃo fazem sentido sem indicar caminhos." + +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "nรฃo foi possรญvel criar รญndice temporรกrio" -#: builtin/commit.c:365 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "falha ao adicionar interativamente" -#: builtin/commit.c:378 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "nรฃo รฉ possรญvel atualizar o รญndice temporรกrio" -#: builtin/commit.c:380 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "Falha ao atualizar a รกrvore de cache principal" -#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "nรฃo รฉ possรญvel escrever o ficheiro new_index" -#: builtin/commit.c:458 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "nรฃo รฉ possรญvel fazer um commit parcial durante uma integraรงรฃo." -#: builtin/commit.c:460 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "nรฃo รฉ possรญvel fazer um commit parcial durante um cherry-pick." -#: builtin/commit.c:469 +#: builtin/commit.c:480 +#, fuzzy +msgid "cannot do a partial commit during a rebase." +msgstr "nรฃo รฉ possรญvel fazer um commit parcial durante uma integraรงรฃo." + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "nรฃo รฉ possรญvel ler o รญndice" -#: builtin/commit.c:488 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "nรฃo รฉ possรญvel escrever ficheiro de รญndice temporรกrio" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "o commit '%s' nรฃo tem cabeรงalho de autor" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "o commit '%s' tem a linha de autor malformada" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "parรขmetro --author malformado" -#: builtin/commit.c:655 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -6959,44 +13063,44 @@ msgstr "" "nรฃo foi possรญvel selecionar um carรกcter de comentรกrio que\n" "nรฃo estivesse jรก a ser usado na mensagem de commit atual" -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "nรฃo foi possรญvel consultar o commit %s" -#: builtin/commit.c:704 builtin/shortlog.c:294 +#: builtin/commit.c:729 builtin/shortlog.c:478 #, c-format msgid "(reading log message from standard input)\n" msgstr "(a ler mensagem de log da entrada padrรฃo)\n" -#: builtin/commit.c:706 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "nรฃo foi possรญvel ler o log da entrada padrรฃo" -#: builtin/commit.c:710 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "nรฃo รฉ possรญvel ler o ficheiro de log '%s'" -#: builtin/commit.c:737 builtin/commit.c:745 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "nรฃo foi possรญvel ler SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "nรฃo foi possรญvel ler MERGE_MSG" -#: builtin/commit.c:796 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "nรฃo foi possรญvel escrever o modelo de commit" -#: builtin/commit.c:814 -#, c-format +#: builtin/commit.c:853 +#, fuzzy 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" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" @@ -7005,13 +13109,13 @@ msgstr "" "\t%s\n" "e tente de novo.\n" -#: builtin/commit.c:819 -#, c-format +#: builtin/commit.c:858 +#, fuzzy 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" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" @@ -7020,7 +13124,7 @@ msgstr "" "\t%s\n" "e tente outra vez.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7030,7 +13134,7 @@ msgstr "" "Linhas comeรงadas com '%c' serรฃo ignoradas, e uma mensagem vazia\n" "aborta o commit.\n" -#: builtin/commit.c:839 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7041,149 +13145,163 @@ msgstr "" "Linhas comeรงadas com '%c' serรฃo mantidas; pode removรช-las se o desejar.\n" "Uma mensagem vazia aborta o commit.\n" -#: builtin/commit.c:859 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:867 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:874 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:892 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "Nรฃo รฉ possรญvel ler o รญndice" -#: builtin/commit.c:954 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Erro ao construir รกrvores" -#: builtin/commit.c:968 builtin/tag.c:273 +#: builtin/commit.c:1011 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Indique a mensagem usando as opรงรตes -m ou -F.\n" -#: builtin/commit.c:1071 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' nรฃo รฉ do tipo 'Nome <email>' e nรฃo corresponde a um autor " "existente" -#: builtin/commit.c:1086 builtin/commit.c:1325 +#: builtin/commit.c:1069 +#, fuzzy, c-format +msgid "Invalid ignored mode '%s'" +msgstr "Modo invรกlido de ficheiros nรฃo controlados '%s'" + +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo invรกlido de ficheiros nรฃo controlados '%s'" -#: builtin/commit.c:1124 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long e -z sรฃo incompatรญveis" -#: builtin/commit.c:1154 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "Nรฃo faz sentido usar --reset-author e --author ao mesmo tempo" -#: builtin/commit.c:1163 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "Nรฃo hรก nada para emendar." -#: builtin/commit.c:1166 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "Integraรงรฃo em curso -- nรฃo รฉ possรญvel emendar." -#: builtin/commit.c:1168 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Cherry-pick em curso -- nรฃo รฉ possรญvel emendar." -#: builtin/commit.c:1171 +#: builtin/commit.c:1187 +#, fuzzy +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "Integraรงรฃo em curso -- nรฃo รฉ possรญvel emendar." + +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "As opรงรตes --squash e --fixup nรฃo podem ser usadas juntas" -#: builtin/commit.c:1181 +#: builtin/commit.c:1200 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado." -#: builtin/commit.c:1183 -msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +#: builtin/commit.c:1202 +#, fuzzy +msgid "Option -m cannot be combined with -c/-C/-F." msgstr "A opรงรฃo -m nรฃo pode ser combinada com -c/C/-F/--fixup." -#: builtin/commit.c:1191 +#: builtin/commit.c:1211 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author sรณ pode ser usado com -C, -c ou --amend." -#: builtin/commit.c:1208 +#: builtin/commit.c:1229 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado." -#: builtin/commit.c:1210 -msgid "No paths with --include/--only does not make sense." -msgstr "As opรงรตes --include/--only nรฃo fazem sentido sem indicar caminhos." - -#: builtin/commit.c:1212 -msgid "Explicit paths specified without -i or -o; assuming --only paths..." -msgstr "Caminhos explรญcitos especificados sem -i ou -o; assumindo --only..." - -#: builtin/commit.c:1224 builtin/tag.c:551 -#, c-format -msgid "Invalid cleanup mode %s" -msgstr "Modo de limpeza invรกlido %s" - -#: builtin/commit.c:1229 -msgid "Paths with -a does not make sense." +#: builtin/commit.c:1235 +#, fuzzy, c-format +msgid "paths '%s ...' with -a does not make sense" msgstr "Indicar caminhos com -a nรฃo faz sentido." -#: builtin/commit.c:1339 builtin/commit.c:1612 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "mostrar status de forma concisa" -#: builtin/commit.c:1341 builtin/commit.c:1614 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "mostrar informaรงรฃo do ramo" -#: builtin/commit.c:1343 +#: builtin/commit.c:1370 +#, fuzzy +msgid "show stash information" +msgstr "mostrar informaรงรฃo do ramo" + +#: builtin/commit.c:1372 builtin/commit.c:1531 +msgid "compute full ahead/behind values" +msgstr "" + +#: builtin/commit.c:1374 msgid "version" msgstr "versรฃo" -#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:443 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "saรญda inteligรญvel por mรกquina" -#: builtin/commit.c:1346 builtin/commit.c:1618 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "apresentar status em formato longo (predefiniรงรฃo)" -#: builtin/commit.c:1349 builtin/commit.c:1621 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "terminar entradas com NUL" -#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:411 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 msgid "mode" msgstr "modo" -#: builtin/commit.c:1352 builtin/commit.c:1624 +#: builtin/commit.c:1383 builtin/commit.c:1541 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostrar ficheiros nรฃo controlados, modo รฉ opcional: all, normal, no. " "(Predefiniรงรฃo: all)" -#: builtin/commit.c:1355 -msgid "show ignored files" -msgstr "mostrar ficheiros ignorados" +#: builtin/commit.c:1387 +#, fuzzy +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" +msgstr "" +"mostrar ficheiros nรฃo controlados, modo รฉ opcional: all, normal, no. " +"(Predefiniรงรฃo: all)" -#: builtin/commit.c:1356 parse-options.h:155 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "quando" -#: builtin/commit.c:1357 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7191,349 +13309,403 @@ msgstr "" "ignorar alteraรงรตes em submรณdulos, quando รฉ opcional: all, dirty, untracked. " "(Predefiniรงรฃo: all)" -#: builtin/commit.c:1359 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "listar ficheiros nรฃo controlados em colunas" -#: builtin/commit.c:1435 -msgid "couldn't look up newly created commit" -msgstr "nรฃo foi possรญvel consultar o commit recรฉm-criado" - -#: builtin/commit.c:1437 -msgid "could not parse newly created commit" -msgstr "nรฃo foi possรญvel analisar o commit recรฉm-criado" +#: builtin/commit.c:1393 +#, fuzzy +msgid "do not detect renames" +msgstr "nรฃo consultar remotos" -#: builtin/commit.c:1482 -msgid "detached HEAD" -msgstr "HEAD destacada" +#: builtin/commit.c:1395 +msgid "detect renames, optionally set similarity index" +msgstr "" -#: builtin/commit.c:1485 -msgid " (root-commit)" -msgstr " (commit-raiz)" +#: builtin/commit.c:1415 +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "" -#: builtin/commit.c:1582 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "suprimir o resumo depois de submeter com sucesso" -#: builtin/commit.c:1583 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "mostrar diff no modelo da mensagem de commit" -#: builtin/commit.c:1585 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "Opรงรตes de mensagem de commit" -#: builtin/commit.c:1586 builtin/tag.c:409 +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 msgid "read message from file" msgstr "ler mensagem de um ficheiro" -#: builtin/commit.c:1587 +#: builtin/commit.c:1502 msgid "author" msgstr "autor" -#: builtin/commit.c:1587 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "substituir autor do commit" -#: builtin/commit.c:1588 builtin/gc.c:353 +#: builtin/commit.c:1503 builtin/gc.c:539 msgid "date" msgstr "data" -#: builtin/commit.c:1588 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "substituir data do commit" -#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:407 -msgid "message" -msgstr "mensagem" - -#: builtin/commit.c:1589 -msgid "commit message" -msgstr "mensagem de commit" - -#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 -#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "commit" -#: builtin/commit.c:1590 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "reutilizar e editar a mensagem de um commit especificado" -#: builtin/commit.c:1591 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "reutilizar a mensagem de um commit especificado" -#: builtin/commit.c:1592 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensagem com formato autosquash para corrigir o commit especificado" -#: builtin/commit.c:1593 +#: builtin/commit.c:1508 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usar mensagem com formato autosquash para esmagar o commit especificado" -#: builtin/commit.c:1594 +#: builtin/commit.c:1509 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)" -#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104 +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "adicionar Signed-off-by:" -#: builtin/commit.c:1596 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "usar ficheiro de modelo especificado" -#: builtin/commit.c:1597 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "forรงar ediรงรฃo do commit" -#: builtin/commit.c:1598 -msgid "default" -msgstr "predefiniรงรฃo" - -#: builtin/commit.c:1598 builtin/tag.c:412 -msgid "how to strip spaces and #comments from message" -msgstr "como retirar espaรงos e #comentรกrios da mensagem" - -#: builtin/commit.c:1599 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "incluir status no modelo da mensagem de commit" -#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 -#: builtin/revert.c:112 -msgid "GPG sign commit" -msgstr "assinar o commit com GPG" - -#: builtin/commit.c:1604 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "Opรงรตes de conteรบdo do commit" -#: builtin/commit.c:1605 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "submeter todos os ficheiros alterados" -#: builtin/commit.c:1606 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "adicionar ficheiros especificados ao รญndice para submeter" -#: builtin/commit.c:1607 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "adicionar ficheiros interativamente" -#: builtin/commit.c:1608 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "adicionar alteraรงรตes interativamente" -#: builtin/commit.c:1609 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "submeter somente os ficheiros especificados" -#: builtin/commit.c:1610 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "ignorar pre-commit e commit-msg hooks" -#: builtin/commit.c:1611 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "mostrar o que seria submetido" -#: builtin/commit.c:1622 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "emendar o commit anterior" -#: builtin/commit.c:1623 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "ignorar post-rewrite hook" -#: builtin/commit.c:1628 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "aceitar o registo duma alteraรงรฃo vazia" -#: builtin/commit.c:1630 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "aceitar o registo duma alteraรงรฃo com uma mensagem vazia" -#: builtin/commit.c:1659 -msgid "could not parse HEAD commit" -msgstr "nรฃo foi possรญvel analisar o commit HEAD" - -#: builtin/commit.c:1707 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Ficheiro MERGE_HEAD corrompido (%s)" -#: builtin/commit.c:1714 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "nรฃo foi possรญvel ler MERGE_MODE" -#: builtin/commit.c:1733 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "nรฃo foi possรญvel ler a mensagem de commit: %s" -#: builtin/commit.c:1744 -#, c-format -msgid "Aborting commit; you did not edit the message.\n" -msgstr "A abortar o commit; nรฃo editou a mensagem.\n" - -#: builtin/commit.c:1749 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "A abortar o commit uma vez que a mensagem de commit estรก vazia.\n" -#: builtin/commit.c:1797 +#: builtin/commit.c:1662 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "A abortar o commit; nรฃo editou a mensagem.\n" + +#: builtin/commit.c:1696 +#, fuzzy msgid "" -"Repository has been updated, but unable to write\n" +"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 reset HEAD\" to recover." +"not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" "O repositรณrio foi atualizado, mas nรฃo foi possรญvel escrever\n" "o ficheiro new_index. Verifique se o disco nรฃo estรก cheio\n" "e que a quota nรฃo foi excedida e execute \"git reset HEAD\" para recuperar." -#: builtin/config.c:9 +#: builtin/config.c:11 msgid "git config [<options>]" msgstr "git config [<opรงรตes>]" -#: builtin/config.c:55 +#: builtin/config.c:107 builtin/env--helper.c:27 +#, fuzzy, c-format +msgid "unrecognized --type argument, %s" +msgstr "argumento nรฃo reconhecido: %s" + +#: builtin/config.c:119 +#, fuzzy +msgid "only one type at a time" +msgstr "imprimir apenas correspondรชncias exatas" + +#: builtin/config.c:128 msgid "Config file location" msgstr "Localizaรงรฃo do ficheiro de configuraรงรฃo" -#: builtin/config.c:56 +#: builtin/config.c:129 msgid "use global config file" msgstr "usar ficheiro de configuraรงรฃo global" -#: builtin/config.c:57 +#: builtin/config.c:130 msgid "use system config file" msgstr "usar ficheiro de configuraรงรฃo do sistema" -#: builtin/config.c:58 +#: builtin/config.c:131 msgid "use repository config file" msgstr "usar ficheiro de configuraรงรฃo do repositรณrio" -#: builtin/config.c:59 +#: builtin/config.c:132 +#, fuzzy +msgid "use per-worktree config file" +msgstr "usar ficheiro de configuraรงรฃo do repositรณrio" + +#: builtin/config.c:133 msgid "use given config file" msgstr "usar ficheiro de configuraรงรฃo fornecido" -#: builtin/config.c:60 +#: builtin/config.c:134 msgid "blob-id" msgstr "id-blob" -#: builtin/config.c:60 +#: builtin/config.c:134 msgid "read config from given blob object" msgstr "ler configuraรงรฃo a partir do objeto blob fornecido" -#: builtin/config.c:61 +#: builtin/config.c:135 msgid "Action" msgstr "Aรงรฃo" -#: builtin/config.c:62 +#: builtin/config.c:136 msgid "get value: name [value-regex]" msgstr "obter valor: nome [regex-do-valor]" -#: builtin/config.c:63 +#: builtin/config.c:137 msgid "get all values: key [value-regex]" msgstr "obter todos os valores: chave [regex-do-valor]" -#: builtin/config.c:64 +#: builtin/config.c:138 msgid "get values for regexp: name-regex [value-regex]" msgstr "obter valores para a regexp: regex-do-nome [regex-do-valor]" -#: builtin/config.c:65 +#: builtin/config.c:139 msgid "get value specific for the URL: section[.var] URL" msgstr "obter valor do URL especificado: section[.var] URL" -#: builtin/config.c:66 +#: builtin/config.c:140 msgid "replace all matching variables: name value [value_regex]" msgstr "" "substituir todos as variรกveis correspondentes: nome valor [regex-do-valor]" -#: builtin/config.c:67 +#: builtin/config.c:141 msgid "add a new variable: name value" msgstr "adicionar uma nova variรกvel: nome valor" -#: builtin/config.c:68 +#: builtin/config.c:142 msgid "remove a variable: name [value-regex]" msgstr "remover uma variรกvel: nome [regex-do-valor]" -#: builtin/config.c:69 +#: builtin/config.c:143 msgid "remove all matches: name [value-regex]" msgstr "remover todas as correspondรชncias: nome [regex-do-valor]" -#: builtin/config.c:70 +#: builtin/config.c:144 msgid "rename section: old-name new-name" msgstr "mudar o nome da secรงรฃo: nome-antigo novo-nome" -#: builtin/config.c:71 +#: builtin/config.c:145 msgid "remove a section: name" msgstr "remover uma secรงรฃo: nome" -#: builtin/config.c:72 +#: builtin/config.c:146 msgid "list all" msgstr "listar todos" -#: builtin/config.c:73 +#: builtin/config.c:147 msgid "open an editor" msgstr "abrir um editor" -#: builtin/config.c:74 +#: builtin/config.c:148 msgid "find the color configured: slot [default]" msgstr "encontrar a cor configurada: slot [predefiniรงรฃo]" -#: builtin/config.c:75 +#: builtin/config.c:149 msgid "find the color setting: slot [stdout-is-tty]" msgstr "encontrar a definiรงรฃo de cor: slot [stdout-รฉ-tty]" -#: builtin/config.c:76 +#: builtin/config.c:150 msgid "Type" msgstr "Tipo" -#: builtin/config.c:77 +#: builtin/config.c:151 builtin/env--helper.c:43 +msgid "value is given this type" +msgstr "" + +#: builtin/config.c:152 msgid "value is \"true\" or \"false\"" msgstr "o valor รฉ \"true\" (verdadeiro) ou \"false\" (falso)" -#: builtin/config.c:78 +#: builtin/config.c:153 msgid "value is decimal number" msgstr "o valor รฉ um nรบmero decimal" -#: builtin/config.c:79 +#: builtin/config.c:154 msgid "value is --bool or --int" msgstr "o valor รฉ --bool ou --int" -#: builtin/config.c:80 +#: builtin/config.c:155 +#, fuzzy +msgid "value is --bool or string" +msgstr "o valor รฉ --bool ou --int" + +#: builtin/config.c:156 msgid "value is a path (file or directory name)" msgstr "o valor รฉ um caminho (nome dum ficheiro ou diretรณrio)" -#: builtin/config.c:81 +#: builtin/config.c:157 +msgid "value is an expiry date" +msgstr "" + +#: builtin/config.c:158 msgid "Other" msgstr "Outro" -#: builtin/config.c:82 +#: builtin/config.c:159 msgid "terminate values with NUL byte" msgstr "terminar valores com o byte NUL" -#: builtin/config.c:83 +#: builtin/config.c:160 msgid "show variable names only" msgstr "mostrar apenas os nomes das variรกveis" -#: builtin/config.c:84 +#: builtin/config.c:161 msgid "respect include directives on lookup" msgstr "respeitar diretivas de inclusรฃo ao pesquisar" -#: builtin/config.c:85 +#: builtin/config.c:162 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "mostrar a origem da configuraรงรฃo (ficheiro, entrada padrรฃo, blob, linha de " "comandos)" -#: builtin/config.c:327 +#: builtin/config.c:163 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" + +#: builtin/config.c:164 builtin/env--helper.c:45 +#, fuzzy +msgid "value" +msgstr "chave=valor" + +#: builtin/config.c:164 +msgid "with --get, use default value when missing entry" +msgstr "" + +#: builtin/config.c:178 +#, c-format +msgid "wrong number of arguments, should be %d" +msgstr "" + +#: builtin/config.c:180 +#, c-format +msgid "wrong number of arguments, should be from %d to %d" +msgstr "" + +#: builtin/config.c:334 +#, fuzzy, c-format +msgid "invalid key pattern: %s" +msgstr "chave invรกlida: %s" + +#: builtin/config.c:370 +#, fuzzy, c-format +msgid "failed to format default config value: %s" +msgstr "falha ao criar o ficheiro %s" + +#: builtin/config.c:434 +#, fuzzy, c-format +msgid "cannot parse color '%s'" +msgstr "nรฃo รฉ possรญvel abrir o ficheiro '%s'" + +#: builtin/config.c:476 msgid "unable to parse default color value" msgstr "nรฃo รฉ possรญvel analisar o valor de cor por omissรฃo" -#: builtin/config.c:471 +#: builtin/config.c:529 builtin/config.c:789 +#, fuzzy +msgid "not in a git directory" +msgstr "Nรฃo รฉ um repositรณrio git" + +#: builtin/config.c:532 +#, fuzzy +msgid "writing to stdin is not supported" +msgstr "Nรฃo รฉ suportada profundidade negativa em --deepen" + +#: builtin/config.c:535 +#, fuzzy +msgid "writing config blobs is not supported" +msgstr "aviso: sendmail alias com aspas nรฃo รฉ suportado: %s\n" + +#: builtin/config.c:620 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7548,12 +13720,84 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:644 +msgid "only one config file at a time" +msgstr "" + +#: builtin/config.c:650 +#, fuzzy +msgid "--local can only be used inside a git repository" +msgstr "--cached fora de um repositรณrio" + +#: builtin/config.c:652 +#, fuzzy +msgid "--blob can only be used inside a git repository" +msgstr "--cached fora de um repositรณrio" + +#: builtin/config.c:654 +#, fuzzy +msgid "--worktree can only be used inside a git repository" +msgstr "'%s' nรฃo รฉ reconhecido como um repositรณrio git" + +#: builtin/config.c:676 +msgid "$HOME not set" +msgstr "" + +#: builtin/config.c:700 +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:735 +msgid "--get-color and variable type are incoherent" +msgstr "" + +#: builtin/config.c:740 +msgid "only one action at a time" +msgstr "" + +#: builtin/config.c:753 +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "" + +#: builtin/config.c:759 +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" + +#: builtin/config.c:765 +msgid "--default is only applicable to --get" +msgstr "" + +#: builtin/config.c:778 +#, fuzzy, c-format +msgid "unable to read config file '%s'" +msgstr "nรฃo รฉ possรญvel ler o ficheiro de assinatura '%s'" + +#: builtin/config.c:781 +#, fuzzy +msgid "error processing config file(s)" +msgstr "usar ficheiro de configuraรงรฃo do repositรณrio" + +#: builtin/config.c:791 +#, fuzzy +msgid "editing stdin is not supported" +msgstr "Nรฃo รฉ suportada profundidade negativa em --deepen" + +#: builtin/config.c:793 +#, fuzzy +msgid "editing blobs is not supported" +msgstr "Nรฃo รฉ suportada profundidade negativa em --deepen" + +#: builtin/config.c:807 #, c-format msgid "cannot create configuration file %s" msgstr "nรฃo รฉ possรญvel criar o ficheiro de configuraรงรฃo %s" -#: builtin/config.c:623 +#: builtin/config.c:820 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7562,75 +13806,91 @@ msgstr "" "nรฃo รฉ possรญvel substituir mรบltiplos valores por um รบnico valor\n" "\tUse uma regexp, --add ou --replace-all para alterar %s." -#: builtin/count-objects.c:86 +#: builtin/config.c:894 builtin/config.c:905 +#, fuzzy, c-format +msgid "no such section: %s" +msgstr "referรชncia inexistente %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:96 +#: builtin/count-objects.c:100 msgid "print sizes in human readable format" msgstr "imprimir dimensรตes em formato inteligรญvel por humanos" -#: builtin/describe.c:18 +#: builtin/credential-cache--daemon.c:226 +#, 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 "" +"As permissรตes do diretรณrio do socket sรฃo demasiado fracas; outros\n" +"utilizadores poderรฃo conseguir as suas credenciais em cache. Considere " +"executar:\n" +"\n" +"\tchmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "imprimir mensagens de depuraรงรฃo no stderr" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "" + +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opรงรตes>] [<commit-etc>...]" -#: builtin/describe.c:19 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<opรงรตes>] --dirty" -#: builtin/describe.c:53 +#: builtin/describe.c:63 msgid "head" msgstr "cabeรงa" -#: builtin/describe.c:53 +#: builtin/describe.c:63 msgid "lightweight" msgstr "leve" -#: builtin/describe.c:53 +#: builtin/describe.c:63 msgid "annotated" msgstr "anotado" -#: builtin/describe.c:250 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "a tag anotada %s nรฃo estรก disponรญvel" -#: builtin/describe.c:254 -#, c-format -msgid "annotated tag %s has no embedded name" -msgstr "a tag anotada %s nรฃo tem nenhum nome incorporado" - -#: builtin/describe.c:256 -#, c-format -msgid "tag '%s' is really '%s' here" +#: builtin/describe.c:281 +#, fuzzy, c-format +msgid "tag '%s' is externally known as '%s'" msgstr "a tag '%s' estรก de facto em '%s'" -#: builtin/describe.c:283 builtin/log.c:487 -#, c-format -msgid "Not a valid object name %s" -msgstr "%s nรฃo รฉ um nome de objeto vรกlido" - -#: builtin/describe.c:286 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s nรฃo รฉ um objeto '%s' vรกlido" - -#: builtin/describe.c:303 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "nenhuma tag corresponde exatamente a '%s'" -#: builtin/describe.c:305 +#: builtin/describe.c:330 #, c-format -msgid "searching to describe %s\n" -msgstr "ร procurar da descriรงรฃo de %s\n" +msgid "No exact match on refs or tags, searching to describe\n" +msgstr "" -#: builtin/describe.c:352 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "a pesquisa terminou em %s\n" -#: builtin/describe.c:379 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7639,7 +13899,7 @@ msgstr "" "Nรฃo รฉ possรญvel usar tags anotadas para descrever '%s'.\n" "No entanto, รฉ possรญvel com tags nรฃo anotadas: tente --tags." -#: builtin/describe.c:383 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7648,12 +13908,12 @@ msgstr "" "Nรฃo รฉ possรญvel usar tags para descrever '%s'.\n" "Tente --always, ou crie algumas tags." -#: builtin/describe.c:413 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits percorridos\n" -#: builtin/describe.c:416 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7662,136 +13922,161 @@ msgstr "" "mais de %i tags encontradas; foram listadas as %i mais recentes\n" "pesquisa interrompida em %s\n" -#: builtin/describe.c:438 +#: builtin/describe.c:529 +#, fuzzy, c-format +msgid "describe %s\n" +msgstr "ร procurar da descriรงรฃo de %s\n" + +#: builtin/describe.c:532 +#, c-format +msgid "Not a valid object name %s" +msgstr "%s nรฃo รฉ um nome de objeto vรกlido" + +#: builtin/describe.c:540 +#, fuzzy, c-format +msgid "%s is neither a commit nor blob" +msgstr "'%s' nรฃo รฉ um commit" + +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "localizar a tag que vem apรณs o commit" -#: builtin/describe.c:439 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "depurar a estratรฉgia de procura para stderr" -#: builtin/describe.c:440 +#: builtin/describe.c:556 msgid "use any ref" msgstr "usar uma referรชncia qualquer" -#: builtin/describe.c:441 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "usar uma tag qualquer, mesmo nรฃo anotada" -#: builtin/describe.c:442 +#: builtin/describe.c:558 msgid "always use long format" msgstr "usar sempre formato longo" -#: builtin/describe.c:443 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "seguir sรณ o primeiro pai" -#: builtin/describe.c:446 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "imprimir apenas correspondรชncias exatas" -#: builtin/describe.c:448 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "considerar as <n> tags mais recentes (predefiniรงรฃo: 10)" -#: builtin/describe.c:450 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "apenas considerar tags que correspondam ao <padrรฃo>" -#: builtin/describe.c:452 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "nรฃo considerar tags que correspondam ao <padrรฃo>" -#: builtin/describe.c:454 builtin/name-rev.c:357 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "mostrar objetos de commit abreviados em recurso" -#: builtin/describe.c:455 builtin/describe.c:458 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "marca" -#: builtin/describe.c:456 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" "acrescentar <marca> se a รกrvore de trabalho contiver alteraรงรตes " "(predefiniรงรฃo: \"-dirty\")" -#: builtin/describe.c:459 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "acrescentar <marca> no caso de รกrvore de trabalho quebrada (predefiniรงรฃo: \"-" "broken\")" -#: builtin/describe.c:477 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "--long รฉ incompatรญvel com --abbrev=0" -#: builtin/describe.c:506 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "Nenhum nome encontrado, nรฃo รฉ possรญvel descrever." -#: builtin/describe.c:549 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty รฉ incompatรญvel com commits ou semelhantes" -#: builtin/describe.c:551 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "--broken รฉ incompatรญvel com commits ou semelhantes" -#: builtin/diff.c:83 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': nรฃo รฉ um ficheiro regular nem uma ligaรงรฃo simbรณlica" -#: builtin/diff.c:234 +#: builtin/diff.c:241 #, c-format msgid "invalid option: %s" msgstr "opรงรฃo invรกlida: %s" #: builtin/diff.c:358 +#, c-format +msgid "%s...%s: no merge base" +msgstr "" + +#: builtin/diff.c:468 msgid "Not a git repository" msgstr "Nรฃo รฉ um repositรณrio git" -#: builtin/diff.c:401 +#: builtin/diff.c:513 #, c-format msgid "invalid object '%s' given." msgstr "objeto invรกlido '%s' fornecido." -#: builtin/diff.c:410 +#: builtin/diff.c:524 #, c-format msgid "more than two blobs given: '%s'" msgstr "mais do que dois blobs fornecidos: '%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:529 #, c-format msgid "unhandled object '%s' given." msgstr "objeto sem tratamento '%s' fornecido." -#: builtin/difftool.c:28 +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "" + +#: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opรงรตes>] [<commit> [<commit>]] [--] [<caminho>...]" -#: builtin/difftool.c:241 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "falha: %d" -#: builtin/difftool.c:283 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "nรฃo foi possรญvel ler a ligaรงรฃo simbรณlica %s" -#: builtin/difftool.c:285 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "nรฃo foi possรญvel ler o ficheiro de ligaรงรฃo simbรณlica %s" -#: builtin/difftool.c:293 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "nรฃo foi possรญvel ler o objeto %s da ligaรงรฃo simbรณlica %s" -#: builtin/difftool.c:395 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -7799,54 +14084,55 @@ msgstr "" "formatos diff combinado('-c' e '--cc') nรฃo sรฃo suportados em\n" "modo diff diretรณrio ('-d' e '--dir-diff')." -#: builtin/difftool.c:609 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ambos os ficheiros modificados: '%s' e '%s'." -#: builtin/difftool.c:611 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "ficheiro de รกrvore de trabalho foi deixado." -#: builtin/difftool.c:622 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "existem ficheiros temporรกrios em '%s'." -#: builtin/difftool.c:623 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "pode querer limpar ou recuperรก-los." -#: builtin/difftool.c:669 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "use 'diff.guitool' em vez de 'diff.tool'" -#: builtin/difftool.c:671 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "efetuar diff diretรณrio completo" -#: builtin/difftool.c:673 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "nรฃo perguntar antes de lanรงar uma ferramenta diff" -#: builtin/difftool.c:679 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "usar symlinks no modi dir-diff" -#: builtin/difftool.c:680 -msgid "<tool>" +#: builtin/difftool.c:707 +#, fuzzy +msgid "tool" msgstr "<ferramenta>" -#: builtin/difftool.c:681 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "usar a ferramenta diff especificada" -#: builtin/difftool.c:683 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "imprimir uma lista de ferramentas diff que podem ser usadas com '--tool'" -#: builtin/difftool.c:686 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -7854,251 +14140,435 @@ msgstr "" "fazer com que 'git-difftool' termine quando uma ferramenta diff invocada " "retorna um cรณdigo de saรญda nรฃo nulo" -#: builtin/difftool.c:688 -msgid "<command>" -msgstr "<comando>" - -#: builtin/difftool.c:689 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "especificar um comando personalizado para ver diffs" -#: builtin/difftool.c:713 +#: builtin/difftool.c:717 +msgid "passed to `diff`" +msgstr "" + +#: builtin/difftool.c:732 +msgid "difftool requires worktree or --no-index" +msgstr "" + +#: builtin/difftool.c:739 +#, fuzzy +msgid "--dir-diff is incompatible with --no-index" +msgstr "--dirty รฉ incompatรญvel com commits ou semelhantes" + +#: builtin/difftool.c:742 +#, fuzzy +msgid "--gui, --tool and --extcmd are mutually exclusive" +msgstr "-b, -B e --detach sรฃo mutuamente exclusivos" + +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "nenhuma <ferramenta> dada a --tool=<ferramenta>" -#: builtin/difftool.c:720 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "nenhum <cmd> dado a --extcmd=<cmd>" -#: builtin/fast-export.c:25 +#: builtin/env--helper.c:6 +msgid "git env--helper --type=[bool|ulong] <options> <env-var>" +msgstr "" + +#: builtin/env--helper.c:42 builtin/hash-object.c:98 +msgid "type" +msgstr "tipo" + +#: builtin/env--helper.c:46 +msgid "default for git_env_*(...) to fall back on" +msgstr "" + +#: builtin/env--helper.c:48 +msgid "be quiet only use git_env_*() value as exit code" +msgstr "" + +#: builtin/env--helper.c:67 +#, c-format +msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" +msgstr "" + +#: builtin/env--helper.c:82 +#, c-format +msgid "" +"option `--default' expects an unsigned long value with `--type=ulong`, not `" +"%s`" +msgstr "" + +#: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opรงรตes-de-rev-list]" -#: builtin/fast-export.c:980 +#: builtin/fast-export.c:868 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" + +#: builtin/fast-export.c:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "mostrar progresso depois de <n> objetos" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "selecionar o tratamento de tags assinadas" -#: builtin/fast-export.c:985 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "selecionar o tratamento de tags que apontem para objetos filtrados" -#: builtin/fast-export.c:988 +#: builtin/fast-export.c:1206 +#, fuzzy +msgid "select handling of commit messages in an alternate encoding" +msgstr "selecionar o tratamento de tags que apontem para objetos filtrados" + +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" msgstr "Capturar marcas neste ficheiro" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" msgstr "Importar marcas deste ficheiro" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:1215 +#, fuzzy +msgid "Import marks from this file if it exists" +msgstr "Importar marcas deste ficheiro" + +#: builtin/fast-export.c:1217 msgid "Fake a tagger when tags lack one" msgstr "Inventar um autor de tag para tags que nรฃo tenham um" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:1219 msgid "Output full tree for each commit" msgstr "Mostrar a รกrvore completa para cada commit" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:1221 msgid "Use the done feature to terminate the stream" msgstr "Usar a funcionalidade done para terminar o fluxo" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "Ignorar a exibiรงรฃo de dados de blob" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1223 builtin/log.c:1811 msgid "refspec" msgstr "especificador de referรชncia" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1224 msgid "Apply refspec to exported refs" msgstr "Aplicar o especificador de referรชncia a referรชncias exportadas" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "anonimizar saรญda" -#: builtin/fetch.c:21 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "" + +#: builtin/fast-export.c:1230 +msgid "Reference parents which are not in fast-export stream by object id" +msgstr "" + +#: builtin/fast-export.c:1232 +msgid "Show original object ids of blobs/commits" +msgstr "" + +#: builtin/fast-export.c:1234 +msgid "Label tags with mark ids" +msgstr "" + +#: builtin/fast-export.c:1257 +#, fuzzy +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "--name-only nรฃo faz sentido" + +#: builtin/fast-export.c:1272 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "" + +#: builtin/fast-import.c:3086 +#, fuzzy, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "A ignorar submรณdulo '%s'" + +#: builtin/fast-import.c:3088 +#, fuzzy, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "A ignorar submรณdulo '%s'" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "" + +#: builtin/fast-import.c:3374 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "" + +#: builtin/fetch-pack.c:241 +#, fuzzy, c-format +msgid "Lockfile created but not reported: %s" +msgstr "Submรณdulos alterados mas nรฃo atualizados:" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" "git fetch [<opรงรตes>] [<repositรณrio> [<especificador-de-referรชncia>...]]" -#: builtin/fetch.c:22 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opรงรตes>] <grupo>" -#: builtin/fetch.c:23 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opรงรตes>] [(<repositรณrio> | <grupo>)...]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opรงรตes>]" -#: builtin/fetch.c:95 builtin/pull.c:175 +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "" + +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "obter de todos os remotos" -#: builtin/fetch.c:97 builtin/pull.c:178 +#: builtin/fetch.c:144 builtin/pull.c:245 +#, fuzzy +msgid "set upstream for git pull/fetch" +msgstr "definir o ramo a montante usado com git pull/status" + +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "acrescentar a .git/FETCH_HEAD em vez de substituir" -#: builtin/fetch.c:99 builtin/pull.c:181 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "caminho para o comando upload pack no remoto" -#: builtin/fetch.c:100 builtin/pull.c:183 -msgid "force overwrite of local branch" +#: builtin/fetch.c:149 +#, fuzzy +msgid "force overwrite of local reference" msgstr "forรงar a substituiรงรฃo do ramo local" -#: builtin/fetch.c:102 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "obter de mรบltiplos remotos" -#: builtin/fetch.c:104 builtin/pull.c:185 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "obter todas as tags e objetos associados" -#: builtin/fetch.c:106 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "nรฃo obter todas as tags (--no-tags)" -#: builtin/fetch.c:108 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "nรบmero de submรณdulos obtidos em paralelo" -#: builtin/fetch.c:110 builtin/pull.c:188 +#: builtin/fetch.c:159 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" "eliminar os ramos de monitorizaรงรฃo remotos que jรก nรฃo existem no remoto" -#: builtin/fetch.c:111 builtin/pull.c:191 +#: builtin/fetch.c:161 +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "" + +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:112 builtin/pull.c:192 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "controlar a obtenรงรฃo recursiva de submรณdulos" -#: builtin/fetch.c:116 builtin/pull.c:200 +#: builtin/fetch.c:168 +#, fuzzy +msgid "write fetched references to the FETCH_HEAD file" +msgstr "escrever o arquivo para este ficheiro" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "manter o pacote transferido" -#: builtin/fetch.c:118 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "permitir a atualizaรงรฃo da referรชncia HEAD" -#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "aprofundar o histรณrico de um clone raso" -#: builtin/fetch.c:123 +#: builtin/fetch.c:176 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "aprofundar o histรณrico de repositรณrio raso com base na data" -#: builtin/fetch.c:129 builtin/pull.c:206 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "converter num repositรณrio completo" -#: builtin/fetch.c:131 builtin/log.c:1440 -msgid "dir" -msgstr "dir" - -#: builtin/fetch.c:132 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "preceder isto ao caminho do submรณdulo" -#: builtin/fetch.c:135 -msgid "default mode for recursion" -msgstr "modo recursivo por omissรฃo" +#: builtin/fetch.c:188 +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "" -#: builtin/fetch.c:137 builtin/pull.c:209 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "aceitar referรชncia que atualizem .git/shallow" -#: builtin/fetch.c:138 builtin/pull.c:211 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "mapa de referรชncias" -#: builtin/fetch.c:139 builtin/pull.c:212 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "especificar mapa de referรชncias" -#: builtin/fetch.c:395 +#: builtin/fetch.c:201 builtin/pull.c:240 +msgid "report that we have only objects reachable from this object" +msgstr "" + +#: builtin/fetch.c:204 builtin/fetch.c:206 +#, fuzzy +msgid "run 'maintenance --auto' after fetching" +msgstr "eliminar remotos depois de obter" + +#: builtin/fetch.c:208 builtin/pull.c:243 +msgid "check for forced-updates on all updated branches" +msgstr "" + +#: builtin/fetch.c:210 +#, fuzzy +msgid "write the commit-graph after fetching" +msgstr "eliminar remotos depois de obter" + +#: builtin/fetch.c:212 +#, fuzzy +msgid "accept refspecs from stdin" +msgstr "ler referรชncias do stdin" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "Referรชncia remota HEAD nรฃo encontrada" -#: builtin/fetch.c:513 +#: builtin/fetch.c:677 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "a configuraรงรฃo fetch.ouput contรฉm o valor invรกlido %s" -#: builtin/fetch.c:606 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "objeto %s nรฃo encontrado" -#: builtin/fetch.c:610 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "[atualizado]" -#: builtin/fetch.c:623 builtin/fetch.c:703 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[rejeitado]" -#: builtin/fetch.c:624 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "nรฃo รฉ possรญvel obter no ramo atual" -#: builtin/fetch.c:633 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[tag atualizada]" -#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 -#: builtin/fetch.c:698 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "nรฃo รฉ possรญvel atualizar a referรชncia local" -#: builtin/fetch.c:653 +#: builtin/fetch.c:808 +msgid "would clobber existing tag" +msgstr "" + +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[nova tag]" -#: builtin/fetch.c:656 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[novo ramo]" -#: builtin/fetch.c:659 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[nova referรชncia]" -#: builtin/fetch.c:698 +#: builtin/fetch.c:875 msgid "forced update" msgstr "atualizaรงรฃo forรงada" -#: builtin/fetch.c:703 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "sem avanรงo-rรกpido" -#: builtin/fetch.c:748 +#: builtin/fetch.c:901 +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:905 +#, 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:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s nรฃo enviou todos os objetos necessรกrios\n" -#: builtin/fetch.c:768 +#: builtin/fetch.c:960 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "%s rejeitado, porque as raรญzes rasas nรฃo podem ser atualizadas" -#: builtin/fetch.c:855 builtin/fetch.c:951 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:866 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8107,55 +14577,81 @@ msgstr "" "algumas referรชncias locais nรฃo puderam ser atualizadas; tente executar\n" " 'git remote prune %s' para remover algum ramo antigo em conflito" -#: builtin/fetch.c:921 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr " (%s ficarรก suspenso)" -#: builtin/fetch.c:922 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " (%s ficou suspenso)" -#: builtin/fetch.c:954 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:955 builtin/remote.c:1022 +#: builtin/fetch.c:1195 builtin/remote.c:1113 msgid "(none)" msgstr "(nenhum)" -#: builtin/fetch.c:978 +#: builtin/fetch.c:1218 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Obtenรงรฃo de objetos no ramo atual %s de um repositรณrio nรฃo nu recusada" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1237 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "O valor \"%2$s\" da opรงรฃo \"%1$s\" nรฃo รฉ vรกlido em %3$s" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opรงรฃo \"%s\" ignorada em %s\n" -#: builtin/fetch.c:1076 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "Nรฃo sei como obter de %s" +#: builtin/fetch.c:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "" -#: builtin/fetch.c:1236 +#: builtin/fetch.c:1463 +#, fuzzy +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "" +"o ramo a montante '%s' nรฃo estรก guardado como um ramo de monitorizaรงรฃo remoto" + +#: builtin/fetch.c:1465 +#, fuzzy +msgid "not setting upstream for a remote tag" +msgstr "definir o ramo a montante usado com git pull/status" + +#: builtin/fetch.c:1467 +#, fuzzy +msgid "unknown branch type" +msgstr "objeto de tipo desconhecido %d" + +#: builtin/fetch.c:1469 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" + +#: builtin/fetch.c:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "A obter de %s\n" -#: builtin/fetch.c:1238 builtin/remote.c:96 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Nรฃo foi possรญvel obter de %s" -#: builtin/fetch.c:1256 +#: builtin/fetch.c:1620 +#, fuzzy, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "nรฃo foi possรญvel definir '%s' como '%s'" + +#: builtin/fetch.c:1724 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8163,204 +14659,418 @@ msgstr "" "Nenhum repositรณrio remoto especificado. Especifique um URL ou\n" "o nome remoto a partir do qual as novas revisรตes devem ser obtidas." -#: builtin/fetch.c:1279 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "Deve especificar um nome para a tag." -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "Nรฃo รฉ suportada profundidade negativa em --deepen" -#: builtin/fetch.c:1323 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen e --depth sรฃo mutuamente exclusivos" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "--depth e --unshallow nรฃo podem ser usados juntos" -#: builtin/fetch.c:1330 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "usar --unshallow num repositรณrio completo nรฃo faz sentido" -#: builtin/fetch.c:1352 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "fetch --all nรฃo leva um repositรณrio como argumento" -#: builtin/fetch.c:1354 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all nรฃo faz sentido com especificadores de referรชncia" -#: builtin/fetch.c:1365 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "O remoto ou grupo remoto nรฃo existe: %s" -#: builtin/fetch.c:1373 +#: builtin/fetch.c:1869 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Nรฃo faz sentido obter um grupo e especificar uma referรชncia" -#: builtin/fmt-merge-msg.c:14 +#: builtin/fetch.c:1887 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialclone" +msgstr "" + +#: builtin/fetch.c:1891 +#, fuzzy +msgid "--stdin can only be used when fetching from one remote" +msgstr "A opรงรฃo --exec sรณ pode ser usada em conjunto com --remote" + +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <mensagem>] [--log[=<n>] | --no-log] [--file " "<ficheiro>]" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:18 msgid "populate log with at most <n> entries from shortlog" msgstr "povoar o registo com, no mรกximo, <n> entradas do shortlog" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "alias de --log (obsoleto)" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "texto" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "usar <texto> no inรญcio da mensagem" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "ficheiro a ler" -#: builtin/for-each-ref.c:9 +#: builtin/for-each-ref.c:10 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<opรงรตes>] [<padrรฃo>]" -#: builtin/for-each-ref.c:10 +#: builtin/for-each-ref.c:11 msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <objeto>]" -#: builtin/for-each-ref.c:11 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" +#: builtin/for-each-ref.c:12 +#, fuzzy +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]" -#: builtin/for-each-ref.c:12 +#: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -#: builtin/for-each-ref.c:27 +#: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" msgstr "" "envolver os marcadores de posiรงรฃo em aspas de forma adequada para " "interpretadores de comandos" -#: builtin/for-each-ref.c:29 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "envolver os marcadores de posiรงรฃo em aspas de forma adequada para perl" -#: builtin/for-each-ref.c:31 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "" "envolver os marcadores de posiรงรฃo em aspas de forma adequada para python" -#: builtin/for-each-ref.c:33 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" msgstr "envolver os marcadores de posiรงรฃo em aspas de forma adequada para Tcl" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "show only <n> matched refs" msgstr "mostrar apenas <n> referรชncias correspondidas" -#: builtin/for-each-ref.c:41 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 +#, fuzzy +msgid "respect format colors" +msgstr "formato esperado: %%(color:<cor>)" + +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "imprimir apenas referรชncias que apontem para o objeto fornecido" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "imprimir apenas referenciadas integradas" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "imprimir apenas referรชncias nรฃo integrada" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "imprimir apenas referรชncias que contenham o commit" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" msgstr "imprimir apenas referรชncias que nรฃo contenham o commit" -#: builtin/fsck.c:554 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 +#, fuzzy +msgid "unknown" +msgstr "desconhecido:" + +#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> +#: builtin/fsck.c:101 builtin/fsck.c:121 +#, fuzzy, c-format +msgid "error in %s %s: %s" +msgstr "erro no objeto: %s" + +#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> +#: builtin/fsck.c:115 +#, fuzzy, c-format +msgid "warning in %s %s: %s" +msgstr "nรฃo รฉ possรญvel abrir %s: %s" + +#: builtin/fsck.c:144 builtin/fsck.c:147 +#, c-format +msgid "broken link from %7s %s" +msgstr "" + +#: builtin/fsck.c:156 +#, fuzzy +msgid "wrong object type in link" +msgstr "objeto de tipo desconhecido %d" + +#: builtin/fsck.c:172 +#, c-format +msgid "" +"broken link from %7s %s\n" +" to %7s %s" +msgstr "" + +#: builtin/fsck.c:283 +#, fuzzy, c-format +msgid "missing %s %s" +msgstr "falta o objeto %s de %s" + +#: builtin/fsck.c:310 +#, fuzzy, c-format +msgid "unreachable %s %s" +msgstr "jรก se tem %s (%s)" + +#: builtin/fsck.c:330 +#, fuzzy, c-format +msgid "dangling %s %s" +msgstr "A atualizar %s..%s\n" + +#: builtin/fsck.c:340 +#, fuzzy +msgid "could not create lost-found" +msgstr "nรฃo foi possรญvel criar o ficheiro '%s'" + +#: builtin/fsck.c:351 +#, fuzzy, c-format +msgid "could not finish '%s'" +msgstr "nรฃo foi possรญvel reiniciar '%s'" + +#: builtin/fsck.c:368 +#, fuzzy, c-format +msgid "Checking %s" +msgstr "A verificar objetos" + +#: builtin/fsck.c:406 +#, fuzzy, c-format +msgid "Checking connectivity (%d objects)" +msgstr "A verificar conectividade" + +#: builtin/fsck.c:425 +#, fuzzy, c-format +msgid "Checking %s %s" +msgstr "A verificar o patch %s..." + +#: builtin/fsck.c:430 +msgid "broken links" +msgstr "" + +#: builtin/fsck.c:439 +#, fuzzy, c-format +msgid "root %s" +msgstr "raiz" + +#: builtin/fsck.c:447 +#, c-format +msgid "tagged %s %s (%s) in %s" +msgstr "" + +#: builtin/fsck.c:476 +#, c-format +msgid "%s: object corrupt or missing" +msgstr "" + +#: builtin/fsck.c:501 +#, fuzzy, c-format +msgid "%s: invalid reflog entry %s" +msgstr "referรชncia invรกlida: %s" + +#: builtin/fsck.c:515 +#, fuzzy, c-format +msgid "Checking reflog %s->%s" +msgstr "A verificar a mudanรงa de nome de '%s' para '%s'\n" + +#: builtin/fsck.c:549 +#, fuzzy, c-format +msgid "%s: invalid sha1 pointer %s" +msgstr "linha rasa invรกlida: %s" + +#: builtin/fsck.c:556 +#, fuzzy, c-format +msgid "%s: not a commit" +msgstr "'%s' nรฃo รฉ um commit" + +#: builtin/fsck.c:610 +#, fuzzy +msgid "notice: No default references" +msgstr "nรฃo foi possรญvel eliminar as referรชncias: %s" + +#: builtin/fsck.c:625 +#, fuzzy, c-format +msgid "%s: object corrupt or missing: %s" +msgstr "objeto nรฃo encontrado: %s" + +#: builtin/fsck.c:638 +#, fuzzy, c-format +msgid "%s: object could not be parsed: %s" +msgstr "nรฃo foi possรญvel analisar %s" + +#: builtin/fsck.c:658 +#, fuzzy, c-format +msgid "bad sha1 file: %s" +msgstr "linha rasa invรกlida: %s" + +#: builtin/fsck.c:673 +#, fuzzy +msgid "Checking object directory" +msgstr "A verificar diretรณrios de objetos" + +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "A verificar diretรณrios de objetos" -#: builtin/fsck.c:646 +#: builtin/fsck.c:691 +#, fuzzy, c-format +msgid "Checking %s link" +msgstr "A extrair ficheiros" + +#: builtin/fsck.c:696 builtin/index-pack.c:865 +#, c-format +msgid "invalid %s" +msgstr "invรกlido %s" + +#: builtin/fsck.c:703 +#, fuzzy, c-format +msgid "%s points to something strange (%s)" +msgstr "%s - nรฃo รฉ algo se possa integrar" + +#: builtin/fsck.c:709 +#, c-format +msgid "%s: detached HEAD points at nothing" +msgstr "" + +#: builtin/fsck.c:713 +#, c-format +msgid "notice: %s points to an unborn branch (%s)" +msgstr "" + +#: builtin/fsck.c:725 +#, fuzzy +msgid "Checking cache tree" +msgstr "A verificar o patch %s..." + +#: builtin/fsck.c:730 +#, fuzzy, c-format +msgid "%s: invalid sha1 pointer in cache-tree" +msgstr "Falha ao atualizar a รกrvore de cache principal" + +#: builtin/fsck.c:739 +msgid "non-tree in cache-tree" +msgstr "" + +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opรงรตes>] [<objeto>...]" -#: builtin/fsck.c:652 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "mostrar objetos inalcanรงรกveis" -#: builtin/fsck.c:653 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "mostrar objetos suspensos" -#: builtin/fsck.c:654 +#: builtin/fsck.c:778 msgid "report tags" msgstr "mostrar tags" -#: builtin/fsck.c:655 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "mostrar nรณs raiz" -#: builtin/fsck.c:656 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "considerar objetos do รญndice como nรณs cabeรงa" -#: builtin/fsck.c:657 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "considerar os reflogs como nรณs cabeรงa (predefiniรงรฃo)" -#: builtin/fsck.c:658 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "considerar tambรฉm pacotes e objetos sobressalente" -#: builtin/fsck.c:659 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "verificar sรณ a conetividade" -#: builtin/fsck.c:660 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "ativar verificaรงรฃo mais rigorosa" -#: builtin/fsck.c:662 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "escrever objetos suspensos em .git/lost-found" -#: builtin/fsck.c:663 builtin/prune.c:107 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "mostrar progresso" -#: builtin/fsck.c:664 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "mostrar nomes verbosos de objetos inalcanรงรกveis" -#: builtin/fsck.c:725 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "A verificar objetos" -#: builtin/gc.c:25 +#: builtin/fsck.c:875 +#, fuzzy, c-format +msgid "%s: object missing" +msgstr "mostrar tamanho do objeto" + +#: builtin/fsck.c:886 +#, fuzzy, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "parรขmetro invรกlido na mรกgica 'prefix' do especificador de caminho" + +#: builtin/gc.c:36 msgid "git gc [<options>]" msgstr "git gc [<opรงรตes>]" -#: builtin/gc.c:78 +#: builtin/gc.c:91 #, c-format msgid "Failed to fstat %s: %s" msgstr "falha ao invocar fstat sobre %s: %s" -#: builtin/gc.c:306 +#: builtin/gc.c:127 +#, fuzzy, c-format +msgid "failed to parse '%s' value '%s'" +msgstr "falha ao abrir '%s': %s" + +#: builtin/gc.c:476 builtin/init-db.c:58 #, c-format -msgid "Can't stat %s" -msgstr "nรฃo รฉ possรญvel invocar stat sobre %s" +msgid "cannot stat '%s'" +msgstr "nรฃo รฉ possรญvel invocar stat sobre '%s'" -#: builtin/gc.c:315 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 +#, c-format +msgid "cannot read '%s'" +msgstr "nรฃo รฉ possรญvel ler '%s'" + +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8375,45 +15085,54 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:354 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "eliminar ficheiros nรฃo referenciados" -#: builtin/gc.c:356 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "ser mais minucioso (aumenta o tempo de execuรงรฃo)" -#: builtin/gc.c:357 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "ativar modo auto-gc" -#: builtin/gc.c:358 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "forรงar a execuรงรฃo do gc mesmo que haja outro gc a executar" -#: builtin/gc.c:375 -#, c-format -msgid "Failed to parse gc.logexpiry value %s" +#: builtin/gc.c:549 +msgid "repack all other packs except the largest pack" +msgstr "" + +#: builtin/gc.c:566 +#, fuzzy, c-format +msgid "failed to parse gc.logexpiry value %s" +msgstr "falha ao analisar o valor %s de gc.logexpiry" + +#: builtin/gc.c:577 +#, fuzzy, c-format +msgid "failed to parse prune expiry value %s" msgstr "falha ao analisar o valor %s de gc.logexpiry" -#: builtin/gc.c:403 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "A autocompactar o repositรณrio em segundo plano para obter um melhor " "desempenho.\n" -#: builtin/gc.c:405 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "A autocompactar o repositรณrio para obter um melhor desempenho.\n" -#: builtin/gc.c:406 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Consulte \"git help gc\" para ler sobre manutenรงรฃo manual.\n" -#: builtin/gc.c:427 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8421,270 +15140,357 @@ msgstr "" "gc jรก a executar na mรกquina '%s' pid %<PRIuMAX> (use --force se nรฃo for o " "caso)" -#: builtin/gc.c:471 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Existem demasiados objeto soltos inalcanรงรกveis; execute 'git prune' para os " "remover." -#: builtin/grep.c:25 +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "" + +#: builtin/gc.c:812 +#, fuzzy +msgid "failed to write commit-graph" +msgstr "falha ao escrever objeto de commit" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "" + +#: builtin/gc.c:932 +#, fuzzy, c-format +msgid "task '%s' failed" +msgstr "falha ao mudar o nome de '%s'" + +#: builtin/gc.c:979 +#, fuzzy, c-format +msgid "'%s' is not a valid task" +msgstr "'%s' nรฃo รฉ uma referรชncia vรกlida." + +#: builtin/gc.c:984 +#, fuzzy, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "'%s' nรฃo pode ser usado com %s" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "" + +#: builtin/gc.c:1003 +#, fuzzy +msgid "run a specific task" +msgstr "nenhum caminho especificado" + +#: builtin/gc.c:1026 +#, fuzzy +msgid "git maintenance run [<options>]" +msgstr "git notes prune [<opรงรตes>]" + +#: builtin/gc.c:1037 +#, fuzzy, c-format +msgid "invalid subcommand: %s" +msgstr "commit invรกlido %s" + +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opรงรตes>] [-e] <padrรฃo> [<rev>...] [[--] <caminho>...]" -#: builtin/grep.c:232 +#: builtin/grep.c:225 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: falha ao criar thread: %s" -#: builtin/grep.c:290 +#: builtin/grep.c:279 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "o nรบmero de threads especificado em %2$s รฉ invรกlido (%1$d)" -#: builtin/grep.c:769 builtin/grep.c:810 +#. TRANSLATORS: %s is the configuration +#. variable for tweaking threads, currently +#. grep.threads +#. +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "sem suporte de threads, %s ignorado" + +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "nรฃo foi possรญvel ler a รกrvore (%s)" -#: builtin/grep.c:829 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "nรฃo foi possรญvel efetuar grep de objetos do tipo %s" -#: builtin/grep.c:893 +#: builtin/grep.c:725 #, c-format msgid "switch `%c' expects a numerical value" msgstr "a opรงรฃo '%c' espera um valor numรฉrico" -#: builtin/grep.c:980 +#: builtin/grep.c:824 msgid "search in index instead of in the work tree" msgstr "procurar no รญndice em vez de procurar na รกrvore de trabalho" -#: builtin/grep.c:982 +#: builtin/grep.c:826 msgid "find in contents not managed by git" msgstr "procurar em conteรบdos nรฃo geridos pelo git" -#: builtin/grep.c:984 +#: builtin/grep.c:828 msgid "search in both tracked and untracked files" msgstr "procurar em ficheiros controlados e nรฃo controlados" -#: builtin/grep.c:986 +#: builtin/grep.c:830 msgid "ignore files specified via '.gitignore'" msgstr "ignorar ficheiros especificados via '.gitignore'" -#: builtin/grep.c:988 +#: builtin/grep.c:832 msgid "recursively search in each submodule" msgstr "procurar recursivamente em cada submรณdulo" -#: builtin/grep.c:990 -msgid "basename" -msgstr "nomebase" - -#: builtin/grep.c:991 -msgid "prepend parent project's basename to output" -msgstr "preceder o nomebase do projeto pai na saรญda" - -#: builtin/grep.c:994 +#: builtin/grep.c:835 msgid "show non-matching lines" msgstr "mostrar linhas nรฃo correspondidas" -#: builtin/grep.c:996 +#: builtin/grep.c:837 msgid "case insensitive matching" msgstr "nรฃo diferenciar maiรบsculas de minรบsculas" -#: builtin/grep.c:998 +#: builtin/grep.c:839 msgid "match patterns only at word boundaries" msgstr "corresponder padrรตes apenas a palavras" -#: builtin/grep.c:1000 +#: builtin/grep.c:841 msgid "process binary files as text" msgstr "processar ficheiros binรกrios como texto" -#: builtin/grep.c:1002 +#: builtin/grep.c:843 msgid "don't match patterns in binary files" msgstr "ignorar ficheiros binรกrios" -#: builtin/grep.c:1005 +#: builtin/grep.c:846 msgid "process binary files with textconv filters" msgstr "processar ficheiros binรกrios com filtros textconv" -#: builtin/grep.c:1007 +#: builtin/grep.c:848 +#, fuzzy +msgid "search in subdirectories (default)" +msgstr "eliminar referรชncias soltas (predefiniรงรฃo)" + +#: builtin/grep.c:850 msgid "descend at most <depth> levels" msgstr "descer no mรกximo atรฉ <profundidade>" -#: builtin/grep.c:1011 +#: builtin/grep.c:854 msgid "use extended POSIX regular expressions" msgstr "usar expressรตes regulares estendidas do POSIX" -#: builtin/grep.c:1014 +#: builtin/grep.c:857 msgid "use basic POSIX regular expressions (default)" msgstr "usar expressรตes regulares bรกsicas do POSIX (predefiniรงรฃo)" -#: builtin/grep.c:1017 +#: builtin/grep.c:860 msgid "interpret patterns as fixed strings" msgstr "interpretar padrรตes como cadeias de caracteres fixas" -#: builtin/grep.c:1020 +#: builtin/grep.c:863 msgid "use Perl-compatible regular expressions" msgstr "usar expressรตes regulares compatรญveis com Perl" -#: builtin/grep.c:1023 +#: builtin/grep.c:866 msgid "show line numbers" msgstr "mostrar nรบmeros de linha" -#: builtin/grep.c:1024 +#: builtin/grep.c:867 +#, fuzzy +msgid "show column number of first match" +msgstr "mostrar apenas nomes de ficheiro sem correspondรชncia" + +#: builtin/grep.c:868 msgid "don't show filenames" msgstr "nรฃo mostrar nomes de ficheiro" -#: builtin/grep.c:1025 +#: builtin/grep.c:869 msgid "show filenames" msgstr "mostrar nomes de ficheiro" -#: builtin/grep.c:1027 +#: builtin/grep.c:871 msgid "show filenames relative to top directory" msgstr "mostrar nomes de ficheiro relativamente ao diretรณrio superior" -#: builtin/grep.c:1029 +#: builtin/grep.c:873 msgid "show only filenames instead of matching lines" msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" -#: builtin/grep.c:1031 +#: builtin/grep.c:875 msgid "synonym for --files-with-matches" msgstr "sinรณnimo de --files-with-matches" -#: builtin/grep.c:1034 +#: builtin/grep.c:878 msgid "show only the names of files without match" msgstr "mostrar apenas nomes de ficheiro sem correspondรชncia" -#: builtin/grep.c:1036 +#: builtin/grep.c:880 msgid "print NUL after filenames" msgstr "imprimir NUL depois dos nomes de ficheiro" -#: builtin/grep.c:1038 +#: builtin/grep.c:883 +#, fuzzy +msgid "show only matching parts of a line" +msgstr "mostrar linhas nรฃo correspondidas" + +#: builtin/grep.c:885 msgid "show the number of matches instead of matching lines" msgstr "mostrar o nรบmero de correspondรชncias em vez das linha correspondidas" -#: builtin/grep.c:1039 +#: builtin/grep.c:886 msgid "highlight matches" msgstr "realรงar correspondรชncias" -#: builtin/grep.c:1041 +#: builtin/grep.c:888 msgid "print empty line between matches from different files" msgstr "" "imprimir uma linha em branco entre correspondรชncias de diferentes ficheiros" -#: builtin/grep.c:1043 +#: builtin/grep.c:890 msgid "show filename only once above matches from same file" msgstr "" "mostrar sรณ uma vez o nome do ficheiro acima das correspondรชncias dentro do " "mesmo ficheiro" -#: builtin/grep.c:1046 +#: builtin/grep.c:893 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> linhas de contexto antes e depois das correspondรชncias" -#: builtin/grep.c:1049 +#: builtin/grep.c:896 msgid "show <n> context lines before matches" msgstr "mostrar <n> linhas de contexto antes das correspondรชncias" -#: builtin/grep.c:1051 +#: builtin/grep.c:898 msgid "show <n> context lines after matches" msgstr "mostrar <n> linhas de contexto depois das correspondรชncias" -#: builtin/grep.c:1053 +#: builtin/grep.c:900 msgid "use <n> worker threads" msgstr "usar <n> threads de trabalho" -#: builtin/grep.c:1054 +#: builtin/grep.c:901 msgid "shortcut for -C NUM" msgstr "atalho para -C NUM" -#: builtin/grep.c:1057 +#: builtin/grep.c:904 msgid "show a line with the function name before matches" msgstr "mostrar uma linha com o nome da funรงรฃo antes das correspondรชncias" -#: builtin/grep.c:1059 +#: builtin/grep.c:906 msgid "show the surrounding function" msgstr "mostrar a funรงรฃo circundante" -#: builtin/grep.c:1062 +#: builtin/grep.c:909 msgid "read patterns from file" msgstr "ler padrรตes do ficheiro" -#: builtin/grep.c:1064 +#: builtin/grep.c:911 msgid "match <pattern>" msgstr "procurar <padrรฃo>" -#: builtin/grep.c:1066 +#: builtin/grep.c:913 msgid "combine patterns specified with -e" msgstr "combinar padrรตes especificados com -e" -#: builtin/grep.c:1078 +#: builtin/grep.c:925 msgid "indicate hit with exit status without output" msgstr "indicar padrรฃo encontrado no valor de saรญda, mas nรฃo imprimir" -#: builtin/grep.c:1080 +#: builtin/grep.c:927 msgid "show only matches from files that match all patterns" msgstr "" "mostrar apenas correspondรชncias de ficheiro que tenham todos os padrรตes" -#: builtin/grep.c:1082 +#: builtin/grep.c:929 msgid "show parse tree for grep expression" msgstr "mostrar รกrvore de analise da expressรตes grep" -#: builtin/grep.c:1086 +#: builtin/grep.c:933 msgid "pager" msgstr "paginador" -#: builtin/grep.c:1086 +#: builtin/grep.c:933 msgid "show matching files in the pager" msgstr "mostrar ficheiros com correspondรชncias no paginador" -#: builtin/grep.c:1089 +#: builtin/grep.c:937 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir invocar grep(1) (ignorado nesta compilaรงรฃo)" -#: builtin/grep.c:1153 -msgid "no pattern given." +#: builtin/grep.c:1004 +#, fuzzy +msgid "no pattern given" msgstr "nenhum padrรฃo fornecido." -#: builtin/grep.c:1189 +#: builtin/grep.c:1040 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index ou --untracked nรฃo podem ser usados em revisรตes" -#: builtin/grep.c:1195 +#: builtin/grep.c:1048 #, c-format msgid "unable to resolve revision: %s" msgstr "nรฃo foi possรญvel resolver revisรฃo: %s" -#: builtin/grep.c:1228 builtin/index-pack.c:1485 +#: builtin/grep.c:1078 +#, fuzzy +msgid "--untracked not supported with --recurse-submodules" +msgstr "opรงรฃo nรฃo suportada com --recurse-submodules." + +#: builtin/grep.c:1082 +msgid "invalid option combination, ignoring --threads" +msgstr "" + +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 +#, fuzzy +msgid "no threads support, ignoring --threads" +msgstr "sem suporte de threads, %s ignorado" + +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nรบmero de threads especificado invรกlido (%d)" -#: builtin/grep.c:1251 +#: builtin/grep.c:1122 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager sรณ funciona na รกrvore de trabalho" -#: builtin/grep.c:1274 -msgid "option not supported with --recurse-submodules." -msgstr "opรงรฃo nรฃo suportada com --recurse-submodules." - -#: builtin/grep.c:1280 -msgid "--cached or --untracked cannot be used with --no-index." +#: builtin/grep.c:1148 +#, fuzzy +msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached ou --untracked nรฃo podem ser usados com --no-index." -#: builtin/grep.c:1286 -msgid "--[no-]exclude-standard cannot be used for tracked contents." +#: builtin/grep.c:1154 +#, fuzzy +msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" "--[no-]exclude-standard nรฃo podem ser usados em conteรบdos nรฃo controlados." -#: builtin/grep.c:1294 -msgid "both --cached and trees are given." +#: builtin/grep.c:1162 +#, fuzzy +msgid "both --cached and trees are given" msgstr "--cached e รกrvores foram fornecidos simultaneamente." -#: builtin/hash-object.c:81 +#: builtin/hash-object.c:85 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -8692,93 +15498,99 @@ msgstr "" "git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--" "stdin] [--] <ficheiro>..." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:86 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:94 -msgid "type" -msgstr "tipo" - -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:98 msgid "object type" msgstr "tipo do objeto" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:99 msgid "write the object into the object database" msgstr "escrever o objeto na base de dados de objetos" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:101 msgid "read the object from stdin" msgstr "ler o objeto da entrada padrรฃo" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:103 msgid "store file as is without filters" msgstr "guardar o ficheiro tal como estรก, sem filtros" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:104 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "obter hash de lixo aleatรณrio para criar objetos corrompidos para depurar o " "Git" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:105 msgid "process file as it were from this path" msgstr "processar o ficheiro como se este fosse do caminho indicado" -#: builtin/help.c:42 +#: builtin/help.c:47 msgid "print all available commands" msgstr "imprimir todos os comandos disponรญveis" -#: builtin/help.c:43 +#: builtin/help.c:48 msgid "exclude guides" msgstr "excluir guias" -#: builtin/help.c:44 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "imprimir lista de guias รบteis" -#: builtin/help.c:45 +#: builtin/help.c:50 +#, fuzzy +msgid "print all configuration variable names" +msgstr "nรฃo รฉ possรญvel criar o ficheiro de configuraรงรฃo %s" + +#: builtin/help.c:52 msgid "show man page" msgstr "mostrar pรกgina do manual" -#: builtin/help.c:46 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "mostrar o manual no navegador web" -#: builtin/help.c:48 +#: builtin/help.c:55 msgid "show info page" msgstr "mostrar pรกgina info" -#: builtin/help.c:54 +#: builtin/help.c:57 +#, fuzzy +msgid "print command description" +msgstr "imprimir conteรบdo do commit" + +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]" -#: builtin/help.c:66 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "formato de ajuda nรฃo reconhecido '%s'" -#: builtin/help.c:93 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "Falha ao iniciar emacsclient." -#: builtin/help.c:106 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "Falha ao analisar a versรฃo do emacsclient." -#: builtin/help.c:114 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "a versรฃo do emacsclient '%d' รฉ demasiado antiga (< 22)." -#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "falha ao executar '%s'" -#: builtin/help.c:207 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -8787,7 +15599,7 @@ msgstr "" "'%s': caminho para visualizador de manual nรฃo suportado.\n" "Considere usar 'man.<ferramenta>.cmd'." -#: builtin/help.c:219 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -8796,441 +15608,427 @@ msgstr "" "'%s': comando de visualizador de manual suportado.\n" "Considere usar 'man.<ferramenta>.path'." -#: builtin/help.c:336 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': visualizador de manual desconhecido." -#: builtin/help.c:353 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "nenhum visualizador de manual atendeu o pedido" -#: builtin/help.c:361 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "nenhum visualizador de info atendeu o pedido" -#: builtin/help.c:403 -msgid "Defining attributes per path" -msgstr "Definir atributos por caminho" - -#: builtin/help.c:404 -msgid "Everyday Git With 20 Commands Or So" -msgstr "Diรกrio Git com mais ou menos 20 Comandos" - -#: builtin/help.c:405 -msgid "A Git glossary" -msgstr "Um Glossรกrio do Git" - -#: builtin/help.c:406 -msgid "Specifies intentionally untracked files to ignore" -msgstr "" -"Especificar ficheiros nรฃo controlados para serem intencionalmente ignorados" - -#: builtin/help.c:407 -msgid "Defining submodule properties" -msgstr "Definir propriedades de submรณdulos" - -#: builtin/help.c:408 -msgid "Specifying revisions and ranges for Git" -msgstr "Especificar revisรตes e intervalos do Git" - -#: builtin/help.c:409 -msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" -msgstr "Uma introduรงรฃo ao Git (versรฃo 1.5.1 ou mais recente)" - -#: builtin/help.c:410 -msgid "An overview of recommended workflows with Git" -msgstr "Uma descriรงรฃo geral dos fluxos de trabalho recomendados para o Git" - -#: builtin/help.c:422 -msgid "The common Git guides are:\n" -msgstr "Os guias comuns do Git:\n" - -#: builtin/help.c:440 -#, c-format -msgid "`git %s' is aliased to `%s'" +#: builtin/help.c:520 builtin/help.c:531 git.c:337 +#, fuzzy, c-format +msgid "'%s' is aliased to '%s'" msgstr "'git %s' รฉ um alias de '%s'" -#: builtin/help.c:462 builtin/help.c:479 +#: builtin/help.c:534 git.c:369 +#, fuzzy, c-format +msgid "bad alias.%s string: %s" +msgstr "Valor de branch.%s.mergeoptions incorreto: %s" + +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "utilizaรงรฃo: %s%s" -#: builtin/index-pack.c:154 -#, c-format -msgid "unable to open %s" -msgstr "nรฃo foi possรญvel abrir %s" +#: builtin/help.c:577 +msgid "'git help config' for more information" +msgstr "" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "incompatibilidade de tipo de objeto em %s" -#: builtin/index-pack.c:224 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "o objeto esperado %s nรฃo foi recebido" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objeto %s: tipo esperado %s, obtido %s" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "nรฃo รฉ possรญvel preencher %d byte" msgstr[1] "nรฃo รฉ possรญvel preencher %d bytes" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "fim de ficheiro (EOF) prematuro" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "erro de leitura da entrada" -#: builtin/index-pack.c:292 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "foram usados mais bytes dos que estavam disponรญveis" -#: builtin/index-pack.c:299 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 msgid "pack too large for current definition of off_t" msgstr "pacote demasiado grande para a definiรงรฃo atual de off_t" -#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "o pacote excede o tamanho mรกximo permitido" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:342 builtin/repack.c:254 #, c-format msgid "unable to create '%s'" msgstr "nรฃo foi possรญvel criar '%s'" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "nรฃo รฉ possรญvel abrir o ficheiro de pacote '%s'" -#: builtin/index-pack.c:337 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "a assinatura do pacote nรฃo corresponde" -#: builtin/index-pack.c:339 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "versรฃo de pacote %<PRIu32> nรฃo suportada" -#: builtin/index-pack.c:357 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:479 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "a descompactaรงรฃo retornou %d" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "delta de objeto base com capacidade excedida no valor de offset" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "offset da base delta estรก fora do limite" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "objeto de tipo desconhecido %d" -#: builtin/index-pack.c:575 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "nรฃo รฉ possรญvel invocar pread sobre o ficheiro de pacote" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "fim prematuro de ficheiro de pacote, falta %<PRIuMAX> byte" msgstr[1] "fim prematuro de ficheiro de pacote, faltam %<PRIuMAX> bytes" -#: builtin/index-pack.c:603 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "inconsistรชncia de descompactaรงรฃo grave" -#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 -#: builtin/index-pack.c:816 builtin/index-pack.c:825 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLISรO DE SHA1 COM %s ENCONTRADA!" -#: builtin/index-pack.c:752 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:257 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "nรฃo foi possรญvel ler %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "nรฃo รฉ possรญvel ler informaรงรฃo de objeto existente %s" -#: builtin/index-pack.c:822 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "nรฃo รฉ possรญvel ler o objeto existente %s" -#: builtin/index-pack.c:836 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "objeto blob invรกlido %s" -#: builtin/index-pack.c:850 -#, c-format -msgid "invalid %s" -msgstr "invรกlido %s" - -#: builtin/index-pack.c:853 -msgid "Error in object" -msgstr "Erro no objeto" +#: builtin/index-pack.c:849 builtin/index-pack.c:868 +#, fuzzy +msgid "fsck error in packed object" +msgstr "ignorar objetos compactados" -#: builtin/index-pack.c:855 +#: builtin/index-pack.c:870 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Nem todos os objetos filhos de %s sรฃo alcanรงรกveis" -#: builtin/index-pack.c:927 builtin/index-pack.c:958 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "falha ao aplicar delta" -#: builtin/index-pack.c:1128 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "A receber objetos" -#: builtin/index-pack.c:1128 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "A indexar objetos" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "pacote corrompido (SHA1 nรฃo corresponde)" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "nรฃo รฉ possรญvel invocar fstat sobre o ficheiro de pacote" -#: builtin/index-pack.c:1168 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "pacote com lixo no final" -#: builtin/index-pack.c:1179 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "extrema confusรฃo em parse_pack_objects()" -#: builtin/index-pack.c:1202 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "A resolver deltas" -#: builtin/index-pack.c:1213 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "nรฃo foi possรญvel criar thread: %s" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "extrema confusรฃo" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1288 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "concluรญdo com %d objeto local" msgstr[1] "concluรญdo com %d objetos locais" -#: builtin/index-pack.c:1273 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Soma de verificaรงรฃo inesperada no final de %s (corrupรงรฃo no disco?)" -#: builtin/index-pack.c:1277 +#: builtin/index-pack.c:1304 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "pacote com %d delta nรฃo resolvido" msgstr[1] "pacote com %d deltas nรฃo resolvidos" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "nรฃo รฉ possรญvel compactar objeto acrescentado (%d)" -#: builtin/index-pack.c:1377 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s corrompido" -#: builtin/index-pack.c:1403 -msgid "error while closing pack file" -msgstr "erro ao fechar ficheiro de pacote" - -#: builtin/index-pack.c:1415 +#: builtin/index-pack.c:1444 #, c-format -msgid "cannot write keep file '%s'" +msgid "packfile name '%s' does not end with '.pack'" +msgstr "o nome do ficheiro de pacote '%s' nรฃo termina em '.pack'" + +#: builtin/index-pack.c:1469 +#, fuzzy, c-format +msgid "cannot write %s file '%s'" msgstr "nรฃo รฉ possรญvel escrever o ficheiro de conservaรงรฃo '%s'" -#: builtin/index-pack.c:1423 -#, c-format -msgid "cannot close written keep file '%s'" +#: builtin/index-pack.c:1477 +#, fuzzy, c-format +msgid "cannot close written %s file '%s'" msgstr "nรฃo รฉ possรญvel fechar o ficheiro de conservaรงรฃo '%s' escrito" -#: builtin/index-pack.c:1433 +#: builtin/index-pack.c:1501 +msgid "error while closing pack file" +msgstr "erro ao fechar ficheiro de pacote" + +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "nรฃo รฉ possรญvel guardar ficheiro de pacote" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "nรฃo รฉ possรญvel guardar o ficheiro รญndice" -#: builtin/index-pack.c:1479 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> incorreto" -#: builtin/index-pack.c:1489 builtin/index-pack.c:1686 -#, c-format -msgid "no threads support, ignoring %s" -msgstr "sem suporte de threads, %s ignorado" - -#: builtin/index-pack.c:1547 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Nรฃo รฉ possรญvel abrir o ficheiro de pacote '%s' existente" -#: builtin/index-pack.c:1549 +#: builtin/index-pack.c:1633 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Nรฃo รฉ possรญvel abrir o ficheiro de รญndice do pacote existente de '%s'" -#: builtin/index-pack.c:1596 +#: builtin/index-pack.c:1681 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d objeto nรฃo delta" msgstr[1] "%d objetos nรฃo delta" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1688 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "comprimento de cadeia = %d: %lu objeto" msgstr[1] "comprimento de cadeia = %d: %lu objetos" -#: builtin/index-pack.c:1616 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "o nome do ficheiro de pacote '%s' nรฃo termina em '.pack'" +#: builtin/index-pack.c:1728 +msgid "Cannot come back to cwd" +msgstr "Nรฃo รฉ possรญvel voltar ao diretรณrio de trabalho atual" -#: builtin/index-pack.c:1698 builtin/index-pack.c:1701 -#: builtin/index-pack.c:1717 builtin/index-pack.c:1721 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "%s incorreto" -#: builtin/index-pack.c:1737 +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, fuzzy, c-format +msgid "unknown hash algorithm '%s'" +msgstr "Formato de arquivo desconhecido '%s'" + +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin nรฃo pode ser usado sem --stdin" -#: builtin/index-pack.c:1739 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "--stdin requer um repositรณrio git" -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1825 +#, fuzzy +msgid "--object-format cannot be used with --stdin" +msgstr "--fix-thin nรฃo pode ser usado sem --stdin" + +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "--verify sem nome do ficheiro de pacote indicado" -#: builtin/init-db.c:54 -#, c-format -msgid "cannot stat '%s'" -msgstr "nรฃo รฉ possรญvel invocar stat sobre '%s'" +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 +#, fuzzy +msgid "fsck error in pack objects" +msgstr "erro no objeto: %s" -#: builtin/init-db.c:60 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "nรฃo รฉ possรญvel invocar stat sobre o modelo '%s'" -#: builtin/init-db.c:65 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "nรฃo รฉ possรญvel abrir (opendir) '%s'" -#: builtin/init-db.c:76 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "nรฃo รฉ possรญvel ler (readlink) '%s'" -#: builtin/init-db.c:78 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "nรฃo รฉ possรญvel criar a ligaรงรฃo simbรณlica '%s' '%s'" -#: builtin/init-db.c:84 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "nรฃo รฉ possรญvel copiar '%s' para '%s'" -#: builtin/init-db.c:88 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "modelo %s ignorado" -#: builtin/init-db.c:119 -#, c-format -msgid "templates not found %s" +#: builtin/init-db.c:124 +#, fuzzy, c-format +msgid "templates not found in %s" msgstr "modelos nรฃo encontrados em %s" -#: builtin/init-db.c:134 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "modelos nรฃo copiados de '%s': %s" -#: builtin/init-db.c:327 +#: builtin/init-db.c:274 +#, fuzzy, c-format +msgid "invalid initial branch name: '%s'" +msgstr "Nome de ramo invรกlido: '%s'" + +#: builtin/init-db.c:366 #, c-format msgid "unable to handle file type %d" msgstr "nรฃo foi possรญvel processar o tipo de ficheiro %d" -#: builtin/init-db.c:330 +#: builtin/init-db.c:369 #, c-format msgid "unable to move %s to %s" msgstr "nรฃo foi possรญvel mover %s para %s" -#: builtin/init-db.c:347 builtin/init-db.c:350 +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "" + +#: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format msgid "%s already exists" msgstr "%s jรก existe" -#: builtin/init-db.c:403 +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "" + +#: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Repositรณrio Git partilhado e existente reinicializado em %s%s\n" -#: builtin/init-db.c:404 +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Repositรณrio Git existem reinicializado em %s%s\n" -#: builtin/init-db.c:408 +#: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Repositรณrio Git vazio e partilhado inicializado em %s%s\n" -#: builtin/init-db.c:409 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Repositรณrio Git vazio inicializado em %s%s\n" -#: builtin/init-db.c:457 +#: builtin/init-db.c:529 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -9238,26 +16036,44 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<diretรณrio-modelo>] [--" "shared[=<permissรตes>]] [<diretรณrio>]" -#: builtin/init-db.c:480 +#: builtin/init-db.c:555 msgid "permissions" msgstr "permissรตes" -#: builtin/init-db.c:481 +#: builtin/init-db.c:556 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "especificar que o repositรณrio git serรก partilhado por vรกrios utilizadores" -#: builtin/init-db.c:515 builtin/init-db.c:520 +#: builtin/init-db.c:562 +#, fuzzy +msgid "override the name of the initial branch" +msgstr "substituir o bit executรกvel dos ficheiros listados" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +msgid "hash" +msgstr "" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "" + +#: builtin/init-db.c:571 +#, fuzzy +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--deepen e --depth sรฃo mutuamente exclusivos" + +#: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format msgid "cannot mkdir %s" msgstr "nรฃo รฉ possรญvel criar o diretรณrio %s" -#: builtin/init-db.c:524 +#: builtin/init-db.c:609 builtin/init-db.c:664 #, c-format msgid "cannot chdir to %s" msgstr "nรฃo รฉ possรญvel mudar para o diretรณrio %s" -#: builtin/init-db.c:545 +#: builtin/init-db.c:636 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -9266,12 +16082,17 @@ msgstr "" "%s (ou --work-tree=<diretรณrio>) nรฃo รฉ permitido sem especificar %s (ou --git-" "dir=<diretรณrio>)" -#: builtin/init-db.c:573 +#: builtin/init-db.c:688 #, c-format msgid "Cannot access work tree '%s'" msgstr "Nรฃo รฉ possรญvel aceder ร รกrvore de trabalho '%s'" -#: builtin/interpret-trailers.c:15 +#: builtin/init-db.c:693 +#, fuzzy +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--first-parent รฉ incompatรญvel com --bisect" + +#: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<value>])...] [<file>...]" @@ -9279,353 +16100,491 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<valor>])...] [<ficheiro>...]" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:95 msgid "edit files in place" msgstr "editar ficheiros no local" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:96 msgid "trim empty trailers" msgstr "cortar terminadores vazios" -#: builtin/interpret-trailers.c:28 +#: builtin/interpret-trailers.c:99 +msgid "where to place the new trailer" +msgstr "" + +#: builtin/interpret-trailers.c:101 +#, fuzzy +msgid "action if trailer already exists" +msgstr "a รกrvore de trabalho '%s' jรก existe." + +#: builtin/interpret-trailers.c:103 +msgid "action if trailer is missing" +msgstr "" + +#: builtin/interpret-trailers.c:105 +#, fuzzy +msgid "output only the trailers" +msgstr "cortar terminadores vazios" + +#: builtin/interpret-trailers.c:106 +#, fuzzy +msgid "do not apply config rules" +msgstr "pesquisar variรกveis de configuraรงรฃo" + +#: builtin/interpret-trailers.c:107 +msgid "join whitespace-continued values" +msgstr "" + +#: builtin/interpret-trailers.c:108 +#, fuzzy +msgid "set parsing options" +msgstr "Opรงรตes de integraรงรฃo" + +#: builtin/interpret-trailers.c:110 +msgid "do not treat --- specially" +msgstr "" + +#: builtin/interpret-trailers.c:111 msgid "trailer" msgstr "terminador" -#: builtin/interpret-trailers.c:29 +#: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "terminadores a adicionar" -#: builtin/interpret-trailers.c:42 +#: builtin/interpret-trailers.c:123 +#, fuzzy +msgid "--trailer with --only-input does not make sense" +msgstr "--name-only nรฃo faz sentido" + +#: builtin/interpret-trailers.c:133 msgid "no input file given for in-place editing" msgstr "nenhum ficheiro de entrada fornecido para ediรงรฃo no local" -#: builtin/log.c:44 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opรงรตes>] [<intervalo-de-revisรตes>] [[--] <caminho>...]" -#: builtin/log.c:45 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<opรงรตes>] <objeto>..." -#: builtin/log.c:89 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "opรงรฃo --decorate invรกlida: %s" -#: builtin/log.c:144 -msgid "suppress diff output" -msgstr "suprimir saรญda do diff" - -#: builtin/log.c:145 +#: builtin/log.c:177 msgid "show source" msgstr "mostrar origem" -#: builtin/log.c:146 +#: builtin/log.c:178 msgid "Use mail map file" msgstr "usar ficheiro de mapeamento de correio" -#: builtin/log.c:147 +#: builtin/log.c:181 +#, fuzzy +msgid "only decorate refs that match <pattern>" +msgstr "usar apenas referรชncia que correspondam ao <padrรฃo>" + +#: builtin/log.c:183 +#, fuzzy +msgid "do not decorate refs that match <pattern>" +msgstr "nรฃo considerar tags que correspondam ao <padrรฃo>" + +#: builtin/log.c:184 msgid "decorate options" msgstr "opรงรตes de decoraรงรฃo" -#: builtin/log.c:150 +#: builtin/log.c:187 msgid "Process line range n,m in file, counting from 1" msgstr "processar intervalo de linhas n,m, a contar a partir de 1" -#: builtin/log.c:246 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "Resultado final: %d %s\n" -#: builtin/log.c:493 +#: builtin/log.c:555 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ficheiro incorreto" -#: builtin/log.c:507 builtin/log.c:601 -#, c-format -msgid "Could not read object %s" +#: builtin/log.c:570 builtin/log.c:665 +#, fuzzy, c-format +msgid "could not read object %s" msgstr "Nรฃo foi possรญvel ler o objeto %s" -#: builtin/log.c:625 -#, c-format -msgid "Unknown type: %d" +#: builtin/log.c:690 +#, fuzzy, c-format +msgid "unknown type: %d" msgstr "Tipo desconhecido: %d" -#: builtin/log.c:746 +#: builtin/log.c:839 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "" + +#: builtin/log.c:846 msgid "format.headers without value" msgstr "format.headers sem valor" -#: builtin/log.c:846 +#: builtin/log.c:965 msgid "name of output directory is too long" msgstr "o nome do diretรณrio de saรญda รฉ demasiado longo" -#: builtin/log.c:861 -#, c-format -msgid "Cannot open patch file %s" +#: builtin/log.c:981 +#, fuzzy, c-format +msgid "cannot open patch file %s" msgstr "Nรฃo รฉ possรญvel abrir o ficheiro de patch %s" -#: builtin/log.c:875 -msgid "Need exactly one range." +#: builtin/log.c:998 +#, fuzzy +msgid "need exactly one range" msgstr "ร necessรกrio exatamente um intervalo." -#: builtin/log.c:885 -msgid "Not a range." +#: builtin/log.c:1008 +#, fuzzy +msgid "not a range" msgstr "Nรฃo รฉ um intervalo." -#: builtin/log.c:991 -msgid "Cover letter needs email format" +#: builtin/log.c:1172 +#, fuzzy +msgid "cover letter needs email format" msgstr "A carta de apresentaรงรฃo precisa de um formato de e-mail" -#: builtin/log.c:1071 +#: builtin/log.c:1178 +#, fuzzy +msgid "failed to create cover-letter file" +msgstr "Falha ao criar os ficheiros de saรญda" + +#: builtin/log.c:1259 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to incorreto: %s" -#: builtin/log.c:1098 +#: builtin/log.c:1286 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opรงรตes>] [<desde> | <intervalo-de-revisรตes>]" -#: builtin/log.c:1148 -msgid "Two output directories?" +#: builtin/log.c:1344 +#, fuzzy +msgid "two output directories?" msgstr "Dois diretรณrios de saรญda?" -#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912 -#, c-format -msgid "Unknown commit %s" +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 +#, fuzzy, c-format +msgid "unknown commit %s" msgstr "Commit desconhecido %s" -#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Falha ao resolver '%s' numa referรชncia vรกlida." +#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/replace.c:210 +#, fuzzy, c-format +msgid "failed to resolve '%s' as a valid ref" +msgstr "falha ao resolver '%s' como uma referรชncia vรกlida." -#: builtin/log.c:1270 -msgid "Could not find exact merge base." +#: builtin/log.c:1515 +#, fuzzy +msgid "could not find exact merge base" msgstr "Nรฃo foi possรญvel encontrar a base exata de integraรงรฃo." -#: builtin/log.c:1274 +#: builtin/log.c:1525 +#, fuzzy msgid "" -"Failed to get upstream, if you want to record base commit automatically,\n" +"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." +"Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" "Falha ao obter ramo a montante, se quer gravar o commit base " "automaticamente,\n" "use branch --set-upstream-to para seguir um ramo remoto.\n" "Ou pode especificar o commit base com --base=<base-commit-id> manualmente." -#: builtin/log.c:1294 -msgid "Failed to find exact merge base" +#: builtin/log.c:1548 +#, fuzzy +msgid "failed to find exact merge base" msgstr "Falha ao procurar base exata de integraรงรฃo" -#: builtin/log.c:1305 +#: builtin/log.c:1565 msgid "base commit should be the ancestor of revision list" msgstr "o commit base deve ser o antecessor da lista de revisรตes" -#: builtin/log.c:1309 +#: builtin/log.c:1575 msgid "base commit shouldn't be in revision list" msgstr "o commit base nรฃo deve fazer parte da lista de revisรตes" -#: builtin/log.c:1358 +#: builtin/log.c:1633 msgid "cannot get patch id" msgstr "nรฃo รฉ possรญvel obter o id do patch" -#: builtin/log.c:1415 +#: builtin/log.c:1690 +#, fuzzy +msgid "failed to infer range-diff origin of current series" +msgstr "falha ao guardar ligaรงรฃo ร referรชncia de notas atual (%s)" + +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "" + +#: builtin/log.c:1736 msgid "use [PATCH n/m] even with a single patch" msgstr "usar [PATCH n/m] mesmo com um รบnico patch" -#: builtin/log.c:1418 +#: builtin/log.c:1739 msgid "use [PATCH] even with multiple patches" msgstr "usar [PATCH] mesmo com mรบltiplos patches" -#: builtin/log.c:1422 +#: builtin/log.c:1743 msgid "print patches to standard out" msgstr "imprimir patches para a saรญda padrรฃo" -#: builtin/log.c:1424 +#: builtin/log.c:1745 msgid "generate a cover letter" msgstr "gerar uma carta de apresentaรงรฃo" -#: builtin/log.c:1426 +#: builtin/log.c:1747 msgid "use simple number sequence for output file names" msgstr "" "usar uma sequรชncia de nรบmeros simples para denominar os ficheiros gerados" -#: builtin/log.c:1427 +#: builtin/log.c:1748 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1428 +#: builtin/log.c:1749 msgid "use <sfx> instead of '.patch'" msgstr "usar <sfx> em vez de '.patch'" -#: builtin/log.c:1430 +#: builtin/log.c:1751 msgid "start numbering patches at <n> instead of 1" msgstr "comeรงar a numerar os patches em <n> em vez de 1" -#: builtin/log.c:1432 +#: builtin/log.c:1753 msgid "mark the series as Nth re-roll" msgstr "marcar a sรฉrie como a n-รฉsima reiteraรงรฃo" -#: builtin/log.c:1434 +#: builtin/log.c:1755 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usar [RFC PATCH] em vez de [PATCH]" -#: builtin/log.c:1437 +#: builtin/log.c:1758 +msgid "cover-from-description-mode" +msgstr "" + +#: builtin/log.c:1759 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" + +#: builtin/log.c:1761 msgid "Use [<prefix>] instead of [PATCH]" msgstr "usar [<prefixo>] em vez de [PATCH]" -#: builtin/log.c:1440 +#: builtin/log.c:1764 msgid "store resulting files in <dir>" msgstr "guardar os ficheiros resultantes em <dir>" -#: builtin/log.c:1443 +#: builtin/log.c:1767 msgid "don't strip/add [PATCH]" msgstr "nรฃo tirar/inserir [PATCH]" -#: builtin/log.c:1446 +#: builtin/log.c:1770 msgid "don't output binary diffs" msgstr "nรฃo gerar diffs binรกrios" -#: builtin/log.c:1448 +#: builtin/log.c:1772 msgid "output all-zero hash in From header" msgstr "preencher o cabeรงalho From com hash de zeros" -#: builtin/log.c:1450 +#: builtin/log.c:1774 msgid "don't include a patch matching a commit upstream" msgstr "nรฃo incluir um patch que coincida com um commit a montante" -#: builtin/log.c:1452 +#: builtin/log.c:1776 msgid "show patch format instead of default (patch + stat)" msgstr "" "mostrar no formato de patch em vez de no formato por omissรฃo (patch + stat)" -#: builtin/log.c:1454 +#: builtin/log.c:1778 msgid "Messaging" msgstr "Mensagem" -#: builtin/log.c:1455 +#: builtin/log.c:1779 msgid "header" msgstr "cabeรงalho" -#: builtin/log.c:1456 +#: builtin/log.c:1780 msgid "add email header" msgstr "adicionar cabeรงalho de e-mail" -#: builtin/log.c:1457 builtin/log.c:1459 +#: builtin/log.c:1781 builtin/log.c:1782 msgid "email" msgstr "e-mail" -#: builtin/log.c:1457 +#: builtin/log.c:1781 msgid "add To: header" msgstr "adicionar cabeรงalho To:" -#: builtin/log.c:1459 +#: builtin/log.c:1782 msgid "add Cc: header" msgstr "adicionar cabeรงalho Cc:" -#: builtin/log.c:1461 +#: builtin/log.c:1783 msgid "ident" msgstr "identidade" -#: builtin/log.c:1462 +#: builtin/log.c:1784 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "definir o endereรงo From como <identidade> (ou como identidade do committer " "se nรฃo indicado)" -#: builtin/log.c:1464 +#: builtin/log.c:1786 msgid "message-id" msgstr "id-mensagem" -#: builtin/log.c:1465 +#: builtin/log.c:1787 msgid "make first mail a reply to <message-id>" msgstr "usar o primeiro email para responder a <id-mensagem>" -#: builtin/log.c:1466 builtin/log.c:1469 +#: builtin/log.c:1788 builtin/log.c:1791 msgid "boundary" msgstr "limite" -#: builtin/log.c:1467 +#: builtin/log.c:1789 msgid "attach the patch" msgstr "anexar o patch" -#: builtin/log.c:1470 +#: builtin/log.c:1792 msgid "inline the patch" msgstr "incorporar o patch" -#: builtin/log.c:1474 +#: builtin/log.c:1796 msgid "enable message threading, styles: shallow, deep" msgstr "ativar mensagens por tรณpicos, estilos: shallow (raso), deep (profundo)" -#: builtin/log.c:1476 +#: builtin/log.c:1798 msgid "signature" msgstr "assinatura" -#: builtin/log.c:1477 +#: builtin/log.c:1799 msgid "add a signature" msgstr "adicionar uma assinatura" -#: builtin/log.c:1478 +#: builtin/log.c:1800 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1479 +#: builtin/log.c:1801 msgid "add prerequisite tree info to the patch series" msgstr "adicionar informaรงรฃo prรฉ-requisito da รกrvore ร sรฉrie de patches" -#: builtin/log.c:1481 +#: builtin/log.c:1804 msgid "add a signature from a file" msgstr "adicionar uma assinatura de um ficheiro" -#: builtin/log.c:1482 +#: builtin/log.c:1805 msgid "don't print the patch filenames" msgstr "nรฃo imprimir os nomes dos ficheiros de patch" -#: builtin/log.c:1572 -msgid "-n and -k are mutually exclusive." +#: builtin/log.c:1807 +#, fuzzy +msgid "show progress while generating patches" +msgstr "mostrar medidor de progresso durante a fase de escrita de objetos" + +#: builtin/log.c:1809 +msgid "show changes against <rev> in cover letter or single patch" +msgstr "" + +#: builtin/log.c:1812 +msgid "show changes against <refspec> in cover letter or single patch" +msgstr "" + +#: builtin/log.c:1814 +msgid "percentage by which creation is weighted" +msgstr "" + +#: builtin/log.c:1896 +#, c-format +msgid "invalid ident line: %s" +msgstr "linha de identidade invรกlida: %s" + +#: builtin/log.c:1911 +#, fuzzy +msgid "-n and -k are mutually exclusive" msgstr "-n e -k sรฃo mutuamente exclusivos." -#: builtin/log.c:1574 -msgid "--subject-prefix/--rfc and -k are mutually exclusive." +#: builtin/log.c:1913 +#, fuzzy +msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc e -k sรฃo mutuamente exclusivos." -#: builtin/log.c:1582 +#: builtin/log.c:1921 msgid "--name-only does not make sense" msgstr "--name-only nรฃo faz sentido" -#: builtin/log.c:1584 +#: builtin/log.c:1923 msgid "--name-status does not make sense" msgstr "--name-status nรฃo faz sentido" -#: builtin/log.c:1586 +#: builtin/log.c:1925 msgid "--check does not make sense" msgstr "--check nรฃo faz sentido" -#: builtin/log.c:1616 +#: builtin/log.c:1958 msgid "standard output, or directory, which one?" msgstr "saรญda padrรฃo, ou diretรณrio, qual deles?" -#: builtin/log.c:1618 +#: builtin/log.c:2062 +msgid "--interdiff requires --cover-letter or single patch" +msgstr "" + +#: builtin/log.c:2066 +msgid "Interdiff:" +msgstr "" + +#: builtin/log.c:2067 #, c-format -msgid "Could not create directory '%s'" -msgstr "Nรฃo foi possรญvel criar o diretรณrio '%s'" +msgid "Interdiff against v%d:" +msgstr "" -#: builtin/log.c:1712 +#: builtin/log.c:2073 +msgid "--creation-factor requires --range-diff" +msgstr "" + +#: builtin/log.c:2077 +msgid "--range-diff requires --cover-letter or single patch" +msgstr "" + +#: builtin/log.c:2085 +msgid "Range-diff:" +msgstr "" + +#: builtin/log.c:2086 +#, c-format +msgid "Range-diff against v%d:" +msgstr "" + +#: builtin/log.c:2097 #, c-format msgid "unable to read signature file '%s'" msgstr "nรฃo รฉ possรญvel ler o ficheiro de assinatura '%s'" -#: builtin/log.c:1784 -msgid "Failed to create output files" +#: builtin/log.c:2133 +#, fuzzy +msgid "Generating patches" +msgstr "falha ao editar patch" + +#: builtin/log.c:2177 +#, fuzzy +msgid "failed to create output files" msgstr "Falha ao criar os ficheiros de saรญda" -#: builtin/log.c:1833 +#: builtin/log.c:2236 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]" -#: builtin/log.c:1887 +#: builtin/log.c:2290 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -9633,111 +16592,118 @@ msgstr "" "O ramo remoto seguido nรฃo foi encontrado, especifique <ramo-a-montante> " "manualmente.\n" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opรงรตes>] [<ficheiro>...]" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "identificar o estado do ficheiro com tags" -#: builtin/ls-files.c:512 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "usar letras minรบsculas para ficheiros 'assumido nรฃo alterado' ('assume " "unchanged')" -#: builtin/ls-files.c:514 +#: builtin/ls-files.c:531 +#, fuzzy +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "" +"usar letras minรบsculas para ficheiros 'assumido nรฃo alterado' ('assume " +"unchanged')" + +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "mostrar ficheiros em cache na saรญda (predefiniรงรฃo)" -#: builtin/ls-files.c:516 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "mostrar ficheiros eliminados na saรญda" -#: builtin/ls-files.c:518 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "mostrar ficheiros modificados na saรญda" -#: builtin/ls-files.c:520 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "mostrar outros ficheiros na saรญda" -#: builtin/ls-files.c:522 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "mostrar ficheiros ignorados na saรญda" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "mostrar nome de objetos com conteรบdo preparado, na saรญda" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "" "mostrar ficheiros no sistema de ficheiros que precisam de ser removidos" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "mostrar nomes de diretรณrios 'other' (outro)" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "mostrar finais de linha dos ficheiros" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "nรฃo mostrar diretรณrios vazios" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "mostrar ficheiros nรฃo integrados na saรญda" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "mostrar informaรงรฃo de resolver-desfazer" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "ignorar ficheiros que correspondam ao padrรฃo" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "ler padrรตes de exclusรฃo do <ficheiro>" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "ler padrรตes de exclusรฃo por diretรณrio do <ficheiro>" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "incluir as exclusรตes standard do git" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "mostrar os caminhos relativamente ao diretรณrio superior do projeto" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "percorrer submรณdulos recursivamente" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "se um <ficheiro> nรฃo estiver no รญndice, tratar como erro" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "รกrvore-etc" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "fingir que os caminhos removidos desde <รกrvore-etc> ainda estรฃo presentes" -#: builtin/ls-files.c:560 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "mostrar dados de depuraรงรฃo" -#: builtin/ls-remote.c:7 +#: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" @@ -9747,260 +16713,390 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repositรณrio> [<referรชncias>...]]" -#: builtin/ls-remote.c:52 +#: builtin/ls-remote.c:59 msgid "do not print remote URL" msgstr "nรฃo imprimir URL remoto" -#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 msgid "exec" msgstr "exec" -#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 msgid "path of git-upload-pack on the remote host" msgstr "caminho para git-upload-pack no servidor remoto" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:65 msgid "limit to tags" msgstr "restringir-se a tags" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:66 msgid "limit to heads" msgstr "restringir-se a cabeรงas" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:67 msgid "do not show peeled tags" msgstr "nรฃo mostrar tags descascadas" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:69 msgid "take url.<base>.insteadOf into account" msgstr "ter url.<base>.insteadOf em conta" -#: builtin/ls-remote.c:64 +#: builtin/ls-remote.c:72 msgid "exit with exit code 2 if no matching refs are found" msgstr "terminar com cรณdigo de saรญda 2 se nรฃo forem encontradas referรชncias" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:75 msgid "show underlying ref in addition to the object pointed by it" msgstr "mostrar a referรชncia subjacente em adiรงรฃo ao objeto por ela apontado" -#: builtin/ls-tree.c:28 +#: builtin/ls-tree.c:30 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<opรงรตes>] <รกrvore-etc> [<caminho>...]" -#: builtin/ls-tree.c:126 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "mostrar apenas รกrvores" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "percorrer as subรกrvores recursivamente" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "mostrar รกrvores ao percorrer" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "terminar entradas com o byte NUL" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "incluir dimensรฃo dos objetos" -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "listar apenas os nomes de ficheiro" -#: builtin/ls-tree.c:141 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "usar nomes de caminho completos" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "mostrar a รกrvore completa; nรฃo apenas o diretรณrio atual (implica --full-name)" -#: builtin/merge.c:46 +#: builtin/mailsplit.c:241 +#, c-format +msgid "empty mbox: '%s'" +msgstr "" + +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <commit> <commit>..." + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <commit>..." + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <commit>..." + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <commit> <commit>" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <referรชncia> [<commit>]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "mostrar todos os antecessores" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "encontrar antecessores de uma รบnica integraรงรฃo com n pontos" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "listar revisรตes nรฃo alcanรงรกveis a partir de outras" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "o primeiro รฉ antecessor do segundo?" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "" +"descobrir onde foi que o <commit> divergiu usando o reflog da <referรชncia>" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" +"git merge-file [<opรงรตes>] [-L <nome1> [-L <orig> [-L <nome2>]]] <ficheiro1> " +"<ficheiro-orig> <ficheiro2>" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "enviar resultados para a saรญda padrรฃo" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "usar integraรงรฃo baseada em diff3" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "usar a nossa versรฃo em caso de conflito" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "usar a versรฃo deles em caso de conflito" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "usar a uniรฃo das versรตes em caso de conflito" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "usar este comprimento de marcador para os conflitos" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "nรฃo alertar sobre conflitos" + +#: builtin/merge-file.c:47 +msgid "set labels for file1/orig-file/file2" +msgstr "definir identificares para ficheiro1/ficheiro-orig/ficheiro2" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "opรงรฃo desconhecido %s" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "nรฃo foi possรญvel analisar o objeto '%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] "nรฃo รฉ possรญvel processar mais do que %d base. Ignorar %s." +msgstr[1] "nรฃo รฉ possรญvel processar mais do que %d bases. Ignorar %s." + +#: builtin/merge-recursive.c:65 +msgid "not handling anything other than two heads merge." +msgstr "nรฃo se pode processar outra coisa senรฃo integraรงรฃo de duas cabeรงas." + +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "nรฃo foi possรญvel resolver a referรชncia %s" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" +msgstr "A integrar %s com %s\n" + +#: builtin/merge.c:56 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opรงรตes>] [<commit>...]" -#: builtin/merge.c:47 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:48 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:103 +#: builtin/merge.c:120 msgid "switch `m' requires a value" msgstr "a opรงรฃo 'm' requer um valor" -#: builtin/merge.c:140 +#: builtin/merge.c:143 +#, fuzzy, c-format +msgid "option `%s' requires a value" +msgstr "a opรงรฃo '%s' requer um valor" + +#: builtin/merge.c:189 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Estratรฉgia de integraรงรฃo '%s' nรฃo encontrada.\n" -#: builtin/merge.c:141 +#: builtin/merge.c:190 #, c-format msgid "Available strategies are:" msgstr "Estratรฉgias disponรญveis:" -#: builtin/merge.c:146 +#: builtin/merge.c:195 #, c-format msgid "Available custom strategies are:" msgstr "Estratรฉgias personalizadas disponรญveis:" -#: builtin/merge.c:196 builtin/pull.c:127 +#: builtin/merge.c:246 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "nรฃo apresentar um diffstat ao fim da integraรงรฃo" -#: builtin/merge.c:199 builtin/pull.c:130 +#: builtin/merge.c:249 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "mostrar um diffstat ao fim da integraรงรฃo" -#: builtin/merge.c:200 builtin/pull.c:133 +#: builtin/merge.c:250 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(sinรณnimo de --stat)" -#: builtin/merge.c:202 builtin/pull.c:136 +#: builtin/merge.c:252 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "adicionar (no mรกximo <n>) entradas do shortlog ร mensagem de commit da " "integraรงรฃo" -#: builtin/merge.c:205 builtin/pull.c:139 +#: builtin/merge.c:255 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "criar um รบnico commit em vez de realizar uma integraรงรฃo" -#: builtin/merge.c:207 builtin/pull.c:142 +#: builtin/merge.c:257 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar um commit se a integraรงรฃo for bem sucedida (predefiniรงรฃo)" -#: builtin/merge.c:209 builtin/pull.c:145 +#: builtin/merge.c:259 builtin/pull.c:154 msgid "edit message before committing" msgstr "editar a mensagem antes de submeter" -#: builtin/merge.c:210 +#: builtin/merge.c:261 msgid "allow fast-forward (default)" msgstr "permitir avanรงo rรกpido (predefiniรงรฃo)" -#: builtin/merge.c:212 builtin/pull.c:151 +#: builtin/merge.c:263 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "abortar se nรฃo รฉ possรญvel efetuar avanรงo rรกpido" -#: builtin/merge.c:216 builtin/pull.c:154 +#: builtin/merge.c:267 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar se o commit tem uma assinatura GPG vรกlida" -#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 -#: builtin/revert.c:108 +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 msgid "strategy" msgstr "estratรฉgia" -#: builtin/merge.c:218 builtin/pull.c:159 +#: builtin/merge.c:269 builtin/pull.c:169 msgid "merge strategy to use" msgstr "estratรฉgia de integraรงรฃo a usar" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option=value" msgstr "opรงรฃo=valor" -#: builtin/merge.c:220 builtin/pull.c:163 +#: builtin/merge.c:271 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "opรงรตes da estratรฉgia de integraรงรฃo selecionada" -#: builtin/merge.c:222 +#: builtin/merge.c:273 msgid "merge commit message (for a non-fast-forward merge)" msgstr "mensagem de commit (de integraรงรฃo nรฃo suscetรญvel a avanรงo rรกpido)" -#: builtin/merge.c:226 +#: builtin/merge.c:280 msgid "abort the current in-progress merge" msgstr "abortar integraรงรฃo em curso" -#: builtin/merge.c:228 +#: builtin/merge.c:282 +#, fuzzy +msgid "--abort but leave index and working tree alone" +msgstr "repor HEAD, รญndice e รกrvore de trabalho" + +#: builtin/merge.c:284 msgid "continue the current in-progress merge" msgstr "continuar a integraรงรฃo em curso" -#: builtin/merge.c:230 builtin/pull.c:170 +#: builtin/merge.c:286 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "permitir integraรงรฃo de histรณricos nรฃo relacionados" -#: builtin/merge.c:258 +#: builtin/merge.c:293 +#, fuzzy +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "ignorar pre-commit e commit-msg hooks" + +#: builtin/merge.c:310 msgid "could not run stash." msgstr "nรฃo foi possรญvel executar o comando stash." -#: builtin/merge.c:263 +#: builtin/merge.c:315 msgid "stash failed" msgstr "falha ao executar o comando stash" -#: builtin/merge.c:268 +#: builtin/merge.c:320 #, c-format msgid "not a valid object: %s" msgstr "nome de objeto invรกlido: %s" -#: builtin/merge.c:287 builtin/merge.c:304 +#: builtin/merge.c:342 builtin/merge.c:359 msgid "read-tree failed" msgstr "falha ao executar o comando read-tree" -#: builtin/merge.c:334 +#: builtin/merge.c:389 msgid " (nothing to squash)" msgstr " (nรฃo hรก nada para esmagar)" -#: builtin/merge.c:345 +#: builtin/merge.c:400 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit esmagado -- HEAD nรฃo atualizada\n" -#: builtin/merge.c:395 +#: builtin/merge.c:450 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Nenhuma mensagem de integraรงรฃo -- HEAD nรฃo atualizada\n" -#: builtin/merge.c:446 +#: builtin/merge.c:501 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' nรฃo aponta para um commit" -#: builtin/merge.c:536 +#: builtin/merge.c:588 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Valor de branch.%s.mergeoptions incorreto: %s" -#: builtin/merge.c:656 +#: builtin/merge.c:713 msgid "Not handling anything other than two heads merge." msgstr "Nรฃo se processa outra coisa senรฃo incorporaรงรฃo de duas cabeรงas." -#: builtin/merge.c:670 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opรงรฃo desconhecida de merge-recursive: -X%s" -#: builtin/merge.c:685 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "nรฃo foi possรญvel escrever %s" -#: builtin/merge.c:737 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "Nรฃo foi possรญvel ler '%s'" -#: builtin/merge.c:746 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Commit de integraรงรฃo nรฃo realizado; use 'git commit' para concluir a " "integraรงรฃo.\n" -#: builtin/merge.c:752 -#, c-format +#: builtin/merge.c:808 +#, fuzzy 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" -"Lines starting with '%c' will be ignored, and an empty message aborts\n" -"the commit.\n" msgstr "" "Introduza uma mensagem de commit, explicando por que esta integraรงรฃo รฉ " "necessรกrio,\n" @@ -10009,75 +17105,90 @@ msgstr "" "Linhas comeรงadas com '%c' sรฃo ignoradas e uma mensagem vazia\n" "aborta o commit.\n" -#: builtin/merge.c:776 +#: builtin/merge.c:813 +#, fuzzy +msgid "An empty message aborts the commit.\n" +msgstr "editar a mensagem antes de submeter" + +#: builtin/merge.c:816 +#, fuzzy, c-format +msgid "" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" +"Introduza a mensagem de commit das suas alteraรงรตes.\n" +"Linhas comeรงadas com '%c' serรฃo ignoradas, e uma mensagem vazia\n" +"aborta o commit.\n" + +#: builtin/merge.c:869 msgid "Empty commit message." msgstr "Mensagem de commit vazia." -#: builtin/merge.c:796 +#: builtin/merge.c:884 #, c-format msgid "Wonderful.\n" msgstr "Maravilhoso.\n" -#: builtin/merge.c:851 +#: builtin/merge.c:945 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Falha ao realizar integraรงรฃo automรกtica; corrija os conflitos e submeta o " "resultado.\n" -#: builtin/merge.c:890 +#: builtin/merge.c:984 msgid "No current branch." msgstr "Nenhum ramo atual." -#: builtin/merge.c:892 +#: builtin/merge.c:986 msgid "No remote for the current branch." msgstr "Nรฃo hรก um remoto para o ramo atual." -#: builtin/merge.c:894 +#: builtin/merge.c:988 msgid "No default upstream defined for the current branch." msgstr "Nรฃo estรก definido nenhum ramo a montante para o ramo atual." -#: builtin/merge.c:899 +#: builtin/merge.c:993 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Nenhum ramo de monitorizaรงรฃo remoto seguido por %s de %s" -#: builtin/merge.c:946 +#: builtin/merge.c:1050 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor '%s' incorreto no ambiente '%s'" -#: builtin/merge.c:1020 -#, c-format -msgid "could not close '%s'" -msgstr "nรฃo foi possรญvel fechar '%s'" - -#: builtin/merge.c:1047 +#: builtin/merge.c:1153 #, c-format msgid "not something we can merge in %s: %s" msgstr "nรฃo se pode integrar em %s: %s" -#: builtin/merge.c:1081 +#: builtin/merge.c:1187 msgid "not something we can merge" msgstr "nรฃo se pode integrar" -#: builtin/merge.c:1146 +#: builtin/merge.c:1291 msgid "--abort expects no arguments" msgstr "--abort nรฃo leva argumentos" -#: builtin/merge.c:1150 +#: builtin/merge.c:1295 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Nรฃo hรก nenhuma integraรงรฃo para se abortar (MERGE_HEAD nรฃo presente)." -#: builtin/merge.c:1162 +#: builtin/merge.c:1313 +#, fuzzy +msgid "--quit expects no arguments" +msgstr "--abort nรฃo leva argumentos" + +#: builtin/merge.c:1326 msgid "--continue expects no arguments" msgstr "--continue nรฃo leva argumentos" -#: builtin/merge.c:1166 +#: builtin/merge.c:1330 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Nรฃo hรก nenhuma integraรงรฃo em curso (MERGE_HEAD nรฃo presente)." -#: builtin/merge.c:1182 +#: builtin/merge.c:1346 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10085,7 +17196,7 @@ msgstr "" "Nรฃo concluiu a integraรงรฃo (MERGE_HEAD presente).\n" "Submeta as suas alteraรงรตes antes de integrar." -#: builtin/merge.c:1189 +#: builtin/merge.c:1353 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10093,393 +17204,300 @@ msgstr "" "Cherry-pick nรฃo concluรญdo (CHERRY_PICK_HEAD presente).\n" "Submeta as suas alteraรงรตes antes de integrar." -#: builtin/merge.c:1192 +#: builtin/merge.c:1356 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Cherry-pick nรฃo concluรญdo (CHERRY_PICK_HEAD presente)." -#: builtin/merge.c:1201 +#: builtin/merge.c:1370 msgid "You cannot combine --squash with --no-ff." msgstr "Nรฃo รฉ possรญvel combinar --squash e --no-ff." -#: builtin/merge.c:1209 +#: builtin/merge.c:1372 +#, fuzzy +msgid "You cannot combine --squash with --commit." +msgstr "Nรฃo รฉ possรญvel combinar --squash e --no-ff." + +#: builtin/merge.c:1388 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Nenhum commit especificado e merge.defaultToUpstream nรฃo definido." -#: builtin/merge.c:1226 +#: builtin/merge.c:1405 msgid "Squash commit into empty head not supported yet" msgstr "Esmagar um commit numa cabeรงa vazia ainda nรฃo รฉ suportado" -#: builtin/merge.c:1228 +#: builtin/merge.c:1407 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Nรฃo faz sentido submeter de modo nรฃo suscetรญvel a avanรงo rรกpido, numa cabeรงa " "vazia" -#: builtin/merge.c:1233 +#: builtin/merge.c:1412 #, c-format msgid "%s - not something we can merge" msgstr "%s - nรฃo รฉ algo se possa integrar" -#: builtin/merge.c:1235 +#: builtin/merge.c:1414 msgid "Can merge only exactly one commit into empty head" msgstr "Sรณ se pode integrar exatamente um commit numa cabeรงa vazia" -#: builtin/merge.c:1269 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "" -"A assinatura GPG do commit %s, alegadamente assinada por %s, nรฃo รฉ de " -"confianรงa." - -#: builtin/merge.c:1272 -#, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "" -"A assinatura GPG do commit %s, alegadamente assinada por %s, estรก incorreta." - -#: builtin/merge.c:1275 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "O commit %s nรฃo tem uma assinatura GPG." - -#: builtin/merge.c:1278 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "A assinatura GPG do commit %s por %s estรก correta\n" - -#: builtin/merge.c:1340 +#: builtin/merge.c:1495 msgid "refusing to merge unrelated histories" msgstr "integraรงรฃo de histรณricos nรฃo relacionados recusada" -#: builtin/merge.c:1349 -msgid "Already up-to-date." +#: builtin/merge.c:1504 +#, fuzzy +msgid "Already up to date." msgstr "Jรก estรก atualizado." -#: builtin/merge.c:1359 +#: builtin/merge.c:1514 #, c-format msgid "Updating %s..%s\n" msgstr "A atualizar %s..%s\n" -#: builtin/merge.c:1400 +#: builtin/merge.c:1560 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "A tentar integraรงรฃo mesmo trivial no interior do รญndice...\n" -#: builtin/merge.c:1407 +#: builtin/merge.c:1567 #, c-format msgid "Nope.\n" msgstr "Nรฃo.\n" -#: builtin/merge.c:1432 -msgid "Already up-to-date. Yeeah!" +#: builtin/merge.c:1592 +#, fuzzy +msgid "Already up to date. Yeeah!" msgstr "Jรก estรก atualizado. Sim!" -#: builtin/merge.c:1438 +#: builtin/merge.c:1598 msgid "Not possible to fast-forward, aborting." msgstr "Nรฃo รฉ possรญvel avanรงar rapidamente, a abortar." -#: builtin/merge.c:1461 builtin/merge.c:1540 +#: builtin/merge.c:1626 builtin/merge.c:1691 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "A recuar a รกrvore ao seu estado original...\n" -#: builtin/merge.c:1465 +#: builtin/merge.c:1630 #, c-format msgid "Trying merge strategy %s...\n" msgstr "A tentar a estratรฉgia de integraรงรฃo %s...\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1682 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Nenhuma estratรฉgia de integraรงรฃo conseguiu processar a integraรงรฃo.\n" -#: builtin/merge.c:1533 +#: builtin/merge.c:1684 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Falha ao integrar com a estratรฉgia %s.\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1693 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "A usar %s para preparar resoluรงรฃo manual.\n" -#: builtin/merge.c:1554 +#: builtin/merge.c:1707 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "A integraรงรฃo automรกtica foi bem sucedida; interrompida antes de submeter " "como solicitado\n" -#: builtin/merge-base.c:29 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <commit> <commit>..." - -#: builtin/merge-base.c:30 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <commit>..." - -#: builtin/merge-base.c:31 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <commit>..." - -#: builtin/merge-base.c:32 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <commit> <commit>" - -#: builtin/merge-base.c:33 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <referรชncia> [<commit>]" +#: builtin/mktree.c:66 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/merge-base.c:217 -msgid "output all common ancestors" -msgstr "mostrar todos os antecessores" +#: builtin/mktree.c:154 +msgid "input is NUL terminated" +msgstr "a entrada termina com NUL" -#: builtin/merge-base.c:219 -msgid "find ancestors for a single n-way merge" -msgstr "encontrar antecessores de uma รบnica integraรงรฃo com n pontos" +#: builtin/mktree.c:155 builtin/write-tree.c:26 +msgid "allow missing objects" +msgstr "permitir objetos nรฃo presentes" -#: builtin/merge-base.c:221 -msgid "list revs not reachable from others" -msgstr "listar revisรตes nรฃo alcanรงรกveis a partir de outras" +#: builtin/mktree.c:156 +msgid "allow creation of more than one tree" +msgstr "permitir a criaรงรฃo de mais do que uma รกrvore" -#: builtin/merge-base.c:223 -msgid "is the first one ancestor of the other?" -msgstr "o primeiro รฉ antecessor do segundo?" +#: builtin/multi-pack-index.c:9 +msgid "" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" +msgstr "" -#: builtin/merge-base.c:225 -msgid "find where <commit> forked from reflog of <ref>" +#: builtin/multi-pack-index.c:26 +msgid "object directory containing set of packfile and pack-index pairs" msgstr "" -"descobrir onde foi que o <commit> divergiu usando o reflog da <referรชncia>" -#: builtin/merge-file.c:8 +#: builtin/multi-pack-index.c:29 msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" +"during repack, collect pack-files of smaller size into a batch that is " +"larger than this size" msgstr "" -"git merge-file [<opรงรตes>] [-L <nome1> [-L <orig> [-L <nome2>]]] <ficheiro1> " -"<ficheiro-orig> <ficheiro2>" -#: builtin/merge-file.c:32 -msgid "send results to standard output" -msgstr "enviar resultados para a saรญda padrรฃo" - -#: builtin/merge-file.c:33 -msgid "use a diff3 based merge" -msgstr "usar integraรงรฃo baseada em diff3" - -#: builtin/merge-file.c:34 -msgid "for conflicts, use our version" -msgstr "usar a nossa versรฃo em caso de conflito" - -#: builtin/merge-file.c:36 -msgid "for conflicts, use their version" -msgstr "usar a versรฃo deles em caso de conflito" - -#: builtin/merge-file.c:38 -msgid "for conflicts, use a union version" -msgstr "usar a uniรฃo das versรตes em caso de conflito" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use this marker size" -msgstr "usar este comprimento de marcador para os conflitos" - -#: builtin/merge-file.c:42 -msgid "do not warn about conflicts" -msgstr "nรฃo alertar sobre conflitos" - -#: builtin/merge-file.c:44 -msgid "set labels for file1/orig-file/file2" -msgstr "definir identificares para ficheiro1/ficheiro-orig/ficheiro2" - -#: builtin/merge-recursive.c:45 -#, c-format -msgid "unknown option %s" -msgstr "opรงรฃo desconhecido %s" - -#: builtin/merge-recursive.c:51 -#, c-format -msgid "could not parse object '%s'" -msgstr "nรฃo foi possรญvel analisar o objeto '%s'" - -#: builtin/merge-recursive.c:55 -#, c-format -msgid "cannot handle more than %d base. Ignoring %s." -msgid_plural "cannot handle more than %d bases. Ignoring %s." -msgstr[0] "nรฃo รฉ possรญvel processar mais do que %d base. Ignorar %s." -msgstr[1] "nรฃo รฉ possรญvel processar mais do que %d bases. Ignorar %s." - -#: builtin/merge-recursive.c:63 -msgid "not handling anything other than two heads merge." -msgstr "nรฃo se pode processar outra coisa senรฃo integraรงรฃo de duas cabeรงas." - -#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 -#, c-format -msgid "could not resolve ref '%s'" -msgstr "nรฃo foi possรญvel resolver a referรชncia %s" - -#: builtin/merge-recursive.c:77 -#, c-format -msgid "Merging %s with %s\n" -msgstr "A integrar %s com %s\n" - -#: builtin/mktree.c:65 -msgid "git mktree [-z] [--missing] [--batch]" -msgstr "git mktree [-z] [--missing] [--batch]" - -#: builtin/mktree.c:152 -msgid "input is NUL terminated" -msgstr "a entrada termina com NUL" +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 +#, fuzzy +msgid "too many arguments" +msgstr "Demasiados argumentos." -#: builtin/mktree.c:153 builtin/write-tree.c:24 -msgid "allow missing objects" -msgstr "permitir objetos nรฃo presentes" +#: builtin/multi-pack-index.c:60 +msgid "--batch-size option is only for 'repack' subcommand" +msgstr "" -#: builtin/mktree.c:154 -msgid "allow creation of more than one tree" -msgstr "permitir a criaรงรฃo de mais do que uma รกrvore" +#: builtin/multi-pack-index.c:69 +#, fuzzy, c-format +msgid "unrecognized subcommand: %s" +msgstr "subcomando desconhecido: %s" -#: builtin/mv.c:16 +#: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<opรงรตes>] <origem>... <destino>" -#: builtin/mv.c:82 +#: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "O diretรณrio %s estรก no รญndice porรฉm nenhum submรณdulo?" -#: builtin/mv.c:84 builtin/rm.c:290 +#: builtin/mv.c:85 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Prepare as suas alteraรงรตes em .gitmodules ou esconda-as para prosseguir" -#: builtin/mv.c:102 +#: builtin/mv.c:103 #, c-format msgid "%.*s is in index" msgstr "%.*s estรก no รญndice" -#: builtin/mv.c:124 +#: builtin/mv.c:125 msgid "force move/rename even if target exists" msgstr "forรงar mover/mudar o nome mesmo que o destino exista" -#: builtin/mv.c:125 +#: builtin/mv.c:127 msgid "skip move/rename errors" msgstr "ignorar erros ao mover/mudar o nome" -#: builtin/mv.c:167 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "o destino '%s' nรฃo รฉ um diretรณrio" -#: builtin/mv.c:178 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "A verificar a mudanรงa de nome de '%s' para '%s'\n" -#: builtin/mv.c:182 +#: builtin/mv.c:185 msgid "bad source" msgstr "origem incorreta" -#: builtin/mv.c:185 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "nรฃo รฉ possรญvel mover um diretรณrio para dentro de si prรณprio" -#: builtin/mv.c:188 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "nรฃo รฉ possรญvel mover um diretรณrio para um ficheiro" -#: builtin/mv.c:197 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "o diretรณrio de origem estรก vazio" -#: builtin/mv.c:222 +#: builtin/mv.c:225 msgid "not under version control" msgstr "nรฃo estรก no controlo de versรตes" -#: builtin/mv.c:225 +#: builtin/mv.c:227 +msgid "conflicted" +msgstr "" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "o destino jรก existe" -#: builtin/mv.c:233 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "a substituir '%s'" -#: builtin/mv.c:236 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "Nรฃo รฉ possรญvel substituir" -#: builtin/mv.c:239 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "mรบltiplas origens para o mesmo destino" -#: builtin/mv.c:241 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "o diretรณrio de destino nรฃo existe" -#: builtin/mv.c:248 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, origem=%s, destino=%s" -#: builtin/mv.c:269 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "A mudar de nome de %s para %s\n" -#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 +#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "falha ao mudar o nome de '%s'" -#: builtin/name-rev.c:289 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opรงรตes>] <commit>..." -#: builtin/name-rev.c:290 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opรงรตes>] --all" -#: builtin/name-rev.c:291 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opรงรตes>] --stdin" -#: builtin/name-rev.c:346 -msgid "print only names (no SHA-1)" -msgstr "imprimir apenas nomes (sem SHA-1)" +#: builtin/name-rev.c:524 +#, fuzzy +msgid "print only ref-based names (no object names)" +msgstr "imprimir apenas os ramos do objeto" -#: builtin/name-rev.c:347 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "usar apenas tags para designar commits" -#: builtin/name-rev.c:349 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "usar apenas referรชncia que correspondam ao <padrรฃo>" -#: builtin/name-rev.c:351 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ignorar referรชncias que correspondam ao <padrรฃo>" -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "listar todos os commits alcanรงรกveis a partir de todas as referรชncias" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "ler da entrada padrรฃo" -#: builtin/name-rev.c:355 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "permitir imprimir nomes 'indefinidos' (predefiniรงรฃo)" -#: builtin/name-rev.c:361 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "desreferenciar tags na entrada (uso interno)" -#: builtin/notes.c:25 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <notes-ref>] [list [<objeto>]]" -#: builtin/notes.c:26 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -10487,11 +17505,11 @@ msgstr "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F " "<ficheiro> | (-c | -C) <objeto>] [<objeto>]" -#: builtin/notes.c:27 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <notes-ref>] copy [-f] <de-objeto> <para-objeto>" -#: builtin/notes.c:28 +#: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -10499,203 +17517,200 @@ msgstr "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F " "<ficheiro> | (-c | -C) <objeto>] [<objeto>]" -#: builtin/notes.c:29 +#: builtin/notes.c:32 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <notes-ref>] edit [--allow-empty] [<objeto>]" -#: builtin/notes.c:30 +#: builtin/notes.c:33 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <notes-ref>] show [<objeto>]" -#: builtin/notes.c:31 +#: builtin/notes.c:34 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <estratรฉgia>] <notes-ref>" -#: builtin/notes.c:32 +#: builtin/notes.c:35 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:33 +#: builtin/notes.c:36 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <notes-ref>] remove [<objeto>...]" -#: builtin/notes.c:35 -msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +#: builtin/notes.c:38 +#, fuzzy +msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" msgstr "git notes [--ref <notes-ref>] prune [-n | -v]" -#: builtin/notes.c:36 +#: builtin/notes.c:39 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <notes-ref>] get-ref" -#: builtin/notes.c:41 +#: builtin/notes.c:44 msgid "git notes [list [<object>]]" msgstr "git notes [list [<objeto>]]" -#: builtin/notes.c:46 +#: builtin/notes.c:49 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<opรงรตes>] [<objeto>]" -#: builtin/notes.c:51 +#: builtin/notes.c:54 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<opรงรตes>] <de-objeto> <para-objeto>" -#: builtin/notes.c:52 +#: builtin/notes.c:55 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<de-objeto> <para-objeto>]..." -#: builtin/notes.c:57 +#: builtin/notes.c:60 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<opรงรตes>] [<objeto>]" -#: builtin/notes.c:62 +#: builtin/notes.c:65 msgid "git notes edit [<object>]" msgstr "git notes edit [<objeto>]" -#: builtin/notes.c:67 +#: builtin/notes.c:70 msgid "git notes show [<object>]" msgstr "git notes show [<objeto>]" -#: builtin/notes.c:72 +#: builtin/notes.c:75 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<opรงรตes>] <notes-ref>" -#: builtin/notes.c:73 +#: builtin/notes.c:76 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<opรงรตes>]" -#: builtin/notes.c:74 +#: builtin/notes.c:77 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<opรงรตes>]" -#: builtin/notes.c:79 +#: builtin/notes.c:82 msgid "git notes remove [<object>]" msgstr "git notes remove [<objeto>]" -#: builtin/notes.c:84 +#: builtin/notes.c:87 msgid "git notes prune [<options>]" msgstr "git notes prune [<opรงรตes>]" -#: builtin/notes.c:89 +#: builtin/notes.c:92 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:94 +#: builtin/notes.c:97 msgid "Write/edit the notes for the following object:" msgstr "Escreva/edite as notas do seguinte objeto:" -#: builtin/notes.c:147 +#: builtin/notes.c:150 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "nรฃo foi possรญvel iniciar o comando 'show' sobre o objeto '%s'" -#: builtin/notes.c:151 +#: builtin/notes.c:154 msgid "could not read 'show' output" msgstr "nรฃo foi possรญvel ler a saรญda do comando 'show'" -#: builtin/notes.c:159 +#: builtin/notes.c:162 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "falha ao concluir o comando 'show' sobre o objeto '%s'" -#: builtin/notes.c:194 +#: builtin/notes.c:197 msgid "please supply the note contents using either -m or -F option" msgstr "forneรงa o conteรบdo da nota usando a opรงรฃo -m ou -F" -#: builtin/notes.c:203 +#: builtin/notes.c:206 msgid "unable to write note object" msgstr "nรฃo รฉ possรญvel escrever o objeto de nota" -#: builtin/notes.c:205 +#: builtin/notes.c:208 #, c-format msgid "the note contents have been left in %s" msgstr "o conteรบdo da nota foi colocado em %s" -#: builtin/notes.c:233 builtin/tag.c:516 -#, c-format -msgid "cannot read '%s'" -msgstr "nรฃo รฉ possรญvel ler '%s'" - -#: builtin/notes.c:235 builtin/tag.c:519 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "nรฃo foi possรญvel abrir ou ler '%s'" -#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 -#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 -#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658 +#: 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 "falha ao resolver '%s' como uma referรชncia vรกlida." -#: builtin/notes.c:257 +#: builtin/notes.c:265 #, c-format msgid "failed to read object '%s'." msgstr "falha ao ler o objeto '%s'." -#: builtin/notes.c:261 +#: builtin/notes.c:268 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "nรฃo รฉ possรญvel ler os dados da nota de um objeto nรฃo-blob '%s'." -#: builtin/notes.c:301 +#: builtin/notes.c:309 #, c-format msgid "malformed input line: '%s'." msgstr "linha de entrada malformada: '%s'." -#: builtin/notes.c:316 +#: builtin/notes.c:324 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "falha ao copiar notas de '%s' para '%s'" -#. TRANSLATORS: the first %s will be replaced by a -#. git notes command: 'add', 'merge', 'remove', etc. -#: builtin/notes.c:345 +#. 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 "foi recusado efetuar %s de notas em %s (fora de refs/notes/)" -#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 -#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651 -#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969 +#: 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 "demasiados parรขmetros" -#: builtin/notes.c:378 builtin/notes.c:664 +#: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." msgstr "nenhuma nota encontrada para o objeto %s." -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:410 builtin/notes.c:576 msgid "note contents as a string" msgstr "conteรบdo da nota sob a forma de cadeia de caracteres" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:413 builtin/notes.c:579 msgid "note contents in a file" msgstr "conteรบdo da nota de um ficheiro" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:416 builtin/notes.c:582 msgid "reuse and edit specified note object" msgstr "reutilizar e editar o objeto de nota especificado" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:419 builtin/notes.c:585 msgid "reuse specified note object" msgstr "reutilizar o objeto de nota especificado" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:422 builtin/notes.c:588 msgid "allow storing empty note" msgstr "permitir guardar uma nota vazia" -#: builtin/notes.c:412 builtin/notes.c:483 +#: builtin/notes.c:423 builtin/notes.c:496 msgid "replace existing notes" msgstr "substituir notas existentes" -#: builtin/notes.c:437 +#: builtin/notes.c:448 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10704,29 +17719,29 @@ msgstr "" "Nรฃo รฉ possรญvel adicionar notas. Notas do objeto %s encontradas. Use '-f' " "para substituรญ-las." -#: builtin/notes.c:452 builtin/notes.c:531 +#: builtin/notes.c:463 builtin/notes.c:544 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "A substituir as notas existentes do objeto %s\n" -#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888 +#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 #, c-format msgid "Removing note for object %s\n" msgstr "A remover a nota do objeto %s\n" -#: builtin/notes.c:484 +#: builtin/notes.c:497 msgid "read objects from stdin" msgstr "ler objetos da entrada padrรฃo" -#: builtin/notes.c:486 +#: builtin/notes.c:499 msgid "load rewriting config for <command> (implies --stdin)" msgstr "carregar configuraรงรฃo de reescrita do <comando> (implica --stdin)" -#: builtin/notes.c:504 +#: builtin/notes.c:517 msgid "too few parameters" msgstr "parรขmetros insuficientes" -#: builtin/notes.c:525 +#: builtin/notes.c:538 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10735,12 +17750,12 @@ msgstr "" "Nรฃo รฉ possรญvel copiar notas. Notas do objeto %s encontradas. Use '-f' para " "substituรญ-las." -#: builtin/notes.c:537 +#: builtin/notes.c:550 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "faltam notas no objeto de origem %s. Nรฃo รฉ possรญvel copiar." -#: builtin/notes.c:589 +#: builtin/notes.c:603 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -10749,52 +17764,52 @@ msgstr "" "As opรงรตes -m/-F/-c/-C sรฃo obsoletas no subcomando 'edit'.\n" "Use 'git notes add -f -m/-F/-c/-C' em seu lugar.\n" -#: builtin/notes.c:684 +#: builtin/notes.c:698 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "falha ao eliminar a referรชncia NOTES_MERGE_PARTIAL" -#: builtin/notes.c:686 +#: builtin/notes.c:700 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "falha ao eliminar a referรชncia NOTES_MERGE_REF" -#: builtin/notes.c:688 +#: builtin/notes.c:702 msgid "failed to remove 'git notes merge' worktree" msgstr "falha ao remover a รกrvore de trabalho de 'git notes merge'" -#: builtin/notes.c:708 +#: builtin/notes.c:722 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "falha ao ler referรชncia NOTES_MERGE_PARTIAL" -#: builtin/notes.c:710 +#: builtin/notes.c:724 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "nรฃo foi possรญvel encontrar o commit de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:712 +#: builtin/notes.c:726 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "nรฃo foi possรญvel analisar o commit de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:725 +#: builtin/notes.c:739 msgid "failed to resolve NOTES_MERGE_REF" msgstr "falha ao resolver NOTES_MERGE_REF" -#: builtin/notes.c:728 +#: builtin/notes.c:742 msgid "failed to finalize notes merge" msgstr "falha ao finalizar integraรงรฃo de notas" -#: builtin/notes.c:754 +#: builtin/notes.c:768 #, c-format msgid "unknown notes merge strategy %s" msgstr "estratรฉgia de integraรงรฃo de notas %s desconhecida" -#: builtin/notes.c:770 +#: builtin/notes.c:784 msgid "General options" msgstr "Opรงรตes gerais" -#: builtin/notes.c:772 +#: builtin/notes.c:786 msgid "Merge options" msgstr "Opรงรตes de integraรงรฃo" -#: builtin/notes.c:774 +#: builtin/notes.c:788 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -10802,46 +17817,46 @@ msgstr "" "resolver conflitos nas notas usando a estratรฉgia indicada (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:776 +#: builtin/notes.c:790 msgid "Committing unmerged notes" msgstr "A submeter notas nรฃo integradas" -#: builtin/notes.c:778 +#: builtin/notes.c:792 msgid "finalize notes merge by committing unmerged notes" msgstr "concluir integraรงรฃo de notas, submetendo notas nรฃo integradas" -#: builtin/notes.c:780 +#: builtin/notes.c:794 msgid "Aborting notes merge resolution" msgstr "A abortar resoluรงรฃo de integraรงรฃo das notas" -#: builtin/notes.c:782 +#: builtin/notes.c:796 msgid "abort notes merge" msgstr "abortar integraรงรฃo das notas" -#: builtin/notes.c:793 +#: builtin/notes.c:807 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "nรฃo รฉ possรญvel misturar --commit, --abort ou -s/--strategy" -#: builtin/notes.c:798 +#: builtin/notes.c:812 msgid "must specify a notes ref to merge" msgstr "tem de especificar uma referรชncia de notas para integrar" -#: builtin/notes.c:822 +#: builtin/notes.c:836 #, c-format msgid "unknown -s/--strategy: %s" msgstr "-s/--strategy desconhecida: %s" -#: builtin/notes.c:859 +#: builtin/notes.c:873 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "uma integraรงรฃo das notas em %s jรก estรก em curso em %s" -#: builtin/notes.c:862 +#: builtin/notes.c:876 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "falha ao guardar ligaรงรฃo ร referรชncia de notas atual (%s)" -#: builtin/notes.c:864 +#: builtin/notes.c:878 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10852,308 +17867,538 @@ msgstr "" "submeta o resultado com 'git notes merge --commit' ou aborte a integraรงรฃo " "com 'git notes merge --abort'.\n" -#: builtin/notes.c:886 +#: builtin/notes.c:897 builtin/tag.c:546 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Falha ao resolver '%s' numa referรชncia vรกlida." + +#: builtin/notes.c:900 #, c-format msgid "Object %s has no note\n" msgstr "O objeto %s nรฃo tem nenhuma nota\n" -#: builtin/notes.c:898 +#: builtin/notes.c:912 msgid "attempt to remove non-existent note is not an error" msgstr "nรฃo considerar como erro a remoรงรฃo de uma nota nรฃo existente" -#: builtin/notes.c:901 +#: builtin/notes.c:915 msgid "read object names from the standard input" msgstr "ler nome dos objetos da entrada padrรฃo" -#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "nรฃo remover, mostrar apenas" -#: builtin/notes.c:940 +#: builtin/notes.c:955 msgid "report pruned notes" msgstr "reportar notas podadas" -#: builtin/notes.c:982 +#: builtin/notes.c:998 msgid "notes-ref" msgstr "notes-ref" -#: builtin/notes.c:983 +#: builtin/notes.c:999 msgid "use notes from <notes-ref>" msgstr "usar notas de <notes-ref>" -#: builtin/notes.c:1018 +#: builtin/notes.c:1034 builtin/stash.c:1605 #, c-format msgid "unknown subcommand: %s" msgstr "subcomando desconhecido: %s" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<opรงรตes>...] [< <lista-referรชncias> | < <lista-" "objetos>]" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<opรงรตes>...] <nome-base> [< <lista-referรชncias> | < <lista-" "objetos>]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:443 +#, fuzzy, c-format +msgid "bad packed object CRC for %s" +msgstr "ignorar objetos compactados" + +#: builtin/pack-objects.c:454 +#, fuzzy, c-format +msgid "corrupt packed object for %s" +msgstr "ignorar objetos compactados" + +#: builtin/pack-objects.c:585 +#, fuzzy, c-format +msgid "recursive delta detected for object %s" +msgstr "o objeto esperado %s nรฃo foi recebido" + +#: builtin/pack-objects.c:796 #, c-format -msgid "deflate error (%d)" -msgstr "erro ao compactar (%d)" +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "" -#: builtin/pack-objects.c:770 +#: builtin/pack-objects.c:1004 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "a desativar escrita de mapa de bits, os pacotes sรฃo divididos devido a pack." "packSizeLimit" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "A escrever objetos" -#: builtin/pack-objects.c:1063 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 +#, c-format +msgid "failed to stat %s" +msgstr "falha ao invocar stat de %s" + +#: builtin/pack-objects.c:1131 +#, c-format +msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" +msgstr "" + +#: builtin/pack-objects.c:1348 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "a desativar escrita de mapa de bits, visto que alguns objetos nรฃo estรฃo a " "ser compactados" -#: builtin/pack-objects.c:2426 +#: builtin/pack-objects.c:1796 +#, fuzzy, c-format +msgid "delta base offset overflow in pack for %s" +msgstr "offset da base delta estรก fora do limite" + +#: builtin/pack-objects.c:1805 +#, fuzzy, c-format +msgid "delta base offset out of bound for %s" +msgstr "offset da base delta estรก fora do limite" + +#: builtin/pack-objects.c:2086 +msgid "Counting objects" +msgstr "A contar objetos" + +#: builtin/pack-objects.c:2231 +#, fuzzy, c-format +msgid "unable to parse object header of %s" +msgstr "nรฃo foi possรญvel analisar o objeto: %s" + +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 +#, fuzzy, c-format +msgid "object %s cannot be read" +msgstr "objeto %s nรฃo encontrado" + +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 +#, c-format +msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" +msgstr "" + +#: builtin/pack-objects.c:2341 +msgid "suboptimal pack - out of memory" +msgstr "" + +#: builtin/pack-objects.c:2656 +#, c-format +msgid "Delta compression using up to %d threads" +msgstr "" + +#: builtin/pack-objects.c:2795 +#, fuzzy, c-format +msgid "unable to pack objects reachable from tag %s" +msgstr "incluir objetos alcanรงรกveis a partir de qualquer referรชncia" + +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "A comprimir objetos" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2889 +msgid "inconsistency with delta count" +msgstr "" + +#: builtin/pack-objects.c:2961 #, c-format -msgid "unsupported index version %s" -msgstr "versรฃo de รญndice %s nรฃo suportada" +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" -#: builtin/pack-objects.c:2833 +#: builtin/pack-objects.c:2964 #, c-format -msgid "bad index version '%s'" -msgstr "versรฃo de รญndice '%s' incorreta" +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" -#: builtin/pack-objects.c:2863 -msgid "do not show progress meter" -msgstr "nรฃo mostrar medidor de progresso" +#: builtin/pack-objects.c:2993 +#, c-format +msgid "" +"expected edge object ID, got garbage:\n" +" %s" +msgstr "" -#: builtin/pack-objects.c:2865 -msgid "show progress meter" -msgstr "mostrar medidor de progresso" +#: builtin/pack-objects.c:2999 +#, c-format +msgid "" +"expected object ID, got garbage:\n" +" %s" +msgstr "" -#: builtin/pack-objects.c:2867 -msgid "show progress meter during object writing phase" -msgstr "mostrar medidor de progresso durante a fase de escrita de objetos" +#: builtin/pack-objects.c:3097 +#, fuzzy +msgid "invalid value for --missing" +msgstr "valor invรกlido de %s" -#: builtin/pack-objects.c:2870 -msgid "similar to --all-progress when progress meter is shown" -msgstr "semelhante a --all-progress quando o medidor de progresso รฉ mostrado" +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 +#, fuzzy +msgid "cannot open pack index" +msgstr "nรฃo รฉ possรญvel invocar pread sobre o ficheiro de pacote" + +#: builtin/pack-objects.c:3187 +#, c-format +msgid "loose object at %s could not be examined" +msgstr "" + +#: builtin/pack-objects.c:3272 +#, fuzzy +msgid "unable to force loose object" +msgstr "nรฃo รฉ possรญvel escrever o objeto de nota" + +#: builtin/pack-objects.c:3365 +#, fuzzy, c-format +msgid "not a rev '%s'" +msgstr "nรฃo รฉ possรญvel ler '%s'" + +#: builtin/pack-objects.c:3368 +#, fuzzy, c-format +msgid "bad revision '%s'" +msgstr "repositรณrio '%s' incorreto" + +#: builtin/pack-objects.c:3393 +#, fuzzy +msgid "unable to add recent objects" +msgstr "nรฃo foi possรญvel analisar o objeto: %s" + +#: builtin/pack-objects.c:3446 +#, c-format +msgid "unsupported index version %s" +msgstr "versรฃo de รญndice %s nรฃo suportada" + +#: builtin/pack-objects.c:3450 +#, c-format +msgid "bad index version '%s'" +msgstr "versรฃo de รญndice '%s' incorreta" -#: builtin/pack-objects.c:2871 -msgid "version[,offset]" +#: builtin/pack-objects.c:3488 +#, fuzzy +msgid "<version>[,<offset>]" msgstr "versรฃo[,offset]" -#: builtin/pack-objects.c:2872 +#: builtin/pack-objects.c:3489 msgid "write the pack index file in the specified idx format version" msgstr "" "escrever o ficheiro de รญndice do pacote na versรฃo de formato especificada" -#: builtin/pack-objects.c:2875 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "tamanho mรกximo de cada ficheiro de pacote gerado" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "ignorar objetos compactados" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "limitar a janela de compactaรงรฃo por objetos" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:3500 msgid "limit pack window by memory in addition to object limit" msgstr "" "limitar a janela de compactaรงรฃo por memรณria em adiรงรฃo ao limite por objetos" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:3502 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "tamanho mรกximo de cadeias delta permitidas no pacote resultante" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "reutilizar deltas existentes" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:3510 msgid "use threads when searching for best delta matches" msgstr "usar threads ao procurar pela melhor correspondรชncia delta" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "nรฃo criar um pacote vazio" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "ler argumentos de revisรฃo da entrada padrรฃo" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:3516 msgid "limit the objects to those that are not yet packed" msgstr "restringir-se aos objetos que ainda nรฃo foram compactados" -#: builtin/pack-objects.c:2902 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanรงรกveis a partir de qualquer referรชncia" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "incluir objetos referenciados por entradas do reflog" -#: builtin/pack-objects.c:2908 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "incluir objetos referenciados pelo รญndice" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "gerar pacote para a saรญda padrรฃo" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:3530 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refiram objetos a compactar" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "manter objetos inalcanรงรกveis" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "empacotar objetos soltos inalcanรงรกveis" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "descompactar objetos inalcanรงรกveis mais recentes que <tempo>" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:3539 +msgid "use the sparse reachability algorithm" +msgstr "" + +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "criar pacotes finos" -#: builtin/pack-objects.c:2924 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "criar pacotes adequados para obter em repositรณrios pouco profundos" -#: builtin/pack-objects.c:2926 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "ignorar pacotes que tenham um ficheiro .keep" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:3547 +#, fuzzy +msgid "ignore this pack" +msgstr "usar pacote fino" + +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "nรญvel de compactaรงรฃo do pacote" -#: builtin/pack-objects.c:2930 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "nรฃo esconder commits introduzidos por enxertos" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:3553 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar um รญndice de mapa de bits se disponรญvel, para acelerar a contagem de " "objetos" -#: builtin/pack-objects.c:2934 +#: builtin/pack-objects.c:3555 msgid "write a bitmap index together with the pack index" msgstr "escrever um รญndice de mapa de bits juntamente com o รญndice do pacote" -#: builtin/pack-objects.c:3061 -msgid "Counting objects" -msgstr "A contar objetos" +#: builtin/pack-objects.c:3559 +#, fuzzy +msgid "write a bitmap index if possible" +msgstr "escrever รญndice de mapa de bits" + +#: builtin/pack-objects.c:3563 +#, fuzzy +msgid "handling for missing objects" +msgstr "permitir objetos nรฃo presentes" + +#: builtin/pack-objects.c:3566 +msgid "do not pack objects in promisor packfiles" +msgstr "" + +#: builtin/pack-objects.c:3568 +#, fuzzy +msgid "respect islands during delta compression" +msgstr "dimensรฃo da janela usada em compressรฃo de deltas" + +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "" + +#: builtin/pack-objects.c:3600 +#, c-format +msgid "delta chain depth %d is too deep, forcing %d" +msgstr "" + +#: builtin/pack-objects.c:3605 +#, c-format +msgid "pack.deltaCacheLimit is too high, forcing %d" +msgstr "" + +#: builtin/pack-objects.c:3659 +msgid "--max-pack-size cannot be used to build a pack for transfer" +msgstr "" + +#: builtin/pack-objects.c:3661 +msgid "minimum pack size limit is 1 MiB" +msgstr "" -#: builtin/pack-refs.c:6 +#: builtin/pack-objects.c:3666 +#, fuzzy +msgid "--thin cannot be used to build an indexable pack" +msgstr "--fix-thin nรฃo pode ser usado sem --stdin" + +#: builtin/pack-objects.c:3669 +#, fuzzy +msgid "--keep-unreachable and --unpack-unreachable are incompatible" +msgstr "--keep-unreachable e -A sรฃo incompatรญveis" + +#: builtin/pack-objects.c:3675 +#, fuzzy +msgid "cannot use --filter without --stdout" +msgstr "nรฃo รฉ possรญvel usar -a com -d" + +#: builtin/pack-objects.c:3735 +#, fuzzy +msgid "Enumerating objects" +msgstr "A escrever objetos" + +#: builtin/pack-objects.c:3766 +#, c-format +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" +msgstr "" + +#: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<opรงรตes>]" -#: builtin/pack-refs.c:14 +#: builtin/pack-refs.c:16 msgid "pack everything" msgstr "compactar tudo" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:17 msgid "prune loose refs (default)" msgstr "eliminar referรชncias soltas (predefiniรงรฃo)" -#: builtin/prune-packed.c:7 +#: builtin/prune-packed.c:6 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:40 -msgid "Removing duplicate objects" -msgstr "A remover objetos duplicados" - -#: builtin/prune.c:11 -msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +#: builtin/prune.c:14 +#, fuzzy +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <tempo>] [--] [<head>...]" -#: builtin/prune.c:106 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "apresentar objetos eliminados" -#: builtin/prune.c:109 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "expirar objetos mais antigos que <tempo>" -#: builtin/prune.c:123 +#: builtin/prune.c:138 +msgid "limit traversal to objects outside promisor packfiles" +msgstr "" + +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "nรฃo รฉ possรญvel limpar num repositรณrio de objetos-preciosos" -#: builtin/pull.c:51 builtin/pull.c:53 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor invรกlido de %s: %s" -#: builtin/pull.c:73 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opรงรตes>] [<repositรณrio> [<especificador-de-referรชncia>...]]" -#: builtin/pull.c:121 +#: builtin/pull.c:123 +#, fuzzy +msgid "control for recursive fetching of submodules" +msgstr "controlar a obtenรงรฃo recursiva de submรณdulos" + +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "Opรงรตes relativas a integraรงรฃo" -#: builtin/pull.c:124 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar alteraรงรตes por rebase em vez de integrar" -#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120 +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permitir avanรงo rรกpido" -#: builtin/pull.c:157 -msgid "automatically stash/stash pop before and after rebase" +#: builtin/pull.c:167 parse-options.h:339 +#, fuzzy +msgid "automatically stash/stash pop before and after" msgstr "empilhar/desempilhar automaticamente antes de depois de rebase" -#: builtin/pull.c:173 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "Opรงรตes relacionadas com obtenรงรฃo de objetos" -#: builtin/pull.c:195 +#: builtin/pull.c:193 +msgid "force overwrite of local branch" +msgstr "forรงar a substituiรงรฃo do ramo local" + +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "nรบmero de submรณdulos puxados em paralelo" -#: builtin/pull.c:284 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor invรกlido de pull.ff: %s" -#: builtin/pull.c:397 +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" + +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11161,14 +18406,14 @@ msgstr "" "Nรฃo hรก nenhum candidato com o qual realizar rebase de entre as referรชncias " "que se acabaram de obter." -#: builtin/pull.c:399 +#: builtin/pull.c:460 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Nรฃo hรก nenhum candidato com o qual integrar de entre as referรชncias que se " "acabaram obter." -#: builtin/pull.c:400 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11176,7 +18421,7 @@ msgstr "" "Geralmente, significa que forneceu um especificador de referรชncia\n" "com um carรกcter universal (wildcard) que nรฃo corresponde a nenhum remoto." -#: builtin/pull.c:403 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11187,44 +18432,44 @@ msgstr "" "Uma vez que este nรฃo รฉ o remoto configurado por predefiniรงรฃo\n" "do ramo atual, deve especificar um ramo na linha de comandos." -#: builtin/pull.c:408 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Nรฃo se encontra em nenhum ramo de momento." -#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Especifique o ramo sobre o qual pretende realizar rebase." -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Especifique o ramo com o qual pretende integrar." -#: builtin/pull.c:413 builtin/pull.c:428 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "Consulte git-pull(1) para obter mais detalhes." -#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 -#: git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<ramo>" -#: builtin/pull.c:423 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "O ramo atual nรฃo segue nenhum ramo." -#: builtin/pull.c:432 git-parse-remote.sh:95 +#: builtin/pull.c:493 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Se deseja definir o ramo que deve ser seguido por este ramo, pode fazรช-lo " "com:" -#: builtin/pull.c:437 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11233,29 +18478,30 @@ msgstr "" "A configuraรงรฃo indica para integrar com a referรชncia '%s'\n" "do remoto, mas aquela referรชncia nรฃo foi obtida." -#: builtin/pull.c:754 +#: builtin/pull.c:609 +#, fuzzy, c-format +msgid "unable to access commit %s" +msgstr "nรฃo foi possรญvel analisar o commit %s" + +#: builtin/pull.c:894 msgid "ignoring --verify-signatures for rebase" msgstr "ignorado --verify-signatures para rebase" -#: builtin/pull.c:801 -msgid "--[no-]autostash option is only valid with --rebase." -msgstr "a opรงรฃo --[no-]autostash sรณ รฉ vรกlida com --rebase." - -#: builtin/pull.c:809 +#: builtin/pull.c:954 msgid "Updating an unborn branch with changes added to the index." msgstr "" "A atualizar um ramo que ainda nรฃo foi criado e com alteraรงรตes adicionadas ao " "รญndice." -#: builtin/pull.c:812 +#: builtin/pull.c:958 msgid "pull with rebase" msgstr "puxar com rebase" -#: builtin/pull.c:813 +#: builtin/pull.c:959 msgid "please commit or stash them." msgstr "submeta ou esconda-as." -#: builtin/pull.c:838 +#: builtin/pull.c:984 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11266,7 +18512,7 @@ msgstr "" "a avanรงar a รกrvore de trabalho a partir do\n" "commit %s." -#: builtin/pull.c:843 +#: builtin/pull.c:990 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11283,27 +18529,31 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:858 +#: builtin/pull.c:1005 msgid "Cannot merge multiple branches into empty head." msgstr "Nรฃo รฉ possรญvel integrar mรบltiplos ramos numa cabeรงa vazia." -#: builtin/pull.c:862 +#: builtin/pull.c:1009 msgid "Cannot rebase onto multiple branches." msgstr "Nรฃo รฉ possรญvel efetuar rebase sobre mรบltiplos ramos." -#: builtin/push.c:16 +#: builtin/pull.c:1017 +msgid "cannot rebase with locally recorded submodule modifications" +msgstr "" + +#: builtin/push.c:19 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<opรงรตes>] [<repositรณrio> [<especificador-de-referรชncia>...]]" -#: builtin/push.c:89 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "forma abreviada de tag sem <tag>" -#: builtin/push.c:99 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "--delete sรณ aceita nomes simples como referรชncias de destino" -#: builtin/push.c:143 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -11312,8 +18562,8 @@ msgstr "" "Para escolher uma opรงรฃo permanentemente, consulte push.default em 'git help " "config'." -#: builtin/push.c:146 -#, c-format +#: builtin/push.c:167 +#, fuzzy, 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" @@ -11323,7 +18573,7 @@ msgid "" "\n" "To push to the branch of the same name on the remote, use\n" "\n" -" git push %s %s\n" +" git push %s HEAD\n" "%s" msgstr "" "O ramo a montante do ramo atual nรฃo coincide com o nome do ramo atual.\n" @@ -11336,7 +18586,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:161 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11351,7 +18601,7 @@ msgstr "" "\n" " git push %s HEAD:<name-of-remote-branch>\n" -#: builtin/push.c:175 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11364,12 +18614,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:183 +#: builtin/push.c:202 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "O ramo atual %s tem mรบltiplos ramos a montante, publicaรงรฃo recusada." -#: builtin/push.c:186 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11380,14 +18630,14 @@ msgstr "" "do ramo atual '%s'. Deve indicar o que pretende publicar e que ramo\n" "remoto atualizar." -#: builtin/push.c:245 +#: builtin/push.c:260 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Nรฃo indicou nenhum especificador de referรชncia para publicar e o valor de " "push.default รฉ \"nothing\"." -#: builtin/push.c:252 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11399,7 +18649,7 @@ msgstr "" "'git pull ...') antes de publicar de novo.\n" "Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes." -#: builtin/push.c:258 +#: builtin/push.c:273 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" @@ -11411,7 +18661,7 @@ msgstr "" "as alteraรงรตes remotas (e.g. 'git pull ...') antes de publicar de novo.\n" "Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes." -#: builtin/push.c:264 +#: builtin/push.c:279 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" @@ -11426,11 +18676,11 @@ msgstr "" "(e.g., 'git pull ...') antes de publicar de novo.\n" "Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes." -#: builtin/push.c:271 +#: builtin/push.c:286 msgid "Updates were rejected because the tag already exists in the remote." msgstr "As atualizaรงรตes foram rejeitadas porque a tag jรก existe no remoto." -#: builtin/push.c:274 +#: builtin/push.c:289 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" @@ -11440,153 +18690,192 @@ msgstr "" "objeto nรฃo commit, ou atualizar uma referรชncia remota fazendo-a\n" "apontar para um objeto nรฃo commit, sem usar a opรงรฃo '--force'.\n" -#: builtin/push.c:334 +#: builtin/push.c:351 #, c-format msgid "Pushing to %s\n" msgstr "A publicar em %s\n" -#: builtin/push.c:338 +#: builtin/push.c:358 #, c-format msgid "failed to push some refs to '%s'" msgstr "falha ao publicar algumas referรชncias em '%s'" -#: builtin/push.c:369 -#, c-format -msgid "bad repository '%s'" -msgstr "repositรณrio '%s' incorreto" - -#: builtin/push.c:370 -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 "" -"Destino de publicaรงรฃo nรฃo definido.\n" -"Indique um URL na linha de comandos ou configure um repositรณrio remoto " -"usando\n" -"\n" -" git remote add <nome> <url>\n" -"\n" -"e publique usando o nome remoto\n" -"\n" -" git push <nome>\n" - -#: builtin/push.c:388 -msgid "--all and --tags are incompatible" -msgstr "--all e --tags sรฃo incompatรญveis" - -#: builtin/push.c:389 -msgid "--all can't be combined with refspecs" -msgstr "--all nรฃo pode ser combinado com especificadores de referรชncias" - -#: builtin/push.c:394 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror e --tags sรฃo incompatรญveis" - -#: builtin/push.c:395 -msgid "--mirror can't be combined with refspecs" -msgstr "--mirror nรฃo pode ser combinado com especificadores de referรชncias" - -#: builtin/push.c:400 -msgid "--all and --mirror are incompatible" -msgstr "--all e --mirror sรฃo incompatรญveis" - -#: builtin/push.c:518 +#: builtin/push.c:532 msgid "repository" msgstr "repositรณrio" -#: builtin/push.c:519 builtin/send-pack.c:162 +#: builtin/push.c:533 builtin/send-pack.c:183 msgid "push all refs" msgstr "publicar todas as referรชncias" -#: builtin/push.c:520 builtin/send-pack.c:164 +#: builtin/push.c:534 builtin/send-pack.c:185 msgid "mirror all refs" msgstr "replicar todas as referรชncias" -#: builtin/push.c:522 +#: builtin/push.c:536 msgid "delete refs" msgstr "eliminar referรชncias" -#: builtin/push.c:523 +#: builtin/push.c:537 msgid "push tags (can't be used with --all or --mirror)" msgstr "publicar tags (nรฃo pode ser usado com --all ou --mirror)" -#: builtin/push.c:526 builtin/send-pack.c:165 +#: builtin/push.c:540 builtin/send-pack.c:186 msgid "force updates" msgstr "forรงar atualizaรงรฃo" -#: builtin/push.c:528 builtin/send-pack.c:179 -msgid "refname>:<expect" +#: builtin/push.c:541 builtin/send-pack.c:198 +#, fuzzy +msgid "<refname>:<expect>" msgstr "nome da referรชncia>:<esperado" -#: builtin/push.c:529 builtin/send-pack.c:180 +#: builtin/push.c:542 builtin/send-pack.c:199 msgid "require old value of ref to be at this value" msgstr "exigir que o antigo valor da referรชncia tenha este valor" -#: builtin/push.c:532 +#: builtin/push.c:545 msgid "control recursive pushing of submodules" msgstr "controlar a publicaรงรฃo recursiva de submรณdulos" -#: builtin/push.c:534 builtin/send-pack.c:173 +#: builtin/push.c:546 builtin/send-pack.c:193 msgid "use thin pack" msgstr "usar pacote fino" -#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 -#: builtin/send-pack.c:160 +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 msgid "receive pack program" msgstr "programa receive pack" -#: builtin/push.c:537 +#: builtin/push.c:549 msgid "set upstream for git pull/status" msgstr "definir o ramo a montante usado com git pull/status" -#: builtin/push.c:540 +#: builtin/push.c:552 msgid "prune locally removed refs" msgstr "eliminar referรชncias removidas localmente" -#: builtin/push.c:542 +#: builtin/push.c:554 msgid "bypass pre-push hook" msgstr "ignorar pre-push hook" -#: builtin/push.c:543 +#: builtin/push.c:555 msgid "push missing but relevant tags" msgstr "publicar tags perdidas mas relevantes" -#: builtin/push.c:546 builtin/send-pack.c:167 +#: builtin/push.c:557 builtin/send-pack.c:187 msgid "GPG sign the push" msgstr "assinar publicaรงรฃo com GPG" -#: builtin/push.c:548 builtin/send-pack.c:174 +#: builtin/push.c:559 builtin/send-pack.c:194 msgid "request atomic transaction on remote side" msgstr "solicitar transaรงรฃo atรณmica no servidor remoto" -#: builtin/push.c:549 builtin/send-pack.c:170 -msgid "server-specific" -msgstr "especรญfico do servidor" - -#: builtin/push.c:549 builtin/send-pack.c:171 -msgid "option to transmit" -msgstr "opรงรฃo para transmitir" - -#: builtin/push.c:563 +#: builtin/push.c:577 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete รฉ incompatรญvel com --all, --mirror e --tags" -#: builtin/push.c:565 +#: builtin/push.c:579 msgid "--delete doesn't make sense without any refs" msgstr "--delete nรฃo faz sentido sem uma referรชncia" -#: builtin/push.c:584 +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "repositรณrio '%s' incorreto" + +#: builtin/push.c:600 +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 "" +"Destino de publicaรงรฃo nรฃo definido.\n" +"Indique um URL na linha de comandos ou configure um repositรณrio remoto " +"usando\n" +"\n" +" git remote add <nome> <url>\n" +"\n" +"e publique usando o nome remoto\n" +"\n" +" git push <nome>\n" + +#: builtin/push.c:615 +msgid "--all and --tags are incompatible" +msgstr "--all e --tags sรฃo incompatรญveis" + +#: builtin/push.c:617 +msgid "--all can't be combined with refspecs" +msgstr "--all nรฃo pode ser combinado com especificadores de referรชncias" + +#: builtin/push.c:621 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror e --tags sรฃo incompatรญveis" + +#: builtin/push.c:623 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror nรฃo pode ser combinado com especificadores de referรชncias" + +#: builtin/push.c:626 +msgid "--all and --mirror are incompatible" +msgstr "--all e --mirror sรฃo incompatรญveis" + +#: builtin/push.c:630 msgid "push options must not have new line characters" msgstr "as opรงรตes de publicaรงรฃo nรฃo podem ter carateres de nova linha" -#: builtin/read-tree.c:40 +#: builtin/range-diff.c:8 +msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" +msgstr "" + +#: builtin/range-diff.c:9 +#, fuzzy +msgid "git range-diff [<options>] <old-tip>...<new-tip>" +msgstr "git merge [<opรงรตes>] [<commit>...]" + +#: builtin/range-diff.c:10 +#, fuzzy +msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" +msgstr "git mv [<opรงรตes>] <origem>... <destino>" + +#: builtin/range-diff.c:22 +msgid "Percentage by which creation is weighted" +msgstr "" + +#: builtin/range-diff.c:24 +#, fuzzy +msgid "use simple diff colors" +msgstr "usar a ferramenta diff especificada" + +#: builtin/range-diff.c:26 +#, fuzzy +msgid "notes" +msgstr "notes-ref" + +#: builtin/range-diff.c:26 +msgid "passed to 'git log'" +msgstr "" + +#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#, fuzzy, c-format +msgid "no .. in range: '%s'" +msgstr "ramo inexistente: '%s'" + +#: builtin/range-diff.c:64 +msgid "single arg format must be symmetric range" +msgstr "" + +#: builtin/range-diff.c:79 +#, fuzzy +msgid "need two commit ranges" +msgstr "editar a mensagem de commit" + +#: builtin/read-tree.c:41 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -11597,89 +18886,739 @@ msgstr "" "sparse-checkout] [--index-output=<ficheiro>] (--empty | <รกrvore-etc1> " "[<รกrvore-etc2> [<รกrvore-etc3>]])" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:124 msgid "write resulting index to <file>" msgstr "escrever o รญndice resultante no <ficheiro>" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:127 msgid "only empty the index" msgstr "apenas esvaziar o รญndice" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:129 msgid "Merging" msgstr "A integrar" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:131 msgid "perform a merge in addition to a read" msgstr "realizar uma integraรงรฃo em adiรงรฃo a uma leitura" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:133 msgid "3-way merge if no file level merging required" msgstr "" "integrar com 3 pontos se a integraรงรฃo ao nรญvel de ficheiros nรฃo for " "necessรกria" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:135 msgid "3-way merge in presence of adds and removes" msgstr "integrar com 3 ponto na presenรงa de adiรงรตes e remoรงรตes" -#: builtin/read-tree.c:143 +#: builtin/read-tree.c:137 msgid "same as -m, but discard unmerged entries" msgstr "o mesmo que -m, mas descartar entradas nรฃo integradas" -#: builtin/read-tree.c:144 +#: builtin/read-tree.c:138 msgid "<subdirectory>/" msgstr "<subdiretรณrio>/" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:139 msgid "read the tree into the index under <subdirectory>/" msgstr "ler a รกrvore em <subdiretรณrio>/ para o รญndice" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:142 msgid "update working tree with merge result" msgstr "atualizar a รกrvore de trabalho com os resultados da integraรงรฃo" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:144 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:151 +#: builtin/read-tree.c:145 msgid "allow explicitly ignored files to be overwritten" msgstr "permitir que os ficheiros explicitamente ignorados sejam substituรญdos" -#: builtin/read-tree.c:154 +#: builtin/read-tree.c:148 msgid "don't check the working tree after merging" msgstr "nรฃo verificar a รกrvore de trabalho depois de integrar" -#: builtin/read-tree.c:155 +#: builtin/read-tree.c:149 msgid "don't update the index or the work tree" msgstr "nรฃo atualizar o รญndice ou a รกrvore de trabalho" -#: builtin/read-tree.c:157 +#: builtin/read-tree.c:151 msgid "skip applying sparse checkout filter" msgstr "ignorar a aplicaรงรฃo do filtro de extraรงรฃo esparsa" -#: builtin/read-tree.c:159 +#: builtin/read-tree.c:153 msgid "debug unpack-trees" msgstr "depurar unpack-trees" -#: builtin/rebase--helper.c:7 -msgid "git rebase--helper [<options>]" +#: builtin/read-tree.c:157 +#, fuzzy +msgid "suppress feedback messages" +msgstr "suprimir mensagens informativas" + +#: builtin/read-tree.c:188 +#, fuzzy +msgid "You need to resolve your current index first" +msgstr "primeiro deve resolver o รญndice atual" + +#: builtin/rebase.c:35 +msgid "" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" +msgstr "" + +#: builtin/rebase.c:37 +msgid "" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" +msgstr "" + +#: builtin/rebase.c:39 +#, fuzzy +msgid "git rebase --continue | --abort | --skip | --edit-todo" +msgstr "git am [<opรงรตes>] (--continue | --skip | --abort)" + +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 +#, fuzzy, c-format +msgid "unusable todo list: '%s'" +msgstr "nรฃo รฉ possรญvel invocar unlink: %s" + +#: builtin/rebase.c:304 +#, fuzzy, c-format +msgid "could not create temporary %s" +msgstr "nรฃo foi possรญvel criar ficheiro temporรกrio" + +#: builtin/rebase.c:310 +#, fuzzy +msgid "could not mark as interactive" +msgstr "Nรฃo foi possรญvel marcar como interativo" + +#: builtin/rebase.c:364 +#, fuzzy +msgid "could not generate todo list" +msgstr "nรฃo foi possรญvel escrever para %s" + +#: builtin/rebase.c:405 +msgid "a base commit must be provided with --upstream or --onto" +msgstr "" + +#: builtin/rebase.c:474 +#, fuzzy +msgid "git rebase--interactive [<options>]" msgstr "git rebase--helper [<opรงรตes>]" -#: builtin/rebase--helper.c:19 +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" +msgstr "" + +#: builtin/rebase.c:491 builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "permitir commits com mensagens vazias" + +#: builtin/rebase.c:493 +#, fuzzy +msgid "rebase merge commits" +msgstr "mergetag incorreta no commit '%s'" + +#: builtin/rebase.c:495 +msgid "keep original branch points of cousins" +msgstr "" + +#: builtin/rebase.c:497 +msgid "move commits that begin with squash!/fixup!" +msgstr "" + +#: builtin/rebase.c:498 +#, fuzzy +msgid "sign commits" +msgstr "assinar os commits com GPG" + +#: builtin/rebase.c:500 builtin/rebase.c:1321 +msgid "display a diffstat of what changed upstream" +msgstr "" + +#: builtin/rebase.c:502 msgid "continue rebase" msgstr "continuar rebase" -#: builtin/rebase--helper.c:21 -msgid "abort rebase" -msgstr "abortar rebase" +#: builtin/rebase.c:504 +#, fuzzy +msgid "skip commit" +msgstr "commit" + +#: builtin/rebase.c:505 +#, fuzzy +msgid "edit the todo list" +msgstr "falha ao escrever para rev-list" + +#: builtin/rebase.c:507 +#, fuzzy +msgid "show the current patch" +msgstr "ignorar o patch atual" + +#: builtin/rebase.c:510 +msgid "shorten commit ids in the todo list" +msgstr "" + +#: builtin/rebase.c:512 +msgid "expand commit ids in the todo list" +msgstr "" + +#: builtin/rebase.c:514 +msgid "check the todo list" +msgstr "" + +#: builtin/rebase.c:516 +msgid "rearrange fixup/squash lines" +msgstr "" + +#: builtin/rebase.c:518 +msgid "insert exec commands in todo list" +msgstr "" + +#: builtin/rebase.c:519 +msgid "onto" +msgstr "" + +#: builtin/rebase.c:522 +#, fuzzy +msgid "restrict-revision" +msgstr "revisรฃo" + +#: builtin/rebase.c:522 +#, fuzzy +msgid "restrict revision" +msgstr "revisรฃo" + +#: builtin/rebase.c:524 +msgid "squash-onto" +msgstr "" + +#: builtin/rebase.c:525 +msgid "squash onto" +msgstr "" + +#: builtin/rebase.c:527 +#, fuzzy +msgid "the upstream commit" +msgstr "Remover a informaรงรฃo do ramo a montante" + +#: builtin/rebase.c:529 +#, fuzzy +msgid "head-name" +msgstr "mudar nome" + +#: builtin/rebase.c:529 +#, fuzzy +msgid "head name" +msgstr "ร frente " + +#: builtin/rebase.c:534 +#, fuzzy +msgid "rebase strategy" +msgstr "estratรฉgia de integraรงรฃo" + +#: builtin/rebase.c:535 +#, fuzzy +msgid "strategy-opts" +msgstr "estratรฉgia" + +#: builtin/rebase.c:536 +#, fuzzy +msgid "strategy options" +msgstr "opรงรตes de decoraรงรฃo" + +#: builtin/rebase.c:537 +msgid "switch-to" +msgstr "" + +#: builtin/rebase.c:538 +msgid "the branch or commit to checkout" +msgstr "" + +#: builtin/rebase.c:539 +#, fuzzy +msgid "onto-name" +msgstr "nome" + +#: builtin/rebase.c:539 +#, fuzzy +msgid "onto name" +msgstr "nome do remoto" + +#: builtin/rebase.c:540 +#, fuzzy +msgid "cmd" +msgstr "comando" + +#: builtin/rebase.c:540 +#, fuzzy +msgid "the command to run" +msgstr "Nenhum comando concluรญdo." + +#: builtin/rebase.c:543 builtin/rebase.c:1415 +msgid "automatically re-schedule any `exec` that fails" +msgstr "" + +#: builtin/rebase.c:559 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "" + +#: builtin/rebase.c:575 +#, c-format +msgid "%s requires the merge backend" +msgstr "" + +#: builtin/rebase.c:618 +#, fuzzy, c-format +msgid "could not get 'onto': '%s'" +msgstr "nรฃo foi possรญvel definir '%s' como '%s'" + +#: builtin/rebase.c:635 +#, fuzzy, c-format +msgid "invalid orig-head: '%s'" +msgstr "ficheiro invรกlido: '%s'" + +#: builtin/rebase.c:660 +#, c-format +msgid "ignoring invalid allow_rerere_autoupdate: '%s'" +msgstr "" + +#: builtin/rebase.c:805 git-rebase--preserve-merges.sh:81 +#, fuzzy +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 "" +"Depois de resolver este problema, execute \"git rebase --continue\".\n" +"Se prefere ignorar este patch, execute \"git rebase --skip\".\n" +"Para extrair o ramo original e interromper o rebase, execute \"git rebase --" +"abort\"." + +#: builtin/rebase.c:888 +#, 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 "" + +#: builtin/rebase.c:1214 +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "" + +#: builtin/rebase.c:1232 +#, fuzzy, 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 "Especifique o ramo sobre o qual pretende realizar rebase." + +#: builtin/rebase.c:1248 +#, fuzzy, 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 "" +"Se deseja definir o ramo que deve ser seguido por este ramo, pode fazรช-lo " +"com:" + +#: builtin/rebase.c:1278 +msgid "exec commands cannot contain newlines" +msgstr "" + +#: builtin/rebase.c:1282 +msgid "empty exec command" +msgstr "" + +#: builtin/rebase.c:1312 +#, fuzzy +msgid "rebase onto given branch instead of upstream" +msgstr "demasiados ramos para remover a definiรงรฃo de ramo a montante" + +#: builtin/rebase.c:1314 +#, fuzzy +msgid "use the merge-base of upstream and branch as the current base" +msgstr "o ramo a montante solicitado '%s' nรฃo existe" + +#: builtin/rebase.c:1316 +#, fuzzy +msgid "allow pre-rebase hook to run" +msgstr "Rebase recusado pelo hook pre-rebase." + +#: builtin/rebase.c:1318 +msgid "be quiet. implies --no-stat" +msgstr "" + +#: builtin/rebase.c:1324 +#, fuzzy +msgid "do not show diffstat of what changed upstream" +msgstr "nรฃo apresentar um diffstat ao fim da integraรงรฃo" + +#: builtin/rebase.c:1327 +#, fuzzy +msgid "add a Signed-off-by: line to each commit" +msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit" + +#: builtin/rebase.c:1330 +#, fuzzy +msgid "make committer date match author date" +msgstr "agrupar por committer em vez de autor" + +#: builtin/rebase.c:1332 +msgid "ignore author date and use current date" +msgstr "" + +#: builtin/rebase.c:1334 +#, fuzzy +msgid "synonym of --reset-author-date" +msgstr "sinรณnimo de --files-with-matches" + +#: builtin/rebase.c:1336 builtin/rebase.c:1340 +#, fuzzy +msgid "passed to 'git apply'" +msgstr "transmitir ao git-apply" + +#: builtin/rebase.c:1338 +#, fuzzy +msgid "ignore changes in whitespace" +msgstr "ignorar alteraรงรตes de espaรงo em branco ao procurar contexto" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 +msgid "cherry-pick all commits, even if unchanged" +msgstr "" + +#: builtin/rebase.c:1347 +#, fuzzy +msgid "continue" +msgstr "continuar rebase" + +#: builtin/rebase.c:1350 +#, fuzzy +msgid "skip current patch and continue" +msgstr "ignorar o patch atual" + +#: builtin/rebase.c:1352 +#, fuzzy +msgid "abort and check out the original branch" +msgstr " (use \"git rebase --abort\" para restaurar o ramo original)" + +#: builtin/rebase.c:1355 +msgid "abort but keep HEAD where it is" +msgstr "" + +#: builtin/rebase.c:1356 +#, fuzzy +msgid "edit the todo list during an interactive rebase" +msgstr "A aรงรฃo --edit-todo sรณ pode ser usada durante um rebase interativo." + +#: builtin/rebase.c:1359 +msgid "show the patch file being applied or merged" +msgstr "" + +#: builtin/rebase.c:1362 +msgid "use apply strategies to rebase" +msgstr "" + +#: builtin/rebase.c:1366 +#, fuzzy +msgid "use merging strategies to rebase" +msgstr "estratรฉgia de integraรงรฃo a usar" + +#: builtin/rebase.c:1370 +msgid "let the user edit the list of commits to rebase" +msgstr "" + +#: builtin/rebase.c:1374 +msgid "(DEPRECATED) try to recreate merges instead of ignoring them" +msgstr "" + +#: builtin/rebase.c:1379 +msgid "how to handle commits that become empty" +msgstr "" + +#: builtin/rebase.c:1386 +msgid "move commits that begin with squash!/fixup! under -i" +msgstr "" + +#: builtin/rebase.c:1393 +msgid "add exec lines after each commit of the editable list" +msgstr "" + +#: builtin/rebase.c:1397 +#, fuzzy +msgid "allow rebasing commits with empty messages" +msgstr "permitir commits com mensagens vazias" + +#: builtin/rebase.c:1401 +msgid "try to rebase merges instead of skipping them" +msgstr "" + +#: builtin/rebase.c:1404 +#, fuzzy +msgid "use 'merge-base --fork-point' to refine upstream" +msgstr "git merge-base --fork-point <referรชncia> [<commit>]" + +#: builtin/rebase.c:1406 +#, fuzzy +msgid "use the given merge strategy" +msgstr "opรงรฃo de estratรฉgia de integraรงรฃo" + +#: builtin/rebase.c:1408 builtin/revert.c:115 +msgid "option" +msgstr "opรงรฃo" + +#: builtin/rebase.c:1409 +msgid "pass the argument through to the merge strategy" +msgstr "" + +#: builtin/rebase.c:1412 +msgid "rebase all reachable commits up to the root(s)" +msgstr "" + +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "" + +#: builtin/rebase.c:1434 +msgid "" +"the rebase.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" + +#: builtin/rebase.c:1440 +#, fuzzy +msgid "It looks like 'git am' is in progress. Cannot rebase." +msgstr "Parece que o git-am estรก em curso. Nรฃo รฉ possรญvel efetuar rebase." + +#: builtin/rebase.c:1481 +msgid "" +"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." +msgstr "" + +#: builtin/rebase.c:1486 +#, fuzzy +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "Nรฃo รฉ possรญvel combinar --squash e --no-ff." + +#: builtin/rebase.c:1488 +#, fuzzy +msgid "cannot combine '--keep-base' with '--root'" +msgstr "Nรฃo รฉ possรญvel combinar --squash e --no-ff." + +#: builtin/rebase.c:1492 +#, fuzzy +msgid "cannot combine '--root' with '--fork-point'" +msgstr "Nรฃo รฉ possรญvel combinar --squash e --no-ff." + +#: builtin/rebase.c:1495 +msgid "No rebase in progress?" +msgstr "Rebase nรฃo estรก em curso?" + +#: builtin/rebase.c:1499 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "A aรงรฃo --edit-todo sรณ pode ser usada durante um rebase interativo." + +#: builtin/rebase.c:1522 +msgid "Cannot read HEAD" +msgstr "Nรฃo รฉ possรญvel ler HEAD" + +#: builtin/rebase.c:1534 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"Deve editar todos os conflitos da integraรงรฃo\n" +"e marcรก-los como resolvidos usando git add" + +#: builtin/rebase.c:1553 +#, fuzzy +msgid "could not discard worktree changes" +msgstr "Nรฃo รฉ possรญvel remover as alteraรงรตes da รกrvore de trabalho" + +#: builtin/rebase.c:1572 +#, fuzzy, c-format +msgid "could not move back to %s" +msgstr "Nรฃo foi possรญvel voltar para $head_name" + +#: builtin/rebase.c:1618 +#, fuzzy, 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 "" +"Parece que jรก existe um diretรณrio $state_dir_base e\n" +"รฉ possรญvel que outro processo de rebase jรก esteja em curso.\n" +"Se for o caso, tente\n" +"\t$cmd_live_rebase\n" +"Se nรฃo for o caso,\n" +"\t$cmd_clear_stale_rebase\n" +"e execute o comando de novo. A execuรงรฃo foi interrompida no caso de\n" +"ainda ter algo importante nesse sรญtio." + +#: builtin/rebase.c:1646 +#, fuzzy +msgid "switch `C' expects a numerical value" +msgstr "a opรงรฃo '%c' espera um valor numรฉrico" + +#: builtin/rebase.c:1688 +#, fuzzy, c-format +msgid "Unknown mode: %s" +msgstr "Mode de --patch desconhecido: %s" + +#: builtin/rebase.c:1727 +msgid "--strategy requires --merge or --interactive" +msgstr "" + +#: builtin/rebase.c:1757 +msgid "cannot combine apply options with merge options" +msgstr "" + +#: builtin/rebase.c:1770 +#, fuzzy, c-format +msgid "Unknown rebase backend: %s" +msgstr "Subcomando desconhecido: %s" + +#: builtin/rebase.c:1795 +msgid "--reschedule-failed-exec requires --exec or --interactive" +msgstr "" + +#: builtin/rebase.c:1815 +msgid "cannot combine '--preserve-merges' with '--rebase-merges'" +msgstr "" + +#: builtin/rebase.c:1819 +msgid "" +"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" +msgstr "" + +#: builtin/rebase.c:1843 +#, fuzzy, c-format +msgid "invalid upstream '%s'" +msgstr "caminho invรกlido '%s'" + +#: builtin/rebase.c:1849 +#, fuzzy +msgid "Could not create new root commit" +msgstr "nรฃo foi possรญvel analisar o commit recรฉm-criado" + +#: builtin/rebase.c:1875 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "" + +#: builtin/rebase.c:1878 +#, fuzzy, c-format +msgid "'%s': need exactly one merge base" +msgstr "ร necessรกrio exatamente um intervalo." + +#: builtin/rebase.c:1886 +#, fuzzy, c-format +msgid "Does not point to a valid commit '%s'" +msgstr "Nรฃo aponta para um commit vรกlido: $onto_name" + +#: builtin/rebase.c:1912 +#, fuzzy, c-format +msgid "fatal: no such branch/commit '%s'" +msgstr "o ramo '%s' nรฃo existe" + +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 +#, c-format +msgid "No such ref: %s" +msgstr "Referรชncia inexistente: %s" + +#: builtin/rebase.c:1931 +#, fuzzy +msgid "Could not resolve HEAD to a revision" +msgstr "nรฃo foi possรญvel resolver o commit HEAD\n" + +#: builtin/rebase.c:1952 +msgid "Please commit or stash them." +msgstr "Submeta ou esconda-as." + +#: builtin/rebase.c:1988 +#, fuzzy, c-format +msgid "could not switch to %s" +msgstr "nรฃo foi possรญvel escrever para %s" + +#: builtin/rebase.c:1999 +#, fuzzy +msgid "HEAD is up to date." +msgstr "HEAD estรก agora em" + +#: builtin/rebase.c:2001 +#, fuzzy, c-format +msgid "Current branch %s is up to date.\n" +msgstr "O ramo atual $branch_name estรก atualizado." + +#: builtin/rebase.c:2009 +#, fuzzy +msgid "HEAD is up to date, rebase forced." +msgstr "O ramo atual $branch_name estรก atualizado, rebase forรงado." + +#: builtin/rebase.c:2011 +#, fuzzy, c-format +msgid "Current branch %s is up to date, rebase forced.\n" +msgstr "O ramo atual $branch_name estรก atualizado, rebase forรงado." + +#: builtin/rebase.c:2019 +msgid "The pre-rebase hook refused to rebase." +msgstr "Rebase recusado pelo hook pre-rebase." + +#: builtin/rebase.c:2026 +#, fuzzy, c-format +msgid "Changes to %s:\n" +msgstr "A publicar em %s\n" + +#: builtin/rebase.c:2029 +#, fuzzy, c-format +msgid "Changes from %s to %s:\n" +msgstr "Alteraรงรตes de $mb para $onto:" + +#: builtin/rebase.c:2054 +#, fuzzy, c-format +msgid "First, rewinding head to replay your work on top of it...\n" +msgstr "" +"Primeiro, a recuar a cabeรงa para replicar as suas alteraรงรตes no topo dela..." + +#: builtin/rebase.c:2063 +#, fuzzy +msgid "Could not detach HEAD" +msgstr "nรฃo foi possรญvel destacar HEAD" + +#: builtin/rebase.c:2072 +#, fuzzy, c-format +msgid "Fast-forwarded %s to %s.\n" +msgstr "Avanรงo-rรกpido para $sha1" -#: builtin/receive-pack.c:27 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:796 +#: builtin/receive-pack.c:1224 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" @@ -11709,7 +19648,7 @@ msgstr "" "Para suprimir esta mensagem e manter o comportamento predefinido, defina a " "variรกvel de configuraรงรฃo 'receive.denyCurrentBranch' como 'refuse'." -#: builtin/receive-pack.c:816 +#: builtin/receive-pack.c:1244 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" @@ -11729,29 +19668,75 @@ msgstr "" "\n" "Para suprimir esta mensagem, pode definรญ-la como 'refuse'." -#: builtin/receive-pack.c:1889 +#: builtin/receive-pack.c:2422 msgid "quiet" msgstr "silencioso" -#: builtin/receive-pack.c:1903 +#: builtin/receive-pack.c:2436 msgid "You must specify a directory." msgstr "Deve especificar um diretรณrio." -#: builtin/reflog.c:423 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "'%s' em '%s' nรฃo รฉ um carimbo de data/hora vรกlido" +#: builtin/reflog.c:17 +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" +"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " +"<refs>..." +msgstr "" + +#: builtin/reflog.c:22 +msgid "" +"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " +"<refs>..." +msgstr "" -#: builtin/reflog.c:540 builtin/reflog.c:545 +#: builtin/reflog.c:25 +msgid "git reflog exists <ref>" +msgstr "" + +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' nรฃo รฉ um carimbo de data/hora vรกlido" -#: builtin/remote.c:12 +#: builtin/reflog.c:606 +#, fuzzy, c-format +msgid "Marking reachable objects..." +msgstr "manter objetos inalcanรงรกveis" + +#: builtin/reflog.c:644 +#, c-format +msgid "%s points nowhere!" +msgstr "" + +#: builtin/reflog.c:696 +#, fuzzy +msgid "no reflog specified to delete" +msgstr "nenhum remoto especificado" + +#: builtin/reflog.c:705 +#, fuzzy, c-format +msgid "not a reflog: %s" +msgstr "Referรชncia invรกlida: %s" + +#: builtin/reflog.c:710 +#, fuzzy, c-format +msgid "no reflog for '%s'" +msgstr "Nรฃo รฉ possรญvel efetuar reflog de '%s': %s\n" + +#: builtin/reflog.c:756 +#, fuzzy, c-format +msgid "invalid ref format: %s" +msgstr "formato de data invรกlido: %s" + +#: builtin/reflog.c:765 +msgid "git reflog [ show | expire | delete | exists ]" +msgstr "" + +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:13 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11759,82 +19744,82 @@ msgstr "" "git remote add [-t <ramo>] [-m <mestre>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nome> <url>" -#: builtin/remote.c:14 builtin/remote.c:34 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <antigo> <novo>" -#: builtin/remote.c:15 builtin/remote.c:39 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <nome>" -#: builtin/remote.c:16 builtin/remote.c:44 +#: builtin/remote.c:21 builtin/remote.c:49 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nome> (-a | --auto | -d | --delete | <ramo>)" -#: builtin/remote.c:17 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nome>" -#: builtin/remote.c:18 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nome>" -#: builtin/remote.c:19 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]" -#: builtin/remote.c:20 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nome> <ramo>..." -#: builtin/remote.c:21 builtin/remote.c:70 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nome>" -#: builtin/remote.c:22 builtin/remote.c:75 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nome> <novo-url> [<url-antigo>]" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nome> <novo-url>" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nome> <url>" -#: builtin/remote.c:29 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opรงรตes>] <nome> <url>" -#: builtin/remote.c:49 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nome> <ramo>..." -#: builtin/remote.c:50 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nome> <ramo>..." -#: builtin/remote.c:55 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<opรงรตes>] <nome>" -#: builtin/remote.c:60 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<opรงรตes>] <nome>" -#: builtin/remote.c:65 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<opรงรตes>] [<grupo> | <remoto>]..." -#: builtin/remote.c:94 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "A atualizar %s" -#: builtin/remote.c:126 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -11842,88 +19827,97 @@ msgstr "" "--mirror รฉ perigoso e obsoleto;\n" "\t use --mirror=fetch ou --mirror=push" -#: builtin/remote.c:143 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "argumento de mirror desconhecido: %s" -#: builtin/remote.c:159 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "obter os ramos remotos" -#: builtin/remote.c:161 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "importar todas as tags e objetos associados ao obter" -#: builtin/remote.c:164 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "ou nรฃo obter nenhuma tag (--no-tags)" -#: builtin/remote.c:166 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "ramos a seguir" -#: builtin/remote.c:167 +#: builtin/remote.c:172 msgid "master branch" msgstr "ramo mestre" -#: builtin/remote.c:168 -msgid "push|fetch" -msgstr "push|fetch" - -#: builtin/remote.c:169 +#: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "configurar o remoto como um espelho para publicar ou obter" -#: builtin/remote.c:181 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "especificar um ramo mestre nรฃo faz sentido com --mirror" -#: builtin/remote.c:183 +#: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "especificar ramos para seguir sรณ faz sentido com fetch mirrors" -#: builtin/remote.c:190 builtin/remote.c:629 +#: builtin/remote.c:195 builtin/remote.c:697 #, c-format msgid "remote %s already exists." msgstr "o remoto %s jรก existe." -#: builtin/remote.c:194 builtin/remote.c:633 +#: builtin/remote.c:199 builtin/remote.c:701 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' nรฃo รฉ um nome de remoto vรกlido" -#: builtin/remote.c:234 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "Nรฃo foi possรญvel configuraรงรฃo o ramo mestre '%s'" -#: builtin/remote.c:336 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" "Nรฃo foi possรญvel obter o mapa de fetch do especificador de referรชncia %s" -#: builtin/remote.c:437 builtin/remote.c:445 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(correspondente)" -#: builtin/remote.c:449 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(eliminado)" -#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856 +#: builtin/remote.c:654 +#, fuzzy, c-format +msgid "could not set '%s'" +msgstr "nรฃo foi possรญvel reiniciar '%s'" + +#: builtin/remote.c:659 #, c-format -msgid "No such remote: %s" -msgstr "Remoto inexistente: %s" +msgid "" +"The %s configuration remote.pushDefault in:\n" +"\t%s:%d\n" +"now names the non-existent remote '%s'" +msgstr "" -#: builtin/remote.c:639 +#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941 +#, fuzzy, c-format +msgid "No such remote: '%s'" +msgstr "Remoto inexistente '%s'" + +#: builtin/remote.c:707 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" "Nรฃo foi possรญvel mudar o nome da secรงรฃo de configuraรงรฃo de '%s' para '%s'" -#: builtin/remote.c:659 +#: builtin/remote.c:727 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11935,17 +19929,17 @@ msgstr "" "\t%s\n" "\tAtualize a configuraรงรฃo manualmente se necessรกrio." -#: builtin/remote.c:695 +#: builtin/remote.c:767 #, c-format msgid "deleting '%s' failed" msgstr "falha ao eliminar '%s'" -#: builtin/remote.c:729 +#: builtin/remote.c:801 #, c-format msgid "creating '%s' failed" msgstr "falha ao criar '%s'" -#: builtin/remote.c:794 +#: builtin/remote.c:877 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11959,306 +19953,304 @@ msgstr[1] "" "Nota: alguns ramos fora da hierarquia refs/remotes/ nรฃo foram removidos;\n" "para os remover, use:" -#: builtin/remote.c:808 +#: builtin/remote.c:891 #, c-format msgid "Could not remove config section '%s'" msgstr "Nรฃo foi possรญvel remover a secรงรฃo de configuraรงรฃo '%s'" -#: builtin/remote.c:909 +#: builtin/remote.c:994 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " novo (os prรณxima objetos obtidos serรฃo guardados em remotes/%s)" -#: builtin/remote.c:912 +#: builtin/remote.c:997 msgid " tracked" msgstr " seguido" -#: builtin/remote.c:914 +#: builtin/remote.c:999 msgid " stale (use 'git remote prune' to remove)" msgstr " obsoleto (use 'git remote prune' para remover)" -#: builtin/remote.c:916 +#: builtin/remote.c:1001 msgid " ???" msgstr " ???" -#: builtin/remote.c:957 +#: builtin/remote.c:1042 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "branch.%s.merge invรกlido; nรฃo รฉ possรญvel rebasear sobre mais do que um ramo" -#: builtin/remote.c:965 +#: builtin/remote.c:1051 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebaseia interativamente sobre %s do remoto" -#: builtin/remote.c:966 +#: builtin/remote.c:1053 +#, fuzzy, c-format +msgid "rebases interactively (with merges) onto remote %s" +msgstr "rebaseia interativamente sobre %s do remoto" + +#: builtin/remote.c:1056 #, c-format msgid "rebases onto remote %s" msgstr "rebaseia sobre %s do remoto" -#: builtin/remote.c:969 +#: builtin/remote.c:1060 #, c-format msgid " merges with remote %s" msgstr " integra com %s do remoto" -#: builtin/remote.c:972 +#: builtin/remote.c:1063 #, c-format msgid "merges with remote %s" msgstr "integra com %s do remoto" -#: builtin/remote.c:975 +#: builtin/remote.c:1066 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s e com o %s do remoto\n" -#: builtin/remote.c:1018 +#: builtin/remote.c:1109 msgid "create" msgstr "criado" -#: builtin/remote.c:1021 +#: builtin/remote.c:1112 msgid "delete" msgstr "eliminado" -#: builtin/remote.c:1025 +#: builtin/remote.c:1116 msgid "up to date" msgstr "atualizado" -#: builtin/remote.c:1028 +#: builtin/remote.c:1119 msgid "fast-forwardable" msgstr "pode ser avanรงado rapidamente" -#: builtin/remote.c:1031 +#: builtin/remote.c:1122 msgid "local out of date" msgstr "local desatualizado" -#: builtin/remote.c:1038 +#: builtin/remote.c:1129 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s forรงa em %-*s (%s)" -#: builtin/remote.c:1041 +#: builtin/remote.c:1132 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s publica em %-*s (%s)" -#: builtin/remote.c:1045 +#: builtin/remote.c:1136 #, c-format msgid " %-*s forces to %s" msgstr " %-*s forรงa em %s" -#: builtin/remote.c:1048 +#: builtin/remote.c:1139 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s publica em %s" -#: builtin/remote.c:1116 +#: builtin/remote.c:1207 msgid "do not query remotes" msgstr "nรฃo consultar remotos" -#: builtin/remote.c:1143 +#: builtin/remote.c:1234 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1144 +#: builtin/remote.c:1235 #, c-format msgid " Fetch URL: %s" msgstr " Obter do URL: %s" -#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297 +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 msgid "(no URL)" msgstr "(nenhum URL)" -#. TRANSLATORS: the colon ':' should align with -#. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1156 builtin/remote.c:1158 +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#. +#: builtin/remote.c:1250 builtin/remote.c:1252 #, c-format msgid " Push URL: %s" msgstr " Publicar no URL: %s" -#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164 +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 #, c-format msgid " HEAD branch: %s" msgstr " Ramo HEAD: %s" -#: builtin/remote.c:1160 +#: builtin/remote.c:1254 msgid "(not queried)" msgstr "(nรฃo consultado)" -#: builtin/remote.c:1162 +#: builtin/remote.c:1256 msgid "(unknown)" msgstr "(desconhecido)" -#: builtin/remote.c:1166 +#: builtin/remote.c:1260 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " Ramo HEAD (o remoto HEAD รฉ ambรญguo, pode ser um dos seguintes):\n" -#: builtin/remote.c:1178 +#: builtin/remote.c:1272 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Ramo remoto:%s" msgstr[1] " Ramos remotos:%s" -#: builtin/remote.c:1181 builtin/remote.c:1207 +#: builtin/remote.c:1275 builtin/remote.c:1301 msgid " (status not queried)" msgstr " (estado nรฃo consultado)" -#: builtin/remote.c:1190 +#: builtin/remote.c:1284 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Ramo local configurado para 'git pull':" msgstr[1] " Ramos locais configurados para 'git pull':" -#: builtin/remote.c:1198 +#: builtin/remote.c:1292 msgid " Local refs will be mirrored by 'git push'" msgstr " Referรชncias locais serรฃo refletidas (mirror) por 'git push'" -#: builtin/remote.c:1204 +#: builtin/remote.c:1298 #, 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 para 'git push'%s:" msgstr[1] " Referรชncias locais configuradas para 'git push'%s:" -#: builtin/remote.c:1225 +#: builtin/remote.c:1319 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "definir refs/remotes/<nome>/HEAD de acordo com o remoto" -#: builtin/remote.c:1227 +#: builtin/remote.c:1321 msgid "delete refs/remotes/<name>/HEAD" msgstr "eliminar refs/remotes/<nome>/HEAD" -#: builtin/remote.c:1242 +#: builtin/remote.c:1336 msgid "Cannot determine remote HEAD" msgstr "Nรฃo รฉ possรญvel determinar o remoto HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1338 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Mรบltiplos ramos HEAD remotos. Escolha um explicitamente com:" -#: builtin/remote.c:1254 +#: builtin/remote.c:1348 #, c-format msgid "Could not delete %s" msgstr "Nรฃo foi possรญvel eliminar %s" -#: builtin/remote.c:1262 +#: builtin/remote.c:1356 #, c-format msgid "Not a valid ref: %s" msgstr "Referรชncia invรกlida: %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1358 #, c-format msgid "Could not setup %s" msgstr "Nรฃo foi possรญvel configurar %s" -#: builtin/remote.c:1282 +#: builtin/remote.c:1376 #, c-format msgid " %s will become dangling!" msgstr " %s ficarรก suspenso!" -#: builtin/remote.c:1283 +#: builtin/remote.c:1377 #, c-format msgid " %s has become dangling!" msgstr " %s ficou suspenso!" -#: builtin/remote.c:1293 +#: builtin/remote.c:1387 #, c-format msgid "Pruning %s" msgstr "A eliminar %s" -#: builtin/remote.c:1294 +#: builtin/remote.c:1388 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1310 +#: builtin/remote.c:1404 #, c-format msgid " * [would prune] %s" msgstr " * [eliminaria] %s" -#: builtin/remote.c:1313 +#: builtin/remote.c:1407 #, c-format msgid " * [pruned] %s" msgstr " * [eliminado] %s" -#: builtin/remote.c:1358 +#: builtin/remote.c:1452 msgid "prune remotes after fetching" msgstr "eliminar remotos depois de obter" -#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543 +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 #, c-format msgid "No such remote '%s'" msgstr "Remoto inexistente '%s'" -#: builtin/remote.c:1437 +#: builtin/remote.c:1531 msgid "add branch" msgstr "adicionar ramo" -#: builtin/remote.c:1444 +#: builtin/remote.c:1538 msgid "no remote specified" msgstr "nenhum remoto especificado" -#: builtin/remote.c:1461 +#: builtin/remote.c:1555 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de publicaรงรฃo em vez de URLs utilizados para obter" -#: builtin/remote.c:1463 +#: builtin/remote.c:1557 msgid "return all URLs" msgstr "retornar todos os URLs" -#: builtin/remote.c:1491 +#: builtin/remote.c:1585 #, c-format msgid "no URLs configured for remote '%s'" msgstr "o remoto '%s' nรฃo tem nenhum URL configurado" -#: builtin/remote.c:1517 +#: builtin/remote.c:1611 msgid "manipulate push URLs" msgstr "manipular URLs de publicaรงรฃo" -#: builtin/remote.c:1519 +#: builtin/remote.c:1613 msgid "add URL" msgstr "adicionar URL" -#: builtin/remote.c:1521 +#: builtin/remote.c:1615 msgid "delete URLs" msgstr "eliminar URLs" -#: builtin/remote.c:1528 +#: builtin/remote.c:1622 msgid "--add --delete doesn't make sense" msgstr "--add --delete nรฃo faz sentido" -#: builtin/remote.c:1569 +#: builtin/remote.c:1661 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Padrรฃo de URL antigo invรกlido: %s" -#: builtin/remote.c:1577 +#: builtin/remote.c:1669 #, c-format msgid "No such URL found: %s" msgstr "URL nรฃo encontrado: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1671 msgid "Will not delete all non-push URLs" msgstr "Nรฃo รฉ possรญvel remover todos os URLs de nรฃo publicaรงรฃo" -#: builtin/remote.c:1593 -msgid "be verbose; must be placed before a subcommand" -msgstr "ser verboso; deve ser colocado antes de um subcomando" - -#: builtin/remote.c:1624 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Subcomando desconhecido: %s" - -#: builtin/repack.c:17 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [<opรงรตes>]" -#: builtin/repack.c:22 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -12266,125 +20258,273 @@ msgstr "" "Repacks incrementais sรฃo incompatรญveis com รญndices bitmap. Use\n" "--no-write-bitmap-รญndex ou desative a configuraรงรฃo pack.writebitmaps." -#: builtin/repack.c:166 +#: builtin/repack.c:197 +msgid "could not start pack-objects to repack promisor objects" +msgstr "" + +#: builtin/repack.c:236 builtin/repack.c:421 +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "" + +#: builtin/repack.c:260 +msgid "could not finish pack-objects to repack promisor objects" +msgstr "" + +#: builtin/repack.c:297 msgid "pack everything in a single pack" msgstr "compactar tudo num รบnico pacote" -#: builtin/repack.c:168 +#: builtin/repack.c:299 msgid "same as -a, and turn unreachable objects loose" msgstr "o mesmo que -a, e soltar objetos inalcanรงรกveis" -#: builtin/repack.c:171 +#: builtin/repack.c:302 msgid "remove redundant packs, and run git-prune-packed" msgstr "remover pacotes redundantes e executar git-prune-packed" -#: builtin/repack.c:173 +#: builtin/repack.c:304 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passar --no-reuse-delta ao git-pack-objects" -#: builtin/repack.c:175 +#: builtin/repack.c:306 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passar --no-reuse-object ao git-pack-objects" -#: builtin/repack.c:177 +#: builtin/repack.c:308 msgid "do not run git-update-server-info" msgstr "nรฃo executar git-update-server-info" -#: builtin/repack.c:180 +#: builtin/repack.c:311 msgid "pass --local to git-pack-objects" msgstr "passar --local ao git-pack-objects" -#: builtin/repack.c:182 +#: builtin/repack.c:313 msgid "write bitmap index" msgstr "escrever รญndice de mapa de bits" -#: builtin/repack.c:183 +#: builtin/repack.c:315 +#, fuzzy +msgid "pass --delta-islands to git-pack-objects" +msgstr "passar --local ao git-pack-objects" + +#: builtin/repack.c:316 msgid "approxidate" msgstr "aproximar" -#: builtin/repack.c:184 +#: builtin/repack.c:317 msgid "with -A, do not loosen objects older than this" msgstr "com -A, nรฃo soltar mais objetos alรฉm destes" -#: builtin/repack.c:186 +#: builtin/repack.c:319 msgid "with -a, repack unreachable objects" msgstr "com -a, reempacotar objetos inalcanรงรกveis" -#: builtin/repack.c:188 +#: builtin/repack.c:321 msgid "size of the window used for delta compression" msgstr "dimensรฃo da janela usada em compressรฃo de deltas" -#: builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:322 builtin/repack.c:328 msgid "bytes" msgstr "bytes" -#: builtin/repack.c:190 +#: builtin/repack.c:323 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "o mesmo que o anterior, mas limitar a memรณria usada em vez do nรบmero de " "entradas" -#: builtin/repack.c:192 +#: builtin/repack.c:325 msgid "limits the maximum delta depth" msgstr "limitar a profundidade mรกxima de delta" -#: builtin/repack.c:194 +#: builtin/repack.c:327 +#, fuzzy +msgid "limits the maximum number of threads" +msgstr "limitar a profundidade mรกxima de delta" + +#: builtin/repack.c:329 msgid "maximum size of each packfile" msgstr "tamanho mรกximo de cada ficheiro de pacote" -#: builtin/repack.c:196 +#: builtin/repack.c:331 msgid "repack objects in packs marked with .keep" msgstr "reempacotar objetos em pacotes marcados com .keep" -#: builtin/repack.c:206 +#: builtin/repack.c:333 +#, fuzzy +msgid "do not repack this pack" +msgstr "criar pacotes finos" + +#: builtin/repack.c:343 msgid "cannot delete packs in a precious-objects repo" msgstr "nรฃo รฉ possรญvel eliminar pacotes num repositรณrio de objetos-preciosos" -#: builtin/repack.c:210 +#: builtin/repack.c:347 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable e -A sรฃo incompatรญveis" -#: builtin/repack.c:400 builtin/worktree.c:115 +#: builtin/repack.c:430 +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 "" + +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "falha ao remover '%s'" -#: builtin/replace.c:19 +#: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <objeto> <substituiรงรฃo>" -#: builtin/replace.c:20 +#: builtin/replace.c:23 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <objeto>" -#: builtin/replace.c:21 +#: builtin/replace.c:24 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <commit> [<pai>...]" -#: builtin/replace.c:22 +#: builtin/replace.c:25 +#, fuzzy +msgid "git replace [-f] --convert-graft-file" +msgstr "git replace [-f] --edit <objeto>" + +#: builtin/replace.c:26 msgid "git replace -d <object>..." msgstr "git replace -d <objeto>..." -#: builtin/replace.c:23 +#: builtin/replace.c:27 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<formato>] [-l [<padrรฃo>]]" -#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395 +#: builtin/replace.c:90 #, c-format -msgid "Not a valid object name: '%s'" +msgid "" +"invalid replace format '%s'\n" +"valid formats are 'short', 'medium' and 'long'" +msgstr "" + +#: builtin/replace.c:125 +#, fuzzy, c-format +msgid "replace ref '%s' not found" +msgstr "ramo '%s' nรฃo encontrado." + +#: builtin/replace.c:141 +#, fuzzy, c-format +msgid "Deleted replace ref '%s'" +msgstr "eliminar referรชncias substituรญdas" + +#: builtin/replace.c:153 +#, fuzzy, c-format +msgid "'%s' is not a valid ref name" +msgstr "'%s' nรฃo รฉ um nome de remoto vรกlido" + +#: builtin/replace.c:158 +#, fuzzy, c-format +msgid "replace ref '%s' already exists" +msgstr "a tag '%s' jรก existe" + +#: 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 "" + +#: builtin/replace.c:229 +#, fuzzy, c-format +msgid "unable to open %s for writing" +msgstr "nรฃo foi possรญvel abrir %s para escrita" + +#: builtin/replace.c:242 +msgid "cat-file reported failure" +msgstr "" + +#: builtin/replace.c:258 +#, fuzzy, c-format +msgid "unable to open %s for reading" +msgstr "nรฃo รฉ possรญvel abrir ou ler %s" + +#: builtin/replace.c:272 +#, fuzzy +msgid "unable to spawn mktree" +msgstr "nรฃo foi possรญvel ler a รกrvore (%s)" + +#: builtin/replace.c:276 +#, fuzzy +msgid "unable to read from mktree" +msgstr "nรฃo foi possรญvel ler a รกrvore (%s)" + +#: builtin/replace.c:285 +#, fuzzy +msgid "mktree reported failure" +msgstr "falha ao reverter" + +#: builtin/replace.c:289 +#, fuzzy +msgid "mktree did not return an object name" +msgstr "o remoto nรฃo enviou todos os objetos necessรกrios" + +#: builtin/replace.c:298 +#, fuzzy, c-format +msgid "unable to fstat %s" +msgstr "nรฃo foi possรญvel atualizar %s" + +#: builtin/replace.c:303 +#, fuzzy +msgid "unable to write object to database" +msgstr "nรฃo รฉ possรญvel escrever o objeto de nota" + +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 +#: builtin/replace.c:454 +#, fuzzy, c-format +msgid "not a valid object name: '%s'" msgstr "Nome de objeto invรกlido: '%s'" -#: builtin/replace.c:359 +#: builtin/replace.c:326 +#, fuzzy, c-format +msgid "unable to get object type for %s" +msgstr "nรฃo foi possรญvel efetuar grep de objetos do tipo %s" + +#: builtin/replace.c:342 +#, fuzzy +msgid "editing object file failed" +msgstr "falha ao ler referรชncias bissetadas" + +#: builtin/replace.c:351 +#, c-format +msgid "new object is the same as the old one: '%s'" +msgstr "" + +#: builtin/replace.c:384 +#, fuzzy, c-format +msgid "could not parse %s as a commit" +msgstr "nรฃo foi possรญvel analisar o commit HEAD" + +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mergetag incorreta no commit '%s'" -#: builtin/replace.c:361 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "mergetag malformada no commit '%s'" -#: builtin/replace.c:372 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -12393,205 +20533,308 @@ msgstr "" "o commit original '%s' contรฉm a mergetag '%s' que foi excluรญda; use --edit " "em vez de --graft" -#: builtin/replace.c:405 -#, c-format -msgid "the original commit '%s' has a gpg signature." +#: builtin/replace.c:469 +#, fuzzy, c-format +msgid "the original commit '%s' has a gpg signature" msgstr "o commit original '%s' tem uma assinatura gpg." -#: builtin/replace.c:406 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "a assinatura serรก removida do commit suplente!" -#: builtin/replace.c:412 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "nรฃo foi possรญvel escrever o commit suplente de: '%s'" -#: builtin/replace.c:436 +#: builtin/replace.c:488 +#, c-format +msgid "graft for '%s' unnecessary" +msgstr "" + +#: builtin/replace.c:492 +#, c-format +msgid "new commit is the same as the old one: '%s'" +msgstr "" + +#: builtin/replace.c:527 +#, fuzzy, c-format +msgid "" +"could not convert the following graft(s):\n" +"%s" +msgstr "Removeria o seguinte item:" + +#: builtin/replace.c:548 msgid "list replace refs" msgstr "listar referรชncias substituรญdas" -#: builtin/replace.c:437 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "eliminar referรชncias substituรญdas" -#: builtin/replace.c:438 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "editar objeto existente" -#: builtin/replace.c:439 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "mudar os pais de um commit" -#: builtin/replace.c:440 +#: builtin/replace.c:552 +#, fuzzy +msgid "convert existing graft file" +msgstr "forรงar substituiรงรฃo dos ficheiros existentes" + +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "substituir a referรชncia se esta existir" -#: builtin/replace.c:441 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "nรฃo mostrar o conteรบdo de --edit com impressรฃo bonita" -#: builtin/replace.c:442 +#: builtin/replace.c:556 msgid "use this format" msgstr "usar este formato" -#: builtin/rerere.c:12 +#: builtin/replace.c:569 +#, fuzzy +msgid "--format cannot be used when not listing" +msgstr "--fix-thin nรฃo pode ser usado sem --stdin" + +#: builtin/replace.c:577 +#, fuzzy +msgid "-f only makes sense when writing a replacement" +msgstr "-z sรณ faz sentido com --stdin" + +#: builtin/replace.c:581 +#, fuzzy +msgid "--raw only makes sense with --edit" +msgstr "-z sรณ faz sentido com --stdin" + +#: builtin/replace.c:587 +msgid "-d needs at least one argument" +msgstr "" + +#: builtin/replace.c:593 +msgid "bad number of arguments" +msgstr "" + +#: builtin/replace.c:599 +#, fuzzy +msgid "-e needs exactly one argument" +msgstr "ร necessรกrio exatamente um intervalo." + +#: builtin/replace.c:605 +msgid "-g needs at least one argument" +msgstr "" + +#: builtin/replace.c:611 +#, fuzzy +msgid "--convert-graft-file takes no argument" +msgstr "--continue nรฃo leva argumentos" + +#: builtin/replace.c:617 +#, fuzzy +msgid "only one pattern can be given with -l" +msgstr "combinar padrรตes especificados com -e" + +#: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" "git rerere [clear | forget <caminho>... | status | remaining | diff | gc]" -#: builtin/rerere.c:58 +#: builtin/rerere.c:60 msgid "register clean resolutions in index" msgstr "registar resoluรงรตes limpas no รญndice" -#: builtin/reset.c:26 +#: builtin/rerere.c:79 +msgid "'git rerere forget' without paths is deprecated" +msgstr "" + +#: builtin/rerere.c:113 +#, fuzzy, c-format +msgid "unable to generate diff for '%s'" +msgstr "nรฃo foi possรญvel criar '%s'" + +#: builtin/reset.c:32 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -#: builtin/reset.c:27 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +#: builtin/reset.c:33 +#, fuzzy +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "git reset [-q] [<รกrvore-etc>] [--] <caminhos>..." -#: builtin/reset.c:28 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +#: 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>...]" msgstr "git reset --patch [<รกrvore-etc>] [--] [<caminhos>...]" -#: builtin/reset.c:34 +#: builtin/reset.c:41 msgid "mixed" msgstr "misturado" -#: builtin/reset.c:34 +#: builtin/reset.c:41 msgid "soft" msgstr "suave" -#: builtin/reset.c:34 +#: builtin/reset.c:41 msgid "hard" msgstr "forte" -#: builtin/reset.c:34 +#: builtin/reset.c:41 msgid "merge" msgstr "merge" -#: builtin/reset.c:34 +#: builtin/reset.c:41 msgid "keep" msgstr "conservador" -#: builtin/reset.c:74 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "HEAD invรกlida." -#: builtin/reset.c:76 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "Falha ao procurar รกrvore de HEAD." -#: builtin/reset.c:82 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "Falha ao procurar รกrvore de %s." -#: builtin/reset.c:100 +#: builtin/reset.c:116 #, c-format msgid "HEAD is now at %s" msgstr "HEAD estรก agora em %s" -#: builtin/reset.c:183 +#: builtin/reset.c:195 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Nรฃo รฉ possรญvel repor de modo %s durante uma integraรงรฃo." -#: builtin/reset.c:276 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "silencioso, sรณ reportar erros" -#: builtin/reset.c:278 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "repor HEAD e รญndice" -#: builtin/reset.c:279 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "repor HEAD apenas" -#: builtin/reset.c:281 builtin/reset.c:283 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "repor HEAD, รญndice e รกrvore de trabalho" -#: builtin/reset.c:285 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "repor HEAD mas conservar alteraรงรตes locais" -#: builtin/reset.c:288 +#: builtin/reset.c:310 msgid "record only the fact that removed paths will be added later" msgstr "registar apenas o facto de que os caminhos removidos serรฃo adicionados" -#: builtin/reset.c:305 +#: builtin/reset.c:344 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Falha ao resolver '%s' como referรชncia vรกlida." -#: builtin/reset.c:313 +#: builtin/reset.c:352 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Falha ao resolver '%s' como รกrvore vรกlida." -#: builtin/reset.c:322 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch รฉ incompatรญvel com --{hard,mixed,soft}" -#: builtin/reset.c:331 +#: builtin/reset.c:371 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed acompanhado com caminhos รฉ obsoleto; use 'git reset -- <caminhos>'." -#: builtin/reset.c:333 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "Nรฃo รฉ possรญvel repor de modo %s com caminhos." -#: builtin/reset.c:343 +#: builtin/reset.c:388 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "Nรฃo รฉ permitido repor de modo %s num repositรณrio nu" -#: builtin/reset.c:347 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "-N sรณ pode ser usado com --mixed" -#: builtin/reset.c:364 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "Alteraรงรตes nรฃo preparadas depois de repor:" -#: builtin/reset.c:370 +#: builtin/reset.c:416 +#, 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 "" + +#: builtin/reset.c:434 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Nรฃo foi possรญvel repor o ficheiro รญndice para a revisรฃo '%s'." -#: builtin/reset.c:374 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "Nรฃo foi possรญvel escrever novo ficheiro de รญndice." -#: builtin/rev-list.c:354 +#: builtin/rev-list.c:499 +msgid "cannot combine --exclude-promisor-objects and --missing" +msgstr "" + +#: builtin/rev-list.c:560 +msgid "object filtering requires --objects" +msgstr "" + +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "rev-list nรฃo suporta apresentaรงรฃo de notas" -#: builtin/rev-parse.c:393 +#: builtin/rev-list.c:615 +#, fuzzy +msgid "marked counting is incompatible with --objects" +msgstr "--first-parent รฉ incompatรญvel com --bisect" + +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<opรงรตes>] -- [<argumentos>...]" -#: builtin/rev-parse.c:398 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "conservar '--' passado como argumento" -#: builtin/rev-parse.c:400 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "parar de analisar depois do primeiro argumento que nรฃo seja uma opรงรฃo" -#: builtin/rev-parse.c:403 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "mostrar em formato fixo e longo" -#: builtin/rev-parse.c:534 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12606,96 +20849,98 @@ msgstr "" "Execute \"git rev-parse --parseopt -h\" para obter mais informaรงรฃo sobre a " "primeira utilizaรงรฃo." -#: builtin/revert.c:22 +#: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<opรงรตes>] <commit-etc>..." -#: builtin/revert.c:23 +#: builtin/revert.c:25 msgid "git revert <subcommand>" msgstr "git revert <subcommando>" -#: builtin/revert.c:28 +#: builtin/revert.c:30 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<opรงรตes>] <commit-etc>..." -#: builtin/revert.c:29 +#: builtin/revert.c:31 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <subcommando>" -#: builtin/revert.c:89 +#: builtin/revert.c:72 +#, fuzzy, c-format +msgid "option `%s' expects a number greater than zero" +msgstr "a opรงรฃo '%c' espera um valor numรฉrico" + +#: builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s nรฃo pode ser usado com %s" -#: builtin/revert.c:98 +#: builtin/revert.c:102 msgid "end revert or cherry-pick sequence" msgstr "terminar reversรฃo ou cherry-pick" -#: builtin/revert.c:99 +#: builtin/revert.c:103 msgid "resume revert or cherry-pick sequence" msgstr "retomar a reversรฃo ou cherry-pick" -#: builtin/revert.c:100 +#: builtin/revert.c:104 msgid "cancel revert or cherry-pick sequence" msgstr "cancelar reversรฃo ou cherry-pick" -#: builtin/revert.c:101 +#: builtin/revert.c:105 +#, fuzzy +msgid "skip current commit and continue" +msgstr "imprimir conteรบdo do commit" + +#: builtin/revert.c:107 msgid "don't automatically commit" msgstr "nรฃo submeter automaticamente" -#: builtin/revert.c:102 +#: builtin/revert.c:108 msgid "edit the commit message" msgstr "editar a mensagem de commit" -#: builtin/revert.c:105 +#: builtin/revert.c:111 msgid "parent-number" msgstr "nรบmero-pai" -#: builtin/revert.c:106 +#: builtin/revert.c:112 msgid "select mainline parent" msgstr "selecionar pai principal" -#: builtin/revert.c:108 +#: builtin/revert.c:114 msgid "merge strategy" msgstr "estratรฉgia de integraรงรฃo" -#: builtin/revert.c:109 -msgid "option" -msgstr "opรงรฃo" - -#: builtin/revert.c:110 +#: builtin/revert.c:116 msgid "option for merge strategy" msgstr "opรงรฃo de estratรฉgia de integraรงรฃo" -#: builtin/revert.c:119 +#: builtin/revert.c:125 msgid "append commit name" msgstr "acrescentar nome do commit" -#: builtin/revert.c:121 +#: builtin/revert.c:127 msgid "preserve initially empty commits" msgstr "preservar commits inicialmente vazios" -#: builtin/revert.c:122 -msgid "allow commits with empty messages" -msgstr "permitir commits com mensagens vazias" - -#: builtin/revert.c:123 +#: builtin/revert.c:129 msgid "keep redundant, empty commits" msgstr "manter commits redundantes e vazios" -#: builtin/revert.c:211 +#: builtin/revert.c:232 msgid "revert failed" msgstr "falha ao reverter" -#: builtin/revert.c:224 +#: builtin/revert.c:245 msgid "cherry-pick failed" msgstr "falha ao efetuar cherry-pick" -#: builtin/rm.c:17 +#: builtin/rm.c:19 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<opรงรตes>] [--] <ficheiro>..." -#: builtin/rm.c:205 +#: builtin/rm.c:207 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -12709,7 +20954,7 @@ msgstr[1] "" "os seguintes ficheiros tรชm conteรบdo preparado no รญndice diferente\n" "do conteรบdo no ficheiro e em HEAD:" -#: builtin/rm.c:210 +#: builtin/rm.c:212 msgid "" "\n" "(use -f to force removal)" @@ -12717,13 +20962,13 @@ msgstr "" "\n" "(use -f para forรงar remoรงรฃo)" -#: builtin/rm.c:214 +#: 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] "o seguinte ficheiro contรฉm alteraรงรตes preparadas no รญndice:" msgstr[1] "os seguintes ficheiros contรชm alteraรงรตes preparadas no รญndice:" -#: builtin/rm.c:218 builtin/rm.c:227 +#: builtin/rm.c:220 builtin/rm.c:229 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -12731,48 +20976,53 @@ msgstr "" "\n" "(use --cached para manter o ficheiro, ou -f para forรงar remoรงรฃo)" -#: builtin/rm.c:224 +#: builtin/rm.c:226 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "o seguinte ficheiro contรฉm alteraรงรตes locais:" msgstr[1] "os seguintes ficheiros contรชm alteraรงรตes locais:" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "nรฃo listar ficheiros removidos" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "remover apenas do รญndice" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "ignorar verificaรงรฃo de atualizaรงรฃo" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "permitir remoรงรฃo recursiva" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "sair com valor zero mesmo quando nรฃo hรก correspondรชncia" -#: builtin/rm.c:308 +#: builtin/rm.c:282 +msgid "No pathspec was given. Which files should I remove?" +msgstr "" + +#: builtin/rm.c:305 +#, fuzzy +msgid "please stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"Prepare as suas alteraรงรตes em .gitmodules ou esconda-as para prosseguir" + +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "nรฃo remover '%s' recursivamente sem -r" -#: builtin/rm.c:347 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: nรฃo รฉ possรญvel remover %s" -#: builtin/rm.c:370 -#, c-format -msgid "could not remove '%s'" -msgstr "nรฃo foi possรญvel remover '%s'" - -#: builtin/send-pack.c:18 +#: builtin/send-pack.c:20 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " @@ -12785,52 +21035,84 @@ msgstr "" " --all e especificaรงรฃo explicita duma <referรชncia> sรฃo mutuamente " "exclusivos." -#: builtin/send-pack.c:161 +#: builtin/send-pack.c:182 msgid "remote name" msgstr "nome do remoto" -#: builtin/send-pack.c:175 +#: builtin/send-pack.c:195 msgid "use stateless RPC protocol" msgstr "use protocolo RPC sem estado" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:196 msgid "read refs from stdin" msgstr "ler referรชncias do stdin" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:197 msgid "print status from remote helper" msgstr "imprimir estado do programa auxiliar remoto" -#: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +#: builtin/shortlog.c:15 +#, fuzzy +msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "" "git shortlog [<opรงรตes>] [<intervalo-de-revisรตes>] [[--] [<caminho>...]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:16 +#, fuzzy +msgid "git log --pretty=short | git shortlog [<options>]" +msgstr "git worktree list [<opรงรตes>]" + +#: builtin/shortlog.c:134 +msgid "using multiple --group options with stdin is not supported" +msgstr "" + +#: builtin/shortlog.c:144 +msgid "using --group=trailer with stdin is not supported" +msgstr "" + +#: builtin/shortlog.c:388 +#, fuzzy, c-format +msgid "unknown group type: %s" +msgstr "Tipo desconhecido: %d" + +#: builtin/shortlog.c:416 msgid "Group by committer rather than author" msgstr "agrupar por committer em vez de autor" -#: builtin/shortlog.c:250 +#: builtin/shortlog.c:419 msgid "sort output according to the number of commits per author" msgstr "ordenar saรญda de acordo com o nรบmero de commits por autor" -#: builtin/shortlog.c:252 +#: builtin/shortlog.c:421 msgid "Suppress commit descriptions, only provides commit count" msgstr "suprimir a descriรงรฃo dos commits, fornecer apenas o nรบmero de commits" -#: builtin/shortlog.c:254 +#: builtin/shortlog.c:423 msgid "Show the email address of each author" msgstr "Mostrar o endereรงo de e-mail de cada autor" -#: builtin/shortlog.c:255 -msgid "w[,i1[,i2]]" -msgstr "w[,i1[,i2]]" +#: builtin/shortlog.c:424 +msgid "<w>[,<i1>[,<i2>]]" +msgstr "" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:425 msgid "Linewrap output" msgstr "ajustar linhas" -#: builtin/show-branch.c:10 +#: builtin/shortlog.c:427 +msgid "field" +msgstr "" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "" + +#: builtin/shortlog.c:456 +#, fuzzy +msgid "too many arguments given outside repository" +msgstr "%s: '%s' estรก fora do repositรณrio" + +#: 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" @@ -12842,131 +21124,139 @@ msgstr "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<revisรฃo> | <glob>)...]" -#: builtin/show-branch.c:14 +#: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referรชncia>]" -#: builtin/show-branch.c:374 +#: 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] "ignorar %s; nรฃo รฉ possรญvel processar mais do que %d referรชncia" msgstr[1] "ingorar %s; nรฃo รฉ possรญvel processar mais do que %d referรชncias" -#: builtin/show-branch.c:536 +#: builtin/show-branch.c:548 #, c-format msgid "no matching refs with %s" msgstr "nenhuma referรชncia corresponde com %s" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "mostrar os ramos de monitorizaรงรฃo remotos e os ramos locais" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "mostrar os ramos de monitorizaรงรฃo remotos" -#: builtin/show-branch.c:636 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "colorir '*!+-' correspondendo ao ramo" -#: builtin/show-branch.c:638 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "mostrar mais <n> commits depois do antecessor comum" -#: builtin/show-branch.c:640 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "sinรณnimo de more=-1" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "suprimir a cadeias de caracteres de nomes" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "incluir o ramo atual" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "designar commits pelos seus nomes de objeto" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "mostrar possรญveis bases de integraรงรฃo" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "mostrar referรชncias inalcanรงรกveis a partir de outras referรชncias" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "mostrar commits em ordem topolรณgica" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "mostrar apenas commits nรฃo presentes no primeiro ramo" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "mostrar integraรงรตes alcanรงรกveis a partir duma รบnica ponta" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "" "ordenar topologicamente, mantendo a ordenaรงรฃo por data sempre que possรญvel" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "mostrar as <n> entradas de ref-log mais recente a partir da base" -#: builtin/show-branch.c:696 +#: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog รฉ incompatรญvel com --all, --remotes, --independent or --merge-base" -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "nenhum ramo fornecido e HEAD nรฃo รฉ vรกlida" -#: builtin/show-branch.c:723 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "a opรงรฃo --reflog precisa do nome de um ramo" -#: builtin/show-branch.c:726 +#: 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] "apenas %d entrada podem ser mostradas neste momento." msgstr[1] "apenas %d entradas podem ser mostradas neste momento." -#: builtin/show-branch.c:730 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "referรชncia inexistente %s" -#: builtin/show-branch.c:814 +#: builtin/show-branch.c:831 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "nรฃo รฉ possรญvel processar mais do que %d revisรฃo." msgstr[1] "nรฃo รฉ possรญvel processar mais do que %d revisรตes." -#: builtin/show-branch.c:818 +#: builtin/show-branch.c:835 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' nรฃo รฉ uma referรชncia vรกlida." -#: builtin/show-branch.c:821 +#: builtin/show-branch.c:838 #, c-format msgid "cannot find commit %s (%s)" msgstr "nรฃo รฉ possรญvel encontrar o commit %s (%s)" -#: builtin/show-ref.c:10 +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "" + +#: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" @@ -12974,257 +21264,826 @@ msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<padrรฃo>...]" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:13 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<padrรฃo>]" -#: builtin/show-ref.c:159 +#: builtin/show-ref.c:162 msgid "only show tags (can be combined with heads)" msgstr "mostrar apenas tags (pode ser combinado com heads)" -#: builtin/show-ref.c:160 +#: builtin/show-ref.c:163 msgid "only show heads (can be combined with tags)" msgstr "mostrar apenas cabeรงas (pode ser combinado com tags)" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:164 msgid "stricter reference checking, requires exact ref path" msgstr "" "verificaรงรฃo de referรชncias mais rigorosa, requer o caminho exato da " "referรชncia" -#: builtin/show-ref.c:164 builtin/show-ref.c:166 +#: builtin/show-ref.c:167 builtin/show-ref.c:169 msgid "show the HEAD reference, even if it would be filtered out" msgstr "mostrar a referรชncia HEAD, mesmo que fosse filtrada" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:171 msgid "dereference tags into object IDs" msgstr "desreferenciar tags em IDs de objeto" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:173 msgid "only show SHA1 hash using <n> digits" msgstr "mostrar hash SHA1 com <n> digitos" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:177 msgid "do not print results to stdout (useful with --verify)" msgstr "nรฃo imprimir resultados para o stdout (รบtil com --verify)" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:179 msgid "show refs from stdin that aren't in local repository" msgstr "mostrar referรชncias do stdin que nรฃo estรฃo no repositรณrio local" -#: builtin/stripspace.c:17 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "" + +#: builtin/sparse-checkout.c:50 +#, fuzzy +msgid "git sparse-checkout list" +msgstr "git archive --list" + +#: builtin/sparse-checkout.c:76 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "" + +#: builtin/sparse-checkout.c:228 +#, fuzzy +msgid "failed to create directory for sparse-checkout file" +msgstr "falha ao criar o diretรณrio %s" + +#: builtin/sparse-checkout.c:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "falha ao abrir '%s'" + +#: builtin/sparse-checkout.c:401 +#, fuzzy, c-format +msgid "could not normalize path %s" +msgstr "nรฃo foi possรญvel analisar o patch '%s'" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "" + +#: builtin/sparse-checkout.c:438 +#, fuzzy, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "nรฃo รฉ possรญvel ler a ligaรงรฃo simbรณlica %s" + +#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +msgid "unable to load existing sparse-checkout patterns" +msgstr "" + +#: builtin/sparse-checkout.c:561 +#, fuzzy +msgid "read patterns from standard in" +msgstr "ler atualizaรงรตes da entrada padrรฃo" + +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "" + +#: builtin/sparse-checkout.c:595 +#, fuzzy +msgid "git sparse-checkout disable" +msgstr "ignorar a aplicaรงรฃo do filtro de extraรงรฃo esparsa" + +#: builtin/sparse-checkout.c:623 +#, fuzzy +msgid "error while refreshing working directory" +msgstr "nรฃo รฉ possรญvel de obter o diretรณrio de trabalho atual" + +#: builtin/stash.c:22 builtin/stash.c:38 +#, fuzzy +msgid "git stash list [<options>]" +msgstr "git worktree list [<opรงรตes>]" + +#: builtin/stash.c:23 builtin/stash.c:43 +#, fuzzy +msgid "git stash show [<options>] [<stash>]" +msgstr "git remote show [<opรงรตes>] <nome>" + +#: builtin/stash.c:24 builtin/stash.c:48 +msgid "git stash drop [-q|--quiet] [<stash>]" +msgstr "" + +#: builtin/stash.c:25 +msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgstr "" + +#: builtin/stash.c:26 builtin/stash.c:63 +#, fuzzy +msgid "git stash branch <branchname> [<stash>]" +msgstr "git branch [<opรงรตes>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]" + +#: builtin/stash.c:27 builtin/stash.c:68 +msgid "git stash clear" +msgstr "" + +#: 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 "" + +#: 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 "" + +#: builtin/stash.c:53 +msgid "git stash pop [--index] [-q|--quiet] [<stash>]" +msgstr "" + +#: builtin/stash.c:58 +msgid "git stash apply [--index] [-q|--quiet] [<stash>]" +msgstr "" + +#: builtin/stash.c:73 +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 +#, fuzzy, c-format +msgid "'%s' is not a stash-like commit" +msgstr "'$args' nรฃo รฉ um commit semelhante a pilha" + +#: builtin/stash.c:148 +#, fuzzy, c-format +msgid "Too many revisions specified:%s" +msgstr "Demasiadas revisรตes especificadas: $REV" + +#: builtin/stash.c:162 +#, fuzzy +msgid "No stash entries found." +msgstr "Nenhuma pilha encontrada." + +#: builtin/stash.c:176 +#, fuzzy, c-format +msgid "%s is not a valid reference" +msgstr "'%s' nรฃo รฉ uma referรชncia vรกlida." + +#: builtin/stash.c:225 +msgid "git stash clear with parameters is unimplemented" +msgstr "nรฃo estรก implementado git stash clear com parรขmetros" + +#: builtin/stash.c:404 +#, fuzzy +msgid "cannot apply a stash in the middle of a merge" +msgstr "Nรฃo รฉ possรญvel aplicar uma pilha durante uma integraรงรฃo" + +#: builtin/stash.c:415 +#, fuzzy, c-format +msgid "could not generate diff %s^!." +msgstr "nรฃo foi possรญvel ler '%s'." + +#: builtin/stash.c:422 +#, fuzzy +msgid "conflicts in index.Try without --index." +msgstr "Conflitos no รญndice. Tente sem --index." + +#: builtin/stash.c:428 +#, fuzzy +msgid "could not save index tree" +msgstr "Nรฃo foi possรญvel guardar รกrvore do รญndice" + +#: builtin/stash.c:437 +#, fuzzy +msgid "could not restore untracked files from stash" +msgstr "Nรฃo foi possรญvel restaurar os ficheiros nรฃo controlados da pilha" + +#: builtin/stash.c:451 +#, fuzzy, c-format +msgid "Merging %s with %s" +msgstr "A integrar %s com %s\n" + +#: builtin/stash.c:461 +msgid "Index was not unstashed." +msgstr "O รญndice nรฃo foi reposto." + +#: builtin/stash.c:522 builtin/stash.c:621 +#, fuzzy +msgid "attempt to recreate the index" +msgstr "falha ao ler o รญndice" + +#: builtin/stash.c:555 +#, fuzzy, c-format +msgid "Dropped %s (%s)" +msgstr "A descartar ${REV} ($s)" + +#: builtin/stash.c:558 +#, fuzzy, c-format +msgid "%s: Could not drop stash entry" +msgstr "${REV}: Nรฃo foi possรญvel descartar elemento da pilha" + +#: builtin/stash.c:583 +#, fuzzy, c-format +msgid "'%s' is not a stash reference" +msgstr "'$args' nรฃo รฉ uma referรชncia de pilha" + +#: builtin/stash.c:633 +#, fuzzy +msgid "The stash entry is kept in case you need it again." +msgstr "A pilha รฉ guarda no caso de precisar dela de novo." + +#: builtin/stash.c:656 +msgid "No branch name specified" +msgstr "Nenhum nome de ramo especificado" + +#: builtin/stash.c:800 builtin/stash.c:837 +#, fuzzy, c-format +msgid "Cannot update %s with %s" +msgstr "Nรฃo รฉ possรญvel atualizar $ref_stash com $w_commit" + +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 +#, fuzzy +msgid "stash message" +msgstr "mensagem da tag" + +#: builtin/stash.c:828 +msgid "\"git stash store\" requires one <commit> argument" +msgstr "" + +#: builtin/stash.c:1043 +msgid "No changes selected" +msgstr "Nenhuma alteraรงรฃo selecionada" + +#: builtin/stash.c:1143 +msgid "You do not have the initial commit yet" +msgstr "O commit inicial ainda nรฃo existe" + +#: builtin/stash.c:1170 +msgid "Cannot save the current index state" +msgstr "Nรฃo รฉ possรญvel guardar o estado atual do รญndice" + +#: builtin/stash.c:1179 +msgid "Cannot save the untracked files" +msgstr "Nรฃo รฉ possรญvel guardar os ficheiros nรฃo controlados" + +#: builtin/stash.c:1190 builtin/stash.c:1199 +msgid "Cannot save the current worktree state" +msgstr "Nรฃo รฉ possรญvel guardar o estado atual da รกrvore de trabalho" + +#: builtin/stash.c:1227 +msgid "Cannot record working tree state" +msgstr "Nรฃo รฉ possรญvel gravar o estado da รกrvore de trabalho" + +#: builtin/stash.c:1276 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "" +"Nรฃo รฉ possรญvel usar --patch e --include-untracked ou --all ao mesmo tempo" + +#: builtin/stash.c:1292 +#, fuzzy +msgid "Did you forget to 'git add'?" +msgstr "Queria dizer 'git add .'?\n" + +#: builtin/stash.c:1307 +msgid "No local changes to save" +msgstr "Nรฃo hรก alteraรงรตes locais para guardar" + +#: builtin/stash.c:1314 +msgid "Cannot initialize stash" +msgstr "Nรฃo รฉ possรญvel inicializar a pilha" + +#: builtin/stash.c:1329 +msgid "Cannot save the current status" +msgstr "Nรฃo รฉ possรญvel guardar o estado atual" + +#: builtin/stash.c:1334 +#, fuzzy, c-format +msgid "Saved working directory and index state %s" +msgstr "Diretรณrio de trabalho e estado do รญndice $stash_msg guardados" + +#: builtin/stash.c:1424 +msgid "Cannot remove worktree changes" +msgstr "Nรฃo รฉ possรญvel remover as alteraรงรตes da รกrvore de trabalho" + +#: builtin/stash.c:1463 builtin/stash.c:1528 +msgid "keep index" +msgstr "" + +#: builtin/stash.c:1465 builtin/stash.c:1530 +msgid "stash in patch mode" +msgstr "" + +#: builtin/stash.c:1466 builtin/stash.c:1531 +#, fuzzy +msgid "quiet mode" +msgstr "silencioso" + +#: builtin/stash.c:1468 builtin/stash.c:1533 +#, fuzzy +msgid "include untracked files in stash" +msgstr "listar ficheiros nรฃo controlados em colunas" + +#: builtin/stash.c:1470 builtin/stash.c:1535 +#, fuzzy +msgid "include ignore files" +msgstr "mostrar ficheiros ignorados" + +#: builtin/stash.c:1570 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" + +#: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" -#: builtin/stripspace.c:18 +#: builtin/stripspace.c:19 msgid "git stripspace [-c | --comment-lines]" msgstr "git stripspace [-c | --comment-lines]" -#: builtin/stripspace.c:35 +#: builtin/stripspace.c:37 msgid "skip and remove all lines starting with comment character" msgstr "" "ignorar e remover todas as linhas comeรงadas com um carรกcter de comentรกrio" -#: builtin/stripspace.c:38 +#: builtin/stripspace.c:40 msgid "prepend comment character and space to each line" msgstr "preceder cada linha com um carรกcter de comentรกrio e um espaรงo" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075 -#, c-format -msgid "No such ref: %s" -msgstr "Referรชncia inexistente: %s" - -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Esperava-se um nome completo de uma referรชncia, obteve-se %s" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:64 +msgid "submodule--helper print-default-remote takes no arguments" +msgstr "" + +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "nรฃo รฉ possรญvel tirar um componente do URL '%s'" -#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "รขncora alternativa para caminhos relativos" -#: builtin/submodule--helper.c:310 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]" -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Nenhum URL encontrado para o caminho de submรณdulo '%s' em .gitmodules" -#: builtin/submodule--helper.c:395 +#: builtin/submodule--helper.c:524 +#, fuzzy, c-format +msgid "Entering '%s'\n" +msgstr "a substituir '%s'" + +#: builtin/submodule--helper.c:527 #, c-format msgid "" -"could not lookup configuration '%s'. Assuming this repository is its own " +"run_command returned non-zero status for %s\n" +"." +msgstr "" + +#: builtin/submodule--helper.c:549 +#, c-format +msgid "" +"run_command returned non-zero status while recursing in the nested " +"submodules of %s\n" +"." +msgstr "" + +#: builtin/submodule--helper.c:565 +#, fuzzy +msgid "Suppress output of entering each submodule command" +msgstr "Suprimir a saรญda ao inicializar um submรณdulo" + +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 +#, fuzzy +msgid "Recurse into nested submodules" +msgstr "percorrer submรณdulos recursivamente" + +#: builtin/submodule--helper.c:572 +msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" +msgstr "" + +#: builtin/submodule--helper.c:599 +#, fuzzy, c-format +msgid "" +"could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" "nรฃo รฉ possรญvel encontrar configuraรงรฃo '%s'. Assumir que este repositรณrio รฉ o " "prรณprio repositรณrio a montante autoritรกrio." -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Falha ao registar o URL do caminho de submรณdulo '%s'" -#: builtin/submodule--helper.c:410 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submรณdulo '%s' (%s) registado com caminho '%s'\n" -#: builtin/submodule--helper.c:420 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "aviso: modo de atualizaรงรฃo do comando sugerido para o submรณdulo '%s'\n" -#: builtin/submodule--helper.c:427 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Falha ao registar o modo de atualizaรงรฃo do caminho de submรณdulo '%s'" -#: builtin/submodule--helper.c:443 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "Suprimir a saรญda ao inicializar um submรณdulo" -#: builtin/submodule--helper.c:448 -msgid "git submodule--helper init [<path>]" +#: builtin/submodule--helper.c:714 +#, fuzzy +msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<caminho>]" -#: builtin/submodule--helper.c:476 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#, c-format +msgid "no submodule mapping found in .gitmodules for path '%s'" +msgstr "" +"nenhum mapeamento de submรณdulo do caminho '%s' encontrado em .gitmodules" + +#: builtin/submodule--helper.c:835 +#, fuzzy, c-format +msgid "could not resolve HEAD ref inside the submodule '%s'" +msgstr "nรฃo foi possรญvel percorrer recursivamente o submรณdulo '%s'" + +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 +#, fuzzy, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "nรฃo foi possรญvel percorrer recursivamente o submรณdulo '%s'" + +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#, fuzzy +msgid "Suppress submodule status output" +msgstr "preceder isto ao caminho do submรณdulo" + +#: builtin/submodule--helper.c:887 +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "" + +#: builtin/submodule--helper.c:888 +#, fuzzy +msgid "recurse into nested submodules" +msgstr "percorrer submรณdulos recursivamente" + +#: builtin/submodule--helper.c:893 +#, fuzzy +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]" + +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <caminho>" -#: builtin/submodule--helper.c:482 +#: builtin/submodule--helper.c:989 #, c-format -msgid "no submodule mapping found in .gitmodules for path '%s'" +msgid "* %s %s(blob)->%s(submodule)" msgstr "" -"nenhum mapeamento de submรณdulo do caminho '%s' encontrado em .gitmodules" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "" + +#: builtin/submodule--helper.c:1005 +#, fuzzy, c-format +msgid "%s" +msgstr "[%s]" + +#: builtin/submodule--helper.c:1055 +#, fuzzy, c-format +msgid "couldn't hash object from '%s'" +msgstr "nรฃo foi possรญvel analisar o objeto '%s'" + +#: builtin/submodule--helper.c:1059 +#, fuzzy, c-format +msgid "unexpected mode %o\n" +msgstr "modo inesperado $mod_dst" + +#: builtin/submodule--helper.c:1300 +#, fuzzy +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "extrair <ramo> em vez da HEAD do remoto" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "" + +#: builtin/submodule--helper.c:1306 +#, fuzzy +msgid "limit the summary size" +msgstr "restringir-se a cabeรงas" + +#: builtin/submodule--helper.c:1311 +#, fuzzy +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule--helper init [<caminho>]" + +#: builtin/submodule--helper.c:1335 +#, fuzzy +msgid "could not fetch a revision for HEAD" +msgstr "nรฃo foi possรญvel destacar HEAD" + +#: builtin/submodule--helper.c:1340 +#, fuzzy +msgid "--cached and --files are mutually exclusive" +msgstr "--deepen e --depth sรฃo mutuamente exclusivos" + +#: builtin/submodule--helper.c:1407 +#, fuzzy, c-format +msgid "Synchronizing submodule url for '%s'\n" +msgstr "A sincronizar o URL do submรณdulo '$displaypath'" + +#: builtin/submodule--helper.c:1413 +#, fuzzy, c-format +msgid "failed to register url for submodule path '%s'" +msgstr "Falha ao registar o URL do caminho de submรณdulo '%s'" + +#: builtin/submodule--helper.c:1427 +#, fuzzy, c-format +msgid "failed to get the default remote for submodule '%s'" +msgstr "Falha ao registar o modo de atualizaรงรฃo do caminho de submรณdulo '%s'" + +#: builtin/submodule--helper.c:1438 +#, fuzzy, c-format +msgid "failed to update remote for submodule '%s'" +msgstr "Falha ao registar o modo de atualizaรงรฃo do caminho de submรณdulo '%s'" + +#: builtin/submodule--helper.c:1485 +#, fuzzy +msgid "Suppress output of synchronizing submodule url" +msgstr "Suprimir a saรญda ao inicializar um submรณdulo" + +#: builtin/submodule--helper.c:1492 +#, fuzzy +msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule--helper init [<caminho>]" + +#: builtin/submodule--helper.c:1546 +#, fuzzy, 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 "" +"A รกrvore de trabalho do submรณdulo '$displaypath' contรฉm um diretรณrio .git\n" +"(use 'rm -rf' se pretende mesmo removรช-lo, incluindo todo o seu histรณrico)" + +#: builtin/submodule--helper.c:1558 +#, fuzzy, c-format +msgid "" +"Submodule work tree '%s' contains local modifications; use '-f' to discard " +"them" +msgstr "" +"A รกrvore de trabalho do submรณdulo '$displaypath' contรฉm alteraรงรตes locais; " +"use '-f' para as descartar" + +#: builtin/submodule--helper.c:1566 +#, fuzzy, c-format +msgid "Cleared directory '%s'\n" +msgstr "Diretรณrio '$displaypath' limpo" + +#: builtin/submodule--helper.c:1568 +#, fuzzy, c-format +msgid "Could not remove submodule work tree '%s'\n" +msgstr "" +"Nรฃo foi possรญvel remover a รกrvore de trabalho do submรณdulo '$displaypath'" + +#: builtin/submodule--helper.c:1579 +#, fuzzy, c-format +msgid "could not create empty submodule directory %s" +msgstr "Nรฃo foi possรญvel criar o diretรณrio vazio do submรณdulo '$displaypath'" + +#: builtin/submodule--helper.c:1595 +#, fuzzy, c-format +msgid "Submodule '%s' (%s) unregistered for path '%s'\n" +msgstr "Submรณdulo '%s' (%s) registado com caminho '%s'\n" + +#: builtin/submodule--helper.c:1624 +msgid "Remove submodule working trees even if they contain local changes" +msgstr "" + +#: builtin/submodule--helper.c:1625 +#, fuzzy +msgid "Unregister all submodules" +msgstr "percorrer submรณdulos recursivamente" + +#: builtin/submodule--helper.c:1630 +msgid "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" +msgstr "" + +#: builtin/submodule--helper.c:1644 +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "" +"Use '--all' se pretende mesmo anular a inicializaรงรฃo todos os submรณdulos" + +#: builtin/submodule--helper.c:1713 +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:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "o submรณdulo '%s' nรฃo pode adicionar sobressalente: %s" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "O valor '%s' de submodule.alternateErrorStrategy nรฃo รฉ reconhecido" -#: builtin/submodule--helper.c:611 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "O valor '%s' de submodule.alternateLocation nรฃo รฉ reconhecido" -#: builtin/submodule--helper.c:633 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "sรญtio para aonde o novo submรณdulo serรก clonado" -#: builtin/submodule--helper.c:636 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "nome do novo submรณdulo" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "url donde clonar o submรณdulos" -#: builtin/submodule--helper.c:645 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "profundidade de clones rasos" -#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "forรงar progresso da clonagem" -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#, fuzzy +msgid "disallow cloning into non-empty directory" +msgstr "a aplicar a um histรณrico vazio" + +#: builtin/submodule--helper.c:1848 +#, fuzzy msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference " "<repositรณrio>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>" -#: builtin/submodule--helper.c:684 +#: builtin/submodule--helper.c:1873 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "" + +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "falha ao clonar '%s' no caminho de submรณdulo '%s'" -#: builtin/submodule--helper.c:699 +#: builtin/submodule--helper.c:1888 +#, fuzzy, c-format +msgid "directory not empty: '%s'" +msgstr "o diretรณrio de origem estรก vazio" + +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "nรฃo foi possรญvel obter o diretรณrio do submรณdulo de '%s'" -#: builtin/submodule--helper.c:764 +#: builtin/submodule--helper.c:1936 +#, fuzzy, c-format +msgid "Invalid update mode '%s' for submodule path '%s'" +msgstr "Falha ao registar o modo de atualizaรงรฃo do caminho de submรณdulo '%s'" + +#: builtin/submodule--helper.c:1940 +#, fuzzy, c-format +msgid "Invalid update mode '%s' configured for submodule path '%s'" +msgstr "Falha ao registar o modo de atualizaรงรฃo do caminho de submรณdulo '%s'" + +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Caminho de submรณdulo '%s' nรฃo inicializado" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "Pretendia usar 'update --init'?" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "A ignorar submรณdulo %s nรฃo integrado" -#: builtin/submodule--helper.c:814 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "A ignorar submรณdulo '%s'" -#: builtin/submodule--helper.c:942 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falha ao clonar '%s'. Nova tentativa agendada" -#: builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falha ao clonar '%s' pela segunda vez, abortado" -#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "caminho para a รกrvore de trabalho" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "caminho para a รกrvore de trabalho, atravessando limites de submรณdulos " "aninhados" -#: builtin/submodule--helper.c:981 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:2340 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "criar um clone raso, truncado ao nรบmero especificado de revisรตes" -#: builtin/submodule--helper.c:988 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "trabalhos em paralelo" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "se o clone inicial deve seguir a recomendaรงรฃo rasa" -#: builtin/submodule--helper.c:991 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "nรฃo imprimir progresso da clonagem" -#: builtin/submodule--helper.c:998 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +#: builtin/submodule--helper.c:2357 +#, fuzzy +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]" -#: builtin/submodule--helper.c:1008 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "valor incorreto no parรขmetro update" -#: builtin/submodule--helper.c:1079 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13233,33 +22092,106 @@ msgstr "" "O ramo do submรณdulo (%s) foi configurado para herdar o ramo do superprojeto, " "mas o superprojeto nรฃo estรก em nenhum ramo" -#: builtin/submodule--helper.c:1163 +#: builtin/submodule--helper.c:2541 +#, fuzzy, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "nรฃo foi possรญvel procurar pelo submรณdulo '%s'" + +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "percorrer submรณdulos recursivamente" -#: builtin/submodule--helper.c:1169 -msgid "git submodule--helper embed-git-dir [<path>...]" +#: builtin/submodule--helper.c:2580 +#, fuzzy +msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper embed-git-dir [<caminho>...]" -#: builtin/submodule--helper.c:1226 -msgid "submodule--helper subcommand must be called with a subcommand" -msgstr "o subcomando submodule--helper deve ser invocado com um subcomando" +#: builtin/submodule--helper.c:2636 +msgid "check if it is safe to write to the .gitmodules file" +msgstr "" + +#: builtin/submodule--helper.c:2639 +#, fuzzy +msgid "unset the config in the .gitmodules file" +msgstr "falha ao preparar .gitmodules atualizado" + +#: builtin/submodule--helper.c:2644 +#, fuzzy +msgid "git submodule--helper config <name> [<value>]" +msgstr "git submodule--helper name <caminho>" + +#: builtin/submodule--helper.c:2645 +#, fuzzy +msgid "git submodule--helper config --unset <name>" +msgstr "git submodule--helper init [<caminho>]" + +#: builtin/submodule--helper.c:2646 +#, fuzzy +msgid "git submodule--helper config --check-writeable" +msgstr "git submodule--helper init [<caminho>]" + +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 +#, fuzzy, sh-format +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "" +"Prepare as suas alteraรงรตes em .gitmodules ou esconda-as para prosseguir" + +#: builtin/submodule--helper.c:2681 +#, fuzzy +msgid "Suppress output for setting url of a submodule" +msgstr "Suprimir a saรญda ao inicializar um submรณdulo" + +#: builtin/submodule--helper.c:2685 +#, fuzzy +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper init [<caminho>]" + +#: builtin/submodule--helper.c:2718 +#, fuzzy +msgid "set the default tracking branch to master" +msgstr "mostrar os ramos de monitorizaรงรฃo remotos" -#: builtin/submodule--helper.c:1233 +#: builtin/submodule--helper.c:2720 +#, fuzzy +msgid "set the default tracking branch" +msgstr "mostrar os ramos de monitorizaรงรฃo remotos" + +#: builtin/submodule--helper.c:2724 +#, fuzzy +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]" + +#: builtin/submodule--helper.c:2725 +#, fuzzy +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]" + +#: builtin/submodule--helper.c:2732 +#, fuzzy +msgid "--branch or --default required" +msgstr "nome do ramo รฉ obrigatรณrio" + +#: builtin/submodule--helper.c:2735 +#, fuzzy +msgid "--branch and --default are mutually exclusive" +msgstr "--deepen e --depth sรฃo mutuamente exclusivos" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s nรฃo suporta --super-prefix" -#: builtin/submodule--helper.c:1239 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' nรฃo รฉ um subcomando vรกlido de submodule--helper" -#: builtin/symbolic-ref.c:7 +#: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<opรงรตes>] <nome> [<referรชncia>]" -#: builtin/symbolic-ref.c:8 +#: builtin/symbolic-ref.c:9 msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <nome>" @@ -13276,51 +22208,54 @@ msgstr "eliminar referรชncias simbรณlicas" msgid "shorten ref output" msgstr "encurtar a apresentaรงรฃo de referรชncias" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "razรฃo" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "razรฃo da atualizaรงรฃo" -#: builtin/tag.c:23 +#: builtin/tag.c:25 +#, fuzzy msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " -"[<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" +"\t\t<tagname> [<head>]" msgstr "" "git tag [-a | -s | -u <id-chave>] [-f] [-m <msg> | -F <ficheiro>] <nome-da-" "tag> [<head>]" -#: builtin/tag.c:24 +#: builtin/tag.c:27 msgid "git tag -d <tagname>..." msgstr "git tag -d <nome-da-tag>..." -#: builtin/tag.c:25 +#: builtin/tag.c:28 +#, fuzzy msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] " -"[--points-at <objeto>]\n" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <objeto>]\n" "\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<padrรฃo>...]" -#: builtin/tag.c:27 +#: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<formato>] <nometag>..." -#: builtin/tag.c:83 +#: builtin/tag.c:89 #, c-format msgid "tag '%s' not found." msgstr "tag '%s' nรฃo encontrada." -#: builtin/tag.c:99 +#: builtin/tag.c:105 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag '%s' eliminada (era %s)\n" -#: builtin/tag.c:128 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -13333,7 +22268,7 @@ msgstr "" " %s\n" "Linha comeรงadas com '%c' serรฃo ignoradas.\n" -#: builtin/tag.c:132 +#: builtin/tag.c:139 #, c-format msgid "" "\n" @@ -13347,365 +22282,372 @@ msgstr "" " %s\n" "Linhas comeรงadas com '%c' serรฃo mantidas; pode removรช-las se o desejar.\n" -#: builtin/tag.c:210 +#: builtin/tag.c:198 msgid "unable to sign the tag" msgstr "nรฃo foi possรญvel assinar a tag" -#: builtin/tag.c:212 +#: builtin/tag.c:200 msgid "unable to write tag file" msgstr "nรฃo foi possรญvel escrever o ficheiro da tag" -#: builtin/tag.c:236 +#: 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 "" + +#: builtin/tag.c:232 msgid "bad object type." msgstr "tipo de objeto incorreto." -#: builtin/tag.c:282 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "sem mensagem de tag?" -#: builtin/tag.c:289 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "A mensagem da tag foi guardada em %s\n" -#: builtin/tag.c:312 -msgid "tag: tagging " -msgstr "tag: a colocar tag" - -#: builtin/tag.c:320 -msgid "object of unknown type" -msgstr "objeto de tipo desconhecido" - -#: builtin/tag.c:327 -msgid "commit object" -msgstr "objeto commit" - -#: builtin/tag.c:335 -msgid "tree object" -msgstr "objeto รกrvore" - -#: builtin/tag.c:338 -msgid "blob object" -msgstr "objeto blob" - -#: builtin/tag.c:341 -msgid "other tag object" -msgstr "outro objeto tag" - -#: builtin/tag.c:397 +#: builtin/tag.c:403 msgid "list tag names" msgstr "listar os nomes das tag" -#: builtin/tag.c:399 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "imprimir <n> linhas de cada mensagem de tag" -#: builtin/tag.c:401 +#: builtin/tag.c:407 msgid "delete tags" msgstr "eliminar tags" -#: builtin/tag.c:402 +#: builtin/tag.c:408 msgid "verify tags" msgstr "verificar tags" -#: builtin/tag.c:404 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "Opรงรตes de criaรงรฃo de tags" -#: builtin/tag.c:406 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "tag anotada, รฉ necessรกrio uma mensagem" -#: builtin/tag.c:408 +#: builtin/tag.c:414 msgid "tag message" msgstr "mensagem da tag" -#: builtin/tag.c:410 +#: builtin/tag.c:416 +#, fuzzy +msgid "force edit of tag message" +msgstr "forรงar ediรงรฃo do commit" + +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "tag anotada e assinada com GPG" -#: builtin/tag.c:414 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "usar outra chave para assinar a tag" -#: builtin/tag.c:415 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "substituir a tag se esta existir" -#: builtin/tag.c:416 builtin/update-ref.c:368 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "criar um reflog" -#: builtin/tag.c:418 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "Opรงรตes de listagem de tags" -#: builtin/tag.c:419 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "mostrar a lista de tags em colunas" -#: builtin/tag.c:420 builtin/tag.c:422 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "imprimir apenas tags que contenham o commit" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "imprimir apenas tags que nรฃo contenham o commit" -#: builtin/tag.c:424 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "imprimir apenas as tags que foram integradas" -#: builtin/tag.c:425 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "imprimir apenas as tags que nรฃo foram integradas" -#: builtin/tag.c:430 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "imprimir apenas as tags do objeto" -#: builtin/tag.c:469 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "--column e -n sรฃo incompatรญveis" -#: builtin/tag.c:491 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "a opรงรฃo -n sรณ รฉ permitida no modo lista" -#: builtin/tag.c:493 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "a opรงรฃo --contains sรณ รฉ permitida no modo lista" -#: builtin/tag.c:495 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "a opรงรฃo --contains sรณ รฉ permitida no modo lista" -#: builtin/tag.c:497 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "a opรงรฃo --points-at sรณ รฉ permitida no modo lista" -#: builtin/tag.c:499 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "as opรงรตes --merged e --no-merged sรณ sรฃo permitidas no modo lista" -#: builtin/tag.c:510 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "sรณ รฉ permitido um opรงรฃo -F ou -m." -#: builtin/tag.c:529 +#: builtin/tag.c:543 msgid "too many params" msgstr "demasiado parรขmetros" -#: builtin/tag.c:535 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' nรฃo รฉ um nome de tag vรกlido." -#: builtin/tag.c:540 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "a tag '%s' jรก existe" -#: builtin/tag.c:570 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' atualizada (era %s)\n" -#: builtin/unpack-objects.c:493 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "A descompactar objetos" -#: builtin/update-index.c:79 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "falha ao criar o diretรณrio %s" -#: builtin/update-index.c:85 -#, c-format -msgid "failed to stat %s" -msgstr "falha ao invocar stat de %s" - -#: builtin/update-index.c:95 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "falha ao criar o ficheiro %s" -#: builtin/update-index.c:103 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "falha ao eliminar o ficheiro %s" -#: builtin/update-index.c:110 builtin/update-index.c:216 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "falha ao eliminar o diretรณrio %s" -#: builtin/update-index.c:135 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "A testar mtime em '%s' " -#: builtin/update-index.c:149 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "" "a informaรงรฃo de stat do diretรณrio nรฃo mudou depois de adicionar um novo " "ficheiro" -#: builtin/update-index.c:162 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "" "a informaรงรฃo de stat do diretรณrio nรฃo mudou depois de adicionar um novo " "diretรณrio" -#: builtin/update-index.c:175 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "a informaรงรฃo de stat mudou depois de atualizar um ficheiro" -#: builtin/update-index.c:186 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "a informaรงรฃo de stat do diretรณrio mudou depois de adicionar um ficheiro " "dentro dum subdiretรณrio" -#: builtin/update-index.c:197 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "" "a informaรงรฃo de stat do diretรณrio nรฃo mudou depois de eliminar um ficheiro" -#: builtin/update-index.c:210 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "" "a informaรงรฃo de stat do diretรณrio nรฃo mudou depois de eliminar um diretรณrio" -#: builtin/update-index.c:217 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:568 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opรงรตes>] [--] [<ficheiro>...]" -#: builtin/update-index.c:923 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "continuar a refrescar mesmo quando o รญndice precise de ser atualizado" -#: builtin/update-index.c:926 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "refrescar: ignorar submรณdulos" -#: builtin/update-index.c:929 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "nรฃo ignorar novos ficheiros" -#: builtin/update-index.c:931 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "deixar que os ficheiros substituam os diretรณrios e vice-versa" -#: builtin/update-index.c:933 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "avisar sobre ficheiros que faltem na รกrvore de trabalho" -#: builtin/update-index.c:935 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "refrescar mesmo que o รญndice contenha entradas nรฃo integradas" -#: builtin/update-index.c:938 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "refrescar informaรงรฃo de stat" -#: builtin/update-index.c:942 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "como --refresh, mas ignorar a definiรงรฃo assume-unchanged" -#: builtin/update-index.c:946 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<modo>,<objeto>,<caminho>" -#: builtin/update-index.c:947 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "adicionar o elemento especificado ao รญndice" -#: builtin/update-index.c:956 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "marcar ficheiros como \"nรฃo alterados\"" -#: builtin/update-index.c:959 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "limpar o bit assumed-unchanged" -#: builtin/update-index.c:962 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "marcar ficheiros como \"รบnicos do รญndice\"" -#: builtin/update-index.c:965 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "limpar o bit ignorar-รกrvore-de-trabalho" -#: builtin/update-index.c:968 +#: 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 "" "sรณ adicionar ao รญndice; nรฃo adicionar o conteรบdo ร base de dados de objetos" -#: builtin/update-index.c:970 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "" "remover os caminhos mencionado mesmo se estiverem presentes na รกrvore de " "trabalho" -#: builtin/update-index.c:972 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "com --stdin: as linhas da entrada sรฃo terminadas com bytes nulos" -#: builtin/update-index.c:974 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "ler lista de caminho a atualizar da entrada padrรฃo" -#: builtin/update-index.c:978 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "adicionar elementos da entrada padrรฃo ao รญndice" -#: builtin/update-index.c:982 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repovoar as fases nยบ2 e nยบ3 dos caminhos listados" -#: builtin/update-index.c:986 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "atualizar apenas elementos que difiram de HEAD" -#: builtin/update-index.c:990 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ignorar ficheiros nรฃo presentes na รกrvore de trabalho" -#: builtin/update-index.c:993 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "mostrar aรงรตes na saรญda padrรฃo" -#: builtin/update-index.c:995 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "(para porcelanas) esquecer conflitos guardados que nรฃo foram resolvidos" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "escrever o รญndice neste formato" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "ativar ou desativar a divisรฃo do รญndice" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "ativar ou desativar cache nรฃo controlada" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "testar se o sistema de ficheiros suporta cache nรฃo controlada" -#: builtin/update-index.c:1007 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "ativar cache nรฃo controlada sem testar o sistema de ficheiros" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1063 +msgid "write out the index even if is not flagged as changed" +msgstr "" + +#: builtin/update-index.c:1065 +#, fuzzy +msgid "enable or disable file system monitor" +msgstr "ativar ou desativar a divisรฃo do รญndice" + +#: builtin/update-index.c:1067 +#, fuzzy +msgid "mark files as fsmonitor valid" +msgstr "marcar ficheiros como \"nรฃo alterados\"" + +#: builtin/update-index.c:1070 +msgid "clear fsmonitor valid bit" +msgstr "" + +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -13713,7 +22655,7 @@ msgstr "" "core.splitIndex estรก definida como false; remova ou altere-a se pretende " "mesmo ativar รญndice separado" -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -13721,7 +22663,7 @@ msgstr "" "core.splitIndex estรก definida como true; remova ou altere-a se pretende " "mesmo desativar รญndice separado" -#: builtin/update-index.c:1127 +#: 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" @@ -13729,11 +22671,11 @@ msgstr "" "core.untrackedCache estรก definida como true; remova ou altere-a se pretende " "mesmo desativar a cache nรฃo controlada" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "A cache nรฃo controlada estรก desativada" -#: builtin/update-index.c:1139 +#: 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" @@ -13741,71 +22683,114 @@ msgstr "" "core.untrackedCache estรก definida como false; remova ou altere-a se pretende " "mesmo ativar a cache nรฃo controlada" -#: builtin/update-index.c:1143 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "A cache nรฃo controlada de '%s' foi ativada." -#: builtin/update-ref.c:9 +#: builtin/update-index.c:1218 +#, fuzzy +msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" +msgstr "" +"core.splitIndex estรก definida como false; remova ou altere-a se pretende " +"mesmo ativar รญndice separado" + +#: builtin/update-index.c:1222 +msgid "fsmonitor enabled" +msgstr "" + +#: builtin/update-index.c:1225 +#, fuzzy +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgstr "" +"core.splitIndex estรก definida como true; remova ou altere-a se pretende " +"mesmo desativar รญndice separado" + +#: builtin/update-index.c:1229 +msgid "fsmonitor disabled" +msgstr "" + +#: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<opรงรตes>] -d <nome-da-referรชncia> [<valor-antigo>]" -#: builtin/update-ref.c:10 +#: builtin/update-ref.c:11 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "" "git update-ref [<opรงรตes>] <nome-da-referรชncia> <novo-valor> [<valor-" "antigo>]" -#: builtin/update-ref.c:11 +#: builtin/update-ref.c:12 msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<opรงรตes>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "eliminar a referรชncia" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "" "atualizar a referรชncia <nome-da-referรชncia>, nรฃo a referรชncia que esta aponta" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "os argumentos da entrada padrรฃo terminam em NUL" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "ler atualizaรงรตes da entrada padrรฃo" -#: builtin/update-server-info.c:6 +#: builtin/update-server-info.c:7 msgid "git update-server-info [--force]" msgstr "git update-server-info [--force]" -#: builtin/update-server-info.c:14 +#: builtin/update-server-info.c:15 msgid "update the info files from scratch" msgstr "atualizar os ficheiros de informaรงรฃo do zero" -#: builtin/verify-commit.c:17 +#: builtin/upload-pack.c:11 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-pack [<opรงรตes>] <dir>" + +#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 +msgid "quit after a single request/response exchange" +msgstr "terminar depois de uma รบnica troca de pedido/resposta" + +#: builtin/upload-pack.c:25 +msgid "exit immediately after initial ref advertisement" +msgstr "sair imediatamente depois do anรบncio inicial da referรชncia" + +#: builtin/upload-pack.c:27 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "nรฃo tentar <diretรณrio>/.git/ se o <diretรณrio> nรฃo for um diretรณrio Git" + +#: builtin/upload-pack.c:29 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "interromper transferรชncia depois de <n> segundos de inatividade" + +#: builtin/verify-commit.c:19 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <commit>..." -#: builtin/verify-commit.c:72 +#: builtin/verify-commit.c:68 msgid "print commit contents" msgstr "imprimir conteรบdo do commit" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 +#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "imprimir informaรงรฃo do gpg em bruto" -#: builtin/verify-pack.c:54 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -#: builtin/verify-pack.c:64 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "verboso" -#: builtin/verify-pack.c:66 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "mostrar apenas estatรญsticas" @@ -13817,198 +22802,501 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." msgid "print tag contents" msgstr "imprimir conteรบdo da tag" -#: builtin/worktree.c:15 -msgid "git worktree add [<options>] <path> [<branch>]" +#: builtin/worktree.c:17 +#, fuzzy +msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<opรงรตes>] <caminho> [<ramo>]" -#: builtin/worktree.c:16 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<opรงรตes>]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opรงรตes>] <caminho>" -#: builtin/worktree.c:18 +#: builtin/worktree.c:20 +#, fuzzy +msgid "git worktree move <worktree> <new-path>" +msgstr "git worktree lock [<opรงรตes>] <caminho>" + +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opรงรตes>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:22 +#, fuzzy +msgid "git worktree remove [<options>] <worktree>" +msgstr "git worktree lock [<opรงรตes>] <caminho>" + +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <caminho>" -#: builtin/worktree.c:42 -#, c-format -msgid "Removing worktrees/%s: not a valid directory" -msgstr "A remover worktrees/%s: diretรณrio invรกlido" +#: builtin/worktree.c:60 builtin/worktree.c:970 +#, fuzzy, c-format +msgid "failed to delete '%s'" +msgstr "falha ao executar '%s'" -#: builtin/worktree.c:48 -#, c-format -msgid "Removing worktrees/%s: gitdir file does not exist" +#: builtin/worktree.c:85 +#, fuzzy +msgid "not a valid directory" +msgstr "nome de objeto invรกlido: %s" + +#: builtin/worktree.c:91 +#, fuzzy +msgid "gitdir file does not exist" msgstr "A remover worktrees/%s: o ficheiro gitdir nรฃo existe" -#: builtin/worktree.c:53 -#, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -msgstr "A remover worktrees/%s: nรฃo รฉ possรญvel ler o ficheiro gitdir (%s)" +#: builtin/worktree.c:96 builtin/worktree.c:105 +#, fuzzy, c-format +msgid "unable to read gitdir file (%s)" +msgstr "nรฃo foi possรญvel ler a รกrvore (%s)" -#: builtin/worktree.c:64 +#: builtin/worktree.c:115 #, c-format -msgid "Removing worktrees/%s: invalid gitdir file" -msgstr "A remover worktrees/%s: ficheiro gitdir invรกlido" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "" -#: builtin/worktree.c:80 -#, c-format -msgid "Removing worktrees/%s: gitdir file points to non-existent location" +#: builtin/worktree.c:123 +#, fuzzy +msgid "invalid gitdir file" +msgstr "linha de Data invรกlida" + +#: builtin/worktree.c:131 +#, fuzzy +msgid "gitdir file points to non-existent location" msgstr "" "A remover worktrees/%s: o ficheiro gitdir aponta para uma localizaรงรฃo " "inexistente" -#: builtin/worktree.c:128 +#: builtin/worktree.c:146 +#, fuzzy, c-format +msgid "Removing %s/%s: %s" +msgstr "A remover %s" + +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "reportar รกrvores de trabalho podadas" -#: builtin/worktree.c:130 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "expirar รกrvores de trabalho mais antigos que <tempo>" -#: builtin/worktree.c:204 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "'%s' jรก existe" -#: builtin/worktree.c:236 +#: builtin/worktree.c:302 +#, fuzzy, c-format +msgid "unusable worktree destination '%s'" +msgstr "nรฃo รฉ possรญvel ler o ficheiro de assinatura '%s'" + +#: builtin/worktree.c:307 +#, c-format +msgid "" +"'%s' is a missing but locked worktree;\n" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" +msgstr "" + +#: builtin/worktree.c:309 +#, c-format +msgid "" +"'%s' is a missing but already registered worktree;\n" +"use '%s -f' to override, or 'prune' or 'remove' to clear" +msgstr "" + +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "nรฃo foi possรญvel criar o diretรณrio de '%s'" -#: builtin/worktree.c:272 +#: builtin/worktree.c:494 builtin/worktree.c:500 +#, fuzzy, c-format +msgid "Preparing worktree (new branch '%s')" +msgstr "Erro a eliminar ramo '%s'" + +#: builtin/worktree.c:496 #, c-format -msgid "Preparing %s (identifier %s)" +msgid "Preparing worktree (resetting branch '%s'; was at %s)" +msgstr "" + +#: builtin/worktree.c:505 +#, c-format +msgid "Preparing worktree (checking out '%s')" +msgstr "" + +#: builtin/worktree.c:511 +#, fuzzy, c-format +msgid "Preparing worktree (detached HEAD %s)" msgstr "A preparar %s (identificador %s)" -#: builtin/worktree.c:324 +#: builtin/worktree.c:552 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extrair o <ramo> mesmo se jรก tenha sido extraรญdo noutra รกrvore de trabalho" -#: builtin/worktree.c:326 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "criar um novo ramo" -#: builtin/worktree.c:328 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "criar ou repor um ramo" -#: builtin/worktree.c:330 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "povoar a nova รกrvore de trabalho" -#: builtin/worktree.c:338 +#: builtin/worktree.c:560 +#, fuzzy +msgid "keep the new working tree locked" +msgstr "povoar a nova รกrvore de trabalho" + +#: builtin/worktree.c:563 +#, fuzzy +msgid "set up tracking mode (see git-branch(1))" +msgstr "configurar modo de seguimento (consulte git-pull(1))" + +#: builtin/worktree.c:566 +#, fuzzy +msgid "try to match the new branch name with a remote-tracking branch" +msgstr "" +"o ramo a montante '%s' nรฃo estรก guardado como um ramo de monitorizaรงรฃo remoto" + +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B e --detach sรฃo mutuamente exclusivos" -#: builtin/worktree.c:473 +#: builtin/worktree.c:635 +#, fuzzy +msgid "--[no-]track can only be used if a new branch is created" +msgstr "A aรงรฃo --edit-todo sรณ pode ser usada durante um rebase interativo." + +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "razรฃo de trancar" -#: builtin/worktree.c:485 builtin/worktree.c:518 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' nรฃo รฉ uma รกrvore de trabalho" -#: builtin/worktree.c:487 builtin/worktree.c:520 +#: builtin/worktree.c:769 builtin/worktree.c:802 msgid "The main working tree cannot be locked or unlocked" msgstr "A รกrvore de trabalho principal nรฃo pode ser trancada nem destrancada" -#: builtin/worktree.c:492 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' jรก estรก trancada, razรฃo: %s" -#: builtin/worktree.c:494 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "'%s' jรก estรก trancada" -#: builtin/worktree.c:522 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "'%s' nรฃo estรก trancada" -#: builtin/write-tree.c:13 +#: builtin/worktree.c:845 +msgid "working trees containing submodules cannot be moved or removed" +msgstr "" + +#: builtin/worktree.c:853 +#, fuzzy +msgid "force move even if worktree is dirty or locked" +msgstr "forรงar mover/mudar o nome mesmo que o destino exista" + +#: builtin/worktree.c:876 builtin/worktree.c:1000 +#, fuzzy, c-format +msgid "'%s' is a main working tree" +msgstr "'%s' nรฃo รฉ uma รกrvore de trabalho" + +#: builtin/worktree.c:881 +#, fuzzy, c-format +msgid "could not figure out destination name from '%s'" +msgstr "nรฃo foi possรญvel migrar o diretรณrio git de '%s' para '%s'" + +#: builtin/worktree.c:894 +#, 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:896 +msgid "" +"cannot move a locked working tree;\n" +"use 'move -f -f' to override or unlock first" +msgstr "" + +#: builtin/worktree.c:899 +#, c-format +msgid "validation failed, cannot move working tree: %s" +msgstr "" + +#: builtin/worktree.c:904 +#, fuzzy, c-format +msgid "failed to move '%s' to '%s'" +msgstr "falha ao abrir '%s': %s" + +#: builtin/worktree.c:950 +#, fuzzy, c-format +msgid "failed to run 'git status' on '%s'" +msgstr "falha ao escrever para '%s'" + +#: builtin/worktree.c:954 +#, c-format +msgid "'%s' contains modified or untracked files, use --force to delete it" +msgstr "" + +#: builtin/worktree.c:959 +#, fuzzy, c-format +msgid "failed to run 'git status' on '%s', code %d" +msgstr "nรฃo foi possรญvel executar 'git status' no submรณdulo '%s'" + +#: builtin/worktree.c:982 +msgid "force removal even if worktree is dirty or locked" +msgstr "" + +#: builtin/worktree.c:1005 +#, 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:1007 +msgid "" +"cannot remove a locked working tree;\n" +"use 'remove -f -f' to override or unlock first" +msgstr "" + +#: builtin/worktree.c:1010 +#, c-format +msgid "validation failed, cannot remove working tree: %s" +msgstr "" + +#: builtin/worktree.c:1034 +#, fuzzy, c-format +msgid "repair: %s: %s" +msgstr "%s: %s" + +#: builtin/worktree.c:1037 +#, fuzzy, c-format +msgid "error: %s: %s" +msgstr "%s: %s" + +#: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefixo>/]" -#: builtin/write-tree.c:26 +#: builtin/write-tree.c:28 msgid "<prefix>/" msgstr "<prefixo>/" -#: builtin/write-tree.c:27 +#: builtin/write-tree.c:29 msgid "write tree object for a subdirectory <prefix>" msgstr "escrever objeto รกrvore do subdiretรณrio <prefixo>" -#: builtin/write-tree.c:30 +#: builtin/write-tree.c:31 msgid "only useful for debugging" msgstr "apenas รบtil para depuraรงรฃo" -#: upload-pack.c:22 -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<opรงรตes>] <dir>" +#: http-fetch.c:114 +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "" -#: upload-pack.c:1040 -msgid "quit after a single request/response exchange" -msgstr "terminar depois de uma รบnica troca de pedido/resposta" +#: http-fetch.c:122 +#, fuzzy +msgid "not a git repository" +msgstr "Nรฃo รฉ um repositรณrio git" -#: upload-pack.c:1042 -msgid "exit immediately after initial ref advertisement" -msgstr "sair imediatamente depois do anรบncio inicial da referรชncia" +#: t/helper/test-reach.c:154 +#, fuzzy, c-format +msgid "commit %s is not marked reachable" +msgstr "o commit %s nรฃo tem o pai %d" -#: upload-pack.c:1044 -msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "nรฃo tentar <diretรณrio>/.git/ se o <diretรณrio> nรฃo for um diretรณrio Git" +#: t/helper/test-reach.c:164 +msgid "too many commits marked reachable" +msgstr "" -#: upload-pack.c:1046 -msgid "interrupt transfer after <n> seconds of inactivity" -msgstr "interromper transferรชncia depois de <n> segundos de inatividade" +#: t/helper/test-serve-v2.c:7 +#, fuzzy +msgid "test-tool serve-v2 [<options>]" +msgstr "git rebase--helper [<opรงรตes>]" -#: credential-cache--daemon.c:223 -#, c-format +#: t/helper/test-serve-v2.c:19 +#, fuzzy +msgid "exit immediately after advertising capabilities" +msgstr "sair imediatamente depois do anรบncio inicial da referรชncia" + +#: git.c:28 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" +"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 "" -"As permissรตes do diretรณrio do socket sรฃo demasiado fracas; outros\n" -"utilizadores poderรฃo conseguir as suas credenciais em cache. Considere " -"executar:\n" -"\n" -"\tchmod 0700 %s" -#: credential-cache--daemon.c:271 -msgid "print debugging messages to stderr" -msgstr "imprimir mensagens de depuraรงรฃo no stderr" - -#: git.c:14 +#: git.c:35 +#, fuzzy 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." +"to read about a specific subcommand or concept.\n" +"See 'git help git' for an overview of the system." msgstr "" "'git help -a' e 'git help -g' listam os subcomandos disponรญveis e alguns\n" "guias de conceitos. Consulte 'git help <comando>' ou 'git help <conceito>'\n" "para ler sobre um subcomando ou conceito especรญfico." -#: http.c:355 +#: git.c:187 +#, c-format +msgid "no directory given for --git-dir\n" +msgstr "" + +#: git.c:201 +#, c-format +msgid "no namespace given for --namespace\n" +msgstr "" + +#: git.c:215 +#, c-format +msgid "no directory given for --work-tree\n" +msgstr "" + +#: git.c:229 +#, fuzzy, c-format +msgid "no prefix given for --super-prefix\n" +msgstr "%s nรฃo suporta --super-prefix" + +#: git.c:251 +#, c-format +msgid "-c expects a configuration string\n" +msgstr "" + +#: git.c:289 +#, c-format +msgid "no directory given for -C\n" +msgstr "" + +#: git.c:315 +#, fuzzy, c-format +msgid "unknown option: %s\n" +msgstr "opรงรฃo desconhecido %s" + +#: git.c:364 +#, c-format +msgid "while expanding alias '%s': '%s'" +msgstr "" + +#: git.c:373 +#, c-format +msgid "" +"alias '%s' changes environment variables.\n" +"You can use '!git' in the alias to do this" +msgstr "" + +#: git.c:380 +#, c-format +msgid "empty alias for %s" +msgstr "" + +#: git.c:383 +#, c-format +msgid "recursive alias: %s" +msgstr "" + +#: git.c:465 +#, fuzzy +msgid "write failure on standard output" +msgstr "mostrar aรงรตes na saรญda padrรฃo" + +#: git.c:467 +#, fuzzy +msgid "unknown write failure on standard output" +msgstr "mostrar aรงรตes na saรญda padrรฃo" + +#: git.c:469 +#, fuzzy +msgid "close failed on standard output" +msgstr "enviar resultados para a saรญda padrรฃo" + +#: git.c:819 +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "" + +#: git.c:869 +#, fuzzy, c-format +msgid "cannot handle %s as a builtin" +msgstr "nรฃo รฉ possรญvel enviar mensagem como 7bit" + +#: git.c:882 +#, fuzzy, c-format +msgid "" +"usage: %s\n" +"\n" +msgstr "utilizaรงรฃo: %s" + +#: git.c:902 +#, c-format +msgid "expansion of alias '%s' failed; '%s' is not a git command\n" +msgstr "" + +#: git.c:914 +#, fuzzy, c-format +msgid "failed to run command '%s': %s\n" +msgstr "falha ao abrir '%s': %s" + +#: http.c:399 +#, c-format +msgid "negative value for http.postbuffer; defaulting to %d" +msgstr "" + +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Nรฃo รฉ suportado delegar controlo com cURL < 7.22.0" -#: http.c:364 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Nรฃo รฉ suportado afixar chaves pรบblicas com cURL < 7.44.0" -#: http.c:1755 +#: http.c:910 +#, fuzzy +msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" +msgstr "Nรฃo รฉ suportado afixar chaves pรบblicas com cURL < 7.44.0" + +#: http.c:989 +#, fuzzy +msgid "Protocol restrictions not supported with cURL < 7.19.4" +msgstr "Nรฃo รฉ suportado afixar chaves pรบblicas com cURL < 7.44.0" + +#: http.c:1132 +#, c-format +msgid "Unsupported SSL backend '%s'. Supported SSL backends:" +msgstr "" + +#: http.c:1139 +#, c-format +msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" +msgstr "" + +#: http.c:1143 +#, fuzzy, c-format +msgid "Could not set SSL backend to '%s': already set" +msgstr "Nรฃo foi possรญvel voltar para $head_name" + +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14019,275 +23307,993 @@ msgstr "" " pedido para: %s\n" " redireรงรฃo: %s" -#: remote-curl.c:323 +#: remote-curl.c:174 +#, fuzzy, c-format +msgid "invalid quoting in push-option value: '%s'" +msgstr "opรงรฃo invรกlida: %s" + +#: remote-curl.c:298 +#, fuzzy, c-format +msgid "%sinfo/refs not valid: is this a git repository?" +msgstr "'%s' nรฃo รฉ reconhecido como um repositรณrio git" + +#: remote-curl.c:399 +msgid "invalid server response; expected service, got flush packet" +msgstr "" + +#: remote-curl.c:430 +#, fuzzy, c-format +msgid "invalid server response; got '%s'" +msgstr "referรชncia invรกlida: %s" + +#: remote-curl.c:490 +#, fuzzy, c-format +msgid "repository '%s' not found" +msgstr "o repositรณrio '%s' nรฃo existe" + +#: remote-curl.c:494 +#, fuzzy, c-format +msgid "Authentication failed for '%s'" +msgstr "Falha ao executar: $rest" + +#: remote-curl.c:498 +#, c-format +msgid "unable to access '%s': %s" +msgstr "nรฃo รฉ possรญvel aceder a '%s': %s" + +#: remote-curl.c:504 #, c-format msgid "redirecting to %s" msgstr "a redirecionar para %s " -#: common-cmds.h:9 -msgid "start a working area (see also: git help tutorial)" -msgstr "iniciar uma รกrea de trabalho (consulte tambรฉm: git help tutorial)" +#: remote-curl.c:633 +msgid "shouldn't have EOF when not gentle on EOF" +msgstr "" -#: common-cmds.h:10 -msgid "work on the current change (see also: git help everyday)" -msgstr "trabalhar na alteraรงรฃo atual (consulte tambรฉm: git help everyday)" +#: remote-curl.c:645 +msgid "remote server sent stateless separator" +msgstr "" -#: common-cmds.h:11 -msgid "examine the history and state (see also: git help revisions)" -msgstr "examinar o histรณrico e estado (consulte tambรฉm: git help revisions)" +#: remote-curl.c:715 +msgid "unable to rewind rpc post data - try increasing http.postBuffer" +msgstr "" -#: common-cmds.h:12 -msgid "grow, mark and tweak your common history" -msgstr "aumentar, marcar e ajustar o seu histรณrico comum" +#: remote-curl.c:745 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "" -#: common-cmds.h:13 -msgid "collaborate (see also: git help workflows)" -msgstr "colaborar (consulte tambรฉm: git help workflows)" +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "" + +#: remote-curl.c:823 +#, fuzzy, c-format +msgid "RPC failed; %s" +msgstr "falha: %d" + +#: remote-curl.c:863 +#, fuzzy +msgid "cannot handle pushes this big" +msgstr "nรฃo รฉ possรญvel processar mais do que %d revisรฃo." + +#: remote-curl.c:978 +#, c-format +msgid "cannot deflate request; zlib deflate error %d" +msgstr "" + +#: remote-curl.c:982 +#, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "" + +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" +msgstr "" + +#: remote-curl.c:1034 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "" + +#: remote-curl.c:1123 +#, fuzzy +msgid "dumb http transport does not support shallow capabilities" +msgstr "O servidor nรฃo suporta clientes rasos" + +#: remote-curl.c:1138 +#, fuzzy +msgid "fetch failed." +msgstr "falha ao executar o comando stash" + +#: remote-curl.c:1184 +msgid "cannot fetch by sha1 over smart http" +msgstr "" + +#: remote-curl.c:1228 remote-curl.c:1234 +#, fuzzy, c-format +msgid "protocol error: expected sha/ref, got '%s'" +msgstr "erro de protocolo: cabeรงalho de pacote incorreto" + +#: remote-curl.c:1246 remote-curl.c:1361 +#, fuzzy, c-format +msgid "http transport does not support %s" +msgstr "O servidor nรฃo suporta STARTTLS! %s" + +#: remote-curl.c:1282 +#, fuzzy +msgid "git-http-push failed" +msgstr "falha ao executar o comando stash" + +#: remote-curl.c:1467 +msgid "remote-curl: usage: git remote-curl <remote> [<url>]" +msgstr "" + +#: remote-curl.c:1499 +msgid "remote-curl: error reading command stream from git" +msgstr "" -#: common-cmds.h:17 +#: remote-curl.c:1506 +msgid "remote-curl: fetch attempted without a local repo" +msgstr "" + +#: remote-curl.c:1547 +#, c-format +msgid "remote-curl: unknown command '%s' from git" +msgstr "" + +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "" + +#: compat/compiler.h:38 +#, fuzzy +msgid "no libc information available\n" +msgstr "mostrar informaรงรฃo do ramo" + +#: list-objects-filter-options.h:91 +msgid "args" +msgstr "" + +#: list-objects-filter-options.h:92 +#, fuzzy +msgid "object filtering" +msgstr "tipo do objeto" + +#: parse-options.h:183 +msgid "expiry-date" +msgstr "data-de-validade" + +#: parse-options.h:197 +msgid "no-op (backward compatibility)" +msgstr "sem-aรงรฃo (retrocompatibilidade)" + +#: parse-options.h:309 +msgid "be more verbose" +msgstr "ser mais verboso" + +#: parse-options.h:311 +msgid "be more quiet" +msgstr "ser mais silencioso" + +#: parse-options.h:317 +#, fuzzy +msgid "use <n> digits to display object names" +msgstr "usar <n> dรญgitos para mostrar SHA-1s" + +#: parse-options.h:336 +msgid "how to strip spaces and #comments from message" +msgstr "como retirar espaรงos e #comentรกrios da mensagem" + +#: parse-options.h:337 +#, fuzzy +msgid "read pathspec from file" +msgstr "ler padrรตes do ficheiro" + +#: parse-options.h:338 +#, fuzzy +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL character" +msgstr "os caminhos estรฃo separados por caracteres NUL" + +#: ref-filter.h:96 +msgid "key" +msgstr "chave" + +#: ref-filter.h:96 +msgid "field name to sort on" +msgstr "nome do campo pelo qual ordernar" + +#: rerere.h:44 +msgid "update the index with reused conflict resolution if possible" +msgstr "" +"atualizar o รญndice com resoluรงรตes de conflitos reutilizadas se possรญvel" + +#: wt-status.h:80 +msgid "HEAD detached at " +msgstr "HEAD destacada em " + +#: wt-status.h:81 +msgid "HEAD detached from " +msgstr "HEAD destacada de " + +#: command-list.h:50 msgid "Add file contents to the index" msgstr "Adicionar conteรบdos de ficheiros ao รญndice" -#: common-cmds.h:18 +#: command-list.h:51 +msgid "Apply a series of patches from a mailbox" +msgstr "" + +#: command-list.h:52 +#, fuzzy +msgid "Annotate file lines with commit information" +msgstr "Mostrar em formato de porcelana com informaรงรตes de commit por linha" + +#: command-list.h:53 +#, fuzzy +msgid "Apply a patch to files and/or to the index" +msgstr "adicionar o elemento especificado ao รญndice" + +#: command-list.h:54 +msgid "Import a GNU Arch repository into Git" +msgstr "" + +#: command-list.h:55 +#, fuzzy +msgid "Create an archive of files from a named tree" +msgstr "listar ficheiros arquivados para stderr" + +#: command-list.h:56 msgid "Use binary search to find the commit that introduced a bug" msgstr "Use procura binรกrio para encontrar o commit que introduziu um bug" -#: common-cmds.h:19 +#: 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 "Listar, criar ou eliminar ramos" -#: common-cmds.h:20 +#: command-list.h:59 +msgid "Collect information for user to file a bug report" +msgstr "" + +#: command-list.h:60 +msgid "Move objects and refs by archive" +msgstr "" + +#: command-list.h:61 +msgid "Provide content or type and size information for repository objects" +msgstr "" + +#: command-list.h:62 +#, fuzzy +msgid "Display gitattributes information" +msgstr "usar .gitattributes apenas a partir do รญndice" + +#: command-list.h:63 +msgid "Debug gitignore / exclude files" +msgstr "" + +#: command-list.h:64 +#, fuzzy +msgid "Show canonical names and email addresses of contacts" +msgstr "Mostrar o endereรงo de e-mail de cada autor" + +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "Mudar de ramos ou restaurar os ficheiros da รกrvore de trabalho" -#: common-cmds.h:21 +#: command-list.h:66 +#, fuzzy +msgid "Copy files from the index to the working tree" +msgstr "caminho para a รกrvore de trabalho" + +#: command-list.h:67 +msgid "Ensures that a reference name is well formed" +msgstr "" + +#: command-list.h:68 +msgid "Find commits yet to be applied to upstream" +msgstr "" + +#: command-list.h:69 +msgid "Apply the changes introduced by some existing commits" +msgstr "" + +#: command-list.h:70 +msgid "Graphical alternative to git-commit" +msgstr "" + +#: command-list.h:71 +#, fuzzy +msgid "Remove untracked files from the working tree" +msgstr "Remover ficheiros da รกrvore de trabalho e do รญndice" + +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "Clonar um repositรณrio num novo diretรณrio" -#: common-cmds.h:22 +#: command-list.h:73 +#, fuzzy +msgid "Display data in columns" +msgstr "listar os ramos em colunas" + +#: command-list.h:74 msgid "Record changes to the repository" msgstr "Gravar alteraรงรตes no repositรณrio" -#: common-cmds.h:23 +#: command-list.h:75 +msgid "Write and verify Git commit-graph files" +msgstr "" + +#: command-list.h:76 +#, fuzzy +msgid "Create a new commit object" +msgstr "falha ao escrever objeto de commit" + +#: command-list.h:77 +msgid "Get and set repository or global options" +msgstr "" + +#: command-list.h:78 +msgid "Count unpacked number of objects and their disk consumption" +msgstr "" + +#: command-list.h:79 +msgid "Retrieve and store user credentials" +msgstr "" + +#: command-list.h:80 +msgid "Helper to temporarily store passwords in memory" +msgstr "" + +#: command-list.h:81 +msgid "Helper to store credentials on disk" +msgstr "" + +#: command-list.h:82 +msgid "Export a single commit to a CVS checkout" +msgstr "" + +#: command-list.h:83 +msgid "Salvage your data out of another SCM people love to hate" +msgstr "" + +#: command-list.h:84 +msgid "A CVS server emulator for Git" +msgstr "" + +#: command-list.h:85 +msgid "A really simple server for Git repositories" +msgstr "" + +#: command-list.h:86 +msgid "Give an object a human readable name based on an available ref" +msgstr "" + +#: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Mostrar alteraรงรตes entre commits, entre commit e รกrvore de trabalho, etc" -#: common-cmds.h:24 +#: command-list.h:88 +#, fuzzy +msgid "Compares files in the working tree and the index" +msgstr "Remover ficheiros da รกrvore de trabalho e do รญndice" + +#: command-list.h:89 +#, fuzzy +msgid "Compare a tree to the working tree or index" +msgstr "caminho para a รกrvore de trabalho" + +#: command-list.h:90 +msgid "Compares the content and mode of blobs found via two tree objects" +msgstr "" + +#: command-list.h:91 +msgid "Show changes using common diff tools" +msgstr "" + +#: command-list.h:92 +msgid "Git data exporter" +msgstr "" + +#: command-list.h:93 +msgid "Backend for fast Git data importers" +msgstr "" + +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "Transferir objetos e referรชncias doutro repositรณrio" -#: common-cmds.h:25 +#: command-list.h:95 +#, fuzzy +msgid "Receive missing objects from another repository" +msgstr "Transferir objetos e referรชncias doutro repositรณrio" + +#: command-list.h:96 +#, fuzzy +msgid "Rewrite branches" +msgstr " Ramo remoto:%s" + +#: command-list.h:97 +#, fuzzy +msgid "Produce a merge commit message" +msgstr "editar a mensagem de commit" + +#: command-list.h:98 +#, fuzzy +msgid "Output information on each ref" +msgstr "atualizar informaรงรฃo de stat no ficheiro de รญndice" + +#: command-list.h:99 +msgid "Prepare patches for e-mail submission" +msgstr "" + +#: command-list.h:100 +#, fuzzy +msgid "Verifies the connectivity and validity of the objects in the database" +msgstr "escrever o objeto na base de dados de objetos" + +#: command-list.h:101 +msgid "Cleanup unnecessary files and optimize the local repository" +msgstr "" + +#: command-list.h:102 +msgid "Extract commit ID from an archive created using git-archive" +msgstr "" + +#: command-list.h:103 msgid "Print lines matching a pattern" msgstr "Imprimir linhas que correspondam a um padrรฃo" -#: common-cmds.h:26 +#: command-list.h:104 +msgid "A portable graphical interface to Git" +msgstr "" + +#: command-list.h:105 +msgid "Compute object ID and optionally creates a blob from a file" +msgstr "" + +#: command-list.h:106 +msgid "Display help information about Git" +msgstr "" + +#: command-list.h:107 +msgid "Server side implementation of Git over HTTP" +msgstr "" + +#: command-list.h:108 +#, fuzzy +msgid "Download from a remote Git repository via HTTP" +msgstr "Transferir objetos e referรชncias doutro repositรณrio" + +#: command-list.h:109 +#, fuzzy +msgid "Push objects over HTTP/DAV to another repository" +msgstr "Transferir objetos e referรชncias doutro repositรณrio" + +#: command-list.h:110 +msgid "Send a collection of patches from stdin to an IMAP folder" +msgstr "" + +#: command-list.h:111 +msgid "Build pack index file for an existing packed archive" +msgstr "" + +#: command-list.h:112 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Criar um repositรณrio Git vazio ou reinicializar um jรก existente" -#: common-cmds.h:27 +#: command-list.h:113 +msgid "Instantly browse your working repository in gitweb" +msgstr "" + +#: command-list.h:114 +msgid "Add or parse structured information in commit messages" +msgstr "" + +#: command-list.h:115 +#, fuzzy +msgid "The Git repository browser" +msgstr "Nรฃo รฉ um repositรณrio git" + +#: command-list.h:116 msgid "Show commit logs" msgstr "Mostrar histรณrico de commits" -#: common-cmds.h:28 +#: command-list.h:117 +#, fuzzy +msgid "Show information about files in the index and the working tree" +msgstr "e fez alteraรงรตes ao รญndice e/ou ร รกrvore de trabalho" + +#: command-list.h:118 +#, fuzzy +msgid "List references in a remote repository" +msgstr "repositรณrio de referรชncia" + +#: command-list.h:119 +#, fuzzy +msgid "List the contents of a tree object" +msgstr "imprimir apenas as tags do objeto" + +#: command-list.h:120 +msgid "Extracts patch and authorship from a single e-mail message" +msgstr "" + +#: command-list.h:121 +msgid "Simple UNIX mbox splitter program" +msgstr "" + +#: command-list.h:122 +msgid "Run tasks to optimize Git repository data" +msgstr "" + +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "Juntar duas ou mais histรณrias de desenvolvimento numa sรณ" -#: common-cmds.h:29 +#: command-list.h:124 +#, fuzzy +msgid "Find as good common ancestors as possible for a merge" +msgstr "encontrar antecessores de uma รบnica integraรงรฃo com n pontos" + +#: command-list.h:125 +#, fuzzy +msgid "Run a three-way file merge" +msgstr "A recorrer a integraรงรฃo com 3 pontos...\n" + +#: command-list.h:126 +#, fuzzy +msgid "Run a merge for files needing merging" +msgstr "" +"integrar com 3 pontos se a integraรงรฃo ao nรญvel de ficheiros nรฃo for " +"necessรกria" + +#: command-list.h:127 +msgid "The standard helper program to use with git-merge-index" +msgstr "" + +#: command-list.h:128 +msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgstr "" + +#: command-list.h:129 +msgid "Show three-way merge without touching index" +msgstr "" + +#: command-list.h:130 +msgid "Write and verify multi-pack-indexes" +msgstr "" + +#: command-list.h:131 +#, fuzzy +msgid "Creates a tag object" +msgstr "outro objeto tag" + +#: command-list.h:132 +msgid "Build a tree-object from ls-tree formatted text" +msgstr "" + +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "Mover ou mudar o nome de um ficheiro, diretรณrio ou ligaรงรฃo simbรณlica" -#: common-cmds.h:30 +#: command-list.h:134 +msgid "Find symbolic names for given revs" +msgstr "" + +#: command-list.h:135 +#, fuzzy +msgid "Add or inspect object notes" +msgstr "o objeto esperado %s nรฃo foi recebido" + +#: command-list.h:136 +msgid "Import from and submit to Perforce repositories" +msgstr "" + +#: command-list.h:137 +#, fuzzy +msgid "Create a packed archive of objects" +msgstr "ignorar objetos compactados" + +#: command-list.h:138 +#, fuzzy +msgid "Find redundant pack files" +msgstr "nรฃo รฉ possรญvel invocar pread sobre o ficheiro de pacote" + +#: command-list.h:139 +msgid "Pack heads and tags for efficient repository access" +msgstr "" + +#: command-list.h:140 +msgid "Routines to help parsing remote repository access parameters" +msgstr "" + +#: command-list.h:141 +msgid "Compute unique ID for a patch" +msgstr "" + +#: command-list.h:142 +#, fuzzy +msgid "Prune all unreachable objects from the object database" +msgstr "escrever o objeto na base de dados de objetos" + +#: command-list.h:143 +msgid "Remove extra objects that are already in pack files" +msgstr "" + +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Obter e integrar com outro repositรณrio ou outro ramo local" -#: common-cmds.h:31 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "Atualizar referรชncias remotas juntamente com objetos associados" -#: common-cmds.h:32 +#: command-list.h:146 +#, fuzzy +msgid "Applies a quilt patchset onto the current branch" +msgstr "Nรฃo estรก definido nenhum ramo a montante para o ramo atual." + +#: command-list.h:147 +msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#: command-list.h:148 +#, fuzzy +msgid "Reads tree information into the index" +msgstr "atualizar informaรงรฃo de stat no ficheiro de รญndice" + +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "Reaplicar commits no topo de outra base" -#: common-cmds.h:33 +#: command-list.h:150 +#, fuzzy +msgid "Receive what is pushed into the repository" +msgstr "Gravar alteraรงรตes no repositรณrio" + +#: command-list.h:151 +#, fuzzy +msgid "Manage reflog information" +msgstr "mostrar informaรงรฃo de resolver-desfazer" + +#: command-list.h:152 +#, fuzzy +msgid "Manage set of tracked repositories" +msgstr "Gravar alteraรงรตes no repositรณrio" + +#: command-list.h:153 +#, fuzzy +msgid "Pack unpacked objects in a repository" +msgstr "--cached fora de um repositรณrio" + +#: command-list.h:154 +#, fuzzy +msgid "Create, list, delete refs to replace objects" +msgstr "Criar, listar, eliminar ou verificar um objeto tag assinado com GPG" + +#: command-list.h:155 +msgid "Generates a summary of pending changes" +msgstr "" + +#: command-list.h:156 +msgid "Reuse recorded resolution of conflicted merges" +msgstr "" + +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "Repor a HEAD atual no estado especificado" -#: common-cmds.h:34 +#: command-list.h:158 +#, fuzzy +msgid "Restore working tree files" +msgstr "Mudar de ramos ou restaurar os ficheiros da รกrvore de trabalho" + +#: command-list.h:159 +#, fuzzy +msgid "Revert some existing commits" +msgstr "nรฃo รฉ possรญvel emendar commit nรฃo-existente" + +#: command-list.h:160 +#, fuzzy +msgid "Lists commit objects in reverse chronological order" +msgstr "mostrar commits em ordem topolรณgica" + +#: command-list.h:161 +#, fuzzy +msgid "Pick out and massage parameters" +msgstr "demasiados parรขmetros" + +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "Remover ficheiros da รกrvore de trabalho e do รญndice" -#: common-cmds.h:35 +#: command-list.h:163 +msgid "Send a collection of patches as emails" +msgstr "" + +#: command-list.h:164 +#, fuzzy +msgid "Push objects over Git protocol to another repository" +msgstr "Transferir objetos e referรชncias doutro repositรณrio" + +#: command-list.h:165 +msgid "Restricted login shell for Git-only SSH access" +msgstr "" + +#: command-list.h:166 +msgid "Summarize 'git log' output" +msgstr "" + +#: command-list.h:167 msgid "Show various types of objects" msgstr "Mostrar vรกrios tipos objetos" -#: common-cmds.h:36 +#: command-list.h:168 +#, fuzzy +msgid "Show branches and their commits" +msgstr "imprimir apenas ramos que contenham o commit" + +#: command-list.h:169 +msgid "Show packed archive index" +msgstr "" + +#: command-list.h:170 +#, fuzzy +msgid "List references in a local repository" +msgstr "o repositรณrio de referรชncia '%s' nรฃo รฉ um repositรณrio local." + +#: command-list.h:171 +msgid "Git's i18n setup code for shell scripts" +msgstr "" + +#: command-list.h:172 +msgid "Common Git shell script setup code" +msgstr "" + +#: command-list.h:173 +msgid "Initialize and modify the sparse-checkout" +msgstr "" + +#: command-list.h:174 +#, fuzzy +msgid "Stash the changes in a dirty working directory away" +msgstr "%s: jรก existe no diretรณrio de trabalho" + +#: command-list.h:175 +#, fuzzy +msgid "Add file contents to the staging area" +msgstr "Adicionar conteรบdos de ficheiros ao รญndice" + +#: command-list.h:176 msgid "Show the working tree status" msgstr "Mostrar o estado da รกrvores de trabalho" -#: common-cmds.h:37 +#: command-list.h:177 +msgid "Remove unnecessary whitespace" +msgstr "" + +#: command-list.h:178 +msgid "Initialize, update or inspect submodules" +msgstr "" + +#: command-list.h:179 +msgid "Bidirectional operation between a Subversion repository and Git" +msgstr "" + +#: command-list.h:180 +#, fuzzy +msgid "Switch branches" +msgstr "Mudou para o ramo '%s'\n" + +#: command-list.h:181 +#, fuzzy +msgid "Read, modify and delete symbolic refs" +msgstr "eliminar referรชncias simbรณlicas" + +#: command-list.h:182 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Criar, listar, eliminar ou verificar um objeto tag assinado com GPG" -#: parse-options.h:145 -msgid "expiry-date" -msgstr "data-de-validade" +#: command-list.h:183 +msgid "Creates a temporary file with a blob's contents" +msgstr "" -#: parse-options.h:160 -msgid "no-op (backward compatibility)" -msgstr "sem-aรงรฃo (retrocompatibilidade)" +#: command-list.h:184 +msgid "Unpack objects from a packed archive" +msgstr "" -#: parse-options.h:238 -msgid "be more verbose" -msgstr "ser mais verboso" +#: command-list.h:185 +#, fuzzy +msgid "Register file contents in the working tree to the index" +msgstr "Remover ficheiros da รกrvore de trabalho e do รญndice" -#: parse-options.h:240 -msgid "be more quiet" -msgstr "ser mais silencioso" +#: command-list.h:186 +msgid "Update the object name stored in a ref safely" +msgstr "" -#: parse-options.h:246 -msgid "use <n> digits to display SHA-1s" -msgstr "usar <n> dรญgitos para mostrar SHA-1s" +#: command-list.h:187 +msgid "Update auxiliary info file to help dumb servers" +msgstr "" -#: rerere.h:40 -msgid "update the index with reused conflict resolution if possible" +#: command-list.h:188 +msgid "Send archive back to git-archive" msgstr "" -"atualizar o รญndice com resoluรงรตes de conflitos reutilizadas se possรญvel" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "Deve comeรงar por executar \"git bisect start\"" +#: command-list.h:189 +msgid "Send objects packed back to git-fetch-pack" +msgstr "" -#. 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 "Quer que o Git o faรงa por si [Y/n]? " +#: command-list.h:190 +msgid "Show a Git logical variable" +msgstr "" -#: git-bisect.sh:121 -#, sh-format -msgid "unrecognised option: '$arg'" -msgstr "opรงรฃo nรฃo reconhecida: '$arg'" +#: command-list.h:191 +#, fuzzy +msgid "Check the GPG signature of commits" +msgstr "assinar o commit com GPG" -#: git-bisect.sh:125 -#, sh-format -msgid "'$arg' does not appear to be a valid revision" -msgstr "'$arg' nรฃo parecer ser uma revisรฃo vรกlida" +#: command-list.h:192 +#, fuzzy +msgid "Validate packed Git archive files" +msgstr "nรฃo foi possรญvel criar o ficheiro de arquivo '%s'" -#: git-bisect.sh:154 -msgid "Bad HEAD - I need a HEAD" -msgstr "HEAD incorreta - รฉ necessรกrio uma HEAD" +#: command-list.h:193 +msgid "Check the GPG signature of tags" +msgstr "" -#: git-bisect.sh:167 -#, sh-format -msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." +#: command-list.h:194 +msgid "Git web interface (web frontend to Git repositories)" msgstr "" -"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-vรกlido>'." -#: git-bisect.sh:177 -msgid "won't bisect on cg-seek'ed tree" -msgstr "nรฃo รฉ possรญvel bissetar numa รกrvore \"cg-seek'ed\"" +#: command-list.h:195 +msgid "Show logs with difference each commit introduces" +msgstr "" -#: git-bisect.sh:181 -msgid "Bad HEAD - strange symbolic ref" -msgstr "HEAD incorreta - referรชncia simbรณlica desconhecida" +#: command-list.h:196 +#, fuzzy +msgid "Manage multiple working trees" +msgstr "caminho para a รกrvore de trabalho" -#: git-bisect.sh:233 -#, sh-format -msgid "Bad bisect_write argument: $state" -msgstr "Argumento de bisect_write incorreto: $state" +#: command-list.h:197 +#, fuzzy +msgid "Create a tree object from the current index" +msgstr "ler o objeto da entrada padrรฃo" + +#: command-list.h:198 +msgid "Defining attributes per path" +msgstr "Definir atributos por caminho" + +#: command-list.h:199 +msgid "Git command-line interface and conventions" +msgstr "" + +#: command-list.h:200 +msgid "A Git core tutorial for developers" +msgstr "" + +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "" + +#: command-list.h:202 +msgid "Git for CVS users" +msgstr "" + +#: command-list.h:203 +#, fuzzy +msgid "Tweaking diff output" +msgstr "suprimir saรญda do diff" + +#: command-list.h:204 +msgid "A useful minimum set of commands for Everyday Git" +msgstr "" + +#: command-list.h:205 +msgid "Frequently asked questions about using Git" +msgstr "" + +#: command-list.h:206 +#, fuzzy +msgid "A Git Glossary" +msgstr "Um Glossรกrio do Git" + +#: command-list.h:207 +msgid "Hooks used by Git" +msgstr "" + +#: command-list.h:208 +msgid "Specifies intentionally untracked files to ignore" +msgstr "" +"Especificar ficheiros nรฃo controlados para serem intencionalmente ignorados" + +#: command-list.h:209 +msgid "Defining submodule properties" +msgstr "Definir propriedades de submรณdulos" + +#: command-list.h:210 +msgid "Git namespaces" +msgstr "" + +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "" -#: git-bisect.sh:262 +#: command-list.h:212 +msgid "Git Repository Layout" +msgstr "" + +#: command-list.h:213 +msgid "Specifying revisions and ranges for Git" +msgstr "Especificar revisรตes e intervalos do Git" + +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "" + +#: command-list.h:215 +#, fuzzy +msgid "A tutorial introduction to Git: part two" +msgstr "Uma introduรงรฃo ao Git (versรฃo 1.5.1 ou mais recente)" + +#: command-list.h:216 +#, fuzzy +msgid "A tutorial introduction to Git" +msgstr "Uma introduรงรฃo ao Git (versรฃo 1.5.1 ou mais recente)" + +#: command-list.h:217 +msgid "An overview of recommended workflows with Git" +msgstr "Uma descriรงรฃo geral dos fluxos de trabalho recomendados para o Git" + +#: git-bisect.sh:79 #, sh-format msgid "Bad rev input: $arg" msgstr "Revisรฃo incorreta na entrada: $arg" -#: git-bisect.sh:281 +#: git-bisect.sh:99 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Revisรฃo incorreta na entrada: $bisected_head" -#: git-bisect.sh:290 +#: git-bisect.sh:108 #, sh-format msgid "Bad rev input: $rev" msgstr "Revisรฃo incorreta na entrada: $rev" -#: git-bisect.sh:299 +#: git-bisect.sh:117 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' sรณ leva um argumento." -#: git-bisect.sh:322 -#, sh-format -msgid "Warning: bisecting only with a $TERM_BAD commit." -msgstr "Aviso: a bissetar sรณ com um commit $TERM_BAD." - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:328 -msgid "Are you sure [Y/n]? " -msgstr "Tem a certeza [Y/n]? " - -#: git-bisect.sh:340 -#, sh-format -msgid "" -"You need to give me at least one $bad_syn and one $good_syn revision.\n" -"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" -msgstr "" -"Deve indicar pelo menos uma revisรฃo $bad_syn e uma revisรฃo $good_syn.\n" -"(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)" - -#: git-bisect.sh:343 -#, sh-format -msgid "" -"You need to start by \"git bisect start\".\n" -"You then need to give me at least one $good_syn and one $bad_syn revision.\n" -"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" -msgstr "" -"Deve comeรงar por executar \"git bisect start\".\n" -"Indique pelo menos uma revisรฃo $good_syn e uma revisรฃo $bad_syn.\n" -"(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)" - -#: git-bisect.sh:414 git-bisect.sh:546 -msgid "We are not bisecting." -msgstr "Nรฃo se estรก a bissetar." - -#: git-bisect.sh:421 -#, sh-format -msgid "'$invalid' is not a valid commit" -msgstr "'$invalid' nรฃo รฉ um commit vรกlido" - -#: git-bisect.sh:430 -#, sh-format -msgid "" -"Could not check out original HEAD '$branch'.\n" -"Try 'git bisect reset <commit>'." -msgstr "" -"Nรฃo foi possรญvel extrair a HEAD original de '$branch'.\n" -"Tente 'git bisect reset <commit>'." - -#: git-bisect.sh:458 +#: git-bisect.sh:149 msgid "No logfile given" msgstr "Nenhum ficheiro de log fornecido" -#: git-bisect.sh:459 +#: git-bisect.sh:150 #, sh-format msgid "cannot read $file for replaying" msgstr "nรฃo รฉ possรญvel ler $file para reproduzir" -#: git-bisect.sh:480 +#: git-bisect.sh:173 msgid "?? what are you talking about?" msgstr "?? do que รฉ que estรก a falar?" -#: git-bisect.sh:492 +#: git-bisect.sh:183 +msgid "bisect run failed: no command provided." +msgstr "" + +#: git-bisect.sh:188 #, sh-format msgid "running $command" msgstr "a executar $command" -#: git-bisect.sh:499 +#: git-bisect.sh:195 #, sh-format msgid "" "bisect run failed:\n" @@ -14296,11 +24302,11 @@ msgstr "" "falha ao bissetar:\n" "cรณdigo de saรญda $res de '$command' รฉ < 0 ou >= 128" -#: git-bisect.sh:525 +#: git-bisect.sh:221 msgid "bisect run cannot continue any more" msgstr "nรฃo รฉ possรญvel continuar a bissetar" -#: git-bisect.sh:531 +#: git-bisect.sh:227 #, sh-format msgid "" "bisect run failed:\n" @@ -14309,47 +24315,13 @@ msgstr "" "falha ao bissetar:\n" "'bisect_state $state' retornou com o cรณdigo de erro $res" -#: git-bisect.sh:538 +#: git-bisect.sh:234 msgid "bisect run success" msgstr "bissecรงรฃo concluรญda com sucesso" -#: git-bisect.sh:565 -msgid "please use two different terms" -msgstr "use dois termos diferentes" - -#: git-bisect.sh:575 -#, sh-format -msgid "'$term' is not a valid term" -msgstr "'$term' nรฃo รฉ um termo vรกlido" - -#: git-bisect.sh:578 -#, sh-format -msgid "can't use the builtin command '$term' as a term" -msgstr "nรฃo รฉ possรญvel usar o comando '$term' como um termo" - -#: git-bisect.sh:587 git-bisect.sh:593 -#, sh-format -msgid "can't change the meaning of term '$term'" -msgstr "nรฃo รฉ possรญvel alterar o significado do termo '$term'" - -#: git-bisect.sh:606 -#, sh-format -msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." -msgstr "" -"Comando invรกlido: estรก-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD." - -#: git-bisect.sh:636 -msgid "no terms defined" -msgstr "nenhum termo definido" - -#: git-bisect.sh:653 -#, sh-format -msgid "" -"invalid argument $arg for 'git bisect terms'.\n" -"Supported options are: --term-good|--term-old and --term-bad|--term-new." -msgstr "" -"argumento invรกlido $arg de 'git bisect terms'.\n" -"Opรงรตes suportadas: --term-good|--term-old e --term-bad|--term-new." +#: git-bisect.sh:242 +msgid "We are not bisecting." +msgstr "Nรฃo se estรก a bissetar." #: git-merge-octopus.sh:46 msgid "" @@ -14373,8 +24345,8 @@ msgid "Unable to find common commit with $pretty_name" msgstr "Nรฃo รฉ possรญvel encontrar commit comum com $pretty_name" #: git-merge-octopus.sh:77 -#, sh-format -msgid "Already up-to-date with $pretty_name" +#, fuzzy, sh-format +msgid "Already up to date with $pretty_name" msgstr "Jรก estรก atualizado com $pretty_name" #: git-merge-octopus.sh:89 @@ -14391,350 +24363,49 @@ msgstr "A tentar integraรงรฃo simples com $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "A integraรงรฃo simples nรฃo funcionou, a tentar integraรงรฃo automรกtica." -#: git-rebase.sh:57 -msgid "" -"When you have resolved this problem, run \"git rebase --continue\".\n" -"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" -"To check out the original branch and stop rebasing, run \"git rebase --abort" -"\"." -msgstr "" -"Depois de resolver este problema, execute \"git rebase --continue\".\n" -"Se prefere ignorar este patch, execute \"git rebase --skip\".\n" -"Para extrair o ramo original e interromper o rebase, execute \"git rebase --" -"abort\"." - -#: git-rebase.sh:157 git-rebase.sh:396 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "Nรฃo foi possรญvel voltar para $head_name" - -#: git-rebase.sh:171 -#, sh-format -msgid "Cannot store $stash_sha1" -msgstr "Nรฃo รฉ possรญvel guardar $stash_sha1" - -#: git-rebase.sh:211 -msgid "The pre-rebase hook refused to rebase." -msgstr "Rebase recusado pelo hook pre-rebase." - -#: git-rebase.sh:216 -msgid "It looks like git-am is in progress. Cannot rebase." -msgstr "Parece que o git-am estรก em curso. Nรฃo รฉ possรญvel efetuar rebase." - -#: git-rebase.sh:357 -msgid "No rebase in progress?" -msgstr "Rebase nรฃo estรก em curso?" - -#: git-rebase.sh:368 -msgid "The --edit-todo action can only be used during interactive rebase." -msgstr "A aรงรฃo --edit-todo sรณ pode ser usada durante um rebase interativo." - -#: git-rebase.sh:375 -msgid "Cannot read HEAD" -msgstr "Nรฃo รฉ possรญvel ler HEAD" - -#: git-rebase.sh:378 -msgid "" -"You must edit all merge conflicts and then\n" -"mark them as resolved using git add" -msgstr "" -"Deve editar todos os conflitos da integraรงรฃo\n" -"e marcรก-los como resolvidos usando git add" - -#: git-rebase.sh:418 -#, sh-format -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 "" -"Parece que jรก existe um diretรณrio $state_dir_base e\n" -"รฉ possรญvel que outro processo de rebase jรก esteja em curso.\n" -"Se for o caso, tente\n" -"\t$cmd_live_rebase\n" -"Se nรฃo for o caso,\n" -"\t$cmd_clear_stale_rebase\n" -"e execute o comando de novo. A execuรงรฃo foi interrompida no caso de\n" -"ainda ter algo importante nesse sรญtio." - -#: git-rebase.sh:469 -#, sh-format -msgid "invalid upstream $upstream_name" -msgstr "$upstream_name a montante invรกlido" - -#: git-rebase.sh:493 -#, sh-format -msgid "$onto_name: there are more than one merge bases" -msgstr "$onto_name: hรก mais do que uma base de integraรงรฃo" - -#: git-rebase.sh:496 git-rebase.sh:500 -#, sh-format -msgid "$onto_name: there is no merge base" -msgstr "$onto_name: nรฃo hรก nenhuma base de integraรงรฃo" - -#: git-rebase.sh:505 -#, sh-format -msgid "Does not point to a valid commit: $onto_name" -msgstr "Nรฃo aponta para um commit vรกlido: $onto_name" - -#: git-rebase.sh:528 -#, sh-format -msgid "fatal: no such branch: $branch_name" -msgstr "fatal: ramo inexistente: $branch_name" - -#: git-rebase.sh:561 -msgid "Cannot autostash" -msgstr "Nรฃo รฉ possรญvel empilhar automaticamente (autostash)" - -#: git-rebase.sh:566 -#, sh-format -msgid "Created autostash: $stash_abbrev" -msgstr "Pilha automรกtica (autostash) criada: $stash_abbrev" - -#: git-rebase.sh:570 -msgid "Please commit or stash them." -msgstr "Submeta ou esconda-as." - -#: git-rebase.sh:590 -#, sh-format -msgid "Current branch $branch_name is up to date." -msgstr "O ramo atual $branch_name estรก atualizado." - -#: git-rebase.sh:594 -#, sh-format -msgid "Current branch $branch_name is up to date, rebase forced." -msgstr "O ramo atual $branch_name estรก atualizado, rebase forรงado." - -#: git-rebase.sh:605 -#, sh-format -msgid "Changes from $mb to $onto:" -msgstr "Alteraรงรตes de $mb para $onto:" - -#: git-rebase.sh:614 -msgid "First, rewinding head to replay your work on top of it..." -msgstr "" -"Primeiro, a recuar a cabeรงa para replicar as suas alteraรงรตes no topo dela..." - -#: git-rebase.sh:624 -#, sh-format -msgid "Fast-forwarded $branch_name to $onto_name." -msgstr "$branch_name avanรงado rapidamente para $onto_name." - -#: git-stash.sh:53 -msgid "git stash clear with parameters is unimplemented" -msgstr "nรฃo estรก implementado git stash clear com parรขmetros" - -#: git-stash.sh:94 -msgid "You do not have the initial commit yet" -msgstr "O commit inicial ainda nรฃo existe" - -#: git-stash.sh:109 -msgid "Cannot save the current index state" -msgstr "Nรฃo รฉ possรญvel guardar o estado atual do รญndice" - -#: git-stash.sh:124 -msgid "Cannot save the untracked files" -msgstr "Nรฃo รฉ possรญvel guardar os ficheiros nรฃo controlados" - -#: git-stash.sh:144 git-stash.sh:157 -msgid "Cannot save the current worktree state" -msgstr "Nรฃo รฉ possรญvel guardar o estado atual da รกrvore de trabalho" - -#: git-stash.sh:161 -msgid "No changes selected" -msgstr "Nenhuma alteraรงรฃo selecionada" - -#: git-stash.sh:164 -msgid "Cannot remove temporary index (can't happen)" -msgstr "Nรฃo รฉ possรญvel remover o รญndice temporรกrio (nรฃo pode acontecer)" - -#: git-stash.sh:177 -msgid "Cannot record working tree state" -msgstr "Nรฃo รฉ possรญvel gravar o estado da รกrvore de trabalho" - -#: git-stash.sh:209 -#, sh-format -msgid "Cannot update $ref_stash with $w_commit" -msgstr "Nรฃo รฉ possรญvel atualizar $ref_stash com $w_commit" - -#. TRANSLATORS: $option is an invalid option, like -#. `--blah-blah'. The 7 spaces at the beginning of the -#. second line correspond to "error: ". So you should line -#. up the second line with however many characters the -#. translation of "error: " takes in your language. E.g. in -#. English this is: -#. -#. $ git stash save --blah-blah 2>&1 | head -n 2 -#. error: unknown option for 'stash save': --blah-blah -#. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:265 -#, sh-format -msgid "" -"error: unknown option for 'stash save': $option\n" -" To provide a message, use git stash save -- '$option'" -msgstr "" -"erro: opรงรฃo desconhecida de 'stash save': $option\n" -" Para fornecer uma mensagem, use git stash save -- '$option'" - -#: git-stash.sh:278 -msgid "Can't use --patch and --include-untracked or --all at the same time" -msgstr "" -"Nรฃo รฉ possรญvel usar --patch e --include-untracked ou --all ao mesmo tempo" - -#: git-stash.sh:286 -msgid "No local changes to save" -msgstr "Nรฃo hรก alteraรงรตes locais para guardar" - -#: git-stash.sh:291 -msgid "Cannot initialize stash" -msgstr "Nรฃo รฉ possรญvel inicializar a pilha" - -#: git-stash.sh:295 -msgid "Cannot save the current status" -msgstr "Nรฃo รฉ possรญvel guardar o estado atual" - -#: git-stash.sh:296 -#, sh-format -msgid "Saved working directory and index state $stash_msg" -msgstr "Diretรณrio de trabalho e estado do รญndice $stash_msg guardados" - -#: git-stash.sh:323 -msgid "Cannot remove worktree changes" -msgstr "Nรฃo รฉ possรญvel remover as alteraรงรตes da รกrvore de trabalho" - -#: git-stash.sh:471 -#, sh-format -msgid "unknown option: $opt" -msgstr "opรงรฃo desconhecido: $opt" - -#: git-stash.sh:484 -msgid "No stash found." -msgstr "Nenhuma pilha encontrada." - -#: git-stash.sh:491 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "Demasiadas revisรตes especificadas: $REV" - -#: git-stash.sh:506 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "$reference nรฃo รฉ uma referรชncia vรกlida" - -#: git-stash.sh:534 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "'$args' nรฃo รฉ um commit semelhante a pilha" - -#: git-stash.sh:545 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "'$args' nรฃo รฉ uma referรชncia de pilha" - -#: git-stash.sh:553 -msgid "unable to refresh index" -msgstr "nรฃo foi possรญvel refrescar o รญndice" - -#: git-stash.sh:557 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "Nรฃo รฉ possรญvel aplicar uma pilha durante uma integraรงรฃo" - -#: git-stash.sh:565 -msgid "Conflicts in index. Try without --index." -msgstr "Conflitos no รญndice. Tente sem --index." - -#: git-stash.sh:567 -msgid "Could not save index tree" -msgstr "Nรฃo foi possรญvel guardar รกrvore do รญndice" - -#: git-stash.sh:576 -msgid "Could not restore untracked files from stash" -msgstr "Nรฃo foi possรญvel restaurar os ficheiros nรฃo controlados da pilha" - -#: git-stash.sh:601 -msgid "Cannot unstage modified files" -msgstr "Nรฃo รฉ possรญvel despreparar os ficheiros modificado" - -#: git-stash.sh:616 -msgid "Index was not unstashed." -msgstr "O รญndice nรฃo foi reposto." - -#: git-stash.sh:630 -msgid "The stash is kept in case you need it again." -msgstr "A pilha รฉ guarda no caso de precisar dela de novo." - -#: git-stash.sh:639 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "A descartar ${REV} ($s)" - -#: git-stash.sh:640 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "${REV}: Nรฃo foi possรญvel descartar elemento da pilha" - -#: git-stash.sh:648 -msgid "No branch name specified" -msgstr "Nenhum nome de ramo especificado" - -#: git-stash.sh:727 -msgid "(To restore them type \"git stash apply\")" -msgstr "(Para os restaurar execute \"git stash apply\")" - -#: git-submodule.sh:181 +#: git-submodule.sh:180 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Os caminhos relativos sรณ podem ser usados a partir do topo da รกrvore de " "trabalho" -#: git-submodule.sh:191 +#: git-submodule.sh:190 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL do repositรณrio: '$repo' deve ser absoluto ou comeรงar com ./|../" -#: git-submodule.sh:210 +#: git-submodule.sh:209 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' jรก existe no รญndice" -#: git-submodule.sh:213 +#: git-submodule.sh:212 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' jรก existe no รญndicee nรฃo รฉ um submรณdulo" -#: git-submodule.sh:218 -#, 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 "" -"O seguinte caminho foi ignorado por um ficheiro .gitignore:\n" -"$sm_path\n" -"Use -f se pretende mesmo adicionรก-lo." +#: git-submodule.sh:219 +#, fuzzy, sh-format +msgid "'$sm_path' does not have a commit checked out" +msgstr "o caminho '%s' nรฃo tem a versรฃo deles" -#: git-submodule.sh:236 +#: git-submodule.sh:250 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "A adicionar repositรณrio existente em '$sm_path' ao รญndice" -#: git-submodule.sh:238 +#: git-submodule.sh:252 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' jรก existe e nรฃo รฉ uma repositรณrio git vรกlido" -#: git-submodule.sh:246 +#: git-submodule.sh:260 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Um diretรณrio git de '$sm_name' foi encontrado localmente com os remotos:" -#: git-submodule.sh:248 +#: git-submodule.sh:262 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -14750,101 +24421,39 @@ msgstr "" "ou nรฃo tem a certeza o que isto significa escolha outro nome com a opรงรฃo '--" "name'." -#: git-submodule.sh:254 +#: git-submodule.sh:268 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "A reativar o diretรณrio git local do submรณdulo '$sm_name'." -#: git-submodule.sh:266 +#: git-submodule.sh:280 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Nรฃo foi possรญvel extrair o submรณdulo '$sm_path'" -#: git-submodule.sh:271 +#: git-submodule.sh:285 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Falha ao adicionar o submรณdulo '$sm_path'" -#: git-submodule.sh:280 +#: git-submodule.sh:294 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Falha ao registar o submรณdulo '$sm_path'" -#: git-submodule.sh:341 -#, sh-format -msgid "Entering '$displaypath'" -msgstr "A entrar em '$displaypath'" - -#: git-submodule.sh:361 -#, sh-format -msgid "Stopping at '$displaypath'; script returned non-zero status." -msgstr "" -"Interrompido em '$displaypath'; o script retornou um valor diferente de zero." - -#: git-submodule.sh:432 -#, sh-format -msgid "pathspec and --all are incompatible" -msgstr "especificador de caminho e --all sรฃo incompatรญveis" - -#: git-submodule.sh:437 -#, sh-format -msgid "Use '--all' if you really want to deinitialize all submodules" -msgstr "" -"Use '--all' se pretende mesmo anular a inicializaรงรฃo todos os submรณdulos" - -#: git-submodule.sh:457 -#, sh-format -msgid "" -"Submodule work tree '$displaypath' contains a .git directory\n" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "" -"A รกrvore de trabalho do submรณdulo '$displaypath' contรฉm um diretรณrio .git\n" -"(use 'rm -rf' se pretende mesmo removรช-lo, incluindo todo o seu histรณrico)" - -#: git-submodule.sh:465 -#, sh-format -msgid "" -"Submodule work tree '$displaypath' contains local modifications; use '-f' to " -"discard them" -msgstr "" -"A รกrvore de trabalho do submรณdulo '$displaypath' contรฉm alteraรงรตes locais; " -"use '-f' para as descartar" - -#: git-submodule.sh:468 -#, sh-format -msgid "Cleared directory '$displaypath'" -msgstr "Diretรณrio '$displaypath' limpo" - -#: git-submodule.sh:469 -#, sh-format -msgid "Could not remove submodule work tree '$displaypath'" -msgstr "" -"Nรฃo foi possรญvel remover a รกrvore de trabalho do submรณdulo '$displaypath'" - -#: git-submodule.sh:472 -#, sh-format -msgid "Could not create empty submodule directory '$displaypath'" -msgstr "Nรฃo foi possรญvel criar o diretรณrio vazio do submรณdulo '$displaypath'" - -#: git-submodule.sh:481 -#, sh-format -msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" -msgstr "" -"O registo do submรณdulo '$name' ($url) foi removido do caminho '$displaypath'" - -#: git-submodule.sh:637 +#: git-submodule.sh:567 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Nรฃo foi possรญvel encontrar a revisรฃo atual no caminho de submรณdulo " "'$displaypath'" -#: git-submodule.sh:647 +#: git-submodule.sh:577 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Nรฃo foi possรญvel obter no caminho de submรณdulo '$sm_path'" -#: git-submodule.sh:652 +#: git-submodule.sh:582 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -14853,12 +24462,14 @@ msgstr "" "Nรฃo foi possรญvel encontrar a revisรฃo atual ${remote_name}/${branch} no " "caminho de submรณdulo '$sm_path'" -#: git-submodule.sh:670 -#, sh-format -msgid "Unable to fetch in submodule path '$displaypath'" +#: git-submodule.sh:600 +#, fuzzy, sh-format +msgid "" +"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " +"$sha1:" msgstr "Nรฃo รฉ possรญvel obter no caminho de submรณdulo '$displaypath'" -#: git-submodule.sh:676 +#: git-submodule.sh:606 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14867,109 +24478,101 @@ msgstr "" "Obteve-se no caminho de submรณdulo '$displaypath', mas nรฃo continha $sha1. " "Falha ao obter aquele commit diretamente." -#: git-submodule.sh:683 +#: git-submodule.sh:613 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Nรฃo รฉ possรญvel extrair '$sha1' no caminho de submรณdulo '$displaypath'" -#: git-submodule.sh:684 +#: git-submodule.sh:614 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Caminho de submรณdulo '$displaypath': '$sha1' extraรญdo" -#: git-submodule.sh:688 +#: git-submodule.sh:618 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Nรฃo foi possรญvel efetuar rebase de '$sha1' no caminho de submรณdulo " "'$displaypath'" -#: git-submodule.sh:689 +#: git-submodule.sh:619 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Caminho de submรณdulo '$displaypath': rebase concluรญdo em '$sha1'" -#: git-submodule.sh:694 +#: git-submodule.sh:624 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Nรฃo รฉ possรญvel integrar '$sha1' no caminho de submรณdulo '$displaypath'" -#: git-submodule.sh:695 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Caminho de submรณdulo '$displaypath': integrado em '$sha1'" -#: git-submodule.sh:700 +#: git-submodule.sh:630 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Falha ao executar '$command $sha1' no caminho de submรณdulo '$displaypath'" -#: git-submodule.sh:701 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Caminho de submรณdulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:732 +#: git-submodule.sh:662 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falha ao percorrer o caminho de submรณdulo '$displaypath'" -#: git-submodule.sh:840 -msgid "The --cached option cannot be used with the --files option" -msgstr "A opรงรฃo --cached nรฃo pode ser usada com a opรงรฃo --files" - -#: git-submodule.sh:892 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "modo inesperado $mod_dst" - -#: git-submodule.sh:912 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr " Aviso: $display_name nรฃo contรฉm o commit $sha1_src" - -#: git-submodule.sh:915 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr " Warn: $display_name nรฃo contรฉm o commit $sha1_dst" - -#: git-submodule.sh:918 +#: git-parse-remote.sh:89 #, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr " Warn: $display_name contรฉm os commits $sha1_src e $sha1_dst" +msgid "See git-${cmd}(1) for details." +msgstr "Consulte git-${cmd}(1) para obter mais detalhes." -#: git-submodule.sh:1064 -#, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "Falha ao percorrer recursivamente o caminho de submรณdulo '$sm_path'" +#: git-rebase--preserve-merges.sh:109 +msgid "Applied autostash." +msgstr "Pilha automรกtica (autostash) aplicada." -#: git-submodule.sh:1136 +#: git-rebase--preserve-merges.sh:112 #, sh-format -msgid "Synchronizing submodule url for '$displaypath'" -msgstr "A sincronizar o URL do submรณdulo '$displaypath'" +msgid "Cannot store $stash_sha1" +msgstr "Nรฃo รฉ possรญvel guardar $stash_sha1" -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "Consulte git-${cmd}(1) para obter mais detalhes." +#: git-rebase--preserve-merges.sh:113 +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 "" +"Surgiram conflitos ao aplicar a pilha automรกtica (autostash).\n" +"As suas alteraรงรตes estรฃo guardadas na pilha.\n" +"Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n" -#: git-rebase--interactive.sh:140 +#: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "A rebasear ($new_count/$total)" -#: git-rebase--interactive.sh:156 +#: git-rebase--preserve-merges.sh:197 +#, fuzzy msgid "" "\n" "Commands:\n" -" p, pick = use commit\n" -" r, reword = use commit, but edit the commit message\n" -" e, edit = use commit, but stop for amending\n" -" s, squash = use commit, but meld into previous commit\n" -" f, fixup = like \"squash\", but discard this commit's log message\n" -" x, exec = run command (the rest of the line) using shell\n" -" d, drop = remove commit\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 "" @@ -14985,23 +24588,7 @@ msgstr "" "\n" "Estas linhas pode ser reordenadas; sรฃo executadas de cima para baixo.\n" -#: git-rebase--interactive.sh:171 -msgid "" -"\n" -"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" -msgstr "" -"\n" -"Nรฃo remover nenhum linha. Use 'drop' explicitamente para remover um commit.\n" - -#: git-rebase--interactive.sh:175 -msgid "" -"\n" -"If you remove a line here THAT COMMIT WILL BE LOST.\n" -msgstr "" -"\n" -"Se remover uma linha daqui AQUELE COMMIT SERร PERDIDO.\n" - -#: git-rebase--interactive.sh:211 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -15020,83 +24607,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:236 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: nรฃo รฉ um commit que se possa apanhar" -#: git-rebase--interactive.sh:275 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nome de commit invรกlido: $sha1" -#: git-rebase--interactive.sh:317 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "Nรฃo รฉ possรญvel escrever o sha1 substituto do commit" -#: git-rebase--interactive.sh:369 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "Avanรงo-rรกpido para $sha1" -#: git-rebase--interactive.sh:371 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Nรฃo รฉ possรญvel avanรงar rapidamente para $sha1" -#: git-rebase--interactive.sh:380 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Nรฃo รฉ possรญvel mover HEAD para $first_parent" -#: git-rebase--interactive.sh:385 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Recusa-se a esmagar uma integraรงรฃo: $sha1" -#: git-rebase--interactive.sh:399 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "Erro ao refazer integraรงรฃo $sha1" -#: git-rebase--interactive.sh:407 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "Nรฃo foi possรญvel apanhar $sha1" -#: git-rebase--interactive.sh:416 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "Esta รฉ a mensagem de commit nยบ${n}:" -#: git-rebase--interactive.sh:421 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "A mensagem de commit nยบ${n} serรก ignorada:" -#: git-rebase--interactive.sh:432 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Isto รฉ a combinaรงรฃo de $count commit." msgstr[1] "Isto รฉ a combinaรงรฃo de $count commits." -#: git-rebase--interactive.sh:441 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Nรฃo รฉ possรญvel escrever $fixup_msg" -#: git-rebase--interactive.sh:444 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "Isto รฉ a combinaรงรฃo de 2 commits." -#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 -#: git-rebase--interactive.sh:531 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Nรฃo foi possรญvel aplicar $sha1... $rest" -#: git-rebase--interactive.sh:559 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -15113,31 +24700,31 @@ msgstr "" "poder\n" "reformular a mensagem do commit." -#: git-rebase--interactive.sh:574 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Parou em $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:589 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Nรฃo รฉ possรญvel efetuar '$squash_style' sem um commit anterior" -#: git-rebase--interactive.sh:631 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "A executar: $rest" -#: git-rebase--interactive.sh:639 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "Falha ao executar: $rest" -#: git-rebase--interactive.sh:641 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "e fez alteraรงรตes ao รญndice e/ou ร รกrvore de trabalho" -#: git-rebase--interactive.sh:643 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -15148,7 +24735,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:656 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -15163,94 +24750,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:667 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Comando desconhecido: $command $sha1 $rest" -#: git-rebase--interactive.sh:668 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Corrija-o usando 'git rebase --edit-todo'." -#: git-rebase--interactive.sh:703 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "$head_name rebaseado e atualizado com sucesso." -#: git-rebase--interactive.sh:750 -msgid "Could not skip unnecessary pick commands" -msgstr "Nรฃo foi possรญvel saltar comandos pick desnecessรกrios" - -#: git-rebase--interactive.sh:908 -#, sh-format -msgid "" -"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" -" - $line" -msgstr "" -"Aviso: falta o SHA-1 ou a seguinte linha nรฃo tem um commit:\n" -" - $line" - -#: git-rebase--interactive.sh:941 -#, sh-format -msgid "" -"Warning: the command isn't recognized in the following line:\n" -" - $line" -msgstr "" -"Aviso: o comando nรฃo รฉ reconhecido na seguinte linha:\n" -" - $line" - -#: git-rebase--interactive.sh:980 -msgid "could not detach HEAD" -msgstr "nรฃo foi possรญvel destacar HEAD" - -#: git-rebase--interactive.sh:1018 -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):" -msgstr "" -"Aviso: alguns commits podem ter sido descartados acidentalmente.\n" -"Commits descartados (mais novo para o mais velho):" - -#: git-rebase--interactive.sh:1026 -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." -msgstr "" -"Para evitar esta mensagem, use \"drop\" para remover um commit " -"explicitamente.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' para mudar o nรญvel de avisos.\n" -"O comportamentos possรญveis sรฃo: ignore, warn, error." - -#: git-rebase--interactive.sh:1037 -#, sh-format -msgid "" -"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " -"Ignoring." -msgstr "" -"Definiรงรฃo $check_level desconhecida da opรงรฃo rebase.missingCommitsCheck. " -"Ignorado." - -#: git-rebase--interactive.sh:1054 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'." -msgstr "" -"Pode corrรญ-lo com 'git rebase --edit-todo' e depois executar 'git rebase --" -"continue'." - -#: git-rebase--interactive.sh:1055 -msgid "Or you can abort the rebase with 'git rebase --abort'." -msgstr "Ou pode abortar o rebase com 'git rebase --abort'." - -#: git-rebase--interactive.sh:1083 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Nรฃo foi possรญvel remover CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1088 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15281,11 +24799,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1105 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "Erro ao tentar encontrar a identidade do autor para emendar o commit" -#: git-rebase--interactive.sh:1110 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15293,208 +24811,122 @@ msgstr "" "Tem alteraรงรตes por submeter na รกrvore de trabalho. Submeta-as primeiro\n" "e execute 'git rebase --continue' de novo." -#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "Nรฃo foi possรญvel submeter as alteraรงรตes preparadas." -#: git-rebase--interactive.sh:1147 -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" -"Estรก a editar o ficheiro de tarefa de um rebase interativo em curso.\n" -"Para continuar o rebase depois de editar, execute:\n" -" git rebase --continue\n" -"\n" - -#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "Nรฃo foi possรญvel executar o editor" -#: git-rebase--interactive.sh:1168 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "Nรฃo foi possรญvel extrair $switch_to" -#: git-rebase--interactive.sh:1173 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "Sem HEAD?" -#: git-rebase--interactive.sh:1174 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Nรฃo foi possรญvel criar $state_dir temporรกrio" -#: git-rebase--interactive.sh:1176 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "Nรฃo foi possรญvel marcar como interativo" -#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 -msgid "Could not init rewritten commits" -msgstr "Nรฃo foi possรญvel inicializar commits reescritos" - -#: git-rebase--interactive.sh:1291 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)" msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)" -#: git-rebase--interactive.sh:1296 -msgid "" -"\n" -"However, if you remove everything, the rebase will be aborted.\n" -"\n" -msgstr "" -"\n" -"No entanto, se remover tudo, o rebase serรก abortado.\n" -"\n" - -#: git-rebase--interactive.sh:1303 +#: git-rebase--preserve-merges.sh:945 msgid "Note that empty commits are commented out" msgstr "Note que commits vazios sรฃo comentados" +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 +msgid "Could not init rewritten commits" +msgstr "Nรฃo foi possรญvel inicializar commits reescritos" + #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format msgid "usage: $dashless $USAGE" msgstr "utilizaรงรฃo: $dashless $USAGE" -#: git-sh-setup.sh:190 +#: git-sh-setup.sh:191 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "" "Nรฃo รฉ possรญvel mudar de diretรณrio para $cdup, o topo da รกrvore de trabalho" -#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#: git-sh-setup.sh:200 git-sh-setup.sh:207 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "fatal: $program_name nรฃo pode ser usado sem uma รกrvore de trabalho." -#: git-sh-setup.sh:220 +#: git-sh-setup.sh:221 msgid "Cannot rebase: You have unstaged changes." msgstr "Nรฃo รฉ possรญvel rebasear: tem alteraรงรตes nรฃo preparadas." -#: git-sh-setup.sh:223 +#: git-sh-setup.sh:224 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "Nรฃo รฉ possรญvel reescrever ramos: tem alteraรงรตes nรฃo preparadas." -#: git-sh-setup.sh:226 +#: git-sh-setup.sh:227 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "Nรฃo รฉ possรญvel puxar com rebase: tem alteraรงรตes nรฃo preparadas." -#: git-sh-setup.sh:229 +#: git-sh-setup.sh:230 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "Nรฃo รฉ possรญvel efetuar $action: tem alteraรงรตes nรฃo preparadas." -#: git-sh-setup.sh:242 +#: git-sh-setup.sh:243 msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "Nรฃo รฉ possรญvel rebasear: o รญndice contรฉm alteraรงรตes nรฃo submetidas." -#: git-sh-setup.sh:245 +#: git-sh-setup.sh:246 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "Nรฃo รฉ possรญvel puxar com rebase: o รญndice contรฉm alteraรงรตes nรฃo submetidas." -#: git-sh-setup.sh:248 +#: git-sh-setup.sh:249 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "" "Nรฃo รฉ possรญvel efetuar $action: o รญndice contรฉm alteraรงรตes nรฃo submetidas." -#: git-sh-setup.sh:252 +#: git-sh-setup.sh:253 msgid "Additionally, your index contains uncommitted changes." msgstr "Alรฉm disso, o รญndice contรฉm alteraรงรตes nรฃo submetidas." -#: git-sh-setup.sh:372 +#: git-sh-setup.sh:373 msgid "You need to run this command from the toplevel of the working tree." msgstr "" "Precisa de executar este comando a partir do topo da รกrvore de trabalho." -#: git-sh-setup.sh:377 +#: git-sh-setup.sh:378 msgid "Unable to determine absolute path of git directory" msgstr "Nรฃo รฉ possรญvel determinar o caminho absoluto do diretรณrio git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:238 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:239 -msgid "staged" -msgstr "preparado" - -#: git-add--interactive.perl:239 -msgid "unstaged" -msgstr "nรฃo preparado" - -#: git-add--interactive.perl:288 git-add--interactive.perl:313 -msgid "binary" -msgstr "binรกrio" - -#: git-add--interactive.perl:297 git-add--interactive.perl:351 -msgid "nothing" -msgstr "nada" - -#: git-add--interactive.perl:333 git-add--interactive.perl:348 -msgid "unchanged" -msgstr "nรฃo alterado" - -#: git-add--interactive.perl:644 -#, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "%d caminho adicionar\n" -msgstr[1] "%d caminhos adicionados\n" - -#: git-add--interactive.perl:647 -#, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "%d caminho atualizado\n" -msgstr[1] "%d caminhos atualizados\n" - -#: git-add--interactive.perl:650 -#, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "%d caminho revertido\n" -msgstr[1] "%d caminhos revertidos\n" - -#: git-add--interactive.perl:653 +#: git-add--interactive.perl:634 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "%d caminho afetado\n" msgstr[1] "%d caminhos afetados\n" -#: git-add--interactive.perl:662 -msgid "Update" -msgstr "Atualizar" - -#: git-add--interactive.perl:674 -msgid "Revert" -msgstr "Reverter" - -#: git-add--interactive.perl:697 -#, perl-format -msgid "note: %s is untracked now.\n" -msgstr "nota: %s รฉ agora nรฃo controlado.\n" - -#: git-add--interactive.perl:708 -msgid "Add untracked" -msgstr "Adicionar nรฃo controlados" - -#: git-add--interactive.perl:714 -msgid "No untracked files.\n" -msgstr "Nenhum ficheiros nรฃo controlado.\n" - -#: git-add--interactive.perl:1030 +#: git-add--interactive.perl:1058 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -15502,7 +24934,7 @@ msgstr "" "Se o patch se aplicar corretamente, o excerto editado serรก marcado\n" "como preparado imediatamente." -#: git-add--interactive.perl:1033 +#: git-add--interactive.perl:1061 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -15510,7 +24942,7 @@ msgstr "" "Se o patch se aplicar corretamente, o excerto editado serรก marcado\n" "como escondido imediatamente." -#: git-add--interactive.perl:1036 +#: git-add--interactive.perl:1064 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -15518,7 +24950,8 @@ msgstr "" "Se o patch se aplicar corretamente, o excerto editado serรก marcado\n" "como nรฃo preparado imediatamente." -#: git-add--interactive.perl:1039 git-add--interactive.perl:1048 +#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -15526,7 +24959,8 @@ msgstr "" "Se o patch se aplicar corretamente, o excerto editado serรก marcado\n" "para ser aplicado imediatamente." -#: git-add--interactive.perl:1042 git-add--interactive.perl:1045 +#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -15534,17 +24968,13 @@ msgstr "" "Se o patch se aplicar corretamente, o excerto editado serรก marcado\n" "para ser descartado imediatamente." -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1116 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "" "nรฃo foi possรญvel abrir o ficheiro de ediรงรฃo do excerto para escrita: %s" -#: git-add--interactive.perl:1059 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Modo de ediรงรฃo manual de excerto -- ver guia rรกpido abaixo no final.\n" - -#: git-add--interactive.perl:1065 +#: git-add--interactive.perl:1123 #, perl-format msgid "" "---\n" @@ -15557,37 +24987,13 @@ msgstr "" "Para remover linhas '%s', elimine-as.\n" "Linhas comeรงadas com %s serรฃo removidas.\n" -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1073 -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 nรฃo se aplicar corretamente, ser-lhe-รก dada oportunidade para editar\n" -"de novo. Se todas as linhas do excerto forem removidas, a ediรงรฃo รฉ\n" -"abortada e o exceto รฉ deixado inalterado.\n" - -#: git-add--interactive.perl:1087 +#: git-add--interactive.perl:1145 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" "nรฃo foi possรญvel abrir o ficheiro de ediรงรฃo do excerto para leitura: %s" -#. 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:1178 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"O excerto que editou nรฃo aplica.\n" -"Edite de novo (responder \"nรฃo\" descarta!) [y/n]? " - -#: git-add--interactive.perl:1187 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -15601,7 +25007,7 @@ msgstr "" "a - preparar este excerto e todos os excertos seguintes no ficheiro\n" "d - nรฃo preparar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1193 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -15615,7 +25021,7 @@ msgstr "" "a - esconder este excerto e todos os seguintes no ficheiro\n" "d - nรฃo esconder este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1199 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -15629,7 +25035,7 @@ msgstr "" "a - despreparar este excerto e todos os excertos seguintes no ficheiro\n" "d - nรฃo despreparar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1205 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -15643,7 +25049,7 @@ msgstr "" "a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" "d - nรฃo aplicar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1211 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -15657,7 +25063,7 @@ msgstr "" "a - descartar este excerto e todos os excertos seguintes no ficheiro\n" "d - nรฃo descartar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1217 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -15671,7 +25077,7 @@ msgstr "" "a - descartar este excerto e todos os excertos seguintes no ficheiro\n" "d - nรฃo descartar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1223 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -15685,7 +25091,22 @@ msgstr "" "a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" "d - nรฃo aplicar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1232 +#: git-add--interactive.perl:1301 +#, fuzzy +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 - aplicar este excerto ao รญndice e ร รกrvore de trabalho\n" +"n - nรฃo aplicar este excerto ao รญndice e ร รกrvore de trabalho\n" +"q - sair; nรฃo aplicar este excerto ou restantes\n" +"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" +"d - nรฃo aplicar este excerto nem os excertos seguintes no ficheiro" + +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -15707,203 +25128,95 @@ msgstr "" "e - editar manualmente o excerto atual\n" "? - imprimir ajuda\n" -#: git-add--interactive.perl:1263 +#: git-add--interactive.perl:1347 msgid "The selected hunks do not apply to the index!\n" msgstr "Os excertos selecionados nรฃo aplicam ao รญndice!\n" -#: git-add--interactive.perl:1264 -msgid "Apply them to the worktree anyway? " -msgstr "Aplicรก-los ร รกrvore de trabalho mesmo assim? " - -#: git-add--interactive.perl:1267 -msgid "Nothing was applied.\n" -msgstr "Nรฃo foi aplicado nada.\n" - -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorado nรฃo integrado: %s\n" -#: git-add--interactive.perl:1287 -msgid "Only binary files changed.\n" -msgstr "Apenas ficheiros binรกrios alterados.\n" - -#: git-add--interactive.perl:1289 -msgid "No changes.\n" -msgstr "Sem alteraรงรตes.\n" - -#: git-add--interactive.perl:1297 -msgid "Patch update" -msgstr "Atualizar patch" - -#: git-add--interactive.perl:1349 -#, perl-format -msgid "Stage mode change [y,n,q,a,d,/%s,?]? " -msgstr "Preparar alteraรงรฃo de modo [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1350 -#, perl-format -msgid "Stage deletion [y,n,q,a,d,/%s,?]? " -msgstr "Preparar eliminaรงรฃo [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1351 -#, perl-format -msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " -msgstr "Preparar este excerto [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1354 -#, perl-format -msgid "Stash mode change [y,n,q,a,d,/%s,?]? " -msgstr "Esconder alteraรงรฃo de modo [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1355 -#, perl-format -msgid "Stash deletion [y,n,q,a,d,/%s,?]? " -msgstr "Esconder eliminaรงรฃo [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1356 -#, perl-format -msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " -msgstr "Esconder este excerto [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1359 -#, perl-format -msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " -msgstr "Nรฃo preparar alteraรงรฃo de modo [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1360 -#, perl-format -msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " -msgstr "Nรฃo preparar eliminaรงรฃo [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1361 -#, perl-format -msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " -msgstr "Nรฃo preparar este excerto [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1364 -#, perl-format -msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar alteraรงรฃo de modo ao รญndice [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1365 -#, perl-format -msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar eliminaรงรฃo ao รญndice [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1366 -#, perl-format -msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " -msgstr "Aplicar este excerto ao รญndice [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1369 -#, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descartar alteraรงรฃo de modo da รกrvore de trabalho [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1370 -#, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descartar eliminaรงรฃo da รกrvore de trabalho [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1371 -#, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descartar este excerto da รกrvore de trabalho [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1374 -#, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "" -"Descartar alteraรงรฃo de modo do รญndice e da รกrvore de trabalho [y,n,q,a,d,/" -"%s,?]? " - -#: git-add--interactive.perl:1375 -#, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "" -"Descartar eliminaรงรฃo do รญndice e da รกrvore de trabalho [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1376 -#, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "" -"Descartar este excerto do รญndice e da รกrvore de trabalho [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1379 -#, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +#: git-add--interactive.perl:1481 +#, fuzzy, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" "Aplicar alteraรงรฃo de modo ao รญndice e ร รกrvore de trabalho [y,n,q,a,d,/" "%s,?]? " -#: git-add--interactive.perl:1380 -#, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " +#: git-add--interactive.perl:1482 +#, fuzzy, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "" "Aplicar eliminaรงรฃo ao รญndice e ร รกrvore de trabalho [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1381 -#, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " +#: git-add--interactive.perl:1483 +#, fuzzy, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "" -"Aplicar este excerto ao รญndice e ร รกrvore de trabalho [y,n,q,a,d,/%s,?]? " +"Aplicar eliminaรงรฃo ao รญndice e ร รกrvore de trabalho [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1484 -msgid "go to which hunk (<ret> to see more)? " -msgstr "ir para que excerto (<ret> para ver mais)? " +#, fuzzy, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Aplicar este excerto ao รญndice e ร รกrvore de trabalho [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1486 -msgid "go to which hunk? " -msgstr "ir para que excerto? " +#: git-add--interactive.perl:1601 +msgid "No other hunks to goto\n" +msgstr "" -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Nรบmero invรกlido: '%s'\n" -#: git-add--interactive.perl:1500 +#: git-add--interactive.perl:1624 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Lamento, apenas %d excerto disponรญvel.\n" msgstr[1] "Lamento, apenas %d excertos disponรญveis.\n" -#: git-add--interactive.perl:1526 -msgid "search for regex? " -msgstr "procurar por regex? " +#: git-add--interactive.perl:1659 +msgid "No other hunks to search\n" +msgstr "" -#: git-add--interactive.perl:1539 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regexp de pesquisa malformada %s: %s\n" -#: git-add--interactive.perl:1549 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "Nenhum excerto corresponde ao padrรฃo fornecido\n" -#: git-add--interactive.perl:1561 git-add--interactive.perl:1583 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "Nenhum excerto anterior\n" -#: git-add--interactive.perl:1570 git-add--interactive.perl:1589 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "Nenhum excerto seguinte\n" -#: git-add--interactive.perl:1597 +#: git-add--interactive.perl:1732 +msgid "Sorry, cannot split this hunk\n" +msgstr "" + +#: git-add--interactive.perl:1738 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Dividir em %d excerto.\n" msgstr[1] "Dividir em %d excertos.\n" -#: git-add--interactive.perl:1649 -msgid "Review diff" -msgstr "Rever diff" +#: git-add--interactive.perl:1748 +msgid "Sorry, cannot edit this hunk\n" +msgstr "" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1668 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -15923,84 +25236,98 @@ msgstr "" "add untracked - adicionar conteรบdos de ficheiros nรฃo controlados ao conjunto " "de alteraรงรตes preparadas\n" -#: git-add--interactive.perl:1685 git-add--interactive.perl:1690 -#: git-add--interactive.perl:1693 git-add--interactive.perl:1700 -#: git-add--interactive.perl:1704 git-add--interactive.perl:1710 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 msgid "missing --" msgstr "falta --" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1861 #, perl-format msgid "unknown --patch mode: %s" msgstr "Mode de --patch desconhecido: %s" -#: git-add--interactive.perl:1712 git-add--interactive.perl:1718 +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argumento invรกlido %s, esperava-se --" -#: git-send-email.perl:121 +#: git-send-email.perl:138 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "a zona local difere de GMT por um intervalo nรฃo arrendado ao minuto\n" -#: git-send-email.perl:128 git-send-email.perl:134 +#: git-send-email.perl:145 git-send-email.perl:151 msgid "local time offset greater than or equal to 24 hours\n" msgstr "a diferenรงa de tempo local รฉ maior ou igual a 24 horas\n" -#: git-send-email.perl:202 git-send-email.perl:208 +#: git-send-email.perl:223 git-send-email.perl:229 msgid "the editor exited uncleanly, aborting everything" msgstr "o editor saiu com erros, abortar tudo" -#: git-send-email.perl:282 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' contรฉm uma versรฃo intermรฉdia do e-mail que esteve a compor.\n" -#: git-send-email.perl:287 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contรฉm o e-mail composto.\n" -#: git-send-email.perl:305 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases incompatรญvel com outras opรงรตes\n" -#: git-send-email.perl:368 git-send-email.perl:623 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Nรฃo รฉ possรญvel executar git format-patch fora de um repositรณrio\n" -#: git-send-email.perl:437 +#: git-send-email.perl:492 +msgid "" +"`batch-size` and `relogin` must be specified together (via command-line or " +"configuration option)\n" +msgstr "" + +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Campo de --suppress-cc desconhecido: '%s'\n" -#: git-send-email.perl:466 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Definidiรงรฃo --confirm desconhecida: '%s'\n" -#: git-send-email.perl:498 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "aviso: sendmail alias com aspas nรฃo รฉ suportado: %s\n" -#: git-send-email.perl:500 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "aviso: `:include:` nรฃo suportado: %s\n" -#: git-send-email.perl:502 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "aviso: `/file` ou redireรงรฃo `|pipe` nรฃo suportado: %s\n" -#: git-send-email.perl:507 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "aviso: linha sendmail nรฃo รฉ reconhecida: %s\n" -#: git-send-email.perl:589 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -16015,12 +25342,12 @@ msgstr "" " * Dizendo \"./%s\" se pretende um ficheiro; ou\n" " * Passando a opรงรฃo --format-patch se pretende um intervalo de commits.\n" -#: git-send-email.perl:610 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Falha ao abrir diretรณrio %s: %s" -#: git-send-email.perl:634 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -16029,7 +25356,7 @@ msgstr "" "fatal: %s: %s\n" "aviso: nenhum patch foi enviado\n" -#: git-send-email.perl:645 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -16039,17 +25366,17 @@ msgstr "" "Nenhum ficheiro patch especificado!\n" "\n" -#: git-send-email.perl:658 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "Nenhum linha de assunto em %s?" -#: git-send-email.perl:668 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Falha ao abrir %s para escrita: %s" -#: git-send-email.perl:678 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -16063,31 +25390,27 @@ msgstr "" "\n" "Apague o conteรบdo do corpo se nรฃo deseja enviar um sumรกrio.\n" -#: git-send-email.perl:701 -#, perl-format -msgid "Failed to open %s.final: %s" -msgstr "Falha ao abrir %s.final: %s" - -#: git-send-email.perl:704 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "Falha ao abrir %s: %s" -#: git-send-email.perl:739 -msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" -msgstr "Os campos To/Cc/Bcc nรฃo sรฃo interpretados ainda, foram ignorados\n" +#: git-send-email.perl:788 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "Falha ao abrir %s.final: %s" -#: git-send-email.perl:748 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "O e-mail de sumรกrio estรก vazio, saltรก-lo ร frente\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:780 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Tem a certeza que quer usar <%s> [y/N]? " -#: git-send-email.perl:809 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -16095,11 +25418,11 @@ msgstr "" "Os seguintes ficheiros sรฃo 8bit, mas nรฃo declaram um Content-Transfer-" "Encoding.\n" -#: git-send-email.perl:814 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Que codificaรงรฃo 8bit se deve declarar [UTF-8]? " -#: git-send-email.perl:822 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -16112,22 +25435,22 @@ msgstr "" "tem o assunto modelo '*** SUBJECT HERE ***'. Passe --force se pretende mesmo " "enviar.\n" -#: git-send-email.perl:841 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "Para quem devem ser enviados os e-mails (se alguรฉm)?" -#: git-send-email.perl:859 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: alias '%s' expande para si prรณprio\n" -#: git-send-email.perl:871 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID para ser usado como In-Reply-To para o primeiro e-mail (se " "algum)? " -#: git-send-email.perl:921 git-send-email.perl:929 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "erro: nรฃo รฉ possรญvel extrair um endereรงo vรกlido de: %s\n" @@ -16135,16 +25458,16 @@ msgstr "erro: nรฃo รฉ possรญvel extrair um endereรงo vรกlido de: %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:933 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "O que fazer com este endereรงo? ([q]uit|[d]rop|[e]dit): " -#: git-send-email.perl:1234 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "O caminho de CA '%s' nรฃo existe" -#: git-send-email.perl:1309 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16168,132 +25491,538 @@ msgstr "" " execute 'git config --global sendemail.confirm auto'.\n" "\n" -#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your +#. 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:1324 -msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " +#: git-send-email.perl:1468 +#, fuzzy +msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Enviar este e-mail? ([y]es|[n]o|[q]uit|[a]ll): " -#: git-send-email.perl:1327 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "ร necessรกria resposta se deseja enviar este e-mail" -#: git-send-email.perl:1353 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "O servidor SMTP necessรกrio nรฃo estรก definido corretamente." -#: git-send-email.perl:1397 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "O servidor nรฃo suporta STARTTLS! %s" -#: git-send-email.perl:1403 +#: git-send-email.perl:1551 git-send-email.perl:1555 +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "" + +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Nรฃo รฉ possรญvel inicializar SMTP devidamente. Verifique a configuraรงรฃo e use " "--smtp-debug." -#: git-send-email.perl:1421 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "Falha ao enviar %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "Simulado-Enviado %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "Enviado %s\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "Simulado-OK. O registo diz:\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "OK. O registo diz:\n" -#: git-send-email.perl:1438 +#: git-send-email.perl:1599 msgid "Result: " msgstr "Resultado: " -#: git-send-email.perl:1441 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "Resultado: OK\n" -#: git-send-email.perl:1454 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "nรฃo รฉ possรญvel abrir o ficheiro %s" -#: git-send-email.perl:1501 git-send-email.perl:1521 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Adicionar cc: %s da linha '%s'\n" -#: git-send-email.perl:1507 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Adicionar para: %s da linha '%s'\n" -#: git-send-email.perl:1555 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Adicionar cc: %s da linha '%s'\n" -#: git-send-email.perl:1578 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Adicionar cc: %s da linha '%s'\n" -#: git-send-email.perl:1676 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Nรฃo foi possรญvel executar '%s'" -#: git-send-email.perl:1683 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Adicionar %s: %s de: '%s'\n" -#: git-send-email.perl:1687 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) falha ao fechar pipe para '%s'" -#: git-send-email.perl:1714 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "nรฃo รฉ possรญvel enviar mensagem como 7bit" -#: git-send-email.perl:1722 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "codificaรงรฃo de transferรชncia invรกlida" -#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "nรฃo รฉ possรญvel abrir %s: %s\n" -#: git-send-email.perl:1744 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: o patch contรฉm uma linha mais longa que 998 carateres" -#: git-send-email.perl:1760 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Saltar %s com sufixo de backup '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1764 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Deseja mesmo enviar %s? [y|N]: " +#, c-format +#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +#~ msgstr "" +#~ "valor '%s' de core.untrackedCache desconhecido; usar 'keep' valor por " +#~ "omissรฃo" + +#~ msgid "git fetch-pack: expected ACK/NAK, got EOF" +#~ msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se EOF" + +#~ msgid "Server supports multi_ack_detailed" +#~ msgstr "O servidor suporta multi_ack_detailed" + +#~ msgid "Server supports no-done" +#~ msgstr "O servidor suporta no-done" + +#~ msgid "Server supports multi_ack" +#~ msgstr "O servidor suporta muilti_ack" + +#~ msgid "Server supports side-band-64k" +#~ msgstr "O servidor suporta side-band-64k" + +#~ msgid "Server supports allow-tip-sha1-in-want" +#~ msgstr "O servidor suporta allow-tip-sha1-in-want" + +#~ msgid "Server supports allow-reachable-sha1-in-want" +#~ msgstr "O servidor suporta allow-reachable-sha1-in-want" + +#, c-format +#~ msgid "in %0.1f seconds automatically..." +#~ msgstr "automaticamente em %0.1f..." + +#~ msgid "error building trees" +#~ msgstr "erro ao construir รกrvores" + +#, c-format +#~ msgid "Renaming %s to %s and %s to %s instead" +#~ msgstr "A mudar o nome de %s para %s e de %s para %s, em alternativa" + +#~ msgid "" +#~ "empty strings as pathspecs will be made invalid in upcoming releases. " +#~ "please use . instead if you meant to match all paths" +#~ msgstr "" +#~ "cadeias de caracteres vazias como especificadores de caminho tornar-se-รฃo " +#~ "invรกlidas nas prรณximas versรตes. Use . para corresponder a todos os " +#~ "caminhos" + +#, c-format +#~ msgid "Could not open '%s' for writing" +#~ msgstr "Nรฃo foi possรญvel abrir '%s' para escrita" + +#, c-format +#~ msgid "positive value expected objectname:short=%s" +#~ msgstr "valor positivo esperado objectname:short=%s" + +#, c-format +#~ msgid "(HEAD detached at %s)" +#~ msgstr "(HEAD destacada em %s)" + +#, c-format +#~ msgid "(HEAD detached from %s)" +#~ msgstr "(HEAD destacada de %s)" + +#~ msgid "Internal error" +#~ msgstr "Erro interno" + +#, c-format +#~ msgid "dup2(%d,%d) failed" +#~ msgstr "dup2(%d,%d) falhou" + +#, c-format +#~ msgid "" +#~ "invalid 1st line of squash message:\n" +#~ "\n" +#~ "\t%.*s" +#~ msgstr "" +#~ "1ยช linha invรกlida da mensagem de squash:\n" +#~ "\n" +#~ "\t%.*s" + +#, c-format +#~ msgid "mainline was specified but commit %s is not a merge." +#~ msgstr "" +#~ "a linha principal foi especificada mas o commit %s nรฃo รฉ uma integraรงรฃo." + +#~ msgid "BUG: returned path string doesn't match cwd?" +#~ msgstr "BUG: returned path string doesn't match cwd?" + +#, c-format +#~ msgid "" +#~ "Cannot update sparse checkout: the following entries are not up-to-date:\n" +#~ "%s" +#~ msgstr "" +#~ "Nรฃo รฉ possรญvel extrair esparsamente: as seguintes entradas nรฃo estรฃo " +#~ "atualizadas:\n" +#~ "%s" + +#, c-format +#~ msgid "" +#~ "The following working tree files would be overwritten by sparse checkout " +#~ "update:\n" +#~ "%s" +#~ msgstr "" +#~ "Os seguintes ficheiros na รกrvore de trabalho seriam substituรญdos ao " +#~ "atualizar a extraรงรฃo esparsa:\n" +#~ "%s" + +#, c-format +#~ msgid "" +#~ "The following working tree files would be removed by sparse checkout " +#~ "update:\n" +#~ "%s" +#~ msgstr "" +#~ "Os seguintes ficheiros na รกrvore de trabalho seriam removidos ao " +#~ "atualizar a extraรงรฃo esparsa:\n" +#~ "%s" + +#, c-format +#~ msgid "submodule update strategy not supported for submodule '%s'" +#~ msgstr "nรฃo foi possรญvel procurar pelo submรณdulo '%s'" + +#, c-format +#~ msgid "could not close %s" +#~ msgstr "nรฃo foi possรญvel fechar %s" + +#~ msgid "Initial commit on " +#~ msgstr "Commit inicial em " + +#~ msgid "(+/-)x" +#~ msgstr "(+/-)x" + +#, c-format +#~ msgid "Use -f if you really want to add them.\n" +#~ msgstr "Use -f se deseja mesmo adicionรก-los.\n" + +#~ msgid "Patch is empty. Was it split wrong?" +#~ msgstr "O patch estรก vazio. Foi dividido incorretamente?" + +#~ msgid "cannot be interactive without stdin connected to a terminal." +#~ msgstr "" +#~ "nรฃo รฉ possรญvel entrar em modo interativo sem um entrada padrรฃo conectada " +#~ "a um terminal." + +#, c-format +#~ msgid "The copy of the patch that failed is found in: %s" +#~ msgstr "A cรณpia do patch que falhou encontra-se em: %s" + +#~ msgid "" +#~ "You still have unmerged paths in your index.\n" +#~ "Did you forget to use 'git add'?" +#~ msgstr "" +#~ "Ainda hรก caminhos nรฃo integrados no รญndice.\n" +#~ "Esqueceu-se de usar 'git add'?" + +#~ msgid "update BISECT_HEAD instead of checking out the current commit" +#~ msgstr "atualizar BISECT_HEAD em vez de extrair o commit atual" + +#~ msgid "Use an experimental heuristic to improve diffs" +#~ msgstr "Usar um heurรญstica experimental para melhorar diffs" + +#~ msgid "change upstream info" +#~ msgstr "alterar a informaรงรฃo do ramo a montante" + +#~ msgid "it does not make sense to create 'HEAD' manually" +#~ msgstr "nรฃo faz sentido criar 'HEAD' manualmente" + +#, c-format +#~ msgid "" +#~ "\n" +#~ "If you wanted to make '%s' track '%s', do this:\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "Se quer que '%s' siga '%s', faรงa:\n" +#~ "\n" + +#, c-format +#~ msgid "" +#~ "Cannot update paths and switch to branch '%s' at the same time.\n" +#~ "Did you intend to checkout '%s' which can not be resolved as commit?" +#~ msgstr "" +#~ "Nรฃo รฉ possรญvel atualizar os caminho e mudar para o ramo '%s' ao mesmo " +#~ "tempo.\n" +#~ "Pretendia extrair '%s' o qual nรฃo pode ser resolvido como commit?" + +#, c-format +#~ msgid "failed to stat %s\n" +#~ msgstr "falha ao invocar stat de %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 "" +#~ "Se deseja ignorar este commit, use:\n" +#~ "\n" +#~ " git reset\n" +#~ "\n" +#~ "Depois \"git cherry-pick --continue\" irรก retomar o cherry-pick\n" +#~ "dos restantes commits.\n" + +#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..." +#~ msgstr "Caminhos explรญcitos especificados sem -i ou -o; assumindo --only..." + +#~ msgid "default" +#~ msgstr "predefiniรงรฃo" + +#, c-format +#~ msgid "annotated tag %s has no embedded name" +#~ msgstr "a tag anotada %s nรฃo tem nenhum nome incorporado" + +#~ msgid "<command>" +#~ msgstr "<comando>" + +#~ msgid "default mode for recursion" +#~ msgstr "modo recursivo por omissรฃo" + +#, c-format +#~ msgid "Don't know how to fetch from %s" +#~ msgstr "Nรฃo sei como obter de %s" + +#, c-format +#~ msgid "Can't stat %s" +#~ msgstr "nรฃo รฉ possรญvel invocar stat sobre %s" + +#~ msgid "basename" +#~ msgstr "nomebase" + +#~ msgid "Everyday Git With 20 Commands Or So" +#~ msgstr "Diรกrio Git com mais ou menos 20 Comandos" + +#~ msgid "Error in object" +#~ msgstr "Erro no objeto" + +#~ msgid "print only names (no SHA-1)" +#~ msgstr "imprimir apenas nomes (sem SHA-1)" + +#~ msgid "--[no-]autostash option is only valid with --rebase." +#~ msgstr "a opรงรฃo --[no-]autostash sรณ รฉ vรกlida com --rebase." + +#~ msgid "abort rebase" +#~ msgstr "abortar rebase" + +#~ msgid "push|fetch" +#~ msgstr "push|fetch" + +#~ msgid "w[,i1[,i2]]" +#~ msgstr "w[,i1[,i2]]" + +#~ msgid "submodule--helper subcommand must be called with a subcommand" +#~ msgstr "o subcomando submodule--helper deve ser invocado com um subcomando" + +#~ msgid "tag: tagging " +#~ msgstr "tag: a colocar tag" + +#~ msgid "commit object" +#~ msgstr "objeto commit" + +#~ msgid "blob object" +#~ msgstr "objeto blob" + +#, c-format +#~ msgid "Removing worktrees/%s: not a valid directory" +#~ msgstr "A remover worktrees/%s: diretรณrio invรกlido" + +#, c-format +#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +#~ msgstr "A remover worktrees/%s: nรฃo รฉ possรญvel ler o ficheiro gitdir (%s)" + +#, c-format +#~ msgid "Removing worktrees/%s: invalid gitdir file" +#~ msgstr "A remover worktrees/%s: ficheiro gitdir invรกlido" + +#, sh-format +#~ msgid "unrecognised option: '$arg'" +#~ msgstr "opรงรฃo nรฃo reconhecida: '$arg'" + +#, sh-format +#~ msgid "'$invalid' is not a valid commit" +#~ msgstr "'$invalid' nรฃo รฉ um commit vรกlido" + +#, sh-format +#~ msgid "invalid upstream $upstream_name" +#~ msgstr "$upstream_name a montante invรกlido" + +#, sh-format +#~ msgid "$onto_name: there are more than one merge bases" +#~ msgstr "$onto_name: hรก mais do que uma base de integraรงรฃo" + +#, sh-format +#~ msgid "$onto_name: there is no merge base" +#~ msgstr "$onto_name: nรฃo hรก nenhuma base de integraรงรฃo" + +#, sh-format +#~ msgid "fatal: no such branch: $branch_name" +#~ msgstr "fatal: ramo inexistente: $branch_name" + +#, sh-format +#~ msgid "Fast-forwarded $branch_name to $onto_name." +#~ msgstr "$branch_name avanรงado rapidamente para $onto_name." + +#~ msgid "Cannot remove temporary index (can't happen)" +#~ msgstr "Nรฃo รฉ possรญvel remover o รญndice temporรกrio (nรฃo pode acontecer)" + +#, sh-format +#~ msgid "" +#~ "error: unknown option for 'stash save': $option\n" +#~ " To provide a message, use git stash save -- '$option'" +#~ msgstr "" +#~ "erro: opรงรฃo desconhecida de 'stash save': $option\n" +#~ " Para fornecer uma mensagem, use git stash save -- '$option'" + +#, sh-format +#~ msgid "unknown option: $opt" +#~ msgstr "opรงรฃo desconhecido: $opt" + +#, sh-format +#~ msgid "$reference is not a valid reference" +#~ msgstr "$reference nรฃo รฉ uma referรชncia vรกlida" + +#~ msgid "Cannot unstage modified files" +#~ msgstr "Nรฃo รฉ possรญvel despreparar os ficheiros modificado" + +#~ msgid "(To restore them type \"git stash apply\")" +#~ msgstr "(Para os restaurar execute \"git stash apply\")" + +#, 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 "" +#~ "O seguinte caminho foi ignorado por um ficheiro .gitignore:\n" +#~ "$sm_path\n" +#~ "Use -f se pretende mesmo adicionรก-lo." + +#, sh-format +#~ msgid "Entering '$displaypath'" +#~ msgstr "A entrar em '$displaypath'" + +#, sh-format +#~ msgid "Stopping at '$displaypath'; script returned non-zero status." +#~ msgstr "" +#~ "Interrompido em '$displaypath'; o script retornou um valor diferente de " +#~ "zero." + +#, sh-format +#~ msgid "pathspec and --all are incompatible" +#~ msgstr "especificador de caminho e --all sรฃo incompatรญveis" + +#, sh-format +#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" +#~ msgstr "" +#~ "O registo do submรณdulo '$name' ($url) foi removido do caminho " +#~ "'$displaypath'" + +#~ msgid "The --cached option cannot be used with the --files option" +#~ msgstr "A opรงรฃo --cached nรฃo pode ser usada com a opรงรฃo --files" + +#, sh-format +#~ msgid " Warn: $display_name doesn't contain commit $sha1_src" +#~ msgstr " Aviso: $display_name nรฃo contรฉm o commit $sha1_src" + +#, sh-format +#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst" +#~ msgstr " Warn: $display_name nรฃo contรฉm o commit $sha1_dst" + +#, sh-format +#~ msgid "" +#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +#~ msgstr " Warn: $display_name contรฉm os commits $sha1_src e $sha1_dst" + +#, sh-format +#~ msgid "Failed to recurse into submodule path '$sm_path'" +#~ msgstr "Falha ao percorrer recursivamente o caminho de submรณdulo '$sm_path'" + +#, sh-format +#~ msgid "" +#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" +#~ " - $line" +#~ msgstr "" +#~ "Aviso: falta o SHA-1 ou a seguinte linha nรฃo tem um commit:\n" +#~ " - $line" + +#, sh-format +#~ msgid "" +#~ "Warning: the command isn't recognized in the following line:\n" +#~ " - $line" +#~ msgstr "" +#~ "Aviso: o comando nรฃo รฉ reconhecido na seguinte linha:\n" +#~ " - $line" + +#~ msgid "Or you can abort the rebase with 'git rebase --abort'." +#~ msgstr "Ou pode abortar o rebase com 'git rebase --abort'." + +#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" +#~ msgstr "Os campos To/Cc/Bcc nรฃo sรฃo interpretados ainda, foram ignorados\n" + #~ msgid "" #~ "There is nothing to exclude from by :(exclude) patterns.\n" #~ "Perhaps you forgot to add either ':/' or '.' ?" @@ -16304,21 +26033,12 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ msgid "unrecognized format: %%(%s)" #~ msgstr "formato nรฃo reconhecido: %%(%s)" -#~ msgid ":strip= requires a positive integer argument" -#~ msgstr ":strip= requer um inteiro positivo como argumento" - #~ msgid "ref '%s' does not have %ld components to :strip" #~ msgstr "a referรชncia '%s' nรฃo tem %ld componentes como se indica em :strip" -#~ msgid "unknown %.*s format %s" -#~ msgstr "formato de %.*s desconhecido %s" - #~ msgid "[%s: gone]" #~ msgstr "[%s: desaparecido]" -#~ msgid "[%s]" -#~ msgstr "[%s]" - #~ msgid "[%s: behind %d]" #~ msgstr "[%s: atrรกs %d]" @@ -16337,15 +26057,6 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ msgid "git merge [<options>] <msg> HEAD <commit>" #~ msgstr "git merge [<opรงรตes>] <msg> HEAD <commit>" -#~ msgid "'%s' is not a commit" -#~ msgstr "'%s' nรฃo รฉ um commit" - -#~ msgid "cannot open file '%s'" -#~ msgstr "nรฃo รฉ possรญvel abrir o ficheiro '%s'" - -#~ msgid "could not close file %s" -#~ msgstr "nรฃo รฉ possรญvel fechar o ficheiro %s" - #~ msgid "tag name too long: %.*s..." #~ msgstr "o nome da tag รฉ demasiado longo: %.*s..." @@ -16405,24 +26116,12 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ "Nรฃo รฉ possรญvel efetuar cherry-pick durante outro cherry-pick. durante um " #~ "cherry-pick." -#~ msgid "Could not parse line %d." -#~ msgstr "Nรฃo foi possรญvel analisar a linha %d." - #~ msgid "Could not open %s" #~ msgstr "Nรฃo foi possรญvel abrir %s" -#~ msgid "Could not read %s." -#~ msgstr "Nรฃo foi possรญvel ler %s." - #~ msgid "Could not format %s." #~ msgstr "Nรฃo foi possรญvel formatar %s." -#~ msgid "%s: %s" -#~ msgstr "%s: %s" - -#~ msgid "cannot open %s: %s" -#~ msgstr "nรฃo รฉ possรญvel abrir %s: %s" - #~ msgid "You need to set your committer info first" #~ msgstr "Primeiro tem de definir a sua informaรงรฃo de committer" @@ -16558,18 +26257,12 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ msgid "Unprocessed path??? %s" #~ msgstr "Caminho nรฃo processado??? %s" -#~ msgid "Error wrapping up %s" -#~ msgstr "Erro ao rematar %s." - #~ msgid "Cannot %s during a %s" #~ msgstr "Nรฃo foi possรญvel efetuar %s durante %s" #~ msgid "Can't cherry-pick into empty head" #~ msgstr "Nรฃo รฉ possรญvel efetuar cherry-pick numa cabeรงa vazia" -#~ msgid "could not open %s for writing" -#~ msgstr "nรฃo foi possรญvel abrir %s para escrita" - #~ msgid "could not write branch description template" #~ msgstr "nรฃo foi possรญvel escrever o modelo da descriรงรฃo do ramo" @@ -16609,9 +26302,6 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ msgid "removing '%s' failed" #~ msgstr "falha ao remover '%s'" -#~ msgid "program error" -#~ msgstr "erro do programa" - #~ msgid "Please call 'bisect_state' with at least one argument." #~ msgstr "Invoque 'bisect_state' com pelo menos um argumento." @@ -16648,9 +26338,6 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ msgid "'%s': %s" #~ msgstr "'%s': %s" -#~ msgid "unable to access '%s': %s" -#~ msgstr "nรฃo รฉ possรญvel aceder a '%s': %s" - #~ msgid " git branch -d %s\n" #~ msgstr " git branch -d %s\n" @@ -16665,9 +26352,6 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ "Prepare as suas alteraรงรตes em .gitmodules ou esconda-as (stash) para " #~ "prosseguir" -#~ msgid "could not verify the tag '%s'" -#~ msgstr "nรฃo foi possรญvel validar a tag '%s'" - #~ msgid "failed to remove: %s" #~ msgstr "falha ao remover: %s" @@ -16681,15 +26365,9 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ "Submรณdulo em '$displaypath' nรฃo inicializado\n" #~ "Talvez queira usar 'update --init'?" -#~ msgid "unable to parse format" -#~ msgstr "nรฃo foi possรญvel analisar o formato" - #~ msgid "improper format entered align:%s" #~ msgstr "formato imprรณprio introduzido align:%s" -#~ msgid "Could not set core.worktree in %s" -#~ msgstr "Nรฃo foi possรญvel definir core.worktree em %s" - #~ msgid "" #~ "push.default is unset; its implicit value has changed in\n" #~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -16741,9 +26419,6 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ msgid "Could not append '%s'" #~ msgstr "Nรฃo foi possรญvel acrescentar '%s'" -#~ msgid "Missing author: %s" -#~ msgstr "Autor em falta: %s" - #~ msgid "Testing " #~ msgstr "A testar " diff --git a/third_party/git/po/sv.po b/third_party/git/po/sv.po index 4ad206df70..40c5b23f08 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-2019 Peter Krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2020 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. +# Peter Krefting <peter@softwolves.pp.se>, 2010-2020. # msgid "" msgstr "" -"Project-Id-Version: git 2.23.0\n" +"Project-Id-Version: git 2.29.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-07-30 09:59+0800\n" -"PO-Revision-Date: 2019-07-31 12:40+0200\n" +"POT-Creation-Date: 2020-10-10 09:32+0800\n" +"PO-Revision-Date: 2020-10-11 11:52+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -16,49 +16,776 @@ 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.0.2\n" +"X-Generator: Gtranslator 3.30.1\n" -#: advice.c:109 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "Vadรฅ (%s)?" + +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +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 reset.c:89 sequencer.c:3444 +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:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, 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:1738 git-add--interactive.perl:1371 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Endast binรคra filer รคndrade.\n" + +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "Inga รคndringar.\n" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "Uppdatera patch" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +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:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "*** Kommandon ***" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +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:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: 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:781 git-add--interactive.perl:1805 +#, c-format +msgid "Bye.\n" +msgstr "Hej dรฅ.\n" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, 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:35 git-add--interactive.perl:1434 +#, 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:36 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "Kรถa tillรคgg [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, 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:39 +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:42 +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:56 git-add--interactive.perl:1439 +#, 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:57 git-add--interactive.perl:1440 +#, 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:58 git-add--interactive.perl:1441 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "Stash:a tillรคgg [y,n,q,a,d%s,?]? " + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, 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:61 +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:64 +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:80 git-add--interactive.perl:1445 +#, 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:81 git-add--interactive.perl:1446 +#, 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:82 git-add--interactive.perl:1447 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "Ta bort tillรคgg frรฅn kรถn [y,n,q,a,d%s,?]? " + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, 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:85 +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:88 +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:103 git-add--interactive.perl:1451 +#, 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:104 git-add--interactive.perl:1452 +#, 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:105 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "Applicera tillรคgg pรฅ indexet [y,n,q,a,d%s,?]? " + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, 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:108 add-patch.c:176 add-patch.c:221 +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:111 +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:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, 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:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, 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:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta tillรคgg frรฅn arbetskatalogen [y,n,q,a,d%s,?]? " + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, 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:131 add-patch.c:154 add-patch.c:199 +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:134 add-patch.c:202 +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:149 add-patch.c:194 git-add--interactive.perl:1463 +#, 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:150 add-patch.c:195 git-add--interactive.perl:1464 +#, 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:151 add-patch.c:196 git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta tillรคgg frรฅn indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, 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:157 +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:171 add-patch.c:216 git-add--interactive.perl:1469 +#, 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:172 add-patch.c:217 git-add--interactive.perl:1470 +#, 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:173 add-patch.c:218 git-add--interactive.perl:1471 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera tillรคgg pรฅ indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, 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:179 +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:224 +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:342 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "kunde inte tolka styckehuvudet \"%.*s\"" + +#: add-patch.c:361 add-patch.c:365 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "kunde inte tolka fรคrgat styckehuvud \"%.*s\"" + +#: add-patch.c:419 +msgid "could not parse diff" +msgstr "kunde inte tolka diff" + +#: add-patch.c:438 +msgid "could not parse colored diff" +msgstr "kunde inte tolka fรคrgad diff" + +#: add-patch.c:452 +#, c-format +msgid "failed to run '%s'" +msgstr "misslyckades att kรถra \"%s\"" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "omaka utdata frรฅn interactive.diffFilter" + +#: add-patch.c:612 +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:785 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"fรถrvรคntade sammanhangsrad %d i\n" +"%.*s" + +#: add-patch.c:800 +#, 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:1076 git-add--interactive.perl:1117 +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:1080 +#, 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:1094 git-add--interactive.perl:1131 +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:1127 +msgid "could not parse hunk header" +msgstr "kunde inte tolka styckehuvud" + +#: add-patch.c:1172 +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:1241 git-add--interactive.perl:1244 +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:1284 +msgid "The selected hunks do not apply to the index!" +msgstr "Markerade stycken kan inte appliceras pรฅ indexet!" + +#: add-patch.c:1285 git-add--interactive.perl:1348 +msgid "Apply them to the worktree anyway? " +msgstr "Applicera dem pรฅ arbetskatalogen trots det? " + +#: add-patch.c:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "Ingenting applicerades.\n" + +#: add-patch.c:1349 +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:1511 add-patch.c:1521 +msgid "No previous hunk" +msgstr "Inget fรถregรฅende stycke" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No next hunk" +msgstr "Inget fรถljande stycke" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "Inga andra stycken att gรฅ till" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "gรฅ till vilket stycke (<ret> fรถr att se fler)? " + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "gรฅ till vilket stycke? " + +#: add-patch.c:1555 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Ogiltigt siffervรคrde: \"%s\"" + +#: add-patch.c:1560 +#, 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:1569 +msgid "No other hunks to search" +msgstr "Inga andra stycken att sรถka efter" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "sรถk efter reguljรคrt uttryck? " + +#: add-patch.c:1590 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Felaktigt format pรฅ reguljรคrt sรถkuttryck %s: %s" + +#: add-patch.c:1607 +msgid "No hunk matches the given pattern" +msgstr "Inga stycken motsvarar givet mรถnster" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "Beklagar, kan inte dela stycket" + +#: add-patch.c:1618 +#, c-format +msgid "Split into %d hunks." +msgstr "Dela i %d stycken." + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "Beklagar, kan inte redigera stycket" + +#: add-patch.c:1674 +msgid "'git apply' failed" +msgstr "\"git apply\" misslyckades" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" +"\n" +"Slรฅ av meddelandet med \"git config advice.%s false\"" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "%stips: %.*s%s\n" -#: advice.c:162 +#: advice.c:247 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:164 +#: advice.c:249 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:166 +#: advice.c:251 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:168 +#: advice.c:253 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:170 +#: advice.c:255 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:172 +#: advice.c:257 #, 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:180 +#: advice.c:265 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." @@ -66,23 +793,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:188 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar pรฅ grund av olรถst konflikgt." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:278 builtin/merge.c:1349 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "Checka in dina รคndringar innan du utfรถr sammanslagningen." -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "Avslutar pรฅ grund av ofullbordad sammanslagning." -#: advice.c:202 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -208,17 +935,7 @@ 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: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 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -234,82 +951,92 @@ msgstr[1] "" "sรถkvรคgskomponenter\n" "tas bort (rad %d)" -#: apply.c:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1752 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: ovรคntad 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 msgid "new file depends on old contents" msgstr "ny fil beror pรฅ gammalt innehรฅll" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehรฅll" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch pรฅ rad %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror pรฅ gammalt innehรฅll" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehรฅll" -#: apply.c:1830 +#: apply.c:1831 #, 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:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binรคrpatch pรฅ rad %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binรคrpatchen pรฅ rad %d kรคnns inte igen" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skrรคp pรฅ rad %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte lรคsa symboliska lรคnken %s" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "kunde inte รถppna eller lรคsa %s" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning pรฅ rad: \"%c\"" -#: apply.c:3046 +#: 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] "Stycke %d lyckades pรฅ %d (offset %d rad)." msgstr[1] "Stycke %d lyckades pรฅ %d (offset %d rader)." -#: apply.c:3058 +#: apply.c:3069 #, 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:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -318,25 +1045,25 @@ msgstr "" "vid sรถkning efter:\n" "%.*s" -#: apply.c:3086 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binรคra patchdata fรถr \"%s\"" -#: apply.c:3094 +#: apply.c:3105 #, 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:3141 +#: apply.c:3152 #, 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:3151 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -344,429 +1071,459 @@ msgstr "" "patchen appliceras pรฅ \"%s\" (%s), som inte motsvarar det nuvarande " "innehรฅllet." -#: apply.c:3159 +#: apply.c:3171 #, 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:3177 +#: apply.c:3189 #, 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:3190 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binรคrpatchen kan inte tillรคmpas pรฅ \"%s\"" -#: apply.c:3196 +#: apply.c:3209 #, 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:3217 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3340 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 #, c-format msgid "failed to read %s" msgstr "misslyckades lรคsa %s" -#: apply.c:3400 +#: apply.c:3413 #, 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:3429 apply.c:3672 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "sรถkvรคgen %s har รคndrat namn/tagits bort" -#: apply.c:3515 apply.c:3687 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3524 apply.c:3695 +#: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3559 +#: apply.c:3572 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:3562 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka pรฅ trevรคgssammanslagning...\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte lรคsa aktuellt innehรฅll i \"%s\"" -#: apply.c:3594 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka pรฅ trevรคgssammanslagning...\n" -#: apply.c:3608 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen pรฅ \"%s\" med konflikter.\n" -#: apply.c:3613 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillรคmpade patchen pรฅ \"%s\" rent.\n" -#: apply.c:3639 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "patch fรถr borttagning lรคmnar kvar filinnehรฅll" -#: apply.c:3712 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3714 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, fรถrvรคntade %o" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sรถkvรคg \"%s\"" -#: apply.c:3923 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3926 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3946 +#: apply.c:3976 #, 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:3951 +#: apply.c:3981 #, 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:3971 +#: apply.c:4001 #, 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:3975 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillรคmpas" -#: apply.c:3990 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4082 +#: apply.c:4112 #, 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:4089 +#: apply.c:4119 #, 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:4092 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller รคr oanvรคndbar (%s)." -#: 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 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lรคgga till %s till temporรคrt index" -#: apply.c:4111 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporรคrt index till %s" -#: apply.c:4249 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s frรฅn indexet" -#: apply.c:4283 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch fรถr undermodulen %s" -#: apply.c:4289 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status pรฅ nyligen skapade filen \"%s\"" -#: apply.c:4297 +#: apply.c:4327 #, 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:4303 apply.c:4448 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lรคgga till cachepost fรถr %s" -#: apply.c:4346 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4350 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "stรคnger filen \"%s\"" -#: apply.c:4420 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" lรคge %o" -#: apply.c:4518 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillรคmpade patchen %s rent." -#: apply.c:4526 +#: apply.c:4556 msgid "internal error" msgstr "internt fel" -#: apply.c:4529 +#: apply.c:4559 #, 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:4540 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "kan inte รถppna %s" -#: apply.c:4562 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillรคmpades rent." -#: apply.c:4566 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4676 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4684 +#: apply.c:4723 msgid "unrecognized input" msgstr "indata kรคnns inte igen" -#: apply.c:4704 +#: apply.c:4743 msgid "unable to read index file" msgstr "kan inte lรคsa indexfilen" -#: apply.c:4859 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte รถppna patchen \"%s\": %s" -#: apply.c:4886 +#: apply.c:4927 #, 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:4892 apply.c:4907 +#: apply.c:4933 apply.c:4948 #, 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:4900 +#: apply.c:4941 #, 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:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: 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 +#: apply.c:4985 msgid "don't apply changes matching the given path" msgstr "tillรคmpa inte รคndringar som motsvarar given sรถkvรคg" -#: apply.c:4947 +#: apply.c:4988 msgid "apply changes matching the given path" msgstr "tillรคmpa รคndringar som motsvarar given sรถkvรคg" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "antal" -#: apply.c:4950 +#: apply.c:4991 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck frรฅn traditionella diff-sรถkvรคgar" -#: apply.c:4953 +#: apply.c:4994 msgid "ignore additions made by the patch" msgstr "ignorera tillรคgg gjorda av patchen" -#: apply.c:4955 +#: apply.c:4996 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:4959 +#: apply.c:5000 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4961 +#: apply.c:5002 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:4963 +#: apply.c:5004 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:4965 +#: apply.c:5006 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillรคmpas pรฅ aktuellt index" -#: apply.c:4967 +#: apply.c:5008 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:4969 +#: apply.c:5010 msgid "apply a patch without touching the working tree" msgstr "tillรคmpa en patch utan att rรถra arbetskatalogen" -#: apply.c:4971 +#: apply.c:5012 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rรถr filer utanfรถr arbetskatalogen" -#: apply.c:4974 +#: apply.c:5015 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillรคmpa ocksรฅ patchen (anvรคnd med --stat/--summary/--check)" -#: apply.c:4976 +#: apply.c:5017 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:4978 +#: apply.c:5019 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporรคrt index baserat pรฅ inbyggd indexinformation" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "sรถkvรคgar avdelas med NUL-tecken" -#: apply.c:4983 +#: apply.c:5024 msgid "ensure at least <n> lines of context match" msgstr "se till att รฅtminstone <n> rader sammanhang รคr lika" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3319 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "รฅtgรคrd" -#: apply.c:4985 +#: apply.c:5026 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller รคndrade rader som har fel i blanktecken" -#: apply.c:4988 apply.c:4991 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" msgstr "ignorera รคndringar i blanktecken fรถr sammanhang" -#: apply.c:4994 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "tillรคmpa patchen baklรคnges" -#: apply.c:4996 +#: apply.c:5037 msgid "don't expect at least one line of context" msgstr "fรถrvรคnta inte minst en rad sammanhang" -#: apply.c:4998 +#: apply.c:5039 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lรคmna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5000 +#: apply.c:5041 msgid "allow overlapping hunks" msgstr "tillรฅt รถverlappande stycken" -#: 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 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5003 +#: apply.c:5044 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5006 +#: apply.c:5047 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte pรฅ antalet linjer i styckehuvuden" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "rot" -#: apply.c:5009 +#: apply.c:5050 msgid "prepend <root> to all filenames" msgstr "lรคgg till <rot> i alla filnamn" +#: 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:265 archive-zip.c:358 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "filens lรคge stรถds ej: 0%o (SHA1: %s)" + +#: archive-tar.c:449 +#, c-format +msgid "unable to start '%s' filter" +msgstr "kunde inte starta filtret \"%s\"" + +#: archive-tar.c:452 +msgid "unable to redirect descriptor" +msgstr "kan inte omdirigera handtag" + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "filtret \"%s\" rapporterade fel" + +#: archive-zip.c:318 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "sรถkvรคgen รคr inte giltig UTF-8: %s" + +#: archive-zip.c:322 +#, 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:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "fel i deflate (%d)" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "tidsstรคmpeln fรถr stor fรถr detta system: %<PRIuMAX>" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<flaggor>] <trรคd-igt> [<sรถkvรคg>...]" @@ -786,182 +1543,164 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "kan inte lรคsa %s" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "kunde inte lรคsa \"%s\"" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sรถkvรคgsangivelsen \"%s\" motsvarade inte nรฅgra filer" -#: archive.c:396 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "ingen sรฅdan referens: %.*s" -#: archive.c:401 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "objektnamnet รคr inte giltigt: %s" -#: archive.c:414 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "inte ett trรคdobjekt: %s" -#: archive.c:426 +#: archive.c:485 msgid "current working directory is untracked" msgstr "aktuell arbetskatalog รคr inte spรฅrad" -#: archive.c:457 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "Hittar inte filen: %s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "Inte en vanlig fil: %s" + +#: archive.c:553 msgid "fmt" msgstr "fmt" -#: archive.c:457 +#: archive.c:553 msgid "archive format" msgstr "arkivformat" -#: archive.c:458 builtin/log.c:1597 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "prefix" -#: archive.c:459 +#: archive.c:555 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: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 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "fil" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "ta med ospรฅrade filer i arkivet" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:463 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr "lรคs .gitattributes i arbetskatalogen" -#: archive.c:464 +#: archive.c:563 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer pรฅ standard fel" -#: archive.c:465 +#: archive.c:564 msgid "store only" msgstr "endast spara" -#: archive.c:466 +#: archive.c:565 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:474 +#: archive.c:573 msgid "compress better" msgstr "komprimera bรคttre" -#: archive.c:477 +#: archive.c:576 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:1379 builtin/submodule--helper.c:1859 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "arkiv" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:579 builtin/archive.c:92 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:707 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "kommando" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "sรถkvรคg till kommandot git-upload-archive pรฅ fjรคrren" -#: archive.c:489 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "Ovรคntad flagga --remote" -#: archive.c:491 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "Flaggan --exec kan endast anvรคndas tillsammans med --remote" -#: archive.c:493 +#: archive.c:592 msgid "Unexpected option --output" msgstr "Ovรคntad flagga --output" -#: archive.c:515 +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" +msgstr "Flaggorna --add-file och --remote kan inte anvรคndas samtidigt" + +#: archive.c:616 #, c-format msgid "Unknown archive format '%s'" msgstr "Okรคnt arkivformat \"%s\"" -#: archive.c:522 +#: archive.c:623 #, c-format 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:345 -#, c-format -msgid "cannot stream blob %s" -msgstr "kan inte strรถmma blob:en %s" - -#: 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:287 archive-zip.c:353 -#, c-format -msgid "cannot read %s" -msgstr "kan inte lรคsa %s" - -#: archive-tar.c:459 -#, c-format -msgid "unable to start '%s' filter" -msgstr "kunde inte starta filtret \"%s\"" - -#: archive-tar.c:462 -msgid "unable to redirect descriptor" -msgstr "kan inte omdirigera handtag" - -#: archive-tar.c:469 -#, c-format -msgid "'%s' filter reported error" -msgstr "filtret \"%s\" rapporterade fel" - -#: 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: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: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:609 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "tidsstรคmpeln fรถr stor fรถr detta system: %<PRIuMAX>" - -#: attr.c:211 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%-*s รคr inte ett giltigt namn pรฅ attribut" -#: attr.c:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s inte tillรฅtet: %s:%d" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -969,22 +1708,22 @@ msgstr "" "Negativa mรถnster ignoreras i git-attribut\n" "Anvรคnd '\\!' fรถr att inleda med ett utropstecken." -#: bisect.c:468 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehรฅll i filen \"%s\": %s" -#: bisect.c:678 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "Det finns inte mer att gรถra \"bisect\" pรฅ!\n" -#: bisect.c:733 +#: bisect.c:753 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet pรฅ incheckningen รคr inte giltigt: %s" -#: bisect.c:758 +#: bisect.c:778 #, c-format msgid "" "The merge base %s is bad.\n" @@ -993,7 +1732,7 @@ msgstr "" "Sammanslagningsbasen %s รคr trasig.\n" "Det betyder att felet har rรคttats mellan %s och [%s].\n" -#: bisect.c:763 +#: bisect.c:783 #, c-format msgid "" "The merge base %s is new.\n" @@ -1002,7 +1741,7 @@ msgstr "" "Sammanslagningsbasen %s รคr ny.\n" "Egenskapen har รคndrats mellan %s och [%s].\n" -#: bisect.c:768 +#: bisect.c:788 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1011,7 +1750,7 @@ msgstr "" "Sammanslagningsbasen %s รคr %s.\n" "Det betyder att den fรถrsta \"%s\" incheckningen รคr mellan %s och [%s].\n" -#: bisect.c:776 +#: bisect.c:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1022,7 +1761,7 @@ msgstr "" "git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" -#: bisect.c:789 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1034,36 +1773,36 @@ msgstr "" "%s.\n" "Vi fortsรคtter รคndรฅ." -#: bisect.c:822 +#: bisect.c:848 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas mรฅste testas\n" -#: bisect.c:865 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behรถvs" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "kunde inte lรคsa filen \"%s\"" -#: bisect.c:958 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "misslyckades lรคsa bisect-referenser" -#: bisect.c:977 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var bรฅde %s och %s\n" -#: bisect.c:985 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" @@ -1072,7 +1811,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sรถkvรคgsparametrar?\n" -#: bisect.c:1004 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1082,48 +1821,48 @@ msgstr[1] "(ungefรคr %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1088 #, 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:2697 +#: blame.c:2778 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte sรฅ bra tillsammans." -#: blame.c:2711 +#: blame.c:2792 msgid "cannot use --contents with final commit object name" msgstr "kan inte anvรคnda --contents med namn pรฅ slutgiltigt incheckningsobjekt" -#: blame.c:2732 +#: blame.c:2813 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: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 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: blame.c:2759 +#: blame.c:2840 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:2770 +#: blame.c:2851 #, c-format msgid "no such path %s in %s" msgstr "sรถkvรคgen %s i %s finns inte" -#: blame.c:2781 +#: blame.c:2862 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte lรคsa objektet %s fรถr sรถkvรคgen %s" @@ -1242,7 +1981,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 skall\n" +"Om du har tรคnkt sรคnda in en ny lokal gren som ska\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." @@ -1261,391 +2000,361 @@ msgstr "Objektnamnet รคr tvetydigt: \"%s\"." msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten รคr inte giltig: \"%s\"." -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" รคr redan utcheckad pรฅ \"%s\"" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" -#: bundle.c:36 +#: bundle.c:41 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' ser inte ut som en v2-bundle-fil" +msgid "unrecognized bundle hash algorithm: %s" +msgstr "okรคnd hashningsalgoritm fรถr paket (bundle): \"%s\"" -#: bundle.c:64 +#: bundle.c:45 +#, c-format +msgid "unknown capability '%s'" +msgstr "okรคnd kapabilitet \"%s\"" + +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)" + +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "okรคnt huvud: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "kunde inte รถppna \"%s\"" -#: bundle.c:143 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nรถdvรคndiga incheckningar:" -#: bundle.c:146 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "behรถver ett arkiv fรถr att verifiera ett paket (bundle)." -#: bundle.c:197 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Paketet (bundlen) innehรฅller denna referens:" msgstr[1] "Paketet (bundlen) innehรฅller dessa %d referenser:" -#: bundle.c:204 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." -#: bundle.c:206 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" 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:272 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "kan inte duplicera pakethandtag" -#: bundle.c:279 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:290 +#: bundle.c:337 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:332 +#: bundle.c:379 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:381 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306 +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "version %d fรถr paket (bundle) stรถds ej" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s" + +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 #, c-format msgid "unrecognized argument: %s" msgstr "okรคnt argument: %s" -#: bundle.c:468 +#: bundle.c:530 msgid "Refusing to create empty bundle." msgstr "Vรคgrar skapa ett tomt paket (bundle)." -#: bundle.c:478 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:503 +#: bundle.c:565 msgid "index-pack died" msgstr "index-pack dog" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "felaktigt fรคrgvรคrde: %.*s" -#: 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-graph.c:188 midx.c:46 +msgid "invalid hash version" +msgstr "felaktig hashnings-version" -#: commit.c:52 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s รคr inte en incheckning!" - -#: commit.c:192 -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 "" -"Stรถd fรถr <GIT_DIR>/info/grafts avrรฅds frรฅn och\n" -"kommer tas bort i en framtida version av Git.\n" -"\n" -"Anvรคnd \"git replace --convert-graft-file\"\n" -"fรถr att omvandla grafts till ersรคttningsreferenser.\n" -"\n" -"Slรฅ av detta meddelande genom att skriva\n" -"\"git config advice.graftFileDeprecated false\"" - -#: 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: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:1133 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "Incheckning %s har inte nรฅgon GPG-signatur." - -#: 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: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 "" -"Varning: incheckningsmeddelandet รคr inte korrekt UTF-8.\n" -"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:127 +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "incheckningsgraffilen %s รคr fรถr liten" -#: commit-graph.c:192 +#: commit-graph.c:311 #, 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:199 +#: commit-graph.c:318 #, 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:206 +#: commit-graph.c:325 #, 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: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:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "incheckningsgraffilen รคr fรถr liten fรถr att innehรฅlla %u stycken" -#: commit-graph.c:240 +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "felaktigt offset fรถr stycke %08x%08x i incheckningsgraffilen" -#: commit-graph.c:283 +#: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "incheckningsgrafens stycke-id %08x fรถrekommer flera gรฅnger" -#: commit-graph.c:347 +#: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" msgstr "incheckningsgrafen har inga bas-graf-stycken" -#: commit-graph.c:357 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "incheckningsgrafens kedja stรคmmer inte" -#: commit-graph.c:404 +#: commit-graph.c:557 #, 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:430 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "kan inte hitta alla incheckingsgraffiler" -#: commit-graph.c:553 commit-graph.c:613 +#: commit-graph.c:721 commit-graph.c:785 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ogiltig incheckningsposition. incheckningsgrafen รคr troligtvis trasig" -#: commit-graph.c:574 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:1001 builtin/pack-objects.c:2651 +#: commit-graph.c:1042 builtin/am.c:1306 +#, c-format +msgid "unable to parse commit %s" +msgstr "kunde inte tolka incheckningen %s" + +#: commit-graph.c:1265 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hรคmta typ fรถr objektet %s" -#: commit-graph.c:1033 +#: commit-graph.c:1301 msgid "Loading known commits in commit graph" msgstr "Lรคser in kรคnda incheckningar i incheckningsgraf" -#: commit-graph.c:1050 +#: commit-graph.c:1318 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nรฅbara incheckningar i incheckningsgraf" -#: commit-graph.c:1069 +#: commit-graph.c:1338 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmรคrken i incheckningsgraf" -#: commit-graph.c:1088 +#: commit-graph.c:1357 msgid "Computing commit graph generation numbers" msgstr "Berรคknar generationsvรคrden fรถr incheckningsgraf" -#: commit-graph.c:1162 +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "Berรคknar Bloom-filter fรถr sรถkvรคgar รคndrade av incheckningen" + +#: commit-graph.c:1501 +msgid "Collecting referenced commits" +msgstr "Samlar refererade incheckningar" + +#: commit-graph.c:1526 #, 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:1175 +#: commit-graph.c:1539 #, c-format msgid "error adding pack %s" msgstr "fel vid tillรคgg av paketet %s" -#: commit-graph.c:1179 +#: commit-graph.c:1543 #, c-format msgid "error opening index for %s" msgstr "fel vid รถppning av indexet fรถr %s" -#: 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:1237 +#: commit-graph.c:1582 msgid "Finding commits for commit graph among packed objects" msgstr "Sรถker incheckningar fรถr incheckingsgraf i packade objekt" -#: commit-graph.c:1252 +#: commit-graph.c:1597 msgid "Counting distinct commits in commit graph" msgstr "Rรคknar olika incheckningar i incheckningsgraf" -#: commit-graph.c:1283 +#: commit-graph.c:1629 msgid "Finding extra edges in commit graph" msgstr "Sรถker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:1331 +#: commit-graph.c:1678 msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1364 midx.c:811 +#: commit-graph.c:1720 midx.c:826 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger fรถr %s" -#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251 +#: commit-graph.c:1733 +msgid "unable to create temporary graph layer" +msgstr "kan inte skapa temporรคrt graflager" + +#: commit-graph.c:1738 #, c-format -msgid "unable to create '%s'" -msgstr "kunde inte skapa \"%s\"" +msgid "unable to adjust shared permissions for '%s'" +msgstr "kan inte justera delade behรถrigheter fรถr \"%s\"" -#: commit-graph.c:1436 +#: commit-graph.c:1808 #, 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:1477 +#: commit-graph.c:1853 msgid "unable to open commit-graph chain file" msgstr "Kunde inte รถppna incheckningsgrafkedjefilen" -#: commit-graph.c:1489 +#: commit-graph.c:1869 msgid "failed to rename base commit-graph file" msgstr "kunde inte byta namn pรฅ bas-incheckingsgraffilen" -#: commit-graph.c:1509 +#: commit-graph.c:1889 msgid "failed to rename temporary commit-graph file" msgstr "kunde inte byta namn pรฅ temporรคr incheckningsgraffil" -#: commit-graph.c:1620 +#: commit-graph.c:2015 msgid "Scanning merged commits" msgstr "Sรถker sammanslagna incheckningar" -#: commit-graph.c:1631 +#: commit-graph.c:2026 #, c-format msgid "unexpected duplicate commit id %s" msgstr "ovรคntat duplicerat inchecknings-id %s" -#: commit-graph.c:1656 +#: commit-graph.c:2049 msgid "Merging commit-graph" msgstr "Slรฅr ihop incheckningsgraf" -#: commit-graph.c:1842 +#: commit-graph.c:2259 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "formatet pรฅ incheckningsgrafen kan inte visa %d incheckningar" -#: commit-graph.c:1853 +#: commit-graph.c:2270 msgid "too many commits to write graph" msgstr "fรถr mรฅnga incheckningar fรถr att skriva graf" -#: commit-graph.c:1943 +#: commit-graph.c:2363 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:1953 +#: commit-graph.c:2373 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s sรฅ %s" -#: commit-graph.c:1963 commit-graph.c:1978 +#: commit-graph.c:2383 commit-graph.c:2398 #, 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:1970 +#: commit-graph.c:2390 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s frรฅn incheckningsgraf" -#: commit-graph.c:1987 +#: commit-graph.c:2408 msgid "Verifying commits in commit graph" msgstr "Bekrรคftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2000 +#: commit-graph.c:2423 #, 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:2007 +#: commit-graph.c:2430 #, 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:2017 +#: commit-graph.c:2440 #, 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:2026 +#: commit-graph.c:2449 #, 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:2039 +#: commit-graph.c:2463 #, 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:2044 +#: commit-graph.c:2468 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1653,7 +2362,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll fรถr incheckningen %s, men icke-" "noll pรฅ annan plats" -#: commit-graph.c:2048 +#: commit-graph.c:2472 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1661,23 +2370,86 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt frรฅn noll fรถr incheckningen " "%s, men noll pรฅ annan plats" -#: commit-graph.c:2063 +#: commit-graph.c:2488 #, 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:2069 +#: commit-graph.c:2494 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "incheckningsdatumet fรถr incheckningen %s i incheckningsgrafen รคr %<PRIuMAX> !" "= %<PRIuMAX>" +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "kunde inte tolka %s" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s รคr inte en incheckning!" + +#: commit.c:194 +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 "" +"Stรถd fรถr <GIT_DIR>/info/grafts avrรฅds frรฅn och\n" +"kommer tas bort i en framtida version av Git.\n" +"\n" +"Anvรคnd \"git replace --convert-graft-file\"\n" +"fรถr att omvandla grafts till ersรคttningsreferenser.\n" +"\n" +"Slรฅ av detta meddelande genom att skriva\n" +"\"git config advice.graftFileDeprecated false\"" + +#: commit.c:1172 +#, 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:1176 +#, 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:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "Incheckning %s har inte nรฅgon GPG-signatur." + +#: commit.c:1182 +#, 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:1436 +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 "" +"Varning: incheckningsmeddelandet รคr inte korrekt UTF-8.\n" +"Uppdatera det efter att ha rรคttat meddelandet, eller รคndra variabeln\n" +"i18n.commitencoding till den teckenkodning som anvรคnds i ditt projekt.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "minnet slut" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1692,302 +2464,296 @@ msgstr "" "\t%s\n" "Det kan bero pรฅ cirkulรคra inkluderingar." -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "kunde inte expandera inkluderingssรถkvรคg \"%s\"" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "relativa konfigureringsinkluderingar mรฅste komma frรฅn filer" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor mรฅste komma frรฅn filer" -#: config.c:375 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "nyckeln innehรฅller inte ett stycke: %s" -#: config.c:381 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "nyckeln innehรฅller inte variabelnamn: %s" -#: config.c:405 sequencer.c:2463 +#: config.c:408 sequencer.c:2547 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: config.c:411 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "ogiltig nyckel (nyradstecken): %s" -#: config.c:447 config.c:459 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "falsk konfigureringsparameter: %s" -#: config.c:494 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "felaktigt format i %s" -#: config.c:820 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:824 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:828 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:832 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:836 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:840 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:977 +#: config.c:993 msgid "out of range" msgstr "utanfรถr intervallet" -#: config.c:977 +#: config.c:993 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:978 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvรคrde \"%s\" fรถr \"%s\": %s" -#: config.c:997 +#: config.c:1013 #, 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:1000 +#: config.c:1016 #, 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:1003 +#: config.c:1019 #, 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:1006 +#: config.c:1022 #, 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:1009 +#: config.c:1025 #, 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:1012 +#: config.c:1028 #, 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:1107 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera anvรคndarkatalog i: \"%s\"" -#: config.c:1116 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" fรถr \"%s\" รคr inte en giltig tidsstรคmpel" -#: config.c:1207 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "fรถrkortningslรคngd utanfรถr intervallet: %d" -#: config.c:1221 config.c:1232 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1324 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "core.commentChar kan bara vara ett tecken" -#: config.c:1357 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt lรคge fรถr skapande av objekt: %s" -#: config.c:1429 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "felformat vรคrde fรถr %s" -#: config.c:1455 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "felformat vรคrde fรถr %s: %s" -#: config.c:1456 +#: config.c:1472 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:1517 builtin/pack-objects.c:3399 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1638 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "kunde inte lรคsa konfigurerings-blobobjektet \"%s\"" -#: config.c:1641 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensen \"%s\" pekar inte pรฅ en blob" -#: config.c:1658 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "kan inte slรฅ upp konfigurerings-bloben \"%s\"" -#: config.c:1688 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1744 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2093 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "okรคnt fel uppstod vid lรคsning av konfigurationsfilerna" -#: config.c:2263 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: 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 +#: config.c:2341 #, 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:2378 +#: config.c:2387 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka vรคrdet \"%s\" frรฅn kommandoradskonfiguration" -#: config.c:2380 +#: config.c:2389 #, 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:2461 +#: config.c:2470 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2493 +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "%s har flera vรคrden" -#: config.c:2522 +#: config.c:2531 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2774 config.c:3098 +#: config.c:2783 config.c:3107 #, c-format msgid "could not lock config file %s" msgstr "kunde inte lรฅsa konfigurationsfilen %s" -#: config.c:2785 +#: config.c:2794 #, c-format msgid "opening %s" msgstr "รถppnar %s" -#: config.c:2820 builtin/config.c:328 +#: config.c:2829 builtin/config.c:354 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mรถnster: %s" -#: config.c:2845 +#: config.c:2854 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:2858 config.c:3111 +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades pรฅ %s" -#: config.c:2869 +#: config.c:2878 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utfรถra mmap pรฅ \"%s\"" -#: config.c:2878 config.c:3116 +#: config.c:2887 config.c:3125 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades pรฅ %s" -#: config.c:2963 config.c:3213 +#: config.c:2972 config.c:3222 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:2997 +#: config.c:3006 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte stรคlla in \"%s\" till \"%s\"" -#: config.c:2999 builtin/remote.c:782 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort instรคllning fรถr \"%s\"" -#: config.c:3089 +#: config.c:3098 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn pรฅ stycke: %s" -#: config.c:3256 +#: config.c:3265 #, c-format msgid "missing value for '%s'" msgstr "vรคrde saknas fรถr \"%s\"" @@ -2013,72 +2779,81 @@ msgstr "" msgid "server doesn't support '%s'" msgstr "Servern stรถder inte \"%s\"" -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "servern stรถder inte funktionen \"%s\"" -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" msgstr "fรถrvรคntade \"flush\" efter fรถrmรฅgor" -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "ignorerar fรถrmรฅgor efter fรถrsta raden \"%s\"" -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "protokollfel: fรถrvรคntade inte capabilities^{}" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "protokollfel: fรถrvรคntade \"shallow sha-1\" fick \"%s\"" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "arkivet pรฅ andra sidan kan inte vara grunt" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" msgstr "ogiltigt paket" -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "protokollfel: fรถrvรคntade inte \"%s\"" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "okรคnt objektformat \"%s\" angavs av servern" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" msgstr "ogiltigt svar pรฅ ls-refs: %s" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" -msgstr "ovรคntad \"flush\" efter ref-listan" +msgstr "fรถrvรคntade \"flush\" efter ref-listan" -#: connect.c:544 +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "fรถrvรคntade svarsavslutningspaket efter ref-listan" + +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" msgstr "protokollet \"%s\" stรถds inte" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" msgstr "kunde inte sรคtta SO_KEEPALIVE pรฅ uttaget" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "Slรฅr upp %s..." -#: connect.c:639 +#: connect.c:735 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "kan inte slรฅ upp %s (port %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" @@ -2087,7 +2862,7 @@ msgstr "" "klart.\n" "Ansluter till %s (port %s)..." -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -2097,89 +2872,89 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "klart." -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "kunde inte slรฅ upp %s (%s)" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "okรคnd port %s" -#: connect.c:845 connect.c:1171 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "konstigt vรคrdnamn \"%s\" blockerat" -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "konstig port \"%s\" blockerad" -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "kan inte starta mellanserver (proxy) %s" -#: connect.c:924 +#: connect.c:1024 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:1119 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" msgstr "ssh-varianten \"simple\" stรถder inte -4" -#: connect.c:1131 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" msgstr "ssh-varianten \"simple\" stรถder inte -6" -#: connect.c:1148 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh-varianten \"simple\" stรถder inte val av port" -#: connect.c:1260 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" msgstr "konstigt sรถkvรคgsnamn \"%s\" blockerat" -#: connect.c:1307 +#: connect.c:1408 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:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:98 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "Kunde inte kรถra \"git rev-list\"" -#: connected.c:118 +#: connected.c:144 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:125 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "kunde inte stรคnga rev-list:s standard in" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "felaktig crlf_action %d" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF skulle ersรคttas av LF i %s" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2188,12 +2963,12 @@ msgstr "" "CRLF kommer att ersรคttas av LF i %s.\n" "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF skulle ersรคttas av CRLF i %s" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2202,18 +2977,18 @@ msgstr "" "LF kommer att ersรคttas av CRLF i %s.\n" "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" -#: convert.c:279 +#: convert.c:284 #, 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:286 +#: convert.c:291 #, 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 @@ -2230,51 +3005,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:424 convert.c:495 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "misslyckades omkoda \"%s\" frรฅn %s till %s" -#: convert.c:467 +#: convert.c:462 #, 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:673 +#: convert.c:665 #, 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:693 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "kunde inte skicka indata till externt filter \"%s\"" -#: convert.c:700 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "externt filter \"%s\" misslyckades %d" -#: convert.c:735 convert.c:738 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "lรคsning frรฅn externt filter \"%s\" misslyckades" -#: convert.c:741 convert.c:796 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "externt filter \"%s\" misslyckades" -#: convert.c:844 +#: convert.c:837 msgid "unexpected filter type" msgstr "ovรคntad filtertyp" -#: convert.c:855 +#: convert.c:848 msgid "path name too long for external filter" msgstr "sรถkvรคgen fรถr lรฅng fรถr externt filter" -#: convert.c:929 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2283,67 +3058,95 @@ msgstr "" "externt filter \"%s\" รคr inte lรคngre tillgรคngligt trots att alla sรถkvรคgar " "inte har filtrerats" -#: convert.c:1228 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "true/false รคr inte giltig teckenkodning fรถr arbetskatalogen" -#: convert.c:1398 convert.c:1432 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: \"clean\"-filtret \"%s\" misslyckades" -#: convert.c:1476 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades" -#: date.c:137 +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "hoppar รถver uppslag av inloggningsuppgifter fรถr nyckel: credential.%s" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "vรคgrar arbeta med inloggningsuppgifter utan vรคrdfรคlt" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "vรคgrar arbeta med inloggningsuppgifter utan protokollfรคlt" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "url innehรฅller radbrytning i komponenten %s: %s" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "url saknar protokoll: %s" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "kan inte tolka url fรถr inloggingsuppgifter: %s" + +#: date.c:138 msgid "in the future" msgstr "i framtiden" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> sekund sedan" msgstr[1] "%<PRIuMAX> sekunder sedan" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> minut sedan" msgstr[1] "%<PRIuMAX> minuter sedan" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> timme sedan" msgstr[1] "%<PRIuMAX> timmar sedan" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> dag sedan" msgstr[1] "%<PRIuMAX> dagar sedan" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> vecka sedan" msgstr[1] "%<PRIuMAX> veckor sedan" -#: date.c:177 +#: date.c:178 #, 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:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2351,14 +3154,14 @@ msgstr[0] "%<PRIuMAX> รฅr" msgstr[1] "%<PRIuMAX> รฅr" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, 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:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2389,15 +3192,6 @@ msgstr "รถ-regex frรฅn konfiguration har fรถr mรฅnga fรฅngstgrupper (max=%d)" msgid "Marked %d islands, done.\n" msgstr "Markerade %d รถar, klar.\n" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "kunde inte lรคsa orderfilen \"%s\"" - -#: diffcore-rename.c:544 -msgid "Performing inexact rename detection" -msgstr "Utfรถr onรถjaktig namnbytesdetektering" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<flaggor>] <sรถkvรคg> <sรถkvรคg>" @@ -2410,17 +3204,17 @@ msgstr "" "Inte ett git-arkiv. Anvรคnd --no-index fรถr att jรคmfรถra tvรฅ sรถkvรคgar utanfรถr " "en arbetskatalog." -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskรคrningsprocentandel \"%s\"\n" -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okรคnd dirstat-parameter \"%s\"\n" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2428,7 +3222,7 @@ msgstr "" "fรคrginstรคllningen fรถr flyttade block mรฅste vara en av \"no\", \"default\", " "\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\"" -#: diff.c:324 +#: diff.c:325 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -2438,7 +3232,7 @@ msgstr "" "\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change" "\"" -#: diff.c:332 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -2446,12 +3240,12 @@ msgstr "" "color-moved-ws: allow-indentation-change kan inte kombineras med andra " "blankstegslรคgen" -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okรคnt vรคrde fรถr konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2460,35 +3254,35 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4215 +#: diff.c:4269 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4560 +#: diff.c:4618 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s รคr รถmsesidigt uteslutande" -#: diff.c:4563 +#: diff.c:4621 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object รคr รถmsesidigt uteslutande" -#: diff.c:4641 +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "--follow krรคver exakt en sรถkvรคgsangivelse" -#: diff.c:4689 +#: diff.c:4747 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt vรคrde fรถr --stat: %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s fรถrvรคntar ett numeriskt vรคrde" -#: diff.c:4726 +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2497,42 +3291,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4811 +#: diff.c:4869 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okรคnd รคndringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4835 +#: diff.c:4893 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okรคnt vรคrde efter ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4907 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slรฅ upp \"%s\"" -#: diff.c:4899 diff.c:4905 +#: diff.c:4957 diff.c:4963 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s fรถrvรคntar formen <n>/<m>" -#: diff.c:4917 +#: diff.c:4975 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s fรถrvรคntar ett tecken, fick \"%s\"" -#: diff.c:4938 +#: diff.c:4996 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:4957 +#: diff.c:5015 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt lรคge %s\" i --color-moved-ws" -#: diff.c:4997 +#: diff.c:5055 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2540,149 +3334,149 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5033 diff.c:5053 +#: diff.c:5091 diff.c:5111 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument fรถr %s" -#: diff.c:5191 +#: diff.c:5248 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5247 +#: diff.c:5304 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5270 +#: diff.c:5327 msgid "Diff output format options" msgstr "Formatflaggor fรถr diff-utdata" -#: diff.c:5272 diff.c:5278 +#: diff.c:5329 diff.c:5335 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5275 builtin/log.c:182 +#: diff.c:5332 builtin/log.c:176 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5337 diff.c:5451 diff.c:5458 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5338 diff.c:5341 msgid "generate diffs with <n> lines context" msgstr "skapa diffar med <n> rader sammanhang" -#: diff.c:5286 +#: diff.c:5343 msgid "generate the diff in raw format" msgstr "generera diff i rรฅformat" -#: diff.c:5289 +#: diff.c:5346 msgid "synonym for '-p --raw'" msgstr "synonym till \"-p --raw\"" -#: diff.c:5293 +#: diff.c:5350 msgid "synonym for '-p --stat'" msgstr "synonym till \"-p --stat\"" -#: diff.c:5297 +#: diff.c:5354 msgid "machine friendly --stat" msgstr "maskinlรคsbar --stat" -#: diff.c:5300 +#: diff.c:5357 msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden fรถr --stat" -#: diff.c:5302 diff.c:5310 +#: diff.c:5359 diff.c:5367 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5303 +#: diff.c:5360 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:5307 +#: diff.c:5364 msgid "synonym for --dirstat=cumulative" msgstr "synonym fรถr --dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5368 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonym fรถr --dirstat=filer,param1,param2..." -#: diff.c:5315 +#: diff.c:5372 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om รคndringar introducerar konfliktmarkรถrer eller blankstegsfel" -#: diff.c:5318 +#: diff.c:5375 msgid "condensed summary such as creations, renames and mode changes" msgstr "kortfattad summering sรฅsom skapade, namnbyten och รคndrade lรคgen" -#: diff.c:5321 +#: diff.c:5378 msgid "show only names of changed files" msgstr "visa endast namnen pรฅ รคndrade filer" -#: diff.c:5324 +#: diff.c:5381 msgid "show only names and status of changed files" msgstr "visa endast namn och status fรถr รคndrade filer" -#: diff.c:5326 +#: diff.c:5383 msgid "<width>[,<name-width>[,<count>]]" msgstr "<bredd>[,<namn-bredd>[,<antal>]]" -#: diff.c:5327 +#: diff.c:5384 msgid "generate diffstat" msgstr "skapa diffstat" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5386 diff.c:5389 diff.c:5392 msgid "<width>" msgstr "<bredd>" -#: diff.c:5330 +#: diff.c:5387 msgid "generate diffstat with a given width" msgstr "generera en diffstat med given bredd" -#: diff.c:5333 +#: diff.c:5390 msgid "generate diffstat with a given name width" msgstr "generera en diffstat med given namnbredd" -#: diff.c:5336 +#: diff.c:5393 msgid "generate diffstat with a given graph width" msgstr "generera en diffstat med given grafbredd" -#: diff.c:5338 +#: diff.c:5395 msgid "<count>" msgstr "<antal>" -#: diff.c:5339 +#: diff.c:5396 msgid "generate diffstat with limited lines" msgstr "generera diffstat med begrรคnsade rader" -#: diff.c:5342 +#: diff.c:5399 msgid "generate compact summary in diffstat" msgstr "skapa kompakt รถversikt i diffstat" -#: diff.c:5345 +#: diff.c:5402 msgid "output a binary diff that can be applied" msgstr "skapa en binรคrdiff som kan appliceras" -#: diff.c:5348 +#: diff.c:5405 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:5350 +#: diff.c:5407 msgid "show colored diff" msgstr "visa fรคrgad diff" -#: diff.c:5351 +#: diff.c:5408 msgid "<kind>" msgstr "<typ>" -#: diff.c:5352 +#: diff.c:5409 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2690,7 +3484,7 @@ msgstr "" "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " "\"new\" (nya) rader i diffen" -#: diff.c:5355 +#: diff.c:5412 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2698,87 +3492,87 @@ msgstr "" "skriv inte om sรถkvรคgsnamn och anvรคnd NUL-tecken som fรคltseparerare i --raw " "eller --numstat" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5359 +#: diff.c:5416 msgid "show the given source prefix instead of \"a/\"" msgstr "visa givet kรคllprefix istรคllet fรถr \"a/\"" -#: diff.c:5362 +#: diff.c:5419 msgid "show the given destination prefix instead of \"b/\"" msgstr "visa givet mรฅlprefix istรคllet fรถr \"b/\"" -#: diff.c:5365 +#: diff.c:5422 msgid "prepend an additional prefix to every line of output" msgstr "lรคgg till ytterligare prefix pรฅ alla rader i utdata" -#: diff.c:5368 +#: diff.c:5425 msgid "do not show any source or destination prefix" msgstr "visa inte kรคll- eller mรฅlprefix" -#: diff.c:5371 +#: diff.c:5428 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:5375 diff.c:5380 diff.c:5385 +#: diff.c:5432 diff.c:5437 diff.c:5442 msgid "<char>" msgstr "<tecken>" -#: diff.c:5376 +#: diff.c:5433 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:5381 +#: diff.c:5438 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:5386 +#: diff.c:5443 msgid "specify the character to indicate a context instead of ' '" msgstr "ange tecken fรถr att ange sammanhang istรคllet fรถr \" \"" -#: diff.c:5389 +#: diff.c:5446 msgid "Diff rename options" msgstr "Diff-namnbytesflaggor" -#: diff.c:5390 +#: diff.c:5447 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5448 msgid "break complete rewrite changes into pairs of delete and create" msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" -#: diff.c:5395 +#: diff.c:5452 msgid "detect renames" msgstr "detektera namnรคndringar" -#: diff.c:5399 +#: diff.c:5456 msgid "omit the preimage for deletes" msgstr "ta bort fรถr-version fรถr borttagningar" -#: diff.c:5402 +#: diff.c:5459 msgid "detect copies" msgstr "detektera kopior" -#: diff.c:5406 +#: diff.c:5463 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:5408 +#: diff.c:5465 msgid "disable rename detection" msgstr "inaktivera detektering av namnbyten" -#: diff.c:5411 +#: diff.c:5468 msgid "use empty blobs as rename source" msgstr "anvรคnd tomma blob:ar som namnรคndringskรคlla" -#: diff.c:5413 +#: diff.c:5470 msgid "continue listing the history of a file beyond renames" msgstr "fortsรคtt lista historiken fรถr en fil bortom namnรคndringar" -#: diff.c:5416 +#: diff.c:5473 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2786,159 +3580,159 @@ msgstr "" "fรถrhindra namnbyte/kopie-detektering om antalet namnbyten/kopior รถverskriver " "given grรคns" -#: diff.c:5418 +#: diff.c:5475 msgid "Diff algorithm options" msgstr "Alternativ fรถr diff-algoritm" -#: diff.c:5420 +#: diff.c:5477 msgid "produce the smallest possible diff" msgstr "skapa minsta mรถjliga diff" -#: diff.c:5423 +#: diff.c:5480 msgid "ignore whitespace when comparing lines" msgstr "ignorera blanktecken vid radjรคmfรถrelse" -#: diff.c:5426 +#: diff.c:5483 msgid "ignore changes in amount of whitespace" msgstr "ignorera รคndringar i antal blanktecken vid radjรคmfรถrelse" -#: diff.c:5429 +#: diff.c:5486 msgid "ignore changes in whitespace at EOL" msgstr "ignorera blanktecken vid radslut" -#: diff.c:5432 +#: diff.c:5489 msgid "ignore carrier-return at the end of line" msgstr "ignorera CR-tecken vid radslut" -#: diff.c:5435 +#: diff.c:5492 msgid "ignore changes whose lines are all blank" msgstr "ignorera รคndringar i rader som รคr helt blanka" -#: diff.c:5438 +#: diff.c:5495 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:5441 +#: diff.c:5498 msgid "generate diff using the \"patience diff\" algorithm" msgstr "skapa diffar med algoritmen \"patience diff\"" -#: diff.c:5445 +#: diff.c:5502 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5447 +#: diff.c:5504 msgid "<algorithm>" msgstr "<algoritm>" -#: diff.c:5448 +#: diff.c:5505 msgid "choose a diff algorithm" msgstr "vรคlj en diff-algoritm" -#: diff.c:5450 +#: diff.c:5507 msgid "<text>" msgstr "<text>" -#: diff.c:5451 +#: diff.c:5508 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "skapa diffar med algoritmen \"anchored diff\"" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5510 diff.c:5519 diff.c:5522 msgid "<mode>" msgstr "<lรคge>" -#: diff.c:5454 +#: diff.c:5511 msgid "show word diff, using <mode> to delimit changed words" msgstr "visa orddiff, dรคr <lรคge> avgrรคnsar รคndrade ord" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5513 diff.c:5516 diff.c:5561 msgid "<regex>" msgstr "<reguttr>" -#: diff.c:5457 +#: diff.c:5514 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:5460 +#: diff.c:5517 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" -#: diff.c:5463 +#: diff.c:5520 msgid "moved lines of code are colored differently" msgstr "flyttade kodrader fรคrgas pรฅ annat sรคtt" -#: diff.c:5466 +#: diff.c:5523 msgid "how white spaces are ignored in --color-moved" msgstr "hur blanktecken ignoreras i --color-moved" -#: diff.c:5469 +#: diff.c:5526 msgid "Other diff options" msgstr "Andra diff-flaggor" -#: diff.c:5471 +#: diff.c:5528 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:5475 +#: diff.c:5532 msgid "treat all files as text" msgstr "hantera alla filer som text" -#: diff.c:5477 +#: diff.c:5534 msgid "swap two inputs, reverse the diff" msgstr "vรคxla tvรฅ indatafiler, vรคnd diffen" -#: diff.c:5479 +#: diff.c:5536 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "avsluta med 1 vid รคndringar, annars 0" -#: diff.c:5481 +#: diff.c:5538 msgid "disable all output of the program" msgstr "slรฅ av alla utdata frรฅn programmet" -#: diff.c:5483 +#: diff.c:5540 msgid "allow an external diff helper to be executed" msgstr "tillรฅt kรถra en extern diff-hjรคlpare" -#: diff.c:5485 +#: diff.c:5542 msgid "run external text conversion filters when comparing binary files" msgstr "kรถr externt textkonverteringsfiler nรคr binรคrfiler jรคmfรถrs" -#: diff.c:5487 +#: diff.c:5544 msgid "<when>" msgstr "<nรคr>" -#: diff.c:5488 +#: diff.c:5545 msgid "ignore changes to submodules in the diff generation" msgstr "ignorera รคndringar i undermoduler nรคr diffen skapas" -#: diff.c:5491 +#: diff.c:5548 msgid "<format>" msgstr "<format>" -#: diff.c:5492 +#: diff.c:5549 msgid "specify how differences in submodules are shown" msgstr "ange hur รคndringar i undermoduler visas" -#: diff.c:5496 +#: diff.c:5553 msgid "hide 'git add -N' entries from the index" msgstr "dรถlj \"git add -N\"-poster frรฅn indexet" -#: diff.c:5499 +#: diff.c:5556 msgid "treat 'git add -N' entries as real in the index" msgstr "tolka \"git add -N\"-poster som รคkta i indexet" -#: diff.c:5501 +#: diff.c:5558 msgid "<string>" msgstr "<strรคng>" -#: diff.c:5502 +#: diff.c:5559 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:5505 +#: diff.c:5562 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -2946,108 +3740,138 @@ msgstr "" "se efter รคndringar som รคndrar antalet fรถrekomster av angivet reguljรคrt " "uttryck" -#: diff.c:5508 +#: diff.c:5565 msgid "show all changes in the changeset with -S or -G" msgstr "visa alla รคndringar i รคndringsuppsรคttningen med -S eller -G" -#: diff.c:5511 +#: diff.c:5568 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:5514 +#: diff.c:5571 msgid "control the order in which files appear in the output" msgstr "styr ordningen i vilken filer visas i utdata" -#: diff.c:5515 +#: diff.c:5572 msgid "<object-id>" msgstr "<objekt-id>" -#: diff.c:5516 +#: diff.c:5573 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:5518 +#: diff.c:5575 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5576 msgid "select files by diff type" msgstr "vรคlj filter efter diff-typ" -#: diff.c:5521 +#: diff.c:5578 msgid "<file>" msgstr "<fil>" -#: diff.c:5522 +#: diff.c:5579 msgid "Output to a specific file" msgstr "Skriv utdata till en specifik fil" -#: diff.c:6177 +#: diff.c:6236 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:6180 +#: diff.c:6239 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:6183 +#: diff.c:6242 #, 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:537 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "kunde inte lรคsa orderfilen \"%s\"" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "Utfรถr onรถjaktig namnbytesdetektering" + +#: dir.c:578 #, 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:926 +#: dir.c:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "okรคnt mรถnster: %s" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "okรคnt negativt mรถnster: %s" + +#: dir.c:809 +#, 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:819 +msgid "disabling cone pattern matching" +msgstr "inaktiverar konmรถnstermatchning" + +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "kan inte anvรคnda %s som exkluderingsfil" -#: dir.c:1843 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte รถppna katalogen \"%s\"" -#: dir.c:2085 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "misslyckades hรคmta kรคrnans namn och information" -#: dir.c:2209 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "ospรฅrad cache รคr inaktiverad pรฅ systemet eller platsen" -#: dir.c:3013 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3058 dir.c:3063 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger fรถr %s" -#: dir.c:3092 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog frรฅn \"%s\" till \"%s\"" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" -msgstr "tips: Vรคntar pรฅ att textredigeringsprogrammet skall stรคnga filen...%c" +msgstr "tips: Vรคntar pรฅ att textredigeringsprogrammet ska stรคnga filen...%c" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "Filtrerar innehรฅll" -#: entry.c:476 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "kunde inte ta status pรฅ filen \"%s\"" @@ -3057,7 +3881,7 @@ msgstr "kunde inte ta status pรฅ filen \"%s\"" msgid "bad git namespace path \"%s\"" msgstr "felaktig git-namnrymdssรถkvรคg \"%s\"" -#: environment.c:332 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "kunde inte stรคlla in GIT_DIR till \"%s\"" @@ -3067,266 +3891,288 @@ 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-object.c:17 -msgid "Remote with no URL" -msgstr "Fjรคrr utan URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: fรถrvรคntade grund lista" -#: fetch-pack.c:154 +#: fetch-pack.c:179 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:165 +#: fetch-pack.c:190 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:185 +#: fetch-pack.c:210 #, 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:196 +#: fetch-pack.c:221 msgid "unable to write to remote" msgstr "kunde inte skriva till fjรคrren" -#: fetch-pack.c:258 +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc krรคver \"multi_ack_detailed\"" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "fรถrvรคntade shallow/unshallow, fick %s" -#: fetch-pack.c:417 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:448 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:465 +#: fetch-pack.c:479 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:492 progress.c:339 msgid "done" msgstr "klart" -#: fetch-pack.c:489 +#: fetch-pack.c:504 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:540 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:744 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:824 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:791 +#: fetch-pack.c:832 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:859 +#: fetch-pack.c:916 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:875 +#: fetch-pack.c:933 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:877 +#: fetch-pack.c:935 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:908 +#: fetch-pack.c:978 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen รคr %.*s" -#: 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 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 #, c-format msgid "Server supports %s" msgstr "Servern stรถder %s" -#: fetch-pack.c:915 +#: fetch-pack.c:985 msgid "Server does not support shallow clients" msgstr "Servern stรถder inte klienter med grunda arkiv" -#: fetch-pack.c:975 +#: fetch-pack.c:1045 msgid "Server does not support --shallow-since" msgstr "Servern stรถder inte --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:1050 msgid "Server does not support --shallow-exclude" msgstr "Servern stรถder inte --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "Servern stรถder inte --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1056 +msgid "Server does not support this repository's object format" +msgstr "Servern stรถder inte det hรคr arkivets objektformat" + +#: fetch-pack.c:1069 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1081 fetch-pack.c:1619 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hรคmtning misslyckades." -#: fetch-pack.c:1151 +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "omaka algoritmer: klient %s; server %s" + +#: fetch-pack.c:1209 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "servern stรถder inte algoritmen \"%s\"" + +#: fetch-pack.c:1229 msgid "Server does not support shallow requests" msgstr "Servern stรถder inte grunda fรถrfrรฅgningar" -#: fetch-pack.c:1157 +#: fetch-pack.c:1236 msgid "Server supports filter" msgstr "Servern stรถder filter" -#: fetch-pack.c:1184 +#: fetch-pack.c:1275 msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjรคrren" -#: fetch-pack.c:1202 +#: fetch-pack.c:1293 #, c-format msgid "error reading section header '%s'" msgstr "fel vid lรคsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1208 +#: fetch-pack.c:1299 #, c-format msgid "expected '%s', received '%s'" msgstr "fรถrvรคntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1247 +#: fetch-pack.c:1360 #, c-format msgid "unexpected acknowledgment line: '%s'" -msgstr "fรถrvรคntade bekrรคftelserad: \"%s\"" +msgstr "ovรคntad bekrรคftelserad: \"%s\"" -#: fetch-pack.c:1252 +#: fetch-pack.c:1365 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekrรคftelser: %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1375 msgid "expected packfile to be sent after 'ready'" msgstr "vรคntade att paketfil skulle sรคndas efter \"ready\"" -#: fetch-pack.c:1264 +#: fetch-pack.c:1377 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:1306 +#: fetch-pack.c:1419 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1466 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "fรถrvรคntade wanted-ref, fick %s" -#: fetch-pack.c:1358 +#: fetch-pack.c:1471 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "ovรคntad wanted-ref: \"%s\"" -#: fetch-pack.c:1363 +#: fetch-pack.c:1476 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av รถnskade referenser: %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1506 +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack: fรถrvรคntade svarsavslutningspaket" + +#: fetch-pack.c:1887 msgid "no matching remote head" msgstr "inget motsvarande fjรคrrhuvud" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1910 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "fjรคrren sรคnde inte alla nรถdvรคndiga objekt" -#: fetch-pack.c:1739 +#: fetch-pack.c:1937 #, c-format msgid "no such remote ref %s" msgstr "ingen sรฅdan fjรคrreferens: %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1940 #, 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:321 -msgid "gpg failed to sign the data" -msgstr "gpg misslyckades signera data" - -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "kunde inte skapa temporรคra fil" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristรฅende signatur till \"%s\"" -#: graph.c:97 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg misslyckades signera data" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig fรคrg \"%.*s\" i log.graphColors" -#: grep.c:2117 +#: 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 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte lรคsa %s" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status pรฅ \"%s\"" -#: grep.c:2145 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort lรคsning" @@ -3376,48 +4222,48 @@ msgid "Low-level Commands / Interrogators" msgstr "Lรฅgnivรฅkommandon / frรฅgare" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Lรฅgnivรฅkommandon / synka arkiv" #: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "Lรฅgnivรฅkommandon / interna hjรคlpare" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "git-kommandon tillgรคngliga i \"%s\"" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon frรฅn andra platser i din $PATH" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "Dessa vanliga Git-kommandon anvรคnds i olika situationer:" -#: help.c:363 git.c:98 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "okรคnd kommandolisttyp \"%s\"" -#: help.c:403 -msgid "The common Git guides are:" -msgstr "De vanliga Git-vรคgledningarna รคr:" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Vรคgledningar fรถr Git-koncept:" -#: help.c:512 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "Se \"git help <kommando>\" fรถr att lรคsa om ett specifikt underkommando" -#: help.c:517 +#: help.c:434 msgid "External commands" msgstr "Externa kommandon" -#: help.c:532 +#: help.c:449 msgid "Command aliases" msgstr "Kommadoalias" -#: help.c:596 +#: help.c:513 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -3426,32 +4272,32 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "kรถra det. Kanske git-%s รคr trasigt?" -#: help.c:655 +#: help.c:572 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj dรฅ. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:677 +#: help.c:594 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns." -#: help.c:682 +#: help.c:599 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Fortsรคtter under fรถrutsรคttningen att du menade \"%s\"." -#: help.c:687 +#: help.c:604 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "Fortsรคtter om %0.1f sekunder, under fรถrutsรคttningen att du menade \"%s\"." -#: help.c:695 +#: help.c:612 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: \"%s\" รคr inte ett git-kommando. Se \"git --help\"." -#: help.c:699 +#: help.c:616 msgid "" "\n" "The most similar command is" @@ -3465,16 +4311,16 @@ msgstr[1] "" "\n" "Mest lika kommandon รคr" -#: help.c:714 +#: help.c:656 msgid "git version [<options>]" msgstr "git version [<flaggor>]" -#: help.c:782 +#: help.c:711 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:715 msgid "" "\n" "Did you mean this?" @@ -3488,7 +4334,15 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "Fรถrfattar-identitet okรคnd\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "Incheckar-identitet okรคnd\n" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -3514,76 +4368,95 @@ msgstr "" "Kรถr utan --global fรถr att endast รคndra i aktuellt arkiv.\n" "\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "ingen e-post angavs och autodetektering รคr inaktiverad" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "kunde inte autodetektera e-postadress (fick \"%s\")" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "inget namn angavs och autodetektering รคr inaktiverad" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "kunde inte autodetektera namn (fick \"%s\")" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "tomt ident-namn (fรถr <%s>) ej tillรฅtet" -#: ident.c:421 +#: ident.c:439 #, c-format 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:611 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: 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-filter-options.c:81 +msgid "expected 'tree:<depth>'" +msgstr "fรถrvรคntade \"tree:<djup>\"" -#: list-objects.c:142 +#: list-objects-filter-options.c:96 +msgid "sparse:path filters support has been dropped" +msgstr "sparse:sรถkvรคg-filter stรถds inte lรคngre" + +#: list-objects-filter-options.c:109 #, 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" +msgid "invalid filter-spec '%s'" +msgstr "felaktig filterspecifikation: \"%s\"" -#: list-objects.c:378 +#: list-objects-filter-options.c:125 #, c-format -msgid "unable to load root tree for commit %s" -msgstr "kunde inte lรคsa in rot-trรคdet fรถr incheckningen %s" +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "mรฅste anvรคnda specialsekvens i delfilter-spec: \"%c\"" -#: list-objects-filter-options.c:36 +#: list-objects-filter-options.c:167 +msgid "expected something after combine:" +msgstr "fรถrvรคntade nรฅgonting efter combine:" + +#: list-objects-filter-options.c:249 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:361 +msgid "unable to upgrade repository format to support partial clone" +msgstr "kunde inte uppgradera arkivformat till att stรถda delvis klon" -#: 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.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "kunde inte nรฅ gles blob pรฅ \"%s\"" -#: list-objects-filter-options.c:94 +#: list-objects-filter.c:495 #, c-format -msgid "invalid filter-spec '%s'" -msgstr "felaktig filterspecifikation: \"%s\"" +msgid "unable to parse sparse filter data in %s" +msgstr "kunde inte tolka gles filterdata i %s" + +#: list-objects.c:127 +#, 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-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "kan inte รคndra kontraktsfjรคrr fรถr delvis kloning" +#: list-objects.c:140 +#, 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 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "kunde inte lรคsa in rot-trรคdet fรถr incheckningen %s" -#: lockfile.c:151 +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -3603,130 +4476,120 @@ msgstr "" "tidigare:\n" "ta bort filen manuellt fรถr att fortsรคtta." -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Kunde inte skapa \"%s.lock\": %s" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "misslyckades lรคsa cachen" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "fรถrvรคntade \"flush\" efter ls-refs-argument" -#: 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:322 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, 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:354 +#: merge-recursive.c:388 #, 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:437 -msgid "error building trees" -msgstr "fel vid byggande av trรคd" - -#: merge-recursive.c:863 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sรถkvรคgen \"%s\"%s" -#: merge-recursive.c:874 +#: merge-recursive.c:885 #, 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:888 merge-recursive.c:907 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:897 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vรคgrar fรถrlora ospรฅrad fil vid \"%s\"" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte lรคsa objektet %s: \"%s\"" -#: merge-recursive.c:941 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "blob fรถrvรคntades fรถr %s \"%s\"" -#: merge-recursive.c:965 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades รถppna \"%s\": %s" -#: merge-recursive.c:976 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska lรคnken \"%s\": %s" -#: merge-recursive.c:981 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" -msgstr "vet inte hur %06o %s \"%s\" skall hanteras" +msgstr "vet inte hur %06o %s \"%s\" ska hanteras" -#: merge-recursive.c:1177 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slรฅ ihop undermodulen %s (ej utcheckad)" -#: merge-recursive.c:1184 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slรฅ ihop undermodulen %s (incheckningar saknas)" -#: merge-recursive.c:1191 +#: merge-recursive.c:1205 #, 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:1199 merge-recursive.c:1211 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till fรถljande incheckning:" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Snabbspolar undermodulen %s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1251 #, 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:1241 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Misslyckades slรฅ ihop undermodulen %s (ej snabbspolning)" -#: merge-recursive.c:1242 +#: merge-recursive.c:1256 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:1245 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3743,32 +4606,32 @@ msgstr "" "\n" "vilket godtar lรถsningen.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slรฅ ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1327 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:1332 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lรคgga till %s till databasen" -#: merge-recursive.c:1364 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "Slรฅr ihop %s automatiskt" -#: merge-recursive.c:1387 +#: merge-recursive.c:1402 #, 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:1459 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3777,7 +4640,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:1464 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3786,7 +4649,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:1471 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3795,7 +4658,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:1476 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3804,40 +4667,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:1511 +#: merge-recursive.c:1526 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vรคgrar fรถrlora lortig fil vid \"%s\"" -#: merge-recursive.c:1601 +#: merge-recursive.c:1587 #, 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:1659 +#: merge-recursive.c:1645 #, 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:1690 +#: merge-recursive.c:1676 #, 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:1695 +#: merge-recursive.c:1681 #, 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:1714 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3846,28 +4709,28 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" pรฅ grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1719 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (lรคmnad olรถst)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1805 #, 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:2035 +#: merge-recursive.c:2068 #, 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 skall placeras dรฅ " +"KONFLIKT (namnรคndrad delad katalog): Osรคker pรฅ var %s ska placeras dรฅ " "katalogen %s bytte namn till flera andra kataloger, utan att nรฅgon " "destination fick en majoritet av filerna." -#: merge-recursive.c:2067 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3876,7 +4739,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:2077 +#: merge-recursive.c:2110 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3885,7 +4748,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:2169 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3894,7 +4757,7 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3903,52 +4766,52 @@ msgstr "" "VARNING: Undviker att applicera namnรคndring %s -> %s pรฅ %s, dรฅ %s sjรคlv har " "bytt namn." -#: merge-recursive.c:2937 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "kan inte lรคsa objektet %s" -#: merge-recursive.c:2940 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "objektet %s รคr inte en blob" -#: merge-recursive.c:3004 +#: merge-recursive.c:3040 msgid "modify" msgstr "รคndra" -#: merge-recursive.c:3004 +#: merge-recursive.c:3040 msgid "modified" msgstr "รคndrad" -#: merge-recursive.c:3016 +#: merge-recursive.c:3052 msgid "content" msgstr "innehรฅll" -#: merge-recursive.c:3020 +#: merge-recursive.c:3056 msgid "add/add" msgstr "tillรคgg/tillรคgg" -#: merge-recursive.c:3043 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade รถver %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3065 git-submodule.sh:937 +#: merge-recursive.c:3101 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:3066 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3096 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Lรคgger till som %s istรคllet" -#: merge-recursive.c:3178 +#: merge-recursive.c:3215 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -3957,7 +4820,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:3181 +#: merge-recursive.c:3218 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -3966,7 +4829,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:3185 +#: merge-recursive.c:3222 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -3975,7 +4838,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:3188 +#: merge-recursive.c:3225 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -3984,227 +4847,265 @@ 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:3302 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3325 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3330 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3337 +#: merge-recursive.c:3374 #, 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:3346 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "Lรคgger till %s" -#: merge-recursive.c:3355 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillรคgg/tillรคgg): Sammanslagningskonflikt i %s" -#: 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 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "Redan ร jour!" -#: merge-recursive.c:3413 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av trรคden %s och %s misslyckades" -#: merge-recursive.c:3512 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "Slรฅr ihop:" -#: merge-recursive.c:3525 +#: merge-recursive.c:3563 #, 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:3564 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3630 +#: merge-recursive.c:3672 +#, 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:3769 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: midx.c:69 +#: merge.c:41 +msgid "failed to read the cache" +msgstr "misslyckades lรคsa cachen" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "kunde inte skriva ny indexfil" + +#: midx.c:79 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-indexfilen %s รคr fรถr liten" -#: midx.c:85 +#: midx.c:95 #, 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:90 +#: midx.c:100 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-indexversionen %d stรถds inte" -#: midx.c:95 +#: midx.c:105 #, c-format -msgid "hash version %u does not match" -msgstr "hash-versionen %u stรคmmer inte" +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "multi-pack-index-hashversionen %u stรคmmer inte med versionen %u" -#: midx.c:109 +#: midx.c:122 msgid "invalid chunk offset (too large)" msgstr "felaktigt offset fรถr stycke (fรถr stort)" -#: midx.c:133 +#: midx.c:146 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:146 +#: midx.c:159 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index saknar krรคvd paketnamn-stycke" -#: midx.c:148 +#: midx.c:161 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index saknar krรคvt OID-utbredningsstycke" -#: midx.c:150 +#: midx.c:163 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index saknar krรคvt OID-uppslagnignsstycke" -#: midx.c:152 +#: midx.c:165 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index saknar krรคvt objekt-offsetstycke" -#: midx.c:166 +#: midx.c:179 #, 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:211 +#: midx.c:222 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (%u paket totalt)" -#: midx.c:261 +#: midx.c:272 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:289 +#: midx.c:300 msgid "error preparing packfile from multi-pack-index" msgstr "fel nรคr paketfiler frรฅn multi-pack-index skulle fรถrberedas" -#: midx.c:470 +#: midx.c:485 #, c-format msgid "failed to add packfile '%s'" msgstr "misslyckades lรคsa paketfilen \"%s\"" -#: midx.c:476 +#: midx.c:491 #, c-format msgid "failed to open pack-index '%s'" msgstr "misslyckades รถppna paketindexet \"%s\"" -#: midx.c:536 +#: midx.c:551 #, c-format msgid "failed to locate object %d in packfile" msgstr "misslyckades hitta objekt %d i paketfilen" -#: midx.c:865 +#: midx.c:853 +msgid "Adding packfiles to multi-pack-index" +msgstr "Lรคgger till paketfiler till multi-pack-index" + +#: midx.c:886 #, c-format msgid "did not see pack-file %s to drop" msgstr "sรฅg inte paketfilen %s som skulle kastas" -#: midx.c:1036 +#: midx.c:938 +msgid "no pack files to index." +msgstr "inga paketfiler att indexera." + +#: midx.c:990 +msgid "Writing chunks to multi-pack-index" +msgstr "Skriver stycken till multi-pack-index" + +#: midx.c:1068 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "misslyckades stรคda multi-pack-index pรฅ %s" -#: midx.c:1091 +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "multi-pack-indexfilen finns, men kunde inte tolkas" + +#: midx.c:1132 msgid "Looking for referenced packfiles" msgstr "Ser efter refererade packfiler" -#: midx.c:1106 +#: midx.c:1147 #, 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:1110 -msgid "Verifying OID order in MIDX" -msgstr "Bekrรคftar OID-ordning i MIDX" +#: midx.c:1152 +msgid "the midx contains no oid" +msgstr "midx saknar oid" + +#: midx.c:1161 +msgid "Verifying OID order in multi-pack-index" +msgstr "Bekrรคftar OID-ordning i multi-pack-index" -#: midx.c:1119 +#: midx.c:1170 #, 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:1138 +#: midx.c:1190 msgid "Sorting objects by packfile" msgstr "Sorterar objekt efter packfil" -#: midx.c:1144 +#: midx.c:1197 msgid "Verifying object offsets" msgstr "Bekrรคftar offset fรถr objekt" -#: midx.c:1160 +#: midx.c:1213 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "misslyckades lรคsa paketpost fรถr oid[%d] = %s" -#: midx.c:1166 +#: midx.c:1219 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "misslyckades lรคsa paketindex fรถr paketfil %s" -#: midx.c:1175 +#: midx.c:1228 #, 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:1350 +#: midx.c:1253 +msgid "Counting referenced objects" +msgstr "Rรคknar refererade objekt" + +#: midx.c:1263 +msgid "Finding and deleting unreferenced packfiles" +msgstr "Ser efter och tar bort orefererade packfiler" + +#: midx.c:1454 msgid "could not start pack-objects" msgstr "kunde inte starta pack-objects" -#: midx.c:1369 +#: midx.c:1474 msgid "could not finish pack-objects" msgstr "kunde inte avsluta pack-objects" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "misslyckades skapa lazy_dir-trรฅd: %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "misslyckades skapa lazy_name-trรฅd: %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "misslyckades utfรถra join pรฅ lazy_name-trรฅd: %s" @@ -4249,45 +5150,71 @@ 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:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "ogiltig objekttyp \"%s\"" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "objektet %s รคr en %s, inte en %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "objektet %s har okรคnd typ-id %d" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "hashvรคrde stรคmmer inte รถverens %s" -#: packfile.c:648 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "kan inte hรคmta storlek pรฅ %s" + +#: packfile.c:630 msgid "offset before end of packfile (broken .idx?)" msgstr "offset fรถre slutet av packfilen (trasig .idx?)" -#: packfile.c:1899 +#: packfile.c:1922 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset fรถre slutet av packindex fรถr %s (trasigt index?)" -#: packfile.c:1903 +#: packfile.c:1926 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex fรถr %s (trunkerat index?)" +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "flaggan \"%s\" antar ett numeriskt vรคrde" + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "trasigt utlรถpsdatum: \"%s\"" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "" +"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)" + +#: parse-options-cb.c:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "felformat objektnamn \"%s\"" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4303,7 +5230,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:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "%s tar inget vรคrde" @@ -4313,41 +5240,46 @@ msgstr "%s tar inget vรคrde" msgid "%s isn't available" msgstr "%s รคr inte tillgรคngligt" -#: parse-options.c:219 +#: parse-options.c:217 #, 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:389 +#: parse-options.c:386 #, 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:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, 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:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "alias fรถr --%s" -#: parse-options.c:859 +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "okรคnd flagga \"%s\"" -#: parse-options.c:861 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "okรคnd flagga \"%c\"" -#: parse-options.c:863 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "okรคnd icke-ascii-flagga i strรคngen: \"%s\"" -#: parse-options.c:887 +#: parse-options.c:890 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "anvรคndning: %s" @@ -4355,74 +5287,48 @@ msgstr "anvรคndning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:915 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:957 msgid "-NUM" msgstr "-TAL" -#: parse-options.c:968 -#, c-format -msgid "alias of --%s" -msgstr "alias fรถr --%s" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "flaggan \"%s\" antar ett numeriskt vรคrde" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "trasigt utlรถpsdatum: \"%s\"" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "" -"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "felformat objektnamn \"%s\"" - -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte gรถra %s skrivbar fรถr gruppen" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Specialtecknet \"\\\" tillรฅts inte som sista tecken i attributvรคrde" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Endast en \"attr:\"-angivelse tillรฅten." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "attr-angivelse kan inte vara tom" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "ogiltigt attributnamn %s" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "de globala sรถkvรคgsinstรคllningarna \"glob\" och \"noglob\" รคr inkompatibla" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4430,50 +5336,55 @@ msgstr "" "den globala sรถkvรคgsinstรคllningen \"literal\" รคr inkompatibel med alla andra " "globala sรถkvรคgsinstรคllningar" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ogiltig parameter fรถr sรถkvรคgsuttrycket fรถr \"prefix\"" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Felaktigt sรถkvรคgsuttryck \"%.*s\" i \"%s\"" -#: pathspec.c:330 +#: pathspec.c:332 #, 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:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Ej implementerat sรถkvรคgsuttryckmagi \"%c\" i \"%s\"" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: \"literal\" och \"glob\" รคr inkompatibla" -#: pathspec.c:440 +#: pathspec.c:445 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: \"%s\" รคr utanfรถr arkivet" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: \"%s\" รคr utanfรถr arkivet pรฅ \"%s\"" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "\"%s\" (minnesstรถd: \"%c\")" -#: pathspec.c:524 +#: pathspec.c:531 #, 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:591 +#: pathspec.c:598 #, 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:643 +#, 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" @@ -4483,44 +5394,48 @@ msgid "unable to write delim packet" msgstr "kan inte skriva delim-paket" #: pkt-line.c:106 +msgid "unable to write stateless separator packet" +msgstr "kan inte skriva tillstรฅndslรถst avdelarpaket" + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "fel vid skrivning av \"flush\"-paket" -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "protokollfel: omรถjligt lรฅng rad" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "paketskrivning med format misslyckades" -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "paketskrivning misslyckades - data รถverskrider maximal paketstorlek" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "paketskrivning misslyckades" -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "lรคsfel" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "fjรคrren lade pรฅ ovรคntat" -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "protokollfel: felaktig radlรคngdstecken: %.4s" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "protokollfel: felaktig radlรคngd: %d" -#: pkt-line.c:362 +#: pkt-line.c:373 sideband.c:150 #, c-format msgid "remote error: %s" msgstr "fjรคrrfel: %s" @@ -4534,82 +5449,113 @@ msgstr "Uppdaterar indexet" msgid "unable to create threaded lstat: %s" msgstr "kunde inte skapa trรฅdad lstat: %s" -#: pretty.c:966 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format fรถr --pretty" -#: range-diff.c:70 +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "promisor-remote: kunde inte starta (fork) underprocessen fรถr fetch" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "promisor-remote: kunde skriva till underprocessen fรถr fetch" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" +"promisor-remote: kunde inte stรคnga standard in fรถr underprocessen fรถr fetch" + +#: promisor-remote.c:53 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "kontraktsfjรคrr kan inte bรถrja med \"/\": %s" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "Tar bort duplicerade objekt" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "kunde inte starta \"log\"" -#: range-diff.c:72 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "kunde inte lรคsa utdata frรฅn \"log\"" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:98 sequencer.c:5283 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" -#: range-diff.c:117 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" +"kunde inte tolka fรถrsta raden i \"log\"-updata: bรถrjar inte med \"commit \": " +"\"%s\"" + +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "kunde inte tolka git-huvudet \"%.*s\"" -#: range-diff.c:274 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "misslyckades skapa diff" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen fรถr \"%s\"" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "lรคgger inte till filalias \"%s\" (\"%s\" finns redan i indexet)" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "kan inte skapa tom blob i objektdatabasen" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: kan bara lรคgga till vanliga filer, symboliska lรคnkar och git-kataloger" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "\"%s\" har inte nรฅgon utcheckad incheckning" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "kan inte indexera filen \"%s\"" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "kan inte lรคgga till \"%s\" till indexet" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "kan inte ta status pรฅ \"%s\"" -#: read-cache.c:1314 +#: read-cache.c:1318 #, 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:1499 +#: read-cache.c:1524 msgid "Refresh index" msgstr "Uppdatera indexet" -#: read-cache.c:1613 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4618,7 +5564,7 @@ msgstr "" "index.version satt, men vรคrdet รคr ogiltigt.\n" "Anvรคnder version %i" -#: read-cache.c:1623 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4627,150 +5573,161 @@ msgstr "" "GIT_INDEX_VERSION satt, men vรคrdet รคr ogiltigt.\n" "Anvรคnder version %i" -#: read-cache.c:1679 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "felaktig signatur 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "felaktig indexversion %d" -#: read-cache.c:1691 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "felaktig sha1-signatur fรถr indexfil" -#: read-cache.c:1721 +#: read-cache.c:1747 #, 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:1723 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "ignorerar filtillรคgget %.4s" -#: read-cache.c:1760 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "okรคnt format 0x%08x pรฅ indexpost" -#: read-cache.c:1776 +#: read-cache.c:1802 #, 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:1833 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "osorterade kรถposter i index" -#: read-cache.c:1836 +#: read-cache.c:1862 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "flera kรถposter fรถr den sammanslagna filen \"%s\"" -#: read-cache.c:1839 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "osorterade kรถposter fรถr \"%s\"" -#: 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 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "indexfilen trasig" -#: read-cache.c:2087 +#: read-cache.c:2115 #, 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:2100 +#: read-cache.c:2128 #, 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:2133 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "%s: รถppning av indexfilen misslyckades" -#: read-cache.c:2137 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: kan inte ta startus pรฅ det รถppna indexet" -#: read-cache.c:2141 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indexfilen mindre รคn fรถrvรคntat" -#: read-cache.c:2145 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "%s: kan inte koppla indexfilen" -#: read-cache.c:2187 +#: read-cache.c:2215 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "kunde inte skapa load_index_extensions-trรฅden: %s" -#: read-cache.c:2214 +#: read-cache.c:2242 #, 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:2246 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "kunde inte uppdatera delat index \"%s\"" -#: read-cache.c:2293 +#: read-cache.c:2321 #, 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:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 #, c-format msgid "could not close '%s'" msgstr "kunde inte stรคnga \"%s\"" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status pรฅ \"%s\"" -#: read-cache.c:3105 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte รถppna git-katalog: %s" -#: read-cache.c:3117 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort lรคnken: %s" -#: read-cache.c:3142 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rรคtta behรถrighetsbitar pรฅ \"%s\"" -#: read-cache.c:3291 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte รฅtergรฅ till kรถ 0" -#: rebase-interactive.c:26 +#: 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 #, 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:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -4814,14 +5771,14 @@ msgstr "" "\n" "Du kan byta ordning pรฅ raderna; de utfรถrs uppifrรฅn och ned.\n" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, 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:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4830,7 +5787,7 @@ msgstr "" "Ta inte bort rader. Anvรคnd \"drop\" fรถr att specifikt fรถrkasta en " "incheckning.\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4838,7 +5795,7 @@ msgstr "" "\n" "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FรRLORAS.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4852,7 +5809,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4862,22 +5819,19 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: 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 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 #, c-format msgid "could not write '%s'" msgstr "kunde inte skriva \"%s\"" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "kunde inte kopiera \"%s\" till \"%s\"." +msgid "could not write '%s'." +msgstr "kunde inte skriva \"%s\"." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -4886,7 +5840,7 @@ msgstr "" "Varning: vissa incheckningar kan av misstag ha tappats.\n" "Tappade incheckningar (nyaste fรถrst):\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -4906,124 +5860,14 @@ msgstr "" "\" (fel).\n" "\n" -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -msgstr "\"%s\" pekar inte pรฅ ett giltigt objekt!" - -#: refs.c:667 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "ignorerar dinglande symbolisk referens %s" - -#: refs.c:669 ref-filter.c:2092 -#, c-format -msgid "ignoring broken ref %s" -msgstr "ignorerar trasig referens %s" - -#: refs.c:804 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "kunde inte รถppna \"%s\" fรถr skrivning: %s" - -#: refs.c:814 refs.c:865 -#, c-format -msgid "could not read ref '%s'" -msgstr "Kunde inte lรคsa referensen \"%s\"" - -#: refs.c:820 -#, c-format -msgid "ref '%s' already exists" -msgstr "referensen \"%s\" finns redan" - -#: refs.c:825 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "ovรคntat objekt-id vid skrivning \"%s\"" - -#: 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 wrapper.c:225 wrapper.c:395 builtin/am.c:715 -#: builtin/rebase.c:1003 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 #, c-format -msgid "could not open '%s' for writing" -msgstr "kunde inte รถppna \"%s\" fรถr skrivning" - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "ovรคntat objekt-id vid borttagning \"%s\"" - -#: refs.c:998 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "loggen fรถr referensen %s har lucka efter %s" - -#: refs.c:1004 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "loggen fรถr referensen %s slutade ovรคntat pรฅ %s" - -#: refs.c:1063 -#, c-format -msgid "log for %s is empty" -msgstr "loggen fรถr %s รคr tom" - -#: refs.c:1155 -#, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "vรคgrar uppdatera referens med trasigt namn \"%s\"" - -#: refs.c:1231 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "update_ref misslyckades fรถr referensen \"%s\": %s" - -#: 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:2044 -msgid "ref updates forbidden inside quarantine environment" -msgstr "referensuppdateringar fรถrbjudna i karantรคnmiljรถ" - -#: refs.c:2140 refs.c:2170 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "\"%s\" finns; kan inte skapa \"%s\"" - -#: 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:1234 -#, c-format -msgid "could not remove reference %s" -msgstr "kunde inte ta bort referensen %s" - -#: 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:1251 refs/packed-backend.c:1545 -#, c-format -msgid "could not delete references: %s" -msgstr "kunde inte ta bort referenser: %s" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "felaktig referensspecifikation: \"%s\"" +msgid "could not read '%s'." +msgstr "kunde inte lรคsa \"%s\"." -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "fรถrsvunnen" @@ -5042,281 +5886,370 @@ msgstr "bakom %d" msgid "ahead %d, behind %d" msgstr "fรถre %d, bakom %d" -#: ref-filter.c:162 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "fรถrvรคntat format: %%(color:<color>)" -#: ref-filter.c:164 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okรคnd fรคrg: %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Heltalsvรคrde fรถrvรคntades refname:lstrip=%s" -#: ref-filter.c:190 +#: ref-filter.c:197 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvรคrde fรถrvรคntades refname:rstrip=%s" -#: ref-filter.c:192 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "okรคnt %%(%s)-argument: %s" -#: ref-filter.c:247 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) tar inte argument" -#: ref-filter.c:269 +#: ref-filter.c:276 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "okรคnt %%(objectsize)-argument: %s" -#: ref-filter.c:277 +#: ref-filter.c:284 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) tar inte argument" -#: ref-filter.c:289 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:298 +#: ref-filter.c:309 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) tar inte argument" +msgid "unrecognized %%(subject) argument: %s" +msgstr "okรคnt %%(subject)-argument: %s" -#: ref-filter.c:320 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "okรคnt %%(trailers)-argument: %s" -#: ref-filter.c:349 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt vรคrde fรถrvรคntat contents:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okรคnt %%(contents)-argument: %s" -#: ref-filter.c:366 +#: ref-filter.c:380 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "positivt vรคrde fรถrvรคntat objectname:short=%s" +msgid "positive value expected '%s' in %%(%s)" +msgstr "positivt vรคrde fรถrvรคntat \"%s\" i %%(%s)" -#: ref-filter.c:370 +#: ref-filter.c:384 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "okรคnt %%(objectname)-argument: %s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "okรคnt argument \"%s\" i %%(%s)" -#: ref-filter.c:400 +#: ref-filter.c:398 +#, c-format +msgid "unrecognized email option: %s" +msgstr "okรคnd e-postalternativ: %s" + +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "fรถrvรคntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:412 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "okรคnd position:%s" -#: ref-filter.c:419 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "okรคnd bredd:%s" -#: ref-filter.c:428 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okรคnt %%(align)-argument: %s" -#: ref-filter.c:436 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd fรถrvรคntad med atomen %%(align)" -#: ref-filter.c:454 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "okรคnt %%(if)-argument: %s" -#: ref-filter.c:556 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fรคltnamn: %.*s" -#: ref-filter.c:583 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "okรคnt fรคltnamn: %.*s" -#: ref-filter.c:587 +#: ref-filter.c:615 #, 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:711 +#: ref-filter.c:739 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) anvรคnd utan en %%(then)-atom" -#: ref-filter.c:774 +#: ref-filter.c:802 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) anvรคnd utan en %%(if)-atom" -#: ref-filter.c:776 +#: ref-filter.c:804 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) anvรคnd mer รคn en gรฅng" -#: ref-filter.c:778 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) anvรคnd efter %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:834 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) anvรคnd utan en %%(if)-atom" -#: ref-filter.c:808 +#: ref-filter.c:836 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) anvรคnd utan en %%(then)-atom" -#: ref-filter.c:810 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) anvรคnd mer รคn en gรฅng" -#: ref-filter.c:825 +#: ref-filter.c:853 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) anvรคnd utan motsvarande atom" -#: ref-filter.c:882 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "felformad formatstrรคng %s" -#: ref-filter.c:1485 +#: ref-filter.c:1541 #, c-format msgid "no branch, rebasing %s" msgstr "ingen gren, ombaserar %s" -#: ref-filter.c:1488 +#: ref-filter.c:1544 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "ingen gren, ombaserar frรฅnkopplat HEAD %s" -#: ref-filter.c:1491 +#: ref-filter.c:1547 #, c-format msgid "no branch, bisect started on %s" msgstr "ingen gren, \"bisect\" startad pรฅ %s" -#: ref-filter.c:1501 +#: ref-filter.c:1557 msgid "no branch" msgstr "ingen gren" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1591 ref-filter.c:1800 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas fรถr %s" -#: ref-filter.c:1547 +#: ref-filter.c:1601 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades pรฅ %s fรถr %s" -#: ref-filter.c:1998 +#: ref-filter.c:2054 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:2087 +#: ref-filter.c:2143 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:2382 -#, c-format -msgid "format: %%(end) atom missing" -msgstr "format: atomen %%(end) saknas" - -#: ref-filter.c:2482 +#: ref-filter.c:2148 refs.c:657 #, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "flaggan \"%s\" รคr inkompatibel med --merged" +msgid "ignoring broken ref %s" +msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2485 +#: ref-filter.c:2464 #, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "flaggan \"%s\" รคr inkompatibel med --no-merged" +msgid "format: %%(end) atom missing" +msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2495 +#: ref-filter.c:2563 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2500 +#: ref-filter.c:2568 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" mรฅste peka pรฅ en incheckning" -#: remote.c:363 +#: refs.c:264 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "\"%s\" pekar inte pรฅ ett giltigt objekt!" + +#: refs.c:572 +#, c-format +msgid "could not retrieve `%s`" +msgstr "kunde inte hรคmta \"%s\"" + +#: refs.c:579 +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "felaktigt namn pรฅ gren: %s = %s" + +#: refs.c:655 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "ignorerar dinglande symbolisk referens %s" + +#: refs.c:892 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "loggen fรถr referensen %s har lucka efter %s" + +#: refs.c:898 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "loggen fรถr referensen %s slutade ovรคntat pรฅ %s" + +#: refs.c:957 +#, c-format +msgid "log for %s is empty" +msgstr "loggen fรถr %s รคr tom" + +#: refs.c:1049 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "vรคgrar uppdatera referens med trasigt namn \"%s\"" + +#: refs.c:1120 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "update_ref misslyckades fรถr referensen \"%s\": %s" + +#: refs.c:1944 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "flera uppdateringar fรถr referensen \"%s\" tillรฅts inte" + +#: refs.c:2024 +msgid "ref updates forbidden inside quarantine environment" +msgstr "referensuppdateringar fรถrbjudna i karantรคnmiljรถ" + +#: refs.c:2035 +msgid "ref updates aborted by hook" +msgstr "referensuppdateringar avbrutna av krok" + +#: refs.c:2135 refs.c:2165 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "\"%s\" finns; kan inte skapa \"%s\"" + +#: refs.c:2141 refs.c:2176 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" + +#: refs/files-backend.c:1228 +#, c-format +msgid "could not remove reference %s" +msgstr "kunde inte ta bort referensen %s" + +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "kunde inte ta bort referensen %s: %s" + +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#, c-format +msgid "could not delete references: %s" +msgstr "kunde inte ta bort referenser: %s" + +#: refspec.c:167 +#, c-format +msgid "invalid refspec '%s'" +msgstr "felaktig referensspecifikation: \"%s\"" + +#: remote.c:351 #, 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:410 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "mer รคn en receivepack angavs, anvรคnder den fรถrsta" -#: remote.c:418 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "mer รคn en uploadpack angavs, anvรคnder den fรถrsta" -#: remote.c:608 +#: remote.c:590 #, 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:612 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spรฅrar vanligtvis %s, inte %s" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spรฅrar bรฅde %s och %s" -#: remote.c:684 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "nyckeln \"%s\" i mรถnstret innehรฅller ingen \"*\"" -#: remote.c:694 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "vรคrdet \"%s\" i mรถnstret innehรฅller ingen \"*\"" -#: remote.c:1000 +#: remote.c:1073 #, c-format msgid "src refspec %s does not match any" msgstr "kรคll-referensspecifikationen %s motsvarar ingen" -#: remote.c:1005 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "kรคll-referensspecifikationen %s motsvarar mer รคn en" @@ -5325,7 +6258,7 @@ msgstr "kรคll-referensspecifikationen %s motsvarar mer รคn en" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5348,7 +6281,7 @@ msgstr "" "\n" "Inget av dem fungerade, sรฅ vi gav upp. Ange fullstรคndig referens." -#: remote.c:1040 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5359,7 +6292,7 @@ msgstr "" "Var det meningen att skapa en ny gren genom att sรคnda\n" "till \"%s:refs/heads/%s\"?" -#: remote.c:1045 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5370,7 +6303,7 @@ msgstr "" "Var det meningen att skapa en ny tagg genom att sรคnda\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1050 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5381,7 +6314,7 @@ msgstr "" "Var det meningen att tagga ett nytt trรคd genom att sรคnda\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1055 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5392,114 +6325,114 @@ msgstr "" "Var det meningen att tagga en ny blob genom att sรคnda\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1091 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s kan inte slรฅs upp till en gren" -#: remote.c:1102 +#: remote.c:1175 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "kan inte ta bort \"%s\": fjรคrreferensen finns inte" -#: remote.c:1114 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "fjรคrr-referensspecifikationen \"%s\" motsvarar mer รคn en" -#: remote.c:1121 +#: remote.c:1194 #, 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:1624 remote.c:1725 +#: remote.c:1703 remote.c:1804 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte pรฅ en gren" -#: remote.c:1633 +#: remote.c:1712 #, c-format msgid "no such branch: '%s'" msgstr "okรคnd gren: \"%s\"" -#: remote.c:1636 +#: remote.c:1715 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppstrรถm angiven fรถr grenen \"%s\"" -#: remote.c:1642 +#: remote.c:1721 #, 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:1657 +#: remote.c:1736 #, 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:1669 +#: remote.c:1748 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjรคrr fรถr \"push\"" -#: remote.c:1679 +#: remote.c:1758 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation fรถr \"%s\" innehรฅller inte \"%s\"" -#: remote.c:1692 +#: remote.c:1771 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mรฅl (push.default รคr \"ingenting\")" -#: remote.c:1714 +#: remote.c:1793 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mรฅl" -#: remote.c:1840 +#: remote.c:1922 #, c-format msgid "couldn't find remote ref %s" msgstr "Kunde inte hitta fjรคrr-referensen %s" -#: remote.c:1853 +#: remote.c:1935 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorerar mรคrklig referens \"%s\" lokalt" -#: remote.c:2016 +#: remote.c:2098 #, 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:2020 +#: remote.c:2102 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (anvรคnd \"git branch --unset-upstream\" fรถr att rรคtta)\n" -#: remote.c:2023 +#: remote.c:2105 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren รคr ร jour med \"%s\".\n" -#: remote.c:2027 +#: remote.c:2109 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Din gren och \"%s\" pekar pรฅ olika incheckningar.\n" -#: remote.c:2030 +#: remote.c:2112 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (anvรคnd \"%s\" fรถr detaljer)\n" -#: remote.c:2034 +#: remote.c:2116 #, 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:2040 +#: remote.c:2122 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:2043 +#: remote.c:2125 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5509,11 +6442,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2051 +#: remote.c:2133 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:2054 +#: remote.c:2136 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5528,11 +6461,11 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2064 +#: remote.c:2146 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:2247 +#: remote.c:2337 #, c-format msgid "cannot parse expected object name '%s'" msgstr "kan inte tolka fรถrvรคntat objektnamn \"%s\"" @@ -5547,7 +6480,7 @@ msgstr "felaktig ersรคttningsreferensnamn: %s" msgid "duplicate replace ref: %s" msgstr "duplicerat ersรคttningsreferensnamn: %s" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "ersรคttningsdjupet fรถr hรถgt fรถr objektet %s" @@ -5610,8 +6543,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:2023 builtin/log.c:1790 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" @@ -5645,20 +6578,34 @@ 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:2507 +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "kunde inte bestรคmma HEAD-revision" + +#: reset.c:70 reset.c:76 sequencer.c:3426 +#, c-format +msgid "failed to find tree of %s" +msgstr "kunde inte hitta trรคdet fรถr %s." + +#: revision.c:2344 +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<paketfil> stรถds inte lรคngre" + +#: revision.c:2364 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "okรคnt vรคrde fรถr --diff-merges: %s" + +#: revision.c:2702 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2510 +#: revision.c:2705 #, 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:2710 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent รคr inkompatibelt med --bisect" - -#: revision.c:2714 +#: revision.c:2915 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" @@ -5666,12 +6613,12 @@ msgstr "-L stรถder รคnnu inte andra diff-format รคn -p och -s" msgid "open /dev/null failed" msgstr "misslyckades รถppna /dev/null" -#: run-command.c:1269 +#: run-command.c:1270 #, c-format msgid "cannot create async thread: %s" msgstr "kan inte skapa asynkron trรฅd: %s" -#: run-command.c:1333 +#: run-command.c:1334 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5680,29 +6627,33 @@ 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:141 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "ovรคntat flush-paket vid lรคsning av fjรคrruppackningsstatus" -#: send-pack.c:143 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "kunde inte tolka fjรคrruppackningsstatus: %s" -#: send-pack.c:145 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "fjรคrruppackning misslyckades: %s" -#: send-pack.c:306 +#: send-pack.c:372 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:420 +#: send-pack.c:460 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "mottagarsidan stรถder inte arkivets hashningsalgoritm" + +#: send-pack.c:469 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stรถder inte push med --signed" -#: send-pack.c:422 +#: send-pack.c:471 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5710,47 +6661,47 @@ msgstr "" "sรคnder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:434 +#: send-pack.c:483 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stรถder inte push med --atomic" -#: send-pack.c:439 +#: send-pack.c:488 msgid "the receiving end does not support push options" msgstr "mottagarsidan stรถder inte push-flaggor" -#: sequencer.c:187 +#: sequencer.c:194 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "felaktigt incheckningsmeddelandestรคdningslรคge \"%s\"" -#: sequencer.c:292 +#: sequencer.c:308 #, c-format msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:321 +#: sequencer.c:339 msgid "revert" msgstr "revert" -#: sequencer.c:323 +#: sequencer.c:341 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:325 -msgid "rebase -i" -msgstr "rebase -i" +#: sequencer.c:343 +msgid "rebase" +msgstr "rebase" -#: sequencer.c:327 +#: sequencer.c:345 #, c-format msgid "unknown action: %d" msgstr "okรคnd funktion: %d" -#: sequencer.c:385 +#: sequencer.c:404 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5758,7 +6709,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:388 +#: sequencer.c:407 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5768,115 +6719,109 @@ msgstr "" "med \"git add <sรถkvรคgar>\" eller \"git rm <sรถkvรคgar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:420 sequencer.c:3028 #, c-format msgid "could not lock '%s'" msgstr "kunde inte lรฅsa \"%s\"" -#: sequencer.c:408 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "kunde inte skriva till \"%s\"" + +#: sequencer.c:427 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades fรคrdigstรคlla \"%s\"" -#: 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:462 +#: sequencer.c:471 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala รคndringar skulle skrivas รถver av %s." -#: sequencer.c:466 +#: sequencer.c:475 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:498 +#: sequencer.c:507 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:546 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt stรคdningslรคge %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:632 +#: sequencer.c:640 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:649 +#: sequencer.c:657 msgid "unable to update cache tree" msgstr "kan inte uppdatera cachetrรคd" -#: sequencer.c:663 +#: sequencer.c:671 msgid "could not resolve HEAD commit" msgstr "kunde inte bestรคmma HEAD:s incheckning" -#: sequencer.c:743 +#: sequencer.c:751 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:754 +#: sequencer.c:762 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av vรคrdet \"%s\"" -#: 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 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte รถppna \"%s\" fรถr lรคsning" -#: sequencer.c:801 +#: sequencer.c:809 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:806 +#: sequencer.c:814 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:811 +#: sequencer.c:819 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:815 +#: sequencer.c:823 #, c-format msgid "unknown variable '%s'" msgstr "okรคnd variabel \"%s\"" -#: sequencer.c:820 +#: sequencer.c:828 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:822 +#: sequencer.c:830 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:824 +#: sequencer.c:832 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "ogiltigt datumformat \"%s\" i \"%s\"" - -#: sequencer.c:901 +#: sequencer.c:897 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5893,11 +6838,11 @@ msgid "" " git rebase --continue\n" msgstr "" "du har kรถade รคndringar i din arbetskatalog.\n" -"Om รคndringarna skall lรคggas in i fรถregรฅende incheckning, kรถr:\n" +"Om รคndringarna ska lรคggas in i fรถregรฅende incheckning, kรถr:\n" "\n" " git commit --amend %s\n" "\n" -"Om de skall checkas in i en egen incheckning, kรถr:\n" +"Om de ska checkas in i en egen incheckning, kรถr:\n" "\n" " git commit %s\n" "\n" @@ -5905,15 +6850,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "skriver rotincheckning" - -#: sequencer.c:1216 +#: sequencer.c:1178 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1223 +#: sequencer.c:1184 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5940,7 +6881,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1197 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5965,327 +6906,340 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1239 msgid "couldn't look up newly created commit" msgstr "kunde inte slรฅ upp en precis skapad incheckning" -#: sequencer.c:1280 +#: sequencer.c:1241 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1326 +#: sequencer.c:1287 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestรคmma HEAD efter att ha skapat incheckning" -#: sequencer.c:1328 +#: sequencer.c:1289 msgid "detached HEAD" msgstr "frรฅnkopplad HEAD" -#: sequencer.c:1332 +#: sequencer.c:1293 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1353 +#: sequencer.c:1314 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1355 +#: sequencer.c:1316 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s รคr inte en incheckning!" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1373 sequencer.c:2067 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens fรถrfattare" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett trรคd" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1417 sequencer.c:1535 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte lรคsa incheckningsmeddelande frรฅn \"%s\"" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1446 sequencer.c:1478 +#, c-format +msgid "invalid author identity '%s'" +msgstr "ogiltig fรถrfattar-identitet \"%s\"" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "trasig fรถrfattare: saknar datuminformation" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1526 +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "kunde inte uppdatera %s" + +#: sequencer.c:1567 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1531 +#: sequencer.c:1572 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka fรถrรคldraincheckningen %s" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1655 sequencer.c:1766 #, c-format msgid "unknown command: %d" msgstr "okรคnt kommando: %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1713 sequencer.c:1738 #, c-format msgid "This is a combination of %d commits." msgstr "Det hรคr รคr en kombination av %d incheckningar." -#: sequencer.c:1672 +#: sequencer.c:1723 msgid "need a HEAD to fixup" msgstr "behรถver en HEAD-incheckning att rรคtta" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1725 sequencer.c:3338 msgid "could not read HEAD" msgstr "kunde inte lรคsa HEAD" -#: sequencer.c:1676 +#: sequencer.c:1727 msgid "could not read HEAD's commit message" msgstr "kunde inte lรคsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1682 +#: sequencer.c:1733 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Det hรคr รคr 1:a incheckningsmeddelandet:" -#: sequencer.c:1697 +#: sequencer.c:1748 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte lรคsa incheckningsmeddelande fรถr %s" -#: sequencer.c:1704 +#: sequencer.c:1755 #, c-format msgid "This is the commit message #%d:" msgstr "Det hรคr รคr incheckningsmeddelande %d:" -#: sequencer.c:1710 +#: sequencer.c:1761 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas รถver:" -#: sequencer.c:1798 +#: sequencer.c:1849 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1805 +#: sequencer.c:1856 msgid "cannot fixup root commit" msgstr "kan inte gรถra \"fixup\" pรฅ rotincheckning" -#: sequencer.c:1824 +#: sequencer.c:1875 #, 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:1832 sequencer.c:1840 +#: sequencer.c:1883 sequencer.c:1891 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte fรถrรคlder %d" -#: sequencer.c:1846 +#: sequencer.c:1897 #, 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:1865 +#: sequencer.c:1916 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka fรถrรคldraincheckningen %s" -#: sequencer.c:1930 +#: sequencer.c:1981 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn pรฅ \"%s\" till \"%s\"" -#: sequencer.c:1985 +#: sequencer.c:2038 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte รฅngra %s... %s" -#: sequencer.c:1986 +#: sequencer.c:2039 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillรคmpa %s... %s" -#: sequencer.c:2045 +#: sequencer.c:2059 +#, 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:2117 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades lรคsa indexet" -#: sequencer.c:2052 +#: sequencer.c:2124 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2128 +#: sequencer.c:2201 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2137 +#: sequencer.c:2210 #, c-format msgid "missing arguments for %s" msgstr "argument saknas fรถr %s" -#: sequencer.c:2174 +#: sequencer.c:2241 #, c-format -msgid "could not parse '%.*s'" -msgstr "kunde inte tolka \"%.*s\"" +msgid "could not parse '%s'" +msgstr "kunde inte tolka \"%s\"" -#: sequencer.c:2228 +#: sequencer.c:2302 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2239 +#: sequencer.c:2313 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utfรถra \"%s\" utan en fรถregรฅende incheckning" -#: 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 +#: sequencer.c:2399 msgid "cancelling a cherry picking in progress" msgstr "avbryter pรฅgรฅende \"cherry-pick\"" -#: sequencer.c:2330 +#: sequencer.c:2408 msgid "cancelling a revert in progress" msgstr "avbryter pรฅgรฅende \"revert\"" -#: sequencer.c:2364 +#: sequencer.c:2452 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rรคtta det med \"git rebase --edit-todo\"." -#: sequencer.c:2366 +#: sequencer.c:2454 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvรคndbart manus: \"%s\"" -#: sequencer.c:2371 +#: sequencer.c:2459 msgid "no commits parsed." msgstr "inga incheckningar lรคstes." -#: sequencer.c:2382 +#: sequencer.c:2470 msgid "cannot cherry-pick during a revert." msgstr "kan inte utfรถra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2384 +#: sequencer.c:2472 msgid "cannot revert during a cherry-pick." msgstr "kan inte utfรถra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2466 +#: sequencer.c:2550 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt vรคrde fรถr %s: %s" -#: sequencer.c:2553 +#: sequencer.c:2657 msgid "unusable squash-onto" msgstr "oanvรคndbar squash-onto" -#: sequencer.c:2569 +#: sequencer.c:2677 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: \"%s\"" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2769 sequencer.c:4609 msgid "empty commit set passed" msgstr "den angivna uppsรคttningen incheckningar รคr tom" -#: sequencer.c:2668 +#: sequencer.c:2786 msgid "revert is already in progress" msgstr "en \"revert\" pรฅgรฅr redan" -#: sequencer.c:2670 +#: sequencer.c:2788 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2673 +#: sequencer.c:2791 msgid "cherry-pick is already in progress" msgstr "en \"cherry-pick\" pรฅgรฅr redan" -#: sequencer.c:2675 +#: sequencer.c:2793 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2689 +#: sequencer.c:2807 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2704 +#: sequencer.c:2822 msgid "could not lock HEAD" msgstr "kunde inte lรฅsa HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2882 sequencer.c:4325 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pรฅgรฅr" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2884 sequencer.c:2895 msgid "cannot resolve HEAD" msgstr "kan inte bestรคmma HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2886 sequencer.c:2930 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:2798 builtin/grep.c:734 +#: sequencer.c:2916 builtin/grep.c:745 #, c-format msgid "cannot open '%s'" msgstr "kan inte รถppna \"%s\"" -#: sequencer.c:2800 +#: sequencer.c:2918 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte lรคsa \"%s\": %s" -#: sequencer.c:2801 +#: sequencer.c:2919 msgid "unexpected end of file" msgstr "ovรคntat filslut" -#: sequencer.c:2807 +#: sequencer.c:2925 #, 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:2818 +#: sequencer.c:2936 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:2859 +#: sequencer.c:2977 msgid "no revert in progress" msgstr "ingen \"revers\" pรฅgรฅr" -#: sequencer.c:2867 +#: sequencer.c:2986 msgid "no cherry-pick in progress" msgstr "ingen \"cherry-pick\" pรฅgรฅr" -#: sequencer.c:2877 +#: sequencer.c:2996 msgid "failed to skip the commit" msgstr "kunde inte hoppa รถver incheckningen" -#: sequencer.c:2884 +#: sequencer.c:3003 msgid "there is nothing to skip" msgstr "ingenting att hoppa รถver" -#: sequencer.c:2887 +#: sequencer.c:3006 #, c-format msgid "" "have you committed already?\n" @@ -6294,21 +7248,16 @@ msgstr "" "har du redan checkat in?\n" "testa \"git %s --continue\"" -#: sequencer.c:3011 sequencer.c:4015 -#, c-format -msgid "could not update %s" -msgstr "kunde inte uppdatera %s" - -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3168 sequencer.c:4217 msgid "cannot read HEAD" msgstr "kan inte lรคsa HEAD" -#: sequencer.c:3066 +#: sequencer.c:3185 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3074 +#: sequencer.c:3193 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6327,27 +7276,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3203 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillรคmpa %s... %.*s" -#: sequencer.c:3091 +#: sequencer.c:3210 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slรฅ ihop %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%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 "kunde inte lรคsa indexet" +#: sequencer.c:3240 +#, c-format +msgid "Executing: %s\n" +msgstr "Kรถr: %s\n" -#: sequencer.c:3136 +#: sequencer.c:3255 #, c-format msgid "" "execution failed: %s\n" @@ -6362,11 +7311,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3261 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:3148 +#: sequencer.c:3267 #, c-format msgid "" "execution succeeded: %s\n" @@ -6383,111 +7332,128 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3328 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3263 +#: sequencer.c:3382 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3268 +#: sequencer.c:3387 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: 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:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "kunde inte skriva indexet" - -#: sequencer.c:3351 +#: sequencer.c:3471 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplรถsa \"%s\"" -#: sequencer.c:3379 +#: sequencer.c:3502 msgid "cannot merge without a current revision" msgstr "kan inte slรฅ ihop utan en aktuell incheckning" -#: sequencer.c:3401 +#: sequencer.c:3524 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3410 +#: sequencer.c:3533 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slรฅ samman: \"%.*s\"" -#: sequencer.c:3422 +#: sequencer.c:3545 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:3437 +#: sequencer.c:3561 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte lรคsa incheckningsmeddelande fรถr \"%s\"" -#: sequencer.c:3590 +#: sequencer.c:3730 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens fรถrsรถka slรฅ ihop \"%.*s\"" -#: sequencer.c:3606 +#: sequencer.c:3746 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "Kan inte utfรถra \"autostash\"" + +#: sequencer.c:3823 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "Ovรคntat svar frรฅn stash: \"%s\"" + +#: sequencer.c:3829 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "Kunde inte skapa katalog fรถr \"%s\"" + +#: sequencer.c:3832 +#, c-format +msgid "Created autostash: %s\n" +msgstr "Skapade autostash: %s\n" + +#: sequencer.c:3836 +msgid "could not reset --hard" +msgstr "kunde inte utfรถra \"reset --hard\"" + +#: sequencer.c:3861 #, c-format msgid "Applied autostash.\n" msgstr "Tillรคmpade autostash.\n" -#: sequencer.c:3687 +#: sequencer.c:3873 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3876 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"Tillรคmpning av autostash gav konflikter.\n" +"%s\n" "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:3751 -#, c-format -msgid "could not checkout %s" -msgstr "kunde inte checka ut %s" +#: sequencer.c:3881 +msgid "Applying autostash resulted in conflicts." +msgstr "Tillรคmpning av autostash gav konflikter." + +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." +msgstr "Autostash finns; skapar ny stash-post." -#: sequencer.c:3765 +#: sequencer.c:3974 #, c-format msgid "%s: not a valid OID" msgstr "%s: inte ett giltigt OID" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "kunde inte koppla frรฅn HEAD" -#: sequencer.c:3785 +#: sequencer.c:3994 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade pรฅ HEAD\n" -#: sequencer.c:3787 +#: sequencer.c:3996 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade pรฅ %s\n" -#: sequencer.c:3795 +#: sequencer.c:4004 #, c-format msgid "" "Could not execute the todo command\n" @@ -6508,48 +7474,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "Ombaserar (%d/%d)%s" + +#: sequencer.c:4095 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade pรฅ %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:4166 #, c-format msgid "unknown command %d" msgstr "okรคnt kommando %d" -#: sequencer.c:4003 +#: sequencer.c:4225 msgid "could not read orig-head" msgstr "kunde inte lรคsa orig-head" -#: sequencer.c:4008 +#: sequencer.c:4230 msgid "could not read 'onto'" msgstr "kunde inte lรคsa \"onto\"" -#: sequencer.c:4022 +#: sequencer.c:4244 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:4115 +#: sequencer.c:4304 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "Lyckades ombasera och uppdatera %s.\n" + +#: sequencer.c:4337 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har okรถade รคndringar." -#: sequencer.c:4124 +#: sequencer.c:4346 msgid "cannot amend non-existing commit" msgstr "kan inte lรคgga till incheckning som inte finns" -#: sequencer.c:4126 +#: sequencer.c:4348 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4128 +#: sequencer.c:4350 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehรฅll: \"%s\"" -#: sequencer.c:4131 +#: sequencer.c:4353 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6559,69 +7535,64 @@ 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:4167 sequencer.c:4205 +#: sequencer.c:4389 sequencer.c:4428 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4220 +#: sequencer.c:4444 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4451 msgid "could not commit staged changes." msgstr "kunde inte checka in kรถade รคndringar." -#: sequencer.c:4328 +#: sequencer.c:4477 +#, c-format +msgid "invalid committer '%s'" +msgstr "ogiltig incheckare %s" + +#: sequencer.c:4586 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte gรถra \"cherry-pick\" pรฅ typen \"%s\"" -#: sequencer.c:4332 +#: sequencer.c:4590 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4367 +#: sequencer.c:4625 msgid "can't revert as initial commit" msgstr "kan inte รฅngra som fรถrsta incheckning" -#: sequencer.c:4810 +#: sequencer.c:5102 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stรถds" -#: sequencer.c:4813 +#: sequencer.c:5105 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 +#: sequencer.c:5347 sequencer.c:5364 msgid "nothing to do" msgstr "inget att gรถra" -#: sequencer.c:5114 +#: sequencer.c:5383 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa รถver onรถdiga \"pick\"-kommandon" -#: sequencer.c:5197 +#: sequencer.c:5480 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." -#: setup.c:123 +#: setup.c:133 #, c-format -msgid "'%s' is outside repository" -msgstr "\"%s\" รคr utanfรถr arkivet" +msgid "'%s' is outside repository at '%s'" +msgstr "\"%s\" รคr utanfรถr arkivet pรฅ \"%s\"" -#: setup.c:173 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6631,7 +7602,7 @@ msgstr "" "Anvรคnd \"git <kommando> -- <sรถkvรคg>..\" fรถr att ange sรถkvรคgar som inte finns " "lokalt." -#: setup.c:186 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6643,12 +7614,12 @@ msgstr "" "Anvรคnd \"--\" fรถr att skilja sรถkvรคgar frรฅn revisioner, sรฅ hรคr:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:235 +#: setup.c:264 #, 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:254 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6659,92 +7630,96 @@ msgstr "" "Anvรคnd \"--\" fรถr att skilja sรถkvรคgar frรฅn revisioner, sรฅ hรคr:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:390 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "kan inte skapa arbetskatalog med felaktig konfiguration" -#: setup.c:394 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "funktionen mรฅste kรถras i en arbetskatalog" -#: setup.c:540 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Fรถrvรคntade git-arkivversion <= %d, hittade %d" -#: setup.c:548 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "okรคnda arkivutรถkningar hittades:" -#: setup.c:567 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "arkivversionen รคr 0, men utรถkningar som bara finns i v1 upptรคcktes:" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "fel vid รถppning av \"%s\"" -#: setup.c:569 +#: setup.c:702 #, 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:571 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "fel vid lรคsning av %s" -#: setup.c:573 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "ogiltigt gitfilformat: %s" -#: setup.c:575 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "ingen sรถkvรคg i gitfil: %s" -#: setup.c:577 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "inte ett git-arkiv: %s" -#: setup.c:676 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "\"$%s\" fรถr stor" -#: setup.c:690 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "inte ett git-arkiv: \"%s\"" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "kan inte byta katalog (chdir) till \"%s\"" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "kan inte gรฅ tillbaka till arbetskatalogen (cwd)" -#: setup.c:851 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status pรฅ \"%*ss%s%s\"" -#: setup.c:1083 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "Kan inte lรคsa aktuell arbetskatalog" -#: setup.c:1092 setup.c:1098 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "kan inte byta till \"%s\"" -#: setup.c:1103 +#: setup.c:1245 #, 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:1109 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6754,7 +7729,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgrรคns (GIT_DISCOVERY_ACROSS_FILESYSTEM รคr inte satt)." -#: setup.c:1220 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6763,283 +7738,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:1264 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "misslyckades รถppna /dev/null eller \"dup\"" -#: setup.c:1279 +#: setup.c:1424 msgid "fork failed" msgstr "\"fork\" misslyckades" -#: setup.c:1284 +#: setup.c:1429 msgid "setsid failed" msgstr "\"setsid\" misslyckades" -#: sha1-file.c:453 +#: sha1-file.c:470 #, 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:504 +#: sha1-file.c:521 #, c-format msgid "unable to normalize alternate object path: %s" -msgstr "kunde inte normalisera alternativ objektsรถkvรคg: %s" +msgstr "kunde inte normalisera supplerande objektsรถkvรคg: %s" -#: sha1-file.c:576 +#: sha1-file.c:593 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s: ignorerar alternativa objektlagringar, fรถr djup nรคstling" +msgstr "%s: ignorerar supplerande objektlager, fรถr djup nรคstling" -#: sha1-file.c:583 +#: sha1-file.c:600 #, c-format msgid "unable to normalize object directory: %s" msgstr "kan inte normalisera objektkatalogen: %s" -#: sha1-file.c:626 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" -msgstr "kan inte utfรถra \"fdopen\" pรฅ lรฅsfil fรถr \"alternates\"" +msgstr "kan inte utfรถra \"fdopen\" pรฅ suppleantlรฅsfil" -#: sha1-file.c:644 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "kan inte lรคsa \"alternates\"-filen" -#: sha1-file.c:651 +#: sha1-file.c:668 msgid "unable to move new alternates file into place" msgstr "kan inte flytta ny \"alternates\"-fil pรฅ plats" -#: sha1-file.c:686 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "sรถkvรคgen \"%s\" finns inte" -#: sha1-file.c:712 +#: sha1-file.c:724 #, 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:718 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" รคr inte ett lokalt arkiv." -#: sha1-file.c:724 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" รคr grunt" -#: sha1-file.c:732 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" รคr ympat" -#: sha1-file.c:792 +#: sha1-file.c:804 #, c-format msgid "invalid line while parsing alternate refs: %s" -msgstr "felaktig rad vid tolkning av alternativa referenser: %s" +msgstr "felaktig rad vid tolkning av supplerande referenser: %s" -#: sha1-file.c:943 +#: sha1-file.c:954 #, 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:968 +#: sha1-file.c:975 msgid "mmap failed" msgstr "mmap misslyckades" -#: sha1-file.c:1132 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "objektfilen %s รคr tom" -#: sha1-file.c:1256 sha1-file.c:2395 +#: sha1-file.c:1274 sha1-file.c:2467 #, c-format msgid "corrupt loose object '%s'" msgstr "trasigt lรถst objekt \"%s\"" -#: sha1-file.c:1258 sha1-file.c:2399 +#: sha1-file.c:1276 sha1-file.c:2471 #, c-format msgid "garbage at end of loose object '%s'" msgstr "skrรคp i slutet av lรถst objekt \"%s\"" -#: sha1-file.c:1300 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "felaktig objekttyp" -#: sha1-file.c:1384 +#: sha1-file.c:1402 #, 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:1387 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "kan inte packa upp %s-huvudet" -#: sha1-file.c:1393 +#: sha1-file.c:1411 #, 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:1396 +#: sha1-file.c:1414 #, c-format msgid "unable to parse %s header" msgstr "kan inte tolka %s-huvud" -#: sha1-file.c:1587 +#: sha1-file.c:1641 #, c-format msgid "failed to read object %s" msgstr "misslyckades lรคsa objektet %s" -#: sha1-file.c:1591 +#: sha1-file.c:1645 #, c-format msgid "replacement %s not found for %s" msgstr "ersรคttningen %s hittades inte fรถr %s" -#: sha1-file.c:1595 +#: sha1-file.c:1649 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "lรถst objekt %s (lagrat i %s) รคr trasigt" -#: sha1-file.c:1599 +#: sha1-file.c:1653 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) รคr trasigt" -#: sha1-file.c:1702 +#: sha1-file.c:1758 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: sha1-file.c:1709 +#: sha1-file.c:1765 #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sรคtta behรถrigheten till \"%s\"" -#: sha1-file.c:1716 +#: sha1-file.c:1772 msgid "file write error" msgstr "fel vid skrivning av fil" -#: sha1-file.c:1735 +#: sha1-file.c:1792 msgid "error when closing loose object file" msgstr "fel vid stรคngning av fil fรถr lรถst objekt" -#: sha1-file.c:1800 +#: sha1-file.c:1857 #, 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:1802 +#: sha1-file.c:1859 msgid "unable to create temporary file" msgstr "kan inte skapa temporรคr fil" -#: sha1-file.c:1826 +#: sha1-file.c:1883 msgid "unable to write loose object file" msgstr "kunde inte skriva fil fรถr lรถst objekt" -#: sha1-file.c:1832 +#: sha1-file.c:1889 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "kan inte utfรถra \"deflate\" pรฅ nytt objekt %s (%d)" -#: sha1-file.c:1836 +#: sha1-file.c:1893 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" pรฅ objektet %s misslyckades (%d)" -#: sha1-file.c:1840 +#: sha1-file.c:1897 #, c-format msgid "confused by unstable object source data for %s" msgstr "fรถrvirrad av instabil objektkรคlldata fรถr %s" -#: sha1-file.c:1850 builtin/pack-objects.c:920 +#: sha1-file.c:1907 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades pรฅ %s" -#: sha1-file.c:1925 +#: sha1-file.c:1984 #, c-format msgid "cannot read object for %s" msgstr "kan inte lรคsa objekt fรถr %s" -#: sha1-file.c:1965 +#: sha1-file.c:2035 msgid "corrupt commit" msgstr "trasik incheckning" -#: sha1-file.c:1973 +#: sha1-file.c:2043 msgid "corrupt tag" msgstr "trasig tagg" -#: sha1-file.c:2072 +#: sha1-file.c:2143 #, c-format msgid "read error while indexing %s" msgstr "lรคsfel vid indexering av %s" -#: sha1-file.c:2075 +#: sha1-file.c:2146 #, c-format msgid "short read while indexing %s" msgstr "fรถr lite lรคstes vid indexering av %s" -#: sha1-file.c:2148 sha1-file.c:2157 +#: sha1-file.c:2219 sha1-file.c:2229 #, c-format msgid "%s: failed to insert into database" msgstr "%s: misslyckades lรคgga in i databasen" -#: sha1-file.c:2163 +#: sha1-file.c:2235 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stรถds ej" -#: sha1-file.c:2187 +#: sha1-file.c:2259 #, c-format msgid "%s is not a valid object" msgstr "%s รคr inte ett giltigt objekt" -#: sha1-file.c:2189 +#: sha1-file.c:2261 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s รคr inte ett giltigt \"%s\"-objekt" -#: sha1-file.c:2216 builtin/index-pack.c:155 +#: sha1-file.c:2288 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "kan inte รถppna %s" -#: sha1-file.c:2406 sha1-file.c:2458 +#: sha1-file.c:2478 sha1-file.c:2531 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash stรคmmer inte fรถr %s (fรถrvรคntade %s)" -#: sha1-file.c:2430 +#: sha1-file.c:2502 #, c-format msgid "unable to mmap %s" msgstr "kan inte utfรถra \"mmap\" fรถr %s" -#: sha1-file.c:2435 +#: sha1-file.c:2507 #, c-format msgid "unable to unpack header of %s" msgstr "kan inte packa upp huvud fรถr %s" -#: sha1-file.c:2441 +#: sha1-file.c:2513 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud fรถr %s" -#: sha1-file.c:2452 +#: sha1-file.c:2524 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehรฅll i %s" -#: sha1-name.c:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s รคr tvetydig" -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Kandidaterna รคr:" -#: sha1-name.c:800 +#: 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" @@ -7061,44 +8036,110 @@ 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:1702 +#, 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:1708 +#, 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:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "sรถkvรคgen \"%s\" finns inte i \"%.*s\"" + +#: sha1-name.c:1745 +#, 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:1761 +#, 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:1769 +#, 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:1771 +#, 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:1784 +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:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "felaktigt objektnamn \"%.*s\"." + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:848 #, c-format msgid "%u.%2.2u GiB" msgstr "%u,%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u,%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u MiB" msgstr "%u,%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u,%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:867 #, c-format msgid "%u.%2.2u KiB" msgstr "%u,%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u,%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:875 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7106,13 +8147,48 @@ msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:877 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" +msgstr "kunde inte รถppna \"%s\" fรถr skrivning" + +#: strbuf.c:1175 +#, c-format +msgid "could not edit '%s'" +msgstr "kunde inte redigera \"%s\"" + +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "ignorerar misstรคnkt undermodulnamn: %s" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "negativa vรคrden รคr inte tillรฅtna fรถr submodule.fetchjobs" + +#: submodule-config.c:402 +#, 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:499 +#, c-format +msgid "invalid value for %s" +msgstr "ogiltigt vรคrde fรถr %s" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "Kunde inte uppdatera .gitmodules-posten %s" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7143,51 +8219,127 @@ msgstr "i ej utcheckad undermodul \"%s\"" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sรถkvรคgsangivelsen \"%s\" รคr i undermodulen \"%.*s\"" -#: submodule.c:910 +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "felaktigt argument till --ignore-submodules: %s" + +#: submodule.c:816 +#, 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:919 #, 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:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1004 +#, 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:1127 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "process fรถr undermodulen \"%s\" misslyckades" + +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slรฅ upp HEAD som giltig referens." -#: submodule.c:1481 +#: submodule.c:1167 +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "Sรคnder undermodulen \"%s\"\n" + +#: submodule.c:1170 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "Kunde inte sรคnda undermodulen \"%s\"\n" + +#: submodule.c:1462 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "Hรคmtar undermodulen %s%s\n" + +#: submodule.c:1492 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "Kunde inte komma รฅt undermodulen \"%s\"\n" + +#: submodule.c:1646 #, c-format -msgid "Could not access submodule '%s'" -msgstr "kunde inte komma รฅt undermodulen \"%s\"" +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"Fel vid hรคmtning av undermodul:\n" +"%s" -#: submodule.c:1651 +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" kรคnns inte igen som ett git-arkiv" -#: submodule.c:1789 +#: submodule.c:1688 +#, 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:1729 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\"" + +#: submodule.c:1804 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1802 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte kรถra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1817 +#: submodule.c:1832 #, 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:1907 +#: submodule.c:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "kunde inte rekursera in i undermodulen \"%s\"" + +#: submodule.c:1880 +msgid "could not reset submodule index" +msgstr "kunde inte รฅterstรคlla indexet i undermodul" + +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1959 +#: submodule.c:1974 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Undermoduler \"%s\" kunde inte uppdateras." -#: submodule.c:2007 +#: submodule.c:2042 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "undermodul-gitkatalogen \"%s\" รคr inuti gitkatalogen \"%.*s\"" + +#: submodule.c:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7195,12 +8347,17 @@ msgstr "" "relocate_gitdir fรถr undermodulen \"%s\", som har mer รคn en arbetskatalog, " "stรถds ej" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slรฅ upp namnet fรถr undermodulen \"%s\"" -#: submodule.c:2026 +#: submodule.c:2079 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "vรคgrar flytta \"%s\" till en befintlig gitkatalog" + +#: submodule.c:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7211,205 +8368,83 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:2109 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "kunde inte rekursera in i undermodulen \"%s\"" - -#: submodule.c:2153 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2192 +#: submodule.c:2254 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en ovรคntad returkod %d" -#: submodule-config.c:232 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "ignorerar misstรคnkt undermodulnamn: %s" - -#: 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: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:486 -#, c-format -msgid "invalid value for %s" -msgstr "ogiltigt vรคrde fรถr %s" - -#: submodule-config.c:755 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "Kunde inte uppdatera .gitmodules-posten %s" - -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "misslyckades utfรถra \"trailer\"-kommandot \"%s\"" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format 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:295 +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "mer รคn en %s" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "tom slรคpradssymbol i slรคpraden \"%.*s\"" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "kunde inte lรคsa indatafilen \"%s\"" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "kunde inte lรคsa frรฅn standard in" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status pรฅ %s" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "filen %s รคr inte en normal fil" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "filen %s รคr inte skrivbar av anvรคndaren" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "kunde inte รถppna temporรคr fil" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "kunde inte byta namn pรฅ temporรคr fil till %s" -#: transport.c:116 -#, c-format -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:142 -#, c-format -msgid "could not read bundle '%s'" -msgstr "kunde inte lรคsa paketet (bundlen) \"%s\"" - -#: transport.c:208 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "transport: ogiltig flagga fรถr depth: \"%s\"" - -#: 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:260 -msgid "server options require protocol version 2 or later" -msgstr "serverflaggor krรคver protokollversion 2 eller senare" - -#: transport.c:625 -msgid "could not parse transport.color.* config" -msgstr "kunde inte tolka instรคllningen fรถr transport.color.*" - -#: transport.c:698 -msgid "support for protocol v2 not implemented yet" -msgstr "stรถd fรถr protokoll v2 รคnnu ej implementerat" - -#: 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:891 -#, c-format -msgid "transport '%s' not allowed" -msgstr "transporten \"%s\" tillรฅts inte" - -#: transport.c:945 -msgid "git-over-rsync is no longer supported" -msgstr "git-over-rsync stรถds inte lรคngre" - -#: transport.c:1040 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "" -"Fรถljande undermodulsรถkvรคgar innehรฅller รคndringar som\n" -"inte kan hittas av fjรคrrarna:\n" - -#: transport.c:1044 -#, 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" -"Testa\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"eller cd till sรถkvรคgen och anvรคnd\n" -"\n" -"\tgit push\n" -"\n" -"fรถr att sรคnda dem till fjรคrren.\n" -"\n" - -#: transport.c:1052 -msgid "Aborting." -msgstr "Avbryter." - -#: transport.c:1193 -msgid "failed to push all needed submodules" -msgstr "kunde inte sรคnda alla nรถdvรคndiga undermoduler" - -#: transport.c:1340 transport-helper.c:645 -msgid "operation not supported by protocol" -msgstr "funktionen stรถds inte av protokollet" - -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:62 transport-helper.c:91 msgid "full write to remote helper failed" msgstr "komplett skrivning till fjรคrrhjรคlpare misslyckades" -#: transport-helper.c:134 +#: transport-helper.c:145 #, c-format msgid "unable to find remote helper for '%s'" msgstr "kan inte hitta fjรคrrhjรคlpare fรถr \"%s\"" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" msgstr "kunde inte duplicera utdata-filhandtag" -#: transport-helper.c:201 +#: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7418,170 +8453,277 @@ msgstr "" "okรคnd krรคvd fรถrmรฅga (capability) %s; fjรคrrhjรคlparen behรถver antagligen en " "nyare version av Git" -#: transport-helper.c:207 +#: transport-helper.c:220 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:274 transport-helper.c:414 +#: transport-helper.c:287 transport-helper.c:429 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s sade ovรคntat: \"%s\"" -#: transport-helper.c:403 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "%s lรฅste ocksรฅ %s" -#: transport-helper.c:481 +#: transport-helper.c:497 msgid "couldn't run fast-import" msgstr "kunde inte kรถra fast-import" -#: transport-helper.c:504 +#: transport-helper.c:520 msgid "error while running fast-import" msgstr "fel nรคr fast-import kรถrdes" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:549 transport-helper.c:1226 #, c-format msgid "could not read ref %s" msgstr "kunde inte lรคsa referensen %s" -#: transport-helper.c:578 +#: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" msgstr "okรคnt svar pรฅ ansluntning: %s" -#: transport-helper.c:600 +#: transport-helper.c:616 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:602 +#: transport-helper.c:618 msgid "invalid remote service path" msgstr "felaktig sรถkvรคg till fjรคrrtjรคnst" -#: transport-helper.c:648 +#: transport-helper.c:661 transport.c:1428 +msgid "operation not supported by protocol" +msgstr "funktionen stรถds inte av protokollet" + +#: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" msgstr "kan inte ansluta till undertjรคnsten %s" -#: transport-helper.c:720 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "\"option\" utan matchande \"ok/error\"-direktiv" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "fรถrvรคntade ok/error, hjรคlpprogrammet svarade \"%s\"" -#: transport-helper.c:773 +#: transport-helper.c:841 #, c-format msgid "helper reported unexpected status of %s" msgstr "hjรคlparen returnerade ovรคntad status %s" -#: transport-helper.c:834 +#: transport-helper.c:924 #, c-format msgid "helper %s does not support dry-run" msgstr "hjรคlparen %s stรถder inte dry-run" -#: transport-helper.c:837 +#: transport-helper.c:927 #, c-format msgid "helper %s does not support --signed" msgstr "hjรคlparen %s stรถder inte --signed" -#: transport-helper.c:840 +#: transport-helper.c:930 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "hjรคlparen %s stรถder inte --signed=if-asked" -#: transport-helper.c:847 +#: transport-helper.c:935 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "hjรคlparen %s stรถder inte --atomic" + +#: transport-helper.c:941 #, c-format msgid "helper %s does not support 'push-option'" msgstr "hjรคlparen %s stรถder inte \"push-option\"" -#: transport-helper.c:945 +#: transport-helper.c:1040 msgid "remote-helper doesn't support push; refspec needed" msgstr "fjรคrrhjรคlparen stรถder inte push; referensspecifikation krรคvs" -#: transport-helper.c:950 +#: transport-helper.c:1045 #, c-format msgid "helper %s does not support 'force'" msgstr "hjรคlparen %s stรถder inte \"force\"" -#: transport-helper.c:997 +#: transport-helper.c:1092 msgid "couldn't run fast-export" msgstr "kunde inte kรถra fast-export" -#: transport-helper.c:1002 +#: transport-helper.c:1097 msgid "error while running fast-export" msgstr "fel vid kรถrning av fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1122 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" msgstr "" "Inga gemensamma referenser och inga angavs; gรถr inget.\n" -"Du kanske borde ange en gren sรฅsom \"master\".\n" +"Du kanske borde ange en gren.\n" -#: transport-helper.c:1091 +#: transport-helper.c:1203 +#, c-format +msgid "unsupported object format '%s'" +msgstr "objektformatet \"%s\" stรถds ej" + +#: transport-helper.c:1212 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1244 +#: transport-helper.c:1364 #, c-format msgid "read(%s) failed" msgstr "lรคs(%s) misslyckades" -#: transport-helper.c:1271 +#: transport-helper.c:1391 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1320 +#: transport-helper.c:1440 #, c-format msgid "%s thread failed" msgstr "%s-trรฅden misslyckades" -#: transport-helper.c:1324 +#: transport-helper.c:1444 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-trรฅden misslyckades ansluta: %s" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1463 transport-helper.c:1467 #, 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:1384 +#: transport-helper.c:1504 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vรคnta" -#: transport-helper.c:1388 +#: transport-helper.c:1508 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1526 transport-helper.c:1535 msgid "can't start thread for copying data" msgstr "kan inte skapa trรฅd fรถr kopiering av data" -#: tree-walk.c:33 +#: transport.c:116 +#, c-format +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 +#, c-format +msgid "could not read bundle '%s'" +msgstr "kunde inte lรคsa paketet (bundlen) \"%s\"" + +#: transport.c:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport: ogiltig flagga fรถr depth: \"%s\"" + +#: transport.c:269 +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:270 +msgid "server options require protocol version 2 or later" +msgstr "serverflaggor krรคver protokollversion 2 eller senare" + +#: transport.c:712 +msgid "could not parse transport.color.* config" +msgstr "kunde inte tolka instรคllningen fรถr transport.color.*" + +#: transport.c:785 +msgid "support for protocol v2 not implemented yet" +msgstr "stรถd fรถr protokoll v2 รคnnu ej implementerat" + +#: transport.c:919 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "okรคnt vรคrde fรถr instรคllningen \"%s\": %s" + +#: transport.c:985 +#, c-format +msgid "transport '%s' not allowed" +msgstr "transporten \"%s\" tillรฅts inte" + +#: transport.c:1038 +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync stรถds inte lรคngre" + +#: transport.c:1140 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"Fรถljande undermodulsรถkvรคgar innehรฅller รคndringar som\n" +"inte kan hittas av fjรคrrarna:\n" + +#: transport.c:1144 +#, 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" +"Testa\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"eller cd till sรถkvรคgen och anvรคnd\n" +"\n" +"\tgit push\n" +"\n" +"fรถr att sรคnda dem till fjรคrren.\n" +"\n" + +#: transport.c:1152 +msgid "Aborting." +msgstr "Avbryter." + +#: transport.c:1297 +msgid "failed to push all needed submodules" +msgstr "kunde inte sรคnda alla nรถdvรคndiga undermoduler" + +#: tree-walk.c:32 msgid "too-short tree object" msgstr "trรคdobjekt fรถr kort" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "felformat lรคge i trรคdpost" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "tomt filnamn i trรคdpost" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "trรคdfil fรถr kort" -#: unpack-trees.c:111 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7590,7 +8732,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:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7599,7 +8741,7 @@ msgstr "" "Dina lokala รคndringar av fรถljande filer skulle skrivas รถver av utcheckning:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7609,7 +8751,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina รคndringar eller anvรคnd \"stash\" innan du byter gren." -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7619,7 +8761,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7628,7 +8770,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:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7637,7 +8779,7 @@ msgstr "" "Dina lokala รคndringar av fรถljande filer skulle skrivas รถver av \"%s\":\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7647,7 +8789,7 @@ msgstr "" "dem:\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7656,7 +8798,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:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7665,7 +8807,7 @@ msgstr "" "Fรถljande ospรฅrade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7675,7 +8817,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slรฅr samman." -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7685,7 +8827,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7694,7 +8836,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:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7703,7 +8845,7 @@ msgstr "" "Fรถljande ospรฅrade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7714,7 +8856,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7725,7 +8867,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7735,7 +8877,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7745,7 +8887,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7754,7 +8896,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:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7763,61 +8905,70 @@ msgstr "" "Fรถljande ospรฅrade filer i arbetskatalogen skulle skrivas รถver av \"%s\":\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" รถverlappar \"%s\". Kan inte binda." -#: unpack-trees.c:173 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -"Kan inte uppdatera gles utcheckning: fรถljande poster รคr inte ร jour:\n" +"Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"Fรถljande filer i arbetskatalogen skulle skrivas รถver av uppdatering av gles " -"utcheckning:\n" +"Fรถljande sรถkvรคgar รคr inte ร jour och lรคmnades till trots fรถr gles-mรถnster:\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"Fรถljande filer i arbetskatalogen skulle tas bort av uppdatering av gles " -"utcheckning:\n" +"Fรถljande sรถkvรคgar har inte slagits ihop och lรคmnades till trots fรถr gles-" +"mรถnster:\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"Kan inte uppdatera undermodul:\n" +"Fรถljande sรถkvรคgar fanns redan och har dรคrfรถr inte uppdaterats till trots fรถr " +"gles-mรถnster:\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:318 +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" +"Du bรถr kรถra \"git sparse-checkout reapply\" efter att ha fixat sรถkvรคgarna " +"ovan.\n" + +#: unpack-trees.c:350 msgid "Updating files" msgstr "Uppdaterar filer" -#: unpack-trees.c:350 +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7827,6 +8978,14 @@ msgstr "" "sรถkvรคgar pรฅ ett okรคnsligt filsystem) och endast en frรฅn samma\n" "kollisionsgrupp finns i arbetskatalogen:\n" +#: unpack-trees.c:1498 +msgid "Updating index flags" +msgstr "Uppdaterar indexflaggor" + +#: upload-pack.c:1516 +msgid "expected flush after fetch arguments" +msgstr "fรถrvรคntade \"flush\" efter \"fetch\"-argument" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix" @@ -7856,47 +9015,87 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sรถkvรคgssegment" -#: worktree.c:258 builtin/am.c:2095 +#: walker.c:170 +msgid "Fetching objects" +msgstr "Hรคmtar objekt" + +#: worktree.c:236 builtin/am.c:2116 #, c-format msgid "failed to read '%s'" msgstr "misslyckades lรคsa \"%s\"" -#: worktree.c:304 +#: worktree.c:283 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "\"%s\" i huvudarbetskatalogen รคr inte arkivkatalogen" -#: worktree.c:315 +#: worktree.c:294 #, 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:327 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "\"%s\" finns inte" -#: worktree.c:333 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "\"%s\" รคr inte en .git-fil, felkod %d" -#: worktree.c:341 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "\"%s\" pekar inte tillbaka till \"%s\"" -#: wrapper.c:223 wrapper.c:393 +#: worktree.c:587 +msgid "not a directory" +msgstr "inte en katalog" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr ".git รคr inte en fil" + +#: worktree.c:598 +msgid ".git file broken" +msgstr ".git-filen รคr trasig" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr ".git-filen รคr felaktig" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "inte en giltig sรถkvรคg" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "hittar inte arkivet; .git รคr inte en fil" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "hittar inte arkivet; .git-filen รคr trasig" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "gitdir รคr olรคsbar" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "gitdir รคr felaktig" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "kunde inte รถppna \"%s\" fรถr lรคsning och skrivning" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma รฅt \"%s\"" -#: wrapper.c:632 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "kan inte hรคmta aktuell arbetskatalog" @@ -7931,23 +9130,23 @@ msgstr " (anvรคnd \"git add/rm <fil>...\" som lรคmpligt fรถr att ange lรถsning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (anvรคnd \"git rm <fil>...\" fรถr att ange lรถsning)" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "รndringar att checka in:" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" 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 skall checkas in)" +" (anvรคnd \"git add <fil>...\" fรถr att uppdatera vad som ska 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 skall checkas in)" +" (anvรคnd \"git add/rm <fil>...\" fรถr att uppdatera vad som ska checkas in)" #: wt-status.c:241 msgid "" @@ -7964,97 +9163,96 @@ msgstr "" #: wt-status.c:254 #, 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 skall checkas in)" +msgstr " (anvรคnd \"git %s <fil>...\" fรถr att ta med i det som ska checkas in)" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "borttaget av bรคgge:" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "tillagt av bรคgge:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "รคndrat av bรคgge:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "ny fil:" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "kopierad:" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "borttagen:" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "รคndrad:" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "namnbytt:" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "typbyte:" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "okรคnd:" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "osammanslagen:" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "รคndrat innehรฅll, " -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "ospรฅrat innehรฅll, " -#: wt-status.c:906 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Stashen innehรฅller just nu %d post" msgstr[1] "Stashen innehรฅller just nu %d poster" -#: wt-status.c:938 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "Undermoduler รคndrade men inte uppdaterade:" -#: wt-status.c:940 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "Undermodulers รคndringar att checka in:" -#: wt-status.c:1022 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -8062,7 +9260,7 @@ msgstr "" "Raden ovan fรฅr inte รคndras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1114 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -8073,107 +9271,107 @@ msgstr "" "Det tog %.2f sekunder att rรคkna fรถre/bakom-vรคrden.\n" "Du kan anvรคnda \"--no-ahead-behind\" fรถr undvika detta.\n" -#: wt-status.c:1144 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sรถkvรคgar." -#: wt-status.c:1147 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr " (rรคtta konflikter och kรถr \"git commit\")" -#: wt-status.c:1149 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (anvรคnd \"git merge --abort\" fรถr att avbryta sammanslagningen)" -#: wt-status.c:1153 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rรคttats men du รคr fortfarande i en sammanslagning." -#: wt-status.c:1156 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr " (anvรคnd \"git commit\" fรถr att slutfรถra sammanslagningen)" -#: wt-status.c:1165 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "Du รคr i mitten av en kรถrning av \"git am\"." -#: wt-status.c:1168 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "Aktuell patch รคr tom." -#: wt-status.c:1172 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rรคtta konflikter och kรถr sedan \"git am --continue\")" -#: wt-status.c:1174 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (anvรคnd \"git am --skip\" fรถr att hoppa รถver patchen)" -#: wt-status.c:1176 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (anvรคnd \"git am --abort\" fรถr att รฅterstรคlla ursprungsgrenen)" -#: wt-status.c:1309 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1311 +#: wt-status.c:1307 msgid "No commands done." msgstr "Inga kommandon utfรถrda." -#: wt-status.c:1314 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Sista kommandot utfรถrt (%d kommando utfรถrt):" msgstr[1] "Sista kommandot utfรถrt (%d kommandon utfรถrt):" -#: wt-status.c:1325 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1330 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "Inga kommandon รฅterstรฅr." -#: wt-status.c:1333 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nรคsta kommando att utfรถra (%d kommando รฅterstรฅr):" msgstr[1] "Fรถljande kommandon att utfรถra (%d kommandon รฅterstรฅr):" -#: wt-status.c:1341 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (anvรคnd \"git rebase --edit-todo\" fรถr att visa och redigera)" -#: wt-status.c:1353 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du hรฅller pรฅ att ombasera grenen \"%s\" ovanpรฅ \"%s\"." -#: wt-status.c:1358 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "Du hรฅller pรฅ med en ombasering." -#: wt-status.c:1371 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rรคtta konflikter och kรถr sedan \"git rebase --continue\")" -#: wt-status.c:1373 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (anvรคnd \"git rebase --skip\" fรถr att hoppa รถver patchen)" -#: wt-status.c:1375 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (anvรคnd \"git rebase --abort\" fรถr att checka ut ursprungsgrenen)" -#: wt-status.c:1382 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rรคttade: kรถr \"git rebase --continue\")" -#: wt-status.c:1386 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -8181,83 +9379,91 @@ msgstr "" "Du hรฅller pรฅ att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpรฅ \"%s\"." -#: wt-status.c:1391 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "Du hรฅller pรฅ att dela upp en incheckning i en ombasering." -#: wt-status.c:1394 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Sรฅ fort din arbetskatalog รคr ren, kรถr \"git rebase --continue\")" -#: wt-status.c:1398 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du hรฅller pรฅ att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpรฅ \"%s\"." -#: wt-status.c:1403 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "Du hรฅller pรฅ att redigera en incheckning under en ombasering." -#: wt-status.c:1406 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (anvรคnd \"git commit --amend\" fรถr att lรคgga till pรฅ aktuell incheckning)" -#: wt-status.c:1408 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (anvรคnd \"git rebase --continue\" nรคr du รคr nรถjd med dina รคndringar)" -#: wt-status.c:1419 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick pรฅgรฅr." -#: wt-status.c:1422 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du hรฅller pรฅ med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1429 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rรคtta konflikter och kรถr sedan \"git cherry-pick --continue\")" -#: wt-status.c:1432 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (kรถr \"git cherry-pick --continue\" fรถr att fortsรคtta)" -#: wt-status.c:1435 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rรคttade: kรถr \"git cherry-pick --continue\")" -#: wt-status.c:1437 +#: wt-status.c:1433 +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:1435 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:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "ร ngring pรฅgรฅr." -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "Du hรฅller pรฅ med att รฅngra incheckningen %s." -#: wt-status.c:1456 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rรคtta konflikter och kรถr sedan \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr " (kรถr \"git revert --continue\" fรถr att fortsรคtta)" -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rรคttade: kรถr \"git revert --continue\")" +#: wt-status.c:1462 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (anvรคnd \"git revert --skip\" fรถr att hoppa รถver patchen)" + #: 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)" @@ -8276,39 +9482,44 @@ 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:1690 +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "Du รคr i en gles utcheckning med %d%% spรฅrade filer pรฅ plats." + +#: wt-status.c:1731 msgid "On branch " msgstr "Pรฅ grenen " -#: wt-status.c:1697 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pรฅgรฅr; ovanpรฅ " -#: wt-status.c:1699 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "ombasering pรฅgรฅr; ovanpรฅ " -#: wt-status.c:1709 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "Inte pรฅ nรฅgon gren fรถr nรคrvarande." -#: wt-status.c:1726 +#: wt-status.c:1767 msgid "Initial commit" msgstr "Fรถrsta incheckning" -#: wt-status.c:1727 +#: wt-status.c:1768 msgid "No commits yet" msgstr "Inga incheckningar รคnnu" -#: wt-status.c:1741 +#: wt-status.c:1782 msgid "Untracked files" msgstr "Ospรฅrade filer" -#: wt-status.c:1743 +#: wt-status.c:1784 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1747 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8320,32 +9531,32 @@ msgstr "" "lรคgga till nya filer sjรคlv (se \"git help status\")." # %s รคr nรคsta strรคng eller tom. -#: wt-status.c:1753 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "Ospรฅrade filer visas ej%s" -#: wt-status.c:1755 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr " (anvรคnd flaggan -u fรถr att visa ospรฅrade filer)" -#: wt-status.c:1761 +#: wt-status.c:1802 msgid "No changes" msgstr "Inga รคndringar" -#: wt-status.c:1766 +#: wt-status.c:1807 #, 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:1769 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "inga รคndringar att checka in\n" -#: wt-status.c:1772 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8354,186 +9565,195 @@ msgstr "" "inget kรถat fรถr incheckning, men ospรฅrade filer finns (spรฅra med \"git add" "\")\n" -#: wt-status.c:1775 +#: wt-status.c:1819 #, 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:1778 +#: wt-status.c:1823 #, 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:1781 wt-status.c:1786 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1784 +#: wt-status.c:1830 #, 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:1788 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1901 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "Inga incheckningar รคnnu pรฅ " -#: wt-status.c:1905 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1936 +#: wt-status.c:1975 msgid "different" msgstr "olika" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "efter " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "fรถre " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har okรถade รคndringar." -#: wt-status.c:2472 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehรฅller dit index รคndringar som inte har checkats in." -#: wt-status.c:2474 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehรฅller รคndringar som inte checkats in." -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#, c-format +msgid "failed to unlink '%s'" +msgstr "misslyckades ta bort lรคnken \"%s\"" + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sรถkvรคg>..." -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c fรถrvรคntades inte" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Okรถade รคndringar efter att ha uppdaterat indexet:" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:272 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "Kunde inte lรคsa indexet" -#: builtin/add.c:245 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte รถppna \"%s\" fรถr skrivning." -#: builtin/add.c:249 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:252 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:255 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status pรฅ \"%s\"" -#: builtin/add.c:257 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:262 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillรคmpa \"%s\"" -#: builtin/add.c:270 +#: builtin/add.c:308 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: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 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 msgid "dry run" msgstr "testkรถrning" -#: builtin/add.c:293 +#: builtin/add.c:331 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 msgid "select hunks interactively" msgstr "vรคlj stycken interaktivt" -#: builtin/add.c:295 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:296 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "tillรฅt lรคgga till annars ignorerade filer" -#: builtin/add.c:297 +#: builtin/add.c:335 msgid "update tracked files" msgstr "uppdatera spรฅrade filer" -#: builtin/add.c:298 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "รฅternormalisera radslut i spรฅrade filer (implicerar -u)" -#: builtin/add.c:299 +#: builtin/add.c:337 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:300 +#: builtin/add.c:338 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:303 +#: builtin/add.c:341 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:305 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "lรคgg inte till, uppdatera endast indexet" -#: builtin/add.c:306 +#: builtin/add.c:344 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:307 +#: builtin/add.c:345 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - รคven saknade - filer ignoreras i testkรถrning" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "รถverstyr exekveringsbiten fรถr angivna filer" -#: builtin/add.c:311 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "varna nรคr ett inbyggt arkiv lรคggs till" -#: builtin/add.c:326 +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "bakรคnda fรถr \"git stash -p\"" + +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8564,150 +9784,179 @@ msgstr "" "\n" "Se \"git help submodule\" fรถr ytterligare information." -#: builtin/add.c:354 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "lรคgger till inbรคddat git-arkiv: %s" -#: 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:416 +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:379 +#: builtin/add.c:425 msgid "adding files failed" msgstr "misslyckades lรคgga till filer" -#: builtin/add.c:419 +#: builtin/add.c:453 builtin/commit.c:345 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--pathspec-from-file รคr inkompatibelt med --interactive/--patch" + +#: builtin/add.c:470 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file รคr inkompatibelt med --edit" + +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "-A och -u รคr รถmsesidigt inkompatibla" -#: builtin/add.c:426 +#: builtin/add.c:485 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:430 +#: builtin/add.c:489 #, 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:445 +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "--pathspec-from-file รคr inkompatibelt med sรถkvรคgsangivelsesparametrar" + +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul krรคver --pathspec-from-file" + +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:446 +#: builtin/add.c:520 +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/am.c:160 #, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Kanske menade du att skriva \"git add .\"?\n" +msgid "invalid committer: %s" +msgstr "ogiltig incheckare: %s" -#: builtin/am.c:348 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "kunde inte tolka fรถrfattarskript" -#: builtin/am.c:432 +#: builtin/am.c:450 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:474 +#: builtin/am.c:492 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:512 +#: builtin/am.c:530 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar frรฅn \"%s\" till \"%s\"" -#: builtin/am.c:538 +#: builtin/am.c:556 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:726 +#: builtin/am.c:744 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:791 +#: builtin/am.c:809 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:839 +#: builtin/am.c:857 msgid "invalid timestamp" msgstr "ogiltig tidsstรคmpel" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:862 builtin/am.c:874 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:851 +#: builtin/am.c:869 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:944 +#: builtin/am.c:962 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:967 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:954 +#: builtin/am.c:972 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "kan inte skriva indexfil" - -#: builtin/am.c:1098 +#: builtin/am.c:1103 #, 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:1099 +#: builtin/am.c:1104 #, 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:1100 +#: builtin/am.c:1105 #, 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:1183 +#: builtin/am.c:1188 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:1211 +#: builtin/am.c:1216 msgid "Patch is empty." msgstr "Patchen รคr tom." -#: builtin/am.c:1277 +#: builtin/am.c:1281 #, c-format -msgid "invalid ident line: %.*s" -msgstr "ogiltig ident-rad: %.*s" +msgid "missing author line in commit %s" +msgstr "saknad \"author\"-rad i incheckningen %s" -#: builtin/am.c:1299 +#: builtin/am.c:1284 #, c-format -msgid "unable to parse commit %s" -msgstr "kunde inte tolka incheckningen %s" +msgid "invalid ident line: %.*s" +msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1503 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:1498 +#: builtin/am.c:1505 msgid "Using index info to reconstruct a base tree..." msgstr "Anvรคnder indexinfo fรถr att รฅterskapa ett bastrรคd..." -#: builtin/am.c:1517 +#: builtin/am.c:1524 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8715,25 +9964,25 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillรคmpas pรฅ blobbar som antecknats i dess index." -#: builtin/am.c:1523 +#: builtin/am.c:1530 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka pรฅ att patcha grundversionen och trevรคgssammanslagning..." -#: builtin/am.c:1549 +#: builtin/am.c:1556 msgid "Failed to merge in the changes." msgstr "Misslyckades slรฅ ihop รคndringarna." -#: builtin/am.c:1581 +#: builtin/am.c:1588 msgid "applying to an empty history" msgstr "tillรคmpar pรฅ en tom historik" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1639 builtin/am.c:1643 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte รฅteruppta: %s finns inte." -#: builtin/am.c:1650 +#: builtin/am.c:1661 msgid "Commit Body is:" msgstr "Incheckningskroppen รคr:" @@ -8741,36 +9990,41 @@ msgstr "Incheckningskroppen รคr:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1671 #, 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:1710 +#: builtin/am.c:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "kan inte skriva indexfil" + +#: builtin/am.c:1721 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillรคmpa patchar (smutsiga: %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1761 builtin/am.c:1829 #, c-format msgid "Applying: %.*s" msgstr "Tillรคmpar: %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1778 msgid "No changes -- Patch already applied." msgstr "Inga รคndringar -- Patchen har redan tillรคmpats." -#: builtin/am.c:1773 +#: builtin/am.c:1784 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades pรฅ %s %.*s" -#: builtin/am.c:1777 -msgid "Use 'git am --show-current-patch' to see the failed patch" +#: builtin/am.c:1788 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -"Anvรคnd \"git am --show-current-patch\" fรถr att se patchen som misslyckades" +"Anvรคnd \"git am --show-current-patch=diff\" fรถr att se patchen som " +"misslyckades" -#: builtin/am.c:1821 +#: builtin/am.c:1832 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8780,7 +10034,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:1828 +#: builtin/am.c:1839 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8792,17 +10046,17 @@ msgstr "" "lรถsta.\n" "Du kan kรถra \"git rm\" fรถr att godta \"borttagen av dem\" fรถr den." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"." -#: builtin/am.c:1987 +#: builtin/am.c:1998 msgid "failed to clean index" msgstr "misslyckades stรคda upp indexet" -#: builtin/am.c:2031 +#: builtin/am.c:2042 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8810,143 +10064,155 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "ร terstรคller inte till ORIG_HEAD" -#: builtin/am.c:2128 +#: builtin/am.c:2149 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt vรคrde fรถr --patch-format: %s" -#: builtin/am.c:2164 +#: builtin/am.c:2191 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "Felaktigt vรคrde fรถr --show-current-patch: %s" + +#: builtin/am.c:2195 +#, 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:2226 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2165 +#: builtin/am.c:2227 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2233 msgid "run interactively" msgstr "kรถr interaktivt" -#: builtin/am.c:2173 +#: builtin/am.c:2235 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2175 +#: builtin/am.c:2237 msgid "allow fall back on 3way merging if needed" msgstr "tillรฅt falla tillbaka pรฅ trevรคgssammanslagning om nรถdvรคndigt" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:307 builtin/stash.c:806 +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2178 +#: builtin/am.c:2240 msgid "add a Signed-off-by line to the commit message" msgstr "lรคgg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2181 +#: builtin/am.c:2243 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2183 +#: builtin/am.c:2245 msgid "pass -k flag to git-mailinfo" msgstr "sรคnd flaggan -k till git-mailinfo" -#: builtin/am.c:2185 +#: builtin/am.c:2247 msgid "pass -b flag to git-mailinfo" msgstr "sรคnd flaggan -b till git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2249 msgid "pass -m flag to git-mailinfo" msgstr "sรคnd flaggan -m till git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2251 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:2192 +#: builtin/am.c:2254 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:2195 +#: builtin/am.c:2257 msgid "strip everything before a scissors line" msgstr "ta bort allting fรถre en saxlinje" -#: 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 +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 msgid "pass it through git-apply" msgstr "sรคnd det genom git-apply" -#: 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:141 parse-options.h:162 parse-options.h:312 +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: 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 +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2221 +#: builtin/am.c:2283 msgid "format the patch(es) are in" msgstr "format fรถr patch(ar)" -#: builtin/am.c:2227 +#: builtin/am.c:2289 msgid "override error message when patch failure occurs" msgstr "รถverstyr felmeddelanden nรคr patchfel uppstรฅr" -#: builtin/am.c:2229 +#: builtin/am.c:2291 msgid "continue applying patches after resolving a conflict" msgstr "fortsรคtt applicera patchar efter att ha lรถst en konflikt" -#: builtin/am.c:2232 +#: builtin/am.c:2294 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2297 msgid "skip the current patch" msgstr "hoppa รถver den aktuella grenen" -#: builtin/am.c:2238 +#: builtin/am.c:2300 msgid "restore the original branch and abort the patching operation." msgstr "รฅterstรคll originalgrenen och avbryt patchningen." -#: builtin/am.c:2241 +#: builtin/am.c:2303 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:2244 -msgid "show the patch being applied." -msgstr "visa patchen som tillรคmpas." +#: builtin/am.c:2307 +msgid "show the patch being applied" +msgstr "visa patchen som tillรคmpas" -#: builtin/am.c:2248 +#: builtin/am.c:2312 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2250 +#: builtin/am.c:2314 msgid "use current timestamp for author date" msgstr "anvรคnd nuvarande tidsstรคmpel fรถr fรถrfattardatum" -#: 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 +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2256 +#: builtin/am.c:2320 msgid "(internal use for git-rebase)" msgstr "(anvรคnds internt av git-rebase)" -#: builtin/am.c:2274 +#: builtin/am.c:2338 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." @@ -8954,16 +10220,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:2281 +#: builtin/am.c:2345 msgid "failed to read the index" msgstr "misslyckades lรคsa indexet" -#: builtin/am.c:2296 +#: builtin/am.c:2360 #, 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:2320 +#: builtin/am.c:2384 #, c-format msgid "" "Stray %s directory found.\n" @@ -8972,11 +10238,11 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Anvรคnd \"git am --abort\" fรถr att ta bort den." -#: builtin/am.c:2326 +#: builtin/am.c:2390 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lรถsningsoperation pรฅgรฅr inte, vi รฅterupptar inte." -#: builtin/am.c:2336 +#: builtin/am.c:2400 msgid "interactive mode requires patches on the command line" msgstr "interaktivt lรคge krรคver patchar pรฅ kommandoraden" @@ -9014,23 +10280,23 @@ msgstr "git archive: protokollfel" msgid "git archive: expected a flush" msgstr "git archive: fรถrvรคntade en tรถmning (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 --next-all" +msgstr "git bisect--helper --next-all" + +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "git bisect--helper --write-terms <term-fรถr-fel> <term-fรถr-rรคtt>" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:25 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<incheckning>]" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" @@ -9038,7 +10304,7 @@ msgstr "" "git bisect--helper --bisect-write [--no-log] <tillstรฅnd> <revision> <term-" "fรถr-rรคtt> <term-fรถr-fel>" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:28 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" @@ -9046,12 +10312,12 @@ msgstr "" "git bisect--helper --bisect-check-and-set-terms <kommadno> <term-fรถr-rรคtt> " "<term-fรถr-fel>" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" "git bisect--helper --bisect-next-check <term-fรถr-rรคtt> <term-fรถr-fel> <eterm>" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:30 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -9059,48 +10325,68 @@ msgstr "" "git-bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:31 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<fel> [<rรคtt>...]] [--] [<sรถkvรคgar>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<dรฅlig> [<bra>...]] [--] " +"[<sรถkvรคgar>...]" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-auto-next" + +#: builtin/bisect--helper.c:35 +msgid "git bisect--helper --bisect-autostart" +msgstr "git bisect--helper --bisect-autostart" + +#: builtin/bisect--helper.c:97 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "kan inte kopiera filen \"%s\" i lรคget \"%s\"" + +#: builtin/bisect--helper.c:104 +#, c-format +msgid "could not write to file '%s'" +msgstr "kunde inte skriva till filen \"%s\"" + +#: builtin/bisect--helper.c:143 #, c-format msgid "'%s' is not a valid term" msgstr "\"%s\" รคr inte en giltig term" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:147 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "kan inte anvรคnda det inbyggda kommandot \"%s\" som term" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "kan inte รคndra betydelsen av termen \"%s\"" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:167 msgid "please use two different terms" msgstr "termerna mรฅste vara olika" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "kunde inte รถppna filen BISECT_TERMS" - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:207 #, c-format msgid "We are not bisecting.\n" msgstr "Vi utfรถr ingen bisect fรถr tillfรคllet.\n" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:215 #, c-format msgid "'%s' is not a valid commit" msgstr "\"%s\" รคr inte en giltig incheckning" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:224 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -9108,27 +10394,27 @@ msgstr "" "Kunde inte checka ut original-HEAD \"%s\". Fรถrsรถk \"git bisect reset " "<incheckning>\"." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:268 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Felaktigt argument till bisect_write: %s" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:273 #, 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:232 +#: builtin/bisect--helper.c:285 #, c-format msgid "couldn't open the file '%s'" msgstr "kunde inte รถppna filen \"%s\"" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:311 #, 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:285 +#: builtin/bisect--helper.c:338 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9137,7 +10423,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:289 +#: builtin/bisect--helper.c:342 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9148,7 +10434,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:321 +#: builtin/bisect--helper.c:362 #, c-format msgid "bisecting only with a %s commit" msgstr "utfรถr bisect med endast en %s incheckning" @@ -9157,15 +10443,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:329 +#: builtin/bisect--helper.c:370 msgid "Are you sure [Y/n]? " msgstr "รr du sรคker [Y=ja/N=nej]? " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:431 msgid "no terms defined" msgstr "inga termer angivna" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:434 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9174,7 +10460,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:389 +#: builtin/bisect--helper.c:444 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9183,115 +10469,162 @@ 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:475 +#: builtin/bisect--helper.c:511 +msgid "revision walk setup failed\n" +msgstr "misslyckades starta revisionstraversering\n" + +#: builtin/bisect--helper.c:533 +#, c-format +msgid "could not open '%s' for appending" +msgstr "kunde inte รถppna \"%s\" fรถr tillรคgg" + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +msgid "'' is not a valid term" +msgstr "\"\" รคr inte en giltig term" + +#: builtin/bisect--helper.c:674 #, c-format msgid "unrecognized option: '%s'" msgstr "okรคnd flagga: %s" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:678 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "\"%s\" verkar inte vara en giltig revision" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:709 msgid "bad HEAD - I need a HEAD" msgstr "felaktigt HEAD - Jag behรถver ett HEAD" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:724 #, 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:547 +#: builtin/bisect--helper.c:745 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:550 +#: builtin/bisect--helper.c:748 msgid "bad HEAD - strange symbolic ref" msgstr "felaktigt HEAD - konstig symbolisk referens" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:775 #, c-format msgid "invalid ref: '%s'" msgstr "ogiltig referens: \"%s\"" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:827 +msgid "You need to start by \"git bisect start\"\n" +msgstr "Du mรฅste starta med \"git bisect start\"\n" + +#. 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:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Vill du att jag ska gรถra det รฅt dig [Y=ja/N=nej]? " + +#: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'" msgstr "utfรถr 'git bisect next'" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:868 msgid "write the terms to .git/BISECT_TERMS" msgstr "skriv termerna i .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:870 msgid "cleanup the bisection state" msgstr "stรคdar upp bisect-tillstรฅnd" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:872 msgid "check for expected revs" msgstr "kontrollera fรถr fรถrvรคntade versioner" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:874 msgid "reset the bisection state" msgstr "รฅterstรคll bisect-tillstรฅnd" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:876 msgid "write out the bisection state in BISECT_LOG" msgstr "skriver bisect-tillstรฅndet i BISECT_LOG" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:878 msgid "check and set terms in a bisection state" msgstr "visa och ange termer fรถr bisect-tillstรฅnd" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:880 msgid "check whether bad or good terms exist" msgstr "se efter om termer fรถr rรคtt och fel finns" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:882 msgid "print out the bisect terms" msgstr "skriv ut termer fรถr bisect" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:884 msgid "start the bisect session" msgstr "pรฅbรถrja bisect-kรถrningen" -#: 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:886 +msgid "find the next bisection commit" +msgstr "hitta nรคsta incheckning i bisect" + +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" +msgstr "" +"kontrollera nรคsta bisect-tillstรฅnd och checka sรฅ ut nรคsta bisect-incheckning" + +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "pรฅbรถrja bisect om det inte redan har startats" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:892 msgid "no log for BISECT_WRITE" msgstr "ingen logg fรถr BISECT_WRITE" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:910 msgid "--write-terms requires two arguments" msgstr "--write-terms krรคver tvรฅ argument" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:914 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state tar inga argument" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:921 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:684 +#: builtin/bisect--helper.c:925 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write krรคver antingen 4 eller 5 argument" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:931 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms krรคver tre argument" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:937 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check krรคver 2 eller 3 argument" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:943 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms krรคver noll eller ett argument" +#: builtin/bisect--helper.c:952 +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next krรคver 0 argument" + +#: builtin/bisect--helper.c:958 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--bisect-auto-next krรคver 0 argument" + +#: builtin/bisect--helper.c:964 +msgid "--bisect-autostart does not accept arguments" +msgstr "--bisect-autostart tar inga argument" + #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" @@ -9318,132 +10651,128 @@ msgstr "felaktig fรคrg \"%s\" i color.blame.repeatedLines" msgid "invalid value for blame.coloring" msgstr "ogiltigt vรคrde fรถr blame.coloring" -#: builtin/blame.c:823 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "kan inte hitta revision %s att ignorera" -#: builtin/blame.c:845 +#: builtin/blame.c:867 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter nรคr vi hittar dem, interaktivt" -#: 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:868 +msgid "Do not show object names of boundary commits (Default: off)" +msgstr "Visa inte objektnamn fรถr grรคnsincheckningar (Standard: av)" -#: builtin/blame.c:847 +#: builtin/blame.c:869 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som grรคnser (Standard: av)" -#: builtin/blame.c:848 +#: builtin/blame.c:870 msgid "Show work cost statistics" msgstr "Visa statistik รถver arbetskostnad" -#: builtin/blame.c:849 +#: builtin/blame.c:871 msgid "Force progress reporting" msgstr "Tvinga fรถrloppsrapportering" -#: builtin/blame.c:850 +#: builtin/blame.c:872 msgid "Show output score for blame entries" msgstr "Visa utdatapoรคng fรถr klandringsposter" -#: builtin/blame.c:851 +#: builtin/blame.c:873 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:852 +#: builtin/blame.c:874 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:853 +#: builtin/blame.c:875 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett fรถr maskinkonsumtion" -#: builtin/blame.c:854 +#: builtin/blame.c:876 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:855 +#: builtin/blame.c:877 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:856 +#: builtin/blame.c:878 msgid "Show raw timestamp (Default: off)" msgstr "Visa rรฅ tidsstรคmpel (Standard: av)" -#: builtin/blame.c:857 +#: builtin/blame.c:879 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lรฅng inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:858 +#: builtin/blame.c:880 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck fรถrfattarnamn och tidsstรคmpel (Standard: av)" -#: builtin/blame.c:859 +#: builtin/blame.c:881 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:860 +#: builtin/blame.c:882 msgid "Ignore whitespace differences" msgstr "Ignorera รคndringar i blanksteg" -#: builtin/blame.c:861 builtin/log.c:1646 +#: builtin/blame.c:883 builtin/log.c:1808 msgid "rev" msgstr "rev" -#: builtin/blame.c:861 +#: builtin/blame.c:883 msgid "Ignore <rev> when blaming" msgstr "ignorera <rev> vid klandren" -#: builtin/blame.c:862 +#: builtin/blame.c:884 msgid "Ignore revisions from <file>" msgstr "ignorera revisioner frรฅn <fil>" -#: builtin/blame.c:863 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "fรคrglรคgg redundant metadata frรฅn tidigare rader annorlunda" -#: builtin/blame.c:864 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "fรคrglรคgg rader efter รฅlder" -#: 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 +#: builtin/blame.c:887 msgid "Spend extra cycles to find better match" msgstr "Slรถsa extra cykler med att hitta bรคttre trรคff" -#: builtin/blame.c:874 +#: builtin/blame.c:888 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:875 +#: builtin/blame.c:889 msgid "Use <file>'s contents as the final image" msgstr "Anvรคnd <fil>s innehรฅll som slutgiltig bild" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "poรคng" -#: builtin/blame.c:876 +#: builtin/blame.c:890 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:877 +#: builtin/blame.c:891 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med bรถrjan pรฅ 1" -#: builtin/blame.c:929 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte anvรคndas med --incremental eller porslinsformat" @@ -9455,24 +10784,24 @@ msgstr "--progress kan inte anvรคndas med --incremental eller porslinsformat" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "4 รฅr, 11 mรฅnader sedan" -#: builtin/blame.c:1087 +#: builtin/blame.c:1110 #, 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:1133 +#: builtin/blame.c:1156 msgid "Blaming lines" msgstr "Klandra rader" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" +msgstr "git branch [<flaggor>] [-r | -a] [--merged] [--no-merged]" #: builtin/branch.c:30 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" @@ -9676,7 +11005,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:485 +#: builtin/branch.c:626 builtin/rebase.c:526 msgid "upstream" msgstr "uppstrรถms" @@ -9685,8 +11014,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" @@ -9768,99 +11097,99 @@ msgstr "visa endast ej sammanslagna grenar" msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 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 +#: builtin/tag.c:434 msgid "object" msgstr "objekt" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "visa endast grenar fรถr objektet" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 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:39 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format att anvรคnda fรถr utdata" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose รคr inkompatibla" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "grennamn krรคvs" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frรฅnkopplad HEAD" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning fรถr mer รคn en gren" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar pรฅ grenen \"%s\" รคnnu." -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "fรถr mรฅnga grenar fรถr kopiering" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "fรถr mรฅnga flaggor fรถr namnbyte" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "fรถr mรฅnga flaggor fรถr att byta uppstrรถm" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sรคtta uppstrรถm fรถr HEAD till %s nรคr det inte pekar mot nรฅgon gren." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "okรคnd gren \"%s\"" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "fรถr mรฅnga flaggor fรถr att ta bort uppstrรถm" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppstrรถm fรถr HEAD nรคr det inte pekar mot nรฅgon gren." -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppstrรถmsinformation" -#: builtin/branch.c:841 +#: builtin/branch.c:839 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>?" @@ -9868,7 +11197,7 @@ msgstr "" "Flaggorna -a och -r pรฅ \"git branch\" tar inte ett namn pรฅ gren.\n" "Menade du att anvรคnda: -a|-r --list <mรถnster>?" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -9876,20 +11205,166 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Anvรคnd --track " "eller --set-upstream-to istรคllet." -#: builtin/bundle.c:45 +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "git version:\n" + +#: builtin/bugreport.c:21 #, c-format -msgid "%s is okay\n" -msgstr "%s รคr okej\n" +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() misslyckades med felet \"%s\" (%d)\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "kompilatorinfo:" + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "libc-info:" + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "kรถrs inte frรฅn ett git-arkiv - inga krokar att visa\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"Tack fรถr att du skriver en buggraport fรถr Git!\n" +"Om du svarar pรฅ fรถljande frรฅgor รคr det lรคttare fรถr oss att fรถrsta " +"problemet.\n" +"Skriv gรคrna pรฅ engelska\n" +"\n" +"Vad gjorde du innan felet uppstod? (Steg fรถr att รฅterskapa problemet)\n" +"\n" +"Vad fรถrvรคntade du skulle hรคnda? (Fรถrvรคntat beteende)\n" +"\n" +"Vad hรคnde istรคllet? (Faktiskt beteende)\n" +"\n" +"Vad รคr skillnaden mellan det du fรถrvรคntade dig och vad som faktiskt hรคnde?\n" +"\n" +"Nรฅgot mer du vill lรคgga till:\n" +"\n" +"Se รถver resten av felrapporten nedan.\n" +"Du kan ta bort rader du inte vill dela.\n" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "ange mรฅl fรถr buggrapporteringsfilen" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "ange ett filรคndelse i strftime-format" + +#: builtin/bugreport.c:158 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "kunde inte skapa inledande kataloger fรถr \"%s\"" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "Systeminfo" + +#: builtin/bugreport.c:168 +msgid "Enabled Hooks" +msgstr "Aktiverade krokar" + +#: builtin/bugreport.c:175 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "kunde inte skapa filen pรฅ \"%s\"" + +#: builtin/bugreport.c:178 +#, c-format +msgid "unable to write to %s" +msgstr "kunde inte skriva till %s" + +#: builtin/bugreport.c:188 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "Skapade ny rapport pรฅ \"%s\"\n" + +#: 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:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "visa inte fรถrloppsindikator" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "visa fรถrloppsindikator" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +msgid "show progress meter during object writing phase" +msgstr "visa fรถrloppsindikator under objektskrivningsfasen" + +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +msgid "similar to --all-progress when progress meter is shown" +msgstr "som --all-progress nรคr fรถrloppsindikatorn visas" -#: builtin/bundle.c:58 +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "ange formatversion fรถr paket (bundle)." + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "Behรถver ett arkiv fรถr att skapa ett paket (bundle)." -#: builtin/bundle.c:62 +#: builtin/bundle.c:107 +msgid "do not show bundle details" +msgstr "visa inte paketdetaljer" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "%s รคr okej\n" + +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "Behรถver ett arkiv fรถr att packa upp ett paket (bundle)." -#: builtin/cat-file.c:594 +#: builtin/bundle.c:171 builtin/remote.c:1687 +msgid "be verbose; must be placed before a subcommand" +msgstr "var pratsam; mรฅste skrivas fรถre ett underkommando" + +#: builtin/bundle.c:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Okรคnt underkommando: %s" + +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -9897,80 +11372,80 @@ 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:595 +#: builtin/cat-file.c:599 msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "endast en buntflagga kan anges" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:642 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:639 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "visa objektets innehรฅll snyggt" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:645 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:643 +#: builtin/cat-file.c:647 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:644 git-submodule.sh:936 +#: builtin/cat-file.c:648 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "anvรคnd specifik sรถkvรคg fรถr --textconv/--filters" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:651 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:648 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "buffra utdata frรฅn --batch" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:654 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:654 +#: builtin/cat-file.c:658 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:658 +#: builtin/cat-file.c:662 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:660 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "visa alla objekt med --batch eller --batch-check" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "ordna inte --batch-all-objects output" @@ -9998,8 +11473,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:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "undertryck fรถrloppsrapportering" @@ -10011,27 +11486,27 @@ msgstr "visa indatasรถkvรคgar som inte trรคffas" msgid "ignore index when checking" msgstr "ignorera index vid kontroll" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "kan inte ange sรถkvรคgsnamn med --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z kan endast anvรคndas tillsammans med --stdin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "ingen sรถkvรคg angavs" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 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:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "kan inte anvรคnda bรฅde --quiet och --verbose" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching รคr endast giltig med --verbose" @@ -10089,9 +11564,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:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 msgid "string" msgstr "strรคng" @@ -10119,98 +11594,98 @@ msgstr "git switch [<flaggor>] [<gren>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..." -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "sรถkvรคgen \"%s\" har inte vรฅr version" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "sรถkvรคgen \"%s\" har inte deras version" -#: builtin/checkout.c:190 +#: builtin/checkout.c:206 #, 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:240 +#: builtin/checkout.c:258 #, 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:258 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "sรถkvรคg \"%s\": kan inte slรฅ ihop" -#: builtin/checkout.c:274 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lรคgga till sammanslagningsresultat fรถr \"%s\"" -#: builtin/checkout.c:374 +#: builtin/checkout.c:396 #, 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:379 +#: builtin/checkout.c:401 #, 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:386 +#: builtin/checkout.c:408 #, 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:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, 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:422 builtin/checkout.c:425 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte anvรคndas med %s" -#: builtin/checkout.c:429 +#: builtin/checkout.c:451 #, 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:433 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "varken \"%s\" eller \"%s\" har angivits" -#: builtin/checkout.c:437 +#: builtin/checkout.c:459 #, 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:442 builtin/checkout.c:447 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "\"%s\" eller \"%s\" kan inte anvรคndas med %s" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:528 builtin/checkout.c:535 #, c-format msgid "path '%s' is unmerged" msgstr "sรถkvรคgen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:679 +#: builtin/checkout.c:703 msgid "you need to resolve your current index first" msgstr "du mรฅste lรถsa ditt befintliga index fรถrst" -#: builtin/checkout.c:729 +#: builtin/checkout.c:757 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10219,55 +11694,50 @@ msgstr "" "kan inte fortsรคtta med kรถade รคndringar i fรถljande filer:\n" "%s" -#: 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 +#: builtin/checkout.c:853 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg fรถr \"%s\": %s\n" -#: builtin/checkout.c:875 +#: builtin/checkout.c:895 msgid "HEAD is now at" msgstr "HEAD รคr nu pรฅ" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:899 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:903 #, c-format msgid "Reset branch '%s'\n" msgstr "ร terstรคll gren \"%s\"\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:906 #, c-format msgid "Already on '%s'\n" msgstr "Redan pรฅ \"%s\"\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:910 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Vรคxlade till och nollstรคllde grenen \"%s\"\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:912 builtin/checkout.c:1338 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Vรคxlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:914 #, c-format msgid "Switched to branch '%s'\n" msgstr "Vรคxlade till grenen \"%s\"\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:965 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:971 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10290,7 +11760,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:990 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10317,28 +11787,19 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1025 msgid "internal error in revision walk" msgstr "internt fel vid genomgรฅng av revisioner (revision walk)" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1029 msgid "Previous HEAD position was" msgstr "Tidigare position fรถr HEAD var" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1069 builtin/checkout.c:1333 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: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 +#: builtin/checkout.c:1146 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10347,37 +11808,71 @@ 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:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1153 +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:1163 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "\"%s\" motsvarar flera (%d) spรฅrade fjรคrrgrenar" + +#: builtin/checkout.c:1229 +msgid "only one reference expected" +msgstr "endast en referens fรถrvรคntades" + +#: builtin/checkout.c:1246 +#, c-format +msgid "only one reference expected, %d given." +msgstr "endast en referens fรถrvรคntades, %d gavs." + +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1305 builtin/checkout.c:1671 #, c-format msgid "reference is not a tree: %s" msgstr "referensen รคr inte ett trรคd: %s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1352 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "fรถrvรคntade gren, fick taggen \"%s\"" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1354 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "fรถrvรคntade gren, fick fjรคrrgrenen \"%s\"" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1355 builtin/checkout.c:1363 #, c-format msgid "a branch is expected, got '%s'" msgstr "fรถrvรคntade gren, fick \"%s\"" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1358 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "fรถrvรคntade gren, fick incheckningen \"%s\"" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1374 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10385,7 +11880,7 @@ msgstr "" "kan inte vรคxla gren vid sammanslagning\n" "รvervรคg \"git merge --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1378 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -10393,7 +11888,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:1333 +#: builtin/checkout.c:1382 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10401,7 +11896,7 @@ msgstr "" "kan inte vรคxla gren vid ombasering\n" "รvervรคg \"git rebase --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1386 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10409,7 +11904,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:1341 +#: builtin/checkout.c:1390 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10417,138 +11912,146 @@ msgstr "" "kan inte vรคxla gren i en \"revert\"\n" "รvervรคg \"git revert --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1394 msgid "you are switching branch while bisecting" msgstr "dรฅ vรคxlar grenar medan du gรถr en \"bisect\"" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1401 msgid "paths cannot be used with switching branches" msgstr "sรถkvรคgar kan inte anvรคndas vid byte av gren" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte anvรคndas vid byte av gren" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte anvรคndas med \"%s\"" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1429 #, c-format msgid "'%s' cannot take <start-point>" msgstr "\"%s\" kan inte ta <startpunkt>" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1437 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte vรคxla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1444 msgid "missing branch or commit argument" msgstr "saknar gren- eller incheckingsargument" -#: 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 +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 msgid "force progress reporting" msgstr "tvinga fรถrloppsrapportering" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1487 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:1439 builtin/log.c:1634 parse-options.h:318 +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 msgid "style" msgstr "stil" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1489 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1501 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "koppla frรฅn HEAD vid namngiven incheckning" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1502 msgid "set upstream info for new branch" msgstr "sรคtt uppstrรถmsinformation fรถr ny gren" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1504 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala รคndringar)" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new unparented branch" msgstr "ny gren utan fรถrรคlder" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1508 builtin/merge.c:291 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1511 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:1475 +#: builtin/checkout.c:1524 msgid "checkout our version for unmerged files" msgstr "checka ut vรฅr version fรถr ej sammanslagna filer" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1527 msgid "checkout their version for unmerged files" msgstr "checka ut deras version fรถr ej sammanslagna filer" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1531 msgid "do not limit pathspecs to sparse entries only" msgstr "begrรคnsa inte sรถkvรคgar till endast glesa poster" -#: builtin/checkout.c:1533 -msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-b, -B och --orphan รคr รถmsesidigt uteslutande" +#: builtin/checkout.c:1586 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "-%c, -%c och --orphan รคr รถmsesidigt uteslutande" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1590 msgid "-p and --overlay are mutually exclusive" msgstr "-p och --overlay รคr รถmsesidigt uteslutande" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1627 msgid "--track needs a branch name" msgstr "--track behรถver ett namn pรฅ en gren" -#: builtin/checkout.c:1578 -msgid "missing branch name; try -b" -msgstr "grennamn saknas; fรถrsรถk med -b" +#: builtin/checkout.c:1632 +#, c-format +msgid "missing branch name; try -%c" +msgstr "grennamn saknas; fรถrsรถk med -%c" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1664 #, c-format msgid "could not resolve %s" msgstr "kunde inte upplรถsa %s" -#: 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 +#: builtin/checkout.c:1680 msgid "invalid path specification" msgstr "felaktig sรถkvรคgsangivelse" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1687 #, 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:1642 +#: builtin/checkout.c:1691 #, 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:1646 +#: builtin/checkout.c:1700 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file รคr inkompatibelt med --detach" + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file รคr inkompatibelt med --patch" + +#: builtin/checkout.c:1716 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10556,135 +12059,111 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge รคr inkompatibla nรคr\n" "du checkar ut frรฅn indexet." -#: 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:1721 +msgid "you must specify path(s) to restore" +msgstr "du mรฅste ange katalog(er) att รฅterstรคlla" -#: 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 +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1748 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1750 msgid "create/reset and checkout a branch" msgstr "skapa/nollstรคll och checka ut en gren" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1751 msgid "create reflog for new branch" msgstr "skapa reflogg fรถr ny gren" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1753 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "fรถrutspรฅ \"git checkout <gren-saknas>\" (fรถrval)" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1754 msgid "use overlay mode (default)" msgstr "anvรคnd รถverlรคggslรคge (standard)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1799 msgid "create and switch to a new branch" msgstr "skapa och vรคxla till en ny gren" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1801 msgid "create/reset and switch to a branch" msgstr "skapa/nollstรคll och vรคxla till en gren" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1803 msgid "second guess 'git switch <no-such-branch>'" msgstr "fรถrutspรฅ \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1805 msgid "throw away local modifications" msgstr "kasta bort lokala รคndringar" -#: builtin/checkout.c:1772 -msgid "where the checkout from" -msgstr "kรคlla till utcheckning" +#: builtin/checkout.c:1839 +msgid "which tree-ish to checkout from" +msgstr "vilken trรคd-igt att checka ut frรฅn" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1841 msgid "restore the index" msgstr "รฅterstรคll indexet" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1843 msgid "restore the working tree (default)" msgstr "รฅterstรคll arbetskatalogen (fรถrval)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1845 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1846 msgid "use overlay mode" msgstr "anvรคnd รถverlรคggslรคge" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <mรถnster>] [-x | -X] [--] " "<sรถkvรคgar>..." -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "Tar bort %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "Skulle ta bort %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "Hoppar รถver arkivet %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "Skulle hoppa รถver arkivet %s\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "kunde inte ta status (\"lstat\") pรฅ %s\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10697,7 +12176,7 @@ msgstr "" "foo - markera post baserad pรฅ unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10718,38 +12197,33 @@ msgstr "" "* - vรคlj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadรฅ (%s)?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmรถnster>>" -#: builtin/clean.c:699 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:720 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Vรคlj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]? " -#: builtin/clean.c:786 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "Hej dรฅ.\n" - -#: builtin/clean.c:794 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10767,64 +12241,52 @@ msgstr "" "help - denna skรคrm\n" "? - hjรคlp fรถr kommandoval" -#: 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 +#: builtin/clean.c:825 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:846 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "Inga fler filer att stรคda, avslutar." -#: builtin/clean.c:908 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "skriv inte ut namn pรฅ borttagna filer" -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "force" msgstr "tvinga" -#: builtin/clean.c:911 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "stรคda interaktivt" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: 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/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mรถnster" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "lรคgg till <mรถnster> till ignoreringsregler" -#: builtin/clean.c:916 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "ta รคven bort ignorerade filer" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:936 -msgid "-x and -X cannot be used together" -msgstr "-x och -X kan inte anvรคndas samtidigt" - -#: builtin/clean.c:940 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -10832,7 +12294,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vรคgrar " "stรคda" -#: builtin/clean.c:943 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -10840,7 +12302,11 @@ msgstr "" "clean.requireForce har standardvรคrdet true och varken -i, -n eller -f " "angavs; vรคgrar stรคda" -#: builtin/clone.c:46 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "-x och -X kan inte anvรคndas samtidigt" + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" @@ -10848,7 +12314,7 @@ msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" msgid "don't create a checkout" msgstr "skapa inte nรฅgon utcheckning" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" @@ -10868,11 +12334,11 @@ msgstr "skapa inte lokala hรฅrda lรคnkar, kopiera alltid" msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "sรถkvรคgsangivelse" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" @@ -10880,26 +12346,26 @@ msgstr "initiera undermoduler i klonen" msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:550 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:551 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:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 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:3308 builtin/repack.c:330 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 msgid "name" msgstr "namn" @@ -10915,8 +12381,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:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/pull.c:208 msgid "depth" msgstr "djup" @@ -10924,7 +12390,8 @@ 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:154 builtin/pack-objects.c:3297 +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 msgid "time" msgstr "tid" @@ -10932,16 +12399,17 @@ 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:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 msgid "revision" msgstr "revision" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "fรถrdjupa historik fรถr grund klon, exkludera revisionen" -#: builtin/clone.c:132 +#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" @@ -10953,11 +12421,11 @@ msgstr "klona inga taggar och gรถr att senare hรคmtningar inte fรถljer dem" msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:559 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "separera gitkatalogen frรฅn arbetskatalogen" @@ -10969,25 +12437,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:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 msgid "server-specific" msgstr "serverspecifik" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sรคnda" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 msgid "use IPv4 addresses only" msgstr "anvรคnd endast IPv4-adresser" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 msgid "use IPv6 addresses only" msgstr "anvรคnd endast IPv6-adresser" @@ -10995,7 +12463,11 @@ 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:285 +#: 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 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11003,47 +12475,42 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog pรฅ kommandoraden" -#: builtin/clone.c:338 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info: Kan inte skapa alternativ fรถr \"%s\": %s\n" +msgstr "info: Kan inte skapa suppleant fรถr \"%s\": %s\n" -#: builtin/clone.c:411 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och รคr ingen katalog" -#: builtin/clone.c:428 +#: builtin/clone.c:431 #, c-format msgid "failed to start iterator over '%s'" msgstr "misslyckades starta iterator รถver \"%s\"" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "misslyckades ta bort lรคnken \"%s\"" - -#: builtin/clone.c:458 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa lรคnken \"%s\"" -#: builtin/clone.c:462 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "misslyckades iterera รถver \"%s\"" -#: builtin/clone.c:492 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:512 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11053,133 +12520,142 @@ 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:583 +#: builtin/clone.c:589 #, 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:702 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:752 +#: builtin/clone.c:756 +msgid "failed to initialize sparse-checkout" +msgstr "misslyckades initiera sparse-checkout" + +#: builtin/clone.c:779 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:783 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:833 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:896 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "kan inte packa om fรถr att stรคda upp" -#: builtin/clone.c:898 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporรคr \"alternates\"-fil" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:970 builtin/receive-pack.c:2434 msgid "Too many arguments." msgstr "Fรถr mรฅnga argument." -#: builtin/clone.c:942 +#: builtin/clone.c:974 msgid "You must specify a repository to clone." msgstr "Du mรฅste ange ett arkiv att klona." -#: builtin/clone.c:955 +#: builtin/clone.c:987 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s รคr inkompatibla." -#: builtin/clone.c:958 +#: builtin/clone.c:990 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir รคr inkompatibla." -#: builtin/clone.c:971 +#: builtin/clone.c:1006 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:977 builtin/fetch.c:1653 +#: builtin/clone.c:1010 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s รคr inte ett positivt tal" -#: builtin/clone.c:987 +#: builtin/clone.c:1020 #, 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:997 +#: builtin/clone.c:1026 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "arkivsรถkvรคgen \"%s\" finns redan och รคr inte en tom katalog." + +#: builtin/clone.c:1040 #, c-format msgid "working tree '%s' already exists." msgstr "arbetstrรคdet \"%s\" finns redan." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger fรถr \"%s\"" -#: builtin/clone.c:1017 +#: builtin/clone.c:1060 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1037 +#: builtin/clone.c:1080 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1082 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1106 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:1124 +#: builtin/clone.c:1170 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; anvรคnd file:// istรคllet." -#: builtin/clone.c:1126 +#: builtin/clone.c:1172 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:1128 +#: builtin/clone.c:1174 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:1130 +#: builtin/clone.c:1176 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; anvรคnd file:// istรคllet." -#: builtin/clone.c:1133 +#: builtin/clone.c:1179 msgid "source repository is shallow, ignoring --local" msgstr "kรคllarkivet รคr grunt, ignorerar --local" -#: builtin/clone.c:1138 +#: builtin/clone.c:1184 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1268 builtin/clone.c:1276 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjรคrrgrenen %s hittades inte i uppstrรถmsarkivet %s" -#: builtin/clone.c:1226 +#: builtin/clone.c:1279 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -11215,6 +12691,110 @@ msgstr "Spaltfyllnad mellan spalter" msgid "--command must be the first argument" msgstr "--command mรฅste vara fรถrsta argument" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +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:14 builtin/commit-graph.c:27 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" +"git commit-graph write [--object-dir <objkat>] [--append] [--" +"split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <delnings-flaggor>" + +#: builtin/commit-graph.c:64 +#, c-format +msgid "could not find object directory matching %s" +msgstr "kunde inte hitta objektkatalog fรถr %s" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "kat" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "Objektkatalogen dรคr grafen ska lagras" + +#: builtin/commit-graph.c:83 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "om inchecknignsgrafen รคr delad, kontrollera bara spetsfilen" + +#: builtin/commit-graph.c:106 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "Kunde inte รถppna incheckningsgrafen \"%s\"" + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "okรคnt argument fรถr --split, %s" + +#: builtin/commit-graph.c:155 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "ovรคntat icke-hexadecimalt objekt-ID: %s" + +#: builtin/commit-graph.c:160 +#, c-format +msgid "invalid object: %s" +msgstr "ogiltigt objekt: %s" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "starta traversering vid alla referenser" + +#: builtin/commit-graph.c:215 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "sรถk paketindex listade pรฅ standard in efter incheckningar" + +#: builtin/commit-graph.c:217 +msgid "start walk at commits listed by stdin" +msgstr "bรถrja gรฅ genom incheckningar listade pรฅ standard in" + +#: builtin/commit-graph.c:219 +msgid "include all commits already in the commit-graph file" +msgstr "ta med alla incheckningar redan i filen commit-graph" + +#: builtin/commit-graph.c:221 +msgid "enable computation for changed paths" +msgstr "aktivera berรคkning av รคndrade sรถkvรคgar" + +#: builtin/commit-graph.c:224 +msgid "allow writing an incremental commit-graph file" +msgstr "tillรฅt skriva en inkrementell incheckningsgraffil" + +#: builtin/commit-graph.c:228 +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:230 +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:232 +msgid "only expire files older than a given date-time" +msgstr "lรฅt tid endast gรฅ ut fรถr filer รคldre รคn givet datum och tid" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "maximalt antal Bloom-filer med รคndrad sรถkvรคg att berรคkna" + +#: builtin/commit-graph.c:255 +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" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "Hรคmtar incheckningar frรฅn indata" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -11228,7 +12808,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:542 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 #, c-format msgid "not a valid object name %s" msgstr "objektnamnet รคr inte giltigt: %s" @@ -11256,13 +12836,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:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 -#: builtin/tag.c:412 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 msgid "message" msgstr "meddelande" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "incheckningsmeddelande" @@ -11270,8 +12850,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:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -11316,10 +12896,14 @@ msgstr "" "\n" #: builtin/commit.c:63 +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "Anvรคnd annars \"git rebase --skip\"\n" + +#: builtin/commit.c:66 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Anvรคnd annars \"git cherry-pick --skip\"\n" -#: builtin/commit.c:66 +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -11341,61 +12925,73 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trรคdobjekt" -#: builtin/commit.c:356 +#: builtin/commit.c:348 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "--pathspec-from-file med -a ger ingen mening" + +#: builtin/commit.c:361 +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:373 msgid "unable to create temporary index" msgstr "kunde inte skapa temporรคr indexfil" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "interaktiv tillรคggning misslyckades" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporรคrt index" -#: builtin/commit.c:378 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cachetrรคdet" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:455 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "kan inte utfรถra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:457 +#: builtin/commit.c:478 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:465 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "kan inte utfรถra en delvis incheckning under en ombasering." + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "kan inte lรคsa indexet" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporรคr indexfil" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar fรถrfattarhuvud" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat fรถrfattarhuvud" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11403,68 +12999,66 @@ msgstr "" "kunde inte vรคlja ett kommentarstecken som inte anvรคnts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slรฅ upp incheckningen %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:478 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lรคser loggmeddelande frรฅn standard in)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "kunde inte lรคsa logg frรฅn standard in" -#: builtin/commit.c:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte lรคsa loggfilen \"%s\"" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "kunde inte lรคsa SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "kunde inte lรคsa MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:829 -#, c-format +#: builtin/commit.c:853 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" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" "Det verkar som du checkar in en sammanslagning.\n" -"Om det inte stรคmmer tar du bort filen\n" -"\t%s\n" +"Om det inte stรคmmer kรถr du\n" +"\tgit update-ref -d MERGE_HEAD\n" "och fรถrsรถker igen.\n" -#: builtin/commit.c:834 -#, c-format +#: builtin/commit.c:858 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" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" "Det verkar som du checkar in en cherry-pick.\n" -"Om det inte stรคmmer tar du bort filen\n" -"\t%s\n" +"Om det inte stรคmmer kรถr du\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "och fรถrsรถker igen.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11474,7 +13068,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11485,144 +13079,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:872 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFรถrfattare: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "Kan inte lรคsa indexet" -#: builtin/commit.c:972 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Fel vid byggande av trรคd" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:276 #, 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:1030 +#: builtin/commit.c:1055 #, 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:1044 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat lรคge \"%s\"" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt lรคge fรถr ospรฅrade filer: \"%s\"" -#: builtin/commit.c:1102 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long och -z รคr inkompatibla" -#: builtin/commit.c:1146 +#: builtin/commit.c:1171 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:1155 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "Du har inget att utรถka." -#: builtin/commit.c:1158 +#: builtin/commit.c:1183 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:1160 +#: builtin/commit.c:1185 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:1163 +#: builtin/commit.c:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "Du รคr i mitten av en ombasering -- kan inte utรถka." + +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte anvรคndas samtidigt" -#: builtin/commit.c:1173 +#: builtin/commit.c:1200 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:1175 +#: builtin/commit.c:1202 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:1183 +#: builtin/commit.c:1211 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:1200 +#: builtin/commit.c:1229 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: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 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "sรถkvรคgarna \"%s ...\" med -a ger ingen mening" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1343 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "berรคkna fullstรคndiga fรถre-/efter-vรคrden" -#: builtin/commit.c:1347 +#: builtin/commit.c:1374 msgid "version" msgstr "version" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "maskinlรคsbar utdata" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "visa status i lรฅngt format (standard)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: 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 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 msgid "mode" msgstr "lรคge" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1383 builtin/commit.c:1541 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:1360 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11630,11 +13224,11 @@ msgstr "" "visa ignorerade filer, valfria lรคgen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "nรคr" -#: builtin/commit.c:1363 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11642,172 +13236,172 @@ msgstr "" "ignorera รคndringar i undermoduler, valfritt nรคr: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "visa ospรฅrade filer i spalter" -#: builtin/commit.c:1366 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "detektera inte namnรคndringar" -#: builtin/commit.c:1368 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "detektera namnรคndringar, mรถjligen sรคtt likhetsindex" -#: builtin/commit.c:1388 +#: builtin/commit.c:1415 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:1493 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgรฅngsrik incheckning" -#: builtin/commit.c:1494 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "visa diff i mallen fรถr incheckningsmeddelandet" -#: builtin/commit.c:1496 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "Alternativ fรถr incheckningsmeddelande" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 msgid "read message from file" msgstr "lรคs meddelande frรฅn fil" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "author" msgstr "fรถrfattare" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "รถverstyr fรถrfattare fรถr incheckningen" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:539 msgid "date" msgstr "datum" -#: builtin/commit.c:1499 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "รถverstyr datum fรถr incheckningen" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1501 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "รฅteranvรคnd och redigera meddelande frรฅn angiven incheckning" -#: builtin/commit.c:1502 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "รฅteranvรคnd meddelande frรฅn angiven incheckning" -#: builtin/commit.c:1503 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "anvรคnd autosquash-formaterat meddelande fรถr att fixa angiven incheckning" -#: builtin/commit.c:1504 +#: builtin/commit.c:1508 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:1505 +#: builtin/commit.c:1509 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:1506 builtin/log.c:1581 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "lรคgg till Signed-off-by:" -#: builtin/commit.c:1507 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "anvรคnd angiven mallfil" -#: builtin/commit.c:1508 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1510 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "inkludera status i mallen fรถr incheckningsmeddelandet" -#: builtin/commit.c:1515 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "Alternativ fรถr incheckningens innehรฅll" -#: builtin/commit.c:1516 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "checka in alla รคndrade filer" -#: builtin/commit.c:1517 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "lรคgg till angivna filer till indexet fรถr incheckning" -#: builtin/commit.c:1518 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "lรคgg till filer interaktivt" -#: builtin/commit.c:1519 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "lรคgg till รคndringar interaktivt" -#: builtin/commit.c:1520 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1521 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "fรถrbigรฅ pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1522 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1535 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "lรคgg till fรถregรฅende incheckning" -#: builtin/commit.c:1536 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "fรถrbigรฅ post-rewrite-krok" -#: builtin/commit.c:1541 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "ok att registrera en tom รคndring" -#: builtin/commit.c:1543 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "ok att registrera en รคndring med tomt meddelande" -#: builtin/commit.c:1616 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1623 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "kunde inte lรคsa MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte lรคsa incheckningsmeddelande: %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter pรฅ grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1654 +#: builtin/commit.c:1662 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1688 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -11818,282 +13412,219 @@ msgstr "" "att kvoten inte har รถverskridits, och kรถr sedan\n" "\"git restore --staged :/\" fรถr att รฅterstรคlla." -#: 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: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] <split options>" -msgstr "" -"git commit-graph write [--object-dir <objkat>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <delnings-flaggor>" - -#: 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: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 skall lagras" - -#: 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: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:164 -msgid "start walk at all refs" -msgstr "starta traversering vid alla referenser" - -#: 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:168 -msgid "start walk at commits listed by stdin" -msgstr "bรถrja gรฅ genom incheckningar listade pรฅ standard in" - -#: 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:172 -msgid "allow writing an incremental commit-graph file" -msgstr "tillรฅt skriva en inkrementell incheckningsgraffil" - -#: 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: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: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" - #: builtin/config.c:11 msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:107 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "okรคnt argument fรถr --type, %s" -#: builtin/config.c:115 +#: builtin/config.c:119 msgid "only one type at a time" msgstr "endast en typ รฅt gรฅngen" -#: builtin/config.c:124 +#: builtin/config.c:128 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:125 +#: builtin/config.c:129 msgid "use global config file" msgstr "anvรคnd global konfigurationsfil" -#: builtin/config.c:126 +#: builtin/config.c:130 msgid "use system config file" msgstr "anvรคnd systemets konfigurationsfil" -#: builtin/config.c:127 +#: builtin/config.c:131 msgid "use repository config file" msgstr "anvรคnd arkivets konfigurationsfil" -#: builtin/config.c:128 +#: builtin/config.c:132 msgid "use per-worktree config file" msgstr "anvรคnd arbetskatalogens konfigurationsfil" -#: builtin/config.c:129 +#: builtin/config.c:133 msgid "use given config file" msgstr "anvรคnd angiven konfigurationsfil" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "read config from given blob object" msgstr "lรคs konfiguration frรฅn givet blob-objekt" -#: builtin/config.c:131 +#: builtin/config.c:135 msgid "Action" msgstr "ร tgรคrd" -#: builtin/config.c:132 +#: builtin/config.c:136 msgid "get value: name [value-regex]" msgstr "hรคmta vรคrde: namn [vรคrde-reguttr]" -#: builtin/config.c:133 +#: builtin/config.c:137 msgid "get all values: key [value-regex]" msgstr "hรคmta alla vรคrden: nyckel [vรคrde-reguttr]" -#: builtin/config.c:134 +#: builtin/config.c:138 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:135 +#: builtin/config.c:139 msgid "get value specific for the URL: section[.var] URL" msgstr "hรคmta vรคrde specifikt URL:en: sektion[.var] URL" -#: builtin/config.c:136 +#: builtin/config.c:140 msgid "replace all matching variables: name value [value_regex]" msgstr "ersรคtt alla motsvarande variabler: namn vรคrde [vรคrde-reguttr]" -#: builtin/config.c:137 +#: builtin/config.c:141 msgid "add a new variable: name value" msgstr "lรคgg till en ny variabel: namn vรคrde" -#: builtin/config.c:138 +#: builtin/config.c:142 msgid "remove a variable: name [value-regex]" msgstr "ta bort en variabel: namn [vรคrde-reguttr]" -#: builtin/config.c:139 +#: builtin/config.c:143 msgid "remove all matches: name [value-regex]" msgstr "ta bort alla trรคffar: namn [vรคrde-reguttr]" -#: builtin/config.c:140 +#: builtin/config.c:144 msgid "rename section: old-name new-name" msgstr "byt namn pรฅ sektion: gammalt-namn nytt-namn" -#: builtin/config.c:141 +#: builtin/config.c:145 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:142 +#: builtin/config.c:146 msgid "list all" msgstr "visa alla" -#: builtin/config.c:143 +#: builtin/config.c:147 msgid "open an editor" msgstr "รถppna textredigeringsprogram" -#: builtin/config.c:144 +#: builtin/config.c:148 msgid "find the color configured: slot [default]" msgstr "hitta den instรคllda fรคrgen: slot [default]" -#: builtin/config.c:145 +#: builtin/config.c:149 msgid "find the color setting: slot [stdout-is-tty]" msgstr "hitta fรคrginstรคllningen: slot [stdout-is-tty]" -#: builtin/config.c:146 +#: builtin/config.c:150 msgid "Type" msgstr "Typ" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:151 builtin/env--helper.c:43 msgid "value is given this type" msgstr "vรคrdet har givits denna typ" -#: builtin/config.c:148 +#: builtin/config.c:152 msgid "value is \"true\" or \"false\"" msgstr "vรคrdet รคr \"true\" eller \"false\"" -#: builtin/config.c:149 +#: builtin/config.c:153 msgid "value is decimal number" msgstr "vรคrdet รคr ett decimalt tal" -#: builtin/config.c:150 +#: builtin/config.c:154 msgid "value is --bool or --int" msgstr "vรคrdet รคr --bool eller --int" -#: builtin/config.c:151 +#: builtin/config.c:155 +msgid "value is --bool or string" +msgstr "vรคrdet รคr --bool eller strรคng" + +#: builtin/config.c:156 msgid "value is a path (file or directory name)" msgstr "vรคrdet รคr en sรถkvรคg (fil- eller katalognamn)" -#: builtin/config.c:152 +#: builtin/config.c:157 msgid "value is an expiry date" msgstr "vรคrdet รคr ett utgรฅngsdatum" -#: builtin/config.c:153 +#: builtin/config.c:158 msgid "Other" msgstr "Andra" -#: builtin/config.c:154 +#: builtin/config.c:159 msgid "terminate values with NUL byte" msgstr "terminera vรคrden med NUL-byte" -#: builtin/config.c:155 +#: builtin/config.c:160 msgid "show variable names only" msgstr "visa endast variabelnamn" -#: builtin/config.c:156 +#: builtin/config.c:161 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:157 +#: builtin/config.c:162 msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskรคlla (fil, standard in, blob, kommandorad)" -#: builtin/config.c:158 builtin/env--helper.c:40 +#: builtin/config.c:163 +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:164 builtin/env--helper.c:45 msgid "value" msgstr "vรคrde" -#: builtin/config.c:158 +#: builtin/config.c:164 msgid "with --get, use default value when missing entry" msgstr "med --get, anvรคnd standardvรคrde vid saknad post" -#: builtin/config.c:172 +#: builtin/config.c:178 #, c-format msgid "wrong number of arguments, should be %d" msgstr "fel antal argument, skulle vara %d" -#: builtin/config.c:174 +#: builtin/config.c:180 #, 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:308 +#: builtin/config.c:334 #, c-format msgid "invalid key pattern: %s" msgstr "felaktigt nyckelmรถnster: %s" -#: builtin/config.c:344 +#: builtin/config.c:370 #, c-format msgid "failed to format default config value: %s" msgstr "misslyckades formatera standardkonfigurationsvรคrde: %s" -#: builtin/config.c:401 +#: builtin/config.c:434 #, c-format msgid "cannot parse color '%s'" msgstr "kan inte tolka fรคrgen \"%s\"" -#: builtin/config.c:443 +#: builtin/config.c:476 msgid "unable to parse default color value" msgstr "kan inte tolka standardfรคrgvรคrde" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:529 builtin/config.c:789 msgid "not in a git directory" msgstr "inte i en git-katalog" -#: builtin/config.c:499 +#: builtin/config.c:532 msgid "writing to stdin is not supported" msgstr "skriva till standard in stรถds inte" -#: builtin/config.c:502 +#: builtin/config.c:535 msgid "writing config blobs is not supported" msgstr "skriva konfigurations-blobbar stรถds inte" -#: builtin/config.c:587 +#: builtin/config.c:620 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12108,23 +13639,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:644 msgid "only one config file at a time" msgstr "endast en konfigurationsfil รฅt gรฅngen" -#: builtin/config.c:616 +#: builtin/config.c:650 msgid "--local can only be used inside a git repository" msgstr "--local kan bara anvรคndas inuti ett git-arkiv" -#: builtin/config.c:619 +#: builtin/config.c:652 msgid "--blob can only be used inside a git repository" msgstr "--blob kan bara anvรคndas inuti ett git-arkiv" -#: builtin/config.c:638 +#: builtin/config.c:654 +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree kan bara anvรคndas inuti ett git-arkiv" + +#: builtin/config.c:676 msgid "$HOME not set" msgstr "$HOME inte satt" -#: builtin/config.c:658 +#: builtin/config.c:700 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -12134,52 +13669,52 @@ msgstr "" "konfigurationsutรถknignen worktreeConfig har aktiverats. Lรคsa stycket\n" "\"KONFIGURATIONSFIL\" i \"git help worktree\" fรถr detaljer" -#: builtin/config.c:688 +#: builtin/config.c:735 msgid "--get-color and variable type are incoherent" msgstr "--get-color och variabeltyp stรคmmer inte รถverens" -#: builtin/config.c:693 +#: builtin/config.c:740 msgid "only one action at a time" msgstr "endast en รฅtgรคrd รฅt gรฅngen" -#: builtin/config.c:706 +#: builtin/config.c:753 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:712 +#: builtin/config.c:759 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:718 +#: builtin/config.c:765 msgid "--default is only applicable to --get" msgstr "--default gรคller bara fรถr --get" -#: builtin/config.c:731 +#: builtin/config.c:778 #, c-format msgid "unable to read config file '%s'" msgstr "kan inte konfigurationsfil \"%s\"" -#: builtin/config.c:734 +#: builtin/config.c:781 msgid "error processing config file(s)" msgstr "fel vid hantering av konfigurationsfil(er)" -#: builtin/config.c:744 +#: builtin/config.c:791 msgid "editing stdin is not supported" msgstr "redigering av standard in stรถds ej" -#: builtin/config.c:746 +#: builtin/config.c:793 msgid "editing blobs is not supported" msgstr "redigering av blobbar stรถds ej" -#: builtin/config.c:760 +#: builtin/config.c:807 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:773 +#: builtin/config.c:820 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12188,7 +13723,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:847 builtin/config.c:858 +#: builtin/config.c:894 builtin/config.c:905 #, c-format msgid "no such section: %s" msgstr "ingen sรฅdan sektion: %s" @@ -12201,11 +13736,37 @@ 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:27 +#: builtin/credential-cache--daemon.c:226 +#, 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 "" +"Behรถrigheten pรฅ din uttags-katalog (socket) รคr fรถr lรถs; andra\n" +"anvรคndare kan lรคsa dina cachade inloggningsuppgifter. Du bรถr kรถra:\n" +"\n" +"\tchmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "skriv felsรถkningsmeddelanden pรฅ standard fel" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" +"\"credential-cache--daemon\" ej tillgรคnglig; stรถd fรถr unix-uttag saknas" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "\"credential-cache\" ej tillgรคnglig; stรถd fรถr unix-uttag saknas" + +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<flaggor>] [<incheckning-igt>...]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<flaggor>] --dirty" @@ -12221,38 +13782,33 @@ msgstr "lรคttviktig" msgid "annotated" msgstr "annoterad" -#: builtin/describe.c:273 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgรคnglig" -#: builtin/describe.c:277 +#: builtin/describe.c:281 #, c-format -msgid "annotated tag %s has no embedded name" -msgstr "den annoterade taggen %s har inget inbรคddat namn" +msgid "tag '%s' is externally known as '%s'" +msgstr "taggen \"%s\" รคr utanfรถr kรคnd som \"%s\"" -#: 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:323 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:325 +#: builtin/describe.c:330 #, 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:379 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "avslutade sรถkning pรฅ %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12261,7 +13817,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:409 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12270,12 +13826,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa nรฅgra taggar." -#: builtin/describe.c:439 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:442 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12284,148 +13840,158 @@ msgstr "" "mer รคn %i taggar hittades; listar de %i senaste\n" "gav upp sรถkningen vid %s\n" -#: builtin/describe.c:510 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "beskriva %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet รคr inte giltigt: %s" -#: builtin/describe.c:521 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s รคr varken incheckning eller blob" -#: builtin/describe.c:535 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:536 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "felsรถk sรถkstrategin pรฅ standard fel" -#: builtin/describe.c:537 +#: builtin/describe.c:556 msgid "use any ref" msgstr "anvรคnd alla referenser" -#: builtin/describe.c:538 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "anvรคnd alla taggar, รคven oannoterade" -#: builtin/describe.c:539 +#: builtin/describe.c:558 msgid "always use long format" msgstr "anvรคnd alltid lรฅngt format" -#: builtin/describe.c:540 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "fรถlj endast fรถrsta fรถrรคldern" -#: builtin/describe.c:543 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "skriv endast ut exakta trรคffar" -#: builtin/describe.c:545 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "รถvervรคg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:547 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "รถvervรคg endast taggar som motsvarar <mรถnster>" -#: builtin/describe.c:549 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "รถvervรคg inte taggar som motsvarar <mรถnster>" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "visa fรถrkortade incheckningsobjekt som standard" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "mรคrke" -#: builtin/describe.c:553 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "lรคgg till <mรคrke> pรฅ lortigt arbetstrรคd (standard: \"-dirty\")" -#: builtin/describe.c:556 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "lรคgg till <mรคrke> pรฅ trasigt arbetstrรคd (standard: \"-broken\")" -#: builtin/describe.c:574 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "--long รคr inkompatibel med --abbrev=0" -#: builtin/describe.c:603 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva nรฅgot." -#: builtin/describe.c:654 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty รคr inkompatibelt med \"commit-ish\"-vรคrden" -#: builtin/describe.c:656 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "--broken รคr inkompatibelt med \"commit-ish\"-vรคrden" -#: builtin/diff.c:84 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk lรคnk" -#: builtin/diff.c:235 +#: builtin/diff.c:241 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:350 +#: builtin/diff.c:358 +#, c-format +msgid "%s...%s: no merge base" +msgstr "%s...%s: ingen sammanslagningsbas" + +#: builtin/diff.c:468 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:394 +#: builtin/diff.c:513 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs รคr felaktigt." -#: builtin/diff.c:403 +#: builtin/diff.c:524 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer รคn tvรฅ blobbar angavs: \"%s\"" -#: builtin/diff.c:408 +#: builtin/diff.c:529 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "%s...%s: flera sammanslagningsbaser, anvรคnder %s" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sรถkvรคg>...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "misslyckades: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "kunde inte lรคsa symboliska lรคnken %s" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "kunde inte lรคsa symbolisk lรคnk-fil %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, 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:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12433,53 +13999,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stรถds inte i\n" "katalogdifflรคge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bรคgge filerna รคndrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lรคmnades kvar." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "temporรคra filer finns i \"%s\"." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "du kanske vill stรคda eller rรคdda dem." -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "anvรคnd \"diff.guitool\" istรคllet fรถr \"diff.tool\"" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "utfรถr diff fรถr hela katalogen" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "frรฅga inte vid start av diff-verktyg" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "anvรคnd symboliska lรคnkar i katalogdifflรคge" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "verktyg" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "anvรคnd angivet diff-verktyg" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 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:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12487,31 +14053,31 @@ msgstr "" "lรฅt \"git-difftool\" avbryta nรคr ett anropat diff-verktyg ger returvรคrde " "skilt frรฅn noll" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando fรถr att visa diffar" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "sรคndes till \"diff\"" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool krรคver en arbetskatalog eller --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff รคr inkompatibelt med --no-index" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool och --extcmd รคr รถmsesidigt uteslutande" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs fรถr --tool=<verktyg>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs fรถr --extcmd=<kommando>" @@ -12519,26 +14085,26 @@ msgstr "inget <kommando> angavs fรถr --extcmd=<kommando>" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljรถvariabel>" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "typ" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "standard fรถr git_env_*(...) att falla tillbaka pรฅ" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "var tyst, anvรคnd bara git_env_*() som resultatvรคrde" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" "flaggan \"--default\" fรถrvรคntar ett sanningsvรคrde med \"--type=bool\", inte " "\"%s\"" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -12551,156 +14117,235 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:868 +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:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "symbolen fรถr --anonymize-map kan inte vara tom" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "visa fรถrlopp efter <n> objekt" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "vรคlj hantering av signerade taggar" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "vรคlj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1206 msgid "select handling of commit messages in an alternate encoding" msgstr "vรคlj hantering av incheckningsmeddelanden i alternativ teckenkodning" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" msgstr "Dumpa mรคrken till filen" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" msgstr "Importera mรคrken frรฅn filen" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1215 +msgid "Import marks from this file if it exists" +msgstr "Importera mรคrken frรฅn filen, om den finns" + +#: builtin/fast-export.c:1217 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare nรคr taggen saknar en" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1219 msgid "Output full tree for each commit" msgstr "Skriv ut hela trรคdet fรถr varje incheckning" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1221 msgid "Use the done feature to terminate the stream" msgstr "Anvรคnd done-funktionen fรถr att avsluta strรถmmen" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "Hoppa รถver skrivning av blob-data" -#: builtin/fast-export.c:1145 builtin/log.c:1649 +#: builtin/fast-export.c:1223 builtin/log.c:1811 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1224 msgid "Apply refspec to exported refs" msgstr "Applicera referensspecifikation pรฅ exporterade referenser" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "frรฅn:till" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "konvertera <frรฅn> till <till> i anonymiserad utdata" + +#: builtin/fast-export.c:1230 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:1151 +#: builtin/fast-export.c:1232 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:1234 +msgid "Label tags with mark ids" +msgstr "Mรคrk taggar med mรคrke-id" + +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "--anonymize-map utan --anonymize ger ingen mening" + +#: builtin/fast-export.c:1272 +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/fast-import.c:3086 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "Saknar frรฅn-mรคrken fรถr undermodulen \"%s\"" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "Saknar till-mรคrken fรถr undermodulen \"%s\"" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "Fรถrvรคntade \"mark\"-kommando, fick %s" -#: builtin/fetch.c:30 +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "Fรถrvรคntade \"to\"-kommando, fick %s" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "Fรถrvรคndae formatet namn:filnamn fรถr undermodul-omskrivningsflaggan" + +#: builtin/fast-import.c:3374 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "funktionen \"%s\" fรถrbjuden i indata utan --allow-unsafe-features" + +#: builtin/fetch-pack.c:241 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "Lรฅsfil skapad men inte rapporterad: %s" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel kan inte vara negativt" + +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "hรคmta frรฅn alla fjรคrrar" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:144 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "stรคll in uppstrรถm fรถr git pull/fetch" + +#: builtin/fetch.c:146 builtin/pull.c:188 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:129 builtin/pull.c:209 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "sรถkvรคg till upload pack pรฅ fjรคrren" -#: builtin/fetch.c:130 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "tvinga รถverskrivning av lokal referens" -#: builtin/fetch.c:132 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "hรคmta frรฅn flera fjรคrrar" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "hรคmta alla taggar och associerade objekt" -#: builtin/fetch.c:136 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "hรคmta inte alla taggar (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hรคmtas parallellt" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:159 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjรคrrspรฅrande grenar ej lรคngre pรฅ fjรคrren" -#: builtin/fetch.c:142 +#: builtin/fetch.c:161 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:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:144 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hรคmtning av undermoduler" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "skriv hรคmtade referenser till FETCH_HEAD-filen" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "behรฅll hรคmtade paket" -#: builtin/fetch.c:150 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "tillรฅt uppdatering av HEAD-referens" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "fรถrdjupa historik fรถr grund klon" -#: builtin/fetch.c:155 +#: builtin/fetch.c:176 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "fรถrdjupa historik fรถr grund klon baserad pรฅ tid" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:164 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "lรคgg till i bรถrjan av undermodulens sรถkvรคgsutdata" -#: builtin/fetch.c:167 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12708,105 +14353,137 @@ msgstr "" "standard fรถr rekursiv hรคmtning av undermoduler (lรคgre prioritet รคn " "konfigurationsfiler)" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "ange referenskarta fรถr \"fetch\"" -#: builtin/fetch.c:180 +#: builtin/fetch.c:201 builtin/pull.c:240 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:183 -msgid "run 'gc --auto' after fetching" -msgstr "kรถr \"gc --auto\" efter hรคmtning" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "kรถr \"maintenance --auto\" efter hรคmtning" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" -#: builtin/fetch.c:491 +#: builtin/fetch.c:210 +msgid "write the commit-graph after fetching" +msgstr "skriv incheckingsgrafen efter hรคmtning" + +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "ta emot referenser frรฅn standard in" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjรคrr-referensen HEAD" -#: builtin/fetch.c:630 +#: builtin/fetch.c:677 #, 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:728 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:732 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "[ร jour]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "kan inte hรคmta i aktuell gren" -#: builtin/fetch.c:756 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:761 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "skulle skriva รถver befintlig tagg" -#: builtin/fetch.c:783 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:875 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:833 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:879 +#: builtin/fetch.c:901 +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:905 +#, 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:939 #, 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:900 +#: builtin/fetch.c:960 #, 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:991 builtin/fetch.c:1124 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "Frรฅn %.*s\n" -#: builtin/fetch.c:1002 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -12815,134 +14492,124 @@ 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: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 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1095 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1128 builtin/remote.c:1036 +#: builtin/fetch.c:1195 builtin/remote.c:1113 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1151 +#: builtin/fetch.c:1218 #, 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:1170 +#: builtin/fetch.c:1237 #, 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:1173 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras fรถr %s\n" -#: builtin/fetch.c:1477 +#: builtin/fetch.c:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "flera grenar upptรคcktes, inkompatibelt med --set-upstream" + +#: builtin/fetch.c:1463 +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:1465 +msgid "not setting upstream for a remote tag" +msgstr "stรคller inte in uppstrรถm fรถr en fjรคrrtag" + +#: builtin/fetch.c:1467 +msgid "unknown branch type" +msgstr "okรคnd grentyp" + +#: builtin/fetch.c:1469 +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:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "Hรคmtar %s\n" -#: builtin/fetch.c:1479 builtin/remote.c:100 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hรคmta %s" -#: 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:1620 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "kunde inte hรคmta \"%s\" (felkod: %d)\n" -#: builtin/fetch.c:1549 +#: builtin/fetch.c:1724 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 skall hรคmtas frรฅn." +"fjรคrrarkiv som nya incheckningar ska hรคmtas frรฅn." -#: builtin/fetch.c:1586 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "Du mรฅste ange namnet pรฅ en tagg." -#: builtin/fetch.c:1637 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stรถds inte i --deepen" -#: builtin/fetch.c:1639 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth รคr รถmsesidigt uteslutande" -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte anvรคndas samtidigt" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte anvรคndas pรฅ ett komplett arkiv" -#: builtin/fetch.c:1662 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet pรฅ ett arkiv som argument" -#: builtin/fetch.c:1664 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1673 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjรคrren eller fjรคrrgruppen finns inte: %s" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1869 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:1696 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -12950,29 +14617,33 @@ msgstr "" "--filter kan endast anvรคndas med fjรคrren konfigurerad i extensions." "partialclone" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "--stdin kan bara anvรคndas fรถr att hรคmta frรฅn en fjรคrr" + +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 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:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "alias fรถr --log (avrรฅds)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "fil att lรคsa frรฅn" @@ -12985,8 +14656,9 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <objekt>]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<incheckning>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +msgstr "" +"git for-each-ref [--merged [<incheckning>]] [--no-merged <incheckning>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" @@ -13013,7 +14685,7 @@ msgstr "citera platshรฅllare passande fรถr Tcl" msgid "show only <n> matched refs" msgstr "visa endast <n> trรคffade refs" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "anvรคnd formatfรคrger" @@ -13037,32 +14709,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:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "okรคnd" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, 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:131 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" msgstr "varning i %s %s: %s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "trasig lรคnk frรฅn %7s %s" -#: builtin/fsck.c:168 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "fel objekttyp i lรคnk" -#: builtin/fsck.c:184 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" @@ -13071,239 +14743,239 @@ msgstr "" "trasig lรคnk frรฅn %7s %s\n" " till %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "saknat %s %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "onรฅbart %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "hรคngande %s %s" -#: builtin/fsck.c:349 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "kunde inte skapa lost-found" -#: builtin/fsck.c:360 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "kunde inte avsluta \"%s\"" -#: builtin/fsck.c:377 +#: builtin/fsck.c:368 #, 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:415 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Kontrollerar konnektivitet (%d objekt)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "Kontrollerar %s %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:430 msgid "broken links" msgstr "trasiga lรคnkar" -#: builtin/fsck.c:447 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "roten %s" -#: builtin/fsck.c:455 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "taggad %s %s (%s) i %s" -#: builtin/fsck.c:484 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objekt trasigt eller saknas" -#: builtin/fsck.c:509 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: ogiltig reflog-post %s" -#: builtin/fsck.c:523 +#: builtin/fsck.c:515 #, c-format msgid "Checking reflog %s->%s" msgstr "Kontrollerar reflog %s->%s" -#: builtin/fsck.c:557 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: ogiltig sha1-pekare %s" -#: builtin/fsck.c:564 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "%s: inte en incheckning!" -#: builtin/fsck.c:619 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "obs: Inga fรถrvalda referenser" -#: builtin/fsck.c:634 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objektet trasigt eller saknas: %s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: objektet kunde inte tolkas: %s" -#: builtin/fsck.c:667 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "ogiltig sha1-fil: %s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "Kontrollerar objektkatalog" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:700 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "Kontrollerar %s-lรคnk" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/fsck.c:712 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pekar pรฅ nรฅgot konstigt (%s)" -#: builtin/fsck.c:718 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: frรฅnkopplat HEAD pekar pรฅ ingenting" -#: builtin/fsck.c:722 +#: builtin/fsck.c:713 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "obs: %s pekar pรฅ en ofรถdd gren (%s)" -#: builtin/fsck.c:734 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "Kontrollerar cachetrรคd" -#: builtin/fsck.c:739 +#: builtin/fsck.c:730 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: ogiltig sha1-pekare i cachetrรคd" -#: builtin/fsck.c:750 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "icke-trรคd i cachetrรคd" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "visa onรฅbara objekt" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "gรถr indexojekt till huvudnoder" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "gรถr refloggar till huvudnoder (standard)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" -msgstr "ta รคven hรคnsyn till paket och alternativa objekt" +msgstr "ta รคven hรคnsyn till paket och supplerande objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "visa fรถrlopp" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn fรถr nรฅbara objekt" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/fsck.c:887 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "%s: objekt saknas" -#: builtin/fsck.c:899 +#: builtin/fsck.c:886 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "ogiltig parameter: fรถrvรคntade sha1, fick \"%s\"" -#: builtin/gc.c:34 +#: builtin/gc.c:36 msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" -#: builtin/gc.c:90 +#: builtin/gc.c:91 #, c-format msgid "Failed to fstat %s: %s" msgstr "Misslyckades ta status (fstat) pรฅ %s: %s" -#: builtin/gc.c:126 +#: builtin/gc.c:127 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "misslyckades tolka \"%s\" vรคrde \"%s\"" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status pรฅ \"%s\"" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "kunde inte lรคsa \"%s\"" @@ -13383,7 +15055,60 @@ 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:29 +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<uppgift>]" + +#: builtin/gc.c:812 +msgid "failed to write commit-graph" +msgstr "kunde inte skriva incheckningsgraf" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "lรฅsfilen \"%s\" finns, hoppar รถver underhรฅll" + +#: builtin/gc.c:932 +#, c-format +msgid "task '%s' failed" +msgstr "uppgiften \"%s\" misslyckades" + +#: builtin/gc.c:979 +#, c-format +msgid "'%s' is not a valid task" +msgstr "\"%s\" รคr inte en giltig uppgift" + +#: builtin/gc.c:984 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "uppgiften \"%s\" kan inte vรคljas flera gรฅnger" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "kรถr uppgifter baserad pรฅ arkivets tillstรฅnd" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "rapportera inte framgรฅng eller annan information รถver standard fel" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "uppgift" + +#: builtin/gc.c:1003 +msgid "run a specific task" +msgstr "utfรถr en specifik uppgift" + +#: builtin/gc.c:1026 +msgid "git maintenance run [<options>]" +msgstr "git maintenance run [<flaggor>]" + +#: builtin/gc.c:1037 +#, c-format +msgid "invalid subcommand: %s" +msgstr "felaktigt underkommando: %s" + +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mรถnster> [<rev>...] [[--] <sรถkvรคg>...]" @@ -13401,258 +15126,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:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2722 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "trรฅdstรถd saknas, ignorerar %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte lรคsa trรคd (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" frรฅn objekt av typen %s" -#: builtin/grep.c:714 +#: builtin/grep.c:725 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt vรคrde" -#: builtin/grep.c:813 +#: builtin/grep.c:824 msgid "search in index instead of in the work tree" msgstr "sรถk i indexet istรคllet fรถr i arbetskatalogen" -#: builtin/grep.c:815 +#: builtin/grep.c:826 msgid "find in contents not managed by git" msgstr "sรถk i innehรฅll som inte hanteras av git" -#: builtin/grep.c:817 +#: builtin/grep.c:828 msgid "search in both tracked and untracked files" msgstr "sรถk i bรฅde spรฅrade och ospรฅrade filer" -#: builtin/grep.c:819 +#: builtin/grep.c:830 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:821 +#: builtin/grep.c:832 msgid "recursively search in each submodule" msgstr "sรถk varje undermodul rekursivt" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "show non-matching lines" msgstr "visa rader som inte trรคffas" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "case insensitive matching" msgstr "skiftlรคgesokรคnslig sรถkning" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "match patterns only at word boundaries" msgstr "matcha endast mรถnster vid ordgrรคnser" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "process binary files as text" msgstr "hantera binรคrfiler som text" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "don't match patterns in binary files" msgstr "trรคffa inte mรถnster i binรคrfiler" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "process binary files with textconv filters" msgstr "hantera binรคrfiler med textconv-filter" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "search in subdirectories (default)" msgstr "sรถk i underkataloger (standard)" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "descend at most <depth> levels" msgstr "gรฅ som mest ned <djup> nivรฅer" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "use extended POSIX regular expressions" msgstr "anvรคnd utรถkade POSIX-reguljรคra uttryck" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "use basic POSIX regular expressions (default)" msgstr "anvรคnd grundlรคggande POSIX-reguljรคra uttryck (standard)" -#: builtin/grep.c:849 +#: builtin/grep.c:860 msgid "interpret patterns as fixed strings" msgstr "tolka mรถnster som fixerade strรคngar" -#: builtin/grep.c:852 +#: builtin/grep.c:863 msgid "use Perl-compatible regular expressions" msgstr "anvรคnd Perlkompatibla reguljรคra uttryck" -#: builtin/grep.c:855 +#: builtin/grep.c:866 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:856 +#: builtin/grep.c:867 msgid "show column number of first match" msgstr "visa kolumnnummer fรถr fรถrsta trรคff" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:858 +#: builtin/grep.c:869 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:862 +#: builtin/grep.c:873 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istรคllet fรถr trรคffade rader" -#: builtin/grep.c:864 +#: builtin/grep.c:875 msgid "synonym for --files-with-matches" msgstr "synonym fรถr --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show only the names of files without match" msgstr "visa endast namn pรฅ filer utan trรคffar" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:872 +#: builtin/grep.c:883 msgid "show only matching parts of a line" msgstr "visa endast trรคffade delar av rader" -#: builtin/grep.c:874 +#: builtin/grep.c:885 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:875 +#: builtin/grep.c:886 msgid "highlight matches" msgstr "ljusmarkera trรคffar" -#: builtin/grep.c:877 +#: builtin/grep.c:888 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan trรคffar frรฅn olika filer" -#: builtin/grep.c:879 +#: builtin/grep.c:890 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:882 +#: builtin/grep.c:893 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang fรถre och efter trรคffar" -#: builtin/grep.c:885 +#: builtin/grep.c:896 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang fรถre trรคffar" -#: builtin/grep.c:887 +#: builtin/grep.c:898 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter trรคffar" -#: builtin/grep.c:889 +#: builtin/grep.c:900 msgid "use <n> worker threads" msgstr "anvรคnd <n> jobbtrรฅdar" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "shortcut for -C NUM" msgstr "genvรคg fรถr -C NUM" -#: builtin/grep.c:893 +#: builtin/grep.c:904 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet fรถre trรคffen" -#: builtin/grep.c:895 +#: builtin/grep.c:906 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "read patterns from file" msgstr "lรคs mรถnster frรฅn fil" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "match <pattern>" msgstr "trรคffa <mรถnster>" -#: builtin/grep.c:902 +#: builtin/grep.c:913 msgid "combine patterns specified with -e" msgstr "kombinera mรถnster som anges med -e" -#: builtin/grep.c:914 +#: builtin/grep.c:925 msgid "indicate hit with exit status without output" msgstr "ange trรคff med slutstatuskod utan utdata" -#: builtin/grep.c:916 +#: builtin/grep.c:927 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:918 +#: builtin/grep.c:929 msgid "show parse tree for grep expression" msgstr "visa analystrรคd fรถr grep-uttryck" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "pager" msgstr "blรคddrare" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "show matching files in the pager" msgstr "visa trรคffade filer i filblรคddraren" -#: builtin/grep.c:926 +#: builtin/grep.c:937 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillรฅt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:990 +#: builtin/grep.c:1004 msgid "no pattern given" msgstr "inget mรถnster angavs" -#: builtin/grep.c:1026 +#: builtin/grep.c:1040 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte anvรคndas med revisioner" -#: builtin/grep.c:1034 +#: builtin/grep.c:1048 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slรฅ upp revision: %s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1078 +msgid "--untracked not supported with --recurse-submodules" +msgstr "--untracked stรถds inte med --recurse-submodules" + +#: builtin/grep.c:1082 msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3405 +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "trรฅdstรถd saknas, ignorerar --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719 +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trรฅdar angivet (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1122 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1117 -msgid "option not supported with --recurse-submodules" -msgstr "flaggan stรถds inte med --recurse-submodules" - -#: builtin/grep.c:1123 +#: builtin/grep.c:1148 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached och --untracked kan inte anvรคndas med --no-index" -#: builtin/grep.c:1129 +#: builtin/grep.c:1154 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:1137 +#: builtin/grep.c:1162 msgid "both --cached and trees are given" msgstr "bรฅde --cached och trรคd angavs" @@ -13694,66 +15419,66 @@ msgstr "" msgid "process file as it were from this path" msgstr "hantera filen som om den kom frรฅn sรถkvรคgen" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "visa alla tillgรคngliga kommandon" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "uteslut vรคgledningar" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "lista anvรคndbara vรคgledningar" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "visa namn pรฅ alla konfigurationsvariabler" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "visa manualsida" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "visa manual i webblรคsare" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "visa info-sida" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "visa kommandobeskrivning" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "okรคnt hjรคlpformat: \"%s\"" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" fรถr gammal (< 22)." -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "exec misslyckades fรถr \"%s\"" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -13762,7 +15487,7 @@ msgstr "" "\"%s\": sรถkvรคg fรถr man-visare som ej stรถds.\n" "Anvรคnd \"man.<verktyg>.cmd\" istรคllet." -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -13771,396 +15496,424 @@ msgstr "" "\"%s\": kommando fรถr man-visare som stรถds.\n" "Anvรคnd \"man.<verktyg>.path\" istรคllet." -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okรคnd man-visare." -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade fรถrfrรฅgan" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade fรถrfrรฅgan" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "\"%s\" รคr ett alias fรถr \"%s\"" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "felaktig alias.%s-strรคng: %s" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "anvรคndning: %s%s" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "\"git help config\" fรถr mer information" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stรคmmer inte รถverens vid %s" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det fรถrvรคntade objektet %s" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objektet %s: fรถrvรคntad typ %s, sรฅg %s" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "indatalรคsfel" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "anvรคnde fler byte รคn tillgรคngligt" -#: builtin/index-pack.c:288 builtin/pack-objects.c:600 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 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:94 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paket รคr stรถrre รคn tillรฅten maximal storlek" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:342 builtin/repack.c:254 +#, c-format +msgid "unable to create '%s'" +msgstr "kunde inte skapa \"%s\"" + +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte รถppna paketfilen \"%s\"" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "paketsignatur stรคmmer inte รถverens" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stรถds ej" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "indexvรคrdespill fรถr deltabasobjekt" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "deltabasindex utanfรถr grรคnsen" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "okรคnd objekttyp %d" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "kan inte utfรถra \"pread\" pรฅ paketfil" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "fรถr tidigt slut pรฅ paketfilen, %<PRIuMAX> byte saknas" msgstr[1] "fรถr tidigt slut pรฅ paketfilen, %<PRIuMAX> byte saknas" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: 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 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTรCKT VID %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:153 -#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "kunde inte lรคsa %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte lรคsa information om befintligt objekt %s" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "kan inte lรคsa befintligt objekt %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "fsck-fel i packat objekt" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:870 #, 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:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "misslyckades tillรคmpa delta" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "Skapar index fรถr objekt" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet รคr trasigt (SHA1 stรคmmer inte)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "kan inte utfรถra \"fstat\" pรฅ paketfil" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "paket har skrรคp i slutet" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "fรถrvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa trรฅd: %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "fรถrvirrad bortom vanvett" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1288 #, 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:1264 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Ovรคntad svanschecksumma fรถr %s (trasig disk?)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1304 #, 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:1292 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utfรถra \"deflate\" pรฅ tillagt objekt (%d)" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s รคr trasigt" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "kan inte ta skriva %s-fil \"%s\"" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "kan inte stรคnga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "fel vid stรคngning av paketfil" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte รถppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1633 #, 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:1643 +#: builtin/index-pack.c:1681 #, 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:1650 +#: builtin/index-pack.c:1688 #, 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:1689 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "Kan inte gรฅ tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "okรคnd hashningsalgoritm \"%s\"" + +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte anvรคndas med --stdin" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "--stdin krรคver ett git-arkiv" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1825 +msgid "--object-format cannot be used with --stdin" +msgstr "--object-format kan inte anvรคndas med --stdin" + +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" -#: builtin/init-db.c:61 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "kan inte ta status pรฅ mallen \"%s\"" -#: builtin/init-db.c:66 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "kan inte รถppna katalogen (opendir) \"%s\"" -#: builtin/init-db.c:78 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "kan inte lรคsa lรคnk (readlink) \"%s\"" -#: builtin/init-db.c:80 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kan inte skapa symbolisk lรคnk \"%s\" \"%s\"" -#: builtin/init-db.c:86 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kan inte kopiera \"%s\" till \"%s\"" -#: builtin/init-db.c:90 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:121 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "mallarna hittades inte i %s" -#: builtin/init-db.c:136 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "kopierade inte mallar frรฅn \"%s\": %s" -#: builtin/init-db.c:334 +#: builtin/init-db.c:274 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "ogiltigt namn pรฅ fรถrsta gren: \"%s\"" + +#: builtin/init-db.c:366 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:337 +#: builtin/init-db.c:369 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "fรถrsรถker initiera arkivet pรฅ nytt med annan hash" + +#: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:413 +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: ignorerade --initial-branch=%s" + +#: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Ominitierade befintligt Git-arkiv i %s%s\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Initierade tomt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Initierade tomt Git-arkiv i %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:529 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -14168,25 +15921,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behรถrigheter>]] [<katalog>]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:555 msgid "permissions" msgstr "behรถrigheter" -#: builtin/init-db.c:492 +#: builtin/init-db.c:556 msgid "specify that the git repository is to be shared amongst several users" -msgstr "ange att git-arkivet skall delas bland flera anvรคndare" +msgstr "ange att git-arkivet ska delas bland flera anvรคndare" + +#: builtin/init-db.c:562 +msgid "override the name of the initial branch" +msgstr "รถverstyr namnet pรฅ fรถrsta gren" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +msgid "hash" +msgstr "hash" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "ange hashningsalgoritm att anvรคnda" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:571 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--separate-git-dir och --bare รคr รถmsesidigt uteslutande" + +#: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:538 +#: builtin/init-db.c:609 builtin/init-db.c:664 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:559 +#: builtin/init-db.c:636 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -14195,11 +15964,15 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillรฅtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:587 +#: builtin/init-db.c:688 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma รฅt arbetskatalogen \"%s\"" +#: builtin/init-db.c:693 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separatebgit-dir รคr inkompatibelt med naket arkiv" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -14218,7 +15991,7 @@ msgstr "ta bort tomma slรคprader" #: builtin/interpret-trailers.c:99 msgid "where to place the new trailer" -msgstr "var nya slรคprader skall placeras" +msgstr "var nya slรคprader ska placeras" #: builtin/interpret-trailers.c:101 msgid "action if trailer already exists" @@ -14264,60 +16037,40 @@ 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:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sรถkvรคg>...]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga fรถr --decorate: %s" -#: 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 +#: builtin/log.c:177 msgid "show source" msgstr "visa kรคllkod" -#: builtin/log.c:184 +#: builtin/log.c:178 msgid "Use mail map file" msgstr "Anvรคnd e-postmappningsfil" -#: builtin/log.c:186 +#: builtin/log.c:181 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mรถnster>" -#: builtin/log.c:188 +#: builtin/log.c:183 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mรถnster>" -#: builtin/log.c:189 +#: builtin/log.c:184 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:192 +#: builtin/log.c:187 msgid "Process line range n,m in file, counting from 1" msgstr "Behandla radintervallet n,m i filen, med bรถrjan pรฅ 1" @@ -14326,79 +16079,84 @@ msgstr "Behandla radintervallet n,m i filen, med bรถrjan pรฅ 1" msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:551 +#: builtin/log.c:555 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:566 builtin/log.c:660 +#: builtin/log.c:570 builtin/log.c:665 #, c-format msgid "could not read object %s" msgstr "kunde inte lรคsa objektet %s" -#: builtin/log.c:685 +#: builtin/log.c:690 #, c-format msgid "unknown type: %d" msgstr "okรคnd typ: %d" -#: builtin/log.c:808 +#: builtin/log.c:839 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%s: ogiltigt omslag frรฅn beskrivningslรคge" + +#: builtin/log.c:846 msgid "format.headers without value" msgstr "format.headers utan vรคrde" -#: builtin/log.c:925 +#: builtin/log.c:965 msgid "name of output directory is too long" msgstr "namnet pรฅ utdatakatalogen รคr fรถr lรฅngt" -#: builtin/log.c:941 +#: builtin/log.c:981 #, c-format msgid "cannot open patch file %s" msgstr "kan inte รถppna patchfilen %s" -#: builtin/log.c:958 +#: builtin/log.c:998 msgid "need exactly one range" msgstr "behรถver precis ett intervall" -#: builtin/log.c:968 +#: builtin/log.c:1008 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1091 +#: builtin/log.c:1172 msgid "cover letter needs email format" msgstr "omslagsbrevet behรถver e-postformat" -#: builtin/log.c:1097 +#: builtin/log.c:1178 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil fรถr omslagsbrev" -#: builtin/log.c:1176 +#: builtin/log.c:1259 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1203 +#: builtin/log.c:1286 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1261 +#: builtin/log.c:1344 msgid "two output directories?" msgstr "tvรฅ utdatakataloger?" -#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 #, c-format msgid "unknown commit %s" msgstr "okรคnd incheckning %s" -#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1506 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:1387 +#: builtin/log.c:1515 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1391 +#: builtin/log.c:1525 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" @@ -14408,373 +16166,386 @@ 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:1411 +#: builtin/log.c:1548 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1422 +#: builtin/log.c:1565 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bรถr vara fรถrfader till revisionslistan" -#: builtin/log.c:1426 +#: builtin/log.c:1575 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bรถr inte vara i revisionslistan" -#: builtin/log.c:1479 +#: builtin/log.c:1633 msgid "cannot get patch id" msgstr "kan inte hรคmta patch-id" -#: builtin/log.c:1531 -msgid "failed to infer range-diff ranges" -msgstr "misslyckades rรคkna ut intervall range-diff" +#: builtin/log.c:1690 +msgid "failed to infer range-diff origin of current series" +msgstr "misslyckades rรคkna ut intervalldiff-ursprung fรถr aktuell serie" + +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "anvรคnd \"%s\" som intervalldiff-ursprung fรถr aktuell serie" -#: builtin/log.c:1576 +#: builtin/log.c:1736 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:1579 +#: builtin/log.c:1739 msgid "use [PATCH] even with multiple patches" msgstr "anvรคnd [PATCH] รคven fรถr flera patchar" -#: builtin/log.c:1583 +#: builtin/log.c:1743 msgid "print patches to standard out" msgstr "skriv patcharna pรฅ standard ut" -#: builtin/log.c:1585 +#: builtin/log.c:1745 msgid "generate a cover letter" msgstr "generera ett fรถljebrev" -#: builtin/log.c:1587 +#: builtin/log.c:1747 msgid "use simple number sequence for output file names" msgstr "anvรคnd enkel nummersekvens fรถr utdatafilnamn" -#: builtin/log.c:1588 +#: builtin/log.c:1748 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1589 +#: builtin/log.c:1749 msgid "use <sfx> instead of '.patch'" msgstr "anvรคnd <sfx> istรคllet fรถr \".patch\"" -#: builtin/log.c:1591 +#: builtin/log.c:1751 msgid "start numbering patches at <n> instead of 1" msgstr "bรถrja numrera patchar pรฅ <n> istรคllet fรถr 1" -#: builtin/log.c:1593 +#: builtin/log.c:1753 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te fรถrsรถk" -#: builtin/log.c:1595 +#: builtin/log.c:1755 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Anvรคnd [RFC PATCH] istรคllet fรถr [PATCH]" -#: builtin/log.c:1598 +#: builtin/log.c:1758 +msgid "cover-from-description-mode" +msgstr "cover-from-description-lรคge" + +#: builtin/log.c:1759 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "skapa delar av omslagsbrevet baserat pรฅ grenbeskrivelsen" + +#: builtin/log.c:1761 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Anvรคnd [<prefix>] istรคllet fรถr [PATCH]" -#: builtin/log.c:1601 +#: builtin/log.c:1764 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1604 +#: builtin/log.c:1767 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lรคgg till [PATCH]" -#: builtin/log.c:1607 +#: builtin/log.c:1770 msgid "don't output binary diffs" msgstr "skriv inte binรคra diffar" -#: builtin/log.c:1609 +#: builtin/log.c:1772 msgid "output all-zero hash in From header" msgstr "anvรคnd hashvรคrde med nollor i From-huvud" -#: builtin/log.c:1611 +#: builtin/log.c:1774 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppstrรถmsincheckning" -#: builtin/log.c:1613 +#: builtin/log.c:1776 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istรคllet fรถr standard (patch + stat)" -#: builtin/log.c:1615 +#: builtin/log.c:1778 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1616 +#: builtin/log.c:1779 msgid "header" msgstr "huvud" -#: builtin/log.c:1617 +#: builtin/log.c:1780 msgid "add email header" msgstr "lรคgg till e-posthuvud" -#: builtin/log.c:1618 builtin/log.c:1620 +#: builtin/log.c:1781 builtin/log.c:1782 msgid "email" msgstr "epost" -#: builtin/log.c:1618 +#: builtin/log.c:1781 msgid "add To: header" msgstr "lรคgg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1620 +#: builtin/log.c:1782 msgid "add Cc: header" msgstr "lรคgg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1622 +#: builtin/log.c:1783 msgid "ident" msgstr "ident" -#: builtin/log.c:1623 +#: builtin/log.c:1784 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:1625 +#: builtin/log.c:1786 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1626 +#: builtin/log.c:1787 msgid "make first mail a reply to <message-id>" msgstr "gรถr det fรถrsta brevet ett svar till <meddelande-id>" -#: builtin/log.c:1627 builtin/log.c:1630 +#: builtin/log.c:1788 builtin/log.c:1791 msgid "boundary" msgstr "grรคns" -#: builtin/log.c:1628 +#: builtin/log.c:1789 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1631 +#: builtin/log.c:1792 msgid "inline the patch" msgstr "gรถr patchen ett inline-objekt" -#: builtin/log.c:1635 +#: builtin/log.c:1796 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrรฅdning, typer: shallow, deep" -#: builtin/log.c:1637 +#: builtin/log.c:1798 msgid "signature" msgstr "signatur" -#: builtin/log.c:1638 +#: builtin/log.c:1799 msgid "add a signature" msgstr "lรคgg till signatur" -#: builtin/log.c:1639 +#: builtin/log.c:1800 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1640 +#: builtin/log.c:1801 msgid "add prerequisite tree info to the patch series" msgstr "lรคgg till fรถrhandskrรคvd trรคdinfo i patchserien" -#: builtin/log.c:1642 +#: builtin/log.c:1804 msgid "add a signature from a file" msgstr "lรคgg till signatur frรฅn fil" -#: builtin/log.c:1643 +#: builtin/log.c:1805 msgid "don't print the patch filenames" msgstr "visa inte filnamn fรถr patchar" -#: builtin/log.c:1645 +#: builtin/log.c:1807 msgid "show progress while generating patches" msgstr "visa fรถrloppsindikator medan patchar skapas" -#: builtin/log.c:1647 +#: builtin/log.c:1809 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa รคndringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1650 +#: builtin/log.c:1812 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa รคndringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1652 +#: builtin/log.c:1814 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vรคgs med" -#: builtin/log.c:1727 +#: builtin/log.c:1896 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1742 +#: builtin/log.c:1911 msgid "-n and -k are mutually exclusive" msgstr "-n och -k kan inte anvรคndas samtidigt" -#: builtin/log.c:1744 +#: builtin/log.c:1913 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc och -k kan inte anvรคndas samtidigt" -#: builtin/log.c:1752 +#: builtin/log.c:1921 msgid "--name-only does not make sense" msgstr "kan inte anvรคnda --name-only" -#: builtin/log.c:1754 +#: builtin/log.c:1923 msgid "--name-status does not make sense" msgstr "kan inte anvรคnda --name-status" -#: builtin/log.c:1756 +#: builtin/log.c:1925 msgid "--check does not make sense" msgstr "kan inte anvรคnda --check" -#: builtin/log.c:1788 +#: builtin/log.c:1958 msgid "standard output, or directory, which one?" -msgstr "standard ut, eller katalog, vilken skall det vara?" +msgstr "standard ut, eller katalog, vilken ska det vara?" -#: builtin/log.c:1877 +#: builtin/log.c:2062 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff krรคver --cover-letter eller ensam patch" -#: builtin/log.c:1881 +#: builtin/log.c:2066 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1882 +#: builtin/log.c:2067 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:1888 +#: builtin/log.c:2073 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor krรคver --range-diff" -#: builtin/log.c:1892 +#: builtin/log.c:2077 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff krรคver --cover-letter eller ensam patch" -#: builtin/log.c:1900 +#: builtin/log.c:2085 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:1901 +#: builtin/log.c:2086 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:1912 +#: builtin/log.c:2097 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte lรคsa signaturfil \"%s\"" -#: builtin/log.c:1948 +#: builtin/log.c:2133 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:1992 +#: builtin/log.c:2177 msgid "failed to create output files" msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2051 +#: builtin/log.c:2236 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppstrรถm> [<huvud> [<grรคns>]]]" -#: builtin/log.c:2105 +#: builtin/log.c:2290 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spรฅrad fjรคrrgren, ange <uppstrรถm> manuellt.\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "anvรคnd smรฅ bokstรคver fรถr \"anta ofรถrรคndrade\"-filer" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "anvรคnd smรฅ bokstรคver fรถr \"fsmonitor clean\"-filer" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "visa kรถat innehรฅlls objektnamn i utdata" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behรถver tas bort" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "visa endast namn fรถr \"andra\" kataloger" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "hoppa รถver filer som motsvarar mรถnster" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "exkludera mรถnster som lรคses frรฅn <fil>" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "lรคs ytterligare per-katalog-exkluderingsmรถnster frรฅn <fil>" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "lรคgg till git:s standardexkluderingar" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "gรถr utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte รคr indexet, betrakta det som ett fel" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "trรคd-igt" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "lรฅtsas att sรถkvรคgar borttagna sedan <trรคd-igt> fortfarande finns" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "visa felsรถkningsutdata" @@ -14792,7 +16563,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:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 msgid "exec" msgstr "exec" @@ -14865,192 +16636,303 @@ msgstr "visa hela trรคdet; inte bara aktuell katalog (implicerar --full-name)" msgid "empty mbox: '%s'" msgstr "tom mbox: \"%s\"" -#: builtin/merge.c:55 +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..." + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <incheckning>..." + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <incheckning>..." + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <ref> [<incheckning>]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "skriv ut alla gemensamma anfรคder" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "hitta anfader fรถr enkel n-vรคgssammanslagning" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "visa revisioner som inte kan nรฅs frรฅn andra" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "รคr den fรถrsta anfader till den andra?" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "se var <incheckning> grenades av frรฅn referensloggen frรฅn <ref>" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" +"git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> " +"<origfil> <fil2>" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "sรคnd resultat till standard ut" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "anvรคnd diff3-baserad sammanslagning" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "fรถr konflikter, anvรคnd vรฅr version" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "fรถr konflikter, anvรคnd deras version" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "fรถr konflikter, anvรคnd en fรถrenad version" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "fรถr konflikter, anvรคnd denna markรถrstorlek" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "varna inte om konflikter" + +#: builtin/merge-file.c:47 +msgid "set labels for file1/orig-file/file2" +msgstr "sรคtt etiketter fรถr fil1/origfil/fil2" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "okรคnd flagga %s" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "kunde inte tolka objektet \"%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] "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 +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 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "kunde inte bestรคmma referensen \"%s\"" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Slรฅr ihop %s med %s\n" + +#: builtin/merge.c:56 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:120 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behรถver ett vรคrde" -#: builtin/merge.c:141 +#: builtin/merge.c:143 #, c-format msgid "option `%s' requires a value" msgstr "flaggan \"%s\" behรถver ett vรคrde" -#: builtin/merge.c:187 +#: builtin/merge.c:189 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:188 +#: builtin/merge.c:190 #, c-format msgid "Available strategies are:" msgstr "Tillgรคngliga strategier รคr:" -#: builtin/merge.c:193 +#: builtin/merge.c:195 #, c-format msgid "Available custom strategies are:" msgstr "Tillgรคngliga skrรคddarsydda strategier รคr:" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:246 builtin/pull.c:133 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:247 builtin/pull.c:154 +#: builtin/merge.c:249 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat nรคr sammanslagningen รคr fรคrdig" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:250 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:252 builtin/pull.c:142 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:253 builtin/pull.c:166 +#: builtin/merge.c:255 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istรคllet fรถr en sammanslagning" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:257 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "utfรถr en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:259 builtin/pull.c:154 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:259 +#: builtin/merge.c:261 msgid "allow fast-forward (default)" msgstr "tillรฅt snabbspolning (standard)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:263 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte รคr mรถjlig" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:267 builtin/pull.c:164 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:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:269 builtin/pull.c:169 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att anvรคnda" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option=value" msgstr "alternativ=vรคrde" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "alternativ fรถr vald sammanslagningsstrategi" -#: builtin/merge.c:271 +#: builtin/merge.c:273 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande fรถr (icke snabbspolande) sammanslagning" -#: builtin/merge.c:278 +#: builtin/merge.c:280 msgid "abort the current in-progress merge" msgstr "avbryt den pรฅgรฅende sammanslagningen" -#: builtin/merge.c:280 +#: builtin/merge.c:282 msgid "--abort but leave index and working tree alone" msgstr "--abort men lรคmna index och arbetskatalog ensamma" -#: builtin/merge.c:282 +#: builtin/merge.c:284 msgid "continue the current in-progress merge" msgstr "fortsรคtt den pรฅgรฅende sammanslagningen" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:286 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "tillรฅt sammanslagning av orelaterade historier" -#: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "bekrรคfta commit-msg-krok" +#: builtin/merge.c:293 +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "fรถrbigรฅ pre-merge-commit- och commit-msg-krokar" -#: builtin/merge.c:307 +#: builtin/merge.c:310 msgid "could not run stash." msgstr "kunde kรถra stash." -#: builtin/merge.c:312 +#: builtin/merge.c:315 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:317 +#: builtin/merge.c:320 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:342 builtin/merge.c:359 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:386 +#: builtin/merge.c:389 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:450 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:498 +#: builtin/merge.c:501 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka pรฅ en incheckning" -#: builtin/merge.c:585 +#: builtin/merge.c:588 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-strรคng: %s" -#: builtin/merge.c:708 +#: builtin/merge.c:713 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte nรฅgot annat รคn en sammanslagning av tvรฅ huvuden." -#: builtin/merge.c:722 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga fรถr merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:789 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte lรคsa frรฅn \"%s\"" -#: builtin/merge.c:798 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; anvรคnd \"git commit\" fรถr att slutfรถra " "den.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:808 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" @@ -15061,11 +16943,11 @@ msgstr "" "temagren.\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:813 msgid "An empty message aborts the commit.\n" msgstr "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:816 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15074,73 +16956,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:869 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:872 +#: builtin/merge.c:884 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:945 #, 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:972 +#: builtin/merge.c:984 msgid "No current branch." msgstr "Inte pรฅ nรฅgon gren." -#: builtin/merge.c:974 +#: builtin/merge.c:986 msgid "No remote for the current branch." msgstr "Ingen fjรคrr fรถr aktuell gren." -#: builtin/merge.c:976 +#: builtin/merge.c:988 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppstrรถm angiven fรถr aktuell gren." -#: builtin/merge.c:981 +#: builtin/merge.c:993 #, 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:1038 +#: builtin/merge.c:1050 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt vรคrde \"%s\" i miljรถvariabeln \"%s\"" -#: builtin/merge.c:1141 +#: builtin/merge.c:1153 #, 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:1175 +#: builtin/merge.c:1187 msgid "not something we can merge" msgstr "inte nรฅgot vi kan slรฅ ihop" -#: builtin/merge.c:1278 +#: builtin/merge.c:1291 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1282 +#: builtin/merge.c:1295 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1291 +#: builtin/merge.c:1313 msgid "--quit expects no arguments" msgstr "--quit tar inga argument" -#: builtin/merge.c:1304 +#: builtin/merge.c:1326 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1308 +#: builtin/merge.c:1330 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pรฅgรฅr (MERGE_HEAD saknas)." -#: builtin/merge.c:1324 +#: builtin/merge.c:1346 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15148,7 +17030,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina รคndringar innan du slรฅr ihop." -#: builtin/merge.c:1331 +#: builtin/merge.c:1353 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15156,212 +17038,101 @@ 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:1334 +#: builtin/merge.c:1356 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:1348 +#: builtin/merge.c:1370 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1350 +#: builtin/merge.c:1372 msgid "You cannot combine --squash with --commit." msgstr "Du kan inte kombinera --squash med --commit." -#: builtin/merge.c:1366 +#: builtin/merge.c:1388 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream รคr ej satt." -#: builtin/merge.c:1383 +#: builtin/merge.c:1405 msgid "Squash commit into empty head not supported yet" msgstr "Stรถder inte en tillplattningsincheckning pรฅ ett tomt huvud รคnnu" -#: builtin/merge.c:1385 +#: builtin/merge.c:1407 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:1390 +#: builtin/merge.c:1412 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte nรฅgot vi kan slรฅ ihop" -#: builtin/merge.c:1392 +#: builtin/merge.c:1414 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:1471 +#: builtin/merge.c:1495 msgid "refusing to merge unrelated histories" msgstr "vรคgrar slรฅ samman orelaterad historik" -#: builtin/merge.c:1480 +#: builtin/merge.c:1504 msgid "Already up to date." msgstr "Redan ร jour." -#: builtin/merge.c:1490 +#: builtin/merge.c:1514 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1560 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Fรถrsรถker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1567 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1592 msgid "Already up to date. Yeeah!" msgstr "Redan ร jour. Toppen!" -#: builtin/merge.c:1570 +#: builtin/merge.c:1598 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1626 builtin/merge.c:1691 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "ร terspolar trรคdet till orรถrt...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1630 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Fรถrsรถker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1682 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1684 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1693 #, 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:1672 +#: builtin/merge.c:1707 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatisk sammanslagning lyckades; stoppar fรถre incheckning som รถnskat\n" -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..." - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <incheckning>..." - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <incheckning>..." - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <ref> [<incheckning>]" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "skriv ut alla gemensamma anfรคder" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "hitta anfader fรถr enkel n-vรคgssammanslagning" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "visa revisioner som inte kan nรฅs frรฅn andra" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "รคr den fรถrsta anfader till den andra?" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "se var <incheckning> grenades av frรฅn referensloggen frรฅn <ref>" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" -"git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> " -"<origfil> <fil2>" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "sรคnd resultat till standard ut" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "anvรคnd diff3-baserad sammanslagning" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "fรถr konflikter, anvรคnd vรฅr version" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "fรถr konflikter, anvรคnd deras version" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "fรถr konflikter, anvรคnd en fรถrenad version" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "fรถr konflikter, anvรคnd denna markรถrstorlek" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "varna inte om konflikter" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "sรคtt etiketter fรถr fil1/origfil/fil2" - -#: builtin/merge-recursive.c:46 -#, c-format -msgid "unknown option %s" -msgstr "okรคnd flagga %s" - -#: builtin/merge-recursive.c:52 -#, c-format -msgid "could not parse object '%s'" -msgstr "kunde inte tolka objektet \"%s\"" - -#: 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: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: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:78 -#, c-format -msgid "Merging %s with %s\n" -msgstr "Slรฅr ihop %s med %s\n" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -15380,17 +17151,17 @@ msgstr "tillรฅt skapa mer รคn ett trรคd" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -"git multi-pack-index [--object-dir=<kat>] (write|verify|expire|repack --" -"batch-size=<storlek>)" +"git multi-pack-index [<flaggor>] (write|verify|expire|repack --batch-" +"size=<storlek>)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 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:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -15398,15 +17169,15 @@ msgstr "" "vid ompackning, samla mindre paketfiler i en bunt som รคr stรถrre รคn denna " "storlekt" -#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "fรถr mรฅnga argument" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 msgid "--batch-size option is only for 'repack' subcommand" msgstr "flaggan --batch-size anvรคnds bara i underkommandot \"repack\"" -#: builtin/multi-pack-index.c:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "okรคnt underkommando: %s" @@ -15438,113 +17209,117 @@ msgstr "tvinga flytta/รคndra namn รคven om mรฅlet finns" msgid "skip move/rename errors" msgstr "hoppa รถver fel vid flytt/namnรคndring" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "destinationen \"%s\" รคr ingen katalog" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "felaktig kรคlla" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig sjรคlv" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "kan inte flytta katalog รถver fil" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "kรคllkatalogen รคr tom" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "inte versionshanterad" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "i konflikt" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "skriver รถver \"%s\"" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "Kan inte skriva รถver" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "flera kรคllor fรถr samma mรฅl" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "destinationskatalogen finns inte" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, kรคlla=%s, mรฅl=%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn pรฅ %s till %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520 +#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn pรฅ \"%s\"" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:411 -msgid "print only names (no SHA-1)" -msgstr "skriv endast namn (ingen SHA-1)" +#: builtin/name-rev.c:524 +msgid "print only ref-based names (no object names)" +msgstr "skriv endast referensbaserade namn (inga objektnamn)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "anvรคnd endast taggar fรถr att namnge incheckningar" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "anvรคnd endast referenser som motsvarar <mรถnster>" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ignorera referenser som motsvarar <mรถnster>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nรฅs alla referenser" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "lรคs frรฅn standard in" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "tillรฅt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (anvรคnds internt)" @@ -15691,7 +17466,7 @@ msgstr "kunde inte skriva anteckningsobjekt" msgid "the note contents have been left in %s" msgstr "anteckningens innehรฅll har lรคmnats kvar i %s" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte รถppna eller lรคsa \"%s\"" @@ -15925,7 +17700,7 @@ msgstr "" "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " "sammanslagningen med \"git notes merge --abort\".\n" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slรฅ upp \"%s\" som en giltig referens." @@ -15943,7 +17718,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:165 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" @@ -15959,142 +17734,135 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "anvรคnd anteckningar frรฅn <anteckningsref>" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1605 #, c-format msgid "unknown subcommand: %s" msgstr "okรคnt underkommando: %s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:424 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "felaktig CRC fรถr packat objekt %s" -#: builtin/pack-objects.c:435 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "trasigt packat objekt fรถr %s" -#: builtin/pack-objects.c:566 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "rekursivt delta upptรคcktes fรถr objektet %s" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "ordnade %u objekt, fรถrvรคntade %<PRIu32>" -#: 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 +#: builtin/pack-objects.c:1004 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:850 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:912 builtin/update-index.c:89 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status pรฅ %s" -#: builtin/pack-objects.c:965 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "skrev %<PRIu32> objekt medan %<PRIu32> fรถrvรคntades" -#: builtin/pack-objects.c:1161 +#: builtin/pack-objects.c:1348 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:1591 +#: builtin/pack-objects.c:1796 #, 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:1600 +#: builtin/pack-objects.c:1805 #, 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:1869 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "Rรคknar objekt" -#: 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 +#: builtin/pack-objects.c:2231 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud fรถr %s" -#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100 -#: builtin/pack-objects.c:2110 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte lรคsas" -#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, 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:2124 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2656 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering anvรคnder upp till %d trรฅdar" -#: builtin/pack-objects.c:2582 +#: builtin/pack-objects.c:2795 #, 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:2669 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "deltarรคknaren รคr inkonsekvent" -#: builtin/pack-objects.c:2756 +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" +"vรคrdet pรฅ uploadpack.blobpackfileuri mรฅste vara pรฅ formen '<objekt-hash> " +"<paket-hash> <uri>' (fick '%s')" + +#: builtin/pack-objects.c:2964 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" +"objektet redan konfigurerat i et annat uploadpack.blobpackfileuri (fick '%s)" + +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16103,7 +17871,7 @@ msgstr "" "fรถrvรคntade kant-objekt-id, fick skrรคp:\n" " %s" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16112,243 +17880,243 @@ msgstr "" "fรถrvรคntade objekt-id, fick skrรคp:\n" " %s" -#: builtin/pack-objects.c:2860 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "ogiltigt vรคrde fรถr --missing" -#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "kan inte รถppna paketfilen" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:3187 #, 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:3035 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "kan inte tvinga lรถsa objekt" -#: builtin/pack-objects.c:3127 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3130 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3155 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "kan inte lรคgga till nya objekt" -#: builtin/pack-objects.c:3208 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stรถds ej" -#: builtin/pack-objects.c:3212 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: 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 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3251 +#: builtin/pack-objects.c:3489 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "maximal storlek pรฅ varje utdatapaketfil" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" -msgstr "ignorera lรฅnade objekt frรฅn alternativa objektlager" +msgstr "ignorera lรฅnade objekt frรฅn supplerande objektlager" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "begrรคnsa paketfรถnster efter objekt" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3500 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:3264 +#: builtin/pack-objects.c:3502 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:3266 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "รฅteranvรคnd befintliga delta" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "รฅteranvรคnd befintliga objekt" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "anvรคnd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3510 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:3274 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "fรถrsรถk inte skapa tom paketutdata" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "lรคs revisionsargument frรฅn standard in" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3516 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:3281 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nรฅs frรฅn nรฅgon referens" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras frรฅn referensloggposter" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras frรฅn indexet" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "skriv paket pรฅ standard ut" -#: builtin/pack-objects.c:3292 +#: builtin/pack-objects.c:3530 msgid "include tag objects that refer to objects to be packed" -msgstr "inkludera taggobjekt som refererar objekt som skall packas" +msgstr "inkludera taggobjekt som refererar objekt som ska packas" -#: builtin/pack-objects.c:3294 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "behรฅll onรฅbara objekt" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "packa lรถsa onรฅbara objekt" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onรฅbara objekt nyare รคn <tid>" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" msgstr "anvรคnd gles-nรฅbarhetsalgoritmen" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3305 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lรคmpade fรถr grunda hรคmtningar" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhรถrande .keep-fil" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "komprimeringsgrad fรถr paket" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "gรถm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3553 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:3317 +#: builtin/pack-objects.c:3555 msgid "write a bitmap index together with the pack index" msgstr "anvรคnd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3320 +#: builtin/pack-objects.c:3559 +msgid "write a bitmap index if possible" +msgstr "skriv bitkartindex om mรถjligt" + +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3566 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3325 +#: builtin/pack-objects.c:3568 msgid "respect islands during delta compression" msgstr "respektera รถar under deltakomprimering" -#: builtin/pack-objects.c:3350 +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "protokoll" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "" +"uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll" + +#: builtin/pack-objects.c:3600 #, 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:3355 +#: builtin/pack-objects.c:3605 #, 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:3409 +#: builtin/pack-objects.c:3659 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 skall รถverfรถras" +"--max-pack-size kan inte anvรคndas fรถr att bygga ett paket som ska รถverfรถras" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3661 msgid "minimum pack size limit is 1 MiB" msgstr "minsta packstorlek รคr 1 MiB" -#: builtin/pack-objects.c:3416 +#: builtin/pack-objects.c:3666 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:3419 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable och -unpack-unreachable kan inte anvรคndas samtidigt" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3675 msgid "cannot use --filter without --stdout" msgstr "kan inte anvรคnda --filter utan --stdout" -#: builtin/pack-objects.c:3486 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "Rรคknar upp objekt" -#: builtin/pack-objects.c:3516 +#: builtin/pack-objects.c:3766 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" msgstr "" -"Totalt %<PRIu32> (delta %<PRIu32>), รฅteranvรคnde %<PRIu32> (delta %<PRIu32>)" +"Totalt %<PRIu32> (delta %<PRIu32>), รฅteranvรคnde %<PRIu32> (delta %<PRIu32>), " +"paket-รฅteranvรคnda %<PRIu32>" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -16362,81 +18130,106 @@ msgstr "packa allt" msgid "prune loose refs (default)" msgstr "ta bort lรถsa referenser (standard)" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 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 "Tar bort duplicerade objekt" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "lรฅt tid gรฅ ut fรถr objekt รคldre รคn <tid>" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "begrรคnsa vandring av objekt utanfรถr kontraktspackfiler." -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt vรคrde fรถr %s: %s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:141 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "styrning fรถr rekursiv hรคmtning av undermoduler" -#: builtin/pull.c:145 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "Alternativ gรคllande sammanslagning" -#: builtin/pull.c:148 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma รคndringar genom ombasering i stรคllet fรถr sammanslagning" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 msgid "allow fast-forward" msgstr "tillรฅt snabbspolning" -#: 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:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" +msgstr "utfรถr automatiskt stash/stash pop fรถre och efter" -#: builtin/pull.c:201 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "Alternativ gรคllande hรคmtningar" -#: builtin/pull.c:211 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "tvinga รถverskrivning av lokal gren" -#: builtin/pull.c:219 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hรคmtas parallellt" -#: builtin/pull.c:316 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt vรคrde fรถr pull.ff: %s" -#: builtin/pull.c:433 +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"Det avrรฅds frรฅn att gรถra \"pull\" utan att ange hur avvikande grenar\n" +"ska fรถrlikas. Du kan ta bort det hรคr meddelandet genom att kรถra ett av\n" +"fรถljande kommandon innan du gรถr \"pull\" nรคsta gรฅng: \n" +"\n" +" git config pull.rebase false # sammanslagning (fรถrvald strategi)\n" +" git config pull.rebase true # ombasering\n" +" git config pull.ff only # endast snabbspolning\n" +"\n" +"Du kan ersรคtta \"git config\" med \"git config --global\" fรถr att vรคlja en\n" +"fรถrvald instรคllning fรถr alla arkiv. Du kan ocksรฅ ange --rebase, --no-rebase\n" +"eller --ff-only pรฅ kommandoraden fรถr att รถverstyra det konfigurerade\n" +"fรถrvalet vid kรถrning.\n" + +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16444,14 +18237,14 @@ msgstr "" "Det finns ingen kandidat fรถr ombasering bland referenserna du precis har " "hรคmtat." -#: builtin/pull.c:435 +#: builtin/pull.c:460 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:436 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16459,7 +18252,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:439 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16470,42 +18263,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:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1240 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:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 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:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 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:449 builtin/pull.c:464 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) fรถr detaljer." -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 msgid "<remote>" msgstr "<fjรคrr>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1238 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:468 git-parse-remote.sh:95 +#: builtin/pull.c:493 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:473 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16514,32 +18307,28 @@ 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:581 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "kunde inte komma รฅt incheckningen %s" -#: builtin/pull.c:861 +#: builtin/pull.c:894 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures fรถr ombasering" -#: builtin/pull.c:916 -msgid "--[no-]autostash option is only valid with --rebase." -msgstr "--[no-]autostash รคr endast giltig med --rebase." - -#: builtin/pull.c:924 +#: builtin/pull.c:954 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:928 +#: builtin/pull.c:958 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:929 +#: builtin/pull.c:959 msgid "please commit or stash them." msgstr "checka in eller anvรคnd \"stash\" pรฅ dem." -#: builtin/pull.c:954 +#: builtin/pull.c:984 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16550,7 +18339,7 @@ msgstr "" "snabbspolar din arbetskatalog frรฅn\n" "incheckningen %s." -#: builtin/pull.c:960 +#: builtin/pull.c:990 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16567,15 +18356,15 @@ msgstr "" "$ git reset --hard\n" "fรถr att รฅtergรฅ." -#: builtin/pull.c:975 +#: builtin/pull.c:1005 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slรฅ ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:979 +#: builtin/pull.c:1009 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpรฅ flera grenar." -#: builtin/pull.c:986 +#: builtin/pull.c:1017 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade รคndringar i undermoful" @@ -16587,11 +18376,11 @@ msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" msgid "tag shorthand without <tag>" msgstr "taggfรถrkortning utan <tagg>" -#: builtin/push.c:121 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla mรฅlreferensnamn" -#: builtin/push.c:167 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -16600,7 +18389,7 @@ msgstr "" "Fรถr att vรคlja ett av alternativen permanent, se push.default i \"git help " "config\"." -#: builtin/push.c:170 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16625,7 +18414,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16640,7 +18429,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-pรฅ-fjรคrrgren>\n" -#: builtin/push.c:199 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16653,12 +18442,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:202 #, 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:210 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -16667,16 +18456,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" -"skall sรคndas fรถr att uppdatera fjรคrrgrenen." +"ska sรคndas fรถr att uppdatera fjรคrrgrenen." -#: builtin/push.c:269 +#: builtin/push.c:260 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:276 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -16688,7 +18477,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:282 +#: builtin/push.c:273 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" @@ -16700,7 +18489,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:288 +#: builtin/push.c:279 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" @@ -16714,11 +18503,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:295 +#: builtin/push.c:286 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:298 +#: builtin/push.c:289 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" @@ -16729,140 +18518,140 @@ msgstr "" "pekar pรฅ nรฅgot som inte รคr en incheckning, utan att anvรคnda flaggan\n" "\"--force\".\n" -#: builtin/push.c:359 +#: builtin/push.c:351 #, c-format msgid "Pushing to %s\n" msgstr "Sรคnder till %s\n" -#: builtin/push.c:364 +#: builtin/push.c:358 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sรคnda vissa referenser till \"%s\"" -#: 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 +#: builtin/push.c:532 msgid "repository" msgstr "arkiv" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:533 builtin/send-pack.c:183 msgid "push all refs" msgstr "sรคnd alla referenser" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:534 builtin/send-pack.c:185 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:558 +#: builtin/push.c:536 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:559 +#: builtin/push.c:537 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:562 builtin/send-pack.c:167 +#: builtin/push.c:540 builtin/send-pack.c:186 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:541 builtin/send-pack.c:198 msgid "<refname>:<expect>" msgstr "<refnamn>:<fรถrvรคnta>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:542 builtin/send-pack.c:199 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:568 +#: builtin/push.c:545 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insรคndning av undermoduler" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:546 builtin/send-pack.c:193 msgid "use thin pack" msgstr "anvรคnd tunna paket" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 msgid "receive pack program" msgstr "program fรถr att ta emot paket" -#: builtin/push.c:573 +#: builtin/push.c:549 msgid "set upstream for git pull/status" msgstr "stรคll in uppstrรถm fรถr git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:552 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:578 +#: builtin/push.c:554 msgid "bypass pre-push hook" msgstr "fรถrbigรฅ pre-push-krok" -#: builtin/push.c:579 +#: builtin/push.c:555 msgid "push missing but relevant tags" msgstr "sรคnd in saknade men relevanta taggar" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:557 builtin/send-pack.c:187 msgid "GPG sign the push" msgstr "GPG-signera insรคndningen" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:559 builtin/send-pack.c:194 msgid "request atomic transaction on remote side" msgstr "begรคr atomiska transaktioner pรฅ fjรคrrsidan" -#: builtin/push.c:602 +#: builtin/push.c:577 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete รคr inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:604 +#: builtin/push.c:579 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte anvรคndas utan referenser" -#: builtin/push.c:607 +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "felaktigt arkiv \"%s\"" + +#: builtin/push.c:600 +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:615 msgid "--all and --tags are incompatible" msgstr "--all och --tags รคr inkompatibla" -#: builtin/push.c:609 +#: builtin/push.c:617 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:613 +#: builtin/push.c:621 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags รคr inkompatibla" -#: builtin/push.c:615 +#: builtin/push.c:623 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:618 +#: builtin/push.c:626 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror รคr inkompatibla" -#: builtin/push.c:637 +#: builtin/push.c:630 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehรฅlla radbrytning" @@ -16879,24 +18668,32 @@ 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:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "Procent som skapelse vรคgs med" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "anvรคnd enkla diff-fรคrger" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: 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 #, c-format msgid "no .. in range: '%s'" msgstr ".. saknas i intervall: \"%s\"" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "ensamt argument mรฅste vara symmetriskt intervall" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "behรถver tvรฅ incheckningsintervall" @@ -16978,234 +18775,215 @@ msgstr "felsรถk unpack-trees" msgid "suppress feedback messages" msgstr "undertryck รฅterkopplingsmeddelanden" -#: builtin/rebase.c:32 +#: 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:35 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] [<uppstrรถm>] " -"[<gren>]" +"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas> | --keep-base] " +"[<uppstrรถm> [<gren>]]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] --root [<gren>]" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 #, c-format msgid "unusable todo list: '%s'" msgstr "oanvรคndbar todo-lista: %s" -#: 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 +#: builtin/rebase.c:304 #, c-format msgid "could not create temporary %s" msgstr "kunde inte skapa temporรคr %s" -#: builtin/rebase.c:285 +#: builtin/rebase.c:310 msgid "could not mark as interactive" msgstr "kunde inte markera som interaktiv" -#: builtin/rebase.c:343 +#: builtin/rebase.c:364 msgid "could not generate todo list" msgstr "Kunde inte skapa attgรถra-lista" -#: builtin/rebase.c:382 +#: builtin/rebase.c:405 msgid "a base commit must be provided with --upstream or --onto" msgstr "en basincheckning mรฅste anges med --upstream eller --onto" -#: builtin/rebase.c:437 +#: builtin/rebase.c:474 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<flaggor>]" -#: builtin/rebase.c:449 -msgid "keep empty commits" -msgstr "behรฅll tomma incheckningar" +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" +msgstr "behรฅller incheckningar som รคr tomma frรฅn bรถrjan" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:491 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "tillรฅt incheckningar med tomt meddelande" -#: builtin/rebase.c:452 +#: builtin/rebase.c:493 msgid "rebase merge commits" msgstr "ombasera sammanslagningar" -#: builtin/rebase.c:454 +#: builtin/rebase.c:495 msgid "keep original branch points of cousins" msgstr "behรฅll ursprungliga fรถrgreningspunkter fรถr kusiner" -#: builtin/rebase.c:456 +#: builtin/rebase.c:497 msgid "move commits that begin with squash!/fixup!" msgstr "flytta incheckningar som inleds med squash!/fixup!" -#: builtin/rebase.c:457 +#: builtin/rebase.c:498 msgid "sign commits" msgstr "signera incheckningar" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:500 builtin/rebase.c:1321 msgid "display a diffstat of what changed upstream" msgstr "vis diffstat fรถr vad som รคndrats uppstrรถms" -#: builtin/rebase.c:461 +#: builtin/rebase.c:502 msgid "continue rebase" msgstr "fortsรคtt ombasering" -#: builtin/rebase.c:463 +#: builtin/rebase.c:504 msgid "skip commit" msgstr "hoppa รถver incheckning" -#: builtin/rebase.c:464 +#: builtin/rebase.c:505 msgid "edit the todo list" msgstr "redigera attgรถra-listan" -#: builtin/rebase.c:466 +#: builtin/rebase.c:507 msgid "show the current patch" msgstr "visa nuvarande patch" -#: builtin/rebase.c:469 +#: builtin/rebase.c:510 msgid "shorten commit ids in the todo list" msgstr "fรถrkorta inchecknings-id i todo-listan" -#: builtin/rebase.c:471 +#: builtin/rebase.c:512 msgid "expand commit ids in the todo list" msgstr "utรถka inchecknings-id i todo-listan" -#: builtin/rebase.c:473 +#: builtin/rebase.c:514 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase.c:475 +#: builtin/rebase.c:516 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/rebase.c:477 +#: builtin/rebase.c:518 msgid "insert exec commands in todo list" msgstr "lรคgg in exec-kommandon i todo-listan" -#: builtin/rebase.c:478 +#: builtin/rebase.c:519 msgid "onto" msgstr "ovanpรฅ" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict revision" msgstr "begrรคnsa revision" -#: builtin/rebase.c:483 +#: builtin/rebase.c:524 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:484 +#: builtin/rebase.c:525 msgid "squash onto" msgstr "tryck ihop ovanpรฅ" -#: builtin/rebase.c:486 +#: builtin/rebase.c:527 msgid "the upstream commit" msgstr "uppstrรถmsincheckningen" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head name" msgstr "namn pรฅ huvud" -#: builtin/rebase.c:493 +#: builtin/rebase.c:534 msgid "rebase strategy" msgstr "sammanslagningsstrategi" -#: builtin/rebase.c:494 +#: builtin/rebase.c:535 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:495 +#: builtin/rebase.c:536 msgid "strategy options" msgstr "strategiflaggor" -#: builtin/rebase.c:496 +#: builtin/rebase.c:537 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:497 +#: builtin/rebase.c:538 msgid "the branch or commit to checkout" msgstr "gren eller inchecking att checka ut" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto name" msgstr "pรฅ-namn" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "cmd" msgstr "kmd" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "the command to run" msgstr "kommando att kรถra" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:543 builtin/rebase.c:1415 msgid "automatically re-schedule any `exec` that fails" msgstr "kรถr automatiskt alla \"exec\" som misslyckas pรฅ nytt" -#: builtin/rebase.c:518 +#: builtin/rebase.c:559 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" -#: builtin/rebase.c:534 +#: builtin/rebase.c:575 #, c-format -msgid "%s requires an interactive rebase" -msgstr "%s krรคver en interaktiv ombasering" +msgid "%s requires the merge backend" +msgstr "%s krรคver \"merge\"-bakรคndan" -#: builtin/rebase.c:586 +#: builtin/rebase.c:618 #, c-format msgid "could not get 'onto': '%s'" msgstr "kunde inte hรคmta \"onto\": \"%s\"" -#: builtin/rebase.c:601 +#: builtin/rebase.c:635 #, c-format msgid "invalid orig-head: '%s'" msgstr "ogiltigt orig-head: \"%s\"" -#: builtin/rebase.c:626 +#: builtin/rebase.c:660 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" -#: builtin/rebase.c:702 -#, c-format -msgid "Could not read '%s'" -msgstr "Kunde inte lรคsa \"%s\"" - -#: builtin/rebase.c:720 -#, c-format -msgid "Cannot store %s" -msgstr "Kan inte spara %s" - -#: builtin/rebase.c:827 -msgid "could not determine HEAD revision" -msgstr "kunde inte bestรคmma HEAD-revision" - -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:805 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" @@ -17219,7 +18997,7 @@ msgstr "" "Fรถr att avbryta och รฅtergรฅ till dรคr du var fรถre ombaseringen, kรถr \"git " "rebase --abort\"." -#: builtin/rebase.c:1031 +#: builtin/rebase.c:888 #, c-format msgid "" "\n" @@ -17238,7 +19016,15 @@ msgstr "" "\n" "Dรคrfรถr kan inte git ombasera dessa." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1214 +#, 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:1232 #, c-format msgid "" "%s\n" @@ -17255,7 +19041,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1248 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17268,128 +19054,148 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1278 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehรฅlla nyradstecken" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1282 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1312 msgid "rebase onto given branch instead of upstream" msgstr "ombasera mot given grenen istรคllet fรถr uppstrรถm" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1314 +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:1316 msgid "allow pre-rebase hook to run" msgstr "tillรฅt pre-rebase-krok att kรถra" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1318 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1324 msgid "do not show diffstat of what changed upstream" msgstr "visa inte en diffstat fรถr vad som รคndrats uppstrรถms" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1327 msgid "add a Signed-off-by: line to each commit" msgstr "lรคgg \"Signed-off-by:\"-rad till varje incheckning" -#: 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:1330 +msgid "make committer date match author date" +msgstr "sรคtt incheckningsdatum till fรถrfattardatum" + +#: builtin/rebase.c:1332 +msgid "ignore author date and use current date" +msgstr "ignorera fรถrfattardatum och anvรคnd nuvarande" + +#: builtin/rebase.c:1334 +msgid "synonym of --reset-author-date" +msgstr "synonym fรถr --reset-author-date" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1336 builtin/rebase.c:1340 msgid "passed to 'git apply'" msgstr "sรคnds till \"git apply\"" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1338 +msgid "ignore changes in whitespace" +msgstr "ignorera รคndringar i blanksteg" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 msgid "cherry-pick all commits, even if unchanged" msgstr "utfรถr cherry-pick pรฅ alla incheckningar, รคven om oรคndrad" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1347 msgid "continue" msgstr "fortsรคtt" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1350 msgid "skip current patch and continue" msgstr "hoppa รถver nuvarande patch och fortsรคtt" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1352 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1355 msgid "abort but keep HEAD where it is" msgstr "avbryt men behรฅll HEAD dรคr det รคr" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1356 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgรถra-listan under interaktiv ombasering." -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1359 msgid "show the patch file being applied or merged" msgstr "visa patchen som tillรคmpas eller slรฅs samman" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1362 +msgid "use apply strategies to rebase" +msgstr "anvรคnd appliceringstrategier fรถr ombasering" + +#: builtin/rebase.c:1366 msgid "use merging strategies to rebase" -msgstr "anvรคnd sammanslagningsstrategier fรถr sammanslagning" +msgstr "anvรคnd sammanslagningsstrategier fรถr ombasering" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1370 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:1451 +#: builtin/rebase.c:1374 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:1455 -msgid "preserve empty commits during rebase" -msgstr "behรฅll tomma incheckningar under ombasering" +#: builtin/rebase.c:1379 +msgid "how to handle commits that become empty" +msgstr "hur incheckningar som blir tomma ska hanteras" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1386 msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som bรถrjar med squash!/fixup! under -i" -#: 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:1465 +#: builtin/rebase.c:1393 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:1469 +#: builtin/rebase.c:1397 msgid "allow rebasing commits with empty messages" msgstr "tillรฅt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1401 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:1475 +#: builtin/rebase.c:1404 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:1477 +#: builtin/rebase.c:1406 msgid "use the given merge strategy" msgstr "anvรคnd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1408 builtin/revert.c:115 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1409 msgid "pass the argument through to the merge strategy" msgstr "sรคnd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1412 msgid "rebase all reachable commits up to the root(s)" msgstr "ombasera alla nรฅbara incheckningar upp till roten/rรถtterna" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "applicera alla รคndringar, รคven de som redan finns uppstrรถms" + +#: builtin/rebase.c:1434 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17397,29 +19203,41 @@ 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:1506 +#: builtin/rebase.c:1440 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:1547 +#: builtin/rebase.c:1481 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:1551 +#: builtin/rebase.c:1486 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "kan inte kombinera \"--keep-base\" med \"--onto\"" + +#: builtin/rebase.c:1488 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "kan inte kombinera \"--keep-base\" med \"--root\"" + +#: builtin/rebase.c:1492 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "kan inte kombinera \"--root\" med \"--fork-point\"" + +#: builtin/rebase.c:1495 msgid "No rebase in progress?" msgstr "Ingen ombasering pรฅgรฅr?" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1499 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:1578 +#: builtin/rebase.c:1522 msgid "Cannot read HEAD" msgstr "Kan inte lรคsa HEAD" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1534 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17427,16 +19245,16 @@ msgstr "" "Du mรฅste redigera alla sammanslagningskonflikter och\n" "dรคrefter markera dem som lรถsta med git add" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1553 msgid "could not discard worktree changes" msgstr "kunde inte kasta รคndringar i arbetskatalogen" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1572 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1618 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17457,176 +19275,143 @@ msgstr "" "och kรถr programmet igen. Jag avslutar ifall du fortfarande har\n" "nรฅgot av vรคrde dรคr.\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1646 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" fรถrvรคntar ett numeriskt vรคrde" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1688 #, c-format msgid "Unknown mode: %s" msgstr "Okรคnt lรคge: %s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1727 msgid "--strategy requires --merge or --interactive" msgstr "--strategy krรคver --merge eller --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1757 +msgid "cannot combine apply options with merge options" +msgstr "kan inte kombinera apply-flaggor med merge-flaggor" + +#: builtin/rebase.c:1770 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "Okรคnd rebase-bakรคnda: %s" + +#: builtin/rebase.c:1795 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec krรคver --exec eller --interactive" -#: 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 +#: builtin/rebase.c:1815 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1819 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec" "\"" -#: 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 +#: builtin/rebase.c:1843 #, c-format msgid "invalid upstream '%s'" msgstr "felaktig uppstrรถm \"%s\"" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1849 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1875 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "\"%s\": behรถver precis en sammanslagningsbas med gren" + +#: builtin/rebase.c:1878 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behรถver precis en sammanslagningsbas" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1886 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte pรฅ en giltig incheckning: \"%s\"" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1912 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "รถdesdigert: ingen sรฅdan gren/incheckning: \"%s\"" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Ingen sรฅdan referens: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1931 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestรคmma HEAD:s incheckning" -#: builtin/rebase.c:1981 -msgid "Cannot autostash" -msgstr "Kan inte utfรถra \"autostash\"" - -#: builtin/rebase.c:1984 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "Ovรคntat svar frรฅn stash: \"%s\"" - -#: builtin/rebase.c:1990 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "Kunde inte skapa katalog fรถr \"%s\"" - -#: builtin/rebase.c:1993 -#, c-format -msgid "Created autostash: %s\n" -msgstr "Skapade autostash: %s\n" - -#: builtin/rebase.c:1996 -msgid "could not reset --hard" -msgstr "kunde inte utfรถra \"reset --hard\"" - -#: 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 +#: builtin/rebase.c:1952 msgid "Please commit or stash them." msgstr "Checka in eller anvรคnd \"stash\" pรฅ dem." -#: builtin/rebase.c:2040 -#, c-format -msgid "could not parse '%s'" -msgstr "kunde inte tolka \"%s\"" - -#: builtin/rebase.c:2053 +#: builtin/rebase.c:1988 #, c-format msgid "could not switch to %s" msgstr "kunde inte vรคxla till %s" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:1999 msgid "HEAD is up to date." msgstr "HEAD รคr ร jour." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2001 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktuell gren %s รคr ร jour.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2009 msgid "HEAD is up to date, rebase forced." msgstr "HEAD รคr ร jour, ombasering framtvingad." -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2011 #, 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:2084 +#: builtin/rebase.c:2019 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vรคgrade ombaseringen." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2026 #, c-format msgid "Changes to %s:\n" msgstr "รndringar till %s:\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2029 #, c-format msgid "Changes from %s to %s:\n" msgstr "รndringar frรฅn %s till %s:\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2054 #, 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:2128 +#: builtin/rebase.c:2063 msgid "Could not detach HEAD" msgstr "Kunde inte koppla frรฅn HEAD" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2072 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:1224 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" @@ -17656,7 +19441,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:852 +#: builtin/receive-pack.c:1244 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" @@ -17677,11 +19462,11 @@ msgstr "" "\n" "Fรถr att undvika detta meddelande kan du sรคtta det till \"refuse\"." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:2422 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:2436 msgid "You must specify a directory." msgstr "Du mรฅste ange en katalog." @@ -17707,49 +19492,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <referens>" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "\"%s\" รคr inte en giltig tidsstรคmpel" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "Markerar nรฅbara objekt..." -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "%s pekar ingenstans!" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "ingen referenslogg att ta bort angavs" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "inte en referenslogg: %s" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "ingen referenslogg fรถr \"%s\"" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "felaktigt referensformat: %s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -17757,82 +19542,82 @@ msgstr "" "git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <namn> <url>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <gammal> <ny>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <namn>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 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:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <namn>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <namn>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjรคrr>)...]" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <namn> <gren>..." -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <namn>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <namn> <nyurl>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <namn> <url>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<flaggor>] <namn> <url>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <namn> <gren>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <namn> <gren>..." -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<flaggor>] <namn>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<flaggor>] <namn>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<flaggor>] [<grupp> | <fjรคrr>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "Uppdaterar %s" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -17840,82 +19625,98 @@ msgstr "" "--mirror รคr farlig och fรถrรฅldrad; anvรคnd\n" "\t --mirror=fetch eller --mirror=push istรคllet" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "okรคnt argument till mirror: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "hรคmta fjรคrrgrenarna" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "importera alla taggar och associerade objekt vid hรคmtning" -#: builtin/remote.c:168 +#: builtin/remote.c:169 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:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "gren(ar) att spรฅra" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "huvudgren" -#: builtin/remote.c:173 +#: builtin/remote.c:174 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:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "att ange en master-gren ger ingen mening med --mirror" -#: builtin/remote.c:187 +#: builtin/remote.c:188 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:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:697 #, c-format msgid "remote %s already exists." msgstr "fjรคrrarkivet %s finns redan." -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:701 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" รคr inte ett giltigt namn pรฅ fjรคrrarkiv" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "Kunde inte skapa master \"%s\"" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Kunde inte hรคmta mappning fรถr referensspecifikation %s" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(matchande)" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:654 +#, c-format +msgid "could not set '%s'" +msgstr "kunde inte stรคlla in \"%s\"" + +#: builtin/remote.c:659 +#, 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:690 builtin/remote.c:833 builtin/remote.c:941 #, c-format msgid "No such remote: '%s'" msgstr "Ingen sรฅdan fjรคrr: \"%s\"" -#: builtin/remote.c:646 +#: builtin/remote.c:707 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn pรฅ konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:666 +#: builtin/remote.c:727 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -17926,17 +19727,17 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nรถdvรคndigt." -#: builtin/remote.c:702 +#: builtin/remote.c:767 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:736 +#: builtin/remote.c:801 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:802 +#: builtin/remote.c:877 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -17950,118 +19751,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:816 +#: builtin/remote.c:891 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:917 +#: builtin/remote.c:994 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nรคsta hรคmtning sparar i remotes/%s)" -#: builtin/remote.c:920 +#: builtin/remote.c:997 msgid " tracked" msgstr " spรฅrad" -#: builtin/remote.c:922 +#: builtin/remote.c:999 msgid " stale (use 'git remote prune' to remove)" msgstr " fรถrlegad (anvรคnd \"git remote prune\" fรถr att ta bort)" -#: builtin/remote.c:924 +#: builtin/remote.c:1001 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:1042 #, 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:974 +#: builtin/remote.c:1051 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt pรฅ fjรคrren %s" -#: builtin/remote.c:976 +#: builtin/remote.c:1053 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "ombaseras interaktivt (med sammanslagningar) pรฅ fjรคrren %s" -#: builtin/remote.c:979 +#: builtin/remote.c:1056 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras pรฅ fjรคrren %s" -#: builtin/remote.c:983 +#: builtin/remote.c:1060 #, c-format msgid " merges with remote %s" msgstr " sammanslรฅs med fjรคrren %s" -#: builtin/remote.c:986 +#: builtin/remote.c:1063 #, c-format msgid "merges with remote %s" msgstr "sammanslรฅs med fjรคrren %s" -#: builtin/remote.c:989 +#: builtin/remote.c:1066 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s och med fjรคrren %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1109 msgid "create" msgstr "skapa" -#: builtin/remote.c:1035 +#: builtin/remote.c:1112 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1039 +#: builtin/remote.c:1116 msgid "up to date" msgstr "ร jour" -#: builtin/remote.c:1042 +#: builtin/remote.c:1119 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1045 +#: builtin/remote.c:1122 msgid "local out of date" msgstr "lokal fรถrรฅldrad" -#: builtin/remote.c:1052 +#: builtin/remote.c:1129 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1132 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sรคnder till %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1136 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1139 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sรคnder till %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1207 msgid "do not query remotes" msgstr "frรฅga inte fjรคrrar" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid "* remote %s" msgstr "* fjรคrr %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1235 #, c-format msgid " Fetch URL: %s" msgstr " Hรคmt-URL: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 msgid "(no URL)" msgstr "(ingen URL)" @@ -18069,193 +19870,184 @@ msgstr "(ingen URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1250 builtin/remote.c:1252 #, c-format msgid " Push URL: %s" msgstr " Sรคnd-URL: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1254 msgid "(not queried)" msgstr "(inte fรถrfrรฅgad)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1256 msgid "(unknown)" msgstr "(okรคnd)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1260 #, 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:1195 +#: builtin/remote.c:1272 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjรคrrgren:%s" msgstr[1] " Fjรคrrgrenar:%s" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1275 builtin/remote.c:1301 msgid " (status not queried)" msgstr " (status inte fรถrfrรฅgad)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1284 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:1215 +#: builtin/remote.c:1292 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1221 +#: builtin/remote.c:1298 #, 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:1242 +#: builtin/remote.c:1319 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sรคtt refs/remotes/<namn>/HEAD enligt fjรคrren" -#: builtin/remote.c:1244 +#: builtin/remote.c:1321 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1336 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestรคmma HEAD pรฅ fjรคrren" -#: builtin/remote.c:1261 +#: builtin/remote.c:1338 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:1271 +#: builtin/remote.c:1348 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1356 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1358 #, c-format msgid "Could not setup %s" msgstr "Kunde inte stรคlla in %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1377 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1388 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1404 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1407 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1452 msgid "prune remotes after fetching" msgstr "rensa fjรคrrar efter hรคmtning" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 #, c-format msgid "No such remote '%s'" msgstr "Ingen sรฅdan fjรคrr \"%s\"" -#: builtin/remote.c:1454 +#: builtin/remote.c:1531 msgid "add branch" msgstr "lรคgg till gren" -#: builtin/remote.c:1461 +#: builtin/remote.c:1538 msgid "no remote specified" msgstr "ingen fjรคrr angavs" -#: builtin/remote.c:1478 +#: builtin/remote.c:1555 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:1480 +#: builtin/remote.c:1557 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1508 +#: builtin/remote.c:1585 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna fรถr fjรคrren \"%s\"" -#: builtin/remote.c:1534 +#: builtin/remote.c:1611 msgid "manipulate push URLs" msgstr "manipulera URL:ar fรถr sรคndning" -#: builtin/remote.c:1536 +#: builtin/remote.c:1613 msgid "add URL" msgstr "lรคgg till URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1615 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1545 +#: builtin/remote.c:1622 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1584 +#: builtin/remote.c:1661 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mรถnster: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1669 #, c-format msgid "No such URL found: %s" msgstr "Ingen sรฅdan URL hittades: %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1671 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sรคnd-URL:er" -#: 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 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" -#: builtin/repack.c:27 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18264,112 +20056,112 @@ msgstr "" "Anvรคnd --no-write-bitmap-index eller inaktivera instรคllningen\n" "pack.writebitmaps" -#: builtin/repack.c:201 +#: builtin/repack.c:197 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:240 builtin/repack.c:418 +#: builtin/repack.c:236 builtin/repack.c:421 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:257 +#: builtin/repack.c:260 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:295 +#: builtin/repack.c:297 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:297 +#: builtin/repack.c:299 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gรถr onรฅbara objekt lรถsa" -#: builtin/repack.c:300 +#: builtin/repack.c:302 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort รถverflรถdiga paket, och kรถr git-prune-packed" -#: builtin/repack.c:302 +#: builtin/repack.c:304 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sรคnd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:304 +#: builtin/repack.c:306 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sรคnd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:306 +#: builtin/repack.c:308 msgid "do not run git-update-server-info" msgstr "kรถr inte git-update-server-info" -#: builtin/repack.c:309 +#: builtin/repack.c:311 msgid "pass --local to git-pack-objects" msgstr "sรคnd --local till git-pack-objects" -#: builtin/repack.c:311 +#: builtin/repack.c:313 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:313 +#: builtin/repack.c:315 msgid "pass --delta-islands to git-pack-objects" msgstr "sรคnd --delta-islands till git-pack-objects" -#: builtin/repack.c:314 +#: builtin/repack.c:316 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:315 +#: builtin/repack.c:317 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lรถs inte upp objekt รคldre รคn detta" -#: builtin/repack.c:317 +#: builtin/repack.c:319 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onรฅbara objekt" -#: builtin/repack.c:319 +#: builtin/repack.c:321 msgid "size of the window used for delta compression" msgstr "storlek pรฅ fรถnster anvรคnt fรถr deltakomprimering" -#: builtin/repack.c:320 builtin/repack.c:326 +#: builtin/repack.c:322 builtin/repack.c:328 msgid "bytes" msgstr "byte" -#: builtin/repack.c:321 +#: builtin/repack.c:323 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:323 +#: builtin/repack.c:325 msgid "limits the maximum delta depth" msgstr "begrรคnsa maximalt deltadjup" -#: builtin/repack.c:325 +#: builtin/repack.c:327 msgid "limits the maximum number of threads" msgstr "begrรคnsar maximalt antal trรฅdar" -#: builtin/repack.c:327 +#: builtin/repack.c:329 msgid "maximum size of each packfile" msgstr "maximal storlek pรฅ varje paketfil" -#: builtin/repack.c:329 +#: builtin/repack.c:331 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket mรคrkta med .keep" -#: builtin/repack.c:331 +#: builtin/repack.c:333 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:341 +#: builtin/repack.c:343 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:345 +#: builtin/repack.c:347 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte anvรคndas samtidigt" -#: builtin/repack.c:427 +#: builtin/repack.c:430 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:488 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18388,7 +20180,7 @@ msgstr "" "VARNING: namnet misslyckades ocksรฅ.\n" "VARNING: Byt namn pรฅ dem i %s manuellt:\n" -#: builtin/repack.c:536 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -18496,8 +20288,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:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: 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 "objektnamnet รคr inte giltigt: \"%s\"" @@ -18516,22 +20308,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:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "kunde inte tolka %s som incheckning" -#: builtin/replace.c:414 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "felaktig sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:416 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "felformad sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:428 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -18540,31 +20332,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:467 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur" -#: builtin/replace.c:468 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "signaturen kommer att tas bort i ersรคttningsincheckningen!" -#: builtin/replace.c:478 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "kunde inte skriva ersรคttningsincheckning fรถr: \"%s\"" -#: builtin/replace.c:486 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "ympning fรถr \"%s\" behรถvs inte" -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, 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:525 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -18573,71 +20365,71 @@ msgstr "" "kunde inte konvertera fรถljande ympning(ar):\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "visa ersรคttningsreferenser" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "ta bort ersรคttningsreferenser" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "redigera befintligt objekt" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "รคndra en inchecknings fรถrรคldrar" -#: builtin/replace.c:550 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "konvertera befintlig ympningsfil" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "ersรคtt referensen om den finns" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "anvรคnd inte snygg visning av innehรฅll fรถr --edit" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "anvรคnd detta format" -#: builtin/replace.c:567 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "--format kan inte anvรคndas utanfรถr listning" -#: builtin/replace.c:575 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "-f kan endast anvรคndas vid skrivning av ersรคttning" -#: builtin/replace.c:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw kan bara anvรคndas med --edit" -#: builtin/replace.c:585 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "-d behรถver minst ett argument" -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "fel antal argument" -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e tar exakt ett argument" -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-g tar minst ett argument" -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file tar inga argument" -#: builtin/replace.c:615 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "endast ett mรถnster kan anges med -l" @@ -18665,114 +20457,125 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "git reset [-q] [<trรคd-igt>] [--] <sรถkvรคgar>..." #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +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>...]" msgstr "git reset --patch [<trรคd-igt>] [--] [<sรถkvรคgar>...]" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "blandad" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "mjuk" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "hรฅrd" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "sammanslagning" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "behรฅll" -#: builtin/reset.c:81 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:83 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta trรคdet fรถr HEAD." -#: builtin/reset.c:89 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta trรคdet fรถr %s." -#: builtin/reset.c:193 +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD รคr nu pรฅ %s" + +#: builtin/reset.c:195 #, 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:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" -#: builtin/reset.c:295 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "รฅterstรคll HEAD och index" -#: builtin/reset.c:296 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "รฅterstรคll endast HEAD" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "รฅterstรคll HEAD, index och arbetskatalog" -#: builtin/reset.c:302 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "รฅterstรคll HEAD men behรฅll lokala รคndringar" -#: builtin/reset.c:308 +#: builtin/reset.c:310 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:326 +#: builtin/reset.c:344 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Kunde inte slรฅ upp \"%s\" som en giltig revision." -#: builtin/reset.c:334 +#: builtin/reset.c:352 #, 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:343 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch รคr inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:353 +#: builtin/reset.c:371 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:355 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte gรถra %s รฅterstรคllning med sรถkvรคgar." -#: builtin/reset.c:370 +#: builtin/reset.c:388 #, 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:374 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "-N kan endast anvรคndas med --mixed" -#: builtin/reset.c:395 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "Okรถade รคndringar efter รฅterstรคllning:" -#: builtin/reset.c:398 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -18786,53 +20589,48 @@ msgstr "" "konfigurationsvariabeln\n" "reset.quiet till true fรถr att gรถra detta till fรถrval.\n" -#: builtin/reset.c:408 +#: builtin/reset.c:434 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte รฅterstรคlla indexfilen till versionen \"%s\"." -#: builtin/reset.c:412 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "kan inte kombinera --exclude-promisor-objects och --missing" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "objektfiltrering krรคver --objects" -#: 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 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "rev-list stรถder inte visning av anteckningar" -#: 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-list.c:615 +msgid "marked counting is incompatible with --objects" +msgstr "markerad rรคkning รคr inkompatibelt med --objects" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "behรฅll \"--\" sรคnt som argument" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter fรถrsta argument som inte รคr flagga" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "utdata fast i lรฅng form" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -18977,37 +20775,41 @@ 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:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "lista inte borttagna filer" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "ta bara bort frรฅn indexet" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "รถverstyr ร jour-testet" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "tillรฅt rekursiv borttagning" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus รคven om inget trรคffades" -#: builtin/rm.c:289 +#: 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 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:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" @@ -19024,55 +20826,76 @@ msgstr "" "[<ref>...]\n" " --all och explicit angiven <ref> รคr รถmsesidigt uteslutande." -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:182 msgid "remote name" msgstr "fjรคrrnamn" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:195 msgid "use stateless RPC protocol" msgstr "anvรคnd tillstรฅndslรถst RPC-protokoll" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:196 msgid "read refs from stdin" msgstr "lรคs referenser frรฅn standard in" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:197 msgid "print status from remote helper" msgstr "visa status frรฅn fjรคrrhjรคlpare" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:15 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sรถkvรคg>...]" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<flaggor>]" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:134 +msgid "using multiple --group options with stdin is not supported" +msgstr "mer รคn en --group-flagga stรถds inte med standard in" + +#: builtin/shortlog.c:144 +msgid "using --group=trailer with stdin is not supported" +msgstr "att anvรคnda --group=trailer stรถds inte med standard in" + +#: builtin/shortlog.c:388 +#, c-format +msgid "unknown group type: %s" +msgstr "okรคnd grupptyp: %s" + +#: builtin/shortlog.c:416 msgid "Group by committer rather than author" msgstr "Gruppera efter incheckare istรคllet fรถr fรถrfattare" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:419 msgid "sort output according to the number of commits per author" msgstr "sortera utdata enligt antal incheckningar per fรถrfattare" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:421 msgid "Suppress commit descriptions, only provides commit count" msgstr "Undertryck beskrivningar, visa bara antal incheckningar" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:423 msgid "Show the email address of each author" msgstr "Visa e-postadress fรถr varje fรถrfattare" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:424 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:425 msgid "Linewrap output" msgstr "Radbryt utdata" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:427 +msgid "field" +msgstr "fรถt" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "Gruppera efter fรคlt" + +#: builtin/shortlog.c:456 msgid "too many arguments given outside repository" msgstr "fรถr mรฅnga flaggor givna utanfรถr arkivet" @@ -19212,6 +21035,14 @@ msgstr "\"%s\" รคr inte en giltig referens." msgid "cannot find commit %s (%s)" msgstr "hittar inte incheckning %s (%s)" +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "hashningsalgoritm" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "okรคnd hashningsalgoritm" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -19256,15 +21087,87 @@ 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/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <flaggor>" + +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:76 +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:228 +msgid "failed to create directory for sparse-checkout file" +msgstr "misslyckades skapa katalog fรถr \"sparse-checkout\"-filen" + +#: builtin/sparse-checkout.c:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "kunde inte uppgradera arkivformat fรถr att aktivera worktreeConfig" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "misslyckades รคndra instรคllningen extensions.worktreeConfig" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "initiera sparse-checkout i konlรคge" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "misslyckades รถppna \"%s\"" + +#: builtin/sparse-checkout.c:401 +#, c-format +msgid "could not normalize path %s" +msgstr "kunde inte normalisera sรถkvรคgen \"%s\"" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <mรถnster>)" + +#: builtin/sparse-checkout.c:438 +#, 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:492 builtin/sparse-checkout.c:516 +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:561 +msgid "read patterns from standard in" +msgstr "lรคs mรถnster frรฅn standard in" + +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:623 +msgid "error while refreshing working directory" +msgstr "fel vid uppdatering av arbetskatalog" + +#: builtin/stash.c:22 builtin/stash.c:38 msgid "git stash list [<options>]" msgstr "git stash list [<flaggor>]" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<flaggor>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -19272,25 +21175,27 @@ 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:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <grennamn> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: 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 <meddelande>]\n" +" [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n" " [--] [<sรถkvรคg>...]]" -#: builtin/stash.c:31 builtin/stash.c:84 +#: 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>]" @@ -19298,189 +21203,201 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<meddelande>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>" -#: builtin/stash.c:127 +#: 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 #, c-format msgid "'%s' is not a stash-like commit" msgstr "\"%s\" รคr inte en \"stash\"-liknande incheckning" -#: builtin/stash.c:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "Fรถr mรฅnga revisioner angivna:%s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "Inga \"stash\"-poster hittades." -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "%s รคr inte en giltigt referens" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "\"git stash clear\" med parametrar har inte implementerats" -#: builtin/stash.c:403 +#: builtin/stash.c:404 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:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "kunde inte skapa diff %s^!." -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "konflikter i indexet. Testa utan --index." -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "kunde inte spara indextrรคd" -#: builtin/stash.c:434 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "kunde inte รฅterstรคlla ospรฅrade filer frรฅn stash-post" -#: builtin/stash.c:448 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "Slรฅr ihop %s med %s" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "Indexet har inte tagits upp ur \"stash\":en" -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "fรถrsรถk รฅterskapa indexet" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "Kastade %s (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Kunde inte kasta \"stash\"-post" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "\"%s\" รคr inte en \"stash\"-referens" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 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:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "Kan inte uppdatera %s med %s" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 msgid "stash message" msgstr "\"stash\"-meddelande" -#: builtin/stash.c:818 +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" krรคver ett <incheckning>-argument" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1043 msgid "No changes selected" msgstr "Inga รคndringar valda" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1143 msgid "You do not have the initial commit yet" msgstr "Du har inte den fรถrsta incheckningen รคnnu" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1170 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstรฅnd fรถr indexet" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1179 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospรฅrade filer" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1190 builtin/stash.c:1199 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstรฅnd fรถr arbetskatalogen" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1227 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstรฅnd fรถr arbetskatalog" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1276 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:1285 +#: builtin/stash.c:1292 msgid "Did you forget to 'git add'?" msgstr "Glรถmde du anvรคnda \"git add\"?" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1307 msgid "No local changes to save" msgstr "Inga lokala รคndringar att spara" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1314 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1329 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: builtin/stash.c:1327 +#: builtin/stash.c:1334 #, c-format msgid "Saved working directory and index state %s" msgstr "Sparade arbetskatalogen och indexstatus %s" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1424 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort รคndringar i arbetskatalogen" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1463 builtin/stash.c:1528 msgid "keep index" msgstr "behรฅll indexet" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "stash in patch mode" msgstr "\"stash\" i \"patch\"-lรคge" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "quiet mode" msgstr "tyst lรคge" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "include untracked files in stash" msgstr "ta med ospรฅrade filer i \"stash\"" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1470 builtin/stash.c:1535 msgid "include ignore files" msgstr "ta med ignorerade filer" -#: builtin/stash.c:1555 -#, c-format -msgid "could not exec %s" -msgstr "kunde inte kรถra %s" +#: builtin/stash.c:1570 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"stรถdet fรถr stash.useBuiltin har tagits bort!\n" +"Se posten fรถr det i \"git help config\" fรถr detaljer." #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -19498,40 +21415,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:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Fรถrvรคntade fullt referensnamn, fick %s" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote tar inga argument" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, 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:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "alternativa ankare fรถr relativa sรถkvรคgar" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sรถkvรคg>] [<sรถkvรคg>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, 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:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Gรฅr in i \"%s\"\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -19540,7 +21457,7 @@ msgstr "" "run_command returnerade icke-nollstatus fรถr %s\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19551,19 +21468,19 @@ msgstr "" "undermoduler fรถr %s\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "Dรถlj utdata frรฅn fรถr varje undermodulskommando som startas" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" msgstr "Rekursera in i nรคstlade undermoduler" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -19572,54 +21489,54 @@ msgstr "" "kunde inte slรฅ upp konfigurationen \"%s\". Antar att arkivet รคr sin eget " "officiella uppstrรถm." -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:666 #, 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:669 +#: builtin/submodule--helper.c:670 #, 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:679 +#: builtin/submodule--helper.c:680 #, 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:686 +#: builtin/submodule--helper.c:687 #, 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:708 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "Dรถlj utdata frรฅn initiering av undermodul" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<flaggor>] [<sรถkvรคg>]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, 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:824 +#: builtin/submodule--helper.c:835 #, 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:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "Hindra statusutskrift fรถr undermodul" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:887 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -19627,47 +21544,104 @@ msgstr "" "Visa incheckning frรฅn indexet istรคllet fรถr den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" msgstr "rekursera in i nรคstlade undermoduler" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sรถkvรคg>...]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sรถkvรคg>" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "* %s %s(blob)->%s(submodule)" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "* %s %s(submodule)->%s(blob)" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "kunde inte hasha objekt frรฅn \"%s\"" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "okรคnt lรคge %o\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "anvรคnd incechkning lagrad i indexet istรคllet fรถr undermodulens HEAD" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" +"fรถr att jรคmfรถra incheckningen i indexet med den som lagrats i undermodulens " +"HEAD" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "" +"hoppa รถver undermoduler dรคr vรคrdet fรถr \"ignore_config\" รคr satt till \"all\"" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "begrรคnsa รถversiktsstorleken" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "" +"git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sรถkvรคg>]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "kunde inte hรคmta en version fรถr HEAD" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "--cached och --files รคr รถmsesidigt uteslutande" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synkroniserar undermodul-url fรถr \"%s\"\n" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:1413 #, 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:990 +#: builtin/submodule--helper.c:1427 #, 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:1001 +#: builtin/submodule--helper.c:1438 #, 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:1048 +#: builtin/submodule--helper.c:1485 msgid "Suppress output of synchronizing submodule url" msgstr "Dรถlj utdata frรฅn synkroniering av undermodul-url" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<sรถkvรคg>]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -19676,7 +21650,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:1121 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -19685,175 +21659,203 @@ msgstr "" "Undermodulens arbetskatalog \"%s\" har lokala รคndringar; \"-f\" kastar bort " "dem" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rensade katalogen \"%s\"\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "kunde inte skapa tom undermodulskatalog %s" -#: builtin/submodule--helper.c:1158 +#: builtin/submodule--helper.c:1595 #, 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:1187 +#: builtin/submodule--helper.c:1624 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:1188 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "Avregistrera alla undermoduler" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sรถkvรคg>...]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1644 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:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1713 +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:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" -msgstr "undermodulen \"%s\" kan inte lรคgga till alternativ: %s" +msgstr "undermodulen \"%s\" kan inte lรคgga till suppleant: %s" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1791 #, 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:1348 +#: builtin/submodule--helper.c:1798 #, 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:1371 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" -msgstr "var den nya undermodulen skall klonas till" +msgstr "var den nya undermodulen ska klonas till" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "namn pรฅ den nya undermodulen" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen frรฅn" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "djup fรถr grunda kloner" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "tvinga kloningsfรถrlopp" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +msgid "disallow cloning into non-empty directory" +msgstr "fรถrhindra kloning till icke-tom katalog" + +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<sรถkvรคg>] [--quiet] [--reference " -"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sรถkvรคg>" +"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --" +"path <sรถkvรคg>" + +#: builtin/submodule--helper.c:1873 +#, 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" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsรถkvรคgen \"%s\"" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "katalogen inte tom: \"%s\"" + +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte fรฅ tag i undermodulkatalog fรถr \"%s\"" -#: builtin/submodule--helper.c:1474 +#: builtin/submodule--helper.c:1936 #, 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:1478 +#: builtin/submodule--helper.c:1940 #, 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:1571 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsรถkvรคgen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att anvรคnda \"update --init\"?" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar รถver ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar รถver undermodulen \"%s\"" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt fรถrsรถk planlagt" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:2265 #, 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:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "sรถkvรคg inuti arbetskatalogen" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:2330 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:1858 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:2340 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:1867 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" -msgstr "om den fรถrsta klonen skall fรถlja rekommendation fรถr grund kloning" +msgstr "om den fรถrsta klonen ska fรถlja rekommendation fรถr grund kloning" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "skriv inte klonfรถrlopp" -#: 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:2357 +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:1890 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "felaktigt vรคrde fรถr parametern update" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -19862,50 +21864,84 @@ 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:2061 +#: builtin/submodule--helper.c:2541 #, 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:2094 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sรถkvรคg>...]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2636 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:2159 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "ta bort konfigurationen frรฅn .gitmodules-filen" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <namn> [<vรคrde>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <namn>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 #, 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:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2681 +msgid "Suppress output for setting url of a submodule" +msgstr "Dรถlj utdata frรฅn instรคllning av url fรถr undermodul" + +#: builtin/submodule--helper.c:2685 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper set-url [--quiet] <sรถkvรคg> <nyurl>" + +#: builtin/submodule--helper.c:2718 +msgid "set the default tracking branch to master" +msgstr "vรคlj master som fรถrvald spรฅrad gren" + +#: builtin/submodule--helper.c:2720 +msgid "set the default tracking branch" +msgstr "vรคlj fรถrvald spรฅrad gren" + +#: builtin/submodule--helper.c:2724 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sรถkvรคg>" + +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" +"git submodule--helper set-branch [-q|--quiet] (-b|--brand) <gren> <sรถkvรคg>" + +#: builtin/submodule--helper.c:2732 +msgid "--branch or --default required" +msgstr "--branch eller --default krรคvs" + +#: builtin/submodule--helper.c:2735 +msgid "--branch and --default are mutually exclusive" +msgstr "--branch och --default รคr รถmsesidigt uteslutande" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stรถder inte --super-prefix" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" รคr inte ett giltigt underkommando till submodule--helper" @@ -19931,11 +21967,11 @@ msgstr "ta bort symbolisk referens" msgid "shorten ref output" msgstr "fรถrkorta ref-utdata" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "skรคl" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "skรคl till uppdateringen" @@ -19955,11 +21991,13 @@ msgstr "git tag -d <taggnamn>..." msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" "git tag -l [-n[<antal>]] [--contains <incheckning>] [--no-contains " "<incheckning>] [--points-at <objekt>]\n" -"\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mรถnster>...]" +"\t\t[--format=<format>] [--merged <incheckning>] [--no-merged <incheckning>] " +"[<mรถnster>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -20028,335 +22066,339 @@ msgstr "" msgid "bad object type." msgstr "felaktig objekttyp." -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lรคmnats i %s\n" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "visa <n> rader frรฅn varje taggmeddelande" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "Alternativ fรถr att skapa taggar" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behรถver meddelande" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "tvinga redigering av incheckningsmeddelande" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "anvรคnd annan nyckel fรถr att signera taggen" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "ersรคtt taggen om den finns" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "Alternativ fรถr listning av taggar" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehรฅller incheckningen" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "visa endast taggar som inte innehรฅller incheckningen" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "visa endast taggar fรถr objektet" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "--column och -n รคr inkompatibla" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "Flaggan -n รคr endast tillรฅten i listlรคge" -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "Flaggan --contains รคr endast tillรฅten i listlรคge" -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "Flaggan --no-contains รคr endast tillรฅten i listlรคge" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "Flaggan --points-at รคr endast tillรฅten i listlรคge" -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Flaggorna --merged och --no-merged รคr endast tillรฅtna i listlรคge" -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillรฅts." -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "fรถr mรฅnga parametrar" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" รคr inte ett giltigt taggnamn." -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "Packar upp objekt" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "misslyckades skapa katalogen %s" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "misslyckades skapa filen %s" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "misslyckades ta bort filen %s" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "misslyckades ta bort katalogen %s" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "Testar mtime i \"%s\" " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 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:166 +#: builtin/update-index.c:167 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:179 +#: builtin/update-index.c:180 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:190 +#: builtin/update-index.c:191 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:201 +#: builtin/update-index.c:202 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:214 +#: builtin/update-index.c:215 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:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "fortsรคtt uppdatera รคven nรคr index inte รคr ร jour" -#: builtin/update-index.c:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "lรฅt filer ersรคtta kataloger och omvรคnt" -#: builtin/update-index.c:981 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "lรคgg mรคrke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:983 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera รคven om indexet innehรฅller ej sammanslagna poster" -#: builtin/update-index.c:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-instรคllning" -#: builtin/update-index.c:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<lรคge>,<objekt>,<sรถkvรคg>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "lรคgg till angiven post i indexet" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "markera filer som \"รคndras inte\"" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "tรถm \"skip-worktree\"-biten" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1020 +msgid "do not touch index-only entries" +msgstr "rรถr inte \"endast index\"-poster" + +#: builtin/update-index.c:1022 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:1019 +#: builtin/update-index.c:1024 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:1021 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1028 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:1027 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "lรคgg poster frรฅn standard in till indexet" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1036 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:1035 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig frรฅn HEAD" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "rapportera รฅtgรคrder pรฅ standard ut" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(fรถr porslin) glรถm sparade olรถsta konflikter" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospรฅrad cache" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stรถder ospรฅrad cache" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospรฅrad cache utan att testa filsystemet" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1063 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:1060 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "aktivera eller inaktivera filsystemsรถvervakning" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "markera filer som \"fsmonitor valid\"" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "tรถm \"fsmonitor valid\"-bit" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20364,7 +22406,7 @@ msgstr "" "core.splitIndex รคr satt till false; ta bort eller รคndra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20372,7 +22414,7 @@ msgstr "" "core.splitIndex รคr satt till true; ta bort eller รคndra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1188 +#: 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" @@ -20380,11 +22422,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:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Ospรฅrad cache รคr inaktiverad" -#: builtin/update-index.c:1200 +#: 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" @@ -20392,26 +22434,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:1204 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospรฅrad cache รคr aktiverad fรถr \"%s\"" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1218 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:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor aktiverat" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1225 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:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor inaktiverat" @@ -20427,19 +22469,19 @@ msgstr "git update-ref [<flaggor>] <refnamn> <gammaltvรคrde> [<nyttvรคrde>]" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<flaggor>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "ta bort referensen" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "uppdatera <refnamn> inte det den pekar pรฅ" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "standard in har NUL-terminerade argument" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "lรคs uppdateringar frรฅn standard in" @@ -20471,258 +22513,250 @@ 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:20 +#: builtin/verify-commit.c:19 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <incheckning>..." -#: builtin/verify-commit.c:69 +#: builtin/verify-commit.c:68 msgid "print commit contents" msgstr "visa innehรฅll fรถr incheckning" -#: builtin/verify-commit.c:70 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "visa rรฅa gpg-statusdata" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 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 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "pratsam" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "visa endast statistik" -#: builtin/verify-tag.c:19 +#: builtin/verify-tag.c:18 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..." -#: builtin/verify-tag.c:37 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "visa innehรฅll fรถr tag" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<flaggor>] <sรถkvรคg> [<incheckning-igt>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<flaggor>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<flaggor>] <sรถkvรคg>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbetskatalog> <ny-sรถkvรคg>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<flaggor>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<flaggor>] <arbetskatalog>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <sรถkvรคg>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:970 #, c-format msgid "failed to delete '%s'" msgstr "misslyckades ta bort \"%s\"" -#: 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 +msgid "not a valid directory" +msgstr "inte i en giltig katalog" -#: 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:91 +msgid "gitdir file does not exist" +msgstr "gitdir-filen existerar inte" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:96 builtin/worktree.c:105 #, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -msgstr "Tar bort worktrees/%s: kan inte lรคsa gitdir-filen (%s)" +msgid "unable to read gitdir file (%s)" +msgstr "kunde inte lรคsa gitdir-filen (%s)" -#: builtin/worktree.c:110 +#: builtin/worktree.c:115 #, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" -msgstr "" -"Tar bort worktrees/%s: kort lรคsning (fรถrvรคntade %<PRIuMAX> byte, lรคste " -"%<PRIuMAX>)" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "kort lรคsning (fรถrvรคntade %<PRIuMAX> byte, lรคste %<PRIuMAX>)" -#: builtin/worktree.c:118 -#, c-format -msgid "Removing worktrees/%s: invalid gitdir file" -msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" +#: builtin/worktree.c:123 +msgid "invalid gitdir file" +msgstr "ogiltig gitdir-fil" + +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "gitdir-filen pekar pรฅ en ickeexisterande plats" -#: builtin/worktree.c:127 +#: builtin/worktree.c:146 #, 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" +msgid "Removing %s/%s: %s" +msgstr "Tar bort %s/%s: %s" -#: builtin/worktree.c:166 +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "rapportera borttagna arbetskataloger" -#: builtin/worktree.c:168 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "lรฅt tid gรฅ ut fรถr arbetskataloger รคldre รคn <tid>" -#: builtin/worktree.c:235 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:252 +#: builtin/worktree.c:302 #, c-format -msgid "unable to re-add worktree '%s'" -msgstr "kunde inte lรคgga in arbetskatalogen \"%s\" igen" +msgid "unusable worktree destination '%s'" +msgstr "oanvรคndbar mรฅl fรถr arbetskatalog \"%s\"" -#: builtin/worktree.c:257 +#: builtin/worktree.c:307 #, 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" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" "\"%s\" รคr en saknad men lรฅst arbetskatalog;\n" -"anvรคnd \"add -f -f\" fรถr att รถverstyra, eller \"unlock\" och \"prune\" eller " +"anvรคnd \"%s -f -f\" fรถr att รถverstyra, eller \"unlock\" och \"prune\" eller " "\"remove\" fรถr att rensa" -#: builtin/worktree.c:259 +#: builtin/worktree.c:309 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" "\"%s\" รคr en saknad men redan registrerad arbetskatalog;\n" -"anvรคnd \"add -f\" fรถr att รถverstyra, eller \"prune\" eller \"remove\" fรถr " -"att rensa" +"anvรคnd \"%s -f\" fรถr att รถverstyra, eller \"prune\" eller \"remove\" fรถr att " +"rensa" -#: builtin/worktree.c:309 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Fรถrbereder arbetskatalog (ny gren \"%s\")" -#: builtin/worktree.c:442 +#: builtin/worktree.c:496 #, 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:451 +#: builtin/worktree.c:505 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Fรถrbereder arbetskatalog (checkar ut \"%s\")" -#: builtin/worktree.c:457 +#: builtin/worktree.c:511 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Fรถrbereder arbetskatalog (frรฅnkopplat HEAD %s)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:552 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:501 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:503 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "skapa eller รฅterstรคll en gren" -#: builtin/worktree.c:505 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:506 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "lรฅt arbetskatalogen fรถrbli lรฅst" -#: builtin/worktree.c:509 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "stรคll in spรฅrningslรคge (se git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:566 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:520 +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach รคr รถmsesidigt uteslutande" -#: builtin/worktree.c:581 +#: builtin/worktree.c:635 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:681 +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "orsak till lรฅs" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" รคr inte en arbetskatalog" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:769 builtin/worktree.c:802 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte lรฅsas eller lรฅsas upp" -#: builtin/worktree.c:700 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" รคr redan lรฅst, orsak: %s" -#: builtin/worktree.c:702 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" รคr redan lรฅst" -#: builtin/worktree.c:730 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" รคr inte lรฅst" -#: builtin/worktree.c:771 +#: builtin/worktree.c:845 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:779 +#: builtin/worktree.c:853 msgid "force move even if worktree is dirty or locked" msgstr "tvinga flyttning รคven om arbetskatalogen รคr smutsig eller lรฅst" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:876 builtin/worktree.c:1000 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" รคr inte en huvudarbetskatalog" -#: builtin/worktree.c:807 +#: builtin/worktree.c:881 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut mรฅlnamn frรฅn \"%s\"" -#: builtin/worktree.c:813 -#, c-format -msgid "target '%s' already exists" -msgstr "mรฅlet \"%s\" finns redan" - -#: builtin/worktree.c:821 +#: builtin/worktree.c:894 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -20731,7 +22765,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:823 +#: builtin/worktree.c:896 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -20739,36 +22773,38 @@ 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:826 +#: builtin/worktree.c:899 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:831 +#: builtin/worktree.c:904 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:879 +#: builtin/worktree.c:950 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades kรถra \"git status\" pรฅ \"%s\"" -#: builtin/worktree.c:883 +#: builtin/worktree.c:954 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "\"%s\" รคr smutsigt, anvรคnd --force fรถr att ta bort det" +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" -#: builtin/worktree.c:888 +#: builtin/worktree.c:959 #, 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:911 +#: builtin/worktree.c:982 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:934 +#: builtin/worktree.c:1005 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -20777,7 +22813,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:936 +#: builtin/worktree.c:1007 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -20785,11 +22821,21 @@ 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:939 +#: builtin/worktree.c:1010 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" +#: builtin/worktree.c:1034 +#, c-format +msgid "repair: %s: %s" +msgstr "reparera: %s: %s" + +#: builtin/worktree.c:1037 +#, c-format +msgid "error: %s: %s" +msgstr "fel: %s: %s" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]" @@ -20806,29 +22852,22 @@ msgstr "visa trรคdobjekt fรถr underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast anvรคndbart vid felsรถkning" -#: credential-cache--daemon.c:223 +#: http-fetch.c:114 #, 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" +msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" -"Behรถrigheten pรฅ din uttags-katalog (socket) รคr fรถr lรถs; andra\n" -"anvรคndare kan lรคsa dina cachade inloggningsuppgifter. Du bรถr kรถra:\n" -"\n" -"\tchmod 0700 %s" +"argumentet till --packfile mรฅste vara ett giltigt hashvรคrde (fick '%s')" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "skriv felsรถkningsmeddelanden pรฅ standard fel" +#: http-fetch.c:122 +msgid "not a git repository" +msgstr "inte ett git-arkiv" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "incheckning %s รคr inte mรคrkt nรฅbar" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "fรถr mรฅnga incheckningar markerade nรฅbara" @@ -20840,7 +22879,7 @@ msgstr "test-tool serve-v2 [<flaggor>]" msgid "exit immediately after advertising capabilities" msgstr "avsluta omedelbart efter kungรถrelse av kapabiliteter" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -20857,7 +22896,7 @@ msgstr "" " [--git-dir=<sรถkvรคg>] [--work-tree=<sรถkvรคg>] [--namespace=<namn>]\n" " <kommando> [<flaggor>]" -#: git.c:34 +#: git.c:35 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" @@ -20869,47 +22908,47 @@ msgstr "" "<koncept>\" fรถr att lรคsa mer om specifika underkommandon och koncept.\n" "See \"git help git\" fรถr en รถversikt รถver systemet." -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "ingen katalog angavs fรถr --git-dir\n" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "ingen namnrymd angavs fรถr --namespace\n" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "ingen katalog angavs fรถr --work-tree\n" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "inget prefix angavs fรถr --super-prefix\n" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "-c fรถrvรคntar en konfigurationsstrรคng\n" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "ingen katalog angavs fรถr -C\n" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "okรคnd flagga: %s\n" -#: git.c:360 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "vid expandering av aliaset \"%s\": \"%s\"" -#: git.c:369 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -20918,39 +22957,39 @@ msgstr "" "aliaset \"%s\" รคndrar miljรถvariabler.\n" "Du kan anvรคnda \"!git\" i aliaset fรถr att gรถra det" -#: git.c:377 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "tomt alias fรถr %s" -#: git.c:380 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "rekursivt alias: %s" -#: git.c:460 +#: git.c:465 msgid "write failure on standard output" msgstr "skrivfel pรฅ standard ut" -#: git.c:462 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "okรคnt skrivfel pรฅ standard ut" -#: git.c:464 +#: git.c:469 msgid "close failed on standard output" msgstr "stรคng misslyckades pรฅ standard ut" -#: git.c:796 +#: git.c:819 #, 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:846 +#: git.c:869 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:859 +#: git.c:882 #, c-format msgid "" "usage: %s\n" @@ -20959,54 +22998,54 @@ msgstr "" "anvรคndning: %s\n" "\n" -#: git.c:879 +#: git.c:902 #, 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:891 +#: git.c:914 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades kรถra kommandot \"%s\": %s\n" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "http.postbuffer har negativt vรคrde; anvรคnder fรถrvalet %d" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegerad styrning stรถds inte av cURL < 7.22.0" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Fastnรฅlning av รถppen nyckel stรถds inte av cURL < 7.44.0" -#: http.c:876 +#: http.c:910 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE stรถds inte av cURL < 7.44.0" -#: http.c:949 +#: http.c:989 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Prtokollbegrรคnsningar stรถds inte av cURL < 7.19.4" -#: http.c:1085 +#: http.c:1132 #, 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:1092 +#: http.c:1139 #, 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:1096 +#: http.c:1143 #, 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:1965 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21017,152 +23056,192 @@ msgstr "" " bad om: %s\n" " omdirigering: %s" -#: remote-curl.c:157 +#: remote-curl.c:174 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "felaktig citering pรฅ vรคrde fรถr push-option: \"%s\"" -#: remote-curl.c:254 +#: remote-curl.c:298 #, 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:355 +#: remote-curl.c:399 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:386 +#: remote-curl.c:430 #, c-format msgid "invalid server response; got '%s'" msgstr "ogiltigt svar frรฅn servern; fick \"%s\"" -#: remote-curl.c:446 +#: remote-curl.c:490 #, c-format msgid "repository '%s' not found" msgstr "arkivet \"%s\" hittades inte" -#: remote-curl.c:450 +#: remote-curl.c:494 #, c-format msgid "Authentication failed for '%s'" msgstr "Autentisering misslyckades \"%s\"" -#: remote-curl.c:454 +#: remote-curl.c:498 #, c-format msgid "unable to access '%s': %s" msgstr "kan inte komma รฅt \"%s\": %s" -#: remote-curl.c:460 +#: remote-curl.c:504 #, c-format msgid "redirecting to %s" msgstr "omdirigerar till %s" -#: remote-curl.c:584 +#: remote-curl.c:633 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:664 +#: remote-curl.c:645 +msgid "remote server sent stateless separator" +msgstr "fjรคrrservern sรคnde tillstรฅndslรถs avdelare" + +#: remote-curl.c:715 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:724 +#: remote-curl.c:745 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curl: felaktig radlรคngdstecken: %.4s" + +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curl: ovรคntat svarsavslutningspaketet" + +#: remote-curl.c:823 #, c-format msgid "RPC failed; %s" msgstr "RPC misslyckades; %s" -#: remote-curl.c:764 +#: remote-curl.c:863 msgid "cannot handle pushes this big" msgstr "kan inte hantera sรฅ stora sรคndningar" -#: remote-curl.c:879 +#: remote-curl.c:978 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "kan inte packa upp anrop; zlib-deflate-fel %d" -#: remote-curl.c:883 +#: remote-curl.c:982 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "kan inte packa upp anrop; zlib-slutfel %d" -#: remote-curl.c:1014 +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" +msgstr "%d byte av lรคngd-huvudet togs emot" + +#: remote-curl.c:1034 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "%d byte av kroppen vรคntas fortfarande" + +#: remote-curl.c:1123 msgid "dumb http transport does not support shallow capabilities" msgstr "dum http-transport stรถder inte grunda arkiv" -#: remote-curl.c:1028 +#: remote-curl.c:1138 msgid "fetch failed." msgstr "mottagning misslyckades." -#: remote-curl.c:1076 +#: remote-curl.c:1184 msgid "cannot fetch by sha1 over smart http" msgstr "kan inte hรคmta med sha1 รถver smart http" -#: remote-curl.c:1120 remote-curl.c:1126 +#: remote-curl.c:1228 remote-curl.c:1234 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "protokollfel: fรถrvรคntade sha/ref, fick \"%s\"" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1246 remote-curl.c:1361 #, c-format msgid "http transport does not support %s" msgstr "http-transporten stรถder inte %s" -#: remote-curl.c:1174 +#: remote-curl.c:1282 msgid "git-http-push failed" msgstr "git-http-push misslyckades" -#: remote-curl.c:1360 +#: remote-curl.c:1467 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: anvรคndning: git remote-curl <fjรคrr> [<url>]" -#: remote-curl.c:1392 +#: remote-curl.c:1499 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:1399 +#: remote-curl.c:1506 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: fรถrsรถkte ta emot utan lokalt arkiv" -#: remote-curl.c:1439 +#: remote-curl.c:1547 #, 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:61 +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "ingen kompilatorinformation tillgรคnglig\n" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "ingen libc-information tillgรคnglig\n" + +#: list-objects-filter-options.h:91 msgid "args" msgstr "argument" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "objektfiltrering" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:184 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakรฅtkompatibilitet)" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "var mer tyst" -#: 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:317 +msgid "use <n> digits to display object names" +msgstr "anvรคnd <n> siffror fรถr att visa objektnamn" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" -msgstr "hur blanksteg och #kommentarer skall tas bort frรฅn meddelande" +msgstr "hur blanksteg och #kommentarer ska tas bort frรฅn meddelande" -#: ref-filter.h:101 +#: 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" + +#: ref-filter.h:96 msgid "key" msgstr "nyckel" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "fรคltnamn att sortera pรฅ" @@ -21170,11 +23249,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:68 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "HEAD frรฅnkopplad vid " -#: wt-status.h:69 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "HEAD frรฅnkopplad frรฅn " @@ -21215,670 +23294,687 @@ msgid "List, create, or delete branches" msgstr "Visa, skapa eller ta bort grenar" #: command-list.h:59 +msgid "Collect information for user to file a bug report" +msgstr "Samla information frรฅn anvรคndaren fรถr att sรคnda en felrapport" + +#: command-list.h:60 msgid "Move objects and refs by archive" msgstr "Flytta objekt och referenser efter arkiv" -#: command-list.h:60 +#: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "" "Visa innehรฅller eller typ- och storleksinformation fรถr objekt i arkivet" -#: command-list.h:61 +#: command-list.h:62 msgid "Display gitattributes information" msgstr "Visa information frรฅn gitattributes" -#: command-list.h:62 +#: command-list.h:63 msgid "Debug gitignore / exclude files" msgstr "Felsรถk gitignore / exkluderings-filer" -#: command-list.h:63 +#: command-list.h:64 msgid "Show canonical names and email addresses of contacts" msgstr "Visa kanoniska namn och e-postadresser fรถr kontakter" -#: command-list.h:64 +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "Byt till en ny gren eller รฅterstรคll filer i arbetskatalogen" -#: command-list.h:65 +#: command-list.h:66 msgid "Copy files from the index to the working tree" msgstr "Kopiera filer frรฅn indexet till arbetskatalogen" -#: command-list.h:66 +#: command-list.h:67 msgid "Ensures that a reference name is well formed" msgstr "Se till att referensen รคr vรคlformad" -#: command-list.h:67 +#: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "Hitta incheckningar som รคnnu inte applicerats uppstrรถms" -#: command-list.h:68 +#: command-list.h:69 msgid "Apply the changes introduced by some existing commits" msgstr "Applicera รคndringarna introducerade av befintliga incheckningar" -#: command-list.h:69 +#: command-list.h:70 msgid "Graphical alternative to git-commit" msgstr "Grafiskt alternativ till git-commit" -#: command-list.h:70 +#: command-list.h:71 msgid "Remove untracked files from the working tree" msgstr "Ta bort ospรฅrade filer frรฅn arbetskatalogen" -#: command-list.h:71 +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "Klona ett arkiv till en ny katalog" -#: command-list.h:72 +#: command-list.h:73 msgid "Display data in columns" msgstr "Visa data i kolumner" -#: command-list.h:73 +#: command-list.h:74 msgid "Record changes to the repository" msgstr "Protokollfรถr รคndringar i arkivet" -#: command-list.h:74 +#: command-list.h:75 msgid "Write and verify Git commit-graph files" msgstr "Skriv och verifiera Git-incheckningsgraffiler" -#: command-list.h:75 +#: command-list.h:76 msgid "Create a new commit object" msgstr "Skapa ett nytt incheckningsobjekt" -#: command-list.h:76 +#: command-list.h:77 msgid "Get and set repository or global options" msgstr "Lรคs och skriv alternativ fรถr arkiv eller globalt" -#: command-list.h:77 +#: command-list.h:78 msgid "Count unpacked number of objects and their disk consumption" msgstr "Rรคkna antal opackade objekt och mรคngd diskutrymme" -#: command-list.h:78 +#: command-list.h:79 msgid "Retrieve and store user credentials" msgstr "Hรคmta och spara anvรคndarreferenser" -#: command-list.h:79 +#: command-list.h:80 msgid "Helper to temporarily store passwords in memory" msgstr "Hjรคlpprogram fรถr att tillfรคlligt lagra lรถsenord i minnet" -#: command-list.h:80 +#: command-list.h:81 msgid "Helper to store credentials on disk" msgstr "Hjรคlpprogram fรถr att lagra anvรคndarreferenser pรฅ disk" -#: command-list.h:81 +#: command-list.h:82 msgid "Export a single commit to a CVS checkout" msgstr "Exportera en enkel incheckning i en CVS-utcheckning" -#: command-list.h:82 +#: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" msgstr "Rรคdda dina data ut ur andra SCM folk รคlskar att hata" -#: command-list.h:83 +#: command-list.h:84 msgid "A CVS server emulator for Git" msgstr "En CVS-serveremulator fรถr Git" -#: command-list.h:84 +#: command-list.h:85 msgid "A really simple server for Git repositories" msgstr "En riktigt enkel server fรถr Git-arkiv" -#: command-list.h:85 +#: command-list.h:86 msgid "Give an object a human readable name based on an available ref" msgstr "Ge ett objekt anvรคndarlรคsbara namn baserade pรฅ en tillgรคnglig referens" -#: command-list.h:86 +#: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" msgstr "Visa รคndringar mellan incheckningar, med arbetskatalogen, osv" -#: command-list.h:87 +#: command-list.h:88 msgid "Compares files in the working tree and the index" msgstr "Jรคmfรถr filer i arbetskatalogen och indexet" -#: command-list.h:88 +#: command-list.h:89 msgid "Compare a tree to the working tree or index" msgstr "Jรคmfรถr en trรคd med arbetskatalogen eller indexet" -#: command-list.h:89 +#: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" msgstr "Visar innehรฅll och lรคge fรถr blobbar som hittats via tvรฅ trรคdobjekt" -#: command-list.h:90 +#: command-list.h:91 msgid "Show changes using common diff tools" msgstr "Visa รคndringar med vanliga diff-verktyg" -#: command-list.h:91 +#: command-list.h:92 msgid "Git data exporter" msgstr "Exporterare fรถr Git-data" -#: command-list.h:92 +#: command-list.h:93 msgid "Backend for fast Git data importers" msgstr "Bakรคnda fรถr snabba Git-dataimporterare" -#: command-list.h:93 +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "Hรคmta objekt och referenser frรฅn annat arkiv" -#: command-list.h:94 +#: command-list.h:95 msgid "Receive missing objects from another repository" msgstr "Ta emot saknade objekt frรฅn annat arkiv" -#: command-list.h:95 +#: command-list.h:96 msgid "Rewrite branches" msgstr "Skriv om grenar" -#: command-list.h:96 +#: command-list.h:97 msgid "Produce a merge commit message" msgstr "Skapa incheckningsmeddelande fรถr en sammanslagning" -#: command-list.h:97 +#: command-list.h:98 msgid "Output information on each ref" msgstr "Visa information fรถr varje referens" -#: command-list.h:98 +#: command-list.h:99 msgid "Prepare patches for e-mail submission" msgstr "Fรถrbered patchar fรถr insรคndning via e-post" -#: command-list.h:99 +#: command-list.h:100 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "Bekrรคftar konnektivitet och validitet fรถr objektet i databasen" -#: command-list.h:100 +#: command-list.h:101 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Stรคda onรถdiga filer och optimera det lokala arkivet" -#: command-list.h:101 +#: command-list.h:102 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 +#: command-list.h:103 msgid "Print lines matching a pattern" msgstr "Visa rader som motsvarar mรถnster" -#: command-list.h:103 +#: command-list.h:104 msgid "A portable graphical interface to Git" msgstr "Ett portabelt grafiskt grรคnssnitt fรถr Git" -#: command-list.h:104 +#: command-list.h:105 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 +#: command-list.h:106 msgid "Display help information about Git" msgstr "Visa hjรคlpinformation om Git" -#: command-list.h:106 +#: command-list.h:107 msgid "Server side implementation of Git over HTTP" msgstr "Serversideimplementation av Git รถver HTTP" -#: command-list.h:107 +#: command-list.h:108 msgid "Download from a remote Git repository via HTTP" msgstr "Hรคmta objekt och referenser frรฅn annat Git-arkiv รถver HTTP" -#: command-list.h:108 +#: command-list.h:109 msgid "Push objects over HTTP/DAV to another repository" msgstr "Sรคnd objekt รถver HTTP/DAV till ett annat arkiv" -#: command-list.h:109 +#: command-list.h:110 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "Sรคnd en samling patchar frรฅn stdin till en IMAP-mapp" -#: command-list.h:110 +#: command-list.h:111 msgid "Build pack index file for an existing packed archive" msgstr "SKapa pack-indexfiler fรถr ett befintligt packat arkiv" -#: command-list.h:111 +#: command-list.h:112 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt" -#: command-list.h:112 +#: command-list.h:113 msgid "Instantly browse your working repository in gitweb" msgstr "Omedelbart blรคddra i din arbetskatalog med gitweb" -#: command-list.h:113 +#: command-list.h:114 msgid "Add or parse structured information in commit messages" msgstr "" "Lรคgg till eller tolka strukturerad information i incheckningsmeddelanden" -#: command-list.h:114 +#: command-list.h:115 msgid "The Git repository browser" msgstr "Blรคddraren fรถr Git-arkiv" -#: command-list.h:115 +#: command-list.h:116 msgid "Show commit logs" msgstr "Visa incheckningsloggar" -#: command-list.h:116 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "Visa information om filer i indexet och arbetskatalogen" -#: command-list.h:117 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "Lista referenser i ett fjรคrrarkiv" -#: command-list.h:118 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "Visa innehรฅllet i ett trรคdobjekt" -#: command-list.h:119 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "Hรคmta patch och รคgarskap frรฅn ett enkelt e-postmeddelande" -#: command-list.h:120 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "Enkelt program fรถr att dela en UNIX mbox" -#: command-list.h:121 +#: command-list.h:122 +msgid "Run tasks to optimize Git repository data" +msgstr "Utfรถr uppgifter fรถr att optimera Git-arkivdata" + +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "Slรฅ ihop tvรฅ eller flera utvecklingshistorier" -#: command-list.h:122 +#: command-list.h:124 msgid "Find as good common ancestors as possible for a merge" msgstr "Hitta en sรฅ bra anfader som mรถjligt fรถr sammanslagning" -#: command-list.h:123 +#: command-list.h:125 msgid "Run a three-way file merge" msgstr "Kรถr en trevรคgs-filsammanslagning" -#: command-list.h:124 +#: command-list.h:126 msgid "Run a merge for files needing merging" msgstr "Kรถr en sammanslagning fรถr filer som behรถver det" -#: command-list.h:125 +#: command-list.h:127 msgid "The standard helper program to use with git-merge-index" msgstr "Fรถrvalt hjรคlpprogram att anvรคnda tillsammans med git-merge-index" -#: command-list.h:126 +#: command-list.h:128 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "Kรถr verktyg fรถr lรถsning av sammanslagningskonflikter" -#: command-list.h:127 +#: command-list.h:129 msgid "Show three-way merge without touching index" msgstr "Visa trevรคgssammanslagning utan att rรถra indexet" -#: command-list.h:128 +#: command-list.h:130 msgid "Write and verify multi-pack-indexes" msgstr "Skriv och verifiera multi-pack-index" -#: command-list.h:129 +#: command-list.h:131 msgid "Creates a tag object" msgstr "Skapar ett taggobjekt" -#: command-list.h:130 +#: command-list.h:132 msgid "Build a tree-object from ls-tree formatted text" msgstr "Bygg ett trรคdobjekt frรฅn ls-tree-formaterad text" -#: command-list.h:131 +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "Flytta eller byt namn pรฅ en fil, katalog eller symbolisk lรคnk" -#: command-list.h:132 +#: command-list.h:134 msgid "Find symbolic names for given revs" msgstr "Hitta symboliska namn fรถr givna referenser" -#: command-list.h:133 +#: command-list.h:135 msgid "Add or inspect object notes" msgstr "Lรคgg till eller inspektera objektanteckningar" -#: command-list.h:134 +#: command-list.h:136 msgid "Import from and submit to Perforce repositories" msgstr "Importera frรฅn eller sรคnd till Perforce-arkiv" -#: command-list.h:135 +#: command-list.h:137 msgid "Create a packed archive of objects" msgstr "Skapa ett packat arkiv med objekt" -#: command-list.h:136 +#: command-list.h:138 msgid "Find redundant pack files" msgstr "Hitta redundanta pack-filer" -#: command-list.h:137 +#: command-list.h:139 msgid "Pack heads and tags for efficient repository access" msgstr "Packa huvuden och taggar fรถr effektiv arkivรฅtkomst" -#: command-list.h:138 +#: command-list.h:140 msgid "Routines to help parsing remote repository access parameters" msgstr "" "Rutiner fรถr att gรถra det lรคttare att tolka รฅtkomstparametrar fรถr fjรคrrarkiv" -#: command-list.h:139 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "Berรคkna unik ID fรถr en patch" -#: command-list.h:140 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "Ta bort alla onรฅbara objekt frรฅn objektdatabasen" -#: command-list.h:141 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "Ta bort extraobjekt som redan finns i pack-filerna" -#: command-list.h:142 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Hรคmta frรฅn och integrera med annat arkiv eller en lokal gren" -#: command-list.h:143 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "Uppdatera fjรคrr-referenser och tillhรถrande objekt" -#: command-list.h:144 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "Tillรคmpar en quilt-patchuppsรคttning pรฅ aktiv gren" -#: command-list.h:145 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "Jรคmfรถr tvรฅ incheckningsintervall (dvs. tvรฅ versioner av en gren)" -#: command-list.h:146 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "Lรคser trรคdinformation in i indexet" -#: command-list.h:147 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "Applicera incheckningar pรฅ nytt ovanpรฅ en annan bastopp" -#: command-list.h:148 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "Ta emot det som sรคnds till arkivet" -#: command-list.h:149 +#: command-list.h:151 msgid "Manage reflog information" msgstr "Hantera referenslogg-information" -#: command-list.h:150 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "Hantera uppsรคttningen spรฅrade arkiv" -#: command-list.h:151 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "Packa opackade objekt i ett arkiv" -#: command-list.h:152 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "Skapa, visa, ta bort referenser fรถr att ersรคtta objekt" -#: command-list.h:153 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "Skapar en sammanfattning av vรคntande รคndringar" -#: command-list.h:154 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "ร teranvรคnd sparad lรถsning av sammanslagningskonflikter" -#: command-list.h:155 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "ร terstรคll aktuell HEAD till angivet tillstรฅnd" -#: command-list.h:156 +#: command-list.h:158 msgid "Restore working tree files" msgstr "ร terstรคll filer i arbetskatalogen" -#: command-list.h:157 +#: command-list.h:159 msgid "Revert some existing commits" msgstr "ร terstรคll nรฅgra befintliga incheckningar" -#: command-list.h:158 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "Visa incheckningsobjekt i omvรคnd kronologisk ordning" -#: command-list.h:159 +#: command-list.h:161 msgid "Pick out and massage parameters" msgstr "Plocka ut och massera parametrar" -#: command-list.h:160 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "Ta bort filer frรฅn arbetskatalogen och frรฅn indexet" -#: command-list.h:161 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "Sรคnd en uppsรคttning patchar som e-post" -#: command-list.h:162 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "Sรคnd objekt รถver Git-protokollet till annat arkiv" -#: command-list.h:163 +#: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" msgstr "Begrรคnsat inloggningsskal fรถr SSH-รฅtkomst till bara Git" -#: command-list.h:164 +#: command-list.h:166 msgid "Summarize 'git log' output" msgstr "Summera \"git log\"-utdata" -#: command-list.h:165 +#: command-list.h:167 msgid "Show various types of objects" msgstr "Visa olika sorters objekt" -#: command-list.h:166 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "Visa grenar och deras incheckningar" -#: command-list.h:167 +#: command-list.h:169 msgid "Show packed archive index" msgstr "Skapa packat arkivindex" -#: command-list.h:168 +#: command-list.h:170 msgid "List references in a local repository" msgstr "Visa referenser i ett lokalt arkiv" -#: command-list.h:169 +#: command-list.h:171 msgid "Git's i18n setup code for shell scripts" msgstr "Git:s i18n-startkod fรถr skalskript" -#: command-list.h:170 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "Gemensam skriptstartkod fรถr Git" -#: command-list.h:171 +#: command-list.h:173 +msgid "Initialize and modify the sparse-checkout" +msgstr "Initiera och modifiera sparse-checkout" + +#: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "Spara undan รคndringar i en lortig arbetskatalog" -#: command-list.h:172 +#: command-list.h:175 msgid "Add file contents to the staging area" msgstr "Lรคgg filinnehรฅllet till indexet" -#: command-list.h:173 +#: command-list.h:176 msgid "Show the working tree status" msgstr "Visa status fรถr arbetskatalogen" -#: command-list.h:174 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "Ta bort onรถdiga blanksteg" -#: command-list.h:175 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "Initiera, uppdatera eller inspektera undermoduler" -#: command-list.h:176 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git" -#: command-list.h:177 +#: command-list.h:180 msgid "Switch branches" msgstr "Byt gren" -#: command-list.h:178 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "Lรคs, modifiera eller ta bort symbolisk referens" -#: command-list.h:179 +#: command-list.h:182 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:180 +#: command-list.h:183 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:181 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "Packa upp objekt frรฅn ett pakat arkiv" -#: command-list.h:182 +#: command-list.h:185 msgid "Register file contents in the working tree to the index" msgstr "Registrera filinnehรฅllet frรฅn arbetskatalogen i indexet" -#: command-list.h:183 +#: command-list.h:186 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:184 +#: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" msgstr "Uppdatera tillรคggsinfofil fรถr att hjรคlpa dumma servrar" -#: command-list.h:185 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "Sรคnd arkivet tillbaka till git-archive" -#: command-list.h:186 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "Sรคnd packade objekt tillbaka till git-fetch-pack" -#: command-list.h:187 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "Visa en logisk Git-variabel" -#: command-list.h:188 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "Kontrollera GPG-signaturer fรถr incheckningar" -#: command-list.h:189 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "Bekrรคfta packade Git-arkivfiler" -#: command-list.h:190 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "Kontrollera GPG-signaturer i taggar" -#: command-list.h:191 +#: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git-webbgrรคnssnitt (webbframรคnda fรถr Git-arkiv)" -#: command-list.h:192 +#: command-list.h:195 msgid "Show logs with difference each commit introduces" msgstr "Visa loggar med differenser varje incheckning introducerar" -#: command-list.h:193 +#: command-list.h:196 msgid "Manage multiple working trees" msgstr "Hantera ytterligare arbetskataloger" -#: command-list.h:194 +#: command-list.h:197 msgid "Create a tree object from the current index" msgstr "Skapa ett trรคdobjekt frรฅn aktuellt index" -#: command-list.h:195 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "Definierar attribut per sรถkvรคg" -#: command-list.h:196 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "Gits kommandoradsgrรคnssnitt och -konventioner" -#: command-list.h:197 +#: command-list.h:200 msgid "A Git core tutorial for developers" msgstr "Grundlรคggande Git-handledning fรถr utvecklare" -#: command-list.h:198 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "Tillhandahรฅll anvรคndarnamn och lรถsenord till Git" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "Git fรถr CVS-anvรคndare" -#: command-list.h:199 +#: command-list.h:203 msgid "Tweaking diff output" msgstr "Justrea diff-utdata" -#: command-list.h:200 +#: command-list.h:204 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:201 +#: command-list.h:205 +msgid "Frequently asked questions about using Git" +msgstr "Ofta stรคllda frรฅgor om att anvรคnda Git" + +#: command-list.h:206 msgid "A Git Glossary" msgstr "En Git-ordlista" -#: command-list.h:202 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "Krokar som anvรคnds av Git" -#: command-list.h:203 +#: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospรฅrade filer att ignorera" -#: command-list.h:204 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "Ange egenskaper fรถr undermoduler" -#: command-list.h:205 +#: command-list.h:210 msgid "Git namespaces" msgstr "Git-namnrymder" -#: command-list.h:206 +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "Hjรคlpprogram fรถr att interagera med fjรคrrarkiv" + +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Gits arkivlayout" -#: command-list.h:207 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: command-list.h:208 +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "Monterar ett arkiv inuti ett annat" + +#: command-list.h:215 msgid "A tutorial introduction to Git: part two" msgstr "Introduktion till Git: del tvรฅ" -#: command-list.h:209 +#: command-list.h:216 msgid "A tutorial introduction to Git" msgstr "Introduktion till Git" -#: command-list.h:210 +#: command-list.h:217 msgid "An overview of recommended workflows with Git" msgstr "รversikt รถver rekommenderade arbetsflรถden med Git" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "Du mรฅste starta med \"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 "Vill du att jag ska gรถra det รฅt dig [Y=ja/N=nej]? " - -#: git-bisect.sh:101 +#: git-bisect.sh:79 #, sh-format msgid "Bad rev input: $arg" msgstr "Felaktig rev-indata: $arg" -#: git-bisect.sh:121 +#: git-bisect.sh:99 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Felaktig rev-indata: $bisected_head" -#: git-bisect.sh:130 +#: git-bisect.sh:108 #, sh-format msgid "Bad rev input: $rev" msgstr "Felaktig rev-indata: $rev" -#: git-bisect.sh:139 +#: git-bisect.sh:117 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument." -#: git-bisect.sh:209 +#: git-bisect.sh:149 msgid "No logfile given" msgstr "Ingen loggfil angiven" -#: git-bisect.sh:210 +#: git-bisect.sh:150 #, sh-format msgid "cannot read $file for replaying" msgstr "kan inte lรคsa $file fรถr uppspelning" -#: git-bisect.sh:232 +#: git-bisect.sh:173 msgid "?? what are you talking about?" msgstr "?? vad menar du?" -#: git-bisect.sh:241 +#: git-bisect.sh:183 msgid "bisect run failed: no command provided." msgstr "bisect-kรถrning misslyckades: inget kommando gavs." -#: git-bisect.sh:246 +#: git-bisect.sh:188 #, sh-format msgid "running $command" msgstr "kรถr $command" -#: git-bisect.sh:253 +#: git-bisect.sh:195 #, sh-format msgid "" "bisect run failed:\n" @@ -21887,11 +23983,11 @@ msgstr "" "\"bisect\"-kรถrningen misslyckades:\n" "felkod $res frรฅn \"$command\" รคr < 0 eller >= 128" -#: git-bisect.sh:279 +#: git-bisect.sh:221 msgid "bisect run cannot continue any more" msgstr "\"bisect\"-kรถrningen kan inte fortsรคtta lรคngre" -#: git-bisect.sh:285 +#: git-bisect.sh:227 #, sh-format msgid "" "bisect run failed:\n" @@ -21900,11 +23996,11 @@ msgstr "" "\"bisect\"-kรถrningen misslyckades:\n" "\"bisect_state $state\" avslutades med felkoden $res" -#: git-bisect.sh:292 +#: git-bisect.sh:234 msgid "bisect run success" msgstr "\"bisect\"-kรถrningen lyckades" -#: git-bisect.sh:300 +#: git-bisect.sh:242 msgid "We are not bisecting." msgstr "Vi utfรถr ingen bisect fรถr tillfรคllet." @@ -21948,139 +24044,46 @@ 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: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:271 -#, sh-format -msgid "Cannot update $ref_stash with $w_commit" -msgstr "Kan inte uppdatera $ref_stash med $w_commit" - -#: 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:355 -#, sh-format -msgid "Saved working directory and index state $stash_msg" -msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" - -#: git-legacy-stash.sh:535 -#, sh-format -msgid "unknown option: $opt" -msgstr "okรคnd flagga: $opt" - -#: 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:570 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "$reference รคr inte en giltig referens" - -#: 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:609 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "\"$args\" รคr inte en \"stash\"-referens" - -#: git-legacy-stash.sh:617 -msgid "unable to refresh index" -msgstr "kan inte uppdatera indexet" - -#: 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:629 -msgid "Conflicts in index. Try without --index." -msgstr "Konflikter i indexet. Testa utan --index." - -#: git-legacy-stash.sh:631 -msgid "Could not save index tree" -msgstr "Kunde inte spara indextrรคd" - -#: 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:665 -msgid "Cannot unstage modified files" -msgstr "Kan inte ta bort รคndrade filer ur kรถn" - -#: git-legacy-stash.sh:703 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "Kastade ${REV} ($s)" - -#: 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:791 -msgid "(To restore them type \"git stash apply\")" -msgstr "(Fรถr att รฅterstรคlla dem, skriv \"git stash apply\")" - -#: git-submodule.sh:200 +#: git-submodule.sh:180 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:210 +#: git-submodule.sh:190 #, 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:229 +#: git-submodule.sh:209 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:232 +#: git-submodule.sh:212 #, 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:239 +#: git-submodule.sh:219 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "\"$sm_path\" har inte nรฅgon utcheckad incheckning" -#: 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 +#: git-submodule.sh:250 #, 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:270 +#: git-submodule.sh:252 #, 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:278 +#: git-submodule.sh:260 #, 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:280 +#: git-submodule.sh:262 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22098,37 +24101,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:286 +#: git-submodule.sh:268 #, 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:298 +#: git-submodule.sh:280 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:303 +#: git-submodule.sh:285 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lรคgga till undermodulen \"$sm_path\"" -#: git-submodule.sh:312 +#: git-submodule.sh:294 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:573 +#: git-submodule.sh:567 #, 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:583 +#: git-submodule.sh:577 #, 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:588 +#: git-submodule.sh:582 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -22137,7 +24140,7 @@ msgstr "" "Kan inte hitta aktuell revision fรถr ${remote_name}/${branch} i " "undermodulsรถkvรคgen \"$sm_path\"" -#: git-submodule.sh:606 +#: git-submodule.sh:600 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -22146,7 +24149,7 @@ msgstr "" "Kan inte hรคmta i undermodulsรถkvรคg \"$displaypath\"; fรถrsรถkte hรคmta $sha1 " "direkt:" -#: git-submodule.sh:612 +#: git-submodule.sh:606 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -22155,78 +24158,52 @@ msgstr "" "Hรคmtade i undermodulssรถkvรคgen \"$displaypath\", men den innehรถll inte $sha1. " "Direkt hรคmtning av incheckningen misslyckades." -#: git-submodule.sh:619 +#: git-submodule.sh:613 #, 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:620 +#: git-submodule.sh:614 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsรถkvรคgen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:624 +#: git-submodule.sh:618 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsรถkvรคgen \"$displaypath\"" -#: git-submodule.sh:625 +#: git-submodule.sh:619 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsรถkvรคgen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:630 +#: git-submodule.sh:624 #, 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:631 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsรถkvรคgen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:636 +#: git-submodule.sh:630 #, 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:637 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsรถkvรคgen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:668 +#: git-submodule.sh:662 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsรถkvรคgen \"$displaypath\"" -#: 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:882 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "ovรคntat lรคge $mod_dst" - -#: 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: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:908 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" -" Varning: $display_name innehรฅller inte incheckningarna $sha1_src och " -"$sha1_dst" - #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." @@ -22241,12 +24218,22 @@ msgstr "Tillรคmpade autostash." msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" +#: git-rebase--preserve-merges.sh:113 +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 "" +"Tillรคmpning av autostash gav konflikter.\n" +"Dina รคndringar รคr sรคkra i stashen.\n" +"Du kan nรคr som helst anvรคnda \"git stash pop\" eller \"git stash drop\".\n" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Ombaserar ($new_count/$total)" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -22287,7 +24274,7 @@ msgstr "" "\n" "Du kan byta ordning pรฅ raderna; de utfรถrs uppifrรฅn och ned.\n" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -22306,83 +24293,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: inte en incheckning som kan vรคljas" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Felaktigt incheckningsnamn: $sha1" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "Kan inte skriva ersรคttnings-sha1 fรถr aktuell incheckning" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "Snabbspolade till $sha1" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Kan inte snabbspola till $sha1" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Kan inte flytta HEAD till $first_parent" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Vรคgrar utfรถra \"squash\" pรฅ en sammanslagning: $sha1" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "Fel nรคr sammanslagningen $sha1 skulle gรถras om" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "Kunde inte vรคlja $sha1" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "Det hรคr รคr incheckningsmeddelande ${n}:" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Incheckningsmeddelande ${n} kommer hoppas รถver:" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Det hรคr รคr en kombination av $count incheckning." msgstr[1] "Det hรคr รคr en kombination av $count incheckningar." -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Kan inte skriva $fixup_msg" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "Det hรคr รคr en kombination av 2 incheckningar." -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Kunde inte tillรคmpa $sha1... $rest" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -22396,31 +24383,31 @@ msgstr "" "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n" "du mรฅste lรถsa problemet innan du kan skriva om incheckningsmeddelandet." -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Stoppade pรฅ $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Kan inte utfรถra \"$squash_style\" utan en fรถregรฅende incheckning" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "Kรถr: $rest" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "Kรถrning misslyckades: $rest" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "och gjorde รคndringar till indexet och/eller arbetskatalogen" -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -22431,7 +24418,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -22446,25 +24433,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Okรคnt kommando: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Rรคtta det med \"git rebase --edit-todo\"." -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Lyckades ombasera och uppdatera $head_name." -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -22483,11 +24470,11 @@ msgid "" msgstr "" "Du har kรถade รคndringar i din arbetskatalog.\n" "Om det รคr meningen att รคndringarna\n" -"skall lรคggas in i fรถregรฅende incheckning, kรถr:\n" +"ska lรคggas in i fรถregรฅende incheckning, kรถr:\n" "\n" " git commit --amend $gpg_sign_opt_quoted\n" "\n" -"Om de skall checkas in i en egen incheckning, kรถr:\n" +"Om de ska checkas in i en egen incheckning, kรถr:\n" "\n" " git commit $gpg_sign_opt_quoted\n" "\n" @@ -22495,11 +24482,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "Fel vid fรถrsรถk att hitta fรถrfattaridentitet fรถr att utรถka incheckning" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -22507,40 +24494,44 @@ msgstr "" "Du har รคndringar i arbetskatalogen som inte checkats in. Checka in dem\n" "fรถrst och kรถr sedan \"git rebase --continue\" igen." -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "Kunde inte checka in kรถade รคndringar." -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "Kunde inte starta textredigerare" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "Kunde inte checka ut $switch_to" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "Inget HEAD?" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Kunde inte skapa temporรคr $state_dir" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "Kunde inte markera som interaktiv" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" 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:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:945 +msgid "Note that empty commits are commented out" +msgstr "Observera att tomma incheckningar รคr utkommenterade" + +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "Kunde inte initiera omskrivna incheckningar" @@ -22605,81 +24596,19 @@ 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:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: 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 +#: git-add--interactive.perl:634 #, 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: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 +#: git-add--interactive.perl:1058 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -22687,7 +24616,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "kรถas omedelbart." -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1061 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -22695,7 +24624,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "lรคggas till i \"stash\" omedelbart." -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1064 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -22703,8 +24632,8 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "tas bort frรฅn kรถn omedelbart." -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -22712,8 +24641,8 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras fรถr applicering omedelbart." -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -22721,16 +24650,12 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras fรถr kasta omedelbart." -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1116 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "misslyckades รถppna styckeredigeringsfil fรถr skrivning: %s" -#: 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 +#: git-add--interactive.perl:1123 #, perl-format msgid "" "---\n" @@ -22743,36 +24668,12 @@ msgstr "" "Ta bort \"%s\" rader genom att radera dem.\n" "Rader som bรถrjar med %s kommer att tas bort.\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 "" -"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 +#: git-add--interactive.perl:1145 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "misslyckades รถppna styckesredigeringsfil fรถr lรคsning: %s" -#. 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 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -22786,7 +24687,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:1252 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -22800,7 +24701,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:1258 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -22814,7 +24715,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:1264 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -22828,7 +24729,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:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -22842,7 +24743,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:1276 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -22856,7 +24757,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:1282 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -22870,7 +24771,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:1294 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -22884,7 +24785,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:1309 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -22906,226 +24807,90 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjรคlp\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1347 msgid "The selected hunks do not apply to the index!\n" msgstr "Markerade stycken kan inte appliceras pรฅ indexet!\n" -#: 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 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorerar ej sammanslagen: %s\n" -#: 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 +#: git-add--interactive.perl:1481 #, 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:1467 +#: git-add--interactive.perl:1482 #, 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:1468 +#: git-add--interactive.perl:1483 +#, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera tillรคgg pรฅ arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1484 #, 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:1568 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "Inga andra stycken att gรฅ till\n" -#: 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 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ogiltigt siffervรคrde: \"%s\"\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1624 #, 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:1617 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "Inga andra stycken att sรถka efter\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "sรถk efter reguljรคrt uttryck? " - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Felaktigt format pรฅ reguljรคrt sรถkuttryck %s: %s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "Inga stycken motsvarar givet mรถnster\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "Inget fรถregรฅende stycke\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "Inget fรถljande stycke\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "Beklagar, kan inte dela stycket\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1738 #, 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:1706 +#: git-add--interactive.perl:1748 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:1771 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23142,19 +24907,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: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 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 msgid "missing --" msgstr "saknad --" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1861 #, perl-format msgid "unknown --patch mode: %s" msgstr "okรคnt lรคge fรถr --patch: %s" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 #, perl-format msgid "invalid argument %s, expecting --" msgstr "felaktigt argument %s, fรถrvรคntar --" @@ -23171,27 +24936,39 @@ msgstr "lokal tidszonfรถrskjutning stรถrre รคn eller lika med 24 timmar\n" msgid "the editor exited uncleanly, aborting everything" msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "\"%s\" innehรฅller en mellanliggande version av e-postbrevet du skrev.\n" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "\"%s.final\" innehรฅller det skrivna brevet.\n" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-alias รคr inkompatibelt med andra flaggor\n" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"รถdesdigert: hittade konfigurationsflaggor fรถr \"sendmail\"\n" +"git-send-email konfigureras med \"sendemail.*\"-flaggor - lรคgg mรคrke till \"e" +"\".\n" +"Sรคtt sendemail.forbidSendmailVariables till false fรถr att inaktivera denna " +"kontroll.\n" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Kan inte kรถra git format-patch frรฅn utanfรถr arkivet\n" -#: git-send-email.perl:484 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -23199,37 +24976,37 @@ msgstr "" "\"batch-size\" och \"relogin\" mรฅste anges tillsammans (via kommandorad " "eller konfigurationsflagga)\n" -#: git-send-email.perl:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Okรคnt fรคlt i --suppress-cc: \"%s\"\n" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Okรคnd instรคllning i --confirm: \"%s\"\n" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "varning: sendmail-alias med citationstecken stรถds inte. %s\n" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "varning: \":include:\" stรถds inte: %s\n" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "varning: omdirigering til \"/fil\" eller \"|rรถr\" stรถds inte: %s\n" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "varning: sendmail-raden kรคnns inte igen: %s\n" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -23244,12 +25021,12 @@ msgstr "" " * Sรคga \"./%s\" om du menar en fil; eller\n" " * Ange flaggan --format-patch om du menar ett intervall.\n" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Misslyckades utfรถra opendir %s: %s" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -23258,7 +25035,7 @@ msgstr "" "รถdesdigert: %s: %s\n" "varning: inga patchar har sรคnts\n" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -23268,17 +25045,17 @@ msgstr "" "Inga patchfiler angavs!\n" "\n" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "Ingen รคrenderad i %s?" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Kunde inte รถppna fรถr skrivning %s: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -23292,38 +25069,38 @@ msgstr "" "\n" "Rensa brevkroppen om du inte vill sรคnda nรฅgon sammanfattning.\n" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "Misslyckades รถppna %s: %s" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Misslyckades รถppna %s.final: %s" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "Sammanfattande brev tomt, hoppar รถver\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "รr du sรคker pรฅ att du vill anvรคnda <%s> [Y=ja, N=nej]? " -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" "Fรถljande filer รคr รฅttabitars, men anger inte en Content-Transfer-Encoding.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " -msgstr "Vilken รฅttabitarsteckenkodning skall jag ange [UTF-8]? " +msgstr "Vilken รฅttabitarsteckenkodning ska jag ange [UTF-8]? " -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -23336,21 +25113,21 @@ msgstr "" "har mallรคrendet \"*** SUBJECT HERE ***\". Anvรคnd --force om du verkligen " "vill sรคnda.\n" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" -msgstr "Till vem skall breven sรคndas (om nรฅgon)?" +msgstr "Till vem ska breven sรคndas (om nรฅgon)?" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "รถdesdigert: aliaset \"%s\" expanderar till sig sjรคlv\n" -#: git-send-email.perl:975 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID att anvรคnda som In-Reply-To fรถr det fรถrsta brevet (om nรฅgot)? " -#: git-send-email.perl:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "fel: kunde inte fรฅ fram en giltig adress frรฅn: %s\n" @@ -23358,16 +25135,16 @@ msgstr "fel: kunde inte fรฅ fram en giltig adress frรฅn: %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 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Vad vill du gรถra med adressen? (q=avsluta, d=kasta, e=redigera): " -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA-sรถkvรคgen \"%s\" finns inte" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -23394,124 +25171,124 @@ msgstr "" #. 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 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Sรคnda brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): " -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "Svar krรคvs pรฅ frรฅgan \"Sรคnda brevet?\"" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "Nรถdvรคndig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stรถder inte SMARTTLS! %s" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Kan inte initiera SMTP korrekt. Kontrollera instรคllningarna och anvรคnd --" "smtp-debug." -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sรคnda %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sรคnde %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "Sรคnde %s\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen sรคger:\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "OK. Loggen sรคger:\n" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "kan inte รถppna filen %s" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Lรคgger till cc: %s frรฅn raden \"%s\"\n" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Lรคgger till to: %s frรฅn raden \"%s\"\n" -#: git-send-email.perl:1718 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(icke-mbox) Lรคgger till cc: %s frรฅn raden \"%s\"\n" -#: git-send-email.perl:1753 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(kropp) Lรคgger till cc: %s frรฅn raden \"%s\"\n" -#: git-send-email.perl:1864 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte kรถra \"%s\"" -#: git-send-email.perl:1871 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Lรคgger till %s: %s frรฅn: \"%s\"\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stรคnga rรถret till \"%s\"" -#: git-send-email.perl:1905 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "kan inte sรคnda brev som sjubitars" -#: git-send-email.perl:1913 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "ogiltig รถverfรถringskondning" -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte รถppna %s: %s\n" -#: git-send-email.perl:1957 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: patchen innehรฅller en rad lรคngre รคn 998 tecken" -#: git-send-email.perl:1974 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -23519,11 +25296,386 @@ msgstr "" "sรคkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1978 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sรคnda %s? [y=ja, n=nej]: " +#~ msgid "unknown hash algorithm length" +#~ msgstr "okรคnd hashningsalgoritmlรคngd" + +#~ msgid "" +#~ "commit-graph chunk lookup table entry missing; file may be incomplete" +#~ msgstr "" +#~ "incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara " +#~ "ofullstรคndig" + +#~ msgid "Writing changed paths Bloom filters index" +#~ msgstr "Skriver Bloom-filterindex fรถr รคndrade sรถkvรคgar" + +#~ msgid "hash version %u does not match" +#~ msgstr "hash-versionen %u stรคmmer inte" + +#~ msgid "Remote with no URL" +#~ msgstr "Fjรคrr utan URL" + +#~ msgid "%%(subject) does not take arguments" +#~ msgstr "%%(subject) tar inte argument" + +#~ msgid "positive value expected objectname:short=%s" +#~ msgstr "positivt vรคrde fรถrvรคntat objectname:short=%s" + +#~ msgid "unrecognized %%(objectname) argument: %s" +#~ msgstr "okรคnt %%(objectname)-argument: %s" + +#~ msgid "option `%s' is incompatible with --merged" +#~ msgstr "flaggan \"%s\" รคr inkompatibel med --merged" + +#~ msgid "option `%s' is incompatible with --no-merged" +#~ msgstr "flaggan \"%s\" รคr inkompatibel med --no-merged" + +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "kunde inte รถppna \"%s\" fรถr skrivning: %s" + +#~ msgid "could not read ref '%s'" +#~ msgstr "Kunde inte lรคsa referensen \"%s\"" + +#~ msgid "ref '%s' already exists" +#~ msgstr "referensen \"%s\" finns redan" + +#~ msgid "unexpected object ID when writing '%s'" +#~ msgstr "ovรคntat objekt-id vid skrivning \"%s\"" + +#~ msgid "unexpected object ID when deleting '%s'" +#~ msgstr "ovรคntat objekt-id vid borttagning \"%s\"" + +#~ msgid "The hash algorithm %s is not supported in this build." +#~ msgstr "Hashningsalgoritmen %s stรถds inte i detta bygge." + +#~ msgid "could not open the file BISECT_TERMS" +#~ msgstr "kunde inte รถppna filen BISECT_TERMS" + +#~ msgid "update BISECT_HEAD instead of checking out the current commit" +#~ msgstr "" +#~ "uppdatera BISECT_HEAD istรคllet fรถr att checka ut aktuell incheckning" + +#~ msgid "print only names (no SHA-1)" +#~ msgstr "skriv endast namn (ingen SHA-1)" + +#~ msgid "passed to 'git am'" +#~ msgstr "sรคnds till \"git am\"" + +#~ msgid "The --cached option cannot be used with the --files option" +#~ msgstr "Flaggan --cached kan inte anvรคndas med flaggan --files" + +#~ msgid " Warn: $display_name doesn't contain commit $sha1_src" +#~ msgstr " Varning: $display_name innehรฅller inte incheckningen $sha1_src" + +#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst" +#~ msgstr " Varning: $display_name innehรฅller inte incheckningen $sha1_dst" + +#~ msgid "" +#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +#~ msgstr "" +#~ " Varning: $display_name innehรฅller inte incheckningarna $sha1_src och " +#~ "$sha1_dst" + +#~ 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" + +#~ msgid "invalid commit object id: %s" +#~ msgstr "ogiltigt inchecknings-objekt-id %s" + +#~ msgid "Removing worktrees/%s: not a valid directory" +#~ msgstr "Tar bort worktrees/%s: inte en giltig katalog" + +#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +#~ msgstr "Tar bort worktrees/%s: kan inte lรคsa gitdir-filen (%s)" + +#~ msgid "Removing worktrees/%s: invalid gitdir file" +#~ msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" + +#~ msgid "unable to re-add worktree '%s'" +#~ msgstr "kunde inte lรคgga in arbetskatalogen \"%s\" igen" + +#~ msgid "target '%s' already exists" +#~ msgstr "mรฅlet \"%s\" finns redan" + +#~ msgid "" +#~ "Cannot update sparse checkout: the following entries are not up to date:\n" +#~ "%s" +#~ msgstr "" +#~ "Kan inte uppdatera gles utcheckning: fรถljande poster รคr inte ร jour:\n" +#~ "%s" + +#~ msgid "" +#~ "The following working tree files would be overwritten by sparse checkout " +#~ "update:\n" +#~ "%s" +#~ msgstr "" +#~ "Fรถljande filer i arbetskatalogen skulle skrivas รถver av uppdatering av " +#~ "gles utcheckning:\n" +#~ "%s" + +#~ msgid "" +#~ "The following working tree files would be removed by sparse checkout " +#~ "update:\n" +#~ "%s" +#~ msgstr "" +#~ "Fรถljande filer i arbetskatalogen skulle tas bort av uppdatering av gles " +#~ "utcheckning:\n" +#~ "%s" + +#~ msgid "annotated tag %s has no embedded name" +#~ msgstr "den annoterade taggen %s har inget inbรคddat namn" + +#~ msgid "automatically stash/stash pop before and after rebase" +#~ msgstr "utfรถr automatiskt stash/stash pop fรถre och efter ombasering" + +#~ msgid "--[no-]autostash option is only valid with --rebase." +#~ msgstr "--[no-]autostash รคr endast giltig med --rebase." + +#~ msgid "(DEPRECATED) keep empty commits" +#~ msgstr "(FรRร LDRAD) behรฅll tomma incheckningar" + +#~ msgid "Could not read '%s'" +#~ msgstr "Kunde inte lรคsa \"%s\"" + +#~ msgid "Cannot store %s" +#~ msgstr "Kan inte spara %s" + +#~ msgid "initialize sparse-checkout" +#~ msgstr "initiera sparse-checkout" + +#~ msgid "set sparse-checkout patterns" +#~ msgstr "stรคll in filter fรถr gles utcheckning" + +#~ msgid "disable sparse-checkout" +#~ msgstr "inaktivera gles utcheckning" + +#~ msgid "could not exec %s" +#~ msgstr "kunde inte kรถra %s" + +#~ msgid "Cannot remove temporary index (can't happen)" +#~ msgstr "Kan inte ta bort temporรคrt index (kan inte intrรคffa)" + +#~ msgid "Cannot update $ref_stash with $w_commit" +#~ msgstr "Kan inte uppdatera $ref_stash med $w_commit" + +#~ msgid "error: unknown option for 'stash push': $option" +#~ msgstr "fel: okรคnd flagga fรถr \"stash push\": $option" + +#~ msgid "Saved working directory and index state $stash_msg" +#~ msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" + +#~ msgid "unknown option: $opt" +#~ msgstr "okรคnd flagga: $opt" + +#~ msgid "Too many revisions specified: $REV" +#~ msgstr "Fรถr mรฅnga revisioner angivna: $REV" + +#~ msgid "$reference is not a valid reference" +#~ msgstr "$reference รคr inte en giltig referens" + +#~ msgid "'$args' is not a stash-like commit" +#~ msgstr "\"$args\" รคr inte en \"stash\"-liknande incheckning" + +#~ msgid "'$args' is not a stash reference" +#~ msgstr "\"$args\" รคr inte en \"stash\"-referens" + +#~ msgid "unable to refresh index" +#~ msgstr "kan inte uppdatera indexet" + +#~ msgid "Cannot apply a stash in the middle of a merge" +#~ msgstr "Kan inte tillรคmpa en \"stash\" mitt i en sammanslagning" + +#~ msgid "Conflicts in index. Try without --index." +#~ msgstr "Konflikter i indexet. Testa utan --index." + +#~ msgid "Could not save index tree" +#~ msgstr "Kunde inte spara indextrรคd" + +#~ msgid "Could not restore untracked files from stash entry" +#~ msgstr "Kunde inte รฅterstรคlla ospรฅrade filer frรฅn stash-post" + +#~ msgid "Cannot unstage modified files" +#~ msgstr "Kan inte ta bort รคndrade filer ur kรถn" + +#~ msgid "Dropped ${REV} ($s)" +#~ msgstr "Kastade ${REV} ($s)" + +#~ msgid "${REV}: Could not drop stash entry" +#~ msgstr "${REV}: Kunde inte kasta \"stash\"-post" + +#~ msgid "(To restore them type \"git stash apply\")" +#~ msgstr "(Fรถr att รฅterstรคlla dem, skriv \"git stash apply\")" + +#~ 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 "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 "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\"" @@ -23561,9 +25713,6 @@ 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" @@ -23585,9 +25734,6 @@ msgstr "Vill du verkligen sรคnda %s? [y=ja, n=nej]: " #~ msgid "unrecognized verb: %s" #~ msgstr "okรคnt verb: %s" -#~ msgid "hash version %X does not match version %X" -#~ msgstr "hash-versionen %X stรคmmer inte med versionen %X" - #~ msgid "option '%s' requires a value" #~ msgstr "flaggan \"%s\" behรถver ett vรคrde" @@ -23750,9 +25896,6 @@ msgstr "Vill du verkligen sรคnda %s? [y=ja, n=nej]: " #~ msgid "make rebase script" #~ msgstr "skapa ombaseringsskript" -#~ msgid "No such remote: %s" -#~ msgstr "Inget sรฅdant fjรคrrarkiv: %s" - #~ msgid "cannot move a locked working tree" #~ msgstr "kan inte flytta en lรฅst arbetskatalog" @@ -23888,11 +26031,6 @@ msgstr "Vill du verkligen sรคnda %s? [y=ja, n=nej]: " #~ msgstr "" #~ "okรคnd instรคllning %s fรถr flaggan rebase.missingCommitsCheck. Ignorerar." -#~ msgid "%" -#~ msgid_plural "%" -#~ msgstr[0] "%" -#~ msgstr[1] "%" - #~ msgid "%s, %" #~ msgid_plural "%s, %" #~ msgstr[0] "%s. %" @@ -24080,18 +26218,12 @@ 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" #~ msgid "Could not format %s." #~ msgstr "Kunde inte formatera %s." -#~ msgid "%s: %s" -#~ msgstr "%s: %s" - #~ msgid "You need to set your committer info first" #~ msgstr "Du mรฅste stรคlla in din incheckarinformation fรถrst" @@ -24405,9 +26537,6 @@ 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" @@ -24441,9 +26570,6 @@ msgstr "Vill du verkligen sรคnda %s? [y=ja, n=nej]: " #~ msgid "false|true|preserve" #~ msgstr "false|true|preserve" -#~ msgid "unsupported sort specification '%s'" -#~ msgstr "sorteringsangivelsen \"%s\" stรถds ej" - #~ msgid "unsupported sort specification '%s' in variable '%s'" #~ msgstr "sorteringsangivelsen \"%s\" i variabeln \"%s\" stรถds ej" @@ -24465,9 +26591,6 @@ 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 new file mode 100644 index 0000000000..54619e9a71 --- /dev/null +++ b/third_party/git/po/tr.po @@ -0,0 +1,25391 @@ +# 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) | iลleme # +# commit (eyl.) | iลlemek # +# commitish | iลlememsi # +# 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 | (iลleme) 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-10-10 09:32+0800\n" +"PO-Revision-Date: 2020-10-06 13: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 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +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 reset.c:89 sequencer.c:3444 +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:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, 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:1738 git-add--interactive.perl:1371 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Yalnฤฑzca ikili dosyalar deฤiลtirildi.\n" + +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "Deฤiลiklik yok.\n" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "Yama gรผncellemesi" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +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:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "*** Komutlar ***" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +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:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: 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:781 git-add--interactive.perl:1805 +#, c-format +msgid "Bye.\n" +msgstr "Gรผle gรผle.\n" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, 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:35 git-add--interactive.perl:1434 +#, 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:36 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "Ekleme hazฤฑrlansฤฑn mฤฑ [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, 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:39 +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:42 +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:56 git-add--interactive.perl:1439 +#, 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:57 git-add--interactive.perl:1440 +#, 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:58 git-add--interactive.perl:1441 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "Ekleme zulalansฤฑn mฤฑ [y,n,q,a,d%s,?]? " + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, 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:61 +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:64 +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:80 git-add--interactive.perl:1445 +#, 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:81 git-add--interactive.perl:1446 +#, 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:82 git-add--interactive.perl:1447 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "Ekleme hazฤฑrlฤฑktan รงฤฑkarฤฑlsฤฑn mฤฑ [y,n,q,a,d%s,?]? " + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, 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:85 +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:88 +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:103 git-add--interactive.perl:1451 +#, 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:104 git-add--interactive.perl:1452 +#, 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:105 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "Ekleme indekse uygulansฤฑn mฤฑ [y,n,q,a,d%s,?]? " + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, 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:108 add-patch.c:176 add-patch.c:221 +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:111 +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:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, 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:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, 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:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "Ekleme รงalฤฑลma aฤacฤฑndan atฤฑlsฤฑn mฤฑ [y,n,q,a,d%s,?]? " + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, 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:131 add-patch.c:154 add-patch.c:199 +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:134 add-patch.c:202 +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:149 add-patch.c:194 git-add--interactive.perl:1463 +#, 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:150 add-patch.c:195 git-add--interactive.perl:1464 +#, 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:151 add-patch.c:196 git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Ekleme indeksten ve รงalฤฑลma aฤacฤฑndan atฤฑlsฤฑn mฤฑ [y,n,q,a,d%s,?]? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, 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:157 +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:171 add-patch.c:216 git-add--interactive.perl:1469 +#, 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:172 add-patch.c:217 git-add--interactive.perl:1470 +#, 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:173 add-patch.c:218 git-add--interactive.perl:1471 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Ekleme indekse ve รงalฤฑลma aฤacฤฑna uygulansฤฑn mฤฑ [y,n,q,a,d%s,?]? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, 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:179 +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:224 +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:342 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "parรงa รผstbilgisi '%.*s' ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: add-patch.c:361 add-patch.c:365 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "renklendirilmiล parรงa รผstbilgisi '%.*s' ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: add-patch.c:419 +msgid "could not parse diff" +msgstr "diff ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: add-patch.c:438 +msgid "could not parse colored diff" +msgstr "renklendirilmiล diff ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: add-patch.c:452 +#, c-format +msgid "failed to run '%s'" +msgstr "'%s' รงalฤฑลtฤฑrฤฑlamadฤฑ" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "interactive.diffFilter รถgesinden eลleลmeyen รงฤฑktฤฑ" + +#: add-patch.c:612 +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:785 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"ลurada baฤlam satฤฑrฤฑ #%d bekleniyordu:\n" +"%.*s" + +#: add-patch.c:800 +#, 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:1076 git-add--interactive.perl:1117 +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:1080 +#, 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:1094 git-add--interactive.perl:1131 +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:1127 +msgid "could not parse hunk header" +msgstr "parรงa รผstbilgisi ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: add-patch.c:1172 +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:1241 git-add--interactive.perl:1244 +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)\" " +"ฤฑskartaya รงฤฑkarฤฑr!) [y/n]? " + +#: add-patch.c:1284 +msgid "The selected hunks do not apply to the index!" +msgstr "Seรงili parรงalar indekse uygulanamฤฑyor!" + +#: add-patch.c:1285 git-add--interactive.perl:1348 +msgid "Apply them to the worktree anyway? " +msgstr "รalฤฑลma aฤacฤฑna yine de uygulansฤฑn mฤฑ? " + +#: add-patch.c:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "Hiรงbir ลey uygulanmadฤฑ.\n" + +#: add-patch.c:1349 +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:1511 add-patch.c:1521 +msgid "No previous hunk" +msgstr "รncesinde parรงa yok" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No next hunk" +msgstr "Sonrasฤฑnda parรงa yok" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "Gidilecek baลka bir parรงa yok" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "hangi parรงaya gidilsin (daha fazla gรถrmek iรงin <ret>)? " + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "hangi parรงaya gidilsin? " + +#: add-patch.c:1555 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Geรงersiz sayฤฑ: '%s'" + +#: add-patch.c:1560 +#, 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:1569 +msgid "No other hunks to search" +msgstr "Aranacak baลka parรงa yok" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "dรผzenli ifade aransฤฑn mฤฑ? " + +#: add-patch.c:1590 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Hatalฤฑ oluลturulmuล dรผzenli ifade %s: %s" + +#: add-patch.c:1607 +msgid "No hunk matches the given pattern" +msgstr "Verilen dizgi ile eลleลen bir parรงa yok" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "รzgรผnรผm, bu parรงa bรถlรผnemiyor" + +#: add-patch.c:1618 +#, c-format +msgid "Split into %d hunks." +msgstr "%d parรงaya bรถlรผndรผ." + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "รzgรผnรผm, bu parรงa dรผzenlenemiyor" + +#: add-patch.c:1674 +msgid "'git apply' failed" +msgstr "'git apply' baลarฤฑsฤฑz oldu" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" +"\n" +"Bu iletiyi \"git config advice.%s false\" ile devre dฤฑลฤฑ bฤฑrakฤฑn" + +#: advice.c:156 +#, c-format +msgid "%shint: %.*s%s\n" +msgstr "%sipucu: %.*s%s\n" + +#: advice.c:247 +msgid "Cherry-picking is not possible because you have unmerged files." +msgstr "Seรง-al yapฤฑlamaz; birleลtirmesi tamamlanmamฤฑล dosyalarฤฑnฤฑz var." + +#: advice.c:249 +msgid "Committing is not possible because you have unmerged files." +msgstr "ฤฐลleme yapฤฑlamaz; birleลtirmesi tamamlanmamฤฑล dosyalarฤฑnฤฑz var." + +#: advice.c:251 +msgid "Merging is not possible because you have unmerged files." +msgstr "Birleลtirme yapฤฑlamaz; birleลtirmesi tamamlanmamฤฑล dosyalarฤฑnฤฑz var." + +#: advice.c:253 +msgid "Pulling is not possible because you have unmerged files." +msgstr "รekme yapฤฑlamaz; birleลtirmesi tamamlanmamฤฑล dosyalarฤฑnฤฑz var." + +#: advice.c:255 +msgid "Reverting is not possible because you have unmerged files." +msgstr "Geriye al yapฤฑlamaz; birleลtirmesi tamamlanmamฤฑล dosyalarฤฑnฤฑz var." + +#: advice.c:257 +#, c-format +msgid "It is not possible to %s because you have unmerged files." +msgstr "%s yapฤฑlamฤฑyor; birleลtirmesi tamamlanmamฤฑล dosyalarฤฑnฤฑz var." + +#: advice.c:265 +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 iลleyin." + +#: advice.c:273 +msgid "Exiting because of an unresolved conflict." +msgstr "รรถzรผme kavuลturulmamฤฑล bir รงakฤฑลmadan dolayฤฑ รงฤฑkฤฑlฤฑyor." + +#: advice.c:278 builtin/merge.c:1349 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Birleลtirmenizi sonuรงlandฤฑrmadฤฑnฤฑz (MERGE_HEAD mevcut)." + +#: advice.c:280 +msgid "Please, commit your changes before merging." +msgstr "Birleลtirme รถncesinde deฤiลikliklerinizi iลleyin." + +#: advice.c:281 +msgid "Exiting because of unfinished merge." +msgstr "Tamamlanmamฤฑล birleลtirmeden dolayฤฑ รงฤฑkฤฑlฤฑyor." + +#: advice.c:287 +#, 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 iลlemeleri baลka hiรงbir dala etki etmeden geri alabilirsiniz.\n" +"\n" +"Yaptฤฑฤฤฑnฤฑz iลlemeleri korumak 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 dosyanฤฑn eski iรงeriฤe baฤฤฑmlฤฑlฤฑฤฤฑ var" + +#: 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ฤฑnฤฑn eski iรงeriฤe baฤฤฑmlฤฑlฤฑฤฤฑ var" + +#: 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:72 setup.c:308 +#, 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 apply.c:3953 +#, 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:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 +#, c-format +msgid "invalid path '%s'" +msgstr "geรงersiz yol '%s'" + +#: apply.c:3950 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: indekste halihazฤฑrda var" + +#: apply.c:3956 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: รงalฤฑลma dizininde halihazฤฑrda var" + +#: apply.c:3976 +#, 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:3981 +#, 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:4001 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "etkilenen dosya '%s' bir sembolik baฤฤฑn รถtesinde" + +#: apply.c:4005 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: yama uygulanamฤฑyor" + +#: apply.c:4020 +#, c-format +msgid "Checking patch %s..." +msgstr "%s yamasฤฑ denetleniyor..." + +#: apply.c:4112 +#, 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:4119 +#, 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:4122 +#, c-format +msgid "sha1 information is lacking or useless (%s)." +msgstr "sha1 bilgisi eksik veya yararsฤฑz (%s)." + +#: apply.c:4131 +#, c-format +msgid "could not add %s to temporary index" +msgstr "%s geรงici indekse eklenemedi" + +#: apply.c:4141 +#, c-format +msgid "could not write temporary index to %s" +msgstr "geรงici indeks ลuraya yazฤฑlamadฤฑ: %s" + +#: apply.c:4279 +#, c-format +msgid "unable to remove %s from index" +msgstr "%s indeksten kaldฤฑrฤฑlamฤฑyor" + +#: apply.c:4313 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "%s altmodรผlรผ iรงin hasarlฤฑ yama" + +#: apply.c:4319 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "yeni oluลturulan '%s' dosyasฤฑnฤฑn bilgileri alฤฑnamฤฑyor" + +#: apply.c:4327 +#, 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:4333 apply.c:4478 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "%s iรงin รถnbellek girdisi eklenemiyor" + +#: apply.c:4376 builtin/bisect--helper.c:537 +#, c-format +msgid "failed to write to '%s'" +msgstr "ลuraya yazฤฑlamadฤฑ: '%s'" + +#: apply.c:4380 +#, c-format +msgid "closing file '%s'" +msgstr "'%s' dosyasฤฑ kapatฤฑlฤฑyor" + +#: apply.c:4450 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "'%s' dosyasฤฑ yazฤฑlamฤฑyor, %o kipi" + +#: apply.c:4548 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "%s yamasฤฑ sorunsuzca uygulandฤฑ." + +#: apply.c:4556 +msgid "internal error" +msgstr "iรง hata" + +#: apply.c:4559 +#, 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:4570 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr ".rej dosya adฤฑ %.*s.rej olarak kฤฑsaltฤฑlฤฑyor" + +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 +#, c-format +msgid "cannot open %s" +msgstr "%s aรงฤฑlamฤฑyor" + +#: apply.c:4592 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Parรงa #%d sorunsuzca uygulandฤฑ." + +#: apply.c:4596 +#, c-format +msgid "Rejected hunk #%d." +msgstr "Parรงa %d geri รงevrildi." + +#: apply.c:4715 +#, c-format +msgid "Skipped patch '%s'." +msgstr "'%s' yamasฤฑ atlandฤฑ." + +#: apply.c:4723 +msgid "unrecognized input" +msgstr "tanฤฑmlanamayan girdi" + +#: apply.c:4743 +msgid "unable to read index file" +msgstr "indeks dosyasฤฑ okunamฤฑyor" + +#: apply.c:4900 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "'%s' yamasฤฑ aรงฤฑlamฤฑyor: %s" + +#: apply.c:4927 +#, 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:4933 apply.c:4948 +#, 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:4941 +#, 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:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +msgid "Unable to write new index file" +msgstr "Yeni indeks dosyasฤฑ yazฤฑlamฤฑyor" + +#: apply.c:4985 +msgid "don't apply changes matching the given path" +msgstr "verilen yol ile eลleลen deฤiลiklikleri uygulama" + +#: apply.c:4988 +msgid "apply changes matching the given path" +msgstr "verilen yol ile eลleลen deฤiลiklikleri uygula" + +#: apply.c:4990 builtin/am.c:2279 +msgid "num" +msgstr "sayฤฑ" + +#: apply.c:4991 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "geleneksel diff yollarฤฑndan <sayฤฑ> รถncรผ eฤik รงizgiyi kaldฤฑr" + +#: apply.c:4994 +msgid "ignore additions made by the patch" +msgstr "yamanฤฑn yaptฤฑฤฤฑ eklemeleri yok say" + +#: apply.c:4996 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "yamayฤฑ uygulama yerine girdi iรงin diffstat รงฤฑktฤฑsฤฑ ver" + +#: apply.c:5000 +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:5002 +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:5004 +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:5006 +msgid "make sure the patch is applicable to the current index" +msgstr "yamanฤฑn geรงerli indekse uygulanabilir olduฤundan emin ol" + +#: apply.c:5008 +msgid "mark new files with `git add --intent-to-add`" +msgstr "yeni dosyalarฤฑ `git add --intent-to-add` ile imle" + +#: apply.c:5010 +msgid "apply a patch without touching the working tree" +msgstr "รงalฤฑลma aฤacฤฑna dokunmadan bir yama uygula" + +#: apply.c:5012 +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:5015 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "ek olarak yamayฤฑ da uygula (--stat/--summary/--check ile kullan)" + +#: apply.c:5017 +msgid "attempt three-way merge if a patch does not apply" +msgstr "bir yama uygulanamฤฑyorsa 3 yรถnlรผ birleลtirme dene" + +#: apply.c:5019 +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:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 +msgid "paths are separated with NUL character" +msgstr "yollar NUL karakteri ile ayrฤฑlฤฑr" + +#: apply.c:5024 +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:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 +msgid "action" +msgstr "eylem" + +#: apply.c:5026 +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:5029 apply.c:5032 +msgid "ignore changes in whitespace when finding context" +msgstr "baฤlam bulurken boลluk deฤiลikliklerini yok say" + +#: apply.c:5035 +msgid "apply the patch in reverse" +msgstr "yamayฤฑ tersten uygula" + +#: apply.c:5037 +msgid "don't expect at least one line of context" +msgstr "en az bir satฤฑr baฤlam bekleme" + +#: apply.c:5039 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "reddedilmiล parรงalarฤฑ ilgili *.rej dosyalarฤฑnda bฤฑrak" + +#: apply.c:5041 +msgid "allow overlapping hunks" +msgstr "รผst รผste binen parรงalara izin ver" + +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 +msgid "be verbose" +msgstr "ayrฤฑntฤฑ ver" + +#: apply.c:5044 +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:5047 +msgid "do not trust the line counts in the hunk headers" +msgstr "parรงa รผstbilgisindeki satฤฑr sayฤฑmฤฑna gรผvenme" + +#: apply.c:5049 builtin/am.c:2267 +msgid "root" +msgstr "kรถk" + +#: apply.c:5050 +msgid "prepend <root> to all filenames" +msgstr "tรผm dosya adlarฤฑnฤฑn baลฤฑna <kรถk> ekle" + +#: archive-tar.c:125 archive-zip.c:345 +#, c-format +msgid "cannot stream blob %s" +msgstr "%s ikili nesnesi akฤฑtฤฑlamฤฑyor" + +#: archive-tar.c:265 archive-zip.c:358 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "desteklenmeyen dosya kipi: 0%o (SHA1: %s)" + +#: archive-tar.c:449 +#, c-format +msgid "unable to start '%s' filter" +msgstr "'%s' sรผzgeci baลlatฤฑlamฤฑyor" + +#: archive-tar.c:452 +msgid "unable to redirect descriptor" +msgstr "aรงฤฑklayฤฑcฤฑ yeniden yรถnlendirilemiyor" + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "'%s' sรผzgeci hata bildirdi" + +#: archive-zip.c:318 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "yol geรงerli UTF-8 deฤil: %s" + +#: archive-zip.c:322 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "yol รงok uzun (%d karakter, SHA1: %s): %s" + +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "sรถndรผrme hatasฤฑ (%d)" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "zaman damgasฤฑ bu sistem iรงin รงok bรผyรผk: %<PRIuMAX>" + +#: 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:192 +#, c-format +msgid "cannot read %s" +msgstr "%s okunamฤฑyor" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "'%s' okunamadฤฑ" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 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:454 +#, c-format +msgid "no such ref: %.*s" +msgstr "bรถyle bir baลvuru yok: %.*s" + +#: archive.c:460 +#, c-format +msgid "not a valid object name: %s" +msgstr "geรงerli bir nesne adฤฑ deฤil: %s" + +#: archive.c:473 +#, c-format +msgid "not a tree object: %s" +msgstr "bir aฤaรง nesnesi deฤil: %s" + +#: archive.c:485 +msgid "current working directory is untracked" +msgstr "geรงerli รงalฤฑลma dizini izlenmiyor" + +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "Dosya bulunamadฤฑ: %s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "Normal bir dosya deฤil: %s" + +#: archive.c:553 +msgid "fmt" +msgstr "biรงim" + +#: archive.c:553 +msgid "archive format" +msgstr "arลiv biรงimi" + +#: archive.c:554 builtin/log.c:1760 +msgid "prefix" +msgstr "รถnek" + +#: archive.c:555 +msgid "prepend prefix to each pathname in the archive" +msgstr "รถneki arลivdeki tรผm yol adlarฤฑnฤฑn baลฤฑna ekle" + +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 +msgid "file" +msgstr "dosya" + +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "izlenmeyen dosyalarฤฑ arลive ekle" + +#: archive.c:560 builtin/archive.c:90 +msgid "write the archive to this file" +msgstr "arลivi bu dosyaya yaz" + +#: archive.c:562 +msgid "read .gitattributes in working directory" +msgstr "รงalฤฑลma dizinindeki .gitattributes'u oku" + +#: archive.c:563 +msgid "report archived files on stderr" +msgstr "arลivlenmiล dosyalarฤฑ stderr'de raporla" + +#: archive.c:564 +msgid "store only" +msgstr "yalnฤฑzca depola" + +#: archive.c:565 +msgid "compress faster" +msgstr "daha hฤฑzlฤฑ sฤฑkฤฑลtฤฑr" + +#: archive.c:573 +msgid "compress better" +msgstr "daha iyi sฤฑkฤฑลtฤฑr" + +#: archive.c:576 +msgid "list supported archive formats" +msgstr "desteklenen arลiv biรงimlerini listele" + +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +msgid "repo" +msgstr "depo" + +#: archive.c:579 builtin/archive.c:92 +msgid "retrieve the archive from remote repository <repo>" +msgstr "arลivi uzak konum deposu <depo>'dan al" + +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 +#: builtin/notes.c:498 +msgid "command" +msgstr "komut" + +#: archive.c:581 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:588 +msgid "Unexpected option --remote" +msgstr "Beklenmedik seรงenek --remote" + +#: archive.c:590 +msgid "Option --exec can only be used together with --remote" +msgstr "--exec seรงeneฤi yalnฤฑzca --remote ile birlikte kullanฤฑlabilir" + +#: archive.c:592 +msgid "Unexpected option --output" +msgstr "Beklenmedik seรงenek --output" + +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" +msgstr "--add-file ve --remote seรงenekleri birlikte kullanฤฑlamaz" + +#: archive.c:616 +#, c-format +msgid "Unknown archive format '%s'" +msgstr "Bilinmeyen arลiv biรงimi '%s'" + +#: archive.c:623 +#, c-format +msgid "Argument not supported for format '%s': -%d" +msgstr "'%s' biรงimi iรงin desteklenmeyen deฤiลken: -%d" + +#: 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:476 +#, 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:686 +#, c-format +msgid "We cannot bisect more!\n" +msgstr "Daha fazla ikili arama yapฤฑlamฤฑyor!\n" + +#: bisect.c:753 +#, c-format +msgid "Not a valid commit name %s" +msgstr "Geรงerli bir iลleme adฤฑ deฤil: %s" + +#: bisect.c:778 +#, 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:783 +#, 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:788 +#, 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' iลlemesi %s ve [%s] arasฤฑnda.\n" + +#: bisect.c:796 +#, 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:809 +#, 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 iลlemesinin %s ve [%s] arasฤฑnda olduฤundan emin olamฤฑyoruz.\n" +"Yine de sรผrdรผreceฤiz." + +#: bisect.c:848 +#, c-format +msgid "Bisecting: a merge base must be tested\n" +msgstr "ฤฐkili arama: Birleลtirme temelleri sฤฑnanmalฤฑ\n" + +#: bisect.c:898 +#, c-format +msgid "a %s revision is needed" +msgstr "bir %s revizyonu gerekiyor" + +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 +#, c-format +msgid "could not create file '%s'" +msgstr "'%s' dosyasฤฑ oluลturulamadฤฑ" + +#: bisect.c:974 builtin/merge.c:150 +#, c-format +msgid "could not read file '%s'" +msgstr "'%s' dosyasฤฑ okunamadฤฑ" + +#: bisect.c:1014 +msgid "reading bisect refs failed" +msgstr "ikili arama baลvurularฤฑnฤฑ okuma baลarฤฑsฤฑz oldu" + +#: bisect.c:1044 +#, c-format +msgid "%s was both %s and %s\n" +msgstr "%s hem %s hem %s idi\n" + +#: bisect.c:1053 +#, c-format +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path parameters?\n" +msgstr "" +"Sฤฑnanabilir bir iลleme bulunamadฤฑ.\n" +"Hatalฤฑ yol parametreleri ile mi baลladฤฑnฤฑz?\n" + +#: bisect.c:1082 +#, 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:1088 +#, 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:2778 +msgid "--contents and --reverse do not blend well." +msgstr "--contents ve --reverse birlikte pek iyi gitmiyor." + +#: blame.c:2792 +msgid "cannot use --contents with final commit object name" +msgstr "--contents son iลleme nesnesi adฤฑ ile kullanฤฑlamฤฑyor" + +#: blame.c:2813 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" +"--reverse ve --first-parent birlikte en son iลlemenin belirtilmesini " +"gerektiriyor" + +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 +msgid "revision walk setup failed" +msgstr "revizyonda gezinme ayarlamasฤฑ baลarฤฑsฤฑz oldu" + +#: blame.c:2840 +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:2851 +#, c-format +msgid "no such path %s in %s" +msgstr "ลurada %s yolu bulunamadฤฑ: %s" + +#: blame.c:2862 +#, 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:365 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "'%s' รงฤฑkฤฑลฤฑ '%s' konumunda halihazฤฑrda yapฤฑlmฤฑล" + +#: branch.c:388 +#, 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:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "bilinmeyen demet saฤlama algoritmasฤฑ: %s" + +#: bundle.c:45 +#, c-format +msgid "unknown capability '%s'" +msgstr "bilinmeyen yetenek '%s'" + +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' bir v2 veya v3 demet dosyasฤฑ gibi gรถrรผnmรผyor" + +#: bundle.c:110 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "tanฤฑmlanamayan รผstbilgi: %s%s (%d)" + +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 +#, c-format +msgid "could not open '%s'" +msgstr "'%s' aรงฤฑlamadฤฑ" + +#: bundle.c:189 +msgid "Repository lacks these prerequisite commits:" +msgstr "Depo aลaฤฤฑdaki รถnkoลul iลlemelere iye deฤil:" + +#: bundle.c:192 +msgid "need a repository to verify a bundle" +msgstr "bir demeti doฤrulamak iรงin bir depo gerekiyor" + +#: bundle.c:243 +#, 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:250 +msgid "The bundle records a complete history." +msgstr "Demet tam bir geรงmiล kaydฤฑnฤฑ yazar." + +#: bundle.c:252 +#, c-format +msgid "The bundle requires this ref:" +msgid_plural "The bundle requires these %d refs:" +msgstr[0] "Demet ลu iลlemeyi gerektiriyor:" +msgstr[1] "Demet ลu %d iลlemeyi gerektiriyor:" + +#: bundle.c:319 +msgid "unable to dup bundle descriptor" +msgstr "demet aรงฤฑklayฤฑcฤฑsฤฑ รงoฤaltฤฑlamฤฑyor" + +#: bundle.c:326 +msgid "Could not spawn pack-objects" +msgstr "pack-objects ortaya รงฤฑkarฤฑlamadฤฑ" + +#: bundle.c:337 +msgid "pack-objects died" +msgstr "pack-objects sonlandฤฑ" + +#: bundle.c:379 +msgid "rev-list died" +msgstr "rev-list sonlandฤฑ" + +#: bundle.c:428 +#, 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:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "desteklenmeyen demet sรผrรผmรผ %d" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "demet sรผrรผmรผ %d, %s algoritmasฤฑ ile yazฤฑlamฤฑyor" + +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 +#, c-format +msgid "unrecognized argument: %s" +msgstr "tanฤฑmlanamayan deฤiลken: %s" + +#: bundle.c:530 +msgid "Refusing to create empty bundle." +msgstr "Boล demet oluลturma reddediliyor." + +#: bundle.c:540 +#, c-format +msgid "cannot create '%s'" +msgstr "'%s' oluลturulamฤฑyor" + +#: bundle.c:565 +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-graph.c:188 midx.c:46 +msgid "invalid hash version" +msgstr "geรงersiz saฤlama sรผrรผmรผ" + +#: commit-graph.c:246 +msgid "commit-graph file is too small" +msgstr "commit-graph dosyasฤฑ pek kรผรงรผk" + +#: commit-graph.c:311 +#, 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:318 +#, 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:325 +#, 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:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "commit-graph dosyasฤฑ %u iri parรงa tutmak iรงin pek kรผรงรผk" + +#: commit-graph.c:361 +#, c-format +msgid "commit-graph improper chunk offset %08x%08x" +msgstr "commit-graph biรงimsiz iri parรงa ofseti %08x%08x" + +#: commit-graph.c:433 +#, 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:499 +msgid "commit-graph has no base graphs chunk" +msgstr "commit-graph temel grafiฤi iri parรงasฤฑna iye deฤil" + +#: commit-graph.c:509 +msgid "commit-graph chain does not match" +msgstr "commit-graph zinciri eลleลmiyor" + +#: commit-graph.c:557 +#, 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:581 +msgid "unable to find all commit-graph files" +msgstr "tรผm commit-graph dosyalarฤฑ bulunamฤฑyor" + +#: commit-graph.c:721 commit-graph.c:785 +msgid "invalid commit position. commit-graph is likely corrupt" +msgstr "geรงersiz iลleme konumu. commit-graph bรผyรผk olasฤฑlฤฑkla hasar gรถrmรผล." + +#: commit-graph.c:742 +#, c-format +msgid "could not find commit %s" +msgstr "%s iลlemesi bulunamadฤฑ" + +#: commit-graph.c:1042 builtin/am.c:1306 +#, c-format +msgid "unable to parse commit %s" +msgstr "%s iลlemesi ayrฤฑลtฤฑrฤฑlamฤฑyor" + +#: commit-graph.c:1265 builtin/pack-objects.c:2864 +#, c-format +msgid "unable to get type of object %s" +msgstr "%s nesnesinin tรผrรผ alฤฑnamฤฑyor" + +#: commit-graph.c:1301 +msgid "Loading known commits in commit graph" +msgstr "ฤฐลleme grafiฤindeki bilinen iลlemeler yรผkleniyor" + +#: commit-graph.c:1318 +msgid "Expanding reachable commits in commit graph" +msgstr "ฤฐลleme grafiฤindeki ulaลฤฑlabilir iลlemeler geniลletiliyor" + +#: commit-graph.c:1338 +msgid "Clearing commit marks in commit graph" +msgstr "ฤฐลleme grafiฤindeki iลleme imleri temizleniyor" + +#: commit-graph.c:1357 +msgid "Computing commit graph generation numbers" +msgstr "ฤฐลleme grafiฤi kuลak sayฤฑlarฤฑ hesaplanฤฑyor" + +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "" +"Geรงerli iลlemelerdeki deฤiลtirilmiล yollar iรงin Bloom sรผzgeci hesaplanฤฑyor" + +#: commit-graph.c:1501 +msgid "Collecting referenced commits" +msgstr "Baลvurulmuล iลlemeler toplanฤฑyor" + +#: commit-graph.c:1526 +#, c-format +msgid "Finding commits for commit graph in %d pack" +msgid_plural "Finding commits for commit graph in %d packs" +msgstr[0] "%d pakette iลleme grafiฤi iรงin iลlemeler bulunuyor" +msgstr[1] "%d pakette iลleme grafiฤi iรงin iลlemeler bulunuyor" + +#: commit-graph.c:1539 +#, c-format +msgid "error adding pack %s" +msgstr "%s paketi eklenirken hata" + +#: commit-graph.c:1543 +#, c-format +msgid "error opening index for %s" +msgstr "%s iรงin indeks aรงฤฑlฤฑrken hata" + +#: commit-graph.c:1582 +msgid "Finding commits for commit graph among packed objects" +msgstr "Paketlenmiล nesneler arasฤฑndan iลleme grafiฤi iรงin iลlemeler bulunuyor" + +#: commit-graph.c:1597 +msgid "Counting distinct commits in commit graph" +msgstr "ฤฐลleme grafiฤindeki belirgin iลlemeler sayฤฑlฤฑyor" + +#: commit-graph.c:1629 +msgid "Finding extra edges in commit graph" +msgstr "ฤฐลleme grafiฤindeki ek sฤฑnฤฑrlar bulunuyor" + +#: commit-graph.c:1678 +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:1720 midx.c:826 +#, c-format +msgid "unable to create leading directories of %s" +msgstr "%s รถncรผ dizinleri oluลturulamฤฑyor" + +#: commit-graph.c:1733 +msgid "unable to create temporary graph layer" +msgstr "geรงici grafik katmanฤฑ oluลturulamฤฑyor" + +#: commit-graph.c:1738 +#, c-format +msgid "unable to adjust shared permissions for '%s'" +msgstr "'%s' iรงin paylaลฤฑlan izinler ayarlanamฤฑyor" + +#: commit-graph.c:1808 +#, c-format +msgid "Writing out commit graph in %d pass" +msgid_plural "Writing out commit graph in %d passes" +msgstr[0] "ฤฐลleme grafiฤi %d geรงiลte yazฤฑlฤฑyor" +msgstr[1] "ฤฐลleme grafiฤi %d geรงiลte yazฤฑlฤฑyor" + +#: commit-graph.c:1853 +msgid "unable to open commit-graph chain file" +msgstr "commit-graph zincir dosyasฤฑ aรงฤฑlamฤฑyor" + +#: commit-graph.c:1869 +msgid "failed to rename base commit-graph file" +msgstr "temel commit-graph dosyasฤฑ yeniden adlandฤฑrฤฑlamadฤฑ" + +#: commit-graph.c:1889 +msgid "failed to rename temporary commit-graph file" +msgstr "geรงici commit-graph dosyasฤฑ yeniden adlandฤฑrฤฑlamadฤฑ" + +#: commit-graph.c:2015 +msgid "Scanning merged commits" +msgstr "Birleลtirilen iลlemeler taranฤฑyor" + +#: commit-graph.c:2026 +#, c-format +msgid "unexpected duplicate commit id %s" +msgstr "beklenmedik yinelenmiล iลleme numarasฤฑ %s" + +#: commit-graph.c:2049 +msgid "Merging commit-graph" +msgstr "commit-graph birleลtiriliyor" + +#: commit-graph.c:2259 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "iลleme grafiฤi biรงimi %d iลlemeyi yazamฤฑyor" + +#: commit-graph.c:2270 +msgid "too many commits to write graph" +msgstr "grafik yazฤฑmฤฑ iรงin รงok fazla iลleme" + +#: commit-graph.c:2363 +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:2373 +#, 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:2383 commit-graph.c:2398 +#, 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:2390 +#, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "%s iลlemesi commit-graph'tan ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: commit-graph.c:2408 +msgid "Verifying commits in commit graph" +msgstr "ฤฐลleme grafiฤindeki iลlemeler doฤrulanฤฑyor" + +#: commit-graph.c:2423 +#, c-format +msgid "failed to parse commit %s from object database for commit-graph" +msgstr "" +"%s iลlemesi commit-graph iรงin olan nesne veritabanฤฑndan ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: commit-graph.c:2430 +#, c-format +msgid "root tree OID for commit %s in commit-graph is %s != %s" +msgstr "" +"commit-graph'teki %s iลlemesi iรงin olan kรถk aฤaรง nesne tanฤฑmlayฤฑcฤฑsฤฑ %s != %s" + +#: commit-graph.c:2440 +#, c-format +msgid "commit-graph parent list for commit %s is too long" +msgstr "%s iลlemesi iรงin olan commit-graph รผst รถge listesi รงok uzun" + +#: commit-graph.c:2449 +#, 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:2463 +#, c-format +msgid "commit-graph parent list for commit %s terminates early" +msgstr "%s iลlemesi iรงin olan commit-graph รผst รถge listesi erkenden sonlanฤฑyor" + +#: commit-graph.c:2468 +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "" +"%s iลlemesi iรงin commit-graph kuลak sayฤฑsฤฑ sฤฑfฤฑr; ancak baลka yerlerde " +"sฤฑfฤฑrdan farklฤฑ" + +#: commit-graph.c:2472 +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "" +"%s iลlemesi iรงin commit-graph kuลak sayฤฑsฤฑ sฤฑfฤฑrdan farklฤฑ; ancak baลka " +"yerlerde sฤฑfฤฑr" + +#: commit-graph.c:2488 +#, c-format +msgid "commit-graph generation for commit %s is %u != %u" +msgstr "%s iลlemesi iรงin commit-graph kuลaฤฤฑ %u != %u" + +#: commit-graph.c:2494 +#, c-format +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "" +"%s iลlemesi iรงin commit-graph iรงindeki iลleme tarihi %<PRIuMAX> != %<PRIuMAX>" + +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "%s ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s bir iลleme deฤil!" + +#: commit.c:194 +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ฤฑlmamalฤฑ\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:1172 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" +"%s iลlemesinin gรผvenilmeyen bir GPG imzasฤฑ var, iddiaya gรถre %s tarafฤฑndan." + +#: commit.c:1176 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "%s iลlemesinin hatalฤฑ bir GPG imzasฤฑ var, iddiaya gรถre %s tarafฤฑndan." + +#: commit.c:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "%s iลlemesinin bir GPG imzasฤฑ yok." + +#: commit.c:1182 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "%s iลlemesinin %s tarafฤฑndan saฤlanan dรผzgรผn bir GPG imzasฤฑ var\n" + +#: commit.c:1436 +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ฤฑ: ฤฐลleme iletisi UTF-8'e uymuyor.\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" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "bellek tรผkendi" + +#: config.c:125 +#, 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 "" +"aลaฤฤฑdaki iรงerilirken olabilecek en รงok iรงerme derinliฤi (%d) aลฤฑldฤฑ:\n" +"\t%s\n" +"iรงerme konumu:\n" +"\t%s\n" +"Bu dairesel iรงermelerden dolayฤฑ olabilir." + +#: config.c:141 +#, c-format +msgid "could not expand include path '%s'" +msgstr "iรงerme yolu '%s' geniลletilemedi" + +#: config.c:152 +msgid "relative config includes must come from files" +msgstr "gรถreceli yapฤฑlandฤฑrma iรงermeleri dosyalardan gelmeli" + +#: config.c:198 +msgid "relative config include conditionals must come from files" +msgstr "gรถreceli yapฤฑlandฤฑrma iรงerme koลullularฤฑ dosyalardan gelmeli" + +#: config.c:378 +#, c-format +msgid "key does not contain a section: %s" +msgstr "anahtar, bir bรถlรผm iรงermiyor: %s" + +#: config.c:384 +#, c-format +msgid "key does not contain variable name: %s" +msgstr "anahtar, bir deฤiลken adฤฑ iรงermiyor: %s" + +#: config.c:408 sequencer.c:2547 +#, c-format +msgid "invalid key: %s" +msgstr "geรงersiz anahtar: %s" + +#: config.c:414 +#, c-format +msgid "invalid key (newline): %s" +msgstr "geรงersiz anahtar (yenisatฤฑr): %s" + +#: config.c:450 config.c:462 +#, c-format +msgid "bogus config parameter: %s" +msgstr "dรผzmece yapฤฑlandฤฑrma parametresi: %s" + +#: config.c:497 +#, c-format +msgid "bogus format in %s" +msgstr "%s iรงinde dรผzmece biรงim" + +#: config.c:836 +#, 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:840 +#, c-format +msgid "bad config line %d in file %s" +msgstr "hatalฤฑ yapฤฑlandฤฑrma satฤฑrฤฑ %d, %s dosyasฤฑ iรงinde" + +#: config.c:844 +#, c-format +msgid "bad config line %d in standard input" +msgstr "standart girdi iรงinde hatalฤฑ yapฤฑlandฤฑrma satฤฑrฤฑ %d" + +#: config.c:848 +#, 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:852 +#, 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:856 +#, c-format +msgid "bad config line %d in %s" +msgstr "hatalฤฑ yapฤฑlandฤฑrma satฤฑrฤฑ %d, %s iรงinde" + +#: config.c:993 +msgid "out of range" +msgstr "erim dฤฑลฤฑ" + +#: config.c:993 +msgid "invalid unit" +msgstr "geรงersiz birim" + +#: config.c:994 +#, 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:1013 +#, 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:1016 +#, 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:1019 +#, 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:1022 +#, 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:1025 +#, 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:1028 +#, 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:1123 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "ลuradaki kullanฤฑcฤฑ dizini geniลletilemedi: '%s'" + +#: config.c:1132 +#, 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:1223 +#, c-format +msgid "abbrev length out of range: %d" +msgstr "kฤฑsaltma uzunluฤu erim dฤฑลฤฑnda: %d" + +#: config.c:1237 config.c:1248 +#, c-format +msgid "bad zlib compression level %d" +msgstr "hatalฤฑ zlib sฤฑkฤฑลtฤฑrma dรผzeyi %d" + +#: config.c:1340 +msgid "core.commentChar should only be one character" +msgstr "core.commentChar yalnฤฑzca bir karakter olmalฤฑ" + +#: config.c:1373 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "nesne oluลturma iรงin geรงersiz kip: %s" + +#: config.c:1445 +#, c-format +msgid "malformed value for %s" +msgstr "%s iรงin hatalฤฑ oluลturulmuล deฤer" + +#: config.c:1471 +#, c-format +msgid "malformed value for %s: %s" +msgstr "%s iรงin hatalฤฑ oluลturulmuล deฤer: %s" + +#: config.c:1472 +msgid "must be one of nothing, matching, simple, upstream or current" +msgstr "nothing, matching, simple, upstream veya current iรงinden biri olmalฤฑ" + +#: config.c:1533 builtin/pack-objects.c:3649 +#, c-format +msgid "bad pack compression level %d" +msgstr "hatalฤฑ paket sฤฑkฤฑลtฤฑrma dรผzeyi %d" + +#: config.c:1655 +#, c-format +msgid "unable to load config blob object '%s'" +msgstr "'%s' yapฤฑlandฤฑrma ikili nesnesi yรผklenemiyor" + +#: config.c:1658 +#, c-format +msgid "reference '%s' does not point to a blob" +msgstr "'%s' baลvurusu ikili bir nesneye iลaret etmiyor" + +#: config.c:1675 +#, c-format +msgid "unable to resolve config blob '%s'" +msgstr "'%s' yapฤฑlandฤฑrma ikili nesnesi รงรถzรผlemiyor" + +#: config.c:1705 +#, c-format +msgid "failed to parse %s" +msgstr "%s ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: config.c:1759 +msgid "unable to parse command-line config" +msgstr "komut satฤฑrฤฑ yapฤฑlandฤฑrmasฤฑ ayrฤฑลtฤฑrฤฑlamฤฑyor" + +#: config.c:2122 +msgid "unknown error occurred while reading the configuration files" +msgstr "yapฤฑlandฤฑrma dosyalarฤฑ okunurken beklenmedik bir hata oluลtu" + +#: config.c:2296 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "Geรงersiz %s: '%s'" + +#: config.c:2341 +#, 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:2387 +#, 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:2389 +#, 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:2470 +#, c-format +msgid "invalid section name '%s'" +msgstr "geรงersiz bรถlรผm adฤฑ '%s'" + +#: config.c:2502 +#, c-format +msgid "%s has multiple values" +msgstr "%s birden รงok deฤere iye" + +#: config.c:2531 +#, c-format +msgid "failed to write new configuration file %s" +msgstr "yeni yapฤฑlandฤฑrma dosyasฤฑ %s yazฤฑlamadฤฑ" + +#: config.c:2783 config.c:3107 +#, c-format +msgid "could not lock config file %s" +msgstr "%s yapฤฑlandฤฑrma dosyasฤฑ kilitlenemedi" + +#: config.c:2794 +#, c-format +msgid "opening %s" +msgstr "%s aรงฤฑlฤฑyor" + +#: config.c:2829 builtin/config.c:354 +#, c-format +msgid "invalid pattern: %s" +msgstr "geรงersiz dizgi: %s" + +#: config.c:2854 +#, c-format +msgid "invalid config file %s" +msgstr "geรงersiz yapฤฑlandฤฑrma dosyasฤฑ %s" + +#: config.c:2867 config.c:3120 +#, c-format +msgid "fstat on %s failed" +msgstr "%s รผzerinde fstat baลarฤฑsฤฑz oldu" + +#: config.c:2878 +#, c-format +msgid "unable to mmap '%s'" +msgstr "'%s' mmap yapฤฑlamฤฑyor" + +#: config.c:2887 config.c:3125 +#, c-format +msgid "chmod on %s failed" +msgstr "%s รผzerinde chmod baลarฤฑsฤฑz oldu" + +#: config.c:2972 config.c:3222 +#, c-format +msgid "could not write config file %s" +msgstr "%s yapฤฑlandฤฑrma dosyasฤฑ yazฤฑlamadฤฑ" + +#: config.c:3006 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "'%s', '%s' olarak ayarlanamadฤฑ" + +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 +#, c-format +msgid "could not unset '%s'" +msgstr "'%s' ayarฤฑ kapatฤฑlamadฤฑ" + +#: config.c:3098 +#, c-format +msgid "invalid section name: %s" +msgstr "geรงersiz bรถlรผm adฤฑ: %s" + +#: config.c:3265 +#, 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:118 +#, c-format +msgid "server doesn't support feature '%s'" +msgstr "sunucu '%s' รถzelliฤini desteklemiyor" + +#: connect.c:129 +msgid "expected flush after capabilities" +msgstr "yeteneklerden sonra floล bekleniyordu" + +#: connect.c:263 +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "'%s' ilk satฤฑrฤฑndan sonra yetenekler yok sayฤฑlฤฑyor" + +#: connect.c:284 +msgid "protocol error: unexpected capabilities^{}" +msgstr "protokol hatasฤฑ: beklenmedik yetenekler^{}" + +#: connect.c:306 +#, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "protokol hatasฤฑ: sฤฑฤ sha-1 bekleniyordu, '%s' alฤฑndฤฑ" + +#: connect.c:308 +msgid "repository on the other end cannot be shallow" +msgstr "diฤer uรงtaki depo sฤฑฤ olamaz" + +#: connect.c:347 +msgid "invalid packet" +msgstr "geรงersiz paket" + +#: connect.c:367 +#, c-format +msgid "protocol error: unexpected '%s'" +msgstr "protokol hatasฤฑ: beklenmedik '%s'" + +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "sunucu tarafฤฑndan bilinmeyen nesne biรงimi '%s' belirtildi" + +#: connect.c:500 +#, c-format +msgid "invalid ls-refs response: %s" +msgstr "geรงersiz ls-refs yanฤฑtฤฑ: %s" + +#: connect.c:504 +msgid "expected flush after ref listing" +msgstr "baลvuru listelemesinden sonra floล bekleniyordu" + +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "baลvuru listelemesinden sonra yanฤฑt sonu paketi bekleniyordu" + +#: connect.c:640 +#, c-format +msgid "protocol '%s' is not supported" +msgstr "'%s' protokolรผ desteklenmiyor" + +#: connect.c:691 +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "soket รผzerinde SO_KEEPALIVE ayarlanamฤฑyor" + +#: connect.c:731 connect.c:794 +#, c-format +msgid "Looking up %s ... " +msgstr "%s adresi aranฤฑyor..." + +#: connect.c:735 +#, 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:739 connect.c:810 +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" +"bitti.\n" +"%s adresine baฤlanฤฑlฤฑyor (kapฤฑ %s)..." + +#: connect.c:761 connect.c:838 +#, c-format +msgid "" +"unable to connect to %s:\n" +"%s" +msgstr "" +"%s adresine baฤlanฤฑlฤฑyor:\n" +"%s" + +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " +#: connect.c:767 connect.c:844 +msgid "done." +msgstr "bitti." + +#: connect.c:798 +#, c-format +msgid "unable to look up %s (%s)" +msgstr "%s aranamฤฑyor (%s)" + +#: connect.c:804 +#, c-format +msgid "unknown port %s" +msgstr "bilinmeyen kapฤฑ %s" + +#: connect.c:941 connect.c:1271 +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "garip makine adฤฑ '%s' engellendi" + +#: connect.c:943 +#, c-format +msgid "strange port '%s' blocked" +msgstr "garip kapฤฑ '%s' engellendi" + +#: connect.c:953 +#, c-format +msgid "cannot start proxy %s" +msgstr "vekil %s baลlatฤฑlamฤฑyor" + +#: connect.c:1024 +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:1219 +msgid "ssh variant 'simple' does not support -4" +msgstr "ssh deฤiลik biรงimi 'simple' -4 desteklemiyor" + +#: connect.c:1231 +msgid "ssh variant 'simple' does not support -6" +msgstr "ssh deฤiลik biรงimi 'simple' -6 desteklemiyor" + +#: connect.c:1248 +msgid "ssh variant 'simple' does not support setting port" +msgstr "ssh deฤiลik biรงimi 'simple' kapฤฑ ayarlamayฤฑ desteklemiyor" + +#: connect.c:1360 +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "garip yol adฤฑ '%s' engellendi" + +#: connect.c:1408 +msgid "unable to fork" +msgstr "รงatallanamฤฑyor" + +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 +msgid "Checking connectivity" +msgstr "Baฤlantฤฑ denetleniyor" + +#: connected.c:120 +msgid "Could not run 'git rev-list'" +msgstr "'git rev-list' รงalฤฑลtฤฑrฤฑlamadฤฑ" + +#: connected.c:144 +msgid "failed write to rev-list" +msgstr "rev-list yazฤฑlamadฤฑ" + +#: connected.c:149 +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:665 +#, 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:685 +#, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "girdi '%s' dฤฑล sรผzgecine beslenemiyor" + +#: convert.c:692 +#, c-format +msgid "external filter '%s' failed %d" +msgstr "'%s' dฤฑล sรผzgeci %d iรงin baลarฤฑsฤฑz oldu" + +#: convert.c:727 convert.c:730 +#, c-format +msgid "read from external filter '%s' failed" +msgstr "'%s' dฤฑล sรผzgecinden okuma baลarฤฑsฤฑz oldu" + +#: convert.c:733 convert.c:788 +#, c-format +msgid "external filter '%s' failed" +msgstr "'%s' dฤฑล sรผzgeci baลarฤฑsฤฑz oldu" + +#: convert.c:837 +msgid "unexpected filter type" +msgstr "beklenmedik sรผzgeรง tรผrรผ" + +#: convert.c:848 +msgid "path name too long for external filter" +msgstr "dฤฑล sรผzgeรง iรงin yol adฤฑ pek uzun" + +#: convert.c:940 +#, 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:1240 +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:1428 convert.c:1462 +#, c-format +msgid "%s: clean filter '%s' failed" +msgstr "%s: temiz sรผzgeรง '%s' baลarฤฑsฤฑz oldu" + +#: convert.c:1508 +#, c-format +msgid "%s: smudge filter %s failed" +msgstr "%s: is sรผzgeci %s baลarฤฑsฤฑz oldu" + +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "ลu anahtar iรงin yetki aramasฤฑ atlanฤฑyor: credential.%s" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "anamakine bilgisi eksik yetki ile รงalฤฑลma reddediliyor" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "protokol bilgisi eksik yetki ile รงalฤฑลma reddediliyor" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "url, kendisinin %s bileลeninde bir yenisatฤฑr iรงeriyor: %s" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "url'nin ลemasฤฑ yok: %s" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "yetki url'si ayrฤฑลtฤฑrฤฑlamฤฑyor: %s" + +#: 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" + +#: 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:156 +#, 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:161 +#, c-format +msgid " Unknown dirstat parameter '%s'\n" +msgstr " Bilinmeyen dirstat parametresi '%s'\n" + +#: diff.c:297 +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:325 +#, 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:333 +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:410 +#, 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:470 +#, 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:4269 +#, c-format +msgid "external diff died, stopping at %s" +msgstr "dฤฑล diff sonlandฤฑ, %s konumunda durdu" + +#: diff.c:4618 +msgid "--name-only, --name-status, --check and -s are mutually exclusive" +msgstr "--name-only, --name-status, --check ve -s birlikte kullanฤฑlmaz" + +#: diff.c:4621 +msgid "-G, -S and --find-object are mutually exclusive" +msgstr "-G, -S ve --find-object birlikte kullanฤฑlmaz" + +#: diff.c:4699 +msgid "--follow requires exactly one pathspec" +msgstr "--follow tam olarak yalnฤฑzca bir yol belirteci gerektiriyor" + +#: diff.c:4747 +#, c-format +msgid "invalid --stat value: %s" +msgstr "geรงersiz --stat deฤeri: %s" + +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 +#, c-format +msgid "%s expects a numerical value" +msgstr "%s bir sayฤฑsal deฤer bekliyor" + +#: diff.c:4784 +#, 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:4869 +#, 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:4893 +#, c-format +msgid "unknown value after ws-error-highlight=%.*s" +msgstr "ลundan sonra bilinmeyen deฤer: ws-error-highlight=%.*s" + +#: diff.c:4907 +#, c-format +msgid "unable to resolve '%s'" +msgstr "'%s' รงรถzรผlemiyor" + +#: diff.c:4957 diff.c:4963 +#, c-format +msgid "%s expects <n>/<m> form" +msgstr "%s <n>/<m> biรงimi bekliyor" + +#: diff.c:4975 +#, c-format +msgid "%s expects a character, got '%s'" +msgstr "%s bir karakter bekliyor, '%s' aldฤฑ" + +#: diff.c:4996 +#, c-format +msgid "bad --color-moved argument: %s" +msgstr "hatalฤฑ --color-moved deฤiลkeni: %s" + +#: diff.c:5015 +#, c-format +msgid "invalid mode '%s' in --color-moved-ws" +msgstr "--color-moved-ws iรงinde geรงersiz kip '%s'" + +#: diff.c:5055 +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:5091 diff.c:5111 +#, c-format +msgid "invalid argument to %s" +msgstr "%s iรงin geรงersiz deฤiลken" + +#: diff.c:5248 +#, c-format +msgid "failed to parse --submodule option parameter: '%s'" +msgstr "--submodule seรงenek parametresi ayrฤฑลtฤฑrฤฑlamadฤฑ: '%s'" + +#: diff.c:5304 +#, c-format +msgid "bad --word-diff argument: %s" +msgstr "hatalฤฑ --word-diff deฤiลkeni: %s" + +#: diff.c:5327 +msgid "Diff output format options" +msgstr "Diff รงฤฑktฤฑsฤฑ biรงimlendirme seรงenekleri" + +#: diff.c:5329 diff.c:5335 +msgid "generate patch" +msgstr "yama oluลtur" + +#: diff.c:5332 builtin/log.c:176 +msgid "suppress diff output" +msgstr "diff รงฤฑktฤฑsฤฑnฤฑ gizle" + +#: diff.c:5337 diff.c:5451 diff.c:5458 +msgid "<n>" +msgstr "<n>" + +#: diff.c:5338 diff.c:5341 +msgid "generate diffs with <n> lines context" +msgstr "diff'leri <n> satฤฑr baฤlamlฤฑ oluลtur" + +#: diff.c:5343 +msgid "generate the diff in raw format" +msgstr "diff'i ham biรงimde oluลtur" + +#: diff.c:5346 +msgid "synonym for '-p --raw'" +msgstr "'-p --raw eลanlamlฤฑsฤฑ" + +#: diff.c:5350 +msgid "synonym for '-p --stat'" +msgstr "'-p --stat eลanlamlฤฑsฤฑ" + +#: diff.c:5354 +msgid "machine friendly --stat" +msgstr "makinede okunabilen --stat" + +#: diff.c:5357 +msgid "output only the last line of --stat" +msgstr "--stat'ฤฑn yalnฤฑzca son satฤฑrฤฑnฤฑ รงฤฑktฤฑ ver" + +#: diff.c:5359 diff.c:5367 +msgid "<param1,param2>..." +msgstr "<param1,param2>..." + +#: diff.c:5360 +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:5364 +msgid "synonym for --dirstat=cumulative" +msgstr "--dirstat-cumulative eลanlamlฤฑsฤฑ" + +#: diff.c:5368 +msgid "synonym for --dirstat=files,param1,param2..." +msgstr "--dirstat=files,param1,param2... eลanlamlฤฑsฤฑ" + +#: diff.c:5372 +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:5375 +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:5378 +msgid "show only names of changed files" +msgstr "yalnฤฑzca deฤiลtirilen dosyalarฤฑn adlarฤฑnฤฑ gรถster" + +#: diff.c:5381 +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:5383 +msgid "<width>[,<name-width>[,<count>]]" +msgstr "<geniลlik>[,<ad-geniลlik>[,<sayฤฑm>]]" + +#: diff.c:5384 +msgid "generate diffstat" +msgstr "diffstat oluลtur" + +#: diff.c:5386 diff.c:5389 diff.c:5392 +msgid "<width>" +msgstr "<geniลlik>" + +#: diff.c:5387 +msgid "generate diffstat with a given width" +msgstr "diffstat'ฤฑ verilmiล bir geniลlik ile oluลtur" + +#: diff.c:5390 +msgid "generate diffstat with a given name width" +msgstr "diffstat'ฤฑ verilmiล bir ad geniลliฤi ile oluลtur" + +#: diff.c:5393 +msgid "generate diffstat with a given graph width" +msgstr "diffstat'ฤฑ verilmiล bir grafik geniลliฤi ile oluลtur" + +#: diff.c:5395 +msgid "<count>" +msgstr "<sayฤฑm>" + +#: diff.c:5396 +msgid "generate diffstat with limited lines" +msgstr "diffstat'ฤฑ kฤฑsฤฑtlฤฑ satฤฑrlarla oluลtur" + +#: diff.c:5399 +msgid "generate compact summary in diffstat" +msgstr "diffstat iรงinde ufak รถzet oluลtur" + +#: diff.c:5402 +msgid "output a binary diff that can be applied" +msgstr "uygulanabilir bir ikili diff รงฤฑktฤฑsฤฑ ver" + +#: diff.c:5405 +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:5407 +msgid "show colored diff" +msgstr "renkli diff gรถster" + +#: diff.c:5408 +msgid "<kind>" +msgstr "<รงeลit>" + +#: diff.c:5409 +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:5412 +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:5415 diff.c:5418 diff.c:5421 diff.c:5527 +msgid "<prefix>" +msgstr "<รถnek>" + +#: diff.c:5416 +msgid "show the given source prefix instead of \"a/\"" +msgstr "\"a/\" yerine verilmiล kaynak รถnekini gรถster" + +#: diff.c:5419 +msgid "show the given destination prefix instead of \"b/\"" +msgstr "\"b/\"yerine verilmiล kaynak รถnekini gรถster" + +#: diff.c:5422 +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:5425 +msgid "do not show any source or destination prefix" +msgstr "hiรงbir kaynak ve hedef รถnekini gรถsterme" + +#: diff.c:5428 +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:5432 diff.c:5437 diff.c:5442 +msgid "<char>" +msgstr "<karakter>" + +#: diff.c:5433 +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:5438 +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:5443 +msgid "specify the character to indicate a context instead of ' '" +msgstr "baฤlam belirtmek iรงin ' ' yerine kullanฤฑlacak karakteri belirle" + +#: diff.c:5446 +msgid "Diff rename options" +msgstr "Diff yeniden adlandฤฑrma seรงenekleri" + +#: diff.c:5447 +msgid "<n>[/<m>]" +msgstr "<n>[/<m>]" + +#: diff.c:5448 +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:5452 +msgid "detect renames" +msgstr "yeniden adlandฤฑrmalarฤฑ algฤฑla" + +#: diff.c:5456 +msgid "omit the preimage for deletes" +msgstr "silmeler iรงin รถngรถrรผntรผyรผ atla" + +#: diff.c:5459 +msgid "detect copies" +msgstr "kopyalarฤฑ algฤฑla" + +#: diff.c:5463 +msgid "use unmodified files as source to find copies" +msgstr "deฤiลtirilmemiล dosyalarฤฑ kopyalarฤฑ bulmak iรงin kaynak olarak kullan" + +#: diff.c:5465 +msgid "disable rename detection" +msgstr "yeniden adlandฤฑrma algฤฑlamasฤฑnฤฑ devre dฤฑลฤฑ bฤฑrak" + +#: diff.c:5468 +msgid "use empty blobs as rename source" +msgstr "boล ikili nesneleri yeniden adlandฤฑrma kaynaฤฤฑ olarak kullan" + +#: diff.c:5470 +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:5473 +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:5475 +msgid "Diff algorithm options" +msgstr "Diff algoritma seรงenekleri" + +#: diff.c:5477 +msgid "produce the smallest possible diff" +msgstr "olabilecek en kรผรงรผk diff'i รผret" + +#: diff.c:5480 +msgid "ignore whitespace when comparing lines" +msgstr "satฤฑrlarฤฑ karลฤฑlaลtฤฑrฤฑrken boลluklarฤฑ yok say" + +#: diff.c:5483 +msgid "ignore changes in amount of whitespace" +msgstr "boลluk sayฤฑsฤฑndaki deฤiลiklikleri yok say" + +#: diff.c:5486 +msgid "ignore changes in whitespace at EOL" +msgstr "satฤฑr sonundaki boลluk deฤiลikliklerini yok say" + +#: diff.c:5489 +msgid "ignore carrier-return at the end of line" +msgstr "satฤฑr sonundaki satฤฑrbaลฤฑ karakterini yok say" + +#: diff.c:5492 +msgid "ignore changes whose lines are all blank" +msgstr "satฤฑrlarฤฑnฤฑn tรผmรผ boล olan deฤiลiklikleri yok say" + +#: diff.c:5495 +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:5498 +msgid "generate diff using the \"patience diff\" algorithm" +msgstr "diff'i \"patience diff\" algoritmasฤฑnฤฑ kullanarak oluลtur" + +#: diff.c:5502 +msgid "generate diff using the \"histogram diff\" algorithm" +msgstr "diff'i \"histogram diff\" algoritmasฤฑnฤฑ kullanarak oluลtur" + +#: diff.c:5504 +msgid "<algorithm>" +msgstr "<algoritma>" + +#: diff.c:5505 +msgid "choose a diff algorithm" +msgstr "bir diff algoritmasฤฑ seรง" + +#: diff.c:5507 +msgid "<text>" +msgstr "<metin>" + +#: diff.c:5508 +msgid "generate diff using the \"anchored diff\" algorithm" +msgstr "diff'i \"anchored diff\" algoritmasฤฑnฤฑ kullanarak oluลtur" + +#: diff.c:5510 diff.c:5519 diff.c:5522 +msgid "<mode>" +msgstr "<kip>" + +#: diff.c:5511 +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:5513 diff.c:5516 diff.c:5561 +msgid "<regex>" +msgstr "<ifade>" + +#: diff.c:5514 +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:5517 +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" +msgstr "ลuna eลdeฤer: --word-diff=color --word-diff-regex=<ifade>" + +#: diff.c:5520 +msgid "moved lines of code are colored differently" +msgstr "taลฤฑnan kod satฤฑrlarฤฑ farklฤฑ renklendirilir" + +#: diff.c:5523 +msgid "how white spaces are ignored in --color-moved" +msgstr "boลluklar --color-moved iรงinde nasฤฑl yok sayฤฑlฤฑr" + +#: diff.c:5526 +msgid "Other diff options" +msgstr "Diฤer diff seรงenekleri" + +#: diff.c:5528 +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:5532 +msgid "treat all files as text" +msgstr "tรผm dosyalarฤฑ metin olarak varsay" + +#: diff.c:5534 +msgid "swap two inputs, reverse the diff" +msgstr "iki girdiyi deฤiลtir, diff'i tersine dรถndรผr" + +#: diff.c:5536 +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "ayrฤฑmlar varsa 1 ile, yoksa 0 ile รงฤฑk" + +#: diff.c:5538 +msgid "disable all output of the program" +msgstr "tรผm program รงฤฑktฤฑsฤฑnฤฑ devre dฤฑลฤฑ bฤฑrak" + +#: diff.c:5540 +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:5542 +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:5544 +msgid "<when>" +msgstr "<ne-zaman>" + +#: diff.c:5545 +msgid "ignore changes to submodules in the diff generation" +msgstr "diff oluลtururken altmodรผllere olan deฤiลiklikleri yok say" + +#: diff.c:5548 +msgid "<format>" +msgstr "<biรงim>" + +#: diff.c:5549 +msgid "specify how differences in submodules are shown" +msgstr "altmodรผllerdeki deฤiลikliklerin nasฤฑl gรถsterileceฤini belirt" + +#: diff.c:5553 +msgid "hide 'git add -N' entries from the index" +msgstr "indeksten 'git add -N' girdilerini gizle" + +#: diff.c:5556 +msgid "treat 'git add -N' entries as real in the index" +msgstr "indekste 'git add -N' girdilerine gerรงekmiล gibi davran" + +#: diff.c:5558 +msgid "<string>" +msgstr "<dizi>" + +#: diff.c:5559 +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:5562 +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:5565 +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:5568 +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:5571 +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:5572 +msgid "<object-id>" +msgstr "<nesne-no>" + +#: diff.c:5573 +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:5575 +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" + +#: diff.c:5576 +msgid "select files by diff type" +msgstr "dosyalarฤฑ diff tรผrรผne gรถre seรง" + +#: diff.c:5578 +msgid "<file>" +msgstr "<dosya>" + +#: diff.c:5579 +msgid "Output to a specific file" +msgstr "belirli bir dosyaya รงฤฑktฤฑ ver" + +#: diff.c:6236 +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:6239 +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:6242 +#, 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." + +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "orderfile '%s' okunamadฤฑ" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "Kesin olmayan yeniden adlandฤฑrma algฤฑlamasฤฑ gerรงekleลtiriliyor" + +#: dir.c:578 +#, 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:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "tanฤฑmlanamayan dizgi: '%s'" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "tanฤฑmlanamayan negatif dizgi: '%s'" + +#: dir.c:809 +#, 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:819 +msgid "disabling cone pattern matching" +msgstr "koni dizgi eลleลmesi devre dฤฑลฤฑ bฤฑrakฤฑlฤฑyor" + +#: dir.c:1198 +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "%s bir 'exclude' dosyasฤฑ olarak kullanฤฑlamฤฑyor" + +#: dir.c:2305 +#, c-format +msgid "could not open directory '%s'" +msgstr "'%s' dizini aรงฤฑlamadฤฑ" + +#: dir.c:2605 +msgid "failed to get kernel name and information" +msgstr "รงekirdek adฤฑ ve bilgisi alฤฑnamadฤฑ" + +#: dir.c:2729 +msgid "untracked cache is disabled on this system or location" +msgstr "izlenmeyen รถnbellek bu sistemde veya konumda devre dฤฑลฤฑ bฤฑrakฤฑlmฤฑล" + +#: dir.c:3520 +#, c-format +msgid "index file corrupt in repo %s" +msgstr "%s deposundaki indeks dosyasฤฑ hasarlฤฑ" + +#: dir.c:3565 dir.c:3570 +#, c-format +msgid "could not create directories for %s" +msgstr "%s iรงin dizinler oluลturulamadฤฑ" + +#: dir.c:3599 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "git dizini '%s' konumundan '%s' konumuna gรถรง ettirilemedi" + +#: editor.c:74 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "ฤฐpucu: Dรผzenleyicinizin dosyayฤฑ kapatmasฤฑ bekleniyor...%c" + +#: entry.c:177 +msgid "Filtering content" +msgstr "ฤฐรงerik sรผzรผlรผyor" + +#: entry.c:478 +#, c-format +msgid "could not stat file '%s'" +msgstr "'%s' dosyasฤฑnฤฑn bilgileri alฤฑnamadฤฑ" + +#: environment.c:150 +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "hatalฤฑ git ad alanฤฑ yolu \"%s\"" + +#: environment.c:337 +#, 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:176 +msgid "git fetch-pack: expected shallow list" +msgstr "git fetch-pack: sฤฑฤ bir liste bekleniyordu" + +#: fetch-pack.c:179 +msgid "git fetch-pack: expected a flush packet after shallow list" +msgstr "git fetch-pack: sฤฑฤ listeden sonra floล paketi bekleniyordu" + +#: fetch-pack.c:190 +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:210 +#, c-format +msgid "git fetch-pack: expected ACK/NAK, got '%s'" +msgstr "git fetch-pack: ACK/NAK bekleniyordu, '%s' alฤฑndฤฑ" + +#: fetch-pack.c:221 +msgid "unable to write to remote" +msgstr "uzak konuma yazฤฑlamฤฑyor" + +#: fetch-pack.c:282 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "--stateless-rpc multi_ack_detailed gerektiriyor" + +#: fetch-pack.c:375 fetch-pack.c:1397 +#, c-format +msgid "invalid shallow line: %s" +msgstr "geรงersiz sฤฑฤ satฤฑr: %s" + +#: fetch-pack.c:381 fetch-pack.c:1403 +#, c-format +msgid "invalid unshallow line: %s" +msgstr "geรงersiz sฤฑฤ olmayan satฤฑr: %s" + +#: fetch-pack.c:383 fetch-pack.c:1405 +#, c-format +msgid "object not found: %s" +msgstr "nesne bulunamadฤฑ: %s" + +#: fetch-pack.c:386 fetch-pack.c:1408 +#, c-format +msgid "error in object: %s" +msgstr "nesne iรงinde hata: %s" + +#: fetch-pack.c:388 fetch-pack.c:1410 +#, c-format +msgid "no shallow found: %s" +msgstr "sฤฑฤ bulunamadฤฑ: %s" + +#: fetch-pack.c:391 fetch-pack.c:1414 +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "sฤฑฤ/sฤฑฤ olmayan bekleniyordu, %s alฤฑndฤฑ" + +#: fetch-pack.c:431 +#, c-format +msgid "got %s %d %s" +msgstr "%s %d %s alฤฑndฤฑ" + +#: fetch-pack.c:448 +#, c-format +msgid "invalid commit %s" +msgstr "geรงersiz iลleme %s" + +#: fetch-pack.c:479 +msgid "giving up" +msgstr "vazgeรงiliyor" + +#: fetch-pack.c:492 progress.c:339 +msgid "done" +msgstr "bitti" + +#: fetch-pack.c:504 +#, c-format +msgid "got %s (%d) %s" +msgstr "%s (%d) %s alฤฑndฤฑ" + +#: fetch-pack.c:540 +#, c-format +msgid "Marking %s as complete" +msgstr "%s tamam olarak imleniyor" + +#: fetch-pack.c:755 +#, c-format +msgid "already have %s (%s)" +msgstr "%s halihazฤฑrda var (%s)" + +#: fetch-pack.c:824 +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "fetch-pack: yanbant รงoฤullama รงรถzรผcรผsรผ ayrฤฑ รงatallanamฤฑyor" + +#: fetch-pack.c:832 +msgid "protocol error: bad pack header" +msgstr "protokol hatasฤฑ: hatalฤฑ paket รผstbilgisi" + +#: fetch-pack.c:916 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-pack: %s ayrฤฑ รงatallanamฤฑyor" + +#: fetch-pack.c:933 +#, c-format +msgid "%s failed" +msgstr "%s baลarฤฑsฤฑz oldu" + +#: fetch-pack.c:935 +msgid "error in sideband demultiplexer" +msgstr "yanbant รงoฤullama รงรถzรผcรผsรผnde hata" + +#: fetch-pack.c:978 +#, c-format +msgid "Server version is %.*s" +msgstr "Sunucu sรผrรผmรผ %.*s" + +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 +#, c-format +msgid "Server supports %s" +msgstr "Sunucu %s destekliyor" + +#: fetch-pack.c:985 +msgid "Server does not support shallow clients" +msgstr "Sunucu sฤฑฤ istemcileri desteklemiyor" + +#: fetch-pack.c:1045 +msgid "Server does not support --shallow-since" +msgstr "Sunucu --shallow-since desteklemiyor" + +#: fetch-pack.c:1050 +msgid "Server does not support --shallow-exclude" +msgstr "Sunucu --shallow-exclude desteklemiyor" + +#: fetch-pack.c:1054 +msgid "Server does not support --deepen" +msgstr "Sunucu --deepen desteklemiyor" + +#: fetch-pack.c:1056 +msgid "Server does not support this repository's object format" +msgstr "Sunucu bu deponun nesne tรผrรผnรผ desteklemiyor" + +#: fetch-pack.c:1069 +msgid "no common commits" +msgstr "ortak iลleme yok" + +#: fetch-pack.c:1081 fetch-pack.c:1619 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack: getirme baลarฤฑsฤฑz" + +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "eลleลmeyen algoritmalar: istemci %s; sunucu %s" + +#: fetch-pack.c:1209 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "sunucu '%s' algoritmasฤฑnฤฑ desteklemiyor" + +#: fetch-pack.c:1229 +msgid "Server does not support shallow requests" +msgstr "Sunucu sฤฑฤ istekleri desteklemiyor" + +#: fetch-pack.c:1236 +msgid "Server supports filter" +msgstr "Sunucu sรผzgeรง destekliyor" + +#: fetch-pack.c:1275 +msgid "unable to write request to remote" +msgstr "uzak konuma istek yazฤฑlamฤฑyor" + +#: fetch-pack.c:1293 +#, c-format +msgid "error reading section header '%s'" +msgstr "bรถlรผm รผstbilgisi '%s' okunurken hata" + +#: fetch-pack.c:1299 +#, c-format +msgid "expected '%s', received '%s'" +msgstr "'%s' bekleniyordu, '%s' alฤฑndฤฑ" + +#: fetch-pack.c:1360 +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "beklenmedik alฤฑndฤฑ satฤฑrฤฑ: '%s'" + +#: fetch-pack.c:1365 +#, c-format +msgid "error processing acks: %d" +msgstr "alฤฑndฤฑlar iลlenirken hata: %d" + +#: fetch-pack.c:1375 +msgid "expected packfile to be sent after 'ready'" +msgstr "paket dosyasฤฑnฤฑn 'ready'den sonra gรถnderilmesi gerekiyordu" + +#: fetch-pack.c:1377 +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:1419 +#, c-format +msgid "error processing shallow info: %d" +msgstr "sฤฑฤ bilgi iลlenirken hata: %d" + +#: fetch-pack.c:1466 +#, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "wanted-ref bekleniyordu, '%s' alฤฑndฤฑ" + +#: fetch-pack.c:1471 +#, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "beklenmedik wanted-ref: '%s'" + +#: fetch-pack.c:1476 +#, c-format +msgid "error processing wanted refs: %d" +msgstr "aranan baลvurular iลlenirken hata: %d" + +#: fetch-pack.c:1506 +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack: yanฤฑt sonu paketi bekleniyordu" + +#: fetch-pack.c:1887 +msgid "no matching remote head" +msgstr "eลleลen uzak dal ucu yok" + +#: fetch-pack.c:1910 builtin/clone.c:692 +msgid "remote did not send all necessary objects" +msgstr "uzak konum gereken tรผm nesneleri gรถndermedi" + +#: fetch-pack.c:1937 +#, c-format +msgid "no such remote ref %s" +msgstr "bรถyle bir uzak baลvuru yok: %s" + +#: fetch-pack.c:1940 +#, 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:272 +msgid "could not create temporary file" +msgstr "geรงici dosya oluลturulamadฤฑ" + +#: gpg-interface.c:275 +#, c-format +msgid "failed writing detached signature to '%s'" +msgstr "ลuna ayrฤฑk imza yazฤฑlamadฤฑ: '%s'" + +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg veriyi imzalayamadฤฑ" + +#: 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> aracฤฑlฤฑฤฤฑyla). 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:176 builtin/clone.c:411 builtin/diff.c:89 +#: 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 geรงerli 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:300 +#, c-format +msgid "available git commands in '%s'" +msgstr "'%s' iรงindeki kullanฤฑlabilir git komutlarฤฑ" + +#: help.c:307 +msgid "git commands available from elsewhere on your $PATH" +msgstr "$PATH iรงindeki baลka yerlerden kullanฤฑlabilen git komutlarฤฑ" + +#: help.c:316 +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:365 git.c:99 +#, c-format +msgid "unsupported command listing type '%s'" +msgstr "desteklenmeyen komut listeleme tรผrรผ '%s'" + +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Git konsept kฤฑlavuzlarฤฑ ลunlardฤฑr:" + +#: help.c:429 +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:434 +msgid "External commands" +msgstr "Dฤฑล komutlar" + +#: help.c:449 +msgid "Command aliases" +msgstr "Komut armalarฤฑ" + +#: help.c:513 +#, 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:572 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Tรผh. Sisteminiz hiรงbir Git komutunu bildirmiyor." + +#: help.c:594 +#, 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:599 +#, 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:604 +#, 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:612 +#, 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:616 +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:656 +msgid "git version [<options>]" +msgstr "git version [<seรงenekler>]" + +#: help.c:711 +#, c-format +msgid "%s: %s - %s" +msgstr "%s: %s - %s" + +#: help.c:715 +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:353 +msgid "Author identity unknown\n" +msgstr "Yazar kimliฤi bilinmiyor\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "ฤฐลleyici kimliฤi bilinmiyor\n" + +#: ident.c:362 +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:397 +msgid "no email was given and auto-detection is disabled" +msgstr "bir e-posta verilmedi ve kendiliฤinden algฤฑlama devre dฤฑลฤฑ" + +#: ident.c:402 +#, 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:419 +msgid "no name was given and auto-detection is disabled" +msgstr "bir ad verilmedi ve kendiliฤinden algฤฑlama devre dฤฑลฤฑ" + +#: ident.c:425 +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "ad kendiliฤinden algฤฑlanamฤฑyor ('%s' alฤฑndฤฑ)" + +#: ident.c:433 +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "boล tanฤฑmlayฤฑcฤฑ adฤฑna (<%s> iรงin) izin verilmiyor" + +#: ident.c:439 +#, c-format +msgid "name consists only of disallowed characters: %s" +msgstr "ad yalnฤฑzca izin verilmeyen karakterlerden oluลuyor: %s" + +#: ident.c:454 builtin/commit.c:634 +#, c-format +msgid "invalid date format: %s" +msgstr "geรงersiz tarih biรงimi: %s" + +#: list-objects-filter-options.c:81 +msgid "expected 'tree:<depth>'" +msgstr "'tree:<derinlik>' bekleniyordu" + +#: list-objects-filter-options.c:96 +msgid "sparse:path filters support has been dropped" +msgstr "sparse:path sรผzgeรงleri desteฤi artฤฑk yok" + +#: list-objects-filter-options.c:109 +#, c-format +msgid "invalid filter-spec '%s'" +msgstr "geรงersiz filter-spec '%s'" + +#: list-objects-filter-options.c:125 +#, 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:167 +msgid "expected something after combine:" +msgstr "birlikte kullanฤฑmdan sonra bir ลeyler bekleniyordu:" + +#: list-objects-filter-options.c:249 +msgid "multiple filter-specs cannot be combined" +msgstr "รงoklu filter-specs birlikte kullanฤฑlamaz" + +#: list-objects-filter-options.c:361 +msgid "unable to upgrade repository format to support partial clone" +msgstr "depo biรงimi kฤฑsฤฑmsal klonlarฤฑ desteklemesi iรงin yรผkseltilemiyor" + +#: 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.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 iลlemesi iรงin kรถk aฤacฤฑ yรผklenemiyor" + +#: lockfile.c:152 +#, 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:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "'%s.lock' oluลturulamฤฑyor: %s" + +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "ls-refs deฤiลkenlerinden sonra floล bekleniyordu" + +#: merge-recursive.c:356 +msgid "(bad commit)\n" +msgstr "(hatalฤฑ iลleme)\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 (iลlemeler 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 (iลlemeler 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 iลlemeye 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 (iลlemeleri 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ฤin:\n" +"\n" +"\tgit update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"komutu bu รถneriyi kabul edecektir.\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:2484 merge-recursive.c:3129 +#, 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:1805 +#, 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:2068 +#, 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:2100 +#, 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:2110 +#, 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:2202 +#, 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:2447 +#, 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:2973 +#, c-format +msgid "cannot read object %s" +msgstr "%s nesnesi okunamฤฑyor" + +#: merge-recursive.c:2976 +#, c-format +msgid "object %s is not a blob" +msgstr "%s nesnesi ikili bir nesne deฤil" + +#: merge-recursive.c:3040 +msgid "modify" +msgstr "deฤiลtir" + +#: merge-recursive.c:3040 +msgid "modified" +msgstr "deฤiลtirilmiล" + +#: merge-recursive.c:3052 +msgid "content" +msgstr "iรงerik" + +#: merge-recursive.c:3056 +msgid "add/add" +msgstr "ekle/ekle" + +#: merge-recursive.c:3079 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "%s atlandฤฑ (mevcut ile aynฤฑ biรงimde birleลtirildi)" + +#: merge-recursive.c:3101 +msgid "submodule" +msgstr "altmodรผl" + +#: merge-recursive.c:3102 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "รAKIลMA (%s): %s iรงinde birleลtirme รงakฤฑลmasฤฑ" + +#: merge-recursive.c:3132 +#, c-format +msgid "Adding as %s instead" +msgstr "Bunun yerine %s olarak ekleniyor" + +#: merge-recursive.c:3215 +#, 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:3218 +#, 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:3222 +#, 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:3225 +#, 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:3339 +#, c-format +msgid "Removing %s" +msgstr "%s kaldฤฑrฤฑlฤฑyor" + +#: merge-recursive.c:3362 +msgid "file/directory" +msgstr "dosya/dizin" + +#: merge-recursive.c:3367 +msgid "directory/file" +msgstr "dizin/dosya" + +#: merge-recursive.c:3374 +#, 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:3383 +#, c-format +msgid "Adding %s" +msgstr "%s ekleniyor" + +#: merge-recursive.c:3392 +#, 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:3436 +msgid "Already up to date!" +msgstr "Her ลey gรผncel!" + +#: merge-recursive.c:3445 +#, 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:3550 +msgid "Merging:" +msgstr "Birleลtiriliyor:" + +#: merge-recursive.c:3563 +#, 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:3613 +msgid "merge returned no commit" +msgstr "birleลtirme herhangi bir iลleme dรถndรผrmedi" + +#: merge-recursive.c:3672 +#, 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:3769 +#, c-format +msgid "Could not parse object '%s'" +msgstr "'%s' nesnesi ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 +msgid "Unable to write index." +msgstr "ฤฐndeks yazฤฑlamฤฑyor." + +#: merge.c:41 +msgid "failed to read the cache" +msgstr "รถnbellek okunamadฤฑ" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "yeni indeks dosyasฤฑ yazฤฑlamฤฑyor" + +#: midx.c:79 +#, c-format +msgid "multi-pack-index file %s is too small" +msgstr "multi-pack-index dosyasฤฑ %s pek kรผรงรผk" + +#: midx.c:95 +#, 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:100 +#, c-format +msgid "multi-pack-index version %d not recognized" +msgstr "multi-pack-index sรผrรผmรผ %d tanฤฑmlanamฤฑyor" + +#: midx.c:105 +#, c-format +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "multi-pack-index saฤlama sรผrรผmรผ %u, %u sรผrรผmรผ ile eลleลmiyor" + +#: midx.c:122 +msgid "invalid chunk offset (too large)" +msgstr "geรงersiz iri parรงa ofseti (รงok geniล)" + +#: midx.c:146 +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:159 +msgid "multi-pack-index missing required pack-name chunk" +msgstr "multi-pack-index'ten gerekli pack-name iri parรงasฤฑ eksik" + +#: midx.c:161 +msgid "multi-pack-index missing required OID fanout chunk" +msgstr "multi-pack-index'ten gerekli OID fanout iri parรงasฤฑ eksik" + +#: midx.c:163 +msgid "multi-pack-index missing required OID lookup chunk" +msgstr "multi-pack-index'ten gerekli OID arama iri parรงasฤฑ eksik" + +#: midx.c:165 +msgid "multi-pack-index missing required object offsets chunk" +msgstr "multi-pack-index'ten gerekli nesne ofsetleri iri parรงasฤฑ eksik" + +#: midx.c:179 +#, 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:222 +#, c-format +msgid "bad pack-int-id: %u (%u total packs)" +msgstr "hatalฤฑ pack-int-id: %u (%u toplam paket)" + +#: midx.c:272 +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:300 +msgid "error preparing packfile from multi-pack-index" +msgstr "paket dosyasฤฑ multi-pack-index'ten hazฤฑrlanฤฑrken hata" + +#: midx.c:485 +#, c-format +msgid "failed to add packfile '%s'" +msgstr "paket dosyasฤฑ '%s' eklenemedi" + +#: midx.c:491 +#, c-format +msgid "failed to open pack-index '%s'" +msgstr "pack-index '%s' aรงฤฑlamadฤฑ" + +#: midx.c:551 +#, c-format +msgid "failed to locate object %d in packfile" +msgstr "%d nesnesi paket dosyasฤฑnda bulunamadฤฑ" + +#: midx.c:853 +msgid "Adding packfiles to multi-pack-index" +msgstr "Paket dosyalarฤฑ multi-pack-index'e ekleniyor" + +#: midx.c:886 +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "bฤฑrakฤฑlacak pack-file %s gรถrรผlmedi" + +#: midx.c:938 +msgid "no pack files to index." +msgstr "indekslenecek paket dosyasฤฑ yok." + +#: midx.c:990 +msgid "Writing chunks to multi-pack-index" +msgstr "ฤฐri parรงalar multi-pack-index'e yazฤฑlฤฑyor" + +#: midx.c:1068 +#, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "multi-pack-index %s konumunda temizlenemedi" + +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "multi-pack-index dosyasฤฑ mevcut, ancak ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: midx.c:1132 +msgid "Looking for referenced packfiles" +msgstr "Baลvurulmuล paket dosyalarฤฑ aranฤฑyor" + +#: midx.c:1147 +#, 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:1152 +msgid "the midx contains no oid" +msgstr "midx bir oid iรงermiyor" + +#: midx.c:1161 +msgid "Verifying OID order in multi-pack-index" +msgstr "multi-pack-index iรงindeki OID sฤฑrasฤฑ doฤrulanฤฑyor" + +#: midx.c:1170 +#, 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:1190 +msgid "Sorting objects by packfile" +msgstr "Nesneler paket dosyasฤฑna gรถre sฤฑralanฤฑyor" + +#: midx.c:1197 +msgid "Verifying object offsets" +msgstr "Nesne ofsetleri doฤrulanฤฑyor" + +#: midx.c:1213 +#, 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:1219 +#, c-format +msgid "failed to load pack-index for packfile %s" +msgstr "paket dosyasฤฑ %s iรงin pack-index yรผklenemedi" + +#: midx.c:1228 +#, 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:1253 +msgid "Counting referenced objects" +msgstr "Baลvurulmuล nesneler sayฤฑlฤฑyor" + +#: midx.c:1263 +msgid "Finding and deleting unreferenced packfiles" +msgstr "Baลvurulmamฤฑล paket dosyalarฤฑ bulunuyor ve siliniyor" + +#: midx.c:1454 +msgid "could not start pack-objects" +msgstr "pack-objects baลlatฤฑlamadฤฑ" + +#: midx.c:1474 +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 " +"iลleyin/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ฤฑ iลlenemiyor" + +#: 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" + +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "%s boyutu alฤฑnamฤฑyor" + +#: packfile.c:630 +msgid "offset before end of packfile (broken .idx?)" +msgstr "ofset paket dosyasฤฑnฤฑn sonundan รถnce (bozuk .idx?)" + +#: packfile.c:1922 +#, 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:1926 +#, 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?)" + +#: 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:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "hatalฤฑ oluลturulmuล nesne adฤฑ '%s'" + +#: 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:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "ลunun armasฤฑ: --%s" + +#: parse-options.c:862 +#, c-format +msgid "unknown option `%s'" +msgstr "bilinmeyen seรงenek '%s'" + +#: parse-options.c:864 +#, c-format +msgid "unknown switch `%c'" +msgstr "bilinmeyen anahtar '%c'" + +#: parse-options.c:866 +#, c-format +msgid "unknown non-ascii option in string: `%s'" +msgstr "dizi iรงinde bilinmeyen ascii dฤฑลฤฑ seรงenek: '%s'" + +#: parse-options.c:890 +msgid "..." +msgstr "..." + +#: parse-options.c:909 +#, 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:915 +#, c-format +msgid " or: %s" +msgstr " veya: %s" + +#: parse-options.c:918 +#, c-format +msgid " %s" +msgstr " %s" + +#: parse-options.c:957 +msgid "-NUM" +msgstr "-SAYI" + +#: 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:445 +#, c-format +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: '%s', '%s' konumunda depo dฤฑลฤฑnda" + +#: pathspec.c:521 +#, c-format +msgid "'%s' (mnemonic: '%c')" +msgstr "'%s' (belleten: '%c')" + +#: pathspec.c:531 +#, 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:598 +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "yol belirteci '%s' bir sembolik baฤฤฑn รถtesinde" + +#: pathspec.c:643 +#, 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 "unable to write stateless separator packet" +msgstr "durumsuz ayฤฑrฤฑcฤฑ paketi yazฤฑlamฤฑyor" + +#: pkt-line.c:113 +msgid "flush packet write failed" +msgstr "floล paketi yazฤฑmฤฑ baลarฤฑsฤฑz" + +#: pkt-line.c:153 pkt-line.c:239 +msgid "protocol error: impossibly long line" +msgstr "protokol hatasฤฑ: olanaksฤฑz uzun satฤฑr" + +#: pkt-line.c:169 pkt-line.c:171 +msgid "packet write with format failed" +msgstr "biรงimlendirilmiล paket yazฤฑmฤฑ baลarฤฑsฤฑz" + +#: pkt-line.c:203 +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:210 pkt-line.c:217 +msgid "packet write failed" +msgstr "paket yazฤฑmฤฑ baลarฤฑsฤฑz" + +#: pkt-line.c:302 +msgid "read error" +msgstr "okuma hatasฤฑ" + +#: pkt-line.c:310 +msgid "the remote end hung up unexpectedly" +msgstr "uzak konum beklenmedik bir biรงimde hattฤฑ kapattฤฑ" + +#: pkt-line.c:338 +#, c-format +msgid "protocol error: bad line length character: %.4s" +msgstr "protokol hatasฤฑ: hatalฤฑ satฤฑr uzunluฤu karakteri: %.4s" + +#: pkt-line.c:352 pkt-line.c:357 +#, c-format +msgid "protocol error: bad line length %d" +msgstr "protokol hatasฤฑ: hatalฤฑ satฤฑr uzunluฤu %d" + +#: pkt-line.c:373 sideband.c:150 +#, 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:983 +msgid "unable to parse --pretty format" +msgstr "--pretty biรงimi ayrฤฑลtฤฑrฤฑlamฤฑyor" + +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "promisor-remote: getirme altiลlemi รงatallanamฤฑyor" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "promisor-remote: getirme altiลlemine yazฤฑlamฤฑyor" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "promisor-remote: altiลlemi getirmek iรงin stdin kapatฤฑlamฤฑyor" + +#: promisor-remote.c:53 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "vaatรงi uzak konum adฤฑ '/' ile baลlayamaz: %s" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "Yinelenmiล nesneler kaldฤฑrฤฑlฤฑyor" + +#: range-diff.c:77 +msgid "could not start `log`" +msgstr "'log' baลlatฤฑlamadฤฑ" + +#: range-diff.c:79 +msgid "could not read `log` output" +msgstr "'log' รงฤฑktฤฑsฤฑ okunamadฤฑ" + +#: range-diff.c:98 sequencer.c:5283 +#, c-format +msgid "could not parse commit '%s'" +msgstr "'%s' iลlemesi ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" +"'log' รงฤฑktฤฑsฤฑnฤฑn ilk satฤฑrฤฑ ayrฤฑลtฤฑrฤฑlamadฤฑ: 'commit ' ile baลlamฤฑyor: '%s'" + +#: range-diff.c:137 +#, c-format +msgid "could not parse git header '%.*s'" +msgstr "git รผstbilgisi '%.*s' ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: range-diff.c:301 +msgid "failed to generate diff" +msgstr "diff oluลturulamadฤฑ" + +#: range-diff.c:534 range-diff.c:536 +#, c-format +msgid "could not parse log for '%s'" +msgstr "'%s' gรผnlรผฤรผ ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: read-cache.c:682 +#, 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:698 +msgid "cannot create an empty blob in the object database" +msgstr "nesne veritabanฤฑnda boล ikili bir nesne oluลturulamฤฑyor" + +#: read-cache.c:720 +#, 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:725 +#, c-format +msgid "'%s' does not have a commit checked out" +msgstr "'%s' รงฤฑkฤฑลฤฑ yapฤฑlmฤฑล bir iลlemeye iye deฤil" + +#: read-cache.c:777 +#, c-format +msgid "unable to index file '%s'" +msgstr "'%s' dosyasฤฑ indekslenemiyor" + +#: read-cache.c:796 +#, c-format +msgid "unable to add '%s' to index" +msgstr "'%s' indekse eklenemiyor" + +#: read-cache.c:807 +#, c-format +msgid "unable to stat '%s'" +msgstr "'%s' dosyasฤฑnฤฑn bilgileri alฤฑnamฤฑyor" + +#: read-cache.c:1318 +#, 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:1524 +msgid "Refresh index" +msgstr "ฤฐndeks yenileniyor" + +#: read-cache.c:1639 +#, 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:1649 +#, 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:1705 +#, c-format +msgid "bad signature 0x%08x" +msgstr "hatalฤฑ imza 0x%08x" + +#: read-cache.c:1708 +#, c-format +msgid "bad index version %d" +msgstr "hatalฤฑ indeks sรผrรผmรผ %d" + +#: read-cache.c:1717 +msgid "bad index file sha1 signature" +msgstr "hatalฤฑ indeks dosyasฤฑ sha1 imzasฤฑ" + +#: read-cache.c:1747 +#, 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:1749 +#, c-format +msgid "ignoring %.4s extension" +msgstr "%.4s uzantฤฑsฤฑ yok sayฤฑlฤฑyor" + +#: read-cache.c:1786 +#, c-format +msgid "unknown index entry format 0x%08x" +msgstr "bilinmeyen indeks girdisi biรงimi 0x%08x" + +#: read-cache.c:1802 +#, 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:1859 +msgid "unordered stage entries in index" +msgstr "indekste sฤฑrasฤฑz hazฤฑrlama alanฤฑ girdileri" + +#: read-cache.c:1862 +#, 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:1865 +#, c-format +msgid "unordered stage entries for '%s'" +msgstr "'%s' iรงin sฤฑrasฤฑz hazฤฑrlama alanฤฑ girdileri" + +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 +msgid "index file corrupt" +msgstr "indeks dosyasฤฑ hasar gรถrmรผล" + +#: read-cache.c:2115 +#, 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:2128 +#, 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:2161 +#, c-format +msgid "%s: index file open failed" +msgstr "%s: indeks dosyasฤฑ aรงฤฑlamadฤฑ" + +#: read-cache.c:2165 +#, c-format +msgid "%s: cannot stat the open index" +msgstr "%s: aรงฤฑk indeksin bilgileri alฤฑnamฤฑyor" + +#: read-cache.c:2169 +#, c-format +msgid "%s: index file smaller than expected" +msgstr "%s: indeks dosyasฤฑ beklenenden daha kรผรงรผk" + +#: read-cache.c:2173 +#, c-format +msgid "%s: unable to map index file" +msgstr "%s: indeks dosyasฤฑ eลlemlenemiyor" + +#: read-cache.c:2215 +#, 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:2242 +#, 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:2274 +#, c-format +msgid "could not freshen shared index '%s'" +msgstr "paylaลฤฑlan indeks '%s' tazelenemedi" + +#: read-cache.c:2321 +#, 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:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 +#, c-format +msgid "could not close '%s'" +msgstr "'%s' kapatฤฑlamadฤฑ" + +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 +#, c-format +msgid "could not stat '%s'" +msgstr "'%s' bilgileri alฤฑnamadฤฑ" + +#: read-cache.c:3133 +#, c-format +msgid "unable to open git dir: %s" +msgstr "git dizini aรงฤฑlamฤฑyor: %s" + +#: read-cache.c:3145 +#, c-format +msgid "unable to unlink: %s" +msgstr "baฤlantฤฑ kesilemiyor: %s" + +#: read-cache.c:3170 +#, c-format +msgid "cannot fix permission bits on '%s'" +msgstr "'%s' รผzerindeki izin bitleri onarฤฑlamฤฑyor" + +#: read-cache.c:3319 +#, 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 <iลleme> = iลlemeyi kullan\n" +"r, reword <iลleme> = iลlemeyi kullan; ancak iลleme iletisini dรผzenle\n" +"e, edit <iลleme> = iลlemeyi kullan; ancak deฤiลtirmek iรงin dur\n" +"s, squash <iลleme> = iลlemeyi kullan; ancak รถnceki iลleme iรงine karฤฑลtฤฑr\n" +"f, fixup <iลleme> = \"squash\" gibi; ancak bu iลlemenin 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 <iลleme> = iลlemeyi 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 <iลleme> | -c <iลleme>] <etiket> [# <teksatฤฑr>]\n" +". orijinal birleลtirme iลlemesi iletisini kullanarak bir\n" +". birleลtirme iลlemesi oluลtur (veya teksatฤฑr, eฤer bir orijinal\n" +". birleลtirme iลlemesi belirtilmemiลse). ฤฐลleme iletisini yeniden\n" +". yazmak iรงin -c <iลleme> 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:218 +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 iลlemeyi kaldฤฑrmak iรงin 'drop'u aรงฤฑkรงa " +"kullanฤฑn.\n" + +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 +msgid "" +"\n" +"If you remove a line here THAT COMMIT WILL BE LOST.\n" +msgstr "" +"\n" +"Buradaki bir satฤฑrฤฑ kaldฤฑrฤฑrsanฤฑz ฤฐลLEME KAYBOLUR.\n" + +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 +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:938 +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "" +"\n" +"Ancak tรผmรผnรผ kaldฤฑrฤฑrsanฤฑz yeniden temellendirme iptal edilecektir.\n" +"\n" + +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 +#, c-format +msgid "could not write '%s'" +msgstr "'%s' yazฤฑlamadฤฑ" + +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 +#, 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ฤฑ iลlemeler yanlฤฑลlฤฑkla bฤฑrakฤฑlmฤฑล olabilir.\n" +"Bฤฑrakฤฑlan iลlemeler: (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 iลlemeyi 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:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 +#, c-format +msgid "could not read '%s'." +msgstr "'%s' okunamadฤฑ." + +#: ref-filter.c:42 wt-status.c:1973 +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:169 +#, c-format +msgid "expected format: %%(color:<color>)" +msgstr "beklenen biรงim: %%(color:<renk>)" + +#: ref-filter.c:171 +#, c-format +msgid "unrecognized color: %%(color:%s)" +msgstr "tanฤฑmlanamayan renk: %%(color:%s)" + +#: ref-filter.c:193 +#, c-format +msgid "Integer value expected refname:lstrip=%s" +msgstr "Tamsayฤฑ deฤeri ลunu bekliyordu: refname:lstrip=%s" + +#: ref-filter.c:197 +#, c-format +msgid "Integer value expected refname:rstrip=%s" +msgstr "Tamsayฤฑ deฤeri ลunu bekliyordu: refname:rstrip=%s" + +#: ref-filter.c:199 +#, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "tanฤฑmlanamayan %%(%s) deฤiลkeni: %s" + +#: ref-filter.c:254 +#, c-format +msgid "%%(objecttype) does not take arguments" +msgstr "%%(objecttype) deฤiลken almฤฑyor" + +#: ref-filter.c:276 +#, c-format +msgid "unrecognized %%(objectsize) argument: %s" +msgstr "tanฤฑmlanamayan %%(objectsize) deฤiลkeni: %s" + +#: ref-filter.c:284 +#, c-format +msgid "%%(deltabase) does not take arguments" +msgstr "%%(deltabase) deฤiลken almฤฑyor" + +#: ref-filter.c:296 +#, c-format +msgid "%%(body) does not take arguments" +msgstr "%%(body) deฤiลken almฤฑyor" + +#: ref-filter.c:309 +#, c-format +msgid "unrecognized %%(subject) argument: %s" +msgstr "tanฤฑmlanamayan %%(subject) deฤiลkeni: %s" + +#: ref-filter.c:330 +#, c-format +msgid "unknown %%(trailers) argument: %s" +msgstr "bilinmeyen %%(trailers) deฤiลkeni: %s" + +#: ref-filter.c:363 +#, c-format +msgid "positive value expected contents:lines=%s" +msgstr "pozitif deฤer ลunu bekliyordu: contents:lines=%s" + +#: ref-filter.c:365 +#, c-format +msgid "unrecognized %%(contents) argument: %s" +msgstr "tanฤฑmlanamayan %%(contents) deฤiลkeni: %s" + +#: ref-filter.c:380 +#, c-format +msgid "positive value expected '%s' in %%(%s)" +msgstr "pozitif deฤer ลurada '%s' bekliyordu: %%(%s)" + +#: ref-filter.c:384 +#, c-format +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "ลurada tanฤฑmlanamayan deฤiลken '%s': %%(%s)" + +#: ref-filter.c:398 +#, c-format +msgid "unrecognized email option: %s" +msgstr "tanฤฑmlanamayan e-posta seรงeneฤi: %s" + +#: ref-filter.c:428 +#, c-format +msgid "expected format: %%(align:<width>,<position>)" +msgstr "beklenen biรงim: %%(align:<geniลlik>,<konum>)" + +#: ref-filter.c:440 +#, c-format +msgid "unrecognized position:%s" +msgstr "tanฤฑmlanamayan konum:%s" + +#: ref-filter.c:447 +#, c-format +msgid "unrecognized width:%s" +msgstr "tanฤฑmlanamayan geniลlik:%s" + +#: ref-filter.c:456 +#, c-format +msgid "unrecognized %%(align) argument: %s" +msgstr "tanฤฑmlanamayan %%(align) deฤiลkeni: %s" + +#: ref-filter.c:464 +#, c-format +msgid "positive width expected with the %%(align) atom" +msgstr "pozitif geniลlik %%(align) รถgeciฤi ile birlikte bekleniyordu" + +#: ref-filter.c:482 +#, c-format +msgid "unrecognized %%(if) argument: %s" +msgstr "tanฤฑmlanamayan %%(if) deฤiลkeni: %s" + +#: ref-filter.c:584 +#, c-format +msgid "malformed field name: %.*s" +msgstr "hatalฤฑ oluลturulmuล alan adฤฑ: %.*s" + +#: ref-filter.c:611 +#, c-format +msgid "unknown field name: %.*s" +msgstr "bilinmeyen alan adฤฑ: %.*s" + +#: ref-filter.c:615 +#, 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:739 +#, 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:802 +#, 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:804 +#, c-format +msgid "format: %%(then) atom used more than once" +msgstr "biรงim: %%(then) รถgeciฤi birden รงok kez kullanฤฑldฤฑ" + +#: ref-filter.c:806 +#, c-format +msgid "format: %%(then) atom used after %%(else)" +msgstr "biรงim: %%(then) รถgeciฤi %%(else) รถgeciฤinden sonra kullanฤฑldฤฑ" + +#: ref-filter.c:834 +#, 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:836 +#, 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:838 +#, c-format +msgid "format: %%(else) atom used more than once" +msgstr "biรงim: %%(else) รถgeciฤi birden รงok kez kullanฤฑldฤฑ" + +#: ref-filter.c:853 +#, 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:910 +#, c-format +msgid "malformed format string %s" +msgstr "hatalฤฑ oluลturulmuล biรงim dizisi %s" + +#: ref-filter.c:1541 +#, c-format +msgid "no branch, rebasing %s" +msgstr "dal yok, %s yeniden temellendiriliyor" + +#: ref-filter.c:1544 +#, c-format +msgid "no branch, rebasing detached HEAD %s" +msgstr "dal yok, ayrฤฑk HEAD %s yeniden temellendiriliyor" + +#: ref-filter.c:1547 +#, c-format +msgid "no branch, bisect started on %s" +msgstr "dal yok, ikili arama %s รผzerinde baลladฤฑ" + +#: ref-filter.c:1557 +msgid "no branch" +msgstr "dal yok" + +#: ref-filter.c:1591 ref-filter.c:1800 +#, c-format +msgid "missing object %s for %s" +msgstr "eksik nesne %s (%s iรงin)" + +#: ref-filter.c:1601 +#, 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:2054 +#, c-format +msgid "malformed object at '%s'" +msgstr "'%s' konumunda hatalฤฑ oluลturulmuล nesne" + +#: ref-filter.c:2143 +#, c-format +msgid "ignoring ref with broken name %s" +msgstr "bozuk ada iye %s baลvurusu yok sayฤฑlฤฑyor" + +#: ref-filter.c:2148 refs.c:657 +#, c-format +msgid "ignoring broken ref %s" +msgstr "bozuk baลvuru %s yok sayฤฑlฤฑyor" + +#: ref-filter.c:2464 +#, c-format +msgid "format: %%(end) atom missing" +msgstr "biรงim: %%(end) รถgeciฤi eksik" + +#: ref-filter.c:2563 +#, c-format +msgid "malformed object name %s" +msgstr "hatalฤฑ oluลturulmuล nesne adฤฑ %s" + +#: ref-filter.c:2568 +#, c-format +msgid "option `%s' must point to a commit" +msgstr "'%s' bir iลlemeye iลaret etmeli" + +#: refs.c:264 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "%s geรงerli bir nesneye iลaret etmiyor!" + +#: refs.c:572 +#, c-format +msgid "could not retrieve `%s`" +msgstr "'%s' alฤฑnamadฤฑ" + +#: refs.c:579 +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "geรงersiz dal adฤฑ: %s = %s" + +#: refs.c:655 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "sarkan sembolik baลvuru %s yok sayฤฑlฤฑyor" + +#: refs.c:892 +#, 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:898 +#, 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:957 +#, c-format +msgid "log for %s is empty" +msgstr "%s iรงin olan gรผnlรผk boล" + +#: refs.c:1049 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "hatalฤฑ ada iye '%s' baลvurusunu gรผncelleme reddediliyor" + +#: refs.c:1120 +#, 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:1944 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "'%s' baลvurusu iรงin birden รงok gรผncellemeye izin verilmiyor" + +#: refs.c:2024 +msgid "ref updates forbidden inside quarantine environment" +msgstr "baลvuru gรผncellemeleri karantina ortamฤฑ iรงinde yasak" + +#: refs.c:2035 +msgid "ref updates aborted by hook" +msgstr "baลvuru gรผncellemeleri kanca tarafฤฑndan iptal edildi" + +#: refs.c:2135 refs.c:2165 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "'%s' mevcut; '%s' oluลturulamฤฑyor" + +#: refs.c:2141 refs.c:2176 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "'%s' ve '%s' aynฤฑ anda iลlenemiyor" + +#: refs/files-backend.c:1228 +#, c-format +msgid "could not remove reference %s" +msgstr "%s baลvurusu kaldฤฑrฤฑlamadฤฑ" + +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "%s baลvurusu silinemedi: %s" + +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#, c-format +msgid "could not delete references: %s" +msgstr "baลvurular silinemedi: %s" + +#: refspec.c:167 +#, c-format +msgid "invalid refspec '%s'" +msgstr "geรงersiz baลvuru belirteci '%s'" + +#: remote.c:351 +#, c-format +msgid "config remote shorthand cannot begin with '/': %s" +msgstr "uzak konum yapฤฑlandฤฑrma stenografisi '/' ile baลlayamaz: %s" + +#: remote.c:399 +msgid "more than one receivepack given, using the first" +msgstr "birden fazla receivepack verildi, birincisi kullanฤฑlฤฑyor" + +#: remote.c:407 +msgid "more than one uploadpack given, using the first" +msgstr "birden fazla uploadpack verildi, birincisi kullanฤฑlฤฑyor" + +#: remote.c:590 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "Hem %s hem %s ลuraya getirilemiyor: %s" + +#: remote.c:594 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s genelde %s รถgesini izler, %s deฤil" + +#: remote.c:598 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s hem %s hem %s รถgelerini izler" + +#: remote.c:666 +#, c-format +msgid "key '%s' of pattern had no '*'" +msgstr "dizginin '%s' anahtarฤฑnda '*' yoktu" + +#: remote.c:676 +#, c-format +msgid "value '%s' of pattern has no '*'" +msgstr "dizginin '%s' deฤerinde '*' yok" + +#: remote.c:1073 +#, 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:1078 +#, 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:1093 +#, 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:1113 +#, 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 iลleme nesnesi.\n" +"'%s:refs/heads/%s' konumuna iterek yeni bir dal mฤฑ\n" +"oluลturmak istediniz?" + +#: remote.c:1118 +#, 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:1123 +#, 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:1128 +#, 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:1164 +#, c-format +msgid "%s cannot be resolved to branch" +msgstr "%s dala รงรถzรผlemiyor" + +#: remote.c:1175 +#, c-format +msgid "unable to delete '%s': remote ref does not exist" +msgstr "'%s' silinemiyor: uzak baลvuru yok" + +#: remote.c:1187 +#, c-format +msgid "dst refspec %s matches more than one" +msgstr "birden รงok hedef baลvuru belirteci %s eลleลmesi" + +#: remote.c:1194 +#, c-format +msgid "dst ref %s receives from more than one src" +msgstr "hedef baลvurusu %s birden รงok kaynaktan alฤฑyor" + +#: remote.c:1703 remote.c:1804 +msgid "HEAD does not point to a branch" +msgstr "HEAD bir dala iลaret etmiyor" + +#: remote.c:1712 +#, c-format +msgid "no such branch: '%s'" +msgstr "bรถyle bir dal yok: '%s'" + +#: remote.c:1715 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "'%s' dalฤฑ iรงin รผstkaynak yapฤฑlandฤฑrฤฑlmamฤฑล" + +#: remote.c:1721 +#, 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:1736 +#, c-format +msgid "push destination '%s' on remote '%s' has no local tracking branch" +msgstr "'%s' itme hedefinin ('%s' uzak konumunda) yerel izleme dalฤฑ yok" + +#: remote.c:1748 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "'%s' dalฤฑnฤฑn itme iรงin uzak konumu yok" + +#: remote.c:1758 +#, 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:1771 +msgid "push has no destination (push.default is 'nothing')" +msgstr "itilecek bir hedef yok (push.default: 'nothing')" + +#: remote.c:1793 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "tek bir konuma 'simple' itme รงรถzรผlemiyor" + +#: remote.c:1922 +#, c-format +msgid "couldn't find remote ref %s" +msgstr "%s uzak baลvurusu bulunamadฤฑ" + +#: remote.c:1935 +#, c-format +msgid "* Ignoring funny ref '%s' locally" +msgstr "* Eฤlenceli baลvuru '%s' yerel olarak yok sayฤฑlฤฑyor" + +#: remote.c:2098 +#, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "Dalฤฑnฤฑz '%s' temelli; ancak รผstkaynak kaybolmuล.\n" + +#: remote.c:2102 +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr " (dรผzeltmek iรงin \"git branch --unset-upstream\" kullan)\n" + +#: remote.c:2105 +#, c-format +msgid "Your branch is up to date with '%s'.\n" +msgstr "Dalฤฑnฤฑz '%s' ile gรผncel.\n" + +#: remote.c:2109 +#, c-format +msgid "Your branch and '%s' refer to different commits.\n" +msgstr "Sizin dalฤฑnฤฑz ve '%s' baลka iลlemelere baลvuruyor.\n" + +#: remote.c:2112 +#, c-format +msgid " (use \"%s\" for details)\n" +msgstr " (ayrฤฑntฤฑlar iรงin \"%s\" kullanฤฑn)\n" + +#: remote.c:2116 +#, 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 iลleme ileride.\n" +msgstr[1] "Dalฤฑnฤฑz '%s' dalฤฑndan %d iลleme ileride.\n" + +#: remote.c:2122 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " (yerel iลlemelerinizi yayฤฑmlamak iรงin \"git push\" kullanฤฑn)\n" + +#: remote.c:2125 +#, 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 iลleme geride ve ileri sarฤฑlabilir.\n" +msgstr[1] "Dalฤฑnฤฑz '%s' dalฤฑndan %d iลleme geride ve ileri sarฤฑlabilir.\n" + +#: remote.c:2133 +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:2136 +#, 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 iลleme var.\n" +msgstr[1] "" +"Sizin dalฤฑnฤฑz ve '%s' birbirinden uzaklaลmฤฑล ve sฤฑrasฤฑyla\n" +"her birinde %d ve %d iลleme var.\n" + +#: remote.c:2146 +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:2337 +#, 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:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#, 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" + +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "HEAD revizyonu saptanamadฤฑ" + +#: reset.c:70 reset.c:76 sequencer.c:3426 +#, c-format +msgid "failed to find tree of %s" +msgstr "%s รถgesinin aฤacฤฑ bulunamadฤฑ" + +#: revision.c:2344 +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<paketdosyasฤฑ> artฤฑk desteklenmiyor" + +#: revision.c:2364 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "--diff-merges iรงin bilinmeyen deฤer: %s" + +#: revision.c:2702 +msgid "your current branch appears to be broken" +msgstr "geรงerli dalฤฑnฤฑz bozuk gibi gรถrรผnรผyor" + +#: revision.c:2705 +#, 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 iลleme yok" + +#: revision.c:2915 +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:1270 +#, c-format +msgid "cannot create async thread: %s" +msgstr "async iล parรงacฤฑฤฤฑ oluลturulamadฤฑ: %s" + +#: run-command.c:1334 +#, 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:145 +msgid "unexpected flush packet while reading remote unpack status" +msgstr "uzak konum aรงฤฑm durumu okunurken beklenmedik floล paketi" + +#: send-pack.c:147 +#, c-format +msgid "unable to parse remote unpack status: %s" +msgstr "uzak konum aรงฤฑm durumu ayrฤฑลtฤฑrฤฑlamadฤฑ: %s" + +#: send-pack.c:149 +#, c-format +msgid "remote unpack failed: %s" +msgstr "uzak konum aรงฤฑmฤฑ baลarฤฑsฤฑz: %s" + +#: send-pack.c:372 +msgid "failed to sign the push certificate" +msgstr "itme sertifikasฤฑ imzalanamadฤฑ" + +#: send-pack.c:460 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "alฤฑcฤฑ uรง bu deponun saฤlama algoritmasฤฑnฤฑ desteklemiyor" + +#: send-pack.c:469 +msgid "the receiving end does not support --signed push" +msgstr "alฤฑcฤฑ uรง --signed itmeyi desteklemiyor" + +#: send-pack.c:471 +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:483 +msgid "the receiving end does not support --atomic push" +msgstr "alฤฑcฤฑ uรง --atomic itmeyi desteklemiyor" + +#: send-pack.c:488 +msgid "the receiving end does not support push options" +msgstr "alฤฑcฤฑ uรง itme seรงeneklerini desteklemiyor" + +#: sequencer.c:194 +#, c-format +msgid "invalid commit message cleanup mode '%s'" +msgstr "geรงersiz iลleme iletisi temizleme kipi '%s'" + +#: sequencer.c:308 +#, c-format +msgid "could not delete '%s'" +msgstr "'%s' silinemedi" + +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 +#, c-format +msgid "could not remove '%s'" +msgstr "'%s' kaldฤฑrฤฑlamadฤฑ" + +#: sequencer.c:339 +msgid "revert" +msgstr "geri al" + +#: sequencer.c:341 +msgid "cherry-pick" +msgstr "seรง-al" + +#: sequencer.c:343 +msgid "rebase" +msgstr "yeniden temellendirme" + +#: sequencer.c:345 +#, c-format +msgid "unknown action: %d" +msgstr "bilinmeyen eylem: %d" + +#: sequencer.c:404 +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:407 +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 iลleyin" + +#: sequencer.c:420 sequencer.c:3028 +#, c-format +msgid "could not lock '%s'" +msgstr "'%s' kilitlenemedi" + +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "ลuraya yazฤฑlamadฤฑ: '%s'" + +#: sequencer.c:427 +#, c-format +msgid "could not write eol to '%s'" +msgstr "satฤฑr sonu ลuraya yazฤฑlamadฤฑ: '%s'" + +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 +#, c-format +msgid "failed to finalize '%s'" +msgstr "'%s' tamamlanamadฤฑ" + +#: sequencer.c:471 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "%s ile yerel deฤiลikliklerinizin รผzerine yazฤฑlacaktฤฑr." + +#: sequencer.c:475 +msgid "commit your changes or stash them to proceed." +msgstr "ฤฐlerlemek iรงin deฤiลikliklerinizi iลleyin veya zulalayฤฑn." + +#: sequencer.c:507 +#, c-format +msgid "%s: fast-forward" +msgstr "%s: ileri sar" + +#: sequencer.c:546 builtin/tag.c:566 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Geรงersiz temizlik kipi %s" + +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. "rebase". +#. +#: sequencer.c:640 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: Yeni indeks dosyasฤฑ yazฤฑlamฤฑyor" + +#: sequencer.c:657 +msgid "unable to update cache tree" +msgstr "รถnbellek aฤacฤฑ gรผncellenemiyor" + +#: sequencer.c:671 +msgid "could not resolve HEAD commit" +msgstr "HEAD iลlemesi รงรถzรผlemedi" + +#: sequencer.c:751 +#, c-format +msgid "no key present in '%.*s'" +msgstr "'%.*s' iรงinde bir anahtar yok" + +#: sequencer.c:762 +#, c-format +msgid "unable to dequote value of '%s'" +msgstr "'%s' รถgesinin tฤฑrnaklarฤฑ kaldฤฑrฤฑlamฤฑyor" + +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 +#, c-format +msgid "could not open '%s' for reading" +msgstr "'%s' okuma iรงin aรงฤฑlamadฤฑ" + +#: sequencer.c:809 +msgid "'GIT_AUTHOR_NAME' already given" +msgstr "'GIT_AUTHOR_NAME' halihazฤฑrda verilmiล" + +#: sequencer.c:814 +msgid "'GIT_AUTHOR_EMAIL' already given" +msgstr "'GIT_AUTHOR_EMAIL' halihazฤฑrda verilmiล" + +#: sequencer.c:819 +msgid "'GIT_AUTHOR_DATE' already given" +msgstr "'GIT_AUTHOR_DATE' halihazฤฑrda verilmiล" + +#: sequencer.c:823 +#, c-format +msgid "unknown variable '%s'" +msgstr "bilinmeyen deฤiลken '%s'" + +#: sequencer.c:828 +msgid "missing 'GIT_AUTHOR_NAME'" +msgstr "'GIT_AUTHOR_NAME' eksik" + +#: sequencer.c:830 +msgid "missing 'GIT_AUTHOR_EMAIL'" +msgstr "'GIT_AUTHOR_EMAIL' eksik" + +#: sequencer.c:832 +msgid "missing 'GIT_AUTHOR_DATE'" +msgstr "'GIT_AUTHOR_DATE' eksik" + +#: sequencer.c:897 +#, 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" +"Eฤer bu deฤiลikliklerin bir รถnceki iลlemeye eklenmesi\n" +"gerekiyorsa ลu komutu รงalฤฑลtฤฑrฤฑn:\n" +"\n" +"\tgit commit --amend %s\n" +"\n" +"Yeni bir iลleme yapmak istiyorsanฤฑz ลu komutu รงalฤฑลtฤฑrฤฑn:\n" +"\n" +"\tgit commit %s\n" +"\n" +"Her iki durumda da iลiniz bittikten sonra ลu komut ile sรผrdรผrรผn:\n" +"\n" +"\tgit rebase --continue\n" + +#: sequencer.c:1178 +msgid "'prepare-commit-msg' hook failed" +msgstr "'prepare-commit-msg' baลarฤฑsฤฑz oldu" + +#: sequencer.c:1184 +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 iลleme iรงin kullanฤฑlan kimliฤi dรผzeltmek isteyebilirsiniz:\n" +"\n" +"\tgit commit --amend --reset-author\n" + +#: sequencer.c:1197 +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 iลleme iรงin kullanฤฑlan kimliฤi dรผzeltmek isteyebilirsiniz:\n" +"\n" +"\tgit commit --amend --reset-author\n" + +#: sequencer.c:1239 +msgid "couldn't look up newly created commit" +msgstr "yeni yapฤฑlan iลleme aranamadฤฑ" + +#: sequencer.c:1241 +msgid "could not parse newly created commit" +msgstr "yeni yapฤฑlan iลleme ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: sequencer.c:1287 +msgid "unable to resolve HEAD after creating commit" +msgstr "HEAD, iลleme yapฤฑldฤฑktan sonra รงรถzรผlemiyor" + +#: sequencer.c:1289 +msgid "detached HEAD" +msgstr "ayrฤฑk HEAD" + +#: sequencer.c:1293 +msgid " (root-commit)" +msgstr " (kรถk iลleme)" + +#: sequencer.c:1314 +msgid "could not parse HEAD" +msgstr "HEAD ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: sequencer.c:1316 +#, c-format +msgid "HEAD %s is not a commit!" +msgstr "HEAD %s bir iลleme deฤil" + +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 +msgid "could not parse HEAD commit" +msgstr "HEAD iลlemesi ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: sequencer.c:1373 sequencer.c:2067 +msgid "unable to parse commit author" +msgstr "iลleme yazarฤฑ ayrฤฑลtฤฑrฤฑlamฤฑyor" + +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree bir aฤaca yazamadฤฑ" + +#: sequencer.c:1417 sequencer.c:1535 +#, c-format +msgid "unable to read commit message from '%s'" +msgstr "'%s' konumundan iลleme iletisi okunamฤฑyor" + +#: sequencer.c:1446 sequencer.c:1478 +#, c-format +msgid "invalid author identity '%s'" +msgstr "geรงersiz yazar kimliฤi '%s'" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "hasar gรถrmรผล yazar: tarih bilgisi eksik" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 +msgid "failed to write commit object" +msgstr "iลleme nesnesi yazฤฑlamadฤฑ" + +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "%s gรผncellenemedi" + +#: sequencer.c:1567 +#, c-format +msgid "could not parse commit %s" +msgstr "%s iลlemesi ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: sequencer.c:1572 +#, c-format +msgid "could not parse parent commit %s" +msgstr "รผst iลleme %s ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: sequencer.c:1655 sequencer.c:1766 +#, c-format +msgid "unknown command: %d" +msgstr "bilinmeyen komut: %d" + +#: sequencer.c:1713 sequencer.c:1738 +#, c-format +msgid "This is a combination of %d commits." +msgstr "Bu %d iลlemenin bir birleลimi." + +#: sequencer.c:1723 +msgid "need a HEAD to fixup" +msgstr "dรผzeltmek iรงin bir HEAD gerekiyor" + +#: sequencer.c:1725 sequencer.c:3338 +msgid "could not read HEAD" +msgstr "HEAD okunamadฤฑ" + +#: sequencer.c:1727 +msgid "could not read HEAD's commit message" +msgstr "HEAD'in iลleme iletisi okunamadฤฑ" + +#: sequencer.c:1733 +#, c-format +msgid "cannot write '%s'" +msgstr "'%s' yazฤฑlamฤฑyor" + +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 +msgid "This is the 1st commit message:" +msgstr "Birinci iลleme iletisi bu:" + +#: sequencer.c:1748 +#, c-format +msgid "could not read commit message of %s" +msgstr "%s iลleme iletisi okunamadฤฑ" + +#: sequencer.c:1755 +#, c-format +msgid "This is the commit message #%d:" +msgstr "ฤฐลleme iletisi #%d bu:" + +#: sequencer.c:1761 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "ฤฐลleme iletisi #%d atlanacak:" + +#: sequencer.c:1849 +msgid "your index file is unmerged." +msgstr "indeks dosyanฤฑz birleลtirilmemiล" + +#: sequencer.c:1856 +msgid "cannot fixup root commit" +msgstr "kรถk iลleme dรผzeltilemiyor" + +#: sequencer.c:1875 +#, c-format +msgid "commit %s is a merge but no -m option was given." +msgstr "%s iลlemesi bir birleลtirme; ancak bir -m seรงeneฤi verilmedi." + +#: sequencer.c:1883 sequencer.c:1891 +#, c-format +msgid "commit %s does not have parent %d" +msgstr "%s iลlemesinin %d diye bir รผst รถgesi yok" + +#: sequencer.c:1897 +#, c-format +msgid "cannot get commit message for %s" +msgstr "%s iลlemesinin iletisi alฤฑnamฤฑyor" + +#. TRANSLATORS: The first %s will be a "todo" command like +#. "revert" or "pick", the second %s a SHA1. +#: sequencer.c:1916 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s: รผst iลleme %s ayrฤฑลtฤฑrฤฑlamฤฑyor" + +#: sequencer.c:1981 +#, c-format +msgid "could not rename '%s' to '%s'" +msgstr "'%s', '%s' olarak yeniden adlandฤฑrฤฑlamadฤฑ" + +#: sequencer.c:2038 +#, c-format +msgid "could not revert %s... %s" +msgstr "%s geri alฤฑnamadฤฑ... %s" + +#: sequencer.c:2039 +#, c-format +msgid "could not apply %s... %s" +msgstr "%s uygulanamadฤฑ... %s" + +#: sequencer.c:2059 +#, 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:2117 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: indeks okunamadฤฑ" + +#: sequencer.c:2124 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: indeks yenilenemedi" + +#: sequencer.c:2201 +#, c-format +msgid "%s does not accept arguments: '%s'" +msgstr "%s deฤiลken kabul etmiyor: '%s'" + +#: sequencer.c:2210 +#, c-format +msgid "missing arguments for %s" +msgstr "%s iรงin eksik deฤiลken" + +#: sequencer.c:2241 +#, c-format +msgid "could not parse '%s'" +msgstr "'%s' ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: sequencer.c:2302 +#, c-format +msgid "invalid line %d: %.*s" +msgstr "geรงersiz satฤฑr %d: %.*s" + +#: sequencer.c:2313 +#, c-format +msgid "cannot '%s' without a previous commit" +msgstr "รถncesinde bir iลleme olmadan '%s' yapฤฑlamฤฑyor" + +#: sequencer.c:2399 +msgid "cancelling a cherry picking in progress" +msgstr "sรผrmekte olan bir seรง-al iptal ediliyor" + +#: sequencer.c:2408 +msgid "cancelling a revert in progress" +msgstr "sรผrmekte olan bir geri al iptal ediliyor" + +#: sequencer.c:2452 +msgid "please fix this using 'git rebase --edit-todo'." +msgstr "lรผtfen bunu 'git rebase --edit-todo' kullanarak onarฤฑn." + +#: sequencer.c:2454 +#, c-format +msgid "unusable instruction sheet: '%s'" +msgstr "kullanฤฑlabilir olmayan yรถnerge tablosu: '%s'" + +#: sequencer.c:2459 +msgid "no commits parsed." +msgstr "Hiรงbir iลleme ayrฤฑลtฤฑrฤฑlmadฤฑ." + +#: sequencer.c:2470 +msgid "cannot cherry-pick during a revert." +msgstr "bir geri al sฤฑrasฤฑnda seรง-al yapฤฑlamฤฑyor" + +#: sequencer.c:2472 +msgid "cannot revert during a cherry-pick." +msgstr "bir seรง-al sฤฑrasฤฑnda geri al yapฤฑlamฤฑyor" + +#: sequencer.c:2550 +#, c-format +msgid "invalid value for %s: %s" +msgstr "%s iรงin geรงersiz deฤer: %s" + +#: sequencer.c:2657 +msgid "unusable squash-onto" +msgstr "kullanฤฑlabilir olmayan squash-onto" + +#: sequencer.c:2677 +#, c-format +msgid "malformed options sheet: '%s'" +msgstr "hatalฤฑ oluลturulmuล seรงenekler tablosu: '%s'" + +#: sequencer.c:2769 sequencer.c:4609 +msgid "empty commit set passed" +msgstr "boล iลleme seti aktarฤฑldฤฑ" + +#: sequencer.c:2786 +msgid "revert is already in progress" +msgstr "geri al halihazฤฑrda sรผrรผyor" + +#: sequencer.c:2788 +#, c-format +msgid "try \"git revert (--continue | %s--abort | --quit)\"" +msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin" + +#: sequencer.c:2791 +msgid "cherry-pick is already in progress" +msgstr "seรง-al halihazฤฑrda sรผrรผyor" + +#: sequencer.c:2793 +#, c-format +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" +msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin" + +#: sequencer.c:2807 +#, c-format +msgid "could not create sequencer directory '%s'" +msgstr "ardฤฑลtฤฑrฤฑcฤฑ dizini '%s' oluลturulamadฤฑ" + +#: sequencer.c:2822 +msgid "could not lock HEAD" +msgstr "HEAD kilitlenemedi" + +#: sequencer.c:2882 sequencer.c:4325 +msgid "no cherry-pick or revert in progress" +msgstr "sรผren bir seรง-al veya geri al yok" + +#: sequencer.c:2884 sequencer.c:2895 +msgid "cannot resolve HEAD" +msgstr "HEAD รงรถzรผlemiyor" + +#: sequencer.c:2886 sequencer.c:2930 +msgid "cannot abort from a branch yet to be born" +msgstr "daha doฤmamฤฑล bir daldan iptal edilemiyor" + +#: sequencer.c:2916 builtin/grep.c:745 +#, c-format +msgid "cannot open '%s'" +msgstr "'%s' aรงฤฑlamฤฑyor" + +#: sequencer.c:2918 +#, c-format +msgid "cannot read '%s': %s" +msgstr "'%s' okunamฤฑyor: %s" + +#: sequencer.c:2919 +msgid "unexpected end of file" +msgstr "beklenmedik dosya sonu" + +#: sequencer.c:2925 +#, 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:2936 +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:2977 +msgid "no revert in progress" +msgstr "sรผren bir geri al yok" + +#: sequencer.c:2986 +msgid "no cherry-pick in progress" +msgstr "sรผren bir seรง-al yok" + +#: sequencer.c:2996 +msgid "failed to skip the commit" +msgstr "iลleme atlanamadฤฑ" + +#: sequencer.c:3003 +msgid "there is nothing to skip" +msgstr "atlanacak bir ลey yok" + +#: sequencer.c:3006 +#, c-format +msgid "" +"have you committed already?\n" +"try \"git %s --continue\"" +msgstr "" +"ฤฐลlemeyi yaptฤฑnฤฑz mฤฑ?\n" +"\"git %s --continue\" deneyin.\"" + +#: sequencer.c:3168 sequencer.c:4217 +msgid "cannot read HEAD" +msgstr "HEAD okunamฤฑyor" + +#: sequencer.c:3185 +#, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "'%s', '%s' konumuna kopyalanamฤฑyor" + +#: sequencer.c:3193 +#, 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 "" +"ฤฐลlemeyi ล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:3203 +#, c-format +msgid "Could not apply %s... %.*s" +msgstr "%s uygulanamฤฑyor... %.*s" + +#: sequencer.c:3210 +#, c-format +msgid "Could not merge %.*s" +msgstr "%.*s birleลtirilemedi" + +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "'%s', '%s' konumuna kopyalanamadฤฑ" + +#: sequencer.c:3240 +#, c-format +msgid "Executing: %s\n" +msgstr "รalฤฑลtฤฑrฤฑlฤฑyor: %s\n" + +#: sequencer.c:3255 +#, 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:3261 +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:3267 +#, 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 iลleyin veya zulalayฤฑn, ardฤฑndan ลunu รงalฤฑลtฤฑrฤฑn:\n" +"\n" +"\tgit rebase --continue\n" +"\n" + +#: sequencer.c:3328 +#, c-format +msgid "illegal label name: '%.*s'" +msgstr "izin verilmeyen etiket adฤฑ: '%.*s'" + +#: sequencer.c:3382 +msgid "writing fake root commit" +msgstr "sahte kรถk iลlemesi yazฤฑlฤฑyor" + +#: sequencer.c:3387 +msgid "writing squash-onto" +msgstr "squash-onto yazฤฑlฤฑyor" + +#: sequencer.c:3471 +#, c-format +msgid "could not resolve '%s'" +msgstr "'%s' รงรถzรผlemedi" + +#: sequencer.c:3502 +msgid "cannot merge without a current revision" +msgstr "gรผncel bir revizyon olmadan birleลtirilemiyor" + +#: sequencer.c:3524 +#, c-format +msgid "unable to parse '%.*s'" +msgstr "'%.*s' ayrฤฑลtฤฑrฤฑlamฤฑyor" + +#: sequencer.c:3533 +#, c-format +msgid "nothing to merge: '%.*s'" +msgstr "birleลtirilecek bir ลey yok: '%.*s'" + +#: sequencer.c:3545 +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:3561 +#, c-format +msgid "could not get commit message of '%s'" +msgstr "'%s' iลlemesinin iลleme iletisi alฤฑnamadฤฑ" + +#: sequencer.c:3730 +#, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "ลunu birleลtirme giriลiminde bulunulamadฤฑ bile: '%.*s'" + +#: sequencer.c:3746 +msgid "merge: Unable to write new index file" +msgstr "merge: Yeni indeks dosyasฤฑ yazฤฑlamฤฑyor" + +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "Kendiliฤinden zulalanamฤฑyor" + +#: sequencer.c:3823 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "Beklenmedik zula yanฤฑtฤฑ: '%s'" + +#: sequencer.c:3829 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "'%s' iรงin dizin oluลturulamadฤฑ" + +#: sequencer.c:3832 +#, c-format +msgid "Created autostash: %s\n" +msgstr "Zula kendiliฤinden oluลturuldu: %s\n" + +#: sequencer.c:3836 +msgid "could not reset --hard" +msgstr "'reset --hard' yapฤฑlamadฤฑ" + +#: sequencer.c:3861 +#, c-format +msgid "Applied autostash.\n" +msgstr "Kendiliฤinden zulalama uygulandฤฑ.\n" + +#: sequencer.c:3873 +#, c-format +msgid "cannot store %s" +msgstr "%s depolanamฤฑyor" + +#: sequencer.c:3876 +#, c-format +msgid "" +"%s\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" +"%s\n" +"Deฤiลiklikleriniz zulada gรผvende.\n" +"ฤฐstediฤiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n" + +#: sequencer.c:3881 +msgid "Applying autostash resulted in conflicts." +msgstr "Kendiliฤinden zulalama รงakฤฑลmalara neden oldu." + +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." +msgstr "Kendiliฤinden zulalama mevcut; yeni bir zula girdisi oluลturuluyor." + +#: sequencer.c:3974 +#, c-format +msgid "%s: not a valid OID" +msgstr "%s: geรงerli bir OID deฤil" + +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 +msgid "could not detach HEAD" +msgstr "HEAD ayrฤฑlamadฤฑ" + +#: sequencer.c:3994 +#, c-format +msgid "Stopped at HEAD\n" +msgstr "HEAD'de duruldu\n" + +#: sequencer.c:3996 +#, c-format +msgid "Stopped at %s\n" +msgstr "%s konumunda duruldu\n" + +#: sequencer.c:4004 +#, 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:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "Yeniden temellendiriliyor: (%d/%d)%s" + +#: sequencer.c:4095 +#, c-format +msgid "Stopped at %s... %.*s\n" +msgstr "%s konumunda durdu... %.*s\n" + +#: sequencer.c:4166 +#, c-format +msgid "unknown command %d" +msgstr "bilinmeyen komut %d" + +#: sequencer.c:4225 +msgid "could not read orig-head" +msgstr "orig-head okunamadฤฑ" + +#: sequencer.c:4230 +msgid "could not read 'onto'" +msgstr "'onto' okunamadฤฑ" + +#: sequencer.c:4244 +#, c-format +msgid "could not update HEAD to %s" +msgstr "HEAD ลu konuma gรผncellenemedi: %s" + +#: sequencer.c:4304 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "%s baลarฤฑyla yeniden temellendirildi ve gรผncellendi.\n" + +#: sequencer.c:4337 +msgid "cannot rebase: You have unstaged changes." +msgstr "Yeniden temellendirilemiyor: Hazฤฑrlanmamฤฑล deฤiลiklikleriniz var." + +#: sequencer.c:4346 +msgid "cannot amend non-existing commit" +msgstr "var olmayan iลleme deฤiลtirilemiyor" + +#: sequencer.c:4348 +#, c-format +msgid "invalid file: '%s'" +msgstr "geรงersiz dosya: '%s'" + +#: sequencer.c:4350 +#, c-format +msgid "invalid contents: '%s'" +msgstr "geรงersiz iรงerik: '%s'" + +#: sequencer.c:4353 +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 iลlenmemiล deฤiลiklikleriniz var. Lรผtfen รถnce\n" +"onlarฤฑ iลleyin ve ardฤฑndan 'git rebase --continue' yapฤฑn." + +#: sequencer.c:4389 sequencer.c:4428 +#, c-format +msgid "could not write file: '%s'" +msgstr "dosya yazฤฑlamadฤฑ: '%s'" + +#: sequencer.c:4444 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "CHERRY_PICK_HEAD kaldฤฑrฤฑlamadฤฑ" + +#: sequencer.c:4451 +msgid "could not commit staged changes." +msgstr "Hazฤฑrlanmฤฑล deฤiลiklikler iลlenemedi." + +#: sequencer.c:4477 +#, c-format +msgid "invalid committer '%s'" +msgstr "geรงersiz iลleyici '%s'" + +#: sequencer.c:4586 +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "%s: Bir %s seรงip alฤฑnamฤฑyor" + +#: sequencer.c:4590 +#, c-format +msgid "%s: bad revision" +msgstr "%s hatalฤฑ revizyon" + +#: sequencer.c:4625 +msgid "can't revert as initial commit" +msgstr "ilk iลleme geri alฤฑnamaz" + +#: sequencer.c:5102 +msgid "make_script: unhandled options" +msgstr "make_script: ele alฤฑnmayan seรงenekler" + +#: sequencer.c:5105 +msgid "make_script: error preparing revisions" +msgstr "make_script: revizyonlar hazฤฑrlanฤฑrken hata" + +#: sequencer.c:5347 sequencer.c:5364 +msgid "nothing to do" +msgstr "yapฤฑlacak bir ลey yok" + +#: sequencer.c:5383 +msgid "could not skip unnecessary pick commands" +msgstr "gerekli olmayan seรงim komutlarฤฑ atlanamadฤฑ" + +#: sequencer.c:5480 +msgid "the script was already rearranged." +msgstr "betik halihazฤฑrda yeniden dรผzenlenmiลti" + +#: setup.c:133 +#, c-format +msgid "'%s' is outside repository at '%s'" +msgstr "'%s', '%s' konumunda depo dฤฑลฤฑnda" + +#: setup.c:185 +#, 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:198 +#, 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:264 +#, 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:283 +#, 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:419 +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:423 +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:661 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "Beklenen git repo sรผrรผmรผ <= %d, %d bulundu" + +#: setup.c:669 +msgid "unknown repository extensions found:" +msgstr "bilinmeyen depo geniลletmeleri bulundu:" + +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "depo sรผrรผmรผ 0; ancak v1'e รถzel geniลletmeler bulundu:" + +#: setup.c:700 +#, c-format +msgid "error opening '%s'" +msgstr "'%s' aรงฤฑlฤฑrken hata" + +#: setup.c:702 +#, 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:704 +#, c-format +msgid "error reading %s" +msgstr "%s okunurken hata" + +#: setup.c:706 +#, c-format +msgid "invalid gitfile format: %s" +msgstr "geรงersiz gitfile biรงimi: %s" + +#: setup.c:708 +#, c-format +msgid "no path in gitfile: %s" +msgstr "gitfile iรงinde yol yok: %s" + +#: setup.c:710 +#, c-format +msgid "not a git repository: %s" +msgstr "bir git deposu deฤil: %s" + +#: setup.c:812 +#, c-format +msgid "'$%s' too big" +msgstr "'$%s' รงok bรผyรผk" + +#: setup.c:826 +#, c-format +msgid "not a git repository: '%s'" +msgstr "bir git deposu deฤil: '%s'" + +#: setup.c:855 setup.c:857 setup.c:888 +#, c-format +msgid "cannot chdir to '%s'" +msgstr "'%s' konumuna chdir yapฤฑlamฤฑyor" + +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +msgid "cannot come back to cwd" +msgstr "cwd'ye geri dรถnรผlemiyor" + +#: setup.c:987 +#, c-format +msgid "failed to stat '%*s%s%s'" +msgstr "'%*s%s%s' bilgileri alฤฑnamadฤฑ" + +#: setup.c:1225 +msgid "Unable to read current working directory" +msgstr "ลu anki รงalฤฑลma dizini okunamฤฑyor" + +#: setup.c:1234 setup.c:1240 +#, c-format +msgid "cannot change to '%s'" +msgstr "ลuraya deฤiลtirilemiyor: '%s'" + +#: setup.c:1245 +#, 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:1251 +#, 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:1362 +#, 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:1409 +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:1424 +msgid "fork failed" +msgstr "รงatallama baลarฤฑsฤฑz" + +#: setup.c:1429 +msgid "setsid failed" +msgstr "setsid baลarฤฑsฤฑz" + +#: sha1-file.c:470 +#, 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:521 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "alternatif nesne yolu olaฤanlaลtฤฑrฤฑlamฤฑyor: %s" + +#: sha1-file.c:593 +#, 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:600 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "nesne dizini olaฤanlaลtฤฑrฤฑlamฤฑyor: %s" + +#: sha1-file.c:643 +msgid "unable to fdopen alternates lockfile" +msgstr "alternatifler kilit dosyasฤฑ fdopen yapฤฑlamฤฑyor" + +#: sha1-file.c:661 +msgid "unable to read alternates file" +msgstr "alternatifler dosyasฤฑ okunamฤฑyor" + +#: sha1-file.c:668 +msgid "unable to move new alternates file into place" +msgstr "yeni alternatifler dosyasฤฑ yerine taลฤฑnamฤฑyor" + +#: sha1-file.c:703 +#, c-format +msgid "path '%s' does not exist" +msgstr "'%s' diye bir yol yok" + +#: sha1-file.c:724 +#, 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:730 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "Baลvuru deposu '%s' yerel bir depo deฤil." + +#: sha1-file.c:736 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "baลvuru deposu '%s' sฤฑฤ" + +#: sha1-file.c:744 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "baลvuru deposu '%s' aลฤฑlฤฑ" + +#: sha1-file.c:804 +#, 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:954 +#, 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:975 +msgid "mmap failed" +msgstr "mmap baลarฤฑsฤฑz" + +#: sha1-file.c:1139 +#, c-format +msgid "object file %s is empty" +msgstr "nesne dosyasฤฑ %s boล" + +#: sha1-file.c:1274 sha1-file.c:2467 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "hasar gรถrmรผล gevลek nesne '%s'" + +#: sha1-file.c:1276 sha1-file.c:2471 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "gevลek nesne '%s' sonunda anlamsฤฑz veri" + +#: sha1-file.c:1318 +msgid "invalid object type" +msgstr "geรงersiz nesne tรผrรผ" + +#: sha1-file.c:1402 +#, 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:1405 +#, c-format +msgid "unable to unpack %s header" +msgstr "%s รผstbilgisi aรงฤฑlamฤฑyor" + +#: sha1-file.c:1411 +#, 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:1414 +#, c-format +msgid "unable to parse %s header" +msgstr "%s รผstbilgisi ayrฤฑลtฤฑrฤฑlamฤฑyor" + +#: sha1-file.c:1641 +#, c-format +msgid "failed to read object %s" +msgstr "%s nesnesi okunamadฤฑ" + +#: sha1-file.c:1645 +#, c-format +msgid "replacement %s not found for %s" +msgstr "%s yedeฤi %s iรงin bulunamadฤฑ" + +#: sha1-file.c:1649 +#, 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:1653 +#, 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:1758 +#, c-format +msgid "unable to write file %s" +msgstr "%s dosyasฤฑ yazฤฑlamฤฑyor" + +#: sha1-file.c:1765 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "'%s' รถgesine izin ayarlanamฤฑyor" + +#: sha1-file.c:1772 +msgid "file write error" +msgstr "dosya yazฤฑm hatasฤฑ" + +#: sha1-file.c:1792 +msgid "error when closing loose object file" +msgstr "gevลek nesne dosyasฤฑ kapatฤฑlฤฑrken hata" + +#: sha1-file.c:1857 +#, 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:1859 +msgid "unable to create temporary file" +msgstr "geรงici dosya oluลturulamฤฑyor" + +#: sha1-file.c:1883 +msgid "unable to write loose object file" +msgstr "gevลek nesne dosyasฤฑ yazฤฑlamฤฑyor" + +#: sha1-file.c:1889 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "yeni nesne %s sรถndรผrรผlemiyor (%d)" + +#: sha1-file.c:1893 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "%s nesnesi รผzerinde deflateEnd baลarฤฑsฤฑz oldu (%d)" + +#: sha1-file.c:1897 +#, 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:1907 builtin/pack-objects.c:1086 +#, c-format +msgid "failed utime() on %s" +msgstr "%s รผzerinde utime() baลarฤฑsฤฑz" + +#: sha1-file.c:1984 +#, c-format +msgid "cannot read object for %s" +msgstr "%s iรงin nesne okunamฤฑyor" + +#: sha1-file.c:2035 +msgid "corrupt commit" +msgstr "hasar gรถrmรผล iลleme" + +#: sha1-file.c:2043 +msgid "corrupt tag" +msgstr "hasar gรถrmรผล etiket" + +#: sha1-file.c:2143 +#, c-format +msgid "read error while indexing %s" +msgstr "%s indekslenirken okuma hatasฤฑ" + +#: sha1-file.c:2146 +#, c-format +msgid "short read while indexing %s" +msgstr "%s indekslenirken kฤฑsa read" + +#: sha1-file.c:2219 sha1-file.c:2229 +#, c-format +msgid "%s: failed to insert into database" +msgstr "%s: veritabanฤฑna ekleme baลarฤฑsฤฑz" + +#: sha1-file.c:2235 +#, c-format +msgid "%s: unsupported file type" +msgstr "%s: desteklenmeyen dosya tรผrรผ" + +#: sha1-file.c:2259 +#, c-format +msgid "%s is not a valid object" +msgstr "%s geรงerli bir nesne deฤil" + +#: sha1-file.c:2261 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s geรงerli bir '%s' nesnesi deฤil" + +#: sha1-file.c:2288 builtin/index-pack.c:192 +#, c-format +msgid "unable to open %s" +msgstr "%s aรงฤฑlamฤฑyor" + +#: sha1-file.c:2478 sha1-file.c:2531 +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "%s iรงin saฤlama uyuลmazlฤฑฤฤฑ (%s bekleniyordu)" + +#: sha1-file.c:2502 +#, c-format +msgid "unable to mmap %s" +msgstr "%s mmap yapฤฑlamadฤฑ" + +#: sha1-file.c:2507 +#, c-format +msgid "unable to unpack header of %s" +msgstr "%s รผstbilgisi aรงฤฑlamฤฑyor" + +#: sha1-file.c:2513 +#, c-format +msgid "unable to parse header of %s" +msgstr "%s รผstbilgisi ayrฤฑลtฤฑrฤฑlamฤฑyor" + +#: sha1-file.c:2524 +#, 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:1702 +#, 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:1708 +#, 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:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "'%s' yolu '%.*s' iรงinde mevcut deฤil" + +#: sha1-name.c:1745 +#, 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:1761 +#, 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:1769 +#, 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:1771 +#, 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:1784 +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:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "geรงersiz nesne adฤฑ: '%.*s'" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte +#: strbuf.c:848 +#, c-format +msgid "%u.%2.2u GiB" +msgstr "%u.%2.2u GiB" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second +#: strbuf.c:850 +#, c-format +msgid "%u.%2.2u GiB/s" +msgstr "%u.%2.2u GiB/sn" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte +#: strbuf.c:858 +#, c-format +msgid "%u.%2.2u MiB" +msgstr "%u.%2.2u MiB" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second +#: strbuf.c:860 +#, c-format +msgid "%u.%2.2u MiB/s" +msgstr "%u.%2.2u MiB/sn" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte +#: strbuf.c:867 +#, c-format +msgid "%u.%2.2u KiB" +msgstr "%u.%2.2u KiB" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second +#: strbuf.c:869 +#, c-format +msgid "%u.%2.2u KiB/s" +msgstr "%u.%2.2u KiB/sn" + +#. TRANSLATORS: IEC 80000-13:2008 byte +#: strbuf.c:875 +#, 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:877 +#, c-format +msgid "%u byte/s" +msgid_plural "%u bytes/s" +msgstr[0] "%u bayt/sn" +msgstr[1] "%u bayt/sn" + +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" +msgstr "'%s' yazma iรงin aรงฤฑlamadฤฑ" + +#: strbuf.c:1175 +#, c-format +msgid "could not edit '%s'" +msgstr "'%s' dรผzenlenemedi" + +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "kuลku doฤuran altmodรผl yok sayฤฑlฤฑyor: %s" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "submodule.fetchjobs iรงin negatif deฤerlere izin verilmiyor" + +#: submodule-config.c:402 +#, 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:499 +#, c-format +msgid "invalid value for %s" +msgstr "%s iรงin geรงersiz deฤer" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr ".gitmodules girdisi %s gรผncellenemedi" + +#: 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:816 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" +"%s iลlemesinde '%s' yolunda bulunan altmodรผl, aynฤฑ adlฤฑ bir altmodรผlle " +"รงarpฤฑลฤฑyor. Atlanฤฑyor." + +#: submodule.c:919 +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "altmodรผl girdisi '%s' (%s) bir %s, iลleme deฤil" + +#: submodule.c:1004 +#, 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:1127 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "'%s' altmodรผlรผ iรงin iลlem baลarฤฑsฤฑz oldu" + +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "HEAD geรงerli bir baลvuru olarak รงรถzรผlemedi." + +#: submodule.c:1167 +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "'%s' altmodรผlรผ itiliyor\n" + +#: submodule.c:1170 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "'%s' altmodรผlรผ itilemiyor\n" + +#: submodule.c:1462 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "%s%s altmodรผlรผ getiriliyor\n" + +#: submodule.c:1492 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "'%s' altmodรผlรผne eriลilemedi\n" + +#: submodule.c:1646 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"Altmodรผl getirilirken hata:\n" +"%s" + +#: submodule.c:1671 +#, c-format +msgid "'%s' not recognized as a git repository" +msgstr "'%s' bir git deposu olarak tanฤฑmlanamadฤฑ" + +#: submodule.c:1688 +#, 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:1729 +#, 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:1804 +#, c-format +msgid "could not start 'git status' in submodule '%s'" +msgstr "'%s' altmodรผlรผ iรงinde 'git status' baลlatฤฑlamadฤฑ" + +#: submodule.c:1817 +#, 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:1832 +#, 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:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "'%s' altmodรผlรผne รถzyinelenemedi" + +#: submodule.c:1880 +msgid "could not reset submodule index" +msgstr "altmodรผl indeksi sฤฑfฤฑrlanamadฤฑ" + +#: submodule.c:1922 +#, c-format +msgid "submodule '%s' has dirty index" +msgstr "'%s' altmodรผlรผ indeksi kirli" + +#: submodule.c:1974 +#, c-format +msgid "Submodule '%s' could not be updated." +msgstr "'%s' altmodรผlรผ gรผncellenemedi." + +#: submodule.c:2042 +#, 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:2063 +#, 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:2075 submodule.c:2134 +#, c-format +msgid "could not lookup name for submodule '%s'" +msgstr "'%s' altmodรผlรผ adฤฑ aranamadฤฑ" + +#: submodule.c:2079 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "'%s' รถgesini mevcut bir git dizinine taลฤฑma reddediliyor" + +#: submodule.c:2086 +#, 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:2214 +msgid "could not start ls-files in .." +msgstr "ls-files ลurada baลlatฤฑlamadฤฑ .." + +#: submodule.c:2254 +#, c-format +msgid "ls-tree returned unexpected return code %d" +msgstr "ls-tree beklenmedik bir biรงimde %d kodu ile รงฤฑktฤฑ" + +#: trailer.c:236 +#, c-format +msgid "running trailer command '%s' failed" +msgstr "'%s' artbilgi komutunu รงalฤฑลtฤฑrma baลarฤฑsฤฑz oldu" + +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "bilinmeyen deฤer '%s' ('%s' anahtarฤฑ iรงin)" + +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 +#, c-format +msgid "more than one %s" +msgstr "birden รงok %s" + +#: trailer.c:728 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "'%.*s' artbilgisi iรงinde boล artbilgi jetonu" + +#: trailer.c:748 +#, c-format +msgid "could not read input file '%s'" +msgstr "'%s' girdi dosyasฤฑ okunamadฤฑ" + +#: trailer.c:751 +msgid "could not read from stdin" +msgstr "stdin'den okunamadฤฑ" + +#: trailer.c:1009 wrapper.c:676 +#, c-format +msgid "could not stat %s" +msgstr "%s dosya bilgileri alฤฑnamadฤฑ" + +#: trailer.c:1011 +#, c-format +msgid "file %s is not a regular file" +msgstr "%s dosyasฤฑ sฤฑradan bir dosya deฤil" + +#: trailer.c:1013 +#, c-format +msgid "file %s is not writable by user" +msgstr "%s dosyasฤฑ kullanฤฑcฤฑ tarafฤฑndan yazฤฑlabilir deฤil" + +#: trailer.c:1025 +msgid "could not open temporary file" +msgstr "geรงici dosya aรงฤฑlamadฤฑ" + +#: trailer.c:1065 +#, c-format +msgid "could not rename temporary file to %s" +msgstr "geรงici dosya adฤฑ %s olarak deฤiลtirilemedi" + +#: transport-helper.c:62 transport-helper.c:91 +msgid "full write to remote helper failed" +msgstr "uzak konum yardฤฑmcฤฑsฤฑna tam yazฤฑm baลarฤฑsฤฑz" + +#: transport-helper.c:145 +#, c-format +msgid "unable to find remote helper for '%s'" +msgstr "'%s' iรงin uzak konum yardฤฑmcฤฑsฤฑ bulunamadฤฑ" + +#: transport-helper.c:161 transport-helper.c:575 +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:214 +#, 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:220 +msgid "this remote helper should implement refspec capability" +msgstr "bu uzak konum yardฤฑmcฤฑsฤฑ refspec yapabilirliฤini yerine getirmeli" + +#: transport-helper.c:287 transport-helper.c:429 +#, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "%s beklenmedik bir biรงimde ลunu sรถyledi: '%s'" + +#: transport-helper.c:417 +#, c-format +msgid "%s also locked %s" +msgstr "%s ayrฤฑca ลunu kilitledi: %s" + +#: transport-helper.c:497 +msgid "couldn't run fast-import" +msgstr "fast-import รงalฤฑลtฤฑrฤฑlamadฤฑ" + +#: transport-helper.c:520 +msgid "error while running fast-import" +msgstr "fast-import รงalฤฑลtฤฑrฤฑlฤฑrken hata" + +#: transport-helper.c:549 transport-helper.c:1226 +#, c-format +msgid "could not read ref %s" +msgstr "%s baลvurusu okunamadฤฑ" + +#: transport-helper.c:594 +#, c-format +msgid "unknown response to connect: %s" +msgstr "'connect'e bilinmeyen yanฤฑt: %s" + +#: transport-helper.c:616 +msgid "setting remote service path not supported by protocol" +msgstr "uzak servis yolu ayarlama protokol tarafฤฑndan desteklenmiyor" + +#: transport-helper.c:618 +msgid "invalid remote service path" +msgstr "geรงersiz uzak konum servis yolu" + +#: transport-helper.c:661 transport.c:1428 +msgid "operation not supported by protocol" +msgstr "iลlem protokol tarafฤฑndan desteklenmiyor" + +#: transport-helper.c:664 +#, c-format +msgid "can't connect to subservice %s" +msgstr "%s altservisine baฤlanฤฑlamฤฑyor" + +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "eลleลen bir 'tamam/hata' direktifi olmadan 'option'" + +#: transport-helper.c:788 +#, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "tamam/hata bekleniyordu, yardฤฑmcฤฑ ลunu sรถyledi: '%s'" + +#: transport-helper.c:841 +#, c-format +msgid "helper reported unexpected status of %s" +msgstr "yardฤฑmcฤฑ %s beklenmedik durumu bildirdi" + +#: transport-helper.c:924 +#, c-format +msgid "helper %s does not support dry-run" +msgstr "%s yardฤฑmcฤฑsฤฑ 'dry-run' desteklemiyor" + +#: transport-helper.c:927 +#, c-format +msgid "helper %s does not support --signed" +msgstr "%s yardฤฑmcฤฑsฤฑ --signed desteklemiyor" + +#: transport-helper.c:930 +#, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "%s yardฤฑmcฤฑsฤฑ --signed=if-asked desteklemiyor" + +#: transport-helper.c:935 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "%s yardฤฑmcฤฑsฤฑ --atomic desteklemiyor" + +#: transport-helper.c:941 +#, c-format +msgid "helper %s does not support 'push-option'" +msgstr "%s yardฤฑmcฤฑsฤฑ 'push-option' desteklemiyor" + +#: transport-helper.c:1040 +msgid "remote-helper doesn't support push; refspec needed" +msgstr "remote-helper itme desteklemiyor; baลvuru belirteci gerekli" + +#: transport-helper.c:1045 +#, c-format +msgid "helper %s does not support 'force'" +msgstr "%s yardฤฑmcฤฑsฤฑ 'force' desteklemiyor" + +#: transport-helper.c:1092 +msgid "couldn't run fast-export" +msgstr "fast-export รงalฤฑลtฤฑrฤฑlamadฤฑ" + +#: transport-helper.c:1097 +msgid "error while running fast-export" +msgstr "fast-export รงalฤฑลtฤฑrฤฑlฤฑrken hata" + +#: transport-helper.c:1122 +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch.\n" +msgstr "" +"Ortak baลvuru yok ve hiรง belirtilmemiล; bir ลey yapฤฑlmayacak.\n" +"Belki de bir dal belirtmelisiniz.\n" + +#: transport-helper.c:1203 +#, c-format +msgid "unsupported object format '%s'" +msgstr "desteklenmeyen nesne biรงimi '%s'" + +#: transport-helper.c:1212 +#, c-format +msgid "malformed response in ref list: %s" +msgstr "baลvuru listesinde hatalฤฑ oluลturulmuล yanฤฑt: %s" + +#: transport-helper.c:1364 +#, c-format +msgid "read(%s) failed" +msgstr "read(%s) baลarฤฑsฤฑz oldu" + +#: transport-helper.c:1391 +#, c-format +msgid "write(%s) failed" +msgstr "write(%s) baลarฤฑsฤฑz oldu" + +#: transport-helper.c:1440 +#, c-format +msgid "%s thread failed" +msgstr "%s iล parรงacฤฑฤฤฑ baลarฤฑsฤฑz oldu" + +#: transport-helper.c:1444 +#, c-format +msgid "%s thread failed to join: %s" +msgstr "%s iล parรงacฤฑฤฤฑ eklenemedi: %s" + +#: transport-helper.c:1463 transport-helper.c:1467 +#, 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:1504 +#, c-format +msgid "%s process failed to wait" +msgstr "%s iลlemi bekleyemedi" + +#: transport-helper.c:1508 +#, c-format +msgid "%s process failed" +msgstr "%s iลlemi baลarฤฑsฤฑz oldu" + +#: transport-helper.c:1526 transport-helper.c:1535 +msgid "can't start thread for copying data" +msgstr "veri kopyalama iรงin iล parรงacฤฑฤฤฑ baลlatฤฑlamฤฑyor" + +#: 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:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport: Geรงersiz derinlik seรงeneฤi '%s'" + +#: transport.c:269 +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:270 +msgid "server options require protocol version 2 or later" +msgstr "sunucu seรงenekleri protokol sรผrรผm 2 veya sonrasฤฑnฤฑ gerektirir" + +#: transport.c:712 +msgid "could not parse transport.color.* config" +msgstr "transport.color.* yapฤฑlandฤฑrmasฤฑ ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: transport.c:785 +msgid "support for protocol v2 not implemented yet" +msgstr "protokol v2 desteฤi henรผz yerine getirilmedi" + +#: transport.c:919 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "'%s' yapฤฑlandฤฑrmasฤฑ iรงin bilinmeyen deฤer: %s" + +#: transport.c:985 +#, c-format +msgid "transport '%s' not allowed" +msgstr "'%s' taลฤฑyฤฑcฤฑsฤฑna izin verilmiyor" + +#: transport.c:1038 +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync artฤฑk desteklenmiyor" + +#: transport.c:1140 +#, 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:1144 +#, 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:1152 +msgid "Aborting." +msgstr "ฤฐptal ediliyor" + +#: transport.c:1297 +msgid "failed to push all needed submodules" +msgstr "gereken tรผm altmodรผller itilemedi" + +#: 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:113 +#, 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ฤฑล ile aลaฤฤฑdaki dosyalardaki yerel deฤiลikliklerin รผzerine yazฤฑlacak:\n" +"%%sLรผtfen dal deฤiลtirmeden รถnce deฤiลikliklerinizi iลleyin veya zulalayฤฑn." + +#: unpack-trees.c:115 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"รฤฑkฤฑล ile aลaฤฤฑdaki dosyalardaki yerel deฤiลikliklerin รผzerine yazฤฑlacak:\n" +"%%s" + +#: unpack-trees.c:118 +#, 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 iลleyin veya zulalayฤฑn." + +#: unpack-trees.c:120 +#, 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:123 +#, 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 iลleyin veya zulalayฤฑn." + +#: unpack-trees.c:125 +#, 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:130 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in them:\n" +"%s" +msgstr "" +"Aลaฤฤฑdaki dizinleri gรผncellemek iรงlerindeki izlenmeyen dosyalarฤฑ kaybeder:\n" +"%s" + +#: unpack-trees.c:134 +#, 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ฤฑล ile 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:136 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"รฤฑkฤฑล ile aลaฤฤฑdaki izlenmeyen รงalฤฑลma aฤacฤฑ dosyalarฤฑ kaldฤฑrฤฑlacak:\n" +"%%s" + +#: unpack-trees.c:139 +#, 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:141 +#, 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:144 +#, 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:146 +#, 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:152 +#, 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ฤฑล ile 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:154 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"รฤฑkฤฑล ile aลaฤฤฑdaki izlenmeyen รงalฤฑลma aฤacฤฑ dosyalarฤฑnฤฑn รผzerine " +"yazฤฑlacak:\n" +"%%s" + +#: unpack-trees.c:157 +#, 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:159 +#, 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:162 +#, 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:164 +#, 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:172 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "'%s' girdisi '%s' ile รผst รผste biniyor. Baฤlanamฤฑyor." + +#: unpack-trees.c:175 +#, c-format +msgid "" +"Cannot update submodule:\n" +"%s" +msgstr "" +"Altmodรผl gรผncellenemiyor:\n" +"%s" + +#: unpack-trees.c:178 +#, c-format +msgid "" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" +"%s" +msgstr "" +"Aลaฤฤฑdaki yollar gรผncel deฤil ve seyrek dizgilere raฤmen terk edilmiล:\n" +"%s" + +#: unpack-trees.c:180 +#, c-format +msgid "" +"The following paths are unmerged and were left despite sparse patterns:\n" +"%s" +msgstr "" +"Aลaฤฤฑdaki yollar birleลtirilmemiล ve seyrek dizgilere raฤmen terk edilmiล:\n" +"%s" + +#: unpack-trees.c:182 +#, c-format +msgid "" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" +"%s" +msgstr "" +"Aลaฤฤฑdaki yollar halihazฤฑrda vardฤฑ ve buna gรถre, seyrek dizgilere raฤmen " +"gรผncellenmedi:\n" +"%s" + +#: unpack-trees.c:262 +#, c-format +msgid "Aborting\n" +msgstr "ฤฐptal ediliyor\n" + +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" +"Yukarฤฑdaki yollarฤฑ onardฤฑktan sonra 'git sparse-checkout reapply' yapmak " +"isteyebilirsiniz.\n" + +#: unpack-trees.c:350 +msgid "Updating files" +msgstr "Dosyalar gรผncelleniyor" + +#: unpack-trees.c:382 +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:1498 +msgid "Updating index flags" +msgstr "ฤฐndeks bayraklarฤฑ gรผncelleniyor" + +#: upload-pack.c:1516 +msgid "expected flush after fetch arguments" +msgstr "getir deฤiลkenlerinden sonra floล bekleniyordu" + +#: 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:236 builtin/am.c:2116 +#, c-format +msgid "failed to read '%s'" +msgstr "'%s' okunamadฤฑ" + +#: worktree.c:283 +#, 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:294 +#, 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:306 +#, c-format +msgid "'%s' does not exist" +msgstr "'%s' mevcut deฤil" + +#: worktree.c:312 +#, c-format +msgid "'%s' is not a .git file, error code %d" +msgstr "'%s' bir .git dosyasฤฑ deฤil, hata kodu %d" + +#: worktree.c:321 +#, c-format +msgid "'%s' does not point back to '%s'" +msgstr "'%s' ลuna geri iลaret etmiyor: '%s'" + +#: worktree.c:587 +msgid "not a directory" +msgstr "bir dizin deฤil" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr ".git bir dosya deฤil" + +#: worktree.c:598 +msgid ".git file broken" +msgstr ".git dosyasฤฑ bozuk" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr ".git dosyasฤฑ doฤru deฤil" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "geรงerli bir yol deฤil" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "depo konumu bulunamฤฑyor: .git bir dosya deฤil" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "depo konumu bulunamฤฑyor: .git dosyasฤฑ bozuk" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "okunamayan gitdir" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "doฤru olmayan gitdir" + +#: wrapper.c:197 wrapper.c:367 +#, c-format +msgid "could not open '%s' for reading and writing" +msgstr "'%s' okuma ve yazma iรงin aรงฤฑlamadฤฑ" + +#: wrapper.c:398 wrapper.c:599 +#, c-format +msgid "unable to access '%s'" +msgstr "'%s' eriลilemiyor" + +#: wrapper.c:607 +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:1070 +msgid "Changes to be committed:" +msgstr "ฤฐลlenecek deฤiลiklikler:" + +#: wt-status.c:234 wt-status.c:1079 +msgid "Changes not staged for commit:" +msgstr "ฤฐลleme iรงin hazฤฑrlanmamฤฑล deฤiลiklikler:" + +#: wt-status.c:238 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr " (iลlenecekleri 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 " (iลlenecekleri 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 " (iลlenecekler arasฤฑna koymak iรงin \"git %s <dosya>...\" kullanฤฑn)" + +#: wt-status.c:266 +msgid "both deleted:" +msgstr "ikimiz de sildik:" + +#: wt-status.c:268 +msgid "added by us:" +msgstr "biz ekledik:" + +#: wt-status.c:270 +msgid "deleted by them:" +msgstr "onlar sildi:" + +#: wt-status.c:272 +msgid "added by them:" +msgstr "onlar ekledi:" + +#: wt-status.c:274 +msgid "deleted by us:" +msgstr "biz sildik:" + +#: wt-status.c:276 +msgid "both added:" +msgstr "ikimiz de ekledik:" + +#: wt-status.c:278 +msgid "both modified:" +msgstr "ikimiz de deฤiลtirdik:" + +#: wt-status.c:288 +msgid "new file:" +msgstr "yeni dosya:" + +#: wt-status.c:290 +msgid "copied:" +msgstr "kopyalandฤฑ:" + +#: wt-status.c:292 +msgid "deleted:" +msgstr "silindi:" + +#: wt-status.c:294 +msgid "modified:" +msgstr "deฤiลtirildi:" + +#: wt-status.c:296 +msgid "renamed:" +msgstr "yeniden adlandฤฑrฤฑldฤฑ:" + +#: wt-status.c:298 +msgid "typechange:" +msgstr "tรผrรผ deฤiลtirildi:" + +#: wt-status.c:300 +msgid "unknown:" +msgstr "bilinmiyor" + +#: wt-status.c:302 +msgid "unmerged:" +msgstr "birleลtirilmedi:" + +#: wt-status.c:382 +msgid "new commits, " +msgstr "yeni iลlemeler, " + +#: wt-status.c:384 +msgid "modified content, " +msgstr "deฤiลtirilen iรงerik, " + +#: wt-status.c:386 +msgid "untracked content, " +msgstr "izlenmeyen iรงerik, " + +#: wt-status.c:903 +#, 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:934 +msgid "Submodules changed but not updated:" +msgstr "Deฤiลtirilen; ancak gรผncellenmeyen altmodรผller:" + +#: wt-status.c:936 +msgid "Submodule changes to be committed:" +msgstr "ฤฐลlenecek altmodรผl deฤiลiklikleri:" + +#: wt-status.c:1018 +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:1110 +#, 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:1140 +msgid "You have unmerged paths." +msgstr "Birleลtirilmemiล yollarฤฑnฤฑz var." + +#: wt-status.c:1143 +msgid " (fix conflicts and run \"git commit\")" +msgstr " (รงakฤฑลmalarฤฑ onar ve \"git commit\" รงalฤฑลtฤฑr)" + +#: wt-status.c:1145 +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr " (birleลtirmeyi iptal etmek iรงin \"git merge --abort\" kullanฤฑn)" + +#: wt-status.c:1149 +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:1152 +msgid " (use \"git commit\" to conclude merge)" +msgstr " (birleลtirmeyi sonuรงlandฤฑrmak iรงin \"git commit\" kullanฤฑn)" + +#: wt-status.c:1161 +msgid "You are in the middle of an am session." +msgstr "Bir 'am' oturumunun tam ortasฤฑndasฤฑnฤฑz." + +#: wt-status.c:1164 +msgid "The current patch is empty." +msgstr "Mevcut yama boล." + +#: wt-status.c:1168 +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:1170 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " (bu yamayฤฑ atlamak iรงin \"git am --skip\" kullanฤฑn" + +#: wt-status.c:1172 +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:1305 +msgid "git-rebase-todo is missing." +msgstr "git-rebase-todo eksik" + +#: wt-status.c:1307 +msgid "No commands done." +msgstr "Yerine getirilen bir komut yok." + +#: wt-status.c:1310 +#, 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:1321 +#, c-format +msgid " (see more in file %s)" +msgstr " (ek bilgi iรงin %s dosyasฤฑna bakฤฑn)" + +#: wt-status.c:1326 +msgid "No commands remaining." +msgstr "Kalan komut yok." + +#: wt-status.c:1329 +#, 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:1337 +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:1349 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "ลu anda '%s' dalฤฑnฤฑ '%s' รผzerine yeniden temellendiriyorsunuz." + +#: wt-status.c:1354 +msgid "You are currently rebasing." +msgstr "ลu anda yeniden temellendirme yapmaktasฤฑnฤฑz." + +#: wt-status.c:1367 +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:1369 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " (bu yamayฤฑ atlamak iรงin \"git rebase --skip\" kullanฤฑn)" + +#: wt-status.c:1371 +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:1378 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " (tรผm รงakฤฑลmalar onarฤฑldฤฑ: \"git rebase --continue\" รงalฤฑลtฤฑr)" + +#: wt-status.c:1382 +#, 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 iลlemeyi " +"parรงalara bรถlรผyorsunuz." + +#: wt-status.c:1387 +msgid "You are currently splitting a commit during a rebase." +msgstr "" +"ลu anda yeniden temellendirme sฤฑrasฤฑnda bir iลlemeyi parรงalara bรถlรผyorsunuz." + +#: wt-status.c:1390 +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:1394 +#, 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 iลlemeyi " +"dรผzenliyorsunuz." + +#: wt-status.c:1399 +msgid "You are currently editing a commit during a rebase." +msgstr "ลu anda yeniden temellendirme sฤฑrasฤฑnda bir iลlemeyi dรผzenliyorsunuz." + +#: wt-status.c:1402 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr " (geรงerli iลlemeyi deฤiลtirmek iรงin \"git commit --amend\" kullanฤฑn)" + +#: wt-status.c:1404 +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:1415 +msgid "Cherry-pick currently in progress." +msgstr "Seรง-al ลu anda sรผrmekte." + +#: wt-status.c:1418 +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "ลu anda %s iลlemesini seรง-al yapฤฑyorsunuz." + +#: wt-status.c:1425 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr " (รงakฤฑลmalarฤฑ onar ve \"git cherry-pick --continue\" รงalฤฑลtฤฑr)" + +#: wt-status.c:1428 +msgid " (run \"git cherry-pick --continue\" to continue)" +msgstr " (sรผrdรผrmek iรงin \"git cherry-pick --continue\" รงalฤฑลtฤฑr)" + +#: wt-status.c:1431 +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:1433 +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:1435 +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:1445 +msgid "Revert currently in progress." +msgstr "Geriye al ลu anda sรผrmekte." + +#: wt-status.c:1448 +#, c-format +msgid "You are currently reverting commit %s." +msgstr "ลu anda %s iลlemesini geri alฤฑyorsunuz." + +#: wt-status.c:1454 +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr " (รงakฤฑลmalarฤฑ onar ve \"git revert --continue\" รงalฤฑลtฤฑr)" + +#: wt-status.c:1457 +msgid " (run \"git revert --continue\" to continue)" +msgstr " (sรผrdรผrmek iรงin \"git revert --continue\" รงalฤฑลtฤฑr)" + +#: wt-status.c:1460 +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr " (tรผm รงakฤฑลmalar onarฤฑldฤฑ: \"git revert --continue\" รงalฤฑลtฤฑr)" + +#: wt-status.c:1462 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (bu yamayฤฑ atlamak iรงin \"git revert --skip\" kullanฤฑn)" + +#: wt-status.c:1464 +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:1474 +#, 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:1478 +msgid "You are currently bisecting." +msgstr "ลu anda ikili arama yapฤฑyorsunuz" + +#: wt-status.c:1481 +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:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "ฤฐzlenen dosyalarฤฑn %%%d mevcut olduฤu aralฤฑklฤฑ bir รงฤฑkฤฑลtasฤฑnฤฑz." + +#: wt-status.c:1731 +msgid "On branch " +msgstr "รzerinde bulunulan dal: " + +#: wt-status.c:1738 +msgid "interactive rebase in progress; onto " +msgstr "ลunun รผzerine etkileลimli yeniden temellendirme sรผrmekte: " + +#: wt-status.c:1740 +msgid "rebase in progress; onto " +msgstr "ลunun รผzerine yeniden temellendirme sรผrmekte: " + +#: wt-status.c:1750 +msgid "Not currently on any branch." +msgstr "ลu anda bir dal รผzerinde deฤil." + +#: wt-status.c:1767 +msgid "Initial commit" +msgstr "ฤฐlk iลleme" + +#: wt-status.c:1768 +msgid "No commits yet" +msgstr "Henรผz bir iลleme yok" + +#: wt-status.c:1782 +msgid "Untracked files" +msgstr "ฤฐzlenmeyen dosyalar" + +#: wt-status.c:1784 +msgid "Ignored files" +msgstr "Yok sayฤฑlan dosyalar" + +#: wt-status.c:1788 +#, 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 ortaya dรถkรผlmesi %.2f saniye sรผrdรผ. 'status -uno'\n" +"bunu hฤฑzlandฤฑrabilir; ancak yeni dosyalarฤฑ eklemeyi unutmamanฤฑz\n" +"konusunda dikkatli olmalฤฑsฤฑnฤฑz (ek bilgi iรงin 'git help status')." + +#: wt-status.c:1794 +#, c-format +msgid "Untracked files not listed%s" +msgstr "ฤฐzlenmeyen dosyalar listelenmiyor%s" + +#: wt-status.c:1796 +msgid " (use -u option to show untracked files)" +msgstr " (izlenmeyen dosyalarฤฑ gรถstermek iรงin -u seรงeneฤini kullanฤฑn)" + +#: wt-status.c:1802 +msgid "No changes" +msgstr "Deฤiลiklik yok" + +#: wt-status.c:1807 +#, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "" +"ฤฐลlemeye eklenen deฤiลiklik yok (\"git add\" ve/veya \"git commit -a\" " +"kullanฤฑn)\n" + +#: wt-status.c:1811 +#, c-format +msgid "no changes added to commit\n" +msgstr "ฤฐลlemeye eklenen deฤiลiklik yok\n" + +#: wt-status.c:1815 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "" +"iลlemeye bir ลey eklenmedi; ancak izlenmeyen dosyalar var (izlemek iรงin\n" +"\"git add\" kullanฤฑn)\n" + +#: wt-status.c:1819 +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "iลlemeye bir ลey eklenmedi; ancak izlenmeyen dosyalar var\n" + +#: wt-status.c:1823 +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "" +"ฤฐลlenecek bir ลey yok (dosyalar oluลturun/kopyalayฤฑn ve izlemek iรงin \"git " +"add\" kullanฤฑn)\n" + +#: wt-status.c:1827 wt-status.c:1833 +#, c-format +msgid "nothing to commit\n" +msgstr "ฤฐลlenecek bir ลey yok\n" + +#: wt-status.c:1830 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "" +"ฤฐลlenecek bir ลey yok (izlenmeyen dosyalarฤฑ gรถstermek iรงin -u kullanฤฑn)\n" + +#: wt-status.c:1835 +#, c-format +msgid "nothing to commit, working tree clean\n" +msgstr "ฤฐลlenecek bir ลey yok, รงalฤฑลma aฤacฤฑ temiz\n" + +#: wt-status.c:1940 +msgid "No commits yet on " +msgstr "ลurada henรผz bir iลleme yok: " + +#: wt-status.c:1944 +msgid "HEAD (no branch)" +msgstr "HEAD (dal yok)" + +#: wt-status.c:1975 +msgid "different" +msgstr "deฤiลik" + +#: wt-status.c:1977 wt-status.c:1985 +msgid "behind " +msgstr "ลunun arkasฤฑnda: " + +#: wt-status.c:1980 wt-status.c:1983 +msgid "ahead " +msgstr "ลunun รถnรผnde: " + +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c:2505 +#, c-format +msgid "cannot %s: You have unstaged changes." +msgstr "%s yapฤฑlamฤฑyor: Hazฤฑrlanmamฤฑล deฤiลiklikleriniz var." + +#: wt-status.c:2511 +msgid "additionally, your index contains uncommitted changes." +msgstr "Ek olarak, indeksiniz iลlenmemiล deฤiลiklikler iรงeriyor." + +#: wt-status.c:2513 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "%s yapฤฑlamฤฑyor: ฤฐndeksiniz iลlenmemiล deฤiลiklikler iรงeriyor." + +#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#, 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:285 +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:272 builtin/rev-parse.c:904 +msgid "Could not read the index" +msgstr "ฤฐndeks okunamadฤฑ" + +#: builtin/add.c:283 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "'%s' yazฤฑm iรงin aรงฤฑlamadฤฑ." + +#: builtin/add.c:287 +msgid "Could not write patch" +msgstr "Yama yazฤฑlamadฤฑ" + +#: builtin/add.c:290 +msgid "editing patch failed" +msgstr "yamayฤฑ dรผzenleme baลarฤฑsฤฑz" + +#: builtin/add.c:293 +#, c-format +msgid "Could not stat '%s'" +msgstr "'%s' dosya bilgileri alฤฑnamadฤฑ" + +#: builtin/add.c:295 +msgid "Empty patch. Aborted." +msgstr "Boล yama. ฤฐptal edildi." + +#: builtin/add.c:300 +#, c-format +msgid "Could not apply '%s'" +msgstr "'%s' uygulanamadฤฑ" + +#: builtin/add.c:308 +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:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 +msgid "dry run" +msgstr "sฤฑnama turu" + +#: builtin/add.c:331 +msgid "interactive picking" +msgstr "etkileลimli seรงim" + +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 +msgid "select hunks interactively" +msgstr "parรงalarฤฑ etkileลimli olarak seรง" + +#: builtin/add.c:333 +msgid "edit current diff and apply" +msgstr "geรงerli diff'i dรผzenle ve uygula" + +#: builtin/add.c:334 +msgid "allow adding otherwise ignored files" +msgstr "baลka tรผrlรผ yok sayฤฑlan dosyalarฤฑn eklenmesine izin ver" + +#: builtin/add.c:335 +msgid "update tracked files" +msgstr "izlenen dosyalarฤฑ gรผncelle" + +#: builtin/add.c:336 +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:337 +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:338 +msgid "add changes from all tracked and untracked files" +msgstr "tรผm izlenen/izlenmeyen dosyalardan deฤiลiklikleri ekle" + +#: builtin/add.c:341 +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:343 +msgid "don't add, only refresh the index" +msgstr "ekleme, yalnฤฑzca indeksi yenile" + +#: builtin/add.c:344 +msgid "just skip files which cannot be added because of errors" +msgstr "yalnฤฑzca hatalardan dolayฤฑ eklenemeyen dosyalarฤฑ atla" + +#: builtin/add.c:345 +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:347 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:349 +msgid "warn when adding an embedded repository" +msgstr "gรถmรผlรผ bir depo eklenirken uyar" + +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "'git stash -p' iรงin arka uรง" + +#: builtin/add.c:369 +#, 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:397 +#, c-format +msgid "adding embedded git repository: %s" +msgstr "gรถmรผlรผ git deposu ekleniyor: %s" + +#: builtin/add.c:416 +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:425 +msgid "adding files failed" +msgstr "dosya ekleme baลarฤฑsฤฑz" + +#: builtin/add.c:453 builtin/commit.c:345 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--pathspec-from-file, --interactive/--patch ile uyumsuz" + +#: builtin/add.c:470 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file, --edit ile uyumsuz" + +#: builtin/add.c:482 +msgid "-A and -u are mutually incompatible" +msgstr "-A ve -u karลฤฑlฤฑklฤฑ olarak uyumlu" + +#: builtin/add.c:485 +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:489 +#, 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:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "--pathspec-from-file yol belirteci deฤiลkenleri ile uyumsuz" + +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul, --pathspec-from-file gerektiriyor" + +#: builtin/add.c:518 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "Hiรงbir ลey belirtilmedi, hiรงbir ลey eklenmedi.\n" + +#: builtin/add.c:520 +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:160 +#, c-format +msgid "invalid committer: %s" +msgstr "geรงersiz iลleyici: %s" + +#: builtin/am.c:366 +msgid "could not parse author script" +msgstr "yazar betiฤi ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: builtin/am.c:450 +#, c-format +msgid "'%s' was deleted by the applypatch-msg hook" +msgstr "'%s' applypatch-msg kancasฤฑ tarafฤฑndan silindi" + +#: builtin/am.c:492 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Hatalฤฑ oluลturulmuล girdi satฤฑrฤฑ: '%s'." + +#: builtin/am.c:530 +#, 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:556 +msgid "fseek failed" +msgstr "fseek baลarฤฑsฤฑz oldu" + +#: builtin/am.c:744 +#, c-format +msgid "could not parse patch '%s'" +msgstr "'%s' yamasฤฑ ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: builtin/am.c:809 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Bir kerede yalnฤฑzca bir StGIT yama serisi uygulanabilir" + +#: builtin/am.c:857 +msgid "invalid timestamp" +msgstr "geรงersiz zaman damgasฤฑ" + +#: builtin/am.c:862 builtin/am.c:874 +msgid "invalid Date line" +msgstr "geรงersiz tarih satฤฑrฤฑ" + +#: builtin/am.c:869 +msgid "invalid timezone offset" +msgstr "geรงersiz zaman dilimi ofseti" + +#: builtin/am.c:962 +msgid "Patch format detection failed." +msgstr "Yama biรงimi algฤฑlamasฤฑ baลarฤฑsฤฑz." + +#: builtin/am.c:967 builtin/clone.c:409 +#, c-format +msgid "failed to create directory '%s'" +msgstr "'%s' dizini oluลturulamadฤฑ" + +#: builtin/am.c:972 +msgid "Failed to split patches." +msgstr "Yamalar parรงalanฤฑp bรถlรผnemedi." + +#: builtin/am.c:1103 +#, 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:1104 +#, 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:1105 +#, 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:1188 +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:1216 +msgid "Patch is empty." +msgstr "Yama boล." + +#: builtin/am.c:1281 +#, c-format +msgid "missing author line in commit %s" +msgstr "%s iลlemesinde yazar satฤฑrฤฑ eksik" + +#: builtin/am.c:1284 +#, c-format +msgid "invalid ident line: %.*s" +msgstr "geรงersiz tanฤฑmlama satฤฑrฤฑ: %.*s" + +#: builtin/am.c:1503 +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:1505 +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:1524 +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:1530 +msgid "Falling back to patching base and 3-way merge..." +msgstr "Temeli yamalamaya ve 3 yรถnlรผ birleลtirmeye geri รงekiliniyor..." + +#: builtin/am.c:1556 +msgid "Failed to merge in the changes." +msgstr "Deฤiลiklikler birleลtirilemedi." + +#: builtin/am.c:1588 +msgid "applying to an empty history" +msgstr "boล bir geรงmiลe uygulanฤฑyor" + +#: builtin/am.c:1639 builtin/am.c:1643 +#, c-format +msgid "cannot resume: %s does not exist." +msgstr "sรผrdรผrรผlemiyor: %s yok" + +#: builtin/am.c:1661 +msgid "Commit Body is:" +msgstr "ฤฐลleme 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:1671 +#, 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:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "indeks dosyasฤฑ yazฤฑlamฤฑyor" + +#: builtin/am.c:1721 +#, c-format +msgid "Dirty index: cannot apply patches (dirty: %s)" +msgstr "Kirli indeks: Yamalar uygulanamฤฑyor (kirli: %s)" + +#: builtin/am.c:1761 builtin/am.c:1829 +#, c-format +msgid "Applying: %.*s" +msgstr "Uygulanฤฑyor: %.*s" + +#: builtin/am.c:1778 +msgid "No changes -- Patch already applied." +msgstr "Deฤiลiklik yok -- Yama halihazฤฑrda uygulandฤฑ." + +#: builtin/am.c:1784 +#, c-format +msgid "Patch failed at %s %.*s" +msgstr "Yama ลurada baลarฤฑsฤฑz oldu: %s %.*s" + +#: builtin/am.c:1788 +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:1832 +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:1839 +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:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 +#, c-format +msgid "Could not parse object '%s'." +msgstr "'%s' nesnesi ayrฤฑลtฤฑrฤฑlamadฤฑ." + +#: builtin/am.c:1998 +msgid "failed to clean index" +msgstr "indeks temizlenemedi" + +#: builtin/am.c:2042 +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:2149 +#, c-format +msgid "Invalid value for --patch-format: %s" +msgstr "Geรงersiz --patch-format deฤeri: %s" + +#: builtin/am.c:2191 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "--show-current-patch iรงin geรงersiz deฤer: %s" + +#: builtin/am.c:2195 +#, 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:2226 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" +msgstr "git am [<seรงenekler>] [(<mbox> | <posta-dizin>)...]" + +#: builtin/am.c:2227 +msgid "git am [<options>] (--continue | --skip | --abort)" +msgstr "git am [<seรงenekler>] (--continue | --skip | --abort)" + +#: builtin/am.c:2233 +msgid "run interactively" +msgstr "etkileลimli olarak รงalฤฑลtฤฑr" + +#: builtin/am.c:2235 +msgid "historical option -- no-op" +msgstr "tarihi seรงenek -- no-op" + +#: builtin/am.c:2237 +msgid "allow fall back on 3way merging if needed" +msgstr "gerekirse 3 yรถnlรผ birleลtirmeye geri รงekilmeye izin ver" + +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 +msgid "be quiet" +msgstr "sessiz ol" + +#: builtin/am.c:2240 +msgid "add a Signed-off-by line to the commit message" +msgstr "iลleme iletisine bir Signed-off-by satฤฑrฤฑ ekle" + +#: builtin/am.c:2243 +msgid "recode into utf8 (default)" +msgstr "utf8 olarak yeniden kodla (รถntanฤฑmlฤฑ)" + +#: builtin/am.c:2245 +msgid "pass -k flag to git-mailinfo" +msgstr "'git-mailinfo'ya -k bayraฤฤฑnฤฑ geรงir" + +#: builtin/am.c:2247 +msgid "pass -b flag to git-mailinfo" +msgstr "'git-mailinfo'ya -b bayraฤฤฑnฤฑ geรงir" + +#: builtin/am.c:2249 +msgid "pass -m flag to git-mailinfo" +msgstr "'git-mailinfo'ya -m bayraฤฤฑnฤฑ geรงir" + +#: builtin/am.c:2251 +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:2254 +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:2257 +msgid "strip everything before a scissors line" +msgstr "bir kesim รงizgisinden รถnceki her ลeyi รงฤฑkar" + +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 +msgid "pass it through git-apply" +msgstr "git-apply aracฤฑlฤฑฤฤฑyla geรงir" + +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 +msgid "n" +msgstr "n" + +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 +msgid "format" +msgstr "biรงim" + +#: builtin/am.c:2283 +msgid "format the patch(es) are in" +msgstr "yama biรงimi" + +#: builtin/am.c:2289 +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:2291 +msgid "continue applying patches after resolving a conflict" +msgstr "bir รงakฤฑลmayฤฑ รงรถzdรผkten sonra yamalarฤฑ uygulamayฤฑ sรผrdรผr" + +#: builtin/am.c:2294 +msgid "synonyms for --continue" +msgstr "--continue eลanlamlฤฑlarฤฑ" + +#: builtin/am.c:2297 +msgid "skip the current patch" +msgstr "geรงerli yamayฤฑ atla" + +#: builtin/am.c:2300 +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:2303 +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:2307 +msgid "show the patch being applied" +msgstr "uygulanmakta olan yamayฤฑ gรถster" + +#: builtin/am.c:2312 +msgid "lie about committer date" +msgstr "iลleyici tarihi hakkฤฑnda yalan sรถyle" + +#: builtin/am.c:2314 +msgid "use current timestamp for author date" +msgstr "yazar tarihi iรงin geรงerli zaman damgasฤฑnฤฑ kullan" + +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 +msgid "key-id" +msgstr "key-id" + +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 +msgid "GPG-sign commits" +msgstr "GPG imzalฤฑ iลlemeler" + +#: builtin/am.c:2320 +msgid "(internal use for git-rebase)" +msgstr "(git-rebase iรงin iรง kullanฤฑm)" + +#: builtin/am.c:2338 +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:2345 +msgid "failed to read the index" +msgstr "indeks okunamadฤฑ" + +#: builtin/am.c:2360 +#, 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:2384 +#, 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:2390 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "ฤฐlerlemekte olan bir รงรถzรผm iลlemi yok, sรผrdรผrme yapmฤฑyoruz." + +#: builtin/am.c:2400 +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>] [<yama>...]" + +#: 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:23 +msgid "git bisect--helper --next-all" +msgstr "git bisect--helper --next-all" + +#: builtin/bisect--helper.c:24 +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:25 +msgid "git bisect--helper --bisect-clean-state" +msgstr "git bisect--helper --bisect-clean-state" + +#: builtin/bisect--helper.c:26 +msgid "git bisect--helper --bisect-reset [<commit>]" +msgstr "git bisect--helper --bisect-reset [<iลleme>]" + +#: builtin/bisect--helper.c:27 +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:28 +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:29 +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:30 +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:31 +msgid "" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" +msgstr "" +"git bisect--helper --bisect-start [--term-{new,bad}=<terim> --term-{old,good}" +"=<terim>] [--no-checkout] [--first-parent] [<kรถtรผ> [<iyi>...]] [--] " +"[<yollar>...]" + +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-auto-next" + +#: builtin/bisect--helper.c:35 +msgid "git bisect--helper --bisect-autostart" +msgstr "git bisect--helper --bisect-autostart" + +#: builtin/bisect--helper.c:97 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "'%s' dosyasฤฑ '%s' kipinde aรงฤฑlamฤฑyor" + +#: builtin/bisect--helper.c:104 +#, c-format +msgid "could not write to file '%s'" +msgstr "'%s' dosyasฤฑna yazฤฑlamadฤฑ" + +#: builtin/bisect--helper.c:143 +#, c-format +msgid "'%s' is not a valid term" +msgstr "'%s' geรงerli bir terim deฤil" + +#: builtin/bisect--helper.c:147 +#, 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:157 +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "'%s' teriminin anlamฤฑ deฤiลtirilemiyor" + +#: builtin/bisect--helper.c:167 +msgid "please use two different terms" +msgstr "lรผtfen iki deฤiลik terim kullanฤฑn" + +#: builtin/bisect--helper.c:207 +#, c-format +msgid "We are not bisecting.\n" +msgstr "ฤฐkili arama yapฤฑlmฤฑyor.\n" + +#: builtin/bisect--helper.c:215 +#, c-format +msgid "'%s' is not a valid commit" +msgstr "'%s' geรงerli bir iลleme deฤil" + +#: builtin/bisect--helper.c:224 +#, 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 <iลleme>' deneyin." + +#: builtin/bisect--helper.c:268 +#, c-format +msgid "Bad bisect_write argument: %s" +msgstr "Hatalฤฑ bisect_write deฤiลkeni: %s" + +#: builtin/bisect--helper.c:273 +#, c-format +msgid "couldn't get the oid of the rev '%s'" +msgstr "'%s' revizyonunun oid'si alฤฑnamadฤฑ" + +#: builtin/bisect--helper.c:285 +#, c-format +msgid "couldn't open the file '%s'" +msgstr "'%s' dosyasฤฑ aรงฤฑlamadฤฑ" + +#: builtin/bisect--helper.c:311 +#, 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:338 +#, 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:342 +#, 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:362 +#, c-format +msgid "bisecting only with a %s commit" +msgstr "yalnฤฑzca bir %s iลlemesi 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:370 +msgid "Are you sure [Y/n]? " +msgstr "Emin misiniz [Y/n]? " + +#: builtin/bisect--helper.c:431 +msgid "no terms defined" +msgstr "hiรงbir terim tanฤฑmlanmadฤฑ" + +#: builtin/bisect--helper.c:434 +#, 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:444 +#, 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:511 +msgid "revision walk setup failed\n" +msgstr "revizyonda gezinme ayarlamasฤฑ baลarฤฑsฤฑz oldu\n" + +#: builtin/bisect--helper.c:533 +#, c-format +msgid "could not open '%s' for appending" +msgstr "'%s' iliลtirme iรงin aรงฤฑlamadฤฑ" + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +msgid "'' is not a valid term" +msgstr "'' geรงerli bir terim deฤil" + +#: builtin/bisect--helper.c:674 +#, c-format +msgid "unrecognized option: '%s'" +msgstr "tanฤฑmlanamayan seรงenek: '%s'" + +#: builtin/bisect--helper.c:678 +#, 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:709 +msgid "bad HEAD - I need a HEAD" +msgstr "hatalฤฑ HEAD - Bana bir HEAD gerek" + +#: builtin/bisect--helper.c:724 +#, 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:745 +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:748 +msgid "bad HEAD - strange symbolic ref" +msgstr "hatalฤฑ HEAD - tuhaf sembolik baลvuru" + +#: builtin/bisect--helper.c:775 +#, c-format +msgid "invalid ref: '%s'" +msgstr "geรงersiz baลvuru: '%s'" + +#: builtin/bisect--helper.c:827 +msgid "You need to start by \"git bisect start\"\n" +msgstr "\"git bisect start\" ile baลlamalฤฑsฤฑnฤฑz\n" + +#. 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:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Bunu sizin yerinize benim yapmamฤฑ ister misiniz [Y/n]? " + +#: builtin/bisect--helper.c:866 +msgid "perform 'git bisect next'" +msgstr "'git bisect next' gerรงekleลtir" + +#: builtin/bisect--helper.c:868 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "terimleri .git/BISECT_TERMS konumuna yaz" + +#: builtin/bisect--helper.c:870 +msgid "cleanup the bisection state" +msgstr "ikili arama durumunu temizle" + +#: builtin/bisect--helper.c:872 +msgid "check for expected revs" +msgstr "beklenen baลvurular iรงin denetle" + +#: builtin/bisect--helper.c:874 +msgid "reset the bisection state" +msgstr "ikili arama durumunu sฤฑfฤฑrla" + +#: builtin/bisect--helper.c:876 +msgid "write out the bisection state in BISECT_LOG" +msgstr "ikili arama durumunu BISECT_LOG iรงine yaz" + +#: builtin/bisect--helper.c:878 +msgid "check and set terms in a bisection state" +msgstr "bir ikili arama durumundaki terimleri denetle ve ayarla" + +#: builtin/bisect--helper.c:880 +msgid "check whether bad or good terms exist" +msgstr "iyi veya kรถtรผ terimlerin olup olmadฤฑฤฤฑnฤฑ denetle" + +#: builtin/bisect--helper.c:882 +msgid "print out the bisect terms" +msgstr "ikili arama terimlerini yazdฤฑr" + +#: builtin/bisect--helper.c:884 +msgid "start the bisect session" +msgstr "ikili arama oturumunu baลlat" + +#: builtin/bisect--helper.c:886 +msgid "find the next bisection commit" +msgstr "bir sonraki ikili arama iลlemesini bul" + +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" +msgstr "" +"bir sonraki ikili arama durumunu doฤrula ve bir sonraki ikili arama " +"iลlemesini รงฤฑkฤฑล yap" + +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "henรผz baลlamamฤฑลsa ikili aramayฤฑ baลlat" + +#: builtin/bisect--helper.c:892 +msgid "no log for BISECT_WRITE" +msgstr "BISECT_WRITE iรงin gรผnlรผk yok" + +#: builtin/bisect--helper.c:910 +msgid "--write-terms requires two arguments" +msgstr "--write-terms iki deฤiลken gerektiriyor" + +#: builtin/bisect--helper.c:914 +msgid "--bisect-clean-state requires no arguments" +msgstr "--bisect-clean-state bir deฤiลken gerektirmiyor" + +#: builtin/bisect--helper.c:921 +msgid "--bisect-reset requires either no argument or a commit" +msgstr "--bisect-reset bir deฤiลken veya iลleme gerektirmiyor" + +#: builtin/bisect--helper.c:925 +msgid "--bisect-write requires either 4 or 5 arguments" +msgstr "--bisect-write 4 veya 5 deฤiลken gerektiriyor" + +#: builtin/bisect--helper.c:931 +msgid "--check-and-set-terms requires 3 arguments" +msgstr "--check-and-set-terms 3 deฤiลken gerektiriyor" + +#: builtin/bisect--helper.c:937 +msgid "--bisect-next-check requires 2 or 3 arguments" +msgstr "--bisect-next-check 2 veya 3 deฤiลken gerektiriyor" + +#: builtin/bisect--helper.c:943 +msgid "--bisect-terms requires 0 or 1 argument" +msgstr "--bisect-terms 0 veya 1 deฤiลken gerektiriyor" + +#: builtin/bisect--helper.c:952 +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next 0 deฤiลken gerektiriyor" + +#: builtin/bisect--helper.c:958 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--bisect-auto-next 0 deฤiลken gerektiriyor" + +#: builtin/bisect--helper.c:964 +msgid "--bisect-autostart does not accept arguments" +msgstr "--bisect-autostart herhangi bir deฤiลken almaz" + +#: builtin/blame.c:32 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git blame [<seรงenekler>] [<rev-sรงnk>] [<rev>] [--] <dosya>" + +#: builtin/blame.c:37 +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:410 +#, c-format +msgid "expecting a color: %s" +msgstr "bir renk bekleniyor: %s" + +#: builtin/blame.c:417 +msgid "must end with a color" +msgstr "bir renk ile bitmeli" + +#: builtin/blame.c:730 +#, c-format +msgid "invalid color '%s' in color.blame.repeatedLines" +msgstr "color.blame.repeatedLines iรงinde geรงersiz renk '%s'" + +#: builtin/blame.c:748 +msgid "invalid value for blame.coloring" +msgstr "blame.coloring iรงin geรงersiz deฤer" + +#: builtin/blame.c:845 +#, c-format +msgid "cannot find revision %s to ignore" +msgstr "yok saymak iรงin %s revizyonu bulunamฤฑyor" + +#: builtin/blame.c:867 +msgid "Show blame entries as we find them, incrementally" +msgstr "genel bakฤฑล girdilerini buldukรงa artan biรงimde gรถster" + +#: builtin/blame.c:868 +msgid "Do not show object names of boundary commits (Default: off)" +msgstr "sฤฑnฤฑr iลlemeleri iรงin nesne adlarฤฑnฤฑ gรถsterme (รntanฤฑmlฤฑ: Kapalฤฑ)" + +#: builtin/blame.c:869 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "kรถk iลlemelerini sฤฑnฤฑr olarak varsayma (รntanฤฑmlฤฑ: Kapalฤฑ)" + +#: builtin/blame.c:870 +msgid "Show work cost statistics" +msgstr "iล maliyet istatistiklerini gรถster" + +#: builtin/blame.c:871 +msgid "Force progress reporting" +msgstr "durum bildirmeyi zorla" + +#: builtin/blame.c:872 +msgid "Show output score for blame entries" +msgstr "genel bakฤฑล girdileri iรงin รงฤฑktฤฑ skorunu gรถster" + +#: builtin/blame.c:873 +msgid "Show original filename (Default: auto)" +msgstr "orijinal dosya adฤฑnฤฑ gรถster (รntanฤฑmlฤฑ: Otomatik)" + +#: builtin/blame.c:874 +msgid "Show original linenumber (Default: off)" +msgstr "orijinal satฤฑr numarasฤฑnฤฑ gรถster (รntanฤฑmlฤฑ: Kapalฤฑ)" + +#: builtin/blame.c:875 +msgid "Show in a format designed for machine consumption" +msgstr "makine iลlemesi iรงin tasarlanmฤฑล bir biรงimde gรถster" + +#: builtin/blame.c:876 +msgid "Show porcelain format with per-line commit information" +msgstr "okunabilir biรงimde her satฤฑr iรงin iลleme bilgisi ile gรถster" + +#: builtin/blame.c:877 +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:878 +msgid "Show raw timestamp (Default: off)" +msgstr "ham zaman damgasฤฑnฤฑ gรถster (รntanฤฑmlฤฑ: Kapalฤฑ)" + +#: builtin/blame.c:879 +msgid "Show long commit SHA1 (Default: off)" +msgstr "uzun iลleme SHA1'ini gรถster (รntanฤฑmlฤฑ: Kapalฤฑ)" + +#: builtin/blame.c:880 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "yazar adฤฑnฤฑ ve zaman damgasฤฑnฤฑ gizle (รntanฤฑmlฤฑ: Kapalฤฑ)" + +#: builtin/blame.c:881 +msgid "Show author email instead of name (Default: off)" +msgstr "yazar adฤฑ yerine e-postasฤฑnฤฑ gรถster (รntanฤฑmlฤฑ: Kapalฤฑ)" + +#: builtin/blame.c:882 +msgid "Ignore whitespace differences" +msgstr "boลluk ayrฤฑmlarฤฑnฤฑ yok say" + +#: builtin/blame.c:883 builtin/log.c:1808 +msgid "rev" +msgstr "revizyon" + +#: builtin/blame.c:883 +msgid "Ignore <rev> when blaming" +msgstr "suรงlarken <revizyon>'u yok say" + +#: builtin/blame.c:884 +msgid "Ignore revisions from <file>" +msgstr "<dosya>'dan olan revizyonlarฤฑ yok say" + +#: builtin/blame.c:885 +msgid "color redundant metadata from previous line differently" +msgstr "bir รถnceki dosyadan gereksiz รผstveriyi baลka biรงimde renklendir" + +#: builtin/blame.c:886 +msgid "color lines by age" +msgstr "satฤฑrlarฤฑ yaลฤฑna gรถre renklendir" + +#: builtin/blame.c:887 +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:888 +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:889 +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:890 builtin/blame.c:891 +msgid "score" +msgstr "skor" + +#: builtin/blame.c:890 +msgid "Find line copies within and across files" +msgstr "satฤฑr kopyalarฤฑnฤฑ dosyalar iรงinde ve arasฤฑnda ara" + +#: builtin/blame.c:891 +msgid "Find line movements within and across files" +msgstr "satฤฑr hareketlerini dosyalar iรงinde ve arasฤฑnda ara" + +#: builtin/blame.c:892 +msgid "n,m" +msgstr "n,m" + +#: builtin/blame.c:892 +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:944 +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:995 +msgid "4 years, 11 months ago" +msgstr "4 yฤฑl 11 ay รถnce" + +#: builtin/blame.c:1110 +#, 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:1156 +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 iลleme 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 iลleme nesnesi aranamadฤฑ" + +#: builtin/branch.c:240 +#, c-format +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "'%s' dalฤฑ silinemiyor, ลurada รงฤฑkฤฑล yapฤฑlmฤฑล: '%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:526 +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 iลlemeyi 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 iลlemeyi 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:656 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:434 +msgid "object" +msgstr "nesne" + +#: builtin/branch.c:657 +msgid "print only branches of the object" +msgstr "yalnฤฑzca nesnenin dallarฤฑnฤฑ yazdฤฑr" + +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 +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:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/verify-tag.c:38 +msgid "format to use for the output" +msgstr "รงฤฑktฤฑ iรงin kullanฤฑlacak biรงim" + +#: builtin/branch.c:682 builtin/clone.c:789 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD, refs/heads altฤฑnda bulunamadฤฑ!" + +#: builtin/branch.c:706 +msgid "--column and --verbose are incompatible" +msgstr "--column ve --verbose birbiriyle uyumsuz" + +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 +msgid "branch name required" +msgstr "dal adฤฑ gerekli" + +#: builtin/branch.c:751 +msgid "Cannot give description to detached HEAD" +msgstr "Ayrฤฑlmฤฑล HEAD'e aรงฤฑklama verilemiyor" + +#: builtin/branch.c:756 +msgid "cannot edit description of more than one branch" +msgstr "birden รงok dalฤฑn aรงฤฑklamasฤฑ dรผzenlenemiyor" + +#: builtin/branch.c:763 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "'%s' dalฤฑnda henรผz bir iลleme yok." + +#: builtin/branch.c:766 +#, c-format +msgid "No branch named '%s'." +msgstr "'%s' adฤฑnda bir dal yok." + +#: builtin/branch.c:781 +msgid "too many branches for a copy operation" +msgstr "bir kopyalama iลlemi iรงin รงok fazla dal" + +#: builtin/branch.c:790 +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:795 +msgid "too many arguments to set new upstream" +msgstr "yeni รผstkaynak ayarlamak iรงin รงok fazla deฤiลken" + +#: builtin/branch.c:799 +#, 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:802 builtin/branch.c:825 +#, c-format +msgid "no such branch '%s'" +msgstr "'%s' diye bir dal yok" + +#: builtin/branch.c:806 +#, c-format +msgid "branch '%s' does not exist" +msgstr "'%s' diye bir dal mevcut deฤil" + +#: builtin/branch.c:819 +msgid "too many arguments to unset upstream" +msgstr "รผst kaynaฤฤฑ kaldฤฑrmak iรงin รงok fazla deฤiลken" + +#: builtin/branch.c:823 +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:829 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "'%s' dalฤฑnฤฑn รผstkaynak bilgisi yok" + +#: builtin/branch.c:839 +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:843 +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/bugreport.c:15 +msgid "git version:\n" +msgstr "git sรผrรผmรผ:\n" + +#: builtin/bugreport.c:21 +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() '%s' hatasฤฑnฤฑ verip รงฤฑktฤฑ (%d)\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "derleyici bilgisi: " + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "libc bilgisi: " + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "bir git deposundan รงalฤฑลtฤฑrฤฑlmadฤฑ - gรถsterilecek kanca yok\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "git bugreport [-o|--output-directory <dosya>] [-s|--suffix <biรงim>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"Hata bildiriminiz iรงin teลekkรผrler!\n" +"Yaลadฤฑฤฤฑnฤฑz sorunu daha iyi anlayabilmemiz iรงin lรผtfen aลaฤฤฑdaki\n" +"sorularฤฑ yanฤฑtlayฤฑn.\n" +"\n" +"Hata oluลmadan รถnce ne yapฤฑyordunuz? (hata oluลturma adฤฑmlarฤฑ)\n" +"\n" +"Ne olmasฤฑnฤฑ bekliyordunuz? (beklenen davranฤฑล)\n" +"\n" +"Bunun yerine ne oldu? (gรถzlenen davranฤฑล)\n" +"\n" +"Olmasฤฑnฤฑ istediฤinizle gerรงekte olan arasฤฑndaki ayrฤฑm nedir?\n" +"\n" +"Eklemek istediฤiniz baลka bir ลey:\n" +"\n" +"Aลaฤฤฑda hata raporunun geri kalanฤฑna bir gรถz atฤฑn.\n" +"Paylaลmak istemediฤiniz satฤฑrlarฤฑ silebilirsiniz.\n" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "hata raporu dosyasฤฑ iรงin bir konum belirtin" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "dosya adฤฑ iรงin bir strftime biรงimli ek belirtin" + +#: builtin/bugreport.c:158 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "'%s' iรงin รถncรผ dizinler oluลturulamadฤฑ" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "Sistem Bilgisi" + +#: builtin/bugreport.c:168 +msgid "Enabled Hooks" +msgstr "Etkin Kancalar" + +#: builtin/bugreport.c:175 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "'%s' hata raporu dosyasฤฑ oluลturulamadฤฑ" + +#: builtin/bugreport.c:178 +#, c-format +msgid "unable to write to %s" +msgstr "%s dosyasฤฑna yazฤฑlamฤฑyor" + +#: builtin/bugreport.c:188 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "Hata raporu '%s' dosyasฤฑna yazฤฑldฤฑ.\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:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "ilerleme รงubuฤunu gรถsterme" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "ilerleme รงubuฤunu gรถster" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +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:74 builtin/pack-objects.c:3487 +msgid "similar to --all-progress when progress meter is shown" +msgstr "ilerleme รงubuฤu gรถsterildiฤinde --all-progress'e benzer" + +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "demet biรงim sรผrรผmรผnรผ belirt" + +#: builtin/bundle.c:96 +msgid "Need a repository to create a bundle." +msgstr "Bir demet oluลturmak iรงin bir depo gerekli." + +#: builtin/bundle.c:107 +msgid "do not show bundle details" +msgstr "demet ayrฤฑntฤฑlarฤฑnฤฑ gรถsterme" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "%s tamam\n" + +#: builtin/bundle.c:163 +msgid "Need a repository to unbundle." +msgstr "Demeti รงรถzmek iรงin bir depo gerekli" + +#: builtin/bundle.c:171 builtin/remote.c:1687 +msgid "be verbose; must be placed before a subcommand" +msgstr "ayrฤฑntฤฑlฤฑ anlat; bir altkomuttan รถnce yerleลtirilmelidir" + +#: builtin/bundle.c:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Bilinmeyen altkomut: %s" + +#: builtin/cat-file.c:598 +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:599 +msgid "" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" +msgstr "" +"git cat-file (--batch[=<biรงim>] | --batch-check[=<biรงim>]) [--follow-" +"symlinks] [--textconv | --filters]" + +#: builtin/cat-file.c:620 +msgid "only one batch option may be specified" +msgstr "yalnฤฑzca bir toplu iล seรงeneฤi belirtilebilir" + +#: builtin/cat-file.c:638 +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:639 +msgid "show object type" +msgstr "nesne tรผrรผnรผ gรถster" + +#: builtin/cat-file.c:640 +msgid "show object size" +msgstr "nesne boyutunu gรถster" + +#: builtin/cat-file.c:642 +msgid "exit with zero when there's no error" +msgstr "hata yoksa sฤฑfฤฑr koduyla รงฤฑk" + +#: builtin/cat-file.c:643 +msgid "pretty-print object's content" +msgstr "nesne iรงeriฤini okunabilir biรงimde gรถster" + +#: builtin/cat-file.c:645 +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:647 +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:648 +msgid "blob" +msgstr "ikili nesne" + +#: builtin/cat-file.c:649 +msgid "use a specific path for --textconv/--filters" +msgstr "--textconv/--filters iรงin belirli bir yol kullan" + +#: builtin/cat-file.c:651 +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:652 +msgid "buffer --batch output" +msgstr "--batch รงฤฑktฤฑsฤฑnฤฑ arabelleฤe al" + +#: builtin/cat-file.c:654 +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:658 +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:662 +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:664 +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:666 +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:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 +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>] <kiลi>..." + +#: 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:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 +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:188 builtin/checkout.c:227 +#, c-format +msgid "path '%s' does not have our version" +msgstr "'%s' yolu bizdeki sรผrรผme iye deฤil" + +#: builtin/checkout.c:190 builtin/checkout.c:229 +#, c-format +msgid "path '%s' does not have their version" +msgstr "'%s' yolu onlardaki sรผrรผme iye deฤil" + +#: builtin/checkout.c:206 +#, 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:258 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "'%s' yolu gereken sรผrรผmlere iye deฤil" + +#: builtin/checkout.c:275 +#, c-format +msgid "path '%s': cannot merge" +msgstr "'%s' yolu: Birleลtirilemiyor" + +#: builtin/checkout.c:291 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "'%s' iรงin birleลtirme sonuรงlarฤฑ eklenemiyor" + +#: builtin/checkout.c:396 +#, 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:401 +#, 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:408 +#, 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:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "'%s' gรผncellenmekte olan yollarla kullanฤฑlamaz" + +#: builtin/checkout.c:444 builtin/checkout.c:447 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "'%s', %s ile birlikte kullanฤฑlamaz" + +#: builtin/checkout.c:451 +#, 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:455 +#, c-format +msgid "neither '%s' or '%s' is specified" +msgstr "ne '%s' ne de '%s' belirtilmiล" + +#: builtin/checkout.c:459 +#, 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:464 builtin/checkout.c:469 +#, c-format +msgid "'%s' or '%s' cannot be used with %s" +msgstr "'%s' veya '%s', %s ile birlikte kullanฤฑlamaz" + +#: builtin/checkout.c:528 builtin/checkout.c:535 +#, c-format +msgid "path '%s' is unmerged" +msgstr "'%s' yolu birleลtirilmemiล" + +#: builtin/checkout.c:703 +msgid "you need to resolve your current index first" +msgstr "รถnce geรงerli indeksinizi รงรถzmelisiniz" + +#: builtin/checkout.c:757 +#, c-format +msgid "" +"cannot continue with staged changes in the following files:\n" +"%s" +msgstr "" +"aลaฤฤฑdaki dosyalardaki hazฤฑrlanan deฤiลikliklerle sรผrdรผrรผlemiyor:\n" +"%s" + +#: builtin/checkout.c:853 +#, 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:895 +msgid "HEAD is now at" +msgstr "HEAD konumu:" + +#: builtin/checkout.c:899 builtin/clone.c:720 +msgid "unable to update HEAD" +msgstr "HEAD gรผncellenemiyor" + +#: builtin/checkout.c:903 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "'%s' dalฤฑ sฤฑfฤฑrlandฤฑ.\n" + +#: builtin/checkout.c:906 +#, c-format +msgid "Already on '%s'\n" +msgstr "Halihazฤฑrda '%s' รผzerinde\n" + +#: builtin/checkout.c:910 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "'%s' dalฤฑna geรงildi ve sฤฑfฤฑrlandฤฑ.\n" + +#: builtin/checkout.c:912 builtin/checkout.c:1338 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Yeni '%s' dalฤฑna geรงildi.\n" + +#: builtin/checkout.c:914 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "'%s' dalฤฑna geรงildi.\n" + +#: builtin/checkout.c:965 +#, c-format +msgid " ... and %d more.\n" +msgstr "... ve %d daha.\n" + +#: builtin/checkout.c:971 +#, 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 iลleme\n" +"bฤฑrakฤฑyorsunuz:\n" +"\n" +"%s\n" +msgstr[1] "" +"Uyarฤฑ: Arkanฤฑzda dallarฤฑnฤฑzdan hiรงbirine baฤlฤฑ olmayฤฑn %d iลleme\n" +"bฤฑrakฤฑyorsunuz:\n" +"\n" +"%s\n" + +#: builtin/checkout.c:990 +#, 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:1025 +msgid "internal error in revision walk" +msgstr "revizyonlarda gezinirken iรง hata" + +#: builtin/checkout.c:1029 +msgid "Previous HEAD position was" +msgstr "รnceki HEAD konumu ลuydu:" + +#: builtin/checkout.c:1069 builtin/checkout.c:1333 +msgid "You are on a branch yet to be born" +msgstr "Henรผz doฤmamฤฑล bir dal รผzerindesiniz" + +#: builtin/checkout.c:1146 +#, 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:1153 +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:1163 +#, 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:1229 +msgid "only one reference expected" +msgstr "yalnฤฑzca bir baลvuru bekleniyordu" + +#: builtin/checkout.c:1246 +#, c-format +msgid "only one reference expected, %d given." +msgstr "yalnฤฑzca bir baลvuru bekleniyordu, %d verildi" + +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 +#, c-format +msgid "invalid reference: %s" +msgstr "geรงersiz baลvuru: %s" + +#: builtin/checkout.c:1305 builtin/checkout.c:1671 +#, c-format +msgid "reference is not a tree: %s" +msgstr "baลvuru bir aฤaca deฤil: %s" + +#: builtin/checkout.c:1352 +#, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "bir dal bekleniyordu, '%s' etiketi alฤฑndฤฑ" + +#: builtin/checkout.c:1354 +#, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "bir dal bekleniyordu, '%s' uzak dalฤฑ alฤฑndฤฑ" + +#: builtin/checkout.c:1355 builtin/checkout.c:1363 +#, c-format +msgid "a branch is expected, got '%s'" +msgstr "bir dal bekleniyordu, '%s' alฤฑndฤฑ" + +#: builtin/checkout.c:1358 +#, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "bir dal bekleniyordu, '%s' iลlemesi alฤฑndฤฑ" + +#: builtin/checkout.c:1374 +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:1378 +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:1382 +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:1386 +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:1390 +msgid "" +"cannot switch branch while reverting\n" +"Consider \"git revert --quit\" or \"git worktree add\"." +msgstr "" +"Geriye al yaparken dal deฤiลtirilemiyor.\n" +"\"git revert --quit\" veya \"git worktree add\" yapmayฤฑ dรผลรผnรผn." + +#: builtin/checkout.c:1394 +msgid "you are switching branch while bisecting" +msgstr "ikili arama yaparken dal deฤiลtiriyorsunuz" + +#: builtin/checkout.c:1401 +msgid "paths cannot be used with switching branches" +msgstr "dal deฤiลtirilirken yollar kullanฤฑlamaz" + +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "dal deฤiลtirilirken '%s' kullanฤฑlamaz" + +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "'%s', '%s' ile birlikte kullanฤฑlamaz" + +#: builtin/checkout.c:1429 +#, c-format +msgid "'%s' cannot take <start-point>" +msgstr "'%s', <baลlama-noktasฤฑ> alamaz" + +#: builtin/checkout.c:1437 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "Dal, iลleme olmayan '%s' รถgesine deฤiลtirilemez" + +#: builtin/checkout.c:1444 +msgid "missing branch or commit argument" +msgstr "dal veya iลleme deฤiลkeni eksik" + +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 +msgid "force progress reporting" +msgstr "durum belirtmeyi zorla" + +#: builtin/checkout.c:1487 +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:1488 builtin/log.c:1795 parse-options.h:322 +msgid "style" +msgstr "stil" + +#: builtin/checkout.c:1489 +msgid "conflict style (merge or diff3)" +msgstr "รงakฤฑลma stili (birleลtirme veya diff3)" + +#: builtin/checkout.c:1501 builtin/worktree.c:558 +msgid "detach HEAD at named commit" +msgstr "adฤฑ verilen iลlemede HEAD'i ayฤฑr" + +#: builtin/checkout.c:1502 +msgid "set upstream info for new branch" +msgstr "yeni dal iรงin รผstkaynak bilgisi ayarla" + +#: builtin/checkout.c:1504 +msgid "force checkout (throw away local modifications)" +msgstr "zorla รงฤฑkฤฑล yap (yerel deฤiลiklikleri รงรถpe at)" + +#: builtin/checkout.c:1506 +msgid "new-branch" +msgstr "yeni dal" + +#: builtin/checkout.c:1506 +msgid "new unparented branch" +msgstr "yeni รผst รถgesi olmayan dal" + +#: builtin/checkout.c:1508 builtin/merge.c:291 +msgid "update ignored files (default)" +msgstr "yok sayฤฑlan dosyalarฤฑ gรผncelle (รถntanฤฑmlฤฑ)" + +#: builtin/checkout.c:1511 +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:1524 +msgid "checkout our version for unmerged files" +msgstr "birleลtirilmeyen dosyalar iรงin bizdeki sรผrรผmรผ รงฤฑkฤฑล yap" + +#: builtin/checkout.c:1527 +msgid "checkout their version for unmerged files" +msgstr "birleลtirilmeyen dosyalar iรงin onlardaki sรผrรผmรผnรผ รงฤฑkฤฑล yap" + +#: builtin/checkout.c:1531 +msgid "do not limit pathspecs to sparse entries only" +msgstr "yol belirteรงlerini yalnฤฑzca aralฤฑklฤฑ girdilere kฤฑsฤฑtlama" + +#: builtin/checkout.c:1586 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "-%c, -%c ve --orphan birlikte kullanฤฑlmaz" + +#: builtin/checkout.c:1590 +msgid "-p and --overlay are mutually exclusive" +msgstr "-p ve --overlay birlikte kullanฤฑlmaz" + +#: builtin/checkout.c:1627 +msgid "--track needs a branch name" +msgstr "--track iรงin bir dal adฤฑ gerekli" + +#: builtin/checkout.c:1632 +#, c-format +msgid "missing branch name; try -%c" +msgstr "eksik dal adฤฑ; -%c deneyin" + +#: builtin/checkout.c:1664 +#, c-format +msgid "could not resolve %s" +msgstr "%s รงรถzรผlemedi" + +#: builtin/checkout.c:1680 +msgid "invalid path specification" +msgstr "geรงersiz yol belirtimi" + +#: builtin/checkout.c:1687 +#, c-format +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" +msgstr "'%s' bir iลleme deฤil ve ondan bir '%s' dalฤฑ oluลturulamaz" + +#: builtin/checkout.c:1691 +#, 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:1700 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file, --detach ile uyumsuz" + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file, --patch ile uyumsuz" + +#: builtin/checkout.c:1716 +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:1721 +msgid "you must specify path(s) to restore" +msgstr "eski durumuna getirilecek yollarฤฑ belirtmelisiniz" + +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 +msgid "branch" +msgstr "dal" + +#: builtin/checkout.c:1748 +msgid "create and checkout a new branch" +msgstr "yeni bir dal oluลtur ve รงฤฑkฤฑล yap" + +#: builtin/checkout.c:1750 +msgid "create/reset and checkout a branch" +msgstr "bir dal oluลtur/sฤฑfฤฑrla ve รงฤฑkฤฑล yap" + +#: builtin/checkout.c:1751 +msgid "create reflog for new branch" +msgstr "yeni dal iรงin baลvuru gรผnlรผฤรผ oluลtur" + +#: builtin/checkout.c:1753 +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:1754 +msgid "use overlay mode (default)" +msgstr "yerpaylaลฤฑm kipini kullan (รถntanฤฑmlฤฑ)" + +#: builtin/checkout.c:1799 +msgid "create and switch to a new branch" +msgstr "yeni bir dal oluลtur ve ona geรง" + +#: builtin/checkout.c:1801 +msgid "create/reset and switch to a branch" +msgstr "bir dal oluลtur/sฤฑfฤฑrla ve ona geรง" + +#: builtin/checkout.c:1803 +msgid "second guess 'git switch <no-such-branch>'" +msgstr "'git switch <bรถyle-bir-dal-yok>'a temkinli yaklaล" + +#: builtin/checkout.c:1805 +msgid "throw away local modifications" +msgstr "yerel deฤiลiklikleri รงรถpe at" + +#: builtin/checkout.c:1839 +msgid "which tree-ish to checkout from" +msgstr "รงฤฑkฤฑล yapฤฑlacak aฤacฤฑmsฤฑ" + +#: builtin/checkout.c:1841 +msgid "restore the index" +msgstr "indeksi eski durumuna getir" + +#: builtin/checkout.c:1843 +msgid "restore the working tree (default)" +msgstr "รงalฤฑลma aฤacฤฑnฤฑ eski durumuna getir" + +#: builtin/checkout.c:1845 +msgid "ignore unmerged entries" +msgstr "birleลtirilmemiล girdileri yok say" + +#: builtin/checkout.c:1846 +msgid "use overlay mode" +msgstr "yerpaylaลฤฑm kipini kullan" + +#: builtin/clean.c:29 +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:33 +#, c-format +msgid "Removing %s\n" +msgstr "%s kaldฤฑrฤฑlฤฑyor\n" + +#: builtin/clean.c:34 +#, c-format +msgid "Would remove %s\n" +msgstr "%s kaldฤฑrฤฑlacak\n" + +#: builtin/clean.c:35 +#, c-format +msgid "Skipping repository %s\n" +msgstr "%s dizini atlanฤฑyor\n" + +#: builtin/clean.c:36 +#, c-format +msgid "Would skip repository %s\n" +msgstr "%s dizini atlanacak\n" + +#: builtin/clean.c:37 +#, c-format +msgid "failed to remove %s" +msgstr "%s kaldฤฑrฤฑlamadฤฑ" + +#: builtin/clean.c:38 +#, c-format +msgid "could not lstat %s\n" +msgstr "%s 'lstat' yapฤฑlamadฤฑ\n" + +#: builtin/clean.c:302 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:306 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:661 +#, c-format +msgid "Input ignore patterns>> " +msgstr "Girdi iรงin yok sayma dizgileri>> " + +#: builtin/clean.c:696 +#, c-format +msgid "WARNING: Cannot find items matched by: %s" +msgstr "UYARI: ลununla eลleลen รถgeler bulunamฤฑyor: %s" + +#: builtin/clean.c:717 +msgid "Select items to delete" +msgstr "Silinecek รถgeleri seรงin" + +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 +#, c-format +msgid "Remove %s [y/N]? " +msgstr "%s kaldฤฑrฤฑlsฤฑn mฤฑ [y/N]? " + +#: builtin/clean.c:789 +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:825 +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:841 +msgid "No more files to clean, exiting." +msgstr "Temizlenecek baลka dosya yok, รงฤฑkฤฑlฤฑyor." + +#: builtin/clean.c:903 +msgid "do not print names of files removed" +msgstr "kaldฤฑrฤฑlan dosyalarฤฑn adlarฤฑnฤฑ yazdฤฑrma" + +#: builtin/clean.c:905 +msgid "force" +msgstr "zorla" + +#: builtin/clean.c:906 +msgid "interactive cleaning" +msgstr "etkileลimli temizlik" + +#: builtin/clean.c:908 +msgid "remove whole directories" +msgstr "dizinleri tรผmรผyle kaldฤฑr" + +#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/show-ref.c:179 +msgid "pattern" +msgstr "dizgi" + +#: builtin/clean.c:910 +msgid "add <pattern> to ignore rules" +msgstr "yok sayma kurallarฤฑna <dizgi> ekle" + +#: builtin/clean.c:911 +msgid "remove ignored files, too" +msgstr "yok sayฤฑlan dosyalar da kaldฤฑrฤฑldฤฑ" + +#: builtin/clean.c:913 +msgid "remove only ignored files" +msgstr "yalnฤฑzca yok sayฤฑlan dosyalarฤฑ kaldฤฑr" + +#: builtin/clean.c:929 +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:932 +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/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "-x ve -X birlikte kullanฤฑlamaz" + +#: 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:553 +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:106 +msgid "pathspec" +msgstr "yol belirteci" + +#: builtin/clone.c:106 +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:550 +msgid "template-directory" +msgstr "ลablon dizini" + +#: builtin/clone.c:112 builtin/init-db.c:551 +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:1831 +#: builtin/submodule--helper.c:2336 +msgid "reference repository" +msgstr "baลvuru deposu" + +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 +msgid "use --reference only while cloning" +msgstr "--reference'ฤฑ yalnฤฑzca klonlarken kullan" + +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 +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:173 builtin/grep.c:849 +#: builtin/pull.c:208 +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:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 +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:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 +msgid "revision" +msgstr "revizyon" + +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 +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:1843 +#: builtin/submodule--helper.c:2352 +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:559 +msgid "gitdir" +msgstr "git dizini" + +#: builtin/clone.c:138 builtin/init-db.c:560 +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:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 +msgid "server-specific" +msgstr "sunucuya รถzel" + +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 +msgid "option to transmit" +msgstr "iletme seรงeneฤi" + +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 +msgid "use IPv4 addresses only" +msgstr "yalnฤฑzca IPv4 adresleri kullan" + +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 +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:431 +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "yineleyici '%s' รผzerinden รงalฤฑลtฤฑrฤฑlamadฤฑ" + +#: builtin/clone.c:462 +#, c-format +msgid "failed to create link '%s'" +msgstr "'%s' baฤฤฑ oluลturulamadฤฑ" + +#: builtin/clone.c:466 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "dosya ลuraya kopyalanamadฤฑ: '%s'" + +#: builtin/clone.c:471 +#, c-format +msgid "failed to iterate over '%s'" +msgstr "'%s' รผzerinde yinelenemedi" + +#: builtin/clone.c:498 +#, c-format +msgid "done.\n" +msgstr "bitti.\n" + +#: builtin/clone.c:512 +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:589 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "Klonlanacak %s uzak dal bulunamadฤฑ." + +#: builtin/clone.c:708 +#, c-format +msgid "unable to update %s" +msgstr "%s gรผncellenemiyor" + +#: builtin/clone.c:756 +msgid "failed to initialize sparse-checkout" +msgstr "sparse-checkout ilklendirilemedi" + +#: builtin/clone.c:779 +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:811 +msgid "unable to checkout working tree" +msgstr "รงalฤฑลma aฤacฤฑ รงฤฑkฤฑล yapฤฑlamฤฑyor" + +#: builtin/clone.c:868 +msgid "unable to write parameters to config file" +msgstr "parametreler yapฤฑlandฤฑrma dosyasฤฑna yazฤฑlamฤฑyor" + +#: builtin/clone.c:931 +msgid "cannot repack to clean up" +msgstr "temizlik iรงin yeniden paketlenemiyor" + +#: builtin/clone.c:933 +msgid "cannot unlink temporary alternates file" +msgstr "geรงici alternatifler dosyasฤฑnฤฑn baฤlantฤฑsฤฑ kesilemiyor" + +#: builtin/clone.c:970 builtin/receive-pack.c:2434 +msgid "Too many arguments." +msgstr "รok fazla deฤiลken." + +#: builtin/clone.c:974 +msgid "You must specify a repository to clone." +msgstr "Klonlamak iรงin bir depo belirtmelisiniz." + +#: builtin/clone.c:987 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "--bare ve --origin %s seรงenekleri birbiriyle uyumsuz." + +#: builtin/clone.c:990 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "--bare ve --separate-git-dir birbiriyle uyumsuz." + +#: builtin/clone.c:1006 +#, c-format +msgid "repository '%s' does not exist" +msgstr "'%s' deposu mevcut deฤil" + +#: builtin/clone.c:1010 builtin/fetch.c:1841 +#, c-format +msgid "depth %s is not a positive number" +msgstr "%s derinliฤi pozitif bir sayฤฑ deฤil" + +#: builtin/clone.c:1020 +#, 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:1026 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "Depo yolu '%s' halihazฤฑrda mevcut ve boล bir dizin deฤil." + +#: builtin/clone.c:1040 +#, c-format +msgid "working tree '%s' already exists." +msgstr "รalฤฑลma aฤacฤฑ '%s' halihazฤฑrda mevcut." + +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "ลunun รถncรผ dizinleri oluลturulamadฤฑ: '%s'" + +#: builtin/clone.c:1060 +#, c-format +msgid "could not create work tree dir '%s'" +msgstr "'%s' รงalฤฑลma aฤacฤฑ dizini oluลturulamadฤฑ" + +#: builtin/clone.c:1080 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "'%s' รงฤฑplak deposuna klonlanฤฑyor...\n" + +#: builtin/clone.c:1082 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "Klonlama konumu: '%s'...\n" + +#: builtin/clone.c:1106 +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:1170 +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:1172 +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:1174 +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:1176 +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:1179 +msgid "source repository is shallow, ignoring --local" +msgstr "kaynak depo sฤฑฤ, --local yok sayฤฑlฤฑyor" + +#: builtin/clone.c:1184 +msgid "--local is ignored" +msgstr "--local yok sayฤฑldฤฑ" + +#: builtin/clone.c:1268 builtin/clone.c:1276 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "%s uzak dalฤฑ %s รผstkaynaฤฤฑnda bulunamadฤฑ" + +#: builtin/clone.c:1279 +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-graph.c:13 builtin/commit-graph.c:22 +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:14 builtin/commit-graph.c:27 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" +"git commit-graph write [--object-dir <nsndzn>] [--append] [--" +"split[=<strateji>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <bรถlme-seรงenekleri>" + +#: builtin/commit-graph.c:64 +#, c-format +msgid "could not find object directory matching %s" +msgstr "'%s' ile eลleลen nesne dizini bulunamadฤฑ" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "dizin" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "Grafiฤin depolanacaฤฤฑ nesne dizini" + +#: builtin/commit-graph.c:83 +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:106 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "commit-graph '%s' aรงฤฑlamadฤฑ" + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "tanฤฑmlanamayan --split deฤiลkeni, %s" + +#: builtin/commit-graph.c:155 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "beklenmedik onaltฤฑlฤฑk olmayan nesne kimliฤi: %s" + +#: builtin/commit-graph.c:160 +#, c-format +msgid "invalid object: %s" +msgstr "geรงersiz nesne: %s" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "tรผm baลvurularda gezinmeyi baลlat" + +#: builtin/commit-graph.c:215 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "stdin tarafฤฑndan listelenen paket indekslerini tara" + +#: builtin/commit-graph.c:217 +msgid "start walk at commits listed by stdin" +msgstr "stdin tarafฤฑndan listelenen tรผm iลlemelerde gezinmeyi baลlat" + +#: builtin/commit-graph.c:219 +msgid "include all commits already in the commit-graph file" +msgstr "halihazฤฑrda commit-graph dosyasฤฑnda bulunan tรผm iลlemeleri iรงer" + +#: builtin/commit-graph.c:221 +msgid "enable computation for changed paths" +msgstr "deฤiลtirilen yollar iรงin hesaplamayฤฑ etkinleลtir" + +#: builtin/commit-graph.c:224 +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:228 +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 " +"iลleme sayฤฑsฤฑ" + +#: builtin/commit-graph.c:230 +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:232 +msgid "only expire files older than a given date-time" +msgstr "yalnฤฑzca verilen bir tarihten daha eski dosyalarฤฑn hรผkmรผnรผ kaldฤฑr" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "Hesaplanacak en รงok deฤiลtirilen yollar iรงin Bloom sรผzgeรงleri sayฤฑsฤฑ" + +#: builtin/commit-graph.c:255 +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/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "Girdiden iลlemeler toplanฤฑyor" + +#: 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[<deฤer-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:546 +#, 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 iลleme รถgesinin no'su" + +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 +msgid "message" +msgstr "ileti" + +#: builtin/commit-tree.c:115 builtin/commit.c:1504 +msgid "commit message" +msgstr "iลleme iletisi" + +#: builtin/commit-tree.c:118 +msgid "read commit log message from file" +msgstr "iลleme gรผnlรผk iletisini dosyadan oku" + +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/pull.c:176 builtin/revert.c:118 +msgid "GPG sign commit" +msgstr "iลlemeyi 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 iลlemeyi deฤiลtirmek istediniz; ancak bu onu\n" +"boล yapacaktฤฑr. Komutunuzu --allow-empty ile yineleyebilir veya\n" +"iลlemeyi \"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 rebase --skip'\n" +msgstr "Aksi durumda, lรผtfen 'git rebase --skip' kullanฤฑn.\n" + +#: builtin/commit.c:66 +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "Aksi durumda, lรผtfen 'git cherry-pick --skip' kullanฤฑn.\n" + +#: builtin/commit.c:69 +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 iลlemeleri seรง-al yapmayฤฑ sรผrdรผrmek iรงin:\n" +"\n" +"\tgit cherry-pick --continue\n" +"\n" +"kullanฤฑn.\n" +"Bu iลlemeyi atlamak isterseniz ลunu kullanฤฑn:\n" +"\n" +"\tgit cherry-pick --continue\n" +"\n" + +#: builtin/commit.c:312 +msgid "failed to unpack HEAD tree object" +msgstr "HEAD aฤaรง nesnesi aรงฤฑlamadฤฑ" + +#: builtin/commit.c:348 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "--pathspec-from-file, -a ile bir anlam ifade etmiyor" + +#: builtin/commit.c:361 +msgid "No paths with --include/--only does not make sense." +msgstr "--include/--only iรงermeyen yollar bir anlam ifade etmiyor." + +#: builtin/commit.c:373 +msgid "unable to create temporary index" +msgstr "geรงici indeks oluลturulamฤฑyor" + +#: builtin/commit.c:382 +msgid "interactive add failed" +msgstr "etkileลimli ekleme baลarฤฑsฤฑz" + +#: builtin/commit.c:397 +msgid "unable to update temporary index" +msgstr "geรงici indeks gรผncellenemiyor" + +#: builtin/commit.c:399 +msgid "Failed to update main cache tree" +msgstr "Ana รถnbellek aฤacฤฑ gรผncellenemedi" + +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 +msgid "unable to write new_index file" +msgstr "new_index_file yazฤฑlamฤฑyor" + +#: builtin/commit.c:476 +msgid "cannot do a partial commit during a merge." +msgstr "Bir birleลtirme sฤฑrasฤฑnda kฤฑsmi iลleme yapฤฑlamaz." + +#: builtin/commit.c:478 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "Bir seรง-al sฤฑrasฤฑnda kฤฑsmi iลleme yapฤฑlamaz." + +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "Bir yeniden temellendirme sฤฑrasฤฑnda kฤฑsmi iลleme yapฤฑlamaz." + +#: builtin/commit.c:488 +msgid "cannot read the index" +msgstr "indeks okunamฤฑyor" + +#: builtin/commit.c:507 +msgid "unable to write temporary index file" +msgstr "geรงici indeks dosyasฤฑ yazฤฑlamฤฑyor" + +#: builtin/commit.c:605 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "'%s' iลlemesinde yazar รผstbilgisi yok" + +#: builtin/commit.c:607 +#, c-format +msgid "commit '%s' has malformed author line" +msgstr "'%s' iลlemesindeki yazar satฤฑrฤฑ hatalฤฑ oluลturulmuล" + +#: builtin/commit.c:626 +msgid "malformed --author parameter" +msgstr "hatalฤฑ oluลturulmuล --author parametresi" + +#: builtin/commit.c:679 +msgid "" +"unable to select a comment character that is not used\n" +"in the current commit message" +msgstr "" +"mevcut iลleme iletisinde kullanฤฑlmayan bir yorum\n" +"karakteri seรงilemiyor" + +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 +#, c-format +msgid "could not lookup commit %s" +msgstr "%s iลlemesi aranamadฤฑ" + +#: builtin/commit.c:729 builtin/shortlog.c:478 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "(gรผnlรผk iletisi standart girdi'den okunuyor)\n" + +#: builtin/commit.c:731 +msgid "could not read log from standard input" +msgstr "gรผnlรผk standart girdi'den okunamadฤฑ" + +#: builtin/commit.c:735 +#, c-format +msgid "could not read log file '%s'" +msgstr "gรผnlรผk dosyasฤฑ '%s' okunamadฤฑ" + +#: builtin/commit.c:766 builtin/commit.c:782 +msgid "could not read SQUASH_MSG" +msgstr "SQUASH_MSG okunamadฤฑ" + +#: builtin/commit.c:773 +msgid "could not read MERGE_MSG" +msgstr "MERGE_MSG okunamadฤฑ" + +#: builtin/commit.c:833 +msgid "could not write commit template" +msgstr "iลleme ลablonu yazฤฑlamadฤฑ" + +#: builtin/commit.c:853 +msgid "" +"\n" +"It looks like you may be committing a merge.\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" +"and try again.\n" +msgstr "" +"\n" +"Gรถrรผnรผลe bakฤฑlฤฑrsa bir birleลtirmeyi iลliyorsunuz.\n" +"Eฤer bu doฤru deฤilse lรผtfen ลunu รงalฤฑลtฤฑrฤฑn:\n" +"\tgit update-ref -d MERGE_HEAD\n" +"ve yeniden deneyin.\n" + +#: builtin/commit.c:858 +msgid "" +"\n" +"It looks like you may be committing a cherry-pick.\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"and try again.\n" +msgstr "" +"\n" +"Gรถrรผnรผลe gรถre bir seรง-al iลliyorsunuz.\n" +"Eฤer bu doฤru deฤilse lรผtfen ลunu รงalฤฑลtฤฑrฤฑn:\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"ve yeniden deneyin.\n" + +#: builtin/commit.c:868 +#, 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 iลleme iletisi girin. '%c' ile baลlayan\n" +"satฤฑrlar yok sayฤฑlacaktฤฑr. Boล bir ileti iลlemeyi iptal eder.\n" + +#: builtin/commit.c:876 +#, 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 iลleme iletisi girin. '%c' ile baลlayan\n" +"satฤฑrlar tutulacaktฤฑr; isterseniz onlarฤฑ kaldฤฑrabilirsiniz.\n" +"Boล bir ileti iลlemeyi iptal eder.\n" + +#: builtin/commit.c:893 +#, c-format +msgid "%sAuthor: %.*s <%.*s>" +msgstr "%sYazar: %.*s <%.*s>" + +#: builtin/commit.c:901 +#, c-format +msgid "%sDate: %s" +msgstr "%sTarih: %s" + +#: builtin/commit.c:908 +#, c-format +msgid "%sCommitter: %.*s <%.*s>" +msgstr "%sฤฐลleyici: %.*s <%.*s>" + +#: builtin/commit.c:926 +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:276 +#, 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:1331 +#, 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:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "" +"Bir yeniden temellendirmenin tam ortasฤฑndasฤฑnฤฑz -- deฤiลtirme yapฤฑlamฤฑyor." + +#: builtin/commit.c:1190 +msgid "Options --squash and --fixup cannot be used together" +msgstr "--squash ve --fixup seรงenekleri birlikte kullanฤฑlamaz" + +#: builtin/commit.c:1200 +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:1202 +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:1211 +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:1229 +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:1235 +#, c-format +msgid "paths '%s ...' with -a does not make sense" +msgstr "'%s ...' yollarฤฑ -a ile bir anlam ifade etmiyor" + +#: builtin/commit.c:1366 builtin/commit.c:1527 +msgid "show status concisely" +msgstr "durumu kฤฑsaca gรถster" + +#: builtin/commit.c:1368 builtin/commit.c:1529 +msgid "show branch information" +msgstr "dal bilgisini gรถster" + +#: builtin/commit.c:1370 +msgid "show stash information" +msgstr "zula bilgisini gรถster" + +#: builtin/commit.c:1372 builtin/commit.c:1531 +msgid "compute full ahead/behind values" +msgstr "tam รถnรผnde/arkasฤฑnda deฤerlerini hesapla" + +#: builtin/commit.c:1374 +msgid "version" +msgstr "sรผrรผm" + +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 +msgid "machine-readable output" +msgstr "makine tarafฤฑndan okunabilir รงฤฑktฤฑ" + +#: builtin/commit.c:1377 builtin/commit.c:1535 +msgid "show status in long format (default)" +msgstr "durumu uzun biรงimde gรถster (รถntanฤฑmlฤฑ)" + +#: builtin/commit.c:1380 builtin/commit.c:1538 +msgid "terminate entries with NUL" +msgstr "girdileri NUL ile sonlandฤฑr" + +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 +msgid "mode" +msgstr "kip" + +#: builtin/commit.c:1383 builtin/commit.c:1541 +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:1387 +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:1389 parse-options.h:192 +msgid "when" +msgstr "ne zaman" + +#: builtin/commit.c:1390 +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:1392 +msgid "list untracked files in columns" +msgstr "izlenmeyen dosyalarฤฑ sรผtunlarla gรถster" + +#: builtin/commit.c:1393 +msgid "do not detect renames" +msgstr "yeniden adlandฤฑrmalarฤฑ algฤฑlama" + +#: builtin/commit.c:1395 +msgid "detect renames, optionally set similarity index" +msgstr "" +"yeniden adlandฤฑrmalarฤฑ algฤฑla, isteฤe baฤlฤฑ olarak benzerlik indeksi ayarla" + +#: builtin/commit.c:1415 +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:1497 +msgid "suppress summary after successful commit" +msgstr "baลarฤฑlฤฑ iลlemenin ardฤฑndan รถzeti gizle" + +#: builtin/commit.c:1498 +msgid "show diff in commit message template" +msgstr "diff'i iลleme iletisi ลablonunda gรถster" + +#: builtin/commit.c:1500 +msgid "Commit message options" +msgstr "ฤฐลleme iletisi seรงenekleri" + +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 +msgid "read message from file" +msgstr "iletiyi dosyadan oku" + +#: builtin/commit.c:1502 +msgid "author" +msgstr "yazar" + +#: builtin/commit.c:1502 +msgid "override author for commit" +msgstr "iลleme yazarฤฑnฤฑ geรงersiz kฤฑl" + +#: builtin/commit.c:1503 builtin/gc.c:539 +msgid "date" +msgstr "tarih" + +#: builtin/commit.c:1503 +msgid "override date for commit" +msgstr "iลleme tarihini geรงersiz kฤฑl" + +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 +msgid "commit" +msgstr "iลleme" + +#: builtin/commit.c:1505 +msgid "reuse and edit message from specified commit" +msgstr "belirtilen iลlemenin iletisini dรผzenle ve yeniden kullan" + +#: builtin/commit.c:1506 +msgid "reuse message from specified commit" +msgstr "belirtilen iลlemenin iletisini yeniden kullan" + +#: builtin/commit.c:1507 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "" +"belirtilen iลlemeyi dรผzeltmek iรงin kendiliฤinden tฤฑkฤฑลtฤฑrma tarafฤฑndan " +"biรงimlendirilen iletiyi kullan" + +#: builtin/commit.c:1508 +msgid "use autosquash formatted message to squash specified commit" +msgstr "" +"belirtilen iลlemeyi tฤฑkฤฑลtฤฑrmak iรงin kendiliฤinden tฤฑkฤฑลtฤฑrma tarafฤฑndan " +"biรงimlendirilen iletiyi kullan" + +#: builtin/commit.c:1509 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "" +"iลlemenin yazarฤฑ ลu andan itibaren benim (-C/-c/--amend ile kullanฤฑldฤฑ)" + +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 +msgid "add Signed-off-by:" +msgstr "Signed-off-by: ekle" + +#: builtin/commit.c:1511 +msgid "use specified template file" +msgstr "belirtilen ลablon dosyasฤฑnฤฑ kullan" + +#: builtin/commit.c:1512 +msgid "force edit of commit" +msgstr "iลlemeyi zorla dรผzenle" + +#: builtin/commit.c:1514 +msgid "include status in commit message template" +msgstr "iลleme iletisi ลablonunda durumu iรงer" + +#: builtin/commit.c:1519 +msgid "Commit contents options" +msgstr "ฤฐลleme iรงeriฤi seรงenekleri" + +#: builtin/commit.c:1520 +msgid "commit all changed files" +msgstr "deฤiลtirilen tรผm dosyalarฤฑ gรถnder" + +#: builtin/commit.c:1521 +msgid "add specified files to index for commit" +msgstr "belirtilen dosyalarฤฑ iลleme iรงin indekse ekle" + +#: builtin/commit.c:1522 +msgid "interactively add files" +msgstr "dosyalarฤฑ etkileลimli olarak ekle" + +#: builtin/commit.c:1523 +msgid "interactively add changes" +msgstr "deฤiลiklikleri etkileลimli olarak ekle" + +#: builtin/commit.c:1524 +msgid "commit only specified files" +msgstr "yalnฤฑzca belirtilen dosyalarฤฑ gรถnder" + +#: builtin/commit.c:1525 +msgid "bypass pre-commit and commit-msg hooks" +msgstr "pre-commit ve commit-msg kancalarฤฑnฤฑ atla" + +#: builtin/commit.c:1526 +msgid "show what would be committed" +msgstr "neyin iลleneceฤini gรถster" + +#: builtin/commit.c:1539 +msgid "amend previous commit" +msgstr "รถnceki iลlemeyi deฤiลtir" + +#: builtin/commit.c:1540 +msgid "bypass post-rewrite hook" +msgstr "post-rewrite kancasฤฑnฤฑ atla" + +#: builtin/commit.c:1547 +msgid "ok to record an empty change" +msgstr "boล bir deฤiลikliฤin kaydฤฑ yazฤฑlabilir" + +#: builtin/commit.c:1549 +msgid "ok to record a change with an empty message" +msgstr "boล iletili bir deฤiลikliฤin kaydฤฑ yazฤฑlabilir" + +#: builtin/commit.c:1622 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "Hasar gรถrmรผล MERGE_HEAD dosyasฤฑ (%s)" + +#: builtin/commit.c:1629 +msgid "could not read MERGE_MODE" +msgstr "MERGE_MODE okunamadฤฑ" + +#: builtin/commit.c:1650 +#, c-format +msgid "could not read commit message: %s" +msgstr "iลleme iletisi okunamadฤฑ: %s" + +#: builtin/commit.c:1657 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "ฤฐลleme iletisinin boล olmasฤฑndan dolayฤฑ iptal ediliyor.\n" + +#: builtin/commit.c:1662 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "ฤฐลleme iptal ediliyor; iletiyi dรผzenlenmedi.\n" + +#: builtin/commit.c:1696 +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/config.c:11 +msgid "git config [<options>]" +msgstr "git config [<seรงenekler>]" + +#: builtin/config.c:107 builtin/env--helper.c:27 +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "tanฤฑmlanamayan --type deฤiลkeni, %s" + +#: builtin/config.c:119 +msgid "only one type at a time" +msgstr "bir kerede yalnฤฑzca bir tรผr" + +#: builtin/config.c:128 +msgid "Config file location" +msgstr "Yapฤฑlandฤฑrma dosyasฤฑ konumu" + +#: builtin/config.c:129 +msgid "use global config file" +msgstr "global yapฤฑlandฤฑrma dosyasฤฑ kullan" + +#: builtin/config.c:130 +msgid "use system config file" +msgstr "sistem yapฤฑlandฤฑrma dosyasฤฑ kullan" + +#: builtin/config.c:131 +msgid "use repository config file" +msgstr "depo yapฤฑlandฤฑrma dosyasฤฑ kullan" + +#: builtin/config.c:132 +msgid "use per-worktree config file" +msgstr "her รงalฤฑลma aฤacฤฑna รถzel bir yapฤฑlandฤฑrma dosyasฤฑ kullan" + +#: builtin/config.c:133 +msgid "use given config file" +msgstr "verilen yapฤฑlandฤฑrma dosyasฤฑnฤฑ kullan" + +#: builtin/config.c:134 +msgid "blob-id" +msgstr "ikili nesne numarasฤฑ" + +#: builtin/config.c:134 +msgid "read config from given blob object" +msgstr "verilen ikili nesneden yapฤฑlandฤฑrmayฤฑ oku" + +#: builtin/config.c:135 +msgid "Action" +msgstr "Eylem" + +#: builtin/config.c:136 +msgid "get value: name [value-regex]" +msgstr "deฤer al: ad [dรผzenli ifade deฤeri]" + +#: builtin/config.c:137 +msgid "get all values: key [value-regex]" +msgstr "tรผm deฤerleri al: anahtar [dรผzenli ifade deฤeri]" + +#: builtin/config.c:138 +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:139 +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:140 +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:141 +msgid "add a new variable: name value" +msgstr "yeni bir deฤiลken ekle: ad deฤer" + +#: builtin/config.c:142 +msgid "remove a variable: name [value-regex]" +msgstr "bir deฤiลken kaldฤฑr: ad [dรผzenli ifade deฤeri]" + +#: builtin/config.c:143 +msgid "remove all matches: name [value-regex]" +msgstr "tรผm eลleลmeleri kaldฤฑr: ad [dรผzenli ifade deฤeri]" + +#: builtin/config.c:144 +msgid "rename section: old-name new-name" +msgstr "bรถlรผmรผ yeniden adlandฤฑr: eski_ad yeni_ad" + +#: builtin/config.c:145 +msgid "remove a section: name" +msgstr "bir bรถlรผmรผ kaldฤฑr: ad" + +#: builtin/config.c:146 +msgid "list all" +msgstr "tรผmรผnรผ listele" + +#: builtin/config.c:147 +msgid "open an editor" +msgstr "bir dรผzenleyici aรง" + +#: builtin/config.c:148 +msgid "find the color configured: slot [default]" +msgstr "yapฤฑlandฤฑrฤฑlan rengi bul: yuva [รถntanฤฑmlฤฑ]" + +#: builtin/config.c:149 +msgid "find the color setting: slot [stdout-is-tty]" +msgstr "renk ayarฤฑnฤฑ bul: yuva [stdout tty]" + +#: builtin/config.c:150 +msgid "Type" +msgstr "Tรผr" + +#: builtin/config.c:151 builtin/env--helper.c:43 +msgid "value is given this type" +msgstr "deฤer bu tรผrde verildi" + +#: builtin/config.c:152 +msgid "value is \"true\" or \"false\"" +msgstr "deฤer \"true\" (doฤru) veya \"false\" (yanlฤฑล)" + +#: builtin/config.c:153 +msgid "value is decimal number" +msgstr "deฤer ondalฤฑk sayฤฑ" + +#: builtin/config.c:154 +msgid "value is --bool or --int" +msgstr "deฤer --bool veya --int" + +#: builtin/config.c:155 +msgid "value is --bool or string" +msgstr "deฤer --bool veya dizi" + +#: builtin/config.c:156 +msgid "value is a path (file or directory name)" +msgstr "deฤer bir yol (dosya veya dizin adฤฑ)" + +#: builtin/config.c:157 +msgid "value is an expiry date" +msgstr "deฤer bir son kullanฤฑm tarihi" + +#: builtin/config.c:158 +msgid "Other" +msgstr "Diฤer" + +#: builtin/config.c:159 +msgid "terminate values with NUL byte" +msgstr "deฤerleri NUL baytฤฑ ile sonlandฤฑr" + +#: builtin/config.c:160 +msgid "show variable names only" +msgstr "yalnฤฑzca deฤiลken adlarฤฑnฤฑ gรถster" + +#: builtin/config.c:161 +msgid "respect include directives on lookup" +msgstr "arama sฤฑrasฤฑnda iรงerme yรถnergelerine uy" + +#: builtin/config.c:162 +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:163 +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:164 builtin/env--helper.c:45 +msgid "value" +msgstr "deฤer" + +#: builtin/config.c:164 +msgid "with --get, use default value when missing entry" +msgstr "--get ile girdi verilmemiลse รถntanฤฑmlฤฑ deฤeri kullan" + +#: builtin/config.c:178 +#, c-format +msgid "wrong number of arguments, should be %d" +msgstr "yanlฤฑล deฤiลken sayฤฑsฤฑ, %d olmalฤฑ" + +#: builtin/config.c:180 +#, 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:334 +#, c-format +msgid "invalid key pattern: %s" +msgstr "geรงersiz anahtar dizgisi: %s" + +#: builtin/config.c:370 +#, c-format +msgid "failed to format default config value: %s" +msgstr "รถntanฤฑmlฤฑ yapฤฑlandฤฑrma deฤeri biรงimlendirilemedi: %s" + +#: builtin/config.c:434 +#, c-format +msgid "cannot parse color '%s'" +msgstr "renk ayrฤฑลtฤฑrฤฑlamฤฑyor: '%s'" + +#: builtin/config.c:476 +msgid "unable to parse default color value" +msgstr "รถntanฤฑmlฤฑ renk deฤeri ayrฤฑลtฤฑrฤฑlamฤฑyor" + +#: builtin/config.c:529 builtin/config.c:789 +msgid "not in a git directory" +msgstr "bir git dizininde deฤil" + +#: builtin/config.c:532 +msgid "writing to stdin is not supported" +msgstr "stdin'e yazma desteklenmiyor" + +#: builtin/config.c:535 +msgid "writing config blobs is not supported" +msgstr "yapฤฑlandฤฑrma ikili nesneleri yazฤฑmฤฑ desteklenmiyor" + +#: builtin/config.c:620 +#, 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:644 +msgid "only one config file at a time" +msgstr "bir kerede yalnฤฑzca bir yapฤฑlandฤฑrma dosyasฤฑ" + +#: builtin/config.c:650 +msgid "--local can only be used inside a git repository" +msgstr "--local yalnฤฑzca bir git deposu iรงinde kullanฤฑlabilir" + +#: builtin/config.c:652 +msgid "--blob can only be used inside a git repository" +msgstr "--blob yalnฤฑzca bir git deposu iรงinde kullanฤฑlabilir" + +#: builtin/config.c:654 +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree yalnฤฑzca bir git deposu iรงinde kullanฤฑlabilir" + +#: builtin/config.c:676 +msgid "$HOME not set" +msgstr "$HOME ayarlanmamฤฑล" + +#: builtin/config.c:700 +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:735 +msgid "--get-color and variable type are incoherent" +msgstr "--get-color ve deฤiลken tรผrรผ tutarsฤฑz" + +#: builtin/config.c:740 +msgid "only one action at a time" +msgstr "bir kerede yalnฤฑzca bir eylem" + +#: builtin/config.c:753 +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only yalnฤฑzca ลunlara uygulanabilir: --list, --get-regexp" + +#: builtin/config.c:759 +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:765 +msgid "--default is only applicable to --get" +msgstr "--default yalnฤฑzca ลuna uygulanabilir: --get" + +#: builtin/config.c:778 +#, c-format +msgid "unable to read config file '%s'" +msgstr "'%s' yapฤฑlandฤฑrma dosyasฤฑ okunamฤฑyor" + +#: builtin/config.c:781 +msgid "error processing config file(s)" +msgstr "yapฤฑlandฤฑrma dosyalarฤฑ iลlenirken hata" + +#: builtin/config.c:791 +msgid "editing stdin is not supported" +msgstr "stdin'i dรผzenleme desteklenmiyor" + +#: builtin/config.c:793 +msgid "editing blobs is not supported" +msgstr "ikili nesneleri dรผzenleme desteklenmiyor" + +#: builtin/config.c:807 +#, c-format +msgid "cannot create configuration file %s" +msgstr "%s yapฤฑlandฤฑrma dosyasฤฑ oluลturulamฤฑyor" + +#: builtin/config.c:820 +#, 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:894 builtin/config.c:905 +#, 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/credential-cache--daemon.c:226 +#, 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" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "hata ayฤฑklama iletilerini stderr'e yazdฤฑr" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "credential-cache-daemon kullanฤฑlamฤฑyor; unix soket desteฤi yok" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache kullanฤฑlamฤฑyor; unix soket desteฤi yok" + +#: builtin/describe.c:26 +msgid "git describe [<options>] [<commit-ish>...]" +msgstr "git describe [<seรงenekler>] [<iลlememsi>...]" + +#: builtin/describe.c:27 +msgid "git describe [<options>] --dirty" +msgstr "git describe [<seรงenekler>] --dirty" + +#: builtin/describe.c:63 +msgid "head" +msgstr "dal ucu" + +#: builtin/describe.c:63 +msgid "lightweight" +msgstr "hafif" + +#: builtin/describe.c:63 +msgid "annotated" +msgstr "ek aรงฤฑklamalฤฑ" + +#: builtin/describe.c:277 +#, c-format +msgid "annotated tag %s not available" +msgstr "%s ek aรงฤฑklamalฤฑ etiketi mevcut deฤil" + +#: builtin/describe.c:281 +#, c-format +msgid "tag '%s' is externally known as '%s'" +msgstr "'%s' etiketi dฤฑลarฤฑda '%s' olarak biliniyor" + +#: builtin/describe.c:328 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "'%s' ile herhangi bir etiket tam olarak eลleลmiyor" + +#: builtin/describe.c:330 +#, 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:397 +#, c-format +msgid "finished search at %s\n" +msgstr "arama ลurada bitirildi: %s\n" + +#: builtin/describe.c:424 +#, 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:428 +#, 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:458 +#, c-format +msgid "traversed %lu commits\n" +msgstr "%lu iลleme katedildi\n" + +#: builtin/describe.c:461 +#, 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:529 +#, c-format +msgid "describe %s\n" +msgstr "ลunu tanฤฑmla: %s\n" + +#: builtin/describe.c:532 +#, c-format +msgid "Not a valid object name %s" +msgstr "%s geรงerli bir nesne adฤฑ deฤil" + +#: builtin/describe.c:540 +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "%s ne bir iลleme ne de ikili nesne" + +#: builtin/describe.c:554 +msgid "find the tag that comes after the commit" +msgstr "iลlemenin ardฤฑndan gelen etiketi bul" + +#: builtin/describe.c:555 +msgid "debug search strategy on stderr" +msgstr "stderr'deki arama stratejisini ayฤฑkla" + +#: builtin/describe.c:556 +msgid "use any ref" +msgstr "herhangi bir baลvuruyu kullan" + +#: builtin/describe.c:557 +msgid "use any tag, even unannotated" +msgstr "herhangi bir etiketi kullan, ek aรงฤฑklamasฤฑ olmasa bile" + +#: builtin/describe.c:558 +msgid "always use long format" +msgstr "her zaman uzun biรงimi kullan" + +#: builtin/describe.c:559 +msgid "only follow first parent" +msgstr "yalnฤฑzca ilk รผst รถgeyi izle" + +#: builtin/describe.c:562 +msgid "only output exact matches" +msgstr "yalnฤฑzca kesin eลleลmeleri รงฤฑktฤฑ ver" + +#: builtin/describe.c:564 +msgid "consider <n> most recent tags (default: 10)" +msgstr "<n> en son etiketi dikkate al (รถntanฤฑmlฤฑ: 10)" + +#: builtin/describe.c:566 +msgid "only consider tags matching <pattern>" +msgstr "yalnฤฑzca <dizgi> ile eลleลen etiketleri dikkate al" + +#: builtin/describe.c:568 +msgid "do not consider tags matching <pattern>" +msgstr "<dizgi> ile eลleลen etiketleri dikkate alma" + +#: builtin/describe.c:570 builtin/name-rev.c:535 +msgid "show abbreviated commit object as fallback" +msgstr "kฤฑsaltฤฑlmฤฑล iลleme nesnesini geri รงekilinecek nesne olarak gรถster" + +#: builtin/describe.c:571 builtin/describe.c:574 +msgid "mark" +msgstr "im" + +#: builtin/describe.c:572 +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:575 +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:593 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long, --abbrev=0 ile uyumsuz" + +#: builtin/describe.c:622 +msgid "No names found, cannot describe anything." +msgstr "Hiรงbir ad bulunamadฤฑ, hiรงbir ลey betimlenemiyor." + +#: builtin/describe.c:673 +msgid "--dirty is incompatible with commit-ishes" +msgstr "--dirty, iลlememsilerle uyumsuz" + +#: builtin/describe.c:675 +msgid "--broken is incompatible with commit-ishes" +msgstr "--broken, iลlememsilerle uyumsuz" + +#: builtin/diff.c:91 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "'%s': Sฤฑradan bir dosya veya sembolik baฤ deฤil" + +#: builtin/diff.c:241 +#, c-format +msgid "invalid option: %s" +msgstr "geรงersiz seรงenek: %s" + +#: builtin/diff.c:358 +#, c-format +msgid "%s...%s: no merge base" +msgstr "%s...%s: birleลtirme temeli yok" + +#: builtin/diff.c:468 +msgid "Not a git repository" +msgstr "Bir git deposu deฤil" + +#: builtin/diff.c:513 +#, c-format +msgid "invalid object '%s' given." +msgstr "geรงersiz nesne '%s' verildi" + +#: builtin/diff.c:524 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "ikiden รงok ikili nesne verildi: '%s'" + +#: builtin/diff.c:529 +#, c-format +msgid "unhandled object '%s' given." +msgstr "ele alฤฑnmayan nesne '%s' verildi" + +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "%s...%s: รงoklu birleลtirme temelleri, %s kullanฤฑlฤฑyor" + +#: builtin/difftool.c:30 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" +msgstr "git difftool [<seรงenekler>] [<iลleme> [<iลleme>]] [--] [<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:42 builtin/hash-object.c:98 +msgid "type" +msgstr "tรผr" + +#: builtin/env--helper.c:46 +msgid "default for git_env_*(...) to fall back on" +msgstr "git_env_*(...)'ฤฑn geri รงekileceฤi รถntanฤฑmlฤฑ" + +#: builtin/env--helper.c:48 +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:67 +#, 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:82 +#, 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:868 +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:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "--anonymize-map jetonu boล olamaz" + +#: builtin/fast-export.c:1198 +msgid "show progress after <n> objects" +msgstr "<n> nesneden sonra ilerlemeyi gรถster" + +#: builtin/fast-export.c:1200 +msgid "select handling of signed tags" +msgstr "imzalanan etiketlerin nasฤฑl ele alฤฑnacaฤฤฑnฤฑ seรงin" + +#: builtin/fast-export.c:1203 +msgid "select handling of tags that tag filtered objects" +msgstr "nesnelerce sรผzรผlen etiketlerin nasฤฑl ele alฤฑnacaฤฤฑnฤฑ seรงin" + +#: builtin/fast-export.c:1206 +msgid "select handling of commit messages in an alternate encoding" +msgstr "" +"baลka bir kodlamaya iye iลleme iletilerinin nasฤฑl ele alฤฑnacaฤฤฑnฤฑ seรงin" + +#: builtin/fast-export.c:1209 +msgid "Dump marks to this file" +msgstr "imleri bu dosyaya boลalt" + +#: builtin/fast-export.c:1211 +msgid "Import marks from this file" +msgstr "imleri bu dosyadan iรงe aktar" + +#: builtin/fast-export.c:1215 +msgid "Import marks from this file if it exists" +msgstr "eฤer varsa bu dosyadan imleri iรงe aktar" + +#: builtin/fast-export.c:1217 +msgid "Fake a tagger when tags lack one" +msgstr "etiketlerin bir etiketleyicisi yoksa varmฤฑล gibi davran" + +#: builtin/fast-export.c:1219 +msgid "Output full tree for each commit" +msgstr "her iลleme iรงin tรผm aฤacฤฑn รงฤฑktฤฑsฤฑnฤฑ ver" + +#: builtin/fast-export.c:1221 +msgid "Use the done feature to terminate the stream" +msgstr "akฤฑลฤฑ sonlandฤฑrmak iรงin 'done' รถzelliฤini kullan" + +#: builtin/fast-export.c:1222 +msgid "Skip output of blob data" +msgstr "ikili nesne verisi รงฤฑktฤฑsฤฑnฤฑ atla" + +#: builtin/fast-export.c:1223 builtin/log.c:1811 +msgid "refspec" +msgstr "baลvuru belirteci" + +#: builtin/fast-export.c:1224 +msgid "Apply refspec to exported refs" +msgstr "baลvuru belirtecini dฤฑลa aktarฤฑlan baลvurulara aktar" + +#: builtin/fast-export.c:1225 +msgid "anonymize output" +msgstr "รงฤฑktฤฑ kimliฤini gizle" + +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "kimden:kime" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "<kimden> ve <kime>'yi anonimleลtirilmiล รงฤฑktฤฑda dรถnรผลtรผr" + +#: builtin/fast-export.c:1230 +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:1232 +msgid "Show original object ids of blobs/commits" +msgstr "ikili nesnelerin/iลlemelerin orijinal nesne numaralarฤฑnฤฑ gรถster" + +#: builtin/fast-export.c:1234 +msgid "Label tags with mark ids" +msgstr "etiketleri im numaralarฤฑyla adlandฤฑr" + +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "--anonymize-map, --anonymize olmadan bir anlam ifade etmiyor" + +#: builtin/fast-export.c:1272 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "Hem --import-marks ve hem --import-marks-if-exists aktarฤฑlamadฤฑ" + +#: builtin/fast-import.c:3086 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "'%s' altmodรผlรผ iรงin '(on)-dan' imleri eksik" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "'%s' altmodรผlรผ iรงin '(o)-na' imleri eksik" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "'mark' komutu bekleniyordu, %s alฤฑndฤฑ" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "'to' komutu bekleniyordu, %s alฤฑndฤฑ" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "Altmodรผl yeniden yazฤฑm seรงeneฤi iรงin name:filename biรงimi bekleniyordu" + +#: builtin/fast-import.c:3374 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "'%s' รถzelliฤi --allow-unsafe-features olmadan girdide yasaklฤฑ" + +#: builtin/fetch-pack.c:241 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "Kilit dosyasฤฑ oluลturuldu; ancak raporlanmadฤฑ: %s" + +#: builtin/fetch.c:35 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<seรงenekler>] [<depo> [<bลvr-blrtรง>...]]" + +#: builtin/fetch.c:36 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<seรงenekler>] <grup>" + +#: builtin/fetch.c:37 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<seรงenekler>] [(<depo> | <grup>)...]" + +#: builtin/fetch.c:38 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<seรงenekler>]" + +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel negatif olamaz" + +#: builtin/fetch.c:142 builtin/pull.c:185 +msgid "fetch from all remotes" +msgstr "tรผm uzak konumlardan getir" + +#: builtin/fetch.c:144 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "git pull/fetch iรงin รผstkaynak ayarla" + +#: builtin/fetch.c:146 builtin/pull.c:188 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr ".git/FETCH_HEAD'in รผzerine yazmak yerine ona iliลtir" + +#: builtin/fetch.c:148 builtin/pull.c:191 +msgid "path to upload pack on remote end" +msgstr "uzak uรงtaki yรผkleme paketine olan yol" + +#: builtin/fetch.c:149 +msgid "force overwrite of local reference" +msgstr "yerel baลvurunun รผzerine zorla yaz" + +#: builtin/fetch.c:151 +msgid "fetch from multiple remotes" +msgstr "birden รงok uzak konumdan getir" + +#: builtin/fetch.c:153 builtin/pull.c:195 +msgid "fetch all tags and associated objects" +msgstr "tรผm etiketleri ve iliลkilendirilen nesneleri getir" + +#: builtin/fetch.c:155 +msgid "do not fetch all tags (--no-tags)" +msgstr "tรผm etiketleri getirme (--no-tags)" + +#: builtin/fetch.c:157 +msgid "number of submodules fetched in parallel" +msgstr "paralelde getirilen altmodรผllerin sayฤฑsฤฑ" + +#: builtin/fetch.c:159 builtin/pull.c:198 +msgid "prune remote-tracking branches no longer on remote" +msgstr "artฤฑk uzak konumda olmayan uzak izleme dallarฤฑnฤฑ buda" + +#: builtin/fetch.c:161 +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:162 builtin/fetch.c:187 builtin/pull.c:122 +msgid "on-demand" +msgstr "istek รผzerine" + +#: builtin/fetch.c:163 +msgid "control recursive fetching of submodules" +msgstr "altmodรผllerin รถzyineli getirilmesini denetle" + +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "getirilen baลvurularฤฑ FETCH_HEAD dosyasฤฑna yaz" + +#: builtin/fetch.c:169 builtin/pull.c:206 +msgid "keep downloaded pack" +msgstr "indirilen paketi tut" + +#: builtin/fetch.c:171 +msgid "allow updating of HEAD ref" +msgstr "HEAD baลvurusunun gรผncellenmesine izin ver" + +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 +msgid "deepen history of shallow clone" +msgstr "sฤฑฤ klonun geรงmiลini derinleลtir" + +#: builtin/fetch.c:176 builtin/pull.c:212 +msgid "deepen history of shallow repository based on time" +msgstr "zamana baฤlฤฑ olarak sฤฑฤ deponun geรงmiลini derinleลtir" + +#: builtin/fetch.c:182 builtin/pull.c:221 +msgid "convert to a complete repository" +msgstr "tam bir depoya dรถnรผลtรผr" + +#: builtin/fetch.c:185 +msgid "prepend this to submodule path output" +msgstr "bunu altmodรผl yol รงฤฑktฤฑsฤฑnฤฑn baลฤฑna ekle" + +#: builtin/fetch.c:188 +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:192 builtin/pull.c:224 +msgid "accept refs that update .git/shallow" +msgstr ".git/shallow'u gรผncelleyen baลvurularฤฑ kabul et" + +#: builtin/fetch.c:193 builtin/pull.c:226 +msgid "refmap" +msgstr "ilgili baลvuru" + +#: builtin/fetch.c:194 builtin/pull.c:227 +msgid "specify fetch refmap" +msgstr "getirme ile ilgili baลvurularฤฑ belirt" + +#: builtin/fetch.c:201 builtin/pull.c:240 +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:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "getirme sonrasฤฑnda 'maintenance --auto' รงalฤฑลtฤฑr" + +#: builtin/fetch.c:208 builtin/pull.c:243 +msgid "check for forced-updates on all updated branches" +msgstr "tรผm gรผncellenmiล dallarฤฑ zorlanmฤฑล gรผncellemeler iรงin denetle" + +#: builtin/fetch.c:210 +msgid "write the commit-graph after fetching" +msgstr "getirdikten sonra iลleme grafiฤini yaz" + +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "baลvuru belirteรงlerini stdin'den oku" + +#: builtin/fetch.c:523 +msgid "Couldn't find remote ref HEAD" +msgstr "Uzak HEAD baลvurusu bulunamadฤฑ" + +#: builtin/fetch.c:677 +#, 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:775 +#, c-format +msgid "object %s not found" +msgstr "%s nesnesi bulunamadฤฑ" + +#: builtin/fetch.c:779 +msgid "[up to date]" +msgstr "[gรผncel]" + +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 +msgid "[rejected]" +msgstr "[reddedildi]" + +#: builtin/fetch.c:793 +msgid "can't fetch in current branch" +msgstr "geรงerli dalda getirme yapฤฑlamฤฑyor" + +#: builtin/fetch.c:803 +msgid "[tag update]" +msgstr "[etiket gรผncellemesi]" + +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 +msgid "unable to update local ref" +msgstr "yerel baลvuru gรผncellenemiyor" + +#: builtin/fetch.c:808 +msgid "would clobber existing tag" +msgstr "var olan etiketi deฤiลtirecektir" + +#: builtin/fetch.c:830 +msgid "[new tag]" +msgstr "[yeni etiket]" + +#: builtin/fetch.c:833 +msgid "[new branch]" +msgstr "[yeni dal]" + +#: builtin/fetch.c:836 +msgid "[new ref]" +msgstr "[yeni baลvuru]" + +#: builtin/fetch.c:875 +msgid "forced update" +msgstr "zorlanmฤฑล gรผncelleme" + +#: builtin/fetch.c:880 +msgid "non-fast-forward" +msgstr "ileri sarฤฑm deฤil" + +#: builtin/fetch.c:901 +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:905 +#, 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:939 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s tรผm gerekli nesneleri gรถndermedi\n" + +#: builtin/fetch.c:960 +#, 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:1053 builtin/fetch.c:1191 +#, c-format +msgid "From %.*s\n" +msgstr "ลu konumdan: %.*s\n" + +#: builtin/fetch.c:1064 +#, 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:1161 +#, c-format +msgid " (%s will become dangling)" +msgstr " (%s sarkacak)" + +#: builtin/fetch.c:1162 +#, c-format +msgid " (%s has become dangling)" +msgstr " (%s sarkmaya baลladฤฑ)" + +#: builtin/fetch.c:1194 +msgid "[deleted]" +msgstr "[silindi]" + +#: builtin/fetch.c:1195 builtin/remote.c:1113 +msgid "(none)" +msgstr "(hiรงbiri)" + +#: builtin/fetch.c:1218 +#, 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:1237 +#, 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:1240 +#, 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:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "birden รงok dal algฤฑlandฤฑ, --set-upstream ile uyumsuz" + +#: builtin/fetch.c:1463 +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:1465 +msgid "not setting upstream for a remote tag" +msgstr "bir uzak konum etiketi iรงin รผstkaynak ayarlanmฤฑyor" + +#: builtin/fetch.c:1467 +msgid "unknown branch type" +msgstr "bilinmeyen dal tรผrรผ" + +#: builtin/fetch.c:1469 +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:1598 builtin/fetch.c:1661 +#, c-format +msgid "Fetching %s\n" +msgstr "%s getiriliyor\n" + +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 +#, c-format +msgid "Could not fetch %s" +msgstr "%s getirilemedi" + +#: builtin/fetch.c:1620 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "'%s' getirilemedi (รงฤฑkฤฑล kodu: %d)\n" + +#: builtin/fetch.c:1724 +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:1760 +msgid "You need to specify a tag name." +msgstr "Bir etiket adฤฑ belirtmeniz gerekiyor." + +#: builtin/fetch.c:1825 +msgid "Negative depth in --deepen is not supported" +msgstr "--deepen iรงin negatif derinlik desteklenmiyor" + +#: builtin/fetch.c:1827 +msgid "--deepen and --depth are mutually exclusive" +msgstr "--deepen ve --depth birlikte kullanฤฑlamaz" + +#: builtin/fetch.c:1832 +msgid "--depth and --unshallow cannot be used together" +msgstr "--depth ve --unshallow birlikte kullanฤฑlamaz" + +#: builtin/fetch.c:1834 +msgid "--unshallow on a complete repository does not make sense" +msgstr "tam bir depo รผzerinde --unshallow bir anlam ifade etmiyor" + +#: builtin/fetch.c:1851 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all bir depo deฤiลkeni almฤฑyor" + +#: builtin/fetch.c:1853 +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:1862 +#, 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:1869 +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:1887 +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/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "" +"--stdin seรงeneฤi yalnฤฑzca bir uzak konumdan getirilirken kullanฤฑlabilir" + +#: builtin/fmt-merge-msg.c:7 +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:18 +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:21 +msgid "alias for --log (deprecated)" +msgstr "--log iรงin arma (kullanฤฑlmamalฤฑ)" + +#: builtin/fmt-merge-msg.c:24 +msgid "text" +msgstr "metin" + +#: builtin/fmt-merge-msg.c:25 +msgid "use <text> as start of message" +msgstr "iletinin baลlangฤฑcฤฑ olarak <metin> kullan" + +#: builtin/fmt-merge-msg.c:26 +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 [<commit>]] [--no-merged [<commit>]]" +msgstr "git for-each-ref [--merged [<iลleme>]] [--no-merged [<iลleme>]]" + +#: builtin/for-each-ref.c:13 +msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" +msgstr "git for-each-ref [--contains [<iลleme>]] [--no-contains [<iลleme>]]" + +#: 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:440 +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 iลlemeyi 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 iลlemeyi iรงermeyen baลvurularฤฑ yazdฤฑr" + +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 +msgid "unknown" +msgstr "bilinmeyen" + +#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> +#: builtin/fsck.c:101 builtin/fsck.c:121 +#, 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:115 +#, c-format +msgid "warning in %s %s: %s" +msgstr "%s %s iรงinde uyarฤฑ: %s" + +#: builtin/fsck.c:144 builtin/fsck.c:147 +#, c-format +msgid "broken link from %7s %s" +msgstr "ลuradan kฤฑrฤฑk baฤ: %7s %s" + +#: builtin/fsck.c:156 +msgid "wrong object type in link" +msgstr "baฤda yanlฤฑล nesne tรผrรผ" + +#: builtin/fsck.c:172 +#, 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:283 +#, c-format +msgid "missing %s %s" +msgstr "eksik %s %s" + +#: builtin/fsck.c:310 +#, c-format +msgid "unreachable %s %s" +msgstr "ulaลฤฑlamayan %s %s" + +#: builtin/fsck.c:330 +#, c-format +msgid "dangling %s %s" +msgstr "sarkan %s %s" + +#: builtin/fsck.c:340 +msgid "could not create lost-found" +msgstr "lost-found oluลturulamadฤฑ" + +#: builtin/fsck.c:351 +#, c-format +msgid "could not finish '%s'" +msgstr "'%s' bitirilemedi" + +#: builtin/fsck.c:368 +#, c-format +msgid "Checking %s" +msgstr "%s denetleniyor" + +#: builtin/fsck.c:406 +#, c-format +msgid "Checking connectivity (%d objects)" +msgstr "Baฤlanabilirlik denetleniyor (%d nesne)" + +#: builtin/fsck.c:425 +#, c-format +msgid "Checking %s %s" +msgstr "%s %s denetleniyor" + +#: builtin/fsck.c:430 +msgid "broken links" +msgstr "kฤฑrฤฑk baฤlar" + +#: builtin/fsck.c:439 +#, c-format +msgid "root %s" +msgstr "kรถk %s" + +#: builtin/fsck.c:447 +#, c-format +msgid "tagged %s %s (%s) in %s" +msgstr "%s %s (%s) ลurada etiketlendi: %s" + +#: builtin/fsck.c:476 +#, c-format +msgid "%s: object corrupt or missing" +msgstr "%s: nesne hasar gรถrmรผล veya kayฤฑp" + +#: builtin/fsck.c:501 +#, c-format +msgid "%s: invalid reflog entry %s" +msgstr "%s: geรงersiz baลvuru gรผnlรผฤรผ girdisi %s" + +#: builtin/fsck.c:515 +#, c-format +msgid "Checking reflog %s->%s" +msgstr "Baลvuru gรผnlรผฤรผ denetleniyor: %s->%s" + +#: builtin/fsck.c:549 +#, c-format +msgid "%s: invalid sha1 pointer %s" +msgstr "%s: geรงersiz sha1 iลaretรงisi %s" + +#: builtin/fsck.c:556 +#, c-format +msgid "%s: not a commit" +msgstr "%s: bir iลleme deฤil" + +#: builtin/fsck.c:610 +msgid "notice: No default references" +msgstr "Uyarฤฑ: รntanฤฑmlฤฑ baลvurular yok" + +#: builtin/fsck.c:625 +#, c-format +msgid "%s: object corrupt or missing: %s" +msgstr "%s: nesne hasar gรถrmรผล veya kayฤฑp: %s" + +#: builtin/fsck.c:638 +#, c-format +msgid "%s: object could not be parsed: %s" +msgstr "%s: nesne ayrฤฑลtฤฑrฤฑlamadฤฑ: %s" + +#: builtin/fsck.c:658 +#, c-format +msgid "bad sha1 file: %s" +msgstr "hatalฤฑ sha1 dosyasฤฑ: %s" + +#: builtin/fsck.c:673 +msgid "Checking object directory" +msgstr "Nesne dizini denetleniyor" + +#: builtin/fsck.c:676 +msgid "Checking object directories" +msgstr "Nesne dizinleri denetleniyor" + +#: builtin/fsck.c:691 +#, c-format +msgid "Checking %s link" +msgstr "%s baฤ denetleniyor" + +#: builtin/fsck.c:696 builtin/index-pack.c:865 +#, c-format +msgid "invalid %s" +msgstr "geรงersiz %s" + +#: builtin/fsck.c:703 +#, c-format +msgid "%s points to something strange (%s)" +msgstr "%s garip bir ลeye iลaret ediyor (%s)" + +#: builtin/fsck.c:709 +#, c-format +msgid "%s: detached HEAD points at nothing" +msgstr "%s: ayrฤฑk HEAD bir ลeye iลaret etmiyor" + +#: builtin/fsck.c:713 +#, 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:725 +msgid "Checking cache tree" +msgstr "รnbellek aฤacฤฑ denetleniyor" + +#: builtin/fsck.c:730 +#, 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:739 +msgid "non-tree in cache-tree" +msgstr "cache-tree iรงinde aฤaรง olmayan รถge" + +#: builtin/fsck.c:770 +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<seรงenekler>] [<nesne>...]" + +#: builtin/fsck.c:776 +msgid "show unreachable objects" +msgstr "ulaลฤฑlamayan nesneleri gรถster" + +#: builtin/fsck.c:777 +msgid "show dangling objects" +msgstr "sarkan nesneleri gรถster" + +#: builtin/fsck.c:778 +msgid "report tags" +msgstr "etiketleri bildir" + +#: builtin/fsck.c:779 +msgid "report root nodes" +msgstr "kรถk dรผฤรผmleri bildir" + +#: builtin/fsck.c:780 +msgid "make index objects head nodes" +msgstr "indeks nesnelerini dal ucu dรผฤรผmรผ yap" + +#: builtin/fsck.c:781 +msgid "make reflogs head nodes (default)" +msgstr "baลvuru gรผnlรผklerini dal ucu dรผฤรผmรผ yap (รถntanฤฑmlฤฑ)" + +#: builtin/fsck.c:782 +msgid "also consider packs and alternate objects" +msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al" + +#: builtin/fsck.c:783 +msgid "check only connectivity" +msgstr "yalnฤฑzca baฤlanabilirliฤi denetle" + +#: builtin/fsck.c:784 +msgid "enable more strict checking" +msgstr "daha kesin denetlemeyi etkinleลtir" + +#: builtin/fsck.c:786 +msgid "write dangling objects in .git/lost-found" +msgstr "sarkan nesneleri .git/lost-found'a yaz" + +#: builtin/fsck.c:787 builtin/prune.c:134 +msgid "show progress" +msgstr "ilerlemeyi gรถster" + +#: builtin/fsck.c:788 +msgid "show verbose names for reachable objects" +msgstr "ulaลฤฑlabilir nesneler iรงin ayrฤฑntฤฑlฤฑ adlarฤฑ gรถster" + +#: builtin/fsck.c:847 builtin/index-pack.c:261 +msgid "Checking objects" +msgstr "Nesneler denetleniyor" + +#: builtin/fsck.c:875 +#, c-format +msgid "%s: object missing" +msgstr "%s: nesne kayฤฑp" + +#: builtin/fsck.c:886 +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "geรงersiz parametre: sha1 bekleniyordu, '%s' alฤฑndฤฑ" + +#: builtin/gc.c:36 +msgid "git gc [<options>]" +msgstr "git gc [<seรงenekler>]" + +#: builtin/gc.c:91 +#, c-format +msgid "Failed to fstat %s: %s" +msgstr "%s fstat yapฤฑlamadฤฑ: %s" + +#: builtin/gc.c:127 +#, c-format +msgid "failed to parse '%s' value '%s'" +msgstr "'%s' deฤeri '%s' ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: builtin/gc.c:476 builtin/init-db.c:58 +#, c-format +msgid "cannot stat '%s'" +msgstr "'%s' bilgileri alฤฑnamฤฑyor" + +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 +#, c-format +msgid "cannot read '%s'" +msgstr "'%s' okunamฤฑyor" + +#: builtin/gc.c:492 +#, 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:540 +msgid "prune unreferenced objects" +msgstr "baลvurulmayan nesneleri buda" + +#: builtin/gc.c:542 +msgid "be more thorough (increased runtime)" +msgstr "biraz daha titiz ol (artฤฑrฤฑlmฤฑล iลleyiล sรผresi)" + +#: builtin/gc.c:543 +msgid "enable auto-gc mode" +msgstr "auto-gc kipini etkinleลtir" + +#: builtin/gc.c:546 +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:549 +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:566 +#, c-format +msgid "failed to parse gc.logexpiry value %s" +msgstr "gc.logexpiry deฤeri %s ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: builtin/gc.c:577 +#, c-format +msgid "failed to parse prune expiry value %s" +msgstr "'prune expiry' deฤeri %s ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: builtin/gc.c:597 +#, 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:599 +#, 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:600 +#, 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:640 +#, 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:695 +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/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<gรถrev>]" + +#: builtin/gc.c:812 +msgid "failed to write commit-graph" +msgstr "commit-graph yazฤฑlamadฤฑ" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "kilit dosyasฤฑ '%s' mevcut, bakฤฑm atlanฤฑyor" + +#: builtin/gc.c:932 +#, c-format +msgid "task '%s' failed" +msgstr "'%s' gรถrevi baลarฤฑsฤฑz oldu" + +#: builtin/gc.c:979 +#, c-format +msgid "'%s' is not a valid task" +msgstr "'%s' geรงerli bir gรถrev deฤil" + +#: builtin/gc.c:984 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "'%s' gรถrevi birden รงok kez seรงilemez" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "gรถrevleri deponun durumuna gรถre รงalฤฑลtฤฑr" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "stderr รผzerinden ilerlemeyi veya baลka bir bilgiyi raporlama" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "gรถrev" + +#: builtin/gc.c:1003 +msgid "run a specific task" +msgstr "belirli bir gรถrevi รงalฤฑลtฤฑr" + +#: builtin/gc.c:1026 +msgid "git maintenance run [<options>]" +msgstr "git maintenance run [<seรงenekler>]" + +#: builtin/gc.c:1037 +#, c-format +msgid "invalid subcommand: %s" +msgstr "geรงersiz altkomut: %s" + +#: 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:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "iล parรงacฤฑฤฤฑ desteฤi yok, %s yok sayฤฑlฤฑyor" + +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 +#, c-format +msgid "unable to read tree (%s)" +msgstr "aฤaรง okunamฤฑyor (%s)" + +#: builtin/grep.c:655 +#, 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:725 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "'%c' anahtarฤฑ sayฤฑsal bir deฤer bekliyor" + +#: builtin/grep.c:824 +msgid "search in index instead of in the work tree" +msgstr "รงalฤฑลma aฤacฤฑ yerine indekste ara" + +#: builtin/grep.c:826 +msgid "find in contents not managed by git" +msgstr "git tarafฤฑndan yรถnetilmeyen iรงerikte bul" + +#: builtin/grep.c:828 +msgid "search in both tracked and untracked files" +msgstr "hem izlenen hem izlenmeyen dosyalar iรงinde ara" + +#: builtin/grep.c:830 +msgid "ignore files specified via '.gitignore'" +msgstr "'.gitignore'da belirtilen dosyalarฤฑ yok say" + +#: builtin/grep.c:832 +msgid "recursively search in each submodule" +msgstr "her altmodรผlde รถzyineli olarak ara" + +#: builtin/grep.c:835 +msgid "show non-matching lines" +msgstr "eลleลmeyen satฤฑrlarฤฑ gรถster" + +#: builtin/grep.c:837 +msgid "case insensitive matching" +msgstr "BรYรK/kรผรงรผk harf duyarsฤฑz eลleลme" + +#: builtin/grep.c:839 +msgid "match patterns only at word boundaries" +msgstr "yalnฤฑzca sรถzcรผk sฤฑnฤฑrlarฤฑndaki dizgileri eลleลtir" + +#: builtin/grep.c:841 +msgid "process binary files as text" +msgstr "ikili dosyalarฤฑ metin olarak iลle" + +#: builtin/grep.c:843 +msgid "don't match patterns in binary files" +msgstr "ikili dosyalardaki dizgileri eลleลtirme" + +#: builtin/grep.c:846 +msgid "process binary files with textconv filters" +msgstr "ikili dosyalarฤฑ textconv sรผzgeรงleri ile iลle" + +#: builtin/grep.c:848 +msgid "search in subdirectories (default)" +msgstr "altdizinlerde ara (รถntanฤฑmlฤฑ)" + +#: builtin/grep.c:850 +msgid "descend at most <depth> levels" +msgstr "en รงok <derinlik> dรผzey in" + +#: builtin/grep.c:854 +msgid "use extended POSIX regular expressions" +msgstr "geniลletilmiล POSIX dรผzenli ifadelerini kullan" + +#: builtin/grep.c:857 +msgid "use basic POSIX regular expressions (default)" +msgstr "temel POSIX dรผzenli ifadelerini kullan (รถntanฤฑmlฤฑ)" + +#: builtin/grep.c:860 +msgid "interpret patterns as fixed strings" +msgstr "dizgileri sabit diziler olarak yorumla" + +#: builtin/grep.c:863 +msgid "use Perl-compatible regular expressions" +msgstr "Perl uyumlu dรผzenli ifadeler kullan" + +#: builtin/grep.c:866 +msgid "show line numbers" +msgstr "satฤฑr numaralarฤฑnฤฑ gรถster" + +#: builtin/grep.c:867 +msgid "show column number of first match" +msgstr "ilk eลleลmenin sรผtun numarasฤฑnฤฑ gรถster" + +#: builtin/grep.c:868 +msgid "don't show filenames" +msgstr "dosya adlarฤฑnฤฑ gรถsterme" + +#: builtin/grep.c:869 +msgid "show filenames" +msgstr "dosya adlarฤฑnฤฑ gรถster" + +#: builtin/grep.c:871 +msgid "show filenames relative to top directory" +msgstr "dosya adlarฤฑnฤฑ en รผst dizine gรถreceli olarak gรถster" + +#: builtin/grep.c:873 +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:875 +msgid "synonym for --files-with-matches" +msgstr "--files-with-matches eลanlamlฤฑsฤฑ" + +#: builtin/grep.c:878 +msgid "show only the names of files without match" +msgstr "eลleลme olmadan yalnฤฑzca dosya adlarฤฑnฤฑ gรถster" + +#: builtin/grep.c:880 +msgid "print NUL after filenames" +msgstr "dosya adlarฤฑndan sonra NUL yazdฤฑr" + +#: builtin/grep.c:883 +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:885 +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:886 +msgid "highlight matches" +msgstr "eลleลmeleri vurgula" + +#: builtin/grep.c:888 +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:890 +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:893 +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:896 +msgid "show <n> context lines before matches" +msgstr "eลleลmelerden รถnce <n> satฤฑr baฤlam gรถster" + +#: builtin/grep.c:898 +msgid "show <n> context lines after matches" +msgstr "eลleลmelerden sonra <n> satฤฑr baฤlam gรถster" + +#: builtin/grep.c:900 +msgid "use <n> worker threads" +msgstr "<n> iล parรงacฤฑฤฤฑ kullan" + +#: builtin/grep.c:901 +msgid "shortcut for -C NUM" +msgstr "-C NUM iรงin kฤฑsayol" + +#: builtin/grep.c:904 +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:906 +msgid "show the surrounding function" +msgstr "รงevresindeki iลlevi gรถster" + +#: builtin/grep.c:909 +msgid "read patterns from file" +msgstr "dizgileri dosyadan oku" + +#: builtin/grep.c:911 +msgid "match <pattern>" +msgstr "<dizgi> ile eลleล" + +#: builtin/grep.c:913 +msgid "combine patterns specified with -e" +msgstr "-e ile belirtilen dizgileri birleลtir" + +#: builtin/grep.c:925 +msgid "indicate hit with exit status without output" +msgstr "รงฤฑkฤฑล durumu ile olan eลleลmelerde รงฤฑktฤฑ verme" + +#: builtin/grep.c:927 +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:929 +msgid "show parse tree for grep expression" +msgstr "grep ifadesi iรงin ayrฤฑลtฤฑrma aฤacฤฑnฤฑ gรถster" + +#: builtin/grep.c:933 +msgid "pager" +msgstr "sayfalayฤฑcฤฑ" + +#: builtin/grep.c:933 +msgid "show matching files in the pager" +msgstr "sayfalayฤฑcฤฑda eลleลen dosyalarฤฑ gรถster" + +#: builtin/grep.c:937 +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:1004 +msgid "no pattern given" +msgstr "bir dizgi verilmedi" + +#: builtin/grep.c:1040 +msgid "--no-index or --untracked cannot be used with revs" +msgstr "--no-index veya --untracked revizyonlarla birlikte kullanฤฑlamaz" + +#: builtin/grep.c:1048 +#, c-format +msgid "unable to resolve revision: %s" +msgstr "revizyon รงรถzรผlemiyor: %s" + +#: builtin/grep.c:1078 +msgid "--untracked not supported with --recurse-submodules" +msgstr "--untracked, --recurse-submodules ile desteklenmiyor" + +#: builtin/grep.c:1082 +msgid "invalid option combination, ignoring --threads" +msgstr "geรงersiz seรงenek birleลtirmesi, --threads yok sayฤฑlฤฑyor" + +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 +msgid "no threads support, ignoring --threads" +msgstr "iล parรงacฤฑฤฤฑ desteฤi yok, --threads yok sayฤฑlฤฑyor" + +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "geรงersiz belirtilen iล parรงacฤฑฤฤฑ sayฤฑsฤฑ (%d)" + +#: builtin/grep.c:1122 +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:1148 +msgid "--cached or --untracked cannot be used with --no-index" +msgstr "--cached veya --untracked, --no-index ile birlikte kullanฤฑlamฤฑyor" + +#: builtin/grep.c:1154 +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:1162 +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:47 +msgid "print all available commands" +msgstr "tรผm kullanฤฑlabilir komutlarฤฑ yazdฤฑr" + +#: builtin/help.c:48 +msgid "exclude guides" +msgstr "kฤฑlavuzlarฤฑ hariรง tut" + +#: builtin/help.c:49 +msgid "print list of useful guides" +msgstr "kullanฤฑลlฤฑ kฤฑlavuzlarฤฑn listesini รงฤฑkar" + +#: builtin/help.c:50 +msgid "print all configuration variable names" +msgstr "tรผm yapฤฑlandฤฑrma deฤiลkenleri adlarฤฑnฤฑ yazdฤฑr" + +#: builtin/help.c:52 +msgid "show man page" +msgstr "man sayfasฤฑnฤฑ gรถster" + +#: builtin/help.c:53 +msgid "show manual in web browser" +msgstr "kฤฑlavuzu web tarayฤฑcฤฑsฤฑnda gรถster" + +#: builtin/help.c:55 +msgid "show info page" +msgstr "bilgi sayfasฤฑnฤฑ gรถster" + +#: builtin/help.c:57 +msgid "print command description" +msgstr "komut aรงฤฑklamasฤฑnฤฑ yazdฤฑr" + +#: builtin/help.c:62 +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<komut>]" + +#: builtin/help.c:163 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "tanฤฑmlanamayan yardฤฑm biรงimi '%s'" + +#: builtin/help.c:190 +msgid "Failed to start emacsclient." +msgstr "emacsclient baลlatฤฑlamadฤฑ." + +#: builtin/help.c:203 +msgid "Failed to parse emacsclient version." +msgstr "emacsclient sรผrรผmรผ ayrฤฑลtฤฑrฤฑlamadฤฑ." + +#: builtin/help.c:211 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "emacsclient sรผrรผmรผ '%d' pek eski (<22)." + +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 +#, c-format +msgid "failed to exec '%s'" +msgstr "'%s' รงalฤฑลtฤฑrฤฑlamadฤฑ" + +#: builtin/help.c:307 +#, 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:319 +#, 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:436 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "'%s': Bilinmeyen man gรถrรผntรผleyicisi." + +#: builtin/help.c:453 +msgid "no man viewer handled the request" +msgstr "isteฤe hiรงbir man gรถrรผntรผleyicisi ele almadฤฑ" + +#: builtin/help.c:461 +msgid "no info viewer handled the request" +msgstr "isteฤe hiรงbir bilgi gรถrรผntรผleyicisi ele almadฤฑ" + +#: builtin/help.c:520 builtin/help.c:531 git.c:337 +#, c-format +msgid "'%s' is aliased to '%s'" +msgstr "'%s', '%s' olarak armalanmฤฑล" + +#: builtin/help.c:534 git.c:369 +#, c-format +msgid "bad alias.%s string: %s" +msgstr "hatalฤฑ alias.%s dizisi: %s" + +#: builtin/help.c:563 builtin/help.c:593 +#, c-format +msgid "usage: %s%s" +msgstr "kullanฤฑm: %s%s" + +#: builtin/help.c:577 +msgid "'git help config' for more information" +msgstr "ek bilgi iรงin: 'git help config'" + +#: builtin/index-pack.c:221 +#, c-format +msgid "object type mismatch at %s" +msgstr "%s konumunda nesne tรผrรผ uyuลmazlฤฑฤฤฑ" + +#: builtin/index-pack.c:241 +#, c-format +msgid "did not receive expected object %s" +msgstr "beklenen nesne %s alฤฑnmadฤฑ" + +#: builtin/index-pack.c:244 +#, c-format +msgid "object %s: expected type %s, found %s" +msgstr "nesne %s: beklenen tรผr %s, bulunan %s" + +#: builtin/index-pack.c:294 +#, 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:304 +msgid "early EOF" +msgstr "erken dosya sonu" + +#: builtin/index-pack.c:305 +msgid "read error on input" +msgstr "girdide okuma hatasฤฑ" + +#: builtin/index-pack.c:317 +msgid "used more bytes than were available" +msgstr "kullanฤฑlabilir olandan daha รงok bayt kullanฤฑldฤฑ" + +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 +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:327 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:342 builtin/repack.c:254 +#, c-format +msgid "unable to create '%s'" +msgstr "'%s' oluลturulamฤฑyor" + +#: builtin/index-pack.c:348 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "'%s' paket dosyasฤฑ aรงฤฑlamฤฑyor" + +#: builtin/index-pack.c:362 +msgid "pack signature mismatch" +msgstr "paket imzasฤฑ uyuลmazlฤฑฤฤฑ" + +#: builtin/index-pack.c:364 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "paket sรผrรผmรผ %<PRIu32> desteklenmiyor" + +#: builtin/index-pack.c:382 +#, c-format +msgid "pack has bad object at offset %<PRIuMAX>: %s" +msgstr "paketin %<PRIuMAX> ofsetinde hatalฤฑ nesne var: %s" + +#: builtin/index-pack.c:488 +#, c-format +msgid "inflate returned %d" +msgstr "ลiลirme programฤฑ %d dรถndรผrdรผ" + +#: builtin/index-pack.c:537 +msgid "offset value overflow for delta base object" +msgstr "delta tabanฤฑ nesnesi iรงin ofset deฤeri taลฤฑmฤฑ" + +#: builtin/index-pack.c:545 +msgid "delta base offset is out of bound" +msgstr "delta tabanฤฑ ofseti sฤฑnฤฑrlar dฤฑลฤฑnda" + +#: builtin/index-pack.c:553 +#, c-format +msgid "unknown object type %d" +msgstr "bilinmeyen nesne tรผrรผ %d" + +#: builtin/index-pack.c:584 +msgid "cannot pread pack file" +msgstr "paket dosyasฤฑ 'pread' yapฤฑlamฤฑyor" + +#: builtin/index-pack.c:586 +#, 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:612 +msgid "serious inflate inconsistency" +msgstr "ciddi ลiลirme programฤฑ tutarsฤฑzlฤฑฤฤฑ" + +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "%s ฤฐLE SHA1 รARPIลMASI BULUNDU!" + +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#, c-format +msgid "unable to read %s" +msgstr "%s okunamฤฑyor" + +#: builtin/index-pack.c:824 +#, c-format +msgid "cannot read existing object info %s" +msgstr "mevcut %s nesne bilgisi okunamฤฑyor" + +#: builtin/index-pack.c:832 +#, c-format +msgid "cannot read existing object %s" +msgstr "mevcut %s nesnesi okunamฤฑyor" + +#: builtin/index-pack.c:846 +#, c-format +msgid "invalid blob object %s" +msgstr "geรงersiz %s ikili nesnesi" + +#: builtin/index-pack.c:849 builtin/index-pack.c:868 +msgid "fsck error in packed object" +msgstr "paketlenmiล nesne iรงinde fsck hatasฤฑ" + +#: builtin/index-pack.c:870 +#, 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:931 builtin/index-pack.c:978 +msgid "failed to apply delta" +msgstr "delta uygulanamadฤฑ" + +#: builtin/index-pack.c:1161 +msgid "Receiving objects" +msgstr "Nesneler alฤฑnฤฑyor" + +#: builtin/index-pack.c:1161 +msgid "Indexing objects" +msgstr "Nesneler indeksleniyor" + +#: builtin/index-pack.c:1195 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "paket hasar gรถrmรผล (SHA1 uyumsuzluฤu)" + +#: builtin/index-pack.c:1200 +msgid "cannot fstat packfile" +msgstr "paket dosyasฤฑ fstat yapฤฑlamฤฑyor" + +#: builtin/index-pack.c:1203 +msgid "pack has junk at the end" +msgstr "paket sonunda dรถkรผntรผler var" + +#: builtin/index-pack.c:1215 +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:1238 +msgid "Resolving deltas" +msgstr "Deltalar รงรถzรผlรผyor" + +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 +#, c-format +msgid "unable to create thread: %s" +msgstr "iล parรงacฤฑฤฤฑ oluลturulamadฤฑ: %s" + +#: builtin/index-pack.c:1282 +msgid "confusion beyond insanity" +msgstr "karmaลa akฤฑl almaz dรผzeyde" + +#: builtin/index-pack.c:1288 +#, 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:1300 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "%s iรงin beklenmedik kuyruk saฤlamasฤฑ (disk hasarฤฑ?)" + +#: builtin/index-pack.c:1304 +#, 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:1328 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "iliลtirilen nesne sรถndรผrรผlemedi (%d)" + +#: builtin/index-pack.c:1424 +#, c-format +msgid "local object %s is corrupt" +msgstr "yerel nesne %s hasarlฤฑ" + +#: builtin/index-pack.c:1444 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "paket dosyasฤฑ adฤฑ '%s', '.pack' ile bitmiyor" + +#: builtin/index-pack.c:1469 +#, c-format +msgid "cannot write %s file '%s'" +msgstr "%s dosyasฤฑ '%s' yazฤฑlamฤฑyor" + +#: builtin/index-pack.c:1477 +#, c-format +msgid "cannot close written %s file '%s'" +msgstr "yazฤฑlmฤฑล %s dosyasฤฑ '%s' kapatฤฑlamฤฑyor" + +#: builtin/index-pack.c:1501 +msgid "error while closing pack file" +msgstr "paket dosyasฤฑ kapatฤฑlฤฑrken hata" + +#: builtin/index-pack.c:1515 +msgid "cannot store pack file" +msgstr "paket dosyasฤฑ depolanamฤฑyor" + +#: builtin/index-pack.c:1523 +msgid "cannot store index file" +msgstr "indeks dosyasฤฑ depolanamฤฑyor" + +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "hatalฤฑ pack.indexversion=%<PRIu32>" + +#: builtin/index-pack.c:1631 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "Mevcut paket dosyasฤฑ '%s' aรงฤฑlamฤฑyor" + +#: builtin/index-pack.c:1633 +#, 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:1681 +#, 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:1688 +#, 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:1728 +msgid "Cannot come back to cwd" +msgstr "ลu anki รงalฤฑลma dizinine geri gelinemiyor" + +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 +#, c-format +msgid "bad %s" +msgstr "hatalฤฑ %s" + +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "bilinmeyen saฤlama algoritmasฤฑ '%s'" + +#: builtin/index-pack.c:1821 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin, --stdin olmadan kullanฤฑlamaz" + +#: builtin/index-pack.c:1823 +msgid "--stdin requires a git repository" +msgstr "--stdin bir git dizini gerektirir" + +#: builtin/index-pack.c:1825 +msgid "--object-format cannot be used with --stdin" +msgstr "--object-format, --stdin olmadan kullanฤฑlamaz" + +#: builtin/index-pack.c:1831 +msgid "--verify with no packfile name given" +msgstr "--verify ile bir paket dosyasฤฑ adฤฑ verilmedi" + +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 +msgid "fsck error in pack objects" +msgstr "paket nesnelerinde fsck hatasฤฑ" + +#: builtin/init-db.c:64 +#, c-format +msgid "cannot stat template '%s'" +msgstr "'%s' ลablonunun bilgileri alฤฑnamฤฑyor" + +#: builtin/init-db.c:69 +#, c-format +msgid "cannot opendir '%s'" +msgstr "'%s' opendir yapฤฑlamฤฑyor" + +#: builtin/init-db.c:81 +#, c-format +msgid "cannot readlink '%s'" +msgstr "'%s' readlink yapฤฑlamฤฑyor" + +#: builtin/init-db.c:83 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "'%s', '%s' รถgesine sembolik baฤla baฤlanamฤฑyor" + +#: builtin/init-db.c:89 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "'%s' ลuraya kopyalanamฤฑyor: '%s'" + +#: builtin/init-db.c:93 +#, c-format +msgid "ignoring template %s" +msgstr "%s ลablonu yok sayฤฑlฤฑyor" + +#: builtin/init-db.c:124 +#, c-format +msgid "templates not found in %s" +msgstr "ลablonlar %s iรงinde bulunamadฤฑ" + +#: builtin/init-db.c:139 +#, c-format +msgid "not copying templates from '%s': %s" +msgstr "ลablonlar '%s' konumundan kopyalanmฤฑyor: %s" + +#: builtin/init-db.c:274 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "geรงersiz baลlangฤฑรง dalฤฑ adฤฑ: '%s'" + +#: builtin/init-db.c:366 +#, c-format +msgid "unable to handle file type %d" +msgstr "%d dosya tรผrรผ ele alฤฑnamฤฑyor" + +#: builtin/init-db.c:369 +#, c-format +msgid "unable to move %s to %s" +msgstr "%s ลuraya taลฤฑnamฤฑyor: %s" + +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "depoyu baลka bir saฤlama ile yeniden ilklendirme deneniyor" + +#: builtin/init-db.c:409 builtin/init-db.c:412 +#, c-format +msgid "%s already exists" +msgstr "%s halihazฤฑrda var" + +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: --initial-branch=%s yok sayฤฑldฤฑ" + +#: builtin/init-db.c:474 +#, 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:475 +#, 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:479 +#, 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:480 +#, 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:529 +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:555 +msgid "permissions" +msgstr "izinler" + +#: builtin/init-db.c:556 +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:562 +msgid "override the name of the initial branch" +msgstr "baลlangฤฑรง dalฤฑnฤฑn adฤฑnฤฑ geรงersiz kฤฑl" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +msgid "hash" +msgstr "saฤlama" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "kullanฤฑlacak saฤlama algoritmasฤฑnฤฑ belirle" + +#: builtin/init-db.c:571 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--separate-git-dir ve --bare birlikte kullanฤฑlamaz" + +#: builtin/init-db.c:600 builtin/init-db.c:605 +#, c-format +msgid "cannot mkdir %s" +msgstr "%s mkdir yapฤฑlamฤฑyor" + +#: builtin/init-db.c:609 builtin/init-db.c:664 +#, c-format +msgid "cannot chdir to %s" +msgstr "%s รถgesine chdir yapฤฑlamฤฑyor" + +#: builtin/init-db.c:636 +#, 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:688 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "'%s' รงalฤฑลma aฤacฤฑ eriลilemiyor" + +#: builtin/init-db.c:693 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separate-git-dir, รงฤฑplak depo ile uyumsuz" + +#: 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 " +"<jeton>[(=|:)<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 "ayฤฑrma รงizgilerine (---) รถ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:177 +msgid "show source" +msgstr "kaynaฤฤฑ gรถster" + +#: builtin/log.c:178 +msgid "Use mail map file" +msgstr "posta eลlem dosyasฤฑnฤฑ kullan" + +#: builtin/log.c:181 +msgid "only decorate refs that match <pattern>" +msgstr "yalnฤฑzca <dizgi> ile eลleลen baลvurularฤฑ sรผsle" + +#: builtin/log.c:183 +msgid "do not decorate refs that match <pattern>" +msgstr "<dizgi> ile eลleลen baลvurularฤฑ sรผsleme" + +#: builtin/log.c:184 +msgid "decorate options" +msgstr "sรผsleme seรงenekleri" + +#: builtin/log.c:187 +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:297 +#, c-format +msgid "Final output: %d %s\n" +msgstr "Son รงฤฑktฤฑ: %d %s\n" + +#: builtin/log.c:555 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s: hatalฤฑ dosya" + +#: builtin/log.c:570 builtin/log.c:665 +#, c-format +msgid "could not read object %s" +msgstr "%s nesnesi okunamadฤฑ" + +#: builtin/log.c:690 +#, c-format +msgid "unknown type: %d" +msgstr "bilinmeyen tรผr: %d" + +#: builtin/log.c:839 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%s: aรงฤฑklama kipinden geรงersiz kapak sayfasฤฑ" + +#: builtin/log.c:846 +msgid "format.headers without value" +msgstr "format.headers deฤere iye deฤil" + +#: builtin/log.c:965 +msgid "name of output directory is too long" +msgstr "รงฤฑktฤฑ dizininin adฤฑ pek uzun" + +#: builtin/log.c:981 +#, c-format +msgid "cannot open patch file %s" +msgstr "%s yama dosyasฤฑ okunamฤฑyor" + +#: builtin/log.c:998 +msgid "need exactly one range" +msgstr "bir tam erim gerekiyor" + +#: builtin/log.c:1008 +msgid "not a range" +msgstr "bir erim deฤil" + +#: builtin/log.c:1172 +msgid "cover letter needs email format" +msgstr "niyet mektubu iรงin e-posta biรงimi gerekli" + +#: builtin/log.c:1178 +msgid "failed to create cover-letter file" +msgstr "cover-letter dosyasฤฑ oluลturulamadฤฑ" + +#: builtin/log.c:1259 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "akฤฑl almaz in-reply-to: %s" + +#: builtin/log.c:1286 +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<seรงenekler>] [<-beri> | <revizyon-erimi>]" + +#: builtin/log.c:1344 +msgid "two output directories?" +msgstr "iki รงฤฑktฤฑ dizini?" + +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 +#, c-format +msgid "unknown commit %s" +msgstr "bilinmeyen iลleme %s" + +#: builtin/log.c:1506 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:1515 +msgid "could not find exact merge base" +msgstr "kesin birleลtirme temeli bulunamadฤฑ" + +#: builtin/log.c:1525 +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 iลlemesinin 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 iลlemesini kendiniz --base=<taban-iลlemesi-no>\n" +"kullanarak el ile belirtebilirsiniz." + +#: builtin/log.c:1548 +msgid "failed to find exact merge base" +msgstr "kesin birleลtirme temeli bulunamadฤฑ" + +#: builtin/log.c:1565 +msgid "base commit should be the ancestor of revision list" +msgstr "taban iลlemesi revizyon listesinin atasฤฑ olmalฤฑ" + +#: builtin/log.c:1575 +msgid "base commit shouldn't be in revision list" +msgstr "taban iลlemesi revizyon listesinde olmamalฤฑ" + +#: builtin/log.c:1633 +msgid "cannot get patch id" +msgstr "yama numarasฤฑ alฤฑnamฤฑyor" + +#: builtin/log.c:1690 +msgid "failed to infer range-diff origin of current series" +msgstr "geรงerli dizinin range-diff kรถkeninden bir anlam รงฤฑkartฤฑlamadฤฑ" + +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "geรงerli dizinin range-diff kรถkeni olarak '%s' kullanฤฑlฤฑyor" + +#: builtin/log.c:1736 +msgid "use [PATCH n/m] even with a single patch" +msgstr "bir yamayla bile olsa [PATCH n/m] kullan" + +#: builtin/log.c:1739 +msgid "use [PATCH] even with multiple patches" +msgstr "birden รงok yama bile olsa [PATCH] kullan" + +#: builtin/log.c:1743 +msgid "print patches to standard out" +msgstr "yamalarฤฑ standart รงฤฑktฤฑya yazdฤฑr" + +#: builtin/log.c:1745 +msgid "generate a cover letter" +msgstr "bir niyet mektubu oluลtur" + +#: builtin/log.c:1747 +msgid "use simple number sequence for output file names" +msgstr "รงฤฑktฤฑ dosya adlarฤฑ iรงin yalฤฑn sayฤฑ dizisi oluลtur" + +#: builtin/log.c:1748 +msgid "sfx" +msgstr "sonek" + +#: builtin/log.c:1749 +msgid "use <sfx> instead of '.patch'" +msgstr "'.patch' yerine <sonek> kullan" + +#: builtin/log.c:1751 +msgid "start numbering patches at <n> instead of 1" +msgstr "yamalarฤฑ 1 yerine <n>'de numaralandฤฑrmaya baลla" + +#: builtin/log.c:1753 +msgid "mark the series as Nth re-roll" +msgstr "diziyi n. deneme olarak imle" + +#: builtin/log.c:1755 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "[PATCH] yerine [RFC PATCH] kullan" + +#: builtin/log.c:1758 +msgid "cover-from-description-mode" +msgstr "aรงฤฑklama kipinden kapak sayfasฤฑ kipi" + +#: builtin/log.c:1759 +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:1761 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "[PATCH] yerine [<รถnek>] kullan" + +#: builtin/log.c:1764 +msgid "store resulting files in <dir>" +msgstr "ortaya รงฤฑkan dosyalarฤฑ <dizin>'de depola" + +#: builtin/log.c:1767 +msgid "don't strip/add [PATCH]" +msgstr "[PATCH]'i soyma/ekleme" + +#: builtin/log.c:1770 +msgid "don't output binary diffs" +msgstr "ikili diff'leri รงฤฑktฤฑ verme" + +#: builtin/log.c:1772 +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:1774 +msgid "don't include a patch matching a commit upstream" +msgstr "รผstkaynaktaki bir iลleme ile eลleลen bir yamayฤฑ iรงerme" + +#: builtin/log.c:1776 +msgid "show patch format instead of default (patch + stat)" +msgstr "รถntanฤฑmlฤฑ yerine yama biรงimini gรถster (patch + stat)" + +#: builtin/log.c:1778 +msgid "Messaging" +msgstr "ฤฐletileลme" + +#: builtin/log.c:1779 +msgid "header" +msgstr "รผstbilgi" + +#: builtin/log.c:1780 +msgid "add email header" +msgstr "e-posta รผstbilgisi ekle" + +#: builtin/log.c:1781 builtin/log.c:1782 +msgid "email" +msgstr "e-posta" + +#: builtin/log.c:1781 +msgid "add To: header" +msgstr "To: รผstbilgisi ekle" + +#: builtin/log.c:1782 +msgid "add Cc: header" +msgstr "Cc: รผstbilgisi ekle" + +#: builtin/log.c:1783 +msgid "ident" +msgstr "tanฤฑmlayฤฑcฤฑ" + +#: builtin/log.c:1784 +msgid "set From address to <ident> (or committer ident if absent)" +msgstr "" +"From adresini <tanฤฑmlayฤฑcฤฑ> olarak ayarla (veya yoksa iลleyici tanฤฑmlayฤฑcฤฑsฤฑ)" + +#: builtin/log.c:1786 +msgid "message-id" +msgstr "ileti no" + +#: builtin/log.c:1787 +msgid "make first mail a reply to <message-id>" +msgstr "ilk postayฤฑ <ileti no>'ya bir yanฤฑt yap" + +#: builtin/log.c:1788 builtin/log.c:1791 +msgid "boundary" +msgstr "sฤฑnฤฑr" + +#: builtin/log.c:1789 +msgid "attach the patch" +msgstr "yamayฤฑ ekle" + +#: builtin/log.c:1792 +msgid "inline the patch" +msgstr "yamayฤฑ iletiye koy" + +#: builtin/log.c:1796 +msgid "enable message threading, styles: shallow, deep" +msgstr "iletileri kataloglamayฤฑ etkinleลtir, stiller: shallow, deep" + +#: builtin/log.c:1798 +msgid "signature" +msgstr "imza" + +#: builtin/log.c:1799 +msgid "add a signature" +msgstr "imza ekle" + +#: builtin/log.c:1800 +msgid "base-commit" +msgstr "taban iลleme" + +#: builtin/log.c:1801 +msgid "add prerequisite tree info to the patch series" +msgstr "yama dizisine รถnkoลul aฤaรง bilgisini ekle" + +#: builtin/log.c:1804 +msgid "add a signature from a file" +msgstr "dosyadan bir imza ekle" + +#: builtin/log.c:1805 +msgid "don't print the patch filenames" +msgstr "yama dosya adlarฤฑnฤฑ yazdฤฑrma" + +#: builtin/log.c:1807 +msgid "show progress while generating patches" +msgstr "yamalar oluลturulurken ilerlemeyi gรถster" + +#: builtin/log.c:1809 +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:1812 +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:1814 +msgid "percentage by which creation is weighted" +msgstr "oluลumun tartฤฑldฤฑฤฤฑ yรผzde" + +#: builtin/log.c:1896 +#, c-format +msgid "invalid ident line: %s" +msgstr "geรงersiz tanฤฑmlayฤฑcฤฑ satฤฑrฤฑ: %s" + +#: builtin/log.c:1911 +msgid "-n and -k are mutually exclusive" +msgstr "-n ve -k birlikte kullanฤฑlamaz" + +#: builtin/log.c:1913 +msgid "--subject-prefix/--rfc and -k are mutually exclusive" +msgstr "--subject-prefix/--rfc ve -k birlikte kullanฤฑlamaz" + +#: builtin/log.c:1921 +msgid "--name-only does not make sense" +msgstr "--name-only bir anlam ifade etmiyor" + +#: builtin/log.c:1923 +msgid "--name-status does not make sense" +msgstr "--name-status bir anlam ifade etmiyor" + +#: builtin/log.c:1925 +msgid "--check does not make sense" +msgstr "--check bir anlam ifade etmiyor" + +#: builtin/log.c:1958 +msgid "standard output, or directory, which one?" +msgstr "standart รงฤฑktฤฑ veya dizin, hangisi?" + +#: builtin/log.c:2062 +msgid "--interdiff requires --cover-letter or single patch" +msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor" + +#: builtin/log.c:2066 +msgid "Interdiff:" +msgstr "Interdiff:" + +#: builtin/log.c:2067 +#, c-format +msgid "Interdiff against v%d:" +msgstr "Interdiff v%d karลฤฑsฤฑnda:" + +#: builtin/log.c:2073 +msgid "--creation-factor requires --range-diff" +msgstr "--creation-factor, --range-diff gerektiriyor" + +#: builtin/log.c:2077 +msgid "--range-diff requires --cover-letter or single patch" +msgstr "--range-diff, --cover-letter veya tek yama gerektiriyor" + +#: builtin/log.c:2085 +msgid "Range-diff:" +msgstr "Range-diff:" + +#: builtin/log.c:2086 +#, c-format +msgid "Range-diff against v%d:" +msgstr "Range-diff v%d karลฤฑsฤฑnda:" + +#: builtin/log.c:2097 +#, c-format +msgid "unable to read signature file '%s'" +msgstr "'%s' imza dosyasฤฑ okunamฤฑyor" + +#: builtin/log.c:2133 +msgid "Generating patches" +msgstr "Yamalar oluลturuluyor" + +#: builtin/log.c:2177 +msgid "failed to create output files" +msgstr "รงฤฑktฤฑ dosyalarฤฑ oluลturulamadฤฑ" + +#: builtin/log.c:2236 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<รผstkaynak> [<dal-ucu> [<sฤฑnฤฑr>]]]" + +#: builtin/log.c:2290 +#, 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:471 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<seรงenekler>] [<dosya>...]" + +#: builtin/ls-files.c:527 +msgid "identify the file status with tags" +msgstr "dosya durumunu etiketlerle tanฤฑmla" + +#: builtin/ls-files.c:529 +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:531 +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "'fsmonitor clean' dosyalarฤฑnฤฑ kรผรงรผk harflerle gรถster" + +#: builtin/ls-files.c:533 +msgid "show cached files in the output (default)" +msgstr "รถnbelleฤe alฤฑnan dosyalarฤฑ รงฤฑktฤฑda gรถster (รถntanฤฑmlฤฑ)" + +#: builtin/ls-files.c:535 +msgid "show deleted files in the output" +msgstr "silinen dosyalarฤฑ รงฤฑktฤฑda gรถster" + +#: builtin/ls-files.c:537 +msgid "show modified files in the output" +msgstr "deฤiลtirilen dosyalarฤฑ รงฤฑktฤฑda gรถster" + +#: builtin/ls-files.c:539 +msgid "show other files in the output" +msgstr "diฤer dosyalarฤฑ รงฤฑktฤฑda gรถster" + +#: builtin/ls-files.c:541 +msgid "show ignored files in the output" +msgstr "yok sayฤฑlan dosyalarฤฑ รงฤฑktฤฑda gรถster" + +#: builtin/ls-files.c:544 +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:546 +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:548 +msgid "show 'other' directories' names only" +msgstr "'diฤer' dizinlerin yalnฤฑzca adฤฑnฤฑ gรถster" + +#: builtin/ls-files.c:550 +msgid "show line endings of files" +msgstr "dosyalarฤฑn satฤฑr sonlarฤฑnฤฑ gรถster" + +#: builtin/ls-files.c:552 +msgid "don't show empty directories" +msgstr "boล dizinleri gรถsterme" + +#: builtin/ls-files.c:555 +msgid "show unmerged files in the output" +msgstr "birleลtirilmemiล dosyalarฤฑ รงฤฑktฤฑda gรถster" + +#: builtin/ls-files.c:557 +msgid "show resolve-undo information" +msgstr "'resolve-undo' bilgisini gรถster" + +#: builtin/ls-files.c:559 +msgid "skip files matching pattern" +msgstr "dizgi ile eลleลen dosyalarฤฑ atla" + +#: builtin/ls-files.c:562 +msgid "exclude patterns are read from <file>" +msgstr "hariรง tutma dizgileri <dosya>'dan okunuyor" + +#: builtin/ls-files.c:565 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "ek dizin baลฤฑ hariรง tutma dizgilerini <dosya>'dan oku" + +#: builtin/ls-files.c:567 +msgid "add the standard git exclusions" +msgstr "standart git hariรง tutmalarฤฑnฤฑ ekle" + +#: builtin/ls-files.c:571 +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:574 +msgid "recurse through submodules" +msgstr "altmodรผller iรงinden รถzyinele" + +#: builtin/ls-files.c:576 +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:577 +msgid "tree-ish" +msgstr "aฤacฤฑmsฤฑ" + +#: builtin/ls-files.c:578 +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:580 +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:1392 +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รง iลlemelere 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-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <iลleme> <iลleme>..." + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <iลleme>..." + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <iลleme>..." + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <iลleme> <iลleme>" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <baลvuru> [<iลleme>]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "tรผm ortak atalarฤฑ รงฤฑktฤฑ ver" + +#: builtin/merge-base.c:145 +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:147 +msgid "list revs not reachable from others" +msgstr "baลkalarฤฑ tarafฤฑndan ulaลฤฑlabilir revizyonlarฤฑ listele" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "ilki diฤerlerinin atasฤฑ mฤฑ?" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "<iลleme>'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ฤฑ ele alฤฑnamฤฑyor. %s yok sayฤฑlฤฑyor." +msgstr[1] "%d tabandan fazlasฤฑ ele alฤฑnamฤฑyor. %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/merge.c:56 +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<seรงenekler>] [<iลleme>...]" + +#: builtin/merge.c:57 +msgid "git merge --abort" +msgstr "git merge --abort" + +#: builtin/merge.c:58 +msgid "git merge --continue" +msgstr "git merge --continue" + +#: builtin/merge.c:120 +msgid "switch `m' requires a value" +msgstr "'m' anahtarฤฑ bir deฤer gerektiriyor" + +#: builtin/merge.c:143 +#, c-format +msgid "option `%s' requires a value" +msgstr "'%s' seรงeneฤi bir deฤer gerektiriyor" + +#: builtin/merge.c:189 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Birleลtirme stratejisi '%s' bulunamadฤฑ.\n" + +#: builtin/merge.c:190 +#, c-format +msgid "Available strategies are:" +msgstr "Kullanฤฑlabilir stratejiler:" + +#: builtin/merge.c:195 +#, c-format +msgid "Available custom strategies are:" +msgstr "Kullanฤฑlabilir รถzel stratejiler:" + +#: builtin/merge.c:246 builtin/pull.c:133 +msgid "do not show a diffstat at the end of the merge" +msgstr "birleลtirmenin sonunda bir diffstat gรถsterme" + +#: builtin/merge.c:249 builtin/pull.c:136 +msgid "show a diffstat at the end of the merge" +msgstr "birleลtirmenin sonunda bir diffstat gรถster" + +#: builtin/merge.c:250 builtin/pull.c:139 +msgid "(synonym to --stat)" +msgstr "(--stat eลanlamlฤฑsฤฑ)" + +#: builtin/merge.c:252 builtin/pull.c:142 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "" +"kฤฑsa gรผnlรผkten birleลtirme iลlemesi iletisine girdiler (en รงok <n>) ekle" + +#: builtin/merge.c:255 builtin/pull.c:148 +msgid "create a single commit instead of doing a merge" +msgstr "birleลtirme yerine tek bir iลleme oluลtur" + +#: builtin/merge.c:257 builtin/pull.c:151 +msgid "perform a commit if the merge succeeds (default)" +msgstr "birleลtirme baลarฤฑlฤฑ olursa bir iลleme gerรงekleลtir (รถntanฤฑmlฤฑ)" + +#: builtin/merge.c:259 builtin/pull.c:154 +msgid "edit message before committing" +msgstr "gรถndermeden รถnce iletiyi dรผzenle" + +#: builtin/merge.c:261 +msgid "allow fast-forward (default)" +msgstr "ileri sarฤฑma izin ver (รถntanฤฑmlฤฑ)" + +#: builtin/merge.c:263 builtin/pull.c:161 +msgid "abort if fast-forward is not possible" +msgstr "ileri sarฤฑm olanaklฤฑ deฤilse iptal et" + +#: builtin/merge.c:267 builtin/pull.c:164 +msgid "verify that the named commit has a valid GPG signature" +msgstr "adฤฑ verilen iลlemenin geรงerli bir GPG imzasฤฑ olduฤunu doฤrula" + +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 +msgid "strategy" +msgstr "strateji" + +#: builtin/merge.c:269 builtin/pull.c:169 +msgid "merge strategy to use" +msgstr "kullanฤฑlacak birleลtirme stratejisi" + +#: builtin/merge.c:270 builtin/pull.c:172 +msgid "option=value" +msgstr "seรงenek=deฤer" + +#: builtin/merge.c:271 builtin/pull.c:173 +msgid "option for selected merge strategy" +msgstr "seรงili birleลtirme stratejisi iรงin seรงenekler" + +#: builtin/merge.c:273 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "" +"birleลtirme iลlemesi iletisi (ileri sarฤฑm olmayan bir birleลtirme iรงin)" + +#: builtin/merge.c:280 +msgid "abort the current in-progress merge" +msgstr "ilerlemekte olan geรงerli birleลtirmeyi iptal et" + +#: builtin/merge.c:282 +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:284 +msgid "continue the current in-progress merge" +msgstr "ilerlemekte olan geรงerli birleลtirmeyi sรผrdรผrรผn" + +#: builtin/merge.c:286 builtin/pull.c:180 +msgid "allow merging unrelated histories" +msgstr "birbiriyle iliลkisi olmayan geรงmiลlerin birleลtirilmesine izin ver" + +#: builtin/merge.c:293 +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "pre-merge-commit ve commit-msg kancalarฤฑnฤฑ atla" + +#: builtin/merge.c:310 +msgid "could not run stash." +msgstr "zula yapฤฑlamadฤฑ" + +#: builtin/merge.c:315 +msgid "stash failed" +msgstr "zulalama baลarฤฑsฤฑz oldu" + +#: builtin/merge.c:320 +#, c-format +msgid "not a valid object: %s" +msgstr "geรงerli bir nesne deฤil: %s" + +#: builtin/merge.c:342 builtin/merge.c:359 +msgid "read-tree failed" +msgstr "read-tree baลarฤฑsฤฑz oldu" + +#: builtin/merge.c:389 +msgid " (nothing to squash)" +msgstr " (tฤฑkฤฑลtฤฑrฤฑlacak bir ลey yok)" + +#: builtin/merge.c:400 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "Tฤฑkฤฑลtฤฑrma iลlemesi -- HEAD gรผncellenmiyor\n" + +#: builtin/merge.c:450 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "Birleลtirme iletisi yok -- HEAD gรผncellenmiyor\n" + +#: builtin/merge.c:501 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "'%s' bir iลlemeye iลaret etmiyor" + +#: builtin/merge.c:588 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Hatalฤฑ branch.%s.mergeoptions dizisi: %s" + +#: builtin/merge.c:713 +msgid "Not handling anything other than two heads merge." +msgstr "ฤฐki uรง iลlemenin birleลtirilmesi dฤฑลฤฑnda bir ลey yapฤฑlmฤฑyor." + +#: builtin/merge.c:726 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "merge-recursive iรงin geรงersiz seรงenek: -X%s" + +#: builtin/merge.c:741 +#, c-format +msgid "unable to write %s" +msgstr "%s yazฤฑlamฤฑyor" + +#: builtin/merge.c:793 +#, c-format +msgid "Could not read from '%s'" +msgstr "ลu konumdan okunamadฤฑ: '%s'" + +#: builtin/merge.c:802 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "Birleลtirme iลlenmiyor, tamamlamak iรงin 'git commit' kullanฤฑn.\n" + +#: builtin/merge.c:808 +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 iลleme iletisi\n" +"girin, รถzellikle gรผncellenmiล bir รผstkaynaฤฤฑ kiลisel dala birleลtiriyorsa.\n" +"\n" + +#: builtin/merge.c:813 +msgid "An empty message aborts the commit.\n" +msgstr "Boล bir ileti iลlemeyi iptal eder.\n" + +#: builtin/merge.c:816 +#, 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 iลlemeyi\n" +"iptal eder.\n" + +#: builtin/merge.c:869 +msgid "Empty commit message." +msgstr "Boล iลleme iletisi." + +#: builtin/merge.c:884 +#, c-format +msgid "Wonderful.\n" +msgstr "Harika.\n" + +#: builtin/merge.c:945 +#, 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 iลleyin.\n" + +#: builtin/merge.c:984 +msgid "No current branch." +msgstr "Geรงerli dal yok." + +#: builtin/merge.c:986 +msgid "No remote for the current branch." +msgstr "Geรงerli dal iรงin uzak konum yok." + +#: builtin/merge.c:988 +msgid "No default upstream defined for the current branch." +msgstr "Geรงerli dal iรงin รถntanฤฑmlฤฑ รผstkaynak tanฤฑmlanmamฤฑล." + +#: builtin/merge.c:993 +#, c-format +msgid "No remote-tracking branch for %s from %s" +msgstr "%s iรงin %s konumundan uzak izleyen dal yok" + +#: builtin/merge.c:1050 +#, c-format +msgid "Bad value '%s' in environment '%s'" +msgstr "Hatalฤฑ deฤer '%s', '%s' ortamฤฑnda" + +#: builtin/merge.c:1153 +#, 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:1187 +msgid "not something we can merge" +msgstr "birleลtirebileceฤimiz bir ลey deฤil" + +#: builtin/merge.c:1291 +msgid "--abort expects no arguments" +msgstr "--abort bir deฤiลken beklemez" + +#: builtin/merge.c:1295 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "ฤฐptal edilecek bir birleลtirme yok (MERGE_HEAD eksik)." + +#: builtin/merge.c:1313 +msgid "--quit expects no arguments" +msgstr "--quit bir deฤiลken beklemez" + +#: builtin/merge.c:1326 +msgid "--continue expects no arguments" +msgstr "--continue bir deฤiลken beklemez" + +#: builtin/merge.c:1330 +msgid "There is no merge in progress (MERGE_HEAD missing)." +msgstr "ฤฐlerlemekte olan bir birleลtirme yok (MERGE_HEAD eksik)." + +#: builtin/merge.c:1346 +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 iลleyin." + +#: builtin/merge.c:1353 +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 iลleyin." + +#: builtin/merge.c:1356 +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:1370 +msgid "You cannot combine --squash with --no-ff." +msgstr "--squash ile --no-ff birlikte kullanฤฑlamaz." + +#: builtin/merge.c:1372 +msgid "You cannot combine --squash with --commit." +msgstr "--squash ile --commit birlikte kullanฤฑlamaz." + +#: builtin/merge.c:1388 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "Belirtilen bir iลleme yok ve merge.defaultToUpstream ayarlanmamฤฑล." + +#: builtin/merge.c:1405 +msgid "Squash commit into empty head not supported yet" +msgstr "ฤฐลlemeyi boล dal ucuna tฤฑkฤฑลtฤฑrma henรผz desteklenmiyor" + +#: builtin/merge.c:1407 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" +"ฤฐleri sarฤฑm olmayan iลlemeyi boล dal ucuna yapmak bir anlam ifade etmiyor" + +#: builtin/merge.c:1412 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - birleลtirebileceฤimiz bir ลey deฤil" + +#: builtin/merge.c:1414 +msgid "Can merge only exactly one commit into empty head" +msgstr "Boล dal ucuna tam olarak yalnฤฑzca bir iลleme birleลtirilebilir" + +#: builtin/merge.c:1495 +msgid "refusing to merge unrelated histories" +msgstr "birbiriyle iliลkisi olmayan geรงmiลleri birleลtirme reddediliyor" + +#: builtin/merge.c:1504 +msgid "Already up to date." +msgstr "Tรผmรผ gรผncel." + +#: builtin/merge.c:1514 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Gรผncelleniyor: %s..%s\n" + +#: builtin/merge.c:1560 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "Gerรงekten รถnemsiz indeks iรงi birleลtirme deneniyor...\n" + +#: builtin/merge.c:1567 +#, c-format +msgid "Nope.\n" +msgstr "Yok.\n" + +#: builtin/merge.c:1592 +msgid "Already up to date. Yeeah!" +msgstr "Tรผmรผ gรผncel. ฤฐลte bu!" + +#: builtin/merge.c:1598 +msgid "Not possible to fast-forward, aborting." +msgstr "ฤฐleri sarma olanaklฤฑ deฤil, iptal ediliyor." + +#: builtin/merge.c:1626 builtin/merge.c:1691 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "Aฤaรง bozulmamฤฑล durumuna geri sarฤฑlฤฑyor...\n" + +#: builtin/merge.c:1630 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "%s birleลtirme stratejisi deneniyor...\n" + +#: builtin/merge.c:1682 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Birleลtirmeyi hiรงbir birleลtirme stratejisi iลlemedi\n" + +#: builtin/merge.c:1684 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "%s stratejisi ile birleลtirme baลarฤฑsฤฑz oldu.\n" + +#: builtin/merge.c:1693 +#, 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:1707 +#, 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/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:25 +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:170 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "'%s' hedefi bir dizin deฤil" + +#: builtin/mv.c:181 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "'%s'->'%s' yeniden adlandฤฑrmasฤฑ denetleniyor\n" + +#: builtin/mv.c:185 +msgid "bad source" +msgstr "hatalฤฑ kaynak" + +#: builtin/mv.c:188 +msgid "can not move directory into itself" +msgstr "dizin kendi iรงine taลฤฑnamฤฑyor" + +#: builtin/mv.c:191 +msgid "cannot move directory over file" +msgstr "dizin dosya รผzerinden taลฤฑnamฤฑyor" + +#: builtin/mv.c:200 +msgid "source directory is empty" +msgstr "kaynak dizin boล" + +#: builtin/mv.c:225 +msgid "not under version control" +msgstr "sรผrรผm denetimi altฤฑnda deฤil" + +#: builtin/mv.c:227 +msgid "conflicted" +msgstr "รงakฤฑลmalฤฑ" + +#: builtin/mv.c:230 +msgid "destination exists" +msgstr "hedef mevcut" + +#: builtin/mv.c:238 +#, c-format +msgid "overwriting '%s'" +msgstr "รผzerine yazฤฑlฤฑyor: '%s'" + +#: builtin/mv.c:241 +msgid "Cannot overwrite" +msgstr "รzerine yazฤฑlamฤฑyor" + +#: builtin/mv.c:244 +msgid "multiple sources for the same target" +msgstr "aynฤฑ hedef iรงin birden รงok kaynak" + +#: builtin/mv.c:246 +msgid "destination directory does not exist" +msgstr "hedef dizin mevcut deฤil" + +#: builtin/mv.c:253 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, kaynak=%s, hedef:%s" + +#: builtin/mv.c:274 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "%s, %s olarak yeniden adlandฤฑrฤฑlฤฑyor\n" + +#: builtin/mv.c:280 builtin/remote.c:782 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>] <iลleme>..." + +#: 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 ref-based names (no object names)" +msgstr "yalnฤฑzca baลvuru tabanlฤฑ adlarฤฑ yazdฤฑr (nesne adฤฑ yok)" + +#: builtin/name-rev.c:525 +msgid "only use tags to name the commits" +msgstr "iลlemeleri 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 iลlemeleri 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:533 +#, 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 "" +"'edit' altkomutunun -m/-F/-c/-C seรงenekleri artฤฑk eski ve kullanฤฑlmamalฤฑ.\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 "iลleme, NOTES_MERGE_PARTIAL รถgesinden bulunamadฤฑ." + +#: builtin/notes.c:726 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "iลleme, NOTES_MERGE_PARTIAL รถgesinden 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 iลleniyor" + +#: builtin/notes.c:792 +msgid "finalize notes merge by committing unmerged notes" +msgstr "birleลtirilmemiล notlarฤฑ iลleyerek 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 iลleyin. Birleลtirmeyi iptal " +"etmek isterseniz 'git notes merge --abort' kullanarak bunu yapabilirsiniz.\n" + +#: builtin/notes.c:897 builtin/tag.c:546 +#, 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:132 builtin/worktree.c:220 +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:1605 +#, c-format +msgid "unknown subcommand: %s" +msgstr "bilinmeyen altkomut: %s" + +#: builtin/pack-objects.c:54 +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:55 +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:443 +#, c-format +msgid "bad packed object CRC for %s" +msgstr "%s iรงin hatalฤฑ paketlenmiล nesne CRC'si" + +#: builtin/pack-objects.c:454 +#, c-format +msgid "corrupt packed object for %s" +msgstr "%s iรงin hasar gรถrmรผล paketlenmiล nesne" + +#: builtin/pack-objects.c:585 +#, c-format +msgid "recursive delta detected for object %s" +msgstr "%s nesnesi iรงin รถzyineli delta algฤฑlandฤฑ" + +#: builtin/pack-objects.c:796 +#, c-format +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "%u nesne sipariล verildi, %<PRIu32> bekleniyordu" + +#: builtin/pack-objects.c:1004 +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:1017 +msgid "Writing objects" +msgstr "Nesneler yazฤฑlฤฑyor" + +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 +#, c-format +msgid "failed to stat %s" +msgstr "%s bilgileri alฤฑnamฤฑyor" + +#: builtin/pack-objects.c:1131 +#, c-format +msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" +msgstr "%<PRIu32> nesne yazฤฑldฤฑ (%<PRIu32> bekleniyordu)" + +#: builtin/pack-objects.c:1348 +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:1796 +#, 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:1805 +#, 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:2086 +msgid "Counting objects" +msgstr "Nesneler sayฤฑlฤฑyor" + +#: builtin/pack-objects.c:2231 +#, c-format +msgid "unable to parse object header of %s" +msgstr "%s nesne รผstbilgisi ayrฤฑลtฤฑrฤฑlamฤฑyor" + +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 +#, c-format +msgid "object %s cannot be read" +msgstr "%s nesnesi okunamฤฑyor" + +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 +#, 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:2341 +msgid "suboptimal pack - out of memory" +msgstr "standart altฤฑ paket - bellek yetersiz" + +#: builtin/pack-objects.c:2656 +#, 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:2795 +#, c-format +msgid "unable to pack objects reachable from tag %s" +msgstr "%s etiketinden ulaลฤฑlabilir nesneler paketlenemiyor" + +#: builtin/pack-objects.c:2883 +msgid "Compressing objects" +msgstr "Nesneler sฤฑkฤฑลtฤฑrฤฑlฤฑyor" + +#: builtin/pack-objects.c:2889 +msgid "inconsistency with delta count" +msgstr "delta sayฤฑmฤฑnda tutarsฤฑzlฤฑk" + +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" +"uploadpack.blobpackfileuri deฤeri '<nesne-saฤlamasฤฑ> <paket-saฤlamasฤฑ> <uri> " +"biรงiminde olmalฤฑdฤฑr ('%s' alฤฑndฤฑ)" + +#: builtin/pack-objects.c:2964 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" +"nesne halihazฤฑrda baลka bir uploadpack.blobpackfileuri iรงinde yapฤฑlandฤฑrฤฑldฤฑ " +"('%s' alฤฑndฤฑ)" + +#: builtin/pack-objects.c:2993 +#, 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:2999 +#, 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:3097 +msgid "invalid value for --missing" +msgstr "--missing iรงin geรงersiz deฤer" + +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 +msgid "cannot open pack index" +msgstr "paket indeksi aรงฤฑlamฤฑyor" + +#: builtin/pack-objects.c:3187 +#, c-format +msgid "loose object at %s could not be examined" +msgstr "%s konumundaki gevลek nesne incelenemedi" + +#: builtin/pack-objects.c:3272 +msgid "unable to force loose object" +msgstr "gevลek nesne zorlanamฤฑyor" + +#: builtin/pack-objects.c:3365 +#, c-format +msgid "not a rev '%s'" +msgstr "bir revizyon deฤil: '%s'" + +#: builtin/pack-objects.c:3368 +#, c-format +msgid "bad revision '%s'" +msgstr "hatalฤฑ revizyon: '%s'" + +#: builtin/pack-objects.c:3393 +msgid "unable to add recent objects" +msgstr "en son nesneler eklenemiyor" + +#: builtin/pack-objects.c:3446 +#, c-format +msgid "unsupported index version %s" +msgstr "desteklenmeyen indeks sรผrรผmรผ %s" + +#: builtin/pack-objects.c:3450 +#, c-format +msgid "bad index version '%s'" +msgstr "hatalฤฑ indeks sรผrรผmรผ '%s'" + +#: builtin/pack-objects.c:3488 +msgid "<version>[,<offset>]" +msgstr "<sรผrรผm>[,<ofset>]" + +#: builtin/pack-objects.c:3489 +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:3492 +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:3494 +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:3496 +msgid "ignore packed objects" +msgstr "paketlenmiล nesneleri yok say" + +#: builtin/pack-objects.c:3498 +msgid "limit pack window by objects" +msgstr "paket penceresini nesnelerle sฤฑnฤฑrla" + +#: builtin/pack-objects.c:3500 +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:3502 +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:3504 +msgid "reuse existing deltas" +msgstr "var olan deltalarฤฑ yeniden kullan" + +#: builtin/pack-objects.c:3506 +msgid "reuse existing objects" +msgstr "var olan nesneleri yeniden kullan" + +#: builtin/pack-objects.c:3508 +msgid "use OFS_DELTA objects" +msgstr "OFS_DELTA nesneleri kullan" + +#: builtin/pack-objects.c:3510 +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:3512 +msgid "do not create an empty pack output" +msgstr "boล bir paket รงฤฑktฤฑsฤฑ oluลturma" + +#: builtin/pack-objects.c:3514 +msgid "read revision arguments from standard input" +msgstr "revizyon deฤiลkenlerini standart girdi'den oku" + +#: builtin/pack-objects.c:3516 +msgid "limit the objects to those that are not yet packed" +msgstr "nesneleri henรผz paketlenmeyenlere kฤฑsฤฑtla" + +#: builtin/pack-objects.c:3519 +msgid "include objects reachable from any reference" +msgstr "herhangi bir baลvurudan ulaลฤฑlabilir olan nesneleri iรงer" + +#: builtin/pack-objects.c:3522 +msgid "include objects referred by reflog entries" +msgstr "baลvuru gรผnlรผฤรผ tarafฤฑndan baลvurulan nesneleri iรงer" + +#: builtin/pack-objects.c:3525 +msgid "include objects referred to by the index" +msgstr "indeks tarafฤฑndan baลvurulan nesneleri iรงer" + +#: builtin/pack-objects.c:3528 +msgid "output pack to stdout" +msgstr "paketi stdout'a รงฤฑktฤฑ ver" + +#: builtin/pack-objects.c:3530 +msgid "include tag objects that refer to objects to be packed" +msgstr "paketlenecek nesnelere baลvuran etiket nesnelerini iรงer" + +#: builtin/pack-objects.c:3532 +msgid "keep unreachable objects" +msgstr "ulaลฤฑlamayan nesneleri tut" + +#: builtin/pack-objects.c:3534 +msgid "pack loose unreachable objects" +msgstr "ulaลฤฑlamayan gevลek nesneleri paketle" + +#: builtin/pack-objects.c:3536 +msgid "unpack unreachable objects newer than <time>" +msgstr "<zaman>'dan daha yeni ulaลฤฑlamayan nesneleri aรง" + +#: builtin/pack-objects.c:3539 +msgid "use the sparse reachability algorithm" +msgstr "aralฤฑklฤฑ ulaลฤฑlabilirlik algoritmasฤฑnฤฑ kullan" + +#: builtin/pack-objects.c:3541 +msgid "create thin packs" +msgstr "ince paketler oluลtur" + +#: builtin/pack-objects.c:3543 +msgid "create packs suitable for shallow fetches" +msgstr "sฤฑฤ getirmelere uygun paketler oluลtur" + +#: builtin/pack-objects.c:3545 +msgid "ignore packs that have companion .keep file" +msgstr "eลlik eden .keep dosyasฤฑna iye paketleri yok say" + +#: builtin/pack-objects.c:3547 +msgid "ignore this pack" +msgstr "bu paketi yok say" + +#: builtin/pack-objects.c:3549 +msgid "pack compression level" +msgstr "paket sฤฑkฤฑลtฤฑrma dรผzeyi" + +#: builtin/pack-objects.c:3551 +msgid "do not hide commits by grafts" +msgstr "aลฤฑlarla gelen iลlemeleri gizleme" + +#: builtin/pack-objects.c:3553 +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:3555 +msgid "write a bitmap index together with the pack index" +msgstr "paket indeksiyle birlikte bir biteลlem indeksi de yaz" + +#: builtin/pack-objects.c:3559 +msgid "write a bitmap index if possible" +msgstr "eฤer olanaklฤฑysa bir biteลlem indeksi yaz" + +#: builtin/pack-objects.c:3563 +msgid "handling for missing objects" +msgstr "eksik nesneler iรงin iลlem" + +#: builtin/pack-objects.c:3566 +msgid "do not pack objects in promisor packfiles" +msgstr "nesneleri vaatรงi paket dosyalarฤฑyla paketleme" + +#: builtin/pack-objects.c:3568 +msgid "respect islands during delta compression" +msgstr "delta sฤฑkฤฑลtฤฑrmasฤฑ sฤฑrasฤฑnda adalara uy" + +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "protokol" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "" +"bu protokol ile herhangi bir yapฤฑlandฤฑrฤฑlmฤฑล uploadpack.blobpackfileuri " +"รถgesini hariรง tut" + +#: builtin/pack-objects.c:3600 +#, 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:3605 +#, c-format +msgid "pack.deltaCacheLimit is too high, forcing %d" +msgstr "pack.deltaCacheLimit รงok yรผksek, %d zorlanฤฑyor" + +#: builtin/pack-objects.c:3659 +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:3661 +msgid "minimum pack size limit is 1 MiB" +msgstr "olabilecek en kรผรงรผk paket boyutu limiti 1 MiB'dฤฑr" + +#: builtin/pack-objects.c:3666 +msgid "--thin cannot be used to build an indexable pack" +msgstr "--thin bir indekslenebilir paket yapฤฑmฤฑnda kullanฤฑlamaz" + +#: builtin/pack-objects.c:3669 +msgid "--keep-unreachable and --unpack-unreachable are incompatible" +msgstr "--keep-unreachable ve --unpack-unreachable birbiriyle uyumsuz" + +#: builtin/pack-objects.c:3675 +msgid "cannot use --filter without --stdout" +msgstr "--filter, --stdout olmadan kullanฤฑlamaz" + +#: builtin/pack-objects.c:3735 +msgid "Enumerating objects" +msgstr "Nesneler ortaya dรถkรผlรผyor" + +#: builtin/pack-objects.c:3766 +#, 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:6 +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" + +#: builtin/prune.c:14 +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" +msgstr "" +"git prune [-n] [-v] [--progress] [--expire <zaman>] [--] [<dal-ucu>...]" + +#: builtin/prune.c:133 +msgid "report pruned objects" +msgstr "budanmฤฑล nesneleri bildir" + +#: builtin/prune.c:136 +msgid "expire objects older than <time>" +msgstr "<zaman>'dan daha eski nesnelerin hรผkmรผnรผ kaldฤฑr" + +#: builtin/prune.c:138 +msgid "limit traversal to objects outside promisor packfiles" +msgstr "promisor paket dosyalarฤฑnฤฑn dฤฑลฤฑndaki nesnelere taramayฤฑ kฤฑsฤฑtla" + +#: builtin/prune.c:152 +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:123 +msgid "control for recursive fetching of submodules" +msgstr "altmodรผllerin รถzyineli getirilmesi iรงin denetleme" + +#: builtin/pull.c:127 +msgid "Options related to merging" +msgstr "Birleลtirme ile ilgili seรงenekler" + +#: builtin/pull.c:130 +msgid "incorporate changes by rebasing rather than merging" +msgstr "deฤiลiklikleri birleลtirme yerine yeniden temellendirme ile kat" + +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 +msgid "allow fast-forward" +msgstr "ileri sarฤฑma izin ver" + +#: builtin/pull.c:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" +msgstr "รถncesinde ve sonrasฤฑnda kendiliฤinden zulala/zulalarฤฑ patlat" + +#: builtin/pull.c:183 +msgid "Options related to fetching" +msgstr "Getirme ile ilgili seรงenekler" + +#: builtin/pull.c:193 +msgid "force overwrite of local branch" +msgstr "zorla yerel dalฤฑn รผzerine yaz" + +#: builtin/pull.c:201 +msgid "number of submodules pulled in parallel" +msgstr "paralelde รงekilen altmodรผllerin sayฤฑsฤฑ" + +#: builtin/pull.c:317 +#, c-format +msgid "Invalid value for pull.ff: %s" +msgstr "pull.ff iรงin geรงersiz deฤer: %s" + +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"Iraksak dallarฤฑn nasฤฑl uzlaลtฤฑrฤฑlacaฤฤฑnฤฑ belirtmeden รงekme\n" +"yapฤฑlmasฤฑ รถnerilmez. Bu iletiyi bir sonraki รงekimden รถnce\n" +"aลaฤฤฑdaki komutlardan birini รงalฤฑลtฤฑrarak susturabilirsiniz:\n" +"\n" +"\tgit config pull.rebase false # birleลtir (รถntanฤฑmlฤฑ strateji)\n" +"\tgit config pull.rebase true # yeniden temellendir\n" +"\tgit config pull.ff only # yalnฤฑzca ileri sarฤฑm\n" +"\n" +"Ayarฤฑ global kฤฑlmak iรงin \"git config\"i \"git config --global\" ile\n" +"deฤiลtirin. รntanฤฑmlฤฑ yapฤฑlandฤฑrmayฤฑ yรผrรผtme sฤฑrasฤฑnda --rebase,\n" +"--no-rebase veya --ff-only ile geรงersiz kฤฑlabilirsiniz.\n" + +#: builtin/pull.c:458 +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched." +msgstr "" +"Az รถnce getirdiฤiniz baลvurular arasฤฑnda yeniden temellendirme iรงin aday yok." + +#: builtin/pull.c:460 +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:461 +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:464 +#, 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:469 builtin/rebase.c:1240 git-parse-remote.sh:73 +msgid "You are not currently on a branch." +msgstr "ลu anda bir dal รผzerinde deฤilsiniz." + +#: builtin/pull.c:471 builtin/pull.c:486 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:473 builtin/pull.c:488 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:474 builtin/pull.c:489 +msgid "See git-pull(1) for details." +msgstr "Ayrฤฑntฤฑlar iรงin: git-pull(1)" + +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<uzak-konum>" + +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<dal>" + +#: builtin/pull.c:484 builtin/rebase.c:1238 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:493 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:498 +#, 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 belirtiyor,\n" +"ancak bรถyle bir baลvuru getirilmedi." + +#: builtin/pull.c:609 +#, c-format +msgid "unable to access commit %s" +msgstr "%s iลlemesine eriลilemedi" + +#: builtin/pull.c:894 +msgid "ignoring --verify-signatures for rebase" +msgstr "yeniden temellendirme iรงin --verify-signature yok sayฤฑlฤฑyor" + +#: builtin/pull.c:954 +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:958 +msgid "pull with rebase" +msgstr "yeniden temellendirme ile รงekim" + +#: builtin/pull.c:959 +msgid "please commit or stash them." +msgstr "Lรผtfen onlarฤฑ iลleyin veya zulalayฤฑn." + +#: builtin/pull.c:984 +#, 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 iลlemesinden\n" +"ileri sarฤฑlฤฑyor." + +#: builtin/pull.c:990 +#, 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:1005 +msgid "Cannot merge multiple branches into empty head." +msgstr "Boล dal ucuna birden รงok dal birleลtirilemez." + +#: builtin/pull.c:1009 +msgid "Cannot rebase onto multiple branches." +msgstr "Birden รงok dala yeniden temellendirme yapฤฑlamaz." + +#: builtin/pull.c:1017 +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:111 +msgid "tag shorthand without <tag>" +msgstr "stenografiyi <etiket> olmadan etiketle" + +#: builtin/push.c:119 +msgid "--delete only accepts plain target ref names" +msgstr "--delete yalnฤฑzca dรผz hedef baลvuru adlarฤฑnฤฑ kabul eder" + +#: builtin/push.c:164 +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:167 +#, 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:182 +#, 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:194 +#, 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:202 +#, 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:205 +#, 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:260 +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:267 +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:273 +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:279 +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 sizde olmayan\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:286 +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:289 +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 "" +"ฤฐลleme olmayan bir nesneye iลaret eden uzak baลvuruyu gรผncelleyemez\n" +"veya --force seรงeneฤini kullanmadan bir uzak baลvuruyu iลlemesi\n" +"olmayan bir nesneye iลaret etmesini saฤlamasฤฑ iรงin gรผncelleyemezsiniz.\n" + +#: builtin/push.c:351 +#, c-format +msgid "Pushing to %s\n" +msgstr "ฤฐtme konumu: %s\n" + +#: builtin/push.c:358 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "bazฤฑ baลvurular '%s' konumuna itilemedi" + +#: builtin/push.c:532 +msgid "repository" +msgstr "depo" + +#: builtin/push.c:533 builtin/send-pack.c:183 +msgid "push all refs" +msgstr "tรผm baลvurularฤฑ it" + +#: builtin/push.c:534 builtin/send-pack.c:185 +msgid "mirror all refs" +msgstr "tรผm baลvurularฤฑ yansฤฑla" + +#: builtin/push.c:536 +msgid "delete refs" +msgstr "baลvurularฤฑ sil" + +#: builtin/push.c:537 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "etiketleri it (--all veya --mirror ile kullanฤฑlamaz)" + +#: builtin/push.c:540 builtin/send-pack.c:186 +msgid "force updates" +msgstr "zorla gรผncelle" + +#: builtin/push.c:541 builtin/send-pack.c:198 +msgid "<refname>:<expect>" +msgstr "<baลvuruadฤฑ>:<bekle>" + +#: builtin/push.c:542 builtin/send-pack.c:199 +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:545 +msgid "control recursive pushing of submodules" +msgstr "altmodรผllerin รถzyineli itilmesini denetle" + +#: builtin/push.c:546 builtin/send-pack.c:193 +msgid "use thin pack" +msgstr "ince paket kullan" + +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 +msgid "receive pack program" +msgstr "paket programฤฑnฤฑ al" + +#: builtin/push.c:549 +msgid "set upstream for git pull/status" +msgstr "git pull/status iรงin รผstkaynak ayarla" + +#: builtin/push.c:552 +msgid "prune locally removed refs" +msgstr "yerelde kaldฤฑrฤฑlan baลvurularฤฑ buda" + +#: builtin/push.c:554 +msgid "bypass pre-push hook" +msgstr "pre-push kancasฤฑnฤฑ atla" + +#: builtin/push.c:555 +msgid "push missing but relevant tags" +msgstr "eksik; ancak ilgili etiketleri it" + +#: builtin/push.c:557 builtin/send-pack.c:187 +msgid "GPG sign the push" +msgstr "itmeyi GPG ile imzala" + +#: builtin/push.c:559 builtin/send-pack.c:194 +msgid "request atomic transaction on remote side" +msgstr "uzak tarafta atomsal iลlem iste" + +#: builtin/push.c:577 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete; --all, --mirror ve --tags ile uyumsuz" + +#: builtin/push.c:579 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete bir baลvuru olmadan anlam ifade etmiyor" + +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "hatalฤฑ depo '%s'" + +#: builtin/push.c:600 +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:615 +msgid "--all and --tags are incompatible" +msgstr "--all ve --tags birbiriyle uyumsuz" + +#: builtin/push.c:617 +msgid "--all can't be combined with refspecs" +msgstr "--all baลvuru belirteรงleriyle birleลtirilemez" + +#: builtin/push.c:621 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror ve --tags birbiriyle uyumsuz" + +#: builtin/push.c:623 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror baลvuru belirteรงleriyle birleลtirilemez" + +#: builtin/push.c:626 +msgid "--all and --mirror are incompatible" +msgstr "--all ve --mirror birbiriyle uyumsuz" + +#: builtin/push.c:630 +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 iลleme 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:35 +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:37 +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:39 +msgid "git rebase --continue | --abort | --skip | --edit-todo" +msgstr "git rebase --continue | --abort | --skip | --edit-todo" + +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "kullanฤฑlamaz yapฤฑlacaklar listesi: '%s'" + +#: builtin/rebase.c:304 +#, c-format +msgid "could not create temporary %s" +msgstr "geรงici %s oluลturulamadฤฑ" + +#: builtin/rebase.c:310 +msgid "could not mark as interactive" +msgstr "etkileลimli olarak imlenemedi" + +#: builtin/rebase.c:364 +msgid "could not generate todo list" +msgstr "yapฤฑlacaklar listesi oluลturulamadฤฑ" + +#: builtin/rebase.c:405 +msgid "a base commit must be provided with --upstream or --onto" +msgstr "bir taban iลlemesi --upstream veya --onto ile saฤlanmalฤฑdฤฑr" + +#: builtin/rebase.c:474 +msgid "git rebase--interactive [<options>]" +msgstr "git rebase--interactive [<seรงenekler>]" + +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" +msgstr "boล baลlayan iลlemeleri tut" + +#: builtin/rebase.c:491 builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "boล iletili iลlemelere izin ver" + +#: builtin/rebase.c:493 +msgid "rebase merge commits" +msgstr "birleลtirme iลlemelerini yeniden temellendir" + +#: builtin/rebase.c:495 +msgid "keep original branch points of cousins" +msgstr "kuzenlerin orijinal dal noktalarฤฑnฤฑ tut" + +#: builtin/rebase.c:497 +msgid "move commits that begin with squash!/fixup!" +msgstr "squash!/fixup! ile baลlayan iลlemeleri taลฤฑ" + +#: builtin/rebase.c:498 +msgid "sign commits" +msgstr "iลlemeleri imzala" + +#: builtin/rebase.c:500 builtin/rebase.c:1321 +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:502 +msgid "continue rebase" +msgstr "yeniden temellendirmeyi sรผrdรผr" + +#: builtin/rebase.c:504 +msgid "skip commit" +msgstr "iลlemeyi atla" + +#: builtin/rebase.c:505 +msgid "edit the todo list" +msgstr "yapฤฑlacaklar listesini dรผzenle" + +#: builtin/rebase.c:507 +msgid "show the current patch" +msgstr "geรงerli yamayฤฑ gรถster" + +#: builtin/rebase.c:510 +msgid "shorten commit ids in the todo list" +msgstr "yapฤฑlacaklar listesindeki iลleme numaralarฤฑnฤฑ kฤฑsalt" + +#: builtin/rebase.c:512 +msgid "expand commit ids in the todo list" +msgstr "yapฤฑlacaklar listesindeki iลleme numaralarฤฑnฤฑ geniลlet" + +#: builtin/rebase.c:514 +msgid "check the todo list" +msgstr "yapฤฑlacaklar listesini denetle" + +#: builtin/rebase.c:516 +msgid "rearrange fixup/squash lines" +msgstr "fixup/squash satฤฑrlarฤฑnฤฑ yeniden dรผzenle" + +#: builtin/rebase.c:518 +msgid "insert exec commands in todo list" +msgstr "yapฤฑlacaklar listesine 'exec' komutlarฤฑ ekle" + +#: builtin/rebase.c:519 +msgid "onto" +msgstr "รผzerine" + +#: builtin/rebase.c:522 +msgid "restrict-revision" +msgstr "restrict-revision" + +#: builtin/rebase.c:522 +msgid "restrict revision" +msgstr "revizyonu sฤฑnฤฑrla" + +#: builtin/rebase.c:524 +msgid "squash-onto" +msgstr "squash-onto" + +#: builtin/rebase.c:525 +msgid "squash onto" +msgstr "tฤฑkฤฑลtฤฑr" + +#: builtin/rebase.c:527 +msgid "the upstream commit" +msgstr "รผstkaynak iลlemesi" + +#: builtin/rebase.c:529 +msgid "head-name" +msgstr "head-name" + +#: builtin/rebase.c:529 +msgid "head name" +msgstr "dal ucu adฤฑ" + +#: builtin/rebase.c:534 +msgid "rebase strategy" +msgstr "yeniden temellendirme stratejisi" + +#: builtin/rebase.c:535 +msgid "strategy-opts" +msgstr "strategy-opts" + +#: builtin/rebase.c:536 +msgid "strategy options" +msgstr "strateji seรงenekleri" + +#: builtin/rebase.c:537 +msgid "switch-to" +msgstr "switch-to" + +#: builtin/rebase.c:538 +msgid "the branch or commit to checkout" +msgstr "รงฤฑkฤฑล yapฤฑlacak dal veya iลleme" + +#: builtin/rebase.c:539 +msgid "onto-name" +msgstr "onto-name" + +#: builtin/rebase.c:539 +msgid "onto name" +msgstr "'onto' adฤฑ:" + +#: builtin/rebase.c:540 +msgid "cmd" +msgstr "komut" + +#: builtin/rebase.c:540 +msgid "the command to run" +msgstr "รงalฤฑลtฤฑrฤฑlacak komut" + +#: builtin/rebase.c:543 builtin/rebase.c:1415 +msgid "automatically re-schedule any `exec` that fails" +msgstr "baลarฤฑsฤฑz olan her 'exec'i kendiliฤinden yeniden zamanla" + +#: builtin/rebase.c:559 +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:575 +#, c-format +msgid "%s requires the merge backend" +msgstr "%s birleลtirme arka ucunu gerektiriyor" + +#: builtin/rebase.c:618 +#, c-format +msgid "could not get 'onto': '%s'" +msgstr "'onto' alฤฑnamadฤฑ: '%s'" + +#: builtin/rebase.c:635 +#, c-format +msgid "invalid orig-head: '%s'" +msgstr "geรงersiz orig-head: '%s'" + +#: builtin/rebase.c:660 +#, c-format +msgid "ignoring invalid allow_rerere_autoupdate: '%s'" +msgstr "geรงersiz allow_rerere_autoupdate yok sayฤฑlฤฑyor: '%s'" + +#: builtin/rebase.c:805 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 iลlemeyi 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:888 +#, 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:1214 +#, 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:1232 +#, 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:1248 +#, 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:1278 +msgid "exec commands cannot contain newlines" +msgstr "'exec' komutlarฤฑ yenisatฤฑrlar iรงeremez" + +#: builtin/rebase.c:1282 +msgid "empty exec command" +msgstr "boล 'exec' komutu" + +#: builtin/rebase.c:1312 +msgid "rebase onto given branch instead of upstream" +msgstr "รผstkaynak yerine verilen dalฤฑn รผzerine yeniden temellendir" + +#: builtin/rebase.c:1314 +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:1316 +msgid "allow pre-rebase hook to run" +msgstr "pre-rebase kancasฤฑnฤฑn รงalฤฑลmasฤฑna izin ver" + +#: builtin/rebase.c:1318 +msgid "be quiet. implies --no-stat" +msgstr "sessiz ol (--no-stat ima eder)" + +#: builtin/rebase.c:1324 +msgid "do not show diffstat of what changed upstream" +msgstr "รผstkaynakta nelerin deฤiลtiฤini gรถsteren diffstat gรถsterme" + +#: builtin/rebase.c:1327 +msgid "add a Signed-off-by: line to each commit" +msgstr "her iลlemeye bir Signed-off-by satฤฑrฤฑ ekle" + +#: builtin/rebase.c:1330 +msgid "make committer date match author date" +msgstr "iลleyici tarihi ile yazar tarihini aynฤฑ yap" + +#: builtin/rebase.c:1332 +msgid "ignore author date and use current date" +msgstr "yazar tarihini yok say ve geรงerli tarihi kullan" + +#: builtin/rebase.c:1334 +msgid "synonym of --reset-author-date" +msgstr "--reset-author-date eลanlamlฤฑsฤฑ" + +#: builtin/rebase.c:1336 builtin/rebase.c:1340 +msgid "passed to 'git apply'" +msgstr "'git apply'a aktarฤฑldฤฑ" + +#: builtin/rebase.c:1338 +msgid "ignore changes in whitespace" +msgstr "boลluk deฤiลikliklerini yok say" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 +msgid "cherry-pick all commits, even if unchanged" +msgstr "deฤiลtirilmemiล olsa bile tรผm iลlemeleri seรง-al yap" + +#: builtin/rebase.c:1347 +msgid "continue" +msgstr "sรผrdรผr" + +#: builtin/rebase.c:1350 +msgid "skip current patch and continue" +msgstr "geรงerli yamayฤฑ atla ve sรผrdรผr" + +#: builtin/rebase.c:1352 +msgid "abort and check out the original branch" +msgstr "iptal et ve orijinal dalฤฑ รงฤฑkฤฑล yap" + +#: builtin/rebase.c:1355 +msgid "abort but keep HEAD where it is" +msgstr "iptal et; ancak HEAD'i olduฤu yerde bฤฑrak" + +#: builtin/rebase.c:1356 +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:1359 +msgid "show the patch file being applied or merged" +msgstr "yama dosyasฤฑ uygulanฤฑrken veya birleลtirilirken gรถster" + +#: builtin/rebase.c:1362 +msgid "use apply strategies to rebase" +msgstr "yeniden temellendirmek iรงin \"apply\" stratejilerini kullan" + +#: builtin/rebase.c:1366 +msgid "use merging strategies to rebase" +msgstr "yeniden temellendirmek iรงin birleลtirme stratejilerini kullan" + +#: builtin/rebase.c:1370 +msgid "let the user edit the list of commits to rebase" +msgstr "" +"yeniden temellendirilecek iลlemelerin listesini kullanฤฑcฤฑnฤฑn dรผzenlemesine " +"izin ver" + +#: builtin/rebase.c:1374 +msgid "(DEPRECATED) try to recreate merges instead of ignoring them" +msgstr "" +"(KULLANILMAMALI) birleลtirmeleri yok saymak yerine onlarฤฑ yeniden " +"oluลturmaya รงalฤฑล" + +#: builtin/rebase.c:1379 +msgid "how to handle commits that become empty" +msgstr "boลalan iลlemelerin nasฤฑl ele alฤฑnacaฤฤฑ" + +#: builtin/rebase.c:1386 +msgid "move commits that begin with squash!/fixup! under -i" +msgstr "-i altฤฑndaki squash!/fixup! ile baลlayan iลlemeleri taลฤฑ" + +#: builtin/rebase.c:1393 +msgid "add exec lines after each commit of the editable list" +msgstr "dรผzenlenebilir listenin her iลlemesinden sonra exec satฤฑrlarฤฑ ekle" + +#: builtin/rebase.c:1397 +msgid "allow rebasing commits with empty messages" +msgstr "boล iletili iลlemelerin yeniden temellendirilmesine izin ver" + +#: builtin/rebase.c:1401 +msgid "try to rebase merges instead of skipping them" +msgstr "birleลtirmeleri atlamak yerine onlarฤฑ yeniden temellendirmeyi dene" + +#: builtin/rebase.c:1404 +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:1406 +msgid "use the given merge strategy" +msgstr "verilen birleลtirme stratejisini kullan" + +#: builtin/rebase.c:1408 builtin/revert.c:115 +msgid "option" +msgstr "seรงenek" + +#: builtin/rebase.c:1409 +msgid "pass the argument through to the merge strategy" +msgstr "deฤiลkeni birleลtirme stratejisine aktar" + +#: builtin/rebase.c:1412 +msgid "rebase all reachable commits up to the root(s)" +msgstr "ulaลฤฑlabilir tรผm iลlemeleri kรถk(ler)e kadar yeniden temellendir" + +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "tรผm deฤiลiklikleri uygula, halihazฤฑrda รผstkaynakta olanlarฤฑ bile" + +#: builtin/rebase.c:1434 +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:1440 +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:1481 +msgid "" +"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." +msgstr "" +"'git rebase --preserve-merges' artฤฑk eski. Yerine --rebase-merges kullanฤฑn." + +#: builtin/rebase.c:1486 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "--keep-base ile --onto birlikte kullanฤฑlamaz" + +#: builtin/rebase.c:1488 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "--keep-base ile --root birlikte kullanฤฑlamaz" + +#: builtin/rebase.c:1492 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "--root ile --fork-point birlikte kullanฤฑlamaz" + +#: builtin/rebase.c:1495 +msgid "No rebase in progress?" +msgstr "Sรผrmekte olan bir yeniden temellendirme yok" + +#: builtin/rebase.c:1499 +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:1522 +msgid "Cannot read HEAD" +msgstr "HEAD okunamฤฑyor" + +#: builtin/rebase.c:1534 +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:1553 +msgid "could not discard worktree changes" +msgstr "รงalฤฑลma aฤacฤฑ deฤiลiklikleri atฤฑlamadฤฑ" + +#: builtin/rebase.c:1572 +#, c-format +msgid "could not move back to %s" +msgstr "%s konumuna geri taลฤฑnamadฤฑ" + +#: builtin/rebase.c:1618 +#, 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:1646 +msgid "switch `C' expects a numerical value" +msgstr "'C' anahtarฤฑ sayฤฑsal bir deฤer bekliyor" + +#: builtin/rebase.c:1688 +#, c-format +msgid "Unknown mode: %s" +msgstr "Bilinmeyen kip: %s" + +#: builtin/rebase.c:1727 +msgid "--strategy requires --merge or --interactive" +msgstr "--strategy, --merge veya --interactive gerektiriyor" + +#: builtin/rebase.c:1757 +msgid "cannot combine apply options with merge options" +msgstr "\"apply\" seรงenekleri \"merge\" seรงenekleriyle birlikte kullanฤฑlamฤฑyor" + +#: builtin/rebase.c:1770 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "Bilinmeyen yeniden temellendirme arka ucu: %s" + +#: builtin/rebase.c:1795 +msgid "--reschedule-failed-exec requires --exec or --interactive" +msgstr "--reschedule-failed-exec, --exec veya --interactive gerektiriyor" + +#: builtin/rebase.c:1815 +msgid "cannot combine '--preserve-merges' with '--rebase-merges'" +msgstr "--preserve-merges ile --rebase-merges birlikte kullanฤฑlamฤฑyor" + +#: builtin/rebase.c:1819 +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:1843 +#, c-format +msgid "invalid upstream '%s'" +msgstr "geรงersiz รผstkaynak '%s'" + +#: builtin/rebase.c:1849 +msgid "Could not create new root commit" +msgstr "Yeni kรถk iลleme oluลturulamadฤฑ" + +#: builtin/rebase.c:1875 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "'%s': tam olarak dallฤฑ bir birleลtirme temeli gerekli" + +#: builtin/rebase.c:1878 +#, c-format +msgid "'%s': need exactly one merge base" +msgstr "'%s': tam olarak bir birleลtirme temeli gerekiyor" + +#: builtin/rebase.c:1886 +#, c-format +msgid "Does not point to a valid commit '%s'" +msgstr "'%s' geรงerli bir iลlemeye iลaret etmiyor" + +#: builtin/rebase.c:1912 +#, c-format +msgid "fatal: no such branch/commit '%s'" +msgstr "onulmaz: bรถyle bir dal/iลleme yok: '%s'" + +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 +#, c-format +msgid "No such ref: %s" +msgstr "Bรถyle bir baลvuru yok: %s" + +#: builtin/rebase.c:1931 +msgid "Could not resolve HEAD to a revision" +msgstr "HEAD bir revizyona รงรถzรผlemedi" + +#: builtin/rebase.c:1952 +msgid "Please commit or stash them." +msgstr "Lรผtfen onlarฤฑ iลleyin veya zulalayฤฑn." + +#: builtin/rebase.c:1988 +#, c-format +msgid "could not switch to %s" +msgstr "ลuraya geรงilemedi: %s" + +#: builtin/rebase.c:1999 +msgid "HEAD is up to date." +msgstr "HEAD gรผncel." + +#: builtin/rebase.c:2001 +#, c-format +msgid "Current branch %s is up to date.\n" +msgstr "Geรงerli dal %s gรผncel.\n" + +#: builtin/rebase.c:2009 +msgid "HEAD is up to date, rebase forced." +msgstr "HEAD gรผncel, yeniden temellendirme zorla yapฤฑldฤฑ." + +#: builtin/rebase.c:2011 +#, c-format +msgid "Current branch %s is up to date, rebase forced.\n" +msgstr "Geรงerli dal %s gรผncel, yeniden temellendirme zorla yapฤฑldฤฑ.\n" + +#: builtin/rebase.c:2019 +msgid "The pre-rebase hook refused to rebase." +msgstr "'pre-rebase' kancasฤฑ yeniden temellendirmeyi reddetti." + +#: builtin/rebase.c:2026 +#, c-format +msgid "Changes to %s:\n" +msgstr "%s iรงin olan deฤiลiklikler:\n" + +#: builtin/rebase.c:2029 +#, c-format +msgid "Changes from %s to %s:\n" +msgstr "%s -> %s deฤiลiklikleri:\n" + +#: builtin/rebase.c:2054 +#, 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:2063 +msgid "Could not detach HEAD" +msgstr "HEAD ayrฤฑlamadฤฑ" + +#: builtin/rebase.c:2072 +#, c-format +msgid "Fast-forwarded %s to %s.\n" +msgstr "%s, %s konumuna ileri sarฤฑldฤฑ.\n" + +#: builtin/receive-pack.c:34 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <git-dizini>" + +#: builtin/receive-pack.c:1224 +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:1244 +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:2422 +msgid "quiet" +msgstr "sessiz" + +#: builtin/receive-pack.c:2436 +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ฤฑlmamalฤฑ; 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:697 +#, c-format +msgid "remote %s already exists." +msgstr "%s uzak konumu halihazฤฑrda var." + +#: builtin/remote.c:199 builtin/remote.c:701 +#, 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:654 +#, c-format +msgid "could not set '%s'" +msgstr "'%s' ayarlanamadฤฑ" + +#: builtin/remote.c:659 +#, 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:690 builtin/remote.c:833 builtin/remote.c:941 +#, c-format +msgid "No such remote: '%s'" +msgstr "Bรถyle bir uzak konum yok: '%s'" + +#: builtin/remote.c:707 +#, 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:727 +#, 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:767 +#, c-format +msgid "deleting '%s' failed" +msgstr "'%s' silinmesi baลarฤฑsฤฑz" + +#: builtin/remote.c:801 +#, c-format +msgid "creating '%s' failed" +msgstr "'%s' oluลturulmasฤฑ baลarฤฑsฤฑz" + +#: builtin/remote.c:877 +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:891 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "'%s' yapฤฑlandฤฑrsa bรถlรผmรผ kaldฤฑrฤฑlamadฤฑ" + +#: builtin/remote.c:994 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr " yeni (bir sonraki getirme uzak konumlarda depolayacak/%s" + +#: builtin/remote.c:997 +msgid " tracked" +msgstr " izlendi" + +#: builtin/remote.c:999 +msgid " stale (use 'git remote prune' to remove)" +msgstr " eskimiล (kaldฤฑrmak iรงin 'git remote prune' kullanฤฑn)" + +#: builtin/remote.c:1001 +msgid " ???" +msgstr " ???" + +#: builtin/remote.c:1042 +#, 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:1051 +#, c-format +msgid "rebases interactively onto remote %s" +msgstr "%s uzak konumuna etkileลimli olarak yeniden temellendirir" + +#: builtin/remote.c:1053 +#, 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:1056 +#, c-format +msgid "rebases onto remote %s" +msgstr "%s uzak konumuna yeniden temellendirir" + +#: builtin/remote.c:1060 +#, c-format +msgid " merges with remote %s" +msgstr " %s uzak konumu ile birleลtirir" + +#: builtin/remote.c:1063 +#, c-format +msgid "merges with remote %s" +msgstr "%s uzak konumu ile birleลtirir" + +#: builtin/remote.c:1066 +#, c-format +msgid "%-*s and with remote %s\n" +msgstr "%-*s ve %s uzak konumu ile birlikte\n" + +#: builtin/remote.c:1109 +msgid "create" +msgstr "oluลtur" + +#: builtin/remote.c:1112 +msgid "delete" +msgstr "sil" + +#: builtin/remote.c:1116 +msgid "up to date" +msgstr "gรผncel" + +#: builtin/remote.c:1119 +msgid "fast-forwardable" +msgstr "ileri sarฤฑlabilir" + +#: builtin/remote.c:1122 +msgid "local out of date" +msgstr "yerelin tarihi geรงmiล" + +#: builtin/remote.c:1129 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr " %-*s ลuna zorluyor: %-*s (%s)" + +#: builtin/remote.c:1132 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s ลuna itiyor: %-*s (%s)" + +#: builtin/remote.c:1136 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s ลuna zorluyor: %s" + +#: builtin/remote.c:1139 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s ลuna itiyor: %s" + +#: builtin/remote.c:1207 +msgid "do not query remotes" +msgstr "uzak konumlarฤฑ sorgulama" + +#: builtin/remote.c:1234 +#, c-format +msgid "* remote %s" +msgstr "* uzak konum %s" + +#: builtin/remote.c:1235 +#, c-format +msgid " Fetch URL: %s" +msgstr " URL'yi getir: %s" + +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 +msgid "(no URL)" +msgstr "(URL yok)" + +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#. +#: builtin/remote.c:1250 builtin/remote.c:1252 +#, c-format +msgid " Push URL: %s" +msgstr " URL'yi it: %s" + +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 +#, c-format +msgid " HEAD branch: %s" +msgstr " HEAD dalฤฑ: %s" + +#: builtin/remote.c:1254 +msgid "(not queried)" +msgstr "(sorgulanmadฤฑ" + +#: builtin/remote.c:1256 +msgid "(unknown)" +msgstr "(bilinmiyor)" + +#: builtin/remote.c:1260 +#, 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:1272 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " Uzak dal:%s" +msgstr[1] " Uzak dallar:%s" + +#: builtin/remote.c:1275 builtin/remote.c:1301 +msgid " (status not queried)" +msgstr " (durum sorgulanmadฤฑ)" + +#: builtin/remote.c:1284 +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:1292 +msgid " Local refs will be mirrored by 'git push'" +msgstr " Yerel baลvurular 'git pull' tarafฤฑndan yansฤฑlanacak" + +#: builtin/remote.c:1298 +#, 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:1319 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "refs/remotes/<ad>/HEAD'i uzak konuma gรถre ayarla" + +#: builtin/remote.c:1321 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "refs/remotes/<ad>/HEAD'i sil" + +#: builtin/remote.c:1336 +msgid "Cannot determine remote HEAD" +msgstr "Uzak konum HEAD'i belirlenemiyor" + +#: builtin/remote.c:1338 +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:1348 +#, c-format +msgid "Could not delete %s" +msgstr "%s silinemedi" + +#: builtin/remote.c:1356 +#, c-format +msgid "Not a valid ref: %s" +msgstr "Geรงerli bir baลvuru deฤil: %s" + +#: builtin/remote.c:1358 +#, c-format +msgid "Could not setup %s" +msgstr "%s ayarlanamadฤฑ" + +#: builtin/remote.c:1376 +#, c-format +msgid " %s will become dangling!" +msgstr " %s sarkacak!" + +#: builtin/remote.c:1377 +#, c-format +msgid " %s has become dangling!" +msgstr " %s sarkmaya baลladฤฑ!" + +#: builtin/remote.c:1387 +#, c-format +msgid "Pruning %s" +msgstr "%s budanฤฑyor" + +#: builtin/remote.c:1388 +#, c-format +msgid "URL: %s" +msgstr "URL: %s" + +#: builtin/remote.c:1404 +#, c-format +msgid " * [would prune] %s" +msgstr " * %s [budanacak]" + +#: builtin/remote.c:1407 +#, c-format +msgid " * [pruned] %s" +msgstr " * %s [budandฤฑ]" + +#: builtin/remote.c:1452 +msgid "prune remotes after fetching" +msgstr "getirme sonrasฤฑnda uzak konumlarฤฑ buda" + +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 +#, c-format +msgid "No such remote '%s'" +msgstr "Bรถyle bir uzak konum yok '%s'" + +#: builtin/remote.c:1531 +msgid "add branch" +msgstr "dal ekle" + +#: builtin/remote.c:1538 +msgid "no remote specified" +msgstr "uzak konum belirtilmedi" + +#: builtin/remote.c:1555 +msgid "query push URLs rather than fetch URLs" +msgstr "itme URL'lerinden รงok getirme URL'lerini sorgula" + +#: builtin/remote.c:1557 +msgid "return all URLs" +msgstr "tรผm URL'leri dรถndรผr" + +#: builtin/remote.c:1585 +#, c-format +msgid "no URLs configured for remote '%s'" +msgstr "'%s' uzak konumu iรงin URL yapฤฑlandฤฑrฤฑlmamฤฑล" + +#: builtin/remote.c:1611 +msgid "manipulate push URLs" +msgstr "itme URL'lerini deฤiลtir" + +#: builtin/remote.c:1613 +msgid "add URL" +msgstr "URL ekle" + +#: builtin/remote.c:1615 +msgid "delete URLs" +msgstr "URL'leri sil" + +#: builtin/remote.c:1622 +msgid "--add --delete doesn't make sense" +msgstr "--add --delete bir anlam ifade etmiyor" + +#: builtin/remote.c:1661 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "Geรงersiz eski URL dizgisi: %s" + +#: builtin/remote.c:1669 +#, c-format +msgid "No such URL found: %s" +msgstr "Bรถyle bir URL bulunamadฤฑ: %s" + +#: builtin/remote.c:1671 +msgid "Will not delete all non-push URLs" +msgstr "Tรผm itme olmayan URL'ler silinmeyecek" + +#: builtin/repack.c:25 +msgid "git repack [<options>]" +msgstr "git repack [<seรงenekler>]" + +#: builtin/repack.c:30 +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:197 +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:236 builtin/repack.c:421 +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:260 +msgid "could not finish pack-objects to repack promisor objects" +msgstr "vaatรงi nesneleri yeniden paketleme iรงin pack-objects bitirilemedi" + +#: builtin/repack.c:297 +msgid "pack everything in a single pack" +msgstr "her ลeyi tek bir pakete sฤฑฤdฤฑr" + +#: builtin/repack.c:299 +msgid "same as -a, and turn unreachable objects loose" +msgstr "-a ile aynฤฑ ve ulaลฤฑlamayan nesneleri serbest bฤฑrakฤฑr" + +#: builtin/repack.c:302 +msgid "remove redundant packs, and run git-prune-packed" +msgstr "gereksiz paketleri kaldฤฑr ve 'git prune-packed' รงalฤฑลtฤฑr" + +#: builtin/repack.c:304 +msgid "pass --no-reuse-delta to git-pack-objects" +msgstr "'git-pack-objects'e --no-reuse-delta geรงir" + +#: builtin/repack.c:306 +msgid "pass --no-reuse-object to git-pack-objects" +msgstr "'git-pack-objects'e --no-reuse-object geรงir" + +#: builtin/repack.c:308 +msgid "do not run git-update-server-info" +msgstr "'git-update-server-info' รงalฤฑลtฤฑrma" + +#: builtin/repack.c:311 +msgid "pass --local to git-pack-objects" +msgstr "--local'ฤฑ 'git-pack-objects'e geรงir" + +#: builtin/repack.c:313 +msgid "write bitmap index" +msgstr "biteลlem indeksi yaz" + +#: builtin/repack.c:315 +msgid "pass --delta-islands to git-pack-objects" +msgstr "--delta-islands'ฤฑ 'git-pack-objects'e geรงir" + +#: builtin/repack.c:316 +msgid "approxidate" +msgstr "yaklaลฤฑk tarih" + +#: builtin/repack.c:317 +msgid "with -A, do not loosen objects older than this" +msgstr "-A ile, bundan daha eski nesneleri bฤฑrakma" + +#: builtin/repack.c:319 +msgid "with -a, repack unreachable objects" +msgstr "-a ile, ulaลฤฑlamayan nesneleri yeniden paketle" + +#: builtin/repack.c:321 +msgid "size of the window used for delta compression" +msgstr "delta sฤฑkฤฑลtฤฑrmasฤฑ iรงin kullanฤฑlan pencerenin boyutu" + +#: builtin/repack.c:322 builtin/repack.c:328 +msgid "bytes" +msgstr "baytlar" + +#: builtin/repack.c:323 +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:325 +msgid "limits the maximum delta depth" +msgstr "olabilecek en bรผyรผk delta derinliฤini kฤฑsฤฑtlar" + +#: builtin/repack.c:327 +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:329 +msgid "maximum size of each packfile" +msgstr "her paket dosyasฤฑnฤฑn olabilecek en bรผyรผk boyutu" + +#: builtin/repack.c:331 +msgid "repack objects in packs marked with .keep" +msgstr "nesneleri .keep ile imlenmiล paketlerde yeniden paketle" + +#: builtin/repack.c:333 +msgid "do not repack this pack" +msgstr "bu paketi yeniden paketleme" + +#: builtin/repack.c:343 +msgid "cannot delete packs in a precious-objects repo" +msgstr "bir precious-objects deposundaki paketler silinemiyor" + +#: builtin/repack.c:347 +msgid "--keep-unreachable and -A are incompatible" +msgstr "--keep-unreachable ve -A birbiriyle uyumsuz" + +#: builtin/repack.c:430 +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 <iลleme> [<รผ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 iลleme olarak ayrฤฑลtฤฑrฤฑlamadฤฑ" + +#: builtin/replace.c:416 +#, c-format +msgid "bad mergetag in commit '%s'" +msgstr "'%s' iลlemesinde hatalฤฑ birleลtirme etiketi" + +#: builtin/replace.c:418 +#, c-format +msgid "malformed mergetag in commit '%s'" +msgstr "'%s' iลlemesinde 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 iลlemesi 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 iลlemesinin bir gpg imzasฤฑ var" + +#: builtin/replace.c:470 +msgid "the signature will be removed in the replacement commit!" +msgstr "imza, yerine geรงecek iลlemede kaldฤฑrฤฑlacak" + +#: builtin/replace.c:480 +#, c-format +msgid "could not write replacement commit for: '%s'" +msgstr "ลunun yerine geรงecek iลleme 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 iลleme 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 iลlemenin รผ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] [<iลleme>]" + +#: 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:83 +msgid "You do not have a valid HEAD." +msgstr "Geรงerli bir HEAD'iniz yok." + +#: builtin/reset.c:85 +msgid "Failed to find tree of HEAD." +msgstr "HEAD aฤacฤฑ bulunamadฤฑ." + +#: builtin/reset.c:91 +#, c-format +msgid "Failed to find tree of %s." +msgstr "%s aฤacฤฑ bulunamadฤฑ." + +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ลimdi ลurada: %s" + +#: builtin/reset.c:195 +#, 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:295 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:297 +msgid "reset HEAD and index" +msgstr "HEAD'i ve indeksi sฤฑfฤฑrla" + +#: builtin/reset.c:298 +msgid "reset only HEAD" +msgstr "yalnฤฑzca HEAD'i sฤฑfฤฑrla" + +#: builtin/reset.c:300 builtin/reset.c:302 +msgid "reset HEAD, index and working tree" +msgstr "HEAD'i, indeksi ve รงalฤฑลma aฤacฤฑnฤฑ sฤฑfฤฑrla" + +#: builtin/reset.c:304 +msgid "reset HEAD but keep local changes" +msgstr "HEAD'i sฤฑfฤฑrla; ancak yerel deฤiลiklikleri tut" + +#: builtin/reset.c:310 +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:344 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "'%s' geรงerli bir revizyon olarak รงรถzรผlemedi." + +#: builtin/reset.c:352 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "'%s' geรงerli bir aฤaรง olarak รงรถzรผlemedi." + +#: builtin/reset.c:361 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch, --{hard,mixed,soft} ile uyumsuz" + +#: builtin/reset.c:371 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "" +"belirtilmiล yol ile --mixed artฤฑk eski; yerine 'git reset -- <yollar>' " +"kullanฤฑn." + +#: builtin/reset.c:373 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "Belirtilmiล yol varken %s sฤฑfฤฑrlamasฤฑ yapฤฑlamฤฑyor." + +#: builtin/reset.c:388 +#, 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:392 +msgid "-N can only be used with --mixed" +msgstr "-N yalnฤฑzca --mixed ile birlikte kullanฤฑlabilir" + +#: builtin/reset.c:413 +msgid "Unstaged changes after reset:" +msgstr "Sฤฑfฤฑrlama sonrasฤฑnda hazฤฑrlanmamฤฑล deฤiลiklikler:" + +#: builtin/reset.c:416 +#, 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 ortaya 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:434 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "ฤฐndeks dosyasฤฑ '%s' revizyonuna sฤฑfฤฑrlanamadฤฑ." + +#: builtin/reset.c:439 +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:409 +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<seรงenekler>] -- [<deฤiลkenler>...]" + +#: builtin/rev-parse.c:414 +msgid "keep the `--` passed as an arg" +msgstr "'--'i geรงirilen bir deฤiลken olarak tut" + +#: builtin/rev-parse.c:416 +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:419 +msgid "output in stuck long form" +msgstr "uzun biรงimde รงฤฑktฤฑ ver" + +#: builtin/rev-parse.c:552 +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>] <iลlememsi>..." + +#: 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>] <iลlememsi>..." + +#: 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 iลlemeyi 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 "iลleme 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 "iลleme adฤฑnฤฑ iliลtir" + +#: builtin/revert.c:127 +msgid "preserve initially empty commits" +msgstr "baลlangฤฑรงta boล olan iลlemeleri koru" + +#: builtin/revert.c:129 +msgid "keep redundant, empty commits" +msgstr "gereksiz, boล iลlemeleri 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:182 +msgid "remote name" +msgstr "uzak konum adฤฑ" + +#: builtin/send-pack.c:195 +msgid "use stateless RPC protocol" +msgstr "durumsuz RPC protokolรผnรผ kullan" + +#: builtin/send-pack.c:196 +msgid "read refs from stdin" +msgstr "baลvurularฤฑ stdin'den oku" + +#: builtin/send-pack.c:197 +msgid "print status from remote helper" +msgstr "uzak konum yardฤฑmcฤฑsฤฑndan durum yazdฤฑr" + +#: builtin/shortlog.c:15 +msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" +msgstr "git shortlog [<seรงenekler>] [<revizyon-erimi>] [[--] <yol>...]" + +#: builtin/shortlog.c:16 +msgid "git log --pretty=short | git shortlog [<options>]" +msgstr "git log --pretty=short | git shortlog [<seรงenekler>]" + +#: builtin/shortlog.c:134 +msgid "using multiple --group options with stdin is not supported" +msgstr "stdin ile รงoklu --group seรงenekleri kullanฤฑmฤฑ desteklenmiyor" + +#: builtin/shortlog.c:144 +msgid "using --group=trailer with stdin is not supported" +msgstr "stdin ile --group=trailer kullanฤฑmฤฑ desteklenmiyor" + +#: builtin/shortlog.c:388 +#, c-format +msgid "unknown group type: %s" +msgstr "bilinmeyen grup tรผrรผ: %s" + +#: builtin/shortlog.c:416 +msgid "Group by committer rather than author" +msgstr "Yazar yerine iลleyici ile grupla" + +#: builtin/shortlog.c:419 +msgid "sort output according to the number of commits per author" +msgstr "รงฤฑktฤฑyฤฑ yazar baลฤฑna olan iลleme sayฤฑsฤฑna gรถre sฤฑrala" + +#: builtin/shortlog.c:421 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "ฤฐลleme aรงฤฑklamalarฤฑnฤฑ gizle, yalnฤฑzca iลleme sayฤฑsฤฑnฤฑ ver" + +#: builtin/shortlog.c:423 +msgid "Show the email address of each author" +msgstr "Her yazarฤฑn e-posta adresini gรถster" + +#: builtin/shortlog.c:424 +msgid "<w>[,<i1>[,<i2>]]" +msgstr "<w>[,<i1>[,<i2>]]" + +#: builtin/shortlog.c:425 +msgid "Linewrap output" +msgstr "รฤฑktฤฑ satฤฑrlarฤฑnฤฑ kaydฤฑr" + +#: builtin/shortlog.c:427 +msgid "field" +msgstr "alan" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "Alan ile grupla" + +#: builtin/shortlog.c:456 +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ฤฑ ele alฤฑnamฤฑyor" +msgstr[1] "%s yok sayฤฑlฤฑyor; %d baลvurudan fazlasฤฑ ele alฤฑnamฤฑyor" + +#: 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> iลleme 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 "iลlemeleri 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 "iลlemeleri 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 iลlemeleri 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ฤฑ ele alฤฑnamฤฑyor." +msgstr[1] "%d revizyondan baลkasฤฑ ele alฤฑnamฤฑyor." + +#: 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 iลlemesi bulunamฤฑyor (%s)" + +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "saฤlama algoritmasฤฑ" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "bilinmeyen saฤlama algoritmasฤฑ '%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|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <seรงenekler>" + +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:76 +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:228 +msgid "failed to create directory for sparse-checkout file" +msgstr "aralฤฑklฤฑ รงฤฑkฤฑล dosyasฤฑ iรงin dizin oluลturulamadฤฑ" + +#: builtin/sparse-checkout.c:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "depo biรงimi worktreeConfig etkinleลtirmesi iรงin yรผkseltilemiyor" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "extensions.worktreeConfig yapฤฑlandฤฑrmasฤฑ ayarlanamadฤฑ" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "aralฤฑklฤฑ รงฤฑkฤฑลฤฑ koni kipinde ilklendir" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "'%s' aรงฤฑlamadฤฑ" + +#: builtin/sparse-checkout.c:401 +#, c-format +msgid "could not normalize path %s" +msgstr "'%s' yolu olaฤanlaลtฤฑrฤฑlamadฤฑ" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <dizgiler>)" + +#: builtin/sparse-checkout.c:438 +#, 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:492 builtin/sparse-checkout.c:516 +msgid "unable to load existing sparse-checkout patterns" +msgstr "mevcut aralฤฑklฤฑ รงฤฑkฤฑล dizgileri yรผklenemiyor" + +#: builtin/sparse-checkout.c:561 +msgid "read patterns from standard in" +msgstr "dizgileri stdin'den oku" + +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:623 +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] <iลleme>" + +#: 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 iลleme deฤil" + +#: builtin/stash.c:148 +#, c-format +msgid "Too many revisions specified:%s" +msgstr "รok fazla revizyon belirtildi:%s" + +#: builtin/stash.c:162 +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 +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 +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 +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 +msgid "No branch name specified" +msgstr "Dal adฤฑ belirtilmedi" + +#: builtin/stash.c:800 builtin/stash.c:837 +#, c-format +msgid "Cannot update %s with %s" +msgstr "%s, %s ile gรผncellenemiyor" + +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 +msgid "stash message" +msgstr "zula iletisi" + +#: builtin/stash.c:828 +msgid "\"git stash store\" requires one <commit> argument" +msgstr "\"git stash store\" bir <iลleme> deฤiลkeni gerektirir" + +#: builtin/stash.c:1043 +msgid "No changes selected" +msgstr "Deฤiลiklik seรงilmedi" + +#: builtin/stash.c:1143 +msgid "You do not have the initial commit yet" +msgstr "Henรผz ilk iลleme yapฤฑlmamฤฑล" + +#: builtin/stash.c:1170 +msgid "Cannot save the current index state" +msgstr "Geรงerli indeks durumu kaydedilemiyor" + +#: builtin/stash.c:1179 +msgid "Cannot save the untracked files" +msgstr "ฤฐzlenmeyen dosyalar kaydedilemiyor" + +#: builtin/stash.c:1190 builtin/stash.c:1199 +msgid "Cannot save the current worktree state" +msgstr "Geรงerli รงalฤฑลma aฤacฤฑ durumu kaydedilemiyor" + +#: builtin/stash.c:1227 +msgid "Cannot record working tree state" +msgstr "รalฤฑลma aฤacฤฑ durumu kaydฤฑ yazฤฑlamฤฑyor" + +#: builtin/stash.c:1276 +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:1292 +msgid "Did you forget to 'git add'?" +msgstr "'git add' yapmayฤฑ mฤฑ unuttunuz?" + +#: builtin/stash.c:1307 +msgid "No local changes to save" +msgstr "Kaydedilecek yerel deฤiลiklik yok" + +#: builtin/stash.c:1314 +msgid "Cannot initialize stash" +msgstr "Zula ilklendirilemiyor" + +#: builtin/stash.c:1329 +msgid "Cannot save the current status" +msgstr "Geรงerli durum kaydedilemiyor" + +#: builtin/stash.c:1334 +#, c-format +msgid "Saved working directory and index state %s" +msgstr "รalฤฑลma dizini ve indeks durumu %s kaydedildi" + +#: builtin/stash.c:1424 +msgid "Cannot remove worktree changes" +msgstr "รalฤฑลma aฤacฤฑ deฤiลiklikleri kaldฤฑrฤฑlamฤฑyor" + +#: builtin/stash.c:1463 builtin/stash.c:1528 +msgid "keep index" +msgstr "indeksi tut" + +#: builtin/stash.c:1465 builtin/stash.c:1530 +msgid "stash in patch mode" +msgstr "yama kipinde zula" + +#: builtin/stash.c:1466 builtin/stash.c:1531 +msgid "quiet mode" +msgstr "sessiz kip" + +#: builtin/stash.c:1468 builtin/stash.c:1533 +msgid "include untracked files in stash" +msgstr "zulada izlenmeyen dosyalarฤฑ iรงer" + +#: builtin/stash.c:1470 builtin/stash.c:1535 +msgid "include ignore files" +msgstr "yok sayma dosyalarฤฑnฤฑ iรงer" + +#: builtin/stash.c:1570 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"stash.useBuiltin desteฤi kaldฤฑrฤฑldฤฑ!\n" +"Ayrฤฑntฤฑlar iรงin 'git help config' iรงindeki girdisine bakฤฑn." + +#: 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:2423 +#, 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:1819 +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:629 +#: builtin/submodule--helper.c:652 +#, 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:1487 +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:666 +#, 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:670 +#, 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:680 +#, 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:687 +#, 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:709 +msgid "Suppress output for initializing a submodule" +msgstr "Bir altmodรผl ilklendirmesi รงฤฑktฤฑsฤฑnฤฑ gizle" + +#: builtin/submodule--helper.c:714 +msgid "git submodule--helper init [<options>] [<path>]" +msgstr "git submodule--helper init [<seรงenekler>] [<yol>]" + +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#, 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:835 +#, 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:862 builtin/submodule--helper.c:1457 +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "'%s' altmodรผlรผne รถzyinelenemedi" + +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +msgid "Suppress submodule status output" +msgstr "Altmodรผl durum รงฤฑktฤฑsฤฑnฤฑ gizle" + +#: builtin/submodule--helper.c:887 +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "" +"Altmodรผl HEAD'i iรงinde depolanan iลleme yerine indekste depolanan iลlemeyi " +"kullan" + +#: builtin/submodule--helper.c:888 +msgid "recurse into nested submodules" +msgstr "iรง iรงe geรงmiล altmodรผle รถzyinele" + +#: builtin/submodule--helper.c:893 +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "git submodule status [--quiet] [--cached] [--recursive] [<yol>...]" + +#: builtin/submodule--helper.c:917 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper name <yol>" + +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "* %s %s(ikili nesne)->%s(altmodรผl)" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "* %s %s(altmodรผl)->%s(ikili nesne)" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "'%s' รผzerinden nesne saฤlamasฤฑ yapฤฑlamadฤฑ" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "beklenmedik kip %o\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "altmodรผl HEAD'i iรงindeki iลleme ile indekstekini karลฤฑlaลtฤฑrmak iรงin" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "altmodรผl HEAD'i yerine indekste depolanan iลlemeyi kullan" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "'ignore_config' deฤeri 'all' olan altmodรผlleri atla" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "รถzet boyutunu sฤฑnฤฑrla" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule--helper summary [<seรงenekler>] [<iลleme>] [--] [<yol>]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "HEAD iรงin bir revizyon getirilemedi" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "--cached ve --files birlikte kullanฤฑlamaz" + +#: builtin/submodule--helper.c:1407 +#, c-format +msgid "Synchronizing submodule url for '%s'\n" +msgstr "'%s' iรงin altmodรผl url'si eลitleniyor\n" + +#: builtin/submodule--helper.c:1413 +#, 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:1427 +#, 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:1438 +#, c-format +msgid "failed to update remote for submodule '%s'" +msgstr "'%s' altmodรผlรผ iรงin uzak konum gรผncellenemedi" + +#: builtin/submodule--helper.c:1485 +msgid "Suppress output of synchronizing submodule url" +msgstr "Altmodรผl url'si eลitleme รงฤฑktฤฑsฤฑnฤฑ gizle" + +#: builtin/submodule--helper.c:1492 +msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]" + +#: builtin/submodule--helper.c:1546 +#, 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:1558 +#, 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:1566 +#, c-format +msgid "Cleared directory '%s'\n" +msgstr "'%s' dizini temizlendi\n" + +#: builtin/submodule--helper.c:1568 +#, 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:1579 +#, c-format +msgid "could not create empty submodule directory %s" +msgstr "boล altmodรผl dizini %s oluลturulamadฤฑ" + +#: builtin/submodule--helper.c:1595 +#, 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:1624 +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:1625 +msgid "Unregister all submodules" +msgstr "Tรผm altmodรผllerin kaydฤฑnฤฑ kaldฤฑr" + +#: builtin/submodule--helper.c:1630 +msgid "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" +msgstr "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<yol>...]]" + +#: builtin/submodule--helper.c:1644 +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:1713 +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:1752 builtin/submodule--helper.c:1755 +#, c-format +msgid "submodule '%s' cannot add alternate: %s" +msgstr "'%s' altmodรผlรผ alternatif ekleyemiyor: %s" + +#: builtin/submodule--helper.c:1791 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "'%s' submodule.alternateErrorStrategy deฤeri tanฤฑmlanamadฤฑ" + +#: builtin/submodule--helper.c:1798 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "'%s' submodule.alternateLocation deฤeri tanฤฑmlanamadฤฑ" + +#: builtin/submodule--helper.c:1822 +msgid "where the new submodule will be cloned to" +msgstr "yeni altmodรผlรผn nereye klonlanacaฤฤฑ" + +#: builtin/submodule--helper.c:1825 +msgid "name of the new submodule" +msgstr "yeni altmodรผlรผn adฤฑ" + +#: builtin/submodule--helper.c:1828 +msgid "url where to clone the submodule from" +msgstr "altmodรผlรผn klonlanacaฤฤฑ url konumu" + +#: builtin/submodule--helper.c:1836 +msgid "depth for shallow clones" +msgstr "sฤฑฤ klonlarฤฑn derinliฤi" + +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +msgid "force cloning progress" +msgstr "zorla klonla" + +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +msgid "disallow cloning into non-empty directory" +msgstr "boล olmayan dizine klonlamaya izin verme" + +#: builtin/submodule--helper.c:1848 +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:1873 +#, 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:1884 +#, 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:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "dizin boล deฤil: '%s'" + +#: builtin/submodule--helper.c:1900 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "'%s' iรงin altmodรผl dizini alฤฑnamadฤฑ" + +#: builtin/submodule--helper.c:1936 +#, 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:1940 +#, 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:2041 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "Altmodรผl yolu '%s' ilklendirilmedi" + +#: builtin/submodule--helper.c:2045 +msgid "Maybe you want to use 'update --init'?" +msgstr "'update --init' mi kullanmak istersiniz?" + +#: builtin/submodule--helper.c:2075 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "Birleลtirilmemiล altmodรผl %s atlanฤฑyor" + +#: builtin/submodule--helper.c:2104 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "'%s' altmodรผlรผ atlanฤฑyor" + +#: builtin/submodule--helper.c:2254 +#, c-format +msgid "Failed to clone '%s'. Retry scheduled" +msgstr "'%s' klonlanamadฤฑ. Yeniden deneme zamanlandฤฑ." + +#: builtin/submodule--helper.c:2265 +#, c-format +msgid "Failed to clone '%s' a second time, aborting" +msgstr "'%s' ikinci bir kez klonlanamadฤฑ, iptal ediliyor" + +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 +msgid "path into the working tree" +msgstr "รงalฤฑลma aฤacฤฑna giden yol" + +#: builtin/submodule--helper.c:2330 +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:2334 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout veya none" + +#: builtin/submodule--helper.c:2340 +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:2343 +msgid "parallel jobs" +msgstr "paralel iลler" + +#: builtin/submodule--helper.c:2345 +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:2346 +msgid "don't print cloning progress" +msgstr "klonlama iลlemini yazdฤฑrma" + +#: builtin/submodule--helper.c:2357 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=<yol>] [<yol>...]" + +#: builtin/submodule--helper.c:2370 +msgid "bad value for update parameter" +msgstr "gรผncelleme parametresi iรงin hatalฤฑ deฤer" + +#: builtin/submodule--helper.c:2418 +#, 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:2541 +#, 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:2574 +msgid "recurse into submodules" +msgstr "altmodรผllere รถzyinele" + +#: builtin/submodule--helper.c:2580 +msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" +msgstr "git submodule--helper absorb-git-dirs [<seรงenekler>] [<yol>...]" + +#: builtin/submodule--helper.c:2636 +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:2639 +msgid "unset the config in the .gitmodules file" +msgstr ".gitmodules dosyasฤฑndaki yapฤฑlandฤฑrmayฤฑ kaldฤฑr" + +#: builtin/submodule--helper.c:2644 +msgid "git submodule--helper config <name> [<value>]" +msgstr "git submodule--helper config <ad> [<deฤer>]" + +#: builtin/submodule--helper.c:2645 +msgid "git submodule--helper config --unset <name>" +msgstr "git submodule--helper config --unset <ad>" + +#: builtin/submodule--helper.c:2646 +msgid "git submodule--helper config --check-writeable" +msgstr "git submodule--helper config --check-writeable" + +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 +#, 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:2681 +msgid "Suppress output for setting url of a submodule" +msgstr "Bir altmodรผl url ayarlanmasฤฑ รงฤฑktฤฑsฤฑnฤฑ gizle" + +#: builtin/submodule--helper.c:2685 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper set-url [--quiet] <yol> <yeniurl>" + +#: builtin/submodule--helper.c:2718 +msgid "set the default tracking branch to master" +msgstr "รถntanฤฑmlฤฑ izleme dalฤฑnฤฑ master olarak ayarla" + +#: builtin/submodule--helper.c:2720 +msgid "set the default tracking branch" +msgstr "รถntanฤฑmlฤฑ izleme dalฤฑnฤฑ ayarla" + +#: builtin/submodule--helper.c:2724 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <yol>" + +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <dal> <yol>" + +#: builtin/submodule--helper.c:2732 +msgid "--branch or --default required" +msgstr "--branch veya --default gerekli" + +#: builtin/submodule--helper.c:2735 +msgid "--branch and --default are mutually exclusive" +msgstr "--branch ve --default birlikte kullanฤฑlamaz" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 +#, c-format +msgid "%s doesn't support --super-prefix" +msgstr "%s, --super-prefix desteklemiyor" + +#: builtin/submodule--helper.c:2798 +#, 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:486 +msgid "reason" +msgstr "neden" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +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>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" +msgstr "" +"git tag -l [-n[<sayฤฑ>]] [--contains <iลleme>] [--no-contains <iลleme>] [--" +"points-at <nesne>]\n" +"\t\t[--format=<biรงim>] [--merged <iลleme>] [--no-merged <iลleme>] " +"[<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:285 +msgid "no tag message?" +msgstr "etiket iletisi yok mu?" + +#: builtin/tag.c:292 +#, 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:403 +msgid "list tag names" +msgstr "etiket adlarฤฑnฤฑ listele" + +#: builtin/tag.c:405 +msgid "print <n> lines of each tag message" +msgstr "her etiket iletisinin <n> satฤฑrฤฑnฤฑ listele" + +#: builtin/tag.c:407 +msgid "delete tags" +msgstr "etiketleri sil" + +#: builtin/tag.c:408 +msgid "verify tags" +msgstr "etiketleri doฤrula" + +#: builtin/tag.c:410 +msgid "Tag creation options" +msgstr "Etiket oluลturma seรงenekleri" + +#: builtin/tag.c:412 +msgid "annotated tag, needs a message" +msgstr "aรงฤฑklama eklenmiล etiket iรงin bir ileti gerek" + +#: builtin/tag.c:414 +msgid "tag message" +msgstr "etiket iletisi" + +#: builtin/tag.c:416 +msgid "force edit of tag message" +msgstr "etiket iletisini zorla dรผzenle" + +#: builtin/tag.c:417 +msgid "annotated and GPG-signed tag" +msgstr "aรงฤฑklama eklenmiล ve GPG imzalฤฑ etiket" + +#: builtin/tag.c:420 +msgid "use another key to sign the tag" +msgstr "etiketi imzalamak iรงin baลka bir anahtar kullanฤฑn" + +#: builtin/tag.c:421 +msgid "replace the tag if exists" +msgstr "eฤer varsa etiketi baลkasฤฑyla deฤiลtir" + +#: builtin/tag.c:422 builtin/update-ref.c:492 +msgid "create a reflog" +msgstr "bir baลvuru gรผnlรผฤรผ oluลtur" + +#: builtin/tag.c:424 +msgid "Tag listing options" +msgstr "Etiket listeleme seรงenekleri" + +#: builtin/tag.c:425 +msgid "show tag list in columns" +msgstr "etiket listesini sรผtunlarla gรถster" + +#: builtin/tag.c:426 builtin/tag.c:428 +msgid "print only tags that contain the commit" +msgstr "yalnฤฑzca iลlemeyi iรงeren etiketleri yazdฤฑr" + +#: builtin/tag.c:427 builtin/tag.c:429 +msgid "print only tags that don't contain the commit" +msgstr "yalnฤฑzca iลleme iรงermeyen etiketleri yazdฤฑr" + +#: builtin/tag.c:430 +msgid "print only tags that are merged" +msgstr "yalnฤฑzca birleลtirilen etiketleri yazdฤฑr" + +#: builtin/tag.c:431 +msgid "print only tags that are not merged" +msgstr "yalnฤฑzca birleลtirilmeyen etiketleri yazdฤฑr" + +#: builtin/tag.c:435 +msgid "print only tags of the object" +msgstr "yalnฤฑzca nesnenin etiketlerini yazdฤฑr" + +#: builtin/tag.c:483 +msgid "--column and -n are incompatible" +msgstr "--column ve -n birbiriyle uyumsuz" + +#: builtin/tag.c:505 +msgid "-n option is only allowed in list mode" +msgstr "-n seรงeneฤine yalnฤฑzca liste kipinde izin verilir" + +#: builtin/tag.c:507 +msgid "--contains option is only allowed in list mode" +msgstr "--contains seรงeneฤine yalnฤฑzca liste kipinde izin verilir" + +#: builtin/tag.c:509 +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:511 +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:513 +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:524 +msgid "only one -F or -m option is allowed." +msgstr "yalnฤฑzca bir -F veya -m seรงeneฤine izin verilir" + +#: builtin/tag.c:543 +msgid "too many params" +msgstr "รงok fazla parametre" + +#: builtin/tag.c:549 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "'%s' geรงerli bir etiket adฤฑ deฤil." + +#: builtin/tag.c:554 +#, c-format +msgid "tag '%s' already exists" +msgstr "'%s' etiketi halihazฤฑrda var" + +#: builtin/tag.c:585 +#, 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:487 +msgid "delete the reference" +msgstr "baลvuruyu sil" + +#: builtin/update-ref.c:489 +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:490 +msgid "stdin has NUL-terminated arguments" +msgstr "stdin'de NUL ile sonlandฤฑrฤฑlan deฤiลkenler var" + +#: builtin/update-ref.c:491 +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] <iลleme>..." + +#: builtin/verify-commit.c:68 +msgid "print commit contents" +msgstr "iลleme 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:59 +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..." + +#: builtin/verify-pack.c:70 +msgid "verbose" +msgstr "ayrฤฑntฤฑlฤฑ anlatฤฑm" + +#: builtin/verify-pack.c:72 +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> [<iลlememsi>]" + +#: 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:970 +#, c-format +msgid "failed to delete '%s'" +msgstr "'%s' silinemedi" + +#: builtin/worktree.c:85 +msgid "not a valid directory" +msgstr "geรงerli bir dizin deฤil" + +#: builtin/worktree.c:91 +msgid "gitdir file does not exist" +msgstr "gitdir dosyasฤฑ mevcut deฤil" + +#: builtin/worktree.c:96 builtin/worktree.c:105 +#, c-format +msgid "unable to read gitdir file (%s)" +msgstr "gitdir dosyasฤฑ (%s) okunamฤฑyor" + +#: builtin/worktree.c:115 +#, c-format +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "az okundu (%<PRIuMAX> bayt bekleniyordu, %<PRIuMAX> okundu)" + +#: builtin/worktree.c:123 +msgid "invalid gitdir file" +msgstr "geรงersiz gitdir dosyasฤฑ" + +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "gitdir dosyasฤฑ var olmayan bir konuma iลaret ediyor" + +#: builtin/worktree.c:146 +#, c-format +msgid "Removing %s/%s: %s" +msgstr "%s/%s kaldฤฑrฤฑlฤฑyor: %s" + +#: builtin/worktree.c:221 +msgid "report pruned working trees" +msgstr "budanan รงalฤฑลma aฤaรงlarฤฑnฤฑ bildir" + +#: builtin/worktree.c:223 +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:293 +#, c-format +msgid "'%s' already exists" +msgstr "'%s' halihazฤฑrda var" + +#: builtin/worktree.c:302 +#, c-format +msgid "unusable worktree destination '%s'" +msgstr "kullanฤฑlamayan รงalฤฑลma aฤacฤฑ konumu '%s'" + +#: builtin/worktree.c:307 +#, c-format +msgid "" +"'%s' is a missing but locked worktree;\n" +"use '%s -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 '%s -f -f', temizlemek iรงin 'unlock', 'prune' veya " +"'remove' kullanฤฑn" + +#: builtin/worktree.c:309 +#, c-format +msgid "" +"'%s' is a missing but already registered worktree;\n" +"use '%s -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 '%s -f', temizlemek iรงin 'prune' veya 'remove' kullanฤฑn" + +#: builtin/worktree.c:360 +#, c-format +msgid "could not create directory of '%s'" +msgstr "'%s' dizini oluลturulamadฤฑ" + +#: builtin/worktree.c:494 builtin/worktree.c:500 +#, c-format +msgid "Preparing worktree (new branch '%s')" +msgstr "รalฤฑลma aฤacฤฑ hazฤฑrlanฤฑyor (yeni dal '%s')" + +#: builtin/worktree.c:496 +#, 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:505 +#, c-format +msgid "Preparing worktree (checking out '%s')" +msgstr "รalฤฑลma aฤacฤฑ hazฤฑrlanฤฑyor ('%s' รงฤฑkฤฑล yapฤฑlฤฑyor)" + +#: builtin/worktree.c:511 +#, c-format +msgid "Preparing worktree (detached HEAD %s)" +msgstr "รalฤฑลma aฤacฤฑ hazฤฑrlanฤฑyor (ayrฤฑk HEAD %s)" + +#: builtin/worktree.c:552 +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:555 +msgid "create a new branch" +msgstr "yeni bir dal oluลtur" + +#: builtin/worktree.c:557 +msgid "create or reset a branch" +msgstr "yeni bir dal oluลtur veya sฤฑfฤฑrla" + +#: builtin/worktree.c:559 +msgid "populate the new working tree" +msgstr "yeni รงalฤฑลma aฤacฤฑnฤฑ doldur" + +#: builtin/worktree.c:560 +msgid "keep the new working tree locked" +msgstr "yeni รงalฤฑลma aฤacฤฑnฤฑ kilitli tut" + +#: builtin/worktree.c:563 +msgid "set up tracking mode (see git-branch(1))" +msgstr "izleme kipini ayarla (bkz: git-branch(1))" + +#: builtin/worktree.c:566 +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:574 +msgid "-b, -B, and --detach are mutually exclusive" +msgstr "-b, -B ve --detach birlikte kullanฤฑlamaz" + +#: builtin/worktree.c:635 +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:755 +msgid "reason for locking" +msgstr "kilitleme nedeni" + +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 +#, c-format +msgid "'%s' is not a working tree" +msgstr "'%s' bir รงalฤฑลma aฤacฤฑ deฤil" + +#: builtin/worktree.c:769 builtin/worktree.c:802 +msgid "The main working tree cannot be locked or unlocked" +msgstr "Ana รงalฤฑลma aฤacฤฑ kilitlenemez veya kilidi aรงฤฑlamaz" + +#: builtin/worktree.c:774 +#, c-format +msgid "'%s' is already locked, reason: %s" +msgstr "'%s' halihazฤฑrda kilitli, nedeni: %s" + +#: builtin/worktree.c:776 +#, c-format +msgid "'%s' is already locked" +msgstr "'%s' halihazฤฑrda kilitli" + +#: builtin/worktree.c:804 +#, c-format +msgid "'%s' is not locked" +msgstr "'%s' kilitli deฤil" + +#: builtin/worktree.c:845 +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:853 +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:876 builtin/worktree.c:1000 +#, c-format +msgid "'%s' is a main working tree" +msgstr "'%s' bir ana รงalฤฑลma aฤacฤฑ" + +#: builtin/worktree.c:881 +#, c-format +msgid "could not figure out destination name from '%s'" +msgstr "hedef adฤฑ ลuradan anlaลฤฑlamadฤฑ: '%s'" + +#: builtin/worktree.c:894 +#, 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:896 +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:899 +#, 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:904 +#, c-format +msgid "failed to move '%s' to '%s'" +msgstr "'%s' -> '%s' taลฤฑmasฤฑ baลarฤฑsฤฑz" + +#: builtin/worktree.c:950 +#, c-format +msgid "failed to run 'git status' on '%s'" +msgstr "'%s' รผzerinde 'git status' รงalฤฑลtฤฑrฤฑlamadฤฑ" + +#: builtin/worktree.c:954 +#, 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:959 +#, 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:982 +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:1005 +#, 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:1007 +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:1010 +#, 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/worktree.c:1034 +#, c-format +msgid "repair: %s: %s" +msgstr "ลunu onar %s: %s" + +#: builtin/worktree.c:1037 +#, c-format +msgid "error: %s: %s" +msgstr "hata: %s: %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ฤฑ" + +#: http-fetch.c:114 +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "--packfile iรงin deฤiลken geรงerli bir saฤlama olmalฤฑdฤฑr ('%s' alฤฑndฤฑ)" + +#: http-fetch.c:122 +msgid "not a git repository" +msgstr "bir git deposu deฤil" + +#: t/helper/test-reach.c:154 +#, c-format +msgid "commit %s is not marked reachable" +msgstr "%s iลlemesi ulaลฤฑlabilir olarak imlenmedi" + +#: t/helper/test-reach.c:164 +msgid "too many commits marked reachable" +msgstr "รงok fazla iลleme 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:28 +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:35 +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:187 +#, c-format +msgid "no directory given for --git-dir\n" +msgstr "--git-dir iรงin dizin verilmedi\n" + +#: git.c:201 +#, c-format +msgid "no namespace given for --namespace\n" +msgstr "--namespace iรงin ad alanฤฑ verilmedi\n" + +#: git.c:215 +#, c-format +msgid "no directory given for --work-tree\n" +msgstr "--work-tree iรงin dizin verilmedi\n" + +#: git.c:229 +#, c-format +msgid "no prefix given for --super-prefix\n" +msgstr "--super-prefix iรงin รถnek verilmedi\n" + +#: git.c:251 +#, c-format +msgid "-c expects a configuration string\n" +msgstr "-c bir yapฤฑlandฤฑrma dizisi bekliyor\n" + +#: git.c:289 +#, c-format +msgid "no directory given for -C\n" +msgstr "-C iรงin dizin verilmedi\n" + +#: git.c:315 +#, c-format +msgid "unknown option: %s\n" +msgstr "bilinmeyen seรงenek: %s\n" + +#: git.c:364 +#, c-format +msgid "while expanding alias '%s': '%s'" +msgstr "'%s' armasฤฑ geniลletirilirken: '%s'" + +#: git.c:373 +#, 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:380 +#, c-format +msgid "empty alias for %s" +msgstr "%s iรงin boล arma" + +#: git.c:383 +#, c-format +msgid "recursive alias: %s" +msgstr "รถzyineli arma: %s" + +#: git.c:465 +msgid "write failure on standard output" +msgstr "standart รงฤฑktฤฑ'da yazma hatasฤฑ" + +#: git.c:467 +msgid "unknown write failure on standard output" +msgstr "standart รงฤฑktฤฑ'da bilinmeyen yazma hatasฤฑ" + +#: git.c:469 +msgid "close failed on standard output" +msgstr "standart รงฤฑktฤฑ'da kapatma baลarฤฑsฤฑz" + +#: git.c:819 +#, 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:869 +#, c-format +msgid "cannot handle %s as a builtin" +msgstr "%s bir yerleลik olarak ele alฤฑnamฤฑyor" + +#: git.c:882 +#, c-format +msgid "" +"usage: %s\n" +"\n" +msgstr "" +"kullanฤฑm: %s\n" +"\n" + +#: git.c:902 +#, 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:914 +#, c-format +msgid "failed to run command '%s': %s\n" +msgstr "'%s' komutu รงalฤฑลtฤฑrฤฑlamadฤฑ: %s\n" + +#: http.c:399 +#, 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:420 +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "Delegasyon denetimi cURL < 7.22.0 tarafฤฑndan desteklenmiyor" + +#: http.c:429 +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:910 +msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" +msgstr "CURLSSLOPT_NO_REVOKE cURL < 7.44.0 tarafฤฑndan desteklenmiyor" + +#: http.c:989 +msgid "Protocol restrictions not supported with cURL < 7.19.4" +msgstr "Protokol sฤฑnฤฑrlamalarฤฑ cURL < 7.19.4 tarafฤฑndan desteklenmiyor" + +#: http.c:1132 +#, c-format +msgid "Unsupported SSL backend '%s'. Supported SSL backends:" +msgstr "Desteklenmeyen SSL arka ucu '%s'. Desteklenen SSL arka uรงlarฤฑ:" + +#: http.c:1139 +#, 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:1143 +#, c-format +msgid "Could not set SSL backend to '%s': already set" +msgstr "SSL arka ucu '%s' olarak ayarlanamadฤฑ: Halihazฤฑrda ayarlanmฤฑล" + +#: http.c:2025 +#, 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:174 +#, 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:298 +#, 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:399 +msgid "invalid server response; expected service, got flush packet" +msgstr "geรงersiz sunucu yanฤฑtฤฑ; servis bekleniyordu, floล paketi alฤฑndฤฑ" + +#: remote-curl.c:430 +#, c-format +msgid "invalid server response; got '%s'" +msgstr "geรงersiz sunucu yanฤฑtฤฑ; '%s' alฤฑndฤฑ" + +#: remote-curl.c:490 +#, c-format +msgid "repository '%s' not found" +msgstr "'%s' deposu bulunamadฤฑ" + +#: remote-curl.c:494 +#, c-format +msgid "Authentication failed for '%s'" +msgstr "'%s' iรงin kimlik doฤrulamasฤฑ baลarฤฑsฤฑz" + +#: remote-curl.c:498 +#, c-format +msgid "unable to access '%s': %s" +msgstr "'%s' eriลilemiyor: %s" + +#: remote-curl.c:504 +#, c-format +msgid "redirecting to %s" +msgstr "ลuraya yeniden yรถnlendiriliyor: %s" + +#: remote-curl.c:633 +msgid "shouldn't have EOF when not gentle on EOF" +msgstr "dosya sonuna dikkat edilmiyorsa dosya sonu olmamalฤฑdฤฑr" + +#: remote-curl.c:645 +msgid "remote server sent stateless separator" +msgstr "uzak sunucu durumsuz ayฤฑrฤฑcฤฑ gรถnderdi" + +#: remote-curl.c:715 +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:745 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curl: hatalฤฑ satฤฑr uzunluฤu karakteri: %.4s" + +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curl: beklenmedik yanฤฑt sonu paketi" + +#: remote-curl.c:823 +#, c-format +msgid "RPC failed; %s" +msgstr "RPC baลarฤฑsฤฑz oldu; %s" + +#: remote-curl.c:863 +msgid "cannot handle pushes this big" +msgstr "bu kadar bรผyรผk itmeler ele alฤฑnamฤฑyor" + +#: remote-curl.c:978 +#, c-format +msgid "cannot deflate request; zlib deflate error %d" +msgstr "istek sรถndรผrรผlemiyor; 'zlib deflate' hatasฤฑ %d" + +#: remote-curl.c:982 +#, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "istek sรถndรผrรผlemiyor; 'zlib end' hatasฤฑ %d" + +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" +msgstr "รผstbilginin %d baytฤฑ alฤฑndฤฑ" + +#: remote-curl.c:1034 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "gรถvdenin %d baytฤฑ hรขlรข bekleniyor" + +#: remote-curl.c:1123 +msgid "dumb http transport does not support shallow capabilities" +msgstr "programlanamayan http taลฤฑyฤฑcฤฑsฤฑ sฤฑฤ iลlevleri desteklemiyor" + +#: remote-curl.c:1138 +msgid "fetch failed." +msgstr "getirme baลarฤฑsฤฑz." + +#: remote-curl.c:1184 +msgid "cannot fetch by sha1 over smart http" +msgstr "akฤฑllฤฑ http รผzerinden sha1 ile getirme yapฤฑlamฤฑyor" + +#: remote-curl.c:1228 remote-curl.c:1234 +#, c-format +msgid "protocol error: expected sha/ref, got '%s'" +msgstr "protokol hatasฤฑ: sha/ref bekleniyordu, '%s' alฤฑndฤฑ" + +#: remote-curl.c:1246 remote-curl.c:1361 +#, c-format +msgid "http transport does not support %s" +msgstr "http taลฤฑyฤฑcฤฑsฤฑ %s desteklemiyor" + +#: remote-curl.c:1282 +msgid "git-http-push failed" +msgstr "git-http-push baลarฤฑsฤฑz" + +#: remote-curl.c:1467 +msgid "remote-curl: usage: git remote-curl <remote> [<url>]" +msgstr "remote-curl: kullanฤฑm: git remote-curl <uzak-konum> [<url>]" + +#: remote-curl.c:1499 +msgid "remote-curl: error reading command stream from git" +msgstr "remote-curl: git'ten komut akฤฑลฤฑ okunurken hata" + +#: remote-curl.c:1506 +msgid "remote-curl: fetch attempted without a local repo" +msgstr "remote-curl: yerel bir depo olmadan getirme yapฤฑlmaya รงalฤฑลฤฑldฤฑ" + +#: remote-curl.c:1547 +#, c-format +msgid "remote-curl: unknown command '%s' from git" +msgstr "remote-curl: git'ten bilinmeyen komut '%s'" + +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "derleyici bilgisi mevcut deฤil\n" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "libc bilgisi mevcut deฤil\n" + +#: list-objects-filter-options.h:91 +msgid "args" +msgstr "deฤiลkenler" + +#: list-objects-filter-options.h:92 +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 object names" +msgstr "nesne adlarฤฑnฤฑ gรถrรผntรผlemek iรงin <n> basamak 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:96 +msgid "key" +msgstr "anahtar" + +#: ref-filter.h:96 +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:80 +msgid "HEAD detached at " +msgstr "HEAD ลurada ayrฤฑldฤฑ: " + +#: wt-status.h:81 +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 "ฤฐลleme 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 iลlemeyi 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 "Collect information for user to file a bug report" +msgstr "Hata raporu bildirimi iรงin veri topla" + +#: command-list.h:60 +msgid "Move objects and refs by archive" +msgstr "Nesneleri ve baลvurularฤฑ arลive gรถre taลฤฑ" + +#: command-list.h:61 +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:62 +msgid "Display gitattributes information" +msgstr "gitattributes bilgisini gรถrรผntรผle" + +#: command-list.h:63 +msgid "Debug gitignore / exclude files" +msgstr "gitignore / exclude dosyalarฤฑnda hata ayฤฑkla" + +#: command-list.h:64 +msgid "Show canonical names and email addresses of contacts" +msgstr "Kiลilerin adlarฤฑnฤฑ ve e-posta adreslerini gรถster" + +#: command-list.h:65 +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:66 +msgid "Copy files from the index to the working tree" +msgstr "Dosyalarฤฑ indeksten รงalฤฑลma aฤacฤฑna kopyala" + +#: command-list.h:67 +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:68 +msgid "Find commits yet to be applied to upstream" +msgstr "Henรผz รผstkaynaฤa uygulanmayan iลlemeleri bul" + +#: command-list.h:69 +msgid "Apply the changes introduced by some existing commits" +msgstr "Mevcut bazฤฑ iลlemelerin getirdiฤi deฤiลiklikleri uygula" + +#: command-list.h:70 +msgid "Graphical alternative to git-commit" +msgstr "git-commit iรงin grafik tabanlฤฑ alternatif" + +#: command-list.h:71 +msgid "Remove untracked files from the working tree" +msgstr "ฤฐzlenmeyen dosyalarฤฑ รงalฤฑลma aฤacฤฑndan kaldฤฑr" + +#: command-list.h:72 +msgid "Clone a repository into a new directory" +msgstr "Bir depoyu yeni bir dizine klonla" + +#: command-list.h:73 +msgid "Display data in columns" +msgstr "Verileri sรผtunlarla gรถster" + +#: command-list.h:74 +msgid "Record changes to the repository" +msgstr "Deฤiลikliklerin kaydฤฑnฤฑ depoya yaz" + +#: command-list.h:75 +msgid "Write and verify Git commit-graph files" +msgstr "Git commit-graph dosyalarฤฑnฤฑ doฤrula ve yaz" + +#: command-list.h:76 +msgid "Create a new commit object" +msgstr "Yeni bir iลleme nesnesi oluลtur" + +#: command-list.h:77 +msgid "Get and set repository or global options" +msgstr "Depoyu veya global seรงenekleri al ve ayarla" + +#: command-list.h:78 +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:79 +msgid "Retrieve and store user credentials" +msgstr "Kullanฤฑcฤฑ yetkilerini al ve depola" + +#: command-list.h:80 +msgid "Helper to temporarily store passwords in memory" +msgstr "Parolalarฤฑ geรงici olarak bellekte saklamak iรงin yardฤฑmcฤฑ" + +#: command-list.h:81 +msgid "Helper to store credentials on disk" +msgstr "Yetkileri diskte saklamak iรงin yardฤฑmcฤฑ" + +#: command-list.h:82 +msgid "Export a single commit to a CVS checkout" +msgstr "Bir CVS รงฤฑkฤฑลฤฑna tek bir iลlemeyi dฤฑลa aktar" + +#: command-list.h:83 +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:84 +msgid "A CVS server emulator for Git" +msgstr "Git iรงin bir SCV sunucusu รถykรผnรผcรผsรผ" + +#: command-list.h:85 +msgid "A really simple server for Git repositories" +msgstr "Git depolarฤฑ iรงin gerรงekten yalฤฑn bir sunucu" + +#: command-list.h:86 +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:87 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "ฤฐลlemeler, iลleme ve aฤaรงlar vb. arasฤฑ deฤiลiklikler" + +#: command-list.h:88 +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:89 +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:90 +msgid "Compares the content and mode of blobs found via two tree objects" +msgstr "" +"ฤฐki aฤaรง nesnesi aracฤฑlฤฑฤฤฑyla bulunan ikililerin iรงerik ve kipini karลฤฑlaลtฤฑr" + +#: command-list.h:91 +msgid "Show changes using common diff tools" +msgstr "Deฤiลiklikleri yaygฤฑn diff araรงlarฤฑyla gรถster" + +#: command-list.h:92 +msgid "Git data exporter" +msgstr "Git veri dฤฑลa aktarฤฑcฤฑsฤฑ" + +#: command-list.h:93 +msgid "Backend for fast Git data importers" +msgstr "Hฤฑzlฤฑ Git veri dฤฑลa aktarฤฑcฤฑlarฤฑ iรงin arka uรง" + +#: command-list.h:94 +msgid "Download objects and refs from another repository" +msgstr "Baลka bir depodan nesneleri ve baลvurularฤฑ indir" + +#: command-list.h:95 +msgid "Receive missing objects from another repository" +msgstr "Baลka bir depodan eksik nesneleri al" + +#: command-list.h:96 +msgid "Rewrite branches" +msgstr "Dallarฤฑ yeniden yaz" + +#: command-list.h:97 +msgid "Produce a merge commit message" +msgstr "Bir birleลtirme iลlemesi iletisi oluลtur" + +#: command-list.h:98 +msgid "Output information on each ref" +msgstr "Her baลvuru รผzerine bilgi รงฤฑktฤฑ ver" + +#: command-list.h:99 +msgid "Prepare patches for e-mail submission" +msgstr "E-posta teslimi iรงin yamalarฤฑ hazฤฑrla" + +#: command-list.h:100 +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:101 +msgid "Cleanup unnecessary files and optimize the local repository" +msgstr "Gereksiz dosyalarฤฑ temizle ve yerel depoyu eniyile" + +#: command-list.h:102 +msgid "Extract commit ID from an archive created using git-archive" +msgstr "ฤฐลleme iletisini bir git-archive arลivinden รงฤฑkartฤฑp al" + +#: command-list.h:103 +msgid "Print lines matching a pattern" +msgstr "Bir dizgi ile eลleลen satฤฑrlarฤฑ yazdฤฑr" + +#: command-list.h:104 +msgid "A portable graphical interface to Git" +msgstr "Git iรงin taลฤฑnabilir bir grafik arabirim" + +#: command-list.h:105 +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:106 +msgid "Display help information about Git" +msgstr "Git yardฤฑm bilgisini gรถrรผntรผle" + +#: command-list.h:107 +msgid "Server side implementation of Git over HTTP" +msgstr "Git'in HTTP รผzerinden sunucu tarafฤฑ uygulamasฤฑ" + +#: command-list.h:108 +msgid "Download from a remote Git repository via HTTP" +msgstr "HTTP รผzerinden uzak bir Git deposundan indir" + +#: command-list.h:109 +msgid "Push objects over HTTP/DAV to another repository" +msgstr "Nesneleri HTTP/DAV รผzerinden baลka bir depoya it" + +#: command-list.h:110 +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:111 +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:112 +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:113 +msgid "Instantly browse your working repository in gitweb" +msgstr "gitweb'deki รงalฤฑลma deposuna anฤฑnda gรถz at" + +#: command-list.h:114 +msgid "Add or parse structured information in commit messages" +msgstr "ฤฐลleme iletilerine dรผzenli bilgi ekle veya ayrฤฑลtฤฑr" + +#: command-list.h:115 +msgid "The Git repository browser" +msgstr "Git depo tarayฤฑcฤฑsฤฑ" + +#: command-list.h:116 +msgid "Show commit logs" +msgstr "ฤฐลleme gรผnlรผklerini gรถster" + +#: command-list.h:117 +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:118 +msgid "List references in a remote repository" +msgstr "Uzak bir depodaki baลvurularฤฑ listele" + +#: command-list.h:119 +msgid "List the contents of a tree object" +msgstr "Bir aฤaรง nesnesinin iรงeriฤini listele" + +#: command-list.h:120 +msgid "Extracts patch and authorship from a single e-mail message" +msgstr "E-posta iletisinden yama ve yazar bilgisini รงฤฑkart" + +#: command-list.h:121 +msgid "Simple UNIX mbox splitter program" +msgstr "Yalฤฑn UNIX mbox bรถlรผcรผ yazฤฑlฤฑmฤฑ" + +#: command-list.h:122 +msgid "Run tasks to optimize Git repository data" +msgstr "Git depo verisini eniyilemek iรงin gรถrevler รงalฤฑลtฤฑr" + +#: command-list.h:123 +msgid "Join two or more development histories together" +msgstr "ฤฐki veya daha fazla geliลtirme geรงmiลini birleลtir" + +#: command-list.h:124 +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:125 +msgid "Run a three-way file merge" +msgstr "Bir รผรง yรถnlรผ dosya birleลtirmesi รงalฤฑลtฤฑr" + +#: command-list.h:126 +msgid "Run a merge for files needing merging" +msgstr "Birleลtirilmesi gereken dosyalarฤฑ birleลtir" + +#: command-list.h:127 +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:128 +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:129 +msgid "Show three-way merge without touching index" +msgstr "ฤฐndekse dokunmadan รผรงlรผ birleลtirmeyi gรถster" + +#: command-list.h:130 +msgid "Write and verify multi-pack-indexes" +msgstr "multi-pack-index doฤrula ve yaz" + +#: command-list.h:131 +msgid "Creates a tag object" +msgstr "Bir etiket nesnesi oluลtur" + +#: command-list.h:132 +msgid "Build a tree-object from ls-tree formatted text" +msgstr "ls-tree biรงimli metinden bir aฤaรง nesnesi yap" + +#: command-list.h:133 +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:134 +msgid "Find symbolic names for given revs" +msgstr "Verilen revizyonlar iรงin sembolik adlarฤฑ bul" + +#: command-list.h:135 +msgid "Add or inspect object notes" +msgstr "Nesne notlarฤฑ ekle veya incele" + +#: command-list.h:136 +msgid "Import from and submit to Perforce repositories" +msgstr "Perforce depolarฤฑndan iรงe aktar ve onlara gรถnder" + +#: command-list.h:137 +msgid "Create a packed archive of objects" +msgstr "Paketlenmiล bir nesne arลivi oluลtur" + +#: command-list.h:138 +msgid "Find redundant pack files" +msgstr "Gereksiz paket dosyalarฤฑnฤฑ bul" + +#: command-list.h:139 +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:140 +msgid "Routines to help parsing remote repository access parameters" +msgstr "Uzak depo eriลim parametrelerini ayrฤฑลtฤฑrmaya yardฤฑmcฤฑ rutinler" + +#: command-list.h:141 +msgid "Compute unique ID for a patch" +msgstr "Bir yama iรงin eลi olmayan numara hesapla" + +#: command-list.h:142 +msgid "Prune all unreachable objects from the object database" +msgstr "Ulaลฤฑlamayan tรผm nesneleri nesne veritabanฤฑndan buda" + +#: command-list.h:143 +msgid "Remove extra objects that are already in pack files" +msgstr "Halihazฤฑrda paket dosyalarฤฑnda olan ek nesneleri kaldฤฑr" + +#: command-list.h:144 +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:145 +msgid "Update remote refs along with associated objects" +msgstr "ฤฐliลkin nesnelerle birlikte uzak baลvurularฤฑ da gรผncelle" + +#: command-list.h:146 +msgid "Applies a quilt patchset onto the current branch" +msgstr "Geรงerli dala bir \"Quilt\" yama seti uygula" + +#: command-list.h:147 +msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgstr "ฤฐki iลleme erimini karลฤฑlaลtฤฑr (bir dalฤฑn iki sรผrรผmรผ)" + +#: command-list.h:148 +msgid "Reads tree information into the index" +msgstr "Aฤaรง bilgisini indekse okur" + +#: command-list.h:149 +msgid "Reapply commits on top of another base tip" +msgstr "ฤฐลlemeleri baลka bir temel ucu รผzerine uygula" + +#: command-list.h:150 +msgid "Receive what is pushed into the repository" +msgstr "Depoya ne itildiyse al" + +#: command-list.h:151 +msgid "Manage reflog information" +msgstr "Baลvuru gรผnlรผฤรผ bilgisini yรถnet" + +#: command-list.h:152 +msgid "Manage set of tracked repositories" +msgstr "ฤฐzlenen depolar setini yรถnet" + +#: command-list.h:153 +msgid "Pack unpacked objects in a repository" +msgstr "Bir depodaki paketlenmemiล nesneleri paketle" + +#: command-list.h:154 +msgid "Create, list, delete refs to replace objects" +msgstr "Nesne deฤiลtirmek iรงin baลvurular oluลtur, sil, listele" + +#: command-list.h:155 +msgid "Generates a summary of pending changes" +msgstr "Bekleyen deฤiลikliklerin bir รถzetini รงฤฑkart" + +#: command-list.h:156 +msgid "Reuse recorded resolution of conflicted merges" +msgstr "รakฤฑลan birleลtirmelerin kayฤฑtlฤฑ รงรถzรผmlerini yen. kullan" + +#: command-list.h:157 +msgid "Reset current HEAD to the specified state" +msgstr "Geรงerli HEAD'i belirtilen duruma sฤฑfฤฑrla" + +#: command-list.h:158 +msgid "Restore working tree files" +msgstr "รalฤฑลma aฤacฤฑ dosyalarฤฑnฤฑ eski durumuna getir" + +#: command-list.h:159 +msgid "Revert some existing commits" +msgstr "Bazฤฑ var olan iลlemeleri geri al" + +#: command-list.h:160 +msgid "Lists commit objects in reverse chronological order" +msgstr "ฤฐลleme nesnelerini ters kronolojik sฤฑrada listele" + +#: command-list.h:161 +msgid "Pick out and massage parameters" +msgstr "Parametreleri al ve รผzerinde รงalฤฑล" + +#: command-list.h:162 +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:163 +msgid "Send a collection of patches as emails" +msgstr "Bir yama derlemesini e-posta olarak gรถnder" + +#: command-list.h:164 +msgid "Push objects over Git protocol to another repository" +msgstr "Nesneleri Git protokolรผ รผzerinden baลka bir depoya it" + +#: command-list.h:165 +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:166 +msgid "Summarize 'git log' output" +msgstr "'git log' รงฤฑktฤฑsฤฑnฤฑ รถzetle" + +#: command-list.h:167 +msgid "Show various types of objects" +msgstr "รeลitli tรผrde nesneleri gรถster" + +#: command-list.h:168 +msgid "Show branches and their commits" +msgstr "Dallarฤฑ ve onlarฤฑn iลlemelerini gรถster" + +#: command-list.h:169 +msgid "Show packed archive index" +msgstr "Paketlenmiล arลiv indeksini gรถster" + +#: command-list.h:170 +msgid "List references in a local repository" +msgstr "Yerel bir depodaki baลvurularฤฑ listele" + +#: command-list.h:171 +msgid "Git's i18n setup code for shell scripts" +msgstr "Kabuk betikleri iรงin Git'in i18n kurulum kodu" + +#: command-list.h:172 +msgid "Common Git shell script setup code" +msgstr "Ortak Git kabuk betiฤi kurulum kodu" + +#: command-list.h:173 +msgid "Initialize and modify the sparse-checkout" +msgstr "Aralฤฑklฤฑ รงฤฑkฤฑลฤฑ ilklendir ve gรผncelle" + +#: command-list.h:174 +msgid "Stash the changes in a dirty working directory away" +msgstr "Kirli bir รงalฤฑลma dizinindeki deฤiลiklikleri zulala" + +#: command-list.h:175 +msgid "Add file contents to the staging area" +msgstr "Dosya iรงeriฤini hazฤฑrlama alanฤฑna ekle" + +#: command-list.h:176 +msgid "Show the working tree status" +msgstr "รalฤฑลma aฤacฤฑ durumunu gรถster" + +#: command-list.h:177 +msgid "Remove unnecessary whitespace" +msgstr "Gereksiz boลluklarฤฑ kaldฤฑr" + +#: command-list.h:178 +msgid "Initialize, update or inspect submodules" +msgstr "Altmodรผlleri ilklendir, gรผncelle veya incele" + +#: command-list.h:179 +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:180 +msgid "Switch branches" +msgstr "Dal deฤiลtir" + +#: command-list.h:181 +msgid "Read, modify and delete symbolic refs" +msgstr "Sembolik baลvurularฤฑ oku, dรผzenle ve sil" + +#: command-list.h:182 +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:183 +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:184 +msgid "Unpack objects from a packed archive" +msgstr "Paketlenmiล bir arลivden nesneleri รงฤฑkar" + +#: command-list.h:185 +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:186 +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:187 +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:188 +msgid "Send archive back to git-archive" +msgstr "Arลivi git-archive'e geri gรถnder" + +#: command-list.h:189 +msgid "Send objects packed back to git-fetch-pack" +msgstr "Nesneleri git-fetch-pack'e paketlenmiล olarak geri gรถnder" + +#: command-list.h:190 +msgid "Show a Git logical variable" +msgstr "Bir mantฤฑksal Git deฤiลkeni gรถster" + +#: command-list.h:191 +msgid "Check the GPG signature of commits" +msgstr "ฤฐลlemelerin GPG imzasฤฑnฤฑ denetle" + +#: command-list.h:192 +msgid "Validate packed Git archive files" +msgstr "Paketlenmiล Git arลiv dosyalarฤฑnฤฑ doฤrula" + +#: command-list.h:193 +msgid "Check the GPG signature of tags" +msgstr "Etiketlerin GPG imzasฤฑnฤฑ doฤrula" + +#: command-list.h:194 +msgid "Git web interface (web frontend to Git repositories)" +msgstr "Git web arabirimi (Git depolarฤฑ iรงin web รถn ucu)" + +#: command-list.h:195 +msgid "Show logs with difference each commit introduces" +msgstr "Gรผnlรผkleri her iลlemenin sunduฤu deฤiลikliklerle gรถster" + +#: command-list.h:196 +msgid "Manage multiple working trees" +msgstr "Birden รงok รงalฤฑลma aฤacฤฑnฤฑ yรถnet" + +#: command-list.h:197 +msgid "Create a tree object from the current index" +msgstr "Geรงerli indeksten bir aฤaรง nesnesi oluลtur" + +#: command-list.h:198 +msgid "Defining attributes per path" +msgstr "รznitelikleri yola gรถre tanฤฑmla" + +#: command-list.h:199 +msgid "Git command-line interface and conventions" +msgstr "Git komut satฤฑrฤฑ arabirimi ve kurallarฤฑ" + +#: command-list.h:200 +msgid "A Git core tutorial for developers" +msgstr "Geliลtiriciler iรงin Git รงekirdeฤi eฤitmeni" + +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "Git'e kullanฤฑcฤฑ adlarฤฑ ve parolalar belirt" + +#: command-list.h:202 +msgid "Git for CVS users" +msgstr "CVS kullanฤฑcฤฑlarฤฑ iรงin Git" + +#: command-list.h:203 +msgid "Tweaking diff output" +msgstr "diff รงฤฑktฤฑsฤฑ iรงin ince ayarlar" + +#: command-list.h:204 +msgid "A useful minimum set of commands for Everyday Git" +msgstr "Gรผnlรผk Git kullanฤฑmฤฑ iรงin yararlฤฑ komutlar" + +#: command-list.h:205 +msgid "Frequently asked questions about using Git" +msgstr "Git kullanฤฑmฤฑ hakkฤฑnda sฤฑkรงa sorulan sorular" + +#: command-list.h:206 +msgid "A Git Glossary" +msgstr "Git Kavram Dizini" + +#: command-list.h:207 +msgid "Hooks used by Git" +msgstr "Git tarafฤฑndan kullanฤฑlan kancalar" + +#: command-list.h:208 +msgid "Specifies intentionally untracked files to ignore" +msgstr "รzellikle yok sayฤฑlmasฤฑ istenen dosyalarฤฑ belirt" + +#: command-list.h:209 +msgid "Defining submodule properties" +msgstr "Altmodรผl รถzelliklerini tanฤฑmlama" + +#: command-list.h:210 +msgid "Git namespaces" +msgstr "Git ad alanlarฤฑ" + +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "Uzak depolar ile etkileลim iรงin yardฤฑmcฤฑ programlar" + +#: command-list.h:212 +msgid "Git Repository Layout" +msgstr "Git Depo Yerleลimi" + +#: command-list.h:213 +msgid "Specifying revisions and ranges for Git" +msgstr "Git iรงin revizyonlarฤฑ ve erimleri belirtme" + +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "Bir depoyu bir baลkasฤฑnฤฑn iรงine baฤlama" + +#: command-list.h:215 +msgid "A tutorial introduction to Git: part two" +msgstr "Git'e Giriล: Bรถlรผm 2" + +#: command-list.h:216 +msgid "A tutorial introduction to Git" +msgstr "Git'e Giriล" + +#: command-list.h:217 +msgid "An overview of recommended workflows with Git" +msgstr "รnerilen Git รงalฤฑลma akฤฑลlarฤฑna genel bakฤฑล" + +#: git-bisect.sh:79 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "Hatalฤฑ revizyon girdisi: $arg" + +#: git-bisect.sh:99 +#, sh-format +msgid "Bad rev input: $bisected_head" +msgstr "Hatalฤฑ revizyon girdisi: $bisected_head" + +#: git-bisect.sh:108 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "Hatalฤฑ revizyon girdisi: $rev" + +#: git-bisect.sh:117 +#, 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:149 +msgid "No logfile given" +msgstr "Gรผnlรผk dosyasฤฑ verilmedi" + +#: git-bisect.sh:150 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "$file yeniden oynatฤฑm iรงin okunamฤฑyor" + +#: git-bisect.sh:173 +msgid "?? what are you talking about?" +msgstr "?? neden sรถz ediyorsun?" + +#: git-bisect.sh:183 +msgid "bisect run failed: no command provided." +msgstr "ikili arama baลarฤฑsฤฑz: Komut verilmedi." + +#: git-bisect.sh:188 +#, sh-format +msgid "running $command" +msgstr "$command รงalฤฑลtฤฑrฤฑlฤฑyor" + +#: git-bisect.sh:195 +#, 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:221 +msgid "bisect run cannot continue any more" +msgstr "bisect daha fazla รงalฤฑลtฤฑrฤฑlamฤฑyor" + +#: git-bisect.sh:227 +#, 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:234 +msgid "bisect run success" +msgstr "ikili arama baลarฤฑlฤฑ" + +#: git-bisect.sh:242 +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 iลleme 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 "ฤฐleri sarma konumu: $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-submodule.sh:180 +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:190 +#, 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:209 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "'$sm_path' indekste halihazฤฑrda var" + +#: git-submodule.sh:212 +#, 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:219 +#, sh-format +msgid "'$sm_path' does not have a commit checked out" +msgstr "'$sm_path' รงฤฑkฤฑล yapฤฑlan bir iลlemeye iye deฤil" + +#: git-submodule.sh:250 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "'$sm_path' konumundaki mevcut depo indekse ekleniyor" + +#: git-submodule.sh:252 +#, 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:260 +#, 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:262 +#, 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:268 +#, 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:280 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "'$sm_path' altmodรผlรผ รงฤฑkฤฑล yapฤฑlamฤฑyor" + +#: git-submodule.sh:285 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "'$sm_path' altmodรผlรผ eklenemedi" + +#: git-submodule.sh:294 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "'$sm_path' altmodรผlรผ kaydฤฑ yapฤฑlamadฤฑ" + +#: git-submodule.sh:567 +#, sh-format +msgid "Unable to find current revision in submodule path '$displaypath'" +msgstr "'$displaypath' altmodรผl yolunda geรงerli revizyon bulunamadฤฑ" + +#: git-submodule.sh:577 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "'$sm_path' altmodรผl yolunda getirme yapฤฑlamadฤฑ" + +#: git-submodule.sh:582 +#, 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:600 +#, 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:606 +#, 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 iลlemenin doฤrudan getirilmesi baลarฤฑsฤฑz oldu." + +#: git-submodule.sh:613 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgstr "'$displaypath' altmodรผl yolunda '$sha1' รงฤฑkฤฑลฤฑ yapฤฑlamadฤฑ" + +#: git-submodule.sh:614 +#, sh-format +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "Altmodรผl yolu '$displaypath': '$sha1' รงฤฑkฤฑลฤฑ yaptฤฑ" + +#: git-submodule.sh:618 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" +msgstr "'$sha1', '$displaypath' altmodรผl yolunda yeniden temellendirilemedi" + +#: git-submodule.sh:619 +#, sh-format +msgid "Submodule path '$displaypath': rebased into '$sha1'" +msgstr "Altmodรผl yolu '$displaypath': '$sha1' iรงine yeniden temellendirildi" + +#: git-submodule.sh:624 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" +msgstr "'$sha1', '$displaypath' altmodรผl yolunda birleลtirilemedi" + +#: git-submodule.sh:625 +#, sh-format +msgid "Submodule path '$displaypath': merged in '$sha1'" +msgstr "Altmodรผl yolu '$displaypath': '$sha1' iรงinde birleลtirildi" + +#: git-submodule.sh:630 +#, 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:631 +#, sh-format +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Altmodรผl yolu '$displaypath': '$command $sha1'" + +#: git-submodule.sh:662 +#, sh-format +msgid "Failed to recurse into submodule path '$displaypath'" +msgstr "'$displaypath' altmodรผl yoluna รถzyinelenemedi" + +#: 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:113 +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" + +#: git-rebase--preserve-merges.sh:191 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "Yeniden temellendiriliyor ($new_count/$total)" + +#: git-rebase--preserve-merges.sh:197 +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 <iลleme> = iลlemeyi kullan\n" +"r, reword <iลleme> = iลlemeyi kullan; ancak iลleme iletisini dรผzenle\n" +"e, edit <iลleme> = iลlemeyi kullan; ancak deฤiลtirme iรงin dur\n" +"s, squash <iลleme> = iลlemeyi kullan; ancak รถnceki iลleme iรงine karฤฑลtฤฑr\n" +"f, fixup <iลleme> = \"squash\" gibi; ancak bu iลlemenin gรผnlรผk iletisini at\n" +"x, exec <iลleme> = komutu (satฤฑrฤฑn geri kalanฤฑ) kabuk kullanarak รงalฤฑลtฤฑr\n" +"d, drop <iลleme> = iลlemeyi 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 <iลleme> | -c <iลleme>] <etiket> [# <tek-satฤฑr>]\n" +". orijinal birleลtirme iลlemesi iletisini kullanarak bir\n" +". birleลtirme iลlemesi oluลtur (veya teksatฤฑr, eฤer bir orijinal\n" +". birleลtirme iลlemesi belirtilmemiลse). ฤฐลleme iletisini yeniden\n" +". yazmak iรงin -c <iลleme> 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:260 +#, 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 "" +"ฤฐลlemeyi ล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:285 +#, sh-format +msgid "$sha1: not a commit that can be picked" +msgstr "$sha1: seรงilebilecek bir iลleme deฤil" + +#: git-rebase--preserve-merges.sh:324 +#, sh-format +msgid "Invalid commit name: $sha1" +msgstr "Geรงersiz iลleme adฤฑ: $sha1" + +#: git-rebase--preserve-merges.sh:354 +msgid "Cannot write current commit's replacement sha1" +msgstr "Geรงerli iลlemenin yerine geรงecek sha1 yazฤฑlamฤฑyor" + +#: git-rebase--preserve-merges.sh:405 +#, sh-format +msgid "Fast-forward to $sha1" +msgstr "ลuraya ileri sar: $sha1" + +#: git-rebase--preserve-merges.sh:407 +#, sh-format +msgid "Cannot fast-forward to $sha1" +msgstr "ลuraya ileri sarฤฑlamฤฑyor: $sha1" + +#: git-rebase--preserve-merges.sh:416 +#, sh-format +msgid "Cannot move HEAD to $first_parent" +msgstr "HEAD ลuraya taลฤฑnamฤฑyor: $first_parent" + +#: git-rebase--preserve-merges.sh:421 +#, sh-format +msgid "Refusing to squash a merge: $sha1" +msgstr "Bir birleลtirmeyi tฤฑkฤฑลtฤฑrma reddediliyor: $sha1" + +#: git-rebase--preserve-merges.sh:439 +#, sh-format +msgid "Error redoing merge $sha1" +msgstr "$sha1 birleลtirmesi yeniden yapฤฑlฤฑrken hata" + +#: git-rebase--preserve-merges.sh:448 +#, sh-format +msgid "Could not pick $sha1" +msgstr "$sha1 seรงilemedi" + +#: git-rebase--preserve-merges.sh:457 +#, sh-format +msgid "This is the commit message #${n}:" +msgstr "ฤฐลleme iletisi #${n}:" + +#: git-rebase--preserve-merges.sh:462 +#, sh-format +msgid "The commit message #${n} will be skipped:" +msgstr "ฤฐลleme iletisi #${n} atlanacak:" + +#: git-rebase--preserve-merges.sh:473 +#, sh-format +msgid "This is a combination of $count commit." +msgid_plural "This is a combination of $count commits." +msgstr[0] "Bu $count iลlemenin bir birleลimidir." +msgstr[1] "Bu $count iลlemenin bir birleลimidir." + +#: git-rebase--preserve-merges.sh:482 +#, sh-format +msgid "Cannot write $fixup_msg" +msgstr "$fixup_msg yazฤฑlamฤฑyor" + +#: git-rebase--preserve-merges.sh:485 +msgid "This is a combination of 2 commits." +msgstr "Bu 2 iลlemenin bir birleลimidir." + +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 +#, sh-format +msgid "Could not apply $sha1... $rest" +msgstr "$sha1... $rest uygulanamadฤฑ" + +#: git-rebase--preserve-merges.sh:601 +#, 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 iลleme deฤiลtirilemedi.\n" +"Bu bรผyรผk olasฤฑlฤฑkla boล bir iลleme 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" +"iลlemeyi dรผzenleyebilmeye baลlamanฤฑz iรงin bu sorunu รงรถzmeniz gerekebilir." + +#: git-rebase--preserve-merges.sh:616 +#, sh-format +msgid "Stopped at $sha1_abbrev... $rest" +msgstr "ลurada duruldu: $sha1_abbrev... $rest" + +#: git-rebase--preserve-merges.sh:631 +#, sh-format +msgid "Cannot '$squash_style' without a previous commit" +msgstr "รncesinde bir iลleme olmadan '$squash_style' yapฤฑlamฤฑyor" + +#: git-rebase--preserve-merges.sh:673 +#, sh-format +msgid "Executing: $rest" +msgstr "รalฤฑลtฤฑrฤฑlฤฑyor: $rest" + +#: git-rebase--preserve-merges.sh:681 +#, sh-format +msgid "Execution failed: $rest" +msgstr "รalฤฑลtฤฑrma baลarฤฑsฤฑz: $rest" + +#: git-rebase--preserve-merges.sh:683 +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:685 +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:698 +#, 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 iลleyin veya zulalayฤฑn, ardฤฑndan ลunu รงalฤฑลtฤฑrฤฑn:\n" +"\n" +"\tgit rebase --continue" + +#: git-rebase--preserve-merges.sh:709 +#, sh-format +msgid "Unknown command: $command $sha1 $rest" +msgstr "Bilinmeyen komut: $command $sha1 $rest" + +#: git-rebase--preserve-merges.sh:710 +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:745 +#, 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:802 +msgid "Could not remove CHERRY_PICK_HEAD" +msgstr "CHERRY_PICK_HEAD kaldฤฑrฤฑlamadฤฑ" + +#: git-rebase--preserve-merges.sh:807 +#, 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 iลlemeye eklenmesi\n" +"gerekiyorsa ลu komutu รงalฤฑลtฤฑrฤฑn:\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Eฤer yeni bir iลleme 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:824 +msgid "Error trying to find the author identity to amend commit" +msgstr "ฤฐลlemeyi deฤiลtirmek iรงin yazar kimliฤini bulmaya รงalฤฑลฤฑrken hata" + +#: git-rebase--preserve-merges.sh:829 +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 iลlenmemiล deฤiลiklikleriniz var. Lรผtfen รถnce onlarฤฑ\n" +"iลleyin ve ardฤฑndan yeniden 'git rebase --continue' รงalฤฑลtฤฑrฤฑn." + +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 +msgid "Could not commit staged changes." +msgstr "Hazฤฑrlanan deฤiลiklikler iลlenemedi." + +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 +msgid "Could not execute editor" +msgstr "Dรผzenleyici รงalฤฑลtฤฑrฤฑlamadฤฑ" + +#: git-rebase--preserve-merges.sh:890 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "$switch_to รงฤฑkฤฑลฤฑ yapฤฑlamadฤฑ" + +#: git-rebase--preserve-merges.sh:897 +msgid "No HEAD?" +msgstr "HEAD yok mu?" + +#: git-rebase--preserve-merges.sh:898 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "Geรงici $state_dir oluลturulamadฤฑ" + +#: git-rebase--preserve-merges.sh:901 +msgid "Could not mark as interactive" +msgstr "Etkileลimli olarak imlenemedi" + +#: git-rebase--preserve-merges.sh:933 +#, 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:945 +msgid "Note that empty commits are commented out" +msgstr "Boล iลlemelerin yorum olarak varsayฤฑldฤฑฤฤฑnฤฑ kenara yazฤฑn." + +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 +msgid "Could not init rewritten commits" +msgstr "Yeniden yazฤฑlan iลlemeler ilklendirilemedi" + +#: 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 iลlenmemiล 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 iลlenmemiล " +"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 iลlenmemiล deฤiลiklikleriniz var." + +#: git-sh-setup.sh:253 +msgid "Additionally, your index contains uncommitted changes." +msgstr "Ek olarak, indeksinizde iลlenmemiล 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:1058 +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:1061 +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:1064 +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:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 +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:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 +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:1116 +#, 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:1123 +#, 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:1145 +#, 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:1253 +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:1259 +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:1265 +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:1271 +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:1277 git-add--interactive.perl:1295 +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:1283 +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:1289 +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:1301 +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:1316 +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:1347 +msgid "The selected hunks do not apply to the index!\n" +msgstr "Seรงili parรงalar indekse uygulanamฤฑyor!\n" + +#: git-add--interactive.perl:1362 +#, perl-format +msgid "ignoring unmerged: %s\n" +msgstr "birleลtirilmeyenler yok sayฤฑlฤฑyor: %s\n" + +#: git-add--interactive.perl:1481 +#, 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:1482 +#, 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:1483 +#, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Ekleme รงalฤฑลma aฤacฤฑna uygulansฤฑn mฤฑ [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1484 +#, 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:1601 +msgid "No other hunks to goto\n" +msgstr "Gidilecek baลka parรงa yok\n" + +#: git-add--interactive.perl:1619 +#, perl-format +msgid "Invalid number: '%s'\n" +msgstr "Geรงersiz sayฤฑ: '%s'\n" + +#: git-add--interactive.perl:1624 +#, 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:1659 +msgid "No other hunks to search\n" +msgstr "Aranacak baลka parรงa yok\n" + +#: git-add--interactive.perl:1676 +#, perl-format +msgid "Malformed search regexp %s: %s\n" +msgstr "Hatalฤฑ oluลturulmuล arama dรผzenli ifadesi %s: %s\n" + +#: git-add--interactive.perl:1686 +msgid "No hunk matches the given pattern\n" +msgstr "Verilen dizgi ile hiรงbir parรงa eลleลmiyor\n" + +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 +msgid "No previous hunk\n" +msgstr "รncesinde parรงa yok\n" + +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 +msgid "No next hunk\n" +msgstr "Sonrasฤฑnda parรงa yok\n" + +#: git-add--interactive.perl:1732 +msgid "Sorry, cannot split this hunk\n" +msgstr "รzgรผnรผm, bu parรงa bรถlรผnemiyor\n" + +#: git-add--interactive.perl:1738 +#, 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:1748 +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:1813 +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:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 +msgid "missing --" +msgstr "-- eksik" + +#: git-add--interactive.perl:1861 +#, perl-format +msgid "unknown --patch mode: %s" +msgstr "bilinmeyen --patch kipi: %s" + +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 +#, 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:312 +#, 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:317 +#, perl-format +msgid "'%s.final' contains the composed email.\n" +msgstr "'%s.final' yazฤฑlan e-postayฤฑ iรงeriyor.\n" + +#: git-send-email.perl:410 +msgid "--dump-aliases incompatible with other options\n" +msgstr "--dump-aliases diฤer seรงeneklerle uyumsuz\n" + +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"onulmaz: 'sendmail' iรงin yapฤฑlandฤฑrma seรงenekleri bulundu\n" +"git-send-email, sendemail.* seรงenekleri ile yapฤฑlandฤฑrฤฑlmฤฑลtฤฑr.\n" +"'e'ye dikkat edin. sendemail.forbidSendmailVariables seรงeneฤini 'false'\n" +"yaparak bu denetimi devre dฤฑลฤฑ bฤฑrakabilirsiniz.\n" + +#: git-send-email.perl:489 git-send-email.perl:691 +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:492 +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:505 +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "Bilinmeyen --suppress-cc alanฤฑ: '%s'\n" + +#: git-send-email.perl:536 +#, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "Bilinmeyen --confirm ayarฤฑ: '%s'\n" + +#: git-send-email.perl:564 +#, 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:566 +#, perl-format +msgid "warning: `:include:` not supported: %s\n" +msgstr "uyarฤฑ: ':include:' desteklenmiyor: %s\n" + +#: git-send-email.perl:568 +#, 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:573 +#, perl-format +msgid "warning: sendmail line is not recognized: %s\n" +msgstr "uyarฤฑ: sendmail satฤฑrฤฑ tanฤฑmlanamadฤฑ: %s\n" + +#: git-send-email.perl:657 +#, 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 iลlemelerin\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:678 +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "%s opendir yapฤฑlamadฤฑ: %s" + +#: git-send-email.perl:702 +#, 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:713 +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "" +"\n" +"Hiรงbir yama dosyasฤฑ belirtilmedi!\n" +"\n" + +#: git-send-email.perl:726 +#, perl-format +msgid "No subject line in %s?" +msgstr "%s iรงinde konu satฤฑrฤฑ yok mu?" + +#: git-send-email.perl:736 +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "%s yazma iรงin aรงฤฑlamadฤฑ: %s" + +#: git-send-email.perl:747 +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:771 +#, perl-format +msgid "Failed to open %s: %s" +msgstr "%s aรงฤฑlamadฤฑ: %s" + +#: git-send-email.perl:788 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "%s.final aรงฤฑlamadฤฑ: %s" + +#: git-send-email.perl:831 +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:866 +#, 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:921 +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:926 +msgid "Which 8bit encoding should I declare [UTF-8]? " +msgstr "Hangi 8 bit kodlamayฤฑ beyan etmeliyim [UTF-8]? " + +#: git-send-email.perl:934 +#, 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:953 +msgid "To whom should the emails be sent (if anyone)?" +msgstr "E-postalar kime gรถnderilmeli (eฤer gerekliyse)?" + +#: git-send-email.perl:971 +#, perl-format +msgid "fatal: alias '%s' expands to itself\n" +msgstr "onulmaz: '%s' armasฤฑ kendisine geniลliyor\n" + +#: git-send-email.perl:983 +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:1041 git-send-email.perl:1049 +#, 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:1053 +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:1370 +#, perl-format +msgid "CA path \"%s\" does not exist" +msgstr "CA yolu \"%s\" mevcut deฤil" + +#: git-send-email.perl:1453 +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 iลleme 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:1468 +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:1471 +msgid "Send this email reply required" +msgstr "Bu e-postayฤฑ yanฤฑt gerektirme seรงeneฤiyle gรถnder" + +#: git-send-email.perl:1499 +msgid "The required SMTP server is not properly defined." +msgstr "Gerekli SMTP sunucusu dรผzgรผnce tanฤฑmlanmamฤฑล." + +#: git-send-email.perl:1546 +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "Sunucu STARTTLS desteklemiyor! %s" + +#: git-send-email.perl:1551 git-send-email.perl:1555 +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "STARTTLS baลarฤฑsฤฑz oldu! %s" + +#: git-send-email.perl:1564 +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:1582 +#, perl-format +msgid "Failed to send %s\n" +msgstr "%s gรถnderilemedi\n" + +#: git-send-email.perl:1585 +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "%s gรถnderilir gibi yapฤฑldฤฑ\n" + +#: git-send-email.perl:1585 +#, perl-format +msgid "Sent %s\n" +msgstr "%s gรถnderildi\n" + +#: git-send-email.perl:1587 +msgid "Dry-OK. Log says:\n" +msgstr "Sฤฑnama tamam. Gรผnlรผk รงฤฑktฤฑsฤฑ:\n" + +#: git-send-email.perl:1587 +msgid "OK. Log says:\n" +msgstr "Tamam. Gรผnlรผk รงฤฑktฤฑsฤฑ:\n" + +#: git-send-email.perl:1599 +msgid "Result: " +msgstr "Sonuรง: " + +#: git-send-email.perl:1602 +msgid "Result: OK\n" +msgstr "Sonuรง: Tamam\n" + +#: git-send-email.perl:1620 +#, perl-format +msgid "can't open file %s" +msgstr "%s dosyasฤฑ aรงฤฑlamฤฑyor" + +#: git-send-email.perl:1667 git-send-email.perl:1687 +#, 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:1673 +#, 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:1730 +#, 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:1765 +#, 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:1876 +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "(%s) '%s' รงalฤฑลtฤฑrฤฑlamadฤฑ" + +#: git-send-email.perl:1883 +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n" + +#: git-send-email.perl:1887 +#, perl-format +msgid "(%s) failed to close pipe to '%s'" +msgstr "(%s) ลuraya olan veri yolu kapatฤฑlamadฤฑ: '%s'" + +#: git-send-email.perl:1917 +msgid "cannot send message as 7bit" +msgstr "ileti 7 bit olarak gรถnderilemiyor" + +#: git-send-email.perl:1925 +msgid "invalid transfer encoding" +msgstr "geรงersiz aktarฤฑm kodlamasฤฑ" + +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "%s aรงฤฑlamฤฑyor: %s\n" + +#: git-send-email.perl:1969 +#, 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:1986 +#, 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:1990 +#, 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 b8aa93a2c7..7b76379d04 100644 --- a/third_party/git/po/vi.po +++ b/third_party/git/po/vi.po @@ -2,14 +2,15 @@ # 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. +# 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. # msgid "" msgstr "" -"Project-Id-Version: git v2.23.0-rc2\n" +"Project-Id-Version: git v2.29.0 rd2\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-08-10 20:12+0800\n" -"PO-Revision-Date: 2019-08-11 07:08+0700\n" +"POT-Creation-Date: 2020-10-10 09:32+0800\n" +"PO-Revision-Date: 2020-10-13 08:36+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" @@ -20,47 +21,779 @@ msgstr "" "X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: ..\n" -"X-Generator: Gtranslator 2.91.7\n" +"X-Generator: Poedit 2.4.1\n" -#: advice.c:109 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "Hแบฃ (%s)?" + +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +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 reset.c:89 sequencer.c:3444 +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:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, 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:1738 git-add--interactive.perl:1371 +#, 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:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "Khรดng cรณ thay ฤแปi nร o.\n" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "Cแบญp nhแบญt miแบฟng vรก" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +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:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "*** Lแปnh ***" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +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:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: 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:781 git-add--interactive.perl:1805 +#, c-format +msgid "Bye.\n" +msgstr "Tแบกm biแปt.\n" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, 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:35 git-add--interactive.perl:1434 +#, 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:36 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "Thรชm vร o bแป phรณng [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, 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:39 +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:42 +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:56 git-add--interactive.perl:1439 +#, 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:57 git-add--interactive.perl:1440 +#, 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:58 git-add--interactive.perl:1441 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "Thรชm vร o tแบกm cแบฅt [y,n,q,a,d%s,?]? " + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, 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:61 +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:64 +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:80 git-add--interactive.perl:1445 +#, 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:81 git-add--interactive.perl:1446 +#, 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:82 git-add--interactive.perl:1447 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "Thรชm vร o viแปc bแป ra khแปi bแป phรณng [y,n,q,a,d%s,?]? " + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, 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:85 +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:88 +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:103 git-add--interactive.perl:1451 +#, 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:104 git-add--interactive.perl:1452 +#, 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:105 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "รp dแปฅng cรกc thรชm vร o mแปฅc lแปฅc [y,n,q,a,d%s,?]? " + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, 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:108 add-patch.c:176 add-patch.c:221 +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:111 +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:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, 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:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, 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:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "Thรชm cรกc loแบกi bแป khแปi cรขy lร m viแปc [y,n,q,a,d%s,?]? " + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, 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:131 add-patch.c:154 add-patch.c:199 +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:134 add-patch.c:202 +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:149 add-patch.c:194 git-add--interactive.perl:1463 +#, 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:150 add-patch.c:195 git-add--interactive.perl:1464 +#, 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:151 add-patch.c:196 git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Thรชm cรกc loแบกi bแป tแปซ mแปฅc lแปฅc vร cรขy lร m viแปc [y,n,q,a,d%s,?]? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, 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:157 +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:171 add-patch.c:216 git-add--interactive.perl:1469 +#, 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:172 add-patch.c:217 git-add--interactive.perl:1470 +#, 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:173 add-patch.c:218 git-add--interactive.perl:1471 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "รp dแปฅng thรชm vร o mแปฅc lแปฅc vร cรขy lร m viแปc [y,n,q,a,d%s,?]? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, 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:179 +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:224 +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:342 +#, 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:361 add-patch.c:365 +#, 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:419 +msgid "could not parse diff" +msgstr "khรดng thแป phรขn tรญch cรบ phรกp khรกc biแปt" + +#: add-patch.c:438 +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:452 +#, c-format +msgid "failed to run '%s'" +msgstr "gแบทp lแปi khi chแบกy โ%sโ" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "ฤแบงu ra khรดng khแปp tแปซ interactive.diffFilter" + +#: add-patch.c:612 +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:785 +#, 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:800 +#, 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:1076 git-add--interactive.perl:1117 +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:1080 +#, 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:1094 git-add--interactive.perl:1131 +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:1127 +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:1172 +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:1241 git-add--interactive.perl:1244 +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:1284 +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:1285 git-add--interactive.perl:1348 +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:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "ฤรฃ khรดng รกp dแปฅng gรฌ cแบฃ.\n" + +#: add-patch.c:1349 +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:1511 add-patch.c:1521 +msgid "No previous hunk" +msgstr "Khรดng cรณ khรบc kแบฟ trฦฐแปc" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No next hunk" +msgstr "Khรดng cรณ khรบc kแบฟ tiแบฟp" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "Khรดng cรฒn khรบc nร o ฤแป mร nhแบฃy ฤแบฟn" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "nhแบฃy ฤแบฟn khรบc nร o (<ret> ฤแป xem thรชm)? " + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "nhแบฃy ฤแบฟn khรบc nร o? " + +#: add-patch.c:1555 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Sแป khรดng hแปฃp lแป: โ%sโ" + +#: add-patch.c:1560 +#, 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:1569 +msgid "No other hunks to search" +msgstr "Khรดng cรฒn khรบc nร o ฤแป mร tรฌm kiแบฟm" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "tรฌm kiแบฟm cho biแปu thแปฉc chรญnh quy? " + +#: add-patch.c:1590 +#, 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:1607 +msgid "No hunk matches the given pattern" +msgstr "Khรดng thแบฅy khรบc nร o khแปp mแบซu ฤรฃ cho" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "Rแบฅt tiแบฟc, khรดng thแป chia nhแป khรบc nร y" + +#: add-patch.c:1618 +#, c-format +msgid "Split into %d hunks." +msgstr "Chi nhแป thร nh %d khรบc." + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "Rแบฅt tiแบฟc, khรดng thแป sแปญa khรบc nร y" + +#: add-patch.c:1674 +msgid "'git apply' failed" +msgstr "'git apply' gแบทp lแปi" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" +"\n" +"Tแบฏt lแปi nhแบฏn nร y bแบฑng \"git config advice.%s false\"" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sgแปฃi รฝ: %.*s%s\n" -#: advice.c:162 +#: advice.c:247 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:164 +#: advice.c:249 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:166 +#: advice.c:251 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:168 +#: advice.c:253 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:170 +#: advice.c:255 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:172 +#: advice.c:257 #, 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:180 +#: advice.c:265 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." @@ -68,23 +801,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:188 +#: advice.c:273 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:193 builtin/merge.c:1327 +#: advice.c:278 builtin/merge.c:1349 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:195 +#: advice.c:280 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:196 +#: advice.c:281 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:202 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -115,9 +848,9 @@ msgstr "" "\n" "Nแบฟu bแบกn muแปn tแบกo mแปt nhรกnh mแปi ฤแป giแปฏ lแบกi cรกc lแบงn chuyแปn giao bแบกn tแบกo,\n" "bแบกn cรณ thแป lร m thแบฟ (ngay bรขy giแป hay sau nร y) bแบฑng cรกch dรนng tรนy chแปn\n" -"dรฒng lแปnh -b. Vรญ dแปฅ:\n" +"dรฒng lแปnh -c. Vรญ dแปฅ:\n" "\n" -" git checkout -c <tรชn-nhรกnh-mแปi>\n" +" git switch -c <tรชn-nhรกnh-mแปi>\n" "\n" "Hoร n lแบกi thao tรกc nร y bแบฑng:\n" "\n" @@ -212,17 +945,7 @@ 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: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 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -234,81 +957,91 @@ 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:1564 +#: apply.c:1385 #, 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:1752 +#: 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 msgid "new file depends on old contents" msgstr "tแบญp tin mแปi phแปฅ thuแปc vร o nแปi dung cลฉ" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "tแบญp tin ฤรฃ xรณa vแบซn cรฒn nแปi dung" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "miแบฟng vรก hแปng tแบกi dรฒng %d" -#: apply.c:1825 +#: apply.c:1826 #, 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:1827 +#: apply.c:1828 #, 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:1830 +#: apply.c:1831 #, 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:1977 +#: apply.c:1978 #, 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:2014 +#: apply.c:2015 #, 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:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "vรก chแป vแปi โrรกcโ tแบกi dรฒng %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "khรดng thแป ฤแปc liรชn kแบฟt mแปm %s" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "khรดng thแป mแป hay ฤแปc %s" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khแปi ฤแบงu dรฒng: โ%cโ" -#: apply.c:3046 +#: 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] "Khแปi dแปฏ liแปu #%d thร nh cรดng tแบกi %d (offset %d dรฒng)." -#: apply.c:3058 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %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" +msgstr "Ngแปฏ cแบฃnh bแป giแบฃm xuแปng cรฒn (%ld/%ld) ฤแป รกp dแปฅng mแบฃnh dแปฏ liแปu tแบกi %d" -#: apply.c:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -317,456 +1050,486 @@ msgstr "" "trong khi ฤang tรฌm kiแบฟm cho:\n" "%.*s" -#: apply.c:3086 +#: apply.c:3097 #, 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:3094 +#: apply.c:3105 #, 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:3141 +#: apply.c:3152 #, 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:3151 +#: apply.c:3163 #, 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:3159 +#: apply.c:3171 #, 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:3177 +#: apply.c:3189 #, 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:3190 +#: apply.c:3202 #, 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:3196 +#: apply.c:3209 #, 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:3217 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "gแบทp lแปi khi vรก: %s:%ld" -#: apply.c:3340 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "khรดng thแป lแบฅy ra %s" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 #, c-format msgid "failed to read %s" msgstr "gแบทp lแปi khi ฤแปc %s" -#: apply.c:3400 +#: apply.c:3413 #, 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:3429 apply.c:3672 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "ฤฦฐแปng dแบซn %s ฤรฃ bแป xรณa hoแบทc ฤแปi tรชn" -#: apply.c:3515 apply.c:3687 +#: apply.c:3528 apply.c:3700 #, 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:3524 apply.c:3695 +#: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" msgstr "%s: khรดng khแปp trong mแปฅc lแปฅc" -#: apply.c:3559 +#: apply.c:3572 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:3562 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "ฤang trแป lแบกi hรฒa trแปn โ3-ฤฦฐแปngโโฆ\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3591 apply.c:3595 #, 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:3594 +#: apply.c:3607 #, 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:3608 +#: apply.c:3621 #, 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:3613 +#: apply.c:3626 #, 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:3639 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "loแบกi bแป miแบฟng vรก ฤแป lแบกi nแปi dung tแบญp tin" -#: apply.c:3712 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiแปu" -#: apply.c:3714 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s cรณ kiแปu %o, cแบงn %o" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "ฤฦฐแปng dแบซn khรดng hแปฃp lแป โ%sโ" -#: apply.c:3923 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s: ฤรฃ cรณ tแปซ trฦฐแปc trong bแบฃng mแปฅc lแปฅc" -#: apply.c:3926 +#: apply.c:3956 #, 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:3946 +#: apply.c:3976 #, 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:3951 +#: apply.c:3981 #, 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:3971 +#: apply.c:4001 #, 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:3975 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s: miแบฟng vรก khรดng ฤฦฐแปฃc รกp dแปฅng" -#: apply.c:3990 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "ฤang kiแปm tra miแบฟng vรก %sโฆ" -#: apply.c:4082 +#: apply.c:4112 #, 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:4089 +#: apply.c:4119 #, 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:4092 +#: apply.c:4122 #, 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: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 +#: apply.c:4131 #, 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:4111 +#: apply.c:4141 #, 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:4249 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "khรดng thแป gแปก bแป %s tแปซ mแปฅc lแปฅc" -#: apply.c:4283 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "miแบฟng vรก sai hแปng cho mรด-ฤun-con %s" -#: apply.c:4289 +#: apply.c:4319 #, 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:4297 +#: apply.c:4327 #, 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:4303 apply.c:4448 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "khรดng thแป thรชm mแปฅc nhแป ฤแปm cho %s" -#: apply.c:4346 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "gแบทp lแปi khi ghi vร o โ%sโ" -#: apply.c:4350 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "ฤang ฤรณng tแบญp tin โ%sโ" -#: apply.c:4420 +#: apply.c:4450 #, 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:4518 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "ฤรฃ รกp dแปฅng miแบฟng vรก %s mแปt cรกch sแบกch sแบฝ." -#: apply.c:4526 +#: apply.c:4556 msgid "internal error" msgstr "lแปi nแปi bแป" -#: apply.c:4529 +#: apply.c:4559 #, 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:4540 +#: apply.c:4570 #, 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:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "khรดng mแป ฤฦฐแปฃc โ%sโ" -#: apply.c:4562 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khแปi nhแป #%d ฤฦฐแปฃc รกp dแปฅng gแปn gร ng." -#: apply.c:4566 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "ฤoแบกn dแปฏ liแปu #%d bแป tแปซ chแปi." -#: apply.c:4676 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "Bแป qua ฤฦฐแปng dแบซn โ%sโ." -#: apply.c:4684 +#: apply.c:4723 msgid "unrecognized input" msgstr "khรดng thแปซa nhแบญn ฤแบงu vร o" -#: apply.c:4704 +#: apply.c:4743 msgid "unable to read index file" msgstr "khรดng thแป ฤแปc tแบญp tin lฦฐu bแบฃng mแปฅc lแปฅc" -#: apply.c:4859 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "khรดng thแป mแป miแบฟng vรก โ%sโ: %s" -#: apply.c:4886 +#: apply.c:4927 #, 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:4892 apply.c:4907 +#: apply.c:4933 apply.c:4948 #, 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:4900 +#: apply.c:4941 #, 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:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 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: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 +#: apply.c:4985 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:4947 +#: apply.c:4988 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:4949 builtin/am.c:2217 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "sแป" -#: apply.c:4950 +#: apply.c:4991 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:4953 +#: apply.c:4994 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:4955 +#: apply.c:4996 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:4959 +#: apply.c:5000 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:4961 +#: apply.c:5002 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:4963 +#: apply.c:5004 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:4965 +#: apply.c:5006 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:4967 +#: apply.c:5008 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:4969 +#: apply.c:5010 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:4971 +#: apply.c:5012 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:4974 +#: apply.c:5015 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:4976 +#: apply.c:5017 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:4978 +#: apply.c:5019 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:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 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:4983 +#: apply.c:5024 msgid "ensure at least <n> lines of context match" -msgstr "ฤแบฃm bแบฃo rแบฑng cรณ รญt nhแบฅt <n> dรฒng nแปi dung khแปp" +msgstr "ฤแบฃm bแบฃo rแบฑng cรณ รญt nhแบฅt <n> dรฒng ngแปฏ cแบฃnh khแปp" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "hร nh ฤแปng" -#: apply.c:4985 +#: apply.c:5026 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:4988 apply.c:4991 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" -msgstr "lแป ฤi sแปฑ thay ฤแปi do khoแบฃng trแบฏng gรขy ra khi quรฉt nแปi dung" +msgstr "lแป ฤi sแปฑ thay ฤแปi do khoแบฃng trแบฏng gรขy ra khi tรฌm ngแปฏ cแบฃnh" -#: apply.c:4994 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "รกp dแปฅng miแบฟng vรก theo chiแปu ngฦฐแปฃc" -#: apply.c:4996 +#: apply.c:5037 msgid "don't expect at least one line of context" -msgstr "ฤแปซng hy vแปng cรณ รญt nhแบฅt mแปt dรฒng nแปi dung" +msgstr "ฤแปซng hy vแปng cรณ รญt nhแบฅt mแปt dรฒng ngแปฏ cแบฃnh" -#: apply.c:4998 +#: apply.c:5039 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:5000 +#: apply.c:5041 msgid "allow overlapping hunks" msgstr "cho phรฉp chแปng khแปi nhแป" -#: 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 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "chi tiแบฟt" -#: apply.c:5003 +#: apply.c:5044 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:5006 +#: apply.c:5047 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:5008 builtin/am.c:2205 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "gแปc" -#: apply.c:5009 +#: apply.c:5050 msgid "prepend <root> to all filenames" msgstr "treo thรชm <root> vร o tแบฅt cแบฃ cรกc tรชn tแบญp tin" +#: 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:265 archive-zip.c:358 +#, 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:449 +#, c-format +msgid "unable to start '%s' filter" +msgstr "khรดng thแป bแบฏt ฤแบงu bแป lแปc โ%sโ" + +#: archive-tar.c:452 +msgid "unable to redirect descriptor" +msgstr "khรดng thแป chuyแปn hฦฐแปng mรด tแบฃ" + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "bแป lแปc โ%sโ ฤรฃ bรกo cรกo lแปi" + +#: archive-zip.c:318 +#, 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:322 +#, 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:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "lแปi giแบฃi nรฉn (%d)" + +#: archive-zip.c:603 +#, 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>" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<cรกc tรนy chแปn>] <tree-ish> [</ฤฦฐแปng/dแบซn>โฆ]" @@ -786,182 +1549,164 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <kho> [--exec <lแปnh>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "khรดng thแป ฤแปc %s" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "khรดng thแป ฤแปc โ%sโ" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, 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" -#: archive.c:396 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "khรดng cรณ tham chiแบฟu nร o nhฦฐ thแบฟ: %.*s" -#: archive.c:401 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "khรดng phแบฃi lร tรชn ฤแปi tฦฐแปฃng hแปฃp lแป: โ%sโ" -#: archive.c:414 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "khรดng phแบฃi lร ฤแปi tฦฐแปฃng cรขy: โ%sโ" -#: archive.c:426 +#: archive.c:485 msgid "current working directory is untracked" msgstr "thฦฐ mแปฅc lร m viแปc hiแปn hร nh chฦฐa ฤฦฐแปฃc theo dรตi" -#: archive.c:457 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "Khรดng tรฌm thแบฅy tแบญp tin: %s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "Khรดng phแบฃi mแปt tแบญp tin thฦฐแปng: %s" + +#: archive.c:553 msgid "fmt" msgstr "ฤแปnh_dแบกng" -#: archive.c:457 +#: archive.c:553 msgid "archive format" msgstr "ฤแปnh dแบกng lฦฐu trแปฏ" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "tiแปn_tแป" -#: archive.c:459 +#: archive.c:555 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: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 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "tแบญp_tin" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "thรชm cรกc tแบญp tin khรดng ฤฦฐแปฃc theo dรตi vร o kho lฦฐu" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "ghi kho lฦฐu vร o tแบญp tin nร y" -#: archive.c:463 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr "ฤแปc .gitattributes trong thฦฐ mแปฅc lร m viแปc" -#: archive.c:464 +#: archive.c:563 msgid "report archived files on stderr" msgstr "liแปt kรช cรกc tแบญp tin ฤฦฐแปฃc lฦฐu trแปฏ vร o stderr (ฤแบงu ra lแปi tiรชu chuแบฉn)" -#: archive.c:465 +#: archive.c:564 msgid "store only" msgstr "chแป lฦฐu (khรดng nรฉn)" -#: archive.c:466 +#: archive.c:565 msgid "compress faster" msgstr "nรฉn nhanh hฦกn" -#: archive.c:474 +#: archive.c:573 msgid "compress better" msgstr "nรฉn nhแป hฦกn" -#: archive.c:477 +#: archive.c:576 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:1379 builtin/submodule--helper.c:1859 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "kho" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:579 builtin/archive.c:92 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:707 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "lแปnh" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "ฤฦฐแปng dแบซn ฤแบฟn lแปnh git-upload-pack trรชn mรกy chแปง" -#: archive.c:489 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "Gแบทp tรนy chแปn khรดng cแบงn --remote" -#: archive.c:491 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "Tรนy chแปn --exec chแป cรณ thแป ฤฦฐแปฃc dรนng cรนng vแปi --remote" -#: archive.c:493 +#: archive.c:592 msgid "Unexpected option --output" msgstr "Gแบทp tรนy chแปn khรดng cแบงn --output" -#: archive.c:515 +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" +msgstr "Cรกc tรนy chแปn --add-file vร --remote khรดng thแป sแปญ dแปฅng cรนng vแปi nhau" + +#: archive.c:616 #, c-format msgid "Unknown archive format '%s'" msgstr "Khรดng hiแปu ฤแปnh dแบกng โ%sโ" -#: archive.c:522 +#: archive.c:623 #, c-format 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:345 -#, c-format -msgid "cannot stream blob %s" -msgstr "khรดng thแป stream blob โ%sโ" - -#: 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:287 archive-zip.c:353 -#, c-format -msgid "cannot read %s" -msgstr "khรดng thแป ฤแปc %s" - -#: 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:462 -msgid "unable to redirect descriptor" -msgstr "khรดng thแป chuyแปn hฦฐแปng mรด tแบฃ" - -#: 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: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: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: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: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:211 +#: attr.c:212 #, 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:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s khรดng ฤฦฐแปฃc phรฉp: %s:%d" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -969,22 +1714,22 @@ msgstr "" "Cรกc mแบซu dแบกng phแปง ฤแปnh bแป cแบฅm dรนng cho cรกc thuแปc tรญnh cแปงa git\n" "Dรนng โ\\!โ cho cรกc chuแปi vฤn bแบฃn cรณ dแบฅu chแบฅm than dแบซn ฤแบงu." -#: bisect.c:468 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Nแปi dung ฤฦฐแปฃc trรญch dแบซn sai trong tแบญp tin โ%sโ: %s" -#: bisect.c:678 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "Chรบng tรดi khรดng bisect thรชm nแปฏa!\n" -#: bisect.c:733 +#: bisect.c:753 #, 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:758 +#: bisect.c:778 #, c-format msgid "" "The merge base %s is bad.\n" @@ -993,7 +1738,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:763 +#: bisect.c:783 #, c-format msgid "" "The merge base %s is new.\n" @@ -1002,7 +1747,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:768 +#: bisect.c:788 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1011,7 +1756,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:776 +#: bisect.c:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1022,7 +1767,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:789 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1034,36 +1779,36 @@ msgstr "" "%s.\n" "Chรบng tรดi vแบซn cแปฉ tiแบฟp tแปฅc." -#: bisect.c:822 +#: bisect.c:848 #, 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:865 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "cแบงn mแปt ฤiแปm xรฉt duyแปt %s" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "khรดng thแป tแบกo tแบญp tin โ%sโ" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "khรดng thแป ฤแปc tแบญp tin โ%sโ" -#: bisect.c:958 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "viแปc ฤแปc tham chiแบฟu bisect gแบทp lแปi" -#: bisect.c:977 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "%s lร cแบฃ %s vร %s\n" -#: bisect.c:985 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" @@ -1072,7 +1817,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:1004 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1081,46 +1826,46 @@ msgstr[0] "(ฦฐแปc chแปซng %d bฦฐแปc)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1088 #, 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:2697 +#: blame.c:2778 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:2711 +#: blame.c:2792 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:2732 +#: blame.c:2813 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: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 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 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:2759 +#: blame.c:2840 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:2770 +#: blame.c:2851 #, c-format msgid "no such path %s in %s" msgstr "khรดng cรณ ฤฦฐแปng dแบซn %s trong โ%sโ" -#: blame.c:2781 +#: blame.c:2862 #, c-format msgid "cannot read blob %s for path %s" msgstr "khรดng thแป ฤแปc blob %s cho ฤฦฐแปng dแบซn โ%sโ" @@ -1256,402 +2001,373 @@ msgstr "Tรชn ฤแปi tฦฐแปฃng chฦฐa rรต rร ng: โ%sโ." msgid "Not a valid branch point: '%s'." msgstr "Nhรกnh khรดng hแปฃp lแป: โ%sโ." -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "โ%sโ ฤรฃ ฤฦฐแปฃc lแบฅy ra tแบกi โ%sโ rแปi" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD cแปงa cรขy lร m viแปc %s chฦฐa ฤฦฐแปฃc cแบญp nhแบญt" -#: bundle.c:36 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "khรดng hiแปu thuแบญt toรกn bฤm dแปฏ liแปu bundle: %s" + +#: bundle.c:45 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "โ%sโ khรดng giแปng nhฦฐ tแบญp tin v2 bundle (ฤแปnh dแบกng dump cแปงa git)" +msgid "unknown capability '%s'" +msgstr "khรดng hiแปu dung lฦฐแปฃng โ%sโ" -#: bundle.c:64 +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "โ%sโ khรดng giแปng nhฦฐ tแบญp tin v2 hay v3 bundle (ฤแปnh dแบกng dump cแปงa git)" + +#: bundle.c:110 #, c-format 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:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "khรดng thแป mแป โ%sโ" -#: bundle.c:143 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "Kho chแปฉa thiแบฟu nhแปฏng lแบงn chuyแปn giao tiรชn quyแบฟt nร y:" -#: bundle.c:146 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "cแบงn mแปt kho chแปฉa ฤแป thแบฉm tra mแปt bundle" -#: bundle.c:197 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Bรณ dแปฏ liแปu chแปฉa %d tham chiแบฟu:" -#: bundle.c:204 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "Lแปnh bundle ghi lแบกi toร n bแป lแปch sแปญ." -#: bundle.c:206 +#: bundle.c:252 #, c-format 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:272 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "khรดng thแป nhรขn ฤรดi bแป mรด tแบฃ bundle" -#: bundle.c:279 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "Khรดng thแป sแบฃn sinh ฤแปi tฦฐแปฃng gรณi" -#: bundle.c:290 +#: bundle.c:337 msgid "pack-objects died" msgstr "ฤแปi tฦฐแปฃng gรณi ฤรฃ chแบฟt" -#: bundle.c:332 +#: bundle.c:379 msgid "rev-list died" msgstr "rev-list ฤรฃ chแบฟt" -#: bundle.c:381 +#: bundle.c:428 #, 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:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "phiรชn bแบฃn bundle %d khรดng ฤฦฐแปฃc hแป trแปฃ" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "khรดng thแป ghi phiรชn bแบฃn bundle %d vแปi thuแบญt toรกn %s" + +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 #, c-format msgid "unrecognized argument: %s" msgstr "ฤแปi sแป khรดng ฤฦฐแปฃc thแปซa nhแบญn: %s" -#: bundle.c:468 +#: bundle.c:530 msgid "Refusing to create empty bundle." msgstr "Tแปซ chแปi tแบกo mแปt bรณ dแปฏ liแปu trแปng rแปng." -#: bundle.c:478 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "khรดng thแป tแบกo โ%sโ" -#: bundle.c:503 +#: bundle.c:565 msgid "index-pack died" msgstr "mแปฅc lแปฅc gรณi ฤรฃ chแบฟt" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "giรก trแป mร u khรดng hแปฃp lแป: %.*s" -#: 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-graph.c:188 midx.c:46 +msgid "invalid hash version" +msgstr "phiรชn bแบฃn bฤm khรดng hแปฃp lแป" -#: 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:192 -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 "" -"Viแปc hแป trแปฃ cho <GIT_DIR>/info/grafts ฤรฃ lแบกc hแบญu\n" -"vร sแบฝ bแป xรณa bแป แป phiรชn bแบฃn Git tฦฐฦกng lai.\n" -"\n" -"Vui lรฒng dรนng \"git replace --convert-graft-file\"\n" -"ฤแป chuyแปn ฤแปi cรกc graft thร nh cรกc tham chiแบฟu thay thแบฟ.\n" -"\n" -"Tแบฏt lแปi nhแบฏn nร y bแบฑng cรกch chแบกy\n" -"\"git config advice.graftFileDeprecated false\"" - -#: 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: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: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: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: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 "" -"Cแบฃnh bรกo: ghi chรบ cho lแบงn chuyแปn giao khรดng hแปฃp chuแบฉn UTF-8.\n" -"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:127 +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "tแบญp tin ฤแป-thแป-cรกc-lแบงn-chuyแปn-giao quรก nhแป" -#: commit-graph.c:192 +#: commit-graph.c:311 #, 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:199 +#: commit-graph.c:318 #, 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:206 +#: commit-graph.c:325 #, 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: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:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "tแบญp tin ฤแป-thแป-cรกc-lแบงn-chuyแปn-giao quรก nhแป ฤแป giแปฏ %u mแบฃnh dแปฏ liแปu" -#: commit-graph.c:240 +#: commit-graph.c:361 #, 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:283 +#: commit-graph.c:433 #, 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:347 +#: commit-graph.c:499 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:357 +#: commit-graph.c:509 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:404 +#: commit-graph.c:557 #, 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:430 +#: commit-graph.c:581 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:554 commit-graph.c:614 +#: commit-graph.c:721 commit-graph.c:785 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:575 +#: commit-graph.c:742 #, 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:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:1042 builtin/am.c:1306 +#, 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:1265 builtin/pack-objects.c:2864 #, 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:1034 +#: commit-graph.c:1301 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:1051 +#: commit-graph.c:1318 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:1070 +#: commit-graph.c:1338 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:1089 +#: commit-graph.c:1357 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:1163 +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "ฤang tรญnh toรกn chuyแปn giao cรกc bแป lแปc Bloom ฤฦฐแปng dแบซn bแป thay ฤแปi" + +#: commit-graph.c:1501 +msgid "Collecting referenced commits" +msgstr "ฤang sฦฐu tแบญp cรกc lแบงn chuyแปn giao ฤฦฐแปฃc tham chiแบฟu" + +#: commit-graph.c:1526 #, 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:1176 +#: commit-graph.c:1539 #, c-format msgid "error adding pack %s" msgstr "gแบทp lแปi thรชm gรณi %s" -#: commit-graph.c:1180 +#: commit-graph.c:1543 #, c-format msgid "error opening index for %s" msgstr "gแบทp lแปi khi mแป mแปฅc lแปฅc cho โ%sโ" -#: 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:1238 +#: commit-graph.c:1582 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:1253 +#: commit-graph.c:1597 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:1284 +#: commit-graph.c:1629 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:1332 +#: commit-graph.c:1678 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:1365 midx.c:811 +#: commit-graph.c:1720 midx.c:826 #, 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:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1733 +msgid "unable to create temporary graph layer" +msgstr "khรดng thแป tแบกo lแปp sฦก ฤแป tแบกm thแปi" + +#: commit-graph.c:1738 #, c-format -msgid "unable to create '%s'" -msgstr "khรดng thแป tแบกo โ%sโ" +msgid "unable to adjust shared permissions for '%s'" +msgstr "khรดng thแป chแปnh sแปญa quyแปn chia sแบป thร nh โ%sโ" -#: commit-graph.c:1437 +#: commit-graph.c:1808 #, 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:1478 +#: commit-graph.c:1853 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:1490 +#: commit-graph.c:1869 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:1510 +#: commit-graph.c:1889 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:1621 +#: commit-graph.c:2015 msgid "Scanning merged commits" msgstr "ฤang quรฉt cรกc lแบงn chuyแปn giao ฤรฃ hรฒa trแปn" -#: commit-graph.c:1632 +#: commit-graph.c:2026 #, 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:1657 +#: commit-graph.c:2049 msgid "Merging commit-graph" msgstr "ฤang hรฒa trแปn ฤแป-thแป-cรกc-lแบงn-chuyแปn-giao" -#: commit-graph.c:1844 +#: commit-graph.c:2259 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "ฤแปnh dแบกng ฤแป hแปa cรกc lแบงn chuyแปn giao khรดng thแป ghi %d lแบงn chuyแปn giao" -#: commit-graph.c:1855 +#: commit-graph.c:2270 msgid "too many commits to write graph" msgstr "cรณ quรก nhiแปu lแบงn chuyแปn giao ฤแป ghi ฤแป thแป" -#: commit-graph.c:1945 +#: commit-graph.c:2363 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:1955 +#: commit-graph.c:2373 #, 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:1965 commit-graph.c:1980 +#: commit-graph.c:2383 commit-graph.c:2398 #, 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:1972 +#: commit-graph.c:2390 #, 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" -#: commit-graph.c:1989 +#: commit-graph.c:2408 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:2002 +#: commit-graph.c:2423 #, 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:2009 +#: commit-graph.c:2430 #, 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:2019 +#: commit-graph.c:2440 #, 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:2028 +#: commit-graph.c:2449 #, 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:2041 +#: commit-graph.c:2463 #, 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:2046 +#: commit-graph.c:2468 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1659,7 +2375,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:2050 +#: commit-graph.c:2472 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1667,23 +2383,85 @@ 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:2065 +#: commit-graph.c:2488 #, 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:2071 +#: commit-graph.c:2494 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "ngร y chuyแปn giao cho lแบงn chuyแปn giao %s trong ฤแป-thแป-cรกc-lแบงn-chuyแปn-giao lร " "%<PRIuMAX> != %<PRIuMAX>" +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "khรดng thแป phรขn tรญch cรบ phรกp %s" + +#: commit.c:54 +#, 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:194 +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 "" +"Viแปc hแป trแปฃ cho <GIT_DIR>/info/grafts ฤรฃ lแบกc hแบญu\n" +"vร sแบฝ bแป xรณa bแป แป phiรชn bแบฃn Git tฦฐฦกng lai.\n" +"\n" +"Vui lรฒng dรนng \"git replace --convert-graft-file\"\n" +"ฤแป chuyแปn ฤแปi cรกc graft thร nh cรกc tham chiแบฟu thay thแบฟ.\n" +"\n" +"Tแบฏt lแปi nhแบฏn nร y bแบฑng cรกch chแบกy\n" +"\"git config advice.graftFileDeprecated false\"" + +#: commit.c:1172 +#, 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:1176 +#, 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:1179 +#, 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:1182 +#, 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:1436 +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 "" +"Cแบฃnh bรกo: ghi chรบ cho lแบงn chuyแปn giao khรดng hแปฃp chuแบฉn UTF-8.\n" +"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" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "hแบฟt bแป nhแป" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1698,297 +2476,291 @@ msgstr "" "\t%s\n" "Nguyรชn nhรขn cรณ thแป lร gแปm quแบฉn vรฒng." -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "khรดng thแป khai triแปn ฤฦฐแปng dแบซn โ%sโ" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "cรกc bao gแปm cแบฅu hรฌnh liรชn quan phแบฃi ฤแบฟn tแปซ cรกc tแบญp tin" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "cรกc ฤiแปu kiแปn bao gแปm cแบฅu hรฌnh liรชn quan phแบฃi ฤแบฟn tแปซ cรกc tแบญp tin" -#: config.c:376 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "khรณa khรดng chแปฉa mแปt phแบงn: %s" -#: config.c:382 +#: config.c:384 #, c-format 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:2463 +#: config.c:408 sequencer.c:2547 #, c-format msgid "invalid key: %s" msgstr "khรณa khรดng ฤรบng: %s" -#: config.c:412 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "khรณa khรดng hแปฃp lแป (dรฒng mแปi): %s" -#: config.c:448 config.c:460 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "tham sแป cแบฅu hรฌnh khรดng cรณ thแปฑc: %s" -#: config.c:495 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "ฤแปnh dแบกng khรดng cรณ thแปฑc trong %s" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "tแบญp tin cแบฅu hรฌnh sai tแบกi dรฒng %d trong blob %s" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "cแบฅu hรฌnh sai tแบกi dรฒng %d trong tแบญp tin %s" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "cแบฅu hรฌnh sai tแบกi dรฒng %d trong ฤแบงu vร o tiรชu chuแบฉn" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "cแบฅu hรฌnh sai tแบกi dรฒng %d trong blob-mรด-ฤun-con %s" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "cแบฅu hรฌnh sai tแบกi dรฒng %d trong dรฒng lแปnh %s" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "cแบฅu hรฌnh sai tแบกi dรฒng %d trong %s" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "nแบฑm ngoร i phแบกm vi" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "ฤฦกn vแป khรดng hแปฃp lแป" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "sai giรก trแป bแบฑng sแป cแปงa cแบฅu hรฌnh โ%sโ cho โ%sโ: %s" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "sai giรก trแป bแบฑng sแป cแปงa cแบฅu hรฌnh โ%sโ cho โ%sโ trong blob %s: %s" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "sai giรก trแป bแบฑng sแป cแปงa cแบฅu hรฌnh โ%sโ cho โ%sโ trong tแบญp tin %s: %s" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "sai giรก trแป bแบฑng sแป cแปงa cแบฅu hรฌnh โ%sโ cho โ%sโ trong ฤแบงu vร o tiรชu chuแบฉn: %s" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "sai giรก trแป bแบฑng sแป cแปงa cแบฅu hรฌnh โ%sโ cho โ%sโ trong submodule-blob %s: %s" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "sai giรก trแป bแบฑng sแป cแปงa cแบฅu hรฌnh โ%sโ cho โ%sโ trong dรฒng lแปnh %s: %s" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "sai giรก trแป bแบฑng sแป cแปงa cแบฅu hรฌnh โ%sโ cho โ%sโ trong %s: %s" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "gแบทp lแปi mแป rแปng thฦฐ mแปฅc ngฦฐแปi dรนng trong: โ%sโ" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "โ%sโ dร nh cho โ%sโ khรดng phแบฃi lร dแบฅu vแบฟt thแปi gian hแปฃp lแป" -#: config.c:1208 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "chiแปu dร i abbrev nแบฑm ngoร i phแบกm vi: %d" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "mแปฉc nรฉn zlib %d lร sai" -#: config.c:1325 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "core.commentChar chแป ฤฦฐแปฃc cรณ mแปt kรฝ tแปฑ" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "chแบฟ ฤแป khรดng hแปฃp lแป ฤแปi vแปi viแปc tแบกo ฤแปi tฦฐแปฃng: %s" -#: config.c:1430 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "giรก trแป cho %s sai dแบกng" -#: config.c:1456 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "giรก trแป cho %s sai dแบกng: %s" -#: config.c:1457 +#: config.c:1472 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:3410 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "mแปฉc nรฉn gรณi %d khรดng hแปฃp lแป" -#: config.c:1639 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "khรดng thแป tแบฃi ฤแปi tฦฐแปฃng blob cแบฅu hรฌnh โ%sโ" -#: config.c:1642 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "tham chiแบฟu โ%sโ khรดng chแป ฤแบฟn mแปt blob nร o cแบฃ" -#: config.c:1659 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "khรดng thแป phรขn giแบฃi ฤiแปm xรฉt duyแปt โ%sโ" -#: config.c:1689 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "gแบทp lแปi khi phรขn tรญch cรบ phรกp %s" -#: config.c:1745 +#: config.c:1759 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:2094 +#: config.c:2122 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:2264 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "%s khรดng hแปฃp lแป: โ%sโ" -#: 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 +#: config.c:2341 #, 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:2379 +#: config.c:2387 #, 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:2381 +#: config.c:2389 #, 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:2462 +#: config.c:2470 #, c-format msgid "invalid section name '%s'" msgstr "tรชn cแปงa phแบงn khรดng hแปฃp lแป โ%sโ" -#: config.c:2494 +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "%s cรณ ฤa giรก trแป" -#: config.c:2523 +#: config.c:2531 #, 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:2775 config.c:3099 +#: config.c:2783 config.c:3107 #, 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:2786 +#: config.c:2794 #, c-format msgid "opening %s" msgstr "ฤang mแป โ%sโ" -#: config.c:2821 builtin/config.c:328 +#: config.c:2829 builtin/config.c:354 #, c-format msgid "invalid pattern: %s" msgstr "mแบซu khรดng hแปฃp lแป: %s" -#: config.c:2846 +#: config.c:2854 #, c-format msgid "invalid config file %s" msgstr "tแบญp tin cแบฅu hรฌnh โ%sโ khรดng hแปฃp lแป" -#: config.c:2859 config.c:3112 +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "fstat trรชn %s gแบทp lแปi" -#: config.c:2870 +#: config.c:2878 #, c-format msgid "unable to mmap '%s'" msgstr "khรดng thแป mmap โ%sโ" -#: config.c:2879 config.c:3117 +#: config.c:2887 config.c:3125 #, c-format msgid "chmod on %s failed" msgstr "chmod trรชn %s gแบทp lแปi" -#: config.c:2964 config.c:3214 +#: config.c:2972 config.c:3222 #, c-format msgid "could not write config file %s" msgstr "khรดng thแป ghi tแบญp tin cแบฅu hรฌnh โ%sโ" -#: config.c:2998 +#: config.c:3006 #, c-format msgid "could not set '%s' to '%s'" msgstr "khรดng thแป ฤแบทt โ%sโ thร nh โ%sโ" -#: config.c:3000 builtin/remote.c:782 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "khรดng thแป thรดi ฤแบทt โ%sโ" -#: config.c:3090 +#: config.c:3098 #, c-format msgid "invalid section name: %s" msgstr "tรชn cแปงa phแบงn khรดng hแปฃp lแป: %s" -#: config.c:3257 +#: config.c:3265 #, c-format msgid "missing value for '%s'" msgstr "thiแบฟu giรก trแป cho cho โ%sโ" @@ -2014,72 +2786,81 @@ msgstr "" msgid "server doesn't support '%s'" msgstr "mรกy chแปง khรดng hแป trแปฃ โ%sโ" -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "mรกy chแปง khรดng hแป trแปฃ tรญnh nฤng โ%sโ" -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" msgstr "cแบงn ฤแบฉy dแปฏ liแปu lรชn ฤฤฉa sau cรกc capabilities" -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "bแป qua capabilities sau dรฒng ฤแบงu tiรชn โ%sโ" -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "lแปi giao thแปฉc: khรดng cแบงn capabilities^{}" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "lแปi giao thแปฉc: cแบงn sha-1 shallow, nhฦฐng lแบกi nhแบญn ฤฦฐแปฃc โ%sโ" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "kho ฤรฃ แป ฤiแปm cuแปi khoรกc nรชn khรดng thแป ฤฦฐแปฃc shallow" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" msgstr "gรณi khรดng hแปฃp lแป" -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "lแปi giao thแปฉc: khรดng cแบงn โ%sโ" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "khรดng hiแปu ฤแปnh dแบกng ฤแปi tฦฐแปฃng '%s' ฤฦฐแปฃc chแป ฤแปnh bแปi mรกy phแปฅc vแปฅ" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" msgstr "trแบฃ vแป cแปงa ls-refs khรดng hแปฃp lแป: %s" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" msgstr "cแบงn ฤแบฉy dแปฏ liแปu lรชn ฤฤฉa sau khi liแปt kรช tham chiแบฟu" -#: connect.c:544 +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "cแบงn nhแบญn ฤฦฐแปฃc trแบฃ lแปi lร kแบฟt thรบc gรณi sau khi liแปt kรช tham chiแบฟu" + +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" msgstr "giao thแปฉc โ%sโ chฦฐa ฤฦฐแปฃc hแป trแปฃ" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" msgstr "khรดng thแป ฤแบทt SO_KEEPALIVE trรชn แป cแบฏm" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "ฤang tรฌm kiแบฟm %s โฆ " -#: connect.c:639 +#: connect.c:735 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "khรดng tรฌm ฤฦฐแปฃc %s (cแปng %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" @@ -2088,7 +2869,7 @@ msgstr "" "xong.\n" "ฤang kแบฟt nแปi ฤแบฟn %s (cแปng %s) โฆ " -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -2098,87 +2879,87 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "hoร n tแบฅt." -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "khรดng thแป tรฌm thแบฅy %s (%s)" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "khรดng hiแปu cแปng %s" -#: connect.c:845 connect.c:1171 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "ฤรฃ khรณa tรชn mรกy lแบก โ%sโ" -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "ฤรฃ khรณa cแปng lแบก โ%sโ" -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "khรดng thแป khแปi chแบกy แปงy nhiแปm โ%sโ" -#: connect.c:924 +#: connect.c:1024 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:1119 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" msgstr "ssh biแบฟn thแป โsimpleโ khรดng hแป trแปฃ -4" -#: connect.c:1131 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" msgstr "ssh biแบฟn thแป โsimpleโ khรดng hแป trแปฃ -6" -#: connect.c:1148 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh biแบฟn thแป โsimpleโ khรดng hแป trแปฃ ฤแบทt cแปng" -#: connect.c:1260 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" msgstr "ฤรฃ khรณa tรชn ฤฦฐแปng dแบซn lแบก โ%sโ" -#: connect.c:1307 +#: connect.c:1408 msgid "unable to fork" msgstr "khรดng thแป rแบฝ nhรกnh tiแบฟn trรฌnh con" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "ฤang kiแปm tra kแบฟt nแปi" -#: connected.c:98 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "Khรดng thแป chแบกy โgit rev-listโ" -#: connected.c:118 +#: connected.c:144 msgid "failed write to rev-list" msgstr "gแบทp lแปi khi ghi vร o rev-list" -#: connected.c:125 +#: connected.c:149 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:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action %d khรดng hแปฃp lแป" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF nรชn ฤฦฐแปฃc thay bแบฑng LF trong %s" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2187,12 +2968,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:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF nรชn thay bแบฑng CRLF trong %s" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2201,19 +2982,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:279 +#: convert.c:284 #, 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:286 +#: convert.c:291 #, 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 @@ -2229,50 +3010,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:424 convert.c:495 +#: convert.c:419 convert.c:490 #, 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:467 +#: convert.c:462 #, 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:673 +#: convert.c:665 #, 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:693 +#: convert.c:685 #, 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:700 +#: convert.c:692 #, 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:735 convert.c:738 +#: convert.c:727 convert.c:730 #, 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:741 convert.c:796 +#: convert.c:733 convert.c:788 #, 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:844 +#: convert.c:837 msgid "unexpected filter type" msgstr "gแบทp kiแปu bแป lแปc thแปซa" -#: convert.c:855 +#: convert.c:848 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:929 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2281,74 +3062,102 @@ 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:1228 +#: convert.c:1240 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:1398 convert.c:1432 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: gแบทp lแปi khi xรณa bแป lแปc โ%sโ" -#: convert.c:1476 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: smudge bแป lแปc %s gแบทp lแปi" -#: date.c:137 +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "bแป qua tรฌm kiแบฟm giแบฅy chแปฉng chแปฑc cho khรณa: credential.%s" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "tแปซ chแปi lร m viแปc vแปi giแบฅy chแปฉng thแปฑc thiแบฟu trฦฐแปng mรกy chแปง" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "tแปซ chแปi lร m viแปc vแปi giแบฅy chแปฉng thแปฑc thiแบฟu trฦฐแปng giao thแปฉc" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "url cรณ chแปฉa mแปt dแบฅu xuแปng dรฒng trong thร nh phแบงn %s cแปงa nรณ: %s" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "url khรดng cรณ lฦฐแปฃc ฤแป: %s" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "khรดng thแป phรขn tรญch cรบ phรกp giแบฅy chแปฉng thแปฑc url: %s" + +#: date.c:138 msgid "in the future" msgstr "แป thแปi tฦฐฦกng lai" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> giรขy trฦฐแปc" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> phรบt trฦฐแปc" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> giแป trฦฐแปc" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> ngร y trฦฐแปc" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> tuแบงn trฦฐแปc" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> thรกng trฦฐแปc" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" msgstr[0] "%<PRIuMAX> nฤm" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s, %<PRIuMAX> thรกng trฦฐแปc" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2379,15 +3188,6 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "ฤรฃ ฤรกnh dแบฅu %d island, xong.\n" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "gแบทp lแปi khi ฤแปc tแบญp-tin-thแปฉ-tแปฑ โ%sโ" - -#: 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" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<cรกc tรนy chแปn>] </ฤฦฐแปng/dแบซn> </ฤฦฐแปng/dแบซn>" @@ -2400,17 +3200,17 @@ msgstr "" "Khรดng phแบฃi lร mแปt thฦฐ mแปฅc git. Dรนng --no-index ฤแป so sรกnh hai ฤฦฐแปng dแบซn bรชn " "ngoร i mแปt cรขy lร m viแปc" -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Gแบทp lแปi khi phรขn tรญch dirstat cแบฏt bแป phแบงn trฤm โ%sโ\n" -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Khรดng hiแปu ฤแปi sแป dirstat โ%sโ\n" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2418,7 +3218,7 @@ msgstr "" "cร i ฤแบทt mร u ฤรฃ di chuyแปn phแบฃi lร mแปt trong โnoโ, โdefaultโ, โblocksโ, " "โzebraโ, โdimmed_zebraโ, โplainโ" -#: diff.c:324 +#: diff.c:325 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -2428,7 +3228,7 @@ msgstr "" "changeโ, โignore-space-at-eolโ, โignore-all-spaceโ, โallow-indentation-" "changeโ" -#: diff.c:332 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -2436,12 +3236,12 @@ msgstr "" "color-moved-ws: allow-indentation-change khรดng thแป tแป hแปฃp cรนng vแปi cรกc chแบฟ " "ฤแป khoแบฃng trแบฏng khรกc" -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Khรดng hiแปu giรก trแป cho biแบฟn cแบฅu hรฌnh โdiff.submoduleโ: โ%sโ" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2450,35 +3250,35 @@ msgstr "" "Tรฌm thแบฅy cรกc lแปi trong biแบฟn cแบฅu hรฌnh โdiff.dirstatโ:\n" "%s" -#: diff.c:4215 +#: diff.c:4269 #, 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:4560 +#: diff.c:4618 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:4563 +#: diff.c:4621 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:4641 +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "--follow cแบงn chรญnh xรกc mแปt ฤแบทc tแบฃ ฤฦฐแปng dแบซn" -#: diff.c:4689 +#: diff.c:4747 #, c-format msgid "invalid --stat value: %s" msgstr "giรก trแป --stat khรดng hแปฃp lแป: โ%sโ" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, 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:4726 +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2487,42 +3287,42 @@ msgstr "" "Gแบทp lแปi khi phรขn tรญch ฤแปi sแป tรนy chแปn --dirstat/-X:\n" "%s" -#: diff.c:4811 +#: diff.c:4869 #, 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:4835 +#: diff.c:4893 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "khรดng hiแปu giรก trแป sau ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4907 #, c-format msgid "unable to resolve '%s'" msgstr "khรดng thแป phรขn giแบฃi โ%sโ" -#: diff.c:4899 diff.c:4905 +#: diff.c:4957 diff.c:4963 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s cแบงn dแบกng <n>/<m>" -#: diff.c:4917 +#: diff.c:4975 #, 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:4938 +#: diff.c:4996 #, c-format msgid "bad --color-moved argument: %s" msgstr "ฤแปi sแป --color-moved sai: %s" -#: diff.c:4957 +#: diff.c:5015 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "chแบฟ ฤแป โ%sโ khรดng hแปฃp lแป trong --color-moved-ws" -#: diff.c:4997 +#: diff.c:5055 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2530,158 +3330,158 @@ msgstr "" "tรนy chแปn diff-algorithm chแบฅp nhแบญn \"myers\", \"minimal\", \"patience\" vร " "\"histogram\"" -#: diff.c:5033 diff.c:5053 +#: diff.c:5091 diff.c:5111 #, c-format msgid "invalid argument to %s" msgstr "tham sแป cho %s khรดng hแปฃp lแป" -#: diff.c:5191 +#: diff.c:5248 #, 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:5247 +#: diff.c:5304 #, c-format msgid "bad --word-diff argument: %s" msgstr "ฤแปi sแป --word-diff sai: %s" -#: diff.c:5270 +#: diff.c:5327 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:5272 diff.c:5278 +#: diff.c:5329 diff.c:5335 msgid "generate patch" msgstr "tแบกo miแบฟng vรก" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5332 builtin/log.c:176 msgid "suppress diff output" msgstr "chแบทn mแปi kแบฟt xuแบฅt tแปซ diff" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5337 diff.c:5451 diff.c:5458 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5338 diff.c:5341 msgid "generate diffs with <n> lines context" msgstr "tแบกo khรกc biแปt vแปi <n> dรฒng ngแปฏ cแบฃnh" -#: diff.c:5286 +#: diff.c:5343 msgid "generate the diff in raw format" msgstr "tแบกo khรกc biแปt แป ฤแปnh dแบกng thรด" -#: diff.c:5289 +#: diff.c:5346 msgid "synonym for '-p --raw'" msgstr "ฤแปng nghฤฉa vแปi โ-p --rawโ" -#: diff.c:5293 +#: diff.c:5350 msgid "synonym for '-p --stat'" msgstr "ฤแปng nghฤฉa vแปi โ-p --statโ" -#: diff.c:5297 +#: diff.c:5354 msgid "machine friendly --stat" msgstr "--stat thuแบญn tiแปn cho mรกy ฤแปc" -#: diff.c:5300 +#: diff.c:5357 msgid "output only the last line of --stat" msgstr "chแป xuแบฅt nhแปฏng dรฒng cuแปi cแปงa --stat" -#: diff.c:5302 diff.c:5310 +#: diff.c:5359 diff.c:5367 msgid "<param1,param2>..." msgstr "<tham_sแป_1,tham_sแป_2>โฆ" -#: diff.c:5303 +#: diff.c:5360 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:5307 +#: diff.c:5364 msgid "synonym for --dirstat=cumulative" msgstr "ฤแปng nghฤฉa vแปi --dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5368 msgid "synonym for --dirstat=files,param1,param2..." msgstr "ฤแปng nghฤฉa vแปi --dirstat=files,param1,param2โฆ" -#: diff.c:5315 +#: diff.c:5372 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:5318 +#: diff.c:5375 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:5321 +#: diff.c:5378 msgid "show only names of changed files" msgstr "chแป hiแปn thแป tรชn cแปงa cรกc tแบญp tin ฤแปi" -#: diff.c:5324 +#: diff.c:5381 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:5326 +#: diff.c:5383 msgid "<width>[,<name-width>[,<count>]]" msgstr "<rแปng>[,<name-width>[,<sแป-lฦฐแปฃng>]]" -#: diff.c:5327 +#: diff.c:5384 msgid "generate diffstat" msgstr "tแบกo diffstat" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5386 diff.c:5389 diff.c:5392 msgid "<width>" msgstr "<rแปng>" -#: diff.c:5330 +#: diff.c:5387 msgid "generate diffstat with a given width" msgstr "tแบกo diffstat vแปi ฤแป rแปng ฤรฃ cho" -#: diff.c:5333 +#: diff.c:5390 msgid "generate diffstat with a given name width" msgstr "tแบกo diffstat vแปi tรชn ฤแป rแปng ฤรฃ cho" -#: diff.c:5336 +#: diff.c:5393 msgid "generate diffstat with a given graph width" msgstr "tแบกo diffstat vแปi ฤแป rแปng ฤแป thแป ฤรฃ cho" -#: diff.c:5338 +#: diff.c:5395 msgid "<count>" msgstr "<sแป_lฦฐแปฃng>" -#: diff.c:5339 +#: diff.c:5396 msgid "generate diffstat with limited lines" msgstr "tแบกo diffstat vแปi cรกc dรฒng bแป giแปi hแบกn" -#: diff.c:5342 +#: diff.c:5399 msgid "generate compact summary in diffstat" msgstr "tแบกo tแปng hแปฃp xรบc tรญch trong diffstat" -#: diff.c:5345 +#: diff.c:5402 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:5348 +#: diff.c:5405 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:5350 +#: diff.c:5407 msgid "show colored diff" msgstr "hiแปn thแป thay ฤแปi ฤฦฐแปฃc tรด mร u" -#: diff.c:5351 +#: diff.c:5408 msgid "<kind>" msgstr "<kiแปu>" -#: diff.c:5352 +#: diff.c:5409 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -"tรด sang cรกc lแปi vแป khoแบฃng trแบฏng trong cรกc dรฒng โcontextโ, โoldโ vร โnewโ " +"tรด sรกng 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:5355 +#: diff.c:5412 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2689,89 +3489,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:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 msgid "<prefix>" msgstr "<tiแปn_tแป>" -#: diff.c:5359 +#: diff.c:5416 msgid "show the given source prefix instead of \"a/\"" msgstr "hiแปn thแป tiแปn tแป nguแปn ฤรฃ cho thay cho \"a/\"" -#: diff.c:5362 +#: diff.c:5419 msgid "show the given destination prefix instead of \"b/\"" msgstr "hiแปn thแป tiแปn tแป ฤรญch ฤรฃ cho thay cho \"b/\"" -#: diff.c:5365 +#: diff.c:5422 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:5368 +#: diff.c:5425 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:5371 +#: diff.c:5428 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:5375 diff.c:5380 diff.c:5385 +#: diff.c:5432 diff.c:5437 diff.c:5442 msgid "<char>" msgstr "<kรฝ_tแปฑ>" -#: diff.c:5376 +#: diff.c:5433 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:5381 +#: diff.c:5438 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:5386 +#: diff.c:5443 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:5389 +#: diff.c:5446 msgid "Diff rename options" msgstr "Tรนy chแปn khรกc biแปt ฤแปi tรชn" -#: diff.c:5390 +#: diff.c:5447 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5448 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:5395 +#: diff.c:5452 msgid "detect renames" msgstr "dรฒ tรฌm cรกc tรชn thay ฤแปi" -#: diff.c:5399 +#: diff.c:5456 msgid "omit the preimage for deletes" msgstr "bแป qua preimage (tiแปn แบฃnh??) cho cรกc viแปc xรณa" -#: diff.c:5402 +#: diff.c:5459 msgid "detect copies" msgstr "dรฒ bแบฃn sao" -#: diff.c:5406 +#: diff.c:5463 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:5408 +#: diff.c:5465 msgid "disable rename detection" msgstr "tแบฏt dรฒ tรฌm ฤแปi tรชn" -#: diff.c:5411 +#: diff.c:5468 msgid "use empty blobs as rename source" -msgstr "dung cรกc blob trแปng rแปng nhฦฐ lร nguแปn ฤแปi tรชn" +msgstr "dรนng cรกc blob trแปng rแปng nhฦฐ lร nguแปn ฤแปi tรชn" -#: diff.c:5413 +#: diff.c:5470 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:5416 +#: diff.c:5473 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2779,156 +3579,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:5418 +#: diff.c:5475 msgid "Diff algorithm options" msgstr "Tรนy chแปn thuแบญt toรกn khรกc biแปt" -#: diff.c:5420 +#: diff.c:5477 msgid "produce the smallest possible diff" msgstr "sแบฃn sinh khรกc biแปt รญt nhแบฅt cรณ thแป" -#: diff.c:5423 +#: diff.c:5480 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:5426 +#: diff.c:5483 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:5429 +#: diff.c:5486 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:5432 +#: diff.c:5489 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:5435 +#: diff.c:5492 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:5438 +#: diff.c:5495 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:5441 +#: diff.c:5498 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:5445 +#: diff.c:5502 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:5447 +#: diff.c:5504 msgid "<algorithm>" msgstr "<thuแบญt toรกn>" -#: diff.c:5448 +#: diff.c:5505 msgid "choose a diff algorithm" msgstr "chแปn mแปt thuแบญt toรกn khรกc biแปt" -#: diff.c:5450 +#: diff.c:5507 msgid "<text>" msgstr "<vฤn bแบฃn>" -#: diff.c:5451 +#: diff.c:5508 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:5453 diff.c:5462 diff.c:5465 +#: diff.c:5510 diff.c:5519 diff.c:5522 msgid "<mode>" msgstr "<chแบฟ ฤแป>" -#: diff.c:5454 +#: diff.c:5511 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -"hiแปn thแป khรกc biแปt tแปซ, sแปญ dung <chแบฟ ฤแป> ฤแป bแป giแปi hแบกn cรกc tแปซ bแป thay ฤแปi" +"hiแปn thแป khรกc biแปt tแปซ, sแปญ dแปฅng <chแบฟ ฤแป> ฤแป bแป giแปi hแบกn cรกc tแปซ bแป thay ฤแปi" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5513 diff.c:5516 diff.c:5561 msgid "<regex>" msgstr "<regex>" -#: diff.c:5457 +#: diff.c:5514 msgid "use <regex> to decide what a word is" msgstr "dรนng <regex> ฤแป quyแบฟt ฤแปnh tแปซ lร cรกi gรฌ" -#: diff.c:5460 +#: diff.c:5517 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:5463 +#: diff.c:5520 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:5466 +#: diff.c:5523 msgid "how white spaces are ignored in --color-moved" -msgstr "bแป qua khoแบฃng trแบฏng nhฦฐ thแบฟ nร o trong --color-moved" +msgstr "cรกch bแป qua khoแบฃng trแบฏng trong --color-moved" -#: diff.c:5469 +#: diff.c:5526 msgid "Other diff options" msgstr "Cรกc tรนy chแปn khรกc biแปt khรกc" -#: diff.c:5471 +#: diff.c:5528 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -"khi chแบกy tแปซ thฦฐ mแปฅc con, thแปฑ thi cรกc thay ฤแปi bรชn ngoร i vร hiแปn thแป cรกc " +"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 " "ฤฦฐแปng dแบซn liรชn quan" -#: diff.c:5475 +#: diff.c:5532 msgid "treat all files as text" msgstr "coi mแปi tแบญp tin lร dแบกng vฤn bแบฃn thฦฐแปng" -#: diff.c:5477 +#: diff.c:5534 msgid "swap two inputs, reverse the diff" msgstr "trรกo ฤแปi hai ฤแบงu vร o, ฤแบฃo ngฦฐแปฃc khรกc biแปt" -#: diff.c:5479 +#: diff.c:5536 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:5481 +#: diff.c:5538 msgid "disable all output of the program" msgstr "tแบฏt mแปi kแบฟt xuแบฅt cแปงa chฦฐฦกng trรฌnh" -#: diff.c:5483 +#: diff.c:5540 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:5485 +#: diff.c:5542 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:5487 +#: diff.c:5544 msgid "<when>" msgstr "<khi>" -#: diff.c:5488 +#: diff.c:5545 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:5491 +#: diff.c:5548 msgid "<format>" msgstr "<ฤแปnh dแบกng>" -#: diff.c:5492 +#: diff.c:5549 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:5496 +#: diff.c:5553 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:5499 +#: diff.c:5556 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:5501 +#: diff.c:5558 msgid "<string>" msgstr "<chuแปi>" -#: diff.c:5502 +#: diff.c:5559 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -2936,7 +3736,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:5505 +#: diff.c:5562 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -2944,23 +3744,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:5508 +#: diff.c:5565 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:5511 +#: diff.c:5568 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:5514 +#: diff.c:5571 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:5515 +#: diff.c:5572 msgid "<object-id>" msgstr "<mรฃ-sแป-ฤแปi-tฦฐแปฃng>" -#: diff.c:5516 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -2968,33 +3768,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:5518 +#: diff.c:5575 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)โฆ[*]]" -#: diff.c:5519 +#: diff.c:5576 msgid "select files by diff type" msgstr "chแปn cรกc tแบญp tin theo kiแปu khรกc biแปt" -#: diff.c:5521 +#: diff.c:5578 msgid "<file>" msgstr "<tแบญp_tin>" -#: diff.c:5522 +#: diff.c:5579 msgid "Output to a specific file" msgstr "Xuแบฅt ra mแปt tแบญp tin cแปฅ thแป" -#: diff.c:6177 +#: diff.c:6236 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:6180 +#: diff.c:6239 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:6183 +#: diff.c:6242 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3002,54 +3802,82 @@ 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:537 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "gแบทp lแปi khi ฤแปc tแบญp-tin-thแปฉ-tแปฑ โ%sโ" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "ฤang thแปฑc hiแปn dรฒ tรฌm ฤแปi tรชn khรดng chรญnh xรกc" + +#: dir.c:578 #, 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:926 +#: dir.c:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "mแบซu khรดng ฤฦฐแปฃc thแปซa nhแบญn: โ%sโ" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "mแบซu รขm khรดng ฤฦฐแปฃc thแปซa nhแบญn: โ%sโ" + +#: dir.c:809 +#, 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:819 +msgid "disabling cone pattern matching" +msgstr "vรด hiแปu khแปp mแบซu nรณn" + +#: dir.c:1198 #, 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:1843 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "khรดng thแป mแป thฦฐ mแปฅc โ%sโ" -#: dir.c:2085 +#: dir.c:2605 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:2209 +#: dir.c:2729 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:3013 +#: dir.c:3520 #, 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:3058 dir.c:3063 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "khรดng thแป tแบกo thฦฐ mแปฅc cho %s" -#: dir.c:3092 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" -msgstr "khรดng thแป di cฦฐ thฦฐ mแปฅc git tแปซ โ%sโ sang โ%sโ" +msgstr "khรดng thแป di dแปi thฦฐ mแปฅc git tแปซ โ%sโ sang โ%sโ" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "gแปฃi รฝ: Chแป trรฌnh biรชn soแบกn cแปงa bแบกn ฤรณng tแบญp tinโฆ%c" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "Nแปi dung lแปc" -#: entry.c:476 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "khรดng thแป lแบฅy thแปng kรช tแบญp tin โ%sโ" @@ -3059,7 +3887,7 @@ msgstr "khรดng thแป lแบฅy thแปng kรช tแบญp tin โ%sโ" msgid "bad git namespace path \"%s\"" msgstr "ฤฦฐแปng dแบซn khรดng gian tรชn git \"%s\" sai" -#: environment.c:332 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "khรดng thแป ฤแบทt GIT_DIR thร nh โ%sโ" @@ -3069,266 +3897,288 @@ 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-object.c:17 -msgid "Remote with no URL" -msgstr "Mรกy chแปง khรดng cรณ ฤแปa chแป URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: cแบงn danh sรกch shallow" -#: fetch-pack.c:154 +#: fetch-pack.c:179 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:165 +#: fetch-pack.c:190 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:185 +#: fetch-pack.c:210 #, 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:196 +#: fetch-pack.c:221 msgid "unable to write to remote" msgstr "khรดng thแป ghi lรชn mรกy phแปฅc vแปฅ" -#: fetch-pack.c:258 +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc cแบงn multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "dรฒng shallow khรดng hแปฃp lแป: %s" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "dรฒng unshallow khรดng hแปฃp lแป: %s" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "khรดng tรฌm thแบฅy ฤแปi tฦฐแปฃng: %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "lแปi trong ฤแปi tฦฐแปฃng: %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "khรดng tรฌm shallow nร o: %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "cแบงn shallow/unshallow, nhฦฐng lแบกi nhแบญn ฤฦฐแปฃc %s" -#: fetch-pack.c:417 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "nhแบญn %s %d - %s" -#: fetch-pack.c:434 +#: fetch-pack.c:448 #, c-format msgid "invalid commit %s" msgstr "lแบงn chuyแปn giao %s khรดng hแปฃp lแป" -#: fetch-pack.c:465 +#: fetch-pack.c:479 msgid "giving up" msgstr "chแปu thua" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:492 progress.c:339 msgid "done" msgstr "xong" -#: fetch-pack.c:489 +#: fetch-pack.c:504 #, c-format msgid "got %s (%d) %s" msgstr "nhแบญn %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:540 #, c-format msgid "Marking %s as complete" msgstr "ฤรกnh dแบฅu %s lร ฤรฃ hoร n thร nh" -#: fetch-pack.c:744 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "ฤรฃ sแบตn cรณ %s (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:824 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: khรดng thแป rแบฝ nhรกnh sideband demultiplexer" -#: fetch-pack.c:791 +#: fetch-pack.c:832 msgid "protocol error: bad pack header" msgstr "lแปi giao thแปฉc: phแบงn ฤแบงu gรณi bแป sai" -#: fetch-pack.c:859 +#: fetch-pack.c:916 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: khรดng thแป rแบฝ nhรกnh %s" -#: fetch-pack.c:875 +#: fetch-pack.c:933 #, c-format msgid "%s failed" msgstr "%s gแบทp lแปi" -#: fetch-pack.c:877 +#: fetch-pack.c:935 msgid "error in sideband demultiplexer" msgstr "cรณ lแปi trong sideband demultiplexer" -#: fetch-pack.c:908 +#: fetch-pack.c:978 #, c-format msgid "Server version is %.*s" msgstr "Phiรชn bแบฃn mรกy chแปง lร %.*s" -#: 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 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 #, c-format msgid "Server supports %s" msgstr "Mรกy chแปง hแป trแปฃ %s" -#: fetch-pack.c:915 +#: fetch-pack.c:985 msgid "Server does not support shallow clients" msgstr "Mรกy chแปง khรดng hแป trแปฃ mรกy khรกch shallow" -#: fetch-pack.c:975 +#: fetch-pack.c:1045 msgid "Server does not support --shallow-since" msgstr "Mรกy chแปง khรดng hแป trแปฃ --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:1050 msgid "Server does not support --shallow-exclude" msgstr "Mรกy chแปง khรดng hแป trแปฃ --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "Mรกy chแปง khรดng hแป trแปฃ --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1056 +msgid "Server does not support this repository's object format" +msgstr "Mรกy chแปง khรดng hแป trแปฃ ฤแปnh dแบกng ฤแปi tฦฐแปฃng cแปงa kho nร y" + +#: fetch-pack.c:1069 msgid "no common commits" msgstr "khรดng cรณ lแบงn chuyแปn giao chung nร o" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1081 fetch-pack.c:1619 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch gแบทp lแปi." -#: fetch-pack.c:1151 +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "cรกc thuแบญt toรกn khรดng khแปp nhau: mรกy khรกch %s; mรกy chแปง %s" + +#: fetch-pack.c:1209 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "mรกy chแปง khรดng hแป trแปฃ thuแบญt toรกn โ%sโ" + +#: fetch-pack.c:1229 msgid "Server does not support shallow requests" msgstr "Mรกy chแปง khรดng hแป trแปฃ yรชu cแบงu shallow" -#: fetch-pack.c:1157 +#: fetch-pack.c:1236 msgid "Server supports filter" msgstr "Mรกy chแปง hแป trแปฃ bแป lแปc" -#: fetch-pack.c:1184 +#: fetch-pack.c:1275 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:1202 +#: fetch-pack.c:1293 #, 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:1208 +#: fetch-pack.c:1299 #, c-format msgid "expected '%s', received '%s'" msgstr "cแบงn โ%sโ, nhฦฐng lแบกi nhแบญn โ%sโ" -#: fetch-pack.c:1247 +#: fetch-pack.c:1360 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "gแบทp dรฒng khรดng ฤฦฐแปฃc thแปซa nhแบญn: โ%sโ" -#: fetch-pack.c:1252 +#: fetch-pack.c:1365 #, 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:1262 +#: fetch-pack.c:1375 msgid "expected packfile to be sent after 'ready'" msgstr "cแบงn tแบญp tin gรณi ฤแป gแปญi sau โreadyโ" -#: fetch-pack.c:1264 +#: fetch-pack.c:1377 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:1306 +#: fetch-pack.c:1419 #, c-format msgid "error processing shallow info: %d" msgstr "lแปi xแปญ lรฝ thรดng tin shallow: %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1466 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "cแบงn wanted-ref, nhฦฐng lแบกi nhแบญn ฤฦฐแปฃc โ%sโ" -#: fetch-pack.c:1358 +#: fetch-pack.c:1471 #, c-format msgid "unexpected wanted-ref: '%s'" -msgstr "khรดng cแบงn wanted-ref: โ%sโ" +msgstr "wanted-ref khรดng ฤฦฐแปฃc mong ฤแปฃi: โ%sโ" -#: fetch-pack.c:1363 +#: fetch-pack.c:1476 #, c-format msgid "error processing wanted refs: %d" msgstr "lแปi khi xแปญ lรฝ wanted refs: %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1506 +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack: cแบงn nhแบญn ฤฦฐแปฃc trแบฃ lแปi lร kแบฟt thรบc gรณi" + +#: fetch-pack.c:1887 msgid "no matching remote head" msgstr "khรดng khแปp phแบงn ฤแบงu mรกy chแปง" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1910 builtin/clone.c:692 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:1739 +#: fetch-pack.c:1937 #, 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:1742 +#: fetch-pack.c:1940 #, 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:321 -msgid "gpg failed to sign the data" -msgstr "gpg gแบทp lแปi khi kรฝ dแปฏ liแปu" - -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "khรดng thแป tแบกo tแบญp tin tแบกm thแปi" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, 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:97 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg gแบทp lแปi khi kรฝ dแปฏ liแปu" + +#: graph.c:98 #, 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:2117 +#: 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 #, c-format msgid "'%s': unable to read %s" msgstr "โ%sโ: khรดng thแป ฤแปc %s" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 #: 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:2145 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "โ%sโ: ฤแปc ngแบฏn" @@ -3378,48 +4228,48 @@ msgid "Low-level Commands / Interrogators" msgstr "Lแปnh/bแป hแปi แป mแปฉc thแบฅp" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Lแปnh/ฤแปng bแป kho แป mแปฉc thแบฅp" #: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "Lแปnh/Hแป trแปฃ nแปi tแบกi แป mแปฉc thแบฅp" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "cรกc lแปnh git sแบตn cรณ trong thฦฐ mแปฅc โ%sโ:" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "cรกc lแปnh git sแบตn cรณ tแปซ mแปt nฦกi khรกc trong $PATH cแปงa bแบกn" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "Cรณ cรกc lแปnh Git chung ฤฦฐแปฃc sแปญ dแปฅng trong cรกc tรฌnh huแปng khรกc nhau:" -#: help.c:363 git.c:98 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "khรดng hแป trแปฃ liแปt kรช lแปnh kiแปu โ%sโ" -#: help.c:403 -msgid "The common Git guides are:" -msgstr "Cรกc chแป dแบซn chung vแป Git lร :" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Cรกc chแป dแบซn khรกi niแปm vแป Git lร :" -#: help.c:512 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "Xem โgit help <lแปnh>โ ฤแป ฤแปc cรกc ฤแบทc tแบฃ cแปงa lแปnh con" -#: help.c:517 +#: help.c:434 msgid "External commands" msgstr "Cรกc lแปnh bรชn ngoร i" -#: help.c:532 +#: help.c:449 msgid "Command aliases" msgstr "Cรกc bรญ danh lแปnh" -#: help.c:596 +#: help.c:513 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -3428,31 +4278,31 @@ msgstr "" "โ%sโ trรดng nhฦฐ lร mแปt lแปnh git, nhฦฐng chรบng tรดi khรดng\n" "thแป thแปฑc thi nรณ. Cรณ lแบฝ lร lแปnh git-%s ฤรฃ bแป hแปng?" -#: help.c:655 +#: help.c:572 msgid "Uh oh. Your system reports no Git commands at all." msgstr "แปi chร . Hแป thแปng cแปงa bแบกn bรกo rแบฑng chแบณng cรณ lแปnh Git nร o cแบฃ." -#: help.c:677 +#: help.c:594 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "CแบขNH BรO: Bแบกn ฤรฃ gแปi lแปnh Git cรณ tรชn โ%sโ, mร nรณ lแบกi khรดng cรณ sแบตn." -#: help.c:682 +#: help.c:599 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Tiแบฟp tแปฅc vร coi rแบฑng รฝ bแบกn lร โ%sโ." -#: help.c:687 +#: help.c:604 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Tiแบฟp tแปฅc trong %0.1f giรขy,vร coi rแบฑng รฝ bแบกn lร โ%sโ." -#: help.c:695 +#: help.c:612 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: โ%sโ khรดng phแบฃi lร mแปt lแปnh cแปงa git. Xem โgit --helpโ." -#: help.c:699 +#: help.c:616 msgid "" "\n" "The most similar command is" @@ -3463,16 +4313,16 @@ msgstr[0] "" "\n" "Nhแปฏng lแปnh giแปng nhแบฅt lร " -#: help.c:714 +#: help.c:656 msgid "git version [<options>]" msgstr "git version [<cรกc tรนy chแปn>]" -#: help.c:782 +#: help.c:711 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:715 msgid "" "\n" "Did you mean this?" @@ -3483,7 +4333,15 @@ msgstr[0] "" "\n" "Cรณ phแบฃi รฝ bแบกn lร mแปt trong sแป nhแปฏng cรกi nร y khรดng?" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "Chฦฐa biแบฟt ฤแปnh danh tรกc giแบฃ\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "Chฦฐa biแบฟt ฤแปnh danh ngฦฐแปi chuyแปn giao\n" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -3509,76 +4367,95 @@ msgstr "" "Bแป tรนy chแปn --global nแบฟu chแป ฤแปnh danh riรชng cho kho nร y.\n" "\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "khรดng ฤฦฐa ra ฤแปa chแป thฦฐ ฤiแปn tแปญ vร auto-detection bแป tแบฏt" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "khรดng thแป tแปฑ dรฒ tรฌm ฤแปa chแป thฦฐ ฤiแปn tแปญ (nhแบญn โ%sโ)" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "chฦฐa chแป ra tรชn vร tแปฑ-ฤแปng-dรฒ-tรฌm bแป tแบฏt" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "khรดng thแป dรฒ-tรฌm-tแปฑ ฤแปng tรชn (ฤรฃ nhแบญn โ%sโ)" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "khรดng cho phรฉp tรชn ฤแปnh danh lร rแปng (cho <%s>)" -#: ident.c:421 +#: ident.c:439 #, c-format 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:611 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "ngร y thรกng khรดng hแปฃp lแป: %s" -#: 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-filter-options.c:81 +msgid "expected 'tree:<depth>'" +msgstr "cแบงn โtree:<depth>โ" -#: list-objects.c:142 +#: list-objects-filter-options.c:96 +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:109 #, 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" +msgid "invalid filter-spec '%s'" +msgstr "ฤแบทc tแบฃ bแป lแปc khรดng hแปฃp lแป โ%sโ" -#: list-objects.c:378 +#: list-objects-filter-options.c:125 #, 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โ" +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:167 +msgid "expected something after combine:" +msgstr "mong ฤแปฃi mแปt cรกi gรฌ ฤรณ sau khi kแบฟt hแปฃp:" -#: list-objects-filter-options.c:36 +#: list-objects-filter-options.c:249 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:361 +msgid "unable to upgrade repository format to support partial clone" +msgstr "khรดng thแป nรขng cแบฅp ฤแปnh ฤแปnh dแบกng kho chแปฉa ฤแป hแป trแปฃ nhรขn bแบฃn cแปฅc bแป" -#: 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.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-options.c:94 +#: list-objects-filter.c:495 #, c-format -msgid "invalid filter-spec '%s'" -msgstr "ฤแบทc tแบฃ bแป lแปc khรดng hแปฃp lแป โ%sโ" +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: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" +#: list-objects.c:127 +#, 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 +#, 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" -#: lockfile.c:151 +#: list-objects.c:375 +#, 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โ" + +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -3597,129 +4474,119 @@ msgstr "" "mแปt tiแบฟn trรฌnh git cรณ lแบฝ ฤรฃ ฤแป vแปก khi thแปฑc hiแปn แป kho nร y trฦฐแปc ฤรณ:\n" "gรต bแป tแบญp tin mแปt cรกch thแปง cรดng ฤแป tiแบฟp tแปฅc." -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Khรดng thแป tแบกo โ%s.lockโ: %s" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "gแบทp lแปi khi ฤแปc bแป nhแป ฤแปm" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "cแบงn ฤแบฉy dแปฏ liแปu lรชn ฤฤฉa sau tham sแป ls-refs (liแปt kรช tham chiแบฟu)" -#: 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:322 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(commit sai)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, 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:354 +#: merge-recursive.c:388 #, 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:437 -msgid "error building trees" -msgstr "gแบทp lแปi khi xรขy dแปฑng cรขy" - -#: merge-recursive.c:863 +#: merge-recursive.c:874 #, 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:874 +#: merge-recursive.c:885 #, 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:888 merge-recursive.c:907 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": cรณ lแบฝ lร mแปt xung ฤแปt D/F?" -#: merge-recursive.c:897 +#: merge-recursive.c:908 #, 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:938 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "khรดng thแป ฤแปc ฤแปi tฦฐแปฃng %s โ%sโ" -#: merge-recursive.c:941 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "mong ฤแปฃi ฤแปi tฦฐแปฃng blob cho %s โ%sโ" -#: merge-recursive.c:965 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "gแบทp lแปi khi mแป โ%sโ: %s" -#: merge-recursive.c:976 +#: merge-recursive.c:990 #, 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:981 +#: merge-recursive.c:995 #, 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:1177 +#: merge-recursive.c:1191 #, 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:1184 +#: merge-recursive.c:1198 #, 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:1191 +#: merge-recursive.c:1205 #, 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:1199 merge-recursive.c:1211 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, 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:1202 merge-recursive.c:1214 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Chuyแปn-tiแบฟp-nhanh mรด-ฤun-con โ%sโ" -#: merge-recursive.c:1237 +#: merge-recursive.c:1251 #, 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:1241 +#: merge-recursive.c:1255 #, 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:1242 +#: merge-recursive.c:1256 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:1245 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3736,33 +4603,33 @@ msgstr "" "\n" "cรกi mร sแบฝ chแบฅp nhแบญn gแปฃi รฝ nร y.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1268 #, 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:1327 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "Gแบทp lแปi khi thแปฑc hiแปn trแปn nแปi bแป" -#: merge-recursive.c:1332 +#: merge-recursive.c:1346 #, 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:1364 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "Tแปฑ-ฤแปng-hรฒa-trแปn %s" -#: merge-recursive.c:1387 +#: merge-recursive.c:1402 #, 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:1459 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3771,7 +4638,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:1464 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3780,7 +4647,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:1471 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3789,7 +4656,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:1476 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3798,45 +4665,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:1511 +#: merge-recursive.c:1526 msgid "rename" msgstr "ฤแปi tรชn" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "renamed" msgstr "ฤรฃ ฤแปi tรชn" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, 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:1601 +#: merge-recursive.c:1587 #, 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:1659 +#: merge-recursive.c:1645 #, 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:1690 +#: merge-recursive.c:1676 #, 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:1695 +#: merge-recursive.c:1681 #, 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:1714 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3845,17 +4712,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:1719 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (cแบงn giแบฃi quyแบฟt)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1805 #, 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:2035 +#: merge-recursive.c:2068 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3866,7 +4733,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:2067 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3875,7 +4742,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:2077 +#: merge-recursive.c:2110 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3884,7 +4751,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:2169 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3893,7 +4760,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:2413 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3902,52 +4769,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:2938 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "khรดng thแป ฤแปc ฤแปi tฦฐแปฃng %s" -#: merge-recursive.c:2941 +#: merge-recursive.c:2976 #, 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:3005 +#: merge-recursive.c:3040 msgid "modify" msgstr "sแปญa ฤแปi" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modified" msgstr "ฤรฃ sแปญa" -#: merge-recursive.c:3017 +#: merge-recursive.c:3052 msgid "content" msgstr "nแปi dung" -#: merge-recursive.c:3021 +#: merge-recursive.c:3056 msgid "add/add" msgstr "thรชm/thรชm" -#: merge-recursive.c:3044 +#: merge-recursive.c:3079 #, 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:3066 git-submodule.sh:937 +#: merge-recursive.c:3101 msgid "submodule" msgstr "mรด-ฤun-con" -#: merge-recursive.c:3067 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "XUNG ฤแปT (%s): Xung ฤแปt hรฒa trแปn trong %s" -#: merge-recursive.c:3097 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Thay vร o ฤรณ thรชm vร o %s" -#: merge-recursive.c:3179 +#: merge-recursive.c:3215 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -3956,7 +4823,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:3182 +#: merge-recursive.c:3218 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -3965,7 +4832,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:3186 +#: merge-recursive.c:3222 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -3974,7 +4841,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:3189 +#: merge-recursive.c:3225 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -3983,227 +4850,265 @@ 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:3303 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "ฤang xรณa %s" -#: merge-recursive.c:3326 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "tแบญp-tin/thฦฐ-mแปฅc" -#: merge-recursive.c:3331 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "thฦฐ-mแปฅc/tแบญp-tin" -#: merge-recursive.c:3338 +#: merge-recursive.c:3374 #, 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:3347 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "Thรชm \"%s\"" -#: merge-recursive.c:3356 +#: merge-recursive.c:3392 #, 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: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 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "ฤรฃ cแบญp nhแบญt rแปi!" -#: merge-recursive.c:3414 +#: merge-recursive.c:3445 #, 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:3513 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "ฤang trแปn:" -#: merge-recursive.c:3526 +#: merge-recursive.c:3563 #, 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:3565 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "hรฒa trแปn khรดng trแบฃ vแป lแบงn chuyแปn giao nร o" -#: merge-recursive.c:3631 +#: merge-recursive.c:3672 +#, 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:3769 #, c-format msgid "Could not parse object '%s'" msgstr "Khรดng thแป phรขn tรญch ฤแปi tฦฐแปฃng โ%sโ" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 msgid "Unable to write index." msgstr "Khรดng thแป ghi bแบฃng mแปฅc lแปฅc." -#: midx.c:69 +#: merge.c:41 +msgid "failed to read the cache" +msgstr "gแบทp lแปi khi ฤแปc bแป nhแป ฤแปm" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +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" + +#: midx.c:79 #, c-format msgid "multi-pack-index file %s is too small" msgstr "tแบญp tin ฤแป thแป multi-pack-index %s quรก nhแป" -#: midx.c:85 +#: midx.c:95 #, 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:90 +#: midx.c:100 #, 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:95 +#: midx.c:105 #, c-format -msgid "hash version %u does not match" -msgstr "phiรชn bแบฃn bฤm โ%uโ khรดng khแปp" +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "phiรชn bแบฃn bฤm multi-pack-index %u khรดng khแปp phiรชn bแบฃn %u" -#: midx.c:109 +#: midx.c:122 msgid "invalid chunk offset (too large)" msgstr "khoแบฃng bรน ฤoแบกn khรดng hแปฃp lแป (quรก lแปn)" -#: midx.c:133 +#: midx.c:146 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:146 +#: midx.c:159 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:148 +#: midx.c:161 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:150 +#: midx.c:163 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:152 +#: midx.c:165 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:166 +#: midx.c:179 #, 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:211 +#: midx.c:222 #, 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:261 +#: midx.c:272 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:289 +#: midx.c:300 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:470 +#: midx.c:485 #, c-format msgid "failed to add packfile '%s'" msgstr "gแบทp lแปi khi thรชm tแบญp tin gรณi โ%sโ" -#: midx.c:476 +#: midx.c:491 #, c-format msgid "failed to open pack-index '%s'" msgstr "gแบทp lแปi khi mแป pack-index โ%sโ" -#: midx.c:536 +#: midx.c:551 #, 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:865 +#: midx.c:853 +msgid "Adding packfiles to multi-pack-index" +msgstr "ฤang thรชm tแบญp tin gรณi tแปซ multi-pack-index" + +#: midx.c:886 #, 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:1036 +#: midx.c:938 +msgid "no pack files to index." +msgstr "khรดng cรณ tแบญp tin gรณi ฤแป ฤรกnh mแปฅc lแปฅc." + +#: midx.c:990 +msgid "Writing chunks to multi-pack-index" +msgstr "ฤang ghi cรกc khรบc vร o multi-pack-index" + +#: midx.c:1068 #, 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:1091 +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "ฤรฃ cรณ tแบญp tin multi-pack-index, nhฦฐng gแบทp lแปi khi phรขn tรญch cรบ phรกp" + +#: midx.c:1132 msgid "Looking for referenced packfiles" msgstr "ฤang khรณa cho cรกc gรณi bแป tham chiแบฟu" -#: midx.c:1106 +#: midx.c:1147 #, 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:1110 -msgid "Verifying OID order in MIDX" -msgstr "Thแบฉm tra thแปฉ tแปฑ OID trong MIDX" +#: midx.c:1152 +msgid "the midx contains no oid" +msgstr "midx chแบณng chแปฉa oid nร o" + +#: midx.c:1161 +msgid "Verifying OID order in multi-pack-index" +msgstr "Thแบฉm tra thแปฉ tแปฑ OID trong multi-pack-index" -#: midx.c:1119 +#: midx.c:1170 #, 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:1138 +#: midx.c:1190 msgid "Sorting objects by packfile" msgstr "ฤang sแบฏp xแบฟp cรกc ฤแปi tฦฐแปฃng theo tแบญp tin gรณi" -#: midx.c:1144 +#: midx.c:1197 msgid "Verifying object offsets" msgstr "ฤang thแบฉm tra cรกc khoแบฃng bรน ฤแปi tฦฐแปฃng" -#: midx.c:1160 +#: midx.c:1213 #, 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:1166 +#: midx.c:1219 #, 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:1175 +#: midx.c:1228 #, 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:1350 +#: midx.c:1253 +msgid "Counting referenced objects" +msgstr "ฤang ฤแบฟm cรกc ฤแปi tฦฐแปฃng ฤฦฐแปฃc tham chiแบฟu" + +#: midx.c:1263 +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:1454 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:1369 +#: midx.c:1474 msgid "could not finish pack-objects" msgstr "khรดng thแป hoร n thiแปn cรกc ฤแปi tฦฐแปฃng gรณi" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "khรดng thแป tแบกo tuyแบฟn lazy_dir: %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "khรดng thแป tแบกo tuyแบฟn lazy_name: %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "khรดng thแป gia nhแบญp tuyแบฟn lazy_name: %s" @@ -4250,46 +5155,71 @@ 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:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "kiแปu ฤแปi tฦฐแปฃng \"%s\" khรดng hแปฃp lแป" -#: object.c:174 +#: object.c:173 #, 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:234 +#: object.c:233 #, 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:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "khรดng thแป phรขn tรญch ฤแปi tฦฐแปฃng: โ%sโ" -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "mรฃ bฤm khรดng khแปp %s" -#: packfile.c:648 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "khรดng thแป lแบฅy kรญch cแปก cแปงa %s" + +#: packfile.c:630 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 ร ?)" -#: packfile.c:1899 +#: packfile.c:1922 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "vแป trรญ tฦฐฦกng ฤแปi nแบฑm trฦฐแปc chแป mแปฅc gรณi cho %s (mแปฅc lแปฅc bแป hแปng ร ?)" -#: packfile.c:1903 +#: packfile.c:1926 #, c-format 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 ร ?)" +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "tรนy chแปn โ%sโ cแบงn mแปt giรก trแป bแบฑng sแป" + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "ngร y thรกng hแบฟt hแบกn dแป hรฌnh โ%sโ" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "tรนy chแปn โ%sโ cแบงn \"always\", \"auto\", hoแบทc \"never\"" + +#: parse-options-cb.c:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "tรชn ฤแปi tฦฐแปฃng dแป hรฌnh โ%sโ" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4305,7 +5235,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:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "%s k nhแบญn giรก trแป" @@ -4315,41 +5245,46 @@ msgstr "%s k nhแบญn giรก trแป" msgid "%s isn't available" msgstr "%s khรดng sแบตn cรณ" -#: parse-options.c:219 +#: parse-options.c:217 #, 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:389 +#: parse-options.c:386 #, 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:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, 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:859 +#: parse-options.c:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "bรญ danh cแปงa --%s" + +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "khรดng hiแปu tรนy chแปn โ%sโ" -#: parse-options.c:861 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "khรดng hiแปu tรนy chแปn โ%cโ" -#: parse-options.c:863 +#: parse-options.c:866 #, 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:887 +#: parse-options.c:890 msgid "..." msgstr "โฆ" -#: parse-options.c:906 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "cรกch dรนng: %s" @@ -4357,74 +5292,49 @@ msgstr "cรกch dรนng: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " hoแบทc: %s" -#: parse-options.c:915 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:957 msgid "-NUM" msgstr "-Sแป" -#: parse-options.c:968 -#, c-format -msgid "alias of --%s" -msgstr "bรญ danh cแปงa --%s" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "tรนy chแปn โ%sโ cแบงn mแปt giรก trแป bแบฑng sแป" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "ngร y thรกng hแบฟt hแบกn dแป hรฌnh โ%sโ" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "tรนy chแปn โ%sโ cแบงn \"always\", \"auto\", hoแบทc \"never\"" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "tรชn ฤแปi tฦฐแปฃng dแป hรฌnh โ%sโ" - -#: path.c:897 +#: path.c:915 #, 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:128 +#: pathspec.c:130 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:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Chแป cรณ mแปt ฤแบทc tแบฃ โattr:โ lร ฤฦฐแปฃc phรฉp." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "ฤแบทc tแบฃ attr phแบฃi khรดng ฤฦฐแปฃc ฤแป trแปng" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "tรชn thuแปc tรญnh khรดng hแปฃp lแป %s" -#: pathspec.c:257 +#: pathspec.c:259 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:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4432,50 +5342,55 @@ 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:304 +#: pathspec.c:306 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:325 +#: pathspec.c:327 #, 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:330 +#: pathspec.c:332 #, 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:368 +#: pathspec.c:370 #, 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:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: โliteralโ vร โglobโ xung khแบฏc nhau" -#: pathspec.c:440 +#: pathspec.c:445 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: โ%sโ ngoร i mแปt kho chแปฉa" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: โ%sโ ngoร i mแปt kho chแปฉa tแบกi '%s'" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "โ%sโ (mnemonic: โ%cโ)" -#: pathspec.c:524 +#: pathspec.c:531 #, 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:591 +#: pathspec.c:598 #, 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:643 +#, 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" @@ -4485,44 +5400,48 @@ msgid "unable to write delim packet" msgstr "khรดng thแป ghi gรณi delim" #: pkt-line.c:106 +msgid "unable to write stateless separator packet" +msgstr "khรดng thแป ghi gรณi phรขn tรกch khรดng trแบกng thรกi" + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "gแบทp lแปi khi ghi vร o tแบญp tin gรณi lรบc ฤแบฉy dแปฏ liแปu lรชn bแป nhแป" -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "lแปi giao thแปฉc: khรดng thแป lร m ฤฦฐแปฃc dรฒng dร i" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "gแบทp lแปi khi ghi gรณi cรณ ฤแปnh dแบกng" -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "gแบทp lแปi khi ghi gรณi - dแปฏ liแปu vฦฐแปฃt quรก cแปก vรณi tแปi ฤa" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "gแบทp lแปi khi ghi gรณi" -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "lแปi ฤแปc" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "mรกy chแปง bแป treo bแบฅt ngแป" -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "lแปi giao thแปฉc: kรฝ tแปฑ chiแปu dร i dรฒng bแป sai: %.4s" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "lแปi giao thแปฉc: chiแปu dร i dรฒng bแป sai %d" -#: pkt-line.c:362 +#: pkt-line.c:373 sideband.c:150 #, c-format msgid "remote error: %s" msgstr "lแปi mรกy chแปง: %s" @@ -4536,83 +5455,114 @@ 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:966 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "khรดng thแป phรขn tรญch ฤแปnh dแบกng --pretty" -#: range-diff.c:70 +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "promisor-remote: khรดng thแป rแบฝ nhรกnh tuyแบฟn trรฌnh con fetch" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "promisor-remote: khรดng thแป ghi tiแบฟn trรฌnh con fetch" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" +"promisor-remote: khรดng thแป ฤรณng ฤแบงu vร o tiรชu chuแบฉn tiแบฟn trรฌnh con fetch" + +#: promisor-remote.c:53 +#, 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" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "ฤang gแปก cรกc ฤแปi tฦฐแปฃng trรนng lแบทp" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "khรดng thแป lแบฅy thรดng tin thแปng kรช vแป โlogโ" -#: range-diff.c:72 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "khรดng thแป ฤแปc kแบฟt xuแบฅt โlogโ" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:98 sequencer.c:5283 #, 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:117 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" +"khรดng thแป phรขn tรญch cรบ phรกp dรฒng ฤแบงu tiรชn cแปงa ฤแบงu ra `log`: khรดng bแบฏt ฤแบงu " +"bแบฑng 'commit ': '%s'" + +#: range-diff.c:137 #, 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:274 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "gแบทp lแปi khi tแบกo khรกc biแปt" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "khรดng thแป phรขn tรญch nhแบญt kรฝ cho โ%sโ" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" "sแบฝ khรดng thรชm cรกc bรญ danh โ%sโ (โ%sโ ฤรฃ cรณ tแปซ trฦฐแปc trong bแบฃng mแปฅc lแปฅc)" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "khรดng thแป tแบกo mแปt blob rแปng trong cฦก sแป dแปฏ liแปu ฤแปi tฦฐแปฃng" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: chแป cรณ thแป thรชm tแบญp tin thรดng thฦฐแปng, liรชn kแบฟt mแปm hoแบทc git-directories" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "โ%sโ khรดng cรณ mแปt lแบงn chuyแปn giao nร o ฤฦฐแปฃc lแบฅy ra" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "khรดng thแป ฤรกnh mแปฅc lแปฅc tแบญp tin โ%sโ" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "khรดng thแป thรชm %s vร o bแบฃng mแปฅc lแปฅc" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "khรดng thแป lแบฅy thแปng kรช โ%sโ" -#: read-cache.c:1314 +#: read-cache.c:1318 #, 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:1499 +#: read-cache.c:1524 msgid "Refresh index" msgstr "Lร m tฦฐฦกi mแปi bแบฃng mแปฅc lแปฅc" -#: read-cache.c:1613 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4621,7 +5571,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:1623 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4630,150 +5580,161 @@ 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:1679 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "chแปฏ kรฝ sai 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "phiรชn bแบฃn mแปฅc lแปฅc sai %d" -#: read-cache.c:1691 +#: read-cache.c:1717 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:1721 +#: read-cache.c:1747 #, 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:1723 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "ฤang lแป ฤi phแบงn mแป rแปng %.4s" -#: read-cache.c:1760 +#: read-cache.c:1786 #, 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:1776 +#: read-cache.c:1802 #, 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:1833 +#: read-cache.c:1859 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:1836 +#: read-cache.c:1862 #, 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:1839 +#: read-cache.c:1865 #, 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: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 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "tแบญp tin ghi bแบฃng mแปฅc lแปฅc bแป hแปng" -#: read-cache.c:2087 +#: read-cache.c:2115 #, 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:2100 +#: read-cache.c:2128 #, 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:2133 +#: read-cache.c:2161 #, 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:2137 +#: read-cache.c:2165 #, 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:2141 +#: read-cache.c:2169 #, 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:2145 +#: read-cache.c:2173 #, 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:2187 +#: read-cache.c:2215 #, 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:2214 +#: read-cache.c:2242 #, 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:2246 +#: read-cache.c:2274 #, 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:2293 +#: read-cache.c:2321 #, 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:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 #, c-format msgid "could not close '%s'" msgstr "khรดng thแป ฤรณng โ%sโ" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 #, c-format msgid "could not stat '%s'" msgstr "khรดng thแป lแบฅy thรดng tin thแปng kรช vแป โ%sโ" -#: read-cache.c:3105 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "khรดng thแป mแป thฦฐ mแปฅc git: %s" -#: read-cache.c:3117 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "khรดng thแป bแป liรชn kแบฟt (unlink): โ%sโ" -#: read-cache.c:3142 +#: read-cache.c:3170 #, 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:3291 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: khรดng thแป xรณa bแป stage #0" -#: rebase-interactive.c:26 +#: 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 #, 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:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -4819,13 +5780,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:56 +#: rebase-interactive.c:63 #, 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:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4834,7 +5795,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:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4842,7 +5803,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:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4856,7 +5817,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4866,22 +5827,19 @@ 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: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 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 #, c-format msgid "could not write '%s'" msgstr "khรดng thแป ghi โ%sโ" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "khรดng thแป chรฉp โ%sโ sang โ%sโ." +msgid "could not write '%s'." +msgstr "khรดng thแป ghi โ%sโ." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -4890,7 +5848,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:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -4908,124 +5866,14 @@ msgstr "" "Cรกnh แปฉng xแปญ cรณ thแป lร : ignore, warn, error.\n" "\n" -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -msgstr "โ%sโ khรดng chแป ฤแบฟn mแปt lแบงn chuyแปn giao hแปฃp lแป nร o cแบฃ!" - -#: refs.c:667 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "ฤang lแป ฤi tham chiแบฟu mแปm thแปซa %s" - -#: refs.c:669 ref-filter.c:2092 -#, c-format -msgid "ignoring broken ref %s" -msgstr "ฤang lแป ฤi tham chiแบฟu hแปng %s" - -#: refs.c:804 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "khรดng thแป mแป โ%sโ ฤแป ghi: %s" - -#: refs.c:814 refs.c:865 -#, c-format -msgid "could not read ref '%s'" -msgstr "khรดng thแป ฤแปc tham chiแบฟu โ%sโ" - -#: refs.c:820 -#, c-format -msgid "ref '%s' already exists" -msgstr "tham chiแบฟu โ%sโ ฤรฃ cรณ tแปซ trฦฐแปc rแปi" - -#: refs.c:825 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "khรดng cแบงn ID ฤแปi tฦฐแปฃng khi ghi โ%sโ" - -#: 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 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" - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "gแบทp ID ฤแปi tฦฐแปฃng khรดng cแบงn khi xรณa โ%sโ" - -#: refs.c:998 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "nhแบญt kรฝ cho tham chiแบฟu %s cรณ khoแบฃng trแปng sau %s" - -#: refs.c:1004 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "nhแบญt kรฝ cho tham chiแบฟu %s kแบฟt thรบc bแบฅt ngแป trรชn %s" - -#: refs.c:1063 -#, c-format -msgid "log for %s is empty" -msgstr "nhแบญt kรฝ cho %s trแปng rแปng" - -#: refs.c:1155 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 #, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "tแปซ chแปi cแบญp nhแบญt tham chiแบฟu vแปi tรชn sai โ%sโ" - -#: refs.c:1231 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "update_ref bแป lแปi cho ref โ%sโ: %s" - -#: 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: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: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: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:1234 -#, c-format -msgid "could not remove reference %s" -msgstr "khรดng thแป gแปก bแป tham chiแบฟu: %s" - -#: 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: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" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "refspec khรดng hแปฃp lแป โ%sโ" +msgid "could not read '%s'." +msgstr "khรดng thแป ฤแปc โ%sโ." -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "ฤรฃ ra ฤi" @@ -5044,122 +5892,127 @@ msgstr "ฤแบฑng sau %d" msgid "ahead %d, behind %d" msgstr "trฦฐแปc %d, sau %d" -#: ref-filter.c:162 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "cแบงn ฤแปnh dแบกng: %%(color:<color>)" -#: ref-filter.c:164 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "khรดng nhแบญn ra mร u: %%(mร u:%s)" -#: ref-filter.c:186 +#: ref-filter.c:193 #, 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:190 +#: ref-filter.c:197 #, 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:192 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "ฤแปi sแป khรดng ฤฦฐแปฃc thแปซa nhแบญn %%(%s): %s" -#: ref-filter.c:247 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) khรดng nhแบญn cรกc ฤแปi sแป" -#: ref-filter.c:269 +#: ref-filter.c:276 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "tham sแป khรดng ฤฦฐแปฃc thแปซa nhแบญn %%(objectname): %s" -#: ref-filter.c:277 +#: ref-filter.c:284 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) khรดng nhแบญn cรกc ฤแปi sแป" -#: ref-filter.c:289 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) khรดng nhแบญn cรกc ฤแปi sแป" -#: ref-filter.c:298 +#: ref-filter.c:309 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) khรดng nhแบญn cรกc ฤแปi sแป" +msgid "unrecognized %%(subject) argument: %s" +msgstr "tham sแป khรดng ฤฦฐแปฃc thแปซa nhแบญn %%(subject): %s" -#: ref-filter.c:320 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "khรดng hiแปu tham sแป %%(trailers): %s" -#: ref-filter.c:349 +#: ref-filter.c:363 #, 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:351 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "ฤแปi sแป khรดng ฤฦฐแปฃc thแปซa nhแบญn %%(contents): %s" -#: ref-filter.c:366 +#: ref-filter.c:380 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "cแบงn nแปi dung mang giรก trแป dฦฐฦกng:shot=%s" +msgid "positive value expected '%s' in %%(%s)" +msgstr "cแบงn giรก trแป dฦฐฦกng '%s' trong %%(%s)" -#: ref-filter.c:370 +#: ref-filter.c:384 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "ฤแปi sแป khรดng ฤฦฐแปฃc thแปซa nhแบญn %%(objectname): %s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "ฤแปi sแป '%s' khรดng ฤฦฐแปฃc thแปซa nhแบญn trong %%(%s)" -#: ref-filter.c:400 +#: ref-filter.c:398 +#, c-format +msgid "unrecognized email option: %s" +msgstr "khรดng nhแบญn ra tรนy chแปn thฦฐ ฤiแปn tแปญ: โ%sโ" + +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "cแบงn ฤแปnh dแบกng: %%(align:<width>,<position>)" -#: ref-filter.c:412 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "vแป trรญ khรดng ฤฦฐแปฃc thแปซa nhแบญn:%s" -#: ref-filter.c:419 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "chiแปu rแปng khรดng ฤฦฐแปฃc thแปซa nhแบญn:%s" -#: ref-filter.c:428 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "ฤแปi sแป khรดng ฤฦฐแปฃc thแปซa nhแบญn %%(align): %s" -#: ref-filter.c:436 +#: ref-filter.c:464 #, 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:454 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "ฤแปi sแป khรดng ฤฦฐแปฃc thแปซa nhแบญn %%(if): %s" -#: ref-filter.c:556 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "tรชn trฦฐแปng dแป hรฌnh: %.*s" -#: ref-filter.c:583 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "khรดng hiแปu tรชn trฦฐแปng: %.*s" -#: ref-filter.c:587 +#: ref-filter.c:615 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" @@ -5167,159 +6020,243 @@ 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:711 +#: ref-filter.c:739 #, 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:774 +#: ref-filter.c:802 #, 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:776 +#: ref-filter.c:804 #, 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:778 +#: ref-filter.c:806 #, 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:806 +#: ref-filter.c:834 #, 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:808 +#: ref-filter.c:836 #, 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:810 +#: ref-filter.c:838 #, 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:825 +#: ref-filter.c:853 #, 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:882 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "chuแปi ฤแปnh dแบกng dแป hรฌnh %s" -#: ref-filter.c:1485 +#: ref-filter.c:1541 #, c-format msgid "no branch, rebasing %s" msgstr "khรดng nhรกnh, ฤang cแบฃi tแป %s" -#: ref-filter.c:1488 +#: ref-filter.c:1544 #, 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:1491 +#: ref-filter.c:1547 #, 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:1501 +#: ref-filter.c:1557 msgid "no branch" msgstr "khรดng nhรกnh" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1591 ref-filter.c:1800 #, c-format msgid "missing object %s for %s" msgstr "thiแบฟu ฤแปi tฦฐแปฃng %s cho %s" -#: ref-filter.c:1547 +#: ref-filter.c:1601 #, 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:1998 +#: ref-filter.c:2054 #, c-format msgid "malformed object at '%s'" msgstr "ฤแปi tฦฐแปฃng dแป hรฌnh tแบกi โ%sโ" -#: ref-filter.c:2087 +#: ref-filter.c:2143 #, 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:2382 +#: ref-filter.c:2148 refs.c:657 #, c-format -msgid "format: %%(end) atom missing" -msgstr "ฤแปnh dแบกng: thiแบฟu nguyรชn tแปญ %%(end)" - -#: 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" +msgid "ignoring broken ref %s" +msgstr "ฤang lแป ฤi tham chiแบฟu hแปng %s" -#: ref-filter.c:2485 +#: ref-filter.c:2464 #, 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" +msgid "format: %%(end) atom missing" +msgstr "ฤแปnh dแบกng: thiแบฟu nguyรชn tแปญ %%(end)" -#: ref-filter.c:2495 +#: ref-filter.c:2563 #, c-format msgid "malformed object name %s" msgstr "tรชn ฤแปi tฦฐแปฃng dแป hรฌnh %s" -#: ref-filter.c:2500 +#: ref-filter.c:2568 #, 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:363 +#: refs.c:264 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "โ%sโ khรดng chแป ฤแบฟn mแปt lแบงn chuyแปn giao hแปฃp lแป nร o cแบฃ!" + +#: refs.c:572 +#, c-format +msgid "could not retrieve `%s`" +msgstr "khรดng thแป lแบฅy vแป โ%sโ" + +#: refs.c:579 +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "tรชn nhรกnh khรดng hแปฃp lแป: %s = %s" + +#: refs.c:655 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "ฤang lแป ฤi tham chiแบฟu mแปm thแปซa %s" + +#: refs.c:892 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "nhแบญt kรฝ cho tham chiแบฟu %s cรณ khoแบฃng trแปng sau %s" + +#: refs.c:898 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "nhแบญt kรฝ cho tham chiแบฟu %s kแบฟt thรบc bแบฅt ngแป trรชn %s" + +#: refs.c:957 +#, c-format +msgid "log for %s is empty" +msgstr "nhแบญt kรฝ cho %s trแปng rแปng" + +#: refs.c:1049 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "tแปซ chแปi cแบญp nhแบญt tham chiแบฟu vแปi tรชn sai โ%sโ" + +#: refs.c:1120 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "update_ref bแป lแปi cho ref โ%sโ: %s" + +#: refs.c:1944 +#, 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:2024 +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:2035 +msgid "ref updates aborted by hook" +msgstr "cรกc cแบญp nhแบญt tham chiแบฟu bแป bรฃi bแป bแปi mรณc" + +#: refs.c:2135 refs.c:2165 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "โ%sโ sแบตn cรณ; khรดng thแป tแบกo โ%sโ" + +#: refs.c:2141 refs.c:2176 +#, 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:1228 +#, c-format +msgid "could not remove reference %s" +msgstr "khรดng thแป gแปก bแป tham chiแบฟu: %s" + +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 +#, 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:1245 refs/packed-backend.c:1555 +#, c-format +msgid "could not delete references: %s" +msgstr "khรดng thแป xรณa bแป tham chiแบฟu: %s" + +#: refspec.c:167 +#, c-format +msgid "invalid refspec '%s'" +msgstr "refspec khรดng hแปฃp lแป โ%sโ" + +#: remote.c:351 #, 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:410 +#: remote.c:399 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:418 +#: remote.c:407 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:608 +#: remote.c:590 #, 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:612 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s thฦฐแปng theo dรตi %s, khรดng phแบฃi %s" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s theo dรตi cแบฃ %s vร %s" -#: remote.c:684 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "khรณa โ%sโ cแปงa mแบซu k cรณ โ*โ" -#: remote.c:694 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "giรก trแป โ%sโ cแปงa mแบซu k cรณ โ*โ" -#: remote.c:1000 +#: remote.c:1073 #, 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:1005 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "refspec %s nguแปn khแปp nhiแปu hฦกn mแปt" @@ -5328,7 +6265,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:1020 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5353,7 +6290,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:1040 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5364,7 +6301,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:1045 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5375,7 +6312,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:1050 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5386,7 +6323,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:1055 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5397,115 +6334,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:1091 +#: remote.c:1164 #, 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:1102 +#: remote.c:1175 #, 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:1114 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "dst refspec %s khแปp nhiแปu hฦกn mแปt" -#: remote.c:1121 +#: remote.c:1194 #, 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:1624 remote.c:1725 +#: remote.c:1703 remote.c:1804 msgid "HEAD does not point to a branch" msgstr "HEAD khรดng chแป ฤแบฟn mแปt nhรกnh nร o cแบฃ" -#: remote.c:1633 +#: remote.c:1712 #, c-format msgid "no such branch: '%s'" msgstr "khรดng cรณ nhรกnh nร o nhฦฐ thแบฟ: โ%sโ" -#: remote.c:1636 +#: remote.c:1715 #, 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:1642 +#: remote.c:1721 #, 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:1657 +#: remote.c:1736 #, 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:1669 +#: remote.c:1748 #, 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:1679 +#: remote.c:1758 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "ฤแบฉy refspecs cho โ%sโ khรดng bao gแปm โ%sโ" -#: remote.c:1692 +#: remote.c:1771 msgid "push has no destination (push.default is 'nothing')" msgstr "ฤแบฉy lรชn mร khรดng cรณ ฤรญch (push.default lร โnothingโ)" -#: remote.c:1714 +#: remote.c:1793 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:1840 +#: remote.c:1922 #, 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:1853 +#: remote.c:1935 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* ฤang bแป qua tham chiแบฟu thรบ vแป nแปi bแป โ%sโ" -#: remote.c:2016 +#: remote.c:2098 #, 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:2020 +#: remote.c:2102 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (dรนng \" git branch --unset-upstream\" ฤแป sแปญa)\n" -#: remote.c:2023 +#: remote.c:2105 #, 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:2027 +#: remote.c:2109 #, 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:2030 +#: remote.c:2112 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (dรนng \"%s\" ฤแป biแบฟt thรชm chi tiแบฟt)\n" -#: remote.c:2034 +#: remote.c:2116 #, 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:2040 +#: remote.c:2122 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:2043 +#: remote.c:2125 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5514,11 +6451,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:2051 +#: remote.c:2133 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:2054 +#: remote.c:2136 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5531,13 +6468,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:2064 +#: remote.c:2146 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:2247 +#: remote.c:2337 #, 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โ" @@ -5552,7 +6489,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:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "ฤแป sรขu thay thแบฟ quรก cao cho ฤแปi tฦฐแปฃng %s" @@ -5615,8 +6552,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:2023 builtin/log.c:1773 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "khรดng thแป tแบกo thฦฐ mแปฅc โ%sโ" @@ -5650,20 +6587,34 @@ 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:2507 +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "khรดng thแป dรฒ tรฌm ฤiแปm xรฉt duyแปt HEAD" + +#: reset.c:70 reset.c:76 sequencer.c:3426 +#, c-format +msgid "failed to find tree of %s" +msgstr "gแบทp lแปi khi tรฌm cรขy cแปงa %s" + +#: revision.c:2344 +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<packfile> khรดng cรฒn ฤฦฐแปฃc hแป trแปฃ nแปฏa" + +#: revision.c:2364 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "khรดng hiแปu giรก trแป cho --diff-merges: %s" + +#: revision.c:2702 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:2510 +#: revision.c:2705 #, 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:2710 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent xung khแบฏc vแปi --bisect" - -#: revision.c:2714 +#: revision.c:2915 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" @@ -5671,12 +6622,12 @@ msgstr "-L vแบซn chฦฐa hแป trแปฃ ฤแปnh dแบกng khรกc biแปt nร o ngoร i -p vร msgid "open /dev/null failed" msgstr "gแบทp lแปi khi mแป โ/dev/nullโ" -#: run-command.c:1269 +#: run-command.c:1270 #, c-format msgid "cannot create async thread: %s" msgstr "khรดng thแป tแบกo tuyแบฟn async: %s" -#: run-command.c:1333 +#: run-command.c:1334 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5685,30 +6636,34 @@ 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:141 +#: send-pack.c:145 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:143 +#: send-pack.c:147 #, 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:145 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "mรกy chแปง gแบทp lแปi unpack: %s" -#: send-pack.c:306 +#: send-pack.c:372 msgid "failed to sign the push certificate" msgstr "gแบทp lแปi khi kรฝ chแปฉng thแปฑc ฤแบฉy" -#: send-pack.c:420 +#: send-pack.c:460 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "kแบฟt thรบc nhแบญn khรดng hแป trแปฃ cรกc tรนy chแปn cแปงa lแปnh push" + +#: send-pack.c:469 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:422 +#: send-pack.c:471 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5716,47 +6671,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:434 +#: send-pack.c:483 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:439 +#: send-pack.c:488 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:187 +#: sequencer.c:194 #, 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:292 +#: sequencer.c:308 #, c-format msgid "could not delete '%s'" msgstr "khรดng thแป xรณa bแป โ%sโ" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "khรดng thแป gแปก bแป โ%sโ" -#: sequencer.c:321 +#: sequencer.c:339 msgid "revert" msgstr "hoร n nguyรชn" -#: sequencer.c:323 +#: sequencer.c:341 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:325 -msgid "rebase -i" -msgstr "rebase -i" +#: sequencer.c:343 +msgid "rebase" +msgstr "rebase" -#: sequencer.c:327 +#: sequencer.c:345 #, c-format msgid "unknown action: %d" msgstr "khรดng nhแบญn ra thao tรกc: %d" -#: sequencer.c:385 +#: sequencer.c:404 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5764,7 +6719,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:388 +#: sequencer.c:407 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5774,115 +6729,109 @@ 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:401 sequencer.c:2909 +#: sequencer.c:420 sequencer.c:3028 #, c-format msgid "could not lock '%s'" msgstr "khรดng thแป khรณa โ%sโ" -#: sequencer.c:408 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "khรดng thแป ghi vร o โ%sโ" + +#: sequencer.c:427 #, c-format msgid "could not write eol to '%s'" msgstr "khรดng thแป ghi eol vร o โ%sโ" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 #, c-format msgid "failed to finalize '%s'" msgstr "gแบทp lแปi khi hoร n thร nh โ%sโ" -#: 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:462 +#: sequencer.c:471 #, 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:466 +#: sequencer.c:475 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:498 +#: sequencer.c:507 #, c-format msgid "%s: fast-forward" msgstr "%s: chuyแปn-tiแบฟp-nhanh" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:546 builtin/tag.c:566 #, 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 -i". +#. "rebase". #. -#: sequencer.c:632 +#: sequencer.c:640 #, 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:649 +#: sequencer.c:657 msgid "unable to update cache tree" msgstr "khรดng thแป cแบญp nhแบญt cรขy bแป nhแป ฤแปm" -#: sequencer.c:663 +#: sequencer.c:671 msgid "could not resolve HEAD commit" msgstr "khรดng thแป phรขn giแบฃi lแบงn chuyแปn giao HEAD" -#: sequencer.c:743 +#: sequencer.c:751 #, c-format msgid "no key present in '%.*s'" msgstr "khรดng cรณ khรณa hiแปn diแปn trong โ%.*sโ" -#: sequencer.c:754 +#: sequencer.c:762 #, 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:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 #, c-format msgid "could not open '%s' for reading" msgstr "khรดng thแป mแป โ%sโ ฤแป ฤแปc" -#: sequencer.c:801 +#: sequencer.c:809 msgid "'GIT_AUTHOR_NAME' already given" msgstr "โGIT_AUTHOR_NAMEโ ฤรฃ sแบตn ฤฦฐa ra rแปi" -#: sequencer.c:806 +#: sequencer.c:814 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "โGIT_AUTHOR_EMAILโ ฤรฃ sแบตn ฤฦฐa ra rแปi" -#: sequencer.c:811 +#: sequencer.c:819 msgid "'GIT_AUTHOR_DATE' already given" msgstr "โGIT_AUTHOR_DATEโ ฤรฃ sแบตn ฤฦฐa ra rแปi" -#: sequencer.c:815 +#: sequencer.c:823 #, c-format msgid "unknown variable '%s'" msgstr "khรดng hiแปu biแบฟn โ%sโ" -#: sequencer.c:820 +#: sequencer.c:828 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "thiแบฟu โGIT_AUTHOR_NAMEโ" -#: sequencer.c:822 +#: sequencer.c:830 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "thiแบฟu โGIT_AUTHOR_EMAILโ" -#: sequencer.c:824 +#: sequencer.c:832 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "thiแบฟu โGIT_AUTHOR_DATEโ" -#: 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 +#: sequencer.c:897 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5911,15 +6860,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "ghi chuyแปn giao gแปc" - -#: sequencer.c:1216 +#: sequencer.c:1178 msgid "'prepare-commit-msg' hook failed" msgstr "mรณc โprepare-commit-msgโ bแป lแปi" -#: sequencer.c:1223 +#: sequencer.c:1184 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5950,7 +6895,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1197 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5978,328 +6923,341 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1239 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:1280 +#: sequencer.c:1241 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:1326 +#: sequencer.c:1287 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:1328 +#: sequencer.c:1289 msgid "detached HEAD" msgstr "ฤรฃ rแปi khแปi HEAD" -#: sequencer.c:1332 +#: sequencer.c:1293 msgid " (root-commit)" msgstr " (root-commit)" -#: sequencer.c:1353 +#: sequencer.c:1314 msgid "could not parse HEAD" msgstr "khรดng thแป phรขn tรญch HEAD" -#: sequencer.c:1355 +#: sequencer.c:1316 #, 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:1359 builtin/commit.c:1571 +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "khรดng thแป phรขn tรญch commit (lแบงn chuyแปn giao) HEAD" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1373 sequencer.c:2067 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:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 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:1438 sequencer.c:1499 +#: sequencer.c:1417 sequencer.c:1535 #, 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:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1446 sequencer.c:1478 +#, c-format +msgid "invalid author identity '%s'" +msgstr "ฤแปnh danh tรกc giแบฃ khรดng hแปฃp lแป โ%sโ" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "tรกc giแบฃ sai hแปng: thiแบฟu thรดng tin nร y thรกng" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 msgid "failed to write commit object" msgstr "gแบทp lแปi khi ghi ฤแปi tฦฐแปฃng chuyแปn giao" -#: sequencer.c:1526 +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "khรดng thแป cแบญp nhแบญt %s" + +#: sequencer.c:1567 #, c-format msgid "could not parse commit %s" msgstr "khรดng thแป phรขn tรญch lแบงn chuyแปn giao %s" -#: sequencer.c:1531 +#: sequencer.c:1572 #, 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:1605 sequencer.c:1715 +#: sequencer.c:1655 sequencer.c:1766 #, c-format msgid "unknown command: %d" msgstr "khรดng hiแปu cรขu lแปnh %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1713 sequencer.c:1738 #, 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:1672 +#: sequencer.c:1723 msgid "need a HEAD to fixup" msgstr "cแบงn mแปt HEAD ฤแป sแปญa" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1725 sequencer.c:3338 msgid "could not read HEAD" msgstr "khรดng thแป ฤแปc HEAD" -#: sequencer.c:1676 +#: sequencer.c:1727 msgid "could not read HEAD's commit message" msgstr "khรดng thแป ฤแปc phแบงn chรบ thรญch (message) cแปงa HEAD" -#: sequencer.c:1682 +#: sequencer.c:1733 #, c-format msgid "cannot write '%s'" msgstr "khรดng thแป ghi โ%sโ" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "ฤรขy lร chรบ thรญch cho lแบงn chuyแปn giao thแปฉ nhแบฅt:" -#: sequencer.c:1697 +#: sequencer.c:1748 #, 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:1704 +#: sequencer.c:1755 #, 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:1710 +#: sequencer.c:1761 #, 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:1798 +#: sequencer.c:1849 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:1805 +#: sequencer.c:1856 msgid "cannot fixup root commit" msgstr "khรดng thแป sแปญa chแปฏa lแบงn chuyแปn giao gแปc" -#: sequencer.c:1824 +#: sequencer.c:1875 #, 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:1832 sequencer.c:1840 +#: sequencer.c:1883 sequencer.c:1891 #, 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:1846 +#: sequencer.c:1897 #, 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:1865 +#: sequencer.c:1916 #, 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:1930 +#: sequencer.c:1981 #, c-format msgid "could not rename '%s' to '%s'" msgstr "khรดng thแป ฤแปi tรชn โ%sโ thร nh โ%sโ" -#: sequencer.c:1985 +#: sequencer.c:2038 #, c-format msgid "could not revert %s... %s" msgstr "khรดng thแป hoร n nguyรชn %sโฆ %s" -#: sequencer.c:1986 +#: sequencer.c:2039 #, c-format msgid "could not apply %s... %s" msgstr "khรดng thแป รกp dแปฅng miแบฟng vรก %sโฆ %s" -#: sequencer.c:2045 +#: sequencer.c:2059 +#, 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:2117 #, 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:2052 +#: sequencer.c:2124 #, 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:2128 +#: sequencer.c:2201 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s khรดng nhแบญn cรกc ฤแปi sแป: โ%sโ" -#: sequencer.c:2137 +#: sequencer.c:2210 #, c-format msgid "missing arguments for %s" msgstr "thiแบฟu ฤแปi sแป cho %s" -#: sequencer.c:2174 +#: sequencer.c:2241 #, 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:2228 +#: sequencer.c:2302 #, c-format msgid "invalid line %d: %.*s" msgstr "dรฒng khรดng hแปฃp lแป %d: %.*s" -#: sequencer.c:2239 +#: sequencer.c:2313 #, 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: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 +#: sequencer.c:2399 msgid "cancelling a cherry picking in progress" msgstr "ฤang hแปงy bแป thao tรกc cherry pick ฤang thแปฑc hiแปn" -#: sequencer.c:2330 +#: sequencer.c:2408 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:2364 +#: sequencer.c:2452 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:2366 +#: sequencer.c:2454 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "bแบฃng chแป thแป khรดng thแป dรนng ฤฦฐแปฃc: %s" -#: sequencer.c:2371 +#: sequencer.c:2459 msgid "no commits parsed." msgstr "khรดng cรณ lแบงn chuyแปn giao nร o ฤฦฐแปฃc phรขn tรญch." -#: sequencer.c:2382 +#: sequencer.c:2470 msgid "cannot cherry-pick during a revert." msgstr "khรดng thแป cherry-pick trong khi hoร n nguyรชn." -#: sequencer.c:2384 +#: sequencer.c:2472 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:2466 +#: sequencer.c:2550 #, c-format msgid "invalid value for %s: %s" msgstr "giรก trแป cho %s khรดng hแปฃp lแป: %s" -#: sequencer.c:2553 +#: sequencer.c:2657 msgid "unusable squash-onto" msgstr "squash-onto khรดng dรนng ฤฦฐแปฃc" -#: sequencer.c:2569 +#: sequencer.c:2677 #, c-format msgid "malformed options sheet: '%s'" msgstr "bแบฃng tรนy chแปn dแป hรฌnh: โ%sโ" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2769 sequencer.c:4609 msgid "empty commit set passed" msgstr "lแบงn chuyแปn giao trแปng rแปng ฤแบทt lร hแปฃp quy cรกch" -#: sequencer.c:2668 +#: sequencer.c:2786 msgid "revert is already in progress" msgstr "cรณ thao tรกc hoร n nguyรชn ฤang ฤฦฐแปฃc thแปฑc hiแปn" -#: sequencer.c:2670 +#: sequencer.c:2788 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "hรฃy thแปญ \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2673 +#: sequencer.c:2791 msgid "cherry-pick is already in progress" msgstr "cรณ thao tรกc โcherry-pickโ ฤang ฤฦฐแปฃc thแปฑc hiแปn" -#: sequencer.c:2675 +#: sequencer.c:2793 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "hรฃy thแปญ \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2689 +#: sequencer.c:2807 #, 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:2704 +#: sequencer.c:2822 msgid "could not lock HEAD" msgstr "khรดng thแป khรณa HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2882 sequencer.c:4325 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:2766 sequencer.c:2777 +#: sequencer.c:2884 sequencer.c:2895 msgid "cannot resolve HEAD" msgstr "khรดng thแป phรขn giแบฃi HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2886 sequencer.c:2930 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:2798 builtin/grep.c:734 +#: sequencer.c:2916 builtin/grep.c:745 #, c-format msgid "cannot open '%s'" msgstr "khรดng mแป ฤฦฐแปฃc โ%sโ" -#: sequencer.c:2800 +#: sequencer.c:2918 #, c-format msgid "cannot read '%s': %s" msgstr "khรดng thแป ฤแปc โ%sโ: %s" -#: sequencer.c:2801 +#: sequencer.c:2919 msgid "unexpected end of file" msgstr "gแบทp kแบฟt thรบc tแบญp tin ฤแปt xuแบฅt" -#: sequencer.c:2807 +#: sequencer.c:2925 #, 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:2818 +#: sequencer.c:2936 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:2859 +#: sequencer.c:2977 msgid "no revert in progress" msgstr "khรดng cรณ tiแบฟn trรฌnh hoร n nguyรชn nร o" -#: sequencer.c:2867 +#: sequencer.c:2986 msgid "no cherry-pick in progress" msgstr "khรดng cรณ cherry-pick ฤang ฤฦฐแปฃc thแปฑc hiแปn" -#: sequencer.c:2877 +#: sequencer.c:2996 msgid "failed to skip the commit" msgstr "gแบทp lแปi khi bแป qua ฤแปi tฦฐแปฃng chuyแปn giao" -#: sequencer.c:2884 +#: sequencer.c:3003 msgid "there is nothing to skip" msgstr "แป ฤรขy khรดng cรณ gรฌ ฤแป mร bแป qua cแบฃ" -#: sequencer.c:2887 +#: sequencer.c:3006 #, c-format msgid "" "have you committed already?\n" @@ -6308,21 +7266,16 @@ msgstr "" "bแบกn ฤรฃ sแบตn sร ng chuyแปn giao chฦฐa?\n" "thแปญ \"git %s --continue\"" -#: sequencer.c:3011 sequencer.c:4015 -#, c-format -msgid "could not update %s" -msgstr "khรดng thแป cแบญp nhแบญt %s" - -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3168 sequencer.c:4217 msgid "cannot read HEAD" msgstr "khรดng thแป ฤแปc HEAD" -#: sequencer.c:3066 +#: sequencer.c:3185 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "khรดng thแป chรฉp โ%sโ sang โ%sโ" -#: sequencer.c:3074 +#: sequencer.c:3193 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6341,27 +7294,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3203 #, c-format msgid "Could not apply %s... %.*s" msgstr "Khรดng thแป รกp dแปฅng %sโฆ %.*s" -#: sequencer.c:3091 +#: sequencer.c:3210 #, c-format msgid "Could not merge %.*s" msgstr "Khรดng hรฒa trแปn %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "khรดng thแป chรฉp โ%sโ sang โ%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 "khรดng thแป ฤแปc bแบฃng mแปฅc lแปฅc" +#: sequencer.c:3240 +#, c-format +msgid "Executing: %s\n" +msgstr "ฤang thแปฑc thi: %s\n" -#: sequencer.c:3136 +#: sequencer.c:3255 #, c-format msgid "" "execution failed: %s\n" @@ -6376,11 +7329,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3261 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:3148 +#: sequencer.c:3267 #, c-format msgid "" "execution succeeded: %s\n" @@ -6397,112 +7350,129 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3328 #, c-format msgid "illegal label name: '%.*s'" msgstr "tรชn nhรฃn dแป hรฌnh: โ%.*sโ" -#: sequencer.c:3263 +#: sequencer.c:3382 msgid "writing fake root commit" msgstr "ghi lแบงn chuyแปn giao gแปc giแบฃ" -#: sequencer.c:3268 +#: sequencer.c:3387 msgid "writing squash-onto" msgstr "ฤang ghi squash-onto" -#: 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:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "khรดng thแป ghi bแบฃng mแปฅc lแปฅc" - -#: sequencer.c:3351 +#: sequencer.c:3471 #, c-format msgid "could not resolve '%s'" msgstr "khรดng thแป phรขn giแบฃi โ%sโ" -#: sequencer.c:3379 +#: sequencer.c:3502 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:3401 +#: sequencer.c:3524 #, c-format msgid "unable to parse '%.*s'" msgstr "khรดng thแป phรขn tรญch โ%.*sโ" -#: sequencer.c:3410 +#: sequencer.c:3533 #, c-format msgid "nothing to merge: '%.*s'" msgstr "chแบณng cรณ gรฌ ฤแป hรฒa trแปn: โ%.*sโ" -#: sequencer.c:3422 +#: sequencer.c:3545 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:3437 +#: sequencer.c:3561 #, 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:3590 +#: sequencer.c:3730 #, 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:3606 +#: sequencer.c:3746 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:3675 builtin/rebase.c:711 +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "Khรดng thแป autostash" + +#: sequencer.c:3823 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "Gแบทp ฤรกp แปฉng stash khรดng cแบงn: โ%sโ" + +#: sequencer.c:3829 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "Khรดng thแป tแบกo thฦฐ mแปฅc cho โ%sโ" + +#: sequencer.c:3832 +#, c-format +msgid "Created autostash: %s\n" +msgstr "ฤรฃ tแบกo autostash: %s\n" + +#: sequencer.c:3836 +msgid "could not reset --hard" +msgstr "khรดng thแป reset --hard" + +#: sequencer.c:3861 #, c-format msgid "Applied autostash.\n" msgstr "ฤรฃ รกp dแปฅng autostash.\n" -#: sequencer.c:3687 +#: sequencer.c:3873 #, c-format msgid "cannot store %s" msgstr "khรดng thแปญ lฦฐu โ%sโ" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3876 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"รp dแปฅng autostash cรณ hiแปu quแบฃ trong cรกc xung ฤแปt.\n" +"%s\n" "Cรกc thay ฤแปi cแปงa bแบกn an toร n trong stash (tแบกm cแบฅt ฤi).\n" "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:3751 -#, c-format -msgid "could not checkout %s" -msgstr "khรดng thแป lแบฅy ra %s" +#: sequencer.c:3881 +msgid "Applying autostash resulted in conflicts." +msgstr "รp dแปฅng autostash cรณ hiแปu quแบฃ trong cรกc xung ฤแปt." -#: sequencer.c:3765 +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." +msgstr "Autostash ฤรฃ sแบตn cรณ; nรชn tแบกo mแปt mแปฅc stash mแปi." + +#: sequencer.c:3974 #, c-format msgid "%s: not a valid OID" msgstr "%s khรดng phแบฃi lร mแปt OID hแปฃp lแป" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "khรดng thแป tรกch rแปi HEAD" -#: sequencer.c:3785 +#: sequencer.c:3994 #, c-format msgid "Stopped at HEAD\n" msgstr "Dแปซng lแบกi แป HEAD\n" -#: sequencer.c:3787 +#: sequencer.c:3996 #, c-format msgid "Stopped at %s\n" msgstr "Dแปซng lแบกi แป %s\n" -#: sequencer.c:3795 +#: sequencer.c:4004 #, c-format msgid "" "Could not execute the todo command\n" @@ -6523,48 +7493,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "ฤang cแบฃi tแป (%d/%d)%s" + +#: sequencer.c:4095 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Dแปซng lแบกi แป %sโฆ %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:4166 #, c-format msgid "unknown command %d" msgstr "khรดng hiแปu cรขu lแปnh %d" -#: sequencer.c:4003 +#: sequencer.c:4225 msgid "could not read orig-head" msgstr "khรดng thแป ฤแปc orig-head" -#: sequencer.c:4008 +#: sequencer.c:4230 msgid "could not read 'onto'" msgstr "khรดng thแป ฤแปc โontoโ." -#: sequencer.c:4022 +#: sequencer.c:4244 #, c-format msgid "could not update HEAD to %s" msgstr "khรดng thแป cแบญp nhแบญt HEAD thร nh %s" -#: sequencer.c:4115 +#: sequencer.c:4304 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "Cร i tแป vร cแบญp nhแบญt %s mแปt cรกch thร nh cรดng.\n" + +#: sequencer.c:4337 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:4124 +#: sequencer.c:4346 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:4126 +#: sequencer.c:4348 #, c-format msgid "invalid file: '%s'" msgstr "tแบญp tin khรดng hแปฃp lแป: โ%sโ" -#: sequencer.c:4128 +#: sequencer.c:4350 #, c-format msgid "invalid contents: '%s'" msgstr "nแปi dung khรดng hแปฃp lแป: โ%sโ" -#: sequencer.c:4131 +#: sequencer.c:4353 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6574,69 +7554,64 @@ 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:4167 sequencer.c:4205 +#: sequencer.c:4389 sequencer.c:4428 #, c-format msgid "could not write file: '%s'" msgstr "khรดng thแป ghi tแบญp tin: โ%sโ" -#: sequencer.c:4220 +#: sequencer.c:4444 msgid "could not remove CHERRY_PICK_HEAD" msgstr "khรดng thแป xรณa bแป CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4451 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:4328 +#: sequencer.c:4477 +#, c-format +msgid "invalid committer '%s'" +msgstr "chuyแปn giao khรดng hแปฃp lแป '%s'" + +#: sequencer.c:4586 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: khรดng thแป cherry-pick mแปt %s" -#: sequencer.c:4332 +#: sequencer.c:4590 #, c-format msgid "%s: bad revision" msgstr "%s: ฤiแปm xรฉt duyแปt sai" -#: sequencer.c:4367 +#: sequencer.c:4625 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:4810 +#: sequencer.c:5102 msgid "make_script: unhandled options" msgstr "make_script: cรกc tรนy chแปn ฤฦฐแปฃc khรดng xแปญ lรฝ" -#: sequencer.c:4813 +#: sequencer.c:5105 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 +#: sequencer.c:5347 sequencer.c:5364 msgid "nothing to do" msgstr "khรดng cรณ gรฌ ฤแป lร m" -#: sequencer.c:5114 +#: sequencer.c:5383 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:5197 +#: sequencer.c:5480 msgid "the script was already rearranged." msgstr "vฤn lแปnh ฤรฃ sแบตn ฤฦฐแปฃc sแบฏp ฤแบทt rแปi." -#: setup.c:123 +#: setup.c:133 #, c-format -msgid "'%s' is outside repository" -msgstr "โ%sโ แป ngoร i mแปt kho chแปฉa" +msgid "'%s' is outside repository at '%s'" +msgstr "โ%sโ ngoร i mแปt kho chแปฉa tแบกi '%s'" -#: setup.c:173 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6646,7 +7621,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:186 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6658,12 +7633,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:235 +#: setup.c:264 #, 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:254 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6674,92 +7649,96 @@ 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:390 +#: setup.c:419 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:394 +#: setup.c:423 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:540 +#: setup.c:661 #, 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:548 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "tรฌm thแบฅy phแบงn mแป rแปng kho chฦฐa biแบฟt:" -#: setup.c:567 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "phiรชn bแบฃn kho lร 0, nhฦฐng lแบกi tรฌm thแบฅy phแบงn mแป rแปng chแป v1:" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "gแบทp lแปi khi mแป โ%sโ" -#: setup.c:569 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "tแบญp tin .git lร quรก lแปn: โ%sโ" -#: setup.c:571 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "gแบทp lแปi khi ฤแปc %s" -#: setup.c:573 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "ฤแปnh dแบกng tแบญp tin git khรดng hแปฃp lแป: %s" -#: setup.c:575 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "khรดng cรณ ฤฦฐแปng dแบซn trong tแบญp tin git: %s" -#: setup.c:577 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "khรดng phแบฃi lร kho git: %s" -#: setup.c:676 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "โ$%sโ quรก lแปn" -#: setup.c:690 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "khรดng phแบฃi lร kho git: โ%sโ" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "khรดng thแป chdir (chuyแปn ฤแปi thฦฐ mแปฅc) sang โ%sโ" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "khรดng thแป quay lแบกi cwd" -#: setup.c:851 +#: setup.c:987 #, 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:1083 +#: setup.c:1225 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:1092 setup.c:1098 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "khรดng thแป chuyแปn sang โ%sโ" -#: setup.c:1103 +#: setup.c:1245 #, 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:1109 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6769,7 +7748,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:1220 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6778,284 +7757,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:1264 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "gแบทp lแปi khi mแป โ/dev/nullโ hay dup" -#: setup.c:1279 +#: setup.c:1424 msgid "fork failed" msgstr "gแบทp lแปi khi rแบฝ nhรกnh tiแบฟn trรฌnh" -#: setup.c:1284 +#: setup.c:1429 msgid "setsid failed" msgstr "setsid gแบทp lแปi" -#: sha1-file.c:453 +#: sha1-file.c:470 #, 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:504 +#: sha1-file.c:521 #, 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:576 +#: sha1-file.c:593 #, 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:583 +#: sha1-file.c:600 #, 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:626 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" msgstr "khรดng thแป fdopen tแบญp tin khรณa thay thแบฟ" -#: sha1-file.c:644 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "khรดng thแป ฤแปc tแบญp tin thay thแบฟ" -#: sha1-file.c:651 +#: sha1-file.c:668 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:686 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "ฤฦฐแปng dแบซn โ%sโ khรดng tแปn tแบกi" -#: sha1-file.c:712 +#: sha1-file.c:724 #, 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:718 +#: sha1-file.c:730 #, 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:724 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "kho tham chiแบฟu โ%sโ lร nรดng" -#: sha1-file.c:732 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "kho tham chiแบฟu โ%sโ bแป cแบฅy ghรฉp" -#: sha1-file.c:792 +#: sha1-file.c:804 #, 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:944 +#: sha1-file.c:954 #, 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:969 +#: sha1-file.c:975 msgid "mmap failed" msgstr "mmap gแบทp lแปi" -#: sha1-file.c:1133 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "tแบญp tin ฤแปi tฦฐแปฃng %s trแปng rแปng" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1274 sha1-file.c:2467 #, c-format msgid "corrupt loose object '%s'" msgstr "ฤแปi tฦฐแปฃng mแบฅt hแปng โ%sโ" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1276 sha1-file.c:2471 #, 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:1301 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "kiแปu ฤแปi tฦฐแปฃng khรดng hแปฃp lแป" -#: sha1-file.c:1385 +#: sha1-file.c:1402 #, 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:1388 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "khรดng thแป giแบฃi gรณi phแบงn ฤแบงu %s" -#: sha1-file.c:1394 +#: sha1-file.c:1411 #, 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:1397 +#: sha1-file.c:1414 #, 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:1588 +#: sha1-file.c:1641 #, c-format msgid "failed to read object %s" msgstr "gแบทp lแปi khi ฤแปc ฤแปi tฦฐแปฃng โ%sโ" -#: sha1-file.c:1592 +#: sha1-file.c:1645 #, 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:1596 +#: sha1-file.c:1649 #, 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:1600 +#: sha1-file.c:1653 #, 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:1703 +#: sha1-file.c:1758 #, c-format msgid "unable to write file %s" msgstr "khรดng thแป ghi tแบญp tin %s" -#: sha1-file.c:1710 +#: sha1-file.c:1765 #, c-format msgid "unable to set permission to '%s'" msgstr "khรดng thแป ฤแบทt quyแปn thร nh โ%sโ" -#: sha1-file.c:1717 +#: sha1-file.c:1772 msgid "file write error" msgstr "lแปi ghi tแบญp tin" -#: sha1-file.c:1736 +#: sha1-file.c:1792 msgid "error when closing loose object file" msgstr "gแบทp lแปi trong khi ฤรณng tแบญp tin ฤแปi tฦฐแปฃng" -#: sha1-file.c:1801 +#: sha1-file.c:1857 #, 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:1803 +#: sha1-file.c:1859 msgid "unable to create temporary file" msgstr "khรดng thแป tแบกo tแบญp tin tแบกm thแปi" -#: sha1-file.c:1827 +#: sha1-file.c:1883 msgid "unable to write loose object file" msgstr "khรดng thแป ghi tแบญp tin ฤแปi tฦฐแปฃng ฤรฃ mแบฅt" -#: sha1-file.c:1833 +#: sha1-file.c:1889 #, 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:1837 +#: sha1-file.c:1893 #, 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:1841 +#: sha1-file.c:1897 #, 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:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1907 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "gแบทp lแปi utime() trรชn โ%sโ" -#: sha1-file.c:1926 +#: sha1-file.c:1984 #, c-format msgid "cannot read object for %s" msgstr "khรดng thแป ฤแปc ฤแปi tฦฐแปฃng cho %s" -#: sha1-file.c:1966 +#: sha1-file.c:2035 msgid "corrupt commit" msgstr "lแบงn chuyแปn giao sai hแปng" -#: sha1-file.c:1974 +#: sha1-file.c:2043 msgid "corrupt tag" msgstr "thแบป sai hแปng" -#: sha1-file.c:2073 +#: sha1-file.c:2143 #, c-format msgid "read error while indexing %s" msgstr "gแบทp lแปi ฤแปc khi ฤรกnh mแปฅc lแปฅc %s" -#: sha1-file.c:2076 +#: sha1-file.c:2146 #, c-format msgid "short read while indexing %s" msgstr "khรดng ฤแปc ngแบฏn khi ฤรกnh mแปฅc lแปฅc %s" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2219 sha1-file.c:2229 #, 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:2164 +#: sha1-file.c:2235 #, c-format msgid "%s: unsupported file type" msgstr "%s: kiแปu tแบญp tin khรดng ฤฦฐแปฃc hแป trแปฃ" -#: sha1-file.c:2188 +#: sha1-file.c:2259 #, 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:2190 +#: sha1-file.c:2261 #, 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:2217 builtin/index-pack.c:155 +#: sha1-file.c:2288 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "khรดng thแป mแป %s" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2478 sha1-file.c:2531 #, 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:2431 +#: sha1-file.c:2502 #, c-format msgid "unable to mmap %s" msgstr "khรดng thแป mmap %s" -#: sha1-file.c:2436 +#: sha1-file.c:2507 #, 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:2442 +#: sha1-file.c:2513 #, 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:2453 +#: sha1-file.c:2524 #, 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:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "tรณm lฦฐแปฃc SHA1 %s chฦฐa rรต rร ng" -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Cรกc แปฉng cแปญ lร :" -#: sha1-name.c:800 +#: 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" @@ -7079,56 +8058,159 @@ 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:1702 +#, 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:1708 +#, 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:1717 +#, 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:1745 +#, 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:1761 +#, 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:1769 +#, 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:1771 +#, 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:1784 +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:1922 +#, 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:821 +#: strbuf.c:848 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/giรขy" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/giรขy" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:867 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/giรขy" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:875 #, c-format msgid "%u byte" msgid_plural "%u bytes" msgstr[0] "%u byte" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:877 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/giรขy" +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" +msgstr "khรดng thแป mแป โ%sโ ฤแป ghi" + +#: strbuf.c:1175 +#, c-format +msgid "could not edit '%s'" +msgstr "khรดng thแป sแปญa โ%sโ" + +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "ฤang lแป ฤi tรชn mรด-ฤun-con mแบญp mแป: %s" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "khรดng cho phรฉp giรก trแป รขm แป submodule.fetchJobs" + +#: submodule-config.c:402 +#, 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:499 +#, c-format +msgid "invalid value for %s" +msgstr "giรก trแป cho %s khรดng hแปฃp lแป" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "Khรดng thแป cแบญp nhแบญt mแปฅc .gitmodules %s" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7159,52 +8241,128 @@ 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:910 +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "ฤแปi sแป --ignore-submodules sai: %s" + +#: submodule.c:816 +#, 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:919 #, 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:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1004 +#, 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:1127 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "xแปญ lรฝ cho mรด-ฤun-con โ%sโ gแบทp lแปi" + +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 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:1481 +#: submodule.c:1167 +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "ฤแบฉy lรชn mรด-ฤun-con โ%sโ\n" + +#: submodule.c:1170 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "Khรดng thแป ฤแบฉy lรชn mรด-ฤun-con โ%sโ\n" + +#: submodule.c:1462 #, c-format -msgid "Could not access submodule '%s'" -msgstr "Khรดng thแป truy cแบญp mรด-ฤun-con โ%sโ" +msgid "Fetching submodule %s%s\n" +msgstr "ฤang lแบฅy vแป mรด-ฤun-con %s%s\n" -#: submodule.c:1651 +#: submodule.c:1492 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "Khรดng thแป truy cแบญp mรด-ฤun-con โ%sโ\n" + +#: submodule.c:1646 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"Cรณ lแปi khi lแบฅy vแป mรด-ฤun-con:\n" +" โ%sโ" + +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" msgstr "khรดng nhแบญn ra โ%sโ lร mแปt kho git" -#: submodule.c:1789 +#: submodule.c:1688 +#, 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:1729 +#, 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:1804 #, 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:1802 +#: submodule.c:1817 #, 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:1817 +#: submodule.c:1832 #, 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:1907 +#: submodule.c:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "khรดng thแป ฤแป quy vร o trong mรด-ฤun-con โ%sโ" + +#: submodule.c:1880 +msgid "could not reset submodule index" +msgstr "khรดng thแป ฤแบทt lแบกi mแปฅc lแปฅc cแปงa mรด-ฤun-con" + +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "mรด-ฤun-con โ%sโ cรณ mแปฅc lแปฅc cรฒn bแบฉn" -#: submodule.c:1959 +#: submodule.c:1974 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Mรด-ฤun-con โ%sโ khรดng thแป ฤฦฐแปฃc cแบญp nhแบญt." -#: submodule.c:2007 +#: submodule.c:2042 +#, 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:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7212,12 +8370,17 @@ 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:2019 submodule.c:2074 +#: submodule.c:2075 submodule.c:2134 #, 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:2026 +#: submodule.c:2079 +#, 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:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7228,207 +8391,83 @@ msgstr "" "โ%sโ sang\n" "โ%sโ\n" -#: 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 +#: submodule.c:2214 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:2192 +#: submodule.c:2254 #, 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: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:299 -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "khรดng cho phรฉp giรก trแป รขm แป submodule.fetchJobs" - -#: 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:486 -#, c-format -msgid "invalid value for %s" -msgstr "giรก trแป cho %s khรดng hแปฃp lแป" - -#: 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" - -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "chแบกy lแปnh kรฉo theo โ%sโ gแบทp lแปi" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format 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:295 +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "nhiแปu hฦกn mแปt %s" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "thแบป thแปซa trแปng rแปng trong phแบงn thแปซa โ%.*sโ" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "khรดng ฤแปc ฤฦฐแปฃc tแบญp tin ฤแบงu vร o โ%sโ" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "khรดng thแป ฤแปc tแปซ ฤแบงu vร o tiรชu chuแบฉn" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "khรดng thแป lแบฅy thรดng tin thแปng kรช vแป %s" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "\"%s\" khรดng phแบฃi lร tแบญp tin bรฌnh thฦฐแปng" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "tแบญp tin %s ngฦฐแปi dรนng khรดng thแป ghi ฤฦฐแปฃc" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "khรดng thแป tแบกo tแบญp tin tแบกm thแปi" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "khรดng thแป ฤแปi tรชn tแบญp tin tแบกm thแปi thร nh %s" -#: transport.c:116 -#, c-format -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:142 -#, c-format -msgid "could not read bundle '%s'" -msgstr "khรดng thแป ฤแปc bรณ โ%sโ" - -#: 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: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: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: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: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: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: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:945 -msgid "git-over-rsync is no longer supported" -msgstr "git-over-rsync khรดng cรฒn ฤฦฐแปฃc hแป trแปฃ nแปฏa" - -#: transport.c:1040 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -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:1044 -#, 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" -"Hรฃy thแปญ\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"hoแบทc cd ฤแบฟn ฤฦฐแปng dแบซn vร dรนng\n" -"\n" -"\tgit push\n" -"\n" -"ฤแป ฤแบฉy chรบng lรชn mรกy phแปฅc vแปฅ.\n" -"\n" - -#: transport.c:1052 -msgid "Aborting." -msgstr "Bรฃi bแป." - -#: 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: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:51 transport-helper.c:80 +#: transport-helper.c:62 transport-helper.c:91 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:134 +#: transport-helper.c:145 #, 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:150 transport-helper.c:559 +#: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" msgstr "khรดng thแป nhรขn ฤรดi fd dแบงu ra bแป hแป trแปฃ" -#: transport-helper.c:201 +#: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7437,169 +8476,276 @@ 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:207 +#: transport-helper.c:220 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:274 transport-helper.c:414 +#: transport-helper.c:287 transport-helper.c:429 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s said bแบฅt ngแป: โ%sโ" -#: transport-helper.c:403 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "%s cลฉng khรณa %s" -#: transport-helper.c:481 +#: transport-helper.c:497 msgid "couldn't run fast-import" msgstr "khรดng thแป chแบกy fast-import" -#: transport-helper.c:504 +#: transport-helper.c:520 msgid "error while running fast-import" msgstr "gแบทp lแปi trong khi chแบกy fast-import" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:549 transport-helper.c:1226 #, c-format msgid "could not read ref %s" msgstr "khรดng thแป ฤแปc tham chiแบฟu %s" -#: transport-helper.c:578 +#: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" msgstr "khรดng hiแปu ฤรกp แปฉng ฤแป kแบฟt nแปi: %s" -#: transport-helper.c:600 +#: transport-helper.c:616 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:602 +#: transport-helper.c:618 msgid "invalid remote service path" msgstr "ฤฦฐแปng dแบซn dแปch vแปฅ mรกy chแปง khรดng hแปฃp lแป" -#: transport-helper.c:648 +#: transport-helper.c:661 transport.c:1428 +msgid "operation not supported by protocol" +msgstr "thao tรกc khรดng ฤฦฐแปฃc gia thแปฉc hแป trแปฃ" + +#: transport-helper.c:664 #, 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:720 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "'option' khรดng cรณ chแป thแป 'ok/error' tฦฐฦกng แปฉng" + +#: transport-helper.c:788 #, 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:773 +#: transport-helper.c:841 #, 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:834 +#: transport-helper.c:924 #, c-format msgid "helper %s does not support dry-run" msgstr "helper %s khรดng hแป trแปฃ dry-run" -#: transport-helper.c:837 +#: transport-helper.c:927 #, c-format msgid "helper %s does not support --signed" msgstr "helper %s khรดng hแป trแปฃ --signed" -#: transport-helper.c:840 +#: transport-helper.c:930 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "helper %s khรดng hแป trแปฃ --signed=if-asked" -#: transport-helper.c:847 +#: transport-helper.c:935 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "helper %s khรดng hแป trแปฃ --atomic" + +#: transport-helper.c:941 #, c-format msgid "helper %s does not support 'push-option'" msgstr "helper %s khรดng hแป trแปฃ โpush-optionโ" -#: transport-helper.c:945 +#: transport-helper.c:1040 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:950 +#: transport-helper.c:1045 #, c-format msgid "helper %s does not support 'force'" msgstr "helper %s khรดng hแป trแปฃ โforceโ" -#: transport-helper.c:997 +#: transport-helper.c:1092 msgid "couldn't run fast-export" msgstr "khรดng thแป chแบกy fast-export" -#: transport-helper.c:1002 +#: transport-helper.c:1097 msgid "error while running fast-export" msgstr "gแบทp lแปi trong khi chแบกy fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1122 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" msgstr "" "Khรดng cรณ cรกc tham chiแบฟu trong phแบงn chung vร chฦฐa chแป ฤแปnh; nรชn khรดng lร m gรฌ " "cแบฃ.\n" -"Tuy nhiรชn bแบกn nรชn chแป ฤแปnh mแปt nhรกnh nhฦฐ โmasterโ chแบณng hแบกn.\n" +"Tuy nhiรชn bแบกn nรชn chแป ฤแปnh mแปt nhรกnh.\n" + +#: transport-helper.c:1203 +#, c-format +msgid "unsupported object format '%s'" +msgstr "khรดng hแป trแปฃ ฤแปnh dแบกng ฤแปi tฦฐแปฃng โ%sโ" -#: transport-helper.c:1091 +#: transport-helper.c:1212 #, 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:1244 +#: transport-helper.c:1364 #, c-format msgid "read(%s) failed" msgstr "read(%s) gแบทp lแปi" -#: transport-helper.c:1271 +#: transport-helper.c:1391 #, c-format msgid "write(%s) failed" msgstr "write(%s) gแบทp lแปi" -#: transport-helper.c:1320 +#: transport-helper.c:1440 #, c-format msgid "%s thread failed" msgstr "tuyแบฟn trรฌnh %s gแบทp lแปi" -#: transport-helper.c:1324 +#: transport-helper.c:1444 #, 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:1343 transport-helper.c:1347 +#: transport-helper.c:1463 transport-helper.c:1467 #, 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:1384 +#: transport-helper.c:1504 #, c-format msgid "%s process failed to wait" msgstr "xแปญ lรฝ %s gแบทp lแปi khi ฤแปฃi" -#: transport-helper.c:1388 +#: transport-helper.c:1508 #, c-format msgid "%s process failed" msgstr "xแปญ lรฝ %s gแบทp lแปi" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1526 transport-helper.c:1535 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:33 +#: transport.c:116 +#, c-format +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 +#, c-format +msgid "could not read bundle '%s'" +msgstr "khรดng thแป ฤแปc bรณ โ%sโ" + +#: transport.c:220 +#, 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:269 +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:270 +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:712 +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:785 +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:919 +#, 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:985 +#, c-format +msgid "transport '%s' not allowed" +msgstr "khรดng cho phรฉp phฦฐฦกng thแปฉc vแบญn chuyแปn โ%sโ" + +#: transport.c:1038 +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync khรดng cรฒn ฤฦฐแปฃc hแป trแปฃ nแปฏa" + +#: transport.c:1140 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +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:1144 +#, 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" +"Hรฃy thแปญ\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"hoแบทc cd ฤแบฟn ฤฦฐแปng dแบซn vร dรนng\n" +"\n" +"\tgit push\n" +"\n" +"ฤแป ฤแบฉy chรบng lรชn mรกy phแปฅc vแปฅ.\n" +"\n" + +#: transport.c:1152 +msgid "Aborting." +msgstr "Bรฃi bแป." + +#: transport.c:1297 +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" + +#: tree-walk.c:32 msgid "too-short tree object" msgstr "ฤแปi tฦฐแปฃng cรขy quรก ngแบฏn" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "chแบฟ ฤแป dแป hรฌnh trong ฤแป mแปฅc cรขy" -#: tree-walk.c:43 +#: tree-walk.c:42 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:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "tแบญp tin cรขy quรก ngแบฏn" -#: unpack-trees.c:111 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7610,7 +8756,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:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7620,7 +8766,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7631,7 +8777,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:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7641,7 +8787,7 @@ msgstr "" "hรฒa trแปn:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7651,7 +8797,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:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7661,7 +8807,7 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7671,7 +8817,7 @@ msgstr "" "trong nรณ:\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7681,7 +8827,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:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7691,7 +8837,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7701,7 +8847,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:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7711,7 +8857,7 @@ msgstr "" "trแปn:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7720,7 +8866,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:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7729,7 +8875,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:150 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7740,7 +8886,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:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7751,7 +8897,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7761,7 +8907,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:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7771,7 +8917,7 @@ msgstr "" "hรฒa trแปn:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7781,7 +8927,7 @@ msgstr "" "%s:\n" "%%sVui lรฒng di chuyแปn hay gแปก bแป chรบng trฦฐแปc khi bแบกn %s." -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7791,61 +8937,71 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:172 #, 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:173 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" 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" +"Khรดng thแป cแบญp nhแบญt mรด-ฤun-con:\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"Cรกc tแบญp tin cรขy lร m viแปc chฦฐa ฤฦฐแปฃc theo dรตi sau ฤรขy sแบฝ bแป ghi ฤรจ bแปi cแบญp " -"nhแบญt checkout rแบฃi rรกc:\n" +"Cรกc ฤฦฐแปng dแบซn sau ฤรขy khรดng ฤฦฐแปฃc cแบญp nhแบญt vร vแบซn ฤฦฐแปฃc ฤแป lแบกi bแบฅt chแบฅp cรกc " +"mแบซu sparse:\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"Cรกc tแบญp tin cรขy lร m viแปc chฦฐa ฤฦฐแปฃc theo dรตi sau ฤรขy sแบฝ bแป xรณa bแป bแปi cแบญp " -"nhแบญt checkout rแบฃi rรกc:\n" +"Cรกc ฤฦฐแปng dแบซn theo sau ฤรขy chฦฐa ฤฦฐแปฃc hรฒa trแปn vร ฤแป bแบฅt chแบฅp cรกc mแบซu " +"sparse:\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"Khรดng thแป cแบญp nhแบญt mรด-ฤun-con:\n" +"Cรกc ฤฦฐแปng dแบซn sau ฤรขy ฤรฃ sแบตn hiแปn diแปn vร nhฦฐ vแบญy khรดng ฤฦฐแปฃc cแบญp nhแบญt bแบฅt " +"cแบฅp cรกc mแบซu sparse:\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "Bรฃi bแป\n" -#: unpack-trees.c:318 +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" +"Sau khi sแปญa cรกc ฤฦฐแปng dแบซn phรญa trรชn, bแบกn cรณ thแป chแบกy `git sparse-checkout " +"reapply`.\n" + +#: unpack-trees.c:350 msgid "Updating files" msgstr "ฤang cแบญp nhแบญt cรกc tแบญp tin" -#: unpack-trees.c:350 +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7855,6 +9011,14 @@ 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:1498 +msgid "Updating index flags" +msgstr "ฤang cแบญp nhแบญt cรกc cแป mแปฅc lแปฅc" + +#: upload-pack.c:1516 +msgid "expected flush after fetch arguments" +msgstr "cแบงn ฤแบฉy dแปฏ liแปu lรชn ฤฤฉa sau cรกc tham sแป cแปงa lแปnh fetch" + #: 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แป โ://โ" @@ -7884,48 +9048,88 @@ 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แป" -#: worktree.c:258 builtin/am.c:2095 +#: walker.c:170 +msgid "Fetching objects" +msgstr "ฤang lแบฅy vแป cรกc ฤแปi tฦฐแปฃng" + +#: worktree.c:236 builtin/am.c:2116 #, c-format msgid "failed to read '%s'" msgstr "gแบทp lแปi khi ฤแปc โ%sโ" -#: worktree.c:304 +#: worktree.c:283 #, 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:315 +#: worktree.c:294 #, 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:327 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "\"%s\" khรดng tแปn tแบกi" -#: worktree.c:333 +#: worktree.c:312 #, 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:341 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "โ%sโ khรดng chแป ngฦฐแปฃc ฤแบฟn โ%sโ" -#: wrapper.c:223 wrapper.c:393 +#: worktree.c:587 +msgid "not a directory" +msgstr "khรดng phแบฃi thฦฐ mแปฅc" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr ".git khรดng phแบฃi lร mแปt tแบญp tin" + +#: worktree.c:598 +msgid ".git file broken" +msgstr "tแปp .git bแป hแปng" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr "tแบญp tin .git khรดng chรญnh xรกc" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "khรดng phแบฃi lร mแปt ฤฦฐแปng dแบซn hแปฃp lแป" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "khรดng thแป phรขn bแป kho chแปฉa; .git khรดng phแบฃi lร mแปt tแบญp tin" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "khรดng thแป phรขn bแป kho chแปฉa; tแบญp tin .git bแป hแปng" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "gitdir khรดng thแป ฤแปc ฤฦฐแปฃc" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "gitdir khรดng chรญnh xรกc" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "khรดng thแป mแป โ%sโ ฤแป ฤแปc vร ghi" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "khรดng thแป truy cแบญp โ%sโ" -#: wrapper.c:632 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "khรดng thแป lแบฅy thฦฐ mแปฅc lร m viแปc hiแปn hร nh" @@ -7962,11 +9166,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (dรนng \"git rm <tแบญp-tin>โฆ\" ฤแป ฤรกnh dแบฅu lร cแบงn giแบฃi quyแบฟt)" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "Nhแปฏng thay ฤแปi sแบฝ ฤฦฐแปฃc chuyแปn giao:" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "Cรกc thay ฤแปi chฦฐa ฤฦฐแปฃc ฤแบทt lรชn bแป phรณng ฤแป chuyแปn giao:" @@ -7998,93 +9202,93 @@ msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (dรนng \"git %s <tแบญp-tin>โฆ\" ฤแป thรชm vร o nhแปฏng gรฌ cแบงn ฤฦฐแปฃc chuyแปn giao)" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "bแป xรณa bแปi cแบฃ hai:" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "ฤฦฐแปฃc thรชm vร o bแปi chรบng ta:" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "bแป xรณa ฤi bแปi hแป:" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "ฤฦฐแปฃc thรชm vร o bแปi hแป:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "bแป xรณa bแปi chรบng ta:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "ฤฦฐแปฃc thรชm vร o bแปi cแบฃ hai:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "bแป sแปญa bแปi cแบฃ hai:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "tแบญp tin mแปi:" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "ฤรฃ chรฉp:" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "ฤรฃ xรณa:" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "ฤรฃ sแปญa:" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "ฤรฃ ฤแปi tรชn:" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "ฤแปi-kiแปu:" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "khรดng hiแปu:" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "chฦฐa hรฒa trแปn:" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "lแบงn chuyแปn giao mแปi, " -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "nแปi dung bแป sแปญa ฤแปi, " -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "nแปi dung chฦฐa ฤฦฐแปฃc theo dรตi, " -#: wt-status.c:906 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Bแบกn hiแปn nay แป trong phแบงn cแบฅt ฤi ฤang cรณ %d mแปฅc" -#: wt-status.c:938 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "Nhแปฏng mรด-ฤun-con ฤรฃ bแป thay ฤแปi nhฦฐng chฦฐa ฤฦฐแปฃc cแบญp nhแบญt:" -#: wt-status.c:940 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "Nhแปฏng mรด-ฤun-con thay ฤแปi ฤรฃ ฤฦฐแปฃc chuyแปn giao:" -#: wt-status.c:1022 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -8092,7 +9296,7 @@ msgstr "" "Khรดng sแปญa hay xรณa bแป ฤฦฐแปng แป trรชn.\n" "Mแปi thแปฉ phรญa dฦฐแปi sแบฝ ฤฦฐแปฃc xรณa bแป." -#: wt-status.c:1114 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -8103,109 +9307,109 @@ msgstr "" "Nรณ cแบงn %.2f giรขy ฤแป tรญnh toรกn giรก trแป cแปงa trฦฐแปc/sau cแปงa nhรกnh.\n" "Bแบกn cรณ thแป dรนng '--no-ahead-behind' trรกnh phแบฃi ฤiแปu nร y.\n" -#: wt-status.c:1144 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "Bแบกn cรณ nhแปฏng ฤฦฐแปng dแบซn chฦฐa ฤฦฐแปฃc hรฒa trแปn." -#: wt-status.c:1147 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr " (sแปญa cรกc xung ฤแปt rแปi chแบกy \"git commit\")" -#: wt-status.c:1149 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (dรนng \"git merge --abort\" ฤแป bรฃi bแป viแปc hรฒa trแปn)" -#: wt-status.c:1153 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "Tแบฅt cแบฃ cรกc xung ฤแปt ฤรฃ ฤฦฐแปฃc giแบฃi quyแบฟt nhฦฐng bแบกn vแบซn ฤang hรฒa trแปn." -#: wt-status.c:1156 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr " (dรนng \"git commit\" ฤแป hoร n tแบฅt viแปc hรฒa trแปn)" -#: wt-status.c:1165 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "Bแบกn ฤang แป giแปฏa cแปงa mแปt phiรชn โamโ." -#: wt-status.c:1168 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "Miแบฟng vรก hiแปn tแบกi bแป trแปng rแปng." -#: wt-status.c:1172 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (sแปญa cรกc xung ฤแปt vร sau ฤรณ chแบกy lแปnh \"git am --continue\")" -#: wt-status.c:1174 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (dรนng \"git am --skip\" ฤแป bแป qua miแบฟng vรก nร y)" -#: wt-status.c:1176 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (dรนng \"git am --abort\" ฤแป phแปฅc hแปi lแบกi nhรกnh nguyรชn thแปงy)" -#: wt-status.c:1309 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "thiแบฟu git-rebase-todo." -#: wt-status.c:1311 +#: wt-status.c:1307 msgid "No commands done." msgstr "Khรดng thแปฑc hiแปn lแปnh nร o." -#: wt-status.c:1314 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Lแปnh thแปฑc hiแปn cuแปi (%d lแปnh ฤฦฐแปฃc thแปฑc thi):" -#: wt-status.c:1325 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " (xem thรชm trong %s)" -#: wt-status.c:1330 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "Khรดng cรณ lแปnh nร o cรฒn lแบกi." -#: wt-status.c:1333 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Lแปnh cแบงn lร m kแบฟ tiแบฟp (%d lแปnh cรฒn lแบกi):" -#: wt-status.c:1341 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (dรนng lแปnh \"git rebase --edit-todo\" ฤแป xem vร sแปญa)" -#: wt-status.c:1353 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Bแบกn hiแปn nay ฤang thแปฑc hiแปn viแปc โrebaseโ nhรกnh โ%sโ trรชn โ%sโ." -#: wt-status.c:1358 +#: wt-status.c:1354 msgid "You are currently rebasing." -msgstr "Bแบกn hiแปn nay ฤang thแปฑc hiแปn viแปc โrebaseโ (โcแบฃi tแปโ)." +msgstr "Bแบกn hiแปn nay ฤang thแปฑc hiแปn viแปc โrebaseโ (cแบฃi tแป)." -#: wt-status.c:1371 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (sแปญa cรกc xung ฤแปt vร sau ฤรณ chแบกy lแปnh โcแบฃi tแปโ \"git rebase --continue\")" -#: wt-status.c:1373 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (dรนng lแปnh โcแบฃi tแปโ \"git rebase --skip\" ฤแป bแป qua lแบงn vรก nร y)" -#: wt-status.c:1375 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (dรนng lแปnh โcแบฃi tแปโ \"git rebase --abort\" ฤแป check-out nhรกnh nguyรชn thแปงy)" -#: wt-status.c:1382 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (khi tแบฅt cแบฃ cรกc xung ฤแปt ฤรฃ sแปญa xong: chแบกy lแปnh โcแบฃi tแปโ \"git rebase --" "continue\")" -#: wt-status.c:1386 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -8213,90 +9417,98 @@ msgstr "" "Bแบกn hiแปn nay ฤang thแปฑc hiแปn viแปc chia tรกch mแปt lแบงn chuyแปn giao trong khi " "ฤang โrebaseโ nhรกnh โ%sโ trรชn โ%sโ." -#: wt-status.c:1391 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "" "Bแบกn hiแปn tแบกi ฤang cแบฏt ฤรดi mแปt lแบงn chuyแปn giao trong khi ฤang thแปฑc hiแปn viแปc " "rebase." -#: wt-status.c:1394 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Mแปt khi thฦฐ mแปฅc lร m viแปc cแปงa bแบกn ฤรฃ gแปn gร ng, chแบกy lแปnh โcแบฃi tแปโ \"git " "rebase --continue\")" -#: wt-status.c:1398 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Bแบกn hiแปn nay ฤang thแปฑc hiแปn viแปc sแปญa chแปฏa mแปt lแบงn chuyแปn giao trong khi ฤang " "rebase nhรกnh โ%sโ trรชn โ%sโ." -#: wt-status.c:1403 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "Bแบกn hiแปn ฤang sแปญa mแปt lแบงn chuyแปn giao trong khi bแบกn thแปฑc hiแปn rebase." -#: wt-status.c:1406 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (dรนng \"git commit --amend\" ฤแป โtu bแปโ lแบงn chuyแปn giao hiแปn tแบกi)" -#: wt-status.c:1408 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (chแบกy lแปnh โcแบฃi tแปโ \"git rebase --continue\" mแปt khi bแบกn cแบฃm thแบฅy hร i " "lรฒng vแป nhแปฏng thay ฤแปi cแปงa mรฌnh)" -#: wt-status.c:1419 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick hiแปn tแบกi ฤang ฤฦฐแปฃc thแปฑc hiแปn." -#: wt-status.c:1422 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Bแบกn hiแปn nay ฤang thแปฑc hiแปn viแปc cherry-pick lแบงn chuyแปn giao %s." -#: wt-status.c:1429 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (sแปญa cรกc xung ฤแปt vร sau ฤรณ chแบกy lแปnh \"git cherry-pick --continue\")" -#: wt-status.c:1432 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (chแบกy lแปnh \"git cherry-pick --continue\" ฤแป tiแบฟp tแปฅc)" -#: wt-status.c:1435 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (khi tแบฅt cแบฃ cรกc xung ฤแปt ฤรฃ sแปญa xong: chแบกy lแปnh \"git cherry-pick --" "continue\")" -#: wt-status.c:1437 +#: wt-status.c:1433 +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:1435 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:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "Hoร n nguyรชn hiแปn tแบกi ฤang thแปฑc hiแปn." -#: wt-status.c:1450 +#: wt-status.c:1448 #, 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:1456 +#: wt-status.c:1454 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:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr " (chแบกy lแปnh \"git revert --continue\" ฤแป tiแบฟp tแปฅc)" -#: wt-status.c:1462 +#: wt-status.c:1460 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:1462 +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: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)" @@ -8316,39 +9528,46 @@ msgstr "Bแบกn hiแปn tแบกi ฤang thแปฑc hiแปn viแปc bisect (di chuyแปn nแปญa 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:1690 +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "" +"Bแบกn ฤang แป trong lแบงn lแบฅy ra sparser %d%% cแปงa cรกc tแบญp tin ฤฦฐแปฃc theo dรตi hiแปn " +"tแบกi." + +#: wt-status.c:1731 msgid "On branch " msgstr "Trรชn nhรกnh " -#: wt-status.c:1697 +#: wt-status.c:1738 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:1699 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "rebase ฤang ฤฦฐแปฃc thแปฑc hiแปn: lรชn trรชn " -#: wt-status.c:1709 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "Hiแปn tแบกi chแบณng แป nhรกnh nร o cแบฃ." -#: wt-status.c:1726 +#: wt-status.c:1767 msgid "Initial commit" msgstr "Lแบงn chuyแปn giao khแปi tแบกo" -#: wt-status.c:1727 +#: wt-status.c:1768 msgid "No commits yet" msgstr "Vแบซn chฦฐa chuyแปn giao" -#: wt-status.c:1741 +#: wt-status.c:1782 msgid "Untracked files" msgstr "Nhแปฏng tแบญp tin chฦฐa ฤฦฐแปฃc theo dรตi" -#: wt-status.c:1743 +#: wt-status.c:1784 msgid "Ignored files" msgstr "Nhแปฏng tแบญp tin bแป lแป ฤi" -#: wt-status.c:1747 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8360,32 +9579,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:1753 +#: wt-status.c:1794 #, 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:1755 +#: wt-status.c:1796 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:1761 +#: wt-status.c:1802 msgid "No changes" msgstr "Khรดng cรณ thay ฤแปi nร o" -#: wt-status.c:1766 +#: wt-status.c:1807 #, 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:1769 +#: wt-status.c:1811 #, 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:1772 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8394,200 +9613,209 @@ 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:1775 +#: wt-status.c:1819 #, 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:1778 +#: wt-status.c:1823 #, 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:1781 wt-status.c:1786 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "khรดng cรณ gรฌ ฤแป chuyแปn giao\n" -#: wt-status.c:1784 +#: wt-status.c:1830 #, 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:1788 +#: wt-status.c:1835 #, 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:1901 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "Vแบซn khรดng thแปฑc hiแปn lแปnh chuyแปn giao nร o " -#: wt-status.c:1905 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD (khรดng nhรกnh)" -#: wt-status.c:1936 +#: wt-status.c:1975 msgid "different" msgstr "khรกc" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "ฤแบฑng sau " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "phรญa trฦฐแปc " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2505 #, 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:2472 +#: wt-status.c:2511 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:2474 +#: wt-status.c:2513 #, 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." -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#, c-format +msgid "failed to unlink '%s'" +msgstr "gแบทp lแปi khi bแป liรชn kแบฟt (unlink) โ%sโ" + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<cรกc tรนy chแปn>] [--] <pathspec>โฆ" -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "trแบกng thรกi lแปnh diff khรดng nhฦฐ mong ฤแปฃi %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "cแบญp nhแบญt tแบญp tin gแบทp lแปi" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "gแปก bแป โ%sโ\n" -#: builtin/add.c:174 +#: builtin/add.c:178 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:234 builtin/rev-parse.c:896 +#: builtin/add.c:272 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "Khรดng thแป ฤแปc bแบฃng mแปฅc lแปฅc" -#: builtin/add.c:245 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "Khรดng thแป mแป โ%sโ ฤแป ghi." -#: builtin/add.c:249 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "Khรดng thแป ghi ra miแบฟng vรก" -#: builtin/add.c:252 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "gแบทp lแปi khi sแปญa miแบฟng vรก" -#: builtin/add.c:255 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "Khรดng thแป lแบฅy thรดng tin thแปng kรช vแป โ%sโ" -#: builtin/add.c:257 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "Miแบฟng vรก trแปng rแปng. Nรชn bแป qua." -#: builtin/add.c:262 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "Khรดng thแป รกp dแปฅng miแบฟng vรก โ%sโ" -#: builtin/add.c:270 +#: builtin/add.c:308 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: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 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 msgid "dry run" msgstr "chแบกy thแปญ" -#: builtin/add.c:293 +#: builtin/add.c:331 msgid "interactive picking" msgstr "sแปญa bแบฑng cรกch tฦฐฦกng tรกc" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 msgid "select hunks interactively" msgstr "chแปn โhunksโ theo kiแปu tฦฐฦกng tรกc" -#: builtin/add.c:295 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "sแปญa diff hiแปn nay vร รกp dแปฅng nรณ" -#: builtin/add.c:296 +#: builtin/add.c:334 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:297 +#: builtin/add.c:335 msgid "update tracked files" msgstr "cแบญp nhแบญt cรกc tแบญp tin ฤฦฐแปฃc theo dรตi" -#: builtin/add.c:298 +#: builtin/add.c:336 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:299 +#: builtin/add.c:337 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:300 +#: builtin/add.c:338 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:303 +#: builtin/add.c:341 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:305 +#: builtin/add.c:343 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:306 +#: builtin/add.c:344 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:307 +#: builtin/add.c:345 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:309 builtin/update-index.c:1001 +#: builtin/add.c:347 builtin/update-index.c:1004 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:311 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "cแบฃnh bรกo khi thรชm mแปt kho nhรบng" -#: builtin/add.c:326 +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "แปฉng dแปฅng chแบกy phรญa sau cho 'git stash -p'" + +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8618,150 +9846,179 @@ msgstr "" "\n" "Xem \"git help submodule\" ฤแป biแบฟt thรชm chi tiแบฟt." -#: builtin/add.c:354 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "thรชm cแบงn mแปt kho git nhรบng: %s" -#: 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:416 +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:379 +#: builtin/add.c:425 msgid "adding files failed" msgstr "thรชm tแบญp tin gแบทp lแปi" -#: builtin/add.c:419 +#: builtin/add.c:453 builtin/commit.c:345 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--pathspec-from-file xung khแบฏc vแปi --interactive/--patch" + +#: builtin/add.c:470 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file xung khแบฏc vแปi --edit" + +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "-A vร -u xung khแบฏc nhau" -#: builtin/add.c:426 +#: builtin/add.c:485 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:430 +#: builtin/add.c:489 #, 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:445 +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +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:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul cแบงn --pathspec-from-file" + +#: builtin/add.c:518 #, 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:446 +#: builtin/add.c:520 +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/am.c:160 #, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Cรณ lแบฝ รฝ bแบกn lร โgit add .โ phแบฃi khรดng?\n" +msgid "invalid committer: %s" +msgstr "chuyแปn giao khรดng hแปฃp lแป: %s" -#: builtin/am.c:348 +#: builtin/am.c:366 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:432 +#: builtin/am.c:450 #, 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:474 +#: builtin/am.c:492 #, c-format msgid "Malformed input line: '%s'." msgstr "Dรฒng ฤแบงu vร o dแป hรฌnh: โ%sโ." -#: builtin/am.c:512 +#: builtin/am.c:530 #, 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:538 +#: builtin/am.c:556 msgid "fseek failed" msgstr "fseek gแบทp lแปi" -#: builtin/am.c:726 +#: builtin/am.c:744 #, c-format msgid "could not parse patch '%s'" msgstr "khรดng thแป phรขn tรญch cรบ phรกp โ%sโ" -#: builtin/am.c:791 +#: builtin/am.c:809 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:839 +#: builtin/am.c:857 msgid "invalid timestamp" msgstr "dแบฅu thแปi gian khรดng hแปฃp lแป" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:862 builtin/am.c:874 msgid "invalid Date line" msgstr "dรฒng Ngร y thรกng khรดng hแปฃp lแป" -#: builtin/am.c:851 +#: builtin/am.c:869 msgid "invalid timezone offset" msgstr "ฤแป lแปch mรบi giแป khรดng hแปฃp lแป" -#: builtin/am.c:944 +#: builtin/am.c:962 msgid "Patch format detection failed." msgstr "Dรฒ tรฌm ฤแปnh dแบกng miแบฟng vรก gแบทp lแปi." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:967 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "tแบกo thฦฐ mแปฅc \"%s\" gแบทp lแปi" -#: builtin/am.c:954 +#: builtin/am.c:972 msgid "Failed to split patches." msgstr "Gแบทp lแปi khi chia nhแป cรกc miแบฟng vรก." -#: 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 +#: builtin/am.c:1103 #, 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\"." +msgstr "Khi bแบกn ฤรฃ giแบฃi quyแบฟt xong trแปฅc trแบทc nร y, hรฃy chแบกy \"%s --continue\"." -#: builtin/am.c:1099 +#: builtin/am.c:1104 #, 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:1100 +#: builtin/am.c:1105 #, 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:1183 +#: builtin/am.c:1188 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:1211 +#: builtin/am.c:1216 msgid "Patch is empty." msgstr "Miแบฟng vรก trแปng rแปng." -#: builtin/am.c:1277 +#: builtin/am.c:1281 #, c-format -msgid "invalid ident line: %.*s" -msgstr "dรฒng thแปฅt lแป khรดng hแปฃp lแป: %.*s" +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:1299 +#: builtin/am.c:1284 #, c-format -msgid "unable to parse commit %s" -msgstr "khรดng thแป phรขn tรญch lแบงn chuyแปn giao โ%sโ" +msgid "invalid ident line: %.*s" +msgstr "dรฒng ฤแปnh danh khรดng hแปฃp lแป: %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1503 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โ." +msgstr "Kho thiแบฟu ฤแปi tฦฐแปฃng blob cแบงn thiแบฟt ฤแป thแปฑc hiแปn โ3-way mergeโ." -#: builtin/am.c:1498 +#: builtin/am.c:1505 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:1517 +#: builtin/am.c:1524 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8769,24 +10026,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:1523 +#: builtin/am.c:1530 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โโฆ" +msgstr "ฤang dรนng phฦฐฦกng รกn dแปฑ phรฒng: vรก bแบฃn cฦก sแป vร โhรฒa trแปn 3-ฤฦฐแปngโโฆ" -#: builtin/am.c:1549 +#: builtin/am.c:1556 msgid "Failed to merge in the changes." msgstr "Gแบทp lแปi khi trแปn vร o cรกc thay ฤแปi." -#: builtin/am.c:1581 +#: builtin/am.c:1588 msgid "applying to an empty history" msgstr "รกp dแปฅng vร o mแปt lแปch sแปญ trแปng rแปng" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1639 builtin/am.c:1643 #, 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:1650 +#: builtin/am.c:1661 msgid "Commit Body is:" msgstr "Thรขn cแปงa lแบงn chuyแปn giao lร :" @@ -8794,37 +10051,41 @@ 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:1660 +#: builtin/am.c:1671 #, 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:1710 +#: builtin/am.c:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "khรดng thแป ghi tแบญp tin lฦฐu mแปฅc lแปฅc" + +#: builtin/am.c:1721 #, 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:1750 builtin/am.c:1818 +#: builtin/am.c:1761 builtin/am.c:1829 #, c-format msgid "Applying: %.*s" msgstr "รp dแปฅng: %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1778 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:1773 +#: builtin/am.c:1784 #, c-format msgid "Patch failed at %s %.*s" msgstr "Gแบทp lแปi khi vรก tแบกi %s %.*s" -#: 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:1788 +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:1821 +#: builtin/am.c:1832 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8835,7 +10096,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:1828 +#: builtin/am.c:1839 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8848,17 +10109,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:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Khรดng thแป phรขn tรญch ฤแปi tฦฐแปฃng โ%sโ." -#: builtin/am.c:1987 +#: builtin/am.c:1998 msgid "failed to clean index" msgstr "gแบทp lแปi khi dแปn bแบฃng mแปฅc lแปฅc" -#: builtin/am.c:2031 +#: builtin/am.c:2042 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8866,144 +10127,156 @@ 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:2128 +#: builtin/am.c:2149 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Giรก trแป khรดng hแปฃp lแป cho --patch-format: %s" -#: builtin/am.c:2164 +#: builtin/am.c:2191 +#, 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:2195 +#, 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:2226 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<cรกc tรนy chแปn>] [(<mbox>|<Maildir>)โฆ]" -#: builtin/am.c:2165 +#: builtin/am.c:2227 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<cรกc tรนy chแปn>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2233 msgid "run interactively" msgstr "chแบกy kiแปu tฦฐฦกng tรกc" -#: builtin/am.c:2173 +#: builtin/am.c:2235 msgid "historical option -- no-op" msgstr "tรนy chแปn lแปch sแปญ -- khรดng-toรกn-tแปญ" -#: builtin/am.c:2175 +#: builtin/am.c:2237 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:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 msgid "be quiet" msgstr "im lแบทng" -#: builtin/am.c:2178 +#: builtin/am.c:2240 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:2181 +#: builtin/am.c:2243 msgid "recode into utf8 (default)" msgstr "chuyแปn mรฃ thร nh utf8 (mแบทc ฤแปnh)" -#: builtin/am.c:2183 +#: builtin/am.c:2245 msgid "pass -k flag to git-mailinfo" msgstr "chuyแปn cแป -k cho git-mailinfo" -#: builtin/am.c:2185 +#: builtin/am.c:2247 msgid "pass -b flag to git-mailinfo" msgstr "chuyแปn cแป -b cho git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2249 msgid "pass -m flag to git-mailinfo" msgstr "chuyแปn cแป -m cho git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2251 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:2192 +#: builtin/am.c:2254 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:2195 +#: builtin/am.c:2257 msgid "strip everything before a scissors line" msgstr "cแบฏt mแปi thแปฉ trฦฐแปc dรฒng scissors" -#: 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 +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 msgid "pass it through git-apply" msgstr "chuyแปn nรณ qua git-apply" -#: 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:141 parse-options.h:162 parse-options.h:312 +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: 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 +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "ฤแปnh dแบกng" -#: builtin/am.c:2221 +#: builtin/am.c:2283 msgid "format the patch(es) are in" msgstr "ฤแปnh dแบกng (cรกc) miแบฟng vรก theo" -#: builtin/am.c:2227 +#: builtin/am.c:2289 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:2229 +#: builtin/am.c:2291 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:2232 +#: builtin/am.c:2294 msgid "synonyms for --continue" msgstr "ฤแปng nghฤฉa vแปi --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2297 msgid "skip the current patch" msgstr "bแป qua miแบฟng vรก hiแปn hร nh" -#: builtin/am.c:2238 +#: builtin/am.c:2300 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:2241 +#: builtin/am.c:2303 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:2244 -msgid "show the patch being applied." -msgstr "hiแปn thแป miแบฟng vรก ฤรฃ ฤฦฐแปฃc รกp dแปฅng rแปi." +#: builtin/am.c:2307 +msgid "show the patch being applied" +msgstr "hiแปn thแป miแบฟng vรก ฤรฃ ฤฦฐแปฃc รกp dแปฅng rแปi" -#: builtin/am.c:2248 +#: builtin/am.c:2312 msgid "lie about committer date" msgstr "nรณi dแปi vแป ngร y chuyแปn giao" -#: builtin/am.c:2250 +#: builtin/am.c:2314 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: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 +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "mรฃ-sแป-khรณa" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 msgid "GPG-sign commits" msgstr "Cรกc lแบงn chuyแปn giao kรฝ-GPG" -#: builtin/am.c:2256 +#: builtin/am.c:2320 msgid "(internal use for git-rebase)" msgstr "(dรนng nแปi bแป cho git-rebase)" -#: builtin/am.c:2274 +#: builtin/am.c:2338 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." @@ -9011,16 +10284,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:2281 +#: builtin/am.c:2345 msgid "failed to read the index" msgstr "gแบทp lแปi ฤแปc bแบฃng mแปฅc lแปฅc" -#: builtin/am.c:2296 +#: builtin/am.c:2360 #, 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:2320 +#: builtin/am.c:2384 #, c-format msgid "" "Stray %s directory found.\n" @@ -9029,13 +10302,13 @@ 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:2326 +#: builtin/am.c:2390 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:2336 +#: builtin/am.c:2400 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" +msgstr "chแบฟ ฤแป tฦฐฦกng tรกc yรชu cแบงu cรณ cรกc miแบฟng vรก trรชn dรฒng lแปnh" #: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" @@ -9071,23 +10344,23 @@ msgstr "git archive: lแปi giao thแปฉc" msgid "git archive: expected a flush" msgstr "git archive: cแบงn mแปt flush (ฤแบฉy dแปฏ liแปu lรชn ฤฤฉa)" -#: 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 --next-all" +msgstr "git bisect--helper --next-all" + +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "git bisect--helper --write-terms <bad_term> <good_term>" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:25 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<lแบงn_chuyแปn_giao>]" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" @@ -9095,7 +10368,7 @@ msgstr "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <lรบc_sai> " "<lรบc_ฤรบng>" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:28 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" @@ -9103,11 +10376,11 @@ msgstr "" "git bisect--helper --bisect-check-and-set-terms <command> <lรบc_sai> " "<lรบc_ฤรบng>" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "git bisect--helper --bisect-next-check <lรบc_sai> <lรบc_ฤรบng> [<term>]" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:30 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -9115,48 +10388,68 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:31 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<sai> [<ฤรบng>โฆ]] [--] [</cรกc/ฤฦฐแปng/dแบซn>โฆ]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [</cรกc/" +"ฤฦฐแปng/dแบซn>...]" + +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-auto-next" + +#: builtin/bisect--helper.c:35 +msgid "git bisect--helper --bisect-autostart" +msgstr "git bisect--helper --bisect-autostart" + +#: builtin/bisect--helper.c:97 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "khรดng thแป mแป tแบญp tin โ%sโ แป chแบฟ ฤแป โ%sโ" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:104 +#, c-format +msgid "could not write to file '%s'" +msgstr "khรดng thแป ghi vร o tแบญp tin โ%sโ" + +#: builtin/bisect--helper.c:143 #, c-format msgid "'%s' is not a valid term" msgstr "โ%sโ khรดng phแบฃi mแปt thแปi hแบกn hแปฃp lแป" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:147 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "khรดng thแป dรนng lแปnh tรญch hแปฃp โ%sโ nhฦฐ lร mแปt thแปi kแปณ" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "khรดng thแป thay ฤแปi nghฤฉa cแปงa thแปi kแปณ โ%sโ" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:167 msgid "please use two different terms" msgstr "vui lรฒng dรนng hai thแปi kแปณ khรกc nhau" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "khรดng thแป mแป tแบญp tin BISECT_TERMS" - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:207 #, c-format msgid "We are not bisecting.\n" msgstr "Chรบng tรดi ฤang khรดng bisect.\n" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:215 #, c-format 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:174 +#: builtin/bisect--helper.c:224 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -9164,27 +10457,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:215 +#: builtin/bisect--helper.c:268 #, c-format msgid "Bad bisect_write argument: %s" msgstr "ฤแปi sแป bisect_write sai: %s" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:273 #, 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:232 +#: builtin/bisect--helper.c:285 #, c-format msgid "couldn't open the file '%s'" msgstr "khรดng thแป mแป tแบญp tin โ%sโ" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:311 #, 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:285 +#: builtin/bisect--helper.c:338 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9193,7 +10486,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:289 +#: builtin/bisect--helper.c:342 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9204,7 +10497,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:321 +#: builtin/bisect--helper.c:362 #, 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" @@ -9213,15 +10506,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:329 +#: builtin/bisect--helper.c:370 msgid "Are you sure [Y/n]? " msgstr "Bแบกn cรณ chแบฏc chแบฏn chฦฐa [Y/n]? " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:431 msgid "no terms defined" msgstr "chฦฐa ฤแปnh nghฤฉa thแปi kแปณ nร o" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:434 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9230,7 +10523,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:389 +#: builtin/bisect--helper.c:444 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9239,116 +10532,161 @@ 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:475 +#: builtin/bisect--helper.c:511 +msgid "revision walk setup failed\n" +msgstr "gแบทp lแปi cร i ฤแบทt viแปc di chuyแปn qua cรกc ฤiแปm xรฉt duyแปt\n" + +#: builtin/bisect--helper.c:533 +#, c-format +msgid "could not open '%s' for appending" +msgstr "khรดng thแป mแป โ%sโ ฤแป nแปi thรชm" + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +msgid "'' is not a valid term" +msgstr "โ khรดng phแบฃi mแปt thแปi hแบกn hแปฃp lแป" + +#: builtin/bisect--helper.c:674 #, c-format msgid "unrecognized option: '%s'" msgstr "tรนy chแปn khรดng ฤฦฐแปฃc thแปซa nhแบญn: โ%sโ" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:678 #, 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:511 +#: builtin/bisect--helper.c:709 msgid "bad HEAD - I need a HEAD" msgstr "sai HEAD - Tรดi cแบงn mแปt HEAD" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:724 #, 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:547 +#: builtin/bisect--helper.c:745 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:550 +#: builtin/bisect--helper.c:748 msgid "bad HEAD - strange symbolic ref" msgstr "sai HEAD - tham chiแบฟu mแปm kแปณ lแบก" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:775 #, c-format msgid "invalid ref: '%s'" msgstr "refspec khรดng hแปฃp lแป: โ%sโ" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:827 +msgid "You need to start by \"git bisect start\"\n" +msgstr "Bแบกn cแบงn khแปi ฤแบงu bแบฑng \"git bisect start\"\n" + +#. 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:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Bแบกn cรณ muแปn tรดi thแปฑc hiแปn ฤiแปu nร y cho bแบกn khรดng [Y/n]? " + +#: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'" msgstr "thแปฑc hiแปn โgit bisect nextโ" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:868 msgid "write the terms to .git/BISECT_TERMS" msgstr "ghi thแปi kแปณ vร o .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:870 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:636 +#: builtin/bisect--helper.c:872 msgid "check for expected revs" msgstr "kiแปm tra cho ฤiแปm xem xรฉt cแบงn dรนng" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:874 msgid "reset the bisection state" msgstr "ฤแบทt lแบกi trแบกng di chuyแปn nแปญa bฦฐแปc" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:876 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:642 +#: builtin/bisect--helper.c:878 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:644 +#: builtin/bisect--helper.c:880 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:646 +#: builtin/bisect--helper.c:882 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:648 +#: builtin/bisect--helper.c:884 msgid "start the bisect session" msgstr "bแบฏt ฤแบงu phiรชn di chuyแปn nแปญa bฦฐแปc" -#: builtin/bisect--helper.c:650 -msgid "update BISECT_HEAD instead of checking out the current commit" +#: builtin/bisect--helper.c:886 +msgid "find the next bisection commit" +msgstr "tรฌm lแบงn chuyแปn giao khรดng di chuyแปn phรขn ฤรดi" + +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" msgstr "" -"cแบญp nhแบญt BISECT_HEAD thay vรฌ lแบฅy ra (checking out) lแบงn chuyแปn giao hiแปn hร nh" +"xรกc nhแบญn trแบกng thรกi phรขn ฤรดi kแบฟ sau ฤรณ lแบฅy ra lแบงn chuyแปn giao phรขn ฤรดi kแบฟ" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "chแบกy di chuyแปn phรขn ฤรดi nแบฟu nรณ vแบซn chฦฐa ฤฦฐแปฃc khแปi chแบกy" + +#: builtin/bisect--helper.c:892 msgid "no log for BISECT_WRITE" msgstr "khรดng cรณ nhแบญt kรฝ cho BISECT_WRITE" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:910 msgid "--write-terms requires two arguments" msgstr "--write-terms cแบงn hai tham sแป" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:914 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state khรดng nhแบญn ฤแปi sแป" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:921 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:684 +#: builtin/bisect--helper.c:925 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write cแบงn 4 hoแบทc 5 tham sแป" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:931 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms cแบงn 3 tham sแป" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:937 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:702 +#: builtin/bisect--helper.c:943 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms cแบงn 0 hoแบทc 1 tham sแป" +#: builtin/bisect--helper.c:952 +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next cแบงn 0 tham sแป" + +#: builtin/bisect--helper.c:958 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--bisect-auto-next cแบงn 0 tham sแป" + +#: builtin/bisect--helper.c:964 +msgid "--bisect-autostart does not accept arguments" +msgstr "--bisect-autostart khรดng nhแบญn ฤแปi sแป" + #: 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>" @@ -9375,134 +10713,131 @@ msgstr "mร u khรดng hแปฃp lแป โ%sโ trong color.blame.repeatedLines" msgid "invalid value for blame.coloring" msgstr "mร u khรดng hแปฃp lแป cho blame.coloring" -#: builtin/blame.c:823 +#: builtin/blame.c:845 #, 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:845 +#: builtin/blame.c:867 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:846 -msgid "Show blank SHA-1 for boundary commits (Default: off)" +#: builtin/blame.c:868 +msgid "Do not show object names of 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)" +"ฤแปซng hiแปn thแป tรชn ฤแปi tฦฐแปฃng cแปงa nhแปฏng lแบงn chuyแปn giao biรชn giแปi (Mแบทc ฤแปnh: " +"off)" -#: builtin/blame.c:847 +#: builtin/blame.c:869 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:848 +#: builtin/blame.c:870 msgid "Show work cost statistics" msgstr "Hiแปn thแป thแปng kรช cรดng sแปฉc lร m viแปc" -#: builtin/blame.c:849 +#: builtin/blame.c:871 msgid "Force progress reporting" -msgstr "รp buแปc bรกo cรกo tiแบฟn triแปn cรดng viแปc" +msgstr "รp buแปc bรกo cรกo diแป n biแบฟn cรดng viแปc" -#: builtin/blame.c:850 +#: builtin/blame.c:872 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:851 +#: builtin/blame.c:873 msgid "Show original filename (Default: auto)" msgstr "Hiแปn thแป tรชn tแบญp tin gแปc (Mแบทc ฤแปnh: auto)" -#: builtin/blame.c:852 +#: builtin/blame.c:874 msgid "Show original linenumber (Default: off)" msgstr "Hiแปn thแป sแป dรฒng gแปc (Mแบทc ฤแปnh: off)" -#: builtin/blame.c:853 +#: builtin/blame.c:875 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:854 +#: builtin/blame.c:876 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:855 +#: builtin/blame.c:877 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:856 +#: builtin/blame.c:878 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:857 +#: builtin/blame.c:879 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:858 +#: builtin/blame.c:880 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:859 +#: builtin/blame.c:881 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:860 +#: builtin/blame.c:882 msgid "Ignore whitespace differences" msgstr "Bแป qua cรกc khรกc biแปt do khoแบฃng trแบฏng gรขy ra" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:883 builtin/log.c:1808 msgid "rev" msgstr "rev" -#: builtin/blame.c:861 +#: builtin/blame.c:883 msgid "Ignore <rev> when blaming" -msgstr "bแป qua <rev> khi blame" +msgstr "Bแป qua <rev> khi blame" -#: builtin/blame.c:862 +#: builtin/blame.c:884 msgid "Ignore revisions from <file>" msgstr "Bแป qua cรกc ฤiแปm xรฉt duyแปt tแปซ <tแบญp tin>" -#: builtin/blame.c:863 +#: builtin/blame.c:885 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:864 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "cรกc dรฒng mร u theo tuแปi" -#: 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 +#: builtin/blame.c:887 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:874 +#: builtin/blame.c:888 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:875 +#: builtin/blame.c:889 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:876 builtin/blame.c:877 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "ฤiแปm sแป" -#: builtin/blame.c:876 +#: builtin/blame.c:890 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:877 +#: builtin/blame.c:891 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:878 +#: builtin/blame.c:892 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:892 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:929 +#: builtin/blame.c:944 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" @@ -9515,23 +10850,23 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "4 nฤm, 11 thรกng trฦฐแปc" -#: builtin/blame.c:1087 +#: builtin/blame.c:1110 #, 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:1133 +#: builtin/blame.c:1156 msgid "Blaming lines" msgstr "Cรกc dรฒng blame" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [<cรกc tรนy chแปn>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" +msgstr "git branch [<cรกc tรนy chแปn>] [-r | -a] [--merged] [ --no-merged]" #: builtin/branch.c:30 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" @@ -9734,7 +11069,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:485 +#: builtin/branch.c:626 builtin/rebase.c:526 msgid "upstream" msgstr "thฦฐแปฃng nguแปn" @@ -9743,8 +11078,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" @@ -9826,68 +11161,68 @@ msgstr "chแป hiแปn thแป nhแปฏng nhรกnh mร nรณ khรดng ฤฦฐแปฃc hรฒa trแปn" msgid "list branches in columns" msgstr "liแปt kรช cรกc nhรกnh trong cรกc cแปt" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 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 +#: builtin/tag.c:434 msgid "object" msgstr "ฤแปi tฦฐแปฃng" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "chแป hiแปn thแป cรกc nhรกnh cแปงa ฤแปi tฦฐแปฃng" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "sแบฏp xแบฟp vร lแปc lร phรขn biแปt HOA thฦฐแปng" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "ฤแปnh dแบกng sแบฝ dรนng cho ฤแบงu ra" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "Khรดng tรฌm thแบฅy HEAD แป dฦฐแปi refs/heads!" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "tรนy chแปn --column vร --verbose xung khแบฏc nhau" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "cแบงn chแป ra tรชn nhรกnh" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "Khรดng thแป ฤฦฐa ra mรด tแบฃ HEAD ฤรฃ tรกch rแปi" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "khรดng thแป sแปญa mรด tแบฃ cho nhiแปu hฦกn mแปt nhรกnh" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "Vแบซn chฦฐa chuyแปn giao trรชn nhรกnh โ%sโ." -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "Khรดng cรณ nhรกnh nร o cรณ tรชn โ%sโ." -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "quรก nhiแปu nhรกnh dร nh cho thao tรกc sao chรฉp" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "quรก nhiแปu tham sแป cho thao tรกc ฤแปi tรชn" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "quรก nhiแปu tham sแป ฤแป ฤแบทt thฦฐแปฃng nguแปn mแปi" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -9895,30 +11230,30 @@ msgstr "" "khรดng thแป ฤแบทt thฦฐแปฃng nguแปn cแปงa HEAD thร nh %s khi mร nรณ chแบณng chแป ฤแบฟn nhรกnh " "nร o cแบฃ." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "khรดng cรณ nhรกnh nร o nhฦฐ thแบฟ โ%sโ" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "chฦฐa cรณ nhรกnh โ%sโ" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "quรก nhiแปu tham sแป ฤแป bแป ฤแบทt thฦฐแปฃng nguแปn" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "khรดng thแป bแป ฤแบทt thฦฐแปฃng nguแปn cแปงa HEAD khรดng chแป ฤแบฟn mแปt nhรกnh nร o cแบฃ." -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Nhรกnh โ%sโ khรดng cรณ thรดng tin thฦฐแปฃng nguแปn" -#: builtin/branch.c:841 +#: builtin/branch.c:839 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>?" @@ -9927,7 +11262,7 @@ msgstr "" "nhรกnh.\n" "Cรณ phแบฃi รฝ bแบกn lร dรนng: -a|-r --list <mแบซu>?" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -9935,20 +11270,166 @@ 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:45 +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "phiรชn bแบฃn git:\n" + +#: builtin/bugreport.c:21 #, c-format -msgid "%s is okay\n" -msgstr "โ%sโ tแปt\n" +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() gแบทp lแปi '%s' (%d)\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "thรดng tin trรฌnh biรชn dแปch: " -#: builtin/bundle.c:58 +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "thรดng tin libc: " + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "khรดng chแบกy tแปซ mแปt kho git - nรชn chแบณng cรณ mรณc nร o ฤแป mร hiแปn thแป cแบฃ\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "" +"git bugreport [-o|--output-directory <tแบญp_tin>] [-s|--suffix <ฤแปnh_dแบกng>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"Cแบฃm ฦกn bแบกn ฤรฃ tแบกo mแปt bรกo cรกo lแปi Git!\n" +"Vui lรฒng trแบฃ lแปi cรกc cรขu hแปi sau ฤแป giรบp chรบng tรดi hiแปu vแบฅn ฤแป cแปงa bแบกn.\n" +"\n" +"Bแบกn ฤรฃ lร m gรฌ trฦฐแปc khi lแปi xแบฃy ra? (Cรกc bฦฐแปc ฤแป tรกi tแบกo sแปฑ cแป cแปงa bแบกn)\n" +"\n" +"ฤiแปu bแบกn mong muแปn xแบฃy ra? (Hร nh vi dแปฑ kiแบฟn)\n" +"\n" +"ฤiแปu gรฌ ฤรฃ xแบฃy ra thay thแบฟ? (Hร nh vi thแปฑc tแบฟ)\n" +"\n" +"Cรณ gรฌ khรกc biแปt giแปฏa nhแปฏng gรฌ bแบกn mong ฤแปฃi vร nhแปฏng gรฌ thแปฑc sแปฑ xแบฃy ra?\n" +"\n" +"Bแบฅt kแปณ thแปฉ gรฌ khรกc bแบกn muแปn thรชm:\n" +"\n" +"Vui lรฒng xen xรฉt phแบงn cรฒn lแบกi cแปงa bรกo cรกo lแปi bรชn dฦฐแปi.\n" +"Bแบกn cรณ thแป xรณa bแบฅt kแปณ dรฒng nร o bแบกn khรดng muแปn chia sแบป.\n" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "chแป ฤแปnh thฦฐ mแปฅc ฤแปnh ฤแป tแบกo tแบญp tin bรกo cรกo lแปi" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "" +"chแป ฤแปnh chuแปi ฤแปnh dแบกng thแปi gian strftime dรนng lร m hแบญu tแป cho tรชn tแบญp tin" + +#: builtin/bugreport.c:158 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "khรดng thแป tแบกo cรกc thฦฐ mแปฅc dแบซn ฤแบงu cho โ%sโ" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "Thรดng tin hแป thแปng" + +#: builtin/bugreport.c:168 +msgid "Enabled Hooks" +msgstr "Cรกc Mรณc ฤรฃ ฤฦฐแปฃc bแบญt" + +#: builtin/bugreport.c:175 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "khรดng thแป tแบกo tแบญp tin mแปi tแบกi โ%sโ" + +#: builtin/bugreport.c:178 +#, c-format +msgid "unable to write to %s" +msgstr "khรดng thแป ghi vร o %s" + +#: builtin/bugreport.c:188 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "ฤรฃ tแบกo bรกo cรกo mแปi tแบกi โ%sโ\n" + +#: 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:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "khรดng hiแปn thแป bแป ฤo tiแบฟn trรฌnh" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "hiแปn thแป bแป ฤo tiแบฟn trรฌnh" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +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:74 builtin/pack-objects.c:3487 +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:76 +msgid "specify bundle format version" +msgstr "chแป ฤiแปnh ฤแปnh dแบกng cho bundle" + +#: builtin/bundle.c:96 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 +#: builtin/bundle.c:107 +msgid "do not show bundle details" +msgstr "khรดng hiแปn thแป chi tiแบฟt bundle (bรณ)" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "โ%sโ tแปt\n" + +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "Cแบงn mแปt kho chแปฉa ฤแป cรณ thแป giแบฃi nรฉn mแปt bundle." -#: builtin/cat-file.c:594 +#: builtin/bundle.c:171 builtin/remote.c:1687 +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:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Khรดng hiแปu cรขu lแปnh con: %s" + +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -9956,80 +11437,80 @@ 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:595 +#: builtin/cat-file.c:599 msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<ฤแปnh dแบกng>] | --batch-check[=<ฤแปnh dแบกng>]) [--follow-" +"symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "chแป mแปt tรนy chแปn batch ฤฦฐแปฃc chแป ra" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:638 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:635 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "hiแปn thแป kiแปu ฤแปi tฦฐแปฃng" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "hiแปn thแป kรญch thฦฐแปc ฤแปi tฦฐแปฃng" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:642 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:639 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "in nแปi dung ฤแปi tฦฐแปฃng dแบกng dแป ฤแปc" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:645 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:643 +#: builtin/cat-file.c:647 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:644 git-submodule.sh:936 +#: builtin/cat-file.c:648 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:649 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:647 +#: builtin/cat-file.c:651 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:648 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "ฤแปm kแบฟt xuแบฅt --batch" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:654 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:654 +#: builtin/cat-file.c:658 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:658 +#: builtin/cat-file.c:662 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:660 +#: builtin/cat-file.c:664 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:662 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "ฤแปซng sแบฏp xแบฟp ฤแบงu ra --batch-all-objects" @@ -10057,8 +11538,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:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "chแบทn cรกc bรกo cรกo tiแบฟn trรฌnh hoแบกt ฤแปng" @@ -10070,27 +11551,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:160 +#: builtin/check-ignore.c:163 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:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z chแป hแปฃp lรฝ vแปi --stdin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "chฦฐa chแป ra ฤฦฐแปng dแบซn" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 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:171 +#: builtin/check-ignore.c:174 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:174 +#: builtin/check-ignore.c:177 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" @@ -10149,9 +11630,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:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 msgid "string" msgstr "chuแปi" @@ -10179,96 +11660,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:172 builtin/checkout.c:211 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, 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:174 builtin/checkout.c:213 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, 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:190 +#: builtin/checkout.c:206 #, 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:240 +#: builtin/checkout.c:258 #, 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:258 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "ฤฦฐแปng dแบซn โ%sโ: khรดng thแป hรฒa trแปn" -#: builtin/checkout.c:274 +#: builtin/checkout.c:291 #, 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:374 +#: builtin/checkout.c:396 #, 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:379 +#: builtin/checkout.c:401 #, 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:386 +#: builtin/checkout.c:408 #, 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:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, 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:422 builtin/checkout.c:425 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "khรดng ฤฦฐแปฃc dรนng โ%sโ vแปi %s" -#: builtin/checkout.c:429 +#: builtin/checkout.c:451 #, 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:433 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "khรดng chแป ฤแปnh '%s' khรดng '%s'" -#: builtin/checkout.c:437 +#: builtin/checkout.c:459 #, 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:442 builtin/checkout.c:447 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, 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:506 builtin/checkout.c:513 +#: builtin/checkout.c:528 builtin/checkout.c:535 #, c-format msgid "path '%s' is unmerged" msgstr "ฤฦฐแปng dแบซn โ%sโ khรดng ฤฦฐแปฃc hรฒa trแปn" -#: builtin/checkout.c:679 +#: builtin/checkout.c:703 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:729 +#: builtin/checkout.c:757 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10278,56 +11759,50 @@ msgstr "" "sau:\n" "%s" -#: 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 +#: builtin/checkout.c:853 #, 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:875 +#: builtin/checkout.c:895 msgid "HEAD is now at" msgstr "HEAD hiแปn giแป tแบกi" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:899 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "khรดng thแป cแบญp nhแบญt HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:903 #, c-format msgid "Reset branch '%s'\n" msgstr "ฤแบทt lแบกi nhรกnh โ%sโ\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:906 #, c-format msgid "Already on '%s'\n" msgstr "ฤรฃ sแบตn sร ng trรชn โ%sโ\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:910 #, 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:892 builtin/checkout.c:1289 +#: builtin/checkout.c:912 builtin/checkout.c:1338 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "ฤรฃ chuyแปn ฤแบฟn nhรกnh mแปi โ%sโ\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:914 #, c-format msgid "Switched to branch '%s'\n" msgstr "ฤรฃ chuyแปn ฤแบฟn nhรกnh โ%sโ\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:965 #, c-format msgid " ... and %d more.\n" msgstr " โฆ vร nhiแปu hฦกn %d.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:971 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10346,7 +11821,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:990 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10367,28 +11842,19 @@ msgstr[0] "" " git branch <tรชn_nhรกnh_mแปi> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1025 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:1009 +#: builtin/checkout.c:1029 msgid "Previous HEAD position was" msgstr "Vแป trรญ trฦฐแปc kia cแปงa HEAD lร " -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1069 builtin/checkout.c:1333 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: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 +#: builtin/checkout.c:1146 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10397,37 +11863,71 @@ 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:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1153 +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:1163 +#, 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:1229 +msgid "only one reference expected" +msgstr "chแป cแบงn mแปt tham chiแบฟu" + +#: builtin/checkout.c:1246 +#, 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:1292 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "tham chiแบฟu khรดng hแปฃp lแป: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1305 builtin/checkout.c:1671 #, 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:1303 +#: builtin/checkout.c:1352 #, 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:1305 +#: builtin/checkout.c:1354 #, 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:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1355 builtin/checkout.c:1363 #, 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:1309 +#: builtin/checkout.c:1358 #, 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:1325 +#: builtin/checkout.c:1374 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10435,7 +11935,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:1329 +#: builtin/checkout.c:1378 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -10443,7 +11943,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:1333 +#: builtin/checkout.c:1382 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10451,7 +11951,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:1337 +#: builtin/checkout.c:1386 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10459,7 +11959,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:1341 +#: builtin/checkout.c:1390 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10467,143 +11967,150 @@ 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:1345 +#: builtin/checkout.c:1394 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:1352 +#: builtin/checkout.c:1401 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:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 #, 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:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "โ%sโ khรดng thแป ฤฦฐแปฃc dรนng vแปi โ%sโ" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1429 #, c-format msgid "'%s' cannot take <start-point>" msgstr "โ%sโ khรดng thแป nhแบญn <ฤiแปm-ฤแบงu>" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1437 #, 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:1395 +#: builtin/checkout.c:1444 msgid "missing branch or commit argument" msgstr "thiแบฟu tham sแป lร nhรกnh hoแบทc lแบงn chuyแปn giao" -#: 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 +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 msgid "force progress reporting" msgstr "รฉp buแปc bรกo cรกo tiแบฟn triแปn cรดng viแปc" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1487 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:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 msgid "style" msgstr "kiแปu" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1489 msgid "conflict style (merge or diff3)" msgstr "xung ฤแปt kiแปu (hรฒa trแปn hoแบทc diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1501 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "rแปi bแป HEAD tแบกi lแบงn chuyแปn giao theo tรชn" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1502 msgid "set upstream info for new branch" msgstr "ฤแบทt thรดng tin thฦฐแปฃng nguแปn cho nhรกnh mแปi" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1504 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:1457 +#: builtin/checkout.c:1506 msgid "new-branch" msgstr "nhรกnh-mแปi" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new unparented branch" msgstr "nhรกnh khรดng cha mแปi" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1508 builtin/merge.c:291 msgid "update ignored files (default)" msgstr "cแบญp nhแบญt cรกc tแบญp tin bแป bแป qua (mแบทc ฤแปnh)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1511 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:1475 +#: builtin/checkout.c:1524 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:1478 +#: builtin/checkout.c:1527 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:1482 +#: builtin/checkout.c:1531 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 thฦฐa thแปt" +msgstr "khรดng giแปi hแบกn ฤแบทc tแบฃ ฤฦฐแปng dแบซn thร nh chแป cรกc mแปฅc rแบฃi rรกc" -#: 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:1586 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "-%c, -%c vร --orphan loแบกi tแปซ lแบซn nhau" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1590 msgid "-p and --overlay are mutually exclusive" msgstr "-p vร --overlay loแบกi tแปซ lแบซn nhau" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1627 msgid "--track needs a branch name" msgstr "--track cแบงn tรชn mแปt nhรกnh" -#: builtin/checkout.c:1578 -msgid "missing branch name; try -b" -msgstr "thiแบฟu tรชn nhรกnh; hรฃy thแปญ -b" +#: builtin/checkout.c:1632 +#, c-format +msgid "missing branch name; try -%c" +msgstr "thiแบฟu tรชn nhรกnh; hรฃy thแปญ -%c" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1664 #, c-format msgid "could not resolve %s" msgstr "khรดng thแป phรขn giแบฃi โ%sโ" -#: 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 +#: builtin/checkout.c:1680 msgid "invalid path specification" msgstr "ฤฦฐแปng dแบซn ฤรฃ cho khรดng hแปฃp lแป" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1687 #, 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:1642 +#: builtin/checkout.c:1691 #, 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:1646 +#: builtin/checkout.c:1700 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file xung khแบฏc vแปi --detach" + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file xung khแบฏc vแปi --patch" + +#: builtin/checkout.c:1716 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10611,136 +12118,111 @@ 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: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:1721 +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: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 +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 msgid "branch" msgstr "nhรกnh" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1748 msgid "create and checkout a new branch" msgstr "tแบกo vร checkout mแปt nhรกnh mแปi" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1750 msgid "create/reset and checkout a branch" msgstr "tแบกo/ฤแบทt_lแบกi vร checkout mแปt nhรกnh" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1751 msgid "create reflog for new branch" msgstr "tแบกo reflog cho nhรกnh mแปi" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1753 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:1698 +#: builtin/checkout.c:1754 msgid "use overlay mode (default)" msgstr "dรนng chแบฟ ฤแป che phแปง (mแบทc ฤแปnh)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1799 msgid "create and switch to a new branch" msgstr "tแบกo vร chuyแปn ฤแบฟn mแปt nhรกnh mแปi" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1801 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:1738 +#: builtin/checkout.c:1803 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:1740 +#: builtin/checkout.c:1805 msgid "throw away local modifications" msgstr "vแปฉt bแป cรกc sแปญa ฤแปi ฤแปa phฦฐฦกng" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1839 msgid "which tree-ish to checkout from" msgstr "lแบฅy ra tแปซ tree-ish nร o" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1841 msgid "restore the index" msgstr "phแปฅc hแปi bแบฃng mแปฅc lแปฅc" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1843 msgid "restore the working tree (default)" msgstr "phแปฅc hแปi cรขy lร m viแปc (mแบทc ฤแปnh)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1845 msgid "ignore unmerged entries" msgstr "bแป qua nhแปฏng thแปฉ chฦฐa hรฒa trแปn: %s" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1846 msgid "use overlay mode" msgstr "dรนng chแบฟ ฤแป che phแปง" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <mแบซu>] [-x | -X] [--] </cรกc/ฤฦฐแปng/" "dแบซn>โฆ" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "ฤang gแปก bแป %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "Cรณ thแป gแปก bแป %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "ฤang bแป qua kho chแปฉa %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "Nรชn bแป qua kho chแปฉa %s\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "gแบทp lแปi khi gแปก bแป %s" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format 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:300 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10753,7 +12235,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:304 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10774,38 +12256,33 @@ msgstr "" "* - chแปn tแบฅt\n" " - (ฤแป trแปng) kแบฟt thรบc viแปc chแปn\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hแบฃ (%s)?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:661 #, 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:699 +#: builtin/clean.c:696 #, 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:720 +#: builtin/clean.c:717 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:761 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Xรณa bแป โ%sโ [y/N]? " -#: builtin/clean.c:786 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "Tแบกm biแปt.\n" - -#: builtin/clean.c:794 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10823,63 +12300,51 @@ 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: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 +#: builtin/clean.c:825 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:846 +#: builtin/clean.c:841 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:908 +#: builtin/clean.c:903 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:910 +#: builtin/clean.c:905 msgid "force" msgstr "รฉp buแปc" -#: builtin/clean.c:911 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "dแปn bแบฑng kiแปu tฦฐฦกng tรกc" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "gแปก bแป toร n bแป thฦฐ mแปฅc" -#: 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/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mแบซu" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "thรชm <mแบซu> vร o trong qui tแบฏc bแป qua" -#: builtin/clean.c:916 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "ฤแปng thแปi gแปก bแป cแบฃ cรกc tแบญp tin bแป bแป qua" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "chแป gแปก bแป nhแปฏng tแบญp tin bแป bแป qua" -#: 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:940 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -10887,7 +12352,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:943 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -10895,7 +12360,11 @@ 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:46 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "-x vร -X khรดng thแป dรนng cรนng nhau" + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<cรกc tรนy chแปn>] [--] <kho> [<t.mแปฅc>]" @@ -10903,7 +12372,7 @@ msgstr "git clone [<cรกc tรนy chแปn>] [--] <kho> [<t.mแปฅc>]" msgid "don't create a checkout" msgstr "khรดng tแบกo mแปt checkout" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 msgid "create a bare repository" msgstr "tแบกo kho thuแบงn" @@ -10923,11 +12392,11 @@ msgstr "khรดng sแปญ dแปฅng liรชn kแบฟt cแปฉng nแปi bแป, luรดn sao chรฉp" msgid "setup as shared repository" msgstr "cร i ฤแบทt ฤรขy lร kho chia sแบป" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "ฤแบทc-tแบฃ-ฤฦฐแปng-dแบซn" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "khแปi tแบกo mรด-ฤun-con trong bแบฃn sao" @@ -10935,26 +12404,26 @@ msgstr "khแปi tแบกo mรด-ฤun-con trong bแบฃn sao" msgid "number of submodules cloned in parallel" msgstr "sแป lฦฐแปฃng mรด-ฤun-con ฤฦฐแปฃc nhรขn bแบฃn ฤแปng thแปi" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:550 msgid "template-directory" msgstr "thฦฐ-mแปฅc-mแบซu" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:551 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:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "kho tham chiแบฟu" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 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:3314 builtin/repack.c:319 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 msgid "name" msgstr "tรชn" @@ -10970,8 +12439,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:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/pull.c:208 msgid "depth" msgstr "ฤแป-sรขu" @@ -10979,7 +12448,8 @@ 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:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 msgid "time" msgstr "thแปi-gian" @@ -10987,16 +12457,17 @@ 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:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 msgid "revision" msgstr "ฤiแปm xรฉt duyแปt" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 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/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "chแป nhรขn bแบฃn mแปt nhรกnh, HEAD hoแบทc --branch" @@ -11010,11 +12481,11 @@ msgstr "" msgid "any cloned submodules will be shallow" msgstr "mแปi mรด-ฤun-con nhรขn bแบฃn sแบฝ lร shallow (nรดng)" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:559 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "khรดng dรนng chung thฦฐ mแปฅc dร nh riรชng cho git vร thฦฐ mแปฅc lร m viแปc" @@ -11026,23 +12497,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:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 msgid "server-specific" msgstr "ฤแบทc-tแบฃ-mรกy-phแปฅc-vแปฅ" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 msgid "option to transmit" msgstr "tรนy chแปn ฤแป chuyแปn giao" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 msgid "use IPv4 addresses only" msgstr "chแป dรนng ฤแปa chแป IPv4" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 msgid "use IPv6 addresses only" msgstr "chแป dรนng ฤแปa chแป IPv6" @@ -11050,7 +12521,11 @@ 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:285 +#: 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 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11058,47 +12533,42 @@ 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:338 +#: builtin/clone.c:340 #, 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:411 +#: builtin/clone.c:413 #, 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:428 +#: builtin/clone.c:431 #, 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: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 +#: builtin/clone.c:462 #, 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:462 +#: builtin/clone.c:466 #, 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:467 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "gแบทp lแปi khi lแบทp qua โ%sโ" -#: builtin/clone.c:492 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "hoร n tแบฅt.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:512 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11108,95 +12578,105 @@ 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:583 +#: builtin/clone.c:589 #, 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:702 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "khรดng thแป cแบญp nhแบญt %s" -#: builtin/clone.c:752 +#: builtin/clone.c:756 +msgid "failed to initialize sparse-checkout" +msgstr "gแบทp lแปi khi khแปi tแบกo sparse-checkout" + +#: builtin/clone.c:779 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:783 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "khรดng thแป lแบฅy ra (checkout) cรขy lร m viแปc" -#: builtin/clone.c:833 +#: builtin/clone.c:868 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:896 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "khรดng thแป ฤรณng gรณi ฤแป dแปn dแบนp" -#: builtin/clone.c:898 +#: builtin/clone.c:933 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:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:970 builtin/receive-pack.c:2434 msgid "Too many arguments." msgstr "Cรณ quรก nhiแปu ฤแปi sแป." -#: builtin/clone.c:942 +#: builtin/clone.c:974 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:955 +#: builtin/clone.c:987 #, 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:958 +#: builtin/clone.c:990 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:971 +#: builtin/clone.c:1006 #, c-format msgid "repository '%s' does not exist" msgstr "kho chแปฉa โ%sโ chฦฐa tแปn tแบกi" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:1010 builtin/fetch.c:1841 #, 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:987 +#: builtin/clone.c:1020 #, 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:997 +#: builtin/clone.c:1026 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "" +"ฤฦฐแปng dแบซn kho chแปฉa โ%sโ ฤรฃ cรณ tแปซ trฦฐแปc vร khรดng phแบฃi lร mแปt thฦฐ mแปฅc rแปng." + +#: builtin/clone.c:1040 #, 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:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 #, 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:1017 +#: builtin/clone.c:1060 #, 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:1037 +#: builtin/clone.c:1080 #, 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:1039 +#: builtin/clone.c:1082 #, c-format msgid "Cloning into '%s'...\n" msgstr "ฤang nhรขn bแบฃn thร nh โ%sโโฆ\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1106 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11204,41 +12684,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:1124 +#: builtin/clone.c:1170 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:1126 +#: builtin/clone.c:1172 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:1128 +#: builtin/clone.c:1174 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:1130 +#: builtin/clone.c:1176 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:1133 +#: builtin/clone.c:1179 msgid "source repository is shallow, ignoring --local" msgstr "kho nguแปn lร nรดng, nรชn bแป qua --local" -#: builtin/clone.c:1138 +#: builtin/clone.c:1184 msgid "--local is ignored" msgstr "--local bแป lแป ฤi" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1268 builtin/clone.c:1276 #, 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:1226 +#: builtin/clone.c:1279 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." @@ -11274,6 +12754,120 @@ msgstr "Chรจn thรชm khoแบฃng trแบฏng giแปฏa cรกc cแปt" msgid "--command must be the first argument" msgstr "--command phแบฃi lร ฤแปi sแป ฤแบงu tiรชn" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" +"git commit-graph verify [--object-dir </thฦฐ/mแปฅc/ฤแปi/tฦฐแปฃng>] [--shallow] [--" +"[no-]progress]" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" +"git commit-graph write [--object-dir </thฦฐ/mแปฅc/ฤแปi/tฦฐแปฃng>] [--append][--" +"split[=<chiแบฟn lฦฐแปฃc>]] [--reachable|--stdin-packs|--stdin-commits][--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <cรกc tรนy chแปn chia " +"tรกch>" + +#: builtin/commit-graph.c:64 +#, 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:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "tmแปฅc" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "Thฦฐ mแปฅc ฤแปi tฦฐแปฃng ฤแป lฦฐu ฤแป thแป" + +#: builtin/commit-graph.c:83 +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:106 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "Khรดng thแป mแป ฤแป thแป chuyแปn giao โ%sโ" + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "ฤแปi sแป --split khรดng ฤฦฐแปฃc thแปซa nhแบญn, %s" + +#: builtin/commit-graph.c:155 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "nhแบญn ฤฦฐแปฃc ID ฤแปi tฦฐแปฃng khรดng phแบฃi dแบกng hex khรดng cแบงn: %s" + +#: builtin/commit-graph.c:160 +#, c-format +msgid "invalid object: %s" +msgstr "ฤแปi tฦฐแปฃng khรดng hแปฃp lแป: %s" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "bแบฏt ฤแบงu di chuyแปn tแบกi mแปi tham chiแบฟu" + +#: builtin/commit-graph.c:215 +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:217 +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:219 +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:221 +msgid "enable computation for changed paths" +msgstr "cho phรฉp tรญnh toรกn cรกc ฤฦฐแปng dแบซn ฤรฃ bแป thay ฤแปi" + +#: builtin/commit-graph.c:224 +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:228 +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:230 +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:232 +msgid "only expire files older than a given date-time" +msgstr "chแป lร m hแบฟt hแบกn cรกc tแบญp tin khi nรณ cลฉ hฦกn khoแบฃng <thแปi gian> ฤฦฐa ra" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "sแป tแปi ฤa cรกc bแป lแปc cรกc ฤฦฐแปng dแบซn thay ฤแปi Bloom ฤแป tรญnh toรกn" + +#: builtin/commit-graph.c:255 +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" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "Sฦฐu tแบญp cรกc lแบงn chuyแปn giao tแปซ ฤแบงu vร o" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -11287,7 +12881,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:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 #, c-format msgid "not a valid object name %s" msgstr "khรดng phแบฃi lร tรชn ฤแปi tฦฐแปฃng hแปฃp lแป โ%sโ" @@ -11315,13 +12909,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:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 -#: builtin/tag.c:412 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 msgid "message" msgstr "chรบ thรญch" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "chรบ thรญch cแปงa lแบงn chuyแปn giao" @@ -11329,8 +12923,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:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Kรฝ lแบงn chuyแปn giao dรนng GPG" @@ -11379,10 +12973,14 @@ msgstr "" "\n" #: builtin/commit.c:63 +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "Nแบฟu khรดng ฤฦฐแปฃc thรฌ dรนng lแปnh \"git rebase --skip\"\n" + +#: builtin/commit.c:66 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Nแบฟu khรดng ฤฦฐแปฃc thรฌ dรนng lแปnh \"git cherry-pick --skip\"\n" -#: builtin/commit.c:66 +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -11404,63 +13002,76 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:315 +#: builtin/commit.c:312 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:356 +#: builtin/commit.c:348 +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:361 +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:373 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:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "gแบทp lแปi khi thรชm bแบฑng cรกch tฦฐฦกng" -#: builtin/commit.c:376 +#: builtin/commit.c:397 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:378 +#: builtin/commit.c:399 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:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 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:455 +#: builtin/commit.c:476 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:457 +#: builtin/commit.c:478 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:465 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "" +"khรดng thแป thแปฑc hiแปn viแปc chuyแปn giao cแปฅc bแป trong khi ฤang thแปฑc hiแปn cแบฃi tแป." + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "khรดng ฤแปc ฤฦฐแปฃc bแบฃng mแปฅc lแปฅc" -#: builtin/commit.c:484 +#: builtin/commit.c:507 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:582 +#: builtin/commit.c:605 #, 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:584 +#: builtin/commit.c:607 #, 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:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "ฤแปi sแป cho --author bแป dแป hรฌnh" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11468,68 +13079,66 @@ 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:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, 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:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:478 #, 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:708 +#: builtin/commit.c:731 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:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "khรดng ฤแปc ฤฦฐแปฃc tแปp nhแบญt kรฝ โ%sโ" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "khรดng thแป ฤแปc SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "khรดng thแป ฤแปc MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "khรดng thแป ghi mแบซu chuyแปn giao" -#: builtin/commit.c:829 -#, c-format +#: builtin/commit.c:853 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" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" "Nรณ trรดng giแปng vแปi viแปc bแบกn ฤang chuyแปn giao mแปt lแบงn hรฒa trแปn.\n" -"Nแบฟu khรดng phแบฃi vแบญy, xin hรฃy gแปก bแป tแบญp tin\n" -"\t%s\n" +"Nแบฟu khรดng phแบฃi vแบญy, xin hรฃy chแบกy\n" +"\tgit update-ref -d MERGE_HEAD\n" "vร thแปญ lแบกi.\n" -#: builtin/commit.c:834 -#, c-format +#: builtin/commit.c:858 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" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" "Nรณ trรดng giแปng vแปi viแปc bแบกn ฤang chuyแปn giao mแปt lแบงn cherry-pick.\n" -"Nแบฟu khรดng phแบฃi vแบญy, xin hรฃy gแปก bแป tแบญp tin\n" -"\t%s\n" +"Nแบฟu khรดng phแบฃi vแบญy, xin hรฃy chแบกy\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "vร thแปญ lแบกi.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11540,7 +13149,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:855 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11552,152 +13161,153 @@ 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:872 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sTรกc giแบฃ: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sNgร y thรกng: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sNgฦฐแปi chuyแปn giao: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "Khรดng ฤแปc ฤฦฐแปฃc bแบฃng mแปฅc lแปฅc" -#: builtin/commit.c:972 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Gแบทp lแปi khi xรขy dแปฑng cรขy" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:276 #, 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:1030 +#: builtin/commit.c:1055 #, 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:1044 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Chแบฟ ฤแป bแป qua khรดng hแปฃp lแป โ%sโ" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, 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:1102 +#: builtin/commit.c:1127 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:1146 +#: builtin/commit.c:1171 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:1155 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "Khรดng cรณ gรฌ ฤแป mร โtu bแปโ cแบฃ." -#: builtin/commit.c:1158 +#: builtin/commit.c:1183 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:1160 +#: builtin/commit.c:1185 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:1163 +#: builtin/commit.c:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "" +"Bแบกn ฤang แป giแปฏa cแปงa quรก trรฌnh cแบฃi tแป -- nรชn khรดng thแป thแปฑc hiแปn viแปc โtu bแปโ." + +#: builtin/commit.c:1190 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:1173 +#: builtin/commit.c:1200 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:1175 +#: builtin/commit.c:1202 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:1183 +#: builtin/commit.c:1211 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:1200 +#: builtin/commit.c:1229 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: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 +#: builtin/commit.c:1235 #, 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:1339 builtin/commit.c:1523 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "hiแปn thแป trแบกng thรกi แป dแบกng sรบc tรญch" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "hiแปn thแป thรดng tin nhรกnh" -#: builtin/commit.c:1343 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "hiแปn thแป thรดng tin vแป tแบกm cแบฅt" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "tรญnh ฤแบงy ฤแปง giรก trแป trฦฐแปc/sau" -#: builtin/commit.c:1347 +#: builtin/commit.c:1374 msgid "version" msgstr "phiรชn bแบฃn" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "kแบฟt xuแบฅt dแบกng mรกy-cรณ-thแป-ฤแปc" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1377 builtin/commit.c:1535 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:1353 builtin/commit.c:1534 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "chแบฅm dแปฉt cรกc mแปฅc bแบฑng NUL" -#: 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 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 msgid "mode" msgstr "chแบฟ ฤแป" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1383 builtin/commit.c:1541 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:1360 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11705,11 +13315,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:1362 parse-options.h:179 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "khi" -#: builtin/commit.c:1363 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11717,176 +13327,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:1365 +#: builtin/commit.c:1392 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:1366 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "khรดng dรฒ tรฌm cรกc tรชn thay ฤแปi" -#: builtin/commit.c:1368 +#: builtin/commit.c:1395 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:1388 +#: builtin/commit.c:1415 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:1493 +#: builtin/commit.c:1497 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:1494 +#: builtin/commit.c:1498 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:1496 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "Cรกc tรนy chแปn ghi chรบ commit" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 msgid "read message from file" msgstr "ฤแปc chรบ thรญch tแปซ tแบญp tin" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "author" msgstr "tรกc giแบฃ" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "ghi ฤรจ tรกc giแบฃ cho commit" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:539 msgid "date" msgstr "ngร y thรกng" -#: builtin/commit.c:1499 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "ghi ฤรจ ngร y thรกng cho lแบงn chuyแปn giao" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "lแบงn_chuyแปn_giao" -#: builtin/commit.c:1501 +#: builtin/commit.c:1505 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:1502 +#: builtin/commit.c:1506 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:1503 +#: builtin/commit.c:1507 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:1504 +#: builtin/commit.c:1508 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:1505 +#: builtin/commit.c:1509 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:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "(nรชn dรนng) thรชm dรฒng Signed-off-by:" -#: builtin/commit.c:1507 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "sแปญ dแปฅng tแบญp tin mแบซu ฤรฃ cho" -#: builtin/commit.c:1508 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "รฉp buแปc sแปญa lแบงn commit" -#: builtin/commit.c:1510 +#: builtin/commit.c:1514 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:1515 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "Cรกc tรนy nแปi dung ghi chรบ commit" -#: builtin/commit.c:1516 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "chuyแปn giao tแบฅt cแบฃ cรกc tแบญp tin cรณ thay ฤแปi" -#: builtin/commit.c:1517 +#: builtin/commit.c:1521 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:1518 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "thรชm cรกc tแบญp-tin bแบฑng tฦฐฦกng tรกc" -#: builtin/commit.c:1519 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "thรชm cรกc thay ฤแปi bแบฑng tฦฐฦกng tรกc" -#: builtin/commit.c:1520 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "chแป chuyแปn giao cรกc tแบญp tin ฤรฃ chแป ra" -#: builtin/commit.c:1521 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "vรฒng qua mรณc (hook) pre-commit vร commit-msg" -#: builtin/commit.c:1522 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "hiแปn thแป xem cรกi gรฌ cรณ thแป ฤฦฐแปฃc chuyแปn giao" -#: builtin/commit.c:1535 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "โtu bแปโ (amend) lแบงn commit trฦฐแปc" -#: builtin/commit.c:1536 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "vรฒng qua mรณc (hook) post-rewrite" -#: builtin/commit.c:1541 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "ok ฤแป ghi lแบกi mแปt thay ฤแปi trแปng rแปng" -#: builtin/commit.c:1543 +#: builtin/commit.c:1549 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:1616 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tแบญp tin MERGE_HEAD sai hแปng (%s)" -#: builtin/commit.c:1623 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "khรดng thแป ฤแปc MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1650 #, 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:1649 +#: builtin/commit.c:1657 #, 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:1654 +#: builtin/commit.c:1662 #, 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:1688 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -11897,293 +13507,221 @@ 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 -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]" - -#: 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 "" -"git commit-graph write [--object-dir </thฦฐ/mแปฅc/ฤแปi/tฦฐแปฃng>] [--append|--" -"split] [--reachable|--stdin-packs|--stdin-commits] <cรกc tรนy chแปn chia tรกch>" - -#: 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: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: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: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: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: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: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: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: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: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: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: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" - #: builtin/config.c:11 msgid "git config [<options>]" msgstr "git config [<cรกc tรนy chแปn>]" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:107 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "ฤแปi sแป khรดng ฤฦฐแปฃc thแปซa nhแบญn --type, %s" -#: builtin/config.c:115 +#: builtin/config.c:119 msgid "only one type at a time" msgstr "chแป mแปt kiแปu mแปt lแบงn" -#: builtin/config.c:124 +#: builtin/config.c:128 msgid "Config file location" msgstr "Vแป trรญ tแบญp tin cแบฅu hรฌnh" -#: builtin/config.c:125 +#: builtin/config.c:129 msgid "use global config file" msgstr "dรนng tแบญp tin cแบฅu hรฌnh toร n cแปฅc" -#: builtin/config.c:126 +#: builtin/config.c:130 msgid "use system config file" msgstr "sแปญ dแปฅng tแบญp tin cแบฅu hรฌnh hแป thแปng" -#: builtin/config.c:127 +#: builtin/config.c:131 msgid "use repository config file" msgstr "dรนng tแบญp tin cแบฅu hรฌnh cแปงa kho" -#: builtin/config.c:128 +#: builtin/config.c:132 msgid "use per-worktree config file" msgstr "dรนng tแบญp tin cแบฅu hรฌnh per-worktree" -#: builtin/config.c:129 +#: builtin/config.c:133 msgid "use given config file" msgstr "sแปญ dแปฅng tแบญp tin cแบฅu hรฌnh ฤรฃ cho" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "read config from given blob object" msgstr "ฤแปc cแบฅu hรฌnh tแปซ ฤแปi tฦฐแปฃng blob ฤรฃ cho" -#: builtin/config.c:131 +#: builtin/config.c:135 msgid "Action" msgstr "Hร nh ฤแปng" -#: builtin/config.c:132 +#: builtin/config.c:136 msgid "get value: name [value-regex]" msgstr "lแบฅy giรก-trแป: tรชn [value-regex]" -#: builtin/config.c:133 +#: builtin/config.c:137 msgid "get all values: key [value-regex]" msgstr "lแบฅy tแบฅt cแบฃ giรก-trแป: khรณa [value-regex]" -#: builtin/config.c:134 +#: builtin/config.c:138 msgid "get values for regexp: name-regex [value-regex]" msgstr "lแบฅy giรก trแป cho regexp: name-regex [value-regex]" -#: builtin/config.c:135 +#: builtin/config.c:139 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:136 +#: builtin/config.c:140 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:137 +#: builtin/config.c:141 msgid "add a new variable: name value" msgstr "thรชm biแบฟn mแปi: tรชn giรก-trแป" -#: builtin/config.c:138 +#: builtin/config.c:142 msgid "remove a variable: name [value-regex]" msgstr "gแปก bแป biแบฟn: tรชn [value-regex]" -#: builtin/config.c:139 +#: builtin/config.c:143 msgid "remove all matches: name [value-regex]" msgstr "gแปก bแป mแปi cรกi khแปp: tรชn [value-regex]" -#: builtin/config.c:140 +#: builtin/config.c:144 msgid "rename section: old-name new-name" msgstr "ฤแปi tรชn phแบงn: tรชn-cลฉ tรชn-mแปi" -#: builtin/config.c:141 +#: builtin/config.c:145 msgid "remove a section: name" msgstr "gแปก bแป phแบงn: tรชn" -#: builtin/config.c:142 +#: builtin/config.c:146 msgid "list all" msgstr "liแปt kรช tแบฅt" -#: builtin/config.c:143 +#: builtin/config.c:147 msgid "open an editor" msgstr "mแป mแปt trรฌnh biรชn soแบกn" -#: builtin/config.c:144 +#: builtin/config.c:148 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:145 +#: builtin/config.c:149 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:146 +#: builtin/config.c:150 msgid "Type" msgstr "Kiแปu" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:151 builtin/env--helper.c:43 msgid "value is given this type" msgstr "giรก trแป ฤฦฐแปฃc ฤฦฐa kiแปu nร y" -#: builtin/config.c:148 +#: builtin/config.c:152 msgid "value is \"true\" or \"false\"" msgstr "giรก trแป lร \"true\" hoแบทc \"false\"" -#: builtin/config.c:149 +#: builtin/config.c:153 msgid "value is decimal number" msgstr "giรก trแป แป dแบกng sแป thแบญp phรขn" -#: builtin/config.c:150 +#: builtin/config.c:154 msgid "value is --bool or --int" msgstr "giรก trแป lร --bool hoแบทc --int" -#: builtin/config.c:151 +#: builtin/config.c:155 +msgid "value is --bool or string" +msgstr "giรก trแป lร --bool hoแบทc chuแปi" + +#: builtin/config.c:156 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:152 +#: builtin/config.c:157 msgid "value is an expiry date" msgstr "giรก trแป lร mแปt ngร y hแบฟt hแบกn" -#: builtin/config.c:153 +#: builtin/config.c:158 msgid "Other" msgstr "Khรกc" -#: builtin/config.c:154 +#: builtin/config.c:159 msgid "terminate values with NUL byte" msgstr "chแบฅm dแปฉt giรก trแป vแปi byte NUL" -#: builtin/config.c:155 +#: builtin/config.c:160 msgid "show variable names only" msgstr "chแป hiแปn thแป cรกc tรชn biแบฟn" -#: builtin/config.c:156 +#: builtin/config.c:161 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:157 +#: builtin/config.c:162 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:158 builtin/env--helper.c:40 +#: builtin/config.c:163 +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:164 builtin/env--helper.c:45 msgid "value" msgstr "giรก trแป" -#: builtin/config.c:158 +#: builtin/config.c:164 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:172 +#: builtin/config.c:178 #, c-format msgid "wrong number of arguments, should be %d" msgstr "sai sแป lฦฐแปฃng tham sแป, phแบฃi lร %d" -#: builtin/config.c:174 +#: builtin/config.c:180 #, 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:308 +#: builtin/config.c:334 #, c-format msgid "invalid key pattern: %s" msgstr "mแบซu khรณa khรดng hแปฃp lแป: %s" -#: builtin/config.c:344 +#: builtin/config.c:370 #, 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:401 +#: builtin/config.c:434 #, c-format msgid "cannot parse color '%s'" msgstr "khรดng thแป phรขn tรญch mร u โ%sโ" -#: builtin/config.c:443 +#: builtin/config.c:476 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:496 builtin/config.c:742 +#: builtin/config.c:529 builtin/config.c:789 msgid "not in a git directory" msgstr "khรดng trong thฦฐ mแปฅc git" -#: builtin/config.c:499 +#: builtin/config.c:532 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:502 +#: builtin/config.c:535 msgid "writing config blobs is not supported" msgstr "khรดng hแป trแปฃ ghi cแบฅu hรฌnh cรกc blob" -#: builtin/config.c:587 +#: builtin/config.c:620 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12198,23 +13736,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:644 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:616 +#: builtin/config.c:650 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:619 +#: builtin/config.c:652 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:638 +#: builtin/config.c:654 +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree chแป cรณ thแป ฤฦฐแปฃc dรนng bรชn trong mแปt kho git" + +#: builtin/config.c:676 msgid "$HOME not set" msgstr "Chฦฐa ฤแบทt biแบฟn mรดi trฦฐแปng HOME" -#: builtin/config.c:658 +#: builtin/config.c:700 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -12224,19 +13766,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:688 +#: builtin/config.c:735 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:693 +#: builtin/config.c:740 msgid "only one action at a time" msgstr "chแป mแปt thao tรกc mแปi lแบงn" -#: builtin/config.c:706 +#: builtin/config.c:753 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:712 +#: builtin/config.c:759 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" @@ -12244,33 +13786,33 @@ msgstr "" "--show-origin chแป ฤฦฐแปฃc รกp dแปฅng cho --get, --get-all, --get-regexp, hoแบทc --" "list" -#: builtin/config.c:718 +#: builtin/config.c:765 msgid "--default is only applicable to --get" msgstr "--default chแป ฤฦฐแปฃc รกp dแปฅng cho --get" -#: builtin/config.c:731 +#: builtin/config.c:778 #, 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:734 +#: builtin/config.c:781 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:744 +#: builtin/config.c:791 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:746 +#: builtin/config.c:793 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:760 +#: builtin/config.c:807 #, 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:773 +#: builtin/config.c:820 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12279,7 +13821,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:847 builtin/config.c:858 +#: builtin/config.c:894 builtin/config.c:905 #, c-format msgid "no such section: %s" msgstr "khรดng cรณ ฤoแบกn: %s" @@ -12292,11 +13834,36 @@ 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:27 +#: builtin/credential-cache--daemon.c:226 +#, 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 "" +"Quyแปn hแบกn trรชn thฦฐ mแปฅc gรณi mแบกng cแปงa bแบกn khรดng chรญnh xรกc; ngฦฐแปi dรนng\n" +"khรกc cรณ lแบฝ cรณ thแป ฤแปc ฤฦฐแปฃc chแปฉng thฦฐ ฤฦฐแปฃc lฦฐu ฤแปm cแปงa bแบกn. Cรขn nhแบฏc chแบกy:\n" +"\n" +"\tchmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "in thรดng tin gแปก lแปi ra ฤแบงu ra lแปi tiรชu chuแบฉn" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "credential-cache--daemon khรดng sแบตn cรณ; khรดng hแป trแปฃ unix socket" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache khรดng sแบตn cรณ; khรดng hแป trแปฃ unix socket" + +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<cรกc tรนy chแปn>] <commit-ish>*" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<cรกc tรนy chแปn>] --dirty" @@ -12312,37 +13879,32 @@ msgstr "hแบกng nhแบน" msgid "annotated" msgstr "cรณ diแป n giแบฃi" -#: builtin/describe.c:273 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "thแบป ฤรฃ ฤฦฐแปฃc ghi chรบ %s khรดng sแบตn ฤแป dรนng" -#: 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:279 +#: builtin/describe.c:281 #, c-format -msgid "tag '%s' is really '%s' here" -msgstr "thแบป โ%sโ ฤรฃ thแปฑc sแปฑ แป ฤรขy โ%sโ rแปi" +msgid "tag '%s' is externally known as '%s'" +msgstr "แป bรชn ngoร i, thแบป โ%sโ ฤรฃ ฤฦฐแปฃc biแบฟt ฤแบฟn lร โ%sโ" -#: builtin/describe.c:323 +#: builtin/describe.c:328 #, 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:325 +#: builtin/describe.c:330 #, 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:379 +#: builtin/describe.c:397 #, 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:405 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12351,7 +13913,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:409 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12360,12 +13922,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:439 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "ฤรฃ xuyรชn %lu qua lแบงn chuyแปn giao\n" -#: builtin/describe.c:442 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12374,149 +13936,159 @@ 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:510 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "mรด tแบฃ %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:532 #, 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:521 +#: builtin/describe.c:540 #, 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:535 +#: builtin/describe.c:554 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:536 +#: builtin/describe.c:555 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:537 +#: builtin/describe.c:556 msgid "use any ref" msgstr "dรนng ref bแบฅt kแปณ" -#: builtin/describe.c:538 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "dรนng thแบป bแบฅt kแปณ, cแบฃ khi โunannotatedโ" -#: builtin/describe.c:539 +#: builtin/describe.c:558 msgid "always use long format" msgstr "luรดn dรนng ฤแปnh dแบกng dร i" -#: builtin/describe.c:540 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "chแป theo cha mแบน ฤแบงu tiรชn" -#: builtin/describe.c:543 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "chแป xuแบฅt nhแปฏng gรฌ khแปp chรญnh xรกc" -#: builtin/describe.c:545 +#: builtin/describe.c:564 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:547 +#: builtin/describe.c:566 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:549 +#: builtin/describe.c:568 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:551 builtin/name-rev.c:422 +#: builtin/describe.c:570 builtin/name-rev.c:535 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:552 builtin/describe.c:555 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "dแบฅu" -#: builtin/describe.c:553 +#: builtin/describe.c:572 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:556 +#: builtin/describe.c:575 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:574 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "--long lร xung khแบฏc vแปi tรนy chแปn --abbrev=0" -#: builtin/describe.c:603 +#: builtin/describe.c:622 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:654 +#: builtin/describe.c:673 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:656 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "--broken lร xung khแบฏc vแปi commit-ishes" -#: builtin/diff.c:84 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "โ%sโ: khรดng phแบฃi tแบญp tin bรฌnh thฦฐแปng hay liรชn kแบฟt mแปm" -#: builtin/diff.c:235 +#: builtin/diff.c:241 #, c-format msgid "invalid option: %s" msgstr "tรนy chแปn khรดng hแปฃp lแป: %s" -#: builtin/diff.c:350 +#: builtin/diff.c:358 +#, c-format +msgid "%s...%s: no merge base" +msgstr "%s...%s: khรดng cรณ cฦก sแป hรฒa trแปn" + +#: builtin/diff.c:468 msgid "Not a git repository" msgstr "Khรดng phแบฃi lร kho git" -#: builtin/diff.c:394 +#: builtin/diff.c:513 #, c-format msgid "invalid object '%s' given." msgstr "ฤแปi tฦฐแปฃng ฤรฃ cho โ%sโ khรดng hแปฃp lแป." -#: builtin/diff.c:403 +#: builtin/diff.c:524 #, c-format msgid "more than two blobs given: '%s'" msgstr "ฤรฃ cho nhiแปu hฦกn hai ฤแปi tฦฐแปฃng blob: โ%sโ" -#: builtin/diff.c:408 +#: builtin/diff.c:529 #, c-format msgid "unhandled object '%s' given." msgstr "ฤรฃ cho ฤแปi tฦฐแปฃng khรดng thแป nแบฏm giแปฏ โ%sโ." +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "%s...%s: cรณ nhiแปu cฦก sแป ฤแป hรฒa trแปn, nรชn dรนng %s" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" 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:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "gแบทp lแปi: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "khรดng thแป ฤแปc liรชn kแบฟt mแปm %s" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, 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:305 +#: builtin/difftool.c:312 #, 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:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12524,53 +14096,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:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "cแบฃ hai tแบญp tin ฤรฃ bแป sแปญa: โ%sโ vร โ%sโ." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "cรขy lร m viแปc แป bรชn trรกi." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "cรกc tแบญp tin tแบกm ฤรฃ sแบตn cรณ trong โ%sโ." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 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:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "dรนng โdiff.guitoolโ thay vรฌ dรนng โdiff.toolโ" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "thแปฑc hiแปn mแปt diff toร n thฦฐ mแปฅc" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 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:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "dรนng liรชn kแบฟt mแปm trong diff-thฦฐ-mแปฅc" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "cรดng cแปฅ" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "dรนng cรดng cแปฅ diff ฤรฃ cho" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 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:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12578,31 +14150,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:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "chแป ฤแปnh mแปt lแปnh tรนy รฝ ฤแป xem diff" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "chuyแปn cho โdiffโ" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool cแบงn cรขy lร m viแปc hoแบทc --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff xung khแบฏc vแปi --no-index" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool vร --extcmd loแบกi tแปซ lแบซn nhau" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "chฦฐa ฤฦฐa ra <cรดng_cแปฅ> cho --tool=<cรดng_cแปฅ>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "chฦฐa ฤฦฐa ra <lแปnh> cho --extcmd=<lแปnh>" @@ -12610,25 +14182,25 @@ msgstr "chฦฐa ฤฦฐa ra <lแปnh> cho --extcmd=<lแปnh>" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <cรกc tรนy chแปn> <env-var>" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "kiแปu" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "mแบทc ฤแปnh cho git_env_*(...) ฤแป quay vแป" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "im lแบทng chแป khi dung giรก trแป git_env_*() lร m mรฃ thoรกt" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" "tรนy chแปn `--default' cแบงn mแปt giรก trแป logic vแปi `--type=bool`, khรดng phแบฃi `%s`" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -12641,160 +14213,240 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:868 +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:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "--anonymize-map thแบป khรดng thแป lร rแปng" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "hiแปn thแป tiแบฟn triแปn sau <n> ฤแปi tฦฐแปฃng" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "chแปn ฤiแปu khiแปn cแปงa thแบป ฤรฃ kรฝ" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1203 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:1132 +#: builtin/fast-export.c:1206 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:1135 +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" msgstr "ฤแป cรกc ฤรกnh dแบฅu nร y vร o tแบญp-tin" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" msgstr "Nhแบญp vร o ฤรกnh dแบฅu tแปซ tแบญp tin nร y" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1215 +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:1217 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:1141 +#: builtin/fast-export.c:1219 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:1143 +#: builtin/fast-export.c:1221 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:1144 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "Bแป qua kแบฟt xuแบฅt cแปงa dแปฏ liแปu blob" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1223 builtin/log.c:1811 msgid "refspec" msgstr "refspec" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1224 msgid "Apply refspec to exported refs" msgstr "รp dแปฅng refspec cho refs ฤรฃ xuแบฅt" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "kแบฟt xuแบฅt anonymize" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "tแปซ:ฤแบฟn" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "chuyแปn ฤแปi <from> sang <to> ฤแบงu ra แบฉn danh" + +#: builtin/fast-export.c:1230 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:1151 +#: builtin/fast-export.c:1232 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/fetch.c:30 +#: builtin/fast-export.c:1234 +msgid "Label tags with mark ids" +msgstr "Gแบฏn nhรฃn thแบป ID dแบฅu" + +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "--anonymize-map mร khรดng cรณ --anonymize lร khรดng hแปฃp lรฝ" + +#: builtin/fast-export.c:1272 +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/fast-import.c:3086 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "Thiแบฟu cรกc ฤรกnh dแบฅu cho mรด-ฤun-con โ%sโ" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "Thiแบฟu ฤรกnh dแบฅu cho mรด-ฤun-con โ%sโ" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "Cแบงn lแปnh 'mark', nhฦฐng lแบกi nhแบญn ฤฦฐแปฃc %s" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "Cแบงn lแปnh 'to', nhฦฐng lแบกi nhแบญn ฤฦฐแปฃc %s" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "Cแบงn ฤแปnh dแบกng tรชn:tรชn_tแบญp_tin cho tรนy chแปn ghi lแบกi mรด-ฤun-con" + +#: builtin/fast-import.c:3374 +#, 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" + +#: builtin/fetch-pack.c:241 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "Tแบญp tin khรณa ฤรฃ ฤฦฐแปฃc tแบกo nhฦฐng chฦฐa ฤฦฐแปฃc bรกo cรกo: %s" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<cรกc tรนy chแปn>] [<kho-chแปฉa> [<refspec>โฆ]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [<cรกc tรนy chแปn>] [<nhรณm>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<cรกc tรนy chแปn>] [(<kho> | <nhรณm>)โฆ]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<cรกc tรนy chแปn>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel khรดng thแป รขm" + +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "lแบฅy vแป tแปซ tแบฅt cแบฃ cรกc mรกy chแปง" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:144 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "ฤแบทt thฦฐแปฃng nguแปn cho git pull/fetch" + +#: builtin/fetch.c:146 builtin/pull.c:188 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:129 builtin/pull.c:209 +#: builtin/fetch.c:148 builtin/pull.c:191 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:130 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "รฉp buแปc ghi ฤรจ lรชn tham chiแบฟu nแปi bแป" -#: builtin/fetch.c:132 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "lแบฅy tแปซ nhiแปu mรกy chแปง cรนng lรบc" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:153 builtin/pull.c:195 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:136 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "khรดng lแบฅy tแบฅt cแบฃ cรกc thแบป (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "sแป lฦฐแปฃng mรด-ฤun-con ฤฦฐแปฃc lแบฅy ฤแปng thแปi" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:159 builtin/pull.c:198 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:142 +#: builtin/fetch.c:161 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:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "khi-cแบงn" -#: builtin/fetch.c:144 +#: builtin/fetch.c:163 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:148 builtin/pull.c:224 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "ghi cรกc tham chiแบฟu lแบฅy vแป vร o tแบญp tin FETCH_HEAD" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "giแปฏ lแบกi gรณi ฤรฃ tแบฃi vแป" -#: builtin/fetch.c:150 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "cho phรฉp cแบญp nhแบญt th.chiแบฟu HEAD" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "lร m sรขu hฦกn lแปch sแปญ cแปงa bแบฃn sao" -#: builtin/fetch.c:155 +#: builtin/fetch.c:176 builtin/pull.c:212 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:161 builtin/pull.c:230 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "chuyแปn ฤแปi hoร n toร n sang kho git" -#: builtin/fetch.c:164 +#: builtin/fetch.c:185 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:167 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12802,91 +14454,99 @@ 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:171 builtin/pull.c:233 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "chแบฅp nhแบญn tham chiแบฟu cแบญp nhแบญt .git/shallow" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "chแป ra refmap cแบงn lแบฅy vแป" -#: builtin/fetch.c:180 +#: builtin/fetch.c:201 builtin/pull.c:240 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:183 -msgid "run 'gc --auto' after fetching" -msgstr "chแบกy 'gc --auto' sau khi lแบฅy vแป" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "chแบกy 'maintenance --auto' sau khi lแบฅy vแป" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:208 builtin/pull.c:243 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:491 +#: builtin/fetch.c:210 +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:212 +msgid "accept refspecs from stdin" +msgstr "chแบฅp nhแบญn tham chiแบฟu tแปซ ฤแบงu vร o tiรชu chuแบฉn" + +#: builtin/fetch.c:523 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:630 +#: builtin/fetch.c:677 #, 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:728 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "khรดng tรฌm thแบฅy ฤแปi tฦฐแปฃng %s" -#: builtin/fetch.c:732 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "[ฤรฃ cแบญp nhแบญt]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[Bแป tแปซ chแปi]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "khรดng thแป fetch (lแบฅy) vแป nhรกnh hiแปn hร nh" -#: builtin/fetch.c:756 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[cแบญp nhแบญt thแบป]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "khรดng thแป cแบญp nhแบญt tham chiแบฟu nแปi bแป" -#: builtin/fetch.c:761 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "nรชn xรณa chแปng cรกc thแบป cรณ sแบตn" -#: builtin/fetch.c:783 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[thแบป mแปi]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[nhรกnh mแปi]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[ref (tham chiแบฟu) mแปi]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:875 msgid "forced update" msgstr "cฦฐแปกng bแปฉc cแบญp nhแบญt" -#: builtin/fetch.c:833 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "khรดng-phแบฃi-chuyแปn-tiแบฟp-nhanh" -#: builtin/fetch.c:854 +#: builtin/fetch.c:901 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" @@ -12896,7 +14556,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:858 +#: builtin/fetch.c:905 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -12909,22 +14569,22 @@ msgstr "" "false'\n" "ฤแป trรกnh kiแปm tra nร y.\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:939 #, 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:909 +#: builtin/fetch.c:960 #, 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:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "Tแปซ %.*s\n" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -12933,60 +14593,81 @@ 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:1101 +#: builtin/fetch.c:1161 #, 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:1102 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " (%s ฤรฃ trแป thร nh khรดng ฤแบงu (khรดng ฤฦฐแปฃc quแบฃn lรฝ))" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[ฤรฃ xรณa]" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1195 builtin/remote.c:1113 msgid "(none)" msgstr "(khรดng)" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1218 #, 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:1177 +#: builtin/fetch.c:1237 #, 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:1180 +#: builtin/fetch.c:1240 #, 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:1484 +#: builtin/fetch.c:1448 +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:1463 +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:1465 +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:1467 +msgid "unknown branch type" +msgstr "khรดng hiแปu kiแปu nhรกnh" + +#: builtin/fetch.c:1469 +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:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "ฤang lแบฅy โ%sโ vแป\n" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Khรดng thแป lแบฅyโ%sโ vแป" -#: 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:1620 +#, 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:1556 +#: builtin/fetch.c:1724 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -12994,44 +14675,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:1593 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "Bแบกn phแบฃi ฤแปnh rรต tรชn thแบป." -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1825 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:1646 +#: builtin/fetch.c:1827 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:1651 +#: builtin/fetch.c:1832 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:1653 +#: builtin/fetch.c:1834 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:1669 +#: builtin/fetch.c:1851 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:1671 +#: builtin/fetch.c:1853 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:1680 +#: builtin/fetch.c:1862 #, 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:1687 +#: builtin/fetch.c:1869 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:1703 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13039,30 +14720,35 @@ msgstr "" "--filter chแป cรณ thแป ฤฦฐแปฃc dรนng vแปi mรกy chแปง ฤฦฐแปฃc cแบฅu hรฌnh bแบฑng extensions." "partialclone" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fetch.c:1891 +#| msgid "Option --exec can only be used together with --remote" +msgid "--stdin can only be used when fetching from one remote" +msgstr "--stdin chแป cรณ thแป dรนng khi lแบฅy vแป tแปซ mแปt mรกy chแปง" + +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <chรบ_thรญch>] [--log[=<n>] | --no-log] [--file <tแบญp-" "tin>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 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:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "bรญ danh cho --log (khรดng ฤฦฐแปฃc dรนng)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "vฤn bแบฃn" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 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:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "tแบญp tin ฤแป ฤแปc dแปฏ liแปu tแปซ ฤรณ" @@ -13075,8 +14761,10 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <ฤแปi tฦฐแปฃng>]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<lแบงn-chuyแปn-giao>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +msgstr "" +"git for-each-ref [--merged [<lแบงn-chuyแปn-giao>]] [--no-merged [<lแบงn-chuyแปn-" +"giao>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" @@ -13104,7 +14792,7 @@ msgstr "trรญch dแบซn ฤแป phรน hแปฃp cho Tcl" msgid "show only <n> matched refs" msgstr "hiแปn thแป chแป <n> tham chiแบฟu khแปp" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "cรกc mร u ฤแปnh dแบกng lฦฐu tรขm" @@ -13128,32 +14816,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:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "khรดng hiแปu" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, 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:131 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" msgstr "cรณ cแบฃnh bรกo trong %s %s: %s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "liรชn kแบฟt gรฃy tแปซ %7s %s" -#: builtin/fsck.c:168 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "kiแปu ฤแปi tฦฐแปฃng sai trong liรชn kแบฟt" -#: builtin/fsck.c:184 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" @@ -13162,235 +14850,235 @@ msgstr "" "liรชn kแบฟt gรฃy tแปซ %7s %s \n" " tแปi %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "thiแบฟu %s %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "khรดng tiแบฟp cแบญn ฤฦฐแปฃc %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "dangling %s %s" -#: builtin/fsck.c:349 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "khรดng thแป tแบกo lost-found" -#: builtin/fsck.c:360 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "khรดng thแป hoร n thร nh โ%sโ" -#: builtin/fsck.c:377 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "ฤang kiแปm tra %s" -#: builtin/fsck.c:415 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "ฤang kiแปm tra kแบฟt nแปi (%d ฤแปi tฦฐแปฃng)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "ฤang kiแปm tra %s %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:430 msgid "broken links" msgstr "cรกc liรชn kแบฟt bแป gแบซy" -#: builtin/fsck.c:447 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "gแปc %s" -#: builtin/fsck.c:455 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "ฤรฃ ฤรกnh thแบป %s %s (%s) trong %s" -#: builtin/fsck.c:484 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: ฤแปi tฦฐแปฃng thiแบฟu hay hแปng" -#: builtin/fsck.c:509 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: mแปฅc reflog khรดng hแปฃp lแป %s" -#: builtin/fsck.c:523 +#: builtin/fsck.c:515 #, 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:557 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: con trแป sha1 khรดng hแปฃp lแป %s" -#: builtin/fsck.c:564 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "%s: khรดng phแบฃi lร mแปt lแบงn chuyแปn giao" -#: builtin/fsck.c:619 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "cแบฃnh bรกo: Khรดng cรณ cรกc tham chiแบฟu mแบทc ฤแปnh" -#: builtin/fsck.c:634 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: thiแบฟu ฤแปi tฦฐแปฃng hoแบทc hแปng: %s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:638 #, 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:667 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "tแบญp tin sha1 sai: %s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "ฤang kiแปm tra thฦฐ mแปฅc ฤแปi tฦฐแปฃng" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "ฤang kiแปm tra cรกc thฦฐ mแปฅc ฤแปi tฦฐแปฃng" -#: builtin/fsck.c:700 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "ฤang lแบฅy liรชn kแบฟt %s" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "%s khรดng hแปฃp lแป" -#: builtin/fsck.c:712 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "%s chแป ฤแบฟn thแปฉ gรฌ ฤรณ xa lแบก (%s)" -#: builtin/fsck.c:718 +#: builtin/fsck.c:709 #, 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:722 +#: builtin/fsck.c:713 #, 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:734 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "ฤang kiแปm tra cรขy nhแป tแบกm" -#: builtin/fsck.c:739 +#: builtin/fsck.c:730 #, 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:750 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "non-tree trong cache-tree" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<cรกc tรนy chแปn>] [<ฤแปi-tฦฐแปฃng>โฆ]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "hiแปn thแป cรกc ฤแปi tฦฐแปฃng khรดng thแป ฤแปc ฤฦฐแปฃc" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "hiแปn thแป cรกc ฤแปi tฦฐแปฃng khรดng ฤฦฐแปฃc quแบฃn lรฝ" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "bรกo cรกo cรกc thแบป" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "bรกo cรกo node gแปc" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "tแบกo โindex objects head nodesโ" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "tแบกo โreflogs head nodesโ (mแบทc ฤแปnh)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 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:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "chแป kiแปm tra kแบฟt nแปi" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "cho phรฉp kiแปm tra hแบกn chแบฟ hฦกn" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 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:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "hiแปn thแป quรก trรฌnh" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 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:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "ฤang kiแปm tra cรกc ฤแปi tฦฐแปฃng" -#: builtin/fsck.c:887 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "%s: thiแบฟu ฤแปi tฦฐแปฃng" -#: builtin/fsck.c:899 +#: builtin/fsck.c:886 #, 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:34 +#: builtin/gc.c:36 msgid "git gc [<options>]" msgstr "git gc [<cรกc tรนy chแปn>]" -#: builtin/gc.c:90 +#: builtin/gc.c:91 #, c-format msgid "Failed to fstat %s: %s" msgstr "Gแบทp lแปi khi lแบฅy thรดng tin thแปng kรช vแป tแบญp tin %s: %s" -#: builtin/gc.c:126 +#: builtin/gc.c:127 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "gแบทp lแปi khi phรขn tรญch โ%sโ giรก trแป โ%sโ" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "khรดng thแป lแบฅy thรดng tin thแปng kรช vแป โ%sโ" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "khรดng thแป ฤแปc โ%sโ" @@ -13472,7 +15160,60 @@ 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:29 +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<nhiแปm vแปฅ>]" + +#: builtin/gc.c:812 +msgid "failed to write commit-graph" +msgstr "gแบทp lแปi khi ghi ฤแป thแป cรกc lแบงn chuyแปn giao" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "ฤรฃ cรณ khรณa cแปงa tแบญp tin '%s', bแป qua bแบฃo trรฌ " + +#: builtin/gc.c:932 +#, c-format +msgid "task '%s' failed" +msgstr "gแบทp lแปi khi thแปฑc hiแปn nhiแปm vแปฅ โ%sโ" + +#: builtin/gc.c:979 +#, c-format +msgid "'%s' is not a valid task" +msgstr "โ%sโ khรดng phแบฃi mแปt nhiแปm vแปฅ hแปฃp lแป" + +#: builtin/gc.c:984 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "nhiแปm vแปฅ โ%sโ khรดng ฤฦฐแปฃc chแปn nhiแปu lแบงn" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "chแบกy nhiแปm vแปฅ dแปฑa trรชn trแบกng thรกi cแปงa kho chแปฉa" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "ฤแปซng bรกo cรกo diแป n tiแบฟn hay cรกc thรดng tin khรกc ra ฤแบงu lแปi tiรชu chuแบฉn" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "tรกc vแปฅ" + +#: builtin/gc.c:1003 +msgid "run a specific task" +msgstr "chแบกy mแปt nhiแปm vแปฅ cแปฅ thแป" + +#: builtin/gc.c:1026 +msgid "git maintenance run [<options>]" +msgstr "git maintenance run [<cรกc tรนy chแปn>]" + +#: builtin/gc.c:1037 +#, c-format +msgid "invalid subcommand: %s" +msgstr "lแปn con khรดng hแปฃp lแป: %s" + +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<cรกc tรนy chแปn>] [-e] <mแบซu> [<rev>โฆ] [[--] </ฤฦฐแปng/dแบซn>โฆ]" @@ -13490,259 +15231,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:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "khรดng hแป trแปฃ ฤa tuyแบฟn, bแป qua %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "khรดng thแป ฤแปc cรขy (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:655 #, 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:714 +#: builtin/grep.c:725 #, 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:813 +#: builtin/grep.c:824 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:815 +#: builtin/grep.c:826 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:817 +#: builtin/grep.c:828 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:819 +#: builtin/grep.c:830 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:821 +#: builtin/grep.c:832 msgid "recursively search in each submodule" msgstr "tรฌm kiแบฟm ฤแป quy trong tแปซng mรด-ฤun-con" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "show non-matching lines" msgstr "hiแปn thแป nhแปฏng dรฒng khรดng khแปp vแปi mแบซu" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "case insensitive matching" msgstr "phรขn biแปt HOA/thฦฐแปng" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "match patterns only at word boundaries" msgstr "chแป khแปp mแบซu tแบกi ฤฦฐแปng ranh giแปi tแปซ" -#: builtin/grep.c:830 +#: builtin/grep.c:841 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:832 +#: builtin/grep.c:843 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:835 +#: builtin/grep.c:846 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:837 +#: builtin/grep.c:848 msgid "search in subdirectories (default)" msgstr "tรฌm kiแบฟm trong thฦฐ mแปฅc con (mแบทc ฤแปnh)" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "descend at most <depth> levels" msgstr "hแบก xuแปng รญt nhแบฅt lร mแปฉc <sรขu>" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "use extended POSIX regular expressions" msgstr "dรนng biแปu thแปฉc chรญnh qui POSIX cรณ mแป rแปng" -#: builtin/grep.c:846 +#: builtin/grep.c:857 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:849 +#: builtin/grep.c:860 msgid "interpret patterns as fixed strings" msgstr "diแป n dแปch cรกc mแบซu nhฦฐ lร chuแปi cแป ฤแปnh" -#: builtin/grep.c:852 +#: builtin/grep.c:863 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:855 +#: builtin/grep.c:866 msgid "show line numbers" msgstr "hiแปn thแป sแป cแปงa dรฒng" -#: builtin/grep.c:856 +#: builtin/grep.c:867 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:857 +#: builtin/grep.c:868 msgid "don't show filenames" msgstr "khรดng hiแปn thแป tรชn tแบญp tin" -#: builtin/grep.c:858 +#: builtin/grep.c:869 msgid "show filenames" msgstr "hiแปn thแป cรกc tรชn tแบญp tin" -#: builtin/grep.c:860 +#: builtin/grep.c:871 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:862 +#: builtin/grep.c:873 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:864 +#: builtin/grep.c:875 msgid "synonym for --files-with-matches" msgstr "ฤแปng nghฤฉa vแปi --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:878 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:869 +#: builtin/grep.c:880 msgid "print NUL after filenames" msgstr "thรชm NUL vร o sau tรชn tแบญp tin" -#: builtin/grep.c:872 +#: builtin/grep.c:883 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:874 +#: builtin/grep.c:885 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:875 +#: builtin/grep.c:886 msgid "highlight matches" msgstr "tรด sรกng phแบงn khแปp mแบซu" -#: builtin/grep.c:877 +#: builtin/grep.c:888 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:879 +#: builtin/grep.c:890 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:882 +#: builtin/grep.c:893 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:885 +#: builtin/grep.c:896 msgid "show <n> context lines before matches" msgstr "hiแปn thแป <n> dรฒng nแปi dung trฦฐแปc khแปp" -#: builtin/grep.c:887 +#: builtin/grep.c:898 msgid "show <n> context lines after matches" msgstr "hiแปn thแป <n> dรฒng nแปi dung sau khแปp" -#: builtin/grep.c:889 +#: builtin/grep.c:900 msgid "use <n> worker threads" msgstr "dรนng <n> tuyแบฟn trรฌnh lร m viแปc" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "shortcut for -C NUM" msgstr "dแบกng viแบฟt tแบฏt cแปงa -C Sแป" -#: builtin/grep.c:893 +#: builtin/grep.c:904 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:895 +#: builtin/grep.c:906 msgid "show the surrounding function" msgstr "hiแปn thแป hร m bao quanh" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "read patterns from file" msgstr "ฤแปc mแบซu tแปซ tแบญp-tin" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "match <pattern>" msgstr "match <mแบซu>" -#: builtin/grep.c:902 +#: builtin/grep.c:913 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:914 +#: builtin/grep.c:925 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:916 +#: builtin/grep.c:927 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:918 +#: builtin/grep.c:929 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:922 +#: builtin/grep.c:933 msgid "pager" msgstr "dร n trang" -#: builtin/grep.c:922 +#: builtin/grep.c:933 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:926 +#: builtin/grep.c:937 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:990 +#: builtin/grep.c:1004 msgid "no pattern given" msgstr "chฦฐa chแป ra mแบซu" -#: builtin/grep.c:1026 +#: builtin/grep.c:1040 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:1034 +#: builtin/grep.c:1048 #, 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:1065 +#: builtin/grep.c:1078 +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:1082 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:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "khรดng hแป trแปฃ ฤa tuyแบฟn, bแป qua --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "sแป tuyแบฟn chแป ra khรดng hแปฃp lแป (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1122 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: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 +#: builtin/grep.c:1148 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:1129 +#: builtin/grep.c:1154 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:1137 +#: builtin/grep.c:1162 msgid "both --cached and trees are given" msgstr "cแบฃ hai --cached vร cรกc cรขy phแบฃi ฤฦฐแปฃc chแป ra" @@ -13783,66 +15524,66 @@ msgstr "chแป cแบงn bฤm rรกc ngแบซu nhiรชn ฤแป tแบกo mแปt ฤแปi tฦฐแปฃng hแ msgid "process file as it were from this path" msgstr "xแปญ lรฝ tแบญp tin nhฦฐ lร nรณ ฤang แป thฦฐ mแปฅc nร y" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "hiแปn thแป danh sรกch cรกc cรขu lแปnh ngฦฐแปi dรนng cรณ thแป sแปญ dแปฅng" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "hฦฐแปng dแบซn loแบกi trแปซ" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "hiแปn thแป danh sรกch cรกc hฦฐแปng dแบซn hแปฏu dแปฅng" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "in ra tแบฅt cแบฃ cรกc tรชn biแบฟn cแบฅu hรฌnh" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "hiแปn thแป trang man" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "hiแปn thแป hฦฐแปng dแบซn sแปญ dแปฅng trong trรฌnh duyแปt web" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "hiแปn trang info" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "hiแปn thแป mรด tแบฃ lแปnh" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<lแปnh>]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "khรดng nhแบญn ra ฤแปnh dแบกng trแปฃ giรบp โ%sโ" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "Gแบทp lแปi khi khแปi chแบกy emacsclient." -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "Gแบทp lแปi khi phรขn tรญch phiรชn bแบฃn emacsclient." -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "phiรชn bแบฃn cแปงa emacsclient โ%dโ quรก cลฉ (< 22)." -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "gแบทp lแปi khi thแปฑc thi โ%sโ" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -13851,7 +15592,7 @@ msgstr "" "โ%sโ: ฤฦฐแปng dแบซn khรดng hแป trแปฃ bแป trรฌnh chiแบฟu man.\n" "Hรฃy cรขn nhแบฏc ฤแบฟn viแปc sแปญ dแปฅng โman.<tool>.cmdโ ฤแป thay thแบฟ." -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -13860,390 +15601,418 @@ msgstr "" "โ%sโ: cmd (lแปnh) hแป trแปฃ bแป trรฌnh chiแบฟu man.\n" "Hรฃy cรขn nhแบฏc ฤแบฟn viแปc sแปญ dแปฅng โman.<tool>.pathโ ฤแป thay thแบฟ." -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "โ%sโ: khรดng rรต chฦฐฦกng trรฌnh xem man." -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "khรดng cรณ trรฌnh xem trแปฃ giรบp dแบกng manpage tiแบฟp hแปฃp vแปi yรชu cแบงu" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "khรดng cรณ trรฌnh xem trแปฃ giรบp dแบกng info tiแบฟp hแปฃp vแปi yรชu cแบงu" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "โ%sโ ฤฦฐแปฃc ฤแบทt bรญ danh thร nh โ%sโ" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "chuแปi alias.%s sai: %s" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "cรกch dรนng: %s%s" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "Chแบกy lแปnh โgit help configโ ฤแป cรณ thรชm thรดng tin" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "kiแปu ฤแปi tฦฐแปฃng khรดng khแปp tแบกi %s" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "khรดng thแป lแบฅy vแป ฤแปi tฦฐแปฃng cแบงn %s" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "ฤแปi tฦฐแปฃng %s: cแบงn kiแปu %s nhฦฐng lแบกi nhแบญn ฤฦฐแปฃc %s" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "khรดng thแป ฤiแปn thรชm vร o %d byte" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "gแบทp kแบฟt thรบc tแบญp tin EOF quรก sแปm" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "lแปi ฤแปc แป ฤแบงu vร o" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 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:604 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 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:94 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "gรณi ฤรฃ vฦฐแปฃt quรก cแปก tแปi ฤa ฤฦฐแปฃc phรฉp" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:342 builtin/repack.c:254 +#, c-format +msgid "unable to create '%s'" +msgstr "khรดng thแป tแบกo โ%sโ" + +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "khรดng thแป mแป packfile โ%sโ" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "chแปฏ kรฝ cho gรณi khรดng khแปp" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "khรดng hแป trแปฃ phiรชn bแบฃn gรณi %<PRIu32>" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "gรณi cรณ ฤแปi tฦฐแปฃng sai tแบกi khoแบฃng bรน %<PRIuMAX>: %s" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "xแบฃ nรฉn trแบฃ vแป %d" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "trร n giรก trแป khoแบฃng bรน cho ฤแปi tฦฐแปฃng delta cฦก sแป" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "khoแบฃng bรน cฦก sแป cho delta nแบฑm ngoร i phแบกm vi" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "khรดng hiแปu kiแปu ฤแปi tฦฐแปฃng %d" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "khรดng thแป chแบกy hร m pread cho tแบญp tin gรณi" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "tแบญp tin gรณi bแป kแบฟt thรบc sแปm, thiแบฟu %<PRIuMAX> byte" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 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:764 -#: builtin/index-pack.c:803 builtin/index-pack.c:812 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, 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:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "khรดng thแป ฤแปc %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:824 #, 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:809 +#: builtin/index-pack.c:832 #, 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:823 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "ฤแปi tฦฐแปฃng blob khรดng hแปฃp lแป %s" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "lแปi fsck trong ฤแปi tฦฐแปฃng ฤรณng gรณi" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:870 #, 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:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "gแบทp lแปi khi รกp dแปฅng delta" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "ฤang nhแบญn vแป cรกc ฤแปi tฦฐแปฃng" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "Cรกc ฤแปi tฦฐแปฃng bแบฃng mแปฅc lแปฅc" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "gรณi bแป sai hแปng (SHA1 khรดng khแปp)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "khรดng thแป lแบฅy thรดng tin thแปng kรช packfile" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "pack cรณ phแบงn thแปซa แป cuแปi" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1215 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:1195 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "ฤang phรขn giแบฃi cรกc delta" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "khรดng thแป tแบกo tuyแบฟn: %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "lแปn xแปn hฦกn cแบฃ ฤiรชn rแป" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1288 #, 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:1264 +#: builtin/index-pack.c:1300 #, 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:1268 +#: builtin/index-pack.c:1304 #, 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:1292 +#: builtin/index-pack.c:1328 #, 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:1388 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "ฤแปi tฦฐแปฃng nแปi bแป %s bแป hแปng" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1444 #, 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:1427 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "khรดng thแป ghi %s tแบญp tin โ%sโ" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1477 #, 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:1459 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "gแบทp lแปi trong khi ฤรณng tแบญp tin gรณi" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "khรดng thแป lฦฐu tแบญp tin gรณi" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "khรดng thแป lฦฐu trแปฏ tแบญp tin ghi mแปฅc lแปฅc" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1631 #, 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:1595 +#: builtin/index-pack.c:1633 #, 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:1643 +#: builtin/index-pack.c:1681 #, 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:1650 +#: builtin/index-pack.c:1688 #, 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:1689 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "Khรดng thแป quay lแบกi cwd" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "khรดng hiแปu thuแบญt toรกn bฤm dแปฏ liแปu โ%sโ" + +#: builtin/index-pack.c:1821 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:1779 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "--stdin cแบงn mแปt kho git" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1825 +msgid "--object-format cannot be used with --stdin" +msgstr "--object-format khรดng thแป ฤฦฐแปฃc dรนng vแปi --stdin" + +#: builtin/index-pack.c:1831 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:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "lแปi fsck trong cรกc ฤแปi tฦฐแปฃng gรณi" -#: builtin/init-db.c:61 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "khรดng thแป lแบฅy thรดng tin thแปng kรช vแป mแบซu โ%sโ" -#: builtin/init-db.c:66 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "khรดng thแป opendir() โ%sโ" -#: builtin/init-db.c:78 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "khรดng thแป readlink โ%sโ" -#: builtin/init-db.c:80 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "khรดng thแป tแบกo liรชn kแบฟt mแปm (symlink) โ%sโ โ%sโ" -#: builtin/init-db.c:86 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "khรดng thแป sao chรฉp โ%sโ sang โ%sโ" -#: builtin/init-db.c:90 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "ฤang lแป ฤi mแบซu โ%sโ" -#: builtin/init-db.c:121 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "cรกc mแบซu khรดng ฤฦฐแปฃc tรฌm thแบฅy trong %s" -#: builtin/init-db.c:136 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "khรดng sao chรฉp cรกc mแบซu tแปซ โ%sโ: %s" -#: builtin/init-db.c:334 +#: builtin/init-db.c:274 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "tรชn nhรกnh khแปi tแบกo khรดng hแปฃp lแป: โ%sโ" + +#: builtin/init-db.c:366 #, c-format msgid "unable to handle file type %d" msgstr "khรดng thแป xแปญ lรฝ (handle) tแบญp tin kiแปu %d" -#: builtin/init-db.c:337 +#: builtin/init-db.c:369 #, c-format msgid "unable to move %s to %s" msgstr "khรดng di chuyแปn ฤฦฐแปฃc %s vร o %s" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "cแป ฤแป khแปi tแบกo lแบกi mแปt kho vแปi kiแปu bฤm dแปฏ liแปu khรกc" + +#: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format msgid "%s already exists" msgstr "%s ฤรฃ cรณ tแปซ trฦฐแปc rแปi" -#: builtin/init-db.c:413 +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: --initial-branch=%s bแป bแป qua" + +#: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "ฤรฃ khแปi tแบกo lแบกi kho Git chia sแบป sแบตn cรณ trong %s%s\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "ฤรฃ khแปi tแบกo lแบกi kho Git sแบตn cรณ trong %s%s\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "ฤรฃ khแปi tแบกo lแบกi kho Git chia sแบป trแปng rแปng sแบตn cรณ trong %s%s\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "ฤรฃ khแปi tแบกo lแบกi kho Git trแปng rแปng sแบตn cรณ trong %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:529 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -14251,25 +16020,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<thฦฐ-mแปฅc-tแบกm>] [--shared[=<cรกc-" "quyแปn>]] [thฦฐ-mแปฅc]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:555 msgid "permissions" msgstr "cรกc quyแปn" -#: builtin/init-db.c:492 +#: builtin/init-db.c:556 msgid "specify that the git repository is to be shared amongst several users" msgstr "chแป ra cรกi mร kho git ฤฦฐแปฃc chia sแบป giแปฏa nhiแปu ngฦฐแปi dรนng" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:562 +msgid "override the name of the initial branch" +msgstr "ghi ฤรจ lรชn tรชn cแปงa nhรกnh khแปi tแบกo" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +msgid "hash" +msgstr "bฤm" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "chแป ฤแปnh thuแบญt toรกn bฤm dแปฏ liแปu muแปn dรนng" + +#: builtin/init-db.c:571 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "Cรกc tรนy chแปn --separate-git-dir vร --bare loแบกi tแปซ lแบซn nhau" + +#: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format msgid "cannot mkdir %s" msgstr "khรดng thแป mkdir (tแบกo thฦฐ mแปฅc): %s" -#: builtin/init-db.c:538 +#: builtin/init-db.c:609 builtin/init-db.c:664 #, c-format msgid "cannot chdir to %s" msgstr "khรดng thแป chdir (chuyแปn ฤแปi thฦฐ mแปฅc) sang %s" -#: builtin/init-db.c:559 +#: builtin/init-db.c:636 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -14278,11 +16063,15 @@ msgstr "" "%s (hoแบทc --work-tree=<thฦฐ-mแปฅc>) khรดng cho phรฉp khรดng chแป ฤแปnh %s (hoแบทc --git-" "dir=<thฦฐ-mแปฅc>)" -#: builtin/init-db.c:587 +#: builtin/init-db.c:688 #, c-format msgid "Cannot access work tree '%s'" msgstr "Khรดng thแป truy cแบญp cรขy (tree) lร m viแปc โ%sโ" +#: builtin/init-db.c:693 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separate-git-dir xung khแบฏc vแปi kho thuแบงn" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -14347,121 +16136,126 @@ 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:55 +#: builtin/log.c:56 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:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<cรกc tรนy chแปn>] <ฤแปi-tฦฐแปฃng>โฆ" -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "tรนy chแปn--decorate khรดng hแปฃp lแป: %s" -#: builtin/log.c:173 +#: builtin/log.c:177 msgid "show source" msgstr "hiแปn thแป mรฃ nguแปn" -#: builtin/log.c:174 +#: builtin/log.c:178 msgid "Use mail map file" msgstr "Sแปญ dแปฅng tแบญp tin รกnh xแบก thฦฐ" -#: builtin/log.c:176 +#: builtin/log.c:181 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:178 +#: builtin/log.c:183 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:179 +#: builtin/log.c:184 msgid "decorate options" msgstr "cรกc tรนy chแปn trang trรญ" -#: builtin/log.c:182 +#: builtin/log.c:187 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:280 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "Kแบฟt xuแบฅt cuแปi cรนng: %d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:555 #, c-format msgid "git show %s: bad file" msgstr "git show %s: sai tแบญp tin" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:570 builtin/log.c:665 #, c-format msgid "could not read object %s" msgstr "khรดng thแป ฤแปc ฤแปi tฦฐแปฃng %s" -#: builtin/log.c:668 +#: builtin/log.c:690 #, c-format msgid "unknown type: %d" msgstr "khรดng nhแบญn ra kiแปu: %d" -#: builtin/log.c:791 +#: builtin/log.c:839 +#, 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:846 msgid "format.headers without value" msgstr "format.headers khรดng cรณ giรก trแป cแปฅ thแป" -#: builtin/log.c:908 +#: builtin/log.c:965 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:924 +#: builtin/log.c:981 #, c-format msgid "cannot open patch file %s" msgstr "khรดng thแป mแป tแบญp tin miแบฟng vรก: %s" -#: builtin/log.c:941 +#: builtin/log.c:998 msgid "need exactly one range" msgstr "cแบงn chรญnh xรกc mแปt vรนng" -#: builtin/log.c:951 +#: builtin/log.c:1008 msgid "not a range" msgstr "khรดng phแบฃi lร mแปt vรนng" -#: builtin/log.c:1074 +#: builtin/log.c:1172 msgid "cover letter needs email format" msgstr "โcover letterโ cแบงn cho ฤแปnh dแบกng thฦฐ" -#: builtin/log.c:1080 +#: builtin/log.c:1178 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:1159 +#: builtin/log.c:1259 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to ฤiรชn rแป: %s" -#: builtin/log.c:1186 +#: builtin/log.c:1286 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:1244 +#: builtin/log.c:1344 msgid "two output directories?" msgstr "hai thฦฐ mแปฅc kแบฟt xuแบฅt?" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 #, c-format msgid "unknown commit %s" msgstr "khรดng hiแปu lแบงn chuyแปn giao %s" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1506 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:1370 +#: builtin/log.c:1515 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:1374 +#: builtin/log.c:1525 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" @@ -14472,271 +16266,285 @@ 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:1394 +#: builtin/log.c:1548 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:1405 +#: builtin/log.c:1565 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:1409 +#: builtin/log.c:1575 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:1462 +#: builtin/log.c:1633 msgid "cannot get patch id" msgstr "khรดng thแป lแบฅy mรฃ miแบฟng vรก" -#: 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:1690 +msgid "failed to infer range-diff origin of current series" +msgstr "" +"gแบทp lแปi khi suy luแบญn range-diff (vรนng khรกc biแปt) gแปc cแปงa sรช-ri hiแปn tแบกi" + +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "dรนng '%s' nhฦฐ lร gแปc range-diff cแปงa sรช-ri hiแปn tแบกi" -#: builtin/log.c:1559 +#: builtin/log.c:1736 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:1562 +#: builtin/log.c:1739 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:1566 +#: builtin/log.c:1743 msgid "print patches to standard out" msgstr "hiแปn thแป miแบฟng vรก ra ฤแบงu ra chuแบฉn" -#: builtin/log.c:1568 +#: builtin/log.c:1745 msgid "generate a cover letter" msgstr "tแบกo bรฌ thฦฐ" -#: builtin/log.c:1570 +#: builtin/log.c:1747 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:1571 +#: builtin/log.c:1748 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1572 +#: builtin/log.c:1749 msgid "use <sfx> instead of '.patch'" msgstr "sแปญ dแปฅng <sfx> thay cho โ.patchโ" -#: builtin/log.c:1574 +#: builtin/log.c:1751 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:1576 +#: builtin/log.c:1753 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:1578 +#: builtin/log.c:1755 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Dรนng [RFC Vร] thay cho [Vร]" -#: builtin/log.c:1581 +#: builtin/log.c:1758 +msgid "cover-from-description-mode" +msgstr "cover-from-description-mode" + +#: builtin/log.c:1759 +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:1761 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Dรนng [<tiแปn-tแป>] thay cho [Vร]" -#: builtin/log.c:1584 +#: builtin/log.c:1764 msgid "store resulting files in <dir>" msgstr "lฦฐu cรกc tแบญp tin kแบฟt quแบฃ trong <t.mแปฅc>" -#: builtin/log.c:1587 +#: builtin/log.c:1767 msgid "don't strip/add [PATCH]" msgstr "khรดng strip/add [Vร]" -#: builtin/log.c:1590 +#: builtin/log.c:1770 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:1592 +#: builtin/log.c:1772 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:1594 +#: builtin/log.c:1774 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:1596 +#: builtin/log.c:1776 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:1598 +#: builtin/log.c:1778 msgid "Messaging" msgstr "Lแปi nhแบฏn" -#: builtin/log.c:1599 +#: builtin/log.c:1779 msgid "header" msgstr "ฤแบงu ฤแป thฦฐ" -#: builtin/log.c:1600 +#: builtin/log.c:1780 msgid "add email header" msgstr "thรชm ฤแบงu ฤแป thฦฐ" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1781 builtin/log.c:1782 msgid "email" msgstr "thฦฐ ฤiแปn tแปญ" -#: builtin/log.c:1601 +#: builtin/log.c:1781 msgid "add To: header" msgstr "thรชm To: ฤแบงu ฤแป thฦฐ" -#: builtin/log.c:1603 +#: builtin/log.c:1782 msgid "add Cc: header" msgstr "thรชm Cc: ฤแบงu ฤแป thฦฐ" -#: builtin/log.c:1605 +#: builtin/log.c:1783 msgid "ident" msgstr "thแปฅt lแป" -#: builtin/log.c:1606 +#: builtin/log.c:1784 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:1608 +#: builtin/log.c:1786 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1609 +#: builtin/log.c:1787 msgid "make first mail a reply to <message-id>" msgstr "dรนng thฦฐ ฤแบงu tiรชn ฤแป trแบฃ lแปi <message-id>" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1788 builtin/log.c:1791 msgid "boundary" msgstr "ranh giแปi" -#: builtin/log.c:1611 +#: builtin/log.c:1789 msgid "attach the patch" msgstr "ฤรญnh kรจm miแบฟng vรก" -#: builtin/log.c:1614 +#: builtin/log.c:1792 msgid "inline the patch" msgstr "dรนng miแบฟng vรก lร m nแปi dung" -#: builtin/log.c:1618 +#: builtin/log.c:1796 msgid "enable message threading, styles: shallow, deep" msgstr "cho phรฉp luแปng lแปi nhแบฏn, kiแปu: โshallowโ, โdeepโ" -#: builtin/log.c:1620 +#: builtin/log.c:1798 msgid "signature" msgstr "chแปฏ kรฝ" -#: builtin/log.c:1621 +#: builtin/log.c:1799 msgid "add a signature" msgstr "thรชm chแปฏ kรฝ" -#: builtin/log.c:1622 +#: builtin/log.c:1800 msgid "base-commit" msgstr "lแบงn_chuyแปn_giao_nแปn" -#: builtin/log.c:1623 +#: builtin/log.c:1801 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:1625 +#: builtin/log.c:1804 msgid "add a signature from a file" msgstr "thรชm chแปฏ kรฝ tแปซ mแปt tแบญp tin" -#: builtin/log.c:1626 +#: builtin/log.c:1805 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:1628 +#: builtin/log.c:1807 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:1630 +#: builtin/log.c:1809 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:1633 +#: builtin/log.c:1812 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:1635 +#: builtin/log.c:1814 msgid "percentage by which creation is weighted" msgstr "tแปท lแป phแบงn trฤm theo cรกi tแบกo lร weighted" -#: builtin/log.c:1710 +#: builtin/log.c:1896 #, c-format msgid "invalid ident line: %s" -msgstr "dรฒng thแปฅt lแป khรดng hแปฃp lแป: %s" +msgstr "dรฒng ฤแปnh danh khรดng hแปฃp lแป: %s" -#: builtin/log.c:1725 +#: builtin/log.c:1911 msgid "-n and -k are mutually exclusive" -msgstr "-n vร -k loแบกi tแปซ lแบซn nhau" +msgstr "-n vร -k loแบกi trแปซ lแบซn nhau" -#: builtin/log.c:1727 +#: builtin/log.c:1913 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc vร -k xung khแบฏc nhau" -#: builtin/log.c:1735 +#: builtin/log.c:1921 msgid "--name-only does not make sense" msgstr "--name-only khรดng hแปฃp lรฝ" -#: builtin/log.c:1737 +#: builtin/log.c:1923 msgid "--name-status does not make sense" msgstr "--name-status khรดng hแปฃp lรฝ" -#: builtin/log.c:1739 +#: builtin/log.c:1925 msgid "--check does not make sense" msgstr "--check khรดng hแปฃp lรฝ" -#: builtin/log.c:1771 +#: builtin/log.c:1958 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:1860 +#: builtin/log.c:2062 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff cแบงn --cover-letter hoแบทc vรก ฤฦกn" -#: builtin/log.c:1864 +#: builtin/log.c:2066 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1865 +#: builtin/log.c:2067 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff dแปฑa trรชn v%d:" -#: builtin/log.c:1871 +#: builtin/log.c:2073 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor yรชu cแบงu --range-diff" -#: builtin/log.c:1875 +#: builtin/log.c:2077 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:1883 +#: builtin/log.c:2085 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:1884 +#: builtin/log.c:2086 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff dแปฑa trรชn v%d:" -#: builtin/log.c:1895 +#: builtin/log.c:2097 #, c-format msgid "unable to read signature file '%s'" msgstr "khรดng thแป ฤแปc tแบญp tin chแปฏ kรฝ โ%sโ" -#: builtin/log.c:1931 +#: builtin/log.c:2133 msgid "Generating patches" msgstr "ฤang tแบกo cรกc miแบฟng vรก" -#: builtin/log.c:1975 +#: builtin/log.c:2177 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:2034 +#: builtin/log.c:2236 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<thฦฐแปฃng-nguแปn> [<ฤแบงu> [<giแปi-hแบกn>]]]" -#: builtin/log.c:2088 +#: builtin/log.c:2290 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14744,110 +16552,110 @@ msgstr "" "Khรดng tรฌm thแบฅy nhรกnh mแบกng ฤฦฐแปฃc theo dรตi, hรฃy chแป ฤแปnh <thฦฐแปฃng-nguแปn> mแปt " "cรกch thแปง cรดng.\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<cรกc tรนy chแปn>] [<tแบญp-tin>โฆ]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "nhแบญn dแบกng cรกc trแบกng thรกi tแบญp tin vแปi thแบป" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "dรนng chแปฏ cรกi viแบฟt thฦฐแปng cho cรกc tแบญp tin โassume unchangedโ (giแบฃ ฤแปnh khรดng " "thay ฤแปi)" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "dรนng chแปฏ cรกi viแบฟt thฦฐแปng cho cรกc tแบญp tin โfsmonitor cleanโ" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "hiแปn thแป cรกc tแบญp tin ฤฦฐแปฃc nhแป tแบกm vร o ฤแบงu ra (mแบทc ฤแปnh)" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "hiแปn thแป cรกc tแบญp tin ฤรฃ xรณa trong kแบฟt xuแบฅt" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "hiแปn thแป cรกc tแบญp tin ฤรฃ bแป sแปญa ฤแปi ra kแบฟt xuแบฅt" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "hiแปn thแป cรกc tแบญp tin khรกc trong kแบฟt xuแบฅt" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "hiแปn thแป cรกc tแบญp tin bแป bแป qua trong kแบฟt xuแบฅt" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "hiแปn thแป tรชn ฤแปi tฦฐแปฃng cแปงa nแปi dung ฤฦฐแปฃc ฤแบทt lรชn bแป phรณng ra kแบฟt xuแบฅt" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "hiแปn thแป cรกc tแบญp tin trรชn hแป thแปng tแบญp tin mร nรณ cแบงn ฤฦฐแปฃc gแปก bแป" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "chแป hiแปn thแป tรชn cแปงa cรกc thฦฐ mแปฅc โkhรกcโ" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "hiแปn thแป kแบฟt thรบc dรฒng cแปงa cรกc tแบญp tin" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "khรดng hiแปn thแป thฦฐ mแปฅc rแปng" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "hiแปn thแป cรกc tแบญp tin chฦฐa hรฒa trแปn trong kแบฟt xuแบฅt" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "hiแปn thแป thรดng tin resolve-undo" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "bแป qua nhแปฏng tแบญp tin khแปp vแปi mแปt mแบซu" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "mแบซu loแบกi trแปซ ฤฦฐแปฃc ฤแปc tแปซ <tแบญp tin>" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "ฤแปc thรชm cรกc mแบซu ngoแบกi trแปซ mแปi thฦฐ mแปฅc trong <tแบญp tin>" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "thรชm loแบกi trแปซ tiรชu chuแบฉn kiแปu git" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "lร m cho kแบฟt xuแบฅt liรชn quan ฤแบฟn thฦฐ mแปฅc แป mแปฉc cao nhแบฅt (gแปc) cแปงa dแปฑ รกn" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "ฤแป quy xuyรชn qua mรด-ฤun con" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "nแบฟu <tแบญp tin> bแบฅt kแปณ khรดng แป trong bแบฃng mแปฅc lแปฅc, xแปญ lรฝ nรณ nhฦฐ mแปt lแปi" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "tree-ish" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "giแบฃ ฤแปnh rแบฑng cรกc ฤฦฐแปng dแบซn ฤรฃ bแป gแปก bแป kแป tแปซ <tree-ish> nay vแบซn hiแปn diแปn" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "hiแปn thแป dแปฏ liแปu gแปก lแปi" @@ -14865,7 +16673,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:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 msgid "exec" msgstr "thแปฑc thi" @@ -14938,193 +16746,303 @@ msgstr "liแปt kรช cรขy mแปฅc tin; khรดng chแป thฦฐ mแปฅc hiแปn hร nh (ngแปฅ ร msgid "empty mbox: '%s'" msgstr "mbox trแปng rแปng: โ%sโ" -#: builtin/merge.c:55 +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <lแบงn_chuyแปn_giao> <lแบงn_chuyแปn_giao>โฆ" + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <lแบงn_chuyแปn_giao>โฆ" + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <lแบงn_chuyแปn_giao>โฆ" + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <commit> <lแบงn_chuyแปn_giao>" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <tham-chiแบฟu> [<lแบงn_chuyแปn_giao>]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "xuแบฅt ra tแบฅt cแบฃ cรกc รดng bร , tแป tiรชn chung" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "tรฌm tแป tiรชn cแปงa hรฒa trแปn n-way ฤฦกn" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "liแปt kรช cรกc โrevโ mร nรณ khรดng thแป ฤแปc ฤฦฐแปฃc tแปซ cรกi khรกc" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "lร cha mแบน ฤแบงu tiรชn cแปงa cรกi khรกc?" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "tรฌm xem <commit> ฤฦฐแปฃc rแบฝ nhรกnh แป ฤรขu tแปซ reflog cแปงa <th.chiแบฟu>" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" +"git merge-file [<cรกc tรนy chแปn>] [-L <tรชn1> [-L <gแปc> [-L <tรชn2>]]] <tแบญp-" +"tin1> <tแบญp-tin-gแปc> <tแบญp-tin2>" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "gแปญi kแบฟt quแบฃ vร o ฤแบงu ra tiรชu chuแบฉn" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "dรนng kiแปu hรฒa dแปฑa trรชn diff3" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "ฤแป trรกnh xung ฤแปt, sแปญ dแปฅng phiรชn bแบฃn cแปงa chรบng ta" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "ฤแป trรกnh xung ฤแปt, sแปญ dแปฅng phiรชn bแบฃn cแปงa hแป" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "ฤแป trรกnh xung ฤแปt, sแปญ dแปฅng phiรชn bแบฃn kแบฟt hแปฃp" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "ฤแป trรกnh xung ฤแปt, hรฃy sแปญ dแปฅng kรญch thฦฐแปc bแป tแบกo nร y" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "khรดng cแบฃnh bรกo vแป cรกc xung ฤแปt xแบฃy ra" + +#: builtin/merge-file.c:47 +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 +#, c-format +msgid "unknown option %s" +msgstr "khรดng hiแปu tรนy chแปn %s" + +#: builtin/merge-recursive.c:53 +#, 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 +#, 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 +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 +#, 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 +#, c-format +msgid "Merging %s with %s\n" +msgstr "ฤang hรฒa trแปn %s vแปi %s\n" + +#: builtin/merge.c:56 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<cรกc tรนy chแปn>] [<commit>โฆ]" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:120 msgid "switch `m' requires a value" msgstr "switch โmโ yรชu cแบงu mแปt giรก trแป" -#: builtin/merge.c:141 +#: builtin/merge.c:143 #, 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:187 +#: builtin/merge.c:189 #, 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:188 +#: builtin/merge.c:190 #, c-format msgid "Available strategies are:" msgstr "Cรกc chiแบฟn lฦฐแปฃc sแบตn sร ng lร :" -#: builtin/merge.c:193 +#: builtin/merge.c:195 #, 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:244 builtin/pull.c:151 +#: builtin/merge.c:246 builtin/pull.c:133 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:247 builtin/pull.c:154 +#: builtin/merge.c:249 builtin/pull.c:136 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:248 builtin/pull.c:157 +#: builtin/merge.c:250 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(ฤแปng nghฤฉa vแปi --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:252 builtin/pull.c:142 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:253 builtin/pull.c:166 +#: builtin/merge.c:255 builtin/pull.c:148 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:255 builtin/pull.c:169 +#: builtin/merge.c:257 builtin/pull.c:151 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:257 builtin/pull.c:172 +#: builtin/merge.c:259 builtin/pull.c:154 msgid "edit message before committing" msgstr "sแปญa chรบ thรญch trฦฐแปc khi chuyแปn giao" -#: builtin/merge.c:259 +#: builtin/merge.c:261 msgid "allow fast-forward (default)" msgstr "cho phรฉp chuyแปn-tiแบฟp-nhanh (mแบทc ฤแปnh)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:263 builtin/pull.c:161 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:265 builtin/pull.c:182 +#: builtin/merge.c:267 builtin/pull.c:164 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:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 msgid "strategy" msgstr "chiแบฟn lฦฐแปฃc" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:269 builtin/pull.c:169 msgid "merge strategy to use" msgstr "chiแบฟn lฦฐแปฃc hรฒa trแปn sแบฝ dรนng" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option=value" msgstr "tรนy_chแปn=giรก_trแป" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:173 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:271 +#: builtin/merge.c:273 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:278 +#: builtin/merge.c:280 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:280 +#: builtin/merge.c:282 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:282 +#: builtin/merge.c:284 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:284 builtin/pull.c:198 +#: builtin/merge.c:286 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "cho phรฉp hรฒa trแปn lแปch sแปญ khรดng liรชn quan" -#: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "thแบฉm tra mรณc (hook) commit-msg" +#: builtin/merge.c:293 +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:307 +#: builtin/merge.c:310 msgid "could not run stash." msgstr "khรดng thแป chแบกy stash." -#: builtin/merge.c:312 +#: builtin/merge.c:315 msgid "stash failed" msgstr "lแปnh tแบกm cแบฅt gแบทp lแปi" -#: builtin/merge.c:317 +#: builtin/merge.c:320 #, 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:339 builtin/merge.c:356 +#: builtin/merge.c:342 builtin/merge.c:359 msgid "read-tree failed" msgstr "read-tree gแบทp lแปi" -#: builtin/merge.c:386 +#: builtin/merge.c:389 msgid " (nothing to squash)" msgstr " (khรดng cรณ gรฌ ฤแป squash)" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Squash commit -- khรดng cแบญp nhแบญt HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:450 #, 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:498 +#: builtin/merge.c:501 #, 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:585 +#: builtin/merge.c:588 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Chuแปi branch.%s.mergeoptions sai: %s" -#: builtin/merge.c:708 +#: builtin/merge.c:713 msgid "Not handling anything other than two heads merge." msgstr "Khรดng cแบงm nแบฏm gรฌ ngoร i hai head hรฒa trแปn." -#: builtin/merge.c:722 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Khรดng hiแปu tรนy chแปn cho merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "khรดng thแป ghi %s" -#: builtin/merge.c:789 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "Khรดng thแป ฤแปc tแปซ โ%sโ" -#: builtin/merge.c:798 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Vแบซn chฦฐa hรฒa trแปn cรกc lแบงn chuyแปn giao; sแปญ dแปฅng lแปnh โgit commitโ ฤแป hoร n tแบฅt " "viแปc hรฒa trแปn.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:808 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" @@ -15136,11 +17054,11 @@ msgstr "" "topic.\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:813 msgid "An empty message aborts the commit.\n" msgstr "Nแบฟu phแบงn chรบ thรญch rแปng sแบฝ hแปงy bแป lแบงn chuyแปn giao.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:816 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15149,75 +17067,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:853 +#: builtin/merge.c:869 msgid "Empty commit message." msgstr "Chรบ thรญch cแปงa lแบงn commit (chuyแปn giao) bแป trแปng rแปng." -#: builtin/merge.c:872 +#: builtin/merge.c:884 #, c-format msgid "Wonderful.\n" msgstr "Tuyแปt vแปi.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:945 #, 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:972 +#: builtin/merge.c:984 msgid "No current branch." msgstr "Khรดng phแบฃi nhรกnh hiแปn hร nh." -#: builtin/merge.c:974 +#: builtin/merge.c:986 msgid "No remote for the current branch." msgstr "Khรดng cรณ mรกy chแปง cho nhรกnh hiแปn hร nh." -#: builtin/merge.c:976 +#: builtin/merge.c:988 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:981 +#: builtin/merge.c:993 #, 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:1038 +#: builtin/merge.c:1050 #, 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:1141 +#: builtin/merge.c:1153 #, 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:1175 +#: builtin/merge.c:1187 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:1278 +#: builtin/merge.c:1291 msgid "--abort expects no arguments" msgstr "--abort khรดng nhแบญn cรกc ฤแปi sแป" -#: builtin/merge.c:1282 +#: builtin/merge.c:1295 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:1291 +#: builtin/merge.c:1313 msgid "--quit expects no arguments" msgstr "--quit khรดng nhแบญn cรกc ฤแปi sแป" -#: builtin/merge.c:1304 +#: builtin/merge.c:1326 msgid "--continue expects no arguments" msgstr "--continue khรดng nhแบญn ฤแปi sแป" -#: builtin/merge.c:1308 +#: builtin/merge.c:1330 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:1324 +#: builtin/merge.c:1346 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15225,7 +17143,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:1331 +#: builtin/merge.c:1353 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15233,214 +17151,104 @@ 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:1334 +#: builtin/merge.c:1356 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:1348 +#: builtin/merge.c:1370 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:1350 +#: builtin/merge.c:1372 msgid "You cannot combine --squash with --commit." msgstr "Bแบกn khรดng thแป kแบฟt hแปฃp --squash vแปi --commit." -#: builtin/merge.c:1366 +#: builtin/merge.c:1388 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:1383 +#: builtin/merge.c:1405 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:1385 +#: builtin/merge.c:1407 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:1390 +#: builtin/merge.c:1412 #, 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:1392 +#: builtin/merge.c:1414 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:1471 +#: builtin/merge.c:1495 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:1480 +#: builtin/merge.c:1504 msgid "Already up to date." msgstr "ฤรฃ cแบญp nhแบญt rแปi." -#: builtin/merge.c:1490 +#: builtin/merge.c:1514 #, c-format msgid "Updating %s..%s\n" msgstr "ฤang cแบญp nhแบญt %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1560 #, 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:1539 +#: builtin/merge.c:1567 #, c-format msgid "Nope.\n" msgstr "Khรดng.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1592 msgid "Already up to date. Yeeah!" msgstr "ฤรฃ cแบญp nhแบญt rแปi. Yeeah!" -#: builtin/merge.c:1570 +#: builtin/merge.c:1598 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:1593 builtin/merge.c:1658 +#: builtin/merge.c:1626 builtin/merge.c:1691 #, 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:1597 +#: builtin/merge.c:1630 #, c-format msgid "Trying merge strategy %s...\n" msgstr "ฤang thแปญ chiแบฟn lฦฐแปฃc hรฒa trแปn %sโฆ\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1682 #, 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:1651 +#: builtin/merge.c:1684 #, 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:1660 +#: builtin/merge.c:1693 #, 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:1672 +#: builtin/merge.c:1707 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Hรฒa trแปn tแปฑ ฤแปng ฤรฃ trแป nรชn tแปt; bแป dแปซng trฦฐแปc khi viแปc chuyแปn giao ฤฦฐแปฃc yรชu " "cแบงu\n" -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <lแบงn_chuyแปn_giao> <lแบงn_chuyแปn_giao>โฆ" - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <lแบงn_chuyแปn_giao>โฆ" - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <lแบงn_chuyแปn_giao>โฆ" - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <commit> <lแบงn_chuyแปn_giao>" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <tham-chiแบฟu> [<lแบงn_chuyแปn_giao>]" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "xuแบฅt ra tแบฅt cแบฃ cรกc รดng bร , tแป tiรชn chung" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "tรฌm tแป tiรชn cแปงa hรฒa trแปn n-way ฤฦกn" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "liแปt kรช cรกc โrevโ mร nรณ khรดng thแป ฤแปc ฤฦฐแปฃc tแปซ cรกi khรกc" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "lร cha mแบน ฤแบงu tiรชn cแปงa cรกi khรกc?" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "tรฌm xem <commit> ฤฦฐแปฃc rแบฝ nhรกnh แป ฤรขu tแปซ reflog cแปงa <th.chiแบฟu>" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" -"git merge-file [<cรกc tรนy chแปn>] [-L <tรชn1> [-L <gแปc> [-L <tรชn2>]]] <tแบญp-" -"tin1> <tแบญp-tin-gแปc> <tแบญp-tin2>" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "gแปญi kแบฟt quแบฃ vร o ฤแบงu ra tiรชu chuแบฉn" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "dรนng kiแปu hรฒa dแปฑa trรชn diff3" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "ฤแป trรกnh xung ฤแปt, sแปญ dแปฅng phiรชn bแบฃn cแปงa chรบng ta" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "ฤแป trรกnh xung ฤแปt, sแปญ dแปฅng phiรชn bแบฃn cแปงa hแป" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "ฤแป trรกnh xung ฤแปt, sแปญ dแปฅng phiรชn bแบฃn kแบฟt hแปฃp" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "ฤแป trรกnh xung ฤแปt, hรฃy sแปญ dแปฅng kรญch thฦฐแปc bแป tแบกo nร y" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "khรดng cแบฃnh bรกo vแป cรกc xung ฤแปt xแบฃy ra" - -#: builtin/merge-file.c:47 -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:46 -#, c-format -msgid "unknown option %s" -msgstr "khรดng hiแปu tรนy chแปn %s" - -#: 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: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: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: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:78 -#, c-format -msgid "Merging %s with %s\n" -msgstr "ฤang hรฒa trแปn %s vแปi %s\n" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -15459,17 +17267,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 [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -"git multi-pack-index [--object-dir=<thฦฐ/mแปฅc>] (write|verify|expire|repack --" -"batch-size=<cแปก>)" +"git multi-pack-index [<cรกc-tรนy-chแปn>] (write|verify|expire|repack --batch-" +"size=<cแปก>)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 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:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -15477,15 +17285,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:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "cรณ quรก nhiแปu ฤแปi sแป" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 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:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "khรดng hiแปu cรขu lแปnh con: %s" @@ -15517,114 +17325,118 @@ msgstr "รฉp buแปc di chuyแปn hay ฤแปi tรชn thแบญm chรญ cแบฃ khi ฤรญch ฤรฃ msgid "skip move/rename errors" msgstr "bแป qua cรกc lแปi liรชn quan ฤแบฟn di chuyแปn, ฤแปi tรชn" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "cรณ ฤรญch โ%sโ nhฦฐng ฤรขy khรดng phแบฃi lร mแปt thฦฐ mแปฅc" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "ฤang kiแปm tra viแปc ฤแปi tรชn cแปงa โ%sโ thร nh โ%sโ\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "nguแปn sai" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "khรดng thแป di chuyแปn mแปt thฦฐ mแปฅc vร o trong chรญnh nรณ ฤฦฐแปฃc" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "khรดng di chuyแปn ฤฦฐแปฃc thฦฐ mแปฅc thรดng qua tแบญp tin" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "thฦฐ mแปฅc nguแปn lร trแปng rแปng" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "khรดng nแบฑm dฦฐแปi sแปฑ quแบฃn lรฝ mรฃ nguแปn" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "bแป xung ฤแปt" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "ฤรญch ฤรฃ tแปn tแบกi sแบตn rแปi" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "ฤang ghi ฤรจ lรชn โ%sโ" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "Khรดng thแป ghi ฤรจ" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "nhiแปu nguแปn cho cรนng mแปt ฤรญch" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "thฦฐ mแปฅc ฤรญch khรดng tแปn tแบกi" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, nguแปn=%s, ฤรญch=%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "ฤแปi tรชn %s thร nh %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "gแบทp lแปi khi ฤแปi tรชn โ%sโ" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<cรกc tรนy chแปn>] <commit>โฆ" -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<cรกc tรนy chแปn>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<cรกc tรนy chแปn>] --stdin" -#: 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:524 +msgid "print only ref-based names (no object names)" +msgstr "chแป hiแปn thแป cรกc tham chiแบฟu cฦก sแป (khรดng phแบฃi cรกc tรชn ฤแปi tฦฐแปฃng)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:525 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:414 +#: builtin/name-rev.c:527 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:416 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "bแป qua cรกc tham chiแบฟu khแปp vแปi <mแบซu>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:531 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:419 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "ฤแปc tแปซ ฤแบงu vร o tiรชu chuแบฉn" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:533 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:426 +#: builtin/name-rev.c:539 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แป)" @@ -15770,7 +17582,7 @@ msgstr "khรดng thแป ghi ฤแปi tฦฐแปฃng ghi chรบ (note)" msgid "the note contents have been left in %s" msgstr "nแปi dung ghi chรบ cรฒn lแบกi %s" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "khรดng thแป mแป hay ฤแปc โ%sโ" @@ -16004,7 +17816,7 @@ msgstr "" "chuyแปn giao kแบฟt quแบฃ bแบฑng โgit notes merge --commitโ, hoแบทc bรฃi bแป viแปc hรฒa " "trแปn bแบฑng โgit notes merge --abortโ.\n" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, 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แป." @@ -16022,7 +17834,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:165 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "khรดng gแปก bแป, chแป hiแปn thแป" @@ -16038,145 +17850,139 @@ msgstr "notes-ref" msgid "use notes from <notes-ref>" msgstr "dรนng โnotesโ tแปซ <notes-ref>" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1605 #, c-format msgid "unknown subcommand: %s" msgstr "khรดng hiแปu cรขu lแปnh con: %s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [cรกc tรนy chแปnโฆ] [< <danh-sรกch-tham-chiแบฟu> | < " "<danh-sรกch-ฤแปi-tฦฐแปฃng>]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" 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:428 +#: builtin/pack-objects.c:443 #, 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:439 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "ฤแปi tฦฐแปฃng ฤรฃ ฤรณng gรณi sai hแปng cho %s" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "dรฒ thแบฅy delta ฤแป quy cho ฤแปi tฦฐแปฃng %s" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "ฤรฃ sแบฏp xแบฟp %u ฤแปi tฦฐแปฃng, cแบงn %<PRIu32>" -#: 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 +#: builtin/pack-objects.c:1004 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:854 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "ฤang ghi lแบกi cรกc ฤแปi tฦฐแปฃng" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, 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:970 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "ฤรฃ ghi %<PRIu32> ฤแปi tฦฐแปฃng trong khi cแบงn %<PRIu32>" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1348 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:1597 +#: builtin/pack-objects.c:1796 #, 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:1606 +#: builtin/pack-objects.c:1805 #, 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:1875 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "ฤang ฤแบฟm cรกc ฤแปi tฦฐแปฃng" -#: 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 +#: builtin/pack-objects.c:2231 #, 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:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "khรดng thแป ฤแปc ฤแปi tฦฐแปฃng %s" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, 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:2130 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - hแบฟt bแป nhแป" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2656 #, 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:2588 +#: builtin/pack-objects.c:2795 #, 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:2675 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "ฤang nรฉn cรกc ฤแปi tฦฐแปฃng" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "mรขu thuแบซn vแปi sแป lฦฐแปฃng delta" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" +"giรก trแป cแปงa uploadpack.blobpackfileuri phแบฃi cรณ dแบกng '<object-hash> <pack-" +"hash> <uri>' (nhแบญn '%s')" + +#: builtin/pack-objects.c:2964 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" +"ฤแปi tฦฐแปฃng ฤรฃ ฤฦฐแปฃc cแบฅu hรฌnh trong mแปt uploadpack.blobpackfileuri khรกc (ฤรฃ " +"nhแบญn '%s')" + +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16185,7 +17991,7 @@ msgstr "" "cแบงn ID ฤแปi tฦฐแปฃng cแบกnh, nhแบญn ฤฦฐแปฃc rรกc:\n" " %s" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16194,247 +18000,243 @@ msgstr "" "cแบงn ID ฤแปi tฦฐแปฃng, nhแบญn ฤฦฐแปฃc rรกc:\n" " %s" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "giรก trแป cho --missing khรดng hแปฃp lแป" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "khรดng thแป mแป mแปฅc lแปฅc cแปงa gรณi" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:3187 #, 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:3041 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "khรดng thแป buแปc mแบฅt ฤแปi tฦฐแปฃng" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "khรดng phแบฃi mแปt rev โ%sโ" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "ฤiแปm xem xรฉt sai โ%sโ" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3393 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:3214 +#: builtin/pack-objects.c:3446 #, 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:3218 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "phiรชn bแบฃn mแปฅc lแปฅc sai โ%sโ" -#: 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 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "<phiรชn bแบฃn>[,offset]" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3489 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:3260 +#: builtin/pack-objects.c:3492 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:3262 +#: builtin/pack-objects.c:3494 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:3264 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "bแป qua cรกc ฤแปi tฦฐแปฃng ฤรณng gรณi" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3498 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:3268 +#: builtin/pack-objects.c:3500 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:3270 +#: builtin/pack-objects.c:3502 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:3272 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "dรนng lแบกi cรกc delta sแบตn cรณ" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "dรนng lแบกi cรกc ฤแปi tฦฐแปฃng sแบตn cรณ" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "dรนng cรกc ฤแปi tฦฐแปฃng OFS_DELTA" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3510 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:3280 +#: builtin/pack-objects.c:3512 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:3282 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "ฤแปc tham sแป โrevisionโ tแปซ thiแบฟt bแป nhแบญp chuแบฉn" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3516 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:3287 +#: builtin/pack-objects.c:3519 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:3290 +#: builtin/pack-objects.c:3522 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:3293 +#: builtin/pack-objects.c:3525 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:3296 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "xuแบฅt gรณi ra ฤแบงu ra tiรชu chuแบฉn" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3530 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:3300 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "giแปฏ lแบกi cรกc ฤแปi tฦฐแปฃng khรดng thแป ฤแปc ฤฦฐแปฃc" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "pack mแบฅt cรกc ฤแปi tฦฐแปฃng khรดng thแป ฤแปc ฤฦฐแปฃc" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3536 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:3307 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" -msgstr "dung thuแบญt toรกn โsparse reachabilityโ" +msgstr "sแปญ dแปฅng thuแบญt toรกn โsparse reachabilityโ" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "tแบกo gรณi nhแบน" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3543 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:3313 +#: builtin/pack-objects.c:3545 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:3315 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "bแป qua gรณi nร y" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "mแปฉc nรฉn gรณi" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3551 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:3321 +#: builtin/pack-objects.c:3553 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:3323 +#: builtin/pack-objects.c:3555 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:3327 +#: builtin/pack-objects.c:3559 msgid "write a bitmap index if possible" msgstr "ghi mแปฅc lแปฅc รกnh xแบก nแบฟu ฤฦฐแปฃc" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "xแปญ lรฝ cho thiแบฟu ฤแปi tฦฐแปฃng" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3566 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:3336 +#: builtin/pack-objects.c:3568 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:3361 +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "giao thแปฉc" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "loแบกi trแปซ bแบฅt kแปณ cแบฅu hรฌnh uploadpack.blobpackfileuri vแปi giao thแปฉc nร y" + +#: builtin/pack-objects.c:3600 #, 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:3366 +#: builtin/pack-objects.c:3605 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit lร quรก cao, รฉp dรนng %d" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3659 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:3422 +#: builtin/pack-objects.c:3661 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:3427 +#: builtin/pack-objects.c:3666 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:3430 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable vร --unpack-unreachable xung khแบฏc nhau" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3675 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:3497 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "ฤรกnh sแป cรกc ฤแปi tฦฐแปฃng" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3766 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" -msgstr "Tแปng %<PRIu32> (delta %<PRIu32>), dรนng lแบกi %<PRIu32> (delta %<PRIu32>)" +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>" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -16448,81 +18250,110 @@ msgstr "ฤรณng gรณi mแปi thแปฉ" msgid "prune loose refs (default)" msgstr "prune (cแบฏt cแปฅt) nhแปฏng tham chiแบฟu bแป mแบฅt (mแบทc ฤแปnh)" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 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 "ฤang gแปก cรกc ฤแปi tฦฐแปฃng trรนng lแบทp" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <thแปi-gian>] [--] [<head>โฆ]" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "bรกo cรกo cรกc ฤแปi tฦฐแปฃng ฤรฃ prune" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "cรกc ฤแปi tฦฐแปฃng hแบฟt hแบกn cลฉ hฦกn khoแบฃng <thแปi gian>" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "giแปi hแบกn giao ฤแบฟn cรกc ฤแปi tฦฐแปฃng nแบฑm ngoร i cรกc tแบญp tin gรณi hแปฉa hแบนn" -#: builtin/prune.c:150 +#: builtin/prune.c:152 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:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Giรก trแป khรดng hแปฃp lแป %s: %s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<cรกc tรนy chแปn>] [<kho-chแปฉa> [<refspec>โฆ]]" -#: builtin/pull.c:141 +#: builtin/pull.c:123 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:145 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "Cรกc tรนy chแปn liรชn quan ฤแบฟn hรฒa trแปn" -#: builtin/pull.c:148 +#: builtin/pull.c:130 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:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 msgid "allow fast-forward" msgstr "cho phรฉp chuyแปn-tiแบฟp-nhanh" -#: 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:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" +msgstr "tแปฑ ฤแปng stash/stash pop trฦฐแปc vร sau" -#: builtin/pull.c:201 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "Cรกc tรนy chแปn liรชn quan ฤแบฟn lแปnh lแบฅy vแป" -#: builtin/pull.c:211 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "รฉp buแปc ghi ฤรจ lรชn nhรกnh nแปi bแป" -#: builtin/pull.c:219 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "sแป lฦฐแปฃng mรด-ฤun-con ฤฦฐแปฃc ฤแบฉy lรชn ฤแปng thแปi" -#: builtin/pull.c:316 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Giรก trแป khรดng hแปฃp lแป cho pull.ff: %s" -#: builtin/pull.c:433 +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"Kรฉo mร khรดng chแป ฤแปnh lร m thแบฟ nร o ฤแป hรฒa giแบฃi cรกc nhรกnh phรขn kแปณ lร khรกc nhau " +"lร \n" +"khรดng khuyแบฟn khรญch. Bแบกn cรณ thแป dแปu thรดng bรกo nร y bแบฑng cรกch chแบกy mแปt trong " +"nhแปฏng lแปnh sau ฤรขy\n" +"cรกc lแปnh thแปnh thoแบฃng trฦฐแปc khi thแปฑc hiแปn lแปnh pull tiแบฟp theo cแปงa bแบกn:\n" +"\n" +" git config pull.rebase false # merge (chiแบฟn lฦฐแปฃc mแบทc ฤแปnh)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"Bแบกn cรณ thแป thay thแบฟ \"git config\" vแปi \"git config --global\" ฤแป thiแบฟt lแบญp " +"mแบทc ฤแปnh\n" +"ฦฐu tiรชn cho tแบฅt cแบฃ cรกc kho. Bแบกn cลฉng cรณ thแป chuyแปn qua --rebase, --no-" +"rebase,\n" +"hoแบทc --ff-only trรชn dรฒng lแปnh ฤแป ghi ฤรจ mแบทc ฤแปnh ฤฦฐแปฃc cแบฅu hรฌnh cho mแปi\n" +"lแบงn gแปi.\n" + +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16530,14 +18361,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:435 +#: builtin/pull.c:460 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:436 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16546,7 +18377,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:439 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16558,43 +18389,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:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1240 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:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 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:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 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:449 builtin/pull.c:464 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "Xem git-pull(1) ฤแป biแบฟt thรชm chi tiแบฟt." -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 msgid "<remote>" msgstr "<mรกy chแปง>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<nhรกnh>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1238 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:468 git-parse-remote.sh:95 +#: builtin/pull.c:493 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:473 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16603,34 +18434,30 @@ 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:581 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "khรดng thแป truy cแบญp lแบงn chuyแปn giao โ%sโ" -#: builtin/pull.c:861 +#: builtin/pull.c:894 msgid "ignoring --verify-signatures for rebase" msgstr "bแป qua --verify-signatures khi rebase" -#: 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:924 +#: builtin/pull.c:954 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:928 +#: builtin/pull.c:958 msgid "pull with rebase" msgstr "pull vแปi rebase" -#: builtin/pull.c:929 +#: builtin/pull.c:959 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:954 +#: builtin/pull.c:984 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16641,7 +18468,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:960 +#: builtin/pull.c:990 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16659,15 +18486,15 @@ msgstr "" "$ git reset --hard\n" "ฤแป khรดi phแปฅc lแบกi." -#: builtin/pull.c:975 +#: builtin/pull.c:1005 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:979 +#: builtin/pull.c:1009 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:986 +#: builtin/pull.c:1017 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แป" @@ -16680,11 +18507,11 @@ msgstr "git push [<cรกc tรนy chแปn>] [<kho-chแปฉa> [<refspec>โฆ]]" msgid "tag shorthand without <tag>" msgstr "dรนng tแปc kรฝ thแบป khรดng cรณ <thแบป>" -#: builtin/push.c:121 +#: builtin/push.c:119 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:167 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -16693,7 +18520,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:170 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16718,7 +18545,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16733,7 +18560,7 @@ msgstr "" "\n" " git push %s HEAD:<tรชn-cแปงa-nhรกnh-mรกy-chแปง>\n" -#: builtin/push.c:199 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16747,12 +18574,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:202 #, 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:210 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -16764,14 +18591,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:269 +#: builtin/push.c:260 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:276 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -16784,7 +18611,7 @@ msgstr "" "Xem โNote about fast-forwardsโ trong โgit push --helpโ ฤแป cรณ thรดng tin chi " "tiแบฟt." -#: builtin/push.c:282 +#: builtin/push.c:273 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" @@ -16798,7 +18625,7 @@ msgstr "" "Xem โNote about fast-forwardsโ trong โgit push --helpโ ฤแป cรณ thรดng tin chi " "tiแบฟt." -#: builtin/push.c:288 +#: builtin/push.c:279 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" @@ -16813,11 +18640,11 @@ msgstr "" "Xem โNote about fast-forwardsโ trong โgit push --helpโ ฤแป cรณ thรดng tin chi " "tiแบฟt." -#: builtin/push.c:295 +#: builtin/push.c:286 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:298 +#: builtin/push.c:289 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" @@ -16829,140 +18656,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:359 +#: builtin/push.c:351 #, c-format msgid "Pushing to %s\n" msgstr "ฤang ฤแบฉy lรชn %s\n" -#: builtin/push.c:364 +#: builtin/push.c:358 #, 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: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 +#: builtin/push.c:532 msgid "repository" msgstr "kho" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:533 builtin/send-pack.c:183 msgid "push all refs" msgstr "ฤแบฉy tแบฅt cแบฃ cรกc tham chiแบฟu" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:534 builtin/send-pack.c:185 msgid "mirror all refs" msgstr "mirror tแบฅt cแบฃ cรกc tham chiแบฟu" -#: builtin/push.c:558 +#: builtin/push.c:536 msgid "delete refs" msgstr "xรณa cรกc tham chiแบฟu" -#: builtin/push.c:559 +#: builtin/push.c:537 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:562 builtin/send-pack.c:167 +#: builtin/push.c:540 builtin/send-pack.c:186 msgid "force updates" msgstr "รฉp buแปc cแบญp nhแบญt" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:541 builtin/send-pack.c:198 msgid "<refname>:<expect>" msgstr "<tรชn-tham-chiแบฟu>:<cแบงn>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:542 builtin/send-pack.c:199 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:568 +#: builtin/push.c:545 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:570 builtin/send-pack.c:175 +#: builtin/push.c:546 builtin/send-pack.c:193 msgid "use thin pack" msgstr "tแบกo gรณi nhแบน" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 msgid "receive pack program" msgstr "chฦฐฦกng trรฌnh nhแบญn gรณi" -#: builtin/push.c:573 +#: builtin/push.c:549 msgid "set upstream for git pull/status" msgstr "ฤแบทt thฦฐแปฃng nguแปn cho git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:552 msgid "prune locally removed refs" msgstr "xรฉn tแปa nhแปฏng tham chiแบฟu bแป gแปก bแป" -#: builtin/push.c:578 +#: builtin/push.c:554 msgid "bypass pre-push hook" msgstr "vรฒng qua mรณc tiแปn-ฤแบฉy (pre-push)" -#: builtin/push.c:579 +#: builtin/push.c:555 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:582 builtin/send-pack.c:169 +#: builtin/push.c:557 builtin/send-pack.c:187 msgid "GPG sign the push" msgstr "kรฝ lแบงn ฤแบฉy dรนng GPG" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:559 builtin/send-pack.c:194 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:602 +#: builtin/push.c:577 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:604 +#: builtin/push.c:579 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:607 +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "repository (kho) sai โ%sโ" + +#: builtin/push.c:600 +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:615 msgid "--all and --tags are incompatible" msgstr "--all vร --tags xung khแบฏc nhau" -#: builtin/push.c:609 +#: builtin/push.c:617 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:613 +#: builtin/push.c:621 msgid "--mirror and --tags are incompatible" msgstr "--mirror vร --tags xung khแบฏc nhau" -#: builtin/push.c:615 +#: builtin/push.c:623 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:618 +#: builtin/push.c:626 msgid "--all and --mirror are incompatible" msgstr "--all vร --mirror xung khแบฏc nhau" -#: builtin/push.c:637 +#: builtin/push.c:630 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" @@ -16979,24 +18806,32 @@ 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:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "Tแปท lแป phแบงn trฤm cรกi tแบกo lร weighted" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "dรนng mร u diff ฤฦกn giแบฃn" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: 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 #, c-format msgid "no .. in range: '%s'" msgstr "khรดng cรณ .. trong vรนng: โ%sโ" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 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:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "cแบงn hai vรนng lแบงn chuyแปn giao" @@ -17080,235 +18915,216 @@ 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/rebase.c:32 +#: 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:35 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [cรกc tรนy chแปn] [--exec <lแปnh>] [--onto <newbase>] " -"[<upstream>] [<nhรกnh>]" +"git rebase [-i] [cรกc tรนy chแปn] [--exec <lแปnh>] [--onto <newbase> | --keep-" +"base] [<upstream>] [<nhรกnh>]]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [cรกc tรนy chแปn] [--exec <lแปnh>] [--onto <newbase>] --root " "[<nhรกnh>]" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 #, c-format msgid "unusable todo list: '%s'" msgstr "danh sรกch cแบงn lร m khรดng dรนng ฤฦฐแปฃc: โ%sโ" -#: 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 +#: builtin/rebase.c:304 #, c-format msgid "could not create temporary %s" msgstr "khรดng thแป tแบกo %s tแบกm thแปi" -#: builtin/rebase.c:285 +#: builtin/rebase.c:310 msgid "could not mark as interactive" msgstr "khรดng thแป ฤรกnh dแบฅu lร tฦฐฦกng tรกc" -#: builtin/rebase.c:343 +#: builtin/rebase.c:364 msgid "could not generate todo list" msgstr "khรดng thแป tแบกo danh sรกch cแบงn lร m" -#: builtin/rebase.c:382 +#: builtin/rebase.c:405 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:437 +#: builtin/rebase.c:474 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<cรกc tรนy chแปn>]" -#: builtin/rebase.c:449 -msgid "keep empty commits" -msgstr "giแปฏ lแบกi cรกc lแบงn chuyแปn giao rแปng" +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" +msgstr "bแป qua cรกc lแบงn chuyแปn giao mร nรณ bแบฏt ฤแบงu trแปng rแปng" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:491 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:452 +#: builtin/rebase.c:493 msgid "rebase merge commits" msgstr "cแบฃi tแป cรกc lแบงn chuyแปn giao hรฒa trแปn" -#: builtin/rebase.c:454 +#: builtin/rebase.c:495 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:456 +#: builtin/rebase.c:497 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:457 +#: builtin/rebase.c:498 msgid "sign commits" msgstr "kรฝ cรกc lแบงn chuyแปn giao" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:500 builtin/rebase.c:1321 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:461 +#: builtin/rebase.c:502 msgid "continue rebase" msgstr "tiแบฟp tแปฅc cแบฃi tแป" -#: builtin/rebase.c:463 +#: builtin/rebase.c:504 msgid "skip commit" msgstr "bแป qua lแบงn chuyแปn giao" -#: builtin/rebase.c:464 +#: builtin/rebase.c:505 msgid "edit the todo list" msgstr "sแปญa danh sรกch cแบงn lร m" -#: builtin/rebase.c:466 +#: builtin/rebase.c:507 msgid "show the current patch" msgstr "hiแปn thแป miแบฟng vรก hiแปn hร nh" -#: builtin/rebase.c:469 +#: builtin/rebase.c:510 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:471 +#: builtin/rebase.c:512 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:473 +#: builtin/rebase.c:514 msgid "check the todo list" msgstr "kiแปm tra danh sรกch cแบงn lร m" -#: builtin/rebase.c:475 +#: builtin/rebase.c:516 msgid "rearrange fixup/squash lines" msgstr "sแบฏp xแบฟp lแบกi cรกc dรฒng fixup/squash" -#: builtin/rebase.c:477 +#: builtin/rebase.c:518 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:478 +#: builtin/rebase.c:519 msgid "onto" msgstr "lรชn trรชn" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict-revision" msgstr "ฤiแปm-xรฉt-duyแปt-hแบกn-chแบฟ" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict revision" msgstr "ฤiแปm xรฉt duyแปt hแบกn chแบฟ" -#: builtin/rebase.c:483 +#: builtin/rebase.c:524 msgid "squash-onto" msgstr "squash-lรชn-trรชn" -#: builtin/rebase.c:484 +#: builtin/rebase.c:525 msgid "squash onto" msgstr "squash lรชn trรชn" -#: builtin/rebase.c:486 +#: builtin/rebase.c:527 msgid "the upstream commit" msgstr "lแบงn chuyแปn giao thฦฐแปฃng nguแปn" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head-name" msgstr "tรชn-ฤแบงu" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head name" msgstr "tรชn ฤแบงu" -#: builtin/rebase.c:493 +#: builtin/rebase.c:534 msgid "rebase strategy" msgstr "chiแบฟn lฦฐแปฃc cแบฃi tแป" -#: builtin/rebase.c:494 +#: builtin/rebase.c:535 msgid "strategy-opts" msgstr "tรนy-chแปn-chiแบฟn-lฦฐแปฃc" -#: builtin/rebase.c:495 +#: builtin/rebase.c:536 msgid "strategy options" msgstr "cรกc tรนy chแปn chiแบฟn lฦฐแปฃc" -#: builtin/rebase.c:496 +#: builtin/rebase.c:537 msgid "switch-to" msgstr "chuyแปn-ฤแบฟn" -#: builtin/rebase.c:497 +#: builtin/rebase.c:538 msgid "the branch or commit to checkout" msgstr "nhรกnh hay lแบงn chuyแปn giao lแบงn lแบฅy ra" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto name" msgstr "tรชn lรชn trรชn" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "cmd" msgstr "lแปnh" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "the command to run" msgstr "lแปnh muแปn chแบกy" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:543 builtin/rebase.c:1415 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:518 +#: builtin/rebase.c:559 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:534 +#: builtin/rebase.c:575 #, c-format -msgid "%s requires an interactive rebase" -msgstr "%s cแบงn mแปt cแบฃi tแป kiแปu tฦฐฦกng tรกc" +msgid "%s requires the merge backend" +msgstr "%s cแบงn mแปt แปฉng dแปฅng hรฒa trแปn chแบกy phรญa sau" -#: builtin/rebase.c:586 +#: builtin/rebase.c:618 #, c-format msgid "could not get 'onto': '%s'" msgstr "khรดng thแป ฤแบทt lแบฅy โontoโ: โ%sโ" -#: builtin/rebase.c:601 +#: builtin/rebase.c:635 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head khรดng hแปฃp lแป: โ%sโ" -#: builtin/rebase.c:626 +#: builtin/rebase.c:660 #, 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:702 -#, c-format -msgid "Could not read '%s'" -msgstr "Khรดng thแป ฤแปc โ%sโ" - -#: builtin/rebase.c:720 -#, c-format -msgid "Cannot store %s" -msgstr "Khรดng thแป lฦฐu โ%sโ" - -#: 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:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:805 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" @@ -17323,7 +19139,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:1031 +#: builtin/rebase.c:888 #, c-format msgid "" "\n" @@ -17342,7 +19158,16 @@ msgstr "" "\n" "Kแบฟt quแบฃ lร git khรดng thแป cแบฃi tแป lแบกi chรบng." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1214 +#, 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:1232 #, c-format msgid "" "%s\n" @@ -17359,7 +19184,7 @@ msgstr "" " git rebase โ<nhรกnh>โ\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1248 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17373,128 +19198,150 @@ msgstr "" " git branch --set-upstream-to=%s/<nhรกnh> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1278 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:1368 +#: builtin/rebase.c:1282 msgid "empty exec command" msgstr "lแปnh thแปฑc thi trแปng rแปng" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1312 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:1398 +#: builtin/rebase.c:1314 +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:1316 msgid "allow pre-rebase hook to run" msgstr "cho phรฉp mรณc (hook) pre-rebase ฤฦฐแปฃc chแบกy" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1318 msgid "be quiet. implies --no-stat" msgstr "hรฃy im lแบทng. รฝ lร --no-stat" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1324 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:1409 +#: builtin/rebase.c:1327 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:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 -msgid "passed to 'git am'" -msgstr "chuyแปn cho โgit amโ" +#: builtin/rebase.c:1330 +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แบฃ" + +#: builtin/rebase.c:1332 +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" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1334 +msgid "synonym of --reset-author-date" +msgstr "ฤแปng nghฤฉa vแปi --reset-author-date" + +#: builtin/rebase.c:1336 builtin/rebase.c:1340 msgid "passed to 'git apply'" msgstr "chuyแปn cho โgit applyโ" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1338 +msgid "ignore changes in whitespace" +msgstr "lแป ฤi sแปฑ thay ฤแปi do khoแบฃng trแบฏng gรขy ra" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 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:1428 +#: builtin/rebase.c:1347 msgid "continue" msgstr "tiแบฟp tแปฅc" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1350 msgid "skip current patch and continue" msgstr "bแป qua miแบฟng vรก hiแปn hร nh vร tiแบฟp tแปฅc" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1352 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:1436 +#: builtin/rebase.c:1355 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:1437 +#: builtin/rebase.c:1356 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:1440 +#: builtin/rebase.c:1359 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:1443 +#: builtin/rebase.c:1362 +msgid "use apply strategies to rebase" +msgstr "dรนng chiแบฟn lฦฐแปฃc รกp dแปฅng ฤแป cแบฃi tแป" + +#: builtin/rebase.c:1366 msgid "use merging strategies to rebase" msgstr "dรนng chiแบฟn lฦฐแปฃc hรฒa trแปn ฤแป cแบฃi tแป" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1370 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:1451 +#: builtin/rebase.c:1374 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: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:1379 +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:1457 +#: builtin/rebase.c:1386 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:1463 -msgid "automatically stash/stash pop before and after" -msgstr "tแปฑ ฤแปng stash/stash pop trฦฐแปc vร sau" - -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1393 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:1469 +#: builtin/rebase.c:1397 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:1472 +#: builtin/rebase.c:1401 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:1475 +#: builtin/rebase.c:1404 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:1477 +#: builtin/rebase.c:1406 msgid "use the given merge strategy" msgstr "dรนng chiแบฟn lฦฐแปฃc hรฒa trแปn ฤรฃ cho" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1408 builtin/revert.c:115 msgid "option" msgstr "tรนy chแปn" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1409 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:1483 +#: builtin/rebase.c:1412 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:1500 +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "" +"รกp dแปฅng mแปi thay ฤแปi, ngay cแบฃ khi nhแปฏng thแปฉ ฤรณ ฤรฃ sแบตn cรณ แป thฦฐแปฃng nguแปn" + +#: builtin/rebase.c:1434 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17502,33 +19349,45 @@ 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:1506 +#: builtin/rebase.c:1440 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:1547 +#: builtin/rebase.c:1481 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:1551 +#: builtin/rebase.c:1486 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "khรดng thแป kแบฟt hแปฃp โ--keep-baseโ vแปi โ--ontoโ" + +#: builtin/rebase.c:1488 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "khรดng thแป kแบฟt hแปฃp โ--keep-baseโ vแปi โ--rootโ" + +#: builtin/rebase.c:1492 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "khรดng thแป kแบฟt hแปฃp โ--rootโ vแปi โ--fork-pointโ" + +#: builtin/rebase.c:1495 msgid "No rebase in progress?" msgstr "Khรดng cรณ tiแบฟn trรฌnh rebase nร o phแบฃi khรดng?" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1499 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:1578 +#: builtin/rebase.c:1522 msgid "Cannot read HEAD" msgstr "Khรดng thแป ฤแปc HEAD" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1534 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17536,16 +19395,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:1609 +#: builtin/rebase.c:1553 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:1628 +#: builtin/rebase.c:1572 #, c-format msgid "could not move back to %s" msgstr "khรดng thแป quay trแป lแบกi %s" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1618 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17566,173 +19425,141 @@ 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:1694 +#: builtin/rebase.c:1646 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:1735 +#: builtin/rebase.c:1688 #, c-format msgid "Unknown mode: %s" msgstr "Khรดng hiแปu chแบฟ ฤแป: %s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1727 msgid "--strategy requires --merge or --interactive" msgstr "--strategy cแบงn --merge hay --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1757 +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:1770 +#, 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:1795 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec cแบงn --exec hay --interactive" -#: 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 +#: builtin/rebase.c:1815 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:1832 +#: builtin/rebase.c:1819 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: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 +#: builtin/rebase.c:1843 #, c-format msgid "invalid upstream '%s'" msgstr "thฦฐแปฃng nguแปn khรดng hแปฃp lแป โ%sโ" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1849 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:1889 +#: builtin/rebase.c:1875 +#, 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:1878 #, 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:1896 +#: builtin/rebase.c:1886 #, 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:1921 +#: builtin/rebase.c:1912 #, 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:1929 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Khรดng cรณ tham chiแบฟu nร o nhฦฐ thแบฟ: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1931 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:1981 -msgid "Cannot autostash" -msgstr "Khรดng thแป autostash" - -#: 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:1990 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "Khรดng thแป tแบกo thฦฐ mแปฅc cho โ%sโ" - -#: builtin/rebase.c:1993 -#, c-format -msgid "Created autostash: %s\n" -msgstr "ฤรฃ tแบกo autostash: %s\n" - -#: builtin/rebase.c:1996 -msgid "could not reset --hard" -msgstr "khรดng thแป reset --hard" - -#: 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 +#: builtin/rebase.c:1952 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:2040 -#, c-format -msgid "could not parse '%s'" -msgstr "khรดng thแป phรขn tรญch cรบ phรกp โ%sโ" - -#: builtin/rebase.c:2053 +#: builtin/rebase.c:1988 #, c-format msgid "could not switch to %s" msgstr "khรดng thแป chuyแปn ฤแบฟn %s" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:1999 msgid "HEAD is up to date." msgstr "HEAD ฤรฃ cแบญp nhแบญt." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2001 #, 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:2074 +#: builtin/rebase.c:2009 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:2076 +#: builtin/rebase.c:2011 #, 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:2084 +#: builtin/rebase.c:2019 msgid "The pre-rebase hook refused to rebase." msgstr "Mรณc (hook) pre-rebase tแปซ chแปi rebase." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2026 #, c-format msgid "Changes to %s:\n" msgstr "Thay ฤแปi thร nh %s:\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2029 #, c-format msgid "Changes from %s to %s:\n" msgstr "Thay ฤแปi tแปซ %s thร nh %s:\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2054 #, 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:2128 +#: builtin/rebase.c:2063 msgid "Could not detach HEAD" msgstr "Khรดng thแป tรกch rแปi HEAD" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2072 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Chuyแปn-tiแบฟp-nhanh %s ฤแบฟn %s.\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <thฦฐ-mแปฅc-git>" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:1224 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" @@ -17762,7 +19589,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:852 +#: builtin/receive-pack.c:1244 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" @@ -17783,11 +19610,11 @@ msgstr "" "\n" "ฤแป chแบฅm dแปฉt lแปi nhแบฏn nร y, bแบกn hรฃy ฤแบทt nรณ thร nh โrefuseโ." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:2422 msgid "quiet" msgstr "im lแบทng" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:2436 msgid "You must specify a directory." msgstr "Bแบกn phแบฃi chแป ฤแปnh thฦฐ mแปฅc." @@ -17813,49 +19640,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <tham_chiแบฟu>" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, 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:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "ฤรกnh dแบฅu cรกc ฤแปi tฦฐแปฃng tiแบฟp cแบญn ฤฦฐแปฃcโฆ" -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "%s chแบณng chแป ฤแบฟn ฤรขu cแบฃ!" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "chฦฐa chแป ra reflog ฤแป xรณa" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "khรดng phแบฃi mแปt reflog: %s" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "khรดng reflog cho โ%sโ" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "ฤแปnh dแบกng tham chiแบฟu khรดng hแปฃp lแป: %s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -17863,82 +19690,82 @@ msgstr "" "git remote add [-t <nhรกnh>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <tรชn> <url>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <tรชn-cลฉ> <tรชn-mแปi>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <tรชn>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 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:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <tรชn>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <tรชn>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 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:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <tรชn> <nhรกnh>โฆ" -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote set-url [--push] [--all] <tรชn>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 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:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <tรชn> <url-mแปi>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <tรชn> <url>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<cรกc tรนy chแปn>] <tรชn> <url>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <tรชn> <nhรกnh>โฆ" -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <tรชn> <nhรกnh>โฆ" -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<cรกc tรนy chแปn>] <tรชn>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<cรกc tรนy chแปn>] <tรชn>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 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:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "ฤang cแบญp nhแบญt %s" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -17946,82 +19773,98 @@ 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:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "khรดng hiแปu tham sแป mรกy bแบฃn sao (mirror): %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "lแบฅy vแป cรกc nhรกnh tแปซ mรกy chแปง" -#: builtin/remote.c:165 +#: builtin/remote.c:166 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:168 +#: builtin/remote.c:169 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:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "cรกc nhรกnh ฤแป theo dรตi" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "nhรกnh master" -#: builtin/remote.c:173 +#: builtin/remote.c:174 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:185 +#: builtin/remote.c:186 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:187 +#: builtin/remote.c:188 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:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:697 #, c-format msgid "remote %s already exists." msgstr "mรกy chแปง %s ฤรฃ tแปn tแบกi rแปi." -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:701 #, 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:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "Khรดng thแป cร i ฤแบทt nhรกnh master โ%sโ" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, 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:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(khแปp)" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(xรณa)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:654 +#, c-format +msgid "could not set '%s'" +msgstr "khรดng thแป ฤแบทt โ%sโ" + +#: builtin/remote.c:659 +#, 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:690 builtin/remote.c:833 builtin/remote.c:941 #, c-format msgid "No such remote: '%s'" msgstr "Khรดng cรณ mรกy chแปง nร o nhฦฐ vแบญy: โ%sโ" -#: builtin/remote.c:646 +#: builtin/remote.c:707 #, 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:666 +#: builtin/remote.c:727 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18032,17 +19875,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:702 +#: builtin/remote.c:767 #, c-format msgid "deleting '%s' failed" msgstr "gแบทp lแปi khi xรณa โ%sโ" -#: builtin/remote.c:736 +#: builtin/remote.c:801 #, c-format msgid "creating '%s' failed" msgstr "gแบทp lแปi khi tแบกo โ%sโ" -#: builtin/remote.c:802 +#: builtin/remote.c:877 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18054,119 +19897,119 @@ msgstr[0] "" "ฤi;\n" "ฤแป xรณa ฤi, sแปญ dแปฅng:" -#: builtin/remote.c:816 +#: builtin/remote.c:891 #, 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:917 +#: builtin/remote.c:994 #, 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:920 +#: builtin/remote.c:997 msgid " tracked" msgstr " ฤฦฐแปฃc theo dรตi" -#: builtin/remote.c:922 +#: builtin/remote.c:999 msgid " stale (use 'git remote prune' to remove)" msgstr " cลฉ rรญch (dรนng โgit remote pruneโ ฤแป gแปก bแป)" -#: builtin/remote.c:924 +#: builtin/remote.c:1001 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:1042 #, 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:974 +#: builtin/remote.c:1051 #, 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:976 +#: builtin/remote.c:1053 #, 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:979 +#: builtin/remote.c:1056 #, c-format msgid "rebases onto remote %s" msgstr "thแปฑc hiแปn rebase trรชn mรกy chแปง %s" -#: builtin/remote.c:983 +#: builtin/remote.c:1060 #, c-format msgid " merges with remote %s" msgstr " hรฒa trแปn vแปi mรกy chแปง %s" -#: builtin/remote.c:986 +#: builtin/remote.c:1063 #, c-format msgid "merges with remote %s" msgstr "hรฒa trแปn vแปi mรกy chแปง %s" -#: builtin/remote.c:989 +#: builtin/remote.c:1066 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s vร vแปi mรกy chแปง %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1109 msgid "create" msgstr "tแบกo" -#: builtin/remote.c:1035 +#: builtin/remote.c:1112 msgid "delete" msgstr "xรณa" -#: builtin/remote.c:1039 +#: builtin/remote.c:1116 msgid "up to date" msgstr "ฤรฃ cแบญp nhแบญt" -#: builtin/remote.c:1042 +#: builtin/remote.c:1119 msgid "fast-forwardable" msgstr "cรณ-thแป-chuyแปn-tiแบฟp-nhanh" -#: builtin/remote.c:1045 +#: builtin/remote.c:1122 msgid "local out of date" msgstr "dแปฏ liแปu nแปi bแป ฤรฃ cลฉ" -#: builtin/remote.c:1052 +#: builtin/remote.c:1129 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s รฉp buแปc thร nh %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1132 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s ฤแบฉy lรชn thร nh %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1136 #, c-format msgid " %-*s forces to %s" msgstr " %-*s รฉp buแปc thร nh %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1139 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s ฤแบฉy lรชn thร nh %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1207 msgid "do not query remotes" msgstr "khรดng truy vแบฅn cรกc mรกy chแปง" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid "* remote %s" msgstr "* mรกy chแปง %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1235 #, c-format msgid " Fetch URL: %s" msgstr " URL ฤแป lแบฅy vแป: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 msgid "(no URL)" msgstr "(khรดng cรณ URL)" @@ -18174,190 +20017,181 @@ msgstr "(khรดng cรณ URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1250 builtin/remote.c:1252 #, c-format msgid " Push URL: %s" msgstr " URL ฤแป ฤแบฉy lรชn: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 #, c-format msgid " HEAD branch: %s" msgstr " Nhรกnh HEAD: %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1254 msgid "(not queried)" msgstr "(khรดng yรชu cแบงu)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1256 msgid "(unknown)" msgstr "(khรดng hiแปu)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1260 #, 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:1195 +#: builtin/remote.c:1272 #, 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:1198 builtin/remote.c:1224 +#: builtin/remote.c:1275 builtin/remote.c:1301 msgid " (status not queried)" msgstr " (trแบกng thรกi khรดng ฤฦฐแปฃc yรชu cแบงu)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1284 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:1215 +#: builtin/remote.c:1292 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:1221 +#: builtin/remote.c:1298 #, 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:1242 +#: builtin/remote.c:1319 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:1244 +#: builtin/remote.c:1321 msgid "delete refs/remotes/<name>/HEAD" msgstr "xรณa refs/remotes/<tรชn>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1336 msgid "Cannot determine remote HEAD" msgstr "Khรดng thแป xรกc ฤแปnh ฤฦฐแปฃc HEAD mรกy chแปง" -#: builtin/remote.c:1261 +#: builtin/remote.c:1338 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:1271 +#: builtin/remote.c:1348 #, c-format msgid "Could not delete %s" msgstr "Khรดng thแป xรณa bแป %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1356 #, c-format msgid "Not a valid ref: %s" msgstr "Khรดng phแบฃi lร tham chiแบฟu hแปฃp lแป: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1358 #, c-format msgid "Could not setup %s" msgstr "Khรดng thแป cร i ฤแบทt %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, 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:1300 +#: builtin/remote.c:1377 #, c-format msgid " %s has become dangling!" msgstr " %s ฤรฃ trแป thร nh khรดng ฤแบงu (khรดng ฤฦฐแปฃc quแบฃn lรฝ)!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "Pruning %s" msgstr "ฤang xรฉn bแปt %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1388 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1404 #, c-format msgid " * [would prune] %s" msgstr " * [nรชn xรฉn bแปt] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1407 #, c-format msgid " * [pruned] %s" msgstr " * [ฤรฃ bแป xรฉn] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1452 msgid "prune remotes after fetching" msgstr "cแบฏt mรกy chแปง sau khi lแบฅy vแป" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 #, c-format msgid "No such remote '%s'" msgstr "Khรดng cรณ mรกy chแปง nร o cรณ tรชn โ%sโ" -#: builtin/remote.c:1454 +#: builtin/remote.c:1531 msgid "add branch" msgstr "thรชm nhรกnh" -#: builtin/remote.c:1461 +#: builtin/remote.c:1538 msgid "no remote specified" msgstr "chฦฐa chแป ra mรกy chแปง nร o" -#: builtin/remote.c:1478 +#: builtin/remote.c:1555 msgid "query push URLs rather than fetch URLs" msgstr "truy vแบฅn ฤแบฉy URL thay vรฌ lแบฅy" -#: builtin/remote.c:1480 +#: builtin/remote.c:1557 msgid "return all URLs" msgstr "trแบฃ vแป mแปi URL" -#: builtin/remote.c:1508 +#: builtin/remote.c:1585 #, 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:1534 +#: builtin/remote.c:1611 msgid "manipulate push URLs" msgstr "ฤแบฉy cรกc โURLโ bแบฑng tay" -#: builtin/remote.c:1536 +#: builtin/remote.c:1613 msgid "add URL" msgstr "thรชm URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1615 msgid "delete URLs" msgstr "xรณa URLs" -#: builtin/remote.c:1545 +#: builtin/remote.c:1622 msgid "--add --delete doesn't make sense" msgstr "--add --delete khรดng hแปฃp lรฝ" -#: builtin/remote.c:1584 +#: builtin/remote.c:1661 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Kiแปu mแบซu URL cลฉ khรดng hแปฃp lแป: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1669 #, c-format msgid "No such URL found: %s" msgstr "Khรดng tรฌm thแบฅy URL nhฦฐ vแบญy: %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1671 msgid "Will not delete all non-push URLs" msgstr "Sแบฝ khรดng xรณa nhแปฏng ฤแปa chแป URL khรดng-push" -#: 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 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [<cรกc tรนy chแปn>]" -#: builtin/repack.c:27 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18365,115 +20199,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:190 +#: builtin/repack.c:197 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:229 builtin/repack.c:408 +#: builtin/repack.c:236 builtin/repack.c:421 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:246 +#: builtin/repack.c:260 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:284 +#: builtin/repack.c:297 msgid "pack everything in a single pack" msgstr "ฤรณng gรณi mแปi thแปฉ trong mแปt gรณi ฤฦกn" -#: builtin/repack.c:286 +#: builtin/repack.c:299 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:289 +#: builtin/repack.c:302 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:291 +#: builtin/repack.c:304 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "chuyแปn --no-reuse-delta cho git-pack-objects" -#: builtin/repack.c:293 +#: builtin/repack.c:306 msgid "pass --no-reuse-object to git-pack-objects" msgstr "chuyแปn --no-reuse-object cho git-pack-objects" -#: builtin/repack.c:295 +#: builtin/repack.c:308 msgid "do not run git-update-server-info" msgstr "khรดng chแบกy git-update-server-info" -#: builtin/repack.c:298 +#: builtin/repack.c:311 msgid "pass --local to git-pack-objects" msgstr "chuyแปn --local cho git-pack-objects" -#: builtin/repack.c:300 +#: builtin/repack.c:313 msgid "write bitmap index" msgstr "ghi mแปฅc lแปฅc รกnh xแบก" -#: builtin/repack.c:302 +#: builtin/repack.c:315 msgid "pass --delta-islands to git-pack-objects" msgstr "chuyแปn --delta-islands cho git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:316 msgid "approxidate" msgstr "ngร y ฦฐแปc tรญnh" -#: builtin/repack.c:304 +#: builtin/repack.c:317 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:306 +#: builtin/repack.c:319 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:308 +#: builtin/repack.c:321 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:309 builtin/repack.c:315 +#: builtin/repack.c:322 builtin/repack.c:328 msgid "bytes" msgstr "byte" -#: builtin/repack.c:310 +#: builtin/repack.c:323 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:312 +#: builtin/repack.c:325 msgid "limits the maximum delta depth" msgstr "giแปi hแบกn ฤแป sรขu tแปi ฤa cแปงa โdeltaโ" -#: builtin/repack.c:314 +#: builtin/repack.c:327 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:316 +#: builtin/repack.c:329 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:318 +#: builtin/repack.c:331 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:320 +#: builtin/repack.c:333 msgid "do not repack this pack" msgstr "ฤแปซng ฤรณng gรณi lแบกi gรณi nร y" -#: builtin/repack.c:330 +#: builtin/repack.c:343 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:334 +#: builtin/repack.c:347 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable vร -A xung khแบฏc nhau" -#: builtin/repack.c:417 +#: builtin/repack.c:430 msgid "Nothing new to pack." msgstr "Khรดng cรณ gรฌ mแปi ฤแป mร ฤรณng gรณi." -#: builtin/repack.c:478 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18492,7 +20326,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:526 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "gแบทp lแปi khi gแปก bแป โ%sโ" @@ -18600,8 +20434,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:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: 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 "khรดng phแบฃi lร tรชn ฤแปi tฦฐแปฃng hแปฃp lแป: โ%sโ" @@ -18620,22 +20454,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:383 +#: builtin/replace.c:384 #, 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:414 +#: builtin/replace.c:416 #, 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:416 +#: builtin/replace.c:418 #, 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:428 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -18644,31 +20478,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:467 +#: builtin/replace.c:469 #, 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:468 +#: builtin/replace.c:470 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:478 +#: builtin/replace.c:480 #, 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:486 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft cho โ%sโ khรดng cแบงn thiแบฟt" -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, 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:525 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -18677,71 +20511,71 @@ msgstr "" "khรดng thแป chuyแปn ฤแปi cรกc graft sau ฤรขy:\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "liแปt kรช cรกc refs thay thแบฟ" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "xรณa tham chiแบฟu thay thแบฟ" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "sแปญa ฤแปi tฦฐแปฃng sแบตn cรณ" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "thay ฤแปi cha mแบน cแปงa lแบงn chuyแปn giao" -#: builtin/replace.c:550 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "chuyแปn ฤแปi cรกc tแบญp tin graft sแบตn cรณ" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "thay thแบฟ tham chiแบฟu nแบฟu nรณ ฤรฃ sแบตn cรณ" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "ฤแปซng in ฤแบนp cรกc nแปi dung cho --edit" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "dรนng ฤแปnh dแบกng nร y" -#: builtin/replace.c:567 +#: builtin/replace.c:569 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:575 +#: builtin/replace.c:577 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:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw chแป hแปฃp lรฝ vแปi --edit" -#: builtin/replace.c:585 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "-d cแบงn รญt nhแบฅt mแปt tham sแป" -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" -msgstr "sแป ฤแปi sแป khรดng ฤรบng" +msgstr "sแป lฦฐแปฃng ฤแปi sแป khรดng ฤรบng" -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e cแบงn chรญnh cรกc lร mแปt ฤแปi sแป" -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-q cแบงn รญt nhแบฅt mแปt tham sแป" -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file khรดng nhแบญn ฤแปi sแป" -#: builtin/replace.c:615 +#: builtin/replace.c:617 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" @@ -18770,115 +20604,126 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<tree-ish>] [--] </cรกc/ฤฦฐแปng/dแบซn>โฆ" +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "git reset [-q] [<tree-ish>] [--] <ฤแบทc/tแบฃ/ฤฦฐแปng/dแบซn>..." #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<tree-ish>] [--] [</cรกc/ฤฦฐแปng/dแบซn>โฆ]" +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>...]" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "pha trแปn" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "mแปm" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "cแปฉng" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "hรฒa trแปn" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "giแปฏ lแบกi" -#: builtin/reset.c:81 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "Bแบกn khรดng cรณ HEAD nร o hแปฃp lแป." -#: builtin/reset.c:83 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "Gแบทp lแปi khi tรฌm cรขy cแปงa HEAD." -#: builtin/reset.c:89 +#: builtin/reset.c:91 #, 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:193 +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD hiแปn giแป tแบกi %s" + +#: builtin/reset.c:195 #, 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:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 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:295 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "ฤแบทt lแบกi (reset) HEAD vร bแบฃng mแปฅc lแปฅc" -#: builtin/reset.c:296 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "chแป ฤแบทt lแบกi (reset) HEAD" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:300 builtin/reset.c:302 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:302 +#: builtin/reset.c:304 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:308 +#: builtin/reset.c:310 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:326 +#: builtin/reset.c:344 #, 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:334 +#: builtin/reset.c:352 #, 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:343 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch xung khแบฏc vแปi --{hard,mixed,soft}" -#: builtin/reset.c:353 +#: builtin/reset.c:371 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:355 +#: builtin/reset.c:373 #, 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:370 +#: builtin/reset.c:388 #, 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:374 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "-N chแป ฤฦฐแปฃc dรนng khi cรณ --mixed" -#: builtin/reset.c:395 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "Nhแปฏng thay ฤแปi ฤฦฐแปฃc ฤฦฐa ra khแปi bแป phรณng sau khi reset:" -#: builtin/reset.c:398 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -18892,53 +20737,48 @@ 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:408 +#: builtin/reset.c:434 #, 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:412 +#: builtin/reset.c:439 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:412 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "khรดng thแป tแป hแปฃp --exclude-promisor-objects vร --missing" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "lแปc ฤแปi tฦฐแปฃng yรชu cแบงu --objects" -#: 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 +#: builtin/rev-list.c:610 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: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-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-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<cรกc tรนy chแปn>] -- [<cรกc tham sแป>โฆ]" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "giแปฏ lแบกi โ--โ chuyแปn sang lร m tham sแป" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "dแปซng phรขn tรญch sau ฤแปi sแป ฤแบงu tiรชn khรดng cรณ tรนy chแปn" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "kแบฟt xuแบฅt trong ฤแปnh dแบกng gแบญy dร i" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -19079,37 +20919,41 @@ 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:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "khรดng liแปt kรช cรกc tแบญp tin ฤรฃ gแปก bแป" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "chแป gแปก bแป tแปซ mแปฅc lแปฅc" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "ghi ฤรจ lรชn kiแปm tra cแบญp nhแบญt" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "cho phรฉp gแปก bแป ฤแป qui" -#: builtin/rm.c:247 +#: builtin/rm.c:248 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:289 +#: 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 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:307 +#: builtin/rm.c:323 #, 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:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: khรดng thแป gแปก bแป %s" @@ -19126,55 +20970,77 @@ msgstr "" "chiแบฟu>โฆ]\n" " --all vร ฤแบทc tแบฃ <ref> rรต rร ng lร loแบกi trแปซ lแบซn nhau." -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:182 msgid "remote name" msgstr "tรชn mรกy dแปch vแปฅ" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:195 msgid "use stateless RPC protocol" msgstr "dรนng giao thแปฉc RPC khรดng แปn ฤแปnh" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:196 msgid "read refs from stdin" msgstr "ฤแปc tham chiแบฟu tแปซ ฤแบงu vร o tiรชu chuแบฉn" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:197 msgid "print status from remote helper" msgstr "in cรกc trแบกng thรกi tแปซ phแบงn hฦฐแปng dแบซn trรชn mรกy dแปch vแปฅ" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:15 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<cรกc tรนy chแปn>] [<vรนng-xรฉt-duyแปt>] [[--] [<ฤฦฐแปng/dแบซn>โฆ]]" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<cรกc tรนy chแปn>]" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:134 +msgid "using multiple --group options with stdin is not supported" +msgstr "" +"viแปc dรนng nhiแปu tรนy chแปn --group vแปi ฤแบงu ra tiรชu chuแบฉn lร khรดng ฤฦฐแปฃc hแป trแปฃ" + +#: builtin/shortlog.c:144 +msgid "using --group=trailer with stdin is not supported" +msgstr "viแปc dรนng --group=trailer vแปi ฤแบงu ra tiรชu chuแบฉn lร khรดng ฤฦฐแปฃc hแป trแปฃ" + +#: builtin/shortlog.c:388 +#, c-format +msgid "unknown group type: %s" +msgstr "khรดng nhแบญn ra kiแปu nhรณm: %s" + +#: builtin/shortlog.c:416 msgid "Group by committer rather than author" msgstr "Nhรณm theo ngฦฐแปi chuyแปn giao thay vรฌ tรกc giแบฃ" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:419 msgid "sort output according to the number of commits per author" msgstr "sแบฏp xแบฟp kแบฟt xuแบฅt tuรขn theo sแป lฦฐแปฃng chuyแปn giao trรชn mแปi tรกc giแบฃ" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:421 msgid "Suppress commit descriptions, only provides commit count" msgstr "Chแบทn mแปi mรด tแบฃ lแบงn chuyแปn giao, chแป ฤฦฐa ra sแป lฦฐแปฃng lแบงn chuyแปn giao" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:423 msgid "Show the email address of each author" msgstr "Hiแปn thแป thฦฐ ฤiแปn tแปญ cho tแปซng tรกc giแบฃ" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:424 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:425 msgid "Linewrap output" msgstr "Ngแบฏt dรฒng khi quรก dร i" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:427 +msgid "field" +msgstr "trฦฐแปng" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "Nhรณm theo trฦฐแปng" + +#: builtin/shortlog.c:456 msgid "too many arguments given outside repository" msgstr "quรก nhiแปu tham sแป ฤฦฐa ra ngoร i kho chแปฉa" @@ -19311,6 +21177,14 @@ msgstr "โ%sโ khรดng phแบฃi tham chiแบฟu hแปฃp lแป." msgid "cannot find commit %s (%s)" msgstr "khรดng thแป tรฌm thแบฅy lแบงn chuyแปn giao %s (%s)" +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "thuแบญt-toรกn-bฤm" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "Khรดng hiแปu thuแบญt toรกn bฤm dแปฏ liแปu" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -19359,15 +21233,91 @@ 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/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <cรกc-tรนy-chแปn>" + +#: builtin/sparse-checkout.c:50 +#| msgid "git sparse-checkout init [--cone]" +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:76 +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:228 +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:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "khรดng thแป nรขng cแบฅp ฤแปnh dแบกng kho lฦฐu trแปฏ ฤแป kรญch hoแบกt worktreeConfig" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "gแบทp lแปi khi ฤแบทt cร i ฤแบทt extensions.worktreeConfig" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "khแปi tแบกo sparse-checkout trong chแบฟ ฤแป nรณn" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "gแบทp lแปi khi mแป โ%sโ" + +#: builtin/sparse-checkout.c:401 +#, c-format +msgid "could not normalize path %s" +msgstr "khรดng thแป thฦฐแปng hรณa ฤฦฐแปng dแบซn โ%sโ" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <cรกc mแบซu>)" + +#: builtin/sparse-checkout.c:438 +#, 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:492 builtin/sparse-checkout.c:516 +msgid "unable to load existing sparse-checkout patterns" +msgstr "khรดng thแป tแบฃi cรกc mแบซu sparse-checkout" + +#: builtin/sparse-checkout.c:561 +msgid "read patterns from standard in" +msgstr "ฤแปc cรกc mแบซu tแปซ ฤแบงu vร o tiรชu chuแบฉn" + +#: builtin/sparse-checkout.c:576 +#| msgid "git sparse-checkout init [--cone]" +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:595 +#| msgid "git sparse-checkout init [--cone]" +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:623 +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 msgid "git stash list [<options>]" msgstr "git stash list [<cรกc tรนy chแปn>]" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<cรกc tรนy chแปn>] <stash>" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -19375,25 +21325,27 @@ 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:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <tรชn-nhรกnh> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: 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 <lแปi nhแบฏn>]\n" +" [--pathspec-from-file=<tแบญp_tin> [--pathspec-file-nul]]\n" " [--] [<ฤแบทc/tแบฃ/ฤฦฐแปng/dแบซn>โฆ]]" -#: builtin/stash.c:31 builtin/stash.c:84 +#: 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>]" @@ -19401,190 +21353,202 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<ghi chรบ>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <ghi chรบ>] [-q|--quiet] <commit>" -#: builtin/stash.c:127 +#: 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 #, 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:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "Chแป ra quรก nhiแปu ฤiแปm xรฉt duyแปt: %s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 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:175 +#: builtin/stash.c:176 #, 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:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 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:403 +#: builtin/stash.c:404 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:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "khรดng thแป tแบกo diff %s^!." -#: builtin/stash.c:421 +#: builtin/stash.c:422 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:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "khรดng thแป ghi lแบกi cรขy chแป mแปฅc" -#: builtin/stash.c:434 +#: builtin/stash.c:437 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:448 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "ฤang hรฒa trแปn %s vแปi %s" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "Bแบฃng mแปฅc lแปฅc ฤรฃ khรดng ฤฦฐแปฃc bแป stash." -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "gแบทp lแปi ฤแปc bแบฃng mแปฅc lแปฅc" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "ฤรฃ xรณa %s (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Khรดng thแป xรณa bแป mแปฅc stash" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "โ%sโ khรดng phแบฃi tham chiแบฟu ฤแบฟn stash" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 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:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "Chฦฐa chแป ra tรชn cแปงa nhรกnh" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "Khรดng thแป cแบญp nhแบญt %s vแปi %s" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 msgid "stash message" msgstr "phแบงn chรบ thรญch cho stash" -#: builtin/stash.c:818 +#: builtin/stash.c:828 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:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1043 msgid "No changes selected" msgstr "Chฦฐa cรณ thay ฤแปi nร o ฤฦฐแปฃc chแปn" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1143 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:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1170 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:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1179 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:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1190 builtin/stash.c:1199 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:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1227 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:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1276 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:1285 +#: builtin/stash.c:1292 msgid "Did you forget to 'git add'?" msgstr "Cรณ lแบฝ bแบกn ฤรฃ quรชn โgit add โ phแบฃi khรดng?" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1307 msgid "No local changes to save" msgstr "Khรดng cรณ thay ฤแปi nแปi bแป nร o ฤฦฐแปฃc ghi lแบกi" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1314 msgid "Cannot initialize stash" msgstr "Khรดng thแป khแปi tแบกo stash" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1329 msgid "Cannot save the current status" msgstr "Khรดng thแป ghi lแบกi trแบกng thรกi hiแปn hร nh" -#: builtin/stash.c:1327 +#: builtin/stash.c:1334 #, 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:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1424 msgid "Cannot remove worktree changes" msgstr "Khรดng thแป gแปก bแป cรกc thay ฤแปi cรขy-lร m-viแปc" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1463 builtin/stash.c:1528 msgid "keep index" msgstr "giแปฏ nguyรชn bแบฃng mแปฅc lแปฅc" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "stash in patch mode" msgstr "cแบฅt ฤi แป chแบฟ ฤแป miแบฟng vรก" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "quiet mode" msgstr "chแบฟ ฤแป im lแบทng" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1468 builtin/stash.c:1533 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:1459 builtin/stash.c:1495 +#: builtin/stash.c:1470 builtin/stash.c:1535 msgid "include ignore files" msgstr "bao gแปm cรกc tแบญp tin bแป bแป qua" -#: builtin/stash.c:1555 -#, c-format -msgid "could not exec %s" -msgstr "khรดng thแป thแปฑc thi %s" +#: builtin/stash.c:1570 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"viแปc hแป trแปฃ stash.useBuiltin ฤรฃ bแป xรณa!\n" +"Xem mแปฅc tin cแปงa nรณ trong โgit help configโ ฤแป biแบฟt chi tiแบฟt." #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -19602,40 +21566,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:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, 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:62 +#: builtin/submodule--helper.c:64 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:100 +#: builtin/submodule--helper.c:102 #, 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:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 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:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=</ฤฦฐแปng/dแบซn>] [</ฤฦฐแปng/dแบซn>โฆ]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, 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:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "ฤang vร o โ%sโ\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -19644,7 +21608,7 @@ msgstr "" "run_command trแบฃ vแป trแบกng thรกi khรกc khรดng cho %s\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19655,19 +21619,19 @@ msgstr "" "con lแปng nhau cแปงa %s\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 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:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" msgstr "ฤแป quy vร o trong cรกc mรด-ฤun-con lแปng nhau" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <lแปnh>" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -19676,56 +21640,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:665 +#: builtin/submodule--helper.c:666 #, 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:669 +#: builtin/submodule--helper.c:670 #, 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:679 +#: builtin/submodule--helper.c:680 #, 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:686 +#: builtin/submodule--helper.c:687 #, 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:708 +#: builtin/submodule--helper.c:709 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:713 +#: builtin/submodule--helper.c:714 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:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, 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:824 +#: builtin/submodule--helper.c:835 #, 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:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, 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:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "Chแบทn kรฉt xuแบฅt tรฌnh trแบกng mรด-ฤun-con" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:887 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -19733,48 +21697,107 @@ 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:877 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" msgstr "ฤแป quy vร o trong mรด-ฤun-con lแปng nhau" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" "git submodule status [--quiet] [--cached] [--recursive] [</ฤฦฐแปng/dแบซn>โฆ]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name </ฤฦฐแปng/dแบซn>" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "" +"* %s %s(blob)->%s(\n" +")" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "* %s %s(mรด-ฤun-con)->%s(blob)" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "khรดng thแป bฤm ฤแปi tฦฐแปฃng tแปซ โ%sโ" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "gแบทp chแบฟ ฤแป khรดng nhฦฐ mong chแป %o\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "hรนng lแบงn chuyแปn giao ฤรฃ lฦฐu trong mแปฅc lแปฅc thay cho HEAD mรด-ฤun-con" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" +"ฤแป so sรกnh lแบงn chuyแปn giao lฦฐu trong mแปฅc lแปฅc vแปi cรกi trong HEAD mรด-ฤun-con" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "" +"bแป qua cรกc mรด-ฤun-con vแปi giรก trแป cแปงa 'ignore_config' ฤฦฐแปฃc ฤแบทt thร nh 'all'" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "giแปi hแบกn kรญch cแปก tแปng hแปฃp" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "" +"git submodule--helper summary [<cรกc tรนy chแปn>] [<lแบงn_chuyแปn_giao>] [--] [</" +"ฤฦฐแปng/dแบซn>]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "khรดng thแป lแบฅy vแป mแปt ฤiแปm xem xรฉt cho HEAD" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "Cรกc tรนy chแปn --cached vร --files loแบกi tแปซ lแบซn nhau" + +#: builtin/submodule--helper.c:1407 #, 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:976 +#: builtin/submodule--helper.c:1413 #, 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:990 +#: builtin/submodule--helper.c:1427 #, 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:1001 +#: builtin/submodule--helper.c:1438 #, 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:1048 +#: builtin/submodule--helper.c:1485 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:1055 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [</ฤฦฐแปng/dแบซn>]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -19783,7 +21806,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:1121 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -19792,176 +21815,207 @@ 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:1129 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "ฤรฃ xรณa thฦฐ mแปฅc โ%sโ\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1568 #, 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:1142 +#: builtin/submodule--helper.c:1579 #, 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:1158 +#: builtin/submodule--helper.c:1595 #, 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:1187 +#: builtin/submodule--helper.c:1624 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:1188 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "Bแป ฤฤng kรฝ tแบฅt cแบฃ cรกc trong mรด-ฤun-con" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [</ฤฦฐแปng/dแบซn>โฆ]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1644 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:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1713 +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:1752 builtin/submodule--helper.c:1755 #, 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:1341 +#: builtin/submodule--helper.c:1791 #, 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:1348 +#: builtin/submodule--helper.c:1798 #, 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:1371 +#: builtin/submodule--helper.c:1822 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:1374 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "tรชn cแปงa mรด-ฤun-con mแปi" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1828 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:1385 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "chiแปu sรขu lแปch sแปญ khi tแบกo bแบฃn sao" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "รฉp buแปc tiแบฟn trรฌnh nhรขn bแบฃn" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +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:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=</ฤฦฐแปng/dแบซn>] [--quiet] [--reference " -"<kho>] [--name <tรชn>] [--depth <sรขu>] [--url <url>] [</ฤฦฐแปng/dแบซn>โฆ]" +"<kho>] [--name <tรชn>] [--depth <sรขu>] [--single-branch] [--url <url>] --path " +"</ฤฦฐแปng/dแบซn>" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1873 +#, 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" + +#: builtin/submodule--helper.c:1884 #, 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:1438 +#: builtin/submodule--helper.c:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "thฦฐ mแปฅc khรดng trแปng: '%s'" + +#: builtin/submodule--helper.c:1900 #, 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:1474 +#: builtin/submodule--helper.c:1936 #, 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:1478 +#: builtin/submodule--helper.c:1940 #, 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:1571 +#: builtin/submodule--helper.c:2041 #, 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:1575 +#: builtin/submodule--helper.c:2045 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:1605 +#: builtin/submodule--helper.c:2075 #, 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:1634 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "Bแป qua mรด-ฤun-con โ%sโ" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:2254 #, 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:1789 +#: builtin/submodule--helper.c:2265 #, 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:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "ฤฦฐแปng dแบซn ฤแบฟn cรขy lร m viแปc" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:2330 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:1858 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout hoแบทc khรดng lร m gรฌ cแบฃ" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:2340 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:1867 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "cรดng viแปc ฤแปng thแปi" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:2345 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:1870 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "ฤแปซng in tiแบฟn trรฌnh nhรขn bแบฃn" -#: builtin/submodule--helper.c:1877 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +#: builtin/submodule--helper.c:2357 +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:1890 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "giรก trแป cho tham sแป cแบญp nhแบญt bแป sai" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -19970,50 +22024,86 @@ 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:2061 +#: builtin/submodule--helper.c:2541 #, 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:2094 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "ฤแป quy vร o trong mรด-ฤun-con" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2580 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:2156 +#: builtin/submodule--helper.c:2636 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:2159 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "bแป ฤแบทt cแบฅu hรฌnh trong tแบญp tin .gitmodules" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <tรชn> [<giรก trแป>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <tรชn>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 #, 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:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2681 +msgid "Suppress output for setting url of a submodule" +msgstr "Chแบทn kแบฟt xuแบฅt cho cร i ฤแบทt url cแปงa mแปt mรด-ฤun-con" + +#: builtin/submodule--helper.c:2685 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper set-url [--quiet] </ฤฦฐแปng/dแบซn> <url_mแปi>" + +#: builtin/submodule--helper.c:2718 +msgid "set the default tracking branch to master" +msgstr "ฤแบทt nhรกnh theo dรตi mแบทc ฤแปnh thร nh master" + +#: builtin/submodule--helper.c:2720 +msgid "set the default tracking branch" +msgstr "ฤแบทt nhรกnh theo dรตi mแบทc ฤแปnh" + +#: builtin/submodule--helper.c:2724 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "" +"git submodule--helper set-branch [-q|--quiet](-d|--default)</ฤฦฐแปng/dแบซn>" + +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <nhรกnh> </ฤฦฐแปng/" +"dแบซn>" + +#: builtin/submodule--helper.c:2732 +msgid "--branch or --default required" +msgstr "cแบงn --branch hoแบทc --default" + +#: builtin/submodule--helper.c:2735 +msgid "--branch and --default are mutually exclusive" +msgstr "Cรกc tรนy chแปn --branch vร --default loแบกi tแปซ lแบซn nhau" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s khรดng hแป trแปฃ --super-prefix" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2798 #, 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แป" @@ -20038,11 +22128,11 @@ msgstr "xรณa tham chiแบฟu mแปm" msgid "shorten ref output" msgstr "lร m ngแบฏn kแบฟt xuแบฅt ref (tham chiแบฟu)" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "lรฝ do" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "lรฝ do cแบญp nhแบญt" @@ -20062,11 +22152,13 @@ msgstr "git tag -d <tรชn-thแบป>โฆ" msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" "git tag -l [-n[<sแป>]] [--contains <lแบงn_chuyแปn_giao>] [--no-contains " "<lแบงn_chuyแปn_giao>] [--points-at <ฤแปi-tฦฐแปฃng>]\n" -"\t\t[--format=<ฤแปnh_dแบกng>] [--[no-]merged [<lแบงn_chuyแปn_giao>]] [<mแบซu>โฆ]" +"\t\t[--format=<ฤแปnh_dแบกng>] [--merged <lแบงn_chuyแปn_giao>] [--no-merged " +"[<lแบงn_chuyแปn_giao>]] [<mแบซu>โฆ]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -20135,339 +22227,343 @@ msgstr "" msgid "bad object type." msgstr "kiแปu ฤแปi tฦฐแปฃng sai." -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "khรดng cรณ chรบ thรญch gรฌ cho cho thแบป ร ?" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "Nแปi dung ghi chรบ cรฒn lแบกi %s\n" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "chแป liแปt kรช tรชn cรกc thแบป" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "hiแปn thแป <n> dรฒng cho mแปi ghi chรบ" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "xรณa thแบป" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "thแบฉm tra thแบป" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "Tรนy chแปn tแบกo thแบป" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "ฤแป chรบ giแบฃi cho thแบป, cแบงn mแปt lแปi ghi chรบ" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "phแบงn chรบ thรญch cho thแบป" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "รฉp buแปc sแปญa thแบป lแบงn commit" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "thแบป chรบ giแบฃi vร kรฝ kiแปu GPG" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "dรนng khรกo khรกc ฤแป kรฝ thแบป" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "thay thแบฟ nแบฟu thแบป ฤรณ ฤรฃ cรณ trฦฐแปc" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "tแบกo mแปt reflog" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "Cรกc tรนy chแปn liแปt kรช thแบป" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "hiแปn thแป danh sรกch thแบป trong cรกc cแปt" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "chแป hiแปn thแป nhแปฏng nhรกnh mร nรณ chแปฉa lแบงn chuyแปn giao" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "chแป hiแปn thแป nhแปฏng thแบป mร nรณ khรดng chแปฉa lแบงn chuyแปn giao" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "chแป hiแปn thแป nhแปฏng thแบป mร nรณ ฤฦฐแปฃc hรฒa trแปn" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "chแป hiแปn thแป nhแปฏng thแบป mร nรณ khรดng ฤฦฐแปฃc hรฒa trแปn" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "chแป hiแปn thแป cรกc thแบป cแปงa ฤแปi tฦฐแปฃng" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "--column vร -n xung khแบฏc nhau" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "tรนy chแปn -n chแป cho phรฉp dรนng trong chแบฟ ฤแป liแปt kรช" -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "tรนy chแปn --contains chแป cho phรฉp dรนng trong chแบฟ ฤแป liแปt kรช" -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "tรนy chแปn --no-contains chแป cho phรฉp dรนng trong chแบฟ ฤแป liแปt kรช" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "tรนy chแปn --points-at chแป cho phรฉp dรนng trong chแบฟ ฤแป liแปt kรช" -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" "tรนy chแปn --merged vร --no-merged chแป cho phรฉp dรนng trong chแบฟ ฤแป liแปt kรช" -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "chแป cรณ mแปt tรนy chแปn -F hoแบทc -m lร ฤฦฐแปฃc phรฉp." -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "quรก nhiแปu ฤแปi sแป" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "โ%sโ khรดng phแบฃi thแบป hแปฃp lแป." -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "thแบป โ%sโ ฤรฃ tแปn tแบกi rแปi" -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "ฤรฃ cแบญp nhแบญt thแบป โ%sโ (trฦฐแปc lร %s)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "ฤang giแบฃi nรฉn cรกc ฤแปi tฦฐแปฃng" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "tแบกo thฦฐ mแปฅc \"%s\" gแบทp lแปi" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "gแบทp lแปi khi tแบกo tแบญp tin %s" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "gแบทp lแปi khi xรณa tแบญp tin %s" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "gแบทp lแปi khi xรณa thฦฐ mแปฅc %s" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "ฤang kiแปm thแปญ mtime trong โ%sโ " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 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:166 +#: builtin/update-index.c:167 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:179 +#: builtin/update-index.c:180 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:190 +#: builtin/update-index.c:191 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:201 +#: builtin/update-index.c:202 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:214 +#: builtin/update-index.c:215 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:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " ฤแปng รฝ" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<cรกc tรนy chแปn>] [--] [<tแบญp-tin>โฆ]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:974 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:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "refresh: lแป ฤi mรด-ฤun-con" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "khรดng bแป qua cรกc tแบญp tin mแปi tแบกo" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 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:981 +#: builtin/update-index.c:984 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:983 +#: builtin/update-index.c:986 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:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "lแบฅy lแบกi thรดng tin thแปng kรช" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 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:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<chแบฟ_ฤแป>,<ฤแปi_tฦฐแปฃng>,<ฤฦฐแปng_dแบซn>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 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:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "ฤรกnh dแบฅu cรกc tแบญp tin lร \"khรดng thay ฤแปi\"" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "xรณa bรญt assumed-unchanged (giแบฃ ฤแปnh lร khรดng thay ฤแปi)" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "ฤรกnh dแบฅu cรกc tแบญp tin lร โchแป-ฤแปcโ" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "xรณa bรญt skip-worktree" -#: builtin/update-index.c:1017 +#: 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 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:1019 +#: builtin/update-index.c:1024 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:1021 +#: builtin/update-index.c:1026 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:1023 +#: builtin/update-index.c:1028 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:1027 +#: builtin/update-index.c:1032 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:1031 +#: builtin/update-index.c:1036 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:1035 +#: builtin/update-index.c:1040 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:1039 +#: builtin/update-index.c:1044 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:1042 +#: builtin/update-index.c:1047 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:1044 +#: builtin/update-index.c:1049 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:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "ghi mแปฅc lแปฅc แป ฤแปnh dแบกng nร y" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "bแบญt/tแบฏt chia cแบฏt bแบฃng mแปฅc lแปฅc" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "bแบญt/tแบฏt bแป ฤแปm khรดng theo vแบฟt" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 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:1056 +#: builtin/update-index.c:1061 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:1058 +#: builtin/update-index.c:1063 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:1060 +#: builtin/update-index.c:1065 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:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "ฤรกnh dแบฅu cรกc tแบญp tin lร hแปฃp lแป fsmonitor" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "xรณa bรญt hแปฃp lแป fsmonitor" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20475,7 +22571,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:1177 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20483,7 +22579,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:1188 +#: 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" @@ -20491,11 +22587,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:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Nhแป ฤแปm khรดng theo vแบฟt bแป tแบฏt" -#: builtin/update-index.c:1200 +#: 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" @@ -20503,29 +22599,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:1204 +#: builtin/update-index.c:1210 #, 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:1212 +#: builtin/update-index.c:1218 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:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor ฤฦฐแปฃc bแบญt" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1225 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:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor bแป tแบฏt" @@ -20541,19 +22637,19 @@ msgstr "git update-ref [<cรกc tรนy chแปn>] <refname> <biแบฟn-mแปi> [<biแบฟn msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<cรกc tรนy chแปn>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "xรณa tham chiแบฟu" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "cแบญp nhแบญt <tรชn-tham-chiแบฟu> khรดng phแบฃi cรกi nรณ chแป tแปi" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "ฤแบงu vร o tiรชu chuแบฉn cรณ cรกc ฤแปi sแป ฤฦฐแปฃc chแบฅm dแปฉt bแปi NUL" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "ฤแปc cแบญp nhแบญt tแปซ ฤแบงu vร o tiรชu chuแบฉn" @@ -20597,15 +22693,15 @@ msgstr "hiแปn thแป nแปi dung cแปงa lแบงn chuyแปn giao" msgid "print raw gpg status output" msgstr "in kแบฟt xuแบฅt trแบกng thรกi gpg dแบกng thรด" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <gรณi>โฆ" -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "chi tiแบฟt" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "chแป hiแปn thแป thแปng kรช" @@ -20617,221 +22713,215 @@ 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:18 +#: builtin/worktree.c:17 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:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<cรกc tรนy chแปn>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<cรกc tรนy chแปn>] </ฤฦฐแปng/dแบซn>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <worktree> </ฤฦฐแปng/dแบซn/mแปi>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<cรกc tรนy chแปn>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<cรกc tรนy chแปn>] <worktree>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock </ฤฦฐแปng/dแบซn>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:970 #, c-format msgid "failed to delete '%s'" msgstr "gแบทp lแปi khi xรณa โ%sโ" -#: 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 +msgid "not a valid directory" +msgstr "khรดng phแบฃi thฦฐ mแปฅc hแปฃp lแป" -#: 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:91 +msgid "gitdir file does not exist" +msgstr "tแบญp tin gitdir khรดng tแปn tแบกi" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:96 builtin/worktree.c:105 #, 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)" +msgid "unable to read gitdir file (%s)" +msgstr "khรดng thแป ฤแปc tแบญp tin gitdir (%s)" -#: builtin/worktree.c:110 +#: builtin/worktree.c:115 #, 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>)" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "ฤแปc ngแบฏn (cแบงn %<PRIuMAX> byte, ฤแปc %<PRIuMAX>)" -#: 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:123 +msgid "invalid gitdir file" +msgstr "tแบญp tin gitdir (thฦฐ mแปฅc git) khรดng hแปฃp lแป" -#: builtin/worktree.c:127 +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "tแบญp tin gitdir chแป ฤแบฟn vแป trรญ khรดng tแปn tแบกi" + +#: builtin/worktree.c:146 #, 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" +msgid "Removing %s/%s: %s" +msgstr "ฤang xรณa %s/%s: %s" -#: builtin/worktree.c:166 +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "bรกo cรกo cรกc cรขy lร m viแปc ฤรฃ prune" -#: builtin/worktree.c:168 +#: builtin/worktree.c:223 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:235 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "โ%sโ ฤรฃ cรณ tแปซ trฦฐแปc rแปi" -#: builtin/worktree.c:252 +#: builtin/worktree.c:302 #, c-format -msgid "unable to re-add worktree '%s'" -msgstr "khรดng thแป thรชm-lแบกi cรขy โ%sโ" +msgid "unusable worktree destination '%s'" +msgstr "ฤรญch cรขy lร m viแปc khรดng sแปญ dแปฅng ฤฦฐแปฃc โ%sโ" -#: builtin/worktree.c:257 +#: builtin/worktree.c:307 #, 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" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" 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" +"dรนng โ%s -f -fโ ฤแป ghi ฤรจ, hoแบทc โunlockโ vร โpruneโ hay โremoveโ ฤแป xรณa" -#: builtin/worktree.c:259 +#: builtin/worktree.c:309 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" 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" +"dรนng โ%s -fโ ฤแป ghi ฤรจ, hoแบทc โpruneโ hay โremoveโ ฤแป xรณa" -#: builtin/worktree.c:309 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "khรดng thแป tแบกo thฦฐ mแปฅc cแปงa โ%sโ" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, 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:442 +#: builtin/worktree.c:496 #, 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:451 +#: builtin/worktree.c:505 #, 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:457 +#: builtin/worktree.c:511 #, 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:498 +#: builtin/worktree.c:552 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:501 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "tแบกo nhรกnh mแปi" -#: builtin/worktree.c:503 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "tแบกo hay ฤแบทt lแบกi mแปt nhรกnh" -#: builtin/worktree.c:505 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "di chuyแปn cรขy lร m viแปc mแปi" -#: builtin/worktree.c:506 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "giแปฏ cรขy lร m viแปc mแปi bแป khรณa" -#: builtin/worktree.c:509 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "cร i ฤแบทt chแบฟ ฤแป theo dรตi (xem git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:566 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:520 +#: builtin/worktree.c:574 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:581 +#: builtin/worktree.c:635 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:681 +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "lรฝ do khรณa" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 #, 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:695 builtin/worktree.c:728 +#: builtin/worktree.c:769 builtin/worktree.c:802 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:700 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "โ%sโ ฤรฃ ฤฦฐแปฃc khรณa rแปi, lรฝ do: %s" -#: builtin/worktree.c:702 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "โ%sโ ฤรฃ ฤฦฐแปฃc khรณa rแปi" -#: builtin/worktree.c:730 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "โ%sโ chฦฐa bแป khรณa" -#: builtin/worktree.c:771 +#: builtin/worktree.c:845 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:779 +#: builtin/worktree.c:853 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:802 builtin/worktree.c:929 +#: builtin/worktree.c:876 builtin/worktree.c:1000 #, c-format msgid "'%s' is a main working tree" msgstr "โ%sโ lร cรขy lร m viแปc chรญnh" -#: builtin/worktree.c:807 +#: builtin/worktree.c:881 #, 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:813 -#, c-format -msgid "target '%s' already exists" -msgstr "ฤรญch โ%sโ ฤรฃ tแปn tแบกi rแปi" - -#: builtin/worktree.c:821 +#: builtin/worktree.c:894 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -20840,7 +22930,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:823 +#: builtin/worktree.c:896 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -20848,36 +22938,38 @@ 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:826 +#: builtin/worktree.c:899 #, 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:831 +#: builtin/worktree.c:904 #, c-format msgid "failed to move '%s' to '%s'" msgstr "gแบทp lแปi khi chuyแปn โ%sโ sang โ%sโ" -#: builtin/worktree.c:879 +#: builtin/worktree.c:950 #, 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:883 +#: builtin/worktree.c:954 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "โ%sโ ฤang bแบฉn, hรฃy dรนng --force ฤแป xรณa nรณ" +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รณ" -#: builtin/worktree.c:888 +#: builtin/worktree.c:959 #, 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:911 +#: builtin/worktree.c:982 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:934 +#: builtin/worktree.c:1005 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -20886,7 +22978,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:936 +#: builtin/worktree.c:1007 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -20894,11 +22986,21 @@ 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:939 +#: builtin/worktree.c:1010 #, 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" +#: builtin/worktree.c:1034 +#, c-format +msgid "repair: %s: %s" +msgstr "sแปญa chแปฏa: %s: %s" + +#: builtin/worktree.c:1037 +#, c-format +msgid "error: %s: %s" +msgstr "lแปi: %s: %s" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<tiแปn-tแป>/]" @@ -20915,29 +23017,21 @@ 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" -#: credential-cache--daemon.c:223 +#: http-fetch.c:114 #, 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 "" -"Quyแปn hแบกn trรชn thฦฐ mแปฅc gรณi mแบกng cแปงa bแบกn khรดng chรญnh xรกc; ngฦฐแปi dรนng\n" -"khรกc cรณ lแบฝ cรณ thแป ฤแปc ฤฦฐแปฃc chแปฉng thฦฐ ฤฦฐแปฃc lฦฐu ฤแปm cแปงa bแบกn. Cรขn nhแบฏc chแบกy:\n" -"\n" -"\tchmod 0700 %s" +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "tham sแป cho --packfile phแบฃi lร mแปt giรก trแป bฤm hแปฃp lแป (nhแบญn ฤฦฐแปฃc '%s')" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "in thรดng tin gแปก lแปi ra ฤแบงu ra lแปi tiรชu chuแบฉn" +#: http-fetch.c:122 +msgid "not a git repository" +msgstr "khรดng phแบฃi lร kho git" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "lแบงn chuyแปn giao %s chฦฐa ฤฦฐแปฃc ฤรกnh dแบฅu lร tiแบฟp cแบญn ฤฦฐแปฃc" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "cรณ quรก nhiแปu lแบงn chuyแปn giao ฤฦฐแปฃc ฤรกnh dแบฅu lร tiแบฟp cแบญn ฤฦฐแปฃc" @@ -20949,7 +23043,7 @@ msgstr "test-tool serve-v2 [<cรกc tรนy chแปn>]" msgid "exit immediately after advertising capabilities" msgstr "thoรกt ngay sau khi khแปi tแบกo quแบฃng cรกo capabilities" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -20967,7 +23061,7 @@ msgstr "" "namespace=<tรชn>]\n" " <lแปnh> [<cรกc tham sแป>]" -#: git.c:34 +#: git.c:35 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" @@ -20979,47 +23073,47 @@ msgstr "" "ฤแป xem cรกc ฤแบทc tแบฃ cho lแปnh hay khรกi niแปm cแปฅ thแป.\n" "Xem 'git help git' ฤแป biแบฟt tแปng quan cแปงa hแป thแปng." -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "chฦฐa chแป ra thฦฐ mแปฅc cho --git-dir\n" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "chฦฐa ฤฦฐa ra khรดng gian lร m viแปc cho --namespace\n" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "chฦฐa ฤฦฐa ra cรขy lร m viแปc cho --work-tree\n" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "chฦฐa ฤฦฐa ra tiแปn tแป cho --super-prefix\n" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "-c cแบงn mแปt chuแปi cแบฅu hรฌnh\n" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "chฦฐa ฤฦฐa ra thฦฐ mแปฅc cho -C\n" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "khรดng hiแปu tรนy chแปn: %s\n" -#: git.c:360 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "trong khi triแปn khai bรญ danh โ%sโ: โ%sโ" -#: git.c:369 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -21028,40 +23122,40 @@ 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:377 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "lร m trแปng bรญ danh cho %s" -#: git.c:380 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "ฤแป quy cรกc bรญ danh: %s" -#: git.c:460 +#: git.c:465 msgid "write failure on standard output" msgstr "lแปi ghi nghiรชm trong trรชn ฤแบงu ra tiรชu chuแบฉn" -#: git.c:462 +#: git.c:467 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:464 +#: git.c:469 msgid "close failed on standard output" msgstr "gแบทp lแปi khi ฤรณng ฤแบงu ra tiรชu chuแบฉn" -#: git.c:793 +#: git.c:819 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" "dรฒ tรฌm thแบฅy cรกc bรญ danh quแบฉn trรฒn: biแปu thแปฉc cแปงa โ%sโ khรดng cรณ ฤiแปm kแบฟt:%s" -#: git.c:843 +#: git.c:869 #, c-format msgid "cannot handle %s as a builtin" msgstr "khรดng thแป xแปญ lรฝ %s nhฦฐ lร mแปt phแบงn bแป sung" -#: git.c:856 +#: git.c:882 #, c-format msgid "" "usage: %s\n" @@ -21070,57 +23164,57 @@ msgstr "" "cรกch dรนng: %s\n" "\n" -#: git.c:876 +#: git.c:902 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "gแบทp lแปi khi khai triแปn bรญ danh โ%sโ; โ%sโ khรดng phแบฃi lร lแปnh git\n" -#: git.c:888 +#: git.c:914 #, c-format msgid "failed to run command '%s': %s\n" msgstr "gแบทp lแปi khi chแบกy lแปnh โ%sโ: %s\n" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "giรก trแป รขm cho http.postbuffer; ฤแบทt thร nh mแบทc ฤแปnh lร %d" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "ฤiแปu khiแปn giao quyแปn khรดng ฤฦฐแปฃc hแป trแปฃ vแปi cURL < 7.22.0" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Chแปt khรณa cรดng khรดng ฤฦฐแปฃc hแป trแปฃ vแปi cURL < 7.44.0" -#: http.c:876 +#: http.c:910 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE khรดng ฤฦฐแปฃc hแป trแปฃ vแปi cURL < 7.44.0" -#: http.c:949 +#: http.c:989 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:1085 +#: http.c:1132 #, 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:1092 +#: http.c:1139 #, 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:1096 +#: http.c:1143 #, 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:1965 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21131,154 +23225,196 @@ msgstr "" " hแปi cho: %s\n" " chuyแปn hฦฐแปng: %s" -#: remote-curl.c:157 +#: remote-curl.c:174 #, 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:254 +#: remote-curl.c:298 #, 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:355 +#: remote-curl.c:399 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:386 +#: remote-curl.c:430 #, 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:446 +#: remote-curl.c:490 #, c-format msgid "repository '%s' not found" msgstr "khรดng tรฌm thแบฅy kho โ%sโ" -#: remote-curl.c:450 +#: remote-curl.c:494 #, c-format msgid "Authentication failed for '%s'" msgstr "Xรกc thแปฑc gแบทp lแปi cho โ%sโ" -#: remote-curl.c:454 +#: remote-curl.c:498 #, c-format msgid "unable to access '%s': %s" msgstr "khรดng thแป truy cแบญp โ%sโ: %s" -#: remote-curl.c:460 +#: remote-curl.c:504 #, c-format msgid "redirecting to %s" msgstr "chuyแปn hฦฐแปng ฤแบฟn %s" -#: remote-curl.c:584 +#: remote-curl.c:633 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:664 +#: remote-curl.c:645 +msgid "remote server sent stateless separator" +msgstr "mรกy phแปฅc vแปฅ tแปซ xa gแปญi cรกc bแป ngฤn cรกch khรดng tรฌnh trแบกng" + +#: remote-curl.c:715 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:724 +#: remote-curl.c:745 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curl: kรฝ tแปฑ chiแปu dร i dรฒng bแป sai: %.4s" + +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curl: gแบทp ฤรกp แปฉng lร gรณi kแบฟt thรบc bแบฅt ngแป" + +#: remote-curl.c:823 #, c-format msgid "RPC failed; %s" msgstr "RPC gแบทp lแปi; %s" -#: remote-curl.c:764 +#: remote-curl.c:863 msgid "cannot handle pushes this big" msgstr "khรดng thแป xแปญ lรฝ ฤแบฉy cรกi lแปn nร y" -#: remote-curl.c:879 +#: remote-curl.c:978 #, 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:883 +#: remote-curl.c:982 #, 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:1014 +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" +msgstr "ฤรฃ nhแบญn vแป phแบงn ฤแบงu cรณ chiแปu dร i %d byte" + +#: remote-curl.c:1034 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "phแบงn thรขn vแบซn cรฒn cแบงn %d byte" + +#: remote-curl.c:1123 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:1028 +#: remote-curl.c:1138 msgid "fetch failed." msgstr "lแบฅy vแป gแบทp lแปi." -#: remote-curl.c:1076 +#: remote-curl.c:1184 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:1120 remote-curl.c:1126 +#: remote-curl.c:1228 remote-curl.c:1234 #, 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:1138 remote-curl.c:1252 +#: remote-curl.c:1246 remote-curl.c:1361 #, c-format msgid "http transport does not support %s" msgstr "vแบญn chuyแปn http khรดng hแป trแปฃ %s" -#: remote-curl.c:1174 +#: remote-curl.c:1282 msgid "git-http-push failed" msgstr "git-http-push gแบทp lแปi" -#: remote-curl.c:1360 +#: remote-curl.c:1467 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: usage: git remote-curl <mรกy chแปง> [<url>]" -#: remote-curl.c:1392 +#: remote-curl.c:1499 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:1399 +#: remote-curl.c:1506 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:1439 +#: remote-curl.c:1547 #, 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:61 +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "hiแปn khรดng cรณ thรดng tin vแป trรฌnh biรชn dแปch\n" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "khรดng cรณ thรดng tin vแป libc\n" + +#: list-objects-filter-options.h:91 msgid "args" msgstr "cรกc_tham_sแป" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "lแปc ฤแปi tฦฐแปฃng" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "ngร y hแบฟt hแบกn" -#: parse-options.h:184 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "no-op (tฦฐฦกng thรญch ngฦฐแปฃc)" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "chi tiแบฟt hฦกn nแปฏa" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "im lแบทng hฦกn nแปฏa" -#: 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:317 +msgid "use <n> digits to display object names" +msgstr "sแปญ dแปฅng <n> chแปฏ sแป ฤแป hiแปn thแป tรชn ฤแปi tฦฐแปฃng" -#: parse-options.h:332 +#: parse-options.h:336 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" -#: ref-filter.h:101 +#: 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:96 msgid "key" msgstr "khรณa" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "tรชn trฦฐแปng cแบงn sแบฏp xแบฟp" @@ -21286,11 +23422,11 @@ msgstr "tรชn trฦฐแปng cแบงn sแบฏp xแบฟp" msgid "update the index with reused conflict resolution if possible" msgstr "cแบญp nhแบญt bแบฃng mแปฅc lแปฅc vแปi phรขn giแบฃi xung ฤแปt dรนng lแบกi nแบฟu ฤฦฐแปฃc" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "HEAD ฤฦฐแปฃc tรกch rแปi tแบกi " -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "HEAD ฤฦฐแปฃc tรกch rแปi tแปซ " @@ -21334,680 +23470,697 @@ msgid "List, create, or delete branches" msgstr "Liแปt kรช, tแบกo hay lร xรณa cรกc nhรกnh" #: command-list.h:59 +msgid "Collect information for user to file a bug report" +msgstr "Sฦฐu tแบญp thรดng tin ngฦฐแปi dรนng ฤแป bรกo cรกo lแปi" + +#: command-list.h:60 msgid "Move objects and refs by archive" msgstr "Di chuyแปn cรกc ฤแปi tฦฐแปฃng vร tham chiแบฟu theo kho lฦฐu" -#: command-list.h:60 +#: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "Cung cแบฅp nแปi dung hoแบทc thรดng tin vแป kiแปu vร cแปก cho cรกc ฤแปi tฦฐแปฃng kho" -#: command-list.h:61 +#: command-list.h:62 msgid "Display gitattributes information" msgstr "Hiแปn thแป thรดng tin gitattributes" -#: command-list.h:62 +#: command-list.h:63 msgid "Debug gitignore / exclude files" msgstr "Gแปก lแปi cรกc tแบญp tin gitignore / exclude" -#: command-list.h:63 +#: command-list.h:64 msgid "Show canonical names and email addresses of contacts" msgstr "Hiแปn thแป tรชn vร ฤแปa chแป thฦฐ ฤiแปn tแปญ cแปงa cรกc liรชn hแป dแบกng chuแบฉn hรณa" -#: command-list.h:64 +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "Chuyแปn cรกc nhรกnh hoแบทc phแปฅc hแปi lแบกi cรกc tแบญp tin cรขy lร m viแปc" -#: command-list.h:65 +#: command-list.h:66 msgid "Copy files from the index to the working tree" msgstr "Sao chรฉp cรกc tแบญp tin tแปซ mแปฅc lแปฅc ra cรขy lร m viแปc" -#: command-list.h:66 +#: command-list.h:67 msgid "Ensures that a reference name is well formed" msgstr "ฤแบฃm bแบฃo rแบฑng mแปt tรชn tham chiแบฟu แป dแบกng thแปฉc tแปt" -#: command-list.h:67 +#: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "Tรฌm nhแปฏng lแบงn chuyแปn giao cรฒn chฦฐa ฤฦฐแปฃc รกp dแปฅng lรชn thฦฐแปฃng nguแปn" -#: command-list.h:68 +#: command-list.h:69 msgid "Apply the changes introduced by some existing commits" msgstr "รp dแปฅng cรกc thay ฤแปi ฤฦฐแปฃc ฤฦฐa ra bแปi mแปt sแป lแบงn chuyแปn giao sแบตn cรณ" -#: command-list.h:69 +#: command-list.h:70 msgid "Graphical alternative to git-commit" msgstr "Tฦฐฦกng tรกc ฤแป hแปa vแปi git-commit" -#: command-list.h:70 +#: command-list.h:71 msgid "Remove untracked files from the working tree" msgstr "Gแปก bแป cรกc tแบญp tin khรดng ฤฦฐแปฃc theo dรตi tแปซ cรขy lร m viแปc" -#: command-list.h:71 +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "Nhรขn bแบฃn mแปt kho chแปฉa ฤแบฟn mแปt thฦฐ mแปฅc mแปi" -#: command-list.h:72 +#: command-list.h:73 msgid "Display data in columns" msgstr "Hiแปn thแป dแปฏ liแปu dแบกng cรกc cแปt" -#: command-list.h:73 +#: command-list.h:74 msgid "Record changes to the repository" msgstr "Ghi cรกc thay ฤแปi vร o kho chแปฉa" -#: command-list.h:74 +#: command-list.h:75 msgid "Write and verify Git commit-graph files" msgstr "Ghi vร thแบฉm tra cรกc tแบญp tin ฤแป hแปa cรกc lแบงn chuyแปn giao Git" -#: command-list.h:75 +#: command-list.h:76 msgid "Create a new commit object" msgstr "Tแบกo mแปt ฤแปi tฦฐแปฃng chuyแปn giao" -#: command-list.h:76 +#: command-list.h:77 msgid "Get and set repository or global options" msgstr "Lแบฅy vร ฤแบทt kho hoแบทc cรกc tรนy chแปn toร n cแปฅc" -#: command-list.h:77 +#: command-list.h:78 msgid "Count unpacked number of objects and their disk consumption" msgstr "" "ฤแบฟm sแป lฦฐแปฃng ฤแปi tฦฐแปฃng chฦฐa ฤฦฐแปฃc ฤรณng gรณi vร mแปฉc tiรชu dรนng ฤฤฉa cแปงa chรบng" -#: command-list.h:78 +#: command-list.h:79 msgid "Retrieve and store user credentials" msgstr "Nhแบญn vร lฦฐu chแปฉng nhแบญn cแปงa ngฦฐแปi dรนng" -#: command-list.h:79 +#: command-list.h:80 msgid "Helper to temporarily store passwords in memory" msgstr "Bแป hแป trแปฃ ฤแป lฦฐu mแบญt khแบฉu tแบกm thแปi trong bแป nhแป" -#: command-list.h:80 +#: command-list.h:81 msgid "Helper to store credentials on disk" msgstr "Bแป hแป trแปฃ ฤแป lฦฐu chแปฉng nhแบญn vร o ฤฤฉa" -#: command-list.h:81 +#: command-list.h:82 msgid "Export a single commit to a CVS checkout" msgstr "Xuแบฅt mแปt lแบงn chuyแปn giao thร nh mแปt lแบงn lแบฅy ra CVS" -#: command-list.h:82 +#: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" msgstr "Xem xรฉt giรก trแป dแปฏ liแปu cแปงa bแบกn khแปi ngฦฐแปi khรกc yรชu SCM ฤแป ghรฉt" -#: command-list.h:83 +#: command-list.h:84 msgid "A CVS server emulator for Git" msgstr "Mแปt bแป mรด phแปng mรกy dแปch vแปฅ CVS cho Git" -#: command-list.h:84 +#: command-list.h:85 msgid "A really simple server for Git repositories" msgstr "Mแปt mรกy phแปฅc vแปฅ thแปฑc sแปฑ ฤฦกn giแบฃn dร nh cho kho Git" -#: command-list.h:85 +#: command-list.h:86 msgid "Give an object a human readable name based on an available ref" msgstr "" "ฤฦฐa ra mแปt ฤแปi tฦฐแปฃng dแปฑa trรชn mแปt tรชn แป dแบกng con ngฦฐแปi ฤแปc ฤฦฐแปฃc trรชn mแปt " "tham chiแบฟu sแบตn cรณ" -#: command-list.h:86 +#: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Hiแปn thแป cรกc thay ฤแปi giแปฏa nhแปฏng lแบงn chuyแปn giao, giแปฏa mแปt lแบงn chuyแปn giao " "vร cรขy lร m viแปc, v.v.." -#: command-list.h:87 +#: command-list.h:88 msgid "Compares files in the working tree and the index" msgstr "So sรกnh cรกc tแบญp tin trong cรขy lร m viแปc vร bแบฃng mแปฅc lแปฅc" -#: command-list.h:88 +#: command-list.h:89 msgid "Compare a tree to the working tree or index" msgstr "So sรกnh cรกc cรขy trong cรขy lร m viแปc hoแบทc bแบฃng mแปฅc lแปฅc" -#: command-list.h:89 +#: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" msgstr "" "So sรกnh nแปi dung vร chแบฟ ฤแป cแปงa cรกc blob tรฌm thแบฅy thรดng qua hai ฤแปi tฦฐแปฃng cรขy" -#: command-list.h:90 +#: command-list.h:91 msgid "Show changes using common diff tools" msgstr "Hiแปn thแป cรกc thay ฤแปi sแปญ dแปฅng cรกc cรดng cแปฅ diff chung" -#: command-list.h:91 +#: command-list.h:92 msgid "Git data exporter" msgstr "Bแป xuแบฅt dแปฏ liแปu Git" -#: command-list.h:92 +#: command-list.h:93 msgid "Backend for fast Git data importers" msgstr "แปจng dแปฅng chแบกy phรญa sau cho bแป nhแบญp nhanh dแปฏ liแปu Git" -#: command-list.h:93 +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "Tแบฃi vแป cรกc ฤแปi tฦฐแปฃng vร tham chiแบฟu tแปซ kho chแปฉa khรกc" -#: command-list.h:94 +#: command-list.h:95 msgid "Receive missing objects from another repository" msgstr "Tแบฃi vแป cรกc ฤแปi tฦฐแปฃng cรฒn thiแบฟu tแปซ kho chแปฉa khรกc" -#: command-list.h:95 +#: command-list.h:96 msgid "Rewrite branches" msgstr "Nhแปฏng nhรกnh ghi lแบกi" -#: command-list.h:96 +#: command-list.h:97 msgid "Produce a merge commit message" msgstr "Sแบฃn sinh mแปt ghi chรบ lแบงn chuyแปn giao hรฒa trแปn" -#: command-list.h:97 +#: command-list.h:98 msgid "Output information on each ref" msgstr "Xuแบฅt thรดng tin cho tแปซng tham chiแบฟu" -#: command-list.h:98 +#: command-list.h:99 msgid "Prepare patches for e-mail submission" msgstr "Chuแบฉn bแป cรกc miแบฟng vรก ฤแป gแปญi qua thฦฐ ฤiแปn tแปญ" -#: command-list.h:99 +#: command-list.h:100 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" "Thแบฉm tra lแบกi tรญnh kแบฟt nแปi vร tรญnh hiแปu lแปฑc cแบฃu cรกc ฤแปi tฦฐแปฃng trong cฦก sแป dแปฏ " "liแปu" -#: command-list.h:100 +#: command-list.h:101 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Dแปn dแบนp cรกc tแบญp tin khรดng cแบงn thiแบฟt vร tแปi ฦฐu kho nแปi bแป" -#: command-list.h:101 +#: command-list.h:102 msgid "Extract commit ID from an archive created using git-archive" msgstr "" "Rรบt trรญch mรฃ sแป lแบงn chuyแปn giao tแปซ mแปt kho nรฉn ฤรฃ ฤฦฐแปฃc tแบกo bแปi git-archive" -#: command-list.h:102 +#: command-list.h:103 msgid "Print lines matching a pattern" msgstr "In ra nhแปฏng dรฒng khแปp vแปi mแปt mแบซu" -#: command-list.h:103 +#: command-list.h:104 msgid "A portable graphical interface to Git" msgstr "Mแปt giao diแปn ฤแป hแปa khแบฃ chuyแปn cho Git" -#: command-list.h:104 +#: command-list.h:105 msgid "Compute object ID and optionally creates a blob from a file" msgstr "Tรญnh toรกn ID ฤแปi tฦฐแปฃng vร tรนy chแปn lร tแบกo mแปt blob tแปซ mแปt tแบญp tin" -#: command-list.h:105 +#: command-list.h:106 msgid "Display help information about Git" msgstr "Hiแปn thแป thรดng tin trแปฃ giรบp vแป Git" -#: command-list.h:106 +#: command-list.h:107 msgid "Server side implementation of Git over HTTP" msgstr "Thi hร nh phรญa mรกy chแปง cแปงa Git qua HTTP" -#: command-list.h:107 +#: command-list.h:108 msgid "Download from a remote Git repository via HTTP" msgstr "Tแบฃi vแป tแปซ mแปt kho chแปฉa Git trรชn mแบกng thรดng qua HTTP" -#: command-list.h:108 +#: command-list.h:109 msgid "Push objects over HTTP/DAV to another repository" msgstr "ฤแบฉy cรกc ฤแปi tฦฐแปฃng lรชn thรดng qua HTTP/DAV ฤแบฟn kho chแปฉa khรกc" -#: command-list.h:109 +#: command-list.h:110 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "" "Gแปญi mแปt bแป sฦฐu tแบญp cรกc miแบฟng vรก tแปซ ฤแบงu vร o tiรชu chuแบฉn ฤแบฟn mแปt thฦฐ mแปฅc IMAP" -#: command-list.h:110 +#: command-list.h:111 msgid "Build pack index file for an existing packed archive" msgstr "Xรขy dแปฑng tแบญp tin mแปฅc lแปฅc gรณi cho mแปt kho nรฉn ฤรฃ ฤรณng gรณi sแบตn cรณ" -#: command-list.h:111 +#: command-list.h:112 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Tแบกo mแปt kho git mแปi hay khแปi tแบกo lแบกi mแปt kho ฤรฃ tแปn tแบกi tแปซ trฦฐแปc" -#: command-list.h:112 +#: command-list.h:113 msgid "Instantly browse your working repository in gitweb" msgstr "Duyแปt ngay kho lร m viแปc cแปงa bแบกn trong gitweb" -#: command-list.h:113 +#: command-list.h:114 msgid "Add or parse structured information in commit messages" msgstr "Thรชm hay phรขn tรญch thรดng tin cแบฅu trรบc trong ghi chรบ lแบงn chuyแปn giao" -#: command-list.h:114 +#: command-list.h:115 msgid "The Git repository browser" msgstr "Bแป duyแปn kho Git" -#: command-list.h:115 +#: command-list.h:116 msgid "Show commit logs" msgstr "Hiแปn thแป nhแบญt kรฝ cรกc lแบงn chuyแปn giao" -#: command-list.h:116 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "Hiแปn thแป thรดng tin vแป cรกc tแบญp tin trong bแบฃng mแปฅc lแปฅc vร cรขy lร m viแปc" -#: command-list.h:117 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "Liแปt kรช cรกc tham chiแบฟu trong mแปt kho chแปฉa trรชn mแบกng" -#: command-list.h:118 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "Liแปt kรช nแปi dung cแปงa ฤแปi tฦฐแปฃng cรขy" -#: command-list.h:119 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "Trรญch xuแบฅt miแบฟng vร vร nguแปn tรกc giแบฃ tแปซ mแปt thฦฐ ฤiแปn tแปญ ฤฦกn" -#: command-list.h:120 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "Chฦฐฦกng trรฌnh phรขn tรกch UNIX mbox ฤฦกn giแบฃn" -#: command-list.h:121 +#: command-list.h:122 +msgid "Run tasks to optimize Git repository data" +msgstr "Chแบกy cรกc nhiแปm vแปฅ ฤแป tแปi ฦฐu hรณa dแปฏ liแปu kho Git" + +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "Hแปฃp nhแบฅt hai hay nhiแปu hฦกn lแปch sแปญ cแปงa cรกc nhร phรกt triแปn" -#: command-list.h:122 +#: command-list.h:124 msgid "Find as good common ancestors as possible for a merge" msgstr "Tรฌm cรกc tแป tiรชn chung tแปt cรณ thแป ฤฦฐแปฃc cho hรฒa trแปn" -#: command-list.h:123 +#: command-list.h:125 msgid "Run a three-way file merge" msgstr "Chแบกy mแปt hรฒa trแปn tแบญp tin โ3-ฤฦฐแปngโ" -#: command-list.h:124 +#: command-list.h:126 msgid "Run a merge for files needing merging" msgstr "Chแบกy mแปt hรฒa trแปn cho cรกc tแบญp tin cแบงn hรฒa trแปn" -#: command-list.h:125 +#: command-list.h:127 msgid "The standard helper program to use with git-merge-index" msgstr "Mแปt chฦฐฦกng trรฌnh hแป trแปฃ tiรชu chuแบฉn dรนng vแปi git-merge-index" -#: command-list.h:126 +#: command-list.h:128 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" "Chแบกy cรดng cแปฅ phรขn giแบฃi xung ฤแปt hรฒa trแปn ฤแป mร giแบฃi quyแบฟt cรกc xung ฤแปt hรฒa " "trแปn" -#: command-list.h:127 +#: command-list.h:129 msgid "Show three-way merge without touching index" msgstr "Hiแปn thแป hรฒa trแปn ba-ฤฦฐแปng mร khรดng ฤแปฅng chแบกm ฤแบฟn mแปฅc lแปฅc" -#: command-list.h:128 +#: command-list.h:130 msgid "Write and verify multi-pack-indexes" msgstr "Ghi vร thแบฉm tra cรกc multi-pack-indexes" -#: command-list.h:129 +#: command-list.h:131 msgid "Creates a tag object" msgstr "Tแบกo mแปt ฤแปi tฦฐแปฃng thแบป" -#: command-list.h:130 +#: command-list.h:132 msgid "Build a tree-object from ls-tree formatted text" msgstr "Xรขy dแปฑng mแปt tree-object tแปซ vฤn bแบฃn ฤแปnh dแบกng ls-tree" -#: command-list.h:131 +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "Di chuyแปn hay ฤแปi tรชn mแปt tแบญp tin, thฦฐ mแปฅc hoแบทc liรชn kแบฟt mแปm" -#: command-list.h:132 +#: command-list.h:134 msgid "Find symbolic names for given revs" msgstr "Tรฌm cรกc tรชn liรชn kแบฟt mแปm cho ฤiแปm xรฉt ฤรฃ cho" -#: command-list.h:133 +#: command-list.h:135 msgid "Add or inspect object notes" msgstr "Thรชm hoแบทc ฤiแปu tra ฤแปi tฦฐแปฃng ghi chรบ" -#: command-list.h:134 +#: command-list.h:136 msgid "Import from and submit to Perforce repositories" msgstr "Nhแบญp vร o tแปซ vร gแปญi ฤแบฟn cรกc kho cแบงn thiแบฟt" -#: command-list.h:135 +#: command-list.h:137 msgid "Create a packed archive of objects" msgstr "Tแบกo mแปt kho lฦฐu ฤฦฐแปฃc ฤรณng gรณi cho cรกc ฤแปi" -#: command-list.h:136 +#: command-list.h:138 msgid "Find redundant pack files" msgstr "Tรฌm cรกc tแบญp tin gรณi dฦฐ thแปซa" -#: command-list.h:137 +#: command-list.h:139 msgid "Pack heads and tags for efficient repository access" msgstr "ฤรณng gรณi cรกc phแบงn ฤแบงu vร thแบป ฤแป truy cแบญp kho hiแปu quแบฃ hฦกn" -#: command-list.h:138 +#: command-list.h:140 msgid "Routines to help parsing remote repository access parameters" msgstr "Cรกc thแปง tแปฅc ฤแป giรบp phรขn tรญch cรกc tham sแป truy cแบญp kho chแปฉa trรชn mแบกng" -#: command-list.h:139 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "Tรญnh toรกn ID duy nhแบฅt cho mแปt miแบฟng vรก" -#: command-list.h:140 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "" "Xรฉn bแปt tแบฅt cรกc cรกc ฤแปi tฦฐแปฃng khรดng tiแบฟp cแบญn ฤฦฐแปฃc tแปซ cฦก sแป dแปฏ liแปu ฤแปi tฦฐแปฃng" -#: command-list.h:141 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "Xรณa bแป cรกc ฤแปi tฦฐแปฃng mแป rแปng cรกi mร ฤรฃ sแบตn cรณ trong cรกc tแบญp tin gรณi" -#: command-list.h:142 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Lแบฅy vแป vร hแปฃp nhแบฅt vแปi kho khรกc hay mแปt nhรกnh nแปi bแป" -#: command-list.h:143 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "Cแบญp nhแบญt th.chiแบฟu mรกy chแปง cรนng vแปi cรกc ฤแปi tฦฐแปฃng liรชn quan ฤแบฟn nรณ" -#: command-list.h:144 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "แบคp dแปฅng mแปt bแป miแบฟng vรก quilt vร o trong nhรกnh hiแปn hร nh" -#: command-list.h:145 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "So sรกnh hai vรนng chuyแปn giao (vd: hai phiรชn bแบฃn cแปงa mแปt nhรกnh)" -#: command-list.h:146 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "ฤแปc thรดng tin cรขy vร o trong mแปฅc lแปฅc" -#: command-list.h:147 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "Thu hoแบกch cรกc lแบงn chuyแปn giao trรชn ฤแปnh cแปงa ฤแบงu mรบt cฦก sแป khรกc" -#: command-list.h:148 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "Nhแบญn cรกi mร ฤฦฐแปฃc ฤแบฉy vร o trong kho" -#: command-list.h:149 +#: command-list.h:151 msgid "Manage reflog information" msgstr "Quแบฃn lรฝ thรดng tin reflog" -#: command-list.h:150 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "Quแบฃn lรฝ tแบญp hแปฃp cรกc kho chแปฉa ฤรฃ ฤฦฐแปฃc theo dรตi" -#: command-list.h:151 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "ฤรณng gรณi cรกc ฤแปi tฦฐแปฃng chฦฐa ฤรณng gรณi แป mแปt kho chแปฉa" -#: command-list.h:152 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "Tแบกo, liแปt kรช, xรณa cรกc tham chiแบฟu ฤแป thay thแบฟ cรกc ฤแปi tฦฐแปฃng" -#: command-list.h:153 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "Tแบกo ra mแปt tรณm tแบฏt cรกc thay ฤแปi cรฒn treo" -#: command-list.h:154 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "Dรนng lแบกi cรกc giแบฃi phรกp ฤรฃ ghi lแบกi cแปงa cรกc hรฒa trแปn bแป xung ฤแปt" -#: command-list.h:155 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "ฤแบทt lแบกi HEAD hiแปn hร nh thร nh trแบกng thรกi ฤรฃ cho" -#: command-list.h:156 +#: command-list.h:158 msgid "Restore working tree files" msgstr "Hoร n nguyรชn cรกc tแบญp tin cรขy lร m viแปc" -#: command-list.h:157 +#: command-list.h:159 msgid "Revert some existing commits" msgstr "Hoร n lแบกi mแปt sแป lแบงn chuyแปn giao sแบตn cรณ" -#: command-list.h:158 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "Liแปt kรช cรกc ฤแปi tฦฐแปฃng chuyแปn giao theo thแปฉ tแปฑ tรดpรด ฤแบฃo ngฦฐแปฃc" -#: command-list.h:159 +#: command-list.h:161 msgid "Pick out and massage parameters" msgstr "Cแบญy ra vร xแปญ lรฝ cรกc tham sแป" -#: command-list.h:160 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "Gแปก bแป cรกc tแบญp tin tแปซ cรขy lร m viแปc vร tแปซ bแบฃng mแปฅc lแปฅc" -#: command-list.h:161 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "Gแปญi mแปt tแบญp hแปฃp cแปงa cรกc miแบฟng vรก แป dแบกng thฦฐ ฤiแปn tแปญ" -#: command-list.h:162 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "ฤแบฉy cรกc ฤแปi tฦฐแปฃng lรชn thรดng qua giao thแปฉc Git ฤแบฟn kho chแปฉa khรกc" -#: command-list.h:163 +#: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" msgstr "Hแป vแป ฤฤng nhแบญp cรณ hแบกn chแบฟ cho truy cแบญp SSH chแป-Git" -#: command-list.h:164 +#: command-list.h:166 msgid "Summarize 'git log' output" msgstr "Kแบฟt xuแบฅt โgit logโ dแบกng tรณm tแบฏt" -#: command-list.h:165 +#: command-list.h:167 msgid "Show various types of objects" msgstr "Hiแปn thแป cรกc kiแปu khรกc nhau cแปงa cรกc ฤแปi tฦฐแปฃng" -#: command-list.h:166 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "Hiแปn thแป nhแปฏng nhรกnh vร cรกc lแบงn chuyแปn giao cแปงa chรบng" -#: command-list.h:167 +#: command-list.h:169 msgid "Show packed archive index" msgstr "Hiแปn thแป cรกc muc lแปฅc kho nรฉn ฤรฃ ฤรณng gรณi" -#: command-list.h:168 +#: command-list.h:170 msgid "List references in a local repository" msgstr "Liแปt kรช cรกc tham chiแบฟu trong mแปt kho nแปi bแป" -#: command-list.h:169 +#: command-list.h:171 msgid "Git's i18n setup code for shell scripts" msgstr "Nรฃ cร i ฤแบทt quแปc tแบฟ hรณa cแปงa Git cho vฤn lแปnh hแป vแป" -#: command-list.h:170 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "Mรฃ cร i ฤแบทt vฤn lแปnh hแป vแป Git chung" -#: command-list.h:171 +#: command-list.h:173 +msgid "Initialize and modify the sparse-checkout" +msgstr "Khแปi tแบกo vร sแปญa ฤแปi sparse-checkout" + +#: command-list.h:174 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:172 +#: command-list.h:175 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:173 +#: command-list.h:176 msgid "Show the working tree status" msgstr "Hiแปn thแป trแบกng thรกi cรขy lร m viแปc" -#: command-list.h:174 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "Xรณa bแป cรกc khoแบฃng trแบฏng khรดng cแบงn thiแบฟt" -#: command-list.h:175 +#: command-list.h:178 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:176 +#: command-list.h:179 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:177 +#: command-list.h:180 msgid "Switch branches" msgstr "Cรกc nhรกnh chuyแปn" -#: command-list.h:178 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "ฤแปc, sแปญa vร xรณa tham chiแบฟu mแปm" -#: command-list.h:179 +#: command-list.h:182 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:180 +#: command-list.h:183 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:181 +#: command-list.h:184 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:182 +#: command-list.h:185 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:183 +#: command-list.h:186 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:184 +#: command-list.h:187 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:185 +#: command-list.h:188 msgid "Send archive back to git-archive" -msgstr "Gแปญi trแป lแบกi kho lฦฐu ฤแบฟn git-archive" +msgstr "Gแปญi kho lฦฐu trแป lแบกi cho git-archive" -#: command-list.h:186 +#: command-list.h:189 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" +msgstr "Gแปญi cรกc ฤแปi tฦฐแปฃng ฤรฃ ฤรณng gรณi trแป lแบกi cho git-fetch-pack" -#: command-list.h:187 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "Hiแปn thแป mแปt biแบฟn Git luแบญn lรฝ" -#: command-list.h:188 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "Kiแปm tra kรฝ lแบงn chuyแปn giao dรนng GPG" -#: command-list.h:189 +#: command-list.h:192 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:190 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "Kiแปm tra chแปฏ kรฝ GPG cแปงa cรกc thแบป" -#: command-list.h:191 +#: command-list.h:194 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:192 +#: command-list.h:195 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:193 +#: command-list.h:196 msgid "Manage multiple working trees" msgstr "Quแบฃn lรฝ nhiแปu cรขy lร m viแปc" -#: command-list.h:194 +#: command-list.h:197 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:195 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "ฤแปnh nghฤฉa cรกc thuแปc tรญnh cho mแปi ฤฦฐแปng dแบซn" -#: command-list.h:196 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "Giao diแปn dรฒng lแปnh Git vร quy ฦฐแปc" -#: command-list.h:197 +#: command-list.h:200 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:198 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "Cung cแบฅp tร i khoแบฃn vร mแบญt khแบฉu cho Git" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "Git dร nh cho nhแปฏng ngฦฐแปi dรนng CVS" -#: command-list.h:199 +#: command-list.h:203 msgid "Tweaking diff output" msgstr "Chแปnh kแบฟt xuแบฅt diff" -#: command-list.h:200 +#: command-list.h:204 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:201 +#: command-list.h:205 +msgid "Frequently asked questions about using Git" +msgstr "Cรกc cรขu hแปi thฦฐแปng gแบทp vแป cรกch sแปญ dแปฅng Git" + +#: command-list.h:206 msgid "A Git Glossary" msgstr "Thuแบญt ngแปฏ chuyรชn mรดn Git" -#: command-list.h:202 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "Cรกc mรณc ฤฦฐแปฃc sแปญ dแปฅng bแปi Git" -#: command-list.h:203 +#: command-list.h:208 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:204 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "ฤแปnh nghฤฉa thuแปc tรญnh mรด-ฤun-con" -#: command-list.h:205 +#: command-list.h:210 msgid "Git namespaces" msgstr "Khรดng gian tรชn Git" -#: command-list.h:206 +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "Cรกc chฦฐฦกng trรฌnh hแป trแปฃ ฤแป tฦฐฦกng tรกc vแปi cรกc kho chแปฉa trรชn mรกy chแปง" + +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Bแป cแปฅc kho Git" -#: command-list.h:207 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "Chแป ฤแปnh ฤiแปm xรฉt duyแปt vร vรนng cho Git" -#: command-list.h:208 +#: command-list.h:214 +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:215 msgid "A tutorial introduction to Git: part two" msgstr "Hฦฐแปng dแบซn cรกch dรนng Git: phแบงn hai" -#: command-list.h:209 +#: command-list.h:216 msgid "A tutorial introduction to Git" msgstr "Hฦฐแปng dแบซn cรกch dรนng Git" -#: command-list.h:210 +#: command-list.h:217 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" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "Bแบกn cแบงn khแปi ฤแบงu bแบฑng \"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 "Bแบกn cรณ muแปn tรดi thแปฑc hiแปn ฤiแปu nร y cho bแบกn khรดng [Y/n]? " - -#: git-bisect.sh:101 +#: git-bisect.sh:79 #, sh-format msgid "Bad rev input: $arg" msgstr "ฤแบงu vร o rev sai: $arg" -#: git-bisect.sh:121 +#: git-bisect.sh:99 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "ฤแบงu vร o rev sai: $bisected_head" -#: git-bisect.sh:130 +#: git-bisect.sh:108 #, sh-format msgid "Bad rev input: $rev" msgstr "ฤแบงu vร o rev sai: $rev" -#: git-bisect.sh:139 +#: git-bisect.sh:117 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "โgit bisect $TERM_BADโ cรณ thแป lแบฅy chแป mแปt ฤแปi sแป." -#: git-bisect.sh:209 +#: git-bisect.sh:149 msgid "No logfile given" msgstr "Chฦฐa chแป ra tแบญp tin ghi nhแบญt kรฝ" -#: git-bisect.sh:210 +#: git-bisect.sh:150 #, sh-format msgid "cannot read $file for replaying" msgstr "khรดng thแป ฤแปc $file ฤแป thao diแป n lแบกi" -#: git-bisect.sh:232 +#: git-bisect.sh:173 msgid "?? what are you talking about?" msgstr "?? bแบกn ฤang nรณi gรฌ thแบฟ?" -#: git-bisect.sh:241 +#: git-bisect.sh:183 msgid "bisect run failed: no command provided." msgstr "bisect chแบกy gแบทp lแปi: khรดng ฤฦฐa ra lแปnh." -#: git-bisect.sh:246 +#: git-bisect.sh:188 #, sh-format msgid "running $command" msgstr "ฤang chแบกy lแปnh $command" -#: git-bisect.sh:253 +#: git-bisect.sh:195 #, sh-format msgid "" "bisect run failed:\n" @@ -22016,11 +24169,11 @@ msgstr "" "chแบกy bisect gแบทp lแปi:\n" "mรฃ trแบฃ vแป $res tแปซ lแปnh โ$commandโ lร < 0 hoแบทc >= 128" -#: git-bisect.sh:279 +#: git-bisect.sh:221 msgid "bisect run cannot continue any more" msgstr "bisect khรดng thแป tiแบฟp tแปฅc thรชm ฤฦฐแปฃc nแปฏa" -#: git-bisect.sh:285 +#: git-bisect.sh:227 #, sh-format msgid "" "bisect run failed:\n" @@ -22029,11 +24182,11 @@ msgstr "" "chแบกy bisect gแบทp lแปi:\n" "โbisect_state $stateโ ฤรฃ thoรกt ra vแปi mรฃ lแปi $res" -#: git-bisect.sh:292 +#: git-bisect.sh:234 msgid "bisect run success" msgstr "bisect chแบกy thร nh cรดng" -#: git-bisect.sh:300 +#: git-bisect.sh:242 msgid "We are not bisecting." msgstr "Chรบng tรดi khรดng bisect." @@ -22077,146 +24230,52 @@ 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: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: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: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: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:535 -#, sh-format -msgid "unknown option: $opt" -msgstr "khรดng hiแปu tรนy chแปn: $opt" - -#: 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: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: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: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: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: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: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:631 -msgid "Could not save index tree" -msgstr "Khรดng thแป ghi lแบกi cรขy chแป mแปฅc" - -#: 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: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:703 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "ฤรฃ xรณa ${REV} ($s)" - -#: 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: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:200 +#: git-submodule.sh:180 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:210 +#: git-submodule.sh:190 #, 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:229 +#: git-submodule.sh:209 #, 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:232 +#: git-submodule.sh:212 #, 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:239 +#: git-submodule.sh:219 #, 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: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 +#: git-submodule.sh:250 #, 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:270 +#: git-submodule.sh:252 #, 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:278 +#: git-submodule.sh:260 #, 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:280 +#: git-submodule.sh:262 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22232,40 +24291,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:286 +#: git-submodule.sh:268 #, 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:298 +#: git-submodule.sh:280 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Khรดng thแป lแบฅy ra mรด-ฤun-con โ$sm_pathโ" -#: git-submodule.sh:303 +#: git-submodule.sh:285 #, 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:312 +#: git-submodule.sh:294 #, 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:573 +#: git-submodule.sh:567 #, 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:583 +#: git-submodule.sh:577 #, 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:588 +#: git-submodule.sh:582 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -22274,7 +24333,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:606 +#: git-submodule.sh:600 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -22283,7 +24342,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:612 +#: git-submodule.sh:606 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -22292,80 +24351,54 @@ 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:619 +#: git-submodule.sh:613 #, 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:620 +#: git-submodule.sh:614 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "ฤฦฐแปng dแบซn mรด-ฤun-con โ$displaypathโ: ฤรฃ checkout โ$sha1โ" -#: git-submodule.sh:624 +#: git-submodule.sh:618 #, 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:625 +#: git-submodule.sh:619 #, 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:630 +#: git-submodule.sh:624 #, 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:631 +#: git-submodule.sh:625 #, 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:636 +#: git-submodule.sh:630 #, 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:637 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "ฤฦฐแปng dแบซn mรด-ฤun-con โ$displaypathโ: โ$command $sha1โ" -#: git-submodule.sh:668 +#: git-submodule.sh:662 #, 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: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:882 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "chแบฟ ฤแป khรดng nhฦฐ mong chแป $mod_dst" - -#: 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: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:908 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" -" Cแบฃnh bรกo: $display_name khรดng chแปฉa nhแปฏng lแบงn chuyแปn giao $sha1_src vร " -"$sha1_dst" - #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." @@ -22380,12 +24413,23 @@ msgstr "ฤรฃ รกp dแปฅng autostash." msgid "Cannot store $stash_sha1" msgstr "Khรดng thแป lฦฐu $stash_sha1" +#: git-rebase--preserve-merges.sh:113 +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 "" +"รp dแปฅng autostash cรณ hiแปu quแบฃ trong cรกc xung ฤแปt.\n" +"Cรกc thay ฤแปi cแปงa bแบกn an toร n trong stash (tแบกm cแบฅt ฤi).\n" +"Bแบกn cรณ thแป chแบกy lแปnh \"git stash pop\" hay \"git stash drop\" bแบฅt kแปณ lรบc " +"nร o.\n" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "ฤang rebase ($new_count/$total)" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -22428,7 +24472,7 @@ 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" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -22447,82 +24491,82 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: khรดng phแบฃi lร lแบงn chuyแปn giao mร cรณ thแป lแบฅy ra ฤฦฐแปฃc" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Tรชn lแบงn chuyแปn giao khรดng hแปฃp lแป: $sha1" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "Khรดng thแป ghi lแบกi sha1 thay thแบฟ cแปงa lแบงn chuyแปn giao" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "Chuyแปn-tiแบฟp-nhanh ฤแบฟn $sha1" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Khรดng thแป chuyแปn-tiแบฟp-nhanh ฤแบฟn $sha1" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Khรดng thแป di chuyแปn HEAD ฤแบฟn $first_parent" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Tแปซ chแปi squash lแบงn hรฒa trแปn: $sha1" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "Gแบทp lแปi khi hoร n lแบกi bฦฐแปc hรฒa trแปn $sha1" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "Khรดng thแป lแบฅy ra $sha1" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "ฤรขy lร chรบ thรญch cho lแบงn chuyแปn giao thแปฉ #${n}:" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Chรบ thรญch cho lแบงn chuyแปn giao thแปฉ #${n} sแบฝ bแป bแป qua:" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "ฤรขy lร tแป hแปฃp cแปงa $count lแบงn chuyแปn giao." -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Khรดng thแป $fixup_msg" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "ฤรขy lร tแป hแปฃp cแปงa 2 lแบงn chuyแปn giao." -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Khรดng thแป รกp dแปฅng $sha1โฆ $rest" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -22538,31 +24582,31 @@ msgstr "" "nร y\n" "trฦฐแปc khi bแบกn cรณ thแป lร m viแปc lแบกi vแปi lแบงn chuyแปn giao." -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Bแป dแปซng tแบกi $sha1_abbrevโฆ $rest" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Khรดng โ$squash_styleโ thแป mร khรดng cรณ lแบงn chuyแปn giao kแบฟ trฦฐแปc" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" -msgstr "Thแปฑc thi: $rest" +msgstr "ฤang thแปฑc thi: $rest" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "Thแปฑc thi gแบทp lแปi: $rest" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "vร tแบกo cรกc thay ฤแปi bแบฃng mแปฅc lแปฅc vร /hay cรขy lร m viแปc" -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -22573,7 +24617,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -22588,25 +24632,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Lแปnh chฦฐa biแบฟt: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 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โ." -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Cร i tแป vร cแบญp nhแบญt $head_name mแปt cรกch thร nh cรดng." -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Khรดng thแป xรณa bแป CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -22637,11 +24681,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "Lแปi khi cแป tรฌm ฤแปnh danh cแปงa tรกc giแบฃ ฤแป tu bแป lแบงn chuyแปn giao" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -22650,39 +24694,43 @@ msgstr "" "Vui lรฒng chuyแปn giao chรบng vร sau ฤรณ chแบกy lแปnh โgit rebase --continueโ lแบงn " "nแปฏa." -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "Khรดng thแป chuyแปn giao cรกc thay ฤแปi ฤรฃ ฤฦฐa lรชn bแป phรณng." -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "Khรดng thแป thแปฑc thi trรฌnh biรชn soแบกn" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" -msgstr "Khรดng thแป checkout $switch_to" +msgstr "Khรดng thแป lแบฅy ra $switch_to" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "Khรดng HEAD?" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Khรดng thแป tแบกo thฦฐ mแปฅc tแบกm thแปi $state_dir" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "Khรดng thแป ฤรกnh dแบฅu lร tฦฐฦกng tรกc" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format 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:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:945 +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:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "Khรดng thแป khแปi tแบกo cรกc lแบงn chuyแปn giao ghi lแบกi" @@ -22753,77 +24801,18 @@ 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:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: 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 +#: git-add--interactive.perl:634 #, 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: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 +#: git-add--interactive.perl:1058 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -22831,7 +24820,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:1054 +#: git-add--interactive.perl:1061 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -22839,7 +24828,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:1057 +#: git-add--interactive.perl:1064 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -22847,8 +24836,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:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -22856,8 +24845,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:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -22865,16 +24854,12 @@ 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:1109 +#: git-add--interactive.perl:1116 #, 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: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 +#: git-add--interactive.perl:1123 #, perl-format msgid "" "---\n" @@ -22887,36 +24872,12 @@ 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" -#. 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 +#: git-add--interactive.perl:1145 #, 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" -#. 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 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -22931,7 +24892,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:1252 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -22945,7 +24906,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:1258 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -22961,7 +24922,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:1264 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -22975,7 +24936,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:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -22989,7 +24950,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:1276 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23003,7 +24964,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:1282 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23017,7 +24978,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:1294 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23031,7 +24992,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:1309 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23053,224 +25014,88 @@ msgstr "" "e - sแปญa bแบฑng tay khรบc hiแปn hร nh\n" "? - in trแปฃ giรบp\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1347 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: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 +#: git-add--interactive.perl:1362 #, 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: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 +#: git-add--interactive.perl:1481 #, 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:1467 +#: git-add--interactive.perl:1482 #, 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:1468 +#: git-add--interactive.perl:1483 +#, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "รp dแปฅng viแปc thรชm cho cรขy lร m viแปc [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1484 #, 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:1568 +#: git-add--interactive.perl:1601 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: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 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Sแป khรดng hแปฃp lแป: โ%sโ\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1624 #, 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:1617 +#: git-add--interactive.perl:1659 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:1621 -msgid "search for regex? " -msgstr "tรฌm kiแบฟm cho biแปu thแปฉc chรญnh quy? " - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1676 #, 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:1644 +#: git-add--interactive.perl:1686 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:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "Khรดng cรณ khรบc kแบฟ trฦฐแปc\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "Khรดng cรณ khรบc kแบฟ tiแบฟp\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1732 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:1696 +#: git-add--interactive.perl:1738 #, 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:1706 +#: git-add--interactive.perl:1748 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:1771 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23290,19 +25115,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: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 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 msgid "missing --" msgstr "thiแบฟu --" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1861 #, perl-format msgid "unknown --patch mode: %s" msgstr "khรดng hiแปu chแบฟ ฤแป --patch: %s" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 #, perl-format msgid "invalid argument %s, expecting --" msgstr "ฤแปi sแป khรดng hแปฃp lแป %s, cแบงn --" @@ -23319,26 +25144,36 @@ msgstr "khoแบฃng bรน thแปi gian nแปi bแป lแปn hฦกn hoแบทc bแบฑng 24 giแป\n" msgid "the editor exited uncleanly, aborting everything" msgstr "trรฌnh soแบกn thแบฃo thoรกt khรดng sแบกch sแบฝ, bรฃi bแป mแปi thแปฉ" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "โ%sโ cรณ chฦฐa mแปt phiรชn bแบฃn trung gian cแปงa thฦฐ bแบกn ฤรฃ soแบกn.\n" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "โ%s.finalโ chแปฉa thฦฐ ฤiแปn tแปญ ฤรฃ soแบกn thแบฃo.\n" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases xung khแบฏc vแปi cรกc tรนy chแปn khรกc\n" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"lแปi nghiรชm trแปng: tรฌm thแบฅy cรกc tรนy chแปn cแบฅu hรฌnh cho 'sendmail'\n" +"git-send-email ฤฦฐแปฃc cแบฅu hรฌnh vแปi cรกc tรนy chแปn sendemail.* - chรบ รฝ 'e'.\n" +"ฤแบทt sendemail.forbidSendmailVariables thร nh false ฤแป tแบฏt kiแปm tra nร y.\n" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Khรดng thแป chแบกy git format-patch แป ngoร i mแปt kho chแปฉa\n" -#: git-send-email.perl:484 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -23346,37 +25181,37 @@ msgstr "" "โbatch-sizeโ vร โreloginโ phแบฃi ฤฦฐแปฃc chแป ฤแปnh cรนng vแปi nhau (thรดng qua dรฒng " "lแปnh hoแบทc tรนy chแปn cแบฅu hรฌnh)\n" -#: git-send-email.perl:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Khรดng hiแปu trฦฐแปng --suppress-cc: โ%sโ\n" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Khรดng hiแปu cร i ฤแบทt --confirm: โ%sโ\n" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "cแบฃnh bรกo: bรญ danh sendmail vแปi dแบฅu trรญch dแบซn khรดng ฤฦฐแปฃc hแป trแปฃ: %s\n" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "cแบฃnh bรกo: โ:include:โ khรดng ฤฦฐแปฃc hแป trแปฃ: %s\n" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "cแบฃnh bรกo: chuyแปn hฦฐแปng โ/fileโ hay โ|pipeโ khรดng ฤฦฐแปฃc hแป trแปฃ: %s\n" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "cแบฃnh bรกo: dรฒng sendmail khรดng nhแบญn ra ฤฦฐแปฃc: %s\n" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -23391,12 +25226,12 @@ msgstr "" " * Nรณi \"./%s\" nแบฟu รฝ bแบกn lร mแปt tแบญp tin; hoแบทc\n" " * ฤฦฐa ra tรนy chแปn --format-patch nแบฟu รฝ bแบกn lร chuแบฉn bแป.\n" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Gแบทp lแปi khi mแป thฦฐ mแปฅc โ%sโ: %s" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -23405,7 +25240,7 @@ msgstr "" "nghiรชm trแปng: %s: %s\n" "cแบฃnh bรกo: khรดng cรณ miแบฟng vรก nร o ฤฦฐแปฃc gแปญi ฤi\n" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -23415,17 +25250,17 @@ msgstr "" "Chฦฐa chแป ฤแปnh cรกc tแบญp tin miแบฟng vรก!\n" "\n" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "Khรดng cรณ dรฒng chแปง ฤแป trong %s?" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Gแบทp lแปi khi mแป โ%sโ ฤแป ghi: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -23439,27 +25274,27 @@ msgstr "" "\n" "Xรณa nแปi dung phแบงn thรขn nแบฟu bแบกn khรดng muแปn gแปญi tรณm tแบฏt.\n" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "Gแบทp lแปi khi mแป โ%sโ: %s" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Gแบทp lแปi khi mแป %s.final: %s" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "Thฦฐ tแปng thแป lร trแปng rแปng, nรชn bแป qua nรณ\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Bแบกn cรณ chแบฏc muแปn dรนng <%s> [y/N]? " -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -23467,11 +25302,11 @@ msgstr "" "Cรกc trฦฐแปng sau ฤรขy lร 8bit, nhฦฐng khรดng khai bรกo mแปt Content-Transfer-" "Encoding.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Bแบฃng mรฃ 8bit nร o tรดi nรชn khai bรกo [UTF-8]? " -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -23484,20 +25319,20 @@ msgstr "" "cรณ chแปง ฤแป แป dแบกng mแบซu โ*** SUBJECT HERE ***โ. Dรนng --force nแบฟu bแบกn thแปฑc sแปฑ " "muแปn gแปญi.\n" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "Tแปi ngฦฐแปi mร thฦฐ ฤฦฐแปฃc gแปญi (nแบฟu cรณ)?" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "nghiรชm trแปng: bรญ danh โ%sโ ฤฦฐแปฃc khai triแปn thร nh chรญnh nรณ\n" -#: git-send-email.perl:975 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "Message-ID ฤฦฐแปฃc dรนng nhฦฐ lร In-Reply-To cho thฦฐ ฤแบงu tiรชn (nแบฟu cรณ)? " -#: git-send-email.perl:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "lแปi: khรดng thแป rรบt trรญch mแปt ฤแปa chแป hแปฃp lแป tแปซ: %s\n" @@ -23505,16 +25340,16 @@ msgstr "lแปi: khรดng thแป rรบt trรญch mแปt ฤแปa chแป hแปฃp lแป tแปซ: %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 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Lร m gรฌ vแปi ฤแปa chแป nร y? (thoรกt[q]|xรณa[d]|sแปญa[e]): " -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "ฤฦฐแปng dแบซn CA โ%sโ khรดng tแปn tแบกi" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -23541,134 +25376,534 @@ msgstr "" #. 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 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Gแปญi thฦฐ nร y chแปฉ? ([y]cรณ|[n]khรดng|[e]sแปญa|[q]thoรกt|[a]tแบฅt): " -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "Gแปญi thฦฐ nร y trแบฃ lแปi yรชu cแบงu" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "Mรกy phแปฅc vแปฅ SMTP chฦฐa ฤฦฐแปฃc ฤแปnh nghฤฉa mแปt cรกch thรญch hแปฃp." -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Mรกy chแปง khรดng hแป trแปฃ STARTTLS! %s" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS gแบทp lแปi! %s" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Khรดng thแป khแปi tแบกo SMTP mแปt cรกch ฤรบng ฤแบฏn. Kiแปm tra cแบฅu hรฌnh vร dรนng --smtp-" "debug." -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "Gแบทp lแปi khi gแปญi %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "Thแปญ gแปญi %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "Gแปญi %s\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "Dry-OK. Nhแบญt kรฝ nรณi rแบฑng:\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "OK. Nhแบญt kรฝ nรณi rแบฑng:\n" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "Kแบฟt quแบฃ: " -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "Kแบฟt quแบฃ: Tแปt\n" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "khรดng thแป mแป tแบญp tin โ%sโ" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Thรชm cc: %s tแปซ dรฒng โ%sโ\n" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) ฤang thรชm to: %s tแปซ dรฒng โ%sโ\n" -#: git-send-email.perl:1718 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Thรชm cc: %s tแปซ dรฒng โ%sโ\n" -#: git-send-email.perl:1753 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Thรชm cc: %s tแปซ dรฒng โ%sโ\n" -#: git-send-email.perl:1864 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Khรดng thแป thแปฑc thi โ%sโ" -#: git-send-email.perl:1871 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) ฤang thรชm %s: %s tแปซ: โ%sโ\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) gแบทp lแปi khi ฤรณng ฤฦฐแปng แปng ฤแบฟn โ%sโ" -#: git-send-email.perl:1905 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "khรดng thแป lแบฅy gแปญi thฦฐ dแบกng 7 bรญt" -#: git-send-email.perl:1913 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "bแบฃng mรฃ truyแปn khรดng hแปฃp lแป" -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "khรดng thแป mแป %s: %s\n" -#: git-send-email.perl:1957 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: miแบฟng vรก cรณ chแปฉa dรฒng dร i hฦกn 998 kรฝ tแปฑ" -#: git-send-email.perl:1974 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Bแป qua %s vแปi hแบญu tแป sao lฦฐu dแปฑ phรฒng โ%sโ.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1978 +#: git-send-email.perl:1990 #, perl-format 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): " +#~ msgid "unknown hash algorithm length" +#~ msgstr "khรดng hiแปu chiแปu dร i thuแบญt toรกn bฤm dแปฏ liแปu" + +#~ 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" + +#~ msgid "Writing changed paths Bloom filters index" +#~ msgstr "Ghi dแปฏ liแปu cรกc mแปฅc lแปฅc Bloom ฤฦฐแปng dแบซn ฤรฃ bแป thay ฤแปi" + +#, c-format +#~ msgid "hash version %u does not match" +#~ msgstr "phiรชn bแบฃn bฤm โ%uโ khรดng khแปp" + +#~ msgid "Remote with no URL" +#~ msgstr "Mรกy chแปง khรดng cรณ ฤแปa chแป URL" + +#, c-format +#~ msgid "%%(subject) does not take arguments" +#~ msgstr "%%(subject) khรดng nhแบญn cรกc ฤแปi sแป" + +#, c-format +#~ msgid "positive value expected objectname:short=%s" +#~ msgstr "cแบงn nแปi dung mang giรก trแป dฦฐฦกng:shot=%s" + +#, c-format +#~ msgid "unrecognized %%(objectname) argument: %s" +#~ msgstr "ฤแปi sแป khรดng ฤฦฐแปฃc thแปซa nhแบญn %%(objectname): %s" + +#, 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" + +#, 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" + +#, c-format +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "khรดng thแป mแป โ%sโ ฤแป ghi: %s" + +#, c-format +#~ msgid "could not read ref '%s'" +#~ msgstr "khรดng thแป ฤแปc tham chiแบฟu โ%sโ" + +#, c-format +#~ msgid "ref '%s' already exists" +#~ msgstr "tham chiแบฟu โ%sโ ฤรฃ cรณ tแปซ trฦฐแปc rแปi" + +#, c-format +#~ msgid "unexpected object ID when writing '%s'" +#~ msgstr "khรดng cแบงn ID ฤแปi tฦฐแปฃng khi ghi โ%sโ" + +#, c-format +#~ msgid "unexpected object ID when deleting '%s'" +#~ msgstr "gแบทp ID ฤแปi tฦฐแปฃng khรดng cแบงn khi xรณa โ%sโ" + +#, c-format +#~ msgid "The hash algorithm %s is not supported in this build." +#~ msgstr "Thuแบญt toรกn bฤm %s khรดng ฤฦฐแปฃc hแป trแปฃ trong bแบฃn biรชn dแปch nร y." + +#~ msgid "could not open the file BISECT_TERMS" +#~ msgstr "khรดng thแป mแป tแบญp tin BISECT_TERMS" + +#~ 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" + +#~ msgid "print only names (no SHA-1)" +#~ msgstr "chแป hiแปn thแป tรชn (khรดng SHA-1)" + +#~ msgid "passed to 'git am'" +#~ msgstr "chuyแปn cho โgit amโ" + +#~ 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" + +#, 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" + +#, 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" + +#, sh-format +#~ msgid "" +#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +#~ msgstr "" +#~ " Cแบฃnh bรกo: $display_name khรดng chแปฉa nhแปฏng lแบงn chuyแปn giao $sha1_src vร " +#~ "$sha1_dst" + +#, 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" + +#, 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" + +#, 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แป" + +#, 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)" + +#, 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แป" + +#, c-format +#~ msgid "unable to re-add worktree '%s'" +#~ msgstr "khรดng thแป thรชm-lแบกi cรขy โ%sโ" + +#, c-format +#~ msgid "target '%s' already exists" +#~ msgstr "ฤรญch โ%sโ ฤรฃ tแปn tแบกi rแปi" + +#, c-format +#~ msgid "" +#~ "Cannot update sparse checkout: the following entries are not up to date:\n" +#~ "%s" +#~ 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" + +#, c-format +#~ msgid "" +#~ "The following working tree files would be overwritten by sparse checkout " +#~ "update:\n" +#~ "%s" +#~ msgstr "" +#~ "Cรกc tแบญp tin cรขy lร m viแปc chฦฐa ฤฦฐแปฃc theo dรตi sau ฤรขy sแบฝ bแป ghi ฤรจ bแปi cแบญp " +#~ "nhแบญt checkout rแบฃi rรกc:\n" +#~ "%s" + +#, c-format +#~ msgid "" +#~ "The following working tree files would be removed by sparse checkout " +#~ "update:\n" +#~ "%s" +#~ msgstr "" +#~ "Cรกc tแบญp tin cรขy lร m viแปc chฦฐa ฤฦฐแปฃc theo dรตi sau ฤรขy sแบฝ bแป xรณa bแป bแปi cแบญp " +#~ "nhแบญt checkout rแบฃi rรกc:\n" +#~ "%s" + +#, c-format +#~ msgid "annotated tag %s has no embedded name" +#~ msgstr "thแบป ฤฦฐแปฃc chรบ giแบฃi %s khรดng cรณ tรชn nhรบng" + +#~ msgid "automatically stash/stash pop before and after rebase" +#~ msgstr "tแปฑ ฤแปng stash/stash pop tฦฐแปc vร sau tu bแป (rebase)" + +#~ 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." + +#~ msgid "(DEPRECATED) keep empty commits" +#~ msgstr "(Cลจ) giแปฏ lแบกi cรกc lแบงn chuyแปn giao rแปng" + +#, c-format +#~ msgid "Could not read '%s'" +#~ msgstr "Khรดng thแป ฤแปc โ%sโ" + +#, c-format +#~ msgid "Cannot store %s" +#~ msgstr "Khรดng thแป lฦฐu โ%sโ" + +#~ msgid "initialize sparse-checkout" +#~ msgstr "khแปi tแบกo sparse-checkout" + +#~ msgid "set sparse-checkout patterns" +#~ msgstr "ฤแบทt cรกc mแบซu sparse-checkout" + +#~ msgid "disable sparse-checkout" +#~ msgstr "tแบฏt sparse-checkout" + +#, c-format +#~ msgid "could not exec %s" +#~ msgstr "khรดng thแป thแปฑc thi %s" + +#~ 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)" + +#, sh-format +#~ msgid "Cannot update $ref_stash with $w_commit" +#~ msgstr "Khรดng thแป cแบญp nhแบญt $ref_stash vแปi $w_commit" + +#, 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" + +#, 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" + +#, sh-format +#~ msgid "unknown option: $opt" +#~ msgstr "khรดng hiแปu tรนy chแปn: $opt" + +#, sh-format +#~ msgid "Too many revisions specified: $REV" +#~ msgstr "Chแป ra quรก nhiแปu ฤiแปm xรฉt duyแปt: $REV" + +#, sh-format +#~ msgid "$reference is not a valid reference" +#~ msgstr "$reference khรดng phแบฃi lร tham chiแบฟu hแปฃp lแป" + +#, 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)" + +#, sh-format +#~ msgid "'$args' is not a stash reference" +#~ msgstr "โ$argsโ khรดng phแบฃi tham chiแบฟu ฤแบฟn stash" + +#~ msgid "unable to refresh index" +#~ msgstr "khรดng thแป lร m tฦฐฦกi mแปi bแบฃng mแปฅc lแปฅc" + +#~ 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" + +#~ 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." + +#~ msgid "Could not save index tree" +#~ msgstr "Khรดng thแป ghi lแบกi cรขy chแป mแปฅc" + +#~ 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)" + +#~ 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" + +#, sh-format +#~ msgid "Dropped ${REV} ($s)" +#~ msgstr "ฤรฃ xรณa ${REV} ($s)" + +#, sh-format +#~ msgid "${REV}: Could not drop stash entry" +#~ msgstr "${REV}: Khรดng thแป xรณa bแป mแปฅc stash" + +#~ msgid "(To restore them type \"git stash apply\")" +#~ msgstr "(ฤแป phแปฅc hแปi lแบกi chรบng hรฃy gรต \"git stash apply\")" + +#, 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 "dรฒng ฤแปnh danh khรดng hแปฃp lแป" + +#, 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 "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." @@ -23739,9 +25974,6 @@ 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" @@ -23763,9 +25995,6 @@ msgstr "Bแบกn cรณ thแปฑc sแปฑ muแปn gแปญi %s? [y|N](cรณ/KHรNG): " #~ msgid "unrecognized verb: %s" #~ msgstr "verb khรดng ฤฦฐแปฃc thแปซa nhแบญn: %s" -#~ msgid "hash version %X does not match version %X" -#~ msgstr "phiรชn bแบฃn bฤm โ%Xโ khรดng cรณ phiรชn bแบฃn khแปp %X" - #~ msgid "option '%s' requires a value" #~ msgstr "tรนy chแปn โ%sโ yรชu cแบงu mแปt giรก trแป" @@ -23932,9 +26161,6 @@ msgstr "Bแบกn cรณ thแปฑc sแปฑ muแปn gแปญi %s? [y|N](cรณ/KHรNG): " #~ msgid "make rebase script" #~ msgstr "tแบกo vฤn lแปnh rebase" -#~ msgid "No such remote: %s" -#~ msgstr "Khรดng cรณ mรกy chแปง nร o nhฦฐ thแบฟ: %s" - #~ msgid "cannot move a locked working tree" #~ msgstr "khรดng thแป di chuyแปn mแปt cรขy-lร m-viแปc bแป khรณa" @@ -24117,10 +26343,6 @@ msgstr "Bแบกn cรณ thแปฑc sแปฑ muแปn gแปญi %s? [y|N](cรณ/KHรNG): " #~ msgid "Or you can abort the rebase with 'git rebase --abort'." #~ msgstr "Hoแบทc lร bแบกn cรณ thแป bรฃi bแป lแบงn cแบฃi tแป vแปi lแปnh โgit rebase --abortโ." -#~ msgid "%" -#~ msgid_plural "%" -#~ msgstr[0] "%" - #~ msgid "%s, %" #~ msgid_plural "%s, %" #~ msgstr[0] "%s, %" @@ -24268,18 +26490,12 @@ 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" #~ msgid "Could not format %s." #~ msgstr "Khรดng thแป ฤแปnh dแบกng โ%sโ." -#~ msgid "%s: %s" -#~ msgstr "%s: %s" - #~ msgid "You need to set your committer info first" #~ msgstr "Bแบกn cแบงn ฤแบทt thรดng tin vแป ngฦฐแปi chuyแปn giao mรฃ nguแปn trฦฐแปc ฤรฃ" @@ -24590,9 +26806,6 @@ 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แปญ" @@ -24617,9 +26830,6 @@ msgstr "Bแบกn cรณ thแปฑc sแปฑ muแปn gแปญi %s? [y|N](cรณ/KHรNG): " #~ msgid "insanely long template path %s" #~ msgstr "ฤฦฐแปng dแบซn mแบซu โ%sโ dร i mแปt cรกch ฤiรชn rแป" -#~ msgid "unsupported sort specification '%s'" -#~ msgstr "khรดng hแป trแปฃ ฤแบทc tแบฃ sแบฏp xแบฟp โ%sโ" - #~ msgid "unsupported sort specification '%s' in variable '%s'" #~ msgstr "khรดng hแป trแปฃ ฤแบทc tแบฃ sแบฏp xแบฟp โ%sโ trong biแบฟn โ%sโ" @@ -24645,9 +26855,6 @@ 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 c6bdb3e300..068d71bf2e 100644 --- a/third_party/git/po/zh_CN.po +++ b/third_party/git/po/zh_CN.po @@ -28,8 +28,9 @@ # bare repository | ็บฏไปๅบ # bisect | ไบๅๆฅๆพ # blob object | ๆฐๆฎๅฏน่ฑก +# bloom filter | ๅธ้่ฟๆปคๅจ # branch | ๅๆฏ -# bundle | ๅ +# bundle | ๅฝๆกฃๅ # bypass | ็ป่ฟ # cache | ็ดขๅผ๏ผ็ๅซ็งฐ๏ผ # chain | ๏ผๆไบค๏ผ้พ @@ -139,8 +140,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-08-10 20:12+0800\n" -"PO-Revision-Date: 2019-08-13 21:16+0800\n" +"POT-Creation-Date: 2020-10-10 09:32+0800\n" +"PO-Revision-Date: 2020-10-10 09:43+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,37 +150,749 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:109 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "ๅฏ๏ผ%s๏ผ๏ผ" + +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +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 reset.c:89 sequencer.c:3444 +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:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, 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:1738 git-add--interactive.perl:1371 +#, c-format +msgid "Only binary files changed.\n" +msgstr "ๅชๆไบ่ฟๅถๆไปถ่ขซไฟฎๆนใ\n" + +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "ๆฒกๆไฟฎๆนใ\n" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "่กฅไธๆดๆฐ" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +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:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "*** ๅฝไปค ***" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +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:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: 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:781 git-add--interactive.perl:1805 +#, c-format +msgid "Bye.\n" +msgstr "ๅ่งใ\n" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "ๆๅญๆจกๅผๅๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:35 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "ๆๅญๅ ้คๅจไฝ [y,n,q,a,d%s,?]? " + +#: add-patch.c:36 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "ๆๅญๆทปๅ ๅจไฝ [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "ๆๅญ่ฏฅๅ [y,n,q,a,d%s,?]? " + +#: add-patch.c:39 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "ๅฆๆ่กฅไธ่ฝๆญฃ็กฎๅฐๅบ็จ๏ผ็ผ่พๅๅฐ็ซๅณๆ ่ฎฐไธบๆๅญใ" + +#: add-patch.c:42 +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:56 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "่ดฎ่ๆจกๅผๅๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:57 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "่ดฎ่ๅ ้คๅจไฝ [y,n,q,a,d%s,?]? " + +#: add-patch.c:58 git-add--interactive.perl:1441 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "่ดฎ่ๆทปๅ ๅจไฝ [y,n,q,a,d%s,?]? " + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "่ดฎ่่ฏฅๅ [y,n,q,a,d%s,?]? " + +#: add-patch.c:61 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "ๅฆๆ่กฅไธ่ฝๆญฃ็กฎๅฐๅบ็จ๏ผ็ผ่พๅๅฐ็ซๅณๆ ่ฎฐไธบ่ดฎ่ใ" + +#: add-patch.c:64 +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:80 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "ๅๆถๆๅญๆจกๅผๅๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:81 git-add--interactive.perl:1446 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "ๅๆถๆๅญๅ ้คๅจไฝ [y,n,q,a,d%s,?]? " + +#: add-patch.c:82 git-add--interactive.perl:1447 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "ๅๆถๆๅญๆทปๅ ๅจไฝ [y,n,q,a,d%s,?]? " + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "ๅๆถๆๅญ่ฏฅๅ [y,n,q,a,d%s,?]? " + +#: add-patch.c:85 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "ๅฆๆ่กฅไธ่ฝๆญฃ็กฎๅฐๅบ็จ๏ผ็ผ่พๅๅฐ็ซๅณๆ ่ฎฐไธบๆชๆๅญใ" + +#: add-patch.c:88 +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:103 git-add--interactive.perl:1451 +#, 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:104 git-add--interactive.perl:1452 +#, 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:105 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "ๅฐๆทปๅ ๆไฝๅบ็จๅฐ็ดขๅผ [y,n,q,a,d%s,?]? " + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, 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:108 add-patch.c:176 add-patch.c:221 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "ๅฆๆ่กฅไธ่ฝๆญฃ็กฎๅฐๅบ็จ๏ผ็ผ่พๅๅฐ็ซๅณๆ ่ฎฐไธบๅบ็จใ" + +#: add-patch.c:111 +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:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, 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:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, 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:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "ไปๅทฅไฝๅบไธญไธขๅผๆทปๅ ๅจไฝ [y,n,q,a,d%s,?]? " + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, 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:131 add-patch.c:154 add-patch.c:199 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "ๅฆๆ่กฅไธ่ฝๆญฃ็กฎๅฐๅบ็จ๏ผ็ผ่พๅๅฐ็ซๅณๆ ่ฎฐไธบไธขๅผใ" + +#: add-patch.c:134 add-patch.c:202 +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:149 add-patch.c:194 git-add--interactive.perl:1463 +#, 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:150 add-patch.c:195 git-add--interactive.perl:1464 +#, 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:151 add-patch.c:196 git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "ไป็ดขๅผๅๅทฅไฝๅบไธญไธขๅผๆทปๅ ๅจไฝ [y,n,q,a,d%s,?]? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, 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:157 +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:171 add-patch.c:216 git-add--interactive.perl:1469 +#, 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:172 add-patch.c:217 git-add--interactive.perl:1470 +#, 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:173 add-patch.c:218 git-add--interactive.perl:1471 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "ๅฐๆทปๅ ๆไฝๅบ็จๅฐ็ดขๅผๅๅทฅไฝๅบ [y,n,q,a,d%s,?]? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, 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:179 +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:224 +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:342 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "ๆ ๆณ่งฃๆๆฐๆฎๅๅคดไฟกๆฏ '%.*s'" + +#: add-patch.c:361 add-patch.c:365 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "ๆ ๆณ่งฃๆๅฝฉ่ฒๆฐๆฎๅๅคดไฟกๆฏ '%.*s'" + +#: add-patch.c:419 +msgid "could not parse diff" +msgstr "ไธ่ฝ่งฃๆๅทฎๅผไฟกๆฏ" + +#: add-patch.c:438 +msgid "could not parse colored diff" +msgstr "ไธ่ฝ่งฃๆๅฝฉ่ฒๅทฎๅผไฟกๆฏ" + +#: add-patch.c:452 +#, c-format +msgid "failed to run '%s'" +msgstr "่ฟ่ก '%s' ๅคฑ่ดฅ" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "interactive.diffFilter ็่พๅบไธๅน้ " + +#: add-patch.c:612 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "ๆจ็่ฟๆปคๅจๅฟ ้กปๅจๅ ถ่พๅ ฅๅ่พๅบ็่กไน้ดไฟๆไธไธๅฏนๅบ็ๅ ณ็ณปใ" + +#: add-patch.c:785 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"้ขๆไธไธๆ่ก #%d ไบ\n" +"%.*s" + +#: add-patch.c:800 +#, 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:1076 git-add--interactive.perl:1117 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "ๆๅจๅ็ผ่พๆจกๅผ -- ๆฅ็ๅบ้จ็ๅฟซ้ๆๅใ\n" + +#: add-patch.c:1080 +#, 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:1094 git-add--interactive.perl:1131 +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:1127 +msgid "could not parse hunk header" +msgstr "ๆ ๆณ่งฃๆๆฐๆฎๅๅคดไฟกๆฏ" + +#: add-patch.c:1172 +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:1241 git-add--interactive.perl:1244 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "ๆจ็็ผ่พๅไธ่ฝ่ขซๅบ็จใ้ๆฐ็ผ่พ๏ผ้ๆฉ \"no\" ไธขๅผ๏ผ๏ผ [y/n]? " + +#: add-patch.c:1284 +msgid "The selected hunks do not apply to the index!" +msgstr "้ไธญ็ๅไธ่ฝๅบ็จๅฐ็ดขๅผ๏ผ" + +#: add-patch.c:1285 git-add--interactive.perl:1348 +msgid "Apply them to the worktree anyway? " +msgstr "ๆ ่ฎบๅฆไฝ้ฝ่ฆๅบ็จๅฐๅทฅไฝๅบไน๏ผ" + +#: add-patch.c:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "ๆชๅบ็จใ\n" + +#: add-patch.c:1349 +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:1511 add-patch.c:1521 +msgid "No previous hunk" +msgstr "ๆฒกๆๅไธไธชๅ" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No next hunk" +msgstr "ๆฒกๆไธไธไธชๅ" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "ๆฒกๆๅ ถๅฎๅฏไพ่ทณ่ฝฌ็ๅ" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "่ทณ่ฝฌๅฐๅชไธชๅ๏ผ<ๅ่ฝฆ> ๆฅ็ๆดๅค๏ผ๏ผ " + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "่ทณ่ฝฌๅฐๅชไธชๅ๏ผ" + +#: add-patch.c:1555 +#, c-format +msgid "Invalid number: '%s'" +msgstr "ๆ ๆๆฐๅญ๏ผ'%s'" + +#: add-patch.c:1560 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "ๅฏนไธ่ตท๏ผๅชๆ %d ไธชๅฏ็จๅใ" +msgstr[1] "ๅฏนไธ่ตท๏ผๅชๆ %d ไธชๅฏ็จๅใ" + +#: add-patch.c:1569 +msgid "No other hunks to search" +msgstr "ๆฒกๆๅ ถๅฎๅฏไพๆฅๆพ็ๅ" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "ไฝฟ็จๆญฃๅ่กจ่พพๅผๆ็ดข๏ผ" + +#: add-patch.c:1590 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "้่ฏฏ็ๆญฃๅ่กจ่พพๅผ %s๏ผ%s" + +#: add-patch.c:1607 +msgid "No hunk matches the given pattern" +msgstr "ๆฒกๆๅ็ปๅฎๆจกๅผ็ธๅน้ ็ๅ" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "ๅฏนไธ่ตท๏ผไธ่ฝๆๅ่ฟไธชๅ" + +#: add-patch.c:1618 +#, c-format +msgid "Split into %d hunks." +msgstr "ๆๅไธบ %d ๅใ" + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "ๅฏนไธ่ตท๏ผไธ่ฝ็ผ่พ่ฟไธชๅ" + +#: add-patch.c:1674 +msgid "'git apply' failed" +msgstr "'git apply' ๅคฑ่ดฅ" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" +"\n" +"ไฝฟ็จ \"git config advice.%s false\" ๆฅๅ ณ้ญๆญคๆถๆฏ" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sๆ็คบ๏ผ%.*s%s\n" -#: advice.c:162 +#: advice.c:247 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "ๆ ๆณๆฃ้๏ผๅ ไธบๆจๆๆชๅๅนถ็ๆไปถใ" -#: advice.c:164 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "ๆ ๆณๆไบค๏ผๅ ไธบๆจๆๆชๅๅนถ็ๆไปถใ" -#: advice.c:166 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "ๆ ๆณๅๅนถ๏ผๅ ไธบๆจๆๆชๅๅนถ็ๆไปถใ" -#: advice.c:168 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "ๆ ๆณๆๅ๏ผๅ ไธบๆจๆๆชๅๅนถ็ๆไปถใ" -#: advice.c:170 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "ๆ ๆณๅ้๏ผๅ ไธบๆจๆๆชๅๅนถ็ๆไปถใ" -#: advice.c:172 +#: advice.c:257 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "ๆ ๆณ %s๏ผๅ ไธบๆจๆๆชๅๅนถ็ๆไปถใ" -#: advice.c:180 +#: advice.c:265 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." @@ -187,23 +900,23 @@ msgstr "" "่ฏทๅจๅทฅไฝๅบๆนๆญฃๆไปถ๏ผ็ถๅ้ ๆ ไฝฟ็จ 'git add/rm <ๆไปถ>' ๅฝไปคๆ ่ฎฐ\n" "่งฃๅณๆนๆกๅนถๆไบคใ" -#: advice.c:188 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "ๅ ไธบๅญๅจๆช่งฃๅณ็ๅฒ็ช่้ๅบใ" -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:278 builtin/merge.c:1349 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "ๆจๅฐๆช็ปๆๆจ็ๅๅนถ๏ผๅญๅจ MERGE_HEAD๏ผใ" -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "่ฏทๅจๅๅนถๅๅ ๆไบคๆจ็ไฟฎๆนใ" -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "ๅ ไธบๅญๅจๆชๅฎๆ็ๅๅนถ่้ๅบใ" -#: advice.c:202 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -325,17 +1038,7 @@ msgstr "็ฌฌ %d ่กๅ ๅซๆ ๆๆไปถๆจกๅผ๏ผ%s" msgid "inconsistent header lines %d and %d" msgstr "ไธไธ่ด็ๆไปถๅคด๏ผ%d ่กๅ %d ่ก" -#: 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 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -346,82 +1049,92 @@ msgid_plural "" msgstr[0] "ๅฝ็งป้ค %d ไธชๅๅฏผ่ทฏๅพๅ git diff ๅคด็ผบไนๆไปถๅไฟกๆฏ๏ผ็ฌฌ %d ่ก๏ผ" msgstr[1] "ๅฝ็งป้ค %d ไธชๅๅฏผ่ทฏๅพๅ git diff ๅคด็ผบไนๆไปถๅไฟกๆฏ๏ผ็ฌฌ %d ่ก๏ผ" -#: apply.c:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff ็ๅคดไฟกๆฏไธญ็ผบไนๆไปถๅไฟกๆฏ๏ผ็ฌฌ %d ่ก๏ผ" -#: apply.c:1752 +#: 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:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "ๅ ้ค็ๆไปถไปๆๅ ๅฎน" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "่กฅไธๅจ็ฌฌ %d ่กๆๅ" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "ๆฐๆไปถ %s ไพ่ตๆงๅ ๅฎน" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "ๅ ้ค็ๆไปถ %s ไปๆๅ ๅฎน" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** ่ญฆๅ๏ผๆไปถ %s ๆไธบ็ฉบๆไปถไฝๅนถๆชๅ ้ค" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "ไบ่ฟๅถ่กฅไธๅจ็ฌฌ %d ่กๆๅ๏ผ%.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "ๆช่ฝ่ฏๅซ็ไบ่ฟๅถ่กฅไธไฝไบ็ฌฌ %d ่ก" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "่กฅไธๆไปถ็็ฌฌ %d ่กๅชๆๅๅพๆฐๆฎ" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "ๆ ๆณ่ฏปๅ็ฌฆๅท้พๆฅ %s" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "ไธ่ฝๆๅผๆ่ฏปๅ %s" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "ๆ ๆ็่ก้ฆๅญ็ฌฆ๏ผ'%c'" -#: apply.c:3046 +#: 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 ่ก๏ผ" msgstr[1] "ๅ #%d ๆๅๅบ็จไบ %d๏ผๅ็งป %d ่ก๏ผ" -#: apply.c:3058 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "ไธไธๆๅๅฐๅฐ๏ผ%ld/%ld๏ผไปฅๅจ็ฌฌ %d ่กๅบ็จ่กฅไธ็ๆฎต" -#: apply.c:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -430,451 +1143,481 @@ msgstr "" "ๅฝๆฅ่ฏข๏ผ\n" "%.*s" -#: apply.c:3086 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "็ผบๅคฑ '%s' ็ไบ่ฟๅถ่กฅไธๆฐๆฎ" -#: apply.c:3094 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "ไธ่ฝๅๅๅบ็จไธไธช็ผบๅฐๅฐ '%s' ็ๅๅๆฐๆฎๅ็ไบ่ฟๅถ่กฅไธ" -#: apply.c:3141 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "ไธ่ฝๅจ '%s' ไธๅบ็จๆฒกๆๅฎๆด็ดขๅผ่ก็ไบ่ฟๅถ่กฅไธ" -#: apply.c:3151 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "่กฅไธๅบ็จๅฐ '%s'๏ผ%s๏ผ๏ผไฝๆฏๅๅฝๅๅ ๅฎนไธๅน้ ใ" -#: apply.c:3159 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "่กฅไธๅบ็จๅฐ็ฉบๆไปถ '%s'๏ผไฝๅ ถๅนถ้็ฉบๆไปถ" -#: apply.c:3177 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "ๆ ๆณ่ฏปๅ '%2$s' ๅฟ ้็็ฎๆ ๆไปถ %1$s" -#: apply.c:3190 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "ไบ่ฟๅถ่กฅไธๆชๅบ็จๅฐ '%s'" -#: apply.c:3196 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "ๅฐ '%s' ็ไบ่ฟๅถ่กฅไธไบง็ไบไธๆญฃ็กฎ็็ปๆ๏ผๅบไธบ %s๏ผๅดไธบ %s๏ผ" -#: apply.c:3217 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "ๆ่กฅไธๅคฑ่ดฅ๏ผ%s:%ld" -#: apply.c:3340 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "ไธ่ฝๆฃๅบ %s" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 #, c-format msgid "failed to read %s" msgstr "ๆ ๆณ่ฏปๅ %s" -#: apply.c:3400 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "่ฏปๅไฝไบ็ฌฆๅท้พๆฅไธญ็ '%s'" -#: apply.c:3429 apply.c:3672 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "่ทฏๅพ %s ๅทฒ็ป่ขซ้ๅฝๅ/ๅ ้ค" -#: apply.c:3515 apply.c:3687 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s๏ผไธๅญๅจไบ็ดขๅผไธญ" -#: apply.c:3524 apply.c:3695 +#: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" msgstr "%s๏ผๅ็ดขๅผไธๅน้ " -#: apply.c:3559 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "ไปๅบ็ผบไนๅฟ ่ฆ็ๆฐๆฎๅฏน่ฑกไปฅ่ฟ่กไธๆนๅๅนถใ" -#: apply.c:3562 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "ๅ่ฝๅฐไธๆนๅๅนถ...\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "ๆ ๆณ่ฏปๅ '%s' ็ๅฝๅๅ ๅฎน" -#: apply.c:3594 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "ๆ ๆณๅ่ฝๅฐไธๆนๅๅนถ...\n" -#: apply.c:3608 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "ๅบ็จ่กฅไธๅฐ '%s' ๅญๅจๅฒ็ชใ\n" -#: apply.c:3613 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "ๆๅๅบ็จ่กฅไธๅฐ '%s'ใ\n" -#: apply.c:3639 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "็งป้ค่กฅไธไป็ไธไบๆไปถๅ ๅฎน" -#: apply.c:3712 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s๏ผ้่ฏฏ็ฑปๅ" -#: apply.c:3714 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ็็ฑปๅๆฏ %o๏ผๅบไธบ %o" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "ๆ ๆ่ทฏๅพ '%s'" -#: apply.c:3923 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s๏ผๅทฒ็ปๅญๅจไบ็ดขๅผไธญ" -#: apply.c:3926 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s๏ผๅทฒ็ปๅญๅจไบๅทฅไฝๅบไธญ" -#: apply.c:3946 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s ็ๆฐๆจกๅผ๏ผ%1$o๏ผๅๆงๆจกๅผ๏ผ%3$o๏ผไธๅน้ " -#: apply.c:3951 +#: apply.c:3981 #, 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:3971 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "ๅๅฝฑๅ็ๆไปถ '%s' ไฝไบ็ฌฆๅท้พๆฅไธญ" -#: apply.c:3975 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s๏ผ่กฅไธๆชๅบ็จ" -#: apply.c:3990 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "ๆญฃๅจๆฃๆฅ่กฅไธ %s..." -#: apply.c:4082 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "ๅญๆจก็ป %s ็ sha1 ไฟกๆฏ็ผบๅคฑๆๆ ๆ" -#: apply.c:4089 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s ็ๆจกๅผๅๆด๏ผไฝๅฎไธๅจๅฝๅ HEAD ไธญ" -#: apply.c:4092 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 ไฟกๆฏ็ผบๅคฑๆๆ ๆ๏ผ%s๏ผใ" -#: 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 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "ไธ่ฝๅจไธดๆถ็ดขๅผไธญๆทปๅ %s" -#: apply.c:4111 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "ไธ่ฝๆไธดๆถ็ดขๅผๅๅ ฅๅฐ %s" -#: apply.c:4249 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "ไธ่ฝไป็ดขๅผไธญ็งป้ค %s" -#: apply.c:4283 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "ๅญๆจก็ป %s ๆๅ็่กฅไธ" -#: apply.c:4289 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "ไธ่ฝๅฏนๆฐๅปบๆไปถ '%s' ่ฐ็จ stat" -#: apply.c:4297 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "ไธ่ฝไธบๆฐๅปบๆไปถ %s ๅๅปบๅ็ซฏๅญๅจ" -#: apply.c:4303 apply.c:4448 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "ๆ ๆณไธบ %s ๆทปๅ ็ผๅญๆก็ฎ" -#: apply.c:4346 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "ๅๅ ฅ '%s' ๅคฑ่ดฅ" -#: apply.c:4350 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "ๅ ณ้ญๆไปถ '%s'" -#: apply.c:4420 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "ไธ่ฝๅๆไปถ '%s' ๆ้ %o" -#: apply.c:4518 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "ๆๅๅบ็จ่กฅไธ %sใ" -#: apply.c:4526 +#: apply.c:4556 msgid "internal error" msgstr "ๅ ้จ้่ฏฏ" -#: apply.c:4529 +#: apply.c:4559 #, 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:4540 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "ๆช็ญ .rej ๆไปถๅไธบ %.*s.rej" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "ไธ่ฝๆๅผ %s" -#: apply.c:4562 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "็ฌฌ #%d ไธช็ๆฎตๆๅๅบ็จใ" -#: apply.c:4566 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "ๆ็ป็ฌฌ #%d ไธช็ๆฎตใ" -#: apply.c:4676 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "็ฅ่ฟ่กฅไธ '%s'ใ" -#: apply.c:4684 +#: apply.c:4723 msgid "unrecognized input" msgstr "ๆช่ฝ่ฏๅซ็่พๅ ฅ" -#: apply.c:4704 +#: apply.c:4743 msgid "unable to read index file" msgstr "ๆ ๆณ่ฏปๅ็ดขๅผๆไปถ" -#: apply.c:4859 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "ไธ่ฝๆๅผ่กฅไธ '%s'๏ผ%s" -#: apply.c:4886 +#: apply.c:4927 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "ๆๅถไธไปๆ %d ไธช็ฉบ็ฝๅญ็ฌฆ่ฏฏ็จ" msgstr[1] "ๆๅถไธไปๆ %d ไธช็ฉบ็ฝๅญ็ฌฆ่ฏฏ็จ" -#: apply.c:4892 apply.c:4907 +#: apply.c:4933 apply.c:4948 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ่กๆฐๅขไบ็ฉบ็ฝๅญ็ฌฆ่ฏฏ็จใ" msgstr[1] "%d ่กๆฐๅขไบ็ฉบ็ฝๅญ็ฌฆ่ฏฏ็จใ" -#: apply.c:4900 +#: apply.c:4941 #, 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:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "ๆ ๆณๅๅ ฅๆฐ็ดขๅผๆไปถ" -#: 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 +#: apply.c:4985 msgid "don't apply changes matching the given path" msgstr "ไธ่ฆๅบ็จไธ็ปๅบ่ทฏๅพๅๅน้ ็ๅๆด" -#: apply.c:4947 +#: apply.c:4988 msgid "apply changes matching the given path" msgstr "ๅบ็จไธ็ปๅบ่ทฏๅพๅๅน้ ็ๅๆด" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "ๆฐๅญ" -#: apply.c:4950 +#: apply.c:4991 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ไปไผ ็ป็ diff ่ทฏๅพไธญ็งป้คๆๅฎๆฐ้็ๅๅฏผๆ็บฟ" -#: apply.c:4953 +#: apply.c:4994 msgid "ignore additions made by the patch" msgstr "ๅฟฝ็ฅ่กฅไธไธญ็ๆทปๅ ็ๆไปถ" -#: apply.c:4955 +#: apply.c:4996 msgid "instead of applying the patch, output diffstat for the input" msgstr "ไธๅบ็จ่กฅไธ๏ผ่ๆฏๆพ็คบ่พๅ ฅ็ๅทฎๅผ็ป่ฎก๏ผdiffstat๏ผ" -#: apply.c:4959 +#: apply.c:5000 msgid "show number of added and deleted lines in decimal notation" msgstr "ไปฅๅ่ฟๅถๆฐๆพ็คบๆทปๅ ๅๅ ้ค็่กๆฐ" -#: apply.c:4961 +#: apply.c:5002 msgid "instead of applying the patch, output a summary for the input" msgstr "ไธๅบ็จ่กฅไธ๏ผ่ๆฏๆพ็คบ่พๅ ฅ็ๆฆ่ฆ" -#: apply.c:4963 +#: apply.c:5004 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ไธๅบ็จ่กฅไธ๏ผ่ๆฏๆฅ็่กฅไธๆฏๅฆๅฏๅบ็จ" -#: apply.c:4965 +#: apply.c:5006 msgid "make sure the patch is applicable to the current index" msgstr "็กฎ่ฎค่กฅไธๅฏไปฅๅบ็จๅฐๅฝๅ็ดขๅผ" -#: apply.c:4967 +#: apply.c:5008 msgid "mark new files with `git add --intent-to-add`" msgstr "ไฝฟ็จๅฝไปค `git add --intent-to-add` ๆ ่ฎฐๆฐๅขๆไปถ" -#: apply.c:4969 +#: apply.c:5010 msgid "apply a patch without touching the working tree" msgstr "ๅบ็จ่กฅไธ่ไธไฟฎๆนๅทฅไฝๅบ" -#: apply.c:4971 +#: apply.c:5012 msgid "accept a patch that touches outside the working area" msgstr "ๆฅๅไฟฎๆนๅทฅไฝๅบไนๅคๆไปถ็่กฅไธ" -#: apply.c:4974 +#: apply.c:5015 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "่ฟๅบ็จๆญค่กฅไธ๏ผไธ --stat/--summary/--check ้้กนๅๆถไฝฟ็จ๏ผ" -#: apply.c:4976 +#: apply.c:5017 msgid "attempt three-way merge if a patch does not apply" msgstr "ๅฆๆไธไธช่กฅไธไธ่ฝๅบ็จๅๅฐ่ฏไธๆนๅๅนถ" -#: apply.c:4978 +#: apply.c:5019 msgid "build a temporary index based on embedded index information" msgstr "ๅๅปบไธไธชไธดๆถ็ดขๅผๅบไบๅตๅ ฅ็็ดขๅผไฟกๆฏ" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "่ทฏๅพไปฅ NUL ๅญ็ฌฆๅ้" -#: apply.c:4983 +#: apply.c:5024 msgid "ensure at least <n> lines of context match" msgstr "็กฎไฟ่ณๅฐๅน้ <n> ่กไธไธๆ" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "ๅจไฝ" -#: apply.c:4985 +#: apply.c:5026 msgid "detect new or modified lines that have whitespace errors" msgstr "ๆฃๆฅๆฐๅขๅไฟฎๆน็่กไธญ้ด็็ฉบ็ฝๅญ็ฌฆๆปฅ็จ" -#: apply.c:4988 apply.c:4991 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" msgstr "ๆฅๆพไธไธๆๆถๅฟฝ็ฅ็ฉบ็ฝๅญ็ฌฆ็ๅๆด" -#: apply.c:4994 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "ๅๅๅบ็จ่กฅไธ" -#: apply.c:4996 +#: apply.c:5037 msgid "don't expect at least one line of context" msgstr "ๆ ้่ณๅฐไธ่กไธไธๆ" -#: apply.c:4998 +#: apply.c:5039 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "ๅฐๆ็ป็่กฅไธ็ๆฎตไฟๅญๅจๅฏนๅบ็ *.rej ๆไปถไธญ" -#: apply.c:5000 +#: apply.c:5041 msgid "allow overlapping hunks" msgstr "ๅ ่ฎธ้ๅ ็่กฅไธ็ๆฎต" -#: 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 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ๅ้ฟ่พๅบ" -#: apply.c:5003 +#: apply.c:5044 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "ๅ ่ฎธไธๆญฃ็กฎ็ๆไปถๆซๅฐพๆข่ก็ฌฆ" -#: apply.c:5006 +#: apply.c:5047 msgid "do not trust the line counts in the hunk headers" msgstr "ไธไฟกไปป่กฅไธ็ๆฎต็ๅคดไฟกๆฏไธญ็่กๅท" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "ๆ น็ฎๅฝ" -#: apply.c:5009 +#: apply.c:5050 msgid "prepend <root> to all filenames" msgstr "ไธบๆๆๆไปถๅๅๆทปๅ <ๆ น็ฎๅฝ>" +#: archive-tar.c:125 archive-zip.c:345 +#, c-format +msgid "cannot stream blob %s" +msgstr "ไธ่ฝๆๅผๆฐๆฎๅฏน่ฑก %s" + +#: archive-tar.c:265 archive-zip.c:358 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "ไธๆฏๆ็ๆไปถๆจกๅผ๏ผ0%o (SHA1: %s)" + +#: archive-tar.c:449 +#, c-format +msgid "unable to start '%s' filter" +msgstr "ๆ ๆณๅฏๅจ '%s' ่ฟๆปคๅจ" + +#: archive-tar.c:452 +msgid "unable to redirect descriptor" +msgstr "ๆ ๆณ้ๅฎๅๆ่ฟฐ็ฌฆ" + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "'%s' ่ฟๆปคๅจๆฅๅไบ้่ฏฏ" + +#: archive-zip.c:318 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "่ทฏๅพไธๆฏๆๆ็ UTF-8๏ผ%s" + +#: archive-zip.c:322 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "่ทฏๅพๅคช้ฟ๏ผ%d ๅญ็ฌฆ๏ผSHA1๏ผ%s๏ผ๏ผ%s" + +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "ๅ็ผฉ้่ฏฏ (%d)" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "ๅฏนไบๆฌ็ณป็ปๆถ้ดๆณๅคชๅคง๏ผ%<PRIuMAX>" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "git archive [<้้กน>] <ๆ ๆๆไบค> [<่ทฏๅพ>...]" +msgstr "git archive [<้้กน>] <ๆ ๅฏน่ฑก> [<่ทฏๅพ>...]" #: archive.c:15 msgid "git archive --list" @@ -884,188 +1627,170 @@ 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:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "ไธ่ฝ่ฏปๅ %s" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "ไธ่ฝ่ฏปๅ '%s'" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "่ทฏๅพ่งๆ ผ '%s' ๆชๅน้ ไปปไฝๆไปถ" -#: archive.c:396 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "ๆ ๆญคๅผ็จ๏ผ%.*s" -#: archive.c:401 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "ไธๆฏไธไธชๆๆ็ๅฏน่ฑกๅ๏ผ%s" -#: archive.c:414 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "ไธๆฏไธไธชๆ ๅฏน่ฑก๏ผ%s" -#: archive.c:426 +#: archive.c:485 msgid "current working directory is untracked" msgstr "ๅฝๅๅทฅไฝ็ฎๅฝๆช่ขซ่ท่ธช" -#: archive.c:457 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "ๆไปถๆชๆพๅฐ๏ผ%s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "ไธๆฏไธไธชๅธธ่งๆไปถ๏ผ%s" + +#: archive.c:553 msgid "fmt" msgstr "ๆ ผๅผ" -#: archive.c:457 +#: archive.c:553 msgid "archive format" msgstr "ๅฝๆกฃๆ ผๅผ" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "ๅ็ผ" -#: archive.c:459 +#: archive.c:555 msgid "prepend prefix to each pathname in the archive" msgstr "ไธบๅฝๆกฃไธญๆฏไธช่ทฏๅพๅๅ ไธๅ็ผ" -#: 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 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 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 +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "ๅฐๆช่ท่ธชๆไปถๆทปๅ ๅฐๅฝๆกฃ" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "ๅฝๆกฃๅๅ ฅๆญคๆไปถ" -#: archive.c:463 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr "่ฏปๅๅทฅไฝๅบไธญ็ .gitattributes" -#: archive.c:464 +#: archive.c:563 msgid "report archived files on stderr" msgstr "ๅจๆ ๅ้่ฏฏไธๆฅๅๅฝๆกฃๆไปถ" -#: archive.c:465 +#: archive.c:564 msgid "store only" msgstr "ๅชๅญๅจ" -#: archive.c:466 +#: archive.c:565 msgid "compress faster" msgstr "ๅ็ผฉ้ๅบฆๆดๅฟซ" -#: archive.c:474 +#: archive.c:573 msgid "compress better" msgstr "ๅ็ผฉๆๆๆดๅฅฝ" -#: archive.c:477 +#: archive.c:576 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:1379 builtin/submodule--helper.c:1859 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "ไปๅบ" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:579 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "ไป่ฟ็จไปๅบ๏ผ<ไปๅบ>๏ผๆๅๅฝๆกฃๆไปถ" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "ๅฝไปค" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "่ฟ็จ git-upload-archive ๅฝไปค็่ทฏๅพ" -#: archive.c:489 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "ๆช็ฅๅๆฐ --remote" -#: archive.c:491 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "้้กน --exec ๅช่ฝๅ --remote ๅๆถไฝฟ็จ" -#: archive.c:493 +#: archive.c:592 msgid "Unexpected option --output" msgstr "ๆช็ฅๅๆฐ --output" -#: archive.c:515 +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" +msgstr "้้กน --add-file ๅ --remote ไธ่ฝๅๆถไฝฟ็จ" + +#: archive.c:616 #, c-format msgid "Unknown archive format '%s'" msgstr "ๆช็ฅๅฝๆกฃๆ ผๅผ '%s'" -#: archive.c:522 +#: archive.c:623 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "ๅๆฐไธๆฏๆๆญคๆ ผๅผ '%s'๏ผ-%d" -#: archive-tar.c:125 archive-zip.c:345 -#, c-format -msgid "cannot stream blob %s" -msgstr "ไธ่ฝๆๅผๆฐๆฎๅฏน่ฑก %s" - -#: 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:287 archive-zip.c:353 -#, c-format -msgid "cannot read %s" -msgstr "ไธ่ฝ่ฏปๅ %s" - -#: archive-tar.c:459 -#, c-format -msgid "unable to start '%s' filter" -msgstr "ๆ ๆณๅฏๅจ '%s' ่ฟๆปคๅจ" - -#: archive-tar.c:462 -msgid "unable to redirect descriptor" -msgstr "ๆ ๆณ้ๅฎๅๆ่ฟฐ็ฌฆ" - -#: archive-tar.c:469 -#, c-format -msgid "'%s' filter reported error" -msgstr "'%s' ่ฟๆปคๅจๆฅๅไบ้่ฏฏ" - -#: archive-zip.c:314 -#, c-format -msgid "path is not valid UTF-8: %s" -msgstr "่ทฏๅพไธๆฏๆๆ็ UTF-8๏ผ%s" - -#: archive-zip.c:318 -#, c-format -msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "่ทฏๅพๅคช้ฟ๏ผ%d ๅญ็ฌฆ๏ผSHA1๏ผ%s๏ผ๏ผ%s" - -#: 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:609 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "ๅฏนไบๆฌ็ณป็ปๆถ้ดๆณๅคชๅคง๏ผ%<PRIuMAX>" - -#: attr.c:211 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s ไธๆฏไธไธชๆๆ็ๅฑๆงๅ" -#: attr.c:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "ไธๅ ่ฎธ %s๏ผ%s:%d" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1073,22 +1798,22 @@ msgstr "" "่ดๅผๆจก็ๅจ git attributes ไธญ่ขซๅฟฝ็ฅ\n" "ๅฝๅญ็ฌฆไธฒ็กฎๅฎ่ฆไปฅๆๅนๅทๅผๅงๆถ๏ผไฝฟ็จ '\\!'ใ" -#: bisect.c:468 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "ๆไปถ '%s' ๅ ๅซ้่ฏฏ็ๅผ็จๆ ผๅผ๏ผ%s" -#: bisect.c:678 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "ๆไปฌๆ ๆณ่ฟ่กๆดๅค็ไบๅๆฅๆพ๏ผ\n" -#: bisect.c:733 +#: bisect.c:753 #, c-format msgid "Not a valid commit name %s" msgstr "ไธๆฏไธไธชๆๆ็ๆไบคๅ %s" -#: bisect.c:758 +#: bisect.c:778 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1097,7 +1822,7 @@ msgstr "" "ๅๅนถๅบ็บฟ %s ๆฏๅ็ใ\n" "่ฟๆๅณ็ไปไบ %s ๅ [%s] ไน้ด็ bug ๅทฒ็ป่ขซไฟฎๅคใ\n" -#: bisect.c:763 +#: bisect.c:783 #, c-format msgid "" "The merge base %s is new.\n" @@ -1106,7 +1831,7 @@ msgstr "" "ๅๅนถๅบ็บฟ %s ๆฏๆฐ็ใ\n" "ไปไบ %s ๅ [%s] ไน้ด็ๅฑๆงๅทฒ็ป่ขซไฟฎๆนใ\n" -#: bisect.c:768 +#: bisect.c:788 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1115,7 +1840,7 @@ msgstr "" "ๅๅนถๅบ็บฟ %s ๆฏ %sใ\n" "่ฟๆๅณ็็ฌฌไธไธช '%s' ๆไบคไฝไบ %s ๅ [%s] ไน้ดใ\n" -#: bisect.c:776 +#: bisect.c:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1126,7 +1851,7 @@ msgstr "" "่ฟ็งๆ ๅตไธ git ไบๅๆฅๆพๆ ๆณๆญฃๅธธๅทฅไฝใ\n" "ๆจๅฏ่ฝๅผ้ไบ %s ๅ %s ็ๆฌ๏ผ\n" -#: bisect.c:789 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1137,36 +1862,36 @@ msgstr "" "ๆไปฅๆไปฌๆ ๆณ็กฎ่ฎค็ฌฌไธไธช %s ๆไบคๆฏๅฆไปไบ %s ๅ %s ไน้ดใ\n" "ๆไปฌไปๆง็ปง็ปญใ" -#: bisect.c:822 +#: bisect.c:848 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "ไบๅๆฅๆพไธญ๏ผๅๅนถๅบ็บฟๅฟ ้กปๆฏ็ป่ฟๆต่ฏ็\n" -#: bisect.c:865 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "้่ฆไธไธช %s ็ๆฌ" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "ไธ่ฝๅๅปบๆไปถ '%s'" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "ไธ่ฝ่ฏปๅๆไปถ '%s'" -#: bisect.c:958 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "่ฏปๅไบๅๆฅๆพๅผ็จๅคฑ่ดฅ" -#: bisect.c:977 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "%s ๅๆถไธบ %s ๅ %s\n" -#: bisect.c:985 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" @@ -1175,7 +1900,7 @@ msgstr "" "ๆฒกๆๅ็ฐๅฏๆต่ฏ็ๆไบคใ\n" "ๅฏ่ฝๆจๅจ่ฟ่กๆถไฝฟ็จไบ้่ฏฏ็่ทฏๅพๅๆฐ๏ผ\n" -#: bisect.c:1004 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1185,44 +1910,44 @@ msgstr[1] "๏ผๅคงๆฆ %d ๆญฅ๏ผ" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1088 #, 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:2697 +#: blame.c:2778 msgid "--contents and --reverse do not blend well." msgstr "--contents ๅ --reverse ไธ่ฝๆทท็จใ" -#: blame.c:2711 +#: blame.c:2792 msgid "cannot use --contents with final commit object name" msgstr "ไธ่ฝๅฐ --contents ๅๆ็ป็ๆไบคๅฏน่ฑกๅๅ ฑ็จ" -#: blame.c:2732 +#: blame.c:2813 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse ๅ --first-parent ๅ ฑ็จ๏ผ้่ฆๆๅฎๆๆฐ็ๆไบค" -#: 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 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 msgid "revision walk setup failed" msgstr "็ๆฌ้ๅ่ฎพ็ฝฎๅคฑ่ดฅ" -#: blame.c:2759 +#: blame.c:2840 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse ๅ --first-parent ๅ ฑ็จ๏ผ้่ฆ็ฌฌไธ็ฅๅ ้พไธ็ๆไบค่ๅด" -#: blame.c:2770 +#: blame.c:2851 #, c-format msgid "no such path %s in %s" msgstr "ๅจ %2$s ไธญๆ ๆญค่ทฏๅพ %1$s" -#: blame.c:2781 +#: blame.c:2862 #, c-format msgid "cannot read blob %s for path %s" msgstr "ไธ่ฝไธบ่ทฏๅพ %2$s ่ฏปๅๆฐๆฎๅฏน่ฑก %1$s" @@ -1350,409 +2075,444 @@ msgstr "ๆญงไน็ๅฏน่ฑกๅ๏ผ'%s'ใ" msgid "Not a valid branch point: '%s'." msgstr "ๆ ๆ็ๅๆฏ็น๏ผ'%s'ใ" -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' ๅทฒ็ปๆฃๅบๅฐ '%s'" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "ๅทฅไฝๅบ %s ็ HEAD ๆๅๆฒกๆ่ขซๆดๆฐ" -#: bundle.c:36 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "ๆช่ฝ่ฏๅซ็ๅฝๆกฃๅ ๅๅธ็ฎๆณ๏ผ%s" + +#: bundle.c:45 +#, c-format +msgid "unknown capability '%s'" +msgstr "ๆช็ฅ่ฝๅ '%s'" + +#: bundle.c:71 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' ไธๅๆฏไธไธช v2 ็ๆฌ็ๅ ๆไปถ" +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' ไธๅๆฏไธไธช v2 ๆ v3 ็ๆฌ็ๅฝๆกฃๅ ๆไปถ" -#: bundle.c:64 +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "ๆช่ฝ่ฏๅซ็ๅ ๅคด๏ผ%s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "ไธ่ฝๆๅผ '%s'" -#: bundle.c:143 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "ไปๅบไธญ็ผบๅฐ่ฟไบๅฟ ๅค็ๆไบค๏ผ" -#: bundle.c:146 +#: bundle.c:192 msgid "need a repository to verify a bundle" -msgstr "้่ฆไธไธชไปๅบๆฅๆ ก้ชไธไธชๅ " +msgstr "้่ฆไธไธชไปๅบๆฅๆ ก้ชไธไธชๅฝๆกฃๅ " -#: bundle.c:197 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" -msgstr[0] "่ฟไธชๅ ไธญๅซๆ่ฟไธชๅผ็จ๏ผ" -msgstr[1] "่ฟไธชๅ ไธญๅซๆ %d ไธชๅผ็จ๏ผ" +msgstr[0] "่ฟไธชๅฝๆกฃๅ ไธญๅซๆ่ฟไธชๅผ็จ๏ผ" +msgstr[1] "่ฟไธชๅฝๆกฃๅ ไธญๅซๆ %d ไธชๅผ็จ๏ผ" -#: bundle.c:204 +#: bundle.c:250 msgid "The bundle records a complete history." -msgstr "่ฟไธชๅ ่ฎฐๅฝไธไธชๅฎๆดๅๅฒใ" +msgstr "่ฟไธชๅฝๆกฃๅ ่ฎฐๅฝไธไธชๅฎๆดๅๅฒใ" -#: bundle.c:206 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" -msgstr[0] "่ฟไธชๅ ้่ฆ่ฟไธชๅผ็จ๏ผ" -msgstr[1] "่ฟไธชๅ ้่ฆ %d ไธชๅผ็จ๏ผ" +msgstr[0] "่ฟไธชๅฝๆกฃๅ ้่ฆ่ฟไธชๅผ็จ๏ผ" +msgstr[1] "่ฟไธชๅฝๆกฃๅ ้่ฆ %d ไธชๅผ็จ๏ผ" -#: bundle.c:272 +#: bundle.c:319 msgid "unable to dup bundle descriptor" -msgstr "ๆ ๆณๅคๅถ bundle ๆ่ฟฐ็ฌฆ" +msgstr "ๆ ๆณๅคๅถๅฝๆกฃๅ ๆ่ฟฐ็ฌฆ" -#: bundle.c:279 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "ไธ่ฝ็ๆ pack-objects ่ฟ็จ" -#: bundle.c:290 +#: bundle.c:337 msgid "pack-objects died" msgstr "pack-objects ็ปๆญข" -#: bundle.c:332 +#: bundle.c:379 msgid "rev-list died" msgstr "rev-list ็ปๆญข" -#: bundle.c:381 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "ๅผ็จ '%s' ่ขซ rev-list ้้กนๆ้ค" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "ไธๆฏๆ็ๅฝๆกฃๅ ็ๆฌ %d" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "ไธ่ฝๅๅ ฅ๏ผๅฝๆกฃๅ ็ๆฌ %d ไธๆฏๆ็ฎๆณ %s" + +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 #, c-format msgid "unrecognized argument: %s" msgstr "ๆช่ฝ่ฏๅซ็ๅๆฐ๏ผ%s" -#: bundle.c:468 +#: bundle.c:530 msgid "Refusing to create empty bundle." -msgstr "ไธ่ฝๅๅปบ็ฉบๅ ใ" +msgstr "ไธ่ฝๅๅปบ็ฉบ็ๅฝๆกฃๅ ใ" -#: bundle.c:478 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "ไธ่ฝๅๅปบ '%s'" -#: bundle.c:503 +#: bundle.c:565 msgid "index-pack died" msgstr "index-pack ็ปๆญข" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "ๆ ๆ็้ข่ฒๅผ๏ผ%.*s" -#: 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:52 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s ไธๆฏไธไธชๆไบค๏ผ" - -#: commit.c:192 -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:1127 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "ๆไบค %s ๆไธไธช้ๅฏไฟก็ๅฃฐ็งฐๆฅ่ช %s ็ GPG ็ญพๅใ" - -#: commit.c:1130 -#, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "ๆไบค %s ๆไธไธช้่ฏฏ็ๅฃฐ็งฐๆฅ่ช %s ็ GPG ็ญพๅใ" - -#: commit.c:1133 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "ๆไบค %s ๆฒกๆ GPG ็ญพๅใ" - -#: commit.c:1136 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "ๆไบค %s ๆไธไธชๆฅ่ช %s ็ๅฅฝ็ GPG ็ญพๅใ\n" - -#: 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 "" -"่ญฆๅ๏ผๆไบค่ฏดๆไธ็ฌฆๅ UTF-8 ๅญ็ฌฆ็ผ็ ใ\n" -"ๆจๅฏไปฅ้่ฟไฟฎ่กฅๆไบคๆฅๆนๆญฃๆไบค่ฏดๆ๏ผๆ่ ๅฐ้ ็ฝฎๅ้ i18n.commitencoding\n" -"่ฎพ็ฝฎไธบๆจ้กน็ฎๆ็จ็ๅญ็ฌฆ็ผ็ ใ\n" +#: commit-graph.c:188 midx.c:46 +msgid "invalid hash version" +msgstr "ๆ ๆ็ๅๅธ็ๆฌ" -#: commit-graph.c:127 +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "ๆไบคๅพๅฝขๆไปถๅคชๅฐ" -#: commit-graph.c:192 +#: commit-graph.c:311 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "ๆไบคๅพๅฝข็ญพๅ %X ๅ็ญพๅ %X ไธๅน้ " -#: commit-graph.c:199 +#: commit-graph.c:318 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "ๆไบคๅพๅฝข็ๆฌ %X ๅ็ๆฌ %X ไธๅน้ " -#: commit-graph.c:206 +#: commit-graph.c:325 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "ๆไบคๅพๅฝขๅๅธ็ๆฌ %X ๅ็ๆฌ %X ไธๅน้ " -#: commit-graph.c:229 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" -msgstr "ๆไบคๅพๅฝขๅๆฅๆพ่กจๆก็ฎไธขๅคฑ๏ผๆไปถๅฏ่ฝไธๅฎๆด" +#: commit-graph.c:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "ๆไบคๅพๅฝขๆไปถๅคชๅฐ๏ผๅฎนไธไธ %u ไธชๅ" -#: commit-graph.c:240 +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "ๆไบคๅพๅฝขไธๆญฃ็กฎ็ๅๅ็งป %08x%08x" -#: commit-graph.c:283 +#: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "ๆไบคๅพๅฝขๅ id %08x ๅบ็ฐไบๅคๆฌก" -#: commit-graph.c:347 +#: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" msgstr "ๆไบคๅพๅฝขๆฒกๆๅบ็กๅพๅฝขๅ" -#: commit-graph.c:357 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "ๆไบคๅพๅฝข้พไธๅน้ " -#: commit-graph.c:404 +#: commit-graph.c:557 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "ๆ ๆ็ๆไบคๅพๅฝข้พ๏ผ่ก '%s' ไธๆฏไธไธชๅๅธๅผ" -#: commit-graph.c:430 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "ๆ ๆณๆพๅฐๆๆๆไบคๅพๅฝขๆไปถ" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:721 commit-graph.c:785 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ๆ ๆ็ๆไบคไฝ็ฝฎใๆไบคๅพๅฝขๅฏ่ฝๅทฒๆๅ" -#: commit-graph.c:575 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "ๆ ๆณๆพๅฐๆไบค %s" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:1042 builtin/am.c:1306 +#, c-format +msgid "unable to parse commit %s" +msgstr "ไธ่ฝ่งฃๆๆไบค %s" + +#: commit-graph.c:1265 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "ๆ ๆณ่ทๅพๅฏน่ฑก %s ็ฑปๅ" -#: commit-graph.c:1034 +#: commit-graph.c:1301 msgid "Loading known commits in commit graph" msgstr "ๆญฃๅจๅ ่ฝฝๆไบคๅพไธญ็ๅทฒ็ฅๆไบค" -#: commit-graph.c:1051 +#: commit-graph.c:1318 msgid "Expanding reachable commits in commit graph" msgstr "ๆญฃๅจๆฉๅฑๆไบคๅพไธญ็ๅฏ่พพๆไบค" -#: commit-graph.c:1070 +#: commit-graph.c:1338 msgid "Clearing commit marks in commit graph" msgstr "ๆญฃๅจๆธ ้คๆไบคๅพไธญ็ๆไบคๆ ่ฎฐ" -#: commit-graph.c:1089 +#: commit-graph.c:1357 msgid "Computing commit graph generation numbers" msgstr "ๆญฃๅจ่ฎก็ฎๆไบคๅพไธไปฃๆฐๅญ" -#: commit-graph.c:1163 +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "่ฎก็ฎๆไบคๅๆด่ทฏๅพ็ๅธ้่ฟๆปคๅจ" + +#: commit-graph.c:1501 +msgid "Collecting referenced commits" +msgstr "ๆญฃๅจๆถ้ๅผ็จ็ๆไบค" + +#: commit-graph.c:1526 #, 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:1176 +#: commit-graph.c:1539 #, c-format msgid "error adding pack %s" msgstr "ๆทปๅ ๅ %s ๅบ้" -#: commit-graph.c:1180 +#: commit-graph.c:1543 #, c-format msgid "error opening index for %s" msgstr "ไธบ %s ๆๅผ็ดขๅผๅบ้" -#: 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:1238 +#: commit-graph.c:1582 msgid "Finding commits for commit graph among packed objects" msgstr "ๆญฃๅจๆๅ ๅฏน่ฑกไธญๆฅๆพๆไบคๅพ็ๆไบค" -#: commit-graph.c:1253 +#: commit-graph.c:1597 msgid "Counting distinct commits in commit graph" msgstr "ๆญฃๅจ่ฎก็ฎๆไบคๅพไธญไธๅ็ๆไบค" -#: commit-graph.c:1284 +#: commit-graph.c:1629 msgid "Finding extra edges in commit graph" msgstr "ๆญฃๅจๆฅๆพๆไบคๅพไธญ้ขๅค็่พน" -#: commit-graph.c:1332 +#: commit-graph.c:1678 msgid "failed to write correct number of base graph ids" msgstr "ๆ ๆณๅๅ ฅๆญฃ็กฎๆฐ้็ๅบ็กๅพๅฝข ID" -#: commit-graph.c:1365 midx.c:811 +#: commit-graph.c:1720 midx.c:826 #, c-format msgid "unable to create leading directories of %s" msgstr "ไธ่ฝไธบ %s ๅๅปบๅ ๅฏผ็ฎๅฝ" -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1733 +msgid "unable to create temporary graph layer" +msgstr "ๆ ๆณๅๅปบไธดๆถๅพๅฑ" + +#: commit-graph.c:1738 #, c-format -msgid "unable to create '%s'" -msgstr "ไธ่ฝๅๅปบ '%s'" +msgid "unable to adjust shared permissions for '%s'" +msgstr "ๆ ๆณไธบ '%s' ่ฐๆดๅ ฑไบซๆ้" -#: commit-graph.c:1437 +#: commit-graph.c:1808 #, 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:1478 +#: commit-graph.c:1853 msgid "unable to open commit-graph chain file" msgstr "ๆ ๆณๆๅผๆไบคๅพๅฝข้พๆไปถ" -#: commit-graph.c:1490 +#: commit-graph.c:1869 msgid "failed to rename base commit-graph file" msgstr "ๆ ๆณ้ๅฝๅๅบ็กๆไบคๅพๅฝขๆไปถ" -#: commit-graph.c:1510 +#: commit-graph.c:1889 msgid "failed to rename temporary commit-graph file" msgstr "ๆ ๆณ้ๅฝๅไธดๆถๆไบคๅพๅฝขๆไปถ" -#: commit-graph.c:1621 +#: commit-graph.c:2015 msgid "Scanning merged commits" msgstr "ๆญฃๅจๆซๆๅๅนถๆไบค" -#: commit-graph.c:1632 +#: commit-graph.c:2026 #, c-format msgid "unexpected duplicate commit id %s" msgstr "ๆๅค็้ๅคๆไบค ID %s" -#: commit-graph.c:1657 +#: commit-graph.c:2049 msgid "Merging commit-graph" msgstr "ๆญฃๅจๅๅนถๆไบคๅพๅฝข" -#: commit-graph.c:1844 +#: commit-graph.c:2259 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "ๆไบคๅพๆ ผๅผไธ่ฝๅๅ ฅ %d ไธชๆไบค" -#: commit-graph.c:1855 +#: commit-graph.c:2270 msgid "too many commits to write graph" msgstr "ๆไบคๅคชๅคไธ่ฝ็ปๅพ" -#: commit-graph.c:1945 +#: commit-graph.c:2363 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "ๆไบคๅพๆไปถ็ๆ ก้ช็ ้่ฏฏ๏ผๅฏ่ฝๅทฒ็ปๆๅ" -#: commit-graph.c:1955 +#: commit-graph.c:2373 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "ๆไบคๅพๅฝข็ๅฏน่ฑก ID ้กบๅบไธๆญฃ็กฎ๏ผ%s ็ถๅ %s" -#: commit-graph.c:1965 commit-graph.c:1980 +#: commit-graph.c:2383 commit-graph.c:2398 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "ๆไบคๅพๅฝขๆไธๆญฃ็กฎ็ๆๅบๅผ๏ผfanout[%d] = %u != %u" -#: commit-graph.c:1972 +#: commit-graph.c:2390 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "ๆ ๆณไปๆไบคๅพๅฝขไธญ่งฃๆๆไบค %s" -#: commit-graph.c:1989 +#: commit-graph.c:2408 msgid "Verifying commits in commit graph" msgstr "ๆญฃๅจๆ ก้ชๆไบคๅพไธญ็ๆไบค" -#: commit-graph.c:2002 +#: commit-graph.c:2423 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "ๆ ๆณไปๆไบคๅพๅฝข็ๅฏน่ฑกๅบไธญ่งฃๆๆไบค %s" -#: commit-graph.c:2009 +#: commit-graph.c:2430 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "ๆไบคๅพๅฝขไธญ็ๆไบค %s ็ๆ นๆ ๅฏน่ฑก ID ๆฏ %s != %s" -#: commit-graph.c:2019 +#: commit-graph.c:2440 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "ๆไบค %s ็ๆไบคๅพๅฝข็ถๆไบคๅ่กจๅคช้ฟไบ" -#: commit-graph.c:2028 +#: commit-graph.c:2449 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s ็ๆไบคๅพๅฝข็ถๆไบคๆฏ %s != %s" -#: commit-graph.c:2041 +#: commit-graph.c:2463 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "ๆไบค %s ็ๆไบคๅพๅฝข็ถๆไบคๅ่กจ่ฟๆฉ็ปๆญข" -#: commit-graph.c:2046 +#: commit-graph.c:2468 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "ๆไบคๅพๅฝขไธญๆไบค %s ็ไธไปฃๅทๆฏ้ถ๏ผไฝๅ ถๅฎๅฐๆน้้ถ" -#: commit-graph.c:2050 +#: commit-graph.c:2472 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "ๆไบคๅพๅฝขไธญๆไบค %s ็ไธไปฃๅท้้ถ๏ผไฝๅ ถๅฎๅฐๆนๆฏ้ถ" -#: commit-graph.c:2065 +#: commit-graph.c:2488 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "ๆไบคๅพๅฝขไธญ็ๆไบค %s ็ไธไปฃๅทๆฏ %u != %u" -#: commit-graph.c:2071 +#: commit-graph.c:2494 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "ๆไบคๅพๅฝขไธญๆไบค %s ็ๆไบคๆฅๆๆฏ %<PRIuMAX> != %<PRIuMAX>" +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "ไธ่ฝ่งฃๆ %s" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s ไธๆฏไธไธชๆไบค๏ผ" + +#: commit.c:194 +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:1172 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "ๆไบค %s ๆไธไธช้ๅฏไฟก็ๅฃฐ็งฐๆฅ่ช %s ็ GPG ็ญพๅใ" + +#: commit.c:1176 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "ๆไบค %s ๆไธไธช้่ฏฏ็ๅฃฐ็งฐๆฅ่ช %s ็ GPG ็ญพๅใ" + +#: commit.c:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "ๆไบค %s ๆฒกๆ GPG ็ญพๅใ" + +#: commit.c:1182 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "ๆไบค %s ๆไธไธชๆฅ่ช %s ็ๅฅฝ็ GPG ็ญพๅใ\n" + +#: commit.c:1436 +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" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "ๅ ๅญ่ๅฐฝ" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1767,294 +2527,289 @@ msgstr "" "\t%2$s\n" "่ฟๅฏ่ฝๆฏๅ ไธบๅพช็ฏๅ ๅซใ" -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "ๆ ๆณๆฉๅฑๅ ๅซ่ทฏๅพ '%s'" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "็ธๅฏน่ทฏๅพ็้ ็ฝฎๆไปถๅผ็จๅฟ ้กปๆฅ่ชไบๆไปถ" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "็ธๅฏน่ทฏๅพ็้ ็ฝฎๆไปถๆกไปถๅผ็จๅฟ ้กปๆฅ่ชไบๆไปถ" -#: config.c:376 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "้ฎๅๆฒกๆๅ ๅซไธไธชๅฐ่ๅ็งฐ๏ผ%s" -#: config.c:382 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "้ฎๅๆฒกๆๅ ๅซๅ้ๅ๏ผ%s" -#: config.c:406 sequencer.c:2463 +#: config.c:408 sequencer.c:2547 #, c-format msgid "invalid key: %s" msgstr "ๆ ๆ้ฎๅ๏ผ%s" -#: config.c:412 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "ๆ ๆ้ฎๅ๏ผๆๆข่ก็ฌฆ๏ผ๏ผ%s" -#: config.c:448 config.c:460 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "ไผช้ ็ฝฎๅๆฐ๏ผ%s" -#: config.c:495 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "%s ไธญๆ ผๅผ้่ฏฏ" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "ๆฐๆฎๅฏน่ฑก %2$s ไธญ้่ฏฏ็้ ็ฝฎ่ก %1$d" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "ๆไปถ %2$s ไธญ้่ฏฏ็้ ็ฝฎ่ก %1$d" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "ๆ ๅ่พๅ ฅไธญ้่ฏฏ็้ ็ฝฎ่ก %d" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ๅญๆจก็ปๆฐๆฎๅฏน่ฑก %2$s ไธญ้่ฏฏ็้ ็ฝฎ่ก %1$d" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "ๅฝไปค่ก %2$s ไธญ้่ฏฏ็้ ็ฝฎ่ก %1$d" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "ๅจ %2$s ไธญ้่ฏฏ็้ ็ฝฎ่ก %1$d" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "่ถ ๅบ่ๅด" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "ๆ ๆ็ๅไฝ" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "้ ็ฝฎๅ้ '%2$s' ็ๆฐๅญๅๅผ '%1$s' ่ฎพ็ฝฎ้่ฏฏ๏ผ%3$s" -#: config.c:998 +#: config.c:1013 #, 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 +#: config.c:1016 #, 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 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "ๆ ๅ่พๅ ฅไธญ้ ็ฝฎๅ้ '%2$s' ้่ฏฏ็ๅๅผ '%1$s'๏ผ%3$s" -#: config.c:1007 +#: config.c:1022 #, 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 +#: config.c:1025 #, 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 +#: config.c:1028 #, 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 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "ๆ ๆณๆฉๅฑ็จๆท็ฎๅฝ๏ผ'%s'" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' ็ๅผ '%1$s' ไธๆฏไธไธชๆๆ็ๆถ้ดๆณ" -#: config.c:1208 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "็ผฉๅ้ฟๅบฆ่ถ ๅบ่ๅด๏ผ%d" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "้่ฏฏ็ zlib ๅ็ผฉ็บงๅซ %d" -#: config.c:1325 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "core.commentChar ๅบ่ฏฅๆฏไธไธชๅญ็ฌฆ" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "ๆ ๆ็ๅฏน่ฑกๅๅปบๆจกๅผ๏ผ%s" -#: config.c:1430 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "%s ็ๅๅผๆ ผๅผ้่ฏฏ" -#: config.c:1456 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "%s ็ๅๅผๆ ผๅผ้่ฏฏ๏ผ%s" -#: config.c:1457 +#: config.c:1472 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "ๅฟ ้กปๆฏๅ ถไธญไนไธ๏ผnothingใmatchingใsimpleใupstream ๆ current" -#: config.c:1518 builtin/pack-objects.c:3410 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "้่ฏฏ็ๆๅ ๅ็ผฉ็บงๅซ %d" -#: config.c:1639 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "ๆ ๆณไปๆฐๆฎๅฏน่ฑก '%s' ๅ ่ฝฝ้ ็ฝฎ" -#: config.c:1642 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "ๅผ็จ '%s' ๆฒกๆๆๅไธไธชๆฐๆฎๅฏน่ฑก" -#: config.c:1659 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "ไธ่ฝ่งฃๆ้ ็ฝฎๅฏน่ฑก '%s'" -#: config.c:1689 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "่งฃๆ %s ๅคฑ่ดฅ" -#: config.c:1745 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "ๆ ๆณ่งฃๆๅฝไปค่กไธญ็้ ็ฝฎ" -#: config.c:2094 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "ๅจ่ฏปๅ้ ็ฝฎๆไปถๆถ้ๅฐๆช็ฅ้่ฏฏ" -#: config.c:2264 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "ๆ ๆ %s๏ผ'%s'" -#: config.c:2307 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "ๆช็ฅ็ core.untrackedCache ๅๅผ '%s'๏ผไฝฟ็จ้ป่ฎคๅผ 'keep'" - -#: config.c:2333 +#: config.c:2341 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange ็ๅๅผ '%d' ๅบ่ฏฅไปไบ 0 ๅ 100 ไน้ด" -#: config.c:2379 +#: config.c:2387 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "ๆ ๆณ่งฃๆๅฝไปค่ก้ ็ฝฎไธญ็ '%s'" -#: config.c:2381 +#: config.c:2389 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "ๅจๆไปถ '%2$s' ็็ฌฌ %3$d ่กๅ็ฐ้่ฏฏ็้ ็ฝฎๅ้ '%1$s'" -#: config.c:2462 +#: config.c:2470 #, c-format msgid "invalid section name '%s'" msgstr "ๆ ๆ็ๅฐ่ๅ็งฐ '%s'" -#: config.c:2494 +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "%s ๆๅคไธชๅๅผ" -#: config.c:2523 +#: config.c:2531 #, c-format msgid "failed to write new configuration file %s" msgstr "ๅๅ ฅๆฐ็้ ็ฝฎๆไปถ %s ๅคฑ่ดฅ" -#: config.c:2775 config.c:3099 +#: config.c:2783 config.c:3107 #, c-format msgid "could not lock config file %s" msgstr "ไธ่ฝ้ๅฎ้ ็ฝฎๆไปถ %s" -#: config.c:2786 +#: config.c:2794 #, c-format msgid "opening %s" msgstr "ๆๅผ %s" -#: config.c:2821 builtin/config.c:328 +#: config.c:2829 builtin/config.c:354 #, c-format msgid "invalid pattern: %s" msgstr "ๆ ๆๆจกๅผ๏ผ%s" -#: config.c:2846 +#: config.c:2854 #, c-format msgid "invalid config file %s" msgstr "ๆ ๆ็้ ็ฝฎๆไปถ %s" -#: config.c:2859 config.c:3112 +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "ๅฏน %s ่ฐ็จ fstat ๅคฑ่ดฅ" -#: config.c:2870 +#: config.c:2878 #, c-format msgid "unable to mmap '%s'" msgstr "ไธ่ฝ mmap '%s'" -#: config.c:2879 config.c:3117 +#: config.c:2887 config.c:3125 #, c-format msgid "chmod on %s failed" msgstr "ๅฏน %s ่ฐ็จ chmod ๅคฑ่ดฅ" -#: config.c:2964 config.c:3214 +#: config.c:2972 config.c:3222 #, c-format msgid "could not write config file %s" msgstr "ไธ่ฝๅๅ ฅ้ ็ฝฎๆไปถ %s" -#: config.c:2998 +#: config.c:3006 #, c-format msgid "could not set '%s' to '%s'" msgstr "ไธ่ฝ่ฎพ็ฝฎ '%s' ไธบ '%s'" -#: config.c:3000 builtin/remote.c:782 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "ไธ่ฝๅๆถ่ฎพ็ฝฎ '%s'" -#: config.c:3090 +#: config.c:3098 #, c-format msgid "invalid section name: %s" msgstr "ๆ ๆ็ๅฐ่ๅ็งฐ๏ผ%s" -#: config.c:3257 +#: config.c:3265 #, c-format msgid "missing value for '%s'" msgstr "%s ็ๅๅผ็ผบๅคฑ" @@ -2079,72 +2834,81 @@ msgstr "" msgid "server doesn't support '%s'" msgstr "ๆๅกๅจไธๆฏๆ '%s'" -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "ๆๅกๅจไธๆฏๆ็นๆง '%s'" -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" msgstr "ๅจ่ฝๅไนๅๅบไธบไธไธช flush ๅ " -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "ๅฟฝ็ฅ็ฌฌไธ่ก '%s' ไนๅ็่ฝๅๅญๆฎต" -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "ๅ่ฎฎ้่ฏฏ๏ผๆๅค็ capabilities^{}" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "ๅ่ฎฎ้่ฏฏ๏ผ้ขๆๆต ๅ ้ sha-1๏ผๅดๅพๅฐ '%s'" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "ๅฆไธ็ซฏ็ไปๅบไธ่ฝๆฏๆต ๅ ้ไปๅบ" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" msgstr "ๆ ๆๆฐๆฎๅ " -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "ๅ่ฎฎ้่ฏฏ๏ผๆๅค็ '%s'" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "ๆๅกๅจ็ปๅบๆช็ฅ็ๅฏน่ฑกๆ ผๅผ '%s'" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" msgstr "ๆ ๆ็ ls-refs ๅๅบ๏ผ%s" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" msgstr "ๅจๅผ็จๅ่กจไนๅๅบ่ฏฅๆไธไธช flush ๅ " -#: connect.c:544 +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "ๅจๅผ็จๅ่กจไนๅๅบ่ฏฅๆๅๅบ็ปๆๅ " + +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" msgstr "ไธๆฏๆ '%s' ๅ่ฎฎ" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" msgstr "ๆ ๆณไธบ socket ่ฎพ็ฝฎ SO_KEEPALIVE" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "ๆฅๆพ %s ..." -#: connect.c:639 +#: connect.c:735 #, 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 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" @@ -2153,7 +2917,7 @@ msgstr "" "ๅฎๆใ\n" "่ฟๆฅๅฐ %s๏ผ็ซฏๅฃ %s๏ผ... " -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -2163,87 +2927,87 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "ๅฎๆใ" -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "ๆ ๆณๆฅๆพ %s๏ผ%s๏ผ" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "ๆช็ฅ็ซฏๅฃ %s" -#: connect.c:845 connect.c:1171 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "ๅทฒ้ปๆญขๅฅๆช็ไธปๆบๅ '%s'" -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "ๅทฒ้ปๆญขๅฅๆช็็ซฏๅฃๅท '%s'" -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "ไธ่ฝๅฏๅจไปฃ็ %s" -#: connect.c:924 +#: connect.c:1024 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "ๆชๆๅฎ่ทฏๅพ๏ผๆง่ก 'git help pull' ๆฅ็ๆๆ็ url ่ฏญๆณ" -#: connect.c:1119 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" msgstr "ssh ๅไฝ 'simple' ไธๆฏๆ -4" -#: connect.c:1131 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" msgstr "ssh ๅไฝ 'simple' ไธๆฏๆ -6" -#: connect.c:1148 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh ๅไฝ 'simple' ไธๆฏๆ่ฎพ็ฝฎ็ซฏๅฃ" -#: connect.c:1260 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" msgstr "ๅทฒ้ปๆญขๅฅๆช็่ทฏๅพๅ '%s'" -#: connect.c:1307 +#: connect.c:1408 msgid "unable to fork" msgstr "ๆ ๆณ fork" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "ๆญฃๅจๆฃๆฅ่ฟ้ๆง" -#: connected.c:98 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "ไธ่ฝๆง่ก 'git rev-list'" -#: connected.c:118 +#: connected.c:144 msgid "failed write to rev-list" msgstr "ๅๅ ฅ rev-list ๅคฑ่ดฅ" -#: connected.c:125 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "ๅ ณ้ญ rev-list ็ๆ ๅ่พๅ ฅๅคฑ่ดฅ" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "้ๆณ็ crlf ๅจไฝ %d" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "%s ไธญ็ CRLF ๅฐ่ขซ LF ๆฟๆข" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2252,12 +3016,12 @@ msgstr "" "%s ไธญ็ CRLF ๅฐ่ขซ LF ๆฟๆขใ<\n" "ๅจๅทฅไฝๅบไธญ่ฏฅๆไปถไปไฟๆๅๆ็ๆข่ก็ฌฆใ" -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "ๆไปถ %s ไธญ็ LF ๅฐ่ขซ CRLF ๆฟๆข" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2266,17 +3030,18 @@ msgstr "" "%s ไธญ็ LF ๅฐ่ขซ CRLF ๆฟๆขใ\n" "ๅจๅทฅไฝๅบไธญ่ฏฅๆไปถไปไฟๆๅๆ็ๆข่ก็ฌฆ" -#: convert.c:279 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "ๅฆๆไฝฟ็จ %2$s ็ผ็ ๏ผ็ฆๆญขๅจ '%1$s' ไธญไฝฟ็จ BOM" -#: convert.c:286 +#: 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 ไฝไธบๅทฅไฝๅบ็ผ็ ใ" +"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 @@ -2292,117 +3057,145 @@ msgstr "" "ๆไปถ '%s' ็ผบๅคฑไธไธชๅญ่้กบๅบๆ ่ฎฐ๏ผBOM๏ผใ่ฏทไฝฟ็จ UTF-%sBE or UTF-%sLE๏ผๅๅณไบๅญ" "่ๅบ๏ผไฝไธบๅทฅไฝๅบ็ผ็ ใ" -#: convert.c:424 convert.c:495 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "ๆ ๆณๅฏน '%s' ่ฟ่กไป %s ๅฐ %s ็็ผ็ " -#: convert.c:467 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "ๅฐ'%s' ็็ผ็ ไป %s ๅฐ %s ๆฅๅ่ฝฌๆขไธไธ่ด" -#: convert.c:673 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "ไธ่ฝ fork ไปฅๆง่กๅค้จ่ฟๆปคๅจ '%s'" -#: convert.c:693 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "ไธ่ฝๅฐ่พๅ ฅไผ ้็ปๅค้จ่ฟๆปคๅจ '%s'" -#: convert.c:700 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "ๅค้จ่ฟๆปคๅจ '%s' ๅคฑ่ดฅ็ %d" -#: convert.c:735 convert.c:738 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "ไปๅค้จ่ฟๆปคๅจ '%s' ่ฏปๅๅคฑ่ดฅ" -#: convert.c:741 convert.c:796 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "ๅค้จ่ฟๆปคๅจ '%s' ๅคฑ่ดฅ" -#: convert.c:844 +#: convert.c:837 msgid "unexpected filter type" msgstr "ๆๅค็่ฟๆปค็ฑปๅ" -#: convert.c:855 +#: convert.c:848 msgid "path name too long for external filter" msgstr "ๅค้จ่ฟๆปคๅจ็่ทฏๅพๅๅคช้ฟ" -#: convert.c:929 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "ๅค้จ่ฟๆปคๅจ '%s' ไธๅๅฏ็จ๏ผไฝๅนถ้ๆๆ่ทฏๅพ้ฝๅทฒ่ฟๆปค" -#: convert.c:1228 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "true/false ไธๆฏๆๆ็ๅทฅไฝๅบ็ผ็ " -#: convert.c:1398 convert.c:1432 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s๏ผclean ่ฟๆปคๅจ '%s' ๅคฑ่ดฅ" -#: convert.c:1476 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s๏ผsmudge ่ฟๆปคๅจ %s ๅคฑ่ดฅ" -#: date.c:137 +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "่ทณ่ฟๅญๆฎๆฅ่ฏข๏ผcredential.%s" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "ๆ็ปไฝฟ็จ็ผบๅฐไธปๆบๅญๆฎต็ๅญๆฎ" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "ๆ็ปไฝฟ็จ็ผบๅฐๅ่ฎฎๅญๆฎต็ๅญๆฎ" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "URL ็ %s ็ปไปถไธญๅ ๅซๆข่ก็ฌฆ๏ผ%s" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "URL ๆฒกๆ scheme๏ผ%s" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "ไธ่ฝ่งฃๆๅญๆฎ URL๏ผ%s" + +#: date.c:138 msgid "in the future" msgstr "ๅจๅฐๆฅ" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> ็ง้ๅ" msgstr[1] "%<PRIuMAX> ็ง้ๅ" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> ๅ้ๅ" msgstr[1] "%<PRIuMAX> ๅ้ๅ" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> ๅฐๆถๅ" msgstr[1] "%<PRIuMAX> ๅฐๆถๅ" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> ๅคฉๅ" msgstr[1] "%<PRIuMAX> ๅคฉๅ" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> ๅจๅ" msgstr[1] "%<PRIuMAX> ๅจๅ" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> ไธชๆๅ" msgstr[1] "%<PRIuMAX> ไธชๆๅ" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2410,14 +3203,14 @@ msgstr[0] "%<PRIuMAX> ๅนด" msgstr[1] "%<PRIuMAX> ๅนด" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s %<PRIuMAX> ไธชๆๅ" msgstr[1] "%s %<PRIuMAX> ไธชๆๅ" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2448,15 +3241,6 @@ msgstr "ๆฅ่ช config ็ๆฐๆฎๅฒๆญฃๅ่กจ่พพๅผๆๅคชๅค็ๆ่ท็ป๏ผๆๅค 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:544 -msgid "Performing inexact rename detection" -msgstr "ๆญฃๅจ่ฟ่ก้็ฒพ็กฎ็้ๅฝๅๆขๆต" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<้้กน>] <่ทฏๅพ> <่ทฏๅพ>" @@ -2465,21 +3249,21 @@ msgstr "git diff --no-index [<้้กน>] <่ทฏๅพ> <่ทฏๅพ>" msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" -msgstr "ไธๆฏไธไธช git ไปๅบใไฝฟ็จ --no-index ๆฏ่พๅทฅไฝๅบไนๅค็ไธคไธช่ทฏๅพ" +msgstr "ไธๆฏ git ไปๅบใไฝฟ็จ --no-index ๆฏ่พๅทฅไฝๅบไนๅค็ไธคไธช่ทฏๅพ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " ๆ ๆณ่งฃๆ dirstat ๆชๆญข๏ผcut-off๏ผ็พๅๆฏ '%s'\n" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " ๆช็ฅ็ dirstat ๅๆฐ '%s'\n" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2487,7 +3271,7 @@ msgstr "" "็งปๅจ็้ข่ฒ่ฎพ็ฝฎๅฟ ้กปๆฏ 'no'ใ'default'ใ'blocks'ใ'zebra'ใ'dimmed_zebra' ๆ " "'plain'" -#: diff.c:324 +#: diff.c:325 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -2496,18 +3280,18 @@ msgstr "" "ๆช็ฅ็ color-moved-ws ๆจกๅผ '%s'๏ผๅฏ่ฝ็ๅๅผๆ 'ignore-space-change'ใ'ignore-" "space-at-eol'ใ'ignore-all-space'ใ'allow-indentation-change'" -#: diff.c:332 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "color-moved-ws๏ผallow-indentation-change ไธ่ฝไธๅ ถๅฎ็ฉบ็ฝๅญ็ฌฆๆจกๅผๅ ฑ็จ" -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "้ ็ฝฎๅ้ 'diff.submodule' ๆช็ฅ็ๅๅผ๏ผ'%s'" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2516,35 +3300,35 @@ msgstr "" "ๅ็ฐ้ ็ฝฎๅ้ 'diff.dirstat' ไธญ็้่ฏฏ๏ผ\n" "%s" -#: diff.c:4215 +#: diff.c:4269 #, c-format msgid "external diff died, stopping at %s" msgstr "ๅค้จ diff ้ๅบ๏ผๅๆญขๅจ %s" -#: diff.c:4560 +#: diff.c:4618 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-onlyใ--name-statusใ--check ๅ -s ๆฏไบๆฅ็" -#: diff.c:4563 +#: diff.c:4621 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-Gใ-S ๅ --find-object ๆฏไบๆฅ็" -#: diff.c:4641 +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "--follow ๆ็กฎ่ฆๆฑๅช่ทไธไธช่ทฏๅพ่งๆ ผ" -#: diff.c:4689 +#: diff.c:4747 #, c-format msgid "invalid --stat value: %s" msgstr "ๆ ๆ็ --stat ๅผ๏ผ%s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s ๆๆไธไธชๆฐๅญๅผ" -#: diff.c:4726 +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2553,195 +3337,195 @@ msgstr "" "ๆ ๆณ่งฃๆ --dirstat/-X ้้กน็ๅๆฐ๏ผ\n" "%s" -#: diff.c:4811 +#: diff.c:4869 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s ไธญๆช็ฅ็ๅๆด็ฑป '%1$c'" -#: diff.c:4835 +#: diff.c:4893 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s ไนๅๆช็ฅ็ๅผ" -#: diff.c:4849 +#: diff.c:4907 #, c-format msgid "unable to resolve '%s'" msgstr "ไธ่ฝ่งฃๆ '%s'" -#: diff.c:4899 diff.c:4905 +#: diff.c:4957 diff.c:4963 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s ๆๆ <n>/<m> ๆ ผๅผ" -#: diff.c:4917 +#: diff.c:4975 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s ๆๆไธไธชๅญ็ฌฆ๏ผๅพๅฐ '%s'" -#: diff.c:4938 +#: diff.c:4996 #, c-format msgid "bad --color-moved argument: %s" msgstr "ๅ็ --color-moved ๅๆฐ๏ผ%s" -#: diff.c:4957 +#: diff.c:5015 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws ไธญ็ๆ ๆๆจกๅผ '%s' " -#: diff.c:4997 +#: diff.c:5055 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm ้้กนๆ \"myers\"ใ\"minimal\"ใ\"patience\" ๅ \"histogram\"" -#: diff.c:5033 diff.c:5053 +#: diff.c:5091 diff.c:5111 #, c-format msgid "invalid argument to %s" msgstr "%s ็ๅๆฐๆ ๆ" -#: diff.c:5191 +#: diff.c:5248 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "ๆ ๆณ่งฃๆ --submodule ้้กน็ๅๆฐ๏ผ'%s'" -#: diff.c:5247 +#: diff.c:5304 #, c-format msgid "bad --word-diff argument: %s" msgstr "ๅ็ --word-diff ๅๆฐ๏ผ%s" -#: diff.c:5270 +#: diff.c:5327 msgid "Diff output format options" msgstr "ๅทฎๅผ่พๅบๆ ผๅผๅ้้กน" -#: diff.c:5272 diff.c:5278 +#: diff.c:5329 diff.c:5335 msgid "generate patch" msgstr "็ๆ่กฅไธ" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5332 builtin/log.c:176 msgid "suppress diff output" msgstr "ไธๆพ็คบๅทฎๅผ่พๅบ" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5337 diff.c:5451 diff.c:5458 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5338 diff.c:5341 msgid "generate diffs with <n> lines context" msgstr "็ๆๅซ <n> ่กไธไธๆ็ๅทฎๅผ" -#: diff.c:5286 +#: diff.c:5343 msgid "generate the diff in raw format" msgstr "็ๆๅๅงๆ ผๅผ็ๅทฎๅผ" -#: diff.c:5289 +#: diff.c:5346 msgid "synonym for '-p --raw'" msgstr "ๅ '-p --raw' ๅไน" -#: diff.c:5293 +#: diff.c:5350 msgid "synonym for '-p --stat'" msgstr "ๅ '-p --stat' ๅไน" -#: diff.c:5297 +#: diff.c:5354 msgid "machine friendly --stat" msgstr "ๆบๅจๅๅฅฝ็ --stat" -#: diff.c:5300 +#: diff.c:5357 msgid "output only the last line of --stat" msgstr "ๅช่พๅบ --stat ็ๆๅไธ่ก" -#: diff.c:5302 diff.c:5310 +#: diff.c:5359 diff.c:5367 msgid "<param1,param2>..." msgstr "<ๅๆฐ1,ๅๆฐ2>..." -#: diff.c:5303 +#: diff.c:5360 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "่พๅบๆฏไธชๅญ็ฎๅฝ็ธๅฏนๅๆด็ๅๅธ" -#: diff.c:5307 +#: diff.c:5364 msgid "synonym for --dirstat=cumulative" msgstr "ๅ --dirstat=cumulative ๅไน" -#: diff.c:5311 +#: diff.c:5368 msgid "synonym for --dirstat=files,param1,param2..." msgstr "ๆฏ --dirstat=files,param1,param2... ็ๅไน่ฏ" -#: diff.c:5315 +#: diff.c:5372 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "ๅฆๆๅๆดไธญๅผๅ ฅๅฒ็ชๅฎ็็ฌฆๆ็ฉบ็ฝ้่ฏฏ๏ผ็ปๅบ่ญฆๅ" -#: diff.c:5318 +#: diff.c:5375 msgid "condensed summary such as creations, renames and mode changes" msgstr "็ฒพ็ฎๆ่ฆ๏ผไพๅฆๅๅปบใ้ๅฝๅๅๆจกๅผๅๆด" -#: diff.c:5321 +#: diff.c:5378 msgid "show only names of changed files" msgstr "ๅชๆพ็คบๅๆดๆไปถ็ๆไปถๅ" -#: diff.c:5324 +#: diff.c:5381 msgid "show only names and status of changed files" msgstr "ๅชๆพ็คบๅๆดๆไปถ็ๆไปถๅๅ็ถๆ" -#: diff.c:5326 +#: diff.c:5383 msgid "<width>[,<name-width>[,<count>]]" msgstr "<ๅฎฝๅบฆ>[,<ๆไปถๅๅฎฝๅบฆ>[,<ๆฌกๆฐ>]]" -#: diff.c:5327 +#: diff.c:5384 msgid "generate diffstat" msgstr "็ๆๅทฎๅผ็ป่ฎก๏ผdiffstat๏ผ" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5386 diff.c:5389 diff.c:5392 msgid "<width>" msgstr "<ๅฎฝๅบฆ>" -#: diff.c:5330 +#: diff.c:5387 msgid "generate diffstat with a given width" msgstr "ไฝฟ็จ็ปๅฎ็้ฟๅบฆ็ๆๅทฎๅผ็ป่ฎก" -#: diff.c:5333 +#: diff.c:5390 msgid "generate diffstat with a given name width" msgstr "ไฝฟ็จ็ปๅฎ็ๆไปถๅ้ฟๅบฆ็ๆๅทฎๅผ็ป่ฎก" -#: diff.c:5336 +#: diff.c:5393 msgid "generate diffstat with a given graph width" msgstr "ไฝฟ็จ็ปๅฎ็ๅพๅฝข้ฟๅบฆ็ๆๅทฎๅผ็ป่ฎก" -#: diff.c:5338 +#: diff.c:5395 msgid "<count>" msgstr "<ๆฌกๆฐ>" -#: diff.c:5339 +#: diff.c:5396 msgid "generate diffstat with limited lines" msgstr "็ๆๆ้่กๆฐ็ๅทฎๅผ็ป่ฎก" -#: diff.c:5342 +#: diff.c:5399 msgid "generate compact summary in diffstat" msgstr "็ๆๅทฎๅผ็ป่ฎก็็ฎๆดๆ่ฆ" -#: diff.c:5345 +#: diff.c:5402 msgid "output a binary diff that can be applied" msgstr "่พๅบไธไธชๅฏไปฅๅบ็จ็ไบ่ฟๅถๅทฎๅผ" -#: diff.c:5348 +#: diff.c:5405 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "ๅจ \"index\" ่กๆพ็คบๅฎๆด็ๅๅๅฏน่ฑกๅ็งฐ" -#: diff.c:5350 +#: diff.c:5407 msgid "show colored diff" msgstr "ๆพ็คบๅธฆ้ข่ฒ็ๅทฎๅผ" -#: diff.c:5351 +#: diff.c:5408 msgid "<kind>" msgstr "<็ฑปๅ>" -#: diff.c:5352 +#: diff.c:5409 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "ๅฏนไบๅทฎๅผไธญ็ไธไธๆใๆง็ๅๆฐ็่ก๏ผๅ ไบฎๆพ็คบ้่ฏฏ็็ฉบ็ฝๅญ็ฌฆ" -#: diff.c:5355 +#: diff.c:5412 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2749,348 +3533,376 @@ msgstr "" "ๅจ --raw ๆ่ --numstat ไธญ๏ผไธๅฏน่ทฏๅพๅญ็ฌฆ่ฝฌ็ ๅนถไฝฟ็จ NUL ๅญ็ฌฆๅไธบ่พๅบๅญๆฎต็ๅ้" "็ฌฆ" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 msgid "<prefix>" msgstr "<ๅ็ผ>" -#: diff.c:5359 +#: diff.c:5416 msgid "show the given source prefix instead of \"a/\"" msgstr "ๆพ็คบ็ปๅฎ็ๆบๅ็ผๅไปฃ \"a/\"" -#: diff.c:5362 +#: diff.c:5419 msgid "show the given destination prefix instead of \"b/\"" msgstr "ๆพ็คบ็ปๅฎ็็ฎๆ ๅ็ผๅไปฃ \"b/\"" -#: diff.c:5365 +#: diff.c:5422 msgid "prepend an additional prefix to every line of output" msgstr "่พๅบ็ๆฏไธ่ก้ๅ ๅ็ผ" -#: diff.c:5368 +#: diff.c:5425 msgid "do not show any source or destination prefix" msgstr "ไธๆพ็คบไปปไฝๆบๅ็ฎๆ ๅ็ผ" -#: diff.c:5371 +#: diff.c:5428 msgid "show context between diff hunks up to the specified number of lines" msgstr "ๆพ็คบๆๅฎ่กๆฐ็ๅทฎๅผๅ้ด็ไธไธๆ" -#: diff.c:5375 diff.c:5380 diff.c:5385 +#: diff.c:5432 diff.c:5437 diff.c:5442 msgid "<char>" msgstr "<ๅญ็ฌฆ>" -#: diff.c:5376 +#: diff.c:5433 msgid "specify the character to indicate a new line instead of '+'" msgstr "ๆๅฎไธไธชๅญ็ฌฆๅไปฃ '+' ๆฅ่กจ็คบๆฐ็ไธ่ก" -#: diff.c:5381 +#: diff.c:5438 msgid "specify the character to indicate an old line instead of '-'" msgstr "ๆๅฎไธไธชๅญ็ฌฆๅไปฃ '-' ๆฅ่กจ็คบๆง็ไธ่ก" -#: diff.c:5386 +#: diff.c:5443 msgid "specify the character to indicate a context instead of ' '" msgstr "ๆๅฎไธไธชๅญ็ฌฆๅไปฃ ' ' ๆฅ่กจ็คบไธ่กไธไธๆ" -#: diff.c:5389 +#: diff.c:5446 msgid "Diff rename options" msgstr "ๅทฎๅผ้ๅฝๅ้้กน" -#: diff.c:5390 +#: diff.c:5447 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5448 msgid "break complete rewrite changes into pairs of delete and create" msgstr "ๅฐๅฎๅ จ้ๅ็ๅๆดๆ็ ดไธบๆๅฏน็ๅ ้คๅๅๅปบ" -#: diff.c:5395 +#: diff.c:5452 msgid "detect renames" msgstr "ๆฃๆต้ๅฝๅ" -#: diff.c:5399 +#: diff.c:5456 msgid "omit the preimage for deletes" msgstr "็็ฅๅ ้คๆไฝ็ๅทฎๅผ่พๅบ" -#: diff.c:5402 +#: diff.c:5459 msgid "detect copies" msgstr "ๆฃๆตๆท่ด" -#: diff.c:5406 +#: diff.c:5463 msgid "use unmodified files as source to find copies" msgstr "ไฝฟ็จๆชไฟฎๆน็ๆไปถๅไธบๅ็ฐๆท่ด็ๆบ" -#: diff.c:5408 +#: diff.c:5465 msgid "disable rename detection" msgstr "็ฆ็จ้ๅฝๅๆขๆต" -#: diff.c:5411 +#: diff.c:5468 msgid "use empty blobs as rename source" msgstr "ไฝฟ็จ็ฉบ็ๆฐๆฎๅฏน่ฑกๅไธบ้ๅฝๅ็ๆบ" -#: diff.c:5413 +#: diff.c:5470 msgid "continue listing the history of a file beyond renames" msgstr "็ปง็ปญๅๅบๆไปถ้ๅฝๅไปฅๅค็ๅๅฒ่ฎฐๅฝ" -#: diff.c:5416 +#: diff.c:5473 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "ๅฆๆ้ๅฝๅ/ๆท่ด็ฎๆ ่ถ ่ฟ็ปๅฎ็้ๅถ๏ผ็ฆๆญข้ๅฝๅ/ๆท่ดๆฃๆต" -#: diff.c:5418 +#: diff.c:5475 msgid "Diff algorithm options" msgstr "ๅทฎๅผ็ฎๆณ้้กน" -#: diff.c:5420 +#: diff.c:5477 msgid "produce the smallest possible diff" msgstr "็ๆๅฐฝๅฏ่ฝๅฐ็ๅทฎๅผ" -#: diff.c:5423 +#: diff.c:5480 msgid "ignore whitespace when comparing lines" msgstr "่กๆฏ่พๆถๅฟฝ็ฅ็ฉบ็ฝๅญ็ฌฆ" -#: diff.c:5426 +#: diff.c:5483 msgid "ignore changes in amount of whitespace" msgstr "ๅฟฝ็ฅ็ฉบ็ฝๅญ็ฌฆ็ๅๆด" -#: diff.c:5429 +#: diff.c:5486 msgid "ignore changes in whitespace at EOL" msgstr "ๅฟฝ็ฅ่กๅฐพ็็ฉบ็ฝๅญ็ฌฆๅๆด" -#: diff.c:5432 +#: diff.c:5489 msgid "ignore carrier-return at the end of line" msgstr "ๅฟฝ็ฅ่กๅฐพ็ๅ่ฝฆ็ฌฆ๏ผCR๏ผ" -#: diff.c:5435 +#: diff.c:5492 msgid "ignore changes whose lines are all blank" msgstr "ๅฟฝ็ฅๆด่ก้ฝๆฏ็ฉบ็ฝ็ๅๆด" -#: diff.c:5438 +#: diff.c:5495 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "ๅฏๅๅผ่ฝฌๆขๅทฎๅผ่พน็ไปฅไพฟ้ ่ฏป" -#: diff.c:5441 +#: diff.c:5498 msgid "generate diff using the \"patience diff\" algorithm" msgstr "ไฝฟ็จ \"patience diff\" ็ฎๆณ็ๆๅทฎๅผ" -#: diff.c:5445 +#: diff.c:5502 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "ไฝฟ็จ \"histogram diff\" ็ฎๆณ็ๆๅทฎๅผ" -#: diff.c:5447 +#: diff.c:5504 msgid "<algorithm>" msgstr "<็ฎๆณ>" -#: diff.c:5448 +#: diff.c:5505 msgid "choose a diff algorithm" msgstr "้ๆฉไธไธชๅทฎๅผ็ฎๆณ" -#: diff.c:5450 +#: diff.c:5507 msgid "<text>" msgstr "<ๆๆฌ>" -#: diff.c:5451 +#: diff.c:5508 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "ไฝฟ็จ \"anchored diff\" ็ฎๆณ็ๆๅทฎๅผ" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5510 diff.c:5519 diff.c:5522 msgid "<mode>" msgstr "<ๆจกๅผ>" -#: diff.c:5454 +#: diff.c:5511 msgid "show word diff, using <mode> to delimit changed words" msgstr "ๆพ็คบๅ่ฏๅทฎๅผ๏ผไฝฟ็จ <ๆจกๅผ> ๅ้ๅๆด็ๅ่ฏ" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5513 diff.c:5516 diff.c:5561 msgid "<regex>" msgstr "<ๆญฃๅ>" -#: diff.c:5457 +#: diff.c:5514 msgid "use <regex> to decide what a word is" msgstr "ไฝฟ็จ <ๆญฃๅ่กจ่พพๅผ> ็กฎๅฎไฝไธบไธไธช่ฏ" -#: diff.c:5460 +#: diff.c:5517 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "็ธๅฝไบ --word-diff=color --word-diff-regex=<ๆญฃๅ>" -#: diff.c:5463 +#: diff.c:5520 msgid "moved lines of code are colored differently" msgstr "็งปๅจ็ไปฃ็ ่ก็จไธๅๆนๅผ็่ฒ" -#: diff.c:5466 +#: diff.c:5523 msgid "how white spaces are ignored in --color-moved" msgstr "ๅจ --color-moved ไธๅฆไฝๅฟฝ็ฅ็ฉบ็ฝๅญ็ฌฆ" -#: diff.c:5469 +#: diff.c:5526 msgid "Other diff options" msgstr "ๅ ถๅฎๅทฎๅผ้้กน" -#: diff.c:5471 +#: diff.c:5528 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "ๅฝไปๅญ็ฎๅฝ่ฟ่ก๏ผๆ้ค็ฎๅฝไนๅค็ๅๆดๅนถๆพ็คบ็ธๅฏน่ทฏๅพ" -#: diff.c:5475 +#: diff.c:5532 msgid "treat all files as text" msgstr "ๆๆๆๆไปถๅฝๅๆๆฌๅค็" -#: diff.c:5477 +#: diff.c:5534 msgid "swap two inputs, reverse the diff" msgstr "ไบคๆขไธคไธช่พๅ ฅ๏ผๅ่ฝฌๅทฎๅผ" -#: diff.c:5479 +#: diff.c:5536 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "ๆๅทฎๅผๆถ้ๅบ็ ไธบ 1๏ผๅฆๅไธบ 0" -#: diff.c:5481 +#: diff.c:5538 msgid "disable all output of the program" msgstr "็ฆ็จๆฌ็จๅบ็ๆๆ่พๅบ" -#: diff.c:5483 +#: diff.c:5540 msgid "allow an external diff helper to be executed" msgstr "ๅ ่ฎธๆง่กไธไธชๅค็ฝฎ็ๅทฎๅผๅฉๆ" -#: diff.c:5485 +#: diff.c:5542 msgid "run external text conversion filters when comparing binary files" msgstr "ๅฝๆฏ่พไบ่ฟๅถๆไปถๆถ๏ผ่ฟ่กๅค้จ็ๆๆฌ่ฝฌๆข่ฟๆปคๅจ" -#: diff.c:5487 +#: diff.c:5544 msgid "<when>" msgstr "<ไฝๆถ>" -#: diff.c:5488 +#: diff.c:5545 msgid "ignore changes to submodules in the diff generation" msgstr "ๅจ็ๆๅทฎๅผๆถ๏ผๅฟฝ็ฅๅญๆจก็ป็ๆดๆน" -#: diff.c:5491 +#: diff.c:5548 msgid "<format>" msgstr "<ๆ ผๅผ>" -#: diff.c:5492 +#: diff.c:5549 msgid "specify how differences in submodules are shown" msgstr "ๆๅฎๅญๆจก็ป็ๅทฎๅผๅฆไฝๆพ็คบ" -#: diff.c:5496 +#: diff.c:5553 msgid "hide 'git add -N' entries from the index" msgstr "้่็ดขๅผไธญ 'git add -N' ๆก็ฎ" -#: diff.c:5499 +#: diff.c:5556 msgid "treat 'git add -N' entries as real in the index" msgstr "ๅฐ็ดขๅผไธญ 'git add -N' ๆก็ฎๅฝๅ็ๅฎ็" -#: diff.c:5501 +#: diff.c:5558 msgid "<string>" msgstr "<ๅญ็ฌฆไธฒ>" -#: diff.c:5502 +#: diff.c:5559 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "ๆฅๆพๆนๅไบๆๅฎๅญ็ฌฆไธฒๅบ็ฐๆฌกๆฐ็ๅทฎๅผ" -#: diff.c:5505 +#: diff.c:5562 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "ๆฅๆพๆนๅๆๅฎๆญฃๅๅน้ ๅบ็ฐๆฌกๆฐ็ๅทฎๅผ" -#: diff.c:5508 +#: diff.c:5565 msgid "show all changes in the changeset with -S or -G" msgstr "ๆพ็คบไฝฟ็จ -S ๆ -G ็ๅๆด้็ๆๆๅๆด" -#: diff.c:5511 +#: diff.c:5568 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "ๅฐ -S ็ <string> ๅฝๅๆฉๅฑ็ POSIX ๆญฃๅ่กจ่พพๅผ" -#: diff.c:5514 +#: diff.c:5571 msgid "control the order in which files appear in the output" msgstr "ๆงๅถ่พๅบไธญ็ๆไปถๆพ็คบ้กบๅบ" -#: diff.c:5515 +#: diff.c:5572 msgid "<object-id>" msgstr "<ๅฏน่ฑก ID>" -#: diff.c:5516 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "ๆฅๆพๆนๅๆๅฎๅฏน่ฑกๅบ็ฐๆฌกๆฐ็ๅทฎๅผ" -#: diff.c:5518 +#: diff.c:5575 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5576 msgid "select files by diff type" msgstr "้่ฟๅทฎๅผ็ฑปๅ้ๆฉๆไปถ" -#: diff.c:5521 +#: diff.c:5578 msgid "<file>" msgstr "<ๆไปถ>" -#: diff.c:5522 +#: diff.c:5579 msgid "Output to a specific file" msgstr "่พๅบๅฐไธไธชๆๅฎ็ๆไปถ" -#: diff.c:6177 +#: diff.c:6236 msgid "inexact rename detection was skipped due to too many files." msgstr "ๅ ไธบๆไปถๅคชๅค๏ผ็ฅ่ฟไธไธฅๆ ผ็้ๅฝๅๆฃๆฅใ" -#: diff.c:6180 +#: diff.c:6239 msgid "only found copies from modified paths due to too many files." msgstr "ๅ ไธบๆไปถๅคชๅค๏ผๅชๅจไฟฎๆน็่ทฏๅพไธญๆฅๆพๆท่ดใ" -#: diff.c:6183 +#: diff.c:6242 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "ๆจๅฏ่ฝๆณ่ฆๅฐๅ้ %s ่ฎพ็ฝฎไธบ่ณๅฐ %d ๅนถๅๆฌกๆง่กๆญคๅฝไปคใ" -#: dir.c:537 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "่ฏปๅๆๅบๆไปถ '%s' ๅคฑ่ดฅ" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "ๆญฃๅจ่ฟ่ก้็ฒพ็กฎ็้ๅฝๅๆขๆต" + +#: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "่ทฏๅพ่งๆ ผ '%s' ๆชๅน้ ไปปไฝ git ๅทฒ็ฅๆไปถ" -#: dir.c:926 +#: dir.c:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "ๆช่ฏๅซ็ๆจกๅผ๏ผ'%s'" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "ๆช่ฏๅซ็ๅๅๆจกๅผ๏ผ'%s'" + +#: dir.c:809 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "ๆจ็ sparse-checkout ๆไปถๅฏ่ฝๆ้ฎ้ข๏ผ้ๅค็ๆจกๅผ '%s'" + +#: dir.c:819 +msgid "disabling cone pattern matching" +msgstr "็ฆๆญข cone ๆจกๅผๅน้ " + +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "ไธ่ฝๅฐ %s ็จไฝๆ้คๆไปถ" -#: dir.c:1843 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "ไธ่ฝๆๅผ็ฎๅฝ '%s'" -#: dir.c:2085 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "ๆ ๆณ่ทๅพๅ ๆ ธๅ็งฐๅไฟกๆฏ" -#: dir.c:2209 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "็ผๅญๆช่ท่ธชๆไปถๅจๆฌ็ณป็ปๆไฝ็ฝฎไธญ่ขซ็ฆ็จ" -#: dir.c:3013 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "ไปๅบ %s ไธญ็็ดขๅผๆไปถๆๅ" -#: dir.c:3058 dir.c:3063 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "ไธ่ฝไธบ %s ๅๅปบ็ฎๅฝ" -#: dir.c:3092 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "ไธ่ฝไป '%s' ่ฟ็งป git ็ฎๅฝๅฐ '%s'" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "ๆ็คบ๏ผ็ญๅพ ๆจ็็ผ่พๅจๅ ณ้ญๆไปถ...%c" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "่ฟๆปคๅ ๅฎน" -#: entry.c:476 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "ไธ่ฝๅฏนๆไปถ '%s' ่ฐ็จ stat" @@ -3100,7 +3912,7 @@ msgstr "ไธ่ฝๅฏนๆไปถ '%s' ่ฐ็จ stat" msgid "bad git namespace path \"%s\"" msgstr "้่ฏฏ็ git ๅๅญ็ฉบ้ด่ทฏๅพ \"%s\"" -#: environment.c:332 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "ไธ่ฝ่ฎพ็ฝฎ GIT_DIR ไธบ '%s'" @@ -3110,265 +3922,287 @@ msgstr "ไธ่ฝ่ฎพ็ฝฎ GIT_DIR ไธบ '%s'" msgid "too many args to run %s" msgstr "ๆง่ก %s ็ๅๆฐๅคชๅค" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "่ฟ็จๆช่ฎพ็ฝฎ URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack๏ผๅบไธบ shallow ๅ่กจ" -#: fetch-pack.c:154 +#: fetch-pack.c:179 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack๏ผๅจๆต ๅ ้ๅ่กจไนๅๆๆไธไธช flush ๅ " -#: fetch-pack.c:165 +#: fetch-pack.c:190 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack๏ผๆๆ ACK/NAK๏ผๅดๅพๅฐ flush ๅ " -#: fetch-pack.c:185 +#: fetch-pack.c:210 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack๏ผๅบไธบ ACK/NAK๏ผๅดๅพๅฐ '%s'" -#: fetch-pack.c:196 +#: fetch-pack.c:221 msgid "unable to write to remote" msgstr "ๆ ๆณๅๅฐ่ฟ็จ" -#: fetch-pack.c:258 +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc ้่ฆ multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "ๆ ๆ็ shallow ไฟกๆฏ๏ผ%s" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "ๆ ๆ็ unshallow ไฟกๆฏ๏ผ%s" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "ๅฏน่ฑกๆชๆพๅฐ๏ผ%s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "ๅฏน่ฑกไธญๅบ้๏ผ%s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "ๆชๅ็ฐ shallow๏ผ%s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "ๅบไธบ shallow/unshallow๏ผๅดๅพๅฐ %s" -#: fetch-pack.c:417 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "ๅพๅฐ %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:448 #, c-format msgid "invalid commit %s" msgstr "ๆ ๆๆไบค %s" -#: fetch-pack.c:465 +#: fetch-pack.c:479 msgid "giving up" msgstr "ๆพๅผ" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:492 progress.c:339 msgid "done" msgstr "ๅฎๆ" -#: fetch-pack.c:489 +#: fetch-pack.c:504 #, c-format msgid "got %s (%d) %s" msgstr "ๅพๅฐ %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:540 #, c-format msgid "Marking %s as complete" msgstr "ๆ ่ฎฐ %s ไธบๅฎๆ" -#: fetch-pack.c:744 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "ๅทฒ็ปๆ %s๏ผ%s๏ผ" -#: fetch-pack.c:783 +#: fetch-pack.c:824 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack๏ผๆ ๆณๆดพ็ sideband ๅค่ทฏ่พๅบ" -#: fetch-pack.c:791 +#: fetch-pack.c:832 msgid "protocol error: bad pack header" msgstr "ๅ่ฎฎ้่ฏฏ๏ผๅ็ๅ ๅคด" -#: fetch-pack.c:859 +#: fetch-pack.c:916 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack๏ผๆ ๆณๆดพ็่ฟ็จ %s" -#: fetch-pack.c:875 +#: fetch-pack.c:933 #, c-format msgid "%s failed" msgstr "%s ๅคฑ่ดฅ" -#: fetch-pack.c:877 +#: fetch-pack.c:935 msgid "error in sideband demultiplexer" msgstr "sideband ๅค่ทฏ่พๅบๅบ้" -#: fetch-pack.c:908 +#: fetch-pack.c:978 #, c-format msgid "Server version is %.*s" msgstr "ๆๅกๅจ็ๆฌ %.*s" -#: 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 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 #, c-format msgid "Server supports %s" msgstr "ๆๅกๅจๆฏๆ %s" -#: fetch-pack.c:915 +#: fetch-pack.c:985 msgid "Server does not support shallow clients" msgstr "ๆๅกๅจไธๆฏๆ shalllow ๅฎขๆท็ซฏ" -#: fetch-pack.c:975 +#: fetch-pack.c:1045 msgid "Server does not support --shallow-since" msgstr "ๆๅกๅจไธๆฏๆ --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:1050 msgid "Server does not support --shallow-exclude" msgstr "ๆๅกๅจไธๆฏๆ --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "ๆๅกๅจไธๆฏๆ --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1056 +msgid "Server does not support this repository's object format" +msgstr "ๆๅกๅจไธๆฏๆ่ฟไธชไปๅบ็ๅฏน่ฑกๆ ผๅผ" + +#: fetch-pack.c:1069 msgid "no common commits" msgstr "ๆฒกๆๅ ฑๅ็ๆไบค" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1081 fetch-pack.c:1619 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack๏ผ่ทๅๅคฑ่ดฅใ" -#: fetch-pack.c:1151 +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "ไธๅน้ ็็ฎๆณ๏ผๅฎขๆท็ซฏ %s๏ผๆๅก็ซฏ %s" + +#: fetch-pack.c:1209 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "ๆๅกๅจไธๆฏๆ็ฎๆณ '%s'" + +#: fetch-pack.c:1229 msgid "Server does not support shallow requests" msgstr "ๆๅกๅจไธๆฏๆ shalllow ่ฏทๆฑ" -#: fetch-pack.c:1157 +#: fetch-pack.c:1236 msgid "Server supports filter" msgstr "ๆๅกๅจๆฏๆ filter" -#: fetch-pack.c:1184 +#: fetch-pack.c:1275 msgid "unable to write request to remote" msgstr "ๆ ๆณๅฐ่ฏทๆฑๅๅฐ่ฟ็จ" -#: fetch-pack.c:1202 +#: fetch-pack.c:1293 #, c-format msgid "error reading section header '%s'" msgstr "่ฏปๅ่ๆ ้ข '%s' ๅบ้" -#: fetch-pack.c:1208 +#: fetch-pack.c:1299 #, c-format msgid "expected '%s', received '%s'" msgstr "้ขๆ '%s'๏ผๅพๅฐ '%s'" -#: fetch-pack.c:1247 +#: fetch-pack.c:1360 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ๆๅค็็กฎ่ฎค่ก๏ผ'%s'" -#: fetch-pack.c:1252 +#: fetch-pack.c:1365 #, c-format msgid "error processing acks: %d" msgstr "ๅค็ ack ๅบ้๏ผ%d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1375 msgid "expected packfile to be sent after 'ready'" msgstr "้ขๆๅจ 'ready' ไนๅๅ้ packfile" -#: fetch-pack.c:1264 +#: fetch-pack.c:1377 msgid "expected no other sections to be sent after no 'ready'" msgstr "ๅจๆฒกๆ 'ready' ไธๅบ่ฏฅๅ้ๅ ถๅฎๅฐ่" -#: fetch-pack.c:1306 +#: fetch-pack.c:1419 #, c-format msgid "error processing shallow info: %d" msgstr "ๅค็ๆต ๅ ้ไฟกๆฏๅบ้๏ผ%d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1466 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "้ขๆ wanted-ref๏ผๅพๅฐ '%s'" -#: fetch-pack.c:1358 +#: fetch-pack.c:1471 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "ๆๅค็ wanted-ref๏ผ'%s'" -#: fetch-pack.c:1363 +#: fetch-pack.c:1476 #, c-format msgid "error processing wanted refs: %d" msgstr "ๅค็่ฆ่ทๅ็ๅผ็จๅบ้๏ผ%d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1506 +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack๏ผ้ขๆๅๅบ็ปๆๅ " + +#: fetch-pack.c:1887 msgid "no matching remote head" msgstr "ๆฒกๆๅน้ ็่ฟ็จๅๆฏ" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1910 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "่ฟ็จๆฒกๆๅ้ๆๆๅฟ ้็ๅฏน่ฑก" -#: fetch-pack.c:1739 +#: fetch-pack.c:1937 #, c-format msgid "no such remote ref %s" msgstr "ๆฒกๆ่ฟๆ ท็่ฟ็จๅผ็จ %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1940 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "ๆๅกๅจไธๅ ่ฎธ่ฏทๆฑๆชๅ ฌๅผ็ๅฏน่ฑก %s" -#: gpg-interface.c:321 -msgid "gpg failed to sign the data" -msgstr "gpg ๆ ๆณไธบๆฐๆฎ็ญพๅ" - -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "ไธ่ฝๅๅปบไธดๆถๆไปถ" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "ๆ ๆณๅฐๅ็ฆปๅผ็ญพๅๅๅ ฅ '%s'" -#: graph.c:97 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg ๆฐๆฎ็ญพๅๅคฑ่ดฅ" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ๅฟฝ็ฅ log.graphColors ไธญๆ ๆ็้ข่ฒ '%.*s'" -#: grep.c:2117 +#: 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:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "ๅฏน '%s' ่ฐ็จ stat ๅคฑ่ดฅ" -#: grep.c:2145 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "'%s'๏ผ่ฏปๅไธๅฎๆด" @@ -3418,48 +4252,48 @@ msgid "Low-level Commands / Interrogators" msgstr "ไฝ็บงๅฝไปค/่ฏข้ฎ่ " #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "ไฝ็บงๅฝไปค/ๅๆญฅไปๅบ" #: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "ไฝ็บงๅฝไปค/ๅ ้จๅฉๆ" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "ๅจ '%s' ไธๅฏ็จ็ git ๅฝไปค" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "ๅจ $PATH ่ทฏๅพไธญ็ๅ ถไปๅฐๆนๅฏ็จ็ git ๅฝไปค" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "่ฟไบๆฏๅ็งๅบๅๅธธ่ง็ Git ๅฝไปค๏ผ" -#: help.c:363 git.c:98 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "ไธๆฏๆ็ๅฝไปคๅ่กจ็ฑปๅ '%s'" -#: help.c:403 -msgid "The common Git guides are:" -msgstr "ๆๅธธ็จ็ Git ๅๅฏผๆ๏ผ" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Git ๆฆๅฟตๅๅฏผๆ๏ผ" -#: help.c:512 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "ๆง่กใ'git help <command>' ๆฅๆฅ็็นๅฎๅญๅฝไปค" -#: help.c:517 +#: help.c:434 msgid "External commands" msgstr "ๅค้จๅฝไปค" -#: help.c:532 +#: help.c:449 msgid "Command aliases" msgstr "ๅฝไปคๅซๅ" -#: help.c:596 +#: help.c:513 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -3468,31 +4302,31 @@ msgstr "" "'%s' ๅๆฏไธไธช git ๅฝไปค๏ผไฝๅดๆ ๆณ่ฟ่กใ\n" "ๅฏ่ฝๆฏ git-%s ๅๆ๏ผ" -#: help.c:655 +#: help.c:572 msgid "Uh oh. Your system reports no Git commands at all." msgstr "ๅๅ๏ผๆจ็็ณป็ปไธญๆชๅ็ฐ Git ๅฝไปคใ" -#: help.c:677 +#: help.c:594 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "่ญฆๅ๏ผๆจ่ฟ่กไบไธไธชๅนถไธๅญๅจ็ Git ๅฝไปค '%s'ใ" -#: help.c:682 +#: help.c:599 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "ๅๅฎไฝ ๆณ่ฆ็ๆฏ '%s' ๅนถ็ปง็ปญใ" -#: help.c:687 +#: help.c:604 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "ๅๅฎไฝ ๆณ่ฆ็ๆฏ '%2$s'๏ผๅจ %1$0.1f ็ง้ๅ็ปง็ปญใ" -#: help.c:695 +#: help.c:612 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git๏ผ'%s' ไธๆฏไธไธช git ๅฝไปคใๅ่ง 'git --help'ใ" -#: help.c:699 +#: help.c:616 msgid "" "\n" "The most similar command is" @@ -3506,16 +4340,16 @@ msgstr[1] "" "\n" "ๆ็ธไผผ็ๅฝไปคๆฏ" -#: help.c:714 +#: help.c:656 msgid "git version [<options>]" msgstr "git version [<้้กน>]" -#: help.c:782 +#: help.c:711 #, c-format msgid "%s: %s - %s" msgstr "%s๏ผ%s - %s" -#: help.c:786 +#: help.c:715 msgid "" "\n" "Did you mean this?" @@ -3529,7 +4363,15 @@ msgstr[1] "" "\n" "ๆจๆ็ๆฏ่ฟๅ ถไธญ็ๆไธไธชไน๏ผ" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "ไฝ่ ่บซไปฝๆช็ฅ\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "ๆไบค่ ่บซไปฝๆช็ฅ\n" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -3554,76 +4396,95 @@ msgstr "" "ๆฅ่ฎพ็ฝฎๆจ่ดฆๅท็็ผบ็่บซไปฝๆ ่ฏใ\n" "ๅฆๆไป ๅจๆฌไปๅบ่ฎพ็ฝฎ่บซไปฝๆ ่ฏ๏ผๅ็็ฅ --global ๅๆฐใ\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "ๆชๆไพ้ฎไปถๅฐๅไธ่ชๅจๆขๆต่ขซ็ฆ็จ" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "ๆ ๆณ่ชๅจๆขๆต้ฎไปถๅฐๅ๏ผๅพๅฐ '%s'๏ผ" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "ๆชๆไพๅงๅไธ่ชๅจๆขๆต่ขซ็ฆ็จ" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "ๆ ๆณ่ชๅจๆขๆตๅงๅ๏ผๅพๅฐ '%s'๏ผ" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "ไธๅ ่ฎธ็ฉบ็ๅงๅ๏ผๅฏนไบ <%s>๏ผ" -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "ๅงๅไธญไป ๅ ๅซ็ฆ็จๅญ็ฌฆ๏ผ%s" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "ๆ ๆ็ๆฅๆๆ ผๅผ๏ผ%s" -#: 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-filter-options.c:81 +msgid "expected 'tree:<depth>'" +msgstr "ๆๆ 'tree:<ๆทฑๅบฆ>'" -#: list-objects.c:142 +#: list-objects-filter-options.c:96 +msgid "sparse:path filters support has been dropped" +msgstr "sparse:path ่ฟๆปคๅจๆฏๆๅทฒ่ขซๅ ้ค" + +#: list-objects-filter-options.c:109 #, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "ๆ %2$s ไธญ็ๆก็ฎ '%1$s' ๅ ทๆๆฐๆฎๅฏน่ฑก็ๅฑๆง๏ผไฝไธๆฏไธไธชๆฐๆฎๅฏน่ฑก" +msgid "invalid filter-spec '%s'" +msgstr "ๆ ๆ็่ฟๆปคๅจ่กจ่พพๅผ '%s'" -#: list-objects.c:378 +#: list-objects-filter-options.c:125 #, c-format -msgid "unable to load root tree for commit %s" -msgstr "ๆ ๆณไธบๆไบค %s ๅ ่ฝฝๆ นๆ " +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "ๅฟ ้กปๅฏน sub-filter-spec ไธญ็ๅญ็ฌฆ่ฟ่ก่ฝฌไน๏ผ'%c'" + +#: list-objects-filter-options.c:167 +msgid "expected something after combine:" +msgstr "ๆๆๅจ็ปๅๅๆไธไบไธ่ฅฟ๏ผ" -#: list-objects-filter-options.c:36 +#: list-objects-filter-options.c:249 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:361 +msgid "unable to upgrade repository format to support partial clone" +msgstr "ๆ ๆณๅ็บงไปๅบๆ ผๅผไปฅๆฏๆ้จๅๅ ้" -#: list-objects-filter-options.c:84 -msgid "sparse:path filters support has been dropped" -msgstr "sparse:path ่ฟๆปคๅจๆฏๆๅทฒ่ขซๅ ้ค" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "ไธ่ฝ่ฎฟ้ฎ '%s' ไธญ็็จ็ๆฐๆฎๅฏน่ฑก" -#: list-objects-filter-options.c:94 +#: list-objects-filter.c:495 #, c-format -msgid "invalid filter-spec '%s'" -msgstr "ๆ ๆ็่ฟๆปคๅจ่กจ่พพๅผ '%s'" +msgid "unable to parse sparse filter data in %s" +msgstr "ๆ ๆณ่งฃๆ %s ไธญ็็จ็่ฟๆปคๅจๆฐๆฎ" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "ๆ ๆณไฟฎๆน้จๅๅ ้็ promisor ่ฟ็จไปๅบ" +#: 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' ๅ ทๆๆฐๆฎๅฏน่ฑก็ๆจกๅผ๏ผไฝไธๆฏไธไธชๆฐๆฎๅฏน่ฑก" -#: lockfile.c:151 +#: list-objects.c:375 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "ๆ ๆณไธบๆไบค %s ๅ ่ฝฝๆ นๆ " + +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -3641,123 +4502,113 @@ msgstr "" "ๅฏ่ฝไนๅๆไธไธช git ่ฟ็จๅจ่ฟไธชไปๅบไธญๅผๅธธ้ๅบ๏ผ\n" "ๆๅจๅ ้ค่ฟไธชๆไปถๅ็ปง็ปญใ" -#: lockfile.c:159 +#: lockfile.c:160 #, 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: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 "ๆ ๆณๅๆฐ็็ดขๅผๆไปถ" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "ๅจ ls-refs ๅๆฐๅๅบ่ฏฅๆไธไธช flush ๅ " -#: merge-recursive.c:322 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "๏ผๅๆไบค๏ผ\n" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo ๅฏน่ทฏๅพ '%s' ๆง่กๅคฑ่ดฅ๏ผๅๅนถ็ปๆญขใ" -#: merge-recursive.c:354 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo ๆ ๆณๅทๆฐ่ทฏๅพ '%s'๏ผๅๅนถ็ปๆญขใ" -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "ๅๅปบๆ ๅบ้" - -#: merge-recursive.c:863 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "ๅๅปบ่ทฏๅพ '%s'%s ๅคฑ่ดฅ" -#: merge-recursive.c:874 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "ๅ ้ค %s ไปฅไพฟไธบๅญ็ฎๅฝ็ๅบ็ฉบ้ด\n" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr "๏ผๅฏ่ฝๆฏไธไธช็ฎๅฝ/ๆไปถๅฒ็ช๏ผ" -#: merge-recursive.c:897 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "ๆ็ปไธขๅผ '%s' ไธญ็ๆช่ท่ธชๆไปถ" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "ไธ่ฝ่ฏปๅๅฏน่ฑก %s '%s'" -#: merge-recursive.c:941 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' ๅบไธบๆฐๆฎๅฏน่ฑก" -#: merge-recursive.c:965 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "ๆๅผ '%s' ๅคฑ่ดฅ๏ผ%s" -#: merge-recursive.c:976 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "ๅๅปบ็ฌฆๅท้พๆฅ '%s' ๅคฑ่ดฅ๏ผ%s" -#: merge-recursive.c:981 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ไธ็ฅ้ๅฆไฝๅค็ %06o %s '%s'" -#: merge-recursive.c:1177 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "ๆ ๆณๅๅนถๅญๆจก็ป %s ๏ผๆฒกๆๆฃๅบ๏ผ" -#: merge-recursive.c:1184 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "ๆ ๆณๅๅนถๅญๆจก็ป %s๏ผๆไบคไธๅญๅจ๏ผ" -#: merge-recursive.c:1191 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "ๆ ๆณๅๅนถๅญๆจก็ป %s ๏ผๆไบคๆช่ท้ๅๅนถๅบ็บฟ๏ผ" -#: merge-recursive.c:1199 merge-recursive.c:1211 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "ๅญๆจก็ป %s ๅฟซ่ฟๅฐๅฆไธๆไบค๏ผ" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "ๅฟซ่ฟๅญๆจก็ป %s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1251 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "ๆ ๆณๅๅนถๅญๆจก็ป %s ๏ผๆฒกๅ็ฐๅๅนถ่ท้็ๆไบค๏ผ" -#: merge-recursive.c:1241 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "ๆ ๆณๅๅนถๅญๆจก็ป %s๏ผ้ๅฟซ่ฟ๏ผ" -#: merge-recursive.c:1242 +#: merge-recursive.c:1256 msgid "Found a possible merge resolution for the submodule:\n" msgstr "ๆพๅฐๅญๆจก็ป็ไธไธชๅฏ่ฝ็ๅๅนถๆนๆก๏ผ\n" -#: merge-recursive.c:1245 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3773,31 +4624,31 @@ msgstr "" "\n" "ไปฅๆฅๅๆญคๅปบ่ฎฎใ\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "ๆ ๆณๅๅนถๅญๆจก็ป %s ๏ผๅ็ฐๅคไธชๅๅนถ๏ผ" -#: merge-recursive.c:1327 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "ๆ ๆณๆง่กๅ ้จๅๅนถ" -#: merge-recursive.c:1332 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "ไธ่ฝๆทปๅ %s ่ณๅฏน่ฑกๅบ" -#: merge-recursive.c:1364 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "่ชๅจๅๅนถ %s" -#: merge-recursive.c:1387 +#: 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:1459 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3806,7 +4657,7 @@ msgstr "" "ๅฒ็ช๏ผ%1$s/ๅ ้ค๏ผ๏ผ%2$s ๅจ %3$s ไธญ่ขซๅ ้ค๏ผๅจ %5$s ไธญ่ขซ %4$sใ%7$s ็ %6$s ็" "ๆฌ่ขซไฟ็ใ" -#: merge-recursive.c:1464 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3815,7 +4666,7 @@ msgstr "" "ๅฒ็ช๏ผ%1$s/ๅ ้ค๏ผ๏ผ%2$s ๅจ %3$s ไธญ่ขซๅ ้ค๏ผๅจ %6$s ไธญ็ %5$s ่ขซ %4$sใ%8$s ็ " "%7$s ็ๆฌ่ขซไฟ็ใ" -#: merge-recursive.c:1471 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3824,7 +4675,7 @@ msgstr "" "ๅฒ็ช๏ผ%1$s/ๅ ้ค๏ผ๏ผ%2$s ๅจ %3$s ไธญ่ขซๅ ้ค๏ผๅจ %5$s ไธญ่ขซ %4$sใ%7$s ็ %6$s ็" "ๆฌไฟ็ๅจ %8$s ไธญใ" -#: merge-recursive.c:1476 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3833,40 +4684,40 @@ msgstr "" "ๅฒ็ช๏ผ%1$s/ๅ ้ค๏ผ๏ผ%2$s ๅจ %3$s ไธญ่ขซๅ ้ค๏ผๅจ %6$s ไธญ็ %5$s ่ขซ %4$sใ%8$s ็ " "%7$s ็ๆฌไฟ็ๅจ %9$s ไธญใ" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "rename" msgstr "้ๅฝๅ" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "renamed" msgstr "้ๅฝๅ" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "ๆ็ปไธขๅคฑ่ๆไปถ '%s'" -#: merge-recursive.c:1601 +#: 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:1659 +#: 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:1690 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s ๆฏ %s ไธญ็ไธไธช็ฎๅฝ่ไปฅ %s ไธบๅ่ขซๆทปๅ " -#: merge-recursive.c:1695 +#: merge-recursive.c:1681 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "ๆ็ปไธขๅคฑๆช่ท่ธชๆไปถ '%s'๏ผ่ๆฏๆทปๅ ไธบ %s" -#: merge-recursive.c:1714 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3875,18 +4726,18 @@ msgstr "" "ๅฒ็ช๏ผ้ๅฝๅ/้ๅฝๅ๏ผ๏ผๅจๅๆฏ \"%3$s\" ไธญ้ๅฝๅ \"%1$s\"->\"%2$s\"๏ผๅจๅๆฏ " "\"%6$s\" ไธญ้ๅฝๅ \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1719 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr "๏ผ็ไธๆช่งฃๅณ๏ผ" -#: merge-recursive.c:1828 +#: merge-recursive.c:1805 #, 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:2035 +#: merge-recursive.c:2068 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3896,7 +4747,7 @@ msgstr "" "ๅฒ็ช๏ผๅๅฒ็็ฎๅฝ้ๅฝๅ๏ผ๏ผไธๆธ ๆฅ %s ๅบ่ฏฅๆพๅจๅช้๏ผๅ ไธบ็ฎๅฝ %s ่ขซ้ๅฝๅๅฐๅคไธช" "ๅ ถๅฎ็ฎๅฝ๏ผๆฒกๆ็ฎๅฝๅ ๅซๅคง้จๅๆไปถใ" -#: merge-recursive.c:2067 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3905,7 +4756,7 @@ msgstr "" "ๅฒ็ช๏ผ้ๅผ็ฎๅฝ้ๅฝๅ๏ผ๏ผๅคไบ้ๅผ็ฎๅฝ้ๅฝๅ็็ฐๅญๆไปถ/็ฎๅฝ %s๏ผๅฐไปฅไธ่ทฏๅพๆพ" "ๅจ๏ผ%sใ" -#: merge-recursive.c:2077 +#: merge-recursive.c:2110 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3914,7 +4765,7 @@ msgstr "" "ๅฒ็ช๏ผ้ๅผ็ฎๅฝ้ๅฝๅ๏ผ๏ผๆ ๆณๆ ๅฐไธไธชไปฅไธ่ทฏๅพๅฐ %s๏ผ้ๅผ็ฎๅฝ้ๅฝๅๅฐ่ฏๅฐ่ฟไบ่ทฏ" "ๅพๆพ็ฝฎไบๆญค๏ผ%s" -#: merge-recursive.c:2169 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3923,59 +4774,59 @@ msgstr "" "ๅฒ็ช๏ผ้ๅฝๅ/้ๅฝๅ๏ผ๏ผๅจ %3$s ไธญ้ๅฝๅ็ฎๅฝ %1$s->%2$s๏ผๅจ %6$s ไธญ้ๅฝๅ็ฎๅฝ " "%4$s->%5$s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "่ญฆๅ๏ผ้ฟๅ ๅบ็จ %s -> %s ็้ๅฝๅๅฐ %s๏ผๅ ไธบ %s ๆฌ่บซๅทฒ่ขซ้ๅฝๅใ" -#: merge-recursive.c:2938 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "ไธ่ฝ่ฏปๅๅฏน่ฑก %s" -#: merge-recursive.c:2941 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "ๅฏน่ฑก %s ไธๆฏไธไธชๆฐๆฎๅฏน่ฑก" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modify" msgstr "ไฟฎๆน" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modified" msgstr "ไฟฎๆน" -#: merge-recursive.c:3017 +#: merge-recursive.c:3052 msgid "content" msgstr "ๅ ๅฎน" -#: merge-recursive.c:3021 +#: merge-recursive.c:3056 msgid "add/add" msgstr "ๆทปๅ /ๆทปๅ " -#: merge-recursive.c:3044 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "็ฅ่ฟ %s๏ผๅทฒ็ปๅ่ฟ็ธๅๅๅนถ๏ผ" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3101 msgid "submodule" msgstr "ๅญๆจก็ป" -#: merge-recursive.c:3067 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "ๅฒ็ช๏ผ%s๏ผ๏ผๅๅนถๅฒ็ชไบ %s" -#: merge-recursive.c:3097 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "่ๆฏไปฅ %s ไธบๅๆทปๅ " -#: merge-recursive.c:3179 +#: merge-recursive.c:3215 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -3983,7 +4834,7 @@ msgid "" msgstr "" "่ทฏๅพๅทฒๆดๆฐ๏ผ%s ๆทปๅ ๅฐ %s๏ผไฝไบไธไธช่ขซ้ๅฝๅๅฐ %s ็็ฎๅฝไธญ๏ผๅฐๅ ถ็งปๅจๅฐ %sใ" -#: merge-recursive.c:3182 +#: merge-recursive.c:3218 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -3992,7 +4843,7 @@ msgstr "" "ๅฒ็ช๏ผๆไปถไฝ็ฝฎ๏ผ๏ผ%s ๆทปๅ ๅฐ %s๏ผไฝไบไธไธช่ขซ้ๅฝๅไธบ %s ็็ฎๅฝไธญ๏ผๅปบ่ฎฎๅฐๅ ถ็งปๅจ" "ๅฐ %sใ" -#: merge-recursive.c:3186 +#: merge-recursive.c:3222 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4001,7 +4852,7 @@ msgstr "" "่ทฏๅพๅทฒๆดๆฐ๏ผ%1$s ้ๅฝๅไธบ %3$s ไธญ็ %2$s๏ผ่่ฏฅ็ฎๅฝ่ขซ้ๅฝๅๅฐ %4$s ไธญ๏ผๅฐๅ ถ็งป" "ๅจๅฐ %5$sใ" -#: merge-recursive.c:3189 +#: merge-recursive.c:3225 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4010,224 +4861,262 @@ msgstr "" "ๅฒ็ช๏ผๆไปถไฝ็ฝฎ๏ผ๏ผ%1$s ้ๅฝๅไธบ %3$s ไธญ็ %2$s๏ผ่่ฏฅ็ฎๅฝ่ขซ้ๅฝๅๅฐ %4$s ไธญ๏ผ" "ๅปบ่ฎฎๅฐๅ ถ็งปๅจๅฐ %5$sใ" -#: merge-recursive.c:3303 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "ๅ ้ค %s" -#: merge-recursive.c:3326 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "ๆไปถ/็ฎๅฝ" -#: merge-recursive.c:3331 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "็ฎๅฝ/ๆไปถ" -#: merge-recursive.c:3338 +#: merge-recursive.c:3374 #, 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:3347 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "ๆทปๅ %s" -#: merge-recursive.c:3356 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "ๅฒ็ช๏ผadd/add๏ผ๏ผๅๅนถๅฒ็ชไบ %s" -#: 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 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "ๅทฒ็ปๆฏๆๆฐ็๏ผ" -#: merge-recursive.c:3414 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "ๆ ๆณๅๅนถๆ %s ๅ %s" -#: merge-recursive.c:3513 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "ๅๅนถ๏ผ" -#: merge-recursive.c:3526 +#: merge-recursive.c:3563 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "ๅ็ฐ %u ไธชๅ ฑๅ็ฅๅ ๏ผ" msgstr[1] "ๅ็ฐ %u ไธชๅ ฑๅ็ฅๅ ๏ผ" -#: merge-recursive.c:3565 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "ๅๅนถๆช่ฟๅๆไบค" -#: merge-recursive.c:3631 +#: merge-recursive.c:3672 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"ๆจๅฏนไธๅๆไปถ็ๆฌๅฐไฟฎๆนๅฐ่ขซๅๅนถๆไฝ่ฆ็๏ผ\n" +" %s" + +#: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "ไธ่ฝ่งฃๆๅฏน่ฑก '%s'" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 msgid "Unable to write index." msgstr "ไธ่ฝๅๅ ฅ็ดขๅผใ" -#: midx.c:69 +#: merge.c:41 +msgid "failed to read the cache" +msgstr "่ฏปๅ็ผๅญๅคฑ่ดฅ" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "ๆ ๆณๅๆฐ็็ดขๅผๆไปถ" + +#: midx.c:79 #, c-format msgid "multi-pack-index file %s is too small" msgstr "ๅคๅ ็ดขๅผๆไปถ %s ๅคชๅฐ" -#: midx.c:85 +#: midx.c:95 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "ๅคๅ ็ดขๅผ็ญพๅ 0x%08x ๅ็ญพๅ 0x%08x ไธๅน้ " -#: midx.c:90 +#: midx.c:100 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index ็ๆฌ %d ไธ่ฝ่ขซ่ฏๅซ" -#: midx.c:95 +#: midx.c:105 #, c-format -msgid "hash version %u does not match" -msgstr "ๆฃๅ็ๆฌ %u ไธๅน้ " +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "ๅคๅ ็ดขๅผๅๅธ็ๆฌ %u ๅ็ๆฌ %u ไธๅน้ " -#: midx.c:109 +#: midx.c:122 msgid "invalid chunk offset (too large)" msgstr "ๆ ๆ็ๅๅ็งป๏ผๅคชๅคง๏ผ" -#: midx.c:133 +#: midx.c:146 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "็ปๆญขๅคๅ ็ดขๅผๅ id ๅบ็ฐๆถ้ดๆฉไบ้ขๆ" -#: midx.c:146 +#: midx.c:159 msgid "multi-pack-index missing required pack-name chunk" msgstr "ๅคๅ ็ดขๅผ็ผบๅฐๅฟ ้็ๅ ๅๅ" -#: midx.c:148 +#: midx.c:161 msgid "multi-pack-index missing required OID fanout chunk" msgstr "ๅคๅ ็ดขๅผ็ผบๅฐๅฟ ้็ๅฏน่ฑก ID ๆๅบๅ" -#: midx.c:150 +#: midx.c:163 msgid "multi-pack-index missing required OID lookup chunk" msgstr "ๅคๅ ็ดขๅผ็ผบๅฐๅฟ ้็ๅฏน่ฑก ID ๆฅ่ฏขๅ" -#: midx.c:152 +#: midx.c:165 msgid "multi-pack-index missing required object offsets chunk" msgstr "ๅคๅ ็ดขๅผ็ผบๅฐๅฟ ้็ๅฏน่ฑกๅ็งปๅ" -#: midx.c:166 +#: midx.c:179 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "ๅคๅ ็ดขๅผๅ ๅๆ ๅบ๏ผ'%s' ๅจ '%s' ไนๅ" -#: midx.c:211 +#: midx.c:222 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "้็ pack-int-id๏ผ%u๏ผๅ ฑๆ %u ไธชๅ ๏ผ" -#: midx.c:261 +#: midx.c:272 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "ๅคๅ ็ดขๅผๅญๅจไธไธช64ไฝๅ็งป๏ผไฝๆฏ off_t ๅคชๅฐ" -#: midx.c:289 +#: midx.c:300 msgid "error preparing packfile from multi-pack-index" msgstr "ไปๅคๅ ็ดขๅผๅๅค packfile ๅบ้" -#: midx.c:470 +#: midx.c:485 #, c-format msgid "failed to add packfile '%s'" msgstr "ๆทปๅ ๅ ๆไปถ '%s' ๅคฑ่ดฅ" -#: midx.c:476 +#: midx.c:491 #, c-format msgid "failed to open pack-index '%s'" msgstr "ๆๅผๅ ็ดขๅผ '%s' ๅคฑ่ดฅ" -#: midx.c:536 +#: midx.c:551 #, c-format msgid "failed to locate object %d in packfile" msgstr "ๅจๅ ๆไปถไธญๅฎไฝๅฏน่ฑก %d ๅคฑ่ดฅ" -#: midx.c:865 +#: midx.c:853 +msgid "Adding packfiles to multi-pack-index" +msgstr "ๆทปๅ ๅ ๆไปถๅฐๅคๅ ็ดขๅผ" + +#: midx.c:886 #, c-format msgid "did not see pack-file %s to drop" msgstr "ๆฒกๆ็ๅฐ่ฆไธขๅผ็ๅ ๆไปถ %s" -#: midx.c:1036 +#: midx.c:938 +msgid "no pack files to index." +msgstr "ๆฒกๆ่ฆ็ดขๅผ็ๅ ๆไปถใ" + +#: midx.c:990 +msgid "Writing chunks to multi-pack-index" +msgstr "ๅๅ ฅๅๅฐๅคๅ ็ดขๅผ" + +#: midx.c:1068 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "ๆธ ็ไฝไบ %s ็ๅคๅ ็ดขๅผๅคฑ่ดฅ" -#: midx.c:1091 +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "ๅคๅ ็ดขๅผๆไปถๅญๅจ๏ผไฝๆ ๆณ่งฃๆ" + +#: midx.c:1132 msgid "Looking for referenced packfiles" msgstr "ๆญฃๅจๆฅๆพๅผ็จ็ๅ ๆไปถ" -#: midx.c:1106 +#: midx.c:1147 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "ๅฏน่ฑก ID ๆๅบๆ ๅบ๏ผfanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1110 -msgid "Verifying OID order in MIDX" -msgstr "ๆญฃๅจๆ ก้ช MIDX ไธญ็ๅฏน่ฑก ID ้กบๅบ" +#: midx.c:1152 +msgid "the midx contains no oid" +msgstr "midx ไธๅ ๅซ oid" + +#: midx.c:1161 +msgid "Verifying OID order in multi-pack-index" +msgstr "ๆ ก้ชๅคๅ ็ดขๅผไธญ็ OID ้กบๅบ" -#: midx.c:1119 +#: midx.c:1170 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "ๅฏน่ฑก ID ๆฅ่ฏขๆ ๅบ๏ผoid[%d] = %s >= %s = oid[%d]" -#: midx.c:1138 +#: midx.c:1190 msgid "Sorting objects by packfile" msgstr "้่ฟๅ ๆไปถไธบๅฏน่ฑกๆๅบ" -#: midx.c:1144 +#: midx.c:1197 msgid "Verifying object offsets" msgstr "ๆ ก้ชๅฏน่ฑกๅ็งป" -#: midx.c:1160 +#: midx.c:1213 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "ไธบ oid[%d] = %s ๅ ่ฝฝๅ ๆก็ฎๅคฑ่ดฅ" -#: midx.c:1166 +#: midx.c:1219 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "ไธบๅ ๆไปถ %s ๅ ่ฝฝๅ ็ดขๅผๅคฑ่ดฅ" -#: midx.c:1175 +#: midx.c:1228 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s ้่ฏฏ็ๅฏน่ฑกๅ็งป๏ผ%<PRIx64> != %<PRIx64>" -#: midx.c:1350 +#: midx.c:1253 +msgid "Counting referenced objects" +msgstr "ๆญฃๅจๅฏนๅผ็จๅฏน่ฑก่ฎกๆฐ" + +#: midx.c:1263 +msgid "Finding and deleting unreferenced packfiles" +msgstr "ๆญฃๅจๆฅๆพๅๅ ้คๆชๅผ็จ็ๅ ๆไปถ" + +#: midx.c:1454 msgid "could not start pack-objects" msgstr "ไธ่ฝๅผๅง pack-objects" -#: midx.c:1369 +#: midx.c:1474 msgid "could not finish pack-objects" msgstr "ไธ่ฝ็ปๆ pack-objects" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "ไธ่ฝๅๅปบ lazy_dir ็บฟ็จ๏ผ%s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "ไธ่ฝๅๅปบ lazy_name ็บฟ็จ๏ผ%s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "ไธ่ฝๅ ๅ ฅ lasy_name ็บฟ็จ๏ผ%s" @@ -4271,45 +5160,70 @@ msgstr "ๆ็ปๅ %s๏ผๅจ refs/notes/ ไนๅค๏ผๅๅ ฅๆณจ่งฃ" msgid "Bad %s value: '%s'" msgstr "ๅ็ %s ๅผ๏ผ'%s'" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "ๆ ๆ็ๅฏน่ฑก็ฑปๅ \"%s\"" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "ๅฏน่ฑก %s ๆฏไธไธช %s๏ผไธๆฏไธไธช %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "ๅฏน่ฑก %s ๆๆช็ฅ็็ฑปๅ id %d" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "ไธ่ฝ่งฃๆๅฏน่ฑก๏ผ%s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "ๅๅธๅผไธ %s ไธๅน้ " -#: packfile.c:648 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "ๆ ๆณๅพๅฐ %s ็ๅคงๅฐ" + +#: packfile.c:630 msgid "offset before end of packfile (broken .idx?)" msgstr "ๅ็งป้ๅจๅ ๆไปถ็ปๆไนๅ๏ผๆๅ็ .idx๏ผ๏ผ" -#: packfile.c:1899 +#: packfile.c:1922 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "ๅ็งป้ๅจ %s ็ๅ ็ดขๅผๅผๅงไนๅ๏ผๆๅ็็ดขๅผ๏ผ๏ผ" -#: packfile.c:1903 +#: packfile.c:1926 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" 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:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "ๆ ผๅผ้่ฏฏ็ๅฏน่ฑกๅ '%s'" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4325,7 +5239,7 @@ msgstr "%s ไธ %s ไธๅ ผๅฎน" msgid "%s : incompatible with something else" msgstr "%s๏ผๅๅ ถๅฎ็ไธๅ ผๅฎน" -#: parse-options.c:92 parse-options.c:96 parse-options.c:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "%s ไธๅๅผ" @@ -4335,41 +5249,46 @@ msgstr "%s ไธๅๅผ" msgid "%s isn't available" msgstr "%s ไธๅฏ็จ" -#: parse-options.c:219 +#: 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:389 +#: 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:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, 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:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "--%s ็ๅซๅ" -#: parse-options.c:859 +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "ๆช็ฅ้้กน `%s'" -#: parse-options.c:861 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "ๆช็ฅๅผๅ ณ `%c'" -#: parse-options.c:863 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "ๅญ็ฌฆไธฒไธญๆช็ฅ็้ ascii ๅญ็ฌฆ้้กน๏ผ`%s'" -#: parse-options.c:887 +#: parse-options.c:890 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "็จๆณ๏ผ%s" @@ -4377,122 +5296,102 @@ msgstr "็จๆณ๏ผ%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " ๆ๏ผ%s" # ่ฏ่ ๏ผไธบไฟ่ฏๅจ่พๅบไธญๅฏน้ฝ๏ผๆณจๆ่ฐๆดๅฅไธญ็ฉบๆ ผ๏ผ -#: parse-options.c:915 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:957 msgid "-NUM" msgstr "-ๆฐๅญ" -#: parse-options.c:968 -#, 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:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "ไธ่ฝ่ฎพ็ฝฎ %s ไธบ็ปๅฏๅ" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "่ฝฌไนๅญ็ฌฆ '\\' ไธ่ฝไฝไธบๅฑๆงๅผ็ๆๅไธไธชๅญ็ฌฆ" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "ๅชๅ ่ฎธไธไธช 'attr:' ่งๆ ผใ" -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "ๅฑๆง่งๆ ผไธ่ฝไธบ็ฉบ" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "ๆ ๆ็ๅฑๆงๅ %s" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "ๅ จๅฑ็ 'glob' ๅ 'noglob' ่ทฏๅพ่งๆ ผ่ฎพ็ฝฎไธๅ ผๅฎน" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "ๅ จๅฑ็ 'literal' ่ทฏๅพ่งๆ ผ่ฎพ็ฝฎๅๅ ถๅฎ็ๅ จๅฑ่ทฏๅพ่งๆ ผ่ฎพ็ฝฎไธๅ ผๅฎน" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "่ทฏๅพ่งๆ ผๅ ๅซๆ ๆ็็ฅๅฅๅ็ผ" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "ๅจ่ทฏๅพ่งๆ ผ '%3$s' ไธญๆ ๆ็็ฅๅฅๅ็ผ '%2$.*1$s'" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "่ทฏๅพ่งๆ ผ '%s' ็็ฅๅฅๅ็ผ็ปๅฐพๅฐไบไธไธช ')'" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "่ทฏๅพ่งๆ ผ '%2$s' ไธญๅ ๅซๆชๅฎ็ฐ็็ฅๅฅๅ็ผ '%1$c'" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s๏ผ'literal' ๅ 'glob' ไธๅ ผๅฎน" -#: pathspec.c:440 +#: pathspec.c:445 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s๏ผ'%s' ๅจไปๅบไนๅค" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s๏ผ'%s' ๅจไฝไบ '%s' ็ไปๅบไนๅค" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'๏ผๅฉ่ฎฐ็ฌฆ๏ผ'%c'๏ผ" -#: pathspec.c:524 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s๏ผ่ทฏๅพ่งๆ ผ็ฅๅฅๅ็ผไธ่ขซๆญคๅฝไปคๆฏๆ๏ผ%s" -#: pathspec.c:591 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "่ทฏๅพ่งๆ ผ '%s' ไฝไบ็ฌฆๅท้พๆฅไธญ" +#: pathspec.c:643 +#, c-format +msgid "line is badly quoted: %s" +msgstr "่ก่ขซ้่ฏฏๅฐๅผ็จ๏ผ%s" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "ๆ ๆณๅ flush ๅ " @@ -4502,44 +5401,48 @@ msgid "unable to write delim packet" msgstr "ๆ ๆณๅ delim ๅ " #: pkt-line.c:106 +msgid "unable to write stateless separator packet" +msgstr "ๆ ๆณๅๅ ฅๆ ็ถๆๅ้็ฌฆๆฐๆฎๅ " + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "flush ๅ ๅ้่ฏฏ" -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "ๅ่ฎฎ้่ฏฏ๏ผไธๅฏ่ฝ็้ฟ่ก" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "ๆ ผๅผๅๅ ๅๅ ฅ้่ฏฏ" -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "ๅๆฐๆฎๅ ๅคฑ่ดฅ๏ผๆฐๆฎ่ถ ่ฟไบๅ ็ๆๅคง้ฟๅบฆ" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "ๆฐๆฎๅ ๅๅ ฅๅคฑ่ดฅ" -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "่ฏปๅ้่ฏฏ" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "่ฟ็ซฏๆๅคๆๆญไบ" -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "ๅ่ฎฎ้่ฏฏ๏ผ้่ฏฏ็่ก้ฟๅบฆๅญ็ฌฆไธฒ๏ผ%.4s" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "ๅ่ฎฎ้่ฏฏ๏ผ้่ฏฏ็่ก้ฟๅบฆ %d" -#: pkt-line.c:362 +#: pkt-line.c:373 sideband.c:150 #, c-format msgid "remote error: %s" msgstr "่ฟ็จ้่ฏฏ๏ผ%s" @@ -4553,81 +5456,109 @@ msgstr "ๆญฃๅจๅทๆฐ็ดขๅผ" msgid "unable to create threaded lstat: %s" msgstr "ๆ ๆณๅๅปบ็บฟ็จ lstat๏ผ%s" -#: pretty.c:966 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "ไธ่ฝ่งฃๆ --pretty ๆ ผๅผ" -#: range-diff.c:70 +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "promisor-remote๏ผๆ ๆณๆดพ็ fetch ๅญ่ฟ็จ" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "promisor-remote๏ผๆ ๆณๅ fetch ๅญ่ฟ็จๅๅ ฅ" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "promisor-remote๏ผๆ ๆณๅ ณ้ญ่ณ fetch ๅญ่ฟ็จ็ๆ ๅ่พๅ ฅ" + +#: promisor-remote.c:53 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "promisor ่ฟ็จๅ็งฐไธ่ฝไปฅ '/' ๅผๅง๏ผ%s" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "ๆญฃๅจๅ ้ค้ๅคๅฏน่ฑก" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "ไธ่ฝๅฏๅจ `log`" -#: range-diff.c:72 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "ไธ่ฝ่ฏปๅ `log` ็่พๅบ" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:98 sequencer.c:5283 #, c-format msgid "could not parse commit '%s'" msgstr "ไธ่ฝ่งฃๆๆไบค '%s'" -#: range-diff.c:117 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "ๆ ๆณ่งฃๆ `log` ่พๅบ็้ฆ่ก๏ผไธๆฏไปฅ 'commit ' ๅผๅคด๏ผ'%s'" + +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "ๆ ๆณ่งฃๆ git ๅคด '%.*s'" -#: range-diff.c:274 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "็ๆ diff ๅคฑ่ดฅ" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "ไธ่ฝ่งฃๆ '%s' ็ๆฅๅฟ" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "ๅฐไธไผๆทปๅ ๆไปถๅซๅ '%s'๏ผ'%s' ๅทฒ็ปๅญๅจไบ็ดขๅผไธญ๏ผ" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "ไธ่ฝๅจๅฏน่ฑกๆฐๆฎๅบไธญๅๅปบ็ฉบ็ๆฐๆฎๅฏน่ฑก" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s๏ผๅช่ฝๆทปๅ ๅธธ่งๆไปถใ็ฌฆๅท้พๆฅๆ git ็ฎๅฝ" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' ๆฒกๆๆฃๅบไธไธชๆไบค" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "ๆ ๆณ็ดขๅผๆไปถ '%s'" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "ๆ ๆณๅจ็ดขๅผไธญๆทปๅ '%s'" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "ๆ ๆณๅฏน %s ๆง่ก stat" -#: read-cache.c:1314 +#: read-cache.c:1318 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' ็่ตทๆฅๆขๆฏๆไปถๅๆฏ็ฎๅฝ" -#: read-cache.c:1499 +#: read-cache.c:1524 msgid "Refresh index" msgstr "ๅทๆฐ็ดขๅผ" -#: read-cache.c:1613 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4636,7 +5567,7 @@ msgstr "" "่ฎพ็ฝฎไบ index.version๏ผไฝๆฏๅๅผๆ ๆใ\n" "ไฝฟ็จ็ๆฌ %i" -#: read-cache.c:1623 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4645,150 +5576,160 @@ msgstr "" "่ฎพ็ฝฎไบ GIT_INDEX_VERSION๏ผไฝๆฏๅๅผๆ ๆใ\n" "ไฝฟ็จ็ๆฌ %i" -#: read-cache.c:1679 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "ๅ็็ญพๅ 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "ๅ็็ดขๅผ็ๆฌ %d" -#: read-cache.c:1691 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "ๅ็็ดขๅผๆไปถ sha1 ็ญพๅ" -#: read-cache.c:1721 +#: read-cache.c:1747 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "็ดขๅผไฝฟ็จไธ่ขซๆฏๆ็ %.4s ๆฉๅฑ" # -#: read-cache.c:1723 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "ๅฟฝ็ฅ %.4s ๆฉๅฑ" -#: read-cache.c:1760 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "ๆช็ฅ็็ดขๅผๆก็ฎๆ ผๅผ 0x%08x" -#: read-cache.c:1776 +#: read-cache.c:1802 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "็ดขๅผไธญ้ ่ฟ่ทฏๅพ '%s' ๆ้่ฏฏ็ๅ็งฐๅญๆฎต" -#: read-cache.c:1833 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "็ดขๅผไธญๆๆชๆๅบ็ๆๅญๆก็ฎ" -#: read-cache.c:1836 +#: read-cache.c:1862 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "ๅๅนถๆไปถ '%s' ๆๅคไธชๆๅญๆก็ฎ" -#: read-cache.c:1839 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' ็ๆชๆๅบๆๅญๆก็ฎ" -#: 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 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "็ดขๅผๆไปถๆๅ" -#: read-cache.c:2087 +#: read-cache.c:2115 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "ๆ ๆณๅๅปบ load_cache_entries ็บฟ็จ๏ผ%s" -#: read-cache.c:2100 +#: read-cache.c:2128 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "ๆ ๆณๅ ๅ ฅ load_cache_entries ็บฟ็จ๏ผ%s" -#: read-cache.c:2133 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "%s๏ผๆๅผ็ดขๅผๆไปถๅคฑ่ดฅ" -#: read-cache.c:2137 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "%s๏ผไธ่ฝๅฏนๆๅผ็็ดขๅผๆง่ก stat ๆไฝ" -#: read-cache.c:2141 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "%s๏ผ็ดขๅผๆไปถๆฏ้ขๆ็ๅฐ" -#: read-cache.c:2145 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "%s๏ผๆ ๆณๅฏน็ดขๅผๆไปถๆง่ก map ๆไฝ" -#: read-cache.c:2187 +#: read-cache.c:2215 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "ๆ ๆณๅๅปบ load_index_extensions ็บฟ็จ๏ผ%s" -#: read-cache.c:2214 +#: read-cache.c:2242 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "ๆ ๆณๅ ๅ ฅ load_index_extensions ็บฟ็จ๏ผ%s" -#: read-cache.c:2246 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "ๆ ๆณๅทๆฐๅ ฑไบซ็ดขๅผ '%s'" -#: read-cache.c:2293 +#: read-cache.c:2321 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "ๆๅ็็ดขๅผ๏ผๆๆๅจ %2$s ไธญ็ %1$s๏ผๅพๅฐ %3$s" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 #, c-format msgid "could not close '%s'" msgstr "ไธ่ฝๅ ณ้ญ '%s'" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 #, c-format msgid "could not stat '%s'" msgstr "ไธ่ฝๅฏน '%s' ่ฐ็จ stat" -#: read-cache.c:3105 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "ไธ่ฝๆๅผ git ็ฎๅฝ๏ผ%s" -#: read-cache.c:3117 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "ๆ ๆณๅ ้ค๏ผ%s" -#: read-cache.c:3142 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "ไธ่ฝไฟฎๅค '%s' ็ๆ้ไฝ" -#: read-cache.c:3291 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s๏ผไธ่ฝ่ฝๅฐๆๅญๅบ #0" -#: rebase-interactive.c:26 +#: 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:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -4828,14 +5769,14 @@ msgstr "" "\n" "ๅฏไปฅๅฏน่ฟไบ่ก้ๆฐๆๅบ๏ผๅฐไปไธ่ณไธๆง่กใ\n" -#: rebase-interactive.c:56 +#: 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 ไธชๆไบค๏ผ" msgstr[1] "ๅๅบ %s ๅฐ %s๏ผ%d ไธชๆไบค๏ผ" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4843,7 +5784,7 @@ msgstr "" "\n" "ไธ่ฆๅ ้คไปปๆไธ่กใไฝฟ็จ 'drop' ๆพๅผๅฐๅ ้คไธไธชๆไบคใ\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4851,7 +5792,7 @@ msgstr "" "\n" "ๅฆๆๆจๅจ่ฟ้ๅ ้คไธ่ก๏ผๅฏนๅบ็ๆไบคๅฐไผไธขๅคฑใ\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4865,7 +5806,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4875,22 +5816,19 @@ msgstr "" "็ถ่๏ผๅฆๆๆจๅ ้คๅ จ้จๅ ๅฎน๏ผๅๅบๆไฝๅฐไผ็ปๆญขใ\n" "\n" -#: 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 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 #, c-format msgid "could not write '%s'" msgstr "ไธ่ฝๅๅ ฅ '%s'" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "ไธ่ฝๆท่ด '%s' ่ณ '%s'ใ" +msgid "could not write '%s'." +msgstr "ไธ่ฝๅๅ ฅ '%s'ใ" -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -4899,7 +5837,7 @@ msgstr "" "่ญฆๅ๏ผไธไบๆไบคๅฏ่ฝ่ขซๆๅคไธขๅผใ\n" "ไธขๅผ็ๆไบค๏ผไปๆฐๅฐๆง๏ผ๏ผ\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -4915,124 +5853,14 @@ msgstr "" "ๅฏ้ๅผๆ๏ผignoreใwarnใerrorใ\n" "\n" -#: 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:2092 -#, 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: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 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' ่ฟ่กๅๅ ฅ" - -#: 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:2012 -#, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "ไธๅ ่ฎธๅฏนๅผ็จ '%s' ๅคๆฌกๆดๆฐ" - -#: refs.c:2044 -msgid "ref updates forbidden inside quarantine environment" -msgstr "ๅจ้็ฆป็ฏๅขไธญ็ฆๆญขๆดๆฐๅผ็จ" - -#: refs.c:2140 refs.c:2170 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "'%s' ๅทฒๅญๅจ๏ผๆ ๆณๅๅปบ '%s'" - -#: 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:1234 -#, c-format -msgid "could not remove reference %s" -msgstr "ๆ ๆณๅ ้คๅผ็จ %s" - -#: 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:1251 refs/packed-backend.c:1545 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 #, c-format -msgid "could not delete references: %s" -msgstr "ๆ ๆณๅ ้คๅผ็จ๏ผ%s" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "ๆ ๆ็ๅผ็จ่กจ่พพๅผ๏ผ'%s'" +msgid "could not read '%s'." +msgstr "ไธ่ฝ่ฏปๅ '%s'ใ" -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "ไธขๅคฑ" @@ -5051,280 +5879,369 @@ msgstr "่ฝๅ %d" msgid "ahead %d, behind %d" msgstr "้ขๅ %d๏ผ่ฝๅ %d" -#: ref-filter.c:162 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "ๆๆ็ๆ ผๅผ๏ผ%%(color:<้ข่ฒ>)" -#: ref-filter.c:164 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "ๆช่ฝ่ฏๅซ็้ข่ฒ๏ผ%%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "ๆๆๆดๆฐๅผ refname:lstrip=%s" -#: ref-filter.c:190 +#: ref-filter.c:197 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "ๆๆๆดๆฐๅผ refname:rstrip=%s" -#: ref-filter.c:192 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "ๆช่ฝ่ฏๅซ็ %%(%s) ๅๆฐ๏ผ%s" -#: ref-filter.c:247 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) ไธๅธฆๅๆฐ" -#: ref-filter.c:269 +#: ref-filter.c:276 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "ๆช่ฝ่ฏๅซ็ %%(objectsize) ๅๆฐ๏ผ%s" -#: ref-filter.c:277 +#: ref-filter.c:284 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) ไธๅธฆๅๆฐ" -#: ref-filter.c:289 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) ไธๅธฆๅๆฐ" -#: ref-filter.c:298 +#: ref-filter.c:309 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) ไธๅธฆๅๆฐ" +msgid "unrecognized %%(subject) argument: %s" +msgstr "ๆช่ฝ่ฏๅซ็ %%(subject) ๅๆฐ๏ผ%s" -#: ref-filter.c:320 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "ๆช็ฅ็ %%(trailers) ๅๆฐ๏ผ%s" -#: ref-filter.c:349 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "ๆๆไธไธชๆญฃๆฐ contents:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "ๆช่ฝ่ฏๅซ็ %%(contents) ๅๆฐ๏ผ%s" -#: ref-filter.c:366 +#: ref-filter.c:380 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "ๆๆไธไธชๆญฃๆฐ objectname:short=%s" +msgid "positive value expected '%s' in %%(%s)" +msgstr "ๆๆ %%(%2$s) ไธญ็ '%1$s' ๆฏไธไธชๆญฃๆฐ" -#: ref-filter.c:370 +#: ref-filter.c:384 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "ๆช่ฝ่ฏๅซ็ %%(objectname) ๅๆฐ๏ผ%s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "ๆช่ฝ่ฏๅซ %%(%2$s) ไธญ็ๅๆฐ '%1$s'" -#: ref-filter.c:400 +#: ref-filter.c:398 +#, c-format +msgid "unrecognized email option: %s" +msgstr "ๆช่ฏๅซ็้ฎไปถ้้กน๏ผ%s" + +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "ๆๆ็ๆ ผๅผ๏ผ%%(align:<ๅฎฝๅบฆ>,<ไฝ็ฝฎ>)" -#: ref-filter.c:412 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "ๆช่ฝ่ฏๅซ็ไฝ็ฝฎ๏ผ%s" -#: ref-filter.c:419 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "ๆช่ฝ่ฏๅซ็ๅฎฝๅบฆ๏ผ%s" -#: ref-filter.c:428 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "ๆช่ฝ่ฏๅซ็ %%(align) ๅๆฐ๏ผ%s" -#: ref-filter.c:436 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "ๅ ็ด %%(align) ้่ฆไธไธชๆญฃๆฐ็ๅฎฝๅบฆ" -#: ref-filter.c:454 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "ๆช่ฝ่ฏๅซ็ %%(if) ๅๆฐ๏ผ%s" -#: ref-filter.c:556 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "ๆ ผๅผ้่ฏฏ็ๅญๆฎตๅ๏ผ%.*s" -#: ref-filter.c:583 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "ๆช็ฅ็ๅญๆฎตๅ๏ผ%.*s" -#: ref-filter.c:587 +#: ref-filter.c:615 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" -msgstr "ไธๆฏไธไธช git ไปๅบ๏ผไฝๆฏๅญๆฎต '%.*s' ้่ฆ่ฎฟ้ฎๅฏน่ฑกๆฐๆฎ" +msgstr "ไธๆฏ git ไปๅบ๏ผไฝๆฏๅญๆฎต '%.*s' ้่ฆ่ฎฟ้ฎๅฏน่ฑกๆฐๆฎ" -#: ref-filter.c:711 +#: ref-filter.c:739 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "ๆ ผๅผ๏ผไฝฟ็จไบ %%(if) ๅ ็ด ่ๆฒกๆ %%(then) ๅ ็ด " -#: ref-filter.c:774 +#: ref-filter.c:802 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "ๆ ผๅผ๏ผไฝฟ็จไบ %%(then) ๅ ็ด ่ๆฒกๆ %%(if) ๅ ็ด " -#: ref-filter.c:776 +#: ref-filter.c:804 #, c-format msgid "format: %%(then) atom used more than once" msgstr "ๆ ผๅผ๏ผ%%(then) ๅ ็ด ็จไบๅคๆฌก" -#: ref-filter.c:778 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "ๆ ผๅผ๏ผ%%(then) ๅ ็ด ็จๅจไบ %%(else) ไนๅ" -#: ref-filter.c:806 +#: ref-filter.c:834 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "ๆ ผๅผ๏ผไฝฟ็จไบ %%(else) ๅ ็ด ่ๆฒกๆ %%(if) ๅ ็ด " -#: ref-filter.c:808 +#: ref-filter.c:836 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "ๆ ผๅผ๏ผไฝฟ็จไบ %%(else) ๅ ็ด ่ๆฒกๆ %%(then) ๅ ็ด " -#: ref-filter.c:810 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used more than once" msgstr "ๆ ผๅผ๏ผ%%(else) ๅ ็ด ็จไบๅคๆฌก" -#: ref-filter.c:825 +#: ref-filter.c:853 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "ๆ ผๅผ๏ผไฝฟ็จไบ %%(end) ๅ ็ด ๅดๆฒกๆๅฎ็ๅฏนๅบๅ ็ด " -#: ref-filter.c:882 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "้่ฏฏ็ๆ ผๅผๅๅญ็ฌฆไธฒ %s" -#: ref-filter.c:1485 +#: ref-filter.c:1541 #, c-format msgid "no branch, rebasing %s" msgstr "้ๅๆฏ๏ผๆญฃๅๅบ %s" -#: ref-filter.c:1488 +#: ref-filter.c:1544 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "้ๅๆฏ๏ผๆญฃๅๅบๅ็ฆปๅคดๆ้ %s" -#: ref-filter.c:1491 +#: ref-filter.c:1547 #, c-format msgid "no branch, bisect started on %s" msgstr "้ๅๆฏ๏ผไบๅๆฅๆพๅผๅงไบ %s" -#: ref-filter.c:1501 +#: ref-filter.c:1557 msgid "no branch" msgstr "้ๅๆฏ" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1591 ref-filter.c:1800 #, c-format msgid "missing object %s for %s" msgstr "็ผบๅคฑ %2$s ็ๅฏน่ฑก %1$s" -#: ref-filter.c:1547 +#: ref-filter.c:1601 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer ๅคฑ่ดฅไบ %2$s ็ %1$s" -#: ref-filter.c:1998 +#: ref-filter.c:2054 #, c-format msgid "malformed object at '%s'" msgstr "ๆ ผๅผ้่ฏฏ็ๅฏน่ฑก '%s'" -#: ref-filter.c:2087 +#: ref-filter.c:2143 #, c-format msgid "ignoring ref with broken name %s" msgstr "ๅฟฝ็ฅๅธฆๆ้่ฏฏๅ็งฐ %s ็ๅผ็จ" -#: ref-filter.c:2382 +#: ref-filter.c:2148 refs.c:657 #, c-format -msgid "format: %%(end) atom missing" -msgstr "ๆ ผๅผ๏ผ็ผบๅฐ %%(end) ๅ ็ด " - -#: ref-filter.c:2482 -#, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "้้กน `%s' ๅ --merged ไธๅ ผๅฎน" +msgid "ignoring broken ref %s" +msgstr "ๅฟฝ็ฅๆๅ็ๅผ็จ %s" -#: ref-filter.c:2485 +#: ref-filter.c:2464 #, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "้้กน `%s' ๅ --no-merged ไธๅ ผๅฎน" +msgid "format: %%(end) atom missing" +msgstr "ๆ ผๅผ๏ผ็ผบๅฐ %%(end) ๅ ็ด " -#: ref-filter.c:2495 +#: ref-filter.c:2563 #, c-format msgid "malformed object name %s" msgstr "ๆ ผๅผ้่ฏฏ็ๅฏน่ฑกๅ %s" -#: ref-filter.c:2500 +#: ref-filter.c:2568 #, c-format msgid "option `%s' must point to a commit" msgstr "้้กน `%s' ๅฟ ้กปๆๅไธไธชๆไบค" -#: remote.c:363 +#: refs.c:264 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "%s ๆฒกๆๆๅไธไธชๆๆ็ๅฏน่ฑก๏ผ" + +#: refs.c:572 +#, c-format +msgid "could not retrieve `%s`" +msgstr "ๆ ๆณ่ทๅ `%s`" + +#: refs.c:579 +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "ๆ ๆ็ๅๆฏๅ๏ผ%s = %s" + +#: refs.c:655 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "ๅฟฝ็ฅๆฌ็ฉบ็ฌฆๅทๅผ็จ %s" + +#: refs.c:892 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "ๅผ็จ %s ็ๆฅๅฟๅจ %s ไนๅๆ็ผบๅฃ" + +#: refs.c:898 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "ๅผ็จ %s ็ๆฅๅฟๆๅค็ปๆญขไบ %s " + +#: refs.c:957 +#, c-format +msgid "log for %s is empty" +msgstr "%s ็ๆฅๅฟไธบ็ฉบ" + +#: refs.c:1049 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "ๆ็ปๆดๆฐๆ้่ฏฏๅ็งฐ '%s' ็ๅผ็จ" + +#: refs.c:1120 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "ๅฏนๅผ็จ '%s' ๆง่ก update_ref ๅคฑ่ดฅ๏ผ%s" + +#: refs.c:1944 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "ไธๅ ่ฎธๅฏนๅผ็จ '%s' ๅคๆฌกๆดๆฐ" + +#: refs.c:2024 +msgid "ref updates forbidden inside quarantine environment" +msgstr "ๅจ้็ฆป็ฏๅขไธญ็ฆๆญขๆดๆฐๅผ็จ" + +#: refs.c:2035 +msgid "ref updates aborted by hook" +msgstr "ๅผ็จๆดๆฐ่ขซ้ฉๅญไธญๆญข" + +#: refs.c:2135 refs.c:2165 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "'%s' ๅทฒๅญๅจ๏ผๆ ๆณๅๅปบ '%s'" + +#: refs.c:2141 refs.c:2176 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "ๆ ๆณๅๆถๅค็ '%s' ๅ '%s'" + +#: refs/files-backend.c:1228 +#, c-format +msgid "could not remove reference %s" +msgstr "ๆ ๆณๅ ้คๅผ็จ %s" + +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "ๆ ๆณๅ ้คๅผ็จ %s๏ผ%s" + +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#, c-format +msgid "could not delete references: %s" +msgstr "ๆ ๆณๅ ้คๅผ็จ๏ผ%s" + +#: refspec.c:167 +#, c-format +msgid "invalid refspec '%s'" +msgstr "ๆ ๆ็ๅผ็จ่กจ่พพๅผ๏ผ'%s'" + +#: remote.c:351 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "้ ็ฝฎ็่ฟ็จ็ญๅ็งฐไธ่ฝไปฅ '/' ๅผๅง๏ผ%s" -#: remote.c:410 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "ๆไพไบไธไธชไปฅไธ็ receivepack๏ผไฝฟ็จ็ฌฌไธไธช" -#: remote.c:418 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "ๆไพไบไธไธชไปฅไธ็ uploadpack๏ผไฝฟ็จ็ฌฌไธไธช" -#: remote.c:608 +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "ไธ่ฝๅๆถ่ทๅ %s ๅ %s ่ณ %s" -#: remote.c:612 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s ้ๅธธ่ท่ธช %s๏ผ่้ %s" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s ๅๆถ่ท่ธช %s ๅ %s" -#: remote.c:684 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "ๆจกๅผ็้ฎ '%s' ๆฒกๆ '*'" -#: remote.c:694 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "ๆจกๅผ็ๅผ '%s' ๆฒกๆ '*'" -#: remote.c:1000 +#: remote.c:1073 #, c-format msgid "src refspec %s does not match any" msgstr "ๆบๅผ็จ่กจ่พพๅผ %s ๆฒกๆๅน้ " -#: remote.c:1005 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "ๆบๅผ็จ่กจ่พพๅผ %s ๅน้ ่ถ ่ฟไธไธช" @@ -5333,7 +6250,7 @@ msgstr "ๆบๅผ็จ่กจ่พพๅผ %s ๅน้ ่ถ ่ฟไธไธช" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5355,7 +6272,7 @@ msgstr "" "\n" "้ฝไธ่ก๏ผๆไปฅๆไปฌๅทฒๆพๅผใๆจๅฟ ้กป็ปๅบๅฎๆด็ๅผ็จใ" -#: remote.c:1040 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5365,7 +6282,7 @@ msgstr "" "ๅผ็จ่กจ่พพๅผ็ <src> ๆฏไธไธชๆไบคๅฏน่ฑกใๆจๆฏๆณๅๅปบไธไธชๆฐ็ๅๆฏ่ๅ\n" "'%s:refs/heads/%s' ๆจ้ไน๏ผ" -#: remote.c:1045 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5375,7 +6292,7 @@ msgstr "" "ๅผ็จ่กจ่พพๅผ็ <src> ๆฏไธไธชๆ ็ญพๅฏน่ฑกใๆจๆฏๆณๅๅปบไธไธชๆฐ็ๆ ็ญพ่ๅ\n" "'%s:refs/tags/%s' ๆจ้ไน๏ผ" -#: remote.c:1050 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5385,7 +6302,7 @@ msgstr "" "ๅผ็จ่กจ่พพๅผ็ <src> ๆฏไธไธชๆ ๅฏน่ฑกใๆจๆฏๆณไธบ่ฟไธชๆ ๅฏน่ฑกๅๅปบๆ ็ญพ่ๅ\n" "'%s:refs/tags/%s' ๆจ้ไน๏ผ" -#: remote.c:1055 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5395,114 +6312,114 @@ msgstr "" "ๅผ็จ่กจ่พพๅผ็ <src> ๆฏไธไธชๆฐๆฎๅฏน่ฑกใๆจๆฏๆณไธบ่ฟไธชๆฐๆฎๅฏน่ฑกๅๅปบๆ ็ญพ่ๅ\n" "'%s:refs/tags/%s' ๆจ้ไน๏ผ" -#: remote.c:1091 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s ๆ ๆณ่ขซ่งฃๆไธบๅๆฏ" -#: remote.c:1102 +#: remote.c:1175 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "ๆ ๆณๅ ้ค '%s'๏ผ่ฟ็จๅผ็จไธๅญๅจ" -#: remote.c:1114 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "็ฎๆ ๅผ็จ่กจ่พพๅผ %s ๅน้ ่ถ ่ฟไธไธช" -#: remote.c:1121 +#: remote.c:1194 #, c-format msgid "dst ref %s receives from more than one src" msgstr "็ฎๆ ๅผ็จ %s ๆฅๆถ่ถ ่ฟไธไธชๆบ" -#: remote.c:1624 remote.c:1725 +#: remote.c:1703 remote.c:1804 msgid "HEAD does not point to a branch" msgstr "HEAD ๆฒกๆๆๅไธไธชๅๆฏ" -#: remote.c:1633 +#: remote.c:1712 #, c-format msgid "no such branch: '%s'" msgstr "ๆฒกๆๆญคๅๆฏ๏ผ'%s'" -#: remote.c:1636 +#: remote.c:1715 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ๅฐๆช็ปๅๆฏ '%s' ่ฎพ็ฝฎไธๆธธ" -#: remote.c:1642 +#: remote.c:1721 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "ไธๆธธๅๆฏ '%s' ๆฒกๆๅญๅจไธบไธไธช่ฟ็จ่ท่ธชๅๆฏ" -#: remote.c:1657 +#: remote.c:1736 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "ๆจ้็ฎๆ '%s' ่ณ่ฟ็จ '%s' ๆฒกๆๆฌๅฐ่ท่ธชๅๆฏ" -#: remote.c:1669 +#: remote.c:1748 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "ๅๆฏ '%s' ๆฒกๆ่ฎพ็ฝฎ่ฆๆจ้็่ฟ็จๆๅกๅจ" -#: remote.c:1679 +#: remote.c:1758 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "ๅ '%s' ๆจ้ๅผ็จ่งๆ ผๆชๅ ๅซ '%s'" -#: remote.c:1692 +#: remote.c:1771 msgid "push has no destination (push.default is 'nothing')" msgstr "ๆจ้ๆ ็ฎๆ ๏ผpush.default ๆฏ 'nothing'๏ผ" -#: remote.c:1714 +#: remote.c:1793 msgid "cannot resolve 'simple' push to a single destination" msgstr "ๆ ๆณ่งฃๆ 'simple' ๆจ้่ณไธไธชๅ็ฌ็็ฎๆ " -#: remote.c:1840 +#: remote.c:1922 #, c-format msgid "couldn't find remote ref %s" msgstr "ๆ ๆณๆพๅฐ่ฟ็จๅผ็จ %s" -#: remote.c:1853 +#: remote.c:1935 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* ๅจๆฌๅฐๅฟฝ็ฅๅฏ็ฌ็ๅผ็จ '%s'" -#: remote.c:2016 +#: remote.c:2098 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "ๆจ็ๅๆฏๅบไบ '%s'๏ผไฝๆญคไธๆธธๅๆฏๅทฒ็ปไธๅญๅจใ\n" -#: remote.c:2020 +#: remote.c:2102 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " ๏ผไฝฟ็จ \"git branch --unset-upstream\" ๆฅไฟฎๅค๏ผ\n" -#: remote.c:2023 +#: remote.c:2105 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "ๆจ็ๅๆฏไธไธๆธธๅๆฏ '%s' ไธ่ดใ\n" -#: remote.c:2027 +#: remote.c:2109 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "ๆจ็ๅๆฏๅ '%s' ๆๅไธๅ็ๆไบคใ\n" -#: remote.c:2030 +#: remote.c:2112 #, c-format msgid " (use \"%s\" for details)\n" msgstr " ๏ผไฝฟ็จ \"%s\" ๆฅ็่ฏฆๆ ๏ผ\n" -#: remote.c:2034 +#: remote.c:2116 #, 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:2040 +#: remote.c:2122 msgid " (use \"git push\" to publish your local commits)\n" msgstr " ๏ผไฝฟ็จ \"git push\" ๆฅๅๅธๆจ็ๆฌๅฐๆไบค๏ผ\n" -#: remote.c:2043 +#: remote.c:2125 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5511,11 +6428,11 @@ msgstr[0] "ๆจ็ๅๆฏ่ฝๅ '%s' ๅ ฑ %d ไธชๆไบค๏ผๅนถไธๅฏไปฅๅฟซ่ฟใ\n" msgstr[1] "ๆจ็ๅๆฏ่ฝๅ '%s' ๅ ฑ %d ไธชๆไบค๏ผๅนถไธๅฏไปฅๅฟซ่ฟใ\n" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: remote.c:2051 +#: remote.c:2133 msgid " (use \"git pull\" to update your local branch)\n" msgstr " ๏ผไฝฟ็จ \"git pull\" ๆฅๆดๆฐๆจ็ๆฌๅฐๅๆฏ๏ผ\n" -#: remote.c:2054 +#: remote.c:2136 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5531,11 +6448,11 @@ msgstr[1] "" "ๅนถไธๅๅซๆ %d ๅ %d ๅคไธๅ็ๆไบคใ\n" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: remote.c:2064 +#: remote.c:2146 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " ๏ผไฝฟ็จ \"git pull\" ๆฅๅๅนถ่ฟ็จๅๆฏ๏ผ\n" -#: remote.c:2247 +#: remote.c:2337 #, c-format msgid "cannot parse expected object name '%s'" msgstr "ๆ ๆณ่งฃๆๆๆ็ๅฏน่ฑกๅ '%s'" @@ -5550,7 +6467,7 @@ msgstr "้่ฏฏ็ๆฟๆขๅผ็จๅ็งฐ๏ผ%s" msgid "duplicate replace ref: %s" msgstr "้ๅค็ๆฟๆขๅผ็จ๏ผ%s" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "ๅฏน่ฑก %s ็ๆฟๆขๅฑ็บงๅคชๆทฑ" @@ -5613,8 +6530,8 @@ msgstr "ไธ่ฝๅ ้ค stray '%s'" msgid "Recorded preimage for '%s'" msgstr "ไธบ '%s' ่ฎฐๅฝ preimage" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "ไธ่ฝๅๅปบ็ฎๅฝ '%s'" @@ -5648,20 +6565,34 @@ msgstr "ๅฟ่ฎฐ '%s' ็่งฃๅณๆนๆก\n" msgid "unable to open rr-cache directory" msgstr "ไธ่ฝๆๅผ rr-cache ็ฎๅฝ" -#: revision.c:2507 +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "ไธ่ฝ็กฎๅฎ HEAD ็ๆฌ" + +#: reset.c:70 reset.c:76 sequencer.c:3426 +#, c-format +msgid "failed to find tree of %s" +msgstr "ๆ ๆณๆพๅฐ %s ๆๅ็ๆ ใ" + +#: revision.c:2344 +msgid "--unpacked=<packfile> no longer supported" +msgstr "ไธๅๆฏๆ --unpacked=<packfile>" + +#: revision.c:2364 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "ๆช็ฅ็ --diff-merges ๅๅผ๏ผ%s" + +#: revision.c:2702 msgid "your current branch appears to be broken" msgstr "ๆจ็ๅฝๅๅๆฏๅฅฝๅ่ขซๆๅ" -#: revision.c:2510 +#: revision.c:2705 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "ๆจ็ๅฝๅๅๆฏ '%s' ๅฐๆ ไปปไฝๆไบค" -#: revision.c:2710 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent ไธ --bisect ไธๅ ผๅฎน" - -#: revision.c:2714 +#: revision.c:2915 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L ๅฐไธๆฏๆ -p ๅ -s ไนๅค็ๅทฎๅผๆ ผๅผ" @@ -5669,12 +6600,12 @@ msgstr "-L ๅฐไธๆฏๆ -p ๅ -s ไนๅค็ๅทฎๅผๆ ผๅผ" msgid "open /dev/null failed" msgstr "ไธ่ฝๆๅผ /dev/null" -#: run-command.c:1269 +#: run-command.c:1270 #, c-format msgid "cannot create async thread: %s" msgstr "ไธ่ฝๅๅปบ async ็บฟ็จ๏ผ%s" -#: run-command.c:1333 +#: run-command.c:1334 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5683,75 +6614,79 @@ msgstr "" "ๅ ไธบๆฒกๆๅฐ้ฉๅญ '%s' ่ฎพ็ฝฎไธบๅฏๆง่ก๏ผ้ฉๅญ่ขซๅฟฝ็ฅใๆจๅฏไปฅ้่ฟ\n" "้ ็ฝฎ `git config advice.ignoredHook false` ๆฅๅ ณ้ญ่ฟๆก่ญฆๅใ" -#: send-pack.c:141 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "่ฏปๅ่ฟ็จ่งฃๅ ็ถๆๆถๆถๅฐๆๅค็ flush ๅ " -#: send-pack.c:143 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "ไธ่ฝ่งฃๆ่ฟ็จ่งฃๅ ็ถๆ๏ผ%s" -#: send-pack.c:145 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "่ฟ็จ่งฃๅ ๅคฑ่ดฅ๏ผ%s" -#: send-pack.c:306 +#: send-pack.c:372 msgid "failed to sign the push certificate" msgstr "ไธบๆจ้่ฏไนฆ็ญพๅๅคฑ่ดฅ" -#: send-pack.c:420 +#: send-pack.c:460 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "ๆฅๆถ็ซฏไธๆฏๆ่ฟไธชไปๅบ็ๅๅธ็ฎๆณ" + +#: send-pack.c:469 msgid "the receiving end does not support --signed push" msgstr "ๆฅๆถ็ซฏไธๆฏๆ็ญพๅๆจ้" -#: send-pack.c:422 +#: send-pack.c:471 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "ๆชๅ้ๆจ้่ฏไนฆ๏ผๅ ไธบๆฅๆถ็ซฏไธๆฏๆ็ญพๅๆจ้" -#: send-pack.c:434 +#: send-pack.c:483 msgid "the receiving end does not support --atomic push" msgstr "ๆฅๆถ็ซฏไธๆฏๆๅๅญๆจ้" -#: send-pack.c:439 +#: send-pack.c:488 msgid "the receiving end does not support push options" msgstr "ๆฅๆถ็ซฏไธๆฏๆๆจ้้้กน" -#: sequencer.c:187 +#: sequencer.c:194 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "ๆ ๆ็ๆไบคไฟกๆฏๆธ ็ๆจกๅผ '%s'" -#: sequencer.c:292 +#: sequencer.c:308 #, c-format msgid "could not delete '%s'" msgstr "ๆ ๆณๅ ้ค '%s'" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "ๆ ๆณๅ ้ค '%s'" -#: sequencer.c:321 +#: sequencer.c:339 msgid "revert" msgstr "่ฟๅ" -#: sequencer.c:323 +#: sequencer.c:341 msgid "cherry-pick" msgstr "ๆฃ้" -#: sequencer.c:325 -msgid "rebase -i" -msgstr "rebase -i" +#: sequencer.c:343 +msgid "rebase" +msgstr "ๅๅบ" -#: sequencer.c:327 +#: sequencer.c:345 #, c-format msgid "unknown action: %d" msgstr "ๆช็ฅๅจไฝ๏ผ%d" -#: sequencer.c:385 +#: sequencer.c:404 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5759,7 +6694,7 @@ msgstr "" "ๅฒ็ช่งฃๅณๅฎๆฏๅ๏ผ็จ 'git add <่ทฏๅพ>' ๆ 'git rm <่ทฏๅพ>'\n" "ๅฝไปคๆ ่ฎฐไฟฎๆญฃๅ็ๆไปถ" -#: sequencer.c:388 +#: sequencer.c:407 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5768,115 +6703,109 @@ msgstr "" "ๅฒ็ช่งฃๅณๅฎๆฏๅ๏ผ็จ 'git add <่ทฏๅพ>' ๆ 'git rm <่ทฏๅพ>'\n" "ๅฏนไฟฎๆญฃๅ็ๆไปถๅๆ ่ฎฐ๏ผ็ถๅ็จ 'git commit' ๆไบค" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:420 sequencer.c:3028 #, c-format msgid "could not lock '%s'" msgstr "ไธ่ฝ้ๅฎ '%s'" -#: sequencer.c:408 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "ไธ่ฝๅๅ ฅ '%s'" + +#: sequencer.c:427 #, c-format msgid "could not write eol to '%s'" msgstr "ไธ่ฝๅฐๆข่ก็ฌฆๅๅ ฅ '%s'" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 #, c-format msgid "failed to finalize '%s'" msgstr "ๆ ๆณๅฎๆ '%s'" -#: 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:462 +#: sequencer.c:471 #, c-format msgid "your local changes would be overwritten by %s." msgstr "ๆจ็ๆฌๅฐไฟฎๆนๅฐ่ขซ%s่ฆ็ใ" -#: sequencer.c:466 +#: sequencer.c:475 msgid "commit your changes or stash them to proceed." msgstr "ๆไบคๆจ็ไฟฎๆนๆ่ดฎ่ๅๅ็ปง็ปญใ" -#: sequencer.c:498 +#: sequencer.c:507 #, c-format msgid "%s: fast-forward" msgstr "%s๏ผๅฟซ่ฟ" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:546 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "ๆ ๆ็ๆธ ็ๆจกๅผ %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:632 +#: sequencer.c:640 #, c-format msgid "%s: Unable to write new index file" msgstr "%s๏ผๆ ๆณๅๅ ฅๆฐ็ดขๅผๆไปถ" -#: sequencer.c:649 +#: sequencer.c:657 msgid "unable to update cache tree" msgstr "ไธ่ฝๆดๆฐ็ผๅญๆ " -#: sequencer.c:663 +#: sequencer.c:671 msgid "could not resolve HEAD commit" msgstr "ไธ่ฝ่งฃๆ HEAD ๆไบค" -#: sequencer.c:743 +#: sequencer.c:751 #, c-format msgid "no key present in '%.*s'" msgstr "ๅจ '%.*s' ไธญๆฒกๆ key" -#: sequencer.c:754 +#: sequencer.c:762 #, c-format msgid "unable to dequote value of '%s'" msgstr "ๆ ๆณไธบ '%s' ็ๅผๅปๅผๅท" -#: 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 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 #, c-format msgid "could not open '%s' for reading" msgstr "ๆ ๆณๆๅผ '%s' ่ฟ่ก่ฏปๅ" -#: sequencer.c:801 +#: sequencer.c:809 msgid "'GIT_AUTHOR_NAME' already given" msgstr "ๅทฒ็ป็ปๅบ 'GIT_AUTHOR_NAME'" -#: sequencer.c:806 +#: sequencer.c:814 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "ๅทฒ็ป็ปๅบ 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:811 +#: sequencer.c:819 msgid "'GIT_AUTHOR_DATE' already given" msgstr "ๅทฒ็ป็ปๅบ 'GIT_AUTHOR_DATE'" -#: sequencer.c:815 +#: sequencer.c:823 #, c-format msgid "unknown variable '%s'" msgstr "ๆช็ฅๅ้ '%s'" -#: sequencer.c:820 +#: sequencer.c:828 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "็ผบๅฐ 'GIT_AUTHOR_NAME'" -#: sequencer.c:822 +#: sequencer.c:830 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "็ผบๅฐ 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:824 +#: sequencer.c:832 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "็ผบๅฐ 'GIT_AUTHOR_DATE'" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "'%2$s' ไธญๆ ๆ็ๆฅๆๆ ผๅผ '%1$s'" - -#: sequencer.c:901 +#: sequencer.c:897 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5905,15 +6834,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "ๅๆ นๆไบค" - -#: sequencer.c:1216 +#: sequencer.c:1178 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' ้ฉๅญๅคฑ่ดฅ" -#: sequencer.c:1223 +#: sequencer.c:1184 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5937,7 +6862,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1197 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5960,326 +6885,339 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1239 msgid "couldn't look up newly created commit" msgstr "ๆ ๆณๆพๅฐๆฐๅๅปบ็ๆไบค" -#: sequencer.c:1280 +#: sequencer.c:1241 msgid "could not parse newly created commit" msgstr "ไธ่ฝ่งฃๆๆฐๅๅปบ็ๆไบค" -#: sequencer.c:1326 +#: sequencer.c:1287 msgid "unable to resolve HEAD after creating commit" msgstr "ๅๅปบๆไบคๅ๏ผไธ่ฝ่งฃๆ HEAD" -#: sequencer.c:1328 +#: sequencer.c:1289 msgid "detached HEAD" msgstr "ๅ็ฆปๅคดๆ้" # ่ฏ่ ๏ผไธญๆๅญ็ฌฆไธฒๆผๆฅ๏ผๅฏๅ ้คๅๅฏผ็ฉบๆ ผ -#: sequencer.c:1332 +#: sequencer.c:1293 msgid " (root-commit)" msgstr "๏ผๆ นๆไบค๏ผ" -#: sequencer.c:1353 +#: sequencer.c:1314 msgid "could not parse HEAD" msgstr "ไธ่ฝ่งฃๆ HEAD" -#: sequencer.c:1355 +#: sequencer.c:1316 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s ไธๆฏไธไธชๆไบค๏ผ" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "ไธ่ฝ่งฃๆ HEAD ๆไบค" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1373 sequencer.c:2067 msgid "unable to parse commit author" msgstr "ไธ่ฝ่งฃๆๆไบคไฝ่ " -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 msgid "git write-tree failed to write a tree" msgstr "git write-tree ๆ ๆณๅๅ ฅๆ ๅฏน่ฑก" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1417 sequencer.c:1535 #, c-format msgid "unable to read commit message from '%s'" msgstr "ไธ่ฝไป '%s' ่ฏปๅๆไบค่ฏดๆ" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1446 sequencer.c:1478 +#, c-format +msgid "invalid author identity '%s'" +msgstr "ๆ ๆ็ไฝ่ ่บซไปฝ '%s'" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "ๆๅ็ไฝ่ ๏ผ็ผบๅคฑๆฅๆไฟกๆฏ" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 msgid "failed to write commit object" msgstr "ๅๆไบคๅฏน่ฑกๅคฑ่ดฅ" -#: sequencer.c:1526 +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "ไธ่ฝๆดๆฐ %s" + +#: sequencer.c:1567 #, c-format msgid "could not parse commit %s" msgstr "ไธ่ฝ่งฃๆๆไบค %s" -#: sequencer.c:1531 +#: sequencer.c:1572 #, c-format msgid "could not parse parent commit %s" msgstr "ไธ่ฝ่งฃๆ็ถๆไบค %s" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1655 sequencer.c:1766 #, c-format msgid "unknown command: %d" msgstr "ๆช็ฅๅฝไปค๏ผ%d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1713 sequencer.c:1738 #, c-format msgid "This is a combination of %d commits." msgstr "่ฟๆฏไธไธช %d ไธชๆไบค็็ปๅใ" -#: sequencer.c:1672 +#: sequencer.c:1723 msgid "need a HEAD to fixup" msgstr "้่ฆไธไธช HEAD ๆฅไฟฎๅค" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1725 sequencer.c:3338 msgid "could not read HEAD" msgstr "ไธ่ฝ่ฏปๅ HEAD" -#: sequencer.c:1676 +#: sequencer.c:1727 msgid "could not read HEAD's commit message" msgstr "ไธ่ฝ่ฏปๅ HEAD ็ๆไบค่ฏดๆ" -#: sequencer.c:1682 +#: sequencer.c:1733 #, c-format msgid "cannot write '%s'" msgstr "ไธ่ฝๅ '%s'" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "่ฟๆฏ็ฌฌไธไธชๆไบค่ฏดๆ๏ผ" -#: sequencer.c:1697 +#: sequencer.c:1748 #, c-format msgid "could not read commit message of %s" msgstr "ไธ่ฝ่ฏปๅ %s ็ๆไบค่ฏดๆ" -#: sequencer.c:1704 +#: sequencer.c:1755 #, c-format msgid "This is the commit message #%d:" msgstr "่ฟๆฏๆไบค่ฏดๆ #%d๏ผ" -#: sequencer.c:1710 +#: sequencer.c:1761 #, c-format msgid "The commit message #%d will be skipped:" msgstr "ๆไบค่ฏดๆ #%d ๅฐ่ขซ่ทณ่ฟ๏ผ" -#: sequencer.c:1798 +#: sequencer.c:1849 msgid "your index file is unmerged." msgstr "ๆจ็็ดขๅผๆไปถๆชๅฎๆๅๅนถใ" -#: sequencer.c:1805 +#: sequencer.c:1856 msgid "cannot fixup root commit" msgstr "ไธ่ฝไฟฎๅคๆ นๆไบค" -#: sequencer.c:1824 +#: sequencer.c:1875 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "ๆไบค %s ๆฏไธไธชๅๅนถๆไบคไฝๆชๆไพ -m ้้กนใ" -#: sequencer.c:1832 sequencer.c:1840 +#: sequencer.c:1883 sequencer.c:1891 #, c-format msgid "commit %s does not have parent %d" msgstr "ๆไบค %s ๆฒกๆ็ฌฌ %d ไธช็ถๆไบค" -#: sequencer.c:1846 +#: sequencer.c:1897 #, 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:1865 +#: sequencer.c:1916 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s๏ผไธ่ฝ่งฃๆ็ถๆไบค %s" -#: sequencer.c:1930 +#: sequencer.c:1981 #, c-format msgid "could not rename '%s' to '%s'" msgstr "ไธ่ฝๅฐ '%s' ้ๅฝๅไธบ '%s'" -#: sequencer.c:1985 +#: sequencer.c:2038 #, c-format msgid "could not revert %s... %s" msgstr "ไธ่ฝ่ฟๅ %s... %s" -#: sequencer.c:1986 +#: sequencer.c:2039 #, c-format msgid "could not apply %s... %s" msgstr "ไธ่ฝๅบ็จ %s... %s" -#: sequencer.c:2045 +#: sequencer.c:2059 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "ไธขๅผ %s %s -- ่กฅไธๅ ๅฎนๅทฒๅจไธๆธธ\n" + +#: sequencer.c:2117 #, c-format msgid "git %s: failed to read the index" msgstr "git %s๏ผๆ ๆณ่ฏปๅ็ดขๅผ" -#: sequencer.c:2052 +#: sequencer.c:2124 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s๏ผๆ ๆณๅทๆฐ็ดขๅผ" -#: sequencer.c:2128 +#: sequencer.c:2201 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s ไธๆฅๅๅๆฐ๏ผ'%s'" -#: sequencer.c:2137 +#: sequencer.c:2210 #, c-format msgid "missing arguments for %s" msgstr "็ผบๅฐ %s ็ๅๆฐ" -#: sequencer.c:2174 +#: sequencer.c:2241 #, c-format -msgid "could not parse '%.*s'" -msgstr "ๆ ๆณ่งฃๆ '%.*s'" +msgid "could not parse '%s'" +msgstr "ๆ ๆณ่งฃๆ '%s'" -#: sequencer.c:2228 +#: sequencer.c:2302 #, c-format msgid "invalid line %d: %.*s" msgstr "ๆ ๆ่ก %d๏ผ%.*s" -#: sequencer.c:2239 +#: sequencer.c:2313 #, c-format msgid "cannot '%s' without a previous commit" msgstr "ๆฒกๆ็ถๆไบค็ๆ ๅตไธไธ่ฝ '%s'" -#: 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 +#: sequencer.c:2399 msgid "cancelling a cherry picking in progress" msgstr "ๆญฃๅจๅๆถไธไธช่ฟ่กไธญ็ๆฃ้" -#: sequencer.c:2330 +#: sequencer.c:2408 msgid "cancelling a revert in progress" msgstr "ๆญฃๅจๅๆถไธไธช่ฟ่กไธญ็่ฟๅ" -#: sequencer.c:2364 +#: sequencer.c:2452 msgid "please fix this using 'git rebase --edit-todo'." msgstr "่ฏท็จ 'git rebase --edit-todo' ๆฅไฟฎๆนใ" -#: sequencer.c:2366 +#: sequencer.c:2454 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "ไธๅฏ็จ็ๆไปคๆธ ๅ๏ผ'%s'" -#: sequencer.c:2371 +#: sequencer.c:2459 msgid "no commits parsed." msgstr "ๆฒกๆ่งฃๆๆไบคใ" -#: sequencer.c:2382 +#: sequencer.c:2470 msgid "cannot cherry-pick during a revert." msgstr "ไธ่ฝๅจๅ้ไธญๆง่กๆฃ้ใ" -#: sequencer.c:2384 +#: sequencer.c:2472 msgid "cannot revert during a cherry-pick." msgstr "ไธ่ฝๅจๆฃ้ไธญๆง่กๅ้ใ" -#: sequencer.c:2466 +#: sequencer.c:2550 #, c-format msgid "invalid value for %s: %s" msgstr "%s ็ๅผๆ ๆ๏ผ%s" -#: sequencer.c:2553 +#: sequencer.c:2657 msgid "unusable squash-onto" msgstr "ไธๅฏ็จ็ squash-onto" -#: sequencer.c:2569 +#: sequencer.c:2677 #, c-format msgid "malformed options sheet: '%s'" msgstr "ๆ ผๅผ้่ฏฏ็้้กนๆธ ๅ๏ผ'%s'" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2769 sequencer.c:4609 msgid "empty commit set passed" msgstr "ๆไพไบ็ฉบ็ๆไบค้" -#: sequencer.c:2668 +#: sequencer.c:2786 msgid "revert is already in progress" msgstr "ไธไธช่ฟๅๆไฝๅทฒๅจ่ฟ่ก" -#: sequencer.c:2670 +#: sequencer.c:2788 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "ๅฐ่ฏ \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2673 +#: sequencer.c:2791 msgid "cherry-pick is already in progress" msgstr "ๆฃ้ๆไฝๅทฒๅจ่ฟ่ก" -#: sequencer.c:2675 +#: sequencer.c:2793 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "ๅฐ่ฏ \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2689 +#: sequencer.c:2807 #, c-format msgid "could not create sequencer directory '%s'" msgstr "ไธ่ฝๅๅปบๅบๅ็ฎๅฝ '%s'" -#: sequencer.c:2704 +#: sequencer.c:2822 msgid "could not lock HEAD" msgstr "ไธ่ฝ้ๅฎ HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2882 sequencer.c:4325 msgid "no cherry-pick or revert in progress" msgstr "ๆฃ้ๆ่ฟๅๆไฝๅนถๆช่ฟ่ก" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2884 sequencer.c:2895 msgid "cannot resolve HEAD" msgstr "ไธ่ฝ่งฃๆ HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2886 sequencer.c:2930 msgid "cannot abort from a branch yet to be born" msgstr "ไธ่ฝไปๅฐๆชๅปบ็ซ็ๅๆฏ็ปๆญข" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2916 builtin/grep.c:745 #, c-format msgid "cannot open '%s'" msgstr "ไธ่ฝๆๅผ '%s'" -#: sequencer.c:2800 +#: sequencer.c:2918 #, c-format msgid "cannot read '%s': %s" msgstr "ไธ่ฝ่ฏปๅ '%s'๏ผ%s" -#: sequencer.c:2801 +#: sequencer.c:2919 msgid "unexpected end of file" msgstr "ๆๅค็ๆไปถ็ปๆ" -#: sequencer.c:2807 +#: sequencer.c:2925 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "ไฟๅญๆฃ้ๆไบคๅ็ HEAD ๆไปถ '%s' ๆๅ" -#: sequencer.c:2818 +#: sequencer.c:2936 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "ๆจๅฅฝๅ็งปๅจไบ HEADใๆช่ฝๅ้๏ผๆฃๆฅๆจ็ HEAD๏ผ" -#: sequencer.c:2859 +#: sequencer.c:2977 msgid "no revert in progress" msgstr "ๆฒกๆๆญฃๅจ่ฟ่ก็่ฟๅ" -#: sequencer.c:2867 +#: sequencer.c:2986 msgid "no cherry-pick in progress" msgstr "ๆฒกๆๆญฃๅจ่ฟ่ก็ๆฃ้" -#: sequencer.c:2877 +#: sequencer.c:2996 msgid "failed to skip the commit" msgstr "ๆ ๆณ่ทณ่ฟ่ฟไธชๆไบค" -#: sequencer.c:2884 +#: sequencer.c:3003 msgid "there is nothing to skip" msgstr "ๆฒกๆ่ฆ่ทณ่ฟ็" -#: sequencer.c:2887 +#: sequencer.c:3006 #, c-format msgid "" "have you committed already?\n" @@ -6288,21 +7226,16 @@ msgstr "" "ๆจๅทฒ็ปๆไบคไบไน๏ผ\n" "่ฏ่ฏ \"git %s --continue\"" -#: sequencer.c:3011 sequencer.c:4015 -#, c-format -msgid "could not update %s" -msgstr "ไธ่ฝๆดๆฐ %s" - -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3168 sequencer.c:4217 msgid "cannot read HEAD" msgstr "ไธ่ฝ่ฏปๅ HEAD" -#: sequencer.c:3066 +#: sequencer.c:3185 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "ๆ ๆณๆท่ด '%s' ่ณ '%s'" -#: sequencer.c:3074 +#: sequencer.c:3193 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6321,28 +7254,28 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3203 #, c-format msgid "Could not apply %s... %.*s" msgstr "ไธ่ฝๅบ็จ %s... %.*s" -#: sequencer.c:3091 +#: sequencer.c:3210 #, c-format msgid "Could not merge %.*s" msgstr "ไธ่ฝๅๅนถ %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 #, 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:3240 +#, c-format +msgid "Executing: %s\n" +msgstr "ๆญฃๅจๆง่ก๏ผ%s\n" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: sequencer.c:3136 +#: sequencer.c:3255 #, c-format msgid "" "execution failed: %s\n" @@ -6357,11 +7290,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3261 msgid "and made changes to the index and/or the working tree\n" msgstr "ๅนถไธไฟฎๆน็ดขๅผๅ/ๆๅทฅไฝๅบ\n" -#: sequencer.c:3148 +#: sequencer.c:3267 #, c-format msgid "" "execution succeeded: %s\n" @@ -6378,111 +7311,128 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3328 #, c-format msgid "illegal label name: '%.*s'" msgstr "้ๆณ็ๆ ็ญพๅ็งฐ๏ผ'%.*s'" -#: sequencer.c:3263 +#: sequencer.c:3382 msgid "writing fake root commit" msgstr "ๅไผชๆ นๆไบค" -#: sequencer.c:3268 +#: sequencer.c:3387 msgid "writing squash-onto" msgstr "ๅๅ ฅ squash-onto" -#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 -#, c-format -msgid "failed to find tree of %s" -msgstr "ๆ ๆณๆพๅฐ %s ๆๅ็ๆ ใ" - -#: sequencer.c:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "ไธ่ฝๅๅ ฅ็ดขๅผ" - -#: sequencer.c:3351 +#: sequencer.c:3471 #, c-format msgid "could not resolve '%s'" msgstr "ๆ ๆณ่งฃๆ '%s'" -#: sequencer.c:3379 +#: sequencer.c:3502 msgid "cannot merge without a current revision" msgstr "ๆฒกๆๅฝๅ็ๆฌไธ่ฝๅๅนถ" -#: sequencer.c:3401 +#: sequencer.c:3524 #, c-format msgid "unable to parse '%.*s'" msgstr "ๆ ๆณ่งฃๆ '%.*s'" -#: sequencer.c:3410 +#: sequencer.c:3533 #, c-format msgid "nothing to merge: '%.*s'" msgstr "ๆ ๅฏ็จๅๅนถ๏ผ'%.*s'" -#: sequencer.c:3422 +#: sequencer.c:3545 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "็ซ ้ฑผๅๅนถไธ่ฝๅจไธไธชๆฐ็ๆ นๆไบคไธๆง่ก" -#: sequencer.c:3437 +#: sequencer.c:3561 #, c-format msgid "could not get commit message of '%s'" msgstr "ไธ่ฝ่ทๅ '%s' ็ๆไบค่ฏดๆ" -#: sequencer.c:3590 +#: sequencer.c:3730 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "็่ณไธ่ฝๅฐ่ฏๅๅนถ '%.*s'" -#: sequencer.c:3606 +#: sequencer.c:3746 msgid "merge: Unable to write new index file" msgstr "ๅๅนถ๏ผๆ ๆณๅๅ ฅๆฐ็ดขๅผๆไปถ" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "ๆ ๆณ autostash" + +#: sequencer.c:3823 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "ๆๅค็ stash ๅๅบ๏ผ'%s'" + +#: sequencer.c:3829 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "ไธ่ฝไธบ '%s' ๅๅปบ็ฎๅฝ" + +#: sequencer.c:3832 +#, c-format +msgid "Created autostash: %s\n" +msgstr "ๅๅปบไบ autostash๏ผ%s\n" + +#: sequencer.c:3836 +msgid "could not reset --hard" +msgstr "ๆ ๆณ reset --hard" + +#: sequencer.c:3861 #, c-format msgid "Applied autostash.\n" msgstr "ๅทฒๅบ็จ autostashใ\n" -#: sequencer.c:3687 +#: sequencer.c:3873 #, c-format msgid "cannot store %s" msgstr "ไธ่ฝๅญๅจ %s" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3876 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\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" +"%s\n" +"ๆจ็ไฟฎๆนๅจ่ดฎ่ๅบไธญๅพๅฎๅ จใ\n" "ๆจๅฏไปฅๅจไปปไฝๆถๅ่ฟ่ก \"git stash pop\" ๆ \"git stash drop\"ใ\n" -#: sequencer.c:3751 -#, c-format -msgid "could not checkout %s" -msgstr "ไธ่ฝๆฃๅบ %s" +#: sequencer.c:3881 +msgid "Applying autostash resulted in conflicts." +msgstr "ๅบ็จ่ชๅจ่ดฎ่ๅฏผ่ดๅฒ็ชใ" + +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." +msgstr "่ชๅจ่ดฎ่ๅทฒ็ปๅญๅจ๏ผๆญฃๅจๅๅปบไธไธชๆฐ็่ดฎ่ๆก็ฎใ" -#: sequencer.c:3765 +#: sequencer.c:3974 #, c-format msgid "%s: not a valid OID" msgstr "%s๏ผไธๆฏไธไธชๆๆ็ๅฏน่ฑก ID" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "ไธ่ฝๅ็ฆปๅคดๆ้" -#: sequencer.c:3785 +#: sequencer.c:3994 #, c-format msgid "Stopped at HEAD\n" msgstr "ๅๆญขๅจ HEAD\n" -#: sequencer.c:3787 +#: sequencer.c:3996 #, c-format msgid "Stopped at %s\n" msgstr "ๅๆญขๅจ %s\n" -#: sequencer.c:3795 +#: sequencer.c:4004 #, c-format msgid "" "Could not execute the todo command\n" @@ -6502,48 +7452,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "ๆญฃๅจๅๅบ๏ผ%d/%d๏ผ%s" + +#: sequencer.c:4095 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "ๅๆญขๅจ %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:4166 #, c-format msgid "unknown command %d" msgstr "ๆช็ฅๅฝไปค %d" -#: sequencer.c:4003 +#: sequencer.c:4225 msgid "could not read orig-head" msgstr "ไธ่ฝ่ฏปๅ orig-head" -#: sequencer.c:4008 +#: sequencer.c:4230 msgid "could not read 'onto'" msgstr "ไธ่ฝ่ฏปๅ 'onto'" -#: sequencer.c:4022 +#: sequencer.c:4244 #, c-format msgid "could not update HEAD to %s" msgstr "ไธ่ฝๆดๆฐ HEAD ไธบ %s" -#: sequencer.c:4115 +#: sequencer.c:4304 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "ๆๅๅๅบๅนถๆดๆฐ %sใ\n" + +#: sequencer.c:4337 msgid "cannot rebase: You have unstaged changes." msgstr "ไธ่ฝๅๅบ๏ผๆจๆๆชๆๅญ็ๅๆดใ" -#: sequencer.c:4124 +#: sequencer.c:4346 msgid "cannot amend non-existing commit" msgstr "ไธ่ฝไฟฎ่กฅไธๅญๅจ็ๆไบค" -#: sequencer.c:4126 +#: sequencer.c:4348 #, c-format msgid "invalid file: '%s'" msgstr "ๆ ๆๆไปถ๏ผ'%s'" -#: sequencer.c:4128 +#: sequencer.c:4350 #, c-format msgid "invalid contents: '%s'" msgstr "ๆ ๆๅ ๅฎน๏ผ'%s'" -#: sequencer.c:4131 +#: sequencer.c:4353 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6552,68 +7512,64 @@ msgstr "" "\n" "ๆจ็ๅทฅไฝๅบไธญๆๆชๆไบค็ๅๆดใ่ฏทๅ ๆไบค็ถๅๅๆฌก่ฟ่ก 'git rebase --continue'ใ" -#: sequencer.c:4167 sequencer.c:4205 +#: sequencer.c:4389 sequencer.c:4428 #, c-format msgid "could not write file: '%s'" msgstr "ไธ่ฝๅๅ ฅๆไปถ๏ผ'%s'" -#: sequencer.c:4220 +#: sequencer.c:4444 msgid "could not remove CHERRY_PICK_HEAD" msgstr "ไธ่ฝๅ ้ค CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4451 msgid "could not commit staged changes." msgstr "ไธ่ฝๆไบคๆๅญ็ไฟฎๆนใ" -#: sequencer.c:4328 +#: sequencer.c:4477 +#, c-format +msgid "invalid committer '%s'" +msgstr "ๆ ๆ็ๆไบค่ '%s'" + +#: sequencer.c:4586 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s๏ผไธ่ฝๆฃ้ไธไธช%s" -#: sequencer.c:4332 +#: sequencer.c:4590 #, c-format msgid "%s: bad revision" msgstr "%s๏ผ้่ฏฏ็็ๆฌ" -#: sequencer.c:4367 +#: sequencer.c:4625 msgid "can't revert as initial commit" msgstr "ไธ่ฝไฝไธบๅๅงๆไบคๅ้" -#: sequencer.c:4810 +#: sequencer.c:5102 msgid "make_script: unhandled options" msgstr "make_script๏ผๆๆช่ฝๅค็็้้กน" -#: sequencer.c:4813 +#: sequencer.c:5105 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 +#: sequencer.c:5347 sequencer.c:5364 msgid "nothing to do" msgstr "ๆ ไบๅฏๅ" -#: sequencer.c:5114 +#: sequencer.c:5383 msgid "could not skip unnecessary pick commands" msgstr "ๆ ๆณ่ทณ่ฟไธๅฟ ่ฆ็ๆฃ้" -#: sequencer.c:5197 +#: sequencer.c:5480 msgid "the script was already rearranged." msgstr "่ๆฌๅทฒ็ป้ๆฐ็ผๆใ" -#: setup.c:123 +#: setup.c:133 #, c-format -msgid "'%s' is outside repository" -msgstr "'%s' ๅจไปๅบไนๅค" +msgid "'%s' is outside repository at '%s'" +msgstr "'%s' ๅจไฝไบ '%s' ็ไปๅบไนๅค" -#: setup.c:173 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6622,7 +7578,7 @@ msgstr "" "%s๏ผๅทฅไฝๅบไธญๆ ๆญค่ทฏๅพใ\n" "ไฝฟ็จๅฝไปค 'git <ๅฝไปค> -- <่ทฏๅพ>...' ๆฅๆๅฎๆฌๅฐไธๅญๅจ็่ทฏๅพใ" -#: setup.c:186 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6633,12 +7589,12 @@ msgstr "" "ไฝฟ็จ '--' ๆฅๅ้็ๆฌๅ่ทฏๅพ๏ผไพๅฆ๏ผ\n" "'git <ๅฝไปค> [<็ๆฌ>...] -- [<ๆไปถ>...]'" -#: setup.c:235 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "้้กน '%s' ๅฟ ้กปๅจๅ ถไป้้้กนๅๆฐไนๅ" -#: setup.c:254 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6649,101 +7605,105 @@ msgstr "" "ไฝฟ็จ '--' ๆฅๅ้็ๆฌๅ่ทฏๅพ๏ผไพๅฆ๏ผ\n" "'git <ๅฝไปค> [<็ๆฌ>...] -- [<ๆไปถ>...]'" -#: setup.c:390 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "ๆ ๆณไฝฟ็จๆ ๆ้ ็ฝฎๆฅๅๅปบๅทฅไฝๅบ" -#: setup.c:394 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "่ฏฅๆไฝๅฟ ้กปๅจไธไธชๅทฅไฝๅบไธญ่ฟ่ก" -#: setup.c:540 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "ๆๆ git ไปๅบ็ๆฌ <= %d๏ผๅดๅพๅฐ %d" -#: setup.c:548 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "ๅ็ฐๆช็ฅ็ไปๅบๆฉๅฑ๏ผ" -#: setup.c:567 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "ไปๅบ็็ๆฌๆฏ 0๏ผไฝๆฏๅ็ฐไป ็จไบ v1 ็ๆฉๅฑ๏ผ" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "ๆๅผ '%s' ๅบ้" -#: setup.c:569 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "ๆไปถๅคชๅคง๏ผๆ ๆณไฝไธบ .git ๆไปถ๏ผ'%s'" -#: setup.c:571 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "่ฏปๅ %s ๅบ้" -#: setup.c:573 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "ๆ ๆ็ gitfile ๆ ผๅผ๏ผ%s" -#: setup.c:575 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "ๅจ gitfile ไธญๆฒกๆ่ทฏๅพ๏ผ%s" -#: setup.c:577 +#: setup.c:710 #, c-format msgid "not a git repository: %s" -msgstr "ไธๆฏไธไธช git ไปๅบ๏ผ%s" +msgstr "ไธๆฏ git ไปๅบ๏ผ%s" -#: setup.c:676 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "'$%s' ๅคชๅคง" -#: setup.c:690 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" -msgstr "ไธๆฏไธไธช git ไปๅบ๏ผ'%s'" +msgstr "ไธๆฏ git ไปๅบ๏ผ'%s'" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "ไธ่ฝๅๆข็ฎๅฝๅฐ '%s'" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "ๆ ๆณ่ฟๅๅฝๅๅทฅไฝ็ฎๅฝ" -#: setup.c:851 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "่ทๅ '%*s%s%s' ็ถๆ๏ผstat๏ผๅคฑ่ดฅ" -#: setup.c:1083 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "ไธ่ฝ่ฏปๅๅฝๅๅทฅไฝ็ฎๅฝ" -#: setup.c:1092 setup.c:1098 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "ไธ่ฝๅๆขๅฐ '%s'" -#: setup.c:1103 +#: setup.c:1245 #, c-format msgid "not a git repository (or any of the parent directories): %s" -msgstr "ไธๆฏไธไธช git ไปๅบ๏ผๆ่ ไปปไฝ็ถ็ฎๅฝ๏ผ๏ผ%s" +msgstr "ไธๆฏ git ไปๅบ๏ผๆ่ ไปปไฝ็ถ็ฎๅฝ๏ผ๏ผ%s" -#: setup.c:1109 +#: setup.c:1251 #, 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 ไปๅบ๏ผๆ่ ็ด่ณๆ่ฝฝ็น %s ็ไปปไฝ็ถ็ฎๅฝ๏ผ\n" "ๅๆญขๅจๆไปถ็ณป็ป่พน็๏ผๆช่ฎพ็ฝฎ GIT_DISCOVERY_ACROSS_FILESYSTEM๏ผใ" -#: setup.c:1220 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6752,282 +7712,282 @@ msgstr "" "ๅๆฐ core.sharedRepository ็ๆไปถๅฑๆงๅผๆ้ฎ้ข๏ผ0%.3o๏ผใ\n" "ๆไปถๅฑไธปๅฟ ้กปๅง็ปๆฅๆ่ฏปๅๆ้ใ" -#: setup.c:1264 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "ไธ่ฝๆๅผๆ่ ๅคๅถ /dev/null" -#: setup.c:1279 +#: setup.c:1424 msgid "fork failed" msgstr "fork ๅคฑ่ดฅ" -#: setup.c:1284 +#: setup.c:1429 msgid "setsid failed" msgstr "setsid ๅคฑ่ดฅ" -#: sha1-file.c:453 +#: sha1-file.c:470 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "ๅฏน่ฑก็ฎๅฝ %s ไธๅญๅจ๏ผๆฃๆฅ .git/objects/info/alternates" -#: sha1-file.c:504 +#: sha1-file.c:521 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "ๆ ๆณ่ง่ๅๅค็จๅฏน่ฑก่ทฏๅพ๏ผ%s" -#: sha1-file.c:576 +#: sha1-file.c:593 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s๏ผๅฟฝ็ฅๅค็จๅฏน่ฑกๅบ๏ผๅตๅฅๅคชๆทฑ" -#: sha1-file.c:583 +#: sha1-file.c:600 #, c-format msgid "unable to normalize object directory: %s" msgstr "ๆ ๆณ่ง่ๅๅฏน่ฑก็ฎๅฝ: %s" -#: sha1-file.c:626 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" msgstr "ๆ ๆณ fdopen ๆฟๆข้ๆไปถ" -#: sha1-file.c:644 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "ๆ ๆณ่ฏปๅๆฟไปฃๆไปถ" -#: sha1-file.c:651 +#: sha1-file.c:668 msgid "unable to move new alternates file into place" msgstr "ๆ ๆณๅฐๆฐ็ๆฟไปฃๆไปถ็งปๅจๅฐไฝ" -#: sha1-file.c:686 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "่ทฏๅพ '%s' ไธๅญๅจ" -#: sha1-file.c:712 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "ๅฐไธๆฏๆๅฐๅ่ไปๅบ '%s' ไฝไธบไธไธช้พๆฅๆฃๅบใ" -#: sha1-file.c:718 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "ๅ่ไปๅบ '%s' ไธๆฏไธไธชๆฌๅฐไปๅบใ" -#: sha1-file.c:724 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "ๅ่ไปๅบ '%s' ๆฏไธไธชๆต ๅ ้" -#: sha1-file.c:732 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "ๅ่ไปๅบ '%s' ๅทฒ่ขซ็งปๆค" -#: sha1-file.c:792 +#: sha1-file.c:804 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "่งฃๆๅค็จๅผ็จๆถๆ ๆ็่ก๏ผ%s" -#: sha1-file.c:944 +#: sha1-file.c:954 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "ๅฐ่ฏ mmap %<PRIuMAX>๏ผ่ถ ่ฟไบๆๅคงๅผ %<PRIuMAX>" -#: sha1-file.c:969 +#: sha1-file.c:975 msgid "mmap failed" msgstr "mmap ๅคฑ่ดฅ" -#: sha1-file.c:1133 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "ๅฏน่ฑกๆไปถ %s ไธบ็ฉบ" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1274 sha1-file.c:2467 #, c-format msgid "corrupt loose object '%s'" msgstr "ๆๅ็ๆพๆฃๅฏน่ฑก '%s'" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1276 sha1-file.c:2471 #, c-format msgid "garbage at end of loose object '%s'" msgstr "ๆพๆฃๅฏน่ฑก '%s' ๅ้ขๆๅๅพๆฐๆฎ" -#: sha1-file.c:1301 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "ๆ ๆ็ๅฏน่ฑก็ฑปๅ" -#: sha1-file.c:1385 +#: sha1-file.c:1402 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "ๆ ๆณ็จ --allow-unknown-type ๅๆฐ่งฃๅผ %s ๅคดไฟกๆฏ" -#: sha1-file.c:1388 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "ๆ ๆณ่งฃๅผ %s ๅคด้จ" -#: sha1-file.c:1394 +#: sha1-file.c:1411 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "ๆ ๆณ็จ --allow-unknown-type ๅๆฐ่งฃๆ %s ๅคดไฟกๆฏ" -#: sha1-file.c:1397 +#: sha1-file.c:1414 #, c-format msgid "unable to parse %s header" msgstr "ๆ ๆณ่งฃๆ %s ๅคด้จ" -#: sha1-file.c:1588 +#: sha1-file.c:1641 #, c-format msgid "failed to read object %s" msgstr "่ฏปๅๅฏน่ฑก %s ๅคฑ่ดฅ" -#: sha1-file.c:1592 +#: sha1-file.c:1645 #, c-format msgid "replacement %s not found for %s" msgstr "ๆพไธๅฐ %2$s ็ๆฟไปฃ %1$s" -#: sha1-file.c:1596 +#: sha1-file.c:1649 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "ๆพๆฃๅฏน่ฑก %s๏ผไฟๅญๅจ %s๏ผๅทฒๆๅ" -#: sha1-file.c:1600 +#: sha1-file.c:1653 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "ๆๅ ๅฏน่ฑก %s๏ผไฟๅญๅจ %s๏ผๅทฒๆๅ" -#: sha1-file.c:1703 +#: sha1-file.c:1758 #, c-format msgid "unable to write file %s" msgstr "ๆ ๆณๅๆไปถ %s" -#: sha1-file.c:1710 +#: sha1-file.c:1765 #, c-format msgid "unable to set permission to '%s'" msgstr "ๆ ๆณไธบ '%s' ่ฎพ็ฝฎๆ้" -#: sha1-file.c:1717 +#: sha1-file.c:1772 msgid "file write error" msgstr "ๆไปถๅ้่ฏฏ" -#: sha1-file.c:1736 +#: sha1-file.c:1792 msgid "error when closing loose object file" msgstr "ๅ ณ้ญๆพๆฃๅฏน่ฑกๆไปถๆถๅบ้" -#: sha1-file.c:1801 +#: sha1-file.c:1857 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "ๆ้ไธ่ถณ๏ผๆ ๆณๅจไปๅบๅฏน่ฑกๅบ %s ไธญๆทปๅ ๅฏน่ฑก" -#: sha1-file.c:1803 +#: sha1-file.c:1859 msgid "unable to create temporary file" msgstr "ๆ ๆณๅๅปบไธดๆถๆไปถ" -#: sha1-file.c:1827 +#: sha1-file.c:1883 msgid "unable to write loose object file" msgstr "ไธ่ฝๅๆพๆฃๅฏน่ฑกๆไปถ" -#: sha1-file.c:1833 +#: sha1-file.c:1889 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "ไธ่ฝๅ็ผฉๆฐๅฏน่ฑก %s๏ผ%d๏ผ" -#: sha1-file.c:1837 +#: sha1-file.c:1893 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "ๅจๅฏน่ฑก %s ไธ่ฐ็จ deflateEnd ๅคฑ่ดฅ๏ผ%d๏ผ" -#: sha1-file.c:1841 +#: sha1-file.c:1897 #, c-format msgid "confused by unstable object source data for %s" msgstr "่ขซ %s ็ไธ็จณๅฎๅฏน่ฑกๆบๆฐๆฎๆ็ณๆถไบ" -#: sha1-file.c:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1907 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "ๅจ %s ไธ่ฐ็จ utime() ๅคฑ่ดฅ" -#: sha1-file.c:1926 +#: sha1-file.c:1984 #, c-format msgid "cannot read object for %s" msgstr "ไธ่ฝ่ฏปๅๅฏน่ฑก %s" -#: sha1-file.c:1966 +#: sha1-file.c:2035 msgid "corrupt commit" msgstr "ๆๅ็ๆไบค" -#: sha1-file.c:1974 +#: sha1-file.c:2043 msgid "corrupt tag" msgstr "ๆๅ็ๆ ็ญพ" -#: sha1-file.c:2073 +#: sha1-file.c:2143 #, c-format msgid "read error while indexing %s" msgstr "็ดขๅผ %s ๆถ่ฏปๅ้่ฏฏ" -#: sha1-file.c:2076 +#: sha1-file.c:2146 #, c-format msgid "short read while indexing %s" msgstr "็ดขๅผ %s ๆถ่ฏปๅ ฅไธๅฎๆด" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2219 sha1-file.c:2229 #, c-format msgid "%s: failed to insert into database" msgstr "%s๏ผๆๅ ฅๆฐๆฎๅบๅคฑ่ดฅ" -#: sha1-file.c:2164 +#: sha1-file.c:2235 #, c-format msgid "%s: unsupported file type" msgstr "%s๏ผไธๆฏๆ็ๆไปถ็ฑปๅ" -#: sha1-file.c:2188 +#: sha1-file.c:2259 #, c-format msgid "%s is not a valid object" msgstr "%s ไธๆฏไธไธชๆๆ็ๅฏน่ฑก" -#: sha1-file.c:2190 +#: sha1-file.c:2261 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s ไธๆฏไธไธชๆๆ็ '%s' ๅฏน่ฑก" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2288 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "ไธ่ฝๆๅผ %s" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2478 sha1-file.c:2531 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s ็ๅๅธๅผไธๅน้ ๏ผ้ขๆ %s๏ผ" -#: sha1-file.c:2431 +#: sha1-file.c:2502 #, c-format msgid "unable to mmap %s" msgstr "ไธ่ฝ mmap %s" -#: sha1-file.c:2436 +#: sha1-file.c:2507 #, c-format msgid "unable to unpack header of %s" msgstr "ๆ ๆณ่งฃๅ็ผฉ %s ็ๅคด้จ" -#: sha1-file.c:2442 +#: sha1-file.c:2513 #, c-format msgid "unable to parse header of %s" msgstr "ๆ ๆณ่งฃๆ %s ็ๅคด้จ" -#: sha1-file.c:2453 +#: sha1-file.c:2524 #, c-format msgid "unable to unpack contents of %s" msgstr "ๆ ๆณ่งฃๅ็ผฉ %s ็ๅ ๅฎน" -#: sha1-name.c:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "็ญ SHA1 %s ๅญๅจๆญงไน" -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "ๅ้่ ๆ๏ผ" -#: sha1-name.c:800 +#: 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" @@ -7048,44 +8008,110 @@ 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:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "่ทฏๅพ '%s' ๅจ็ฃ็ไธ๏ผไฝๆฏไธๅจ '%.*s' ไธญ" + +#: sha1-name.c:1708 +#, 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:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "่ทฏๅพ '%s' ไธๅจ '%.*s' ไธญ" + +#: sha1-name.c:1745 +#, 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:1761 +#, 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:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "่ทฏๅพ '%s' ๅจ็ฃ็ไธ๏ผไฝไธๅจ็ดขๅผ้" + +#: sha1-name.c:1771 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "่ทฏๅพ '%s' ไธๅญๅจ๏ผๆขไธๅจ็ฃ็ไธ๏ผไนไธๅจ็ดขๅผไธญ๏ผ" + +#: sha1-name.c:1784 +msgid "relative path syntax can't be used outside working tree" +msgstr "ไธ่ฝๅจๅทฅไฝๅบไนๅคไฝฟ็จ็ธๅฏน่ทฏๅพ่ฏญๆณ" + +#: sha1-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "ๆ ๆ็ๅฏน่ฑกๅ '%.*s'ใ" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:848 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:867 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:875 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7093,13 +8119,48 @@ msgstr[0] "%u ๅญ่" msgstr[1] "%u ๅญ่" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:877 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u ๅญ่/็ง" msgstr[1] "%u ๅญ่/็ง" +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" +msgstr "ๆ ๆณๆๅผ '%s' ่ฟ่กๅๅ ฅ" + +#: strbuf.c:1175 +#, c-format +msgid "could not edit '%s'" +msgstr "ไธ่ฝ็ผ่พ '%s'" + +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "ๅฟฝ็ฅๅฏ็็ๅญๆจก็ปๅ็งฐ๏ผ%s" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "submodule.fetchjobs ไธๅ ่ฎธไธบ่ดๅผ" + +#: submodule-config.c:402 +#, c-format +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgstr "ๅฟฝ็ฅๅฏ่ฝ่ขซ่งฃๆไธบๅฝไปค่ก้้กน็ '%s'๏ผ%s" + +#: submodule-config.c:499 +#, c-format +msgid "invalid value for %s" +msgstr "%s ็ๅผๆ ๆ" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "ไธ่ฝๆดๆฐ .gitmodules ๆก็ฎ %s" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "ๆ ๆณไฟฎๆนๆชๅๅนถ็ .gitmodules๏ผๅ ่งฃๅณๅๅนถๅฒ็ช" @@ -7128,62 +8189,139 @@ msgstr "ไฝไบๆชๆฃๅบ็ๅญๆจก็ป '%s'" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "่ทฏๅพ่งๆ ผ '%s' ๅจๅญๆจก็ป '%.*s' ไธญ" -#: submodule.c:910 +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "ๅ็ --ignore-submodules ๅๆฐ๏ผ%s" + +#: submodule.c:816 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "ๆไบค %s ไธญไฝไบ่ทฏๅพ '%s' ็ๅญๆจก็ปๅๅๅ็ๅญๆจก็ปๅฒ็ชใ ่ทณ่ฟๅฎใ" + +#: submodule.c:919 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "ๅญๆจก็ปๆก็ฎ '%s'๏ผ%s๏ผๆฏไธไธช %s๏ผไธๆฏไธไธชๆไบค" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1004 +#, 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:1127 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "ๅค็ๅญๆจก็ป '%s' ๅคฑ่ดฅ" + +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "ๆ ๆณๅฐ HEAD ่งฃๆไธบๆๆๅผ็จใ" -#: submodule.c:1481 +#: submodule.c:1167 #, c-format -msgid "Could not access submodule '%s'" -msgstr "ๆ ๆณ่ฎฟ้ฎๅญๆจก็ป '%s'" +msgid "Pushing submodule '%s'\n" +msgstr "ๆญฃๅจๆจ้ๅญๆจก็ป '%s'\n" -#: submodule.c:1651 +#: submodule.c:1170 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "ๆ ๆณๆจ้ๅญๆจก็ป '%s'\n" + +#: submodule.c:1462 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "ๆญฃๅจ่ทๅๅญๆจก็ป %s%s\n" + +#: submodule.c:1492 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "ๆ ๆณ่ฎฟ้ฎๅญๆจก็ป '%s'\n" + +#: submodule.c:1646 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"่ทๅๅญๆจก็ปๆถ็้่ฏฏ๏ผ\n" +"%s" + +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" -msgstr "ๆ ๆณๅฐ '%s' ่ฏๅซไธบไธไธช git ไปๅบ" +msgstr "ๆ ๆณๅฐ '%s' ่ฏๅซไธบ git ไปๅบ" -#: submodule.c:1789 +#: submodule.c:1688 +#, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "ๆ ๆณๅจๅญๆจก็ป %s ไธญๆง่ก 'git status --porcelain=2'" + +#: submodule.c:1729 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "ๅจๅญๆจก็ป %s ไธญๆง่ก 'git status --porcelain=2' ๅคฑ่ดฅ" + +#: submodule.c:1804 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "ๆ ๆณๅจๅญๆจก็ป '%s' ไธญๅฏๅจ 'git status'" -#: submodule.c:1802 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "ๆ ๆณๅจๅญๆจก็ป '%s' ไธญๆง่ก 'git status'" -#: submodule.c:1817 +#: submodule.c:1832 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "ๆ ๆณๅจๅญๆจก็ป '%s' ไธญๅๆถ core.worktree ็่ฎพ็ฝฎ" -#: submodule.c:1907 +#: submodule.c:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "ๆ ๆณ้ๅฝ่ฟๅญๆจก็ป่ทฏๅพ '%s'" + +#: submodule.c:1880 +msgid "could not reset submodule index" +msgstr "ๆ ๆณ้็ฝฎๅญๆจก็ป็ดขๅผ" + +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "ๅญๆจก็ป '%s' ไธญๆ่็ดขๅผ" -#: submodule.c:1959 +#: submodule.c:1974 #, c-format msgid "Submodule '%s' could not be updated." msgstr "ๅญๆจก็ป '%s' ๆ ๆณ่ขซๆดๆฐใ" -#: submodule.c:2007 +#: submodule.c:2042 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "ๅญๆจก็ป git ็ฎๅฝ '%s' ไฝไบ git ็ฎๅฝ '%.*s' ไธญ" + +#: submodule.c:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "ไธๆฏๆๅฏนๆๅคไธชๅทฅไฝๅบ็ๅญๆจก็ป '%s' ๆง่ก relocate_gitdir" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "ไธ่ฝๆฅ่ฏขๅญๆจก็ป '%s' ็ๅ็งฐ" -#: submodule.c:2026 +#: submodule.c:2079 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "็ฆๆญข็งปๅจ '%s' ๅฐ็ฐๅญ git ็ฎๅฝไธญ" + +#: submodule.c:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7194,371 +8332,356 @@ msgstr "" "'%s' ่ฟ็งป่ณ\n" "'%s'\n" -#: submodule.c:2109 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "ๆ ๆณ้ๅฝ่ฟๅญๆจก็ป่ทฏๅพ '%s'" - -#: submodule.c:2153 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "ๆ ๆณๅจ .. ไธญๅฏๅจ ls-files" -#: submodule.c:2192 +#: submodule.c:2254 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree ่ฟๅๆช็ฅ่ฟๅๅผ %d" -#: submodule-config.c:232 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "ๅฟฝ็ฅๅฏ็็ๅญๆจก็ปๅ็งฐ๏ผ%s" - -#: submodule-config.c:299 -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "submodule.fetchjobs ไธๅ ่ฎธไธบ่ดๅผ" - -#: 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:486 -#, c-format -msgid "invalid value for %s" -msgstr "%s ็ๅผๆ ๆ" - -#: submodule-config.c:755 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "ไธ่ฝๆดๆฐ .gitmodules ๆก็ฎ %s" - -#: trailer.c:238 +#: trailer.c:236 #, 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 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "้ฎ '%2$s' ็ๆช็ฅๅๅผ '%1$s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "ๅคไบไธไธช %s" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "็ญพๅ '%.*s' ็้ฎไธบ็ฉบ" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "ไธ่ฝ่ฏปๅ่พๅ ฅๆไปถ '%s'" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "ไธ่ฝ่ชๆ ๅ่พๅ ฅ่ฏปๅ" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "ไธ่ฝๅฏน %s ่ฐ็จ stat" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "ๆไปถ %s ไธๆฏไธไธชๆญฃ่งๆไปถ" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "ๆไปถ %s ็จๆทไธๅฏๅ" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "ไธ่ฝๆๅผไธดๆถๆไปถ" -#: trailer.c:1067 +#: trailer.c:1065 #, 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:142 -#, c-format -msgid "could not read bundle '%s'" -msgstr "ๆ ๆณ่ฏปๅ bundle '%s'" - -#: transport.c:208 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "ไผ ่พ๏ผๆ ๆ็ๆทฑๅบฆ้้กน '%s'" - -#: transport.c:259 -msgid "see protocol.version in 'git help config' for more details" -msgstr "ๆฅ็ 'git help config' ไธญ็ protocol.version ่ทๅๆดๅคไฟกๆฏ" - -#: transport.c:260 -msgid "server options require protocol version 2 or later" -msgstr "ๆๅก็ซฏ้้กน้่ฆ็ๆฌ 2 ๅ่ฎฎๆๆด้ซ" - -#: transport.c:625 -msgid "could not parse transport.color.* config" -msgstr "ไธ่ฝ่งฃๆ transport.color.* ้ ็ฝฎ" - -#: transport.c:698 -msgid "support for protocol v2 not implemented yet" -msgstr "ๅ่ฎฎ v2 ็ๆฏๆๅฐๆชๅฎ็ฐ" - -#: transport.c:825 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "้ ็ฝฎ '%s' ็ๅๅผๆช็ฅ๏ผ%s" - -#: transport.c:891 -#, c-format -msgid "transport '%s' not allowed" -msgstr "ไผ ่พ '%s' ไธๅ ่ฎธ" - -#: transport.c:945 -msgid "git-over-rsync is no longer supported" -msgstr "ไธๅๆฏๆ git-over-rsync" - -#: 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:1044 -#, 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:1052 -msgid "Aborting." -msgstr "ๆญฃๅจ็ปๆญขใ" - -#: transport.c:1193 -msgid "failed to push all needed submodules" -msgstr "ไธ่ฝๆจ้ๅ จ้จ้่ฆ็ๅญๆจก็ป" - -#: transport.c:1340 transport-helper.c:645 -msgid "operation not supported by protocol" -msgstr "ๅ่ฎฎไธๆฏๆ่ฏฅๆไฝ" - -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:62 transport-helper.c:91 msgid "full write to remote helper failed" msgstr "ๅฎๆดๅๅ ฅ่ฟ็จๅฉๆๅคฑ่ดฅ" -#: transport-helper.c:134 +#: transport-helper.c:145 #, c-format msgid "unable to find remote helper for '%s'" msgstr "ๆ ๆณไธบ '%s' ๆพๅฐ่ฟ็จๅฉๆ" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" msgstr "ๆ ๆณๅคๅถๅฉๆ่พๅบๆไปถๅฅๆ" -#: transport-helper.c:201 +#: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "ๆช็ฅ็ๅผบๅถ่ฝๅ %s๏ผ่ฏฅ่ฟ็จๅฉๆๅฏ่ฝ้่ฆๆฐ็ๆฌ็Git" -#: transport-helper.c:207 +#: transport-helper.c:220 msgid "this remote helper should implement refspec capability" msgstr "่ฟ็จๅฉๆ้่ฆๅฎ็ฐ refspec ่ฝๅ" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:287 transport-helper.c:429 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s ๆๅคๅฐ่ฏด๏ผ'%s'" -#: transport-helper.c:403 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "%s ไน้ๅฎไบ %s" -#: transport-helper.c:481 +#: transport-helper.c:497 msgid "couldn't run fast-import" msgstr "ไธ่ฝๆง่ก fast-import" -#: transport-helper.c:504 +#: transport-helper.c:520 msgid "error while running fast-import" msgstr "ๆง่ก fast-import ๅบ้" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:549 transport-helper.c:1226 #, c-format msgid "could not read ref %s" msgstr "ๆ ๆณ่ฏปๅๅผ็จ %s" -#: transport-helper.c:578 +#: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" msgstr "่ฟๆฅๆถๆช็ฅ็ๅๅบ๏ผ%s" -#: transport-helper.c:600 +#: transport-helper.c:616 msgid "setting remote service path not supported by protocol" msgstr "ๅ่ฎฎไธๆฏๆ่ฎพ็ฝฎ่ฟ็จๆๅก่ทฏๅพ" -#: transport-helper.c:602 +#: transport-helper.c:618 msgid "invalid remote service path" msgstr "ๆ ๆ็่ฟ็จๆๅก่ทฏๅพ" -#: transport-helper.c:648 +#: transport-helper.c:661 transport.c:1428 +msgid "operation not supported by protocol" +msgstr "ๅ่ฎฎไธๆฏๆ่ฏฅๆไฝ" + +#: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" msgstr "ไธ่ฝ่ฟๆฅๅฐๅญๆๅก %s" -#: transport-helper.c:720 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "'option' ็ผบไนไธไธชๅน้ ็ 'ok/error' ๆไปค" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "้ขๆ ok/error๏ผๅฉๆ่ฏด '%s'" -#: transport-helper.c:773 +#: transport-helper.c:841 #, c-format msgid "helper reported unexpected status of %s" msgstr "ๅฉๆๆฅๅ %s ็ๆๅค็ถๆ" -#: transport-helper.c:834 +#: transport-helper.c:924 #, c-format msgid "helper %s does not support dry-run" msgstr "ๅฉๆ %s ไธๆฏๆ dry-run" -#: transport-helper.c:837 +#: transport-helper.c:927 #, c-format msgid "helper %s does not support --signed" msgstr "ๅฉๆ %s ไธๆฏๆ --signed" -#: transport-helper.c:840 +#: transport-helper.c:930 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "ๅฉๆ %s ไธๆฏๆ --signed=if-asked" -#: transport-helper.c:847 +#: transport-helper.c:935 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "ๅฉๆ %s ไธๆฏๆ --atomic" + +#: transport-helper.c:941 #, c-format msgid "helper %s does not support 'push-option'" msgstr "ๅฉๆ %s ไธๆฏๆ 'push-option'" -#: transport-helper.c:945 +#: transport-helper.c:1040 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-heper ไธๆฏๆ push๏ผ้่ฆๅผ็จ่กจ่พพๅผ" -#: transport-helper.c:950 +#: transport-helper.c:1045 #, c-format msgid "helper %s does not support 'force'" msgstr "ๅฉๆ %s ไธๆฏๆ 'force'" -#: transport-helper.c:997 +#: transport-helper.c:1092 msgid "couldn't run fast-export" msgstr "ๆ ๆณๆง่ก fast-export" -#: transport-helper.c:1002 +#: transport-helper.c:1097 msgid "error while running fast-export" msgstr "ๆง่ก fast-export ๆถๅบ้" -#: transport-helper.c:1027 +#: transport-helper.c:1122 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" msgstr "" "ๆฒกๆๅ ฑๅ็ๅผ็จๅนถไธไนๆฒกๆๆๅฎ๏ผไปไนไนไธไผๅใ\n" -"ๅฏ่ฝๆจๅบ่ฏฅๆๅฎไธไธชๅๆฏๅฆ 'master'ใ\n" +"ไน่ฎธๆจๅบ่ฏฅๆๅฎไธไธชๅๆฏใ\n" + +#: transport-helper.c:1203 +#, c-format +msgid "unsupported object format '%s'" +msgstr "ไธๆฏๆ็ๅฏน่ฑกๆ ผๅผ '%s'" -#: transport-helper.c:1091 +#: transport-helper.c:1212 #, c-format msgid "malformed response in ref list: %s" msgstr "ๅผ็จๅ่กจไธญๆ ผๅผ้่ฏฏ็ๅๅบ๏ผ%s" -#: transport-helper.c:1244 +#: transport-helper.c:1364 #, c-format msgid "read(%s) failed" msgstr "่ฏปๅ๏ผ%s๏ผๅคฑ่ดฅ" -#: transport-helper.c:1271 +#: transport-helper.c:1391 #, c-format msgid "write(%s) failed" msgstr "ๅ๏ผ%s๏ผๅคฑ่ดฅ" -#: transport-helper.c:1320 +#: transport-helper.c:1440 #, c-format msgid "%s thread failed" msgstr "%s ็บฟ็จๅคฑ่ดฅ" -#: transport-helper.c:1324 +#: transport-helper.c:1444 #, c-format msgid "%s thread failed to join: %s" msgstr "%s ็บฟ็จ็ญๅพ ๅคฑ่ดฅ๏ผ%s" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1463 transport-helper.c:1467 #, c-format msgid "can't start thread for copying data: %s" msgstr "ไธ่ฝๅฏๅจ็บฟ็จๆฅๆท่ดๆฐๆฎ๏ผ%s" -#: transport-helper.c:1384 +#: transport-helper.c:1504 #, c-format msgid "%s process failed to wait" msgstr "%s ่ฟ็จ็ญๅพ ๅคฑ่ดฅ" -#: transport-helper.c:1388 +#: transport-helper.c:1508 #, c-format msgid "%s process failed" msgstr "%s ่ฟ็จๅคฑ่ดฅ" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1526 transport-helper.c:1535 msgid "can't start thread for copying data" msgstr "ไธ่ฝๅฏๅจ็บฟ็จๆฅๆท่ดๆฐๆฎ" -#: tree-walk.c:33 +#: 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 "ๆ ๆณ่ฏปๅๅฝๆกฃๅ '%s'" + +#: transport.c:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "ไผ ่พ๏ผๆ ๆ็ๆทฑๅบฆ้้กน '%s'" + +#: transport.c:269 +msgid "see protocol.version in 'git help config' for more details" +msgstr "ๆฅ็ 'git help config' ไธญ็ protocol.version ่ทๅๆดๅคไฟกๆฏ" + +#: transport.c:270 +msgid "server options require protocol version 2 or later" +msgstr "ๆๅก็ซฏ้้กน้่ฆ็ๆฌ 2 ๅ่ฎฎๆๆด้ซ" + +#: transport.c:712 +msgid "could not parse transport.color.* config" +msgstr "ไธ่ฝ่งฃๆ transport.color.* ้ ็ฝฎ" + +#: transport.c:785 +msgid "support for protocol v2 not implemented yet" +msgstr "ๅ่ฎฎ v2 ็ๆฏๆๅฐๆชๅฎ็ฐ" + +#: transport.c:919 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "้ ็ฝฎ '%s' ็ๅๅผๆช็ฅ๏ผ%s" + +#: transport.c:985 +#, c-format +msgid "transport '%s' not allowed" +msgstr "ไผ ่พ '%s' ไธๅ ่ฎธ" + +#: transport.c:1038 +msgid "git-over-rsync is no longer supported" +msgstr "ไธๅๆฏๆ git-over-rsync" + +#: transport.c:1140 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "ไธๅๅญๆจก็ป่ทฏๅพๆๅ ๅซ็ไฟฎๆนๅจไปปไฝ่ฟ็จๆบไธญ้ฝๆพไธๅฐ๏ผ\n" + +#: transport.c:1144 +#, 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:1152 +msgid "Aborting." +msgstr "ๆญฃๅจ็ปๆญขใ" + +#: transport.c:1297 +msgid "failed to push all needed submodules" +msgstr "ไธ่ฝๆจ้ๅ จ้จ้่ฆ็ๅญๆจก็ป" + +#: tree-walk.c:32 msgid "too-short tree object" msgstr "ๅคช็ญ็ๆ ๅฏน่ฑก" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "ๆ ๅฏน่ฑกไธญ็ๆก็ฎๆจกๅผ้่ฏฏ" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "ๆ ๅฏน่ฑกๆก็ฎไธญ็ฉบ็ๆไปถๅ" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "ๅคช็ญ็ๆ ๆไปถ" -#: unpack-trees.c:111 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7567,7 +8690,7 @@ msgstr "" "ๆจๅฏนไธๅๆไปถ็ๆฌๅฐไฟฎๆนๅฐ่ขซๆฃๅบๆไฝ่ฆ็๏ผ\n" "%%s่ฏทๅจๅๆขๅๆฏๅๆไบคๆ่ดฎ่ๆจ็ไฟฎๆนใ" -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7576,7 +8699,7 @@ msgstr "" "ๆจๅฏนไธๅๆไปถ็ๆฌๅฐไฟฎๆนๅฐ่ขซๆฃๅบๆไฝ่ฆ็๏ผ\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7585,7 +8708,7 @@ msgstr "" "ๆจๅฏนไธๅๆไปถ็ๆฌๅฐไฟฎๆนๅฐ่ขซๅๅนถๆไฝ่ฆ็๏ผ\n" "%%s่ฏทๅจๅๅนถๅๆไบคๆ่ดฎ่ๆจ็ไฟฎๆนใ" -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7594,7 +8717,7 @@ msgstr "" "ๆจๅฏนไธๅๆไปถ็ๆฌๅฐไฟฎๆนๅฐ่ขซๅๅนถๆไฝ่ฆ็๏ผ\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7603,7 +8726,7 @@ msgstr "" "ๆจๅฏนไธๅๆไปถ็ๆฌๅฐไฟฎๆนๅฐ่ขซ %s ่ฆ็๏ผ\n" "%%s่ฏทๅจ %s ไนๅๆไบคๆ่ดฎ่ๆจ็ไฟฎๆนใ" -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7612,7 +8735,7 @@ msgstr "" "ๆจๅฏนไธๅๆไปถ็ๆฌๅฐไฟฎๆนๅฐ่ขซ %s ่ฆ็๏ผ\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7621,7 +8744,7 @@ msgstr "" "ๆดๆฐๅฆไธ็ฎๅฝๅฐไผไธขๅคฑๅ ถไธญๆช่ท่ธช็ๆไปถ๏ผ\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7630,7 +8753,7 @@ msgstr "" "ๅทฅไฝๅบไธญไธๅๆช่ท่ธช็ๆไปถๅฐไผๅ ไธบๆฃๅบๆไฝ่่ขซๅ ้ค๏ผ\n" "%%s่ฏทๅจๅๆขๅๆฏไนๅ็งปๅจๆๅ ้คใ" -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7639,7 +8762,7 @@ msgstr "" "ๅทฅไฝๅบไธญไธๅๆช่ท่ธช็ๆไปถๅฐไผๅ ไธบๆฃๅบๆไฝ่่ขซๅ ้ค๏ผ\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7648,7 +8771,7 @@ msgstr "" "ๅทฅไฝๅบไธญไธๅๆช่ท่ธช็ๆไปถๅฐไผๅ ไธบๅๅนถๆไฝ่่ขซๅ ้ค๏ผ\n" "%%s่ฏทๅจๅๅนถๅ็งปๅจๆๅ ้คใ" -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7657,7 +8780,7 @@ msgstr "" "ๅทฅไฝๅบไธญไธๅๆช่ท่ธช็ๆไปถๅฐไผๅ ไธบๅๅนถๆไฝ่่ขซๅ ้ค๏ผ\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7666,7 +8789,7 @@ msgstr "" "ๅทฅไฝๅบไธญไธๅๆช่ท่ธช็ๆไปถๅฐไผๅ ไธบ %s ๆไฝ่่ขซๅ ้ค๏ผ\n" "%%s่ฏทๅจ %s ๅ็งปๅจๆๅ ้คใ" -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7675,7 +8798,7 @@ msgstr "" "ๅทฅไฝๅบไธญไธๅๆช่ท่ธช็ๆไปถๅฐไผๅ ไธบ %s ๆไฝ่่ขซๅ ้ค๏ผ\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7685,7 +8808,7 @@ msgstr "" "ๅทฅไฝๅบไธญไธๅๆช่ท่ธช็ๆไปถๅฐไผๅ ไธบๆฃๅบๆไฝ่่ขซ่ฆ็๏ผ\n" "%%s่ฏทๅจๅๆขๅๆฏๅ็งปๅจๆๅ ้คใ" -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7695,7 +8818,7 @@ msgstr "" "ๅทฅไฝๅบไธญไธๅๆช่ท่ธช็ๆไปถๅฐไผๅ ไธบๆฃๅบๆไฝ่่ขซ่ฆ็๏ผ\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7704,7 +8827,7 @@ msgstr "" "ๅทฅไฝๅบไธญไธๅๆช่ท่ธช็ๆไปถๅฐไผๅ ไธบๅๅนถๆไฝ่่ขซ่ฆ็๏ผ\n" "%%s่ฏทๅจๅๅนถๅ็งปๅจๆๅ ้คใ" -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7713,7 +8836,7 @@ msgstr "" "ๅทฅไฝๅบไธญไธๅๆช่ท่ธช็ๆไปถๅฐไผๅ ไธบๅๅนถๆไฝ่่ขซ่ฆ็๏ผ\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7722,7 +8845,7 @@ msgstr "" "ๅทฅไฝๅบไธญไธๅๆช่ท่ธช็ๆไปถๅฐไผๅ ไธบ %s ๆไฝ่่ขซ่ฆ็๏ผ\n" "%%s่ฏทๅจ %s ๅ็งปๅจๆๅ ้คใ" -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7731,59 +8854,66 @@ msgstr "" "ๅทฅไฝๅบไธญไธๅๆช่ท่ธช็ๆไปถๅฐไผๅ ไธบ %s ๆไฝ่่ขซ่ฆ็๏ผ\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "ๆก็ฎ '%s' ๅ '%s' ้ๅ ใๆ ๆณๅๅนถใ" -#: unpack-trees.c:173 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -"ๆ ๆณๆดๆฐ็จ็ๆฃๅบ๏ผๅฆไธๆก็ฎไธๆฏๆๆฐ๏ผ\n" +"ๆ ๆณๆดๆฐๅญๆจก็ป๏ผ\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"ๅทฅไฝๅบไธญไธๅๆไปถๅฐ่ขซ็จ็ๆฃๅบๆดๆฐๆ่ฆ็๏ผ\n" +"ๅฐฝ็ฎกๅญๅจ็จ็ๆฃๅบๆจกๆฟ๏ผไปฅไธ่ทฏๅพไธๆฏๆๆฐ๏ผๅ ่ไฟ็๏ผ\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"ๅทฅไฝๅบไธญไธๅๆไปถๅฐ่ขซ็จ็ๆฃๅบๆดๆฐๆๅ ้ค๏ผ\n" +"ๅฐฝ็ฎกๅญๅจ็จ็ๆฃๅบๆจกๆฟ๏ผไปฅไธ่ทฏๅพๅคไบๆชๅๅนถ็ถๆ๏ผๅ ่ไฟ็๏ผ\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"ๆ ๆณๆดๆฐๅญๆจก็ป๏ผ\n" +"ๅฐฝ็ฎกๅญๅจ็จ็ๆฃๅบๆจกๆฟ๏ผไปฅไธ่ทฏๅพๅทฒ็ปๅญๅจ๏ผๅ ่ๆชๆดๆฐ๏ผ\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "ๆญฃๅจ็ปๆญข\n" -#: unpack-trees.c:318 +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "ๅจไฟฎๅคไธ่ฟฐ่ทฏๅพไนๅ๏ผไฝ ๅฏ่ฝ่ฆๆง่ก `git sparse-checkout reapply`ใ\n" + +#: unpack-trees.c:350 msgid "Updating files" msgstr "ๆญฃๅจๆดๆฐๆไปถ" -#: unpack-trees.c:350 +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7792,6 +8922,14 @@ msgstr "" "ไปฅไธ่ทฏๅพๅ็็ขฐๆ๏ผๅฆ๏ผๅจไธๅบๅๅคงๅฐๅ็ๆไปถ็ณป็ปไธ็ๅบๅๅคงๅฐๅ็่ทฏๅพ๏ผ๏ผ\n" "ๅนถไธ็ขฐๆ็ปไธญๅชๆไธไธชๆไปถๅญๅจๅทฅไฝๅบไธญ๏ผ\n" +#: unpack-trees.c:1498 +msgid "Updating index flags" +msgstr "ๆญฃๅจๆดๆฐ็ดขๅผๆ ๅฟ" + +#: upload-pack.c:1516 +msgid "expected flush after fetch arguments" +msgstr "ๅจ fetch ๅๆฐไนๅๅบ่ฏฅๆไธไธช flush ๅ " + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "ๆ ๆ็ URL ๆนๆกๅ็งฐๆไธขๅคฑ '://' ๅ็ผ" @@ -7821,47 +8959,87 @@ msgstr "ๆ ๆ็็ซฏๅฃๅท" msgid "invalid '..' path segment" msgstr "ๆ ๆ็ '..' ่ทฏๅพ็ๆฎต" -#: worktree.c:258 builtin/am.c:2095 +#: walker.c:170 +msgid "Fetching objects" +msgstr "ๆญฃๅจ่ทๅๅฏน่ฑก" + +#: worktree.c:236 builtin/am.c:2116 #, c-format msgid "failed to read '%s'" msgstr "่ฏปๅ '%s' ๅคฑ่ดฅ" -#: worktree.c:304 +#: worktree.c:283 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "ๅจไธปๅทฅไฝๅบ็ '%s' ไธๆฏไปๅบ็ฎๅฝ" -#: worktree.c:315 +#: worktree.c:294 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "ๆไปถ '%s' ไธๅ ๅซๅทฅไฝๅบ็็ปๅฏน่ทฏๅพ" -#: worktree.c:327 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "'%s' ไธๅญๅจ" -#: worktree.c:333 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' ไธๆฏไธไธช .git ๆไปถ๏ผ้่ฏฏ็ %d" -#: worktree.c:341 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' ๆฒกๆๆๅๅฐ '%s'" -#: wrapper.c:223 wrapper.c:393 +#: worktree.c:587 +msgid "not a directory" +msgstr "ไธๆฏไธไธช็ฎๅฝ" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr ".git ไธๆฏไธไธชๆไปถ" + +#: worktree.c:598 +msgid ".git file broken" +msgstr ".git ๆไปถๆๅ" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr ".git ๆไปถไธๆญฃ็กฎ" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "ไธๆฏไธไธชๆๆ็่ทฏๅพ" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "ๆ ๆณๅฎไฝไปๅบ๏ผ.git ไธๆฏไธไธชๆไปถ" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "ๆ ๆณๅฎไฝไปๅบ๏ผ.git ๆไปถๆๅ" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "gitdir ไธๅฏ่ฏป" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "gitdir ไธๆญฃ็กฎ" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "ๆ ๆณๆๅผ '%s' ่ฟ่ก่ฏปๅ" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "ไธ่ฝ่ฎฟ้ฎ '%s'" -#: wrapper.c:632 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "ไธ่ฝ่ทๅๅฝๅๅทฅไฝ็ฎๅฝ" @@ -7900,11 +9078,11 @@ msgstr " ๏ผ้ ๆ ไฝฟ็จ \"git add/rm <ๆไปถ>...\" ๆ ่ฎฐ่งฃๅณๆนๆก๏ผ" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " ๏ผไฝฟ็จ \"git rm <ๆไปถ>...\" ๆ ่ฎฐ่งฃๅณๆนๆก๏ผ" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "่ฆๆไบค็ๅๆด๏ผ" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "ๅฐๆชๆๅญไปฅๅคๆไบค็ๅๆด๏ผ" @@ -7935,97 +9113,97 @@ msgstr " ๏ผๆไบคๆไธขๅผๅญๆจก็ปไธญๆช่ท่ธชๆไฟฎๆน็ๅ ๅฎน๏ผ" msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " ๏ผไฝฟ็จ \"git %s <ๆไปถ>...\" ไปฅๅ ๅซ่ฆๆไบค็ๅ ๅฎน๏ผ" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "ๅๆนๅ ้ค๏ผ" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "็ฑๆไปฌๆทปๅ ๏ผ" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "็ฑไปไปฌๅ ้ค๏ผ" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "็ฑไปไปฌๆทปๅ ๏ผ" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "็ฑๆไปฌๅ ้ค๏ผ" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "ๅๆนๆทปๅ ๏ผ" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "ๅๆนไฟฎๆน๏ผ" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "ๆฐๆไปถ๏ผ" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "ๆท่ด๏ผ" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "ๅ ้ค๏ผ" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "ไฟฎๆน๏ผ" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "้ๅฝๅ๏ผ" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "็ฑปๅๅๆด๏ผ" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "ๆช็ฅ๏ผ" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "ๆชๅๅนถ๏ผ" # ่ฏ่ ๏ผๆซๅฐพไธคไธชๅญ่ๅฏ่ฝ่ขซๅ ๅ๏ผๅฆๆ็ฟป่ฏไธบไธญๆๆ ็นไผๅบ็ฐๅไธชๆฑๅญ -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "ๆฐๆไบค, " # ่ฏ่ ๏ผๆซๅฐพไธคไธชๅญ่ๅฏ่ฝ่ขซๅ ๅ๏ผๅฆๆ็ฟป่ฏไธบไธญๆๆ ็นไผๅบ็ฐๅไธชๆฑๅญ -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "ไฟฎๆน็ๅ ๅฎน, " # ่ฏ่ ๏ผๆซๅฐพไธคไธชๅญ่ๅฏ่ฝ่ขซๅ ๅ๏ผๅฆๆ็ฟป่ฏไธบไธญๆๆ ็นไผๅบ็ฐๅไธชๆฑๅญ -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "ๆช่ท่ธช็ๅ ๅฎน, " -#: wt-status.c:906 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "ๆจ็่ดฎ่ๅบๅฝๅๆ %d ๆก่ฎฐๅฝ" msgstr[1] "ๆจ็่ดฎ่ๅบๅฝๅๆ %d ๆก่ฎฐๅฝ" -#: wt-status.c:938 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "ๅญๆจก็ปๅทฒไฟฎๆนไฝๅฐๆชๆดๆฐ๏ผ" -#: wt-status.c:940 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "่ฆๆไบค็ๅญๆจก็ปๅๆด๏ผ" -#: wt-status.c:1022 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -8033,7 +9211,7 @@ msgstr "" "ไธ่ฆๆนๅจๆๅ ้คไธ้ข็ไธ่กใ\n" "ๅ ถไธๆๆๅ ๅฎน้ฝๅฐ่ขซๅฟฝ็ฅใ" -#: wt-status.c:1114 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -8044,77 +9222,77 @@ msgstr "" "่ฑไบ %.2f ็งๆ่ฎก็ฎๅบๅๆฏ็้ขๅ /่ฝๅ่ๅดใ\n" "ไธบ้ฟๅ ๏ผๆจๅฏไปฅไฝฟ็จ '--no-ahead-behind'ใ\n" -#: wt-status.c:1144 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "ๆจๆๅฐๆชๅๅนถ็่ทฏๅพใ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1147 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr " ๏ผ่งฃๅณๅฒ็ชๅนถ่ฟ่ก \"git commit\"๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1149 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " ๏ผไฝฟ็จ \"git merge --abort\" ็ปๆญขๅๅนถ๏ผ" -#: wt-status.c:1153 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "ๆๆๅฒ็ชๅทฒ่งฃๅณไฝๆจไปๅคไบๅๅนถไธญใ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1156 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr " ๏ผไฝฟ็จ \"git commit\" ็ปๆๅๅนถ๏ผ" -#: wt-status.c:1165 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "ๆจๆญฃๅคไบ am ๆไฝ่ฟ็จไธญใ" -#: wt-status.c:1168 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "ๅฝๅ็่กฅไธไธบ็ฉบใ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1172 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " ๏ผ่งฃๅณๅฒ็ช๏ผ็ถๅ่ฟ่ก \"git am --continue\"๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1174 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr " ๏ผไฝฟ็จ \"git am --skip\" ่ทณ่ฟๆญค่กฅไธ๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1176 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " ๏ผไฝฟ็จ \"git am --abort\" ๆขๅคๅๆๅๆฏ๏ผ" -#: wt-status.c:1309 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo ไธขๅคฑใ" -#: wt-status.c:1311 +#: wt-status.c:1307 msgid "No commands done." msgstr "ๆฒกๆๅฝไปค่ขซๆง่กใ" -#: wt-status.c:1314 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "ๆๅไธๆกๅฝไปคๅทฒๅฎๆ๏ผ%d ๆกๅฝไปค่ขซๆง่ก๏ผ๏ผ" msgstr[1] "ๆๅ็ๅฝไปคๅทฒๅฎๆ๏ผ%d ๆกๅฝไปค่ขซๆง่ก๏ผ๏ผ" -#: wt-status.c:1325 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " ๏ผๆดๅคๅ่งๆไปถ %s๏ผ" -#: wt-status.c:1330 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "ๆชๅฉไธไปปไฝๅฝไปคใ" -#: wt-status.c:1333 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -8122,128 +9300,138 @@ msgstr[0] "ๆฅไธๆฅ่ฆๆง่ก็ๅฝไปค๏ผๅฉไฝ %d ๆกๅฝไปค๏ผ๏ผ" msgstr[1] "ๆฅไธๆฅ่ฆๆง่ก็ๅฝไปค๏ผๅฉไฝ %d ๆกๅฝไปค๏ผ๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1341 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " ๏ผไฝฟ็จ \"git rebase --edit-todo\" ๆฅๆฅ็ๅ็ผ่พ๏ผ" -#: wt-status.c:1353 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "ๆจๅจๆง่กๅฐๅๆฏ '%s' ๅๅบๅฐ '%s' ็ๆไฝใ" -#: wt-status.c:1358 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "ๆจๅจๆง่กๅๅบๆไฝใ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1371 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " ๏ผ่งฃๅณๅฒ็ช๏ผ็ถๅ่ฟ่ก \"git rebase --continue\"๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1373 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " ๏ผไฝฟ็จ \"git rebase --skip\" ่ทณ่ฟๆญค่กฅไธ๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1375 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " ๏ผไฝฟ็จ \"git rebase --abort\" ไปฅๆฃๅบๅๆๅๆฏ๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1382 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " ๏ผๆๆๅฒ็ชๅทฒ่งฃๅณ๏ผ่ฟ่ก \"git rebase --continue\"๏ผ" -#: wt-status.c:1386 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "ๆจๅจๆง่กๅฐๅๆฏ '%s' ๅๅบๅฐ '%s' ็ๆไฝๆถๆๅๆไบคใ" -#: wt-status.c:1391 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "ๆจๅจๆง่กๅๅบๆไฝๆถๆๅๆไบคใ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1394 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " ๏ผไธๆฆๆจๅทฅไฝ็ฎๅฝๆไบคๅนฒๅๅ๏ผ่ฟ่ก \"git rebase --continue\"๏ผ" -#: wt-status.c:1398 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "ๆจๅจๆง่กๅฐๅๆฏ '%s' ๅๅบๅฐ '%s' ็ๆไฝๆถ็ผ่พๆไบคใ" -#: wt-status.c:1403 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "ๆจๅจๆง่กๅๅบๆไฝๆถ็ผ่พๆไบคใ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1406 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " ๏ผไฝฟ็จ \"git commit --amend\" ไฟฎ่กฅๅฝๅๆไบค๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1408 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " ๏ผๅฝๆจๅฏนๆจ็ไฟฎๆนๆปกๆๅๆง่ก \"git rebase --continue\"๏ผ" -#: wt-status.c:1419 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "ๆฃ้ๆไฝๆญฃๅจ่ฟ่กไธญใ" -#: wt-status.c:1422 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "ๆจๅจๆง่กๆฃ้ๆไบค %s ็ๆไฝใ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1429 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " ๏ผ่งฃๅณๅฒ็ชๅนถ่ฟ่ก \"git cherry-pick --continue\"๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1432 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " ๏ผๆง่ก \"git cherry-pick --continue\" ไปฅ็ปง็ปญ๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1435 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " ๏ผๆๆๅฒ็ชๅทฒ่งฃๅณ๏ผ่ฟ่ก \"git cherry-pick --continue\"๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1437 +#: wt-status.c:1433 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " ๏ผไฝฟ็จ \"git cherry-pick --skip\" ่ทณ่ฟๆญค่กฅไธ๏ผ" + +# ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ +#: wt-status.c:1435 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " ๏ผไฝฟ็จ \"git cherry-pick --abort\" ไปฅๅๆถๆฃ้ๆไฝ๏ผ" -#: wt-status.c:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "่ฟๅๆไฝๆญฃๅจ่กไธญใ" -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "ๆจๅจๆง่กๅ่ฝฌๆไบค %s ็ๆไฝใ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1456 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " ๏ผ่งฃๅณๅฒ็ชๅนถๆง่ก \"git revert --continue\"๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr " ๏ผๆง่ก \"git revert --continue\" ไปฅ็ปง็ปญ๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " ๏ผๆๆๅฒ็ชๅทฒ่งฃๅณ๏ผๆง่ก \"git revert --continue\"๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ +#: wt-status.c:1462 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " ๏ผไฝฟ็จ \"git revert --skip\" ่ทณ่ฟๆญค่กฅไธ๏ผ" + +# ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ #: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " ๏ผไฝฟ็จ \"git revert --abort\" ไปฅๅๆถๅ่ฝฌๆไบคๆไฝ๏ผ" @@ -8262,39 +9450,44 @@ msgstr "ๆจๅจๆง่กไบๅๆฅๆพๆไฝใ" msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " ๏ผไฝฟ็จ \"git bisect reset\" ไปฅๅๅฐๅๆๅๆฏ๏ผ" -#: wt-status.c:1690 +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "ๆจๅคไบ็จ็็ญพๅบ็ถๆ๏ผๅ ๅซ %d%% ็่ท่ธชๆไปถ" + +#: wt-status.c:1731 msgid "On branch " msgstr "ไฝไบๅๆฏ " -#: wt-status.c:1697 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "ไบคไบๅผๅๅบๆไฝๆญฃๅจ่ฟ่กไธญ๏ผ่ณ " -#: wt-status.c:1699 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "ๅๅบๆไฝๆญฃๅจ่ฟ่กไธญ๏ผ่ณ " -#: wt-status.c:1709 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "ๅฝๅไธๅจไปปไฝๅๆฏไธใ" -#: wt-status.c:1726 +#: wt-status.c:1767 msgid "Initial commit" msgstr "ๅๅงๆไบค" -#: wt-status.c:1727 +#: wt-status.c:1768 msgid "No commits yet" msgstr "ๅฐๆ ๆไบค" -#: wt-status.c:1741 +#: wt-status.c:1782 msgid "Untracked files" msgstr "ๆช่ท่ธช็ๆไปถ" -#: wt-status.c:1743 +#: wt-status.c:1784 msgid "Ignored files" msgstr "ๅฟฝ็ฅ็ๆไปถ" -#: wt-status.c:1747 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8304,221 +9497,230 @@ msgstr "" "่่ดนไบ %.2f ็งไปฅๆไธพๆช่ท่ธช็ๆไปถใ'status -uno' ไน่ฎธ่ฝๆ้ซ้ๅบฆ๏ผ\n" "ไฝๆจ้่ฆๅฐๅฟไธ่ฆๅฟไบๆทปๅ ๆฐๆไปถ๏ผๅ่ง 'git help status'๏ผใ" -#: wt-status.c:1753 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "ๆช่ท่ธช็ๆไปถๆฒกๆๅๅบ%s" # ่ฏ่ ๏ผไธญๆๅญ็ฌฆไธฒๆผๆฅ๏ผๅฏๅ ้คๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1755 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr "๏ผไฝฟ็จ -u ๅๆฐๆพ็คบๆช่ท่ธช็ๆไปถ๏ผ" -#: wt-status.c:1761 +#: wt-status.c:1802 msgid "No changes" msgstr "ๆฒกๆไฟฎๆน" -#: wt-status.c:1766 +#: wt-status.c:1807 #, 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:1769 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "ไฟฎๆนๅฐๆชๅ ๅ ฅๆไบค\n" -#: wt-status.c:1772 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "ๆไบคไธบ็ฉบ๏ผไฝๆฏๅญๅจๅฐๆช่ท่ธช็ๆไปถ๏ผไฝฟ็จ \"git add\" ๅปบ็ซ่ท่ธช๏ผ\n" -#: wt-status.c:1775 +#: wt-status.c:1819 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "ๆไบคไธบ็ฉบ๏ผไฝๆฏๅญๅจๅฐๆช่ท่ธช็ๆไปถ\n" # ่ฏ่ ๏ผไธญๆๅญ็ฌฆไธฒๆผๆฅ๏ผๅฏๅ ้คๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1778 +#: wt-status.c:1823 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "ๆ ๆไปถ่ฆๆไบค๏ผๅๅปบ/ๆท่ดๆไปถๅนถไฝฟ็จ \"git add\" ๅปบ็ซ่ท่ธช๏ผ\n" -#: wt-status.c:1781 wt-status.c:1786 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "ๆ ๆไปถ่ฆๆไบค\n" # ่ฏ่ ๏ผไธญๆๅญ็ฌฆไธฒๆผๆฅ๏ผๅฏๅ ้คๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1784 +#: wt-status.c:1830 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "ๆ ๆไปถ่ฆๆไบค๏ผไฝฟ็จ -u ๆพ็คบๆช่ท่ธช็ๆไปถ๏ผ\n" # ่ฏ่ ๏ผไธญๆๅญ็ฌฆไธฒๆผๆฅ๏ผๅฏๅ ้คๅๅฏผ็ฉบๆ ผ -#: wt-status.c:1788 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "ๆ ๆไปถ่ฆๆไบค๏ผๅนฒๅ็ๅทฅไฝๅบ\n" -#: wt-status.c:1901 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "ๅฐๆ ๆไบคๅจ " -#: wt-status.c:1905 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD๏ผ้ๅๆฏ๏ผ" -#: wt-status.c:1936 +#: wt-status.c:1975 msgid "different" msgstr "ไธๅ" # ่ฏ่ ๏ผๆณจๆไฟๆๅฅๅฐพ็ฉบๆ ผ -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "่ฝๅ " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "้ขๅ " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "ไธ่ฝ%s๏ผๆจๆๆชๆๅญ็ๅๆดใ" -#: wt-status.c:2472 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "ๅฆๅค๏ผๆจ็็ดขๅผไธญๅ ๅซๆชๆไบค็ๅๆดใ" -#: wt-status.c:2474 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "ไธ่ฝ%s๏ผๆจ็็ดขๅผไธญๅ ๅซๆชๆไบค็ๅๆดใ" -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#, c-format +msgid "failed to unlink '%s'" +msgstr "ๅ ้ค '%s' ๅคฑ่ดฅ" + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<้้กน>] [--] <่ทฏๅพ่งๆ ผ>..." -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "ๆๅค็ๅทฎๅผ็ถๆ %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "ๆดๆฐๆไปถๅคฑ่ดฅ" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "ๅ ้ค '%s'\n" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "ๅทๆฐ็ดขๅผไนๅๅฐๆช่ขซๆๅญ็ๅๆด๏ผ" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:272 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "ไธ่ฝ่ฏปๅ็ดขๅผ" -#: builtin/add.c:245 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "ๆ ๆณไธบๅๅ ฅๆๅผ '%s'ใ" -#: builtin/add.c:249 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "ไธ่ฝ็ๆ่กฅไธ" -#: builtin/add.c:252 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "็ผ่พ่กฅไธๅคฑ่ดฅ" -#: builtin/add.c:255 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "ไธ่ฝๅฏน '%s' ่ฐ็จ stat" -#: builtin/add.c:257 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "็ฉบ่กฅไธใๅผๅธธ็ปๆญขใ" -#: builtin/add.c:262 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "ไธ่ฝๅบ็จ '%s'" -#: builtin/add.c:270 +#: builtin/add.c:308 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "ไธๅ่ทฏๅพๆ นๆฎๆจ็ไธไธช .gitignore ๆไปถ่่ขซๅฟฝ็ฅ๏ผ\n" -#: 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 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 msgid "dry run" msgstr "ๆผไน " -#: builtin/add.c:293 +#: builtin/add.c:331 msgid "interactive picking" msgstr "ไบคไบๅผๆฃ้" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 msgid "select hunks interactively" msgstr "ไบคไบๅผๆ้ๆฐๆฎๅ" -#: builtin/add.c:295 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "็ผ่พๅฝๅๅทฎๅผๅนถๅบ็จ" -#: builtin/add.c:296 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "ๅ ่ฎธๆทปๅ ๅฟฝ็ฅ็ๆไปถ" -#: builtin/add.c:297 +#: builtin/add.c:335 msgid "update tracked files" msgstr "ๆดๆฐๅทฒ่ท่ธช็ๆไปถ" -#: builtin/add.c:298 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "ๅฏนๅทฒ่ท่ธชๆไปถ๏ผๆๅซ -u๏ผ้ๆฐๅฝไธๆข่ก็ฌฆ" -#: builtin/add.c:299 +#: builtin/add.c:337 msgid "record only the fact that the path will be added later" msgstr "ๅช่ฎฐๅฝ๏ผ่ฏฅ่ทฏๅพ็จๅๅๆทปๅ " -#: builtin/add.c:300 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "ๆทปๅ ๆๆๆนๅ็ๅทฒ่ท่ธชๆไปถๅๆช่ท่ธชๆไปถ" -#: builtin/add.c:303 +#: builtin/add.c:341 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ๅฟฝ็ฅๅทฅไฝๅบไธญ็งป้ค็่ทฏๅพ๏ผๅ --no-all ็ธๅ๏ผ" -#: builtin/add.c:305 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "ไธๆทปๅ ๏ผๅชๅทๆฐ็ดขๅผ" -#: builtin/add.c:306 +#: builtin/add.c:344 msgid "just skip files which cannot be added because of errors" msgstr "่ทณ่ฟๅ ๅบ้ไธ่ฝๆทปๅ ็ๆไปถ" -#: builtin/add.c:307 +#: builtin/add.c:345 msgid "check if - even missing - files are ignored in dry run" msgstr "ๆฃๆฅๅจๆผไน ๆจกๅผไธๆไปถ๏ผๅณไฝฟไธๅญๅจ๏ผๆฏๅฆ่ขซๅฟฝ็ฅ" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "่ฆ็ๅ่กจ้ๆไปถ็ๅฏๆง่กไฝ" -#: builtin/add.c:311 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "ๅๅปบไธไธชๅตๅ ฅๅผไปๅบๆถ็ปไบ่ญฆๅ" -#: builtin/add.c:326 +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "`git stash -p` ็ๅ็ซฏ" + +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8535,9 +9737,8 @@ msgid "" "\n" "See \"git help submodule\" for more information." msgstr "" -"ๆจๅจๅฝๅไปๅบไธญๆทปๅ ไบๅฆๅคไธไธชGitไปๅบใๅ ้ๅคๅฑ็ไปๅบๅฐไธๅ ๅซๅตๅ ฅไปๅบ็ๅ ๅฎน๏ผๅนถ" -"ไธไธ็ฅ้่ฏฅๅฆไฝ่ทๅๅฎใ\n" -"ๅฆๆๆจ่ฆๆทปๅ ไธไธชๅญๆจก็ป๏ผไฝฟ็จ๏ผ\n" +"ๆจๅจๅฝๅไปๅบไธญๆทปๅ ไบๅฆไธไธชGitไปๅบใๅ ้ๅคๅฑ็ไปๅบๅฐไธๅ ๅซๅตๅ ฅไปๅบ็\n" +"ๅ ๅฎน๏ผๅนถไธไธ็ฅ้่ฏฅๅฆไฝ่ทๅๅฎใๅฆๆๆจ่ฆๆทปๅ ไธไธชๅญๆจก็ป๏ผไฝฟ็จ๏ผ\n" "\n" "\tgit submodule add <url> %s\n" "\n" @@ -8547,146 +9748,175 @@ msgstr "" "\n" "ๅ่ง \"git help submodule\" ่ทๅๆดๅคไฟกๆฏใ" -#: builtin/add.c:354 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "ๆญฃๅจๆทปๅ ๅตๅ ฅๅผ git ไปๅบ๏ผ%s" -#: builtin/add.c:372 -#, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "ไฝฟ็จ -f ๅๆฐๅฆๆๆจ็กฎๅฎ่ฆๆทปๅ ๅฎไปฌใ\n" +#: builtin/add.c:416 +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:379 +#: builtin/add.c:425 msgid "adding files failed" msgstr "ๆทปๅ ๆไปถๅคฑ่ดฅ" -#: builtin/add.c:419 +#: builtin/add.c:453 builtin/commit.c:345 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--pathspec-from-file ไธ --interactive/--patch ไธๅ ผๅฎน" + +#: builtin/add.c:470 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file ไธ --edit ไธๅ ผๅฎน" + +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "-A ๅ -u ้้กนไบๆฅ" -#: builtin/add.c:426 +#: builtin/add.c:485 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "้้กน --ignore-missing ๅช่ฝๅ --dry-run ๅๆถไฝฟ็จ" -#: builtin/add.c:430 +#: builtin/add.c:489 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "ๅๆฐ --chmod ๅๅผ '%s' ๅฟ ้กปๆฏ -x ๆ +x" -#: builtin/add.c:445 +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "--pathspec-from-file ไธ่ทฏๅพ่กจ่พพๅผๅๆฐไธๅ ผๅฎน" + +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul ้่ฆ --pathspec-from-file" + +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "ๆฒกๆๆๅฎๆไปถ๏ผไนๆฒกๆๆไปถ่ขซๆทปๅ ใ\n" -#: builtin/add.c:446 +#: builtin/add.c:520 +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:160 #, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "ไน่ฎธๆจๆณ่ฆๆง่ก 'git add .'๏ผ\n" +msgid "invalid committer: %s" +msgstr "ๆ ๆ็ๆไบค่ ๏ผ%s" -#: builtin/am.c:348 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "ไธ่ฝ่งฃๆไฝ่ ่ๆฌ" -#: builtin/am.c:432 +#: builtin/am.c:450 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' ่ขซ applypatch-msg ้ฉๅญๅ ้ค" -#: builtin/am.c:474 +#: builtin/am.c:492 #, c-format msgid "Malformed input line: '%s'." msgstr "้ๆณ็่พๅ ฅ่ก๏ผ'%s'ใ" -#: builtin/am.c:512 +#: builtin/am.c:530 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "ไป '%s' ๆท่ดๆณจ่งฃๅฐ '%s' ๆถๅคฑ่ดฅ" -#: builtin/am.c:538 +#: builtin/am.c:556 msgid "fseek failed" msgstr "fseek ๅคฑ่ดฅ" -#: builtin/am.c:726 +#: builtin/am.c:744 #, c-format msgid "could not parse patch '%s'" msgstr "ๆ ๆณ่งฃๆ่กฅไธ '%s'" -#: builtin/am.c:791 +#: builtin/am.c:809 msgid "Only one StGIT patch series can be applied at once" msgstr "ไธๆฌกๅช่ฝๆไธไธช StGIT ่กฅไธ้ๅ่ขซๅบ็จ" -#: builtin/am.c:839 +#: builtin/am.c:857 msgid "invalid timestamp" msgstr "ๆ ๆ็ๆถ้ดๆณ" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:862 builtin/am.c:874 msgid "invalid Date line" msgstr "ๆ ๆ็ๆฅๆ่ก" -#: builtin/am.c:851 +#: builtin/am.c:869 msgid "invalid timezone offset" msgstr "ๆ ๆ็ๆถๅบๅ็งปๅผ" -#: builtin/am.c:944 +#: builtin/am.c:962 msgid "Patch format detection failed." msgstr "่กฅไธๆ ผๅผๆขๆตๅคฑ่ดฅใ" -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:967 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "ๅๅปบ็ฎๅฝ '%s' ๅคฑ่ดฅ" -#: builtin/am.c:954 +#: builtin/am.c:972 msgid "Failed to split patches." msgstr "ๆๅ่กฅไธๅคฑ่ดฅใ" -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "ๆ ๆณๅๅ ฅ็ดขๅผๆไปถ" - -#: builtin/am.c:1098 +#: builtin/am.c:1103 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "ๅฝๆจ่งฃๅณ่ฟไธ้ฎ้ข๏ผๆง่ก \"%s --continue\"ใ" -#: builtin/am.c:1099 +#: builtin/am.c:1104 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "ๅฆๆๆจๆณ่ฆ่ทณ่ฟ่ฟไธ่กฅไธ๏ผๅๆง่ก \"%s --skip\"ใ" -#: builtin/am.c:1100 +#: builtin/am.c:1105 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "่ฅ่ฆๅคๅ่ณๅๅงๅๆฏๅนถๅๆญข่กฅไธๆไฝ๏ผๆง่ก \"%s --abort\"ใ" -#: builtin/am.c:1183 +#: builtin/am.c:1188 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "่กฅไธไฝฟ็จ format=flowed ๆ ผๅผๅ้๏ผ่กๅฐพ็็ฉบๆ ผๅฏ่ฝไผไธขๅคฑใ" -#: builtin/am.c:1211 +#: builtin/am.c:1216 msgid "Patch is empty." msgstr "่กฅไธไธบ็ฉบใ" -#: builtin/am.c:1277 +#: builtin/am.c:1281 #, c-format -msgid "invalid ident line: %.*s" -msgstr "ๆ ๆ็่บซไปฝๆ ่ฏ๏ผ%.*s" +msgid "missing author line in commit %s" +msgstr "ๅจๆไบค %s ไธญ็ผบๅคฑไฝ่ ่ก" -#: builtin/am.c:1299 +#: builtin/am.c:1284 #, c-format -msgid "unable to parse commit %s" -msgstr "ไธ่ฝ่งฃๆๆไบค %s" +msgid "invalid ident line: %.*s" +msgstr "ๆ ๆ็่บซไปฝๆ ่ฏ๏ผ%.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1503 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "ไปๅบ็ผบไนๅฟ ่ฆ็ๆฐๆฎๅฏน่ฑกไปฅ่ฟ่กไธๆนๅๅนถใ" -#: builtin/am.c:1498 +#: builtin/am.c:1505 msgid "Using index info to reconstruct a base tree..." msgstr "ไฝฟ็จ็ดขๅผๆฅ้ๅปบไธไธช๏ผไธๆนๅๅนถ็๏ผๅบ็ก็ฎๅฝๆ ..." -#: builtin/am.c:1517 +#: builtin/am.c:1524 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8694,24 +9924,24 @@ msgstr "" "ๆจๆฏๅฆๆพๆๅจ็ผ่พ่ฟๆจ็่กฅไธ๏ผ\n" "ๆ ๆณๅบ็จ่กฅไธๅฐ็ดขๅผไธญ็ๆฐๆฎๅฏน่ฑกไธใ" -#: builtin/am.c:1523 +#: builtin/am.c:1530 msgid "Falling back to patching base and 3-way merge..." msgstr "ๅ่ฝๅฐๅบ็ก็ๆฌไธๆ่กฅไธๅ่ฟ่กไธๆนๅๅนถ..." -#: builtin/am.c:1549 +#: builtin/am.c:1556 msgid "Failed to merge in the changes." msgstr "ๆ ๆณๅๅนถๅๆดใ" -#: builtin/am.c:1581 +#: builtin/am.c:1588 msgid "applying to an empty history" msgstr "ๆญฃๅบ็จๅฐไธไธช็ฉบๅๅฒไธ" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1639 builtin/am.c:1643 #, c-format msgid "cannot resume: %s does not exist." msgstr "ๆ ๆณ็ปง็ปญ๏ผ%s ไธๅญๅจใ" -#: builtin/am.c:1650 +#: builtin/am.c:1661 msgid "Commit Body is:" msgstr "ๆไบคๅ ๅฎนไธบ๏ผ" @@ -8720,35 +9950,39 @@ msgstr "ๆไบคๅ ๅฎนไธบ๏ผ" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1671 #, 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:1710 +#: builtin/am.c:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "ๆ ๆณๅๅ ฅ็ดขๅผๆไปถ" + +#: builtin/am.c:1721 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "่็ดขๅผ๏ผไธ่ฝๅบ็จ่กฅไธ๏ผ่ๆไปถ๏ผ%s๏ผ" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1761 builtin/am.c:1829 #, c-format msgid "Applying: %.*s" msgstr "ๅบ็จ๏ผ%.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1778 msgid "No changes -- Patch already applied." msgstr "ๆฒกๆๅๆด โโ ่กฅไธๅทฒ็ปๅบ็จ่ฟใ" -#: builtin/am.c:1773 +#: builtin/am.c:1784 #, c-format msgid "Patch failed at %s %.*s" msgstr "ๆ่กฅไธๅคฑ่ดฅไบ %s %.*s" -#: 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:1788 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +msgstr "็จ 'git am --show-current-patch=diff' ๅฝไปคๆฅ็ๅคฑ่ดฅ็่กฅไธ" -#: builtin/am.c:1821 +#: builtin/am.c:1832 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8758,7 +9992,7 @@ msgstr "" "ๅฆๆๆฒกๆไปไน่ฆๆทปๅ ๅฐๆๅญๅบ็๏ผๅๅพๅฏ่ฝๆฏๅ ถๅฎๆไบคๅทฒ็ปๅผๅ ฅไบ็ธๅ็ๅๆดใ\n" "ๆจไน่ฎธๆณ่ฆ่ทณ่ฟ่ฟไธช่กฅไธใ" -#: builtin/am.c:1828 +#: builtin/am.c:1839 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8769,159 +10003,171 @@ msgstr "" "ๆจๅบ่ฏฅๅฏนๅทฒ็ปๅฒ็ช่งฃๅณ็ๆฏไธไธชๆไปถๆง่ก 'git add' ๆฅๆ ่ฎฐๅทฒ็ปๅฎๆใ \n" "ไฝ ๅฏไปฅๅฏน \"็ฑไปไปฌๅ ้ค\" ็ๆไปถๆง่ก `git rm` ๅฝไปคใ" -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "ไธ่ฝ่งฃๆๅฏน่ฑก '%s'ใ" -#: builtin/am.c:1987 +#: builtin/am.c:1998 msgid "failed to clean index" msgstr "ๆธ ็ฉบ็ดขๅผๅคฑ่ดฅ" -#: builtin/am.c:2031 +#: builtin/am.c:2042 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:2128 +#: builtin/am.c:2149 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "ๆ ๆ็ --patch-format ๅผ๏ผ%s" -#: builtin/am.c:2164 +#: builtin/am.c:2191 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "ๆ ๆ็ --show-current-patch ๅผ๏ผ%s" + +#: builtin/am.c:2195 +#, 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:2226 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<้้กน>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2165 +#: builtin/am.c:2227 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<้้กน>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2233 msgid "run interactively" msgstr "ไปฅไบคไบๅผๆนๅผ่ฟ่ก" -#: builtin/am.c:2173 +#: builtin/am.c:2235 msgid "historical option -- no-op" msgstr "่็ๅๆฐ โโ ๆ ไฝ็จ" -#: builtin/am.c:2175 +#: builtin/am.c:2237 msgid "allow fall back on 3way merging if needed" msgstr "ๅฆๆๅฟ ่ฆ๏ผๅ ่ฎธไฝฟ็จไธๆนๅๅนถใ" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 msgid "be quiet" msgstr "้้ปๆจกๅผ" -#: builtin/am.c:2178 +#: builtin/am.c:2240 msgid "add a Signed-off-by line to the commit message" msgstr "ๅจๆไบค่ฏดๆไธญๆทปๅ ไธไธช Signed-off-by ็ญพๅ" -#: builtin/am.c:2181 +#: builtin/am.c:2243 msgid "recode into utf8 (default)" msgstr "ไฝฟ็จ utf8 ๅญ็ฌฆ้๏ผ้ป่ฎค๏ผ" -#: builtin/am.c:2183 +#: builtin/am.c:2245 msgid "pass -k flag to git-mailinfo" msgstr "ๅ git-mailinfo ไผ ้ -k ๅๆฐ" -#: builtin/am.c:2185 +#: builtin/am.c:2247 msgid "pass -b flag to git-mailinfo" msgstr "ๅ git-mailinfo ไผ ้ -b ๅๆฐ" -#: builtin/am.c:2187 +#: builtin/am.c:2249 msgid "pass -m flag to git-mailinfo" msgstr "ๅ git-mailinfo ไผ ้ -m ๅๆฐ" -#: builtin/am.c:2189 +#: builtin/am.c:2251 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "้ๅฏน mbox ๆ ผๅผ๏ผๅ git-mailsplit ไผ ้ --keep-cr ๅๆฐ" -#: builtin/am.c:2192 +#: builtin/am.c:2254 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "ไธๅ git-mailsplit ไผ ้ --keep-cr ๅๆฐ๏ผ่ฆ็ am.keepcr ็่ฎพ็ฝฎ" -#: builtin/am.c:2195 +#: builtin/am.c:2257 msgid "strip everything before a scissors line" msgstr "ไธขๅผ่ฃๅ็บฟๅ็ๆๆๅ ๅฎน" -#: 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 +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 msgid "pass it through git-apply" msgstr "ไผ ้็ป git-apply" -#: 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:141 parse-options.h:162 parse-options.h:312 +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: 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 +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "ๆ ผๅผ" -#: builtin/am.c:2221 +#: builtin/am.c:2283 msgid "format the patch(es) are in" msgstr "่กฅไธ็ๆ ผๅผ" -#: builtin/am.c:2227 +#: builtin/am.c:2289 msgid "override error message when patch failure occurs" msgstr "ๆ่กฅไธๅคฑ่ดฅๆถๆพ็คบ็้่ฏฏไฟกๆฏ" -#: builtin/am.c:2229 +#: builtin/am.c:2291 msgid "continue applying patches after resolving a conflict" msgstr "ๅฒ็ช่งฃๅณๅ็ปง็ปญๅบ็จ่กฅไธ" -#: builtin/am.c:2232 +#: builtin/am.c:2294 msgid "synonyms for --continue" msgstr "ๅ --continue ๅไน" -#: builtin/am.c:2235 +#: builtin/am.c:2297 msgid "skip the current patch" msgstr "่ทณ่ฟๅฝๅ่กฅไธ" -#: builtin/am.c:2238 +#: builtin/am.c:2300 msgid "restore the original branch and abort the patching operation." msgstr "ๆขๅคๅๅงๅๆฏๅนถ็ปๆญขๆ่กฅไธๆไฝใ" -#: builtin/am.c:2241 +#: builtin/am.c:2303 msgid "abort the patching operation but keep HEAD where it is." msgstr "็ปๆญข่กฅไธๆไฝไฝไฟๆ HEAD ไธๅใ" -#: builtin/am.c:2244 -msgid "show the patch being applied." -msgstr "ๆพ็คบๆญฃๅจๅบ็จ็่กฅไธใ" +#: builtin/am.c:2307 +msgid "show the patch being applied" +msgstr "ๆพ็คบๆญฃๅจๅบ็จ็่กฅไธ" -#: builtin/am.c:2248 +#: builtin/am.c:2312 msgid "lie about committer date" msgstr "ๅฐไฝ่ ๆฅๆไฝไธบๆไบคๆฅๆ" -#: builtin/am.c:2250 +#: builtin/am.c:2314 msgid "use current timestamp for author date" msgstr "็จๅฝๅๆถ้ดไฝไธบไฝ่ ๆฅๆ" -#: 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 +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 msgid "GPG-sign commits" msgstr "ไฝฟ็จ GPG ็ญพๅๆไบค" -#: builtin/am.c:2256 +#: builtin/am.c:2320 msgid "(internal use for git-rebase)" msgstr "๏ผๅ ้จไฝฟ็จ๏ผ็จไบ git-rebase๏ผ" -#: builtin/am.c:2274 +#: builtin/am.c:2338 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." @@ -8929,16 +10175,16 @@ msgstr "" "ๅๆฐ -b/--binary ๅทฒ็ปๅพ้ฟๆถ้ดไธๅไปปไฝๅฎ่ดจๆไฝไบ๏ผๅนถไธๅฐ่ขซ็งป้คใ\n" "่ฏทไธ่ฆๅไฝฟ็จๅฎไบใ" -#: builtin/am.c:2281 +#: builtin/am.c:2345 msgid "failed to read the index" msgstr "่ฏปๅ็ดขๅผๅคฑ่ดฅ" -#: builtin/am.c:2296 +#: builtin/am.c:2360 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "ไนๅ็ๅๅบ็ฎๅฝ %s ไป็ถๅญๅจ๏ผไฝๅดๆไพไบ mboxใ" -#: builtin/am.c:2320 +#: builtin/am.c:2384 #, c-format msgid "" "Stray %s directory found.\n" @@ -8947,11 +10193,11 @@ msgstr "" "ๅ็ฐไบ้่ฏฏ็ %s ็ฎๅฝใ\n" "ไฝฟ็จ \"git am --abort\" ๅ ้คๅฎใ" -#: builtin/am.c:2326 +#: builtin/am.c:2390 msgid "Resolve operation not in progress, we are not resuming." msgstr "่งฃๅณๆไฝๆช่ฟ่ก๏ผๆไปฌไธไผ็ปง็ปญใ" -#: builtin/am.c:2336 +#: builtin/am.c:2400 msgid "interactive mode requires patches on the command line" msgstr "ไบคไบๅผๆจกๅผ้่ฆๅฝไปค่กไธๆไพ่กฅไธ" @@ -8989,23 +10235,23 @@ msgstr "git archive๏ผๅ่ฎฎ้่ฏฏ" 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 --next-all" +msgstr "git bisect--helper --next-all" + +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "git bisect--helper --write-terms <ๅ-ๆฏ่ฏญ> <ๅฅฝ-ๆฏ่ฏญ>" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:25 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<ๆไบค>]" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" @@ -9013,18 +10259,18 @@ msgstr "" "git bisect--helper --bisect-write [--no-log] <็ถๆ> <็ๆฌ> <ๅฅฝ-ๆฏ่ฏญ> <ๅ-ๆฏ่ฏญ" ">" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:28 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 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "git bisect--helper --bisect-next-check <ๅฅฝ-ๆฏ่ฏญ> <ๅ-ๆฏ่ฏญ> [<ๆฏ่ฏญ>]" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:30 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -9032,74 +10278,93 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:31 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<ๆฏ่ฏญ> --term-{new,bad}" -"=<ๆฏ่ฏญ>][--no-checkout] [<ๅ> [<ๅฅฝ>...]] [--] [<่ทฏๅพ>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<ๆฏ่ฏญ> --term-{old,good}" +"=<ๆฏ่ฏญ>] [--no-checkout] [--first-parent] [<ๅ> [<ๅฅฝ>...]] [--] [<่ทฏๅพ>...]" + +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-auto-next" + +#: builtin/bisect--helper.c:35 +msgid "git bisect--helper --bisect-autostart" +msgstr "git bisect--helper --bisect-autostart" + +#: builtin/bisect--helper.c:97 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "ไธ่ฝไปฅ '%2$s' ๆจกๅผๆๅผๆไปถ '%1$s'" + +#: builtin/bisect--helper.c:104 +#, c-format +msgid "could not write to file '%s'" +msgstr "ไธ่ฝๅๅ ฅๆไปถ '%s'" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:143 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' ไธๆฏไธไธชๆๆ็ๆฏ่ฏญ" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:147 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "ไธ่ฝไฝฟ็จๅ ็ฝฎๅฝไปค '%s' ไฝไธบๆฏ่ฏญ" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "ไธ่ฝไฟฎๆนๆฏ่ฏญ '%s' ็ๅซไน" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:167 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 +#: builtin/bisect--helper.c:207 #, c-format msgid "We are not bisecting.\n" msgstr "ๆไปฌๆฒกๆๅจไบๅๆฅๆพใ\n" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:215 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' ไธๆฏไธไธชๆๆ็ๆไบค" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:224 #, 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:215 +#: builtin/bisect--helper.c:268 #, c-format msgid "Bad bisect_write argument: %s" msgstr "ๅ็ bisect_write ๅๆฐ๏ผ%s" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "ๆ ๆณ่ทๅ็ๆฌ '%s' ็ๅฏน่ฑก ID" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:285 #, c-format msgid "couldn't open the file '%s'" msgstr "ๆ ๆณๆๅผๆไปถ '%s'" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:311 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "ๆ ๆ็ๅฝไปค๏ผๆจๅฝๅๆญฃๅคไบไธไธช %s/%s ไบๅๆฅๆพไธญ" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:338 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9108,7 +10373,7 @@ msgstr "" "ๆจ้่ฆ็ปๆ่ณๅฐไธไธช %s ๅไธไธช %s ็ๆฌใ\n" "ไธบๆญคๆจๅฏไปฅ็จ \"git bisect %s\" ๅ \"git bisect %s\"ใ" -#: builtin/bisect--helper.c:289 +#: builtin/bisect--helper.c:342 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9119,7 +10384,7 @@ msgstr "" "็ถๅ้่ฆๆไพๆ่ณๅฐไธไธช %s ๅไธไธช %s ็ๆฌใ\n" "ไธบๆญคๆจๅฏไปฅ็จ \"git bisect %s\" ๅ \"git bisect %s\" ๅฝไปคใ" -#: builtin/bisect--helper.c:321 +#: builtin/bisect--helper.c:362 #, c-format msgid "bisecting only with a %s commit" msgstr "ๅจๅชๆไธไธช %s ๆไบค็ๆ ๅตไธไบๅๆฅๆพ" @@ -9129,22 +10394,22 @@ msgstr "ๅจๅชๆไธไธช %s ๆไบค็ๆ ๅตไธไบๅๆฅๆพ" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:370 msgid "Are you sure [Y/n]? " msgstr "ๆจ็กฎ่ฎคไน[Y/n]๏ผ " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:431 msgid "no terms defined" msgstr "ๆชๅฎไนๆฏ่ฏญ" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:434 #, 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:389 +#: builtin/bisect--helper.c:444 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9153,114 +10418,160 @@ msgstr "" "ๅฝไปค 'git bisect terms' ็ๅๆฐ %s ๆ ๆใ\n" "ๆฏๆ็้้กนๆ๏ผ--term-good|--term-old ๅ --term-bad|--term-newใ" -#: builtin/bisect--helper.c:475 +#: builtin/bisect--helper.c:511 +msgid "revision walk setup failed\n" +msgstr "็ๆฌ้ๅ่ฎพ็ฝฎๅคฑ่ดฅ\n" + +#: builtin/bisect--helper.c:533 +#, c-format +msgid "could not open '%s' for appending" +msgstr "ๆ ๆณๆๅผ '%s' ่ฟ่ก่ฟฝๅ " + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +msgid "'' is not a valid term" +msgstr "'' ไธๆฏไธไธชๆๆ็ๆฏ่ฏญ" + +#: builtin/bisect--helper.c:674 #, c-format msgid "unrecognized option: '%s'" msgstr "ๆช่ฏๅซ็้้กน๏ผ'%s'" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:678 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' ็่ตทๆฅไธๆฏไธไธชๆๆ็็ๆฌ" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:709 msgid "bad HEAD - I need a HEAD" msgstr "ๅ็ HEAD - ๆ้่ฆไธไธช HEAD" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:724 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "ๆฃๅบ '%s' ๅคฑ่ดฅใๅฐ่ฏ 'git bisect start <ๆๆๅๆฏ>'ใ" -#: builtin/bisect--helper.c:547 +#: builtin/bisect--helper.c:745 msgid "won't bisect on cg-seek'ed tree" msgstr "ไธไผๅจๅไบ cg-seek ็ๆ ไธๅไบๅๆฅๆพ" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:748 msgid "bad HEAD - strange symbolic ref" msgstr "ๅ็ HEAD - ๅฅๆช็็ฌฆๅทๅผ็จ" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:775 #, c-format msgid "invalid ref: '%s'" msgstr "ๆ ๆ็ๅผ็จ๏ผ'%s'" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:827 +msgid "You need to start by \"git bisect start\"\n" +msgstr "ๆจ้่ฆๆง่ก \"git bisect start\" ๆฅๅผๅง\n" + +# ่ฏ่ ๏ผๆณจๆไฟๆๅฅๅฐพ็ฉบๆ ผ +#. 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:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "ๆจๆณ่ฎฉๆไธบๆจ่ฟๆ ทๅไน[Y/n]๏ผ " + +#: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'" msgstr "ๆง่ก 'git bisect next'" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:868 msgid "write the terms to .git/BISECT_TERMS" msgstr "ๅฐๆฏ่ฏญๅๅ ฅ .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:870 msgid "cleanup the bisection state" msgstr "ๆธ ้คไบๅๆฅๆพ็ถๆ" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:872 msgid "check for expected revs" msgstr "ๆฃๆฅ้ขๆ็็ๆฌ" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:874 msgid "reset the bisection state" msgstr "ๆธ ้คไบๅๆฅๆพ็ถๆ" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:876 msgid "write out the bisection state in BISECT_LOG" msgstr "ๅฐไบๅๆฅๆพ็็ถๆๅๅ ฅ BISECT_LOG" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:878 msgid "check and set terms in a bisection state" msgstr "ๅจไธไธชไบๅๆฅๆพ็ถๆไธญๆฃๆฅๅ่ฎพ็ฝฎๆฏ่ฏญ" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:880 msgid "check whether bad or good terms exist" msgstr "ๆฃๆฅๅ็ๆๅฅฝ็ๆฏ่ฏญๆฏๅฆๅญๅจ" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:882 msgid "print out the bisect terms" msgstr "ๆๅฐไบๅๆฅๆพๆฏ่ฏญ" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:884 msgid "start the bisect session" msgstr "ๅฏๅจไบๅๆฅๆพ่ฟ็จ" -#: builtin/bisect--helper.c:650 -msgid "update BISECT_HEAD instead of checking out the current commit" -msgstr "ๆดๆฐ BISECT_HEAD ่้ๆฃๅบๅฝๅๆไบค" +#: builtin/bisect--helper.c:886 +msgid "find the next bisection commit" +msgstr "ๆฅ่ฏขไธไธไธชไบๅๆฅๆพๆไบค" + +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" +msgstr "ๆ ก้ชไธไธไธชไบๅๆฅๆพ็ถๆ็ถๅๆฃๅบไธไธไธชไบๅๆฅๆพๆไบค" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "ๅฆๆไบๅๆฅๆพๅฐๆชๅฏๅจ๏ผๅๅฏๅจไน" + +#: builtin/bisect--helper.c:892 msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE ๆ ๆฅๅฟ" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:910 msgid "--write-terms requires two arguments" msgstr "--write-terms ้่ฆไธคไธชๅๆฐ" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:914 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state ไธๅธฆๅๆฐ" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:921 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset ๆ ้ๅๆฐๆ่ ้่ฆไธไธชๆไบค" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:925 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write ้่ฆ 4 ๆ 5 ไธชๅๆฐ" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:931 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms ้่ฆ 3 ไธชๅๆฐ" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:937 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check ้่ฆ 2 ๆ 3 ไธชๅๆฐ" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:943 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms ้่ฆ 0 ๆ 1 ไธชๅๆฐ" +#: builtin/bisect--helper.c:952 +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next ้่ฆ 0 ไธชๅๆฐ" + +#: builtin/bisect--helper.c:958 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--bisect-auto-next ้่ฆ 0 ไธชๅๆฐ" + +#: builtin/bisect--helper.c:964 +msgid "--bisect-autostart does not accept arguments" +msgstr "--bisect-autostart ไธๅธฆๅๆฐ" + #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<้้กน>] [<็ๆฌ้้กน>] [<็ๆฌ>] [--] <ๆไปถ>" @@ -9287,132 +10598,128 @@ msgstr "่ฎพ็ฝฎ color.blame.repeatedLines ไธญ็ๆ ๆ้ข่ฒ '%s'" msgid "invalid value for blame.coloring" msgstr "่ฎพ็ฝฎ blame.coloring ไธญ็ๆ ๆๅๅผ" -#: builtin/blame.c:823 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "ไธ่ฝๆพๅฐ่ฆๅฟฝ็ฅ็็ๆฌ %s" -#: builtin/blame.c:845 +#: builtin/blame.c:867 msgid "Show blame entries as we find them, incrementally" msgstr "ๅข้ๅผๅฐๆพ็คบๅ็ฐ็ blame ๆก็ฎ" -#: builtin/blame.c:846 -msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "่พน็ๆไบคๆพ็คบ็ฉบ็ SHA-1๏ผ้ป่ฎค๏ผๅ ณ้ญ๏ผ" +#: builtin/blame.c:868 +msgid "Do not show object names of boundary commits (Default: off)" +msgstr "ไธๆพ็คบ่พน็ๆไบค็ๅฏน่ฑกๅ๏ผ้ป่ฎค๏ผๅ ณ้ญ๏ผ" -#: builtin/blame.c:847 +#: builtin/blame.c:869 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "ไธๆๆ นๆไบคไฝไธบ่พน็๏ผ้ป่ฎค๏ผๅ ณ้ญ๏ผ" -#: builtin/blame.c:848 +#: builtin/blame.c:870 msgid "Show work cost statistics" msgstr "ๆพ็คบๅฝไปคๆถ่็ป่ฎก" -#: builtin/blame.c:849 +#: builtin/blame.c:871 msgid "Force progress reporting" msgstr "ๅผบๅถ่ฟๅบฆๆพ็คบ" -#: builtin/blame.c:850 +#: builtin/blame.c:872 msgid "Show output score for blame entries" msgstr "ๆพ็คบๅคๆญ blame ๆก็ฎไฝ็งป็ๅพๅ่ฏๆญไฟกๆฏ" -#: builtin/blame.c:851 +#: builtin/blame.c:873 msgid "Show original filename (Default: auto)" msgstr "ๆพ็คบๅๅงๆไปถๅ๏ผ้ป่ฎค๏ผ่ชๅจ๏ผ" -#: builtin/blame.c:852 +#: builtin/blame.c:874 msgid "Show original linenumber (Default: off)" msgstr "ๆพ็คบๅๅง็่กๅท๏ผ้ป่ฎค๏ผๅ ณ้ญ๏ผ" -#: builtin/blame.c:853 +#: builtin/blame.c:875 msgid "Show in a format designed for machine consumption" msgstr "ๆพ็คบไธบไธไธช้ๅๆบๅจ่ฏปๅ็ๆ ผๅผ" -#: builtin/blame.c:854 +#: builtin/blame.c:876 msgid "Show porcelain format with per-line commit information" msgstr "ไธบๆฏไธ่กๆพ็คบๆบๅจ้็จ็ๆไบคไฟกๆฏ" -#: builtin/blame.c:855 +#: builtin/blame.c:877 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "ไฝฟ็จๅ git-annotate ็ธๅ็่พๅบๆจกๅผ๏ผ้ป่ฎค๏ผๅ ณ้ญ๏ผ" -#: builtin/blame.c:856 +#: builtin/blame.c:878 msgid "Show raw timestamp (Default: off)" msgstr "ๆพ็คบๅๅงๆถ้ดๆณ๏ผ้ป่ฎค๏ผๅ ณ้ญ๏ผ" -#: builtin/blame.c:857 +#: builtin/blame.c:879 msgid "Show long commit SHA1 (Default: off)" msgstr "ๆพ็คบ้ฟ็ SHA1 ๆไบคๅท๏ผ้ป่ฎค๏ผๅ ณ้ญ๏ผ" -#: builtin/blame.c:858 +#: builtin/blame.c:880 msgid "Suppress author name and timestamp (Default: off)" msgstr "้่ไฝ่ ๅๅญๅๆถ้ดๆณ๏ผ้ป่ฎค๏ผๅ ณ้ญ๏ผ" -#: builtin/blame.c:859 +#: builtin/blame.c:881 msgid "Show author email instead of name (Default: off)" msgstr "ๆพ็คบไฝ่ ็้ฎ็ฎฑ่ไธๆฏๅๅญ๏ผ้ป่ฎค๏ผๅ ณ้ญ๏ผ" -#: builtin/blame.c:860 +#: builtin/blame.c:882 msgid "Ignore whitespace differences" msgstr "ๅฟฝ็ฅ็ฉบ็ฝๅทฎๅผ" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:883 builtin/log.c:1808 msgid "rev" msgstr "็ๆฌ" -#: builtin/blame.c:861 +#: builtin/blame.c:883 msgid "Ignore <rev> when blaming" msgstr "ๅจๆง่ก blame ๆไฝๆถๅฟฝ็ฅ <็ๆฌ>" -#: builtin/blame.c:862 +#: builtin/blame.c:884 msgid "Ignore revisions from <file>" msgstr "ๅฟฝ็ฅๆฅ่ช <ๆไปถ> ไธญ็็ๆฌ" -#: builtin/blame.c:863 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "ไฝฟ็จ้ข่ฒ้ด้่พๅบไธๅไธ่กไธๅ็้ๅคๅ ไฟกๆฏ" -#: builtin/blame.c:864 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "ไพๆฎๆถ้ด็่ฒ" -#: builtin/blame.c:871 -msgid "Use an experimental heuristic to improve diffs" -msgstr "ไฝฟ็จไธไธช่ฏ้ชๆง็ๅฏๅๅผ็ฎๆณๆน่ฟๅทฎๅผๆพ็คบ" - -#: builtin/blame.c:873 +#: builtin/blame.c:887 msgid "Spend extra cycles to find better match" msgstr "่ฑ่ดน้ขๅค็ๅพช็ฏๆฅๆพๅฐๆดๅฅฝ็ๅน้ " -#: builtin/blame.c:874 +#: builtin/blame.c:888 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "ไฝฟ็จๆฅ่ช <ๆไปถ> ็ไฟฎ่ฎข้่ไธๆฏ่ฐ็จ git-rev-list" -#: builtin/blame.c:875 +#: builtin/blame.c:889 msgid "Use <file>'s contents as the final image" msgstr "ไฝฟ็จ <ๆไปถ> ็ๅ ๅฎนไฝไธบๆ็ป็ๅพ็" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "ๅพๅ" -#: builtin/blame.c:876 +#: builtin/blame.c:890 msgid "Find line copies within and across files" msgstr "ๆพๅฐๆไปถๅ ๅ่ทจๆไปถ็่กๆท่ด" -#: builtin/blame.c:877 +#: builtin/blame.c:891 msgid "Find line movements within and across files" msgstr "ๆพๅฐๆไปถๅ ๅ่ทจๆไปถ็่ก็งปๅจ" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "Process only line range n,m, counting from 1" msgstr "ๅชๅค็่ก่ๅดๅจ n ๅ m ไน้ด็๏ผไป 1 ๅผๅง" -#: builtin/blame.c:929 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress ไธ่ฝๅ --incremental ๆ --porcelain ๅๆถไฝฟ็จ" @@ -9424,24 +10731,24 @@ msgstr "--progress ไธ่ฝๅ --incremental ๆ --porcelain ๅๆถไฝฟ็จ" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "4 ๅนด 11 ไธชๆๅ" -#: builtin/blame.c:1087 +#: builtin/blame.c:1110 #, 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:1133 +#: builtin/blame.c:1156 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]" +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>]" @@ -9646,7 +10953,7 @@ msgstr "่ฎพ็ฝฎ่ท่ธชๆจกๅผ๏ผๅ่ง git-pull(1)๏ผ" msgid "do not use" msgstr "ไธ่ฆไฝฟ็จ" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:526 msgid "upstream" msgstr "ไธๆธธ" @@ -9655,7 +10962,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 @@ -9738,97 +11045,97 @@ msgstr "ๅชๆๅฐๅฐๆชๅๅนถ็ๅๆฏ" msgid "list branches in columns" msgstr "ไปฅๅ็ๆนๅผๆพ็คบๅๆฏ" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 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 +#: builtin/tag.c:434 msgid "object" msgstr "ๅฏน่ฑก" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "ๅชๆๅฐๆๅ่ฏฅๅฏน่ฑก็ๅๆฏ" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "ๆๅบๅ่ฟๆปคๅฑไบๅคงๅฐๅไธๆๆ" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "่พๅบๆ ผๅผ" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "HEAD ๆฒกๆไฝไบ /refs/heads ไนไธ๏ผ" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "--column ๅ --verbose ไธๅ ผๅฎน" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "ๅฟ ้กปๆไพๅๆฏๅ" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "ไธ่ฝๅๅ็ฆปๅคดๆ้ๆไพๆ่ฟฐ" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "ไธ่ฝไธบไธไธชไปฅไธ็ๅๆฏ็ผ่พๆ่ฟฐ" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "ๅๆฏ '%s' ๅฐๆ ๆไบคใ" -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "ๆฒกๆๅๆฏ '%s'ใ" -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "ไธบๆท่ดๆไฝๆไพไบๅคชๅค็ๅๆฏๅ" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "ไธบ้ๅฝๅๆไฝๆไพไบๅคชๅค็ๅๆฐ" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "ไธบ่ฎพ็ฝฎๆฐไธๆธธๆไพไบๅคชๅค็ๅๆฐ" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, 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 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "ๆฒกๆๆญคๅๆฏ '%s'" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "ๅๆฏ '%s' ไธๅญๅจ" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "ไธบๅๆถไธๆธธ่ฎพ็ฝฎๆไฝๆไพไบๅคชๅค็ๅๆฐ" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "ๆ ๆณๅๆถ HEAD ็ไธๆธธ่ฎพ็ฝฎๅ ไธบๅฎๆฒกๆๆๅไธไธชๅๆฏ" -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "ๅๆฏ '%s' ๆฒกๆไธๆธธไฟกๆฏ" -#: builtin/branch.c:841 +#: builtin/branch.c:839 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>?" @@ -9836,27 +11143,171 @@ msgstr "" "'git branch' ็ -a ๅ -r ้้กนไธๅธฆไธไธชๅๆฏๅใ\n" "ๆจๆฏๅฆๆณ่ฆไฝฟ็จ๏ผ-a|-r --list <ๆจกๅผ>๏ผ" -#: builtin/branch.c:845 +#: builtin/branch.c:843 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:45 +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "git ็ๆฌ๏ผ\n" + +#: builtin/bugreport.c:21 #, c-format -msgid "%s is okay\n" -msgstr "%s ๅฏไปฅ\n" +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() ๅคฑ่ดฅ๏ผ้่ฏฏไธบ '%s'๏ผ%d๏ผ\n" -#: builtin/bundle.c:58 +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "็ผ่ฏๅจไฟกๆฏ๏ผ" + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "libc ไฟกๆฏ๏ผ" + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "ไธๆฏๅจ git ไปๅบไธญๆง่ก - ๆฒกๆๅฏๆพ็คบ็้ฉๅญ\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "git bugreport [-o|--output-directory <ๆไปถ>] [-s|--suffix <ๆ ผๅผ>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"ๆ่ฐขๆจๅกซๅ Git ้่ฏฏๆฅๅ๏ผ\n" +"่ฏทๅกซๅไปฅไธ้ฎๅท๏ผไปฅๅธฎๅฉๆไปฌไบ่งฃๆจ็้ฎ้ขใ\n" +"\n" +"ๅจ้่ฏฏๅ็ไนๅ๏ผๆจๅไบไปไน๏ผ๏ผ้็ฐ้ฎ้ข็ๆญฅ้ชค๏ผ\n" +"\n" +"ๆจๆๆๅ็ไปไน๏ผ๏ผ้ขๆ่กไธบ๏ผ\n" +"\n" +"ๅฎ้ ๅ็ไบไปไน๏ผ๏ผๅฎ้ ่กไธบ๏ผ\n" +"\n" +"ๆจๆๆๆ็ไธๅฎ้ ๅ็็ๆไปไนไธๅ๏ผ\n" +"\n" +"ๆจๆณ่ฆ่กฅๅ ็ๅ ถๅฎๅ ๅฎน๏ผ\n" +"\n" +"่ฏทๆฃๆฅไธ้ข้่ฏฏๆฅๅไธญไฝไธ็ๅ ๅฎนใ\n" +"ๆจๅฏไปฅๅ ้คไปปไฝๆจไธๆณๅ ฑไบซ็ๅ ๅฎนใ\n" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "ๆๅฎ้่ฏฏๆฅๅๆไปถ็็ฎๆ ไฝ็ฝฎ" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "ๆๅฎๆไปถ็ strftime ๆ ผๅผๅ็ผ" + +#: builtin/bugreport.c:158 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "ไธ่ฝไธบ '%s' ๅๅปบๅ ๅฏผ็ฎๅฝ" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "็ณป็ปไฟกๆฏ" + +#: builtin/bugreport.c:168 +msgid "Enabled Hooks" +msgstr "ๅฏ็จ็้ฉๅญ" + +#: builtin/bugreport.c:175 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "ไธ่ฝๅจ '%s' ๅๅปบๆฐๆไปถ" + +#: builtin/bugreport.c:178 +#, c-format +msgid "unable to write to %s" +msgstr "ๆ ๆณๅๅ ฅ %s" + +#: builtin/bugreport.c:188 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "ๅจ '%s' ๅๅปบไบๆฐๆฅๅใ\n" + +#: 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:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "ไธๆพ็คบ่ฟๅบฆ่กจ" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "ๆพ็คบ่ฟๅบฆ่กจ" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +msgid "show progress meter during object writing phase" +msgstr "ๅจๅฏน่ฑกๅๅ ฅ้ถๆฎตๆพ็คบ่ฟๅบฆ่กจ" + +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +msgid "similar to --all-progress when progress meter is shown" +msgstr "ๅฝ่ฟๅบฆ่กจๆพ็คบๆถ็ฑปไผผไบ --all-progress" + +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "ๆๅฎๅฝๆกฃๅ ็ๆ ผๅผ็ๆฌ" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." -msgstr "้่ฆไธไธชไปๅบๆฅๅๅปบๅ ใ" +msgstr "้่ฆไธไธชไปๅบๆฅๅๅปบๅฝๆกฃๅ ใ" + +#: builtin/bundle.c:107 +msgid "do not show bundle details" +msgstr "ไธๆพ็คบๅฝๆกฃๅ ็็ป่" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "%s ๅฏไปฅ\n" -#: builtin/bundle.c:62 +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." -msgstr "้่ฆไธไธชไปๅบๆฅ่งฃๅ ใ" +msgstr "้่ฆไธไธชไปๅบๆฅ่งฃๅผๅฝๆกฃๅ ใ" -#: builtin/cat-file.c:594 +#: builtin/bundle.c:171 builtin/remote.c:1687 +msgid "be verbose; must be placed before a subcommand" +msgstr "ๅ้ฟ่พๅบ๏ผๅฟ ้กป็ฝฎไบๅญๅฝไปคไนๅ" + +#: builtin/bundle.c:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "ๆช็ฅๅญๅฝไปค๏ผ%s" + +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -9864,79 +11315,79 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <็ฑปๅ> | --textconv | --filters) [--path=<่ทฏๅพ>] <ๅฏน่ฑก>" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:599 msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<ๆ ผๅผ>] | --batch-check[=<ๆ ผๅผ>]) [--follow-symlinks] " +"[--textconv | --filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "ๅช่ฝๆๅฎไธไธชๆนๅค็้้กน" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<็ฑปๅ> ๅฏไปฅๆฏๅ ถไธญไนไธ๏ผblobใtreeใcommitใtag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "ๆพ็คบๅฏน่ฑก็ฑปๅ" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "ๆพ็คบๅฏน่ฑกๅคงๅฐ" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "ๅฝๆฒกๆ้่ฏฏๆถ้ๅบๅนถ่ฟๅ้ถ" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "็พ่งๅฐๆๅฐๅฏน่ฑก็ๅ ๅฎน" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" msgstr "ๅฏนไบๆฐๆฎๅฏน่ฑก๏ผๅฏนๅ ถๅ ๅฎนๅๆๆฌ่ฝฌๆข" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" msgstr "ๅฏนไบๆฐๆฎๅฏน่ฑก๏ผๅฏนๅ ถๅ ๅฎนๅ่ฟๆปค" -#: builtin/cat-file.c:644 git-submodule.sh:936 +#: builtin/cat-file.c:648 msgid "blob" msgstr "ๆฐๆฎๅฏน่ฑก" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "ๅฏนไบ --textconv/--filters ไฝฟ็จไธไธช็นๅฎ็่ทฏๅพ" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:651 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "ๅ ่ฎธ -s ๅ -t ๅฏนๆๅ็ๅฏน่ฑก็ๆ" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "็ผๅฒ --batch ็่พๅบ" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:654 msgid "show info and content of objects fed from the standard input" msgstr "ๆพ็คบไปๆ ๅ่พๅ ฅๆไพ็ๅฏน่ฑก็ไฟกๆฏๅๅ ๅฎน" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "ๆพ็คบไปๆ ๅ่พๅ ฅๆไพ็ๅฏน่ฑก็ไฟกๆฏ" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:662 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "่ท้ๆ ๅ ็ฌฆๅท้พๆฅ๏ผๅ --batch ๆ --batch-check ๅ ฑ็จ๏ผ" -#: builtin/cat-file.c:660 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "ไฝฟ็จ --batch ๆ --batch-check ๅๆฐๆพ็คบๆๆๅฏน่ฑก" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "ไธ่ฆๅฏน --batch-all-objects ็่พๅบๆๅบ" @@ -9964,8 +11415,8 @@ msgstr "ไปๆ ๅ่พๅ ฅ่ฏปๅบๆไปถๅ" msgid "terminate input and output records by a NUL character" msgstr "่พๅ ฅๅ่พๅบ็่ฎฐๅฝไฝฟ็จ NUL ๅญ็ฌฆ็ป็ป" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "ไธๆพ็คบ่ฟๅบฆๆฅๅ" @@ -9977,27 +11428,27 @@ msgstr "ๆพ็คบๆชๅน้ ็่พๅ ฅ่ทฏๅพ" msgid "ignore index when checking" msgstr "ๆฃๆฅๆถๅฟฝ็ฅ็ดขๅผ" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "ไธ่ฝๅๆถๆๅฎ่ทฏๅพๅ --stdin ๅๆฐ" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z ้่ฆๅ --stdin ๅๆฐๅ ฑ็จๆๆๆไน" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "ๆชๆๅฎ่ทฏๅพ" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "ๅๆฐ --quiet ๅชๅจๆไพไธไธช่ทฏๅพๅๆถๆๆ" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "ไธ่ฝๅๆถๆไพ --quiet ๅ --verbose ๅๆฐ" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching ้้กนๅชๅจไฝฟ็จ --verbose ๆถๆๆ" @@ -10055,9 +11506,9 @@ msgid "write the content to temporary files" msgstr "ๅฐๅ ๅฎนๅๅ ฅไธดๆถๆไปถ" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 msgid "string" msgstr "ๅญ็ฌฆไธฒ" @@ -10085,98 +11536,98 @@ msgstr "git switch [<้้กน>] [<ๅๆฏ>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<้้กน>] [--source=<ๅๆฏ>] <ๆไปถ>..." -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "่ทฏๅพ '%s' ๆฒกๆๆไปฌ็็ๆฌ" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "่ทฏๅพ '%s' ๆฒกๆไปไปฌ็็ๆฌ" -#: builtin/checkout.c:190 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "่ทฏๅพ '%s' ๆฒกๆๅ จ้จๅฟ ้็็ๆฌ" -#: builtin/checkout.c:240 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "่ทฏๅพ '%s' ๆฒกๆๅฟ ้็็ๆฌ" -#: builtin/checkout.c:258 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'๏ผๆ ๆณๅๅนถ" -#: builtin/checkout.c:274 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "ๆ ๆณไธบ '%s' ๆทปๅ ๅๅนถ็ปๆ" -#: builtin/checkout.c:374 +#: builtin/checkout.c:396 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "้ๆฐๅๅปบไบ %d ไธชๅๅนถๅฒ็ช" msgstr[1] "้ๆฐๅๅปบไบ %d ไธชๅๅนถๅฒ็ช" -#: builtin/checkout.c:379 +#: builtin/checkout.c:401 #, 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:386 +#: builtin/checkout.c:408 #, 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:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ไธ่ฝๅจๆดๆฐ่ทฏๅพๆถไฝฟ็จ" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ไธ่ฝๅ %s ๅๆถไฝฟ็จ" -#: builtin/checkout.c:429 +#: builtin/checkout.c:451 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "ไธ่ฝๅๆถๆดๆฐ่ทฏๅพๅนถๅๆขๅฐๅๆฏ'%s'ใ" -#: builtin/checkout.c:433 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' ๆ '%s' ้ฝๆฒกๆๆๅฎ" -#: builtin/checkout.c:437 +#: builtin/checkout.c:459 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "ๆชๆๅฎ '%2$s' ๆถ๏ผๅฟ ้กปไฝฟ็จ '%1$s'" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' ๆ '%s' ไธ่ฝๅ %s ไธ่ตทไฝฟ็จ" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:528 builtin/checkout.c:535 #, c-format msgid "path '%s' is unmerged" msgstr "่ทฏๅพ '%s' ๆชๅๅนถ" -#: builtin/checkout.c:679 +#: builtin/checkout.c:703 msgid "you need to resolve your current index first" msgstr "ๆจ้่ฆๅ ่งฃๅณๅฝๅ็ดขๅผ็ๅฒ็ช" -#: builtin/checkout.c:729 +#: builtin/checkout.c:757 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10185,56 +11636,51 @@ msgstr "" "ไธ่ฝ็ปง็ปญ๏ผไธๅๆไปถๆๆๅญ็ไฟฎๆน๏ผ\n" "%s" -#: builtin/checkout.c:736 -#, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "ไธๅๆไปถๆๅญ็ไฟฎๆนๅฏ่ฝไผไธขๅคฑ๏ผ%s" - -#: builtin/checkout.c:833 +#: builtin/checkout.c:853 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "ไธ่ฝๅฏน '%s' ๆง่ก reflog ๆไฝ๏ผ%s\n" -#: builtin/checkout.c:875 +#: builtin/checkout.c:895 msgid "HEAD is now at" msgstr "HEAD ็ฎๅไฝไบ" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:899 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "ไธ่ฝๆดๆฐ HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:903 #, c-format msgid "Reset branch '%s'\n" msgstr "้็ฝฎๅๆฏ '%s'\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:906 #, c-format msgid "Already on '%s'\n" msgstr "ๅทฒ็ปไฝไบ '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:910 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "ๅๆขๅนถ้็ฝฎๅๆฏ '%s'\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:912 builtin/checkout.c:1338 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "ๅๆขๅฐไธไธชๆฐๅๆฏ '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:914 #, c-format msgid "Switched to branch '%s'\n" msgstr "ๅๆขๅฐๅๆฏ '%s'\n" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: builtin/checkout.c:945 +#: builtin/checkout.c:965 #, c-format msgid " ... and %d more.\n" msgstr " ... ๅๅ ถๅฎ %d ไธชใ\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:971 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10255,7 +11701,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:990 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10282,28 +11728,19 @@ msgstr[1] "" " git branch <ๆฐๅๆฏๅ> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1025 msgid "internal error in revision walk" msgstr "ๅจ็ๆฌ้ๅๆถ้ๅฐๅ ้จ้่ฏฏ" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1029 msgid "Previous HEAD position was" msgstr "ไนๅ็ HEAD ไฝ็ฝฎๆฏ" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1069 builtin/checkout.c:1333 msgid "You are on a branch yet to be born" msgstr "ๆจไฝไบไธไธชๅฐๆชๅๅงๅ็ๅๆฏ" -#: 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 +#: builtin/checkout.c:1146 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10312,37 +11749,70 @@ msgstr "" "'%s' ๆขๅฏไปฅๆฏไธไธชๆฌๅฐๆไปถ๏ผไนๅฏไปฅๆฏไธไธช่ท่ธชๅๆฏใ\n" "่ฏทไฝฟ็จ --๏ผๅๅฏ้็ --no-guess๏ผๆฅๆถ้คๆญงไน" -#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1153 +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:1163 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "'%s' ๅน้ ๅคไธช๏ผ%d ไธช๏ผ่ฟ็จ่ท่ธชๅๆฏ" + +#: builtin/checkout.c:1229 +msgid "only one reference expected" +msgstr "ๅชๆๆไธไธชๅผ็จ" + +#: builtin/checkout.c:1246 +#, c-format +msgid "only one reference expected, %d given." +msgstr "ๅบๅชๆไธไธชๅผ็จ๏ผๅด็ปๅบไบ %d ไธช" + +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "ๆ ๆๅผ็จ๏ผ%s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1305 builtin/checkout.c:1671 #, c-format msgid "reference is not a tree: %s" msgstr "ๅผ็จไธๆฏไธไธชๆ ๏ผ%s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1352 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "ๆๆไธไธชๅๆฏ๏ผๅพๅฐๆ ็ญพ '%s'" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1354 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "ๆๆไธไธชๅๆฏ๏ผๅพๅฐ่ฟ็จๅๆฏ '%s'" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1355 builtin/checkout.c:1363 #, c-format msgid "a branch is expected, got '%s'" msgstr "ๆๆไธไธชๅๆฏ๏ผๅพๅฐ '%s'" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1358 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "ๆๆไธไธชๅๆฏ๏ผๅพๅฐๆไบค '%s'" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1374 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10350,7 +11820,7 @@ msgstr "" "ไธ่ฝๅจๅๅนถๆถๅๆขๅๆฏ\n" "่่ไฝฟ็จ \"git merge --quit\" ๆ \"git worktree add\"ใ" -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1378 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -10358,7 +11828,7 @@ msgstr "" "ไธ่ฝๅจไธไธช am ไผ่ฏๆ้ดๅๆขๅๆฏ\n" "่่ไฝฟ็จ \"git am --quit\" ๆ \"git worktree add\"ใ" -#: builtin/checkout.c:1333 +#: builtin/checkout.c:1382 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10366,7 +11836,7 @@ msgstr "" "ไธ่ฝๅจๅๅบๆถๅๆขๅๆฏ\n" "่่ไฝฟ็จ \"git rebase --quit\" ๆ \"git worktree add\"ใ" -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1386 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10374,7 +11844,7 @@ msgstr "" "ไธ่ฝๅจๆฃ้ๆถๅๆขๅๆฏ\n" "่่ไฝฟ็จ \"git cherry-pick --quit\" ๆ \"git worktree add\"ใ" -#: builtin/checkout.c:1341 +#: builtin/checkout.c:1390 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10382,270 +11852,254 @@ msgstr "" "ไธ่ฝๅจ่ฟๅๆถๅๆขๅๆฏ\n" "่่ไฝฟ็จ \"git revert --quit\" ๆ \"git worktree add\"ใ" -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1394 msgid "you are switching branch while bisecting" msgstr "ๆจๅจๆง่กไบๅๆฅๆพๆถๅๆขๅๆฏ" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1401 msgid "paths cannot be used with switching branches" msgstr "่ทฏๅพไธ่ฝๅๅๆขๅๆฏๅๆถไฝฟ็จ" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ไธ่ฝๅๅๆขๅๆฏๅๆถไฝฟ็จ" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ไธ่ฝๅ '%s' ๅๆถไฝฟ็จ" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1429 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' ไธๅธฆ <่ตทๅง็น>" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1437 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "ไธ่ฝๅๆขๅๆฏๅฐไธไธช้ๆไบค '%s'" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1444 msgid "missing branch or commit argument" msgstr "็ผบๅฐๅๆฏๆๆไบคๅๆฐ" -#: 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 +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 msgid "force progress reporting" msgstr "ๅผบๅถๆพ็คบ่ฟๅบฆๆฅๅ" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1487 msgid "perform a 3-way merge with the new branch" msgstr "ๅๆฐ็ๅๆฏๆง่กไธๆนๅๅนถ" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 msgid "style" msgstr "้ฃๆ ผ" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1489 msgid "conflict style (merge or diff3)" msgstr "ๅฒ็ช่พๅบ้ฃๆ ผ๏ผmerge ๆ diff3๏ผ" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1501 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "HEAD ไปๆๅฎ็ๆไบคๅ็ฆป" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1502 msgid "set upstream info for new branch" msgstr "ไธบๆฐ็ๅๆฏ่ฎพ็ฝฎไธๆธธไฟกๆฏ" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1504 msgid "force checkout (throw away local modifications)" msgstr "ๅผบๅถๆฃๅบ๏ผไธขๅผๆฌๅฐไฟฎๆน๏ผ" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new-branch" msgstr "ๆฐๅๆฏ" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new unparented branch" msgstr "ๆฐ็ๆฒกๆ็ถๆไบค็ๅๆฏ" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1508 builtin/merge.c:291 msgid "update ignored files (default)" msgstr "ๆดๆฐๅฟฝ็ฅ็ๆไปถ๏ผ้ป่ฎค๏ผ" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1511 msgid "do not check if another worktree is holding the given ref" msgstr "ไธๆฃๆฅๆๅฎ็ๅผ็จๆฏๅฆ่ขซๅ ถไปๅทฅไฝๅบๆๅ ็จ" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1524 msgid "checkout our version for unmerged files" msgstr "ๅฏนๅฐๆชๅๅนถ็ๆไปถๆฃๅบๆไปฌ็็ๆฌ" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1527 msgid "checkout their version for unmerged files" msgstr "ๅฏนๅฐๆชๅๅนถ็ๆไปถๆฃๅบไปไปฌ็็ๆฌ" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1531 msgid "do not limit pathspecs to sparse entries only" msgstr "ๅฏน่ทฏๅพไธๅ็จ็ๆฃๅบ็้ๅถ" -#: builtin/checkout.c:1533 -msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-bใ-B ๅ --orphan ๆฏไบๆฅ็" +#: builtin/checkout.c:1586 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "-%cใ-%c ๅ --orphan ๆฏไบๆฅ็" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1590 msgid "-p and --overlay are mutually exclusive" msgstr "-p ๅ --overlay ไบๆฅ" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1627 msgid "--track needs a branch name" msgstr "--track ้่ฆไธไธชๅๆฏๅ" -#: builtin/checkout.c:1578 -msgid "missing branch name; try -b" -msgstr "็ผบๅฐๅๆฏๅ๏ผๅฐ่ฏ -b" +#: builtin/checkout.c:1632 +#, c-format +msgid "missing branch name; try -%c" +msgstr "็ผบๅฐๅๆฏๅ๏ผๅฐ่ฏ -%c" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1664 #, c-format msgid "could not resolve %s" msgstr "ๆ ๆณ่งฃๆ %s" -#: builtin/checkout.c:1623 -msgid "you must specify path(s) to restore" -msgstr "ๆจๅฟ ้กปๆๅฎไธไธช่ฆๆขๅค็่ทฏๅพ" - -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1680 msgid "invalid path specification" msgstr "ๆ ๆ็่ทฏๅพ่งๆ ผ" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1687 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' ไธๆฏไธไธชๆไบค๏ผไธ่ฝๅบไบๅฎๅๅปบๅๆฏ '%s'" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1691 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout๏ผ--detach ไธ่ฝๆฅๆถ่ทฏๅพๅๆฐ '%s'" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1700 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file ไธ --detach ไธๅ ผๅฎน" + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file ไธ --patch ไธๅ ผๅฎน" + +#: builtin/checkout.c:1716 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: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:1721 +msgid "you must specify path(s) to restore" +msgstr "ๆจๅฟ ้กปๆๅฎไธไธช่ฆๆขๅค็่ทฏๅพ" -#: 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 +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 msgid "branch" msgstr "ๅๆฏ" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1748 msgid "create and checkout a new branch" msgstr "ๅๅปบๅนถๆฃๅบไธไธชๆฐ็ๅๆฏ" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1750 msgid "create/reset and checkout a branch" msgstr "ๅๅปบ/้็ฝฎๅนถๆฃๅบไธไธชๅๆฏ" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1751 msgid "create reflog for new branch" msgstr "ไธบๆฐ็ๅๆฏๅๅปบๅผ็จๆฅๅฟ" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1753 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "ไบๆฌก็ๆต 'git checkout <ๆ ๆญคๅๆฏ>'๏ผ้ป่ฎค๏ผ" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1754 msgid "use overlay mode (default)" msgstr "ไฝฟ็จๅ ๅ ๆจกๅผ๏ผ้ป่ฎค๏ผ" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1799 msgid "create and switch to a new branch" msgstr "ๅๅปบๅนถๅๆขไธไธชๆฐๅๆฏ" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1801 msgid "create/reset and switch to a branch" msgstr "ๅๅปบ/้็ฝฎๅนถๅๆขไธไธชๅๆฏ" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1803 msgid "second guess 'git switch <no-such-branch>'" msgstr "ไบๆฌก็ๆต 'git switch <ๆ ๆญคๅๆฏ>'" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1805 msgid "throw away local modifications" msgstr "ไธขๅผๆฌๅฐไฟฎๆน" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1839 msgid "which tree-ish to checkout from" msgstr "่ฆๆฃๅบๅชไธไธชๆ " -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1841 msgid "restore the index" msgstr "ๆขๅค็ดขๅผ" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1843 msgid "restore the working tree (default)" msgstr "ๆขๅคๅทฅไฝๅบ๏ผ้ป่ฎค๏ผ" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1845 msgid "ignore unmerged entries" msgstr "ๅฟฝ็ฅๆชๅๅนถๆก็ฎ" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1846 msgid "use overlay mode" msgstr "ไฝฟ็จๅ ๅ ๆจกๅผ" -#: builtin/clean.c:28 +#: builtin/clean.c:29 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 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "ๆญฃๅ ้ค %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "ๅฐๅ ้ค %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "ๅฟฝ็ฅไปๅบ %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "ๅฐๅฟฝ็ฅไปๅบ %s\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "ๅ ้ค %s ๅคฑ่ดฅ" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "ไธ่ฝๅฏน %s ่ฐ็จ lstat\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10658,7 +12112,7 @@ msgstr "" "foo - ้่ฟๅฏไธๅ็ผ้ๆฉไธไธช้้กน\n" " - ๏ผ็ฉบ๏ผไปไนไนไธ้ๆฉ\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10679,38 +12133,33 @@ msgstr "" "* - ้ๆฉๆๆ้้กน\n" " - ๏ผ็ฉบ๏ผ็ปๆ้ๆฉ\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: 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:662 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "่พๅ ฅๆจก็ไปฅๆ้คๆก็ฎ>> " -#: builtin/clean.c:699 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "่ญฆๅ๏ผๆ ๆณๆพๅฐๅ %s ๅน้ ็ๆก็ฎ" -#: builtin/clean.c:720 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "้ๆฉ่ฆๅ ้ค็ๆก็ฎ" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "ๅ ้ค %s [y/N]๏ผ" -#: builtin/clean.c:786 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "ๅ่งใ\n" - -#: builtin/clean.c:794 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10728,78 +12177,70 @@ msgstr "" "help - ๆพ็คบๆฌๅธฎๅฉ\n" "? - ๆพ็คบๅฆไฝๅจๆ็คบ็ฌฆไธ้ๆฉ็ๅธฎๅฉ" -#: 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 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "ๅฐๅ ้คๅฆไธๆก็ฎ๏ผ" msgstr[1] "ๅฐๅ ้คๅฆไธๆก็ฎ๏ผ" -#: builtin/clean.c:846 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "ๆฒกๆ่ฆๆธ ็็ๆไปถ๏ผ้ๅบใ" -#: builtin/clean.c:908 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "ไธๆๅฐๅ ้คๆไปถ็ๅ็งฐ" -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "force" msgstr "ๅผบๅถ" -#: builtin/clean.c:911 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "ไบคไบๅผๆธ ้ค" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "ๅ ้คๆดไธช็ฎๅฝ" -#: 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/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "ๆจกๅผ" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "ๆทปๅ <ๆจกๅผ> ๅฐๅฟฝ็ฅ่งๅ" -#: builtin/clean.c:916 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "ไนๅ ้คๅฟฝ็ฅ็ๆไปถ" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "ๅชๅ ้คๅฟฝ็ฅ็ๆไปถ" -#: builtin/clean.c:936 -msgid "-x and -X cannot be used together" -msgstr "-x ๅ -X ไธ่ฝๅๆถไฝฟ็จ" - -#: builtin/clean.c:940 +#: builtin/clean.c:929 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:943 +#: builtin/clean.c:932 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:46 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "-x ๅ -X ไธ่ฝๅๆถไฝฟ็จ" + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<้้กน>] [--] <ไปๅบ> [<่ทฏๅพ>]" @@ -10807,7 +12248,7 @@ msgstr "git clone [<้้กน>] [--] <ไปๅบ> [<่ทฏๅพ>]" msgid "don't create a checkout" msgstr "ไธๅๅปบไธไธชๆฃๅบ" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 msgid "create a bare repository" msgstr "ๅๅปบไธไธช็บฏไปๅบ" @@ -10827,11 +12268,11 @@ msgstr "ไธไฝฟ็จๆฌๅฐ็กฌ้พๆฅ๏ผๅง็ปๅคๅถ" msgid "setup as shared repository" msgstr "่ฎพ็ฝฎไธบๅ ฑไบซไปๅบ" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "่ทฏๅพ่งๆ ผ" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "ๅจๅ ้ๆถๅๅงๅๅญๆจก็ป" @@ -10839,26 +12280,26 @@ msgstr "ๅจๅ ้ๆถๅๅงๅๅญๆจก็ป" msgid "number of submodules cloned in parallel" msgstr "ๅนถๅๅ ้็ๅญๆจก็ป็ๆฐ้" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:550 msgid "template-directory" msgstr "ๆจกๆฟ็ฎๅฝ" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:551 msgid "directory from which templates will be used" msgstr "ๆจกๆฟ็ฎๅฝๅฐ่ขซไฝฟ็จ" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "ๅ่ไปๅบ" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 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:3314 builtin/repack.c:319 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 msgid "name" msgstr "ๅ็งฐ" @@ -10874,8 +12315,8 @@ msgstr "ๆฃๅบ <ๅๆฏ> ่ไธๆฏ่ฟ็จ HEAD" msgid "path to git-upload-pack on the remote" msgstr "่ฟ็จ git-upload-pack ่ทฏๅพ" -#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/pull.c:208 msgid "depth" msgstr "ๆทฑๅบฆ" @@ -10883,7 +12324,8 @@ msgstr "ๆทฑๅบฆ" msgid "create a shallow clone of that depth" msgstr "ๅๅปบไธไธชๆๅฎๆทฑๅบฆ็ๆต ๅ ้" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 msgid "time" msgstr "ๆถ้ด" @@ -10891,16 +12333,17 @@ msgstr "ๆถ้ด" msgid "create a shallow clone since a specific time" msgstr "ไปไธไธช็นๅฎๆถ้ดๅๅปบไธไธชๆต ๅ ้" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 msgid "revision" msgstr "็ๆฌ" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "ๆทฑๅๆต ๅ ้็ๅๅฒ๏ผ้คไบ็นๅฎ็ๆฌ" -#: builtin/clone.c:132 +#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "ๅชๅ ้ไธไธชๅๆฏใHEAD ๆ --branch" @@ -10912,11 +12355,11 @@ msgstr "ไธ่ฆๅ ้ไปปไฝๆ ็ญพ๏ผๅนถไธๅ็ปญ่ทๅๆไฝไนไธไธ่ฝฝๅฎไปฌ" msgid "any cloned submodules will be shallow" msgstr "ๅญๆจก็ปๅฐไปฅๆต ไธ่ฝฝๆจกๅผๅ ้" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:559 msgid "gitdir" msgstr "git็ฎๅฝ" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "git็ฎๅฝๅๅทฅไฝๅบๅ็ฆป" @@ -10928,23 +12371,23 @@ msgstr "key=value" msgid "set config inside the new repository" msgstr "ๅจๆฐไปๅบไธญ่ฎพ็ฝฎ้ ็ฝฎไฟกๆฏ" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 msgid "server-specific" msgstr "server-specific" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 msgid "option to transmit" msgstr "ไผ ่พ้้กน" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 msgid "use IPv4 addresses only" msgstr "ๅชไฝฟ็จ IPv4 ๅฐๅ" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 msgid "use IPv6 addresses only" msgstr "ๅชไฝฟ็จ IPv6 ๅฐๅ" @@ -10952,7 +12395,11 @@ msgstr "ๅชไฝฟ็จ IPv6 ๅฐๅ" msgid "any cloned submodules will use their remote-tracking branch" msgstr "ไปปไฝๅ ้็ๅญๆจก็ปๅฐไฝฟ็จๅฎไปฌ็่ฟ็จ่ท่ธชๅๆฏ" -#: builtin/clone.c:285 +#: 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" @@ -10960,47 +12407,42 @@ msgstr "" "ๆ ๆณ็ๅฐ็ฎๅฝๅใ\n" "่ฏทๅจๅฝไปค่กๆๅฎไธไธช็ฎๅฝ" -#: builtin/clone.c:338 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: ไธ่ฝไธบ '%s' ๆทปๅ ไธไธชๅค็จ๏ผ%s\n" -#: builtin/clone.c:411 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s ๅญๅจไธไธๆฏไธไธช็ฎๅฝ" -#: builtin/clone.c:428 +#: builtin/clone.c:431 #, c-format msgid "failed to start iterator over '%s'" msgstr "ๆ ๆณๅจ '%s' ไธๅฏๅจ่ฟญไปฃๅจ" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "ๅ ้ค '%s' ๅคฑ่ดฅ" - -#: builtin/clone.c:458 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "ๅๅปบ้พๆฅ '%s' ๅคฑ่ดฅ" -#: builtin/clone.c:462 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "ๆท่ดๆไปถ่ณ '%s' ๅคฑ่ดฅ" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "ๆ ๆณๅจ '%s' ไธ่ฟญไปฃ" -#: builtin/clone.c:492 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "ๅฎๆใ\n" -#: builtin/clone.c:506 +#: builtin/clone.c:512 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11010,130 +12452,139 @@ msgstr "" "ๆจๅฏไปฅ้่ฟ 'git status' ๆฃๆฅๅชไบๅทฒ่ขซๆฃๅบ๏ผ็ถๅไฝฟ็จๅฝไปค\n" "'git restore --source=HEAD :/' ้่ฏ\n" -#: builtin/clone.c:583 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "ไธ่ฝๅ็ฐ่ฆๅ ้็่ฟ็จๅๆฏ %sใ" -#: builtin/clone.c:702 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "ไธ่ฝๆดๆฐ %s" -#: builtin/clone.c:752 +#: builtin/clone.c:756 +msgid "failed to initialize sparse-checkout" +msgstr "ๆ ๆณๅๅงๅ็จ็ๆฃๅบ" + +#: builtin/clone.c:779 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "่ฟ็จ HEAD ๆๅไธไธชไธๅญๅจ็ๅผ็จ๏ผๆ ๆณๆฃๅบใ\n" -#: builtin/clone.c:783 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "ไธ่ฝๆฃๅบๅทฅไฝๅบ" -#: builtin/clone.c:833 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "ๆ ๆณๅฐๅๆฐๅๅ ฅ้ ็ฝฎๆไปถ" -#: builtin/clone.c:896 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "ๆ ๆณๆง่ก repack ๆฅๆธ ็" -#: builtin/clone.c:898 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "ๆ ๆณๅ ้คไธดๆถ็ alternates ๆไปถ" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:970 builtin/receive-pack.c:2434 msgid "Too many arguments." msgstr "ๅคชๅคๅๆฐใ" -#: builtin/clone.c:942 +#: builtin/clone.c:974 msgid "You must specify a repository to clone." msgstr "ๆจๅฟ ้กปๆๅฎไธไธชไปๅบๆฅๅ ้ใ" -#: builtin/clone.c:955 +#: builtin/clone.c:987 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare ๅ --origin %s ้้กนไธๅ ผๅฎนใ" -#: builtin/clone.c:958 +#: builtin/clone.c:990 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare ๅ --separate-git-dir ้้กนไธๅ ผๅฎนใ" -#: builtin/clone.c:971 +#: builtin/clone.c:1006 #, c-format msgid "repository '%s' does not exist" msgstr "ไปๅบ '%s' ไธๅญๅจ" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:1010 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "ๆทฑๅบฆ %s ไธๆฏไธไธชๆญฃๆฐ" -#: builtin/clone.c:987 +#: builtin/clone.c:1020 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "็ฎๆ ่ทฏๅพ '%s' ๅทฒ็ปๅญๅจ๏ผๅนถไธไธๆฏไธไธช็ฉบ็ฎๅฝใ" -#: builtin/clone.c:997 +#: builtin/clone.c:1026 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "ไปๅบ่ทฏๅพ '%s' ๅทฒ็ปๅญๅจ๏ผๅนถไธไธๆฏไธไธช็ฉบ็ฎๅฝใ" + +#: builtin/clone.c:1040 #, c-format msgid "working tree '%s' already exists." msgstr "ๅทฅไฝๅบ '%s' ๅทฒ็ปๅญๅจใ" -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "ไธ่ฝไธบ '%s' ๅๅปบๅ ๅฏผ็ฎๅฝ" -#: builtin/clone.c:1017 +#: builtin/clone.c:1060 #, c-format msgid "could not create work tree dir '%s'" msgstr "ไธ่ฝๅๅปบๅทฅไฝๅบ็ฎๅฝ '%s'" -#: builtin/clone.c:1037 +#: builtin/clone.c:1080 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "ๅ ้ๅฐ็บฏไปๅบ '%s'...\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1082 #, c-format msgid "Cloning into '%s'...\n" msgstr "ๆญฃๅ ้ๅฐ '%s'...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1106 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive ๅ --reference ไปฅๅ --reference-if-able ไธๅ ผๅฎน" -#: builtin/clone.c:1124 +#: builtin/clone.c:1170 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ๅจๆฌๅฐๅ ้ๆถ่ขซๅฟฝ็ฅ๏ผ่ฏทๆน็จ file:// ๅ่ฎฎใ" -#: builtin/clone.c:1126 +#: builtin/clone.c:1172 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since ๅจๆฌๅฐๅ ้ๆถ่ขซๅฟฝ็ฅ๏ผ่ฏทๆน็จ file:// ๅ่ฎฎใ" -#: builtin/clone.c:1128 +#: builtin/clone.c:1174 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude ๅจๆฌๅฐๅ ้ๆถ่ขซๅฟฝ็ฅ๏ผ่ฏทๆน็จ file:// ๅ่ฎฎใ" -#: builtin/clone.c:1130 +#: builtin/clone.c:1176 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ๅจๆฌๅฐๅ ้ๆถ่ขซๅฟฝ็ฅ๏ผ่ฏทๆน็จ file:// ๅ่ฎฎใ" -#: builtin/clone.c:1133 +#: builtin/clone.c:1179 msgid "source repository is shallow, ignoring --local" msgstr "ๆบไปๅบๆฏๆต ๅ ้๏ผๅฟฝ็ฅ --local" -#: builtin/clone.c:1138 +#: builtin/clone.c:1184 msgid "--local is ignored" msgstr "--local ่ขซๅฟฝ็ฅ" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1268 builtin/clone.c:1276 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "่ฟ็จๅๆฏ %s ๅจไธๆธธ %s ๆชๅ็ฐ" -#: builtin/clone.c:1226 +#: builtin/clone.c:1279 msgid "You appear to have cloned an empty repository." msgstr "ๆจไผผไนๅ ้ไบไธไธช็ฉบไปๅบใ" @@ -11169,6 +12620,110 @@ msgstr "ไธคๅไน้ด็ๅกซๅ ็ฉบ้ด" msgid "--command must be the first argument" msgstr "--command ๅฟ ้กปๆฏ็ฌฌไธไธชๅๆฐ" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +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:14 builtin/commit-graph.c:27 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" +"git commit-graph write [--object-dir <ๅฏน่ฑก็ฎๅฝ>] [--append] [--split[=<็ญ็ฅ" +">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--" +"[no-]max-new-filters <n>] [--[no-]progress] <ๅๅ้้กน>" + +#: builtin/commit-graph.c:64 +#, c-format +msgid "could not find object directory matching %s" +msgstr "ๆ ๆณๆพๅฐๅ %s ๅน้ ็ๅฏน่ฑก็ฎๅฝ" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "็ฎๅฝ" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "ไฟๅญๅพๅฝข็ๅฏน่ฑก็ฎๅฝ" + +#: builtin/commit-graph.c:83 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "ๅฆๆๆไบคๅพๅฝข่ขซๆๅ๏ผๅช้ช่ฏๅคดไธไธชๆไปถ" + +#: builtin/commit-graph.c:106 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "ๆ ๆณๆๅผๆไบคๅพๅฝข '%s'" + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "ๆช่ฝ่ฏๅซ็ --split ๅๆฐ๏ผ%s" + +#: builtin/commit-graph.c:155 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "ๆๅค็้ๅๅ ญ่ฟๅถๅฏน่ฑก ID๏ผ%s" + +#: builtin/commit-graph.c:160 +#, c-format +msgid "invalid object: %s" +msgstr "ๆ ๆๅฏน่ฑก๏ผ%s" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "ๅผๅง้ๅๆๆๅผ็จ" + +#: builtin/commit-graph.c:215 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "ไปๆ ๅ่พๅ ฅไธญ็ๅ ็ดขๅผๆไปถๅ่กจไธญๆซๆๆไบค" + +#: builtin/commit-graph.c:217 +msgid "start walk at commits listed by stdin" +msgstr "ไปๆ ๅ่พๅ ฅไธญ็ๆไบคๅผๅงๆซๆ" + +#: builtin/commit-graph.c:219 +msgid "include all commits already in the commit-graph file" +msgstr "ๅ ๅซ commit-graph ๆไปถไธญๅทฒๆๆๆๆไบค" + +#: builtin/commit-graph.c:221 +msgid "enable computation for changed paths" +msgstr "ๅฏ็จๅๆด่ทฏๅพ็่ฎก็ฎ" + +#: builtin/commit-graph.c:224 +msgid "allow writing an incremental commit-graph file" +msgstr "ๅ ่ฎธๅไธไธชๅข้ๆไบคๅพๅฝขๆไปถ" + +#: builtin/commit-graph.c:228 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "ๅจ้ๅบๆฌๆๅๆไบคๅพๅฝขไธญ็ๆๅคงๆไบคๆฐ" + +#: builtin/commit-graph.c:230 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "ไธไธชๆๅๆไบคๅพๅฝข็ไธคไธช็บงๅซไน้ด็ๆๅคงๆฏ็" + +#: builtin/commit-graph.c:232 +msgid "only expire files older than a given date-time" +msgstr "ๅช่ฎฉๆฉไบ็ปๅฎๆถ้ด็ๆไปถ่ฟๆ" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "่ฆ่ฎก็ฎ็ๅๆด่ทฏๅพๅธ้่ฟๆปคๅจ็ๆๅคงๆฐ" + +#: builtin/commit-graph.c:255 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "ไธ่ฝๅๆถไฝฟ็จ --reachableใ--stdin-commits ๆ --stdin-packs" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "ๆญฃไปๆ ๅ่พๅ ฅๆถ้ๆไบค" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -11182,7 +12737,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "ๅฟฝ็ฅ้ๅค็็ถๆไบค %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 #, c-format msgid "not a valid object name %s" msgstr "ไธๆฏไธไธชๆๆ็ๅฏน่ฑกๅ %s" @@ -11210,13 +12765,13 @@ msgstr "็ถๆไบค" msgid "id of a parent commit object" msgstr "็ถๆไบคๅฏน่ฑก ID" -#: 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 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 msgid "message" msgstr "่ฏดๆ" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "ๆไบค่ฏดๆ" @@ -11224,8 +12779,8 @@ msgstr "ๆไบค่ฏดๆ" msgid "read commit log message from file" msgstr "ไปๆไปถไธญ่ฏปๅๆไบค่ฏดๆ" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG ๆไบค็ญพๅ" @@ -11269,10 +12824,14 @@ msgstr "" "\n" #: builtin/commit.c:63 +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "ๅฆๅ๏ผ่ฏทไฝฟ็จ 'git rebase --skip'\n" + +#: builtin/commit.c:66 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "ๅฆๅ๏ผ่ฏทไฝฟ็จ 'git cherry-pick --skip'\n" -#: builtin/commit.c:66 +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -11293,126 +12852,136 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "่งฃๅ HEAD ๆ ๅฏน่ฑกๅคฑ่ดฅ" -#: builtin/commit.c:356 +#: builtin/commit.c:348 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "--pathspec-from-file ๅ -a ๅจไธ่ตทๆฒกๆๆไน" + +#: builtin/commit.c:361 +msgid "No paths with --include/--only does not make sense." +msgstr "ๅๆฐ --include/--only ไธ่ท่ทฏๅพๆฒกๆๆไนใ" + +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "ไธ่ฝๅๅปบไธดๆถ็ดขๅผ" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "ไบคไบๅผๆทปๅ ๅคฑ่ดฅ" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "ๆ ๆณๆดๆฐไธดๆถ็ดขๅผ" -#: builtin/commit.c:378 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "ไธ่ฝๆดๆฐๆ ็ไธป็ผๅญ" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "ๆ ๆณๅ new_index ๆไปถ" -#: builtin/commit.c:455 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "ๅจๅๅนถ่ฟ็จไธญไธ่ฝๅ้จๅๆไบคใ" -#: builtin/commit.c:457 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "ๅจๆฃ้่ฟ็จไธญไธ่ฝๅ้จๅๆไบคใ" -#: builtin/commit.c:465 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "ๅจๅๅบ่ฟ็จไธญไธ่ฝๅ้จๅๆไบคใ" + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "ๆ ๆณ่ฏปๅ็ดขๅผ" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "ๆ ๆณๅไธดๆถ็ดขๅผๆไปถ" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "ๆไบค '%s' ็ผบๅฐไฝ่ ไฟกๆฏ" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "ๆไบค '%s' ๆๆ ผๅผ้่ฏฏ็ไฝ่ ไฟกๆฏ" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "ๆ ผๅผ้่ฏฏ็ --author ๅๆฐ" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "ๆ ๆณ้ๆฉไธไธชๆช่ขซๅฝๅๆไบค่ฏดๆไฝฟ็จ็ๆณจ้ๅญ็ฌฆ" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "ไธ่ฝๆฅ่ฏขๆไบค %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:478 #, c-format msgid "(reading log message from standard input)\n" msgstr "๏ผๆญฃไปๆ ๅ่พๅ ฅไธญ่ฏปๅๆฅๅฟไฟกๆฏ๏ผ\n" -#: builtin/commit.c:708 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "ไธ่ฝไปๆ ๅ่พๅ ฅไธญ่ฏปๅๆฅๅฟไฟกๆฏ" -#: builtin/commit.c:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "ไธ่ฝ่ฏปๅๆฅๅฟๆไปถ '%s'" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "ไธ่ฝ่ฏปๅ SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "ไธ่ฝ่ฏปๅ MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "ไธ่ฝๅๆไบคๆจก็" -#: builtin/commit.c:829 -#, c-format +#: builtin/commit.c:853 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" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" -"ไผผไนๆจๆญฃๅจๅไธไธชๅๅนถๆไบคใๅฆๆไธๅฏน๏ผ่ฏทๅ ้คๆไปถ\n" -"\t%s\n" +"ไผผไนๆจๆญฃๅจๅไธไธชๅๅนถๆไบคใๅฆๆไธๅฏน๏ผ่ฏท่ฟ่ก\n" +"\tgit update-ref -d MERGE_HEAD\n" "็ถๅ้่ฏใ\n" -#: builtin/commit.c:834 -#, c-format +#: builtin/commit.c:858 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" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" -"ไผผไนๆจๆญฃๅจๅไธไธชๆฃ้ๆไบคใๅฆๆไธๅฏน๏ผ่ฏทๅ ้คๆไปถ\n" -"\t%s\n" +"ไผผไนๆจๆญฃๅจๅไธไธชๆฃ้ๆไบคใๅฆๆไธๅฏน๏ผ่ฏท่ฟ่ก\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "็ถๅ้่ฏใ\n" -#: builtin/commit.c:847 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11421,7 +12990,7 @@ msgstr "" "่ฏทไธบๆจ็ๅๆด่พๅ ฅๆไบค่ฏดๆใไปฅ '%c' ๅผๅง็่กๅฐ่ขซๅฟฝ็ฅ๏ผ่ไธไธช็ฉบ็ๆไบค\n" "่ฏดๆๅฐไผ็ปๆญขๆไบคใ\n" -#: builtin/commit.c:855 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11432,324 +13001,324 @@ msgstr "" "ไนๅฏไปฅๅ ้คๅฎไปฌใไธไธช็ฉบ็ๆไบค่ฏดๆๅฐไผ็ปๆญขๆไบคใ\n" # ่ฏ่ ๏ผไธบไฟ่ฏๅจ่พๅบไธญๅฏน้ฝ๏ผๆณจๆ่ฐๆดๅฅไธญ็ฉบๆ ผ๏ผ -#: builtin/commit.c:872 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sไฝ่ ๏ผ %.*s <%.*s>" # ่ฏ่ ๏ผไธบไฟ่ฏๅจ่พๅบไธญๅฏน้ฝ๏ผๆณจๆ่ฐๆดๅฅไธญ็ฉบๆ ผ๏ผ -#: builtin/commit.c:880 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sๆฅๆ๏ผ %s" # ่ฏ่ ๏ผไธบไฟ่ฏๅจ่พๅบไธญๅฏน้ฝ๏ผๆณจๆ่ฐๆดๅฅไธญ็ฉบๆ ผ๏ผ -#: builtin/commit.c:887 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sๆไบค่ ๏ผ%.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "ๆ ๆณ่ฏปๅ็ดขๅผ" -#: builtin/commit.c:972 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "ๆ ๆณๅๅปบๆ ๅฏน่ฑก" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "่ฏทไฝฟ็จ -m ๆ -F ้้กนๆไพๆไบค่ฏดๆใ\n" -#: builtin/commit.c:1030 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' ไธๆฏ 'ๅงๅ <้ฎ็ฎฑ>' ๆ ผๅผ๏ผไธๆช่ฝๅจ็ฐๆไฝ่ ไธญๆพๅฐๅน้ " -#: builtin/commit.c:1044 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "ๆ ๆ็ๅฟฝ็ฅๆจกๅผ '%s'" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "ๆ ๆ็ๆช่ฟฝ่ธชๆไปถๅๆฐ '%s'" -#: builtin/commit.c:1102 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long ๅ -z ้้กนไธๅ ผๅฎน" -#: builtin/commit.c:1146 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "ๅๆถไฝฟ็จ --reset-author ๅ --author ๆฒกๆๆไน" -#: builtin/commit.c:1155 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "ๆจๆฒกๆๅฏไฟฎ่กฅ็ๆไบคใ" -#: builtin/commit.c:1158 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "ๆจๆญฃๅคไบไธไธชๅๅนถ่ฟ็จไธญ -- ๆ ๆณไฟฎ่กฅๆไบคใ" -#: builtin/commit.c:1160 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "ๆจๆญฃๅคไบไธไธชๆฃ้่ฟ็จไธญ -- ๆ ๆณไฟฎ่กฅๆไบคใ" -#: builtin/commit.c:1163 +#: builtin/commit.c:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "ๆจๆญฃๅคไบไธไธชๅๅบ่ฟ็จไธญ -- ๆ ๆณไฟฎ่กฅๆไบคใ" + +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "้้กน --squash ๅ --fixup ไธ่ฝๅๆถไฝฟ็จ" -#: builtin/commit.c:1173 +#: builtin/commit.c:1200 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "ๅช่ฝ็จไธไธช -c/-C/-F/--fixup ้้กนใ" -#: builtin/commit.c:1175 +#: builtin/commit.c:1202 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "้้กน -m ไธ่ฝๅ -c/-C/-F ๅๆถไฝฟ็จใ" -#: builtin/commit.c:1183 +#: builtin/commit.c:1211 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ๅช่ฝๅ -Cใ-c ๆ --amend ๅๆถไฝฟ็จใ" -#: builtin/commit.c:1200 +#: builtin/commit.c:1229 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "ๅช่ฝ็จไธไธช --include/--only/--all/--interactive/--patch ้้กนใ" -#: builtin/commit.c:1202 -msgid "No paths with --include/--only does not make sense." -msgstr "ๅๆฐ --include/--only ไธ่ท่ทฏๅพๆฒกๆๆไนใ" - -#: builtin/commit.c:1208 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "่ทฏๅพ '%s ...' ๅ -a ้้กนๅๆถไฝฟ็จๆฒกๆๆไน" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "ไปฅ็ฎๆด็ๆ ผๅผๆพ็คบ็ถๆ" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "ๆพ็คบๅๆฏไฟกๆฏ" -#: builtin/commit.c:1343 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "ๆพ็คบ่ดฎ่ๅบไฟกๆฏ" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "่ฎก็ฎๅฎๆด็้ขๅ /่ฝๅๅผ" -#: builtin/commit.c:1347 +#: builtin/commit.c:1374 msgid "version" msgstr "็ๆฌ" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "ๆบๅจๅฏ่ฏป็่พๅบ" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "ไปฅ้ฟๆ ผๅผๆพ็คบ็ถๆ๏ผ้ป่ฎค๏ผ" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "ๆก็ฎไปฅ NUL ๅญ็ฌฆ็ปๅฐพ" -#: 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 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 msgid "mode" msgstr "ๆจกๅผ" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1383 builtin/commit.c:1541 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "ๆพ็คบๆช่ท่ธช็ๆไปถ๏ผโๆจกๅผโ็ๅฏ้ๅๆฐ๏ผallใnormalใnoใ๏ผ้ป่ฎค๏ผall๏ผ" -#: builtin/commit.c:1360 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "ๆพ็คบๅทฒๅฟฝ็ฅ็ๆไปถ๏ผๅฏ้ๆจกๅผ๏ผtraditionalใmatchingใnoใ๏ผ้ป่ฎค๏ผtraditional๏ผ" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "ไฝๆถ" -#: builtin/commit.c:1363 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "ๅฟฝ็ฅๅญๆจก็ป็ๆดๆน๏ผโไฝๆถโ็ๅฏ้ๅๆฐ๏ผallใdirtyใuntrackedใ๏ผ้ป่ฎค๏ผall๏ผ" -#: builtin/commit.c:1365 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "ไปฅๅ็ๆนๅผๆพ็คบๆช่ท่ธช็ๆไปถ" -#: builtin/commit.c:1366 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "ไธๆฃๆต้ๅฝๅ" -#: builtin/commit.c:1368 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "ๆฃๆต้ๅฝๅ๏ผๅฏไปฅ่ฎพ็ฝฎ็ดขๅผ็ธไผผๅบฆ" -#: builtin/commit.c:1388 +#: builtin/commit.c:1415 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "ไธๆฏๆๅทฒๅฟฝ็ฅๅๆช่ท่ธชๆไปถๅๆฐ็็ปๅ" -#: builtin/commit.c:1493 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "ๆไบคๆๅๅไธๆพ็คบๆฆ่ฟฐไฟกๆฏ" -#: builtin/commit.c:1494 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "ๅจๆไบค่ฏดๆๆจกๆฟ้ๆพ็คบๅทฎๅผ" -#: builtin/commit.c:1496 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "ๆไบค่ฏดๆ้้กน" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 msgid "read message from file" msgstr "ไปๆไปถไธญ่ฏปๅๆไบค่ฏดๆ" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "author" msgstr "ไฝ่ " -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "ๆไบคๆถ่ฆ็ไฝ่ " -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:539 msgid "date" msgstr "ๆฅๆ" -#: builtin/commit.c:1499 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "ๆไบคๆถ่ฆ็ๆฅๆ" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "ๆไบค" -#: builtin/commit.c:1501 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "้็จๅนถ็ผ่พๆๅฎๆไบค็ๆไบค่ฏดๆ" -#: builtin/commit.c:1502 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "้็จๆๅฎๆไบค็ๆไบค่ฏดๆ" -#: builtin/commit.c:1503 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "ไฝฟ็จ autosquash ๆ ผๅผ็ๆไบค่ฏดๆ็จไปฅไฟฎๆญฃๆๅฎ็ๆไบค" -#: builtin/commit.c:1504 +#: builtin/commit.c:1508 msgid "use autosquash formatted message to squash specified commit" msgstr "ไฝฟ็จ autosquash ๆ ผๅผ็ๆไบค่ฏดๆ็จไปฅๅ็ผฉ่ณๆๅฎ็ๆไบค" -#: builtin/commit.c:1505 +#: builtin/commit.c:1509 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "็ฐๅจๅฐ่ฏฅๆไบค็ไฝ่ ๆนไธบๆ๏ผๅ -C/-c/--amend ๅๆฐๅ ฑ็จ๏ผ" -#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "ๆทปๅ Signed-off-by: ็ญพๅ" -#: builtin/commit.c:1507 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "ไฝฟ็จๆๅฎ็ๆจกๆฟๆไปถ" -#: builtin/commit.c:1508 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "ๅผบๅถ็ผ่พๆไบค" -#: builtin/commit.c:1510 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "ๅจๆไบค่ฏดๆๆจกๆฟ้ๅ ๅซ็ถๆไฟกๆฏ" -#: builtin/commit.c:1515 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "ๆไบคๅ ๅฎน้้กน" -#: builtin/commit.c:1516 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "ๆไบคๆๆๆนๅจ็ๆไปถ" -#: builtin/commit.c:1517 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "ๆทปๅ ๆๅฎ็ๆไปถๅฐ็ดขๅผๅบ็ญๅพ ๆไบค" -#: builtin/commit.c:1518 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "ไบคไบๅผๆทปๅ ๆไปถ" -#: builtin/commit.c:1519 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "ไบคไบๅผๆทปๅ ๅๆด" -#: builtin/commit.c:1520 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "ๅชๆไบคๆๅฎ็ๆไปถ" -#: builtin/commit.c:1521 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "็ป่ฟ pre-commit ๅ commit-msg ้ฉๅญ" -#: builtin/commit.c:1522 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "ๆพ็คบๅฐ่ฆๆไบค็ๅ ๅฎน" -#: builtin/commit.c:1535 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "ไฟฎๆนๅ ๅ็ๆไบค" -#: builtin/commit.c:1536 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "็ป่ฟ post-rewrite ้ฉๅญ" -#: builtin/commit.c:1541 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "ๅ ่ฎธไธไธช็ฉบๆไบค" -#: builtin/commit.c:1543 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "ๅ ่ฎธ็ฉบ็ๆไบค่ฏดๆ" -#: builtin/commit.c:1616 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "ๆๅ็ MERGE_HEAD ๆไปถ๏ผ%s๏ผ" -#: builtin/commit.c:1623 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "ไธ่ฝ่ฏปๅ MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "ไธ่ฝ่ฏปๅๆไบค่ฏดๆ๏ผ%s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "็ปๆญขๆไบคๅ ไธบๆไบค่ฏดๆไธบ็ฉบใ\n" -#: builtin/commit.c:1654 +#: builtin/commit.c:1662 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "็ปๆญขๆไบค๏ผๆจๆชๆดๆนๆฅ่ชๆจก็็ๆไบค่ฏดๆใ\n" -#: builtin/commit.c:1688 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -11758,279 +13327,217 @@ msgstr "" "ไปๅบๅทฒๆดๆฐ๏ผไฝๆ ๆณๅ new_index ๆไปถใๆฃๆฅๆฏๅฆ็ฃ็ๅทฒๆปกๆ\n" "็ฃ็้ ้ขๅทฒ่ๅฐฝ๏ผ็ถๅๆง่ก \"git restore --staged :/\" ๆขๅคใ" -#: 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: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] <split options>" -msgstr "git commit-graph write [--object-dir <ๅฏน่ฑก็ฎๅฝ>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>" - -#: 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: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:57 -msgid "if the commit-graph is split, only verify the tip file" -msgstr "ๅฆๆๆไบคๅพๅฝข่ขซๆๅ๏ผๅช้ช่ฏๅคดไธไธชๆไปถ" - -#: 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:164 -msgid "start walk at all refs" -msgstr "ๅผๅง้ๅๆๆๅผ็จ" - -#: builtin/commit-graph.c:166 -msgid "scan pack-indexes listed by stdin for commits" -msgstr "ไปๆ ๅ่พๅ ฅไธญ็ๅ ็ดขๅผๆไปถๅ่กจไธญๆซๆๆไบค" - -#: builtin/commit-graph.c:168 -msgid "start walk at commits listed by stdin" -msgstr "ไปๆ ๅ่พๅ ฅไธญ็ๆไบคๅผๅงๆซๆ" - -#: builtin/commit-graph.c:170 -msgid "include all commits already in the commit-graph file" -msgstr "ๅ ๅซ commit-graph ๆไปถไธญๅทฒๆๆๆๆไบค" - -#: builtin/commit-graph.c:172 -msgid "allow writing an incremental commit-graph file" -msgstr "ๅ ่ฎธๅไธไธชๅข้ๆไบคๅพๅฝขๆไปถ" - -#: 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:176 -msgid "maximum ratio between two levels of a split commit-graph" -msgstr "ไธไธชๆๅๆไบคๅพๅฝข็ไธคไธช็บงๅซไน้ด็ๆๅคงๆฏ็" - -#: builtin/commit-graph.c:191 -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:103 builtin/env--helper.c:23 +#: builtin/config.c:107 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "ๆช่ฝ่ฏๅซ็ --type ๅๆฐ๏ผ%s" -#: builtin/config.c:115 +#: builtin/config.c:119 msgid "only one type at a time" msgstr "ไธๆฌกๅช่ฝไธไธช็ฑปๅ" -#: builtin/config.c:124 +#: builtin/config.c:128 msgid "Config file location" msgstr "้ ็ฝฎๆไปถไฝ็ฝฎ" -#: builtin/config.c:125 +#: builtin/config.c:129 msgid "use global config file" msgstr "ไฝฟ็จๅ จๅฑ้ ็ฝฎๆไปถ" -#: builtin/config.c:126 +#: builtin/config.c:130 msgid "use system config file" msgstr "ไฝฟ็จ็ณป็ป็บง้ ็ฝฎๆไปถ" -#: builtin/config.c:127 +#: builtin/config.c:131 msgid "use repository config file" msgstr "ไฝฟ็จไปๅบ็บง้ ็ฝฎๆไปถ" -#: builtin/config.c:128 +#: builtin/config.c:132 msgid "use per-worktree config file" msgstr "ไฝฟ็จๅทฅไฝๅบ็บงๅซ็้ ็ฝฎๆไปถ" -#: builtin/config.c:129 +#: builtin/config.c:133 msgid "use given config file" msgstr "ไฝฟ็จๆๅฎ็้ ็ฝฎๆไปถ" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "blob-id" msgstr "ๆฐๆฎๅฏน่ฑก ID" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "read config from given blob object" msgstr "ไป็ปๅฎ็ๆฐๆฎๅฏน่ฑก่ฏปๅ้ ็ฝฎ" -#: builtin/config.c:131 +#: builtin/config.c:135 msgid "Action" msgstr "ๆไฝ" -#: builtin/config.c:132 +#: builtin/config.c:136 msgid "get value: name [value-regex]" msgstr "่ทๅๅผ๏ผname [value-regex]" -#: builtin/config.c:133 +#: builtin/config.c:137 msgid "get all values: key [value-regex]" msgstr "่ทๅพๆๆ็ๅผ๏ผkey [value-regex]" -#: builtin/config.c:134 +#: builtin/config.c:138 msgid "get values for regexp: name-regex [value-regex]" msgstr "ๆ นๆฎๆญฃๅ่กจ่พพๅผ่ทๅพๅผ๏ผname-regex [value-regex]" -#: builtin/config.c:135 +#: builtin/config.c:139 msgid "get value specific for the URL: section[.var] URL" msgstr "่ทๅพ URL ๅๅผ๏ผsection[.var] URL" -#: builtin/config.c:136 +#: builtin/config.c:140 msgid "replace all matching variables: name value [value_regex]" msgstr "ๆฟๆขๆๆๅน้ ็ๅ้๏ผname value [value_regex]" -#: builtin/config.c:137 +#: builtin/config.c:141 msgid "add a new variable: name value" msgstr "ๆทปๅ ไธไธชๆฐ็ๅ้๏ผname value" -#: builtin/config.c:138 +#: builtin/config.c:142 msgid "remove a variable: name [value-regex]" msgstr "ๅ ้คไธไธชๅ้๏ผname [value-regex]" -#: builtin/config.c:139 +#: builtin/config.c:143 msgid "remove all matches: name [value-regex]" msgstr "ๅ ้คๆๆๅน้ ้กน๏ผname [value-regex]" -#: builtin/config.c:140 +#: builtin/config.c:144 msgid "rename section: old-name new-name" msgstr "้ๅฝๅๅฐ่๏ผold-name new-name" -#: builtin/config.c:141 +#: builtin/config.c:145 msgid "remove a section: name" msgstr "ๅ ้คไธไธชๅฐ่๏ผname" -#: builtin/config.c:142 +#: builtin/config.c:146 msgid "list all" msgstr "ๅๅบๆๆ" -#: builtin/config.c:143 +#: builtin/config.c:147 msgid "open an editor" msgstr "ๆๅผไธไธช็ผ่พๅจ" -#: builtin/config.c:144 +#: builtin/config.c:148 msgid "find the color configured: slot [default]" msgstr "่ทๅพ้ ็ฝฎ็้ข่ฒ๏ผ้ ็ฝฎ [้ป่ฎค]" -#: builtin/config.c:145 +#: builtin/config.c:149 msgid "find the color setting: slot [stdout-is-tty]" msgstr "่ทๅพ้ข่ฒ่ฎพ็ฝฎ๏ผ้ ็ฝฎ [stdout-is-tty]" -#: builtin/config.c:146 +#: builtin/config.c:150 msgid "Type" msgstr "็ฑปๅ" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:151 builtin/env--helper.c:43 msgid "value is given this type" msgstr "ๅๅผไธบ่ฏฅ็ฑปๅ" -#: builtin/config.c:148 +#: builtin/config.c:152 msgid "value is \"true\" or \"false\"" msgstr "ๅผๆฏ \"true\" ๆ \"false\"" -#: builtin/config.c:149 +#: builtin/config.c:153 msgid "value is decimal number" msgstr "ๅผๆฏๅ่ฟๅถๆฐ" -#: builtin/config.c:150 +#: builtin/config.c:154 msgid "value is --bool or --int" -msgstr "ๅผๆฏ --bool or --int" +msgstr "ๅผๆฏ --bool ๆ --int" + +#: builtin/config.c:155 +msgid "value is --bool or string" +msgstr "ๅผๆฏ --bool ๆๅญ็ฌฆไธฒ" -#: builtin/config.c:151 +#: builtin/config.c:156 msgid "value is a path (file or directory name)" msgstr "ๅผๆฏไธไธช่ทฏๅพ๏ผๆไปถๆ็ฎๅฝๅ๏ผ" -#: builtin/config.c:152 +#: builtin/config.c:157 msgid "value is an expiry date" msgstr "ๅผๆฏไธไธชๅฐๆๆฅๆ" -#: builtin/config.c:153 +#: builtin/config.c:158 msgid "Other" msgstr "ๅ ถๅฎ" -#: builtin/config.c:154 +#: builtin/config.c:159 msgid "terminate values with NUL byte" msgstr "็ปๆญขๅผๆฏ NUL ๅญ่" -#: builtin/config.c:155 +#: builtin/config.c:160 msgid "show variable names only" msgstr "ๅชๆพ็คบๅ้ๅ" -#: builtin/config.c:156 +#: builtin/config.c:161 msgid "respect include directives on lookup" msgstr "ๆฅ่ฏขๆถๅ็ ง include ๆไปค้ๅฝๆฅๆพ" -#: builtin/config.c:157 +#: builtin/config.c:162 msgid "show origin of config (file, standard input, blob, command line)" msgstr "ๆพ็คบ้ ็ฝฎ็ๆฅๆบ๏ผๆไปถใๆ ๅ่พๅ ฅใๆฐๆฎๅฏน่ฑก๏ผๆๅฝไปค่ก๏ผ" -#: builtin/config.c:158 builtin/env--helper.c:40 +#: builtin/config.c:163 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "ๆพ็คบ้ ็ฝฎ็ไฝ็จๅ๏ผๅทฅไฝๅบใๆฌๅฐใๅ จๅฑใ็ณป็ปใๅฝไปค๏ผ" + +#: builtin/config.c:164 builtin/env--helper.c:45 msgid "value" msgstr "ๅๅผ" -#: builtin/config.c:158 +#: builtin/config.c:164 msgid "with --get, use default value when missing entry" msgstr "ไฝฟ็จ --get ๅๆฐ๏ผๅฝ็ผบๅฐ่ฎพ็ฝฎๆถไฝฟ็จ้ป่ฎคๅผ" -#: builtin/config.c:172 +#: builtin/config.c:178 #, c-format msgid "wrong number of arguments, should be %d" msgstr "้่ฏฏ็ๅๆฐไธชๆฐ๏ผๅบ่ฏฅไธบ %d ไธช" -#: builtin/config.c:174 +#: builtin/config.c:180 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "้่ฏฏ็ๅๆฐไธชๆฐ๏ผๅบ่ฏฅไธบไป %d ไธชๅฐ %d ไธช" -#: builtin/config.c:308 +#: builtin/config.c:334 #, c-format msgid "invalid key pattern: %s" msgstr "ๆ ๆ้ฎๅๆจกๅผ๏ผ%s" -#: builtin/config.c:344 +#: builtin/config.c:370 #, c-format msgid "failed to format default config value: %s" msgstr "ๆ ผๅผๅ้ป่ฎค้ ็ฝฎๅผๅคฑ่ดฅ๏ผ%s" -#: builtin/config.c:401 +#: builtin/config.c:434 #, c-format msgid "cannot parse color '%s'" msgstr "ๆ ๆณ่งฃๆ้ข่ฒ '%s'" -#: builtin/config.c:443 +#: builtin/config.c:476 msgid "unable to parse default color value" msgstr "ๆ ๆณ่งฃๆ้ป่ฎค้ข่ฒๅผ" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:529 builtin/config.c:789 msgid "not in a git directory" msgstr "ไธๅจ git ไปๅบไธญ" -#: builtin/config.c:499 +#: builtin/config.c:532 msgid "writing to stdin is not supported" msgstr "ไธๆฏๆๅๅฐๆ ๅ่พๅ ฅ" -#: builtin/config.c:502 +#: builtin/config.c:535 msgid "writing config blobs is not supported" msgstr "ไธๆฏๆๅๅฐ้ ็ฝฎๆฐๆฎๅฏน่ฑก" -#: builtin/config.c:587 +#: builtin/config.c:620 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12045,23 +13552,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:644 msgid "only one config file at a time" msgstr "ไธๆฌกๅช่ฝๆไธไธช้ ็ฝฎๆไปถ" -#: builtin/config.c:616 +#: builtin/config.c:650 msgid "--local can only be used inside a git repository" -msgstr "--local ๅช่ฝๅจไธไธชไปๅบๅ ไฝฟ็จ" +msgstr "--local ๅช่ฝๅจ git ไปๅบๅ ไฝฟ็จ" -#: builtin/config.c:619 +#: builtin/config.c:652 msgid "--blob can only be used inside a git repository" -msgstr "--blob ๅช่ฝๅจไธไธชไปๅบๅ ไฝฟ็จ" +msgstr "--blob ๅช่ฝๅจ git ไปๅบๅ ไฝฟ็จ" -#: builtin/config.c:638 +#: builtin/config.c:654 +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree ๅช่ฝๅจ git ไปๅบๅ ไฝฟ็จ" + +#: builtin/config.c:676 msgid "$HOME not set" msgstr "$HOME ๆช่ฎพ็ฝฎ" -#: builtin/config.c:658 +#: builtin/config.c:700 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -12070,51 +13581,51 @@ msgstr "" "ไธ่ฝๅๅคไธชๅทฅไฝๅบไธ่ตทไฝฟ็จ --worktree๏ผ้ค้ๅฏ็จ worktreeConfig ้ ็ฝฎๆฉๅฑใ\n" "่ฏฆๆ ่ฏท้ ่ฏปโgit help worktreeโ็โCONFIGURATION FILEโๅฐ่" -#: builtin/config.c:688 +#: builtin/config.c:735 msgid "--get-color and variable type are incoherent" msgstr "--get-color ๅๅ้็ฑปๅไธๅ ผๅฎน" -#: builtin/config.c:693 +#: builtin/config.c:740 msgid "only one action at a time" msgstr "ไธๆฌกๅช่ฝๆไธไธชๅจไฝ" -#: builtin/config.c:706 +#: builtin/config.c:753 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only ไป ้็จไบ --list ๆ --get-regexp" -#: builtin/config.c:712 +#: builtin/config.c:759 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:718 +#: builtin/config.c:765 msgid "--default is only applicable to --get" msgstr "--default ไป ้็จไบ --get" -#: builtin/config.c:731 +#: builtin/config.c:778 #, c-format msgid "unable to read config file '%s'" msgstr "ๆ ๆณ่ฏปๅ้ ็ฝฎๆไปถ '%s'" -#: builtin/config.c:734 +#: builtin/config.c:781 msgid "error processing config file(s)" msgstr "ๅค็้ ็ฝฎๆไปถๅบ้" -#: builtin/config.c:744 +#: builtin/config.c:791 msgid "editing stdin is not supported" msgstr "ไธๆฏๆ็ผ่พๆ ๅ่พๅ ฅ" -#: builtin/config.c:746 +#: builtin/config.c:793 msgid "editing blobs is not supported" msgstr "ไธๆฏๆ็ผ่พๆฐๆฎๅฏน่ฑก" -#: builtin/config.c:760 +#: builtin/config.c:807 #, c-format msgid "cannot create configuration file %s" msgstr "ไธ่ฝๅๅปบ้ ็ฝฎๆไปถ %s" -#: builtin/config.c:773 +#: builtin/config.c:820 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12123,7 +13634,7 @@ msgstr "" "ๆ ๆณ็จไธไธชๅผ่ฆ็ๅคไธชๅผ\n" " ไฝฟ็จไธไธชๆญฃๅ่กจ่พพๅผใ--add ๆ --replace-all ๆฅไฟฎๆน %sใ" -#: builtin/config.c:847 builtin/config.c:858 +#: builtin/config.c:894 builtin/config.c:905 #, c-format msgid "no such section: %s" msgstr "ๆ ๆญคๅฐ่๏ผ%s" @@ -12136,11 +13647,36 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "ไปฅ็จๆทๅฏ่ฏป็ๆ ผๅผๆพ็คบๅคงๅฐ" -#: builtin/describe.c:27 +#: builtin/credential-cache--daemon.c:226 +#, 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" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "่พๅบ่ฐ่ฏไฟกๆฏๅฐๆ ๅ้่ฏฏ" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "credential-cache--daemon ไธๅฏ็จ๏ผไธๆฏๆ unix ๅฅๆฅๅญ" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache ไธๅฏ็จ๏ผไธๆฏๆ unix ๅฅๆฅๅญ" + +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<้้กน>] [<ๆไบคๅท>...]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<้้กน>] --dirty" @@ -12156,37 +13692,32 @@ msgstr "่ฝป้็บง็" msgid "annotated" msgstr "้ๆณจ็" -#: builtin/describe.c:273 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "้ๆณจๆ ็ญพ %s ๆ ๆ" -#: builtin/describe.c:277 -#, c-format -msgid "annotated tag %s has no embedded name" -msgstr "้ๆณจๆ ็ญพ %s ๆฒกๆๅตๅ ฅๅ็งฐ" - -#: builtin/describe.c:279 +#: builtin/describe.c:281 #, c-format -msgid "tag '%s' is really '%s' here" -msgstr "ๆ ็ญพ '%s' ็็กฎๆฏๅจ '%s'" +msgid "tag '%s' is externally known as '%s'" +msgstr "ๆ ็ญพ '%s' ๅจๅค้จ่ขซ่ฎคไธบๆฏ '%s'" -#: builtin/describe.c:323 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "ๆฒกๆๆ ็ญพๅ็กฎๅน้ '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "ๆฒกๆ็ฒพ็กฎๅน้ ๅฐๅผ็จๆๆ ็ญพ๏ผ็ปง็ปญๆ็ดข่ฟ่กๆ่ฟฐ\n" -#: builtin/describe.c:379 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "ๅฎๆๆ็ดข %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12195,7 +13726,7 @@ msgstr "" "ๆฒกๆ้ๆณจๆ ็ญพ่ฝๆ่ฟฐ '%s'ใ\n" "็ถ่๏ผๅญๅจๆช้ๆณจๆ ็ญพ๏ผๅฐ่ฏ --tagsใ" -#: builtin/describe.c:409 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12204,12 +13735,12 @@ msgstr "" "ๆฒกๆๆ ็ญพ่ฝๆ่ฟฐ '%s'ใ\n" "ๅฐ่ฏ --always๏ผๆ่ ๅๅปบไธไบๆ ็ญพใ" -#: builtin/describe.c:439 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "ๅทฒ้ๅ %lu ไธชๆไบค\n" -#: builtin/describe.c:442 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12218,147 +13749,157 @@ msgstr "" "ๅ็ฐๅคไบ %i ไธชๆ ็ญพ๏ผๅๅบๆ่ฟ็ %i ไธช\n" "ๅจ %s ๆพๅผๆ็ดข\n" -#: builtin/describe.c:510 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "ๆ่ฟฐ %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "ไธๆฏไธไธชๆๆ็ๅฏน่ฑกๅ %s" -#: builtin/describe.c:521 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s ๆขไธๆฏๆไบคไนไธๆฏๆฐๆฎๅฏน่ฑก" -#: builtin/describe.c:535 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "ๅฏปๆพ่ฏฅๆไบคไนๅ็ๆ ็ญพ" -#: builtin/describe.c:536 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "ๅจๆ ๅ้่ฏฏไธ่ฐ่ฏๆ็ดข็ญ็ฅ" -#: builtin/describe.c:537 +#: builtin/describe.c:556 msgid "use any ref" msgstr "ไฝฟ็จไปปๆๅผ็จ" -#: builtin/describe.c:538 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "ไฝฟ็จไปปๆๆ ็ญพ๏ผๅณไฝฟๆช้ๅธฆๆณจ้" -#: builtin/describe.c:539 +#: builtin/describe.c:558 msgid "always use long format" msgstr "ๅง็ปไฝฟ็จ้ฟๆไบคๅทๆ ผๅผ" -#: builtin/describe.c:540 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "ๅช่ท้็ฌฌไธไธช็ถๆไบค" -#: builtin/describe.c:543 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "ๅช่พๅบ็ฒพ็กฎๅน้ " -#: builtin/describe.c:545 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "่่ๆ่ฟ <n> ไธชๆ ็ญพ๏ผ้ป่ฎค๏ผ10๏ผ" -#: builtin/describe.c:547 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "ๅช่่ๅน้ <ๆจกๅผ> ็ๆ ็ญพ" -#: builtin/describe.c:549 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "ไธ่่ๅน้ <ๆจกๅผ> ็ๆ ็ญพ" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "ๆพ็คบ็ฎๅ็ๆไบคๅทไฝไธบๅๅค" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "ๆ ่ฎฐ" -#: builtin/describe.c:553 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "ๅฏนไบ่ๅทฅไฝๅบ๏ผ่ฟฝๅ <ๆ ่ฎฐ>๏ผ้ป่ฎค๏ผ\"-dirty\"๏ผ" -#: builtin/describe.c:556 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "ๅฏนไบๆๅ็ๅทฅไฝๅบ๏ผ่ฟฝๅ <ๆ ่ฎฐ>๏ผ้ป่ฎค๏ผ\"-broken\"๏ผ" -#: builtin/describe.c:574 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "--long ไธ --abbrev=0 ไธๅ ผๅฎน" -#: builtin/describe.c:603 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "ๆฒกๆๅ็ฐๅ็งฐ๏ผๆ ๆณๆ่ฟฐไปปไฝไธ่ฅฟใ" -#: builtin/describe.c:654 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty ไธๆไบคๅทไธๅ ผๅฎน" -#: builtin/describe.c:656 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "--broken ไธๆไบคๅทไธๅ ผๅฎน" -#: builtin/diff.c:84 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'๏ผไธๆฏไธไธชๆญฃ่งๆไปถๆ็ฌฆๅท้พๆฅ" -#: builtin/diff.c:235 +#: builtin/diff.c:241 #, c-format msgid "invalid option: %s" msgstr "ๆ ๆ้้กน๏ผ%s" -#: builtin/diff.c:350 +#: builtin/diff.c:358 +#, c-format +msgid "%s...%s: no merge base" +msgstr "%s...%s๏ผๆ ๅๅนถๅบ็บฟ" + +#: builtin/diff.c:468 msgid "Not a git repository" -msgstr "ไธๆฏไธไธช git ไปๅบ" +msgstr "ไธๆฏ git ไปๅบ" -#: builtin/diff.c:394 +#: builtin/diff.c:513 #, c-format msgid "invalid object '%s' given." msgstr "ๆไพไบๆ ๆๅฏน่ฑก '%s'ใ" -#: builtin/diff.c:403 +#: builtin/diff.c:524 #, c-format msgid "more than two blobs given: '%s'" msgstr "ๆไพไบ่ถ ่ฟไธคไธชๆฐๆฎๅฏน่ฑก๏ผ'%s'" -#: builtin/diff.c:408 +#: builtin/diff.c:529 #, c-format msgid "unhandled object '%s' given." msgstr "ๆ ๆณๅค็็ๅฏน่ฑก '%s'ใ" +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "%s...%s๏ผๅคๆกๅๅนถๅบ็บฟ๏ผไฝฟ็จ %s" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<้้กน>] [<ๆไบค> [<ๆไบค>]] [--] [<่ทฏๅพ>...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "ๅคฑ่ดฅ๏ผ%d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "ๆ ๆณ่ฏปๅ็ฌฆๅท้พๆฅ %s" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "ๆ ๆณ่ฏปๅ็ฌฆๅท้พๆฅๆไปถ %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "ๆ ๆณ่ฏปๅ็ฌฆๅท้พๆฅ %2$s ๆๅ็ๅฏน่ฑก %1$s" -#: builtin/difftool.c:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12366,83 +13907,83 @@ msgstr "" "ไธๆฏๆๅจ็ฎๅฝๆฏ่พๆจกๅผ๏ผ'-d' ๅ '--dir-diff'๏ผไธญ้็จ็ปๅๅทฎๅผๆ ผๅผ๏ผ'-c' ๅ '--" "cc'๏ผใ" -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ไธคไธชๆไปถ้ฝ่ขซไฟฎๆน๏ผ'%s' ๅ '%s'ใ" -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "ๅทฅไฝๅบๆไปถ่ขซ็ไบไธๆฅใ" -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "ไธดๆถๆไปถๅญๅจไบ '%s'ใ" -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "ๆจๅฏ่ฝๆณ่ฆๆธ ็ๆ่ ๆขๅคๅฎไปฌใ" -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "ไฝฟ็จ `diff.guitool` ไปฃๆฟ `diff.tool`" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "ๆง่กไธไธชๅ จ็ฎๅฝๅทฎๅผๆฏ่พ" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "ๅฏๅจๅทฎๅผๆฏ่พๅทฅๅ ทไนๅไธๆ็คบ" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "ๅจ dir-diff ๆจกๅผไธญไฝฟ็จ็ฌฆๅท้พๆฅ" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "ๅทฅๅ ท" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "ไฝฟ็จๆๅฎ็ๅทฎๅผๆฏ่พๅทฅๅ ท" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "ๆพ็คบๅฏไปฅ็จๅจ `--tool` ๅๆฐๅ็ๅทฎๅผๅทฅๅ ทๅ่กจ" -#: builtin/difftool.c:705 +#: 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:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "ๆๅฎไธไธช็จไบๆฅ็ๅทฎๅผ็่ชๅฎไนๅฝไปค" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "ไผ ้็ป `diff`" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool ่ฆๆฑๅทฅไฝๅบๆ่ --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff ๅ --no-index ไธๅ ผๅฎน" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--guiใ--tool ๅ --extcmd ไบๆฅ" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "ๆฒกๆไธบ --tool=<ๅทฅๅ ท> ๅๆฐๆไพ <ๅทฅๅ ท>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "ๆฒกๆไธบ --extcmd=<ๅฝไปค> ๅๆฐๆไพ <ๅฝไปค>" @@ -12450,24 +13991,24 @@ msgstr "ๆฒกๆไธบ --extcmd=<ๅฝไปค> ๅๆฐๆไพ <ๅฝไปค>" 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 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "็ฑปๅ" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "git_env_*(...) ็้ป่ฎคๅผ" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "ๅฎ้ๆจกๅผ๏ผๅชไฝฟ็จ git_env_*() ็ๅผไฝไธบ้ๅบ็ " -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "้้กน `--default' ๅ `type=bool` ๆๆไธไธชๅธๅฐๅผ๏ผไธๆฏ `%s`" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -12478,245 +14019,332 @@ msgstr "้้กน `--default' ๅ `type=ulong` ๆๆไธไธชๆ ็ฌฆๅท้ฟๆดๅ๏ผไธ msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:868 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "้่ฏฏ๏ผ้ค้ๆๅฎ --mark-tags๏ผๅฆๅๆ ๆณๅฏผๅบๅตๅฅๆ ็ญพใ" + +#: builtin/fast-export.c:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "--anonymize-map ๅๅผไธ่ฝไธบ็ฉบ" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "ๅจ <n> ไธชๅฏน่ฑกไนๅๆพ็คบ่ฟๅบฆ" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "้ๆฉๅฆไฝๅค็็ญพๅๆ ็ญพ" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "้ๆฉๅฝๆ ็ญพๆๅ่ขซ่ฟๆปคๅฏน่ฑกๆถ่ฏฅๆ ็ญพ็ๅค็ๆนๅผ" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1206 msgid "select handling of commit messages in an alternate encoding" msgstr "้ๆฉไฝฟ็จๅค็จ็ผ็ ๅค็ๆไบค่ฏดๆ" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" msgstr "ๆๆ ่ฎฐๅญๅจๅฐ่ฟไธชๆไปถ" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" msgstr "ไป่ฟไธชๆไปถๅฏผๅ ฅๆ ่ฎฐ" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1215 +msgid "Import marks from this file if it exists" +msgstr "ไป่ฏฅๆไปถๅฏผๅ ฅๆ ่ฎฐ๏ผๅฆๆๅญๅจ็่ฏ๏ผ" + +#: builtin/fast-export.c:1217 msgid "Fake a tagger when tags lack one" msgstr "ๅฝๆ ็ญพ็ผบๅฐๆ ่ฎฐ่ ๅญๆฎตๆถ๏ผๅ่ฃ ๆไพไธไธช" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1219 msgid "Output full tree for each commit" msgstr "ๆฏๆฌกๆไบค้ฝ่พๅบๆดไธชๆ " -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1221 msgid "Use the done feature to terminate the stream" msgstr "ไฝฟ็จ done ๅ่ฝๆฅ็ปๆญขๆต" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "่ทณ่ฟๆฐๆฎๅฏน่ฑก็่พๅบ" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1223 builtin/log.c:1811 msgid "refspec" msgstr "ๅผ็จ่งๆ ผ" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1224 msgid "Apply refspec to exported refs" msgstr "ๅฏนๅฏผๅบ็ๅผ็จๅบ็จๅผ็จ่งๆ ผ" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "ๅฟๅ่พๅบ" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "from:to" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "ๅจๅฟๅ่พๅบไธญๅฐ <from> ่ฝฌๆขไธบ <to>" + +#: builtin/fast-export.c:1230 msgid "Reference parents which are not in fast-export stream by object id" msgstr "ๅผ็จ็ถๅฏน่ฑก ID ไธๅจ fast-export ๆตไธญ" -#: builtin/fast-export.c:1151 +#: builtin/fast-export.c:1232 msgid "Show original object ids of blobs/commits" msgstr "ๆพ็คบๆฐๆฎๅฏน่ฑก/ๆไบค็ๅๅงๅฏน่ฑก ID" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1234 +msgid "Label tags with mark ids" +msgstr "ๅฏนๅธฆๆๆ ่ฎฐ ID ็ๆ ็ญพๅๆ ่ฎฐ" + +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "--anonymize-map ่ๆฒกๆ --anonymize ๆฒกๆๆไน" + +#: builtin/fast-export.c:1272 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "ไธ่ฝๅๆถไผ ้ๅๆฐ --import-marks ๅ --import-marks-if-exists" + +#: builtin/fast-import.c:3086 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "ๅญๆจก็ป '%s' ็ผบๅฐ from ๆ ่ฎฐ" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "ๅญๆจก็ป '%s' ็ผบๅฐ to ๆ ่ฎฐ" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "้ขๆ 'mark' ๅฝไปค๏ผๅพๅฐ %s" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "้ขๆ 'to' ๅฝไปค๏ผๅพๅฐ %s" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "ๅญๆจก็ป้ๅ้้กน็้ขๆๆ ผๅผไธบ name:filename" + +#: builtin/fast-import.c:3374 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "ไธๅธฆ --allow-unsafe-features ็่พๅ ฅไธญ็ฆๆญขไฝฟ็จๅ่ฝ '%s'" + +#: builtin/fetch-pack.c:241 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "Lockfile ๅทฒๅๅปบไฝๆชๆฅๅ๏ผ%s" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<้้กน>] [<ไปๅบ> [<ๅผ็จ่งๆ ผ>...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [<้้กน>] <็ป>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<้้กน>] [(<ไปๅบ> | <็ป>)...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<้้กน>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel ไธ่ฝไธบ่ดๆฐ" + +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "ไปๆๆ็่ฟ็จๆๅ" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:144 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "ไธบ git pull/fetch ่ฎพ็ฝฎไธๆธธ" + +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "่ฟฝๅ ๅฐ .git/FETCH_HEAD ่ไธๆฏ่ฆ็ๅฎ" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "ไธไผ ๅ ๅฐ่ฟ็จ็่ทฏๅพ" -#: builtin/fetch.c:130 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "ๅผบๅถ่ฆ็ๆฌๅฐๅผ็จ" -#: builtin/fetch.c:132 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "ไปๅคไธช่ฟ็จๆๅ" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "ๆๅๆๆ็ๆ ็ญพๅๅ ณ่ๅฏน่ฑก" -#: builtin/fetch.c:136 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "ไธๆๅไปปไฝๆ ็ญพ(--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "ๅญๆจก็ป่ทๅ็ๅนถๅๆฐ" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:159 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "ๆธ ้ค่ฟ็จๅทฒ็ปไธๅญๅจ็ๅๆฏ็่ท่ธชๅๆฏ" -#: builtin/fetch.c:142 +#: builtin/fetch.c:161 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "ๆธ ้ค่ฟ็จไธๅญๅจ็ๆฌๅฐๆ ็ญพ๏ผๅนถไธๆฟๆขๅๆดๆ ็ญพ" # ่ฏ่ ๏ผๅฏ้ๅผ๏ผไธ่ฝ็ฟป่ฏ -#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:144 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "ๆงๅถๅญๆจก็ป็้ๅฝๆๅ" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "ๅฐ่ทๅๅฐ็ๅผ็จๅๅ ฅ FETCH_HEAD ๆไปถ" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "ไฟๆไธ่ฝฝๅ " -#: builtin/fetch.c:150 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "ๅ ่ฎธๆดๆฐ HEAD ๅผ็จ" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "ๆทฑๅๆต ๅ ้็ๅๅฒ" -#: builtin/fetch.c:155 +#: builtin/fetch.c:176 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "ๅบไบๆถ้ดๆฅๆทฑๅๆต ๅ ้็ๅๅฒ" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "่ฝฌๆขไธบไธไธชๅฎๆด็ไปๅบ" -#: builtin/fetch.c:164 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "ๅจๅญๆจก็ป่ทฏๅพ่พๅบ็ๅ้ขๅ ไธๆญค็ฎๅฝ" -#: builtin/fetch.c:167 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "้ๅฝ่ทๅๅญๆจก็ป็็ผบ็ๅผ๏ผๆฏ้ ็ฝฎๆไปถไผๅ ็บงไฝ๏ผ" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "ๆฅๅๆดๆฐ .git/shallow ็ๅผ็จ" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "ๅผ็จๆ ๅฐ" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "ๆๅฎ่ทๅๆไฝ็ๅผ็จๆ ๅฐ" -#: builtin/fetch.c:180 +#: builtin/fetch.c:201 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "ๆฅๅๆไปฌๅชๆฅๆไป่ฏฅๅฏน่ฑกๅผๅงๅฏ่พพ็ๅฏน่ฑก" -#: builtin/fetch.c:183 -msgid "run 'gc --auto' after fetching" -msgstr "่ทๅๅๆง่ก 'gc --auto'" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "่ทๅๅๆง่ก 'maintenance --auto'" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "ๅจๆๆๆดๆฐๅๆฏไธๆฃๆฅๅผบๅถๆดๆฐ" -#: builtin/fetch.c:491 +#: builtin/fetch.c:210 +msgid "write the commit-graph after fetching" +msgstr "ๆๅๅๅๆไบคๅพ" + +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "ไปๆ ๅ่พๅ ฅ่ทๅๅผ็จ่กจ่พพๅผ" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "ๆ ๆณๅ็ฐ่ฟ็จ HEAD ๅผ็จ" -#: builtin/fetch.c:630 +#: builtin/fetch.c:677 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "้ ็ฝฎๅ้ fetch.output ๅ ๅซๆ ๆๅผ %s" -#: builtin/fetch.c:728 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "ๅฏน่ฑก %s ๆชๅ็ฐ" -#: builtin/fetch.c:732 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "[ๆๆฐ]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[ๅทฒๆ็ป]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "ๅฝๅๅๆฏไธไธ่ฝๆง่ก่ทๅๆไฝ" -#: builtin/fetch.c:756 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[ๆ ็ญพๆดๆฐ]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "ไธ่ฝๆดๆฐๆฌๅฐๅผ็จ" -#: builtin/fetch.c:761 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "ไผ็ ดๅ็ฐๆ็ๆ ็ญพ" -#: builtin/fetch.c:783 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[ๆฐๆ ็ญพ]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[ๆฐๅๆฏ]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[ๆฐๅผ็จ]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:875 msgid "forced update" msgstr "ๅผบๅถๆดๆฐ" -#: builtin/fetch.c:833 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "้ๅฟซ่ฟ" -#: builtin/fetch.c:854 +#: builtin/fetch.c:901 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" @@ -12726,7 +14354,7 @@ msgstr "" "่ฆ้ๆฐๅฏ็จ๏ผ่ฏทไฝฟ็จ '--show-forced-updates' ้้กนๆ่ฟ่ก\n" "'git config fetch.showForcedUpdates true'ใ" -#: builtin/fetch.c:858 +#: builtin/fetch.c:905 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -12737,22 +14365,22 @@ msgstr "" "่ฑไบ %.2f ็งๆฅๆฃๆฅๅผบๅถๆดๆฐใๆจๅฏไปฅไฝฟ็จ '--no-show-forced-updates'\n" "ๆ่ฟ่ก 'git config fetch.showForcedUpdates false' ไปฅ้ฟๅ ๆญค้กนๆฃๆฅใ\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s ๆชๅ้ๆๆๅฟ ้็ๅฏน่ฑก\n" -#: builtin/fetch.c:909 +#: builtin/fetch.c:960 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "ๆ็ป %s ๅ ไธบๆต ๅ ้ไธๅ ่ฎธ่ขซๆดๆฐ" -#: builtin/fetch.c:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "ๆฅ่ช %.*s\n" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -12762,127 +14390,154 @@ msgstr "" " 'git remote prune %s' ๆฅๅ ้คๆง็ใๆๅฒ็ช็ๅๆฏ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr " ๏ผ%s ๅฐๆไธบๆฌ็ฉบ็ถๆ๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " ๏ผ%s ๅทฒๆไธบๆฌ็ฉบ็ถๆ๏ผ" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[ๅทฒๅ ้ค]" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1195 builtin/remote.c:1113 msgid "(none)" msgstr "๏ผๆ ๏ผ" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1218 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "ๆ็ป่ทๅๅฐ้็บฏไปๅบ็ๅฝๅๅๆฏ %s" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1237 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "้้กน \"%s\" ็ๅผ \"%s\" ๅฏนไบ %s ๆฏๆ ๆ็" -#: builtin/fetch.c:1180 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "้้กน \"%s\" ไธบ %s ๆๅฟฝ็ฅ\n" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "ๆฃๆตๅฐๅคๅๆฏ๏ผๅ --set-upstream ไธๅ ผๅฎน" + +#: builtin/fetch.c:1463 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "ๆฒกๆไธบไธไธช่ฟ็จ่ท่ธชๅๆฏ่ฎพ็ฝฎไธๆธธ" + +#: builtin/fetch.c:1465 +msgid "not setting upstream for a remote tag" +msgstr "ๆฒกๆไธบไธไธช่ฟ็จๆ ็ญพ่ฎพ็ฝฎไธๆธธ" + +#: builtin/fetch.c:1467 +msgid "unknown branch type" +msgstr "ๆช็ฅ็ๅๆฏ็ฑปๅ" + +#: builtin/fetch.c:1469 +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:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "ๆญฃๅจ่ทๅ %s\n" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "ไธ่ฝ่ทๅ %s" -#: builtin/fetch.c:1532 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" -msgstr "ๅชๅฏไปฅๅฐ --filter ็จไบๅจ extensions.partialClone ไธญ้ ็ฝฎ็่ฟ็จไปๅบ" +#: builtin/fetch.c:1620 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "ๆ ๆณ่ทๅ '%s'๏ผ้ๅบ็ ๏ผ%d๏ผ\n" -#: builtin/fetch.c:1556 +#: builtin/fetch.c:1724 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:1593 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "ๆจ้่ฆๆๅฎไธไธชๆ ็ญพๅ็งฐใ" -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "--deepen ไธๆฏๆ่ดๆฐๆทฑๅบฆ" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen ๅ --depth ๆฏไบๆฅ็" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "--depth ๅ --unshallow ไธ่ฝๅๆถไฝฟ็จ" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "ๅฏนไบไธไธชๅฎๆด็ไปๅบ๏ผๅๆฐ --unshallow ๆฒกๆๆไน" -#: builtin/fetch.c:1669 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "fetch --all ไธ่ฝๅธฆไธไธชไปๅบๅๆฐ" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all ๅธฆๅผ็จ่งๆ ผๆฒกๆไปปไฝๆไน" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "ๆฒกๆ่ฟๆ ท็่ฟ็จๆ่ฟ็จ็ป๏ผ%s" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1869 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "่ทๅ็ปๅนถๆๅฎๅผ็จ่งๆ ผๆฒกๆๆไน" -#: builtin/fetch.c:1703 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "ๅชๅฏไปฅๅฐ --filter ็จไบๅจ extensions.partialClone ไธญ้ ็ฝฎ็่ฟ็จไปๅบ" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "--stdin ไป ๅจไปไธไธช่ฟ็จไปๅบ่ทๅ็ๆถๅๅฏ็จ" + +#: builtin/fmt-merge-msg.c:7 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:672 +#: builtin/fmt-merge-msg.c:18 msgid "populate log with at most <n> entries from shortlog" msgstr "ๅๆไบค่ฏดๆไธญๆๅคๅคๅถๆๅฎๆก็ฎ๏ผๅๅนถ่ๆฅ็ๆไบค๏ผ็็ฎ็ญ่ฏดๆ" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "ๅๆฐ --log ็ๅซๅ๏ผๅทฒๅผ็จ๏ผ" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "ๆๆฌ" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "ไฝฟ็จ <ๆๆฌ> ไฝไธบๆไบค่ฏดๆ็ๅผๅง" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "ไปๆไปถไธญ่ฏปๅ" @@ -12895,8 +14550,8 @@ 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) [<ๆไบค>]]" +msgid "git for-each-ref [--merged [<commit>]] [--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>]]" @@ -12922,7 +14577,7 @@ msgstr "ๅผ็จๅ ไฝ็ฌฆ้็จไบ Tcl" msgid "show only <n> matched refs" msgstr "ๅชๆพ็คบ <n> ไธชๅน้ ็ๅผ็จ" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "้ต็ งๆ ผๅผไธญ็้ข่ฒ่พๅบ" @@ -12946,32 +14601,32 @@ msgstr "ๅชๆๅฐๅ ๅซ่ฏฅๆไบค็ๅผ็จ" msgid "print only refs which don't contain the commit" msgstr "ๅชๆๅฐไธๅ ๅซ่ฏฅๆไบค็ๅผ็จ" -#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "ๆช็ฅ" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, c-format msgid "error in %s %s: %s" msgstr "%s %s ้่ฏฏ๏ผ%s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:131 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" msgstr "%s %s ่ญฆๅ๏ผ%s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "ๆฅ่ช %7s %s ็ๆๅ็้พๆฅ" -#: builtin/fsck.c:168 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "้พๆฅไธญ้่ฏฏ็ๅฏน่ฑก็ฑปๅ" -#: builtin/fsck.c:184 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" @@ -12980,235 +14635,235 @@ msgstr "" "ๆๅ็้พๆฅๆฅ่ชไบ %7s %s\n" " ๅฐ %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "็ผบๅคฑ %s %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "ไธๅฏ่พพ %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "ๆฌ็ฉบ %s %s" -#: builtin/fsck.c:349 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "ไธ่ฝๅๅปบ lost-found" -#: builtin/fsck.c:360 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "ไธ่ฝๅฎๆ '%s'" -#: builtin/fsck.c:377 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "ๆญฃๅจๆฃๆฅ %s" -#: builtin/fsck.c:415 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "ๆญฃๅจๆฃๆฅ่ฟ้ๆง๏ผ%d ไธชๅฏน่ฑก๏ผ" -#: builtin/fsck.c:434 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "ๆญฃๅจๆฃๆฅ %s %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:430 msgid "broken links" msgstr "ๆๅ็้พๆฅ" -#: builtin/fsck.c:447 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "ๆ น %s" -#: builtin/fsck.c:455 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "ๆ ่ฎฐ %s %s (%s) ไบ %s" -#: builtin/fsck.c:484 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "%s๏ผๅฏน่ฑกๆๅๆไธขๅคฑ" -#: builtin/fsck.c:509 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s๏ผๆ ๆ็ๅผ็จๆฅๅฟๆก็ฎ %s" -#: builtin/fsck.c:523 +#: builtin/fsck.c:515 #, c-format msgid "Checking reflog %s->%s" msgstr "ๆญฃๅจๆฃๆฅๅผ็จๆฅๅฟ %s->%s" -#: builtin/fsck.c:557 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s๏ผๆ ๆ็ sha1 ๆ้ %s" -#: builtin/fsck.c:564 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "%s๏ผไธๆฏไธไธชๆไบค" -#: builtin/fsck.c:619 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "ๆณจๆ๏ผๆ ้ป่ฎคๅผ็จ" -#: builtin/fsck.c:634 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s๏ผๅฏน่ฑกๆๅๆไธขๅคฑ๏ผ%s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s๏ผไธ่ฝ่งฃๆๅฏน่ฑก๏ผ%s" -#: builtin/fsck.c:667 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "ๅ็ sha1 ๆไปถ๏ผ%s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "ๆญฃๅจๆฃๆฅๅฏน่ฑก็ฎๅฝ" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "ๆญฃๅจๆฃๆฅๅฏน่ฑก็ฎๅฝ" -#: builtin/fsck.c:700 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "ๆญฃๅจๆฃๆฅ %s ้พๆฅ" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "ๆ ๆ็ %s" -#: builtin/fsck.c:712 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "%s ๆๅๅฅๆช็ไธ่ฅฟ๏ผ%s๏ผ" -#: builtin/fsck.c:718 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s๏ผๅ็ฆปๅคดๆ้็ๆๅไธๅญๅจ" -#: builtin/fsck.c:722 +#: builtin/fsck.c:713 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "ๆณจๆ๏ผ%s ๆๅไธไธชๅฐๆช่ฏ็็ๅๆฏ๏ผ%s๏ผ" -#: builtin/fsck.c:734 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "ๆญฃๅจๆฃๆฅ็ผๅญๆ " -#: builtin/fsck.c:739 +#: builtin/fsck.c:730 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s๏ผcache-tree ไธญๆ ๆ็ sha1 ๆ้" -#: builtin/fsck.c:750 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "cache-tree ไธญ้ๆ ๅฏน่ฑก" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<้้กน>] [<ๅฏน่ฑก>...]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "ๆพ็คบไธๅฏ่พพ็ๅฏน่ฑก" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "ๆพ็คบๆฌ็ฉบ็ๅฏน่ฑก" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "ๆฅๅๆ ็ญพ" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "ๆฅๅๆ น่็น" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "ๅฐ็ดขๅผไบฆไฝไธบๆฃๆฅ็ๅคด่็น" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "ๅฐๅผ็จๆฅๅฟไฝไธบๆฃๆฅ็ๅคด่็น๏ผ้ป่ฎค๏ผ" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "ไน่่ๅ ๅๅค็จๅฏน่ฑก" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "ไป ๆฃๆฅ่ฟ้ๆง" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "ๅฏ็จๆดไธฅๆ ผ็ๆฃๆฅ" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "ๅฐๆฌ็ฉบๅฏน่ฑกๅๅ ฅ .git/lost-found ไธญ" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "ๆพ็คบ่ฟๅบฆ" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "ๆพ็คบๅฏ่พพๅฏน่ฑก็่ฏฆ็ปๅ็งฐ" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "ๆญฃๅจๆฃๆฅๅฏน่ฑก" -#: builtin/fsck.c:887 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "%s๏ผๅฏน่ฑก็ผบๅคฑ" -#: builtin/fsck.c:899 +#: builtin/fsck.c:886 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "ๆ ๆ็ๅๆฐ๏ผๆๆ sha1๏ผๅพๅฐ '%s'" -#: builtin/gc.c:34 +#: builtin/gc.c:36 msgid "git gc [<options>]" msgstr "git gc [<้้กน>]" -#: builtin/gc.c:90 +#: builtin/gc.c:91 #, c-format msgid "Failed to fstat %s: %s" msgstr "ๅฏน %s ่ฐ็จ fstat ๅคฑ่ดฅ๏ผ%s" -#: builtin/gc.c:126 +#: builtin/gc.c:127 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "ๆ ๆณ่งฃๆ '%s' ๅผ '%s'" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "ไธ่ฝๅฏน '%s' ่ฐ็จ stat" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "ไธ่ฝ่ฏปๅ '%s'" @@ -13284,7 +14939,60 @@ msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "ๆๅคชๅคไธๅฏ่พพ็ๆพๆฃๅฏน่ฑก๏ผ่ฟ่ก 'git prune' ๅ ้คๅฎไปฌใ" -#: builtin/grep.c:29 +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<ไปปๅก>]" + +#: builtin/gc.c:812 +msgid "failed to write commit-graph" +msgstr "ๆ ๆณๅๅ ฅๆไบคๅพ" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "้ๆไปถ '%s' ๅทฒๅญๅจ๏ผ่ทณ่ฟ็ปดๆค" + +#: builtin/gc.c:932 +#, c-format +msgid "task '%s' failed" +msgstr "ไปปๅก '%s' ๅคฑ่ดฅ" + +#: builtin/gc.c:979 +#, c-format +msgid "'%s' is not a valid task" +msgstr "'%s' ไธๆฏไธไธชๆๆ็ไปปๅก" + +#: builtin/gc.c:984 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "ไปปๅก '%s' ไธ่ฝ่ขซๅคๆฌก้ๆฉ" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "ๅบไบไปๅบ็ถๆๆฅ่ฟ่กไปปๅก" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "ไธ้่ฟๆ ๅ้่ฏฏๆฅๅ่ฟๅบฆๆๅ ถๅฎไฟกๆฏ" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "ไปปๅก" + +#: builtin/gc.c:1003 +msgid "run a specific task" +msgstr "่ฟ่กไธไธช็นๅฎ็ไปปๅก" + +#: builtin/gc.c:1026 +msgid "git maintenance run [<options>]" +msgstr "git maintenance run [<้้กน>]" + +#: builtin/gc.c:1037 +#, c-format +msgid "invalid subcommand: %s" +msgstr "ๆ ๆๅญๅฝไปค๏ผ%s" + +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<้้กน>] [-e] <ๆจกๅผ> [<็ๆฌ>...] [[--] <่ทฏๅพ>...]" @@ -13302,259 +15010,259 @@ msgstr "ไธบ %2$s ่ฎพๅฎ็็บฟ็จๆฐ (%1$d) ๆ ๆ" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "ๆฒกๆ็บฟ็จๆฏๆ๏ผๅฟฝ็ฅ %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "ๆ ๆณ่ฏปๅๆ ๏ผ%s๏ผ" -#: builtin/grep.c:648 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "ๆ ๆณๆๅๆฅ่ชไบ %s ็ฑปๅ็ๅฏน่ฑก" -#: builtin/grep.c:714 +#: builtin/grep.c:725 #, c-format msgid "switch `%c' expects a numerical value" msgstr "ๅผๅ ณ `%c' ๆๆไธไธชๆฐๅญๅผ" -#: builtin/grep.c:813 +#: builtin/grep.c:824 msgid "search in index instead of in the work tree" msgstr "ๅจ็ดขๅผๅบๆ็ดข่ไธๆฏๅจๅทฅไฝๅบ" -#: builtin/grep.c:815 +#: builtin/grep.c:826 msgid "find in contents not managed by git" msgstr "ๅจๆช่ขซ git ็ฎก็็ๅ ๅฎนไธญๆฅๆพ" # ่ฏ่ ๏ผไธญๆๅญ็ฌฆไธฒๆผๆฅ๏ผๅฏๅ ้คๅๅฏผ็ฉบๆ ผ -#: builtin/grep.c:817 +#: builtin/grep.c:828 msgid "search in both tracked and untracked files" msgstr "ๅจ่ท่ธชๅๆช่ท่ธช็ๆไปถไธญๆ็ดข" -#: builtin/grep.c:819 +#: builtin/grep.c:830 msgid "ignore files specified via '.gitignore'" msgstr "ๅฟฝ็ฅ '.gitignore' ๅ ๅซ็ๆไปถ" -#: builtin/grep.c:821 +#: builtin/grep.c:832 msgid "recursively search in each submodule" msgstr "ๅจๆฏไธไธชๅญๆจก็ปไธญ้ๅฝๆ็ดข" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "show non-matching lines" msgstr "ๆพ็คบๆชๅน้ ็่ก" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "case insensitive matching" msgstr "ไธๅบๅๅคงๅฐๅๅน้ " -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "match patterns only at word boundaries" msgstr "ๅชๅจๅ่ฏ่พน็ๅน้ ๆจกๅผ" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "process binary files as text" msgstr "ๆไบ่ฟๅถๆไปถๅฝๅๆๆฌๅค็" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "don't match patterns in binary files" msgstr "ไธๅจไบ่ฟๅถๆไปถไธญๅน้ ๆจกๅผ" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "process binary files with textconv filters" msgstr "็จ textconv ่ฟๆปคๅจๅค็ไบ่ฟๅถๆไปถ" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "search in subdirectories (default)" msgstr "ๅจๅญ็ฎๅฝไธญๅฏปๆพ๏ผ้ป่ฎค๏ผ" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "descend at most <depth> levels" msgstr "ๆๅคไปฅๆๅฎ็ๆทฑๅบฆๅไธๅฏปๆพ" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "use extended POSIX regular expressions" msgstr "ไฝฟ็จๆฉๅฑ็ POSIX ๆญฃๅ่กจ่พพๅผ" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "use basic POSIX regular expressions (default)" msgstr "ไฝฟ็จๅบๆฌ็ POSIX ๆญฃๅ่กจ่พพๅผ๏ผ้ป่ฎค๏ผ" -#: builtin/grep.c:849 +#: builtin/grep.c:860 msgid "interpret patterns as fixed strings" msgstr "ๆๆจกๅผ่งฃๆไธบๅบๅฎ็ๅญ็ฌฆไธฒ" -#: builtin/grep.c:852 +#: builtin/grep.c:863 msgid "use Perl-compatible regular expressions" msgstr "ไฝฟ็จ Perl ๅ ผๅฎน็ๆญฃๅ่กจ่พพๅผ" -#: builtin/grep.c:855 +#: builtin/grep.c:866 msgid "show line numbers" msgstr "ๆพ็คบ่กๅท" -#: builtin/grep.c:856 +#: builtin/grep.c:867 msgid "show column number of first match" msgstr "ๆพ็คบ็ฌฌไธไธชๅน้ ็ๅๅท" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "don't show filenames" msgstr "ไธๆพ็คบๆไปถๅ" -#: builtin/grep.c:858 +#: builtin/grep.c:869 msgid "show filenames" msgstr "ๆพ็คบๆไปถๅ" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "show filenames relative to top directory" msgstr "ๆพ็คบ็ธๅฏนไบ้กถ็บง็ฎๅฝ็ๆไปถๅ" -#: builtin/grep.c:862 +#: builtin/grep.c:873 msgid "show only filenames instead of matching lines" msgstr "ๅชๆพ็คบๆไปถๅ่ไธๆพ็คบๅน้ ็่ก" -#: builtin/grep.c:864 +#: builtin/grep.c:875 msgid "synonym for --files-with-matches" msgstr "ๅ --files-with-matches ๅไน" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show only the names of files without match" msgstr "ๅชๆพ็คบๆชๅน้ ็ๆไปถๅ" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "print NUL after filenames" msgstr "ๅจๆไปถๅๅ่พๅบ NUL ๅญ็ฌฆ" -#: builtin/grep.c:872 +#: builtin/grep.c:883 msgid "show only matching parts of a line" msgstr "ๅชๆพ็คบ่กไธญ็ๅน้ ็้จๅ" -#: builtin/grep.c:874 +#: builtin/grep.c:885 msgid "show the number of matches instead of matching lines" msgstr "ๆพ็คบๆปๅน้ ่กๆฐ๏ผ่ไธๆพ็คบๅน้ ็่ก" -#: builtin/grep.c:875 +#: builtin/grep.c:886 msgid "highlight matches" msgstr "้ซไบฎๆพ็คบๅน้ ้กน" -#: builtin/grep.c:877 +#: builtin/grep.c:888 msgid "print empty line between matches from different files" msgstr "ๅจไธๅๆไปถ็ๅน้ ้กนไน้ดๆๅฐ็ฉบ่ก" -#: builtin/grep.c:879 +#: builtin/grep.c:890 msgid "show filename only once above matches from same file" msgstr "ๅชๅจๅไธๆไปถ็ๅน้ ้กน็ไธ้ขๆพ็คบไธๆฌกๆไปถๅ" -#: builtin/grep.c:882 +#: builtin/grep.c:893 msgid "show <n> context lines before and after matches" msgstr "ๆพ็คบๅน้ ้กนๅๅ็ <n> ่กไธไธๆ" -#: builtin/grep.c:885 +#: builtin/grep.c:896 msgid "show <n> context lines before matches" msgstr "ๆพ็คบๅน้ ้กนๅ <n> ่กไธไธๆ" -#: builtin/grep.c:887 +#: builtin/grep.c:898 msgid "show <n> context lines after matches" msgstr "ๆพ็คบๅน้ ้กนๅ <n> ่กไธไธๆ" -#: builtin/grep.c:889 +#: builtin/grep.c:900 msgid "use <n> worker threads" msgstr "ไฝฟ็จ <n> ไธชๅทฅไฝ็บฟ็จ" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "shortcut for -C NUM" msgstr "ๅฟซๆท้ฎ -C ๆฐๅญ" -#: builtin/grep.c:893 +#: builtin/grep.c:904 msgid "show a line with the function name before matches" msgstr "ๅจๅน้ ็ๅ้ขๆพ็คบไธ่กๅฝๆฐๅ" -#: builtin/grep.c:895 +#: builtin/grep.c:906 msgid "show the surrounding function" msgstr "ๆพ็คบๆๅจๅฝๆฐ็ๅๅๅ ๅฎน" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "read patterns from file" msgstr "ไปๆไปถ่ฏปๅๆจกๅผ" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "match <pattern>" msgstr "ๅน้ <ๆจกๅผ>" -#: builtin/grep.c:902 +#: builtin/grep.c:913 msgid "combine patterns specified with -e" msgstr "็ปๅ็จ -e ๅๆฐ่ฎพๅฎ็ๆจกๅผ" -#: builtin/grep.c:914 +#: builtin/grep.c:925 msgid "indicate hit with exit status without output" msgstr "ไธ่พๅบ๏ผ่็จ้ๅบ็ ๆ ่ฏๅฝไธญ็ถๆ" -#: builtin/grep.c:916 +#: builtin/grep.c:927 msgid "show only matches from files that match all patterns" msgstr "ๅชๆพ็คบๅน้ ๆๆๆจกๅผ็ๆไปถไธญ็ๅน้ " -#: builtin/grep.c:918 +#: builtin/grep.c:929 msgid "show parse tree for grep expression" msgstr "ๆพ็คบ grep ่กจ่พพๅผ็่งฃๆๆ " -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "pager" msgstr "ๅ้กต" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "show matching files in the pager" msgstr "ๅ้กตๆพ็คบๅน้ ็ๆไปถ" -#: builtin/grep.c:926 +#: builtin/grep.c:937 msgid "allow calling of grep(1) (ignored by this build)" msgstr "ๅ ่ฎธ่ฐ็จ grep(1)๏ผๆฌๆฌกๆๅปบๅฟฝ็ฅ๏ผ" -#: builtin/grep.c:990 +#: builtin/grep.c:1004 msgid "no pattern given" msgstr "ๆชๆไพๅน้ ๆจกๅผ" -#: builtin/grep.c:1026 +#: builtin/grep.c:1040 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index ๆ --untracked ไธ่ฝๅ็ๆฌๅๆถไฝฟ็จ" -#: builtin/grep.c:1034 +#: builtin/grep.c:1048 #, c-format msgid "unable to resolve revision: %s" msgstr "ไธ่ฝ่งฃๆ็ๆฌ๏ผ%s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1078 +msgid "--untracked not supported with --recurse-submodules" +msgstr "--untracked ไธๆฏๆๅ --recurse-submodules ๅ ฑ็จ" + +#: builtin/grep.c:1082 msgid "invalid option combination, ignoring --threads" msgstr "ๆ ๆ็้้กน็ปๅ๏ผๅฟฝ็ฅ --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "ๆฒกๆ็บฟ็จๆฏๆ๏ผๅฟฝ็ฅ --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ๆๅฎ็็บฟ็จๆฐๆ ๆ๏ผ%d๏ผ" -#: builtin/grep.c:1094 +#: builtin/grep.c:1122 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ไป ็จไบๅทฅไฝๅบ" -#: builtin/grep.c:1117 -msgid "option not supported with --recurse-submodules" -msgstr "้้กนไธๆฏๆๅ --recurse-submodules ๅ ฑ็จ" - -#: builtin/grep.c:1123 +#: builtin/grep.c:1148 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached ๆ --untracked ไธ่ฝไธ --no-index ๅๆถไฝฟ็จ" -#: builtin/grep.c:1129 +#: builtin/grep.c:1154 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard ไธ่ฝ็จไบๅทฒ่ท่ธชๅ ๅฎน" -#: builtin/grep.c:1137 +#: builtin/grep.c:1162 msgid "both --cached and trees are given" msgstr "ๅๆถ็ปๅบไบ --cached ๅๆ ๅฏน่ฑก" @@ -13595,66 +15303,66 @@ msgstr "ๅ ่ฎธๅฏนไปปๆ้ๆบๅๅพๆฐๆฎๅๆฃๅๆฅๅๅปบๆๅ็ๅฏน่ฑกไปฅไพฟ msgid "process file as it were from this path" msgstr "ๅค็ๆไปถๅนถๅ่ฎพๅ ถๆฅ่ชไบๆญค่ทฏๅพ" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "ๆๅฐๆๆๅฏ็จ็ๅฝไปค" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "ๆ้คๅๅฏผ" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "ๆพ็คบๆ็จ็ๆๅๅ่กจ" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "ๆๅฐๆๆ้ ็ฝฎๅ้ๅ็งฐ" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "ๆพ็คบ man ๆๅ" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "ๅจ web ๆต่งๅจไธญๆพ็คบๆๅ" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "ๆพ็คบ info ๆๅ" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "ๆๅฐๅฝไปคๆ่ฟฐ" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<ๅฝไปค>]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "ๆช่ฝ่ฏๅซ็ๅธฎๅฉๆ ผๅผ '%s'" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "ๆ ๆณๅฏๅจ emacsclientใ" -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "ๆ ๆณ่งฃๆ emacsclient ็ๆฌใ" -#: builtin/help.c:125 +#: builtin/help.c:211 #, 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 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "ๆง่ก '%s' ๅคฑ่ดฅ" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -13663,7 +15371,7 @@ msgstr "" "'%s'๏ผไธๆฏๆ็ man ๆๅๆฅ็ๅจ็่ทฏๅพใ\n" "่ฏทไฝฟ็จ 'man.<ๅทฅๅ ท>.cmd'ใ" -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -13672,396 +15380,424 @@ msgstr "" "'%s': ๆฏๆ็ man ๆๅๆฅ็ๅจๅฝไปคใ\n" "่ฏทไฝฟ็จ 'man.<ๅทฅๅ ท>.path'ใ" -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'๏ผๆช็ฅ็ man ๆฅ็ๅจใ" -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "ๆฒกๆ man ๆฅ็ๅจๅค็ๆญค่ฏทๆฑ" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "ๆฒกๆ info ๆฅ็ๅจๅค็ๆญค่ฏทๆฑ" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' ๆฏ '%s' ็ๅซๅ" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "ๅ็ alias.%s ๅญ็ฌฆไธฒ๏ผ%s" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "็จๆณ๏ผ%s%s" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "'git help config' ่ทๅๆดๅคไฟกๆฏ" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "%s ็ๅฏน่ฑก็ฑปๅไธๅน้ " -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "ๆช่ฝ่ทๅ้ขๆ็ๅฏน่ฑก %s" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "ๅฏน่ฑก %s๏ผๅบไธบ็ฑปๅ %s๏ผๅดๆฏ %s" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "ๆ ๆณๅกซๅ %d ๅญ่" msgstr[1] "ๆ ๆณๅกซๅ %d ๅญ่" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "่ฟๆฉ็ๆไปถ็ปๆ็ฌฆ๏ผEOF๏ผ" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "่พๅ ฅไธ็่ฏป้่ฏฏ" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "็จๆไบ่ถ ่ฟๅฏ็จ็ๅญ่" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 msgid "pack too large for current definition of off_t" msgstr "ๅ ๅคชๅคง่ถ ่ฟไบๅฝๅ off_t ็ๅฎไน" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "ๅ ่ถ ่ฟไบๆๅคงๅ ่ฎธๅผ" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:342 builtin/repack.c:254 +#, c-format +msgid "unable to create '%s'" +msgstr "ไธ่ฝๅๅปบ '%s'" + +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "ๆ ๆณๆๅผๅ ๆไปถ '%s'" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "ๅ ็ญพๅไธๅน้ " -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "ไธๆฏๆๅ ็ๆฌ %<PRIu32>" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "ๅ ไธญๆ้่ฏฏ็ๅฏน่ฑกไฝไบๅ็งป้ %<PRIuMAX>๏ผ%s" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "่งฃๅ็ผฉ่ฟๅ %d" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "ๅ็งปๅผ่ฆ็ไบ delta ๅบๅๅฏน่ฑก" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "delta ๅบๅๅ็งป่ถ็" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "ๆช็ฅๅฏน่ฑก็ฑปๅ %d" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "ๆ ๆณ่ฏปๅๅ ๆไปถ" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "ๅ ๆไปถ่ฟๆฉ็ปๆ๏ผ็ผบๅฐ %<PRIuMAX> ๅญ่" msgstr[1] "ๅ ๆไปถ่ฟๆฉ็ปๆ๏ผ็ผบๅฐ %<PRIuMAX> ๅญ่" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "่งฃๅ็ผฉไธฅ้็ไธไธ่ด" -#: 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 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "ๅ็ฐ %s ๅบ็ฐ SHA1 ๅฒ็ช๏ผ" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "ไธ่ฝ่ฏป %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "ไธ่ฝ่ฏปๅ็ฐๅญๅฏน่ฑกไฟกๆฏ %s" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "ไธ่ฝ่ฏปๅ็ฐๅญๅฏน่ฑก %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "ๆ ๆ็ๆฐๆฎๅฏน่ฑก %s" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "ๅฏนๆๅ ๅฏน่ฑก fsck ๆฃๆฅๅบ้" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:870 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s ็ๆๆๅญๅฏน่ฑกๅนถ้้ฝๅฏ่พพ" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "ๅบ็จ delta ๅคฑ่ดฅ" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "ๆฅๆถๅฏน่ฑกไธญ" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "็ดขๅผๅฏน่ฑกไธญ" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "ๅ ๅฒ็ช๏ผSHA1 ไธๅน้ ๏ผ" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "ไธ่ฝๅฏนๅ ๆไปถ่ฐ็จ fstat" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "ๅ ็็ปๅฐพๆๅๅพๆฐๆฎ" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() ไธญ้ๅฐไธๅฏ็ๅป็้ฎ้ข" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "ๅค็ delta ไธญ" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "ไธ่ฝๅๅปบ็บฟ็จ๏ผ%s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "ไธๅฏ็ๅป" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1288 #, 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:1264 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "ๅฏน %s ็ๅฐพ้จๆ ก้ชๅบ็ฐๆๅค๏ผ็ฃ็ๆๅ๏ผ๏ผ" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1304 #, 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:1292 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "ไธ่ฝๅ็ผฉ้ๅ ๅฏน่ฑก๏ผ%d๏ผ" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "ๆฌๅฐๅฏน่ฑก %s ๅทฒๆๅ" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "ๅ ๆไปถๅ '%s' ๆฒกๆไปฅ '.pack' ็ปๅฐพ" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "ๆ ๆณๅๅ ฅ %s ๆไปถ '%s'" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "ๆ ๆณๅ ณ้ญๅทฒๅๅ ฅ็ %s ๆไปถ '%s'" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "ๅ ณ้ญๅ ๆไปถๆถๅบ้" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "ๆ ๆณๅญๅจๅ ๆไปถ" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "ๆ ๆณๅญๅจ็ดขๅผๆไปถ" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "ๅ็ pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "ๆ ๆณๆๅผ็ฐๅญๅ ๆไปถ '%s'" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1633 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "ๆ ๆณไธบ %s ๆๅผๅ ็ดขๅผๆไปถ" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1681 #, 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:1650 +#: builtin/index-pack.c:1688 #, 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:1689 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "ๆ ๆณ่ฟๅๅฝๅๅทฅไฝ็ฎๅฝ" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "้่ฏฏ้้กน %s" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "ๆช็ฅ็ๅๅธ็ฎๆณ '%s'" + +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ไธ่ฝๅ --stdin ๅๆถไฝฟ็จ" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" -msgstr "--stdin ้่ฆไธไธช git ไปๅบ" +msgstr "--stdin ้่ฆ git ไปๅบ" + +#: builtin/index-pack.c:1825 +msgid "--object-format cannot be used with --stdin" +msgstr "--object-format ไธ่ฝๅ --stdin ๅๆถไฝฟ็จ" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "--verify ๆฒกๆๆไพๅ ๆไปถๅๅๆฐ" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "ๅจๆๅ ๅฏน่ฑกไธญ fsck ๆฃๆฅๅบ้" -#: builtin/init-db.c:61 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "ไธ่ฝๅฏนๆจก็ '%s' ่ฐ็จ stat" -#: builtin/init-db.c:66 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "ไธ่ฝๆๅผ็ฎๅฝ '%s'" -#: builtin/init-db.c:78 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "ไธ่ฝ่ฏปๅ้พๆฅ '%s'" -#: builtin/init-db.c:80 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "ไธ่ฝ่ช '%s' ๅฐ '%s' ๅๅปบ็ฌฆๅท้พๆฅ" -#: builtin/init-db.c:86 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "ไธ่ฝๆท่ด '%s' ่ณ '%s'" -#: builtin/init-db.c:90 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "ๅฟฝ็ฅๆจก็ %s" -#: builtin/init-db.c:121 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "ๆฒกๆๅจ %s ไธญๆพๅฐๆจก็" -#: builtin/init-db.c:136 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "ๆฒกๆไป '%s' ๅคๅถๆจก็๏ผ%s" -#: builtin/init-db.c:334 +#: builtin/init-db.c:274 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "ๆ ๆ็ๅๅงๅๆฏๅ๏ผ'%s'" + +#: builtin/init-db.c:366 #, c-format msgid "unable to handle file type %d" msgstr "ไธ่ฝๅค็ %d ็ฑปๅ็ๆไปถ" -#: builtin/init-db.c:337 +#: builtin/init-db.c:369 #, c-format msgid "unable to move %s to %s" msgstr "ไธ่ฝ็งปๅจ %s ่ณ %s" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "ๅฐ่ฏ็จไธๅ็ๅๅธ็ฎๆณ้ๆฐๅๅงๅไปๅบ" + +#: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format msgid "%s already exists" msgstr "%s ๅทฒ็ปๅญๅจ" -#: builtin/init-db.c:413 +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init๏ผๅทฒๅฟฝ็ฅ --initial-branch=%s" + +#: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "้ๆฐๅๅงๅๅทฒๅญๅจ็ๅ ฑไบซ Git ไปๅบไบ %s%s\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "้ๆฐๅๅงๅๅทฒๅญๅจ็ Git ไปๅบไบ %s%s\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "ๅทฒๅๅงๅ็ฉบ็ๅ ฑไบซ Git ไปๅบไบ %s%s\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "ๅทฒๅๅงๅ็ฉบ็ Git ไปๅบไบ %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:529 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -14069,36 +15805,56 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<ๆจกๆฟ็ฎๅฝ>] [--shared[=<ๆ้>]] " "[<็ฎๅฝ>]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:555 msgid "permissions" msgstr "ๆ้" -#: builtin/init-db.c:492 +#: builtin/init-db.c:556 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 +#: builtin/init-db.c:562 +msgid "override the name of the initial branch" +msgstr "่ฆ็ๅๅงๅๆฏๅ็งฐ" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +msgid "hash" +msgstr "hash" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "ๆๅฎ่ฆไฝฟ็จ็ๅๅธ็ฎๆณ" + +#: builtin/init-db.c:571 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--separate-git-dir ๅ --bare ๆฏไบๆฅ็" + +#: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format msgid "cannot mkdir %s" msgstr "ไธ่ฝๅๅปบ็ฎๅฝ %s" -#: builtin/init-db.c:538 +#: builtin/init-db.c:609 builtin/init-db.c:664 #, c-format msgid "cannot chdir to %s" msgstr "ไธ่ฝๅๆข็ฎๅฝๅฐ %s" -#: builtin/init-db.c:559 +#: builtin/init-db.c:636 #, 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 +#: builtin/init-db.c:688 #, c-format msgid "Cannot access work tree '%s'" msgstr "ไธ่ฝ่ฎฟ้ฎๅทฅไฝๅบ '%s'" +#: builtin/init-db.c:693 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separate-git-dir ไธ่ฝ็จไบ็บฏไปๅบ" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -14163,121 +15919,126 @@ msgstr "--trailer ๅ --only-input ๅๆถไฝฟ็จๆฒกๆๆไน" msgid "no input file given for in-place editing" msgstr "ๆฒกๆ็ปๅบ่ฆๅไฝ็ผ่พ็ๆไปถ" -#: builtin/log.c:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<้้กน>] [<็ๆฌ่ๅด>] [[--] <่ทฏๅพ>...]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<้้กน>] <ๅฏน่ฑก>..." -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "ๆ ๆ็ --decorate ้้กน๏ผ%s" -#: builtin/log.c:173 +#: builtin/log.c:177 msgid "show source" msgstr "ๆพ็คบๆบ" -#: builtin/log.c:174 +#: builtin/log.c:178 msgid "Use mail map file" msgstr "ไฝฟ็จ้ฎไปถๆ ๅฐๆไปถ" -#: builtin/log.c:176 +#: builtin/log.c:181 msgid "only decorate refs that match <pattern>" msgstr "ๅชไฟฎ้ฅฐไธ <ๆจกๅผ> ๅน้ ็ๅผ็จ" -#: builtin/log.c:178 +#: builtin/log.c:183 msgid "do not decorate refs that match <pattern>" msgstr "ไธไฟฎ้ฅฐๅ <ๆจกๅผ> ๅน้ ็ๅผ็จ" -#: builtin/log.c:179 +#: builtin/log.c:184 msgid "decorate options" msgstr "ไฟฎ้ฅฐ้้กน" -#: builtin/log.c:182 +#: builtin/log.c:187 msgid "Process line range n,m in file, counting from 1" msgstr "ๅค็ๆไปถไธญ็ฌฌ n ๅฐ m ไน้ด็่ก๏ผไป 1 ๅผๅง" -#: builtin/log.c:280 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "ๆ็ป่พๅบ๏ผ%d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:555 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ๆๅ็ๆไปถ" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:570 builtin/log.c:665 #, c-format msgid "could not read object %s" msgstr "ไธ่ฝ่ฏปๅๅฏน่ฑก %s" -#: builtin/log.c:668 +#: builtin/log.c:690 #, c-format msgid "unknown type: %d" msgstr "ๆช็ฅ็ฑปๅ๏ผ%d" -#: builtin/log.c:791 +#: builtin/log.c:839 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%s๏ผไปๆ่ฟฐ็ๆ้ๅฝ็ๆจกๅผๆ ๆ" + +#: builtin/log.c:846 msgid "format.headers without value" msgstr "format.headers ๆฒกๆๅผ" -#: builtin/log.c:908 +#: builtin/log.c:965 msgid "name of output directory is too long" msgstr "่พๅบ็ฎๅฝๅๅคช้ฟ" -#: builtin/log.c:924 +#: builtin/log.c:981 #, c-format msgid "cannot open patch file %s" msgstr "ๆ ๆณๆๅผ่กฅไธๆไปถ %s" -#: builtin/log.c:941 +#: builtin/log.c:998 msgid "need exactly one range" msgstr "ๅช้่ฆไธไธช่ๅด" -#: builtin/log.c:951 +#: builtin/log.c:1008 msgid "not a range" msgstr "ไธๆฏไธไธช่ๅด" -#: builtin/log.c:1074 +#: builtin/log.c:1172 msgid "cover letter needs email format" msgstr "้ๅฝ้่ฆ้ฎไปถๅฐๅๆ ผๅผ" -#: builtin/log.c:1080 +#: builtin/log.c:1178 msgid "failed to create cover-letter file" msgstr "ๆ ๆณๅๅปบ้ๅฝๆไปถ" -#: builtin/log.c:1159 +#: builtin/log.c:1259 #, c-format msgid "insane in-reply-to: %s" msgstr "ไธๆญฃๅธธ็ in-reply-to๏ผ%s" -#: builtin/log.c:1186 +#: builtin/log.c:1286 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<้้กน>] [<ไป> | <็ๆฌ่ๅด>]" -#: builtin/log.c:1244 +#: builtin/log.c:1344 msgid "two output directories?" msgstr "ไธคไธช่พๅบ็ฎๅฝ๏ผ" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 #, c-format msgid "unknown commit %s" msgstr "ๆช็ฅๆไบค %s" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1506 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:1370 +#: builtin/log.c:1515 msgid "could not find exact merge base" msgstr "ไธ่ฝๆพๅฐๅ็กฎ็ๅๅนถๅบ็บฟ" -#: builtin/log.c:1374 +#: builtin/log.c:1525 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" @@ -14287,373 +16048,386 @@ msgstr "" "git branch --set-upstream-to ๆฅ่ท่ธชไธไธช่ฟ็จๅๆฏใๆ่ ไฝ ๅฏไปฅ้่ฟ\n" "ๅๆฐ --base=<ๅบ็บฟๆไบค> ๆๅจๆๅฎไธไธชๅบ็บฟๆไบค" -#: builtin/log.c:1394 +#: builtin/log.c:1548 msgid "failed to find exact merge base" msgstr "ๆ ๆณๆพๅฐๅ็กฎ็ๅๅนถๅบ็บฟ" -#: builtin/log.c:1405 +#: builtin/log.c:1565 msgid "base commit should be the ancestor of revision list" msgstr "ๅบ็บฟๆไบคๅบ่ฏฅๆฏ็ๆฌๅ่กจ็็ฅๅ " -#: builtin/log.c:1409 +#: builtin/log.c:1575 msgid "base commit shouldn't be in revision list" msgstr "ๅบ็บฟๆไบคไธๅบ่ฏฅๅบ็ฐๅจ็ๆฌๅ่กจไธญ" -#: builtin/log.c:1462 +#: builtin/log.c:1633 msgid "cannot get patch id" msgstr "ๆ ๆณๅพๅฐ่กฅไธ id" -#: builtin/log.c:1514 -msgid "failed to infer range-diff ranges" -msgstr "ๆ ๆณๆจๆญ range-diff ่ๅด" +#: builtin/log.c:1690 +msgid "failed to infer range-diff origin of current series" +msgstr "ๆ ๆณๆจๆญๅฝๅ็ณปๅ็ range-diff ่ตทๅง" -#: builtin/log.c:1559 +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "ไฝฟ็จ '%s' ไฝไธบๅฝๅ็ณปๅ็ range-diff ๆบ" + +#: builtin/log.c:1736 msgid "use [PATCH n/m] even with a single patch" msgstr "ไฝฟ็จ [PATCH n/m]๏ผๅณไฝฟๅชๆไธไธช่กฅไธ" -#: builtin/log.c:1562 +#: builtin/log.c:1739 msgid "use [PATCH] even with multiple patches" msgstr "ไฝฟ็จ [PATCH]๏ผๅณไฝฟๆๅคไธช่กฅไธ" -#: builtin/log.c:1566 +#: builtin/log.c:1743 msgid "print patches to standard out" msgstr "ๆๅฐ่กฅไธๅฐๆ ๅ่พๅบ" -#: builtin/log.c:1568 +#: builtin/log.c:1745 msgid "generate a cover letter" msgstr "็ๆไธๅฐ้ๅฝ" -#: builtin/log.c:1570 +#: builtin/log.c:1747 msgid "use simple number sequence for output file names" msgstr "ไฝฟ็จ็ฎๅ็ๆฐๅญๅบๅไฝไธบ่พๅบๆไปถๅ" -#: builtin/log.c:1571 +#: builtin/log.c:1748 msgid "sfx" msgstr "ๅ็ผ" -#: builtin/log.c:1572 +#: builtin/log.c:1749 msgid "use <sfx> instead of '.patch'" msgstr "ไฝฟ็จ <ๅ็ผ> ไปฃๆฟ '.patch'" -#: builtin/log.c:1574 +#: builtin/log.c:1751 msgid "start numbering patches at <n> instead of 1" msgstr "่กฅไธไปฅ <n> ๅผๅง็ผๅท๏ผ่ไธๆฏ1" -#: builtin/log.c:1576 +#: builtin/log.c:1753 msgid "mark the series as Nth re-roll" msgstr "ๆ ่ฎฐ่กฅไธ็ณปๅๆฏ็ฌฌๅ ๆฌก้ๅถ" -#: builtin/log.c:1578 +#: builtin/log.c:1755 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "ไฝฟ็จ [RFC PATCH] ไปฃๆฟ [PATCH]" -#: builtin/log.c:1581 +#: builtin/log.c:1758 +msgid "cover-from-description-mode" +msgstr "ไปๅๆฏๆ่ฟฐ่ทๅ้ๅฝ็ๆจกๅผ" + +#: builtin/log.c:1759 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "ๅบไบไธไธชๅๆฏๆ่ฟฐ็ๆ้จๅ้ๅฝ" + +#: builtin/log.c:1761 msgid "Use [<prefix>] instead of [PATCH]" msgstr "ไฝฟ็จ [<ๅ็ผ>] ไปฃๆฟ [PATCH]" -#: builtin/log.c:1584 +#: builtin/log.c:1764 msgid "store resulting files in <dir>" msgstr "ๆ็ปๆๆไปถๅญๅจๅจ <็ฎๅฝ>" -#: builtin/log.c:1587 +#: builtin/log.c:1767 msgid "don't strip/add [PATCH]" msgstr "ไธๅ ้ค/ๆทปๅ [PATCH]" -#: builtin/log.c:1590 +#: builtin/log.c:1770 msgid "don't output binary diffs" msgstr "ไธ่พๅบไบ่ฟๅถๅทฎๅผ" -#: builtin/log.c:1592 +#: builtin/log.c:1772 msgid "output all-zero hash in From header" msgstr "ๅจ From ๅคดไฟกๆฏไธญ่พๅบๅ จไธบ้ถ็ๅๅธๅผ" -#: builtin/log.c:1594 +#: builtin/log.c:1774 msgid "don't include a patch matching a commit upstream" msgstr "ไธๅ ๅซๅทฒๅจไธๆธธๆไบคไธญ็่กฅไธ" -#: builtin/log.c:1596 +#: builtin/log.c:1776 msgid "show patch format instead of default (patch + stat)" msgstr "ๆพ็คบ็บฏ่กฅไธๆ ผๅผ่้้ป่ฎค็๏ผ่กฅไธ+็ถๆ๏ผ" -#: builtin/log.c:1598 +#: builtin/log.c:1778 msgid "Messaging" msgstr "้ฎไปถๅ้" -#: builtin/log.c:1599 +#: builtin/log.c:1779 msgid "header" msgstr "header" -#: builtin/log.c:1600 +#: builtin/log.c:1780 msgid "add email header" msgstr "ๆทปๅ ้ฎไปถๅคด" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1781 builtin/log.c:1782 msgid "email" msgstr "้ฎไปถๅฐๅ" -#: builtin/log.c:1601 +#: builtin/log.c:1781 msgid "add To: header" msgstr "ๆทปๅ ๆถไปถไบบ" -#: builtin/log.c:1603 +#: builtin/log.c:1782 msgid "add Cc: header" msgstr "ๆทปๅ ๆ้" -#: builtin/log.c:1605 +#: builtin/log.c:1783 msgid "ident" msgstr "ๆ ่ฏ" -#: builtin/log.c:1606 +#: builtin/log.c:1784 msgid "set From address to <ident> (or committer ident if absent)" msgstr "ๅฐ From ๅฐๅ่ฎพ็ฝฎไธบ <ๆ ่ฏ>๏ผๅฆ่ฅไธๆไพ๏ผๅ็จๆไบค่ ID ๅไธบๅฐๅ๏ผ" -#: builtin/log.c:1608 +#: builtin/log.c:1786 msgid "message-id" msgstr "้ฎไปถๆ ่ฏ" -#: builtin/log.c:1609 +#: builtin/log.c:1787 msgid "make first mail a reply to <message-id>" msgstr "ไฝฟ็ฌฌไธๅฐ้ฎไปถไฝไธบๅฏน <้ฎไปถๆ ่ฏ> ็ๅๅค" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1788 builtin/log.c:1791 msgid "boundary" msgstr "่พน็" -#: builtin/log.c:1611 +#: builtin/log.c:1789 msgid "attach the patch" msgstr "้ไปถๆนๅผๆทปๅ ่กฅไธ" -#: builtin/log.c:1614 +#: builtin/log.c:1792 msgid "inline the patch" msgstr "ๅ ่ๆพ็คบ่กฅไธ" -#: builtin/log.c:1618 +#: builtin/log.c:1796 msgid "enable message threading, styles: shallow, deep" msgstr "ๅฏ็จ้ฎไปถ็บฟ็ดข๏ผ้ฃๆ ผ๏ผๆต ๏ผๆทฑ" -#: builtin/log.c:1620 +#: builtin/log.c:1798 msgid "signature" msgstr "็ญพๅ" -#: builtin/log.c:1621 +#: builtin/log.c:1799 msgid "add a signature" msgstr "ๆทปๅ ไธไธช็ญพๅ" -#: builtin/log.c:1622 +#: builtin/log.c:1800 msgid "base-commit" msgstr "ๅบ็บฟๆไบค" -#: builtin/log.c:1623 +#: builtin/log.c:1801 msgid "add prerequisite tree info to the patch series" msgstr "ไธบ่กฅไธๅ่กจๆทปๅ ๅ็ฝฎๆ ไฟกๆฏ" -#: builtin/log.c:1625 +#: builtin/log.c:1804 msgid "add a signature from a file" msgstr "ไปๆไปถๆทปๅ ไธไธช็ญพๅ" -#: builtin/log.c:1626 +#: builtin/log.c:1805 msgid "don't print the patch filenames" msgstr "ไธ่ฆๆๅฐ่กฅไธๆไปถๅ" -#: builtin/log.c:1628 +#: builtin/log.c:1807 msgid "show progress while generating patches" msgstr "ๅจ็ๆ่กฅไธๆถๆพ็คบ่ฟๅบฆ" -#: builtin/log.c:1630 +#: builtin/log.c:1809 msgid "show changes against <rev> in cover letter or single patch" msgstr "ๅจ้ๅฝๆๅไธช่กฅไธไธญๆพ็คบๅ <rev> ็ๅทฎๅผ" -#: builtin/log.c:1633 +#: builtin/log.c:1812 msgid "show changes against <refspec> in cover letter or single patch" msgstr "ๅจ้ๅฝๆๅไธช่กฅไธไธญๆพ็คบๅ <refspec> ็ๅทฎๅผ" -#: builtin/log.c:1635 +#: builtin/log.c:1814 msgid "percentage by which creation is weighted" msgstr "ๅๅปบๆ้็็พๅๆฏ" -#: builtin/log.c:1710 +#: builtin/log.c:1896 #, c-format msgid "invalid ident line: %s" msgstr "ๅ ๅซๆ ๆ็่บซไปฝๆ ่ฏ๏ผ%s" -#: builtin/log.c:1725 +#: builtin/log.c:1911 msgid "-n and -k are mutually exclusive" msgstr "-n ๅ -k ไบๆฅ" -#: builtin/log.c:1727 +#: builtin/log.c:1913 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc ๅ -k ไบๆฅ" -#: builtin/log.c:1735 +#: builtin/log.c:1921 msgid "--name-only does not make sense" msgstr "--name-only ๆ ๆไน" -#: builtin/log.c:1737 +#: builtin/log.c:1923 msgid "--name-status does not make sense" msgstr "--name-status ๆ ๆไน" -#: builtin/log.c:1739 +#: builtin/log.c:1925 msgid "--check does not make sense" msgstr "--check ๆ ๆไน" -#: builtin/log.c:1771 +#: builtin/log.c:1958 msgid "standard output, or directory, which one?" msgstr "ๆ ๅ่พๅบๆ็ฎๅฝ๏ผๅชไธไธช๏ผ" -#: builtin/log.c:1860 +#: builtin/log.c:2062 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff ้่ฆ --cover-letter ๆๅไธ่กฅไธ" -#: builtin/log.c:1864 +#: builtin/log.c:2066 msgid "Interdiff:" msgstr "็ๆฌ้ดๅทฎๅผ๏ผ" -#: builtin/log.c:1865 +#: builtin/log.c:2067 #, c-format msgid "Interdiff against v%d:" msgstr "ๅฏน v%d ็็ๆฌๅทฎๅผ๏ผ" -#: builtin/log.c:1871 +#: builtin/log.c:2073 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor ้่ฆ --range-diff" -#: builtin/log.c:1875 +#: builtin/log.c:2077 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff ้่ฆ --cover-letter ๆๅไธ่กฅไธ" -#: builtin/log.c:1883 +#: builtin/log.c:2085 msgid "Range-diff:" msgstr "่ๅดๅทฎๅผ๏ผ" -#: builtin/log.c:1884 +#: builtin/log.c:2086 #, c-format msgid "Range-diff against v%d:" msgstr "ๅฏน v%d ็่ๅดๅทฎๅผ๏ผ" -#: builtin/log.c:1895 +#: builtin/log.c:2097 #, c-format msgid "unable to read signature file '%s'" msgstr "ๆ ๆณ่ฏปๅ็ญพๅๆไปถ '%s'" -#: builtin/log.c:1931 +#: builtin/log.c:2133 msgid "Generating patches" msgstr "็ๆ่กฅไธ" -#: builtin/log.c:1975 +#: builtin/log.c:2177 msgid "failed to create output files" msgstr "ๆ ๆณๅๅปบ่พๅบๆไปถ" -#: builtin/log.c:2034 +#: builtin/log.c:2236 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<ไธๆธธ> [<ๅคด> [<้ๅถ>]]]" -#: builtin/log.c:2088 +#: builtin/log.c:2290 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "ไธ่ฝๆพๅฐ่ท่ธช็่ฟ็จๅๆฏ๏ผ่ฏทๆๅทฅๆๅฎ <ไธๆธธ>ใ\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<้้กน>] [<ๆไปถ>...]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "็จๆ ็ญพๆ ่ฏๆไปถ็็ถๆ" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "ไฝฟ็จๅฐๅๅญๆฏ่กจ็คบ 'ๅ่ฎพๆชๆนๅ็' ๆไปถ" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "ไฝฟ็จๅฐๅๅญๆฏ่กจ็คบ 'fsmonitor clean' ๆไปถ" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "ๆพ็คบ็ผๅญ็ๆไปถ๏ผ้ป่ฎค๏ผ" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "ๆพ็คบๅทฒๅ ้ค็ๆไปถ" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "ๆพ็คบๅทฒไฟฎๆน็ๆไปถ" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "ๆพ็คบๅ ถๅฎๆไปถ" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "ๆพ็คบๅฟฝ็ฅ็ๆไปถ" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "ๆพ็คบๆๅญๅบๅ ๅฎน็ๅฏน่ฑกๅ็งฐ" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "ๆพ็คบๆไปถ็ณป็ป้่ฆๅ ้ค็ๆไปถ" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "ๅชๆพ็คบโๅ ถไปโ็ฎๅฝ็ๅ็งฐ" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "ๆพ็คบๆไปถๆข่ก็ฌฆๆ ผๅผ" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "ไธๆพ็คบ็ฉบ็ฎๅฝ" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "ๆพ็คบๆชๅๅนถ็ๆไปถ" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "ๆพ็คบ resolve-undo ไฟกๆฏ" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" -msgstr "ๅน้ ๆ้คๆไปถ็ๆจกๅผ" +msgstr "่ทณ่ฟๅๆจกๅผๅน้ ็ๆไปถ" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "ไป <ๆไปถ> ไธญ่ฏปๅๆ้คๆจกๅผ" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "ไป <ๆไปถ> ่ฏปๅ้ขๅค็ๆฏไธช็ฎๅฝ็ๆ้คๆจกๅผ" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "ๆทปๅ ๆ ๅ็ git ๆ้ค" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "ๆพ็คบ็ธๅฏนไบ้กถ็บง็ฎๅฝ็ๆไปถๅ" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "ๅจๅญๆจก็ปไธญ้ๅฝ" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "ๅฆๆไปปไฝ <ๆไปถ> ้ฝไธๅจ็ดขๅผๅบ๏ผ่งไธบ้่ฏฏ" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" -msgstr "ๆ ๆๆไบค" +msgstr "ๆ ๅฏน่ฑก" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" -msgstr "ๅ่ฃ ่ชไป <ๆ ๆๆไบค> ไนๅๅ ้ค็่ทฏๅพไป็ถๅญๅจ" +msgstr "ๅ่ฃ ่ชไป <ๆ ๅฏน่ฑก> ไนๅๅ ้ค็่ทฏๅพไป็ถๅญๅจ" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "ๆพ็คบ่ฐ่ฏๆฐๆฎ" @@ -14671,7 +16445,7 @@ msgstr "" msgid "do not print remote URL" msgstr "ไธๆๅฐ่ฟ็จ URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 msgid "exec" msgstr "exec" @@ -14705,7 +16479,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" @@ -14744,191 +16518,302 @@ msgstr "ๅๅบๆดไธชๆ ๏ผไธไป ไป ๅฝๅ็ฎๅฝ๏ผ้ๅซ --full-name๏ผ" msgid "empty mbox: '%s'" msgstr "็ฉบ็ mbox๏ผ'%s'" -#: builtin/merge.c:55 +#: 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:143 +msgid "output all common ancestors" +msgstr "่พๅบๆๆๅ ฑๅ็็ฅๅ " + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "ๆฅๆพไธไธชๅค่ทฏๅๅนถ็็ฅๅ ๆไบค" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "ๆพ็คบไธ่ฝ่ขซๅ ถไป่ฎฟ้ฎๅฐ็็ๆฌ" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "็ฌฌไธไธชๆฏๅ ถไป็็ฅๅ ๆไบคไน๏ผ" + +#: builtin/merge-base.c:151 +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ใ" +msgstr[1] "ๆ ๆณๅค็ %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/merge.c:56 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<้้กน>] [<ๆไบค>...]" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:120 msgid "switch `m' requires a value" msgstr "ๅผๅ ณ `m' ้่ฆไธไธชๅผ" -#: builtin/merge.c:141 +#: builtin/merge.c:143 #, c-format msgid "option `%s' requires a value" msgstr "้้กน `%s' ้่ฆไธไธชๅผ" -#: builtin/merge.c:187 +#: builtin/merge.c:189 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "ไธ่ฝๆพๅฐๅๅนถ็ญ็ฅ '%s'ใ\n" -#: builtin/merge.c:188 +#: builtin/merge.c:190 #, c-format msgid "Available strategies are:" msgstr "ๅฏ็จ็็ญ็ฅๆ๏ผ" -#: builtin/merge.c:193 +#: builtin/merge.c:195 #, c-format msgid "Available custom strategies are:" msgstr "ๅฏ็จ็่ชๅฎไน็ญ็ฅๆ๏ผ" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:246 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "ๅจๅๅนถ็ๆๅไธๆพ็คบๅทฎๅผ็ป่ฎก" -#: builtin/merge.c:247 builtin/pull.c:154 +#: builtin/merge.c:249 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "ๅจๅๅนถ็ๆๅๆพ็คบๅทฎๅผ็ป่ฎก" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:250 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "๏ผๅ --stat ๅไน๏ผ" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:252 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "ๅจๅๅนถๆไบคไฟกๆฏไธญๆทปๅ ๏ผๆๅค <n> ๆก๏ผ็ฒพ็ฎๆไบค่ฎฐๅฝ" -#: builtin/merge.c:253 builtin/pull.c:166 +#: builtin/merge.c:255 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "ๅๅปบไธไธชๅ็ฌ็ๆไบค่ไธๆฏๅไธๆฌกๅๅนถ" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:257 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "ๅฆๆๅๅนถๆๅ๏ผๆง่กไธๆฌกๆไบค๏ผ้ป่ฎค๏ผ" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:259 builtin/pull.c:154 msgid "edit message before committing" msgstr "ๅจๆไบคๅ็ผ่พๆไบค่ฏดๆ" -#: builtin/merge.c:259 +#: builtin/merge.c:261 msgid "allow fast-forward (default)" msgstr "ๅ ่ฎธๅฟซ่ฟ๏ผ้ป่ฎค๏ผ" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:263 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "ๅฆๆไธ่ฝๅฟซ่ฟๅฐฑๆพๅผๅๅนถ" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:267 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "้ช่ฏๆๅฎ็ๆไบคๆฏๅฆๅ ๅซไธไธชๆๆ็ GPG ็ญพๅ" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 msgid "strategy" msgstr "็ญ็ฅ" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:269 builtin/pull.c:169 msgid "merge strategy to use" msgstr "่ฆไฝฟ็จ็ๅๅนถ็ญ็ฅ" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "ๆ้็ๅๅนถ็ญ็ฅ็้้กน" -#: builtin/merge.c:271 +#: builtin/merge.c:273 msgid "merge commit message (for a non-fast-forward merge)" msgstr "ๅๅนถ็ๆไบค่ฏดๆ๏ผ้ๅฏน้ๅฟซ่ฟๅผๅๅนถ๏ผ" -#: builtin/merge.c:278 +#: builtin/merge.c:280 msgid "abort the current in-progress merge" msgstr "ๆพๅผๅฝๅๆญฃๅจ่ฟ่ก็ๅๅนถ" # -#: builtin/merge.c:280 +#: builtin/merge.c:282 msgid "--abort but leave index and working tree alone" msgstr "--abort๏ผไฝๆฏไฟ็็ดขๅผๅๅทฅไฝๅบ" -#: builtin/merge.c:282 +#: builtin/merge.c:284 msgid "continue the current in-progress merge" msgstr "็ปง็ปญๅฝๅๆญฃๅจ่ฟ่ก็ๅๅนถ" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:286 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "ๅ ่ฎธๅๅนถไธ็ธๅ ณ็ๅๅฒ" -#: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "ๆ ก้ช commit-msg ้ฉๅญ" +#: builtin/merge.c:293 +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "็ป่ฟ pre-merge-commit ๅ commit-msg ้ฉๅญ" -#: builtin/merge.c:307 +#: builtin/merge.c:310 msgid "could not run stash." msgstr "ไธ่ฝ่ฟ่ก่ดฎ่ใ" -#: builtin/merge.c:312 +#: builtin/merge.c:315 msgid "stash failed" msgstr "่ดฎ่ๅคฑ่ดฅ" -#: builtin/merge.c:317 +#: builtin/merge.c:320 #, c-format msgid "not a valid object: %s" msgstr "ไธๆฏไธไธชๆๆๅฏน่ฑก๏ผ%s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:342 builtin/merge.c:359 msgid "read-tree failed" msgstr "่ฏปๅๆ ๅคฑ่ดฅ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: builtin/merge.c:386 +#: builtin/merge.c:389 msgid " (nothing to squash)" msgstr " ๏ผๆ ๅฏๅ็ผฉ๏ผ" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "ๅ็ผฉๆไบค -- ๆชๆดๆฐ HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:450 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "ๆ ๅๅนถไฟกๆฏ -- ๆชๆดๆฐ HEAD\n" -#: builtin/merge.c:498 +#: builtin/merge.c:501 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ๆฒกๆๆๅไธไธชๆไบค" -#: builtin/merge.c:585 +#: builtin/merge.c:588 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "ๅ็ branch.%s.mergeoptions ๅญ็ฌฆไธฒ๏ผ%s" -#: builtin/merge.c:708 +#: builtin/merge.c:713 msgid "Not handling anything other than two heads merge." msgstr "ๆชๅค็ไธคไธชๅคดๅๅนถไนๅค็ไปปไฝๆไฝใ" -#: builtin/merge.c:722 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive ็ๆช็ฅ้้กน๏ผ-X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "ไธ่ฝๅ %s" -#: builtin/merge.c:789 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "ไธ่ฝไป '%s' ่ฏปๅ" -#: builtin/merge.c:798 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "ๆชๆไบคๅๅนถ๏ผไฝฟ็จ 'git commit' ๅฎๆๆญคๆฌกๅๅนถใ\n" -#: builtin/merge.c:804 +#: builtin/merge.c:808 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" @@ -14938,83 +16823,83 @@ msgstr "" "ๅๅนถๅฐไธป้ขๅๆฏใ\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:813 msgid "An empty message aborts the commit.\n" msgstr "็ฉบ็ๆไบค่ฏดๆไผ็ปๆญขๆไบคใ\n" -#: builtin/merge.c:812 +#: builtin/merge.c:816 #, 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:853 +#: builtin/merge.c:869 msgid "Empty commit message." msgstr "็ฉบๆไบคไฟกๆฏใ" -#: builtin/merge.c:872 +#: builtin/merge.c:884 #, c-format msgid "Wonderful.\n" msgstr "ๅคชๆฃไบใ\n" -#: builtin/merge.c:933 +#: builtin/merge.c:945 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "่ชๅจๅๅนถๅคฑ่ดฅ๏ผไฟฎๆญฃๅฒ็ช็ถๅๆไบคไฟฎๆญฃ็็ปๆใ\n" -#: builtin/merge.c:972 +#: builtin/merge.c:984 msgid "No current branch." msgstr "ๆฒกๆๅฝๅๅๆฏใ" -#: builtin/merge.c:974 +#: builtin/merge.c:986 msgid "No remote for the current branch." msgstr "ๅฝๅๅๆฏๆฒกๆๅฏนๅบ็่ฟ็จไปๅบใ" -#: builtin/merge.c:976 +#: builtin/merge.c:988 msgid "No default upstream defined for the current branch." msgstr "ๅฝๅๅๆฏๆฒกๆๅฎไน้ป่ฎค็ไธๆธธๅๆฏใ" -#: builtin/merge.c:981 +#: builtin/merge.c:993 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "ๅฏนไบ %s ๆฒกๆๆฅ่ช %s ็่ฟ็จ่ท่ธชๅๆฏ" -#: builtin/merge.c:1038 +#: builtin/merge.c:1050 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "็ฏๅข '%2$s' ไธญๅญๅจๅ็ๅๅผ '%1$s'" -#: builtin/merge.c:1141 +#: builtin/merge.c:1153 #, c-format msgid "not something we can merge in %s: %s" msgstr "ไธ่ฝๅจ %s ไธญๅๅนถ๏ผ%s" -#: builtin/merge.c:1175 +#: builtin/merge.c:1187 msgid "not something we can merge" msgstr "ไธ่ฝๅๅนถ" -#: builtin/merge.c:1278 +#: builtin/merge.c:1291 msgid "--abort expects no arguments" msgstr "--abort ไธๅธฆๅๆฐ" -#: builtin/merge.c:1282 +#: builtin/merge.c:1295 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "ๆฒกๆ่ฆ็ปๆญข็ๅๅนถ๏ผMERGE_HEAD ไธขๅคฑ๏ผใ" -#: builtin/merge.c:1291 +#: builtin/merge.c:1313 msgid "--quit expects no arguments" msgstr "--quit ไธๅธฆๅๆฐ" -#: builtin/merge.c:1304 +#: builtin/merge.c:1326 msgid "--continue expects no arguments" msgstr "--continue ไธๅธฆๅๆฐ" -#: builtin/merge.c:1308 +#: builtin/merge.c:1330 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "ๆฒกๆ่ฟ่กไธญ็ๅๅนถ๏ผMERGE_HEAD ไธขๅคฑ๏ผใ" -#: builtin/merge.c:1324 +#: builtin/merge.c:1346 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15022,7 +16907,7 @@ msgstr "" "ๆจๅฐๆช็ปๆๆจ็ๅๅนถ๏ผๅญๅจ MERGE_HEAD๏ผใ\n" "่ฏทๅจๅๅนถๅๅ ๆไบคๆจ็ไฟฎๆนใ" -#: builtin/merge.c:1331 +#: builtin/merge.c:1353 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15030,211 +16915,100 @@ msgstr "" "ๆจๅฐๆช็ปๆๆจ็ๆฃ้๏ผๅญๅจ CHERRY_PICK_HEAD๏ผใ\n" "่ฏทๅจๅๅนถๅๅ ๆไบคๆจ็ไฟฎๆนใ" -#: builtin/merge.c:1334 +#: builtin/merge.c:1356 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "ๆจๅฐๆช็ปๆๆจ็ๆฃ้๏ผๅญๅจ CHERRY_PICK_HEAD๏ผใ" -#: builtin/merge.c:1348 +#: builtin/merge.c:1370 msgid "You cannot combine --squash with --no-ff." msgstr "ๆจไธ่ฝๅฐ --squash ๅ --no-ff ็ปๅไฝฟ็จใ" -#: builtin/merge.c:1350 +#: builtin/merge.c:1372 msgid "You cannot combine --squash with --commit." msgstr "ๆจไธ่ฝๅฐ --squash ๅ --commit ็ปๅไฝฟ็จใ" -#: builtin/merge.c:1366 +#: builtin/merge.c:1388 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "ๆชๆๅฎๆไบคๅนถไธ merge.defaultToUpstream ๆช่ฎพ็ฝฎใ" -#: builtin/merge.c:1383 +#: builtin/merge.c:1405 msgid "Squash commit into empty head not supported yet" msgstr "ๅฐไธๆฏๆๅฐ็ฉบๅๆฏ็ๅ็ผฉๆไบค" -#: builtin/merge.c:1385 +#: builtin/merge.c:1407 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "ๅฐ็ฉบๅๆฏ็้ๅฟซ่ฟๅผๆไบคๆฒกๆๆไน" -#: builtin/merge.c:1390 +#: builtin/merge.c:1412 #, c-format msgid "%s - not something we can merge" msgstr "%s - ไธ่ฝ่ขซๅๅนถ" -#: builtin/merge.c:1392 +#: builtin/merge.c:1414 msgid "Can merge only exactly one commit into empty head" msgstr "ๅช่ฝๅฐไธไธชๆไบคๅๅนถๅฐ็ฉบๅๆฏไธ" -#: builtin/merge.c:1471 +#: builtin/merge.c:1495 msgid "refusing to merge unrelated histories" msgstr "ๆ็ปๅๅนถๆ ๅ ณ็ๅๅฒ" -#: builtin/merge.c:1480 +#: builtin/merge.c:1504 msgid "Already up to date." msgstr "ๅทฒ็ปๆฏๆๆฐ็ใ" -#: builtin/merge.c:1490 +#: builtin/merge.c:1514 #, c-format msgid "Updating %s..%s\n" msgstr "ๆดๆฐ %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1560 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "ๅฐ่ฏ้ๅธธๅฐ็็ดขๅผๅ ๅๅนถ...\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1567 #, c-format msgid "Nope.\n" msgstr "ๆ ใ\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1592 msgid "Already up to date. Yeeah!" msgstr "ๅทฒ็ปๆฏๆๆฐ็ใ่ถ๏ผ" -#: builtin/merge.c:1570 +#: builtin/merge.c:1598 msgid "Not possible to fast-forward, aborting." msgstr "ๆ ๆณๅฟซ่ฟ๏ผ็ปๆญขใ" -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1626 builtin/merge.c:1691 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "ๅฐๆ ๅๆป่ณๅๅง็ถๆ...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1630 #, c-format msgid "Trying merge strategy %s...\n" msgstr "ๅฐ่ฏๅๅนถ็ญ็ฅ %s...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1682 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "ๆฒกๆๅๅนถ็ญ็ฅๅค็ๆญคๅๅนถใ\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1684 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "ไฝฟ็จ็ญ็ฅ %s ๅๅนถๅคฑ่ดฅใ\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1693 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "ไฝฟ็จ %s ไปฅๅๅคๆๅทฅ่งฃๅณใ\n" -#: builtin/merge.c:1672 +#: builtin/merge.c:1707 #, 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:46 -#, c-format -msgid "unknown option %s" -msgstr "ๆช็ฅ้้กน %s" - -#: builtin/merge-recursive.c:52 -#, c-format -msgid "could not parse object '%s'" -msgstr "ไธ่ฝ่งฃๆๅฏน่ฑก '%s'" - -#: 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:64 -msgid "not handling anything other than two heads merge." -msgstr "ไธ่ฝๅค็ไธคไธชๅคดๅๅนถไนๅค็ไปปไฝๆไฝใ" - -#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 -#, c-format -msgid "could not resolve ref '%s'" -msgstr "ๆ ๆณ่งฃๆๅผ็จ '%s'" - -#: builtin/merge-recursive.c:78 -#, 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]" @@ -15253,31 +17027,31 @@ msgstr "ๅ ่ฎธๅๅปบไธไธชไปฅไธ็ๆ " #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -"git multi-pack-index [--object-dir=<็ฎๅฝ>] (write|verify|expire|repack --" -"batch-size=<ๅคงๅฐ>)" +"git multi-pack-index [<้้กน>] (write|verify|expire|repack --batch-size=<ๅคงๅฐ" +">)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" msgstr "ๅ ๅซๆๅฏนๅ ๆไปถๅๅ ็ดขๅผ็ๅฏน่ฑก็ฎๅฝ" -#: builtin/multi-pack-index.c:25 +#: 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:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "ๅคชๅคๅๆฐ" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 msgid "--batch-size option is only for 'repack' subcommand" msgstr "--batch-size ้้กนไป ็จไบ 'repack' ๅญๅฝไปค" -#: builtin/multi-pack-index.c:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "ๆช่ฏๅซ็ๅญๅฝไปค๏ผ%s" @@ -15308,113 +17082,117 @@ msgstr "ๅผบๅถ็งปๅจ/้ๅฝไปค๏ผๅณไฝฟ็ฎๆ ๅญๅจ" msgid "skip move/rename errors" msgstr "่ทณ่ฟ็งปๅจ/้ๅฝๅ้่ฏฏ" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "็ฎๆ '%s' ไธๆฏไธไธช็ฎๅฝ" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "ๆฃๆฅ '%s' ๅฐ '%s' ็้ๅฝๅ\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "ๅ็ๆบ" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "ไธ่ฝๅฐ็ฎๅฝ็งปๅจๅฐ่ช่บซ" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "ไธ่ฝๅฐ็ฎๅฝ็งปๅจๅฐๆไปถ" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "ๆบ็ฎๅฝไธบ็ฉบ" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "ไธๅจ็ๆฌๆงๅถไนไธ" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "ๅฒ็ช" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "็ฎๆ ๅทฒๅญๅจ" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "่ฆ็ '%s'" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "ไธ่ฝ่ฆ็" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "ๅไธ็ฎๆ ๅ ทๆๅคไธชๆบ" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "็ฎๆ ็ฎๅฝไธๅญๅจ" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s๏ผๆบ=%s๏ผ็ฎๆ =%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "้ๅฝๅ %s ่ณ %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "้ๅฝๅ '%s' ๅคฑ่ดฅ" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<้้กน>] <ๆไบค>..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<้้กน>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<้้กน>] --stdin" -#: builtin/name-rev.c:411 -msgid "print only names (no SHA-1)" -msgstr "ๅชๆๅฐๅ็งฐ๏ผๆ SHA-1๏ผ" +#: builtin/name-rev.c:524 +msgid "print only ref-based names (no object names)" +msgstr "ๅชๆๅฐๅบไบๅผ็จ็ๅ็งฐ๏ผ้ๅฏน่ฑกๅ๏ผ" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "ๅชไฝฟ็จๆ ็ญพๆฅๅฝๅๆไบค" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "ๅชไฝฟ็จๅ <ๆจกๅผ> ็ธๅน้ ็ๅผ็จ" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ๅฟฝ็ฅๅ <ๆจกๅผ> ็ธๅน้ ็ๅผ็จ" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "ๅๅบๅฏไปฅไปๆๆๅผ็จ่ฎฟ้ฎ็ๆไบค" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "ไปๆ ๅ่พๅ ฅ่ฏปๅ" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "ๅ ่ฎธๆๅฐ `ๆชๅฎไน` ็ๅ็งฐ๏ผ้ป่ฎค๏ผ" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "ๅๅ่งฃๆ่พๅ ฅไธญ็ๆ ็ญพ๏ผๅ ้จไฝฟ็จ๏ผ" @@ -15558,7 +17336,7 @@ msgstr "ไธ่ฝๅๆณจ่งฃๅฏน่ฑก" msgid "the note contents have been left in %s" msgstr "ๆณจ่งฃๅ ๅฎน่ขซ็ๅจ %s ไธญ" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "ไธ่ฝๆๅผๆ่ฏปๅ '%s'" @@ -15783,7 +17561,7 @@ msgstr "" "่ชๅจๅๅนถ่ฏดๆๅคฑ่ดฅใไฟฎๆน %s ไธญ็ๅฒ็ชๅนถไธไฝฟ็จๅฝไปค 'git notes merge --commit' ๆ" "ไบค็ปๆ๏ผๆ่ ไฝฟ็จๅฝไปค 'git notes merge --abort' ็ปๆญขๅๅนถใ\n" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "ๆ ๆณ่งฃๆ '%s' ไธบไธไธชๆๆๅผ็จใ" @@ -15801,7 +17579,7 @@ msgstr "ๅฐ่ฏๅ ้คไธๅญๅจ็ๆณจ่งฃไธๆฏไธไธช้่ฏฏ" msgid "read object names from the standard input" msgstr "ไปๆ ๅ่พๅ ฅ่ฏปๅๅฏน่ฑกๅ็งฐ" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "ไธๅ ้ค๏ผๅชๆพ็คบ" @@ -15817,139 +17595,131 @@ msgstr "ๆณจ่งฃๅผ็จ" msgid "use notes from <notes-ref>" msgstr "ไป <ๆณจ่งฃๅผ็จ> ไฝฟ็จๆณจ่งฃ" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1605 #, c-format msgid "unknown subcommand: %s" msgstr "ๆช็ฅๅญๅฝไปค๏ผ%s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<้้กน>...] [< <ๅผ็จๅ่กจ> | < <ๅฏน่ฑกๅ่กจ>]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<้้กน>...] <ๅ็ผๅ็งฐ> [< <ๅผ็จๅ่กจ> | < <ๅฏน่ฑกๅ่กจ>]" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "%s ้็ๅ ๅฏน่ฑก CRC" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "%s ๆๅ็ๅ ๅฏน่ฑก" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "ๅ็ฐๅฏน่ฑก %s ้ๅฝ delta" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "ๆๅบไบ %u ไธชๅฏน่ฑก๏ผ้ขๆ %<PRIu32> ไธช" -#: 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 +#: builtin/pack-objects.c:1004 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "็ฆ็จ bitmap ๅๅ ฅ๏ผๅ ไธบ pack.packSizeLimit ่ฎพ็ฝฎไฝฟๅพๅ ่ขซๅๅไธบๅคไธช" -#: builtin/pack-objects.c:854 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "ๅๅ ฅๅฏน่ฑกไธญ" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "ๅฏน %s ่ฐ็จ stat ๅคฑ่ดฅ" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "ๅๅ ฅ %<PRIu32> ไธชๅฏน่ฑก่้ขๆ %<PRIu32> ไธช" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1348 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "็ฆ็จ bitmap ๅๅ ฅ๏ผๅ ไธบไธไบๅฏน่ฑกๅฐไธไผ่ขซๆๅ " -#: builtin/pack-objects.c:1597 +#: builtin/pack-objects.c:1796 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s ๅ็ผฉไธญ delta ๅบๅๅ็งป่ถ็" -#: builtin/pack-objects.c:1606 +#: builtin/pack-objects.c:1805 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s ็ delta ๅบๅๅ็งป่ถ็" -#: builtin/pack-objects.c:1875 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "ๅฏน่ฑก่ฎกๆฐไธญ" -#: builtin/pack-objects.c:2005 -#, c-format -msgid "unable to get size of %s" -msgstr "ไธ่ฝๅพๅฐ %s ็ๅคงๅฐ" - -#: builtin/pack-objects.c:2020 +#: builtin/pack-objects.c:2231 #, c-format msgid "unable to parse object header of %s" msgstr "ๆ ๆณ่งฃๆๅฏน่ฑก %s ๅคดไฟกๆฏ" -#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "ๅฏน่ฑก %s ๆ ๆณ่ฏปๅ" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "ๅฏน่ฑก %s ไธไธ่ด็ๅฏน่ฑก้ฟๅบฆ๏ผ%<PRIuMAX> vs %<PRIuMAX>๏ผ" -#: builtin/pack-objects.c:2130 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "ๆฌกไผ๏ผsuboptimal๏ผๆๅ - ๅ ๅญไธ่ถณ" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2656 #, c-format msgid "Delta compression using up to %d threads" msgstr "ไฝฟ็จ %d ไธช็บฟ็จ่ฟ่กๅ็ผฉ" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2795 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "ๆ ๆณไธบๆ ็ญพ %s ๅ็ผฉๅฏน่ฑก" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "ๅ็ผฉๅฏน่ฑกไธญ" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "ไธไธ่ด็ๅทฎๅผ่ฎกๆฐ" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" +"uploadpack.blobpackfileuri ็ๅๅผๅฟ ้กปๆฏ '<object-hash> <pack-hash> <uri>' ๆ ผ" +"ๅผ๏ผๅพๅฐ '%s'๏ผ" + +#: builtin/pack-objects.c:2964 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "ๅฏน่ฑกๅทฒ็ปๅจๅฆๅค็ uploadpack.blobpackfileuri ไธญ้ ็ฝฎ๏ผๅพๅฐ '%s'๏ผ" + +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -15958,7 +17728,7 @@ msgstr "" "้ขๆ่พน็ๅฏน่ฑก๏ผedge object๏ผID๏ผๅดๅพๅฐๅๅพๆฐๆฎ๏ผ\n" " %s" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -15967,245 +17737,241 @@ msgstr "" "้ขๆๅฏน่ฑก ID๏ผๅดๅพๅฐๅๅพๆฐๆฎ๏ผ\n" " %s" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "้้กน --missing ็ๅผๆ ๆ" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "ๆ ๆณๆๅผๅ ๆไปถ็ดขๅผ" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:3187 #, c-format msgid "loose object at %s could not be examined" msgstr "ๆ ๆณๆฃๆฅ %s ๅค็ๆพๆฃๅฏน่ฑก" -#: builtin/pack-objects.c:3041 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "ๆ ๆณๅผบๅถๆพๆฃๅฏน่ฑก" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "ไธๆฏไธไธช็ๆฌ '%s'" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "ๅ็็ๆฌ '%s'" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "ๆ ๆณๆทปๅ ๆ่ฟ็ๅฏน่ฑก" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "ไธๆฏๆ็็ดขๅผ็ๆฌ %s" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "ๅ็็ดขๅผ็ๆฌ '%s'" -#: 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 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "<็ๆฌ>[,<ๅ็งป>]" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3489 msgid "write the pack index file in the specified idx format version" msgstr "็จๆๅฎ็ idx ๆ ผๅผ็ๆฌๆฅๅๅ ็ดขๅผๆไปถ" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "ๆฏไธช่พๅบๅ ็ๆๅคงๅฐบๅฏธ" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "ๅฟฝ็ฅไปๅค็จๅฏน่ฑกๅญๅจ้ๅ็จๅฏน่ฑก" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "ๅฟฝ็ฅๅ ๅฏน่ฑก" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "้ๅถๆๅ ็ชๅฃ็ๅฏน่ฑกๆฐ" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3500 msgid "limit pack window by memory in addition to object limit" msgstr "้คๅฏน่ฑกๆฐ้้ๅถๅค่ฎพ็ฝฎๆๅ ็ชๅฃ็ๅ ๅญ้ๅถ" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3502 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "ๆๅ ๅ ่ฎธ็ delta ้พ็ๆๅคง้ฟๅบฆ" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "้็จๅทฒๅญๅจ็ deltas" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "้็จๅทฒๅญๅจ็ๅฏน่ฑก" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "ไฝฟ็จ OFS_DELTA ๅฏน่ฑก" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3510 msgid "use threads when searching for best delta matches" msgstr "ไฝฟ็จ็บฟ็จๆฅ่ฏขๆไฝณ delta ๅน้ " -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "ไธๅๅปบ็ฉบ็ๅ ่พๅบ" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "ไปๆ ๅ่พๅ ฅ่ฏปๅ็ๆฌๅทๅๆฐ" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3516 msgid "limit the objects to those that are not yet packed" msgstr "้ๅถ้ฃไบๅฐๆชๆๅ ็ๅฏน่ฑก" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "ๅ ๆฌๅฏไปฅไปไปปไฝๅผ็จ่ฎฟ้ฎๅฐ็ๅฏน่ฑก" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "ๅ ๆฌ่ขซๅผ็จๆฅๅฟๅผ็จๅฐ็ๅฏน่ฑก" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "ๅ ๆฌ่ขซ็ดขๅผๅผ็จๅฐ็ๅฏน่ฑก" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "่พๅบๅ ๅฐๆ ๅ่พๅบ" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3530 msgid "include tag objects that refer to objects to be packed" msgstr "ๅ ๆฌ้ฃไบๅผ็จไบๅพ ๆๅ ๅฏน่ฑก็ๆ ็ญพๅฏน่ฑก" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "็ปดๆไธๅฏ่พพ็ๅฏน่ฑก" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "ๆๅ ๆพๆฃ็ไธๅฏ่พพๅฏน่ฑก" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "ๅฐๆฏ็ปๅฎ <ๆถ้ด> ๆฐ็ๆ ๆณ่ฎฟ้ฎ็ๅฏน่ฑก่งฃๅ " -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" msgstr "ไฝฟ็จ็จ็ๅฏ่พพๆง็ฎๆณ" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "ๅๅปบ็ฒพ็ฎๅ " -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "ๅๅปบ้ๅๆต ๅ ้ไปๅบ่ทๅ็ๅ " -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "ๅฟฝ็ฅ้ ๆ .keep ๆไปถ็ๅ " -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "ๅฟฝ็ฅ่ฏฅ pack" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "ๆๅ ๅ็ผฉ็บงๅซ" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "ๆพ็คบ่ขซ็งปๆค้่็ๆไบค" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3553 msgid "use a bitmap index if available to speed up counting objects" msgstr "ไฝฟ็จ bitmap ็ดขๅผ๏ผๅฆๆๆ็่ฏ๏ผไปฅๆ้ซๅฏน่ฑก่ฎกๆฐๆถ็้ๅบฆ" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3555 msgid "write a bitmap index together with the pack index" msgstr "ๅจๅปบ็ซๅ ็ดขๅผ็ๅๆถๅๅปบ bitmap ็ดขๅผ" -#: builtin/pack-objects.c:3327 +#: builtin/pack-objects.c:3559 msgid "write a bitmap index if possible" msgstr "ๅฆๆๅฏ่ฝ๏ผๅ bitmap ็ดขๅผ" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "ๅค็ไธขๅคฑ็ๅฏน่ฑก" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3566 msgid "do not pack objects in promisor packfiles" msgstr "ไธ่ฆๆๅ promisor ๅ ๆไปถไธญ็ๅฏน่ฑก" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3568 msgid "respect islands during delta compression" msgstr "ๅจๅข้ๅ็ผฉๆถๅ่ๆฐๆฎๅฒ" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "ๅ่ฎฎ" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "ไฝฟ็จๆญคๅ่ฎฎๆ้คไปปไฝๅทฒ้ ็ฝฎ็ uploadpack.blobpackfileuri" + +#: builtin/pack-objects.c:3600 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "ๅข้้พๆทฑๅบฆ %d ๅคชๆทฑไบ๏ผๅผบๅถไธบ %d" -#: builtin/pack-objects.c:3366 +#: builtin/pack-objects.c:3605 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "้ ็ฝฎ pack.deltaCacheLimit ๅคช้ซไบ๏ผๅผบๅถไธบ %d" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3659 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "ไธ่ฝไฝฟ็จ --max-pack-size ๆฅๆๅปบไผ ่พ็จ็ๅ ๆไปถ" -#: builtin/pack-objects.c:3422 +#: builtin/pack-objects.c:3661 msgid "minimum pack size limit is 1 MiB" msgstr "ๆๅฐ็ๅ ๆไปถๅคงๅฐๆฏ 1 MiB" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3666 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin ไธ่ฝ็จไบๅๅปบไธไธชๅฏ็ดขๅผๅ " -#: builtin/pack-objects.c:3430 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable ๅ --unpack-unreachable ไธๅ ผๅฎน" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3675 msgid "cannot use --filter without --stdout" msgstr "ไธ่ฝๅจๆฒกๆ --stdout ็ๆ ๅตไธไฝฟ็จ --filter" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" -msgstr "ๆไธพๅฏน่ฑก" +msgstr "ๆไธพๅฏน่ฑกไธญ" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3766 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" -msgstr "ๆปๅ ฑ %<PRIu32> ๏ผๅทฎๅผ %<PRIu32>๏ผ๏ผๅค็จ %<PRIu32> ๏ผๅทฎๅผ %<PRIu32>๏ผ" +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>]" @@ -16219,98 +17985,121 @@ msgstr "ๆๅ ไธๅ" msgid "prune loose refs (default)" msgstr "ๆธ ้คๆพๆฃ็ๅผ็จ๏ผ้ป่ฎค๏ผ" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 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 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <ๆถ้ด>] [--] [<head>...]" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "ๆฅๅๆธ ้ค็ๅฏน่ฑก" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "ไฝฟๆฉไบ็ปๅฎๆถ้ด็ๅฏน่ฑก่ฟๆ" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "้ๅถ้ๅ promisor ๅ ไปฅๅค็ๅฏน่ฑก" -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "ไธ่ฝๅจ็ๅไปๅบไธญๆง่กๆธ ็ๆไฝ" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "%s ็ๅผๆ ๆ๏ผ%s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<้้กน>] [<ไปๅบ> [<ๅผ็จ่งๆ ผ>...]]" -#: builtin/pull.c:141 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "ๆงๅถๅญๆจก็ป็้ๅฝ่ทๅ" -#: builtin/pull.c:145 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "ๅๅๅนถ็ธๅ ณ็้้กน" -#: builtin/pull.c:148 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "ไฝฟ็จๅๅบๆไฝๅไปฃๅๅนถๆไฝไปฅๅๅ ฅไฟฎๆน" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 msgid "allow fast-forward" msgstr "ๅ ่ฎธๅฟซ่ฟๅผ" -#: builtin/pull.c:185 -msgid "automatically stash/stash pop before and after rebase" -msgstr "ๅๅบๆไฝๅๅๆง่ก่ชๅจ่ดฎ่ๅๅผนๅบ่ดฎ่" +#: builtin/pull.c:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" +msgstr "ๅจๆไฝๅๅๆง่ก่ชๅจ่ดฎ่ๅๅผนๅบ่ดฎ่" -#: builtin/pull.c:201 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "ๅ่ทๅ็ธๅ ณ็ๅๆฐ" -#: builtin/pull.c:211 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "ๅผบๅถ่ฆ็ๆฌๅฐๅๆฏ" -#: builtin/pull.c:219 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "ๅนถๅๆๅ็ๅญๆจก็ป็ๆฐ้" -#: builtin/pull.c:316 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff ็ๅๅผๆ ๆ๏ผ%s" -#: builtin/pull.c:433 +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"ไธๅปบ่ฎฎๅจๆฒกๆไธบๅ็ฆปๅๆฏๆๅฎๅๅนถ็ญ็ฅๆถๆง่ก pull ๆไฝใ ๆจๅฏไปฅๅจๆง่กไธไธๆฌก\n" +"pull ๆไฝไนๅๆง่กไธ้ขไธๆกๅฝไปคๆฅๆๅถๆฌๆถๆฏ๏ผ\n" +"\n" +" git config pull.rebase false # ๅๅนถ๏ผ็ผบ็็ญ็ฅ๏ผ\n" +" git config pull.rebase true # ๅๅบ\n" +" git config pull.ff only # ไป ๅฟซ่ฟ\n" +"\n" +"ๆจๅฏไปฅๅฐ \"git config\" ๆฟๆขไธบ \"git config --global\" ไปฅไพฟไธบๆๆไปๅบ่ฎพ็ฝฎ\n" +"็ผบ็็้ ็ฝฎ้กนใๆจไนๅฏไปฅๅจๆฏๆฌกๆง่ก pull ๅฝไปคๆถๆทปๅ --rebaseใ--no-rebase๏ผ\n" +"ๆ่ --ff-only ๅๆฐ่ฆ็็ผบ็่ฎพ็ฝฎใ\n" + +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "ๅจๆจๅๅ่ทๅๅฐ็ๅผ็จไธญๆฒกๆๅๅบๆไฝ็ๅ้ใ" -#: builtin/pull.c:435 +#: builtin/pull.c:460 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "ๅจๆจๅๅ่ทๅๅฐ็ๅผ็จไธญๆฒกๆๅๅนถๆไฝ็ๅ้ใ" -#: builtin/pull.c:436 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "้ๅธธ่ฟๆๅณ็ๆจๆไพไบไธไธช้้ ็ฌฆๅผ็จ่งๆ ผไฝๆช่ฝๅ่ฟ็ซฏๅน้ ใ" -#: builtin/pull.c:439 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16320,42 +18109,42 @@ msgstr "" "ๆจ่ฆๆฑไป่ฟ็จ '%s' ๆๅ๏ผไฝๆฏๆชๆๅฎไธไธชๅๆฏใๅ ไธบ่ฟไธๆฏๅฝๅ\n" "ๅๆฏ้ป่ฎค็่ฟ็จไปๅบ๏ผๆจๅฟ ้กปๅจๅฝไปค่กไธญๆๅฎไธไธชๅๆฏๅใ" -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "ๆจๅฝๅไธๅจไธไธชๅๆฏไธใ" -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "่ฏทๆๅฎๆจ่ฆๅๅบๅฐๅชไธไธชๅๆฏใ" -#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "่ฏทๆๅฎๆจ่ฆๅๅนถๅชไธไธชๅๆฏใ" -#: builtin/pull.c:449 builtin/pull.c:464 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "่ฏฆ่ง git-pull(1)ใ" -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 msgid "<remote>" msgstr "<่ฟ็จ>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<ๅๆฏ>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "ๅฝๅๅๆฏๆฒกๆ่ท่ธชไฟกๆฏใ" -#: builtin/pull.c:468 git-parse-remote.sh:95 +#: builtin/pull.c:493 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:473 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16364,32 +18153,28 @@ msgstr "" "ๆจ็้ ็ฝฎไธญๆๅฎ่ฆๅๅนถ่ฟ็จ็ๅผ็จ '%s'๏ผ\n" "ไฝๆฏๆฒกๆ่ทๅๅฐ่ฟไธชๅผ็จใ" -#: builtin/pull.c:581 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "ๆ ๆณ่ฎฟ้ฎๆไบค %s" -#: builtin/pull.c:861 +#: builtin/pull.c:894 msgid "ignoring --verify-signatures for rebase" msgstr "ไธบๅๅบๆไฝๅฟฝ็ฅ --verify-signatures" -#: builtin/pull.c:916 -msgid "--[no-]autostash option is only valid with --rebase." -msgstr "--[no-]autostash ้้กนๅชๅจไฝฟ็จ --rebase ๆถๆๆใ" - -#: builtin/pull.c:924 +#: builtin/pull.c:954 msgid "Updating an unborn branch with changes added to the index." msgstr "ๆดๆฐๅฐๆช่ฏ็็ๅๆฏ๏ผๅๆดๆทปๅ ่ณ็ดขๅผใ" -#: builtin/pull.c:928 +#: builtin/pull.c:958 msgid "pull with rebase" msgstr "ๅๅบๅผๆๅ" -#: builtin/pull.c:929 +#: builtin/pull.c:959 msgid "please commit or stash them." msgstr "่ฏทๆไบคๆ่ดฎ่ๅฎไปฌใ" -#: builtin/pull.c:954 +#: builtin/pull.c:984 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16399,7 +18184,7 @@ msgstr "" "fetch ๆดๆฐไบๅฝๅ็ๅๆฏใๅฟซ่ฟๆจ็ๅทฅไฝๅบ\n" "่ณๆไบค %sใ" -#: builtin/pull.c:960 +#: builtin/pull.c:990 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16416,15 +18201,15 @@ msgstr "" "$ git reset --hard\n" "ๆขๅคไนๅ็็ถๆใ" -#: builtin/pull.c:975 +#: builtin/pull.c:1005 msgid "Cannot merge multiple branches into empty head." msgstr "ๆ ๆณๅฐๅคไธชๅๆฏๅๅนถๅฐ็ฉบๅๆฏใ" -#: builtin/pull.c:979 +#: builtin/pull.c:1009 msgid "Cannot rebase onto multiple branches." msgstr "ๆ ๆณๅๅบๅฐๅคไธชๅๆฏใ" -#: builtin/pull.c:986 +#: builtin/pull.c:1017 msgid "cannot rebase with locally recorded submodule modifications" msgstr "ๆฌๅฐๅญๆจก็ปไธญๆไฟฎๆน๏ผๆ ๆณๅๅบ" @@ -16436,11 +18221,11 @@ msgstr "git push [<้้กน>] [<ไปๅบ> [<ๅผ็จ่งๆ ผ>...]]" msgid "tag shorthand without <tag>" msgstr "ๆ ็ญพๅ้ขๆชๆไพ <ๆ ็ญพ> ๅๆฐ" -#: builtin/push.c:121 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "--delete ๅชๆฅๅ็ฎๅ็็ฎๆ ๅผ็จๅ" -#: builtin/push.c:167 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -16448,7 +18233,7 @@ msgstr "" "\n" "ไธบไบๆฐธไน ๅฐ้ๆฉไปปไธ้้กน๏ผๅ่ง 'git help config' ไธญ็ push.defaultใ" -#: builtin/push.c:170 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16472,7 +18257,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16486,7 +18271,7 @@ msgstr "" "\n" " git push %s HEAD:<่ฟ็จๅๆฏๅๅญ>\n" -#: builtin/push.c:199 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16499,12 +18284,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:202 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "ๅฝๅๅๆฏ %s ๆๅคไธชไธๆธธๅๆฏ๏ผๆ็ปๆจ้ใ" -#: builtin/push.c:210 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -16514,12 +18299,12 @@ msgstr "" "ๆจๆญฃๆจ้่ณ่ฟ็จ '%s'๏ผๅ ถๅนถ้ๅฝๅๅๆฏ '%s' ็ไธๆธธ๏ผ๏ผ\n" "่ๆฒกๆๅ่ฏๆ่ฆๆจ้ไปไนใๆดๆฐๅชไธช่ฟ็จๅๆฏใ" -#: builtin/push.c:269 +#: builtin/push.c:260 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "ๆจๆฒกๆไธบๆจ้ๆๅฎไปปไฝๅผ็จ่งๆ ผ๏ผๅนถไธ push.default ไธบ \"nothing\"ใ" -#: builtin/push.c:276 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -16530,7 +18315,7 @@ msgstr "" "ๅๆฌกๆจ้ๅ๏ผๅ ไธ่ฟ็จๅๆดๅๅนถ๏ผๅฆ 'git pull ...'๏ผใ่ฏฆ่ง\n" "'git push --help' ไธญ็ 'Note about fast-forwards' ๅฐ่ใ" -#: builtin/push.c:282 +#: builtin/push.c:273 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" @@ -16541,7 +18326,7 @@ msgstr "" "ๆฃๅบ่ฏฅๅๆฏๅนถๆดๅ่ฟ็จๅๆด๏ผๅฆ 'git pull ...'๏ผ๏ผ็ถๅๅๆจ้ใ่ฏฆ่ง\n" "'git push --help' ไธญ็ 'Note about fast-forwards' ๅฐ่ใ" -#: builtin/push.c:288 +#: builtin/push.c:279 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" @@ -16554,11 +18339,11 @@ msgstr "" "๏ผๅฆ 'git pull ...'๏ผใ\n" "่ฏฆ่ง 'git push --help' ไธญ็ 'Note about fast-forwards' ๅฐ่ใ" -#: builtin/push.c:295 +#: builtin/push.c:286 msgid "Updates were rejected because the tag already exists in the remote." msgstr "ๆดๆฐ่ขซๆ็ป๏ผๅ ไธบ่ฏฅๆ ็ญพๅจ่ฟ็จๅทฒ็ปๅญๅจใ" -#: builtin/push.c:298 +#: builtin/push.c:289 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" @@ -16567,140 +18352,140 @@ msgstr "" "ๅฆๆไธไฝฟ็จ '--force' ๅๆฐ๏ผๆจไธ่ฝๆดๆฐไธไธชๆๅ้ๆไบคๅฏน่ฑก็่ฟ็จๅผ็จ๏ผ\n" "ไนไธ่ฝๆดๆฐ่ฟ็จๅผ็จ่ฎฉๅ ถๆๅไธไธช้ๆไบคๅฏน่ฑกใ\n" -#: builtin/push.c:359 +#: builtin/push.c:351 #, c-format msgid "Pushing to %s\n" msgstr "ๆจ้ๅฐ %s\n" -#: builtin/push.c:364 +#: builtin/push.c:358 #, c-format msgid "failed to push some refs to '%s'" msgstr "ๆจ้ไธไบๅผ็จๅฐ '%s' ๅคฑ่ดฅ" -#: 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 +#: builtin/push.c:532 msgid "repository" msgstr "ไปๅบ" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:533 builtin/send-pack.c:183 msgid "push all refs" msgstr "ๆจ้ๆๆๅผ็จ" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:534 builtin/send-pack.c:185 msgid "mirror all refs" msgstr "้ๅๆๆๅผ็จ" -#: builtin/push.c:558 +#: builtin/push.c:536 msgid "delete refs" msgstr "ๅ ้คๅผ็จ" -#: builtin/push.c:559 +#: builtin/push.c:537 msgid "push tags (can't be used with --all or --mirror)" msgstr "ๆจ้ๆ ็ญพ๏ผไธ่ฝไฝฟ็จ --all or --mirror๏ผ" -#: builtin/push.c:562 builtin/send-pack.c:167 +#: builtin/push.c:540 builtin/send-pack.c:186 msgid "force updates" msgstr "ๅผบๅถๆดๆฐ" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:541 builtin/send-pack.c:198 msgid "<refname>:<expect>" msgstr "<ๅผ็จๅ>:<ๆๆๅผ>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:542 builtin/send-pack.c:199 msgid "require old value of ref to be at this value" msgstr "่ฆๆฑๅผ็จๆง็ๅๅผไธบ่ฎพๅฎๅผ" -#: builtin/push.c:568 +#: builtin/push.c:545 msgid "control recursive pushing of submodules" msgstr "ๆงๅถๅญๆจก็ป็้ๅฝๆจ้" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:546 builtin/send-pack.c:193 msgid "use thin pack" msgstr "ไฝฟ็จ็ฒพ็ฎๆๅ " -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 msgid "receive pack program" msgstr "ๆฅๆถๅ ็จๅบ" -#: builtin/push.c:573 +#: builtin/push.c:549 msgid "set upstream for git pull/status" msgstr "่ฎพ็ฝฎ git pull/status ็ไธๆธธ" -#: builtin/push.c:576 +#: builtin/push.c:552 msgid "prune locally removed refs" msgstr "ๆธ ้คๆฌๅฐๅ ้ค็ๅผ็จ" -#: builtin/push.c:578 +#: builtin/push.c:554 msgid "bypass pre-push hook" msgstr "็ป่ฟ pre-push ้ฉๅญ" -#: builtin/push.c:579 +#: builtin/push.c:555 msgid "push missing but relevant tags" msgstr "ๆจ้็ผบๅคฑไฝๆๅ ณ็ๆ ็ญพ" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:557 builtin/send-pack.c:187 msgid "GPG sign the push" msgstr "็จ GPG ไธบๆจ้็ญพๅ" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:559 builtin/send-pack.c:194 msgid "request atomic transaction on remote side" msgstr "้่ฆ่ฟ็ซฏๆฏๆๅๅญไบๅก" -#: builtin/push.c:602 +#: builtin/push.c:577 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete ไธ --allใ--mirror ๅ --tags ไธๅ ผๅฎน" -#: builtin/push.c:604 +#: builtin/push.c:579 msgid "--delete doesn't make sense without any refs" msgstr "--delete ๆชๆฅไปปไฝๅผ็จๆฒกๆๆไน" -#: builtin/push.c:607 +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "ๅ็ไปๅบ '%s'" + +#: builtin/push.c:600 +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:615 msgid "--all and --tags are incompatible" msgstr "--all ๅ --tags ไธๅ ผๅฎน" -#: builtin/push.c:609 +#: builtin/push.c:617 msgid "--all can't be combined with refspecs" msgstr "--all ไธ่ฝๅๅผ็จ่งๆ ผๅๆถไฝฟ็จ" -#: builtin/push.c:613 +#: builtin/push.c:621 msgid "--mirror and --tags are incompatible" msgstr "--mirror ๅ --tags ไธๅ ผๅฎน" -#: builtin/push.c:615 +#: builtin/push.c:623 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ไธ่ฝๅๅผ็จ่งๆ ผๅๆถไฝฟ็จ" -#: builtin/push.c:618 +#: builtin/push.c:626 msgid "--all and --mirror are incompatible" msgstr "--all ๅ --mirror ไธๅ ผๅฎน" -#: builtin/push.c:637 +#: builtin/push.c:630 msgid "push options must not have new line characters" msgstr "ๆจ้้้กนไธ่ฝๆๆข่ก็ฌฆ" @@ -16716,24 +18501,32 @@ 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:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "ๅๅปบๆ้็็พๅๆฏ" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "ไฝฟ็จ็ฎๅๅทฎๅผ้ข่ฒ" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: 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:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "ๅไธชๅๆฐๆ ผๅผๅฟ ้กปๆฏๅฏน็งฐ่ๅด๏ผๅณๅ ๅซ...๏ผ" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "้่ฆไธคไธชๆไบค่ๅด" @@ -16815,233 +18608,215 @@ msgstr "่ฐ่ฏ unpack-trees" msgid "suppress feedback messages" msgstr "ๆๅถๅ้ฆไฟกๆฏ" -#: builtin/rebase.c:32 +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "ๆจ้่ฆๅ ่งฃๅณๅฝๅ็ดขๅผ็ๅฒ็ช" + +#: builtin/rebase.c:35 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [้้กน] [--exec <ๅฝไปค>] [--onto <ๆฐๅบ็บฟ>] [<ไธๆธธ>] [<ๅๆฏ>]" +"git rebase [-i] [options] [--exec <ๅฝไปค>] [--onto <ๆฐๅบ็บฟ> | --keep-base] [<" +"ไธๆธธ> [<ๅๆฏ>]]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [้้กน] [--exec <ๅฝไปค>] [--onto <ๆฐๅบ็บฟ>] --root [<ๅๆฏ>]" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 #, c-format msgid "unusable todo list: '%s'" msgstr "ไธๅฏ็จ็ๅพ ๅๅ่กจ๏ผ'%s'" -#: 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 +#: builtin/rebase.c:304 #, c-format msgid "could not create temporary %s" msgstr "ๆ ๆณๅๅปบไธดๆถ็ %s" -#: builtin/rebase.c:285 +#: builtin/rebase.c:310 msgid "could not mark as interactive" msgstr "ๆ ๆณๆ ่ฎฐไธบไบคไบๅผ" -#: builtin/rebase.c:343 +#: builtin/rebase.c:364 msgid "could not generate todo list" msgstr "ๆ ๆณ็ๆๅพ ๅๅ่กจ" -#: builtin/rebase.c:382 +#: builtin/rebase.c:405 msgid "a base commit must be provided with --upstream or --onto" msgstr "ไฝฟ็จ --upstream ๆ --onto ๅฟ ้กปๆไพไธไธชๅบ็บฟๆไบค" -#: builtin/rebase.c:437 +#: builtin/rebase.c:474 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<้้กน>]" -#: builtin/rebase.c:449 -msgid "keep empty commits" -msgstr "ไฟๆ็ฉบๆไบค" +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" +msgstr "ไฟ็ๅๅงไธบ็ฉบ็ๆไบค" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:491 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "ๅ ่ฎธๆไบค่ฏดๆไธบ็ฉบ" -#: builtin/rebase.c:452 +#: builtin/rebase.c:493 msgid "rebase merge commits" msgstr "ๅฏนๅๅนถๆไบคๅๅบ" -#: builtin/rebase.c:454 +#: builtin/rebase.c:495 msgid "keep original branch points of cousins" msgstr "ไฟๆๅ ๅผๆไบค็ๅๅงๅๆฏ็น" -#: builtin/rebase.c:456 +#: builtin/rebase.c:497 msgid "move commits that begin with squash!/fixup!" msgstr "็งปๅจไปฅ squash!/fixup! ๅผๅคด็ๆไบค" -#: builtin/rebase.c:457 +#: builtin/rebase.c:498 msgid "sign commits" msgstr "็ญพๅๆไบค" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:500 builtin/rebase.c:1321 msgid "display a diffstat of what changed upstream" msgstr "ๆพ็คบไธๆธธๅๅ็ๅทฎๅผ็ป่ฎก" -#: builtin/rebase.c:461 +#: builtin/rebase.c:502 msgid "continue rebase" msgstr "็ปง็ปญๅๅบ" -#: builtin/rebase.c:463 +#: builtin/rebase.c:504 msgid "skip commit" msgstr "่ทณ่ฟๆไบค" -#: builtin/rebase.c:464 +#: builtin/rebase.c:505 msgid "edit the todo list" msgstr "ๅๅบๅพ ๅๅ่กจ" -#: builtin/rebase.c:466 +#: builtin/rebase.c:507 msgid "show the current patch" msgstr "ๆพ็คบๅฝๅ่กฅไธ" -#: builtin/rebase.c:469 +#: builtin/rebase.c:510 msgid "shorten commit ids in the todo list" msgstr "็ผฉ็ญๅพ ๅๅ่กจไธญ็ๆไบคๅท" -#: builtin/rebase.c:471 +#: builtin/rebase.c:512 msgid "expand commit ids in the todo list" msgstr "ๆฉๅฑๅพ ๅๅ่กจไธญ็ๆไบคๅท" -#: builtin/rebase.c:473 +#: builtin/rebase.c:514 msgid "check the todo list" msgstr "ๆฃๆฅๅพ ๅๅ่กจ" -#: builtin/rebase.c:475 +#: builtin/rebase.c:516 msgid "rearrange fixup/squash lines" msgstr "้ๆฐๆๅ fixup/squash ่ก" -#: builtin/rebase.c:477 +#: builtin/rebase.c:518 msgid "insert exec commands in todo list" msgstr "ๅจๅพ ๅๅ่กจไธญๆๅ ฅ exec ๆง่กๅฝไปค" -#: builtin/rebase.c:478 +#: builtin/rebase.c:519 msgid "onto" msgstr "onto" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict revision" msgstr "้ๅถ็ๆฌ" -#: builtin/rebase.c:483 +#: builtin/rebase.c:524 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:484 +#: builtin/rebase.c:525 msgid "squash onto" msgstr "squash onto" -#: builtin/rebase.c:486 +#: builtin/rebase.c:527 msgid "the upstream commit" msgstr "ไธๆธธๆไบค" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head name" msgstr "head ๅ็งฐ" -#: builtin/rebase.c:493 +#: builtin/rebase.c:534 msgid "rebase strategy" msgstr "ๅๅบ็ญ็ฅ" -#: builtin/rebase.c:494 +#: builtin/rebase.c:535 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:495 +#: builtin/rebase.c:536 msgid "strategy options" msgstr "็ญ็ฅ้้กน" -#: builtin/rebase.c:496 +#: builtin/rebase.c:537 msgid "switch-to" msgstr "ๅๆขๅฐ" -#: builtin/rebase.c:497 +#: builtin/rebase.c:538 msgid "the branch or commit to checkout" msgstr "่ฆๆฃๅบ็ๅๆฏๆๆไบค" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto name" msgstr "onto name" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "the command to run" msgstr "่ฆๆง่ก็ๅฝไปค" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:543 builtin/rebase.c:1415 msgid "automatically re-schedule any `exec` that fails" msgstr "่ชๅจ้ๆฐๅฎๆไปปไฝๅคฑ่ดฅ็ `exec`" -#: builtin/rebase.c:518 +#: builtin/rebase.c:559 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "ไธไฝฟ็จ --rebase-merges๏ผๅ --[no-]rebase-cousins ๆฒกๆๆๆ" -#: builtin/rebase.c:534 +#: builtin/rebase.c:575 #, c-format -msgid "%s requires an interactive rebase" -msgstr "%s ้่ฆไบคไบๅผๅๅบ" +msgid "%s requires the merge backend" +msgstr "%s ้่ฆๅๅนถๅ็ซฏ" -#: builtin/rebase.c:586 +#: builtin/rebase.c:618 #, c-format msgid "could not get 'onto': '%s'" msgstr "ๆ ๆณ่ทๅ 'onto'๏ผ'%s'" -#: builtin/rebase.c:601 +#: builtin/rebase.c:635 #, c-format msgid "invalid orig-head: '%s'" msgstr "ๆ ๆ็ๅๅง head๏ผ'%s'" -#: builtin/rebase.c:626 +#: builtin/rebase.c:660 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ๅฟฝ็ฅๆ ๆ็ allow_rerere_autoupdate๏ผ'%s'" -#: builtin/rebase.c:702 -#, c-format -msgid "Could not read '%s'" -msgstr "ไธ่ฝ่ฏปๅ '%s'" - -#: builtin/rebase.c:720 -#, c-format -msgid "Cannot store %s" -msgstr "ไธ่ฝๅญๅจ %s" - -#: builtin/rebase.c:827 -msgid "could not determine HEAD revision" -msgstr "ไธ่ฝ็กฎๅฎ HEAD ็ๆฌ" - -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:805 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" @@ -17054,7 +18829,7 @@ msgstr "" "\"git rebase --skip\" ๅฝไปค่ทณ่ฟ่ฟไธชๆไบคใๅฆๆๆณ่ฆ็ปๆญขๆง่กๅนถๅๅฐ\n" "\"git rebase\" ๆง่กไนๅ็็ถๆ๏ผๆง่ก \"git rebase --abort\"ใ" -#: builtin/rebase.c:1031 +#: builtin/rebase.c:888 #, c-format msgid "" "\n" @@ -17072,7 +18847,14 @@ msgstr "" "\n" "ๅ ๆญค git ๆ ๆณๅฏนๅ ถๅๅบใ" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1214 +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "ๆ ๆณ่ฏๅซ็็ฉบ็ฑปๅ '%s'๏ผๆๆๅผๆ \"drop\"ใ\"keep\" ๅ \"ask\"ใ" + +#: builtin/rebase.c:1232 #, c-format msgid "" "%s\n" @@ -17089,7 +18871,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1248 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17102,128 +18884,148 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1278 msgid "exec commands cannot contain newlines" msgstr "exec ๅฝไปคไธ่ฝๅ ๅซๆข่ก็ฌฆ" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1282 msgid "empty exec command" msgstr "็ฉบ็ exec ๅฝไปค" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1312 msgid "rebase onto given branch instead of upstream" msgstr "ๅๅบๅฐ็ปๅฎ็ๅๆฏ่้ไธๆธธ" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1314 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "ไฝฟ็จไธๆธธๅๅๆฏ็ๅๅนถๅบ็บฟๅไธบๅฝๅๅบ็บฟ" + +#: builtin/rebase.c:1316 msgid "allow pre-rebase hook to run" msgstr "ๅ ่ฎธๆง่ก pre-rebase ้ฉๅญ" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1318 msgid "be quiet. implies --no-stat" msgstr "ๅฎ้ใๆ็คบ --no-stat" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1324 msgid "do not show diffstat of what changed upstream" msgstr "ไธๆพ็คบไธๆธธๅๅ็ๅทฎๅผ็ป่ฎก" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1327 msgid "add a Signed-off-by: line to each commit" msgstr "ไธบๆฏไธไธชๆไบคๆทปๅ ไธไธช Signed-off-by: ็ญพๅ" -#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 -msgid "passed to 'git am'" -msgstr "ไผ ้็ป 'git am'" +#: builtin/rebase.c:1330 +msgid "make committer date match author date" +msgstr "ไฝฟๆไบค่ ๆฅๆๅไฝ่ ๆฅๆไธ่ด" + +#: builtin/rebase.c:1332 +msgid "ignore author date and use current date" +msgstr "ๅฟฝ็ฅไฝ่ ๆฅๆ๏ผไฝฟ็จๅฝๅๆฅๆ" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1334 +msgid "synonym of --reset-author-date" +msgstr "--reset-author-date ็ๅไน่ฏ" + +#: builtin/rebase.c:1336 builtin/rebase.c:1340 msgid "passed to 'git apply'" msgstr "ไผ ้็ป 'git apply'" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1338 +msgid "ignore changes in whitespace" +msgstr "ๅฟฝ็ฅ็ฉบ็ฝๅญ็ฌฆ็ๅๆด" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 msgid "cherry-pick all commits, even if unchanged" msgstr "ๆฃ้ๆๆๆไบค๏ผๅณไฝฟๆชไฟฎๆน" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1347 msgid "continue" msgstr "็ปง็ปญ" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1350 msgid "skip current patch and continue" msgstr "่ทณ่ฟๅฝๅ่กฅไธๅนถ็ปง็ปญ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1352 msgid "abort and check out the original branch" msgstr "็ปๆญขๅนถๆฃๅบๅๆๅๆฏ" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1355 msgid "abort but keep HEAD where it is" msgstr "็ปๆญขไฝไฟๆ HEAD ไธๅ" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1356 msgid "edit the todo list during an interactive rebase" msgstr "ๅจไบคไบๅผๅๅบไธญ็ผ่พๅพ ๅๅ่กจ" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1359 msgid "show the patch file being applied or merged" msgstr "ๆพ็คบๆญฃๅจๅบ็จๆๅๅนถ็่กฅไธๆไปถ" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1362 +msgid "use apply strategies to rebase" +msgstr "ไฝฟ็จๅบ็จ็ญ็ฅ่ฟ่กๅๅบ" + +#: builtin/rebase.c:1366 msgid "use merging strategies to rebase" msgstr "ไฝฟ็จๅๅนถ็ญ็ฅ่ฟ่กๅๅบ" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1370 msgid "let the user edit the list of commits to rebase" msgstr "่ฎฉ็จๆท็ผ่พ่ฆๅๅบ็ๆไบคๅ่กจ" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1374 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "๏ผๅทฒๅผ็จ๏ผๅฐ่ฏ้ๅปบๅๅนถๆไบค่้ๅฟฝ็ฅๅฎไปฌ" -#: builtin/rebase.c:1455 -msgid "preserve empty commits during rebase" -msgstr "ๅๅบๆถไฟ็็ฉบๆไบค" +#: builtin/rebase.c:1379 +msgid "how to handle commits that become empty" +msgstr "ๅฆไฝๅค็ๆไธบ็ฉบๆไบค็ๆไบค" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1386 msgid "move commits that begin with squash!/fixup! under -i" msgstr "ๅจ -i ไบคไบๆจกๅผไธ๏ผ็งปๅจไปฅ squash!/fixup! ๅผๅคด็ๆไบค" -#: builtin/rebase.c:1463 -msgid "automatically stash/stash pop before and after" -msgstr "ๅจๆไฝๅๅๆง่ก่ชๅจ่ดฎ่ๅๅผนๅบ่ดฎ่" - -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1393 msgid "add exec lines after each commit of the editable list" msgstr "ๅฏ็ผ่พๅ่กจ็ๆฏไธไธชๆไบคไธ้ขๅขๅ ไธ่ก exec" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1397 msgid "allow rebasing commits with empty messages" msgstr "ๅ ่ฎธ้ๅฏน็ฉบๆไบค่ฏดๆ็ๆไบคๅๅบ" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1401 msgid "try to rebase merges instead of skipping them" msgstr "ๅฐ่ฏๅฏนๅๅนถๆไบคๅๅบ่ไธๆฏๅฟฝ็ฅๅฎไปฌ" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1404 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "ไฝฟ็จ 'merge-base --fork-point' ๆฅไผๅไธๆธธ" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1406 msgid "use the given merge strategy" msgstr "ไฝฟ็จ็ปๅฎ็ๅๅนถ็ญ็ฅ" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1408 builtin/revert.c:115 msgid "option" msgstr "้้กน" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1409 msgid "pass the argument through to the merge strategy" msgstr "ๅฐๅๆฐไผ ้็ปๅๅนถ็ญ็ฅ" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1412 msgid "rebase all reachable commits up to the root(s)" msgstr "ๅฐๆๆๅฏ่พพ็ๆไบคๅๅบๅฐๆ นๆไบค" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "ๅบ็จๆๆๆดๆน๏ผ็่ณ้ฃไบๅทฒๅจไธๆธธๅญๅจ็" + +#: builtin/rebase.c:1434 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17231,28 +19033,40 @@ msgstr "" "ๅฏน rebase.useBuiltin ็ๆฏๆๅทฒ่ขซๅ ้ค๏ผ\n" "่ฏฆ่ง 'git help config' ไธญ็ๆก็ฎใ" -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1440 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "็่ตทๆฅ 'git-am' ๆญฃๅจๆง่กไธญใๆ ๆณๅๅบใ" -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1481 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "git rebase --preserve-merges ่ขซๅผ็จใ็จ --rebase-merges ไปฃๆฟใ" -#: builtin/rebase.c:1551 +#: builtin/rebase.c:1486 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "ไธ่ฝๅฐ '--keep-base' ๅ '--onto' ็ปๅไฝฟ็จ" + +#: builtin/rebase.c:1488 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "ไธ่ฝๅฐ '--keep-base' ๅ '--root' ็ปๅไฝฟ็จ" + +#: builtin/rebase.c:1492 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "ไธ่ฝๅฐ '--root' ๅ '--fork-point' ็ปๅไฝฟ็จ" + +#: builtin/rebase.c:1495 msgid "No rebase in progress?" msgstr "ๆฒกๆๆญฃๅจ่ฟ่ก็ๅๅบ๏ผ" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1499 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "ๅจไฝ --edit-todo ๅช่ฝ็จๅจไบคไบๅผๅๅบ่ฟ็จไธญใ" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1522 msgid "Cannot read HEAD" msgstr "ไธ่ฝ่ฏปๅ HEAD" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1534 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17260,16 +19074,16 @@ msgstr "" "ๆจๅฟ ้กป็ผ่พๆๆ็ๅๅนถๅฒ็ช๏ผ็ถๅ้่ฟ git add\n" "ๅฝไปคๅฐๅฎไปฌๆ ่ฎฐไธบๅทฒ่งฃๅณ" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1553 msgid "could not discard worktree changes" msgstr "ๆ ๆณไธขๅผๅทฅไฝๅบๅๆด" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1572 #, c-format msgid "could not move back to %s" msgstr "ๆ ๆณ็งปๅ %s" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1618 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17288,172 +19102,141 @@ msgstr "" "\t%s\n" "็ถๅๅ้ๆฐๆง่กใ ไธบ้ฟๅ ไธขๅคฑ้่ฆๆฐๆฎ๏ผๆๅทฒ็ปๅๆญขๅฝๅๆไฝใ\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1646 msgid "switch `C' expects a numerical value" msgstr "ๅผๅ ณ `C' ๆๆไธไธชๆฐๅญๅผ" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1688 #, c-format msgid "Unknown mode: %s" msgstr "ๆช็ฅๆจกๅผ๏ผ%s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1727 msgid "--strategy requires --merge or --interactive" msgstr "--strategy ้่ฆ --merge ๆ --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1757 +msgid "cannot combine apply options with merge options" +msgstr "ไธ่ฝ็ปๅไฝฟ็จๅบ็จ้้กนๅๅๅนถ้้กน" + +#: builtin/rebase.c:1770 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "ๆช็ฅ็ๅๅบๅ็ซฏ๏ผ%s" + +#: builtin/rebase.c:1795 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec ้่ฆ --exec ๆ --interactive" -#: builtin/rebase.c:1809 -msgid "cannot combine am options with either interactive or merge options" -msgstr "ไธ่ฝๅฐ am ้้กนไธไบคไบๆๅๅนถ้้กนๅๆถไฝฟ็จ" - -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1815 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "ไธ่ฝๅฐ '--preserve-merges' ๅ '--rebase-merges' ๅๆถไฝฟ็จ" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1819 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "้่ฏฏ๏ผไธ่ฝๅฐ '--preserve-merges' ๅ '--reschedule-failed-exec' ๅๆถไฝฟ็จ" -#: 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 +#: builtin/rebase.c:1843 #, c-format msgid "invalid upstream '%s'" msgstr "ๆ ๆ็ไธๆธธ '%s'" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1849 msgid "Could not create new root commit" msgstr "ไธ่ฝๅๅปบๆฐ็ๆ นๆไบค" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1875 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "'%s'๏ผๅช้่ฆไธๅๆฏ็ไธไธชๅๅนถๅบ็บฟ" + +#: builtin/rebase.c:1878 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s'๏ผๅช้่ฆไธไธชๅๅนถๅบ็บฟ" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1886 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "ๆฒกๆๆๅไธไธชๆๆ็ๆไบค '%s'" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1912 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "่ดๅฝ้่ฏฏ๏ผๆ ๆญคๅๆฏ/ๆไบค '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "ๆฒกๆ่ฟๆ ท็ๅผ็จ๏ผ%s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1931 msgid "Could not resolve HEAD to a revision" msgstr "ๆ ๆณๅฐ HEAD ่งฃๆไธบไธไธช็ๆฌ" -#: builtin/rebase.c:1981 -msgid "Cannot autostash" -msgstr "ๆ ๆณ autostash" - -#: builtin/rebase.c:1984 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "ๆๅค็ stash ๅๅบ๏ผ'%s'" - -#: builtin/rebase.c:1990 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "ไธ่ฝไธบ '%s' ๅๅปบ็ฎๅฝ" - -#: builtin/rebase.c:1993 -#, c-format -msgid "Created autostash: %s\n" -msgstr "ๅๅปบไบ autostash๏ผ%s\n" - -#: builtin/rebase.c:1996 -msgid "could not reset --hard" -msgstr "ๆ ๆณ reset --hard" - -#: builtin/rebase.c:1997 builtin/reset.c:114 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD ็ฐๅจไฝไบ %s" - -#: builtin/rebase.c:2013 +#: builtin/rebase.c:1952 msgid "Please commit or stash them." msgstr "่ฏทๆไบคๆ่ดฎ่ไฟฎๆนใ" -#: builtin/rebase.c:2040 -#, c-format -msgid "could not parse '%s'" -msgstr "ๆ ๆณ่งฃๆ '%s'" - -#: builtin/rebase.c:2053 +#: builtin/rebase.c:1988 #, c-format msgid "could not switch to %s" msgstr "ๆ ๆณๅๆขๅฐ %s" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:1999 msgid "HEAD is up to date." msgstr "HEAD ๆฏๆๆฐ็ใ" -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2001 #, c-format msgid "Current branch %s is up to date.\n" msgstr "ๅฝๅๅๆฏ %s ๆฏๆๆฐ็ใ\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2009 msgid "HEAD is up to date, rebase forced." msgstr "HEAD ๆฏๆๆฐ็๏ผๅผบๅถๅๅบใ" -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2011 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "ๅฝๅๅๆฏ %s ๆฏๆๆฐ็๏ผๅผบๅถๅๅบใ\n" -#: builtin/rebase.c:2084 +#: builtin/rebase.c:2019 msgid "The pre-rebase hook refused to rebase." msgstr "pre-rebase ้ฉๅญๆ็ปไบๅๅบๆไฝใ" -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2026 #, c-format msgid "Changes to %s:\n" msgstr "ๅฐ %s ็ๅๆด๏ผ\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2029 #, c-format msgid "Changes from %s to %s:\n" msgstr "ไป %s ๅฐ %s ็ๅๆด๏ผ\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2054 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "้ฆๅ ๏ผๅ้ๅคดๆ้ไปฅไพฟๅจๅ ถไธ้ๆพๆจ็ๅทฅไฝ...\n" -#: builtin/rebase.c:2128 +#: builtin/rebase.c:2063 msgid "Could not detach HEAD" msgstr "ๆ ๆณๅ็ฆปๅคดๆ้" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2072 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "ๅฟซ่ฟ %s ๅฐ %sใ\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <ไปๅบ็ฎๅฝ>" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:1224 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" @@ -17479,7 +19262,7 @@ msgstr "" "่ฅ่ฆๅฑ่ฝๆญคไฟกๆฏไธไฟๆ้ป่ฎค่กไธบ๏ผ่ฎพ็ฝฎ 'receive.denyCurrentBranch'\n" "้ ็ฝฎๅ้ไธบ 'refuse'ใ" -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:1244 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" @@ -17498,11 +19281,11 @@ msgstr "" "\n" "่ฅ่ฆๅฑ่ฝๆญคไฟกๆฏ๏ผๆจๅฏไปฅ่ฎพ็ฝฎๅฎไธบ 'refuse'ใ" -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:2422 msgid "quiet" msgstr "้้ปๆจกๅผ" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:2436 msgid "You must specify a directory." msgstr "ๆจๅฟ ้กปๆๅฎไธไธช็ฎๅฝใ" @@ -17528,49 +19311,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <ๅผ็จ>" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' ไธๆฏไธไธชๆๆ็ๆถ้ดๆณ" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "ๆญฃๅจๆ ่ฎฐๅฏ่พพๅฏน่ฑก..." -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "%s ๆๅไธๅญๅจ๏ผ" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "ๆชๆๅฎ่ฆๅ ้ค็ๅผ็จๆฅๅฟ" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "ไธๆฏไธไธชๅผ็จๆฅๅฟ๏ผ%s" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "ๆฒกๆ '%s' ็ๅผ็จๆฅๅฟ" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "ๆ ๆ็ๅผ็จๆ ผๅผ๏ผ%s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -17578,81 +19361,81 @@ msgstr "" "git remote add [-t <ๅๆฏ>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <ๅ็งฐ> <ๅฐๅ>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <ๆงๅ็งฐ> <ๆฐๅ็งฐ>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <ๅ็งฐ>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: 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:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <ๅ็งฐ>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <ๅ็งฐ>" -#: builtin/remote.c:23 +#: 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:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <ๅ็งฐ> <ๅๆฏ>..." -#: builtin/remote.c:25 builtin/remote.c:74 +#: 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:26 builtin/remote.c:79 +#: 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:27 builtin/remote.c:80 +#: 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:28 builtin/remote.c:81 +#: 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:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<้้กน>] <ๅ็งฐ> <ๅฐๅ>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <ๅ็งฐ> <ๅๆฏ>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <ๅ็งฐ> <ๅๆฏ>..." -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<้้กน>] <ๅ็งฐ>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<้้กน>] <ๅ็งฐ>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<้้กน>] [<็ป> | <่ฟ็จ>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "ๆดๆฐ %s ไธญ" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -17660,82 +19443,98 @@ msgstr "" "--mirror ้้กนๅฑ้ฉไธ่ฟๆถ๏ผ่ฏทไฝฟ็จ --mirror=fetch\n" "\t ๆ --mirror=push" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "ๆช็ฅ็้ๅๅๆฐ๏ผ%s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "ๆๅ่ฟ็จ็ๅๆฏ" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "ๆๅๆถๅฏผๅ ฅๆๆ็ๆ ็ญพๅๅ ณ่ๅฏน่ฑก" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "ๆไธๆๅไปปไฝๆ ็ญพ๏ผ--no-tags๏ผ" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "่ท่ธช็ๅๆฏ" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "ไธป็บฟๅๆฏ" -#: builtin/remote.c:173 +#: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "ๆ่ฟ็จ่ฎพ็ฝฎไธบ็จไปฅๆจ้ๆๆๅ็้ๅ" -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "ๆๅฎไธไธช master ๅๆฏๅนถไฝฟ็จ --mirror ้้กนๆฒกๆๆไน" -#: builtin/remote.c:187 +#: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "ๆๅฎ่ฆ่ท่ธช็ๅๆฏๅชๅจไธ่ทๅ้ๅๅๆถไฝฟ็จๆๆๆไน" -#: builtin/remote.c:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:697 #, c-format msgid "remote %s already exists." msgstr "่ฟ็จ %s ๅทฒ็ปๅญๅจใ" -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:701 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ไธๆฏไธไธชๆๆ็่ฟ็จๅ็งฐ" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "ๆ ๆณ่ฎพ็ฝฎ master '%s'" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "ๆ ๆณๅพๅฐๅผ็จ่งๆ ผ %s ็่ทๅๅ่กจ" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "๏ผๅน้ ๏ผ" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "๏ผๅ ้ค๏ผ" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:654 +#, c-format +msgid "could not set '%s'" +msgstr "ไธ่ฝ่ฎพ็ฝฎ '%s'" + +#: builtin/remote.c:659 +#, 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:690 builtin/remote.c:833 builtin/remote.c:941 #, c-format msgid "No such remote: '%s'" msgstr "ๆฒกๆๆญค่ฟ็จไปๅบ๏ผ'%s'" -#: builtin/remote.c:646 +#: builtin/remote.c:707 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "ไธ่ฝ้ๅฝๅ้ ็ฝฎๅฐ่ '%s' ๅฐ '%s'" -#: builtin/remote.c:666 +#: builtin/remote.c:727 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -17746,17 +19545,17 @@ msgstr "" "\t%s\n" "\tๅฆๆๅฟ ่ฆ่ฏทๆๅจๆดๆฐ้ ็ฝฎใ" -#: builtin/remote.c:702 +#: builtin/remote.c:767 #, c-format msgid "deleting '%s' failed" msgstr "ๅ ้ค '%s' ๅคฑ่ดฅ" -#: builtin/remote.c:736 +#: builtin/remote.c:801 #, c-format msgid "creating '%s' failed" msgstr "ๅๅปบ '%s' ๅคฑ่ดฅ" -#: builtin/remote.c:802 +#: builtin/remote.c:877 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -17766,118 +19565,118 @@ msgid_plural "" msgstr[0] "ๆณจๆ๏ผref/remotes ๅฑ็บงไนๅค็ไธไธชๅๆฏๆช่ขซ็งป้คใ่ฆๅ ้คๅฎ๏ผไฝฟ็จ๏ผ" msgstr[1] "ๆณจๆ๏ผref/remotes ๅฑ็บงไนๅค็ไธไบๅๆฏๆช่ขซ็งป้คใ่ฆๅ ้คๅฎไปฌ๏ผไฝฟ็จ๏ผ" -#: builtin/remote.c:816 +#: builtin/remote.c:891 #, c-format msgid "Could not remove config section '%s'" msgstr "ไธ่ฝ็งป้ค้ ็ฝฎๅฐ่ '%s'" -#: builtin/remote.c:917 +#: builtin/remote.c:994 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ๆฐ็๏ผไธไธๆฌก่ทๅๅฐๅญๅจไบ remotes/%s๏ผ" -#: builtin/remote.c:920 +#: builtin/remote.c:997 msgid " tracked" msgstr " ๅทฒ่ท่ธช" -#: builtin/remote.c:922 +#: builtin/remote.c:999 msgid " stale (use 'git remote prune' to remove)" msgstr " ่ฟๆถ๏ผไฝฟ็จ 'git remote prune' ๆฅ็งป้ค๏ผ" -#: builtin/remote.c:924 +#: builtin/remote.c:1001 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:1042 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ๆ ๆ็ branch.%s.merge๏ผไธ่ฝๅๅบๅฐไธไธชไปฅไธ็ๅๆฏ" -#: builtin/remote.c:974 +#: builtin/remote.c:1051 #, c-format msgid "rebases interactively onto remote %s" msgstr "ไบคไบๅผๅๅบๅฐ่ฟ็จ %s" -#: builtin/remote.c:976 +#: builtin/remote.c:1053 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "ไบคไบๅผๅๅบ๏ผๅซๅๅนถๆไบค๏ผๅฐ่ฟ็จ %s" -#: builtin/remote.c:979 +#: builtin/remote.c:1056 #, c-format msgid "rebases onto remote %s" msgstr "ๅๅบๅฐ่ฟ็จ %s" -#: builtin/remote.c:983 +#: builtin/remote.c:1060 #, c-format msgid " merges with remote %s" msgstr " ไธ่ฟ็จ %s ๅๅนถ" -#: builtin/remote.c:986 +#: builtin/remote.c:1063 #, c-format msgid "merges with remote %s" msgstr "ไธ่ฟ็จ %s ๅๅนถ" -#: builtin/remote.c:989 +#: builtin/remote.c:1066 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s ไปฅๅๅ่ฟ็จ %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1109 msgid "create" msgstr "ๅๅปบ" -#: builtin/remote.c:1035 +#: builtin/remote.c:1112 msgid "delete" msgstr "ๅ ้ค" -#: builtin/remote.c:1039 +#: builtin/remote.c:1116 msgid "up to date" msgstr "ๆๆฐ" -#: builtin/remote.c:1042 +#: builtin/remote.c:1119 msgid "fast-forwardable" msgstr "ๅฏๅฟซ่ฟ" -#: builtin/remote.c:1045 +#: builtin/remote.c:1122 msgid "local out of date" msgstr "ๆฌๅฐๅทฒ่ฟๆถ" -#: builtin/remote.c:1052 +#: builtin/remote.c:1129 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s ๅผบๅถๆจ้่ณ %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1132 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s ๆจ้่ณ %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1136 #, c-format msgid " %-*s forces to %s" msgstr " %-*s ๅผบๅถๆจ้่ณ %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1139 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s ๆจ้่ณ %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1207 msgid "do not query remotes" msgstr "ไธๆฅ่ฏข่ฟ็จ" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid "* remote %s" msgstr "* ่ฟ็จ %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1235 #, c-format msgid " Fetch URL: %s" msgstr " ่ทๅๅฐๅ๏ผ%s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 msgid "(no URL)" msgstr "(ๆ URL)" @@ -17885,32 +19684,32 @@ msgstr "(ๆ URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1250 builtin/remote.c:1252 #, c-format msgid " Push URL: %s" msgstr " ๆจ้ๅฐๅ๏ผ%s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 #, c-format msgid " HEAD branch: %s" msgstr " HEAD ๅๆฏ๏ผ%s" # ่ฏ่ ๏ผไธญๆๅญ็ฌฆไธฒๆผๆฅ๏ผๅฏๅ ้คๅๅฏผ็ฉบๆ ผ -#: builtin/remote.c:1177 +#: builtin/remote.c:1254 msgid "(not queried)" msgstr "๏ผๆชๆฅ่ฏข๏ผ" -#: builtin/remote.c:1179 +#: builtin/remote.c:1256 msgid "(unknown)" msgstr "๏ผๆช็ฅ๏ผ" -#: builtin/remote.c:1183 +#: builtin/remote.c:1260 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD ๅๆฏ๏ผ่ฟ็จ HEAD ๆจก็ณ๏ผๅฏ่ฝๆฏไธๅไธญ็ไธไธช๏ผ๏ผ\n" -#: builtin/remote.c:1195 +#: builtin/remote.c:1272 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -17918,164 +19717,155 @@ msgstr[0] " ่ฟ็จๅๆฏ๏ผ%s" msgstr[1] " ่ฟ็จๅๆฏ๏ผ%s" # ่ฏ่ ๏ผไธญๆๅญ็ฌฆไธฒๆผๆฅ๏ผๅฏๅ ้คๅๅฏผ็ฉบๆ ผ -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1275 builtin/remote.c:1301 msgid " (status not queried)" msgstr "๏ผ็ถๆๆชๆฅ่ฏข๏ผ" -#: builtin/remote.c:1207 +#: builtin/remote.c:1284 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:1215 +#: builtin/remote.c:1292 msgid " Local refs will be mirrored by 'git push'" msgstr " ๆฌๅฐๅผ็จๅฐๅจ 'git push' ๆถ่ขซ้ๅ" -#: builtin/remote.c:1221 +#: builtin/remote.c:1298 #, 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:1242 +#: builtin/remote.c:1319 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "ๆ นๆฎ่ฟ็จ่ฎพ็ฝฎ refs/remotes/<ๅ็งฐ>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1321 msgid "delete refs/remotes/<name>/HEAD" msgstr "ๅ ้ค refs/remotes/<ๅ็งฐ>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1336 msgid "Cannot determine remote HEAD" msgstr "ๆ ๆณ็กฎๅฎ่ฟ็จ HEAD" -#: builtin/remote.c:1261 +#: builtin/remote.c:1338 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "ๅคไธช่ฟ็จ HEAD ๅๆฏใ่ฏทๆ็กฎๅฐ้ๆฉไธไธช็จๅฝไปค๏ผ" -#: builtin/remote.c:1271 +#: builtin/remote.c:1348 #, c-format msgid "Could not delete %s" msgstr "ๆ ๆณๅ ้ค %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1356 #, c-format msgid "Not a valid ref: %s" msgstr "ไธๆฏไธไธชๆๆๅผ็จ๏ผ%s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1358 #, c-format msgid "Could not setup %s" msgstr "ไธ่ฝ่ฎพ็ฝฎ %s" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, c-format msgid " %s will become dangling!" msgstr " %s ๅฐๆไธบๆฌ็ฉบ็ถๆ๏ผ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: builtin/remote.c:1300 +#: builtin/remote.c:1377 #, c-format msgid " %s has become dangling!" msgstr " %s ๅทฒๆไธบๆฌ็ฉบ็ถๆ๏ผ" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "Pruning %s" msgstr "ไฟฎๅช %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1388 #, c-format msgid "URL: %s" msgstr "URL๏ผ%s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1404 #, c-format msgid " * [would prune] %s" msgstr " * [ๅฐๅ ้ค] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1407 #, c-format msgid " * [pruned] %s" msgstr " * [ๅทฒๅ ้ค] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1452 msgid "prune remotes after fetching" msgstr "ๆๅๅๆธ ้ค่ฟ็จ" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 #, c-format msgid "No such remote '%s'" msgstr "ๆฒกๆๆญค่ฟ็จ '%s'" -#: builtin/remote.c:1454 +#: builtin/remote.c:1531 msgid "add branch" msgstr "ๆทปๅ ๅๆฏ" -#: builtin/remote.c:1461 +#: builtin/remote.c:1538 msgid "no remote specified" msgstr "ๆชๆๅฎ่ฟ็จ" -#: builtin/remote.c:1478 +#: builtin/remote.c:1555 msgid "query push URLs rather than fetch URLs" msgstr "ๆฅ่ฏขๆจ้ URL ๅฐๅ๏ผ่้่ทๅ URL ๅฐๅ" -#: builtin/remote.c:1480 +#: builtin/remote.c:1557 msgid "return all URLs" msgstr "่ฟๅๆๆ URL ๅฐๅ" -#: builtin/remote.c:1508 +#: builtin/remote.c:1585 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ๆฒกๆ็ป่ฟ็จไปๅบ '%s' ่ฎพๅฎ URL" -#: builtin/remote.c:1534 +#: builtin/remote.c:1611 msgid "manipulate push URLs" msgstr "ๆไฝๆจ้ URLS" -#: builtin/remote.c:1536 +#: builtin/remote.c:1613 msgid "add URL" msgstr "ๆทปๅ URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1615 msgid "delete URLs" msgstr "ๅ ้ค URLS" -#: builtin/remote.c:1545 +#: builtin/remote.c:1622 msgid "--add --delete doesn't make sense" msgstr "--add --delete ๆ ๆไน" -#: builtin/remote.c:1584 +#: builtin/remote.c:1661 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ๆ ๆ็ๆง URL ๅน้ ๆจก็๏ผ%s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1669 #, c-format msgid "No such URL found: %s" msgstr "ๆชๆพๅฐๆญค URL๏ผ%s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1671 msgid "Will not delete all non-push URLs" msgstr "ๅฐไธไผๅ ้คๆๆ้ๆจ้ URL ๅฐๅ" -#: 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 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [<้้กน>]" -#: builtin/repack.c:27 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18083,111 +19873,111 @@ msgstr "" "ๅข้ repack ๅ bitmap ็ดขๅผไธๅ ผๅฎนใ ไฝฟ็จ --no-write-bitmap-index\n" "ๆ็ฆ็จ pack.writebitmaps ้ ็ฝฎใ" -#: builtin/repack.c:190 +#: builtin/repack.c:197 msgid "could not start pack-objects to repack promisor objects" msgstr "ๆ ๆณๅผๅง pack-objects ๆฅ้ๆฐๆๅ promisor ๅฏน่ฑก" -#: builtin/repack.c:229 builtin/repack.c:408 +#: builtin/repack.c:236 builtin/repack.c:421 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "repack๏ผๆๆๆฅ่ช pack-objects ็ๅฎๆดๅๅ ญ่ฟๅถๅฏน่ฑก IDใ" -#: builtin/repack.c:246 +#: builtin/repack.c:260 msgid "could not finish pack-objects to repack promisor objects" msgstr "ๆ ๆณๅฎๆ pack-objects ๆฅ้ๆฐๆๅ promisor ๅฏน่ฑก" -#: builtin/repack.c:284 +#: builtin/repack.c:297 msgid "pack everything in a single pack" msgstr "ๆๆๅ ๅฎนๆๅ ๅฐไธไธชๅ ๆไปถไธญ" -#: builtin/repack.c:286 +#: builtin/repack.c:299 msgid "same as -a, and turn unreachable objects loose" msgstr "ๅ -a ็ธๅ๏ผๅนถๅฐไธๅฏ่พพ็ๅฏน่ฑก่ฎพไธบๆพๆฃๅฏน่ฑก" -#: builtin/repack.c:289 +#: builtin/repack.c:302 msgid "remove redundant packs, and run git-prune-packed" msgstr "ๅ ้คๅคไฝ็ๅ ๏ผ่ฟ่ก git-prune-packed" -#: builtin/repack.c:291 +#: builtin/repack.c:304 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "ๅ git-pack-objects ไผ ้ๅๆฐ --no-reuse-delta" -#: builtin/repack.c:293 +#: builtin/repack.c:306 msgid "pass --no-reuse-object to git-pack-objects" msgstr "ๅ git-pack-objects ไผ ้ๅๆฐ --no-reuse-object" -#: builtin/repack.c:295 +#: builtin/repack.c:308 msgid "do not run git-update-server-info" msgstr "ไธ่ฟ่ก git-update-server-info" -#: builtin/repack.c:298 +#: builtin/repack.c:311 msgid "pass --local to git-pack-objects" msgstr "ๅ git-pack-objects ไผ ้ๅๆฐ --local" -#: builtin/repack.c:300 +#: builtin/repack.c:313 msgid "write bitmap index" msgstr "ๅ bitmap ็ดขๅผ" -#: builtin/repack.c:302 +#: builtin/repack.c:315 msgid "pass --delta-islands to git-pack-objects" msgstr "ๅ git-pack-objects ไผ ้ๅๆฐ --delta-islands" -#: builtin/repack.c:303 +#: builtin/repack.c:316 msgid "approxidate" msgstr "่ฟไผผๆฅๆ" -#: builtin/repack.c:304 +#: builtin/repack.c:317 msgid "with -A, do not loosen objects older than this" msgstr "ไฝฟ็จ -A๏ผไธ่ฆๅฐๆฉไบ็ปๅฎๆถ้ด็ๅฏน่ฑก่ฟๆ" -#: builtin/repack.c:306 +#: builtin/repack.c:319 msgid "with -a, repack unreachable objects" msgstr "ไฝฟ็จ -a ๏ผ้ๆฐๅฏนไธๅฏ่พพๅฏน่ฑกๆๅ " -#: builtin/repack.c:308 +#: builtin/repack.c:321 msgid "size of the window used for delta compression" msgstr "็จไบๅข้ๅ็ผฉ็็ชๅฃๅผ" -#: builtin/repack.c:309 builtin/repack.c:315 +#: builtin/repack.c:322 builtin/repack.c:328 msgid "bytes" msgstr "ๅญ่" -#: builtin/repack.c:310 +#: builtin/repack.c:323 msgid "same as the above, but limit memory size instead of entries count" msgstr "ๅไธ้ข็็ธไผผ๏ผไฝ้ๅถๅ ๅญๅคงๅฐ่้ๆก็ฎๆฐ" -#: builtin/repack.c:312 +#: builtin/repack.c:325 msgid "limits the maximum delta depth" msgstr "้ๅถๆๅคงๅข้ๆทฑๅบฆ" -#: builtin/repack.c:314 +#: builtin/repack.c:327 msgid "limits the maximum number of threads" msgstr "้ๅถๆๅคง็บฟ็จๆฐ" -#: builtin/repack.c:316 +#: builtin/repack.c:329 msgid "maximum size of each packfile" msgstr "ๆฏไธชๅ ๆไปถ็ๆๅคงๅฐบๅฏธ" -#: builtin/repack.c:318 +#: builtin/repack.c:331 msgid "repack objects in packs marked with .keep" msgstr "ๅฏนๆ ่ฎฐไธบ .keep ็ๅ ไธญ็ๅฏน่ฑก้ๆฐๆๅ " -#: builtin/repack.c:320 +#: builtin/repack.c:333 msgid "do not repack this pack" msgstr "ไธ่ฆๅฏน่ฏฅๅ ๆไปถ้ๆฐๆๅ " -#: builtin/repack.c:330 +#: builtin/repack.c:343 msgid "cannot delete packs in a precious-objects repo" msgstr "ไธ่ฝๅ ้ค็ๅไปๅบไธญ็ๆๅ ๆไปถ" -#: builtin/repack.c:334 +#: builtin/repack.c:347 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable ๅ -A ไธๅ ผๅฎน" -#: builtin/repack.c:417 +#: builtin/repack.c:430 msgid "Nothing new to pack." msgstr "ๆฒกๆๆฐ็่ฆๆๅ ใ" -#: builtin/repack.c:478 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18203,7 +19993,7 @@ msgstr "" "่ญฆๅ๏ผๅนถไธๅฐ่ฏ้ๅฝๅๆนๅๅๆๆไปถๅ็ๆไฝไนๅคฑ่ดฅใ\n" "่ญฆๅ๏ผ่ฏทๆๅจๅฐ %s ไธ็่ฟไบๆไปถ้ๅฝๅ๏ผ\n" -#: builtin/repack.c:526 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "ๅ ้ค '%s' ๅคฑ่ดฅ" @@ -18311,8 +20101,8 @@ msgstr "ๆ ๆณๅฏน %s ๆง่ก fstat" msgid "unable to write object to database" msgstr "ๆ ๆณๅๆฐๆฎๅบๅๅ ฅๅฏน่ฑก" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: 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'" @@ -18331,53 +20121,53 @@ msgstr "็ผ่พๅฏน่ฑกๆไปถๅคฑ่ดฅ" msgid "new object is the same as the old one: '%s'" msgstr "ๆฐๅฏน่ฑกๅๆงๅฏน่ฑก็ธๅ๏ผ'%s'" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "ๆ ๆณๅฐ %s ่งฃๆไธบไธไธชๆไบค" -#: builtin/replace.c:414 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "ๆไบค '%s' ไธญๅซๆๆๅ็ๅๅนถๆ ็ญพ" -#: builtin/replace.c:416 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "ๆไบค '%s' ไธญๅซๆๆ ผๅผ้่ฏฏ็ๅๅนถๆ ็ญพ" -#: builtin/replace.c:428 +#: 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:467 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "ๅๅงๆไบค '%s' ไธญๆไธไธช gpg ็ญพๅ" -#: builtin/replace.c:468 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "ๅจๆฟๆข็ๆไบคไธญ็ญพๅๅฐ่ขซ็งป้ค๏ผ" -#: builtin/replace.c:478 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "ไธ่ฝไธบ '%s' ๅๆฟๆขๆไบค" -#: builtin/replace.c:486 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "ๅฏน '%s' ็งปๆคๆฒกๆๅฟ ่ฆ" -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "ๆฐๆไบคๅๆง็ไธๆ ท๏ผ'%s'" -#: builtin/replace.c:525 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -18386,71 +20176,71 @@ msgstr "" "ไธ่ฝ่ฝฌๆขไธๅ็งปๆค๏ผ\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "ๅๅบๆฟๆข็ๅผ็จ" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "ๅ ้คๆฟๆข็ๅผ็จ" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "็ผ่พ็ฐๅญ็ๅฏน่ฑก" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "ไฟฎๆนไธไธชๆไบค็็ถๆไบค" -#: builtin/replace.c:550 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "่ฝฌๆข็ฐๅญ็็งปๆคๆไปถ" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "ๅฆๆๅญๅจๅๆฟๆขๅผ็จ" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "ไธ่ฆไธบ --edit ๆไฝ็พ่งๆพ็คบๅ ๅฎน" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "ไฝฟ็จๆญคๆ ผๅผ" -#: builtin/replace.c:567 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "ไธๅๅบๆถไธ่ฝไฝฟ็จ --format" -#: builtin/replace.c:575 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "ๅชๆๅไธไธชๆฟๆขๆถ -f ๆๆๆไน" -#: builtin/replace.c:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw ๅชๆๅ --edit ๅ ฑ็จๆๆๆไน" -#: builtin/replace.c:585 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "-d ้่ฆ่ณๅฐไธไธชๅๆฐ" -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "้่ฏฏ็ๅๆฐไธชๆฐ" -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e ้่ฆไธไป ้่ฆไธไธชๅๆฐ" -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-g ้่ฆ่ณๅฐไธไธชๅๆฐ" -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file ไธๅธฆๅๆฐ" -#: builtin/replace.c:615 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "ๅช่ฝไธบ -l ๆไพไธไธชๆจกๅผ" @@ -18477,116 +20267,126 @@ msgid "" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<ๆไบค>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<ๆ ๆๆไบค>] [--] <่ทฏๅพ>..." +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "git reset [-q] [<ๆ ๅฏน่ฑก>] [--] <่ทฏๅพ่กจ่พพๅผ>..." #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<ๆ ๆๆไบค>] [--] [<่ทฏๅพ>...]" +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:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "ๆททๆ" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "่ฝฏๆง" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "็กฌๆง" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "ๅๅนถ" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "ไฟๆ" -#: builtin/reset.c:81 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "ๆจๆฒกๆไธไธชๆๆ็ HEADใ" -#: builtin/reset.c:83 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "ๆ ๆณๆพๅฐ HEAD ๆๅ็ๆ ใ" -#: builtin/reset.c:89 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "ๆ ๆณๆพๅฐ %s ๆๅ็ๆ ใ" +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ็ฐๅจไฝไบ %s" + # ่ฏ่ ๏ผๆฑๅญไน้ดๆ ็ฉบๆ ผ๏ผๆ ๅ ้ค%sๅๅ็ฉบๆ ผ -#: builtin/reset.c:193 +#: builtin/reset.c:195 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "ๅจๅๅนถ่ฟ็จไธญไธ่ฝๅ%s้็ฝฎๆไฝใ" -#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "ๅฎ้ๆจกๅผ๏ผๅชๆฅๅ้่ฏฏ" -#: builtin/reset.c:295 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "้็ฝฎ HEAD ๅ็ดขๅผ" -#: builtin/reset.c:296 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "ๅช้็ฝฎ HEAD" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "้็ฝฎ HEADใ็ดขๅผๅๅทฅไฝๅบ" -#: builtin/reset.c:302 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "้็ฝฎ HEAD ไฝไฟๅญๆฌๅฐๅๆด" -#: builtin/reset.c:308 +#: builtin/reset.c:310 msgid "record only the fact that removed paths will be added later" msgstr "ๅฐๅ ้ค็่ทฏๅพๆ ่ฎฐไธบ็จๅๆทปๅ " -#: builtin/reset.c:326 +#: builtin/reset.c:344 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "ๆ ๆณๅฐ '%s' ่งฃๆไธบไธไธชๆๆ็็ๆฌใ" -#: builtin/reset.c:334 +#: builtin/reset.c:352 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "ๆ ๆณๅฐ '%s' ่งฃๆไธบไธไธชๆๆ็ๆ ๅฏน่ฑกใ" -#: builtin/reset.c:343 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch ไธ --{hardใmixedใsoft} ้้กนไธๅ ผๅฎน" -#: builtin/reset.c:353 +#: builtin/reset.c:371 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed ๅธฆ่ทฏๅพๅทฒๅผ็จ๏ผ่ๆฏ็จ 'git reset -- <่ทฏๅพ>'ใ" # ่ฏ่ ๏ผๆฑๅญไน้ดๆ ็ฉบๆ ผ๏ผๆ ๅ ้ค%sๅๅ็ฉบๆ ผ -#: builtin/reset.c:355 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "ไธ่ฝๅธฆ่ทฏๅพ่ฟ่ก%s้็ฝฎใ" # ่ฏ่ ๏ผๆฑๅญไน้ดๆ ็ฉบๆ ผ๏ผๆ ๅ ้ค%sๅๅ็ฉบๆ ผ -#: builtin/reset.c:370 +#: builtin/reset.c:388 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "ไธ่ฝๅฏน็บฏไปๅบ่ฟ่ก%s้็ฝฎ" -#: builtin/reset.c:374 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "-N ๅช่ฝๅ --mixed ๅๆถไฝฟ็จ" -#: builtin/reset.c:395 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "้็ฝฎๅๅๆถๆๅญ็ๅๆด๏ผ" -#: builtin/reset.c:398 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -18598,53 +20398,48 @@ msgstr "" "้็ฝฎๅ๏ผๆไธพๆชๆๅญๅๆด่ฑ่ดนไบ %.2f ็งใ ๆจๅฏไปฅไฝฟ็จ '--quiet' ้ฟๅ ๆญคๆ ๅตใ\n" "ๅฐ้ ็ฝฎๅ้ reset.quiet ่ฎพ็ฝฎไธบ true ๅฏไฝฟๅ ถๆไธบ้ป่ฎคๅผใ\n" -#: builtin/reset.c:408 +#: builtin/reset.c:434 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "ไธ่ฝ้็ฝฎ็ดขๅผๆไปถ่ณ็ๆฌ '%s'ใ" -#: builtin/reset.c:412 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "ไธ่ฝๅๅ ฅๆฐ็็ดขๅผๆไปถใ" -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "ไธ่ฝๅๆถไฝฟ็จ --exclude-promisor-objects ๅ --missing ้้กน" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "ๅฏน่ฑก่ฟๆปค้่ฆ --objects" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "ๆ ๆ็็จ็ๅผ '%s'" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "rev-list ไธๆฏๆๆพ็คบๆณจ่งฃ" -#: builtin/rev-list.c:530 -msgid "cannot combine --use-bitmap-index with object filtering" -msgstr "ไธ่ฝๅฐ --use-bitmap-index ๅๅฏน่ฑก่ฟๆปค็ปๅไฝฟ็จ" +#: builtin/rev-list.c:615 +msgid "marked counting is incompatible with --objects" +msgstr "ๆ ่ฎฐ่ฎกๆฐๅ --objects ไธๅ ผๅฎน" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<้้กน>] -- [<ๅๆฐ>...]" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "ไฟๆ `--` ไฝไธบไธไธชๅๆฐไผ ้" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "้ๅฐ็ฌฌไธไธช้้้กนๅๆฐๅๅๆญข่งฃๆ" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "ไปฅๅบๅฎ้ฟๆ ผๅผ่พๅบ" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -18786,36 +20581,40 @@ msgid_plural "the following files have local modifications:" msgstr[0] "ๅฆไธๆไปถๆๆฌๅฐไฟฎๆน๏ผ" msgstr[1] "ๅฆไธๆไปถๆๆฌๅฐไฟฎๆน๏ผ" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "ไธๅๅบๅ ้ค็ๆไปถ" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "ๅชไป็ดขๅผๅบๅ ้ค" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "ๅฟฝ็ฅๆไปถๆดๆฐ็ถๆๆฃๆฅ" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "ๅ ่ฎธ้ๅฝๅ ้ค" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "ๅณไฝฟๆฒกๆๅน้ ๏ผไนไปฅ้ถ็ถๆ้ๅบ" -#: builtin/rm.c:289 +#: 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:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "ๆชๆไพ -r ้้กนไธไผ้ๅฝๅ ้ค '%s'" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm๏ผไธ่ฝๅ ้ค %s" @@ -18831,55 +20630,76 @@ msgstr "" "receive-pack>] [--verbose] [--thin] [--atomic] [<ไธปๆบ>:]<็ฎๅฝ> [<ๅผ็จ>...]\n" " --all ๅๆ็กฎ็ <ๅผ็จ> ไบๆฅใ" -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:182 msgid "remote name" msgstr "่ฟ็จๅ็งฐ" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:195 msgid "use stateless RPC protocol" msgstr "ไฝฟ็จๆ ็ถๆ็ RPC ๅ่ฎฎ" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:196 msgid "read refs from stdin" msgstr "ไปๆ ๅ่พๅ ฅ่ฏปๅๅผ็จ" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:197 msgid "print status from remote helper" msgstr "ๆๅฐๆฅ่ช่ฟ็จ helper ็็ถๆ" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:15 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<้้กน>] [<็ๆฌ่ๅด>] [[--] <่ทฏๅพ>...]" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<้้กน>]" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:134 +msgid "using multiple --group options with stdin is not supported" +msgstr "ไธๆฏๆๅๆ ๅ่พๅ ฅไธ่ตทไฝฟ็จๅคไธช --group ้้กน" + +#: builtin/shortlog.c:144 +msgid "using --group=trailer with stdin is not supported" +msgstr "ไธๆฏๆๅๆ ๅ่พๅ ฅไธ่ตทไฝฟ็จ --group=trailer" + +#: builtin/shortlog.c:388 +#, c-format +msgid "unknown group type: %s" +msgstr "ๆช็ฅๅ็ป็ฑปๅ๏ผ%s" + +#: builtin/shortlog.c:416 msgid "Group by committer rather than author" msgstr "ๆ็ งๆไบค่ ๅ็ป่ไธๆฏไฝ่ " -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:419 msgid "sort output according to the number of commits per author" msgstr "ๆ นๆฎๆฏไธชไฝ่ ็ๆไบคๆฐ้ๆๅบ" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:421 msgid "Suppress commit descriptions, only provides commit count" msgstr "้่ๆไบค่ฏดๆ๏ผๅชๆไพๆไบคๆฐ้" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:423 msgid "Show the email address of each author" msgstr "ๆพ็คบๆฏไธชไฝ่ ็็ตๅญ้ฎไปถๅฐๅ" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:424 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:425 msgid "Linewrap output" msgstr "ๆ่ก่พๅบ" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:427 +msgid "field" +msgstr "ๅญๆฎต" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "ๆๅญๆฎตๅ็ป" + +#: builtin/shortlog.c:456 msgid "too many arguments given outside repository" msgstr "ไปๅบๅคๆง่กๆไพไบๅคชๅค็ๅๆฐ" @@ -19017,6 +20837,14 @@ msgstr "'%s' ไธๆฏไธไธชๆๆ็ๅผ็จใ" msgid "cannot find commit %s (%s)" msgstr "ไธ่ฝๆพๅฐๆไบค %s๏ผ%s๏ผ" +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "ๅๅธ็ฎๆณ" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "ๆช็ฅ็ๅๅธ็ฎๆณ" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -19061,15 +20889,86 @@ msgstr "ไธๆๅฐ็ปๆๅฐๆ ๅ่พๅบ๏ผไพๅฆไธ --verify ๅๆฐๅ ฑ็จ๏ผ" msgid "show refs from stdin that aren't in local repository" msgstr "ๆพ็คบไปๆ ๅ่พๅ ฅไธญ่ฏปๅ ฅ็ไธๅจๆฌๅฐไปๅบไธญ็ๅผ็จ" -#: builtin/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <้้กน>" + +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:76 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "ๆฌๅทฅไฝๅบไธๆฏ็จ็ๆจกๅผ๏ผ็จ็ๆฃๅบๆไปถๅฏ่ฝไธๅญๅจ๏ผ" + +#: builtin/sparse-checkout.c:228 +msgid "failed to create directory for sparse-checkout file" +msgstr "ๆ ๆณไธบ็จ็ๆฃๅบๆไปถๅๅปบ็ฎๅฝ" + +#: builtin/sparse-checkout.c:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "ๆ ๆณๅ็บงไปๅบๆ ผๅผไปฅๅฏ็จ worktreeConfig" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "ๆ ๆณ่ฎพ็ฝฎ extensions.worktreeConfig" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "ๅๅงๅ็จ็ๆฃๅบไธบ cone ๆจกๅผ" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "ๆ ๆณๆๅผ '%s'" + +#: builtin/sparse-checkout.c:401 +#, c-format +msgid "could not normalize path %s" +msgstr "ๆ ๆณ่ง่ๅ่ทฏๅพ %s" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <ๆจกๅผ>)" + +#: builtin/sparse-checkout.c:438 +#, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "ๆ ๆณไธบ C ่ฏญ่จ้ฃๆ ผ็ๅญ็ฌฆไธฒ '%s' ๅปๅผๅท" + +#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +msgid "unable to load existing sparse-checkout patterns" +msgstr "ๆ ๆณๅ ่ฝฝ็ฐๅญ็็จ็ๆฃๅบๆจกๅผ" + +#: builtin/sparse-checkout.c:561 +msgid "read patterns from standard in" +msgstr "ไปๆ ๅ่พๅ ฅ่ฏปๅๆจกๅผ" + +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:623 +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:42 +#: 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:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -19077,25 +20976,27 @@ 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:62 +#: 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:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: 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=<file> [--pathspec-file-nul]]\n" " [--] [<่ทฏๅพ่งๆ ผ>...]]" -#: builtin/stash.c:31 builtin/stash.c:84 +#: 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>]" @@ -19103,189 +21004,201 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<ๆถๆฏ>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:72 +#: 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:127 +#: 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:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "ๆๅฎไบๅคชๅค็็ๆฌ๏ผ%s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "ๆชๅ็ฐ่ดฎ่ๆก็ฎใ" -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "%s ไธๆฏไธไธชๆๆ็ๅผ็จๅ" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear ไธๆฏๆๅๆฐ" -#: builtin/stash.c:403 +#: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" -msgstr "ๆ ๆณๅจๅๅนถ่ฟ็จๅบ็จ่ดฎ่" +msgstr "ๆ ๆณๅจๅๅนถ่ฟ็จไธญๅบ็จ่ดฎ่" -#: builtin/stash.c:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "ๆ ๆณ็ๆๅทฎๅผ %s^!." -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "็ดขๅผไธญๆๅฒ็ชใๅฐ่ฏไธ็จ --indexใ" -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "ไธ่ฝไฟๅญ็ดขๅผๆ " -#: builtin/stash.c:434 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "ๆ ๆณไป่ดฎ่ๆก็ฎไธญๆขๅคๆช่ท่ธชๆไปถ" -#: builtin/stash.c:448 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "ๆญฃๅจๅๅนถ %s ๅ %s" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "็ดขๅผๆชไป่ดฎ่ไธญๆขๅคใ" -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "ๅฐ่ฏ้ๅปบ็ดขๅผ" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "ไธขๅผไบ %s๏ผ%s๏ผ" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s๏ผๆ ๆณไธขๅผ่ดฎ่ๆก็ฎ" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' ไธๆฏไธไธช่ดฎ่ๅผ็จ" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 msgid "The stash entry is kept in case you need it again." msgstr "่ดฎ่ๆก็ฎ่ขซไฟ็ไปฅๅคๆจๅๆฌก้่ฆใ" -#: builtin/stash.c:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "ๆชๆๅฎๅๆฏๅ" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "ๆ ๆณ็จ %2$s ๆดๆฐ %1$s" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 msgid "stash message" msgstr "่ดฎ่่ฏดๆ" -#: builtin/stash.c:818 +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" ้่ฆไธไธช <ๆไบค> ๅๆฐ" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1043 msgid "No changes selected" msgstr "ๆฒกๆ้ๆฉๅๆด" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1143 msgid "You do not have the initial commit yet" msgstr "ๆจๅฐๆชๅปบ็ซๅๅงๆไบค" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1170 msgid "Cannot save the current index state" msgstr "ๆ ๆณไฟๅญๅฝๅ็ดขๅผ็ถๆ" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1179 msgid "Cannot save the untracked files" msgstr "ๆ ๆณไฟๅญๆช่ท่ธชๆไปถ" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1190 builtin/stash.c:1199 msgid "Cannot save the current worktree state" msgstr "ๆ ๆณไฟๅญๅฝๅๅทฅไฝๅบ็ถๆ" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1227 msgid "Cannot record working tree state" msgstr "ไธ่ฝ่ฎฐๅฝๅทฅไฝๅบ็ถๆ" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1276 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "ไธ่ฝๅๆถไฝฟ็จๅๆฐ --patch ๅ --include-untracked ๆ --all" -#: builtin/stash.c:1285 +#: builtin/stash.c:1292 msgid "Did you forget to 'git add'?" msgstr "ๆจๆฏๅฆๅฟไบๆง่ก 'git add'๏ผ" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1307 msgid "No local changes to save" msgstr "ๆฒกๆ่ฆไฟๅญ็ๆฌๅฐไฟฎๆน" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1314 msgid "Cannot initialize stash" msgstr "ๆ ๆณๅๅงๅ่ดฎ่" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1329 msgid "Cannot save the current status" msgstr "ๆ ๆณไฟๅญๅฝๅ็ถๆ" -#: builtin/stash.c:1327 +#: builtin/stash.c:1334 #, c-format msgid "Saved working directory and index state %s" msgstr "ไฟๅญๅทฅไฝ็ฎๅฝๅ็ดขๅผ็ถๆ %s" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1424 msgid "Cannot remove worktree changes" msgstr "ๆ ๆณๅ ้คๅทฅไฝๅบๅๆด" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1463 builtin/stash.c:1528 msgid "keep index" msgstr "ไฟๆ็ดขๅผ" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "stash in patch mode" msgstr "ไปฅ่กฅไธๆจกๅผ่ดฎ่" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "quiet mode" msgstr "้้ปๆจกๅผ" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "include untracked files in stash" msgstr "่ดฎ่ไธญๅ ๅซๆช่ท่ธชๆไปถ" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1470 builtin/stash.c:1535 msgid "include ignore files" msgstr "ๅ ๅซๅฟฝ็ฅ็ๆไปถ" -#: builtin/stash.c:1555 -#, c-format -msgid "could not exec %s" -msgstr "ไธ่ฝๆง่ก %s" +#: builtin/stash.c:1570 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"ๅฏน stash.useBuiltin ็ๆฏๆๅทฒ่ขซๅ ้ค๏ผ\n" +"่ฏฆ่ง 'git help config' ไธญ็ๆก็ฎใ" #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -19303,40 +21216,40 @@ msgstr "่ทณ่ฟๅ็งป้คๆๆ็ๆณจ้่ก" msgid "prepend comment character and space to each line" msgstr "ไธบๆฏไธ่ก็่ก้ฆๆทปๅ ๆณจ้็ฌฆๅ็ฉบๆ ผ" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "ๆๆไธไธชๅฎๆด็ๅผ็จๅ็งฐ๏ผๅดๅพๅฐ %s" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote ไธๅธฆๅๆฐ" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "ๆ ๆณไป url '%s' ๅฅ็ฆปไธไธช็ปไปถ" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "็ธๅฏน่ทฏๅพ็ๆฟไปฃ้่ฎฐ๏ผanchor๏ผ" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<่ทฏๅพ>] [<่ทฏๅพ>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "ๅจ .gitmodules ไธญๆชๆพๅฐๅญๆจก็ป '%s' ็ url" -#: builtin/submodule--helper.c:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "่ฟๅ ฅ '%s'\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -19345,7 +21258,7 @@ msgstr "" "ๅฏน %s ๆง่ก run_command ่ฟๅ้้ถๅผใ\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19355,119 +21268,172 @@ msgstr "" "ๅจ้ๅฝ %s ็ๅญๆจก็ปๆง่ก run_command ๆถ่ฟๅ้้ถๅผใ\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "้ปๆญข่ฟๅ ฅๆฏไธไธชๅญๆจก็ปๅฝไปค็่พๅบ" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" msgstr "้ๅฝ่ฟๅ ฅๅตๅฅๅญๆจก็ปไธญ" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <ๅฝไปค>" -#: builtin/submodule--helper.c:597 +#: 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:665 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "ๆ ๆณไธบๅญๆจก็ป '%s' ๆณจๅ url" -#: builtin/submodule--helper.c:669 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "ๅญๆจก็ป '%s'๏ผ%s๏ผๅทฒๅฏน่ทฏๅพ '%s' ๆณจๅ\n" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "่ญฆๅ๏ผๅปบ่ฎฎๅญๆจก็ป '%s' ไฝฟ็จๅฝไปคๆดๆฐๆจกๅผ\n" -#: builtin/submodule--helper.c:686 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "ๆ ๆณไธบๅญๆจก็ป '%s' ๆณจๅๆดๆฐๆจกๅผ" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "้ปๆญขๅญๆจก็ปๅๅงๅ็่พๅบ" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<้้กน>] [<่ทฏๅพ>]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "ๅจ .gitmodules ไธญๆฒกๆๅ็ฐ่ทฏๅพ '%s' ็ๅญๆจก็ปๆ ๅฐ" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:835 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "ๆ ๆณ่งฃๆๅญๆจก็ป '%s' ็ HEAD ๅผ็จ" -#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "้ๅฝๅญๆจก็ป '%s' ๅคฑ่ดฅ" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "้ปๆญขๅญๆจก็ป็ถๆ่พๅบ" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:887 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "ไฝฟ็จๅญๅจๅจ็ดขๅผไธญ็ๆไบค๏ผ่้ๅญๅจๅจๅญๆจก็ป HEAD ไธญ็ๆไบค" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" msgstr "้ๅฝ่ฟๅ ฅๅตๅฅๅญๆจก็ปไธญ" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<่ทฏๅพ>...]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <่ทฏๅพ>" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "* %s %s๏ผๆฐๆฎๅฏน่ฑก๏ผ->%s๏ผๅญๆจก็ป๏ผ" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "* %s %s๏ผๅญๆจก็ป๏ผ->%s๏ผๆฐๆฎๅฏน่ฑก๏ผ" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "ไธ่ฝไป '%s' ๅๅปบๅๅธๅฏน่ฑก" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "ๆๅค็ๆจกๅผ %o\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "ไฝฟ็จๅญๅจๅจ็ดขๅผไธญ็ๆไบค๏ผ่้ๅญๅจๅจๅญๆจก็ป HEAD ไธญ็ๆไบค" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "ๆฏ่พๅญๅจๅจ็ดขๅผๅๅญๆจก็ป HEAD ไธญ็ๆไบค" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "่ทณ่ฟ่ฎพ็ฝฎไบ 'ignore_config' ไธบ 'all' ็ๅญๆจก็ป" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "้ๅถๆป็ป็ๅคงๅฐ" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule--helper summary [<้้กน>] [<ๆไบค>] [--] [<่ทฏๅพ>]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "ไธ่ฝไธบ HEAD ่ทๅไธไธช็ๆฌ" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "--cached ๅ --files ๆฏไบๆฅ็" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "ไธบ '%s' ๅๆญฅๅญๆจก็ป url\n" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "ๆ ๆณไธบๅญๆจก็ป่ทฏๅพ '%s' ๆณจๅ url" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "ๆ ๆณๅพๅฐๅญๆจก็ป '%s' ็้ป่ฎค่ฟ็จๅ ณ่" -#: builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "ๆ ๆณไธบๅญๆจก็ป '%s' ๆดๆฐ่ฟ็จๅ ณ่" -#: builtin/submodule--helper.c:1048 +#: builtin/submodule--helper.c:1485 msgid "Suppress output of synchronizing submodule url" msgstr "้ปๆญขๅญๆจก็ป url ๅๆญฅ็่พๅบ" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<่ทฏๅพ>]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -19476,230 +21442,291 @@ msgstr "" "ๅญๆจก็ปๅทฅไฝๅบ '%s' ๅ ๅซไธไธช .git ็ฎๅฝ๏ผๅฆๆๆจ็กฎ้ๅ ้คๅฎๅๅ ถๅ จ้จๅๅฒ๏ผไฝฟ็จ 'rm " "-rf' ๅฝไปค๏ผ" -#: builtin/submodule--helper.c:1121 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "ๅญๆจก็ปๅทฅไฝๅบ '%s' ๅ ๅซๆฌๅฐไฟฎๆน๏ผไฝฟ็จ '-f' ไธขๅผๅฎไปฌ" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "ๅทฒๆธ ้ค็ฎๅฝ '%s'\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "ๆ ๆณ็งป้คๅญๆจก็ปๅทฅไฝๅบ '%s'\n" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "ไธ่ฝๅๅปบ็ฉบ็ๅญๆจก็ป็ฎๅฝ %s" -#: builtin/submodule--helper.c:1158 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "ๅญๆจก็ป '%s'๏ผ%s๏ผๆชๅฏน่ทฏๅพ '%s' ๆณจๅ\n" -#: builtin/submodule--helper.c:1187 +#: builtin/submodule--helper.c:1624 msgid "Remove submodule working trees even if they contain local changes" msgstr "ๅ ้คๅญๆจก็ปๅทฅไฝๅบ๏ผๅณไฝฟๅ ๅซๆฌๅฐไฟฎๆน" -#: builtin/submodule--helper.c:1188 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "ๅฐๆๆๅญๆจก็ปๅๆถๆณจๅ" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<่ทฏๅพ>...]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "ๅฆๆๆจ็กฎๅฎๆณ่ฆๅฏนๆๆๅญๆจก็ปๆง่กๅๆถๅๅงๅ๏ผ่ฏทไฝฟ็จ '--all'" -#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1713 +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:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "ๅญๆจก็ป '%s' ไธ่ฝๆทปๅ ไปๅบๅค้๏ผ%s" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "ไธ่ฝ่ฏๅซ submodule.alternateErrorStrategy ็ๅๅผ '%s'" -#: builtin/submodule--helper.c:1348 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "ไธ่ฝ่ฏๅซ submodule.alternateLocaion ็ๅๅผ '%s'" -#: builtin/submodule--helper.c:1371 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "ๆฐ็ๅญๆจก็ปๅฐ่ฆๅ ้็่ทฏๅพ" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "ๆฐๅญๆจก็ป็ๅ็งฐ" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "ๅ ้ๅญๆจก็ป็ url ๅฐๅ" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "ๆต ๅ ้็ๆทฑๅบฆ" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "ๅผบๅถๆพ็คบๅ ้่ฟๅบฆ" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +msgid "disallow cloning into non-empty directory" +msgstr "ไธๅ ่ฎธๅ ้ๅฐไธไธช้็ฉบ็ฎๅฝ" + +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<่ทฏๅพ>] [--quiet] [--reference <ไปๅบ>] " -"[--name <ๅๅญ>] [--depth <ๆทฑๅบฆ>] --url <url> --path <่ทฏๅพ>" +"[--name <ๅๅญ>] [--depth <ๆทฑๅบฆ>] [--single-branch] --url <url> --path <่ทฏๅพ>" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1873 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "ๆ็ปๅจๅฆไธไธชๅญๆจก็ป็ git dir ไธญๅๅปบ/ไฝฟ็จ '%s'" + +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "ๆ ๆณๅ ้ '%s' ๅฐๅญๆจก็ป่ทฏๅพ '%s'" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "็ฎๅฝ้็ฉบ๏ผ'%s'" + +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "ๆ ๆณๅพๅฐ '%s' ็ๅญๆจก็ป็ฎๅฝ" -#: builtin/submodule--helper.c:1474 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "ๅญๆจก็ป '%2$s' ็ๆดๆฐๆจกๅผ '%1$s' ๆ ๆ" -#: builtin/submodule--helper.c:1478 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "ไธบๅญๆจก็ป '%2$s' ้ ็ฝฎ็ๆดๆฐๆจกๅผ '%1$s' ๆ ๆ" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "ๅญๆจก็ป '%s' ๅฐๆชๅๅงๅ" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "ไน่ฎธๆจๆณ่ฆๆง่ก 'update --init'๏ผ" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "็ฅ่ฟๆชๅๅนถ็ๅญๆจก็ป %s" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "็ฅ่ฟๅญๆจก็ป '%s'" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "ๅ ้ '%s' ๅคฑ่ดฅใๆ่ฎกๅ้่ฏ" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "็ฌฌไบๆฌกๅฐ่ฏๅ ้ '%s' ๅคฑ่ดฅ๏ผ้ๅบ" -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "ๅฐๅทฅไฝๅบ็่ทฏๅพ" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "ๅทฅไฝๅบไธญ็่ทฏๅพ๏ผ้ๅฝๅตๅฅๅญๆจก็ป" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebaseใmergeใcheckout ๆ none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:2340 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "ๅๅปบไธไธชๆๅฎๆทฑๅบฆ็ๆต ๅ ้" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "ๅนถๅไปปๅก" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "ๅๅงๅ ้ๆฏๅฆๅบ่ฏฅ้ตๅฎๆจ่็ๆต ๅ ้้้กน" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "ไธ่ฆ่พๅบๅ ้่ฟๅบฆ" -#: 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:2357 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=<่ทฏๅพ>] [<่ทฏๅพ>...]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "update ๅๆฐๅๅผ้่ฏฏ" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:2418 #, 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:2061 +#: builtin/submodule--helper.c:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "ๆ ๆณ่ทๅพๅญๆจก็ป '%s' ็ไปๅบๅฅๆ" -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "ๅจๅญๆจก็ปไธญ้ๅฝ" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<้้กน>] [<่ทฏๅพ>...]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "ๆฃๆฅๅๅ ฅ .gitmodules ๆไปถๆฏๅฆๅฎๅ จ" -#: builtin/submodule--helper.c:2159 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "ๅๆถ .gitmodules ๆไปถไธญ็่ฎพ็ฝฎ" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <ๅ็งฐ> [<ๅผ>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <ๅ็งฐ>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "่ฏท็กฎ่ฎค .gitmodules ๆไปถๅจๅทฅไฝๅบ้" -#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2681 +msgid "Suppress output for setting url of a submodule" +msgstr "้ปๆญข่ฎพ็ฝฎๅญๆจก็ป URL ็่พๅบ" + +#: builtin/submodule--helper.c:2685 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper set-url [--quiet] <่ทฏๅพ> <ๆฐๅฐๅ>" + +#: builtin/submodule--helper.c:2718 +msgid "set the default tracking branch to master" +msgstr "่ฎพ็ฝฎ้ป่ฎค่ท่ธชๅๆฏไธบ master" + +#: builtin/submodule--helper.c:2720 +msgid "set the default tracking branch" +msgstr "่ฎพ็ฝฎ้ป่ฎค่ท่ธชๅๆฏ" + +#: builtin/submodule--helper.c:2724 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <่ทฏๅพ>" + +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <ๅๆฏ> <่ทฏๅพ>" + +#: builtin/submodule--helper.c:2732 +msgid "--branch or --default required" +msgstr "้่ฆ --branch ๆ --default" + +#: builtin/submodule--helper.c:2735 +msgid "--branch and --default are mutually exclusive" +msgstr "--branch ๅ --default ๆฏไบๆฅ็" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ไธๆฏๆ --super-prefix" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' ไธๆฏไธไธชๆๆ็ submodule--helper ๅญๅฝไปค" @@ -19724,11 +21751,11 @@ msgstr "ๅ ้ค็ฌฆๅทๅผ็จ" msgid "shorten ref output" msgstr "็ผฉ็ญๅผ็จ่พๅบ" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "ๅๅ " -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "ๆดๆฐ็ๅๅ " @@ -19748,11 +21775,12 @@ msgstr "git tag -d <ๆ ็ญพๅ>..." msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" "git tag -l [-n[<ๆฐๅญ>]] [--contains <ๆไบค>] [--no-contains <ๆไบค>] [--points-" "at <ๅฏน่ฑก>]\n" -"\t\t[--format=<ๆ ผๅผ>] [--[no-]merged [<ๆไบค>]] [<ๆจกๅผ>...]" +"\t\t[--format=<ๆ ผๅผ>] [--merged <ๆไบค>] [--no-merged <ๆไบค>] [<ๆจกๅผ>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -19820,346 +21848,350 @@ msgstr "" msgid "bad object type." msgstr "ๅ็ๅฏน่ฑก็ฑปๅใ" -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "ๆ ๆ ็ญพ่ฏดๆ๏ผ" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "ๆ ็ญพ่ฏดๆ่ขซไฟ็ๅจ %s\n" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "ๅๅบๆ ็ญพๅ็งฐ" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "ๆฏไธชๆ ็ญพไฟกๆฏๆๅฐ <n> ่ก" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "ๅ ้คๆ ็ญพ" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "้ช่ฏๆ ็ญพ" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "ๆ ็ญพๅๅปบ้้กน" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "้ๆณจๆ ็ญพ๏ผ้่ฆไธไธช่ฏดๆ" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "ๆ ็ญพ่ฏดๆ" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "ๅผบๅถ็ผ่พๆ ็ญพ่ฏดๆ" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "้ๆณจๅนถ้ๅ GPG ็ญพๅ็ๆ ็ญพ" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "ไฝฟ็จๅฆๅค็็ง้ฅ็ญพๅ่ฏฅๆ ็ญพ" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "ๅฆๆๅญๅจ๏ผๆฟๆข็ฐๆ็ๆ ็ญพ" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "ๅๅปบๅผ็จๆฅๅฟ" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "ๆ ็ญพๅ่กจ้้กน" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "ไปฅๅ็ๆนๅผๆพ็คบๆ ็ญพๅ่กจ" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "ๅชๆๅฐๅ ๅซ่ฏฅๆไบค็ๆ ็ญพ" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "ๅชๆๅฐไธๅ ๅซ่ฏฅๆไบค็ๆ ็ญพ" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "ๅชๆๅฐๅทฒ็ปๅๅนถ็ๆ ็ญพ" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "ๅชๆๅฐๅฐๆชๅๅนถ็ๆ ็ญพ" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "ๅชๆๅฐๆๅ่ฏฅๅฏน่ฑก็ๆ ็ญพ" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "--column ๅ -n ไธๅ ผๅฎน" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "-n ้้กนๅชๅ ่ฎธ็จๅจๅ่กจๆพ็คบๆจกๅผ" -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "--contains ้้กนๅชๅ ่ฎธ็จๅจๅ่กจๆพ็คบๆจกๅผ" -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "--no-contains ้้กนๅชๅ ่ฎธ็จๅจๅ่กจๆพ็คบๆจกๅผ" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "--points-at ้้กนๅชๅ ่ฎธ็จๅจๅ่กจๆพ็คบๆจกๅผ" -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "--merged ๅ --no-merged ้้กนๅชๅ ่ฎธ็จๅจๅ่กจๆพ็คบๆจกๅผ" -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "ๅชๅ ่ฎธไธไธช -F ๆ -m ้้กนใ" -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "ๅคชๅคๅๆฐ" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ไธๆฏไธไธชๆๆ็ๆ ็ญพๅ็งฐใ" -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "ๆ ็ญพ '%s' ๅทฒๅญๅจ" -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "ๅทฒๆดๆฐๆ ็ญพ '%s'๏ผๆพไธบ %s๏ผ\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "ๅฑๅผๅฏน่ฑกไธญ" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "ๅๅปบ็ฎๅฝ %s ๅคฑ่ดฅ" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "ๅๅปบๆไปถ %s ๅคฑ่ดฅ" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "ๅ ้คๆไปถ %s ๅคฑ่ดฅ" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "ๅ ้ค็ฎๅฝ %s ๅคฑ่ดฅ" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "ๅจ '%s' ไธญๆต่ฏ mtime " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "ๆทปๅ ไธไธชๆฐๆไปถๅ๏ผ็ฎๅฝ็็ถๆไฟกๆฏๆชๆนๅ" -#: builtin/update-index.c:166 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "ๆทปๅ ไธไธชๆฐ็ฎๅฝๅ๏ผ็ฎๅฝ็็ถๆไฟกๆฏๆชๆนๅ" -#: builtin/update-index.c:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "ๆดๆฐไธไธชๆไปถๅ๏ผ็ฎๅฝ็็ถๆไฟกๆฏ่ขซไฟฎๆน" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "ๅจๅญ็ฎๅฝไธญๆทปๅ ๆไปถๅ๏ผ็ฎๅฝ็็ถๆไฟกๆฏ่ขซไฟฎๆน" -#: builtin/update-index.c:201 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "ๅ ้คไธไธชๆไปถๅ๏ผ็ฎๅฝ็็ถๆไฟกๆฏๆชๆนๅ" -#: builtin/update-index.c:214 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "ๅ ้คไธไธช็ฎๅฝๅ๏ผ็ฎๅฝ็็ถๆไฟกๆฏๆชๆนๅ" -#: builtin/update-index.c:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<้้กน>] [--] [<ๆไปถ>...]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "ๅฝ็ดขๅผ้่ฆๆดๆฐๆถ็ปง็ปญๅทๆฐ" -#: builtin/update-index.c:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "ๅทๆฐ๏ผๅฟฝ็ฅๅญๆจก็ป" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "ไธๅฟฝ็ฅๆฐ็ๆไปถ" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "่ฎฉๆไปถๆฟๆข็ฎๅฝ๏ผๅไนไบฆ็ถ๏ผ" -#: builtin/update-index.c:981 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "้็ฅๆไปถไปๅทฅไฝๅบไธขๅคฑ" -#: builtin/update-index.c:983 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "ๅณไฝฟ็ดขๅผๅบๅ ๅซๆชๅๅนถ็ๆก็ฎไนๆง่กๅทๆฐ" -#: builtin/update-index.c:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "ๅทๆฐ็ป่ฎกไฟกๆฏ" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "็ฑปไผผไบ --refresh๏ผไฝๆฏๅฟฝ็ฅ assume-unchanged ่ฎพ็ฝฎ" -#: builtin/update-index.c:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<ๅญๅๆจกๅผ>,<ๅฏน่ฑก>,<่ทฏๅพ>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "ๆทปๅ ๆๅฎ็ๆก็ฎๅฐ็ดขๅผๅบ" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "ๆๆไปถๆ ่ฎฐไธบ \"ๆฒกๆๅๆด\"" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "ๆธ ้ค assumed-unchanged ไฝ" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "ๆๆไปถๆ ่ฎฐไธบ \"ไป ็ดขๅผ\"" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "ๆธ ้ค skip-worktree ไฝ" -#: builtin/update-index.c:1017 +#: 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:1019 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "ๅณไฝฟๅญๅจๅทฅไฝๅบ้๏ผไนๅ ้ค่ทฏๅพ" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "ๆบๅธฆ --stdin๏ผ่พๅ ฅ็่กไปฅ null ๅญ็ฌฆ็ปๆญข" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "ไปๆ ๅ่พๅ ฅไธญ่ฏปๅ้่ฆๆดๆฐ็่ทฏๅพๅ่กจ" -#: builtin/update-index.c:1027 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "ไปๆ ๅ่พๅ ฅๆทปๅ ๆก็ฎๅฐ็ดขๅผๅบ" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "ไธบๆๅฎๆไปถ้ๆฐ็ๆ็ฌฌ2ๅ็ฌฌ3ๆๅญๅบ" -#: builtin/update-index.c:1035 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "ๅชๆดๆฐไธ HEAD ไธๅ็ๆก็ฎ" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ๅฟฝ็ฅๅทฅไฝๅบไธขๅคฑ็ๆไปถ" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "ๅจๆ ๅ่พๅบๆพ็คบๆไฝ" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) ๅฟ่ฎฐไฟๅญ็ๆช่งฃๅณ็ๅฒ็ช" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "ไปฅ่ฟ็งๆ ผๅผๅๅ ฅ็ดขๅผๅบ" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "ๅฏ็จๆ็ฆ็จ็ดขๅผๆๅ" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "ๅฏ็จ/็ฆ็จๅฏนๆช่ท่ธชๆไปถ็็ผๅญ" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "ๆต่ฏๆไปถ็ณป็ปๆฏๅฆๆฏๆๆช่ท่ธชๆไปถ็ผๅญ" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "ๆ ้ๆฃๆตๆไปถ็ณป็ป๏ผๅฏ็จๅฏนๆช่ท่ธชๆไปถ็็ผๅญ" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "ๅณไฝฟๆฒกๆ่ขซๆ ่ฎฐไธบๅทฒๆดๆน๏ผไน่ฆๅๅบ็ดขๅผ" -#: builtin/update-index.c:1060 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "ๅฏ็จๆ็ฆ็จๆไปถ็ณป็ป็ๆง" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "ๆ ่ฎฐๆไปถไธบ fsmonitor ๆๆ" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "ๆธ ้ค fsmonitor ๆๆไฝ" -#: builtin/update-index.c:1168 +#: 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:1177 +#: 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:1188 +#: 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" @@ -20167,11 +22199,11 @@ msgstr "" "core.untrackedCache ่ขซ่ฎพ็ฝฎไธบ trueใๅฆๆๆจ็กฎๅฎ่ฆ็ฆ็จๆช่ท่ธชๆไปถ็ผๅญ๏ผ่ฏทๅ ้คๆไฟฎ" "ๆนๅฎใ" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "็ผๅญๆช่ท่ธชๆไปถ่ขซ็ฆ็จ" -#: builtin/update-index.c:1200 +#: 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" @@ -20179,25 +22211,25 @@ msgstr "" "core.untrackedCache ่ขซ่ฎพ็ฝฎไธบ falseใๅฆๆๆจ็กฎๅฎ่ฆๅฏ็จๆช่ท่ธชๆไปถ็ผๅญ๏ผ่ฏทๅ ้คๆ" "ไฟฎๆนๅฎใ" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "็ผๅญๆช่ท่ธชๆไปถๅจ '%s' ๅฏ็จ" -#: builtin/update-index.c:1212 +#: 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:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor ่ขซๅฏ็จ" -#: builtin/update-index.c:1219 +#: 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:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor ่ขซ็ฆ็จ" @@ -20213,19 +22245,19 @@ msgstr "git update-ref [<้้กน>] <ๅผ็จๅ> <ๆฐๅผ> [<ๆงๅผ>]" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<้้กน>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "ๅ ้คๅผ็จ" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "ๆดๆฐ <ๅผ็จๅ> ๆฌ่บซ่ไธๆฏๅฎๆๅ็ๅผ็จ" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "ๆ ๅ่พๅ ฅๆไปฅ NUL ๅญ็ฌฆ็ปๆญข็ๅๆฐ" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "ไปๆ ๅ่พๅ ฅ่ฏปๅๆดๆฐ" @@ -20269,15 +22301,15 @@ msgstr "ๆๅฐๆไบคๅ ๅฎน" msgid "print raw gpg status output" msgstr "ๆๅฐๅๅง gpg ็ถๆ่พๅบ" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <ๅ >..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "ๅ้ฟ่พๅบ" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "ๅชๆพ็คบ็ป่ฎก" @@ -20289,221 +22321,215 @@ msgstr "git verify-tag [-v | --verbose] [--format=<ๆ ผๅผ>] <ๆ ็ญพ>..." msgid "print tag contents" msgstr "ๆๅฐๆ ็ญพๅ ๅฎน" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<้้กน>] <่ทฏๅพ> [<ๆไบค>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<้้กน>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<้้กน>] <่ทฏๅพ>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <ๅทฅไฝๅบ> <ๆฐ่ทฏๅพ>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<้้กน>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<้้กน>] <ๅทฅไฝๅบ>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <่ทฏๅพ>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:970 #, c-format msgid "failed to delete '%s'" msgstr "ๅ ้ค '%s' ๅคฑ่ดฅ" -#: builtin/worktree.c:80 -#, c-format -msgid "Removing worktrees/%s: not a valid directory" -msgstr "ๅ ้คๅทฅไฝๅบ/%s๏ผไธๆฏไธไธชๆๆ็็ฎๅฝ" +#: builtin/worktree.c:85 +msgid "not a valid directory" +msgstr "ไธๆฏไธไธชๆๆ็็ฎๅฝ" -#: builtin/worktree.c:86 -#, c-format -msgid "Removing worktrees/%s: gitdir file does not exist" -msgstr "ๅ ้ค worktrees/%s๏ผgitdir ๆไปถไธๅญๅจ" +#: builtin/worktree.c:91 +msgid "gitdir file does not exist" +msgstr "gitdir ๆไปถไธๅญๅจ" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:96 builtin/worktree.c:105 #, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -msgstr "ๅ ้ค worktrees/%s๏ผๆ ๆณ่ฏปๅ gitdir ๆไปถ (%s)" +msgid "unable to read gitdir file (%s)" +msgstr "ๆ ๆณ่ฏปๅ gitdir ๆไปถ๏ผ%s๏ผ" -#: builtin/worktree.c:110 +#: builtin/worktree.c:115 #, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" -msgstr "ๅ ้คๅทฅไฝๆ /%s๏ผ่ฏปๅ่ฟ็ญ๏ผๆๆ %<PRIuMAX> ๅญ่๏ผ่ฏปๅ %<PRIuMAX>๏ผ" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "่ฏปๅ่ฟ็ญ๏ผๆๆ %<PRIuMAX> ๅญ่๏ผ่ฏปๅ %<PRIuMAX>๏ผ" -#: builtin/worktree.c:118 -#, c-format -msgid "Removing worktrees/%s: invalid gitdir file" -msgstr "ๅ ้ค worktrees/%s๏ผๆ ๆ็ gitdir ๆไปถ" +#: builtin/worktree.c:123 +msgid "invalid gitdir file" +msgstr "ๆ ๆ็ gitdir ๆไปถ" + +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "gitdir ๆไปถๆๅไธไธชไธๅญๅจ็ไฝ็ฝฎ" -#: builtin/worktree.c:127 +#: builtin/worktree.c:146 #, c-format -msgid "Removing worktrees/%s: gitdir file points to non-existent location" -msgstr "ๅ ้ค worktrees/%s๏ผgitdir ๆไปถ็ๆๅไธๅญๅจ" +msgid "Removing %s/%s: %s" +msgstr "ๅ ้ค %s/%s: %s" -#: builtin/worktree.c:166 +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "ๆฅๅๆธ ้ค็ๅทฅไฝๅบ" -#: builtin/worktree.c:168 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "ๅฐๆฉไบ <ๆถ้ด> ็ๅทฅไฝๅบ่ฟๆ" -#: builtin/worktree.c:235 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "'%s' ๅทฒ็ปๅญๅจ" -#: builtin/worktree.c:252 +#: builtin/worktree.c:302 #, c-format -msgid "unable to re-add worktree '%s'" -msgstr "ๆ ๆณๅๆฌกๆทปๅ ๅทฅไฝๅบ '%s'" +msgid "unusable worktree destination '%s'" +msgstr "ๆ ๆณไฝฟ็จ็ๅทฅไฝๅบ็ฎๆ '%s'" -#: builtin/worktree.c:257 +#: builtin/worktree.c:307 #, 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" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" -"'%s' ๆฏไธไธชไธขๅคฑไฝ้ๅฎ็ๅทฅไฝๅบ๏ผไฝฟ็จ\n" -"'add -f -f' ่ฆ็๏ผๆ 'unlock' ๅ 'prune' ๆ 'remove' ๆธ ้ค" +"'%s' ๆฏไธไธชไธขๅคฑไฝ้ๅฎ็ๅทฅไฝๅบ๏ผ\n" +"ไฝฟ็จ '%s -f -f' ่ฆ็๏ผๆ็จ 'unlock' ๅ 'prune' ๆ 'remove' ๆธ ้ค" -#: builtin/worktree.c:259 +#: builtin/worktree.c:309 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" -"'%s' ๆฏไธไธชไธขๅคฑไฝๅทฒ็ปๆณจๅ็ๅทฅไฝๅบ๏ผไฝฟ็จ\n" -"'add -f' ่ฆ็๏ผๆ 'prune' ๆ 'remove' ๆธ ้ค" +"'%s' ๆฏไธไธชไธขๅคฑไฝๅทฒ็ปๆณจๅ็ๅทฅไฝๅบ๏ผ\n" +"ไฝฟ็จ '%s -f' ่ฆ็๏ผๆ็จ 'prune' ๆ 'remove' ๆธ ้ค" -#: builtin/worktree.c:309 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "ไธ่ฝๅๅปบ็ฎๅฝ '%s'" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "ๅๅคๅทฅไฝๅบ๏ผๆฐๅๆฏ '%s'๏ผ" -#: builtin/worktree.c:442 +#: builtin/worktree.c:496 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "ๅๅคๅทฅไฝๅบ๏ผ้็ฝฎๅๆฏ '%s'๏ผไนๅไธบ %s๏ผ" -#: builtin/worktree.c:451 +#: builtin/worktree.c:505 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "ๅๅคๅทฅไฝๅบ๏ผๆฃๅบ '%s'๏ผ" -#: builtin/worktree.c:457 +#: builtin/worktree.c:511 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "ๅๅคๅทฅไฝๅบ๏ผๅ็ฆปๅคดๆ้ %s๏ผ" -#: builtin/worktree.c:498 +#: builtin/worktree.c:552 msgid "checkout <branch> even if already checked out in other worktree" msgstr "ๆฃๅบ <ๅๆฏ>๏ผๅณไฝฟๅทฒ็ป่ขซๆฃๅบๅฐๅ ถๅฎๅทฅไฝๅบ" -#: builtin/worktree.c:501 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "ๅๅปบไธไธชๆฐๅๆฏ" -#: builtin/worktree.c:503 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "ๅๅปบๆ้็ฝฎไธไธชๅๆฏ" -#: builtin/worktree.c:505 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "็ๆๆฐ็ๅทฅไฝๅบ" -#: builtin/worktree.c:506 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "้ๅฎๆฐๅทฅไฝๅบ" -#: builtin/worktree.c:509 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "่ฎพ็ฝฎ่ท่ธชๆจกๅผ๏ผๅ่ง git-branch(1)๏ผ" -#: builtin/worktree.c:512 +#: builtin/worktree.c:566 msgid "try to match the new branch name with a remote-tracking branch" msgstr "ๅฐ่ฏไธบๆฐๅๆฏๅๅน้ ไธไธช่ฟ็จ่ท่ธชๅๆฏ" -#: builtin/worktree.c:520 +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-bใ-B ๅ --detach ๆฏไบๆฅ็" -#: builtin/worktree.c:581 +#: builtin/worktree.c:635 msgid "--[no-]track can only be used if a new branch is created" msgstr "ๅช่ฝๅจๅๅปบๆฐๅๆฏๆถไฝฟ็จ้้กน --[no-]track " -#: builtin/worktree.c:681 +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "้ๅฎๅๅ " -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' ไธๆฏไธไธชๅทฅไฝๅบ" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:769 builtin/worktree.c:802 msgid "The main working tree cannot be locked or unlocked" msgstr "ไธปๅทฅไฝๅบๆ ๆณ่ขซๅ ้ๆ่งฃ้" -#: builtin/worktree.c:700 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ๅทฒ่ขซ้ๅฎ๏ผๅๅ ๏ผ%s" -#: builtin/worktree.c:702 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "'%s' ๅทฒ่ขซ้ๅฎ" -#: builtin/worktree.c:730 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "'%s' ๆช่ขซ้ๅฎ" -#: builtin/worktree.c:771 +#: builtin/worktree.c:845 msgid "working trees containing submodules cannot be moved or removed" msgstr "ไธ่ฝ็งปๅจๆๅ ้คๅ ๅซๅญๆจก็ป็ๅทฅไฝๅบ" -#: builtin/worktree.c:779 +#: builtin/worktree.c:853 msgid "force move even if worktree is dirty or locked" msgstr "ๅผบๅถ็งปๅจ๏ผๅณไฝฟๅทฅไฝๅบๆฏ่็ๆๅทฒ้ๅฎ" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:876 builtin/worktree.c:1000 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' ๆฏไธไธชไธปๅทฅไฝๅบ" -#: builtin/worktree.c:807 +#: builtin/worktree.c:881 #, c-format msgid "could not figure out destination name from '%s'" msgstr "ๆ ๆณไป '%s' ็ฎๅบ็ฎๆ ๅ็งฐ" -#: builtin/worktree.c:813 -#, c-format -msgid "target '%s' already exists" -msgstr "็ฎๆ '%s' ๅทฒๅญๅจ" - -#: builtin/worktree.c:821 +#: builtin/worktree.c:894 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -20512,7 +22538,7 @@ msgstr "" "ๆ ๆณ็งปๅจไธไธช้ๅฎ็ๅทฅไฝๅบ๏ผ้ๅฎๅๅ ๏ผ%s\n" "ไฝฟ็จ 'move -f -f' ่ฆ็ๆๅ ่งฃ้" -#: builtin/worktree.c:823 +#: builtin/worktree.c:896 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -20520,36 +22546,36 @@ msgstr "" "ๆ ๆณ็งปๅจไธไธช้ๅฎ็ๅทฅไฝๅบ๏ผ\n" "ไฝฟ็จ 'move -f -f' ่ฆ็ๆๅ ่งฃ้" -#: builtin/worktree.c:826 +#: builtin/worktree.c:899 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "้ช่ฏๅคฑ่ดฅ๏ผๆ ๆณ็งปๅจๅทฅไฝๅบ๏ผ%s" -#: builtin/worktree.c:831 +#: builtin/worktree.c:904 #, c-format msgid "failed to move '%s' to '%s'" msgstr "็งปๅจ '%s' ๅฐ '%s' ๅคฑ่ดฅ" -#: builtin/worktree.c:879 +#: builtin/worktree.c:950 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "ๅจ '%s' ไธญๆง่ก 'git status' ๅคฑ่ดฅ" -#: builtin/worktree.c:883 +#: builtin/worktree.c:954 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "'%s' ๆฏ่็๏ผไฝฟ็จ --force ๅ ้ค" +msgid "'%s' contains modified or untracked files, use --force to delete it" +msgstr "'%s' ๅ ๅซไฟฎๆนๆๆช่ท่ธช็ๆไปถ๏ผไฝฟ็จ --force ๅ ้ค" -#: builtin/worktree.c:888 +#: builtin/worktree.c:959 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "ๅจ '%s' ไธญๆง่ก 'git status' ๅคฑ่ดฅ๏ผ้ๅบ็ %d" -#: builtin/worktree.c:911 +#: builtin/worktree.c:982 msgid "force removal even if worktree is dirty or locked" msgstr "ๅผบๅถๅ ้ค๏ผๅณไฝฟๅทฅไฝๅบๆฏ่็ๆๅทฒ้ๅฎ" -#: builtin/worktree.c:934 +#: builtin/worktree.c:1005 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -20558,7 +22584,7 @@ msgstr "" "ๆ ๆณๅ ้คไธไธช้ๅฎ็ๅทฅไฝๅบ๏ผ้ๅฎๅๅ ๏ผ%s\n" "ไฝฟ็จ 'remove -f -f' ่ฆ็ๆๅ ่งฃ้" -#: builtin/worktree.c:936 +#: builtin/worktree.c:1007 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -20566,11 +22592,21 @@ msgstr "" "ๆ ๆณๅ ้คไธไธช้ๅฎ็ๅทฅไฝๅบ๏ผ\n" "ไฝฟ็จ 'remove -f -f' ่ฆ็ๆๅ ่งฃ้" -#: builtin/worktree.c:939 +#: builtin/worktree.c:1010 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "้ช่ฏๅคฑ่ดฅ๏ผๆ ๆณๅ ้คๅทฅไฝๅบ๏ผ%s" +#: builtin/worktree.c:1034 +#, c-format +msgid "repair: %s: %s" +msgstr "ไฟฎ็๏ผ%s๏ผ%s" + +#: builtin/worktree.c:1037 +#, c-format +msgid "error: %s: %s" +msgstr "้่ฏฏ๏ผ%s๏ผ%s" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<ๅ็ผ>/]" @@ -20587,29 +22623,21 @@ msgstr "ๅฐ <ๅ็ผ> ๅญ็ฎๅฝๅ ๅฎนๅๅฐไธไธชๆ ๅฏน่ฑก" msgid "only useful for debugging" msgstr "ๅชๅฏน่ฐ่ฏๆ็จ" -#: credential-cache--daemon.c:223 +#: http-fetch.c:114 #, 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" +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "--packfile ็ๅๆฐๅฟ ้กปๆฏๆๆ็ๅๅธๅผ๏ผๅพๅฐ '%s'๏ผ" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "่ฐ่ฏไฟกๆฏ่พๅบๅฐๆ ๅ้่ฏฏ" +#: http-fetch.c:122 +msgid "not a git repository" +msgstr "ไธๆฏ git ไปๅบ" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "ๆไบค %s ๆฒกๆๆ ่ฎฐไธบๅฏ่พพ" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "ๅคชๅคๆไบคๆ ่ฎฐไธบๅฏ่พพ" @@ -20621,7 +22649,7 @@ msgstr "test-tool serve-v2 [<้้กน>]" msgid "exit immediately after advertising capabilities" msgstr "ๅฏน่ฝๅๅนฟๅไนๅ็ซๅณ้ๅบ" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -20637,7 +22665,7 @@ msgstr "" " [--git-dir=<่ทฏๅพ>] [--work-tree=<่ทฏๅพ>] [--namespace=<ๅ็งฐ>]\n" " <ๅฝไปค> [<ๅๆฐ>]" -#: git.c:34 +#: git.c:35 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" @@ -20649,47 +22677,47 @@ msgstr "" "ๅธฎๅฉใ\n" "ๆๅ ณ็ณป็ป็ๆฆ่ฟฐ๏ผๆฅ็ 'git help git'ใ" -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "ๆฒกๆไธบ --git-dir ๆไพ็ฎๅฝ\n" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "ๆฒกๆไธบ --namespace ๆไพๅฝๅ็ฉบ้ด\n" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "ๆฒกๆไธบ --work-tree ๆไพ็ฎๅฝ\n" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "ๆฒกๆไธบ --super-prefix ๆไพๅ็ผ\n" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "ๅบไธบ -c ๆไพไธไธช้ ็ฝฎๅญ็ฌฆไธฒ\n" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "ๆฒกๆไธบ -C ๆไพ็ฎๅฝ\n" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "ๆช็ฅ้้กน๏ผ%s\n" -#: git.c:360 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "ๅจๆฉๅฑๅซๅ '%s' ๆถ๏ผ'%s'" -#: git.c:369 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -20698,39 +22726,39 @@ msgstr "" "ๅซๅ '%s' ไฟฎๆน็ฏๅขๅ้ใๆจๅฏไปฅไฝฟ็จๅจๅซๅไธญ\n" "ไฝฟ็จ '!git'" -#: git.c:377 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "%s ็็ฉบๅซๅ" -#: git.c:380 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "้ๅฝ็ๅซๅ๏ผ%s" -#: git.c:460 +#: git.c:465 msgid "write failure on standard output" msgstr "ๅจๆ ๅ่พๅบๅๅ ฅๅคฑ่ดฅ" -#: git.c:462 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "ๅฐๆ ๅ่พๅบ็ๆช็ฅๅๅ ฅ้่ฏฏ" -#: git.c:464 +#: git.c:469 msgid "close failed on standard output" msgstr "ๆ ๅ่พๅบๅ ณ้ญๅคฑ่ดฅ" -#: git.c:793 +#: git.c:819 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "ๆฃๆตๅฐๅซๅๅพช็ฏ๏ผ'%s'็ๆฉๅฑๆช็ปๆญข๏ผ%s" -#: git.c:843 +#: git.c:869 #, c-format msgid "cannot handle %s as a builtin" msgstr "ไธ่ฝไฝไธบๅ ็ฝฎๅฝไปคๅค็ %s" -#: git.c:856 +#: git.c:882 #, c-format msgid "" "usage: %s\n" @@ -20739,53 +22767,53 @@ msgstr "" "็จๆณ๏ผ%s\n" "\n" -#: git.c:876 +#: git.c:902 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "ๅฑๅผๅซๅๅฝไปค '%s' ๅคฑ่ดฅ๏ผ'%s' ไธๆฏไธไธช git ๅฝไปค\n" -#: git.c:888 +#: git.c:914 #, c-format msgid "failed to run command '%s': %s\n" msgstr "่ฟ่กๅฝไปค '%s' ๅคฑ่ดฅ๏ผ%s\n" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "http.postbuffer ไธบ่ดๅผ๏ผ้ป่ฎคไธบ %d" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "ไธๆฏๆๅงๆๆงๅถ๏ผๅ ไธบ cURL < 7.22.0" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "ไธๆฏๆๅ ฌ้ฅๆไปถ้ๅฎ๏ผๅ ไธบ cURL < 7.44.0" -#: http.c:876 +#: http.c:910 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "ไธๆฏๆ CURLSSLOPT_NO_REVOKE๏ผๅ ไธบ cURL < 7.44.0" -#: http.c:949 +#: http.c:989 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "ไธๆฏๆๅ่ฎฎ้ๅถ๏ผๅ ไธบ cURL < 7.19.4" -#: http.c:1085 +#: http.c:1132 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "ไธๆฏๆ็ SSL ๅ็ซฏ '%s'ใๆฏๆ็ SSL ๅ็ซฏ๏ผ" -#: http.c:1092 +#: http.c:1139 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "ๆ ๆณ่ฎพ็ฝฎ SSL ๅ็ซฏไธบ '%s'๏ผcURL: cURL ๆฒกๆไฝฟ็จ SSL ๅ็ซฏๆๅปบ" -#: http.c:1096 +#: http.c:1143 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "ๆ ๆณๅฐ SSL ๅ็ซฏ่ฎพ็ฝฎไธบ '%s'๏ผๅทฒ็ป่ฎพ็ฝฎ" -#: http.c:1965 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -20796,152 +22824,192 @@ msgstr "" " ่ฏทๆฑ๏ผ%s\n" " ้ๅฎๅ๏ผ%s" -#: remote-curl.c:157 +#: remote-curl.c:174 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "ๅจ push-option ๅๅผไธญๆ ๆ็ๅผๅท๏ผ'%s'" -#: remote-curl.c:254 +#: remote-curl.c:298 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" -msgstr "%sinfo/refs ๆ ๆ๏ผ่ฟๆฏไธไธช git ไปๅบไน๏ผ" +msgstr "%sinfo/refs ๆ ๆ๏ผ่ฟๆฏ git ไปๅบไน๏ผ" -#: remote-curl.c:355 +#: remote-curl.c:399 msgid "invalid server response; expected service, got flush packet" msgstr "ๆ ๆ็ๆๅก็ซฏๅๅบใ้ขๆๆๅก๏ผๅพๅฐ flush ๅ " -#: remote-curl.c:386 +#: remote-curl.c:430 #, c-format msgid "invalid server response; got '%s'" msgstr "ๆ ๆ็ๆๅก็ซฏๅๅบ๏ผๅพๅฐ '%s'" -#: remote-curl.c:446 +#: remote-curl.c:490 #, c-format msgid "repository '%s' not found" msgstr "ไปๅบ '%s' ๆชๆพๅฐ" -#: remote-curl.c:450 +#: remote-curl.c:494 #, c-format msgid "Authentication failed for '%s'" msgstr "'%s' ้ดๆๅคฑ่ดฅ" -#: remote-curl.c:454 +#: remote-curl.c:498 #, c-format msgid "unable to access '%s': %s" msgstr "ๆ ๆณ่ฎฟ้ฎ '%s'๏ผ%s" -#: remote-curl.c:460 +#: remote-curl.c:504 #, c-format msgid "redirecting to %s" msgstr "้ๅฎๅๅฐ %s" -#: remote-curl.c:584 +#: remote-curl.c:633 msgid "shouldn't have EOF when not gentle on EOF" msgstr "ๅฝๆฒกๆ่ฎพ็ฝฎๆธฉๅๅค็ๆไปถ็ปๆ็ฌฆ๏ผEOF๏ผๆถ๏ผไธๅบ่ฏฅๆๆไปถ็ปๆ็ฌฆ" -#: remote-curl.c:664 +#: remote-curl.c:645 +msgid "remote server sent stateless separator" +msgstr "่ฟ็จๆๅกๅจๅ้ไบๆ ็ถๆๅ้็ฌฆ" + +#: remote-curl.c:715 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "ๆ ๆณๅๅ rpc post ๆฐๆฎ - ๅฐ่ฏๅขๅ http.postBuffer" -#: remote-curl.c:724 +#: remote-curl.c:745 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curl๏ผ้่ฏฏ็่กๅฎฝๅญ็ฌฆ๏ผ%.4s" + +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curl๏ผๆๅคๅๅบ็ปๆๅ " + +#: remote-curl.c:823 #, c-format msgid "RPC failed; %s" msgstr "RPC ๅคฑ่ดฅใ%s" -#: remote-curl.c:764 +#: remote-curl.c:863 msgid "cannot handle pushes this big" msgstr "ไธ่ฝๅค็่ฟไนๅคง็ๆจ้" -#: remote-curl.c:879 +#: remote-curl.c:978 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "ไธ่ฝๅ็ผฉ่ฏทๆฑ๏ผzlib ๅ็ผฉ้่ฏฏ %d" -#: remote-curl.c:883 +#: remote-curl.c:982 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "ไธ่ฝๅ็ผฉ่ฏทๆฑ๏ผzlib ็ปๆ้่ฏฏ %d" -#: remote-curl.c:1014 +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" +msgstr "ๆถๅฐไบ %d ๅญ่้ฟๅบฆ็ๅคดไฟกๆฏ" + +#: remote-curl.c:1034 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "้ขๆไป็ถ้่ฆ %d ไธชๅญ่็ๆญฃๆ" + +#: remote-curl.c:1123 msgid "dumb http transport does not support shallow capabilities" msgstr "ๅ http ไผ ่พไธๆฏๆ shalllow ่ฝๅ" -#: remote-curl.c:1028 +#: remote-curl.c:1138 msgid "fetch failed." msgstr "่ทๅๅคฑ่ดฅใ" -#: remote-curl.c:1076 +#: remote-curl.c:1184 msgid "cannot fetch by sha1 over smart http" msgstr "ๆ ๆณ้่ฟๆบ่ฝ HTTP ่ทๅ sha1" -#: remote-curl.c:1120 remote-curl.c:1126 +#: remote-curl.c:1228 remote-curl.c:1234 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "ๅ่ฎฎ้่ฏฏ๏ผๆๆ sha/ref๏ผๅดๅพๅฐ '%s'" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1246 remote-curl.c:1361 #, c-format msgid "http transport does not support %s" msgstr "http ไผ ่พๅ่ฎฎไธๆฏๆ %s" -#: remote-curl.c:1174 +#: remote-curl.c:1282 msgid "git-http-push failed" msgstr "git-http-push ๅคฑ่ดฅ" -#: remote-curl.c:1360 +#: remote-curl.c:1467 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl๏ผ็จๆณ๏ผgit remote-curl <่ฟ็จ> [<url>]" -#: remote-curl.c:1392 +#: remote-curl.c:1499 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl๏ผ้่ฏฏ่ฏปๅๆฅ่ช git ็ๅฝไปคๆต" -#: remote-curl.c:1399 +#: remote-curl.c:1506 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl๏ผๅฐ่ฏๆฒกๆๆฌๅฐไปๅบไธ่ทๅ" -#: remote-curl.c:1439 +#: remote-curl.c:1547 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl๏ผๆช็ฅ็ๆฅ่ช git ็ๅฝไปค '%s'" -#: list-objects-filter-options.h:61 +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "็ผ่ฏๅจไฟกๆฏไธๅฏ็จ\n" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "libc ไฟกๆฏไธๅฏ็จ\n" + +#: list-objects-filter-options.h:91 msgid "args" msgstr "ๅๆฐ" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "ๅฏน่ฑก่ฟๆปค" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "ๅฐๆๆถ้ด" -#: parse-options.h:184 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "็ฉบๆไฝ๏ผๅๅๅ ผๅฎน๏ผ" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "ๆดๅ ่ฏฆ็ป" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "ๆดๅ ๅฎ้" -#: parse-options.h:313 -msgid "use <n> digits to display SHA-1s" -msgstr "็จ <n> ไฝๆฐๅญๆพ็คบ SHA-1 ๅๅธๅผ" +#: parse-options.h:317 +msgid "use <n> digits to display object names" +msgstr "็จ <n> ไฝๆฐๅญๆพ็คบๅฏน่ฑกๅ" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "่ฎพ็ฝฎๅฆไฝๅ ้คๆไบค่ฏดๆ้็็ฉบๆ ผๅ#ๆณจ้" -#: ref-filter.h:101 +#: 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:96 msgid "key" msgstr "key" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "ๆๅบ็ๅญๆฎตๅ" @@ -20949,11 +23017,11 @@ msgstr "ๆๅบ็ๅญๆฎตๅ" msgid "update the index with reused conflict resolution if possible" msgstr "ๅฆๆๅฏ่ฝ๏ผ้็จๅฒ็ช่งฃๅณๆดๆฐ็ดขๅผ" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "ๅคดๆ้ๅ็ฆปไบ " -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "ๅคดๆ้ๅ็ฆป่ช " @@ -20994,669 +23062,685 @@ msgid "List, create, or delete branches" msgstr "ๅๅบใๅๅปบๆๅ ้คๅๆฏ" #: command-list.h:59 +msgid "Collect information for user to file a bug report" +msgstr "ๆถ้ไฟกๆฏไปฅไพ็จๆทๆไบค้่ฏฏๆฅๅ" + +#: command-list.h:60 msgid "Move objects and refs by archive" msgstr "้่ฟๅฝๆกฃ็งปๅจๅฏน่ฑกๅๅผ็จ" -#: command-list.h:60 +#: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "ๆไพไปๅบๅฏน่ฑก็ๅ ๅฎนใ็ฑปๅๆๅคงๅฐ" -#: command-list.h:61 +#: command-list.h:62 msgid "Display gitattributes information" msgstr "ๆพ็คบ gitattributes ไฟกๆฏ" -#: command-list.h:62 +#: command-list.h:63 msgid "Debug gitignore / exclude files" msgstr "่ฐ่ฏ gitignore / exclude ๆไปถ" -#: command-list.h:63 +#: command-list.h:64 msgid "Show canonical names and email addresses of contacts" msgstr "ๆพ็คบ่็ณปไบบ็่ง่ๅ็งฐๅ็ตๅญ้ฎไปถ" -#: command-list.h:64 +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "ๅๆขๅๆฏๆๆขๅคๅทฅไฝๅบๆไปถ" -#: command-list.h:65 +#: command-list.h:66 msgid "Copy files from the index to the working tree" msgstr "ไป็ดขๅผๆท่ดๆไปถๅฐๅทฅไฝๅบ" -#: command-list.h:66 +#: command-list.h:67 msgid "Ensures that a reference name is well formed" msgstr "็กฎไฟๅผ็จๅ็งฐๆ ผๅผๆญฃ็กฎ" -#: command-list.h:67 +#: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "ๆฅๆพๅฐๆชๅบ็จๅฐไธๆธธ็ๆไบค" -#: command-list.h:68 +#: command-list.h:69 msgid "Apply the changes introduced by some existing commits" msgstr "ๅบ็จไธไบ็ฐๅญๆไบคๅผๅ ฅ็ไฟฎๆน" -#: command-list.h:69 +#: command-list.h:70 msgid "Graphical alternative to git-commit" msgstr "git-commit ็ๅพๅฝขๆฟไปฃ็้ข" -#: command-list.h:70 +#: command-list.h:71 msgid "Remove untracked files from the working tree" msgstr "ไปๅทฅไฝๅบไธญๅ ้คๆช่ท่ธชๆไปถ" -#: command-list.h:71 +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "ๅ ้ไปๅบๅฐไธไธชๆฐ็ฎๅฝ" -#: command-list.h:72 +#: command-list.h:73 msgid "Display data in columns" msgstr "ไปฅๅ็ๆนๅผๆพ็คบๆฐๆฎ" -#: command-list.h:73 +#: command-list.h:74 msgid "Record changes to the repository" msgstr "่ฎฐๅฝๅๆดๅฐไปๅบ" -#: command-list.h:74 +#: command-list.h:75 msgid "Write and verify Git commit-graph files" msgstr "ๅๅ ฅๅๆ ก้ช Git ๆไบคๅพๆไปถ" -#: command-list.h:75 +#: command-list.h:76 msgid "Create a new commit object" msgstr "ๅๅปบไธไธชๆฐ็ๆไบคๅฏน่ฑก" -#: command-list.h:76 +#: command-list.h:77 msgid "Get and set repository or global options" msgstr "่ทๅๅ่ฎพ็ฝฎไปๅบๆ่ ๅ จๅฑ้้กน" -#: command-list.h:77 +#: command-list.h:78 msgid "Count unpacked number of objects and their disk consumption" msgstr "่ฎก็ฎๆชๆๅ ๅฏน่ฑก็ๆฐ้ๅ็ฃ็็ฉบ้ดๅ ็จ" -#: command-list.h:78 +#: command-list.h:79 msgid "Retrieve and store user credentials" msgstr "ๆฃ็ดขๅๅญๅจ็จๆทๅฏ็ " -#: command-list.h:79 +#: command-list.h:80 msgid "Helper to temporarily store passwords in memory" msgstr "ๅจๅ ๅญไธญไธดๆถๅญๅจๅฏ็ ็ๅฉๆ" -#: command-list.h:80 +#: command-list.h:81 msgid "Helper to store credentials on disk" msgstr "ๅจ็ฃ็ๅญๅจๅฏ็ ็ๅฉๆ" -#: command-list.h:81 +#: command-list.h:82 msgid "Export a single commit to a CVS checkout" msgstr "ๅฐไธไธชๆไบคๅฏผๅบๅฐ CVS ๆฃๅบไธญ" -#: command-list.h:82 +#: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" msgstr "ไปๅฆๅคไธไธชไบบไปฌ็ฑๆจ็้ ็ฝฎ็ฎก็็ณป็ปไธญๆฏๆไฝ ็ๆฐๆฎ" -#: command-list.h:83 +#: command-list.h:84 msgid "A CVS server emulator for Git" msgstr "Git ็ไธไธช CVS ๆๅกๆจกๆๅจ" -#: command-list.h:84 +#: command-list.h:85 msgid "A really simple server for Git repositories" msgstr "ไธไธช้ๅธธ็ฎๅ็ Git ไปๅบๆๅกๅจ" -#: command-list.h:85 +#: command-list.h:86 msgid "Give an object a human readable name based on an available ref" msgstr "ๅบไบไธไธช็ฐๅญ็ๅผ็จไธบไธไธชๅฏน่ฑก่ตทไธไธชๅฏ่ฏป็ๅ็งฐ" -#: command-list.h:86 +#: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" msgstr "ๆพ็คบๆไบคไน้ดใๆไบคๅๅทฅไฝๅบไน้ด็ญ็ๅทฎๅผ" -#: command-list.h:87 +#: command-list.h:88 msgid "Compares files in the working tree and the index" msgstr "ๆฏ่พๅทฅไฝๅบๅ็ดขๅผๅบไธญ็ๆไปถ" -#: command-list.h:88 +#: command-list.h:89 msgid "Compare a tree to the working tree or index" msgstr "ๅฐไธไธชๆ ๅๅทฅไฝๅบๆ็ดขๅผๅๆฏ่พ" -#: command-list.h:89 +#: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" msgstr "ๆฏ่พไธคไธชๆ ๅฏน่ฑก็ๆไปถๅ ๅฎนๅๆจกๅผ" -#: command-list.h:90 +#: command-list.h:91 msgid "Show changes using common diff tools" msgstr "ไฝฟ็จๅธธ่ง็ๅทฎๅผๅทฅๅ ทๆพ็คบๆดๆน" -#: command-list.h:91 +#: command-list.h:92 msgid "Git data exporter" msgstr "Git ๆฐๆฎๅฏผๅบๅจ" -#: command-list.h:92 +#: command-list.h:93 msgid "Backend for fast Git data importers" msgstr "Git ๅฟซ้ๆฐๆฎๅฏผๅ ฅๅจๅ็ซฏ" -#: command-list.h:93 +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "ไปๅฆๅคไธไธชไปๅบไธ่ฝฝๅฏน่ฑกๅๅผ็จ" -#: command-list.h:94 +#: command-list.h:95 msgid "Receive missing objects from another repository" msgstr "ไปๅฆไธไธชไปๅบ่ทๅ็ผบๅคฑ็ๅฏน่ฑก" -#: command-list.h:95 +#: command-list.h:96 msgid "Rewrite branches" msgstr "้ๅๅๆฏ" -#: command-list.h:96 +#: command-list.h:97 msgid "Produce a merge commit message" msgstr "็ๆไธไธชๅๅนถๆไบคไฟกๆฏ" -#: command-list.h:97 +#: command-list.h:98 msgid "Output information on each ref" msgstr "ๅฏนๆฏไธไธชๅผ็จ่พๅบไฟกๆฏ " -#: command-list.h:98 +#: command-list.h:99 msgid "Prepare patches for e-mail submission" msgstr "ๅๅค็ตๅญ้ฎไปถๆไบค็่กฅไธ" -#: command-list.h:99 +#: command-list.h:100 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "้ช่ฏไปๅบไธญๅฏน่ฑก็่ฟ้ๆงๅๆๆๆง" -#: command-list.h:100 +#: command-list.h:101 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "ๆธ ้คไธๅฟ ่ฆ็ๆไปถๅไผๅๆฌๅฐไปๅบ" -#: command-list.h:101 +#: command-list.h:102 msgid "Extract commit ID from an archive created using git-archive" msgstr "ไป git-archive ๅๅปบ็ๅฝๆกฃๆไปถไธญๆๅๆไบค ID" -#: command-list.h:102 +#: command-list.h:103 msgid "Print lines matching a pattern" msgstr "่พๅบๅๆจกๅผๅน้ ็่ก" -#: command-list.h:103 +#: command-list.h:104 msgid "A portable graphical interface to Git" msgstr "ไธไธชไพฟๆบ็ Git ๅพๅฝขๅฎขๆท็ซฏ" -#: command-list.h:104 +#: command-list.h:105 msgid "Compute object ID and optionally creates a blob from a file" msgstr "ไปไธไธชๆไปถ่ฎก็ฎๅฏน่ฑก ID๏ผๅนถๅฏไปฅๅๅปบ blob ๆฐๆฎๅฏน่ฑก" -#: command-list.h:105 +#: command-list.h:106 msgid "Display help information about Git" msgstr "ๆพ็คบ Git ็ๅธฎๅฉไฟกๆฏ" -#: command-list.h:106 +#: command-list.h:107 msgid "Server side implementation of Git over HTTP" msgstr "Git HTTP ๅ่ฎฎ็ๆๅก็ซฏๅฎ็ฐ" -#: command-list.h:107 +#: command-list.h:108 msgid "Download from a remote Git repository via HTTP" msgstr "้่ฟ HTTP ไป่ฟ็จ Git ไปๅบไธ่ฝฝ" -#: command-list.h:108 +#: command-list.h:109 msgid "Push objects over HTTP/DAV to another repository" msgstr "้่ฟ HTTP/DAV ๆจ้ๅฏน่ฑกๅฆไธไธชไปๅบ" -#: command-list.h:109 +#: command-list.h:110 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "ไปๆ ๅ่พๅ ฅๅฐไธ็ป่กฅไธๅ้ๅฐIMAPๆไปถๅคน" -#: command-list.h:110 +#: command-list.h:111 msgid "Build pack index file for an existing packed archive" msgstr "ไปไธไธช็ฐๅญ็ๅ ๅญๆกฃๆไปถๅๅปบๅ ็ดขๅผ" -#: command-list.h:111 +#: command-list.h:112 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "ๅๅปบไธไธช็ฉบ็ Git ไปๅบๆ้ๆฐๅๅงๅไธไธชๅทฒๅญๅจ็ไปๅบ" -#: command-list.h:112 +#: command-list.h:113 msgid "Instantly browse your working repository in gitweb" msgstr "ๅจ gitweb ไธญๅณๆถๆต่งๆจ็ๅทฅไฝไปๅบ" -#: command-list.h:113 +#: command-list.h:114 msgid "Add or parse structured information in commit messages" msgstr "ๆทปๅ ๆ่งฃๆๆไบค่ฏดๆไธญ็็ปๆๅไฟกๆฏ" -#: command-list.h:114 +#: command-list.h:115 msgid "The Git repository browser" msgstr "Git ไปๅบๆต่งๅจ" -#: command-list.h:115 +#: command-list.h:116 msgid "Show commit logs" msgstr "ๆพ็คบๆไบคๆฅๅฟ" -#: command-list.h:116 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "ๆพ็คบ็ดขๅผๅๅทฅไฝๅบไธญๆไปถ็ไฟกๆฏ" -#: command-list.h:117 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "ๆพ็คบไธไธช่ฟ็จไปๅบ็ๅผ็จ" -#: command-list.h:118 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "ๆพ็คบไธไธชๆ ๅฏน่ฑก็ๅ ๅฎน" -#: command-list.h:119 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "ไปๅไธช็ตๅญ้ฎไปถไธญๆๅ่กฅไธๅไฝ่ ่บซไปฝ" -#: command-list.h:120 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "็ฎๅ็ UNIX mbox ้ฎ็ฎฑๅๅ็จๅบ" -#: command-list.h:121 +#: command-list.h:122 +msgid "Run tasks to optimize Git repository data" +msgstr "่ฟ่กไปปๅกไปฅไผๅไปๅบๆฐๆฎ" + +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "ๅๅนถไธคไธชๆๆดๅคๅผๅๅๅฒ" -#: command-list.h:122 +#: command-list.h:124 msgid "Find as good common ancestors as possible for a merge" msgstr "ไธบไบๅๅนถๆฅๆพๅฐฝๅฏ่ฝๅฅฝ็ๅ ฌๅ ฑ็ฅๅ ๆไบค" -#: command-list.h:123 +#: command-list.h:125 msgid "Run a three-way file merge" msgstr "่ฟ่กไธไธชไธ่ทฏๆไปถๅๅนถ" -#: command-list.h:124 +#: command-list.h:126 msgid "Run a merge for files needing merging" msgstr "ๅฏนไบ้่ฆๅๅนถ็ๆไปถๆง่กๅๅนถ" -#: command-list.h:125 +#: command-list.h:127 msgid "The standard helper program to use with git-merge-index" msgstr "ไธ git-merge-index ไธ่ตทไฝฟ็จ็ๆ ๅๅๅฏผ็จๅบ" -#: command-list.h:126 +#: command-list.h:128 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "่ฟ่กๅๅนถๅฒ็ช่งฃๅณๅทฅๅ ทไปฅ่งฃๅณๅๅนถๅฒ็ช" -#: command-list.h:127 +#: command-list.h:129 msgid "Show three-way merge without touching index" msgstr "ๆพ็คบไธ่ทฏๅๅนถ่ไธๅจ็ดขๅผ" -#: command-list.h:128 +#: command-list.h:130 msgid "Write and verify multi-pack-indexes" msgstr "ๅๅ ฅๅๆ ก้ชๅคๅ ็ดขๅผ" -#: command-list.h:129 +#: command-list.h:131 msgid "Creates a tag object" msgstr "ๅๅปบไธไธชๆ ็ญพๅฏน่ฑก" -#: command-list.h:130 +#: command-list.h:132 msgid "Build a tree-object from ls-tree formatted text" msgstr "ๅบไบ ls-tree ็ๆ ผๅผๅๆๆฌๅๅปบไธไธชๆ ๅฏน่ฑก" -#: command-list.h:131 +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "็งปๅจๆ้ๅฝๅไธไธชๆไปถใ็ฎๅฝๆ็ฌฆๅท้พๆฅ" # ๆฅๆพ็ปๅฎ็ๆฌ็็ฌฆๅทๅ็งฐ -#: command-list.h:132 +#: command-list.h:134 msgid "Find symbolic names for given revs" msgstr "ๆฅๆพ็ปๅฎ็ๆฌ็็ฌฆๅทๅ็งฐ" -#: command-list.h:133 +#: command-list.h:135 msgid "Add or inspect object notes" msgstr "ๆทปๅ ๆๆฃๆฅๅฏน่ฑกๆณจ้" -#: command-list.h:134 +#: command-list.h:136 msgid "Import from and submit to Perforce repositories" msgstr "ๅฏผๅ ฅๅๆไบคๅฐ Perforce ไปๅบไธญ" -#: command-list.h:135 +#: command-list.h:137 msgid "Create a packed archive of objects" msgstr "ๅๅปบๅฏน่ฑก็ๅญๆกฃๅ " -#: command-list.h:136 +#: command-list.h:138 msgid "Find redundant pack files" msgstr "ๆฅๆพๅไฝ็ๅ ๆไปถ" -#: command-list.h:137 +#: command-list.h:139 msgid "Pack heads and tags for efficient repository access" msgstr "ๆๅ ๅคดๅๆ ็ญพไปฅๅฎ็ฐ้ซๆ็ไปๅบ่ฎฟ้ฎ" -#: command-list.h:138 +#: command-list.h:140 msgid "Routines to help parsing remote repository access parameters" msgstr "ๅธฎๅฉ่งฃๆ่ฟ็จไปๅบ่ฎฟ้ฎๅๆฐ็ไพ็จ" -#: command-list.h:139 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "่ฎก็ฎไธไธช่กฅไธ็ๅฏไธ ID" -#: command-list.h:140 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "ๅ ้คๅฏน่ฑกๅบไธญๆๆไธๅฏ่พพๅฏน่ฑก" -#: command-list.h:141 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "ๅ ้คๅทฒ็ปๅจๅ ๆไปถไธญ็ๅคไฝๅฏน่ฑก" -#: command-list.h:142 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "่ทๅๅนถๆดๅๅฆๅค็ไปๅบๆไธไธชๆฌๅฐๅๆฏ" -#: command-list.h:143 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "ๆดๆฐ่ฟ็จๅผ็จๅ็ธๅ ณ็ๅฏน่ฑก" -#: command-list.h:144 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "ๅฐไธไธช quilt ่กฅไธ้ๅบ็จๅฐๅฝๅๅๆฏใ" -#: command-list.h:145 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "ๆฏ่พไธคไธชๆไบค่ๅด๏ผๅฆไธไธชๅๆฏ็ไธคไธช็ๆฌ๏ผ" -#: command-list.h:146 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "ๅฐๆ ไฟกๆฏ่ฏปๅๅฐ็ดขๅผ" -#: command-list.h:147 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "ๅจๅฆไธไธชๅๆฏไธ้ๆฐๅบ็จๆไบค" -#: command-list.h:148 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "ๆฅๆถๆจ้ๅฐไปๅบไธญ็ๅฏน่ฑก" -#: command-list.h:149 +#: command-list.h:151 msgid "Manage reflog information" msgstr "็ฎก็ reflog ไฟกๆฏ" -#: command-list.h:150 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "็ฎก็ๅทฒ่ท่ธชไปๅบ" -#: command-list.h:151 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "ๆๅ ไปๅบไธญๆชๆๅ ๅฏน่ฑก" -#: command-list.h:152 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "ๅๅปบใๅๅบใๅ ้คๅฏน่ฑกๆฟๆขๅผ็จ" -#: command-list.h:153 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "็ๆๅพ ๅฎๆดๆน็ๆ่ฆ" -#: command-list.h:154 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "้็จๅฒ็ชๅๅนถ็่งฃๅณๆนๆก่ฎฐๅฝ" -#: command-list.h:155 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "้็ฝฎๅฝๅ HEAD ๅฐๆๅฎ็ถๆ" -#: command-list.h:156 +#: command-list.h:158 msgid "Restore working tree files" msgstr "ๆขๅคๅทฅไฝๅบๆไปถ" -#: command-list.h:157 +#: command-list.h:159 msgid "Revert some existing commits" msgstr "ๅ้ไธไบ็ฐๅญๆไบค" -#: command-list.h:158 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "ๆๆถ้ด้กบๅบๅๅบๆไบคๅฏน่ฑก" -#: command-list.h:159 +#: command-list.h:161 msgid "Pick out and massage parameters" msgstr "้ๅบๅนถๅค็ๅๆฐ" -#: command-list.h:160 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "ไปๅทฅไฝๅบๅ็ดขๅผไธญๅ ้คๆไปถ" -#: command-list.h:161 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "้่ฟ็ตๅญ้ฎไปถๅ้ไธ็ป่กฅไธ" -#: command-list.h:162 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "ไฝฟ็จ Git ๅ่ฎฎๆจ้ๅฏน่ฑกๅฐๅฆไธไธชไปๅบ" -#: command-list.h:163 +#: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" msgstr "ๅชๅ ่ฎธ Git SSH ่ฎฟ้ฎ็ๅ้็ปๅฝshell" -#: command-list.h:164 +#: command-list.h:166 msgid "Summarize 'git log' output" msgstr "'git log' ่พๅบๆ่ฆ" -#: command-list.h:165 +#: command-list.h:167 msgid "Show various types of objects" msgstr "ๆพ็คบๅ็ง็ฑปๅ็ๅฏน่ฑก" -#: command-list.h:166 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "ๆพ็คบๅๆฏๅๆไบค" -#: command-list.h:167 +#: command-list.h:169 msgid "Show packed archive index" msgstr "ๆพ็คบๆๅ ๅฝๆกฃ็ดขๅผ" -#: command-list.h:168 +#: command-list.h:170 msgid "List references in a local repository" msgstr "ๆพ็คบๆฌๅฐไปๅบไธญ็ๅผ็จ" -#: command-list.h:169 +#: command-list.h:171 msgid "Git's i18n setup code for shell scripts" msgstr "ไธบ shell ่ๆฌๅๅค็ Git ๅฝ้ ๅ่ฎพ็ฝฎไปฃ็ " -#: command-list.h:170 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "ๅธธ็จ็ Git shell ่ๆฌ่ฎพ็ฝฎไปฃ็ " -#: command-list.h:171 +#: command-list.h:173 +msgid "Initialize and modify the sparse-checkout" +msgstr "ๅๅงๅๅไฟฎๆน็จ็ๆฃๅบ" + +#: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "่ดฎ่่ๅทฅไฝๅบไธญ็ไฟฎๆน" -#: command-list.h:172 +#: command-list.h:175 msgid "Add file contents to the staging area" msgstr "ๅฐๆไปถๅ ๅฎนๆทปๅ ๅฐ็ดขๅผ" -#: command-list.h:173 +#: command-list.h:176 msgid "Show the working tree status" msgstr "ๆพ็คบๅทฅไฝๅบ็ถๆ" -#: command-list.h:174 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "ๅ ้คไธๅฟ ่ฆ็็ฉบ็ฝๅญ็ฌฆ" -#: command-list.h:175 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "ๅๅงๅใๆดๆฐๆๆฃๆฅๅญๆจก็ป" -#: command-list.h:176 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Subersion ไปๅบๅ Git ไน้ด็ๅๅๆไฝ" -#: command-list.h:177 +#: command-list.h:180 msgid "Switch branches" msgstr "ๅๆขๅๆฏ" -#: command-list.h:178 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "่ฏปๅใไฟฎๆนๅๅ ้ค็ฌฆๅทๅผ็จ" -#: command-list.h:179 +#: command-list.h:182 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "ๅๅปบใๅๅบใๅ ้คๆๆ ก้ชไธไธช GPG ็ญพๅ็ๆ ็ญพๅฏน่ฑก" -#: command-list.h:180 +#: command-list.h:183 msgid "Creates a temporary file with a blob's contents" msgstr "็จ blob ๆฐๆฎๅฏน่ฑก็ๅ ๅฎนๅๅปบไธไธชไธดๆถๆไปถ" -#: command-list.h:181 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "ไปๆๅ ๆไปถไธญ่งฃๅ็ผฉๅฏน่ฑก" -#: command-list.h:182 +#: command-list.h:185 msgid "Register file contents in the working tree to the index" msgstr "ๅฐๅทฅไฝๅบ็ๆไปถๅ ๅฎนๆณจๅๅฐ็ดขๅผ" -#: command-list.h:183 +#: command-list.h:186 msgid "Update the object name stored in a ref safely" msgstr "ๅฎๅ จๅฐๆดๆฐๅญๅจไบๅผ็จไธญ็ๅฏน่ฑกๅ็งฐ" -#: command-list.h:184 +#: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" msgstr "ๆดๆฐ่พ ๅฉไฟกๆฏๆไปถไปฅๅธฎๅฉๅๅ่ฎฎๆๅก" -#: command-list.h:185 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "ๅฐๅญๆกฃๅ้ๅ git-archive" -#: command-list.h:186 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "ๅฐๅฏน่ฑกๅ็ผฉๅ ๅ้ๅ git-fetch-pack" -#: command-list.h:187 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "ๆพ็คบไธไธชGit้ป่พๅ้" -#: command-list.h:188 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "ๆฃๆฅ GPG ๆไบค็ญพๅ" -#: command-list.h:189 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "ๆ ก้ชๆๅ ็Gitๅญไปๆไปถ" -#: command-list.h:190 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "ๆฃๆฅๆ ็ญพ็ GPG ็ญพๅ" -#: command-list.h:191 +#: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git web ็้ข๏ผGit ไปๅบ็ web ๅ็ซฏ๏ผ" -#: command-list.h:192 +#: command-list.h:195 msgid "Show logs with difference each commit introduces" msgstr "ๆพ็คบๆฏไธไธชๆไบคๅผๅ ฅ็ๅทฎๅผๆฅๅฟ" -#: command-list.h:193 +#: command-list.h:196 msgid "Manage multiple working trees" msgstr "็ฎก็ๅคไธชๅทฅไฝๅบ" -#: command-list.h:194 +#: command-list.h:197 msgid "Create a tree object from the current index" msgstr "ไปๅฝๅ็ดขๅผๅๅปบไธไธชๆ ๅฏน่ฑก" -#: command-list.h:195 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "ๅฎไน่ทฏๅพ็ๅฑๆง" -#: command-list.h:196 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "Git ๅฝไปค่ก็้ขๅ็บฆๅฎ" -#: command-list.h:197 +#: command-list.h:200 msgid "A Git core tutorial for developers" msgstr "้ขๅๅผๅไบบๅ็ Git ๆ ธๅฟๆ็จ" -#: command-list.h:198 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "ไธบ Git ๆไพ็จๆทๅๅๅฃไปค" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "้ๅ CVS ็จๆท็ Git ๅธฎๅฉ" -#: command-list.h:199 +#: command-list.h:203 msgid "Tweaking diff output" msgstr "่ฐๆดๅทฎๅผ่พๅบ" -#: command-list.h:200 +#: command-list.h:204 msgid "A useful minimum set of commands for Everyday Git" msgstr "ๆฏไธๅคฉ Git ็ไธ็ปๆ็จ็ๆๅฐๅฝไปค้ๅ" -#: command-list.h:201 +#: command-list.h:205 +msgid "Frequently asked questions about using Git" +msgstr "ๅ ณไบไฝฟ็จ Git ็ๅธธ่ง้ฎ้ข" + +#: command-list.h:206 msgid "A Git Glossary" msgstr "Git ่ฏๆฑ่กจ" -#: command-list.h:202 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "Git ไฝฟ็จ็้ฉๅญ" -#: command-list.h:203 +#: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "ๅฟฝ็ฅๆๅฎ็ๆช่ท่ธชๆไปถ" -#: command-list.h:204 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "ๅฎไนๅญๆจก็ปๅฑๆง" -#: command-list.h:205 +#: command-list.h:210 msgid "Git namespaces" msgstr "Git ๅๅญ็ฉบ้ด" -#: command-list.h:206 +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "ไธ่ฟ็จไปๅบไบคไบ็ๅฉๆ็จๅบ" + +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Git ไปๅบๅธๅฑ" -#: command-list.h:207 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "ๆๅฎ Git ็็ๆฌๅ็ๆฌ่ๅด" -#: command-list.h:208 +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "ๅฐไธไธชไปๅบๅฎ่ฃ ๅฐๅฆๅคไธไธชไปๅบไธญ" + +#: command-list.h:215 msgid "A tutorial introduction to Git: part two" msgstr "ไธไธช Git ๆ็จ๏ผ็ฌฌไบ้จๅ" -#: command-list.h:209 +#: command-list.h:216 msgid "A tutorial introduction to Git" msgstr "ไธไธช Git ๆ็จ" -#: command-list.h:210 +#: command-list.h:217 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 +#: git-bisect.sh:79 #, sh-format msgid "Bad rev input: $arg" msgstr "ๅ็่พๅ ฅ็ๆฌ๏ผ$arg" -#: git-bisect.sh:121 +#: git-bisect.sh:99 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "ๅ็่พๅ ฅ็ๆฌ๏ผ$bisected_head" -#: git-bisect.sh:130 +#: git-bisect.sh:108 #, sh-format msgid "Bad rev input: $rev" msgstr "ๅ็่พๅ ฅ็ๆฌ๏ผ$rev" -#: git-bisect.sh:139 +#: git-bisect.sh:117 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' ๅช่ฝๅธฆไธไธชๅๆฐใ" -#: git-bisect.sh:209 +#: git-bisect.sh:149 msgid "No logfile given" msgstr "ๆชๆไพๆฅๅฟๆไปถ" -#: git-bisect.sh:210 +#: git-bisect.sh:150 #, sh-format msgid "cannot read $file for replaying" msgstr "ไธ่ฝ่ฏปๅ $file ๆฅ้ๆพ" -#: git-bisect.sh:232 +#: git-bisect.sh:173 msgid "?? what are you talking about?" msgstr "?? ๆจๅจ่ฏดไปไน?" -#: git-bisect.sh:241 +#: git-bisect.sh:183 msgid "bisect run failed: no command provided." msgstr "ไบๅๆฅๆพ่ฟ่กๅคฑ่ดฅ๏ผๆฒกๆๆไพๅฝไปคใ" -#: git-bisect.sh:246 +#: git-bisect.sh:188 #, sh-format msgid "running $command" msgstr "่ฟ่ก $command" -#: git-bisect.sh:253 +#: git-bisect.sh:195 #, sh-format msgid "" "bisect run failed:\n" @@ -21665,11 +23749,11 @@ msgstr "" "ไบๅๆฅๆพ่ฟ่กๅคฑ่ดฅ๏ผ\n" "ๅฝไปค '$command' ็้ๅบ็ $res ๅฐไบ 0 ๆๅคงไบ็ญไบ 128" -#: git-bisect.sh:279 +#: git-bisect.sh:221 msgid "bisect run cannot continue any more" msgstr "ไบๅๆฅๆพไธ่ฝ็ปง็ปญ่ฟ่ก" -#: git-bisect.sh:285 +#: git-bisect.sh:227 #, sh-format msgid "" "bisect run failed:\n" @@ -21678,11 +23762,11 @@ msgstr "" "ไบๅๆฅๆพ่ฟ่กๅคฑ่ดฅ๏ผ\n" "'bisect_state $state' ้ๅบ็ ไธบ $res" -#: git-bisect.sh:292 +#: git-bisect.sh:234 msgid "bisect run success" msgstr "ไบๅๆฅๆพ่ฟ่กๆๅ" -#: git-bisect.sh:300 +#: git-bisect.sh:242 msgid "We are not bisecting." msgstr "ๆไปฌๆฒกๆๅจไบๅๆฅๆพใ" @@ -21724,139 +23808,46 @@ msgstr "ๅฐ่ฏๅ $pretty_name ็็ฎๅๅๅนถ" msgid "Simple merge did not work, trying automatic merge." msgstr "็ฎๅๅๅนถๆช็ๆ๏ผๅฐ่ฏ่ชๅจๅๅนถใ" -#: git-legacy-stash.sh:220 -msgid "Cannot remove temporary index (can't happen)" -msgstr "ๆ ๆณๅ ้คไธดๆถ็ดขๅผ๏ผไธๅบๅ็๏ผ" - -#: git-legacy-stash.sh:271 -#, sh-format -msgid "Cannot update $ref_stash with $w_commit" -msgstr "ๆ ๆณ็จ $w_commit ๆดๆฐ $ref_stash" - -#: git-legacy-stash.sh:323 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "้่ฏฏ๏ผ'stash push' ็ๆช็ฅ้้กน๏ผ$option" - -#: git-legacy-stash.sh:355 -#, sh-format -msgid "Saved working directory and index state $stash_msg" -msgstr "ไฟๅญๅทฅไฝ็ฎๅฝๅ็ดขๅผ็ถๆ $stash_msg" - -#: git-legacy-stash.sh:535 -#, sh-format -msgid "unknown option: $opt" -msgstr "ๆช็ฅ้้กน: $opt" - -#: git-legacy-stash.sh:555 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "ๆๅฎไบๅคชๅค็็ๆฌ๏ผ$REV" - -#: git-legacy-stash.sh:570 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "$reference ไธๆฏไธไธชๆๆ็ๅผ็จ" - -#: git-legacy-stash.sh:598 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "'$args' ไธๆฏ่ดฎ่ๅผๆไบค" - -#: git-legacy-stash.sh:609 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "'$args' ไธๆฏไธไธช่ดฎ่ๅผ็จ" - -#: git-legacy-stash.sh:617 -msgid "unable to refresh index" -msgstr "ๆ ๆณๅทๆฐ็ดขๅผ" - -#: git-legacy-stash.sh:621 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "ๆ ๆณๅจๅๅนถ่ฟ็จๅบ็จ่ดฎ่" - -#: git-legacy-stash.sh:629 -msgid "Conflicts in index. Try without --index." -msgstr "็ดขๅผไธญๆๅฒ็ชใๅฐ่ฏไธไฝฟ็จ --indexใ" - -#: git-legacy-stash.sh:631 -msgid "Could not save index tree" -msgstr "ไธ่ฝไฟๅญ็ดขๅผๆ " - -#: git-legacy-stash.sh:640 -msgid "Could not restore untracked files from stash entry" -msgstr "ๆ ๆณไป่ดฎ่ๆก็ฎไธญๆขๅคๆช่ท่ธชๆไปถ" - -#: git-legacy-stash.sh:665 -msgid "Cannot unstage modified files" -msgstr "ๆ ๆณๅฐไฟฎๆน็ๆไปถๅๆถๆๅญ" - -#: git-legacy-stash.sh:703 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "ไธขๅผไบ ${REV} ($s)" - -#: git-legacy-stash.sh:704 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "${REV}๏ผๆ ๆณไธขๅผ่ดฎ่ๆก็ฎ" - -#: git-legacy-stash.sh:791 -msgid "(To restore them type \"git stash apply\")" -msgstr "๏ผไธบๆขๅคๆฐๆฎ่พๅ ฅ \"git stash apply\"๏ผ" - -#: git-submodule.sh:200 +#: git-submodule.sh:180 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "ๅช่ฝๅจๅทฅไฝๅบ็้กถ็บง็ฎๅฝไธญไฝฟ็จ็ธๅฏน่ทฏๅพ" -#: git-submodule.sh:210 +#: git-submodule.sh:190 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "ไปๅบ URL๏ผ'$repo' ๅฟ ้กปๆฏ็ปๅฏน่ทฏๅพๆไปฅ ./|../ ่ตทๅง" -#: git-submodule.sh:229 +#: git-submodule.sh:209 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ๅทฒ็ปๅญๅจไบ็ดขๅผไธญ" -#: git-submodule.sh:232 +#: git-submodule.sh:212 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' ๅทฒ็ปๅญๅจไบ็ดขๅผไธญไธไธๆฏไธไธชๅญๆจก็ป" -#: git-submodule.sh:239 +#: git-submodule.sh:219 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' ๆฒกๆๆฃๅบ็ๆไบค" -#: 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 +#: git-submodule.sh:250 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "ๆทปๅ ไฝไบ '$sm_path' ็็ฐๅญไปๅบๅฐ็ดขๅผ" -#: git-submodule.sh:270 +#: git-submodule.sh:252 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' ๅทฒๅญๅจไธไธๆฏไธไธชๆๆ็ git ไปๅบ" -#: git-submodule.sh:278 +#: git-submodule.sh:260 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "ๆฌๅฐๅ็ฐ '$sm_name' ็ไธไธช git ็ฎๅฝ๏ผไธๅ ถๅฏนๅบ็่ฟ็จไปๅบ๏ผ" -#: git-submodule.sh:280 +#: git-submodule.sh:262 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -21871,51 +23862,51 @@ msgstr "" "ไฝฟ็จ '--force' ้้กนใๅฆๆๆฌๅฐ git ็ฎๅฝไธๆฏๆญฃ็กฎ็ไปๅบ\n" "ๆ่ ๆจไธ็กฎๅฎ่ฟ้็ๅซไน๏ผไฝฟ็จ '--name' ้้กน้ๆฉๅฆๅค็ๅ็งฐใ" -#: git-submodule.sh:286 +#: git-submodule.sh:268 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "ๆฟๆดปๆฌๅฐ git ็ฎๅฝๅฐๅญๆจก็ป '$sm_name'ใ" -#: git-submodule.sh:298 +#: git-submodule.sh:280 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "ไธ่ฝๆฃๅบๅญๆจก็ป '$sm_path'" -#: git-submodule.sh:303 +#: git-submodule.sh:285 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "ๆ ๆณๆทปๅ ๅญๆจก็ป '$sm_path'" -#: git-submodule.sh:312 +#: git-submodule.sh:294 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "ๆ ๆณๆณจๅๅญๆจก็ป '$sm_path'" -#: git-submodule.sh:573 +#: git-submodule.sh:567 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "ๆ ๆณๅจๅญๆจก็ป่ทฏๅพ '$displaypath' ไธญๆพๅฐๅฝๅ็ๆฌ" -#: git-submodule.sh:583 +#: git-submodule.sh:577 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "ๆ ๆณๅจๅญๆจก็ป่ทฏๅพ '$sm_path' ไธญ่ทๅ" -#: git-submodule.sh:588 +#: git-submodule.sh:582 #, 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:606 +#: git-submodule.sh:600 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "ๆ ๆณๅจๅญๆจก็ป่ทฏๅพ '$displaypath' ไธญ่ทๅ๏ผๅฐ่ฏ็ดๆฅ่ทๅ $sha1๏ผ" -#: git-submodule.sh:612 +#: git-submodule.sh:606 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -21923,78 +23914,51 @@ msgid "" msgstr "" "่ทๅไบๅญๆจก็ป่ทฏๅพ '$displaypath'๏ผไฝๆฏๅฎๆฒกๆๅ ๅซ $sha1ใ็ดๆฅ่ทๅ่ฏฅๆไบคๅคฑ่ดฅใ" -#: git-submodule.sh:619 +#: git-submodule.sh:613 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "ๆ ๆณๅจๅญๆจก็ป่ทฏๅพ '$displaypath' ไธญๆฃๅบ '$sha1'" -#: git-submodule.sh:620 +#: git-submodule.sh:614 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "ๅญๆจก็ป่ทฏๅพ '$displaypath'๏ผๆฃๅบ '$sha1'" -#: git-submodule.sh:624 +#: git-submodule.sh:618 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "ๆ ๆณๅจๅญๆจก็ป่ทฏๅพ '$displaypath' ไธญๅๅบ '$sha1'" -#: git-submodule.sh:625 +#: git-submodule.sh:619 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "ๅญๆจก็ป่ทฏๅพ '$displaypath'๏ผๅๅบ่ณ '$sha1'" -#: git-submodule.sh:630 +#: git-submodule.sh:624 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "ๆ ๆณๅๅนถ '$sha1' ๅฐๅญๆจก็ป่ทฏๅพ '$displaypath' ไธญ" -#: git-submodule.sh:631 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "ๅญๆจก็ป่ทฏๅพ '$displaypath'๏ผๅทฒๅๅนถๅ ฅ '$sha1'" -#: git-submodule.sh:636 +#: git-submodule.sh:630 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "ๅจๅญๆจก็ป '$displaypath' ไธญๆง่ก '$command $sha1' ๅคฑ่ดฅ" -#: git-submodule.sh:637 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "ๅญๆจก็ป '$displaypath'๏ผ'$command $sha1'" -#: git-submodule.sh:668 +#: git-submodule.sh:662 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "ๆ ๆณ้ๅฝ่ฟๅญๆจก็ป่ทฏๅพ '$displaypath'" -#: git-submodule.sh:830 -msgid "The --cached option cannot be used with the --files option" -msgstr "้้กน --cached ไธ่ฝๅ้้กน --files ๅๆถไฝฟ็จ" - -#: git-submodule.sh:882 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "ๆๅค็ๆจกๅผ $mod_dst" - -# ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: git-submodule.sh:902 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr " ่ญฆๅ๏ผ$display_name ๆชๅ ๅซๆไบค $sha1_src" - -# ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: git-submodule.sh:905 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr " ่ญฆๅ๏ผ$display_name ๆชๅ ๅซๆไบค $sha1_dst" - -# ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: 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" - #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." @@ -22009,12 +23973,22 @@ msgstr "ๅทฒๅบ็จ autostashใ" msgid "Cannot store $stash_sha1" msgstr "ไธ่ฝๅญๅจ $stash_sha1" +#: git-rebase--preserve-merges.sh:113 +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" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "ๅๅบไธญ๏ผ$new_count/$total๏ผ" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -22052,7 +24026,7 @@ msgstr "" "\n" "ๅฏไปฅๅฏน่ฟไบ่ก้ๆฐๆๅบ๏ผๅฐไปไธ่ณไธๆง่กใ\n" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -22071,83 +24045,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1๏ผไธๆฏไธไธชๅฏไปฅ่ขซๆฃ้็ๆไบค" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "ๆ ๆ็ๆไบคๅ๏ผ$sha1" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "ไธ่ฝๅๅ ฅๅฝๅๆไบค็ๆฟไปฃ sha1" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "ๅฟซ่ฟๅฐ $sha1" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "ไธ่ฝๅฟซ่ฟๅฐ $sha1" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "ไธ่ฝ็งปๅจ HEAD ๅฐ $first_parent" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "ๆ็ปๅ็ผฉไธไธชๅๅนถ๏ผ$sha1" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "ๆ ๆณ้ๅๅๅนถ $sha1" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "ไธ่ฝๆฃ้ $sha1" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "่ฟๆฏๆไบค่ฏดๆ #${n}๏ผ" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "ๆไบค่ฏดๆ #${n} ๅฐ่ขซ่ทณ่ฟ๏ผ" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "่ฟๆฏไธไธช $count ไธชๆไบค็็ปๅใ" msgstr[1] "่ฟๆฏไธไธช $count ไธชๆไบค็็ปๅใ" -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "ไธ่ฝๅๅ ฅ $fixup_msg" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 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 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "ไธ่ฝๅบ็จ $sha1... $rest" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -22160,32 +24134,32 @@ msgstr "" "่ฟ้ๅธธๆฏๅ ไธบ็ฉบ็ๆไบค่ฏดๆ๏ผๆ่ pre-commit ้ฉๅญๆง่กๅคฑ่ดฅใๅฆๆๆฏ pre-commit\n" "้ฉๅญๆง่กๅคฑ่ดฅ๏ผไฝ ๅฏ่ฝ้่ฆๅจ้ๅๆไบค่ฏดๆๅ่งฃๅณ่ฟไธช้ฎ้ขใ" -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "ๅๆญขๅจ $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "ๆฒกๆ็ถๆไบค็ๆ ๅตไธไธ่ฝ '$squash_style'" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "ๆง่ก๏ผ$rest" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "ๆง่กๅคฑ่ดฅ๏ผ$rest" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "ๅนถไธไฟฎๆน็ดขๅผๅ/ๆๅทฅไฝๅบ" # ่ฏ่ ๏ผๆณจๆไฟๆๅๅฏผ็ฉบๆ ผ -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -22196,7 +24170,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -22210,25 +24184,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "ๆช็ฅๅฝไปค๏ผ$command $sha1 $rest" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "่ฆไฟฎๆน่ฏทไฝฟ็จๅฝไปค 'git rebase --edit-todo'ใ" -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "ๆๅๅๅบๅนถๆดๆฐ $head_nameใ" -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "ไธ่ฝๅ ้ค CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -22257,51 +24231,55 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "ๅจไฟฎ่กฅๆไบคไธญๆฅๆพไฝ่ ไฟกๆฏๆถ้ๅฐ้่ฏฏ" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 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 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "ไธ่ฝๆไบคๆๅญ็ไฟฎๆนใ" -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "ๆ ๆณ่ฟ่ก็ผ่พๅจ" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "ไธ่ฝๆฃๅบ $switch_to" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "ๆฒกๆ HEAD๏ผ" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "ไธ่ฝๅๅปบไธดๆถ $state_dir" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "ไธ่ฝๆ ่ฎฐไธบไบคไบๅผ" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "ๅๅบ $shortrevisions ๅฐ $shortonto๏ผ$todocount ไธชๆไบค๏ผ" msgstr[1] "ๅๅบ $shortrevisions ๅฐ $shortonto๏ผ$todocount ไธชๆไบค๏ผ" -#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:945 +msgid "Note that empty commits are commented out" +msgstr "ๆณจๆ็ฉบๆไบคๅทฒ่ขซๆณจ้ๆ" + +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "ไธ่ฝๅฏน้ๅๆไบค่ฟ่กๅๅงๅ" @@ -22363,122 +24341,56 @@ 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:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: 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 +#: git-add--interactive.perl:634 #, 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: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 +#: git-add--interactive.perl:1058 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "ๅฆๆ่กฅไธ่ฝๅนฒๅๅฐๅบ็จ๏ผ็ผ่พๅๅฐ็ซๅณๆ ่ฎฐไธบๆๅญใ" -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1061 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "ๅฆๆ่กฅไธ่ฝๅนฒๅๅฐๅบ็จ๏ผ็ผ่พๅๅฐ็ซๅณๆ ่ฎฐไธบ่ดฎ่ใ" -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1064 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "ๅฆๆ่กฅไธ่ฝๅนฒๅๅฐๅบ็จ๏ผ็ผ่พๅๅฐ็ซๅณๆ ่ฎฐไธบๆชๆๅญใ" -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "ๅฆๆ่กฅไธ่ฝๅนฒๅๅฐๅบ็จ๏ผ็ผ่พๅๅฐ็ซๅณๆ ่ฎฐไธบๅบ็จใ" -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "ๅฆๆ่กฅไธ่ฝๅนฒๅๅฐๅบ็จ๏ผ็ผ่พๅๅฐ็ซๅณๆ ่ฎฐไธบไธขๅผใ" -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1116 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "ไธบๅๅ ฅๆๅผๅ็ผ่พๆไปถๅคฑ่ดฅ๏ผ%s" -#: git-add--interactive.perl:1110 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "ๆๅจๅ็ผ่พๆจกๅผ -- ๆฅ็ๅบ้จ็ๅฟซ้ๆๅใ\n" - -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1123 #, perl-format msgid "" "---\n" @@ -22491,33 +24403,12 @@ msgstr "" "่ฆๅ ้ค '%s' ๅผๅง็่ก๏ผๅ ้คๅฎไปฌใ\n" "ไปฅ %s ๅผๅง็่กๅฐ่ขซๅ ้คใ\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 "" -"ๅฆๆไธ่ฝๅนฒๅๅฐๅบ็จ๏ผๆจๅฐๆๆบไผ้ๆฐ็ผ่พใๅฆๆ่ฏฅๅ็ๅ จ้จๅ ๅฎนๅ ้ค๏ผๅ\n" -"ๆญคๆฌก็ผ่พ่ขซ็ปๆญข๏ผ่ฏฅๅไธไผ่ขซไฟฎๆนใ\n" - -#: git-add--interactive.perl:1138 +#: git-add--interactive.perl:1145 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "ๆ ๆณ่ฏปๅๅ็ผ่พๆไปถ๏ผ%s" -#. 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 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -22531,7 +24422,7 @@ msgstr "" "a - ๆๅญ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ\n" "d - ไธๆๅญ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -22545,7 +24436,7 @@ msgstr "" "a - ่ดฎ่่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ\n" "d - ไธ่ดฎ่่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -22559,7 +24450,7 @@ msgstr "" "a - ไธๆๅญ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ\n" "d - ไธ่ฆไธๆๅญ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -22573,7 +24464,7 @@ msgstr "" "a - ๅบ็จ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ\n" "d - ไธ่ฆๅบ็จ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ" -#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -22587,7 +24478,7 @@ msgstr "" "a - ไธขๅผ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ\n" "d - ไธ่ฆไธขๅผ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ" -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -22601,7 +24492,7 @@ msgstr "" "a - ไธขๅผ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ\n" "d - ไธ่ฆไธขๅผ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ" -#: git-add--interactive.perl:1282 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -22615,7 +24506,7 @@ msgstr "" "a - ๅบ็จ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ\n" "d - ไธ่ฆๅบ็จ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ" -#: git-add--interactive.perl:1294 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -22629,7 +24520,7 @@ msgstr "" "a - ๅบ็จ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ\n" "d - ไธ่ฆๅบ็จ่ฏฅๅๅๆฌๆไปถไธญๅ้ข็ๅ จ้จๅ" -#: git-add--interactive.perl:1309 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -22651,226 +24542,90 @@ msgstr "" "e - ๆๅจ็ผ่พๅฝๅๅ\n" "? - ๆพ็คบๅธฎๅฉ\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1347 msgid "The selected hunks do not apply to the index!\n" msgstr "้ไธญ็ๅไธ่ฝๅบ็จๅฐ็ดขๅผ๏ผ\n" -#: 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 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ๅฟฝ็ฅๆชๅๅ ฅ็๏ผ%s\n" -#: 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 +#: git-add--interactive.perl:1481 #, 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:1467 +#: git-add--interactive.perl:1482 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "ๅฐๅ ้คๆไฝๅบ็จๅฐๅทฅไฝๅบ [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1483 +#, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "ๅฐๆทปๅ ๆไฝๅบ็จๅฐๅทฅไฝๅบ [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1484 #, 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:1568 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "ๆฒกๆๅ ถๅฎๅฏไพ่ทณ่ฝฌ็ๅ\n" -#: 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 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "ๆ ๆๆฐๅญ๏ผ'%s'\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1624 #, 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:1617 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "ๆฒกๆๅ ถๅฎๅฏไพๆฅๆพ็ๅ\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "ไฝฟ็จๆญฃๅ่กจ่พพๅผๆ็ดข๏ผ" - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "้่ฏฏ็ๆญฃๅ่กจ่พพๅผ %s๏ผ%s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" -msgstr "ๆฒกๆๅ็ปๅฎๆจกๅผ็ธๅน้ ็ๅฟซ\n" +msgstr "ๆฒกๆๅ็ปๅฎๆจกๅผ็ธๅน้ ็ๅ\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "ๆฒกๆๅไธไธชๅ\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "ๆฒกๆไธไธไธชๅ\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "ๅฏนไธ่ตท๏ผไธ่ฝๆๅ่ฟไธชๅ\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1738 #, 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:1706 +#: git-add--interactive.perl:1748 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:1771 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -22887,19 +24642,19 @@ msgstr "" "diff - ๆพ็คบ HEAD ๅ็ดขๅผ้ดๅทฎๅผ\n" "add untracked - ๆทปๅ ๆช่ท่ธชๆไปถ็ๅ ๅฎน่ณๆๅญๅ่กจ\n" -#: 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 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 msgid "missing --" msgstr "็ผบๅคฑ --" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1861 #, perl-format msgid "unknown --patch mode: %s" msgstr "ๆช็ฅ็ --patch ๆจกๅผ๏ผ%s" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 #, perl-format msgid "invalid argument %s, expecting --" msgstr "ๆ ๆ็ๅๆฐ %s๏ผๆๆๆฏ --" @@ -22916,62 +24671,72 @@ msgstr "ๆฌๅฐๆถ้ดๅ็งป้ๅคงไบ็ญไบ 24 ๅฐๆถ\n" msgid "the editor exited uncleanly, aborting everything" msgstr "็ผ่พๅจ้ๆญฃๅธธ้ๅบ๏ผ็ปๆญขๆๆๆไฝ" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' ๅ ๅซๆจๆญฃๅจ็ผๅ็ไธไธชไธญ้ด็ๆฌ็้ฎไปถใ\n" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' ๅ ๅซ็ผ่พ็้ฎไปถใ\n" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases ๅๅ ถๅฎ้้กนไธๅ ผๅฎน\n" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"่ดๅฝ้่ฏฏ๏ผๅ็ฐ 'sendmail' ้ ็ฝฎ้้กน\n" +"git-send-email ้่ฟ sendemail.* ้้กน่ฟ่ก่ฎพ็ฝฎ๏ผๆณจๆๅญๆฏ 'e'ใ\n" +"่ฎพ็ฝฎ sendemail.forbidSendmailVariables ไธบ false ๆฅ็ฆ็จ่ฟ้กนๆฃๆฅใ\n" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "ไธ่ฝๅจไปๅบไนๅค่ฟ่ก git format-patch\n" -#: git-send-email.perl:484 +#: git-send-email.perl:492 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 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "ๆช็ฅ็ --suppress-cc ๅญๆฎต๏ผ'%s'\n" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "ๆช็ฅ็ --confirm ่ฎพ็ฝฎ๏ผ'%s'\n" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "่ญฆๅ๏ผไธๆฏๆๅธฆๅผๅท็ sendmail ๅซๅ๏ผ%s\n" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "่ญฆๅ๏ผไธๆฏๆ `:include:`๏ผ%s\n" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "่ญฆๅ๏ผไธๆฏๆ `/file` ๆ `|pipe` ้ๅฎๅ๏ผ%s\n" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "่ญฆๅ๏ผไธ่ฝ่ฏๅซ็ sendmail ่ก๏ผ%s\n" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -22986,12 +24751,12 @@ msgstr "" " * ๅฆๆๅซไนไธบไธไธชๆไปถ๏ผไฝฟ็จ \"./%s\"๏ผๆ่ \n" " * ๅฆๆๅซไนไธบไธไธช่ๅด๏ผไฝฟ็จ --format-patch ้้กนใ\n" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "ๆ ๆณๆๅผ็ฎๅฝ %s: %s" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -23000,7 +24765,7 @@ msgstr "" "่ดๅฝ้่ฏฏ๏ผ%s๏ผ%s\n" "่ญฆๅ๏ผ่กฅไธๆช่ฝๅ้\n" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -23010,17 +24775,17 @@ msgstr "" "ๆชๆๅฎ่กฅไธๆไปถ๏ผ\n" "\n" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "ๅจ %s ไธญๆฒกๆๆ ้ข่ก๏ผ" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "ไธบๅๅ ฅๆๅผ %s ๅคฑ่ดฅ: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -23033,37 +24798,37 @@ msgstr "" "\n" "ๅฆๆๆจไธๆณๅ้ๆ่ฆ๏ผๆธ ้คๅ ๅฎนใ\n" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "ๆ ๆณๆๅผ %s: %s" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "ๆ ๆณๆๅผ %s.final: %s" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "ๆ่ฆ้ฎไปถไธบ็ฉบ๏ผ่ทณ่ฟ\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "ๆจ็กฎ่ฎค่ฆไฝฟ็จ <%s> [y/N]๏ผ" -#: git-send-email.perl:913 +#: git-send-email.perl:921 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 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "่ฆๅฃฐๆ 8bit ไธบไปไนๆ ท็็ผ็ ๆ ผๅผ [UTF-8]๏ผ" -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -23075,20 +24840,20 @@ msgstr "" "\t%s\n" "ๅ ๅซๆจก็ๆ ้ข '*** SUBJECT HERE ***'ใๅฆๆ็กฎๅฎๆณ่ฆๅ้๏ผไฝฟ็จๅๆฐ --forceใ\n" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "้ฎไปถๅฐ่ฆๅ้็ป่ฐ๏ผ" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "่ดๅฝ้่ฏฏ๏ผๅซๅ '%s' ๆฉๅฑไธบๅฎ่ชๅทฑ\n" -#: git-send-email.perl:975 +#: git-send-email.perl:983 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 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "้่ฏฏ๏ผไธ่ฝไป %s ไธญๆๅไธไธชๆๆ็้ฎไปถๅฐๅ\n" @@ -23096,16 +24861,16 @@ 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 +#: git-send-email.perl:1053 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 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA ่ทฏๅพ \"%s\" ไธๅญๅจ" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -23130,128 +24895,128 @@ msgstr "" #. 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 +#: git-send-email.perl:1468 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 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "ๅ้่ฆๆฑ็้ฎไปถๅๅค" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "่ฆๆฑ็ SMTP ๆๅกๅจๆช่ขซๆญฃ็กฎๅฎไนใ" -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "ๆๅกๅจไธๆฏๆ STARTTLS๏ผ%s" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS ๅคฑ่ดฅ๏ผ%s" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "ๆ ๆณๆญฃ็กฎๅฐๅๅงๅ SMTPใๆฃๆฅ้ ็ฝฎๅนถไฝฟ็จ --smtp-debugใ" -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "ๆ ๆณๅ้ %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "ๆผไน ๅ้ %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "ๆญฃๅ้ %s\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "ๆผไน ๆๅใๆฅๅฟ่ฏด๏ผ\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "OKใๆฅๅฟ่ฏด๏ผ\n" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "็ปๆ๏ผ" -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "็ปๆ๏ผOK\n" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "ๆ ๆณๆๅผๆไปถ %s" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) ๆทปๅ cc๏ผ%s ่ช่ก '%s'\n" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) ๆทปๅ to๏ผ%s ่ช่ก '%s'\n" -#: git-send-email.perl:1718 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) ๆทปๅ cc๏ผ%s ่ช่ก '%s'\n" -#: git-send-email.perl:1753 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) ๆทปๅ cc: %s ่ช่ก '%s'\n" -#: git-send-email.perl:1864 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) ไธ่ฝๆง่ก '%s'" -#: git-send-email.perl:1871 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) ๆทปๅ %s: %s ่ช๏ผ'%s'\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) ๆ ๆณๅ ณ้ญ็ฎก้่ณ '%s'" -#: git-send-email.perl:1905 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "ไธ่ฝไปฅ 7bit ๅฝขๅผๅ้ไฟกๆฏ" -#: git-send-email.perl:1913 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "ๆ ๆ็ไผ ้็ผ็ " -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "ไธ่ฝๆๅผ %s๏ผ%s\n" -#: git-send-email.perl:1957 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s๏ผ่กฅไธๅ ๅซไธไธช่ถ ่ฟ 998 ๅญ็ฌฆ็่ก" -#: git-send-email.perl:1974 +#: git-send-email.perl:1986 #, 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 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "ๆจ็็่ฆๅ้ %s๏ผ[y|N]๏ผ" diff --git a/third_party/git/po/zh_TW.po b/third_party/git/po/zh_TW.po new file mode 100644 index 0000000000..54fdbedddb --- /dev/null +++ b/third_party/git/po/zh_TW.po @@ -0,0 +1,25378 @@ +# 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 +# updated on 5/23/2020 +# +# ๅๆ ็ฟป่ญฏ +# 3 way merge ไธๆนๅไฝต +# ? ๏ผ +# abbreviate ็ธฎๅฏซ +# abort ไธญๆญข +# Add ๅ ๅ ฅ +# all ๆๆ +# allow ๅ ่จฑ +# alternative ๆฟไปฃ +# Amend ไฟฎ่จ +# annotate ้่จป +# annotated tag ้่จปๆจ็ฑค +# Apply ๅฅ็จ +# argument ๅผๆธ +# argument ๅผๆธ +# Assume ๅ่จญ +# author ไฝ่ +# bad ไธ่ฏ +# Bare ็ฅผ +# bare repo ็ฅผ็ๆฌๅบซ +# Bisect ไบๅๆณ +# Blame ็ฉถ่ฒฌ +# blob blob +# bloom filter ๅธ้้ๆฟพๅจ +# Branch ๅๆฏ +# branch ๏ผๅ่ฉ๏ผๅปบ็ซๅๆฏ +# Branches ๅๆฏ +# browse ็่ฆฝ +# browser ็่ฆฝๅจ +# bug ่ญ่ฒ +# Bug-ID Bug-ID +# cache ๅฟซๅ +# certificate ๆ่ญ +# Change ่ฎๆด +# change ่ฎๆด +# changed ๅทฒ่ฎๆด +# changes ่ฎๆด +# Check help file ๆฅ็่ชชๆๆชๆก +# checkbox ๆ ธๅๆนๅก +# Checkout ๆชขๅบ +# checksum ็ธฝๅๆชขๆฅ็ขผ +# Cherry Pick ๆๅ +# clean ๆธ ้ค +# cleanup ๆธ ็ +# clear ๆธ ็ฉบ +# click ๆไธไธ +# client ็จๆถ็ซฏ +# clipboard ๅช่ฒผ็ฐฟ +# Clone ่ค่ฃฝ +# Close ้้ +# Collapse ๆถๅ +# Color ่ฒๅฝฉ +# Combine ็ตๅ +# comment ่ฉ่จป +# Commit ๆไบค +# committer ๆไบค่ +# compare ๆฏๅฐ +# comparing ๆฏๅฐ +# Configure ่จญๅฎ +# confirm ็ขบ่ช +# Conflict ่ก็ช +# Context lines ๆ ๅขๅ +# context menu ๅฟซ้กฏๅ่ฝ่กจ +# continue ็นผ็บ +# continuous ๆ็บๆง +# copy ่ค่ฃฝ +# Corrections ๆดๆญฃ +# Could not start ็กๆณๅๅ +# Create ๅปบ็ซ +# Creates ๅปบ็ซ +# Creating ๅปบ็ซไธญ +# Credential ๆ่ญ +# Credential helper ๆ่ญๅๅฉ็จๅผ +# Credentials ๆ่ญ +# credentials ๆ่ญ +# current ็ฎๅ +# custom ่ช่จ +# Customize ่ช่จ +# Daemon ๅฎ่ญท็จๅบ +# Date ๆฅๆ +# Default ้ ่จญ +# Delete ๅช้ค +# describe describe +# description ๆ่ฟฐ +# Destination ็ฎ็ๅฐ +# detach ๅ้ข +# detect ๅตๆธฌ +# Dialogs ๅฐ่ฉฑๆก +# Diff ๅทฎ็ฐ +# differences ๅทฎ็ฐ +# different ๅทฎ็ฐ +# dir ็ฎ้ +# directory ็ฎ้ +# Discard ไธๆฃ +# Display ้กฏ็คบ +# double click ๆๅ ฉไธ +# edit ็ทจ่ผฏ +# editor ็ทจ่ผฏๅจ +# email email +# Enable ๅ็จ +# Error code ้ฏ่ชค็ขผ +# explicitly ้กฏๅผ +# Export ๅฏๅบ +# expression ่กจ็คบๅผ +# extension ๆดๅ ๅฅไปถ +# external ๅค้จ +# fast forward ๅฟซ้ฒ +# fast-forward ๅฟซ้ฒ +# fetch ็ฒๅ +# FETCH_HEAD FETCH_HEAD +# file ๆชๆก +# files ๆชๆก +# filter ็ฏฉ้ธ +# find ๆๅฐ +# Finish ๅฎๆ +# folder ่ณๆๅคพ +# folders ่ณๆๅคพ +# follow ่ท้จ +# Force ๅผทๅถ +# from ่ช +# Git Git +# Git for Windows Git for Windows +# hash ้ๆน +# HEAD HEAD +# highlight ๆจ็คบ +# Hook ๆ้ค +# hunk ๅๅก +# hunks ๅๅก +# Ignore ๅฟฝ็ฅ +# Index ็ดขๅผ +# Info ่ณ่จ +# information ่ณ่จ +# Init ๅๅงๅ +# initial checkout ๅๅง็ฐฝๅบ +# Inline Diff ่กๅ งๅทฎ็ฐ +# inline diff ๅๅ งๅทฎ็ฐ +# is up to date ๅทฒๆๆฐ +# issue ่ญฐ้ก +# item ้ ็ฎ +# items ้ ็ฎ +# Keywords ้้ตๅญ +# label ๆจ่จ +# labels ๆจ่จ +# Last ๆๅพ +# later ็จๅพ +# limitation ้ๅถ +# line ๅ +# lines ๅ +# local ๆฌๅฐ็ซฏ +# Local ๆฌๅฐ็ซฏ +# Log ่จ้ +# Merge ๅไฝต +# merge ๅไฝต +# message ่จๆฏ +# Message ่จๆฏ +# modify ไฟฎๆน +# Name ๅ็จฑ +# Note ่จป +# note ่จป +# Notes ่จป่งฃ +# Open ้ๅ +# Options ้ธ้ +# Ordering ้ ๅบ +# ORIG_HEAD ORIG_HEAD +# Overlay ๅ็คบ่ฆ่ +# pack ๅ ่ฃ +# Parent ็ถ +# patch ่ฃ็ถด +# patched ่ฃ็ถด +# paths ่ทฏๅพ +# pick ๅ +# position ไฝ็ฝฎ +# preview ้ ่ฆฝ +# process ่็ +# program ็จๅผ +# Project ๅฐๆก +# Prune ๅช้ค +# Pull ๆๅ +# Pull Request ๆๅ่ซๆฑ +# Push ๆจ้ +# rebase ้ๅฎๅบๅบ +# rebase ้ๅฎๅบๅบ +# recover ้ๅ +# recovered ้ๅ +# recursively ้่ฟด +# recycle bin ๅๆถๆกถ +# redo ้ๅ +# Ref ๅ็ ง +# ref ๅ็ ง +# reference ๅ็ ง +# RefLog ๅ็ งๆฅ่ช +# refmap ๅ็ งๆ ๅฐ +# refs ๅ็ ง +# refspec ๅ็ ง่ฆๆ ผ +# Remote ้ ็ซฏ +# remote branches ้ ็ซฏๅๆฏ +# Remote-tracking branches ้ ็ซฏ่ท่นคๅๆฏ +# remote-treacking branches ้ ็ซฏ่ฟฝ่นคๅๆฏ +# remove ็งป้ค +# removed ๅทฒ็งป้ค +# repo ็ๆฌๅบซ +# repositories ็ๆฌๅบซ +# Repository ็ๆฌๅบซ +# request ่ฆๆฑ +# Reset ้่จญ +# resolve ่งฃๆฑบ +# rest ๅ ถ้ค็ +# Restore ้ๅ +# Revert ๅพฉๅ +# reverted ๅทฒๅพฉๅ +# review ๆชข้ฑ +# revision ไฟฎ่จ็ +# revisions ็ๆฌ +# script ๆไปค็จฟ +# Scripts ๆไปค็จฟ +# sections ้จๅ +# Show ้กฏ็คบ +# sign ็ฐฝ็ฝฒ +# signed ๅทฒ็ฐฝ็ฝฒ +# skip ็ฅ้ +# special ็นๆฎ +# Squash ๅฃๅ +# stage ๆซๅญ +# stage ๆซๅญ +# staged ๅทฒๆซๅญ +# staging area ๆซๅญๅ +# Stash ๆถ่ +# Status ็ๆ +# subject ไธปๆจ +# Submodule ๅญๆจก็ต +# Superproject ไธๅฑคๅฐๆก +# Switch ๅๆ +# tag ๏ผๅ่ฉ๏ผ่ฒผๆจ็ฑค +# Tag ๆจ็ฑค +# tagger ่ฒผๆจ็ฑค่ +# tags ๆจ็ฑค +# task ๅทฅไฝ +# thesaurus ๅ็พฉๅญ +# three way ไธๆน +# Track ่ท่นค +# Tracked ่ท่นคไธญ +# tracking ่ท่นค +# tree ๆจน +# two 2 +# type ้กๅ +# unchanged ๆช่ฎๆด +# Undo ๅพฉๅ +# Unified diff ๅฎไธๅทฎ็ฐ +# unified diff ็ตฑๅๅผๅทฎ็ฐ +# Unknown ๆช็ฅ +# unstash ๅๆถๆถ่ +# Untracked ๆช่ท่นค็ +# Unversioned ็ก็ๆง +# Update ๆดๆฐ +# UpStream ไธๆธธ +# user ไฝฟ็จ่ +# username ไฝฟ็จ่ ๅ็จฑ +# vanilla ๅ +# verify ๆ ธ้ฉ +# view ๆชข่ฆ +# viewer ๆชข่ฆๅจ +# Warning ่ญฆๅ +# whitespace ็ฉบ็ฝๅญๅ +# whitespaces ็ฉบ็ฝๅญๅ +# working ๅทฅไฝ +# working copy ๅทฅไฝ่คๆฌ +# Working tree ๅทฅไฝ็ฎ้ +# You might need ๆจๅฏ่ฝ้่ฆ +# +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2020-10-10 09:32+0800\n" +"PO-Revision-Date: 2020-10-10 19:26+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" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 2.4.1\n" +"X-ZhConverter: ็นๅๅงฌ dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" +"zhconvert.org\n" + +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "ๅฏ๏ผ%s๏ผ๏ผ" + +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +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 reset.c:89 sequencer.c:3444 +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:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, 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:1738 git-add--interactive.perl:1371 +#, c-format +msgid "Only binary files changed.\n" +msgstr "ๅชๆไบ้ฒไฝๆชๆก่ขซไฟฎๆนใ\n" + +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "ๆฒๆไฟฎๆนใ\n" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "ไฟฎ่ฃๆชๆดๆฐ" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +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:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "*** ๆไปค ***" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +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:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: 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:781 git-add--interactive.perl:1805 +#, c-format +msgid "Bye.\n" +msgstr "ๅ่ฆใ\n" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "ๆซๅญๆจกๅผ่ฎๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:35 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "ๆซๅญๅช้ค่ฎๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:36 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "ๆซๅญๆฐๅข่ฎๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "ๆซๅญๆญคๅๅก [y,n,q,a,d%s,?]? " + +#: add-patch.c:39 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "ๅฆๆไฟฎ่ฃๆช่ฝไนพๆทจๅฐๅฅ็จ๏ผ็ทจ่ผฏๅๅกๅฐ็ซๅณๆจ่จ็บๆซๅญใ" + +#: add-patch.c:42 +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:56 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "ๅฒ่ๆจกๅผ่ฎๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:57 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "ๅฒ่ๅช้ค่ฎๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:58 git-add--interactive.perl:1441 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "ๅฒ่ๆฐๅข่ฎๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "ๅฒ่ๆญคๅๅก [y,n,q,a,d%s,?]? " + +#: add-patch.c:61 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "ๅฆๆไฟฎ่ฃๆช่ฝไนพๆทจๅฐๅฅ็จ๏ผ็ทจ่ผฏๅๅกๅฐ็ซๅณๆจ่จ็บๅฒ่ใ" + +#: add-patch.c:64 +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:80 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "ๅๆถๆซๅญๆจกๅผ่ฎๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:81 git-add--interactive.perl:1446 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "ๅๆถๆซๅญๅช้ค่ฎๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:82 git-add--interactive.perl:1447 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "ๅๆถๆซๅญๆฐๅข่ฎๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "ๅๆถๆซๅญๆญคๅๅก [y,n,q,a,d%s,?]? " + +#: add-patch.c:85 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "ๅฆๆไฟฎ่ฃๆช่ฝไนพๆทจๅฐๅฅ็จ๏ผ็ทจ่ผฏๅๅกๅฐ็ซๅณๆจ่จ็บๆชๆซๅญใ" + +#: add-patch.c:88 +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:103 git-add--interactive.perl:1451 +#, 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:104 git-add--interactive.perl:1452 +#, 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:105 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "ๅฅ็จๆฐๅข่ฎๆด่ณ็ดขๅผ [y,n,q,a,d%s,?]? " + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, 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:108 add-patch.c:176 add-patch.c:221 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "ๅฆๆไฟฎ่ฃๆช่ฝไนพๆทจๅฐๅฅ็จ๏ผ็ทจ่ผฏๅๅกๅฐ็ซๅณๆจ่จ็บๅฅ็จใ" + +#: add-patch.c:111 +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:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, 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:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, 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:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "ๆพๆฃๅทฅไฝ็ฎ้็ๆฐๅข่ฎๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, 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:131 add-patch.c:154 add-patch.c:199 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "ๅฆๆไฟฎ่ฃๆช่ฝไนพๆทจๅฐๅฅ็จ๏ผ็ทจ่ผฏๅๅกๅฐ็ซๅณๆจ่จ็บๆจๆฃใ" + +#: add-patch.c:134 add-patch.c:202 +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:149 add-patch.c:194 git-add--interactive.perl:1463 +#, 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:150 add-patch.c:195 git-add--interactive.perl:1464 +#, 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:151 add-patch.c:196 git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "ๆพๆฃ็ดขๅผๅๅทฅไฝ็ฎ้็ๆฐๅข่ฎๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, 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:157 +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:171 add-patch.c:216 git-add--interactive.perl:1469 +#, 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:172 add-patch.c:217 git-add--interactive.perl:1470 +#, 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:173 add-patch.c:218 git-add--interactive.perl:1471 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "ๅฅ็จ็ดขๅผๅๅทฅไฝ็ฎ้็ๆฐๅข่ฎๆด [y,n,q,a,d%s,?]? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, 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:179 +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:224 +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:342 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "็กๆณ่งฃๆๅๅกๆจ้ ญ '%.*s'" + +#: add-patch.c:361 add-patch.c:365 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "็กๆณ่งฃๆไธ่ฒ้็ๅๅกๆจ้ ญ '%.*s'" + +#: add-patch.c:419 +msgid "could not parse diff" +msgstr "็กๆณ่งฃๆๅทฎ็ฐ (diff)" + +#: add-patch.c:438 +msgid "could not parse colored diff" +msgstr "็กๆณ่งฃๆไธ่ฒ้็ๅทฎ็ฐ (diff)" + +#: add-patch.c:452 +#, c-format +msgid "failed to run '%s'" +msgstr "็กๆณๅท่ก '%s'" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "interactive.diffFilter ็่ผธๅบไธ็ฌฆ" + +#: add-patch.c:612 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "ๆจ็้ๆฟพๅจๅฟ ้ ๅจๅ ถ่ผธๅ ฅๅ่ผธๅบ่ก็ถญๆไธๅฐไธ็ๅฐๆ้ไฟใ" + +#: add-patch.c:785 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"ๆๆไธไธๆ่ก #%d ๆผ\n" +"%.*s" + +#: add-patch.c:800 +#, 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:1076 git-add--interactive.perl:1117 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "ๆๅๅๅก็ทจ่ผฏๆจกๅผ -- ๆชข่ฆๅบ้จ็ๅฟซ้ๆๅใ\n" + +#: add-patch.c:1080 +#, 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:1094 git-add--interactive.perl:1131 +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:1127 +msgid "could not parse hunk header" +msgstr "็กๆณ่งฃๆๅๅกๆจ้ ญ" + +#: add-patch.c:1172 +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:1241 git-add--interactive.perl:1244 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "ๆจ็็ทจ่ผฏๅกไธ่ฝ่ขซๆ็จใ้ๆฐ็ทจ่ผฏ๏ผ้ธๆ \"no\" ๆจๆฃ๏ผ๏ผ [y/n]? " + +#: add-patch.c:1284 +msgid "The selected hunks do not apply to the index!" +msgstr "้ธๅ็ๅๅกไธๆๅฅ็จ้ฒ็ดขๅผ๏ผ" + +#: add-patch.c:1285 git-add--interactive.perl:1348 +msgid "Apply them to the worktree anyway? " +msgstr "็ก่ซๅฆไฝ้ฝ่ฆๅฅ็จๅฐๅทฅไฝๅๅ๏ผ" + +#: add-patch.c:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "ๆชๅฅ็จใ\n" + +#: add-patch.c:1349 +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:1511 add-patch.c:1521 +msgid "No previous hunk" +msgstr "ๆฒๆไธไธๅๅๅก" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No next hunk" +msgstr "ๆฒๆไธไธๅๅๅก" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "ๆฒๆๅ ถๅฎๅฏไพ่ทณ่ฝ็ๅๅก" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "่ทณ่ฝๅฐๅชๅๅๅก๏ผ<Enter> ๆชข่ฆๆดๅค๏ผ๏ผ " + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "่ทณ่ฝๅฐๅชๅๅๅก๏ผ" + +#: add-patch.c:1555 +#, c-format +msgid "Invalid number: '%s'" +msgstr "็กๆๆธๅญ๏ผ'%s'" + +#: add-patch.c:1560 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "ๅฐไธ่ตท๏ผๅชๆ %d ๅๅฏ็จๅๅกใ" + +#: add-patch.c:1569 +msgid "No other hunks to search" +msgstr "ๆฒๆๅ ถๅฎๅฏไพๅฐๆพ็ๅๅก" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "ไฝฟ็จๆญฃ่ฆ่กจ็คบๅผๆๅฐ๏ผ" + +#: add-patch.c:1590 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "้ฏ่ชค็ๆญฃ่ฆ่กจ็คบๅผ %s๏ผ%s" + +#: add-patch.c:1607 +msgid "No hunk matches the given pattern" +msgstr "ๆฒๆๅๆไพๆจกๅผ็ธ็ฌฆๅ็ๅๅก" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "ๅฐไธ่ตท๏ผไธ่ฝๅๅฒ้ๅๅๅก" + +#: add-patch.c:1618 +#, c-format +msgid "Split into %d hunks." +msgstr "ๅๅฒ็บ %d ๅกใ" + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "ๅฐไธ่ตท๏ผไธ่ฝ็ทจ่ผฏ้ๅๅๅก" + +#: add-patch.c:1674 +msgid "'git apply' failed" +msgstr "'git apply' ๅคฑๆ" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" +"\n" +"่ซไฝฟ็จใgit config advice.%s falseใไพๅ็จๆญค่จๆฏ" + +#: advice.c:156 +#, c-format +msgid "%shint: %.*s%s\n" +msgstr "%sๆ็คบ๏ผ%.*s%s\n" + +#: advice.c:247 +msgid "Cherry-picking is not possible because you have unmerged files." +msgstr "็กๆณๆ้ธ๏ผๅ ็บๆจๆๆชๅไฝต็ๆชๆกใ" + +#: advice.c:249 +msgid "Committing is not possible because you have unmerged files." +msgstr "็กๆณๆไบค๏ผๅ ็บๆจๆๆชๅไฝต็ๆชๆกใ" + +#: advice.c:251 +msgid "Merging is not possible because you have unmerged files." +msgstr "็กๆณๅไฝต๏ผๅ ็บๆจๆๆชๅไฝต็ๆชๆกใ" + +#: advice.c:253 +msgid "Pulling is not possible because you have unmerged files." +msgstr "็กๆณๆๅ๏ผๅ ็บๆจๆๆชๅไฝต็ๆชๆกใ" + +#: advice.c:255 +msgid "Reverting is not possible because you have unmerged files." +msgstr "็กๆณ้ๅๆไบค๏ผๅ ็บๆจๆๆชๅไฝต็ๆชๆกใ" + +#: advice.c:257 +#, c-format +msgid "It is not possible to %s because you have unmerged files." +msgstr "็กๆณ %s๏ผๅ ็บๆจๆๆชๅไฝต็ๆชๆกใ" + +#: advice.c:265 +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:273 +msgid "Exiting because of an unresolved conflict." +msgstr "ๅ ็บๅญๅจๆช่งฃๆฑบ็่ก็ช่้ข้ใ" + +#: advice.c:278 builtin/merge.c:1349 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "ๆจๅฐๆช็ตๆๆจ็ๅไฝต๏ผๅญๅจ MERGE_HEAD๏ผใ" + +#: advice.c:280 +msgid "Please, commit your changes before merging." +msgstr "่ซๅจๅไฝตๅๅ ๆไบคๆจ็ไฟฎๆนใ" + +#: advice.c:281 +msgid "Exiting because of unfinished merge." +msgstr "ๅ ็บๅญๅจๆชๅฎๆ็ๅไฝต่้ข้ใ" + +#: advice.c:287 +#, 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:72 setup.c:308 +#, 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 apply.c:3953 +#, 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:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 +#, c-format +msgid "invalid path '%s'" +msgstr "็กๆ่ทฏๅพ '%s'" + +#: apply.c:3950 +#, c-format +msgid "%s: already exists in index" +msgstr "%s๏ผๅทฒ็ถๅญๅจๆผ็ดขๅผไธญ" + +#: apply.c:3956 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s๏ผๅทฒ็ถๅญๅจๆผๅทฅไฝๅไธญ" + +#: apply.c:3976 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "%2$s ็ๆฐๆจกๅผ๏ผ%1$o๏ผๅ่ๆจกๅผ๏ผ%3$o๏ผไธ็ฌฆๅ" + +#: apply.c:3981 +#, 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:4001 +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "ๅๅฝฑ้ฟ็ๆชๆก '%s' ไฝๆผ็ฌฆ่้ฃ็ตไธญ" + +#: apply.c:4005 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s๏ผไฟฎ่ฃๆชๆชๅฅ็จ" + +#: apply.c:4020 +#, c-format +msgid "Checking patch %s..." +msgstr "ๆญฃๅจๆชขๆฅไฟฎ่ฃๆช %s..." + +#: apply.c:4112 +#, c-format +msgid "sha1 information is lacking or useless for submodule %s" +msgstr "ๅญๆจก็ต %s ็ sha1 ่จๆฏ็ผบๅฐๆ็กๆ" + +#: apply.c:4119 +#, c-format +msgid "mode change for %s, which is not in current HEAD" +msgstr "%s ็ๆจกๅผ่ฎๆด๏ผไฝๅฎไธๅจ็ฎๅ HEAD ไธญ" + +#: apply.c:4122 +#, c-format +msgid "sha1 information is lacking or useless (%s)." +msgstr "sha1 ่จๆฏ็ผบๅฐๆ็กๆ๏ผ%s๏ผใ" + +#: apply.c:4131 +#, c-format +msgid "could not add %s to temporary index" +msgstr "ไธ่ฝๅจๆซๆ็ดขๅผไธญๆฐๅข %s" + +#: apply.c:4141 +#, c-format +msgid "could not write temporary index to %s" +msgstr "ไธ่ฝๆๆซๆ็ดขๅผๅฏซๅ ฅๅฐ %s" + +#: apply.c:4279 +#, c-format +msgid "unable to remove %s from index" +msgstr "ไธ่ฝๅพ็ดขๅผไธญ็งป้ค %s" + +#: apply.c:4313 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "ๅญๆจก็ต %s ๆๅฃ็ไฟฎ่ฃๆช" + +#: apply.c:4319 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "ไธ่ฝๅฐๅปบ็ซๆชๆก '%s' ๅผๅซ stat" + +#: apply.c:4327 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "ไธ่ฝ็บๅปบ็ซๆชๆก %s ๅปบ็ซๅพ็ซฏๅฒๅญ" + +#: apply.c:4333 apply.c:4478 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "็กๆณ็บ %s ๆฐๅขๅฟซๅๆข็ฎ" + +#: apply.c:4376 builtin/bisect--helper.c:537 +#, c-format +msgid "failed to write to '%s'" +msgstr "ๅฏซๅ ฅ '%s' ๅคฑๆ" + +#: apply.c:4380 +#, c-format +msgid "closing file '%s'" +msgstr "้้ๆชๆก '%s'" + +#: apply.c:4450 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "ไธ่ฝๅฏซๅ ฅๆชๆก '%s' ๆฌ้ %o" + +#: apply.c:4548 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "ๆๅๅฅ็จไฟฎ่ฃๆช %sใ" + +#: apply.c:4556 +msgid "internal error" +msgstr "ๅ ง้จ้ฏ่ชค" + +#: apply.c:4559 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "ๅฅ็จ %%s ๅไฟฎ่ฃๆช๏ผๅ ถไธญ %d ๅ่ขซๆ็ต..." + +#: apply.c:4570 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "ๆช็ญ .rej ๆชๆกๅ็บ %.*s.rej" + +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 +#, c-format +msgid "cannot open %s" +msgstr "ไธ่ฝ้ๅ %s" + +#: apply.c:4592 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "็ฌฌ #%d ๅ็ๆฎตๆๅๆ็จใ" + +#: apply.c:4596 +#, c-format +msgid "Rejected hunk #%d." +msgstr "ๆ็ต็ฌฌ #%d ๅ็ๆฎตใ" + +#: apply.c:4715 +#, c-format +msgid "Skipped patch '%s'." +msgstr "็ฅ้ไฟฎ่ฃๆช '%s'ใ" + +#: apply.c:4723 +msgid "unrecognized input" +msgstr "็กๆณ่ญๅฅ็่ผธๅ ฅ" + +#: apply.c:4743 +msgid "unable to read index file" +msgstr "็กๆณ่ฎๅ็ดขๅผๆชๆก" + +#: apply.c:4900 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "ไธ่ฝ้ๅไฟฎ่ฃๆช '%s'๏ผ%s" + +#: apply.c:4927 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "ๆๅถไธไปๆ %d ๅ็ฉบ็ฝๅญๅ ่ชค็จ" + +#: apply.c:4933 apply.c:4948 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d ่กๆฐๅขไบ็ฉบ็ฝๅญๅ ่ชค็จใ" + +#: apply.c:4941 +#, c-format +msgid "%d line applied after fixing whitespace errors." +msgid_plural "%d lines applied after fixing whitespace errors." +msgstr[0] "ไฟฎๅพฉ็ฉบ็ฝ้ฏ่ชคๅพ๏ผๆ็จไบ %d ่กใ" + +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +msgid "Unable to write new index file" +msgstr "็กๆณๅฏซๅ ฅๆฐ็ดขๅผๆชๆก" + +#: apply.c:4985 +msgid "don't apply changes matching the given path" +msgstr "ไธ่ฆๆ็จ่็ตฆๅบ่ทฏๅพๅ็ฌฆๅ็่ฎๆด" + +#: apply.c:4988 +msgid "apply changes matching the given path" +msgstr "ๆ็จ่็ตฆๅบ่ทฏๅพๅ็ฌฆๅ็่ฎๆด" + +#: apply.c:4990 builtin/am.c:2279 +msgid "num" +msgstr "ๆธๅญ" + +#: apply.c:4991 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "ๅพๅณ็ตฑ็ diff ่ทฏๅพไธญ็งป้คๆๅฎๆธ้็ๅๅฐๆ็ท" + +#: apply.c:4994 +msgid "ignore additions made by the patch" +msgstr "ๅฟฝ็ฅไฟฎ่ฃๆชไธญ็ๆฐๅข็ๆชๆก" + +#: apply.c:4996 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "ไธๅฅ็จไฟฎ่ฃๆช๏ผ่ๆฏ้กฏ็คบ่ผธๅ ฅ็ๅทฎ็ฐ็ตฑ่จ๏ผdiffstat๏ผ" + +#: apply.c:5000 +msgid "show number of added and deleted lines in decimal notation" +msgstr "ไปฅๅ้ฒไฝๆธ้กฏ็คบๆฐๅขๅๅช้ค็่กๆธ" + +#: apply.c:5002 +msgid "instead of applying the patch, output a summary for the input" +msgstr "ไธๅฅ็จไฟฎ่ฃๆช๏ผ่ๆฏ้กฏ็คบ่ผธๅ ฅ็ๆฆ่ฆ" + +#: apply.c:5004 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "ไธๅฅ็จไฟฎ่ฃๆช๏ผ่ๆฏๆชข่ฆไฟฎ่ฃๆชๆฏๅฆๅฏๆ็จ" + +#: apply.c:5006 +msgid "make sure the patch is applicable to the current index" +msgstr "็ขบ่ชไฟฎ่ฃๆชๅฏไปฅๅฅ็จๅฐ็ฎๅ็ดขๅผ" + +#: apply.c:5008 +msgid "mark new files with `git add --intent-to-add`" +msgstr "ไฝฟ็จๆไปค `git add --intent-to-add` ๆจ่จๆฐๅขๆชๆก" + +#: apply.c:5010 +msgid "apply a patch without touching the working tree" +msgstr "ๅฅ็จไฟฎ่ฃๆช่ไธไฟฎๆนๅทฅไฝๅ" + +#: apply.c:5012 +msgid "accept a patch that touches outside the working area" +msgstr "ๆฅๅไฟฎๆนๅทฅไฝๅไนๅคๆชๆก็ไฟฎ่ฃๆช" + +#: apply.c:5015 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "้ๅฅ็จๆญคไฟฎ่ฃๆช๏ผ่ --stat/--summary/--check ้ธ้ ๅๆไฝฟ็จ๏ผ" + +#: apply.c:5017 +msgid "attempt three-way merge if a patch does not apply" +msgstr "ๅฆๆไธๅไฟฎ่ฃๆชไธ่ฝๆ็จๅๅ่ฉฆไธๆนๅไฝต" + +#: apply.c:5019 +msgid "build a temporary index based on embedded index information" +msgstr "ๅปบ็ซไธๅๆซๆ็ดขๅผๅบๆผๅตๅ ฅ็็ดขๅผ่จๆฏ" + +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 +msgid "paths are separated with NUL character" +msgstr "่ทฏๅพไปฅ NUL ๅญๅ ๅ้" + +#: apply.c:5024 +msgid "ensure at least <n> lines of context match" +msgstr "็ขบไฟ่ณๅฐ็ฌฆๅ <n> ่กไธไธๆ" + +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 +msgid "action" +msgstr "ๅไฝ" + +#: apply.c:5026 +msgid "detect new or modified lines that have whitespace errors" +msgstr "ๆชขๆฅๆฐๅขๅไฟฎๆน็่กไธญ้็็ฉบ็ฝๅญๅ ๆฟซ็จ" + +#: apply.c:5029 apply.c:5032 +msgid "ignore changes in whitespace when finding context" +msgstr "ๅฐๆพไธไธๆๆๅฟฝ็ฅ็ฉบ็ฝๅญๅ ็่ฎๆด" + +#: apply.c:5035 +msgid "apply the patch in reverse" +msgstr "ๅๅๅฅ็จไฟฎ่ฃๆช" + +#: apply.c:5037 +msgid "don't expect at least one line of context" +msgstr "็ก้่ณๅฐไธ่กไธไธๆ" + +#: apply.c:5039 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "ๅฐๆ็ต็ไฟฎ่ฃๆช็ๆฎตๅฒๅญๅจๅฐๆ็ *.rej ๆชๆกไธญ" + +#: apply.c:5041 +msgid "allow overlapping hunks" +msgstr "ๅ ่จฑ้็็ไฟฎ่ฃๆช็ๆฎต" + +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 +msgid "be verbose" +msgstr "่ฉณ็ดฐ่ผธๅบ" + +#: apply.c:5044 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "ๅ ่จฑไธๆญฃ็ขบ็ๆชๆกๆซๅฐพๆ่ก็ฌฆ่" + +#: apply.c:5047 +msgid "do not trust the line counts in the hunk headers" +msgstr "ไธไฟกไปปไฟฎ่ฃๆช็ๆฎต็ๆจ้ ญ่จๆฏไธญ็่ก่" + +#: apply.c:5049 builtin/am.c:2267 +msgid "root" +msgstr "ๆ น็ฎ้" + +#: apply.c:5050 +msgid "prepend <root> to all filenames" +msgstr "็บๆๆๆชๆกๅๅๆฐๅข <ๆ น็ฎ้>" + +#: archive-tar.c:125 archive-zip.c:345 +#, c-format +msgid "cannot stream blob %s" +msgstr "ไธ่ฝ้ๅ่ณๆ็ฉไปถ %s" + +#: archive-tar.c:265 archive-zip.c:358 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "ไธๆฏๆด็ๆชๆกๆจกๅผ๏ผ0%o (SHA1: %s)" + +#: archive-tar.c:449 +#, c-format +msgid "unable to start '%s' filter" +msgstr "็กๆณๅๅ '%s' ้ๆฟพๅจ" + +#: archive-tar.c:452 +msgid "unable to redirect descriptor" +msgstr "็กๆณ้ๅฎๅๆ่ฟฐ็ฌฆ" + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "'%s' ้ๆฟพๅจๅ ฑๅไบ้ฏ่ชค" + +#: archive-zip.c:318 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "่ทฏๅพไธๆฏๆๆ็ UTF-8๏ผ%s" + +#: archive-zip.c:322 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "่ทฏๅพๅคช้ท๏ผ%d ๅญๅ ๏ผSHA1๏ผ%s๏ผ๏ผ%s" + +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "ๅฃ็ธฎ้ฏ่ชค (%d)" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "ๅฐๆผๆฌ็ณป็ตฑๆ้ๆณๅคชๅคง๏ผ%<PRIuMAX>" + +#: 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:192 +#, c-format +msgid "cannot read %s" +msgstr "ไธ่ฝ่ฎๅ %s" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "ไธ่ฝ่ฎๅ '%s'" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "่ทฏๅพ่ฆๆ ผ '%s' ๆช็ฌฆๅไปปไฝๆชๆก" + +#: archive.c:454 +#, c-format +msgid "no such ref: %.*s" +msgstr "็กๆญคๅผ็จ๏ผ%.*s" + +#: archive.c:460 +#, c-format +msgid "not a valid object name: %s" +msgstr "ไธๆฏไธๅๆๆ็็ฉไปถๅ๏ผ%s" + +#: archive.c:473 +#, c-format +msgid "not a tree object: %s" +msgstr "ไธๆฏไธๅๆจน็็ฉไปถ๏ผ%s" + +#: archive.c:485 +msgid "current working directory is untracked" +msgstr "็ฎๅๅทฅไฝ็ฎ้ๆช่ขซ่ฟฝ่นค" + +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "ๆพไธๅฐๆชๆก๏ผ%s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "ไธๆฏไธ่ฌๆชๆก๏ผ%s" + +#: archive.c:553 +msgid "fmt" +msgstr "ๆ ผๅผ" + +#: archive.c:553 +msgid "archive format" +msgstr "ๆญธๆชๆ ผๅผ" + +#: archive.c:554 builtin/log.c:1760 +msgid "prefix" +msgstr "ๅ็ถด" + +#: archive.c:555 +msgid "prepend prefix to each pathname in the archive" +msgstr "็บๆญธๆชไธญๆฏๅ่ทฏๅพๅๅ ไธๅ็ถด" + +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 +msgid "file" +msgstr "ๆชๆก" + +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "ๅฐๆช่ฟฝ่นคๆชๆกๅ ๅ ฅๆญธๆช" + +#: archive.c:560 builtin/archive.c:90 +msgid "write the archive to this file" +msgstr "ๆญธๆชๅฏซๅ ฅๆญคๆชๆก" + +#: archive.c:562 +msgid "read .gitattributes in working directory" +msgstr "่ฎๅๅทฅไฝๅไธญ็ .gitattributes" + +#: archive.c:563 +msgid "report archived files on stderr" +msgstr "ๅจๆจๆบ้ฏ่ชคไธๅ ฑๅๆญธๆชๆชๆก" + +#: archive.c:564 +msgid "store only" +msgstr "ๅชๅฒๅญ" + +#: archive.c:565 +msgid "compress faster" +msgstr "ๅฃ็ธฎ้ๅบฆๆดๅฟซ" + +#: archive.c:573 +msgid "compress better" +msgstr "ๅฃ็ธฎๆๆๆดๅฅฝ" + +#: archive.c:576 +msgid "list supported archive formats" +msgstr "ๅๅบๆฏๆด็ๆญธๆชๆ ผๅผ" + +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +msgid "repo" +msgstr "็ๆฌๅบซ" + +#: archive.c:579 builtin/archive.c:92 +msgid "retrieve the archive from remote repository <repo>" +msgstr "ๅพ้ ็ซฏ็ๆฌๅบซ๏ผ<็ๆฌๅบซ>๏ผๆทๅๆญธๆชๆชๆก" + +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 +#: builtin/notes.c:498 +msgid "command" +msgstr "ๆไปค" + +#: archive.c:581 builtin/archive.c:94 +msgid "path to the remote git-upload-archive command" +msgstr "้ ็ซฏ git-upload-archive ๆไปค็่ทฏๅพ" + +#: archive.c:588 +msgid "Unexpected option --remote" +msgstr "ๆช็ฅๅๆธ --remote" + +#: archive.c:590 +msgid "Option --exec can only be used together with --remote" +msgstr "้ธ้ --exec ๅช่ฝๅ --remote ๅๆไฝฟ็จ" + +#: archive.c:592 +msgid "Unexpected option --output" +msgstr "ๆช็ฅๅๆธ --output" + +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" +msgstr "--add-file ๅ --remote ้ธ้ ไธ่ฝๅๆไฝฟ็จ" + +#: archive.c:616 +#, c-format +msgid "Unknown archive format '%s'" +msgstr "ๆช็ฅๆญธๆชๆ ผๅผ '%s'" + +#: archive.c:623 +#, c-format +msgid "Argument not supported for format '%s': -%d" +msgstr "ๅๆธไธๆฏๆดๆญคๆ ผๅผ '%s'๏ผ-%d" + +#: 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:476 +#, c-format +msgid "Badly quoted content in file '%s': %s" +msgstr "ๆชๆก '%s' ๅ ๅซ้ฏ่ชค็ๅผ็จๆ ผๅผ๏ผ%s" + +#: bisect.c:686 +#, c-format +msgid "We cannot bisect more!\n" +msgstr "ๆๅ็กๆณ้ฒ่กๆดๅค็ไบๅๅฐๆพ๏ผ\n" + +#: bisect.c:753 +#, c-format +msgid "Not a valid commit name %s" +msgstr "ไธๆฏไธๅๆๆ็ๆไบคๅ %s" + +#: bisect.c:778 +#, 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:783 +#, 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:788 +#, 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:796 +#, 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:809 +#, 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:848 +#, c-format +msgid "Bisecting: a merge base must be tested\n" +msgstr "ไบๅๅฐๆพไธญ๏ผๅไฝตๅบ็คๅฟ ้ ๆฏ็ถ้ๆธฌ่ฉฆ็\n" + +#: bisect.c:898 +#, c-format +msgid "a %s revision is needed" +msgstr "้่ฆไธๅ %s ็ๆฌ" + +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 +#, c-format +msgid "could not create file '%s'" +msgstr "ไธ่ฝๅปบ็ซๆชๆก '%s'" + +#: bisect.c:974 builtin/merge.c:150 +#, c-format +msgid "could not read file '%s'" +msgstr "ไธ่ฝ่ฎๅๆชๆก '%s'" + +#: bisect.c:1014 +msgid "reading bisect refs failed" +msgstr "่ฎๅไบๅๅฐๆพๅผ็จๅคฑๆ" + +#: bisect.c:1044 +#, c-format +msgid "%s was both %s and %s\n" +msgstr "%s ๅๆ็บ %s ๅ %s\n" + +#: bisect.c:1053 +#, c-format +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path parameters?\n" +msgstr "" +"ๆฒๆ็ผ็พๅฏๆธฌ่ฉฆ็ๆไบคใ\n" +"ๅฏ่ฝๆจๅจๅท่กๆไฝฟ็จไบ้ฏ่ชค็่ทฏๅพๅๆธ๏ผ\n" + +#: bisect.c:1082 +#, 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:1088 +#, 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:2778 +msgid "--contents and --reverse do not blend well." +msgstr "--contents ๅ --reverse ไธ่ฝๆทท็จใ" + +#: blame.c:2792 +msgid "cannot use --contents with final commit object name" +msgstr "ไธ่ฝๅฐ --contents ๅๆ็ต็ๆไบค็ฉไปถๅๅ ฑ็จ" + +#: blame.c:2813 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "--reverse ๅ --first-parent ๅ ฑ็จ๏ผ้่ฆๆๅฎๆๆฐ็ๆไบค" + +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 +msgid "revision walk setup failed" +msgstr "็ๆฌ้ๆญท่จญๅฎๅคฑๆ" + +#: blame.c:2840 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "--reverse ๅ --first-parent ๅ ฑ็จ๏ผ้่ฆ็ฌฌไธ็ฅๅ ้ไธ็ๆไบค็ฏๅ" + +#: blame.c:2851 +#, c-format +msgid "no such path %s in %s" +msgstr "ๅจ %2$s ไธญ็กๆญค่ทฏๅพ %1$s" + +#: blame.c:2862 +#, 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:365 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "'%s' ๅทฒ็ถๆชขๅบๅฐ '%s'" + +#: branch.c:388 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "ๅทฅไฝๅ %s ็ HEAD ๆๅๆฒๆ่ขซๆดๆฐ" + +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "็กๆณ่ญๅฅ็ๅ ้ๆนๆผ็ฎๆณ๏ผ%s" + +#: bundle.c:45 +#, c-format +msgid "unknown capability '%s'" +msgstr "ๆช็ฅๅ่ฝ '%s'" + +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' ไธๅๆฏไธๅ v2 ๆ v3 ็ๆฌ็ๅ ๆชๆก" + +#: bundle.c:110 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "็กๆณ่ญๅฅ็ๅ ้ ญ๏ผ%s%s (%d)" + +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 +#, c-format +msgid "could not open '%s'" +msgstr "ไธ่ฝ้ๅ '%s'" + +#: bundle.c:189 +msgid "Repository lacks these prerequisite commits:" +msgstr "็ๆฌๅบซไธญ็ผบๅฐ้ไบๅฟ ๅ็ๆไบค๏ผ" + +#: bundle.c:192 +msgid "need a repository to verify a bundle" +msgstr "้่ฆ็ๆฌๅบซ้ฉ่ญไธๅๅ " + +#: bundle.c:243 +#, c-format +msgid "The bundle contains this ref:" +msgid_plural "The bundle contains these %d refs:" +msgstr[0] "้ๅๅ ไธญๅซๆ้ %d ๅๅผ็จ๏ผ" + +#: bundle.c:250 +msgid "The bundle records a complete history." +msgstr "้ๅๅ ่จ้ไธๅๅฎๆดๆญทๅฒใ" + +#: bundle.c:252 +#, c-format +msgid "The bundle requires this ref:" +msgid_plural "The bundle requires these %d refs:" +msgstr[0] "้ๅๅ ้่ฆ้ %d ๅๅผ็จ๏ผ" + +#: bundle.c:319 +msgid "unable to dup bundle descriptor" +msgstr "็กๆณ่ค่ฃฝ bundle ๆ่ฟฐ็ฌฆ" + +#: bundle.c:326 +msgid "Could not spawn pack-objects" +msgstr "ไธ่ฝ็ๆ pack-objects ้ฒ็จ" + +#: bundle.c:337 +msgid "pack-objects died" +msgstr "pack-objects ็ตๆญข" + +#: bundle.c:379 +msgid "rev-list died" +msgstr "rev-list ็ตๆญข" + +#: bundle.c:428 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "ๅผ็จ '%s' ่ขซ rev-list ้ธ้ ๆ้ค" + +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "ไธๆฏๆด็ๅ ็ๆฌ %d" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "็กๆณๅฏซๅ ฅ %2$s ๆผ็ฎๆณ็ๅ ็ๆฌ %1$d" + +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 +#, c-format +msgid "unrecognized argument: %s" +msgstr "็กๆณ่ญๅฅ็ๅๆธ๏ผ%s" + +#: bundle.c:530 +msgid "Refusing to create empty bundle." +msgstr "ไธ่ฝๅปบ็ซ็ฉบๅ ใ" + +#: bundle.c:540 +#, c-format +msgid "cannot create '%s'" +msgstr "ไธ่ฝๅปบ็ซ '%s'" + +#: bundle.c:565 +msgid "index-pack died" +msgstr "index-pack ็ตๆญข" + +#: color.c:329 +#, c-format +msgid "invalid color value: %.*s" +msgstr "็กๆ็้ก่ฒๅผ๏ผ%.*s" + +#: commit-graph.c:188 midx.c:46 +msgid "invalid hash version" +msgstr "็กๆ็้ๆน็ๆฌ" + +#: commit-graph.c:246 +msgid "commit-graph file is too small" +msgstr "ๆไบคๅๅฝขๆชๆกๅคชๅฐ" + +#: commit-graph.c:311 +#, c-format +msgid "commit-graph signature %X does not match signature %X" +msgstr "ๆไบคๅๅฝข็ฐฝๅ %X ๅ็ฐฝๅ %X ไธ็ฌฆๅ" + +#: commit-graph.c:318 +#, c-format +msgid "commit-graph version %X does not match version %X" +msgstr "ๆไบคๅๅฝข็ๆฌ %X ๅ็ๆฌ %X ไธ็ฌฆๅ" + +#: commit-graph.c:325 +#, c-format +msgid "commit-graph hash version %X does not match version %X" +msgstr "ๆไบคๅๅฝข้ๆน็ๆฌ %X ๅ็ๆฌ %X ไธ็ฌฆๅ" + +#: commit-graph.c:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "commit-graph ๆชๆกไธๅค ๆพ็ฝฎ %u ๅๅๅก" + +#: commit-graph.c:361 +#, c-format +msgid "commit-graph improper chunk offset %08x%08x" +msgstr "ๆไบคๅๅฝขไธๆญฃ็ขบ็ๅๅกไฝ็งป %08x%08x" + +#: commit-graph.c:433 +#, c-format +msgid "commit-graph chunk id %08x appears multiple times" +msgstr "ๆไบคๅๅฝขๅๅก id %08x ๅบ็พไบๅคๆฌก" + +#: commit-graph.c:499 +msgid "commit-graph has no base graphs chunk" +msgstr "ๆไบคๅๅฝขๆฒๆๅบ็คๅๅฝขๅๅก" + +#: commit-graph.c:509 +msgid "commit-graph chain does not match" +msgstr "ๆไบคๅๅฝข้ไธ็ฌฆๅ" + +#: commit-graph.c:557 +#, c-format +msgid "invalid commit-graph chain: line '%s' not a hash" +msgstr "็กๆ็ๆไบคๅๅฝข้๏ผ่ก '%s' ไธๆฏไธๅ้ๆนๅผ" + +#: commit-graph.c:581 +msgid "unable to find all commit-graph files" +msgstr "็กๆณๆพๅฐๆๆๆไบคๅๅฝขๆชๆก" + +#: commit-graph.c:721 commit-graph.c:785 +msgid "invalid commit position. commit-graph is likely corrupt" +msgstr "็กๆ็ๆไบคไฝ็ฝฎใๆไบคๅๅฝขๅฏ่ฝๅทฒๆๅฃ" + +#: commit-graph.c:742 +#, c-format +msgid "could not find commit %s" +msgstr "็กๆณๆพๅฐๆไบค %s" + +#: commit-graph.c:1042 builtin/am.c:1306 +#, c-format +msgid "unable to parse commit %s" +msgstr "ไธ่ฝ่งฃๆๆไบค %s" + +#: commit-graph.c:1265 builtin/pack-objects.c:2864 +#, c-format +msgid "unable to get type of object %s" +msgstr "็กๆณ็ฒๅพ็ฉไปถ %s ้กๅ" + +#: commit-graph.c:1301 +msgid "Loading known commits in commit graph" +msgstr "ๆญฃๅจ่ผๅ ฅๆไบคๅไธญ็ๅทฒ็ฅๆไบค" + +#: commit-graph.c:1318 +msgid "Expanding reachable commits in commit graph" +msgstr "ๆญฃๅจๆดๅฑๆไบคๅไธญ็ๅฏไปฅๅๅพๆไบค" + +#: commit-graph.c:1338 +msgid "Clearing commit marks in commit graph" +msgstr "ๆญฃๅจๆธ ้คๆไบคๅไธญ็ๆไบคๆจ่จ" + +#: commit-graph.c:1357 +msgid "Computing commit graph generation numbers" +msgstr "ๆญฃๅจ่จ็ฎๆไบคๅไธไปฃๆธๅญ" + +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "ๆญฃๅจ่จ็ฎๆไบค่ฎๆด่ทฏๅพ็ๅธ้้ๆฟพๅจ" + +#: commit-graph.c:1501 +msgid "Collecting referenced commits" +msgstr "ๆญฃๅจๆถ้ๅผ็จๆไบค" + +#: commit-graph.c:1526 +#, 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:1539 +#, c-format +msgid "error adding pack %s" +msgstr "ๆฐๅขๅ %s ็ผ็้ฏ่ชค" + +#: commit-graph.c:1543 +#, c-format +msgid "error opening index for %s" +msgstr "็บ %s ้ๅ็ดขๅผ็ผ็้ฏ่ชค" + +#: commit-graph.c:1582 +msgid "Finding commits for commit graph among packed objects" +msgstr "ๆญฃๅจๆๅ ็ฉไปถไธญๅฐๆพๆไบคๅ็ๆไบค" + +#: commit-graph.c:1597 +msgid "Counting distinct commits in commit graph" +msgstr "ๆญฃๅจ่จ็ฎๆไบคๅไธญไธๅ็ๆไบค" + +#: commit-graph.c:1629 +msgid "Finding extra edges in commit graph" +msgstr "ๆญฃๅจๅฐๆพๆไบคๅไธญ้กๅค็้" + +#: commit-graph.c:1678 +msgid "failed to write correct number of base graph ids" +msgstr "็กๆณๅฏซๅ ฅๆญฃ็ขบๆธ้็ๅบ็คๅๅฝข ID" + +#: commit-graph.c:1720 midx.c:826 +#, c-format +msgid "unable to create leading directories of %s" +msgstr "ไธ่ฝ็บ %s ๅปบ็ซๅ ๅฐ็ฎ้" + +#: commit-graph.c:1733 +msgid "unable to create temporary graph layer" +msgstr "็กๆณๅปบ็ซๆซๆ็ๅๅฝขๅฑค" + +#: commit-graph.c:1738 +#, c-format +msgid "unable to adjust shared permissions for '%s'" +msgstr "็กๆณ่ชฟๆดใ%sใ็ๅ ฑ็จๆฌ้" + +#: commit-graph.c:1808 +#, 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:1853 +msgid "unable to open commit-graph chain file" +msgstr "็กๆณ้ๅๆไบคๅๅฝข้ๆชๆก" + +#: commit-graph.c:1869 +msgid "failed to rename base commit-graph file" +msgstr "็กๆณ้ๆฐๅฝๅๅบ็คๆไบคๅๅฝขๆชๆก" + +#: commit-graph.c:1889 +msgid "failed to rename temporary commit-graph file" +msgstr "็กๆณ้ๆฐๅฝๅๆซๆๆไบคๅๅฝขๆชๆก" + +#: commit-graph.c:2015 +msgid "Scanning merged commits" +msgstr "ๆญฃๅจๆๆๅไฝตๆไบค" + +#: commit-graph.c:2026 +#, c-format +msgid "unexpected duplicate commit id %s" +msgstr "ๆๅค็้่คๆไบค ID %s" + +#: commit-graph.c:2049 +msgid "Merging commit-graph" +msgstr "ๆญฃๅจๅไฝตๆไบคๅๅฝข" + +#: commit-graph.c:2259 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "ๆไบคๅๆ ผๅผไธ่ฝๅฏซๅ ฅ %d ๅๆไบค" + +#: commit-graph.c:2270 +msgid "too many commits to write graph" +msgstr "ๆไบคๅคชๅคไธ่ฝ็ซๅ" + +#: commit-graph.c:2363 +msgid "the commit-graph file has incorrect checksum and is likely corrupt" +msgstr "ๆไบคๅๆชๆก็็ธฝๅๆชขๆฅ็ขผ้ฏ่ชค๏ผๅฏ่ฝๅทฒ็ถๆๅฃ" + +#: commit-graph.c:2373 +#, c-format +msgid "commit-graph has incorrect OID order: %s then %s" +msgstr "ๆไบคๅๅฝข็็ฉไปถ ID ้ ๅบไธๆญฃ็ขบ๏ผ%s ็ถๅพ %s" + +#: commit-graph.c:2383 commit-graph.c:2398 +#, c-format +msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" +msgstr "ๆไบคๅๅฝขๆไธๆญฃ็ขบ็ๆๅบๅผ๏ผfanout[%d] = %u != %u" + +#: commit-graph.c:2390 +#, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "็กๆณๅพๆไบคๅๅฝขไธญ่งฃๆๆไบค %s" + +#: commit-graph.c:2408 +msgid "Verifying commits in commit graph" +msgstr "ๆญฃๅจ้ฉ่ญๆไบคๅไธญ็ๆไบค" + +#: commit-graph.c:2423 +#, c-format +msgid "failed to parse commit %s from object database for commit-graph" +msgstr "็กๆณๅพๆไบคๅๅฝข็็ฉไปถๅบซไธญ่งฃๆๆไบค %s" + +#: commit-graph.c:2430 +#, c-format +msgid "root tree OID for commit %s in commit-graph is %s != %s" +msgstr "ๆไบคๅๅฝขไธญ็ๆไบค %s ็ๆ นๆจน็็ฉไปถ ID ๆฏ %s != %s" + +#: commit-graph.c:2440 +#, c-format +msgid "commit-graph parent list for commit %s is too long" +msgstr "ๆไบค %s ็ๆไบคๅๅฝข็ถๆไบคๅ่กจๅคช้ทไบ" + +#: commit-graph.c:2449 +#, c-format +msgid "commit-graph parent for %s is %s != %s" +msgstr "%s ็ๆไบคๅๅฝข็ถๆไบคๆฏ %s != %s" + +#: commit-graph.c:2463 +#, c-format +msgid "commit-graph parent list for commit %s terminates early" +msgstr "ๆไบค %s ็ๆไบคๅๅฝข็ถๆไบคๅ่กจ้ๆฉ็ตๆญข" + +#: commit-graph.c:2468 +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "ๆไบคๅๅฝขไธญๆไบค %s ็ไธไปฃ่ๆฏ้ถ๏ผไฝๅ ถๅฎๅฐๆน้้ถ" + +#: commit-graph.c:2472 +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "ๆไบคๅๅฝขไธญๆไบค %s ็ไธไปฃ่้้ถ๏ผไฝๅ ถๅฎๅฐๆนๆฏ้ถ" + +#: commit-graph.c:2488 +#, c-format +msgid "commit-graph generation for commit %s is %u != %u" +msgstr "ๆไบคๅๅฝขไธญ็ๆไบค %s ็ไธไปฃ่ๆฏ %u != %u" + +#: commit-graph.c:2494 +#, c-format +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "ๆไบคๅๅฝขไธญๆไบค %s ็ๆไบคๆฅๆๆฏ %<PRIuMAX> != %<PRIuMAX>" + +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "ไธ่ฝ่งฃๆ %s" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s ไธๆฏไธๅๆไบค๏ผ" + +#: commit.c:194 +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:1172 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "ๆไบค %s ๆไธๅ้ๅฏไฟก็่ฒ็จฑไพ่ช %s ็ GPG ็ฐฝๅใ" + +#: commit.c:1176 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "ๆไบค %s ๆไธๅ้ฏ่ชค็่ฒ็จฑไพ่ช %s ็ GPG ็ฐฝๅใ" + +#: commit.c:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "ๆไบค %s ๆฒๆ GPG ็ฐฝๅใ" + +#: commit.c:1182 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "ๆไบค %s ๆไธๅไพ่ช %s ็ๅฅฝ็ GPG ็ฐฝๅใ\n" + +#: commit.c:1436 +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" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "่จๆถ้ซ่็ก" + +#: config.c:125 +#, 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:141 +#, c-format +msgid "could not expand include path '%s'" +msgstr "็กๆณๆดๅฑๅ ๅซ่ทฏๅพ '%s'" + +#: config.c:152 +msgid "relative config includes must come from files" +msgstr "็ธๅฐ่ทฏๅพ็่จญๅฎๆชๆกๅผ็จๅฟ ้ ไพ่ชๆผๆชๆก" + +#: config.c:198 +msgid "relative config include conditionals must come from files" +msgstr "็ธๅฐ่ทฏๅพ็่จญๅฎๆชๆกๆขไปถๅผ็จๅฟ ้ ไพ่ชๆผๆชๆก" + +#: config.c:378 +#, c-format +msgid "key does not contain a section: %s" +msgstr "้ตๅๆฒๆๅ ๅซไธๅๅฐ็ฏๅ็จฑ๏ผ%s" + +#: config.c:384 +#, c-format +msgid "key does not contain variable name: %s" +msgstr "้ตๅๆฒๆๅ ๅซ่ฎๆธๅ๏ผ%s" + +#: config.c:408 sequencer.c:2547 +#, c-format +msgid "invalid key: %s" +msgstr "็กๆ้ตๅ๏ผ%s" + +#: config.c:414 +#, c-format +msgid "invalid key (newline): %s" +msgstr "็กๆ้ตๅ๏ผๆๆ่ก็ฌฆ่๏ผ๏ผ%s" + +#: config.c:450 config.c:462 +#, c-format +msgid "bogus config parameter: %s" +msgstr "ๅฝ่จญๅฎๅๆธ๏ผ%s" + +#: config.c:497 +#, c-format +msgid "bogus format in %s" +msgstr "%s ไธญๆ ผๅผ้ฏ่ชค" + +#: config.c:836 +#, c-format +msgid "bad config line %d in blob %s" +msgstr "่ณๆ็ฉไปถ %2$s ไธญ้ฏ่ชค็่จญๅฎ่ก %1$d" + +#: config.c:840 +#, c-format +msgid "bad config line %d in file %s" +msgstr "ๆชๆก %2$s ไธญ้ฏ่ชค็่จญๅฎ่ก %1$d" + +#: config.c:844 +#, c-format +msgid "bad config line %d in standard input" +msgstr "ๆจๆบ่ผธๅ ฅไธญ้ฏ่ชค็่จญๅฎ่ก %d" + +#: config.c:848 +#, c-format +msgid "bad config line %d in submodule-blob %s" +msgstr "ๅญๆจก็ต่ณๆ็ฉไปถ %2$s ไธญ้ฏ่ชค็่จญๅฎ่ก %1$d" + +#: config.c:852 +#, c-format +msgid "bad config line %d in command line %s" +msgstr "ๆไปคๅ %2$s ไธญ้ฏ่ชค็่จญๅฎ่ก %1$d" + +#: config.c:856 +#, c-format +msgid "bad config line %d in %s" +msgstr "ๅจ %2$s ไธญ้ฏ่ชค็่จญๅฎ่ก %1$d" + +#: config.c:993 +msgid "out of range" +msgstr "่ถ ๅบ็ฏๅ" + +#: config.c:993 +msgid "invalid unit" +msgstr "็กๆ็ๅฎไฝ" + +#: config.c:994 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "่จญๅฎ่ฎๆธ '%2$s' ็ๆธๅญๅๅผ '%1$s' ่จญๅฎ้ฏ่ชค๏ผ%3$s" + +#: config.c:1013 +#, 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:1016 +#, 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:1019 +#, c-format +msgid "bad numeric config value '%s' for '%s' in standard input: %s" +msgstr "ๆจๆบ่ผธๅ ฅไธญ่จญๅฎ่ฎๆธ '%2$s' ้ฏ่ชค็ๅๅผ '%1$s'๏ผ%3$s" + +#: config.c:1022 +#, 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:1025 +#, 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:1028 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "ๅจ %3$s ไธญ่จญๅฎ่ฎๆธ '%2$s' ้ฏ่ชค็ๅๅผ '%1$s'๏ผ%4$s" + +#: config.c:1123 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "็กๆณๆดๅฑไฝฟ็จ่ ็ฎ้๏ผ'%s'" + +#: config.c:1132 +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "'%2$s' ็ๅผ '%1$s' ไธๆฏไธๅๆๆ็ๆ้ๆณ" + +#: config.c:1223 +#, c-format +msgid "abbrev length out of range: %d" +msgstr "็ธฎๅฏซ้ทๅบฆ่ถ ๅบ็ฏๅ๏ผ%d" + +#: config.c:1237 config.c:1248 +#, c-format +msgid "bad zlib compression level %d" +msgstr "้ฏ่ชค็ zlib ๅฃ็ธฎ็ดๅฅ %d" + +#: config.c:1340 +msgid "core.commentChar should only be one character" +msgstr "core.commentChar ๆ่ฉฒๆฏไธๅๅญๅ " + +#: config.c:1373 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "็กๆ็็ฉไปถๅปบ็ซๆจกๅผ๏ผ%s" + +#: config.c:1445 +#, c-format +msgid "malformed value for %s" +msgstr "%s ็ๅๅผๆ ผๅผ้ฏ่ชค" + +#: config.c:1471 +#, c-format +msgid "malformed value for %s: %s" +msgstr "%s ็ๅๅผๆ ผๅผ้ฏ่ชค๏ผ%s" + +#: config.c:1472 +msgid "must be one of nothing, matching, simple, upstream or current" +msgstr "ๅฟ ้ ๆฏๅ ถไธญไนไธ๏ผnothingใmatchingใsimpleใupstream ๆ current" + +#: config.c:1533 builtin/pack-objects.c:3649 +#, c-format +msgid "bad pack compression level %d" +msgstr "้ฏ่ชค็ๆๅ ๅฃ็ธฎ็ดๅฅ %d" + +#: config.c:1655 +#, c-format +msgid "unable to load config blob object '%s'" +msgstr "็กๆณๅพ่ณๆ็ฉไปถ '%s' ่ผๅ ฅ่จญๅฎ" + +#: config.c:1658 +#, c-format +msgid "reference '%s' does not point to a blob" +msgstr "ๅผ็จ '%s' ๆฒๆๆๅไธๅ่ณๆ็ฉไปถ" + +#: config.c:1675 +#, c-format +msgid "unable to resolve config blob '%s'" +msgstr "ไธ่ฝ่งฃๆ่จญๅฎ็ฉไปถ '%s'" + +#: config.c:1705 +#, c-format +msgid "failed to parse %s" +msgstr "่งฃๆ %s ๅคฑๆ" + +#: config.c:1759 +msgid "unable to parse command-line config" +msgstr "็กๆณ่งฃๆๆไปคๅไธญ็่จญๅฎ" + +#: config.c:2122 +msgid "unknown error occurred while reading the configuration files" +msgstr "ๅจ่ฎๅ่จญๅฎๆชๆกๆ้ๅฐๆช็ฅ้ฏ่ชค" + +#: config.c:2296 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "็กๆ %s๏ผ'%s'" + +#: config.c:2341 +#, c-format +msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" +msgstr "splitIndex.maxPercentChange ็ๅๅผ '%d' ๆ่ฉฒไปๆผ 0 ๅ 100 ไน้" + +#: config.c:2387 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "็กๆณ่งฃๆๆไปคๅ่จญๅฎไธญ็ '%s'" + +#: config.c:2389 +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "ๅจๆชๆก '%2$s' ็็ฌฌ %3$d ่ก็ผ็พ้ฏ่ชค็่จญๅฎ่ฎๆธ '%1$s'" + +#: config.c:2470 +#, c-format +msgid "invalid section name '%s'" +msgstr "็กๆ็ๅฐ็ฏๅ็จฑ '%s'" + +#: config.c:2502 +#, c-format +msgid "%s has multiple values" +msgstr "%s ๆๅคๅๅๅผ" + +#: config.c:2531 +#, c-format +msgid "failed to write new configuration file %s" +msgstr "ๅฏซๅ ฅๆฐ็่จญๅฎๆชๆก %s ๅคฑๆ" + +#: config.c:2783 config.c:3107 +#, c-format +msgid "could not lock config file %s" +msgstr "ไธ่ฝ้ๅฎ่จญๅฎๆชๆก %s" + +#: config.c:2794 +#, c-format +msgid "opening %s" +msgstr "้ๅ %s" + +#: config.c:2829 builtin/config.c:354 +#, c-format +msgid "invalid pattern: %s" +msgstr "็กๆๆจกๅผ๏ผ%s" + +#: config.c:2854 +#, c-format +msgid "invalid config file %s" +msgstr "็กๆ็่จญๅฎๆชๆก %s" + +#: config.c:2867 config.c:3120 +#, c-format +msgid "fstat on %s failed" +msgstr "ๅฐ %s ๅผๅซ fstat ๅคฑๆ" + +#: config.c:2878 +#, c-format +msgid "unable to mmap '%s'" +msgstr "ไธ่ฝ mmap '%s'" + +#: config.c:2887 config.c:3125 +#, c-format +msgid "chmod on %s failed" +msgstr "ๅฐ %s ๅผๅซ chmod ๅคฑๆ" + +#: config.c:2972 config.c:3222 +#, c-format +msgid "could not write config file %s" +msgstr "ไธ่ฝๅฏซๅ ฅ่จญๅฎๆชๆก %s" + +#: config.c:3006 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "ไธ่ฝ่จญๅฎ '%s' ็บ '%s'" + +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 +#, c-format +msgid "could not unset '%s'" +msgstr "ไธ่ฝๅๆถ่จญๅฎ '%s'" + +#: config.c:3098 +#, c-format +msgid "invalid section name: %s" +msgstr "็กๆ็ๅฐ็ฏๅ็จฑ๏ผ%s" + +#: config.c:3265 +#, 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:118 +#, c-format +msgid "server doesn't support feature '%s'" +msgstr "ไผบๆๅจไธๆฏๆด็นๆง '%s'" + +#: connect.c:129 +msgid "expected flush after capabilities" +msgstr "ๅจ่ฝๅไนๅพๆ็บไธๅ flush ๅ " + +#: connect.c:263 +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "ๅฟฝ็ฅ็ฌฌไธ่ก '%s' ไนๅพ็่ฝๅๆฌไฝ" + +#: connect.c:284 +msgid "protocol error: unexpected capabilities^{}" +msgstr "ๅๅฎ้ฏ่ชค๏ผๆๅค็ capabilities^{}" + +#: connect.c:306 +#, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "ๅๅฎ้ฏ่ชค๏ผ้ ๆๆทบ่ค่ฃฝ sha-1๏ผๅปๅพๅฐ '%s'" + +#: connect.c:308 +msgid "repository on the other end cannot be shallow" +msgstr "ๅฆไธ็ซฏ็็ๆฌๅบซไธ่ฝๆฏๆทบ่ค่ฃฝ็ๆฌๅบซ" + +#: connect.c:347 +msgid "invalid packet" +msgstr "็กๆๅฐๅ " + +#: connect.c:367 +#, c-format +msgid "protocol error: unexpected '%s'" +msgstr "ๅๅฎ้ฏ่ชค๏ผๆๅค็ '%s'" + +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "ไผบๆๅจๆๅฎ็ใ%sใ็ฉไปถๆ ผๅผ็กๆ" + +#: connect.c:500 +#, c-format +msgid "invalid ls-refs response: %s" +msgstr "็กๆ็ ls-refs ๅๆ๏ผ%s" + +#: connect.c:504 +msgid "expected flush after ref listing" +msgstr "ๅจๅผ็จๅ่กจไนๅพๆ่ฉฒๆไธๅ flush ๅ " + +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "ๅจๅผ็จๅ่กจๅพ้ ๆ่ฆๆๅๆ็ตๆๅฐๅ " + +#: connect.c:640 +#, c-format +msgid "protocol '%s' is not supported" +msgstr "ไธๆฏๆด '%s' ๅๅฎ" + +#: connect.c:691 +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "็กๆณ็บ socket ่จญๅฎ SO_KEEPALIVE" + +#: connect.c:731 connect.c:794 +#, c-format +msgid "Looking up %s ... " +msgstr "ๅฐๆพ %s ... " + +#: connect.c:735 +#, 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:739 connect.c:810 +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" +"ๅฎๆใ\n" +"้ฃ็ทๅฐ %s๏ผๅ %s๏ผ... " + +#: connect.c:761 connect.c:838 +#, 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:767 connect.c:844 +msgid "done." +msgstr "ๅฎๆใ" + +#: connect.c:798 +#, c-format +msgid "unable to look up %s (%s)" +msgstr "็กๆณๅฐๆพ %s๏ผ%s๏ผ" + +#: connect.c:804 +#, c-format +msgid "unknown port %s" +msgstr "ๆช็ฅๅ %s" + +#: connect.c:941 connect.c:1271 +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "ๅทฒ้ปๆญขๅฅๆช็ไธปๆฉๅ็จฑ '%s'" + +#: connect.c:943 +#, c-format +msgid "strange port '%s' blocked" +msgstr "ๅทฒ้ปๆญขๅฅๆช็ๅ ่ '%s'" + +#: connect.c:953 +#, c-format +msgid "cannot start proxy %s" +msgstr "ไธ่ฝๅๅไปฃ็ %s" + +#: connect.c:1024 +msgid "no path specified; see 'git help pull' for valid url syntax" +msgstr "ๆชๆๅฎ่ทฏๅพ๏ผๅท่ก 'git help pull' ๆชข่ฆๆๆ็ url ่ชๆณ" + +#: connect.c:1219 +msgid "ssh variant 'simple' does not support -4" +msgstr "ssh ่ฎ้ซ 'simple' ไธๆฏๆด -4" + +#: connect.c:1231 +msgid "ssh variant 'simple' does not support -6" +msgstr "ssh ่ฎ้ซ 'simple' ไธๆฏๆด -6" + +#: connect.c:1248 +msgid "ssh variant 'simple' does not support setting port" +msgstr "ssh ่ฎ้ซ 'simple' ไธๆฏๆด่จญๅฎๅ " + +#: connect.c:1360 +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "ๅทฒ้ปๆญขๅฅๆช็่ทฏๅพๅ '%s'" + +#: connect.c:1408 +msgid "unable to fork" +msgstr "็กๆณ fork" + +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 +msgid "Checking connectivity" +msgstr "ๆญฃๅจๆชขๆฅ้ฃ้ๆง" + +#: connected.c:120 +msgid "Could not run 'git rev-list'" +msgstr "ไธ่ฝๅท่ก 'git rev-list'" + +#: connected.c:144 +msgid "failed write to rev-list" +msgstr "ๅฏซๅ ฅ rev-list ๅคฑๆ" + +#: connected.c:149 +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:665 +#, c-format +msgid "cannot fork to run external filter '%s'" +msgstr "ไธ่ฝ fork ไปฅๅท่กๅค้จ้ๆฟพๅจ '%s'" + +#: convert.c:685 +#, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "ไธ่ฝๅฐ่ผธๅ ฅๅณ้็ตฆๅค้จ้ๆฟพๅจ '%s'" + +#: convert.c:692 +#, c-format +msgid "external filter '%s' failed %d" +msgstr "ๅค้จ้ๆฟพๅจ '%s' ๅคฑๆ็ขผ %d" + +#: convert.c:727 convert.c:730 +#, c-format +msgid "read from external filter '%s' failed" +msgstr "ๅพๅค้จ้ๆฟพๅจ '%s' ่ฎๅๅคฑๆ" + +#: convert.c:733 convert.c:788 +#, c-format +msgid "external filter '%s' failed" +msgstr "ๅค้จ้ๆฟพๅจ '%s' ๅคฑๆ" + +#: convert.c:837 +msgid "unexpected filter type" +msgstr "ๆๅค็้ๆฟพ้กๅ" + +#: convert.c:848 +msgid "path name too long for external filter" +msgstr "ๅค้จ้ๆฟพๅจ็่ทฏๅพๅๅคช้ท" + +#: convert.c:940 +#, c-format +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "ๅค้จ้ๆฟพๅจ '%s' ไธๅๅฏ็จ๏ผไฝไธฆ้ๆๆ่ทฏๅพ้ฝๅทฒ้ๆฟพ" + +#: convert.c:1240 +msgid "true/false are no valid working-tree-encodings" +msgstr "true/false ไธๆฏๆๆ็ๅทฅไฝๅ็ทจ็ขผ" + +#: convert.c:1428 convert.c:1462 +#, c-format +msgid "%s: clean filter '%s' failed" +msgstr "%s๏ผclean ้ๆฟพๅจ '%s' ๅคฑๆ" + +#: convert.c:1508 +#, c-format +msgid "%s: smudge filter %s failed" +msgstr "%s๏ผsmudge ้ๆฟพๅจ %s ๅคฑๆ" + +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "่ทณ้้ต็ๆ่ญๆฅ่ฉข๏ผcredential.%s" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "ๆ็ตไฝฟ็จ็ผบๅฐไธปๆฉๆฌไฝ็ๆ่ญ" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "ๆ็ตไฝฟ็จ็ผบๅฐ้่จๅๅฎๆฌไฝ็ๆ่ญ" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "URL ็ %s ้จๅๆๆ่ก๏ผ%s" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "URL ๆฒๆ Scheme๏ผ%s" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "็กๆณ่งฃๆๆ่ญ URL๏ผ%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" + +#: 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:156 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " ็กๆณ่งฃๆ dirstat ๆชๆญข๏ผcut-off๏ผ็พๅๆฏ '%s'\n" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: diff.c:161 +#, c-format +msgid " Unknown dirstat parameter '%s'\n" +msgstr " ๆช็ฅ็ dirstat ๅๆธ '%s'\n" + +#: diff.c:297 +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:325 +#, 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:333 +msgid "" +"color-moved-ws: allow-indentation-change cannot be combined with other " +"whitespace modes" +msgstr "color-moved-ws๏ผallow-indentation-change ไธ่ฝ่ๅ ถๅฎ็ฉบ็ฝๅญๅ ๆจกๅผๅ ฑ็จ" + +#: diff.c:410 +#, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "่จญๅฎ่ฎๆธ 'diff.submodule' ๆช็ฅ็ๅๅผ๏ผ'%s'" + +#: diff.c:470 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"็ผ็พ่จญๅฎ่ฎๆธ 'diff.dirstat' ไธญ็้ฏ่ชค๏ผ\n" +"%s" + +#: diff.c:4269 +#, c-format +msgid "external diff died, stopping at %s" +msgstr "ๅค้จ diff ้ข้๏ผๅๆญขๅจ %s" + +#: diff.c:4618 +msgid "--name-only, --name-status, --check and -s are mutually exclusive" +msgstr "--name-onlyใ--name-statusใ--check ๅ -s ๆฏไบๆฅ็" + +#: diff.c:4621 +msgid "-G, -S and --find-object are mutually exclusive" +msgstr "-Gใ-S ๅ --find-object ๆฏไบๆฅ็" + +#: diff.c:4699 +msgid "--follow requires exactly one pathspec" +msgstr "--follow ๆ็ขบ่ฆๆฑๅช่ทไธๅ่ทฏๅพ่ฆๆ ผ" + +#: diff.c:4747 +#, c-format +msgid "invalid --stat value: %s" +msgstr "็กๆ็ --stat ๅผ๏ผ%s" + +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 +#, c-format +msgid "%s expects a numerical value" +msgstr "%s ๆๆไธๅๆธๅญๅผ" + +#: diff.c:4784 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"็กๆณ่งฃๆ --dirstat/-X ้ธ้ ็ๅๆธ๏ผ\n" +"%s" + +#: diff.c:4869 +#, c-format +msgid "unknown change class '%c' in --diff-filter=%s" +msgstr "--diff-filter=%2$s ไธญๆช็ฅ็่ฎๆด้ก '%1$c'" + +#: diff.c:4893 +#, c-format +msgid "unknown value after ws-error-highlight=%.*s" +msgstr "ws-error-highlight=%.*s ไนๅพๆช็ฅ็ๅผ" + +#: diff.c:4907 +#, c-format +msgid "unable to resolve '%s'" +msgstr "ไธ่ฝ่งฃๆ '%s'" + +#: diff.c:4957 diff.c:4963 +#, c-format +msgid "%s expects <n>/<m> form" +msgstr "%s ๆๆ <n>/<m> ๆ ผๅผ" + +#: diff.c:4975 +#, c-format +msgid "%s expects a character, got '%s'" +msgstr "%s ๆๆไธๅๅญๅ ๏ผๅพๅฐ '%s'" + +#: diff.c:4996 +#, c-format +msgid "bad --color-moved argument: %s" +msgstr "ๅฃ็ --color-moved ๅๆธ๏ผ%s" + +#: diff.c:5015 +#, c-format +msgid "invalid mode '%s' in --color-moved-ws" +msgstr "--color-moved-ws ไธญ็็กๆๆจกๅผ '%s'" + +#: diff.c:5055 +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"diff-algorithm ้ธ้ ๆ \"myers\"ใ\"minimal\"ใ\"patience\" ๅ \"histogram\"" + +#: diff.c:5091 diff.c:5111 +#, c-format +msgid "invalid argument to %s" +msgstr "%s ็ๅๆธ็กๆ" + +#: diff.c:5248 +#, c-format +msgid "failed to parse --submodule option parameter: '%s'" +msgstr "็กๆณ่งฃๆ --submodule ้ธ้ ็ๅๆธ๏ผ'%s'" + +#: diff.c:5304 +#, c-format +msgid "bad --word-diff argument: %s" +msgstr "ๅฃ็ --word-diff ๅๆธ๏ผ%s" + +#: diff.c:5327 +msgid "Diff output format options" +msgstr "ๅทฎ็ฐ่ผธๅบๆ ผๅผๅ้ธ้ " + +#: diff.c:5329 diff.c:5335 +msgid "generate patch" +msgstr "็ๆไฟฎ่ฃๆช" + +#: diff.c:5332 builtin/log.c:176 +msgid "suppress diff output" +msgstr "ไธ้กฏ็คบๅทฎ็ฐ่ผธๅบ" + +#: diff.c:5337 diff.c:5451 diff.c:5458 +msgid "<n>" +msgstr "<n>" + +#: diff.c:5338 diff.c:5341 +msgid "generate diffs with <n> lines context" +msgstr "็ๆๅซ <n> ่กไธไธๆ็ๅทฎ็ฐ" + +#: diff.c:5343 +msgid "generate the diff in raw format" +msgstr "็ๆๅๅงๆ ผๅผ็ๅทฎ็ฐ" + +#: diff.c:5346 +msgid "synonym for '-p --raw'" +msgstr "ๅ '-p --raw' ๅ็พฉ" + +#: diff.c:5350 +msgid "synonym for '-p --stat'" +msgstr "ๅ '-p --stat' ๅ็พฉ" + +#: diff.c:5354 +msgid "machine friendly --stat" +msgstr "ๆฉๅจๅๅฅฝ็ --stat" + +#: diff.c:5357 +msgid "output only the last line of --stat" +msgstr "ๅช่ผธๅบ --stat ็ๆๅพไธ่ก" + +#: diff.c:5359 diff.c:5367 +msgid "<param1,param2>..." +msgstr "<ๅๆธ1,ๅๆธ2>..." + +#: diff.c:5360 +msgid "" +"output the distribution of relative amount of changes for each sub-directory" +msgstr "่ผธๅบๆฏๅๅญ็ฎ้็ธๅฐ่ฎๆด็ๅๅธ" + +#: diff.c:5364 +msgid "synonym for --dirstat=cumulative" +msgstr "ๅ --dirstat=cumulative ๅ็พฉ" + +#: diff.c:5368 +msgid "synonym for --dirstat=files,param1,param2..." +msgstr "ๆฏ --dirstat=files,param1,param2... ็ๅ็พฉ่ฉ" + +#: diff.c:5372 +msgid "warn if changes introduce conflict markers or whitespace errors" +msgstr "ๅฆๆ่ฎๆดไธญๅผๅ ฅ่ก็ชๅฎ็็ฌฆๆ็ฉบ็ฝ้ฏ่ชค๏ผ็ตฆๅบ่ญฆๅ" + +#: diff.c:5375 +msgid "condensed summary such as creations, renames and mode changes" +msgstr "็ฒพ็ฐกๆ่ฆ๏ผไพๅฆๅปบ็ซใ้ๆฐๅฝๅๅๆจกๅผ่ฎๆด" + +#: diff.c:5378 +msgid "show only names of changed files" +msgstr "ๅช้กฏ็คบ่ฎๆดๆชๆก็ๆชๆกๅ" + +#: diff.c:5381 +msgid "show only names and status of changed files" +msgstr "ๅช้กฏ็คบ่ฎๆดๆชๆก็ๆชๆกๅๅ็ๆ " + +#: diff.c:5383 +msgid "<width>[,<name-width>[,<count>]]" +msgstr "<ๅฏฌๅบฆ>[,<ๆชๆกๅๅฏฌๅบฆ>[,<ๆฌกๆธ>]]" + +#: diff.c:5384 +msgid "generate diffstat" +msgstr "็ๆๅทฎ็ฐ็ตฑ่จ๏ผdiffstat๏ผ" + +#: diff.c:5386 diff.c:5389 diff.c:5392 +msgid "<width>" +msgstr "<ๅฏฌๅบฆ>" + +#: diff.c:5387 +msgid "generate diffstat with a given width" +msgstr "ไฝฟ็จๆไพ็้ทๅบฆ็ๆๅทฎ็ฐ็ตฑ่จ" + +#: diff.c:5390 +msgid "generate diffstat with a given name width" +msgstr "ไฝฟ็จๆไพ็ๆชๆกๅ้ทๅบฆ็ๆๅทฎ็ฐ็ตฑ่จ" + +#: diff.c:5393 +msgid "generate diffstat with a given graph width" +msgstr "ไฝฟ็จๆไพ็ๅๅฝข้ทๅบฆ็ๆๅทฎ็ฐ็ตฑ่จ" + +#: diff.c:5395 +msgid "<count>" +msgstr "<ๆฌกๆธ>" + +#: diff.c:5396 +msgid "generate diffstat with limited lines" +msgstr "็ๆๆ้่กๆธ็ๅทฎ็ฐ็ตฑ่จ" + +#: diff.c:5399 +msgid "generate compact summary in diffstat" +msgstr "็ๆๅทฎ็ฐ็ตฑ่จ็็ฐกๆฝๆ่ฆ" + +#: diff.c:5402 +msgid "output a binary diff that can be applied" +msgstr "่ผธๅบไธๅๅฏไปฅๆ็จ็ไบ้ฒไฝๅทฎ็ฐ" + +#: diff.c:5405 +msgid "show full pre- and post-image object names on the \"index\" lines" +msgstr "ๅจ \"index\" ่ก้กฏ็คบๅฎๆด็ๅๅพ็ฉไปถๅ็จฑ" + +#: diff.c:5407 +msgid "show colored diff" +msgstr "้กฏ็คบๅธถ้ก่ฒ็ๅทฎ็ฐ" + +#: diff.c:5408 +msgid "<kind>" +msgstr "<้กๅ>" + +#: diff.c:5409 +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" +msgstr "ๅฐๆผๅทฎ็ฐไธญ็ไธไธๆใ่็ๅๆฐ็่ก๏ผๅ ไบฎ้กฏ็คบ้ฏ่ชค็็ฉบ็ฝๅญๅ " + +#: diff.c:5412 +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" +msgstr "" +"ๅจ --raw ๆ่ --numstat ไธญ๏ผไธๅฐ่ทฏๅพๅญๅ ่ฝๆชไธฆไฝฟ็จ NUL ๅญๅ ๅ็บ่ผธๅบๆฌไฝ็ๅ้" +"็ฌฆ" + +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 +msgid "<prefix>" +msgstr "<ๅ็ถด>" + +#: diff.c:5416 +msgid "show the given source prefix instead of \"a/\"" +msgstr "้กฏ็คบๆไพ็ๆบๅ็ถดๅไปฃ \"a/\"" + +#: diff.c:5419 +msgid "show the given destination prefix instead of \"b/\"" +msgstr "้กฏ็คบๆไพ็็ฎๆจๅ็ถดๅไปฃ \"b/\"" + +#: diff.c:5422 +msgid "prepend an additional prefix to every line of output" +msgstr "่ผธๅบ็ๆฏไธ่ก้ๅ ๅ็ถด" + +#: diff.c:5425 +msgid "do not show any source or destination prefix" +msgstr "ไธ้กฏ็คบไปปไฝๆบๅ็ฎๆจๅ็ถด" + +#: diff.c:5428 +msgid "show context between diff hunks up to the specified number of lines" +msgstr "้กฏ็คบๆๅฎ่กๆธ็ๅทฎ็ฐๅๅก้็ไธไธๆ" + +#: diff.c:5432 diff.c:5437 diff.c:5442 +msgid "<char>" +msgstr "<ๅญๅ >" + +#: diff.c:5433 +msgid "specify the character to indicate a new line instead of '+'" +msgstr "ๆๅฎไธๅๅญๅ ๅไปฃ '+' ไพ่กจ็คบๆฐ็ไธ่ก" + +#: diff.c:5438 +msgid "specify the character to indicate an old line instead of '-'" +msgstr "ๆๅฎไธๅๅญๅ ๅไปฃ '-' ไพ่กจ็คบ่็ไธ่ก" + +#: diff.c:5443 +msgid "specify the character to indicate a context instead of ' '" +msgstr "ๆๅฎไธๅๅญๅ ๅไปฃ ' ' ไพ่กจ็คบไธ่กไธไธๆ" + +#: diff.c:5446 +msgid "Diff rename options" +msgstr "ๅทฎ็ฐ้ๆฐๅฝๅ้ธ้ " + +#: diff.c:5447 +msgid "<n>[/<m>]" +msgstr "<n>[/<m>]" + +#: diff.c:5448 +msgid "break complete rewrite changes into pairs of delete and create" +msgstr "ๅฐๅฎๅ จ้ๅฏซ็่ฎๆดๆ็ ด็บๆๅฐ็ๅช้คๅๅปบ็ซ" + +#: diff.c:5452 +msgid "detect renames" +msgstr "ๆชขๆธฌ้ๆฐๅฝๅ" + +#: diff.c:5456 +msgid "omit the preimage for deletes" +msgstr "็็ฅๅช้ค่ฎๆด็ๅทฎ็ฐ่ผธๅบ" + +#: diff.c:5459 +msgid "detect copies" +msgstr "ๆชขๆธฌ่ค่ฃฝ" + +#: diff.c:5463 +msgid "use unmodified files as source to find copies" +msgstr "ไฝฟ็จๆชไฟฎๆน็ๆชๆกๅ็บ็ผ็พ่ค่ฃฝ็ๆบ" + +#: diff.c:5465 +msgid "disable rename detection" +msgstr "ๅ็จ้ๆฐๅฝๅๅตๆธฌ" + +#: diff.c:5468 +msgid "use empty blobs as rename source" +msgstr "ไฝฟ็จ็ฉบ็่ณๆ็ฉไปถๅ็บ้ๆฐๅฝๅ็ๆบ" + +#: diff.c:5470 +msgid "continue listing the history of a file beyond renames" +msgstr "็นผ็บๅๅบๆชๆก้ๆฐๅฝๅไปฅๅค็ๆญทๅฒ่จ้" + +#: diff.c:5473 +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" +msgstr "ๅฆๆ้ๆฐๅฝๅ/่ค่ฃฝ็ฎๆจ่ถ ้ๆไพ็้ๅถ๏ผ็ฆๆญข้ๆฐๅฝๅ/่ค่ฃฝๆชขๆธฌ" + +#: diff.c:5475 +msgid "Diff algorithm options" +msgstr "ๅทฎ็ฐๆผ็ฎๆณ้ธ้ " + +#: diff.c:5477 +msgid "produce the smallest possible diff" +msgstr "็ๆๅๅฏ่ฝๅฐ็ๅทฎ็ฐ" + +#: diff.c:5480 +msgid "ignore whitespace when comparing lines" +msgstr "่กๆฏ่ผๆๅฟฝ็ฅ็ฉบ็ฝๅญๅ " + +#: diff.c:5483 +msgid "ignore changes in amount of whitespace" +msgstr "ๅฟฝ็ฅ็ฉบ็ฝๅญๅ ็่ฎๆด" + +#: diff.c:5486 +msgid "ignore changes in whitespace at EOL" +msgstr "ๅฟฝ็ฅ่กๅฐพ็็ฉบ็ฝๅญๅ ่ฎๆด" + +#: diff.c:5489 +msgid "ignore carrier-return at the end of line" +msgstr "ๅฟฝ็ฅ่กๅฐพ็Enter็ฌฆ๏ผCR๏ผ" + +#: diff.c:5492 +msgid "ignore changes whose lines are all blank" +msgstr "ๅฟฝ็ฅๆด่ก้ฝๆฏ็ฉบ็ฝ็่ฎๆด" + +#: diff.c:5495 +msgid "heuristic to shift diff hunk boundaries for easy reading" +msgstr "ๅ็ผๅผ่ฝๆๅทฎ็ฐ้็ไปฅไพฟ้ฑ่ฎ" + +#: diff.c:5498 +msgid "generate diff using the \"patience diff\" algorithm" +msgstr "ไฝฟ็จ \"patience diff\" ๆผ็ฎๆณ็ๆๅทฎ็ฐ" + +#: diff.c:5502 +msgid "generate diff using the \"histogram diff\" algorithm" +msgstr "ไฝฟ็จ \"histogram diff\" ๆผ็ฎๆณ็ๆๅทฎ็ฐ" + +#: diff.c:5504 +msgid "<algorithm>" +msgstr "<ๆผ็ฎๆณ>" + +#: diff.c:5505 +msgid "choose a diff algorithm" +msgstr "้ธๆไธๅๅทฎ็ฐๆผ็ฎๆณ" + +#: diff.c:5507 +msgid "<text>" +msgstr "<ๆๅญ>" + +#: diff.c:5508 +msgid "generate diff using the \"anchored diff\" algorithm" +msgstr "ไฝฟ็จ \"anchored diff\" ๆผ็ฎๆณ็ๆๅทฎ็ฐ" + +#: diff.c:5510 diff.c:5519 diff.c:5522 +msgid "<mode>" +msgstr "<ๆจกๅผ>" + +#: diff.c:5511 +msgid "show word diff, using <mode> to delimit changed words" +msgstr "้กฏ็คบๅฎ่ฉๅทฎ็ฐ๏ผไฝฟ็จ <ๆจกๅผ> ๅ้่ฎๆด็ๅฎ่ฉ" + +#: diff.c:5513 diff.c:5516 diff.c:5561 +msgid "<regex>" +msgstr "<ๆญฃๅ>" + +#: diff.c:5514 +msgid "use <regex> to decide what a word is" +msgstr "ไฝฟ็จ <ๆญฃ่ฆ่กจ็คบๅผ> ็ขบๅฎไฝ็บไธๅ่ฉ" + +#: diff.c:5517 +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" +msgstr "็ธ็ถๆผ --word-diff=color --word-diff-regex=<ๆญฃๅ>" + +#: diff.c:5520 +msgid "moved lines of code are colored differently" +msgstr "็งปๅ็็จๅผ็ขผ่ก็จไธๅๆนๅผ่่ฒ" + +#: diff.c:5523 +msgid "how white spaces are ignored in --color-moved" +msgstr "ๅจ --color-moved ไธๅฆไฝๅฟฝ็ฅ็ฉบ็ฝๅญๅ " + +#: diff.c:5526 +msgid "Other diff options" +msgstr "ๅ ถๅฎๅทฎ็ฐ้ธ้ " + +#: diff.c:5528 +msgid "when run from subdir, exclude changes outside and show relative paths" +msgstr "็ถๅพๅญ็ฎ้ๅท่ก๏ผๆ้ค็ฎ้ไนๅค็่ฎๆดไธฆ้กฏ็คบ็ธๅฐ่ทฏๅพ" + +#: diff.c:5532 +msgid "treat all files as text" +msgstr "ๆๆๆๆชๆก็ถๅๆๅญ่็" + +#: diff.c:5534 +msgid "swap two inputs, reverse the diff" +msgstr "ไบคๆๅ ฉๅ่ผธๅ ฅ๏ผๅ่ฝๅทฎ็ฐ" + +#: diff.c:5536 +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "ๆๅทฎ็ฐๆ้ข้็ขผ็บ 1๏ผๅฆๅ็บ 0" + +#: diff.c:5538 +msgid "disable all output of the program" +msgstr "ๅ็จๆฌ็จๅผ็ๆๆ่ผธๅบ" + +#: diff.c:5540 +msgid "allow an external diff helper to be executed" +msgstr "ๅ ่จฑๅท่กไธๅๅค้จ็ๅทฎ็ฐๅๅฉๅทฅๅ ท" + +#: diff.c:5542 +msgid "run external text conversion filters when comparing binary files" +msgstr "็ถๆฏ่ผไบ้ฒไฝๆชๆกๆ๏ผๅท่กๅค้จ็ๆๅญ่ฝๆ้ๆฟพๅจ" + +#: diff.c:5544 +msgid "<when>" +msgstr "<ไฝๆ>" + +#: diff.c:5545 +msgid "ignore changes to submodules in the diff generation" +msgstr "ๅจ็ๆๅทฎ็ฐๆ๏ผๅฟฝ็ฅๅญๆจก็ต็ๆดๆน" + +#: diff.c:5548 +msgid "<format>" +msgstr "<ๆ ผๅผ>" + +#: diff.c:5549 +msgid "specify how differences in submodules are shown" +msgstr "ๆๅฎๅญๆจก็ต็ๅทฎ็ฐๅฆไฝ้กฏ็คบ" + +#: diff.c:5553 +msgid "hide 'git add -N' entries from the index" +msgstr "้ฑ่็ดขๅผไธญ 'git add -N' ๆข็ฎ" + +#: diff.c:5556 +msgid "treat 'git add -N' entries as real in the index" +msgstr "ๅฐ็ดขๅผไธญ 'git add -N' ๆข็ฎ็ถๅ็ๅฏฆ็" + +#: diff.c:5558 +msgid "<string>" +msgstr "<ๅญไธฒ>" + +#: diff.c:5559 +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "ๅฐๆพๆน่ฎไบๆๅฎๅญไธฒๅบ็พๆฌกๆธ็ๅทฎ็ฐ" + +#: diff.c:5562 +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "ๅฐๆพๆน่ฎๆๅฎๆญฃๅ็ฌฆๅๅบ็พๆฌกๆธ็ๅทฎ็ฐ" + +#: diff.c:5565 +msgid "show all changes in the changeset with -S or -G" +msgstr "้กฏ็คบไฝฟ็จ -S ๆ -G ็่ฎๆด้็ๆๆ่ฎๆด" + +#: diff.c:5568 +msgid "treat <string> in -S as extended POSIX regular expression" +msgstr "ๅฐ -S ็ <string> ็ถๅๆดๅฑ็ POSIX ๆญฃ่ฆ่กจ็คบๅผ" + +#: diff.c:5571 +msgid "control the order in which files appear in the output" +msgstr "ๆงๅถ่ผธๅบไธญ็ๆชๆก้กฏ็คบ้ ๅบ" + +#: diff.c:5572 +msgid "<object-id>" +msgstr "<็ฉไปถ ID>" + +#: diff.c:5573 +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "ๅฐๆพๆน่ฎๆๅฎ็ฉไปถๅบ็พๆฌกๆธ็ๅทฎ็ฐ" + +#: diff.c:5575 +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" + +#: diff.c:5576 +msgid "select files by diff type" +msgstr "้้ๅทฎ็ฐ้กๅ้ธๆๆชๆก" + +#: diff.c:5578 +msgid "<file>" +msgstr "<ๆชๆก>" + +#: diff.c:5579 +msgid "Output to a specific file" +msgstr "่ผธๅบๅฐไธๅๆๅฎ็ๆชๆก" + +#: diff.c:6236 +msgid "inexact rename detection was skipped due to too many files." +msgstr "ๅ ็บๆชๆกๅคชๅค๏ผ็ฅ้ไธๅดๆ ผ็้ๆฐๅฝๅๆชขๆฅใ" + +#: diff.c:6239 +msgid "only found copies from modified paths due to too many files." +msgstr "ๅ ็บๆชๆกๅคชๅค๏ผๅชๅจไฟฎๆน็่ทฏๅพไธญๅฐๆพ่ค่ฃฝใ" + +#: diff.c:6242 +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "ๆจๅฏ่ฝๆณ่ฆๅฐ่ฎๆธ %s ่จญๅฎ็บ่ณๅฐ %d ไธฆๅๆฌกๅท่กๆญคๆไปคใ" + +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "่ฎๅๆๅบๆชๆก '%s' ๅคฑๆ" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "ๆญฃๅจ้ฒ่ก้็ฒพ็ขบ็้ๆฐๅฝๅๅตๆธฌ" + +#: dir.c:578 +#, c-format +msgid "pathspec '%s' did not match any file(s) known to git" +msgstr "่ทฏๅพ่ฆๆ ผ '%s' ๆช็ฌฆๅไปปไฝ git ๅทฒ็ฅๆชๆก" + +#: dir.c:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "็กๆณ่ญๅฅๆจฃๅผ๏ผใ%sใ" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "็กๆณ่ญๅฅๅๅๆจกๅผ๏ผใ%sใ" + +#: dir.c:809 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "ๆจ็็จ็ๆชขๅบๆชๆกๅฏ่ฝๆๅ้ก๏ผใ%sใๆจฃๅผ้่ค" + +#: dir.c:819 +msgid "disabling cone pattern matching" +msgstr "ๅ็จ cone ๆจฃๅผ็ฌฆๅๆจกๅผ" + +#: dir.c:1198 +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "ไธ่ฝๅฐ %s ็จไฝๆ้คๆชๆก" + +#: dir.c:2305 +#, c-format +msgid "could not open directory '%s'" +msgstr "ไธ่ฝ้ๅ็ฎ้ '%s'" + +#: dir.c:2605 +msgid "failed to get kernel name and information" +msgstr "็กๆณ็ฒๅพๆ ธๅฟๅ็จฑๅ่จๆฏ" + +#: dir.c:2729 +msgid "untracked cache is disabled on this system or location" +msgstr "ๅฟซๅๆช่ฟฝ่นคๆชๆกๅจๆฌ็ณป็ตฑๆไฝ็ฝฎไธญ่ขซๅ็จ" + +#: dir.c:3520 +#, c-format +msgid "index file corrupt in repo %s" +msgstr "็ๆฌๅบซ %s ไธญ็็ดขๅผๆชๆกๆๅฃ" + +#: dir.c:3565 dir.c:3570 +#, c-format +msgid "could not create directories for %s" +msgstr "ไธ่ฝ็บ %s ๅปบ็ซ็ฎ้" + +#: dir.c:3599 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "ไธ่ฝๅพ '%s' ้ท็งป git ็ฎ้ๅฐ '%s'" + +#: editor.c:74 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "ๆ็คบ๏ผ็ญๅพ ๆจ็็ทจ่ผฏๅจ้้ๆชๆก...%c" + +#: entry.c:177 +msgid "Filtering content" +msgstr "้ๆฟพๅ งๅฎน" + +#: entry.c:478 +#, c-format +msgid "could not stat file '%s'" +msgstr "ไธ่ฝๅฐๆชๆก '%s' ๅผๅซ stat" + +#: environment.c:150 +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "้ฏ่ชค็ git ๅๅญ็ฉบ้่ทฏๅพ \"%s\"" + +#: environment.c:337 +#, 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:176 +msgid "git fetch-pack: expected shallow list" +msgstr "git fetch-pack๏ผๆ็บ shallow ๅ่กจ" + +#: fetch-pack.c:179 +msgid "git fetch-pack: expected a flush packet after shallow list" +msgstr "git fetch-pack๏ผๅจๆทบ่ค่ฃฝๅ่กจไนๅพๆๆไธๅ flush ๅ " + +#: fetch-pack.c:190 +msgid "git fetch-pack: expected ACK/NAK, got a flush packet" +msgstr "git fetch-pack๏ผๆๆ ACK/NAK๏ผๅปๅพๅฐ flush ๅ " + +#: fetch-pack.c:210 +#, c-format +msgid "git fetch-pack: expected ACK/NAK, got '%s'" +msgstr "git fetch-pack๏ผๆ็บ ACK/NAK๏ผๅปๅพๅฐ '%s'" + +#: fetch-pack.c:221 +msgid "unable to write to remote" +msgstr "็กๆณๅฏซๅฐ้ ็ซฏ" + +#: fetch-pack.c:282 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "--stateless-rpc ้่ฆ multi_ack_detailed" + +#: fetch-pack.c:375 fetch-pack.c:1397 +#, c-format +msgid "invalid shallow line: %s" +msgstr "็กๆ็ shallow ่จๆฏ๏ผ%s" + +#: fetch-pack.c:381 fetch-pack.c:1403 +#, c-format +msgid "invalid unshallow line: %s" +msgstr "็กๆ็ unshallow ่จๆฏ๏ผ%s" + +#: fetch-pack.c:383 fetch-pack.c:1405 +#, c-format +msgid "object not found: %s" +msgstr "็ฉไปถๆชๆพๅฐ๏ผ%s" + +#: fetch-pack.c:386 fetch-pack.c:1408 +#, c-format +msgid "error in object: %s" +msgstr "็ฉไปถไธญ็ผ็้ฏ่ชค๏ผ%s" + +#: fetch-pack.c:388 fetch-pack.c:1410 +#, c-format +msgid "no shallow found: %s" +msgstr "ๆช็ผ็พ shallow๏ผ%s" + +#: fetch-pack.c:391 fetch-pack.c:1414 +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "ๆ็บ shallow/unshallow๏ผๅปๅพๅฐ %s" + +#: fetch-pack.c:431 +#, c-format +msgid "got %s %d %s" +msgstr "ๅพๅฐ %s %d %s" + +#: fetch-pack.c:448 +#, c-format +msgid "invalid commit %s" +msgstr "็กๆๆไบค %s" + +#: fetch-pack.c:479 +msgid "giving up" +msgstr "ๆพๆฃ" + +#: fetch-pack.c:492 progress.c:339 +msgid "done" +msgstr "ๅฎๆ" + +#: fetch-pack.c:504 +#, c-format +msgid "got %s (%d) %s" +msgstr "ๅพๅฐ %s (%d) %s" + +#: fetch-pack.c:540 +#, c-format +msgid "Marking %s as complete" +msgstr "ๆจ่จ %s ็บๅฎๆ" + +#: fetch-pack.c:755 +#, c-format +msgid "already have %s (%s)" +msgstr "ๅทฒ็ถๆ %s๏ผ%s๏ผ" + +#: fetch-pack.c:824 +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "fetch-pack๏ผ็กๆณ่ก็ sideband ๅค่ทฏ่ผธๅบ" + +#: fetch-pack.c:832 +msgid "protocol error: bad pack header" +msgstr "ๅๅฎ้ฏ่ชค๏ผๅฃ็ๅ ้ ญ" + +#: fetch-pack.c:916 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-pack๏ผ็กๆณ่ก็้ฒ็จ %s" + +#: fetch-pack.c:933 +#, c-format +msgid "%s failed" +msgstr "%s ๅคฑๆ" + +#: fetch-pack.c:935 +msgid "error in sideband demultiplexer" +msgstr "sideband ๅค่ทฏ่ผธๅบ็ผ็้ฏ่ชค" + +#: fetch-pack.c:978 +#, c-format +msgid "Server version is %.*s" +msgstr "ไผบๆๅจ็ๆฌ %.*s" + +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 +#, c-format +msgid "Server supports %s" +msgstr "ไผบๆๅจๆฏๆด %s" + +#: fetch-pack.c:985 +msgid "Server does not support shallow clients" +msgstr "ไผบๆๅจไธๆฏๆด shalllow ็จๆถ็ซฏ" + +#: fetch-pack.c:1045 +msgid "Server does not support --shallow-since" +msgstr "ไผบๆๅจไธๆฏๆด --shallow-since" + +#: fetch-pack.c:1050 +msgid "Server does not support --shallow-exclude" +msgstr "ไผบๆๅจไธๆฏๆด --shallow-exclude" + +#: fetch-pack.c:1054 +msgid "Server does not support --deepen" +msgstr "ไผบๆๅจไธๆฏๆด --deepen" + +#: fetch-pack.c:1056 +msgid "Server does not support this repository's object format" +msgstr "ไผบๆๅจไธๆฏๆดๆญค็ๆฌๅบซ็็ฉไปถๆ ผๅผ" + +#: fetch-pack.c:1069 +msgid "no common commits" +msgstr "ๆฒๆๅ ฑๅ็ๆไบค" + +#: fetch-pack.c:1081 fetch-pack.c:1619 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack๏ผๅๅพๅคฑๆใ" + +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "็ฎๆณไธไธ่ด๏ผ็จๆถ็ซฏ %s๏ผไผบๆๅจ %s" + +#: fetch-pack.c:1209 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "ไผบๆๅจไธๆฏๆดใ%sใ็ฎๆณ" + +#: fetch-pack.c:1229 +msgid "Server does not support shallow requests" +msgstr "ไผบๆๅจไธๆฏๆด shalllow ่ซๆฑ" + +#: fetch-pack.c:1236 +msgid "Server supports filter" +msgstr "ไผบๆๅจๆฏๆด filter" + +#: fetch-pack.c:1275 +msgid "unable to write request to remote" +msgstr "็กๆณๅฐ่ซๆฑๅฏซๅฐ้ ็ซฏ" + +#: fetch-pack.c:1293 +#, c-format +msgid "error reading section header '%s'" +msgstr "่ฎๅ็ฏๆจ้ก '%s' ็ผ็้ฏ่ชค" + +#: fetch-pack.c:1299 +#, c-format +msgid "expected '%s', received '%s'" +msgstr "้ ๆ '%s'๏ผๅพๅฐ '%s'" + +#: fetch-pack.c:1360 +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "ๆๅค็็ขบ่ช่ก๏ผ'%s'" + +#: fetch-pack.c:1365 +#, c-format +msgid "error processing acks: %d" +msgstr "่็ ack ็ผ็้ฏ่ชค๏ผ%d" + +#: fetch-pack.c:1375 +msgid "expected packfile to be sent after 'ready'" +msgstr "้ ๆๅจ 'ready' ไนๅพๅณ้ packfile" + +#: fetch-pack.c:1377 +msgid "expected no other sections to be sent after no 'ready'" +msgstr "ๅจๆฒๆ 'ready' ไธๆ่ฉฒๅณ้ๅ ถๅฎๅฐ็ฏ" + +#: fetch-pack.c:1419 +#, c-format +msgid "error processing shallow info: %d" +msgstr "่็ๆทบ่ค่ฃฝ่จๆฏ็ผ็้ฏ่ชค๏ผ%d" + +#: fetch-pack.c:1466 +#, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "้ ๆ wanted-ref๏ผๅพๅฐ '%s'" + +#: fetch-pack.c:1471 +#, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "ๆๅค็ wanted-ref๏ผ'%s'" + +#: fetch-pack.c:1476 +#, c-format +msgid "error processing wanted refs: %d" +msgstr "่็่ฆๅๅพ็ๅผ็จ็ผ็้ฏ่ชค๏ผ%d" + +#: fetch-pack.c:1506 +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack: ้ ๆ่ฆๆๅๆ็ตๆๅฐๅ " + +#: fetch-pack.c:1887 +msgid "no matching remote head" +msgstr "ๆฒๆ็ฌฆๅ็้ ็ซฏๅๆฏ" + +#: fetch-pack.c:1910 builtin/clone.c:692 +msgid "remote did not send all necessary objects" +msgstr "้ ็ซฏๆฒๆๅณ้ๆๆๅฟ ้็็ฉไปถ" + +#: fetch-pack.c:1937 +#, c-format +msgid "no such remote ref %s" +msgstr "ๆฒๆ้ๆจฃ็้ ็ซฏๅผ็จ %s" + +#: fetch-pack.c:1940 +#, c-format +msgid "Server does not allow request for unadvertised object %s" +msgstr "ไผบๆๅจไธๅ ่จฑ่ซๆฑๆชๅ ฌ้็็ฉไปถ %s" + +#: gpg-interface.c:272 +msgid "could not create temporary file" +msgstr "ไธ่ฝๅปบ็ซๆซๅญๆช" + +#: gpg-interface.c:275 +#, c-format +msgid "failed writing detached signature to '%s'" +msgstr "็กๆณๅฐๅ้ขๅผ็ฐฝๅๅฏซๅ ฅ '%s'" + +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg ็กๆณ็บ่ณๆ็ฐฝๅ" + +#: 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:176 builtin/clone.c:411 builtin/diff.c:89 +#: 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:300 +#, c-format +msgid "available git commands in '%s'" +msgstr "ๅจ '%s' ไธๅฏ็จ็ git ๆไปค" + +#: help.c:307 +msgid "git commands available from elsewhere on your $PATH" +msgstr "ๅจ $PATH ่ทฏๅพไธญ็ๅ ถไปๅฐๆนๅฏ็จ็ git ๆไปค" + +#: help.c:316 +msgid "These are common Git commands used in various situations:" +msgstr "้ไบๆฏๅ็จฎๅ ดๅๅธธ่ฆ็ Git ๆไปค๏ผ" + +#: help.c:365 git.c:99 +#, c-format +msgid "unsupported command listing type '%s'" +msgstr "ไธๆฏๆด็ๆไปคๅ่กจ้กๅ '%s'" + +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Git ๆฆๅฟตๅฎๅฐๆ๏ผ" + +#: help.c:429 +msgid "See 'git help <command>' to read about a specific subcommand" +msgstr "ๅท่กใ'git help <command>' ไพๆชข่ฆ็นๅฎๅญๆไปค" + +#: help.c:434 +msgid "External commands" +msgstr "ๅค้จๆไปค" + +#: help.c:449 +msgid "Command aliases" +msgstr "ๆไปคๅฅๅ" + +#: help.c:513 +#, 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:572 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "ๅๅ๏ผๆจ็็ณป็ตฑไธญๆช็ผ็พ Git ๆไปคใ" + +#: help.c:594 +#, c-format +msgid "WARNING: You called a Git command named '%s', which does not exist." +msgstr "่ญฆๅ๏ผๆจๅท่กไบไธๅไธฆไธๅญๅจ็ Git ๆไปค '%s'ใ" + +#: help.c:599 +#, c-format +msgid "Continuing under the assumption that you meant '%s'." +msgstr "ๅๅฎไฝ ๆณ่ฆ็ๆฏ '%s' ไธฆ็นผ็บใ" + +#: help.c:604 +#, c-format +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." +msgstr "ๅๅฎไฝ ๆณ่ฆ็ๆฏ '%2$s'๏ผๅจ %1$0.1f ็ง้ๅพ็นผ็บใ" + +#: help.c:612 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git๏ผ'%s' ไธๆฏไธๅ git ๆไปคใๅ่ฆ 'git --help'ใ" + +#: help.c:616 +msgid "" +"\n" +"The most similar command is" +msgid_plural "" +"\n" +"The most similar commands are" +msgstr[0] "" +"\n" +"ๆ้กไผผ็ๆไปคๆ" + +#: help.c:656 +msgid "git version [<options>]" +msgstr "git version [<้ธ้ >]" + +#: help.c:711 +#, c-format +msgid "%s: %s - %s" +msgstr "%s๏ผ%s - %s" + +#: help.c:715 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +"\n" +"ๆจๆ็ๆฏ้ๅๅ๏ผ" + +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "ไฝ่ ่บซๅๆช็ฅ\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "ๆไบค่ ่บซๅๆช็ฅ\n" + +#: ident.c:362 +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:397 +msgid "no email was given and auto-detection is disabled" +msgstr "ๆชๆไพไฟกไปถไฝๅไธ่ชๅๅตๆธฌ่ขซๅ็จ" + +#: ident.c:402 +#, c-format +msgid "unable to auto-detect email address (got '%s')" +msgstr "็กๆณ่ชๅๅตๆธฌไฟกไปถไฝๅ๏ผๅพๅฐ '%s'๏ผ" + +#: ident.c:419 +msgid "no name was given and auto-detection is disabled" +msgstr "ๆชๆไพๅงๅไธ่ชๅๅตๆธฌ่ขซๅ็จ" + +#: ident.c:425 +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "็กๆณ่ชๅๅตๆธฌๅงๅ๏ผๅพๅฐ '%s'๏ผ" + +#: ident.c:433 +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "ไธๅ ่จฑ็ฉบ็ๅงๅ๏ผๅฐๆผ <%s>๏ผ" + +#: ident.c:439 +#, c-format +msgid "name consists only of disallowed characters: %s" +msgstr "ๅงๅไธญๅ ๅ ๅซๅ็จๅญๅ ๏ผ%s" + +#: ident.c:454 builtin/commit.c:634 +#, c-format +msgid "invalid date format: %s" +msgstr "็กๆ็ๆฅๆๆ ผๅผ๏ผ%s" + +#: list-objects-filter-options.c:81 +msgid "expected 'tree:<depth>'" +msgstr "ๆๆ 'tree:<ๆทฑๅบฆ>'" + +#: list-objects-filter-options.c:96 +msgid "sparse:path filters support has been dropped" +msgstr "sparse:path ้ๆฟพๅจๆฏๆดๅทฒ่ขซๅช้ค" + +#: list-objects-filter-options.c:109 +#, c-format +msgid "invalid filter-spec '%s'" +msgstr "็กๆ็้ๆฟพๅจ่กจ้ๅผ '%s'" + +#: list-objects-filter-options.c:125 +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "ๅฟ ้ ๅฐ sub-filter-spec ไธญ็ๅญๅ ้ฒ่ก่ฝ็พฉ๏ผ'%c'" + +#: list-objects-filter-options.c:167 +msgid "expected something after combine:" +msgstr "ๆๆๅจ็ตๅๅพๆไธไบๆฑ่ฅฟ๏ผ" + +#: list-objects-filter-options.c:249 +msgid "multiple filter-specs cannot be combined" +msgstr "ไธ่ฝๆทท็จๅค็จฎ้ๆฟพ่ฆๆ ผ" + +#: list-objects-filter-options.c:361 +msgid "unable to upgrade repository format to support partial clone" +msgstr "็กๆณๅ็ด็ๆฌๅบซๆ ผๅผ๏ผไปฅ่ดไธๆฏๆด้จๅ่ค่ฃฝ" + +#: 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.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 ่ผๅ ฅๆ นๆจน" + +#: lockfile.c:152 +#, 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:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "ไธ่ฝๅปบ็ซ '%s.lock'๏ผ%s" + +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "ๅจ ls-refs ๅผๆธไนๅพๆ่ฉฒๆไธๅ flush ๅ " + +#: 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:2484 merge-recursive.c:3129 +#, 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:1805 +#, 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:2068 +#, 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:2100 +#, 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:2110 +#, 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:2202 +#, 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:2447 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "่ญฆๅ๏ผ้ฟๅ ๆ็จ %s -> %s ็้ๆฐๅฝๅๅฐ %s๏ผๅ ็บ %s ๆฌ่บซๅทฒ่ขซ้ๆฐๅฝๅใ" + +#: merge-recursive.c:2973 +#, c-format +msgid "cannot read object %s" +msgstr "ไธ่ฝ่ฎๅ็ฉไปถ %s" + +#: merge-recursive.c:2976 +#, c-format +msgid "object %s is not a blob" +msgstr "็ฉไปถ %s ไธๆฏไธๅ่ณๆ็ฉไปถ" + +#: merge-recursive.c:3040 +msgid "modify" +msgstr "ไฟฎๆน" + +#: merge-recursive.c:3040 +msgid "modified" +msgstr "ไฟฎๆน" + +#: merge-recursive.c:3052 +msgid "content" +msgstr "ๅ งๅฎน" + +#: merge-recursive.c:3056 +msgid "add/add" +msgstr "ๆฐๅข/ๆฐๅข" + +#: merge-recursive.c:3079 +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "็ฅ้ %s๏ผๅทฒ็ถๅ้็ธๅๅไฝต๏ผ" + +#: merge-recursive.c:3101 +msgid "submodule" +msgstr "ๅญๆจก็ต" + +#: merge-recursive.c:3102 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "่ก็ช๏ผ%s๏ผ๏ผๅไฝต่ก็ชๆผ %s" + +#: merge-recursive.c:3132 +#, c-format +msgid "Adding as %s instead" +msgstr "่ๆฏไปฅ %s ็บๅๆฐๅข" + +#: merge-recursive.c:3215 +#, 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:3218 +#, 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:3222 +#, 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:3225 +#, 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:3339 +#, c-format +msgid "Removing %s" +msgstr "ๅช้ค %s" + +#: merge-recursive.c:3362 +msgid "file/directory" +msgstr "ๆชๆก/็ฎ้" + +#: merge-recursive.c:3367 +msgid "directory/file" +msgstr "็ฎ้/ๆชๆก" + +#: merge-recursive.c:3374 +#, 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:3383 +#, c-format +msgid "Adding %s" +msgstr "ๆฐๅข %s" + +#: merge-recursive.c:3392 +#, c-format +msgid "CONFLICT (add/add): Merge conflict in %s" +msgstr "่ก็ช๏ผadd/add๏ผ๏ผๅไฝต่ก็ชๆผ %s" + +#: merge-recursive.c:3436 +msgid "Already up to date!" +msgstr "ๅทฒ็ถๆฏๆๆฐ็๏ผ" + +#: merge-recursive.c:3445 +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "็กๆณๅไฝตๆจน %s ๅ %s" + +#: merge-recursive.c:3550 +msgid "Merging:" +msgstr "ๅไฝต๏ผ" + +#: merge-recursive.c:3563 +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "็ผ็พ %u ๅๅ ฑๅ็ฅๅ ๏ผ" + +#: merge-recursive.c:3613 +msgid "merge returned no commit" +msgstr "ๅไฝตๆช่ฟๅๆไบค" + +#: merge-recursive.c:3672 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"ๆจๅฐไธๅๆชๆก็ๆฌๆฉไฟฎๆนๅฐ่ขซๅไฝตๅไฝ่ฆ่๏ผ\n" +" %s" + +#: merge-recursive.c:3769 +#, c-format +msgid "Could not parse object '%s'" +msgstr "ไธ่ฝ่งฃๆ็ฉไปถ '%s'" + +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 +msgid "Unable to write index." +msgstr "ไธ่ฝๅฏซๅ ฅ็ดขๅผใ" + +#: merge.c:41 +msgid "failed to read the cache" +msgstr "่ฎๅๅฟซๅๅคฑๆ" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "็กๆณๅฏซๆฐ็็ดขๅผๆชๆก" + +#: midx.c:79 +#, c-format +msgid "multi-pack-index file %s is too small" +msgstr "ๅคๅ ็ดขๅผๆชๆก %s ๅคชๅฐ" + +#: midx.c:95 +#, c-format +msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" +msgstr "ๅคๅ ็ดขๅผ็ฐฝๅ 0x%08x ๅ็ฐฝๅ 0x%08x ไธ็ฌฆๅ" + +#: midx.c:100 +#, c-format +msgid "multi-pack-index version %d not recognized" +msgstr "multi-pack-index ็ๆฌ %d ไธ่ฝ่ขซ่ญๅฅ" + +#: midx.c:105 +#, c-format +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "multi-pack-index ้ๆน็ๆฌ %u ่็ๆฌ %u ไธ็ฌฆๅ" + +#: midx.c:122 +msgid "invalid chunk offset (too large)" +msgstr "็กๆ็ๅๅกไฝ็งป๏ผๅคชๅคง๏ผ" + +#: midx.c:146 +msgid "terminating multi-pack-index chunk id appears earlier than expected" +msgstr "็ตๆญขๅคๅ ็ดขๅผๅๅก id ๅบ็พๆ้ๆฉๆผ้ ๆ" + +#: midx.c:159 +msgid "multi-pack-index missing required pack-name chunk" +msgstr "ๅคๅ ็ดขๅผ็ผบๅฐๅฟ ้็ๅ ๅๅก" + +#: midx.c:161 +msgid "multi-pack-index missing required OID fanout chunk" +msgstr "ๅคๅ ็ดขๅผ็ผบๅฐๅฟ ้็็ฉไปถ ID ๆๅบๅก" + +#: midx.c:163 +msgid "multi-pack-index missing required OID lookup chunk" +msgstr "ๅคๅ ็ดขๅผ็ผบๅฐๅฟ ้็็ฉไปถ ID ๆฅ่ฉขๅก" + +#: midx.c:165 +msgid "multi-pack-index missing required object offsets chunk" +msgstr "ๅคๅ ็ดขๅผ็ผบๅฐๅฟ ้็็ฉไปถไฝ็งปๅก" + +#: midx.c:179 +#, c-format +msgid "multi-pack-index pack names out of order: '%s' before '%s'" +msgstr "ๅคๅ ็ดขๅผๅ ๅ็กๅบ๏ผ'%s' ๅจ '%s' ไนๅ" + +#: midx.c:222 +#, c-format +msgid "bad pack-int-id: %u (%u total packs)" +msgstr "้ฏ็ pack-int-id๏ผ%u๏ผๅ ฑๆ %u ๅๅ ๏ผ" + +#: midx.c:272 +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" +msgstr "ๅคๅ ็ดขๅผๅฒๅญไธๅ64ไฝไฝ็งป๏ผไฝๆฏ off_t ๅคชๅฐ" + +#: midx.c:300 +msgid "error preparing packfile from multi-pack-index" +msgstr "ๅพๅคๅ ็ดขๅผๆบๅ packfile ๆ็ผ็้ฏ่ชค" + +#: midx.c:485 +#, c-format +msgid "failed to add packfile '%s'" +msgstr "ๆฐๅข packfile '%s' ๅคฑๆ" + +#: midx.c:491 +#, c-format +msgid "failed to open pack-index '%s'" +msgstr "้ๅๅ ็ดขๅผ '%s' ๅคฑๆ" + +#: midx.c:551 +#, c-format +msgid "failed to locate object %d in packfile" +msgstr "ๅจ packfile ไธญๅฎไฝ็ฉไปถ %d ๅคฑๆ" + +#: midx.c:853 +msgid "Adding packfiles to multi-pack-index" +msgstr "ๆญฃๅจๆฐๅข packfile ่ณๅคๅ ็ดขๅผ" + +#: midx.c:886 +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "ๆฒๆ็ๅฐ่ฆๆจๆฃ็ๅ ๆชๆก %s" + +#: midx.c:938 +msgid "no pack files to index." +msgstr "ๆฒๆ่ฆ็ดขๅผ็ pack ๆชๆกใ" + +#: midx.c:990 +msgid "Writing chunks to multi-pack-index" +msgstr "ๅฏซๅ ฅๅๅก่ณๅคๅ ็ดขๅผ" + +#: midx.c:1068 +#, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "ๆธ ็ไฝๆผ %s ็ๅคๅ ็ดขๅผๅคฑๆ" + +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "ๆ multi-pack-index ๆชๆก๏ผไฝ็กๆณ่งฃๆ" + +#: midx.c:1132 +msgid "Looking for referenced packfiles" +msgstr "ๆญฃๅจๅฐๆพๅผ็จ็ packfile" + +#: midx.c:1147 +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" +msgstr "็ฉไปถ ID ๆๅบ็กๅบ๏ผfanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" + +#: midx.c:1152 +msgid "the midx contains no oid" +msgstr "midx ๆฒๆ oid" + +#: midx.c:1161 +msgid "Verifying OID order in multi-pack-index" +msgstr "ๆญฃๅจ้ฉ่ญๅคๅ ็ดขๅผไธญ็็ฉไปถ ID ้ ๅบ" + +#: midx.c:1170 +#, c-format +msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" +msgstr "็ฉไปถ ID ๆฅ่ฉข็กๅบ๏ผoid[%d] = %s >= %s = oid[%d]" + +#: midx.c:1190 +msgid "Sorting objects by packfile" +msgstr "้้ packfile ็บ็ฉไปถๆๅบ" + +#: midx.c:1197 +msgid "Verifying object offsets" +msgstr "ๆญฃๅจ้ฉ่ญ็ฉไปถไฝ็งป" + +#: midx.c:1213 +#, c-format +msgid "failed to load pack entry for oid[%d] = %s" +msgstr "็บ oid[%d] = %s ่ผๅ ฅๅ ๆข็ฎๅคฑๆ" + +#: midx.c:1219 +#, c-format +msgid "failed to load pack-index for packfile %s" +msgstr "็บ packfile %s ่ผๅ ฅๅ ็ดขๅผๅคฑๆ" + +#: midx.c:1228 +#, c-format +msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" +msgstr "oid[%d] = %s ้ฏ่ชค็็ฉไปถไฝ็งป๏ผ%<PRIx64> != %<PRIx64>" + +#: midx.c:1253 +msgid "Counting referenced objects" +msgstr "ๆญฃๅจ่จ็ฎๅผ็จ็ฉไปถ" + +#: midx.c:1263 +msgid "Finding and deleting unreferenced packfiles" +msgstr "ๆญฃๅจๅฐๆพไธฆๅช้คๆฒๆๅ่็ packfile" + +#: midx.c:1454 +msgid "could not start pack-objects" +msgstr "ไธ่ฝ้ๅง pack-objects" + +#: midx.c:1474 +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 ไธ็ฌฆๅ" + +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "ไธ่ฝๅพๅฐ %s ็ๅคงๅฐ" + +#: packfile.c:630 +msgid "offset before end of packfile (broken .idx?)" +msgstr "ไฝ็งป้ๅจ packfile ็ตๆไนๅ๏ผๆๅฃ็ .idx๏ผ๏ผ" + +#: packfile.c:1922 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "ไฝ็งป้ๅจ %s ็ๅ ็ดขๅผ้ๅงไนๅ๏ผๆๅฃ็็ดขๅผ๏ผ๏ผ" + +#: packfile.c:1926 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +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:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%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:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "--%s ็ๅฅๅ" + +#: parse-options.c:862 +#, c-format +msgid "unknown option `%s'" +msgstr "ๆช็ฅ้ธ้ `%s'" + +#: parse-options.c:864 +#, c-format +msgid "unknown switch `%c'" +msgstr "ๆช็ฅ้้ `%c'" + +#: parse-options.c:866 +#, c-format +msgid "unknown non-ascii option in string: `%s'" +msgstr "ๅญไธฒไธญๆช็ฅ็้ ascii ๅญๅ ้ธ้ ๏ผ`%s'" + +#: parse-options.c:890 +msgid "..." +msgstr "..." + +#: parse-options.c:909 +#, c-format +msgid "usage: %s" +msgstr "็จๆณ๏ผ%s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation. +#. +#: parse-options.c:915 +#, c-format +msgid " or: %s" +msgstr " ๆ๏ผ%s" + +# ่ญฏ่ ๏ผ็บไฟ่ญๅจ่ผธๅบไธญๅฐ้ฝ๏ผๆณจๆ่ชฟๆดๅฅไธญ็ฉบๆ ผ๏ผ +#: parse-options.c:918 +#, c-format +msgid " %s" +msgstr " %s" + +#: parse-options.c:957 +msgid "-NUM" +msgstr "-ๆธๅญ" + +#: 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:445 +#, c-format +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s๏ผ'%s' ๅจไฝๆผ '%s' ็็ๆฌๅบซไนๅค" + +#: pathspec.c:521 +#, c-format +msgid "'%s' (mnemonic: '%c')" +msgstr "'%s'๏ผๅฉ่จ็ฌฆ๏ผ'%c'๏ผ" + +#: pathspec.c:531 +#, c-format +msgid "%s: pathspec magic not supported by this command: %s" +msgstr "%s๏ผ่ทฏๅพ่ฆๆ ผ็ฅๅฅๅ็ถดไธ่ขซๆญคๆไปคๆฏๆด๏ผ%s" + +#: pathspec.c:598 +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "่ทฏๅพ่ฆๆ ผ '%s' ไฝๆผ็ฌฆ่้ฃ็ตไธญ" + +#: pathspec.c:643 +#, 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 "unable to write stateless separator packet" +msgstr "็กๆณๅฏซๅ ฅ็ก็ๆ ็ๅ้็ฌฆ่ๅฐๅ " + +#: pkt-line.c:113 +msgid "flush packet write failed" +msgstr "flush ๅ ๅฏซ้ฏ่ชค" + +#: pkt-line.c:153 pkt-line.c:239 +msgid "protocol error: impossibly long line" +msgstr "ๅๅฎ้ฏ่ชค๏ผไธๅฏ่ฝ็้ท่ก" + +#: pkt-line.c:169 pkt-line.c:171 +msgid "packet write with format failed" +msgstr "ๆ ผๅผๅๅ ๅฏซๅ ฅ้ฏ่ชค" + +#: pkt-line.c:203 +msgid "packet write failed - data exceeds max packet size" +msgstr "ๅฏซๅฐๅ ๅคฑๆ๏ผ่ณๆ่ถ ้ไบๅ ็ๆๅคง้ทๅบฆ" + +#: pkt-line.c:210 pkt-line.c:217 +msgid "packet write failed" +msgstr "ๅฐๅ ๅฏซๅ ฅๅคฑๆ" + +#: pkt-line.c:302 +msgid "read error" +msgstr "่ฎๅ้ฏ่ชค" + +#: pkt-line.c:310 +msgid "the remote end hung up unexpectedly" +msgstr "้ ็ซฏๆๅคๆๆทไบ" + +#: pkt-line.c:338 +#, c-format +msgid "protocol error: bad line length character: %.4s" +msgstr "ๅๅฎ้ฏ่ชค๏ผ้ฏ่ชค็่ก้ทๅบฆๅญไธฒ๏ผ%.4s" + +#: pkt-line.c:352 pkt-line.c:357 +#, c-format +msgid "protocol error: bad line length %d" +msgstr "ๅๅฎ้ฏ่ชค๏ผ้ฏ่ชค็่ก้ทๅบฆ %d" + +#: pkt-line.c:373 sideband.c:150 +#, 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:983 +msgid "unable to parse --pretty format" +msgstr "ไธ่ฝ่งฃๆ --pretty ๆ ผๅผ" + +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "promisor-remote: ็กๆณ fork fetch ๅญ่็็จๅบ" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "promisor-remote: ็กๆณๅฏซๅ ฅ fetch ๅญ่็็จๅบ" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "promisor-remote: ็กๆณ้้ fetch ๅญ่็็จๅบ็ stdin" + +#: promisor-remote.c:53 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "promisor ้ ็ซฏๅ็จฑไธ่ฝไปฅ '/' ้ๅง๏ผ%s" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "ๆญฃๅจๅช้ค้่ค็ฉไปถ" + +#: range-diff.c:77 +msgid "could not start `log`" +msgstr "ไธ่ฝๅๅ `log`" + +#: range-diff.c:79 +msgid "could not read `log` output" +msgstr "ไธ่ฝ่ฎๅ `log` ็่ผธๅบ" + +#: range-diff.c:98 sequencer.c:5283 +#, c-format +msgid "could not parse commit '%s'" +msgstr "ไธ่ฝ่งฃๆๆไบค '%s'" + +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "็กๆณ่งฃๆ็ฌฌไธ่กใlogใ่ผธๅบ๏ผ้้ ญไธๆฏใcommitใ๏ผใ%sใ" + +#: range-diff.c:137 +#, c-format +msgid "could not parse git header '%.*s'" +msgstr "็กๆณ่งฃๆ git ้ ญ '%.*s'" + +#: range-diff.c:301 +msgid "failed to generate diff" +msgstr "็ๆ diff ๅคฑๆ" + +#: range-diff.c:534 range-diff.c:536 +#, c-format +msgid "could not parse log for '%s'" +msgstr "ไธ่ฝ่งฃๆ '%s' ็ๆฅ่ช" + +#: read-cache.c:682 +#, c-format +msgid "will not add file alias '%s' ('%s' already exists in index)" +msgstr "ๅฐไธๆๆฐๅขๆชๆกๅฅๅ '%s'๏ผ'%s' ๅทฒ็ถๅญๅจๆผ็ดขๅผไธญ๏ผ" + +#: read-cache.c:698 +msgid "cannot create an empty blob in the object database" +msgstr "ไธ่ฝๅจ็ฉไปถ่ณๆๅบซไธญๅปบ็ซ็ฉบ็่ณๆ็ฉไปถ" + +#: read-cache.c:720 +#, c-format +msgid "%s: can only add regular files, symbolic links or git-directories" +msgstr "%s๏ผๅช่ฝๆฐๅขไธ่ฌๆชๆกใ็ฌฆ่้ฃ็ตๆ git ็ฎ้" + +#: read-cache.c:725 +#, c-format +msgid "'%s' does not have a commit checked out" +msgstr "'%s' ๆฒๆๆชขๅบไธๅๆไบค" + +#: read-cache.c:777 +#, c-format +msgid "unable to index file '%s'" +msgstr "็กๆณ็ดขๅผๆชๆก '%s'" + +#: read-cache.c:796 +#, c-format +msgid "unable to add '%s' to index" +msgstr "็กๆณๅจ็ดขๅผไธญๆฐๅข '%s'" + +#: read-cache.c:807 +#, c-format +msgid "unable to stat '%s'" +msgstr "็กๆณๅฐ %s ๅท่ก stat" + +#: read-cache.c:1318 +#, c-format +msgid "'%s' appears as both a file and as a directory" +msgstr "'%s' ็่ตทไพๆขๆฏๆชๆกๅๆฏ็ฎ้" + +#: read-cache.c:1524 +msgid "Refresh index" +msgstr "้ๆฐๆด็็ดขๅผ" + +#: read-cache.c:1639 +#, c-format +msgid "" +"index.version set, but the value is invalid.\n" +"Using version %i" +msgstr "" +"่จญๅฎไบ index.version๏ผไฝๆฏๅๅผ็กๆใ\n" +"ไฝฟ็จ็ๆฌ %i" + +#: read-cache.c:1649 +#, 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:1705 +#, c-format +msgid "bad signature 0x%08x" +msgstr "ๅฃ็็ฐฝๅ 0x%08x" + +#: read-cache.c:1708 +#, c-format +msgid "bad index version %d" +msgstr "ๅฃ็็ดขๅผ็ๆฌ %d" + +#: read-cache.c:1717 +msgid "bad index file sha1 signature" +msgstr "ๅฃ็็ดขๅผๆชๆก sha1 ็ฐฝๅ" + +#: read-cache.c:1747 +#, c-format +msgid "index uses %.4s extension, which we do not understand" +msgstr "็ดขๅผไฝฟ็จไธ่ขซๆฏๆด็ %.4s ๆดๅฑ" + +# +#: read-cache.c:1749 +#, c-format +msgid "ignoring %.4s extension" +msgstr "ๅฟฝ็ฅ %.4s ๆดๅฑ" + +#: read-cache.c:1786 +#, c-format +msgid "unknown index entry format 0x%08x" +msgstr "ๆช็ฅ็็ดขๅผๆข็ฎๆ ผๅผ 0x%08x" + +#: read-cache.c:1802 +#, c-format +msgid "malformed name field in the index, near path '%s'" +msgstr "็ดขๅผไธญ้ ่ฟ่ทฏๅพ '%s' ๆ้ฏ่ชค็ๅ็จฑๆฌไฝ" + +#: read-cache.c:1859 +msgid "unordered stage entries in index" +msgstr "็ดขๅผไธญๆๆชๆๅบ็ๆซๅญๆข็ฎ" + +#: read-cache.c:1862 +#, c-format +msgid "multiple stage entries for merged file '%s'" +msgstr "ๅไฝตๆชๆก '%s' ๆๅคๅๆซๅญๆข็ฎ" + +#: read-cache.c:1865 +#, c-format +msgid "unordered stage entries for '%s'" +msgstr "'%s' ็ๆชๆๅบๆซๅญๆข็ฎ" + +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 +msgid "index file corrupt" +msgstr "็ดขๅผๆชๆกๆๅฃ" + +#: read-cache.c:2115 +#, c-format +msgid "unable to create load_cache_entries thread: %s" +msgstr "็กๆณๅปบ็ซ load_cache_entries ๅท่ก็ท๏ผ%s" + +#: read-cache.c:2128 +#, c-format +msgid "unable to join load_cache_entries thread: %s" +msgstr "็กๆณๅ ๅ ฅ load_cache_entries ๅท่ก็ท๏ผ%s" + +#: read-cache.c:2161 +#, c-format +msgid "%s: index file open failed" +msgstr "%s๏ผ้ๅ็ดขๅผๆชๆกๅคฑๆ" + +#: read-cache.c:2165 +#, c-format +msgid "%s: cannot stat the open index" +msgstr "%s๏ผไธ่ฝๅฐ้ๅ็็ดขๅผๅท่ก stat ๅไฝ" + +#: read-cache.c:2169 +#, c-format +msgid "%s: index file smaller than expected" +msgstr "%s๏ผ็ดขๅผๆชๆกๆฏ้ ๆ็ๅฐ" + +#: read-cache.c:2173 +#, c-format +msgid "%s: unable to map index file" +msgstr "%s๏ผ็กๆณๅฐ็ดขๅผๆชๆกๅท่ก map ๅไฝ" + +#: read-cache.c:2215 +#, c-format +msgid "unable to create load_index_extensions thread: %s" +msgstr "็กๆณๅปบ็ซ load_index_extensions ๅท่ก็ท๏ผ%s" + +#: read-cache.c:2242 +#, c-format +msgid "unable to join load_index_extensions thread: %s" +msgstr "็กๆณๅ ๅ ฅ load_index_extensions ๅท่ก็ท๏ผ%s" + +#: read-cache.c:2274 +#, c-format +msgid "could not freshen shared index '%s'" +msgstr "็กๆณ้ๆฐๆด็ๅ ฑไบซ็ดขๅผ '%s'" + +#: read-cache.c:2321 +#, c-format +msgid "broken index, expect %s in %s, got %s" +msgstr "ๆๅฃ็็ดขๅผ๏ผๆๆๅจ %2$s ไธญ็ %1$s๏ผๅพๅฐ %3$s" + +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 +#, c-format +msgid "could not close '%s'" +msgstr "ไธ่ฝ้้ '%s'" + +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 +#, c-format +msgid "could not stat '%s'" +msgstr "ไธ่ฝๅฐ '%s' ๅผๅซ stat" + +#: read-cache.c:3133 +#, c-format +msgid "unable to open git dir: %s" +msgstr "ไธ่ฝ้ๅ git ็ฎ้๏ผ%s" + +#: read-cache.c:3145 +#, c-format +msgid "unable to unlink: %s" +msgstr "็กๆณๅช้ค๏ผ%s" + +#: read-cache.c:3170 +#, c-format +msgid "cannot fix permission bits on '%s'" +msgstr "ไธ่ฝไฟฎๅพฉ '%s' ็ๆฌ้ไฝ" + +#: read-cache.c:3319 +#, 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:218 +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:222 +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:861 +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:938 +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:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 +#, c-format +msgid "could not write '%s'" +msgstr "ไธ่ฝๅฏซๅ ฅ '%s'" + +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 +#, 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:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 +#, c-format +msgid "could not read '%s'." +msgstr "ไธ่ฝ่ฎๅ '%s'ใ" + +#: ref-filter.c:42 wt-status.c:1973 +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:169 +#, c-format +msgid "expected format: %%(color:<color>)" +msgstr "ๆๆ็ๆ ผๅผ๏ผ%%(color:<้ก่ฒ>)" + +#: ref-filter.c:171 +#, c-format +msgid "unrecognized color: %%(color:%s)" +msgstr "็กๆณ่ญๅฅ็้ก่ฒ๏ผ%%(color:%s)" + +#: ref-filter.c:193 +#, c-format +msgid "Integer value expected refname:lstrip=%s" +msgstr "ๆๆๆดๆธๅผ refname:lstrip=%s" + +#: ref-filter.c:197 +#, c-format +msgid "Integer value expected refname:rstrip=%s" +msgstr "ๆๆๆดๆธๅผ refname:rstrip=%s" + +#: ref-filter.c:199 +#, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "็กๆณ่ญๅฅ็ %%(%s) ๅๆธ๏ผ%s" + +#: ref-filter.c:254 +#, c-format +msgid "%%(objecttype) does not take arguments" +msgstr "%%(objecttype) ไธๅธถๅๆธ" + +#: ref-filter.c:276 +#, c-format +msgid "unrecognized %%(objectsize) argument: %s" +msgstr "็กๆณ่ญๅฅ็ %%(objectsize) ๅๆธ๏ผ%s" + +#: ref-filter.c:284 +#, c-format +msgid "%%(deltabase) does not take arguments" +msgstr "%%(deltabase) ไธๅธถๅๆธ" + +#: ref-filter.c:296 +#, c-format +msgid "%%(body) does not take arguments" +msgstr "%%(body) ไธๅธถๅๆธ" + +#: ref-filter.c:309 +#, c-format +msgid "unrecognized %%(subject) argument: %s" +msgstr "็กๆณ่ญๅฅ็ %%(subject) ๅผๆธ๏ผ%s" + +#: ref-filter.c:330 +#, c-format +msgid "unknown %%(trailers) argument: %s" +msgstr "ๆช็ฅ็ %%(trailers) ๅๆธ๏ผ%s" + +#: ref-filter.c:363 +#, c-format +msgid "positive value expected contents:lines=%s" +msgstr "ๆๆไธๅๆญฃๆธ contents:lines=%s" + +#: ref-filter.c:365 +#, c-format +msgid "unrecognized %%(contents) argument: %s" +msgstr "็กๆณ่ญๅฅ็ %%(contents) ๅๆธ๏ผ%s" + +#: ref-filter.c:380 +#, c-format +msgid "positive value expected '%s' in %%(%s)" +msgstr "%%(%2$s) ไธญ็ '%1$s' ้ ๆๆฏๆญฃๆธๅผ" + +#: ref-filter.c:384 +#, c-format +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "็กๆณ่ญๅฅ %%(%2$s) ไธญ็ '%1$s' ๅๆธ" + +#: ref-filter.c:398 +#, c-format +msgid "unrecognized email option: %s" +msgstr "็กๆณ่ญๅฅ็ email ้ธ้ ๏ผ%s" + +#: ref-filter.c:428 +#, c-format +msgid "expected format: %%(align:<width>,<position>)" +msgstr "ๆๆ็ๆ ผๅผ๏ผ%%(align:<ๅฏฌๅบฆ>,<ไฝ็ฝฎ>)" + +#: ref-filter.c:440 +#, c-format +msgid "unrecognized position:%s" +msgstr "็กๆณ่ญๅฅ็ไฝ็ฝฎ๏ผ%s" + +#: ref-filter.c:447 +#, c-format +msgid "unrecognized width:%s" +msgstr "็กๆณ่ญๅฅ็ๅฏฌๅบฆ๏ผ%s" + +#: ref-filter.c:456 +#, c-format +msgid "unrecognized %%(align) argument: %s" +msgstr "็กๆณ่ญๅฅ็ %%(align) ๅๆธ๏ผ%s" + +#: ref-filter.c:464 +#, c-format +msgid "positive width expected with the %%(align) atom" +msgstr "ๅ ็ด %%(align) ้่ฆไธๅๆญฃๆธ็ๅฏฌๅบฆ" + +#: ref-filter.c:482 +#, c-format +msgid "unrecognized %%(if) argument: %s" +msgstr "็กๆณ่ญๅฅ็ %%(if) ๅๆธ๏ผ%s" + +#: ref-filter.c:584 +#, c-format +msgid "malformed field name: %.*s" +msgstr "ๆ ผๅผ้ฏ่ชค็ๆฌไฝๅ๏ผ%.*s" + +#: ref-filter.c:611 +#, c-format +msgid "unknown field name: %.*s" +msgstr "ๆช็ฅ็ๆฌไฝๅ๏ผ%.*s" + +#: ref-filter.c:615 +#, c-format +msgid "" +"not a git repository, but the field '%.*s' requires access to object data" +msgstr "ไธๆฏไธๅ git ็ๆฌๅบซ๏ผไฝๆฏๆฌไฝ '%.*s' ้่ฆๅญๅ็ฉไปถ่ณๆ" + +#: ref-filter.c:739 +#, c-format +msgid "format: %%(if) atom used without a %%(then) atom" +msgstr "ๆ ผๅผ๏ผไฝฟ็จไบ %%(if) ๅ ็ด ่ๆฒๆ %%(then) ๅ ็ด " + +#: ref-filter.c:802 +#, c-format +msgid "format: %%(then) atom used without an %%(if) atom" +msgstr "ๆ ผๅผ๏ผไฝฟ็จไบ %%(then) ๅ ็ด ่ๆฒๆ %%(if) ๅ ็ด " + +#: ref-filter.c:804 +#, c-format +msgid "format: %%(then) atom used more than once" +msgstr "ๆ ผๅผ๏ผ%%(then) ๅ ็ด ็จไบๅคๆฌก" + +#: ref-filter.c:806 +#, c-format +msgid "format: %%(then) atom used after %%(else)" +msgstr "ๆ ผๅผ๏ผ%%(then) ๅ ็ด ็จๅจไบ %%(else) ไนๅพ" + +#: ref-filter.c:834 +#, c-format +msgid "format: %%(else) atom used without an %%(if) atom" +msgstr "ๆ ผๅผ๏ผไฝฟ็จไบ %%(else) ๅ ็ด ่ๆฒๆ %%(if) ๅ ็ด " + +#: ref-filter.c:836 +#, c-format +msgid "format: %%(else) atom used without a %%(then) atom" +msgstr "ๆ ผๅผ๏ผไฝฟ็จไบ %%(else) ๅ ็ด ่ๆฒๆ %%(then) ๅ ็ด " + +#: ref-filter.c:838 +#, c-format +msgid "format: %%(else) atom used more than once" +msgstr "ๆ ผๅผ๏ผ%%(else) ๅ ็ด ็จไบๅคๆฌก" + +#: ref-filter.c:853 +#, c-format +msgid "format: %%(end) atom used without corresponding atom" +msgstr "ๆ ผๅผ๏ผไฝฟ็จไบ %%(end) ๅ ็ด ๅปๆฒๆๅฎ็ๅฐๆๅ ็ด " + +#: ref-filter.c:910 +#, c-format +msgid "malformed format string %s" +msgstr "้ฏ่ชค็ๆ ผๅผๅๅญไธฒ %s" + +#: ref-filter.c:1541 +#, c-format +msgid "no branch, rebasing %s" +msgstr "้ๅๆฏ๏ผๆญฃ้ๅฎๅบๅบ %s" + +#: ref-filter.c:1544 +#, c-format +msgid "no branch, rebasing detached HEAD %s" +msgstr "้ๅๆฏ๏ผๆญฃ้ๅฎๅบๅบๅ้ข้้ ญๆๆจ %s" + +#: ref-filter.c:1547 +#, c-format +msgid "no branch, bisect started on %s" +msgstr "้ๅๆฏ๏ผไบๅๅฐๆพ้ๅงๆผ %s" + +#: ref-filter.c:1557 +msgid "no branch" +msgstr "้ๅๆฏ" + +#: ref-filter.c:1591 ref-filter.c:1800 +#, c-format +msgid "missing object %s for %s" +msgstr "็ผบๅฐ %2$s ็็ฉไปถ %1$s" + +#: ref-filter.c:1601 +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "parse_object_buffer ๅคฑๆๆผ %2$s ็ %1$s" + +#: ref-filter.c:2054 +#, c-format +msgid "malformed object at '%s'" +msgstr "ๆ ผๅผ้ฏ่ชค็็ฉไปถ '%s'" + +#: ref-filter.c:2143 +#, c-format +msgid "ignoring ref with broken name %s" +msgstr "ๅฟฝ็ฅๅธถๆ้ฏ่ชคๅ็จฑ %s ็ๅผ็จ" + +#: ref-filter.c:2148 refs.c:657 +#, c-format +msgid "ignoring broken ref %s" +msgstr "ๅฟฝ็ฅๆๅฃ็ๅผ็จ %s" + +#: ref-filter.c:2464 +#, c-format +msgid "format: %%(end) atom missing" +msgstr "ๆ ผๅผ๏ผ็ผบๅฐ %%(end) ๅ ็ด " + +#: ref-filter.c:2563 +#, c-format +msgid "malformed object name %s" +msgstr "ๆ ผๅผ้ฏ่ชค็็ฉไปถๅ %s" + +#: ref-filter.c:2568 +#, c-format +msgid "option `%s' must point to a commit" +msgstr "้ธ้ `%s' ๅฟ ้ ๆๅไธๅๆไบค" + +#: refs.c:264 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "%s ๆฒๆๆๅไธๅๆๆ็็ฉไปถ๏ผ" + +#: refs.c:572 +#, c-format +msgid "could not retrieve `%s`" +msgstr "็กๆณๆทๅใ%sใ" + +#: refs.c:579 +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "ๅๆฏๅ็จฑ็กๆ๏ผ%s = %s" + +#: refs.c:655 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "ๅฟฝ็ฅๆธ็ฉบ็ฌฆ่ๅผ็จ %s" + +#: refs.c:892 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "ๅผ็จ %s ็ๆฅ่ชๅจ %s ไนๅพๆ็ผบๅฃ" + +#: refs.c:898 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "ๅผ็จ %s ็ๆฅ่ชๆๅค็ตๆญขๆผ %s" + +#: refs.c:957 +#, c-format +msgid "log for %s is empty" +msgstr "%s ็ๆฅ่ช็บ็ฉบ" + +#: refs.c:1049 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "ๆ็ตๆดๆฐๆ้ฏ่ชคๅ็จฑ '%s' ็ๅผ็จ" + +#: refs.c:1120 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "ๅฐๅผ็จ '%s' ๅท่ก update_ref ๅคฑๆ๏ผ%s" + +#: refs.c:1944 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "ไธๅ ่จฑๅฐๅผ็จ '%s' ๅคๆฌกๆดๆฐ" + +#: refs.c:2024 +msgid "ref updates forbidden inside quarantine environment" +msgstr "ๅจ้้ข็ฐๅขไธญ็ฆๆญขๆดๆฐๅผ็จ" + +#: refs.c:2035 +msgid "ref updates aborted by hook" +msgstr "ๅผ็จๆดๆฐ่ขซๆ้คๆ็ต" + +#: refs.c:2135 refs.c:2165 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "'%s' ๅทฒๅญๅจ๏ผ็กๆณๅปบ็ซ '%s'" + +#: refs.c:2141 refs.c:2176 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "็กๆณๅๆ่็ '%s' ๅ '%s'" + +#: refs/files-backend.c:1228 +#, c-format +msgid "could not remove reference %s" +msgstr "็กๆณๅช้คๅผ็จ %s" + +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "็กๆณๅช้คๅผ็จ %s๏ผ%s" + +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#, c-format +msgid "could not delete references: %s" +msgstr "็กๆณๅช้คๅผ็จ๏ผ%s" + +#: refspec.c:167 +#, c-format +msgid "invalid refspec '%s'" +msgstr "็กๆ็ๅผ็จ่กจ้ๅผ๏ผ'%s'" + +#: remote.c:351 +#, c-format +msgid "config remote shorthand cannot begin with '/': %s" +msgstr "่จญๅฎ็้ ็ซฏ็ญๅ็จฑไธ่ฝไปฅ '/' ้ๅง๏ผ%s" + +#: remote.c:399 +msgid "more than one receivepack given, using the first" +msgstr "ๆไพไบไธๅไปฅไธ็ receivepack๏ผไฝฟ็จ็ฌฌไธๅ" + +#: remote.c:407 +msgid "more than one uploadpack given, using the first" +msgstr "ๆไพไบไธๅไปฅไธ็ uploadpack๏ผไฝฟ็จ็ฌฌไธๅ" + +#: remote.c:590 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "ไธ่ฝๅๆๅๅพ %s ๅ %s ่ณ %s" + +#: remote.c:594 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s ้ๅธธ่ฟฝ่นค %s๏ผ่้ %s" + +#: remote.c:598 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s ๅๆ่ฟฝ่นค %s ๅ %s" + +#: remote.c:666 +#, c-format +msgid "key '%s' of pattern had no '*'" +msgstr "ๆจกๅผ็้ต '%s' ๆฒๆ '*'" + +#: remote.c:676 +#, c-format +msgid "value '%s' of pattern has no '*'" +msgstr "ๆจกๅผ็ๅผ '%s' ๆฒๆ '*'" + +#: remote.c:1073 +#, c-format +msgid "src refspec %s does not match any" +msgstr "ๆบๅผ็จ่กจ้ๅผ %s ๆฒๆ็ฌฆๅ" + +#: remote.c:1078 +#, 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:1093 +#, 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:1113 +#, 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:1118 +#, 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:1123 +#, 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:1128 +#, 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:1164 +#, c-format +msgid "%s cannot be resolved to branch" +msgstr "%s ็กๆณ่ขซ่งฃๆ็บๅๆฏ" + +#: remote.c:1175 +#, c-format +msgid "unable to delete '%s': remote ref does not exist" +msgstr "็กๆณๅช้ค '%s'๏ผ้ ็ซฏๅผ็จไธๅญๅจ" + +#: remote.c:1187 +#, c-format +msgid "dst refspec %s matches more than one" +msgstr "็ฎๆจๅผ็จ่กจ้ๅผ %s ็ฌฆๅ่ถ ้ไธๅ" + +#: remote.c:1194 +#, c-format +msgid "dst ref %s receives from more than one src" +msgstr "็ฎๆจๅผ็จ %s ๆฅๆถ่ถ ้ไธๅๆบ" + +#: remote.c:1703 remote.c:1804 +msgid "HEAD does not point to a branch" +msgstr "HEAD ๆฒๆๆๅไธๅๅๆฏ" + +#: remote.c:1712 +#, c-format +msgid "no such branch: '%s'" +msgstr "ๆฒๆๆญคๅๆฏ๏ผ'%s'" + +#: remote.c:1715 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "ๅฐๆช็ตฆๅๆฏ '%s' ่จญๅฎไธๆธธ" + +#: remote.c:1721 +#, c-format +msgid "upstream branch '%s' not stored as a remote-tracking branch" +msgstr "ไธๆธธๅๆฏ '%s' ๆฒๆๅฒๅญ็บไธๅ้ ็ซฏ่ฟฝ่นคๅๆฏ" + +#: remote.c:1736 +#, c-format +msgid "push destination '%s' on remote '%s' has no local tracking branch" +msgstr "ๆจ้็ฎๆจ '%s' ่ณ้ ็ซฏ '%s' ๆฒๆๆฌๆฉ่ฟฝ่นคๅๆฏ" + +#: remote.c:1748 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "ๅๆฏ '%s' ๆฒๆ่จญๅฎ่ฆๆจ้็้ ็ซฏไผบๆๅจ" + +#: remote.c:1758 +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "ๅ '%s' ๆจ้ๅผ็จ่ฆๆ ผๆชๅ ๅซ '%s'" + +#: remote.c:1771 +msgid "push has no destination (push.default is 'nothing')" +msgstr "ๆจ้็ก็ฎๆจ๏ผpush.default ๆฏ 'nothing'๏ผ" + +#: remote.c:1793 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "็กๆณ่งฃๆ 'simple' ๆจ้่ณไธๅๅฎ็จ็็ฎๆจ" + +#: remote.c:1922 +#, c-format +msgid "couldn't find remote ref %s" +msgstr "็กๆณๆพๅฐ้ ็ซฏๅผ็จ %s" + +#: remote.c:1935 +#, c-format +msgid "* Ignoring funny ref '%s' locally" +msgstr "* ๅจๆฌๆฉๅฟฝ็ฅๅฏ็ฌ็ๅผ็จ '%s'" + +#: remote.c:2098 +#, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "ๆจ็ๅๆฏๅบๆผ '%s'๏ผไฝๆญคไธๆธธๅๆฏๅทฒ็ถไธๅญๅจใ\n" + +#: remote.c:2102 +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr " ๏ผไฝฟ็จ \"git branch --unset-upstream\" ไพไฟฎๅพฉ๏ผ\n" + +#: remote.c:2105 +#, c-format +msgid "Your branch is up to date with '%s'.\n" +msgstr "ๆจ็ๅๆฏ่ไธๆธธๅๆฏ '%s' ไธ่ดใ\n" + +#: remote.c:2109 +#, c-format +msgid "Your branch and '%s' refer to different commits.\n" +msgstr "ๆจ็ๅๆฏๅ '%s' ๆๅไธๅ็ๆไบคใ\n" + +#: remote.c:2112 +#, c-format +msgid " (use \"%s\" for details)\n" +msgstr " ๏ผไฝฟ็จ \"%s\" ๆชข่ฆ่ฉณๆ ๏ผ\n" + +#: remote.c:2116 +#, 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:2122 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " ๏ผไฝฟ็จ \"git push\" ไพ็ผๅธๆจ็ๆฌๆฉๆไบค๏ผ\n" + +#: remote.c:2125 +#, 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:2133 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " ๏ผไฝฟ็จ \"git pull\" ไพๆดๆฐๆจ็ๆฌๆฉๅๆฏ๏ผ\n" + +#: remote.c:2136 +#, 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:2146 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " ๏ผไฝฟ็จ \"git pull\" ไพๅไฝต้ ็ซฏๅๆฏ๏ผ\n" + +#: remote.c:2337 +#, 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:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#, 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 ็ฎ้" + +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "ไธ่ฝ็ขบๅฎ HEAD ็ๆฌ" + +#: reset.c:70 reset.c:76 sequencer.c:3426 +#, c-format +msgid "failed to find tree of %s" +msgstr "็กๆณๆพๅฐ %s ๆๅ็ๆจน" + +#: revision.c:2344 +#| msgid "git-over-rsync is no longer supported" +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<packfile> ๅทฒไธๅๆฏๆด" + +#: revision.c:2364 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "--diff-merges ็ๅผ็กๆ๏ผ%s" + +#: revision.c:2702 +msgid "your current branch appears to be broken" +msgstr "ๆจ็็ฎๅๅๆฏๅฅฝๅ่ขซๆๅฃ" + +#: revision.c:2705 +#, c-format +msgid "your current branch '%s' does not have any commits yet" +msgstr "ๆจ็็ฎๅๅๆฏ '%s' ๅฐ็กไปปไฝๆไบค" + +#: revision.c:2915 +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:1270 +#, c-format +msgid "cannot create async thread: %s" +msgstr "ไธ่ฝๅปบ็ซ async ๅท่ก็ท๏ผ%s" + +#: run-command.c:1334 +#, 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:145 +msgid "unexpected flush packet while reading remote unpack status" +msgstr "่ฎๅ้ ็ซฏ่งฃๅ ็ๆ ๆๆถๅฐๆๅค็ flush ๅ " + +#: send-pack.c:147 +#, c-format +msgid "unable to parse remote unpack status: %s" +msgstr "ไธ่ฝ่งฃๆ้ ็ซฏ่งฃๅ ็ๆ ๏ผ%s" + +#: send-pack.c:149 +#, c-format +msgid "remote unpack failed: %s" +msgstr "้ ็ซฏ่งฃๅ ๅคฑๆ๏ผ%s" + +#: send-pack.c:372 +msgid "failed to sign the push certificate" +msgstr "็บๆจ้่ญๆธ็ฑคๅๅคฑๆ" + +#: send-pack.c:460 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "ๆฅๆถ็ซฏไธๆฏๆดๆญค็ๆฌๅบซ็้ๆน็ฎๆณ" + +#: send-pack.c:469 +msgid "the receiving end does not support --signed push" +msgstr "ๆฅๆถ็ซฏไธๆฏๆด็ฐฝๅๆจ้" + +#: send-pack.c:471 +msgid "" +"not sending a push certificate since the receiving end does not support --" +"signed push" +msgstr "ๆชๅณ้ๆจ้่ญๆธ๏ผๅ ็บๆฅๆถ็ซฏไธๆฏๆด็ฐฝๅๆจ้" + +#: send-pack.c:483 +msgid "the receiving end does not support --atomic push" +msgstr "ๆฅๆถ็ซฏไธๆฏๆดๅๅญๆจ้" + +#: send-pack.c:488 +msgid "the receiving end does not support push options" +msgstr "ๆฅๆถ็ซฏไธๆฏๆดๆจ้้ธ้ " + +#: sequencer.c:194 +#, c-format +msgid "invalid commit message cleanup mode '%s'" +msgstr "็กๆ็ๆไบค่จๆฏๆธ ็ๆจกๅผ '%s'" + +#: sequencer.c:308 +#, c-format +msgid "could not delete '%s'" +msgstr "็กๆณๅช้ค '%s'" + +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 +#, c-format +msgid "could not remove '%s'" +msgstr "็กๆณๅช้ค '%s'" + +#: sequencer.c:339 +msgid "revert" +msgstr "ๅพฉๅ" + +#: sequencer.c:341 +msgid "cherry-pick" +msgstr "ๆๅ" + +#: sequencer.c:343 +msgid "rebase" +msgstr "rebase" + +#: sequencer.c:345 +#, c-format +msgid "unknown action: %d" +msgstr "ๆช็ฅๅไฝ๏ผ%d" + +#: sequencer.c:404 +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:407 +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:420 sequencer.c:3028 +#, c-format +msgid "could not lock '%s'" +msgstr "ไธ่ฝ้ๅฎ '%s'" + +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "ไธ่ฝๅฏซๅ ฅ '%s'" + +#: sequencer.c:427 +#, c-format +msgid "could not write eol to '%s'" +msgstr "ไธ่ฝๅฐๆ่ก็ฌฆ่ๅฏซๅ ฅ '%s'" + +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 +#, c-format +msgid "failed to finalize '%s'" +msgstr "็กๆณๅฎๆ '%s'" + +#: sequencer.c:471 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "ๆจ็ๆฌๆฉไฟฎๆนๅฐ่ขซ%s่ฆ่ใ" + +#: sequencer.c:475 +msgid "commit your changes or stash them to proceed." +msgstr "ๆไบคๆจ็ไฟฎๆนๆๅฒ่ๅพๅ็นผ็บใ" + +#: sequencer.c:507 +#, c-format +msgid "%s: fast-forward" +msgstr "%s๏ผๅฟซ่ฝ" + +#: sequencer.c:546 builtin/tag.c:566 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "็กๆ็ๆธ ็ๆจกๅผ %s" + +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. "rebase". +#. +#: sequencer.c:640 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s๏ผ็กๆณๅฏซๅ ฅๆฐ็ดขๅผๆชๆก" + +#: sequencer.c:657 +msgid "unable to update cache tree" +msgstr "ไธ่ฝๆดๆฐๅฟซๅๆจน" + +#: sequencer.c:671 +msgid "could not resolve HEAD commit" +msgstr "ไธ่ฝ่งฃๆ HEAD ๆไบค" + +#: sequencer.c:751 +#, c-format +msgid "no key present in '%.*s'" +msgstr "ๅจ '%.*s' ไธญๆฒๆ key" + +#: sequencer.c:762 +#, c-format +msgid "unable to dequote value of '%s'" +msgstr "็กๆณ็บ '%s' ็ๅผๅปๅผ่" + +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 +#, c-format +msgid "could not open '%s' for reading" +msgstr "็กๆณ้ๅ '%s' ้ฒ่ก่ฎๅ" + +#: sequencer.c:809 +msgid "'GIT_AUTHOR_NAME' already given" +msgstr "ๅทฒ็ถ็ตฆๅบ 'GIT_AUTHOR_NAME'" + +#: sequencer.c:814 +msgid "'GIT_AUTHOR_EMAIL' already given" +msgstr "ๅทฒ็ถ็ตฆๅบ 'GIT_AUTHOR_EMAIL'" + +#: sequencer.c:819 +msgid "'GIT_AUTHOR_DATE' already given" +msgstr "ๅทฒ็ถ็ตฆๅบ 'GIT_AUTHOR_DATE'" + +#: sequencer.c:823 +#, c-format +msgid "unknown variable '%s'" +msgstr "ๆช็ฅ่ฎๆธ '%s'" + +#: sequencer.c:828 +msgid "missing 'GIT_AUTHOR_NAME'" +msgstr "็ผบๅฐ 'GIT_AUTHOR_NAME'" + +#: sequencer.c:830 +msgid "missing 'GIT_AUTHOR_EMAIL'" +msgstr "็ผบๅฐ 'GIT_AUTHOR_EMAIL'" + +#: sequencer.c:832 +msgid "missing 'GIT_AUTHOR_DATE'" +msgstr "็ผบๅฐ 'GIT_AUTHOR_DATE'" + +#: sequencer.c:897 +#, 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:1178 +msgid "'prepare-commit-msg' hook failed" +msgstr "'prepare-commit-msg' ๆ้คๅคฑๆ" + +#: sequencer.c:1184 +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:1197 +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:1239 +msgid "couldn't look up newly created commit" +msgstr "็กๆณๆพๅฐๆฐๅปบ็ซ็ๆไบค" + +#: sequencer.c:1241 +msgid "could not parse newly created commit" +msgstr "ไธ่ฝ่งฃๆๆฐๅปบ็ซ็ๆไบค" + +#: sequencer.c:1287 +msgid "unable to resolve HEAD after creating commit" +msgstr "ๅปบ็ซๆไบคๅพ๏ผไธ่ฝ่งฃๆ HEAD" + +#: sequencer.c:1289 +msgid "detached HEAD" +msgstr "ๅ้ข HEAD" + +# ่ญฏ่ ๏ผไธญๆๅญไธฒๆผๆฅ๏ผๅฏๅช้คๅๅฐ็ฉบๆ ผ +#: sequencer.c:1293 +msgid " (root-commit)" +msgstr " (ๆ นๆไบค)" + +#: sequencer.c:1314 +msgid "could not parse HEAD" +msgstr "ไธ่ฝ่งฃๆ HEAD" + +#: sequencer.c:1316 +#, c-format +msgid "HEAD %s is not a commit!" +msgstr "HEAD %s ไธๆฏไธๅๆไบค๏ผ" + +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 +msgid "could not parse HEAD commit" +msgstr "ไธ่ฝ่งฃๆ HEAD ๆไบค" + +#: sequencer.c:1373 sequencer.c:2067 +msgid "unable to parse commit author" +msgstr "ไธ่ฝ่งฃๆๆไบคไฝ่ " + +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree ็กๆณๅฏซๅ ฅๆจน็็ฉไปถ" + +#: sequencer.c:1417 sequencer.c:1535 +#, c-format +msgid "unable to read commit message from '%s'" +msgstr "ไธ่ฝๅพ '%s' ่ฎๅๆไบค่ชชๆ" + +#: sequencer.c:1446 sequencer.c:1478 +#, c-format +msgid "invalid author identity '%s'" +msgstr "็กๆ็ไฝ่ ่บซๅ '%s'" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "ไฝ่ ่ณ่จๆๅฃ๏ผ็ผบๅฐๆฅๆ่ณ่จ" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 +msgid "failed to write commit object" +msgstr "ๅฏซๆไบค็ฉไปถๅคฑๆ" + +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "ไธ่ฝๆดๆฐ %s" + +#: sequencer.c:1567 +#, c-format +msgid "could not parse commit %s" +msgstr "ไธ่ฝ่งฃๆๆไบค %s" + +#: sequencer.c:1572 +#, c-format +msgid "could not parse parent commit %s" +msgstr "ไธ่ฝ่งฃๆ็ถๆไบค %s" + +#: sequencer.c:1655 sequencer.c:1766 +#, c-format +msgid "unknown command: %d" +msgstr "ๆช็ฅๆไปค๏ผ%d" + +#: sequencer.c:1713 sequencer.c:1738 +#, c-format +msgid "This is a combination of %d commits." +msgstr "้ๆฏไธๅ %d ๅๆไบค็็ตๅใ" + +#: sequencer.c:1723 +msgid "need a HEAD to fixup" +msgstr "้่ฆไธๅ HEAD ไพไฟฎๅพฉ" + +#: sequencer.c:1725 sequencer.c:3338 +msgid "could not read HEAD" +msgstr "ไธ่ฝ่ฎๅ HEAD" + +#: sequencer.c:1727 +msgid "could not read HEAD's commit message" +msgstr "ไธ่ฝ่ฎๅ HEAD ็ๆไบค่ชชๆ" + +#: sequencer.c:1733 +#, c-format +msgid "cannot write '%s'" +msgstr "ไธ่ฝๅฏซ '%s'" + +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 +msgid "This is the 1st commit message:" +msgstr "้ๆฏ็ฌฌไธๅๆไบค่ชชๆ๏ผ" + +#: sequencer.c:1748 +#, c-format +msgid "could not read commit message of %s" +msgstr "ไธ่ฝ่ฎๅ %s ็ๆไบค่ชชๆ" + +#: sequencer.c:1755 +#, c-format +msgid "This is the commit message #%d:" +msgstr "้ๆฏๆไบค่ชชๆ #%d๏ผ" + +#: sequencer.c:1761 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "ๆไบค่ชชๆ #%d ๅฐ่ขซ่ทณ้๏ผ" + +#: sequencer.c:1849 +msgid "your index file is unmerged." +msgstr "ๆจ็็ดขๅผๆชๆกๆชๅฎๆๅไฝตใ" + +#: sequencer.c:1856 +msgid "cannot fixup root commit" +msgstr "ไธ่ฝไฟฎๅพฉๆ นๆไบค" + +#: sequencer.c:1875 +#, c-format +msgid "commit %s is a merge but no -m option was given." +msgstr "ๆไบค %s ๆฏไธๅๅไฝตๆไบคไฝๆชๆไพ -m ้ธ้ ใ" + +#: sequencer.c:1883 sequencer.c:1891 +#, c-format +msgid "commit %s does not have parent %d" +msgstr "ๆไบค %s ๆฒๆ็ฌฌ %d ๅ็ถๆไบค" + +#: sequencer.c:1897 +#, 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:1916 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s๏ผไธ่ฝ่งฃๆ็ถๆไบค %s" + +#: sequencer.c:1981 +#, c-format +msgid "could not rename '%s' to '%s'" +msgstr "ไธ่ฝๅฐ '%s' ้ๆฐๅฝๅ็บ '%s'" + +#: sequencer.c:2038 +#, c-format +msgid "could not revert %s... %s" +msgstr "ไธ่ฝ้ๅ %s... %s" + +#: sequencer.c:2039 +#, c-format +msgid "could not apply %s... %s" +msgstr "ไธ่ฝๆ็จ %s... %s" + +#: sequencer.c:2059 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "ๆๆฃ %s %s -- ไฟฎ่ฃๆช็ๅ งๅฎนๅทฒๅจไธๆธธ\n" + +#: sequencer.c:2117 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s๏ผ็กๆณ่ฎๅ็ดขๅผ" + +#: sequencer.c:2124 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s๏ผ็กๆณ้ๆฐๆด็็ดขๅผ" + +#: sequencer.c:2201 +#, c-format +msgid "%s does not accept arguments: '%s'" +msgstr "%s ไธๆฅๅๅๆธ๏ผ'%s'" + +#: sequencer.c:2210 +#, c-format +msgid "missing arguments for %s" +msgstr "็ผบๅฐ %s ็ๅๆธ" + +#: sequencer.c:2241 +#, c-format +msgid "could not parse '%s'" +msgstr "็กๆณ่งฃๆ '%s'" + +#: sequencer.c:2302 +#, c-format +msgid "invalid line %d: %.*s" +msgstr "็กๆ่ก %d๏ผ%.*s" + +#: sequencer.c:2313 +#, c-format +msgid "cannot '%s' without a previous commit" +msgstr "ๆฒๆ็ถๆไบค็ๆ ๆณไธไธ่ฝ '%s'" + +#: sequencer.c:2399 +msgid "cancelling a cherry picking in progress" +msgstr "ๆญฃๅจๅๆถไธๅ้ฒ่กไธญ็ๆ้ธ" + +#: sequencer.c:2408 +msgid "cancelling a revert in progress" +msgstr "ๆญฃๅจๅๆถไธๅ้ฒ่กไธญ็้ๅ" + +#: sequencer.c:2452 +msgid "please fix this using 'git rebase --edit-todo'." +msgstr "่ซ็จ 'git rebase --edit-todo' ไพไฟฎๆนใ" + +#: sequencer.c:2454 +#, c-format +msgid "unusable instruction sheet: '%s'" +msgstr "ไธๅฏ็จ็ๆไปคๆธ ๅฎ๏ผ'%s'" + +#: sequencer.c:2459 +msgid "no commits parsed." +msgstr "ๆฒๆ่งฃๆๆไบคใ" + +#: sequencer.c:2470 +msgid "cannot cherry-pick during a revert." +msgstr "ไธ่ฝๅจ้ๅๆไบคไธญๅท่กๆ้ธใ" + +#: sequencer.c:2472 +msgid "cannot revert during a cherry-pick." +msgstr "ไธ่ฝๅจๆ้ธไธญๅท่ก้ๅๆไบคใ" + +#: sequencer.c:2550 +#, c-format +msgid "invalid value for %s: %s" +msgstr "%s ็ๅผ็กๆ๏ผ%s" + +#: sequencer.c:2657 +msgid "unusable squash-onto" +msgstr "ไธๅฏ็จ็ squash-onto" + +#: sequencer.c:2677 +#, c-format +msgid "malformed options sheet: '%s'" +msgstr "ๆ ผๅผ้ฏ่ชค็้ธ้ ๆธ ๅฎ๏ผ'%s'" + +#: sequencer.c:2769 sequencer.c:4609 +msgid "empty commit set passed" +msgstr "ๆไพไบ็ฉบ็ๆไบค้" + +#: sequencer.c:2786 +msgid "revert is already in progress" +msgstr "ไธๅ้ๅๅไฝๅทฒๅจ้ฒ่ก" + +#: sequencer.c:2788 +#, c-format +msgid "try \"git revert (--continue | %s--abort | --quit)\"" +msgstr "ๅ่ฉฆ \"git revert (--continue | %s--abort | --quit)\"" + +#: sequencer.c:2791 +msgid "cherry-pick is already in progress" +msgstr "ๆ้ธๅไฝๅทฒๅจ้ฒ่ก" + +#: sequencer.c:2793 +#, c-format +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" +msgstr "ๅ่ฉฆ \"git cherry-pick (--continue | %s--abort | --quit)\"" + +#: sequencer.c:2807 +#, c-format +msgid "could not create sequencer directory '%s'" +msgstr "ไธ่ฝๅปบ็ซๅบๅ็ฎ้ '%s'" + +#: sequencer.c:2822 +msgid "could not lock HEAD" +msgstr "ไธ่ฝ้ๅฎ HEAD" + +#: sequencer.c:2882 sequencer.c:4325 +msgid "no cherry-pick or revert in progress" +msgstr "ๆ้ธๆ้ๅๅไฝไธฆๆช้ฒ่ก" + +#: sequencer.c:2884 sequencer.c:2895 +msgid "cannot resolve HEAD" +msgstr "ไธ่ฝ่งฃๆ HEAD" + +#: sequencer.c:2886 sequencer.c:2930 +msgid "cannot abort from a branch yet to be born" +msgstr "ไธ่ฝๅพๅฐๆชๅปบ็ซ็ๅๆฏ็ตๆญข" + +#: sequencer.c:2916 builtin/grep.c:745 +#, c-format +msgid "cannot open '%s'" +msgstr "ไธ่ฝ้ๅ '%s'" + +#: sequencer.c:2918 +#, c-format +msgid "cannot read '%s': %s" +msgstr "ไธ่ฝ่ฎๅ '%s'๏ผ%s" + +#: sequencer.c:2919 +msgid "unexpected end of file" +msgstr "ๆๅค็ๆชๆก็ตๆ" + +#: sequencer.c:2925 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "ๅฒๅญๆ้ธๆไบคๅ็ HEAD ๆชๆก '%s' ๆๅฃ" + +#: sequencer.c:2936 +msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" +msgstr "ๆจๅฅฝๅ็งปๅไบ HEADใๆช่ฝ้ๅ๏ผๆชขๆฅๆจ็ HEAD๏ผ" + +#: sequencer.c:2977 +msgid "no revert in progress" +msgstr "ๆฒๆๆญฃๅจ้ฒ่ก็้ๅ" + +#: sequencer.c:2986 +msgid "no cherry-pick in progress" +msgstr "ๆฒๆๆญฃๅจ้ฒ่ก็ๆ้ธ" + +#: sequencer.c:2996 +msgid "failed to skip the commit" +msgstr "็กๆณ่ทณ้้ๅๆไบค" + +#: sequencer.c:3003 +msgid "there is nothing to skip" +msgstr "ๆฒๆ่ฆ่ทณ้็" + +#: sequencer.c:3006 +#, c-format +msgid "" +"have you committed already?\n" +"try \"git %s --continue\"" +msgstr "" +"ๆจๅทฒ็ถๆไบคไบๅ๏ผ\n" +"่ฉฆ่ฉฆ \"git %s --continue\"" + +#: sequencer.c:3168 sequencer.c:4217 +msgid "cannot read HEAD" +msgstr "ไธ่ฝ่ฎๅ HEAD" + +#: sequencer.c:3185 +#, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "็กๆณ่ค่ฃฝ '%s' ่ณ '%s'" + +#: sequencer.c:3193 +#, 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:3203 +#, c-format +msgid "Could not apply %s... %.*s" +msgstr "ไธ่ฝๆ็จ %s... %.*s" + +#: sequencer.c:3210 +#, c-format +msgid "Could not merge %.*s" +msgstr "ไธ่ฝๅไฝต %.*s" + +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "ไธ่ฝ่ค่ฃฝ '%s' ่ณ '%s'" + +#: sequencer.c:3240 +#, c-format +msgid "Executing: %s\n" +msgstr "ๅท่ก๏ผ%s\n" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: sequencer.c:3255 +#, 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:3261 +msgid "and made changes to the index and/or the working tree\n" +msgstr "ไธฆไธไฟฎๆน็ดขๅผๅ/ๆๅทฅไฝๅ\n" + +#: sequencer.c:3267 +#, 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:3328 +#, c-format +msgid "illegal label name: '%.*s'" +msgstr "้ๆณ็ๆจ็ฑคๅ็จฑ๏ผ'%.*s'" + +#: sequencer.c:3382 +msgid "writing fake root commit" +msgstr "ๅฏซๅฝๆ นๆไบค" + +#: sequencer.c:3387 +msgid "writing squash-onto" +msgstr "ๅฏซๅ ฅ squash-onto" + +#: sequencer.c:3471 +#, c-format +msgid "could not resolve '%s'" +msgstr "็กๆณ่งฃๆ '%s'" + +#: sequencer.c:3502 +msgid "cannot merge without a current revision" +msgstr "ๆฒๆ็ฎๅ็ๆฌไธ่ฝๅไฝต" + +#: sequencer.c:3524 +#, c-format +msgid "unable to parse '%.*s'" +msgstr "็กๆณ่งฃๆ '%.*s'" + +#: sequencer.c:3533 +#, c-format +msgid "nothing to merge: '%.*s'" +msgstr "็กๅฏ็จๅไฝต๏ผ'%.*s'" + +#: sequencer.c:3545 +msgid "octopus merge cannot be executed on top of a [new root]" +msgstr "็ซ ้ญๅไธฆไธ่ฝๅจไธๅๆฐ็ๆ นๆไบคไธๅท่ก" + +#: sequencer.c:3561 +#, c-format +msgid "could not get commit message of '%s'" +msgstr "ไธ่ฝๅๅพ '%s' ็ๆไบค่ชชๆ" + +#: sequencer.c:3730 +#, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "็่ณไธ่ฝๅ่ฉฆๅไฝต '%.*s'" + +#: sequencer.c:3746 +msgid "merge: Unable to write new index file" +msgstr "ๅไฝต๏ผ็กๆณๅฏซๅ ฅๆฐ็ดขๅผๆชๆก" + +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "็กๆณ autostash" + +#: sequencer.c:3823 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "ๆๅค็ stash ๅๆ๏ผ'%s'" + +#: sequencer.c:3829 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "ไธ่ฝ็บ '%s' ๅปบ็ซ็ฎ้" + +#: sequencer.c:3832 +#, c-format +msgid "Created autostash: %s\n" +msgstr "ๅปบ็ซไบ autostash๏ผ%s\n" + +#: sequencer.c:3836 +msgid "could not reset --hard" +msgstr "็กๆณ reset --hard" + +#: sequencer.c:3861 +#, c-format +msgid "Applied autostash.\n" +msgstr "ๅทฒๆ็จ autostashใ\n" + +#: sequencer.c:3873 +#, c-format +msgid "cannot store %s" +msgstr "ไธ่ฝๅฒๅญ %s" + +#: sequencer.c:3876 +#, c-format +msgid "" +"%s\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" +"%s\n" +"ๆจ็ไฟฎๆนๅฎๅ จๅฐๅฒๅญๅจๅฒ่ๅไธญใ\n" +"ๆจๅฏไปฅๅจไปปไฝๆๅๅท่ก \"git stash pop\" ๆ \"git stash drop\"ใ\n" + +#: sequencer.c:3881 +msgid "Applying autostash resulted in conflicts." +msgstr "ๅ ๅฅ็จ่ชๅๅฒ่่ๅฐ่ด่ก็ชใ" + +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." +msgstr "ๅทฒๆ่ชๅๅฒ่๏ผๅปบ็ซๆฐๅฒ่้ ็ฎใ" + +#: sequencer.c:3974 +#, c-format +msgid "%s: not a valid OID" +msgstr "%s๏ผไธๆฏไธๅๆๆ็็ฉไปถ ID" + +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 +msgid "could not detach HEAD" +msgstr "ไธ่ฝๅ้ข้้ ญๆๆจ" + +#: sequencer.c:3994 +#, c-format +msgid "Stopped at HEAD\n" +msgstr "ๅๆญขๅจ HEAD\n" + +#: sequencer.c:3996 +#, c-format +msgid "Stopped at %s\n" +msgstr "ๅๆญขๅจ %s\n" + +#: sequencer.c:4004 +#, 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:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "ๆญฃๅจ้ๅฎๅบๅบ (%d/%d)%s" + +#: sequencer.c:4095 +#, c-format +msgid "Stopped at %s... %.*s\n" +msgstr "ๅๆญขๅจ %s... %.*s\n" + +#: sequencer.c:4166 +#, c-format +msgid "unknown command %d" +msgstr "ๆช็ฅๆไปค %d" + +#: sequencer.c:4225 +msgid "could not read orig-head" +msgstr "ไธ่ฝ่ฎๅ orig-head" + +#: sequencer.c:4230 +msgid "could not read 'onto'" +msgstr "ไธ่ฝ่ฎๅ 'onto'" + +#: sequencer.c:4244 +#, c-format +msgid "could not update HEAD to %s" +msgstr "ไธ่ฝๆดๆฐ HEAD ็บ %s" + +#: sequencer.c:4304 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "ๆๅ้ๅฎๅบๅบไธฆๆดๆฐ %sใ\n" + +#: sequencer.c:4337 +msgid "cannot rebase: You have unstaged changes." +msgstr "ไธ่ฝ้ๅฎๅบๅบ๏ผๆจๆๆชๆซๅญ็่ฎๆดใ" + +#: sequencer.c:4346 +msgid "cannot amend non-existing commit" +msgstr "ไธ่ฝไฟฎ่ฃไธๅญๅจ็ๆไบค" + +#: sequencer.c:4348 +#, c-format +msgid "invalid file: '%s'" +msgstr "็กๆๆชๆก๏ผ'%s'" + +#: sequencer.c:4350 +#, c-format +msgid "invalid contents: '%s'" +msgstr "็กๆๅ งๅฎน๏ผ'%s'" + +#: sequencer.c:4353 +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:4389 sequencer.c:4428 +#, c-format +msgid "could not write file: '%s'" +msgstr "ไธ่ฝๅฏซๅ ฅๆชๆก๏ผ'%s'" + +#: sequencer.c:4444 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "ไธ่ฝๅช้ค CHERRY_PICK_HEAD" + +#: sequencer.c:4451 +msgid "could not commit staged changes." +msgstr "ไธ่ฝๆไบคๆซๅญ็ไฟฎๆนใ" + +#: sequencer.c:4477 +#, c-format +msgid "invalid committer '%s'" +msgstr "็กๆ็ๆไบค่ '%s'" + +#: sequencer.c:4586 +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "%s๏ผไธ่ฝๆ้ธไธๅ%s" + +#: sequencer.c:4590 +#, c-format +msgid "%s: bad revision" +msgstr "%s๏ผ้ฏ่ชค็็ๆฌ" + +#: sequencer.c:4625 +msgid "can't revert as initial commit" +msgstr "ไธ่ฝไฝ็บๅๅงๆไบค้ๅๆไบค" + +#: sequencer.c:5102 +msgid "make_script: unhandled options" +msgstr "make_script๏ผๆๆช่ฝ่็็้ธ้ " + +#: sequencer.c:5105 +msgid "make_script: error preparing revisions" +msgstr "make_script๏ผๆบๅ็ๆฌๆ้ฏ่ชค" + +#: sequencer.c:5347 sequencer.c:5364 +msgid "nothing to do" +msgstr "็กไบๅฏๅ" + +#: sequencer.c:5383 +msgid "could not skip unnecessary pick commands" +msgstr "็กๆณ่ทณ้ไธๅฟ ่ฆ็ๆ้ธ" + +#: sequencer.c:5480 +msgid "the script was already rearranged." +msgstr "่ ณๆฌๅทฒ็ถ้ๆฐ็ทจๆใ" + +#: setup.c:133 +#, c-format +msgid "'%s' is outside repository at '%s'" +msgstr "'%s' ๅจไฝๆผ '%s' ็็ๆฌๅบซไนๅค" + +#: setup.c:185 +#, 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:198 +#, 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:264 +#, c-format +msgid "option '%s' must come before non-option arguments" +msgstr "้ธ้ '%s' ๅฟ ้ ๅจๅ ถไป้้ธ้ ๅๆธไนๅ" + +#: setup.c:283 +#, 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:419 +msgid "unable to set up work tree using invalid config" +msgstr "็กๆณไฝฟ็จ็กๆ่จญๅฎไพๅปบ็ซๅทฅไฝๅ" + +#: setup.c:423 +msgid "this operation must be run in a work tree" +msgstr "่ฉฒๅไฝๅฟ ้ ๅจไธๅๅทฅไฝๅไธญๅท่ก" + +#: setup.c:661 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "ๆๆ git ็ๆฌๅบซ็ๆฌ <= %d๏ผๅปๅพๅฐ %d" + +#: setup.c:669 +msgid "unknown repository extensions found:" +msgstr "็ผ็พๆช็ฅ็็ๆฌๅบซๆดๅฑ๏ผ" + +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "repo ็็ๆฌๆฏ 0๏ผไฝๆพๅฐๅชๆฏๆด v1 ็ๆดๅ ๅ ไปถ๏ผ" + +#: setup.c:700 +#, c-format +msgid "error opening '%s'" +msgstr "้ๅ '%s' ็ผ็้ฏ่ชค" + +#: setup.c:702 +#, c-format +msgid "too large to be a .git file: '%s'" +msgstr "ๆชๆกๅคชๅคง๏ผ็กๆณไฝ็บ .git ๆชๆก๏ผ'%s'" + +#: setup.c:704 +#, c-format +msgid "error reading %s" +msgstr "่ฎๅ %s ็ผ็้ฏ่ชค" + +#: setup.c:706 +#, c-format +msgid "invalid gitfile format: %s" +msgstr "็กๆ็ gitfile ๆ ผๅผ๏ผ%s" + +#: setup.c:708 +#, c-format +msgid "no path in gitfile: %s" +msgstr "ๅจ gitfile ไธญๆฒๆ่ทฏๅพ๏ผ%s" + +#: setup.c:710 +#, c-format +msgid "not a git repository: %s" +msgstr "ไธๆฏไธๅ git ็ๆฌๅบซ๏ผ%s" + +#: setup.c:812 +#, c-format +msgid "'$%s' too big" +msgstr "'$%s' ๅคชๅคง" + +#: setup.c:826 +#, c-format +msgid "not a git repository: '%s'" +msgstr "ไธๆฏไธๅ git ็ๆฌๅบซ๏ผ'%s'" + +#: setup.c:855 setup.c:857 setup.c:888 +#, c-format +msgid "cannot chdir to '%s'" +msgstr "ไธ่ฝๅๆ็ฎ้ๅฐ '%s'" + +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +msgid "cannot come back to cwd" +msgstr "็กๆณ่ฟๅ็ฎๅๅทฅไฝ็ฎ้" + +#: setup.c:987 +#, c-format +msgid "failed to stat '%*s%s%s'" +msgstr "ๅๅพ '%*s%s%s' ็ๆ ๏ผstat๏ผๅคฑๆ" + +#: setup.c:1225 +msgid "Unable to read current working directory" +msgstr "ไธ่ฝ่ฎๅ็ฎๅๅทฅไฝ็ฎ้" + +#: setup.c:1234 setup.c:1240 +#, c-format +msgid "cannot change to '%s'" +msgstr "ไธ่ฝๅๆๅฐ '%s'" + +#: setup.c:1245 +#, c-format +msgid "not a git repository (or any of the parent directories): %s" +msgstr "ไธๆฏไธๅ git ็ๆฌๅบซ๏ผๆ่ ไปปไฝ็ถ็ฎ้๏ผ๏ผ%s" + +#: setup.c:1251 +#, 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:1362 +#, 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:1409 +msgid "open /dev/null or dup failed" +msgstr "ไธ่ฝ้ๅๆ่ ่ค่ฃฝ /dev/null" + +#: setup.c:1424 +msgid "fork failed" +msgstr "fork ๅคฑๆ" + +#: setup.c:1429 +msgid "setsid failed" +msgstr "setsid ๅคฑๆ" + +#: sha1-file.c:470 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "็ฉไปถ็ฎ้ %s ไธๅญๅจ๏ผๆชขๆฅ .git/objects/info/alternates" + +#: sha1-file.c:521 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "็กๆณ่ฆ็ฏๅๅ็จ็ฉไปถ่ทฏๅพ๏ผ%s" + +#: sha1-file.c:593 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "%s๏ผๅฟฝ็ฅๅ็จ็ฉไปถๅบซ๏ผๅตๅฅๅคชๆทฑ" + +#: sha1-file.c:600 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "็กๆณ่ฆ็ฏๅ็ฉไปถ็ฎ้: %s" + +#: sha1-file.c:643 +msgid "unable to fdopen alternates lockfile" +msgstr "็กๆณ fdopen ๅไปฃ้ๆชๆก" + +#: sha1-file.c:661 +msgid "unable to read alternates file" +msgstr "็กๆณ่ฎๅๆฟไปฃๆชๆก" + +#: sha1-file.c:668 +msgid "unable to move new alternates file into place" +msgstr "็กๆณๅฐๆฐ็ๆฟไปฃๆชๆก็งปๅๅฐไฝ" + +#: sha1-file.c:703 +#, c-format +msgid "path '%s' does not exist" +msgstr "่ทฏๅพ '%s' ไธๅญๅจ" + +#: sha1-file.c:724 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "ๅฐไธๆฏๆดๅฐๅ่็ๆฌๅบซ '%s' ไฝ็บไธๅ้ฃ็ตๆชขๅบใ" + +#: sha1-file.c:730 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "ๅ่็ๆฌๅบซ '%s' ไธๆฏไธๅๆฌๆฉ็ๆฌๅบซใ" + +#: sha1-file.c:736 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "ๅ่็ๆฌๅบซ '%s' ๆฏไธๅๆทบ่ค่ฃฝ" + +#: sha1-file.c:744 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "ๅ่็ๆฌๅบซ '%s' ๅทฒ่ขซ็งปๆค" + +#: sha1-file.c:804 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "่งฃๆๅ็จๅผ็จๆ็กๆ็่ก๏ผ%s" + +#: sha1-file.c:954 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "ๅ่ฉฆ mmap %<PRIuMAX>๏ผ่ถ ้ไบๆๅคงๅผ %<PRIuMAX>" + +#: sha1-file.c:975 +msgid "mmap failed" +msgstr "mmap ๅคฑๆ" + +#: sha1-file.c:1139 +#, c-format +msgid "object file %s is empty" +msgstr "็ฉไปถๆชๆก %s ็บ็ฉบ" + +#: sha1-file.c:1274 sha1-file.c:2467 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "ๆๅฃ็้ฌๆฃ็ฉไปถ '%s'" + +#: sha1-file.c:1276 sha1-file.c:2471 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "้ฌๆฃ็ฉไปถ '%s' ๅพ้ขๆๅๅพ่ณๆ" + +#: sha1-file.c:1318 +msgid "invalid object type" +msgstr "็กๆ็็ฉไปถ้กๅ" + +#: sha1-file.c:1402 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "็กๆณ็จ --allow-unknown-type ๅๆธ่งฃ้ %s ๆจ้ ญ่จๆฏ" + +#: sha1-file.c:1405 +#, c-format +msgid "unable to unpack %s header" +msgstr "็กๆณ่งฃ้ %s ้ ญ้จ" + +#: sha1-file.c:1411 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "็กๆณ็จ --allow-unknown-type ๅๆธ่งฃๆ %s ๆจ้ ญ่จๆฏ" + +#: sha1-file.c:1414 +#, c-format +msgid "unable to parse %s header" +msgstr "็กๆณ่งฃๆ %s ้ ญ้จ" + +#: sha1-file.c:1641 +#, c-format +msgid "failed to read object %s" +msgstr "่ฎๅ็ฉไปถ %s ๅคฑๆ" + +#: sha1-file.c:1645 +#, c-format +msgid "replacement %s not found for %s" +msgstr "ๆพไธๅฐ %2$s ็ๆฟไปฃ %1$s" + +#: sha1-file.c:1649 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "้ฌๆฃ็ฉไปถ %s๏ผๅฒๅญๅจ %s๏ผๅทฒๆๅฃ" + +#: sha1-file.c:1653 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "ๆๅ ็ฉไปถ %s๏ผๅฒๅญๅจ %s๏ผๅทฒๆๅฃ" + +#: sha1-file.c:1758 +#, c-format +msgid "unable to write file %s" +msgstr "็กๆณๅฏซๆชๆก %s" + +#: sha1-file.c:1765 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "็กๆณ็บ '%s' ่จญๅฎๆฌ้" + +#: sha1-file.c:1772 +msgid "file write error" +msgstr "ๆชๆกๅฏซ้ฏ่ชค" + +#: sha1-file.c:1792 +msgid "error when closing loose object file" +msgstr "้้้ฌๆฃ็ฉไปถๆชๆกๆ็ผ็้ฏ่ชค" + +#: sha1-file.c:1857 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "ๆฌ้ไธ่ถณ๏ผ็กๆณๅจ็ๆฌๅบซ็ฉไปถๅบซ %s ไธญๆฐๅข็ฉไปถ" + +#: sha1-file.c:1859 +msgid "unable to create temporary file" +msgstr "็กๆณๅปบ็ซๆซๅญๆช" + +#: sha1-file.c:1883 +msgid "unable to write loose object file" +msgstr "ไธ่ฝๅฏซ้ฌๆฃ็ฉไปถๆชๆก" + +#: sha1-file.c:1889 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "ไธ่ฝๅฃ็ธฎๆฐ็ฉไปถ %s๏ผ%d๏ผ" + +#: sha1-file.c:1893 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "ๅจ็ฉไปถ %s ไธๅผๅซ deflateEnd ๅคฑๆ๏ผ%d๏ผ" + +#: sha1-file.c:1897 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "่ขซ %s ็ไธ็ฉฉๅฎ็ฉไปถๆบ่ณๆๆ็ณๅกไบ" + +#: sha1-file.c:1907 builtin/pack-objects.c:1086 +#, c-format +msgid "failed utime() on %s" +msgstr "ๅจ %s ไธๅผๅซ utime() ๅคฑๆ" + +#: sha1-file.c:1984 +#, c-format +msgid "cannot read object for %s" +msgstr "ไธ่ฝ่ฎๅ็ฉไปถ %s" + +#: sha1-file.c:2035 +msgid "corrupt commit" +msgstr "ๆๅฃ็ๆไบค" + +#: sha1-file.c:2043 +msgid "corrupt tag" +msgstr "ๆๅฃ็ๆจ็ฑค" + +#: sha1-file.c:2143 +#, c-format +msgid "read error while indexing %s" +msgstr "็ดขๅผ %s ๆ่ฎๅ้ฏ่ชค" + +#: sha1-file.c:2146 +#, c-format +msgid "short read while indexing %s" +msgstr "็ดขๅผ %s ๆ่ฎๅ ฅไธๅฎๆด" + +#: sha1-file.c:2219 sha1-file.c:2229 +#, c-format +msgid "%s: failed to insert into database" +msgstr "%s๏ผๆๅ ฅ่ณๆๅบซๅคฑๆ" + +#: sha1-file.c:2235 +#, c-format +msgid "%s: unsupported file type" +msgstr "%s๏ผไธๆฏๆด็ๆชๆก้กๅ" + +#: sha1-file.c:2259 +#, c-format +msgid "%s is not a valid object" +msgstr "%s ไธๆฏไธๅๆๆ็็ฉไปถ" + +#: sha1-file.c:2261 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s ไธๆฏไธๅๆๆ็ '%s' ็ฉไปถ" + +#: sha1-file.c:2288 builtin/index-pack.c:192 +#, c-format +msgid "unable to open %s" +msgstr "ไธ่ฝ้ๅ %s" + +#: sha1-file.c:2478 sha1-file.c:2531 +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "%s ็้ๆนๅผไธ็ฌฆๅ๏ผ้ ๆ %s๏ผ" + +#: sha1-file.c:2502 +#, c-format +msgid "unable to mmap %s" +msgstr "ไธ่ฝ mmap %s" + +#: sha1-file.c:2507 +#, c-format +msgid "unable to unpack header of %s" +msgstr "็กๆณ่งฃๅฃ็ธฎ %s ็้ ญ้จ" + +#: sha1-file.c:2513 +#, c-format +msgid "unable to parse header of %s" +msgstr "็กๆณ่งฃๆ %s ็้ ญ้จ" + +#: sha1-file.c:2524 +#, 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 ๅๅๅ ญ้ฒไฝๅญๅ ็ตๅฐพ็ๅผ็จ๏ผ\n" +"ๅ ็บ็ถๆจๅชๆไพ 40 ๅๅๅ ญ้ฒไฝๅญๅ ๆ๏ผๅ ถๅฐ่ขซๅฟฝ็ฅใ\n" +"้ไบๅผ็จๅฏ่ฝ่ขซๆๅคๅปบ็ซใไพๅฆ๏ผ\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"็ถใ$brใๅ ็บๆไบๅๅ ็ฉบ็ฝๆ๏ผๆๅปบ็ซๅบ 40 ไฝๅๅ ญ้ฒไฝ็ๅผ็จใ\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:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "็ฃ็ขไธๅญๅจ '%s' ่ทฏๅพ๏ผไฝไธๅญๅจๆผ '%.*s'" + +#: sha1-name.c:1708 +#, 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:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "'%s' ่ทฏๅพไธๅญๅจๆผ '%.*s'" + +#: sha1-name.c:1745 +#, 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:1761 +#, 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:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "็ฃ็ขไธๅญๅจ '%s' ่ทฏๅพ๏ผไฝไธๅจ็ดขๅผไธญ" + +#: sha1-name.c:1771 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "'%s' ่ทฏๅพไธๅญๅจ (ๆขไธๅญๅจ็ฃ็ข๏ผไนไธๅญๅจ็ดขๅผ)" + +#: sha1-name.c:1784 +msgid "relative path syntax can't be used outside working tree" +msgstr "็ธๅฐ่ทฏๅพ่ๆณไธ่ฝ็จๅจๅทฅไฝๅๅค" + +#: sha1-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "'%.*s' ็ฉไปถๅ็จฑ็กๆใ" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte +#: strbuf.c:848 +#, c-format +msgid "%u.%2.2u GiB" +msgstr "%u.%2.2u GiB" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second +#: strbuf.c:850 +#, c-format +msgid "%u.%2.2u GiB/s" +msgstr "%u.%2.2u GiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte +#: strbuf.c:858 +#, c-format +msgid "%u.%2.2u MiB" +msgstr "%u.%2.2u MiB" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second +#: strbuf.c:860 +#, c-format +msgid "%u.%2.2u MiB/s" +msgstr "%u.%2.2u MiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte +#: strbuf.c:867 +#, c-format +msgid "%u.%2.2u KiB" +msgstr "%u.%2.2u KiB" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second +#: strbuf.c:869 +#, c-format +msgid "%u.%2.2u KiB/s" +msgstr "%u.%2.2u KiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 byte +#: strbuf.c:875 +#, c-format +msgid "%u byte" +msgid_plural "%u bytes" +msgstr[0] "%u ไฝๅ ็ต" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second +#: strbuf.c:877 +#, c-format +msgid "%u byte/s" +msgid_plural "%u bytes/s" +msgstr[0] "%u ไฝๅ ็ต/็ง" + +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" +msgstr "็กๆณ้ๅ '%s' ้ฒ่กๅฏซๅ ฅ" + +#: strbuf.c:1175 +#, c-format +msgid "could not edit '%s'" +msgstr "็กๆณ็ทจ่ผฏ '%s'" + +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "ๅฟฝ็ฅๅฏ็็ๅญๆจก็ตๅ็จฑ๏ผ%s" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "submodule.fetchjobs ไธๅ ่จฑ็บ่ฒ ๅผ" + +#: submodule-config.c:402 +#, c-format +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgstr "ๅฟฝ็ฅๅฏ่ฝ่ขซ่งฃๆ็บๆไปคๅ้ธ้ ็ '%s'๏ผ%s" + +#: submodule-config.c:499 +#, c-format +msgid "invalid value for %s" +msgstr "%s ็ๅผ็กๆ" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "ไธ่ฝๆดๆฐ .gitmodules ๆข็ฎ %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:816 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "%s ๆไบคไฝๆผ่ทฏๅพ๏ผ'%s' ็ๅญๆจก็ต่ๅๅ็ๅญๆจก็ต่ก็ชใ่ทณ้ใ" + +#: submodule.c:919 +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "ๅญๆจก็ตๆข็ฎ '%s'๏ผ%s๏ผๆฏไธๅ %s๏ผไธๆฏไธๅๆไบค" + +#: submodule.c:1004 +#, 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:1127 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "่็ '%s' ๅญๆจก็ตๅคฑๆ" + +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "็กๆณๅฐ HEAD ่งฃๆ็บๆๆๅผ็จใ" + +#: submodule.c:1167 +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "ๆญฃๅจๆจ้ '%s' ๅญๆจก็ต\n" + +#: submodule.c:1170 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "็กๆณๆจ้ '%s' ๅญๆจก็ต\n" + +#: submodule.c:1462 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "ๆญฃๅจๆๅ %s%s ๅญๆจก็ต\n" + +#: submodule.c:1492 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "็กๆณๅญๅๅญๆจก็ต '%s'\n" + +#: submodule.c:1646 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"ๆๅๅญๆจก็ตๆ็ผ็้ฏ่ชค๏ผ\n" +"%s" + +#: submodule.c:1671 +#, c-format +msgid "'%s' not recognized as a git repository" +msgstr "็กๆณๅฐ '%s' ่ญๅฅ็บไธๅ git ็ๆฌๅบซ" + +#: submodule.c:1688 +#, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "็กๆณๅจ %s ๅญๆจก็ตๅท่ก 'git status --porcelain=2'" + +#: submodule.c:1729 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "%s ๅญๆจก็ตๅท่ก 'git status --porcelain=2' ๅคฑๆ" + +#: submodule.c:1804 +#, c-format +msgid "could not start 'git status' in submodule '%s'" +msgstr "็กๆณๅจๅญๆจก็ต '%s' ไธญๅๅ 'git status'" + +#: submodule.c:1817 +#, c-format +msgid "could not run 'git status' in submodule '%s'" +msgstr "็กๆณๅจๅญๆจก็ต '%s' ไธญๅท่ก 'git status'" + +#: submodule.c:1832 +#, c-format +msgid "Could not unset core.worktree setting in submodule '%s'" +msgstr "็กๆณๅจๅญๆจก็ต '%s' ไธญๅๆถ core.worktree ็่จญๅฎ" + +#: submodule.c:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "็กๆณ้่ฟดๅญๆจก็ต่ทฏๅพ '%s'" + +#: submodule.c:1880 +msgid "could not reset submodule index" +msgstr "็กๆณ้่จญๅญๆจก็ต็็ดขๅผ" + +#: submodule.c:1922 +#, c-format +msgid "submodule '%s' has dirty index" +msgstr "ๅญๆจก็ต '%s' ไธญๆ้ซ็ดขๅผ" + +#: submodule.c:1974 +#, c-format +msgid "Submodule '%s' could not be updated." +msgstr "ๅญๆจก็ต '%s' ็กๆณ่ขซๆดๆฐใ" + +#: submodule.c:2042 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "ใ%sใๅญๆจก็ต git ็ฎ้ๅจใ%.*sใgit ่ทฏๅพไธญ" + +#: submodule.c:2063 +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "ไธๆฏๆดๅฐๆๅคๅๅทฅไฝๅ็ๅญๆจก็ต '%s' ๅท่ก relocate_gitdir" + +#: submodule.c:2075 submodule.c:2134 +#, c-format +msgid "could not lookup name for submodule '%s'" +msgstr "ไธ่ฝๆฅ่ฉขๅญๆจก็ต '%s' ็ๅ็จฑ" + +#: submodule.c:2079 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "ๆ็ต็งปๅใ%sใ่ณ็พๅญ git ็ฎ้" + +#: submodule.c:2086 +#, 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:2214 +msgid "could not start ls-files in .." +msgstr "็กๆณๅจ .. ไธญๅๅ ls-files" + +#: submodule.c:2254 +#, c-format +msgid "ls-tree returned unexpected return code %d" +msgstr "ls-tree ่ฟๅๆช็ฅ่ฟๅๅผ %d" + +#: trailer.c:236 +#, c-format +msgid "running trailer command '%s' failed" +msgstr "ๅท่ก trailer ๆไปค '%s' ๅคฑๆ" + +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "้ต '%2$s' ็ๆช็ฅๅๅผ '%1$s'" + +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 +#, c-format +msgid "more than one %s" +msgstr "ๅคๆผไธๅ %s" + +#: trailer.c:728 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "็ฐฝๅ '%.*s' ็้ต็บ็ฉบ" + +#: trailer.c:748 +#, c-format +msgid "could not read input file '%s'" +msgstr "ไธ่ฝ่ฎๅ่ผธๅ ฅๆชๆก '%s'" + +#: trailer.c:751 +msgid "could not read from stdin" +msgstr "ไธ่ฝ่ชๆจๆบ่ผธๅ ฅ่ฎๅ" + +#: trailer.c:1009 wrapper.c:676 +#, c-format +msgid "could not stat %s" +msgstr "ไธ่ฝๅฐ %s ๅผๅซ stat" + +#: trailer.c:1011 +#, c-format +msgid "file %s is not a regular file" +msgstr "ๆชๆก %s ไธๆฏไธๅๆญฃ่ฆๆชๆก" + +#: trailer.c:1013 +#, c-format +msgid "file %s is not writable by user" +msgstr "ๆชๆก %s ไฝฟ็จ่ ไธๅฏๅฏซ" + +#: trailer.c:1025 +msgid "could not open temporary file" +msgstr "ไธ่ฝ้ๅๆซๅญๆช" + +#: trailer.c:1065 +#, c-format +msgid "could not rename temporary file to %s" +msgstr "ไธ่ฝ้ๆฐๅฝๅๆซๅญๆช็บ %s" + +#: transport-helper.c:62 transport-helper.c:91 +msgid "full write to remote helper failed" +msgstr "ๅฎๆดๅฏซๅ ฅ้ ็ซฏๅๅฉๅทฅๅ ทๅคฑๆ" + +#: transport-helper.c:145 +#, c-format +msgid "unable to find remote helper for '%s'" +msgstr "็กๆณ็บ '%s' ๆพๅฐ้ ็ซฏๅๅฉๅทฅๅ ท" + +#: transport-helper.c:161 transport-helper.c:575 +msgid "can't dup helper output fd" +msgstr "็กๆณ่ค่ฃฝๅๅฉๅทฅๅ ท่ผธๅบๆชๆกๅฅๆ" + +#: transport-helper.c:214 +#, c-format +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "ๆช็ฅ็ๅผทๅถ่ฝๅ %s๏ผ่ฉฒ้ ็ซฏๅๅฉๅทฅๅ ทๅฏ่ฝ้่ฆๆฐ็ๆฌ็Git" + +#: transport-helper.c:220 +msgid "this remote helper should implement refspec capability" +msgstr "้ ็ซฏๅๅฉๅทฅๅ ท้่ฆๅฏฆ็พ refspec ่ฝๅ" + +#: transport-helper.c:287 transport-helper.c:429 +#, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "%s ๆๅคๅฐ่ชช๏ผ'%s'" + +#: transport-helper.c:417 +#, c-format +msgid "%s also locked %s" +msgstr "%s ไน้ๅฎไบ %s" + +#: transport-helper.c:497 +msgid "couldn't run fast-import" +msgstr "ไธ่ฝๅท่ก fast-import" + +#: transport-helper.c:520 +msgid "error while running fast-import" +msgstr "ๅท่ก fast-import ็ผ็้ฏ่ชค" + +#: transport-helper.c:549 transport-helper.c:1226 +#, c-format +msgid "could not read ref %s" +msgstr "็กๆณ่ฎๅๅผ็จ %s" + +#: transport-helper.c:594 +#, c-format +msgid "unknown response to connect: %s" +msgstr "้ฃ็ทๆๆช็ฅ็ๅๆ๏ผ%s" + +#: transport-helper.c:616 +msgid "setting remote service path not supported by protocol" +msgstr "ๅๅฎไธๆฏๆด่จญๅฎ้ ็ซฏๆๅ่ทฏๅพ" + +#: transport-helper.c:618 +msgid "invalid remote service path" +msgstr "็กๆ็้ ็ซฏๆๅ่ทฏๅพ" + +#: transport-helper.c:661 transport.c:1428 +msgid "operation not supported by protocol" +msgstr "ๅๅฎไธๆฏๆด่ฉฒๅไฝ" + +#: transport-helper.c:664 +#, c-format +msgid "can't connect to subservice %s" +msgstr "ไธ่ฝ้ฃ็ทๅฐๅญๆๅ %s" + +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "'option' ็ผบๅฐๅฐๆ็ 'ok/error' ๆไปค" + +#: transport-helper.c:788 +#, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "้ ๆ ok/error๏ผๅๅฉๅทฅๅ ท่ชช '%s'" + +#: transport-helper.c:841 +#, c-format +msgid "helper reported unexpected status of %s" +msgstr "ๅๅฉๅทฅๅ ทๅ ฑๅ %s ็ๆๅค็ๆ " + +#: transport-helper.c:924 +#, c-format +msgid "helper %s does not support dry-run" +msgstr "ๅๅฉๅทฅๅ ท %s ไธๆฏๆด dry-run" + +#: transport-helper.c:927 +#, c-format +msgid "helper %s does not support --signed" +msgstr "ๅๅฉๅทฅๅ ท %s ไธๆฏๆด --signed" + +#: transport-helper.c:930 +#, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "ๅๅฉๅทฅๅ ท %s ไธๆฏๆด --signed=if-asked" + +#: transport-helper.c:935 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "ๅๅฉๅทฅๅ ท %s ไธๆฏๆด --atomic" + +#: transport-helper.c:941 +#, c-format +msgid "helper %s does not support 'push-option'" +msgstr "ๅๅฉๅทฅๅ ท %s ไธๆฏๆด 'push-option'" + +#: transport-helper.c:1040 +msgid "remote-helper doesn't support push; refspec needed" +msgstr "remote-heper ไธๆฏๆด push๏ผ้่ฆๅผ็จ่กจ้ๅผ" + +#: transport-helper.c:1045 +#, c-format +msgid "helper %s does not support 'force'" +msgstr "ๅๅฉๅทฅๅ ท %s ไธๆฏๆด 'force'" + +#: transport-helper.c:1092 +msgid "couldn't run fast-export" +msgstr "็กๆณๅท่ก fast-export" + +#: transport-helper.c:1097 +msgid "error while running fast-export" +msgstr "ๅท่ก fast-export ๆ็ผ็้ฏ่ชค" + +#: transport-helper.c:1122 +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch.\n" +msgstr "" +"ๆฒๆๅ ฑๅ็ๅผ็จไธฆไธไนๆฒๆๆๅฎ๏ผไป้บผไนไธๆๅใ\n" +"ๆจๆ่จฑๅพๆๅฎไธๅๅๆฏใ\n" + +#: transport-helper.c:1203 +#, c-format +msgid "unsupported object format '%s'" +msgstr "ไธๆฏๆด็็ฉไปถๆ ผๅผใ%sใ" + +#: transport-helper.c:1212 +#, c-format +msgid "malformed response in ref list: %s" +msgstr "ๅผ็จๅ่กจไธญๆ ผๅผ้ฏ่ชค็ๅๆ๏ผ%s" + +#: transport-helper.c:1364 +#, c-format +msgid "read(%s) failed" +msgstr "่ฎๅ๏ผ%s๏ผๅคฑๆ" + +#: transport-helper.c:1391 +#, c-format +msgid "write(%s) failed" +msgstr "ๅฏซ๏ผ%s๏ผๅคฑๆ" + +#: transport-helper.c:1440 +#, c-format +msgid "%s thread failed" +msgstr "%s ๅท่ก็ทๅคฑๆ" + +#: transport-helper.c:1444 +#, c-format +msgid "%s thread failed to join: %s" +msgstr "%s ๅท่ก็ท็ญๅพ ๅคฑๆ๏ผ%s" + +#: transport-helper.c:1463 transport-helper.c:1467 +#, c-format +msgid "can't start thread for copying data: %s" +msgstr "ไธ่ฝๅๅๅท่ก็ทไพ่ค่ฃฝ่ณๆ๏ผ%s" + +#: transport-helper.c:1504 +#, c-format +msgid "%s process failed to wait" +msgstr "%s ้ฒ็จ็ญๅพ ๅคฑๆ" + +#: transport-helper.c:1508 +#, c-format +msgid "%s process failed" +msgstr "%s ้ฒ็จๅคฑๆ" + +#: transport-helper.c:1526 transport-helper.c:1535 +msgid "can't start thread for copying data" +msgstr "ไธ่ฝๅๅๅท่ก็ทไพ่ค่ฃฝ่ณๆ" + +#: 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:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "ๅณ่ผธ๏ผ็กๆ็ๆทฑๅบฆ้ธ้ '%s'" + +#: transport.c:269 +msgid "see protocol.version in 'git help config' for more details" +msgstr "ๆชข่ฆ 'git help config' ไธญ็ protocol.version ๅๅพๆดๅค่จๆฏ" + +#: transport.c:270 +msgid "server options require protocol version 2 or later" +msgstr "ๆๅ็ซฏ้ธ้ ้่ฆ็ๆฌ 2 ๅๅฎๆๆด้ซ" + +#: transport.c:712 +msgid "could not parse transport.color.* config" +msgstr "ไธ่ฝ่งฃๆ transport.color.* ่จญๅฎ" + +#: transport.c:785 +msgid "support for protocol v2 not implemented yet" +msgstr "ๅๅฎ v2 ็ๆฏๆดๅฐๆชๅฏฆ็พ" + +#: transport.c:919 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "่จญๅฎ '%s' ็ๅๅผๆช็ฅ๏ผ%s" + +#: transport.c:985 +#, c-format +msgid "transport '%s' not allowed" +msgstr "ๅณ่ผธ '%s' ไธๅ ่จฑ" + +#: transport.c:1038 +msgid "git-over-rsync is no longer supported" +msgstr "ไธๅๆฏๆด git-over-rsync" + +#: transport.c:1140 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "ไธๅๅญๆจก็ต่ทฏๅพๆๅ ๅซ็ไฟฎๆนๅจไปปไฝ้ ็ซฏๆบไธญ้ฝๆพไธๅฐ๏ผ\n" + +#: transport.c:1144 +#, 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:1152 +msgid "Aborting." +msgstr "ๆญฃๅจ็ตๆญขใ" + +#: transport.c:1297 +msgid "failed to push all needed submodules" +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:113 +#, 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:115 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"ๆจๅฐไธๅๆชๆก็ๆฌๆฉไฟฎๆนๅฐ่ขซๆชขๅบๅไฝ่ฆ่๏ผ\n" +"%%s" + +#: unpack-trees.c:118 +#, 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:120 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"ๆจๅฐไธๅๆชๆก็ๆฌๆฉไฟฎๆนๅฐ่ขซๅไฝตๅไฝ่ฆ่๏ผ\n" +"%%s" + +#: unpack-trees.c:123 +#, 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:125 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"ๆจๅฐไธๅๆชๆก็ๆฌๆฉไฟฎๆนๅฐ่ขซ %s ่ฆ่๏ผ\n" +"%%s" + +#: unpack-trees.c:130 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in them:\n" +"%s" +msgstr "" +"ๆดๆฐๅฆไธ็ฎ้ๅฐๆ้บๅคฑๅ ถไธญๆช่ฟฝ่นค็ๆชๆก๏ผ\n" +"%s" + +#: unpack-trees.c:134 +#, 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:136 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"ๅทฅไฝๅไธญไธๅๆช่ฟฝ่นค็ๆชๆกๅฐๆๅ ็บๆชขๅบๅไฝ่่ขซๅช้ค๏ผ\n" +"%%s" + +#: unpack-trees.c:139 +#, 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:141 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"ๅทฅไฝๅไธญไธๅๆช่ฟฝ่นค็ๆชๆกๅฐๆๅ ็บๅไฝตๅไฝ่่ขซๅช้ค๏ผ\n" +"%%s" + +#: unpack-trees.c:144 +#, 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:146 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"ๅทฅไฝๅไธญไธๅๆช่ฟฝ่นค็ๆชๆกๅฐๆๅ ็บ %s ๅไฝ่่ขซๅช้ค๏ผ\n" +"%%s" + +#: unpack-trees.c:152 +#, 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:154 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"ๅทฅไฝๅไธญไธๅๆช่ฟฝ่นค็ๆชๆกๅฐๆๅ ็บๆชขๅบๅไฝ่่ขซ่ฆ่๏ผ\n" +"%%s" + +#: unpack-trees.c:157 +#, 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:159 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"ๅทฅไฝๅไธญไธๅๆช่ฟฝ่นค็ๆชๆกๅฐๆๅ ็บๅไฝตๅไฝ่่ขซ่ฆ่๏ผ\n" +"%%s" + +#: unpack-trees.c:162 +#, 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:164 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"ๅทฅไฝๅไธญไธๅๆช่ฟฝ่นค็ๆชๆกๅฐๆๅ ็บ %s ๅไฝ่่ขซ่ฆ่๏ผ\n" +"%%s" + +#: unpack-trees.c:172 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "ๆข็ฎ '%s' ๅ '%s' ้็ใ็กๆณๅไฝตใ" + +#: unpack-trees.c:175 +#, c-format +msgid "" +"Cannot update submodule:\n" +"%s" +msgstr "" +"็กๆณๆดๆฐๅญๆจก็ต๏ผ\n" +"%s" + +#: unpack-trees.c:178 +#, c-format +msgid "" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" +"%s" +msgstr "" +"ๅณไฝฟๆ็จ็ๆชขๅบๆจฃๆฟ๏ผไปฅไธ่ทฏๅพไธๆฏๆๆฐไธไฟ็ไธไพ๏ผ\n" +"%s" + +#: unpack-trees.c:180 +#, c-format +msgid "" +"The following paths are unmerged and were left despite sparse patterns:\n" +"%s" +msgstr "" +"ๅณไฝฟๆ็จ็ๆชขๅบๆจฃๆฟ๏ผไปฅไธ่ทฏๅพๆชๅไฝตไธไฟ็ไธไพ๏ผ\n" +"%s" + +#: unpack-trees.c:182 +#, c-format +msgid "" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" +"%s" +msgstr "" +"ๅณไฝฟๆ็จ็ๆชขๅบๆจฃๆฟ๏ผไปฅไธ่ทฏๅพๅทฒ็ถๅญๅจ่ๅ ๆญคๆชๆดๆฐ๏ผ\n" +"%s" + +#: unpack-trees.c:262 +#, c-format +msgid "Aborting\n" +msgstr "ๆญฃๅจ็ตๆญข\n" + +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "ไฟฎๆญฃไปฅไธ่ทฏๅพๅพ๏ผๆจๅฏ่ฝๆณ่ฆๅท่กใgit sparse-checkout reapplyใใ\n" + +#: unpack-trees.c:350 +msgid "Updating files" +msgstr "ๆญฃๅจๆดๆฐๆชๆก" + +#: unpack-trees.c:382 +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:1498 +msgid "Updating index flags" +msgstr "ๆญฃๅจๆดๆฐ็ดขๅผๆๆจ" + +#: upload-pack.c:1516 +msgid "expected flush after fetch arguments" +msgstr "ๅจ fetch ๅผๆธๆ็บไธๅ flush ๅ " + +#: 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:236 builtin/am.c:2116 +#, c-format +msgid "failed to read '%s'" +msgstr "่ฎๅ '%s' ๅคฑๆ" + +#: worktree.c:283 +#, c-format +msgid "'%s' at main working tree is not the repository directory" +msgstr "ๅจไธปๅทฅไฝๅ็ '%s' ไธๆฏ็ๆฌๅบซ็ฎ้" + +#: worktree.c:294 +#, c-format +msgid "'%s' file does not contain absolute path to the working tree location" +msgstr "ๆชๆก '%s' ไธๅ ๅซๅทฅไฝๅ็็ตๅฐ่ทฏๅพ" + +#: worktree.c:306 +#, c-format +msgid "'%s' does not exist" +msgstr "'%s' ไธๅญๅจ" + +#: worktree.c:312 +#, c-format +msgid "'%s' is not a .git file, error code %d" +msgstr "'%s' ไธๆฏไธๅ .git ๆชๆก๏ผ้ฏ่ชค็ขผ %d" + +#: worktree.c:321 +#, c-format +msgid "'%s' does not point back to '%s'" +msgstr "'%s' ๆฒๆๆๅๅฐ '%s'" + +#: worktree.c:587 +msgid "not a directory" +msgstr "ไธๆฏ็ฎ้" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr ".git ไธๆฏๆชๆก" + +#: worktree.c:598 +msgid ".git file broken" +msgstr ".git ๆชๆกๆๆฏ" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr ".git ๆชๆกไธๆญฃ็ขบ" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "้ๆๆ่ทฏๅพ" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "็กๆณๅฎไฝ็ๆฌๅบซ๏ผ.git ไธๆฏๆชๆก" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "็กๆณๅฎไฝ็ๆฌๅบซ๏ผ.git ๆชๆกๆๅฃ" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "็กๆณ่ฎๅ gitdir" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "ไธๆญฃ็ขบ็ gitdir" + +#: wrapper.c:197 wrapper.c:367 +#, c-format +msgid "could not open '%s' for reading and writing" +msgstr "็กๆณ้ๅ '%s' ้ฒ่ก่ฎๅฏซ" + +#: wrapper.c:398 wrapper.c:599 +#, c-format +msgid "unable to access '%s'" +msgstr "ไธ่ฝๅญๅ '%s'" + +#: wrapper.c:607 +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:1070 +msgid "Changes to be committed:" +msgstr "่ฆๆไบค็่ฎๆด๏ผ" + +#: wt-status.c:234 wt-status.c:1079 +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:266 +msgid "both deleted:" +msgstr "้ๆนๅช้ค๏ผ" + +#: wt-status.c:268 +msgid "added by us:" +msgstr "็ฑๆๅๆฐๅข๏ผ" + +#: wt-status.c:270 +msgid "deleted by them:" +msgstr "็ฑไปๅๅช้ค๏ผ" + +#: wt-status.c:272 +msgid "added by them:" +msgstr "็ฑไปๅๆฐๅข๏ผ" + +#: wt-status.c:274 +msgid "deleted by us:" +msgstr "็ฑๆๅๅช้ค๏ผ" + +#: wt-status.c:276 +msgid "both added:" +msgstr "้ๆนๆฐๅข๏ผ" + +#: wt-status.c:278 +msgid "both modified:" +msgstr "้ๆนไฟฎๆน๏ผ" + +#: wt-status.c:288 +msgid "new file:" +msgstr "ๆฐๆชๆก๏ผ" + +#: wt-status.c:290 +msgid "copied:" +msgstr "่ค่ฃฝ๏ผ" + +#: wt-status.c:292 +msgid "deleted:" +msgstr "ๅช้ค๏ผ" + +#: wt-status.c:294 +msgid "modified:" +msgstr "ไฟฎๆน๏ผ" + +#: wt-status.c:296 +msgid "renamed:" +msgstr "้ๆฐๅฝๅ๏ผ" + +#: wt-status.c:298 +msgid "typechange:" +msgstr "้กๅ่ฎๆด๏ผ" + +#: wt-status.c:300 +msgid "unknown:" +msgstr "ๆช็ฅ๏ผ" + +#: wt-status.c:302 +msgid "unmerged:" +msgstr "ๆชๅไฝต๏ผ" + +# ่ญฏ่ ๏ผๆซๅฐพๅ ฉๅไฝๅ ็ตๅฏ่ฝ่ขซๅชๆธ๏ผๅฆๆ็ฟป่ญฏ็บไธญๆๆจ้ปๆๅบ็พๅๅๆผขๅญ +#: wt-status.c:382 +msgid "new commits, " +msgstr "ๆฐๆไบค, " + +# ่ญฏ่ ๏ผๆซๅฐพๅ ฉๅไฝๅ ็ตๅฏ่ฝ่ขซๅชๆธ๏ผๅฆๆ็ฟป่ญฏ็บไธญๆๆจ้ปๆๅบ็พๅๅๆผขๅญ +#: wt-status.c:384 +msgid "modified content, " +msgstr "ไฟฎๆน็ๅ งๅฎน, " + +# ่ญฏ่ ๏ผๆซๅฐพๅ ฉๅไฝๅ ็ตๅฏ่ฝ่ขซๅชๆธ๏ผๅฆๆ็ฟป่ญฏ็บไธญๆๆจ้ปๆๅบ็พๅๅๆผขๅญ +#: wt-status.c:386 +msgid "untracked content, " +msgstr "ๆช่ฟฝ่นค็ๅ งๅฎน, " + +#: wt-status.c:903 +#, c-format +msgid "Your stash currently has %d entry" +msgid_plural "Your stash currently has %d entries" +msgstr[0] "ๆจ็ๅฒ่ๅ็ฎๅๆ %d ๆข็ด้" + +#: wt-status.c:934 +msgid "Submodules changed but not updated:" +msgstr "ๅญๆจก็ตๅทฒไฟฎๆนไฝๅฐๆชๆดๆฐ๏ผ" + +#: wt-status.c:936 +msgid "Submodule changes to be committed:" +msgstr "่ฆๆไบค็ๅญๆจก็ต่ฎๆด๏ผ" + +#: wt-status.c:1018 +msgid "" +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." +msgstr "" +"ไธ่ฆๆนๅๆๅช้คไธ้ข็ไธ่กใ\n" +"ๅ ถไธๆๆๅ งๅฎน้ฝๅฐ่ขซๅฟฝ็ฅใ" + +#: wt-status.c:1110 +#, 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:1140 +msgid "You have unmerged paths." +msgstr "ๆจๆๅฐๆชๅไฝต็่ทฏๅพใ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1143 +msgid " (fix conflicts and run \"git commit\")" +msgstr " ๏ผ่งฃๆฑบ่ก็ชไธฆๅท่ก \"git commit\"๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1145 +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr " ๏ผไฝฟ็จ \"git merge --abort\" ็ตๆญขๅไฝต๏ผ" + +#: wt-status.c:1149 +msgid "All conflicts fixed but you are still merging." +msgstr "ๆๆ่ก็ชๅทฒ่งฃๆฑบไฝๆจไป่ๆผๅไฝตไธญใ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1152 +msgid " (use \"git commit\" to conclude merge)" +msgstr " ๏ผไฝฟ็จ \"git commit\" ็ตๆๅไฝต๏ผ" + +#: wt-status.c:1161 +msgid "You are in the middle of an am session." +msgstr "ๆจๆญฃ่ๆผ am ๅไฝ้็จไธญใ" + +#: wt-status.c:1164 +msgid "The current patch is empty." +msgstr "็ฎๅ็ไฟฎ่ฃๆช็บ็ฉบใ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1168 +msgid " (fix conflicts and then run \"git am --continue\")" +msgstr " ๏ผ่งฃๆฑบ่ก็ช๏ผ็ถๅพๅท่ก \"git am --continue\"๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1170 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " ๏ผไฝฟ็จ \"git am --skip\" ่ทณ้ๆญคไฟฎ่ฃๆช๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1172 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr " ๏ผไฝฟ็จ \"git am --abort\" ๅพฉๅๅๆๅๆฏ๏ผ" + +#: wt-status.c:1305 +msgid "git-rebase-todo is missing." +msgstr "git-rebase-todo ้บๅคฑใ" + +#: wt-status.c:1307 +msgid "No commands done." +msgstr "ๆฒๆๆไปค่ขซๅท่กใ" + +#: wt-status.c:1310 +#, c-format +msgid "Last command done (%d command done):" +msgid_plural "Last commands done (%d commands done):" +msgstr[0] "ๆๅพไธๆขๆไปคๅทฒๅฎๆ๏ผ%d ๆขๆไปค่ขซๅท่ก๏ผ๏ผ" + +#: wt-status.c:1321 +#, c-format +msgid " (see more in file %s)" +msgstr " ๏ผๆดๅคๅ่ฆๆชๆก %s๏ผ" + +#: wt-status.c:1326 +msgid "No commands remaining." +msgstr "ๆชๅฉไธไปปไฝๆไปคใ" + +#: wt-status.c:1329 +#, 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:1337 +msgid " (use \"git rebase --edit-todo\" to view and edit)" +msgstr " ๏ผไฝฟ็จ \"git rebase --edit-todo\" ไพๆชข่ฆๅ็ทจ่ผฏ๏ผ" + +#: wt-status.c:1349 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "ๆจๅจๅท่กๅฐๅๆฏ '%s' ้ๅฎๅบๅบๅฐ '%s' ็ๅไฝใ" + +#: wt-status.c:1354 +msgid "You are currently rebasing." +msgstr "ๆจๅจๅท่ก้ๅฎๅบๅบๅไฝใ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1367 +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " ๏ผ่งฃๆฑบ่ก็ช๏ผ็ถๅพๅท่ก \"git rebase --continue\"๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1369 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " ๏ผไฝฟ็จ \"git rebase --skip\" ่ทณ้ๆญคไฟฎ่ฃๆช๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1371 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr " ๏ผไฝฟ็จ \"git rebase --abort\" ไปฅๆชขๅบๅๆๅๆฏ๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1378 +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " ๏ผๆๆ่ก็ชๅทฒ่งฃๆฑบ๏ผๅท่ก \"git rebase --continue\"๏ผ" + +#: wt-status.c:1382 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "ๆจๅจๅท่กๅฐๅๆฏ '%s' ้ๅฎๅบๅบๅฐ '%s' ็ๅไฝๆๅๅฒๆไบคใ" + +#: wt-status.c:1387 +msgid "You are currently splitting a commit during a rebase." +msgstr "ๆจๅจๅท่ก้ๅฎๅบๅบๅไฝๆๅๅฒๆไบคใ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1390 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr " ๏ผไธๆฆๆจๅทฅไฝ็ฎ้ๆไบคไนพๆทจๅพ๏ผๅท่ก \"git rebase --continue\"๏ผ" + +#: wt-status.c:1394 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "ๆจๅจๅท่กๅฐๅๆฏ '%s' ้ๅฎๅบๅบๅฐ '%s' ็ๅไฝๆ็ทจ่ผฏๆไบคใ" + +#: wt-status.c:1399 +msgid "You are currently editing a commit during a rebase." +msgstr "ๆจๅจๅท่ก้ๅฎๅบๅบๅไฝๆ็ทจ่ผฏๆไบคใ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1402 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr " ๏ผไฝฟ็จ \"git commit --amend\" ไฟฎ่ฃ็ฎๅๆไบค๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1404 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr " ๏ผ็ถๆจๅฐๆจ็ไฟฎๆนๆปฟๆๅพๅท่ก \"git rebase --continue\"๏ผ" + +#: wt-status.c:1415 +msgid "Cherry-pick currently in progress." +msgstr "ๆ้ธๅไฝๆญฃๅจ้ฒ่กไธญใ" + +#: wt-status.c:1418 +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "ๆจๅจๅท่กๆ้ธๆไบค %s ็ๅไฝใ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1425 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr " ๏ผ่งฃๆฑบ่ก็ชไธฆๅท่ก \"git cherry-pick --continue\"๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1428 +msgid " (run \"git cherry-pick --continue\" to continue)" +msgstr " ๏ผๅท่ก \"git cherry-pick --continue\" ไปฅ็นผ็บ๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1431 +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +msgstr " ๏ผๆๆ่ก็ชๅทฒ่งฃๆฑบ๏ผๅท่ก \"git cherry-pick --continue\"๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1433 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " ๏ผไฝฟ็จ \"git cherry-pick --skip\" ่ทณ้ๆญคไฟฎ่ฃๆช๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1435 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" +msgstr " ๏ผไฝฟ็จ \"git cherry-pick --abort\" ไปฅๅๆถๆ้ธๅไฝ๏ผ" + +#: wt-status.c:1445 +msgid "Revert currently in progress." +msgstr "้ๅๅไฝๆญฃๅจ่กไธญใ" + +#: wt-status.c:1448 +#, c-format +msgid "You are currently reverting commit %s." +msgstr "ๆจๅจๅท่กๅ่ฝๆไบค %s ็ๅไฝใ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1454 +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr " ๏ผ่งฃๆฑบ่ก็ชไธฆๅท่ก \"git revert --continue\"๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1457 +msgid " (run \"git revert --continue\" to continue)" +msgstr " ๏ผๅท่ก \"git revert --continue\" ไปฅ็นผ็บ๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1460 +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr " ๏ผๆๆ่ก็ชๅทฒ่งฃๆฑบ๏ผๅท่ก \"git revert --continue\"๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1462 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " ๏ผไฝฟ็จ \"git revert --skip\" ่ทณ้ๆญคไฟฎ่ฃๆช๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1464 +msgid " (use \"git revert --abort\" to cancel the revert operation)" +msgstr " ๏ผไฝฟ็จ \"git revert --abort\" ไปฅๅๆถๅ่ฝๆไบคๅไฝ๏ผ" + +#: wt-status.c:1474 +#, c-format +msgid "You are currently bisecting, started from branch '%s'." +msgstr "ๆจๅจๅท่กๅพๅๆฏ '%s' ้ๅง็ไบๅๅฐๆพๅไฝใ" + +#: wt-status.c:1478 +msgid "You are currently bisecting." +msgstr "ๆจๅจๅท่กไบๅๅฐๆพๅไฝใ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: wt-status.c:1481 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr " ๏ผไฝฟ็จ \"git bisect reset\" ๆชขๅบๅๆๅๆฏ๏ผ" + +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "ๆจ่ๆผ็จ็็ฐฝๅบ็ๆ ๏ผๅ ๅซ %d%% ็่ฟฝ่นคๆชๆกใ" + +#: wt-status.c:1731 +msgid "On branch " +msgstr "ไฝๆผๅๆฏ " + +#: wt-status.c:1738 +msgid "interactive rebase in progress; onto " +msgstr "ไบๅๅผ้ๅฎๅบๅบๅไฝๆญฃๅจ้ฒ่กไธญ๏ผ่ณ " + +#: wt-status.c:1740 +msgid "rebase in progress; onto " +msgstr "้ๅฎๅบๅบๅไฝๆญฃๅจ้ฒ่กไธญ๏ผ่ณ " + +#: wt-status.c:1750 +msgid "Not currently on any branch." +msgstr "็ฎๅไธๅจไปปไฝๅๆฏไธใ" + +#: wt-status.c:1767 +msgid "Initial commit" +msgstr "ๅๅงๆไบค" + +#: wt-status.c:1768 +msgid "No commits yet" +msgstr "ๅฐ็กๆไบค" + +#: wt-status.c:1782 +msgid "Untracked files" +msgstr "ๆช่ฟฝ่นค็ๆชๆก" + +#: wt-status.c:1784 +msgid "Ignored files" +msgstr "ๅฟฝ็ฅ็ๆชๆก" + +#: wt-status.c:1788 +#, 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:1794 +#, c-format +msgid "Untracked files not listed%s" +msgstr "ๆช่ฟฝ่นค็ๆชๆกๆฒๆๅๅบ%s" + +# ่ญฏ่ ๏ผไธญๆๅญไธฒๆผๆฅ๏ผๅฏๅช้คๅๅฐ็ฉบๆ ผ +#: wt-status.c:1796 +msgid " (use -u option to show untracked files)" +msgstr " ๏ผไฝฟ็จ -u ๅๆธ้กฏ็คบๆช่ฟฝ่นค็ๆชๆก๏ผ" + +#: wt-status.c:1802 +msgid "No changes" +msgstr "ๆฒๆไฟฎๆน" + +#: wt-status.c:1807 +#, 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:1811 +#, c-format +msgid "no changes added to commit\n" +msgstr "ไฟฎๆนๅฐๆชๅ ๅ ฅๆไบค\n" + +#: wt-status.c:1815 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "ๆไบค็บ็ฉบ๏ผไฝๆฏๅญๅจๅฐๆช่ฟฝ่นค็ๆชๆก๏ผไฝฟ็จ \"git add\" ๅปบ็ซ่ฟฝ่นค๏ผ\n" + +#: wt-status.c:1819 +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "ๆไบค็บ็ฉบ๏ผไฝๆฏๅญๅจๅฐๆช่ฟฝ่นค็ๆชๆก\n" + +# ่ญฏ่ ๏ผไธญๆๅญไธฒๆผๆฅ๏ผๅฏๅช้คๅๅฐ็ฉบๆ ผ +#: wt-status.c:1823 +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "็กๆชๆก่ฆๆไบค๏ผๅปบ็ซ/่ค่ฃฝๆชๆกไธฆไฝฟ็จ \"git add\" ๅปบ็ซ่ฟฝ่นค๏ผ\n" + +#: wt-status.c:1827 wt-status.c:1833 +#, c-format +msgid "nothing to commit\n" +msgstr "็กๆชๆก่ฆๆไบค\n" + +# ่ญฏ่ ๏ผไธญๆๅญไธฒๆผๆฅ๏ผๅฏๅช้คๅๅฐ็ฉบๆ ผ +#: wt-status.c:1830 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "็กๆชๆก่ฆๆไบค๏ผไฝฟ็จ -u ้กฏ็คบๆช่ฟฝ่นค็ๆชๆก๏ผ\n" + +# ่ญฏ่ ๏ผไธญๆๅญไธฒๆผๆฅ๏ผๅฏๅช้คๅๅฐ็ฉบๆ ผ +#: wt-status.c:1835 +#, c-format +msgid "nothing to commit, working tree clean\n" +msgstr "ๆฒๆ่ฆๆไบค็ๆชๆก๏ผๅทฅไฝๅ็บไนพๆทจ็ๆ \n" + +#: wt-status.c:1940 +msgid "No commits yet on " +msgstr "ๅฐ็กๆไบคๅจ " + +#: wt-status.c:1944 +msgid "HEAD (no branch)" +msgstr "HEAD๏ผ้ๅๆฏ๏ผ" + +#: wt-status.c:1975 +msgid "different" +msgstr "ไธๅ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅฅๅฐพ็ฉบๆ ผ +#: wt-status.c:1977 wt-status.c:1985 +msgid "behind " +msgstr "่ฝๅพ " + +#: wt-status.c:1980 wt-status.c:1983 +msgid "ahead " +msgstr "้ ๅ " + +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c:2505 +#, c-format +msgid "cannot %s: You have unstaged changes." +msgstr "ไธ่ฝ%s๏ผๆจๆๆชๆซๅญ็่ฎๆดใ" + +#: wt-status.c:2511 +msgid "additionally, your index contains uncommitted changes." +msgstr "ๅฆๅค๏ผๆจ็็ดขๅผไธญๅ ๅซๆชๆไบค็่ฎๆดใ" + +#: wt-status.c:2513 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "ไธ่ฝ%s๏ผๆจ็็ดขๅผไธญๅ ๅซๆชๆไบค็่ฎๆดใ" + +#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#, 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:285 +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:272 builtin/rev-parse.c:904 +msgid "Could not read the index" +msgstr "ไธ่ฝ่ฎๅ็ดขๅผ" + +#: builtin/add.c:283 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "็กๆณ็บๅฏซๅ ฅ้ๅ '%s'ใ" + +#: builtin/add.c:287 +msgid "Could not write patch" +msgstr "ไธ่ฝ็ๆไฟฎ่ฃๆช" + +#: builtin/add.c:290 +msgid "editing patch failed" +msgstr "็ทจ่ผฏไฟฎ่ฃๆชๅคฑๆ" + +#: builtin/add.c:293 +#, c-format +msgid "Could not stat '%s'" +msgstr "ไธ่ฝๅฐ '%s' ๅผๅซ stat" + +#: builtin/add.c:295 +msgid "Empty patch. Aborted." +msgstr "็ฉบไฟฎ่ฃๆชใ็ฐๅธธ็ตๆญขใ" + +#: builtin/add.c:300 +#, c-format +msgid "Could not apply '%s'" +msgstr "ไธ่ฝๆ็จ '%s'" + +#: builtin/add.c:308 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "ไธๅ่ทฏๅพๆ นๆๆจ็ไธๅ .gitignore ๆชๆก่่ขซๅฟฝ็ฅ๏ผ\n" + +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 +msgid "dry run" +msgstr "ๆธฌ่ฉฆๅท่ก" + +#: builtin/add.c:331 +msgid "interactive picking" +msgstr "ไบๅๅผๆ้ธ" + +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 +msgid "select hunks interactively" +msgstr "ไบๅๅผๆ้ธ่ณๆๅๅก" + +#: builtin/add.c:333 +msgid "edit current diff and apply" +msgstr "็ทจ่ผฏ็ฎๅๅทฎ็ฐไธฆๆ็จ" + +#: builtin/add.c:334 +msgid "allow adding otherwise ignored files" +msgstr "ๅ ่จฑๆฐๅขๅฟฝ็ฅ็ๆชๆก" + +#: builtin/add.c:335 +msgid "update tracked files" +msgstr "ๆดๆฐๅทฒ่ฟฝ่นค็ๆชๆก" + +#: builtin/add.c:336 +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "ๅฐๅทฒ่ฟฝ่นคๆชๆก๏ผ้ฑๅซ -u๏ผ้ๆฐๆญธไธๆ่ก็ฌฆ่" + +#: builtin/add.c:337 +msgid "record only the fact that the path will be added later" +msgstr "ๅช่จ้๏ผ่ฉฒ่ทฏๅพ็จๅพๅๆฐๅข" + +#: builtin/add.c:338 +msgid "add changes from all tracked and untracked files" +msgstr "ๆฐๅขๆๆๆน่ฎ็ๅทฒ่ฟฝ่นคๆชๆกๅๆช่ฟฝ่นคๆชๆก" + +#: builtin/add.c:341 +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "ๅฟฝ็ฅๅทฅไฝๅไธญ็งป้ค็่ทฏๅพ๏ผๅ --no-all ็ธๅ๏ผ" + +#: builtin/add.c:343 +msgid "don't add, only refresh the index" +msgstr "ไธๆฐๅข๏ผๅช้ๆฐๆด็็ดขๅผ" + +#: builtin/add.c:344 +msgid "just skip files which cannot be added because of errors" +msgstr "่ทณ้ๅ ็ผ็้ฏ่ชคไธ่ฝๆฐๅข็ๆชๆก" + +#: builtin/add.c:345 +msgid "check if - even missing - files are ignored in dry run" +msgstr "ๆชขๆฅๅจๆธฌ่ฉฆๅท่กๆจกๅผไธๆชๆก๏ผๅณไฝฟไธๅญๅจ๏ผๆฏๅฆ่ขซๅฟฝ็ฅ" + +#: builtin/add.c:347 builtin/update-index.c:1004 +msgid "override the executable bit of the listed files" +msgstr "่ฆ่ๅ่กจ่ฃกๆชๆก็ๅฏๅท่กไฝ" + +#: builtin/add.c:349 +msgid "warn when adding an embedded repository" +msgstr "ๅปบ็ซไธๅๅตๅ ฅๅผ็ๆฌๅบซๆ็ตฆไบ่ญฆๅ" + +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "`git stash -p` ็ๅพ็ซฏ" + +#: builtin/add.c:369 +#, 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:397 +#, c-format +msgid "adding embedded git repository: %s" +msgstr "ๆญฃๅจๆฐๅขๅตๅ ฅๅผ git ็ๆฌๅบซ๏ผ%s" + +#: builtin/add.c:416 +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:425 +msgid "adding files failed" +msgstr "ๆฐๅขๆชๆกๅคฑๆ" + +#: builtin/add.c:453 builtin/commit.c:345 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--pathspec-from-file ่ --interactive/--patch ไธ็ธๅฎน" + +#: builtin/add.c:470 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file ่ --edit ไธ็ธๅฎน" + +#: builtin/add.c:482 +msgid "-A and -u are mutually incompatible" +msgstr "-A ๅ -u ้ธ้ ไบๆฅ" + +#: builtin/add.c:485 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "้ธ้ --ignore-missing ๅช่ฝๅ --dry-run ๅๆไฝฟ็จ" + +#: builtin/add.c:489 +#, c-format +msgid "--chmod param '%s' must be either -x or +x" +msgstr "ๅๆธ --chmod ๅๅผ '%s' ๅฟ ้ ๆฏ -x ๆ +x" + +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "--pathspec-from-file ่ <่ทฏๅพ่ฆๆ ผ> ๅๆธไธ็ธๅฎน" + +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul ้่ฆ --pathspec-from-file" + +#: builtin/add.c:518 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "ๆฒๆๆๅฎๆชๆก๏ผไนๆฒๆๆชๆก่ขซๆฐๅขใ\n" + +#: builtin/add.c:520 +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:160 +#, c-format +msgid "invalid committer: %s" +msgstr "็กๆ็ๆไบค่ ๏ผ%s" + +#: builtin/am.c:366 +msgid "could not parse author script" +msgstr "ไธ่ฝ่งฃๆไฝ่ ่ ณๆฌ" + +#: builtin/am.c:450 +#, c-format +msgid "'%s' was deleted by the applypatch-msg hook" +msgstr "'%s' ่ขซ applypatch-msg ๆ้คๅช้ค" + +#: builtin/am.c:492 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "้ๆณ็่ผธๅ ฅ่ก๏ผ'%s'ใ" + +#: builtin/am.c:530 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "ๅพ '%s' ่ค่ฃฝ่จป่งฃๅฐ '%s' ๆๅคฑๆ" + +#: builtin/am.c:556 +msgid "fseek failed" +msgstr "fseek ๅคฑๆ" + +#: builtin/am.c:744 +#, c-format +msgid "could not parse patch '%s'" +msgstr "็กๆณ่งฃๆไฟฎ่ฃๆช '%s'" + +#: builtin/am.c:809 +msgid "Only one StGIT patch series can be applied at once" +msgstr "ไธๆฌกๅช่ฝๆไธๅ StGIT ไฟฎ่ฃๆชไฝๅ่ขซๆ็จ" + +#: builtin/am.c:857 +msgid "invalid timestamp" +msgstr "็กๆ็ๆ้ๆณ" + +#: builtin/am.c:862 builtin/am.c:874 +msgid "invalid Date line" +msgstr "็กๆ็ๆฅๆ่ก" + +#: builtin/am.c:869 +msgid "invalid timezone offset" +msgstr "็กๆ็ๆๅไฝ็งปๅผ" + +#: builtin/am.c:962 +msgid "Patch format detection failed." +msgstr "ไฟฎ่ฃๆชๆ ผๅผๅตๆธฌๅคฑๆใ" + +#: builtin/am.c:967 builtin/clone.c:409 +#, c-format +msgid "failed to create directory '%s'" +msgstr "ๅปบ็ซ็ฎ้ '%s' ๅคฑๆ" + +#: builtin/am.c:972 +msgid "Failed to split patches." +msgstr "ๅๅฒไฟฎ่ฃๆชๅคฑๆใ" + +#: builtin/am.c:1103 +#, c-format +msgid "When you have resolved this problem, run \"%s --continue\"." +msgstr "็ถๆจ่งฃๆฑบ้ไธๅ้ก๏ผๅท่ก \"%s --continue\"ใ" + +#: builtin/am.c:1104 +#, c-format +msgid "If you prefer to skip this patch, run \"%s --skip\" instead." +msgstr "ๅฆๆๆจๆณ่ฆ่ทณ้้ไธไฟฎ่ฃๆช๏ผๅๅท่ก \"%s --skip\"ใ" + +#: builtin/am.c:1105 +#, c-format +msgid "To restore the original branch and stop patching, run \"%s --abort\"." +msgstr "่ฅ่ฆๅพฉๅ่ณๅๅงๅๆฏไธฆๅๆญขไฟฎ่ฃๆชๅไฝ๏ผๅท่ก \"%s --abort\"ใ" + +#: builtin/am.c:1188 +msgid "Patch sent with format=flowed; space at the end of lines might be lost." +msgstr "ไฟฎ่ฃๆชไฝฟ็จ format=flowed ๆ ผๅผๅณ้๏ผ่กๅฐพ็็ฉบๆ ผๅฏ่ฝๆ้บๅคฑใ" + +#: builtin/am.c:1216 +msgid "Patch is empty." +msgstr "ไฟฎ่ฃๆช็บ็ฉบใ" + +#: builtin/am.c:1281 +#, c-format +msgid "missing author line in commit %s" +msgstr "ๅจๆไบค %s ไธญ็ผบๅฐไฝ่ ่ก" + +#: builtin/am.c:1284 +#, c-format +msgid "invalid ident line: %.*s" +msgstr "็กๆ็่บซไปฝๆจ่จ๏ผ%.*s" + +#: builtin/am.c:1503 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "็ๆฌๅบซ็ผบไนๅฟ ่ฆ็่ณๆ็ฉไปถไปฅ้ฒ่กไธๆนๅไฝตใ" + +#: builtin/am.c:1505 +msgid "Using index info to reconstruct a base tree..." +msgstr "ไฝฟ็จ็ดขๅผไพ้ๅปบไธๅ๏ผไธๆนๅไฝต็๏ผๅบ็ค็ฎ้ๆจน..." + +#: builtin/am.c:1524 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"ๆจๆฏๅฆๆพๆๅ็ทจ่ผฏ้ๆจ็ไฟฎ่ฃๆช๏ผ\n" +"็กๆณๅฅ็จไฟฎ่ฃๆชๅฐ็ดขๅผไธญ็่ณๆ็ฉไปถไธใ" + +#: builtin/am.c:1530 +msgid "Falling back to patching base and 3-way merge..." +msgstr "ๅ่ฝๅฐๅบ็ค็ๆฌไธๆไฟฎ่ฃๆชๅ้ฒ่กไธๆนๅไฝต..." + +#: builtin/am.c:1556 +msgid "Failed to merge in the changes." +msgstr "็กๆณๅไฝต่ฎๆดใ" + +#: builtin/am.c:1588 +msgid "applying to an empty history" +msgstr "ๆญฃๅฅ็จๅฐไธๅ็ฉบๆญทๅฒไธ" + +#: builtin/am.c:1639 builtin/am.c:1643 +#, c-format +msgid "cannot resume: %s does not exist." +msgstr "็กๆณ็นผ็บ๏ผ%s ไธๅญๅจใ" + +#: builtin/am.c:1661 +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:1671 +#, 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:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "็กๆณๅฏซๅ ฅ็ดขๅผๆชๆก" + +#: builtin/am.c:1721 +#, c-format +msgid "Dirty index: cannot apply patches (dirty: %s)" +msgstr "้ซ็ดขๅผ๏ผไธ่ฝๅฅ็จไฟฎ่ฃๆช๏ผ้ซๆชๆก๏ผ%s๏ผ" + +#: builtin/am.c:1761 builtin/am.c:1829 +#, c-format +msgid "Applying: %.*s" +msgstr "ๆ็จ๏ผ%.*s" + +#: builtin/am.c:1778 +msgid "No changes -- Patch already applied." +msgstr "ๆฒๆ่ฎๆด โโ ไฟฎ่ฃๆชๅทฒ็ถๆ็จ้ใ" + +#: builtin/am.c:1784 +#, c-format +msgid "Patch failed at %s %.*s" +msgstr "ๆไฟฎ่ฃๆชๅคฑๆๆผ %s %.*s" + +#: builtin/am.c:1788 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +msgstr "็จ 'git am --show-current-patch=diff' ๅฝไปคๆชข่ฆๅคฑๆ็ไฟฎ่ฃๆช" + +#: builtin/am.c:1832 +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:1839 +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:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 +#, c-format +msgid "Could not parse object '%s'." +msgstr "ไธ่ฝ่งฃๆ็ฉไปถ '%s'ใ" + +#: builtin/am.c:1998 +msgid "failed to clean index" +msgstr "ๆธ ็ฉบ็ดขๅผๅคฑๆ" + +#: builtin/am.c:2042 +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:2149 +#, c-format +msgid "Invalid value for --patch-format: %s" +msgstr "็กๆ็ --patch-format ๅผ๏ผ%s" + +#: builtin/am.c:2191 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "็กๆ็ --show-current-patch ๅผ๏ผ%s" + +#: builtin/am.c:2195 +#, 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:2226 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" +msgstr "git am [<้ธ้ >] [(<mbox> | <Maildir>)...]" + +#: builtin/am.c:2227 +msgid "git am [<options>] (--continue | --skip | --abort)" +msgstr "git am [<้ธ้ >] (--continue | --skip | --abort)" + +#: builtin/am.c:2233 +msgid "run interactively" +msgstr "ไปฅไบๅๅผๆนๅผๅท่ก" + +#: builtin/am.c:2235 +msgid "historical option -- no-op" +msgstr "่็ๅๆธ โโ ็กไฝ็จ" + +#: builtin/am.c:2237 +msgid "allow fall back on 3way merging if needed" +msgstr "ๅฆๆๅฟ ่ฆ๏ผๅ ่จฑไฝฟ็จไธๆนๅไฝต" + +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 +msgid "be quiet" +msgstr "้้ปๆจกๅผ" + +#: builtin/am.c:2240 +msgid "add a Signed-off-by line to the commit message" +msgstr "ๅจๆไบค่ชชๆไธญๆฐๅขไธๅ Signed-off-by ็ฐฝๅ" + +#: builtin/am.c:2243 +msgid "recode into utf8 (default)" +msgstr "ไฝฟ็จ utf8 ๅญๅ ้๏ผ้ ่จญ๏ผ" + +#: builtin/am.c:2245 +msgid "pass -k flag to git-mailinfo" +msgstr "ๅ git-mailinfo ๅณ้ -k ๅๆธ" + +#: builtin/am.c:2247 +msgid "pass -b flag to git-mailinfo" +msgstr "ๅ git-mailinfo ๅณ้ -b ๅๆธ" + +#: builtin/am.c:2249 +msgid "pass -m flag to git-mailinfo" +msgstr "ๅ git-mailinfo ๅณ้ -m ๅๆธ" + +#: builtin/am.c:2251 +msgid "pass --keep-cr flag to git-mailsplit for mbox format" +msgstr "้ๅฐ mbox ๆ ผๅผ๏ผๅ git-mailsplit ๅณ้ --keep-cr ๅๆธ" + +#: builtin/am.c:2254 +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" +msgstr "ไธๅ git-mailsplit ๅณ้ --keep-cr ๅๆธ๏ผ่ฆ่ am.keepcr ็่จญๅฎ" + +#: builtin/am.c:2257 +msgid "strip everything before a scissors line" +msgstr "ๆจๆฃ่ฃๅ็ทๅ็ๆๆๅ งๅฎน" + +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 +msgid "pass it through git-apply" +msgstr "ๅณ้็ตฆ git-apply" + +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 +msgid "n" +msgstr "n" + +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 +msgid "format" +msgstr "ๆ ผๅผ" + +#: builtin/am.c:2283 +msgid "format the patch(es) are in" +msgstr "ไฟฎ่ฃๆช็ๆ ผๅผ" + +#: builtin/am.c:2289 +msgid "override error message when patch failure occurs" +msgstr "ๆไฟฎ่ฃๆชๅคฑๆๆ้กฏ็คบ็้ฏ่ชค่จๆฏ" + +#: builtin/am.c:2291 +msgid "continue applying patches after resolving a conflict" +msgstr "่ก็ช่งฃๆฑบๅพ็นผ็บๅฅ็จไฟฎ่ฃๆช" + +#: builtin/am.c:2294 +msgid "synonyms for --continue" +msgstr "ๅ --continue ๅ็พฉ" + +#: builtin/am.c:2297 +msgid "skip the current patch" +msgstr "่ทณ้็ฎๅไฟฎ่ฃๆช" + +#: builtin/am.c:2300 +msgid "restore the original branch and abort the patching operation." +msgstr "ๅพฉๅๅๅงๅๆฏไธฆ็ตๆญขๆไฟฎ่ฃๆชๅไฝใ" + +#: builtin/am.c:2303 +msgid "abort the patching operation but keep HEAD where it is." +msgstr "็ตๆญขไฟฎ่ฃๆชๅไฝไฝไฟๆ HEAD ไธ่ฎใ" + +#: builtin/am.c:2307 +msgid "show the patch being applied" +msgstr "้กฏ็คบๆญฃๅจๅฅ็จ็ไฟฎ่ฃๆช" + +#: builtin/am.c:2312 +msgid "lie about committer date" +msgstr "ๅฐไฝ่ ๆฅๆไฝ็บๆไบคๆฅๆ" + +#: builtin/am.c:2314 +msgid "use current timestamp for author date" +msgstr "็จ็ฎๅๆ้ไฝ็บไฝ่ ๆฅๆ" + +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 +msgid "key-id" +msgstr "key-id" + +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 +msgid "GPG-sign commits" +msgstr "ไฝฟ็จ GPG ็ฐฝๅๆไบค" + +#: builtin/am.c:2320 +msgid "(internal use for git-rebase)" +msgstr "๏ผๅ ง้จไฝฟ็จ๏ผ็จๆผ git-rebase๏ผ" + +#: builtin/am.c:2338 +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:2345 +msgid "failed to read the index" +msgstr "่ฎๅ็ดขๅผๅคฑๆ" + +#: builtin/am.c:2360 +#, c-format +msgid "previous rebase directory %s still exists but mbox given." +msgstr "ไนๅ็้ๅฎๅบๅบ็ฎ้ %s ไป็ถๅญๅจ๏ผไฝๅปๆไพไบ mboxใ" + +#: builtin/am.c:2384 +#, c-format +msgid "" +"Stray %s directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" +"็ผ็พไบ้ฏ่ชค็ %s ็ฎ้ใ\n" +"ไฝฟ็จ \"git am --abort\" ๅช้คๅฎใ" + +#: builtin/am.c:2390 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "่งฃๆฑบๅไฝๆช้ฒ่ก๏ผๆๅไธๆ็นผ็บใ" + +#: builtin/am.c:2400 +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:23 +#| msgid "git bisect--helper --next-all [--no-checkout]" +msgid "git bisect--helper --next-all" +msgstr "git bisect--helper --next-all" + +#: builtin/bisect--helper.c:24 +msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgstr "git bisect--helper --write-terms <ๅฃ-่ก่ช> <ๅฅฝ-่ก่ช>" + +#: builtin/bisect--helper.c:25 +msgid "git bisect--helper --bisect-clean-state" +msgstr "git bisect--helper --bisect-clean-state" + +#: builtin/bisect--helper.c:26 +msgid "git bisect--helper --bisect-reset [<commit>]" +msgstr "git bisect--helper --bisect-reset [<ๆไบค>]" + +#: builtin/bisect--helper.c:27 +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:28 +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:29 +msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" +msgstr "git bisect--helper --bisect-next-check <ๅฅฝ-่ก่ช> <ๅฃ-่ก่ช> [<่ก่ช>]" + +#: builtin/bisect--helper.c:30 +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:31 +#| msgid "" +#| "git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new," +#| "bad}=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +msgid "" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" +msgstr "" +"git bisect--helper --bisect-start [--term-{new,bad}=<่ก่ช> --term-{old,good}" +"=<่ก่ช>] [--no-checkout] [--first-parent] [<ๅฃ> [<ๅฅฝ>...]] [--] [<่ทฏๅพ>...]" + +#: builtin/bisect--helper.c:33 +#| msgid "git bisect--helper --bisect-clean-state" +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-auto-next" + +#: builtin/bisect--helper.c:35 +msgid "git bisect--helper --bisect-autostart" +msgstr "git bisect--helper --bisect-autostart" + +#: builtin/bisect--helper.c:97 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "็กๆณไปฅ '%2$s' ๆจกๅผ้ๅ '%1$s' ๆชๆก" + +#: builtin/bisect--helper.c:104 +#, c-format +msgid "could not write to file '%s'" +msgstr "็กๆณๅฏซๅ ฅ '%s' ๆชๆก" + +#: builtin/bisect--helper.c:143 +#, c-format +msgid "'%s' is not a valid term" +msgstr "'%s' ไธๆฏไธๅๆๆ็่ก่ช" + +#: builtin/bisect--helper.c:147 +#, c-format +msgid "can't use the builtin command '%s' as a term" +msgstr "ไธ่ฝไฝฟ็จๅ งๅปบๆไปค '%s' ไฝ็บ่ก่ช" + +#: builtin/bisect--helper.c:157 +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "ไธ่ฝไฟฎๆน่ก่ช '%s' ็ๅซ็พฉ" + +#: builtin/bisect--helper.c:167 +msgid "please use two different terms" +msgstr "่ซไฝฟ็จๅ ฉๅไธๅ็่ก่ช" + +#: builtin/bisect--helper.c:207 +#, c-format +msgid "We are not bisecting.\n" +msgstr "ๆๅๆฒๆๅจไบๅๅฐๆพใ\n" + +#: builtin/bisect--helper.c:215 +#, c-format +msgid "'%s' is not a valid commit" +msgstr "'%s' ไธๆฏไธๅๆๆ็ๆไบค" + +#: builtin/bisect--helper.c:224 +#, 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:268 +#, c-format +msgid "Bad bisect_write argument: %s" +msgstr "ๅฃ็ bisect_write ๅๆธ๏ผ%s" + +#: builtin/bisect--helper.c:273 +#, c-format +msgid "couldn't get the oid of the rev '%s'" +msgstr "็กๆณๅๅพ็ๆฌ '%s' ็็ฉไปถ ID" + +#: builtin/bisect--helper.c:285 +#, c-format +msgid "couldn't open the file '%s'" +msgstr "็กๆณ้ๅๆชๆก '%s'" + +#: builtin/bisect--helper.c:311 +#, c-format +msgid "Invalid command: you're currently in a %s/%s bisect" +msgstr "็กๆ็ๆไปค๏ผๆจ็ฎๅๆญฃ่ๆผไธๅ %s/%s ไบๅๅฐๆพไธญ" + +#: builtin/bisect--helper.c:338 +#, 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:342 +#, 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:362 +#, 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:370 +msgid "Are you sure [Y/n]? " +msgstr "ๆจ็ขบ่ชๅ[Y/n]๏ผ " + +#: builtin/bisect--helper.c:431 +msgid "no terms defined" +msgstr "ๆชๅฎ็พฉ่ก่ช" + +#: builtin/bisect--helper.c:434 +#, 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:444 +#, 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:511 +msgid "revision walk setup failed\n" +msgstr "็ๆฌ้ๆญท่จญๅฎๅคฑๆ\n" + +#: builtin/bisect--helper.c:533 +#, c-format +msgid "could not open '%s' for appending" +msgstr "็กๆณ้ๅ '%s' ้ฒ่ก้ๅ " + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +msgid "'' is not a valid term" +msgstr "'' ไธๆฏไธๅๆๆ็่ก่ช" + +#: builtin/bisect--helper.c:674 +#, c-format +msgid "unrecognized option: '%s'" +msgstr "ๆช่ญๅฅ็้ธ้ ๏ผ'%s'" + +#: builtin/bisect--helper.c:678 +#, c-format +msgid "'%s' does not appear to be a valid revision" +msgstr "'%s' ็่ตทไพไธๆฏไธๅๆๆ็็ๆฌ" + +#: builtin/bisect--helper.c:709 +msgid "bad HEAD - I need a HEAD" +msgstr "ๅฃ็ HEAD - ๆ้่ฆไธๅ HEAD" + +#: builtin/bisect--helper.c:724 +#, c-format +msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." +msgstr "ๆชขๅบ '%s' ๅคฑๆใๅ่ฉฆ 'git bisect start <ๆๆๅๆฏ>'ใ" + +#: builtin/bisect--helper.c:745 +msgid "won't bisect on cg-seek'ed tree" +msgstr "ไธๆๅจๅไบ cg-seek ็ๆจนไธๅไบๅๅฐๆพ" + +#: builtin/bisect--helper.c:748 +msgid "bad HEAD - strange symbolic ref" +msgstr "ๅฃ็ HEAD - ๅฅๆช็็ฌฆ่ๅผ็จ" + +#: builtin/bisect--helper.c:775 +#, c-format +msgid "invalid ref: '%s'" +msgstr "็กๆ็ๅผ็จ๏ผ'%s'" + +#: builtin/bisect--helper.c:827 +msgid "You need to start by \"git bisect start\"\n" +msgstr "ๆจ้่ฆๅท่ก \"git bisect start\" ไพ้ๅง\n" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅฅๅฐพ็ฉบๆ ผ +#. 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:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "ๆจๆณ่ฎๆ็บๆจ้ๆจฃๅๅ[Y/n]๏ผ " + +#: builtin/bisect--helper.c:866 +msgid "perform 'git bisect next'" +msgstr "ๅท่ก 'git bisect next'" + +#: builtin/bisect--helper.c:868 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "ๅฐ่ก่ชๅฏซๅ ฅ .git/BISECT_TERMS" + +#: builtin/bisect--helper.c:870 +msgid "cleanup the bisection state" +msgstr "ๆธ ้คไบๅๅฐๆพ็ๆ " + +#: builtin/bisect--helper.c:872 +msgid "check for expected revs" +msgstr "ๆชขๆฅ้ ๆ็็ๆฌ" + +#: builtin/bisect--helper.c:874 +msgid "reset the bisection state" +msgstr "ๆธ ้คไบๅๅฐๆพ็ๆ " + +#: builtin/bisect--helper.c:876 +msgid "write out the bisection state in BISECT_LOG" +msgstr "ๅฐไบๅๅฐๆพ็็ๆ ๅฏซๅ ฅ BISECT_LOG" + +#: builtin/bisect--helper.c:878 +msgid "check and set terms in a bisection state" +msgstr "ๅจไธๅไบๅๅฐๆพ็ๆ ไธญๆชขๆฅๅ่จญๅฎ่ก่ช" + +#: builtin/bisect--helper.c:880 +msgid "check whether bad or good terms exist" +msgstr "ๆชขๆฅๅฃ็ๆๅฅฝ็่ก่ชๆฏๅฆๅญๅจ" + +#: builtin/bisect--helper.c:882 +msgid "print out the bisect terms" +msgstr "ๅๅฐไบๅๅฐๆพ่ก่ช" + +#: builtin/bisect--helper.c:884 +msgid "start the bisect session" +msgstr "ๅๅไบๅๅฐๆพ้็จ" + +#: builtin/bisect--helper.c:886 +msgid "find the next bisection commit" +msgstr "ๅฐๆพไธไธๅไบๅๅฐๆพๆไบค" + +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" +msgstr "้ฉ่ญไธไธๅไบๅๅฐๆพ็ๆ ๅพ๏ผๆชขๅบไธไธๅไบๅๅฐๆพๆไบค" + +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "ๅฆๆช้ๅงไบๅๅฐๆพๅ้ๅง" + +#: builtin/bisect--helper.c:892 +msgid "no log for BISECT_WRITE" +msgstr "BISECT_WRITE ็กๆฅ่ช" + +#: builtin/bisect--helper.c:910 +msgid "--write-terms requires two arguments" +msgstr "--write-terms ้่ฆๅ ฉๅๅๆธ" + +#: builtin/bisect--helper.c:914 +msgid "--bisect-clean-state requires no arguments" +msgstr "--bisect-clean-state ไธๅธถๅๆธ" + +#: builtin/bisect--helper.c:921 +msgid "--bisect-reset requires either no argument or a commit" +msgstr "--bisect-reset ็ก้ๅๆธๆ่ ้่ฆไธๅๆไบค" + +#: builtin/bisect--helper.c:925 +msgid "--bisect-write requires either 4 or 5 arguments" +msgstr "--bisect-write ้่ฆ 4 ๆ 5 ๅๅๆธ" + +#: builtin/bisect--helper.c:931 +msgid "--check-and-set-terms requires 3 arguments" +msgstr "--check-and-set-terms ้่ฆ 3 ๅๅๆธ" + +#: builtin/bisect--helper.c:937 +msgid "--bisect-next-check requires 2 or 3 arguments" +msgstr "--bisect-next-check ้่ฆ 2 ๆ 3 ๅๅๆธ" + +#: builtin/bisect--helper.c:943 +msgid "--bisect-terms requires 0 or 1 argument" +msgstr "--bisect-terms ้่ฆ 0 ๆ 1 ๅๅๆธ" + +#: builtin/bisect--helper.c:952 +#| msgid "--bisect-next-check requires 2 or 3 arguments" +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next ้่ฆ 0 ๅๅผๆธ" + +#: builtin/bisect--helper.c:958 +#| msgid "--bisect-terms requires 0 or 1 argument" +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--bisect-auto-next ้่ฆ 0 ๅๅผๆธ" + +#: builtin/bisect--helper.c:964 +#| msgid "--bisect-clean-state requires no arguments" +msgid "--bisect-autostart does not accept arguments" +msgstr "--bisect-autostart ไธๆฅๅๅผๆธ" + +#: builtin/blame.c:32 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git blame [<้ธ้ >] [<็ๆฌ้ธ้ >] [<็ๆฌ>] [--] <ๆชๆก>" + +#: builtin/blame.c:37 +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<็ๆฌ้ธ้ > ็ๆชๆก่จ้ๅจ git-rev-list(1) ไธญ" + +#: builtin/blame.c:410 +#, c-format +msgid "expecting a color: %s" +msgstr "ๆๆไธๅ้ก่ฒ๏ผ%s" + +#: builtin/blame.c:417 +msgid "must end with a color" +msgstr "ๅฟ ้ ไปฅไธๅ้ก่ฒ็ตๅฐพ" + +#: builtin/blame.c:730 +#, c-format +msgid "invalid color '%s' in color.blame.repeatedLines" +msgstr "่จญๅฎ color.blame.repeatedLines ไธญ็็กๆ้ก่ฒ '%s'" + +#: builtin/blame.c:748 +msgid "invalid value for blame.coloring" +msgstr "่จญๅฎ blame.coloring ไธญ็็กๆๅๅผ" + +#: builtin/blame.c:845 +#, c-format +msgid "cannot find revision %s to ignore" +msgstr "ไธ่ฝๆพๅฐ่ฆๅฟฝ็ฅ็็ๆฌ %s" + +#: builtin/blame.c:867 +msgid "Show blame entries as we find them, incrementally" +msgstr "ๅข้ๅผๅฐ้กฏ็คบ็ผ็พ็ blame ๆข็ฎ" + +#: builtin/blame.c:868 +msgid "Do not show object names of boundary commits (Default: off)" +msgstr "ไธ่ฆ้กฏ็คบ้็ๆไบค็็ฉไปถๅ็จฑ (้ ่จญๅผ: off)" + +#: builtin/blame.c:869 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "ไธๆๆ นๆไบคไฝ็บ้็๏ผ้ ่จญ๏ผ้้๏ผ" + +#: builtin/blame.c:870 +msgid "Show work cost statistics" +msgstr "้กฏ็คบๆไปคๆถ่็ตฑ่จ" + +#: builtin/blame.c:871 +msgid "Force progress reporting" +msgstr "ๅผทๅถ้ฒๅบฆ้กฏ็คบ" + +#: builtin/blame.c:872 +msgid "Show output score for blame entries" +msgstr "้กฏ็คบๅคๆท blame ๆข็ฎไฝ็งป็ๅพๅ่จบๆท่จๆฏ" + +#: builtin/blame.c:873 +msgid "Show original filename (Default: auto)" +msgstr "้กฏ็คบๅๅงๆชๆกๅ๏ผ้ ่จญ๏ผ่ชๅ๏ผ" + +#: builtin/blame.c:874 +msgid "Show original linenumber (Default: off)" +msgstr "้กฏ็คบๅๅง็่ก่๏ผ้ ่จญ๏ผ้้๏ผ" + +#: builtin/blame.c:875 +msgid "Show in a format designed for machine consumption" +msgstr "้กฏ็คบ็บไธๅ้ฉๅๆฉๅจ่ฎๅ็ๆ ผๅผ" + +#: builtin/blame.c:876 +msgid "Show porcelain format with per-line commit information" +msgstr "็บๆฏไธ่ก้กฏ็คบๆฉๅจ้ฉ็จ็ๆไบค่จๆฏ" + +#: builtin/blame.c:877 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "ไฝฟ็จๅ git-annotate ็ธๅ็่ผธๅบๆจกๅผ๏ผ้ ่จญ๏ผ้้๏ผ" + +#: builtin/blame.c:878 +msgid "Show raw timestamp (Default: off)" +msgstr "้กฏ็คบๅๅงๆ้ๆณ๏ผ้ ่จญ๏ผ้้๏ผ" + +#: builtin/blame.c:879 +msgid "Show long commit SHA1 (Default: off)" +msgstr "้กฏ็คบ้ท็ SHA1 ๆไบค่๏ผ้ ่จญ๏ผ้้๏ผ" + +#: builtin/blame.c:880 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "้ฑ่ไฝ่ ๅๅญๅๆ้ๆณ๏ผ้ ่จญ๏ผ้้๏ผ" + +#: builtin/blame.c:881 +msgid "Show author email instead of name (Default: off)" +msgstr "้กฏ็คบไฝ่ ็ไฟก็ฎฑ่ไธๆฏๅๅญ๏ผ้ ่จญ๏ผ้้๏ผ" + +#: builtin/blame.c:882 +msgid "Ignore whitespace differences" +msgstr "ๅฟฝ็ฅ็ฉบ็ฝๅทฎ็ฐ" + +#: builtin/blame.c:883 builtin/log.c:1808 +msgid "rev" +msgstr "็ๆฌ" + +#: builtin/blame.c:883 +msgid "Ignore <rev> when blaming" +msgstr "ๅจๅท่ก blame ๅไฝๆๅฟฝ็ฅ <็ๆฌ>" + +#: builtin/blame.c:884 +msgid "Ignore revisions from <file>" +msgstr "ๅฟฝ็ฅไพ่ช <ๆชๆก> ไธญ็็ๆฌ" + +#: builtin/blame.c:885 +msgid "color redundant metadata from previous line differently" +msgstr "ไฝฟ็จ้ก่ฒ้้่ผธๅบ่ๅไธ่กไธๅ็้่คๅ ่จๆฏ" + +#: builtin/blame.c:886 +msgid "color lines by age" +msgstr "ไพๆๆ้่่ฒ" + +#: builtin/blame.c:887 +msgid "Spend extra cycles to find better match" +msgstr "่ฑ่ฒป้กๅค็ๅพช็ฐไพๆพๅฐๆดๅฅฝ็็ฌฆๅ" + +#: builtin/blame.c:888 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "ไฝฟ็จไพ่ช <ๆชๆก> ็ไฟฎ่จ้่ไธๆฏๅผๅซ git-rev-list" + +#: builtin/blame.c:889 +msgid "Use <file>'s contents as the final image" +msgstr "ไฝฟ็จ <ๆชๆก> ็ๅ งๅฎนไฝ็บๆ็ต็ๅ็" + +#: builtin/blame.c:890 builtin/blame.c:891 +msgid "score" +msgstr "ๅพๅ" + +#: builtin/blame.c:890 +msgid "Find line copies within and across files" +msgstr "ๆพๅฐๆชๆกๅ งๅ่ทจๆชๆก็่ก่ค่ฃฝ" + +#: builtin/blame.c:891 +msgid "Find line movements within and across files" +msgstr "ๆพๅฐๆชๆกๅ งๅ่ทจๆชๆก็่ก็งปๅ" + +#: builtin/blame.c:892 +msgid "n,m" +msgstr "n,m" + +#: builtin/blame.c:892 +msgid "Process only line range n,m, counting from 1" +msgstr "ๅช่็่ก็ฏๅๅจ n ๅ m ไน้็๏ผๅพ 1 ้ๅง" + +#: builtin/blame.c:944 +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:995 +msgid "4 years, 11 months ago" +msgstr "4 ๅนด 11 ๅๆๅ" + +#: builtin/blame.c:1110 +#, c-format +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "ๆชๆก %s ๅชๆ %lu ่ก" + +#: builtin/blame.c:1156 +msgid "Blaming lines" +msgstr "่ฟฝ่นค็จๅผ็ขผ่ก" + +#: builtin/branch.c:29 +#| msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +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:526 +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:656 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:434 +msgid "object" +msgstr "็ฉไปถ" + +#: builtin/branch.c:657 +msgid "print only branches of the object" +msgstr "ๅชๅๅฐๆๅ่ฉฒ็ฉไปถ็ๅๆฏ" + +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 +msgid "sorting and filtering are case insensitive" +msgstr "ๆๅบๅ้ๆฟพๅฑฌๆผๅคงๅฐๅฏซไธๆๆ" + +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/verify-tag.c:38 +msgid "format to use for the output" +msgstr "่ผธๅบๆ ผๅผ" + +#: builtin/branch.c:682 builtin/clone.c:789 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD ๆฒๆไฝๆผ /refs/heads ไนไธ๏ผ" + +#: builtin/branch.c:706 +msgid "--column and --verbose are incompatible" +msgstr "--column ๅ --verbose ไธ็ธๅฎน" + +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 +msgid "branch name required" +msgstr "ๅฟ ้ ๆไพๅๆฏๅ" + +#: builtin/branch.c:751 +msgid "Cannot give description to detached HEAD" +msgstr "ไธ่ฝๅๅ้ข้้ ญๆๆจๆไพๆ่ฟฐ" + +#: builtin/branch.c:756 +msgid "cannot edit description of more than one branch" +msgstr "ไธ่ฝ็บไธๅไปฅไธ็ๅๆฏ็ทจ่ผฏๆ่ฟฐ" + +#: builtin/branch.c:763 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "ๅๆฏ '%s' ๅฐ็กๆไบคใ" + +#: builtin/branch.c:766 +#, c-format +msgid "No branch named '%s'." +msgstr "ๆฒๆๅๆฏ '%s'ใ" + +#: builtin/branch.c:781 +msgid "too many branches for a copy operation" +msgstr "็บ่ค่ฃฝๅไฝๆไพไบๅคชๅค็ๅๆฏๅ" + +#: builtin/branch.c:790 +msgid "too many arguments for a rename operation" +msgstr "็บ้ๆฐๅฝๅๅไฝๆไพไบๅคชๅค็ๅๆธ" + +#: builtin/branch.c:795 +msgid "too many arguments to set new upstream" +msgstr "็บ่จญๅฎๆฐไธๆธธๆไพไบๅคชๅค็ๅๆธ" + +#: builtin/branch.c:799 +#, 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:802 builtin/branch.c:825 +#, c-format +msgid "no such branch '%s'" +msgstr "ๆฒๆๆญคๅๆฏ '%s'" + +#: builtin/branch.c:806 +#, c-format +msgid "branch '%s' does not exist" +msgstr "ๅๆฏ '%s' ไธๅญๅจ" + +#: builtin/branch.c:819 +msgid "too many arguments to unset upstream" +msgstr "็บๅๆถไธๆธธ่จญๅฎๅไฝๆไพไบๅคชๅค็ๅๆธ" + +#: builtin/branch.c:823 +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "ๅจ HEAD ็ไธๆธธๆชๆๅไปปไฝๅๆฏๆ็กๆณๅๆถ่จญๅฎใ" + +#: builtin/branch.c:829 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "ๅๆฏ '%s' ๆฒๆไธๆธธ่จๆฏ" + +#: builtin/branch.c:839 +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:843 +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/bugreport.c:15 +msgid "git version:\n" +msgstr "git ็ๆฌ๏ผ\n" + +#: builtin/bugreport.c:21 +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() ๅคฑๆ๏ผ้ฏ่ชค๏ผใ%sใ(%d)\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "็ทจ่ญฏๅจ่ณ่จ๏ผ " + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "libc ่ณ่จ๏ผ " + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "ไธๆฏๅพ git ็ๆฌๅบซๅท่ก - ๆฒๆๅฏ้กฏ็คบ็ๆ้ค\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "git bugreport [-o|--output-directory <ๆชๆก>] [-s|--suffix <ๆ ผๅผ>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"ๆ่ฌๆจๅกซๅฏซ Git ่ญ่ฒๅ ฑๅ๏ผ\n" +"่ซๅ็ญไธๅๅ้ก๏ผไปฅ่ฎๆๅ่ฝๅค ไบ่งฃๆจ็ๅ้กใ\n" +"\n" +"่ญ่ฒ็ผ็ๅ๏ผๆจๅไบไป้บผ๏ผ๏ผ้็พๅ้ก็ๆญฅ้ฉ๏ผ\n" +"\n" +"ไฝ ๅๆฌๆๆ็ผ็ไป้บผ๏ผ๏ผๆๆ่ก็บ๏ผ\n" +"\n" +"้ฃๅฏฆ้ไธ็ผ็ไบไป้บผ๏ผ๏ผๅฏฆ้่ก็บ๏ผ\n" +"\n" +"ๆๆ่ก็บ่ทๅฏฆ้็ผ็็่ก็บๆไป้บผไธๅ๏ผ\n" +"\n" +"ๅ ถไปๆจๆณๅ ๅ ฅ็๏ผ\n" +"\n" +"่ซๆชข้ฑ่ญ่ฒๅ ฑๅไธๆน็ๅฉ้ค้จๅใ\n" +"ๆจๅฏๅช้คไปปไฝๆจไธๆณๅไบซ็ๅฐๆนใ\n" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "่ซๆๅฎ bugreport ๆชๆก็็ฎ็ๅฐ" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "่ซๆๅฎๆชๆกๅ็จฑ็ strftime ๆ ผๅผๅพ็ถด" + +#: builtin/bugreport.c:158 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "็กๆณๅปบ็ซ '%s' ็ๅ็ฝฎ็ฎ้" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "็ณป็ตฑ่ณ่จ" + +#: builtin/bugreport.c:168 +msgid "Enabled Hooks" +msgstr "ๅ็จ็ๆ้ค" + +#: builtin/bugreport.c:175 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "ไธ่ฆๅจใ%sใๅปบ็ซๆฐๆชๆก" + +#: builtin/bugreport.c:178 +#, c-format +msgid "unable to write to %s" +msgstr "็กๆณๅฏซๅ ฅ %s" + +#: builtin/bugreport.c:188 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "ๅทฒๅจใ%sใๅปบ็ซๆฐๅ ฑๅใ\n" + +#: 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:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "ไธ้กฏ็คบ้ฒๅบฆ่กจ" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "้กฏ็คบ้ฒๅบฆ่กจ" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +msgid "show progress meter during object writing phase" +msgstr "ๅจ็ฉไปถๅฏซๅ ฅ้ๆฎต้กฏ็คบ้ฒๅบฆ่กจ" + +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +msgid "similar to --all-progress when progress meter is shown" +msgstr "็ถ้ฒๅบฆ่กจ้กฏ็คบๆ้กไผผๆผ --all-progress" + +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "ๆๅฎๅ ๆ ผๅผ็ๆฌ" + +#: builtin/bundle.c:96 +msgid "Need a repository to create a bundle." +msgstr "้่ฆไธๅ็ๆฌๅบซไพๅปบ็ซๅ ใ" + +#: builtin/bundle.c:107 +msgid "do not show bundle details" +msgstr "ไธ้กฏ็คบๅ (bundle) ่ฉณ็ดฐ่ณ่จ" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "%s ๅฏไปฅ\n" + +#: builtin/bundle.c:163 +msgid "Need a repository to unbundle." +msgstr "้่ฆไธๅ็ๆฌๅบซไพ่งฃๅ ใ" + +#: builtin/bundle.c:171 builtin/remote.c:1687 +msgid "be verbose; must be placed before a subcommand" +msgstr "่ฉณ็ดฐ่ผธๅบ๏ผๅฟ ้ ็ฝฎๆผๅญๆไปคไนๅ" + +#: builtin/bundle.c:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "ๆช็ฅๅญๆไปค๏ผ%s" + +#: builtin/cat-file.c:598 +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:599 +msgid "" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" +msgstr "" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" + +#: builtin/cat-file.c:620 +msgid "only one batch option may be specified" +msgstr "ๅช่ฝๆๅฎไธๅๆนๆฌก่็้ธ้ " + +#: builtin/cat-file.c:638 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "<้กๅ> ๅฏไปฅๆฏๅ ถไธญไนไธ๏ผblobใtreeใcommitใtag" + +#: builtin/cat-file.c:639 +msgid "show object type" +msgstr "้กฏ็คบ็ฉไปถ้กๅ" + +#: builtin/cat-file.c:640 +msgid "show object size" +msgstr "้กฏ็คบ็ฉไปถๅคงๅฐ" + +#: builtin/cat-file.c:642 +msgid "exit with zero when there's no error" +msgstr "็ถๆฒๆ้ฏ่ชคๆ้ข้ไธฆ่ฟๅ้ถ" + +#: builtin/cat-file.c:643 +msgid "pretty-print object's content" +msgstr "็พ่งๅฐๅๅฐ็ฉไปถ็ๅ งๅฎน" + +#: builtin/cat-file.c:645 +msgid "for blob objects, run textconv on object's content" +msgstr "ๅฐๆผ่ณๆ็ฉไปถ๏ผๅฐๅ ถๅ งๅฎนๅๆๅญ่ฝๆ" + +#: builtin/cat-file.c:647 +msgid "for blob objects, run filters on object's content" +msgstr "ๅฐๆผ่ณๆ็ฉไปถ๏ผๅฐๅ ถๅ งๅฎนๅ้ๆฟพ" + +#: builtin/cat-file.c:648 +msgid "blob" +msgstr "blob" + +#: builtin/cat-file.c:649 +msgid "use a specific path for --textconv/--filters" +msgstr "ๅฐๆผ --textconv/--filters ไฝฟ็จไธๅ็นๅฎ็่ทฏๅพ" + +#: builtin/cat-file.c:651 +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "ๅ ่จฑ -s ๅ -t ๅฐๆๅฃ็็ฉไปถ็ๆ" + +#: builtin/cat-file.c:652 +msgid "buffer --batch output" +msgstr "็ทฉ่ก --batch ็่ผธๅบ" + +#: builtin/cat-file.c:654 +msgid "show info and content of objects fed from the standard input" +msgstr "้กฏ็คบๅพๆจๆบ่ผธๅ ฅๆไพ็็ฉไปถ็่จๆฏๅๅ งๅฎน" + +#: builtin/cat-file.c:658 +msgid "show info about objects fed from the standard input" +msgstr "้กฏ็คบๅพๆจๆบ่ผธๅ ฅๆไพ็็ฉไปถ็่จๆฏ" + +#: builtin/cat-file.c:662 +msgid "follow in-tree symlinks (used with --batch or --batch-check)" +msgstr "่ท้จๆจนๅ ง็ฌฆ่้ฃ็ต๏ผๅ --batch ๆ --batch-check ๅ ฑ็จ๏ผ" + +#: builtin/cat-file.c:664 +msgid "show all objects with --batch or --batch-check" +msgstr "ไฝฟ็จ --batch ๆ --batch-check ๅๆธ้กฏ็คบๆๆ็ฉไปถ" + +#: builtin/cat-file.c:666 +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:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 +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:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 +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:188 builtin/checkout.c:227 +#, c-format +msgid "path '%s' does not have our version" +msgstr "่ทฏๅพ '%s' ๆฒๆๆๅ็็ๆฌ" + +#: builtin/checkout.c:190 builtin/checkout.c:229 +#, c-format +msgid "path '%s' does not have their version" +msgstr "่ทฏๅพ '%s' ๆฒๆไปๅ็็ๆฌ" + +#: builtin/checkout.c:206 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "่ทฏๅพ '%s' ๆฒๆๅ จ้จๅฟ ้็็ๆฌ" + +#: builtin/checkout.c:258 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "่ทฏๅพ '%s' ๆฒๆๅฟ ้็็ๆฌ" + +#: builtin/checkout.c:275 +#, c-format +msgid "path '%s': cannot merge" +msgstr "path '%s'๏ผ็กๆณๅไฝต" + +#: builtin/checkout.c:291 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "็กๆณ็บ '%s' ๆฐๅขๅไฝต็ตๆ" + +#: builtin/checkout.c:396 +#, c-format +msgid "Recreated %d merge conflict" +msgid_plural "Recreated %d merge conflicts" +msgstr[0] "้ๆฐๅปบ็ซไบ %d ๅๅไฝต่ก็ช" + +#: builtin/checkout.c:401 +#, c-format +msgid "Updated %d path from %s" +msgid_plural "Updated %d paths from %s" +msgstr[0] "ๅพ %2$s ๆดๆฐไบ %1$d ๅ่ทฏๅพ" + +#: builtin/checkout.c:408 +#, c-format +msgid "Updated %d path from the index" +msgid_plural "Updated %d paths from the index" +msgstr[0] "ๅพ็ดขๅผๅๆดๆฐไบ %d ๅ่ทฏๅพ" + +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "'%s' ไธ่ฝๅจๆดๆฐ่ทฏๅพๆไฝฟ็จ" + +#: builtin/checkout.c:444 builtin/checkout.c:447 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "'%s' ไธ่ฝๅ %s ๅๆไฝฟ็จ" + +#: builtin/checkout.c:451 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "ไธ่ฝๅๆๆดๆฐ่ทฏๅพไธฆๅๆๅฐๅๆฏ'%s'ใ" + +#: builtin/checkout.c:455 +#, c-format +msgid "neither '%s' or '%s' is specified" +msgstr "'%s' ๆ '%s' ้ฝๆฒๆๆๅฎ" + +#: builtin/checkout.c:459 +#, c-format +msgid "'%s' must be used when '%s' is not specified" +msgstr "ๆชๆๅฎ '%2$s' ๆ๏ผๅฟ ้ ไฝฟ็จ '%1$s'" + +#: builtin/checkout.c:464 builtin/checkout.c:469 +#, c-format +msgid "'%s' or '%s' cannot be used with %s" +msgstr "'%s' ๆ '%s' ไธ่ฝๅ %s ไธ่ตทไฝฟ็จ" + +#: builtin/checkout.c:528 builtin/checkout.c:535 +#, c-format +msgid "path '%s' is unmerged" +msgstr "่ทฏๅพ '%s' ๆชๅไฝต" + +#: builtin/checkout.c:703 +msgid "you need to resolve your current index first" +msgstr "ๆจ้่ฆๅ ่งฃๆฑบ็ฎๅ็ดขๅผ็่ก็ช" + +#: builtin/checkout.c:757 +#, c-format +msgid "" +"cannot continue with staged changes in the following files:\n" +"%s" +msgstr "" +"ไธ่ฝ็นผ็บ๏ผไธๅๆชๆกๆๆซๅญ็ไฟฎๆน๏ผ\n" +"%s" + +#: builtin/checkout.c:853 +#, c-format +msgid "Can not do reflog for '%s': %s\n" +msgstr "ไธ่ฝๅฐ '%s' ๅท่ก reflog ๅไฝ๏ผ%s\n" + +#: builtin/checkout.c:895 +msgid "HEAD is now at" +msgstr "HEAD ็ฎๅไฝๆผ" + +#: builtin/checkout.c:899 builtin/clone.c:720 +msgid "unable to update HEAD" +msgstr "ไธ่ฝๆดๆฐ HEAD" + +#: builtin/checkout.c:903 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "้่จญๅๆฏ '%s'\n" + +#: builtin/checkout.c:906 +#, c-format +msgid "Already on '%s'\n" +msgstr "ๅทฒ็ถไฝๆผ '%s'\n" + +#: builtin/checkout.c:910 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "ๅๆไธฆ้่จญๅๆฏ '%s'\n" + +#: builtin/checkout.c:912 builtin/checkout.c:1338 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "ๅๆๅฐไธๅๆฐๅๆฏ '%s'\n" + +#: builtin/checkout.c:914 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "ๅๆๅฐๅๆฏ '%s'\n" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: builtin/checkout.c:965 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... ๅๅ ถๅฎ %d ๅใ\n" + +#: builtin/checkout.c:971 +#, 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:990 +#, 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:1025 +msgid "internal error in revision walk" +msgstr "ๅจ็ๆฌ้ๆญทๆ้ๅฐๅ ง้จ้ฏ่ชค" + +#: builtin/checkout.c:1029 +msgid "Previous HEAD position was" +msgstr "ไนๅ็ HEAD ไฝ็ฝฎๆฏ" + +#: builtin/checkout.c:1069 builtin/checkout.c:1333 +msgid "You are on a branch yet to be born" +msgstr "ๆจไฝๆผไธๅๅฐๆชๅๅงๅ็ๅๆฏ" + +#: builtin/checkout.c:1146 +#, 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:1153 +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:1163 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "'%s' ็ฌฆๅๅคๅ (%d) ้ ็ซฏ่ฟฝ่นคๅๆฏ" + +#: builtin/checkout.c:1229 +msgid "only one reference expected" +msgstr "้ ๆๅชๆไธๅๅผ็จ" + +#: builtin/checkout.c:1246 +#, c-format +msgid "only one reference expected, %d given." +msgstr "ๆๅชๆไธๅๅผ็จ๏ผๅปๆไพไบ %d ๅใ" + +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 +#, c-format +msgid "invalid reference: %s" +msgstr "็กๆๅผ็จ๏ผ%s" + +#: builtin/checkout.c:1305 builtin/checkout.c:1671 +#, c-format +msgid "reference is not a tree: %s" +msgstr "ๅผ็จไธๆฏไธๅๆจน๏ผ%s" + +#: builtin/checkout.c:1352 +#, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "ๆๆไธๅๅๆฏ๏ผๅพๅฐๆจ็ฑค '%s'" + +#: builtin/checkout.c:1354 +#, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "ๆๆไธๅๅๆฏ๏ผๅพๅฐ้ ็ซฏๅๆฏ '%s'" + +#: builtin/checkout.c:1355 builtin/checkout.c:1363 +#, c-format +msgid "a branch is expected, got '%s'" +msgstr "ๆๆไธๅๅๆฏ๏ผๅพๅฐ '%s'" + +#: builtin/checkout.c:1358 +#, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "ๆๆไธๅๅๆฏ๏ผๅพๅฐๆไบค '%s'" + +#: builtin/checkout.c:1374 +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:1378 +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:1382 +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:1386 +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:1390 +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:1394 +msgid "you are switching branch while bisecting" +msgstr "ๆจๅจๅท่กไบๅๅฐๆพๆๅๆๅๆฏ" + +#: builtin/checkout.c:1401 +msgid "paths cannot be used with switching branches" +msgstr "่ทฏๅพไธ่ฝๅๅๆๅๆฏๅๆไฝฟ็จ" + +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "'%s' ไธ่ฝๅๅๆๅๆฏๅๆไฝฟ็จ" + +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "'%s' ไธ่ฝๅ '%s' ๅๆไฝฟ็จ" + +#: builtin/checkout.c:1429 +#, c-format +msgid "'%s' cannot take <start-point>" +msgstr "'%s' ไธๅธถ <่ตทๅง้ป>" + +#: builtin/checkout.c:1437 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "ไธ่ฝๅๆๅๆฏๅฐไธๅ้ๆไบค '%s'" + +#: builtin/checkout.c:1444 +msgid "missing branch or commit argument" +msgstr "็ผบๅฐๅๆฏๆๆไบคๅๆธ" + +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 +msgid "force progress reporting" +msgstr "ๅผทๅถ้กฏ็คบ้ฒๅบฆๅ ฑๅ" + +#: builtin/checkout.c:1487 +msgid "perform a 3-way merge with the new branch" +msgstr "ๅๆฐ็ๅๆฏๅท่กไธๆนๅไฝต" + +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 +msgid "style" +msgstr "้ขจๆ ผ" + +#: builtin/checkout.c:1489 +msgid "conflict style (merge or diff3)" +msgstr "่ก็ช่ผธๅบ้ขจๆ ผ๏ผmerge ๆ diff3๏ผ" + +#: builtin/checkout.c:1501 builtin/worktree.c:558 +msgid "detach HEAD at named commit" +msgstr "HEAD ๅพๆๅฎ็ๆไบคๅ้ข" + +#: builtin/checkout.c:1502 +msgid "set upstream info for new branch" +msgstr "็บๆฐ็ๅๆฏ่จญๅฎไธๆธธ่จๆฏ" + +#: builtin/checkout.c:1504 +msgid "force checkout (throw away local modifications)" +msgstr "ๅผทๅถๆชขๅบ๏ผๆจๆฃๆฌๆฉไฟฎๆน๏ผ" + +#: builtin/checkout.c:1506 +msgid "new-branch" +msgstr "ๆฐๅๆฏ" + +#: builtin/checkout.c:1506 +msgid "new unparented branch" +msgstr "ๆฐ็ๆฒๆ็ถๆไบค็ๅๆฏ" + +#: builtin/checkout.c:1508 builtin/merge.c:291 +msgid "update ignored files (default)" +msgstr "ๆดๆฐๅฟฝ็ฅ็ๆชๆก๏ผ้ ่จญ๏ผ" + +#: builtin/checkout.c:1511 +msgid "do not check if another worktree is holding the given ref" +msgstr "ไธๆชขๆฅๆๅฎ็ๅผ็จๆฏๅฆ่ขซๅ ถไปๅทฅไฝๅๆๅ ็จ" + +#: builtin/checkout.c:1524 +msgid "checkout our version for unmerged files" +msgstr "ๅฐๅฐๆชๅไฝต็ๆชๆกๆชขๅบๆๅ็็ๆฌ" + +#: builtin/checkout.c:1527 +msgid "checkout their version for unmerged files" +msgstr "ๅฐๅฐๆชๅไฝต็ๆชๆกๆชขๅบไปๅ็็ๆฌ" + +#: builtin/checkout.c:1531 +msgid "do not limit pathspecs to sparse entries only" +msgstr "ๅฐ่ทฏๅพไธๅ็จ็ๆชขๅบ็้ๅถ" + +#: builtin/checkout.c:1586 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "-%cใ-%c ๅ --orphan ๆฏไบๆฅ็" + +#: builtin/checkout.c:1590 +msgid "-p and --overlay are mutually exclusive" +msgstr "-p ๅ --overlay ไบๆฅ" + +#: builtin/checkout.c:1627 +msgid "--track needs a branch name" +msgstr "--track ้่ฆไธๅๅๆฏๅ" + +#: builtin/checkout.c:1632 +#, c-format +msgid "missing branch name; try -%c" +msgstr "็ผบๅฐๅๆฏๅ็จฑ๏ผ่ซๅ่ฉฆ -%c" + +#: builtin/checkout.c:1664 +#, c-format +msgid "could not resolve %s" +msgstr "็กๆณ่งฃๆ %s" + +#: builtin/checkout.c:1680 +msgid "invalid path specification" +msgstr "็กๆ็่ทฏๅพ่ฆๆ ผ" + +#: builtin/checkout.c:1687 +#, c-format +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" +msgstr "'%s' ไธๆฏไธๅๆไบค๏ผไธ่ฝๅบๆผๅฎๅปบ็ซๅๆฏ '%s'" + +#: builtin/checkout.c:1691 +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout๏ผ--detach ไธ่ฝๆฅๆถ่ทฏๅพๅๆธ '%s'" + +#: builtin/checkout.c:1700 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file ่ --detach ไธ็ธๅฎน" + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file ่ --patch ไธ็ธๅฎน" + +#: builtin/checkout.c:1716 +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:1721 +msgid "you must specify path(s) to restore" +msgstr "ๆจๅฟ ้ ๆๅฎไธๅ่ฆๅพฉๅ็่ทฏๅพ" + +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 +msgid "branch" +msgstr "ๅๆฏ" + +#: builtin/checkout.c:1748 +msgid "create and checkout a new branch" +msgstr "ๅปบ็ซไธฆๆชขๅบไธๅๆฐ็ๅๆฏ" + +#: builtin/checkout.c:1750 +msgid "create/reset and checkout a branch" +msgstr "ๅปบ็ซ/้่จญไธฆๆชขๅบไธๅๅๆฏ" + +#: builtin/checkout.c:1751 +msgid "create reflog for new branch" +msgstr "็บๆฐ็ๅๆฏๅปบ็ซๅผ็จๆฅ่ช" + +#: builtin/checkout.c:1753 +msgid "second guess 'git checkout <no-such-branch>' (default)" +msgstr "ไบๆฌก็ๆธฌ 'git checkout <็กๆญคๅๆฏ>'๏ผ้ ่จญ๏ผ" + +#: builtin/checkout.c:1754 +msgid "use overlay mode (default)" +msgstr "ไฝฟ็จ็ๅ ๆจกๅผ๏ผ้ ่จญ๏ผ" + +#: builtin/checkout.c:1799 +msgid "create and switch to a new branch" +msgstr "ๅปบ็ซไธฆๅๆไธๅๆฐๅๆฏ" + +#: builtin/checkout.c:1801 +msgid "create/reset and switch to a branch" +msgstr "ๅปบ็ซ/้่จญไธฆๅๆไธๅๅๆฏ" + +#: builtin/checkout.c:1803 +msgid "second guess 'git switch <no-such-branch>'" +msgstr "ไบๆฌก็ๆธฌ 'git switch <็กๆญคๅๆฏ>'" + +#: builtin/checkout.c:1805 +msgid "throw away local modifications" +msgstr "ๆจๆฃๆฌๆฉไฟฎๆน" + +#: builtin/checkout.c:1839 +msgid "which tree-ish to checkout from" +msgstr "่ฆๆชขๅบๅชไธๅๆจน" + +#: builtin/checkout.c:1841 +msgid "restore the index" +msgstr "ๅพฉๅ็ดขๅผ" + +#: builtin/checkout.c:1843 +msgid "restore the working tree (default)" +msgstr "ๅพฉๅๅทฅไฝๅ๏ผ้ ่จญ๏ผ" + +#: builtin/checkout.c:1845 +msgid "ignore unmerged entries" +msgstr "ๅฟฝ็ฅๆชๅไฝตๆข็ฎ" + +#: builtin/checkout.c:1846 +msgid "use overlay mode" +msgstr "ไฝฟ็จ็ๅ ๆจกๅผ" + +#: builtin/clean.c:29 +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:33 +#, c-format +msgid "Removing %s\n" +msgstr "ๆญฃๅช้ค %s\n" + +#: builtin/clean.c:34 +#, c-format +msgid "Would remove %s\n" +msgstr "ๅฐๅช้ค %s\n" + +#: builtin/clean.c:35 +#, c-format +msgid "Skipping repository %s\n" +msgstr "ๅฟฝ็ฅ็ๆฌๅบซ %s\n" + +#: builtin/clean.c:36 +#, c-format +msgid "Would skip repository %s\n" +msgstr "ๅฐๅฟฝ็ฅ็ๆฌๅบซ %s\n" + +#: builtin/clean.c:37 +#, c-format +msgid "failed to remove %s" +msgstr "ๅช้ค %s ๅคฑๆ" + +#: builtin/clean.c:38 +#, c-format +msgid "could not lstat %s\n" +msgstr "ไธ่ฝๅฐ %s ๅผๅซ lstat\n" + +#: builtin/clean.c:302 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:306 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:661 +#, c-format +msgid "Input ignore patterns>> " +msgstr "่ผธๅ ฅ็ฏๆฌไปฅๆ้คๆข็ฎ>> " + +#: builtin/clean.c:696 +#, c-format +msgid "WARNING: Cannot find items matched by: %s" +msgstr "่ญฆๅ๏ผ็กๆณๆพๅฐๅ %s ็ฌฆๅ็ๆข็ฎ" + +#: builtin/clean.c:717 +msgid "Select items to delete" +msgstr "้ธๆ่ฆๅช้ค็ๆข็ฎ" + +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:758 +#, c-format +msgid "Remove %s [y/N]? " +msgstr "็งป้ค %s [y/N]๏ผ " + +#: builtin/clean.c:789 +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:825 +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "ๅฐๅช้คๅฆไธๆข็ฎ๏ผ" + +#: builtin/clean.c:841 +msgid "No more files to clean, exiting." +msgstr "ๆฒๆ่ฆๆธ ็็ๆชๆก๏ผ้ข้ใ" + +#: builtin/clean.c:903 +msgid "do not print names of files removed" +msgstr "ไธๅๅฐๅช้คๆชๆก็ๅ็จฑ" + +#: builtin/clean.c:905 +msgid "force" +msgstr "ๅผทๅถ" + +#: builtin/clean.c:906 +msgid "interactive cleaning" +msgstr "ไบๅๅผๆธ ้ค" + +#: builtin/clean.c:908 +msgid "remove whole directories" +msgstr "ๅช้คๆดๅ็ฎ้" + +#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/show-ref.c:179 +msgid "pattern" +msgstr "ๆจกๅผ" + +#: builtin/clean.c:910 +msgid "add <pattern> to ignore rules" +msgstr "ๆฐๅข <ๆจกๅผ> ๅฐๅฟฝ็ฅ่ฆๅ" + +#: builtin/clean.c:911 +msgid "remove ignored files, too" +msgstr "ไนๅช้คๅฟฝ็ฅ็ๆชๆก" + +#: builtin/clean.c:913 +msgid "remove only ignored files" +msgstr "ๅชๅช้คๅฟฝ็ฅ็ๆชๆก" + +#: builtin/clean.c:929 +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:932 +msgid "" +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " +"refusing to clean" +msgstr "" +"clean.requireForce ้ ่จญ็บ true ไธๆชๆไพ -iใ-n ๆ -f ้ธ้ ๏ผๆ็ตๅท่กๆธ ็ๅไฝ" + +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "-x ๅ -X ไธ่ฝๅๆไฝฟ็จ" + +#: 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:553 +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:106 +msgid "pathspec" +msgstr "่ทฏๅพ่ฆๆ ผ" + +#: builtin/clone.c:106 +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:550 +msgid "template-directory" +msgstr "็ฏๆฌ็ฎ้" + +#: builtin/clone.c:112 builtin/init-db.c:551 +msgid "directory from which templates will be used" +msgstr "็ฏๆฌ็ฎ้ๅฐ่ขซไฝฟ็จ" + +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 +msgid "reference repository" +msgstr "ๅ่็ๆฌๅบซ" + +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 +msgid "use --reference only while cloning" +msgstr "ๅ ๅจ่ค่ฃฝๆๅ่ --reference ๆๅ็ๆฌๆฉ็ๆฌๅบซ" + +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 +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:173 builtin/grep.c:849 +#: builtin/pull.c:208 +msgid "depth" +msgstr "ๆทฑๅบฆ" + +#: builtin/clone.c:126 +msgid "create a shallow clone of that depth" +msgstr "ๅปบ็ซไธๅๆๅฎๆทฑๅบฆ็ๆทบ่ค่ฃฝ" + +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 +msgid "time" +msgstr "ๆ้" + +#: builtin/clone.c:128 +msgid "create a shallow clone since a specific time" +msgstr "ๅพไธๅ็นๅฎๆ้ๅปบ็ซไธๅๆทบ่ค่ฃฝ" + +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 +msgid "revision" +msgstr "ไฟฎ่จ็" + +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 +msgid "deepen history of shallow clone, excluding rev" +msgstr "ๆทฑๅๆทบ่ค่ฃฝ็ๆญทๅฒ๏ผ้คไบ็นๅฎ็ๆฌ" + +#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 +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:559 +msgid "gitdir" +msgstr "git็ฎ้" + +#: builtin/clone.c:138 builtin/init-db.c:560 +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:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 +msgid "server-specific" +msgstr "server-specific" + +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 +msgid "option to transmit" +msgstr "ๅณ่ผธ้ธ้ " + +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 +msgid "use IPv4 addresses only" +msgstr "ๅชไฝฟ็จ IPv4 ไฝๅ" + +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 +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:431 +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "็กๆณๅจ '%s' ไธๅๅ็ไปฃๅจ" + +#: builtin/clone.c:462 +#, c-format +msgid "failed to create link '%s'" +msgstr "ๅปบ็ซ้ฃ็ต '%s' ๅคฑๆ" + +#: builtin/clone.c:466 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "่ค่ฃฝๆชๆก่ณ '%s' ๅคฑๆ" + +#: builtin/clone.c:471 +#, c-format +msgid "failed to iterate over '%s'" +msgstr "็กๆณๅจ '%s' ไธ็ไปฃ" + +#: builtin/clone.c:498 +#, c-format +msgid "done.\n" +msgstr "ๅฎๆใ\n" + +#: builtin/clone.c:512 +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:589 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "ไธ่ฝ็ผ็พ่ฆ่ค่ฃฝ็้ ็ซฏๅๆฏ %sใ" + +#: builtin/clone.c:708 +#, c-format +msgid "unable to update %s" +msgstr "ไธ่ฝๆดๆฐ %s" + +#: builtin/clone.c:756 +msgid "failed to initialize sparse-checkout" +msgstr "็กๆณๅๅงๅ็จ็ๆชขๅบ" + +#: builtin/clone.c:779 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "้ ็ซฏ HEAD ๆๅไธๅไธๅญๅจ็ๅผ็จ๏ผ็กๆณๆชขๅบใ\n" + +#: builtin/clone.c:811 +msgid "unable to checkout working tree" +msgstr "ไธ่ฝๆชขๅบๅทฅไฝๅ" + +#: builtin/clone.c:868 +msgid "unable to write parameters to config file" +msgstr "็กๆณๅฐๅๆธๅฏซๅ ฅ่จญๅฎๆชๆก" + +#: builtin/clone.c:931 +msgid "cannot repack to clean up" +msgstr "็กๆณๅท่ก repack ไพๆธ ็" + +#: builtin/clone.c:933 +msgid "cannot unlink temporary alternates file" +msgstr "็กๆณๅช้คๆซๆ็ alternates ๆชๆก" + +#: builtin/clone.c:970 builtin/receive-pack.c:2434 +msgid "Too many arguments." +msgstr "ๅคชๅคๅๆธใ" + +#: builtin/clone.c:974 +msgid "You must specify a repository to clone." +msgstr "ๆจๅฟ ้ ๆๅฎไธๅ็ๆฌๅบซไพ่ค่ฃฝใ" + +#: builtin/clone.c:987 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "--bare ๅ --origin %s ้ธ้ ไธ็ธๅฎนใ" + +#: builtin/clone.c:990 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "--bare ๅ --separate-git-dir ้ธ้ ไธ็ธๅฎนใ" + +#: builtin/clone.c:1006 +#, c-format +msgid "repository '%s' does not exist" +msgstr "็ๆฌๅบซ '%s' ไธๅญๅจ" + +#: builtin/clone.c:1010 builtin/fetch.c:1841 +#, c-format +msgid "depth %s is not a positive number" +msgstr "ๆทฑๅบฆ %s ไธๆฏไธๅๆญฃๆธ" + +#: builtin/clone.c:1020 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "็ฎๆจ่ทฏๅพ '%s' ๅทฒ็ถๅญๅจ๏ผไธฆไธไธๆฏไธๅ็ฉบ็ฎ้ใ" + +#: builtin/clone.c:1026 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "็ๆฌๅบซ่ทฏๅพ '%s' ๅทฒ็ถๅญๅจ๏ผไธฆไธไธๆฏไธๅ็ฉบ็ฎ้ใ" + +#: builtin/clone.c:1040 +#, c-format +msgid "working tree '%s' already exists." +msgstr "ๅทฅไฝๅ '%s' ๅทฒ็ถๅญๅจใ" + +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "ไธ่ฝ็บ '%s' ๅปบ็ซๅ ๅฐ็ฎ้" + +#: builtin/clone.c:1060 +#, c-format +msgid "could not create work tree dir '%s'" +msgstr "ไธ่ฝๅปบ็ซๅทฅไฝๅ็ฎ้ '%s'" + +#: builtin/clone.c:1080 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "่ค่ฃฝๅฐ็ด็ๆฌๅบซ '%s'...\n" + +#: builtin/clone.c:1082 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "ๆญฃ่ค่ฃฝๅฐ '%s'...\n" + +#: builtin/clone.c:1106 +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "clone --recursive ๅ --reference ไปฅๅ --reference-if-able ไธ็ธๅฎน" + +#: builtin/clone.c:1170 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth ๅจๆฌๆฉ่ค่ฃฝๆ่ขซๅฟฝ็ฅ๏ผ่ซๆน็จ file:// ๅๅฎใ" + +#: builtin/clone.c:1172 +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "--shallow-since ๅจๆฌๆฉ่ค่ฃฝๆ่ขซๅฟฝ็ฅ๏ผ่ซๆน็จ file:// ๅๅฎใ" + +#: builtin/clone.c:1174 +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "--shallow-exclude ๅจๆฌๆฉ่ค่ฃฝๆ่ขซๅฟฝ็ฅ๏ผ่ซๆน็จ file:// ๅๅฎใ" + +#: builtin/clone.c:1176 +msgid "--filter is ignored in local clones; use file:// instead." +msgstr "--filter ๅจๆฌๆฉ่ค่ฃฝๆ่ขซๅฟฝ็ฅ๏ผ่ซๆน็จ file:// ๅๅฎใ" + +#: builtin/clone.c:1179 +msgid "source repository is shallow, ignoring --local" +msgstr "ๆบ็ๆฌๅบซๆฏๆทบ่ค่ฃฝ๏ผๅฟฝ็ฅ --local" + +#: builtin/clone.c:1184 +msgid "--local is ignored" +msgstr "--local ่ขซๅฟฝ็ฅ" + +#: builtin/clone.c:1268 builtin/clone.c:1276 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "้ ็ซฏๅๆฏ %s ๅจไธๆธธ %s ๆช็ผ็พ" + +#: builtin/clone.c:1279 +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-graph.c:13 builtin/commit-graph.c:22 +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:14 builtin/commit-graph.c:27 +#| msgid "" +#| "git commit-graph write [--object-dir <objdir>] [--append] [--" +#| "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--" +#| "changed-paths] [--[no-]progress] <split options>" +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" + +#: builtin/commit-graph.c:64 +#, c-format +msgid "could not find object directory matching %s" +msgstr "ๆพไธๅฐ็ฌฆๅ %s ็็ฉไปถ็ฎ้" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "็ฎ้" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "ๅฒๅญๅๅฝข็็ฉไปถ็ฎ้" + +#: builtin/commit-graph.c:83 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "ๅฆๆๆไบคๅๅฝข่ขซๅๅฒ๏ผๅช้ฉ่ญ้ ญไธๅๆชๆก" + +#: builtin/commit-graph.c:106 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "็กๆณ้ๅๆไบคๅๅฝข '%s'" + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "็กๆณ่ญๅฅ็ --split ๅๆธ๏ผ%s" + +#: builtin/commit-graph.c:155 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "้ๆๆ็้ๅๅ ญ้ฒไฝ็ฉไปถ ID๏ผ%s" + +#: builtin/commit-graph.c:160 +#, c-format +msgid "invalid object: %s" +msgstr "็ฉไปถ็กๆ๏ผ%s" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "้ๅง้ๆญทๆๆๅผ็จ" + +#: builtin/commit-graph.c:215 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "ๅพๆจๆบ่ผธๅ ฅไธญ็ๅ ็ดขๅผๆชๆกๅ่กจไธญๆๆๆไบค" + +#: builtin/commit-graph.c:217 +msgid "start walk at commits listed by stdin" +msgstr "ๅพๆจๆบ่ผธๅ ฅไธญ็ๆไบค้ๅงๆๆ" + +#: builtin/commit-graph.c:219 +msgid "include all commits already in the commit-graph file" +msgstr "ๅ ๅซ commit-graph ๆชๆกไธญๅทฒๆๆๆๆไบค" + +#: builtin/commit-graph.c:221 +msgid "enable computation for changed paths" +msgstr "ๅ็จๅทฒ่ฎๆด่ทฏๅพ็่จ็ฎ" + +#: builtin/commit-graph.c:224 +msgid "allow writing an incremental commit-graph file" +msgstr "ๅ ่จฑๅฏซไธๅๅข้ๆไบคๅๅฝขๆชๆก" + +#: builtin/commit-graph.c:228 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "ๅจ้ๅบๆฌๅๅฒๆไบคๅๅฝขไธญ็ๆๅคงๆไบคๆธ" + +#: builtin/commit-graph.c:230 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "ไธๅๅๅฒๆไบคๅๅฝข็ๅ ฉๅ็ดๅฅไน้็ๆๅคงๆฏ็" + +#: builtin/commit-graph.c:232 +msgid "only expire files older than a given date-time" +msgstr "ๅชๅฐ่ๆผๆๅฎๆฅๆ่ๆ้็ๆชๆก่จญ็บ้ๆ" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "่ฎๆด่ทฏๅพ็ๅธ้้ๆฟพๅจ่ฆ่จ็ฎ็ๆๅคง้" + +#: builtin/commit-graph.c:255 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "ไธ่ฝๅๆไฝฟ็จ --reachableใ--stdin-commits ๆ --stdin-packs" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "ๆญฃๅจๅพ่ผธๅ ฅๆถ้ๆไบค" + +#: 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:546 +#, 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:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 +msgid "message" +msgstr "่จๆฏ" + +#: builtin/commit-tree.c:115 builtin/commit.c:1504 +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:1516 builtin/merge.c:289 +#: builtin/pull.c:176 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 rebase --skip'\n" +msgstr "ๅฆๅ๏ผ่ซไฝฟ็จ 'git rebase --skip'\n" + +#: builtin/commit.c:66 +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "ๅฆๅ๏ผ่ซไฝฟ็จ 'git cherry-pick --skip'\n" + +#: builtin/commit.c:69 +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:312 +msgid "failed to unpack HEAD tree object" +msgstr "่งฃๅ HEAD ๆจน็็ฉไปถๅคฑๆ" + +#: builtin/commit.c:348 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "--pathspec-from-file ๅ -a ๅๆไฝฟ็จๆฒๆๆ็พฉ" + +#: builtin/commit.c:361 +msgid "No paths with --include/--only does not make sense." +msgstr "ๅๆธ --include/--only ไธ่ท่ทฏๅพๆฒๆๆ็พฉใ" + +#: builtin/commit.c:373 +msgid "unable to create temporary index" +msgstr "ไธ่ฝๅปบ็ซๆซๆ็ดขๅผ" + +#: builtin/commit.c:382 +msgid "interactive add failed" +msgstr "ไบๅๅผๆฐๅขๅคฑๆ" + +#: builtin/commit.c:397 +msgid "unable to update temporary index" +msgstr "็กๆณๆดๆฐๆซๆ็ดขๅผ" + +#: builtin/commit.c:399 +msgid "Failed to update main cache tree" +msgstr "ไธ่ฝๆดๆฐๆจน็ไธปๅฟซๅ" + +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 +msgid "unable to write new_index file" +msgstr "็กๆณๅฏซ new_index ๆชๆก" + +#: builtin/commit.c:476 +msgid "cannot do a partial commit during a merge." +msgstr "ๅจๅไฝต้็จไธญไธ่ฝๅ้จๅๆไบคใ" + +#: builtin/commit.c:478 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "ๅจๆ้ธ้็จไธญไธ่ฝๅ้จๅๆไบคใ" + +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "ๅจ้ๅฎๅบๅบ้็จไธญไธ่ฝๅ้จๅๆไบคใ" + +#: builtin/commit.c:488 +msgid "cannot read the index" +msgstr "็กๆณ่ฎๅ็ดขๅผ" + +#: builtin/commit.c:507 +msgid "unable to write temporary index file" +msgstr "็กๆณๅฏซๆซๆ็ดขๅผๆชๆก" + +#: builtin/commit.c:605 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "ๆไบค '%s' ็ผบๅฐไฝ่ ่จๆฏ" + +#: builtin/commit.c:607 +#, c-format +msgid "commit '%s' has malformed author line" +msgstr "ๆไบค '%s' ๆๆ ผๅผ้ฏ่ชค็ไฝ่ ่จๆฏ" + +#: builtin/commit.c:626 +msgid "malformed --author parameter" +msgstr "ๆ ผๅผ้ฏ่ชค็ --author ๅๆธ" + +#: builtin/commit.c:679 +msgid "" +"unable to select a comment character that is not used\n" +"in the current commit message" +msgstr "็กๆณ้ธๆไธๅๆช่ขซ็ฎๅๆไบค่ชชๆไฝฟ็จ็ๅ่จปๅญๅ " + +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 +#, c-format +msgid "could not lookup commit %s" +msgstr "ไธ่ฝๆฅ่ฉขๆไบค %s" + +#: builtin/commit.c:729 builtin/shortlog.c:478 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "๏ผๆญฃๅพๆจๆบ่ผธๅ ฅไธญ่ฎๅๆฅ่ช่จๆฏ๏ผ\n" + +#: builtin/commit.c:731 +msgid "could not read log from standard input" +msgstr "ไธ่ฝๅพๆจๆบ่ผธๅ ฅไธญ่ฎๅๆฅ่ช่จๆฏ" + +#: builtin/commit.c:735 +#, c-format +msgid "could not read log file '%s'" +msgstr "ไธ่ฝ่ฎๅๆฅ่ชๆชๆก '%s'" + +#: builtin/commit.c:766 builtin/commit.c:782 +msgid "could not read SQUASH_MSG" +msgstr "ไธ่ฝ่ฎๅ SQUASH_MSG" + +#: builtin/commit.c:773 +msgid "could not read MERGE_MSG" +msgstr "ไธ่ฝ่ฎๅ MERGE_MSG" + +#: builtin/commit.c:833 +msgid "could not write commit template" +msgstr "ไธ่ฝๅฏซๆไบค็ฏๆฌ" + +#: builtin/commit.c:853 +msgid "" +"\n" +"It looks like you may be committing a merge.\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" +"and try again.\n" +msgstr "" +"\n" +"ๆจไผผไนๆญฃๅจๆไบคไธๅๅไฝตๆไบคใ\n" +"ๅฆๆ้ฏ่ชค๏ผ่ซๅท่ก\n" +"\tgit update-ref -d MERGE_HEAD\n" +"ๅพ้่ฉฆใ\n" + +#: builtin/commit.c:858 +#| 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" +msgid "" +"\n" +"It looks like you may be committing a cherry-pick.\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"and try again.\n" +msgstr "" +"\n" +"ๆจไผผไนๆญฃๅจๆไบคไธๅๆ้ธๆไบคใ\n" +"ๅฆๆ้ฏ่ชค๏ผ่ซๅท่ก\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"ๅพ้่ฉฆใ\n" + +#: builtin/commit.c:868 +#, 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:876 +#, 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:893 +#, c-format +msgid "%sAuthor: %.*s <%.*s>" +msgstr "%sไฝ่ ๏ผ %.*s <%.*s>" + +# ่ญฏ่ ๏ผ็บไฟ่ญๅจ่ผธๅบไธญๅฐ้ฝ๏ผๆณจๆ่ชฟๆดๅฅไธญ็ฉบๆ ผ๏ผ +#: builtin/commit.c:901 +#, c-format +msgid "%sDate: %s" +msgstr "%sๆฅๆ๏ผ %s" + +# ่ญฏ่ ๏ผ็บไฟ่ญๅจ่ผธๅบไธญๅฐ้ฝ๏ผๆณจๆ่ชฟๆดๅฅไธญ็ฉบๆ ผ๏ผ +#: builtin/commit.c:908 +#, c-format +msgid "%sCommitter: %.*s <%.*s>" +msgstr "%sๆไบค่ ๏ผ%.*s <%.*s>" + +#: builtin/commit.c:926 +msgid "Cannot read index" +msgstr "็กๆณ่ฎๅ็ดขๅผ" + +#: builtin/commit.c:997 +msgid "Error building trees" +msgstr "็กๆณๅปบ็ซๆจน็็ฉไปถ" + +#: builtin/commit.c:1011 builtin/tag.c:276 +#, 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:1331 +#, 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:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "ๆจๆญฃ่ๆผ้ๅฎๅบๅบ็้็จไธญ -- ็กๆณไฟฎ่จใ" + +#: builtin/commit.c:1190 +msgid "Options --squash and --fixup cannot be used together" +msgstr "้ธ้ --squash ๅ --fixup ไธ่ฝๅๆไฝฟ็จ" + +#: builtin/commit.c:1200 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "ๅช่ฝ็จไธๅ -c/-C/-F/--fixup ้ธ้ ใ" + +#: builtin/commit.c:1202 +msgid "Option -m cannot be combined with -c/-C/-F." +msgstr "้ธ้ -m ไธ่ฝๅ -c/-C/-F ๅๆไฝฟ็จใ" + +#: builtin/commit.c:1211 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset-author ๅช่ฝๅ -Cใ-c ๆ --amend ๅๆไฝฟ็จใ" + +#: builtin/commit.c:1229 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "ๅช่ฝ็จไธๅ --include/--only/--all/--interactive/--patch ้ธ้ ใ" + +#: builtin/commit.c:1235 +#, c-format +msgid "paths '%s ...' with -a does not make sense" +msgstr "่ทฏๅพ '%s ...' ๅ -a ้ธ้ ๅๆไฝฟ็จๆฒๆๆ็พฉ" + +#: builtin/commit.c:1366 builtin/commit.c:1527 +msgid "show status concisely" +msgstr "ไปฅ็ฐกๆฝ็ๆ ผๅผ้กฏ็คบ็ๆ " + +#: builtin/commit.c:1368 builtin/commit.c:1529 +msgid "show branch information" +msgstr "้กฏ็คบๅๆฏ่จๆฏ" + +#: builtin/commit.c:1370 +msgid "show stash information" +msgstr "้กฏ็คบๅฒ่ๅ่จๆฏ" + +#: builtin/commit.c:1372 builtin/commit.c:1531 +msgid "compute full ahead/behind values" +msgstr "่จ็ฎๅฎๆด็้ ๅ /่ฝๅพๅผ" + +#: builtin/commit.c:1374 +msgid "version" +msgstr "็ๆฌ" + +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 +msgid "machine-readable output" +msgstr "ๆฉๅจๅฏ่ฎ็่ผธๅบ" + +#: builtin/commit.c:1377 builtin/commit.c:1535 +msgid "show status in long format (default)" +msgstr "ไปฅ้ทๆ ผๅผ้กฏ็คบ็ๆ ๏ผ้ ่จญ๏ผ" + +#: builtin/commit.c:1380 builtin/commit.c:1538 +msgid "terminate entries with NUL" +msgstr "ๆข็ฎไปฅ NUL ๅญๅ ็ตๅฐพ" + +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 +msgid "mode" +msgstr "ๆจกๅผ" + +#: builtin/commit.c:1383 builtin/commit.c:1541 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "้กฏ็คบๆช่ฟฝ่นค็ๆชๆก๏ผใๆจกๅผใ็ๅฏ้ธๅๆธ๏ผallใnormalใnoใ๏ผ้ ่จญ๏ผall๏ผ" + +#: builtin/commit.c:1387 +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" +msgstr "" +"้กฏ็คบๅทฒๅฟฝ็ฅ็ๆชๆก๏ผๅฏ้ธๆจกๅผ๏ผtraditionalใmatchingใnoใ๏ผ้ ่จญ๏ผtraditional๏ผ" + +#: builtin/commit.c:1389 parse-options.h:192 +msgid "when" +msgstr "ไฝๆ" + +#: builtin/commit.c:1390 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" +"ๅฟฝ็ฅๅญๆจก็ต็ๆดๆน๏ผใไฝๆใ็ๅฏ้ธๅๆธ๏ผallใdirtyใuntrackedใ๏ผ้ ่จญ๏ผall๏ผ" + +#: builtin/commit.c:1392 +msgid "list untracked files in columns" +msgstr "ไปฅๅ็ๆนๅผ้กฏ็คบๆช่ฟฝ่นค็ๆชๆก" + +#: builtin/commit.c:1393 +msgid "do not detect renames" +msgstr "ไธๆชขๆธฌ้ๆฐๅฝๅ" + +#: builtin/commit.c:1395 +msgid "detect renames, optionally set similarity index" +msgstr "ๆชขๆธฌ้ๆฐๅฝๅ๏ผๅฏไปฅ่จญๅฎ็ดขๅผ็ธไผผๅบฆ" + +#: builtin/commit.c:1415 +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "ไธๆฏๆดๅทฒๅฟฝ็ฅๅๆช่ฟฝ่นคๆชๆกๅๆธ็็ตๅ" + +#: builtin/commit.c:1497 +msgid "suppress summary after successful commit" +msgstr "ๆไบคๆๅๅพไธ้กฏ็คบๆฆ่ฟฐ่จๆฏ" + +#: builtin/commit.c:1498 +msgid "show diff in commit message template" +msgstr "ๅจๆไบค่ชชๆ็ฏๆฌ่ฃก้กฏ็คบๅทฎ็ฐ" + +#: builtin/commit.c:1500 +msgid "Commit message options" +msgstr "ๆไบค่ชชๆ้ธ้ " + +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 +msgid "read message from file" +msgstr "ๅพๆชๆกไธญ่ฎๅๆไบค่ชชๆ" + +#: builtin/commit.c:1502 +msgid "author" +msgstr "ไฝ่ " + +#: builtin/commit.c:1502 +msgid "override author for commit" +msgstr "ๆไบคๆ่ฆ่ไฝ่ " + +#: builtin/commit.c:1503 builtin/gc.c:539 +msgid "date" +msgstr "ๆฅๆ" + +#: builtin/commit.c:1503 +msgid "override date for commit" +msgstr "ๆไบคๆ่ฆ่ๆฅๆ" + +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 +msgid "commit" +msgstr "ๆไบค" + +#: builtin/commit.c:1505 +msgid "reuse and edit message from specified commit" +msgstr "้็จไธฆ็ทจ่ผฏๆๅฎๆไบค็ๆไบค่ชชๆ" + +#: builtin/commit.c:1506 +msgid "reuse message from specified commit" +msgstr "้็จๆๅฎๆไบค็ๆไบค่ชชๆ" + +#: builtin/commit.c:1507 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "ไฝฟ็จ autosquash ๆ ผๅผ็ๆไบค่ชชๆ็จไปฅไฟฎๆญฃๆๅฎ็ๆไบค" + +#: builtin/commit.c:1508 +msgid "use autosquash formatted message to squash specified commit" +msgstr "ไฝฟ็จ autosquash ๆ ผๅผ็ๆไบค่ชชๆ็จไปฅๅฃ็ธฎ่ณๆๅฎ็ๆไบค" + +#: builtin/commit.c:1509 +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "็พๅจๅฐ่ฉฒๆไบค็ไฝ่ ๆน็บๆ๏ผๅ -C/-c/--amend ๅๆธๅ ฑ็จ๏ผ" + +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 +msgid "add Signed-off-by:" +msgstr "ๆฐๅข Signed-off-by: ็ฐฝๅ" + +#: builtin/commit.c:1511 +msgid "use specified template file" +msgstr "ไฝฟ็จๆๅฎ็็ฏๆฌๆชๆก" + +#: builtin/commit.c:1512 +msgid "force edit of commit" +msgstr "ๅผทๅถ็ทจ่ผฏๆไบค" + +#: builtin/commit.c:1514 +msgid "include status in commit message template" +msgstr "ๅจๆไบค่ชชๆ็ฏๆฌ่ฃกๅ ๅซ็ๆ ่จๆฏ" + +#: builtin/commit.c:1519 +msgid "Commit contents options" +msgstr "ๆไบคๅ งๅฎน้ธ้ " + +#: builtin/commit.c:1520 +msgid "commit all changed files" +msgstr "ๆไบคๆๆๆนๅ็ๆชๆก" + +#: builtin/commit.c:1521 +msgid "add specified files to index for commit" +msgstr "ๆฐๅขๆๅฎ็ๆชๆกๅฐ็ดขๅผๅ็ญๅพ ๆไบค" + +#: builtin/commit.c:1522 +msgid "interactively add files" +msgstr "ไบๅๅผๆฐๅขๆชๆก" + +#: builtin/commit.c:1523 +msgid "interactively add changes" +msgstr "ไบๅๅผๆฐๅข่ฎๆด" + +#: builtin/commit.c:1524 +msgid "commit only specified files" +msgstr "ๅชๆไบคๆๅฎ็ๆชๆก" + +#: builtin/commit.c:1525 +msgid "bypass pre-commit and commit-msg hooks" +msgstr "็น้ pre-commit ๅ commit-msg ๆ้ค" + +#: builtin/commit.c:1526 +msgid "show what would be committed" +msgstr "้กฏ็คบๅฐ่ฆๆไบค็ๅ งๅฎน" + +#: builtin/commit.c:1539 +msgid "amend previous commit" +msgstr "ไฟฎๆนๅ ๅ็ๆไบค" + +#: builtin/commit.c:1540 +msgid "bypass post-rewrite hook" +msgstr "็น้ post-rewrite ๆ้ค" + +#: builtin/commit.c:1547 +msgid "ok to record an empty change" +msgstr "ๅ ่จฑไธๅ็ฉบๆไบค" + +#: builtin/commit.c:1549 +msgid "ok to record a change with an empty message" +msgstr "ๅ ่จฑ็ฉบ็ๆไบค่ชชๆ" + +#: builtin/commit.c:1622 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "ๆๅฃ็ MERGE_HEAD ๆชๆก๏ผ%s๏ผ" + +#: builtin/commit.c:1629 +msgid "could not read MERGE_MODE" +msgstr "ไธ่ฝ่ฎๅ MERGE_MODE" + +#: builtin/commit.c:1650 +#, c-format +msgid "could not read commit message: %s" +msgstr "ไธ่ฝ่ฎๅๆไบค่ชชๆ๏ผ%s" + +#: builtin/commit.c:1657 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "็ตๆญขๆไบคๅ ็บๆไบค่ชชๆ็บ็ฉบใ\n" + +#: builtin/commit.c:1662 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "็ตๆญขๆไบค๏ผๆจๆชๆดๆนไพ่ช็ฏๆฌ็ๆไบค่ชชๆใ\n" + +#: builtin/commit.c:1696 +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/config.c:11 +msgid "git config [<options>]" +msgstr "git config [<้ธ้ >]" + +#: builtin/config.c:107 builtin/env--helper.c:27 +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "็กๆณ่ญๅฅ็ --type ๅๆธ๏ผ%s" + +#: builtin/config.c:119 +msgid "only one type at a time" +msgstr "ไธๆฌกๅช่ฝไธๅ้กๅ" + +#: builtin/config.c:128 +msgid "Config file location" +msgstr "่จญๅฎๆชๆกไฝ็ฝฎ" + +#: builtin/config.c:129 +msgid "use global config file" +msgstr "ไฝฟ็จๅ จๅ่จญๅฎๆชๆก" + +#: builtin/config.c:130 +msgid "use system config file" +msgstr "ไฝฟ็จ็ณป็ตฑ็ด่จญๅฎๆชๆก" + +#: builtin/config.c:131 +msgid "use repository config file" +msgstr "ไฝฟ็จ็ๆฌๅบซ็ด่จญๅฎๆชๆก" + +#: builtin/config.c:132 +msgid "use per-worktree config file" +msgstr "ไฝฟ็จๅทฅไฝๅ็ดๅฅ็่จญๅฎๆชๆก" + +#: builtin/config.c:133 +msgid "use given config file" +msgstr "ไฝฟ็จๆๅฎ็่จญๅฎๆชๆก" + +#: builtin/config.c:134 +msgid "blob-id" +msgstr "่ณๆ็ฉไปถ ID" + +#: builtin/config.c:134 +msgid "read config from given blob object" +msgstr "ๅพๆไพ็่ณๆ็ฉไปถ่ฎๅ่จญๅฎ" + +#: builtin/config.c:135 +msgid "Action" +msgstr "ๅไฝ" + +#: builtin/config.c:136 +msgid "get value: name [value-regex]" +msgstr "ๅๅพๅผ๏ผname [value-regex]" + +#: builtin/config.c:137 +msgid "get all values: key [value-regex]" +msgstr "็ฒๅพๆๆ็ๅผ๏ผkey [value-regex]" + +#: builtin/config.c:138 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "ๆ นๆๆญฃ่ฆ่กจ็คบๅผ็ฒๅพๅผ๏ผname-regex [value-regex]" + +#: builtin/config.c:139 +msgid "get value specific for the URL: section[.var] URL" +msgstr "็ฒๅพ URL ๅๅผ๏ผsection[.var] URL" + +#: builtin/config.c:140 +msgid "replace all matching variables: name value [value_regex]" +msgstr "ๅไปฃๆๆ็ฌฆๅ็่ฎๆธ๏ผname value [value_regex]" + +#: builtin/config.c:141 +msgid "add a new variable: name value" +msgstr "ๆฐๅขไธๅๆฐ็่ฎๆธ๏ผname value" + +#: builtin/config.c:142 +msgid "remove a variable: name [value-regex]" +msgstr "ๅช้คไธๅ่ฎๆธ๏ผname [value-regex]" + +#: builtin/config.c:143 +msgid "remove all matches: name [value-regex]" +msgstr "ๅช้คๆๆ็ฌฆๅ้ ๏ผname [value-regex]" + +#: builtin/config.c:144 +msgid "rename section: old-name new-name" +msgstr "้ๆฐๅฝๅๅฐ็ฏ๏ผold-name new-name" + +#: builtin/config.c:145 +msgid "remove a section: name" +msgstr "ๅช้คไธๅๅฐ็ฏ๏ผname" + +#: builtin/config.c:146 +msgid "list all" +msgstr "ๅ จ้จๅๅบ" + +#: builtin/config.c:147 +msgid "open an editor" +msgstr "้ๅไธๅ็ทจ่ผฏๅจ" + +#: builtin/config.c:148 +msgid "find the color configured: slot [default]" +msgstr "็ฒๅพ่จญๅฎ็้ก่ฒ๏ผ่จญๅฎ [้ ่จญ]" + +#: builtin/config.c:149 +msgid "find the color setting: slot [stdout-is-tty]" +msgstr "็ฒๅพ้ก่ฒ่จญๅฎ๏ผ่จญๅฎ [stdout-is-tty]" + +#: builtin/config.c:150 +msgid "Type" +msgstr "้กๅ" + +#: builtin/config.c:151 builtin/env--helper.c:43 +msgid "value is given this type" +msgstr "ๅๅผ็บ่ฉฒ้กๅ" + +#: builtin/config.c:152 +msgid "value is \"true\" or \"false\"" +msgstr "ๅผๆฏ \"true\" ๆ \"false\"" + +#: builtin/config.c:153 +msgid "value is decimal number" +msgstr "ๅผๆฏๅ้ฒไฝๆธ" + +#: builtin/config.c:154 +msgid "value is --bool or --int" +msgstr "ๅผๆฏ --bool or --int" + +#: builtin/config.c:155 +msgid "value is --bool or string" +msgstr "ๅผๆฏ --bool ๆ string" + +#: builtin/config.c:156 +msgid "value is a path (file or directory name)" +msgstr "ๅผๆฏไธๅ่ทฏๅพ๏ผๆชๆกๆ็ฎ้ๅ๏ผ" + +#: builtin/config.c:157 +msgid "value is an expiry date" +msgstr "ๅผๆฏไธๅๅฐๆๆฅๆ" + +#: builtin/config.c:158 +msgid "Other" +msgstr "ๅ ถๅฎ" + +#: builtin/config.c:159 +msgid "terminate values with NUL byte" +msgstr "็ตๆญขๅผๆฏ NUL ไฝๅ ็ต" + +#: builtin/config.c:160 +msgid "show variable names only" +msgstr "ๅช้กฏ็คบ่ฎๆธๅ" + +#: builtin/config.c:161 +msgid "respect include directives on lookup" +msgstr "ๆฅ่ฉขๆๅ็ ง include ๆไปค้่ฟดๅฐๆพ" + +#: builtin/config.c:162 +msgid "show origin of config (file, standard input, blob, command line)" +msgstr "้กฏ็คบ่จญๅฎ็ไพๆบ๏ผๆชๆกใๆจๆบ่ผธๅ ฅใ่ณๆ็ฉไปถ๏ผๆๆไปคๅ๏ผ" + +#: builtin/config.c:163 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" +"้กฏ็คบ่จญๅฎๆช็ไฝ็จๅ (ๅทฅไฝๅ worktreeใๆฌๆฉ localใๅ จๅ globalใ็ณป็ตฑ systemใๆ" +"ไปค command)" + +#: builtin/config.c:164 builtin/env--helper.c:45 +msgid "value" +msgstr "ๅๅผ" + +#: builtin/config.c:164 +msgid "with --get, use default value when missing entry" +msgstr "ไฝฟ็จ --get ไฝๆชๆๅฎๅๆธๆๆไฝฟ็จ็้ ่จญๅผ" + +#: builtin/config.c:178 +#, c-format +msgid "wrong number of arguments, should be %d" +msgstr "้ฏ่ชค็ๅๆธๅๆธ๏ผๆ่ฉฒ็บ %d ๅ" + +#: builtin/config.c:180 +#, c-format +msgid "wrong number of arguments, should be from %d to %d" +msgstr "้ฏ่ชค็ๅๆธๅๆธ๏ผๆ่ฉฒ็บๅพ %d ๅๅฐ %d ๅ" + +#: builtin/config.c:334 +#, c-format +msgid "invalid key pattern: %s" +msgstr "็กๆ้ตๅๆจกๅผ๏ผ%s" + +#: builtin/config.c:370 +#, c-format +msgid "failed to format default config value: %s" +msgstr "ๆ ผๅผๅ้ ่จญ่จญๅฎๅผๅคฑๆ๏ผ%s" + +#: builtin/config.c:434 +#, c-format +msgid "cannot parse color '%s'" +msgstr "็กๆณ่งฃๆ้ก่ฒ '%s'" + +#: builtin/config.c:476 +msgid "unable to parse default color value" +msgstr "็กๆณ่งฃๆ้ ่จญ้ก่ฒๅผ" + +#: builtin/config.c:529 builtin/config.c:789 +msgid "not in a git directory" +msgstr "ไธๅจ git ็ๆฌๅบซไธญ" + +#: builtin/config.c:532 +msgid "writing to stdin is not supported" +msgstr "ไธๆฏๆดๅฏซๅฐๆจๆบ่ผธๅ ฅ" + +#: builtin/config.c:535 +msgid "writing config blobs is not supported" +msgstr "ไธๆฏๆดๅฏซๅฐ่จญๅฎ่ณๆ็ฉไปถ" + +#: builtin/config.c:620 +#, 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:644 +msgid "only one config file at a time" +msgstr "ไธๆฌกๅช่ฝๆไธๅ่จญๅฎๆชๆก" + +#: builtin/config.c:650 +msgid "--local can only be used inside a git repository" +msgstr "--local ๅช่ฝๅจไธๅ็ๆฌๅบซๅ งไฝฟ็จ" + +#: builtin/config.c:652 +msgid "--blob can only be used inside a git repository" +msgstr "--blob ๅช่ฝๅจไธๅ็ๆฌๅบซๅ งไฝฟ็จ" + +#: builtin/config.c:654 +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree ๅช่ฝๅจ git ็ๆฌๅบซไธญไฝฟ็จ" + +#: builtin/config.c:676 +msgid "$HOME not set" +msgstr "$HOME ๆช่จญๅฎ" + +#: builtin/config.c:700 +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:735 +msgid "--get-color and variable type are incoherent" +msgstr "--get-color ๅ่ฎๆธ้กๅไธ็ธๅฎน" + +#: builtin/config.c:740 +msgid "only one action at a time" +msgstr "ไธๆฌกๅช่ฝๆไธๅๅไฝ" + +#: builtin/config.c:753 +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only ๅ ้ฉ็จๆผ --list ๆ --get-regexp" + +#: builtin/config.c:759 +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:765 +msgid "--default is only applicable to --get" +msgstr "--default ๅ ้ฉ็จๆผ --get" + +#: builtin/config.c:778 +#, c-format +msgid "unable to read config file '%s'" +msgstr "็กๆณ่ฎๅ่จญๅฎๆชๆก '%s'" + +#: builtin/config.c:781 +msgid "error processing config file(s)" +msgstr "่็่จญๅฎๆชๆก็ผ็้ฏ่ชค" + +#: builtin/config.c:791 +msgid "editing stdin is not supported" +msgstr "ไธๆฏๆด็ทจ่ผฏๆจๆบ่ผธๅ ฅ" + +#: builtin/config.c:793 +msgid "editing blobs is not supported" +msgstr "ไธๆฏๆด็ทจ่ผฏ่ณๆ็ฉไปถ" + +#: builtin/config.c:807 +#, c-format +msgid "cannot create configuration file %s" +msgstr "ไธ่ฝๅปบ็ซ่จญๅฎๆชๆก %s" + +#: builtin/config.c:820 +#, 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:894 builtin/config.c:905 +#, 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/credential-cache--daemon.c:226 +#, 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" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "้ค้ฏ่จๆฏ่ผธๅบๅฐๆจๆบ้ฏ่ชค" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "credential-cache--daemon ็กๆณไฝฟ็จ๏ผ็ผบๅฐ unix socket ๆฏๆด" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache ็กๆณไฝฟ็จ๏ผ็ผบๅฐ unix socket ๆฏๆด" + +#: 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:63 +msgid "head" +msgstr "HEAD" + +#: builtin/describe.c:63 +msgid "lightweight" +msgstr "่ผ้็ด็" + +#: builtin/describe.c:63 +msgid "annotated" +msgstr "้่จป็" + +#: builtin/describe.c:277 +#, c-format +msgid "annotated tag %s not available" +msgstr "้่จปๆจ็ฑค %s ็กๆ" + +#: builtin/describe.c:281 +#, c-format +msgid "tag '%s' is externally known as '%s'" +msgstr "ใ%sใๆจ็ฑคๅจๅค้จ่ขซ่ช็บๆฏใ%sใ" + +#: builtin/describe.c:328 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "ๆฒๆๆจ็ฑคๆบ็ขบ็ฌฆๅ '%s'" + +#: builtin/describe.c:330 +#, c-format +msgid "No exact match on refs or tags, searching to describe\n" +msgstr "ๆฒๆ็ฒพ็ขบ็ฌฆๅๅฐๅผ็จๆๆจ็ฑค๏ผ็นผ็บๆๅฐ้ฒ่กๆ่ฟฐ\n" + +#: builtin/describe.c:397 +#, c-format +msgid "finished search at %s\n" +msgstr "ๅฎๆๆๅฐ %s\n" + +#: builtin/describe.c:424 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" +"ๆฒๆ้่จปๆจ็ฑค่ฝๆ่ฟฐ '%s'ใ\n" +"็ถ่๏ผๅญๅจๆช้่จปๆจ็ฑค๏ผๅ่ฉฆ --tagsใ" + +#: builtin/describe.c:428 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" +"ๆฒๆๆจ็ฑค่ฝๆ่ฟฐ '%s'ใ\n" +"ๅ่ฉฆ --always๏ผๆ่ ๅปบ็ซไธไบๆจ็ฑคใ" + +#: builtin/describe.c:458 +#, c-format +msgid "traversed %lu commits\n" +msgstr "ๅทฒ้ๆญท %lu ๅๆไบค\n" + +#: builtin/describe.c:461 +#, 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:529 +#, c-format +msgid "describe %s\n" +msgstr "ๆ่ฟฐ %s\n" + +#: builtin/describe.c:532 +#, c-format +msgid "Not a valid object name %s" +msgstr "ไธๆฏไธๅๆๆ็็ฉไปถๅ %s" + +#: builtin/describe.c:540 +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "%s ๆขไธๆฏๆไบคไนไธๆฏ่ณๆ็ฉไปถ" + +#: builtin/describe.c:554 +msgid "find the tag that comes after the commit" +msgstr "ๅฐๆพ่ฉฒๆไบคไนๅพ็ๆจ็ฑค" + +#: builtin/describe.c:555 +msgid "debug search strategy on stderr" +msgstr "ๅจๆจๆบ้ฏ่ชคไธ้ค้ฏๆๅฐ็ญ็ฅ" + +#: builtin/describe.c:556 +msgid "use any ref" +msgstr "ไฝฟ็จไปปๆๅผ็จ" + +#: builtin/describe.c:557 +msgid "use any tag, even unannotated" +msgstr "ไฝฟ็จไปปๆๆจ็ฑค๏ผๅณไฝฟๆช้ๅธถๅ่จป" + +#: builtin/describe.c:558 +msgid "always use long format" +msgstr "ๅง็ตไฝฟ็จ้ทๆไบค่ๆ ผๅผ" + +#: builtin/describe.c:559 +msgid "only follow first parent" +msgstr "ๅช่ท้จ็ฌฌไธๅ็ถๆไบค" + +#: builtin/describe.c:562 +msgid "only output exact matches" +msgstr "ๅช่ผธๅบ็ฒพ็ขบ็ฌฆๅ" + +#: builtin/describe.c:564 +msgid "consider <n> most recent tags (default: 10)" +msgstr "่ๆ ฎๆ่ฟ <n> ๅๆจ็ฑค๏ผ้ ่จญ๏ผ10๏ผ" + +#: builtin/describe.c:566 +msgid "only consider tags matching <pattern>" +msgstr "ๅช่ๆ ฎ็ฌฆๅ <ๆจกๅผ> ็ๆจ็ฑค" + +#: builtin/describe.c:568 +msgid "do not consider tags matching <pattern>" +msgstr "ไธ่ๆ ฎ็ฌฆๅ <ๆจกๅผ> ็ๆจ็ฑค" + +#: builtin/describe.c:570 builtin/name-rev.c:535 +msgid "show abbreviated commit object as fallback" +msgstr "้กฏ็คบ็ฐกๅฏซ็ๆไบค่ไฝ็บๅพๅ" + +#: builtin/describe.c:571 builtin/describe.c:574 +msgid "mark" +msgstr "ๆจ่จ" + +#: builtin/describe.c:572 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "ๅฐๆผ้ซๅทฅไฝๅ๏ผ่ฟฝๅ <ๆจ่จ>๏ผ้ ่จญ๏ผ\"-dirty\"๏ผ" + +#: builtin/describe.c:575 +msgid "append <mark> on broken working tree (default: \"-broken\")" +msgstr "ๅฐๆผๆๅฃ็ๅทฅไฝๅ๏ผ่ฟฝๅ <ๆจ่จ>๏ผ้ ่จญ๏ผ\"-broken\"๏ผ" + +#: builtin/describe.c:593 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long ่ --abbrev=0 ไธ็ธๅฎน" + +#: builtin/describe.c:622 +msgid "No names found, cannot describe anything." +msgstr "ๆฒๆ็ผ็พๅ็จฑ๏ผ็กๆณๆ่ฟฐไปปไฝๆฑ่ฅฟใ" + +#: builtin/describe.c:673 +msgid "--dirty is incompatible with commit-ishes" +msgstr "--dirty ่ๆไบค่ไธ็ธๅฎน" + +#: builtin/describe.c:675 +msgid "--broken is incompatible with commit-ishes" +msgstr "--broken ่ๆไบค่ไธ็ธๅฎน" + +#: builtin/diff.c:91 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "'%s'๏ผไธๆฏไธๅๆญฃ่ฆๆชๆกๆ็ฌฆ่้ฃ็ต" + +#: builtin/diff.c:241 +#, c-format +msgid "invalid option: %s" +msgstr "็กๆ้ธ้ ๏ผ%s" + +#: builtin/diff.c:358 +#, c-format +msgid "%s...%s: no merge base" +msgstr "%s...%s: ็กๅไฝตๅบๅบ" + +#: builtin/diff.c:468 +msgid "Not a git repository" +msgstr "ไธๆฏไธๅ git ็ๆฌๅบซ" + +#: builtin/diff.c:513 +#, c-format +msgid "invalid object '%s' given." +msgstr "ๆไพไบ็กๆ็ฉไปถ '%s'ใ" + +#: builtin/diff.c:524 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "ๆไพไบ่ถ ้ๅ ฉๅ่ณๆ็ฉไปถ๏ผ'%s'" + +#: builtin/diff.c:529 +#, c-format +msgid "unhandled object '%s' given." +msgstr "็กๆณ่็็็ฉไปถ '%s'ใ" + +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "%s...%s๏ผๅคๅๅไฝตๅบๅบ๏ผไฝฟ็จ %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:42 builtin/hash-object.c:98 +msgid "type" +msgstr "้กๅ" + +#: builtin/env--helper.c:46 +msgid "default for git_env_*(...) to fall back on" +msgstr "git_env_*(...) ็้ ่จญๅผ" + +#: builtin/env--helper.c:48 +msgid "be quiet only use git_env_*() value as exit code" +msgstr "ๅฎ้ๆจกๅผ๏ผๅชไฝฟ็จ git_env_*() ็ๅผไฝ็บ้ข้็ขผ" + +#: builtin/env--helper.c:67 +#, c-format +msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" +msgstr "้ธ้ `--default' ๅ `type=bool` ๆๆไธๅๅธๆๅผ๏ผไธๆฏ `%s`" + +#: builtin/env--helper.c:82 +#, 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:868 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "้ฏ่ชค๏ผ้ค้ๆๅฎ --mark-tags๏ผๅฆๅ็กๆณๅฏๅบๅตๅฅๆจ็ฑคใ" + +#: builtin/fast-export.c:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "--anonymize-map ็้ตไธ่ฝ็ฉบ็ฝ" + +#: builtin/fast-export.c:1198 +msgid "show progress after <n> objects" +msgstr "ๅจ <n> ๅ็ฉไปถไนๅพ้กฏ็คบ้ฒๅบฆ" + +#: builtin/fast-export.c:1200 +msgid "select handling of signed tags" +msgstr "้ธๆๅฆไฝ่็็ฐฝๅๆจ็ฑค" + +#: builtin/fast-export.c:1203 +msgid "select handling of tags that tag filtered objects" +msgstr "้ธๆ็ถๆจ็ฑคๆๅ่ขซ้ๆฟพ็ฉไปถๆ่ฉฒๆจ็ฑค็่็ๆนๅผ" + +#: builtin/fast-export.c:1206 +msgid "select handling of commit messages in an alternate encoding" +msgstr "้ธๆไฝฟ็จๅ็จ็ทจ็ขผ่็ๆไบค่ชชๆ" + +#: builtin/fast-export.c:1209 +msgid "Dump marks to this file" +msgstr "ๆๆจ่จๅฒๅญๅฐ้ๅๆชๆก" + +#: builtin/fast-export.c:1211 +msgid "Import marks from this file" +msgstr "ๅพ้ๅๆชๆกๅฏๅ ฅๆจ่จ" + +#: builtin/fast-export.c:1215 +msgid "Import marks from this file if it exists" +msgstr "ๅพ่ฉฒๆชๆกๅฏๅ ฅๆจ่จ๏ผๅฆๆๅญๅจ็่ฉฑ๏ผ" + +#: builtin/fast-export.c:1217 +msgid "Fake a tagger when tags lack one" +msgstr "็ถๆจ็ฑค็ผบๅฐๆจ่จ่ ๆฌไฝๆ๏ผๅ่ฃๆไพไธๅ" + +#: builtin/fast-export.c:1219 +msgid "Output full tree for each commit" +msgstr "ๆฏๆฌกๆไบค้ฝ่ผธๅบๆดๅๆจน" + +#: builtin/fast-export.c:1221 +msgid "Use the done feature to terminate the stream" +msgstr "ไฝฟ็จ done ๅ่ฝไพ็ตๆญขๆต" + +#: builtin/fast-export.c:1222 +msgid "Skip output of blob data" +msgstr "่ทณ้่ณๆ็ฉไปถ็่ผธๅบ" + +#: builtin/fast-export.c:1223 builtin/log.c:1811 +msgid "refspec" +msgstr "ๅ็ ง่ฆๆ ผ" + +#: builtin/fast-export.c:1224 +msgid "Apply refspec to exported refs" +msgstr "ๅฐๅฏๅบ็ๅผ็จๆ็จๅผ็จ่ฆๆ ผ" + +#: builtin/fast-export.c:1225 +msgid "anonymize output" +msgstr "ๅฟๅ่ผธๅบ" + +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "from:to" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "ๅจๅฟๅ่ผธๅบไธญๅฐ <from> ่ฝๆ็บ <to>" + +#: builtin/fast-export.c:1230 +msgid "Reference parents which are not in fast-export stream by object id" +msgstr "ๅผ็จ็ถ็ฉไปถ ID ไธๅจ fast-export ๆตไธญ" + +#: builtin/fast-export.c:1232 +msgid "Show original object ids of blobs/commits" +msgstr "้กฏ็คบ่ณๆ็ฉไปถ/ๆไบค็ๅๅง็ฉไปถ ID" + +#: builtin/fast-export.c:1234 +msgid "Label tags with mark ids" +msgstr "ๅฐๅธถๆๆจ่จ ID ็ๆจ็ฑคๅๆจ่จ" + +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "็ผบๅฐ --anonymize ็ --anonymize-map ๆฒๆๆ็พฉ" + +#: builtin/fast-export.c:1272 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "ไธ่ฝๅๆๅณ้ๅๆธ --import-marks ๅ --import-marks-if-exists" + +#: builtin/fast-import.c:3086 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "ใ%sใๅญๆจก็ต็ผบๅฐ from ๆจ่จ" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "ใ%sใๅญๆจก็ต็ผบๅฐ to ๆจ่จ" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "้ ๆ 'mark' ๆไปค๏ผๅพๅฐ %s" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "้ ๆ 'to' ๆไปค๏ผๅพๅฐ %s" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "ๆๆๅญๆจก็ต rewrite ้ธ้ ็ๆ ผๅผๆฏ name:filename" + +#: builtin/fast-import.c:3374 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "ๆฒๆ --allow-unsafe-features ๆ๏ผ็ฆๆญขๅจ่ผธๅ ฅไธญไฝฟ็จ '%s' ๅ่ฝ" + +#: builtin/fetch-pack.c:241 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "ๅทฒๅปบ็ซ้ๅฎๆชๆก๏ผไฝๅฐๆชๅๅ ฑ๏ผ%s" + +#: builtin/fetch.c:35 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<้ธ้ >] [<็ๆฌๅบซ> [<ๅผ็จ่ฆๆ ผ>...]]" + +#: builtin/fetch.c:36 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<้ธ้ >] <็ต>" + +#: builtin/fetch.c:37 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<้ธ้ >] [(<็ๆฌๅบซ> | <็ต>)...]" + +#: builtin/fetch.c:38 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<้ธ้ >]" + +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel ไธ่ฝ็บ่ฒ ๆธ" + +#: builtin/fetch.c:142 builtin/pull.c:185 +msgid "fetch from all remotes" +msgstr "ๅพๆๆ็้ ็ซฏๆๅ" + +#: builtin/fetch.c:144 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "็บ git pull/fetch ่จญๅฎไธๆธธ" + +#: builtin/fetch.c:146 builtin/pull.c:188 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "่ฟฝๅ ๅฐ .git/FETCH_HEAD ่ไธๆฏ่ฆ่ๅฎ" + +#: builtin/fetch.c:148 builtin/pull.c:191 +msgid "path to upload pack on remote end" +msgstr "ไธๅณๅ ๅฐ้ ็ซฏ็่ทฏๅพ" + +#: builtin/fetch.c:149 +msgid "force overwrite of local reference" +msgstr "ๅผทๅถ่ฆ่ๆฌๆฉๅผ็จ" + +#: builtin/fetch.c:151 +msgid "fetch from multiple remotes" +msgstr "ๅพๅคๅ้ ็ซฏๆๅ" + +#: builtin/fetch.c:153 builtin/pull.c:195 +msgid "fetch all tags and associated objects" +msgstr "ๆๅๆๆ็ๆจ็ฑคๅ้่ฏ็ฉไปถ" + +#: builtin/fetch.c:155 +msgid "do not fetch all tags (--no-tags)" +msgstr "ไธๆๅไปปไฝๆจ็ฑค(--no-tags)" + +#: builtin/fetch.c:157 +msgid "number of submodules fetched in parallel" +msgstr "ๅญๆจก็ตๅๅพ็ไธฆ็ผๆธ" + +#: builtin/fetch.c:159 builtin/pull.c:198 +msgid "prune remote-tracking branches no longer on remote" +msgstr "ๆธ ้ค้ ็ซฏๅทฒ็ถไธๅญๅจ็ๅๆฏ็่ฟฝ่นคๅๆฏ" + +#: builtin/fetch.c:161 +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "ๆธ ้ค้ ็ซฏไธๅญๅจ็ๆฌๆฉๆจ็ฑค๏ผไธฆไธๅไปฃ่ฎๆดๆจ็ฑค" + +# ่ญฏ่ ๏ผๅฏ้ธๅผ๏ผไธ่ฝ็ฟป่ญฏ +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 +msgid "on-demand" +msgstr "on-demand" + +#: builtin/fetch.c:163 +msgid "control recursive fetching of submodules" +msgstr "ๆงๅถๅญๆจก็ต็้่ฟดๆๅ" + +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "ๅฐๅๅพ็ๅ่ๅฏซๅ ฅ FETCH_HEAD ๆชๆก" + +#: builtin/fetch.c:169 builtin/pull.c:206 +msgid "keep downloaded pack" +msgstr "ไฟๆไธ่ผๅ " + +#: builtin/fetch.c:171 +msgid "allow updating of HEAD ref" +msgstr "ๅ ่จฑๆดๆฐ HEAD ๅผ็จ" + +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 +msgid "deepen history of shallow clone" +msgstr "ๆทฑๅๆทบ่ค่ฃฝ็ๆญทๅฒ" + +#: builtin/fetch.c:176 builtin/pull.c:212 +msgid "deepen history of shallow repository based on time" +msgstr "ๅบๆผๆ้ไพๆทฑๅๆทบ่ค่ฃฝ็ๆญทๅฒ" + +#: builtin/fetch.c:182 builtin/pull.c:221 +msgid "convert to a complete repository" +msgstr "่ฝๆ็บไธๅๅฎๆด็็ๆฌๅบซ" + +#: builtin/fetch.c:185 +msgid "prepend this to submodule path output" +msgstr "ๅจๅญๆจก็ต่ทฏๅพ่ผธๅบ็ๅ้ขๅ ไธๆญค็ฎ้" + +#: builtin/fetch.c:188 +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "้่ฟดๅๅพๅญๆจก็ต็้ ่จญๅผ๏ผๆฏ่จญๅฎๆชๆกๅชๅ ๅบฆไฝ๏ผ" + +#: builtin/fetch.c:192 builtin/pull.c:224 +msgid "accept refs that update .git/shallow" +msgstr "ๆฅๅๆดๆฐ .git/shallow ็ๅผ็จ" + +#: builtin/fetch.c:193 builtin/pull.c:226 +msgid "refmap" +msgstr "ๅผ็จๆ ๅฐ" + +#: builtin/fetch.c:194 builtin/pull.c:227 +msgid "specify fetch refmap" +msgstr "ๆๅฎๅๅพๅไฝ็ๅผ็จๆ ๅฐ" + +#: builtin/fetch.c:201 builtin/pull.c:240 +msgid "report that we have only objects reachable from this object" +msgstr "ๅ ฑๅๆๅๅชๆๆๅพ่ฉฒ็ฉไปถ้ๅงๅฏไปฅๅๅพ็็ฉไปถ" + +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "ๅๅพ (fetch) ๅพๅท่ก 'maintenance --auto'" + +#: builtin/fetch.c:208 builtin/pull.c:243 +msgid "check for forced-updates on all updated branches" +msgstr "ๅจๆๆๆดๆฐๅๆฏไธๆชขๆฅๅผทๅถๆดๆฐ" + +#: builtin/fetch.c:210 +msgid "write the commit-graph after fetching" +msgstr "ๆๅๅพๅฏซๅ ฅๅๆฏๅ" + +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "ๅพๆจๆบ่ผธๅ ฅไธญๆฅๅๅผ็จ่กจ้ๅผ" + +#: builtin/fetch.c:523 +msgid "Couldn't find remote ref HEAD" +msgstr "็กๆณ็ผ็พ้ ็ซฏ HEAD ๅผ็จ" + +#: builtin/fetch.c:677 +#, c-format +msgid "configuration fetch.output contains invalid value %s" +msgstr "่จญๅฎ่ฎๆธ fetch.output ๅ ๅซ็กๆๅผ %s" + +#: builtin/fetch.c:775 +#, c-format +msgid "object %s not found" +msgstr "็ฉไปถ %s ๆช็ผ็พ" + +#: builtin/fetch.c:779 +msgid "[up to date]" +msgstr "[ๆๆฐ]" + +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 +msgid "[rejected]" +msgstr "[ๅทฒๆ็ต]" + +#: builtin/fetch.c:793 +msgid "can't fetch in current branch" +msgstr "็ฎๅๅๆฏไธไธ่ฝๅท่กๅๅพๅไฝ" + +#: builtin/fetch.c:803 +msgid "[tag update]" +msgstr "[ๆจ็ฑคๆดๆฐ]" + +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 +msgid "unable to update local ref" +msgstr "ไธ่ฝๆดๆฐๆฌๆฉๅผ็จ" + +#: builtin/fetch.c:808 +msgid "would clobber existing tag" +msgstr "ๆ็ ดๅฃ็พๆ็ๆจ็ฑค" + +#: builtin/fetch.c:830 +msgid "[new tag]" +msgstr "[ๆฐๆจ็ฑค]" + +#: builtin/fetch.c:833 +msgid "[new branch]" +msgstr "[ๆฐๅๆฏ]" + +#: builtin/fetch.c:836 +msgid "[new ref]" +msgstr "[ๆฐๅผ็จ]" + +#: builtin/fetch.c:875 +msgid "forced update" +msgstr "ๅผทๅถๆดๆฐ" + +#: builtin/fetch.c:880 +msgid "non-fast-forward" +msgstr "้ๅฟซ่ฝ" + +#: builtin/fetch.c:901 +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:905 +#, 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:939 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s ๆชๅณ้ๆๆๅฟ ้็็ฉไปถ\n" + +#: builtin/fetch.c:960 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" +msgstr "ๆ็ต %s ๅ ็บๆทบ่ค่ฃฝไธๅ ่จฑ่ขซๆดๆฐ" + +#: builtin/fetch.c:1053 builtin/fetch.c:1191 +#, c-format +msgid "From %.*s\n" +msgstr "ไพ่ช %.*s\n" + +#: builtin/fetch.c:1064 +#, 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:1161 +#, c-format +msgid " (%s will become dangling)" +msgstr " ๏ผ%s ๅฐๆ็บๆธ็ฉบ็ๆ ๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: builtin/fetch.c:1162 +#, c-format +msgid " (%s has become dangling)" +msgstr " ๏ผ%s ๅทฒๆ็บๆธ็ฉบ็ๆ ๏ผ" + +#: builtin/fetch.c:1194 +msgid "[deleted]" +msgstr "[ๅทฒๅช้ค]" + +#: builtin/fetch.c:1195 builtin/remote.c:1113 +msgid "(none)" +msgstr "๏ผ็ก๏ผ" + +#: builtin/fetch.c:1218 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "ๆ็ตๅๅพๅฐ้็ด็ๆฌๅบซ็็ฎๅๅๆฏ %s" + +#: builtin/fetch.c:1237 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "้ธ้ \"%s\" ็ๅผ \"%s\" ๅฐๆผ %s ๆฏ็กๆ็" + +#: builtin/fetch.c:1240 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "้ธ้ \"%s\" ็บ %s ๆๅฟฝ็ฅ\n" + +#: builtin/fetch.c:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "ๆชขๆธฌๅฐๅคๅๆฏ๏ผๅ --set-upstream ไธ็ธๅฎน" + +#: builtin/fetch.c:1463 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "ๆฒๆ็บไธๅ้ ็ซฏ่ฟฝ่นคๅๆฏ่จญๅฎไธๆธธ" + +#: builtin/fetch.c:1465 +msgid "not setting upstream for a remote tag" +msgstr "ๆฒๆ็บไธๅ้ ็ซฏๆจ็ฑค่จญๅฎไธๆธธ" + +#: builtin/fetch.c:1467 +msgid "unknown branch type" +msgstr "ๆช็ฅ็ๅๆฏ้กๅ" + +#: builtin/fetch.c:1469 +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:1598 builtin/fetch.c:1661 +#, c-format +msgid "Fetching %s\n" +msgstr "ๆญฃๅจๅๅพ %s\n" + +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 +#, c-format +msgid "Could not fetch %s" +msgstr "ไธ่ฝๅๅพ %s" + +#: builtin/fetch.c:1620 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "็กๆณๅๅพ '%s'๏ผ้ข้็ขผ๏ผ%d๏ผ\n" + +#: builtin/fetch.c:1724 +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:1760 +msgid "You need to specify a tag name." +msgstr "ๆจ้่ฆๆๅฎไธๅๆจ็ฑคๅ็จฑใ" + +#: builtin/fetch.c:1825 +msgid "Negative depth in --deepen is not supported" +msgstr "--deepen ไธๆฏๆด่ฒ ๆธๆทฑๅบฆ" + +#: builtin/fetch.c:1827 +msgid "--deepen and --depth are mutually exclusive" +msgstr "--deepen ๅ --depth ๆฏไบๆฅ็" + +#: builtin/fetch.c:1832 +msgid "--depth and --unshallow cannot be used together" +msgstr "--depth ๅ --unshallow ไธ่ฝๅๆไฝฟ็จ" + +#: builtin/fetch.c:1834 +msgid "--unshallow on a complete repository does not make sense" +msgstr "ๅฐๆผไธๅๅฎๆด็็ๆฌๅบซ๏ผๅๆธ --unshallow ๆฒๆๆ็พฉ" + +#: builtin/fetch.c:1851 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all ไธ่ฝๅธถไธๅ็ๆฌๅบซๅๆธ" + +#: builtin/fetch.c:1853 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all ๅธถๅผ็จ่ฆๆ ผๆฒๆไปปไฝๆ็พฉ" + +#: builtin/fetch.c:1862 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "ๆฒๆ้ๆจฃ็้ ็ซฏๆ้ ็ซฏ็ต๏ผ%s" + +#: builtin/fetch.c:1869 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "ๅๅพ็ตไธฆๆๅฎๅผ็จ่ฆๆ ผๆฒๆๆ็พฉ" + +#: builtin/fetch.c:1887 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialclone" +msgstr "ๅชๅฏไปฅๅฐ --filter ็จๆผๅจ extensions.partialClone ไธญ่จญๅฎ็้ ็ซฏ็ๆฌๅบซ" + +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "--stdin ๅช่ฝๅจๅๅพไธๅ้ ็ซฏๆไฝฟ็จ" + +#: builtin/fmt-merge-msg.c:7 +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:18 +msgid "populate log with at most <n> entries from shortlog" +msgstr "ๅๆไบค่ชชๆไธญๆๅค่ค่ฃฝๆๅฎๆข็ฎ๏ผๅไฝต่ไพ็ๆไบค๏ผ็็ฐก็ญ่ชชๆ" + +#: builtin/fmt-merge-msg.c:21 +msgid "alias for --log (deprecated)" +msgstr "ๅๆธ --log ็ๅฅๅ๏ผๅทฒๆฃ็จ๏ผ" + +#: builtin/fmt-merge-msg.c:24 +msgid "text" +msgstr "ๆๅญ" + +#: builtin/fmt-merge-msg.c:25 +msgid "use <text> as start of message" +msgstr "ไฝฟ็จ <ๆๅญ> ไฝ็บๆไบค่ชชๆ็้ๅง" + +#: builtin/fmt-merge-msg.c:26 +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>]]" +msgid "git for-each-ref [--merged [<commit>]] [--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:440 +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:69 builtin/fsck.c:148 builtin/fsck.c:149 +msgid "unknown" +msgstr "ๆช็ฅ" + +#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> +#: builtin/fsck.c:101 builtin/fsck.c:121 +#, c-format +msgid "error in %s %s: %s" +msgstr "%s %s ้ฏ่ชค๏ผ%s" + +#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> +#: builtin/fsck.c:115 +#, c-format +msgid "warning in %s %s: %s" +msgstr "%s %s ่ญฆๅ๏ผ%s" + +#: builtin/fsck.c:144 builtin/fsck.c:147 +#, c-format +msgid "broken link from %7s %s" +msgstr "ไพ่ช %7s %s ็ๆๅฃ็้ฃ็ต" + +#: builtin/fsck.c:156 +msgid "wrong object type in link" +msgstr "้ฃ็ตไธญ้ฏ่ชค็็ฉไปถ้กๅ" + +#: builtin/fsck.c:172 +#, c-format +msgid "" +"broken link from %7s %s\n" +" to %7s %s" +msgstr "" +"ๆๅฃ็้ฃ็ตไพ่ชๆผ %7s %s\n" +" ๅฐ %7s %s" + +#: builtin/fsck.c:283 +#, c-format +msgid "missing %s %s" +msgstr "็ผบๅฐ %s %s" + +#: builtin/fsck.c:310 +#, c-format +msgid "unreachable %s %s" +msgstr "็กๆณๅๅพ %s %s" + +#: builtin/fsck.c:330 +#, c-format +msgid "dangling %s %s" +msgstr "ๆธ็ฉบ %s %s" + +#: builtin/fsck.c:340 +msgid "could not create lost-found" +msgstr "ไธ่ฝๅปบ็ซ lost-found" + +#: builtin/fsck.c:351 +#, c-format +msgid "could not finish '%s'" +msgstr "ไธ่ฝๅฎๆ '%s'" + +#: builtin/fsck.c:368 +#, c-format +msgid "Checking %s" +msgstr "ๆญฃๅจๆชขๆฅ %s" + +#: builtin/fsck.c:406 +#, c-format +msgid "Checking connectivity (%d objects)" +msgstr "ๆญฃๅจๆชขๆฅ้ฃ้ๆง๏ผ%d ๅ็ฉไปถ๏ผ" + +#: builtin/fsck.c:425 +#, c-format +msgid "Checking %s %s" +msgstr "ๆญฃๅจๆชขๆฅ %s %s" + +#: builtin/fsck.c:430 +msgid "broken links" +msgstr "ๆๅฃ็้ฃ็ต" + +#: builtin/fsck.c:439 +#, c-format +msgid "root %s" +msgstr "ๆ น %s" + +#: builtin/fsck.c:447 +#, c-format +msgid "tagged %s %s (%s) in %s" +msgstr "ๆจ่จ %s %s (%s) ๆผ %s" + +#: builtin/fsck.c:476 +#, c-format +msgid "%s: object corrupt or missing" +msgstr "%s๏ผ็ฉไปถๆๅฃๆ้บๅคฑ" + +#: builtin/fsck.c:501 +#, c-format +msgid "%s: invalid reflog entry %s" +msgstr "%s๏ผ็กๆ็ๅผ็จๆฅ่ชๆข็ฎ %s" + +#: builtin/fsck.c:515 +#, c-format +msgid "Checking reflog %s->%s" +msgstr "ๆญฃๅจๆชขๆฅๅผ็จๆฅ่ช %s->%s" + +#: builtin/fsck.c:549 +#, c-format +msgid "%s: invalid sha1 pointer %s" +msgstr "%s๏ผ็กๆ็ sha1 ๆๆจ %s" + +#: builtin/fsck.c:556 +#, c-format +msgid "%s: not a commit" +msgstr "%s๏ผไธๆฏไธๅๆไบค" + +#: builtin/fsck.c:610 +msgid "notice: No default references" +msgstr "ๆณจๆ๏ผ็ก้ ่จญๅผ็จ" + +#: builtin/fsck.c:625 +#, c-format +msgid "%s: object corrupt or missing: %s" +msgstr "%s๏ผ็ฉไปถๆๅฃๆ้บๅคฑ๏ผ%s" + +#: builtin/fsck.c:638 +#, c-format +msgid "%s: object could not be parsed: %s" +msgstr "%s๏ผไธ่ฝ่งฃๆ็ฉไปถ๏ผ%s" + +#: builtin/fsck.c:658 +#, c-format +msgid "bad sha1 file: %s" +msgstr "ๅฃ็ sha1 ๆชๆก๏ผ%s" + +#: builtin/fsck.c:673 +msgid "Checking object directory" +msgstr "ๆญฃๅจๆชขๆฅ็ฉไปถ็ฎ้" + +#: builtin/fsck.c:676 +msgid "Checking object directories" +msgstr "ๆญฃๅจๆชขๆฅ็ฉไปถ็ฎ้" + +#: builtin/fsck.c:691 +#, c-format +msgid "Checking %s link" +msgstr "ๆญฃๅจๆชขๆฅ %s ้ฃ็ต" + +#: builtin/fsck.c:696 builtin/index-pack.c:865 +#, c-format +msgid "invalid %s" +msgstr "็กๆ็ %s" + +#: builtin/fsck.c:703 +#, c-format +msgid "%s points to something strange (%s)" +msgstr "%s ๆๅๅฅๆช็ๆฑ่ฅฟ๏ผ%s๏ผ" + +#: builtin/fsck.c:709 +#, c-format +msgid "%s: detached HEAD points at nothing" +msgstr "%s๏ผๅ้ข้้ ญๆๆจ็ๆๅไธๅญๅจ" + +#: builtin/fsck.c:713 +#, c-format +msgid "notice: %s points to an unborn branch (%s)" +msgstr "ๆณจๆ๏ผ%s ๆๅไธๅๅฐๆช่ช็็ๅๆฏ๏ผ%s๏ผ" + +#: builtin/fsck.c:725 +msgid "Checking cache tree" +msgstr "ๆญฃๅจๆชขๆฅๅฟซๅๆจน" + +#: builtin/fsck.c:730 +#, c-format +msgid "%s: invalid sha1 pointer in cache-tree" +msgstr "%s๏ผcache-tree ไธญ็กๆ็ sha1 ๆๆจ" + +#: builtin/fsck.c:739 +msgid "non-tree in cache-tree" +msgstr "cache-tree ไธญ้ๆจน็็ฉไปถ" + +#: builtin/fsck.c:770 +msgid "git fsck [<options>] [<object>...]" +msgstr "git fsck [<้ธ้ >] [<็ฉไปถ>...]" + +#: builtin/fsck.c:776 +msgid "show unreachable objects" +msgstr "้กฏ็คบ็กๆณๅๅพ็็ฉไปถ" + +#: builtin/fsck.c:777 +msgid "show dangling objects" +msgstr "้กฏ็คบๆธ็ฉบ็็ฉไปถ" + +#: builtin/fsck.c:778 +msgid "report tags" +msgstr "ๅ ฑๅๆจ็ฑค" + +#: builtin/fsck.c:779 +msgid "report root nodes" +msgstr "ๅ ฑๅๆ น็ฏ้ป" + +#: builtin/fsck.c:780 +msgid "make index objects head nodes" +msgstr "ๅฐ็ดขๅผไบฆไฝ็บๆชขๆฅ็้ ญ็ฏ้ป" + +#: builtin/fsck.c:781 +msgid "make reflogs head nodes (default)" +msgstr "ๅฐๅผ็จๆฅ่ชไฝ็บๆชขๆฅ็้ ญ็ฏ้ป๏ผ้ ่จญ๏ผ" + +#: builtin/fsck.c:782 +msgid "also consider packs and alternate objects" +msgstr "ไน่ๆ ฎๅ ๅๅ็จ็ฉไปถ" + +#: builtin/fsck.c:783 +msgid "check only connectivity" +msgstr "ๅ ๆชขๆฅ้ฃ้ๆง" + +#: builtin/fsck.c:784 +msgid "enable more strict checking" +msgstr "ๅ็จๆดๅดๆ ผ็ๆชขๆฅ" + +#: builtin/fsck.c:786 +msgid "write dangling objects in .git/lost-found" +msgstr "ๅฐๆธ็ฉบ็ฉไปถๅฏซๅ ฅ .git/lost-found ไธญ" + +#: builtin/fsck.c:787 builtin/prune.c:134 +msgid "show progress" +msgstr "้กฏ็คบ้ฒๅบฆ" + +#: builtin/fsck.c:788 +msgid "show verbose names for reachable objects" +msgstr "้กฏ็คบๅฏไปฅๅๅพ็ฉไปถ็่ฉณ็ดฐๅ็จฑ" + +#: builtin/fsck.c:847 builtin/index-pack.c:261 +msgid "Checking objects" +msgstr "ๆญฃๅจๆชขๆฅ็ฉไปถ" + +#: builtin/fsck.c:875 +#, c-format +msgid "%s: object missing" +msgstr "%s๏ผ็ฉไปถ็ผบๅฐ" + +#: builtin/fsck.c:886 +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "็กๆ็ๅๆธ๏ผๆๆ sha1๏ผๅพๅฐ '%s'" + +#: builtin/gc.c:36 +msgid "git gc [<options>]" +msgstr "git gc [<้ธ้ >]" + +#: builtin/gc.c:91 +#, c-format +msgid "Failed to fstat %s: %s" +msgstr "ๅฐ %s ๅผๅซ fstat ๅคฑๆ๏ผ%s" + +#: builtin/gc.c:127 +#, c-format +msgid "failed to parse '%s' value '%s'" +msgstr "็กๆณ่งฃๆ '%s' ๅผ '%s'" + +#: builtin/gc.c:476 builtin/init-db.c:58 +#, c-format +msgid "cannot stat '%s'" +msgstr "ไธ่ฝๅฐ '%s' ๅผๅซ stat" + +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 +#, c-format +msgid "cannot read '%s'" +msgstr "ไธ่ฝ่ฎๅ '%s'" + +#: builtin/gc.c:492 +#, 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:540 +msgid "prune unreferenced objects" +msgstr "ๆธ ้คๆชๅผ็จ็็ฉไปถ" + +#: builtin/gc.c:542 +msgid "be more thorough (increased runtime)" +msgstr "ๆดๅพนๅบ๏ผๅขๅ ๅท่กๆ้๏ผ" + +#: builtin/gc.c:543 +msgid "enable auto-gc mode" +msgstr "ๅ็จ่ชๅๅๅพๅๆถๆจกๅผ" + +#: builtin/gc.c:546 +msgid "force running gc even if there may be another gc running" +msgstr "ๅผทๅถๅท่ก gc ๅณไฝฟๅฆๅคไธๅ gc ๆญฃๅจๅท่ก" + +#: builtin/gc.c:549 +msgid "repack all other packs except the largest pack" +msgstr "้คไบๆๅคง็ๅ ไนๅค๏ผๅฐๆๆๅ ถๅฎๅ ๆชๆก้ๆฐๆๅ " + +#: builtin/gc.c:566 +#, c-format +msgid "failed to parse gc.logexpiry value %s" +msgstr "่งฃๆ gc.logexpiry ็ๅผ %s ๅคฑๆ" + +#: builtin/gc.c:577 +#, c-format +msgid "failed to parse prune expiry value %s" +msgstr "่งฃๆๆธ ้คๆ้ๅผ %s ๅคฑๆ" + +#: builtin/gc.c:597 +#, c-format +msgid "Auto packing the repository in background for optimum performance.\n" +msgstr "่ชๅๅจๅพๅฐๅท่ก็ๆฌๅบซๆๅ ไปฅๆฑๆไฝณๆง่ฝใ\n" + +#: builtin/gc.c:599 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "่ชๅๆๅ ็ๆฌๅบซไปฅๆฑๆไฝณๆง่ฝใ\n" + +#: builtin/gc.c:600 +#, c-format +msgid "See \"git help gc\" for manual housekeeping.\n" +msgstr "ๆๅ็ถญ่ญทๅ่ฆ \"git help gc\"ใ\n" + +#: 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:695 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "ๆๅคชๅค็กๆณๅๅพ็้ฌๆฃ็ฉไปถ๏ผๅท่ก 'git prune' ๅช้คๅฎๅใ" + +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<ไฝๆฅญ>]" + +#: builtin/gc.c:812 +msgid "failed to write commit-graph" +msgstr "็กๆณๅฏซๅ ฅๆไบคๅๅฝข" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "ๅทฒๅญๅจ '%s' ้ๅฎๆชๆก๏ผ็ฅ้็ถญ่ญท" + +#: builtin/gc.c:932 +#, c-format +msgid "task '%s' failed" +msgstr "ไฝๆฅญ '%s' ๅคฑๆ" + +#: builtin/gc.c:979 +#, c-format +msgid "'%s' is not a valid task" +msgstr "'%s' ้ๆๆไฝๆฅญ" + +#: builtin/gc.c:984 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "ไธ่ฝๅคๆฌก้ธๅ '%s' ไฝๆฅญ" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "ๅบๆผ็ๆฌๅบซ็ๆ ๅท่กไฝๆฅญ" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "ไธ่ฆๅจ stderr ่ผธๅบ้ฒๅบฆๆๅ ถไป่ณ่จ" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "ไฝๆฅญ" + +#: builtin/gc.c:1003 +msgid "run a specific task" +msgstr "ๅท่กๆๅฎไฝๆฅญ" + +#: builtin/gc.c:1026 +#| msgid "git notes prune [<options>]" +msgid "git maintenance run [<options>]" +msgstr "git maintenance run [<้ธ้ >]" + +#: builtin/gc.c:1037 +#, c-format +msgid "invalid subcommand: %s" +msgstr "็กๆๅญๅฝไปค๏ผ%s" + +#: 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:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "ๆฒๆๅท่ก็ทๆฏๆด๏ผๅฟฝ็ฅ %s" + +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 +#, c-format +msgid "unable to read tree (%s)" +msgstr "็กๆณ่ฎๅๆจน๏ผ%s๏ผ" + +#: builtin/grep.c:655 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "็กๆณๆๅไพ่ชๆผ %s ้กๅ็็ฉไปถ" + +#: builtin/grep.c:725 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "้้ `%c' ๆๆไธๅๆธๅญๅผ" + +#: builtin/grep.c:824 +msgid "search in index instead of in the work tree" +msgstr "ๅจ็ดขๅผๅๆๅฐ่ไธๆฏๅจๅทฅไฝๅ" + +#: builtin/grep.c:826 +msgid "find in contents not managed by git" +msgstr "ๅจๆช่ขซ git ็ฎก็็ๅ งๅฎนไธญๅฐๆพ" + +# ่ญฏ่ ๏ผไธญๆๅญไธฒๆผๆฅ๏ผๅฏๅช้คๅๅฐ็ฉบๆ ผ +#: builtin/grep.c:828 +msgid "search in both tracked and untracked files" +msgstr "ๅจ่ฟฝ่นคๅๆช่ฟฝ่นค็ๆชๆกไธญๆๅฐ" + +#: builtin/grep.c:830 +msgid "ignore files specified via '.gitignore'" +msgstr "ๅฟฝ็ฅ '.gitignore' ๅ ๅซ็ๆชๆก" + +#: builtin/grep.c:832 +msgid "recursively search in each submodule" +msgstr "ๅจๆฏไธๅๅญๆจก็ตไธญ้่ฟดๆๅฐ" + +#: builtin/grep.c:835 +msgid "show non-matching lines" +msgstr "้กฏ็คบๆช็ฌฆๅ็่ก" + +#: builtin/grep.c:837 +msgid "case insensitive matching" +msgstr "ไธๅๅๅคงๅฐๅฏซ็ฌฆๅ" + +#: builtin/grep.c:839 +msgid "match patterns only at word boundaries" +msgstr "ๅชๅจๅฎ่ฉ้็็ฌฆๅๆจกๅผ" + +#: builtin/grep.c:841 +msgid "process binary files as text" +msgstr "ๆไบ้ฒไฝๆชๆก็ถๅๆๅญ่็" + +#: builtin/grep.c:843 +msgid "don't match patterns in binary files" +msgstr "ไธๅจไบ้ฒไฝๆชๆกไธญ็ฌฆๅๆจกๅผ" + +#: builtin/grep.c:846 +msgid "process binary files with textconv filters" +msgstr "็จ textconv ้ๆฟพๅจ่็ไบ้ฒไฝๆชๆก" + +#: builtin/grep.c:848 +msgid "search in subdirectories (default)" +msgstr "ๅจๅญ็ฎ้ไธญๅฐๆพ๏ผ้ ่จญ๏ผ" + +#: builtin/grep.c:850 +msgid "descend at most <depth> levels" +msgstr "ๆๅคไปฅๆๅฎ็ๆทฑๅบฆๅไธๅฐๆพ" + +#: builtin/grep.c:854 +msgid "use extended POSIX regular expressions" +msgstr "ไฝฟ็จๆดๅฑ็ POSIX ๆญฃ่ฆ่กจ็คบๅผ" + +#: builtin/grep.c:857 +msgid "use basic POSIX regular expressions (default)" +msgstr "ไฝฟ็จๅบๆฌ็ POSIX ๆญฃ่ฆ่กจ็คบๅผ๏ผ้ ่จญ๏ผ" + +#: builtin/grep.c:860 +msgid "interpret patterns as fixed strings" +msgstr "ๆๆจกๅผ่งฃๆ็บๅบๅฎ็ๅญไธฒ" + +#: builtin/grep.c:863 +msgid "use Perl-compatible regular expressions" +msgstr "ไฝฟ็จ Perl ็ธๅฎน็ๆญฃ่ฆ่กจ็คบๅผ" + +#: builtin/grep.c:866 +msgid "show line numbers" +msgstr "้กฏ็คบ่ก่" + +#: builtin/grep.c:867 +msgid "show column number of first match" +msgstr "้กฏ็คบ็ฌฌไธๅ็ฌฆๅ็ๅ่" + +#: builtin/grep.c:868 +msgid "don't show filenames" +msgstr "ไธ้กฏ็คบๆชๆกๅ" + +#: builtin/grep.c:869 +msgid "show filenames" +msgstr "้กฏ็คบๆชๆกๅ" + +#: builtin/grep.c:871 +msgid "show filenames relative to top directory" +msgstr "้กฏ็คบ็ธๅฐๆผ้ ็ด็ฎ้็ๆชๆกๅ" + +#: builtin/grep.c:873 +msgid "show only filenames instead of matching lines" +msgstr "ๅช้กฏ็คบๆชๆกๅ่ไธ้กฏ็คบ็ฌฆๅ็่ก" + +#: builtin/grep.c:875 +msgid "synonym for --files-with-matches" +msgstr "ๅ --files-with-matches ๅ็พฉ" + +#: builtin/grep.c:878 +msgid "show only the names of files without match" +msgstr "ๅช้กฏ็คบๆช็ฌฆๅ็ๆชๆกๅ" + +#: builtin/grep.c:880 +msgid "print NUL after filenames" +msgstr "ๅจๆชๆกๅๅพ่ผธๅบ NUL ๅญๅ " + +#: builtin/grep.c:883 +msgid "show only matching parts of a line" +msgstr "ๅช้กฏ็คบ่กไธญ็็ฌฆๅ็้จๅ" + +#: builtin/grep.c:885 +msgid "show the number of matches instead of matching lines" +msgstr "้กฏ็คบ็ธฝ็ฌฆๅ่กๆธ๏ผ่ไธ้กฏ็คบ็ฌฆๅ็่ก" + +#: builtin/grep.c:886 +msgid "highlight matches" +msgstr "้ซไบฎ้กฏ็คบ็ฌฆๅ้ " + +#: builtin/grep.c:888 +msgid "print empty line between matches from different files" +msgstr "ๅจไธๅๆชๆก็็ฌฆๅ้ ไน้ๅๅฐ็ฉบ่ก" + +#: builtin/grep.c:890 +msgid "show filename only once above matches from same file" +msgstr "ๅชๅจๅไธๆชๆก็็ฌฆๅ้ ็ไธ้ข้กฏ็คบไธๆฌกๆชๆกๅ" + +#: builtin/grep.c:893 +msgid "show <n> context lines before and after matches" +msgstr "้กฏ็คบ็ฌฆๅ้ ๅๅพ็ <n> ่กไธไธๆ" + +#: builtin/grep.c:896 +msgid "show <n> context lines before matches" +msgstr "้กฏ็คบ็ฌฆๅ้ ๅ <n> ่กไธไธๆ" + +#: builtin/grep.c:898 +msgid "show <n> context lines after matches" +msgstr "้กฏ็คบ็ฌฆๅ้ ๅพ <n> ่กไธไธๆ" + +#: builtin/grep.c:900 +msgid "use <n> worker threads" +msgstr "ไฝฟ็จ <n> ๅๅทฅไฝๅท่ก็ท" + +#: builtin/grep.c:901 +msgid "shortcut for -C NUM" +msgstr "ๅฟซๆท้ต -C ๆธๅญ" + +#: builtin/grep.c:904 +msgid "show a line with the function name before matches" +msgstr "ๅจ็ฌฆๅ็ๅ้ข้กฏ็คบไธ่กๅฝๆธๅ" + +#: builtin/grep.c:906 +msgid "show the surrounding function" +msgstr "้กฏ็คบๆๅจๅฝๆธ็ๅๅพๅ งๅฎน" + +#: builtin/grep.c:909 +msgid "read patterns from file" +msgstr "ๅพๆชๆก่ฎๅๆจกๅผ" + +#: builtin/grep.c:911 +msgid "match <pattern>" +msgstr "็ฌฆๅ <ๆจกๅผ>" + +#: builtin/grep.c:913 +msgid "combine patterns specified with -e" +msgstr "็ตๅ็จ -e ๅๆธ่จญๅฎ็ๆจกๅผ" + +#: builtin/grep.c:925 +msgid "indicate hit with exit status without output" +msgstr "ไธ่ผธๅบ๏ผ่็จ้ข้็ขผๆจ่จๅฝไธญ็ๆ " + +#: builtin/grep.c:927 +msgid "show only matches from files that match all patterns" +msgstr "ๅช้กฏ็คบ็ฌฆๅๆๆๆจกๅผ็ๆชๆกไธญ็็ฌฆๅ" + +#: builtin/grep.c:929 +msgid "show parse tree for grep expression" +msgstr "้กฏ็คบ grep ่กจ้ๅผ็่งฃๆๆจน" + +#: builtin/grep.c:933 +msgid "pager" +msgstr "ๅ้ " + +#: builtin/grep.c:933 +msgid "show matching files in the pager" +msgstr "ๅ้ ้กฏ็คบ็ฌฆๅ็ๆชๆก" + +#: builtin/grep.c:937 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "ๅ ่จฑๅผๅซ grep(1)๏ผๆฌๆฌก็ตๅปบๅฟฝ็ฅ๏ผ" + +#: builtin/grep.c:1004 +msgid "no pattern given" +msgstr "ๆชๆไพ็ฌฆๅๆจกๅผ" + +#: builtin/grep.c:1040 +msgid "--no-index or --untracked cannot be used with revs" +msgstr "--no-index ๆ --untracked ไธ่ฝๅ็ๆฌๅๆไฝฟ็จ" + +#: builtin/grep.c:1048 +#, c-format +msgid "unable to resolve revision: %s" +msgstr "ไธ่ฝ่งฃๆ็ๆฌ๏ผ%s" + +#: builtin/grep.c:1078 +msgid "--untracked not supported with --recurse-submodules" +msgstr "--untracked ไธๆฏๆด่ --recurse-submodules ไธ่ตทไฝฟ็จ" + +#: builtin/grep.c:1082 +msgid "invalid option combination, ignoring --threads" +msgstr "็กๆ็้ธ้ ็ตๅ๏ผๅฟฝ็ฅ --threads" + +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 +msgid "no threads support, ignoring --threads" +msgstr "ๆฒๆๅท่ก็ทๆฏๆด๏ผๅฟฝ็ฅ --threads" + +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "ๆๅฎ็ๅท่ก็ทๆธ็กๆ๏ผ%d๏ผ" + +#: builtin/grep.c:1122 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager ๅ ็จๆผๅทฅไฝๅ" + +#: builtin/grep.c:1148 +msgid "--cached or --untracked cannot be used with --no-index" +msgstr "--cached ๆ --untracked ไธ่ฝ่ --no-index ๅๆไฝฟ็จ" + +#: builtin/grep.c:1154 +msgid "--[no-]exclude-standard cannot be used for tracked contents" +msgstr "--[no-]exclude-standard ไธ่ฝ็จๆผๅทฒ่ฟฝ่นคๅ งๅฎน" + +#: builtin/grep.c:1162 +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:47 +msgid "print all available commands" +msgstr "ๅๅฐๆๆๅฏ็จ็ๆไปค" + +#: builtin/help.c:48 +msgid "exclude guides" +msgstr "ๆ้คๅฎๅฐ" + +#: builtin/help.c:49 +msgid "print list of useful guides" +msgstr "้กฏ็คบๆ็จ็ๆๅๅ่กจ" + +#: builtin/help.c:50 +msgid "print all configuration variable names" +msgstr "ๅๅฐๆๆ่จญๅฎ่ฎๆธๅ็จฑ" + +#: builtin/help.c:52 +msgid "show man page" +msgstr "้กฏ็คบ man ๆๅ" + +#: builtin/help.c:53 +msgid "show manual in web browser" +msgstr "ๅจ web ็่ฆฝๅจไธญ้กฏ็คบๆๅ" + +#: builtin/help.c:55 +msgid "show info page" +msgstr "้กฏ็คบ info ๆๅ" + +#: builtin/help.c:57 +msgid "print command description" +msgstr "ๅๅฐๆไปคๆ่ฟฐ" + +#: builtin/help.c:62 +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<ๆไปค>]" + +#: builtin/help.c:163 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "็กๆณ่ญๅฅ็ๅๅฉๆ ผๅผ '%s'" + +#: builtin/help.c:190 +msgid "Failed to start emacsclient." +msgstr "็กๆณๅๅ emacsclientใ" + +#: builtin/help.c:203 +msgid "Failed to parse emacsclient version." +msgstr "็กๆณ่งฃๆ emacsclient ็ๆฌใ" + +#: builtin/help.c:211 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "emacsclient ็ๆฌ '%d' ๅคช่๏ผ< 22๏ผใ" + +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 +#, c-format +msgid "failed to exec '%s'" +msgstr "ๅท่ก '%s' ๅคฑๆ" + +#: builtin/help.c:307 +#, 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:319 +#, 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:436 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "'%s'๏ผๆช็ฅ็ man ๆชข่ฆๅจใ" + +#: builtin/help.c:453 +msgid "no man viewer handled the request" +msgstr "ๆฒๆ man ๆชข่ฆๅจ่็ๆญค่ซๆฑ" + +#: builtin/help.c:461 +msgid "no info viewer handled the request" +msgstr "ๆฒๆ info ๆชข่ฆๅจ่็ๆญค่ซๆฑ" + +#: builtin/help.c:520 builtin/help.c:531 git.c:337 +#, c-format +msgid "'%s' is aliased to '%s'" +msgstr "'%s' ๆฏ '%s' ็ๅฅๅ" + +#: builtin/help.c:534 git.c:369 +#, c-format +msgid "bad alias.%s string: %s" +msgstr "ๅฃ็ alias.%s ๅญไธฒ๏ผ%s" + +#: builtin/help.c:563 builtin/help.c:593 +#, c-format +msgid "usage: %s%s" +msgstr "็จๆณ๏ผ%s%s" + +#: builtin/help.c:577 +msgid "'git help config' for more information" +msgstr "'git help config' ๅๅพๆดๅค่จๆฏ" + +#: builtin/index-pack.c:221 +#, c-format +msgid "object type mismatch at %s" +msgstr "%s ็็ฉไปถ้กๅไธ็ฌฆๅ" + +#: builtin/index-pack.c:241 +#, c-format +msgid "did not receive expected object %s" +msgstr "ๆช่ฝๅๅพ้ ๆ็็ฉไปถ %s" + +#: builtin/index-pack.c:244 +#, c-format +msgid "object %s: expected type %s, found %s" +msgstr "็ฉไปถ %s๏ผๆ็บ้กๅ %s๏ผๅปๆฏ %s" + +#: builtin/index-pack.c:294 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "็กๆณๅกซๅ %d ไฝๅ ็ต" + +#: builtin/index-pack.c:304 +msgid "early EOF" +msgstr "้ๆฉ็ๆชๆก็ตๆ็ฌฆ๏ผEOF๏ผ" + +#: builtin/index-pack.c:305 +msgid "read error on input" +msgstr "่ผธๅ ฅไธ็่ฎ้ฏ่ชค" + +#: builtin/index-pack.c:317 +msgid "used more bytes than were available" +msgstr "็จๆไบ่ถ ้ๅฏ็จ็ไฝๅ ็ต" + +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 +msgid "pack too large for current definition of off_t" +msgstr "ๅ ๅคชๅคง่ถ ้ไบ็ฎๅ off_t ็ๅฎ็พฉ" + +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 +msgid "pack exceeds maximum allowed size" +msgstr "ๅ ่ถ ้ไบๆๅคงๅ ่จฑๅผ" + +#: builtin/index-pack.c:342 builtin/repack.c:254 +#, c-format +msgid "unable to create '%s'" +msgstr "ไธ่ฝๅปบ็ซ '%s'" + +#: builtin/index-pack.c:348 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "็กๆณ้ๅ packfile '%s'" + +#: builtin/index-pack.c:362 +msgid "pack signature mismatch" +msgstr "ๅ ็ฐฝๅไธ็ฌฆๅ" + +#: builtin/index-pack.c:364 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "ไธๆฏๆดๅ ็ๆฌ %<PRIu32>" + +#: builtin/index-pack.c:382 +#, c-format +msgid "pack has bad object at offset %<PRIuMAX>: %s" +msgstr "ๅ ไธญๆ้ฏ่ชค็็ฉไปถไฝๆผไฝ็งป้ %<PRIuMAX>๏ผ%s" + +#: builtin/index-pack.c:488 +#, c-format +msgid "inflate returned %d" +msgstr "่งฃๅฃ็ธฎ่ฟๅ %d" + +#: builtin/index-pack.c:537 +msgid "offset value overflow for delta base object" +msgstr "ไฝ็งปๅผ่ฆ่ไบ delta ๅบๆบ็ฉไปถ" + +#: builtin/index-pack.c:545 +msgid "delta base offset is out of bound" +msgstr "delta ๅบๆบไฝ็งป่ถ็" + +#: builtin/index-pack.c:553 +#, c-format +msgid "unknown object type %d" +msgstr "ๆช็ฅ็ฉไปถ้กๅ %d" + +#: builtin/index-pack.c:584 +msgid "cannot pread pack file" +msgstr "็กๆณ่ฎๅๅ ๆชๆก" + +#: builtin/index-pack.c:586 +#, 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:612 +msgid "serious inflate inconsistency" +msgstr "่งฃๅฃ็ธฎๅด้็ไธไธ่ด" + +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "็ผ็พ %s ๅบ็พ SHA1 ่ก็ช๏ผ" + +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#, c-format +msgid "unable to read %s" +msgstr "ไธ่ฝ่ฎ %s" + +#: builtin/index-pack.c:824 +#, c-format +msgid "cannot read existing object info %s" +msgstr "ไธ่ฝ่ฎๅ็พๅญ็ฉไปถ่จๆฏ %s" + +#: builtin/index-pack.c:832 +#, c-format +msgid "cannot read existing object %s" +msgstr "ไธ่ฝ่ฎๅ็พๅญ็ฉไปถ %s" + +#: builtin/index-pack.c:846 +#, c-format +msgid "invalid blob object %s" +msgstr "็กๆ็่ณๆ็ฉไปถ %s" + +#: builtin/index-pack.c:849 builtin/index-pack.c:868 +msgid "fsck error in packed object" +msgstr "ๅฐๆๅ ็ฉไปถ fsck ๆชขๆฅ็ผ็้ฏ่ชค" + +#: builtin/index-pack.c:870 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "%s ็ๆๆๅญ็ฉไปถไธฆ้้ฝๅฏไปฅๅๅพ" + +#: builtin/index-pack.c:931 builtin/index-pack.c:978 +msgid "failed to apply delta" +msgstr "ๆ็จ delta ๅคฑๆ" + +#: builtin/index-pack.c:1161 +msgid "Receiving objects" +msgstr "ๆฅๆถ็ฉไปถไธญ" + +#: builtin/index-pack.c:1161 +msgid "Indexing objects" +msgstr "็ดขๅผ็ฉไปถไธญ" + +#: builtin/index-pack.c:1195 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "ๅ ่ก็ช๏ผSHA1 ไธ็ฌฆๅ๏ผ" + +#: builtin/index-pack.c:1200 +msgid "cannot fstat packfile" +msgstr "ไธ่ฝๅฐ packfile ๅผๅซ fstat" + +#: builtin/index-pack.c:1203 +msgid "pack has junk at the end" +msgstr "ๅ ็็ตๅฐพๆๅๅพ่ณๆ" + +#: builtin/index-pack.c:1215 +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "parse_pack_objects() ไธญ้ๅฐไธๅฏ็ๅป็ๅ้ก" + +#: builtin/index-pack.c:1238 +msgid "Resolving deltas" +msgstr "่็ delta ไธญ" + +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 +#, c-format +msgid "unable to create thread: %s" +msgstr "ไธ่ฝๅปบ็ซๅท่ก็ท๏ผ%s" + +#: builtin/index-pack.c:1282 +msgid "confusion beyond insanity" +msgstr "ไธๅฏ็ๅป" + +#: builtin/index-pack.c:1288 +#, c-format +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "ๅฎๆ %d ๅๆฌๆฉ็ฉไปถ" + +#: builtin/index-pack.c:1300 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "ๅฐ %s ็ๅฐพ้จ็ธฝๅๆชขๆฅๅบ็พๆๅค๏ผ็ฃ็ขๆๅฃ๏ผ๏ผ" + +#: builtin/index-pack.c:1304 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "ๅ ๆ %d ๅๆช่งฃๆฑบ็ delta" + +#: builtin/index-pack.c:1328 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "ไธ่ฝๅฃ็ธฎ้ๅ ็ฉไปถ๏ผ%d๏ผ" + +#: builtin/index-pack.c:1424 +#, c-format +msgid "local object %s is corrupt" +msgstr "ๆฌๆฉ็ฉไปถ %s ๅทฒๆๅฃ" + +#: builtin/index-pack.c:1444 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "packfile ๅ็จฑ '%s' ๆฒๆไปฅ '.pack' ็ตๅฐพ" + +#: builtin/index-pack.c:1469 +#, c-format +msgid "cannot write %s file '%s'" +msgstr "็กๆณๅฏซๅ ฅ %s ๆชๆก '%s'" + +#: builtin/index-pack.c:1477 +#, c-format +msgid "cannot close written %s file '%s'" +msgstr "็กๆณ้้ๅทฒๅฏซๅ ฅ็ %s ๆชๆก '%s'" + +#: builtin/index-pack.c:1501 +msgid "error while closing pack file" +msgstr "้้ๅ ๆชๆกๆ็ผ็้ฏ่ชค" + +#: builtin/index-pack.c:1515 +msgid "cannot store pack file" +msgstr "็กๆณๅฒๅญๅ ๆชๆก" + +#: builtin/index-pack.c:1523 +msgid "cannot store index file" +msgstr "็กๆณๅฒๅญ็ดขๅผๆชๆก" + +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "ๅฃ็ pack.indexversion=%<PRIu32>" + +#: builtin/index-pack.c:1631 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "็กๆณ้ๅ็พๅญๅ ๆชๆก '%s'" + +#: builtin/index-pack.c:1633 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "็กๆณ็บ %s ้ๅๅ ็ดขๅผๆชๆก" + +#: builtin/index-pack.c:1681 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "้ delta๏ผ%d ๅ็ฉไปถ" + +#: builtin/index-pack.c:1688 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "้้ท = %d: %lu ็ฉไปถ" + +#: builtin/index-pack.c:1728 +msgid "Cannot come back to cwd" +msgstr "็กๆณ่ฟๅ็ฎๅๅทฅไฝ็ฎ้" + +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 +#, c-format +msgid "bad %s" +msgstr "้ฏ่ชค้ธ้ %s" + +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "ๆช็ฅ็ใ%sใ้ๆน็ฎๆณ" + +#: builtin/index-pack.c:1821 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin ไธ่ฝๅ --stdin ๅๆไฝฟ็จ" + +#: builtin/index-pack.c:1823 +msgid "--stdin requires a git repository" +msgstr "--stdin ้่ฆไธๅ git ็ๆฌๅบซ" + +#: builtin/index-pack.c:1825 +msgid "--object-format cannot be used with --stdin" +msgstr "--object-format ไธ่ฝๅ --stdin ๅๆไฝฟ็จ" + +#: builtin/index-pack.c:1831 +msgid "--verify with no packfile name given" +msgstr "--verify ๆฒๆๆไพ packfile ๅ็จฑๅๆธ" + +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 +msgid "fsck error in pack objects" +msgstr "ๅจๆๅ ็ฉไปถไธญ fsck ๆชขๆฅ็ผ็้ฏ่ชค" + +#: builtin/init-db.c:64 +#, c-format +msgid "cannot stat template '%s'" +msgstr "ไธ่ฝๅฐ็ฏๆฌ '%s' ๅผๅซ stat" + +#: builtin/init-db.c:69 +#, c-format +msgid "cannot opendir '%s'" +msgstr "ไธ่ฝ้ๅ็ฎ้ '%s'" + +#: builtin/init-db.c:81 +#, c-format +msgid "cannot readlink '%s'" +msgstr "ไธ่ฝ่ฎๅ้ฃ็ต '%s'" + +#: builtin/init-db.c:83 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "ไธ่ฝ่ช '%s' ๅฐ '%s' ๅปบ็ซ็ฌฆ่้ฃ็ต" + +#: builtin/init-db.c:89 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "ไธ่ฝ่ค่ฃฝ '%s' ่ณ '%s'" + +#: builtin/init-db.c:93 +#, c-format +msgid "ignoring template %s" +msgstr "ๅฟฝ็ฅ็ฏๆฌ %s" + +#: builtin/init-db.c:124 +#, c-format +msgid "templates not found in %s" +msgstr "ๆฒๆๅจ %s ไธญๆพๅฐ็ฏๆฌ" + +#: builtin/init-db.c:139 +#, c-format +msgid "not copying templates from '%s': %s" +msgstr "ๆฒๆๅพ '%s' ่ค่ฃฝ็ฏๆฌ๏ผ%s" + +#: builtin/init-db.c:274 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "็กๆ็ๅๅงๅๆฏๅ็จฑ๏ผ'%s'" + +#: builtin/init-db.c:366 +#, c-format +msgid "unable to handle file type %d" +msgstr "ไธ่ฝ่็ %d ้กๅ็ๆชๆก" + +#: builtin/init-db.c:369 +#, c-format +msgid "unable to move %s to %s" +msgstr "ไธ่ฝ็งปๅ %s ่ณ %s" + +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "ๅ่ฉฆไปฅไธๅ็้ๆนๅผ้ๆฐๅๅงๅ็ๆฌๅบซ" + +#: builtin/init-db.c:409 builtin/init-db.c:412 +#, c-format +msgid "%s already exists" +msgstr "%s ๅทฒ็ถๅญๅจ" + +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: ๅฟฝ็ฅ --initial-branch=%s" + +#: builtin/init-db.c:474 +#, c-format +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "้ๆฐๅๅงๅๅทฒๅญๅจ็ๅ ฑไบซ Git ็ๆฌๅบซๆผ %s%s\n" + +#: builtin/init-db.c:475 +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "้ๆฐๅๅงๅๅทฒๅญๅจ็ Git ็ๆฌๅบซๆผ %s%s\n" + +#: builtin/init-db.c:479 +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "ๅทฒๅๅงๅ็ฉบ็ๅ ฑไบซ Git ็ๆฌๅบซๆผ %s%s\n" + +#: builtin/init-db.c:480 +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "ๅทฒๅๅงๅ็ฉบ็ Git ็ๆฌๅบซๆผ %s%s\n" + +#: builtin/init-db.c:529 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [<directory>]" +msgstr "" +"git init [-q | --quiet] [--bare] [--template=<็ฏๆฌ็ฎ้>] [--shared[=<ๆฌ้>]] " +"[<็ฎ้>]" + +#: builtin/init-db.c:555 +msgid "permissions" +msgstr "ๆฌ้" + +#: builtin/init-db.c:556 +msgid "specify that the git repository is to be shared amongst several users" +msgstr "ๆๅฎ git ็ๆฌๅบซๆฏๅคๅไฝฟ็จ่ ไน้ๅ ฑไบซ็" + +#: builtin/init-db.c:562 +msgid "override the name of the initial branch" +msgstr "่ฆ่ๅๅงๅๆฏ็ๅ็จฑ" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +msgid "hash" +msgstr "้ๆน" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "ๆๅฎ่ฆไฝฟ็จ็้ๆน็ฎๆณ" + +#: builtin/init-db.c:571 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--separate-git-dir ๅ --bare ไบๆฅ" + +#: builtin/init-db.c:600 builtin/init-db.c:605 +#, c-format +msgid "cannot mkdir %s" +msgstr "ไธ่ฝๅปบ็ซ็ฎ้ %s" + +#: builtin/init-db.c:609 builtin/init-db.c:664 +#, c-format +msgid "cannot chdir to %s" +msgstr "ไธ่ฝๅๆ็ฎ้ๅฐ %s" + +#: builtin/init-db.c:636 +#, 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:688 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "ไธ่ฝๅญๅๅทฅไฝๅ '%s'" + +#: builtin/init-db.c:693 +#| msgid "--first-parent is incompatible with --bisect" +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separate-git-dir ่็ด็ๆฌๅบซไธ็ธๅฎน" + +#: 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:177 +msgid "show source" +msgstr "้กฏ็คบๆบ" + +#: builtin/log.c:178 +msgid "Use mail map file" +msgstr "ไฝฟ็จไฟกไปถๆ ๅฐๆชๆก" + +#: builtin/log.c:181 +msgid "only decorate refs that match <pattern>" +msgstr "ๅชไฟฎ้ฃพ่ <ๆจกๅผ> ็ฌฆๅ็ๅผ็จ" + +#: builtin/log.c:183 +msgid "do not decorate refs that match <pattern>" +msgstr "ไธไฟฎ้ฃพๅ <ๆจกๅผ> ็ฌฆๅ็ๅผ็จ" + +#: builtin/log.c:184 +msgid "decorate options" +msgstr "ไฟฎ้ฃพ้ธ้ " + +#: builtin/log.c:187 +msgid "Process line range n,m in file, counting from 1" +msgstr "่็ๆชๆกไธญ็ฌฌ n ๅฐ m ไน้็่ก๏ผๅพ 1 ้ๅง" + +#: builtin/log.c:297 +#, c-format +msgid "Final output: %d %s\n" +msgstr "ๆ็ต่ผธๅบ๏ผ%d %s\n" + +#: builtin/log.c:555 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s: ๆๅฃ็ๆชๆก" + +#: builtin/log.c:570 builtin/log.c:665 +#, c-format +msgid "could not read object %s" +msgstr "ไธ่ฝ่ฎๅ็ฉไปถ %s" + +#: builtin/log.c:690 +#, c-format +msgid "unknown type: %d" +msgstr "ๆช็ฅ้กๅ๏ผ%d" + +#: builtin/log.c:839 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%s๏ผๅพๆ่ฟฐ็ข็้ๅฝ็ๆจกๅผ็กๆ" + +#: builtin/log.c:846 +msgid "format.headers without value" +msgstr "format.headers ๆฒๆๅผ" + +#: builtin/log.c:965 +msgid "name of output directory is too long" +msgstr "่ผธๅบ็ฎ้ๅๅคช้ท" + +#: builtin/log.c:981 +#, c-format +msgid "cannot open patch file %s" +msgstr "็กๆณ้ๅไฟฎ่ฃๆชๆก %s" + +#: builtin/log.c:998 +msgid "need exactly one range" +msgstr "ๅช้่ฆไธๅ็ฏๅ" + +#: builtin/log.c:1008 +msgid "not a range" +msgstr "ไธๆฏไธๅ็ฏๅ" + +#: builtin/log.c:1172 +msgid "cover letter needs email format" +msgstr "้ๅฝ้่ฆไฟกไปถไฝๅๆ ผๅผ" + +#: builtin/log.c:1178 +msgid "failed to create cover-letter file" +msgstr "็กๆณๅปบ็ซ้ๅฝๆชๆก" + +#: builtin/log.c:1259 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "ไธๆญฃๅธธ็ in-reply-to๏ผ%s" + +#: builtin/log.c:1286 +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<้ธ้ >] [<ๅพ> | <็ๆฌ็ฏๅ>]" + +#: builtin/log.c:1344 +msgid "two output directories?" +msgstr "ๅ ฉๅ่ผธๅบ็ฎ้๏ผ" + +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 +#, c-format +msgid "unknown commit %s" +msgstr "ๆช็ฅๆไบค %s" + +#: builtin/log.c:1506 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:1515 +msgid "could not find exact merge base" +msgstr "ไธ่ฝๆพๅฐๆบ็ขบ็ๅไฝตๅบ็ค" + +#: builtin/log.c:1525 +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:1548 +msgid "failed to find exact merge base" +msgstr "็กๆณๆพๅฐๆบ็ขบ็ๅไฝตๅบ็ค" + +#: builtin/log.c:1565 +msgid "base commit should be the ancestor of revision list" +msgstr "ๅบ็คๆไบคๆ่ฉฒๆฏ็ๆฌๅ่กจ็็ฅๅ " + +#: builtin/log.c:1575 +msgid "base commit shouldn't be in revision list" +msgstr "ๅบ็คๆไบคไธๆ่ฉฒๅบ็พๅจ็ๆฌๅ่กจไธญ" + +#: builtin/log.c:1633 +msgid "cannot get patch id" +msgstr "็กๆณๅพๅฐไฟฎ่ฃๆช id" + +#: builtin/log.c:1690 +#, fuzzy +msgid "failed to infer range-diff origin of current series" +msgstr "็กๆณๆจๆท็ฎๅ็ณปๅ็ range-diff ไพๆบ" + +#: builtin/log.c:1692 +#, fuzzy, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "ๅฐ '%s' ็ถไฝ็ฎๅ็ณปๅ็ range-diff ไพๆบ" + +#: builtin/log.c:1736 +msgid "use [PATCH n/m] even with a single patch" +msgstr "ไฝฟ็จ [PATCH n/m]๏ผๅณไฝฟๅชๆไธๅไฟฎ่ฃๆช" + +#: builtin/log.c:1739 +msgid "use [PATCH] even with multiple patches" +msgstr "ไฝฟ็จ [PATCH]๏ผๅณไฝฟๆๅคๅไฟฎ่ฃๆช" + +#: builtin/log.c:1743 +msgid "print patches to standard out" +msgstr "ๅๅฐไฟฎ่ฃๆชๅฐๆจๆบ่ผธๅบ" + +#: builtin/log.c:1745 +msgid "generate a cover letter" +msgstr "็ๆไธๅฐ้ๅฝ" + +#: builtin/log.c:1747 +msgid "use simple number sequence for output file names" +msgstr "ไฝฟ็จ็ฐกๅฎ็ๆธๅญๅบๅไฝ็บ่ผธๅบๆชๆกๅ" + +#: builtin/log.c:1748 +msgid "sfx" +msgstr "ๅพ็ถด" + +#: builtin/log.c:1749 +msgid "use <sfx> instead of '.patch'" +msgstr "ไฝฟ็จ <ๅพ็ถด> ไปฃๆฟ '.patch'" + +#: builtin/log.c:1751 +msgid "start numbering patches at <n> instead of 1" +msgstr "ไฟฎ่ฃๆชไปฅ <n> ้ๅง็ทจ่๏ผ่ไธๆฏ1" + +#: builtin/log.c:1753 +msgid "mark the series as Nth re-roll" +msgstr "ๆจ่จไฟฎ่ฃๆช็ณปๅๆฏ็ฌฌๅนพๆฌก้่ฃฝ" + +#: builtin/log.c:1755 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "ไฝฟ็จ [RFC PATCH] ไปฃๆฟ [PATCH]" + +#: builtin/log.c:1758 +msgid "cover-from-description-mode" +msgstr "ๅพๆ่ฟฐ็ข็้ๅฝ็ๆจกๅผ" + +#: builtin/log.c:1759 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "ๅบๆผๅๆฏๆ่ฟฐ็ข็้จๅ้ๅฝ" + +#: builtin/log.c:1761 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "ไฝฟ็จ [<ๅ็ถด>] ไปฃๆฟ [PATCH]" + +#: builtin/log.c:1764 +msgid "store resulting files in <dir>" +msgstr "ๆ็ตๆๆชๆกๅฒๅญๅจ <็ฎ้>" + +#: builtin/log.c:1767 +msgid "don't strip/add [PATCH]" +msgstr "ไธๅช้ค/ๆฐๅข [PATCH]" + +#: builtin/log.c:1770 +msgid "don't output binary diffs" +msgstr "ไธ่ผธๅบไบ้ฒไฝๅทฎ็ฐ" + +#: builtin/log.c:1772 +msgid "output all-zero hash in From header" +msgstr "ๅจ From ๆจ้ ญ่จๆฏไธญ่ผธๅบๅ จ็บ้ถ็้ๆนๅผ" + +#: builtin/log.c:1774 +msgid "don't include a patch matching a commit upstream" +msgstr "ไธๅ ๅซๅทฒๅจไธๆธธๆไบคไธญ็ไฟฎ่ฃๆช" + +#: builtin/log.c:1776 +msgid "show patch format instead of default (patch + stat)" +msgstr "้กฏ็คบ็ดไฟฎ่ฃๆชๆ ผๅผ่้้ ่จญ็๏ผไฟฎ่ฃๆช+็ๆ ๏ผ" + +#: builtin/log.c:1778 +msgid "Messaging" +msgstr "ไฟกไปถๅณ้" + +#: builtin/log.c:1779 +msgid "header" +msgstr "header" + +#: builtin/log.c:1780 +msgid "add email header" +msgstr "ๆฐๅขไฟกไปถ้ ญ" + +#: builtin/log.c:1781 builtin/log.c:1782 +msgid "email" +msgstr "ไฟกไปถไฝๅ" + +#: builtin/log.c:1781 +msgid "add To: header" +msgstr "ๆฐๅขๆถไปถไบบ" + +#: builtin/log.c:1782 +msgid "add Cc: header" +msgstr "ๆฐๅขๆ้" + +#: builtin/log.c:1783 +msgid "ident" +msgstr "ๆจ่จ" + +#: builtin/log.c:1784 +msgid "set From address to <ident> (or committer ident if absent)" +msgstr "ๅฐ From ไฝๅ่จญๅฎ็บ <ๆจ่จ>๏ผๅฆ่ฅไธๆไพ๏ผๅ็จๆไบค่ ID ๅ็บไฝๅ๏ผ" + +#: builtin/log.c:1786 +msgid "message-id" +msgstr "ไฟกไปถๆจ่จ" + +#: builtin/log.c:1787 +msgid "make first mail a reply to <message-id>" +msgstr "ไฝฟ็ฌฌไธๅฐไฟกไปถไฝ็บๅฐ <ไฟกไปถๆจ่จ> ็ๅ่ฆ" + +#: builtin/log.c:1788 builtin/log.c:1791 +msgid "boundary" +msgstr "้็" + +#: builtin/log.c:1789 +msgid "attach the patch" +msgstr "้ไปถๆนๅผๆฐๅขไฟฎ่ฃๆช" + +#: builtin/log.c:1792 +msgid "inline the patch" +msgstr "ๅ ง่ฏ้กฏ็คบไฟฎ่ฃๆช" + +#: builtin/log.c:1796 +msgid "enable message threading, styles: shallow, deep" +msgstr "ๅ็จไฟกไปถ็ท็ดข๏ผ้ขจๆ ผ๏ผๆทบ๏ผๆทฑ" + +#: builtin/log.c:1798 +msgid "signature" +msgstr "็ฐฝๅ" + +#: builtin/log.c:1799 +msgid "add a signature" +msgstr "ๆฐๅขไธๅ็ฐฝๅ" + +#: builtin/log.c:1800 +msgid "base-commit" +msgstr "ๅบ็คๆไบค" + +#: builtin/log.c:1801 +msgid "add prerequisite tree info to the patch series" +msgstr "็บไฟฎ่ฃๆชๅ่กจๆฐๅขๅ็ฝฎๆจน่จๆฏ" + +#: builtin/log.c:1804 +msgid "add a signature from a file" +msgstr "ๅพๆชๆกๆฐๅขไธๅ็ฐฝๅ" + +#: builtin/log.c:1805 +msgid "don't print the patch filenames" +msgstr "ไธ่ฆๅๅฐไฟฎ่ฃๆชๆชๆกๅ" + +#: builtin/log.c:1807 +msgid "show progress while generating patches" +msgstr "ๅจ็ๆไฟฎ่ฃๆชๆ้กฏ็คบ้ฒๅบฆ" + +#: builtin/log.c:1809 +msgid "show changes against <rev> in cover letter or single patch" +msgstr "ๅจ้ๅฝๆๅฎๅไฟฎ่ฃๆชไธญ้กฏ็คบๅ <rev> ็ๅทฎ็ฐ" + +#: builtin/log.c:1812 +msgid "show changes against <refspec> in cover letter or single patch" +msgstr "ๅจ้ๅฝๆๅฎๅไฟฎ่ฃๆชไธญ้กฏ็คบๅ <refspec> ็ๅทฎ็ฐ" + +#: builtin/log.c:1814 +msgid "percentage by which creation is weighted" +msgstr "ๅปบ็ซๆฌ้็็พๅๆฏ" + +#: builtin/log.c:1896 +#, c-format +msgid "invalid ident line: %s" +msgstr "ๅ ๅซ็กๆ็่บซไปฝๆจ่จ๏ผ%s" + +#: builtin/log.c:1911 +msgid "-n and -k are mutually exclusive" +msgstr "-n ๅ -k ไบๆฅ" + +#: builtin/log.c:1913 +msgid "--subject-prefix/--rfc and -k are mutually exclusive" +msgstr "--subject-prefix/--rfc ๅ -k ไบๆฅ" + +#: builtin/log.c:1921 +msgid "--name-only does not make sense" +msgstr "--name-only ็กๆ็พฉ" + +#: builtin/log.c:1923 +msgid "--name-status does not make sense" +msgstr "--name-status ็กๆ็พฉ" + +#: builtin/log.c:1925 +msgid "--check does not make sense" +msgstr "--check ็กๆ็พฉ" + +#: builtin/log.c:1958 +msgid "standard output, or directory, which one?" +msgstr "ๆจๆบ่ผธๅบๆ็ฎ้๏ผๅชไธๅ๏ผ" + +#: builtin/log.c:2062 +msgid "--interdiff requires --cover-letter or single patch" +msgstr "--interdiff ้่ฆ --cover-letter ๆๅฎไธไฟฎ่ฃๆช" + +#: builtin/log.c:2066 +msgid "Interdiff:" +msgstr "็ๆฌ้ๅทฎ็ฐ๏ผ" + +#: builtin/log.c:2067 +#, c-format +msgid "Interdiff against v%d:" +msgstr "ๅฐ v%d ็็ๆฌๅทฎ็ฐ๏ผ" + +#: builtin/log.c:2073 +msgid "--creation-factor requires --range-diff" +msgstr "--creation-factor ้่ฆ --range-diff" + +#: builtin/log.c:2077 +msgid "--range-diff requires --cover-letter or single patch" +msgstr "--range-diff ้่ฆ --cover-letter ๆๅฎไธไฟฎ่ฃๆช" + +#: builtin/log.c:2085 +msgid "Range-diff:" +msgstr "็ฏๅๅทฎ็ฐ๏ผ" + +#: builtin/log.c:2086 +#, c-format +msgid "Range-diff against v%d:" +msgstr "ๅฐ v%d ็็ฏๅๅทฎ็ฐ๏ผ" + +#: builtin/log.c:2097 +#, c-format +msgid "unable to read signature file '%s'" +msgstr "็กๆณ่ฎๅ็ฐฝๅๆชๆก '%s'" + +#: builtin/log.c:2133 +msgid "Generating patches" +msgstr "็ๆไฟฎ่ฃๆช" + +#: builtin/log.c:2177 +msgid "failed to create output files" +msgstr "็กๆณๅปบ็ซ่ผธๅบๆชๆก" + +#: builtin/log.c:2236 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<ไธๆธธ> [<้ ญ> [<้ๅถ>]]]" + +#: builtin/log.c:2290 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "ไธ่ฝๆพๅฐ่ฟฝ่นค็้ ็ซฏๅๆฏ๏ผ่ซๆๅๆๅฎ <ไธๆธธ>ใ\n" + +#: builtin/ls-files.c:471 +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<้ธ้ >] [<ๆชๆก>...]" + +#: builtin/ls-files.c:527 +msgid "identify the file status with tags" +msgstr "็จๆจ็ฑคๆจ่จๆชๆก็็ๆ " + +#: builtin/ls-files.c:529 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "ไฝฟ็จๅฐๅฏซๅญๆฏ่กจ็คบ 'ๅ่จญๆชๆน่ฎ็' ๆชๆก" + +#: builtin/ls-files.c:531 +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "ไฝฟ็จๅฐๅฏซๅญๆฏ่กจ็คบ 'fsmonitor clean' ๆชๆก" + +#: builtin/ls-files.c:533 +msgid "show cached files in the output (default)" +msgstr "้กฏ็คบๅฟซๅ็ๆชๆก๏ผ้ ่จญ๏ผ" + +#: builtin/ls-files.c:535 +msgid "show deleted files in the output" +msgstr "้กฏ็คบๅทฒๅช้ค็ๆชๆก" + +#: builtin/ls-files.c:537 +msgid "show modified files in the output" +msgstr "้กฏ็คบๅทฒไฟฎๆน็ๆชๆก" + +#: builtin/ls-files.c:539 +msgid "show other files in the output" +msgstr "้กฏ็คบๅ ถๅฎๆชๆก" + +#: builtin/ls-files.c:541 +msgid "show ignored files in the output" +msgstr "้กฏ็คบๅฟฝ็ฅ็ๆชๆก" + +#: builtin/ls-files.c:544 +msgid "show staged contents' object name in the output" +msgstr "้กฏ็คบๆซๅญๅๅ งๅฎน็็ฉไปถๅ็จฑ" + +#: builtin/ls-files.c:546 +msgid "show files on the filesystem that need to be removed" +msgstr "้กฏ็คบๆชๆก็ณป็ตฑ้่ฆๅช้ค็ๆชๆก" + +#: builtin/ls-files.c:548 +msgid "show 'other' directories' names only" +msgstr "ๅช้กฏ็คบใๅ ถไปใ็ฎ้็ๅ็จฑ" + +#: builtin/ls-files.c:550 +msgid "show line endings of files" +msgstr "้กฏ็คบๆชๆกๆ่ก็ฌฆ่ๆ ผๅผ" + +#: builtin/ls-files.c:552 +msgid "don't show empty directories" +msgstr "ไธ้กฏ็คบ็ฉบ็ฎ้" + +#: builtin/ls-files.c:555 +msgid "show unmerged files in the output" +msgstr "้กฏ็คบๆชๅไฝต็ๆชๆก" + +#: builtin/ls-files.c:557 +msgid "show resolve-undo information" +msgstr "้กฏ็คบ resolve-undo ่จๆฏ" + +#: builtin/ls-files.c:559 +msgid "skip files matching pattern" +msgstr "็ฌฆๅๆ้คๆชๆก็ๆจกๅผ" + +#: builtin/ls-files.c:562 +msgid "exclude patterns are read from <file>" +msgstr "ๅพ <ๆชๆก> ไธญ่ฎๅๆ้คๆจกๅผ" + +#: builtin/ls-files.c:565 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "ๅพ <ๆชๆก> ่ฎๅ้กๅค็ๆฏๅ็ฎ้็ๆ้คๆจกๅผ" + +#: builtin/ls-files.c:567 +msgid "add the standard git exclusions" +msgstr "ๆฐๅขๆจๆบ็ git ๆ้ค" + +#: builtin/ls-files.c:571 +msgid "make the output relative to the project top directory" +msgstr "้กฏ็คบ็ธๅฐๆผ้ ็ด็ฎ้็ๆชๆกๅ" + +#: builtin/ls-files.c:574 +msgid "recurse through submodules" +msgstr "ๅจๅญๆจก็ตไธญ้่ฟด" + +#: builtin/ls-files.c:576 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "ๅฆๆไปปไฝ <ๆชๆก> ้ฝไธๅจ็ดขๅผๅ๏ผ่ฆ็บ้ฏ่ชค" + +#: builtin/ls-files.c:577 +msgid "tree-ish" +msgstr "ๆจนๆๆไบค" + +#: builtin/ls-files.c:578 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "ๅ่ฃ่ชๅพ <ๆจนๆๆไบค> ไนๅพๅช้ค็่ทฏๅพไป็ถๅญๅจ" + +#: builtin/ls-files.c:580 +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:1392 +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-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:143 +msgid "output all common ancestors" +msgstr "่ผธๅบๆๆๅ ฑๅ็็ฅๅ " + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "ๅฐๆพไธๅๅค่ทฏๅไฝต็็ฅๅ ๆไบค" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "้กฏ็คบไธ่ฝ่ขซๅ ถไปๅญๅๅฐ็็ๆฌ" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "็ฌฌไธๅๆฏๅ ถไป็็ฅๅ ๆไบคๅ๏ผ" + +#: builtin/merge-base.c:151 +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/merge.c:56 +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<้ธ้ >] [<ๆไบค>...]" + +#: builtin/merge.c:57 +msgid "git merge --abort" +msgstr "git merge --abort" + +#: builtin/merge.c:58 +msgid "git merge --continue" +msgstr "git merge --continue" + +#: builtin/merge.c:120 +msgid "switch `m' requires a value" +msgstr "้้ `m' ้่ฆไธๅๅผ" + +#: builtin/merge.c:143 +#, c-format +msgid "option `%s' requires a value" +msgstr "้ธ้ `%s' ้่ฆไธๅๅผ" + +#: builtin/merge.c:189 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "ไธ่ฝๆพๅฐๅไฝต็ญ็ฅ '%s'ใ\n" + +#: builtin/merge.c:190 +#, c-format +msgid "Available strategies are:" +msgstr "ๅฏ็จ็็ญ็ฅๆ๏ผ" + +#: builtin/merge.c:195 +#, c-format +msgid "Available custom strategies are:" +msgstr "ๅฏ็จ็่ช่จ็ญ็ฅๆ๏ผ" + +#: builtin/merge.c:246 builtin/pull.c:133 +msgid "do not show a diffstat at the end of the merge" +msgstr "ๅจๅไฝต็ๆๅพไธ้กฏ็คบๅทฎ็ฐ็ตฑ่จ" + +#: builtin/merge.c:249 builtin/pull.c:136 +msgid "show a diffstat at the end of the merge" +msgstr "ๅจๅไฝต็ๆๅพ้กฏ็คบๅทฎ็ฐ็ตฑ่จ" + +#: builtin/merge.c:250 builtin/pull.c:139 +msgid "(synonym to --stat)" +msgstr "๏ผๅ --stat ๅ็พฉ๏ผ" + +#: builtin/merge.c:252 builtin/pull.c:142 +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "ๅจๅไฝตๆไบค่จๆฏไธญๆฐๅข๏ผๆๅค <n> ๆข๏ผ็ฒพ็ฐกๆไบค่จ้" + +#: builtin/merge.c:255 builtin/pull.c:148 +msgid "create a single commit instead of doing a merge" +msgstr "ๅปบ็ซไธๅๅฎ็จ็ๆไบค่ไธๆฏๅไธๆฌกๅไฝต" + +#: builtin/merge.c:257 builtin/pull.c:151 +msgid "perform a commit if the merge succeeds (default)" +msgstr "ๅฆๆๅไฝตๆๅ๏ผๅท่กไธๆฌกๆไบค๏ผ้ ่จญ๏ผ" + +#: builtin/merge.c:259 builtin/pull.c:154 +msgid "edit message before committing" +msgstr "ๅจๆไบคๅ็ทจ่ผฏๆไบค่ชชๆ" + +#: builtin/merge.c:261 +msgid "allow fast-forward (default)" +msgstr "ๅ ่จฑๅฟซ่ฝ๏ผ้ ่จญ๏ผ" + +#: builtin/merge.c:263 builtin/pull.c:161 +msgid "abort if fast-forward is not possible" +msgstr "ๅฆๆไธ่ฝๅฟซ่ฝๅฐฑๆพๆฃๅไฝต" + +#: builtin/merge.c:267 builtin/pull.c:164 +msgid "verify that the named commit has a valid GPG signature" +msgstr "้ฉ่ญๆๅฎ็ๆไบคๆฏๅฆๅ ๅซไธๅๆๆ็ GPG ็ฐฝๅ" + +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 +msgid "strategy" +msgstr "็ญ็ฅ" + +#: builtin/merge.c:269 builtin/pull.c:169 +msgid "merge strategy to use" +msgstr "่ฆไฝฟ็จ็ๅไฝต็ญ็ฅ" + +#: builtin/merge.c:270 builtin/pull.c:172 +msgid "option=value" +msgstr "option=value" + +#: builtin/merge.c:271 builtin/pull.c:173 +msgid "option for selected merge strategy" +msgstr "ๆ้ธ็ๅไฝต็ญ็ฅ็้ธ้ " + +#: builtin/merge.c:273 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "ๅไฝต็ๆไบค่ชชๆ๏ผ้ๅฐ้ๅฟซ่ฝๅผๅไฝต๏ผ" + +#: builtin/merge.c:280 +msgid "abort the current in-progress merge" +msgstr "ๆพๆฃ็ฎๅๆญฃๅจ้ฒ่ก็ๅไฝต" + +# +#: builtin/merge.c:282 +msgid "--abort but leave index and working tree alone" +msgstr "--abort๏ผไฝๆฏไฟ็็ดขๅผๅๅทฅไฝๅ" + +#: builtin/merge.c:284 +msgid "continue the current in-progress merge" +msgstr "็นผ็บ็ฎๅๆญฃๅจ้ฒ่ก็ๅไฝต" + +#: builtin/merge.c:286 builtin/pull.c:180 +msgid "allow merging unrelated histories" +msgstr "ๅ ่จฑๅไธฆไธ็ธ้็ๆญทๅฒ" + +#: builtin/merge.c:293 +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "็น้ pre-merge-commit ๅ commit-msg ๆ้ค" + +#: builtin/merge.c:310 +msgid "could not run stash." +msgstr "ไธ่ฝๅท่กๅฒ่ใ" + +#: builtin/merge.c:315 +msgid "stash failed" +msgstr "ๅฒ่ๅคฑๆ" + +#: builtin/merge.c:320 +#, c-format +msgid "not a valid object: %s" +msgstr "ไธๆฏไธๅๆๆ็ฉไปถ๏ผ%s" + +#: builtin/merge.c:342 builtin/merge.c:359 +msgid "read-tree failed" +msgstr "่ฎๅๆจนๅคฑๆ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: builtin/merge.c:389 +msgid " (nothing to squash)" +msgstr " ๏ผ็กๅฏๅฃ็ธฎ๏ผ" + +#: builtin/merge.c:400 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "ๅฃ็ธฎๆไบค -- ๆชๆดๆฐ HEAD\n" + +#: builtin/merge.c:450 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "็กๅไฝต่จๆฏ -- ๆชๆดๆฐ HEAD\n" + +#: builtin/merge.c:501 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "'%s' ๆฒๆๆๅไธๅๆไบค" + +#: builtin/merge.c:588 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "ๅฃ็ branch.%s.mergeoptions ๅญไธฒ๏ผ%s" + +#: builtin/merge.c:713 +msgid "Not handling anything other than two heads merge." +msgstr "ๆช่็ๅ ฉๅ้ ญๅไฝตไนๅค็ไปปไฝๅไฝใ" + +#: builtin/merge.c:726 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "merge-recursive ็ๆช็ฅ้ธ้ ๏ผ-X%s" + +#: builtin/merge.c:741 +#, c-format +msgid "unable to write %s" +msgstr "ไธ่ฝๅฏซ %s" + +#: builtin/merge.c:793 +#, c-format +msgid "Could not read from '%s'" +msgstr "ไธ่ฝๅพ '%s' ่ฎๅ" + +#: builtin/merge.c:802 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "ๆชๆไบคๅไธฆ๏ผไฝฟ็จ 'git commit' ๅฎๆๆญคๆฌกๅไฝตใ\n" + +#: builtin/merge.c:808 +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:813 +msgid "An empty message aborts the commit.\n" +msgstr "็ฉบ็ๆไบค่ชชๆๆ็ตๆญขๆไบคใ\n" + +#: builtin/merge.c:816 +#, 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:869 +msgid "Empty commit message." +msgstr "็ฉบๆไบค่จๆฏใ" + +#: builtin/merge.c:884 +#, c-format +msgid "Wonderful.\n" +msgstr "ๅคชๆฃไบใ\n" + +#: builtin/merge.c:945 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "่ชๅๅไฝตๅคฑๆ๏ผไฟฎๆญฃ่ก็ช็ถๅพๆไบคไฟฎๆญฃ็็ตๆใ\n" + +#: builtin/merge.c:984 +msgid "No current branch." +msgstr "ๆฒๆ็ฎๅๅๆฏใ" + +#: builtin/merge.c:986 +msgid "No remote for the current branch." +msgstr "็ฎๅๅๆฏๆฒๆๅฐๆ็้ ็ซฏ็ๆฌๅบซใ" + +#: builtin/merge.c:988 +msgid "No default upstream defined for the current branch." +msgstr "็ฎๅๅๆฏๆฒๆๅฎ็พฉ้ ่จญ็ไธๆธธๅๆฏใ" + +#: builtin/merge.c:993 +#, c-format +msgid "No remote-tracking branch for %s from %s" +msgstr "ๅฐๆผ %s ๆฒๆไพ่ช %s ็้ ็ซฏ่ฟฝ่นคๅๆฏ" + +#: builtin/merge.c:1050 +#, c-format +msgid "Bad value '%s' in environment '%s'" +msgstr "็ฐๅข '%2$s' ไธญๅญๅจๅฃ็ๅๅผ '%1$s'" + +#: builtin/merge.c:1153 +#, c-format +msgid "not something we can merge in %s: %s" +msgstr "ไธ่ฝๅจ %s ไธญๅไฝต๏ผ%s" + +#: builtin/merge.c:1187 +msgid "not something we can merge" +msgstr "ไธ่ฝๅไฝต" + +#: builtin/merge.c:1291 +msgid "--abort expects no arguments" +msgstr "--abort ไธๅธถๅๆธ" + +#: builtin/merge.c:1295 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "ๆฒๆ่ฆ็ตๆญข็ๅไฝต๏ผMERGE_HEAD ้บๅคฑ๏ผใ" + +#: builtin/merge.c:1313 +msgid "--quit expects no arguments" +msgstr "--quit ไธๅธถๅๆธ" + +#: builtin/merge.c:1326 +msgid "--continue expects no arguments" +msgstr "--continue ไธๅธถๅๆธ" + +#: builtin/merge.c:1330 +msgid "There is no merge in progress (MERGE_HEAD missing)." +msgstr "ๆฒๆ้ฒ่กไธญ็ๅไฝต๏ผMERGE_HEAD ้บๅคฑ๏ผใ" + +#: builtin/merge.c:1346 +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:1353 +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:1356 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "ๆจๅฐๆช็ตๆๆจ็ๆ้ธ๏ผๅญๅจ CHERRY_PICK_HEAD๏ผใ" + +#: builtin/merge.c:1370 +msgid "You cannot combine --squash with --no-ff." +msgstr "ๆจไธ่ฝๅฐ --squash ๅ --no-ff ็ตๅไฝฟ็จใ" + +#: builtin/merge.c:1372 +msgid "You cannot combine --squash with --commit." +msgstr "ๆจไธ่ฝๅฐ --squash ๅ --commit ็ตๅไฝฟ็จใ" + +#: builtin/merge.c:1388 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "ๆชๆๅฎๆไบคไธฆไธ merge.defaultToUpstream ๆช่จญๅฎใ" + +#: builtin/merge.c:1405 +msgid "Squash commit into empty head not supported yet" +msgstr "ๅฐไธๆฏๆดๅฐ็ฉบๅๆฏ็ๅฃ็ธฎๆไบค" + +#: builtin/merge.c:1407 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "ๅฐ็ฉบๅๆฏ็้ๅฟซ่ฝๅผๆไบคๆฒๆๆ็พฉ" + +#: builtin/merge.c:1412 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - ไธ่ฝ่ขซๅไฝต" + +#: builtin/merge.c:1414 +msgid "Can merge only exactly one commit into empty head" +msgstr "ๅช่ฝๅฐไธๅๆไบคๅไธฆๅฐ็ฉบๅๆฏไธ" + +#: builtin/merge.c:1495 +msgid "refusing to merge unrelated histories" +msgstr "ๆ็ตๅไฝต็ก้็ๆญทๅฒ" + +#: builtin/merge.c:1504 +msgid "Already up to date." +msgstr "ๅทฒ็ถๆฏๆๆฐ็ใ" + +#: builtin/merge.c:1514 +#, c-format +msgid "Updating %s..%s\n" +msgstr "ๆดๆฐ %s..%s\n" + +#: builtin/merge.c:1560 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "ๅ่ฉฆ้ๅธธๅฐ็็ดขๅผๅ งๅไฝต...\n" + +#: builtin/merge.c:1567 +#, c-format +msgid "Nope.\n" +msgstr "็กใ\n" + +#: builtin/merge.c:1592 +msgid "Already up to date. Yeeah!" +msgstr "ๅทฒ็ถๆฏๆๆฐ็ใ่ถ๏ผ" + +#: builtin/merge.c:1598 +msgid "Not possible to fast-forward, aborting." +msgstr "็กๆณๅฟซ่ฝ๏ผ็ตๆญขใ" + +#: builtin/merge.c:1626 builtin/merge.c:1691 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "ๅฐๆจนๅๆปพ่ณๅๅง็ๆ ...\n" + +#: builtin/merge.c:1630 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "ๅ่ฉฆๅไฝต็ญ็ฅ %s...\n" + +#: builtin/merge.c:1682 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "ๆฒๆๅไฝต็ญ็ฅ่็ๆญคๅไฝตใ\n" + +#: builtin/merge.c:1684 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "ไฝฟ็จ็ญ็ฅ %s ๅไฝตๅคฑๆใ\n" + +#: builtin/merge.c:1693 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "ไฝฟ็จ %s ไปฅๆบๅๆๅ่งฃๆฑบใ\n" + +#: builtin/merge.c:1707 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "่ชๅๅไฝต้ฒๅฑ้ ๅฉ๏ผๆ่ฆๆฑๅจๆไบคๅๅๆญข\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:25 +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:170 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "็ฎๆจ '%s' ไธๆฏไธๅ็ฎ้" + +#: builtin/mv.c:181 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "ๆชขๆฅ '%s' ๅฐ '%s' ็้ๆฐๅฝๅ\n" + +#: builtin/mv.c:185 +msgid "bad source" +msgstr "ๅฃ็ๆบ" + +#: builtin/mv.c:188 +msgid "can not move directory into itself" +msgstr "ไธ่ฝๅฐ็ฎ้็งปๅๅฐ่ช่บซ" + +#: builtin/mv.c:191 +msgid "cannot move directory over file" +msgstr "ไธ่ฝๅฐ็ฎ้็งปๅๅฐๆชๆก" + +#: builtin/mv.c:200 +msgid "source directory is empty" +msgstr "ๆบ็ฎ้็บ็ฉบ" + +#: builtin/mv.c:225 +msgid "not under version control" +msgstr "ไธๅจ็ๆฌๆงๅถไนไธ" + +#: builtin/mv.c:227 +msgid "conflicted" +msgstr "่ก็ช" + +#: builtin/mv.c:230 +msgid "destination exists" +msgstr "็ฎๆจๅทฒๅญๅจ" + +#: builtin/mv.c:238 +#, c-format +msgid "overwriting '%s'" +msgstr "่ฆ่ '%s'" + +#: builtin/mv.c:241 +msgid "Cannot overwrite" +msgstr "ไธ่ฝ่ฆ่" + +#: builtin/mv.c:244 +msgid "multiple sources for the same target" +msgstr "ๅไธ็ฎๆจๅ ทๆๅคๅๆบ" + +#: builtin/mv.c:246 +msgid "destination directory does not exist" +msgstr "็ฎๆจ็ฎ้ไธๅญๅจ" + +#: builtin/mv.c:253 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s๏ผๆบ=%s๏ผ็ฎๆจ=%s" + +#: builtin/mv.c:274 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "้ๆฐๅฝๅ %s ่ณ %s\n" + +#: builtin/mv.c:280 builtin/remote.c:782 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 ref-based names (no object names)" +msgstr "ๅช่ผธๅบๅบๆผๅ่็ๅ็จฑ (ๆฒๆ็ฉไปถๅ็จฑ)" + +#: 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:533 +#, 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:546 +#, 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:132 builtin/worktree.c:220 +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:1605 +#, c-format +msgid "unknown subcommand: %s" +msgstr "ๆช็ฅๅญๆไปค๏ผ%s" + +#: builtin/pack-objects.c:54 +msgid "" +"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" +msgstr "git pack-objects --stdout [<้ธ้ >...] [< <ๅผ็จๅ่กจ> | < <็ฉไปถๅ่กจ>]" + +#: builtin/pack-objects.c:55 +msgid "" +"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" +msgstr "git pack-objects [<้ธ้ >...] <ๅ็ถดๅ็จฑ> [< <ๅผ็จๅ่กจ> | < <็ฉไปถๅ่กจ>]" + +#: builtin/pack-objects.c:443 +#, c-format +msgid "bad packed object CRC for %s" +msgstr "%s ้ฏ็ๅ ็ฉไปถ CRC" + +#: builtin/pack-objects.c:454 +#, c-format +msgid "corrupt packed object for %s" +msgstr "%s ๆๅฃ็ๅ ็ฉไปถ" + +#: builtin/pack-objects.c:585 +#, c-format +msgid "recursive delta detected for object %s" +msgstr "็ผ็พ็ฉไปถ %s ้่ฟด delta" + +#: builtin/pack-objects.c:796 +#, c-format +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "ๆๅบไบ %u ๅ็ฉไปถ๏ผ้ ๆ %<PRIu32> ๅ" + +#: builtin/pack-objects.c:1004 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "ๅ็จ bitmap ๅฏซๅ ฅ๏ผๅ ็บ pack.packSizeLimit ่จญๅฎไฝฟๅพๅ ่ขซๅๅ็บๅคๅ" + +#: builtin/pack-objects.c:1017 +msgid "Writing objects" +msgstr "ๅฏซๅ ฅ็ฉไปถไธญ" + +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 +#, c-format +msgid "failed to stat %s" +msgstr "ๅฐ %s ๅผๅซ stat ๅคฑๆ" + +#: builtin/pack-objects.c:1131 +#, c-format +msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" +msgstr "ๅฏซๅ ฅ %<PRIu32> ๅ็ฉไปถ่้ ๆ %<PRIu32> ๅ" + +#: builtin/pack-objects.c:1348 +msgid "disabling bitmap writing, as some objects are not being packed" +msgstr "ๅ็จ bitmap ๅฏซๅ ฅ๏ผๅ ็บไธไบ็ฉไปถๅฐไธๆ่ขซๆๅ " + +#: builtin/pack-objects.c:1796 +#, c-format +msgid "delta base offset overflow in pack for %s" +msgstr "%s ๅฃ็ธฎไธญ delta ๅบๆบไฝ็งป่ถ็" + +#: builtin/pack-objects.c:1805 +#, c-format +msgid "delta base offset out of bound for %s" +msgstr "%s ็ delta ๅบๆบไฝ็งป่ถ็" + +#: builtin/pack-objects.c:2086 +msgid "Counting objects" +msgstr "็ฉไปถ่จๆธไธญ" + +#: builtin/pack-objects.c:2231 +#, c-format +msgid "unable to parse object header of %s" +msgstr "็กๆณ่งฃๆ็ฉไปถ %s ๆจ้ ญ่จๆฏ" + +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 +#, c-format +msgid "object %s cannot be read" +msgstr "็ฉไปถ %s ็กๆณ่ฎๅ" + +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 +#, c-format +msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" +msgstr "็ฉไปถ %s ไธไธ่ด็็ฉไปถ้ทๅบฆ๏ผ%<PRIuMAX> vs %<PRIuMAX>๏ผ" + +#: builtin/pack-objects.c:2341 +msgid "suboptimal pack - out of memory" +msgstr "ๆฌกๅช๏ผsuboptimal๏ผๆๅ - ่จๆถ้ซไธ่ถณ" + +#: builtin/pack-objects.c:2656 +#, c-format +msgid "Delta compression using up to %d threads" +msgstr "ไฝฟ็จ %d ๅๅท่ก็ท้ฒ่กๅฃ็ธฎ" + +#: builtin/pack-objects.c:2795 +#, c-format +msgid "unable to pack objects reachable from tag %s" +msgstr "็กๆณ็บๆจ็ฑค %s ๅฃ็ธฎ็ฉไปถ" + +#: builtin/pack-objects.c:2883 +msgid "Compressing objects" +msgstr "ๅฃ็ธฎ็ฉไปถไธญ" + +#: builtin/pack-objects.c:2889 +msgid "inconsistency with delta count" +msgstr "ไธไธ่ด็ๅทฎ็ฐ่จๆธ" + +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" +"uploadpack.blobpackfileuri ็ๅผๆ ผๅผๅฟ ้ ็บ '<object-hash> <pack-hash> " +"<uri>' (ๆถๅฐ '%s')" + +#: builtin/pack-objects.c:2964 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "็ฉไปถๅทฒ็ถๅจๅ ถไป uploadpack.blobpackfileuri ่จญๅฎ้ (ๆถๅฐ '%s')" + +#: builtin/pack-objects.c:2993 +#, c-format +msgid "" +"expected edge object ID, got garbage:\n" +" %s" +msgstr "" +"้ ๆ้็็ฉไปถ๏ผedge object๏ผID๏ผๅปๅพๅฐๅๅพ่ณๆ๏ผ\n" +" %s" + +#: builtin/pack-objects.c:2999 +#, c-format +msgid "" +"expected object ID, got garbage:\n" +" %s" +msgstr "" +"้ ๆ็ฉไปถ ID๏ผๅปๅพๅฐๅๅพ่ณๆ๏ผ\n" +" %s" + +#: builtin/pack-objects.c:3097 +msgid "invalid value for --missing" +msgstr "้ธ้ --missing ็ๅผ็กๆ" + +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 +msgid "cannot open pack index" +msgstr "็กๆณ้ๅๅ ๆชๆก็ดขๅผ" + +#: builtin/pack-objects.c:3187 +#, c-format +msgid "loose object at %s could not be examined" +msgstr "็กๆณๆชขๆฅ %s ่็้ฌๆฃ็ฉไปถ" + +#: builtin/pack-objects.c:3272 +msgid "unable to force loose object" +msgstr "็กๆณๅผทๅถ้ฌๆฃ็ฉไปถ" + +#: builtin/pack-objects.c:3365 +#, c-format +msgid "not a rev '%s'" +msgstr "ไธๆฏไธๅ็ๆฌ '%s'" + +#: builtin/pack-objects.c:3368 +#, c-format +msgid "bad revision '%s'" +msgstr "ๅฃ็็ๆฌ '%s'" + +#: builtin/pack-objects.c:3393 +msgid "unable to add recent objects" +msgstr "็กๆณๆฐๅขๆ่ฟ็็ฉไปถ" + +#: builtin/pack-objects.c:3446 +#, c-format +msgid "unsupported index version %s" +msgstr "ไธๆฏๆด็็ดขๅผ็ๆฌ %s" + +#: builtin/pack-objects.c:3450 +#, c-format +msgid "bad index version '%s'" +msgstr "ๅฃ็็ดขๅผ็ๆฌ '%s'" + +#: builtin/pack-objects.c:3488 +msgid "<version>[,<offset>]" +msgstr "<็ๆฌ>[,<ไฝ็งป>]" + +#: builtin/pack-objects.c:3489 +msgid "write the pack index file in the specified idx format version" +msgstr "็จๆๅฎ็ idx ๆ ผๅผ็ๆฌไพๅฏซๅ ็ดขๅผๆชๆก" + +#: builtin/pack-objects.c:3492 +msgid "maximum size of each output pack file" +msgstr "ๆฏๅ่ผธๅบๅ ็ๆๅคงๅฐบๅฏธ" + +#: builtin/pack-objects.c:3494 +msgid "ignore borrowed objects from alternate object store" +msgstr "ๅฟฝ็ฅๅพๅ็จ็ฉไปถๅฒๅญ่ฃกๅ็จ็ฉไปถ" + +#: builtin/pack-objects.c:3496 +msgid "ignore packed objects" +msgstr "ๅฟฝ็ฅๅ ็ฉไปถ" + +#: builtin/pack-objects.c:3498 +msgid "limit pack window by objects" +msgstr "้ๅถๆๅ ่ฆ็ช็็ฉไปถๆธ" + +#: builtin/pack-objects.c:3500 +msgid "limit pack window by memory in addition to object limit" +msgstr "้ค็ฉไปถๆธ้้ๅถๅค่จญๅฎๆๅ ่ฆ็ช็่จๆถ้ซ้ๅถ" + +#: builtin/pack-objects.c:3502 +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "ๆๅ ๅ ่จฑ็ delta ้็ๆๅคง้ทๅบฆ" + +#: builtin/pack-objects.c:3504 +msgid "reuse existing deltas" +msgstr "้็จๅทฒๅญๅจ็ deltas" + +#: builtin/pack-objects.c:3506 +msgid "reuse existing objects" +msgstr "้็จๅทฒๅญๅจ็็ฉไปถ" + +#: builtin/pack-objects.c:3508 +msgid "use OFS_DELTA objects" +msgstr "ไฝฟ็จ OFS_DELTA ็ฉไปถ" + +#: builtin/pack-objects.c:3510 +msgid "use threads when searching for best delta matches" +msgstr "ไฝฟ็จๅท่ก็ทๆฅ่ฉขๆไฝณ delta ็ฌฆๅ" + +#: builtin/pack-objects.c:3512 +msgid "do not create an empty pack output" +msgstr "ไธๅปบ็ซ็ฉบ็ๅ ่ผธๅบ" + +#: builtin/pack-objects.c:3514 +msgid "read revision arguments from standard input" +msgstr "ๅพๆจๆบ่ผธๅ ฅ่ฎๅ็ๆฌ่ๅๆธ" + +#: builtin/pack-objects.c:3516 +msgid "limit the objects to those that are not yet packed" +msgstr "้ๅถ้ฃไบๅฐๆชๆๅ ็็ฉไปถ" + +#: builtin/pack-objects.c:3519 +msgid "include objects reachable from any reference" +msgstr "ๅ ๆฌๅฏไปฅๅพไปปไฝๅผ็จๅญๅๅฐ็็ฉไปถ" + +#: builtin/pack-objects.c:3522 +msgid "include objects referred by reflog entries" +msgstr "ๅ ๆฌ่ขซๅผ็จๆฅ่ชๅผ็จๅฐ็็ฉไปถ" + +#: builtin/pack-objects.c:3525 +msgid "include objects referred to by the index" +msgstr "ๅ ๆฌ่ขซ็ดขๅผๅผ็จๅฐ็็ฉไปถ" + +#: builtin/pack-objects.c:3528 +msgid "output pack to stdout" +msgstr "่ผธๅบๅ ๅฐๆจๆบ่ผธๅบ" + +#: builtin/pack-objects.c:3530 +msgid "include tag objects that refer to objects to be packed" +msgstr "ๅ ๆฌ้ฃไบๅผ็จไบๅพ ๆๅ ็ฉไปถ็ๆจ็ฑค็ฉไปถ" + +#: builtin/pack-objects.c:3532 +msgid "keep unreachable objects" +msgstr "็ถญๆ็กๆณๅๅพ็็ฉไปถ" + +#: builtin/pack-objects.c:3534 +msgid "pack loose unreachable objects" +msgstr "ๆๅ ้ฌๆฃ็็กๆณๅๅพ็ฉไปถ" + +#: builtin/pack-objects.c:3536 +msgid "unpack unreachable objects newer than <time>" +msgstr "ๅฐๆฏๆไพ <ๆ้> ๆฐ็็กๆณๅญๅ็็ฉไปถ่งฃๅ " + +#: builtin/pack-objects.c:3539 +msgid "use the sparse reachability algorithm" +msgstr "ไฝฟ็จ็จ็ๅฏไปฅๅๅพๆงๆผ็ฎๆณ" + +#: builtin/pack-objects.c:3541 +msgid "create thin packs" +msgstr "ๅปบ็ซ็ฒพ็ฐกๅ " + +#: builtin/pack-objects.c:3543 +msgid "create packs suitable for shallow fetches" +msgstr "ๅปบ็ซ้ฉๅๆทบ่ค่ฃฝ็ๆฌๅบซๅๅพ็ๅ " + +#: builtin/pack-objects.c:3545 +msgid "ignore packs that have companion .keep file" +msgstr "ๅฟฝ็ฅ้ ๆ .keep ๆชๆก็ๅ " + +#: builtin/pack-objects.c:3547 +msgid "ignore this pack" +msgstr "ๅฟฝ็ฅ่ฉฒ pack" + +#: builtin/pack-objects.c:3549 +msgid "pack compression level" +msgstr "ๆๅ ๅฃ็ธฎ็ดๅฅ" + +#: builtin/pack-objects.c:3551 +msgid "do not hide commits by grafts" +msgstr "้กฏ็คบ่ขซ็งปๆค้ฑ่็ๆไบค" + +#: builtin/pack-objects.c:3553 +msgid "use a bitmap index if available to speed up counting objects" +msgstr "ไฝฟ็จ bitmap ็ดขๅผ๏ผๅฆๆๆ็่ฉฑ๏ผไปฅๆ้ซ็ฉไปถ่จๆธๆ็้ๅบฆ" + +#: builtin/pack-objects.c:3555 +msgid "write a bitmap index together with the pack index" +msgstr "ๅจๅปบ็ซๅ ็ดขๅผ็ๅๆๅปบ็ซ bitmap ็ดขๅผ" + +#: builtin/pack-objects.c:3559 +msgid "write a bitmap index if possible" +msgstr "ๅฆๆๅฏ่ฝ๏ผๅฏซ bitmap ็ดขๅผ" + +#: builtin/pack-objects.c:3563 +msgid "handling for missing objects" +msgstr "่็้บๅคฑ็็ฉไปถ" + +#: builtin/pack-objects.c:3566 +msgid "do not pack objects in promisor packfiles" +msgstr "ไธ่ฆๆๅ promisor packfile ไธญ็็ฉไปถ" + +#: builtin/pack-objects.c:3568 +msgid "respect islands during delta compression" +msgstr "ๅจๅข้ๅฃ็ธฎๆๅ่่ณๆๅณถ" + +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "้่จๅๅฎ" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "ๆ้คไปปไฝ่จญๅฎ้๏ผไฝฟ็จๆญค้่จๅๅฎ็ uploadpack.blobpackfileuri" + +#: builtin/pack-objects.c:3600 +#, c-format +msgid "delta chain depth %d is too deep, forcing %d" +msgstr "ๅข้้ๆทฑๅบฆ %d ๅคชๆทฑไบ๏ผๅผทๅถ็บ %d" + +#: builtin/pack-objects.c:3605 +#, c-format +msgid "pack.deltaCacheLimit is too high, forcing %d" +msgstr "่จญๅฎ pack.deltaCacheLimit ๅคช้ซไบ๏ผๅผทๅถ็บ %d" + +#: builtin/pack-objects.c:3659 +msgid "--max-pack-size cannot be used to build a pack for transfer" +msgstr "ไธ่ฝไฝฟ็จ --max-pack-size ไพ็ตๅปบๅณ่ผธ็จ็ๅ ๆชๆก" + +#: builtin/pack-objects.c:3661 +msgid "minimum pack size limit is 1 MiB" +msgstr "ๆๅฐ็ๅ ๆชๆกๅคงๅฐๆฏ 1 MiB" + +#: builtin/pack-objects.c:3666 +msgid "--thin cannot be used to build an indexable pack" +msgstr "--thin ไธ่ฝ็จๆผๅปบ็ซไธๅๅฏ็ดขๅผๅ " + +#: builtin/pack-objects.c:3669 +msgid "--keep-unreachable and --unpack-unreachable are incompatible" +msgstr "--keep-unreachable ๅ --unpack-unreachable ไธ็ธๅฎน" + +#: builtin/pack-objects.c:3675 +msgid "cannot use --filter without --stdout" +msgstr "ไธ่ฝๅจๆฒๆ --stdout ็ๆ ๆณไธไฝฟ็จ --filter" + +#: builtin/pack-objects.c:3735 +msgid "Enumerating objects" +msgstr "ๆ่็ฉไปถ" + +#: builtin/pack-objects.c:3766 +#, 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:6 +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" + +#: builtin/prune.c:14 +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--progress] [--expire <ๆ้>] [--] [<head>...]" + +#: builtin/prune.c:133 +msgid "report pruned objects" +msgstr "ๅ ฑๅๆธ ้ค็็ฉไปถ" + +#: builtin/prune.c:136 +msgid "expire objects older than <time>" +msgstr "ไฝฟๆฉๆผๆไพๆ้็็ฉไปถ้ๆ" + +#: builtin/prune.c:138 +msgid "limit traversal to objects outside promisor packfiles" +msgstr "้ๅถ้ๆญท promisor packfile ไปฅๅค็็ฉไปถ" + +#: builtin/prune.c:152 +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:123 +msgid "control for recursive fetching of submodules" +msgstr "ๆงๅถๅญๆจก็ต็้่ฟดๅๅพ" + +#: builtin/pull.c:127 +msgid "Options related to merging" +msgstr "ๅๅไฝต็ธ้็้ธ้ " + +#: builtin/pull.c:130 +msgid "incorporate changes by rebasing rather than merging" +msgstr "ไฝฟ็จ้ๅฎๅบๅบๅไฝๅไปฃๅไฝตๅไฝไปฅๅฅ็จไฟฎๆน" + +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 +msgid "allow fast-forward" +msgstr "ๅ ่จฑๅฟซ่ฝๅผ" + +#: builtin/pull.c:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" +msgstr "ๅจๅไฝๅๅพๅท่ก่ชๅๅฒ่ๅๅฝๅบๅฒ่" + +#: builtin/pull.c:183 +msgid "Options related to fetching" +msgstr "ๅๅๅพ็ธ้็ๅๆธ" + +#: builtin/pull.c:193 +msgid "force overwrite of local branch" +msgstr "ๅผทๅถ่ฆ่ๆฌๆฉๅๆฏ" + +#: builtin/pull.c:201 +msgid "number of submodules pulled in parallel" +msgstr "ไธฆ็ผๆๅ็ๅญๆจก็ต็ๆธ้" + +#: builtin/pull.c:317 +#, c-format +msgid "Invalid value for pull.ff: %s" +msgstr "pull.ff ็ๅๅผ็กๆ๏ผ%s" + +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"ไธๅปบ่ญฐๅจๅฐๆชๆๅฎๅ้ขๅๆฏ็ๅไฝต็ญ็ฅ็ๆ ๆณไธๆๅใ\n" +"ๆจๅฏไปฅๅจไธไธๆฌกๅผๅซ pull ๅฝไปคๅๅท่กไธ่ฟฐๅฝไปค\n" +"ไปฅ้ฑ่ๆญค่จๆฏ๏ผ\n" +"\n" +" git config pull.rebase false # ๅไฝต๏ผ้ ่จญ็ญ็ฅ๏ผ\n" +" git config pull.rebase true # ้ๅฎๅบๅบ\n" +" git config pull.ff only # ๅชๅฟซ้ฒ\n" +"\n" +"ๆจๅฏไปฅๅฐใgit configใๆนๆใgit config --globalใไปฅ่จญๅฎ\n" +"ๆๆ็ๆฌๅบซ็้ ่จญๅๅฅฝ่จญๅฎใไนๅฏไปฅๆฏๆฌกๅจๅฝไปคๅๅผๅซ\n" +"pull ๅฝไปคๆๅณ้ --rebaseใ--no-rebase ๆ --ff-only ่ฆ่\n" +"่จญๅฎ็้ ่จญๅผใ\n" + +#: builtin/pull.c:458 +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched." +msgstr "ๅจๆจๅๅๅๅพๅฐ็ๅผ็จไธญๆฒๆ้ๅฎๅบๅบๅไฝ็ๅ้ธใ" + +#: builtin/pull.c:460 +msgid "" +"There are no candidates for merging among the refs that you just fetched." +msgstr "ๅจๆจๅๅๅๅพๅฐ็ๅผ็จไธญๆฒๆๅไฝตๅไฝ็ๅ้ธใ" + +#: builtin/pull.c:461 +msgid "" +"Generally this means that you provided a wildcard refspec which had no\n" +"matches on the remote end." +msgstr "้ๅธธ้ๆๅณ่ๆจๆไพไบไธ่ฌ็จๅญๅ ๅผ็จ่ฆๆ ผไฝๆช่ฝๅ้ ็ซฏ็ฌฆๅใ" + +#: builtin/pull.c:464 +#, 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:469 builtin/rebase.c:1240 git-parse-remote.sh:73 +msgid "You are not currently on a branch." +msgstr "ๆจ็ฎๅไธๅจไธๅๅๆฏไธใ" + +#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 +msgid "Please specify which branch you want to rebase against." +msgstr "่ซๆๅฎๆจ่ฆ้ๅฎๅบๅบๅฐๅชไธๅๅๆฏใ" + +#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82 +msgid "Please specify which branch you want to merge with." +msgstr "่ซๆๅฎๆจ่ฆๅไฝตๅชไธๅๅๆฏใ" + +#: builtin/pull.c:474 builtin/pull.c:489 +msgid "See git-pull(1) for details." +msgstr "่ฉณ่ฆ git-pull(1)ใ" + +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<้ ็ซฏ>" + +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<ๅๆฏ>" + +#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 +msgid "There is no tracking information for the current branch." +msgstr "็ฎๅๅๆฏๆฒๆ่ฟฝ่นค่จๆฏใ" + +#: builtin/pull.c:493 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:498 +#, 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:609 +#, c-format +msgid "unable to access commit %s" +msgstr "็กๆณๅญๅๆไบค %s" + +#: builtin/pull.c:894 +msgid "ignoring --verify-signatures for rebase" +msgstr "็บ้ๅฎๅบๅบๅไฝๅฟฝ็ฅ --verify-signatures" + +#: builtin/pull.c:954 +msgid "Updating an unborn branch with changes added to the index." +msgstr "ๆดๆฐๅฐๆช่ช็็ๅๆฏ๏ผ่ฎๆดๆฐๅข่ณ็ดขๅผใ" + +#: builtin/pull.c:958 +msgid "pull with rebase" +msgstr "้ๅฎๅบๅบๅผๆๅ" + +#: builtin/pull.c:959 +msgid "please commit or stash them." +msgstr "่ซๆไบคๆๅฒ่ๅฎๅใ" + +#: builtin/pull.c:984 +#, 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:990 +#, 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:1005 +msgid "Cannot merge multiple branches into empty head." +msgstr "็กๆณๅฐๅคๅๅๆฏๅไฝตๅฐ็ฉบๅๆฏใ" + +#: builtin/pull.c:1009 +msgid "Cannot rebase onto multiple branches." +msgstr "็กๆณ้ๅฎๅบๅบๅฐๅคๅๅๆฏใ" + +#: builtin/pull.c:1017 +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:111 +msgid "tag shorthand without <tag>" +msgstr "ๆจ็ฑคๅพ้ขๆชๆไพ <ๆจ็ฑค> ๅๆธ" + +#: builtin/push.c:119 +msgid "--delete only accepts plain target ref names" +msgstr "--delete ๅชๆฅๅ็ฐกๅฎ็็ฎๆจๅผ็จๅ" + +#: builtin/push.c:164 +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'." +msgstr "" +"\n" +"็บไบๆฐธไน ๅฐ้ธๆไปปไธ้ธ้ ๏ผๅ่ฆ 'git help config' ไธญ็ push.defaultใ" + +#: builtin/push.c:167 +#, 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:182 +#, 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:194 +#, 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:202 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "็ฎๅๅๆฏ %s ๆๅคๅไธๆธธๅๆฏ๏ผๆ็ตๆจ้ใ" + +#: builtin/push.c:205 +#, 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:260 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "ๆจๆฒๆ็บๆจ้ๆๅฎไปปไฝๅผ็จ่ฆๆ ผ๏ผไธฆไธ push.default ็บ \"nothing\"ใ" + +#: builtin/push.c:267 +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:273 +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:279 +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:286 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "ๆดๆฐ่ขซๆ็ต๏ผๅ ็บ่ฉฒๆจ็ฑคๅจ้ ็ซฏๅทฒ็ถๅญๅจใ" + +#: builtin/push.c:289 +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:351 +#, c-format +msgid "Pushing to %s\n" +msgstr "ๆจ้ๅฐ %s\n" + +#: builtin/push.c:358 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "ๆจ้ไธไบๅผ็จๅฐ '%s' ๅคฑๆ" + +#: builtin/push.c:532 +msgid "repository" +msgstr "็ๆฌๅบซ" + +#: builtin/push.c:533 builtin/send-pack.c:183 +msgid "push all refs" +msgstr "ๆจ้ๆๆๅผ็จ" + +#: builtin/push.c:534 builtin/send-pack.c:185 +msgid "mirror all refs" +msgstr "้กๅๆๆๅผ็จ" + +#: builtin/push.c:536 +msgid "delete refs" +msgstr "ๅช้คๅผ็จ" + +#: builtin/push.c:537 +msgid "push tags (can't be used with --all or --mirror)" +msgstr "ๆจ้ๆจ็ฑค๏ผไธ่ฝไฝฟ็จ --all or --mirror๏ผ" + +#: builtin/push.c:540 builtin/send-pack.c:186 +msgid "force updates" +msgstr "ๅผทๅถๆดๆฐ" + +#: builtin/push.c:541 builtin/send-pack.c:198 +msgid "<refname>:<expect>" +msgstr "<ๅผ็จๅ>:<ๆๆๅผ>" + +#: builtin/push.c:542 builtin/send-pack.c:199 +msgid "require old value of ref to be at this value" +msgstr "่ฆๆฑๅผ็จ่็ๅๅผ็บ่จญๅฎๅผ" + +#: builtin/push.c:545 +msgid "control recursive pushing of submodules" +msgstr "ๆงๅถๅญๆจก็ต็้่ฟดๆจ้" + +#: builtin/push.c:546 builtin/send-pack.c:193 +msgid "use thin pack" +msgstr "ไฝฟ็จ็ฒพ็ฐกๆๅ " + +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 +msgid "receive pack program" +msgstr "ๆฅๆถๅ ็จๅผ" + +#: builtin/push.c:549 +msgid "set upstream for git pull/status" +msgstr "่จญๅฎ git pull/status ็ไธๆธธ" + +#: builtin/push.c:552 +msgid "prune locally removed refs" +msgstr "ๆธ ้คๆฌๆฉๅช้ค็ๅผ็จ" + +#: builtin/push.c:554 +msgid "bypass pre-push hook" +msgstr "็น้ pre-push ๆ้ค" + +#: builtin/push.c:555 +msgid "push missing but relevant tags" +msgstr "ๆจ้็ผบๅฐไฝๆ้็ๆจ็ฑค" + +#: builtin/push.c:557 builtin/send-pack.c:187 +msgid "GPG sign the push" +msgstr "็จ GPG ็บๆจ้็ฐฝๅ" + +#: builtin/push.c:559 builtin/send-pack.c:194 +msgid "request atomic transaction on remote side" +msgstr "้่ฆ้ ็ซฏๆฏๆดๅๅญไบๅ" + +#: builtin/push.c:577 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete ่ --allใ--mirror ๅ --tags ไธ็ธๅฎน" + +#: builtin/push.c:579 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete ๆชๆฅไปปไฝๅผ็จๆฒๆๆ็พฉ" + +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "ๅฃ็็ๆฌๅบซ '%s'" + +#: builtin/push.c:600 +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:615 +msgid "--all and --tags are incompatible" +msgstr "--all ๅ --tags ไธ็ธๅฎน" + +#: builtin/push.c:617 +msgid "--all can't be combined with refspecs" +msgstr "--all ไธ่ฝๅๅผ็จ่ฆๆ ผๅๆไฝฟ็จ" + +#: builtin/push.c:621 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror ๅ --tags ไธ็ธๅฎน" + +#: builtin/push.c:623 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror ไธ่ฝๅๅผ็จ่ฆๆ ผๅๆไฝฟ็จ" + +#: builtin/push.c:626 +msgid "--all and --mirror are incompatible" +msgstr "--all ๅ --mirror ไธ็ธๅฎน" + +#: builtin/push.c:630 +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:35 +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:37 +msgid "" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" +msgstr "" +"git rebase [-i] [้ธ้ ] [--exec <ๆไปค>] [--onto <ๆฐๅบ็ค>] --root [<ๅๆฏ>]" + +#: builtin/rebase.c:39 +msgid "git rebase --continue | --abort | --skip | --edit-todo" +msgstr "git rebase --continue | --abort | --skip | --edit-todo" + +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "ไธๅฏ็จ็ๅพ ่พฆๅ่กจ๏ผ'%s'" + +#: builtin/rebase.c:304 +#, c-format +msgid "could not create temporary %s" +msgstr "็กๆณๅปบ็ซๆซๆ็ %s" + +#: builtin/rebase.c:310 +msgid "could not mark as interactive" +msgstr "็กๆณๆจ่จ็บไบๅๅผ" + +#: builtin/rebase.c:364 +msgid "could not generate todo list" +msgstr "็กๆณ็ๆๅพ ่พฆๅ่กจ" + +#: builtin/rebase.c:405 +msgid "a base commit must be provided with --upstream or --onto" +msgstr "ไฝฟ็จ --upstream ๆ --onto ๅฟ ้ ๆไพไธๅๅบ็คๆไบค" + +#: builtin/rebase.c:474 +msgid "git rebase--interactive [<options>]" +msgstr "git rebase--interactive [<้ธ้ >]" + +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" +msgstr "ไฟ็้้ ญๆฏ็ฉบ็ฝ็ๆไบค" + +#: builtin/rebase.c:491 builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "ๅ ่จฑๆไบค่ชชๆ็บ็ฉบ" + +#: builtin/rebase.c:493 +msgid "rebase merge commits" +msgstr "ๅฐๅไฝตๆไบค้ๅฎๅบๅบ" + +#: builtin/rebase.c:495 +msgid "keep original branch points of cousins" +msgstr "ไฟๆๅ ๅผๆไบค็ๅๅงๅๆฏ้ป" + +#: builtin/rebase.c:497 +msgid "move commits that begin with squash!/fixup!" +msgstr "็งปๅไปฅ squash!/fixup! ้้ ญ็ๆไบค" + +#: builtin/rebase.c:498 +msgid "sign commits" +msgstr "็ฐฝๅๆไบค" + +#: builtin/rebase.c:500 builtin/rebase.c:1321 +msgid "display a diffstat of what changed upstream" +msgstr "้กฏ็คบไธๆธธ่ฎๅ็ๅทฎ็ฐ็ตฑ่จ" + +#: builtin/rebase.c:502 +msgid "continue rebase" +msgstr "็นผ็บ้ๅฎๅบๅบ" + +#: builtin/rebase.c:504 +msgid "skip commit" +msgstr "่ทณ้ๆไบค" + +#: builtin/rebase.c:505 +msgid "edit the todo list" +msgstr "้ๅฎๅบๅบๅพ ่พฆๅ่กจ" + +#: builtin/rebase.c:507 +msgid "show the current patch" +msgstr "้กฏ็คบ็ฎๅไฟฎ่ฃๆช" + +#: builtin/rebase.c:510 +msgid "shorten commit ids in the todo list" +msgstr "็ธฎ็ญๅพ ่พฆๅ่กจไธญ็ๆไบค่" + +#: builtin/rebase.c:512 +msgid "expand commit ids in the todo list" +msgstr "ๆดๅฑๅพ ่พฆๅ่กจไธญ็ๆไบค่" + +#: builtin/rebase.c:514 +msgid "check the todo list" +msgstr "ๆชขๆฅๅพ ่พฆๅ่กจ" + +#: builtin/rebase.c:516 +msgid "rearrange fixup/squash lines" +msgstr "้ๆฐๆๅ fixup/squash ่ก" + +#: builtin/rebase.c:518 +msgid "insert exec commands in todo list" +msgstr "ๅจๅพ ่พฆๅ่กจไธญๆๅ ฅ exec ๅท่กๆไปค" + +#: builtin/rebase.c:519 +msgid "onto" +msgstr "onto" + +#: builtin/rebase.c:522 +msgid "restrict-revision" +msgstr "restrict-revision" + +#: builtin/rebase.c:522 +msgid "restrict revision" +msgstr "้ๅถ็ๆฌ" + +#: builtin/rebase.c:524 +msgid "squash-onto" +msgstr "squash-onto" + +#: builtin/rebase.c:525 +msgid "squash onto" +msgstr "squash onto" + +#: builtin/rebase.c:527 +msgid "the upstream commit" +msgstr "ไธๆธธๆไบค" + +#: builtin/rebase.c:529 +msgid "head-name" +msgstr "head-name" + +#: builtin/rebase.c:529 +msgid "head name" +msgstr "head ๅ็จฑ" + +#: builtin/rebase.c:534 +msgid "rebase strategy" +msgstr "้ๅฎๅบๅบ็ญ็ฅ" + +#: builtin/rebase.c:535 +msgid "strategy-opts" +msgstr "strategy-opts" + +#: builtin/rebase.c:536 +msgid "strategy options" +msgstr "็ญ็ฅ้ธ้ " + +#: builtin/rebase.c:537 +msgid "switch-to" +msgstr "ๅๆๅฐ" + +#: builtin/rebase.c:538 +msgid "the branch or commit to checkout" +msgstr "่ฆๆชขๅบ็ๅๆฏๆๆไบค" + +#: builtin/rebase.c:539 +msgid "onto-name" +msgstr "onto-name" + +#: builtin/rebase.c:539 +msgid "onto name" +msgstr "onto name" + +#: builtin/rebase.c:540 +msgid "cmd" +msgstr "cmd" + +#: builtin/rebase.c:540 +msgid "the command to run" +msgstr "่ฆๅท่ก็ๆไปค" + +#: builtin/rebase.c:543 builtin/rebase.c:1415 +msgid "automatically re-schedule any `exec` that fails" +msgstr "่ชๅ้ๆฐๅฎๆไปปไฝๅคฑๆ็ `exec`" + +#: builtin/rebase.c:559 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "ไธไฝฟ็จ --rebase-merges๏ผๅ --[no-]rebase-cousins ๆฒๆๆๆ" + +#: builtin/rebase.c:575 +#, c-format +msgid "%s requires the merge backend" +msgstr "%s ้่ฆๅไฝตๅพ็ซฏ" + +#: builtin/rebase.c:618 +#, c-format +msgid "could not get 'onto': '%s'" +msgstr "็กๆณๅๅพ 'onto'๏ผ'%s'" + +#: builtin/rebase.c:635 +#, c-format +msgid "invalid orig-head: '%s'" +msgstr "็กๆ็ๅๅง head๏ผ'%s'" + +#: builtin/rebase.c:660 +#, c-format +msgid "ignoring invalid allow_rerere_autoupdate: '%s'" +msgstr "ๅฟฝ็ฅ็กๆ็ allow_rerere_autoupdate๏ผ'%s'" + +#: builtin/rebase.c:805 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:888 +#, 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:1214 +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "็กๆณ่ญๅฅ็ '%s' ็ฉบ้กๅ๏ผๆๆ็ๆธๅผๆ \"drop\"ใ\"keep\" ่ท \"ask\"ใ" + +#: builtin/rebase.c:1232 +#, 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:1248 +#, 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:1278 +msgid "exec commands cannot contain newlines" +msgstr "exec ๆไปคไธ่ฝๅ ๅซๆ่ก็ฌฆ่" + +#: builtin/rebase.c:1282 +msgid "empty exec command" +msgstr "็ฉบ็ exec ๆไปค" + +#: builtin/rebase.c:1312 +msgid "rebase onto given branch instead of upstream" +msgstr "้ๅฎๅบๅบๅฐๆไพ็ๅๆฏ่้ไธๆธธ" + +#: builtin/rebase.c:1314 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "ไฝฟ็จไธๆธธๅๅๆฏ็ๅไฝตๅบ็คๅ็บ็ฎๅๅบ็ค" + +#: builtin/rebase.c:1316 +msgid "allow pre-rebase hook to run" +msgstr "ๅ ่จฑๅท่ก pre-rebase ๆ้ค" + +#: builtin/rebase.c:1318 +msgid "be quiet. implies --no-stat" +msgstr "ๅฎ้ใๆ็คบ --no-stat" + +#: builtin/rebase.c:1324 +msgid "do not show diffstat of what changed upstream" +msgstr "ไธ้กฏ็คบไธๆธธ่ฎๅ็ๅทฎ็ฐ็ตฑ่จ" + +#: builtin/rebase.c:1327 +msgid "add a Signed-off-by: line to each commit" +msgstr "็บๆฏไธๅๆไบคๆฐๅขไธๅ Signed-off-by: ็ฐฝๅ" + +#: builtin/rebase.c:1330 +msgid "make committer date match author date" +msgstr "ไฝฟๆไบคๆฅๆ่่ฃฝไฝๆฅๆ็ธ็ฌฆๅ" + +#: builtin/rebase.c:1332 +msgid "ignore author date and use current date" +msgstr "ๅฟฝ็ฅ่ฃฝไฝๆฅๆ่ไฝฟ็จๆฅๅๆฅๆ" + +#: builtin/rebase.c:1334 +msgid "synonym of --reset-author-date" +msgstr "ๅ --reset-author-date ๅ็พฉ" + +#: builtin/rebase.c:1336 builtin/rebase.c:1340 +msgid "passed to 'git apply'" +msgstr "ๅณ้็ตฆ 'git apply'" + +#: builtin/rebase.c:1338 +msgid "ignore changes in whitespace" +msgstr "ๅฟฝ็ฅ็ฉบ็ฝๅญๅ ไธญ็่ฎๆด" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 +msgid "cherry-pick all commits, even if unchanged" +msgstr "ๆ้ธๆๆๆไบค๏ผๅณไฝฟๆชไฟฎๆน" + +#: builtin/rebase.c:1347 +msgid "continue" +msgstr "็นผ็บ" + +#: builtin/rebase.c:1350 +msgid "skip current patch and continue" +msgstr "่ทณ้็ฎๅไฟฎ่ฃๆชไธฆ็นผ็บ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: builtin/rebase.c:1352 +msgid "abort and check out the original branch" +msgstr "็ตๆญขไธฆๆชขๅบๅๆๅๆฏ" + +#: builtin/rebase.c:1355 +msgid "abort but keep HEAD where it is" +msgstr "็ตๆญขไฝไฟๆ HEAD ไธ่ฎ" + +#: builtin/rebase.c:1356 +msgid "edit the todo list during an interactive rebase" +msgstr "ๅจไบๅๅผ้ๅฎๅบๅบไธญ็ทจ่ผฏๅพ ่พฆๅ่กจ" + +#: builtin/rebase.c:1359 +msgid "show the patch file being applied or merged" +msgstr "้กฏ็คบๆญฃๅจๅฅ็จๆๅไฝต็ไฟฎ่ฃๆชๆก" + +#: builtin/rebase.c:1362 +msgid "use apply strategies to rebase" +msgstr "ไฝฟ็จๅฅ็จ็ญ็ฅ้ฒ่ก้ๅฎๅบๅบ" + +#: builtin/rebase.c:1366 +msgid "use merging strategies to rebase" +msgstr "ไฝฟ็จๅไฝต็ญ็ฅ้ฒ่ก้ๅฎๅบๅบ" + +#: builtin/rebase.c:1370 +msgid "let the user edit the list of commits to rebase" +msgstr "่ฎไฝฟ็จ่ ็ทจ่ผฏ่ฆ้ๅฎๅบๅบ็ๆไบคๅ่กจ" + +#: builtin/rebase.c:1374 +msgid "(DEPRECATED) try to recreate merges instead of ignoring them" +msgstr "๏ผๅทฒๆฃ็จ๏ผๅ่ฉฆ้ๅปบๅไฝตๆไบค่้ๅฟฝ็ฅๅฎๅ" + +#: builtin/rebase.c:1379 +msgid "how to handle commits that become empty" +msgstr "่็็ฉบ็ฝๆไบค็ๆนๅผ" + +#: builtin/rebase.c:1386 +msgid "move commits that begin with squash!/fixup! under -i" +msgstr "ๅจ -i ไบๅๆจกๅผไธ๏ผ็งปๅไปฅ squash!/fixup! ้้ ญ็ๆไบค" + +#: builtin/rebase.c:1393 +msgid "add exec lines after each commit of the editable list" +msgstr "ๅฏ็ทจ่ผฏๅ่กจ็ๆฏไธๅๆไบคไธ้ขๅขๅ ไธ่ก exec" + +#: builtin/rebase.c:1397 +msgid "allow rebasing commits with empty messages" +msgstr "ๅ ่จฑ้ๅฐ็ฉบๆไบค่ชชๆ็ๆไบค้ๅฎๅบๅบ" + +#: builtin/rebase.c:1401 +msgid "try to rebase merges instead of skipping them" +msgstr "ๅ่ฉฆๅฐๅไฝตๆไบค้ๅฎๅบๅบ่ไธๆฏๅฟฝ็ฅๅฎๅ" + +#: builtin/rebase.c:1404 +msgid "use 'merge-base --fork-point' to refine upstream" +msgstr "ไฝฟ็จ 'merge-base --fork-point' ไพๆไฝณๅไธๆธธ" + +#: builtin/rebase.c:1406 +msgid "use the given merge strategy" +msgstr "ไฝฟ็จๆไพ็ๅไฝต็ญ็ฅ" + +#: builtin/rebase.c:1408 builtin/revert.c:115 +msgid "option" +msgstr "้ธ้ " + +#: builtin/rebase.c:1409 +msgid "pass the argument through to the merge strategy" +msgstr "ๅฐๅๆธๅณ้็ตฆๅไฝต็ญ็ฅ" + +#: builtin/rebase.c:1412 +msgid "rebase all reachable commits up to the root(s)" +msgstr "ๅฐๆๆๅฏไปฅๅๅพ็ๆไบค้ๅฎๅบๅบๅฐๆ นๆไบค" + +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "ๅณไฝฟๅทฒๆไพไธๆธธ๏ผไปๅฅ็จๆๆ่ฎๆด" + +#: builtin/rebase.c:1434 +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:1440 +msgid "It looks like 'git am' is in progress. Cannot rebase." +msgstr "็่ตทไพ 'git-am' ๆญฃๅจๅท่กไธญใ็กๆณ้ๅฎๅบๅบใ" + +#: builtin/rebase.c:1481 +msgid "" +"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." +msgstr "git rebase --preserve-merges ่ขซๆฃ็จใ็จ --rebase-merges ไปฃๆฟใ" + +#: builtin/rebase.c:1486 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "ไธ่ฝๅฐ '--keep-base' ๅ '--onto' ็ตๅไฝฟ็จ" + +#: builtin/rebase.c:1488 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "ไธ่ฝๅฐ '--keep-base' ๅ '--root' ็ตๅไฝฟ็จ" + +#: builtin/rebase.c:1492 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "ไธ่ฝๅฐ '--root' ๅ '--fork-point' ็ตๅไฝฟ็จ" + +#: builtin/rebase.c:1495 +msgid "No rebase in progress?" +msgstr "ๆฒๆๆญฃๅจ้ฒ่ก็้ๅฎๅบๅบ๏ผ" + +#: builtin/rebase.c:1499 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "ๅไฝ --edit-todo ๅช่ฝ็จๅจไบๅๅผ้ๅฎๅบๅบ้็จไธญใ" + +#: builtin/rebase.c:1522 +msgid "Cannot read HEAD" +msgstr "ไธ่ฝ่ฎๅ HEAD" + +#: builtin/rebase.c:1534 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"ๆจๅฟ ้ ็ทจ่ผฏๆๆ็ๅไฝต่ก็ช๏ผ็ถๅพ้้ git add\n" +"ๆไปคๅฐๅฎๅๆจ่จ็บๅทฒ่งฃๆฑบ" + +#: builtin/rebase.c:1553 +msgid "could not discard worktree changes" +msgstr "็กๆณๆจๆฃๅทฅไฝๅ่ฎๆด" + +#: builtin/rebase.c:1572 +#, c-format +msgid "could not move back to %s" +msgstr "็กๆณ็งปๅ %s" + +#: builtin/rebase.c:1618 +#, 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:1646 +msgid "switch `C' expects a numerical value" +msgstr "้้ `C' ๆๆไธๅๆธๅญๅผ" + +#: builtin/rebase.c:1688 +#, c-format +msgid "Unknown mode: %s" +msgstr "ๆช็ฅๆจกๅผ๏ผ%s" + +#: builtin/rebase.c:1727 +msgid "--strategy requires --merge or --interactive" +msgstr "--strategy ้่ฆ --merge ๆ --interactive" + +#: builtin/rebase.c:1757 +msgid "cannot combine apply options with merge options" +msgstr "ไธ่ฝๅฐ apply ๅฅ็จ้ธ้ ่ merge ๅไฝต้ธ้ ไธ่ตทไฝฟ็จ" + +#: builtin/rebase.c:1770 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "ๆช็ฅ rebase ๅพ็ซฏ๏ผ%s" + +#: builtin/rebase.c:1795 +msgid "--reschedule-failed-exec requires --exec or --interactive" +msgstr "--reschedule-failed-exec ้่ฆ --exec ๆ --interactive" + +#: builtin/rebase.c:1815 +msgid "cannot combine '--preserve-merges' with '--rebase-merges'" +msgstr "ไธ่ฝๅฐ '--preserve-merges' ๅ '--rebase-merges' ๅๆไฝฟ็จ" + +#: builtin/rebase.c:1819 +msgid "" +"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" +msgstr "" +"้ฏ่ชค๏ผไธ่ฝๅฐ '--preserve-merges' ๅ '--reschedule-failed-exec' ๅๆไฝฟ็จ" + +#: builtin/rebase.c:1843 +#, c-format +msgid "invalid upstream '%s'" +msgstr "็กๆ็ไธๆธธ '%s'" + +#: builtin/rebase.c:1849 +msgid "Could not create new root commit" +msgstr "ไธ่ฝๅปบ็ซๆฐ็ๆ นๆไบค" + +#: builtin/rebase.c:1875 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "'%s'๏ผๅช้่ฆ่ๅๆฏ็ไธๅๅไฝตๅบ็ค" + +#: builtin/rebase.c:1878 +#, c-format +msgid "'%s': need exactly one merge base" +msgstr "'%s'๏ผๅช้่ฆไธๅๅไฝตๅบ็ค" + +#: builtin/rebase.c:1886 +#, c-format +msgid "Does not point to a valid commit '%s'" +msgstr "ๆฒๆๆๅไธๅๆๆ็ๆไบค '%s'" + +#: builtin/rebase.c:1912 +#, c-format +msgid "fatal: no such branch/commit '%s'" +msgstr "่ดๅฝ้ฏ่ชค๏ผ็กๆญคๅๆฏ/ๆไบค '%s'" + +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 +#, c-format +msgid "No such ref: %s" +msgstr "ๆฒๆ้ๆจฃ็ๅผ็จ๏ผ%s" + +#: builtin/rebase.c:1931 +msgid "Could not resolve HEAD to a revision" +msgstr "็กๆณๅฐ HEAD ่งฃๆ็บไธๅ็ๆฌ" + +#: builtin/rebase.c:1952 +msgid "Please commit or stash them." +msgstr "่ซๆไบคๆๅฒ่ไฟฎๆนใ" + +#: builtin/rebase.c:1988 +#, c-format +msgid "could not switch to %s" +msgstr "็กๆณๅๆๅฐ %s" + +#: builtin/rebase.c:1999 +msgid "HEAD is up to date." +msgstr "HEAD ๆฏๆๆฐ็ใ" + +#: builtin/rebase.c:2001 +#, c-format +msgid "Current branch %s is up to date.\n" +msgstr "็ฎๅๅๆฏ %s ๆฏๆๆฐ็ใ\n" + +#: builtin/rebase.c:2009 +msgid "HEAD is up to date, rebase forced." +msgstr "HEAD ๆฏๆๆฐ็๏ผๅผทๅถ้ๅฎๅบๅบใ" + +#: builtin/rebase.c:2011 +#, c-format +msgid "Current branch %s is up to date, rebase forced.\n" +msgstr "็ฎๅๅๆฏ %s ๆฏๆๆฐ็๏ผๅผทๅถ้ๅฎๅบๅบใ\n" + +#: builtin/rebase.c:2019 +msgid "The pre-rebase hook refused to rebase." +msgstr "pre-rebase ๆ้คๆ็ตไบ้ๅฎๅบๅบๅไฝใ" + +#: builtin/rebase.c:2026 +#, c-format +msgid "Changes to %s:\n" +msgstr "ๅฐ %s ็่ฎๆด๏ผ\n" + +#: builtin/rebase.c:2029 +#, c-format +msgid "Changes from %s to %s:\n" +msgstr "ๅพ %s ๅฐ %s ็่ฎๆด๏ผ\n" + +#: builtin/rebase.c:2054 +#, c-format +msgid "First, rewinding head to replay your work on top of it...\n" +msgstr "้ฆๅ ๏ผ้ๅ้้ ญๆๆจไปฅไพฟๅจๅ ถไธ้ๆพๆจ็ๅทฅไฝ...\n" + +#: builtin/rebase.c:2063 +msgid "Could not detach HEAD" +msgstr "็กๆณๅ้ข้้ ญๆๆจ" + +#: builtin/rebase.c:2072 +#, c-format +msgid "Fast-forwarded %s to %s.\n" +msgstr "ๅฟซ่ฝ %s ๅฐ %sใ\n" + +#: builtin/receive-pack.c:34 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <็ๆฌๅบซ็ฎ้>" + +#: builtin/receive-pack.c:1224 +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:1244 +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:2422 +msgid "quiet" +msgstr "้้ปๆจกๅผ" + +#: builtin/receive-pack.c:2436 +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 "master ๅๆฏ" + +#: 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:697 +#, c-format +msgid "remote %s already exists." +msgstr "้ ็ซฏ %s ๅทฒ็ถๅญๅจใ" + +#: builtin/remote.c:199 builtin/remote.c:701 +#, 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:654 +#, c-format +msgid "could not set '%s'" +msgstr "็กๆณ่จญๅฎ '%s'" + +#: builtin/remote.c:659 +#, 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:690 builtin/remote.c:833 builtin/remote.c:941 +#, c-format +msgid "No such remote: '%s'" +msgstr "ๆฒๆๆญค้ ็ซฏ็ๆฌๅบซ๏ผ'%s'" + +#: builtin/remote.c:707 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "ไธ่ฝ้ๆฐๅฝๅ่จญๅฎๅฐ็ฏ '%s' ๅฐ '%s'" + +#: builtin/remote.c:727 +#, 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:767 +#, c-format +msgid "deleting '%s' failed" +msgstr "ๅช้ค '%s' ๅคฑๆ" + +#: builtin/remote.c:801 +#, c-format +msgid "creating '%s' failed" +msgstr "ๅปบ็ซ '%s' ๅคฑๆ" + +#: builtin/remote.c:877 +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:891 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "ไธ่ฝ็งป้ค่จญๅฎๅฐ็ฏ '%s'" + +#: builtin/remote.c:994 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr " ๆฐ็๏ผไธไธๆฌกๅๅพๅฐๅฒๅญๆผ remotes/%s๏ผ" + +#: builtin/remote.c:997 +msgid " tracked" +msgstr " ๅทฒ่ฟฝ่นค" + +#: builtin/remote.c:999 +msgid " stale (use 'git remote prune' to remove)" +msgstr " ้ๆ๏ผไฝฟ็จ 'git remote prune' ไพ็งป้ค๏ผ" + +#: builtin/remote.c:1001 +msgid " ???" +msgstr " ???" + +#: builtin/remote.c:1042 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "็กๆ็ branch.%s.merge๏ผไธ่ฝ้ๅฎๅบๅบๅฐไธๅไปฅไธ็ๅๆฏ" + +#: builtin/remote.c:1051 +#, c-format +msgid "rebases interactively onto remote %s" +msgstr "ไบๅๅผ้ๅฎๅบๅบๅฐ้ ็ซฏ %s" + +#: builtin/remote.c:1053 +#, c-format +msgid "rebases interactively (with merges) onto remote %s" +msgstr "ไบๅๅผ้ๅฎๅบๅบ๏ผๅซๅไฝตๆไบค๏ผๅฐ้ ็ซฏ %s" + +#: builtin/remote.c:1056 +#, c-format +msgid "rebases onto remote %s" +msgstr "้ๅฎๅบๅบๅฐ้ ็ซฏ %s" + +#: builtin/remote.c:1060 +#, c-format +msgid " merges with remote %s" +msgstr " ่้ ็ซฏ %s ๅไฝต" + +#: builtin/remote.c:1063 +#, c-format +msgid "merges with remote %s" +msgstr "่้ ็ซฏ %s ๅไฝต" + +#: builtin/remote.c:1066 +#, c-format +msgid "%-*s and with remote %s\n" +msgstr "%-*s ไปฅๅๅ้ ็ซฏ %s\n" + +#: builtin/remote.c:1109 +msgid "create" +msgstr "ๅปบ็ซ" + +#: builtin/remote.c:1112 +msgid "delete" +msgstr "ๅช้ค" + +#: builtin/remote.c:1116 +msgid "up to date" +msgstr "ๆๆฐ" + +#: builtin/remote.c:1119 +msgid "fast-forwardable" +msgstr "ๅฏๅฟซ่ฝ" + +#: builtin/remote.c:1122 +msgid "local out of date" +msgstr "ๆฌๆฉๅทฒ้ๆ" + +#: builtin/remote.c:1129 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr " %-*s ๅผทๅถๆจ้่ณ %-*s (%s)" + +#: builtin/remote.c:1132 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s ๆจ้่ณ %-*s (%s)" + +#: builtin/remote.c:1136 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s ๅผทๅถๆจ้่ณ %s" + +#: builtin/remote.c:1139 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s ๆจ้่ณ %s" + +#: builtin/remote.c:1207 +msgid "do not query remotes" +msgstr "ไธๆฅ่ฉข้ ็ซฏ" + +#: builtin/remote.c:1234 +#, c-format +msgid "* remote %s" +msgstr "* ้ ็ซฏ %s" + +#: builtin/remote.c:1235 +#, c-format +msgid " Fetch URL: %s" +msgstr " ๅๅพไฝๅ๏ผ%s" + +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 +msgid "(no URL)" +msgstr "(็ก URL)" + +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#. +#: builtin/remote.c:1250 builtin/remote.c:1252 +#, c-format +msgid " Push URL: %s" +msgstr " ๆจ้ไฝๅ๏ผ%s" + +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 +#, c-format +msgid " HEAD branch: %s" +msgstr " HEAD ๅๆฏ๏ผ%s" + +# ่ญฏ่ ๏ผไธญๆๅญไธฒๆผๆฅ๏ผๅฏๅช้คๅๅฐ็ฉบๆ ผ +#: builtin/remote.c:1254 +msgid "(not queried)" +msgstr "๏ผๆชๆฅ่ฉข๏ผ" + +#: builtin/remote.c:1256 +msgid "(unknown)" +msgstr "๏ผๆช็ฅ๏ผ" + +#: builtin/remote.c:1260 +#, c-format +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr " HEAD ๅๆฏ๏ผ้ ็ซฏ HEAD ๆจก็ณ๏ผๅฏ่ฝๆฏไธๅไธญ็ไธๅ๏ผ๏ผ\n" + +#: builtin/remote.c:1272 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " ้ ็ซฏๅๆฏ๏ผ%s" + +# ่ญฏ่ ๏ผไธญๆๅญไธฒๆผๆฅ๏ผๅฏๅช้คๅๅฐ็ฉบๆ ผ +#: builtin/remote.c:1275 builtin/remote.c:1301 +msgid " (status not queried)" +msgstr "๏ผ็ๆ ๆชๆฅ่ฉข๏ผ" + +#: builtin/remote.c:1284 +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] " ็บ 'git pull' ่จญๅฎ็ๆฌๆฉๅๆฏ๏ผ" + +#: builtin/remote.c:1292 +msgid " Local refs will be mirrored by 'git push'" +msgstr " ๆฌๆฉๅผ็จๅฐๅจ 'git push' ๆ่ขซ้กๅ" + +#: builtin/remote.c:1298 +#, 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:1319 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "ๆ นๆ้ ็ซฏ่จญๅฎ refs/remotes/<ๅ็จฑ>/HEAD" + +#: builtin/remote.c:1321 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "ๅช้ค refs/remotes/<ๅ็จฑ>/HEAD" + +#: builtin/remote.c:1336 +msgid "Cannot determine remote HEAD" +msgstr "็กๆณ็ขบๅฎ้ ็ซฏ HEAD" + +#: builtin/remote.c:1338 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "ๅคๅ้ ็ซฏ HEAD ๅๆฏใ่ซๆ็ขบๅฐ้ธๆไธๅ็จๆไปค๏ผ" + +#: builtin/remote.c:1348 +#, c-format +msgid "Could not delete %s" +msgstr "็กๆณๅช้ค %s" + +#: builtin/remote.c:1356 +#, c-format +msgid "Not a valid ref: %s" +msgstr "ไธๆฏไธๅๆๆๅผ็จ๏ผ%s" + +#: builtin/remote.c:1358 +#, c-format +msgid "Could not setup %s" +msgstr "ไธ่ฝ่จญๅฎ %s" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: builtin/remote.c:1376 +#, c-format +msgid " %s will become dangling!" +msgstr " %s ๅฐๆ็บๆธ็ฉบ็ๆ ๏ผ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: builtin/remote.c:1377 +#, c-format +msgid " %s has become dangling!" +msgstr " %s ๅทฒๆ็บๆธ็ฉบ็ๆ ๏ผ" + +#: builtin/remote.c:1387 +#, c-format +msgid "Pruning %s" +msgstr "ไฟฎๅช %s" + +#: builtin/remote.c:1388 +#, c-format +msgid "URL: %s" +msgstr "URL๏ผ%s" + +#: builtin/remote.c:1404 +#, c-format +msgid " * [would prune] %s" +msgstr " * [ๅฐๅช้ค] %s" + +#: builtin/remote.c:1407 +#, c-format +msgid " * [pruned] %s" +msgstr " * [ๅทฒๅช้ค] %s" + +#: builtin/remote.c:1452 +msgid "prune remotes after fetching" +msgstr "ๆๅๅพๆธ ้ค้ ็ซฏ" + +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 +#, c-format +msgid "No such remote '%s'" +msgstr "ๆฒๆๆญค้ ็ซฏ '%s'" + +#: builtin/remote.c:1531 +msgid "add branch" +msgstr "ๆฐๅขๅๆฏ" + +#: builtin/remote.c:1538 +msgid "no remote specified" +msgstr "ๆชๆๅฎ้ ็ซฏ" + +#: builtin/remote.c:1555 +msgid "query push URLs rather than fetch URLs" +msgstr "ๆฅ่ฉขๆจ้ URL ไฝๅ๏ผ่้ๅๅพ URL ไฝๅ" + +#: builtin/remote.c:1557 +msgid "return all URLs" +msgstr "่ฟๅๆๆ URL ไฝๅ" + +#: builtin/remote.c:1585 +#, c-format +msgid "no URLs configured for remote '%s'" +msgstr "ๆฒๆ็ตฆ้ ็ซฏ็ๆฌๅบซ '%s' ่จญๅฎ URL" + +#: builtin/remote.c:1611 +msgid "manipulate push URLs" +msgstr "ๅไฝๆจ้ URLS" + +#: builtin/remote.c:1613 +msgid "add URL" +msgstr "ๆฐๅข URL" + +#: builtin/remote.c:1615 +msgid "delete URLs" +msgstr "ๅช้ค URL" + +#: builtin/remote.c:1622 +msgid "--add --delete doesn't make sense" +msgstr "--add --delete ็กๆ็พฉ" + +#: builtin/remote.c:1661 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "็กๆ็่ URL ็ฌฆๅ็ฏๆฌ๏ผ%s" + +#: builtin/remote.c:1669 +#, c-format +msgid "No such URL found: %s" +msgstr "ๆชๆพๅฐๆญค URL๏ผ%s" + +#: builtin/remote.c:1671 +msgid "Will not delete all non-push URLs" +msgstr "ๅฐไธๆๅช้คๆๆ้ๆจ้ URL ไฝๅ" + +#: builtin/repack.c:25 +msgid "git repack [<options>]" +msgstr "git repack [<้ธ้ >]" + +#: builtin/repack.c:30 +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:197 +msgid "could not start pack-objects to repack promisor objects" +msgstr "็กๆณ้ๅง pack-objects ไพ้ๆฐๆๅ promisor ็ฉไปถ" + +#: builtin/repack.c:236 builtin/repack.c:421 +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "repack๏ผๆๆไพ่ช pack-objects ็ๅฎๆดๅๅ ญ้ฒไฝ็ฉไปถ IDใ" + +#: builtin/repack.c:260 +msgid "could not finish pack-objects to repack promisor objects" +msgstr "็กๆณๅฎๆ pack-objects ไพ้ๆฐๆๅ promisor ็ฉไปถ" + +#: builtin/repack.c:297 +msgid "pack everything in a single pack" +msgstr "ๆๆๅ งๅฎนๆๅ ๅฐไธๅๅ ๆชๆกไธญ" + +#: builtin/repack.c:299 +msgid "same as -a, and turn unreachable objects loose" +msgstr "ๅ -a ็ธๅ๏ผไธฆๅฐ็กๆณๅๅพ็็ฉไปถ่จญ็บ้ฌๆฃ็ฉไปถ" + +#: builtin/repack.c:302 +msgid "remove redundant packs, and run git-prune-packed" +msgstr "ๅช้คๅค้ค็ๅ ๏ผๅท่ก git-prune-packed" + +#: builtin/repack.c:304 +msgid "pass --no-reuse-delta to git-pack-objects" +msgstr "ๅ git-pack-objects ๅณ้ๅๆธ --no-reuse-delta" + +#: builtin/repack.c:306 +msgid "pass --no-reuse-object to git-pack-objects" +msgstr "ๅ git-pack-objects ๅณ้ๅๆธ --no-reuse-object" + +#: builtin/repack.c:308 +msgid "do not run git-update-server-info" +msgstr "ไธๅท่ก git-update-server-info" + +#: builtin/repack.c:311 +msgid "pass --local to git-pack-objects" +msgstr "ๅ git-pack-objects ๅณ้ๅๆธ --local" + +#: builtin/repack.c:313 +msgid "write bitmap index" +msgstr "ๅฏซ bitmap ็ดขๅผ" + +#: builtin/repack.c:315 +msgid "pass --delta-islands to git-pack-objects" +msgstr "ๅ git-pack-objects ๅณ้ๅๆธ --delta-islands" + +#: builtin/repack.c:316 +msgid "approxidate" +msgstr "่ฟไผผๆฅๆ" + +#: builtin/repack.c:317 +msgid "with -A, do not loosen objects older than this" +msgstr "ไฝฟ็จ -A๏ผไธ่ฆๅฐๆฉๆผๆไพๆ้็็ฉไปถ้ๆ" + +#: builtin/repack.c:319 +msgid "with -a, repack unreachable objects" +msgstr "ไฝฟ็จ -a ๏ผ้ๆฐๅฐ็กๆณๅๅพ็ฉไปถๆๅ " + +#: builtin/repack.c:321 +msgid "size of the window used for delta compression" +msgstr "็จๆผๅข้ๅฃ็ธฎ็่ฆ็ชๅผ" + +#: builtin/repack.c:322 builtin/repack.c:328 +msgid "bytes" +msgstr "ไฝๅ ็ต" + +#: builtin/repack.c:323 +msgid "same as the above, but limit memory size instead of entries count" +msgstr "ๅไธ้ข็็ธไผผ๏ผไฝ้ๅถ่จๆถ้ซๅคงๅฐ่้ๆข็ฎๆธ" + +#: builtin/repack.c:325 +msgid "limits the maximum delta depth" +msgstr "้ๅถๆๅคงๅข้ๆทฑๅบฆ" + +#: builtin/repack.c:327 +msgid "limits the maximum number of threads" +msgstr "้ๅถๆๅคงๅท่ก็ทๆธ" + +#: builtin/repack.c:329 +msgid "maximum size of each packfile" +msgstr "ๆฏๅ packfile ็ๆๅคงๅฐบๅฏธ" + +#: builtin/repack.c:331 +msgid "repack objects in packs marked with .keep" +msgstr "ๅฐๆจ่จ็บ .keep ็ๅ ไธญ็็ฉไปถ้ๆฐๆๅ " + +#: builtin/repack.c:333 +msgid "do not repack this pack" +msgstr "ไธ่ฆๅฐ่ฉฒๅ ๆชๆก้ๆฐๆๅ " + +#: builtin/repack.c:343 +msgid "cannot delete packs in a precious-objects repo" +msgstr "ไธ่ฝๅช้ค็ๅ็ๆฌๅบซไธญ็ๆๅ ๆชๆก" + +#: builtin/repack.c:347 +msgid "--keep-unreachable and -A are incompatible" +msgstr "--keep-unreachable ๅ -A ไธ็ธๅฎน" + +#: builtin/repack.c:430 +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:83 +msgid "You do not have a valid HEAD." +msgstr "ๆจๆฒๆไธๅๆๆ็ HEADใ" + +#: builtin/reset.c:85 +msgid "Failed to find tree of HEAD." +msgstr "็กๆณๆพๅฐ HEAD ๆๅ็ๆจนใ" + +#: builtin/reset.c:91 +#, c-format +msgid "Failed to find tree of %s." +msgstr "็กๆณๆพๅฐ %s ๆๅ็ๆจนใ" + +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ็พๅจไฝๆผ %s" + +# ่ญฏ่ ๏ผๆผขๅญไน้็ก็ฉบๆ ผ๏ผๆ ๅช้ค%sๅๅพ็ฉบๆ ผ +#: builtin/reset.c:195 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "ๅจๅไฝต้็จไธญไธ่ฝๅ%s้่จญๅไฝใ" + +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 +msgid "be quiet, only report errors" +msgstr "ๅฎ้ๆจกๅผ๏ผๅชๅ ฑๅ้ฏ่ชค" + +#: builtin/reset.c:297 +msgid "reset HEAD and index" +msgstr "้่จญ HEAD ๅ็ดขๅผ" + +#: builtin/reset.c:298 +msgid "reset only HEAD" +msgstr "ๅช้่จญ HEAD" + +#: builtin/reset.c:300 builtin/reset.c:302 +msgid "reset HEAD, index and working tree" +msgstr "้่จญ HEADใ็ดขๅผๅๅทฅไฝๅ" + +#: builtin/reset.c:304 +msgid "reset HEAD but keep local changes" +msgstr "้่จญ HEAD ไฝๅฒๅญๆฌๆฉ่ฎๆด" + +#: builtin/reset.c:310 +msgid "record only the fact that removed paths will be added later" +msgstr "ๅฐๅช้ค็่ทฏๅพๆจ่จ็บ็จๅพๆฐๅข" + +#: builtin/reset.c:344 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "็กๆณๅฐ '%s' ่งฃๆ็บไธๅๆๆ็็ๆฌใ" + +#: builtin/reset.c:352 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "็กๆณๅฐ '%s' ่งฃๆ็บไธๅๆๆ็ๆจน็็ฉไปถใ" + +#: builtin/reset.c:361 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch ่ --{hardใmixedใsoft} ้ธ้ ไธ็ธๅฎน" + +#: builtin/reset.c:371 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "--mixed ๅธถ่ทฏๅพๅทฒๆฃ็จ๏ผ่ๆฏ็จ 'git reset -- <่ทฏๅพ>'ใ" + +# ่ญฏ่ ๏ผๆผขๅญไน้็ก็ฉบๆ ผ๏ผๆ ๅช้ค%sๅๅพ็ฉบๆ ผ +#: builtin/reset.c:373 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "ไธ่ฝๅธถ่ทฏๅพ้ฒ่ก%s้่จญใ" + +# ่ญฏ่ ๏ผๆผขๅญไน้็ก็ฉบๆ ผ๏ผๆ ๅช้ค%sๅๅพ็ฉบๆ ผ +#: builtin/reset.c:388 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "ไธ่ฝๅฐ็ด็ๆฌๅบซ้ฒ่ก%s้่จญ" + +#: builtin/reset.c:392 +msgid "-N can only be used with --mixed" +msgstr "-N ๅช่ฝๅ --mixed ๅๆไฝฟ็จ" + +#: builtin/reset.c:413 +msgid "Unstaged changes after reset:" +msgstr "้่จญๅพๅๆถๆซๅญ็่ฎๆด๏ผ" + +#: builtin/reset.c:416 +#, 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:434 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "ไธ่ฝ้่จญ็ดขๅผๆชๆก่ณ็ๆฌ '%s'ใ" + +#: builtin/reset.c:439 +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:409 +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<้ธ้ >] -- [<ๅๆธ>...]" + +#: builtin/rev-parse.c:414 +msgid "keep the `--` passed as an arg" +msgstr "ไฟๆ `--` ไฝ็บไธๅๅๆธๅณ้" + +#: builtin/rev-parse.c:416 +msgid "stop parsing after the first non-option argument" +msgstr "้ๅฐ็ฌฌไธๅ้้ธ้ ๅๆธๅพๅๆญข่งฃๆ" + +#: builtin/rev-parse.c:419 +msgid "output in stuck long form" +msgstr "ไปฅๅบๅฎ้ทๆ ผๅผ่ผธๅบ" + +#: builtin/rev-parse.c:552 +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:182 +msgid "remote name" +msgstr "้ ็ซฏๅ็จฑ" + +#: builtin/send-pack.c:195 +msgid "use stateless RPC protocol" +msgstr "ไฝฟ็จ็ก็ๆ ็ RPC ๅๅฎ" + +#: builtin/send-pack.c:196 +msgid "read refs from stdin" +msgstr "ๅพๆจๆบ่ผธๅ ฅ่ฎๅๅผ็จ" + +#: builtin/send-pack.c:197 +msgid "print status from remote helper" +msgstr "ๅๅฐไพ่ช้ ็ซฏ helper ็็ๆ " + +#: builtin/shortlog.c:15 +msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" +msgstr "git shortlog [<้ธ้ >] [<็ๆฌ็ฏๅ>] [[--] <่ทฏๅพ>...]" + +#: builtin/shortlog.c:16 +msgid "git log --pretty=short | git shortlog [<options>]" +msgstr "git log --pretty=short | git shortlog [<้ธ้ >]" + +#: builtin/shortlog.c:134 +msgid "using multiple --group options with stdin is not supported" +msgstr "ไธๆฏๆดๅจๆจๆบ่ผธๅ ฅไฝฟ็จๅคๅ --group ้ธ้ " + +#: builtin/shortlog.c:144 +msgid "using --group=trailer with stdin is not supported" +msgstr "ไธๆฏๆดๅจๆจๆบ่ผธๅ ฅไฝฟ็จ --group=trailer" + +#: builtin/shortlog.c:388 +#, c-format +msgid "unknown group type: %s" +msgstr "ๆช็ฅ็พค็ต้กๅ๏ผ%s" + +#: builtin/shortlog.c:416 +msgid "Group by committer rather than author" +msgstr "ๆ็ งๆไบค่ ๅ็ต่ไธๆฏไฝ่ " + +#: builtin/shortlog.c:419 +msgid "sort output according to the number of commits per author" +msgstr "ๆ นๆๆฏๅไฝ่ ็ๆไบคๆธ้ๆๅบ" + +#: builtin/shortlog.c:421 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "้ฑ่ๆไบค่ชชๆ๏ผๅชๆไพๆไบคๆธ้" + +#: builtin/shortlog.c:423 +msgid "Show the email address of each author" +msgstr "้กฏ็คบๆฏๅไฝ่ ็้ปๅญไฟกไปถไฝๅ" + +#: builtin/shortlog.c:424 +msgid "<w>[,<i1>[,<i2>]]" +msgstr "<w>[,<i1>[,<i2>]]" + +#: builtin/shortlog.c:425 +msgid "Linewrap output" +msgstr "ๆ่ก่ผธๅบ" + +#: builtin/shortlog.c:427 +msgid "field" +msgstr "ๆฌไฝ" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "ไพๆฌไฝๅ็ต" + +#: builtin/shortlog.c:456 +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-index.c:21 +msgid "hash-algorithm" +msgstr "้ๆน็ฎๆณ" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "ๆช็ฅ็้ๆน็ฎๆณ" + +#: 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|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <้ธ้ >" + +#: builtin/sparse-checkout.c:50 +#| msgid "git sparse-checkout init [--cone]" +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:76 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "้ไธๆฏ็จ็ๅทฅไฝๅ๏ผsparse-checkout ๆชๆกๅฏ่ฝไธๅญๅจ๏ผ" + +#: builtin/sparse-checkout.c:228 +msgid "failed to create directory for sparse-checkout file" +msgstr "็กๆณๅปบ็ซ็จ็ๆชขๅบๆชๆก็็ฎ้" + +#: builtin/sparse-checkout.c:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "็กๆณๅ็ด็ๆฌๅบซๆ ผๅผ๏ผไปฅ่ด็กๆณๅ็จ worktreeConfig" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "็กๆณ่จญๅฎ extensions.worktreeConfig ่จญๅฎ" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "ไปฅ cone ๆจกๅผๅๅงๅ็จ็ๆชขๅบ" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "็กๆณ้ๅใ%sใ" + +#: builtin/sparse-checkout.c:401 +#, c-format +msgid "could not normalize path %s" +msgstr "็กๆณๆจๆบๅ่ทฏๅพ %s" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <ๆจฃๅผ>)" + +#: builtin/sparse-checkout.c:438 +#, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "็กๆณๅปๆ '%s' C ๆจฃๅผๅญไธฒ็ๅผ่" + +#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +msgid "unable to load existing sparse-checkout patterns" +msgstr "็กๆณ่ผๅ ฅ็พๅญ็็จ็ๆชขๅบๆจฃๅผ" + +#: builtin/sparse-checkout.c:561 +msgid "read patterns from standard in" +msgstr "ๅพๆจๆบ่ผธๅ ฅ่ฎๅๆจฃๅผ" + +#: builtin/sparse-checkout.c:576 +#| msgid "git sparse-checkout init [--cone]" +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:595 +#| msgid "git sparse-checkout init [--cone]" +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:623 +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 +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 +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 +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 +msgid "The stash entry is kept in case you need it again." +msgstr "ๅฒ่ๆข็ฎ่ขซไฟ็ไปฅๅๆจๅๆฌก้่ฆใ" + +#: builtin/stash.c:656 +msgid "No branch name specified" +msgstr "ๆชๆๅฎๅๆฏๅ" + +#: builtin/stash.c:800 builtin/stash.c:837 +#, c-format +msgid "Cannot update %s with %s" +msgstr "็กๆณ็จ %2$s ๆดๆฐ %1$s" + +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 +msgid "stash message" +msgstr "ๅฒ่่ชชๆ" + +#: builtin/stash.c:828 +msgid "\"git stash store\" requires one <commit> argument" +msgstr "\"git stash store\" ้่ฆไธๅ <ๆไบค> ๅๆธ" + +#: builtin/stash.c:1043 +msgid "No changes selected" +msgstr "ๆฒๆ้ธๆ่ฎๆด" + +#: builtin/stash.c:1143 +msgid "You do not have the initial commit yet" +msgstr "ๆจๅฐๆชๅปบ็ซๅๅงๆไบค" + +#: builtin/stash.c:1170 +msgid "Cannot save the current index state" +msgstr "็กๆณๅฒๅญ็ฎๅ็ดขๅผ็ๆ " + +#: builtin/stash.c:1179 +msgid "Cannot save the untracked files" +msgstr "็กๆณๅฒๅญๆช่ฟฝ่นคๆชๆก" + +#: builtin/stash.c:1190 builtin/stash.c:1199 +msgid "Cannot save the current worktree state" +msgstr "็กๆณๅฒๅญ็ฎๅๅทฅไฝๅ็ๆ " + +#: builtin/stash.c:1227 +msgid "Cannot record working tree state" +msgstr "ไธ่ฝ่จ้ๅทฅไฝๅ็ๆ " + +#: builtin/stash.c:1276 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "ไธ่ฝๅๆไฝฟ็จๅๆธ --patch ๅ --include-untracked ๆ --all" + +#: builtin/stash.c:1292 +msgid "Did you forget to 'git add'?" +msgstr "ๆจๆฏๅฆๅฟไบๅท่ก 'git add'๏ผ" + +#: builtin/stash.c:1307 +msgid "No local changes to save" +msgstr "ๆฒๆ่ฆๅฒๅญ็ๆฌๆฉไฟฎๆน" + +#: builtin/stash.c:1314 +msgid "Cannot initialize stash" +msgstr "็กๆณๅๅงๅๅฒ่" + +#: builtin/stash.c:1329 +msgid "Cannot save the current status" +msgstr "็กๆณๅฒๅญ็ฎๅ็ๆ " + +#: builtin/stash.c:1334 +#, c-format +msgid "Saved working directory and index state %s" +msgstr "ๅฒๅญๅทฅไฝ็ฎ้ๅ็ดขๅผ็ๆ %s" + +#: builtin/stash.c:1424 +msgid "Cannot remove worktree changes" +msgstr "็กๆณๅช้คๅทฅไฝๅ่ฎๆด" + +#: builtin/stash.c:1463 builtin/stash.c:1528 +msgid "keep index" +msgstr "ไฟๆ็ดขๅผ" + +#: builtin/stash.c:1465 builtin/stash.c:1530 +msgid "stash in patch mode" +msgstr "ไปฅไฟฎ่ฃๆชๆจกๅผๅฒ่" + +#: builtin/stash.c:1466 builtin/stash.c:1531 +msgid "quiet mode" +msgstr "้้ปๆจกๅผ" + +#: builtin/stash.c:1468 builtin/stash.c:1533 +msgid "include untracked files in stash" +msgstr "ๅฒ่ไธญๅ ๅซๆช่ฟฝ่นคๆชๆก" + +#: builtin/stash.c:1470 builtin/stash.c:1535 +msgid "include ignore files" +msgstr "ๅ ๅซๅฟฝ็ฅ็ๆชๆก" + +#: builtin/stash.c:1570 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"ๅฐ stash.useBuiltin ็ๆฏๆดๅทฒ่ขซๅช้ค๏ผ\n" +"่ฉณ่ฆใgit help configใไธญ็ๆข็ฎใ" + +#: 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:2423 +#, 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:1819 +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:629 +#: builtin/submodule--helper.c:652 +#, 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:1487 +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:666 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "็กๆณ็บๅญๆจก็ต '%s' ่จปๅ url" + +#: builtin/submodule--helper.c:670 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "ๅญๆจก็ต '%s'๏ผ%s๏ผๅทฒๅฐ่ทฏๅพ '%s' ่จปๅ\n" + +#: builtin/submodule--helper.c:680 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "่ญฆๅ๏ผๅปบ่ญฐๅญๆจก็ต '%s' ไฝฟ็จๆไปคๆดๆฐๆจกๅผ\n" + +#: builtin/submodule--helper.c:687 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "็กๆณ็บๅญๆจก็ต '%s' ่จปๅๆดๆฐๆจกๅผ" + +#: builtin/submodule--helper.c:709 +msgid "Suppress output for initializing a submodule" +msgstr "้ปๆญขๅญๆจก็ตๅๅงๅ็่ผธๅบ" + +#: builtin/submodule--helper.c:714 +msgid "git submodule--helper init [<options>] [<path>]" +msgstr "git submodule--helper init [<้ธ้ >] [<่ทฏๅพ>]" + +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#, c-format +msgid "no submodule mapping found in .gitmodules for path '%s'" +msgstr "ๅจ .gitmodules ไธญๆฒๆ็ผ็พ่ทฏๅพ '%s' ็ๅญๆจก็ตๆ ๅฐ" + +#: builtin/submodule--helper.c:835 +#, c-format +msgid "could not resolve HEAD ref inside the submodule '%s'" +msgstr "็กๆณ่งฃๆๅญๆจก็ต '%s' ็ HEAD ๅผ็จ" + +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "้่ฟดๅญๆจก็ต '%s' ๅคฑๆ" + +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +msgid "Suppress submodule status output" +msgstr "้ปๆญขๅญๆจก็ต็ๆ ่ผธๅบ" + +#: builtin/submodule--helper.c:887 +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "ไฝฟ็จๅฒๅญๅจ็ดขๅผไธญ็ๆไบค๏ผ่้ๅฒๅญๅจๅญๆจก็ต HEAD ไธญ็ๆไบค" + +#: builtin/submodule--helper.c:888 +msgid "recurse into nested submodules" +msgstr "้่ฟด้ฒๅ ฅๅตๅฅๅญๆจก็ตไธญ" + +#: builtin/submodule--helper.c:893 +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "git submodule status [--quiet] [--cached] [--recursive] [<่ทฏๅพ>...]" + +#: builtin/submodule--helper.c:917 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper name <่ทฏๅพ>" + +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "* %s %s(blob)->%s(submodule)" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "* %s %s(submodule)->%s(blob)" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "็กๆณ้ๆนไพ่ช '%s' ็็ฉไปถ" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "้้ ๆ็ๆจกๅผ %o\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "ไฝฟ็จๅฒๅญๅจ็ดขๅผไธญ็ๆไบค่้ๅญๆจก็ต HEAD" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "ๆฏ่ผ็ดขๅผไธญ็๏ผๅๅญๆจก็ต HEAD ไธญ็ๆไบค" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "'ignore_config' ๅผ่จญ็บ 'all' ๆ็ฅ้ๅญๆจก็ต" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "้ๅถๆ่ฆๅคงๅฐ" + +#: builtin/submodule--helper.c:1311 +#| msgid "git submodule--helper init [<options>] [<path>]" +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule--helper summary [<้ธ้ >] [<ๆไบค>] [--] [<่ทฏๅพ>]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "็กๆณๅๅพ HEAD ็็ๆฌ" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "--cached ๅ --files ไบๆฅ" + +#: builtin/submodule--helper.c:1407 +#, c-format +msgid "Synchronizing submodule url for '%s'\n" +msgstr "็บ '%s' ๅๆญฅๅญๆจก็ต url\n" + +#: builtin/submodule--helper.c:1413 +#, c-format +msgid "failed to register url for submodule path '%s'" +msgstr "็กๆณ็บๅญๆจก็ต่ทฏๅพ '%s' ่จปๅ url" + +#: builtin/submodule--helper.c:1427 +#, c-format +msgid "failed to get the default remote for submodule '%s'" +msgstr "็กๆณๅพๅฐๅญๆจก็ต '%s' ็้ ่จญ้ ็ซฏ้่ฏ" + +#: builtin/submodule--helper.c:1438 +#, c-format +msgid "failed to update remote for submodule '%s'" +msgstr "็กๆณ็บๅญๆจก็ต '%s' ๆดๆฐ้ ็ซฏ้่ฏ" + +#: builtin/submodule--helper.c:1485 +msgid "Suppress output of synchronizing submodule url" +msgstr "้ปๆญขๅญๆจก็ต url ๅๆญฅ็่ผธๅบ" + +#: builtin/submodule--helper.c:1492 +msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule--helper sync [--quiet] [--recursive] [<่ทฏๅพ>]" + +#: builtin/submodule--helper.c:1546 +#, 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:1558 +#, c-format +msgid "" +"Submodule work tree '%s' contains local modifications; use '-f' to discard " +"them" +msgstr "ๅญๆจก็ตๅทฅไฝๅ '%s' ๅ ๅซๆฌๆฉไฟฎๆน๏ผไฝฟ็จ '-f' ๆจๆฃๅฎๅ" + +#: builtin/submodule--helper.c:1566 +#, c-format +msgid "Cleared directory '%s'\n" +msgstr "ๅทฒๆธ ้ค็ฎ้ '%s'\n" + +#: builtin/submodule--helper.c:1568 +#, c-format +msgid "Could not remove submodule work tree '%s'\n" +msgstr "็กๆณ็งป้คๅญๆจก็ตๅทฅไฝๅ '%s'\n" + +#: builtin/submodule--helper.c:1579 +#, c-format +msgid "could not create empty submodule directory %s" +msgstr "ไธ่ฝๅปบ็ซ็ฉบ็ๅญๆจก็ต็ฎ้ %s" + +#: builtin/submodule--helper.c:1595 +#, c-format +msgid "Submodule '%s' (%s) unregistered for path '%s'\n" +msgstr "ๅญๆจก็ต '%s'๏ผ%s๏ผๆชๅฐ่ทฏๅพ '%s' ่จปๅ\n" + +#: builtin/submodule--helper.c:1624 +msgid "Remove submodule working trees even if they contain local changes" +msgstr "ๅช้คๅญๆจก็ตๅทฅไฝๅ๏ผๅณไฝฟๅ ๅซๆฌๆฉไฟฎๆน" + +#: builtin/submodule--helper.c:1625 +msgid "Unregister all submodules" +msgstr "ๅฐๆๆๅญๆจก็ตๅๆถ่จปๅ" + +#: builtin/submodule--helper.c:1630 +msgid "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" +msgstr "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<่ทฏๅพ>...]]" + +#: builtin/submodule--helper.c:1644 +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "ๅฆๆๆจ็ขบๅฎๆณ่ฆๅฐๆๆๅญๆจก็ตๅท่กๅๆถๅๅงๅ๏ผ่ซไฝฟ็จ '--all'" + +#: builtin/submodule--helper.c:1713 +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:1752 builtin/submodule--helper.c:1755 +#, c-format +msgid "submodule '%s' cannot add alternate: %s" +msgstr "ๅญๆจก็ต '%s' ไธ่ฝๆฐๅข็ๆฌๅบซๅ้ธ๏ผ%s" + +#: builtin/submodule--helper.c:1791 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "ไธ่ฝ่ญๅฅ submodule.alternateErrorStrategy ็ๅๅผ '%s'" + +#: builtin/submodule--helper.c:1798 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "ไธ่ฝ่ญๅฅ submodule.alternateLocaion ็ๅๅผ '%s'" + +#: builtin/submodule--helper.c:1822 +msgid "where the new submodule will be cloned to" +msgstr "ๆฐ็ๅญๆจก็ตๅฐ่ฆ่ค่ฃฝ็่ทฏๅพ" + +#: builtin/submodule--helper.c:1825 +msgid "name of the new submodule" +msgstr "ๆฐๅญๆจก็ต็ๅ็จฑ" + +#: builtin/submodule--helper.c:1828 +msgid "url where to clone the submodule from" +msgstr "่ค่ฃฝๅญๆจก็ต็ url ไฝๅ" + +#: builtin/submodule--helper.c:1836 +msgid "depth for shallow clones" +msgstr "ๆทบ่ค่ฃฝ็ๆทฑๅบฆ" + +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +msgid "force cloning progress" +msgstr "ๅผทๅถ้กฏ็คบ่ค่ฃฝ้ฒๅบฆ" + +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +msgid "disallow cloning into non-empty directory" +msgstr "ไธๅ ่จฑ่ค่ฃฝ่ณ้็ฉบ็ฝ็ฎ้" + +#: builtin/submodule--helper.c:1848 +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:1873 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "ๆ็ตๅจๅ ถไปๅญๆจก็ต็ git ่ทฏๅพๅปบ็ซ๏ผไฝฟ็จใ%sใ" + +#: builtin/submodule--helper.c:1884 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "็กๆณ่ค่ฃฝ '%s' ๅฐๅญๆจก็ต่ทฏๅพ '%s'" + +#: builtin/submodule--helper.c:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "็ฎ้ไธๆฏ็ฉบ็๏ผใ%sใ" + +#: builtin/submodule--helper.c:1900 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "็กๆณๅพๅฐ '%s' ็ๅญๆจก็ต็ฎ้" + +#: builtin/submodule--helper.c:1936 +#, c-format +msgid "Invalid update mode '%s' for submodule path '%s'" +msgstr "ๅญๆจก็ต '%2$s' ็ๆดๆฐๆจกๅผ '%1$s' ็กๆ" + +#: builtin/submodule--helper.c:1940 +#, c-format +msgid "Invalid update mode '%s' configured for submodule path '%s'" +msgstr "็บๅญๆจก็ต '%2$s' ่จญๅฎ็ๆดๆฐๆจกๅผ '%1$s' ็กๆ" + +#: builtin/submodule--helper.c:2041 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "ๅญๆจก็ต '%s' ๅฐๆชๅๅงๅ" + +#: builtin/submodule--helper.c:2045 +msgid "Maybe you want to use 'update --init'?" +msgstr "ไน่จฑๆจๆณ่ฆๅท่ก 'update --init'๏ผ" + +#: builtin/submodule--helper.c:2075 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "็ฅ้ๆชๅไฝต็ๅญๆจก็ต %s" + +#: builtin/submodule--helper.c:2104 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "็ฅ้ๅญๆจก็ต '%s'" + +#: builtin/submodule--helper.c:2254 +#, c-format +msgid "Failed to clone '%s'. Retry scheduled" +msgstr "่ค่ฃฝ '%s' ๅคฑๆใๆ่จๅ้่ฉฆ" + +#: builtin/submodule--helper.c:2265 +#, c-format +msgid "Failed to clone '%s' a second time, aborting" +msgstr "็ฌฌไบๆฌกๅ่ฉฆ่ค่ฃฝ '%s' ๅคฑๆ๏ผ้ข้" + +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 +msgid "path into the working tree" +msgstr "ๅฐๅทฅไฝๅ็่ทฏๅพ" + +#: builtin/submodule--helper.c:2330 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "ๅทฅไฝๅไธญ็่ทฏๅพ๏ผ้่ฟดๅตๅฅๅญๆจก็ต" + +#: builtin/submodule--helper.c:2334 +msgid "rebase, merge, checkout or none" +msgstr "rebaseใmergeใcheckout ๆ none" + +#: builtin/submodule--helper.c:2340 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "ๅปบ็ซไธๅๆๅฎๆทฑๅบฆ็ๆทบ่ค่ฃฝ" + +#: builtin/submodule--helper.c:2343 +msgid "parallel jobs" +msgstr "ไธฆ็ผไปปๅ" + +#: builtin/submodule--helper.c:2345 +msgid "whether the initial clone should follow the shallow recommendation" +msgstr "ๅๅง่ค่ฃฝๆฏๅฆๆ่ฉฒ้ตๅฎๆจ่ฆ็ๆทบ่ค่ฃฝ้ธ้ " + +#: builtin/submodule--helper.c:2346 +msgid "don't print cloning progress" +msgstr "ไธ่ฆ่ผธๅบ่ค่ฃฝ้ฒๅบฆ" + +#: builtin/submodule--helper.c:2357 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=<่ทฏๅพ>] [<่ทฏๅพ>...]" + +#: builtin/submodule--helper.c:2370 +msgid "bad value for update parameter" +msgstr "update ๅๆธๅๅผ้ฏ่ชค" + +#: builtin/submodule--helper.c:2418 +#, 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:2541 +#, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "็กๆณ็ฒๅพๅญๆจก็ต '%s' ็็ๆฌๅบซๅฅๆ" + +#: builtin/submodule--helper.c:2574 +msgid "recurse into submodules" +msgstr "ๅจๅญๆจก็ตไธญ้่ฟด" + +#: builtin/submodule--helper.c:2580 +msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" +msgstr "git submodule--helper absorb-git-dirs [<้ธ้ >] [<่ทฏๅพ>...]" + +#: builtin/submodule--helper.c:2636 +msgid "check if it is safe to write to the .gitmodules file" +msgstr "ๆชขๆฅๅฏซๅ ฅ .gitmodules ๆชๆกๆฏๅฆๅฎๅ จ" + +#: builtin/submodule--helper.c:2639 +msgid "unset the config in the .gitmodules file" +msgstr "ๅๆถ .gitmodules ๆชๆกไธญ็่จญๅฎ" + +#: builtin/submodule--helper.c:2644 +msgid "git submodule--helper config <name> [<value>]" +msgstr "git submodule--helper config <ๅ็จฑ> [<ๅผ>]" + +#: builtin/submodule--helper.c:2645 +msgid "git submodule--helper config --unset <name>" +msgstr "git submodule--helper config --unset <ๅ็จฑ>" + +#: builtin/submodule--helper.c:2646 +msgid "git submodule--helper config --check-writeable" +msgstr "git submodule--helper config --check-writeable" + +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 +#, sh-format +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "่ซ็ขบ่ช .gitmodules ๆชๆกๅจๅทฅไฝๅ่ฃก" + +#: builtin/submodule--helper.c:2681 +msgid "Suppress output for setting url of a submodule" +msgstr "้ปๆญขๅญๆจก็ต่จญๅฎ URL ็่ผธๅบ" + +#: builtin/submodule--helper.c:2685 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper set-url [--quiet] <่ทฏๅพ> <ๆฐ URL>" + +#: builtin/submodule--helper.c:2718 +msgid "set the default tracking branch to master" +msgstr "ๅฐ้ ่จญ็่ฟฝ่นคๅๆฏ่จญ็บ master" + +#: builtin/submodule--helper.c:2720 +msgid "set the default tracking branch" +msgstr "่จญๅฎ้ ่จญ่ฟฝ่นคๅๆฏ" + +#: builtin/submodule--helper.c:2724 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" + +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" + +#: builtin/submodule--helper.c:2732 +msgid "--branch or --default required" +msgstr "้่ฆ --branch ๆ --default" + +#: builtin/submodule--helper.c:2735 +msgid "--branch and --default are mutually exclusive" +msgstr "--branch ่ --default ไบๆฅ" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 +#, c-format +msgid "%s doesn't support --super-prefix" +msgstr "%s ไธๆฏๆด --super-prefix" + +#: builtin/submodule--helper.c:2798 +#, 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:486 +msgid "reason" +msgstr "ๅๅ " + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +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>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" +msgstr "" +"git tag -l [-n[<ๆธๅญ>]] [--contains <ๆไบค>] [--no-contains <ๆไบค>] [--points-" +"at <็ฉไปถ>]\n" +"\t\t[--format=<ๆ ผๅผ>] [--merged <ๆไบค>] [--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:285 +msgid "no tag message?" +msgstr "็กๆจ็ฑค่ชชๆ๏ผ" + +#: builtin/tag.c:292 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "ๆจ็ฑค่ชชๆ่ขซไฟ็ๅจ %s\n" + +#: builtin/tag.c:403 +msgid "list tag names" +msgstr "ๅๅบๆจ็ฑคๅ็จฑ" + +#: builtin/tag.c:405 +msgid "print <n> lines of each tag message" +msgstr "ๆฏๅๆจ็ฑค่จๆฏๅๅฐ <n> ่ก" + +#: builtin/tag.c:407 +msgid "delete tags" +msgstr "ๅช้คๆจ็ฑค" + +#: builtin/tag.c:408 +msgid "verify tags" +msgstr "้ฉ่ญๆจ็ฑค" + +#: builtin/tag.c:410 +msgid "Tag creation options" +msgstr "ๆจ็ฑคๅปบ็ซ้ธ้ " + +#: builtin/tag.c:412 +msgid "annotated tag, needs a message" +msgstr "้่จปๆจ็ฑค๏ผ้่ฆไธๅ่ชชๆ" + +#: builtin/tag.c:414 +msgid "tag message" +msgstr "ๆจ็ฑค่ชชๆ" + +#: builtin/tag.c:416 +msgid "force edit of tag message" +msgstr "ๅผทๅถ็ทจ่ผฏๆจ็ฑค่ชชๆ" + +#: builtin/tag.c:417 +msgid "annotated and GPG-signed tag" +msgstr "้่จปไธฆ้ๅ GPG ็ฐฝๅ็ๆจ็ฑค" + +#: builtin/tag.c:420 +msgid "use another key to sign the tag" +msgstr "ไฝฟ็จๅฆๅค็็ง้ฐ็ฐฝๅ่ฉฒๆจ็ฑค" + +#: builtin/tag.c:421 +msgid "replace the tag if exists" +msgstr "ๅฆๆๅญๅจ๏ผๅไปฃ็พๆ็ๆจ็ฑค" + +#: builtin/tag.c:422 builtin/update-ref.c:492 +msgid "create a reflog" +msgstr "ๅปบ็ซๅผ็จๆฅ่ช" + +#: builtin/tag.c:424 +msgid "Tag listing options" +msgstr "ๆจ็ฑคๅ่กจ้ธ้ " + +#: builtin/tag.c:425 +msgid "show tag list in columns" +msgstr "ไปฅๅ็ๆนๅผ้กฏ็คบๆจ็ฑคๅ่กจ" + +#: builtin/tag.c:426 builtin/tag.c:428 +msgid "print only tags that contain the commit" +msgstr "ๅชๅๅฐๅ ๅซ่ฉฒๆไบค็ๆจ็ฑค" + +#: builtin/tag.c:427 builtin/tag.c:429 +msgid "print only tags that don't contain the commit" +msgstr "ๅชๅๅฐไธๅ ๅซ่ฉฒๆไบค็ๆจ็ฑค" + +#: builtin/tag.c:430 +msgid "print only tags that are merged" +msgstr "ๅชๅๅฐๅทฒ็ถๅไฝต็ๆจ็ฑค" + +#: builtin/tag.c:431 +msgid "print only tags that are not merged" +msgstr "ๅชๅๅฐๅฐๆชๅไฝต็ๆจ็ฑค" + +#: builtin/tag.c:435 +msgid "print only tags of the object" +msgstr "ๅชๅๅฐๆๅ่ฉฒ็ฉไปถ็ๆจ็ฑค" + +#: builtin/tag.c:483 +msgid "--column and -n are incompatible" +msgstr "--column ๅ -n ไธ็ธๅฎน" + +#: builtin/tag.c:505 +msgid "-n option is only allowed in list mode" +msgstr "-n ้ธ้ ๅชๅ ่จฑ็จๅจๅ่กจ้กฏ็คบๆจกๅผ" + +#: builtin/tag.c:507 +msgid "--contains option is only allowed in list mode" +msgstr "--contains ้ธ้ ๅชๅ ่จฑ็จๅจๅ่กจ้กฏ็คบๆจกๅผ" + +#: builtin/tag.c:509 +msgid "--no-contains option is only allowed in list mode" +msgstr "--no-contains ้ธ้ ๅชๅ ่จฑ็จๅจๅ่กจ้กฏ็คบๆจกๅผ" + +#: builtin/tag.c:511 +msgid "--points-at option is only allowed in list mode" +msgstr "--points-at ้ธ้ ๅชๅ ่จฑ็จๅจๅ่กจ้กฏ็คบๆจกๅผ" + +#: builtin/tag.c:513 +msgid "--merged and --no-merged options are only allowed in list mode" +msgstr "--merged ๅ --no-merged ้ธ้ ๅชๅ ่จฑ็จๅจๅ่กจ้กฏ็คบๆจกๅผ" + +#: builtin/tag.c:524 +msgid "only one -F or -m option is allowed." +msgstr "ๅชๅ ่จฑไธๅ -F ๆ -m ้ธ้ ใ" + +#: builtin/tag.c:543 +msgid "too many params" +msgstr "ๅคชๅคๅๆธ" + +#: builtin/tag.c:549 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "'%s' ไธๆฏไธๅๆๆ็ๆจ็ฑคๅ็จฑใ" + +#: builtin/tag.c:554 +#, c-format +msgid "tag '%s' already exists" +msgstr "ๆจ็ฑค '%s' ๅทฒๅญๅจ" + +#: builtin/tag.c:585 +#, 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:487 +msgid "delete the reference" +msgstr "ๅช้คๅผ็จ" + +#: builtin/update-ref.c:489 +msgid "update <refname> not the one it points to" +msgstr "ๆดๆฐ <ๅผ็จๅ> ๆฌ่บซ่ไธๆฏๅฎๆๅ็ๅผ็จ" + +#: builtin/update-ref.c:490 +msgid "stdin has NUL-terminated arguments" +msgstr "ๆจๆบ่ผธๅ ฅๆไปฅ NUL ๅญๅ ็ตๆญข็ๅๆธ" + +#: builtin/update-ref.c:491 +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:59 +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <ๅ >..." + +#: builtin/verify-pack.c:70 +msgid "verbose" +msgstr "่ฉณ็ดฐ่ผธๅบ" + +#: builtin/verify-pack.c:72 +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:970 +#, c-format +msgid "failed to delete '%s'" +msgstr "ๅช้ค '%s' ๅคฑๆ" + +#: builtin/worktree.c:85 +msgid "not a valid directory" +msgstr "้ๆๆ็ฎ้" + +#: builtin/worktree.c:91 +msgid "gitdir file does not exist" +msgstr "ๆพไธๅฐ gitdir ๆชๆก" + +#: builtin/worktree.c:96 builtin/worktree.c:105 +#, c-format +msgid "unable to read gitdir file (%s)" +msgstr "็กๆณ่ฎๅ gitdir ๆชๆก (%s)" + +#: builtin/worktree.c:115 +#, c-format +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "่ฎๅ้็ญ๏ผ้ ๆๆ %<PRIuMAX> ไฝๅ ็ต๏ผๅช่ฎๅฐ %<PRIuMAX>๏ผ" + +#: builtin/worktree.c:123 +msgid "invalid gitdir file" +msgstr "gitdir ๆชๆก็กๆ" + +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "gitdir ๆชๆกๆๅ็ไฝ็ฝฎไธๅญๅจ" + +#: builtin/worktree.c:146 +#, c-format +msgid "Removing %s/%s: %s" +msgstr "็งป้ค %s/%s: %s" + +#: builtin/worktree.c:221 +msgid "report pruned working trees" +msgstr "ๅ ฑๅๆธ ้ค็ๅทฅไฝๅ" + +#: builtin/worktree.c:223 +msgid "expire working trees older than <time>" +msgstr "ๅฐๆฉๆผ <ๆ้> ็ๅทฅไฝๅ้ๆ" + +#: builtin/worktree.c:293 +#, c-format +msgid "'%s' already exists" +msgstr "'%s' ๅทฒ็ถๅญๅจ" + +#: builtin/worktree.c:302 +#, c-format +msgid "unusable worktree destination '%s'" +msgstr "็กๆณไฝฟ็จ็ๅทฅไฝ็ฎ้็ฎ็ๅฐใ%sใ" + +#: builtin/worktree.c:307 +#, c-format +msgid "" +"'%s' is a missing but locked worktree;\n" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" +msgstr "" +"'%s' ๆฏๅ้บๅคฑไฝ่ขซ้ๅฎ็ๅทฅไฝๅ๏ผ\n" +"ไฝฟ็จ '%s -f -f' ่ฆ่๏ผๆ 'unlock' ๅ 'prune' ๆ 'remove' ๆธ ้ค" + +#: builtin/worktree.c:309 +#, c-format +msgid "" +"'%s' is a missing but already registered worktree;\n" +"use '%s -f' to override, or 'prune' or 'remove' to clear" +msgstr "" +"'%s' ๆฏๅ้บๅคฑไฝๅทฒ่จปๅ็ๅทฅไฝๅ๏ผ\n" +"ไฝฟ็จ '%s -f' ่ฆ่๏ผๆ 'prune' ๆ 'remove' ๆธ ้ค" + +#: builtin/worktree.c:360 +#, c-format +msgid "could not create directory of '%s'" +msgstr "ไธ่ฝๅปบ็ซ็ฎ้ '%s'" + +#: builtin/worktree.c:494 builtin/worktree.c:500 +#, c-format +msgid "Preparing worktree (new branch '%s')" +msgstr "ๆบๅๅทฅไฝๅ๏ผๆฐๅๆฏ '%s'๏ผ" + +#: builtin/worktree.c:496 +#, c-format +msgid "Preparing worktree (resetting branch '%s'; was at %s)" +msgstr "ๆบๅๅทฅไฝๅ๏ผ้่จญๅๆฏ '%s'๏ผไนๅ็บ %s๏ผ" + +#: builtin/worktree.c:505 +#, c-format +msgid "Preparing worktree (checking out '%s')" +msgstr "ๆบๅๅทฅไฝๅ๏ผๆชขๅบ '%s'๏ผ" + +#: builtin/worktree.c:511 +#, c-format +msgid "Preparing worktree (detached HEAD %s)" +msgstr "ๆบๅๅทฅไฝๅ๏ผๅ้ข้้ ญๆๆจ %s๏ผ" + +#: builtin/worktree.c:552 +msgid "checkout <branch> even if already checked out in other worktree" +msgstr "ๆชขๅบ <ๅๆฏ>๏ผๅณไฝฟๅทฒ็ถ่ขซๆชขๅบๅฐๅ ถๅฎๅทฅไฝๅ" + +#: builtin/worktree.c:555 +msgid "create a new branch" +msgstr "ๅปบ็ซไธๅๆฐๅๆฏ" + +#: builtin/worktree.c:557 +msgid "create or reset a branch" +msgstr "ๅปบ็ซๆ้่จญไธๅๅๆฏ" + +#: builtin/worktree.c:559 +msgid "populate the new working tree" +msgstr "็ๆๆฐ็ๅทฅไฝๅ" + +#: builtin/worktree.c:560 +msgid "keep the new working tree locked" +msgstr "้ๅฎๆฐๅทฅไฝๅ" + +#: builtin/worktree.c:563 +msgid "set up tracking mode (see git-branch(1))" +msgstr "่จญๅฎ่ฟฝ่นคๆจกๅผ๏ผๅ่ฆ git-branch(1)๏ผ" + +#: builtin/worktree.c:566 +msgid "try to match the new branch name with a remote-tracking branch" +msgstr "ๅ่ฉฆ็บๆฐๅๆฏๅ็ฌฆๅไธๅ้ ็ซฏ่ฟฝ่นคๅๆฏ" + +#: builtin/worktree.c:574 +msgid "-b, -B, and --detach are mutually exclusive" +msgstr "-bใ-B ๅ --detach ๆฏไบๆฅ็" + +#: builtin/worktree.c:635 +msgid "--[no-]track can only be used if a new branch is created" +msgstr "ๅช่ฝๅจๅปบ็ซๆฐๅๆฏๆไฝฟ็จ --[no-]track ้ธ้ " + +#: builtin/worktree.c:755 +msgid "reason for locking" +msgstr "้ๅฎๅๅ " + +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 +#, c-format +msgid "'%s' is not a working tree" +msgstr "'%s' ไธๆฏไธๅๅทฅไฝๅ" + +#: builtin/worktree.c:769 builtin/worktree.c:802 +msgid "The main working tree cannot be locked or unlocked" +msgstr "ไธปๅทฅไฝๅ็กๆณ่ขซๅ ้ๆ่งฃ้" + +#: builtin/worktree.c:774 +#, c-format +msgid "'%s' is already locked, reason: %s" +msgstr "'%s' ๅทฒ่ขซ้ๅฎ๏ผๅๅ ๏ผ%s" + +#: builtin/worktree.c:776 +#, c-format +msgid "'%s' is already locked" +msgstr "'%s' ๅทฒ่ขซ้ๅฎ" + +#: builtin/worktree.c:804 +#, c-format +msgid "'%s' is not locked" +msgstr "'%s' ๆช่ขซ้ๅฎ" + +#: builtin/worktree.c:845 +msgid "working trees containing submodules cannot be moved or removed" +msgstr "ไธ่ฝ็งปๅๆๅช้คๅ ๅซๅญๆจก็ต็ๅทฅไฝๅ" + +#: builtin/worktree.c:853 +msgid "force move even if worktree is dirty or locked" +msgstr "ๅผทๅถ็งปๅ๏ผๅณไฝฟๅทฅไฝๅๆฏ้ซ็ๆๅทฒ้ๅฎ" + +#: builtin/worktree.c:876 builtin/worktree.c:1000 +#, c-format +msgid "'%s' is a main working tree" +msgstr "'%s' ๆฏไธๅไธปๅทฅไฝๅ" + +#: builtin/worktree.c:881 +#, c-format +msgid "could not figure out destination name from '%s'" +msgstr "็กๆณๅพ '%s' ็ฎๅบ็ฎๆจๅ็จฑ" + +#: builtin/worktree.c:894 +#, 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:896 +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:899 +#, c-format +msgid "validation failed, cannot move working tree: %s" +msgstr "้ฉ่ญๅคฑๆ๏ผ็กๆณ็งปๅๅทฅไฝๅ๏ผ%s" + +#: builtin/worktree.c:904 +#, c-format +msgid "failed to move '%s' to '%s'" +msgstr "็งปๅ '%s' ๅฐ '%s' ๅคฑๆ" + +#: builtin/worktree.c:950 +#, c-format +msgid "failed to run 'git status' on '%s'" +msgstr "ๅจ '%s' ไธญๅท่ก 'git status' ๅคฑๆ" + +#: builtin/worktree.c:954 +#, c-format +msgid "'%s' contains modified or untracked files, use --force to delete it" +msgstr "'%s' ๅ ๅซไฟฎๆนๆๆช่ฟฝ่นค็ๆชๆก๏ผไฝฟ็จ --force ๅช้ค" + +#: builtin/worktree.c:959 +#, c-format +msgid "failed to run 'git status' on '%s', code %d" +msgstr "ๅจ '%s' ไธญๅท่ก 'git status' ๅคฑๆ๏ผ้ข้็ขผ %d" + +#: builtin/worktree.c:982 +msgid "force removal even if worktree is dirty or locked" +msgstr "ๅผทๅถๅช้ค๏ผๅณไฝฟๅทฅไฝๅๆฏ้ซ็ๆๅทฒ้ๅฎ" + +#: builtin/worktree.c:1005 +#, 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:1007 +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:1010 +#, c-format +msgid "validation failed, cannot remove working tree: %s" +msgstr "้ฉ่ญๅคฑๆ๏ผ็กๆณๅช้คๅทฅไฝๅ๏ผ%s" + +#: builtin/worktree.c:1034 +#, c-format +msgid "repair: %s: %s" +msgstr "ไฟฎๅพฉ๏ผ%s๏ผ%s" + +#: builtin/worktree.c:1037 +#, c-format +msgid "error: %s: %s" +msgstr "้ฏ่ชค๏ผ%s๏ผ%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 "ๅชๅฐ้ค้ฏๆ็จ" + +#: http-fetch.c:114 +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "ๅณๅ ฅ --packfile ็ๅๆธๅฟ ้ ๆฏๆๆ็้ๆน (ๆถๅฐ '%s')" + +#: http-fetch.c:122 +msgid "not a git repository" +msgstr "ไธๆฏไธๅ git ็ๆฌๅบซ" + +#: t/helper/test-reach.c:154 +#, c-format +msgid "commit %s is not marked reachable" +msgstr "ๆไบค %s ๆฒๆๆจ่จ็บๅฏไปฅๅๅพ" + +#: t/helper/test-reach.c:164 +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:28 +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:35 +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:187 +#, c-format +msgid "no directory given for --git-dir\n" +msgstr "ๆฒๆ็บ --git-dir ๆไพ็ฎ้\n" + +#: git.c:201 +#, c-format +msgid "no namespace given for --namespace\n" +msgstr "ๆฒๆ็บ --namespace ๆไพๅฝๅ็ฉบ้\n" + +#: git.c:215 +#, c-format +msgid "no directory given for --work-tree\n" +msgstr "ๆฒๆ็บ --work-tree ๆไพ็ฎ้\n" + +#: git.c:229 +#, c-format +msgid "no prefix given for --super-prefix\n" +msgstr "ๆฒๆ็บ --super-prefix ๆไพๅ็ถด\n" + +#: git.c:251 +#, c-format +msgid "-c expects a configuration string\n" +msgstr "ๆ็บ -c ๆไพไธๅ่จญๅฎๅญไธฒ\n" + +#: git.c:289 +#, c-format +msgid "no directory given for -C\n" +msgstr "ๆฒๆ็บ -C ๆไพ็ฎ้\n" + +#: git.c:315 +#, c-format +msgid "unknown option: %s\n" +msgstr "ๆช็ฅ้ธ้ ๏ผ%s\n" + +#: git.c:364 +#, c-format +msgid "while expanding alias '%s': '%s'" +msgstr "ๅจๆดๅฑๅฅๅ '%s' ๆ๏ผ'%s'" + +#: git.c:373 +#, 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:380 +#, c-format +msgid "empty alias for %s" +msgstr "%s ็็ฉบๅฅๅ" + +#: git.c:383 +#, c-format +msgid "recursive alias: %s" +msgstr "้่ฟด็ๅฅๅ๏ผ%s" + +#: git.c:465 +msgid "write failure on standard output" +msgstr "ๅจๆจๆบ่ผธๅบๅฏซๅ ฅๅคฑๆ" + +#: git.c:467 +msgid "unknown write failure on standard output" +msgstr "ๅฐๆจๆบ่ผธๅบ็ๆช็ฅๅฏซๅ ฅ้ฏ่ชค" + +#: git.c:469 +msgid "close failed on standard output" +msgstr "ๆจๆบ่ผธๅบ้้ๅคฑๆ" + +#: git.c:819 +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "ๆชขๆธฌๅฐๅฅๅๅพช็ฐ๏ผ'%s'็ๆดๅฑๆช็ตๆญข๏ผ%s" + +#: git.c:869 +#, c-format +msgid "cannot handle %s as a builtin" +msgstr "ไธ่ฝไฝ็บๅ งๅปบๆไปค่็ %s" + +#: git.c:882 +#, c-format +msgid "" +"usage: %s\n" +"\n" +msgstr "" +"็จๆณ๏ผ%s\n" +"\n" + +#: git.c:902 +#, c-format +msgid "expansion of alias '%s' failed; '%s' is not a git command\n" +msgstr "ๅฑ้ๅฅๅๆไปค '%s' ๅคฑๆ๏ผ'%s' ไธๆฏไธๅ git ๆไปค\n" + +#: git.c:914 +#, c-format +msgid "failed to run command '%s': %s\n" +msgstr "ๅท่กๆไปค '%s' ๅคฑๆ๏ผ%s\n" + +#: http.c:399 +#, c-format +msgid "negative value for http.postbuffer; defaulting to %d" +msgstr "http.postbuffer ็บ่ฒ ๅผ๏ผ้ ่จญ็บ %d" + +#: http.c:420 +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "ไธๆฏๆดๅง่จๆงๅถ๏ผๅ ็บ cURL < 7.22.0" + +#: http.c:429 +msgid "Public key pinning not supported with cURL < 7.44.0" +msgstr "ไธๆฏๆดๅ ฌ้ฐๆชๆก้ๅฎ๏ผๅ ็บ cURL < 7.44.0" + +#: http.c:910 +msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" +msgstr "ไธๆฏๆด CURLSSLOPT_NO_REVOKE๏ผๅ ็บ cURL < 7.44.0" + +#: http.c:989 +msgid "Protocol restrictions not supported with cURL < 7.19.4" +msgstr "ไธๆฏๆดๅๅฎ้ๅถ๏ผๅ ็บ cURL < 7.19.4" + +#: http.c:1132 +#, c-format +msgid "Unsupported SSL backend '%s'. Supported SSL backends:" +msgstr "ไธๆฏๆด็ SSL ๅพ็ซฏ '%s'ใๆฏๆด็ SSL ๅพ็ซฏ๏ผ" + +#: http.c:1139 +#, c-format +msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" +msgstr "็กๆณ่จญๅฎ SSL ๅพ็ซฏ็บ '%s'๏ผcURL: cURL ๆฒๆไฝฟ็จ SSL ๅพ็ซฏ็ตๅปบ" + +#: http.c:1143 +#, c-format +msgid "Could not set SSL backend to '%s': already set" +msgstr "็กๆณๅฐ SSL ๅพ็ซฏ่จญๅฎ็บ '%s'๏ผๅทฒ็ถ่จญๅฎ" + +#: http.c:2025 +#, 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:174 +#, c-format +msgid "invalid quoting in push-option value: '%s'" +msgstr "ๅจ push-option ๅๅผไธญ็กๆ็ๅผ่๏ผ'%s'" + +#: remote-curl.c:298 +#, c-format +msgid "%sinfo/refs not valid: is this a git repository?" +msgstr "%sinfo/refs ็กๆ๏ผ้ๆฏไธๅ git ็ๆฌๅบซๅ๏ผ" + +#: remote-curl.c:399 +msgid "invalid server response; expected service, got flush packet" +msgstr "็กๆ็ๆๅ็ซฏๅๆใ้ ๆๆๅ๏ผๅพๅฐ flush ๅ " + +#: remote-curl.c:430 +#, c-format +msgid "invalid server response; got '%s'" +msgstr "็กๆ็ๆๅ็ซฏๅๆ๏ผๅพๅฐ '%s'" + +#: remote-curl.c:490 +#, c-format +msgid "repository '%s' not found" +msgstr "็ๆฌๅบซ '%s' ๆชๆพๅฐ" + +#: remote-curl.c:494 +#, c-format +msgid "Authentication failed for '%s'" +msgstr "'%s' ่บซไปฝ้ฉ่ญๅคฑๆ" + +#: remote-curl.c:498 +#, c-format +msgid "unable to access '%s': %s" +msgstr "็กๆณๅญๅ '%s'๏ผ%s" + +#: remote-curl.c:504 +#, c-format +msgid "redirecting to %s" +msgstr "้ๅฎๅๅฐ %s" + +#: remote-curl.c:633 +msgid "shouldn't have EOF when not gentle on EOF" +msgstr "็ถๆฒๆ่จญๅฎๆบซๅ่็ๆชๆก็ตๆ็ฌฆ๏ผEOF๏ผๆ๏ผไธๆ่ฉฒๆๆชๆก็ตๆ็ฌฆ" + +#: remote-curl.c:645 +msgid "remote server sent stateless separator" +msgstr "้ ็ซฏไผบๆๅจๅณ้ไบ็ก็ๆ ็ๅ้็ฌฆ่" + +#: remote-curl.c:715 +msgid "unable to rewind rpc post data - try increasing http.postBuffer" +msgstr "็กๆณ้ๅ rpc post ่ณๆ - ๅ่ฉฆๅขๅ http.postBuffer" + +#: remote-curl.c:745 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curl: ้ฏ่ชค็่ก้ทๅบฆๅญไธฒ๏ผ%.4s" + +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curl: ้้ ๆ็ๅๆ็ตๆๅฐๅ " + +#: remote-curl.c:823 +#, c-format +msgid "RPC failed; %s" +msgstr "RPC ๅคฑๆใ%s" + +#: remote-curl.c:863 +msgid "cannot handle pushes this big" +msgstr "ไธ่ฝ่็้้บผๅคง็ๆจ้" + +#: remote-curl.c:978 +#, c-format +msgid "cannot deflate request; zlib deflate error %d" +msgstr "ไธ่ฝๅฃ็ธฎ่ซๆฑ๏ผzlib ๅฃ็ธฎ้ฏ่ชค %d" + +#: remote-curl.c:982 +#, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "ไธ่ฝๅฃ็ธฎ่ซๆฑ๏ผzlib ็ตๆ้ฏ่ชค %d" + +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" +msgstr "ๆถๅฐไบ %d ไฝๅ ็ต้ทๅบฆ็ๆจ้ ญ" + +#: remote-curl.c:1034 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "้ ๆไป่ฆๆ %d ไฝๅ ็ต็ๆฌๆ (body)" + +#: remote-curl.c:1123 +msgid "dumb http transport does not support shallow capabilities" +msgstr "ๅ http ๅณ่ผธไธๆฏๆด shalllow ่ฝๅ" + +#: remote-curl.c:1138 +msgid "fetch failed." +msgstr "ๅๅพๅคฑๆใ" + +#: remote-curl.c:1184 +msgid "cannot fetch by sha1 over smart http" +msgstr "็กๆณ้้ๆบๆ ง HTTP ๅๅพ sha1" + +#: remote-curl.c:1228 remote-curl.c:1234 +#, c-format +msgid "protocol error: expected sha/ref, got '%s'" +msgstr "ๅๅฎ้ฏ่ชค๏ผๆๆ sha/ref๏ผๅปๅพๅฐ '%s'" + +#: remote-curl.c:1246 remote-curl.c:1361 +#, c-format +msgid "http transport does not support %s" +msgstr "http ๅณ่ผธๅๅฎไธๆฏๆด %s" + +#: remote-curl.c:1282 +msgid "git-http-push failed" +msgstr "git-http-push ๅคฑๆ" + +#: remote-curl.c:1467 +msgid "remote-curl: usage: git remote-curl <remote> [<url>]" +msgstr "remote-curl๏ผ็จๆณ๏ผgit remote-curl <้ ็ซฏ> [<url>]" + +#: remote-curl.c:1499 +msgid "remote-curl: error reading command stream from git" +msgstr "remote-curl๏ผ้ฏ่ชค่ฎๅไพ่ช git ็ๆไปคๆต" + +#: remote-curl.c:1506 +msgid "remote-curl: fetch attempted without a local repo" +msgstr "remote-curl๏ผๅ่ฉฆๆฒๆๆฌๆฉ็ๆฌๅบซไธๅๅพ" + +#: remote-curl.c:1547 +#, c-format +msgid "remote-curl: unknown command '%s' from git" +msgstr "remote-curl๏ผๆช็ฅ็ไพ่ช git ็ๆไปค '%s'" + +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "ๆฒๆๅฏ็จ็็ทจ่ญฏๅจ่ณ่จ\n" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "ๆฒๆๅฏ็จ็ libc ่ณ่จ\n" + +#: list-objects-filter-options.h:91 +msgid "args" +msgstr "ๅๆธ" + +#: list-objects-filter-options.h:92 +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 object names" +msgstr "็จ <n> ไฝๆธๅญ้กฏ็คบ็ฉไปถๅ็จฑ" + +#: 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:96 +msgid "key" +msgstr "key" + +#: ref-filter.h:96 +msgid "field name to sort on" +msgstr "ๆๅบ็ๆฌไฝๅ" + +#: rerere.h:44 +msgid "update the index with reused conflict resolution if possible" +msgstr "ๅฆๆๅฏ่ฝ๏ผ้็จ่ก็ช่งฃๆฑบๆดๆฐ็ดขๅผ" + +#: wt-status.h:80 +msgid "HEAD detached at " +msgstr "้้ ญๆๆจๅ้ขๆผ " + +#: wt-status.h:81 +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 "Collect information for user to file a bug report" +msgstr "ๅนซไฝฟ็จ่ ๆถ้่ฆ้้่ญ่ฒๅ ฑๅ็่ณ่จ" + +#: command-list.h:60 +msgid "Move objects and refs by archive" +msgstr "้้ๆญธๆช็งปๅ็ฉไปถๅๅผ็จ" + +#: command-list.h:61 +msgid "Provide content or type and size information for repository objects" +msgstr "ๆไพ็ๆฌๅบซ็ฉไปถ็ๅ งๅฎนใ้กๅๆๅคงๅฐ" + +#: command-list.h:62 +msgid "Display gitattributes information" +msgstr "้กฏ็คบ gitattributes ่จๆฏ" + +#: command-list.h:63 +msgid "Debug gitignore / exclude files" +msgstr "้ค้ฏ gitignore / exclude ๆชๆก" + +#: command-list.h:64 +msgid "Show canonical names and email addresses of contacts" +msgstr "้กฏ็คบ่ฏ็ตกไบบ็่ฆ็ฏๅ็จฑๅ้ปๅญไฟกไปถ" + +#: command-list.h:65 +msgid "Switch branches or restore working tree files" +msgstr "ๅๆๅๆฏๆๅพฉๅๅทฅไฝๅๆชๆก" + +#: command-list.h:66 +msgid "Copy files from the index to the working tree" +msgstr "ๅพ็ดขๅผ่ค่ฃฝๆชๆกๅฐๅทฅไฝๅ" + +#: command-list.h:67 +msgid "Ensures that a reference name is well formed" +msgstr "็ขบไฟๅผ็จๅ็จฑๆ ผๅผๆญฃ็ขบ" + +#: command-list.h:68 +msgid "Find commits yet to be applied to upstream" +msgstr "ๅฐๆพๅฐๆชๅฅ็จๅฐไธๆธธ็ๆไบค" + +#: command-list.h:69 +msgid "Apply the changes introduced by some existing commits" +msgstr "ๆ็จไธไบ็พๅญๆไบคๅผๅ ฅ็ไฟฎๆน" + +#: command-list.h:70 +msgid "Graphical alternative to git-commit" +msgstr "git-commit ็ๅๅฝขๆฟไปฃไป้ข" + +#: command-list.h:71 +msgid "Remove untracked files from the working tree" +msgstr "ๅพๅทฅไฝๅไธญๅช้คๆช่ฟฝ่นคๆชๆก" + +#: command-list.h:72 +msgid "Clone a repository into a new directory" +msgstr "่ค่ฃฝ็ๆฌๅบซๅฐไธๅๆฐ็ฎ้" + +#: command-list.h:73 +msgid "Display data in columns" +msgstr "ไปฅๅ็ๆนๅผ้กฏ็คบ่ณๆ" + +#: command-list.h:74 +msgid "Record changes to the repository" +msgstr "่จ้่ฎๆดๅฐ็ๆฌๅบซ" + +#: command-list.h:75 +msgid "Write and verify Git commit-graph files" +msgstr "ๅฏซๅ ฅๅ้ฉ่ญ Git ๆไบคๅๆชๆก" + +#: command-list.h:76 +msgid "Create a new commit object" +msgstr "ๅปบ็ซไธๅๆฐ็ๆไบค็ฉไปถ" + +#: command-list.h:77 +msgid "Get and set repository or global options" +msgstr "ๅๅพๅ่จญๅฎ็ๆฌๅบซๆ่ ๅ จๅ้ธ้ " + +#: command-list.h:78 +msgid "Count unpacked number of objects and their disk consumption" +msgstr "่จ็ฎๆชๆๅ ็ฉไปถ็ๆธ้ๅ็ฃ็ข็ฉบ้ๅ ็จ" + +#: command-list.h:79 +msgid "Retrieve and store user credentials" +msgstr "ๆชข็ดขๅๅฒๅญไฝฟ็จ่ ๅฏ็ขผ" + +#: command-list.h:80 +msgid "Helper to temporarily store passwords in memory" +msgstr "ๅจ่จๆถ้ซไธญๆซๆๅฒๅญๅฏ็ขผ็ๅๅฉๅทฅๅ ท" + +#: command-list.h:81 +msgid "Helper to store credentials on disk" +msgstr "ๅจ็ฃ็ขๅฒๅญๅฏ็ขผ็ๅๅฉๅทฅๅ ท" + +#: command-list.h:82 +msgid "Export a single commit to a CVS checkout" +msgstr "ๅฐไธๅๆไบคๅฏๅบๅฐ CVS ๆชขๅบไธญ" + +#: command-list.h:83 +msgid "Salvage your data out of another SCM people love to hate" +msgstr "ๅพๅฆๅคไธๅไบบๅๆๆจ็่จญๅฎ็ฎก็็ณป็ตฑไธญๆฏๆไฝ ็่ณๆ" + +#: command-list.h:84 +msgid "A CVS server emulator for Git" +msgstr "Git ็ไธๅ CVS ๆๅๆจกๆฌๅจ" + +#: command-list.h:85 +msgid "A really simple server for Git repositories" +msgstr "ไธๅ้ๅธธ็ฐกๅฎ็ Git ็ๆฌๅบซไผบๆๅจ" + +#: command-list.h:86 +msgid "Give an object a human readable name based on an available ref" +msgstr "ๅบๆผไธๅ็พๅญ็ๅผ็จ็บไธๅ็ฉไปถ่ตทไธๅๅฏ่ฎ็ๅ็จฑ" + +#: command-list.h:87 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "้กฏ็คบๆไบคไน้ใๆไบคๅๅทฅไฝๅไน้็ญ็ๅทฎ็ฐ" + +#: command-list.h:88 +msgid "Compares files in the working tree and the index" +msgstr "ๆฏ่ผๅทฅไฝๅๅ็ดขๅผๅไธญ็ๆชๆก" + +#: command-list.h:89 +msgid "Compare a tree to the working tree or index" +msgstr "ๅฐไธๅๆจนๅๅทฅไฝๅๆ็ดขๅผๅๆฏ่ผ" + +#: command-list.h:90 +msgid "Compares the content and mode of blobs found via two tree objects" +msgstr "ๆฏ่ผๅ ฉๅๆจน็็ฉไปถ็ๆชๆกๅ งๅฎนๅๆจกๅผ" + +#: command-list.h:91 +msgid "Show changes using common diff tools" +msgstr "ไฝฟ็จๅธธ่ฆ็ๅทฎ็ฐๅทฅๅ ท้กฏ็คบๆดๆน" + +#: command-list.h:92 +msgid "Git data exporter" +msgstr "Git ่ณๆๅฏๅบๅจ" + +#: command-list.h:93 +msgid "Backend for fast Git data importers" +msgstr "Git ๅฟซ้่ณๆๅฏๅ ฅๅจๅพ็ซฏ" + +#: command-list.h:94 +msgid "Download objects and refs from another repository" +msgstr "ๅพๅฆๅคไธๅ็ๆฌๅบซไธ่ผ็ฉไปถๅๅผ็จ" + +#: command-list.h:95 +msgid "Receive missing objects from another repository" +msgstr "ๅพๅฆไธๅ็ๆฌๅบซๅๅพ็ผบๅฐ็็ฉไปถ" + +#: command-list.h:96 +msgid "Rewrite branches" +msgstr "้ๅฏซๅๆฏ" + +#: command-list.h:97 +msgid "Produce a merge commit message" +msgstr "็ๆไธๅๅไฝตๆไบค่จๆฏ" + +#: command-list.h:98 +msgid "Output information on each ref" +msgstr "ๅฐๆฏไธๅๅผ็จ่ผธๅบ่จๆฏ" + +#: command-list.h:99 +msgid "Prepare patches for e-mail submission" +msgstr "ๆบๅ้ปๅญไฟกไปถๆไบค็ไฟฎ่ฃๆช" + +#: command-list.h:100 +msgid "Verifies the connectivity and validity of the objects in the database" +msgstr "้ฉ่ญ็ๆฌๅบซไธญ็ฉไปถ็้ฃ้ๆงๅๆๆๆง" + +#: command-list.h:101 +msgid "Cleanup unnecessary files and optimize the local repository" +msgstr "ๆธ ้คไธๅฟ ่ฆ็ๆชๆกๅๆไฝณๅๆฌๆฉ็ๆฌๅบซ" + +#: command-list.h:102 +msgid "Extract commit ID from an archive created using git-archive" +msgstr "ๅพ git-archive ๅปบ็ซ็ๆญธๆชๆชๆกไธญๆทๅๆไบค ID" + +#: command-list.h:103 +msgid "Print lines matching a pattern" +msgstr "่ผธๅบๅๆจกๅผ็ฌฆๅ็่ก" + +#: command-list.h:104 +msgid "A portable graphical interface to Git" +msgstr "ไธๅไพฟๆ็ Git ๅๅฝข็จๆถ็ซฏ" + +#: command-list.h:105 +msgid "Compute object ID and optionally creates a blob from a file" +msgstr "ๅพไธๅๆชๆก่จ็ฎ็ฉไปถ ID๏ผไธฆๅฏไปฅๅปบ็ซ blob ่ณๆ็ฉไปถ" + +#: command-list.h:106 +msgid "Display help information about Git" +msgstr "้กฏ็คบ Git ็่ชชๆ่จๆฏ" + +#: command-list.h:107 +msgid "Server side implementation of Git over HTTP" +msgstr "Git HTTP ๅๅฎ็ๆๅ็ซฏๅฏฆ็พ" + +#: command-list.h:108 +msgid "Download from a remote Git repository via HTTP" +msgstr "้้ HTTP ๅพ้ ็ซฏ Git ็ๆฌๅบซไธ่ผ" + +#: command-list.h:109 +msgid "Push objects over HTTP/DAV to another repository" +msgstr "้้ HTTP/DAV ๆจ้็ฉไปถๅฆไธๅ็ๆฌๅบซ" + +#: command-list.h:110 +msgid "Send a collection of patches from stdin to an IMAP folder" +msgstr "ๅพๆจๆบ่ผธๅ ฅๅฐไธ็ตไฟฎ่ฃๆชๅณ้ๅฐIMAP่ณๆๅคพ" + +#: command-list.h:111 +msgid "Build pack index file for an existing packed archive" +msgstr "ๅพไธๅ็พๅญ็ๅ ๅญๆชๆชๆกๅปบ็ซๅ ็ดขๅผ" + +#: command-list.h:112 +msgid "Create an empty Git repository or reinitialize an existing one" +msgstr "ๅปบ็ซไธๅ็ฉบ็ Git ็ๆฌๅบซๆ้ๆฐๅๅงๅไธๅๅทฒๅญๅจ็็ๆฌๅบซ" + +#: command-list.h:113 +msgid "Instantly browse your working repository in gitweb" +msgstr "ๅจ gitweb ไธญๅณๆ็่ฆฝๆจ็ๅทฅไฝ็ๆฌๅบซ" + +#: command-list.h:114 +msgid "Add or parse structured information in commit messages" +msgstr "ๆฐๅขๆ่งฃๆๆไบค่ชชๆไธญ็็ตๆงๅ่จๆฏ" + +#: command-list.h:115 +msgid "The Git repository browser" +msgstr "Git ็ๆฌๅบซ็่ฆฝๅจ" + +#: command-list.h:116 +msgid "Show commit logs" +msgstr "้กฏ็คบๆไบคๆฅ่ช" + +#: command-list.h:117 +msgid "Show information about files in the index and the working tree" +msgstr "้กฏ็คบ็ดขๅผๅๅทฅไฝๅไธญๆชๆก็่จๆฏ" + +#: command-list.h:118 +msgid "List references in a remote repository" +msgstr "้กฏ็คบไธๅ้ ็ซฏ็ๆฌๅบซ็ๅผ็จ" + +#: command-list.h:119 +msgid "List the contents of a tree object" +msgstr "้กฏ็คบไธๅๆจน็็ฉไปถ็ๅ งๅฎน" + +#: command-list.h:120 +msgid "Extracts patch and authorship from a single e-mail message" +msgstr "ๅพๅฎๅ้ปๅญไฟกไปถไธญๆทๅไฟฎ่ฃๆชๅไฝ่ ่บซไปฝ" + +#: command-list.h:121 +msgid "Simple UNIX mbox splitter program" +msgstr "็ฐกๅฎ็ UNIX mbox ไฟก็ฎฑๅๅ็จๅผ" + +#: command-list.h:122 +msgid "Run tasks to optimize Git repository data" +msgstr "ๅท่ก็จไพๆไฝณๅ Git ็ๆฌๅบซ่ณๆ็ไฝๆฅญ" + +#: command-list.h:123 +msgid "Join two or more development histories together" +msgstr "ๅไฝตๅ ฉๅๆๆดๅค้็ผๆญทๅฒ" + +#: command-list.h:124 +msgid "Find as good common ancestors as possible for a merge" +msgstr "็บไบๅไฝตๅฐๆพๅๅฏ่ฝๅฅฝ็ๅ ฌๅ ฑ็ฅๅ ๆไบค" + +#: command-list.h:125 +msgid "Run a three-way file merge" +msgstr "ๅท่กไธๅไธ่ทฏๆชๆกๅไฝต" + +#: command-list.h:126 +msgid "Run a merge for files needing merging" +msgstr "ๅฐๆผ้่ฆๅไฝต็ๆชๆกๅท่กๅไฝต" + +#: command-list.h:127 +msgid "The standard helper program to use with git-merge-index" +msgstr "่ git-merge-index ไธ่ตทไฝฟ็จ็ๆจๆบๅฎๅฐ็จๅผ" + +#: command-list.h:128 +msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgstr "ๅท่กๅไฝต่ก็ช่งฃๆฑบๅทฅๅ ทไปฅ่งฃๆฑบๅไฝต่ก็ช" + +#: command-list.h:129 +msgid "Show three-way merge without touching index" +msgstr "้กฏ็คบไธ่ทฏๅไฝต่ไธๅ็ดขๅผ" + +#: command-list.h:130 +msgid "Write and verify multi-pack-indexes" +msgstr "ๅฏซๅ ฅๅ้ฉ่ญๅคๅ ็ดขๅผ" + +#: command-list.h:131 +msgid "Creates a tag object" +msgstr "ๅปบ็ซไธๅๆจ็ฑค็ฉไปถ" + +#: command-list.h:132 +msgid "Build a tree-object from ls-tree formatted text" +msgstr "ๅบๆผ ls-tree ็ๆ ผๅผๅๆๅญๅปบ็ซไธๅๆจน็็ฉไปถ" + +#: command-list.h:133 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "็งปๅๆ้ๆฐๅฝๅไธๅๆชๆกใ็ฎ้ๆ็ฌฆ่้ฃ็ต" + +# ๅฐๆพๆไพ็ๆฌ็็ฌฆ่ๅ็จฑ +#: command-list.h:134 +msgid "Find symbolic names for given revs" +msgstr "ๅฐๆพๆไพ็ๆฌ็็ฌฆ่ๅ็จฑ" + +#: command-list.h:135 +msgid "Add or inspect object notes" +msgstr "ๆฐๅขๆๆชขๆฅ็ฉไปถๅ่จป" + +#: command-list.h:136 +msgid "Import from and submit to Perforce repositories" +msgstr "ๅฏๅ ฅๅๆไบคๅฐ Perforce ็ๆฌๅบซไธญ" + +#: command-list.h:137 +msgid "Create a packed archive of objects" +msgstr "ๅปบ็ซ็ฉไปถ็ๅญๆชๅ " + +#: command-list.h:138 +msgid "Find redundant pack files" +msgstr "ๅฐๆพๅ้ค็ๅ ๆชๆก" + +#: command-list.h:139 +msgid "Pack heads and tags for efficient repository access" +msgstr "ๆๅ ้ ญๅๆจ็ฑคไปฅๅฏฆ็พ้ซๆ็็ๆฌๅบซๅญๅ" + +#: command-list.h:140 +msgid "Routines to help parsing remote repository access parameters" +msgstr "ๅๅฉ่งฃๆ้ ็ซฏ็ๆฌๅบซๅญๅๅๆธ็ไพ็จ" + +#: command-list.h:141 +msgid "Compute unique ID for a patch" +msgstr "่จ็ฎไธๅไฟฎ่ฃๆช็ๅฏไธ ID" + +#: command-list.h:142 +msgid "Prune all unreachable objects from the object database" +msgstr "ๅช้ค็ฉไปถๅบซไธญๆๆ็กๆณๅๅพ็ฉไปถ" + +#: command-list.h:143 +msgid "Remove extra objects that are already in pack files" +msgstr "ๅช้คๅทฒ็ถๅจๅ ๆชๆกไธญ็ๅค้ค็ฉไปถ" + +#: command-list.h:144 +msgid "Fetch from and integrate with another repository or a local branch" +msgstr "ๅๅพไธฆๆดๅๅฆๅค็็ๆฌๅบซๆไธๅๆฌๆฉๅๆฏ" + +#: command-list.h:145 +msgid "Update remote refs along with associated objects" +msgstr "ๆดๆฐ้ ็ซฏๅผ็จๅ็ธ้็็ฉไปถ" + +#: command-list.h:146 +msgid "Applies a quilt patchset onto the current branch" +msgstr "ๅฐไธๅ quilt ไฟฎ่ฃๆช้ๅๅฅ็จๅฐ็ฎๅๅๆฏ" + +#: command-list.h:147 +msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgstr "ๆฏ่ผๅ ฉๅๆไบค็ฏๅ๏ผๅฆไธๅๅๆฏ็ๅ ฉๅ็ๆฌ๏ผ" + +#: command-list.h:148 +msgid "Reads tree information into the index" +msgstr "ๅฐๆจน่จๆฏ่ฎๅๅฐ็ดขๅผ" + +#: command-list.h:149 +msgid "Reapply commits on top of another base tip" +msgstr "ๅจๅฆไธๅๅๆฏไธ้ๆฐๆ็จๆไบค" + +#: command-list.h:150 +msgid "Receive what is pushed into the repository" +msgstr "ๆฅๆถๆจ้ๅฐ็ๆฌๅบซไธญ็็ฉไปถ" + +#: command-list.h:151 +msgid "Manage reflog information" +msgstr "็ฎก็ reflog ่จๆฏ" + +#: command-list.h:152 +msgid "Manage set of tracked repositories" +msgstr "็ฎก็ๅทฒ่ฟฝ่นค็ๆฌๅบซ" + +#: command-list.h:153 +msgid "Pack unpacked objects in a repository" +msgstr "ๆๅ ็ๆฌๅบซไธญๆชๆๅ ็ฉไปถ" + +#: command-list.h:154 +msgid "Create, list, delete refs to replace objects" +msgstr "ๅปบ็ซใๅๅบใๅช้ค็ฉไปถๅไปฃๅผ็จ" + +#: command-list.h:155 +msgid "Generates a summary of pending changes" +msgstr "็ๆๅพ ๅฎๆดๆน็ๆ่ฆ" + +#: command-list.h:156 +msgid "Reuse recorded resolution of conflicted merges" +msgstr "้็จ่ก็ชๅไฝต็่งฃๆฑบๆนๆก่จ้" + +#: command-list.h:157 +msgid "Reset current HEAD to the specified state" +msgstr "้่จญ็ฎๅ HEAD ๅฐๆๅฎ็ๆ " + +#: command-list.h:158 +msgid "Restore working tree files" +msgstr "ๅพฉๅๅทฅไฝๅๆชๆก" + +#: command-list.h:159 +msgid "Revert some existing commits" +msgstr "้ๅไธไบ็พๅญๆไบค" + +#: command-list.h:160 +msgid "Lists commit objects in reverse chronological order" +msgstr "ๆๆ้้ ๅบๅๅบๆไบค็ฉไปถ" + +#: command-list.h:161 +msgid "Pick out and massage parameters" +msgstr "้ธๅบไธฆ่็ๅๆธ" + +#: command-list.h:162 +msgid "Remove files from the working tree and from the index" +msgstr "ๅพๅทฅไฝๅๅ็ดขๅผไธญๅช้คๆชๆก" + +#: command-list.h:163 +msgid "Send a collection of patches as emails" +msgstr "้้้ปๅญไฟกไปถๅณ้ไธ็ตไฟฎ่ฃๆช" + +#: command-list.h:164 +msgid "Push objects over Git protocol to another repository" +msgstr "ไฝฟ็จ Git ๅๅฎๆจ้็ฉไปถๅฐๅฆไธๅ็ๆฌๅบซ" + +#: command-list.h:165 +msgid "Restricted login shell for Git-only SSH access" +msgstr "ๅชๅ ่จฑ Git SSH ๅญๅ็ๅ้็ปๅ ฅshell" + +#: command-list.h:166 +msgid "Summarize 'git log' output" +msgstr "'git log' ่ผธๅบๆ่ฆ" + +#: command-list.h:167 +msgid "Show various types of objects" +msgstr "้กฏ็คบๅ็จฎ้กๅ็็ฉไปถ" + +#: command-list.h:168 +msgid "Show branches and their commits" +msgstr "้กฏ็คบๅๆฏๅๆไบค" + +#: command-list.h:169 +msgid "Show packed archive index" +msgstr "้กฏ็คบๆๅ ๆญธๆช็ดขๅผ" + +#: command-list.h:170 +msgid "List references in a local repository" +msgstr "้กฏ็คบๆฌๆฉ็ๆฌๅบซไธญ็ๅผ็จ" + +#: command-list.h:171 +msgid "Git's i18n setup code for shell scripts" +msgstr "็บ shell ่ ณๆฌๆบๅ็ Git ๅ้ๅ่จญๅฎ็จๅผ็ขผ" + +#: command-list.h:172 +msgid "Common Git shell script setup code" +msgstr "ๅธธ็จ็ Git shell ่ ณๆฌ่จญๅฎ็จๅผ็ขผ" + +#: command-list.h:173 +msgid "Initialize and modify the sparse-checkout" +msgstr "ๅๅงๅไธฆไฟฎๆน็จ็ๆชขๅบ" + +#: command-list.h:174 +msgid "Stash the changes in a dirty working directory away" +msgstr "ๅฒ่้ซๅทฅไฝๅไธญ็ไฟฎๆน" + +#: command-list.h:175 +msgid "Add file contents to the staging area" +msgstr "ๅฐๆชๆกๅ งๅฎนๆฐๅขๅฐ็ดขๅผ" + +#: command-list.h:176 +msgid "Show the working tree status" +msgstr "้กฏ็คบๅทฅไฝๅ็ๆ " + +#: command-list.h:177 +msgid "Remove unnecessary whitespace" +msgstr "ๅช้คไธๅฟ ่ฆ็็ฉบ็ฝๅญๅ " + +#: command-list.h:178 +msgid "Initialize, update or inspect submodules" +msgstr "ๅๅงๅใๆดๆฐๆๆชขๆฅๅญๆจก็ต" + +#: command-list.h:179 +msgid "Bidirectional operation between a Subversion repository and Git" +msgstr "Subversion ็ๆฌๅบซๅ Git ไน้็้ๅๅไฝ" + +#: command-list.h:180 +msgid "Switch branches" +msgstr "ๅๆๅๆฏ" + +#: command-list.h:181 +msgid "Read, modify and delete symbolic refs" +msgstr "่ฎๅใไฟฎๆนๅๅช้ค็ฌฆ่ๅผ็จ" + +#: command-list.h:182 +msgid "Create, list, delete or verify a tag object signed with GPG" +msgstr "ๅปบ็ซใๅๅบใๅช้คๆ้ฉ่ญไธๅ GPG ็ฐฝๅ็ๆจ็ฑค็ฉไปถ" + +#: command-list.h:183 +msgid "Creates a temporary file with a blob's contents" +msgstr "็จ blob ่ณๆ็ฉไปถ็ๅ งๅฎนๅปบ็ซไธๅๆซๅญๆช" + +#: command-list.h:184 +msgid "Unpack objects from a packed archive" +msgstr "ๅพๆๅ ๆชๆกไธญ่งฃๅฃ็ธฎ็ฉไปถ" + +#: command-list.h:185 +msgid "Register file contents in the working tree to the index" +msgstr "ๅฐๅทฅไฝๅ็ๆชๆกๅ งๅฎน่จปๅๅฐ็ดขๅผ" + +#: command-list.h:186 +msgid "Update the object name stored in a ref safely" +msgstr "ๅฎๅ จๅฐๆดๆฐๅฒๅญๆผๅผ็จไธญ็็ฉไปถๅ็จฑ" + +#: command-list.h:187 +msgid "Update auxiliary info file to help dumb servers" +msgstr "ๆดๆฐ่ผๅฉ่จๆฏๆชๆกไปฅๅๅฉๅๅๅฎๆๅ" + +#: command-list.h:188 +msgid "Send archive back to git-archive" +msgstr "ๅฐๅญๆชๅณ้ๅ git-archive" + +#: command-list.h:189 +msgid "Send objects packed back to git-fetch-pack" +msgstr "ๅฐ็ฉไปถๅฃ็ธฎๅ ๅณ้ๅ git-fetch-pack" + +#: command-list.h:190 +msgid "Show a Git logical variable" +msgstr "้กฏ็คบ Git ้่ผฏ่ฎๆธ" + +#: command-list.h:191 +msgid "Check the GPG signature of commits" +msgstr "ๆชขๆฅ GPG ๆไบค็ฐฝๅ" + +#: command-list.h:192 +msgid "Validate packed Git archive files" +msgstr "้ฉ่ญๆๅ ็ Git ๅฐๅญๆชๆก" + +#: command-list.h:193 +msgid "Check the GPG signature of tags" +msgstr "ๆชขๆฅๆจ็ฑค็ GPG ็ฐฝๅ" + +#: command-list.h:194 +msgid "Git web interface (web frontend to Git repositories)" +msgstr "Git web ไป้ข๏ผGit ็ๆฌๅบซ็ web ๅ็ซฏ๏ผ" + +#: command-list.h:195 +msgid "Show logs with difference each commit introduces" +msgstr "้กฏ็คบๆฏไธๅๆไบคๅผๅ ฅ็ๅทฎ็ฐๆฅ่ช" + +#: command-list.h:196 +msgid "Manage multiple working trees" +msgstr "็ฎก็ๅคๅๅทฅไฝๅ" + +#: command-list.h:197 +msgid "Create a tree object from the current index" +msgstr "ๅพ็ฎๅ็ดขๅผๅปบ็ซไธๅๆจน็็ฉไปถ" + +#: command-list.h:198 +msgid "Defining attributes per path" +msgstr "ๅฎ็พฉ่ทฏๅพ็ๅฑฌๆง" + +#: command-list.h:199 +msgid "Git command-line interface and conventions" +msgstr "Git ๆไปคๅไป้ขๅ็ดๅฎ" + +#: command-list.h:200 +msgid "A Git core tutorial for developers" +msgstr "้ขๅ้็ผไบบๅก็ Git ๆ ธๅฟๆๅญธ" + +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "ๅฐไฝฟ็จ่ ๅ็จฑๅๅฏ็ขผๆไพ็ตฆ Git" + +#: command-list.h:202 +msgid "Git for CVS users" +msgstr "้ฉๅ CVS ไฝฟ็จ่ ็ Git ๅๅฉ" + +#: command-list.h:203 +msgid "Tweaking diff output" +msgstr "่ชฟๆดๅทฎ็ฐ่ผธๅบ" + +#: command-list.h:204 +msgid "A useful minimum set of commands for Everyday Git" +msgstr "ๆฏไธๅคฉ Git ็ไธ็ตๆ็จ็ๆๅฐๆไปค้ๅ" + +#: command-list.h:205 +msgid "Frequently asked questions about using Git" +msgstr "Git ไฝฟ็จ็ๅธธ่ฆๅ้ก" + +#: command-list.h:206 +msgid "A Git Glossary" +msgstr "Git ่ฉๅฝ่กจ" + +#: command-list.h:207 +msgid "Hooks used by Git" +msgstr "Git ไฝฟ็จ็ๆ้ค" + +#: command-list.h:208 +msgid "Specifies intentionally untracked files to ignore" +msgstr "ๅฟฝ็ฅๆๅฎ็ๆช่ฟฝ่นคๆชๆก" + +#: command-list.h:209 +msgid "Defining submodule properties" +msgstr "ๅฎ็พฉๅญๆจก็ตๅฑฌๆง" + +#: command-list.h:210 +msgid "Git namespaces" +msgstr "Git ๅๅญ็ฉบ้" + +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "็จไพ่้ ็ซฏ็ๆฌๅบซไบๅ็ๅๅฉๅทฅๅ ท" + +#: command-list.h:212 +msgid "Git Repository Layout" +msgstr "Git ็ๆฌๅบซ้ ็ฝฎ" + +#: command-list.h:213 +msgid "Specifying revisions and ranges for Git" +msgstr "ๆๅฎ Git ็็ๆฌๅ็ๆฌ็ฏๅ" + +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "ๅจๆๅ็ๆฌๅบซๆ่ผๆๅ็ๆฌๅบซ" + +#: command-list.h:215 +msgid "A tutorial introduction to Git: part two" +msgstr "ไธๅ Git ๆๅญธ๏ผ็ฌฌไบ้จๅ" + +#: command-list.h:216 +msgid "A tutorial introduction to Git" +msgstr "ไธๅ Git ๆๅญธ" + +#: command-list.h:217 +msgid "An overview of recommended workflows with Git" +msgstr "Git ๆจ่ฆ็ๅทฅไฝๆตๆฆ่ฆฝ" + +#: git-bisect.sh:79 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "ๅฃ็่ผธๅ ฅ็ๆฌ๏ผ$arg" + +#: git-bisect.sh:99 +#, sh-format +msgid "Bad rev input: $bisected_head" +msgstr "ๅฃ็่ผธๅ ฅ็ๆฌ๏ผ$bisected_head" + +#: git-bisect.sh:108 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "ๅฃ็่ผธๅ ฅ็ๆฌ๏ผ$rev" + +#: git-bisect.sh:117 +#, sh-format +msgid "'git bisect $TERM_BAD' can take only one argument." +msgstr "'git bisect $TERM_BAD' ๅช่ฝๅธถไธๅๅๆธใ" + +#: git-bisect.sh:149 +msgid "No logfile given" +msgstr "ๆชๆไพๆฅ่ชๆชๆก" + +#: git-bisect.sh:150 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "ไธ่ฝ่ฎๅ $file ไพ้ๆพ" + +#: git-bisect.sh:173 +msgid "?? what are you talking about?" +msgstr "?? ๆจๅจ่ชชไป้บผ?" + +#: git-bisect.sh:183 +msgid "bisect run failed: no command provided." +msgstr "ไบๅๅฐๆพๅท่กๅคฑๆ๏ผๆฒๆๆไพๆไปคใ" + +#: git-bisect.sh:188 +#, sh-format +msgid "running $command" +msgstr "ๅท่ก $command" + +#: git-bisect.sh:195 +#, 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:221 +msgid "bisect run cannot continue any more" +msgstr "ไบๅๅฐๆพไธ่ฝ็นผ็บๅท่ก" + +#: git-bisect.sh:227 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" +"ไบๅๅฐๆพๅท่กๅคฑๆ๏ผ\n" +"'bisect_state $state' ้ข้็ขผ็บ $res" + +#: git-bisect.sh:234 +msgid "bisect run success" +msgstr "ไบๅๅฐๆพๅท่กๆๅ" + +#: git-bisect.sh:242 +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-submodule.sh:180 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "ๅช่ฝๅจๅทฅไฝๅ็้ ็ด็ฎ้ไธญไฝฟ็จ็ธๅฐ่ทฏๅพ" + +#: git-submodule.sh:190 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "็ๆฌๅบซ URL๏ผ'$repo' ๅฟ ้ ๆฏ็ตๅฐ่ทฏๅพๆไปฅ ./|../ ่ตทๅง" + +#: git-submodule.sh:209 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "'$sm_path' ๅทฒ็ถๅญๅจๆผ็ดขๅผไธญ" + +#: git-submodule.sh:212 +#, sh-format +msgid "'$sm_path' already exists in the index and is not a submodule" +msgstr "'$sm_path' ๅทฒ็ถๅญๅจๆผ็ดขๅผไธญไธไธๆฏไธๅๅญๆจก็ต" + +#: git-submodule.sh:219 +#, sh-format +msgid "'$sm_path' does not have a commit checked out" +msgstr "'$sm_path' ๆฒๆๆชขๅบ็ๆไบค" + +#: git-submodule.sh:250 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "ๆฐๅขไฝๆผ '$sm_path' ็็พๅญ็ๆฌๅบซๅฐ็ดขๅผ" + +#: git-submodule.sh:252 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "'$sm_path' ๅทฒๅญๅจไธไธๆฏไธๅๆๆ็ git ็ๆฌๅบซ" + +#: git-submodule.sh:260 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "ๆฌๆฉ็ผ็พ '$sm_name' ็ไธๅ git ็ฎ้๏ผ่ๅ ถๅฐๆ็้ ็ซฏ็ๆฌๅบซ๏ผ" + +#: git-submodule.sh:262 +#, 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:268 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "ๅๅๆฌๆฉ git ็ฎ้ๅฐๅญๆจก็ต '$sm_name'ใ" + +#: git-submodule.sh:280 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "ไธ่ฝๆชขๅบๅญๆจก็ต '$sm_path'" + +#: git-submodule.sh:285 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "็กๆณๆฐๅขๅญๆจก็ต '$sm_path'" + +#: git-submodule.sh:294 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "็กๆณ่จปๅๅญๆจก็ต '$sm_path'" + +#: git-submodule.sh:567 +#, sh-format +msgid "Unable to find current revision in submodule path '$displaypath'" +msgstr "็กๆณๅจๅญๆจก็ต่ทฏๅพ '$displaypath' ไธญๆพๅฐ็ฎๅ็ๆฌ" + +#: git-submodule.sh:577 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "็กๆณๅจๅญๆจก็ต่ทฏๅพ '$sm_path' ไธญๅๅพ" + +#: git-submodule.sh:582 +#, 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:600 +#, sh-format +msgid "" +"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " +"$sha1:" +msgstr "็กๆณๅจๅญๆจก็ต่ทฏๅพ '$displaypath' ไธญๅๅพ๏ผๅ่ฉฆ็ดๆฅๅๅพ $sha1๏ผ" + +#: git-submodule.sh:606 +#, 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:613 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" +msgstr "็กๆณๅจๅญๆจก็ต่ทฏๅพ '$displaypath' ไธญๆชขๅบ '$sha1'" + +#: git-submodule.sh:614 +#, sh-format +msgid "Submodule path '$displaypath': checked out '$sha1'" +msgstr "ๅญๆจก็ต่ทฏๅพ '$displaypath'๏ผๆชขๅบ '$sha1'" + +#: git-submodule.sh:618 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" +msgstr "็กๆณๅจๅญๆจก็ต่ทฏๅพ '$displaypath' ไธญ้ๅฎๅบๅบ '$sha1'" + +#: git-submodule.sh:619 +#, sh-format +msgid "Submodule path '$displaypath': rebased into '$sha1'" +msgstr "ๅญๆจก็ต่ทฏๅพ '$displaypath'๏ผ้ๅฎๅบๅบ่ณ '$sha1'" + +#: git-submodule.sh:624 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$displaypath'" +msgstr "็กๆณๅไฝต '$sha1' ๅฐๅญๆจก็ต่ทฏๅพ '$displaypath' ไธญ" + +#: git-submodule.sh:625 +#, sh-format +msgid "Submodule path '$displaypath': merged in '$sha1'" +msgstr "ๅญๆจก็ต่ทฏๅพ '$displaypath'๏ผๅทฒๅไฝตๅ ฅ '$sha1'" + +#: git-submodule.sh:630 +#, sh-format +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "ๅจๅญๆจก็ต '$displaypath' ไธญๅท่ก '$command $sha1' ๅคฑๆ" + +#: git-submodule.sh:631 +#, sh-format +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "ๅญๆจก็ต '$displaypath'๏ผ'$command $sha1'" + +#: git-submodule.sh:662 +#, sh-format +msgid "Failed to recurse into submodule path '$displaypath'" +msgstr "็กๆณ้่ฟด้ฒๅญๆจก็ต่ทฏๅพ '$displaypath'" + +#: 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:113 +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" + +#: git-rebase--preserve-merges.sh:191 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "้ๅฎๅบๅบไธญ๏ผ$new_count/$total๏ผ" + +#: git-rebase--preserve-merges.sh:197 +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:260 +#, 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:285 +#, sh-format +msgid "$sha1: not a commit that can be picked" +msgstr "$sha1๏ผไธๆฏไธๅๅฏไปฅ่ขซๆ้ธ็ๆไบค" + +#: git-rebase--preserve-merges.sh:324 +#, sh-format +msgid "Invalid commit name: $sha1" +msgstr "็กๆ็ๆไบคๅ๏ผ$sha1" + +#: git-rebase--preserve-merges.sh:354 +msgid "Cannot write current commit's replacement sha1" +msgstr "ไธ่ฝๅฏซๅ ฅ็ฎๅๆไบค็ๆฟไปฃ sha1" + +#: git-rebase--preserve-merges.sh:405 +#, sh-format +msgid "Fast-forward to $sha1" +msgstr "ๅฟซ่ฝๅฐ $sha1" + +#: git-rebase--preserve-merges.sh:407 +#, sh-format +msgid "Cannot fast-forward to $sha1" +msgstr "ไธ่ฝๅฟซ่ฝๅฐ $sha1" + +#: git-rebase--preserve-merges.sh:416 +#, sh-format +msgid "Cannot move HEAD to $first_parent" +msgstr "ไธ่ฝ็งปๅ HEAD ๅฐ $first_parent" + +#: git-rebase--preserve-merges.sh:421 +#, sh-format +msgid "Refusing to squash a merge: $sha1" +msgstr "ๆ็ตๅฃ็ธฎไธๅๅไฝต๏ผ$sha1" + +#: git-rebase--preserve-merges.sh:439 +#, sh-format +msgid "Error redoing merge $sha1" +msgstr "็กๆณ้ๅๅไฝต $sha1" + +#: git-rebase--preserve-merges.sh:448 +#, sh-format +msgid "Could not pick $sha1" +msgstr "ไธ่ฝๆ้ธ $sha1" + +#: git-rebase--preserve-merges.sh:457 +#, sh-format +msgid "This is the commit message #${n}:" +msgstr "้ๆฏๆไบค่ชชๆ #${n}๏ผ" + +#: git-rebase--preserve-merges.sh:462 +#, sh-format +msgid "The commit message #${n} will be skipped:" +msgstr "ๆไบค่ชชๆ #${n} ๅฐ่ขซ่ทณ้๏ผ" + +#: git-rebase--preserve-merges.sh:473 +#, 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:482 +#, sh-format +msgid "Cannot write $fixup_msg" +msgstr "ไธ่ฝๅฏซๅ ฅ $fixup_msg" + +#: git-rebase--preserve-merges.sh:485 +msgid "This is a combination of 2 commits." +msgstr "้ๆฏไธๅ 2 ๅๆไบค็็ตๅใ" + +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 +#, sh-format +msgid "Could not apply $sha1... $rest" +msgstr "ไธ่ฝๆ็จ $sha1... $rest" + +#: git-rebase--preserve-merges.sh:601 +#, 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:616 +#, sh-format +msgid "Stopped at $sha1_abbrev... $rest" +msgstr "ๅๆญขๅจ $sha1_abbrev... $rest" + +#: git-rebase--preserve-merges.sh:631 +#, sh-format +msgid "Cannot '$squash_style' without a previous commit" +msgstr "ๆฒๆ็ถๆไบค็ๆ ๆณไธไธ่ฝ '$squash_style'" + +#: git-rebase--preserve-merges.sh:673 +#, sh-format +msgid "Executing: $rest" +msgstr "ๅท่ก๏ผ$rest" + +#: git-rebase--preserve-merges.sh:681 +#, sh-format +msgid "Execution failed: $rest" +msgstr "ๅท่กๅคฑๆ๏ผ$rest" + +#: git-rebase--preserve-merges.sh:683 +msgid "and made changes to the index and/or the working tree" +msgstr "ไธฆไธไฟฎๆน็ดขๅผๅ/ๆๅทฅไฝๅ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#: git-rebase--preserve-merges.sh:685 +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:698 +#, 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:709 +#, sh-format +msgid "Unknown command: $command $sha1 $rest" +msgstr "ๆช็ฅๆไปค๏ผ$command $sha1 $rest" + +#: git-rebase--preserve-merges.sh:710 +msgid "Please fix this using 'git rebase --edit-todo'." +msgstr "่ฆไฟฎๆน่ซไฝฟ็จๆไปค 'git rebase --edit-todo'ใ" + +#: git-rebase--preserve-merges.sh:745 +#, sh-format +msgid "Successfully rebased and updated $head_name." +msgstr "ๆๅ้ๅฎๅบๅบไธฆๆดๆฐ $head_nameใ" + +#: git-rebase--preserve-merges.sh:802 +msgid "Could not remove CHERRY_PICK_HEAD" +msgstr "ไธ่ฝๅช้ค CHERRY_PICK_HEAD" + +#: git-rebase--preserve-merges.sh:807 +#, 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:824 +msgid "Error trying to find the author identity to amend commit" +msgstr "ๅจไฟฎ่ฃๆไบคไธญๅฐๆพไฝ่ ่จๆฏๆ้ๅฐ้ฏ่ชค" + +#: git-rebase--preserve-merges.sh:829 +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:834 git-rebase--preserve-merges.sh:838 +msgid "Could not commit staged changes." +msgstr "ไธ่ฝๆไบคๆซๅญ็ไฟฎๆนใ" + +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 +msgid "Could not execute editor" +msgstr "็กๆณๅท่ก็ทจ่ผฏๅจ" + +#: git-rebase--preserve-merges.sh:890 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "ไธ่ฝๆชขๅบ $switch_to" + +#: git-rebase--preserve-merges.sh:897 +msgid "No HEAD?" +msgstr "ๆฒๆ HEAD๏ผ" + +#: git-rebase--preserve-merges.sh:898 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "ไธ่ฝๅปบ็ซๆซๆ $state_dir" + +#: git-rebase--preserve-merges.sh:901 +msgid "Could not mark as interactive" +msgstr "ไธ่ฝๆจ่จ็บไบๅๅผ" + +#: git-rebase--preserve-merges.sh:933 +#, 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:945 +msgid "Note that empty commits are commented out" +msgstr "ๆณจๆ็ฉบๆไบคๅทฒ่ขซๅ่จปๆ" + +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 +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:1058 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging." +msgstr "ๅฆๆไฟฎ่ฃๆช่ฝไนพๆทจๅฐๅฅ็จ๏ผ็ทจ่ผฏๅกๅฐ็ซๅณๆจ่จ็บๆซๅญใ" + +#: git-add--interactive.perl:1061 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for stashing." +msgstr "ๅฆๆไฟฎ่ฃๆช่ฝไนพๆทจๅฐๅฅ็จ๏ผ็ทจ่ผฏๅกๅฐ็ซๅณๆจ่จ็บๅฒ่ใ" + +#: git-add--interactive.perl:1064 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for unstaging." +msgstr "ๅฆๆไฟฎ่ฃๆช่ฝไนพๆทจๅฐๅฅ็จ๏ผ็ทจ่ผฏๅกๅฐ็ซๅณๆจ่จ็บๆชๆซๅญใ" + +#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for applying." +msgstr "ๅฆๆไฟฎ่ฃๆช่ฝไนพๆทจๅฐๅฅ็จ๏ผ็ทจ่ผฏๅกๅฐ็ซๅณๆจ่จ็บๆ็จใ" + +#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding." +msgstr "ๅฆๆไฟฎ่ฃๆช่ฝไนพๆทจๅฐๅฅ็จ๏ผ็ทจ่ผฏๅกๅฐ็ซๅณๆจ่จ็บๆจๆฃใ" + +#: git-add--interactive.perl:1116 +#, perl-format +msgid "failed to open hunk edit file for writing: %s" +msgstr "็บๅฏซๅ ฅ้ๅๅๅก็ทจ่ผฏๆชๆกๅคฑๆ๏ผ%s" + +#: git-add--interactive.perl:1123 +#, 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:1145 +#, perl-format +msgid "failed to open hunk edit file for reading: %s" +msgstr "็กๆณ่ฎๅๅๅก็ทจ่ผฏๆชๆก๏ผ%s" + +#: git-add--interactive.perl:1253 +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:1259 +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:1265 +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:1271 +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:1277 git-add--interactive.perl:1295 +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:1283 +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:1289 +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:1301 +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:1316 +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:1347 +msgid "The selected hunks do not apply to the index!\n" +msgstr "้ธไธญ็ๅๅกไธ่ฝๅฅ็จๅฐ็ดขๅผ๏ผ\n" + +#: git-add--interactive.perl:1362 +#, perl-format +msgid "ignoring unmerged: %s\n" +msgstr "ๅฟฝ็ฅๆชๅฅ็จ็๏ผ%s\n" + +#: git-add--interactive.perl:1481 +#, 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:1482 +#, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "ๅฐๅช้ค่ฎๆดๅฅ็จๅฐๅทฅไฝๅ [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1483 +#, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "ๅฐๆฐๅข่ฎๆดๅฅ็จๅฐๅทฅไฝๅ [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1484 +#, 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:1601 +msgid "No other hunks to goto\n" +msgstr "ๆฒๆๅ ถๅฎๅฏไพ่ทณ่ฝ็ๅๅก\n" + +#: git-add--interactive.perl:1619 +#, perl-format +msgid "Invalid number: '%s'\n" +msgstr "็กๆๆธๅญ๏ผ'%s'\n" + +#: git-add--interactive.perl:1624 +#, 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:1659 +msgid "No other hunks to search\n" +msgstr "ๆฒๆๅ ถๅฎๅฏไพๅฐๆพ็ๅๅก\n" + +#: git-add--interactive.perl:1676 +#, perl-format +msgid "Malformed search regexp %s: %s\n" +msgstr "้ฏ่ชค็ๆญฃ่ฆ่กจ็คบๅผ %s๏ผ%s\n" + +#: git-add--interactive.perl:1686 +msgid "No hunk matches the given pattern\n" +msgstr "ๆฒๆๅๆไพๆจกๅผ็ธ็ฌฆๅ็ๅๅก\n" + +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 +msgid "No previous hunk\n" +msgstr "ๆฒๆๅไธๅๅๅก\n" + +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 +msgid "No next hunk\n" +msgstr "ๆฒๆไธไธๅๅๅก\n" + +#: git-add--interactive.perl:1732 +msgid "Sorry, cannot split this hunk\n" +msgstr "ๅฐไธ่ตท๏ผไธ่ฝๅๅฒ้ๅๅๅก\n" + +#: git-add--interactive.perl:1738 +#, perl-format +msgid "Split into %d hunk.\n" +msgid_plural "Split into %d hunks.\n" +msgstr[0] "ๅๅฒ็บ %d ๅกใ\n" + +#: git-add--interactive.perl:1748 +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:1813 +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:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 +msgid "missing --" +msgstr "็ผบๅฐ --" + +#: git-add--interactive.perl:1861 +#, perl-format +msgid "unknown --patch mode: %s" +msgstr "ๆช็ฅ็ --patch ๆจกๅผ๏ผ%s" + +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 +#, 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:312 +#, perl-format +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" +msgstr "'%s' ๅ ๅซๆจๆญฃๅจ็ทจๅฏซ็ไธๅไธญ้็ๆฌ็ไฟกไปถใ\n" + +#: git-send-email.perl:317 +#, perl-format +msgid "'%s.final' contains the composed email.\n" +msgstr "'%s.final' ๅ ๅซ็ทจ่ผฏ็ไฟกไปถใ\n" + +#: git-send-email.perl:410 +msgid "--dump-aliases incompatible with other options\n" +msgstr "--dump-aliases ๅๅ ถๅฎ้ธ้ ไธ็ธๅฎน\n" + +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"่ดๅฝ้ฏ่ชค๏ผๆพๅฐ 'sendmail' ็่จญๅฎ้ธ้ \n" +"git-send-email ๅทฒ็ถไปฅ sendemail.* ้ธ้ ่จญๅฎ - ๆณจๆ่ฃก้ข็ 'e'ใ\n" +"่ซๅฐ sendemail.forbidSendmailVariables ่จญ็บ false ๅ็จๆญคๆชขๆฅใ\n" + +#: git-send-email.perl:489 git-send-email.perl:691 +msgid "Cannot run git format-patch from outside a repository\n" +msgstr "ไธ่ฝๅจ็ๆฌๅบซไนๅคๅท่ก git format-patch\n" + +#: git-send-email.perl:492 +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:505 +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "ๆช็ฅ็ --suppress-cc ๆฌไฝ๏ผ'%s'\n" + +#: git-send-email.perl:536 +#, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "ๆช็ฅ็ --confirm ่จญๅฎ๏ผ'%s'\n" + +#: git-send-email.perl:564 +#, perl-format +msgid "warning: sendmail alias with quotes is not supported: %s\n" +msgstr "่ญฆๅ๏ผไธๆฏๆดๅธถๅผ่็ sendmail ๅฅๅ๏ผ%s\n" + +#: git-send-email.perl:566 +#, perl-format +msgid "warning: `:include:` not supported: %s\n" +msgstr "่ญฆๅ๏ผไธๆฏๆด `:include:`๏ผ%s\n" + +#: git-send-email.perl:568 +#, perl-format +msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" +msgstr "่ญฆๅ๏ผไธๆฏๆด `/file` ๆ `|pipe` ้ๅฎๅ๏ผ%s\n" + +#: git-send-email.perl:573 +#, perl-format +msgid "warning: sendmail line is not recognized: %s\n" +msgstr "่ญฆๅ๏ผไธ่ฝ่ญๅฅ็ sendmail ่ก๏ผ%s\n" + +#: git-send-email.perl:657 +#, 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:678 +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "็กๆณ้ๅ็ฎ้ %s: %s" + +#: git-send-email.perl:702 +#, perl-format +msgid "" +"fatal: %s: %s\n" +"warning: no patches were sent\n" +msgstr "" +"่ดๅฝ้ฏ่ชค๏ผ%s๏ผ%s\n" +"่ญฆๅ๏ผไฟฎ่ฃๆชๆช่ฝๅณ้\n" + +#: git-send-email.perl:713 +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "" +"\n" +"ๆชๆๅฎไฟฎ่ฃๆชๆก๏ผ\n" +"\n" + +#: git-send-email.perl:726 +#, perl-format +msgid "No subject line in %s?" +msgstr "ๅจ %s ไธญๆฒๆๆจ้ก่ก๏ผ" + +#: git-send-email.perl:736 +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "็บๅฏซๅ ฅ้ๅ %s ๅคฑๆ: %s" + +#: git-send-email.perl:747 +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:771 +#, perl-format +msgid "Failed to open %s: %s" +msgstr "็กๆณ้ๅ %s: %s" + +#: git-send-email.perl:788 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "็กๆณ้ๅ %s.final: %s" + +#: git-send-email.perl:831 +msgid "Summary email is empty, skipping it\n" +msgstr "ๆ่ฆไฟกไปถ็บ็ฉบ๏ผ่ทณ้\n" + +#. TRANSLATORS: please keep [y/N] as is. +#: git-send-email.perl:866 +#, perl-format +msgid "Are you sure you want to use <%s> [y/N]? " +msgstr "ๆจๆฏๅฆ่ฆไฝฟ็จ <%s> [y/N]๏ผ " + +#: git-send-email.perl:921 +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:926 +msgid "Which 8bit encoding should I declare [UTF-8]? " +msgstr "่ฆๅฎฃๅ 8bit ็บไป้บผๆจฃ็็ทจ็ขผๆ ผๅผ [UTF-8]๏ผ " + +#: git-send-email.perl:934 +#, 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:953 +msgid "To whom should the emails be sent (if anyone)?" +msgstr "ไฟกไปถๅฐ่ฆๅณ้็ตฆ่ชฐ๏ผ" + +#: git-send-email.perl:971 +#, perl-format +msgid "fatal: alias '%s' expands to itself\n" +msgstr "่ดๅฝ้ฏ่ชค๏ผๅฅๅ '%s' ๆดๅฑ็บๅฎ่ชๅทฑ\n" + +#: git-send-email.perl:983 +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:1041 git-send-email.perl:1049 +#, 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:1053 +msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " +msgstr "ๅฆไฝ่็้ๅไฝๅ๏ผ([q]uit|[d]rop|[e]dit)๏ผ" + +#: git-send-email.perl:1370 +#, perl-format +msgid "CA path \"%s\" does not exist" +msgstr "CA ่ทฏๅพ \"%s\" ไธๅญๅจ" + +#: git-send-email.perl:1453 +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:1468 +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:1471 +msgid "Send this email reply required" +msgstr "ๅณ้่ฆๆฑ็ไฟกไปถๅๅพฉ" + +#: git-send-email.perl:1499 +msgid "The required SMTP server is not properly defined." +msgstr "่ฆๆฑ็ SMTP ไผบๆๅจๆช่ขซๆญฃ็ขบๅฎ็พฉใ" + +#: git-send-email.perl:1546 +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "ไผบๆๅจไธๆฏๆด STARTTLS๏ผ%s" + +#: git-send-email.perl:1551 git-send-email.perl:1555 +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "STARTTLS ๅคฑๆ๏ผ%s" + +#: git-send-email.perl:1564 +msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." +msgstr "็กๆณๆญฃ็ขบๅฐๅๅงๅ SMTPใๆชขๆฅ่จญๅฎไธฆไฝฟ็จ --smtp-debugใ" + +#: git-send-email.perl:1582 +#, perl-format +msgid "Failed to send %s\n" +msgstr "็กๆณๅณ้ %s\n" + +#: git-send-email.perl:1585 +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "ๆธฌ่ฉฆๅท่กๅณ้ %s\n" + +#: git-send-email.perl:1585 +#, perl-format +msgid "Sent %s\n" +msgstr "ๆญฃๅณ้ %s\n" + +#: git-send-email.perl:1587 +msgid "Dry-OK. Log says:\n" +msgstr "ๆธฌ่ฉฆๅท่กๆๅใๆฅ่ช่ชช๏ผ\n" + +#: git-send-email.perl:1587 +msgid "OK. Log says:\n" +msgstr "OKใๆฅ่ช่ชช๏ผ\n" + +#: git-send-email.perl:1599 +msgid "Result: " +msgstr "็ตๆ๏ผ" + +#: git-send-email.perl:1602 +msgid "Result: OK\n" +msgstr "็ตๆ๏ผOK\n" + +#: git-send-email.perl:1620 +#, perl-format +msgid "can't open file %s" +msgstr "็กๆณ้ๅๆชๆก %s" + +#: git-send-email.perl:1667 git-send-email.perl:1687 +#, perl-format +msgid "(mbox) Adding cc: %s from line '%s'\n" +msgstr "(mbox) ๆฐๅข cc๏ผ%s ่ช่ก '%s'\n" + +#: git-send-email.perl:1673 +#, perl-format +msgid "(mbox) Adding to: %s from line '%s'\n" +msgstr "(mbox) ๆฐๅข to๏ผ%s ่ช่ก '%s'\n" + +#: git-send-email.perl:1730 +#, perl-format +msgid "(non-mbox) Adding cc: %s from line '%s'\n" +msgstr "(non-mbox) ๆฐๅข cc๏ผ%s ่ช่ก '%s'\n" + +#: git-send-email.perl:1765 +#, perl-format +msgid "(body) Adding cc: %s from line '%s'\n" +msgstr "(body) ๆฐๅข cc: %s ่ช่ก '%s'\n" + +#: git-send-email.perl:1876 +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "(%s) ไธ่ฝๅท่ก '%s'" + +#: git-send-email.perl:1883 +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) ๆฐๅข %s: %s ่ช๏ผ'%s'\n" + +#: git-send-email.perl:1887 +#, perl-format +msgid "(%s) failed to close pipe to '%s'" +msgstr "(%s) ็กๆณ้้็ฎก้่ณ '%s'" + +#: git-send-email.perl:1917 +msgid "cannot send message as 7bit" +msgstr "ไธ่ฝไปฅ 7bit ๅฝขๅผๅณ้่จๆฏ" + +#: git-send-email.perl:1925 +msgid "invalid transfer encoding" +msgstr "็กๆ็ๅณ้็ทจ็ขผ" + +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "ไธ่ฝ้ๅ %s๏ผ%s\n" + +#: git-send-email.perl:1969 +#, perl-format +msgid "%s: patch contains a line longer than 998 characters" +msgstr "%s๏ผไฟฎ่ฃๆชๅ ๅซไธๅ่ถ ้ 998 ๅญๅ ็่ก" + +#: git-send-email.perl:1986 +#, 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:1990 +#, perl-format +msgid "Do you really want to send %s? [y|N]: " +msgstr "ๆจ็็่ฆๅณ้ %s๏ผ[y|N]๏ผ" + +#~ msgid "unknown hash algorithm length" +#~ msgstr "ๆช็ฅ็้ๆน็ฎๆณ้ทๅบฆ" + +#~ msgid "" +#~ "commit-graph chunk lookup table entry missing; file may be incomplete" +#~ msgstr "ๆไบคๅๅฝขๅๅกๅฐๆพ่กจๆข็ฎ้บๅคฑ๏ผๆชๆกๅฏ่ฝไธๅฎๆด" + +#~ msgid "Writing changed paths Bloom filters index" +#~ msgstr "ๆญฃๅจๅฏซๅ ฅ่ฎๆด่ทฏๅพ็ๅธ้้ๆฟพๅจ็ดขๅผ" + +#, c-format +#~ msgid "hash version %u does not match" +#~ msgstr "ๆฃๅ็ๆฌ %u ไธ็ฌฆๅ" + +#~ msgid "Remote with no URL" +#~ msgstr "้ ็ซฏๆช่จญๅฎ URL" + +#, c-format +#~ msgid "%%(subject) does not take arguments" +#~ msgstr "%%(subject) ไธๅธถๅๆธ" + +#, c-format +#~ msgid "positive value expected objectname:short=%s" +#~ msgstr "ๆๆไธๅๆญฃๆธ objectname:short=%s" + +#, c-format +#~ msgid "unrecognized %%(objectname) argument: %s" +#~ msgstr "็กๆณ่ญๅฅ็ %%(objectname) ๅๆธ๏ผ%s" + +#, c-format +#~ msgid "option `%s' is incompatible with --merged" +#~ msgstr "้ธ้ `%s' ๅ --merged ไธ็ธๅฎน" + +#, c-format +#~ msgid "option `%s' is incompatible with --no-merged" +#~ msgstr "้ธ้ `%s' ๅ --no-merged ไธ็ธๅฎน" + +#, c-format +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "็กๆณ็บๅฏซๅ ฅ้ๅ '%s'๏ผ%s" + +#, c-format +#~ msgid "could not read ref '%s'" +#~ msgstr "็กๆณ่ฎๅๅผ็จ '%s'" + +#, c-format +#~ msgid "ref '%s' already exists" +#~ msgstr "ๅผ็จ '%s' ๅทฒ็ถๅญๅจ" + +#, c-format +#~ msgid "unexpected object ID when writing '%s'" +#~ msgstr "ๅฏซๅ ฅ '%s' ๆๆๅค็็ฉไปถ ID" + +#, c-format +#~ msgid "unexpected object ID when deleting '%s'" +#~ msgstr "ๅช้ค '%s' ๆๆๅค็็ฉไปถ ID" + +#, c-format +#~ msgid "The hash algorithm %s is not supported in this build." +#~ msgstr "ๆญค็ตๅปบไธๆฏๆด %s ้ๆน็ฎๆณใ" + +#~ msgid "could not open the file BISECT_TERMS" +#~ msgstr "ไธ่ฝ้ๅๆชๆก BISECT_TERMS" + +#~ msgid "update BISECT_HEAD instead of checking out the current commit" +#~ msgstr "ๆดๆฐ BISECT_HEAD ่้ๆชขๅบ็ฎๅๆไบค" + +#~ msgid "print only names (no SHA-1)" +#~ msgstr "ๅชๅๅฐๅ็จฑ๏ผ็ก SHA-1๏ผ" + +#~ msgid "passed to 'git am'" +#~ msgstr "ๅณ้็ตฆ 'git am'" + +#~ msgid "The --cached option cannot be used with the --files option" +#~ msgstr "้ธ้ --cached ไธ่ฝๅ้ธ้ --files ๅๆไฝฟ็จ" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#, sh-format +#~ msgid " Warn: $display_name doesn't contain commit $sha1_src" +#~ msgstr " ่ญฆๅ๏ผ$display_name ๆชๅ ๅซๆไบค $sha1_src" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#, sh-format +#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst" +#~ msgstr " ่ญฆๅ๏ผ$display_name ๆชๅ ๅซๆไบค $sha1_dst" + +# ่ญฏ่ ๏ผ่ซ็ถญๆๅๅฐ็ฉบๆ ผ +#, sh-format +#~ msgid "" +#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +#~ msgstr " ่ญฆๅ๏ผ$display_name ๆชๅ ๅซๆไบค $sha1_src ๅ $sha1_dst" + +#, c-format +#~ msgid "Finding commits for commit graph from %d ref" +#~ msgid_plural "Finding commits for commit graph from %d refs" +#~ msgstr[0] "ๆญฃๅจๅพ %d ๅๅผ็จไธญๅฐๆพๆไบคๅ็ๆไบค" + +#, c-format +#~ msgid "invalid commit object id: %s" +#~ msgstr "็กๆ็ๆไบค็ฉไปถ ID๏ผ%s" + +#, c-format +#~ msgid "Removing worktrees/%s: not a valid directory" +#~ msgstr "ๅช้คๅทฅไฝๅ/%s๏ผไธๆฏไธๅๆๆ็็ฎ้" + +#, c-format +#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +#~ msgstr "ๅช้ค worktrees/%s๏ผ็กๆณ่ฎๅ gitdir ๆชๆก (%s)" + +#, c-format +#~ msgid "Removing worktrees/%s: invalid gitdir file" +#~ msgstr "ๅช้ค worktrees/%s๏ผ็กๆ็ gitdir ๆชๆก" + +#, c-format +#~ msgid "unable to re-add worktree '%s'" +#~ msgstr "็กๆณๅๆฌกๆฐๅขๅทฅไฝๅ '%s'" + +#, c-format +#~ msgid "target '%s' already exists" +#~ msgstr "็ฎๆจ '%s' ๅทฒๅญๅจ" + +#, c-format +#~ msgid "" +#~ "Cannot update sparse checkout: the following entries are not up to date:\n" +#~ "%s" +#~ msgstr "" +#~ "็กๆณๆดๆฐ็จ็็ฐฝๅบ๏ผๅฆไธๆข็ฎไธๆฏๆๆฐ๏ผ\n" +#~ "%s" + +#, c-format +#~ msgid "" +#~ "The following working tree files would be overwritten by sparse checkout " +#~ "update:\n" +#~ "%s" +#~ msgstr "" +#~ "ๅทฅไฝๅไธญไธๅๆชๆกๅฐ่ขซ็จ็็ฐฝๅบๆดๆฐๆ่ฆ่๏ผ\n" +#~ "%s" + +#, c-format +#~ msgid "" +#~ "The following working tree files would be removed by sparse checkout " +#~ "update:\n" +#~ "%s" +#~ msgstr "" +#~ "ๅทฅไฝๅไธญไธๅๆชๆกๅฐ่ขซ็จ็็ฐฝๅบๆดๆฐๆๅช้ค๏ผ\n" +#~ "%s" + +#, c-format +#~ msgid "annotated tag %s has no embedded name" +#~ msgstr "้่จปๆจ็ฑค %s ๆฒๆๅตๅ ฅๅ็จฑ" + +#~ msgid "automatically stash/stash pop before and after rebase" +#~ msgstr "้ๅฎๅบๅบๅไฝๅๅพๅท่ก่ชๅๅฒ่ๅๅฝๅบๅฒ่" + +#~ msgid "--[no-]autostash option is only valid with --rebase." +#~ msgstr "--[no-]autostash ้ธ้ ๅชๅจไฝฟ็จ --rebase ๆๆๆใ" + +#~ msgid "(DEPRECATED) keep empty commits" +#~ msgstr "(ๆฃ็จ) ไฟๆ็ฉบๆไบค" + +#, c-format +#~ msgid "Could not read '%s'" +#~ msgstr "ไธ่ฝ่ฎๅ '%s'" + +#, c-format +#~ msgid "Cannot store %s" +#~ msgstr "ไธ่ฝๅฒๅญ %s" + +#~ msgid "initialize sparse-checkout" +#~ msgstr "ๅๅงๅ็จ็็ฐฝๅบ" + +#~ msgid "set sparse-checkout patterns" +#~ msgstr "่จญๅฎ็จ็็ฐฝๅบๆจฃๅผ" + +#~ msgid "disable sparse-checkout" +#~ msgstr "ๅ็จ็จ็็ฐฝๅบ" + +#, c-format +#~ msgid "could not exec %s" +#~ msgstr "ไธ่ฝๅท่ก %s" + +#~ msgid "Cannot remove temporary index (can't happen)" +#~ msgstr "็กๆณๅช้คๆซๆ็ดขๅผ๏ผไธๆ็ผ็๏ผ" + +#, sh-format +#~ msgid "Cannot update $ref_stash with $w_commit" +#~ msgstr "็กๆณ็จ $w_commit ๆดๆฐ $ref_stash" + +#, sh-format +#~ msgid "error: unknown option for 'stash push': $option" +#~ msgstr "้ฏ่ชค๏ผ'stash push' ็ๆช็ฅ้ธ้ ๏ผ$option" + +#, sh-format +#~ msgid "Saved working directory and index state $stash_msg" +#~ msgstr "ๅฒๅญๅทฅไฝ็ฎ้ๅ็ดขๅผ็ๆ $stash_msg" + +#, sh-format +#~ msgid "unknown option: $opt" +#~ msgstr "ๆช็ฅ้ธ้ : $opt" + +#, sh-format +#~ msgid "Too many revisions specified: $REV" +#~ msgstr "ๆๅฎไบๅคชๅค็็ๆฌ๏ผ$REV" + +#, sh-format +#~ msgid "$reference is not a valid reference" +#~ msgstr "$reference ไธๆฏไธๅๆๆ็ๅผ็จ" + +#, sh-format +#~ msgid "'$args' is not a stash-like commit" +#~ msgstr "'$args' ไธๆฏๅฒ่ๅผๆไบค" + +#, sh-format +#~ msgid "'$args' is not a stash reference" +#~ msgstr "'$args' ไธๆฏไธๅๅฒ่ๅผ็จ" + +#~ msgid "unable to refresh index" +#~ msgstr "็กๆณ้ๆฐๆด็็ดขๅผ" + +#~ msgid "Cannot apply a stash in the middle of a merge" +#~ msgstr "็กๆณๅจๅไฝต้็จๅฅ็จๅฒ่" + +#~ msgid "Conflicts in index. Try without --index." +#~ msgstr "็ดขๅผไธญๆ่ก็ชใๅ่ฉฆไธไฝฟ็จ --indexใ" + +#~ msgid "Could not save index tree" +#~ msgstr "ไธ่ฝๅฒๅญ็ดขๅผๆจน" + +#~ msgid "Could not restore untracked files from stash entry" +#~ msgstr "็กๆณๅพๅฒ่ๆข็ฎไธญๅพฉๅๆช่ฟฝ่นคๆชๆก" + +#~ msgid "Cannot unstage modified files" +#~ msgstr "็กๆณๅฐไฟฎๆน็ๆชๆกๅๆถๆซๅญ" + +#, sh-format +#~ msgid "Dropped ${REV} ($s)" +#~ msgstr "ๆจๆฃไบ ${REV} ($s)" + +#, sh-format +#~ msgid "${REV}: Could not drop stash entry" +#~ msgstr "${REV}๏ผ็กๆณๆจๆฃๅฒ่ๆข็ฎ" + +#~ msgid "(To restore them type \"git stash apply\")" +#~ msgstr "๏ผ็บๅพฉๅ่ณๆ่ผธๅ ฅ \"git stash apply\"๏ผ" diff --git a/third_party/git/pretty.c b/third_party/git/pretty.c index e4ed14effe..7a7708a0ea 100644 --- a/third_party/git/pretty.c +++ b/third_party/git/pretty.c @@ -20,6 +20,7 @@ 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; @@ -97,7 +98,9 @@ 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 } + { "oneline", CMIT_FMT_ONELINE, 1, 0 }, + { "reference", CMIT_FMT_USERFORMAT, 1, 0, + 0, DATE_SHORT, "%C(auto)%h (%s, %ad)" }, /* * Please update $__git_log_pretty_formats in * git-completion.bash when you add new formats. @@ -181,6 +184,8 @@ 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); @@ -469,7 +474,8 @@ void pp_user_info(struct pretty_print_context *pp, } strbuf_addstr(sb, "From: "); - if (needs_rfc2047_encoding(namebuf, namelen)) { + if (pp->encode_email_headers && + needs_rfc2047_encoding(namebuf, namelen)) { add_rfc2047(sb, namebuf, namelen, encoding, RFC2047_ADDRESS); max_length = 76; /* per rfc2047 */ @@ -696,7 +702,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') /* mailmap lookup */ + if (part == 'N' || part == 'E' || part == 'L') /* mailmap lookup */ mailmap_name(&mail, &maillen, &name, &namelen); if (part == 'n' || part == 'N') { /* name */ strbuf_add(sb, name, namelen); @@ -706,6 +712,13 @@ 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; @@ -731,6 +744,9 @@ 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: @@ -823,21 +839,22 @@ static int istitlechar(char c) (c >= '0' && c <= '9') || c == '.' || c == '_'; } -static void format_sanitized_subject(struct strbuf *sb, const char *msg) +void format_sanitized_subject(struct strbuf *sb, const char *msg, size_t len) { size_t trimlen; size_t start_len = sb->len; int space = 2; + int i; - for (; *msg && *msg != '\n'; msg++) { - if (istitlechar(*msg)) { + for (i = 0; i < len; i++) { + if (istitlechar(msg[i])) { if (space == 1) strbuf_addch(sb, '-'); space = 0; - strbuf_addch(sb, *msg); - if (*msg == '.') - while (*(msg+1) == '.') - msg++; + strbuf_addch(sb, msg[i]); + if (msg[i] == '.') + while (msg[i+1] == '.') + i++; } else space |= 1; } @@ -1139,7 +1156,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ const struct commit *commit = c->commit; const char *msg = c->message; struct commit_list *p; - const char *arg; + const char *arg, *eol; size_t res; char **slot; @@ -1239,11 +1256,9 @@ 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 */ @@ -1298,9 +1313,18 @@ 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': @@ -1324,6 +1348,25 @@ 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; } @@ -1363,7 +1406,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ format_subject(sb, msg + c->subject_off, " "); return 1; case 'f': /* sanitized subject */ - format_sanitized_subject(sb, msg + c->subject_off); + eol = strchrnul(msg + c->subject_off, '\n'); + format_sanitized_subject(sb, msg + c->subject_off, eol - (msg + c->subject_off)); return 1; case 'b': /* body */ strbuf_addstr(sb, msg + c->body_off); @@ -1568,9 +1612,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_insert(sb, orig_len, "\n", 1); + strbuf_insertstr(sb, orig_len, "\n"); else if (magic == ADD_SP_BEFORE_NON_EMPTY) - strbuf_insert(sb, orig_len, " ", 1); + strbuf_insertstr(sb, orig_len, " "); } return consumed + 1; } @@ -1612,14 +1656,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; + struct format_commit_context context = { + .commit = commit, + .pretty_ctx = pretty_ctx, + .wrap_start = sb->len + }; 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 @@ -1726,7 +1770,8 @@ void pp_title_line(struct pretty_print_context *pp, if (pp->print_email_subject) { if (pp->rev) fmt_output_email_subject(sb, pp->rev); - if (needs_rfc2047_encoding(title.buf, title.len)) + if (pp->encode_email_headers && + needs_rfc2047_encoding(title.buf, title.len)) add_rfc2047(sb, title.buf, title.len, encoding, RFC2047_SUBJECT); else diff --git a/third_party/git/pretty.h b/third_party/git/pretty.h index 4ad1fc31ff..7ce6c0b437 100644 --- a/third_party/git/pretty.h +++ b/third_party/git/pretty.h @@ -43,6 +43,7 @@ struct pretty_print_context { struct string_list *mailmap; int color; struct ident_split *from_ident; + unsigned encode_email_headers:1; /* * Fields below here are manipulated internally by pp_* functions and @@ -138,4 +139,7 @@ const char *format_subject(struct strbuf *sb, const char *msg, /* Check if "cmit_fmt" will produce an empty output. */ int commit_format_is_empty(enum cmit_fmt); +/* Make subject of commit message suitable for filename */ +void format_sanitized_subject(struct strbuf *sb, const char *msg, size_t len); + #endif /* PRETTY_H */ diff --git a/third_party/git/progress.c b/third_party/git/progress.c index 277db8afa2..31014e6fca 100644 --- a/third_party/git/progress.c +++ b/third_party/git/progress.c @@ -8,12 +8,14 @@ * published by the Free Software Foundation. */ +#define GIT_TEST_PROGRESS_ONLY #include "cache.h" #include "gettext.h" #include "progress.h" #include "strbuf.h" #include "trace.h" #include "utf8.h" +#include "config.h" #define TP_IDX_MAX 8 @@ -45,6 +47,18 @@ 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) +{ + progress_update = 1; +} + + static void progress_interval(int signum) { progress_update = 1; @@ -55,6 +69,9 @@ static void set_progress_signal(void) struct sigaction sa; struct itimerval v; + if (progress_testing) + return; + progress_update = 0; memset(&sa, 0, sizeof(sa)); @@ -72,6 +89,10 @@ 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; @@ -88,6 +109,7 @@ 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; @@ -115,21 +137,27 @@ 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, - 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); + 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); progress->split = 1; } else { - fprintf(stderr, "%s: %s%s", progress->title, - counters_sb->buf, eol); + fprintf(stderr, "%s: %s%*s", progress->title, + counters_sb->buf, (int) clear_len, eol); } fflush(stderr); } @@ -147,6 +175,14 @@ 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; @@ -157,7 +193,7 @@ void display_throughput(struct progress *progress, uint64_t total) return; tp = progress->throughput; - now_ns = getnanotime(); + now_ns = progress_getnanotime(progress); if (!tp) { progress->throughput = tp = xcalloc(1, sizeof(*tp)); @@ -229,12 +265,23 @@ static struct progress *start_progress_delay(const char *title, uint64_t total, progress->title_len = utf8_strwidth(title); progress->split = 0; set_progress_signal(); + trace2_region_enter("progress", title, the_repository); 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, 2, 0); + return start_progress_delay(title, total, get_default_delay(), 0); } struct progress *start_progress(const char *title, uint64_t total) @@ -259,7 +306,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, 2, 1); + return start_progress_delay(title, total, get_default_delay(), 1); } static void finish_if_sparse(struct progress *progress) @@ -272,14 +319,34 @@ static void finish_if_sparse(struct progress *progress) void stop_progress(struct progress **p_progress) { + if (!p_progress) + BUG("don't provide NULL to stop_progress"); + finish_if_sparse(*p_progress); + if (*p_progress) { + trace2_data_intmax("progress", the_repository, "total_objects", + (*p_progress)->total); + + if ((*p_progress)->throughput) + trace2_data_intmax("progress", the_repository, + "total_bytes", + (*p_progress)->throughput->curr_total); + + trace2_region_leave("progress", (*p_progress)->title, the_repository); + } + stop_progress_msg(p_progress, _("done")); } void stop_progress_msg(struct progress **p_progress, const char *msg) { - struct progress *progress = *p_progress; + struct progress *progress; + + if (!p_progress) + BUG("don't provide NULL to stop_progress_msg"); + + progress = *p_progress; if (!progress) return; *p_progress = NULL; @@ -289,7 +356,7 @@ void stop_progress_msg(struct progress **p_progress, const char *msg) struct throughput *tp = progress->throughput; if (tp) { - uint64_t now_ns = getnanotime(); + uint64_t now_ns = progress_getnanotime(progress); 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/progress.h b/third_party/git/progress.h index 847338911f..f1913acf73 100644 --- a/third_party/git/progress.h +++ b/third_party/git/progress.h @@ -3,6 +3,14 @@ struct progress; +#ifdef GIT_TEST_PROGRESS_ONLY + +extern int progress_testing; +extern uint64_t progress_test_ns; +void progress_test_force_update(void); + +#endif + void display_throughput(struct progress *progress, uint64_t total); void display_progress(struct progress *progress, uint64_t n); struct progress *start_progress(const char *title, uint64_t total); diff --git a/third_party/git/promisor-remote.c b/third_party/git/promisor-remote.c new file mode 100644 index 0000000000..3c572b1c81 --- /dev/null +++ b/third_party/git/promisor-remote.c @@ -0,0 +1,259 @@ +#include "cache.h" +#include "object-store.h" +#include "promisor-remote.h" +#include "config.h" +#include "transport.h" +#include "strvec.h" + +static char *repository_format_partial_clone; + +void set_repository_format_partial_clone(char *partial_clone) +{ + repository_format_partial_clone = xstrdup_or_null(partial_clone); +} + +static int fetch_objects(const char *remote_name, + const struct object_id *oids, + int oid_nr) +{ + struct child_process child = CHILD_PROCESS_INIT; + int i; + FILE *child_in; + + child.git_cmd = 1; + child.in = -1; + strvec_pushl(&child.args, "-c", "fetch.negotiationAlgorithm=noop", + "fetch", remote_name, "--no-tags", + "--no-write-fetch-head", "--recurse-submodules=no", + "--filter=blob:none", "--stdin", NULL); + if (start_command(&child)) + die(_("promisor-remote: unable to fork off fetch subprocess")); + child_in = xfdopen(child.in, "w"); + + for (i = 0; i < oid_nr; i++) { + if (fputs(oid_to_hex(&oids[i]), child_in) < 0) + die_errno(_("promisor-remote: could not write to fetch subprocess")); + if (fputc('\n', child_in) < 0) + die_errno(_("promisor-remote: could not write to fetch subprocess")); + } + + if (fclose(child_in) < 0) + die_errno(_("promisor-remote: could not close stdin to fetch subprocess")); + return finish_command(&child) ? -1 : 0; +} + +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; + size_t namelen; + const char *subkey; + + 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; + + if (oid_nr == 0) + return 0; + + 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 new file mode 100644 index 0000000000..c7a14063c5 --- /dev/null +++ b/third_party/git/promisor-remote.h @@ -0,0 +1,41 @@ +#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. + */ +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); + +/* + * Fetches all requested objects from all promisor remotes, trying them one at + * a time until all objects are fetched. Returns 0 upon success, and non-zero + * otherwise. + * + * If oid_nr is 0, this function returns 0 (success) immediately. + */ +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/prompt.c b/third_party/git/prompt.c index 6d5885d009..5ded21a017 100644 --- a/third_party/git/prompt.c +++ b/third_party/git/prompt.c @@ -74,3 +74,15 @@ char *git_prompt(const char *prompt, int flags) } return r; } + +int git_read_line_interactively(struct strbuf *line) +{ + int ret; + + fflush(stdout); + ret = strbuf_getline_lf(line, stdin); + if (ret != EOF) + strbuf_trim_trailing_newline(line); + + return ret; +} diff --git a/third_party/git/prompt.h b/third_party/git/prompt.h index e04cced030..e294e93541 100644 --- a/third_party/git/prompt.h +++ b/third_party/git/prompt.h @@ -6,4 +6,6 @@ char *git_prompt(const char *prompt, int flags); +int git_read_line_interactively(struct strbuf *line); + #endif /* PROMPT_H */ diff --git a/third_party/git/protocol.c b/third_party/git/protocol.c index 9741f05750..052d7edbb9 100644 --- a/third_party/git/protocol.c +++ b/third_party/git/protocol.c @@ -17,30 +17,29 @@ 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 = getenv(git_test_k); + const char *git_test_v; - if (!git_config_get_string_const("protocol.version", &value)) { + if (!git_config_get_string_tmp("protocol.version", &value)) { enum protocol_version version = parse_protocol_version(value); if (version == protocol_unknown_version) die("unknown value for config 'protocol.version': %s", value); - retval = version; + return 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); - if (retval < env) - retval = env; + return env; } - return retval; + return protocol_v2; } enum protocol_version determine_protocol_version_server(void) diff --git a/third_party/git/prune-packed.c b/third_party/git/prune-packed.c new file mode 100644 index 0000000000..261520b472 --- /dev/null +++ b/third_party/git/prune-packed.c @@ -0,0 +1,43 @@ +#include "object-store.h" +#include "packfile.h" +#include "progress.h" +#include "prune-packed.h" + +static struct progress *progress; + +static int prune_subdir(unsigned int nr, const char *path, void *data) +{ + int *opts = data; + display_progress(progress, nr + 1); + if (!(*opts & PRUNE_PACKED_DRY_RUN)) + rmdir(path); + return 0; +} + +static int prune_object(const struct object_id *oid, const char *path, + void *data) +{ + int *opts = data; + + if (!has_object_pack(oid)) + return 0; + + if (*opts & PRUNE_PACKED_DRY_RUN) + printf("rm -f %s\n", path); + else + unlink_or_warn(path); + return 0; +} + +void prune_packed_objects(int opts) +{ + if (opts & PRUNE_PACKED_VERBOSE) + progress = start_delayed_progress(_("Removing duplicate objects"), 256); + + for_each_loose_file_in_objdir(get_object_directory(), + prune_object, NULL, prune_subdir, &opts); + + /* Ensure we show 100% before finishing progress */ + display_progress(progress, 256); + stop_progress(&progress); +} diff --git a/third_party/git/prune-packed.h b/third_party/git/prune-packed.h new file mode 100644 index 0000000000..936fa9df23 --- /dev/null +++ b/third_party/git/prune-packed.h @@ -0,0 +1,9 @@ +#ifndef PRUNE_PACKED_H +#define PRUNE_PACKED_H + +#define PRUNE_PACKED_DRY_RUN 01 +#define PRUNE_PACKED_VERBOSE 02 + +void prune_packed_objects(int); + +#endif diff --git a/third_party/git/quote.c b/third_party/git/quote.c index 7f2aa6faa4..69f4ca45da 100644 --- a/third_party/git/quote.c +++ b/third_party/git/quote.c @@ -1,6 +1,6 @@ #include "cache.h" #include "quote.h" -#include "argv-array.h" +#include "strvec.h" int quote_path_fully = 1; @@ -48,8 +48,14 @@ 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 (!isalpha(*p) && !isdigit(*p) && !strchr(ok_punct, *p)) { + if (!isalnum(*p) && !strchr(ok_punct, *p)) { sq_quote_buf(dst, src); return; } @@ -84,12 +90,28 @@ 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++) { - strbuf_addch(dst, ' '); + if (i > 0) + strbuf_addch(dst, ' '); sq_quote_buf_pretty(dst, argv[i]); } } @@ -150,7 +172,7 @@ char *sq_dequote(char *arg) static int sq_dequote_to_argv_internal(char *arg, const char ***argv, int *nr, int *alloc, - struct argv_array *array) + struct strvec *array) { char *next = arg; @@ -165,7 +187,7 @@ static int sq_dequote_to_argv_internal(char *arg, (*argv)[(*nr)++] = dequoted; } if (array) - argv_array_push(array, dequoted); + strvec_push(array, dequoted); } while (next); return 0; @@ -176,7 +198,7 @@ int sq_dequote_to_argv(char *arg, const char ***argv, int *nr, int *alloc) return sq_dequote_to_argv_internal(arg, argv, nr, alloc, NULL); } -int sq_dequote_to_argv_array(char *arg, struct argv_array *array) +int sq_dequote_to_strvec(char *arg, struct strvec *array) { return sq_dequote_to_argv_internal(arg, NULL, NULL, NULL, array); } @@ -188,7 +210,7 @@ int sq_dequote_to_argv_array(char *arg, struct argv_array *array) */ #define X8(x) x, x, x, x, x, x, x, x #define X16(x) X8(x), X8(x) -static signed char const sq_lookup[256] = { +static signed char const cq_lookup[256] = { /* 0 1 2 3 4 5 6 7 */ /* 0x00 */ 1, 1, 1, 1, 1, 1, 1, 'a', /* 0x08 */ 'b', 't', 'n', 'v', 'f', 'r', 1, 1, @@ -201,9 +223,9 @@ static signed char const sq_lookup[256] = { /* 0x80 */ /* set to 0 */ }; -static inline int sq_must_quote(char c) +static inline int cq_must_quote(char c) { - return sq_lookup[(unsigned char)c] + quote_path_fully > 0; + return cq_lookup[(unsigned char)c] + quote_path_fully > 0; } /* returns the longest prefix not needing a quote up to maxlen if positive. @@ -213,9 +235,9 @@ static size_t next_quote_pos(const char *s, ssize_t maxlen) { size_t len; if (maxlen < 0) { - for (len = 0; !sq_must_quote(s[len]); len++); + for (len = 0; !cq_must_quote(s[len]); len++); } else { - for (len = 0; len < maxlen && !sq_must_quote(s[len]); len++); + for (len = 0; len < maxlen && !cq_must_quote(s[len]); len++); } return len; } @@ -234,7 +256,7 @@ static size_t next_quote_pos(const char *s, ssize_t maxlen) * Return value is the same as in (1). */ static size_t quote_c_style_counted(const char *name, ssize_t maxlen, - struct strbuf *sb, FILE *fp, int no_dq) + struct strbuf *sb, FILE *fp, unsigned flags) { #undef EMIT #define EMIT(c) \ @@ -250,6 +272,7 @@ static size_t quote_c_style_counted(const char *name, ssize_t maxlen, count += (l); \ } while (0) + int no_dq = !!(flags & CQUOTE_NODQ); size_t len, count = 0; const char *p = name; @@ -269,8 +292,8 @@ static size_t quote_c_style_counted(const char *name, ssize_t maxlen, ch = (unsigned char)*p++; if (maxlen >= 0) maxlen -= len + 1; - if (sq_lookup[ch] >= ' ') { - EMIT(sq_lookup[ch]); + if (cq_lookup[ch] >= ' ') { + EMIT(cq_lookup[ch]); } else { EMIT(((ch >> 6) & 03) + '0'); EMIT(((ch >> 3) & 07) + '0'); @@ -287,19 +310,21 @@ static size_t quote_c_style_counted(const char *name, ssize_t maxlen, return count; } -size_t quote_c_style(const char *name, struct strbuf *sb, FILE *fp, int nodq) +size_t quote_c_style(const char *name, struct strbuf *sb, FILE *fp, unsigned flags) { - return quote_c_style_counted(name, -1, sb, fp, nodq); + return quote_c_style_counted(name, -1, sb, fp, flags); } -void quote_two_c_style(struct strbuf *sb, const char *prefix, const char *path, int nodq) +void quote_two_c_style(struct strbuf *sb, const char *prefix, const char *path, + unsigned flags) { + int nodq = !!(flags & CQUOTE_NODQ); if (quote_c_style(prefix, NULL, NULL, 0) || quote_c_style(path, NULL, NULL, 0)) { if (!nodq) strbuf_addch(sb, '"'); - quote_c_style(prefix, sb, NULL, 1); - quote_c_style(path, sb, NULL, 1); + quote_c_style(prefix, sb, NULL, CQUOTE_NODQ); + quote_c_style(path, sb, NULL, CQUOTE_NODQ); if (!nodq) strbuf_addch(sb, '"'); } else { @@ -330,13 +355,25 @@ void write_name_quoted_relative(const char *name, const char *prefix, } /* quote path as relative to the given prefix */ -char *quote_path_relative(const char *in, const char *prefix, - struct strbuf *out) +char *quote_path(const char *in, const char *prefix, struct strbuf *out, unsigned flags) { struct strbuf sb = STRBUF_INIT; const char *rel = relative_path(in, prefix, &sb); + int force_dq = ((flags & QUOTE_PATH_QUOTE_SP) && strchr(rel, ' ')); + strbuf_reset(out); - quote_c_style_counted(rel, strlen(rel), out, NULL, 0); + + /* + * If the caller wants us to enclose the output in a dq-pair + * whether quote_c_style_counted() needs to, we do it ourselves + * and tell quote_c_style_counted() not to. + */ + if (force_dq) + strbuf_addch(out, '"'); + quote_c_style_counted(rel, strlen(rel), out, NULL, + force_dq ? CQUOTE_NODQ : 0); + if (force_dq) + strbuf_addch(out, '"'); strbuf_release(&sb); return out->buf; diff --git a/third_party/git/quote.h b/third_party/git/quote.h index fb08dc085c..4b72a583cf 100644 --- a/third_party/git/quote.h +++ b/third_party/git/quote.h @@ -40,6 +40,7 @@ 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 @@ -55,24 +56,27 @@ char *sq_dequote(char *); int sq_dequote_to_argv(char *arg, const char ***argv, int *nr, int *alloc); /* - * Same as above, but store the unquoted strings in an argv_array. We will - * still modify arg in place, but unlike sq_dequote_to_argv, the argv_array + * Same as above, but store the unquoted strings in a strvec. We will + * still modify arg in place, but unlike sq_dequote_to_argv, the strvec * will duplicate and take ownership of the strings. */ -struct argv_array; -int sq_dequote_to_argv_array(char *arg, struct argv_array *); +struct strvec; +int sq_dequote_to_strvec(char *arg, struct strvec *); int unquote_c_style(struct strbuf *, const char *quoted, const char **endp); -size_t quote_c_style(const char *name, struct strbuf *, FILE *, int no_dq); -void quote_two_c_style(struct strbuf *, const char *, const char *, int); + +/* Bits in the flags parameter to quote_c_style() */ +#define CQUOTE_NODQ 01 +size_t quote_c_style(const char *name, struct strbuf *, FILE *, unsigned); +void quote_two_c_style(struct strbuf *, const char *, const char *, unsigned); void write_name_quoted(const char *name, FILE *, int terminator); void write_name_quoted_relative(const char *name, const char *prefix, FILE *fp, int terminator); /* quote path as relative to the given prefix */ -char *quote_path_relative(const char *in, const char *prefix, - struct strbuf *out); +char *quote_path(const char *in, const char *prefix, struct strbuf *out, unsigned flags); +#define QUOTE_PATH_QUOTE_SP 01 /* quoting as a string literal for other languages */ void perl_quote_buf(struct strbuf *sb, const char *src); diff --git a/third_party/git/range-diff.c b/third_party/git/range-diff.c index ba1e9a4265..24dc435e48 100644 --- a/third_party/git/range-diff.c +++ b/third_party/git/range-diff.c @@ -2,7 +2,7 @@ #include "range-diff.h" #include "string-list.h" #include "run-command.h" -#include "argv-array.h" +#include "strvec.h" #include "hashmap.h" #include "xdiff-interface.h" #include "linear-assignment.h" @@ -40,7 +40,8 @@ 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) +static int read_patches(const char *range, struct string_list *list, + const struct strvec *other_arg) { struct child_process cp = CHILD_PROCESS_INIT; struct strbuf buf = STRBUF_INIT, contents = STRBUF_INIT; @@ -50,18 +51,24 @@ static int read_patches(const char *range, struct string_list *list) int offset, len; size_t size; - argv_array_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges", - "--reverse", "--date-order", "--decorate=no", - /* - * Choose indicators that are not used anywhere - * else in diffs, but still look reasonable - * (e.g. will not be confusing when debugging) - */ - "--output-indicator-new=>", - "--output-indicator-old=<", - "--output-indicator-context=#", - "--no-abbrev-commit", range, - NULL); + strvec_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 + * (e.g. will not be confusing when debugging) + */ + "--output-indicator-new=>", + "--output-indicator-old=<", + "--output-indicator-context=#", + "--no-abbrev-commit", + "--pretty=medium", + "--notes", + NULL); + if (other_arg) + strvec_pushv(&cp.args, other_arg->v); + strvec_push(&cp.args, range); cp.out = -1; cp.no_stdin = 1; cp.git_cmd = 1; @@ -101,20 +108,34 @@ static int read_patches(const char *range, struct string_list *list) continue; } + if (!util) { + error(_("could not parse first line of `log` output: " + "did not start with 'commit ': '%s'"), + line); + string_list_clear(list, 1); + strbuf_release(&buf); + strbuf_release(&contents); + finish_command(&cp); + return -1; + } + if (starts_with(line, "diff --git")) { struct patch patch = { 0 }; struct strbuf root = STRBUF_INIT; int linenr = 0; + int orig_len; in_header = 0; strbuf_addch(&buf, '\n'); if (!util->diff_offset) util->diff_offset = buf.len; line[len - 1] = '\n'; - len = parse_git_diff_header(&root, &linenr, 1, line, + orig_len = len; + len = parse_git_diff_header(&root, &linenr, 0, line, len, size, &patch); if (len < 0) - die(_("could not parse git header '%.*s'"), (int)len, line); + die(_("could not parse git header '%.*s'"), + orig_len, line); strbuf_addstr(&buf, " ## "); if (patch.is_new > 0) strbuf_addf(&buf, "%s (new)", patch.new_name); @@ -143,6 +164,12 @@ 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) @@ -217,8 +244,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, strhash(util->diff)); - hashmap_add(&map, util); + hashmap_entry_init(&util->e, strhash(util->diff)); + hashmap_add(&map, &util->e); } /* Now try to find exact matches in b */ @@ -228,8 +255,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, strhash(util->diff)); - other = hashmap_remove(&map, util, NULL); + hashmap_entry_init(&util->e, strhash(util->diff)); + other = hashmap_remove_entry(&map, util, e, NULL); if (other) { if (other->matching >= 0) BUG("already assigned!"); @@ -239,7 +266,7 @@ static void find_exact_matches(struct string_list *a, struct string_list *b) } } - hashmap_free(&map, 0); + hashmap_free(&map); } static void diffsize_consume(void *data, char *line, unsigned long len) @@ -495,16 +522,17 @@ 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, - struct diff_options *diffopt) + const struct diff_options *diffopt, + const struct strvec *other_arg) { int res = 0; struct string_list branch1 = STRING_LIST_INIT_DUP; struct string_list branch2 = STRING_LIST_INIT_DUP; - if (read_patches(range1, &branch1)) + if (read_patches(range1, &branch1, other_arg)) res = error(_("could not parse log for '%s'"), range1); - if (!res && read_patches(range2, &branch2)) + if (!res && read_patches(range2, &branch2, other_arg)) 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 08a50b6e98..583ced2e8e 100644 --- a/third_party/git/range-diff.h +++ b/third_party/git/range-diff.h @@ -2,16 +2,18 @@ #define RANGE_DIFF_H #include "diff.h" +#include "strvec.h" #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60 /* - * Compare series of commmits in RANGE1 and RANGE2, and emit to the + * Compare series of commits 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, - struct diff_options *diffopt); + const struct diff_options *diffopt, + const struct strvec *other_arg); #endif diff --git a/third_party/git/reachable.c b/third_party/git/reachable.c index 8f50235b28..77a60c70a5 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); + bitmap_git = prepare_bitmap_walk(revs, NULL); if (bitmap_git) { - traverse_bitmap_commit_list(bitmap_git, mark_object_seen); + traverse_bitmap_commit_list(bitmap_git, revs, 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 52ffa8a313..ecf6f68994 100644 --- a/third_party/git/read-cache.c +++ b/third_party/git/read-cache.c @@ -89,8 +89,10 @@ static struct mem_pool *find_mem_pool(struct index_state *istate) else pool_ptr = &istate->ce_mem_pool; - if (!*pool_ptr) - mem_pool_init(pool_ptr, 0); + if (!*pool_ptr) { + *pool_ptr = xmalloc(sizeof(**pool_ptr)); + mem_pool_init(*pool_ptr, 0); + } return *pool_ptr; } @@ -959,11 +961,14 @@ static int verify_dotfile(const char *rest, unsigned mode) int verify_path(const char *path, unsigned mode) { - char c; + char c = 0; if (has_dos_drive_prefix(path)) return 0; + if (!is_valid_path(path)) + return 0; + goto inside; for (;;) { if (!c) @@ -971,6 +976,7 @@ 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)) { @@ -979,6 +985,10 @@ inside: } } if (protect_ntfs) { +#ifdef GIT_WINDOWS_NATIVE + if (c == '\\') + return 0; +#endif if (is_ntfs_dotgit(path)) return 0; if (S_ISLNK(mode)) { @@ -991,7 +1001,15 @@ 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++; } } @@ -1155,20 +1173,6 @@ static int has_dir_name(struct index_state *istate, return retval; } - if (istate->cache_nr > 0 && - ce_namelen(istate->cache[istate->cache_nr - 1]) > len) { - /* - * The directory prefix lines up with part of - * a longer file or directory name, but sorts - * after it, so this sub-directory cannot - * collide with a file. - * - * last: xxx/yy-file (because '-' sorts before '/') - * this: xxx/yy/abc - */ - return retval; - } - /* * This is a possible collision. Fall through and * let the regular search code handle it. @@ -1276,7 +1280,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 = -istate->cache_nr - 1; + pos = index_pos_to_insert_pos(istate->cache_nr); else pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce)); @@ -1472,6 +1476,27 @@ 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) @@ -1599,16 +1624,17 @@ struct cache_entry *refresh_cache_entry(struct index_state *istate, #define INDEX_FORMAT_DEFAULT 3 -static unsigned int get_index_format_default(void) +static unsigned int get_index_format_default(struct repository *r) { char *envversion = getenv("GIT_INDEX_VERSION"); char *endp; - int value; unsigned int version = INDEX_FORMAT_DEFAULT; if (!envversion) { - if (!git_config_get_int("index.version", &value)) - version = value; + prepare_repo_settings(r); + + if (r->settings.index_version >= 0) + version = r->settings.index_version; 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); @@ -1768,7 +1794,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 begining of a block, ignore the previous name */ + /* If we're at the beginning of a block, ignore the previous name */ strip_len = decode_varint(&cp); if (previous_ce) { previous_len = previous_ce->ce_namelen; @@ -1844,18 +1870,17 @@ static void check_ce_order(struct index_state *istate) static void tweak_untracked_cache(struct index_state *istate) { - switch (git_config_get_untracked_cache()) { - case -1: /* keep: do nothing */ - break; - case 0: /* false */ + struct repository *r = the_repository; + + prepare_repo_settings(r); + + if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE) { remove_untracked_cache(istate); - break; - case 1: /* true */ - add_untracked_cache(istate); - break; - default: /* unknown value: do nothing */ - break; + return; } + + if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE) + add_untracked_cache(istate); } static void tweak_split_index(struct index_state *istate) @@ -1894,7 +1919,7 @@ static size_t estimate_cache_size(size_t ondisk_size, unsigned int entries) /* * Account for potential alignment differences. */ - per_entry += align_padding_size(sizeof(struct cache_entry), -sizeof(struct ondisk_cache_entry)); + per_entry += align_padding_size(per_entry, 0); return ondisk_size + entries * per_entry; } @@ -1983,11 +2008,12 @@ static unsigned long load_all_cache_entries(struct index_state *istate, { unsigned long consumed; + istate->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool)); if (istate->version == 4) { - mem_pool_init(&istate->ce_mem_pool, + mem_pool_init(istate->ce_mem_pool, estimate_cache_size_from_compressed(istate->cache_nr)); } else { - mem_pool_init(&istate->ce_mem_pool, + mem_pool_init(istate->ce_mem_pool, estimate_cache_size(mmap_size, istate->cache_nr)); } @@ -2047,7 +2073,8 @@ static unsigned long load_cache_entries_threaded(struct index_state *istate, con if (istate->name_hash_initialized) BUG("the name hash isn't thread safe"); - mem_pool_init(&istate->ce_mem_pool, 0); + istate->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool)); + mem_pool_init(istate->ce_mem_pool, 0); /* ensure we have no more threads than we have blocks to process */ if (nr_threads > ieot->nr) @@ -2074,11 +2101,12 @@ static unsigned long load_cache_entries_threaded(struct index_state *istate, con nr = 0; for (j = p->ieot_start; j < p->ieot_start + p->ieot_blocks; j++) nr += p->ieot->entries[j].nr; + p->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool)); if (istate->version == 4) { - mem_pool_init(&p->ce_mem_pool, + mem_pool_init(p->ce_mem_pool, estimate_cache_size_from_compressed(nr)); } else { - mem_pool_init(&p->ce_mem_pool, + mem_pool_init(p->ce_mem_pool, estimate_cache_size(mmap_size, nr)); } @@ -2335,7 +2363,7 @@ int discard_index(struct index_state *istate) if (istate->ce_mem_pool) { mem_pool_discard(istate->ce_mem_pool, should_validate_cache_entries()); - istate->ce_mem_pool = NULL; + FREE_AND_NULL(istate->ce_mem_pool); } return 0; @@ -2765,7 +2793,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile, } if (!istate->version) { - istate->version = get_index_format_default(); + istate->version = get_index_format_default(the_repository); 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 aa18ae82b7..762853bc7e 100644 --- a/third_party/git/rebase-interactive.c +++ b/third_party/git/rebase-interactive.c @@ -5,6 +5,13 @@ #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, @@ -28,7 +35,7 @@ static enum missing_commit_check_level get_missing_commit_check_level(void) return MISSING_COMMIT_CHECK_IGNORE; } -void append_todo_help(unsigned keep_empty, int command_count, +void append_todo_help(int command_count, const char *shortrevisions, const char *shortonto, struct strbuf *buf) { @@ -80,33 +87,33 @@ void append_todo_help(unsigned keep_empty, 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(); + const char *todo_file = rebase_path_todo(), + *todo_backup = rebase_path_todo_backup(); 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) - todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list); + incorrect = todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list) | + file_exists(rebase_path_dropped()); 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 (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 (!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 (launch_sequence_editor(todo_file, &new_todo->buf, NULL)) return -2; @@ -115,10 +122,23 @@ int edit_todo_list(struct repository *r, struct todo_list *todo_list, if (initial && new_todo->buf.len == 0) return -3; - /* 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); + 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; + } return 0; } @@ -183,7 +203,52 @@ 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 44dbb06311..dc2cf0ee12 100644 --- a/third_party/git/rebase-interactive.h +++ b/third_party/git/rebase-interactive.h @@ -5,12 +5,17 @@ struct strbuf; struct repository; struct todo_list; -void append_todo_help(unsigned keep_empty, int command_count, +void append_todo_help(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 new file mode 100644 index 0000000000..f8137d859b --- /dev/null +++ b/third_party/git/rebase.c @@ -0,0 +1,35 @@ +#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 new file mode 100644 index 0000000000..cc723d4748 --- /dev/null +++ b/third_party/git/rebase.h @@ -0,0 +1,15 @@ +#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 f27cfc8c3e..c62f6b4822 100644 --- a/third_party/git/ref-filter.c +++ b/third_party/git/ref-filter.c @@ -22,7 +22,7 @@ #include "commit-reach.h" #include "worktree.h" #include "hashmap.h" -#include "argv-array.h" +#include "strvec.h" static struct ref_msg { const char *gone; @@ -79,17 +79,20 @@ static struct expand_data { } oi, oi_deref; struct ref_to_worktree_entry { - struct hashmap_entry ent; /* must be the first member! */ + struct hashmap_entry ent; struct worktree *wt; /* key is wt->head_ref */ }; static int ref_to_worktree_map_cmpfnc(const void *unused_lookupdata, - const void *existing_hashmap_entry_to_test, - const void *key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *kptr, const void *keydata_aka_refname) { - const struct ref_to_worktree_entry *e = existing_hashmap_entry_to_test; - const struct ref_to_worktree_entry *k = key; + 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); + return strcmp(e->wt->head_ref, keydata_aka_refname ? keydata_aka_refname : k->wt->head_ref); } @@ -124,7 +127,8 @@ static struct used_atom { unsigned int nobracket : 1, push : 1, push_remote : 1; } remote_ref; struct { - enum { C_BARE, C_BODY, C_BODY_DEP, C_LINES, C_SIG, C_SUB, C_TRAILERS } option; + enum { C_BARE, C_BODY, C_BODY_DEP, C_LENGTH, C_LINES, + C_SIG, C_SUB, C_SUB_SANITIZE, C_TRAILERS } option; struct process_trailer_options trailer_opts; unsigned int nlines; } contents; @@ -135,7 +139,10 @@ static struct used_atom { struct { enum { O_FULL, O_LENGTH, O_SHORT } option; unsigned int length; - } objectname; + } oid; + struct email_option { + enum { EO_RAW, EO_TRIM, EO_LOCALPART } option; + } email_option; struct refname_atom refname; char *head; } u; @@ -276,9 +283,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_sha1 = oi_deref.delta_base_oid.hash; + oi_deref.info.delta_base_oid = &oi_deref.delta_base_oid; else - oi.info.delta_base_sha1 = oi.delta_base_oid.hash; + oi.info.delta_base_oid = &oi.delta_base_oid; return 0; } @@ -294,9 +301,12 @@ static int body_atom_parser(const struct ref_format *format, struct used_atom *a static int subject_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg, struct strbuf *err) { - if (arg) - return strbuf_addf_ret(err, -1, _("%%(subject) does not take arguments")); - atom->u.contents.option = C_SUB; + if (!arg) + atom->u.contents.option = C_SUB; + else if (!strcmp(arg, "sanitize")) + atom->u.contents.option = C_SUB_SANITIZE; + else + return strbuf_addf_ret(err, -1, _("unrecognized %%(subject) argument: %s"), arg); return 0; } @@ -335,13 +345,17 @@ static int contents_atom_parser(const struct ref_format *format, struct used_ato atom->u.contents.option = C_BARE; else if (!strcmp(arg, "body")) atom->u.contents.option = C_BODY; + else if (!strcmp(arg, "size")) + atom->u.contents.option = C_LENGTH; else if (!strcmp(arg, "signature")) atom->u.contents.option = C_SIG; else if (!strcmp(arg, "subject")) atom->u.contents.option = C_SUB; - else if (skip_prefix(arg, "trailers", &arg)) { - skip_prefix(arg, ":", &arg); - if (trailers_atom_parser(format, atom, *arg ? arg : NULL, err)) + else if (!strcmp(arg, "trailers")) { + if (trailers_atom_parser(format, atom, NULL, err)) + return -1; + } else if (skip_prefix(arg, "trailers:", &arg)) { + if (trailers_atom_parser(format, atom, arg, err)) return -1; } else if (skip_prefix(arg, "lines=", &arg)) { atom->u.contents.option = C_LINES; @@ -352,22 +366,36 @@ static int contents_atom_parser(const struct ref_format *format, struct used_ato return 0; } -static int objectname_atom_parser(const struct ref_format *format, struct used_atom *atom, - const char *arg, struct strbuf *err) +static int oid_atom_parser(const struct ref_format *format, struct used_atom *atom, + const char *arg, struct strbuf *err) { if (!arg) - atom->u.objectname.option = O_FULL; + atom->u.oid.option = O_FULL; else if (!strcmp(arg, "short")) - atom->u.objectname.option = O_SHORT; + atom->u.oid.option = O_SHORT; else if (skip_prefix(arg, "short=", &arg)) { - atom->u.objectname.option = O_LENGTH; - if (strtoul_ui(arg, 10, &atom->u.objectname.length) || - atom->u.objectname.length == 0) - return strbuf_addf_ret(err, -1, _("positive value expected objectname:short=%s"), arg); - if (atom->u.objectname.length < MINIMUM_ABBREV) - atom->u.objectname.length = MINIMUM_ABBREV; + atom->u.oid.option = O_LENGTH; + if (strtoul_ui(arg, 10, &atom->u.oid.length) || + atom->u.oid.length == 0) + return strbuf_addf_ret(err, -1, _("positive value expected '%s' in %%(%s)"), arg, atom->name); + if (atom->u.oid.length < MINIMUM_ABBREV) + atom->u.oid.length = MINIMUM_ABBREV; } else - return strbuf_addf_ret(err, -1, _("unrecognized %%(objectname) argument: %s"), arg); + return strbuf_addf_ret(err, -1, _("unrecognized argument '%s' in %%(%s)"), arg, atom->name); + return 0; +} + +static int person_email_atom_parser(const struct ref_format *format, struct used_atom *atom, + const char *arg, struct strbuf *err) +{ + if (!arg) + atom->u.email_option.option = EO_RAW; + else if (!strcmp(arg, "trim")) + atom->u.email_option.option = EO_TRIM; + else if (!strcmp(arg, "localpart")) + atom->u.email_option.option = EO_LOCALPART; + else + return strbuf_addf_ret(err, -1, _("unrecognized email option: %s"), arg); return 0; } @@ -472,25 +500,25 @@ static struct { { "refname", SOURCE_NONE, FIELD_STR, refname_atom_parser }, { "objecttype", SOURCE_OTHER, FIELD_STR, objecttype_atom_parser }, { "objectsize", SOURCE_OTHER, FIELD_ULONG, objectsize_atom_parser }, - { "objectname", SOURCE_OTHER, FIELD_STR, objectname_atom_parser }, + { "objectname", SOURCE_OTHER, FIELD_STR, oid_atom_parser }, { "deltabase", SOURCE_OTHER, FIELD_STR, deltabase_atom_parser }, - { "tree", SOURCE_OBJ }, - { "parent", SOURCE_OBJ }, + { "tree", SOURCE_OBJ, FIELD_STR, oid_atom_parser }, + { "parent", SOURCE_OBJ, FIELD_STR, oid_atom_parser }, { "numparent", SOURCE_OBJ, FIELD_ULONG }, { "object", SOURCE_OBJ }, { "type", SOURCE_OBJ }, { "tag", SOURCE_OBJ }, { "author", SOURCE_OBJ }, { "authorname", SOURCE_OBJ }, - { "authoremail", SOURCE_OBJ }, + { "authoremail", SOURCE_OBJ, FIELD_STR, person_email_atom_parser }, { "authordate", SOURCE_OBJ, FIELD_TIME }, { "committer", SOURCE_OBJ }, { "committername", SOURCE_OBJ }, - { "committeremail", SOURCE_OBJ }, + { "committeremail", SOURCE_OBJ, FIELD_STR, person_email_atom_parser }, { "committerdate", SOURCE_OBJ, FIELD_TIME }, { "tagger", SOURCE_OBJ }, { "taggername", SOURCE_OBJ }, - { "taggeremail", SOURCE_OBJ }, + { "taggeremail", SOURCE_OBJ, FIELD_STR, person_email_atom_parser }, { "taggerdate", SOURCE_OBJ, FIELD_TIME }, { "creator", SOURCE_OBJ }, { "creatordate", SOURCE_OBJ, FIELD_TIME }, @@ -895,21 +923,27 @@ int verify_ref_format(struct ref_format *format) return 0; } -static int grab_objectname(const char *name, const struct object_id *oid, - struct atom_value *v, struct used_atom *atom) +static const char *do_grab_oid(const char *field, const struct object_id *oid, + struct used_atom *atom) { - if (starts_with(name, "objectname")) { - if (atom->u.objectname.option == O_SHORT) { - v->s = xstrdup(find_unique_abbrev(oid, DEFAULT_ABBREV)); - return 1; - } else if (atom->u.objectname.option == O_FULL) { - v->s = xstrdup(oid_to_hex(oid)); - return 1; - } else if (atom->u.objectname.option == O_LENGTH) { - v->s = xstrdup(find_unique_abbrev(oid, atom->u.objectname.length)); - return 1; - } else - BUG("unknown %%(objectname) option"); + switch (atom->u.oid.option) { + case O_FULL: + return oid_to_hex(oid); + case O_LENGTH: + return find_unique_abbrev(oid, atom->u.oid.length); + case O_SHORT: + return find_unique_abbrev(oid, DEFAULT_ABBREV); + default: + BUG("unknown %%(%s) option", field); + } +} + +static int grab_oid(const char *name, const char *field, const struct object_id *oid, + struct atom_value *v, struct used_atom *atom) +{ + if (starts_with(name, field)) { + v->s = xstrdup(do_grab_oid(field, oid, atom)); + return 1; } return 0; } @@ -937,7 +971,7 @@ static void grab_common_values(struct atom_value *val, int deref, struct expand_ } else if (!strcmp(name, "deltabase")) v->s = xstrdup(oid_to_hex(&oi->delta_base_oid)); else if (deref) - grab_objectname(name, &oi->oid, v, &used_atom[i]); + grab_oid(name, "objectname", &oi->oid, v, &used_atom[i]); } } @@ -976,21 +1010,20 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object continue; if (deref) name++; - if (!strcmp(name, "tree")) { - v->s = xstrdup(oid_to_hex(get_commit_tree_oid(commit))); - } - else if (!strcmp(name, "numparent")) { + if (grab_oid(name, "tree", get_commit_tree_oid(commit), v, &used_atom[i])) + continue; + if (!strcmp(name, "numparent")) { v->value = commit_list_count(commit->parents); v->s = xstrfmt("%lu", (unsigned long)v->value); } - else if (!strcmp(name, "parent")) { + else if (starts_with(name, "parent")) { struct commit_list *parents; struct strbuf s = STRBUF_INIT; for (parents = commit->parents; parents; parents = parents->next) { - struct commit *parent = parents->item; + struct object_id *oid = &parents->item->object.oid; if (parents != commit->parents) strbuf_addch(&s, ' '); - strbuf_addstr(&s, oid_to_hex(&parent->object.oid)); + strbuf_addstr(&s, do_grab_oid("parent", oid, &used_atom[i])); } v->s = strbuf_detach(&s, NULL); } @@ -1028,19 +1061,38 @@ static const char *copy_name(const char *buf) if (!strncmp(cp, " <", 2)) return xmemdupz(buf, cp - buf); } - return ""; + return xstrdup(""); } -static const char *copy_email(const char *buf) +static const char *copy_email(const char *buf, struct used_atom *atom) { const char *email = strchr(buf, '<'); const char *eoemail; if (!email) - return ""; - eoemail = strchr(email, '>'); + return xstrdup(""); + switch (atom->u.email_option.option) { + case EO_RAW: + eoemail = strchr(email, '>'); + if (eoemail) + eoemail++; + break; + case EO_TRIM: + email++; + eoemail = strchr(email, '>'); + break; + case EO_LOCALPART: + email++; + eoemail = strchr(email, '@'); + if (!eoemail) + eoemail = strchr(email, '>'); + break; + default: + BUG("unknown email option"); + } + if (!eoemail) - return ""; - return xmemdupz(email, eoemail + 1 - email); + return xstrdup(""); + return xmemdupz(email, eoemail - email); } static char *copy_subject(const char *buf, unsigned long len) @@ -1110,7 +1162,7 @@ static void grab_person(const char *who, struct atom_value *val, int deref, void continue; if (name[wholen] != 0 && strcmp(name + wholen, "name") && - strcmp(name + wholen, "email") && + !starts_with(name + wholen, "email") && !starts_with(name + wholen, "date")) continue; if (!wholine) @@ -1121,8 +1173,8 @@ static void grab_person(const char *who, struct atom_value *val, int deref, void v->s = copy_line(wholine); else if (!strcmp(name + wholen, "name")) v->s = copy_name(wholine); - else if (!strcmp(name + wholen, "email")) - v->s = copy_email(wholine); + else if (starts_with(name + wholen, "email")) + v->s = copy_email(wholine, &used_atom[i]); else if (starts_with(name + wholen, "date")) grab_date(wholine, v, name); } @@ -1235,8 +1287,8 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, void *buf) continue; if (deref) name++; - if (strcmp(name, "subject") && - strcmp(name, "body") && + if (strcmp(name, "body") && + !starts_with(name, "subject") && !starts_with(name, "trailers") && !starts_with(name, "contents")) continue; @@ -1248,8 +1300,14 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, void *buf) if (atom->u.contents.option == C_SUB) v->s = copy_subject(subpos, sublen); - else if (atom->u.contents.option == C_BODY_DEP) + else if (atom->u.contents.option == C_SUB_SANITIZE) { + struct strbuf sb = STRBUF_INIT; + format_sanitized_subject(&sb, subpos, sublen); + v->s = strbuf_detach(&sb, NULL); + } else if (atom->u.contents.option == C_BODY_DEP) v->s = xmemdupz(bodypos, bodylen); + else if (atom->u.contents.option == C_LENGTH) + v->s = xstrfmt("%"PRIuMAX, (uintmax_t)strlen(subpos)); else if (atom->u.contents.option == C_BODY) v->s = xmemdupz(bodypos, nonsiglen); else if (atom->u.contents.option == C_SIG) @@ -1456,12 +1514,10 @@ 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, - &explicit); - *s = xstrdup(explicit ? merge : ""); + merge = remote_ref_for_branch(branch, atom->u.remote_ref.push); + *s = xstrdup(merge ? merge : ""); } else BUG("unhandled RR_* enum"); } @@ -1501,9 +1557,7 @@ char *get_head_description(void) strbuf_addstr(&desc, _("no branch")); strbuf_addch(&desc, ')'); - free(state.branch); - free(state.onto); - free(state.detached_from); + wt_status_state_free_buffers(&state); return strbuf_detach(&desc, NULL); } @@ -1565,9 +1619,10 @@ 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, strhash(worktrees[i]->head_ref)); + hashmap_entry_init(&entry->ent, + strhash(worktrees[i]->head_ref)); - hashmap_add(map, entry); + hashmap_add(map, &entry->ent); } } } @@ -1577,25 +1632,27 @@ static void lazy_init_worktree_map(void) if (ref_to_worktree_map.worktrees) return; - ref_to_worktree_map.worktrees = get_worktrees(0); + ref_to_worktree_map.worktrees = get_worktrees(); hashmap_init(&(ref_to_worktree_map.map), ref_to_worktree_map_cmpfnc, NULL, 0); populate_worktree_map(&(ref_to_worktree_map.map), ref_to_worktree_map.worktrees); } static char *get_worktree_path(const struct used_atom *atom, const struct ref_array_item *ref) { - struct hashmap_entry entry; + struct hashmap_entry entry, *e; struct ref_to_worktree_entry *lookup_result; lazy_init_worktree_map(); hashmap_entry_init(&entry, strhash(ref->refname)); - lookup_result = hashmap_get(&(ref_to_worktree_map.map), &entry, ref->refname); + e = hashmap_get(&(ref_to_worktree_map.map), &entry, ref->refname); - if (lookup_result) - return xstrdup(lookup_result->wt->path); - else + if (!e) return xstrdup(""); + + lookup_result = container_of(e, struct ref_to_worktree_entry, ent); + + return xstrdup(lookup_result->wt->path); } /* @@ -1695,7 +1752,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err) v->s = xstrdup(buf + 1); } continue; - } else if (!deref && grab_objectname(name, &ref->objectname, v, atom)) { + } else if (!deref && grab_oid(name, "objectname", &ref->objectname, v, atom)) { continue; } else if (!strcmp(name, "HEAD")) { if (atom->u.head && !strcmp(ref->refname, atom->u.head)) @@ -1766,7 +1823,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 = ((struct tag *)obj)->tagged->oid; + oi_deref.oid = *get_tagged_oid((struct tag *)obj); /* * NEEDSWORK: This derefs tag only once, which @@ -1910,15 +1967,15 @@ static void find_longest_prefixes_1(struct string_list *out, static void find_longest_prefixes(struct string_list *out, const char **patterns) { - struct argv_array sorted = ARGV_ARRAY_INIT; + struct strvec sorted = STRVEC_INIT; struct strbuf prefix = STRBUF_INIT; - argv_array_pushv(&sorted, patterns); - QSORT(sorted.argv, sorted.argc, qsort_strcmp); + strvec_pushv(&sorted, patterns); + QSORT(sorted.v, sorted.nr, qsort_strcmp); - find_longest_prefixes_1(out, &prefix, sorted.argv, sorted.argc); + find_longest_prefixes_1(out, &prefix, sorted.v, sorted.nr); - argv_array_clear(&sorted); + strvec_clear(&sorted); strbuf_release(&prefix); } @@ -1972,12 +2029,11 @@ static int for_each_fullref_in_pattern(struct ref_filter *filter, } /* - * Given a ref (sha1, refname), check if the ref belongs to the array - * of sha1s. If the given ref is a tag, check if the given tag points - * at one of the sha1s in the given sha1 array. - * the given sha1_array. + * Given a ref (oid, refname), check if the ref belongs to the array + * of oids. If the given ref is a tag, check if the given tag points + * at one of the oids in the given oid array. * NEEDSWORK: - * 1. Only a single level of inderection is obtained, we might want to + * 1. Only a single level of indirection is obtained, we might want to * change this to account for multiple levels (e.g. annotated tags * pointing to annotated tags pointing to a commit.) * 2. As the refs are cached we might know what refname peels to without @@ -1997,7 +2053,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 = &((struct tag *)obj)->tagged->oid; + tagged_oid = get_tagged_oid((struct tag *)obj); if (tagged_oid && oid_array_lookup(points_at, tagged_oid) >= 0) return tagged_oid; return NULL; @@ -2109,9 +2165,9 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid, * obtain the commit using the 'oid' available and discard all * non-commits early. The actual filtering is done later. */ - if (filter->merge_commit || filter->with_commit || filter->no_commit || filter->verbose) { - commit = lookup_commit_reference_gently(the_repository, oid, - 1); + if (filter->reachable_from || filter->unreachable_from || + filter->with_commit || filter->no_commit || filter->verbose) { + commit = lookup_commit_reference_gently(the_repository, oid, 1); if (!commit) return 0; /* We perform the filtering for the '--contains' option... */ @@ -2166,19 +2222,28 @@ void ref_array_clear(struct ref_array *array) used_atom_cnt = 0; if (ref_to_worktree_map.worktrees) { - hashmap_free(&(ref_to_worktree_map.map), 1); + hashmap_free_entries(&(ref_to_worktree_map.map), + struct ref_to_worktree_entry, ent); free_worktrees(ref_to_worktree_map.worktrees); ref_to_worktree_map.worktrees = NULL; } } -static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata) +#define EXCLUDE_REACHED 0 +#define INCLUDE_REACHED 1 +static void reach_filter(struct ref_array *array, + struct commit_list *check_reachable, + int include_reached) { struct rev_info revs; int i, old_nr; - struct ref_filter *filter = ref_cbdata->filter; - struct ref_array *array = ref_cbdata->array; - struct commit **to_clear = xcalloc(sizeof(struct commit *), array->nr); + struct commit **to_clear; + struct commit_list *cr; + + if (!check_reachable) + return; + + to_clear = xcalloc(sizeof(struct commit *), array->nr); repo_init_revisions(the_repository, &revs, NULL); @@ -2188,8 +2253,11 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata) to_clear[i] = item->commit; } - filter->merge_commit->object.flags |= UNINTERESTING; - add_pending_object(&revs, &filter->merge_commit->object, ""); + for (cr = check_reachable; cr; cr = cr->next) { + struct commit *merge_commit = cr->item; + merge_commit->object.flags |= UNINTERESTING; + add_pending_object(&revs, &merge_commit->object, ""); + } revs.limited = 1; if (prepare_revision_walk(&revs)) @@ -2204,14 +2272,19 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata) int is_merged = !!(commit->object.flags & UNINTERESTING); - if (is_merged == (filter->merge == REF_FILTER_MERGED_INCLUDE)) + if (is_merged == include_reached) array->items[array->nr++] = array->items[i]; else free_array_item(item); } clear_commit_marks_many(old_nr, to_clear, ALL_REV_FLAGS); - clear_commit_marks(filter->merge_commit, ALL_REV_FLAGS); + + while (check_reachable) { + struct commit *merge_commit = pop_commit(&check_reachable); + clear_commit_marks(merge_commit, ALL_REV_FLAGS); + } + free(to_clear); } @@ -2263,8 +2336,8 @@ int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int clear_contains_cache(&ref_cbdata.no_contains_cache); /* Filters that need revision walking */ - if (filter->merge_commit) - do_merge_filter(&ref_cbdata); + reach_filter(array, filter->reachable_from, INCLUDE_REACHED); + reach_filter(array, filter->unreachable_from, EXCLUDE_REACHED); return ret; } @@ -2291,7 +2364,7 @@ static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, stru if (va->value < vb->value) cmp = -1; else if (va->value == vb->value) - cmp = cmp_fn(a->refname, b->refname); + cmp = 0; else cmp = 1; } @@ -2310,7 +2383,16 @@ static int compare_refs(const void *a_, const void *b_, void *ref_sorting) if (cmp) return cmp; } - return 0; + s = ref_sorting; + return s && s->ignore_case ? + strcasecmp(a->refname, b->refname) : + strcmp(a->refname, b->refname); +} + +void ref_sorting_icase_all(struct ref_sorting *sorting, int flag) +{ + for (; sorting; sorting = sorting->next) + sorting->ignore_case = !!flag; } void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array) @@ -2473,31 +2555,22 @@ int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset) { struct ref_filter *rf = opt->value; struct object_id oid; - int no_merged = starts_with(opt->long_name, "no"); + struct commit *merge_commit; BUG_ON_OPT_NEG(unset); - if (rf->merge) { - if (no_merged) { - return error(_("option `%s' is incompatible with --merged"), - opt->long_name); - } else { - return error(_("option `%s' is incompatible with --no-merged"), - opt->long_name); - } - } - - rf->merge = no_merged - ? REF_FILTER_MERGED_OMIT - : REF_FILTER_MERGED_INCLUDE; - if (get_oid(arg, &oid)) die(_("malformed object name %s"), arg); - rf->merge_commit = lookup_commit_reference_gently(the_repository, - &oid, 0); - if (!rf->merge_commit) + merge_commit = lookup_commit_reference_gently(the_repository, &oid, 0); + + if (!merge_commit) return error(_("option `%s' must point to a commit"), opt->long_name); + if (starts_with(opt->long_name, "no")) + commit_list_insert(merge_commit, &rf->unreachable_from); + else + commit_list_insert(merge_commit, &rf->reachable_from); + return 0; } diff --git a/third_party/git/ref-filter.h b/third_party/git/ref-filter.h index f1dcff4c6e..feaef4a8fd 100644 --- a/third_party/git/ref-filter.h +++ b/third_party/git/ref-filter.h @@ -1,7 +1,7 @@ #ifndef REF_FILTER_H #define REF_FILTER_H -#include "sha1-array.h" +#include "oid-array.h" #include "refs.h" #include "commit.h" #include "parse-options.h" @@ -54,13 +54,8 @@ struct ref_filter { struct oid_array points_at; struct commit_list *with_commit; struct commit_list *no_commit; - - enum { - REF_FILTER_MERGED_NONE = 0, - REF_FILTER_MERGED_INCLUDE, - REF_FILTER_MERGED_OMIT - } merge; - struct commit *merge_commit; + struct commit_list *reachable_from; + struct commit_list *unreachable_from; unsigned int with_commit_tag_algo : 1, match_as_path : 1, @@ -114,6 +109,8 @@ void ref_array_clear(struct ref_array *array); int verify_ref_format(struct ref_format *format); /* Sort the given ref_array as per the ref_sorting provided */ void ref_array_sort(struct ref_sorting *sort, struct ref_array *array); +/* Set the ignore_case flag for all elements of a sorting list */ +void ref_sorting_icase_all(struct ref_sorting *sorting, int flag); /* Based on the given format and quote_style, fill the strbuf */ int format_ref_array_item(struct ref_array_item *info, const struct ref_format *format, diff --git a/third_party/git/refs.c b/third_party/git/refs.c index cd297ee4bd..fa01153151 100644 --- a/third_party/git/refs.c +++ b/third_party/git/refs.c @@ -9,13 +9,15 @@ #include "iterator.h" #include "refs.h" #include "refs/refs-internal.h" +#include "run-command.h" #include "object-store.h" #include "object.h" #include "tag.h" #include "submodule.h" #include "worktree.h" -#include "argv-array.h" +#include "strvec.h" #include "repository.h" +#include "sigchain.h" /* * List of all available backends @@ -311,7 +313,7 @@ int read_ref(const char *refname, struct object_id *oid) return read_ref_full(refname, RESOLVE_REF_READING, oid, NULL); } -static int refs_ref_exists(struct ref_store *refs, const char *refname) +int refs_ref_exists(struct ref_store *refs, const char *refname) { return !!refs_resolve_ref_unsafe(refs, refname, RESOLVE_REF_READING, NULL, NULL); } @@ -321,50 +323,6 @@ int ref_exists(const char *refname) return refs_ref_exists(get_main_ref_store(the_repository), refname); } -static int match_ref_pattern(const char *refname, - const struct string_list_item *item) -{ - int matched = 0; - if (item->util == NULL) { - if (!wildmatch(item->string, refname, 0)) - matched = 1; - } else { - const char *rest; - if (skip_prefix(refname, item->string, &rest) && - (!*rest || *rest == '/')) - matched = 1; - } - return matched; -} - -int ref_filter_match(const char *refname, - const struct string_list *include_patterns, - const struct string_list *exclude_patterns) -{ - struct string_list_item *item; - - if (exclude_patterns && exclude_patterns->nr) { - for_each_string_list_item(item, exclude_patterns) { - if (match_ref_pattern(refname, item)) - return 0; - } - } - - if (include_patterns && include_patterns->nr) { - int found = 0; - for_each_string_list_item(item, include_patterns) { - if (match_ref_pattern(refname, item)) { - found = 1; - break; - } - } - - if (!found) - return 0; - } - return 1; -} - static int filter_refs(const char *refname, const struct object_id *oid, int flags, void *data) { @@ -383,7 +341,7 @@ enum peel_status peel_object(const struct object_id *name, struct object_id *oid if (o->type == OBJ_NONE) { int type = oid_object_info(the_repository, name, NULL); - if (type < 0 || !object_as_type(the_repository, o, type, 0)) + if (type < 0 || !object_as_type(o, type, 0)) return PEEL_INVALID; } @@ -595,13 +553,43 @@ int refname_match(const char *abbrev_name, const char *full_name) * Given a 'prefix' expand it by the rules in 'ref_rev_parse_rules' and add * the results to 'prefixes' */ -void expand_ref_prefix(struct argv_array *prefixes, const char *prefix) +void expand_ref_prefix(struct strvec *prefixes, const char *prefix) { const char **p; int len = strlen(prefix); for (p = ref_rev_parse_rules; *p; p++) - argv_array_pushf(prefixes, *p, len, prefix); + strvec_pushf(prefixes, *p, len, prefix); +} + +char *repo_default_branch_name(struct repository *r) +{ + const char *config_key = "init.defaultbranch"; + const char *config_display_key = "init.defaultBranch"; + char *ret = NULL, *full_ref; + + if (repo_config_get_string(r, config_key, &ret) < 0) + die(_("could not retrieve `%s`"), config_display_key); + + if (!ret) + ret = xstrdup("master"); + + full_ref = xstrfmt("refs/heads/%s", ret); + if (check_refname_format(full_ref, 0)) + die(_("invalid branch name: %s = %s"), config_display_key, ret); + free(full_ref); + + return ret; +} + +const char *git_default_branch_name(void) +{ + static char *ret; + + if (!ret) + ret = repo_default_branch_name(the_repository); + + return ret; } /* @@ -610,10 +598,14 @@ void expand_ref_prefix(struct argv_array *prefixes, const char *prefix) * to name a branch. */ static char *substitute_branch_name(struct repository *r, - const char **string, int *len) + const char **string, int *len, + int nonfatal_dangling_mark) { struct strbuf buf = STRBUF_INIT; - int ret = repo_interpret_branch_name(r, *string, *len, &buf, 0); + struct interpret_branch_name_options options = { + .nonfatal_dangling_mark = nonfatal_dangling_mark + }; + int ret = repo_interpret_branch_name(r, *string, *len, &buf, &options); if (ret == *len) { size_t size; @@ -626,19 +618,15 @@ static char *substitute_branch_name(struct repository *r, } int repo_dwim_ref(struct repository *r, const char *str, int len, - struct object_id *oid, char **ref) + struct object_id *oid, char **ref, int nonfatal_dangling_mark) { - char *last_branch = substitute_branch_name(r, &str, &len); + char *last_branch = substitute_branch_name(r, &str, &len, + nonfatal_dangling_mark); int refs_found = expand_ref(r, str, len, oid, ref); free(last_branch); return refs_found; } -int dwim_ref(const char *str, int len, struct object_id *oid, char **ref) -{ - return repo_dwim_ref(the_repository, str, len, oid, ref); -} - int expand_ref(struct repository *repo, const char *str, int len, struct object_id *oid, char **ref) { @@ -677,7 +665,7 @@ int repo_dwim_log(struct repository *r, const char *str, int len, struct object_id *oid, char **log) { struct ref_store *refs = get_main_ref_store(r); - char *last_branch = substitute_branch_name(r, &str, &len); + char *last_branch = substitute_branch_name(r, &str, &len, 0); const char **p; int logs_found = 0; struct strbuf path = STRBUF_INIT; @@ -720,10 +708,9 @@ int dwim_log(const char *str, int len, struct object_id *oid, char **log) static int is_per_worktree_ref(const char *refname) { - return !strcmp(refname, "HEAD") || - starts_with(refname, "refs/worktree/") || - starts_with(refname, "refs/bisect/") || - starts_with(refname, "refs/rewritten/"); + return starts_with(refname, "refs/worktree/") || + starts_with(refname, "refs/bisect/") || + starts_with(refname, "refs/rewritten/"); } static int is_pseudoref_syntax(const char *refname) @@ -783,102 +770,6 @@ long get_files_ref_lock_timeout_ms(void) return timeout_ms; } -static int write_pseudoref(const char *pseudoref, const struct object_id *oid, - const struct object_id *old_oid, struct strbuf *err) -{ - const char *filename; - int fd; - struct lock_file lock = LOCK_INIT; - struct strbuf buf = STRBUF_INIT; - int ret = -1; - - if (!oid) - return 0; - - strbuf_addf(&buf, "%s\n", oid_to_hex(oid)); - - filename = git_path("%s", pseudoref); - fd = hold_lock_file_for_update_timeout(&lock, filename, 0, - get_files_ref_lock_timeout_ms()); - if (fd < 0) { - strbuf_addf(err, _("could not open '%s' for writing: %s"), - filename, strerror(errno)); - goto done; - } - - if (old_oid) { - struct object_id actual_old_oid; - - if (read_ref(pseudoref, &actual_old_oid)) { - if (!is_null_oid(old_oid)) { - strbuf_addf(err, _("could not read ref '%s'"), - pseudoref); - rollback_lock_file(&lock); - goto done; - } - } else if (is_null_oid(old_oid)) { - strbuf_addf(err, _("ref '%s' already exists"), - pseudoref); - rollback_lock_file(&lock); - goto done; - } else if (!oideq(&actual_old_oid, old_oid)) { - strbuf_addf(err, _("unexpected object ID when writing '%s'"), - pseudoref); - rollback_lock_file(&lock); - goto done; - } - } - - if (write_in_full(fd, buf.buf, buf.len) < 0) { - strbuf_addf(err, _("could not write to '%s'"), filename); - rollback_lock_file(&lock); - goto done; - } - - commit_lock_file(&lock); - ret = 0; -done: - strbuf_release(&buf); - return ret; -} - -static int delete_pseudoref(const char *pseudoref, const struct object_id *old_oid) -{ - const char *filename; - - filename = git_path("%s", pseudoref); - - if (old_oid && !is_null_oid(old_oid)) { - struct lock_file lock = LOCK_INIT; - int fd; - struct object_id actual_old_oid; - - fd = hold_lock_file_for_update_timeout( - &lock, filename, 0, - get_files_ref_lock_timeout_ms()); - if (fd < 0) { - error_errno(_("could not open '%s' for writing"), - filename); - return -1; - } - if (read_ref(pseudoref, &actual_old_oid)) - die(_("could not read ref '%s'"), pseudoref); - if (!oideq(&actual_old_oid, old_oid)) { - error(_("unexpected object ID when deleting '%s'"), - pseudoref); - rollback_lock_file(&lock); - return -1; - } - - unlink(filename); - rollback_lock_file(&lock); - } else { - unlink(filename); - } - - return 0; -} - int refs_delete_ref(struct ref_store *refs, const char *msg, const char *refname, const struct object_id *old_oid, @@ -887,11 +778,6 @@ int refs_delete_ref(struct ref_store *refs, const char *msg, struct ref_transaction *transaction; struct strbuf err = STRBUF_INIT; - if (ref_type(refname) == REF_TYPE_PSEUDOREF) { - assert(refs == get_main_ref_store(the_repository)); - return delete_pseudoref(refname, old_oid); - } - transaction = ref_store_transaction_begin(refs, &err); if (!transaction || ref_transaction_delete(transaction, refname, old_oid, @@ -914,12 +800,11 @@ int delete_ref(const char *msg, const char *refname, old_oid, flags); } -void copy_reflog_msg(struct strbuf *sb, const char *msg) +static void copy_reflog_msg(struct strbuf *sb, const char *msg) { char c; int wasspace = 1; - strbuf_addch(sb, '\t'); while ((c = *msg++)) { if (wasspace && isspace(c)) continue; @@ -931,6 +816,15 @@ void copy_reflog_msg(struct strbuf *sb, const char *msg) strbuf_rtrim(sb); } +static char *normalize_reflog_message(const char *msg) +{ + struct strbuf sb = STRBUF_INIT; + + if (msg && *msg) + copy_reflog_msg(&sb, msg); + return strbuf_detach(&sb, NULL); +} + int should_autocreate_reflog(const char *refname) { switch (log_all_ref_updates) { @@ -1136,7 +1030,7 @@ struct ref_update *ref_transaction_add_update( oidcpy(&update->new_oid, new_oid); if (flags & REF_HAVE_OLD) oidcpy(&update->old_oid, old_oid); - update->msg = xstrdup_or_null(msg); + update->msg = normalize_reflog_message(msg); return update; } @@ -1214,18 +1108,13 @@ int refs_update_ref(struct ref_store *refs, const char *msg, struct strbuf err = STRBUF_INIT; int ret = 0; - if (ref_type(refname) == REF_TYPE_PSEUDOREF) { - assert(refs == get_main_ref_store(the_repository)); - ret = write_pseudoref(refname, new_oid, old_oid, &err); - } else { - t = ref_store_transaction_begin(refs, &err); - if (!t || - ref_transaction_update(t, refname, new_oid, old_oid, - flags, msg, &err) || - ref_transaction_commit(t, &err)) { - ret = 1; - ref_transaction_free(t); - } + t = ref_store_transaction_begin(refs, &err); + if (!t || + ref_transaction_update(t, refname, new_oid, old_oid, flags, msg, + &err) || + ref_transaction_commit(t, &err)) { + ret = 1; + ref_transaction_free(t); } if (ret) { const char *str = _("update_ref failed for ref '%s': %s"); @@ -1638,11 +1527,37 @@ int for_each_rawref(each_ref_fn fn, void *cb_data) return refs_for_each_rawref(get_main_ref_store(the_repository), fn, cb_data); } +static int refs_read_special_head(struct ref_store *ref_store, + const char *refname, struct object_id *oid, + struct strbuf *referent, unsigned int *type) +{ + struct strbuf full_path = STRBUF_INIT; + struct strbuf content = STRBUF_INIT; + int result = -1; + strbuf_addf(&full_path, "%s/%s", ref_store->gitdir, refname); + + if (strbuf_read_file(&content, full_path.buf, 0) < 0) + goto done; + + result = parse_loose_ref_contents(content.buf, oid, referent, type); + +done: + strbuf_release(&full_path); + strbuf_release(&content); + return result; +} + int refs_read_raw_ref(struct ref_store *ref_store, const char *refname, struct object_id *oid, struct strbuf *referent, unsigned int *type) { - return ref_store->be->read_raw_ref(ref_store, refname, oid, referent, type); + if (!strcmp(refname, "FETCH_HEAD") || !strcmp(refname, "MERGE_HEAD")) { + return refs_read_special_head(ref_store, refname, oid, referent, + type); + } + + return ref_store->be->read_raw_ref(ref_store, refname, oid, referent, + type); } /* This function needs to return a meaningful errno on failure */ @@ -1772,7 +1687,7 @@ int resolve_gitlink_ref(const char *submodule, const char *refname, struct ref_store_hash_entry { - struct hashmap_entry ent; /* must be the first member! */ + struct hashmap_entry ent; struct ref_store *refs; @@ -1781,11 +1696,16 @@ struct ref_store_hash_entry }; static int ref_store_hash_cmp(const void *unused_cmp_data, - const void *entry, const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *keydata) { - const struct ref_store_hash_entry *e1 = entry, *e2 = entry_or_key; - const char *name = keydata ? keydata : e2->name; + 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; return strcmp(e1->name, name); } @@ -1796,7 +1716,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, strhash(name)); + hashmap_entry_init(&entry->ent, strhash(name)); entry->refs = refs; return entry; } @@ -1815,12 +1735,15 @@ 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; - entry = hashmap_get_from_hash(map, strhash(name), name); + hash = strhash(name); + entry = hashmap_get_entry_from_hash(map, hash, name, + struct ref_store_hash_entry, ent); return entry ? entry->refs : NULL; } @@ -1844,14 +1767,15 @@ static struct ref_store *ref_store_init(const char *gitdir, struct ref_store *get_main_ref_store(struct repository *r) { - if (r->refs) - return r->refs; + if (r->refs_private) + return r->refs_private; if (!r->gitdir) BUG("attempting to get main_ref_store outside of repository"); - r->refs = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS); - return r->refs; + r->refs_private = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS); + r->refs_private = maybe_debug_wrap_ref_store(r->gitdir, r->refs_private); + return r->refs_private; } /* @@ -1863,10 +1787,13 @@ 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); - if (hashmap_put(map, alloc_ref_store_hash_entry(name, refs))) + entry = alloc_ref_store_hash_entry(name, refs); + if (hashmap_put(map, &entry->ent)) BUG("%s ref_store '%s' initialized twice", type, name); } @@ -1984,9 +1911,14 @@ int refs_create_symref(struct ref_store *refs, const char *refs_heads_master, const char *logmsg) { - return refs->be->create_symref(refs, ref_target, - refs_heads_master, - logmsg); + char *msg; + int retval; + + msg = normalize_reflog_message(logmsg); + retval = refs->be->create_symref(refs, ref_target, refs_heads_master, + msg); + free(msg); + return retval; } int create_symref(const char *ref_target, const char *refs_heads_master, @@ -2019,10 +1951,58 @@ int ref_update_reject_duplicates(struct string_list *refnames, return 0; } +static int run_transaction_hook(struct ref_transaction *transaction, + const char *state) +{ + struct child_process proc = CHILD_PROCESS_INIT; + struct strbuf buf = STRBUF_INIT; + const char *hook; + int ret = 0, i; + + hook = find_hook("reference-transaction"); + if (!hook) + return ret; + + strvec_pushl(&proc.args, hook, state, NULL); + proc.in = -1; + proc.stdout_to_stderr = 1; + proc.trace2_hook_name = "reference-transaction"; + + ret = start_command(&proc); + if (ret) + return ret; + + sigchain_push(SIGPIPE, SIG_IGN); + + for (i = 0; i < transaction->nr; i++) { + struct ref_update *update = transaction->updates[i]; + + strbuf_reset(&buf); + strbuf_addf(&buf, "%s %s %s\n", + oid_to_hex(&update->old_oid), + oid_to_hex(&update->new_oid), + update->refname); + + if (write_in_full(proc.in, buf.buf, buf.len) < 0) { + if (errno != EPIPE) + ret = -1; + break; + } + } + + close(proc.in); + sigchain_pop(SIGPIPE); + strbuf_release(&buf); + + ret |= finish_command(&proc); + return ret; +} + int ref_transaction_prepare(struct ref_transaction *transaction, struct strbuf *err) { struct ref_store *refs = transaction->ref_store; + int ret; switch (transaction->state) { case REF_TRANSACTION_OPEN: @@ -2045,7 +2025,17 @@ int ref_transaction_prepare(struct ref_transaction *transaction, return -1; } - return refs->be->transaction_prepare(refs, transaction, err); + ret = refs->be->transaction_prepare(refs, transaction, err); + if (ret) + return ret; + + ret = run_transaction_hook(transaction, "prepared"); + if (ret) { + ref_transaction_abort(transaction, err); + die(_("ref updates aborted by hook")); + } + + return 0; } int ref_transaction_abort(struct ref_transaction *transaction, @@ -2069,6 +2059,8 @@ int ref_transaction_abort(struct ref_transaction *transaction, break; } + run_transaction_hook(transaction, "aborted"); + ref_transaction_free(transaction); return ret; } @@ -2097,7 +2089,10 @@ int ref_transaction_commit(struct ref_transaction *transaction, break; } - return refs->be->transaction_finish(refs, transaction, err); + ret = refs->be->transaction_finish(refs, transaction, err); + if (!ret) + run_transaction_hook(transaction, "committed"); + return ret; } int refs_verify_refname_available(struct ref_store *refs, @@ -2301,10 +2296,16 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction, return refs->be->initial_transaction_commit(refs, transaction, err); } -int refs_delete_refs(struct ref_store *refs, const char *msg, +int refs_delete_refs(struct ref_store *refs, const char *logmsg, struct string_list *refnames, unsigned int flags) { - return refs->be->delete_refs(refs, msg, refnames, flags); + char *msg; + int retval; + + msg = normalize_reflog_message(logmsg); + retval = refs->be->delete_refs(refs, msg, refnames, flags); + free(msg); + return retval; } int delete_refs(const char *msg, struct string_list *refnames, @@ -2316,7 +2317,13 @@ int delete_refs(const char *msg, struct string_list *refnames, int refs_rename_ref(struct ref_store *refs, const char *oldref, const char *newref, const char *logmsg) { - return refs->be->rename_ref(refs, oldref, newref, logmsg); + char *msg; + int retval; + + msg = normalize_reflog_message(logmsg); + retval = refs->be->rename_ref(refs, oldref, newref, msg); + free(msg); + return retval; } int rename_ref(const char *oldref, const char *newref, const char *logmsg) @@ -2327,7 +2334,13 @@ int rename_ref(const char *oldref, const char *newref, const char *logmsg) int refs_copy_existing_ref(struct ref_store *refs, const char *oldref, const char *newref, const char *logmsg) { - return refs->be->copy_ref(refs, oldref, newref, logmsg); + char *msg; + int retval; + + msg = normalize_reflog_message(logmsg); + retval = refs->be->copy_ref(refs, oldref, newref, msg); + free(msg); + return retval; } int copy_existing_ref(const char *oldref, const char *newref, const char *logmsg) diff --git a/third_party/git/refs.h b/third_party/git/refs.h index 730d05ad91..6695518156 100644 --- a/third_party/git/refs.h +++ b/third_party/git/refs.h @@ -1,6 +1,8 @@ #ifndef REFS_H #define REFS_H +#include "cache.h" + struct object_id; struct ref_store; struct repository; @@ -105,6 +107,8 @@ int refs_verify_refname_available(struct ref_store *refs, const struct string_list *skip, struct strbuf *err); +int refs_ref_exists(struct ref_store *refs, const char *refname); + int ref_exists(const char *refname); int should_autocreate_reflog(const char *refname); @@ -145,16 +149,31 @@ int refname_match(const char *abbrev_name, const char *full_name); * Given a 'prefix' expand it by the rules in 'ref_rev_parse_rules' and add * the results to 'prefixes' */ -struct argv_array; -void expand_ref_prefix(struct argv_array *prefixes, const char *prefix); +struct strvec; +void expand_ref_prefix(struct strvec *prefixes, const char *prefix); int expand_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref); -int repo_dwim_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref); +int repo_dwim_ref(struct repository *r, const char *str, int len, + struct object_id *oid, char **ref, int nonfatal_dangling_mark); int repo_dwim_log(struct repository *r, const char *str, int len, struct object_id *oid, char **ref); -int dwim_ref(const char *str, int len, struct object_id *oid, char **ref); +static inline int dwim_ref(const char *str, int len, struct object_id *oid, + char **ref, int nonfatal_dangling_mark) +{ + return repo_dwim_ref(the_repository, str, len, oid, ref, + nonfatal_dangling_mark); +} int dwim_log(const char *str, int len, struct object_id *oid, char **ref); /* + * Retrieves the default branch name for newly-initialized repositories. + * + * The return value of `repo_default_branch_name()` is an allocated string. The + * return value of `git_default_branch_name()` is a singleton. + */ +const char *git_default_branch_name(void); +char *repo_default_branch_name(struct repository *r); + +/* * A ref_transaction represents a collection of reference updates that * should succeed or fail together. * @@ -310,19 +329,35 @@ 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); @@ -345,18 +380,6 @@ int for_each_rawref(each_ref_fn fn, void *cb_data); void normalize_glob_ref(struct string_list_item *item, const char *prefix, const char *pattern); -/* - * Returns 0 if refname matches any of the exclude_patterns, or if it doesn't - * match any of the include_patterns. Returns 1 otherwise. - * - * If pattern list is NULL or empty, matching against that list is skipped. - * This has the effect of matching everything by default, unless the user - * specifies rules otherwise. - */ -int ref_filter_match(const char *refname, - const struct string_list *include_patterns, - const struct string_list *exclude_patterns); - static inline const char *has_glob_specials(const char *pattern) { return strpbrk(pattern, "?*["); @@ -428,19 +451,35 @@ int delete_refs(const char *msg, struct string_list *refnames, int refs_delete_reflog(struct ref_store *refs, const char *refname); int delete_reflog(const char *refname); -/* iterate over reflog entries */ +/* + * Callback to process a reflog entry found by the iteration functions (see + * below) + */ typedef int each_reflog_ent_fn( struct object_id *old_oid, struct object_id *new_oid, const char *committer, timestamp_t timestamp, int tz, const char *msg, void *cb_data); +/* Iterate over reflog entries in the log for `refname`. */ + +/* oldest entry first */ int refs_for_each_reflog_ent(struct ref_store *refs, const char *refname, each_reflog_ent_fn fn, void *cb_data); + +/* youngest entry first */ int refs_for_each_reflog_ent_reverse(struct ref_store *refs, const char *refname, each_reflog_ent_fn fn, void *cb_data); + +/* + * Iterate over reflog entries in the log for `refname` in the main ref store. + */ + +/* oldest entry first */ int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_data); + +/* youngest entry first */ int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void *cb_data); /* @@ -791,6 +830,41 @@ 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/debug.c b/third_party/git/refs/debug.c new file mode 100644 index 0000000000..922e64fa6a --- /dev/null +++ b/third_party/git/refs/debug.c @@ -0,0 +1,398 @@ + +#include "refs-internal.h" +#include "trace.h" + +static struct trace_key trace_refs = TRACE_KEY_INIT(REFS); + +struct debug_ref_store { + struct ref_store base; + struct ref_store *refs; +}; + +extern struct ref_storage_be refs_be_debug; + +struct ref_store *maybe_debug_wrap_ref_store(const char *gitdir, struct ref_store *store) +{ + struct debug_ref_store *res; + struct ref_storage_be *be_copy; + + if (!trace_want(&trace_refs)) { + return store; + } + res = xmalloc(sizeof(struct debug_ref_store)); + be_copy = xmalloc(sizeof(*be_copy)); + *be_copy = refs_be_debug; + /* we never deallocate backends, so safe to copy the pointer. */ + be_copy->name = store->be->name; + trace_printf_key(&trace_refs, "ref_store for %s\n", gitdir); + res->refs = store; + base_ref_store_init((struct ref_store *)res, be_copy); + return (struct ref_store *)res; +} + +static int debug_init_db(struct ref_store *refs, struct strbuf *err) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)refs; + int res = drefs->refs->be->init_db(drefs->refs, err); + trace_printf_key(&trace_refs, "init_db: %d\n", res); + return res; +} + +static int debug_transaction_prepare(struct ref_store *refs, + struct ref_transaction *transaction, + struct strbuf *err) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)refs; + int res; + transaction->ref_store = drefs->refs; + res = drefs->refs->be->transaction_prepare(drefs->refs, transaction, + err); + trace_printf_key(&trace_refs, "transaction_prepare: %d\n", res); + return res; +} + +static void print_update(int i, const char *refname, + const struct object_id *old_oid, + const struct object_id *new_oid, unsigned int flags, + unsigned int type, const char *msg) +{ + char o[GIT_MAX_HEXSZ + 1] = "null"; + char n[GIT_MAX_HEXSZ + 1] = "null"; + if (old_oid) + oid_to_hex_r(o, old_oid); + if (new_oid) + oid_to_hex_r(n, new_oid); + + type &= 0xf; /* see refs.h REF_* */ + flags &= REF_HAVE_NEW | REF_HAVE_OLD | REF_NO_DEREF | + REF_FORCE_CREATE_REFLOG; + trace_printf_key(&trace_refs, "%d: %s %s -> %s (F=0x%x, T=0x%x) \"%s\"\n", i, refname, + o, n, flags, type, msg); +} + +static void print_transaction(struct ref_transaction *transaction) +{ + int i; + trace_printf_key(&trace_refs, "transaction {\n"); + for (i = 0; i < transaction->nr; i++) { + struct ref_update *u = transaction->updates[i]; + print_update(i, u->refname, &u->old_oid, &u->new_oid, u->flags, + u->type, u->msg); + } + trace_printf_key(&trace_refs, "}\n"); +} + +static int debug_transaction_finish(struct ref_store *refs, + struct ref_transaction *transaction, + struct strbuf *err) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)refs; + int res; + transaction->ref_store = drefs->refs; + res = drefs->refs->be->transaction_finish(drefs->refs, transaction, + err); + print_transaction(transaction); + trace_printf_key(&trace_refs, "finish: %d\n", res); + return res; +} + +static int debug_transaction_abort(struct ref_store *refs, + struct ref_transaction *transaction, + struct strbuf *err) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)refs; + int res; + transaction->ref_store = drefs->refs; + res = drefs->refs->be->transaction_abort(drefs->refs, transaction, err); + return res; +} + +static int debug_initial_transaction_commit(struct ref_store *refs, + struct ref_transaction *transaction, + struct strbuf *err) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)refs; + int res; + transaction->ref_store = drefs->refs; + res = drefs->refs->be->initial_transaction_commit(drefs->refs, + transaction, err); + return res; +} + +static int debug_pack_refs(struct ref_store *ref_store, unsigned int flags) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + int res = drefs->refs->be->pack_refs(drefs->refs, flags); + trace_printf_key(&trace_refs, "pack_refs: %d\n", res); + return res; +} + +static int debug_create_symref(struct ref_store *ref_store, + const char *ref_name, const char *target, + const char *logmsg) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + int res = drefs->refs->be->create_symref(drefs->refs, ref_name, target, + logmsg); + trace_printf_key(&trace_refs, "create_symref: %s -> %s \"%s\": %d\n", ref_name, + target, logmsg, res); + return res; +} + +static int debug_delete_refs(struct ref_store *ref_store, const char *msg, + struct string_list *refnames, unsigned int flags) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + int res = + drefs->refs->be->delete_refs(drefs->refs, msg, refnames, flags); + int i; + trace_printf_key(&trace_refs, "delete_refs {\n"); + for (i = 0; i < refnames->nr; i++) + trace_printf_key(&trace_refs, "%s\n", refnames->items[i].string); + trace_printf_key(&trace_refs, "}: %d\n", res); + return res; +} + +static int debug_rename_ref(struct ref_store *ref_store, const char *oldref, + const char *newref, const char *logmsg) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + int res = drefs->refs->be->rename_ref(drefs->refs, oldref, newref, + logmsg); + trace_printf_key(&trace_refs, "rename_ref: %s -> %s \"%s\": %d\n", oldref, newref, + logmsg, res); + return res; +} + +static int debug_copy_ref(struct ref_store *ref_store, const char *oldref, + const char *newref, const char *logmsg) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + int res = + drefs->refs->be->copy_ref(drefs->refs, oldref, newref, logmsg); + trace_printf_key(&trace_refs, "copy_ref: %s -> %s \"%s\": %d\n", oldref, newref, + logmsg, res); + return res; +} + +struct debug_ref_iterator { + struct ref_iterator base; + struct ref_iterator *iter; +}; + +static int debug_ref_iterator_advance(struct ref_iterator *ref_iterator) +{ + struct debug_ref_iterator *diter = + (struct debug_ref_iterator *)ref_iterator; + int res = diter->iter->vtable->advance(diter->iter); + if (res) + trace_printf_key(&trace_refs, "iterator_advance: (%d)\n", res); + else + trace_printf_key(&trace_refs, "iterator_advance: %s (0)\n", + diter->iter->refname); + + diter->base.ordered = diter->iter->ordered; + diter->base.refname = diter->iter->refname; + diter->base.oid = diter->iter->oid; + diter->base.flags = diter->iter->flags; + return res; +} + +static int debug_ref_iterator_peel(struct ref_iterator *ref_iterator, + struct object_id *peeled) +{ + struct debug_ref_iterator *diter = + (struct debug_ref_iterator *)ref_iterator; + int res = diter->iter->vtable->peel(diter->iter, peeled); + trace_printf_key(&trace_refs, "iterator_peel: %s: %d\n", diter->iter->refname, res); + return res; +} + +static int debug_ref_iterator_abort(struct ref_iterator *ref_iterator) +{ + struct debug_ref_iterator *diter = + (struct debug_ref_iterator *)ref_iterator; + int res = diter->iter->vtable->abort(diter->iter); + trace_printf_key(&trace_refs, "iterator_abort: %d\n", res); + return res; +} + +static struct ref_iterator_vtable debug_ref_iterator_vtable = { + debug_ref_iterator_advance, debug_ref_iterator_peel, + debug_ref_iterator_abort +}; + +static struct ref_iterator * +debug_ref_iterator_begin(struct ref_store *ref_store, const char *prefix, + unsigned int flags) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + struct ref_iterator *res = + drefs->refs->be->iterator_begin(drefs->refs, prefix, flags); + struct debug_ref_iterator *diter = xcalloc(1, sizeof(*diter)); + base_ref_iterator_init(&diter->base, &debug_ref_iterator_vtable, 1); + diter->iter = res; + trace_printf_key(&trace_refs, "ref_iterator_begin: %s (0x%x)\n", prefix, flags); + return &diter->base; +} + +static int debug_read_raw_ref(struct ref_store *ref_store, const char *refname, + struct object_id *oid, struct strbuf *referent, + unsigned int *type) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + int res = 0; + + oidcpy(oid, &null_oid); + res = drefs->refs->be->read_raw_ref(drefs->refs, refname, oid, referent, + type); + + if (res == 0) { + trace_printf_key(&trace_refs, "read_raw_ref: %s: %s (=> %s) type %x: %d\n", + refname, oid_to_hex(oid), referent->buf, *type, res); + } else { + trace_printf_key(&trace_refs, "read_raw_ref: %s: %d\n", refname, res); + } + return res; +} + +static struct ref_iterator * +debug_reflog_iterator_begin(struct ref_store *ref_store) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + struct ref_iterator *res = + drefs->refs->be->reflog_iterator_begin(drefs->refs); + trace_printf_key(&trace_refs, "for_each_reflog_iterator_begin\n"); + return res; +} + +struct debug_reflog { + const char *refname; + each_reflog_ent_fn *fn; + void *cb_data; +}; + +static int debug_print_reflog_ent(struct object_id *old_oid, + struct object_id *new_oid, + const char *committer, timestamp_t timestamp, + int tz, const char *msg, void *cb_data) +{ + struct debug_reflog *dbg = (struct debug_reflog *)cb_data; + int ret; + char o[GIT_MAX_HEXSZ + 1] = "null"; + char n[GIT_MAX_HEXSZ + 1] = "null"; + if (old_oid) + oid_to_hex_r(o, old_oid); + if (new_oid) + oid_to_hex_r(n, new_oid); + + ret = dbg->fn(old_oid, new_oid, committer, timestamp, tz, msg, + dbg->cb_data); + trace_printf_key(&trace_refs, "reflog_ent %s (ret %d): %s -> %s, %s %ld \"%s\"\n", + dbg->refname, ret, o, n, committer, (long int)timestamp, msg); + return ret; +} + +static int debug_for_each_reflog_ent(struct ref_store *ref_store, + const char *refname, each_reflog_ent_fn fn, + void *cb_data) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + struct debug_reflog dbg = { + .refname = refname, + .fn = fn, + .cb_data = cb_data, + }; + + int res = drefs->refs->be->for_each_reflog_ent( + drefs->refs, refname, &debug_print_reflog_ent, &dbg); + trace_printf_key(&trace_refs, "for_each_reflog: %s: %d\n", refname, res); + return res; +} + +static int debug_for_each_reflog_ent_reverse(struct ref_store *ref_store, + const char *refname, + each_reflog_ent_fn fn, + void *cb_data) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + struct debug_reflog dbg = { + .refname = refname, + .fn = fn, + .cb_data = cb_data, + }; + int res = drefs->refs->be->for_each_reflog_ent_reverse( + drefs->refs, refname, &debug_print_reflog_ent, &dbg); + trace_printf_key(&trace_refs, "for_each_reflog_reverse: %s: %d\n", refname, res); + return res; +} + +static int debug_reflog_exists(struct ref_store *ref_store, const char *refname) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + int res = drefs->refs->be->reflog_exists(drefs->refs, refname); + trace_printf_key(&trace_refs, "reflog_exists: %s: %d\n", refname, res); + return res; +} + +static int debug_create_reflog(struct ref_store *ref_store, const char *refname, + int force_create, struct strbuf *err) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + int res = drefs->refs->be->create_reflog(drefs->refs, refname, + force_create, err); + trace_printf_key(&trace_refs, "create_reflog: %s: %d\n", refname, res); + return res; +} + +static int debug_delete_reflog(struct ref_store *ref_store, const char *refname) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + int res = drefs->refs->be->delete_reflog(drefs->refs, refname); + trace_printf_key(&trace_refs, "delete_reflog: %s: %d\n", refname, res); + return res; +} + +static int debug_reflog_expire(struct ref_store *ref_store, const char *refname, + const struct object_id *oid, unsigned int flags, + reflog_expiry_prepare_fn prepare_fn, + reflog_expiry_should_prune_fn should_prune_fn, + reflog_expiry_cleanup_fn cleanup_fn, + void *policy_cb_data) +{ + struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; + int res = drefs->refs->be->reflog_expire(drefs->refs, refname, oid, + flags, prepare_fn, + should_prune_fn, cleanup_fn, + policy_cb_data); + trace_printf_key(&trace_refs, "reflog_expire: %s: %d\n", refname, res); + return res; +} + +struct ref_storage_be refs_be_debug = { + NULL, + "debug", + NULL, + debug_init_db, + debug_transaction_prepare, + debug_transaction_finish, + debug_transaction_abort, + debug_initial_transaction_commit, + + debug_pack_refs, + debug_create_symref, + debug_delete_refs, + debug_rename_ref, + debug_copy_ref, + + debug_ref_iterator_begin, + debug_read_raw_ref, + + debug_reflog_iterator_begin, + debug_for_each_reflog_ent, + debug_for_each_reflog_ent_reverse, + debug_reflog_exists, + debug_create_reflog, + debug_delete_reflog, + debug_reflog_expire, +}; diff --git a/third_party/git/refs/files-backend.c b/third_party/git/refs/files-backend.c index d60767ab73..04e85e7002 100644 --- a/third_party/git/refs/files-backend.c +++ b/third_party/git/refs/files-backend.c @@ -39,13 +39,6 @@ #define REF_NEEDS_COMMIT (1 << 6) /* - * Used as a flag in ref_update::flags when we want to log a ref - * update but not actually perform it. This is used when a symbolic - * ref update is split up. - */ -#define REF_LOG_ONLY (1 << 7) - -/* * Used as a flag in ref_update::flags when the ref_update was via an * update to HEAD. */ @@ -67,7 +60,6 @@ struct files_ref_store { struct ref_store base; unsigned int store_flags; - char *gitdir; char *gitcommondir; struct ref_cache *loose; @@ -94,18 +86,17 @@ static struct ref_store *files_ref_store_create(const char *gitdir, struct ref_store *ref_store = (struct ref_store *)refs; struct strbuf sb = STRBUF_INIT; + ref_store->gitdir = xstrdup(gitdir); base_ref_store_init(ref_store, &refs_be_files); refs->store_flags = flags; - refs->gitdir = xstrdup(gitdir); get_common_dir_noenv(&sb, gitdir); refs->gitcommondir = strbuf_detach(&sb, NULL); strbuf_addf(&sb, "%s/packed-refs", refs->gitcommondir); refs->packed_ref_store = packed_ref_store_create(sb.buf, flags); strbuf_release(&sb); - chdir_notify_reparent("files-backend $GIT_DIR", - &refs->gitdir); + chdir_notify_reparent("files-backend $GIT_DIR", &refs->base.gitdir); chdir_notify_reparent("files-backend $GIT_COMMONDIR", &refs->gitcommondir); @@ -176,7 +167,7 @@ static void files_reflog_path(struct files_ref_store *refs, switch (ref_type(refname)) { case REF_TYPE_PER_WORKTREE: case REF_TYPE_PSEUDOREF: - strbuf_addf(sb, "%s/logs/%s", refs->gitdir, refname); + strbuf_addf(sb, "%s/logs/%s", refs->base.gitdir, refname); break; case REF_TYPE_OTHER_PSEUDOREF: case REF_TYPE_MAIN_PSEUDOREF: @@ -198,7 +189,7 @@ static void files_ref_path(struct files_ref_store *refs, switch (ref_type(refname)) { case REF_TYPE_PER_WORKTREE: case REF_TYPE_PSEUDOREF: - strbuf_addf(sb, "%s/%s", refs->gitdir, refname); + strbuf_addf(sb, "%s/%s", refs->base.gitdir, refname); break; case REF_TYPE_MAIN_PSEUDOREF: if (!skip_prefix(refname, "main-worktree/", &refname)) @@ -360,7 +351,6 @@ static int files_read_raw_ref(struct ref_store *ref_store, struct strbuf sb_path = STRBUF_INIT; const char *path; const char *buf; - const char *p; struct stat st; int fd; int ret = -1; @@ -465,37 +455,41 @@ stat_ref: close(fd); strbuf_rtrim(&sb_contents); buf = sb_contents.buf; - if (starts_with(buf, "ref:")) { - buf += 4; + + ret = parse_loose_ref_contents(buf, oid, referent, type); + +out: + save_errno = errno; + strbuf_release(&sb_path); + strbuf_release(&sb_contents); + errno = save_errno; + return ret; +} + +int parse_loose_ref_contents(const char *buf, struct object_id *oid, + struct strbuf *referent, unsigned int *type) +{ + const char *p; + if (skip_prefix(buf, "ref:", &buf)) { while (isspace(*buf)) buf++; strbuf_reset(referent); strbuf_addstr(referent, buf); *type |= REF_ISSYMREF; - ret = 0; - goto out; + return 0; } /* - * Please note that FETCH_HEAD has additional - * data after the sha. + * FETCH_HEAD has additional data after the sha. */ if (parse_oid_hex(buf, oid, &p) || (*p != '\0' && !isspace(*p))) { *type |= REF_ISBROKEN; errno = EINVAL; - goto out; + return -1; } - - ret = 0; - -out: - save_errno = errno; - strbuf_release(&sb_path); - strbuf_release(&sb_contents); - errno = save_errno; - return ret; + return 0; } static void unlock_ref(struct ref_lock *lock) @@ -1327,7 +1321,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 oid, orig_oid; + struct object_id orig_oid; int flag = 0, logmoved = 0; struct ref_lock *lock; struct stat loginfo; @@ -1395,7 +1389,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, - &oid, NULL) && + NULL, NULL) && refs_delete_ref(&refs->base, NULL, newrefname, NULL, REF_NO_DEREF)) { if (errno == EISDIR) { @@ -1629,8 +1623,10 @@ static int log_ref_write_fd(int fd, const struct object_id *old_oid, int ret = 0; strbuf_addf(&sb, "%s %s %s", oid_to_hex(old_oid), oid_to_hex(new_oid), committer); - if (msg && *msg) - copy_reflog_msg(&sb, msg); + if (msg && *msg) { + strbuf_addch(&sb, '\t'); + strbuf_addstr(&sb, msg); + } strbuf_addch(&sb, '\n'); if (write_in_full(fd, sb.buf, sb.len) < 0) ret = -1; @@ -2198,12 +2194,11 @@ static struct ref_iterator *files_reflog_iterator_begin(struct ref_store *ref_st files_downcast(ref_store, REF_STORE_READ, "reflog_iterator_begin"); - if (!strcmp(refs->gitdir, refs->gitcommondir)) { + if (!strcmp(refs->base.gitdir, refs->gitcommondir)) { return reflog_iterator_begin(ref_store, refs->gitcommondir); } else { return merge_ref_iterator_begin( - 0, - reflog_iterator_begin(ref_store, refs->gitdir), + 0, reflog_iterator_begin(ref_store, refs->base.gitdir), reflog_iterator_begin(ref_store, refs->gitcommondir), reflog_iterator_select, refs); } @@ -2566,16 +2561,18 @@ static void files_transaction_cleanup(struct files_ref_store *refs, } } - if (backend_data->packed_transaction && - ref_transaction_abort(backend_data->packed_transaction, &err)) { - error("error aborting transaction: %s", err.buf); - strbuf_release(&err); - } + if (backend_data) { + if (backend_data->packed_transaction && + ref_transaction_abort(backend_data->packed_transaction, &err)) { + error("error aborting transaction: %s", err.buf); + strbuf_release(&err); + } - if (backend_data->packed_refs_locked) - packed_refs_unlock(refs->packed_ref_store); + if (backend_data->packed_refs_locked) + packed_refs_unlock(refs->packed_ref_store); - free(backend_data); + free(backend_data); + } transaction->state = REF_TRANSACTION_CLOSED; } diff --git a/third_party/git/refs/packed-backend.c b/third_party/git/refs/packed-backend.c index c01c7f5901..b912f2505f 100644 --- a/third_party/git/refs/packed-backend.c +++ b/third_party/git/refs/packed-backend.c @@ -200,6 +200,7 @@ struct ref_store *packed_ref_store_create(const char *path, struct ref_store *ref_store = (struct ref_store *)refs; base_ref_store_init(ref_store, &refs_be_packed); + ref_store->gitdir = xstrdup(path); refs->store_flags = store_flags; refs->path = xstrdup(path); @@ -1012,14 +1013,23 @@ int packed_refs_lock(struct ref_store *ref_store, int flags, struct strbuf *err) } /* - * 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. + * 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. */ - validate_snapshot(refs); + clear_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 f2d8c0123a..467f4b3c93 100644 --- a/third_party/git/refs/refs-internal.h +++ b/third_party/git/refs/refs-internal.h @@ -32,6 +32,13 @@ struct ref_transaction; #define REF_HAVE_OLD (1 << 3) /* + * Used as a flag in ref_update::flags when we want to log a ref + * update but not actually perform it. This is used when a symbolic + * ref update is split up. + */ +#define REF_LOG_ONLY (1 << 7) + +/* * Return the length of time to retry acquiring a loose reference lock * before giving up, in milliseconds: */ @@ -96,12 +103,6 @@ enum peel_status { */ enum peel_status peel_object(const struct object_id *name, struct object_id *oid); -/* - * Copy the reflog message msg to sb while cleaning up the whitespaces. - * Especially, convert LF to space, because reflog file is one line per entry. - */ -void copy_reflog_msg(struct strbuf *sb, const char *msg); - /** * Information needed for a single ref update. Set new_oid to the new * value or to null_oid to delete the ref. To check the old value @@ -262,7 +263,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 - * assocated with the iteration, frees the ref_iterator object, and + * associated 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 @@ -347,9 +348,13 @@ int is_empty_ref_iterator(struct ref_iterator *ref_iterator); /* * Return an iterator that goes over each reference in `refs` for * which the refname begins with prefix. If trim is non-zero, then - * trim that many characters off the beginning of each refname. flags - * can be DO_FOR_EACH_INCLUDE_BROKEN to include broken references in - * the iteration. The output is ordered by refname. + * trim that many characters off the beginning of each refname. + * The output is ordered by refname. The following flags are supported: + * + * DO_FOR_EACH_INCLUDE_BROKEN: include broken references in + * the iteration. + * + * DO_FOR_EACH_PER_WORKTREE_ONLY: only produce REF_TYPE_PER_WORKTREE refs. */ struct ref_iterator *refs_ref_iterator_begin( struct ref_store *refs, @@ -438,6 +443,14 @@ void base_ref_iterator_free(struct ref_iterator *iter); /* Virtual function declarations for ref_iterators: */ +/* + * backend-specific implementation of ref_iterator_advance. For symrefs, the + * function should set REF_ISSYMREF, and it should also dereference the symref + * to provide the OID referent. If DO_FOR_EACH_INCLUDE_BROKEN is set, symrefs + * with non-existent referents and refs pointing to non-existent object names + * should also be returned. If DO_FOR_EACH_PER_WORKTREE_ONLY, only + * REF_TYPE_PER_WORKTREE refs should be returned. + */ typedef int ref_iterator_advance_fn(struct ref_iterator *ref_iterator); typedef int ref_iterator_peel_fn(struct ref_iterator *ref_iterator, @@ -661,18 +674,32 @@ extern struct ref_storage_be refs_be_packed; /* * A representation of the reference store for the main repository or * a submodule. The ref_store instances for submodules are kept in a - * linked list. + * hash map; see get_submodule_ref_store() for more info. */ struct ref_store { /* The backend describing this ref_store's storage scheme: */ const struct ref_storage_be *be; + + /* The gitdir that this ref_store applies to: */ + char *gitdir; }; /* + * Parse contents of a loose ref file. + */ +int parse_loose_ref_contents(const char *buf, struct object_id *oid, + struct strbuf *referent, unsigned int *type); + +/* * Fill in the generic part of refs and add it to our collection of * reference stores. */ void base_ref_store_init(struct ref_store *refs, const struct ref_storage_be *be); +/* + * Support GIT_TRACE_REFS by optionally wrapping the given ref_store instance. + */ +struct ref_store *maybe_debug_wrap_ref_store(const char *gitdir, struct ref_store *store); + #endif /* REFS_REFS_INTERNAL_H */ diff --git a/third_party/git/refspec.c b/third_party/git/refspec.c index 9a9bf21934..8af357a0a3 100644 --- a/third_party/git/refspec.c +++ b/third_party/git/refspec.c @@ -1,5 +1,5 @@ #include "cache.h" -#include "argv-array.h" +#include "strvec.h" #include "refs.h" #include "refspec.h" @@ -8,6 +8,7 @@ static struct refspec_item s_tag_refspec = { 1, 0, 0, + 0, "refs/tags/*", "refs/tags/*" }; @@ -32,10 +33,17 @@ static int parse_refspec(struct refspec_item *item, const char *refspec, int fet if (*lhs == '+') { item->force = 1; lhs++; + } else if (*lhs == '^') { + item->negative = 1; + lhs++; } rhs = strrchr(lhs, ':'); + /* negative refspecs only have one side */ + if (item->negative && rhs) + return 0; + /* * Before going on, special case ":" (or "+:") as a refspec * for pushing matching refs. @@ -55,7 +63,7 @@ static int parse_refspec(struct refspec_item *item, const char *refspec, int fet llen = (rhs ? (rhs - lhs - 1) : strlen(lhs)); if (1 <= llen && memchr(lhs, '*', llen)) { - if ((rhs && !is_glob) || (!rhs && fetch)) + if ((rhs && !is_glob) || (!rhs && !item->negative && fetch)) return 0; is_glob = 1; } else if (rhs && is_glob) { @@ -66,6 +74,28 @@ static int parse_refspec(struct refspec_item *item, const char *refspec, int fet item->src = xstrndup(lhs, llen); flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0); + if (item->negative) { + struct object_id unused; + + /* + * Negative refspecs only have a LHS, which indicates a ref + * (or pattern of refs) to exclude from other matches. This + * can either be a simple ref, or a glob pattern. Exact sha1 + * match is not currently supported. + */ + if (!*item->src) + return 0; /* negative refspecs must not be empty */ + else if (llen == the_hash_algo->hexsz && !get_oid_hex(item->src, &unused)) + return 0; /* negative refpsecs cannot be exact sha1 */ + else if (!check_refname_format(item->src, flags)) + ; /* valid looking ref is ok */ + else + return 0; + + /* the other rules below do not apply to negative refspecs */ + return 1; + } + if (fetch) { struct object_id unused; @@ -153,7 +183,7 @@ void refspec_init(struct refspec *rs, int fetch) rs->fetch = fetch; } -void refspec_append(struct refspec *rs, const char *refspec) +static void refspec_append_nodup(struct refspec *rs, char *refspec) { struct refspec_item item; @@ -163,7 +193,21 @@ void refspec_append(struct refspec *rs, const char *refspec) rs->items[rs->nr++] = item; ALLOC_GROW(rs->raw, rs->raw_nr + 1, rs->raw_alloc); - rs->raw[rs->raw_nr++] = xstrdup(refspec); + rs->raw[rs->raw_nr++] = refspec; +} + +void refspec_append(struct refspec *rs, const char *refspec) +{ + refspec_append_nodup(rs, xstrdup(refspec)); +} + +void refspec_appendf(struct refspec *rs, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + refspec_append_nodup(rs, xstrvfmt(fmt, ap)); + va_end(ap); } void refspec_appendn(struct refspec *rs, const char **refspecs, int nr) @@ -202,14 +246,14 @@ int valid_fetch_refspec(const char *fetch_refspec_str) } void refspec_ref_prefixes(const struct refspec *rs, - struct argv_array *ref_prefixes) + struct strvec *ref_prefixes) { int i; for (i = 0; i < rs->nr; i++) { const struct refspec_item *item = &rs->items[i]; const char *prefix = NULL; - if (item->exact_sha1) + if (item->exact_sha1 || item->negative) continue; if (rs->fetch == REFSPEC_FETCH) prefix = item->src; @@ -221,9 +265,9 @@ void refspec_ref_prefixes(const struct refspec *rs, if (prefix) { if (item->pattern) { const char *glob = strchr(prefix, '*'); - argv_array_pushf(ref_prefixes, "%.*s", - (int)(glob - prefix), - prefix); + strvec_pushf(ref_prefixes, "%.*s", + (int)(glob - prefix), + prefix); } else { expand_ref_prefix(ref_prefixes, prefix); } diff --git a/third_party/git/refspec.h b/third_party/git/refspec.h index 9b6e64a824..9551832399 100644 --- a/third_party/git/refspec.h +++ b/third_party/git/refspec.h @@ -4,11 +4,26 @@ #define TAG_REFSPEC "refs/tags/*:refs/tags/*" extern const struct refspec_item *tag_refspec; +/** + * A struct refspec_item 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. If it is a negative refspec, (starts + * with '^'), negative 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 "". + * + * remote_find_tracking(), given a remote and a struct refspec_item 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_item { unsigned force : 1; unsigned pattern : 1; unsigned matching : 1; unsigned exact_sha1 : 1; + unsigned negative : 1; char *src; char *dst; @@ -20,6 +35,10 @@ struct refspec_item { #define REFSPEC_INIT_FETCH { .fetch = REFSPEC_FETCH } #define REFSPEC_INIT_PUSH { .fetch = REFSPEC_PUSH } +/** + * An array of strings can be parsed into a struct refspec using + * parse_fetch_refspec() or parse_push_refspec(). + */ struct refspec { struct refspec_item *items; int alloc; @@ -39,17 +58,19 @@ void refspec_item_init_or_die(struct refspec_item *item, const char *refspec, void refspec_item_clear(struct refspec_item *item); void refspec_init(struct refspec *rs, int fetch); void refspec_append(struct refspec *rs, const char *refspec); +__attribute__((format (printf,2,3))) +void refspec_appendf(struct refspec *rs, const char *fmt, ...); void refspec_appendn(struct refspec *rs, const char **refspecs, int nr); void refspec_clear(struct refspec *rs); int valid_fetch_refspec(const char *refspec); -struct argv_array; +struct strvec; /* * Determine what <prefix> values to pass to the peer in ref-prefix lines * (see Documentation/technical/protocol-v2.txt). */ void refspec_ref_prefixes(const struct refspec *rs, - struct argv_array *ref_prefixes); + struct strvec *ref_prefixes); #endif /* REFSPEC_H */ diff --git a/third_party/git/remote-curl.c b/third_party/git/remote-curl.c index 051f26629d..32cc4a0c55 100644 --- a/third_party/git/remote-curl.c +++ b/third_party/git/remote-curl.c @@ -10,9 +10,9 @@ #include "pkt-line.h" #include "string-list.h" #include "sideband.h" -#include "argv-array.h" +#include "strvec.h" #include "credential.h" -#include "sha1-array.h" +#include "oid-array.h" #include "send-pack.h" #include "protocol.h" #include "quote.h" @@ -39,8 +39,13 @@ struct options { /* One of the SEND_PACK_PUSH_CERT_* constants. */ push_cert : 2, deepen_relative : 1, + + /* see documentation of corresponding flag in fetch-pack.h */ from_promisor : 1, - no_dependents : 1; + + atomic : 1, + object_format : 1; + const struct git_hash_algo *hash_algo; }; static struct options options; static struct string_list cas_options = STRING_LIST_INIT_DUP; @@ -118,7 +123,11 @@ static int set_option(const char *name, const char *value) } else if (!strcmp(name, "cas")) { struct strbuf val = STRBUF_INIT; - strbuf_addf(&val, "--" CAS_OPT_NAME "=%s", value); + strbuf_addstr(&val, "--force-with-lease="); + if (*value != '"') + strbuf_addstr(&val, value); + else if (unquote_c_style(&val, value, NULL)) + return -1; string_list_append(&cas_options, val.buf); strbuf_release(&val); return 0; @@ -148,6 +157,14 @@ 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); @@ -175,12 +192,19 @@ static int set_option(const char *name, const char *value) } else if (!strcmp(name, "from-promisor")) { options.from_promisor = 1; return 0; - } else if (!strcmp(name, "no-dependents")) { - options.no_dependents = 1; - return 0; } else if (!strcmp(name, "filter")) { options.filter = xstrdup(value); return 0; + } else if (!strcmp(name, "object-format")) { + int algo; + options.object_format = 1; + if (strcmp(value, "true")) { + algo = hash_algo_by_name(value); + if (algo == GIT_HASH_UNKNOWN) + die("unknown object format '%s'", value); + options.hash_algo = &hash_algos[algo]; + } + return 0; } else { return 1 /* unsupported */; } @@ -222,6 +246,7 @@ static struct ref *parse_git_refs(struct discovery *heads, int for_push) case protocol_v0: get_remote_heads(&reader, &list, for_push ? REF_NORMAL : 0, NULL, &heads->shallow); + options.hash_algo = reader.hash_algo; break; case protocol_unknown_version: BUG("unknown protocol version"); @@ -230,6 +255,19 @@ static struct ref *parse_git_refs(struct discovery *heads, int for_push) return list; } +static const struct git_hash_algo *detect_hash_algo(struct discovery *heads) +{ + const char *p = memchr(heads->buf, '\t', heads->len); + int algo; + if (!p) + return the_hash_algo; + + algo = hash_algo_by_length((p - heads->buf) / 2); + if (algo == GIT_HASH_UNKNOWN) + return NULL; + return &hash_algos[algo]; +} + static struct ref *parse_info_refs(struct discovery *heads) { char *data, *start, *mid; @@ -240,6 +278,12 @@ static struct ref *parse_info_refs(struct discovery *heads) struct ref *ref = NULL; struct ref *last_ref = NULL; + options.hash_algo = detect_hash_algo(heads); + if (!options.hash_algo) + die("%sinfo/refs not valid: could not determine hash algorithm; " + "is this a git repository?", + transport_anonymize_url(url.buf)); + data = heads->buf; start = NULL; mid = data; @@ -250,13 +294,13 @@ static struct ref *parse_info_refs(struct discovery *heads) if (data[i] == '\t') mid = &data[i]; if (data[i] == '\n') { - if (mid - start != the_hash_algo->hexsz) + if (mid - start != options.hash_algo->hexsz) die(_("%sinfo/refs not valid: is this a git repository?"), transport_anonymize_url(url.buf)); data[i] = 0; ref_name = mid + 1; ref = alloc_ref(ref_name); - get_oid_hex(start, &ref->old_oid); + get_oid_hex_algop(start, &ref->old_oid, options.hash_algo); if (!refs) refs = ref; if (last_ref) @@ -500,11 +544,16 @@ static struct ref *get_refs(int for_push) static void output_refs(struct ref *refs) { struct ref *posn; + if (options.object_format && options.hash_algo) { + printf(":object-format %s\n", options.hash_algo->name); + } for (posn = refs; posn; posn = posn->next) { if (posn->symref) printf("@%s %s\n", posn->symref, posn->name); else - printf("%s %s\n", oid_to_hex(&posn->old_oid), posn->name); + printf("%s %s\n", hash_to_hex_algop(posn->old_oid.hash, + options.hash_algo), + posn->name); } printf("\n"); fflush(stdout); @@ -592,6 +641,8 @@ static int rpc_read_from_out(struct rpc_state *rpc, int options, case PACKET_READ_FLUSH: memcpy(buf - 4, "0000", 4); break; + case PACKET_READ_RESPONSE_END: + die(_("remote server sent stateless separator")); } } @@ -634,7 +685,7 @@ static size_t rpc_out(void *ptr, size_t eltsize, return 0; } /* - * If avail is non-zerp, the line length for the flush still + * If avail is non-zero, the line length for the flush still * hasn't been fully sent. Proceed with sending the line * length. */ @@ -670,9 +721,55 @@ static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp) } #endif +struct check_pktline_state { + char len_buf[4]; + int len_filled; + int remaining; +}; + +static void check_pktline(struct check_pktline_state *state, const char *ptr, size_t size) +{ + while (size) { + if (!state->remaining) { + int digits_remaining = 4 - state->len_filled; + if (digits_remaining > size) + digits_remaining = size; + memcpy(&state->len_buf[state->len_filled], ptr, digits_remaining); + state->len_filled += digits_remaining; + ptr += digits_remaining; + size -= digits_remaining; + + if (state->len_filled == 4) { + state->remaining = packet_length(state->len_buf); + if (state->remaining < 0) { + die(_("remote-curl: bad line length character: %.4s"), state->len_buf); + } else if (state->remaining == 2) { + die(_("remote-curl: unexpected response end packet")); + } else if (state->remaining < 4) { + state->remaining = 0; + } else { + state->remaining -= 4; + } + state->len_filled = 0; + } + } + + if (state->remaining) { + int remaining = state->remaining; + if (remaining > size) + remaining = size; + ptr += remaining; + size -= remaining; + state->remaining -= remaining; + } + } +} + struct rpc_in_data { struct rpc_state *rpc; struct active_request_slot *slot; + int check_pktline; + struct check_pktline_state pktline_state; }; /* @@ -693,6 +790,8 @@ static size_t rpc_in(char *ptr, size_t eltsize, return size; if (size) data->rpc->any_written = 1; + if (data->check_pktline) + check_pktline(&data->pktline_state, ptr, size); write_or_die(data->rpc->in, ptr, size); return size; } @@ -769,7 +868,7 @@ static curl_off_t xcurl_off_t(size_t len) * If flush_received is true, do not attempt to read any more; just use what's * in rpc->buf. */ -static int post_rpc(struct rpc_state *rpc, int flush_received) +static int post_rpc(struct rpc_state *rpc, int stateless_connect, int flush_received) { struct active_request_slot *slot; struct curl_slist *headers = http_copy_default_headers(); @@ -911,6 +1010,8 @@ retry: curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, rpc_in); rpc_in_data.rpc = rpc; rpc_in_data.slot = slot; + rpc_in_data.check_pktline = stateless_connect; + memset(&rpc_in_data.pktline_state, 0, sizeof(rpc_in_data.pktline_state)); curl_easy_setopt(slot->curl, CURLOPT_FILE, &rpc_in_data); curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 0); @@ -927,6 +1028,14 @@ retry: if (!rpc->any_written) err = -1; + if (rpc_in_data.pktline_state.len_filled) + err = error(_("%d bytes of length header were received"), rpc_in_data.pktline_state.len_filled); + if (rpc_in_data.pktline_state.remaining) + err = error(_("%d bytes of body are still expected"), rpc_in_data.pktline_state.remaining); + + if (stateless_connect) + packet_response_end(rpc->in); + curl_slist_free_all(headers); free(gzip_body); return err; @@ -976,7 +1085,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads, break; rpc->pos = 0; rpc->len = n; - err |= post_rpc(rpc, 0); + err |= post_rpc(rpc, 0, 0); } close(client.in); @@ -1017,6 +1126,7 @@ 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); @@ -1034,41 +1144,39 @@ static int fetch_git(struct discovery *heads, struct rpc_state rpc; struct strbuf preamble = STRBUF_INIT; int i, err; - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; struct strbuf rpc_result = STRBUF_INIT; - argv_array_pushl(&args, "fetch-pack", "--stateless-rpc", - "--stdin", "--lock-pack", NULL); + strvec_pushl(&args, "fetch-pack", "--stateless-rpc", + "--stdin", "--lock-pack", NULL); if (options.followtags) - argv_array_push(&args, "--include-tag"); + strvec_push(&args, "--include-tag"); if (options.thin) - argv_array_push(&args, "--thin"); + strvec_push(&args, "--thin"); if (options.verbosity >= 3) - argv_array_pushl(&args, "-v", "-v", NULL); + strvec_pushl(&args, "-v", "-v", NULL); if (options.check_self_contained_and_connected) - argv_array_push(&args, "--check-self-contained-and-connected"); + strvec_push(&args, "--check-self-contained-and-connected"); if (options.cloning) - argv_array_push(&args, "--cloning"); + strvec_push(&args, "--cloning"); if (options.update_shallow) - argv_array_push(&args, "--update-shallow"); + strvec_push(&args, "--update-shallow"); if (!options.progress) - argv_array_push(&args, "--no-progress"); + strvec_push(&args, "--no-progress"); if (options.depth) - argv_array_pushf(&args, "--depth=%lu", options.depth); + strvec_pushf(&args, "--depth=%lu", options.depth); if (options.deepen_since) - argv_array_pushf(&args, "--shallow-since=%s", options.deepen_since); + strvec_pushf(&args, "--shallow-since=%s", options.deepen_since); for (i = 0; i < options.deepen_not.nr; i++) - argv_array_pushf(&args, "--shallow-exclude=%s", - options.deepen_not.items[i].string); + strvec_pushf(&args, "--shallow-exclude=%s", + options.deepen_not.items[i].string); if (options.deepen_relative && options.depth) - argv_array_push(&args, "--deepen-relative"); + strvec_push(&args, "--deepen-relative"); if (options.from_promisor) - argv_array_push(&args, "--from-promisor"); - if (options.no_dependents) - argv_array_push(&args, "--no-dependents"); + strvec_push(&args, "--from-promisor"); if (options.filter) - argv_array_pushf(&args, "--filter=%s", options.filter); - argv_array_push(&args, url.buf); + strvec_pushf(&args, "--filter=%s", options.filter); + strvec_push(&args, url.buf); for (i = 0; i < nr_heads; i++) { struct ref *ref = to_fetch[i]; @@ -1083,12 +1191,12 @@ static int fetch_git(struct discovery *heads, rpc.service_name = "git-upload-pack", rpc.gzip_request = 1; - err = rpc_service(&rpc, heads, args.argv, &preamble, &rpc_result); + err = rpc_service(&rpc, heads, args.v, &preamble, &rpc_result); if (rpc_result.len) write_or_die(1, rpc_result.buf, rpc_result.len); strbuf_release(&rpc_result); strbuf_release(&preamble); - argv_array_clear(&args); + strvec_clear(&args); return err; } @@ -1154,61 +1262,63 @@ static void parse_fetch(struct strbuf *buf) strbuf_reset(buf); } -static int push_dav(int nr_spec, char **specs) +static int push_dav(int nr_spec, const char **specs) { struct child_process child = CHILD_PROCESS_INIT; size_t i; child.git_cmd = 1; - argv_array_push(&child.args, "http-push"); - argv_array_push(&child.args, "--helper-status"); + strvec_push(&child.args, "http-push"); + strvec_push(&child.args, "--helper-status"); if (options.dry_run) - argv_array_push(&child.args, "--dry-run"); + strvec_push(&child.args, "--dry-run"); if (options.verbosity > 1) - argv_array_push(&child.args, "--verbose"); - argv_array_push(&child.args, url.buf); + strvec_push(&child.args, "--verbose"); + strvec_push(&child.args, url.buf); for (i = 0; i < nr_spec; i++) - argv_array_push(&child.args, specs[i]); + strvec_push(&child.args, specs[i]); if (run_command(&child)) die(_("git-http-push failed")); return 0; } -static int push_git(struct discovery *heads, int nr_spec, char **specs) +static int push_git(struct discovery *heads, int nr_spec, const char **specs) { struct rpc_state rpc; int i, err; - struct argv_array args; + struct strvec args; struct string_list_item *cas_option; struct strbuf preamble = STRBUF_INIT; struct strbuf rpc_result = STRBUF_INIT; - argv_array_init(&args); - argv_array_pushl(&args, "send-pack", "--stateless-rpc", "--helper-status", - NULL); + strvec_init(&args); + strvec_pushl(&args, "send-pack", "--stateless-rpc", "--helper-status", + NULL); if (options.thin) - argv_array_push(&args, "--thin"); + strvec_push(&args, "--thin"); if (options.dry_run) - argv_array_push(&args, "--dry-run"); + strvec_push(&args, "--dry-run"); if (options.push_cert == SEND_PACK_PUSH_CERT_ALWAYS) - argv_array_push(&args, "--signed=yes"); + strvec_push(&args, "--signed=yes"); else if (options.push_cert == SEND_PACK_PUSH_CERT_IF_ASKED) - argv_array_push(&args, "--signed=if-asked"); + strvec_push(&args, "--signed=if-asked"); + if (options.atomic) + strvec_push(&args, "--atomic"); if (options.verbosity == 0) - argv_array_push(&args, "--quiet"); + strvec_push(&args, "--quiet"); else if (options.verbosity > 1) - argv_array_push(&args, "--verbose"); + strvec_push(&args, "--verbose"); for (i = 0; i < options.push_options.nr; i++) - argv_array_pushf(&args, "--push-option=%s", - options.push_options.items[i].string); - argv_array_push(&args, options.progress ? "--progress" : "--no-progress"); + strvec_pushf(&args, "--push-option=%s", + options.push_options.items[i].string); + strvec_push(&args, options.progress ? "--progress" : "--no-progress"); for_each_string_list_item(cas_option, &cas_options) - argv_array_push(&args, cas_option->string); - argv_array_push(&args, url.buf); + strvec_push(&args, cas_option->string); + strvec_push(&args, url.buf); - argv_array_push(&args, "--stdin"); + strvec_push(&args, "--stdin"); for (i = 0; i < nr_spec; i++) packet_buf_write(&preamble, "%s\n", specs[i]); packet_buf_flush(&preamble); @@ -1216,16 +1326,16 @@ static int push_git(struct discovery *heads, int nr_spec, char **specs) memset(&rpc, 0, sizeof(rpc)); rpc.service_name = "git-receive-pack", - err = rpc_service(&rpc, heads, args.argv, &preamble, &rpc_result); + err = rpc_service(&rpc, heads, args.v, &preamble, &rpc_result); if (rpc_result.len) write_or_die(1, rpc_result.buf, rpc_result.len); strbuf_release(&rpc_result); strbuf_release(&preamble); - argv_array_clear(&args); + strvec_clear(&args); return err; } -static int push(int nr_spec, char **specs) +static int push(int nr_spec, const char **specs) { struct discovery *heads = discover_refs("git-receive-pack", 1); int ret; @@ -1240,14 +1350,13 @@ static int push(int nr_spec, char **specs) static void parse_push(struct strbuf *buf) { - char **specs = NULL; - int alloc_spec = 0, nr_spec = 0, i, ret; + struct strvec specs = STRVEC_INIT; + int ret; do { - if (starts_with(buf->buf, "push ")) { - ALLOC_GROW(specs, nr_spec + 1, alloc_spec); - specs[nr_spec++] = xstrdup(buf->buf + 5); - } + const char *arg; + if (skip_prefix(buf->buf, "push ", &arg)) + strvec_push(&specs, arg); else die(_("http transport does not support %s"), buf->buf); @@ -1258,17 +1367,15 @@ static void parse_push(struct strbuf *buf) break; } while (1); - ret = push(nr_spec, specs); + ret = push(specs.nr, specs.v); printf("\n"); fflush(stdout); if (ret) exit(128); /* error already reported */ - free_specs: - for (i = 0; i < nr_spec; i++) - free(specs[i]); - free(specs); +free_specs: + strvec_clear(&specs); } static int stateless_connect(const char *service_name) @@ -1333,7 +1440,7 @@ static int stateless_connect(const char *service_name) BUG("The entire rpc->buf should be larger than LARGE_PACKET_MAX"); if (status == PACKET_READ_EOF) break; - if (post_rpc(&rpc, status == PACKET_READ_FLUSH)) + if (post_rpc(&rpc, 1, status == PACKET_READ_FLUSH)) /* We would have an err here */ break; /* Reset the buffer for next request */ @@ -1430,6 +1537,7 @@ int cmd_main(int argc, const char **argv) printf("option\n"); printf("push\n"); printf("check-connectivity\n"); + printf("object-format\n"); printf("\n"); fflush(stdout); } else if (skip_prefix(buf.buf, "stateless-connect ", &arg)) { diff --git a/third_party/git/remote-testsvn.c b/third_party/git/remote-testsvn.c deleted file mode 100644 index 3af708c5b6..0000000000 --- a/third_party/git/remote-testsvn.c +++ /dev/null @@ -1,337 +0,0 @@ -#include "cache.h" -#include "refs.h" -#include "remote.h" -#include "object-store.h" -#include "strbuf.h" -#include "url.h" -#include "exec-cmd.h" -#include "run-command.h" -#include "vcs-svn/svndump.h" -#include "notes.h" -#include "argv-array.h" - -static const char *url; -static int dump_from_file; -static const char *private_ref; -static const char *remote_ref = "refs/heads/master"; -static const char *marksfilename, *notes_ref; -struct rev_note { unsigned int rev_nr; }; - -static int cmd_capabilities(const char *line); -static int cmd_import(const char *line); -static int cmd_list(const char *line); - -typedef int (*input_command_handler)(const char *); -struct input_command_entry { - const char *name; - input_command_handler fn; - unsigned char batchable; /* whether the command starts or is part of a batch */ -}; - -static const struct input_command_entry input_command_list[] = { - { "capabilities", cmd_capabilities, 0 }, - { "import", cmd_import, 1 }, - { "list", cmd_list, 0 }, - { NULL, NULL } -}; - -static int cmd_capabilities(const char *line) -{ - printf("import\n"); - printf("bidi-import\n"); - printf("refspec %s:%s\n\n", remote_ref, private_ref); - fflush(stdout); - return 0; -} - -static void terminate_batch(void) -{ - /* terminate a current batch's fast-import stream */ - printf("done\n"); - fflush(stdout); -} - -/* NOTE: 'ref' refers to a git reference, while 'rev' refers to a svn revision. */ -static char *read_ref_note(const struct object_id *oid) -{ - const struct object_id *note_oid; - char *msg = NULL; - unsigned long msglen; - enum object_type type; - - init_notes(NULL, notes_ref, NULL, 0); - if (!(note_oid = get_note(NULL, oid))) - return NULL; /* note tree not found */ - if (!(msg = read_object_file(note_oid, &type, &msglen))) - error("Empty notes tree. %s", notes_ref); - else if (!msglen || type != OBJ_BLOB) { - error("Note contains unusable content. " - "Is something else using this notes tree? %s", notes_ref); - FREE_AND_NULL(msg); - } - free_notes(NULL); - return msg; -} - -static int parse_rev_note(const char *msg, struct rev_note *res) -{ - const char *key, *value, *end; - size_t len; - - while (*msg) { - end = strchrnul(msg, '\n'); - len = end - msg; - - key = "Revision-number: "; - if (starts_with(msg, key)) { - long i; - char *end; - value = msg + strlen(key); - i = strtol(value, &end, 0); - if (end == value || i < 0 || i > UINT32_MAX) - return -1; - res->rev_nr = i; - return 0; - } - msg += len + 1; - } - /* didn't find it */ - return -1; -} - -static int note2mark_cb(const struct object_id *object_oid, - const struct object_id *note_oid, char *note_path, - void *cb_data) -{ - FILE *file = (FILE *)cb_data; - char *msg; - unsigned long msglen; - enum object_type type; - struct rev_note note; - - if (!(msg = read_object_file(note_oid, &type, &msglen)) || - !msglen || type != OBJ_BLOB) { - free(msg); - return 1; - } - if (parse_rev_note(msg, ¬e)) - return 2; - if (fprintf(file, ":%d %s\n", note.rev_nr, oid_to_hex(object_oid)) < 1) - return 3; - return 0; -} - -static void regenerate_marks(void) -{ - int ret; - FILE *marksfile = xfopen(marksfilename, "w+"); - - ret = for_each_note(NULL, 0, note2mark_cb, marksfile); - if (ret) - die("Regeneration of marks failed, returned %d.", ret); - fclose(marksfile); -} - -static void check_or_regenerate_marks(int latestrev) -{ - FILE *marksfile; - struct strbuf sb = STRBUF_INIT; - struct strbuf line = STRBUF_INIT; - int found = 0; - - if (latestrev < 1) - return; - - init_notes(NULL, notes_ref, NULL, 0); - marksfile = fopen(marksfilename, "r"); - if (!marksfile) { - regenerate_marks(); - marksfile = xfopen(marksfilename, "r"); - fclose(marksfile); - } else { - strbuf_addf(&sb, ":%d ", latestrev); - while (strbuf_getline_lf(&line, marksfile) != EOF) { - if (starts_with(line.buf, sb.buf)) { - found++; - break; - } - } - fclose(marksfile); - if (!found) - regenerate_marks(); - } - free_notes(NULL); - strbuf_release(&sb); - strbuf_release(&line); -} - -static int cmd_import(const char *line) -{ - int code; - int dumpin_fd; - char *note_msg; - struct object_id head_oid; - unsigned int startrev; - struct child_process svndump_proc = CHILD_PROCESS_INIT; - const char *command = "svnrdump"; - - if (read_ref(private_ref, &head_oid)) - startrev = 0; - else { - note_msg = read_ref_note(&head_oid); - if(note_msg == NULL) { - warning("No note found for %s.", private_ref); - startrev = 0; - } else { - struct rev_note note = { 0 }; - if (parse_rev_note(note_msg, ¬e)) - die("Revision number couldn't be parsed from note."); - startrev = note.rev_nr + 1; - free(note_msg); - } - } - check_or_regenerate_marks(startrev - 1); - - if (dump_from_file) { - dumpin_fd = open(url, O_RDONLY); - if(dumpin_fd < 0) - die_errno("Couldn't open svn dump file %s.", url); - } else { - svndump_proc.out = -1; - argv_array_push(&svndump_proc.args, command); - argv_array_push(&svndump_proc.args, "dump"); - argv_array_push(&svndump_proc.args, url); - argv_array_pushf(&svndump_proc.args, "-r%u:HEAD", startrev); - - code = start_command(&svndump_proc); - if (code) - die("Unable to start %s, code %d", command, code); - dumpin_fd = svndump_proc.out; - } - /* setup marks file import/export */ - printf("feature import-marks-if-exists=%s\n" - "feature export-marks=%s\n", marksfilename, marksfilename); - - svndump_init_fd(dumpin_fd, STDIN_FILENO); - svndump_read(url, private_ref, notes_ref); - svndump_deinit(); - svndump_reset(); - - close(dumpin_fd); - if (!dump_from_file) { - code = finish_command(&svndump_proc); - if (code) - warning("%s, returned %d", command, code); - } - - return 0; -} - -static int cmd_list(const char *line) -{ - printf("? %s\n\n", remote_ref); - fflush(stdout); - return 0; -} - -static int do_command(struct strbuf *line) -{ - const struct input_command_entry *p = input_command_list; - static struct string_list batchlines = STRING_LIST_INIT_DUP; - static const struct input_command_entry *batch_cmd; - /* - * commands can be grouped together in a batch. - * Batches are ended by \n. If no batch is active the program ends. - * During a batch all lines are buffered and passed to the handler function - * when the batch is terminated. - */ - if (line->len == 0) { - if (batch_cmd) { - struct string_list_item *item; - for_each_string_list_item(item, &batchlines) - batch_cmd->fn(item->string); - terminate_batch(); - batch_cmd = NULL; - string_list_clear(&batchlines, 0); - return 0; /* end of the batch, continue reading other commands. */ - } - return 1; /* end of command stream, quit */ - } - if (batch_cmd) { - if (!starts_with(batch_cmd->name, line->buf)) - die("Active %s batch interrupted by %s", batch_cmd->name, line->buf); - /* buffer batch lines */ - string_list_append(&batchlines, line->buf); - return 0; - } - - for (p = input_command_list; p->name; p++) { - if (starts_with(line->buf, p->name) && (strlen(p->name) == line->len || - line->buf[strlen(p->name)] == ' ')) { - if (p->batchable) { - batch_cmd = p; - string_list_append(&batchlines, line->buf); - return 0; - } - return p->fn(line->buf); - } - } - die("Unknown command '%s'\n", line->buf); - return 0; -} - -int cmd_main(int argc, const char **argv) -{ - struct strbuf buf = STRBUF_INIT, url_sb = STRBUF_INIT, - private_ref_sb = STRBUF_INIT, marksfilename_sb = STRBUF_INIT, - notes_ref_sb = STRBUF_INIT; - static struct remote *remote; - const char *url_in; - - setup_git_directory(); - if (argc < 2 || argc > 3) { - usage("git-remote-svn <remote-name> [<url>]"); - return 1; - } - - remote = remote_get(argv[1]); - url_in = (argc == 3) ? argv[2] : remote->url[0]; - - if (starts_with(url_in, "file://")) { - dump_from_file = 1; - url = url_decode(url_in + sizeof("file://")-1); - } else { - dump_from_file = 0; - end_url_with_slash(&url_sb, url_in); - url = url_sb.buf; - } - - strbuf_addf(&private_ref_sb, "refs/svn/%s/master", remote->name); - private_ref = private_ref_sb.buf; - - strbuf_addf(¬es_ref_sb, "refs/notes/%s/revs", remote->name); - notes_ref = notes_ref_sb.buf; - - strbuf_addf(&marksfilename_sb, "%s/info/fast-import/remote-svn/%s.marks", - get_git_dir(), remote->name); - marksfilename = marksfilename_sb.buf; - - while (1) { - if (strbuf_getline_lf(&buf, stdin) == EOF) { - if (ferror(stdin)) - die("Error reading command stream"); - else - die("Unexpected end of command stream"); - } - if (do_command(&buf)) - break; - strbuf_reset(&buf); - } - - strbuf_release(&buf); - strbuf_release(&url_sb); - strbuf_release(&private_ref_sb); - strbuf_release(¬es_ref_sb); - strbuf_release(&marksfilename_sb); - return 0; -} diff --git a/third_party/git/remote.c b/third_party/git/remote.c index e50f7602ed..8be67f0892 100644 --- a/third_party/git/remote.c +++ b/third_party/git/remote.c @@ -11,7 +11,7 @@ #include "tag.h" #include "string-list.h" #include "mergesort.h" -#include "argv-array.h" +#include "strvec.h" #include "commit-reach.h" #include "advice.h" @@ -111,14 +111,16 @@ struct remotes_hash_key { }; static int remotes_hash_cmp(const void *unused_cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *keydata) { - const struct remote *a = entry; - const struct remote *b = entry_or_key; + const struct remote *a, *b; 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 @@ -135,7 +137,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; + struct hashmap_entry lookup_entry, *e; if (!len) len = strlen(name); @@ -145,8 +147,9 @@ static struct remote *make_remote(const char *name, int len) lookup.len = len; hashmap_entry_init(&lookup_entry, memhash(name, len)); - if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL) - return ret; + e = hashmap_get(&remotes_hash, &lookup_entry, &lookup); + if (e) + return container_of(e, struct remote, ent); ret = xcalloc(1, sizeof(struct remote)); ret->prune = -1; /* unspecified */ @@ -158,8 +161,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, lookup_entry.hash); - replaced = hashmap_put(&remotes_hash, ret); + hashmap_entry_init(&ret->ent, lookup_entry.hash); + replaced = hashmap_put_entry(&remotes_hash, ret, ent); assert(replaced == NULL); /* no previous entry overwritten */ return ret; } @@ -171,54 +174,43 @@ static void add_merge(struct branch *branch, const char *name) branch->merge_name[branch->merge_nr++] = name; } -static struct branch *make_branch(const char *name, int len) +static struct branch *make_branch(const char *name, size_t len) { struct branch *ret; int i; for (i = 0; i < branches_nr; i++) { - if (len ? (!strncmp(name, branches[i]->name, len) && - !branches[i]->name[len]) : - !strcmp(name, branches[i]->name)) + if (!strncmp(name, branches[i]->name, len) && + !branches[i]->name[len]) return branches[i]; } ALLOC_GROW(branches, branches_nr + 1, branches_alloc); ret = xcalloc(1, sizeof(struct branch)); branches[branches_nr++] = ret; - if (len) - ret->name = xstrndup(name, len); - else - ret->name = xstrdup(name); + ret->name = xstrndup(name, len); ret->refname = xstrfmt("refs/heads/%s", ret->name); return ret; } -static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len) +static struct rewrite *make_rewrite(struct rewrites *r, + const char *base, size_t len) { struct rewrite *ret; int i; for (i = 0; i < r->rewrite_nr; i++) { - if (len - ? (len == r->rewrite[i]->baselen && - !strncmp(base, r->rewrite[i]->base, len)) - : !strcmp(base, r->rewrite[i]->base)) + if (len == r->rewrite[i]->baselen && + !strncmp(base, r->rewrite[i]->base, len)) return r->rewrite[i]; } ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc); ret = xcalloc(1, sizeof(struct rewrite)); r->rewrite[r->rewrite_nr++] = ret; - if (len) { - ret->base = xstrndup(base, len); - ret->baselen = len; - } - else { - ret->base = xstrdup(base); - ret->baselen = strlen(base); - } + ret->base = xstrndup(base, len); + ret->baselen = len; return ret; } @@ -284,7 +276,7 @@ static void read_branches_file(struct remote *remote) /* * The branches file would have URL and optionally - * #branch specified. The "master" (or specified) branch is + * #branch specified. The default (or specified) branch is * fetched and stored in the local branch matching the * remote name. */ @@ -292,28 +284,24 @@ static void read_branches_file(struct remote *remote) if (frag) *(frag++) = '\0'; else - frag = "master"; + frag = (char *)git_default_branch_name(); add_url_alias(remote, strbuf_detach(&buf, NULL)); - strbuf_addf(&buf, "refs/heads/%s:refs/heads/%s", - frag, remote->name); - refspec_append(&remote->fetch, buf.buf); + refspec_appendf(&remote->fetch, "refs/heads/%s:refs/heads/%s", + frag, remote->name); /* * Cogito compatible push: push current HEAD to remote #branch * (master if missing) */ - strbuf_reset(&buf); - strbuf_addf(&buf, "HEAD:refs/heads/%s", frag); - refspec_append(&remote->push, buf.buf); + refspec_appendf(&remote->push, "HEAD:refs/heads/%s", frag); remote->fetch_tags = 1; /* always auto-follow */ - strbuf_release(&buf); } static int handle_config(const char *key, const char *value, void *cb) { const char *name; - int namelen; + size_t namelen; const char *subkey; struct remote *remote; struct branch *branch; @@ -366,7 +354,8 @@ 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_REPO) + if (current_config_scope() == CONFIG_SCOPE_LOCAL || + current_config_scope() == CONFIG_SCOPE_WORKTREE) remote->configured_in_repo = 1; if (!strcmp(subkey, "mirror")) remote->mirror = git_config_bool(key, value); @@ -466,7 +455,7 @@ static void read_config(void) const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag); if (head_ref && (flag & REF_ISSYMREF) && skip_prefix(head_ref, "refs/heads/", &head_ref)) { - current_branch = make_branch(head_ref, 0); + current_branch = make_branch(head_ref, strlen(head_ref)); } } git_config(handle_config, NULL); @@ -512,14 +501,11 @@ 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, - int *explicit) +const char *remote_ref_for_branch(struct branch *branch, int for_push) { if (branch) { if (!for_push) { if (branch->merge_nr) { - if (explicit) - *explicit = 1; return branch->merge_name[0]; } } else { @@ -530,15 +516,11 @@ 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; } } } - if (explicit) - *explicit = 0; - return ""; + return NULL; } static struct remote *remote_get_1(const char *name, @@ -700,6 +682,91 @@ static int match_name_with_pattern(const char *key, const char *name, return ret; } +static int refspec_match(const struct refspec_item *refspec, + const char *name) +{ + if (refspec->pattern) + return match_name_with_pattern(refspec->src, name, NULL, NULL); + + return !strcmp(refspec->src, name); +} + +static int omit_name_by_refspec(const char *name, struct refspec *rs) +{ + int i; + + for (i = 0; i < rs->nr; i++) { + if (rs->items[i].negative && refspec_match(&rs->items[i], name)) + return 1; + } + return 0; +} + +struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs) +{ + struct ref **tail; + + for (tail = &ref_map; *tail; ) { + struct ref *ref = *tail; + + if (omit_name_by_refspec(ref->name, rs)) { + *tail = ref->next; + free(ref->peer_ref); + free(ref); + } else + tail = &ref->next; + } + + return ref_map; +} + +static int query_matches_negative_refspec(struct refspec *rs, struct refspec_item *query) +{ + int i, matched_negative = 0; + int find_src = !query->src; + struct string_list reversed = STRING_LIST_INIT_NODUP; + const char *needle = find_src ? query->dst : query->src; + + /* + * Check whether the queried ref matches any negative refpsec. If so, + * then we should ultimately treat this as not matching the query at + * all. + * + * Note that negative refspecs always match the source, but the query + * item uses the destination. To handle this, we apply pattern + * refspecs in reverse to figure out if the query source matches any + * of the negative refspecs. + */ + for (i = 0; i < rs->nr; i++) { + struct refspec_item *refspec = &rs->items[i]; + char *expn_name; + + if (refspec->negative) + continue; + + /* Note the reversal of src and dst */ + if (refspec->pattern) { + const char *key = refspec->dst ? refspec->dst : refspec->src; + const char *value = refspec->src; + + if (match_name_with_pattern(key, needle, value, &expn_name)) + string_list_append_nodup(&reversed, expn_name); + } else { + if (!strcmp(needle, refspec->src)) + string_list_append(&reversed, refspec->src); + } + } + + for (i = 0; !matched_negative && i < reversed.nr; i++) { + if (omit_name_by_refspec(reversed.items[i].string, rs)) + matched_negative = 1; + } + + string_list_clear(&reversed, 0); + + return matched_negative; +} + static void query_refspecs_multiple(struct refspec *rs, struct refspec_item *query, struct string_list *results) @@ -710,6 +777,9 @@ static void query_refspecs_multiple(struct refspec *rs, if (find_src && !query->dst) BUG("query_refspecs_multiple: need either src or dst"); + if (query_matches_negative_refspec(rs, query)) + return; + for (i = 0; i < rs->nr; i++) { struct refspec_item *refspec = &rs->items[i]; const char *key = find_src ? refspec->dst : refspec->src; @@ -717,7 +787,7 @@ static void query_refspecs_multiple(struct refspec *rs, const char *needle = find_src ? query->dst : query->src; char **result = find_src ? &query->src : &query->dst; - if (!refspec->dst) + if (!refspec->dst || refspec->negative) continue; if (refspec->pattern) { if (match_name_with_pattern(key, needle, value, result)) @@ -738,12 +808,15 @@ int query_refspecs(struct refspec *rs, struct refspec_item *query) if (find_src && !query->dst) BUG("query_refspecs: need either src or dst"); + if (query_matches_negative_refspec(rs, query)) + return -1; + for (i = 0; i < rs->nr; i++) { struct refspec_item *refspec = &rs->items[i]; const char *key = find_src ? refspec->dst : refspec->src; const char *value = find_src ? refspec->src : refspec->dst; - if (!refspec->dst) + if (!refspec->dst || refspec->negative) continue; if (refspec->pattern) { if (match_name_with_pattern(key, needle, value, result)) { @@ -1072,7 +1145,7 @@ static int match_explicit(struct ref *src, struct ref *dst, const char *dst_value = rs->dst; char *dst_guess; - if (rs->pattern || rs->matching) + if (rs->pattern || rs->matching || rs->negative) return 0; matched_src = matched_dst = NULL; @@ -1148,6 +1221,10 @@ static char *get_ref_match(const struct refspec *rs, const struct ref *ref, int matching_refs = -1; for (i = 0; i < rs->nr; i++) { const struct refspec_item *item = &rs->items[i]; + + if (item->negative) + continue; + if (item->matching && (matching_refs == -1 || item->force)) { matching_refs = i; @@ -1353,7 +1430,7 @@ int check_push_refs(struct ref *src, struct refspec *rs) for (i = 0; i < rs->nr; i++) { struct refspec_item *item = &rs->items[i]; - if (item->pattern || item->matching) + if (item->pattern || item->matching || item->negative) continue; ret |= match_explicit_lhs(src, item, NULL, NULL); @@ -1455,6 +1532,8 @@ int match_push_refs(struct ref *src, struct ref **dst, string_list_clear(&src_ref_index, 0); } + *dst = apply_negative_refspecs(*dst, rs); + if (errs) return -1; return 0; @@ -1572,7 +1651,7 @@ static void set_merge(struct branch *ret) strcmp(ret->remote_name, ".")) continue; if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]), - &oid, &ref) == 1) + &oid, &ref, 0) == 1) ret->merge[i]->dst = ref; else ret->merge[i]->dst = xstrdup(ret->merge_name[i]); @@ -1587,7 +1666,7 @@ struct branch *branch_get(const char *name) if (!name || !*name || !strcmp(name, "HEAD")) ret = current_branch; else - ret = make_branch(name, 0); + ret = make_branch(name, strlen(name)); set_merge(ret); return ret; } @@ -1824,6 +1903,9 @@ int get_fetch_map(const struct ref *remote_refs, { struct ref *ref_map, **rmp; + if (refspec->negative) + return 0; + if (refspec->pattern) { ref_map = get_expanded_map(remote_refs, refspec); } else { @@ -1899,7 +1981,7 @@ static int stat_branch_pair(const char *branch_name, const char *base, struct object_id oid; struct commit *ours, *theirs; struct rev_info revs; - struct argv_array argv = ARGV_ARRAY_INIT; + struct strvec argv = STRVEC_INIT; /* Cannot stat if what we used to build on no longer exists */ if (read_ref(base, &oid)) @@ -1925,15 +2007,15 @@ static int stat_branch_pair(const char *branch_name, const char *base, BUG("stat_branch_pair: invalid abf '%d'", abf); /* Run "rev-list --left-right ours...theirs" internally... */ - argv_array_push(&argv, ""); /* ignored */ - argv_array_push(&argv, "--left-right"); - argv_array_pushf(&argv, "%s...%s", - oid_to_hex(&ours->object.oid), - oid_to_hex(&theirs->object.oid)); - argv_array_push(&argv, "--"); + strvec_push(&argv, ""); /* ignored */ + strvec_push(&argv, "--left-right"); + strvec_pushf(&argv, "%s...%s", + oid_to_hex(&ours->object.oid), + oid_to_hex(&theirs->object.oid)); + strvec_push(&argv, "--"); repo_init_revisions(the_repository, &revs, NULL); - setup_revisions(argv.argc, argv.argv, &revs, NULL); + setup_revisions(argv.nr, argv.v, &revs, NULL); if (prepare_revision_walk(&revs)) die(_("revision walk setup failed")); @@ -1952,7 +2034,7 @@ static int stat_branch_pair(const char *branch_name, const char *base, clear_commit_marks(ours, ALL_REV_FLAGS); clear_commit_marks(theirs, ALL_REV_FLAGS); - argv_array_clear(&argv); + strvec_clear(&argv); return 1; } @@ -2111,8 +2193,16 @@ struct ref *guess_remote_head(const struct ref *head, if (head->symref) return copy_ref(find_ref_by_name(refs, head->symref)); - /* If refs/heads/master could be right, it is. */ + /* If a remote branch exists with the default branch name, let's use it. */ if (!all) { + char *ref = xstrfmt("refs/heads/%s", git_default_branch_name()); + + r = find_ref_by_name(refs, ref); + free(ref); + if (r && oideq(&r->old_oid, &head->old_oid)) + return copy_ref(r); + + /* Fall back to the hard-coded historical default */ r = find_ref_by_name(refs, "refs/heads/master"); if (r && oideq(&r->old_oid, &head->old_oid)) return copy_ref(r); diff --git a/third_party/git/remote.h b/third_party/git/remote.h index 83e885672b..d0e3f51574 100644 --- a/third_party/git/remote.h +++ b/third_party/git/remote.h @@ -6,6 +6,14 @@ #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, @@ -14,18 +22,24 @@ enum { }; struct remote { - struct hashmap_entry ent; /* must be first */ + struct hashmap_entry ent; + /* 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; @@ -34,36 +48,59 @@ 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; - /* - * for curl remotes only - */ + /* The proxy to use for curl (http, https, ftp, etc.) URLs. */ 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); +struct ref_push_report { + const char *ref_name; + struct object_id *old_oid; + struct object_id *new_oid; + unsigned int forced_update:1; + struct ref_push_report *next; +}; + struct ref { struct ref *next; struct object_id old_oid; @@ -111,6 +148,7 @@ struct ref { REF_STATUS_ATOMIC_PUSH_FAILED } status; char *remote_status; + struct ref_push_report *report; struct ref *peer_ref; /* when renaming */ char name[FLEX_ARRAY]; /* more */ }; @@ -139,7 +177,7 @@ void free_refs(struct ref *ref); struct oid_array; struct packet_reader; -struct argv_array; +struct strvec; struct string_list; struct ref **get_remote_heads(struct packet_reader *reader, struct ref **list, unsigned int flags, @@ -149,8 +187,9 @@ struct ref **get_remote_heads(struct packet_reader *reader, /* Used for protocol v2 in order to retrieve refs from a remote */ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader, struct ref **list, int for_push, - const struct argv_array *ref_prefixes, - const struct string_list *server_options); + const struct strvec *ref_prefixes, + const struct string_list *server_options, + int stateless_rpc); int resolve_remote_symref(struct ref *ref, struct ref *list); @@ -163,6 +202,12 @@ int resolve_remote_symref(struct ref *ref, struct ref *list); */ struct ref *ref_remove_duplicates(struct ref *ref_map); +/* + * Remove all entries in the input list which match any negative refspec in + * the refspec list. + */ +struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs); + int query_refspecs(struct refspec *rs, struct refspec_item *query); char *apply_refspecs(struct refspec *rs, const char *name); @@ -175,7 +220,8 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror, /* * Given a list of the remote refs and the specification of things to * fetch, makes a (separate) list of the refs to fetch and the local - * refs to store into. + * refs to store into. Note that negative refspecs are ignored here, and + * should be handled separately. * * *tail is the pointer to the tail pointer of the list of results * beforehand, and will be set to the tail pointer of the list of @@ -194,16 +240,36 @@ 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; @@ -212,10 +278,11 @@ 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, - int *explicit); +const char *remote_ref_for_branch(struct branch *branch, int for_push); +/* 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 e295e87943..7bd9aba6ee 100644 --- a/third_party/git/replace-object.c +++ b/third_party/git/replace-object.c @@ -34,14 +34,23 @@ static int register_replace_ref(struct repository *r, void prepare_replace_object(struct repository *r) { - if (r->objects->replace_map) + if (r->objects->replace_map_initialized) 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 04ed7a85a2..3fbc32eb7b 100644 --- a/third_party/git/replace-object.h +++ b/third_party/git/replace-object.h @@ -24,12 +24,17 @@ 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 && + (r->objects->replace_map_initialized && 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 new file mode 100644 index 0000000000..88ccce2036 --- /dev/null +++ b/third_party/git/repo-settings.c @@ -0,0 +1,74 @@ +#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, "commitgraph.readchangedpaths", &value)) + r->settings.commit_graph_read_changed_paths = 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.commit_graph_read_changed_paths, 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 if (!strcasecmp(strval, "noop")) + r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_NOOP; + else + r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT; + } + + if (!repo_config_get_bool(r, "pack.usesparse", &value)) + r->settings.pack_use_sparse = value; + UPDATE_DEFAULT_BOOL(r->settings.pack_use_sparse, 1); + + 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; + UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 0); + + if (!repo_config_get_bool(r, "feature.experimental", &value) && value) + UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING); + + /* 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 682c239fe3..a4174ddb06 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 initilization fails then it may be due to the submodule + * If initialization fails then it may be due to the submodule * not being populated in the superproject's worktree. Instead - * we can try to initilize the submodule by finding it's gitdir + * we can try to initialize 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 4fb6a5885f..bacf843d46 100644 --- a/third_party/git/repository.h +++ b/third_party/git/repository.h @@ -11,6 +11,36 @@ 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, + FETCH_NEGOTIATION_NOOP = 3, +}; + +struct repo_settings { + int initialized; + + int core_commit_graph; + int commit_graph_read_changed_paths; + 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 */ /* @@ -39,8 +69,12 @@ struct repository { */ struct parsed_object_pool *parsed_objects; - /* The store in which the refs are held. */ - struct ref_store *refs; + /* + * The store in which the refs are held. This should generally only be + * accessed via get_main_ref_store(), as that will lazily initialize + * the ref object. + */ + struct ref_store *refs_private; /* * Contains path to often used file names. @@ -72,6 +106,8 @@ struct repository { */ char *submodule_prefix; + struct repo_settings settings; + /* Subsystems */ /* * Repository's config which contains key-value pairs from the usual @@ -95,6 +131,9 @@ 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' */ @@ -139,7 +178,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 occured. If the repository's index has already been + * than zero if an error occurred. 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); @@ -157,5 +196,12 @@ 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); + +/* + * Return 1 if upgrade repository format to target_version succeeded, + * 0 if no upgrade is necessary, and -1 when upgrade is not possible. + */ +int upgrade_repository_format(int target_version); #endif /* REPOSITORY_H */ diff --git a/third_party/git/rerere.c b/third_party/git/rerere.c index 17abb47321..9281131a9f 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 sha1_to_hex(id->collection->hash); + return hash_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", sha1_to_hex(rr_dir->hash))); + DIR *dir = opendir(git_path("rr-cache/%s", hash_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 *sha1) +static struct rerere_id *new_rerere_id(unsigned char *hash) { - return new_rerere_id_hex(sha1_to_hex(sha1)); + return new_rerere_id_hex(hash_to_hex(hash)); } /* @@ -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 occured. + * hunks and -1 if an error occurred. */ static int handle_path(unsigned char *hash, struct rerere_io *io, int marker_size) { diff --git a/third_party/git/reset.c b/third_party/git/reset.c new file mode 100644 index 0000000000..2f4fbd07c5 --- /dev/null +++ b/third_party/git/reset.c @@ -0,0 +1,141 @@ +#include "git-compat-util.h" +#include "cache-tree.h" +#include "lockfile.h" +#include "refs.h" +#include "reset.h" +#include "run-command.h" +#include "tree-walk.h" +#include "tree.h" +#include "unpack-trees.h" + +int reset_head(struct repository *r, struct object_id *oid, const char *action, + const char *switch_to_branch, unsigned flags, + const char *reflog_orig_head, const char *reflog_head, + const char *default_reflog_action) +{ + unsigned detach_head = flags & RESET_HEAD_DETACH; + unsigned reset_hard = flags & RESET_HEAD_HARD; + unsigned run_hook = flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK; + unsigned refs_only = flags & RESET_HEAD_REFS_ONLY; + unsigned update_orig_head = flags & RESET_ORIG_HEAD; + struct object_id head_oid; + struct tree_desc desc[2] = { { NULL }, { NULL } }; + struct lock_file lock = LOCK_INIT; + struct unpack_trees_options unpack_tree_opts; + struct tree *tree; + const char *reflog_action; + struct strbuf msg = STRBUF_INIT; + size_t prefix_len; + struct object_id *orig = NULL, oid_orig, + *old_orig = NULL, oid_old_orig; + int ret = 0, nr = 0; + + if (switch_to_branch && !starts_with(switch_to_branch, "refs/")) + BUG("Not a fully qualified branch: '%s'", switch_to_branch); + + if (!refs_only && repo_hold_locked_index(r, &lock, LOCK_REPORT_ON_ERROR) < 0) { + ret = -1; + goto leave_reset_head; + } + + if ((!oid || !reset_hard) && get_oid("HEAD", &head_oid)) { + ret = error(_("could not determine HEAD revision")); + goto leave_reset_head; + } + + if (!oid) + oid = &head_oid; + + if (refs_only) + goto reset_head_refs; + + memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts)); + setup_unpack_trees_porcelain(&unpack_tree_opts, action); + unpack_tree_opts.head_idx = 1; + unpack_tree_opts.src_index = r->index; + unpack_tree_opts.dst_index = r->index; + unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge; + unpack_tree_opts.update = 1; + unpack_tree_opts.merge = 1; + init_checkout_metadata(&unpack_tree_opts.meta, switch_to_branch, oid, NULL); + if (!detach_head) + unpack_tree_opts.reset = 1; + + if (repo_read_index_unmerged(r) < 0) { + ret = error(_("could not read index")); + goto leave_reset_head; + } + + if (!reset_hard && !fill_tree_descriptor(r, &desc[nr++], &head_oid)) { + ret = error(_("failed to find tree of %s"), + oid_to_hex(&head_oid)); + goto leave_reset_head; + } + + if (!fill_tree_descriptor(r, &desc[nr++], oid)) { + ret = error(_("failed to find tree of %s"), oid_to_hex(oid)); + goto leave_reset_head; + } + + if (unpack_trees(nr, desc, &unpack_tree_opts)) { + ret = -1; + goto leave_reset_head; + } + + tree = parse_tree_indirect(oid); + prime_cache_tree(r, r->index, tree); + + if (write_locked_index(r->index, &lock, COMMIT_LOCK) < 0) { + ret = error(_("could not write index")); + goto leave_reset_head; + } + +reset_head_refs: + reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT); + strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : default_reflog_action); + prefix_len = msg.len; + + if (update_orig_head) { + if (!get_oid("ORIG_HEAD", &oid_old_orig)) + old_orig = &oid_old_orig; + if (!get_oid("HEAD", &oid_orig)) { + orig = &oid_orig; + if (!reflog_orig_head) { + strbuf_addstr(&msg, "updating ORIG_HEAD"); + reflog_orig_head = msg.buf; + } + update_ref(reflog_orig_head, "ORIG_HEAD", orig, + old_orig, 0, UPDATE_REFS_MSG_ON_ERR); + } else if (old_orig) + delete_ref(NULL, "ORIG_HEAD", old_orig, 0); + } + + if (!reflog_head) { + strbuf_setlen(&msg, prefix_len); + strbuf_addstr(&msg, "updating HEAD"); + reflog_head = msg.buf; + } + if (!switch_to_branch) + ret = update_ref(reflog_head, "HEAD", oid, orig, + detach_head ? REF_NO_DEREF : 0, + UPDATE_REFS_MSG_ON_ERR); + else { + ret = update_ref(reflog_head, switch_to_branch, oid, + NULL, 0, UPDATE_REFS_MSG_ON_ERR); + if (!ret) + ret = create_symref("HEAD", switch_to_branch, + reflog_head); + } + if (run_hook) + run_hook_le(NULL, "post-checkout", + oid_to_hex(orig ? orig : &null_oid), + oid_to_hex(oid), "1", NULL); + +leave_reset_head: + strbuf_release(&msg); + rollback_lock_file(&lock); + while (nr) + free((void *)desc[--nr].buffer); + return ret; + +} diff --git a/third_party/git/reset.h b/third_party/git/reset.h new file mode 100644 index 0000000000..12f83c78e2 --- /dev/null +++ b/third_party/git/reset.h @@ -0,0 +1,20 @@ +#ifndef RESET_H +#define RESET_H + +#include "hash.h" +#include "repository.h" + +#define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION" + +#define RESET_HEAD_DETACH (1<<0) +#define RESET_HEAD_HARD (1<<1) +#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2) +#define RESET_HEAD_REFS_ONLY (1<<3) +#define RESET_ORIG_HEAD (1<<4) + +int reset_head(struct repository *r, struct object_id *oid, const char *action, + const char *switch_to_branch, unsigned flags, + const char *reflog_orig_head, const char *reflog_head, + const char *default_reflog_action); + +#endif diff --git a/third_party/git/revision.c b/third_party/git/revision.c index 07412297f0..aa62212040 100644 --- a/third_party/git/revision.c +++ b/third_party/git/revision.c @@ -23,11 +23,14 @@ #include "bisect.h" #include "packfile.h" #include "worktree.h" -#include "argv-array.h" +#include "strvec.h" #include "commit-reach.h" #include "commit-graph.h" #include "prio-queue.h" #include "hashmap.h" +#include "utf8.h" +#include "bloom.h" +#include "json-writer.h" volatile show_early_output_fn_t show_early_output; @@ -36,6 +39,8 @@ static const char *term_good; implement_shared_commit_slab(revision_sources, char *); +static inline int want_ancestry(const struct rev_info *revs); + void show_object_with_name(FILE *out, struct object *obj, const char *name) { const char *p; @@ -107,30 +112,34 @@ struct path_and_oids_entry { }; static int path_and_oids_cmp(const void *hashmap_cmp_fn_data, - const struct path_and_oids_entry *e1, - const struct path_and_oids_entry *e2, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, 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, (hashmap_cmp_fn) path_and_oids_cmp, NULL, 0); + hashmap_init(map, 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); - while ((entry = (struct path_and_oids_entry *)hashmap_iter_next(&iter))) { + hashmap_for_each_entry(map, &iter, entry, ent /* member name */) { oidset_clear(&entry->trees); free(entry->path); } - hashmap_free(map, 1); + hashmap_free_entries(map, struct path_and_oids_entry, ent); } static void paths_and_oids_insert(struct hashmap *map, @@ -141,18 +150,19 @@ 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, hash); + hashmap_entry_init(&key.ent, hash); /* use a shallow copy for the lookup */ key.path = (char *)path; oidset_init(&key.trees, 0); - if (!(entry = (struct path_and_oids_entry *)hashmap_get(map, &key, NULL))) { + entry = hashmap_get_entry(map, &key, ent, NULL); + if (!entry) { entry = xcalloc(1, sizeof(struct path_and_oids_entry)); - hashmap_entry_init(entry, hash); + hashmap_entry_init(&entry->ent, hash); entry->path = xstrdup(key.path); oidset_init(&entry->trees, 16); - hashmap_put(map, entry); + hashmap_put(map, &entry->ent); } oidset_insert(&entry->trees, oid); @@ -235,8 +245,7 @@ void mark_trees_uninteresting_sparse(struct repository *r, add_children_by_path(r, tree, &map); } - hashmap_iter_init(&map, &map_iter); - while ((entry = hashmap_iter_next(&map_iter))) + hashmap_for_each_entry(&map, &map_iter, entry, ent /* member name */) mark_trees_uninteresting_sparse(r, &entry->trees); paths_and_oids_clear(&map); @@ -306,13 +315,14 @@ static void add_pending_object_with_path(struct rev_info *revs, const char *name, unsigned mode, const char *path) { + struct interpret_branch_name_options options = { 0 }; if (!obj) return; if (revs->no_walk && (obj->flags & UNINTERESTING)) revs->no_walk = 0; if (revs->reflog_info && obj->type == OBJ_COMMIT) { struct strbuf buf = STRBUF_INIT; - int len = interpret_branch_name(name, 0, &buf, 0); + int len = interpret_branch_name(name, 0, &buf, &options); if (0 < len && name[len] && buf.len) strbuf_addstr(&buf, name + len); @@ -404,9 +414,7 @@ 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); - if (!tag->tagged) - die("bad tag"); - object = parse_object(revs->repo, &tag->tagged->oid); + object = parse_object(revs->repo, get_tagged_oid(tag)); if (!object) { if (revs->ignore_missing_links || (flags & UNINTERESTING)) return NULL; @@ -432,7 +440,7 @@ static struct commit *handle_commit(struct rev_info *revs, if (object->type == OBJ_COMMIT) { struct commit *commit = (struct commit *)object; - if (parse_commit(commit) < 0) + if (repo_parse_commit(revs->repo, commit) < 0) die("unable to parse commit %s", name); if (flags & UNINTERESTING) { mark_parents_uninteresting(commit); @@ -621,11 +629,156 @@ static void file_change(struct diff_options *options, options->flags.has_changes = 1; } +static int bloom_filter_atexit_registered; +static unsigned int count_bloom_filter_maybe; +static unsigned int count_bloom_filter_definitely_not; +static unsigned int count_bloom_filter_false_positive; +static unsigned int count_bloom_filter_not_present; + +static void trace2_bloom_filter_statistics_atexit(void) +{ + struct json_writer jw = JSON_WRITER_INIT; + + jw_object_begin(&jw, 0); + jw_object_intmax(&jw, "filter_not_present", count_bloom_filter_not_present); + jw_object_intmax(&jw, "maybe", count_bloom_filter_maybe); + jw_object_intmax(&jw, "definitely_not", count_bloom_filter_definitely_not); + jw_object_intmax(&jw, "false_positive", count_bloom_filter_false_positive); + jw_end(&jw); + + trace2_data_json("bloom", the_repository, "statistics", &jw); + + jw_release(&jw); +} + +static int forbid_bloom_filters(struct pathspec *spec) +{ + if (spec->has_wildcard) + return 1; + if (spec->nr > 1) + return 1; + if (spec->magic & ~PATHSPEC_LITERAL) + return 1; + if (spec->nr && (spec->items[0].magic & ~PATHSPEC_LITERAL)) + return 1; + + return 0; +} + +static void prepare_to_use_bloom_filter(struct rev_info *revs) +{ + struct pathspec_item *pi; + char *path_alloc = NULL; + const char *path, *p; + size_t len; + int path_component_nr = 1; + + if (!revs->commits) + return; + + if (forbid_bloom_filters(&revs->prune_data)) + return; + + repo_parse_commit(revs->repo, revs->commits->item); + + revs->bloom_filter_settings = get_bloom_filter_settings(revs->repo); + if (!revs->bloom_filter_settings) + return; + + if (!revs->pruning.pathspec.nr) + return; + + pi = &revs->pruning.pathspec.items[0]; + + /* remove single trailing slash from path, if needed */ + if (pi->len > 0 && pi->match[pi->len - 1] == '/') { + path_alloc = xmemdupz(pi->match, pi->len - 1); + path = path_alloc; + } else + path = pi->match; + + len = strlen(path); + if (!len) { + revs->bloom_filter_settings = NULL; + free(path_alloc); + return; + } + + p = path; + while (*p) { + /* + * At this point, the path is normalized to use Unix-style + * path separators. This is required due to how the + * changed-path Bloom filters store the paths. + */ + if (*p == '/') + path_component_nr++; + p++; + } + + revs->bloom_keys_nr = path_component_nr; + ALLOC_ARRAY(revs->bloom_keys, revs->bloom_keys_nr); + + fill_bloom_key(path, len, &revs->bloom_keys[0], + revs->bloom_filter_settings); + path_component_nr = 1; + + p = path + len - 1; + while (p > path) { + if (*p == '/') + fill_bloom_key(path, p - path, + &revs->bloom_keys[path_component_nr++], + revs->bloom_filter_settings); + p--; + } + + if (trace2_is_enabled() && !bloom_filter_atexit_registered) { + atexit(trace2_bloom_filter_statistics_atexit); + bloom_filter_atexit_registered = 1; + } + + free(path_alloc); +} + +static int check_maybe_different_in_bloom_filter(struct rev_info *revs, + struct commit *commit) +{ + struct bloom_filter *filter; + int result = 1, j; + + if (!revs->repo->objects->commit_graph) + return -1; + + if (commit_graph_generation(commit) == GENERATION_NUMBER_INFINITY) + return -1; + + filter = get_bloom_filter(revs->repo, commit); + + if (!filter) { + count_bloom_filter_not_present++; + return -1; + } + + for (j = 0; result && j < revs->bloom_keys_nr; j++) { + result = bloom_filter_contains(filter, + &revs->bloom_keys[j], + revs->bloom_filter_settings); + } + + if (result) + count_bloom_filter_maybe++; + else + count_bloom_filter_definitely_not++; + + return result; +} + static int rev_compare_tree(struct rev_info *revs, - struct commit *parent, struct commit *commit) + struct commit *parent, struct commit *commit, int nth_parent) { struct tree *t1 = get_commit_tree(parent); struct tree *t2 = get_commit_tree(commit); + int bloom_ret = 1; if (!t1) return REV_TREE_NEW; @@ -650,17 +803,26 @@ static int rev_compare_tree(struct rev_info *revs, return REV_TREE_SAME; } + if (revs->bloom_keys_nr && !nth_parent) { + bloom_ret = check_maybe_different_in_bloom_filter(revs, commit); + + if (bloom_ret == 0) + return REV_TREE_SAME; + } + tree_difference = REV_TREE_SAME; revs->pruning.flags.has_changes = 0; - if (diff_tree_oid(&t1->object.oid, &t2->object.oid, "", - &revs->pruning) < 0) - return REV_TREE_DIFFERENT; + diff_tree_oid(&t1->object.oid, &t2->object.oid, "", &revs->pruning); + + if (!nth_parent) + if (bloom_ret == 1 && tree_difference == REV_TREE_SAME) + count_bloom_filter_false_positive++; + return tree_difference; } static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit) { - int retval; struct tree *t1 = get_commit_tree(commit); if (!t1) @@ -668,9 +830,9 @@ static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit) tree_difference = REV_TREE_SAME; revs->pruning.flags.has_changes = 0; - retval = diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning); + diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning); - return retval >= 0 && (tree_difference == REV_TREE_SAME); + return tree_difference == REV_TREE_SAME; } struct treesame_state { @@ -848,11 +1010,11 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) ts->treesame[0] = 1; } } - if (parse_commit(p) < 0) + if (repo_parse_commit(revs->repo, p) < 0) die("cannot simplify commit %s (because of %s)", oid_to_hex(&commit->object.oid), oid_to_hex(&p->object.oid)); - switch (rev_compare_tree(revs, p, commit)) { + switch (rev_compare_tree(revs, p, commit, nth_parent)) { case REV_TREE_SAME: if (!revs->simplify_history || !relevant_commit(p)) { /* Even if a merge with an uninteresting @@ -867,7 +1029,19 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) } parent->next = NULL; commit->parents = parent; - commit->object.flags |= TREESAME; + + /* + * A merge commit is a "diversion" if it is not + * TREESAME to its first parent but is TREESAME + * to a later parent. In the simplified history, + * we "divert" the history walk to the later + * parent. These commits are shown when "show_pulls" + * is enabled, so do not mark the object as + * TREESAME here. + */ + if (!revs->show_pulls || !nth_parent) + commit->object.flags |= TREESAME; + return; case REV_TREE_NEW: @@ -881,7 +1055,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) * IOW, we pretend this parent is a * "root" commit. */ - if (parse_commit(p) < 0) + if (repo_parse_commit(revs->repo, p) < 0) die("cannot simplify commit %s (invalid %s)", oid_to_hex(&commit->object.oid), oid_to_hex(&p->object.oid)); @@ -894,6 +1068,10 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) relevant_change = 1; else irrelevant_change = 1; + + if (!nth_parent) + commit->object.flags |= PULL_MERGE; + continue; } die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid)); @@ -945,7 +1123,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit, parent = parent->next; if (p) p->object.flags |= UNINTERESTING; - if (parse_commit_gently(p, 1) < 0) + if (repo_parse_commit_gently(revs->repo, p, 1) < 0) continue; if (p->parents) mark_parents_uninteresting(p); @@ -976,7 +1154,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit, struct commit *p = parent->item; int gently = revs->ignore_missing_links || revs->exclude_promisor_objects; - if (parse_commit_gently(p, gently) < 0) { + if (repo_parse_commit_gently(revs->repo, p, gently) < 0) { if (revs->exclude_promisor_objects && is_promisor_object(&p->object.oid)) { if (revs->first_parent_only) @@ -1250,7 +1428,8 @@ static int limit_list(struct rev_info *revs) continue; break; } - if (revs->min_age != -1 && (commit->date > revs->min_age)) + if (revs->min_age != -1 && (commit->date > revs->min_age) && + !revs->line_level_traverse) continue; date = commit->date; p = &commit_list_insert(commit, p)->next; @@ -1449,7 +1628,7 @@ static void add_other_reflogs_to_pending(struct all_refs_cb *cb) { struct worktree **worktrees, **p; - worktrees = get_worktrees(0); + worktrees = get_worktrees(); for (p = worktrees; *p; p++) { struct worktree *wt = *p; @@ -1537,7 +1716,7 @@ void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags) if (revs->single_worktree) return; - worktrees = get_worktrees(0); + worktrees = get_worktrees(); for (p = worktrees; *p; p++) { struct worktree *wt = *p; struct index_state istate = { NULL }; @@ -1634,7 +1813,7 @@ void repo_init_revisions(struct repository *r, revs->repo = r; revs->abbrev = DEFAULT_ABBREV; - revs->ignore_merges = 1; + revs->ignore_merges = -1; revs->simplify_history = 1; revs->pruning.repo = r; revs->pruning.flags.recursive = 1; @@ -1665,7 +1844,7 @@ void repo_init_revisions(struct repository *r, revs->diffopt.prefix_length = strlen(prefix); } - revs->notes_opt.use_default_notes = -1; + init_display_notes(&revs->notes_opt); } static void add_pending_commit_list(struct rev_info *revs, @@ -1836,7 +2015,7 @@ static int handle_dotdot(const char *arg, return ret; } -int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt) +static int handle_revision_arg_1(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt) { struct object_context oc; char *mark; @@ -1911,15 +2090,23 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi return 0; } +int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt) +{ + int ret = handle_revision_arg_1(arg, revs, flags, revarg_opt); + if (!ret) + revs->rev_input_given = 1; + return ret; +} + static void read_pathspec_from_stdin(struct strbuf *sb, - struct argv_array *prune) + struct strvec *prune) { while (strbuf_getline(sb, stdin) != EOF) - argv_array_push(prune, sb->buf); + strvec_push(prune, sb->buf); } static void read_revisions_from_stdin(struct rev_info *revs, - struct argv_array *prune) + struct strvec *prune) { struct strbuf sb; int seen_dashdash = 0; @@ -2063,7 +2250,6 @@ 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; @@ -2155,7 +2341,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if (!strcmp(arg, "--unpacked")) { revs->unpacked = 1; } else if (starts_with(arg, "--unpacked=")) { - die("--unpacked=<packfile> no longer supported."); + die(_("--unpacked=<packfile> no longer supported")); } else if (!strcmp(arg, "-r")) { revs->diff = 1; revs->diffopt.flags.recursive = 1; @@ -2164,7 +2350,22 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->diffopt.flags.recursive = 1; revs->diffopt.flags.tree_in_recursive = 1; } else if (!strcmp(arg, "-m")) { + /* + * To "diff-index", "-m" means "match missing", and to the "log" + * family of commands, it means "show full diff for merges". Set + * both fields appropriately. + */ revs->ignore_merges = 0; + revs->match_missing = 1; + } else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) { + if (!strcmp(optarg, "off")) { + revs->ignore_merges = 1; + } else { + die(_("unknown value for --diff-merges: %s"), optarg); + } + return argcount; + } else if (!strcmp(arg, "--no-diff-merges")) { + revs->ignore_merges = 1; } else if (!strcmp(arg, "-c")) { revs->diff = 1; revs->dense_combined_merges = 0; @@ -2201,9 +2402,8 @@ 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")) { - revs->show_notes = 1; + enable_default_display_notes(&revs->notes_opt, &revs->show_notes); 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")) { @@ -2218,25 +2418,14 @@ 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; - strbuf_addstr(&buf, optarg); - expand_notes_ref(&buf); - string_list_append(&revs->notes_opt.extra_notes_refs, - strbuf_detach(&buf, NULL)); + enable_ref_display_notes(&revs->notes_opt, &revs->show_notes, optarg); + revs->show_notes_given = 1; } else if (!strcmp(arg, "--no-notes")) { - revs->show_notes = 0; + disable_display_notes(&revs->notes_opt, &revs->show_notes); 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; @@ -2251,6 +2440,10 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->topo_order = 1; revs->rewrite_parents = 1; revs->graph = graph_init(revs); + } else if (!strcmp(arg, "--encode-email-headers")) { + revs->encode_email_headers = 1; + } else if (!strcmp(arg, "--no-encode-email-headers")) { + revs->encode_email_headers = 0; } else if (!strcmp(arg, "--root")) { revs->show_root_diff = 1; } else if (!strcmp(arg, "--no-commit-id")) { @@ -2275,6 +2468,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if (!strcmp(arg, "--full-diff")) { revs->diff = 1; revs->full_diff = 1; + } else if (!strcmp(arg, "--show-pulls")) { + revs->show_pulls = 1; } else if (!strcmp(arg, "--full-history")) { revs->simplify_history = 0; } else if (!strcmp(arg, "--relative-date")) { @@ -2385,8 +2580,8 @@ static int for_each_good_bisect_ref(struct ref_store *refs, each_ref_fn fn, void } static int handle_revision_pseudo_opt(const char *submodule, - struct rev_info *revs, - int argc, const char **argv, int *flags) + struct rev_info *revs, + const char **argv, int *flags) { const char *arg = argv[0]; const char *optarg; @@ -2520,9 +2715,10 @@ static void NORETURN diagnose_missing_default(const char *def) */ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt) { - int i, flags, left, seen_dashdash, got_rev_arg = 0, revarg_opt; - struct argv_array prune_data = ARGV_ARRAY_INIT; + int i, flags, left, seen_dashdash, revarg_opt; + struct strvec prune_data = STRVEC_INIT; const char *submodule = NULL; + int seen_end_of_options = 0; if (opt) submodule = opt->submodule; @@ -2539,7 +2735,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s argv[i] = NULL; argc = i; if (argv[i + 1]) - argv_array_pushv(&prune_data, argv + i + 1); + strvec_pushv(&prune_data, argv + i + 1); seen_dashdash = 1; break; } @@ -2552,11 +2748,11 @@ 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 (*arg == '-') { + if (!seen_end_of_options && *arg == '-') { int opts; opts = handle_revision_pseudo_opt(submodule, - revs, argc - i, argv + i, + revs, argv + i, &flags); if (opts > 0) { i += opts - 1; @@ -2574,6 +2770,11 @@ 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) { @@ -2600,14 +2801,12 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s for (j = i; j < argc; j++) verify_filename(revs->prefix, argv[j], j == i); - argv_array_pushv(&prune_data, argv + i); + strvec_pushv(&prune_data, argv + i); break; } - else - got_rev_arg = 1; } - if (prune_data.argc) { + if (prune_data.nr) { /* * If we need to introduce the magic "a lone ':' means no * pathspec whatsoever", here is the place to do so. @@ -2623,9 +2822,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s * } */ parse_pathspec(&revs->prune_data, 0, 0, - revs->prefix, prune_data.argv); + revs->prefix, prune_data.v); } - argv_array_clear(&prune_data); + strvec_clear(&prune_data); if (revs->def == NULL) revs->def = opt ? opt->def : NULL; @@ -2633,7 +2832,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s opt->tweak(revs, opt); if (revs->show_merge) prepare_show_merge(revs); - if (revs->def && !revs->pending.nr && !revs->rev_input_given && !got_rev_arg) { + if (revs->def && !revs->pending.nr && !revs->rev_input_given) { struct object_id oid; struct object *object; struct object_context oc; @@ -2656,6 +2855,12 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s if (revs->diffopt.objfind) revs->simplify_history = 0; + if (revs->line_level_traverse) { + if (want_ancestry(revs)) + revs->limited = 1; + revs->topo_order = 1; + } + if (revs->topo_order && !generation_numbers_enabled(the_repository)) revs->limited = 1; @@ -2668,22 +2873,21 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s copy_pathspec(&revs->diffopt.pathspec, &revs->prune_data); } - if (revs->combine_merges) + if (revs->combine_merges && revs->ignore_merges < 0) revs->ignore_merges = 0; + if (revs->ignore_merges < 0) + revs->ignore_merges = 1; if (revs->combined_all_paths && !revs->combine_merges) die("--combined-all-paths makes no sense without -c or --cc"); revs->diffopt.abbrev = revs->abbrev; - if (revs->line_level_traverse) { - revs->limited = 1; - revs->topo_order = 1; - } - diff_setup_done(&revs->diffopt); 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) @@ -2706,9 +2910,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s if (!revs->reflog_info && revs->grep_filter.use_reflog_filter) die("cannot use --grep-reflog without --walk-reflogs"); - if (revs->first_parent_only && revs->bisect) - die(_("--first-parent is incompatible with --bisect")); - if (revs->line_level_traverse && (revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT))) die(_("-L does not yet support diff formats besides -p and -s")); @@ -3021,7 +3222,8 @@ static struct commit_list **simplify_one(struct rev_info *revs, struct commit *c if (!cnt || (commit->object.flags & UNINTERESTING) || !(commit->object.flags & TREESAME) || - (parent = one_relevant_parent(revs, commit->parents)) == NULL) + (parent = one_relevant_parent(revs, commit->parents)) == NULL || + (revs->show_pulls && (commit->object.flags & PULL_MERGE))) st->simplified = commit; else { pst = locate_simplify_state(revs, parent); @@ -3088,7 +3290,7 @@ static void set_children(struct rev_info *revs) void reset_revision_walk(void) { - clear_object_flags(SEEN | ADDED | SHOWN); + clear_object_flags(SEEN | ADDED | SHOWN | TOPO_WALK_EXPLORED | TOPO_WALK_INDEGREE); } static int mark_uninteresting(const struct object_id *oid, @@ -3132,7 +3334,7 @@ static void explore_walk_step(struct rev_info *revs) if (!c) return; - if (parse_commit_gently(c, 1) < 0) + if (repo_parse_commit_gently(revs->repo, c, 1) < 0) return; if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE) @@ -3157,7 +3359,7 @@ static void explore_to_depth(struct rev_info *revs, struct topo_walk_info *info = revs->topo_walk_info; struct commit *c; while ((c = prio_queue_peek(&info->explore_queue)) && - c->generation >= gen_cutoff) + commit_graph_generation(c) >= gen_cutoff) explore_walk_step(revs); } @@ -3170,10 +3372,10 @@ static void indegree_walk_step(struct rev_info *revs) if (!c) return; - if (parse_commit_gently(c, 1) < 0) + if (repo_parse_commit_gently(revs->repo, c, 1) < 0) return; - explore_to_depth(revs, c->generation); + explore_to_depth(revs, commit_graph_generation(c)); for (p = c->parents; p; p = p->next) { struct commit *parent = p->item; @@ -3197,14 +3399,30 @@ static void compute_indegrees_to_depth(struct rev_info *revs, struct topo_walk_info *info = revs->topo_walk_info; struct commit *c; while ((c = prio_queue_peek(&info->indegree_queue)) && - c->generation >= gen_cutoff) + commit_graph_generation(c) >= gen_cutoff) 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)); @@ -3234,15 +3452,17 @@ static void init_topo_walk(struct rev_info *revs) info->min_generation = GENERATION_NUMBER_INFINITY; for (list = revs->commits; list; list = list->next) { struct commit *c = list->item; + uint32_t generation; - if (parse_commit_gently(c, 1)) + if (repo_parse_commit_gently(revs->repo, c, 1)) continue; test_flag_and_insert(&info->explore_queue, c, TOPO_WALK_EXPLORED); test_flag_and_insert(&info->indegree_queue, c, TOPO_WALK_INDEGREE); - if (c->generation < info->min_generation) - info->min_generation = c->generation; + generation = commit_graph_generation(c); + if (generation < info->min_generation) + info->min_generation = generation; *(indegree_slab_at(&info->indegree, c)) = 1; @@ -3293,15 +3513,17 @@ static void expand_topo_walk(struct rev_info *revs, struct commit *commit) for (p = commit->parents; p; p = p->next) { struct commit *parent = p->item; int *pi; + uint32_t generation; if (parent->object.flags & UNINTERESTING) continue; - if (parse_commit_gently(parent, 1) < 0) + if (repo_parse_commit_gently(revs->repo, parent, 1) < 0) continue; - if (parent->generation < info->min_generation) { - info->min_generation = parent->generation; + generation = commit_graph_generation(parent); + if (generation < info->min_generation) { + info->min_generation = generation; compute_indegrees_to_depth(revs, info->min_generation); } @@ -3348,6 +3570,8 @@ int prepare_revision_walk(struct rev_info *revs) FOR_EACH_OBJECT_PROMISOR_ONLY); } + if (!revs->reflog_info) + prepare_to_use_bloom_filter(revs); if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED) commit_list_sort_by_date(&revs->commits); if (revs->no_walk) @@ -3359,12 +3583,20 @@ int prepare_revision_walk(struct rev_info *revs) sort_in_topological_order(&revs->commits, revs->sort_order); } else if (revs->topo_order) init_topo_walk(revs); - if (revs->line_level_traverse) + if (revs->line_level_traverse && want_ancestry(revs)) + /* + * At the moment we can only do line-level log with parent + * rewriting by performing this expensive pre-filtering step. + * If parent rewriting is not requested, then we rather + * perform the line-level log filtering during the regular + * history traversal. + */ line_log_filter(revs); if (revs->simplify_merges) simplify_merges(revs); if (revs->children.name) set_children(revs); + return 0; } @@ -3569,6 +3801,22 @@ enum commit_action get_commit_action(struct rev_info *revs, struct commit *commi return commit_ignore; if (commit->object.flags & UNINTERESTING) return commit_ignore; + if (revs->line_level_traverse && !want_ancestry(revs)) { + /* + * In case of line-level log with parent rewriting + * prepare_revision_walk() already took care of all line-level + * log filtering, and there is nothing left to do here. + * + * If parent rewriting was not requested, then this is the + * place to perform the line-level log filtering. Notably, + * this check, though expensive, must come before the other, + * cheaper filtering conditions, because the tracked line + * ranges must be adjusted even when the commit will end up + * being ignored based on other conditions. + */ + if (!line_log_process_ranges_arbitrary_commit(revs, commit)) + return commit_ignore; + } if (revs->min_age != -1 && comparison_date(revs, commit) > revs->min_age) return commit_ignore; @@ -3588,6 +3836,10 @@ enum commit_action get_commit_action(struct rev_info *revs, struct commit *commi /* drop merges unless we want parenthood */ if (!want_ancestry(revs)) return commit_ignore; + + if (revs->show_pulls && (commit->object.flags & PULL_MERGE)) + return commit_show; + /* * If we want ancestry, then need to keep any merges * between relevant commits to tie together topology. @@ -3934,7 +4186,7 @@ struct commit *get_revision(struct rev_info *revs) return c; } -char *get_revision_mark(const struct rev_info *revs, const struct commit *commit) +const char *get_revision_mark(const struct rev_info *revs, const struct commit *commit) { if (commit->object.flags & BOUNDARY) return "-"; @@ -3956,7 +4208,7 @@ 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) { - char *mark = get_revision_mark(revs, commit); + const 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 4134dc6029..f6bf860d19 100644 --- a/third_party/git/revision.h +++ b/third_party/git/revision.h @@ -9,6 +9,19 @@ #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) @@ -21,6 +34,13 @@ #define SYMMETRIC_LEFT (1u<<8) #define PATCHSAME (1u<<9) #define BOTTOM (1u<<10) + +/* WARNING: This is also used as REACHABLE in commit-graph.c. */ +#define PULL_MERGE (1u<<15) + +#define TOPO_WALK_EXPLORED (1u<<23) +#define TOPO_WALK_INDEGREE (1u<<24) + /* * Indicates object was reached by traversal. i.e. not given by user on * command-line or stdin. @@ -30,10 +50,7 @@ */ #define NOT_USER_GIVEN (1u<<25) #define TRACK_LINEAR (1u<<26) -#define ALL_REV_FLAGS (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR) - -#define TOPO_WALK_EXPLORED (1u<<27) -#define TOPO_WALK_INDEGREE (1u<<28) +#define ALL_REV_FLAGS (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR | PULL_MERGE) #define DECORATE_SHORT_REFS 1 #define DECORATE_FULL_REFS 2 @@ -43,6 +60,8 @@ struct repository; struct rev_info; struct string_list; struct saved_parents; +struct bloom_key; +struct bloom_filter_settings; define_shared_commit_slab(revision_sources, char *); struct rev_cmdline_info { @@ -116,6 +135,7 @@ struct rev_info { no_walk:2, remove_empty_trees:1, simplify_history:1, + show_pulls:1, topo_order:1, simplify_merges:1, simplify_by_decoration:1, @@ -168,19 +188,20 @@ struct rev_info { unsigned int diff:1, full_diff:1, show_root_diff:1, + match_missing:1, no_commit_id:1, verbose_header:1, - ignore_merges:1, combine_merges:1, combined_all_paths:1, dense_combined_merges:1, always_show_header:1; + int ignore_merges:2; /* 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, @@ -190,7 +211,8 @@ struct rev_info { use_terminator:1, missing_newline:1, date_mode_explicit:1, - preserve_subject:1; + preserve_subject:1, + encode_email_headers:1; unsigned int disable_stdin:1; /* --show-linear-break */ unsigned int track_linear:1, @@ -278,6 +300,17 @@ struct rev_info { struct revision_sources *sources; struct topo_walk_info *topo_walk_info; + + /* Commit graph bloom filter fields */ + /* The bloom filter key(s) for the pathspec */ + struct bloom_key *bloom_keys; + int bloom_keys_nr; + + /* + * The bloom filter settings used to generate the key. + * This is loaded from the commit-graph being used. + */ + struct bloom_filter_settings *bloom_filter_settings; }; int ref_excluded(struct string_list *, const char *path); @@ -306,11 +339,29 @@ 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[]); @@ -319,11 +370,28 @@ 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); -char *get_revision_mark(const struct rev_info *revs, - const struct commit *commit); + +const 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); @@ -333,8 +401,19 @@ 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 3449db319b..2ee59acdc8 100644 --- a/third_party/git/run-command.c +++ b/third_party/git/run-command.c @@ -2,7 +2,7 @@ #include "run-command.h" #include "exec-cmd.h" #include "sigchain.h" -#include "argv-array.h" +#include "strvec.h" #include "thread-utils.h" #include "strbuf.h" #include "string-list.h" @@ -11,14 +11,14 @@ void child_process_init(struct child_process *child) { memset(child, 0, sizeof(*child)); - argv_array_init(&child->args); - argv_array_init(&child->env_array); + strvec_init(&child->args); + strvec_init(&child->env_array); } void child_process_clear(struct child_process *child) { - argv_array_clear(&child->args); - argv_array_clear(&child->env_array); + strvec_clear(&child->args); + strvec_clear(&child->env_array); } struct child_to_clean { @@ -213,8 +213,9 @@ 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 r != NULL; + return found; } int sane_execvp(const char *file, char * const argv[]) @@ -262,31 +263,31 @@ int sane_execvp(const char *file, char * const argv[]) return -1; } -static const char **prepare_shell_cmd(struct argv_array *out, const char **argv) +static const char **prepare_shell_cmd(struct strvec *out, const char **argv) { if (!argv[0]) BUG("shell command is empty"); if (strcspn(argv[0], "|&;<>()$`\\\"' \t\n*?[#~=%") != strlen(argv[0])) { #ifndef GIT_WINDOWS_NATIVE - argv_array_push(out, SHELL_PATH); + strvec_push(out, SHELL_PATH); #else - argv_array_push(out, "sh"); + strvec_push(out, "sh"); #endif - argv_array_push(out, "-c"); + strvec_push(out, "-c"); /* * If we have no extra arguments, we do not even need to * bother with the "$@" magic. */ if (!argv[1]) - argv_array_push(out, argv[0]); + strvec_push(out, argv[0]); else - argv_array_pushf(out, "%s \"$@\"", argv[0]); + strvec_pushf(out, "%s \"$@\"", argv[0]); } - argv_array_pushv(out, argv); - return out->argv; + strvec_pushv(out, argv); + return out->v; } #ifndef GIT_WINDOWS_NATIVE @@ -400,7 +401,7 @@ static void child_err_spew(struct child_process *cmd, struct child_err *cerr) set_error_routine(old_errfn); } -static int prepare_cmd(struct argv_array *out, const struct child_process *cmd) +static int prepare_cmd(struct strvec *out, const struct child_process *cmd) { if (!cmd->argv[0]) BUG("command is empty"); @@ -409,30 +410,29 @@ static int prepare_cmd(struct argv_array *out, const struct child_process *cmd) * Add SHELL_PATH so in the event exec fails with ENOEXEC we can * attempt to interpret the command with 'sh'. */ - argv_array_push(out, SHELL_PATH); + strvec_push(out, SHELL_PATH); if (cmd->git_cmd) { - argv_array_push(out, "git"); - argv_array_pushv(out, cmd->argv); + prepare_git_cmd(out, cmd->argv); } else if (cmd->use_shell) { prepare_shell_cmd(out, cmd->argv); } else { - argv_array_pushv(out, cmd->argv); + strvec_pushv(out, cmd->argv); } /* - * If there are no '/' characters in the command then perform a path - * lookup and use the resolved path as the command to exec. If there - * are '/' characters, we have exec attempt to invoke the command - * directly. + * If there are no dir separator characters in the command then perform + * a path lookup and use the resolved path as the command to exec. If + * there are dir separator characters, we have exec attempt to invoke + * the command directly. */ - if (!strchr(out->argv[1], '/')) { - char *program = locate_in_PATH(out->argv[1]); + if (!has_dir_sep(out->v[1])) { + char *program = locate_in_PATH(out->v[1]); if (program) { - free((char *)out->argv[1]); - out->argv[1] = program; + free((char *)out->v[1]); + out->v[1] = program; } else { - argv_array_clear(out); + strvec_clear(out); errno = ENOENT; return -1; } @@ -672,9 +672,9 @@ int start_command(struct child_process *cmd) char *str; if (!cmd->argv) - cmd->argv = cmd->args.argv; + cmd->argv = cmd->args.v; if (!cmd->env) - cmd->env = cmd->env_array.argv; + cmd->env = cmd->env_array.v; /* * In case of errors we must keep the promise to close FDs @@ -742,7 +742,7 @@ fail_pipe: int notify_pipe[2]; int null_fd = -1; char **childenv; - struct argv_array argv = ARGV_ARRAY_INIT; + struct strvec argv = STRVEC_INIT; struct child_err cerr; struct atfork_state as; @@ -846,10 +846,10 @@ fail_pipe: * be used in the event exec failed with ENOEXEC at which point * we will try to interpret the command using 'sh'. */ - execve(argv.argv[1], (char *const *) argv.argv + 1, + execve(argv.v[1], (char *const *) argv.v + 1, (char *const *) childenv); if (errno == ENOEXEC) - execve(argv.argv[0], (char *const *) argv.argv, + execve(argv.v[0], (char *const *) argv.v, (char *const *) childenv); if (errno == ENOENT) { @@ -888,7 +888,7 @@ fail_pipe: if (null_fd >= 0) close(null_fd); - argv_array_clear(&argv); + strvec_clear(&argv); free(childenv); } end_of_spawn: @@ -897,7 +897,7 @@ end_of_spawn: { int fhin = 0, fhout = 1, fherr = 2; const char **sargv = cmd->argv; - struct argv_array nargv = ARGV_ARRAY_INIT; + struct strvec nargv = STRVEC_INIT; if (cmd->no_stdin) fhin = open("/dev/null", O_RDWR); @@ -935,7 +935,7 @@ end_of_spawn: if (cmd->clean_on_exit && cmd->pid >= 0) mark_child_for_cleanup(cmd->pid, cmd); - argv_array_clear(&nargv); + strvec_clear(&nargv); cmd->argv = sargv; if (fhin != 0) close(fhin); @@ -1039,6 +1039,7 @@ int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir, cmd.silent_exec_failure = opt & RUN_SILENT_EXEC_FAILURE ? 1 : 0; cmd.use_shell = opt & RUN_USING_SHELL ? 1 : 0; cmd.clean_on_exit = opt & RUN_CLEAN_ON_EXIT ? 1 : 0; + cmd.wait_after_clean = opt & RUN_WAIT_AFTER_CLEAN ? 1 : 0; cmd.dir = dir; cmd.env = env; cmd.trace2_child_class = tr2_class; @@ -1351,9 +1352,9 @@ int run_hook_ve(const char *const *env, const char *name, va_list args) if (!p) return 0; - argv_array_push(&hook.args, p); + strvec_push(&hook.args, p); while ((p = va_arg(args, const char *))) - argv_array_push(&hook.args, p); + strvec_push(&hook.args, p); hook.env = env; hook.no_stdin = 1; hook.stdout_to_stderr = 1; @@ -1864,3 +1865,14 @@ int run_processes_parallel_tr2(int n, get_next_task_fn get_next_task, return result; } + +int run_auto_maintenance(int quiet) +{ + struct child_process maint = CHILD_PROCESS_INIT; + + maint.git_cmd = 1; + strvec_pushl(&maint.args, "maintenance", "run", "--auto", NULL); + strvec_push(&maint.args, quiet ? "--quiet" : "--no-quiet"); + + return run_command(&maint); +} diff --git a/third_party/git/run-command.h b/third_party/git/run-command.h index f769e03f01..6472b38bde 100644 --- a/third_party/git/run-command.h +++ b/third_party/git/run-command.h @@ -3,12 +3,64 @@ #include "thread-utils.h" -#include "argv-array.h" +#include "strvec.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 + * `strvec` (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; + + struct strvec args; + struct strvec env_array; pid_t pid; int trace2_child_id; @@ -18,8 +70,8 @@ struct child_process { /* * Using .in, .out, .err: - * - Specify 0 for no redirections (child inherits stdin, stdout, - * stderr from parent). + * - Specify 0 for no redirections. No new file descriptor is allocated. + * (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 @@ -37,13 +89,43 @@ 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 `strvec` (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; @@ -52,14 +134,64 @@ struct child_process { void *clean_on_exit_handler_cbdata; }; -#define CHILD_PROCESS_INIT { NULL, ARGV_ARRAY_INIT, ARGV_ARRAY_INIT } +#define CHILD_PROCESS_INIT { NULL, STRVEC_INIT, STRVEC_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 *); /* @@ -68,16 +200,48 @@ 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); +/* + * Trigger an auto-gc + */ +int run_auto_maintenance(int quiet); + #define RUN_COMMAND_NO_STDIN 1 #define RUN_GIT_CMD 2 /*If this is to be git sub-command */ #define RUN_COMMAND_STDOUT_TO_STDERR 4 #define RUN_SILENT_EXEC_FAILURE 8 #define RUN_USING_SHELL 16 #define RUN_CLEAN_ON_EXIT 32 +#define RUN_WAIT_AFTER_CLEAN 64 + +/** + * 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); /* @@ -125,15 +289,84 @@ 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 { - /* - * proc reads from in; closes it before return - * proc writes to out; closes it before return - * returns 0 on success, non-zero on failure + + /** + * 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. + * */ 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 @@ -146,8 +379,19 @@ 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 6dc16c3211..c9698070fc 100644 --- a/third_party/git/send-pack.c +++ b/third_party/git/send-pack.c @@ -12,9 +12,10 @@ #include "quote.h" #include "transport.h" #include "version.h" -#include "sha1-array.h" +#include "oid-array.h" #include "gpg-interface.h" #include "cache.h" +#include "shallow.h" int option_parse_push_signed(const struct option *opt, const char *arg, int unset) @@ -40,7 +41,10 @@ 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(oid)) + if (negative && + !has_object_file_with_flags(oid, + OBJECT_INFO_SKIP_FETCH_OBJECT | + OBJECT_INFO_QUICK)) return; if (negative) @@ -64,20 +68,20 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc int i; int rc; - argv_array_push(&po.args, "pack-objects"); - argv_array_push(&po.args, "--all-progress-implied"); - argv_array_push(&po.args, "--revs"); - argv_array_push(&po.args, "--stdout"); + strvec_push(&po.args, "pack-objects"); + strvec_push(&po.args, "--all-progress-implied"); + strvec_push(&po.args, "--revs"); + strvec_push(&po.args, "--stdout"); if (args->use_thin_pack) - argv_array_push(&po.args, "--thin"); + strvec_push(&po.args, "--thin"); if (args->use_ofs_delta) - argv_array_push(&po.args, "--delta-base-offset"); + strvec_push(&po.args, "--delta-base-offset"); if (args->quiet || !args->progress) - argv_array_push(&po.args, "-q"); + strvec_push(&po.args, "-q"); if (args->progress) - argv_array_push(&po.args, "--progress"); + strvec_push(&po.args, "--progress"); if (is_repository_shallow(the_repository)) - argv_array_push(&po.args, "--shallow"); + strvec_push(&po.args, "--shallow"); po.in = -1; po.out = args->stateless_rpc ? -1 : fd; po.git_cmd = 1; @@ -150,25 +154,79 @@ static int receive_status(struct packet_reader *reader, struct ref *refs) { struct ref *hint; int ret; + struct ref_push_report *report = NULL; + int new_report = 0; + int once = 0; hint = NULL; ret = receive_unpack_status(reader); while (1) { + struct object_id old_oid, new_oid; + const char *head; const char *refname; - char *msg; + char *p; if (packet_reader_read(reader) != PACKET_READ_NORMAL) break; - if (!starts_with(reader->line, "ok ") && !starts_with(reader->line, "ng ")) { - error("invalid ref status from remote: %s", reader->line); + head = reader->line; + p = strchr(head, ' '); + if (!p) { + error("invalid status line from remote: %s", reader->line); ret = -1; break; } + *p++ = '\0'; - refname = reader->line + 3; - msg = strchr(refname, ' '); - if (msg) - *msg++ = '\0'; + if (!strcmp(head, "option")) { + const char *key, *val; + if (!hint || !(report || new_report)) { + if (!once++) + error("'option' without a matching 'ok/ng' directive"); + ret = -1; + continue; + } + if (new_report) { + if (!hint->report) { + hint->report = xcalloc(1, sizeof(struct ref_push_report)); + report = hint->report; + } else { + report = hint->report; + while (report->next) + report = report->next; + report->next = xcalloc(1, sizeof(struct ref_push_report)); + report = report->next; + } + new_report = 0; + } + key = p; + p = strchr(key, ' '); + if (p) + *p++ = '\0'; + val = p; + if (!strcmp(key, "refname")) + report->ref_name = xstrdup_or_null(val); + else if (!strcmp(key, "old-oid") && val && + !parse_oid_hex(val, &old_oid, &val)) + report->old_oid = oiddup(&old_oid); + else if (!strcmp(key, "new-oid") && val && + !parse_oid_hex(val, &new_oid, &val)) + report->new_oid = oiddup(&new_oid); + else if (!strcmp(key, "forced-update")) + report->forced_update = 1; + continue; + } + + report = NULL; + new_report = 0; + if (strcmp(head, "ok") && strcmp(head, "ng")) { + error("invalid ref status from remote: %s", head); + ret = -1; + break; + } + refname = p; + p = strchr(refname, ' '); + if (p) + *p++ = '\0'; /* first try searching at our hint, falling back to all refs */ if (hint) hint = find_ref_by_name(hint, refname); @@ -176,24 +234,27 @@ static int receive_status(struct packet_reader *reader, struct ref *refs) hint = find_ref_by_name(refs, refname); if (!hint) { warning("remote reported status on unknown ref: %s", - refname); + refname); continue; } - if (hint->status != REF_STATUS_EXPECTING_REPORT) { + if (hint->status != REF_STATUS_EXPECTING_REPORT && + hint->status != REF_STATUS_OK && + hint->status != REF_STATUS_REMOTE_REJECT) { warning("remote reported status on unexpected ref: %s", - refname); + refname); continue; } - - if (reader->line[0] == 'o' && reader->line[1] == 'k') - hint->status = REF_STATUS_OK; - else { + if (!strcmp(head, "ng")) { hint->status = REF_STATUS_REMOTE_REJECT; - ret = -1; + if (p) + hint->remote_status = xstrdup(p); + else + hint->remote_status = "failed"; + } else { + hint->status = REF_STATUS_OK; + hint->remote_status = xstrdup_or_null(p); + new_report = 1; } - hint->remote_status = xstrdup_or_null(msg); - /* start our next search from the next ref */ - hint = hint->next; } return ret; } @@ -242,7 +303,12 @@ static int check_to_send_update(const struct ref *ref, const struct send_pack_ar return CHECK_REF_STATUS_REJECTED; case REF_STATUS_UPTODATE: return CHECK_REF_UPTODATE; + default: + case REF_STATUS_EXPECTING_REPORT: + /* already passed checks on the local side */ + case REF_STATUS_OK: + /* of course this is OK */ return 0; } } @@ -319,29 +385,6 @@ free_return: return update_seen; } - -static int atomic_push_failure(struct send_pack_args *args, - struct ref *remote_refs, - struct ref *failing_ref) -{ - struct ref *ref; - /* Mark other refs as failed */ - for (ref = remote_refs; ref; ref = ref->next) { - if (!ref->peer_ref && !args->send_mirror) - continue; - - switch (ref->status) { - case REF_STATUS_EXPECTING_REPORT: - ref->status = REF_STATUS_ATOMIC_PUSH_FAILED; - continue; - default: - break; /* do nothing */ - } - } - return error("atomic push failed for ref %s. status: %d\n", - failing_ref->name, failing_ref->status); -} - #define NONCE_LEN_LIMIT 256 static void reject_invalid_nonce(const char *nonce, int len) @@ -384,6 +427,7 @@ int send_pack(struct send_pack_args *args, int atomic_supported = 0; int use_push_options = 0; int push_options_supported = 0; + int object_format_supported = 0; unsigned cmds_sent = 0; int ret; struct async demux; @@ -391,7 +435,9 @@ int send_pack(struct send_pack_args *args, struct packet_reader reader; /* Does the other end support the reporting? */ - if (server_supports("report-status")) + if (server_supports("report-status-v2")) + status_report = 2; + else if (server_supports("report-status")) status_report = 1; if (server_supports("delete-refs")) allow_deleting_refs = 1; @@ -410,6 +456,9 @@ int send_pack(struct send_pack_args *args, if (server_supports("push-options")) push_options_supported = 1; + if (!server_supports_hash(the_hash_algo->name, &object_format_supported)) + die(_("the receiving end does not support this repository's hash algorithm")); + if (args->push_cert != SEND_PACK_PUSH_CERT_NEVER) { int len; push_cert_nonce = server_feature_value("push-cert", &len); @@ -427,7 +476,7 @@ int send_pack(struct send_pack_args *args, if (!remote_refs) { fprintf(stderr, "No refs in common and none specified; doing nothing.\n" - "Perhaps you should specify a branch such as 'master'.\n"); + "Perhaps you should specify a branch.\n"); return 0; } if (args->atomic && !atomic_supported) @@ -440,8 +489,10 @@ int send_pack(struct send_pack_args *args, use_push_options = push_options_supported && args->push_options; - if (status_report) + if (status_report == 1) strbuf_addstr(&cap_buf, " report-status"); + else if (status_report == 2) + strbuf_addstr(&cap_buf, " report-status-v2"); if (use_sideband) strbuf_addstr(&cap_buf, " side-band-64k"); if (quiet_supported && (args->quiet || !args->progress)) @@ -450,6 +501,8 @@ int send_pack(struct send_pack_args *args, strbuf_addstr(&cap_buf, " atomic"); if (use_push_options) strbuf_addstr(&cap_buf, " push-options"); + if (object_format_supported) + strbuf_addf(&cap_buf, " object-format=%s", the_hash_algo->name); if (agent_supported) strbuf_addf(&cap_buf, " agent=%s", git_user_agent_sanitized()); @@ -462,13 +515,6 @@ int send_pack(struct send_pack_args *args, if (ref->deletion && !allow_deleting_refs) ref->status = REF_STATUS_REJECT_NODELETE; - if (!args->dry_run) - advertise_shallow_grafts_buf(&req_buf); - - if (!args->dry_run && push_cert_nonce) - cmds_sent = generate_push_cert(&req_buf, remote_refs, args, - cap_buf.buf, push_cert_nonce); - /* * Clear the status for each ref and see if we need to send * the pack data. @@ -486,7 +532,10 @@ int send_pack(struct send_pack_args *args, if (use_atomic) { strbuf_release(&req_buf); strbuf_release(&cap_buf); - return atomic_push_failure(args, remote_refs, ref); + reject_atomic_push(remote_refs, args->send_mirror); + error("atomic push failed for ref %s. status: %d\n", + ref->name, ref->status); + return args->porcelain ? 0 : -1; } /* else fallthrough */ default: @@ -501,31 +550,35 @@ int send_pack(struct send_pack_args *args, ref->status = REF_STATUS_EXPECTING_REPORT; } + if (!args->dry_run) + advertise_shallow_grafts_buf(&req_buf); + /* * Finally, tell the other end! */ - for (ref = remote_refs; ref; ref = ref->next) { - char *old_hex, *new_hex; - - if (args->dry_run || push_cert_nonce) - continue; - - if (check_to_send_update(ref, args) < 0) - continue; - - old_hex = oid_to_hex(&ref->old_oid); - new_hex = oid_to_hex(&ref->new_oid); - if (!cmds_sent) { - packet_buf_write(&req_buf, - "%s %s %s%c%s", - old_hex, new_hex, ref->name, 0, - cap_buf.buf); - cmds_sent = 1; - } else { - packet_buf_write(&req_buf, "%s %s %s", - old_hex, new_hex, ref->name); + if (!args->dry_run && push_cert_nonce) + cmds_sent = generate_push_cert(&req_buf, remote_refs, args, + cap_buf.buf, push_cert_nonce); + else if (!args->dry_run) + for (ref = remote_refs; ref; ref = ref->next) { + char *old_hex, *new_hex; + + if (check_to_send_update(ref, args) < 0) + continue; + + old_hex = oid_to_hex(&ref->old_oid); + new_hex = oid_to_hex(&ref->new_oid); + if (!cmds_sent) { + packet_buf_write(&req_buf, + "%s %s %s%c%s", + old_hex, new_hex, ref->name, 0, + cap_buf.buf); + cmds_sent = 1; + } else { + packet_buf_write(&req_buf, "%s %s %s", + old_hex, new_hex, ref->name); + } } - } if (use_push_options) { struct string_list_item *item; @@ -564,8 +617,6 @@ 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)) @@ -573,10 +624,12 @@ 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. + * are failing, and just want the error() side effects, + * as well as marking refs with their remote status (if + * we get one). */ if (status_report) - receive_unpack_status(&reader); + receive_status(&reader, remote_refs); if (use_sideband) { close(demux.out); diff --git a/third_party/git/sequencer.c b/third_party/git/sequencer.c index 34ebf8ed94..d76cbded00 100644 --- a/third_party/git/sequencer.c +++ b/third_party/git/sequencer.c @@ -16,7 +16,7 @@ #include "rerere.h" #include "merge-recursive.h" #include "refs.h" -#include "argv-array.h" +#include "strvec.h" #include "quote.h" #include "trailer.h" #include "log-tree.h" @@ -32,6 +32,7 @@ #include "alias.h" #include "commit-reach.h" #include "rebase-interactive.h" +#include "reset.h" #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION" @@ -40,7 +41,7 @@ static const char cherry_picked_prefix[] = "(cherry picked from commit "; GIT_PATH_FUNC(git_path_commit_editmsg, "COMMIT_EDITMSG") -GIT_PATH_FUNC(git_path_seq_dir, "sequencer") +static GIT_PATH_FUNC(git_path_seq_dir, "sequencer") static GIT_PATH_FUNC(git_path_todo_file, "sequencer/todo") static GIT_PATH_FUNC(git_path_opts_file, "sequencer/opts") @@ -57,6 +58,8 @@ 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 @@ -117,7 +120,7 @@ static GIT_PATH_FUNC(rebase_path_author_script, "rebase-merge/author-script") static GIT_PATH_FUNC(rebase_path_amend, "rebase-merge/amend") /* * When we stop at a given patch via the "edit" command, this file contains - * the abbreviated commit name of the corresponding patch. + * the commit object name of the corresponding patch. */ static GIT_PATH_FUNC(rebase_path_stopped_sha, "rebase-merge/stopped-sha") /* @@ -131,7 +134,7 @@ static GIT_PATH_FUNC(rebase_path_rewritten_pending, "rebase-merge/rewritten-pending") /* - * The path of the file containig the OID of the "squash onto" commit, i.e. + * The path of the file containing 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") @@ -147,6 +150,8 @@ static GIT_PATH_FUNC(rebase_path_refs_to_delete, "rebase-merge/refs-to-delete") * command-line. */ static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, "rebase-merge/gpg_sign_opt") +static GIT_PATH_FUNC(rebase_path_cdate_is_adate, "rebase-merge/cdate_is_adate") +static GIT_PATH_FUNC(rebase_path_ignore_date, "rebase-merge/ignore_date") static GIT_PATH_FUNC(rebase_path_orig_head, "rebase-merge/orig-head") static GIT_PATH_FUNC(rebase_path_verbose, "rebase-merge/verbose") static GIT_PATH_FUNC(rebase_path_quiet, "rebase-merge/quiet") @@ -158,6 +163,8 @@ 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) { @@ -242,11 +249,20 @@ static int has_conforming_footer(struct strbuf *sb, struct strbuf *sob, struct trailer_info info; size_t i; int found_sob = 0, found_sob_last = 0; + char saved_char; opts.no_divider = 1; + if (ignore_footer) { + saved_char = sb->buf[sb->len - ignore_footer]; + sb->buf[sb->len - ignore_footer] = '\0'; + } + trailer_info_get(&info, sb->buf, &opts); + if (ignore_footer) + sb->buf[sb->len - ignore_footer] = saved_char; + if (info.trailer_start == info.trailer_end) return 0; @@ -288,7 +304,7 @@ int sequencer_remove_state(struct replay_opts *opts) char *eol = strchr(p, '\n'); if (eol) *eol = '\0'; - if (delete_ref("(rebase -i) cleanup", p, NULL, 0) < 0) { + if (delete_ref("(rebase) cleanup", p, NULL, 0) < 0) { warning(_("could not delete '%s'"), p); ret = -1; } @@ -298,6 +314,8 @@ int sequencer_remove_state(struct replay_opts *opts) } } + free(opts->committer_name); + free(opts->committer_email); free(opts->gpg_sign); free(opts->strategy); for (i = 0; i < opts->xopts_nr; i++) @@ -322,7 +340,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 -i"); + return N_("rebase"); } die(_("unknown action: %d"), opts->action); } @@ -350,7 +368,7 @@ static int get_message(struct commit *commit, struct commit_message *out) subject_len = find_commit_subject(out->message, &subject); out->subject = xmemdupz(subject, subject_len); - out->label = xstrfmt("%s... %s", abbrev, out->subject); + out->label = xstrfmt("%s (%s)", abbrev, out->subject); out->parent_label = xstrfmt("parent of %s", out->label); return 0; @@ -376,7 +394,8 @@ static void print_advice(struct repository *r, int show_hint, * (typically rebase --interactive) wants to take care * of the commit itself so remove CHERRY_PICK_HEAD */ - unlink(git_path_cherry_pick_head(r)); + refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD", + NULL, 0); return; } @@ -415,25 +434,15 @@ static int write_message(const void *buf, size_t len, const char *filename, return 0; } -/* - * Reads a file that was presumably written by a shell script, i.e. with an - * end-of-line marker that needs to be stripped. - * - * Note that only the last end-of-line marker is stripped, consistent with the - * behavior of "$(cat path)" in a shell script. - * - * Returns 1 if the file was read, 0 if it could not be read or does not exist. - */ -static int read_oneliner(struct strbuf *buf, - const char *path, int skip_if_empty) +int read_oneliner(struct strbuf *buf, + const char *path, unsigned flags) { int orig_len = buf->len; - if (!file_exists(path)) - return 0; - if (strbuf_read_file(buf, path, 0) < 0) { - warning_errno(_("could not read '%s'"), path); + if ((flags & READ_ONELINER_WARN_MISSING) || + (errno != ENOENT && errno != ENOTDIR)) + warning_errno(_("could not read '%s'"), path); return 0; } @@ -443,7 +452,7 @@ static int read_oneliner(struct strbuf *buf, buf->buf[buf->len] = '\0'; } - if (skip_if_empty && buf->len == orig_len) + if ((flags & READ_ONELINER_SKIP_IF_EMPTY) && buf->len == orig_len) return 0; return 1; @@ -586,9 +595,9 @@ static int do_recursive_merge(struct repository *r, struct replay_opts *opts) { struct merge_options o; - struct tree *result, *next_tree, *base_tree, *head_tree; + struct tree *next_tree, *base_tree, *head_tree; int clean; - char **xopt; + int i; struct lock_file index_lock = LOCK_INIT; if (repo_hold_locked_index(r, &index_lock, LOCK_REPORT_ON_ERROR) < 0) @@ -608,16 +617,15 @@ 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 (xopt = opts->xopts; xopt != opts->xopts + opts->xopts_nr; xopt++) - parse_merge_opt(&o, *xopt); + for (i = 0; i < opts->xopts_nr; i++) + parse_merge_opt(&o, opts->xopts[i]); clean = merge_trees(&o, head_tree, - next_tree, base_tree, &result); + next_tree, base_tree); 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; @@ -627,7 +635,7 @@ static int do_recursive_merge(struct repository *r, COMMIT_LOCK | SKIP_IF_UNCHANGED)) /* * TRANSLATORS: %s will be "revert", "cherry-pick" or - * "rebase -i". + * "rebase". */ return error(_("%s: Unable to write new index file"), _(action_name(opts))); @@ -836,10 +844,10 @@ finish: /* * Read a GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL AND GIT_AUTHOR_DATE from a - * file with shell quoting into struct argv_array. Returns -1 on + * file with shell quoting into struct strvec. Returns -1 on * error, 0 otherwise. */ -static int read_env_script(struct argv_array *env) +static int read_env_script(struct strvec *env) { char *name, *email, *date; @@ -847,9 +855,9 @@ static int read_env_script(struct argv_array *env) &name, &email, &date, 0)) return -1; - argv_array_pushf(env, "GIT_AUTHOR_NAME=%s", name); - argv_array_pushf(env, "GIT_AUTHOR_EMAIL=%s", email); - argv_array_pushf(env, "GIT_AUTHOR_DATE=%s", date); + strvec_pushf(env, "GIT_AUTHOR_NAME=%s", name); + strvec_pushf(env, "GIT_AUTHOR_EMAIL=%s", email); + strvec_pushf(env, "GIT_AUTHOR_DATE=%s", date); free(name); free(email); free(date); @@ -869,32 +877,20 @@ 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) +static const char *author_date_from_env_array(const struct strvec *env) { - 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; - } + int i; + const char *date; - 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; + for (i = 0; i < env->nr; i++) + if (skip_prefix(env->v[i], + "GIT_AUTHOR_DATE=", &date)) + return date; + /* + * If GIT_AUTHOR_DATE is missing we should have already errored out when + * reading the script + */ + BUG("GIT_AUTHOR_DATE missing from author script"); } static const char staged_changes_advice[] = @@ -947,54 +943,12 @@ static int run_command_silent_on_success(struct child_process *cmd) * interactive rebase: in that case, we will want to retain the * author metadata. */ -static int run_git_commit(struct repository *r, - const char *defmsg, +static int run_git_commit(const char *defmsg, struct replay_opts *opts, unsigned int flags) { 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)) { @@ -1004,32 +958,42 @@ static int run_git_commit(struct repository *r, gpg_opt, gpg_opt); } - argv_array_push(&cmd.args, "commit"); + if (opts->committer_date_is_author_date) + strvec_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s", + opts->ignore_date ? + "" : + author_date_from_env_array(&cmd.env_array)); + if (opts->ignore_date) + strvec_push(&cmd.env_array, "GIT_AUTHOR_DATE="); + + strvec_push(&cmd.args, "commit"); if (!(flags & VERIFY_MSG)) - argv_array_push(&cmd.args, "-n"); + strvec_push(&cmd.args, "-n"); if ((flags & AMEND_MSG)) - argv_array_push(&cmd.args, "--amend"); + strvec_push(&cmd.args, "--amend"); if (opts->gpg_sign) - argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign); + strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign); + else + strvec_push(&cmd.args, "--no-gpg-sign"); if (defmsg) - argv_array_pushl(&cmd.args, "-F", defmsg, NULL); + strvec_pushl(&cmd.args, "-F", defmsg, NULL); else if (!(flags & EDIT_MSG)) - argv_array_pushl(&cmd.args, "-C", "HEAD", NULL); + strvec_pushl(&cmd.args, "-C", "HEAD", NULL); if ((flags & CLEANUP_MSG)) - argv_array_push(&cmd.args, "--cleanup=strip"); + strvec_push(&cmd.args, "--cleanup=strip"); if ((flags & EDIT_MSG)) - argv_array_push(&cmd.args, "-e"); + strvec_push(&cmd.args, "-e"); else if (!(flags & CLEANUP_MSG) && !opts->signoff && !opts->record_origin && !opts->explicit_cleanup) - argv_array_push(&cmd.args, "--cleanup=verbatim"); + strvec_push(&cmd.args, "--cleanup=verbatim"); if ((flags & ALLOW_EMPTY)) - argv_array_push(&cmd.args, "--allow-empty"); + strvec_push(&cmd.args, "--allow-empty"); if (!(flags & EDIT_MSG)) - argv_array_push(&cmd.args, "--allow-empty-message"); + strvec_push(&cmd.args, "--allow-empty-message"); if (is_rebase_i(opts) && !(flags & EDIT_MSG)) return run_command_silent_on_success(&cmd); @@ -1196,25 +1160,22 @@ static int run_prepare_commit_msg_hook(struct repository *r, struct strbuf *msg, const char *commit) { - struct argv_array hook_env = ARGV_ARRAY_INIT; - int ret; - const char *name; + int ret = 0; + const char *name, *arg1 = NULL, *arg2 = NULL; name = git_path_commit_editmsg(); if (write_message(msg->buf, msg->len, name, 0)) return -1; - 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) + if (commit) { + arg1 = "commit"; + arg2 = commit; + } else { + arg1 = "message"; + } + if (run_commit_hook(0, r->index_file, "prepare-commit-msg", name, + arg1, arg2, NULL)) ret = error(_("'prepare-commit-msg' hook failed")); - argv_array_clear(&hook_env); return ret; } @@ -1378,12 +1339,13 @@ static int try_to_commit(struct repository *r, struct object_id *oid) { struct object_id tree; - struct commit *current_head; + struct commit *current_head = NULL; struct commit_list *parents = NULL; struct commit_extra_header *extra = NULL; struct strbuf err = STRBUF_INIT; struct strbuf commit_msg = STRBUF_INIT; char *amend_author = NULL; + const char *committer = NULL; const char *hook_commit = NULL; enum commit_msg_cleanup_mode cleanup; int res = 0; @@ -1392,7 +1354,7 @@ static int try_to_commit(struct repository *r, return -1; if (flags & AMEND_MSG) { - const char *exclude_gpgsig[] = { "gpgsig", NULL }; + const char *exclude_gpgsig[] = { "gpgsig", "gpgsig-sha256", NULL }; const char *out_enc = get_commit_output_encoding(); const char *message = logmsg_reencode(current_head, NULL, out_enc); @@ -1413,7 +1375,8 @@ 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) { + } else if (current_head && + (!(flags & CREATE_ROOT_COMMIT) || (flags & AMEND_MSG))) { commit_list_insert(current_head, &parents); } @@ -1422,11 +1385,27 @@ static int try_to_commit(struct repository *r, 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 (!(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 (find_hook("prepare-commit-msg")) { @@ -1458,10 +1437,57 @@ static int try_to_commit(struct repository *r, goto out; } - reset_ident_date(); + if (opts->committer_date_is_author_date) { + struct ident_split id; + struct strbuf date = STRBUF_INIT; + + if (!opts->ignore_date) { + if (split_ident_line(&id, author, (int)strlen(author)) < 0) { + res = error(_("invalid author identity '%s'"), + author); + goto out; + } + if (!id.date_begin) { + res = error(_( + "corrupt author: missing date information")); + goto out; + } + strbuf_addf(&date, "@%.*s %.*s", + (int)(id.date_end - id.date_begin), + id.date_begin, + (int)(id.tz_end - id.tz_begin), + id.tz_begin); + } else { + reset_ident_date(); + } + committer = fmt_ident(opts->committer_name, + opts->committer_email, + WANT_COMMITTER_IDENT, + opts->ignore_date ? NULL : date.buf, + IDENT_STRICT); + strbuf_release(&date); + } else { + reset_ident_date(); + } + + if (opts->ignore_date) { + struct ident_split id; + char *name, *email; - if (commit_tree_extended(msg->buf, msg->len, &tree, parents, - oid, author, opts->gpg_sign, extra)) { + if (split_ident_line(&id, author, strlen(author)) < 0) { + error(_("invalid author identity '%s'"), author); + goto out; + } + name = xmemdupz(id.name_begin, id.name_end - id.name_begin); + email = xmemdupz(id.mail_begin, id.mail_end - id.mail_begin); + author = fmt_ident(name, email, WANT_AUTHOR_IDENT, NULL, + IDENT_STRICT); + free(name); + free(email); + } + + if (commit_tree_extended(msg->buf, msg->len, &tree, parents, oid, + author, committer, opts->gpg_sign, extra)) { res = error(_("failed to write commit object")); goto out; } @@ -1472,6 +1498,7 @@ 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); @@ -1484,14 +1511,23 @@ out: return res; } +static int write_rebase_head(struct object_id *oid) +{ + if (update_ref("rebase", "REBASE_HEAD", oid, + NULL, REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) + return error(_("could not update %s"), "REBASE_HEAD"); + + return 0; +} + static int do_commit(struct repository *r, const char *msg_file, const char *author, - struct replay_opts *opts, unsigned int flags) + struct replay_opts *opts, unsigned int flags, + struct object_id *oid) { int res = 1; - if (!(flags & EDIT_MSG) && !(flags & VERIFY_MSG) && - !(flags & CREATE_ROOT_COMMIT)) { + if (!(flags & EDIT_MSG) && !(flags & VERIFY_MSG)) { struct object_id oid; struct strbuf sb = STRBUF_INIT; @@ -1504,7 +1540,8 @@ static int do_commit(struct repository *r, author, opts, flags, &oid); strbuf_release(&sb); if (!res) { - unlink(git_path_cherry_pick_head(r)); + refs_delete_ref(get_main_ref_store(r), "", + "CHERRY_PICK_HEAD", NULL, 0); unlink(git_path_merge_msg(r)); if (!is_rebase_i(opts)) print_commit_summary(r, NULL, &oid, @@ -1512,8 +1549,12 @@ static int do_commit(struct repository *r, return res; } } - if (res == 1) - return run_git_commit(r, msg_file, opts, flags); + if (res == 1) { + if (is_rebase_i(opts) && oid) + if (write_rebase_head(oid)) + return -1; + return run_git_commit(msg_file, opts, flags); + } return res; } @@ -1539,23 +1580,30 @@ static int is_original_commit_empty(struct commit *commit) } /* - * Do we run "git commit" with "--allow-empty"? + * 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 */ static int allow_empty(struct repository *r, struct replay_opts *opts, struct commit *commit) { - int index_unchanged, empty_commit; + int index_unchanged, originally_empty; /* - * Three cases: + * Four cases: * * (1) we do not allow empty at all and error out. * - * (2) we allow ones that were initially empty, but - * forbid the ones that become empty; + * (2) we allow ones that were initially empty, and + * just drop the ones that become empty * - * (3) we allow both. + * (3) we allow ones that were initially empty, but + * halt for the ones that become empty; + * + * (4) we allow both. */ if (!opts->allow_empty) return 0; /* let "git commit" barf as necessary */ @@ -1569,13 +1617,15 @@ static int allow_empty(struct repository *r, if (opts->keep_redundant_commits) return 1; - empty_commit = is_original_commit_empty(commit); - if (empty_commit < 0) - return empty_commit; - if (!empty_commit) - return 0; - else + 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 + return 0; } static struct { @@ -1607,7 +1657,7 @@ static const char *command_to_string(const enum todo_command command) static char command_to_char(const enum todo_command command) { - if (command < TODO_COMMENT && todo_command_info[command].c) + if (command < TODO_COMMENT) return todo_command_info[command].c; return comment_line_char; } @@ -1646,6 +1696,7 @@ 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; @@ -1672,7 +1723,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 = get_commit_buffer(head_commit, NULL))) + if (!(head_message = logmsg_reencode(head_commit, NULL, encoding))) return error(_("could not read HEAD's commit message")); find_commit_subject(head_message, &body); @@ -1693,7 +1744,7 @@ static int update_squash_messages(struct repository *r, unuse_commit_buffer(head_commit, head_message); } - if (!(message = get_commit_buffer(commit, NULL))) + if (!(message = logmsg_reencode(commit, NULL, encoding))) return error(_("could not read commit message of %s"), oid_to_hex(&commit->object.oid)); find_commit_subject(message, &body); @@ -1775,7 +1826,7 @@ static int do_pick_commit(struct repository *r, enum todo_command command, struct commit *commit, struct replay_opts *opts, - int final_fixup) + int final_fixup, int *check_todo) { unsigned int flags = opts->edit ? EDIT_MSG : 0; const char *msg_file = opts->edit ? NULL : git_path_merge_msg(r); @@ -1785,7 +1836,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, allow; + int res, unborn = 0, reword = 0, allow, drop_commit; if (opts->no_commit) { /* @@ -1855,7 +1906,7 @@ static int do_pick_commit(struct repository *r, opts); if (res || command != TODO_REWORD) goto leave; - flags |= EDIT_MSG | AMEND_MSG | VERIFY_MSG; + reword = 1; msg_file = NULL; goto fast_forward_edit; } @@ -1913,7 +1964,7 @@ static int do_pick_commit(struct repository *r, } if (command == TODO_REWORD) - flags |= EDIT_MSG | VERIFY_MSG; + reword = 1; else if (is_fixup(command)) { if (update_squash_messages(r, command, commit, opts)) return -1; @@ -1971,7 +2022,9 @@ static int do_pick_commit(struct repository *r, * However, if the merge did not even start, then we don't want to * write it at all. */ - if (command == TODO_PICK && !opts->no_commit && (res == 0 || res == 1) && + if ((command == TODO_PICK || command == TODO_REWORD || + command == TODO_EDIT) && !opts->no_commit && + (res == 0 || res == 1) && update_ref(NULL, "CHERRY_PICK_HEAD", &commit->object.oid, NULL, REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) res = -1; @@ -1990,20 +2043,39 @@ 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) + } else if (allow == 1) { flags |= ALLOW_EMPTY; - if (!opts->no_commit) { -fast_forward_edit: + } else if (allow == 2) { + drop_commit = 1; + refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD", + NULL, 0); + 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 (author || command == TODO_REVERT || (flags & AMEND_MSG)) - res = do_commit(r, msg_file, author, opts, flags); + res = do_commit(r, msg_file, author, opts, flags, + commit? &commit->object.oid : NULL); else res = error(_("unable to parse commit author")); + *check_todo = !!(flags & EDIT_MSG); + if (!res && reword) { +fast_forward_edit: + res = run_git_commit(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()); @@ -2070,6 +2142,7 @@ 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++; } @@ -2164,6 +2237,8 @@ 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"); @@ -2171,11 +2246,10 @@ static int parse_insn_line(struct repository *r, struct todo_item *item, item->arg_len = (int)(eol - bol); if (status < 0) - return error(_("could not parse '%.*s'"), - (int)(end_of_object_name - bol), bol); + return status; item->commit = lookup_commit_reference(r, &commit_oid); - return !item->commit; + return item->commit ? 0 : -1; } int sequencer_get_last_command(struct repository *r, enum replay_action *action) @@ -2318,15 +2392,19 @@ void sequencer_post_commit_cleanup(struct repository *r, int verbose) struct replay_opts opts = REPLAY_OPTS_INIT; int need_cleanup = 0; - if (file_exists(git_path_cherry_pick_head(r))) { - if (!unlink(git_path_cherry_pick_head(r)) && verbose) + if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD")) { + if (!refs_delete_ref(get_main_ref_store(r), "", + "CHERRY_PICK_HEAD", NULL, 0) && + verbose) warning(_("cancelling a cherry picking in progress")); opts.action = REPLAY_PICK; need_cleanup = 1; } - if (file_exists(git_path_revert_head(r))) { - if (!unlink(git_path_revert_head(r)) && verbose) + if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) { + if (!refs_delete_ref(get_main_ref_store(r), "", "REVERT_HEAD", + NULL, 0) && + verbose) warning(_("cancelling a revert in progress")); opts.action = REPLAY_REVERT; need_cleanup = 1; @@ -2341,6 +2419,16 @@ 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) @@ -2386,7 +2474,6 @@ 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)) @@ -2398,10 +2485,7 @@ static int read_populate_todo(struct repository *r, + count_commands(todo_list); todo_list_release(&done); - if (f) { - fprintf(f, "%d\n", todo_list->total_nr); - fclose(f); - } + todo_list_write_total_nr(todo_list); } return 0; @@ -2502,8 +2586,10 @@ static int read_populate_opts(struct replay_opts *opts) { if (is_rebase_i(opts)) { struct strbuf buf = STRBUF_INIT; + int ret = 0; - if (read_oneliner(&buf, rebase_path_gpg_sign_opt(), 1)) { + if (read_oneliner(&buf, rebase_path_gpg_sign_opt(), + READ_ONELINER_SKIP_IF_EMPTY)) { if (!starts_with(buf.buf, "-S")) strbuf_reset(&buf); else { @@ -2513,7 +2599,8 @@ static int read_populate_opts(struct replay_opts *opts) strbuf_reset(&buf); } - if (read_oneliner(&buf, rebase_path_allow_rerere_autoupdate(), 1)) { + if (read_oneliner(&buf, rebase_path_allow_rerere_autoupdate(), + READ_ONELINER_SKIP_IF_EMPTY)) { if (!strcmp(buf.buf, "--rerere-autoupdate")) opts->allow_rerere_auto = RERERE_AUTOUPDATE; else if (!strcmp(buf.buf, "--no-rerere-autoupdate")) @@ -2532,14 +2619,31 @@ static int read_populate_opts(struct replay_opts *opts) opts->signoff = 1; } + if (file_exists(rebase_path_cdate_is_adate())) { + opts->allow_ff = 0; + opts->committer_date_is_author_date = 1; + } + + if (file_exists(rebase_path_ignore_date())) { + opts->allow_ff = 0; + opts->ignore_date = 1; + } + 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); + strbuf_reset(&buf); if (read_oneliner(&opts->current_fixups, - rebase_path_current_fixups(), 1)) { + rebase_path_current_fixups(), + READ_ONELINER_SKIP_IF_EMPTY)) { const char *p = opts->current_fixups.buf; opts->current_fixup_count = 1; while ((p = strchr(p, '\n'))) { @@ -2549,12 +2653,16 @@ static int read_populate_opts(struct replay_opts *opts) } if (read_oneliner(&buf, rebase_path_squash_onto(), 0)) { - if (get_oid_hex(buf.buf, &opts->squash_onto) < 0) - return error(_("unusable squash-onto")); + if (get_oid_hex(buf.buf, &opts->squash_onto) < 0) { + ret = error(_("unusable squash-onto")); + goto done_rebase_i; + } opts->have_squash_onto = 1; } - return 0; +done_rebase_i: + strbuf_release(&buf); + return ret; } if (!file_exists(git_path_opts_file())) @@ -2586,8 +2694,6 @@ 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) @@ -2596,8 +2702,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 (quiet) - write_file(rebase_path_quiet(), "%s\n", quiet); + if (opts->quiet) + write_file(rebase_path_quiet(), "%s", ""); if (opts->verbose) write_file(rebase_path_verbose(), "%s", ""); if (opts->strategy) @@ -2614,6 +2720,14 @@ 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->committer_date_is_author_date) + write_file(rebase_path_cdate_is_adate(), "%s", ""); + if (opts->ignore_date) + write_file(rebase_path_ignore_date(), "%s", ""); if (opts->reschedule_failed_exec) write_file(rebase_path_reschedule_failed_exec(), "%s", ""); @@ -2626,14 +2740,17 @@ 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 = get_commit_buffer(commit, NULL); + const char *commit_buffer = logmsg_reencode(commit, NULL, encoding); const char *subject; int subject_len; @@ -2659,8 +2776,9 @@ static int create_seq_dir(struct repository *r) enum replay_action action; const char *in_progress_error = NULL; const char *in_progress_advice = NULL; - unsigned int advise_skip = file_exists(git_path_revert_head(r)) || - file_exists(git_path_cherry_pick_head(r)); + unsigned int advise_skip = + refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") || + refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD"); if (!sequencer_get_last_command(r, &action)) { switch (action) { @@ -2742,15 +2860,15 @@ static int rollback_is_safe(void) static int reset_merge(const struct object_id *oid) { int ret; - struct argv_array argv = ARGV_ARRAY_INIT; + struct strvec argv = STRVEC_INIT; - argv_array_pushl(&argv, "reset", "--merge", NULL); + strvec_pushl(&argv, "reset", "--merge", NULL); if (!is_null_oid(oid)) - argv_array_push(&argv, oid_to_hex(oid)); + strvec_push(&argv, oid_to_hex(oid)); - ret = run_command_v_opt(argv.argv, RUN_GIT_CMD); - argv_array_clear(&argv); + ret = run_command_v_opt(argv.v, RUN_GIT_CMD); + strvec_clear(&argv); return ret; } @@ -2759,8 +2877,8 @@ static int rollback_single_pick(struct repository *r) { struct object_id head_oid; - if (!file_exists(git_path_cherry_pick_head(r)) && - !file_exists(git_path_revert_head(r))) + if (!refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") && + !refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) return error(_("no cherry-pick or revert in progress")); if (read_ref_full("HEAD", 0, &head_oid, NULL)) return error(_("cannot resolve HEAD")); @@ -2854,7 +2972,7 @@ int sequencer_skip(struct repository *r, struct replay_opts *opts) */ switch (opts->action) { case REPLAY_REVERT: - if (!file_exists(git_path_revert_head(r))) { + if (!refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) { if (action != REPLAY_REVERT) return error(_("no revert in progress")); if (!rollback_is_safe()) @@ -2862,7 +2980,8 @@ int sequencer_skip(struct repository *r, struct replay_opts *opts) } break; case REPLAY_PICK: - if (!file_exists(git_path_cherry_pick_head(r))) { + if (!refs_ref_exists(get_main_ref_store(r), + "CHERRY_PICK_HEAD")) { if (action != REPLAY_PICK) return error(_("no cherry-pick in progress")); if (!rollback_is_safe()) @@ -3000,15 +3119,14 @@ static int make_patch(struct repository *r, { struct strbuf buf = STRBUF_INIT; struct rev_info log_tree_opt; - const char *subject, *p; + const char *subject; + char hex[GIT_MAX_HEXSZ + 1]; int res = 0; - p = short_commit_name(commit); - if (write_message(p, strlen(p), rebase_path_stopped_sha(), 1) < 0) + oid_to_hex_r(hex, &commit->object.oid); + if (write_message(hex, strlen(hex), rebase_path_stopped_sha(), 1) < 0) return -1; - if (update_ref("rebase", "REBASE_HEAD", &commit->object.oid, - NULL, REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) - res |= error(_("could not update %s"), "REBASE_HEAD"); + res |= write_rebase_head(&commit->object.oid); strbuf_addf(&buf, "%s/patch", get_dir(opts)); memset(&log_tree_opt, 0, sizeof(log_tree_opt)); @@ -3030,7 +3148,8 @@ static int make_patch(struct repository *r, strbuf_addf(&buf, "%s/message", get_dir(opts)); if (!file_exists(buf.buf)) { - const char *commit_buffer = get_commit_buffer(commit, NULL); + const char *encoding = get_commit_output_encoding(); + const char *commit_buffer = logmsg_reencode(commit, NULL, encoding); find_commit_subject(commit_buffer, &subject); res |= write_message(subject, strlen(subject), buf.buf, 1); unuse_commit_buffer(commit, commit_buffer); @@ -3114,17 +3233,17 @@ static int error_failed_squash(struct repository *r, static int do_exec(struct repository *r, const char *command_line) { - struct argv_array child_env = ARGV_ARRAY_INIT; + struct strvec child_env = STRVEC_INIT; const char *child_argv[] = { NULL, NULL }; int dirty, status; - fprintf(stderr, "Executing: %s\n", command_line); + fprintf(stderr, _("Executing: %s\n"), command_line); child_argv[0] = command_line; - argv_array_pushf(&child_env, "GIT_DIR=%s", absolute_path(get_git_dir())); - argv_array_pushf(&child_env, "GIT_WORK_TREE=%s", - absolute_path(get_git_work_tree())); + strvec_pushf(&child_env, "GIT_DIR=%s", absolute_path(get_git_dir())); + strvec_pushf(&child_env, "GIT_WORK_TREE=%s", + absolute_path(get_git_work_tree())); status = run_command_v_opt_cd_env(child_argv, RUN_USING_SHELL, NULL, - child_env.argv); + child_env.v); /* force re-reading of the cache */ if (discard_index(r->index) < 0 || repo_read_index(r) < 0) @@ -3154,7 +3273,7 @@ static int do_exec(struct repository *r, const char *command_line) status = 1; } - argv_array_clear(&child_env); + strvec_clear(&child_env); return status; } @@ -3209,7 +3328,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 -i (label) '%.*s'", len, name); + strbuf_addf(&msg, "rebase (label) '%.*s'", len, name); transaction = ref_store_transaction_begin(refs, &err); if (!transaction) { @@ -3295,6 +3414,7 @@ static int do_reset(struct repository *r, unpack_tree_opts.fn = oneway_merge; unpack_tree_opts.merge = 1; unpack_tree_opts.update = 1; + init_checkout_metadata(&unpack_tree_opts.meta, name, &oid, NULL); if (repo_read_index_unmerged(r)) { rollback_lock_file(&lock); @@ -3364,6 +3484,9 @@ 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; @@ -3429,7 +3552,8 @@ static int do_merge(struct repository *r, } if (commit) { - const char *message = get_commit_buffer(commit, NULL); + const char *encoding = get_commit_output_encoding(); + const char *message = logmsg_reencode(commit, NULL, encoding); const char *body; int len; @@ -3516,7 +3640,7 @@ static int do_merge(struct repository *r, goto leave_merge; } - if (to_merge->next) { + if (strategy || to_merge->next) { /* Octopus merge */ struct child_process cmd = CHILD_PROCESS_INIT; @@ -3527,26 +3651,42 @@ static int do_merge(struct repository *r, goto leave_merge; } + if (opts->committer_date_is_author_date) + strvec_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s", + opts->ignore_date ? + "" : + author_date_from_env_array(&cmd.env_array)); + if (opts->ignore_date) + strvec_push(&cmd.env_array, "GIT_AUTHOR_DATE="); + cmd.git_cmd = 1; - argv_array_push(&cmd.args, "merge"); - argv_array_push(&cmd.args, "-s"); - 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"); - argv_array_push(&cmd.args, "--no-stat"); - argv_array_push(&cmd.args, "-F"); - argv_array_push(&cmd.args, git_path_merge_msg(r)); + strvec_push(&cmd.args, "merge"); + strvec_push(&cmd.args, "-s"); + if (!strategy) + strvec_push(&cmd.args, "octopus"); + else { + strvec_push(&cmd.args, strategy); + for (k = 0; k < opts->xopts_nr; k++) + strvec_pushf(&cmd.args, + "-X%s", opts->xopts[k]); + } + strvec_push(&cmd.args, "--no-edit"); + strvec_push(&cmd.args, "--no-ff"); + strvec_push(&cmd.args, "--no-log"); + strvec_push(&cmd.args, "--no-stat"); + strvec_push(&cmd.args, "-F"); + strvec_push(&cmd.args, git_path_merge_msg(r)); if (opts->gpg_sign) - argv_array_push(&cmd.args, opts->gpg_sign); + strvec_push(&cmd.args, opts->gpg_sign); /* Add the tips to be merged */ for (j = to_merge; j; j = j->next) - argv_array_push(&cmd.args, - oid_to_hex(&j->item->object.oid)); + strvec_push(&cmd.args, + oid_to_hex(&j->item->object.oid)); strbuf_release(&ref_name); - unlink(git_path_cherry_pick_head(r)); + refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD", + NULL, 0); rollback_lock_file(&lock); rollback_lock_file(&lock); @@ -3568,7 +3708,7 @@ static int do_merge(struct repository *r, goto leave_merge; } - write_message(oid_to_hex(&merge_commit->object.oid), GIT_SHA1_HEXSZ, + write_message(oid_to_hex(&merge_commit->object.oid), the_hash_algo->hexsz, git_path_merge_head(r), 0); write_message("no-ff", 5, git_path_merge_mode(r), 0); @@ -3617,7 +3757,7 @@ static int do_merge(struct repository *r, * command needs to be rescheduled). */ fast_forward_edit: - ret = !!run_git_commit(r, git_path_merge_msg(r), opts, + ret = !!run_git_commit(git_path_merge_msg(r), opts, run_commit_flags); leave_merge: @@ -3653,59 +3793,142 @@ static enum todo_command peek_command(struct todo_list *todo_list, int offset) return -1; } -static int apply_autostash(struct replay_opts *opts) +void create_autostash(struct repository *r, const char *path, + const char *default_reflog_action) +{ + struct strbuf buf = STRBUF_INIT; + struct lock_file lock_file = LOCK_INIT; + int fd; + + fd = repo_hold_locked_index(r, &lock_file, 0); + refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL); + if (0 <= fd) + repo_update_index_if_able(r, &lock_file); + rollback_lock_file(&lock_file); + + if (has_unstaged_changes(r, 1) || + has_uncommitted_changes(r, 1)) { + struct child_process stash = CHILD_PROCESS_INIT; + struct object_id oid; + + strvec_pushl(&stash.args, + "stash", "create", "autostash", NULL); + stash.git_cmd = 1; + stash.no_stdin = 1; + strbuf_reset(&buf); + if (capture_command(&stash, &buf, GIT_MAX_HEXSZ)) + die(_("Cannot autostash")); + strbuf_trim_trailing_newline(&buf); + if (get_oid(buf.buf, &oid)) + die(_("Unexpected stash response: '%s'"), + buf.buf); + strbuf_reset(&buf); + strbuf_add_unique_abbrev(&buf, &oid, DEFAULT_ABBREV); + + if (safe_create_leading_directories_const(path)) + die(_("Could not create directory for '%s'"), + path); + write_file(path, "%s", oid_to_hex(&oid)); + printf(_("Created autostash: %s\n"), buf.buf); + if (reset_head(r, NULL, "reset --hard", + NULL, RESET_HEAD_HARD, NULL, NULL, + default_reflog_action) < 0) + die(_("could not reset --hard")); + + if (discard_index(r->index) < 0 || + repo_read_index(r) < 0) + die(_("could not read index")); + } + strbuf_release(&buf); +} + +static int apply_save_autostash_oid(const char *stash_oid, int attempt_apply) { - struct strbuf stash_sha1 = STRBUF_INIT; struct child_process child = CHILD_PROCESS_INIT; int ret = 0; - if (!read_oneliner(&stash_sha1, rebase_path_autostash(), 1)) { - strbuf_release(&stash_sha1); - return 0; + if (attempt_apply) { + child.git_cmd = 1; + child.no_stdout = 1; + child.no_stderr = 1; + strvec_push(&child.args, "stash"); + strvec_push(&child.args, "apply"); + strvec_push(&child.args, stash_oid); + ret = run_command(&child); } - strbuf_trim(&stash_sha1); - child.git_cmd = 1; - child.no_stdout = 1; - child.no_stderr = 1; - argv_array_push(&child.args, "stash"); - argv_array_push(&child.args, "apply"); - argv_array_push(&child.args, stash_sha1.buf); - if (!run_command(&child)) + if (attempt_apply && !ret) fprintf(stderr, _("Applied autostash.\n")); else { struct child_process store = CHILD_PROCESS_INIT; store.git_cmd = 1; - argv_array_push(&store.args, "stash"); - argv_array_push(&store.args, "store"); - argv_array_push(&store.args, "-m"); - argv_array_push(&store.args, "autostash"); - argv_array_push(&store.args, "-q"); - argv_array_push(&store.args, stash_sha1.buf); + strvec_push(&store.args, "stash"); + strvec_push(&store.args, "store"); + strvec_push(&store.args, "-m"); + strvec_push(&store.args, "autostash"); + strvec_push(&store.args, "-q"); + strvec_push(&store.args, stash_oid); if (run_command(&store)) - ret = error(_("cannot store %s"), stash_sha1.buf); + ret = error(_("cannot store %s"), stash_oid); else fprintf(stderr, - _("Applying autostash resulted in conflicts.\n" + _("%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or" - " \"git stash drop\" at any time.\n")); + " \"git stash drop\" at any time.\n"), + attempt_apply ? + _("Applying autostash resulted in conflicts.") : + _("Autostash exists; creating a new stash entry.")); } - strbuf_release(&stash_sha1); return ret; } +static int apply_save_autostash(const char *path, int attempt_apply) +{ + struct strbuf stash_oid = STRBUF_INIT; + int ret = 0; + + if (!read_oneliner(&stash_oid, path, + READ_ONELINER_SKIP_IF_EMPTY)) { + strbuf_release(&stash_oid); + return 0; + } + strbuf_trim(&stash_oid); + + ret = apply_save_autostash_oid(stash_oid.buf, attempt_apply); + + unlink(path); + strbuf_release(&stash_oid); + return ret; +} + +int save_autostash(const char *path) +{ + return apply_save_autostash(path, 0); +} + +int apply_autostash(const char *path) +{ + return apply_save_autostash(path, 1); +} + +int apply_autostash_oid(const char *stash_oid) +{ + return apply_save_autostash_oid(stash_oid, 1); +} + static const char *reflog_message(struct replay_opts *opts, const char *sub_action, const char *fmt, ...) { va_list ap; static struct strbuf buf = STRBUF_INIT; + char *reflog_action = getenv(GIT_REFLOG_ACTION); va_start(ap, fmt); strbuf_reset(&buf); - strbuf_addstr(&buf, action_name(opts)); + strbuf_addstr(&buf, reflog_action ? reflog_action : action_name(opts)); if (sub_action) strbuf_addf(&buf, " (%s)", sub_action); if (fmt) { @@ -3725,9 +3948,9 @@ static int run_git_checkout(struct repository *r, struct replay_opts *opts, cmd.git_cmd = 1; - argv_array_push(&cmd.args, "checkout"); - argv_array_push(&cmd.args, commit); - argv_array_pushf(&cmd.env_array, GIT_REFLOG_ACTION "=%s", action); + strvec_push(&cmd.args, "checkout"); + strvec_push(&cmd.args, commit); + strvec_pushf(&cmd.env_array, GIT_REFLOG_ACTION "=%s", action); if (opts->verbose) ret = run_command(&cmd); @@ -3740,20 +3963,6 @@ 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) @@ -3765,7 +3974,7 @@ static int checkout_onto(struct repository *r, struct replay_opts *opts, return error(_("%s: not a valid OID"), orig_head); if (run_git_checkout(r, opts, oid_to_hex(onto), action)) { - apply_autostash(opts); + apply_autostash(rebase_path_autostash()); sequencer_remove_state(opts); return error(_("could not detach HEAD")); } @@ -3807,17 +4016,23 @@ static int pick_commits(struct repository *r, struct replay_opts *opts) { int res = 0, reschedule = 0; + char *prev_reflog_action; + /* Note that 0 for 3rd parameter of setenv means set only if not set */ setenv(GIT_REFLOG_ACTION, action_name(opts), 0); + prev_reflog_action = xstrdup(getenv(GIT_REFLOG_ACTION)); if (opts->allow_ff) assert(!(opts->signoff || opts->no_commit || - opts->record_origin || opts->edit)); + opts->record_origin || opts->edit || + opts->committer_date_is_author_date || + opts->ignore_date)); if (read_and_refresh_cache(r, opts)) return -1; 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; @@ -3832,7 +4047,7 @@ static int pick_commits(struct repository *r, fclose(f); } if (!opts->quiet) - fprintf(stderr, "Rebasing (%d/%d)%s", + fprintf(stderr, _("Rebasing (%d/%d)%s"), todo_list->done_nr, todo_list->total_nr, opts->verbose ? "\n" : "\r"); @@ -3852,11 +4067,14 @@ static int pick_commits(struct repository *r, } if (item->command <= TODO_SQUASH) { if (is_rebase_i(opts)) - setenv("GIT_REFLOG_ACTION", reflog_message(opts, + setenv(GIT_REFLOG_ACTION, reflog_message(opts, command_to_string(item->command), NULL), 1); res = do_pick_commit(r, item->command, item->commit, - opts, is_final_fixup(todo_list)); + opts, is_final_fixup(todo_list), + &check_todo); + if (is_rebase_i(opts)) + setenv(GIT_REFLOG_ACTION, prev_reflog_action, 1); if (is_rebase_i(opts) && res < 0) { /* Reschedule */ advise(_(rescheduled_advice), @@ -3913,7 +4131,6 @@ 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(); @@ -3924,17 +4141,8 @@ 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; @@ -3970,6 +4178,20 @@ 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++; @@ -4054,9 +4276,9 @@ cleanup_head_ref: child.in = open(rebase_path_rewritten_list(), O_RDONLY); child.git_cmd = 1; - argv_array_push(&child.args, "notes"); - argv_array_push(&child.args, "copy"); - argv_array_push(&child.args, "--for-rewrite=rebase"); + strvec_push(&child.args, "notes"); + strvec_push(&child.args, "copy"); + strvec_push(&child.args, "--for-rewrite=rebase"); /* we don't care if this copying failed */ run_command(&child); @@ -4067,19 +4289,19 @@ cleanup_head_ref: O_RDONLY); hook.stdout_to_stderr = 1; hook.trace2_hook_name = "post-rewrite"; - argv_array_push(&hook.args, post_rewrite_hook); - argv_array_push(&hook.args, "rebase"); + strvec_push(&hook.args, post_rewrite_hook); + strvec_push(&hook.args, "rebase"); /* we don't care if this hook failed */ run_command(&hook); } } - apply_autostash(opts); + apply_autostash(rebase_path_autostash()); if (!opts->quiet) { if (!opts->verbose) term_clear_line(); fprintf(stderr, - "Successfully rebased and updated %s.\n", + _("Successfully rebased and updated %s.\n"), head_ref.buf); } @@ -4098,8 +4320,8 @@ static int continue_single_pick(struct repository *r) { const char *argv[] = { "commit", NULL }; - if (!file_exists(git_path_cherry_pick_head(r)) && - !file_exists(git_path_revert_head(r))) + if (!refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") && + !refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) return error(_("no cherry-pick or revert in progress")); return run_command_v_opt(argv, RUN_GIT_CMD); } @@ -4197,9 +4419,10 @@ 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 = get_commit_buffer(commit, NULL)) || + !(p = logmsg_reencode(commit, NULL, encoding)) || write_message(p, strlen(p), path, 0)) { unuse_commit_buffer(commit, p); return error(_("could not write file: " @@ -4214,15 +4437,16 @@ static int commit_staged_changes(struct repository *r, } if (is_clean) { - const char *cherry_pick_head = git_path_cherry_pick_head(r); - - if (file_exists(cherry_pick_head) && unlink(cherry_pick_head)) + if (refs_ref_exists(get_main_ref_store(r), + "CHERRY_PICK_HEAD") && + refs_delete_ref(get_main_ref_store(r), "", + "CHERRY_PICK_HEAD", NULL, 0)) return error(_("could not remove CHERRY_PICK_HEAD")); if (!final_fixup) return 0; } - if (run_git_commit(r, final_fixup ? NULL : rebase_path_message(), + if (run_git_commit(final_fixup ? NULL : rebase_path_message(), opts, flags)) return error(_("could not commit staged changes.")); unlink(rebase_path_amend()); @@ -4243,6 +4467,22 @@ static int commit_staged_changes(struct repository *r, return 0; } +static int init_committer(struct replay_opts *opts) +{ + struct ident_split id; + const char *committer; + + committer = git_committer_info(IDENT_STRICT); + if (split_ident_line(&id, committer, strlen(committer)) < 0) + return error(_("invalid committer '%s'"), committer); + opts->committer_name = + xmemdupz(id.name_begin, id.name_end - id.name_begin); + opts->committer_email = + xmemdupz(id.mail_begin, id.mail_end - id.mail_begin); + + return 0; +} + int sequencer_continue(struct repository *r, struct replay_opts *opts) { struct todo_list todo_list = TODO_LIST_INIT; @@ -4254,10 +4494,23 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts) if (read_populate_opts(opts)) return -1; if (is_rebase_i(opts)) { + if (opts->committer_date_is_author_date && init_committer(opts)) + return -1; + if ((res = read_populate_todo(r, &todo_list, opts))) goto release_todo_list; - if (commit_staged_changes(r, opts, &todo_list)) - return -1; + + 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; + } } else if (!file_exists(get_todo_path(opts))) return continue_single_pick(r); else if ((res = read_populate_todo(r, &todo_list, opts))) @@ -4265,8 +4518,9 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts) if (!is_rebase_i(opts)) { /* Verify that the conflict has been resolved */ - if (file_exists(git_path_cherry_pick_head(r)) || - file_exists(git_path_revert_head(r))) { + if (refs_ref_exists(get_main_ref_store(r), + "CHERRY_PICK_HEAD") || + refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) { res = continue_single_pick(r); if (res) goto release_todo_list; @@ -4280,8 +4534,9 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts) struct strbuf buf = STRBUF_INIT; struct object_id oid; - if (read_oneliner(&buf, rebase_path_stopped_sha(), 1) && - !get_oid_committish(buf.buf, &oid)) + if (read_oneliner(&buf, rebase_path_stopped_sha(), + READ_ONELINER_SKIP_IF_EMPTY) && + !get_oid_hex(buf.buf, &oid)) record_in_rewritten(&oid, peek_command(&todo_list, 0)); strbuf_release(&buf); } @@ -4296,9 +4551,12 @@ 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); + TODO_PICK : TODO_REVERT, cmit, opts, 0, + &check_todo); } int sequencer_pick_revisions(struct repository *r, @@ -4440,9 +4698,14 @@ struct labels_entry { char label[FLEX_ARRAY]; }; -static int labels_cmp(const void *fndata, const struct labels_entry *a, - const struct labels_entry *b, const void *key) +static int labels_cmp(const void *fndata, const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, 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); } @@ -4463,7 +4726,6 @@ 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); @@ -4483,11 +4745,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_reset(&state->buf); - strbuf_grow(&state->buf, GIT_SHA1_HEXSZ); + strbuf_grow(&state->buf, GIT_MAX_HEXSZ); label = p = state->buf.buf; find_unique_abbrev_r(p, oid, default_abbrev); @@ -4500,7 +4762,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 < GIT_SHA1_HEXSZ; i++) { + for (; i < the_hash_algo->hexsz; i++) { char save = p[i]; p[i] = '\0'; if (!hashmap_get_from_hash(&state->labels, @@ -4509,37 +4771,60 @@ static const char *label_oid(struct object_id *oid, const char *label, p[i] = save; } } - } 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)) { + } else { + struct strbuf *buf = &state->buf; + /* - * 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. + * 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. */ - struct strbuf *buf = &state->buf; + 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; - strbuf_reset(buf); - strbuf_add(buf, label, len); + 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; - 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; - } + 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; + label = buf->buf; + } } FLEX_ALLOC_STR(labels_entry, label, label); - hashmap_entry_init(labels_entry, strihash(label)); - hashmap_add(&state->labels, labels_entry); + hashmap_entry_init(&labels_entry->entry, strihash(label)); + hashmap_add(&state->labels, &labels_entry->entry); FLEX_ALLOC_STR(string_entry, string, label); oidcpy(&string_entry->entry.oid, oid); @@ -4554,6 +4839,7 @@ static int make_script_with_merges(struct pretty_print_context *pp, { 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; @@ -4573,14 +4859,19 @@ static int make_script_with_merges(struct pretty_print_context *pp, oidmap_init(&commit2todo, 0); oidmap_init(&state.commit2label, 0); - hashmap_init(&state.labels, (hashmap_cmp_fn) labels_cmp, NULL, 0); + hashmap_init(&state.labels, 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); } /* @@ -4601,6 +4892,8 @@ static int make_script_with_merges(struct pretty_print_context *pp, is_empty = is_original_commit_empty(commit); if (!is_empty && (commit->object.flags & PATCHSAME)) continue; + if (is_empty && !keep_empty) + continue; strbuf_reset(&oneline); pretty_print_commit(pp, commit, &oneline); @@ -4609,11 +4902,12 @@ 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); + if (is_empty) + strbuf_addf(&buf, " %c empty", + comment_line_char); FLEX_ALLOC_STR(entry, string, buf.buf); oidcpy(&entry->entry.oid, &commit->object.oid); @@ -4635,10 +4929,6 @@ 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)); @@ -4681,7 +4971,7 @@ static int make_script_with_merges(struct pretty_print_context *pp, label_oid(oid, "branch-point", &state); } - /* Add HEAD as implict "tip of branch" */ + /* Add HEAD as implicit "tip of branch" */ if (!iter->next) tips_tail = &commit_list_insert(iter->item, tips_tail)->next; @@ -4720,7 +5010,8 @@ static int make_script_with_merges(struct pretty_print_context *pp, if (!commit) strbuf_addf(out, "%s %s\n", cmd_reset, - rebase_cousins ? "onto" : "[new root]"); + rebase_cousins || root_with_onto ? + "onto" : "[new root]"); else { const char *to = NULL; @@ -4767,7 +5058,7 @@ static int make_script_with_merges(struct pretty_print_context *pp, oidmap_free(&commit2todo, 1); oidmap_free(&state.commit2label, 1); - hashmap_free(&state.labels, 1); + hashmap_free_entries(&state.labels, struct labels_entry, entry); strbuf_release(&state.buf); return 0; @@ -4783,12 +5074,13 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, 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; + int reapply_cherry_picks = flags & TODO_LIST_REAPPLY_CHERRY_PICKS; repo_init_revisions(r, &revs, NULL); revs.verbose_header = 1; if (!rebase_merges) revs.max_parents = 1; - revs.cherry_mark = 1; + revs.cherry_mark = !reapply_cherry_picks; revs.limited = 1; revs.reverse = 1; revs.right_only = 1; @@ -4816,15 +5108,17 @@ 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); + if (is_empty && !keep_empty) + continue; strbuf_addf(out, "%s %s ", insn, oid_to_hex(&commit->object.oid)); pretty_print_commit(&pp, commit, out); + if (is_empty) + strbuf_addf(out, " %c empty", comment_line_char); strbuf_addch(out, '\n'); } return 0; @@ -4862,7 +5156,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 immediatly after rearranging + * As we insert the exec commands immediately 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 @@ -4911,6 +5205,8 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis max = num; for (item = todo_list->items, i = 0; i < max; i++, item++) { + char cmd; + /* if the item is not a command write it and continue */ if (item->command >= TODO_COMMENT) { strbuf_addf(buf, "%.*s\n", item->arg_len, @@ -4919,8 +5215,9 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis } /* add command to the buffer */ - if (flags & TODO_LIST_ABBREVIATE_CMDS) - strbuf_addch(buf, command_to_char(item->command)); + cmd = command_to_char(item->command); + if ((flags & TODO_LIST_ABBREVIATE_CMDS) && cmd) + strbuf_addch(buf, cmd); else strbuf_addstr(buf, command_to_string(item->command)); @@ -4958,7 +5255,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(flags & TODO_LIST_KEEP_EMPTY, count_commands(todo_list), + append_todo_help(count_commands(todo_list), shortrevisions, shortonto, &buf); res = write_message(buf.buf, buf.len, file, 0); @@ -4967,41 +5264,6 @@ 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, @@ -5041,6 +5303,7 @@ 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)); @@ -5055,13 +5318,14 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla struct string_list *commands, unsigned autosquash, struct todo_list *todo_list) { - const char *shortonto, *todo_file = rebase_path_todo(); + char shortonto[GIT_MAX_HEXSZ + 1]; + const char *todo_file = rebase_path_todo(); struct todo_list new_todo = TODO_LIST_INIT; - struct strbuf *buf = &todo_list->buf; + struct strbuf *buf = &todo_list->buf, buf2 = STRBUF_INIT; struct object_id oid = onto->object.oid; int res; - shortonto = find_unique_abbrev(&oid, DEFAULT_ABBREV); + find_unique_abbrev_r(shortonto, &oid, DEFAULT_ABBREV); if (buf->len == 0) { struct todo_item *item = append_new_todo(todo_list); @@ -5077,7 +5341,7 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla todo_list_add_exec_commands(todo_list, commands); if (count_commands(todo_list) == 0) { - apply_autostash(opts); + apply_autostash(rebase_path_autostash()); sequencer_remove_state(opts); return error(_("nothing to do")); @@ -5088,27 +5352,32 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla if (res == -1) return -1; else if (res == -2) { - apply_autostash(opts); + apply_autostash(rebase_path_autostash()); sequencer_remove_state(opts); return -1; } else if (res == -3) { - apply_autostash(opts); + apply_autostash(rebase_path_autostash()); sequencer_remove_state(opts); todo_list_release(&new_todo); return error(_("nothing to do")); - } - - 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)); + } else if (res == -4) { 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")); @@ -5120,15 +5389,24 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla return error_errno(_("could not write '%s'"), todo_file); } - todo_list_release(&new_todo); + res = -1; + + if (opts->committer_date_is_author_date && init_committer(opts)) + goto cleanup; if (checkout_onto(r, opts, onto_name, &oid, orig_head)) - return -1; + goto cleanup; if (require_clean_work_tree(r, "rebase", "", 1, 1)) - return -1; + goto cleanup; - return sequencer_continue(r, opts); + todo_list_write_total_nr(&new_todo); + res = pick_commits(r, &new_todo, opts); + +cleanup: + todo_list_release(&new_todo); + + return res; } struct subject2item_entry { @@ -5138,9 +5416,15 @@ struct subject2item_entry { }; static int subject2item_cmp(const void *fndata, - const struct subject2item_entry *a, - const struct subject2item_entry *b, const void *key) + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, + 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); } @@ -5173,8 +5457,7 @@ 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, (hashmap_cmp_fn) subject2item_cmp, - NULL, todo_list->nr); + hashmap_init(&subject2item, subject2item_cmp, NULL, todo_list->nr); ALLOC_ARRAY(next, todo_list->nr); ALLOC_ARRAY(tail, todo_list->nr); ALLOC_ARRAY(subjects, todo_list->nr); @@ -5200,7 +5483,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 = get_commit_buffer(item->commit, NULL); + commit_buffer = logmsg_reencode(item->commit, NULL, "UTF-8"); find_commit_subject(commit_buffer, &subject); format_subject(&buf, subject, " "); subject = subjects[i] = strbuf_detach(&buf, &subject_len); @@ -5217,8 +5500,11 @@ int todo_list_rearrange_squash(struct todo_list *todo_list) break; } - if ((entry = hashmap_get_from_hash(&subject2item, - strhash(p), p))) + entry = hashmap_get_entry_from_hash(&subject2item, + strhash(p), p, + struct subject2item_entry, + entry); + if (entry) /* found by title */ i2 = entry->i; else if (!strchr(p, ' ') && @@ -5243,17 +5529,21 @@ int todo_list_rearrange_squash(struct todo_list *todo_list) todo_list->items[i].command = starts_with(subject, "fixup!") ? TODO_FIXUP : TODO_SQUASH; - if (next[i2] < 0) + if (tail[i2] < 0) { + next[i] = next[i2]; next[i2] = i; - else + } else { + next[i] = next[tail[i2]]; next[tail[i2]] = i; + } tail[i2] = i; } else if (!hashmap_get_from_hash(&subject2item, strhash(subject), subject)) { FLEX_ALLOC_MEM(entry, subject, subject, subject_len); entry->i = i; - hashmap_entry_init(entry, strhash(entry->subject)); - hashmap_put(&subject2item, entry); + hashmap_entry_init(&entry->entry, + strhash(entry->subject)); + hashmap_put(&subject2item, &entry->entry); } } @@ -5287,9 +5577,30 @@ 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(&subject2item, 1); + hashmap_free_entries(&subject2item, struct subject2item_entry, entry); clear_commit_todo_item(&commit_todo); return 0; } + +int sequencer_determine_whence(struct repository *r, enum commit_whence *whence) +{ + if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD")) { + struct object_id cherry_pick_head, rebase_head; + + if (file_exists(git_path_seq_dir())) + *whence = FROM_CHERRY_PICK_MULTI; + if (file_exists(rebase_path()) && + !get_oid("REBASE_HEAD", &rebase_head) && + !get_oid("CHERRY_PICK_HEAD", &cherry_pick_head) && + oideq(&rebase_head, &cherry_pick_head)) + *whence = FROM_REBASE_PICK; + else + *whence = FROM_CHERRY_PICK_SINGLE; + + return 1; + } + + return 0; +} diff --git a/third_party/git/sequencer.h b/third_party/git/sequencer.h index 6704acbb9c..b2a501e445 100644 --- a/third_party/git/sequencer.h +++ b/third_party/git/sequencer.h @@ -3,14 +3,15 @@ #include "cache.h" #include "strbuf.h" +#include "wt-status.h" struct commit; struct repository; 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) @@ -39,13 +40,18 @@ 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; int reschedule_failed_exec; + int committer_date_is_author_date; + int ignore_date; int mainline; + char *committer_name; + char *committer_email; char *gpg_sign; enum commit_msg_cleanup_mode default_msg_cleanup; int explicit_cleanup; @@ -143,13 +149,18 @@ 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) +#define TODO_LIST_REAPPLY_CHERRY_PICKS (1U << 7) 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, @@ -184,8 +195,11 @@ 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); +void create_autostash(struct repository *r, const char *path, + const char *default_reflog_action); +int save_autostash(const char *path); +int apply_autostash(const char *path); +int apply_autostash_oid(const char *stash_oid); #define SUMMARY_INITIAL_COMMIT (1 << 0) #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1) @@ -194,13 +208,27 @@ void print_commit_summary(struct repository *repo, const struct object_id *oid, unsigned int flags); +#define READ_ONELINER_SKIP_IF_EMPTY (1 << 0) +#define READ_ONELINER_WARN_MISSING (1 << 1) + +/* + * Reads a file that was presumably written by a shell script, i.e. with an + * end-of-line marker that needs to be stripped. + * + * Note that only the last end-of-line marker is stripped, consistent with the + * behavior of "$(cat path)" in a shell script. + * + * Returns 1 if the file was read, 0 if it could not be read or does not exist. + */ +int read_oneliner(struct strbuf *buf, + const char *path, unsigned flags); 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); +int sequencer_determine_whence(struct repository *r, enum commit_whence *whence); +#endif /* SEQUENCER_H */ diff --git a/third_party/git/serve.c b/third_party/git/serve.c index 317256c1a4..f6341206c4 100644 --- a/third_party/git/serve.c +++ b/third_party/git/serve.c @@ -3,7 +3,7 @@ #include "config.h" #include "pkt-line.h" #include "version.h" -#include "argv-array.h" +#include "strvec.h" #include "ls-refs.h" #include "serve.h" #include "upload-pack.h" @@ -22,6 +22,14 @@ static int agent_advertise(struct repository *r, return 1; } +static int object_format_advertise(struct repository *r, + struct strbuf *value) +{ + if (value) + strbuf_addstr(value, r->hash_algo->name); + return 1; +} + struct protocol_capability { /* * The name of the capability. The server uses this name when @@ -48,7 +56,7 @@ struct protocol_capability { * This field should be NULL for capabilities which are not commands. */ int (*command)(struct repository *r, - struct argv_array *keys, + struct strvec *keys, struct packet_reader *request); }; @@ -57,6 +65,7 @@ static struct protocol_capability capabilities[] = { { "ls-refs", always_advertise, ls_refs }, { "fetch", upload_pack_advertise, upload_pack_v2 }, { "server-option", always_advertise, NULL }, + { "object-format", object_format_advertise, NULL }, }; static void advertise_capabilities(void) @@ -133,13 +142,13 @@ static int is_command(const char *key, struct protocol_capability **command) return 0; } -int has_capability(const struct argv_array *keys, const char *capability, +int has_capability(const struct strvec *keys, const char *capability, const char **value) { int i; - for (i = 0; i < keys->argc; i++) { + for (i = 0; i < keys->nr; i++) { const char *out; - if (skip_prefix(keys->argv[i], capability, &out) && + if (skip_prefix(keys->v[i], capability, &out) && (!*out || *out == '=')) { if (value) { if (*out == '=') @@ -153,6 +162,22 @@ int has_capability(const struct argv_array *keys, const char *capability, return 0; } +static void check_algorithm(struct repository *r, struct strvec *keys) +{ + int client = GIT_HASH_SHA1, server = hash_algo_by_ptr(r->hash_algo); + const char *algo_name; + + if (has_capability(keys, "object-format", &algo_name)) { + client = hash_algo_by_name(algo_name); + if (client == GIT_HASH_UNKNOWN) + die("unknown object format '%s'", algo_name); + } + + if (client != server) + die("mismatched object format: server %s; client %s\n", + r->hash_algo->name, hash_algos[client].name); +} + enum request_state { PROCESS_REQUEST_KEYS, PROCESS_REQUEST_DONE, @@ -162,7 +187,7 @@ static int process_request(void) { enum request_state state = PROCESS_REQUEST_KEYS; struct packet_reader reader; - struct argv_array keys = ARGV_ARRAY_INIT; + struct strvec keys = STRVEC_INIT; struct protocol_capability *command = NULL; packet_reader_init(&reader, 0, NULL, 0, @@ -186,7 +211,7 @@ static int process_request(void) /* collect request; a sequence of keys and values */ if (is_command(reader.line, &command) || is_valid_capability(reader.line)) - argv_array_push(&keys, reader.line); + strvec_push(&keys, reader.line); else die("unknown capability '%s'", reader.line); @@ -198,7 +223,7 @@ static int process_request(void) * If no command and no keys were given then the client * wanted to terminate the connection. */ - if (!keys.argc) + if (!keys.nr) return 1; /* @@ -217,15 +242,19 @@ static int process_request(void) state = PROCESS_REQUEST_DONE; break; + case PACKET_READ_RESPONSE_END: + BUG("unexpected stateless separator packet"); } } if (!command) die("no command requested"); + check_algorithm(the_repository, &keys); + command->command(the_repository, &keys, &reader); - argv_array_clear(&keys); + strvec_clear(&keys); return 0; } diff --git a/third_party/git/serve.h b/third_party/git/serve.h index 42ddca7f8b..fc2683e24d 100644 --- a/third_party/git/serve.h +++ b/third_party/git/serve.h @@ -1,8 +1,8 @@ #ifndef SERVE_H #define SERVE_H -struct argv_array; -int has_capability(const struct argv_array *keys, const char *capability, +struct strvec; +int has_capability(const struct strvec *keys, const char *capability, const char **value); struct serve_options { diff --git a/third_party/git/server-info.c b/third_party/git/server-info.c index 4d8199b1d9..bae2cdfd51 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 aginst old_fp + * uic_printf will compare incremental comparison against 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 8dcb4631f7..c04cd25a30 100644 --- a/third_party/git/setup.c +++ b/third_party/git/setup.c @@ -4,6 +4,7 @@ #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; @@ -31,6 +32,7 @@ static int abspath_part_inside_repo(char *path) char *path0; int off; const char *work_tree = get_git_work_tree(); + struct strbuf realpath = STRBUF_INIT; if (!work_tree) return -1; @@ -59,8 +61,10 @@ static int abspath_part_inside_repo(char *path) path++; if (*path == '/') { *path = '\0'; - if (fspathcmp(real_path(path0), work_tree) == 0) { + strbuf_realpath(&realpath, path0, 1); + if (fspathcmp(realpath.buf, work_tree) == 0) { memmove(path0, path + 1, len - (path - path0)); + strbuf_release(&realpath); return 0; } *path = '/'; @@ -68,11 +72,14 @@ static int abspath_part_inside_repo(char *path) } /* check whole path */ - if (fspathcmp(real_path(path0), work_tree) == 0) { + strbuf_realpath(&realpath, path0, 1); + if (fspathcmp(realpath.buf, work_tree) == 0) { *path0 = '\0'; + strbuf_release(&realpath); return 0; } + strbuf_release(&realpath); return -1; } @@ -119,8 +126,13 @@ 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) - die(_("'%s' is outside repository"), 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)); + } return r; } @@ -196,9 +208,26 @@ static void NORETURN die_verify_filename(struct repository *r, */ static int looks_like_pathspec(const char *arg) { - /* anything with a wildcard character */ - if (!no_wildcard(arg)) - return 1; + 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; + } + } /* long-form pathspec magic */ if (starts_with(arg, ":(")) @@ -418,6 +447,63 @@ static int read_worktree_config(const char *var, const char *value, void *vdata) return 0; } +enum extension_result { + EXTENSION_ERROR = -1, /* compatible with error(), etc */ + EXTENSION_UNKNOWN = 0, + EXTENSION_OK = 1 +}; + +/* + * Do not add new extensions to this function. It handles extensions which are + * respected even in v0-format repositories for historical compatibility. + */ +static enum extension_result handle_extension_v0(const char *var, + const char *value, + const char *ext, + struct repository_format *data) +{ + if (!strcmp(ext, "noop")) { + return EXTENSION_OK; + } else if (!strcmp(ext, "preciousobjects")) { + data->precious_objects = git_config_bool(var, value); + return EXTENSION_OK; + } else if (!strcmp(ext, "partialclone")) { + if (!value) + return config_error_nonbool(var); + data->partial_clone = xstrdup(value); + return EXTENSION_OK; + } else if (!strcmp(ext, "worktreeconfig")) { + data->worktree_config = git_config_bool(var, value); + return EXTENSION_OK; + } + + return EXTENSION_UNKNOWN; +} + +/* + * Record any new extensions in this function. + */ +static enum extension_result handle_extension(const char *var, + const char *value, + const char *ext, + struct repository_format *data) +{ + if (!strcmp(ext, "noop-v1")) { + return EXTENSION_OK; + } else if (!strcmp(ext, "objectformat")) { + int format; + + if (!value) + return config_error_nonbool(var); + format = hash_algo_by_name(value); + if (format == GIT_HASH_UNKNOWN) + return error("invalid value for 'extensions.objectformat'"); + data->hash_algo = format; + return EXTENSION_OK; + } + return EXTENSION_UNKNOWN; +} + static int check_repo_format(const char *var, const char *value, void *vdata) { struct repository_format *data = vdata; @@ -426,23 +512,25 @@ static int check_repo_format(const char *var, const char *value, void *vdata) if (strcmp(var, "core.repositoryformatversion") == 0) data->version = git_config_int(var, value); else if (skip_prefix(var, "extensions.", &ext)) { - /* - * record any known extensions here; otherwise, - * we fall through to recording it as unknown, and - * check_repository_format will complain - */ - if (!strcmp(ext, "noop")) - ; - else if (!strcmp(ext, "preciousobjects")) - data->precious_objects = git_config_bool(var, value); - else if (!strcmp(ext, "partialclone")) { - if (!value) - return config_error_nonbool(var); - data->partial_clone = xstrdup(value); - } else if (!strcmp(ext, "worktreeconfig")) - data->worktree_config = git_config_bool(var, value); - else + switch (handle_extension_v0(var, value, ext, data)) { + case EXTENSION_ERROR: + return -1; + case EXTENSION_OK: + return 0; + case EXTENSION_UNKNOWN: + break; + } + + switch (handle_extension(var, value, ext, data)) { + case EXTENSION_ERROR: + return -1; + case EXTENSION_OK: + string_list_append(&data->v1_only_extensions, ext); + return 0; + case EXTENSION_UNKNOWN: string_list_append(&data->unknown_extensions, ext); + return 0; + } } return read_worktree_config(var, value, vdata); @@ -478,9 +566,10 @@ static int check_repository_format_gently(const char *gitdir, struct repository_ } repository_format_precious_objects = candidate->precious_objects; - repository_format_partial_clone = xstrdup_or_null(candidate->partial_clone); + set_repository_format_partial_clone(candidate->partial_clone); repository_format_worktree_config = candidate->worktree_config; string_list_clear(&candidate->unknown_extensions, 0); + string_list_clear(&candidate->v1_only_extensions, 0); if (repository_format_worktree_config) { /* @@ -509,6 +598,37 @@ static int check_repository_format_gently(const char *gitdir, struct repository_ return 0; } +int upgrade_repository_format(int target_version) +{ + struct strbuf sb = STRBUF_INIT; + struct strbuf err = STRBUF_INIT; + struct strbuf repo_version = STRBUF_INIT; + struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT; + + strbuf_git_common_path(&sb, the_repository, "config"); + read_repository_format(&repo_fmt, sb.buf); + strbuf_release(&sb); + + if (repo_fmt.version >= target_version) + return 0; + + if (verify_repository_format(&repo_fmt, &err) < 0) { + error("cannot upgrade repository format from %d to %d: %s", + repo_fmt.version, target_version, err.buf); + strbuf_release(&err); + return -1; + } + if (!repo_fmt.version && repo_fmt.unknown_extensions.nr) + return error("cannot upgrade repository format: " + "unknown extension %s", + repo_fmt.unknown_extensions.items[0].string); + + strbuf_addf(&repo_version, "%d", target_version); + git_config_set("core.repositoryformatversion", repo_version.buf); + strbuf_release(&repo_version); + return 1; +} + static void init_repository_format(struct repository_format *format) { const struct repository_format fresh = REPOSITORY_FORMAT_INIT; @@ -528,6 +648,7 @@ int read_repository_format(struct repository_format *format, const char *path) void clear_repository_format(struct repository_format *format) { string_list_clear(&format->unknown_extensions, 0); + string_list_clear(&format->v1_only_extensions, 0); free(format->work_tree); free(format->partial_clone); init_repository_format(format); @@ -553,6 +674,18 @@ int verify_repository_format(const struct repository_format *format, return -1; } + if (format->version == 0 && format->v1_only_extensions.nr) { + int i; + + strbuf_addstr(err, + _("repo version is 0, but v1-only extensions found:")); + + for (i = 0; i < format->v1_only_extensions.nr; i++) + strbuf_addf(err, "\n\t%s", + format->v1_only_extensions.items[i].string); + return -1; + } + return 0; } @@ -600,6 +733,7 @@ const char *read_gitfile_gently(const char *path, int *return_error_code) struct stat st; int fd; ssize_t len; + static struct strbuf realpath = STRBUF_INIT; if (stat(path, &st)) { /* NEEDSWORK: discern between ENOENT vs other errors */ @@ -650,7 +784,9 @@ const char *read_gitfile_gently(const char *path, int *return_error_code) error_code = READ_GITFILE_ERR_NOT_A_REPO; goto cleanup_return; } - path = real_path(dir); + + strbuf_realpath(&realpath, dir, 1); + path = realpath.buf; cleanup_return: if (return_error_code) @@ -706,7 +842,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv, } /* #18, #26 */ - set_git_dir(gitdirenv); + set_git_dir(gitdirenv, 0); free(gitfile); return NULL; } @@ -728,7 +864,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv, } else if (!git_env_bool(GIT_IMPLICIT_WORK_TREE_ENVIRONMENT, 1)) { /* #16d */ - set_git_dir(gitdirenv); + set_git_dir(gitdirenv, 0); free(gitfile); return NULL; } @@ -740,14 +876,14 @@ static const char *setup_explicit_git_dir(const char *gitdirenv, /* both get_git_work_tree() and cwd are already normalized */ if (!strcmp(cwd->buf, worktree)) { /* cwd == worktree */ - set_git_dir(gitdirenv); + set_git_dir(gitdirenv, 0); free(gitfile); return NULL; } offset = dir_inside_of(cwd->buf, worktree); if (offset >= 0) { /* cwd inside worktree? */ - set_git_dir(real_path(gitdirenv)); + set_git_dir(gitdirenv, 1); if (chdir(worktree)) die_errno(_("cannot chdir to '%s'"), worktree); strbuf_addch(cwd, '/'); @@ -756,7 +892,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv, } /* cwd outside worktree */ - set_git_dir(gitdirenv); + set_git_dir(gitdirenv, 0); free(gitfile); return NULL; } @@ -785,7 +921,7 @@ static const char *setup_discovered_git_dir(const char *gitdir, /* #16.2, #17.2, #20.2, #21.2, #24, #25, #28, #29 (see t1510) */ if (is_bare_repository_cfg > 0) { - set_git_dir(offset == cwd->len ? gitdir : real_path(gitdir)); + set_git_dir(gitdir, (offset != cwd->len)); if (chdir(cwd->buf)) die_errno(_("cannot come back to cwd")); return NULL; @@ -794,10 +930,10 @@ static const char *setup_discovered_git_dir(const char *gitdir, /* #0, #1, #5, #8, #9, #12, #13 */ set_git_work_tree("."); if (strcmp(gitdir, DEFAULT_GIT_DIR_ENVIRONMENT)) - set_git_dir(gitdir); + set_git_dir(gitdir, 0); 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) */ @@ -837,10 +973,10 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset, die_errno(_("cannot come back to cwd")); root_len = offset_1st_component(cwd->buf); strbuf_setlen(cwd, offset > root_len ? offset : root_len); - set_git_dir(cwd->buf); + set_git_dir(cwd->buf, 0); } else - set_git_dir("."); + set_git_dir(".", 0); return NULL; } @@ -858,7 +994,7 @@ static dev_t get_device_or_die(const char *path, const char *prefix, int prefix_ /* * A "string_list_each_func_t" function that canonicalizes an entry - * from GIT_CEILING_DIRECTORIES using real_path_if_valid(), or + * from GIT_CEILING_DIRECTORIES using real_pathdup(), or * discards it if unusable. The presence of an empty entry in * GIT_CEILING_DIRECTORIES turns off canonicalization for all * subsequent entries. @@ -919,7 +1055,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 = has_dos_drive_prefix(dir->buf) ? 3 : 1; + int ceil_offset = -1, min_offset = offset_1st_component(dir->buf); dev_t current_device = 0; int one_filesystem = 1; @@ -947,6 +1083,12 @@ 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>") @@ -1228,11 +1370,14 @@ int git_config_perm(const char *var, const char *value) return -(i & 0666); } -void check_repository_format(void) +void check_repository_format(struct repository_format *fmt) { struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT; - check_repository_format_gently(get_git_dir(), &repo_fmt, NULL); + if (!fmt) + fmt = &repo_fmt; + check_repository_format_gently(get_git_dir(), fmt, NULL); startup_info->have_repository = 1; + repo_set_hash_algo(the_repository, fmt->hash_algo); clear_repository_format(&repo_fmt); } diff --git a/third_party/git/sha1-array.h b/third_party/git/sha1-array.h deleted file mode 100644 index 55d016c4bf..0000000000 --- a/third_party/git/sha1-array.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef SHA1_ARRAY_H -#define SHA1_ARRAY_H - -struct oid_array { - struct object_id *oid; - int nr; - int alloc; - int sorted; -}; - -#define OID_ARRAY_INIT { NULL, 0, 0, 0 } - -void oid_array_append(struct oid_array *array, const struct object_id *oid); -int oid_array_lookup(struct oid_array *array, const struct object_id *oid); -void oid_array_clear(struct oid_array *array); - -typedef int (*for_each_oid_fn)(const struct object_id *oid, - void *data); -int oid_array_for_each(struct oid_array *array, - for_each_oid_fn fn, - void *data); -int oid_array_for_each_unique(struct oid_array *array, - for_each_oid_fn fn, - void *data); -void oid_array_filter(struct oid_array *array, - for_each_oid_fn want, - void *cbdata); - -#endif /* SHA1_ARRAY_H */ diff --git a/third_party/git/sha1-file.c b/third_party/git/sha1-file.c index 487ea35d2d..dd65bd5c68 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,7 +55,6 @@ "\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 @@ -75,6 +74,11 @@ static void git_hash_sha1_init(git_hash_ctx *ctx) git_SHA1_Init(&ctx->sha1); } +static void git_hash_sha1_clone(git_hash_ctx *dst, const git_hash_ctx *src) +{ + git_SHA1_Clone(&dst->sha1, &src->sha1); +} + static void git_hash_sha1_update(git_hash_ctx *ctx, const void *data, size_t len) { git_SHA1_Update(&ctx->sha1, data, len); @@ -91,6 +95,11 @@ static void git_hash_sha256_init(git_hash_ctx *ctx) git_SHA256_Init(&ctx->sha256); } +static void git_hash_sha256_clone(git_hash_ctx *dst, const git_hash_ctx *src) +{ + git_SHA256_Clone(&dst->sha256, &src->sha256); +} + static void git_hash_sha256_update(git_hash_ctx *ctx, const void *data, size_t len) { git_SHA256_Update(&ctx->sha256, data, len); @@ -106,6 +115,11 @@ static void git_hash_unknown_init(git_hash_ctx *ctx) BUG("trying to init unknown hash"); } +static void git_hash_unknown_clone(git_hash_ctx *dst, const git_hash_ctx *src) +{ + BUG("trying to clone unknown hash"); +} + static void git_hash_unknown_update(git_hash_ctx *ctx, const void *data, size_t len) { BUG("trying to update unknown hash"); @@ -124,6 +138,7 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = { 0, 0, git_hash_unknown_init, + git_hash_unknown_clone, git_hash_unknown_update, git_hash_unknown_final, NULL, @@ -137,6 +152,7 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = { GIT_SHA1_HEXSZ, GIT_SHA1_BLKSZ, git_hash_sha1_init, + git_hash_sha1_clone, git_hash_sha1_update, git_hash_sha1_final, &empty_tree_oid, @@ -150,6 +166,7 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = { GIT_SHA256_HEXSZ, GIT_SHA256_BLKSZ, git_hash_sha256_init, + git_hash_sha256_clone, git_hash_sha256_update, git_hash_sha256_final, &empty_tree_oid_sha256, @@ -677,20 +694,15 @@ void add_to_alternates_memory(const char *reference) char *compute_alternate_path(const char *path, struct strbuf *err) { char *ref_git = NULL; - const char *repo, *ref_git_s; + const char *repo; int seen_error = 0; - ref_git_s = real_path_if_valid(path); - if (!ref_git_s) { + ref_git = real_pathdup(path, 0); + if (!ref_git) { seen_error = 1; strbuf_addf(err, _("path '%s' does not exist"), path); goto out; - } else - /* - * Beware: read_gitfile(), real_path() and mkpath() - * return static buffer - */ - ref_git = xstrdup(ref_git_s); + } repo = read_gitfile(ref_git); if (!repo) @@ -751,18 +763,18 @@ static void fill_alternate_refs_command(struct child_process *cmd, if (!git_config_get_value("core.alternateRefsCommand", &value)) { cmd->use_shell = 1; - argv_array_push(&cmd->args, value); - argv_array_push(&cmd->args, repo_path); + strvec_push(&cmd->args, value); + strvec_push(&cmd->args, repo_path); } else { cmd->git_cmd = 1; - argv_array_pushf(&cmd->args, "--git-dir=%s", repo_path); - argv_array_push(&cmd->args, "for-each-ref"); - argv_array_push(&cmd->args, "--format=%(objectname)"); + strvec_pushf(&cmd->args, "--git-dir=%s", repo_path); + strvec_push(&cmd->args, "for-each-ref"); + strvec_push(&cmd->args, "--format=%(objectname)"); if (!git_config_get_value("core.alternateRefsPrefixes", &value)) { - argv_array_push(&cmd->args, "--"); - argv_array_split(&cmd->args, value); + strvec_push(&cmd->args, "--"); + strvec_split(&cmd->args, value); } } @@ -869,9 +881,7 @@ void prepare_alt_odb(struct repository *r) /* Returns 1 if we have successfully freshened the file, 0 otherwise. */ static int freshen_file(const char *fn) { - struct utimbuf t; - t.actime = t.modtime = time(NULL); - return !utime(fn, &t); + return !utime(fn, NULL); } /* @@ -952,12 +962,8 @@ void *xmmap_gently(void *start, size_t length, mmap_limit_check(length); ret = mmap(start, length, prot, flags, fd, offset); - if (ret == MAP_FAILED) { - if (!length) - return NULL; - release_pack_memory(length); - ret = mmap(start, length, prot, flags, fd, offset); - } + if (ret == MAP_FAILED && !length) + ret = NULL; return ret; } @@ -976,8 +982,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(const struct object_id *oid, void *map, - unsigned long size, const char *type) +int check_object_signature(struct repository *r, const struct object_id *oid, + void *map, unsigned long size, const char *type) { struct object_id real_oid; enum object_type obj_type; @@ -987,11 +993,11 @@ int check_object_signature(const struct object_id *oid, void *map, int hdrlen; if (map) { - hash_object_file(map, size, type, &real_oid); + hash_object_file(r->hash_algo, map, size, type, &real_oid); return !oideq(oid, &real_oid) ? -1 : 0; } - st = open_istream(oid, &obj_type, &size, NULL); + st = open_istream(r, oid, &obj_type, &size, NULL); if (!st) return -1; @@ -999,8 +1005,8 @@ int check_object_signature(const struct object_id *oid, void *map, hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(obj_type), (uintmax_t)size) + 1; /* Sha1.. */ - the_hash_algo->init_fn(&c); - the_hash_algo->update_fn(&c, hdr, hdrlen); + r->hash_algo->init_fn(&c); + r->hash_algo->update_fn(&c, hdr, hdrlen); for (;;) { char buf[1024 * 16]; ssize_t readlen = read_istream(st, buf, sizeof(buf)); @@ -1011,9 +1017,9 @@ int check_object_signature(const struct object_id *oid, void *map, } if (!readlen) break; - the_hash_algo->update_fn(&c, buf, readlen); + r->hash_algo->update_fn(&c, buf, readlen); } - the_hash_algo->final_fn(real_oid.hash, &c); + r->hash_algo->final_fn(real_oid.hash, &c); close_istream(st); return !oideq(oid, &real_oid) ? -1 : 0; } @@ -1152,6 +1158,8 @@ 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; @@ -1160,7 +1168,11 @@ static int unpack_loose_short_header(git_zstream *stream, stream->avail_out = bufsiz; git_inflate_init(stream); - return git_inflate(stream, 0); + obj_read_unlock(); + ret = git_inflate(stream, 0); + obj_read_lock(); + + return ret; } int unpack_loose_header(git_zstream *stream, @@ -1205,7 +1217,9 @@ 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; @@ -1245,8 +1259,11 @@ static void *unpack_loose_rest(git_zstream *stream, */ stream->next_out = buf + bytes; stream->avail_out = size - bytes; - while (status == Z_OK) + while (status == Z_OK) { + obj_read_unlock(); status = git_inflate(stream, Z_FINISH); + obj_read_lock(); + } } if (status == Z_STREAM_END && !stream->avail_in) { git_inflate_end(stream); @@ -1348,8 +1365,8 @@ static int loose_object_info(struct repository *r, struct strbuf hdrbuf = STRBUF_INIT; unsigned long size_scratch; - if (oi->delta_base_sha1) - hashclr(oi->delta_base_sha1); + if (oi->delta_base_oid) + oidclr(oi->delta_base_oid); /* * If we don't care about type or size, then we don't @@ -1416,17 +1433,41 @@ 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; -int oid_object_info_extended(struct repository *r, const struct object_id *oid, - struct object_info *oi, unsigned flags) +static int do_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); @@ -1436,24 +1477,22 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid, if (!oi) oi = &blank_oi; - 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; - } + 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; } while (1) { @@ -1475,16 +1514,17 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid, } /* Check if it is a missing object */ - if (fetch_if_missing && repository_format_partial_clone && + if (fetch_if_missing && has_promisor_remote() && !already_retried && r == the_repository && !(flags & OBJECT_INFO_SKIP_FETCH_OBJECT)) { /* - * 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. + * 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. */ - fetch_objects(repository_format_partial_clone, real, 1); + promisor_remote_get_direct(r, real, 1); already_retried = 1; continue; } @@ -1501,7 +1541,7 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid, rtype = packed_object_info(r, e.p, e.offset, oi); if (rtype < 0) { mark_bad_packed_object(e.p, real->hash); - return oid_object_info_extended(r, real, oi, 0); + return do_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; @@ -1512,6 +1552,17 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid, 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, @@ -1548,8 +1599,9 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type, { struct cached_object *co; - hash_object_file(buf, len, type_name(type), oid); - if (has_object_file(oid) || find_cached_object(oid)) + hash_object_file(the_hash_algo, buf, len, type_name(type), oid); + if (has_object_file_with_flags(oid, OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT) || + find_cached_object(oid)) return 0; ALLOC_GROW(cached_objects, cached_object_nr + 1, cached_object_alloc); co = &cached_objects[cached_object_nr++]; @@ -1584,6 +1636,7 @@ 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)); @@ -1599,6 +1652,7 @@ 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; } @@ -1652,7 +1706,8 @@ void *read_object_with_reference(struct repository *r, } } -static void write_object_file_prepare(const void *buf, unsigned long len, +static void write_object_file_prepare(const struct git_hash_algo *algo, + const void *buf, unsigned long len, const char *type, struct object_id *oid, char *hdr, int *hdrlen) { @@ -1662,10 +1717,10 @@ static void write_object_file_prepare(const void *buf, unsigned long len, *hdrlen = xsnprintf(hdr, *hdrlen, "%s %"PRIuMAX , type, (uintmax_t)len)+1; /* Sha1.. */ - 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); + algo->init_fn(&c); + algo->update_fn(&c, hdr, *hdrlen); + algo->update_fn(&c, buf, len); + algo->final_fn(oid->hash, &c); } /* @@ -1718,12 +1773,13 @@ static int write_buffer(int fd, const void *buf, size_t len) return 0; } -int hash_object_file(const void *buf, unsigned long len, const char *type, +int hash_object_file(const struct git_hash_algo *algo, 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(buf, len, type, oid, hdr, &hdrlen); + write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen); return 0; } @@ -1881,7 +1937,8 @@ 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(buf, len, type, oid, hdr, &hdrlen); + write_object_file_prepare(the_hash_algo, 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); @@ -1897,7 +1954,8 @@ 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(buf, len, type, oid, header, &hdrlen); + write_object_file_prepare(the_hash_algo, buf, len, type, oid, header, + &hdrlen); if (!(flags & HASH_WRITE_OBJECT)) goto cleanup; @@ -1931,13 +1989,24 @@ int force_object_loose(const struct object_id *oid, time_t mtime) return ret; } +int has_object(struct repository *r, const struct object_id *oid, + unsigned flags) +{ + int quick = !(flags & HAS_OBJECT_RECHECK_PACKED); + unsigned object_info_flags = OBJECT_INFO_SKIP_FETCH_OBJECT | + (quick ? OBJECT_INFO_QUICK : 0); + + if (!startup_info->have_repository) + return 0; + return oid_object_info_extended(r, oid, NULL, object_info_flags) >= 0; +} + int repo_has_object_file_with_flags(struct repository *r, const struct object_id *oid, int flags) { if (!startup_info->have_repository) return 0; - return oid_object_info_extended(r, oid, NULL, - flags | OBJECT_INFO_SKIP_CACHED) >= 0; + return oid_object_info_extended(r, oid, NULL, flags) >= 0; } int repo_has_object_file(struct repository *r, @@ -2008,7 +2077,8 @@ 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(buf, size, type_name(type), oid); + ret = hash_object_file(the_hash_algo, buf, size, + type_name(type), oid); if (re_allocated) free(buf); return ret; @@ -2034,8 +2104,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(sbuf.buf, sbuf.len, type_name(OBJ_BLOB), - oid); + ret = hash_object_file(the_hash_algo, sbuf.buf, sbuf.len, + type_name(OBJ_BLOB), oid); strbuf_release(&sbuf); return ret; } @@ -2153,7 +2223,8 @@ 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(sb.buf, sb.len, blob_type, oid); + hash_object_file(the_hash_algo, 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); @@ -2454,8 +2525,9 @@ int read_loose_object(const char *path, git_inflate_end(&stream); goto out; } - if (check_object_signature(expected_oid, *contents, - *size, type_name(*type))) { + if (check_object_signature(the_repository, 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 796ab68da8..29185844ec 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 *sha1, void *table, size_t nr, +int sha1_pos(const unsigned char *hash, void *table, size_t nr, sha1_access_fn fn) { size_t hi = nr; @@ -63,14 +63,14 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr, if (nr != 1) { size_t lov, hiv, miv, ofs; - for (ofs = 0; ofs < 18; ofs += 2) { + for (ofs = 0; ofs < the_hash_algo->rawsz - 2; ofs += 2) { lov = take2(fn(0, table) + ofs); hiv = take2(fn(nr - 1, table) + ofs); - miv = take2(sha1 + ofs); + miv = take2(hash + ofs); if (miv < lov) return -1; if (hiv < miv) - return -1 - nr; + return index_pos_to_insert_pos(nr); if (lov != hiv) { /* * At this point miv could be equal @@ -88,7 +88,7 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr, do { int cmp; - cmp = hashcmp(fn(mi, table), sha1); + cmp = hashcmp(fn(mi, table), hash); if (!cmp) return mi; if (cmp > 0) @@ -97,7 +97,7 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr, lo = mi + 1; mi = lo + (hi - lo) / 2; } while (lo < hi); - return -lo-1; + return index_pos_to_insert_pos(lo); } 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 2989e27b71..0b23b86ceb 100644 --- a/third_party/git/sha1-name.c +++ b/third_party/git/sha1-name.c @@ -8,7 +8,7 @@ #include "refs.h" #include "remote.h" #include "dir.h" -#include "sha1-array.h" +#include "oid-array.h" #include "packfile.h" #include "object-store.h" #include "repository.h" @@ -155,7 +155,6 @@ 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; @@ -173,10 +172,10 @@ static void unique_in_pack(struct packed_git *p, */ for (i = first; i < num && !ds->ambiguous; i++) { struct object_id oid; - current = nth_packed_object_oid(&oid, p, i); - if (!match_sha(ds->len, ds->bin_pfx.hash, current->hash)) + nth_packed_object_id(&oid, p, i); + if (!match_sha(ds->len, ds->bin_pfx.hash, oid.hash)) break; - update_candidates(ds, current); + update_candidates(ds, &oid); } } @@ -403,9 +402,9 @@ static int repo_collect_ambiguous(struct repository *r, return collect_ambiguous(oid, data); } -static struct repository *sort_ambiguous_repo; -static int sort_ambiguous(const void *a, const void *b) +static int sort_ambiguous(const void *a, const void *b, void *ctx) { + 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; @@ -434,10 +433,7 @@ static int sort_ambiguous(const void *a, const void *b) static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a) { - /* 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; + QSORT_S(a->oid, a->nr, sort_ambiguous, r); } static enum get_oid_result get_short_oid(struct repository *r, @@ -646,14 +642,14 @@ static void find_abbrev_len_for_pack(struct packed_git *p, */ mad->init_len = 0; if (!match) { - if (nth_packed_object_oid(&oid, p, first)) + if (!nth_packed_object_id(&oid, p, first)) extend_abbrev_len(&oid, mad); } else if (first < num - 1) { - if (nth_packed_object_oid(&oid, p, first + 1)) + if (!nth_packed_object_id(&oid, p, first + 1)) extend_abbrev_len(&oid, mad); } if (first > 0) { - if (nth_packed_object_oid(&oid, p, first - 1)) + if (!nth_packed_object_id(&oid, p, first - 1)) extend_abbrev_len(&oid, mad); } mad->init_len = mad->cur_len; @@ -813,7 +809,7 @@ static int get_oid_basic(struct repository *r, const char *str, int len, if (len == r->hash_algo->hexsz && !get_oid_hex(str, oid)) { if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) { - refs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref); + refs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref, 0); if (refs_found > 0) { warning(warn_msg, len, str); if (advice_object_name_warning) @@ -864,11 +860,11 @@ static int get_oid_basic(struct repository *r, const char *str, int len, if (!len && reflog_len) /* allow "@{...}" to mean the current branch reflog */ - refs_found = repo_dwim_ref(r, "HEAD", 4, oid, &real_ref); + refs_found = repo_dwim_ref(r, "HEAD", 4, oid, &real_ref, 0); else if (reflog_len) refs_found = repo_dwim_log(r, str, len, oid, &real_ref); else - refs_found = repo_dwim_ref(r, str, len, oid, &real_ref); + refs_found = repo_dwim_ref(r, str, len, oid, &real_ref, 0); if (!refs_found) return -1; @@ -911,26 +907,21 @@ 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 (starts_with(real_ref, "refs/heads/")) { - str = real_ref + 11; - len = strlen(real_ref + 11); - } else { - /* detached HEAD */ + if (!skip_prefix(real_ref, "refs/heads/", &str)) str = "HEAD"; - len = 4; - } + len = strlen(str); } 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); } } @@ -1163,13 +1154,22 @@ static enum get_oid_result get_oid_1(struct repository *r, } if (has_suffix) { - int num = 0; + unsigned int num = 0; int len1 = cp - name; cp++; - while (cp < name + len) - num = num * 10 + *cp++ - '0'; + 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; + } 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 buf; + struct strbuf *sb; }; 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->buf); - strbuf_add(&cb->buf, match, len); + strbuf_reset(cb->sb); + strbuf_add(cb->sb, match, len); return 1; /* we are done */ } return 0; @@ -1341,18 +1341,15 @@ static int interpret_nth_prior_checkout(struct repository *r, if (nth <= 0) return -1; cb.remaining = nth; - strbuf_init(&cb.buf, 20); + cb.sb = buf; 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; } @@ -1430,9 +1427,12 @@ static int reinterpret(struct repository *r, struct strbuf tmp = STRBUF_INIT; int used = buf->len; int ret; + struct interpret_branch_name_options options = { + .allowed = allowed + }; strbuf_add(buf, name + len, namelen - len); - ret = repo_interpret_branch_name(r, buf->buf, buf->len, &tmp, allowed); + ret = repo_interpret_branch_name(r, buf->buf, buf->len, &tmp, &options); /* that data was not interpreted, remove our cruft */ if (ret < 0) { strbuf_setlen(buf, used); @@ -1474,7 +1474,7 @@ static int interpret_branch_mark(struct repository *r, int (*get_mark)(const char *, int), const char *(*get_data)(struct branch *, struct strbuf *), - unsigned allowed) + const struct interpret_branch_name_options *options) { int len; struct branch *branch; @@ -1496,10 +1496,16 @@ static int interpret_branch_mark(struct repository *r, branch = branch_get(NULL); value = get_data(branch, &err); - if (!value) - die("%s", err.buf); + if (!value) { + if (options->nonfatal_dangling_mark) { + strbuf_release(&err); + return -1; + } else { + die("%s", err.buf); + } + } - if (!branch_interpret_allowed(value, allowed)) + if (!branch_interpret_allowed(value, options->allowed)) return -1; set_shortened_ref(r, buf, value); @@ -1509,7 +1515,7 @@ static int interpret_branch_mark(struct repository *r, int repo_interpret_branch_name(struct repository *r, const char *name, int namelen, struct strbuf *buf, - unsigned allowed) + const struct interpret_branch_name_options *options) { char *at; const char *start; @@ -1518,7 +1524,7 @@ int repo_interpret_branch_name(struct repository *r, if (!namelen) namelen = strlen(name); - if (!allowed || (allowed & INTERPRET_BRANCH_LOCAL)) { + if (!options->allowed || (options->allowed & INTERPRET_BRANCH_LOCAL)) { len = interpret_nth_prior_checkout(r, name, namelen, buf); if (!len) { return len; /* syntax Ok, not enough switches */ @@ -1526,7 +1532,8 @@ int repo_interpret_branch_name(struct repository *r, if (len == namelen) return len; /* consumed all */ else - return reinterpret(r, name, namelen, len, buf, allowed); + return reinterpret(r, name, namelen, len, buf, + options->allowed); } } @@ -1534,22 +1541,22 @@ int repo_interpret_branch_name(struct repository *r, (at = memchr(start, '@', namelen - (start - name))); start = at + 1) { - if (!allowed || (allowed & INTERPRET_BRANCH_HEAD)) { + if (!options->allowed || (options->allowed & INTERPRET_BRANCH_HEAD)) { len = interpret_empty_at(name, namelen, at - name, buf); if (len > 0) return reinterpret(r, name, namelen, len, buf, - allowed); + options->allowed); } len = interpret_branch_mark(r, name, namelen, at - name, buf, upstream_mark, branch_get_upstream, - allowed); + options); if (len > 0) return len; len = interpret_branch_mark(r, name, namelen, at - name, buf, push_mark, branch_get_push, - allowed); + options); if (len > 0) return len; } @@ -1560,7 +1567,10 @@ int repo_interpret_branch_name(struct repository *r, void strbuf_branchname(struct strbuf *sb, const char *name, unsigned allowed) { int len = strlen(name); - int used = interpret_branch_name(name, len, sb, allowed); + struct interpret_branch_name_options options = { + .allowed = allowed + }; + int used = interpret_branch_name(name, len, sb, &options); if (used < 0) used = 0; @@ -1689,14 +1699,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" - "Did you mean '%.*s:%s' aka '%.*s:./%s'?", + die(_("path '%s' exists, but not '%s'\n" + "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"), fullname, filename, object_name_len, object_name, @@ -1704,7 +1714,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); } } @@ -1732,8 +1742,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" - "Did you mean ':%d:%s'?", + die(_("path '%s' is in the index, but not at stage %d\n" + "hint: Did you mean ':%d:%s'?"), filename, stage, ce_stage(ce), filename); } @@ -1748,17 +1758,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" - "Did you mean ':%d:%s' aka ':%d:./%s'?", + die(_("path '%s' is in the index, but not '%s'\n" + "hint: 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); @@ -1771,7 +1781,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, @@ -1818,8 +1828,8 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo, cb.repo = repo; cb.list = &list; - refs_for_each_ref(repo->refs, handle_one_ref, &cb); - refs_head_ref(repo->refs, handle_one_ref, &cb); + refs_for_each_ref(get_main_ref_store(repo), handle_one_ref, &cb); + refs_head_ref(get_main_ref_store(repo), handle_one_ref, &cb); commit_list_sort_by_date(&list); return get_oid_oneline(repo, name + 2, oid, list); } @@ -1909,7 +1919,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 9d3cf81d4d..dede2cbddf 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 (embeded linux, cygwin, etc). + * *BSD and newlib (embedded 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://public-inbox.org/git/93056823-2740-d072-1ebd-46b440b33d7e@felt.demon.nl/ + * https://lore.kernel.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 e0cc9d988c..5c300e812e 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", - sha1_to_hex(hash)); + hash_to_hex_algop(hash, &hash_algos[GIT_HASH_SHA1])); } /* diff --git a/third_party/git/sha256/gcrypt.h b/third_party/git/sha256/gcrypt.h index 09bd8bb200..501da5ed91 100644 --- a/third_party/git/sha256/gcrypt.h +++ b/third_party/git/sha256/gcrypt.h @@ -22,8 +22,14 @@ inline void gcrypt_SHA256_Final(unsigned char *digest, gcrypt_SHA256_CTX *ctx) memcpy(digest, gcry_md_read(*ctx, GCRY_MD_SHA256), SHA256_DIGEST_SIZE); } +inline void gcrypt_SHA256_Clone(gcrypt_SHA256_CTX *dst, const gcrypt_SHA256_CTX *src) +{ + gcry_md_copy(dst, *src); +} + #define platform_SHA256_CTX gcrypt_SHA256_CTX #define platform_SHA256_Init gcrypt_SHA256_Init +#define platform_SHA256_Clone gcrypt_SHA256_Clone #define platform_SHA256_Update gcrypt_SHA256_Update #define platform_SHA256_Final gcrypt_SHA256_Final diff --git a/third_party/git/shallow.c b/third_party/git/shallow.c index 5fa2b15d37..91b9e1073c 100644 --- a/third_party/git/shallow.c +++ b/third_party/git/shallow.c @@ -8,15 +8,13 @@ #include "pkt-line.h" #include "remote.h" #include "refs.h" -#include "sha1-array.h" +#include "oid-array.h" #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" +#include "shallow.h" void set_alternate_shallow_file(struct repository *r, const char *path, int override) { @@ -41,15 +39,21 @@ int register_shallow(struct repository *r, const struct object_id *oid) return register_commit_graft(r, graft, 0); } -int is_repository_shallow(struct repository *r) +int unregister_shallow(const struct object_id *oid) { - /* - * NEEDSWORK: This function updates - * r->parsed_objects->{is_shallow,shallow_stat} as a side effect but - * there is no corresponding function to clear them when the shallow - * file is updated. - */ + int pos = commit_graft_pos(the_repository, oid->hash); + if (pos < 0) + return -1; + if (pos + 1 < the_repository->parsed_objects->grafts_nr) + MOVE_ARRAY(the_repository->parsed_objects->grafts + pos, + the_repository->parsed_objects->grafts + pos + 1, + the_repository->parsed_objects->grafts_nr - pos - 1); + the_repository->parsed_objects->grafts_nr--; + return 0; +} +int is_repository_shallow(struct repository *r) +{ FILE *fp; char buf[1024]; const char *path = r->parsed_objects->alternate_shallow_file; @@ -82,11 +86,34 @@ int is_repository_shallow(struct repository *r) return r->parsed_objects->is_shallow; } +static void reset_repository_shallow(struct repository *r) +{ + r->parsed_objects->is_shallow = -1; + stat_validity_clear(r->parsed_objects->shallow_stat); +} + +int commit_shallow_file(struct repository *r, struct shallow_lock *lk) +{ + int res = commit_lock_file(&lk->lock); + reset_repository_shallow(r); + return res; +} + +void rollback_shallow_file(struct repository *r, struct shallow_lock *lk) +{ + rollback_lock_file(&lk->lock); + reset_repository_shallow(r); +} + /* * TODO: use "int" elemtype instead of "int *" when/if commit-slab * supports a "valid" flag. */ define_commit_slab(commit_depth, int *); +static void free_depth_in_slab(int **ptr) +{ + FREE_AND_NULL(*ptr); +} struct commit_list *get_shallow_commits(struct object_array *heads, int depth, int shallow_flag, int not_shallow_flag) { @@ -153,13 +180,7 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth, } } } - for (i = 0; i < depths.slab_count; i++) { - int j; - - for (j = 0; j < depths.slab_size; j++) - free(depths.slab[i][j]); - } - clear_commit_depth(&depths); + deep_clear_commit_depth(&depths, free_depth_in_slab); return result; } @@ -341,22 +362,22 @@ const char *setup_temporary_shallow(const struct oid_array *extra) return ""; } -void setup_alternate_shallow(struct lock_file *shallow_lock, +void setup_alternate_shallow(struct shallow_lock *shallow_lock, const char **alternate_shallow_file, const struct oid_array *extra) { struct strbuf sb = STRBUF_INIT; int fd; - fd = hold_lock_file_for_update(shallow_lock, + fd = hold_lock_file_for_update(&shallow_lock->lock, git_path_shallow(the_repository), LOCK_DIE_ON_ERROR); check_shallow_file_for_update(the_repository); if (write_shallow_commits(&sb, 0, extra)) { if (write_in_full(fd, sb.buf, sb.len) < 0) die_errno("failed to write to %s", - get_lock_file_path(shallow_lock)); - *alternate_shallow_file = get_lock_file_path(shallow_lock); + get_lock_file_path(&shallow_lock->lock)); + *alternate_shallow_file = get_lock_file_path(&shallow_lock->lock); } else /* * is_repository_shallow() sees empty string as "no @@ -389,7 +410,7 @@ void advertise_shallow_grafts(int fd) */ void prune_shallow(unsigned options) { - struct lock_file shallow_lock = LOCK_INIT; + struct shallow_lock shallow_lock = SHALLOW_LOCK_INIT; struct strbuf sb = STRBUF_INIT; unsigned flags = SEEN_ONLY; int fd; @@ -403,18 +424,18 @@ void prune_shallow(unsigned options) strbuf_release(&sb); return; } - fd = hold_lock_file_for_update(&shallow_lock, + fd = hold_lock_file_for_update(&shallow_lock.lock, git_path_shallow(the_repository), LOCK_DIE_ON_ERROR); check_shallow_file_for_update(the_repository); if (write_shallow_commits_1(&sb, 0, NULL, flags)) { if (write_in_full(fd, sb.buf, sb.len) < 0) die_errno("failed to write to %s", - get_lock_file_path(&shallow_lock)); - commit_lock_file(&shallow_lock); + get_lock_file_path(&shallow_lock.lock)); + commit_shallow_file(the_repository, &shallow_lock); } else { unlink(git_path_shallow(the_repository)); - rollback_lock_file(&shallow_lock); + rollback_shallow_file(the_repository, &shallow_lock); } strbuf_release(&sb); } diff --git a/third_party/git/shallow.h b/third_party/git/shallow.h new file mode 100644 index 0000000000..5b4a96dcd6 --- /dev/null +++ b/third_party/git/shallow.h @@ -0,0 +1,81 @@ +#ifndef SHALLOW_H +#define SHALLOW_H + +#include "lockfile.h" +#include "object.h" +#include "repository.h" +#include "strbuf.h" + +void set_alternate_shallow_file(struct repository *r, const char *path, int override); +int register_shallow(struct repository *r, const struct object_id *oid); +int unregister_shallow(const struct object_id *oid); +int is_repository_shallow(struct repository *r); + +/* + * Lock for updating the $GIT_DIR/shallow file. + * + * Use `commit_shallow_file()` to commit an update, or + * `rollback_shallow_file()` to roll it back. In either case, any + * in-memory cached information about which commits are shallow will be + * appropriately invalidated so that future operations reflect the new + * state. + */ +struct shallow_lock { + struct lock_file lock; +}; +#define SHALLOW_LOCK_INIT { LOCK_INIT } + +/* commit $GIT_DIR/shallow and reset stat-validity checks */ +int commit_shallow_file(struct repository *r, struct shallow_lock *lk); +/* rollback $GIT_DIR/shallow and reset stat-validity checks */ +void rollback_shallow_file(struct repository *r, struct shallow_lock *lk); + +struct commit_list *get_shallow_commits(struct object_array *heads, + int depth, int shallow_flag, int not_shallow_flag); +struct commit_list *get_shallow_commits_by_rev_list( + int ac, const char **av, int shallow_flag, int not_shallow_flag); +int write_shallow_commits(struct strbuf *out, int use_pack_protocol, + const struct oid_array *extra); + +void setup_alternate_shallow(struct shallow_lock *shallow_lock, + const char **alternate_shallow_file, + const struct oid_array *extra); + +const char *setup_temporary_shallow(const struct oid_array *extra); + +void advertise_shallow_grafts(int); + +#define PRUNE_SHOW_ONLY 1 +#define PRUNE_QUICK 2 +void prune_shallow(unsigned options); + +/* + * Initialize with prepare_shallow_info() or zero-initialize (equivalent to + * prepare_shallow_info with a NULL oid_array). + */ +struct shallow_info { + struct oid_array *shallow; + int *ours, nr_ours; + int *theirs, nr_theirs; + struct oid_array *ref; + + /* for receive-pack */ + uint32_t **used_shallow; + int *need_reachability_test; + int *reachable; + int *shallow_ref; + struct commit **commits; + int nr_commits; +}; + +void prepare_shallow_info(struct shallow_info *, struct oid_array *); +void clear_shallow_info(struct shallow_info *); +void remove_nonexistent_theirs_shallow(struct shallow_info *); +void assign_shallow_commits_to_refs(struct shallow_info *info, + uint32_t **used, + int *ref_status); +int delayed_reachability_test(struct shallow_info *si, int c); + +extern struct trace_key trace_shallow; + +#endif /* SHALLOW_H */ diff --git a/third_party/git/shell.c b/third_party/git/shell.c index 40084a3013..cef7ffdc9e 100644 --- a/third_party/git/shell.c +++ b/third_party/git/shell.c @@ -4,6 +4,7 @@ #include "strbuf.h" #include "run-command.h" #include "alias.h" +#include "prompt.h" #define COMMAND_DIR "git-shell-commands" #define HELP_COMMAND COMMAND_DIR "/help" @@ -16,10 +17,10 @@ static int do_generic_cmd(const char *me, char *arg) setup_path(); if (!arg || !(arg = sq_dequote(arg)) || *arg == '-') die("bad argument"); - if (!starts_with(me, "git-")) + if (!skip_prefix(me, "git-", &me)) die("bad command"); - my_argv[0] = me + 4; + my_argv[0] = me; my_argv[1] = arg; my_argv[2] = NULL; @@ -76,12 +77,11 @@ static void run_shell(void) int count; fprintf(stderr, "git> "); - if (strbuf_getline_lf(&line, stdin) == EOF) { + if (git_read_line_interactively(&line) == EOF) { fprintf(stderr, "\n"); strbuf_release(&line); break; } - strbuf_trim(&line); rawargs = strbuf_detach(&line, NULL); split_args = xstrdup(rawargs); count = split_cmdline(split_args, &argv); diff --git a/third_party/git/shortlog.h b/third_party/git/shortlog.h index 2fa61c4294..64be879b24 100644 --- a/third_party/git/shortlog.h +++ b/third_party/git/shortlog.h @@ -15,7 +15,13 @@ struct shortlog { int in2; int user_format; int abbrev; - int committer; + + enum { + SHORTLOG_GROUP_AUTHOR = (1 << 0), + SHORTLOG_GROUP_COMMITTER = (1 << 1), + SHORTLOG_GROUP_TRAILER = (1 << 2), + } groups; + struct string_list trailers; char *common_repo_prefix; int email; diff --git a/third_party/git/sideband.c b/third_party/git/sideband.c index ef851113c4..0a60662fa6 100644 --- a/third_party/git/sideband.c +++ b/third_party/git/sideband.c @@ -147,7 +147,7 @@ int demultiplex_sideband(const char *me, char *buf, int len, switch (band) { case 3: if (die_on_error) - die("remote error: %s", buf + 1); + die(_("remote error: %s"), buf + 1); strbuf_addf(scratch, "%s%s", scratch->len ? "\n" : "", DISPLAY_PREFIX); maybe_colorize_sideband(scratch, buf + 1, len); diff --git a/third_party/git/sigchain.h b/third_party/git/sigchain.h index 138b20f54b..8e6bada892 100644 --- a/third_party/git/sigchain.h +++ b/third_party/git/sigchain.h @@ -1,12 +1,57 @@ #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/split-index.c b/third_party/git/split-index.c index e6154e4ea9..c0e8ad670d 100644 --- a/third_party/git/split-index.c +++ b/third_party/git/split-index.c @@ -79,8 +79,10 @@ void move_cache_to_base_index(struct index_state *istate) if (si->base && si->base->ce_mem_pool) { - if (!istate->ce_mem_pool) - mem_pool_init(&istate->ce_mem_pool, 0); + if (!istate->ce_mem_pool) { + istate->ce_mem_pool = xmalloc(sizeof(struct mem_pool)); + mem_pool_init(istate->ce_mem_pool, 0); + } mem_pool_combine(istate->ce_mem_pool, istate->split_index->base->ce_mem_pool); } diff --git a/third_party/git/compat/qsort.c b/third_party/git/stable-qsort.c index 7d071afb70..6cbaf39f7b 100644 --- a/third_party/git/compat/qsort.c +++ b/third_party/git/stable-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_qsort(void *b, size_t n, size_t s, - int (*cmp)(const void *, const void *)) +void git_stable_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/strbuf.c b/third_party/git/strbuf.c index d30f916858..e3397cc4c7 100644 --- a/third_party/git/strbuf.c +++ b/third_party/git/strbuf.c @@ -479,6 +479,23 @@ 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, int flags) +{ + size_t i, len = strlen(src); + + for (i = 0; i < len; i++) { + unsigned char ch = src[i]; + if (ch <= 0x1F || ch >= 0x7F || + (ch == '/' && (flags & STRBUF_ENCODE_SLASH)) || + 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; @@ -539,7 +556,6 @@ ssize_t strbuf_write(struct strbuf *sb, FILE *f) return sb->len ? fwrite(sb->buf, 1, sb->len, f) : 0; } - #define STRBUF_MAXLINK (2*PATH_MAX) int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint) @@ -675,6 +691,16 @@ int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term) } #endif +int strbuf_appendwholeline(struct strbuf *sb, FILE *fp, int term) +{ + struct strbuf line = STRBUF_INIT; + if (strbuf_getwholeline(&line, fp, term)) + return EOF; + strbuf_addbuf(sb, &line); + strbuf_release(&line); + return 0; +} + static int strbuf_getdelim(struct strbuf *sb, FILE *fp, int term) { if (strbuf_getwholeline(sb, fp, term)) @@ -774,8 +800,10 @@ void strbuf_addstr_xml_quoted(struct strbuf *buf, const char *s) } } -static int is_rfc3986_reserved(char ch) +int is_rfc3986_reserved_or_unreserved(char ch) { + if (is_rfc3986_unreserved(ch)) + return 1; switch (ch) { case '!': case '*': case '\'': case '(': case ')': case ';': case ':': case '@': case '&': case '=': case '+': case '$': @@ -785,20 +813,19 @@ static int is_rfc3986_reserved(char ch) return 0; } -static int is_rfc3986_unreserved(char ch) +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, - int reserved) + char_predicate allow_unencoded_fn) { strbuf_grow(sb, len); while (len--) { char ch = *s++; - if (is_rfc3986_unreserved(ch) || - (!reserved && is_rfc3986_reserved(ch))) + if (allow_unencoded_fn(ch)) strbuf_addch(sb, ch); else strbuf_addf(sb, "%%%02x", (unsigned char)ch); @@ -806,9 +833,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, - int reserved) + char_predicate allow_unencoded_fn) { - strbuf_add_urlencode(sb, s, strlen(s), reserved); + strbuf_add_urlencode(sb, s, strlen(s), allow_unencoded_fn); } static void strbuf_humanise(struct strbuf *buf, off_t bytes, @@ -1124,3 +1151,31 @@ 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 f62278a0be..223ee2094a 100644 --- a/third_party/git/strbuf.h +++ b/third_party/git/strbuf.h @@ -245,6 +245,18 @@ 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. */ @@ -366,6 +378,17 @@ size_t strbuf_expand_dict_cb(struct strbuf *sb, */ void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src); +#define STRBUF_ENCODE_SLASH 1 + +/** + * Append the contents of a string to a strbuf, percent-encoding any characters + * that are needed to be encoded for a URL. + * + * If STRBUF_ENCODE_SLASH is set in flags, percent-encode slashes. Otherwise, + * slashes are not percent-encoded. + */ +void strbuf_add_percentencode(struct strbuf *dst, const char *src, int flags); + /** * Append the given byte size as a human-readable string (i.e. 12.23 KiB, * 3.50 MiB). @@ -485,6 +508,12 @@ int strbuf_getline(struct strbuf *sb, FILE *file); int strbuf_getwholeline(struct strbuf *sb, FILE *file, int term); /** + * Like `strbuf_getwholeline`, but appends the line instead of + * resetting the buffer first. + */ +int strbuf_appendwholeline(struct strbuf *sb, FILE *file, int term); + +/** * Like `strbuf_getwholeline`, but operates on a file descriptor. * It reads one character at a time, so it is very slow. Do not * use it unless you need the correct position in the file @@ -621,6 +650,17 @@ 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, @@ -672,8 +712,13 @@ 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, - int reserved); + char_predicate allow_unencoded_fn); __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 fcd6303219..800f07a52c 100644 --- a/third_party/git/streaming.c +++ b/third_party/git/streaming.c @@ -16,6 +16,7 @@ enum input_source { }; typedef int (*open_istream_fn)(struct git_istream *, + struct repository *, struct object_info *, const struct object_id *, enum object_type *); @@ -29,8 +30,8 @@ struct stream_vtbl { #define open_method_decl(name) \ int open_istream_ ##name \ - (struct git_istream *st, struct object_info *oi, \ - const struct object_id *oid, \ + (struct git_istream *st, struct repository *r, \ + struct object_info *oi, const struct object_id *oid, \ enum object_type *type) #define close_method_decl(name) \ @@ -108,7 +109,8 @@ 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(const struct object_id *oid, +static enum input_source istream_source(struct repository *r, + const struct object_id *oid, enum object_type *type, struct object_info *oi) { @@ -117,7 +119,7 @@ static enum input_source istream_source(const struct object_id *oid, oi->typep = type; oi->sizep = &size; - status = oid_object_info_extended(the_repository, oid, oi, 0); + status = oid_object_info_extended(r, oid, oi, 0); if (status < 0) return stream_error; @@ -133,22 +135,23 @@ static enum input_source istream_source(const struct object_id *oid, } } -struct git_istream *open_istream(const struct object_id *oid, +struct git_istream *open_istream(struct repository *r, + 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(the_repository, oid); - enum input_source src = istream_source(real, type, &oi); + const struct object_id *real = lookup_replace_object(r, oid); + enum input_source src = istream_source(r, real, type, &oi); if (src < 0) return NULL; st = xmalloc(sizeof(*st)); - if (open_istream_tbl[src](st, &oi, real, type)) { - if (open_istream_incore(st, &oi, real, type)) { + if (open_istream_tbl[src](st, r, &oi, real, type)) { + if (open_istream_incore(st, r, &oi, real, type)) { free(st); return NULL; } @@ -338,8 +341,7 @@ static struct stream_vtbl loose_vtbl = { static open_method_decl(loose) { - st->u.loose.mapped = map_loose_object(the_repository, - oid, &st->u.loose.mapsize); + st->u.loose.mapped = map_loose_object(r, oid, &st->u.loose.mapsize); if (!st->u.loose.mapped) return -1; if ((unpack_loose_header(&st->z, @@ -499,7 +501,7 @@ static struct stream_vtbl incore_vtbl = { static open_method_decl(incore) { - st->u.incore.buf = read_object_file_extended(the_repository, oid, type, &st->size, 0); + st->u.incore.buf = read_object_file_extended(r, oid, type, &st->size, 0); st->u.incore.read_ptr = 0; st->vtbl = &incore_vtbl; @@ -520,7 +522,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(oid, &type, &sz, filter); + st = open_istream(the_repository, 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 f465a3cd31..5e4e6acfd0 100644 --- a/third_party/git/streaming.h +++ b/third_party/git/streaming.h @@ -8,7 +8,9 @@ /* opaque */ struct git_istream; -struct git_istream *open_istream(const struct object_id *, enum object_type *, unsigned long *, struct stream_filter *); +struct git_istream *open_istream(struct repository *, 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 f964399949..6c5d274126 100644 --- a/third_party/git/string-list.h +++ b/third_party/git/string-list.h @@ -4,7 +4,8 @@ /** * 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 `strcmp()` order. + * entries are sorted by string value in the order specified by the `cmp` + * member (`strcmp()` by default). * * The caller: * @@ -179,7 +180,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 coresponding string_list_item, NULL otherwise. + * return the corresponding string_list_item, NULL otherwise. */ struct string_list_item *string_list_lookup(struct string_list *list, const char *string); @@ -209,7 +210,8 @@ 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 `strcmp()` order. + * Sort the list's entries by string value in order specified by list->cmp + * (strcmp() if list->cmp is NULL). */ void string_list_sort(struct string_list *list); diff --git a/third_party/git/strvec.c b/third_party/git/strvec.c new file mode 100644 index 0000000000..21dce0a7a4 --- /dev/null +++ b/third_party/git/strvec.c @@ -0,0 +1,109 @@ +#include "cache.h" +#include "strvec.h" +#include "strbuf.h" + +const char *empty_strvec[] = { NULL }; + +void strvec_init(struct strvec *array) +{ + array->v = empty_strvec; + array->nr = 0; + array->alloc = 0; +} + +static void strvec_push_nodup(struct strvec *array, const char *value) +{ + if (array->v == empty_strvec) + array->v = NULL; + + ALLOC_GROW(array->v, array->nr + 2, array->alloc); + array->v[array->nr++] = value; + array->v[array->nr] = NULL; +} + +const char *strvec_push(struct strvec *array, const char *value) +{ + strvec_push_nodup(array, xstrdup(value)); + return array->v[array->nr - 1]; +} + +const char *strvec_pushf(struct strvec *array, const char *fmt, ...) +{ + va_list ap; + struct strbuf v = STRBUF_INIT; + + va_start(ap, fmt); + strbuf_vaddf(&v, fmt, ap); + va_end(ap); + + strvec_push_nodup(array, strbuf_detach(&v, NULL)); + return array->v[array->nr - 1]; +} + +void strvec_pushl(struct strvec *array, ...) +{ + va_list ap; + const char *arg; + + va_start(ap, array); + while ((arg = va_arg(ap, const char *))) + strvec_push(array, arg); + va_end(ap); +} + +void strvec_pushv(struct strvec *array, const char **items) +{ + for (; *items; items++) + strvec_push(array, *items); +} + +void strvec_pop(struct strvec *array) +{ + if (!array->nr) + return; + free((char *)array->v[array->nr - 1]); + array->v[array->nr - 1] = NULL; + array->nr--; +} + +void strvec_split(struct strvec *array, const char *to_split) +{ + while (isspace(*to_split)) + to_split++; + for (;;) { + const char *p = to_split; + + if (!*p) + break; + + while (*p && !isspace(*p)) + p++; + strvec_push_nodup(array, xstrndup(to_split, p - to_split)); + + while (isspace(*p)) + p++; + to_split = p; + } +} + +void strvec_clear(struct strvec *array) +{ + if (array->v != empty_strvec) { + int i; + for (i = 0; i < array->nr; i++) + free((char *)array->v[i]); + free(array->v); + } + strvec_init(array); +} + +const char **strvec_detach(struct strvec *array) +{ + if (array->v == empty_strvec) + return xcalloc(1, sizeof(const char *)); + else { + const char **ret = array->v; + strvec_init(array); + return ret; + } +} diff --git a/third_party/git/strvec.h b/third_party/git/strvec.h new file mode 100644 index 0000000000..fdcad75b45 --- /dev/null +++ b/third_party/git/strvec.h @@ -0,0 +1,89 @@ +#ifndef STRVEC_H +#define STRVEC_H + +/** + * The strvec API allows one to dynamically build and store + * NULL-terminated arrays of strings. A strvec maintains the invariant that the + * `items` member always points to a non-NULL array, and that the array is + * always NULL-terminated at the element pointed to by `items[nr]`. 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 `strvec` manages its own memory. Any strings pushed into the + * array are duplicated, and all memory is freed by strvec_clear(). + */ + +extern const char *empty_strvec[]; + +/** + * A single array. This should be initialized by assignment from + * `STRVEC_INIT`, or by calling `strvec_init`. The `items` + * member contains the actual array; the `nr` member contains the + * number of elements in the array, not including the terminating + * NULL. + */ +struct strvec { + const char **v; + int nr; + int alloc; +}; + +#define STRVEC_INIT { empty_strvec, 0, 0 } + +/** + * Initialize an array. This is no different than assigning from + * `STRVEC_INIT`. + */ +void strvec_init(struct strvec *); + +/* Push a copy of a string onto the end of the array. */ +const char *strvec_push(struct strvec *, const char *); + +/** + * Format a string and push it onto the end of the array. This is a + * convenience wrapper combining `strbuf_addf` and `strvec_push`. + */ +__attribute__((format (printf,2,3))) +const char *strvec_pushf(struct strvec *, 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 strvec_pushl(struct strvec *, ...); + +/* Push a null-terminated array of strings onto the end of the array. */ +void strvec_pushv(struct strvec *, const char **); + +/** + * Remove the final element from the array. If there are no + * elements in the array, do nothing. + */ +void strvec_pop(struct strvec *); + +/* Splits by whitespace; does not handle quoted arguments! */ +void strvec_split(struct strvec *, const char *); + +/** + * Free all memory associated with the array and return it to the + * initial, empty state. + */ +void strvec_clear(struct strvec *); + +/** + * Disconnect the `items` member from the `strvec` 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 `strvec` is in a reinitialized state and can be pushed + * into again. + */ +const char **strvec_detach(struct strvec *); + +#endif /* STRVEC_H */ diff --git a/third_party/git/sub-process.c b/third_party/git/sub-process.c index 3f4af93555..dfa790d3ff 100644 --- a/third_party/git/sub-process.c +++ b/third_party/git/sub-process.c @@ -6,12 +6,14 @@ #include "pkt-line.h" int cmd2process_cmp(const void *unused_cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *unused_keydata) { - const struct subprocess_entry *e1 = entry; - const struct subprocess_entry *e2 = entry_or_key; + 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); return strcmp(e1->cmd, e2->cmd); } @@ -20,9 +22,9 @@ struct subprocess_entry *subprocess_find_entry(struct hashmap *hashmap, const ch { struct subprocess_entry key; - hashmap_entry_init(&key, strhash(cmd)); + hashmap_entry_init(&key.ent, strhash(cmd)); key.cmd = cmd; - return hashmap_get(hashmap, &key, NULL); + return hashmap_get_entry(hashmap, &key, ent, NULL); } int subprocess_read_status(int fd, struct strbuf *status) @@ -58,7 +60,7 @@ void subprocess_stop(struct hashmap *hashmap, struct subprocess_entry *entry) kill(entry->process.pid, SIGTERM); finish_command(&entry->process); - hashmap_remove(hashmap, entry, NULL); + hashmap_remove(hashmap, &entry->ent, NULL); } static void subprocess_exit_handler(struct child_process *process) @@ -82,7 +84,7 @@ int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, co process = &entry->process; child_process_init(process); - argv_array_push(&process->args, cmd); + strvec_push(&process->args, cmd); process->use_shell = 1; process->in = -1; process->out = -1; @@ -96,7 +98,7 @@ int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, co return err; } - hashmap_entry_init(entry, strhash(cmd)); + hashmap_entry_init(&entry->ent, strhash(cmd)); err = startfn(entry); if (err) { @@ -105,7 +107,7 @@ int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, co return err; } - hashmap_add(hashmap, entry); + hashmap_add(hashmap, &entry->ent); return 0; } diff --git a/third_party/git/sub-process.h b/third_party/git/sub-process.h index 5c182fad98..e85f21fa1a 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; /* must be the first member! */ + struct hashmap_entry ent; 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 void *e1, - const void *e2, + const struct hashmap_entry *e, + const struct hashmap_entry *entry_or_key, const void *unused_keydata); /* diff --git a/third_party/git/submodule-config.c b/third_party/git/submodule-config.c index 4264ee216f..c569e22aa3 100644 --- a/third_party/git/submodule-config.c +++ b/third_party/git/submodule-config.c @@ -38,24 +38,28 @@ enum lookup_type { }; static int config_path_cmp(const void *unused_cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *unused_keydata) { - const struct submodule_entry *a = entry; - const struct submodule_entry *b = entry_or_key; + 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); 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 void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *unused_keydata) { - const struct submodule_entry *a = entry; - const struct submodule_entry *b = entry_or_key; + 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); return strcmp(a->config->name, b->config->name) || !oideq(&a->config->gitmodules_oid, &b->config->gitmodules_oid); @@ -95,12 +99,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_iter_init(&cache->for_name, &iter); - while ((entry = hashmap_iter_next(&iter))) + hashmap_for_each_entry(&cache->for_name, &iter, entry, + ent /* member name */) free_one_config(entry); - hashmap_free(&cache->for_path, 1); - hashmap_free(&cache->for_name, 1); + hashmap_free_entries(&cache->for_path, struct submodule_entry, ent); + hashmap_free_entries(&cache->for_name, struct submodule_entry, ent); cache->initialized = 0; cache->gitmodules_read = 0; } @@ -123,9 +127,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, hash); + hashmap_entry_init(&e->ent, hash); e->config = submodule; - hashmap_put(&cache->for_path, e); + hashmap_put(&cache->for_path, &e->ent); } static void cache_remove_path(struct submodule_cache *cache, @@ -135,9 +139,9 @@ static void cache_remove_path(struct submodule_cache *cache, submodule->path); struct submodule_entry e; struct submodule_entry *removed; - hashmap_entry_init(&e, hash); + hashmap_entry_init(&e.ent, hash); e.config = submodule; - removed = hashmap_remove(&cache->for_path, &e, NULL); + removed = hashmap_remove_entry(&cache->for_path, &e, ent, NULL); free(removed); } @@ -147,9 +151,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, hash); + hashmap_entry_init(&e->ent, hash); e->config = submodule; - hashmap_add(&cache->for_name, e); + hashmap_add(&cache->for_name, &e->ent); } static const struct submodule *cache_lookup_path(struct submodule_cache *cache, @@ -163,10 +167,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, hash); + hashmap_entry_init(&key.ent, hash); key.config = &key_config; - entry = hashmap_get(&cache->for_path, &key, NULL); + entry = hashmap_get_entry(&cache->for_path, &key, ent, NULL); if (entry) return entry->config; return NULL; @@ -183,10 +187,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, hash); + hashmap_entry_init(&key.ent, hash); key.config = &key_config; - entry = hashmap_get(&cache->for_name, &key, NULL); + entry = hashmap_get_entry(&cache->for_name, &key, ent, NULL); if (entry) return entry->config; return NULL; @@ -221,7 +225,8 @@ static int name_and_item_from_var(const char *var, struct strbuf *name, struct strbuf *item) { const char *subsection, *key; - int subsection_len, parse; + size_t subsection_len; + int parse; parse = parse_config_key(var, "submodule", &subsection, &subsection_len, &key); if (parse < 0 || !subsection) @@ -405,6 +410,13 @@ 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; @@ -482,8 +494,9 @@ 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) - die(_("invalid value for %s"), var); + &submodule->update_strategy) < 0 || + submodule->update_strategy.type == SM_UPDATE_COMMAND) + 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, @@ -550,7 +563,9 @@ static const struct submodule *config_from(struct submodule_cache *cache, struct hashmap_iter iter; struct submodule_entry *entry; - entry = hashmap_iter_first(&cache->for_name, &iter); + entry = hashmap_iter_first_entry(&cache->for_name, &iter, + struct submodule_entry, + ent /* member name */); if (!entry) return NULL; return entry->config; @@ -612,7 +627,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 as a mechanism to retrieve arbitrary configuration stored in + * not be used as a mechanism to retrieve arbitrary configuration stored in * the repository. * * Runs the provided config function on the '.gitmodules' file found in the @@ -621,7 +636,9 @@ 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 }; + struct git_config_source config_source = { + 0, .scope = CONFIG_SCOPE_SUBMODULE + }; const struct config_options opts = { 0 }; struct object_id oid; char *file; @@ -660,10 +677,13 @@ 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) +void repo_read_gitmodules(struct repository *repo, int skip_if_read) { submodule_cache_check_init(repo); + if (repo->submodule_cache->gitmodules_read && skip_if_read) + return; + if (repo_read_index(repo) < 0) return; @@ -689,20 +709,11 @@ 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) { - gitmodules_read_check(r); + repo_read_gitmodules(r, 1); return config_from(r->submodule_cache, treeish_name, name, lookup_name); } @@ -710,7 +721,7 @@ const struct submodule *submodule_from_path(struct repository *r, const struct object_id *treeish_name, const char *path) { - gitmodules_read_check(r); + repo_read_gitmodules(r, 1); return config_from(r->submodule_cache, treeish_name, path, lookup_path); } @@ -766,10 +777,14 @@ static int gitmodules_fetch_config(const char *var, const char *value, void *cb) { struct fetch_config *config = cb; if (!strcmp(var, "submodule.fetchjobs")) { - *(config->max_children) = parse_submodule_fetchjobs(var, value); + if (config->max_children) + *(config->max_children) = + parse_submodule_fetchjobs(var, value); return 0; } else if (!strcmp(var, "fetch.recursesubmodules")) { - *(config->recurse_submodules) = parse_fetch_recurse_submodules_arg(var, value); + if (config->recurse_submodules) + *(config->recurse_submodules) = + parse_fetch_recurse_submodules_arg(var, value); return 0; } diff --git a/third_party/git/submodule-config.h b/third_party/git/submodule-config.h index 1b4e2da658..c11e22cf50 100644 --- a/third_party/git/submodule-config.h +++ b/third_party/git/submodule-config.h @@ -7,9 +7,31 @@ #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. + * in a certain revision. It is returned by the lookup functions. */ struct submodule { const char *path; @@ -39,15 +61,29 @@ 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); +void repo_read_gitmodules(struct repository *repo, int skip_if_read); 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 0f199c5137..b3bb59f066 100644 --- a/third_party/git/submodule.c +++ b/third_party/git/submodule.c @@ -12,8 +12,8 @@ #include "diffcore.h" #include "refs.h" #include "string-list.h" -#include "sha1-array.h" -#include "argv-array.h" +#include "oid-array.h" +#include "strvec.h" #include "blob.h" #include "thread-utils.h" #include "quote.h" @@ -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_match_stat(istate, istate->cache[pos], &st, 0) & DATA_CHANGED) + ie_modified(istate, istate->cache[pos], &st, 0) & DATA_CHANGED) return 0; } @@ -194,7 +194,7 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt, char *key; key = xstrfmt("submodule.%s.ignore", submodule->name); - if (repo_config_get_string_const(the_repository, key, &ignore)) + if (repo_config_get_string_tmp(the_repository, key, &ignore)) ignore = submodule->ignore; free(key); @@ -262,17 +262,17 @@ int is_submodule_active(struct repository *repo, const char *path) sl = repo_config_get_value_multi(repo, "submodule.active"); if (sl) { struct pathspec ps; - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; const struct string_list_item *item; for_each_string_list_item(item, sl) { - argv_array_push(&args, item->string); + strvec_push(&args, item->string); } - parse_pathspec(&ps, 0, 0, NULL, args.argv); + parse_pathspec(&ps, 0, 0, NULL, args.v); ret = match_pathspec(repo->index, &ps, path, strlen(path), 0, NULL, 1); - argv_array_clear(&args); + strvec_clear(&args); clear_pathspec(&ps); return ret; } @@ -431,20 +431,21 @@ 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 */ } -static int prepare_submodule_summary(struct rev_info *rev, const char *path, - struct commit *left, struct commit *right, - struct commit_list *merge_bases) +static int prepare_submodule_diff_summary(struct repository *r, struct rev_info *rev, + const char *path, + struct commit *left, struct commit *right, + struct commit_list *merge_bases) { struct commit_list *list; - repo_init_revisions(the_repository, rev, NULL); + repo_init_revisions(r, rev, NULL); setup_revisions(0, NULL, rev, NULL); rev->left_right = 1; rev->first_parent_only = 1; @@ -459,7 +460,7 @@ static int prepare_submodule_summary(struct rev_info *rev, const char *path, return prepare_revision_walk(rev); } -static void print_submodule_summary(struct repository *r, struct rev_info *rev, struct diff_options *o) +static void print_submodule_diff_summary(struct repository *r, struct rev_info *rev, struct diff_options *o) { static const char format[] = " %m %s"; struct strbuf sb = STRBUF_INIT; @@ -481,27 +482,27 @@ static void print_submodule_summary(struct repository *r, struct rev_info *rev, strbuf_release(&sb); } -static void prepare_submodule_repo_env_no_git_dir(struct argv_array *out) +static void prepare_submodule_repo_env_no_git_dir(struct strvec *out) { const char * const *var; for (var = local_repo_env; *var; var++) { if (strcmp(*var, CONFIG_DATA_ENVIRONMENT)) - argv_array_push(out, *var); + strvec_push(out, *var); } } -void prepare_submodule_repo_env(struct argv_array *out) +void prepare_submodule_repo_env(struct strvec *out) { prepare_submodule_repo_env_no_git_dir(out); - argv_array_pushf(out, "%s=%s", GIT_DIR_ENVIRONMENT, - DEFAULT_GIT_DIR_ENVIRONMENT); + strvec_pushf(out, "%s=%s", GIT_DIR_ENVIRONMENT, + DEFAULT_GIT_DIR_ENVIRONMENT); } -static void prepare_submodule_repo_env_in_gitdir(struct argv_array *out) +static void prepare_submodule_repo_env_in_gitdir(struct strvec *out) { prepare_submodule_repo_env_no_git_dir(out); - argv_array_pushf(out, "%s=.", GIT_DIR_ENVIRONMENT); + strvec_pushf(out, "%s=.", GIT_DIR_ENVIRONMENT); } /* @@ -610,7 +611,7 @@ output_header: strbuf_release(&sb); } -void show_submodule_summary(struct diff_options *o, const char *path, +void show_submodule_diff_summary(struct diff_options *o, const char *path, struct object_id *one, struct object_id *two, unsigned dirty_submodule) { @@ -632,12 +633,12 @@ void show_submodule_summary(struct diff_options *o, const char *path, goto out; /* Treat revision walker failure the same as missing commits */ - if (prepare_submodule_summary(&rev, path, left, right, merge_bases)) { + if (prepare_submodule_diff_summary(sub, &rev, path, left, right, merge_bases)) { diff_emit_submodule_error(o, "(revision walker failed)\n"); goto out; } - print_submodule_summary(sub, &rev, o); + print_submodule_diff_summary(sub, &rev, o); out: if (merge_bases) @@ -681,22 +682,22 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path, cp.no_stdin = 1; /* TODO: other options may need to be passed here. */ - argv_array_pushl(&cp.args, "diff", "--submodule=diff", NULL); - argv_array_pushf(&cp.args, "--color=%s", want_color(o->use_color) ? + strvec_pushl(&cp.args, "diff", "--submodule=diff", NULL); + strvec_pushf(&cp.args, "--color=%s", want_color(o->use_color) ? "always" : "never"); if (o->flags.reverse_diff) { - argv_array_pushf(&cp.args, "--src-prefix=%s%s/", - o->b_prefix, path); - argv_array_pushf(&cp.args, "--dst-prefix=%s%s/", - o->a_prefix, path); + strvec_pushf(&cp.args, "--src-prefix=%s%s/", + o->b_prefix, path); + strvec_pushf(&cp.args, "--dst-prefix=%s%s/", + o->a_prefix, path); } else { - argv_array_pushf(&cp.args, "--src-prefix=%s%s/", - o->a_prefix, path); - argv_array_pushf(&cp.args, "--dst-prefix=%s%s/", - o->b_prefix, path); + strvec_pushf(&cp.args, "--src-prefix=%s%s/", + o->a_prefix, path); + strvec_pushf(&cp.args, "--dst-prefix=%s%s/", + o->b_prefix, path); } - argv_array_push(&cp.args, oid_to_hex(old_oid)); + strvec_push(&cp.args, oid_to_hex(old_oid)); /* * If the submodule has modified content, we will diff against the * work tree, under the assumption that the user has asked for the @@ -704,7 +705,7 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path, * haven't yet been committed to the submodule yet. */ if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED)) - argv_array_push(&cp.args, oid_to_hex(new_oid)); + strvec_push(&cp.args, oid_to_hex(new_oid)); prepare_submodule_repo_env(&cp.env_array); if (start_command(&cp)) @@ -812,9 +813,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; } @@ -836,15 +837,22 @@ static void collect_changed_submodules_cb(struct diff_queue_struct *q, */ static void collect_changed_submodules(struct repository *r, struct string_list *changed, - struct argv_array *argv) + struct strvec *argv) { struct rev_info rev; const struct commit *commit; + int save_warning; + struct setup_revision_opt s_r_opt = { + .assume_dashdash = 1, + }; + save_warning = warn_on_object_refname_ambiguity; + warn_on_object_refname_ambiguity = 0; repo_init_revisions(r, &rev, NULL); - setup_revisions(argv->argc, argv->argv, &rev, NULL); + setup_revisions(argv->nr, argv->v, &rev, &s_r_opt); + warn_on_object_refname_ambiguity = save_warning; 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; @@ -857,7 +865,8 @@ static void collect_changed_submodules(struct repository *r, diff_rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK; diff_rev.diffopt.format_callback = collect_changed_submodules_cb; diff_rev.diffopt.format_callback_data = &data; - diff_tree_combined_merge(commit, 1, &diff_rev); + diff_rev.dense_combined_merges = 1; + diff_tree_combined_merge(commit, &diff_rev); } reset_revision_walk(); @@ -879,8 +888,8 @@ static int has_remote(const char *refname, const struct object_id *oid, static int append_oid_to_argv(const struct object_id *oid, void *data) { - struct argv_array *argv = data; - argv_array_push(argv, oid_to_hex(oid)); + struct strvec *argv = data; + strvec_push(argv, oid_to_hex(oid)); return 0; } @@ -941,9 +950,9 @@ static int submodule_has_commits(struct repository *r, struct child_process cp = CHILD_PROCESS_INIT; struct strbuf out = STRBUF_INIT; - argv_array_pushl(&cp.args, "rev-list", "-n", "1", NULL); + strvec_pushl(&cp.args, "rev-list", "-n", "1", NULL); oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args); - argv_array_pushl(&cp.args, "--not", "--all", NULL); + strvec_pushl(&cp.args, "--not", "--all", NULL); prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; @@ -982,9 +991,9 @@ static int submodule_needs_pushing(struct repository *r, struct strbuf buf = STRBUF_INIT; int needs_pushing = 0; - argv_array_push(&cp.args, "rev-list"); + strvec_push(&cp.args, "rev-list"); oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args); - argv_array_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL); + strvec_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL); prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; @@ -992,7 +1001,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; @@ -1012,13 +1021,13 @@ int find_unpushed_submodules(struct repository *r, { struct string_list submodules = STRING_LIST_INIT_DUP; struct string_list_item *name; - struct argv_array argv = ARGV_ARRAY_INIT; + struct strvec argv = STRVEC_INIT; - /* argv.argv[0] will be ignored by setup_revisions */ - argv_array_push(&argv, "find_unpushed_submodules"); + /* argv.v[0] will be ignored by setup_revisions */ + strvec_push(&argv, "find_unpushed_submodules"); oid_array_for_each_unique(commits, append_oid_to_argv, &argv); - argv_array_push(&argv, "--not"); - argv_array_pushf(&argv, "--remotes=%s", remotes_name); + strvec_push(&argv, "--not"); + strvec_pushf(&argv, "--remotes=%s", remotes_name); collect_changed_submodules(r, &submodules, &argv); @@ -1041,7 +1050,7 @@ int find_unpushed_submodules(struct repository *r, } free_submodules_oids(&submodules); - argv_array_clear(&argv); + strvec_clear(&argv); return needs_pushing->nr; } @@ -1054,22 +1063,22 @@ static int push_submodule(const char *path, { if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) { struct child_process cp = CHILD_PROCESS_INIT; - argv_array_push(&cp.args, "push"); + strvec_push(&cp.args, "push"); if (dry_run) - argv_array_push(&cp.args, "--dry-run"); + strvec_push(&cp.args, "--dry-run"); if (push_options && push_options->nr) { const struct string_list_item *item; for_each_string_list_item(item, push_options) - argv_array_pushf(&cp.args, "--push-option=%s", - item->string); + strvec_pushf(&cp.args, "--push-option=%s", + item->string); } if (remote->origin != REMOTE_UNCONFIGURED) { int i; - argv_array_push(&cp.args, remote->name); + strvec_push(&cp.args, remote->name); for (i = 0; i < rs->raw_nr; i++) - argv_array_push(&cp.args, rs->raw[i]); + strvec_push(&cp.args, rs->raw[i]); } prepare_submodule_repo_env(&cp.env_array); @@ -1095,13 +1104,13 @@ static void submodule_push_check(const char *path, const char *head, struct child_process cp = CHILD_PROCESS_INIT; int i; - argv_array_push(&cp.args, "submodule--helper"); - argv_array_push(&cp.args, "push-check"); - argv_array_push(&cp.args, head); - argv_array_push(&cp.args, remote->name); + strvec_push(&cp.args, "submodule--helper"); + strvec_push(&cp.args, "push-check"); + strvec_push(&cp.args, head); + strvec_push(&cp.args, remote->name); for (i = 0; i < rs->raw_nr; i++) - argv_array_push(&cp.args, rs->raw[i]); + strvec_push(&cp.args, rs->raw[i]); prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; @@ -1115,7 +1124,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 +1164,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; } } @@ -1189,17 +1198,17 @@ void check_for_new_submodule_commits(struct object_id *oid) static void calculate_changed_submodule_paths(struct repository *r, struct string_list *changed_submodule_names) { - struct argv_array argv = ARGV_ARRAY_INIT; + struct strvec argv = STRVEC_INIT; struct string_list_item *name; /* No need to check if there are no submodules configured */ if (!submodule_from_path(r, NULL, NULL)) return; - argv_array_push(&argv, "--"); /* argv[0] program name */ + strvec_push(&argv, "--"); /* argv[0] program name */ oid_array_for_each_unique(&ref_tips_after_fetch, append_oid_to_argv, &argv); - argv_array_push(&argv, "--not"); + strvec_push(&argv, "--not"); oid_array_for_each_unique(&ref_tips_before_fetch, append_oid_to_argv, &argv); @@ -1231,7 +1240,7 @@ static void calculate_changed_submodule_paths(struct repository *r, string_list_remove_empty_items(changed_submodule_names, 1); - argv_array_clear(&argv); + strvec_clear(&argv); oid_array_clear(&ref_tips_before_fetch); oid_array_clear(&ref_tips_after_fetch); initialized_fetch_ref_tips = 0; @@ -1242,24 +1251,24 @@ int submodule_touches_in_range(struct repository *r, struct object_id *incl_oid) { struct string_list subs = STRING_LIST_INIT_DUP; - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; int ret; /* No need to check if there are no submodules configured */ if (!submodule_from_path(r, NULL, NULL)) return 0; - argv_array_push(&args, "--"); /* args[0] program name */ - argv_array_push(&args, oid_to_hex(incl_oid)); + strvec_push(&args, "--"); /* args[0] program name */ + strvec_push(&args, oid_to_hex(incl_oid)); if (!is_null_oid(excl_oid)) { - argv_array_push(&args, "--not"); - argv_array_push(&args, oid_to_hex(excl_oid)); + strvec_push(&args, "--not"); + strvec_push(&args, oid_to_hex(excl_oid)); } collect_changed_submodules(r, &subs, &args); ret = subs.nr; - argv_array_clear(&args); + strvec_clear(&args); free_submodules_oids(&subs); return ret; @@ -1267,7 +1276,7 @@ int submodule_touches_in_range(struct repository *r, struct submodule_parallel_fetch { int count; - struct argv_array args; + struct strvec args; struct repository *r; const char *prefix; int command_line_option; @@ -1280,10 +1289,12 @@ 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, \ +#define SPF_INIT {0, STRVEC_INIT, NULL, NULL, 0, 0, 0, 0, \ STRING_LIST_INIT_DUP, \ - NULL, 0, 0} + NULL, 0, 0, STRBUF_INIT} static int get_fetch_recurse_config(const struct submodule *submodule, struct submodule_parallel_fetch *spf) @@ -1297,7 +1308,7 @@ static int get_fetch_recurse_config(const struct submodule *submodule, int fetch_recurse = submodule->fetch_recurse; key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name); - if (!repo_config_get_string_const(spf->r, key, &value)) { + if (!repo_config_get_string_tmp(spf->r, key, &value)) { fetch_recurse = parse_fetch_recurse_submodules_arg(key, value); } free(key); @@ -1448,17 +1459,17 @@ 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); - argv_array_push(&cp->args, default_argv); - argv_array_push(&cp->args, "--submodule-prefix"); + strvec_init(&cp->args); + strvec_pushv(&cp->args, spf->args.v); + strvec_push(&cp->args, default_argv); + strvec_push(&cp->args, "--submodule-prefix"); strbuf_addf(&submodule_prefix, "%s%s/", spf->prefix, task->sub->path); - argv_array_push(&cp->args, submodule_prefix.buf); + strvec_push(&cp->args, submodule_prefix.buf); spf->count++; *task_cb = task; @@ -1478,7 +1489,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'"), + _("Could not access submodule '%s'\n"), ce->name); } } @@ -1498,14 +1509,14 @@ static int get_next_submodule(struct child_process *cp, cp->git_cmd = 1; cp->dir = task->repo->gitdir; - argv_array_init(&cp->args); - argv_array_pushv(&cp->args, spf->args.argv); - argv_array_push(&cp->args, "on-demand"); - argv_array_push(&cp->args, "--submodule-prefix"); - argv_array_push(&cp->args, submodule_prefix.buf); + strvec_init(&cp->args); + strvec_pushv(&cp->args, spf->args.v); + strvec_push(&cp->args, "on-demand"); + strvec_push(&cp->args, "--submodule-prefix"); + strvec_push(&cp->args, submodule_prefix.buf); /* NEEDSWORK: have get_default_remote from submodule--helper */ - argv_array_push(&cp->args, "origin"); + strvec_push(&cp->args, "origin"); oid_array_for_each_unique(task->commits, append_oid_to_argv, &cp->args); @@ -1547,7 +1558,10 @@ static int fetch_finish(int retvalue, struct strbuf *err, struct string_list_item *it; struct oid_array *commits; - if (retvalue) + if (!task || !task->sub) + BUG("callback cookie bogus"); + + if (retvalue) { /* * NEEDSWORK: This indicates that the overall fetch * failed, even though there may be a subsequent fetch @@ -1557,8 +1571,9 @@ static int fetch_finish(int retvalue, struct strbuf *err, */ spf->result = 1; - if (!task || !task->sub) - BUG("callback cookie bogus"); + strbuf_addf(&spf->submodules_with_errors, "\t%s\n", + task->sub->name); + } /* Is this the second time we process this submodule? */ if (task->commits) @@ -1592,7 +1607,7 @@ out: } int fetch_populated_submodules(struct repository *r, - const struct argv_array *options, + const struct strvec *options, const char *prefix, int command_line_option, int default_option, int quiet, int max_parallel_jobs) @@ -1610,12 +1625,12 @@ 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++) - argv_array_push(&spf.args, options->argv[i]); - argv_array_push(&spf.args, "--recurse-submodules-default"); + strvec_push(&spf.args, "fetch"); + for (i = 0; i < options->nr; i++) + strvec_push(&spf.args, options->v[i]); + strvec_push(&spf.args, "--recurse-submodules-default"); /* default value, "--submodule-prefix" and its value are added later */ calculate_changed_submodule_paths(r, &spf.changed_submodule_names); @@ -1627,7 +1642,12 @@ int fetch_populated_submodules(struct repository *r, &spf, "submodule", "parallel/fetch"); - argv_array_clear(&spf.args); + if (spf.submodules_with_errors.len > 0) + fprintf(stderr, _("Errors during submodule fetch:\n%s"), + spf.submodules_with_errors.buf); + + + strvec_clear(&spf.args); out: free_submodules_oids(&spf.changed_submodule_names); return spf.result; @@ -1655,9 +1675,9 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked) } strbuf_reset(&buf); - argv_array_pushl(&cp.args, "status", "--porcelain=2", NULL); + strvec_pushl(&cp.args, "status", "--porcelain=2", NULL); if (ignore_untracked) - argv_array_push(&cp.args, "-uno"); + strvec_push(&cp.args, "-uno"); prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; @@ -1665,7 +1685,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) { @@ -1706,7 +1726,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; @@ -1715,14 +1735,6 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked) int submodule_uses_gitfile(const char *path) { struct child_process cp = CHILD_PROCESS_INIT; - const char *argv[] = { - "submodule", - "foreach", - "--quiet", - "--recursive", - "test -f .git", - NULL, - }; struct strbuf buf = STRBUF_INIT; const char *git_dir; @@ -1735,7 +1747,10 @@ int submodule_uses_gitfile(const char *path) strbuf_release(&buf); /* Now test that all nested submodules use a gitfile too */ - cp.argv = argv; + strvec_pushl(&cp.args, + "submodule", "foreach", "--quiet", "--recursive", + "test -f .git", NULL); + prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; cp.no_stdin = 1; @@ -1768,16 +1783,16 @@ int bad_to_remove_submodule(const char *path, unsigned flags) if (!submodule_uses_gitfile(path)) return 1; - argv_array_pushl(&cp.args, "status", "--porcelain", - "--ignore-submodules=none", NULL); + strvec_pushl(&cp.args, "status", "--porcelain", + "--ignore-submodules=none", NULL); if (flags & SUBMODULE_REMOVAL_IGNORE_UNTRACKED) - argv_array_push(&cp.args, "-uno"); + strvec_push(&cp.args, "-uno"); else - argv_array_push(&cp.args, "-uall"); + strvec_push(&cp.args, "-uall"); if (!(flags & SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED)) - argv_array_push(&cp.args, "--ignored"); + strvec_push(&cp.args, "--ignored"); prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; @@ -1811,7 +1826,7 @@ out: void submodule_unset_core_worktree(const struct submodule *sub) { char *config_path = xstrfmt("%s/modules/%s/config", - get_git_common_dir(), sub->name); + get_git_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'"), @@ -1835,13 +1850,13 @@ static int submodule_has_dirty_index(const struct submodule *sub) prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; - argv_array_pushl(&cp.args, "diff-index", "--quiet", - "--cached", "HEAD", NULL); + strvec_pushl(&cp.args, "diff-index", "--quiet", + "--cached", "HEAD", NULL); cp.no_stdin = 1; 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); } @@ -1855,14 +1870,14 @@ static void submodule_reset_index(const char *path) cp.no_stdin = 1; cp.dir = path; - argv_array_pushf(&cp.args, "--super-prefix=%s%s/", - get_super_prefix_or_empty(), path); - argv_array_pushl(&cp.args, "read-tree", "-u", "--reset", NULL); + strvec_pushf(&cp.args, "--super-prefix=%s%s/", + get_super_prefix_or_empty(), path); + strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL); - argv_array_push(&cp.args, empty_tree_oid_hex()); + strvec_push(&cp.args, empty_tree_oid_hex()); if (run_command(&cp)) - die("could not reset submodule index"); + die(_("could not reset submodule index")); } /** @@ -1914,7 +1929,7 @@ int submodule_move_head(const char *path, ABSORB_GITDIR_RECURSE_SUBMODULES); } else { char *gitdir = xstrfmt("%s/modules/%s", - get_git_common_dir(), sub->name); + get_git_dir(), sub->name); connect_work_tree_and_git_dir(path, gitdir, 0); free(gitdir); @@ -1924,7 +1939,7 @@ int submodule_move_head(const char *path, if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) { char *gitdir = xstrfmt("%s/modules/%s", - get_git_common_dir(), sub->name); + get_git_dir(), sub->name); connect_work_tree_and_git_dir(path, gitdir, 1); free(gitdir); } @@ -1936,24 +1951,24 @@ int submodule_move_head(const char *path, cp.no_stdin = 1; cp.dir = path; - argv_array_pushf(&cp.args, "--super-prefix=%s%s/", - get_super_prefix_or_empty(), path); - argv_array_pushl(&cp.args, "read-tree", "--recurse-submodules", NULL); + strvec_pushf(&cp.args, "--super-prefix=%s%s/", + get_super_prefix_or_empty(), path); + strvec_pushl(&cp.args, "read-tree", "--recurse-submodules", NULL); if (flags & SUBMODULE_MOVE_HEAD_DRY_RUN) - argv_array_push(&cp.args, "-n"); + strvec_push(&cp.args, "-n"); else - argv_array_push(&cp.args, "-u"); + strvec_push(&cp.args, "-u"); if (flags & SUBMODULE_MOVE_HEAD_FORCE) - argv_array_push(&cp.args, "--reset"); + strvec_push(&cp.args, "--reset"); else - argv_array_push(&cp.args, "-m"); + strvec_push(&cp.args, "-m"); if (!(flags & SUBMODULE_MOVE_HEAD_FORCE)) - argv_array_push(&cp.args, old_head ? old_head : empty_tree_oid_hex()); + strvec_push(&cp.args, old_head ? old_head : empty_tree_oid_hex()); - argv_array_push(&cp.args, new_head ? new_head : empty_tree_oid_hex()); + strvec_push(&cp.args, new_head ? new_head : empty_tree_oid_hex()); if (run_command(&cp)) { ret = error(_("Submodule '%s' could not be updated."), path); @@ -1969,8 +1984,8 @@ int submodule_move_head(const char *path, cp.dir = path; prepare_submodule_repo_env(&cp.env_array); - argv_array_pushl(&cp.args, "update-ref", "HEAD", - "--no-deref", new_head, NULL); + strvec_pushl(&cp.args, "update-ref", "HEAD", + "--no-deref", new_head, NULL); if (run_command(&cp)) { ret = -1; @@ -1993,6 +2008,47 @@ 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. @@ -2000,7 +2056,7 @@ out: 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; - const char *new_git_dir; + char *new_git_dir; const struct submodule *sub; if (submodule_uses_worktrees(path)) @@ -2018,10 +2074,14 @@ 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_path("modules/%s", sub->name); + 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); 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, @@ -2101,9 +2161,9 @@ void absorb_git_dir_into_superproject(const char *path, cp.dir = path; cp.git_cmd = 1; cp.no_stdin = 1; - argv_array_pushl(&cp.args, "--super-prefix", sb.buf, - "submodule--helper", - "absorb-git-dirs", NULL); + strvec_pushl(&cp.args, "--super-prefix", sb.buf, + "submodule--helper", + "absorb-git-dirs", NULL); prepare_submodule_repo_env(&cp.env_array); if (run_command(&cp)) die(_("could not recurse into submodule '%s'"), path); @@ -2112,13 +2172,13 @@ void absorb_git_dir_into_superproject(const char *path, } } -const char *get_superproject_working_tree(void) +int get_superproject_working_tree(struct strbuf *buf) { struct child_process cp = CHILD_PROCESS_INIT; struct strbuf sb = STRBUF_INIT; - const char *one_up = real_path_if_valid("../"); + struct strbuf one_up = STRBUF_INIT; const char *cwd = xgetcwd(); - const char *ret = NULL; + int ret = 0; const char *subpath; int code; ssize_t len; @@ -2129,19 +2189,20 @@ const char *get_superproject_working_tree(void) * We might have a superproject, but it is harder * to determine. */ - return NULL; + return 0; - if (!one_up) - return NULL; + if (!strbuf_realpath(&one_up, "../", 0)) + return 0; - subpath = relative_path(cwd, one_up, &sb); + subpath = relative_path(cwd, one_up.buf, &sb); + strbuf_release(&one_up); prepare_submodule_repo_env(&cp.env_array); - argv_array_pop(&cp.env_array); + strvec_pop(&cp.env_array); - argv_array_pushl(&cp.args, "--literal-pathspecs", "-C", "..", - "ls-files", "-z", "--stage", "--full-name", "--", - subpath, NULL); + strvec_pushl(&cp.args, "--literal-pathspecs", "-C", "..", + "ls-files", "-z", "--stage", "--full-name", "--", + subpath, NULL); strbuf_reset(&sb); cp.no_stdin = 1; @@ -2175,7 +2236,8 @@ const char *get_superproject_working_tree(void) super_wt = xstrdup(cwd); super_wt[cwd_len - super_sub_len] = '\0'; - ret = real_path(super_wt); + strbuf_realpath(buf, super_wt, 1); + ret = 1; free(super_wt); } strbuf_release(&sb); @@ -2184,10 +2246,10 @@ const char *get_superproject_working_tree(void) if (code == 128) /* '../' is not a git repository */ - return NULL; + return 0; if (code == 0 && len == 0) /* There is an unrelated git repository at '../' */ - return NULL; + return 0; if (code) die(_("ls-tree returned unexpected return code %d"), code); diff --git a/third_party/git/submodule.h b/third_party/git/submodule.h index 8072e6d6dd..4ac6e31cf1 100644 --- a/third_party/git/submodule.h +++ b/third_party/git/submodule.h @@ -1,7 +1,7 @@ #ifndef SUBMODULE_H #define SUBMODULE_H -struct argv_array; +struct strvec; struct cache_entry; struct diff_options; struct index_state; @@ -69,7 +69,7 @@ int parse_submodule_update_strategy(const char *value, struct submodule_update_strategy *dst); const char *submodule_strategy_to_string(const struct submodule_update_strategy *s); void handle_ignore_submodules_arg(struct diff_options *, const char *); -void show_submodule_summary(struct diff_options *o, const char *path, +void show_submodule_diff_summary(struct diff_options *o, const char *path, struct object_id *one, struct object_id *two, unsigned dirty_submodule); void show_submodule_inline_diff(struct diff_options *o, const char *path, @@ -84,7 +84,7 @@ int should_update_submodules(void); const struct submodule *submodule_from_ce(const struct cache_entry *ce); void check_for_new_submodule_commits(struct object_id *oid); int fetch_populated_submodules(struct repository *r, - const struct argv_array *options, + const struct strvec *options, const char *prefix, int command_line_option, int default_option, @@ -124,6 +124,11 @@ 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, @@ -138,7 +143,7 @@ void submodule_unset_core_worktree(const struct submodule *sub); * a submodule by clearing any repo-specific environment variables, but * retaining any config in the environment. */ -void prepare_submodule_repo_env(struct argv_array *out); +void prepare_submodule_repo_env(struct strvec *out); #define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0) void absorb_git_dir_into_superproject(const char *path, @@ -147,8 +152,8 @@ void absorb_git_dir_into_superproject(const char *path, /* * Return the absolute path of the working tree of the superproject, which this * project is a submodule of. If this repository is not a submodule of - * another repository, return NULL. + * another repository, return 0. */ -const char *get_superproject_working_tree(void); +int get_superproject_working_tree(struct strbuf *buf); #endif diff --git a/third_party/git/t/README b/third_party/git/t/README index 60d5b77bcc..2adaf7c2d2 100644 --- a/third_party/git/t/README +++ b/third_party/git/t/README @@ -1,7 +1,7 @@ -Core GIT Tests +Core Git Tests ============== -This directory holds many test scripts for core GIT tools. The +This directory holds many test scripts for core Git tools. The first part of this short document describes how to run the tests and read their output. @@ -69,7 +69,8 @@ You can also run each test individually from command line, like this: You can pass --verbose (or -v), --debug (or -d), and --immediate (or -i) command line argument to the test, or by setting GIT_TEST_OPTS -appropriately before running "make". +appropriately before running "make". Short options can be bundled, i.e. +'-d -v' is the same as '-dv'. -v:: --verbose:: @@ -352,8 +353,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, overrides the -'protocol.version' setting to n if it is less than n. +GIT_TEST_PROTOCOL_VERSION=<n>, when set, makes 'protocol.version' +default to n. GIT_TEST_FULL_IN_PACK_ARRAY=<boolean> exercises the uncommon pack-objects code path where there are more than 1024 packs even if @@ -378,6 +379,11 @@ GIT_TEST_COMMIT_GRAPH=<boolean>, when true, forces the commit-graph to be written after every 'git commit' command, and overrides the 'core.commitGraph' setting to true. +GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=<boolean>, when true, forces +commit-graph write to compute and write changed path Bloom filters for +every 'git commit-graph write', as if the `--changed-paths` option was +passed in. + GIT_TEST_FSMONITOR=$PWD/t7519/fsmonitor-all exercises the fsmonitor code path for utilizing a file system monitor to speed up detecting new or changed files. @@ -386,15 +392,15 @@ GIT_TEST_INDEX_VERSION=<n> exercises the index read/write code path for the index version specified. Can be set to any valid version (currently 2, 3, or 4). -GIT_TEST_PACK_SPARSE=<boolean> if enabled will default the pack-objects -builtin to use the sparse object walk. This can still be overridden by -the --no-sparse command-line argument. +GIT_TEST_PACK_SPARSE=<boolean> if disabled will default the pack-objects +builtin to use the non-sparse object walk. This can still be overridden by +the --sparse command-line argument. GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path by overriding the minimum number of cache entries required per thread. -GIT_TEST_STASH_USE_BUILTIN=<boolean>, when false, disables the -built-in version of git-stash. See 'stash.useBuiltin' in +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 @@ -415,6 +421,10 @@ GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=<boolean>, when true (which is the default when running tests), errors out when an abbreviated option is used. +GIT_TEST_DEFAULT_HASH=<hash-algo> specifies which hash algorithm to +use in the test scripts. Recognized values for <hash-algo> are "sha1" +and "sha256". + Naming Tests ------------ @@ -546,6 +556,41 @@ Here are the "do's:" reports "ok" or "not ok" to the end user running the tests. Under --verbose, they are shown to help debug the tests. + - Be careful when you loop + + You may need to verify multiple things in a loop, but the + following does not work correctly: + + test_expect_success 'test three things' ' + for i in one two three + do + test_something "$i" + done && + test_something_else + ' + + Because the status of the loop itself is the exit status of the + test_something in the last round, the loop does not fail when + "test_something" for "one" or "two" fails. This is not what you + want. + + Instead, you can break out of the loop immediately when you see a + failure. Because all test_expect_* snippets are executed inside + a function, "return 1" can be used to fail the test immediately + upon a failure: + + test_expect_success 'test three things' ' + for i in one two three + do + test_something "$i" || return 1 + done && + test_something_else + ' + + Note that we still &&-chain the loop to propagate failures from + earlier commands. + + And here are the "don'ts:" - Don't exit() within a <script> part. @@ -978,6 +1023,15 @@ 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 ------------- @@ -1067,21 +1121,21 @@ Tips for Writing Tests As with any programming projects, existing programs are the best source of the information. However, do _not_ emulate t0000-basic.sh when writing your tests. The test is special in -that it tries to validate the very core of GIT. For example, it +that it tries to validate the very core of Git. For example, it knows that there will be 256 subdirectories under .git/objects/, and it knows that the object ID of an empty tree is a certain 40-byte string. This is deliberately done so in t0000-basic.sh because the things the very basic core test tries to achieve is -to serve as a basis for people who are changing the GIT internal +to serve as a basis for people who are changing the Git internals drastically. For these people, after making certain changes, not seeing failures from the basic test _is_ a failure. And -such drastic changes to the core GIT that even changes these +such drastic changes to the core Git that even changes these otherwise supposedly stable object IDs should be accompanied by an update to t0000-basic.sh. However, other tests that simply rely on basic parts of the core -GIT working properly should not have that level of intimate -knowledge of the core GIT internals. If all the test scripts +Git working properly should not have that level of intimate +knowledge of the core Git internals. If all the test scripts hardcoded the object IDs like t0000-basic.sh does, that defeats the purpose of t0000-basic.sh, which is to isolate that level of validation in one place. Your test also ends up needing diff --git a/third_party/git/t/chainlint.sed b/third_party/git/t/chainlint.sed index 70df40e34b..8a25c5b855 100644 --- a/third_party/git/t/chainlint.sed +++ b/third_party/git/t/chainlint.sed @@ -117,7 +117,7 @@ /^[ ]*!*[ ]*(..*)[ ]*[0-9]*[<>|&]/boneline # multi-line "(...\n...)" -/^[ ]*(/bsubshell +/^[ ]*(/bsubsh # innocuous line -- print it and advance to next line b @@ -130,11 +130,11 @@ b } b -:subshell +:subsh # bare "(" line? -- stash for later printing /^[ ]*([ ]*$/ { h - bnextline + bnextln } # "(..." line -- split off and stash "(", then process "..." as its own line x @@ -143,7 +143,7 @@ x s/(// bslurp -:nextline +:nextln N s/.*\n// @@ -151,10 +151,10 @@ s/.*\n// # incomplete line "...\" /\\$/bicmplte # multi-line quoted string "...\n..."? -/"/bdqstring +/"/bdqstr # multi-line quoted string '...\n...'? (but not contraction in string "it's") /'/{ - /"[^'"]*'[^'"]*"/!bsqstring + /"[^'"]*'[^'"]*"/!bsqstr } :folded # here-doc -- swallow it @@ -163,8 +163,8 @@ s/.*\n// # before closing ")", "done", "elsif", "else", or "fi" will need to be # re-visited to drop "suspect" marking since final line of those constructs # legitimately lacks "&&", so "suspect" mark must be removed -/^[ ]*#/bnextline -/^[ ]*$/bnextline +/^[ ]*#/bnextln +/^[ ]*$/bnextln # in-line comment -- strip it (but not "#" in a string, Bash ${#...} array # length, or Perforce "//depot/path#42" revision in filespec) /[ ]#/{ @@ -175,22 +175,22 @@ s/.*\n// # multi-line "case ... esac" /^[ ]*case[ ]..*[ ]in/bcase # multi-line "for ... done" or "while ... done" -/^[ ]*for[ ]..*[ ]in/bcontinue -/^[ ]*while[ ]/bcontinue -/^[ ]*do[ ]/bcontinue -/^[ ]*do[ ]*$/bcontinue -/;[ ]*do/bcontinue +/^[ ]*for[ ]..*[ ]in/bcont +/^[ ]*while[ ]/bcont +/^[ ]*do[ ]/bcont +/^[ ]*do[ ]*$/bcont +/;[ ]*do/bcont /^[ ]*done[ ]*&&[ ]*$/bdone /^[ ]*done[ ]*$/bdone /^[ ]*done[ ]*[<>|]/bdone /^[ ]*done[ ]*)/bdone -/||[ ]*exit[ ]/bcontinue -/||[ ]*exit[ ]*$/bcontinue +/||[ ]*exit[ ]/bcont +/||[ ]*exit[ ]*$/bcont # multi-line "if...elsif...else...fi" -/^[ ]*if[ ]/bcontinue -/^[ ]*then[ ]/bcontinue -/^[ ]*then[ ]*$/bcontinue -/;[ ]*then/bcontinue +/^[ ]*if[ ]/bcont +/^[ ]*then[ ]/bcont +/^[ ]*then[ ]*$/bcont +/;[ ]*then/bcont /^[ ]*elif[ ]/belse /^[ ]*elif[ ]*$/belse /^[ ]*else[ ]/belse @@ -234,10 +234,10 @@ s/.*\n// } } # line ends with pipe "...|" -- valid; not missing "&&" -/|[ ]*$/bcontinue +/|[ ]*$/bcont # missing end-of-line "&&" -- mark suspect /&&[ ]*$/!s/^/?!AMP?!/ -:continue +:cont # retrieve and print previous line x n @@ -250,7 +250,7 @@ s/\\\n// bslurp # check for multi-line double-quoted string "...\n..." -- fold to one line -:dqstring +:dqstr # remove all quote pairs s/"\([^"]*\)"/@!\1@!/g # done if no dangling quote @@ -258,13 +258,13 @@ s/"\([^"]*\)"/@!\1@!/g # otherwise, slurp next line and try again N s/\n// -bdqstring +bdqstr :dqdone s/@!/"/g bfolded # check for multi-line single-quoted string '...\n...' -- fold to one line -:sqstring +:sqstr # remove all quote pairs s/'\([^']*\)'/@!\1@!/g # done if no dangling quote @@ -272,7 +272,7 @@ s/'\([^']*\)'/@!\1@!/g # otherwise, slurp next line and try again N s/\n// -bsqstring +bsqstr :sqdone s/@!/'/g bfolded @@ -282,11 +282,11 @@ bfolded :heredoc s/^\(.*\)<<[ ]*[-\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\2>\1<</ s/[ ]*<<// -:heredsub +:hdocsub N /^<\([^>]*\)>.*\n[ ]*\1[ ]*$/!{ s/\n.*$// - bheredsub + bhdocsub } s/^<[^>]*>// s/\n.*$// @@ -305,7 +305,7 @@ bcase x s/?!AMP?!// x -bcontinue +bcont # found "done" closing for-loop or while-loop, or "fi" closing if-then -- drop # "suspect" from final contained line since that line legitimately lacks "&&" @@ -321,10 +321,10 @@ bchkchn # found nested multi-line "(...\n...)" -- pass through untouched :nest x -:nstslurp +:nstslrp n # closing ")" on own line -- stop nested slurp -/^[ ]*)/bnstclose +/^[ ]*)/bnstcl # comment -- not closing ")" if in comment /^[ ]*#/bnstcnt # "$((...))" -- arithmetic expansion; not closing ")" @@ -332,11 +332,11 @@ n # "$(...)" -- command substitution; not closing ")" /\$([^)][^)]*)[^)]*$/bnstcnt # closing "...)" -- stop nested slurp -/)/bnstclose +/)/bnstcl :nstcnt x -bnstslurp -:nstclose +bnstslrp +:nstcl s/^/>>/ # is it "))" which closes nested and parent subshells? /)[ ]*)/bslurp diff --git a/third_party/git/t/check-non-portable-shell.pl b/third_party/git/t/check-non-portable-shell.pl index 38bfeebd88..fd3303552b 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 006d2a8152..1f32ca66ea 100644 --- a/third_party/git/t/gitweb-lib.sh +++ b/third_party/git/t/gitweb-lib.sh @@ -58,10 +58,11 @@ gitweb_run () { GATEWAY_INTERFACE='CGI/1.1' HTTP_ACCEPT='*/*' REQUEST_METHOD='GET' - QUERY_STRING=""$1"" - PATH_INFO=""$2"" + QUERY_STRING=$1 + PATH_INFO=$2 + REQUEST_URI=/gitweb.cgi$PATH_INFO export GATEWAY_INTERFACE HTTP_ACCEPT REQUEST_METHOD \ - QUERY_STRING PATH_INFO + QUERY_STRING PATH_INFO REQUEST_URI 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 2bad28af92..8c2ddcce95 100644 --- a/third_party/git/t/helper/.gitignore +++ b/third_party/git/t/helper/.gitignore @@ -1,5 +1,2 @@ -* -!*.sh -!*.[ch] -!*.gitignore - +/test-tool +/test-fake-ssh diff --git a/third_party/git/t/helper/test-advise.c b/third_party/git/t/helper/test-advise.c new file mode 100644 index 0000000000..a7043df1d3 --- /dev/null +++ b/third_party/git/t/helper/test-advise.c @@ -0,0 +1,22 @@ +#include "test-tool.h" +#include "cache.h" +#include "advice.h" +#include "config.h" + +int cmd__advise_if_enabled(int argc, const char **argv) +{ + if (argc != 2) + die("usage: %s <advice>", argv[0]); + + setup_git_directory(); + git_config(git_default_config, NULL); + + /* + * Any advice type can be used for testing, but NESTED_TAG was + * selected here and in t0018 where this command is being + * executed. + */ + advise_if_enabled(ADVICE_NESTED_TAG, argv[1]); + + return 0; +} diff --git a/third_party/git/t/helper/test-bloom.c b/third_party/git/t/helper/test-bloom.c new file mode 100644 index 0000000000..46e97b04eb --- /dev/null +++ b/third_party/git/t/helper/test-bloom.c @@ -0,0 +1,97 @@ +#include "git-compat-util.h" +#include "bloom.h" +#include "test-tool.h" +#include "commit.h" + +static struct bloom_filter_settings settings = DEFAULT_BLOOM_FILTER_SETTINGS; + +static void add_string_to_filter(const char *data, struct bloom_filter *filter) { + struct bloom_key key; + int i; + + fill_bloom_key(data, strlen(data), &key, &settings); + printf("Hashes:"); + for (i = 0; i < settings.num_hashes; i++){ + printf("0x%08x|", key.hashes[i]); + } + printf("\n"); + add_key_to_filter(&key, filter, &settings); +} + +static void print_bloom_filter(struct bloom_filter *filter) { + int i; + + if (!filter) { + printf("No filter.\n"); + return; + } + printf("Filter_Length:%d\n", (int)filter->len); + printf("Filter_Data:"); + for (i = 0; i < filter->len; i++) { + printf("%02x|", filter->data[i]); + } + printf("\n"); +} + +static void get_bloom_filter_for_commit(const struct object_id *commit_oid) +{ + struct commit *c; + struct bloom_filter *filter; + setup_git_directory(); + c = lookup_commit(the_repository, commit_oid); + filter = get_or_compute_bloom_filter(the_repository, c, 1, + &settings, + NULL); + print_bloom_filter(filter); +} + +static const char *bloom_usage = "\n" +" test-tool bloom get_murmur3 <string>\n" +" test-tool bloom generate_filter <string> [<string>...]\n" +" test-tool get_filter_for_commit <commit-hex>\n"; + +int cmd__bloom(int argc, const char **argv) +{ + setup_git_directory(); + + if (argc < 2) + usage(bloom_usage); + + if (!strcmp(argv[1], "get_murmur3")) { + uint32_t hashed; + if (argc < 3) + usage(bloom_usage); + hashed = murmur3_seeded(0, argv[2], strlen(argv[2])); + printf("Murmur3 Hash with seed=0:0x%08x\n", hashed); + } + + if (!strcmp(argv[1], "generate_filter")) { + struct bloom_filter filter; + int i = 2; + filter.len = (settings.bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD; + filter.data = xcalloc(filter.len, sizeof(unsigned char)); + + if (argc - 1 < i) + usage(bloom_usage); + + while (argv[i]) { + add_string_to_filter(argv[i], &filter); + i++; + } + + print_bloom_filter(&filter); + } + + if (!strcmp(argv[1], "get_filter_for_commit")) { + struct object_id oid; + const char *end; + if (argc < 3) + usage(bloom_usage); + if (parse_oid_hex(argv[2], &oid, &end)) + die("cannot parse oid '%s'", argv[2]); + init_bloom_filters(); + get_bloom_filter_for_commit(&oid); + } + + return 0; +} diff --git a/third_party/git/t/helper/test-config.c b/third_party/git/t/helper/test-config.c index 214003d5b2..a6e936721f 100644 --- a/third_party/git/t/helper/test-config.c +++ b/third_party/git/t/helper/test-config.c @@ -37,21 +37,6 @@ * */ -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; @@ -63,7 +48,8 @@ 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("scope=%s\n", scope_name(current_config_scope())); + printf("lno=%d\n", current_config_line()); + printf("scope=%s\n", config_scope_name(current_config_scope())); return 0; } @@ -140,7 +126,7 @@ int cmd__config(int argc, const char **argv) goto exit1; } } else if (argc == 3 && !strcmp(argv[1], "get_string")) { - if (!git_config_get_string_const(argv[2], &v)) { + if (!git_config_get_string_tmp(argv[2], &v)) { printf("%s\n", v); goto exit0; } else { diff --git a/third_party/git/t/helper/test-date.c b/third_party/git/t/helper/test-date.c index 585347ea48..099eff4f0f 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, struct timeval *now) +static void show_relative_dates(const char **argv) { struct strbuf buf = STRBUF_INIT; for (; *argv; argv++) { time_t t = atoi(*argv); - show_date_relative(t, now, &buf); + show_date_relative(t, &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, struct timeval *now) +static void parse_approxidate(const char **argv) { for (; *argv; argv++) { timestamp_t t; - t = approxidate_relative(*argv, now); + t = approxidate_relative(*argv); printf("%s -> %s\n", *argv, show_date(t, 0, DATE_MODE(ISO8601))); } } -static void parse_approx_timestamp(const char **argv, struct timeval *now) +static void parse_approx_timestamp(const char **argv) { for (; *argv; argv++) { timestamp_t t; - t = approxidate_relative(*argv, now); + t = approxidate_relative(*argv); printf("%s -> %"PRItime"\n", *argv, t); } } @@ -103,22 +103,13 @@ 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, &now); + show_relative_dates(argv+1); else if (!strcmp(*argv, "human")) show_human_dates(argv+1); else if (skip_prefix(*argv, "show:", &x)) @@ -126,9 +117,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, &now); + parse_approxidate(argv+1); else if (!strcmp(*argv, "timestamp")) - parse_approx_timestamp(argv+1, &now); + parse_approx_timestamp(argv+1); 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 f65e301f9d..7b4278462b 100644 --- a/third_party/git/t/helper/test-drop-caches.c +++ b/third_party/git/t/helper/test-drop-caches.c @@ -8,18 +8,21 @@ static int cmd_sync(void) { char Buffer[MAX_PATH]; DWORD dwRet; - char szVolumeAccessPath[] = "\\\\.\\X:"; + char szVolumeAccessPath[] = "\\\\.\\XXXX:"; HANDLE hVolWrite; - int success = 0; + int success = 0, dos_drive_prefix; dwRet = GetCurrentDirectory(MAX_PATH, Buffer); if ((0 == dwRet) || (dwRet > MAX_PATH)) return error("Error getting current directory"); - if (!has_dos_drive_prefix(Buffer)) + dos_drive_prefix = has_dos_drive_prefix(Buffer); + if (!dos_drive_prefix) return error("'%s': invalid drive letter", Buffer); - szVolumeAccessPath[4] = Buffer[0]; + memcpy(szVolumeAccessPath, Buffer, dos_drive_prefix); + szVolumeAccessPath[dos_drive_prefix] = '\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 2786f47088..975f0ac890 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 %"PRIuMAX"\n", (uintmax_t)istate->fsmonitor_last_update); + printf("fsmonitor last update %s\n", 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-dump-split-index.c b/third_party/git/t/helper/test-dump-split-index.c index 63c689d6ee..a209880eb3 100644 --- a/third_party/git/t/helper/test-dump-split-index.c +++ b/third_party/git/t/helper/test-dump-split-index.c @@ -13,6 +13,8 @@ int cmd__dump_split_index(int ac, const char **av) struct split_index *si; int i; + setup_git_directory(); + do_read_index(&the_index, av[1], 1); printf("own %s\n", oid_to_hex(&the_index.oid)); si = the_index.split_index; diff --git a/third_party/git/t/helper/test-hashmap.c b/third_party/git/t/helper/test-hashmap.c index aaf17b0ddf..f38706216f 100644 --- a/third_party/git/t/helper/test-hashmap.c +++ b/third_party/git/t/helper/test-hashmap.c @@ -5,6 +5,7 @@ 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]; @@ -16,15 +17,17 @@ static const char *get_value(const struct test_entry *e) } static int test_entry_cmp(const void *cmp_data, - const void *entry, - const void *entry_or_key, + const struct hashmap_entry *eptr, + const struct hashmap_entry *entry_or_key, const void *keydata) { const int ignore_case = cmp_data ? *((int *)cmp_data) : 0; - const struct test_entry *e1 = entry; - const struct test_entry *e2 = entry_or_key; + const struct test_entry *e1, *e2; 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 @@ -37,7 +40,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, hash); + hashmap_entry_init(&entry->ent, hash); memcpy(entry->key, key, klen + 1); memcpy(entry->key + klen + 1, value, vlen + 1); return entry; @@ -103,11 +106,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], hashes[i]); - hashmap_add(&map, entries[i]); + hashmap_entry_init(&entries[i]->ent, hashes[i]); + hashmap_add(&map, &entries[i]->ent); } - hashmap_free(&map, 0); + hashmap_free(&map); } } else { /* test map lookups */ @@ -116,8 +119,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], hashes[i]); - hashmap_add(&map, entries[i]); + hashmap_entry_init(&entries[i]->ent, hashes[i]); + hashmap_add(&map, &entries[i]->ent); } for (j = 0; j < rounds; j++) { @@ -127,7 +130,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds) } } - hashmap_free(&map, 0); + hashmap_free(&map); } } @@ -179,7 +182,7 @@ int cmd__hashmap(int argc, const char **argv) entry = alloc_test_entry(hash, p1, p2); /* add to hashmap */ - hashmap_add(&map, entry); + hashmap_add(&map, &entry->ent); } else if (!strcmp("put", cmd) && p1 && p2) { @@ -187,43 +190,44 @@ int cmd__hashmap(int argc, const char **argv) entry = alloc_test_entry(hash, p1, p2); /* add / replace entry */ - entry = hashmap_put(&map, entry); + entry = hashmap_put_entry(&map, entry, ent); /* 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_from_hash(&map, hash, p1); + entry = hashmap_get_entry_from_hash(&map, hash, p1, + struct test_entry, ent); /* print result */ if (!entry) puts("NULL"); - while (entry) { + hashmap_for_each_entry_from(&map, entry, ent) 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 */ - entry = hashmap_remove(&map, &key, p1); + rm = hashmap_remove(&map, &key, p1); + entry = rm ? container_of(rm, struct test_entry, ent) + : NULL; /* print result and free entry*/ puts(entry ? get_value(entry) : "NULL"); free(entry); } else if (!strcmp("iterate", cmd)) { - struct hashmap_iter iter; - hashmap_iter_init(&map, &iter); - while ((entry = hashmap_iter_next(&iter))) + + hashmap_for_each_entry(&map, &iter, entry, + ent /* member name */) printf("%s %s\n", entry->key, get_value(entry)); } else if (!strcmp("size", cmd)) { @@ -258,6 +262,6 @@ int cmd__hashmap(int argc, const char **argv) } strbuf_release(&line); - hashmap_free(&map, 1); + hashmap_free_entries(&map, struct test_entry, ent); 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 b99a37080d..cd1b4c9736 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,17 +41,13 @@ static void dump_run(void) die("non-threaded code path used"); } - dir = hashmap_iter_first(&the_index.dir_hash, &iter_dir); - while (dir) { + hashmap_for_each_entry(&the_index.dir_hash, &iter_dir, dir, + ent /* member name */) printf("dir %08x %7d %s\n", dir->ent.hash, dir->nr, dir->name); - dir = hashmap_iter_next(&iter_dir); - } - ce = hashmap_iter_first(&the_index.name_hash, &iter_cache); - while (ce) { + hashmap_for_each_entry(&the_index.name_hash, &iter_cache, ce, + ent /* member name */) 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-line-buffer.c b/third_party/git/t/helper/test-line-buffer.c deleted file mode 100644 index 078dd7e29d..0000000000 --- a/third_party/git/t/helper/test-line-buffer.c +++ /dev/null @@ -1,81 +0,0 @@ -/* - * test-line-buffer.c: code to exercise the svn importer's input helper - */ - -#include "git-compat-util.h" -#include "strbuf.h" -#include "vcs-svn/line_buffer.h" - -static uint32_t strtouint32(const char *s) -{ - char *end; - uintmax_t n = strtoumax(s, &end, 10); - if (*s == '\0' || *end != '\0') - die("invalid count: %s", s); - return (uint32_t) n; -} - -static void handle_command(const char *command, const char *arg, struct line_buffer *buf) -{ - if (starts_with(command, "binary ")) { - struct strbuf sb = STRBUF_INIT; - strbuf_addch(&sb, '>'); - buffer_read_binary(buf, &sb, strtouint32(arg)); - fwrite(sb.buf, 1, sb.len, stdout); - strbuf_release(&sb); - } else if (starts_with(command, "copy ")) { - buffer_copy_bytes(buf, strtouint32(arg)); - } else if (starts_with(command, "skip ")) { - buffer_skip_bytes(buf, strtouint32(arg)); - } else { - die("unrecognized command: %s", command); - } -} - -static void handle_line(const char *line, struct line_buffer *stdin_buf) -{ - const char *arg = strchr(line, ' '); - if (!arg) - die("no argument in line: %s", line); - handle_command(line, arg + 1, stdin_buf); -} - -int cmd_main(int argc, const char **argv) -{ - struct line_buffer stdin_buf = LINE_BUFFER_INIT; - struct line_buffer file_buf = LINE_BUFFER_INIT; - struct line_buffer *input = &stdin_buf; - const char *filename; - char *s; - - if (argc == 1) - filename = NULL; - else if (argc == 2) - filename = argv[1]; - else - usage("test-line-buffer [file | &fd] < script"); - - if (buffer_init(&stdin_buf, NULL)) - die_errno("open error"); - if (filename) { - if (*filename == '&') { - if (buffer_fdinit(&file_buf, strtouint32(filename + 1))) - die_errno("error opening fd %s", filename + 1); - } else { - if (buffer_init(&file_buf, filename)) - die_errno("error opening %s", filename); - } - input = &file_buf; - } - - while ((s = buffer_read_line(&stdin_buf))) - handle_line(s, input); - - if (filename && buffer_deinit(&file_buf)) - die("error reading from %s", filename); - if (buffer_deinit(&stdin_buf)) - die("input error"); - if (ferror(stdout)) - die("output error"); - return 0; -} diff --git a/third_party/git/t/helper/test-sha1-array.c b/third_party/git/t/helper/test-oid-array.c index ad5e69f9d3..b16cd0b11b 100644 --- a/third_party/git/t/helper/test-sha1-array.c +++ b/third_party/git/t/helper/test-oid-array.c @@ -1,6 +1,6 @@ #include "test-tool.h" #include "cache.h" -#include "sha1-array.h" +#include "oid-array.h" static int print_oid(const struct object_id *oid, void *data) { @@ -8,10 +8,13 @@ static int print_oid(const struct object_id *oid, void *data) return 0; } -int cmd__sha1_array(int argc, const char **argv) +int cmd__oid_array(int argc, const char **argv) { struct oid_array array = OID_ARRAY_INIT; struct strbuf line = STRBUF_INIT; + int nongit_ok; + + setup_git_directory_gently(&nongit_ok); while (strbuf_getline(&line, stdin) != EOF) { const char *arg; @@ -19,11 +22,11 @@ int cmd__sha1_array(int argc, const char **argv) if (skip_prefix(line.buf, "append ", &arg)) { if (get_oid_hex(arg, &oid)) - die("not a hexadecimal SHA1: %s", arg); + die("not a hexadecimal oid: %s", arg); oid_array_append(&array, &oid); } else if (skip_prefix(line.buf, "lookup ", &arg)) { if (get_oid_hex(arg, &oid)) - die("not a hexadecimal SHA1: %s", arg); + die("not a hexadecimal oid: %s", arg); printf("%d\n", oid_array_lookup(&array, &oid)); } else if (!strcmp(line.buf, "clear")) oid_array_clear(&array); diff --git a/third_party/git/t/helper/test-parse-options.c b/third_party/git/t/helper/test-parse-options.c index af82db06ac..2051ce57db 100644 --- a/third_party/git/t/helper/test-parse-options.c +++ b/third_party/git/t/helper/test-parse-options.c @@ -121,6 +121,8 @@ 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 new file mode 100644 index 0000000000..b3e08cef4b --- /dev/null +++ b/third_party/git/t/helper/test-parse-pathspec-file.c @@ -0,0 +1,33 @@ +#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 = NULL; + 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, NULL, options, usage, 0); + + parse_pathspec_file(&pathspec, 0, 0, NULL, 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 5d543ad21f..313a153209 100644 --- a/third_party/git/t/helper/test-path-utils.c +++ b/third_party/git/t/helper/test-path-utils.c @@ -185,6 +185,99 @@ 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")) { @@ -197,11 +290,14 @@ int cmd__path_utils(int argc, const char **argv) } if (argc >= 2 && !strcmp(argv[1], "real_path")) { + struct strbuf realpath = STRBUF_INIT; while (argc > 2) { - puts(real_path(argv[2])); + strbuf_realpath(&realpath, argv[2], 1); + puts(realpath.buf); argc--; argv++; } + strbuf_release(&realpath); return 0; } @@ -355,6 +451,26 @@ 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-pkt-line.c b/third_party/git/t/helper/test-pkt-line.c index 282d536384..69152958e5 100644 --- a/third_party/git/t/helper/test-pkt-line.c +++ b/third_party/git/t/helper/test-pkt-line.c @@ -46,6 +46,9 @@ static void unpack(void) case PACKET_READ_DELIM: printf("0001\n"); break; + case PACKET_READ_RESPONSE_END: + printf("0002\n"); + break; } } } @@ -67,7 +70,7 @@ static void unpack_sideband(void) case PACKET_READ_NORMAL: band = reader.line[0] & 0xff; if (band < 1 || band > 2) - die("unexpected side band %d", band); + continue; /* skip non-sideband packets */ fd = band; write_or_die(fd, reader.line + 1, reader.pktlen - 1); @@ -75,6 +78,7 @@ static void unpack_sideband(void) case PACKET_READ_FLUSH: return; case PACKET_READ_DELIM: + case PACKET_READ_RESPONSE_END: break; } } diff --git a/third_party/git/t/helper/test-proc-receive.c b/third_party/git/t/helper/test-proc-receive.c new file mode 100644 index 0000000000..42164d9898 --- /dev/null +++ b/third_party/git/t/helper/test-proc-receive.c @@ -0,0 +1,176 @@ +#include "cache.h" +#include "connect.h" +#include "parse-options.h" +#include "pkt-line.h" +#include "sigchain.h" +#include "test-tool.h" + +static const char *proc_receive_usage[] = { + "test-tool proc-receive [<options>...]", + NULL +}; + +static int die_version; +static int die_readline; +static int no_push_options; +static int use_atomic; +static int use_push_options; +static int verbose; +static int version = 1; +static struct string_list returns = STRING_LIST_INIT_NODUP; + +struct command { + struct command *next; + const char *error_string; + unsigned int skip_update:1, + did_not_exist:1; + int index; + struct object_id old_oid; + struct object_id new_oid; + char ref_name[FLEX_ARRAY]; /* more */ +}; + +static void proc_receive_verison(struct packet_reader *reader) { + int server_version = 0; + + for (;;) { + int linelen; + + if (packet_reader_read(reader) != PACKET_READ_NORMAL) + break; + + if (reader->pktlen > 8 && starts_with(reader->line, "version=")) { + server_version = atoi(reader->line+8); + linelen = strlen(reader->line); + if (linelen < reader->pktlen) { + const char *feature_list = reader->line + linelen + 1; + if (parse_feature_request(feature_list, "atomic")) + use_atomic= 1; + if (parse_feature_request(feature_list, "push-options")) + use_push_options = 1; + } + } + } + + if (server_version != 1 || die_version) + die("bad protocol version: %d", server_version); + + packet_write_fmt(1, "version=%d%c%s\n", + version, '\0', + use_push_options && !no_push_options ? "push-options": ""); + packet_flush(1); +} + +static void proc_receive_read_commands(struct packet_reader *reader, + struct command **commands) +{ + struct command **tail = commands; + + for (;;) { + struct object_id old_oid, new_oid; + struct command *cmd; + const char *refname; + const char *p; + + if (packet_reader_read(reader) != PACKET_READ_NORMAL) + break; + + if (parse_oid_hex(reader->line, &old_oid, &p) || + *p++ != ' ' || + parse_oid_hex(p, &new_oid, &p) || + *p++ != ' ' || + die_readline) + die("protocol error: expected 'old new ref', got '%s'", + reader->line); + refname = p; + FLEX_ALLOC_STR(cmd, ref_name, refname); + oidcpy(&cmd->old_oid, &old_oid); + oidcpy(&cmd->new_oid, &new_oid); + + *tail = cmd; + tail = &cmd->next; + } +} + +static void proc_receive_read_push_options(struct packet_reader *reader, + struct string_list *options) +{ + + if (no_push_options || !use_push_options) + return; + + while (1) { + if (packet_reader_read(reader) != PACKET_READ_NORMAL) + break; + + string_list_append(options, reader->line); + } +} + +int cmd__proc_receive(int argc, const char **argv) +{ + int nongit_ok = 0; + struct packet_reader reader; + struct command *commands = NULL; + struct string_list push_options = STRING_LIST_INIT_DUP; + struct string_list_item *item; + struct option options[] = { + OPT_BOOL(0, "no-push-options", &no_push_options, + "disable push options"), + OPT_BOOL(0, "die-version", &die_version, + "die during version negotiation"), + OPT_BOOL(0, "die-readline", &die_readline, + "die when readline"), + OPT_STRING_LIST('r', "return", &returns, "old/new/ref/status/msg", + "return of results"), + OPT__VERBOSE(&verbose, "be verbose"), + OPT_INTEGER('V', "version", &version, + "use this protocol version number"), + OPT_END() + }; + + setup_git_directory_gently(&nongit_ok); + + argc = parse_options(argc, argv, "test-tools", options, proc_receive_usage, 0); + if (argc > 0) + usage_msg_opt("Too many arguments.", proc_receive_usage, options); + packet_reader_init(&reader, 0, NULL, 0, + PACKET_READ_CHOMP_NEWLINE | + PACKET_READ_DIE_ON_ERR_PACKET); + + sigchain_push(SIGPIPE, SIG_IGN); + proc_receive_verison(&reader); + proc_receive_read_commands(&reader, &commands); + proc_receive_read_push_options(&reader, &push_options); + + if (verbose) { + struct command *cmd; + + if (use_push_options || use_atomic) + fprintf(stderr, "proc-receive:%s%s\n", + use_atomic? " atomic": "", + use_push_options ? " push_options": ""); + + for (cmd = commands; cmd; cmd = cmd->next) + fprintf(stderr, "proc-receive< %s %s %s\n", + oid_to_hex(&cmd->old_oid), + oid_to_hex(&cmd->new_oid), + cmd->ref_name); + + if (push_options.nr > 0) + for_each_string_list_item(item, &push_options) + fprintf(stderr, "proc-receive< %s\n", item->string); + + if (returns.nr) + for_each_string_list_item(item, &returns) + fprintf(stderr, "proc-receive> %s\n", item->string); + } + + if (returns.nr) + for_each_string_list_item(item, &returns) + packet_write_fmt(1, "%s\n", item->string); + packet_flush(1); + sigchain_pop(SIGPIPE); + + return 0; +} diff --git a/third_party/git/t/helper/test-progress.c b/third_party/git/t/helper/test-progress.c new file mode 100644 index 0000000000..5d05cbe789 --- /dev/null +++ b/third_party/git/t/helper/test-progress.c @@ -0,0 +1,74 @@ +/* + * 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. + */ +#define GIT_TEST_PROGRESS_ONLY +#include "test-tool.h" +#include "gettext.h" +#include "parse-options.h" +#include "progress.h" +#include "strbuf.h" + +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-reach.c b/third_party/git/t/helper/test-reach.c index a0272178b7..cda804ed79 100644 --- a/third_party/git/t/helper/test-reach.c +++ b/third_party/git/t/helper/test-reach.c @@ -67,7 +67,7 @@ int cmd__reach(int ac, const char **av) die("failed to load commit for input %s resulting in oid %s\n", buf.buf, oid_to_hex(&oid)); - c = object_as_type(r, peeled, OBJ_COMMIT, 0); + c = object_as_type(peeled, OBJ_COMMIT, 0); if (!c) die("failed to load commit for input %s resulting in oid %s\n", @@ -107,8 +107,10 @@ int cmd__reach(int ac, const char **av) printf("%s(A,B):%d\n", av[1], ref_newer(&oid_A, &oid_B)); else if (!strcmp(av[1], "in_merge_bases")) printf("%s(A,B):%d\n", av[1], in_merge_bases(A, B)); + else if (!strcmp(av[1], "in_merge_bases_many")) + printf("%s(A,X):%d\n", av[1], in_merge_bases_many(A, X_nr, X_array)); else if (!strcmp(av[1], "is_descendant_of")) - printf("%s(A,X):%d\n", av[1], is_descendant_of(A, X)); + printf("%s(A,X):%d\n", av[1], repo_is_descendant_of(r, A, X)); else if (!strcmp(av[1], "get_merge_bases_many")) { struct commit_list *list = get_merge_bases_many(A, X_nr, X_array); printf("%s(A,X):\n", av[1]); diff --git a/third_party/git/t/helper/test-read-cache.c b/third_party/git/t/helper/test-read-cache.c index 7e79b555de..244977a29b 100644 --- a/third_party/git/t/helper/test-read-cache.c +++ b/third_party/git/t/helper/test-read-cache.c @@ -4,11 +4,10 @@ int cmd__read_cache(int argc, const char **argv) { - int i, cnt = 1, namelen; + int i, cnt = 1; const char *name = NULL; if (argc > 1 && skip_prefix(argv[1], "--print-and-refresh=", &name)) { - namelen = strlen(name); argc--; argv++; } @@ -24,7 +23,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, namelen); + pos = index_name_pos(&the_index, name, strlen(name)); 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 new file mode 100644 index 0000000000..5f585a1725 --- /dev/null +++ b/third_party/git/t/helper/test-read-graph.c @@ -0,0 +1,47 @@ +#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; + struct object_directory *odb; + + setup_git_directory(); + odb = the_repository->objects->odb; + + prepare_repo_settings(the_repository); + + graph = read_commit_graph_one(the_repository, odb); + if (!graph) + return 1; + + 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"); + if (graph->chunk_bloom_indexes) + printf(" bloom_indexes"); + if (graph->chunk_bloom_data) + printf(" bloom_data"); + printf("\n"); + + UNLEAK(graph); + + return 0; +} diff --git a/third_party/git/t/helper/test-read-midx.c b/third_party/git/t/helper/test-read-midx.c index 831b586d02..2430880f78 100644 --- a/third_party/git/t/helper/test-read-midx.c +++ b/third_party/git/t/helper/test-read-midx.c @@ -7,14 +7,18 @@ static int read_midx_file(const char *object_dir) { uint32_t i; - struct multi_pack_index *m = load_multi_pack_index(object_dir, 1); + struct multi_pack_index *m; + + setup_git_directory(); + m = load_multi_pack_index(object_dir, 1); if (!m) return 1; - printf("header: %08x %d %d %d\n", + printf("header: %08x %d %d %d %d\n", m->signature, m->version, + m->hash_len, m->num_chunks, m->num_packs); diff --git a/third_party/git/t/helper/test-ref-store.c b/third_party/git/t/helper/test-ref-store.c index 799fc00aa1..759e69dc54 100644 --- a/third_party/git/t/helper/test-ref-store.c +++ b/third_party/git/t/helper/test-ref-store.c @@ -37,7 +37,7 @@ static const char **get_store(const char **argv, struct ref_store **refs) *refs = get_submodule_ref_store(gitdir); } else if (skip_prefix(argv[0], "worktree:", &gitdir)) { - struct worktree **p, **worktrees = get_worktrees(0); + struct worktree **p, **worktrees = get_worktrees(); for (p = worktrees; *p; p++) { struct worktree *wt = *p; diff --git a/third_party/git/t/helper/test-regex.c b/third_party/git/t/helper/test-regex.c index 10284cc56f..d6f28ca8d1 100644 --- a/third_party/git/t/helper/test-regex.c +++ b/third_party/git/t/helper/test-regex.c @@ -1,5 +1,4 @@ #include "test-tool.h" -#include "git-compat-util.h" #include "gettext.h" struct reg_flag { @@ -8,12 +7,13 @@ struct reg_flag { }; static struct reg_flag reg_flags[] = { - { "EXTENDED", REG_EXTENDED }, - { "NEWLINE", REG_NEWLINE }, - { "ICASE", REG_ICASE }, - { "NOTBOL", REG_NOTBOL }, + { "EXTENDED", REG_EXTENDED }, + { "NEWLINE", REG_NEWLINE }, + { "ICASE", REG_ICASE }, + { "NOTBOL", REG_NOTBOL }, + { "NOTEOL", REG_NOTEOL }, #ifdef REG_STARTEND - { "STARTEND", REG_STARTEND }, + { "STARTEND", REG_STARTEND }, #endif { NULL, 0 } }; @@ -41,36 +41,74 @@ int cmd__regex(int argc, const char **argv) { const char *pat; const char *str; - int flags = 0; + int ret, silent = 0, flags = 0; regex_t r; regmatch_t m[1]; - - if (argc == 2 && !strcmp(argv[1], "--bug")) - return test_regex_bug(); - else if (argc < 3) - usage("test-tool regex --bug\n" - "test-tool regex <pattern> <string> [<options>]"); + char errbuf[64]; argv++; - pat = *argv++; - str = *argv++; - while (*argv) { - struct reg_flag *rf; - for (rf = reg_flags; rf->name; rf++) - if (!strcmp(*argv, rf->name)) { - flags |= rf->flag; - break; - } - if (!rf->name) - die("do not recognize %s", *argv); + argc--; + + if (!argc) + goto usage; + + if (!strcmp(*argv, "--bug")) { + if (argc == 1) + return test_regex_bug(); + else + goto usage; + } + if (!strcmp(*argv, "--silent")) { + silent = 1; argv++; + argc--; + } + if (!argc) + goto usage; + + pat = *argv++; + if (argc == 1) + str = NULL; + else { + str = *argv++; + while (*argv) { + struct reg_flag *rf; + for (rf = reg_flags; rf->name; rf++) + if (!strcmp(*argv, rf->name)) { + flags |= rf->flag; + break; + } + if (!rf->name) + die("do not recognize flag %s", *argv); + argv++; + } } git_setup_gettext(); - if (regcomp(&r, pat, flags)) - die("failed regcomp() for pattern '%s'", pat); - if (regexec(&r, str, 1, m, 0)) - return 1; + ret = regcomp(&r, pat, flags); + if (ret) { + if (silent) + return ret; + + regerror(ret, &r, errbuf, sizeof(errbuf)); + die("failed regcomp() for pattern '%s' (%s)", pat, errbuf); + } + if (!str) + return 0; + + ret = regexec(&r, str, 1, m, 0); + if (ret) { + if (silent || ret == REG_NOMATCH) + return ret; + + regerror(ret, &r, errbuf, sizeof(errbuf)); + die("failed regexec() for subject '%s' (%s)", str, errbuf); + } return 0; +usage: + usage("\ttest-tool regex --bug\n" + "\ttest-tool regex [--silent] <pattern>\n" + "\ttest-tool regex [--silent] <pattern> <string> [<options>]"); + return -1; } diff --git a/third_party/git/t/helper/test-repository.c b/third_party/git/t/helper/test-repository.c index f7f8618445..56f0e3c1be 100644 --- a/third_party/git/t/helper/test-repository.c +++ b/third_party/git/t/helper/test-repository.c @@ -19,12 +19,11 @@ static void test_parse_commit_in_graph(const char *gitdir, const char *worktree, memset(the_repository, 0, sizeof(*the_repository)); - /* TODO: Needed for temporary hack in hashcmp, see 183a638b7da. */ - repo_set_hash_algo(the_repository, GIT_HASH_SHA1); - if (repo_init(&r, gitdir, worktree)) die("Couldn't init repo"); + repo_set_hash_algo(the_repository, hash_algo_by_ptr(r.hash_algo)); + c = lookup_commit(&r, commit_oid); if (!parse_commit_in_graph(&r, c)) @@ -50,12 +49,11 @@ static void test_get_commit_tree_in_graph(const char *gitdir, memset(the_repository, 0, sizeof(*the_repository)); - /* TODO: Needed for temporary hack in hashcmp, see 183a638b7da. */ - repo_set_hash_algo(the_repository, GIT_HASH_SHA1); - if (repo_init(&r, gitdir, worktree)) die("Couldn't init repo"); + repo_set_hash_algo(the_repository, hash_algo_by_ptr(r.hash_algo)); + c = lookup_commit(&r, commit_oid); /* @@ -75,6 +73,10 @@ static void test_get_commit_tree_in_graph(const char *gitdir, int cmd__repository(int argc, const char **argv) { + int nongit_ok = 0; + + setup_git_directory_gently(&nongit_ok); + if (argc < 2) die("must have at least 2 arguments"); if (!strcmp(argv[1], "parse_commit_in_graph")) { diff --git a/third_party/git/t/helper/test-run-command.c b/third_party/git/t/helper/test-run-command.c index 2cc93bb69c..7ae03dc712 100644 --- a/third_party/git/t/helper/test-run-command.c +++ b/third_party/git/t/helper/test-run-command.c @@ -10,11 +10,16 @@ #include "test-tool.h" #include "git-compat-util.h" +#include "cache.h" #include "run-command.h" -#include "argv-array.h" +#include "strvec.h" #include "strbuf.h" -#include <string.h> -#include <errno.h> +#include "parse-options.h" +#include "string-list.h" +#include "thread-utils.h" +#include "wildmatch.h" +#include "gettext.h" +#include "parse-options.h" static int number_callbacks; static int parallel_next(struct child_process *cp, @@ -26,7 +31,7 @@ static int parallel_next(struct child_process *cp, if (number_callbacks >= 4) return 0; - argv_array_pushv(&cp->args, d->argv); + strvec_pushv(&cp->args, d->argv); strbuf_addstr(err, "preloaded output of a child\n"); number_callbacks++; return 1; @@ -50,17 +55,343 @@ 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; + strvec_pushl(&cp->args, "sh", test, NULL); + if (suite->quiet) + strvec_push(&cp->args, "--quiet"); + if (suite->immediate) + strvec_push(&cp->args, "-i"); + if (suite->verbose) + strvec_push(&cp->args, "-v"); + if (suite->verbose_log) + strvec_push(&cp->args, "-V"); + if (suite->trace) + strvec_push(&cp->args, "-x"); + if (suite->write_junit_xml) + strvec_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 strvec args = STRVEC_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; + + strvec_clear(&args); + if (msys2) + strvec_pushl(&args, "sh", "-c", + "printf %s\\\\0 \"$@\"", "skip", NULL); + else + strvec_pushl(&args, "test-tool", "run-command", + "quote-echo", NULL); + arg_offset = args.nr; + + if (argc > 0) { + trials = 1; + arg_count = argc; + for (j = 0; j < arg_count; j++) + strvec_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'; + + strvec_push(&args, buf); + } + } + + if (i < skip) + continue; + + cp.argv = args.v; + 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.v[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.v[j + arg_offset]); + + strbuf_release(&out); + strvec_clear(&args); + + return ret; + } + + if (i && (i % 100) == 0) + fprintf(stderr, "Trials completed: %d\n", (int)i); + } + + strbuf_release(&out); + strvec_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); + + strvec_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")) { if (!argv[2]) die("env specifier without a value"); - argv_array_push(&proc.env_array, argv[2]); + strvec_push(&proc.env_array, argv[2]); argv += 2; argc -= 2; } diff --git a/third_party/git/t/helper/test-submodule-nested-repo-config.c b/third_party/git/t/helper/test-submodule-nested-repo-config.c index bc97929bbc..c5fd4527dc 100644 --- a/third_party/git/t/helper/test-submodule-nested-repo-config.c +++ b/third_party/git/t/helper/test-submodule-nested-repo-config.c @@ -1,7 +1,7 @@ #include "test-tool.h" #include "submodule-config.h" -static void die_usage(int argc, const char **argv, const char *msg) +static void die_usage(const char **argv, const char *msg) { fprintf(stderr, "%s\n", msg); fprintf(stderr, "Usage: %s <submodulepath> <config name>\n", argv[0]); @@ -14,13 +14,13 @@ int cmd__submodule_nested_repo_config(int argc, const char **argv) const struct submodule *sub; if (argc < 3) - die_usage(argc, argv, "Wrong number of arguments."); + die_usage(argv, "Wrong number of arguments."); setup_git_directory(); sub = submodule_from_path(the_repository, &null_oid, argv[1]); if (repo_submodule_init(&subrepo, the_repository, sub)) { - die_usage(argc, argv, "Submodule not found."); + die_usage(argv, "Submodule not found."); } /* Read the config of _child_ submodules. */ diff --git a/third_party/git/t/helper/test-svn-fe.c b/third_party/git/t/helper/test-svn-fe.c deleted file mode 100644 index 7667c0803f..0000000000 --- a/third_party/git/t/helper/test-svn-fe.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * test-svn-fe: Code to exercise the svn import lib - */ - -#include "git-compat-util.h" -#include "vcs-svn/svndump.h" -#include "vcs-svn/svndiff.h" -#include "vcs-svn/sliding_window.h" -#include "vcs-svn/line_buffer.h" - -static const char test_svnfe_usage[] = - "test-svn-fe (<dumpfile> | [-d] <preimage> <delta> <len>)"; - -static int apply_delta(int argc, const char **argv) -{ - struct line_buffer preimage = LINE_BUFFER_INIT; - struct line_buffer delta = LINE_BUFFER_INIT; - struct sliding_view preimage_view = SLIDING_VIEW_INIT(&preimage, -1); - - if (argc != 5) - usage(test_svnfe_usage); - - if (buffer_init(&preimage, argv[2])) - die_errno("cannot open preimage"); - if (buffer_init(&delta, argv[3])) - die_errno("cannot open delta"); - if (svndiff0_apply(&delta, (off_t) strtoumax(argv[4], NULL, 0), - &preimage_view, stdout)) - return 1; - if (buffer_deinit(&preimage)) - die_errno("cannot close preimage"); - if (buffer_deinit(&delta)) - die_errno("cannot close delta"); - strbuf_release(&preimage_view.buf); - return 0; -} - -int cmd_main(int argc, const char **argv) -{ - if (argc == 2) { - if (svndump_init(argv[1])) - return 1; - svndump_read(NULL, "refs/heads/master", "refs/notes/svn/revs"); - svndump_deinit(); - svndump_reset(); - return 0; - } - - if (argc >= 2 && !strcmp(argv[1], "-d")) - return apply_delta(argc, argv); - usage(test_svnfe_usage); -} diff --git a/third_party/git/t/helper/test-tool.c b/third_party/git/t/helper/test-tool.c index ce7e89028c..a0d3966b29 100644 --- a/third_party/git/t/helper/test-tool.c +++ b/third_party/git/t/helper/test-tool.c @@ -14,6 +14,8 @@ struct test_cmd { }; static struct test_cmd cmds[] = { + { "advise", cmd__advise_if_enabled }, + { "bloom", cmd__bloom }, { "chmtime", cmd__chmtime }, { "config", cmd__config }, { "ctype", cmd__ctype }, @@ -36,14 +38,19 @@ static struct test_cmd cmds[] = { { "match-trees", cmd__match_trees }, { "mergesort", cmd__mergesort }, { "mktemp", cmd__mktemp }, + { "oid-array", cmd__oid_array }, { "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 }, + { "proc-receive", cmd__proc_receive}, + { "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 }, @@ -53,7 +60,6 @@ static struct test_cmd cmds[] = { { "scrap-cache-tree", cmd__scrap_cache_tree }, { "serve-v2", cmd__serve_v2 }, { "sha1", cmd__sha1 }, - { "sha1-array", cmd__sha1_array }, { "sha256", cmd__sha256 }, { "sigchain", cmd__sigchain }, { "strcmp-offset", cmd__strcmp_offset }, @@ -108,6 +114,7 @@ int cmd_main(int argc, const char **argv) argc--; trace2_cmd_name(cmds[i].name); trace2_cmd_list_config(); + trace2_cmd_list_env_vars(); return cmds[i].fn(argc, argv); } } diff --git a/third_party/git/t/helper/test-tool.h b/third_party/git/t/helper/test-tool.h index f805bb39ae..07034d3f38 100644 --- a/third_party/git/t/helper/test-tool.h +++ b/third_party/git/t/helper/test-tool.h @@ -4,6 +4,8 @@ #define USE_THE_INDEX_COMPATIBILITY_MACROS #include "git-compat-util.h" +int cmd__advise_if_enabled(int argc, const char **argv); +int cmd__bloom(int argc, const char **argv); int cmd__chmtime(int argc, const char **argv); int cmd__config(int argc, const char **argv); int cmd__ctype(int argc, const char **argv); @@ -29,11 +31,15 @@ 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__proc_receive(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); @@ -43,7 +49,7 @@ int cmd__run_command(int argc, const char **argv); int cmd__scrap_cache_tree(int argc, const char **argv); int cmd__serve_v2(int argc, const char **argv); int cmd__sha1(int argc, const char **argv); -int cmd__sha1_array(int argc, const char **argv); +int cmd__oid_array(int argc, const char **argv); int cmd__sha256(int argc, const char **argv); int cmd__sigchain(int argc, const char **argv); int cmd__strcmp_offset(int argc, const char **argv); diff --git a/third_party/git/t/helper/test-trace2.c b/third_party/git/t/helper/test-trace2.c index 197819c872..823f33ceff 100644 --- a/third_party/git/t/helper/test-trace2.c +++ b/third_party/git/t/helper/test-trace2.c @@ -1,6 +1,6 @@ #include "test-tool.h" #include "cache.h" -#include "argv-array.h" +#include "strvec.h" #include "run-command.h" #include "exec-cmd.h" #include "config.h" 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 b4b752b01a..ae52183e63 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 (strchr(filename, '/') || strchr(filename, '\\')) + if (strpbrk(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 2be955fafb..b0b6060929 100644 --- a/third_party/git/t/lib-bash.sh +++ b/third_party/git/t/lib-bash.sh @@ -2,10 +2,12 @@ # 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 937b831ea6..dea2cbef51 100755..100644 --- a/third_party/git/t/lib-credential.sh +++ b/third_party/git/t/lib-credential.sh @@ -1,4 +1,5 @@ -#!/bin/sh +# Shell library for testing credential handling including helpers. See t0302 +# for an example of testing a specific helper. # Try a set of credential helpers; the expected stdin, # stdout and stderr should be provided on stdin, @@ -19,7 +20,7 @@ check() { false fi && test_cmp expect-stdout stdout && - test_cmp expect-stderr stderr + test_i18ncmp 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 fb8f887080..e62569222b 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 ! git env--helper --type=bool --default=true --exit-code GIT_TEST_GIT_DAEMON +if ! test_bool_env GIT_TEST_GIT_DAEMON true 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 547b9f88e1..5aff2abe8b 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_must_fail test -d "$git" && + test_path_is_missing "$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 5d4ae629e1..547eb3c31a 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 git env--helper --type=bool --default=false --exit-code GIT_TEST_HTTPD + if test_bool_env GIT_TEST_SVN_HTTPD false then . "$TEST_DIRECTORY"/lib-httpd.sh LIB_HTTPD_SVN="$loc" @@ -78,21 +78,24 @@ maybe_start_httpd () { } convert_to_rev_db () { - perl -w -- - "$@" <<\EOF + perl -w -- - "$(test_oid rawsz)" "$@" <<\EOF use strict; +my $oidlen = shift; @ARGV == 2 or die "usage: convert_to_rev_db <input> <output>"; +my $record_size = $oidlen + 4; +my $hexlen = $oidlen * 2; open my $wr, '+>', $ARGV[1] or die "$!: couldn't open: $ARGV[1]"; open my $rd, '<', $ARGV[0] or die "$!: couldn't open: $ARGV[0]"; my $size = (stat($rd))[7]; -($size % 24) == 0 or die "Inconsistent size: $size"; -while (sysread($rd, my $buf, 24) == 24) { - my ($r, $c) = unpack('NH40', $buf); - my $offset = $r * 41; +($size % $record_size) == 0 or die "Inconsistent size: $size"; +while (sysread($rd, my $buf, $record_size) == $record_size) { + my ($r, $c) = unpack("NH$hexlen", $buf); + my $offset = $r * ($hexlen + 1); seek $wr, 0, 2 or die $!; my $pos = tell $wr; if ($pos < $offset) { - for (1 .. (($offset - $pos) / 41)) { - print $wr (('0' x 40),"\n") or die $!; + for (1 .. (($offset - $pos) / ($hexlen + 1))) { + print $wr (('0' x $hexlen),"\n") or die $!; } } seek $wr, $offset, 0 or die $!; @@ -104,7 +107,7 @@ EOF } require_svnserve () { - if ! git env--helper --type=bool --default=false --exit-code GIT_TEST_SVNSERVE + if ! test_bool_env GIT_TEST_SVNSERVE false then skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)' test_done diff --git a/third_party/git/t/lib-gpg.sh b/third_party/git/t/lib-gpg.sh index 8d28652b72..9fc5241228 100755..100644 --- a/third_party/git/t/lib-gpg.sh +++ b/third_party/git/t/lib-gpg.sh @@ -1,14 +1,25 @@ -#!/bin/sh +# We always set GNUPGHOME, even if no usable GPG was found, as +# +# - It does not hurt, and +# +# - we cannot set global environment variables in lazy prereqs because they are +# executed in an eval'ed subshell that changes the working directory to a +# temporary one. + +GNUPGHOME="$PWD/gpghome" +export GNUPGHOME + +test_lazy_prereq GPG ' + gpg_version=$(gpg --version 2>&1) + test $? != 127 || exit 1 -gpg_version=$(gpg --version 2>&1) -if test $? != 127 -then # As said here: http://www.gnupg.org/documentation/faqs.html#q6.19 - # the gpg version 1.0.6 didn't parse trust packets correctly, so for + # the gpg version 1.0.6 did not parse trust packets correctly, so for # that version, creation of signed tags using the generated key fails. case "$gpg_version" in - 'gpg (GnuPG) 1.0.6'*) + "gpg (GnuPG) 1.0.6"*) say "Your version of gpg (1.0.6) is too buggy for testing" + exit 1 ;; *) # Available key info: @@ -27,55 +38,54 @@ then # To export ownertrust: # gpg --homedir /tmp/gpghome --export-ownertrust \ # > lib-gpg/ownertrust - mkdir ./gpghome && - chmod 0700 ./gpghome && - GNUPGHOME="$(pwd)/gpghome" && - export GNUPGHOME && - (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) && - gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \ + mkdir "$GNUPGHOME" && + chmod 0700 "$GNUPGHOME" && + (gpgconf --kill gpg-agent || : ) && + gpg --homedir "${GNUPGHOME}" --import \ "$TEST_DIRECTORY"/lib-gpg/keyring.gpg && - gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \ + gpg --homedir "${GNUPGHOME}" --import-ownertrust \ "$TEST_DIRECTORY"/lib-gpg/ownertrust && - gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null 2>&1 \ - --sign -u committer@example.com && - test_set_prereq GPG && - # Available key info: - # * see t/lib-gpg/gpgsm-gen-key.in - # To generate new certificate: - # * no passphrase - # gpgsm --homedir /tmp/gpghome/ \ - # -o /tmp/gpgsm.crt.user \ - # --generate-key \ - # --batch t/lib-gpg/gpgsm-gen-key.in - # To import certificate: - # gpgsm --homedir /tmp/gpghome/ \ - # --import /tmp/gpgsm.crt.user - # To export into a .p12 we can later import: - # gpgsm --homedir /tmp/gpghome/ \ - # -o t/lib-gpg/gpgsm_cert.p12 \ - # --export-secret-key-p12 "committer@example.com" - echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \ - --passphrase-fd 0 --pinentry-mode loopback \ - --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 && - - gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K | - grep fingerprint: | - cut -d" " -f4 | - tr -d '\n' >"${GNUPGHOME}/trustlist.txt" && - - echo " S relax" >>"${GNUPGHOME}/trustlist.txt" && - echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ - -u committer@example.com -o /dev/null --sign - 2>&1 && - test_set_prereq GPGSM + gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \ + --sign -u committer@example.com ;; esac -fi +' + +test_lazy_prereq GPGSM ' + test_have_prereq GPG && + # Available key info: + # * see t/lib-gpg/gpgsm-gen-key.in + # To generate new certificate: + # * no passphrase + # gpgsm --homedir /tmp/gpghome/ \ + # -o /tmp/gpgsm.crt.user \ + # --generate-key \ + # --batch t/lib-gpg/gpgsm-gen-key.in + # To import certificate: + # gpgsm --homedir /tmp/gpghome/ \ + # --import /tmp/gpgsm.crt.user + # To export into a .p12 we can later import: + # gpgsm --homedir /tmp/gpghome/ \ + # -o t/lib-gpg/gpgsm_cert.p12 \ + # --export-secret-key-p12 "committer@example.com" + echo | gpgsm --homedir "${GNUPGHOME}" \ + --passphrase-fd 0 --pinentry-mode loopback \ + --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 && + + gpgsm --homedir "${GNUPGHOME}" -K | + grep fingerprint: | + cut -d" " -f4 | + tr -d "\\n" >"${GNUPGHOME}/trustlist.txt" && + + echo " S relax" >>"${GNUPGHOME}/trustlist.txt" && + echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ + -u committer@example.com -o /dev/null --sign - +' -if test_have_prereq GPG && - echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null 2>&1 -then - test_set_prereq RFC1991 -fi +test_lazy_prereq RFC1991 ' + test_have_prereq GPG && + echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null +' sanitize_pgp() { perl -ne ' diff --git a/third_party/git/t/lib-httpd.sh b/third_party/git/t/lib-httpd.sh index 0d985758c6..d2edfa4c50 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 ! git env--helper --type=bool --default=true --exit-code GIT_TEST_HTTPD +if ! test_bool_env GIT_TEST_HTTPD true then skip_all="Network testing disabled (unset GIT_TEST_HTTPD to enable)" test_done @@ -129,10 +129,12 @@ install_script () { prepare_httpd() { mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH" cp "$TEST_PATH"/passwd "$HTTPD_ROOT_PATH" + install_script incomplete-length-upload-pack-v2-http.sh + install_script incomplete-body-upload-pack-v2-http.sh install_script broken-smart-http.sh install_script error-smart-http.sh install_script error.sh - install_script apply-one-time-sed.sh + install_script apply-one-time-perl.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 5c1c86c193..afa91e38b0 100644 --- a/third_party/git/t/lib-httpd/apache.conf +++ b/third_party/git/t/lib-httpd/apache.conf @@ -113,19 +113,27 @@ Alias /auth/dumb/ www/auth/dumb/ SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} SetEnv GIT_HTTP_EXPORT_ALL </LocationMatch> -<LocationMatch /one_time_sed/> +<LocationMatch /one_time_perl/> SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} SetEnv GIT_HTTP_EXPORT_ALL </LocationMatch> +ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/ +ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/ ScriptAliasMatch /error_git_upload_pack/(.*)/git-upload-pack error.sh/ 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_sed/(.*) apply-one-time-sed.sh/$1 +ScriptAliasMatch /one_time_perl/(.*) apply-one-time-perl.sh/$1 <Directory ${GIT_EXEC_PATH}> Options FollowSymlinks </Directory> +<Files incomplete-length-upload-pack-v2-http.sh> + Options ExecCGI +</Files> +<Files incomplete-body-upload-pack-v2-http.sh> + Options ExecCGI +</Files> <Files broken-smart-http.sh> Options ExecCGI </Files> @@ -135,7 +143,7 @@ ScriptAliasMatch /one_time_sed/(.*) apply-one-time-sed.sh/$1 <Files error.sh> Options ExecCGI </Files> -<Files apply-one-time-sed.sh> +<Files apply-one-time-perl.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 new file mode 100644 index 0000000000..09a0abdff7 --- /dev/null +++ b/third_party/git/t/lib-httpd/apply-one-time-perl.sh @@ -0,0 +1,27 @@ +#!/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 deleted file mode 100644 index fcef728925..0000000000 --- a/third_party/git/t/lib-httpd/apply-one-time-sed.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/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-httpd/incomplete-body-upload-pack-v2-http.sh b/third_party/git/t/lib-httpd/incomplete-body-upload-pack-v2-http.sh new file mode 100644 index 0000000000..90e73ef8d5 --- /dev/null +++ b/third_party/git/t/lib-httpd/incomplete-body-upload-pack-v2-http.sh @@ -0,0 +1,3 @@ +printf "Content-Type: text/%s\n" "application/x-git-upload-pack-result" +echo +printf "%s%s" "0079" "45" diff --git a/third_party/git/t/lib-httpd/incomplete-length-upload-pack-v2-http.sh b/third_party/git/t/lib-httpd/incomplete-length-upload-pack-v2-http.sh new file mode 100644 index 0000000000..dce552e348 --- /dev/null +++ b/third_party/git/t/lib-httpd/incomplete-length-upload-pack-v2-http.sh @@ -0,0 +1,3 @@ +printf "Content-Type: text/%s\n" "application/x-git-upload-pack-result" +echo +printf "%s" "00" diff --git a/third_party/git/t/lib-log-graph.sh b/third_party/git/t/lib-log-graph.sh new file mode 100644 index 0000000000..1184cceef2 --- /dev/null +++ b/third_party/git/t/lib-log-graph.sh @@ -0,0 +1,28 @@ +# 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 c4d907a450..bb8938ccbe 100644 --- a/third_party/git/t/lib-pack.sh +++ b/third_party/git/t/lib-pack.sh @@ -37,7 +37,7 @@ pack_header () { pack_obj () { case "$1" in # empty blob - e69de29bb2d1d6434b8b29ae775ad8c2e48c5391) + $EMPTY_BLOB) case "$2" in '') printf '\060\170\234\003\0\0\0\0\1' @@ -47,7 +47,7 @@ pack_obj () { ;; # blob containing "\7\76" - e68fe8129b546b101aee9510c5328e7f21ca1d18) + $(test_oid packlib_7_76)) case "$2" in '') printf '\062\170\234\143\267\3\0\0\116\0\106' @@ -59,11 +59,18 @@ 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" - 01d7713666f4de822776c7622c10f1b07de280dc) + $(test_oid packlib_7_0)) case "$2" in '') printf '\062\170\234\143\147\0\0\0\20\0\10' @@ -75,8 +82,23 @@ 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 ;; + # blob containing "\3\326" + 471819e8c52bf11513f100b2810a8aa0622d5cd3d1c913758a071dd4b3bad8fe) + case "$2" in + '') + printf '\062\170\234\143\276\006\000\000\336\000\332' + return + ;; + esac esac # If it's not a delta, we can convince pack-objects to generate a pack @@ -86,7 +108,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 - 20 - 12)) skip=12 && + dd if=pack_obj.tmp bs=1 count=$((size - $(test_oid rawsz) - 12)) skip=12 && rm -f pack_obj.tmp return fi @@ -97,7 +119,7 @@ pack_obj () { # Compute and append pack trailer to "$1" pack_trailer () { - test-tool sha1 -b <"$1" >trailer.tmp && + test-tool $(test_oid algo) -b <"$1" >trailer.tmp && cat trailer.tmp >>"$1" && rm -f trailer.tmp } @@ -108,3 +130,11 @@ 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 7ea30e5006..b72c051f47 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=pick + action=\& for line in $FAKE_LINES; do case $line in - pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d) + pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d|label|l|reset|r|merge|m) action="$line";; exec_*|x_*|break|b) echo "$line" | sed 's/_/ /g' >> "$1";; @@ -58,11 +58,12 @@ set_fake_editor () { bad) action="badcmd";; fakesha) + test \& != "$action" || action=pick echo "$action XXXXXXX False commit" >> "$1" action=pick;; *) - sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1" - action=pick;; + sed -n "${line}s/^[a-z][a-z]*/$action/p" < "$1".tmp >> "$1" + action=\&;; esac done echo 'rebase -i script after editing:' @@ -118,3 +119,31 @@ 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/lib-submodule-update.sh b/third_party/git/t/lib-submodule-update.sh index 1dd17fc03e..87a759149f 100755..100644 --- a/third_party/git/t/lib-submodule-update.sh +++ b/third_party/git/t/lib-submodule-update.sh @@ -183,7 +183,7 @@ test_git_directory_is_unchanged () { ) } -test_git_directory_exists() { +test_git_directory_exists () { test -e ".git/modules/$1" && if test -f sub1/.git then @@ -196,7 +196,6 @@ test_git_directory_exists() { # the submodule repo if it doesn't exist and configures the most problematic # settings for diff.ignoreSubmodules. prolog () { - test_oid_init && (test -d submodule_update_repo || create_lib_submodule_repo) && test_config_global diff.ignoreSubmodules all && test_config diff.ignoreSubmodules all @@ -297,19 +296,23 @@ test_submodule_content () { # - Directory containing tracked files replaced by submodule # - Submodule replaced by tracked files in directory # - Submodule replaced by tracked file with the same name -# - tracked file replaced by submodule +# - Tracked file replaced by submodule # # The default is that submodule contents aren't changed until "git submodule # update" is run. And even then that command doesn't delete the work tree of # a removed submodule. # +# The first argument of the callback function will be the name of the submodule. +# # Removing a submodule containing a .git directory must fail even when forced -# to protect the history! +# to protect the history! If we are testing this case, the second argument of +# the callback function will be 'test_must_fail', else it will be the empty +# string. # -# Internal function; use test_submodule_switch() or -# test_submodule_forced_switch() instead. -test_submodule_switch_common() { +# Internal function; use test_submodule_switch_func(), test_submodule_switch(), +# or test_submodule_forced_switch() instead. +test_submodule_switch_common () { command="$1" ######################### Appearing submodule ######################### # Switching to a commit letting a submodule appear creates empty dir ... @@ -443,7 +446,7 @@ test_submodule_switch_common() { ( cd submodule_update && git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory && - test_must_fail $command replace_sub1_with_directory && + $command replace_sub1_with_directory test_must_fail && test_superproject_content origin/add_sub1 && test_submodule_content sub1 origin/add_sub1 ) @@ -456,7 +459,7 @@ test_submodule_switch_common() { cd submodule_update && git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory && replace_gitfile_with_git_dir sub1 && - test_must_fail $command replace_sub1_with_directory && + $command replace_sub1_with_directory test_must_fail && test_superproject_content origin/add_sub1 && test_git_directory_is_unchanged sub1 && test_submodule_content sub1 origin/add_sub1 @@ -470,7 +473,7 @@ test_submodule_switch_common() { ( cd submodule_update && git branch -t replace_sub1_with_file origin/replace_sub1_with_file && - test_must_fail $command replace_sub1_with_file && + $command replace_sub1_with_file test_must_fail && test_superproject_content origin/add_sub1 && test_submodule_content sub1 origin/add_sub1 ) @@ -484,7 +487,7 @@ test_submodule_switch_common() { cd submodule_update && git branch -t replace_sub1_with_file origin/replace_sub1_with_file && replace_gitfile_with_git_dir sub1 && - test_must_fail $command replace_sub1_with_file && + $command replace_sub1_with_file test_must_fail && test_superproject_content origin/add_sub1 && test_git_directory_is_unchanged sub1 && test_submodule_content sub1 origin/add_sub1 @@ -559,15 +562,28 @@ test_submodule_switch_common() { # conditions, set the appropriate KNOWN_FAILURE_* variable used in the tests # below to 1. # -# Use as follows: +# The first argument of the callback function will be the name of the submodule. +# +# Removing a submodule containing a .git directory must fail even when forced +# to protect the history! If we are testing this case, the second argument of +# the callback function will be 'test_must_fail', else it will be the empty +# string. +# +# The following example uses `git some-command` as an example command to be +# tested. It updates the worktree and index to match a target, but not any +# submodule directories. # # my_func () { -# target=$1 -# # Do something here that updates the worktree and index to match target, -# # but not any submodule directories. +# ...prepare for `git some-command` to be run... +# $2 git some-command "$1" && +# if test -n "$2" +# then +# return +# fi && +# ...check the state after git some-command is run... # } -# test_submodule_switch "my_func" -test_submodule_switch () { +# test_submodule_switch_func "my_func" +test_submodule_switch_func () { command="$1" test_submodule_switch_common "$command" @@ -580,17 +596,33 @@ test_submodule_switch () { cd submodule_update && git branch -t add_sub1 origin/add_sub1 && >sub1 && - test_must_fail $command add_sub1 && + $command add_sub1 test_must_fail && test_superproject_content origin/no_submodule && test_must_be_empty sub1 ) ' } +# Ensures that the that the arg either contains "test_must_fail" or is empty. +may_only_be_test_must_fail () { + test -z "$1" || test "$1" = test_must_fail || die +} + +git_test_func () { + may_only_be_test_must_fail "$2" && + $2 git $gitcmd "$1" +} + +test_submodule_switch () { + gitcmd="$1" + test_submodule_switch_func "git_test_func" +} + # Same as test_submodule_switch(), except that throwing away local changes in # the superproject is allowed. test_submodule_forced_switch () { - command="$1" + gitcmd="$1" + command="git_test_func" KNOWN_FAILURE_FORCED_SWITCH_TESTS=1 test_submodule_switch_common "$command" @@ -621,16 +653,18 @@ test_submodule_forced_switch () { # - Directory containing tracked files replaced by submodule # - Submodule replaced by tracked files in directory # - Submodule replaced by tracked file with the same name -# - tracked file replaced by submodule +# - Tracked file replaced by submodule # # New test cases # - Removing a submodule with a git directory absorbs the submodules # git directory first into the superproject. +# - Switching from no submodule to nested submodules +# - Switching from nested submodules to no submodule # Internal function; use test_submodule_switch_recursing_with_args() or # test_submodule_forced_switch_recursing_with_args() instead. -test_submodule_recursing_with_args_common() { - command="$1" +test_submodule_recursing_with_args_common () { + command="$1 --recurse-submodules" ######################### Appearing submodule ######################### # Switching to a commit letting a submodule appear checks it out ... @@ -658,22 +692,6 @@ test_submodule_recursing_with_args_common() { test_submodule_content sub1 origin/add_sub1 ) ' - test_expect_success "$command: submodule branch is not changed, detach HEAD instead" ' - prolog && - reset_work_tree_to_interested add_sub1 && - ( - cd submodule_update && - git -C sub1 checkout -b keep_branch && - git -C sub1 rev-parse HEAD >expect && - git branch -t modify_sub1 origin/modify_sub1 && - $command modify_sub1 && - test_superproject_content origin/modify_sub1 && - test_submodule_content sub1 origin/modify_sub1 && - git -C sub1 rev-parse keep_branch >actual && - test_cmp expect actual && - test_must_fail git -C sub1 symbolic-ref HEAD - ) - ' # Replacing a tracked file with a submodule produces a checked out submodule test_expect_success "$command: replace tracked file with submodule checks out submodule" ' @@ -699,6 +717,19 @@ test_submodule_recursing_with_args_common() { test_submodule_content sub1 origin/replace_directory_with_sub1 ) ' + # Switching to a commit with nested submodules recursively checks them out + test_expect_success "$command: nested submodules are checked out" ' + prolog && + reset_work_tree_to_interested no_submodule && + ( + cd submodule_update && + git branch -t modify_sub1_recursively origin/modify_sub1_recursively && + $command modify_sub1_recursively && + test_superproject_content origin/modify_sub1_recursively && + test_submodule_content sub1 origin/modify_sub1_recursively && + test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively + ) + ' ######################## Disappearing submodule ####################### # Removing a submodule removes its work tree ... @@ -762,6 +793,21 @@ test_submodule_recursing_with_args_common() { ) ' + # Switching to a commit without nested submodules removes their worktrees + test_expect_success "$command: worktrees of nested submodules are removed" ' + prolog && + reset_work_tree_to_interested add_nested_sub && + ( + cd submodule_update && + git branch -t no_submodule origin/no_submodule && + $command no_submodule && + test_superproject_content origin/no_submodule && + ! test_path_is_dir sub1 && + test_must_fail git config -f .git/modules/sub1/config core.worktree && + test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree + ) + ' + ########################## Modified submodule ######################### # Updating a submodule sha1 updates the submodule's work tree test_expect_success "$command: modified submodule updates submodule work tree" ' @@ -789,6 +835,23 @@ test_submodule_recursing_with_args_common() { test_submodule_content sub1 origin/add_sub1 ) ' + # Updating a submodule does not touch the currently checked out branch in the submodule + test_expect_success "$command: submodule branch is not changed, detach HEAD instead" ' + prolog && + reset_work_tree_to_interested add_sub1 && + ( + cd submodule_update && + git -C sub1 checkout -b keep_branch && + git -C sub1 rev-parse HEAD >expect && + git branch -t modify_sub1 origin/modify_sub1 && + $command modify_sub1 && + test_superproject_content origin/modify_sub1 && + test_submodule_content sub1 origin/modify_sub1 && + git -C sub1 rev-parse keep_branch >actual && + test_cmp expect actual && + test_must_fail git -C sub1 symbolic-ref HEAD + ) + ' } # Declares and invokes several tests that, in various situations, checks that @@ -809,7 +872,7 @@ test_submodule_recursing_with_args_common() { # test_submodule_switch_recursing_with_args "$GIT_COMMAND" test_submodule_switch_recursing_with_args () { cmd_args="$1" - command="git $cmd_args --recurse-submodules" + command="git $cmd_args" test_submodule_recursing_with_args_common "$command" RESULTDS=success @@ -908,7 +971,6 @@ test_submodule_switch_recursing_with_args () { ) ' - # recursing deeper than one level doesn't work yet. test_expect_success "$command: modified submodule updates submodule recursively" ' prolog && reset_work_tree_to_interested add_nested_sub && @@ -927,7 +989,7 @@ test_submodule_switch_recursing_with_args () { # away local changes in the superproject is allowed. test_submodule_forced_switch_recursing_with_args () { cmd_args="$1" - command="git $cmd_args --recurse-submodules" + command="git $cmd_args" test_submodule_recursing_with_args_common "$command" RESULT=success diff --git a/third_party/git/t/lib-t6000.sh b/third_party/git/t/lib-t6000.sh index b0ed4767e3..fba6778ca3 100644 --- a/third_party/git/t/lib-t6000.sh +++ b/third_party/git/t/lib-t6000.sh @@ -1,7 +1,5 @@ : included from 6002 and others -mkdir -p .git/refs/tags - >sed.script # Answer the sha1 has associated with the tag. The tag must exist under refs/tags @@ -26,7 +24,8 @@ save_tag () { _tag=$1 test -n "$_tag" || error "usage: save_tag tag commit-args ..." shift 1 - "$@" >".git/refs/tags/$_tag" + + git update-ref "refs/tags/$_tag" $("$@") echo "s/$(tag $_tag)/$_tag/g" >sed.script.tmp cat sed.script >>sed.script.tmp diff --git a/third_party/git/t/oid-info/hash-info b/third_party/git/t/oid-info/hash-info index ccdbfdf974..d0736dd1a0 100644 --- a/third_party/git/t/oid-info/hash-info +++ b/third_party/git/t/oid-info/hash-info @@ -6,3 +6,12 @@ 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/README b/third_party/git/t/perf/README index c7b70e2d28..bd649afa97 100644 --- a/third_party/git/t/perf/README +++ b/third_party/git/t/perf/README @@ -84,6 +84,15 @@ You can set the following variables (also in your config.mak): probably be about linux.git size for optimal results. Both default to the git.git you are running from. + GIT_PERF_EXTRA + Boolean to enable additional tests. Most test scripts are + written to detect regressions between two versions of Git, and + the output will compare timings for individual tests between + those versions. Some scripts have additional tests which are not + run by default, that show patterns within a single version of + Git (e.g., performance of index-pack as the number of threads + changes). These can be enabled with GIT_PERF_EXTRA. + You can also pass the options taken by ordinary git tests; the most useful one is: diff --git a/third_party/git/t/perf/aggregate.perl b/third_party/git/t/perf/aggregate.perl index 66554d2161..14e4cda287 100755 --- a/third_party/git/t/perf/aggregate.perl +++ b/third_party/git/t/perf/aggregate.perl @@ -4,7 +4,6 @@ use lib '../../perl/build/lib'; use strict; use warnings; use Getopt::Long; -use Git; use Cwd qw(realpath); sub get_times { @@ -85,6 +84,11 @@ sub format_size { return $out; } +sub sane_backticks { + open(my $fh, '-|', @_); + return <$fh>; +} + my (@dirs, %dirnames, %dirabbrevs, %prefixes, @tests, $codespeed, $sortby, $subsection, $reponame); @@ -102,7 +106,8 @@ while (scalar @ARGV) { my $prefix = ''; last if -f $arg or $arg eq "--"; if (! -d $arg) { - my $rev = Git::command_oneline(qw(rev-parse --verify), $arg); + my $rev = sane_backticks(qw(git rev-parse --verify), $arg); + chomp $rev; $dir = "build/".$rev; } elsif ($arg eq '.') { $dir = '.'; @@ -219,13 +224,7 @@ sub print_default_results { for my $i (0..$#dirs) { my $d = $dirs[$i]; my $base = "$resultsdir/$prefixes{$d}$t"; - $times{$prefixes{$d}.$t} = []; - foreach my $type (qw(times size)) { - if (-e "$base.$type") { - $times{$prefixes{$d}.$t} = [get_times("$base.$type")]; - last; - } - } + $times{$prefixes{$d}.$t} = [get_times("$base.result")]; my ($r,$u,$s) = @{$times{$prefixes{$d}.$t}}; my $w = length format_times($r,$u,$s,$firstr); $colwidth[$i] = $w if $w > $colwidth[$i]; @@ -267,7 +266,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.times"); + my ($r, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.result"); if ($i > 0 and defined $r and defined $prevr and $prevr > 0) { my $percent = 100.0 * ($r - $prevr) / $prevr; push @evolutions, { "percent" => $percent, @@ -327,7 +326,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.times"); + my ($result_value, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.result"); my %vals = ( "commitid" => $commitid, diff --git a/third_party/git/t/perf/bisect_regression b/third_party/git/t/perf/bisect_regression index a94d9955d0..ce47e1662a 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' shoud be greater than old time '$oldtime'" + die "New time '$newtime' should 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/p1400-update-ref.sh b/third_party/git/t/perf/p1400-update-ref.sh new file mode 100755 index 0000000000..ce5ac3ed85 --- /dev/null +++ b/third_party/git/t/perf/p1400-update-ref.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +test_description="Tests performance of update-ref" + +. ./perf-lib.sh + +test_perf_fresh_repo + +test_expect_success "setup" ' + git init --bare target-repo.git && + test_commit PRE && + test_commit POST && + printf "create refs/heads/%d PRE\n" $(test_seq 1000) >create && + printf "update refs/heads/%d POST PRE\n" $(test_seq 1000) >update && + printf "delete refs/heads/%d POST\n" $(test_seq 1000) >delete && + git update-ref --stdin <create +' + +test_perf "update-ref" ' + for i in $(test_seq 1000) + do + git update-ref refs/heads/branch PRE && + git update-ref refs/heads/branch POST PRE && + git update-ref -d refs/heads/branch + done +' + +test_perf "update-ref --stdin" ' + git update-ref --stdin <update && + git update-ref --stdin <delete && + git update-ref --stdin <create +' + +test_perf "nonatomic push" ' + git push ./target-repo.git $(test_seq 1000) && + git push --delete ./target-repo.git $(test_seq 1000) +' + +test_done diff --git a/third_party/git/t/perf/p5302-pack-index.sh b/third_party/git/t/perf/p5302-pack-index.sh index a9b3e112d9..228593d9ad 100755 --- a/third_party/git/t/perf/p5302-pack-index.sh +++ b/third_party/git/t/perf/p5302-pack-index.sh @@ -13,35 +13,36 @@ test_expect_success 'repack' ' export PACK ' -test_perf 'index-pack 0 threads' ' - rm -rf repo.git && - git init --bare repo.git && - GIT_DIR=repo.git git index-pack --threads=1 --stdin < $PACK -' - -test_perf 'index-pack 1 thread ' ' - rm -rf repo.git && - git init --bare repo.git && - GIT_DIR=repo.git GIT_FORCE_THREADS=1 git index-pack --threads=1 --stdin < $PACK +# Rather than counting up and doubling each time, count down from the endpoint, +# halving each time. That ensures that our final test uses as many threads as +# CPUs, even if it isn't a power of 2. +test_expect_success 'set up thread-counting tests' ' + t=$(test-tool online-cpus) && + threads= && + while test $t -gt 0 + do + threads="$t $threads" + t=$((t / 2)) + done ' -test_perf 'index-pack 2 threads' ' +test_perf PERF_EXTRA 'index-pack 0 threads' ' rm -rf repo.git && git init --bare repo.git && - GIT_DIR=repo.git git index-pack --threads=2 --stdin < $PACK -' - -test_perf 'index-pack 4 threads' ' - rm -rf repo.git && - git init --bare repo.git && - GIT_DIR=repo.git git index-pack --threads=4 --stdin < $PACK + GIT_DIR=repo.git git index-pack --threads=1 --stdin < $PACK ' -test_perf 'index-pack 8 threads' ' - rm -rf repo.git && - git init --bare repo.git && - GIT_DIR=repo.git git index-pack --threads=8 --stdin < $PACK -' +for t in $threads +do + THREADS=$t + export THREADS + test_perf PERF_EXTRA "index-pack $t threads" ' + rm -rf repo.git && + git init --bare repo.git && + GIT_DIR=repo.git GIT_FORCE_THREADS=1 \ + git index-pack --threads=$THREADS --stdin <$PACK + ' +done test_perf 'index-pack default number of threads' ' rm -rf repo.git && diff --git a/third_party/git/t/perf/p5303-many-packs.sh b/third_party/git/t/perf/p5303-many-packs.sh index 3779851941..f4c2ab0584 100755 --- a/third_party/git/t/perf/p5303-many-packs.sh +++ b/third_party/git/t/perf/p5303-many-packs.sh @@ -73,10 +73,15 @@ do git rev-list --objects --all >/dev/null ' + test_perf "abbrev-commit ($nr_packs)" ' + git rev-list --abbrev-commit HEAD >/dev/null + ' + # This simulates the interesting part of the repack, which is the # 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 \ @@ -84,4 +89,22 @@ 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 6a3a42531b..b3e725f031 100755 --- a/third_party/git/t/perf/p5310-pack-bitmaps.sh +++ b/third_party/git/t/perf/p5310-pack-bitmaps.sh @@ -31,14 +31,37 @@ test_perf 'simulated fetch' ' } | git pack-objects --revs --stdout >/dev/null ' -test_perf 'pack to file' ' - git pack-objects --all pack1 </dev/null >/dev/null -' - 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 'rev-list count with tree:0' ' + git rev-list --use-bitmap-index --count --objects --all \ + --filter=tree:0 >/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) && @@ -68,4 +91,9 @@ test_perf 'pack to file (partial bitmap)' ' git pack-objects --use-bitmap-index --all pack2b </dev/null >/dev/null ' +test_perf 'rev-list with tree filter (partial bitmap)' ' + git rev-list --use-bitmap-index --count --objects --all \ + --filter=tree:0 >/dev/null +' + test_done diff --git a/third_party/git/t/perf/p5600-clone-reference.sh b/third_party/git/t/perf/p5601-clone-reference.sh index 68fed66347..68fed66347 100755 --- a/third_party/git/t/perf/p5600-clone-reference.sh +++ b/third_party/git/t/perf/p5601-clone-reference.sh diff --git a/third_party/git/t/perf/p9300-fast-import-export.sh b/third_party/git/t/perf/p9300-fast-import-export.sh new file mode 100755 index 0000000000..586161e9ad --- /dev/null +++ b/third_party/git/t/perf/p9300-fast-import-export.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +test_description='test fast-import and fast-export performance' +. ./perf-lib.sh + +test_perf_default_repo + +# Use --no-data here to produce a vastly smaller export file. +# This is much cheaper to work with but should still exercise +# fast-import pretty well (we'll still process all commits and +# trees, which account for 60% or more of objects in most repos). +# +# Use --reencode to avoid the default of aborting on non-utf8 commits, +# which lets this test run against a wider variety of sample repos. +test_perf 'export (no-blobs)' ' + git fast-export --reencode=yes --no-data HEAD >export +' + +test_perf 'import (no-blobs)' ' + git fast-import --force <export +' + +test_done diff --git a/third_party/git/t/perf/perf-lib.sh b/third_party/git/t/perf/perf-lib.sh index b58a43ea43..821581a885 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".times + "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result } test_perf () { @@ -223,7 +223,7 @@ test_perf () { test_size_ () { say >&3 "running: $2" - if test_eval_ "$2" 3>"$base".size; then + if test_eval_ "$2" 3>"$base".result; then test_ok_ "$1" else test_failure_ "$@" @@ -245,3 +245,5 @@ test_at_end_hook_ () { test_export () { export "$@" } + +test_lazy_prereq PERF_EXTRA 'test_bool_env GIT_PERF_EXTRA false' diff --git a/third_party/git/t/t0000-basic.sh b/third_party/git/t/t0000-basic.sh index 9ca0818cbe..923281af93 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_x () { - local x="local" && - echo "$x" +try_local_xy () { + local x="local" y="alsolocal" && + echo "$x $y" } # Check whether the shell supports the "local" keyword. "local" is not @@ -35,11 +35,12 @@ try_local_x () { # relying on "local". test_expect_success 'verify that the running shell supports "local"' ' x="notlocal" && - echo "local" >expected1 && - try_local_x >actual1 && + y="alsonotlocal" && + echo "local alsolocal" >expected1 && + try_local_xy >actual1 && test_cmp expected1 actual1 && - echo "notlocal" >expected2 && - echo "$x" >actual2 && + echo "notlocal alsonotlocal" >expected2 && + echo "$x $y" >actual2 && test_cmp expected2 actual2 ' @@ -76,9 +77,7 @@ _run_sub_test_lib_test_common () { # the sub-test. sane_unset HARNESS_ACTIVE && cd "$name" && - cat >"$name.sh" <<-EOF && - #!$SHELL_PATH - + write_script "$name.sh" "$TEST_SHELL_PATH" <<-EOF && test_description='$descr (run in sub test-lib) This is run in a sub test-lib so that we do not get incorrect @@ -93,15 +92,15 @@ _run_sub_test_lib_test_common () { . "\$TEST_DIRECTORY"/test-lib.sh EOF cat >>"$name.sh" && - chmod +x "$name.sh" && export TEST_DIRECTORY && TEST_OUTPUT_DIRECTORY=$(pwd) && export TEST_OUTPUT_DIRECTORY && + sane_unset GIT_TEST_FAIL_PREREQS && if test -z "$neg" then ./"$name.sh" "$@" >out 2>err else - ! ./"$name.sh" "$@" >out 2>err + ! ./"$name.sh" "$@" >out 2>err fi ) } @@ -126,7 +125,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 descriptior 3 + # expected error output is in descriptor 3 ( cd "$name" && sed -e 's/^> //' -e 's/Z$//' >expect.out && @@ -154,7 +153,7 @@ test_expect_success 'pretend we have a fully passing test suite' " " test_expect_success 'pretend we have a partially passing test suite' " - test_must_fail run_sub_test_lib_test \ + run_sub_test_lib_test_err \ partial-pass '2/3 tests passing' <<-\\EOF && test_expect_success 'passing test #1' 'true' test_expect_success 'failing test #2' 'false' @@ -218,7 +217,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' " - test_must_fail run_sub_test_lib_test \ + run_sub_test_lib_test_err \ mixed-results1 'mixed results #1' <<-\\EOF && test_expect_success 'passing test' 'true' test_expect_success 'failing test' 'false' @@ -237,7 +236,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' " - test_must_fail run_sub_test_lib_test \ + run_sub_test_lib_test_err \ mixed-results2 'mixed results #2' <<-\\EOF && test_expect_success 'passing test' 'true' test_expect_success 'passing test' 'true' @@ -273,24 +272,24 @@ test_expect_success 'pretend we have a mix of all possible results' " " test_expect_success C_LOCALE_OUTPUT 'test --verbose' ' - test_must_fail run_sub_test_lib_test \ - test-verbose "test verbose" --verbose <<-\EOF && + run_sub_test_lib_test_err \ + t1234-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 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 + 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 > ok 1 - passing test > Z - > expecting success: echo foo + > expecting success of 1234.2 '\''test with output'\'': echo foo > foo > ok 2 - test with output > Z - > expecting success: false + > expecting success of 1234.3 '\''failing test'\'': false > not ok 3 - failing test > # false > Z @@ -300,18 +299,18 @@ test_expect_success C_LOCALE_OUTPUT 'test --verbose' ' ' test_expect_success 'test --verbose-only' ' - test_must_fail run_sub_test_lib_test \ - test-verbose-only-2 "test verbose-only=2" \ + run_sub_test_lib_test_err \ + t2345-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 test-verbose-only-2 <<-\EOF + check_sub_test_lib_test t2345-verbose-only-2 <<-\EOF > ok 1 - passing test > Z - > expecting success: echo foo + > expecting success of 2345.2 '\''test with output'\'': echo foo > foo > ok 2 - test with output > Z @@ -391,6 +390,44 @@ 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 && @@ -794,8 +831,21 @@ then exit 1 fi +test_expect_success 'lazy prereqs do not turn off tracing' " + run_sub_test_lib_test lazy-prereq-and-tracing \ + 'lazy prereqs and -x' -v -x <<-\\EOF && + test_lazy_prereq LAZY true + + test_expect_success lazy 'test_have_prereq LAZY && echo trace' + + test_done + EOF + + grep 'echo trace' lazy-prereq-and-tracing/err +" + test_expect_success 'tests clean up even on failures' " - test_must_fail run_sub_test_lib_test \ + run_sub_test_lib_test_err \ failing-cleanup 'Failing tests with cleanup commands' <<-\\EOF && test_expect_success 'tests clean up even after a failure' ' touch clean-after-failure && @@ -824,7 +874,7 @@ test_expect_success 'tests clean up even on failures' " " test_expect_success 'test_atexit is run' " - test_must_fail run_sub_test_lib_test \ + run_sub_test_lib_test_err \ atexit-cleanup 'Run atexit commands' -i <<-\\EOF && test_expect_success 'tests clean up even after a failure' ' > ../../clean-atexit && @@ -841,10 +891,6 @@ test_expect_success 'test_atexit is run' " test_path_is_missing also-clean-atexit " -test_expect_success 'test_oid setup' ' - test_oid_init -' - test_expect_success 'test_oid provides sane info by default' ' test_oid zero >actual && grep "^00*\$" actual && @@ -878,6 +924,51 @@ test_expect_success 'test_oid can look up data for SHA-256' ' test "$hexsz" -eq 64 ' +test_expect_success 'test_oid can look up data for a specified algorithm' ' + rawsz="$(test_oid --hash=sha1 rawsz)" && + hexsz="$(test_oid --hash=sha1 hexsz)" && + test "$rawsz" -eq 20 && + test "$hexsz" -eq 40 && + rawsz="$(test_oid --hash=sha256 rawsz)" && + hexsz="$(test_oid --hash=sha256 hexsz)" && + test "$rawsz" -eq 32 && + 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 @@ -1187,4 +1278,22 @@ test_expect_success 'very long name in the index handled sanely' ' test $len = 4098 ' +test_expect_success 'test_must_fail on a failing git command' ' + test_must_fail git notacommand +' + +test_expect_success 'test_must_fail on a failing git command with env' ' + test_must_fail env var1=a var2=b git notacommand +' + +test_expect_success 'test_must_fail rejects a non-git command' ' + ! test_must_fail grep ^$ notafile 2>err && + grep -F "test_must_fail: only '"'"'git'"'"' is allowed" err +' + +test_expect_success 'test_must_fail rejects a non-git command with env' ' + ! test_must_fail env var1=a var2=b grep ^$ notafile 2>err && + grep -F "test_must_fail: only '"'"'git'"'"' is allowed" err +' + test_done diff --git a/third_party/git/t/t0001-init.sh b/third_party/git/t/t0001-init.sh index 26f8206326..2f7c3dcd0f 100755 --- a/third_party/git/t/t0001-init.sh +++ b/third_party/git/t/t0001-init.sh @@ -316,6 +316,28 @@ test_expect_success 'init with separate gitdir' ' test_path_is_dir realgitdir/refs ' +test_expect_success 'explicit bare & --separate-git-dir incompatible' ' + test_must_fail git init --bare --separate-git-dir goop.git bare.git 2>err && + test_i18ngrep "mutually exclusive" err +' + +test_expect_success 'implicit bare & --separate-git-dir incompatible' ' + test_when_finished "rm -rf bare.git" && + mkdir -p bare.git && + test_must_fail env GIT_DIR=. \ + git -C bare.git init --separate-git-dir goop.git 2>err && + test_i18ngrep "incompatible" err +' + +test_expect_success 'bare & --separate-git-dir incompatible within worktree' ' + test_when_finished "rm -rf bare.git linkwt seprepo" && + test_commit gumby && + git clone --bare . bare.git && + git -C bare.git worktree add --detach ../linkwt && + test_must_fail git -C linkwt init --separate-git-dir seprepo 2>err && + test_i18ngrep "incompatible" err +' + test_lazy_prereq GETCWD_IGNORES_PERMS ' base=GETCWD_TEST_BASE_DIR && mkdir -p $base/dir && @@ -392,13 +414,25 @@ test_expect_success SYMLINKS 're-init to move gitdir symlink' ' test_path_is_dir realgitdir/refs ' -# Tests for the hidden file attribute on windows -is_hidden () { - # Use the output of `attrib`, ignore the absolute path - case "$(attrib "$1")" in *H*?:*) return 0;; esac - return 1 +sep_git_dir_worktree () { + test_when_finished "rm -rf mainwt linkwt seprepo" && + git init mainwt && + test_commit -C mainwt gumby && + git -C mainwt worktree add --detach ../linkwt && + git -C "$1" init --separate-git-dir ../seprepo && + git -C mainwt rev-parse --git-common-dir >expect && + git -C linkwt rev-parse --git-common-dir >actual && + test_cmp expect actual } +test_expect_success 're-init to move gitdir with linked worktrees' ' + sep_git_dir_worktree mainwt +' + +test_expect_success 're-init to move gitdir within linked worktree' ' + sep_git_dir_worktree linkwt +' + test_expect_success MINGW '.git hidden' ' rm -rf newdir && ( @@ -406,7 +440,7 @@ test_expect_success MINGW '.git hidden' ' mkdir newdir && cd newdir && git init && - is_hidden .git + test_path_is_hidden .git ) && check_config newdir/.git false unset ' @@ -448,6 +482,39 @@ test_expect_success 're-init from a linked worktree' ' ) ' +test_expect_success 'init honors GIT_DEFAULT_HASH' ' + GIT_DEFAULT_HASH=sha1 git init sha1 && + git -C sha1 rev-parse --show-object-format >actual && + echo sha1 >expected && + test_cmp expected actual && + GIT_DEFAULT_HASH=sha256 git init sha256 && + git -C sha256 rev-parse --show-object-format >actual && + echo sha256 >expected && + test_cmp expected actual +' + +test_expect_success 'init honors --object-format' ' + git init --object-format=sha1 explicit-sha1 && + git -C explicit-sha1 rev-parse --show-object-format >actual && + echo sha1 >expected && + test_cmp expected actual && + git init --object-format=sha256 explicit-sha256 && + git -C explicit-sha256 rev-parse --show-object-format >actual && + echo sha256 >expected && + test_cmp expected actual +' + +test_expect_success 'extensions.objectFormat is not allowed with repo version 0' ' + git init --object-format=sha256 explicit-v0 && + git -C explicit-v0 config core.repositoryformatversion 0 && + test_must_fail git -C explicit-v0 rev-parse --show-object-format +' + +test_expect_success 'init rejects attempts to initialize with different hash' ' + test_must_fail git -C sha1 init --object-format=sha256 && + test_must_fail git -C sha256 init --object-format=sha1 +' + test_expect_success MINGW 'core.hidedotfiles = false' ' git config --global core.hidedotfiles false && rm -rf newdir && @@ -471,4 +538,30 @@ test_expect_success MINGW 'redirect std handles' ' grep "Needed a single revision" output.txt ' +test_expect_success '--initial-branch' ' + git init --initial-branch=hello initial-branch-option && + git -C initial-branch-option symbolic-ref HEAD >actual && + echo refs/heads/hello >expect && + test_cmp expect actual && + + : re-initializing should not change the branch name && + git init --initial-branch=ignore initial-branch-option 2>err && + test_i18ngrep "ignored --initial-branch" err && + git -C initial-branch-option symbolic-ref HEAD >actual && + grep hello actual +' + +test_expect_success 'overridden default initial branch name (config)' ' + test_config_global init.defaultBranch nmb && + git init initial-branch-config && + git -C initial-branch-config symbolic-ref HEAD >actual && + grep nmb actual +' + +test_expect_success 'invalid default branch name' ' + test_config_global init.defaultBranch "with space" && + test_must_fail git init initial-branch-invalid 2>err && + test_i18ngrep "invalid branch name" err +' + test_done diff --git a/third_party/git/t/t0002-gitfile.sh b/third_party/git/t/t0002-gitfile.sh index 0aa9908ea1..960ed150cb 100755 --- a/third_party/git/t/t0002-gitfile.sh +++ b/third_party/git/t/t0002-gitfile.sh @@ -62,7 +62,7 @@ test_expect_success 'check commit-tree' ' ' test_expect_success 'check rev-list' ' - echo $SHA >"$REAL/HEAD" && + git update-ref "HEAD" "$SHA" && test "$SHA" = "$(git rev-list HEAD)" ' diff --git a/third_party/git/t/t0003-attributes.sh b/third_party/git/t/t0003-attributes.sh index 71e63d8b50..b660593c20 100755 --- a/third_party/git/t/t0003-attributes.sh +++ b/third_party/git/t/t0003-attributes.sh @@ -5,19 +5,16 @@ test_description=gitattributes . ./test-lib.sh attr_check () { - path="$1" expect="$2" + path="$1" expect="$2" git_opts="$3" && - git $3 check-attr test -- "$path" >actual 2>err && - echo "$path: test: $2" >expect && + git $git_opts check-attr test -- "$path" >actual 2>err && + echo "$path: test: $expect" >expect && test_cmp expect actual && - test_line_count = 0 err + test_must_be_empty 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 && @@ -27,7 +24,7 @@ attr_check_quote () { test_expect_success 'open-quoted pathname' ' echo "\"a test=a" >.gitattributes && - test_must_fail attr_check a a + attr_check a unspecified ' @@ -112,20 +109,20 @@ test_expect_success 'attribute test' ' test_expect_success 'attribute matching is case sensitive when 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 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" && attr_check 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/NO unspecified "-c core.ignorecase=0" && attr_check a/b/d/YES a/b/d/* "-c core.ignorecase=0" && - test_must_fail attr_check a/E/f "A/e/F" "-c core.ignorecase=0" + attr_check a/E/f f "-c core.ignorecase=0" ' @@ -149,8 +146,8 @@ test_expect_success 'attribute matching is case insensitive when core.ignorecase ' test_expect_success CASE_INSENSITIVE_FS 'additional case insensitivity tests' ' - 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/D/g a/g "-c core.ignorecase=0" && + attr_check A/B/D/NO unspecified "-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" @@ -244,7 +241,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_line_count = 0 err + test_must_be_empty err ' test_expect_success '"**" with no slashes test' ' @@ -265,7 +262,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_line_count = 0 err + test_must_be_empty err ' test_expect_success 'using --git-dir and --work-tree' ' diff --git a/third_party/git/t/t0006-date.sh b/third_party/git/t/t0006-date.sh index b723db1f76..f68149be88 100755 --- a/third_party/git/t/t0006-date.sh +++ b/third_party/git/t/t0006-date.sh @@ -83,6 +83,11 @@ check_parse 2008-02 bad check_parse 2008-02-14 bad check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 +0000' check_parse '2008-02-14 20:30:45 -0500' '2008-02-14 20:30:45 -0500' +check_parse '2008.02.14 20:30:45 -0500' '2008-02-14 20:30:45 -0500' +check_parse '20080214T203045-04:00' '2008-02-14 20:30:45 -0400' +check_parse '20080214T203045 -04:00' '2008-02-14 20:30:45 -0400' +check_parse '20080214T203045.019-04:00' '2008-02-14 20:30:45 -0400' +check_parse '2008-02-14 20:30:45.019-04:00' '2008-02-14 20:30:45 -0400' check_parse '2008-02-14 20:30:45 -0015' '2008-02-14 20:30:45 -0015' check_parse '2008-02-14 20:30:45 -5' '2008-02-14 20:30:45 +0000' check_parse '2008-02-14 20:30:45 -5:' '2008-02-14 20:30:45 +0000' @@ -105,6 +110,7 @@ check_approxidate 5.seconds.ago '2009-08-30 19:19:55' check_approxidate 10.minutes.ago '2009-08-30 19:10:00' check_approxidate yesterday '2009-08-29 19:20:00' check_approxidate 3.days.ago '2009-08-27 19:20:00' +check_approxidate '12:34:56.3.days.ago' '2009-08-27 12:34:56' check_approxidate 3.weeks.ago '2009-08-09 19:20:00' check_approxidate 3.months.ago '2009-05-30 19:20:00' check_approxidate 2.years.3.months.ago '2007-05-30 19:20:00' diff --git a/third_party/git/t/t0007-git-var.sh b/third_party/git/t/t0007-git-var.sh index 1f600e2cae..88b9ae8158 100755 --- a/third_party/git/t/t0007-git-var.sh +++ b/third_party/git/t/t0007-git-var.sh @@ -17,7 +17,7 @@ test_expect_success 'get GIT_COMMITTER_IDENT' ' test_cmp expect actual ' -test_expect_success !FAIL_PREREQS,!AUTOIDENT 'requested identites are strict' ' +test_expect_success !FAIL_PREREQS,!AUTOIDENT 'requested identities are strict' ' ( sane_unset GIT_COMMITTER_NAME && sane_unset GIT_COMMITTER_EMAIL && diff --git a/third_party/git/t/t0008-ignores.sh b/third_party/git/t/t0008-ignores.sh index 1744cee5e9..370a389e5c 100755 --- a/third_party/git/t/t0008-ignores.sh +++ b/third_party/git/t/t0008-ignores.sh @@ -424,9 +424,24 @@ test_expect_success 'local ignore inside a sub-directory with --verbose' ' ) ' -test_expect_success_multi 'nested include' \ - 'a/b/.gitignore:8:!on* a/b/one' ' - test_check_ignore "a/b/one" +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 ' ############################################################################ @@ -460,7 +475,6 @@ test_expect_success 'cd to ignored sub-directory' ' expect_from_stdin <<-\EOF && foo twoooo - ../one seven ../../one EOF @@ -543,7 +557,6 @@ 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" ' @@ -586,17 +599,7 @@ 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 @@ -696,8 +699,12 @@ 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 a070e645d7..8d3d9144c0 100755 --- a/third_party/git/t/t0014-alias.sh +++ b/third_party/git/t/t0014-alias.sh @@ -37,4 +37,11 @@ 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/t0018-advice.sh b/third_party/git/t/t0018-advice.sh new file mode 100755 index 0000000000..e03554d2f3 --- /dev/null +++ b/third_party/git/t/t0018-advice.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +test_description='Test advise_if_enabled functionality' + +. ./test-lib.sh + +test_expect_success 'advice should be printed when config variable is unset' ' + cat >expect <<-\EOF && + hint: This is a piece of advice + hint: Disable this message with "git config advice.nestedTag false" + EOF + test-tool advise "This is a piece of advice" 2>actual && + test_i18ncmp expect actual +' + +test_expect_success 'advice should be printed when config variable is set to true' ' + cat >expect <<-\EOF && + hint: This is a piece of advice + hint: Disable this message with "git config advice.nestedTag false" + EOF + test_config advice.nestedTag true && + test-tool advise "This is a piece of advice" 2>actual && + test_i18ncmp expect actual +' + +test_expect_success 'advice should not be printed when config variable is set to false' ' + test_config advice.nestedTag false && + test-tool advise "This is a piece of advice" 2>actual && + test_must_be_empty actual +' + +test_done diff --git a/third_party/git/t/t0020-crlf.sh b/third_party/git/t/t0020-crlf.sh index 854da0ae16..b63ba62e5d 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 && - test_must_fail has_cr one && - test_must_fail has_cr dir/two && + ! has_cr one && + ! 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 && - test_must_fail has_cr dir/two && + ! has_cr dir/two && verbose has_cr one && - test_must_fail has_cr three + ! 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 && - test_must_fail has_cr dir/two + ! 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 && - test_must_fail has_cr one && + ! 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 && - test_must_fail has_cr one && + ! 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 && - test_must_fail has_cr one && + ! 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 && - test_must_fail has_cr one && + ! 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 e10f5f787f..4bfffa9c31 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://public-inbox.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/ +# c.f. http://lore.kernel.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://public-inbox.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/ +# c.f. http://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/ test_cmp_exclude_clean () { expect=$1 actual=$2 @@ -364,6 +364,10 @@ test_expect_success PERL 'required process filter should filter data' ' S=$(file_size test.r) && S2=$(file_size test2.r) && S3=$(file_size "testsubdir/test3 '\''sq'\'',\$x=.r") && + M=$(git hash-object test.r) && + M2=$(git hash-object test2.r) && + M3=$(git hash-object "testsubdir/test3 '\''sq'\'',\$x=.r") && + EMPTY=$(git hash-object /dev/null) && filter_git add . && cat >expected.log <<-EOF && @@ -378,18 +382,23 @@ test_expect_success PERL 'required process filter should filter data' ' test_cmp_count expected.log debug.log && git commit -m "test commit 2" && + MASTER=$(git rev-parse --verify master) && + META="ref=refs/heads/master treeish=$MASTER" && rm -f test2.r "testsubdir/test3 '\''sq'\'',\$x=.r" && filter_git checkout --quiet --no-progress . && cat >expected.log <<-EOF && START init handshake complete - IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK] - IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] + IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK] + IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r blob=$M3 $S3 [OK] -- OUT: $S3 . [OK] STOP 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 @@ -403,10 +412,10 @@ test_expect_success PERL 'required process filter should filter data' ' cat >expected.log <<-EOF && START init handshake complete - IN: smudge test.r $S [OK] -- OUT: $S . [OK] - IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK] - IN: smudge test4-empty.r 0 [OK] -- OUT: 0 [OK] - IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] + IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK] + IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK] + IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK] STOP EOF test_cmp_exclude_clean expected.log debug.log && @@ -417,6 +426,117 @@ test_expect_success PERL 'required process filter should filter data' ' ) ' +test_expect_success PERL 'required process filter should filter data for various subcommands' ' + test_config_global filter.protocol.process "rot13-filter.pl debug.log clean smudge" && + test_config_global filter.protocol.required true && + ( + cd repo && + + S=$(file_size test.r) && + S2=$(file_size test2.r) && + S3=$(file_size "testsubdir/test3 '\''sq'\'',\$x=.r") && + M=$(git hash-object test.r) && + M2=$(git hash-object test2.r) && + M3=$(git hash-object "testsubdir/test3 '\''sq'\'',\$x=.r") && + EMPTY=$(git hash-object /dev/null) && + + MASTER=$(git rev-parse --verify master) && + + cp "$TEST_ROOT/test.o" test5.r && + git add test5.r && + git commit -m "test commit 3" && + git checkout empty-branch && + filter_git rebase --onto empty-branch master^^ master && + MASTER2=$(git rev-parse --verify master) && + META="ref=refs/heads/master treeish=$MASTER2" && + cat >expected.log <<-EOF && + START + init handshake complete + IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK] + IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK] + IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK] + STOP + EOF + test_cmp_exclude_clean expected.log debug.log && + + git reset --hard empty-branch && + filter_git reset --hard $MASTER && + META="treeish=$MASTER" && + cat >expected.log <<-EOF && + START + init handshake complete + IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK] + IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK] + IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK] + STOP + EOF + test_cmp_exclude_clean expected.log debug.log && + + git branch old-master $MASTER && + git reset --hard empty-branch && + filter_git reset --hard old-master && + META="ref=refs/heads/old-master treeish=$MASTER" && + cat >expected.log <<-EOF && + START + init handshake complete + IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK] + IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK] + IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK] + STOP + EOF + test_cmp_exclude_clean expected.log debug.log && + + git checkout -b merge empty-branch && + git branch -f master $MASTER2 && + filter_git merge master && + META="treeish=$MASTER2" && + cat >expected.log <<-EOF && + START + init handshake complete + IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK] + IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK] + IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK] + STOP + EOF + test_cmp_exclude_clean expected.log debug.log && + + filter_git archive master >/dev/null && + META="ref=refs/heads/master treeish=$MASTER2" && + cat >expected.log <<-EOF && + START + init handshake complete + IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK] + IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK] + IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK] + STOP + EOF + test_cmp_exclude_clean expected.log debug.log && + + TREE="$(git rev-parse $MASTER2^{tree})" && + filter_git archive $TREE >/dev/null && + META="treeish=$TREE" && + cat >expected.log <<-EOF && + START + init handshake complete + IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK] + IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK] + IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK] + STOP + EOF + test_cmp_exclude_clean expected.log debug.log + ) +' + test_expect_success PERL 'required process filter takes precedence' ' test_config_global filter.protocol.clean false && test_config_global filter.protocol.process "rot13-filter.pl debug.log clean" && @@ -516,17 +636,22 @@ test_expect_success PERL 'required process filter should process multiple packet EOF test_cmp_count expected.log debug.log && - rm -f *.file && + M1="blob=$(git hash-object 1pkt_1__.file)" && + M2="blob=$(git hash-object 2pkt_1+1.file)" && + M3="blob=$(git hash-object 2pkt_2-1.file)" && + M4="blob=$(git hash-object 2pkt_2__.file)" && + M5="blob=$(git hash-object 3pkt_2+1.file)" && + rm -f *.file debug.log && filter_git checkout --quiet --no-progress -- *.file && cat >expected.log <<-EOF && START init handshake complete - IN: smudge 1pkt_1__.file $(($S )) [OK] -- OUT: $(($S )) . [OK] - IN: smudge 2pkt_1+1.file $(($S +1)) [OK] -- OUT: $(($S +1)) .. [OK] - IN: smudge 2pkt_2-1.file $(($S*2-1)) [OK] -- OUT: $(($S*2-1)) .. [OK] - IN: smudge 2pkt_2__.file $(($S*2 )) [OK] -- OUT: $(($S*2 )) .. [OK] - IN: smudge 3pkt_2+1.file $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK] + IN: smudge 1pkt_1__.file $M1 $(($S )) [OK] -- OUT: $(($S )) . [OK] + IN: smudge 2pkt_1+1.file $M2 $(($S +1)) [OK] -- OUT: $(($S +1)) .. [OK] + IN: smudge 2pkt_2-1.file $M3 $(($S*2-1)) [OK] -- OUT: $(($S*2-1)) .. [OK] + IN: smudge 2pkt_2__.file $M4 $(($S*2 )) [OK] -- OUT: $(($S*2 )) .. [OK] + IN: smudge 3pkt_2+1.file $M5 $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK] STOP EOF test_cmp_exclude_clean expected.log debug.log && @@ -575,6 +700,10 @@ test_expect_success PERL 'process filter should restart after unexpected write f S=$(file_size test.r) && S2=$(file_size test2.r) && SF=$(file_size smudge-write-fail.r) && + M=$(git hash-object test.r) && + M2=$(git hash-object test2.r) && + MF=$(git hash-object smudge-write-fail.r) && + rm -f debug.log && git add . && rm -f *.r && @@ -588,11 +717,11 @@ test_expect_success PERL 'process filter should restart after unexpected write f cat >expected.log <<-EOF && START init handshake complete - IN: smudge smudge-write-fail.r $SF [OK] -- [WRITE FAIL] + IN: smudge smudge-write-fail.r blob=$MF $SF [OK] -- [WRITE FAIL] START init handshake complete - IN: smudge test.r $S [OK] -- OUT: $S . [OK] - IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK] + IN: smudge test.r blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK] STOP EOF test_cmp_exclude_clean expected.log debug.log && @@ -626,6 +755,10 @@ test_expect_success PERL 'process filter should not be restarted if it signals a S=$(file_size test.r) && S2=$(file_size test2.r) && SE=$(file_size error.r) && + M=$(git hash-object test.r) && + M2=$(git hash-object test2.r) && + ME=$(git hash-object error.r) && + rm -f debug.log && git add . && rm -f *.r && @@ -634,9 +767,9 @@ test_expect_success PERL 'process filter should not be restarted if it signals a cat >expected.log <<-EOF && START init handshake complete - IN: smudge error.r $SE [OK] -- [ERROR] - IN: smudge test.r $S [OK] -- OUT: $S . [OK] - IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK] + IN: smudge error.r blob=$ME $SE [OK] -- [ERROR] + IN: smudge test.r blob=$M $S [OK] -- OUT: $S . [OK] + IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK] STOP EOF test_cmp_exclude_clean expected.log debug.log && @@ -662,18 +795,21 @@ test_expect_success PERL 'process filter abort stops processing of all further f echo "error this blob and all future blobs" >abort.o && cp abort.o abort.r && + M="blob=$(git hash-object abort.r)" && + rm -f debug.log && SA=$(file_size abort.r) && git add . && rm -f *.r && + # Note: This test assumes that Git filters files in alphabetical # order ("abort.r" before "test.r"). filter_git checkout --quiet --no-progress . && cat >expected.log <<-EOF && START init handshake complete - IN: smudge abort.r $SA [OK] -- [ABORT] + IN: smudge abort.r $M $SA [OK] -- [ABORT] STOP EOF test_cmp_exclude_clean expected.log debug.log && @@ -724,27 +860,29 @@ test_expect_success PERL 'delayed checkout in process filter' ' ) && S=$(file_size "$TEST_ROOT/test.o") && + PM="ref=refs/heads/master treeish=$(git -C repo rev-parse --verify master) " && + M="${PM}blob=$(git -C repo rev-parse --verify master:test.a)" && cat >a.exp <<-EOF && START init handshake complete - IN: smudge test.a $S [OK] -- OUT: $S . [OK] - IN: smudge test-delay10.a $S [OK] -- [DELAYED] - IN: smudge test-delay11.a $S [OK] -- [DELAYED] - IN: smudge test-delay20.a $S [OK] -- [DELAYED] + IN: smudge test.a $M $S [OK] -- OUT: $S . [OK] + IN: smudge test-delay10.a $M $S [OK] -- [DELAYED] + IN: smudge test-delay11.a $M $S [OK] -- [DELAYED] + IN: smudge test-delay20.a $M $S [OK] -- [DELAYED] IN: list_available_blobs test-delay10.a test-delay11.a [OK] - IN: smudge test-delay10.a 0 [OK] -- OUT: $S . [OK] - IN: smudge test-delay11.a 0 [OK] -- OUT: $S . [OK] + IN: smudge test-delay10.a $M 0 [OK] -- OUT: $S . [OK] + IN: smudge test-delay11.a $M 0 [OK] -- OUT: $S . [OK] IN: list_available_blobs test-delay20.a [OK] - IN: smudge test-delay20.a 0 [OK] -- OUT: $S . [OK] + IN: smudge test-delay20.a $M 0 [OK] -- OUT: $S . [OK] IN: list_available_blobs [OK] STOP EOF cat >b.exp <<-EOF && START init handshake complete - IN: smudge test-delay10.b $S [OK] -- [DELAYED] + IN: smudge test-delay10.b $M $S [OK] -- [DELAYED] IN: list_available_blobs test-delay10.b [OK] - IN: smudge test-delay10.b 0 [OK] -- OUT: $S . [OK] + IN: smudge test-delay10.b $M 0 [OK] -- OUT: $S . [OK] IN: list_available_blobs [OK] STOP EOF @@ -764,8 +902,11 @@ test_expect_success PERL 'delayed checkout in process filter' ' rm *.a *.b && filter_git checkout . && - test_cmp_count ../a.exp a.log && - test_cmp_count ../b.exp b.log && + # We are not checking out a ref here, so filter out ref metadata. + sed -e "s!$PM!!" ../a.exp >a.exp.filtered && + sed -e "s!$PM!!" ../b.exp >b.exp.filtered && + test_cmp_count a.exp.filtered a.log && + test_cmp_count b.exp.filtered b.log && test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.a && test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.a && @@ -792,7 +933,6 @@ 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/t0021/rot13-filter.pl b/third_party/git/t/t0021/rot13-filter.pl index 470107248e..cd32a82da5 100644 --- a/third_party/git/t/t0021/rot13-filter.pl +++ b/third_party/git/t/t0021/rot13-filter.pl @@ -135,7 +135,13 @@ while (1) { if ( exists $DELAY{$pathname} and $DELAY{$pathname}{"requested"} == 0 ) { $DELAY{$pathname}{"requested"} = 1; } + } elsif ($buffer =~ /^(ref|treeish|blob)=/) { + print $debug " $buffer"; } else { + # In general, filters need to be graceful about + # new metadata, since it's documented that we + # can pass any key-value pairs, but for tests, + # let's be a little stricter. die "Unknown message '$buffer'"; } diff --git a/third_party/git/t/t0027-auto-crlf.sh b/third_party/git/t/t0027-auto-crlf.sh index 959b6da449..9fcd56fab3 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 () { } -# contruct the attr/ returned by git ls-files --eol +# construct 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 1090e650ed..bfc4fb9af5 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 '\xfe\xff' + printf '\376\377' 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 '\x00\x00\xfe\xff' + printf '\0\0\376\377' 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-32LE >>test.utf16lebom.raw && + printf "$text" | iconv -f UTF-8 -t UTF-16LE >>test.utf16lebom.raw && # Line ending tests printf "one\ntwo\nthree\n" >lf.utf8.raw && @@ -280,4 +280,43 @@ 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 cebc77fab0..14cafc138b 100755 --- a/third_party/git/t/t0040-parse-options.sh +++ b/third_party/git/t/t0040-parse-options.sh @@ -23,6 +23,8 @@ 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> @@ -42,7 +44,7 @@ Magic arguments --no-ambiguous negative ambiguity Standard options - --abbrev[=<n>] use <n> digits to display SHA-1s + --abbrev[=<n>] use <n> digits to display object names -v, --verbose be verbose -n, --dry-run dry run -q, --quiet be quiet @@ -52,7 +54,7 @@ Alias -A, --alias-source <string> get a string -Z, --alias-target <string> - get a string + alias of --alias-source EOF @@ -242,7 +244,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' ' @@ -252,7 +254,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' ' @@ -324,6 +326,22 @@ 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" + + + + + + ' @@ -399,4 +417,11 @@ 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 192c94eccd..608673fb77 100755 --- a/third_party/git/t/t0050-filesystem.sh +++ b/third_party/git/t/t0050-filesystem.sh @@ -131,4 +131,24 @@ $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 c7b53e494b..56db5c8aba 100755 --- a/third_party/git/t/t0060-path-utils.sh +++ b/third_party/git/t/t0060-path-utils.sh @@ -165,6 +165,15 @@ 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 "" ' @@ -285,9 +294,13 @@ 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 @@ -423,6 +436,9 @@ test_expect_success 'match .gitmodules' ' ~1000000 \ ~9999999 \ \ + .gitmodules:\$DATA \ + "gitmod~4 . :\$DATA" \ + \ --not \ ".gitmodules x" \ ".gitmodules .x" \ @@ -447,7 +463,36 @@ test_expect_success 'match .gitmodules' ' \ GI7EB~1 \ GI7EB~01 \ - GI7EB~1X + 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 \ + com0.c \ + lptN \ + \ + --not \ + "win32 " \ + "win32 /x " \ + "win32." \ + "win32 . ." \ + .../hello.txt \ + colon:test \ + "AUX.c" \ + "abc/conOut\$ .xyz/test" \ + lpt8 \ + com9.c \ + "lpt*" \ + Nul \ + "PRN./abc" ' test_done diff --git a/third_party/git/t/t0061-run-command.sh b/third_party/git/t/t0061-run-command.sh index 015fac8b5d..7d599675e3 100755 --- a/third_party/git/t/t0061-run-command.sh +++ b/third_party/git/t/t0061-run-command.sh @@ -12,6 +12,10 @@ 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 @@ -210,10 +214,23 @@ test_expect_success MINGW 'verify curlies are quoted properly' ' test_cmp expect actual ' -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_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_done diff --git a/third_party/git/t/t0064-sha1-array.sh b/third_party/git/t/t0064-sha1-array.sh index 5dda570b9a..45685af2fd 100755 --- a/third_party/git/t/t0064-sha1-array.sh +++ b/third_party/git/t/t0064-sha1-array.sh @@ -18,7 +18,7 @@ test_expect_success 'ordered enumeration' ' { echoid append 88 44 aa 55 && echo for_each_unique - } | test-tool sha1-array >actual && + } | test-tool oid-array >actual && test_cmp expect actual ' @@ -28,7 +28,7 @@ test_expect_success 'ordered enumeration with duplicate suppression' ' echoid append 88 44 aa 55 && echoid append 88 44 aa 55 && echo for_each_unique - } | test-tool sha1-array >actual && + } | test-tool oid-array >actual && test_cmp expect actual ' @@ -36,7 +36,7 @@ test_expect_success 'lookup' ' { echoid append 88 44 aa 55 && echoid lookup 55 - } | test-tool sha1-array >actual && + } | test-tool oid-array >actual && n=$(cat actual) && test "$n" -eq 1 ' @@ -45,7 +45,7 @@ test_expect_success 'lookup non-existing entry' ' { echoid append 88 44 aa 55 && echoid lookup 33 - } | test-tool sha1-array >actual && + } | test-tool oid-array >actual && n=$(cat actual) && test "$n" -lt 0 ' @@ -55,7 +55,7 @@ test_expect_success 'lookup with duplicates' ' echoid append 88 44 aa 55 && echoid append 88 44 aa 55 && echoid lookup 55 - } | test-tool sha1-array >actual && + } | test-tool oid-array >actual && n=$(cat actual) && test "$n" -ge 2 && test "$n" -le 3 @@ -66,7 +66,7 @@ test_expect_success 'lookup non-existing entry with duplicates' ' echoid append 88 44 aa 55 && echoid append 88 44 aa 55 && echoid lookup 66 - } | test-tool sha1-array >actual && + } | test-tool oid-array >actual && n=$(cat actual) && test "$n" -lt 0 ' @@ -81,7 +81,7 @@ test_expect_success 'lookup with almost duplicate values' ' echo "append $id1" && echo "append $id2" && echoid lookup 55 - } | test-tool sha1-array >actual && + } | test-tool oid-array >actual && n=$(cat actual) && test "$n" -eq 0 ' @@ -90,7 +90,7 @@ test_expect_success 'lookup with single duplicate value' ' { echoid append 55 55 && echoid lookup 55 - } | test-tool sha1-array >actual && + } | test-tool oid-array >actual && n=$(cat actual) && test "$n" -ge 0 && test "$n" -le 1 diff --git a/third_party/git/t/t0067-parse_pathspec_file.sh b/third_party/git/t/t0067-parse_pathspec_file.sh new file mode 100755 index 0000000000..7bab49f361 --- /dev/null +++ b/third_party/git/t/t0067-parse_pathspec_file.sh @@ -0,0 +1,108 @@ +#!/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/t0081-line-buffer.sh b/third_party/git/t/t0081-line-buffer.sh deleted file mode 100755 index ce92e6acad..0000000000 --- a/third_party/git/t/t0081-line-buffer.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh - -test_description="Test the svn importer's input handling routines. - -These tests provide some simple checks that the line_buffer API -behaves as advertised. - -While at it, check that input of newlines and null bytes are handled -correctly. -" -. ./test-lib.sh - -test_expect_success 'hello world' ' - echo ">HELLO" >expect && - test-line-buffer <<-\EOF >actual && - binary 6 - HELLO - EOF - test_cmp expect actual -' - -test_expect_success '0-length read, send along greeting' ' - echo ">HELLO" >expect && - test-line-buffer <<-\EOF >actual && - binary 0 - copy 6 - HELLO - EOF - test_cmp expect actual -' - -test_expect_success !MINGW 'read from file descriptor' ' - rm -f input && - echo hello >expect && - echo hello >input && - echo copy 6 | - test-line-buffer "&4" 4<input >actual && - test_cmp expect actual -' - -test_expect_success 'skip, copy null byte' ' - echo Q | q_to_nul >expect && - q_to_nul <<-\EOF | test-line-buffer >actual && - skip 2 - Q - copy 2 - Q - EOF - test_cmp expect actual -' - -test_expect_success 'read null byte' ' - echo ">QhelloQ" | q_to_nul >expect && - q_to_nul <<-\EOF | test-line-buffer >actual && - binary 8 - QhelloQ - EOF - test_cmp expect actual -' - -test_expect_success 'long reads are truncated' ' - echo ">foo" >expect && - test-line-buffer <<-\EOF >actual && - binary 5 - foo - EOF - test_cmp expect actual -' - -test_expect_success 'long copies are truncated' ' - printf "%s\n" ">" foo >expect && - test-line-buffer <<-\EOF >actual && - binary 1 - - copy 5 - foo - EOF - test_cmp expect actual -' - -test_expect_success 'long binary reads are truncated' ' - echo ">foo" >expect && - test-line-buffer <<-\EOF >actual && - binary 5 - foo - EOF - 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 ce9a4a5f32..5a633690bf 100755 --- a/third_party/git/t/t0090-cache-tree.sh +++ b/third_party/git/t/t0090-cache-tree.sh @@ -21,9 +21,10 @@ 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 - subtrees=$(git ls-files|grep /|cut -d / -f 1|uniq) && + git ls-files >files && + subtrees=$(grep / files|cut -d / -f 1|uniq) && subtree_count=$(echo "$subtrees"|awk -v c=0 '$1 != "" {++c} END {print c}') && - entries=$(git ls-files|wc -l) && + entries=$(wc -l <files) && printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" && for subtree in $subtrees do diff --git a/third_party/git/t/t0091-bugreport.sh b/third_party/git/t/t0091-bugreport.sh new file mode 100755 index 0000000000..526304ff95 --- /dev/null +++ b/third_party/git/t/t0091-bugreport.sh @@ -0,0 +1,76 @@ +#!/bin/sh + +test_description='git bugreport' + +. ./test-lib.sh + +# Headers "[System Info]" will be followed by a non-empty line if we put some +# information there; we can make sure all our headers were followed by some +# information to check if the command was successful. +HEADER_PATTERN="^\[.*\]$" + +check_all_headers_populated () { + while read -r line + do + if test "$(grep "$HEADER_PATTERN" "$line")" + then + echo "$line" + read -r nextline + if test -z "$nextline"; then + return 1; + fi + fi + done +} + +test_expect_success 'creates a report with content in the right places' ' + test_when_finished rm git-bugreport-check-headers.txt && + git bugreport -s check-headers && + check_all_headers_populated <git-bugreport-check-headers.txt +' + +test_expect_success 'dies if file with same name as report already exists' ' + test_when_finished rm git-bugreport-duplicate.txt && + >>git-bugreport-duplicate.txt && + test_must_fail git bugreport --suffix duplicate +' + +test_expect_success '--output-directory puts the report in the provided dir' ' + test_when_finished rm -fr foo/ && + git bugreport -o foo/ && + test_path_is_file foo/git-bugreport-* +' + +test_expect_success 'incorrect arguments abort with usage' ' + test_must_fail git bugreport --false 2>output && + test_i18ngrep usage output && + test_path_is_missing git-bugreport-* +' + +test_expect_success 'runs outside of a git dir' ' + test_when_finished rm non-repo/git-bugreport-* && + nongit git bugreport +' + +test_expect_success 'can create leading directories outside of a git dir' ' + test_when_finished rm -fr foo/bar/baz && + nongit git bugreport -o foo/bar/baz +' + +test_expect_success 'indicates populated hooks' ' + test_when_finished rm git-bugreport-hooks.txt && + test_when_finished rm -fr .git/hooks && + rm -fr .git/hooks && + mkdir .git/hooks && + for hook in applypatch-msg prepare-commit-msg.sample + do + write_script ".git/hooks/$hook" <<-EOF || return 1 + echo "hook $hook exists" + EOF + done && + git bugreport -s hooks && + grep applypatch-msg git-bugreport-hooks.txt && + ! grep prepare-commit-msg git-bugreport-hooks.txt +' + +test_done diff --git a/third_party/git/t/t0095-bloom.sh b/third_party/git/t/t0095-bloom.sh new file mode 100755 index 0000000000..7e4ab1795f --- /dev/null +++ b/third_party/git/t/t0095-bloom.sh @@ -0,0 +1,117 @@ +#!/bin/sh + +test_description='Testing the various Bloom filter computations in bloom.c' +. ./test-lib.sh + +test_expect_success 'compute unseeded murmur3 hash for empty string' ' + cat >expect <<-\EOF && + Murmur3 Hash with seed=0:0x00000000 + EOF + test-tool bloom get_murmur3 "" >actual && + test_cmp expect actual +' + +test_expect_success 'compute unseeded murmur3 hash for test string 1' ' + cat >expect <<-\EOF && + Murmur3 Hash with seed=0:0x627b0c2c + EOF + test-tool bloom get_murmur3 "Hello world!" >actual && + test_cmp expect actual +' + +test_expect_success 'compute unseeded murmur3 hash for test string 2' ' + cat >expect <<-\EOF && + Murmur3 Hash with seed=0:0x2e4ff723 + EOF + test-tool bloom get_murmur3 "The quick brown fox jumps over the lazy dog" >actual && + test_cmp expect actual +' + +test_expect_success 'compute bloom key for empty string' ' + cat >expect <<-\EOF && + Hashes:0x5615800c|0x5b966560|0x61174ab4|0x66983008|0x6c19155c|0x7199fab0|0x771ae004| + Filter_Length:2 + Filter_Data:11|11| + EOF + test-tool bloom generate_filter "" >actual && + test_cmp expect actual +' + +test_expect_success 'compute bloom key for whitespace' ' + cat >expect <<-\EOF && + Hashes:0xf178874c|0x5f3d6eb6|0xcd025620|0x3ac73d8a|0xa88c24f4|0x16510c5e|0x8415f3c8| + Filter_Length:2 + Filter_Data:51|55| + EOF + test-tool bloom generate_filter " " >actual && + test_cmp expect actual +' + +test_expect_success 'compute bloom key for test string 1' ' + cat >expect <<-\EOF && + Hashes:0xb270de9b|0x1bb6f26e|0x84fd0641|0xee431a14|0x57892de7|0xc0cf41ba|0x2a15558d| + Filter_Length:2 + Filter_Data:92|6c| + EOF + test-tool bloom generate_filter "Hello world!" >actual && + test_cmp expect actual +' + +test_expect_success 'compute bloom key for test string 2' ' + cat >expect <<-\EOF && + Hashes:0x20ab385b|0xf5237fe2|0xc99bc769|0x9e140ef0|0x728c5677|0x47049dfe|0x1b7ce585| + Filter_Length:2 + Filter_Data:a5|4a| + EOF + test-tool bloom generate_filter "file.txt" >actual && + test_cmp expect actual +' + +test_expect_success 'get bloom filters for commit with no changes' ' + git init && + git commit --allow-empty -m "c0" && + cat >expect <<-\EOF && + Filter_Length:1 + Filter_Data:00| + EOF + test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual && + test_cmp expect actual +' + +test_expect_success 'get bloom filter for commit with 10 changes' ' + rm actual && + rm expect && + mkdir smallDir && + for i in $(test_seq 0 9) + do + echo $i >smallDir/$i + done && + git add smallDir && + git commit -m "commit with 10 changes" && + cat >expect <<-\EOF && + Filter_Length:14 + Filter_Data:02|b3|c4|a0|34|e7|fe|eb|cb|47|fe|a0|e8|72| + EOF + test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual && + test_cmp expect actual +' + +test_expect_success EXPENSIVE 'get bloom filter for commit with 513 changes' ' + rm actual && + rm expect && + mkdir bigDir && + for i in $(test_seq 0 511) + do + echo $i >bigDir/$i + done && + git add bigDir && + git commit -m "commit with 513 changes" && + cat >expect <<-\EOF && + Filter_Length:1 + Filter_Data:ff| + EOF + test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual && + test_cmp expect actual +' + +test_done diff --git a/third_party/git/t/t0211-trace2-perf.sh b/third_party/git/t/t0211-trace2-perf.sh index 2c3ad6e8c1..6ee8ee3b67 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 ff5b9cc729..1529155cf0 100755 --- a/third_party/git/t/t0212-trace2-event.sh +++ b/third_party/git/t/t0212-trace2-event.sh @@ -199,6 +199,43 @@ test_expect_success JSON_PP 'event stream, list config' ' test_cmp expect actual ' +# Test listing of all "interesting" environment variables. + +test_expect_success JSON_PP 'event stream, list env vars' ' + test_when_finished "rm trace.event actual expect" && + GIT_TRACE2_EVENT="$(pwd)/trace.event" \ + GIT_TRACE2_ENV_VARS="A_VAR,OTHER_VAR,MISSING" \ + A_VAR=1 OTHER_VAR="hello world" test-tool trace2 001return 0 && + perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual && + sed -e "s/^|//" >expect <<-EOF && + |VAR1 = { + | "_SID0_":{ + | "argv":[ + | "_EXE_", + | "trace2", + | "001return", + | "0" + | ], + | "exit_code":0, + | "hierarchy":"trace2", + | "name":"trace2", + | "params":[ + | { + | "param":"A_VAR", + | "value":"1" + | }, + | { + | "param":"OTHER_VAR", + | "value":"hello world" + | } + | ], + | "version":"$V" + | } + |}; + EOF + test_cmp expect actual +' + test_expect_success JSON_PP 'basic trace2_data' ' test_when_finished "rm trace.event actual expect" && GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 006data test_category k1 v1 test_category k2 v2 && @@ -265,4 +302,23 @@ 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 82eaaea0f4..bc2d74098f 100755 --- a/third_party/git/t/t0300-credentials.sh +++ b/third_party/git/t/t0300-credentials.sh @@ -22,6 +22,11 @@ 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 @@ -35,43 +40,71 @@ 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 ' @@ -97,14 +130,20 @@ 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 @@ -112,6 +151,8 @@ 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 -- -- @@ -121,14 +162,20 @@ 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 @@ -136,33 +183,49 @@ 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 -- @@ -174,23 +237,31 @@ 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: - askpass: Password: + askpass: Username for '\''http://example.com'\'': + askpass: Password for '\''http://askpass-username@example.com'\'': 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: + askpass: Password for '\''http://foo@example.com'\'': EOF ' @@ -202,7 +273,11 @@ 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 -- @@ -240,6 +315,102 @@ 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 'match percent-encoded UTF-8 values in path' ' + test_config credential.https://example.com.useHttpPath true && + test_config credential.https://example.com/perรบ.git.helper "$HELPER" && + check fill <<-\EOF + url=https://example.com/per%C3%BA.git + -- + protocol=https + host=example.com + path=perรบ.git + username=foo + password=bar + -- + EOF +' + +test_expect_success 'match percent-encoded values in username' ' + test_config credential.https://user%2fname@example.com/foo/bar.git.helper "$HELPER" && + check fill <<-\EOF + url=https://user%2fname@example.com/foo/bar.git + -- + protocol=https + host=example.com + username=foo + password=bar + -- + EOF +' + +test_expect_success 'fetch with multiple path components' ' + test_unconfig credential.helper && + test_config credential.https://example.com/foo/repo.git.helper "verbatim foo bar" && + check fill <<-\EOF + url=https://example.com/foo/repo.git + -- + protocol=https + host=example.com + username=foo + password=bar + -- + verbatim: get + verbatim: protocol=https + verbatim: host=example.com + EOF +' + test_expect_success 'pull username from config' ' test_config credential.https://example.com.username foo && check fill <<-\EOF @@ -255,6 +426,63 @@ 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 @@ -289,23 +517,179 @@ 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="!f() { echo quit=1; }; f" \ + -c credential.helper=quit \ -c credential.helper="verbatim foo bar" \ - credential fill >stdout && - test_must_be_empty stdout + 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 ' 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 path 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 +' + +# usage: check_host_and_path <url> <expected-host> <expected-path> +check_host_and_path () { + # we always parse the path component, but we need this to make sure it + # is passed to the helper + test_config credential.useHTTPPath true && + check fill "verbatim user pass" <<-EOF + url=$1 + -- + protocol=https + host=$2 + path=$3 + username=user + password=pass + -- + verbatim: get + verbatim: protocol=https + verbatim: host=$2 + verbatim: path=$3 + EOF +} + +test_expect_success 'url parser handles bare query marker' ' + check_host_and_path https://example.com?foo.git example.com ?foo.git +' + +test_expect_success 'url parser handles bare fragment marker' ' + check_host_and_path https://example.com#foo.git example.com "#foo.git" +' + +test_expect_success 'url parser not confused by encoded markers' ' + check_host_and_path https://example.com%23%3f%2f/foo.git \ + "example.com#?/" foo.git +' + +test_expect_success 'credential config with partial URLs' ' + echo "echo password=yep" | write_script git-credential-yep && + test_write_lines url=https://user@example.com/repo.git >stdin && + for partial in \ + example.com \ + user@example.com \ + https:// \ + https://example.com \ + https://example.com/ \ + https://user@example.com \ + https://user@example.com/ \ + https://example.com/repo.git \ + https://user@example.com/repo.git \ + /repo.git + do + git -c credential.$partial.helper=yep \ + credential fill <stdin >stdout && + grep yep stdout || + return 1 + done && + + for partial in \ + dont.use.this \ + http:// \ + /repo + do + git -c credential.$partial.helper=yep \ + credential fill <stdin >stdout && + ! grep yep stdout || + return 1 + done && + + git -c credential.$partial.helper=yep \ + -c credential.with%0anewline.username=uh-oh \ + credential fill <stdin >stdout 2>stderr && + test_i18ngrep "skipping credential lookup for key" stderr +' + test_done diff --git a/third_party/git/t/t0302-credential-store.sh b/third_party/git/t/t0302-credential-store.sh index d6b54e8c65..716bf1af9f 100755 --- a/third_party/git/t/t0302-credential-store.sh +++ b/third_party/git/t/t0302-credential-store.sh @@ -107,7 +107,6 @@ test_expect_success 'store: if both xdg and home files exist, only store in home test_must_be_empty "$HOME/.config/git/credentials" ' - test_expect_success 'erase: erase matching credentials from both xdg and home files' ' echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" && mkdir -p "$HOME/.config/git" && @@ -120,4 +119,94 @@ test_expect_success 'erase: erase matching credentials from both xdg and home fi test_must_be_empty "$HOME/.config/git/credentials" ' +invalid_credential_test() { + test_expect_success "get: ignore credentials without $1 as invalid" ' + echo "$2" >"$HOME/.git-credentials" && + check fill store <<-\EOF + protocol=https + host=example.com + -- + protocol=https + host=example.com + username=askpass-username + password=askpass-password + -- + askpass: Username for '\''https://example.com'\'': + askpass: Password for '\''https://askpass-username@example.com'\'': + -- + EOF + ' +} + +invalid_credential_test "scheme" ://user:pass@example.com +invalid_credential_test "valid host/path" https://user:pass@ +invalid_credential_test "username/password" https://pass@example.com + +test_expect_success 'get: credentials with DOS line endings are invalid' ' + printf "https://user:pass@example.com\r\n" >"$HOME/.git-credentials" && + check fill store <<-\EOF + protocol=https + host=example.com + -- + protocol=https + host=example.com + username=askpass-username + password=askpass-password + -- + askpass: Username for '\''https://example.com'\'': + askpass: Password for '\''https://askpass-username@example.com'\'': + -- + EOF +' + +test_expect_success 'get: credentials with path and DOS line endings are valid' ' + printf "https://user:pass@example.com/repo.git\r\n" >"$HOME/.git-credentials" && + check fill store <<-\EOF + url=https://example.com/repo.git + -- + protocol=https + host=example.com + username=user + password=pass + -- + EOF +' + +test_expect_success 'get: credentials with DOS line endings are invalid if path is relevant' ' + printf "https://user:pass@example.com/repo.git\r\n" >"$HOME/.git-credentials" && + test_config credential.useHttpPath true && + check fill store <<-\EOF + url=https://example.com/repo.git + -- + protocol=https + host=example.com + path=repo.git + username=askpass-username + password=askpass-password + -- + askpass: Username for '\''https://example.com/repo.git'\'': + askpass: Password for '\''https://askpass-username@example.com/repo.git'\'': + -- + EOF +' + +test_expect_success 'get: store file can contain empty/bogus lines' ' + echo "" >"$HOME/.git-credentials" && + q_to_tab <<-\CREDENTIAL >>"$HOME/.git-credentials" && + #comment + Q + https://user:pass@example.com + CREDENTIAL + check fill store <<-\EOF + protocol=https + host=example.com + -- + protocol=https + host=example.com + username=user + password=pass + -- + EOF +' + test_done diff --git a/third_party/git/t/t0410-partial-clone.sh b/third_party/git/t/t0410-partial-clone.sh index 5bd892f2f7..584a039b85 100755 --- a/third_party/git/t/t0410-partial-clone.sh +++ b/third_party/git/t/t0410-partial-clone.sh @@ -26,10 +26,44 @@ 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 core.partialclonefilter && + git -C client config --unset remote.origin.partialclonefilter && git -C client fetch origin ' +test_expect_success 'convert shallow clone to partial clone' ' + rm -fr server client && + test_create_repo server && + test_commit -C server my_commit 1 && + test_commit -C server my_commit2 1 && + git clone --depth=1 "file://$(pwd)/server" client && + git -C client fetch --unshallow --filter="blob:none" && + test_cmp_config -C client true remote.origin.promisor && + test_cmp_config -C client blob:none remote.origin.partialclonefilter && + test_cmp_config -C client 1 core.repositoryformatversion +' + +test_expect_success SHA1 'convert to partial clone with noop extension' ' + rm -fr server client && + test_create_repo server && + test_commit -C server my_commit 1 && + test_commit -C server my_commit2 1 && + git clone --depth=1 "file://$(pwd)/server" client && + test_cmp_config -C client 0 core.repositoryformatversion && + git -C client config extensions.noop true && + git -C client fetch --unshallow --filter="blob:none" +' + +test_expect_success SHA1 'converting to partial clone fails with unrecognized extension' ' + rm -fr server client && + test_create_repo server && + test_commit -C server my_commit 1 && + test_commit -C server my_commit2 1 && + git clone --depth=1 "file://$(pwd)/server" client && + test_cmp_config -C client 0 core.repositoryformatversion && + git -C client config extensions.nonsense true && + test_must_fail git -C client fetch --unshallow --filter="blob:none" +' + test_expect_success 'missing reflog object, but promised by a commit, passes fsck' ' rm -rf repo && test_create_repo repo && @@ -149,7 +183,7 @@ test_expect_success 'missing CLI object, but promised, passes fsck' ' ' test_expect_success 'fetching of missing objects' ' - rm -rf repo && + rm -rf repo err && test_create_repo server && test_commit -C server foo && git -C server repack -a -d --write-bitmap-index && @@ -160,14 +194,18 @@ test_expect_success 'fetching of missing objects' ' git -C repo config core.repositoryformatversion 1 && git -C repo config extensions.partialclone "origin" && - git -C repo cat-file -p "$HASH" && + git -C repo cat-file -p "$HASH" 2>err && + + # Ensure that no spurious FETCH_HEAD messages are written + ! grep FETCH_HEAD err && # 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=$(cat promisorlist | sed "s/promisor$/idx/") && - git verify-pack --verbose "$IDX" | grep "$HASH" + IDX=$(sed "s/promisor$/idx/" promisorlist) && + git verify-pack --verbose "$IDX" >out && + grep "$HASH" out ' test_expect_success 'fetching of missing objects works with ref-in-want enabled' ' @@ -179,11 +217,58 @@ test_expect_success 'fetching of missing objects works with ref-in-want enabled' rm -rf repo/.git/objects/* && rm -f trace && GIT_TRACE_PACKET="$(pwd)/trace" git -C repo cat-file -p "$HASH" && - grep "git< fetch=.*ref-in-want" trace + grep "fetch< 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 repo && + rm -rf server server2 repo && + rm -rf server server3 repo && test_create_repo server && test_commit -C server foo && git -C server repack -a -d --write-bitmap-index && @@ -234,7 +319,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 rev-list --exclude-promisor-objects --objects bar >out && + GIT_TEST_COMMIT_GRAPH=0 git -C repo -c core.commitGraph=false rev-list --exclude-promisor-objects --objects bar >out && grep $(git -C repo rev-parse bar) out && ! grep $FOO out ' @@ -381,6 +466,19 @@ 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 && @@ -492,6 +590,20 @@ 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 @@ -514,8 +626,12 @@ 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=$(cat promisorlist | sed "s/promisor$/idx/") && - git verify-pack --verbose "$IDX" | grep "$HASH" + IDX=$(sed "s/promisor$/idx/" promisorlist) && + git verify-pack --verbose "$IDX" >out && + grep "$HASH" out ' +# 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 new file mode 100755 index 0000000000..1ed1df351c --- /dev/null +++ b/third_party/git/t/t0500-progress-display.sh @@ -0,0 +1,312 @@ +#!/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_expect_success 'progress generates traces' ' + 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 + + GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool progress --total=40 \ + "Working hard" <in 2>stderr && + + # t0212/parse_events.perl intentionally omits regions and data. + grep -e "region_enter" -e "\"category\":\"progress\"" trace.event && + grep -e "region_leave" -e "\"category\":\"progress\"" trace.event && + grep "\"key\":\"total_objects\",\"value\":\"40\"" trace.event && + grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event +' + +test_done diff --git a/third_party/git/t/t1006-cat-file.sh b/third_party/git/t/t1006-cat-file.sh index 43c4be1e5e..2f501d2dc9 100755 --- a/third_party/git/t/t1006-cat-file.sh +++ b/third_party/git/t/t1006-cat-file.sh @@ -140,8 +140,6 @@ test_expect_success '--batch-check without %(rest) considers whole line' ' test_cmp expect actual ' -test_oid_init - tree_sha1=$(git write-tree) tree_size=$(($(test_oid rawsz) + 13)) tree_pretty_content="100644 blob $hello_sha1 hello" 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 ba71b159ba..140f459977 100755 --- a/third_party/git/t/t1011-read-tree-sparse-checkout.sh +++ b/third_party/git/t/t1011-read-tree-sparse-checkout.sh @@ -74,13 +74,19 @@ test_expect_success 'read-tree --no-sparse-checkout with empty .git/info/sparse- test_expect_success 'read-tree with empty .git/info/sparse-checkout' ' git config core.sparsecheckout true && echo >.git/info/sparse-checkout && - read_tree_u_must_fail -m -u HEAD && + read_tree_u_must_succeed -m -u HEAD && git ls-files --stage >result && test_cmp expected result && git ls-files -t >result && + cat >expected.swt <<-\EOF && + S init.t + S sub/added + S sub/addedtoo + S subsub/added + EOF test_cmp expected.swt result && - test -f init.t && - test -f sub/added + ! test -f init.t && + ! test -f sub/added ' test_expect_success 'match directories with trailing slash' ' @@ -215,7 +221,6 @@ 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 && @@ -223,7 +228,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_cmp empty result + test_must_be_empty result ' test_expect_success 'read-tree --reset removes outside worktree' ' @@ -234,18 +239,19 @@ test_expect_success 'read-tree --reset removes outside worktree' ' test_must_be_empty result ' -test_expect_success 'print errors when failed to update worktree' ' +test_expect_success 'print warnings when some worktree updates disabled' ' echo sub >.git/info/sparse-checkout && git checkout -f init && mkdir sub && touch sub/added sub/addedtoo && - test_must_fail git checkout top 2>actual && + # Use -q to suppress "Previous HEAD position" and "Head is now at" msgs + git checkout -q top 2>actual && cat >expected <<\EOF && -error: The following untracked working tree files would be overwritten by checkout: +warning: The following paths were already present and thus not updated despite sparse patterns: sub/added sub/addedtoo -Please move or remove them before you switch branches. -Aborting + +After fixing the above paths, you may want to run `git sparse-checkout reapply`. EOF test_i18ncmp expected actual ' diff --git a/third_party/git/t/t1013-read-tree-submodule.sh b/third_party/git/t/t1013-read-tree-submodule.sh index 91a6fafcb4..b6df7444c0 100755 --- a/third_party/git/t/t1013-read-tree-submodule.sh +++ b/third_party/git/t/t1013-read-tree-submodule.sh @@ -12,8 +12,8 @@ test_submodule_switch_recursing_with_args "read-tree -u -m" test_submodule_forced_switch_recursing_with_args "read-tree -u --reset" -test_submodule_switch "git read-tree -u -m" +test_submodule_switch "read-tree -u -m" -test_submodule_forced_switch "git read-tree -u --reset" +test_submodule_forced_switch "read-tree -u --reset" test_done diff --git a/third_party/git/t/t1014-read-tree-confusing.sh b/third_party/git/t/t1014-read-tree-confusing.sh index 2f5a25d503..da3376b3bb 100755 --- a/third_party/git/t/t1014-read-tree-confusing.sh +++ b/third_party/git/t/t1014-read-tree-confusing.sh @@ -49,6 +49,7 @@ 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 dcb4dbba67..61e89a8071 100755 --- a/third_party/git/t/t1050-large.sh +++ b/third_party/git/t/t1050-large.sh @@ -53,7 +53,8 @@ test_expect_success 'add a large file or two' ' for p in .git/objects/pack/pack-*.pack do count=$(( $count + 1 )) - if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx" + if test_path_is_file "$p" && + idx=${p%.pack}.idx && test_path_is_file "$idx" then continue fi @@ -63,9 +64,9 @@ test_expect_success 'add a large file or two' ' test $count = 1 && cnt=$(git show-index <"$idx" | wc -l) && test $cnt = 2 && - for l in .git/objects/??/?????????????????????????????????????? + for l in .git/objects/$OIDPATH_REGEX do - test -f "$l" || continue + test_path_is_file "$l" || continue bad=t done && test -z "$bad" && @@ -76,7 +77,8 @@ test_expect_success 'add a large file or two' ' for p in .git/objects/pack/pack-*.pack do count=$(( $count + 1 )) - if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx" + if test_path_is_file "$p" && + idx=${p%.pack}.idx && test_path_is_file "$idx" then continue fi @@ -111,7 +113,7 @@ test_expect_success 'packsize limit' ' count=0 && for pi in .git/objects/pack/pack-*.idx do - test -f "$pi" && count=$(( $count + 1 )) + test_path_is_file "$pi" && count=$(( $count + 1 )) done && test $count = 2 && @@ -175,7 +177,8 @@ test_expect_success 'git-show a large file' ' test_expect_success 'index-pack' ' git clone file://"$(pwd)"/.git foo && - GIT_DIR=non-existent git index-pack --strict --verify foo/.git/objects/pack/*.pack + GIT_DIR=non-existent git index-pack --object-format=$(test_oid algo) \ + --strict --verify foo/.git/objects/pack/*.pack ' test_expect_success 'repack' ' @@ -194,15 +197,15 @@ test_expect_success 'pack-objects with large loose object' ' test_cmp huge actual ' -test_expect_success 'tar achiving' ' +test_expect_success 'tar archiving' ' git archive --format=tar HEAD >/dev/null ' -test_expect_success 'zip achiving, store only' ' +test_expect_success 'zip archiving, store only' ' git archive --format=zip -0 HEAD >/dev/null ' -test_expect_success 'zip achiving, deflate' ' +test_expect_success 'zip archiving, deflate' ' git archive --format=zip HEAD >/dev/null ' diff --git a/third_party/git/t/t1090-sparse-checkout-scope.sh b/third_party/git/t/t1090-sparse-checkout-scope.sh index 40cc004326..f35a73dd20 100755 --- a/third_party/git/t/t1090-sparse-checkout-scope.sh +++ b/third_party/git/t/t1090-sparse-checkout-scope.sh @@ -63,7 +63,6 @@ test_expect_success 'in partial clone, sparse checkout only fetches needed blobs git -C server commit -m message && test_config -C client core.sparsecheckout 1 && - test_config -C client extensions.partialclone origin && echo "!/*" >client/.git/info/sparse-checkout && echo "/a" >>client/.git/info/sparse-checkout && git -C client fetch --filter=blob:none origin && diff --git a/third_party/git/t/t1091-sparse-checkout-builtin.sh b/third_party/git/t/t1091-sparse-checkout-builtin.sh new file mode 100755 index 0000000000..84acfc48b6 --- /dev/null +++ b/third_party/git/t/t1091-sparse-checkout-builtin.sh @@ -0,0 +1,629 @@ +#!/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 'interaction with clone --no-checkout (unborn index)' ' + git clone --no-checkout "file://$(pwd)/repo" clone_no_checkout && + git -C clone_no_checkout sparse-checkout init --cone && + git -C clone_no_checkout sparse-checkout set folder1 && + + git -C clone_no_checkout sparse-checkout list >actual && + cat >expect <<-\EOF && + folder1 + EOF + test_cmp expect actual && + + # nothing checked out, expect "No such file or directory" + ! ls clone_no_checkout/* >actual && + test_must_be_empty actual && + test_path_is_missing clone_no_checkout/.git/index && + + # No branch is checked out until we manually switch to one + git -C clone_no_checkout switch master && + test_path_is_file clone_no_checkout/.git/index && + check_files clone_no_checkout a folder1 +' + +test_expect_success 'set enables config' ' + git init empty-config && + ( + cd empty-config && + test_commit test file && + test_path_is_missing .git/config.worktree && + git sparse-checkout set nothing && + test_path_is_file .git/config.worktree && + 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 'not-up-to-date does not block rest of sparsification' ' + test_when_finished git -C repo sparse-checkout disable && + 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_write_lines "!/deep/*/" "/deep/deeper1/" >>expect && + + git -C repo sparse-checkout set deep/deeper1 2>err && + + test_i18ngrep "The following paths are not up to date" err && + test_cmp expect repo/.git/info/sparse-checkout && + check_files repo/deep a deeper1 deeper2 && + check_files repo/deep/deeper1 a deepest && + check_files repo/deep/deeper1/deepest a && + check_files repo/deep/deeper2 a +' + +test_expect_success 'revert to old sparse-checkout on empty update' ' + git init empty-test && + ( + echo >file && + git add file && + git commit -m "test" && + 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) warns with dirty status' ' + git clone repo dirty && + echo dirty >dirty/folder1/a && + + git -C dirty sparse-checkout init 2>err && + test_i18ngrep "warning.*The following paths are not up to date" err && + + git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* 2>err && + test_i18ngrep "warning.*The following paths are not up to date" err && + test_path_is_file dirty/folder1/a && + + git -C dirty sparse-checkout disable 2>err && + test_must_be_empty err && + + git -C dirty reset --hard && + git -C dirty sparse-checkout init && + git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* && + test_path_is_missing dirty/folder1/a && + git -C dirty sparse-checkout disable && + test_path_is_file dirty/folder1/a +' + +test_expect_success 'sparse-checkout (init|set|disable) warns with unmerged status' ' + git clone repo unmerged && + + cat >input <<-EOF && + 0 $ZERO_OID folder1/a + 100644 $(git -C unmerged rev-parse HEAD:folder1/a) 1 folder1/a + EOF + git -C unmerged update-index --index-info <input && + + git -C unmerged sparse-checkout init 2>err && + test_i18ngrep "warning.*The following paths are unmerged" err && + + git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* 2>err && + test_i18ngrep "warning.*The following paths are unmerged" err && + test_path_is_file dirty/folder1/a && + + git -C unmerged sparse-checkout disable 2>err && + test_i18ngrep "warning.*The following paths are unmerged" err && + + git -C unmerged reset --hard && + git -C unmerged sparse-checkout init && + git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* && + git -C unmerged sparse-checkout disable +' + +test_expect_success 'sparse-checkout reapply' ' + git clone repo tweak && + + echo dirty >tweak/deep/deeper2/a && + + cat >input <<-EOF && + 0 $ZERO_OID folder1/a + 100644 $(git -C tweak rev-parse HEAD:folder1/a) 1 folder1/a + EOF + git -C tweak update-index --index-info <input && + + git -C tweak sparse-checkout init --cone 2>err && + test_i18ngrep "warning.*The following paths are not up to date" err && + test_i18ngrep "warning.*The following paths are unmerged" err && + + git -C tweak sparse-checkout set folder2 deep/deeper1 2>err && + test_i18ngrep "warning.*The following paths are not up to date" err && + test_i18ngrep "warning.*The following paths are unmerged" err && + + git -C tweak sparse-checkout reapply 2>err && + test_i18ngrep "warning.*The following paths are not up to date" err && + test_path_is_file tweak/deep/deeper2/a && + test_i18ngrep "warning.*The following paths are unmerged" err && + test_path_is_file tweak/folder1/a && + + git -C tweak checkout HEAD deep/deeper2/a && + git -C tweak sparse-checkout reapply 2>err && + test_i18ngrep ! "warning.*The following paths are not up to date" err && + test_path_is_missing tweak/deep/deeper2/a && + test_i18ngrep "warning.*The following paths are unmerged" err && + test_path_is_file tweak/folder1/a && + + git -C tweak add folder1/a && + git -C tweak sparse-checkout reapply 2>err && + test_must_be_empty err && + test_path_is_missing tweak/deep/deeper2/a && + test_path_is_missing tweak/folder1/a && + + git -C tweak sparse-checkout disable +' + +test_expect_success 'cone mode: set with core.ignoreCase=true' ' + rm repo/.git/info/sparse-checkout && + 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 428177c390..825d9a184f 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,26 +1294,25 @@ 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.*" ' @@ -1409,6 +1408,8 @@ 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/"] @@ -1455,6 +1456,10 @@ 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 ' @@ -1623,40 +1628,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 @@ -1664,16 +1669,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 && @@ -1685,9 +1690,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 @@ -1695,8 +1700,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 @@ -1704,31 +1709,36 @@ 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="file\" (dq) and spaces.conf" && + CUSTOM_CONFIG_FILE="custom.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 "$CUSTOM_CONFIG_FILE" --show-origin --list >output && + git config --file "$WEIRDLY_NAMED_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 @@ -1736,11 +1746,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 && @@ -1748,18 +1758,18 @@ test_expect_success '--show-origin stdin with file include' ' test_cmp expect output ' -test_expect_success !MINGW '--show-origin blob' ' +test_expect_success '--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 !MINGW '--show-origin blob ref' ' +test_expect_success '--show-origin blob ref' ' cat >expect <<-\EOF && - blob:"master:file\" (dq) and spaces.conf" user.custom=true + blob:master:custom.conf user.custom=true EOF git add "$CUSTOM_CONFIG_FILE" && git commit -m "new config file" && @@ -1767,12 +1777,74 @@ test_expect_success !MINGW '--show-origin blob ref' ' 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" - test_expect_code 128 nongit git config --local foo.bar +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 ' +for opt in --local --worktree +do + test_expect_success "$opt requires a repo" ' + # we expect 128 to ensure that we do not simply + # fail to find anything and return code "1" + test_expect_code 128 nongit git config $opt foo.bar + ' +done + cat >.git/config <<-\EOF && [core] foo = true diff --git a/third_party/git/t/t1302-repo-version.sh b/third_party/git/t/t1302-repo-version.sh index ce4cff13bb..0acabb6d11 100755 --- a/third_party/git/t/t1302-repo-version.sh +++ b/third_party/git/t/t1302-repo-version.sh @@ -8,6 +8,10 @@ test_description='Test repository version check' . ./test-lib.sh test_expect_success 'setup' ' + test_oid_cache <<-\EOF && + version sha1:0 + version sha256:1 + EOF cat >test.patch <<-\EOF && diff --git a/test.txt b/test.txt new file mode 100644 @@ -23,7 +27,7 @@ test_expect_success 'setup' ' ' test_expect_success 'gitdir selection on normal repos' ' - echo 0 >expect && + echo $(test_oid version) >expect && git config core.repositoryformatversion >actual && git -C test config core.repositoryformatversion >actual2 && test_cmp expect actual && @@ -83,6 +87,9 @@ allow 1 allow 1 noop abort 1 no-such-extension allow 0 no-such-extension +allow 0 noop +abort 0 noop-v1 +allow 1 noop-v1 EOF test_expect_success 'precious-objects allowed' ' diff --git a/third_party/git/t/t1305-config-include.sh b/third_party/git/t/t1305-config-include.sh index d20b4d150d..f1e1b289f9 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 ^core actual.full >actual && + grep -v -e ^core -e ^extensions 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 21e139a313..dd87b43be1 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' ' - test_might_fail rm .gitattributes && + rm -f .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 && - test_might_fail rm "$HOME"/.gitconfig && + rm -f "$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' ' - test_might_fail rm "$HOME"/.gitconfig && - test_might_fail rm "$HOME"/.config/git/config && + rm -f "$HOME"/.gitconfig && + rm -f "$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 37dc689d8c..002e6d3388 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' ' - test_must_fail nongit git config --blob=foo --list + nongit test_must_fail 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 d0a2727b85..3a527e3a84 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 >except <<-\EOF && + cat >expect <<-\EOF && + lama + ball sam bat hask - lama - ball EOF - test-tool config configset_get_value case.baz config2 .git/config >actual && + test-tool config configset_get_value_multi 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' ' - echo "[foo]bar = from-repo" >.git/config && - echo "[foo]bar = from-home" >.gitconfig && + printf "[ignore]\n\tthis = please\n[foo]bar = from-repo\n" >.git/config && + printf "[foo]\n\tbar = from-home\n" >.gitconfig && if test_have_prereq MINGW then # Use Windows path (i.e. *not* $HOME) @@ -253,19 +253,29 @@ 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 - scope=repo + lno=3 + scope=local key=foo.bar value=from-cmdline origin=command line name= - scope=cmdline + lno=-1 + scope=command 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 0c37e7180d..ebb8e1aecb 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 -z "$(cat output)" + test_must_be_empty output ' test_expect_success 'ceiling #2' ' @@ -91,7 +91,12 @@ test_expect_failure 'ignore .git/ with invalid config' ' test_expect_success 'early config and onbranch' ' echo "[broken" >broken && - test_with_config "[includeif \"onbranch:refs/heads/master\"]path=../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_done diff --git a/third_party/git/t/t1400-update-ref.sh b/third_party/git/t/t1400-update-ref.sh index 1fbd940408..770e7be363 100755 --- a/third_party/git/t/t1400-update-ref.sh +++ b/third_party/git/t/t1400-update-ref.sh @@ -37,15 +37,15 @@ test_expect_success setup ' test_expect_success "create $m" ' git update-ref $m $A && - test $A = $(cat .git/$m) + test $A = $(git show-ref -s --verify $m) ' test_expect_success "create $m with oldvalue verification" ' git update-ref $m $B $A && - test $B = $(cat .git/$m) + test $B = $(git show-ref -s --verify $m) ' test_expect_success "fail to delete $m with stale ref" ' test_must_fail git update-ref -d $m $A && - test $B = "$(cat .git/$m)" + test $B = "$(git show-ref -s --verify $m)" ' test_expect_success "delete $m" ' test_when_finished "rm -f .git/$m" && @@ -56,7 +56,7 @@ test_expect_success "delete $m" ' test_expect_success "delete $m without oldvalue verification" ' test_when_finished "rm -f .git/$m" && git update-ref $m $A && - test $A = $(cat .git/$m) && + test $A = $(git show-ref -s --verify $m) && git update-ref -d $m && test_path_is_missing .git/$m ' @@ -69,15 +69,15 @@ test_expect_success "fail to create $n" ' test_expect_success "create $m (by HEAD)" ' git update-ref HEAD $A && - test $A = $(cat .git/$m) + test $A = $(git show-ref -s --verify $m) ' test_expect_success "create $m (by HEAD) with oldvalue verification" ' git update-ref HEAD $B $A && - test $B = $(cat .git/$m) + test $B = $(git show-ref -s --verify $m) ' test_expect_success "fail to delete $m (by HEAD) with stale ref" ' test_must_fail git update-ref -d HEAD $A && - test $B = $(cat .git/$m) + test $B = $(git show-ref -s --verify $m) ' test_expect_success "delete $m (by HEAD)" ' test_when_finished "rm -f .git/$m" && @@ -160,10 +160,10 @@ test_expect_success 'core.logAllRefUpdates=always creates reflog by default' ' git reflog exists $outside ' -test_expect_success 'core.logAllRefUpdates=always creates no reflog for ORIG_HEAD' ' +test_expect_success 'core.logAllRefUpdates=always creates reflog for ORIG_HEAD' ' test_config core.logAllRefUpdates always && git update-ref ORIG_HEAD $A && - test_must_fail git reflog exists ORIG_HEAD + git reflog exists ORIG_HEAD ' test_expect_success '--no-create-reflog overrides core.logAllRefUpdates=always' ' @@ -178,14 +178,14 @@ test_expect_success '--no-create-reflog overrides core.logAllRefUpdates=always' test_expect_success "create $m (by HEAD)" ' git update-ref HEAD $A && - test $A = $(cat .git/$m) + test $A = $(git show-ref -s --verify $m) ' test_expect_success 'pack refs' ' git pack-refs --all ' test_expect_success "move $m (by HEAD)" ' git update-ref HEAD $B $A && - test $B = $(cat .git/$m) + test $B = $(git show-ref -s --verify $m) ' test_expect_success "delete $m (by HEAD) should remove both packed and loose $m" ' test_when_finished "rm -f .git/$m" && @@ -255,7 +255,7 @@ test_expect_success '(not) change HEAD with wrong SHA1' ' ' test_expect_success "(not) changed .git/$m" ' test_when_finished "rm -f .git/$m" && - ! test $B = $(cat .git/$m) + ! test $B = $(git show-ref -s --verify $m) ' rm -f .git/logs/refs/heads/master @@ -263,19 +263,19 @@ test_expect_success "create $m (logged by touch)" ' test_config core.logAllRefUpdates false && GIT_COMMITTER_DATE="2005-05-26 23:30" \ git update-ref --create-reflog HEAD $A -m "Initial Creation" && - test $A = $(cat .git/$m) + test $A = $(git show-ref -s --verify $m) ' test_expect_success "update $m (logged by touch)" ' test_config core.logAllRefUpdates false && GIT_COMMITTER_DATE="2005-05-26 23:31" \ git update-ref HEAD $B $A -m "Switch" && - test $B = $(cat .git/$m) + test $B = $(git show-ref -s --verify $m) ' test_expect_success "set $m (logged by touch)" ' test_config core.logAllRefUpdates false && GIT_COMMITTER_DATE="2005-05-26 23:41" \ git update-ref HEAD $A && - test $A = $(cat .git/$m) + test $A = $(git show-ref -s --verify $m) ' test_expect_success 'empty directory removal' ' @@ -319,19 +319,19 @@ test_expect_success "create $m (logged by config)" ' test_config core.logAllRefUpdates true && GIT_COMMITTER_DATE="2005-05-26 23:32" \ git update-ref HEAD $A -m "Initial Creation" && - test $A = $(cat .git/$m) + test $A = $(git show-ref -s --verify $m) ' test_expect_success "update $m (logged by config)" ' test_config core.logAllRefUpdates true && GIT_COMMITTER_DATE="2005-05-26 23:33" \ - git update-ref HEAD'" $B $A "'-m "Switch" && - test $B = $(cat .git/$m) + git update-ref HEAD $B $A -m "Switch" && + test $B = $(git show-ref -s --verify $m) ' test_expect_success "set $m (logged by config)" ' test_config core.logAllRefUpdates true && GIT_COMMITTER_DATE="2005-05-26 23:43" \ git update-ref HEAD $A && - test $A = $(cat .git/$m) + test $A = $(git show-ref -s --verify $m) ' cat >expect <<EOF @@ -344,14 +344,16 @@ test_expect_success "verifying $m's log (logged by config)" ' test_cmp expect .git/logs/$m ' -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 +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 +' ed="Thu, 26 May 2005 18:32:00 -0500" gd="Thu, 26 May 2005 18:33:00 -0500" @@ -359,55 +361,67 @@ 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 && - test $C = $(cat o) && - test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)" + echo "$C" >expect && + test_cmp expect o && + echo "warning: log for '\''master'\'' only goes back to $ed" >expect && + test_i18ncmp expect 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 && - test $C = $(cat o) && - test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)" + echo "$C" >expect && + test_cmp expect o && + echo "warning: log for '\''master'\'' only goes back to $ed" >expect && + test_i18ncmp expect 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 && - test $C = $(cat o) && - test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)" + echo "$C" >expect && + test_cmp expect o && + echo "warning: log for '\''master'\'' only goes back to $ed" >expect && + test_i18ncmp expect 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 && - test $C = $(cat o) && - test "" = "$(cat e)" + echo "$C" >expect && + test_cmp expect o && + test_must_be_empty 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 && - test $A = $(cat o) && - test "" = "$(cat e)" + echo "$A" >expect && + test_cmp expect o && + test_must_be_empty 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 && - test $B = $(cat o) && + echo "$B" >expect && + test_cmp expect 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 && - test $Z = $(cat o) && - test "" = "$(cat e)" + echo "$Z" >expect && + test_cmp expect o && + test_must_be_empty 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 && - test $E = $(cat o) && - test "" = "$(cat e)" + echo "$E" >expect && + test_cmp expect o && + test_must_be_empty 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 && - test $D = $(cat o) && + echo "$D" >expect && + test_cmp expect o && test_i18ngrep -F "warning: log for ref $m unexpectedly ended on $ld" e ' @@ -461,57 +475,57 @@ test_expect_success 'git cat-file blob master@{2005-05-26 23:42}:F (expect OTHER test_expect_success 'given old value for missing pseudoref, do not create' ' test_must_fail git update-ref PSEUDOREF $A $B 2>err && - test_path_is_missing .git/PSEUDOREF && - test_i18ngrep "could not read ref" err + test_must_fail git rev-parse PSEUDOREF && + test_i18ngrep "unable to resolve reference" err ' test_expect_success 'create pseudoref' ' git update-ref PSEUDOREF $A && - test $A = $(cat .git/PSEUDOREF) + test $A = $(git rev-parse PSEUDOREF) ' test_expect_success 'overwrite pseudoref with no old value given' ' git update-ref PSEUDOREF $B && - test $B = $(cat .git/PSEUDOREF) + test $B = $(git rev-parse PSEUDOREF) ' test_expect_success 'overwrite pseudoref with correct old value' ' git update-ref PSEUDOREF $C $B && - test $C = $(cat .git/PSEUDOREF) + test $C = $(git rev-parse PSEUDOREF) ' test_expect_success 'do not overwrite pseudoref with wrong old value' ' test_must_fail git update-ref PSEUDOREF $D $E 2>err && - test $C = $(cat .git/PSEUDOREF) && - test_i18ngrep "unexpected object ID" err + test $C = $(git rev-parse PSEUDOREF) && + test_i18ngrep "cannot lock ref.*expected" err ' test_expect_success 'delete pseudoref' ' git update-ref -d PSEUDOREF && - test_path_is_missing .git/PSEUDOREF + test_must_fail git rev-parse PSEUDOREF ' test_expect_success 'do not delete pseudoref with wrong old value' ' git update-ref PSEUDOREF $A && test_must_fail git update-ref -d PSEUDOREF $B 2>err && - test $A = $(cat .git/PSEUDOREF) && - test_i18ngrep "unexpected object ID" err + test $A = $(git rev-parse PSEUDOREF) && + test_i18ngrep "cannot lock ref.*expected" err ' test_expect_success 'delete pseudoref with correct old value' ' git update-ref -d PSEUDOREF $A && - test_path_is_missing .git/PSEUDOREF + test_must_fail git rev-parse PSEUDOREF ' test_expect_success 'create pseudoref with old OID zero' ' git update-ref PSEUDOREF $A $Z && - test $A = $(cat .git/PSEUDOREF) + test $A = $(git rev-parse PSEUDOREF) ' test_expect_success 'do not overwrite pseudoref with old OID zero' ' test_when_finished git update-ref -d PSEUDOREF && test_must_fail git update-ref PSEUDOREF $B $Z 2>err && - test $A = $(cat .git/PSEUDOREF) && + test $A = $(git rev-parse PSEUDOREF) && test_i18ngrep "already exists" err ' @@ -1340,15 +1354,6 @@ test_expect_success 'fails with duplicate ref update via symref' ' test_cmp expect actual ' -run_with_limited_open_files () { - (ulimit -n 32 && "$@") -} - -test_lazy_prereq ULIMIT_FILE_DESCRIPTORS ' - test_have_prereq !MINGW,!CYGWIN && - run_with_limited_open_files true -' - test_expect_success ULIMIT_FILE_DESCRIPTORS 'large transaction creating branches does not burst open file limit' ' ( for i in $(test_seq 33) @@ -1390,4 +1395,135 @@ test_expect_success 'handle per-worktree refs in refs/bisect' ' ! test_cmp main-head worktree-head ' +test_expect_success 'transaction handles empty commit' ' + cat >stdin <<-EOF && + start + prepare + commit + EOF + git update-ref --stdin <stdin >actual && + printf "%s: ok\n" start prepare commit >expect && + test_cmp expect actual +' + +test_expect_success 'transaction handles empty commit with missing prepare' ' + cat >stdin <<-EOF && + start + commit + EOF + git update-ref --stdin <stdin >actual && + printf "%s: ok\n" start commit >expect && + test_cmp expect actual +' + +test_expect_success 'transaction handles sole commit' ' + cat >stdin <<-EOF && + commit + EOF + git update-ref --stdin <stdin >actual && + printf "%s: ok\n" commit >expect && + test_cmp expect actual +' + +test_expect_success 'transaction handles empty abort' ' + cat >stdin <<-EOF && + start + prepare + abort + EOF + git update-ref --stdin <stdin >actual && + printf "%s: ok\n" start prepare abort >expect && + test_cmp expect actual +' + +test_expect_success 'transaction exits on multiple aborts' ' + cat >stdin <<-EOF && + abort + abort + EOF + test_must_fail git update-ref --stdin <stdin >actual 2>err && + printf "%s: ok\n" abort >expect && + test_cmp expect actual && + grep "fatal: transaction is closed" err +' + +test_expect_success 'transaction exits on start after prepare' ' + cat >stdin <<-EOF && + prepare + start + EOF + test_must_fail git update-ref --stdin <stdin 2>err >actual && + printf "%s: ok\n" prepare >expect && + test_cmp expect actual && + grep "fatal: prepared transactions can only be closed" err +' + +test_expect_success 'transaction handles empty abort with missing prepare' ' + cat >stdin <<-EOF && + start + abort + EOF + git update-ref --stdin <stdin >actual && + printf "%s: ok\n" start abort >expect && + test_cmp expect actual +' + +test_expect_success 'transaction handles sole abort' ' + cat >stdin <<-EOF && + abort + EOF + git update-ref --stdin <stdin >actual && + printf "%s: ok\n" abort >expect && + test_cmp expect actual +' + +test_expect_success 'transaction can handle commit' ' + cat >stdin <<-EOF && + start + create $a HEAD + commit + EOF + git update-ref --stdin <stdin >actual && + printf "%s: ok\n" start commit >expect && + test_cmp expect actual && + git rev-parse HEAD >expect && + git rev-parse $a >actual && + test_cmp expect actual +' + +test_expect_success 'transaction can handle abort' ' + cat >stdin <<-EOF && + start + create $b HEAD + abort + EOF + git update-ref --stdin <stdin >actual && + printf "%s: ok\n" start abort >expect && + test_cmp expect actual && + test_path_is_missing .git/$b +' + +test_expect_success 'transaction aborts by default' ' + cat >stdin <<-EOF && + start + create $b HEAD + EOF + git update-ref --stdin <stdin >actual && + printf "%s: ok\n" start >expect && + test_cmp expect actual && + test_path_is_missing .git/$b +' + +test_expect_success 'transaction with prepare aborts by default' ' + cat >stdin <<-EOF && + start + create $b HEAD + prepare + EOF + git update-ref --stdin <stdin >actual && + printf "%s: ok\n" start prepare >expect && + test_cmp expect actual && + test_path_is_missing .git/$b +' + test_done diff --git a/third_party/git/t/t1404-update-ref-errors.sh b/third_party/git/t/t1404-update-ref-errors.sh index 970c5c36b9..2d142e5535 100755 --- a/third_party/git/t/t1404-update-ref-errors.sh +++ b/third_party/git/t/t1404-update-ref-errors.sh @@ -32,8 +32,6 @@ test_update_rejected () { test_cmp unchanged actual } -Q="'" - # Test adding and deleting D/F-conflicting references in a single # transaction. df_test() { @@ -93,7 +91,7 @@ df_test() { delname="$delref" fi && cat >expected-err <<-EOF && - fatal: cannot lock ref $Q$addname$Q: $Q$delref$Q exists; cannot create $Q$addref$Q + fatal: cannot lock ref $SQ$addname$SQ: $SQ$delref$SQ exists; cannot create $SQ$addref$SQ EOF $pack && if $add_del @@ -123,7 +121,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" \ - "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q" + "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ" ' @@ -131,7 +129,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" \ - "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q" + "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ" ' @@ -139,7 +137,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" \ - "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q" + "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ" ' @@ -147,7 +145,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" \ - "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q" + "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ" ' @@ -155,7 +153,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" \ - "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q" + "$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ" ' @@ -163,7 +161,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" \ - "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q" + "$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ" ' @@ -171,7 +169,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" \ - "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q" + "$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ" ' @@ -179,7 +177,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" \ - "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q" + "$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ" ' @@ -187,7 +185,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 $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time" + "cannot process $SQ$prefix/c$SQ and $SQ$prefix/c/x$SQ at the same time" ' @@ -334,7 +332,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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q + fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ EOF printf "%s\n" "update $prefix/foo $E $D" | test_must_fail git update-ref --stdin 2>output.err && @@ -345,7 +343,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 $Q$prefix/foo$Q: is at $C but expected $D + fatal: cannot lock ref $SQ$prefix/foo$SQ: 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 && @@ -356,7 +354,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 $Q$prefix/foo$Q: reference already exists + fatal: cannot lock ref $SQ$prefix/foo$SQ: reference already exists EOF printf "%s\n" "create $prefix/foo $E" | test_must_fail git update-ref --stdin 2>output.err && @@ -367,7 +365,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 $Q$prefix/foo$Q: is at $C but expected $D + fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D EOF printf "%s\n" "delete $prefix/foo $D" | test_must_fail git update-ref --stdin 2>output.err && @@ -378,7 +376,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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q + fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ EOF printf "%s\n" "update $prefix/symref $E $D" | test_must_fail git update-ref --stdin 2>output.err && @@ -390,7 +388,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 $Q$prefix/symref$Q: is at $C but expected $D + fatal: cannot lock ref $SQ$prefix/symref$SQ: 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 && @@ -402,7 +400,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 $Q$prefix/symref$Q: reference already exists + fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists EOF printf "%s\n" "create $prefix/symref $E" | test_must_fail git update-ref --stdin 2>output.err && @@ -414,7 +412,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 $Q$prefix/symref$Q: is at $C but expected $D + fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D EOF printf "%s\n" "delete $prefix/symref $D" | test_must_fail git update-ref --stdin 2>output.err && @@ -425,7 +423,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 $Q$prefix/symref$Q: reference is missing but expected $D + fatal: cannot lock ref $SQ$prefix/symref$SQ: 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 && @@ -437,7 +435,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 $Q$prefix/symref$Q: is at $C but expected $D + fatal: cannot lock ref $SQ$prefix/symref$SQ: 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 && @@ -449,7 +447,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 $Q$prefix/symref$Q: reference already exists + fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists EOF printf "%s\n" "option no-deref" "create $prefix/symref $E" | test_must_fail git update-ref --stdin 2>output.err && @@ -461,7 +459,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 $Q$prefix/symref$Q: is at $C but expected $D + fatal: cannot lock ref $SQ$prefix/symref$SQ: 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 && @@ -474,13 +472,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 $Q$prefix/foo$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q + 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 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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q + fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ EOF printf "%s\n" "update $prefix/foo $D $C" | test_must_fail git update-ref --stdin 2>output.err && @@ -493,13 +491,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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken + fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: 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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken + fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken EOF printf "%s\n" "update $prefix/foo $D $C" | test_must_fail git update-ref --stdin 2>output.err && @@ -513,13 +511,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 $Q$prefix/symref$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q + 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 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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q + fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ EOF printf "%s\n" "update $prefix/symref $D $C" | test_must_fail git update-ref --stdin 2>output.err && @@ -532,13 +530,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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken + fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: 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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken + fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken EOF printf "%s\n" "update $prefix/symref $D $C" | test_must_fail git update-ref --stdin 2>output.err && @@ -614,7 +612,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 $Q.*packed-refs.lock$Q: " err && + test_i18ngrep "Unable to create $SQ.*packed-refs.lock$SQ: " err && test_cmp unchanged actual ' diff --git a/third_party/git/t/t1405-main-ref-store.sh b/third_party/git/t/t1405-main-ref-store.sh index 331899ddc4..74af927fba 100755 --- a/third_party/git/t/t1405-main-ref-store.sh +++ b/third_party/git/t/t1405-main-ref-store.sh @@ -31,7 +31,10 @@ test_expect_success 'create_symref(FOO, refs/heads/master)' ' test_expect_success 'delete_refs(FOO, refs/tags/new-tag)' ' git rev-parse FOO -- && git rev-parse refs/tags/new-tag -- && - $RUN delete-refs 0 nothing FOO refs/tags/new-tag && + m=$(git rev-parse master) && + REF_NO_DEREF=1 && + $RUN delete-refs $REF_NO_DEREF nothing FOO refs/tags/new-tag && + test_must_fail git rev-parse --symbolic-full-name FOO && test_must_fail git rev-parse FOO -- && test_must_fail git rev-parse refs/tags/new-tag -- ' diff --git a/third_party/git/t/t1406-submodule-ref-store.sh b/third_party/git/t/t1406-submodule-ref-store.sh index d199d872fb..36b7ef5046 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 && cat actual && + $RUN for-each-reflog-ent HEAD >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 e5cb8a252d..be12fb6350 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_must_fail test -f .git/packed-refs && + test_path_is_missing .git/packed-refs && git update-ref refs/heads/foo $A && - test_must_fail test -f .git/packed-refs && + test_path_is_missing .git/packed-refs && git update-ref refs/heads/foo $B && - test_must_fail test -f .git/packed-refs && + test_path_is_missing .git/packed-refs && git update-ref refs/heads/foo $C $B && - test_must_fail test -f .git/packed-refs && + test_path_is_missing .git/packed-refs && git update-ref -d refs/heads/foo && - test_must_fail test -f .git/packed-refs + test_path_is_missing .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 && - test_must_fail check_packed_refs_marked && + ! 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 && - test_must_fail check_packed_refs_marked + ! 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 82950c0282..730a43d9dd 100755 --- a/third_party/git/t/t1410-reflog.sh +++ b/third_party/git/t/t1410-reflog.sh @@ -54,7 +54,6 @@ check_dont_have () { } test_expect_success setup ' - test_oid_init && mkdir -p A/B && echo rat >C && echo ox >A/D && @@ -195,7 +194,7 @@ test_expect_success 'delete' ' git reflog delete master@{1} && git reflog show master > output && - test $(($master_entry_count - 1)) = $(wc -l < output) && + test_line_count = $(($master_entry_count - 1)) output && test $HEAD_entry_count = $(git reflog | wc -l) && ! grep ox < output && @@ -209,7 +208,7 @@ test_expect_success 'delete' ' git reflog delete master@{07.04.2005.15:15:00.-0700} && git reflog show master > output && - test $(($master_entry_count - 1)) = $(wc -l < output) && + test_line_count = $(($master_entry_count - 1)) 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 feb1efd8ff..1181a9fb28 100755 --- a/third_party/git/t/t1414-reflog-walk.sh +++ b/third_party/git/t/t1414-reflog-walk.sh @@ -18,10 +18,9 @@ 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/t1415-worktree-refs.sh b/third_party/git/t/t1415-worktree-refs.sh index bb2c7572a3..7ab91241ab 100755 --- a/third_party/git/t/t1415-worktree-refs.sh +++ b/third_party/git/t/t1415-worktree-refs.sh @@ -76,24 +76,24 @@ test_expect_success 'reflog of worktrees/xx/HEAD' ' test_cmp expected actual.wt2 ' -test_expect_success 'for-each-ref from main repo' ' +test_expect_success 'for-each-ref from main worktree' ' mkdir fer1 && git -C fer1 init repo && test_commit -C fer1/repo initial && git -C fer1/repo worktree add ../second && - git -C fer1/repo update-ref refs/bisect/main HEAD && - git -C fer1/repo update-ref refs/rewritten/main HEAD && - git -C fer1/repo update-ref refs/worktree/main HEAD && - git -C fer1/repo for-each-ref --format="%(refname)" | grep main >actual && + git -C fer1/repo update-ref refs/bisect/first HEAD && + git -C fer1/repo update-ref refs/rewritten/first HEAD && + git -C fer1/repo update-ref refs/worktree/first HEAD && + git -C fer1/repo for-each-ref --format="%(refname)" | grep first >actual && cat >expected <<-\EOF && - refs/bisect/main - refs/rewritten/main - refs/worktree/main + refs/bisect/first + refs/rewritten/first + refs/worktree/first EOF test_cmp expected actual ' -test_expect_success 'for-each-ref from linked repo' ' +test_expect_success 'for-each-ref from linked worktree' ' mkdir fer2 && git -C fer2 init repo && test_commit -C fer2/repo initial && diff --git a/third_party/git/t/t1416-ref-transaction-hooks.sh b/third_party/git/t/t1416-ref-transaction-hooks.sh new file mode 100755 index 0000000000..f6e741c6c0 --- /dev/null +++ b/third_party/git/t/t1416-ref-transaction-hooks.sh @@ -0,0 +1,136 @@ +#!/bin/sh + +test_description='reference transaction hooks' + +. ./test-lib.sh + +test_expect_success setup ' + mkdir -p .git/hooks && + test_commit PRE && + PRE_OID=$(git rev-parse PRE) && + test_commit POST && + POST_OID=$(git rev-parse POST) +' + +test_expect_success 'hook allows updating ref if successful' ' + test_when_finished "rm .git/hooks/reference-transaction" && + git reset --hard PRE && + write_script .git/hooks/reference-transaction <<-\EOF && + echo "$*" >>actual + EOF + cat >expect <<-EOF && + prepared + committed + EOF + git update-ref HEAD POST && + test_cmp expect actual +' + +test_expect_success 'hook aborts updating ref in prepared state' ' + test_when_finished "rm .git/hooks/reference-transaction" && + git reset --hard PRE && + write_script .git/hooks/reference-transaction <<-\EOF && + if test "$1" = prepared + then + exit 1 + fi + EOF + test_must_fail git update-ref HEAD POST 2>err && + test_i18ngrep "ref updates aborted by hook" err +' + +test_expect_success 'hook gets all queued updates in prepared state' ' + test_when_finished "rm .git/hooks/reference-transaction actual" && + git reset --hard PRE && + write_script .git/hooks/reference-transaction <<-\EOF && + if test "$1" = prepared + then + while read -r line + do + printf "%s\n" "$line" + done >actual + fi + EOF + cat >expect <<-EOF && + $ZERO_OID $POST_OID HEAD + $ZERO_OID $POST_OID refs/heads/master + EOF + git update-ref HEAD POST <<-EOF && + update HEAD $ZERO_OID $POST_OID + update refs/heads/master $ZERO_OID $POST_OID + EOF + test_cmp expect actual +' + +test_expect_success 'hook gets all queued updates in committed state' ' + test_when_finished "rm .git/hooks/reference-transaction actual" && + git reset --hard PRE && + write_script .git/hooks/reference-transaction <<-\EOF && + if test "$1" = committed + then + while read -r line + do + printf "%s\n" "$line" + done >actual + fi + EOF + cat >expect <<-EOF && + $ZERO_OID $POST_OID HEAD + $ZERO_OID $POST_OID refs/heads/master + EOF + git update-ref HEAD POST && + test_cmp expect actual +' + +test_expect_success 'hook gets all queued updates in aborted state' ' + test_when_finished "rm .git/hooks/reference-transaction actual" && + git reset --hard PRE && + write_script .git/hooks/reference-transaction <<-\EOF && + if test "$1" = aborted + then + while read -r line + do + printf "%s\n" "$line" + done >actual + fi + EOF + cat >expect <<-EOF && + $ZERO_OID $POST_OID HEAD + $ZERO_OID $POST_OID refs/heads/master + EOF + git update-ref --stdin <<-EOF && + start + update HEAD POST $ZERO_OID + update refs/heads/master POST $ZERO_OID + abort + EOF + test_cmp expect actual +' + +test_expect_success 'interleaving hook calls succeed' ' + test_when_finished "rm -r target-repo.git" && + + git init --bare target-repo.git && + + write_script target-repo.git/hooks/reference-transaction <<-\EOF && + echo $0 "$@" >>actual + EOF + + write_script target-repo.git/hooks/update <<-\EOF && + echo $0 "$@" >>actual + EOF + + cat >expect <<-EOF && + hooks/update refs/tags/PRE $ZERO_OID $PRE_OID + hooks/reference-transaction prepared + hooks/reference-transaction committed + hooks/update refs/tags/POST $ZERO_OID $POST_OID + hooks/reference-transaction prepared + hooks/reference-transaction committed + EOF + + git push ./target-repo.git PRE POST && + test_cmp expect target-repo.git/actual +' + +test_done diff --git a/third_party/git/t/t1450-fsck.sh b/third_party/git/t/t1450-fsck.sh index b36e0528d0..b17f5c21fb 100755 --- a/third_party/git/t/t1450-fsck.sh +++ b/third_party/git/t/t1450-fsck.sh @@ -9,7 +9,6 @@ test_description='git fsck random collection of tests . ./test-lib.sh test_expect_success setup ' - test_oid_init && git config gc.auto 0 && git config i18n.commitencoding ISO-8859-1 && test_commit A fileA one && @@ -70,7 +69,6 @@ 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 ' @@ -78,7 +76,6 @@ 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 ' @@ -88,7 +85,6 @@ 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 ' @@ -98,7 +94,6 @@ 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 ' @@ -137,6 +132,30 @@ test_expect_success 'other worktree HEAD link pointing at a funny place' ' test_i18ngrep "worktrees/other/HEAD points to something strange" out ' +test_expect_success 'commit with multiple signatures is okay' ' + git cat-file commit HEAD >basis && + cat >sigs <<-EOF && + gpgsig -----BEGIN PGP SIGNATURE----- + VGhpcyBpcyBub3QgcmVhbGx5IGEgc2lnbmF0dXJlLg== + -----END PGP SIGNATURE----- + gpgsig-sha256 -----BEGIN PGP SIGNATURE----- + VGhpcyBpcyBub3QgcmVhbGx5IGEgc2lnbmF0dXJlLg== + -----END PGP SIGNATURE----- + EOF + sed -e "/^committer/q" basis >okay && + cat sigs >>okay && + echo >>okay && + sed -e "1,/^$/d" basis >>okay && + cat okay && + new=$(git hash-object -t commit -w --stdin <okay) && + test_when_finished "remove_object $new" && + 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 +' + test_expect_success 'email without @ is okay' ' git cat-file commit HEAD >basis && sed "s/@/AT/" basis >okay && @@ -145,7 +164,6 @@ 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 ' @@ -157,7 +175,6 @@ 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 ' @@ -169,7 +186,6 @@ 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 ' @@ -181,7 +197,6 @@ 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 ' @@ -193,7 +208,6 @@ 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 ' @@ -207,7 +221,6 @@ 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 ' @@ -219,7 +232,6 @@ 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 ' @@ -244,6 +256,35 @@ test_expect_success 'tree object with duplicate entries' ' test_i18ngrep "error in tree .*contains duplicate file entries" out ' +check_duplicate_names () { + expect=$1 && + shift && + names=$@ && + test_expect_$expect "tree object with duplicate names: $names" ' + test_when_finished "remove_object \$blob" && + test_when_finished "remove_object \$tree" && + test_when_finished "remove_object \$badtree" && + blob=$(echo blob | git hash-object -w --stdin) && + printf "100644 blob %s\t%s\n" $blob x.2 >tree && + tree=$(git mktree <tree) && + for name in $names + do + case "$name" in + */) printf "040000 tree %s\t%s\n" $tree "${name%/}" ;; + *) printf "100644 blob %s\t%s\n" $blob "$name" ;; + esac + done >badtree && + badtree=$(git mktree <badtree) && + test_must_fail git fsck 2>out && + test_i18ngrep "$badtree" out && + test_i18ngrep "error in tree .*contains duplicate file entries" out + ' +} + +check_duplicate_names success x x.1 x/ +check_duplicate_names success x x.1.2 x.1/ x/ +check_duplicate_names success x x.1 x.1.2 x/ + test_expect_success 'unparseable tree object' ' test_oid_cache <<-\EOF && junk sha1:twenty-bytes-of-junk @@ -297,7 +338,6 @@ 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 ' @@ -378,7 +418,6 @@ 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 ' @@ -409,7 +448,6 @@ 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 ' @@ -433,7 +471,6 @@ 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 ) ' @@ -444,7 +481,6 @@ 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 ) ' @@ -456,6 +492,7 @@ 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 && @@ -465,7 +502,6 @@ 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 @@ -632,7 +668,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 -E "$tree \((refs/heads/master|HEAD)@\{[0-9]*\}:" out + test_i18ngrep "$tree (refs/tags/julius:" out ) ' @@ -677,7 +713,7 @@ test_expect_success 'fsck fails on corrupt packfile' ' # at least one of which is not zero, so setting the first byte to 0 is # sufficient.) chmod a+w .git/objects/pack/pack-$pack.pack && - printf '\0' | dd of=.git/objects/pack/pack-$pack.pack bs=1 conv=notrunc seek=12 && + printf "\0" | dd of=.git/objects/pack/pack-$pack.pack bs=1 conv=notrunc seek=12 && test_when_finished "rm -f .git/objects/pack/pack-$pack.*" && remove_object $hsh && diff --git a/third_party/git/t/t1500-rev-parse.sh b/third_party/git/t/t1500-rev-parse.sh index 01abee533d..408b97d5af 100755 --- a/third_party/git/t/t1500-rev-parse.sh +++ b/third_party/git/t/t1500-rev-parse.sh @@ -131,6 +131,30 @@ 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 3498d3d55e..b75558040f 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 && - test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo && + { 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 4ee009da66..3e657e693b 100755 --- a/third_party/git/t/t1506-rev-parse-diagnosis.sh +++ b/third_party/git/t/t1506-rev-parse-diagnosis.sh @@ -8,12 +8,11 @@ exec </dev/null test_did_you_mean () { - sq="'" && cat >expected <<-EOF && - fatal: Path '$2$3' $4, but not ${5:-$sq$3$sq}. - Did you mean '$1:$2$3'${2:+ aka $sq$1:./$3$sq}? + fatal: path '$2$3' $4, but not ${5:-$SQ$3$SQ} + hint: Did you mean '$1:$2$3'${2:+ aka $SQ$1:./$3$SQ}? EOF - test_cmp expected error + test_i18ncmp expected error } HASH_file= @@ -104,66 +103,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 && - grep "Invalid object name '"'"'foobar'"'"'." error && - test_must_fail git rev-parse foobar 2> error && + test_i18ngrep "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 && - 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 && + 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 && (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 && - 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_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_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 && - grep "fatal: Path '"'"'disk-only.txt'"'"' exists on disk, but not in the index." error + 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_expect_success 'invalid @{n} reference' ' test_must_fail git rev-parse master@{99999} >output 2>error && - test -z "$(cat output)" && - grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error && + test_must_be_empty output && + test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error && test_must_fail git rev-parse --verify master@{99999} >output 2>error && - test -z "$(cat output)" && - grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error + test_must_be_empty output && + test_i18ngrep "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 && - grep subdir/nonexistent.txt error + test_i18ngrep subdir/nonexistent.txt error ) ' test_expect_success 'relative path outside worktree' ' test_must_fail git rev-parse HEAD:../file.txt >output 2>error && - test -z "$(cat output)" && + test_must_be_empty 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 -z "$(cat output)" && - grep "relative path syntax can.t be used outside working tree." error + test_must_be_empty output && + test_i18ngrep "relative path syntax can.t be used outside working tree" error ' test_expect_success '<commit>:file correctly diagnosed after a pathname' ' @@ -191,6 +190,24 @@ test_expect_success 'dotdot is not an empty set' ' test_cmp expect actual ' +test_expect_success 'dotdot does not peel endpoints' ' + git tag -a -m "annote" annotated HEAD && + A=$(git rev-parse annotated) && + H=$(git rev-parse annotated^0) && + { + echo $A && echo ^$A + } >expect-with-two-dots && + { + echo $A && echo $A && echo ^$H + } >expect-with-merge-base && + + git rev-parse annotated..annotated >actual-with-two-dots && + test_cmp expect-with-two-dots actual-with-two-dots && + + git rev-parse annotated...annotated >actual-with-merge-base && + test_cmp expect-with-merge-base actual-with-merge-base +' + test_expect_success 'arg before dashdash must be a revision (missing)' ' test_must_fail git rev-parse foobar -- 2>stderr && test_i18ngrep "bad revision" stderr @@ -208,11 +225,33 @@ test_expect_success 'arg before dashdash must be a revision (ambiguous)' ' { # we do not want to use rev-parse here, because # we are testing it - cat .git/refs/heads/foobar && + git show-ref -s refs/heads/foobar && printf "%s\n" -- } >expect && git rev-parse foobar -- >actual && 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 fa3e499641..dfc0d96d8a 100755 --- a/third_party/git/t/t1507-rev-parse-upstream.sh +++ b/third_party/git/t/t1507-rev-parse-upstream.sh @@ -28,16 +28,9 @@ test_expect_success 'setup' ' ) ' -sq="'" - -full_name () { - (cd clone && - git rev-parse --symbolic-full-name "$@") -} - commit_subject () { (cd clone && - git show -s --pretty=format:%s "$@") + git show -s --pretty=tformat:%s "$@") } error_message () { @@ -46,63 +39,78 @@ error_message () { } test_expect_success '@{upstream} resolves to correct full name' ' - test refs/remotes/origin/master = "$(full_name @{upstream})" && - test refs/remotes/origin/master = "$(full_name @{UPSTREAM})" && - test refs/remotes/origin/master = "$(full_name @{UpSTReam})" + 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_expect_success '@{u} resolves to correct full name' ' - test refs/remotes/origin/master = "$(full_name @{u})" && - test refs/remotes/origin/master = "$(full_name @{U})" + 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_expect_success 'my-side@{upstream} resolves to correct full name' ' - test refs/remotes/origin/side = "$(full_name my-side@{u})" + echo refs/remotes/origin/side >expect && + git -C clone rev-parse --symbolic-full-name my-side@{u} >actual && + test_cmp expect actual ' test_expect_success 'upstream of branch with @ in middle' ' - full_name fun@ny@{u} >actual && + git -C clone rev-parse --symbolic-full-name fun@ny@{u} >actual && echo refs/remotes/origin/side >expect && test_cmp expect actual && - full_name fun@ny@{U} >actual && + git -C clone rev-parse --symbolic-full-name fun@ny@{U} >actual && test_cmp expect actual ' test_expect_success 'upstream of branch with @ at start' ' - full_name @funny@{u} >actual && + git -C clone rev-parse --symbolic-full-name @funny@{u} >actual && echo refs/remotes/origin/side >expect && test_cmp expect actual ' test_expect_success 'upstream of branch with @ at end' ' - full_name funny@@{u} >actual && + git -C clone rev-parse --symbolic-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 full_name refs/heads/my-side@{upstream} + test_must_fail git -C clone rev-parse --symbolic-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) && - test 2 = "$(commit_subject my-side)" && - test 5 = "$(commit_subject my-side@{u})" + echo 2 >expect && + commit_subject my-side >actual && + test_cmp expect actual && + echo 5 >expect && + commit_subject my-side@{u} >actual ' test_expect_success 'not-tracking@{u} fails' ' - test_must_fail full_name non-tracking@{u} && + test_must_fail git -C clone rev-parse --symbolic-full-name non-tracking@{u} && (cd clone && git checkout --no-track -b non-tracking) && - test_must_fail full_name non-tracking@{u} + test_must_fail git -C clone rev-parse --symbolic-full-name non-tracking@{u} ' test_expect_success '<branch>@{u}@{1} resolves correctly' ' test_commit 6 && (cd clone && git fetch) && - test 5 = $(commit_subject my-side@{u}@{1}) && - test 5 = $(commit_subject my-side@{U}@{1}) + 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_expect_success '@{u} without specifying branch fails on a detached HEAD' ' @@ -129,7 +137,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 ) ' @@ -151,12 +159,14 @@ test_expect_success 'checkout other@{u}' ' ' test_expect_success 'branch@{u} works when tracking a local branch' ' - test refs/heads/master = "$(full_name local-master@{u})" + echo refs/heads/master >expect && + git -C clone rev-parse --symbolic-full-name local-master@{u} >actual && + test_cmp expect actual ' 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 @@ -164,7 +174,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 @@ -172,7 +182,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 @@ -189,7 +199,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 @@ -205,35 +215,37 @@ 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' ' - test refs/heads/master = "$(full_name @{u})" + echo refs/heads/master >expect && + git -C clone rev-parse --symbolic-full-name @{u} >actual && + test_cmp expect actual ' -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 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 + + 3 + EOF git log -1 -g other@{u} >actual && test_cmp expect actual ' -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 - 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 + + 3 + EOF git log -1 -g other@{u}@{now} >actual && test_cmp expect actual ' diff --git a/third_party/git/t/t1509-root-work-tree.sh b/third_party/git/t/t1509-root-work-tree.sh index 553a3f601b..fd2f7abf1c 100755 --- a/third_party/git/t/t1509-root-work-tree.sh +++ b/third_party/git/t/t1509-root-work-tree.sh @@ -221,7 +221,7 @@ test_expect_success 'setup' ' rm -rf /.git && echo "Initialized empty Git repository in /.git/" > expected && git init > result && - test_cmp expected result + test_i18ncmp expected result ' test_vars 'auto gitdir, root' ".git" "/" "" @@ -246,7 +246,7 @@ test_expect_success 'setup' ' cd / && echo "Initialized empty Git repository in /" > expected && git init --bare > result && - test_cmp expected result + test_i18ncmp expected result ' test_vars 'auto gitdir, root' "." "" "" diff --git a/third_party/git/t/t1512-rev-parse-disambiguation.sh b/third_party/git/t/t1512-rev-parse-disambiguation.sh index c19fb500cb..18fa6cf40d 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 $(wc -l <actual) = 16 && + test_line_count = 16 actual && 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 commitish), plus intro line + # 5 commits, 1 tag (which is a committish), 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 42962ed7d4..b7c31aa86a 100755 --- a/third_party/git/t/t1600-index.sh +++ b/third_party/git/t/t1600-index.sh @@ -59,17 +59,42 @@ test_expect_success 'out of bounds index.version issues warning' ' ) ' -test_expect_success 'GIT_INDEX_VERSION takes precedence over config' ' +test_index_version () { + INDEX_VERSION_CONFIG=$1 && + FEATURE_MANY_FILES=$2 && + ENV_VAR_VERSION=$3 + EXPECTED_OUTPUT_VERSION=$4 && ( rm -f .git/index && - GIT_INDEX_VERSION=4 && - export GIT_INDEX_VERSION && - git config --add index.version 2 && + 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 add a 2>&1 && - echo 4 >expect && + echo $EXPECTED_OUTPUT_VERSION >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/t2013-checkout-submodule.sh b/third_party/git/t/t2013-checkout-submodule.sh index 8f86b5f4b2..b2bdd1fcb4 100755 --- a/third_party/git/t/t2013-checkout-submodule.sh +++ b/third_party/git/t/t2013-checkout-submodule.sh @@ -68,8 +68,8 @@ test_submodule_switch_recursing_with_args "checkout" test_submodule_forced_switch_recursing_with_args "checkout -f" -test_submodule_switch "git checkout" +test_submodule_switch "checkout" -test_submodule_forced_switch "git checkout -f" +test_submodule_forced_switch "checkout -f" test_done diff --git a/third_party/git/t/t2018-checkout-branch.sh b/third_party/git/t/t2018-checkout-branch.sh index 822381dd9d..5f761bc616 100755 --- a/third_party/git/t/t2018-checkout-branch.sh +++ b/third_party/git/t/t2018-checkout-branch.sh @@ -1,50 +1,76 @@ #!/bin/sh -test_description='checkout ' +test_description='checkout' . ./test-lib.sh -# Arguments: <branch> <sha> [<checkout options>] +# Arguments: [!] <branch> <oid> [<checkout options>] # # Runs "git checkout" to switch to <branch>, testing that # # 1) we are on the specified branch, <branch>; -# 2) HEAD is <sha>; if <sha> is not specified, the old HEAD is used. +# 2) HEAD is <oid>; if <oid> is not specified, the old HEAD is used. # # If <checkout options> is not specified, "git checkout" is run with -b. -do_checkout() { +# +# 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 && exp_branch=$1 && exp_ref="refs/heads/$exp_branch" && - # if <sha> is not specified, use HEAD. - exp_sha=${2:-$(git rev-parse --verify HEAD)} && + # if <oid> is not specified, use HEAD. + exp_oid=${2:-$(git rev-parse --verify HEAD)} && # default options for git checkout: -b - if [ -z "$3" ]; then + if test -z "$3" + then opts="-b" else opts="$3" fi - git checkout $opts $exp_branch $exp_sha && + 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 +} - test $exp_ref = $(git rev-parse --symbolic-full-name HEAD) && - test $exp_sha = $(git rev-parse --verify HEAD) +test_dirty_unmergeable () { + test_expect_code 1 git diff --exit-code } -test_dirty_unmergeable() { - ! git diff --exit-code >/dev/null +test_dirty_unmergeable_discards_changes () { + git diff --exit-code } -setup_dirty_unmergeable() { +setup_dirty_unmergeable () { echo >>file1 change2 } -test_dirty_mergeable() { - ! git diff --cached --exit-code >/dev/null +test_dirty_mergeable () { + test_expect_code 1 git diff --cached --exit-code +} + +test_dirty_mergeable_discards_changes () { + git diff --cached --exit-code } -setup_dirty_mergeable() { +setup_dirty_mergeable () { echo >file2 file2 && git add file2 } @@ -82,7 +108,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 && - test_must_fail do_checkout branch2 $HEAD1 && + do_checkout ! branch2 $HEAD1 && test_dirty_unmergeable ' @@ -93,7 +119,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_must_fail test_dirty_unmergeable + test_dirty_unmergeable_discards_changes ' test_expect_success 'checkout -b to a new branch preserves mergeable changes' ' @@ -111,12 +137,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_must_fail test_dirty_mergeable + test_dirty_mergeable_discards_changes ' test_expect_success 'checkout -b to an existing branch fails' ' test_when_finished git reset --hard HEAD && - test_must_fail do_checkout branch2 $HEAD2 + do_checkout ! branch2 $HEAD2 ' test_expect_success 'checkout -b to @{-1} fails with the right branch name' ' @@ -140,7 +166,8 @@ 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' ' - git checkout $(git rev-parse --verify HEAD) && + head=$(git rev-parse --verify HEAD) && + git checkout "$head" && do_checkout branch2 "" -B ' @@ -155,14 +182,14 @@ test_expect_success 'checkout -B to an existing branch with unmergeable changes git checkout branch1 && setup_dirty_unmergeable && - test_must_fail do_checkout branch2 $HEAD1 -B && + 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_must_fail test_dirty_unmergeable + test_dirty_unmergeable_discards_changes ' test_expect_success 'checkout -B to an existing branch preserves mergeable changes' ' @@ -179,7 +206,7 @@ test_expect_success 'checkout -f -B to an existing branch with mergeable changes setup_dirty_mergeable && do_checkout branch2 $HEAD1 "-f -B" && - test_must_fail test_dirty_mergeable + test_dirty_mergeable_discards_changes ' test_expect_success 'checkout -b <describe>' ' @@ -211,4 +238,36 @@ test_expect_success 'checkout -b after clone --no-checkout does a checkout of HE test_path_is_file dest/a.t ' +test_expect_success 'checkout -b to a new branch preserves mergeable changes despite sparse-checkout' ' + test_when_finished " + git reset --hard && + git checkout branch1-scratch && + test_might_fail git branch -D branch3 && + git config core.sparseCheckout false && + rm .git/info/sparse-checkout" && + + test_commit file2 && + + echo stuff >>file1 && + echo file2 >.git/info/sparse-checkout && + git config core.sparseCheckout true && + + CURHEAD=$(git rev-parse HEAD) && + do_checkout branch3 $CURHEAD && + + echo file1 >expect && + git diff --name-only >actual && + test_cmp expect actual +' + +test_expect_success 'checkout -b rejects an invalid start point' ' + test_must_fail git checkout -b branch4 file1 2>err && + test_i18ngrep "is not a commit" err +' + +test_expect_success 'checkout -b rejects an extra path argument' ' + test_must_fail git checkout -b branch5 branch1 file1 2>err && + test_i18ngrep "Cannot update paths and switch to branch" err +' + test_done diff --git a/third_party/git/t/t2022-checkout-paths.sh b/third_party/git/t/t2022-checkout-paths.sh index fc3eb43b89..6844afafc0 100755 --- a/third_party/git/t/t2022-checkout-paths.sh +++ b/third_party/git/t/t2022-checkout-paths.sh @@ -78,4 +78,15 @@ 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 fa0718c730..accfa9aa4b 100755 --- a/third_party/git/t/t2024-checkout-dwim.sh +++ b/third_party/git/t/t2024-checkout-dwim.sh @@ -37,7 +37,9 @@ test_expect_success 'setup' ' git checkout -b foo && test_commit a_foo && git checkout -b bar && - test_commit a_bar + test_commit a_bar && + git checkout -b ambiguous_branch_and_file && + test_commit a_ambiguous_branch_and_file ) && git init repo_b && ( @@ -46,7 +48,9 @@ test_expect_success 'setup' ' git checkout -b foo && test_commit b_foo && git checkout -b baz && - test_commit b_baz + test_commit b_baz && + git checkout -b ambiguous_branch_and_file && + test_commit b_ambiguous_branch_and_file ) && git remote add repo_a repo_a && git remote add repo_b repo_b && @@ -75,6 +79,26 @@ 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/t2025-checkout-no-overlay.sh b/third_party/git/t/t2025-checkout-no-overlay.sh index 76330cb5ab..fa9e098706 100755 --- a/third_party/git/t/t2025-checkout-no-overlay.sh +++ b/third_party/git/t/t2025-checkout-no-overlay.sh @@ -44,4 +44,16 @@ test_expect_success '--no-overlay --theirs with D/F conflict deletes file' ' test_path_is_missing file1 ' +test_expect_success 'wildcard pathspec matches file in subdirectory' ' + git reset --hard && + mkdir subdir && + test_commit file3-1 subdir/file3 && + test_commit file3-2 subdir/file3 && + + git checkout --no-overlay file3-1 "*file3" && + echo file3-1 >expect && + test_path_is_file subdir/file3 && + test_cmp expect subdir/file3 +' + test_done diff --git a/third_party/git/t/t2026-checkout-pathspec-file.sh b/third_party/git/t/t2026-checkout-pathspec-file.sh new file mode 100755 index 0000000000..43d31d7948 --- /dev/null +++ b/third_party/git/t/t2026-checkout-pathspec-file.sh @@ -0,0 +1,163 @@ +#!/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/t2027-checkout-track.sh b/third_party/git/t/t2027-checkout-track.sh new file mode 100755 index 0000000000..bcba1bf90c --- /dev/null +++ b/third_party/git/t/t2027-checkout-track.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +test_description='tests for git branch --track' + +. ./test-lib.sh + +test_expect_success 'setup' ' + test_commit one && + test_commit two +' + +test_expect_success 'checkout --track -b creates a new tracking branch' ' + git checkout --track -b branch1 master && + test $(git rev-parse --abbrev-ref HEAD) = branch1 && + test $(git config --get branch.branch1.remote) = . && + test $(git config --get branch.branch1.merge) = refs/heads/master +' + +test_expect_success 'checkout --track -b rejects an extra path argument' ' + test_must_fail git checkout --track -b branch2 master one.t 2>err && + test_i18ngrep "cannot be used with updating paths" err +' + +test_done diff --git a/third_party/git/t/t2060-switch.sh b/third_party/git/t/t2060-switch.sh index f9efa29dfb..2c1b8c0d6d 100755 --- a/third_party/git/t/t2060-switch.sh +++ b/third_party/git/t/t2060-switch.sh @@ -68,6 +68,14 @@ test_expect_success 'new orphan branch from empty' ' test_cmp expected tracked-files ' +test_expect_success 'orphan branch works with --discard-changes' ' + test_when_finished git switch master && + echo foo >foo.txt && + git switch --discard-changes --orphan new-orphan2 && + git ls-files >tracked-files && + test_must_be_empty tracked-files +' + test_expect_success 'switching ignores file of same branch name' ' test_when_finished git switch master && : >first-branch && diff --git a/third_party/git/t/t2070-restore.sh b/third_party/git/t/t2070-restore.sh index 2650df1966..89e5a142c9 100755 --- a/third_party/git/t/t2070-restore.sh +++ b/third_party/git/t/t2070-restore.sh @@ -69,6 +69,17 @@ test_expect_success 'restore --staged uses HEAD as source' ' test_cmp expected actual ' +test_expect_success 'restore --worktree --staged uses HEAD as source' ' + test_when_finished git reset --hard && + git show HEAD:./first.t >expected && + echo dirty >>first.t && + git add first.t && + git restore --worktree --staged first.t && + git show :./first.t >actual && + test_cmp expected actual && + test_cmp expected first.t +' + test_expect_success 'restore --ignore-unmerged ignores unmerged entries' ' git init unmerged && ( @@ -95,4 +106,32 @@ 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 new file mode 100755 index 0000000000..b48345bf95 --- /dev/null +++ b/third_party/git/t/t2072-restore-pathspec-file.sh @@ -0,0 +1,177 @@ +#!/bin/sh + +test_description='restore --pathspec-from-file' + +. ./test-lib.sh + +test_tick + +test_expect_success setup ' + test_commit file0 && + + mkdir dir1 && + echo 1 >dir1/file && + echo 1 >fileA.t && + echo 1 >fileB.t && + echo 1 >fileC.t && + echo 1 >fileD.t && + git add dir1 fileA.t fileB.t fileC.t fileD.t && + git commit -m "files 1" && + + echo 2 >dir1/file && + echo 2 >fileA.t && + echo 2 >fileB.t && + echo 2 >fileC.t && + echo 2 >fileD.t && + git add dir1 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 -- dir1 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_expect_success 'wildcard pathspec matches file in subdirectory' ' + restore_checkpoint && + + echo "*file" | git restore --pathspec-from-file=- --source=HEAD^1 && + cat >expect <<-\EOF && + M dir1/file + EOF + verify_expect +' + +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 2242cd098e..a30b7ca6bc 100755 --- a/third_party/git/t/t2107-update-index-basic.sh +++ b/third_party/git/t/t2107-update-index-basic.sh @@ -9,7 +9,6 @@ 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/t2203-add-intent.sh b/third_party/git/t/t2203-add-intent.sh index 5bbe8dcce4..cf0175ad6e 100755 --- a/third_party/git/t/t2203-add-intent.sh +++ b/third_party/git/t/t2203-add-intent.sh @@ -232,17 +232,53 @@ test_expect_success 'double rename detection in status' ' ) ' -test_expect_success 'diff-files/diff-cached shows ita as new/not-new files' ' +test_expect_success 'i-t-a files shown as new for "diff", "diff-files"; not-new for "diff --cached"' ' git reset --hard && - echo new >new-ita && - git add -N new-ita && + : >empty && + content="foo" && + echo "$content" >not-empty && + + hash_e=$(git hash-object empty) && + hash_n=$(git hash-object not-empty) && + + cat >expect.diff_p <<-EOF && + diff --git a/empty b/empty + new file mode 100644 + index 0000000..$(git rev-parse --short $hash_e) + diff --git a/not-empty b/not-empty + new file mode 100644 + index 0000000..$(git rev-parse --short $hash_n) + --- /dev/null + +++ b/not-empty + @@ -0,0 +1 @@ + +$content + EOF + cat >expect.diff_s <<-EOF && + create mode 100644 empty + create mode 100644 not-empty + EOF + cat >expect.diff_a <<-EOF && + :000000 100644 0000000 0000000 A$(printf "\t")empty + :000000 100644 0000000 0000000 A$(printf "\t")not-empty + EOF + + git add -N empty not-empty && + + git diff >actual && + test_cmp expect.diff_p actual && + git diff --summary >actual && - echo " create mode 100644 new-ita" >expected && - test_cmp expected actual && - git diff --cached --summary >actual2 && - test_must_be_empty actual2 -' + test_cmp expect.diff_s actual && + + git diff-files -p >actual && + test_cmp expect.diff_p actual && + git diff-files --abbrev >actual && + test_cmp expect.diff_a actual && + + git diff --cached >actual && + test_must_be_empty actual +' test_expect_success '"diff HEAD" includes ita as new files' ' git reset --hard && diff --git a/third_party/git/t/t2400-worktree-add.sh b/third_party/git/t/t2400-worktree-add.sh index e819ba741e..5a7495474a 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,6 +570,15 @@ 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-.- @@ -587,4 +596,28 @@ 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/t2401-worktree-prune.sh b/third_party/git/t/t2401-worktree-prune.sh index b7d6d5d45a..a6ce7f590b 100755 --- a/third_party/git/t/t2401-worktree-prune.sh +++ b/third_party/git/t/t2401-worktree-prune.sh @@ -92,4 +92,28 @@ test_expect_success 'not prune proper checkouts' ' test -d .git/worktrees/nop ' +test_expect_success 'prune duplicate (linked/linked)' ' + test_when_finished rm -fr .git/worktrees w1 w2 && + git worktree add --detach w1 && + git worktree add --detach w2 && + sed "s/w2/w1/" .git/worktrees/w2/gitdir >.git/worktrees/w2/gitdir.new && + mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir && + git worktree prune --verbose >actual && + test_i18ngrep "duplicate entry" actual && + test -d .git/worktrees/w1 && + ! test -d .git/worktrees/w2 +' + +test_expect_success 'prune duplicate (main/linked)' ' + test_when_finished rm -fr repo wt && + test_create_repo repo && + test_commit -C repo x && + git -C repo worktree add --detach ../wt && + rm -fr wt && + mv repo wt && + git -C wt worktree prune --verbose >actual && + test_i18ngrep "duplicate entry" actual && + ! test -d .git/worktrees/wt +' + test_done diff --git a/third_party/git/t/t2402-worktree-list.sh b/third_party/git/t/t2402-worktree-list.sh index bb6fb9b12c..52585ec2aa 100755 --- a/third_party/git/t/t2402-worktree-list.sh +++ b/third_party/git/t/t2402-worktree-list.sh @@ -151,4 +151,10 @@ 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/t2403-worktree-move.sh b/third_party/git/t/t2403-worktree-move.sh index 939d18d728..a4e1a178e0 100755 --- a/third_party/git/t/t2403-worktree-move.sh +++ b/third_party/git/t/t2403-worktree-move.sh @@ -112,6 +112,27 @@ test_expect_success 'move locked worktree (force)' ' git worktree move --force --force flump ploof ' +test_expect_success 'refuse to move worktree atop existing path' ' + >bobble && + git worktree add --detach beeble && + test_must_fail git worktree move beeble bobble +' + +test_expect_success 'move atop existing but missing worktree' ' + git worktree add --detach gnoo && + git worktree add --detach pneu && + rm -fr pneu && + test_must_fail git worktree move gnoo pneu && + git worktree move --force gnoo pneu && + + git worktree add --detach nu && + git worktree lock nu && + rm -fr nu && + test_must_fail git worktree move pneu nu && + test_must_fail git worktree --force move pneu nu && + git worktree move --force --force pneu nu +' + test_expect_success 'move a repo with uninitialized submodule' ' git init withsub && ( diff --git a/third_party/git/t/t2404-worktree-config.sh b/third_party/git/t/t2404-worktree-config.sh index 286121d8de..9536d10919 100755 --- a/third_party/git/t/t2404-worktree-config.sh +++ b/third_party/git/t/t2404-worktree-config.sh @@ -23,8 +23,10 @@ test_expect_success 'config --worktree without extension' ' ' test_expect_success 'enable worktreeConfig extension' ' + git config core.repositoryformatversion 1 && git config extensions.worktreeConfig true && - test_cmp_config true extensions.worktreeConfig + test_cmp_config true extensions.worktreeConfig && + test_cmp_config 1 core.repositoryformatversion ' test_expect_success 'config is shared as before' ' diff --git a/third_party/git/t/t2405-worktree-submodule.sh b/third_party/git/t/t2405-worktree-submodule.sh new file mode 100755 index 0000000000..e1b2bfd87e --- /dev/null +++ b/third_party/git/t/t2405-worktree-submodule.sh @@ -0,0 +1,90 @@ +#!/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/t2406-worktree-repair.sh b/third_party/git/t/t2406-worktree-repair.sh new file mode 100755 index 0000000000..1fe468bfe8 --- /dev/null +++ b/third_party/git/t/t2406-worktree-repair.sh @@ -0,0 +1,179 @@ +#!/bin/sh + +test_description='test git worktree repair' + +. ./test-lib.sh + +test_expect_success setup ' + test_commit init +' + +test_expect_success 'skip missing worktree' ' + test_when_finished "git worktree prune" && + git worktree add --detach missing && + rm -rf missing && + git worktree repair >out 2>err && + test_must_be_empty out && + test_must_be_empty err +' + +test_expect_success 'worktree path not directory' ' + test_when_finished "git worktree prune" && + git worktree add --detach notdir && + rm -rf notdir && + >notdir && + test_must_fail git worktree repair >out 2>err && + test_must_be_empty out && + test_i18ngrep "not a directory" err +' + +test_expect_success "don't clobber .git repo" ' + test_when_finished "rm -rf repo && git worktree prune" && + git worktree add --detach repo && + rm -rf repo && + test_create_repo repo && + test_must_fail git worktree repair >out 2>err && + test_must_be_empty out && + test_i18ngrep ".git is not a file" err +' + +test_corrupt_gitfile () { + butcher=$1 && + problem=$2 && + repairdir=${3:-.} && + test_when_finished 'rm -rf corrupt && git worktree prune' && + git worktree add --detach corrupt && + git -C corrupt rev-parse --absolute-git-dir >expect && + eval "$butcher" && + git -C "$repairdir" worktree repair >out 2>err && + test_i18ngrep "$problem" out && + test_must_be_empty err && + git -C corrupt rev-parse --absolute-git-dir >actual && + test_cmp expect actual +} + +test_expect_success 'repair missing .git file' ' + test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" +' + +test_expect_success 'repair bogus .git file' ' + test_corrupt_gitfile "echo \"gitdir: /nowhere\" >corrupt/.git" \ + ".git file broken" +' + +test_expect_success 'repair incorrect .git file' ' + test_when_finished "rm -rf other && git worktree prune" && + test_create_repo other && + other=$(git -C other rev-parse --absolute-git-dir) && + test_corrupt_gitfile "echo \"gitdir: $other\" >corrupt/.git" \ + ".git file incorrect" +' + +test_expect_success 'repair .git file from main/.git' ' + test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" .git +' + +test_expect_success 'repair .git file from linked worktree' ' + test_when_finished "rm -rf other && git worktree prune" && + git worktree add --detach other && + test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" other +' + +test_expect_success 'repair .git file from bare.git' ' + test_when_finished "rm -rf bare.git corrupt && git worktree prune" && + git clone --bare . bare.git && + git -C bare.git worktree add --detach ../corrupt && + git -C corrupt rev-parse --absolute-git-dir >expect && + rm -f corrupt/.git && + git -C bare.git worktree repair && + git -C corrupt rev-parse --absolute-git-dir >actual && + test_cmp expect actual +' + +test_expect_success 'invalid worktree path' ' + test_must_fail git worktree repair /notvalid >out 2>err && + test_must_be_empty out && + test_i18ngrep "not a valid path" err +' + +test_expect_success 'repo not found; .git not file' ' + test_when_finished "rm -rf not-a-worktree" && + test_create_repo not-a-worktree && + test_must_fail git worktree repair not-a-worktree >out 2>err && + test_must_be_empty out && + test_i18ngrep ".git is not a file" err +' + +test_expect_success 'repo not found; .git file broken' ' + test_when_finished "rm -rf orig moved && git worktree prune" && + git worktree add --detach orig && + echo /invalid >orig/.git && + mv orig moved && + test_must_fail git worktree repair moved >out 2>err && + test_must_be_empty out && + test_i18ngrep ".git file broken" err +' + +test_expect_success 'repair broken gitdir' ' + test_when_finished "rm -rf orig moved && git worktree prune" && + git worktree add --detach orig && + sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect && + rm .git/worktrees/orig/gitdir && + mv orig moved && + git worktree repair moved >out 2>err && + test_cmp expect .git/worktrees/orig/gitdir && + test_i18ngrep "gitdir unreadable" out && + test_must_be_empty err +' + +test_expect_success 'repair incorrect gitdir' ' + test_when_finished "rm -rf orig moved && git worktree prune" && + git worktree add --detach orig && + sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect && + mv orig moved && + git worktree repair moved >out 2>err && + test_cmp expect .git/worktrees/orig/gitdir && + test_i18ngrep "gitdir incorrect" out && + test_must_be_empty err +' + +test_expect_success 'repair gitdir (implicit) from linked worktree' ' + test_when_finished "rm -rf orig moved && git worktree prune" && + git worktree add --detach orig && + sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect && + mv orig moved && + git -C moved worktree repair >out 2>err && + test_cmp expect .git/worktrees/orig/gitdir && + test_i18ngrep "gitdir incorrect" out && + test_must_be_empty err +' + +test_expect_success 'unable to repair gitdir (implicit) from main worktree' ' + test_when_finished "rm -rf orig moved && git worktree prune" && + git worktree add --detach orig && + cat .git/worktrees/orig/gitdir >expect && + mv orig moved && + git worktree repair >out 2>err && + test_cmp expect .git/worktrees/orig/gitdir && + test_must_be_empty out && + test_must_be_empty err +' + +test_expect_success 'repair multiple gitdir files' ' + test_when_finished "rm -rf orig1 orig2 moved1 moved2 && + git worktree prune" && + git worktree add --detach orig1 && + git worktree add --detach orig2 && + sed s,orig1/\.git$,moved1/.git, .git/worktrees/orig1/gitdir >expect1 && + sed s,orig2/\.git$,moved2/.git, .git/worktrees/orig2/gitdir >expect2 && + mv orig1 moved1 && + mv orig2 moved2 && + git worktree repair moved1 moved2 >out 2>err && + test_cmp expect1 .git/worktrees/orig1/gitdir && + test_cmp expect2 .git/worktrees/orig2/gitdir && + test_i18ngrep "gitdir incorrect:.*orig1/gitdir$" out && + test_i18ngrep "gitdir incorrect:.*orig2/gitdir$" out && + test_must_be_empty err +' + +test_done diff --git a/third_party/git/t/t3000-ls-files-others.sh b/third_party/git/t/t3000-ls-files-others.sh index 0aefadacb0..740ce56eab 100755 --- a/third_party/git/t/t3000-ls-files-others.sh +++ b/third_party/git/t/t3000-ls-files-others.sh @@ -91,4 +91,141 @@ test_expect_success SYMLINKS 'ls-files --others with symlinked submodule' ' test_cmp expect actual ' +test_expect_success 'setup nested pathspec search' ' + test_create_repo nested && + ( + cd nested && + + mkdir -p partially_tracked/untracked_dir && + > partially_tracked/content && + > partially_tracked/untracked_dir/file && + + mkdir -p untracked/deep && + > untracked/deep/path && + > untracked/deep/foo.c && + + git add partially_tracked/content + ) +' + +test_expect_success 'ls-files -o --directory with single deep dir pathspec' ' + ( + cd nested && + + git ls-files -o --directory untracked/deep/ >actual && + + cat <<-EOF >expect && + untracked/deep/ + EOF + + test_cmp expect actual + ) +' + +test_expect_success 'ls-files -o --directory with multiple dir pathspecs' ' + ( + cd nested && + + git ls-files -o --directory partially_tracked/ untracked/ >actual && + + cat <<-EOF >expect && + partially_tracked/untracked_dir/ + untracked/ + EOF + + test_cmp expect actual + ) +' + +test_expect_success 'ls-files -o --directory with mix dir/file pathspecs' ' + ( + cd nested && + + git ls-files -o --directory partially_tracked/ untracked/deep/path >actual && + + cat <<-EOF >expect && + partially_tracked/untracked_dir/ + untracked/deep/path + EOF + + test_cmp expect actual + ) +' + +test_expect_success 'ls-files -o --directory with glob filetype match' ' + ( + cd nested && + + # globs kinda defeat --directory, but only for that pathspec + git ls-files --others --directory partially_tracked "untracked/*.c" >actual && + + cat <<-EOF >expect && + partially_tracked/untracked_dir/ + untracked/deep/foo.c + EOF + + test_cmp expect actual + ) +' + +test_expect_success 'ls-files -o --directory with mix of tracked states' ' + ( + cd nested && + + # globs kinda defeat --directory, but only for that pathspec + git ls-files --others --directory partially_tracked/ "untracked/?*" >actual && + + cat <<-EOF >expect && + partially_tracked/untracked_dir/ + untracked/deep/ + EOF + + test_cmp expect actual + ) +' + +test_expect_success 'ls-files -o --directory with glob filetype match only' ' + ( + cd nested && + + git ls-files --others --directory "untracked/*.c" >actual && + + cat <<-EOF >expect && + untracked/deep/foo.c + EOF + + test_cmp expect actual + ) +' + +test_expect_success 'ls-files -o --directory to get immediate paths under one dir only' ' + ( + cd nested && + + git ls-files --others --directory "untracked/?*" >actual && + + cat <<-EOF >expect && + untracked/deep/ + EOF + + test_cmp expect actual + ) +' + +test_expect_success 'ls-files -o avoids listing untracked non-matching gitdir' ' + test_when_finished "rm -rf nested/untracked/deep/empty" && + ( + cd nested && + + git init untracked/deep/empty && + git ls-files --others "untracked/*.c" >actual && + + cat <<-EOF >expect && + untracked/deep/foo.c + EOF + + test_cmp expect actual + ) +' + 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 209b4c7cd8..2ec69a8a26 100755 --- a/third_party/git/t/t3005-ls-files-relative.sh +++ b/third_party/git/t/t3005-ls-files-relative.sh @@ -7,10 +7,6 @@ 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 && @@ -44,9 +40,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 && @@ -59,9 +55,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 318b5bce7e..4a08000713 100755 --- a/third_party/git/t/t3007-ls-files-recurse-submodules.sh +++ b/third_party/git/t/t3007-ls-files-recurse-submodules.sh @@ -130,7 +130,6 @@ 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 64f047332b..85f3704958 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 $($GIT_BUILD_DIR/t/helper/test-tool online-cpus) +if test 1 -eq $(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 new file mode 100755 index 0000000000..3da5b2b6e7 --- /dev/null +++ b/third_party/git/t/t3011-common-prefixes-and-directory-traversal.sh @@ -0,0 +1,209 @@ +#!/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/t3060-ls-files-with-tree.sh b/third_party/git/t/t3060-ls-files-with-tree.sh index 44f378ce41..52ed665fcd 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/t3200-branch.sh b/third_party/git/t/t3200-branch.sh index 411a70b0ce..6efe7a44bc 100755 --- a/third_party/git/t/t3200-branch.sh +++ b/third_party/git/t/t3200-branch.sh @@ -234,10 +234,10 @@ test_expect_success 'git branch -M master master should work when master is chec git branch -M master master ' -test_expect_success 'git branch -M master2 master2 should work when master is checked out' ' +test_expect_success 'git branch -M topic topic should work when master is checked out' ' git checkout master && - git branch master2 && - git branch -M master2 master2 + git branch topic && + git branch -M topic topic ' test_expect_success 'git branch -v -d t should work' ' @@ -323,11 +323,11 @@ test_expect_success 'git branch --list -v with --abbrev' ' test_expect_success 'git branch --column' ' COLUMNS=81 git branch --column=column >actual && - cat >expected <<\EOF && - a/b/c bam foo l * master mb o/o q - abc bar j/k m/m master2 n o/p r + cat >expect <<\EOF && + a/b/c bam foo l * master n o/p r + abc bar j/k m/m mb o/o q topic EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'git branch --column with an extremely long branch name' ' @@ -336,7 +336,7 @@ test_expect_success 'git branch --column with an extremely long branch name' ' test_when_finished "git branch -d $long" && git branch $long && COLUMNS=80 git branch --column=column >actual && - cat >expected <<EOF && + cat >expect <<EOF && a/b/c abc bam @@ -346,16 +346,16 @@ test_expect_success 'git branch --column with an extremely long branch name' ' l m/m * master - master2 mb n o/o o/p q r + topic $long EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'git branch with column.*' ' @@ -364,11 +364,11 @@ test_expect_success 'git branch with column.*' ' COLUMNS=80 git branch >actual && git config --unset column.branch && git config --unset column.ui && - cat >expected <<\EOF && - a/b/c bam foo l * master mb o/o q - abc bar j/k m/m master2 n o/p r + cat >expect <<\EOF && + a/b/c bam foo l * master n o/p r + abc bar j/k m/m mb o/o q topic EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'git branch --column -v should fail' ' @@ -377,9 +377,9 @@ test_expect_success 'git branch --column -v should fail' ' test_expect_success 'git branch -v with column.ui ignored' ' git config column.ui column && - COLUMNS=80 git branch -v | cut -c -10 | sed "s/ *$//" >actual && + COLUMNS=80 git branch -v | cut -c -9 | sed "s/ *$//" >actual && git config --unset column.ui && - cat >expected <<\EOF && + cat >expect <<\EOF && a/b/c abc bam @@ -389,20 +389,20 @@ test_expect_success 'git branch -v with column.ui ignored' ' l m/m * master - master2 mb n o/o o/p q r + topic EOF - test_cmp expected actual + test_cmp expect actual ' mv .git/config .git/config-saved -test_expect_success 'git branch -m q q2 without config should succeed' ' +test_expect_success SHA1 'git branch -m q q2 without config should succeed' ' git branch -m q q2 && git branch -m q2 q ' @@ -597,10 +597,10 @@ test_expect_success 'git branch -C master master should work when master is chec git branch -C master master ' -test_expect_success 'git branch -C master5 master5 should work when master is checked out' ' +test_expect_success 'git branch -C main5 main5 should work when master is checked out' ' git checkout master && - git branch master5 && - git branch -C master5 master5 + git branch main5 && + git branch -C main5 main5 ' test_expect_success 'git branch -C ab cd should overwrite existing config for cd' ' @@ -711,11 +711,11 @@ test_expect_success 'deleting a self-referential symref' ' ' test_expect_success 'renaming a symref is not allowed' ' - git symbolic-ref refs/heads/master2 refs/heads/master && - test_must_fail git branch -m master2 master3 && - git symbolic-ref refs/heads/master2 && + git symbolic-ref refs/heads/topic refs/heads/master && + test_must_fail git branch -m topic new-topic && + git symbolic-ref refs/heads/topic && test_path_is_file .git/refs/heads/master && - test_path_is_missing .git/refs/heads/master3 + test_path_is_missing .git/refs/heads/new-topic ' test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' ' @@ -835,32 +835,42 @@ test_expect_success 'branch from tag w/--track causes failure' ' ' test_expect_success '--set-upstream-to fails on multiple branches' ' - test_must_fail git branch --set-upstream-to master a b c + echo "fatal: too many arguments to set new upstream" >expect && + test_must_fail git branch --set-upstream-to master a b c 2>err && + test_i18ncmp expect err ' test_expect_success '--set-upstream-to fails on detached HEAD' ' git checkout HEAD^{} && - test_must_fail git branch --set-upstream-to master && - git checkout - + test_when_finished git checkout - && + echo "fatal: could not set upstream of HEAD to master when it does not point to any branch." >expect && + test_must_fail git branch --set-upstream-to master 2>err && + test_i18ncmp expect err ' test_expect_success '--set-upstream-to fails on a missing dst branch' ' - test_must_fail git branch --set-upstream-to master does-not-exist + echo "fatal: branch '"'"'does-not-exist'"'"' does not exist" >expect && + test_must_fail git branch --set-upstream-to master does-not-exist 2>err && + test_i18ncmp expect err ' test_expect_success '--set-upstream-to fails on a missing src branch' ' - test_must_fail git branch --set-upstream-to does-not-exist master + test_must_fail git branch --set-upstream-to does-not-exist master 2>err && + test_i18ngrep "the requested upstream branch '"'"'does-not-exist'"'"' does not exist" err ' test_expect_success '--set-upstream-to fails on a non-ref' ' - test_must_fail git branch --set-upstream-to HEAD^{} + echo "fatal: Cannot setup tracking information; starting point '"'"'HEAD^{}'"'"' is not a branch." >expect && + test_must_fail git branch --set-upstream-to HEAD^{} 2>err && + test_i18ncmp expect err ' test_expect_success '--set-upstream-to fails on locked config' ' test_when_finished "rm -f .git/config.lock" && >.git/config.lock && git branch locked && - test_must_fail git branch --set-upstream-to locked + test_must_fail git branch --set-upstream-to locked 2>err && + test_i18ngrep "could not lock config file .git/config" err ' test_expect_success 'use --set-upstream-to modify HEAD' ' @@ -881,14 +891,17 @@ test_expect_success 'use --set-upstream-to modify a particular branch' ' ' test_expect_success '--unset-upstream should fail if given a non-existent branch' ' - test_must_fail git branch --unset-upstream i-dont-exist + echo "fatal: Branch '"'"'i-dont-exist'"'"' has no upstream information" >expect && + test_must_fail git branch --unset-upstream i-dont-exist 2>err && + test_i18ncmp expect err ' test_expect_success '--unset-upstream should fail if config is locked' ' test_when_finished "rm -f .git/config.lock" && git branch --set-upstream-to locked && >.git/config.lock && - test_must_fail git branch --unset-upstream + test_must_fail git branch --unset-upstream 2>err && + test_i18ngrep "could not lock config file .git/config" err ' test_expect_success 'test --unset-upstream on HEAD' ' @@ -900,17 +913,23 @@ test_expect_success 'test --unset-upstream on HEAD' ' test_must_fail git config branch.master.remote && test_must_fail git config branch.master.merge && # fail for a branch without upstream set - test_must_fail git branch --unset-upstream + echo "fatal: Branch '"'"'master'"'"' has no upstream information" >expect && + test_must_fail git branch --unset-upstream 2>err && + test_i18ncmp expect err ' test_expect_success '--unset-upstream should fail on multiple branches' ' - test_must_fail git branch --unset-upstream a b c + echo "fatal: too many arguments to unset upstream" >expect && + test_must_fail git branch --unset-upstream a b c 2>err && + test_i18ncmp expect err ' test_expect_success '--unset-upstream should fail on detached HEAD' ' git checkout HEAD^{} && - test_must_fail git branch --unset-upstream && - git checkout - + test_when_finished git checkout - && + echo "fatal: could not unset upstream of HEAD when it does not point to any branch." >expect && + test_must_fail git branch --unset-upstream 2>err && + test_i18ncmp expect err ' test_expect_success 'test --unset-upstream on a particular branch' ' @@ -922,17 +941,17 @@ test_expect_success 'test --unset-upstream on a particular branch' ' ' test_expect_success 'disabled option --set-upstream fails' ' - test_must_fail git branch --set-upstream origin/master + test_must_fail git branch --set-upstream origin/master ' test_expect_success '--set-upstream-to notices an error to set branch as own upstream' ' git branch --set-upstream-to refs/heads/my13 my13 2>actual && - cat >expected <<-\EOF && + cat >expect <<-\EOF && warning: Not setting branch my13 as its own upstream. EOF test_expect_code 1 git config branch.my13.remote && test_expect_code 1 git config branch.my13.merge && - test_i18ncmp expected actual + test_i18ncmp expect actual ' # Keep this test last, as it changes the current branch @@ -1268,6 +1287,7 @@ test_expect_success 'detect typo in branch name when using --edit-description' ' ' test_expect_success 'refuse --edit-description on unborn branch for now' ' + test_when_finished "git checkout master" && write_script editor <<-\EOF && echo "New contents" >"$1" EOF @@ -1279,10 +1299,6 @@ test_expect_success '--merged catches invalid object names' ' test_must_fail git branch --merged 0000000000000000000000000000000000000000 ' -test_expect_success '--merged is incompatible with --no-merged' ' - test_must_fail git branch --merged HEAD --no-merged HEAD -' - test_expect_success '--list during rebase' ' test_when_finished "reset_rebase" && git checkout master && diff --git a/third_party/git/t/t3201-branch-contains.sh b/third_party/git/t/t3201-branch-contains.sh index 0ea4fc4694..efea5c4971 100755 --- a/third_party/git/t/t3201-branch-contains.sh +++ b/third_party/git/t/t3201-branch-contains.sh @@ -171,6 +171,69 @@ test_expect_success 'Assert that --contains only works on commits, not trees & b test_must_fail git branch --no-contains $blob ' +test_expect_success 'multiple branch --contains' ' + git checkout -b side2 master && + >feature && + git add feature && + git commit -m "add feature" && + git checkout -b next master && + git merge side && + git branch --contains side --contains side2 >actual && + cat >expect <<-\EOF && + * next + side + side2 + EOF + test_cmp expect actual +' + +test_expect_success 'multiple branch --merged' ' + git branch --merged next --merged master >actual && + cat >expect <<-\EOF && + master + * next + side + EOF + test_cmp expect actual +' + +test_expect_success 'multiple branch --no-contains' ' + git branch --no-contains side --no-contains side2 >actual && + cat >expect <<-\EOF && + master + EOF + test_cmp expect actual +' + +test_expect_success 'multiple branch --no-merged' ' + git branch --no-merged next --no-merged master >actual && + cat >expect <<-\EOF && + side2 + EOF + test_cmp expect actual +' + +test_expect_success 'branch --contains combined with --no-contains' ' + git checkout -b seen master && + git merge side && + git merge side2 && + git branch --contains side --no-contains side2 >actual && + cat >expect <<-\EOF && + next + side + EOF + test_cmp expect actual +' + +test_expect_success 'branch --merged combined with --no-merged' ' + git branch --merged seen --no-merged next >actual && + cat >expect <<-\EOF && + * seen + side2 + EOF + test_cmp expect actual +' + # We want to set up a case where the walk for the tracking info # of one branch crosses the tip of another branch (and make sure # that the latter walk does not mess up our flag to see if it was @@ -192,23 +255,12 @@ test_expect_success 'branch --merged with --verbose' ' EOF test_cmp expect actual && git branch --verbose --merged topic >actual && - cat >expect <<-\EOF && - master c77a0a9 second on master - * topic 2c939f4 [ahead 1] foo - zzz c77a0a9 second on master + 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 EOF test_i18ncmp expect actual ' -test_expect_success 'branch --contains combined with --no-contains' ' - git branch --contains zzz --no-contains topic >actual && - cat >expect <<-\EOF && - master - side - zzz - EOF - test_cmp expect actual - -' - test_done diff --git a/third_party/git/t/t3206-range-diff.sh b/third_party/git/t/t3206-range-diff.sh index ec548654ce..6eb344be03 100755 --- a/third_party/git/t/t3206-range-diff.sh +++ b/third_party/git/t/t3206-range-diff.sh @@ -8,97 +8,212 @@ 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 + 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 ' test_expect_success 'simple A..B A..C (unmodified)' ' git range-diff --no-color master..topic master..unmodified \ >actual && - 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/ + 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 expected actual + test_cmp expect actual ' test_expect_success 'simple B...C (unmodified)' ' git range-diff --no-color topic...unmodified >actual && - # same "expected" as above - test_cmp expected actual + # same "expect" as above + test_cmp expect actual ' test_expect_success 'simple A B C (unmodified)' ' git range-diff --no-color master topic unmodified >actual && - # same "expected" as above - test_cmp expected actual + # same "expect" as above + test_cmp expect actual ' test_expect_success 'trivial reordering' ' git range-diff --no-color master topic reordered >actual && - 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/ + 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/ EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'removed a commit' ' git range-diff --no-color master topic removed >actual && - 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/ + 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/ EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'added a commit' ' git range-diff --no-color master topic added >actual && - 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/ + 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/ EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'new base, A B C' ' git range-diff --no-color master topic rebased >actual && - 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/ + 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/ EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'new base, B...C' ' # this syntax includes the commits from master! git range-diff --no-color topic...rebased >actual && - 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/ + 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/ EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'changed commit' ' git range-diff --no-color topic...changed >actual && - cat >expected <<-EOF && - 1: 4de457d = 1: a4b3333 s/5/A/ - 2: fccce22 = 2: f51d370 s/4/A/ - 3: 147e64e ! 3: 0559556 s/11/B/ + 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/ @@ file: A 9 10 @@ -108,7 +223,7 @@ test_expect_success 'changed commit' ' 12 13 14 - 4: a63e992 ! 4: d966c5c s/12/B/ + 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ @@ file @@ file: A 9 @@ -119,45 +234,41 @@ test_expect_success 'changed commit' ' +B 13 EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'changed commit with --no-patch diff option' ' git range-diff --no-color --no-patch topic...changed >actual && - 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/ + 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/ EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'changed commit with --stat diff option' ' git range-diff --no-color --stat topic...changed >actual && - cat >expected <<-EOF && - 1: 4de457d = 1: a4b3333 s/5/A/ - a => b | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - 2: fccce22 = 2: f51d370 s/4/A/ - a => b | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - 3: 147e64e ! 3: 0559556 s/11/B/ - a => b | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - 4: a63e992 ! 4: d966c5c s/12/B/ - a => b | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) + 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/ + a => b | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ + a => b | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'changed commit with sm config' ' git range-diff --no-color --submodule=log topic...changed >actual && - cat >expected <<-EOF && - 1: 4de457d = 1: a4b3333 s/5/A/ - 2: fccce22 = 2: f51d370 s/4/A/ - 3: 147e64e ! 3: 0559556 s/11/B/ + 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/ @@ file: A 9 10 @@ -167,7 +278,7 @@ test_expect_success 'changed commit with sm config' ' 12 13 14 - 4: a63e992 ! 4: d966c5c s/12/B/ + 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ @@ file @@ file: A 9 @@ -178,14 +289,14 @@ test_expect_success 'changed commit with sm config' ' +B 13 EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'renamed file' ' git range-diff --no-color --submodule=log topic...renamed-file >actual && - sed s/Z/\ /g >expected <<-EOF && - 1: 4de457d = 1: f258d75 s/5/A/ - 2: fccce22 ! 2: 017b62d s/4/A/ + 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/ @@ Metadata ZAuthor: Thomas Rast <trast@inf.ethz.ch> Z @@ -198,7 +309,7 @@ test_expect_success 'renamed file' ' Z@@ Z 1 Z 2 - 3: 147e64e ! 3: 3ce7af6 s/11/B/ + 3: $(test_oid t3) ! 3: $(test_oid n3) s/11/B/ @@ Metadata Z ## Commit message ## Z s/11/B/ @@ -210,7 +321,7 @@ test_expect_success 'renamed file' ' Z 8 Z 9 Z 10 - 4: a63e992 ! 4: 1e6226b s/12/B/ + 4: $(test_oid t4) ! 4: $(test_oid n4) s/12/B/ @@ Metadata Z ## Commit message ## Z s/12/B/ @@ -223,14 +334,54 @@ test_expect_success 'renamed file' ' Z 10 Z B EOF - test_cmp expected actual + 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_expect_success 'file added and later removed' ' git range-diff --no-color --submodule=log topic...added-removed >actual && - sed s/Z/\ /g >expected <<-EOF && - 1: 4de457d = 1: 096b1ba s/5/A/ - 2: fccce22 ! 2: d92e698 s/4/A/ + 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/ @@ Metadata ZAuthor: Thomas Rast <trast@inf.ethz.ch> Z @@ -246,7 +397,7 @@ test_expect_success 'file added and later removed' ' Z 7 + + ## new-file (new) ## - 3: 147e64e ! 3: 9a1db4d s/11/B/ + 3: $(test_oid t3) ! 3: $(test_oid s3) s/11/B/ @@ Metadata ZAuthor: Thomas Rast <trast@inf.ethz.ch> Z @@ -262,9 +413,9 @@ test_expect_success 'file added and later removed' ' Z 14 + + ## new-file (deleted) ## - 4: a63e992 = 4: fea3b5c s/12/B/ + 4: $(test_oid t4) = 4: $(test_oid s4) s/12/B/ EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'no commits on one side' ' @@ -274,9 +425,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 >expected <<-EOF && - 1: 4de457d = 1: f686024 s/5/A/ - 2: fccce22 ! 2: 4ab067d s/4/A/ + 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/ @@ Metadata Z ## Commit message ## Z s/4/A/ @@ -286,16 +437,16 @@ test_expect_success 'changed message' ' Z ## file ## Z@@ Z 1 - 3: 147e64e = 3: b9cb956 s/11/B/ - 4: a63e992 = 4: 8add5f1 s/12/B/ + 3: $(test_oid t3) = 3: $(test_oid m3) s/11/B/ + 4: $(test_oid t4) = 4: $(test_oid m4) s/12/B/ EOF - test_cmp expected actual + test_cmp expect actual ' test_expect_success 'dual-coloring' ' - 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> + 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> : <REVERSE><CYAN>@@<RESET> <RESET>Metadata<RESET> : ## Commit message ##<RESET> : s/4/A/<RESET> @@ -305,7 +456,7 @@ test_expect_success 'dual-coloring' ' : ## file ##<RESET> : <CYAN> @@<RESET> : 1<RESET> - :<RED>3: 0559556 <RESET><YELLOW>!<RESET><GREEN> 3: b9cb956<RESET><YELLOW> s/11/B/<RESET> + :<RED>3: $(test_oid c3) <RESET><YELLOW>!<RESET><GREEN> 3: $(test_oid m3)<RESET><YELLOW> s/11/B/<RESET> : <REVERSE><CYAN>@@<RESET> <RESET>file: A<RESET> : 9<RESET> : 10<RESET> @@ -315,7 +466,7 @@ test_expect_success 'dual-coloring' ' : 12<RESET> : 13<RESET> : 14<RESET> - :<RED>4: d966c5c <RESET><YELLOW>!<RESET><GREEN> 4: 8add5f1<RESET><YELLOW> s/12/B/<RESET> + :<RED>4: $(test_oid c4) <RESET><YELLOW>!<RESET><GREEN> 4: $(test_oid m4)<RESET><YELLOW> s/12/B/<RESET> : <REVERSE><CYAN>@@<RESET> <RESET>file<RESET> : <CYAN> @@ file: A<RESET> : 9<RESET> @@ -354,4 +505,216 @@ 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 'basic with modified format.pretty with suffix' ' + git -c format.pretty="format:commit %H%d%n" range-diff \ + master..topic master..unmodified +' + +test_expect_success 'basic with modified format.pretty without "commit "' ' + git -c format.pretty="format:%H%n" range-diff \ + master..topic master..unmodified +' + +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 7bb3814962..4c808e5b3b 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/topic +commit refs/heads/mode-only-change mark :4 author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200 committer Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200 @@ -678,3 +678,32 @@ 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 9ea5fa4fd2..f41b2afb99 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/loosy refs/heads/master && + git update-ref refs/heads/lossy 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 704bbc6541..8f43303007 100755 --- a/third_party/git/t/t3301-notes.sh +++ b/third_party/git/t/t3301-notes.sh @@ -54,7 +54,9 @@ 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 && - test "b4" = "$(git notes show)" && + echo b4 >expect && + git notes show >actual && + test_cmp expect actual && git show HEAD^ && test_must_fail git notes show HEAD^ ' @@ -66,8 +68,9 @@ 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 && - a1d8fa6 refs/notes/commits@{0}: notes: Notes added by '\''git notes add'\'' + $ref refs/notes/commits@{0}: notes: Notes added by '\''git notes add'\'' EOF git reflog show refs/notes/commits >actual && test_cmp expect actual @@ -78,14 +81,21 @@ 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 && - test "b3" = "$(git notes show)" && + echo b3 >expect && + git notes show >actual && + test_cmp expect actual && git show HEAD^ && test_must_fail git notes show HEAD^ ' test_expect_success 'show notes from treeish' ' - test "b3" = "$(git notes --ref commits^{tree} show)" && - test "b4" = "$(git notes --ref commits@{1} show)" + 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_expect_success 'cannot edit notes from non-ref' ' @@ -98,7 +108,9 @@ 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 && - test "b3" = "$(git notes show)" && + echo b3 >expect && + git notes show >actual && + test_cmp expect actual && git show HEAD^ && test_must_fail git notes show HEAD^ ' @@ -108,7 +120,9 @@ 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 && - test "b1" = "$(git notes show)" && + echo b1 >expect && + git notes show >actual && + test_cmp expect actual && git show HEAD^ && test_must_fail git notes show HEAD^ ' @@ -118,7 +132,9 @@ 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 && - test "b2" = "$(git notes show)" && + echo b2 >expect && + git notes show >actual && + test_cmp expect actual && git show HEAD^ && test_must_fail git notes show HEAD^ ' @@ -128,14 +144,17 @@ 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 && - test "b1" = "$(git notes show)" && + echo b1 >expect && + git notes show >actual && + test_cmp expect actual && git show HEAD^ && test_must_fail git notes show HEAD^ ' test_expect_success 'show notes' ' + commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit 7a4ca6ee52a974a66cbaa78e33214535dff1d691 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:14:13 2005 -0700 @@ -144,7 +163,8 @@ test_expect_success 'show notes' ' Notes: ${indent}b1 EOF - ! (git cat-file commit HEAD | grep b1) && + git cat-file commit HEAD >commits && + ! grep b1 commits && git log -1 >actual && test_cmp expect actual ' @@ -152,8 +172,9 @@ 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 d07d62e5208f22eb5695e7eb47667dc8b9860290 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:15:13 2005 -0700 @@ -174,8 +195,9 @@ 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 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:16:13 2005 -0700 @@ -198,10 +220,13 @@ 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 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 - tree 05ac65288c4c4b3b709a020ae94b2ece2f2201ae - parent d07d62e5208f22eb5695e7eb47667dc8b9860290 + commit $commit + tree $tree + parent $parent author A U Thor <author@example.com> 1112912173 -0700 committer C O Mitter <committer@example.com> 1112912173 -0700 @@ -291,8 +316,9 @@ 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 7f9ad8836c775acb134c0a055fc55fb4cd1ba361 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:17:13 2005 -0700 @@ -313,8 +339,9 @@ 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 7f9ad8836c775acb134c0a055fc55fb4cd1ba361 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:17:13 2005 -0700 @@ -356,14 +383,16 @@ 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 7f9ad8836c775acb134c0a055fc55fb4cd1ba361 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:17:13 2005 -0700 ${indent}5th - commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 + commit $parent Author: A U Thor <author@example.com> Date: Thu Apr 7 15:16:13 2005 -0700 @@ -459,9 +488,13 @@ test_expect_success 'removing with --stdin --ignore-missing' ' ' test_expect_success 'list notes with "git notes list"' ' - cat >expect <<-EOF && - c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 7a4ca6ee52a974a66cbaa78e33214535dff1d691 - c18dc024e14f08d18d14eea0d747ff692d66d6a3 d07d62e5208f22eb5695e7eb47667dc8b9860290 + 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 EOF git notes list >actual && test_cmp expect actual @@ -473,9 +506,7 @@ test_expect_success 'list notes with "git notes"' ' ' test_expect_success 'list specific note with "git notes list <object>"' ' - cat >expect <<-EOF && - c18dc024e14f08d18d14eea0d747ff692d66d6a3 - EOF + git rev-parse refs/notes/commits:$commit_3 >expect && git notes list HEAD^^ >actual && test_cmp expect actual ' @@ -498,10 +529,12 @@ 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"' ' - cat >expect_list <<-EOF && - c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 7a4ca6ee52a974a66cbaa78e33214535dff1d691 - 4b6ad22357cc8a1296720574b8d2fbc22fab0671 7f9ad8836c775acb134c0a055fc55fb4cd1ba361 - c18dc024e14f08d18d14eea0d747ff692d66d6a3 d07d62e5208f22eb5695e7eb47667dc8b9860290 + 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 EOF git notes list >actual && test_cmp expect_list actual @@ -531,8 +564,9 @@ 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 2c125331118caba0ff8238b7f4958ac6e93fe39c + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:18:13 2005 -0700 @@ -569,8 +603,10 @@ 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 2c125331118caba0ff8238b7f4958ac6e93fe39c + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:18:13 2005 -0700 @@ -582,7 +618,7 @@ test_expect_success 'Show all notes when notes.displayRef=refs/notes/*' ' Notes (other): ${indent}other note - commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361 + commit $parent Author: A U Thor <author@example.com> Date: Thu Apr 7 15:17:13 2005 -0700 @@ -616,8 +652,9 @@ 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 2c125331118caba0ff8238b7f4958ac6e93fe39c + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:18:13 2005 -0700 @@ -642,14 +679,16 @@ 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 2c125331118caba0ff8238b7f4958ac6e93fe39c + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:18:13 2005 -0700 ${indent}6th - commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361 + commit $parent Author: A U Thor <author@example.com> Date: Thu Apr 7 15:17:13 2005 -0700 @@ -666,8 +705,9 @@ 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 2c125331118caba0ff8238b7f4958ac6e93fe39c + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:18:13 2005 -0700 @@ -700,7 +740,8 @@ 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 && - filename=$(git ls-tree --name-only HEAD | head -n1) && + git ls-tree --name-only HEAD >files && + filename=$(head -n1 files) && git notes add -m "Note on a blob" HEAD:$filename && git notes show HEAD:$filename >actual && test_cmp expect actual && @@ -712,8 +753,10 @@ 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 fb01e0ca8c33b6cc0c6451dde747f97df567cb5c + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:19:13 2005 -0700 @@ -722,11 +765,13 @@ test_expect_success 'create note from other note with "git notes add -C"' ' Notes: ${indent}order test EOF - test_commit 7th && - git notes add -C $(git notes list HEAD^) && + note=$(git notes list HEAD^) && + git notes add -C $note && git log -1 >actual && test_cmp expect actual && - test "$(git notes list HEAD)" = "$(git notes list HEAD^)" + git notes list HEAD^ >expect && + git notes list HEAD >actual && + test_cmp expect actual ' test_expect_success 'create note from non-existing note with "git notes add -C" fails' ' @@ -744,8 +789,9 @@ 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 9a4c31c7f722b5d517e92c64e932dd751e1413bf + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:20:13 2005 -0700 @@ -754,16 +800,19 @@ test_expect_success 'create note from blob with "git notes add -C" reuses blob i Notes: ${indent}This is a blob object EOF - blob=$(echo "This is a blob object" | git hash-object -w --stdin) && - git notes add -C $blob && + echo "This is a blob object" | git hash-object -w --stdin >blob && + git notes add -C $(cat blob) && git log -1 >actual && test_cmp expect actual && - test "$(git notes list HEAD)" = "$blob" + git notes list HEAD >actual && + test_cmp blob actual ' 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 2e0db4bc649e174d667a1cde19e725cf897a5bd2 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:21:13 2005 -0700 @@ -772,8 +821,8 @@ test_expect_success 'create note from other note with "git notes add -c"' ' Notes: ${indent}yet another note EOF - test_commit 9th && - MSG="yet another note" git notes add -c $(git notes list HEAD^^) && + note=$(git notes list HEAD^^) && + MSG="yet another note" git notes add -c $note && git log -1 >actual && test_cmp expect actual ' @@ -785,8 +834,9 @@ 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 2e0db4bc649e174d667a1cde19e725cf897a5bd2 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:21:13 2005 -0700 @@ -797,14 +847,16 @@ test_expect_success 'append to note from other note with "git notes append -C"' ${indent} ${indent}yet another note EOF - git notes append -C $(git notes list HEAD^) HEAD^ && + note=$(git notes list HEAD^) && + git notes append -C $note 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 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:22:13 2005 -0700 @@ -813,14 +865,16 @@ test_expect_success 'create note from other note with "git notes append -c"' ' Notes: ${indent}other note EOF - MSG="other note" git notes append -c $(git notes list HEAD^) && + note=$(git notes list HEAD^) && + MSG="other note" git notes append -c $note && 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 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:22:13 2005 -0700 @@ -831,14 +885,37 @@ test_expect_success 'append to note from other note with "git notes append -c"' ${indent} ${indent}yet another note EOF - MSG="yet another note" git notes append -c $(git notes list HEAD) && + note=$(git notes list HEAD) && + MSG="yet another note" git notes append -c $note && 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 a446fff8777efdc6eb8f4b7c8a5ff699484df0d5 + 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 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:23:13 2005 -0700 @@ -849,23 +926,59 @@ test_expect_success 'copy note with "git notes copy"' ' ${indent} ${indent}yet another note EOF - test_commit 11th && - git notes copy HEAD^ HEAD && + git notes copy HEAD^ && git log -1 >actual && test_cmp expect actual && - test "$(git notes list HEAD)" = "$(git notes list HEAD^)" + git notes list HEAD^ >expect && + git notes list HEAD >actual && + test_cmp expect actual ' 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 && - test "$(git notes list HEAD)" = "$(git notes list HEAD^)" + git notes list HEAD^ >expect && + git notes list HEAD >actual && + test_cmp expect actual ' 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 a446fff8777efdc6eb8f4b7c8a5ff699484df0d5 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:23:13 2005 -0700 @@ -876,10 +989,12 @@ test_expect_success 'allow overwrite with "git notes copy -f"' ' ${indent} ${indent}yet another note EOF - git notes copy -f HEAD~2 HEAD && + git notes copy -f HEAD~2 && git log -1 >actual && test_cmp expect actual && - test "$(git notes list HEAD)" = "$(git notes list HEAD~2)" + git notes list HEAD~2 >expect && + git notes list HEAD >actual && + test_cmp expect actual ' test_expect_success 'cannot copy note from object without notes' ' @@ -889,8 +1004,10 @@ 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 e871aa61182b1d95d0a6fb75445d891722863b6b + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:25:13 2005 -0700 @@ -901,7 +1018,7 @@ test_expect_success 'git notes copy --stdin' ' ${indent} ${indent}yet another note - commit 65e263ded02ae4e8839bc151095113737579dc12 + commit $parent Author: A U Thor <author@example.com> Date: Thu Apr 7 15:24:13 2005 -0700 @@ -912,41 +1029,57 @@ test_expect_success 'git notes copy --stdin' ' ${indent} ${indent}yet another note EOF - (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) && - echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) | - git notes copy --stdin && + 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 && git log -2 >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)" + 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_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 4acf42e847e7fffbbf89ee365c20ac7caf40de89 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 ${indent}15th - commit 07c85d77059393ed0154b8c96906547a59dfcddd + commit $parent Author: A U Thor <author@example.com> Date: Thu Apr 7 15:26:13 2005 -0700 ${indent}14th EOF - 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 && + 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 && 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 4acf42e847e7fffbbf89ee365c20ac7caf40de89 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 @@ -957,7 +1090,7 @@ test_expect_success 'git notes copy --for-rewrite (enabled)' ' ${indent} ${indent}yet another note - commit 07c85d77059393ed0154b8c96906547a59dfcddd + commit $parent Author: A U Thor <author@example.com> Date: Thu Apr 7 15:26:13 2005 -0700 @@ -970,24 +1103,31 @@ test_expect_success 'git notes copy --for-rewrite (enabled)' ' EOF test_config notes.rewriteMode overwrite && test_config notes.rewriteRef "refs/notes/*" && - (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 && + 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 && git log -2 >actual && test_cmp expect actual ' test_expect_success 'git notes copy --for-rewrite (disabled)' ' test_config notes.rewrite.bar false && - echo $(git rev-parse HEAD~3) $(git rev-parse HEAD) | - git notes copy --for-rewrite=bar && + from=$(git rev-parse HEAD~3) && + to=$(git rev-parse HEAD) && + echo "$from" "$to" >copy && + git notes copy --for-rewrite=bar <copy && 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 4acf42e847e7fffbbf89ee365c20ac7caf40de89 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 @@ -999,8 +1139,10 @@ 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/*" && - echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | - git notes copy --for-rewrite=foo && + from=$(git rev-parse HEAD^) && + to=$(git rev-parse HEAD) && + echo "$from" "$to" >copy && + git notes copy --for-rewrite=foo <copy && git log -1 >actual && test_cmp expect actual ' @@ -1008,15 +1150,18 @@ 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/*" && - echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | - git notes copy --for-rewrite=foo && + from=$(git rev-parse HEAD^) && + to=$(git rev-parse HEAD) && + echo "$from" "$to" >copy && + git notes copy --for-rewrite=foo <copy && 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 4acf42e847e7fffbbf89ee365c20ac7caf40de89 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 @@ -1030,15 +1175,18 @@ 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/*" && - echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | - git notes copy --for-rewrite=foo && + from=$(git rev-parse HEAD^) && + to=$(git rev-parse HEAD) && + echo "$from" "$to" >copy && + git notes copy --for-rewrite=foo <copy && 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 4acf42e847e7fffbbf89ee365c20ac7caf40de89 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 @@ -1057,9 +1205,13 @@ 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/*" && - (echo $(git rev-parse HEAD^) $(git rev-parse HEAD) && - echo $(git rev-parse HEAD^^) $(git rev-parse HEAD)) | - git notes copy --for-rewrite=foo && + 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 && git log -1 >actual && test_cmp expect actual ' @@ -1068,15 +1220,18 @@ 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/*" && - echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | - git notes copy --for-rewrite=foo && + from=$(git rev-parse HEAD^) && + to=$(git rev-parse HEAD) && + echo "$from" "$to" >copy && + git notes copy --for-rewrite=foo <copy && 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 4acf42e847e7fffbbf89ee365c20ac7caf40de89 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 @@ -1088,15 +1243,18 @@ 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^ && - echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | - GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo && + 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 && 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 4acf42e847e7fffbbf89ee365c20ac7caf40de89 + commit $commit Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 @@ -1108,9 +1266,11 @@ 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 && - echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | + from=$(git rev-parse HEAD^) && + to=$(git rev-parse HEAD) && + echo "$from" "$to" >copy && GIT_NOTES_REWRITE_REF=refs/notes/commits:refs/notes/other \ - git notes copy --for-rewrite=foo && + git notes copy --for-rewrite=foo <copy && git log -1 >actual && test_cmp expect actual ' @@ -1119,41 +1279,55 @@ 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 && - echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | + from=$(git rev-parse HEAD^) && + to=$(git rev-parse HEAD) && + echo "$from" "$to" >copy && GIT_NOTES_REWRITE_REF=refs/notes/commits \ - git notes copy --for-rewrite=foo && + git notes copy --for-rewrite=foo <copy && 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 && - test_must_fail git notes copy one two three + 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_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 && - test "$(git notes --ref=refs/heads/master get-ref)" = "refs/notes/refs/heads/master" + echo refs/notes/refs/heads/master >expect && + git notes --ref=refs/heads/master get-ref >actual && + test_cmp expect actual ' test_expect_success 'git notes get-ref (no overrides)' ' test_unconfig core.notesRef && sane_unset GIT_NOTES_REF && - test "$(git notes get-ref)" = "refs/notes/commits" + echo refs/notes/commits >expect && + git notes get-ref >actual && + test_cmp expect actual ' test_expect_success 'git notes get-ref (core.notesRef)' ' test_config core.notesRef refs/notes/foo && - test "$(git notes get-ref)" = "refs/notes/foo" + echo refs/notes/foo >expect && + git notes get-ref >actual && + test_cmp expect actual ' test_expect_success 'git notes get-ref (GIT_NOTES_REF)' ' - test "$(GIT_NOTES_REF=refs/notes/bar git notes get-ref)" = "refs/notes/bar" + echo refs/notes/bar >expect && + GIT_NOTES_REF=refs/notes/bar git notes get-ref >actual && + test_cmp expect actual ' test_expect_success 'git notes get-ref (--ref)' ' - test "$(GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref)" = "refs/notes/baz" + echo refs/notes/baz >expect && + GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref >actual && + test_cmp expect actual ' 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 54460beec4..94c1b02251 100755 --- a/third_party/git/t/t3305-notes-fanout.sh +++ b/third_party/git/t/t3305-notes-fanout.sh @@ -4,6 +4,38 @@ test_description='Test that adding/removing many notes triggers automatic fanout . ./test-lib.sh +path_has_fanout() { + path=$1 && + fanout=$2 && + after_last_slash=$(($(test_oid hexsz) - $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 && @@ -20,7 +52,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=300 && + i=$num_notes && while test $i -gt 0 do echo " commit #$i" && @@ -30,39 +62,46 @@ test_expect_success 'many notes created correctly with git-notes' ' test_cmp expect output ' -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 +test_expect_success 'stable fanout 0 is followed by stable fanout 1' ' + i=$num_notes && + fanout=0 && + while test $i -gt 0 do - case "$path" in - ??/??????????????????????????????????????) - : true - ;; - *) - echo "Invalid path \"$path\"" && - return 1 - ;; - esac - done + 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 ' test_expect_success 'deleting most notes with git-notes' ' - num_notes=250 && + remove_notes=285 && i=0 && git rev-list HEAD | - while test $i -lt $num_notes && read sha1 + while test $i -lt $remove_notes && read sha1 do i=$(($i + 1)) && test_tick && - git notes remove "$sha1" || - exit 1 + git notes remove "$sha1" 2>/dev/null || return 1 done ' test_expect_success 'most notes deleted correctly with git-notes' ' - git log HEAD~250 | grep "^ " > output && - i=50 && + git log HEAD~$remove_notes | grep "^ " > output && + i=$(($num_notes - $remove_notes)) && while test $i -gt 0 do echo " commit #$i" && @@ -72,21 +111,29 @@ test_expect_success 'most notes deleted correctly with git-notes' ' test_cmp expect output ' -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 +test_expect_success 'stable fanout 1 is followed by stable fanout 0' ' + i=$remove_notes && + fanout=1 && + while test $i -gt 0 do - case "$path" in - ????????????????????????????????????????) - : true - ;; - *) - echo "Invalid path \"$path\"" && - return 1 - ;; - esac - done + 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 ' test_done diff --git a/third_party/git/t/t3306-notes-prune.sh b/third_party/git/t/t3306-notes-prune.sh index 61748088eb..8f4102ff9e 100755 --- a/third_party/git/t/t3306-notes-prune.sh +++ b/third_party/git/t/t3306-notes-prune.sh @@ -11,23 +11,26 @@ 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 && - COMMIT_FILE=.git/objects/5e/e1c35e83ea47cd3cc4f8cbee0568915fbbbd29 && + third=$(git rev-parse HEAD) && + COMMIT_FILE=$(echo $third | sed "s!^..!.git/objects/&/!") && test -f $COMMIT_FILE && test-tool chmtime =+0 $COMMIT_FILE && git notes add -m "Note #3" ' cat > expect <<END_OF_LOG -commit 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 +commit $third Author: A U Thor <author@example.com> Date: Thu Apr 7 15:15:13 2005 -0700 @@ -36,7 +39,7 @@ Date: Thu Apr 7 15:15:13 2005 -0700 Notes: Note #3 -commit 08341ad9e94faa089d60fd3f523affb25c6da189 +commit $second Author: A U Thor <author@example.com> Date: Thu Apr 7 15:14:13 2005 -0700 @@ -45,7 +48,7 @@ Date: Thu Apr 7 15:14:13 2005 -0700 Notes: Note #2 -commit ab5f302035f2e7aaf04265f08b42034c23256e1f +commit $first Author: A U Thor <author@example.com> Date: Thu Apr 7 15:13:13 2005 -0700 @@ -70,16 +73,16 @@ test_expect_success 'remove some commits' ' test_expect_success 'verify that commits are gone' ' - test_must_fail git cat-file -p 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 && - git cat-file -p 08341ad9e94faa089d60fd3f523affb25c6da189 && - git cat-file -p ab5f302035f2e7aaf04265f08b42034c23256e1f + test_must_fail git cat-file -p $third && + git cat-file -p $second && + git cat-file -p $first ' test_expect_success 'verify that notes are still present' ' - git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 && - git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 && - git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f + git notes show $third && + git notes show $second && + git notes show $first ' test_expect_success 'prune -n does not remove notes' ' @@ -90,13 +93,10 @@ 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 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 && - git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 && - git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f + test_must_fail git notes show $third && + git notes show $second && + git notes show $first ' test_expect_success 'remove some commits' ' @@ -121,21 +121,18 @@ 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 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 && - test_must_fail git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 && - git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f + test_must_fail git notes show $third && + test_must_fail git notes show $second && + git notes show $first ' test_done diff --git a/third_party/git/t/t3308-notes-merge.sh b/third_party/git/t/t3308-notes-merge.sh index d60588ec8f..d69c84c640 100755 --- a/third_party/git/t/t3308-notes-merge.sh +++ b/third_party/git/t/t3308-notes-merge.sh @@ -20,7 +20,33 @@ 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/* + git fetch . refs/notes/*:refs/remote-notes/origin/* && + + 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 ' commit_sha1=$(git rev-parse 1st^{commit}) @@ -40,10 +66,10 @@ verify_notes () { } cat <<EOF | sort >expect_notes_x -5e93d24084d32e1cb61f7070505b9d2530cca987 $commit_sha4 -8366731eeee53787d2bdf8fc1eff7d94757e8da0 $commit_sha3 -eede89064cd42441590d6afec6c37b321ada3389 $commit_sha2 -daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1 +$(test_oid hash4a) $commit_sha4 +$(test_oid hash3a) $commit_sha3 +$(test_oid hash2a) $commit_sha2 +$(test_oid hash1a) $commit_sha1 EOF cat >expect_log_x <<EOF @@ -126,10 +152,10 @@ test_expect_success 'merge previous notes commit (y^ => y) => No-op' ' ' cat <<EOF | sort >expect_notes_y -0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5 -dec2502dac3ea161543f71930044deff93fa945c $commit_sha4 -4069cdb399fd45463ec6eef8e051a16a03592d91 $commit_sha3 -daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1 +$(test_oid hash5b) $commit_sha5 +$(test_oid hash4b) $commit_sha4 +$(test_oid hash3b) $commit_sha3 +$(test_oid hash1a) $commit_sha1 EOF cat >expect_log_y <<EOF @@ -193,11 +219,11 @@ test_expect_success 'merge empty notes ref (z => y)' ' ' cat <<EOF | sort >expect_notes_y -0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5 -dec2502dac3ea161543f71930044deff93fa945c $commit_sha4 -4069cdb399fd45463ec6eef8e051a16a03592d91 $commit_sha3 -d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2 -43add6bd0c8c0bc871ac7991e0f5573cfba27804 $commit_sha1 +$(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 EOF cat >expect_log_y <<EOF @@ -231,9 +257,9 @@ test_expect_success 'change notes on other notes ref (y)' ' ' cat <<EOF | sort >expect_notes_x -0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5 -1f257a3a90328557c452f0817d6cc50c89d315d4 $commit_sha4 -daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1 +$(test_oid hash5b) $commit_sha5 +$(test_oid hash4d) $commit_sha4 +$(test_oid hash1a) $commit_sha1 EOF cat >expect_log_x <<EOF @@ -262,10 +288,10 @@ test_expect_success 'change notes on notes ref (x)' ' ' cat <<EOF | sort >expect_notes_x -0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5 -1f257a3a90328557c452f0817d6cc50c89d315d4 $commit_sha4 -d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2 -43add6bd0c8c0bc871ac7991e0f5573cfba27804 $commit_sha1 +$(test_oid hash5b) $commit_sha5 +$(test_oid hash4d) $commit_sha4 +$(test_oid hash2c) $commit_sha2 +$(test_oid hash1c) $commit_sha1 EOF cat >expect_log_x <<EOF @@ -296,8 +322,8 @@ test_expect_success 'merge y into x => Non-conflicting 3-way merge' ' ' cat <<EOF | sort >expect_notes_w -05a4927951bcef347f51486575b878b2b60137f2 $commit_sha3 -d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2 +$(test_oid hash3d) $commit_sha3 +$(test_oid hash2c) $commit_sha2 EOF cat >expect_log_w <<EOF @@ -326,11 +352,11 @@ test_expect_success 'create notes on new, separate notes ref (w)' ' ' cat <<EOF | sort >expect_notes_x -0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5 -1f257a3a90328557c452f0817d6cc50c89d315d4 $commit_sha4 -05a4927951bcef347f51486575b878b2b60137f2 $commit_sha3 -d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2 -43add6bd0c8c0bc871ac7991e0f5573cfba27804 $commit_sha1 +$(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 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 14c2adf970..141d3e4ca4 100755 --- a/third_party/git/t/t3309-notes-merge-auto-resolve.sh +++ b/third_party/git/t/t3309-notes-merge-auto-resolve.sh @@ -23,7 +23,67 @@ test_expect_success 'setup commits' ' test_commit 12th && test_commit 13th && test_commit 14th && - test_commit 15th + 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 ' commit_sha1=$(git rev-parse 1st^{commit}) @@ -68,16 +128,16 @@ test_expect_success 'setup merge base (x)' ' ' cat <<EOF | sort >expect_notes_x -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 +$(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 EOF cat >expect_log_x <<EOF @@ -141,16 +201,16 @@ test_expect_success 'setup local branch (y)' ' ' cat <<EOF | sort >expect_notes_y -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 +$(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 EOF cat >expect_log_y <<EOF @@ -214,16 +274,16 @@ test_expect_success 'setup remote branch (z)' ' ' cat <<EOF | sort >expect_notes_z -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 +$(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 EOF cat >expect_log_z <<EOF @@ -306,16 +366,16 @@ test_expect_success 'merge z into y with invalid configuration option => Fail/No ' cat <<EOF | sort >expect_notes_ours -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 +$(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 EOF cat >expect_log_ours <<EOF @@ -395,16 +455,16 @@ test_expect_success 'reset to pre-merge state (y)' ' ' cat <<EOF | sort >expect_notes_theirs -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 +$(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 EOF cat >expect_log_theirs <<EOF @@ -473,17 +533,17 @@ test_expect_success 'reset to pre-merge state (y)' ' ' cat <<EOF | sort >expect_notes_union -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 +$(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 EOF cat >expect_log_union <<EOF @@ -574,17 +634,17 @@ test_expect_success 'merge z into y with "manual" per-ref only checks specific r ' cat <<EOF | sort >expect_notes_union2 -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 +$(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 EOF cat >expect_log_union2 <<EOF @@ -648,17 +708,17 @@ test_expect_success 'reset to pre-merge state (z)' ' ' cat <<EOF | sort >expect_notes_cat_sort_uniq -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 +$(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 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 2dea846e25..d3d72e25fe 100755 --- a/third_party/git/t/t3310-notes-merge-manual-resolve.sh +++ b/third_party/git/t/t3310-notes-merge-manual-resolve.sh @@ -13,7 +13,39 @@ test_expect_success 'setup commits' ' test_commit 2nd && test_commit 3rd && test_commit 4th && - test_commit 5th + 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 ' commit_sha1=$(git rev-parse 1st^{commit}) @@ -32,10 +64,16 @@ 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 -6e8e3febca3c2bb896704335cc4d0c34cb2f8715 $commit_sha4 -e5388c10860456ee60673025345fe2e153eb8cf8 $commit_sha3 -ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2 +$(test_oid hash04a) $commit_sha4 +$(test_oid hash03a) $commit_sha3 +$(test_oid hash02a) $commit_sha2 EOF cat >expect_log_x <<EOF @@ -63,9 +101,9 @@ test_expect_success 'setup merge base (x)' ' ' cat <<EOF | sort >expect_notes_y -e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4 -5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3 -b0a6021ec006d07e80e9b20ec9b444cbd9d560d3 $commit_sha1 +$(test_oid hash04b) $commit_sha4 +$(test_oid hash03b) $commit_sha3 +$(test_oid hash01b) $commit_sha1 EOF cat >expect_log_y <<EOF @@ -95,9 +133,9 @@ test_expect_success 'setup local branch (y)' ' ' cat <<EOF | sort >expect_notes_z -cff59c793c20bb49a4e01bc06fb06bad642e0d54 $commit_sha4 -283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 -0a81da8956346e19bcb27a906f04af327e03e31b $commit_sha1 +$(test_oid hash04c) $commit_sha4 +$(test_oid hash02c) $commit_sha2 +$(test_oid hash01c) $commit_sha1 EOF cat >expect_log_z <<EOF @@ -193,9 +231,9 @@ test_expect_success 'merge z into m (== y) with default ("manual") resolver => C ' cat <<EOF | sort >expect_notes_z -00494adecf2d9635a02fa431308d67993f853968 $commit_sha4 -283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 -0a81da8956346e19bcb27a906f04af327e03e31b $commit_sha1 +$(test_oid hash04d) $commit_sha4 +$(test_oid hash02c) $commit_sha2 +$(test_oid hash01c) $commit_sha1 EOF cat >expect_log_z <<EOF @@ -231,8 +269,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 -ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2 -f75d1df88cbfe4258d49852f26cfc83f2ad4494b $commit_sha1 +$(test_oid hash02a) $commit_sha2 +$(test_oid hash01e) $commit_sha1 EOF cat >expect_log_w <<EOF @@ -258,10 +296,10 @@ test_expect_success 'setup unrelated notes ref (w)' ' ' cat <<EOF | sort >expect_notes_w -6e8e3febca3c2bb896704335cc4d0c34cb2f8715 $commit_sha4 -e5388c10860456ee60673025345fe2e153eb8cf8 $commit_sha3 -ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2 -f75d1df88cbfe4258d49852f26cfc83f2ad4494b $commit_sha1 +$(test_oid hash04a) $commit_sha4 +$(test_oid hash03a) $commit_sha3 +$(test_oid hash02a) $commit_sha2 +$(test_oid hash01e) $commit_sha1 EOF cat >expect_log_w <<EOF @@ -291,10 +329,10 @@ test_expect_success 'can do merge without conflicts even if previous merge is un ' cat <<EOF | sort >expect_notes_m -021faa20e931fb48986ffc6282b4bb05553ac946 $commit_sha4 -5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3 -283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 -0a59e787e6d688aa6309e56e8c1b89431a0fc1c1 $commit_sha1 +$(test_oid hash04f) $commit_sha4 +$(test_oid hash03b) $commit_sha3 +$(test_oid hash02c) $commit_sha2 +$(test_oid hash01f) $commit_sha1 EOF cat >expect_log_m <<EOF @@ -335,9 +373,7 @@ EOF y and z notes on 4th commit EOF git notes merge --commit && - # No .git/NOTES_MERGE_* files left - test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null && - test_must_be_empty output && + notes_merge_files_gone && # 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)" && @@ -397,9 +433,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol test_expect_success 'abort notes merge' ' git notes merge --abort && - # No .git/NOTES_MERGE_* files left - test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null && - test_must_be_empty output && + notes_merge_files_gone && # 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) @@ -430,9 +464,9 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol ' cat <<EOF | sort >expect_notes_m -304dfb4325cf243025b9957486eb605a9b51c199 $commit_sha5 -283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 -0a59e787e6d688aa6309e56e8c1b89431a0fc1c1 $commit_sha1 +$(test_oid hash05g) $commit_sha5 +$(test_oid hash02c) $commit_sha2 +$(test_oid hash01f) $commit_sha1 EOF cat >expect_log_m <<EOF @@ -464,9 +498,7 @@ EOF echo "new note on 5th commit" > .git/NOTES_MERGE_WORKTREE/$commit_sha5 && # Finalize merge git notes merge --commit && - # No .git/NOTES_MERGE_* files left - test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null && - test_must_be_empty output && + notes_merge_files_gone && # 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)" && @@ -553,9 +585,7 @@ EOF test_expect_success 'resolve situation by aborting the notes merge' ' git notes merge --abort && - # No .git/NOTES_MERGE_* files left - test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null && - test_must_be_empty output && + notes_merge_files_gone && # 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 37151a3adc..5b675417e9 100755 --- a/third_party/git/t/t3311-notes-merge-fanout.sh +++ b/third_party/git/t/t3311-notes-merge-fanout.sh @@ -29,15 +29,10 @@ verify_fanout () { git ls-tree -r --name-only "refs/notes/$notes_ref" | while read path do - case "$path" in - ??/??????????????????????????????????????) - : true - ;; - *) + echo "$path" | grep "^../[0-9a-f]*$" || { echo "Invalid path \"$path\"" && - return 1 - ;; - esac + return 1; + } done } @@ -48,15 +43,10 @@ verify_no_fanout () { git ls-tree -r --name-only "refs/notes/$notes_ref" | while read path do - case "$path" in - ????????????????????????????????????????) - : true - ;; - *) + echo "$path" | grep -v "^../.*" || { echo "Invalid path \"$path\"" && - return 1 - ;; - esac + return 1; + } done } @@ -67,7 +57,27 @@ 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 + 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 ' commit_sha1=$(git rev-parse commit1^{commit}) @@ -77,11 +87,11 @@ commit_sha4=$(git rev-parse commit4^{commit}) commit_sha5=$(git rev-parse commit5^{commit}) cat <<EOF | sort >expect_notes_x -aed91155c7a72c2188e781fdf40e0f3761b299db $commit_sha5 -99fab268f9d7ee7b011e091a436c78def8eeee69 $commit_sha4 -953c20ae26c7aa0b428c20693fe38bc687f9d1a9 $commit_sha3 -6358796131b8916eaa2dde6902642942a1cb37e1 $commit_sha2 -b02d459c32f0e68f2fe0981033bb34f38776ba47 $commit_sha1 +$(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 EOF cat >expect_log_x <<EOF @@ -145,9 +155,9 @@ test_expect_success 'Fast-forward merge (y => x)' ' ' cat <<EOF | sort >expect_notes_z -9f506ee70e20379d7f78204c77b334f43d77410d $commit_sha3 -23a47d6ea7d589895faf800752054818e1e7627b $commit_sha2 -b02d459c32f0e68f2fe0981033bb34f38776ba47 $commit_sha1 +$(test_oid hash03b) $commit_sha3 +$(test_oid hash02b) $commit_sha2 +$(test_oid hash01a) $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 80b23fd326..40d2975995 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,19 +159,43 @@ test_expect_success 'fail when upstream arg is missing and not configured' ' test_must_fail git rebase ' -test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' ' +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)' ' 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 && + 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 && + 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 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 rev-parse --verify default-base >expect && git rev-parse default~1 >actual && test_cmp expect actual @@ -200,9 +224,15 @@ test_expect_success 'cherry-picked commits and fork-point work together' ' test_cmp expect D ' -test_expect_success 'rebase -q is quiet' ' +test_expect_success 'rebase --apply -q is quiet' ' git checkout -b quiet topic && - git rebase -q master >output.out 2>&1 && + 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 && test_must_be_empty output.out ' @@ -285,7 +315,7 @@ EOF test_cmp From_.msg out ' -test_expect_success 'rebase --am and --show-current-patch' ' +test_expect_success 'rebase --apply and --show-current-patch' ' test_create_repo conflict-apply && ( cd conflict-apply && @@ -295,12 +325,48 @@ test_expect_success 'rebase --am and --show-current-patch' ' echo two >>init.t && git commit -a -m two && git tag two && - test_must_fail git rebase --onto init HEAD^ && + test_must_fail git rebase --apply -f --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 && ( @@ -335,4 +401,22 @@ 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 a0b9438b22..f18bae9450 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 (am): directory rename detected' ' +test_expect_failure 'rebase --apply: directory rename detected' ' ( cd dir-rename && git checkout B^0 && - git -c merge.directoryRenames=true rebase A && + git -c merge.directoryRenames=true rebase --apply A && git ls-files -s >out && test_line_count = 5 out && diff --git a/third_party/git/t/t3402-rebase-merge.sh b/third_party/git/t/t3402-rebase-merge.sh index a1ec501a87..6e032716a6 100755 --- a/third_party/git/t/t3402-rebase-merge.sh +++ b/third_party/git/t/t3402-rebase-merge.sh @@ -162,4 +162,81 @@ test_expect_success 'rebase --skip works with two conflicts in a row' ' git rebase --skip ' +test_expect_success '--reapply-cherry-picks' ' + git init repo && + + # O(1-10) -- O(1-11) -- O(0-10) master + # \ + # -- O(1-11) -- O(1-12) otherbranch + + printf "Line %d\n" $(test_seq 1 10) >repo/file.txt && + git -C repo add file.txt && + git -C repo commit -m "base commit" && + + printf "Line %d\n" $(test_seq 1 11) >repo/file.txt && + git -C repo commit -a -m "add 11" && + + printf "Line %d\n" $(test_seq 0 10) >repo/file.txt && + git -C repo commit -a -m "add 0 delete 11" && + + git -C repo checkout -b otherbranch HEAD^^ && + printf "Line %d\n" $(test_seq 1 11) >repo/file.txt && + git -C repo commit -a -m "add 11 in another branch" && + + printf "Line %d\n" $(test_seq 1 12) >repo/file.txt && + git -C repo commit -a -m "add 12 in another branch" && + + # Regular rebase fails, because the 1-11 commit is deduplicated + test_must_fail git -C repo rebase --merge master 2> err && + test_i18ngrep "error: could not apply.*add 12 in another branch" err && + git -C repo rebase --abort && + + # With --reapply-cherry-picks, it works + git -C repo rebase --merge --reapply-cherry-picks master +' + +test_expect_success '--reapply-cherry-picks refrains from reading unneeded blobs' ' + git init server && + + # O(1-10) -- O(1-11) -- O(1-12) master + # \ + # -- O(0-10) otherbranch + + printf "Line %d\n" $(test_seq 1 10) >server/file.txt && + git -C server add file.txt && + git -C server commit -m "merge base" && + + printf "Line %d\n" $(test_seq 1 11) >server/file.txt && + git -C server commit -a -m "add 11" && + + printf "Line %d\n" $(test_seq 1 12) >server/file.txt && + git -C server commit -a -m "add 12" && + + git -C server checkout -b otherbranch HEAD^^ && + printf "Line %d\n" $(test_seq 0 10) >server/file.txt && + git -C server commit -a -m "add 0" && + + test_config -C server uploadpack.allowfilter 1 && + test_config -C server uploadpack.allowanysha1inwant 1 && + + git clone --filter=blob:none "file://$(pwd)/server" client && + git -C client checkout origin/master && + git -C client checkout origin/otherbranch && + + # Sanity check to ensure that the blobs from the merge base and "add + # 11" are missing + git -C client rev-list --objects --all --missing=print >missing_list && + MERGE_BASE_BLOB=$(git -C server rev-parse master^^:file.txt) && + ADD_11_BLOB=$(git -C server rev-parse master^:file.txt) && + grep "[?]$MERGE_BASE_BLOB" missing_list && + grep "[?]$ADD_11_BLOB" missing_list && + + git -C client rebase --merge --reapply-cherry-picks origin/master && + + # The blob from the merge base had to be fetched, but not "add 11" + git -C client rev-list --objects --all --missing=print >missing_list && + ! grep "[?]$MERGE_BASE_BLOB" missing_list && + grep "[?]$ADD_11_BLOB" missing_list +' + test_done diff --git a/third_party/git/t/t3403-rebase-skip.sh b/third_party/git/t/t3403-rebase-skip.sh index 1f5122b632..a927774910 100755 --- a/third_party/git/t/t3403-rebase-skip.sh +++ b/third_party/git/t/t3403-rebase-skip.sh @@ -7,6 +7,8 @@ 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 :) @@ -20,6 +22,20 @@ 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 goodbye && + test_tick && + GIT_AUTHOR_NAME="Another Author" \ + GIT_AUTHOR_EMAIL="another.author@example.com" \ + git commit --amend --no-edit -m amended-goodbye && + test_tick && + git tag amended-goodbye && git checkout -f skip-reference && echo moo > hello && @@ -76,4 +92,99 @@ test_expect_success 'moved back to branch correctly' ' test_debug 'gitk --all & sleep 1' +test_expect_success 'correct advice upon picking empty commit' ' + test_when_finished "git rebase --abort" && + test_must_fail git rebase -i --onto goodbye \ + amended-goodbye^ amended-goodbye 2>err && + test_i18ngrep "previous cherry-pick is now empty" err && + test_i18ngrep "git rebase --skip" err && + test_must_fail git commit && + test_i18ngrep "git rebase --skip" err +' + +test_expect_success 'correct authorship when committing empty pick' ' + test_when_finished "git rebase --abort" && + test_must_fail git rebase -i --onto goodbye \ + amended-goodbye^ amended-goodbye && + git commit --allow-empty && + git log --pretty=format:"%an <%ae>%n%ad%B" -1 amended-goodbye >expect && + git log --pretty=format:"%an <%ae>%n%ad%B" -1 HEAD >actual && + test_cmp expect actual +' + +test_expect_success 'correct advice upon rewording empty commit' ' + test_when_finished "git rebase --abort" && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="reword 1" git rebase -i \ + --onto goodbye amended-goodbye^ amended-goodbye 2>err + ) && + test_i18ngrep "previous cherry-pick is now empty" err && + test_i18ngrep "git rebase --skip" err && + test_must_fail git commit && + test_i18ngrep "git rebase --skip" err +' + +test_expect_success 'correct advice upon editing empty commit' ' + test_when_finished "git rebase --abort" && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="edit 1" git rebase -i \ + --onto goodbye amended-goodbye^ amended-goodbye 2>err + ) && + test_i18ngrep "previous cherry-pick is now empty" err && + test_i18ngrep "git rebase --skip" err && + test_must_fail git commit && + test_i18ngrep "git rebase --skip" err +' + +test_expect_success 'correct advice upon cherry-picking an empty commit during a rebase' ' + test_when_finished "git rebase --abort" && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_amended-goodbye" \ + git rebase -i goodbye^ goodbye 2>err + ) && + test_i18ngrep "previous cherry-pick is now empty" err && + test_i18ngrep "git cherry-pick --skip" err && + test_must_fail git commit 2>err && + test_i18ngrep "git cherry-pick --skip" err +' + +test_expect_success 'correct advice upon multi cherry-pick picking an empty commit during a rebase' ' + test_when_finished "git rebase --abort" && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_goodbye_amended-goodbye" \ + git rebase -i goodbye^^ goodbye 2>err + ) && + test_i18ngrep "previous cherry-pick is now empty" err && + test_i18ngrep "git cherry-pick --skip" err && + test_must_fail git commit 2>err && + test_i18ngrep "git cherry-pick --skip" err +' + +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 461dd539ff..07a1617351 100755 --- a/third_party/git/t/t3404-rebase-interactive.sh +++ b/third_party/git/t/t3404-rebase-interactive.sh @@ -29,9 +29,6 @@ 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 && @@ -75,12 +72,16 @@ test_expect_success 'rebase --keep-empty' ' test_line_count = 6 actual ' -test_expect_success 'rebase -i with empty HEAD' ' +test_expect_success 'rebase -i with empty todo list' ' cat >expect <<-\EOF && error: nothing to do EOF - set_fake_editor && - test_must_fail env FAKE_LINES="1 exec_true" git rebase -i HEAD^ >actual 2>&1 && + ( + 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 test_i18ncmp expect actual ' @@ -139,8 +140,11 @@ 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 @@ -155,8 +159,6 @@ 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 && @@ -168,9 +170,11 @@ 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 ' @@ -181,80 +185,80 @@ 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) + test_cmp_rev I HEAD ' 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) && - test $(git rev-parse I) = $(git rev-parse HEAD) + test_cmp_rev I branch2 && + test_cmp_rev I HEAD ' 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) && - test $(git rev-parse I) = $(git rev-parse branch2) + test_cmp_rev HEAD^ branch1 && + test_cmp_rev I branch2 ' 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" && - test $(git rev-parse I) = $(git rev-parse branch2) && - test $(git rev-parse I) = $(git rev-parse HEAD~2) + test_cmp_rev I branch2 && + test_cmp_rev I HEAD~2 ' test_expect_success 'reflog for the branch shows state before rebase' ' - test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1) + test_cmp_rev branch1@{1} original-branch1 ' test_expect_success 'reflog for the branch shows correct finish message' ' - printf "rebase -i (finish): refs/heads/branch1 onto %s\n" \ + printf "rebase (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) + 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_expect_success 'stop on conflicting pick' ' - cat >expect <<-\EOF && + cat >expect <<-EOF && diff --git a/file1 b/file1 - index f70f10e..fd79235 100644 + index $blob1..$blob2 100644 --- a/file1 +++ b/file1 @@ -1 +1 @@ -A +G EOF - cat >expect2 <<-\EOF && + cat >expect2 <<-EOF && <<<<<<< HEAD D ======= G - >>>>>>> 5d18e54... G + >>>>>>> $commit (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 && @@ -275,7 +279,7 @@ test_expect_success 'show conflicted patch' ' test_expect_success 'abort' ' git rebase --abort && - test $(git rev-parse new-branch1) = $(git rev-parse HEAD) && + test_cmp_rev new-branch1 HEAD && test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" && test_path_is_missing .git/rebase-merge ' @@ -283,7 +287,6 @@ 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 && @@ -298,7 +301,6 @@ 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" ' @@ -316,12 +318,11 @@ 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 && git rebase --continue && - test $(git rev-parse conflict-a^0) = $(git rev-parse HEAD^) && + test_cmp_rev conflict-a^0 HEAD^ && git show >out && grep AttributeMe out ' @@ -332,11 +333,13 @@ 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) + test_cmp_rev HEAD^ master ' test_expect_success 'retain authorship when squashing' ' @@ -345,7 +348,6 @@ 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 && @@ -355,8 +357,10 @@ 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) ' @@ -390,14 +394,13 @@ 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 && git diff-index --quiet --cached HEAD -- && - test $(git rev-parse HEAD~6) = $(git rev-parse branch1) && - test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) && - test $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) && + test_cmp_rev HEAD~6 branch1 && + test_cmp_rev HEAD~4^2 to-be-preserved && + test_cmp_rev HEAD^^2^ HEAD^^^ && test $(git show HEAD~5:file1) = B && test $(git show HEAD~3:file1) = C && test $(git show HEAD:file1) = E && @@ -405,8 +408,10 @@ 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 && @@ -420,19 +425,20 @@ 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 && - test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) && + ( + 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_cmp_rev HEAD^ new-branch1 && git show HEAD | grep chouette ' 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 && @@ -442,10 +448,13 @@ 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) ' @@ -453,9 +462,12 @@ 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} && @@ -465,12 +477,15 @@ 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} && @@ -480,12 +495,15 @@ 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} && @@ -502,10 +520,13 @@ 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} | @@ -519,10 +540,13 @@ 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} && @@ -532,10 +556,13 @@ 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} && @@ -545,17 +572,21 @@ 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 && @@ -568,8 +599,11 @@ 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 && @@ -589,11 +623,13 @@ 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^) @@ -602,34 +638,41 @@ 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 && @@ -640,8 +683,10 @@ 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) ' @@ -656,9 +701,10 @@ 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' ' @@ -678,8 +724,10 @@ 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" ' @@ -690,9 +738,8 @@ 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) + test_cmp_rev branch3 branch4 ' @@ -715,13 +762,14 @@ 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' ' @@ -738,7 +786,6 @@ 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 && @@ -748,11 +795,10 @@ 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 && - test $(git rev-parse submodule-base) = $(git rev-parse HEAD) + test_cmp_rev submodule-base HEAD ' test_expect_success 'avoid unnecessary reset' ' @@ -761,7 +807,6 @@ 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) && @@ -770,16 +815,22 @@ 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_cmp_rev master^ 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" ' @@ -790,7 +841,6 @@ 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)" ' @@ -803,8 +853,11 @@ 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 ' @@ -813,8 +866,10 @@ 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 ' @@ -823,7 +878,6 @@ 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 @@ -831,7 +885,7 @@ test_expect_success 'always cherry-pick with --no-ff' ' git diff HEAD~$p original-no-ff-branch~$p > out && test_must_be_empty out done && - test $(git rev-parse HEAD~3) = $(git rev-parse original-no-ff-branch~3) && + test_cmp_rev HEAD~3 original-no-ff-branch~3 && git diff HEAD~3 original-no-ff-branch~3 > out && test_must_be_empty out ' @@ -855,8 +909,10 @@ 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 ' @@ -870,9 +926,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 @@ -883,9 +939,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 @@ -896,9 +952,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 @@ -910,9 +966,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 @@ -923,9 +979,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 && @@ -944,13 +1000,11 @@ test_expect_success C_LOCALE_OUTPUT 'rebase -ix with --autosquash' ' echo bis >bis.txt && git add bis.txt && git commit -m "fixup! two_exec" && - set_fake_editor && - ( - git checkout -b autosquash_actual && - git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual - ) && + 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 && @@ -971,7 +1025,6 @@ 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 @@ -979,8 +1032,10 @@ 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) && @@ -993,39 +1048,59 @@ 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 4b825dc642cb" && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="2" git rebase -i --root + ) && + git cat-file commit HEAD | grep "^tree $EMPTY_TREE" && 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 root commit' ' +test_expect_success 'rebase -i --root reword original root commit' ' test_when_finished "test_might_fail git rebase --abort" && - 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 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 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 && @@ -1033,8 +1108,10 @@ 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" && @@ -1044,32 +1121,38 @@ 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-root-branch && + git checkout reword-original-root-branch && git reset --hard && git checkout conflict-branch && - set_fake_editor && - test_must_fail git rebase --onto HEAD~2 HEAD~ && - test_must_fail git rebase --edit-todo && + ( + set_fake_editor && + test_must_fail git rebase -f --apply --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) ' @@ -1077,13 +1160,12 @@ 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 -i (finish): returning to refs/heads/branch-reflog-test - rebase -i (pick): H - rebase -i (pick): G - rebase -i (start): checkout I + rebase (finish): returning to refs/heads/branch-reflog-test + rebase (pick): H + rebase (pick): G + rebase (start): checkout I EOF git reflog -n4 HEAD | sed "s/[^:]*: //" >actual && @@ -1098,8 +1180,10 @@ 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) ' @@ -1108,9 +1192,11 @@ 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 || :" && - git rebase -i HEAD^ && + ( + test_set_editor "$(pwd)/copy-edit-script.sh" && + git rebase -i HEAD^ + ) && test -z "$(grep -ve "^#" -e "^\$" -e "^pick" edit-script)" ' @@ -1145,8 +1231,11 @@ 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 @@ -1161,7 +1250,7 @@ test_expect_success 'rebase -i error on commits with \ in message' ' test_expect_code 1 grep " emp" error ' -test_expect_success 'short SHA-1 setup' ' +test_expect_success 'short commit ID setup' ' test_when_finished "git checkout master" && git checkout --orphan collide && git rm -rf . && @@ -1173,22 +1262,68 @@ test_expect_success 'short SHA-1 setup' ' ) ' -test_expect_success 'short SHA-1 collide' ' +if test -n "$GIT_TEST_FIND_COLLIDER" +then + author="$(unset test_tick; test_tick; git var GIT_AUTHOR_IDENT)" + committer="$(unset test_tick; test_tick; git var GIT_COMMITTER_IDENT)" + blob="$(git rev-parse collide2:collide)" + from="$(git rev-parse collide1^0)" + repl="commit refs/heads/collider-&\\n" + repl="${repl}author $author\\ncommitter $committer\\n" + repl="${repl}data <<EOF\\ncollide2 &\\nEOF\\n" + repl="${repl}from $from\\nM 100644 $blob collide\\n" + test_seq 1 32768 | sed "s|.*|$repl|" >script && + git fast-import <script && + git pack-refs && + git for-each-ref >refs && + grep "^$(test_oid t3404_collision)" <refs >matches && + cat matches && + test_line_count -gt 2 matches || { + echo "Could not find a collider" >&2 + exit 1 + } +fi + +test_expect_success 'short commit ID collide' ' + test_oid_cache <<-EOF && + # collision-related constants + t3404_collision sha1:6bcd + t3404_collision sha256:0161 + t3404_collider sha1:ac4f2ee + t3404_collider sha256:16697 + EOF test_when_finished "reset_rebase && git checkout master" && git checkout collide && + colliding_id=$(test_oid t3404_collision) && + hexsz=$(test_oid hexsz) && + test $colliding_id = "$(git rev-parse HEAD | cut -c 1-4)" && + test_config core.abbrev 4 && ( - unset test_tick && - test_tick && - set_fake_editor && - FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \ - FAKE_LINES="reword 1 2" git rebase -i HEAD~2 - ) + unset test_tick && + test_tick && + set_fake_editor && + FAKE_COMMIT_MESSAGE="collide2 $(test_oid t3404_collider)" \ + FAKE_LINES="reword 1 break 2" git rebase -i HEAD~2 && + test $colliding_id = "$(git rev-parse HEAD | cut -c 1-4)" && + grep "^pick $colliding_id " \ + .git/rebase-merge/git-rebase-todo.tmp && + grep "^pick [0-9a-f]\{$hexsz\}" \ + .git/rebase-merge/git-rebase-todo && + grep "^pick [0-9a-f]\{$hexsz\}" \ + .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" ' 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) ' @@ -1196,16 +1331,20 @@ 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 && @@ -1220,8 +1359,10 @@ 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 && @@ -1236,8 +1377,10 @@ 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 && @@ -1260,8 +1403,10 @@ 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 && @@ -1280,8 +1425,10 @@ 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) @@ -1290,9 +1437,10 @@ 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" \ @@ -1308,9 +1456,10 @@ 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) @@ -1332,19 +1481,141 @@ 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 && @@ -1360,21 +1631,27 @@ 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 && - test_must_fail git rebase -i --exec "git show HEAD" \ - --autosquash master >actual && + ( + set_cat_todo_editor && + 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) @@ -1390,19 +1667,24 @@ 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) ' @@ -1419,42 +1701,105 @@ 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 && - FAKE_LINES="5 1" git rebase -i --root && + ( + set_fake_editor && + 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 && - FAKE_LINES="2" git rebase -i HEAD~2 && + ( + set_fake_editor && + 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 +' + +test_expect_success 'correct error message for partial commit after empty pick' ' + test_when_finished "git rebase --abort" && + ( + set_fake_editor && + FAKE_LINES="2 1 1" && + export FAKE_LINES && + test_must_fail git rebase -i A D + ) && + echo x >file1 && + test_must_fail git commit file1 2>err && + test_i18ngrep "cannot do a partial commit during a rebase." err +' + +test_expect_success 'correct error message for commit --amend after empty pick' ' + test_when_finished "git rebase --abort" && + ( + set_fake_editor && + FAKE_LINES="1 1" && + export FAKE_LINES && + test_must_fail git rebase -i A D + ) && + echo x>file1 && + test_must_fail git commit -a --amend 2>err && + test_i18ngrep "middle of a rebase -- cannot amend." err +' + +test_expect_success 'todo has correct onto hash' ' + GIT_SEQUENCE_EDITOR=cat git rebase -i no-conflict-branch~4 no-conflict-branch >actual && + onto=$(git rev-parse --short HEAD~4) && + test_i18ngrep "^# Rebase ..* onto $onto" 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 b393e1e9fe..927a4f4a4e 100755 --- a/third_party/git/t/t3406-rebase-message.sh +++ b/third_party/git/t/t3406-rebase-message.sh @@ -18,32 +18,29 @@ test_expect_success 'setup' ' ' test_expect_success 'rebase -m' ' - git rebase -m master >report && - >expect && - sed -n -e "/^Already applied: /p" \ - -e "/^Committed: /p" report >actual && - test_cmp expect actual + git rebase -m master >actual && + test_must_be_empty actual ' test_expect_success 'rebase against master twice' ' - git rebase master >out && + git rebase --apply 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 master >out && + git rebase --force-rebase --apply 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 master topic >out && + git rebase --apply 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 topic >out && + git rebase --apply topic >out && test_i18ngrep "Fast-forwarded HEAD to topic" out ' @@ -95,9 +92,9 @@ test_expect_success 'GIT_REFLOG_ACTION' ' git rebase reflog-onto && git log -g --format=%gs -3 >actual && cat >expect <<-\EOF && - rebase finished: returning to refs/heads/reflog-topic - rebase: reflog-to-rebase - rebase: checkout reflog-onto + rebase (finish): returning to refs/heads/reflog-topic + rebase (pick): reflog-to-rebase + rebase (start): checkout reflog-onto EOF test_cmp expect actual && @@ -105,9 +102,9 @@ test_expect_success 'GIT_REFLOG_ACTION' ' 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 - change-the-reflog: reflog-to-rebase - change-the-reflog: checkout reflog-onto + change-the-reflog (finish): returning to refs/heads/reflog-prefix + change-the-reflog (pick): reflog-to-rebase + change-the-reflog (start): checkout reflog-onto EOF test_cmp expect actual ' diff --git a/third_party/git/t/t3407-rebase-abort.sh b/third_party/git/t/t3407-rebase-abort.sh index 910f218284..97efea0f56 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 "" .git/rebase-apply +testrebase " --apply" .git/rebase-apply testrebase " --merge" .git/rebase-merge -test_expect_success 'rebase --quit' ' +test_expect_success 'rebase --apply --quit' ' cd "$work_dir" && # Clean up the state from the previous one git reset --hard pre-rebase && - test_must_fail git rebase master && + test_must_fail git rebase --apply 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 22d218698e..7bab6000dc 100755 --- a/third_party/git/t/t3415-rebase-autosquash.sh +++ b/third_party/git/t/t3415-rebase-autosquash.sh @@ -25,6 +25,13 @@ 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 && @@ -35,10 +42,19 @@ test_auto_fixup () { test_tick && git rebase $2 -i HEAD^^^ && git log --oneline >actual && - 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) + 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_expect_success 'auto fixup (option)' ' @@ -48,12 +64,19 @@ 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_must_fail test_auto_fixup fixup-config-true-no --no-autosquash && + test_auto_fixup ! fixup-config-true-no --no-autosquash && git config rebase.autosquash false && - test_must_fail test_auto_fixup final-fixup-config-false + 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 && @@ -64,10 +87,19 @@ test_auto_squash () { test_tick && git rebase $2 -i HEAD^^^ && git log --oneline >actual && - 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) + 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_expect_success 'auto squash (option)' ' @@ -77,9 +109,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_must_fail test_auto_squash squash-config-true-no --no-autosquash && + test_auto_squash ! squash-config-true-no --no-autosquash && git config rebase.autosquash false && - test_must_fail test_auto_squash final-squash-config-false + test_auto_squash ! final-squash-config-false ' test_expect_success 'misspelled auto squash' ' @@ -94,7 +126,8 @@ test_expect_success 'misspelled auto squash' ' git log --oneline >actual && test_line_count = 4 actual && git diff --exit-code final-missquash && - test 0 = $(git rev-list final-missquash...HEAD | wc -l) + git rev-list final-missquash...HEAD >list && + test_must_be_empty list ' test_expect_success 'auto squash that matches 2 commits' ' @@ -113,9 +146,15 @@ test_expect_success 'auto squash that matches 2 commits' ' git log --oneline >actual && test_line_count = 4 actual && git diff --exit-code final-multisquash && - 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) + 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_expect_success 'auto squash that matches a commit after the squash' ' @@ -134,25 +173,38 @@ 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 && - 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) + 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_expect_success 'auto squash that matches a sha1' ' git reset --hard base && echo 1 >file1 && git add -u && test_tick && - git commit -m "squash! $(git rev-parse --short HEAD^)" && + oid=$(git rev-parse --short HEAD^) && + git commit -m "squash! $oid" && 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 && - test 1 = "$(git cat-file blob HEAD^:file1)" && - test 1 = $(git cat-file commit HEAD^ | grep squash | wc -l) + 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_expect_success 'auto squash that matches longer sha1' ' @@ -160,15 +212,20 @@ test_expect_success 'auto squash that matches longer sha1' ' echo 1 >file1 && git add -u && test_tick && - git commit -m "squash! $(git rev-parse --short=11 HEAD^)" && + oid=$(git rev-parse --short=11 HEAD^) && + git commit -m "squash! $oid" && 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 && - test 1 = "$(git cat-file blob HEAD^:file1)" && - test 1 = $(git cat-file commit HEAD^ | grep squash | wc -l) + 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_auto_commit_flags () { @@ -183,8 +240,12 @@ test_auto_commit_flags () { git log --oneline >actual && test_line_count = 3 actual && git diff --exit-code final-commit-$1 && - test 1 = "$(git cat-file blob HEAD^:file1)" && - test $2 = $(git cat-file commit HEAD^ | grep first | wc -l) + 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_expect_success 'use commit --fixup' ' @@ -210,11 +271,15 @@ 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 $(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 + pick $parent3 first commit + $1 $parent1 $1! first + $1 $head $1! $2! first + pick $parent2 second commit EOF test_cmp expected actual ) && @@ -222,13 +287,17 @@ test_auto_fixup_fixup () { git log --oneline >actual && test_line_count = 3 actual git diff --exit-code "final-$1-$2" && - test 2 = "$(git cat-file blob HEAD^:file1)" && + echo 2 >expect && + git cat-file blob HEAD^:file1 >actual && + test_cmp expect actual && + git cat-file commit HEAD^ >commit && + grep first commit >actual && if test "$1" = "fixup" then - test 1 = $(git cat-file commit HEAD^ | grep first | wc -l) + test_line_count = 1 actual elif test "$1" = "squash" then - test 3 = $(git cat-file commit HEAD^ | grep first | wc -l) + test_line_count = 3 actual else false fi @@ -256,19 +325,25 @@ test_expect_success C_LOCALE_OUTPUT 'autosquash with custom inst format' ' echo 2 >file1 && git add -u && test_tick && - git commit -m "squash! $(git rev-parse --short HEAD^)" && + oid=$(git rev-parse --short HEAD^) && + git commit -m "squash! $oid" && echo 1 >file1 && git add -u && test_tick && - git commit -m "squash! $(git log -n 1 --format=%s HEAD~2)" && + subject=$(git log -n 1 --format=%s HEAD~2) && + git commit -m "squash! $subject" && 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 && - test 1 = "$(git cat-file blob HEAD^:file1)" && - test 2 = $(git cat-file commit HEAD^ | grep squash | wc -l) + 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_expect_success 'autosquash with empty custom instructionFormat' ' @@ -349,4 +424,20 @@ test_expect_success 'abort last squash' ' ! grep first actual ' +test_expect_success 'fixup a fixup' ' + echo 0to-fixup >file0 && + test_tick && + git commit -m "to-fixup" file0 && + test_tick && + git commit --squash HEAD -m X --allow-empty && + test_tick && + git commit --squash HEAD^ -m Y --allow-empty && + test_tick && + git commit -m "squash! $(git rev-parse HEAD^)" -m Z --allow-empty && + test_tick && + git commit -m "squash! $(git rev-parse HEAD^^)" -m W --allow-empty && + git rebase -ki --autosquash HEAD~5 && + test XZWY = $(git show | tr -cd W-Z) +' + test_done diff --git a/third_party/git/t/t3416-rebase-onto-threedots.sh b/third_party/git/t/t3416-rebase-onto-threedots.sh index ddf2f64853..9c2548423b 100755 --- a/third_party/git/t/t3416-rebase-onto-threedots.sh +++ b/third_party/git/t/t3416-rebase-onto-threedots.sh @@ -99,7 +99,64 @@ 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/t3417-rebase-whitespace-fix.sh b/third_party/git/t/t3417-rebase-whitespace-fix.sh index e85cdc7037..946e92f8da 100755 --- a/third_party/git/t/t3417-rebase-whitespace-fix.sh +++ b/third_party/git/t/t3417-rebase-whitespace-fix.sh @@ -52,7 +52,7 @@ test_expect_success 'blank line at end of file; extend at end of file' ' git commit --allow-empty -m "Initial empty commit" && git add file && git commit -m first && mv second file && - git add file && git commit -m second && + git add file && git commit -m second && git rebase --whitespace=fix HEAD^^ && git diff --exit-code HEAD^:file expect-first && test_cmp expect-second file @@ -118,7 +118,7 @@ test_expect_success 'at beginning of file' ' for i in 1 2 3 4 5; do echo $i done >> file && - git commit -m more file && + git commit -m more file && git rebase --whitespace=fix HEAD^^ && test_cmp expect-beginning file ' diff --git a/third_party/git/t/t3418-rebase-continue.sh b/third_party/git/t/t3418-rebase-continue.sh index 4eff14dae5..7a2da972fd 100755 --- a/third_party/git/t/t3418-rebase-continue.sh +++ b/third_party/git/t/t3418-rebase-continue.sh @@ -120,6 +120,20 @@ 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 49f548cdb9..1f32faa4a4 100755 --- a/third_party/git/t/t3419-rebase-patch-id.sh +++ b/third_party/git/t/t3419-rebase-patch-id.sh @@ -4,15 +4,6 @@ test_description='git rebase - test patch id computation' . ./test-lib.sh -count () { - i=0 - while test $i -lt $1 - do - echo "$i" - i=$(($i+1)) - done -} - scramble () { i=0 while read x @@ -26,75 +17,55 @@ scramble () { mv -f "$1.new" "$1" } -run () { - echo \$ "$@" - /usr/bin/time "$@" >/dev/null -} - test_expect_success 'setup' ' git commit --allow-empty -m initial && git tag root ' -do_tests () { - nlines=$1 pr=${2-} - - test_expect_success $pr "setup: $nlines lines" " - rm -f .gitattributes && - git checkout -q -f master && - git reset --hard root && - count $nlines >file && - git add file && - git commit -q -m initial && - git branch -f other && - - scramble file && - git add file && - git commit -q -m 'change big file' && - - git checkout -q other && - : >newfile && - git add newfile && - git commit -q -m 'add small file' && - - git cherry-pick master >/dev/null 2>&1 - " - - test_debug " - run git diff master^\! - " - - test_expect_success $pr 'setup attributes' " - echo 'file binary' >.gitattributes - " - - test_debug " - run git format-patch --stdout master && - run git format-patch --stdout --ignore-if-in-upstream master - " +test_expect_success 'setup: 500 lines' ' + rm -f .gitattributes && + git checkout -q -f master && + git reset --hard root && + test_seq 500 >file && + git add file && + git commit -q -m initial && + git branch -f other && + + scramble file && + git add file && + git commit -q -m "change big file" && + + git checkout -q other && + : >newfile && + git add newfile && + git commit -q -m "add small file" && + + git cherry-pick master >/dev/null 2>&1 +' - test_expect_success $pr 'detect upstream patch' ' - git checkout -q master && - scramble file && - git add file && - git commit -q -m "change big file again" && - git checkout -q other^{} && - git rebase master && - test_must_fail test -n "$(git rev-list master...HEAD~)" - ' +test_expect_success 'setup attributes' ' + echo "file binary" >.gitattributes +' - test_expect_success $pr 'do not drop patch' ' - git branch -f squashed master && - git checkout -q -f squashed && - git reset -q --soft HEAD~2 && - git commit -q -m squashed && - git checkout -q other^{} && - test_must_fail git rebase squashed && - rm -rf .git/rebase-apply - ' -} +test_expect_success 'detect upstream patch' ' + git checkout -q master && + scramble file && + git add file && + 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 +' -do_tests 500 -do_tests 50000 EXPENSIVE +test_expect_success 'do not drop patch' ' + git branch -f squashed master && + git checkout -q -f squashed && + git reset -q --soft HEAD~2 && + git commit -q -m squashed && + git checkout -q other^{} && + test_must_fail git rebase squashed && + git rebase --quit +' test_done diff --git a/third_party/git/t/t3420-rebase-autostash.sh b/third_party/git/t/t3420-rebase-autostash.sh index b8f4d03467..ca331733fb 100755 --- a/third_party/git/t/t3420-rebase-autostash.sh +++ b/third_party/git/t/t3420-rebase-autostash.sh @@ -34,10 +34,9 @@ test_expect_success setup ' remove_progress_re="$(printf "s/.*\\r//")" ' -create_expected_success_am () { +create_expected_success_apply () { 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 @@ -45,19 +44,17 @@ create_expected_success_am () { EOF } -create_expected_success_interactive () { +create_expected_success_merge () { 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_am () { +create_expected_failure_apply () { 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 @@ -67,10 +64,9 @@ create_expected_failure_am () { EOF } -create_expected_failure_interactive () { +create_expected_failure_merge () { 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. @@ -105,9 +101,9 @@ testrebase () { test_expect_success "rebase$type --autostash: check output" ' test_when_finished git branch -D rebased-feature-branch && - suffix=${type#\ --} && suffix=${suffix:-am} && - if test ${suffix} = "merge"; then - suffix=interactive + suffix=${type#\ --} && suffix=${suffix:-apply} && + if test ${suffix} = "interactive"; then + suffix=merge fi && create_expected_success_$suffix && sed "$remove_progress_re" <actual >actual2 && @@ -188,6 +184,26 @@ testrebase () { git checkout feature-branch ' + test_expect_success "rebase$type: --quit" ' + test_config rebase.autostash true && + git reset --hard && + git checkout -b rebased-feature-branch feature-branch && + test_when_finished git branch -D rebased-feature-branch && + echo dirty >>file3 && + git diff >expect && + test_must_fail git rebase$type related-onto-branch && + test_path_is_file $dotest/autostash && + test_path_is_missing file3 && + git rebase --quit && + test_when_finished git stash drop && + test_path_is_missing $dotest/autostash && + ! grep dirty file3 && + git stash show -p >actual && + test_cmp expect actual && + git reset --hard && + git checkout feature-branch + ' + test_expect_success "rebase$type: non-conflicting rebase, conflicting stash" ' test_config rebase.autostash true && git reset --hard && @@ -206,9 +222,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:-am} && - if test ${suffix} = "merge"; then - suffix=interactive + suffix=${type#\ --} && suffix=${suffix:-apply} && + if test ${suffix} = "interactive"; then + suffix=merge fi && create_expected_failure_$suffix && sed "$remove_progress_re" <actual >actual2 && @@ -238,7 +254,7 @@ test_expect_success "rebase: noop rebase" ' git checkout feature-branch ' -testrebase "" .git/rebase-apply +testrebase " --apply" .git/rebase-apply testrebase " --merge" .git/rebase-merge testrebase " --interactive" .git/rebase-merge @@ -306,4 +322,12 @@ 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 7274dca40b..4a9204b4b6 100755 --- a/third_party/git/t/t3421-rebase-topology-linear.sh +++ b/third_party/git/t/t3421-rebase-topology-linear.sh @@ -26,11 +26,21 @@ test_run_rebase () { test_linear_range 'd e' c.. " } -test_run_rebase success '' +test_run_rebase success --apply 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 @@ -40,7 +50,7 @@ test_run_rebase () { test_cmp_rev e HEAD " } -test_run_rebase success '' +test_run_rebase success --apply test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -51,12 +61,13 @@ 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 '' +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 failure -p @@ -64,13 +75,31 @@ 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 '' +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 @@ -110,7 +139,7 @@ test_run_rebase () { test_linear_range 'd i' h.. " } -test_run_rebase success '' +test_run_rebase success --apply test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -125,7 +154,7 @@ test_run_rebase () { test_linear_range 'd' h.. " } -test_run_rebase success '' +test_run_rebase success --apply test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -140,7 +169,7 @@ test_run_rebase () { test_linear_range 'd i' f.. " } -test_run_rebase success '' +test_run_rebase success --apply test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -155,7 +184,7 @@ test_run_rebase () { test_linear_range 'd gp i' h.. " } -test_run_rebase success '' +test_run_rebase success --apply test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -176,32 +205,31 @@ test_expect_success 'setup of linear history for empty commit tests' ' test_run_rebase () { result=$1 shift - test_expect_$result "rebase $* drops empty commit" " + test_expect_$result "rebase $* keeps begin-empty commits" " reset_rebase && - git rebase $* c l && - test_cmp_rev c HEAD~2 && - test_linear_range 'd l' c.. + git rebase $* j l && + test_cmp_rev c HEAD~4 && + test_linear_range 'j d k l' c.. " } -test_run_rebase success '' +test_run_rebase failure --apply 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 shift - test_expect_$result "rebase $* --keep-empty" " + test_expect_$result "rebase $* --no-keep-empty drops begin-empty commits" " reset_rebase && - git rebase $* --keep-empty c l && - test_cmp_rev c HEAD~3 && - test_linear_range 'd k l' c.. + git rebase $* --no-keep-empty c l && + test_cmp_rev c HEAD~2 && + test_linear_range 'd l' c.. " } -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 @@ -213,10 +241,9 @@ test_run_rebase () { test_linear_range 'd k l' j.. " } -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 success --rebase-merges # m @@ -253,7 +280,7 @@ test_run_rebase () { test_linear_range 'x y' c.. " } -test_run_rebase success '' +test_run_rebase success --apply test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -268,7 +295,7 @@ test_run_rebase () { test_linear_range 'x y' c.. " } -test_run_rebase success '' +test_run_rebase success --apply test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase failure -p @@ -283,7 +310,7 @@ test_run_rebase () { test_linear_range 'x y' m.. " } -test_run_rebase success '' +test_run_rebase success --apply test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -299,7 +326,7 @@ test_run_rebase () { " } -test_run_rebase success '' +test_run_rebase success --apply test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase failure -p @@ -314,7 +341,7 @@ test_run_rebase () { test_linear_range 'x y' m.. " } -test_run_rebase success '' +test_run_rebase success --apply test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase failure -p @@ -339,7 +366,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 a5868ea152..c8234062c6 100755 --- a/third_party/git/t/t3422-rebase-incompatible-options.sh +++ b/third_party/git/t/t3422-rebase-incompatible-options.sh @@ -61,8 +61,6 @@ test_rebase_am_only () { } test_rebase_am_only --whitespace=fix -test_rebase_am_only --ignore-whitespace -test_rebase_am_only --committer-date-is-author-date test_rebase_am_only -C4 test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' ' @@ -76,14 +74,4 @@ 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 new file mode 100755 index 0000000000..5e1045a0af --- /dev/null +++ b/third_party/git/t/t3424-rebase-empty.sh @@ -0,0 +1,170 @@ +#!/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 --empty=drop --keep-empty' ' + git checkout -B testing localmods && + git rebase --merge --empty=drop --keep-empty 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 --no-keep-empty' ' + git checkout -B testing localmods && + git rebase --merge --empty=drop --no-keep-empty upstream && + + test_write_lines C B A >expect && + git log --format=%s >actual && + test_cmp expect actual +' + +test_expect_success 'rebase --merge --empty=keep --keep-empty' ' + git checkout -B testing localmods && + git rebase --merge --empty=keep --keep-empty 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=keep --no-keep-empty' ' + git checkout -B testing localmods && + git rebase --merge --empty=keep --no-keep-empty upstream && + + test_write_lines C2 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 fd8efe84fe..e42faa44e7 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 '' +test_run_rebase success --apply 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' '' +test_run_rebase success 'n o e' --apply 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' '' +test_run_rebase success 'd n o e' --apply 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' '' +test_run_rebase success 'd n o e' --apply 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/t3426-rebase-submodule.sh b/third_party/git/t/t3426-rebase-submodule.sh index a2bba04ba9..0ad3a07bf4 100755 --- a/third_party/git/t/t3426-rebase-submodule.sh +++ b/third_party/git/t/t3426-rebase-submodule.sh @@ -17,10 +17,11 @@ git_rebase () { git status -su >actual && ls -1pR * >>actual && test_cmp expect actual && - git rebase "$1" + may_only_be_test_must_fail "$2" && + $2 git rebase "$1" } -test_submodule_switch "git_rebase" +test_submodule_switch_func "git_rebase" git_rebase_interactive () { git status -su >expect && @@ -35,10 +36,11 @@ git_rebase_interactive () { test_cmp expect actual && set_fake_editor && echo "fake-editor.sh" >.git/info/exclude && - git rebase -i "$1" + may_only_be_test_must_fail "$2" && + $2 git rebase -i "$1" } -test_submodule_switch "git_rebase_interactive" +test_submodule_switch_func "git_rebase_interactive" test_expect_success 'rebase interactive ignores modified submodules' ' test_when_finished "rm -rf super sub" && diff --git a/third_party/git/t/t3427-rebase-subtree.sh b/third_party/git/t/t3427-rebase-subtree.sh index d8640522a0..2a7d958ea7 100755 --- a/third_party/git/t/t3427-rebase-subtree.sh +++ b/third_party/git/t/t3427-rebase-subtree.sh @@ -11,113 +11,99 @@ 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): +# +# topic_1 - topic_2 - topic_3 +# \ +# README ---------------------- Add subproject master - topic_4 - files_subtree/topic_5 +# +# Where the merge moves the files master[123].t into the subdirectory +# files_subtree/ and topic_4 as well as files_subtree/topic_5 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 - topic_4 - files_subtree/topic_5 - Empty commit +# +# where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t. +# +# This commit history is then rebased onto `topic_3` 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 && - 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 4' ' - reset_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" -' + git init files && + test_commit -C files topic_1 && + test_commit -C files topic_2 && + test_commit -C files topic_3 && -# 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)" = "files_subtree/master5" -' + : 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" && -# FAILURE: Does not preserve master4. -test_expect_failure REBASE_P \ - 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' ' - reset_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)" = "files_subtree/master4" + : add two extra commits to rebase && + test_commit -C files_subtree topic_4 && + test_commit files_subtree/topic_5 && + + 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 ' -# FAILURE: Does not preserve master5. -test_expect_failure REBASE_P \ - 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5' ' +# FAILURE: Does not preserve topic_4. +test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' ' reset_rebase && - 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" + git checkout -b rebase-preserve-merges to-rebase && + git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master && + verbose test "$(commit_message HEAD~)" = "topic_4" && + verbose test "$(commit_message HEAD)" = "files_subtree/topic_5" ' -# FAILURE: Does not preserve Empty. -test_expect_failure REBASE_P \ - 'Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit' ' +# FAILURE: Does not preserve topic_4. +test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto 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 checkout -b rebase-keep-empty to-rebase && git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master && + verbose test "$(commit_message HEAD~2)" = "topic_4" && + verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" && verbose test "$(commit_message HEAD)" = "Empty commit" ' -# FAILURE: fatal: Could not parse object -test_expect_failure 'Rebase -Xsubtree --onto commit 4' ' +test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' ' 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" + 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)" = "topic_4" && + verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" && + verbose test "$(commit_message HEAD)" = "Empty commit" ' -# 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' ' +test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' ' reset_rebase && - 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 && + 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)" = "topic_4" && + verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" && 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 76f6d306ea..7024d49ae7 100755 --- a/third_party/git/t/t3429-rebase-edit-todo.sh +++ b/third_party/git/t/t3429-rebase-edit-todo.sh @@ -3,15 +3,21 @@ 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 SHA1 'loose object cache vs re-reading todo list' ' +test_expect_success '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 && @@ -33,4 +39,47 @@ test_expect_success SHA1 '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 7b6c4847ad..b454f400eb 100755 --- a/third_party/git/t/t3430-rebase-merges.sh +++ b/third_party/git/t/t3430-rebase-merges.sh @@ -20,12 +20,11 @@ Initial setup: ' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-rebase.sh +. "$TEST_DIRECTORY"/lib-log-graph.sh test_cmp_graph () { cat >expect && - git log --graph --boundary --format=%s "$@" >output && - sed "s/ *$//" <output >output.trimmed && - test_cmp expect output.trimmed + lib_test_cmp_graph --boundary --format=%s "$@" } test_expect_success 'setup' ' @@ -37,20 +36,27 @@ 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 @@ -93,24 +99,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 d9df450 B + pick $b B label E reset onto - pick 5dee784 C + pick $c C label branch-point - pick ca2c861 F - pick 088b00a G + pick $f F + pick $g G label H reset branch-point # C - pick 12bd07b D - merge -C 2051b56 E # E - merge -C 233d48a H # H + pick $d D + merge -C $e E # E + merge -C $h H # H EOF @@ -151,7 +157,6 @@ 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 && @@ -340,7 +345,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 |\ @@ -402,7 +407,7 @@ test_expect_success 'octopus merges' ' | | * three | * | two | |/ - * | one + * / one |/ o before-octopus EOF @@ -415,7 +420,7 @@ test_expect_success 'with --autosquash and --exec' ' git commit --fixup B B.t && write_script show.sh <<-\EOF && subject="$(git show -s --format=%s HEAD)" - content="$(git diff HEAD^! | tail -n 1)" + content="$(git diff HEAD^ HEAD | tail -n 1)" echo "$subject: $content" EOF test_tick && @@ -441,4 +446,52 @@ 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 new file mode 100755 index 0000000000..172562789e --- /dev/null +++ b/third_party/git/t/t3431-rebase-fork-point.sh @@ -0,0 +1,77 @@ +#!/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 E D B A' --fork-point master + +test_rebase 'G F D B A' --fork-point --onto D refs/heads/master +test_rebase 'G F D B A' --fork-point --onto D master + +test_rebase 'G F B A' --fork-point --keep-base refs/heads/master +test_rebase 'G F B A' --fork-point --keep-base master + +test_rebase 'G F C E D B A' refs/heads/master +test_rebase 'G F C E D B A' master + +test_rebase 'G F C D B A' --onto D refs/heads/master +test_rebase 'G F C D B A' --onto D master + +test_rebase 'G F C B A' --keep-base refs/heads/master +test_rebase 'G F C B A' --keep-base master + +test_expect_success 'git rebase --fork-point with ambigous refname' ' + git checkout master && + git checkout -b one && + git checkout side && + git tag one && + test_must_fail git rebase --fork-point --onto D one +' + +test_done diff --git a/third_party/git/t/t3432-rebase-fast-forward.sh b/third_party/git/t/t3432-rebase-fast-forward.sh new file mode 100755 index 0000000000..a29eda87e9 --- /dev/null +++ b/third_party/git/t/t3432-rebase-fast-forward.sh @@ -0,0 +1,138 @@ +#!/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 0 " --apply" "$*" && + test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --apply --no-ff" "$*" + test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --merge" "$*" && + test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --merge --no-ff" "$*" + test_rebase_same_head_ $status_n $what_n $cmp_n 1 " --merge" "$*" && + test_rebase_same_head_ $status_f $what_f $cmp_f 1 " --merge --no-ff" "$*" +} + +test_rebase_same_head_ () { + status="$1" && + shift && + what="$1" && + shift && + cmp="$1" && + shift && + abbreviate="$1" && + shift && + flag="$1" + shift && + if test $abbreviate -eq 1 + then + msg="git rebase$flag $* (rebase.abbreviateCommands = true) with $changes is $what with $cmp HEAD" + else + msg="git rebase$flag $* with $changes is $what with $cmp HEAD" + fi && + test_expect_$status "$msg" " + if test $abbreviate -eq 1 + then + test_config rebase.abbreviateCommands true + fi && + oldhead=\$(git rev-parse HEAD) && + test_when_finished 'git reset --hard \$oldhead' && + git reflog HEAD >expect && + git rebase$flag $* >stdout && + git reflog HEAD >actual && + if test $what = work + then + old=\$(wc -l <expect) && + test_line_count '-gt' \$old actual + elif test $what = noop + then + test_cmp expect actual + 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 new file mode 100755 index 0000000000..05df964670 --- /dev/null +++ b/third_party/git/t/t3433-rebase-across-mode-change.sh @@ -0,0 +1,48 @@ +#!/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 new file mode 100755 index 0000000000..c7c835cde9 --- /dev/null +++ b/third_party/git/t/t3434-rebase-i18n.sh @@ -0,0 +1,84 @@ +#!/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 new file mode 100644 index 0000000000..7cbef0ee6f --- /dev/null +++ b/third_party/git/t/t3434/ISO8859-1.txt @@ -0,0 +1,3 @@ +ฤหัฯึ + +มb็d่fg diff --git a/third_party/git/t/t3434/eucJP.txt b/third_party/git/t/t3434/eucJP.txt new file mode 100644 index 0000000000..546f2aac01 --- /dev/null +++ b/third_party/git/t/t3434/eucJP.txt @@ -0,0 +1,4 @@ +คฯค์คาคคี + +คทคฦคคค๋คฮคฌกขคคค๋คฮควกฃ +฿ภษอคค์คืค๊คค์คคำคฐค๊คํคุกฃ diff --git a/third_party/git/t/t3435-rebase-gpg-sign.sh b/third_party/git/t/t3435-rebase-gpg-sign.sh new file mode 100755 index 0000000000..b47c59c190 --- /dev/null +++ b/third_party/git/t/t3435-rebase-gpg-sign.sh @@ -0,0 +1,71 @@ +#!/bin/sh +# +# Copyright (c) 2020 Doan Tran Cong Danh +# + +test_description='test rebase --[no-]gpg-sign' + +. ./test-lib.sh +. "$TEST_DIRECTORY/lib-rebase.sh" +. "$TEST_DIRECTORY/lib-gpg.sh" + +if ! test_have_prereq GPG +then + skip_all='skip all test rebase --[no-]gpg-sign, gpg not available' + test_done +fi + +test_rebase_gpg_sign () { + local must_fail= will=will fake_editor= + if test "x$1" = "x!" + then + must_fail=test_must_fail + will="won't" + shift + fi + conf=$1 + shift + test_expect_success "rebase $* with commit.gpgsign=$conf $will sign commit" " + git reset two && + git config commit.gpgsign $conf && + set_fake_editor && + FAKE_LINES='r 1 p 2' git rebase --force-rebase --root $* && + $must_fail git verify-commit HEAD^ && + $must_fail git verify-commit HEAD + " +} + +test_expect_success 'setup' ' + test_commit one && + test_commit two && + test_must_fail git verify-commit HEAD && + test_must_fail git verify-commit HEAD^ +' + +test_expect_success 'setup: merge commit' ' + test_commit fork-point && + git switch -c side && + test_commit three && + git switch master && + git merge --no-ff side && + git tag merged +' + +test_rebase_gpg_sign ! false +test_rebase_gpg_sign true +test_rebase_gpg_sign ! true --no-gpg-sign +test_rebase_gpg_sign ! true --gpg-sign --no-gpg-sign +test_rebase_gpg_sign false --no-gpg-sign --gpg-sign +test_rebase_gpg_sign true -i +test_rebase_gpg_sign ! true -i --no-gpg-sign +test_rebase_gpg_sign ! true -i --gpg-sign --no-gpg-sign +test_rebase_gpg_sign false -i --no-gpg-sign --gpg-sign + +test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' ' + git reset --hard merged && + git config commit.gpgsign true && + git rebase -p --no-gpg-sign --onto=one fork-point master && + test_must_fail git verify-commit HEAD +' + +test_done diff --git a/third_party/git/t/t3436-rebase-more-options.sh b/third_party/git/t/t3436-rebase-more-options.sh new file mode 100755 index 0000000000..eaaf4c8d1d --- /dev/null +++ b/third_party/git/t/t3436-rebase-more-options.sh @@ -0,0 +1,180 @@ +#!/bin/sh +# +# Copyright (c) 2019 Rohit Ashiwal +# + +test_description='tests to ensure compatibility between am and interactive backends' + +. ./test-lib.sh + +. "$TEST_DIRECTORY"/lib-rebase.sh + +GIT_AUTHOR_DATE="1999-04-02T08:03:20+05:30" +export GIT_AUTHOR_DATE + +# This is a special case in which both am and interactive backends +# provide the same output. It was done intentionally because +# both the backends fall short of optimal behaviour. +test_expect_success 'setup' ' + git checkout -b topic && + test_write_lines "line 1" " line 2" "line 3" >file && + git add file && + git commit -m "add file" && + + test_write_lines "line 1" "new line 2" "line 3" >file && + git commit -am "update file" && + git tag side && + test_commit commit1 foo foo1 && + test_commit commit2 foo foo2 && + test_commit commit3 foo foo3 && + + git checkout --orphan master && + rm foo && + test_write_lines "line 1" " line 2" "line 3" >file && + git commit -am "add file" && + git tag main && + + mkdir test-bin && + write_script test-bin/git-merge-test <<-\EOF + exec git merge-recursive "$@" + EOF +' + +test_expect_success '--ignore-whitespace works with apply backend' ' + test_must_fail git rebase --apply main side && + git rebase --abort && + git rebase --apply --ignore-whitespace main side && + git diff --exit-code side +' + +test_expect_success '--ignore-whitespace works with merge backend' ' + test_must_fail git rebase --merge main side && + git rebase --abort && + git rebase --merge --ignore-whitespace main side && + git diff --exit-code side +' + +test_expect_success '--ignore-whitespace is remembered when continuing' ' + ( + set_fake_editor && + FAKE_LINES="break 1" git rebase -i --ignore-whitespace \ + main side && + git rebase --continue + ) && + git diff --exit-code side +' + +test_ctime_is_atime () { + git log $1 --format="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> %ai" >authortime && + git log $1 --format="%cn <%ce> %ci" >committertime && + test_cmp authortime committertime +} + +test_expect_success '--committer-date-is-author-date works with apply backend' ' + GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author && + git rebase --apply --committer-date-is-author-date HEAD^ && + test_ctime_is_atime -1 +' + +test_expect_success '--committer-date-is-author-date works with merge backend' ' + GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author && + git rebase -m --committer-date-is-author-date HEAD^ && + test_ctime_is_atime -1 +' + +test_expect_success '--committer-date-is-author-date works with rebase -r' ' + git checkout side && + GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 && + git rebase -r --root --committer-date-is-author-date && + test_ctime_is_atime +' + +test_expect_success '--committer-date-is-author-date works when forking merge' ' + git checkout side && + GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 && + PATH="./test-bin:$PATH" git rebase -r --root --strategy=test \ + --committer-date-is-author-date && + test_ctime_is_atime +' + +test_expect_success '--committer-date-is-author-date works when committing conflict resolution' ' + git checkout commit2 && + GIT_AUTHOR_DATE="@1980 +0000" git commit --amend --only --reset-author && + test_must_fail git rebase -m --committer-date-is-author-date \ + --onto HEAD^^ HEAD^ && + echo resolved > foo && + git add foo && + git rebase --continue && + test_ctime_is_atime -1 +' + +# Checking for +0000 in the author date is sufficient since the +# default timezone is UTC but the timezone used while committing is +# +0530. The inverted logic in the grep is necessary to check all the +# author dates in the file. +test_atime_is_ignored () { + git log $1 --format=%ai >authortime && + ! grep -v +0000 authortime +} + +test_expect_success '--reset-author-date works with apply backend' ' + git commit --amend --date="$GIT_AUTHOR_DATE" && + git rebase --apply --reset-author-date HEAD^ && + test_atime_is_ignored -1 +' + +test_expect_success '--reset-author-date works with merge backend' ' + git commit --amend --date="$GIT_AUTHOR_DATE" && + git rebase --reset-author-date -m HEAD^ && + test_atime_is_ignored -1 +' + +test_expect_success '--reset-author-date works after conflict resolution' ' + test_must_fail git rebase --reset-author-date -m \ + --onto commit2^^ commit2^ commit2 && + echo resolved >foo && + git add foo && + git rebase --continue && + test_atime_is_ignored -1 +' + +test_expect_success '--reset-author-date works with rebase -r' ' + git checkout side && + git merge --no-ff commit3 && + git rebase -r --root --reset-author-date && + test_atime_is_ignored +' + +test_expect_success '--reset-author-date with --committer-date-is-author-date works' ' + test_must_fail git rebase -m --committer-date-is-author-date \ + --reset-author-date --onto commit2^^ commit2^ commit3 && + git checkout --theirs foo && + git add foo && + git rebase --continue && + test_ctime_is_atime -2 && + test_atime_is_ignored -2 +' + +test_expect_success '--reset-author-date --committer-date-is-author-date works when forking merge' ' + GIT_SEQUENCE_EDITOR="echo \"merge -C $(git rev-parse HEAD) commit3\">" \ + PATH="./test-bin:$PATH" git rebase -i --strategy=test \ + --reset-author-date \ + --committer-date-is-author-date side side && + test_ctime_is_atime -1 && + test_atime_is_ignored -1 + ' + +test_expect_success '--ignore-date is an alias for --reset-author-date' ' + git commit --amend --date="$GIT_AUTHOR_DATE" && + git rebase --apply --ignore-date HEAD^ && + git commit --allow-empty -m empty --date="$GIT_AUTHOR_DATE" && + git rebase -m --ignore-date HEAD^ && + test_atime_is_ignored -2 +' + +# 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/t3500-cherry.sh b/third_party/git/t/t3500-cherry.sh index f038f34b7c..2b8d9cb38e 100755 --- a/third_party/git/t/t3500-cherry.sh +++ b/third_party/git/t/t3500-cherry.sh @@ -55,4 +55,27 @@ test_expect_success \ expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* - .*" ' +test_expect_success 'cherry ignores whitespace' ' + git switch --orphan=upstream-with-space && + test_commit initial file && + >expect && + git switch --create=feature-without-space && + + # A spaceless file on the feature branch. Expect a match upstream. + printf space >file && + git add file && + git commit -m"file without space" && + git log --format="- %H" -1 >>expect && + + # A further change. Should not match upstream. + test_commit change file && + git log --format="+ %H" -1 >>expect && + + git switch upstream-with-space && + # Same as the spaceless file, just with spaces and on upstream. + test_commit "file with space" file "s p a c e" file-with-space && + git cherry upstream-with-space feature-without-space >actual && + test_cmp expect actual +' + test_done diff --git a/third_party/git/t/t3501-revert-cherry-pick.sh b/third_party/git/t/t3501-revert-cherry-pick.sh index d1c68af8c5..3669dfb1be 100755 --- a/third_party/git/t/t3501-revert-cherry-pick.sh +++ b/third_party/git/t/t3501-revert-cherry-pick.sh @@ -47,7 +47,7 @@ test_expect_success 'cherry-pick --nonsense' ' git diff --exit-code HEAD && test_must_fail git cherry-pick --nonsense 2>msg && git diff --exit-code HEAD "$pos" && - test_i18ngrep '[Uu]sage:' msg + test_i18ngrep "[Uu]sage:" msg ' test_expect_success 'revert --nonsense' ' @@ -56,7 +56,7 @@ test_expect_success 'revert --nonsense' ' git diff --exit-code HEAD && test_must_fail git revert --nonsense 2>msg && git diff --exit-code HEAD "$pos" && - test_i18ngrep '[Uu]sage:' msg + test_i18ngrep "[Uu]sage:" msg ' test_expect_success 'cherry-pick after renaming branch' ' @@ -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 >out && + git cherry-pick refs/heads/unrelated && 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 a267b2d144..80a0d08706 100755 --- a/third_party/git/t/t3504-cherry-pick-rerere.sh +++ b/third_party/git/t/t3504-cherry-pick-rerere.sh @@ -94,8 +94,10 @@ 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 master && - test_must_fail test_cmp expect foo + test_must_fail git cherry-pick foo-master && + grep ===== foo && + grep foo-dev foo && + grep foo-master 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 127dd0082f..9d5adbc130 100755 --- a/third_party/git/t/t3506-cherry-pick-ff.sh +++ b/third_party/git/t/t3506-cherry-pick-ff.sh @@ -16,7 +16,11 @@ test_expect_success setup ' git add file1 && test_tick && git commit -m "second" && - git tag second + git tag second && + test_oid_cache <<-EOF + cp_ff sha1:1df192cd8bc58a2b275d842cede4d221ad9000d1 + cp_ff sha256:e70d6b7fc064bddb516b8d512c9057094b96ce6ff08e12080acc4fe7f1d60a1d + EOF ' test_expect_success 'cherry-pick using --ff fast forwards' ' @@ -102,7 +106,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)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1" + test "$(git rev-parse --verify HEAD)" = "$(test_oid cp_ff)" ' 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 9b9b4ca8d4..a21adcf0e4 100755 --- a/third_party/git/t/t3507-cherry-pick-conflict.sh +++ b/third_party/git/t/t3507-cherry-pick-conflict.sh @@ -161,6 +161,29 @@ test_expect_success 'successful commit clears CHERRY_PICK_HEAD' ' test_must_fail git rev-parse --verify CHERRY_PICK_HEAD ' + +test_expect_success 'partial commit of cherry-pick fails' ' + pristine_detach initial && + + test_must_fail git cherry-pick picked && + echo resolved >foo && + git add foo && + test_must_fail git commit foo 2>err && + + test_i18ngrep "cannot do a partial commit during a cherry-pick." err +' + +test_expect_success 'commit --amend of cherry-pick fails' ' + pristine_detach initial && + + test_must_fail git cherry-pick picked && + echo resolved >foo && + git add foo && + test_must_fail git commit --amend 2>err && + + test_i18ngrep "in the middle of a cherry-pick -- cannot amend." err +' + test_expect_success 'successful final commit clears cherry-pick state' ' pristine_detach initial && @@ -168,7 +191,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_must_fail test_path_exists .git/sequencer + test_path_is_missing .git/sequencer ' test_expect_success 'reset after final pick clears cherry-pick state' ' @@ -178,7 +201,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_must_fail test_path_exists .git/sequencer + test_path_is_missing .git/sequencer ' test_expect_success 'failed cherry-pick produces dirty index' ' @@ -260,12 +283,12 @@ test_expect_success 'failed cherry-pick describes conflict in work tree' ' a ======= c - >>>>>>> objid picked + >>>>>>> objid (picked) EOF test_must_fail git cherry-pick picked && - sed "s/[a-f0-9]*\.\.\./objid/" foo >actual && + sed "s/[a-f0-9]* (/objid (/" foo >actual && test_cmp expected actual ' @@ -275,16 +298,16 @@ test_expect_success 'diff3 -m style' ' cat <<-EOF >expected && <<<<<<< HEAD a - ||||||| parent of objid picked + ||||||| parent of objid (picked) b ======= c - >>>>>>> objid picked + >>>>>>> objid (picked) EOF test_must_fail git cherry-pick picked && - sed "s/[a-f0-9]*\.\.\./objid/" foo >actual && + sed "s/[a-f0-9]* (/objid (/" foo >actual && test_cmp expected actual ' @@ -296,7 +319,7 @@ test_expect_success 'revert also handles conflicts sanely' ' a ======= b - >>>>>>> parent of objid picked + >>>>>>> parent of objid (picked) EOF { git checkout picked -- foo && @@ -322,7 +345,7 @@ test_expect_success 'revert also handles conflicts sanely' ' test_must_fail git update-index --refresh -q && test_must_fail git diff-index --exit-code HEAD && test_cmp expected-stages actual-stages && - sed "s/[a-f0-9]*\.\.\./objid/" foo >actual && + sed "s/[a-f0-9]* (/objid (/" foo >actual && test_cmp expected actual ' @@ -381,23 +404,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_must_fail test_path_exists .git/sequencer + 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_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_must_fail test_path_exists .git/sequencer + 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_expect_success 'revert conflict, diff3 -m style' ' @@ -406,16 +429,16 @@ test_expect_success 'revert conflict, diff3 -m style' ' cat <<-EOF >expected && <<<<<<< HEAD a - ||||||| objid picked + ||||||| objid (picked) c ======= b - >>>>>>> parent of objid picked + >>>>>>> parent of objid (picked) EOF test_must_fail git revert picked && - sed "s/[a-f0-9]*\.\.\./objid/" foo >actual && + sed "s/[a-f0-9]* (/objid (/" foo >actual && test_cmp expected actual ' @@ -489,7 +512,7 @@ test_expect_success 'commit after failed cherry-pick adds -s at the right place' Signed-off-by: C O Mitter <committer@example.com> # Conflicts: EOF - grep -e "^# Conflicts:" -e '^Signed-off-by' .git/COMMIT_EDITMSG >actual && + grep -e "^# Conflicts:" -e "^Signed-off-by" .git/COMMIT_EDITMSG >actual && test_cmp expect actual && cat <<-\EOF >expected && @@ -518,7 +541,7 @@ test_expect_success 'commit --amend -s places the sign-off at the right place' ' Signed-off-by: C O Mitter <committer@example.com> Conflicts: EOF - grep -e "^Conflicts:" -e '^Signed-off-by' .git/COMMIT_EDITMSG >actual && + grep -e "^Conflicts:" -e "^Signed-off-by" .git/COMMIT_EDITMSG >actual && test_cmp expect actual ' 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 b457333e18..23070a7b73 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/t3510-cherry-pick-sequence.sh b/third_party/git/t/t3510-cherry-pick-sequence.sh index 793bcc7fe3..5b94fdaa67 100755 --- a/third_party/git/t/t3510-cherry-pick-sequence.sh +++ b/third_party/git/t/t3510-cherry-pick-sequence.sh @@ -123,7 +123,8 @@ test_expect_success 'revert --skip to skip commit' ' test_expect_success 'skip "empty" commit' ' pristine_detach picked && test_commit dummy foo d && - test_must_fail git cherry-pick anotherpick && + test_must_fail git cherry-pick anotherpick 2>err && + test_i18ngrep "git cherry-pick --skip" err && git cherry-pick --skip && test_cmp_rev dummy HEAD ' diff --git a/third_party/git/t/t3512-cherry-pick-submodule.sh b/third_party/git/t/t3512-cherry-pick-submodule.sh index bd78287841..6ece1d8573 100755 --- a/third_party/git/t/t3512-cherry-pick-submodule.sh +++ b/third_party/git/t/t3512-cherry-pick-submodule.sh @@ -7,7 +7,7 @@ test_description='cherry-pick can handle submodules' KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 -test_submodule_switch "git cherry-pick" +test_submodule_switch "cherry-pick" test_expect_success 'unrelated submodule/file conflict is ignored' ' test_create_repo sub && diff --git a/third_party/git/t/t3513-revert-submodule.sh b/third_party/git/t/t3513-revert-submodule.sh index 5e39fcdb66..a759f12cbb 100755 --- a/third_party/git/t/t3513-revert-submodule.sh +++ b/third_party/git/t/t3513-revert-submodule.sh @@ -15,7 +15,12 @@ git_revert () { git status -su >expect && ls -1pR * >>expect && tar cf "$TRASH_DIRECTORY/tmp.tar" * && - git checkout "$1" && + may_only_be_test_must_fail "$2" && + $2 git checkout "$1" && + if test -n "$2" + then + return + fi && git revert HEAD && rm -rf * && tar xf "$TRASH_DIRECTORY/tmp.tar" && @@ -26,6 +31,6 @@ git_revert () { } KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 -test_submodule_switch "git_revert" +test_submodule_switch_func "git_revert" test_done diff --git a/third_party/git/t/t3514-cherry-pick-revert-gpg.sh b/third_party/git/t/t3514-cherry-pick-revert-gpg.sh new file mode 100755 index 0000000000..5b2e250eaa --- /dev/null +++ b/third_party/git/t/t3514-cherry-pick-revert-gpg.sh @@ -0,0 +1,86 @@ +#!/bin/sh +# +# Copyright (c) 2020 Doan Tran Cong Danh +# + +test_description='test {cherry-pick,revert} --[no-]gpg-sign' + +. ./test-lib.sh +. "$TEST_DIRECTORY/lib-gpg.sh" + +if ! test_have_prereq GPG +then + skip_all='skip all test {cherry-pick,revert} --[no-]gpg-sign, gpg not available' + test_done +fi + +test_gpg_sign () { + local must_fail= will=will fake_editor= + if test "x$1" = "x!" + then + must_fail=test_must_fail + will="won't" + shift + fi + conf=$1 + cmd=$2 + cmit=$3 + shift 3 + test_expect_success "$cmd $* $cmit with commit.gpgsign=$conf $will sign commit" " + git reset --hard tip && + git config commit.gpgsign $conf && + git $cmd $* $cmit && + git rev-list tip.. >rev-list && + $must_fail git verify-commit \$(cat rev-list) + " +} + +test_expect_success 'setup' ' + test_commit one && + git switch -c side && + test_commit side1 && + test_commit side2 && + git switch - && + test_commit two && + test_commit three && + test_commit tip +' + +test_gpg_sign ! false cherry-pick side +test_gpg_sign ! false cherry-pick ..side +test_gpg_sign true cherry-pick side +test_gpg_sign true cherry-pick ..side +test_gpg_sign ! true cherry-pick side --no-gpg-sign +test_gpg_sign ! true cherry-pick ..side --no-gpg-sign +test_gpg_sign ! true cherry-pick side --gpg-sign --no-gpg-sign +test_gpg_sign ! true cherry-pick ..side --gpg-sign --no-gpg-sign +test_gpg_sign false cherry-pick side --no-gpg-sign --gpg-sign +test_gpg_sign false cherry-pick ..side --no-gpg-sign --gpg-sign +test_gpg_sign true cherry-pick side --edit +test_gpg_sign true cherry-pick ..side --edit +test_gpg_sign ! true cherry-pick side --edit --no-gpg-sign +test_gpg_sign ! true cherry-pick ..side --edit --no-gpg-sign +test_gpg_sign ! true cherry-pick side --edit --gpg-sign --no-gpg-sign +test_gpg_sign ! true cherry-pick ..side --edit --gpg-sign --no-gpg-sign +test_gpg_sign false cherry-pick side --edit --no-gpg-sign --gpg-sign +test_gpg_sign false cherry-pick ..side --edit --no-gpg-sign --gpg-sign + +test_gpg_sign ! false revert HEAD --edit +test_gpg_sign ! false revert two.. --edit +test_gpg_sign true revert HEAD --edit +test_gpg_sign true revert two.. --edit +test_gpg_sign ! true revert HEAD --edit --no-gpg-sign +test_gpg_sign ! true revert two.. --edit --no-gpg-sign +test_gpg_sign ! true revert HEAD --edit --gpg-sign --no-gpg-sign +test_gpg_sign ! true revert two.. --edit --gpg-sign --no-gpg-sign +test_gpg_sign false revert HEAD --edit --no-gpg-sign --gpg-sign +test_gpg_sign false revert two.. --edit --no-gpg-sign --gpg-sign +test_gpg_sign true revert HEAD --no-edit +test_gpg_sign true revert two.. --no-edit +test_gpg_sign ! true revert HEAD --no-edit --no-gpg-sign +test_gpg_sign ! true revert two.. --no-edit --no-gpg-sign +test_gpg_sign ! true revert HEAD --no-edit --gpg-sign --no-gpg-sign +test_gpg_sign ! true revert two.. --no-edit --gpg-sign --no-gpg-sign +test_gpg_sign false revert HEAD --no-edit --no-gpg-sign --gpg-sign + +test_done diff --git a/third_party/git/t/t3600-rm.sh b/third_party/git/t/t3600-rm.sh index 66282a720e..efec8d13b6 100755 --- a/third_party/git/t/t3600-rm.sh +++ b/third_party/git/t/t3600-rm.sh @@ -113,9 +113,10 @@ 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 && - test $(grep "^rm " rm-output | wc -l) = 1 && - rm -f test-file rm-output && + 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 commit -m "remove file from rm test" ' @@ -243,11 +244,13 @@ test_expect_success 'choking "git rm" should not let it die with cruft' ' 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 1234567890123456789012345678901234567890 0 some-file-$i" + echo "100644 $hash 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 ' @@ -301,7 +304,8 @@ EOF test_expect_success 'rm removes empty submodules from work tree' ' mkdir submod && - git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) submod && + hash=$(git rev-parse HEAD) && + git update-index --add --cacheinfo 160000 "$hash" submod && git config -f .gitmodules submodule.sub.url ./. && git config -f .gitmodules submodule.sub.path submod && git submodule init && @@ -420,6 +424,13 @@ 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 && @@ -620,7 +631,8 @@ test_expect_success 'setup subsubmodule' ' git submodule update && ( cd submod && - git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod && + hash=$(git rev-parse HEAD) && + git update-index --add --cacheinfo 160000 "$hash" 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 new file mode 100755 index 0000000000..7de21f8bcf --- /dev/null +++ b/third_party/git/t/t3601-rm-pathspec-file.sh @@ -0,0 +1,79 @@ +#!/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 c325167b90..b7d4ba608c 100755 --- a/third_party/git/t/t3700-add.sh +++ b/third_party/git/t/t3700-add.sh @@ -192,7 +192,7 @@ test_expect_success 'git add --refresh with pathspec' ' test_must_be_empty actual && git diff-files --name-only >actual && - ! grep bar actual&& + ! grep bar actual && grep baz actual ' @@ -326,7 +326,9 @@ 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 -Use -f if you really want to add them. +hint: Use -f if you really want to add them. +hint: Turn this message off by running +hint: "git config advice.addIgnoredFile false" 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 69991a3168..ca04fac417 100755 --- a/third_party/git/t/t3701-add-interactive.sh +++ b/third_party/git/t/t3701-add-interactive.sh @@ -23,6 +23,26 @@ 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 () { + # The first element of $@ may be a shell function, as a result POSIX + # does not guarantee that "one-shot assignment" will not persist after + # the function call. Thus, we prevent these variables from escaping + # this function's context with this subshell. + ( + GIT_PAGER_IN_USE=true && + TERM=vt100 && + export GIT_PAGER_IN_USE TERM && + "$@" + ) +} + test_expect_success 'setup (initial)' ' echo content >file && git add file && @@ -57,6 +77,15 @@ 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 && @@ -94,7 +123,6 @@ test_expect_success 'revert works (commit)' ' grep "unchanged *+3/-0 file" output ' - test_expect_success 'setup expected' ' cat >expected <<-\EOF EOF @@ -263,6 +291,35 @@ 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 && @@ -314,7 +371,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/^Stage this hunk[^@]*\(@@ .*\)/\1/" \ + sed -n -e "s/^([1-2]\/[1-2]) Stage this hunk[^@]*\(@@ .*\)/\1/" \ -e "/^[-+@ \\\\]"/p >output && test_must_be_empty error && git diff --cached >diff && @@ -364,6 +421,25 @@ test_expect_success 'deleting an empty file' ' diff_cmp expected diff ' +test_expect_success 'adding an empty file' ' + git init added && + ( + cd added && + test_commit initial && + >empty && + git add empty && + test_tick && + git commit -m empty && + git tag added-file && + git reset --hard HEAD^ && + test_path_is_missing empty && + + echo y | git checkout -p added-file -- >actual && + test_path_is_file empty && + test_i18ngrep "Apply addition to index and worktree" actual + ) +' + test_expect_success 'split hunk setup' ' git reset --hard && test_write_lines 10 20 30 40 50 60 >test && @@ -374,6 +450,36 @@ 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: # @@ -403,6 +509,40 @@ 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 && @@ -429,35 +569,69 @@ test_expect_success 'patch mode ignores unmerged entries' ' diff_cmp expected diff ' -test_expect_success TTY 'diffs can be colorized' ' +test_expect_success 'index is refreshed after applying patch' ' + git reset --hard && + echo content >test && + printf y | git add -p && + git diff-files --exit-code +' + +test_expect_success 'diffs can be colorized' ' git reset --hard && echo content >test && - printf y | test_terminal git add -p >output 2>&1 && + printf y >y && + force_color git add -p >output 2>&1 <y && + git diff-files --exit-code && # 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 TTY 'diffFilter filters diff' ' +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' ' git reset --hard && echo content >test && test_config interactive.diffFilter "sed s/^/foo:/" && - printf y | test_terminal git add -p >output 2>&1 && + printf y >y && + force_color git add -p >output 2>&1 <y && # 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 TTY 'detect bogus diffFilter output' ' +test_expect_success 'detect bogus diffFilter output' ' git reset --hard && echo content >test && - test_config interactive.diffFilter "echo too-short" && - printf y | test_must_fail test_terminal git add -p + test_config interactive.diffFilter "sed 1d" && + printf y >y && + force_color test_must_fail 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_expect_success 'patch-mode via -i prompts for files' ' @@ -642,9 +816,72 @@ test_expect_success 'add -p patch editing works with pathological context lines' test_expect_success 'checkout -p works with pathological context lines' ' test_write_lines a a a a a a >a && git add a && - test_write_lines a b a b a b a b a b a > a&& + test_write_lines a b a b a b a b a b a >a && test_write_lines s n n y q | git checkout -p && test_write_lines a b a b a a b a b a >expect && test_cmp expect a ' + +# This should be called from a subshell as it sets a temporary editor +setup_new_file() { + write_script new-file-editor.sh <<-\EOF && + sed /^#/d "$1" >patch && + sed /^+c/d patch >"$1" + EOF + test_set_editor "$(pwd)/new-file-editor.sh" && + test_write_lines a b c d e f >new-file && + test_write_lines a b d e f >new-file-expect && + test_write_lines "@@ -0,0 +1,6 @@" +a +b +c +d +e +f >patch-expect +} + +test_expect_success 'add -N followed by add -p patch editing' ' + git reset --hard && + ( + setup_new_file && + git add -N new-file && + test_write_lines e n q | git add -p && + git cat-file blob :new-file >actual && + test_cmp new-file-expect actual && + test_cmp patch-expect patch + ) +' + +test_expect_success 'checkout -p patch editing of added file' ' + git reset --hard && + ( + setup_new_file && + git add new-file && + git commit -m "add new file" && + git rm new-file && + git commit -m "remove new file" && + test_write_lines e n q | git checkout -p HEAD^ && + test_cmp new-file-expect new-file && + test_cmp patch-expect patch + ) +' + +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 new file mode 100755 index 0000000000..9e35c1fbca --- /dev/null +++ b/third_party/git/t/t3704-add-pathspec-file.sh @@ -0,0 +1,159 @@ +#!/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 8eb47942e2..d696aa4e52 100755 --- a/third_party/git/t/t3800-mktag.sh +++ b/third_party/git/t/t3800-mktag.sh @@ -69,28 +69,28 @@ check_verify_failure '"object" line SHA1 check' '^error: char7: .*SHA1 hash$' # 4. type line label check cat >tag.sig <<EOF -object 779e9b33986b1c2670fff52c5067603117b3e895 +object $head xxxx tag tag mytag tagger . <> 0 +0000 EOF -check_verify_failure '"type" line label check' '^error: char47: .*"\\ntype "$' +check_verify_failure '"type" line label check' '^error: char.*: .*"\\ntype "$' ############################################################ # 5. type line eol check -echo "object 779e9b33986b1c2670fff52c5067603117b3e895" >tag.sig +echo "object $head" >tag.sig printf "type tagsssssssssssssssssssssssssssssss" >>tag.sig -check_verify_failure '"type" line eol check' '^error: char48: .*"\\n"$' +check_verify_failure '"type" line eol check' '^error: char.*: .*"\\n"$' ############################################################ # 6. tag line label check #1 cat >tag.sig <<EOF -object 779e9b33986b1c2670fff52c5067603117b3e895 +object $head type tag xxx mytag tagger . <> 0 +0000 @@ -98,37 +98,37 @@ tagger . <> 0 +0000 EOF check_verify_failure '"tag" line label check #1' \ - '^error: char57: no "tag " found$' + '^error: char.*: no "tag " found$' ############################################################ # 7. tag line label check #2 cat >tag.sig <<EOF -object 779e9b33986b1c2670fff52c5067603117b3e895 +object $head type taggggggggggggggggggggggggggggggg tag EOF check_verify_failure '"tag" line label check #2' \ - '^error: char87: no "tag " found$' + '^error: char.*: no "tag " found$' ############################################################ # 8. type line type-name length check cat >tag.sig <<EOF -object 779e9b33986b1c2670fff52c5067603117b3e895 +object $head type taggggggggggggggggggggggggggggggg tag mytag EOF check_verify_failure '"type" line type-name length check' \ - '^error: char53: type too long$' + '^error: char.*: type too long$' ############################################################ # 9. verify object (SHA1/type) check cat >tag.sig <<EOF -object 779e9b33986b1c2670fff52c5067603117b3e895 +object $(test_oid deadbeef) type tagggg tag mytag tagger . <> 0 +0000 @@ -150,7 +150,7 @@ tagger . <> 0 +0000 EOF check_verify_failure 'verify tag-name check' \ - '^error: char67: could not verify tag name$' + '^error: char.*: could not verify tag name$' ############################################################ # 11. tagger line label check #1 @@ -164,7 +164,7 @@ This is filler EOF check_verify_failure '"tagger" line label check #1' \ - '^error: char70: could not find "tagger "$' + '^error: char.*: could not find "tagger "$' ############################################################ # 12. tagger line label check #2 @@ -179,7 +179,7 @@ This is filler EOF check_verify_failure '"tagger" line label check #2' \ - '^error: char70: could not find "tagger "$' + '^error: char.*: could not find "tagger "$' ############################################################ # 13. disallow missing tag author name @@ -194,7 +194,7 @@ This is filler EOF check_verify_failure 'disallow missing tag author name' \ - '^error: char77: missing tagger name$' + '^error: char.*: missing tagger name$' ############################################################ # 14. disallow missing tag author name @@ -209,7 +209,7 @@ tagger T A Gger < EOF check_verify_failure 'disallow malformed tagger' \ - '^error: char77: malformed tagger field$' + '^error: char.*: malformed tagger field$' ############################################################ # 15. allow empty tag email @@ -238,7 +238,7 @@ tagger T A Gger <tag ger@example.com> 0 +0000 EOF check_verify_failure 'disallow spaces in tag email' \ - '^error: char77: malformed tagger field$' + '^error: char.*: malformed tagger field$' ############################################################ # 17. disallow missing tag timestamp @@ -252,7 +252,7 @@ tagger T A Gger <tagger@example.com>__ EOF check_verify_failure 'disallow missing tag timestamp' \ - '^error: char107: missing tag timestamp$' + '^error: char.*: missing tag timestamp$' ############################################################ # 18. detect invalid tag timestamp1 @@ -266,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: char107: missing tag timestamp$' + '^error: char.*: missing tag timestamp$' ############################################################ # 19. detect invalid tag timestamp2 @@ -280,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: char111: malformed tag timestamp$' + '^error: char.*: malformed tag timestamp$' ############################################################ # 20. detect invalid tag timezone1 @@ -294,7 +294,7 @@ tagger T A Gger <tagger@example.com> 1206478233 GMT EOF check_verify_failure 'detect invalid tag timezone1' \ - '^error: char118: malformed tag timezone$' + '^error: char.*: malformed tag timezone$' ############################################################ # 21. detect invalid tag timezone2 @@ -308,7 +308,7 @@ tagger T A Gger <tagger@example.com> 1206478233 + 30 EOF check_verify_failure 'detect invalid tag timezone2' \ - '^error: char118: malformed tag timezone$' + '^error: char.*: malformed tag timezone$' ############################################################ # 22. detect invalid tag timezone3 @@ -322,7 +322,7 @@ tagger T A Gger <tagger@example.com> 1206478233 -1430 EOF check_verify_failure 'detect invalid tag timezone3' \ - '^error: char118: malformed tag timezone$' + '^error: char.*: malformed tag timezone$' ############################################################ # 23. detect invalid header entry @@ -337,7 +337,7 @@ this line should not be here EOF check_verify_failure 'detect invalid header entry' \ - '^error: char124: trailing garbage in tag header$' + '^error: char.*: 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 b92ff95977..d277a9f4b7 100755 --- a/third_party/git/t/t3900-i18n-commit.sh +++ b/third_party/git/t/t3900-i18n-commit.sh @@ -204,4 +204,41 @@ 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 b8e337893f..9f7ca98967 100755 --- a/third_party/git/t/t3903-stash.sh +++ b/third_party/git/t/t3903-stash.sh @@ -7,6 +7,18 @@ 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 && @@ -36,7 +48,7 @@ EOF test_expect_success 'parents of stash' ' test $(git rev-parse stash^) = $(git rev-parse HEAD) && git diff stash^2..stash >output && - test_cmp expect output + diff_cmp expect output ' test_expect_success 'applying bogus stash does nothing' ' @@ -210,13 +222,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 && - test_cmp expect output && + diff_cmp expect output && git diff >output && - test_cmp expect1 output && + diff_cmp expect1 output && git add file && git commit -m alternate\ second && git diff master..stashbranch >output && - test_cmp output expect2 && + diff_cmp output expect2 && test 0 = $(git stash list | wc -l) ' @@ -232,8 +244,11 @@ test_expect_success 'save -q is quiet' ' test_must_be_empty output.out ' -test_expect_success 'pop -q is quiet' ' +test_expect_success 'pop -q works and 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 ' @@ -242,6 +257,8 @@ 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 ' @@ -268,6 +285,11 @@ 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 && @@ -577,7 +599,7 @@ test_expect_success 'stash show -p - stashes on stack, stash-like argument' ' +bar EOF git stash show -p ${STASH_ID} >actual && - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'stash show - no stashes on stack, stash-like argument' ' @@ -609,7 +631,7 @@ test_expect_success 'stash show -p - no stashes on stack, stash-like argument' ' +foo EOF git stash show -p ${STASH_ID} >actual && - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'stash show --patience shows diff' ' @@ -627,7 +649,7 @@ test_expect_success 'stash show --patience shows diff' ' +foo EOF git stash show --patience ${STASH_ID} >actual && - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'drop: fail early if specified stash is not a stash ref' ' @@ -791,7 +813,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 && - test_cmp expect output + diff_cmp expect output ' test_expect_success 'store called with invalid commit' ' @@ -847,7 +869,7 @@ test_expect_success 'stash list implies --first-parent -m' ' +working EOF git stash list --format=%gd -p >actual && - test_cmp expect actual + diff_cmp expect actual ' test_expect_success 'stash list --cc shows combined diff' ' @@ -864,7 +886,7 @@ test_expect_success 'stash list --cc shows combined diff' ' ++working EOF git stash list --format=%gd -p --cc >actual && - test_cmp expect actual + diff_cmp expect actual ' test_expect_success 'stash is not confused by partial renames' ' @@ -1241,4 +1263,45 @@ 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_expect_success 'stash -c stash.useBuiltin=false warning ' ' + expected="stash.useBuiltin support has been removed" && + + git -c stash.useBuiltin=false stash 2>err && + test_i18ngrep "$expected" err && + env GIT_TEST_STASH_USE_BUILTIN=false git stash 2>err && + test_i18ngrep "$expected" err && + + git -c stash.useBuiltin=true stash 2>err && + test_must_be_empty err && + env GIT_TEST_STASH_USE_BUILTIN=true git stash 2>err && + test_must_be_empty err +' + test_done diff --git a/third_party/git/t/t3904-stash-patch.sh b/third_party/git/t/t3904-stash-patch.sh index 9546b6f8a4..accfe3845c 100755 --- a/third_party/git/t/t3904-stash-patch.sh +++ b/third_party/git/t/t3904-stash-patch.sh @@ -89,7 +89,7 @@ test_expect_success 'none of this moved HEAD' ' verify_saved_head ' -test_expect_failure 'stash -p with split hunk' ' +test_expect_success 'stash -p with split hunk' ' git reset --hard && cat >test <<-\EOF && aaa @@ -106,8 +106,8 @@ test_expect_failure 'stash -p with split hunk' ' ccc EOF printf "%s\n" s n y q | - test_might_fail git stash -p 2>error && - ! test_must_be_empty error && + git stash -p 2>error && + test_must_be_empty error && grep "added line 1" test && ! grep "added line 2" test ' diff --git a/third_party/git/t/t3905-stash-include-untracked.sh b/third_party/git/t/t3905-stash-include-untracked.sh index 29ca76f2fb..f075c7f1f3 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-existant> shows no changes when there are none' ' - git stash push -u -- non-existant >actual && +test_expect_success 'stash -u -- <non-existent> shows no changes when there are none' ' + git stash push -u -- non-existent >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 d7219d6f8f..a52e53dd2d 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 apply can handle submodules' +test_description='stash can handle submodules' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-submodule-update.sh @@ -8,7 +8,12 @@ test_description='stash apply can handle submodules' git_stash () { git status -su >expect && ls -1pR * >>expect && - git read-tree -u -m "$1" && + may_only_be_test_must_fail "$2" && + $2 git read-tree -u -m "$1" && + if test -n "$2" + then + return + fi && git stash && git status -su >actual && ls -1pR * >>actual && @@ -19,6 +24,46 @@ git_stash () { KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES=1 KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 -test_submodule_switch "git_stash" +test_submodule_switch_func "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 new file mode 100755 index 0000000000..2b2b366ef9 --- /dev/null +++ b/third_party/git/t/t3908-stash-in-worktree.sh @@ -0,0 +1,27 @@ +#!/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 new file mode 100755 index 0000000000..55e050cfd4 --- /dev/null +++ b/third_party/git/t/t3909-stash-pathspec-file.sh @@ -0,0 +1,100 @@ +#!/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 8de36b7d12..e5116a76a1 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 .* 0000000000000000000000000000000000000000 M path0\$" actual && + grep -q "^:100644 100755 .* $ZERO_OID 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 3a6c21e825..6a9f010197 100755 --- a/third_party/git/t/t4002-diff-basic.sh +++ b/third_party/git/t/t4002-diff-basic.sh @@ -7,123 +7,270 @@ test_description='Test diff raw-output. ' . ./test-lib.sh + . "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh -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 +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 EOF -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 +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 EOF -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 +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 EOF -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 +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 EOF -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 +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 EOF -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 +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 EOF cmp_diff_files_output () { diff --git a/third_party/git/t/t4005-diff-rename-2.sh b/third_party/git/t/t4005-diff-rename-2.sh index f542d2929d..d18a80493c 100755 --- a/third_party/git/t/t4005-diff-rename-2.sh +++ b/third_party/git/t/t4005-diff-rename-2.sh @@ -14,8 +14,8 @@ test_expect_success 'setup reference tree' ' git update-index --add COPYING rezrov && tree=$(git write-tree) && echo $tree && - sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 && - sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 && + sed -e "s/HOWEVER/However/" <COPYING >COPYING.1 && + sed -e "s/GPL/G.P.L/g" <COPYING >COPYING.2 && origoid=$(git hash-object COPYING) && oid1=$(git hash-object COPYING.1) && oid2=$(git hash-object COPYING.2) diff --git a/third_party/git/t/t4009-diff-rename-4.sh b/third_party/git/t/t4009-diff-rename-4.sh index 3641fd84d6..b63bdf031f 100755 --- a/third_party/git/t/t4009-diff-rename-4.sh +++ b/third_party/git/t/t4009-diff-rename-4.sh @@ -14,6 +14,7 @@ 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' @@ -22,6 +23,8 @@ 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, @@ -31,11 +34,11 @@ test_expect_success \ git diff-index -z -C $tree >current -cat >expected <<\EOF -:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 +cat >expected <<EOF +:100644 100644 $orig $c1 C1234 COPYING COPYING.1 -:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 R1234 +:100644 100644 $orig $c2 R1234 COPYING COPYING.2 EOF @@ -57,10 +60,10 @@ test_expect_success \ # about rezrov. git diff-index -z -C $tree >current -cat >expected <<\EOF -:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 M +cat >expected <<EOF +:100644 100644 $orig $c2 M COPYING -:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 +:100644 100644 $orig $c1 C1234 COPYING COPYING.1 EOF @@ -82,8 +85,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 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 +cat >expected <<EOF +:100644 100644 $orig $c1 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 281f8fad0c..65cc703c65 100755 --- a/third_party/git/t/t4010-diff-pathspec.sh +++ b/third_party/git/t/t4010-diff-pathspec.sh @@ -17,11 +17,15 @@ 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 @@ -31,32 +35,32 @@ test_expect_success \ 'git diff-index --cached $tree -- path >current && compare_diff_raw current expected' -cat >expected <<\EOF -:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1 +cat >expected <<EOF +:100644 100644 $before1 $after1 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 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1 +cat >expected <<EOF +:100644 100644 $before1 $after1 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 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1 +cat >expected <<EOF +:100644 100644 $before1 $after1 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 8e4020bb5a8d8c873b25de15933e75cc0fc275df dca6b92303befc93086aa025d90a5facd7eb2812 M file0 +cat >expected <<EOF +:100644 100644 $before0 $after0 M file0 EOF test_expect_success \ 'limit to file0 should show file0' \ @@ -121,7 +125,9 @@ test_expect_success 'setup submodules' ' test_expect_success 'diff-tree ignores trailing slash on submodule path' ' git diff --name-only HEAD^ HEAD submod >expect && git diff --name-only HEAD^ HEAD submod/ >actual && - test_cmp expect actual + test_cmp expect actual && + git diff --name-only HEAD^ HEAD -- submod/whatever >actual && + test_must_be_empty actual ' test_expect_success 'diff multiple wildcard pathspecs' ' diff --git a/third_party/git/t/t4011-diff-symlink.sh b/third_party/git/t/t4011-diff-symlink.sh index 5ae19b987d..717034bb50 100755 --- a/third_party/git/t/t4011-diff-symlink.sh +++ b/third_party/git/t/t4011-diff-symlink.sh @@ -9,11 +9,24 @@ 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' ' - cat >expected <<-\EOF && + symlink=$(symlink_oid xyzzy) && + cat >expected <<-EOF && diff --git a/frotz b/frotz new file mode 120000 - index 0000000..7c465af + index 0000000..$symlink --- /dev/null +++ b/frotz @@ -0,0 +1 @@ @@ -21,7 +34,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..7c465af + index 0000000..$symlink --- /dev/null +++ b/nitfol @@ -0,0 +1 @@ @@ -46,10 +59,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 7c465af..0000000 + index $symlink..0000000 --- a/frotz +++ /dev/null @@ -1 +0,0 @@ @@ -57,7 +70,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 7c465af..0000000 + index $symlink..0000000 --- a/nitfol +++ /dev/null @@ -1 +0,0 @@ @@ -90,9 +103,10 @@ test_expect_success 'diff identical, but newly created symlink and file' ' ' test_expect_success 'diff different symlink and file' ' - cat >expected <<-\EOF && + new=$(symlink_oid yxyyz) && + cat >expected <<-EOF && diff --git a/frotz b/frotz - index 7c465af..df1db54 120000 + index $symlink..$new 120000 --- a/frotz +++ b/frotz @@ -1 +1 @@ @@ -101,7 +115,7 @@ test_expect_success 'diff different symlink and file' ' +yxyyz \ No newline at end of file diff --git a/nitfol b/nitfol - index 7c465af..df1db54 100644 + index $symlink..$new 100644 --- a/nitfol +++ b/nitfol @@ -1 +1 @@ @@ -137,14 +151,16 @@ test_expect_success SYMLINKS 'setup symlinks with attributes' ' ' test_expect_success SYMLINKS 'symlinks do not respect userdiff config by path' ' - cat >expect <<-\EOF && + file=$(short_oid file.bin) && + link=$(symlink_oid file.bin) && + cat >expect <<-EOF && diff --git a/file.bin b/file.bin new file mode 100644 - index 0000000..d95f3ad + index 0000000..$file Binary files /dev/null and b/file.bin differ diff --git a/link.bin b/link.bin new file mode 120000 - index 0000000..dce41ec + index 0000000..$link --- /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 a9054d2db1..5c7b0122b4 100755 --- a/third_party/git/t/t4013-diff-various.sh +++ b/third_party/git/t/t4013-diff-various.sh @@ -7,9 +7,6 @@ test_description='Various diff formatting options' . ./test-lib.sh -LF=' -' - test_expect_success setup ' GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" && @@ -98,6 +95,15 @@ test_expect_success setup ' git commit -m "update mode" && git checkout -f master && + GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" && + GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" && + export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && + git checkout -b note initial && + git update-index --chmod=+x file2 && + git commit -m "update mode (file2)" && + git notes add -m "note" && + git checkout -f master && + # Same merge as master, but with parents reversed. Hide it in a # pseudo-ref to avoid impacting tests with --all. commit=$(echo reverse | @@ -123,6 +129,48 @@ test_expect_success setup ' +*++ [initial] Initial EOF +process_diffs () { + perl -e ' + my $oid_length = length($ARGV[0]); + my $x40 = "[0-9a-f]{40}"; + my $xab = "[0-9a-f]{4,16}"; + my $orx = "[0-9a-f]" x $oid_length; + + sub munge_oid { + my ($oid) = @_; + my $x; + + return "" unless length $oid; + + if ($oid =~ /^(100644|100755|120000)$/) { + return $oid; + } + + if ($oid =~ /^0*$/) { + $x = "0"; + } else { + $x = "f"; + } + + if (length($oid) == 40) { + return $x x $oid_length; + } else { + return $x x length($oid); + } + } + + while (<STDIN>) { + s/($orx)/munge_oid($1)/ge; + s/From ($x40)( |\))/"From " . munge_oid($1) . $2/ge; + s/commit ($x40)($| \(from )($x40?)/"commit " . munge_oid($1) . $2 . munge_oid($3)/ge; + s/\b($x40)( |\.\.|$)/munge_oid($1) . $2/ge; + s/^($x40)($| )/munge_oid($1) . $2/e; + s/($xab)(\.\.|,| |\.\.\.|$)/munge_oid($1) . $2/ge; + print; + } + ' "$ZERO_OID" <"$1" +} + V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g') while read magic cmd do @@ -161,13 +209,15 @@ 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" + rm -f "$actual" actual expect else # this is to help developing new tests. cp "$actual" "$expect" @@ -189,6 +239,9 @@ diff-tree --root -r --abbrev=4 initial :noellipses diff-tree --root -r --abbrev=4 initial diff-tree -p initial diff-tree --root -p initial +diff-tree --root -p --abbrev=10 initial +diff-tree --root -p --full-index initial +diff-tree --root -p --full-index --abbrev=10 initial diff-tree --patch-with-stat initial diff-tree --root --patch-with-stat initial diff-tree --patch-with-raw initial @@ -265,6 +318,9 @@ log --root --patch-with-stat --summary master log --root -c --patch-with-stat --summary master # improved by Timo's patch log --root --cc --patch-with-stat --summary master +log --no-diff-merges -p --first-parent master +log --diff-merges=off -p --first-parent master +log --first-parent --diff-merges=off -p master log -p --first-parent master log -m -p --first-parent master log -m -p master @@ -375,6 +431,9 @@ diff --no-index --raw --no-abbrev dir2 dir diff-tree --pretty --root --stat --compact-summary initial diff-tree --pretty -R --root --stat --compact-summary initial +diff-tree --pretty note +diff-tree --pretty --notes note +diff-tree --format=%N note diff-tree --stat --compact-summary initial mode diff-tree -R --stat --compact-summary initial mode EOF @@ -386,16 +445,22 @@ 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 && - test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached" result + process_diffs result >actual && + process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached" >expected && + test_cmp expected actual ' test_expect_success 'diff --cached -- file on unborn branch' ' git diff --cached -- file0 >result && - test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result + process_diffs result >actual && + process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" >expected && + test_cmp expected actual ' test_expect_success 'diff --line-prefix with spaces' ' git diff --line-prefix="| | | " --cached -- file0 >result && - test_cmp "$TEST_DIRECTORY/t4013/diff.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_expect_success 'diff-tree --stdin with log formatting' ' diff --git a/third_party/git/t/t4013/diff.diff-tree_--format=%N_note b/third_party/git/t/t4013/diff.diff-tree_--format=%N_note new file mode 100644 index 0000000000..93042ed539 --- /dev/null +++ b/third_party/git/t/t4013/diff.diff-tree_--format=%N_note @@ -0,0 +1,6 @@ +$ git diff-tree --format=%N note +note + + +:100644 100755 01e79c32a8c99c557f0757da7cb6d65b3414466d 01e79c32a8c99c557f0757da7cb6d65b3414466d M file2 +$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--notes_note b/third_party/git/t/t4013/diff.diff-tree_--pretty_--notes_note new file mode 100644 index 0000000000..4d0bde601c --- /dev/null +++ b/third_party/git/t/t4013/diff.diff-tree_--pretty_--notes_note @@ -0,0 +1,12 @@ +$ git diff-tree --pretty --notes note +commit a6f364368ca320bc5a92e18912e16fa6b3dff598 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:06:00 2006 +0000 + + update mode (file2) + +Notes: + note + +:100644 100755 01e79c32a8c99c557f0757da7cb6d65b3414466d 01e79c32a8c99c557f0757da7cb6d65b3414466d M file2 +$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_note b/third_party/git/t/t4013/diff.diff-tree_--pretty_note new file mode 100644 index 0000000000..1fa5967083 --- /dev/null +++ b/third_party/git/t/t4013/diff.diff-tree_--pretty_note @@ -0,0 +1,9 @@ +$ git diff-tree --pretty note +commit a6f364368ca320bc5a92e18912e16fa6b3dff598 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:06:00 2006 +0000 + + update mode (file2) + +:100644 100755 01e79c32a8c99c557f0757da7cb6d65b3414466d 01e79c32a8c99c557f0757da7cb6d65b3414466d M file2 +$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--root_-p_--abbrev=10_initial b/third_party/git/t/t4013/diff.diff-tree_--root_-p_--abbrev=10_initial new file mode 100644 index 0000000000..7518a9044e --- /dev/null +++ b/third_party/git/t/t4013/diff.diff-tree_--root_-p_--abbrev=10_initial @@ -0,0 +1,29 @@ +$ git diff-tree --root -p --abbrev=10 initial +444ac553ac7612cc88969031b02b3767fb8a353a +diff --git a/dir/sub b/dir/sub +new file mode 100644 +index 0000000000..35d242ba79 +--- /dev/null ++++ b/dir/sub +@@ -0,0 +1,2 @@ ++A ++B +diff --git a/file0 b/file0 +new file mode 100644 +index 0000000000..01e79c32a8 +--- /dev/null ++++ b/file0 +@@ -0,0 +1,3 @@ ++1 ++2 ++3 +diff --git a/file2 b/file2 +new file mode 100644 +index 0000000000..01e79c32a8 +--- /dev/null ++++ b/file2 +@@ -0,0 +1,3 @@ ++1 ++2 ++3 +$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--root_-p_--full-index_--abbrev=10_initial b/third_party/git/t/t4013/diff.diff-tree_--root_-p_--full-index_--abbrev=10_initial new file mode 100644 index 0000000000..69f913fbe5 --- /dev/null +++ b/third_party/git/t/t4013/diff.diff-tree_--root_-p_--full-index_--abbrev=10_initial @@ -0,0 +1,29 @@ +$ git diff-tree --root -p --full-index --abbrev=10 initial +444ac553ac7612cc88969031b02b3767fb8a353a +diff --git a/dir/sub b/dir/sub +new file mode 100644 +index 0000000000000000000000000000000000000000..35d242ba79ae89ac695e26b3d4c27a8e6f028f9e +--- /dev/null ++++ b/dir/sub +@@ -0,0 +1,2 @@ ++A ++B +diff --git a/file0 b/file0 +new file mode 100644 +index 0000000000000000000000000000000000000000..01e79c32a8c99c557f0757da7cb6d65b3414466d +--- /dev/null ++++ b/file0 +@@ -0,0 +1,3 @@ ++1 ++2 ++3 +diff --git a/file2 b/file2 +new file mode 100644 +index 0000000000000000000000000000000000000000..01e79c32a8c99c557f0757da7cb6d65b3414466d +--- /dev/null ++++ b/file2 +@@ -0,0 +1,3 @@ ++1 ++2 ++3 +$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--root_-p_--full-index_initial b/third_party/git/t/t4013/diff.diff-tree_--root_-p_--full-index_initial new file mode 100644 index 0000000000..1b0b6717fa --- /dev/null +++ b/third_party/git/t/t4013/diff.diff-tree_--root_-p_--full-index_initial @@ -0,0 +1,29 @@ +$ git diff-tree --root -p --full-index initial +444ac553ac7612cc88969031b02b3767fb8a353a +diff --git a/dir/sub b/dir/sub +new file mode 100644 +index 0000000000000000000000000000000000000000..35d242ba79ae89ac695e26b3d4c27a8e6f028f9e +--- /dev/null ++++ b/dir/sub +@@ -0,0 +1,2 @@ ++A ++B +diff --git a/file0 b/file0 +new file mode 100644 +index 0000000000000000000000000000000000000000..01e79c32a8c99c557f0757da7cb6d65b3414466d +--- /dev/null ++++ b/file0 +@@ -0,0 +1,3 @@ ++1 ++2 ++3 +diff --git a/file2 b/file2 +new file mode 100644 +index 0000000000000000000000000000000000000000..01e79c32a8c99c557f0757da7cb6d65b3414466d +--- /dev/null ++++ b/file2 +@@ -0,0 +1,3 @@ ++1 ++2 ++3 +$ diff --git a/third_party/git/t/t4013/diff.log_--decorate=full_--all b/third_party/git/t/t4013/diff.log_--decorate=full_--all index 2afe91f116..3f9b872ece 100644 --- a/third_party/git/t/t4013/diff.log_--decorate=full_--all +++ b/third_party/git/t/t4013/diff.log_--decorate=full_--all @@ -5,12 +5,27 @@ Date: Mon Jun 26 00:06:00 2006 +0000 update mode +commit a6f364368ca320bc5a92e18912e16fa6b3dff598 (refs/heads/note) +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:06:00 2006 +0000 + + update mode (file2) + +Notes: + note + commit cd4e72fd96faed3f0ba949dc42967430374e2290 (refs/heads/rearrange) Author: A U Thor <author@example.com> Date: Mon Jun 26 00:06:00 2006 +0000 Rearranged lines in dir/sub +commit cbacedd14cb8b89255a2c02b59e77a2e9a8021a0 (refs/notes/commits) +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:06:00 2006 +0000 + + Notes added by 'git notes add' + commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/master) Merge: 9a6d494 c7a2ab9 Author: A U Thor <author@example.com> diff --git a/third_party/git/t/t4013/diff.log_--decorate_--all b/third_party/git/t/t4013/diff.log_--decorate_--all index d0f308ab2b..f5e20e1e14 100644 --- a/third_party/git/t/t4013/diff.log_--decorate_--all +++ b/third_party/git/t/t4013/diff.log_--decorate_--all @@ -5,12 +5,27 @@ Date: Mon Jun 26 00:06:00 2006 +0000 update mode +commit a6f364368ca320bc5a92e18912e16fa6b3dff598 (note) +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:06:00 2006 +0000 + + update mode (file2) + +Notes: + note + commit cd4e72fd96faed3f0ba949dc42967430374e2290 (rearrange) Author: A U Thor <author@example.com> Date: Mon Jun 26 00:06:00 2006 +0000 Rearranged lines in dir/sub +commit cbacedd14cb8b89255a2c02b59e77a2e9a8021a0 (refs/notes/commits) +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:06:00 2006 +0000 + + Notes added by 'git notes add' + commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> master) Merge: 9a6d494 c7a2ab9 Author: A U Thor <author@example.com> diff --git a/third_party/git/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master b/third_party/git/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master new file mode 100644 index 0000000000..194e893c94 --- /dev/null +++ b/third_party/git/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master @@ -0,0 +1,78 @@ +$ git log --diff-merges=off -p --first-parent master +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 +Merge: 9a6d494 c7a2ab9 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:04:00 2006 +0000 + + Merge branch 'side' + +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:02:00 2006 +0000 + + Third + +diff --git a/dir/sub b/dir/sub +index 8422d40..cead32e 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -2,3 +2,5 @@ A + B + C + D ++E ++F +diff --git a/file1 b/file1 +new file mode 100644 +index 0000000..b1e6722 +--- /dev/null ++++ b/file1 +@@ -0,0 +1,3 @@ ++A ++B ++C + +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:01:00 2006 +0000 + + Second + + This is the second commit. + +diff --git a/dir/sub b/dir/sub +index 35d242b..8422d40 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -1,2 +1,4 @@ + A + B ++C ++D +diff --git a/file0 b/file0 +index 01e79c3..b414108 100644 +--- a/file0 ++++ b/file0 +@@ -1,3 +1,6 @@ + 1 + 2 + 3 ++4 ++5 ++6 +diff --git a/file2 b/file2 +deleted file mode 100644 +index 01e79c3..0000000 +--- a/file2 ++++ /dev/null +@@ -1,3 +0,0 @@ +-1 +-2 +-3 + +commit 444ac553ac7612cc88969031b02b3767fb8a353a +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:00:00 2006 +0000 + + Initial +$ diff --git a/third_party/git/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master b/third_party/git/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master new file mode 100644 index 0000000000..5d7461a167 --- /dev/null +++ b/third_party/git/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master @@ -0,0 +1,78 @@ +$ git log --first-parent --diff-merges=off -p master +commit 80e25ffa65bcdbe82ef654b4d06dbbde7945c37f +Merge: 9a6d494 c7a2ab9 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:04:00 2006 +0000 + + Merge branch 'side' + +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:02:00 2006 +0000 + + Third + +diff --git a/dir/sub b/dir/sub +index 8422d40..cead32e 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -2,3 +2,5 @@ A + B + C + D ++E ++F +diff --git a/file1 b/file1 +new file mode 100644 +index 0000000..b1e6722 +--- /dev/null ++++ b/file1 +@@ -0,0 +1,3 @@ ++A ++B ++C + +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:01:00 2006 +0000 + + Second + + This is the second commit. + +diff --git a/dir/sub b/dir/sub +index 35d242b..8422d40 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -1,2 +1,4 @@ + A + B ++C ++D +diff --git a/file0 b/file0 +index 01e79c3..b414108 100644 +--- a/file0 ++++ b/file0 +@@ -1,3 +1,6 @@ + 1 + 2 + 3 ++4 ++5 ++6 +diff --git a/file2 b/file2 +deleted file mode 100644 +index 01e79c3..0000000 +--- a/file2 ++++ /dev/null +@@ -1,3 +0,0 @@ +-1 +-2 +-3 + +commit 444ac553ac7612cc88969031b02b3767fb8a353a +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:00:00 2006 +0000 + + Initial +$ diff --git a/third_party/git/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master b/third_party/git/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master new file mode 100644 index 0000000000..597002232e --- /dev/null +++ b/third_party/git/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master @@ -0,0 +1,78 @@ +$ git log --no-diff-merges -p --first-parent master +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 +Merge: 9a6d494 c7a2ab9 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:04:00 2006 +0000 + + Merge branch 'side' + +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:02:00 2006 +0000 + + Third + +diff --git a/dir/sub b/dir/sub +index 8422d40..cead32e 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -2,3 +2,5 @@ A + B + C + D ++E ++F +diff --git a/file1 b/file1 +new file mode 100644 +index 0000000..b1e6722 +--- /dev/null ++++ b/file1 +@@ -0,0 +1,3 @@ ++A ++B ++C + +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:01:00 2006 +0000 + + Second + + This is the second commit. + +diff --git a/dir/sub b/dir/sub +index 35d242b..8422d40 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -1,2 +1,4 @@ + A + B ++C ++D +diff --git a/file0 b/file0 +index 01e79c3..b414108 100644 +--- a/file0 ++++ b/file0 +@@ -1,3 +1,6 @@ + 1 + 2 + 3 ++4 ++5 ++6 +diff --git a/file2 b/file2 +deleted file mode 100644 +index 01e79c3..0000000 +--- a/file2 ++++ /dev/null +@@ -1,3 +0,0 @@ +-1 +-2 +-3 + +commit 444ac553ac7612cc88969031b02b3767fb8a353a +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:00:00 2006 +0000 + + Initial +$ diff --git a/third_party/git/t/t4013/diff.log_-p_--first-parent_master b/third_party/git/t/t4013/diff.log_-p_--first-parent_master index 3fc896d424..28840ebea1 100644 --- a/third_party/git/t/t4013/diff.log_-p_--first-parent_master +++ b/third_party/git/t/t4013/diff.log_-p_--first-parent_master @@ -6,6 +6,28 @@ Date: Mon Jun 26 00:04:00 2006 +0000 Merge branch 'side' +diff --git a/dir/sub b/dir/sub +index cead32e..992913c 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -4,3 +4,5 @@ C + D + E + F ++1 ++2 +diff --git a/file0 b/file0 +index b414108..10a8a9f 100644 +--- a/file0 ++++ b/file0 +@@ -4,3 +4,6 @@ + 4 + 5 + 6 ++A ++B ++C + commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Author: A U Thor <author@example.com> Date: Mon Jun 26 00:02:00 2006 +0000 diff --git a/third_party/git/t/t4014-format-patch.sh b/third_party/git/t/t4014-format-patch.sh index ca7debf1d4..294e76c860 100755 --- a/third_party/git/t/t4014-format-patch.sh +++ b/third_party/git/t/t4014-format-patch.sh @@ -9,7 +9,6 @@ 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 && @@ -34,7 +33,8 @@ test_expect_success setup ' git commit -m "Side changes #3 with \\n backslash-n in it." && git checkout master && - git diff-tree -p C2 | git apply --index && + git diff-tree -p C2 >patch && + git apply --index <patch && test_tick && git commit -m "Master accepts moral equivalent of #2" && @@ -59,185 +59,170 @@ 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 && - cnt=$(grep "^From " patch0 | wc -l) && - test $cnt = 3 - + grep "^From " patch0 >from0 && + test_line_count = 3 from0 ' -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 && - cnt=$(grep "^From " patch1 | wc -l) && - test $cnt = 2 - + grep "^From " patch1 >from1 && + test_line_count = 2 from1 ' -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 && - cnt=$(grep "^From " patch1 | wc -l) && - test $cnt = 2 + grep "^From " patch1 >from1 && + test_line_count = 2 from1 ' test_expect_success "format-patch doesn't consider merge commits" ' - - git checkout -b slave master && + git checkout -b feature master && echo "Another line" >>file && test_tick && - git commit -am "Slave change #1" && + git commit -am "Feature branch change #1" && echo "Yet another line" >>file && test_tick && - git commit -am "Slave change #2" && + git commit -am "Feature branch change #2" && git checkout -b merger master && test_tick && - git merge --no-ff slave && - cnt=$(git format-patch -3 --stdout | grep "^From " | wc -l) && - test $cnt = 3 + git merge --no-ff feature && + git format-patch -3 --stdout >patch && + grep "^From " patch >from && + test_line_count = 3 from ' -test_expect_success "format-patch result applies" ' - +test_expect_success 'format-patch result applies' ' git checkout -b rebuild-0 master && git am -3 patch0 && - cnt=$(git rev-list master.. | wc -l) && - test $cnt = 2 + git rev-list master.. >list && + test_line_count = 2 list ' -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 && - cnt=$(git rev-list master.. | wc -l) && - test $cnt = 2 + git rev-list master.. >list && + test_line_count = 2 list ' test_expect_success 'commit did not screw up the log message' ' - - git cat-file commit side | grep "^Side .* with .* backslash-n" - + git cat-file commit side >actual && + grep "^Side .* with .* backslash-n" actual ' 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 | grep "^Side .* with .* backslash-n" - + git cat-file commit rebuild-1 >actual && + grep "^Side .* with .* backslash-n" actual ' 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 | sed -e "/^\$/q" >patch5 && - grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 && - grep "^ *S E Cipient <scipient@example.com>\$" patch5 + 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 ' 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 | sed -e "/^\$/q" >patch5 && - grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 && - grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" patch5 + 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 ' 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 | sed -e "/^\$/q" >patch6 && - grep "^Cc: R E Cipient <rcipient@example.com>\$" patch6 + 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 ' 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 | sed -e "/^\$/q" >patch7 && - grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch7 && - grep "^ *S E Cipient <scipient@example.com>\$" patch7 + 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 ' 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 | sed -e "/^\$/q" >patch8 && - grep "^To: R E Cipient <rcipient@example.com>\$" patch8 + 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 ' test_expect_failure 'command line To: header (rfc822)' ' - - 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 + 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 ' test_expect_failure 'command line To: header (rfc2047)' ' - - 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 + 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 ' test_expect_success 'configuration To: header (ascii)' ' - git config format.to "R E Cipient <rcipient@example.com>" && - git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 && - grep "^To: R E Cipient <rcipient@example.com>\$" patch9 + git format-patch --stdout master..side >patch9 && + sed -e "/^\$/q" patch9 >hdrs9 && + grep "^To: R E Cipient <rcipient@example.com>\$" hdrs9 ' test_expect_failure 'configuration To: header (rfc822)' ' - git config format.to "R. E. Cipient <rcipient@example.com>" && - git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 && - grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch9 + git format-patch --stdout master..side >patch9 && + sed -e "/^\$/q" patch9 >hdrs9 && + grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs9 ' test_expect_failure 'configuration To: header (rfc2047)' ' - git config format.to "R ร Cipient <rcipient@example.com>" && - git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 && - grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch9 + 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 ' # check_patch <patch>: Verify that <patch> looks like a half-sane @@ -249,89 +234,79 @@ check_patch () { } test_expect_success 'format.from=false' ' - - git -c format.from=false format-patch --stdout master..side | - sed -e "/^\$/q" >patch && + git -c format.from=false format-patch --stdout master..side >patch && + sed -e "/^\$/q" patch >hdrs && check_patch patch && - ! grep "^From: C O Mitter <committer@example.com>\$" patch + ! grep "^From: C O Mitter <committer@example.com>\$" hdrs ' test_expect_success 'format.from=true' ' - - 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 + 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 ' test_expect_success 'format.from with address' ' - - 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 + 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 ' 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 | - sed -e "/^\$/q" >patch && - check_patch patch && - ! grep "^From: F R Om <from@example.com>\$" patch + 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 ' test_expect_success '--from overrides format.from' ' - - 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 + 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 ' 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 | - sed -e "/^\$/q" >patch10 && - check_patch patch10 && - ! grep "^To: R E Cipient <rcipient@example.com>\$" patch10 + 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 ' 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 | - sed -e "/^\$/q" >patch11 && - check_patch patch11 && - ! grep "^To: Someone <someone@out.there>\$" patch11 && - grep "^To: Someone Else <else@out.there>\$" patch11 + --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 ' 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 | - sed -e "/^\$/q" >patch12 && - check_patch patch12 && - ! grep "^Cc: C E Cipient <rcipient@example.com>\$" patch12 + 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 ' 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 | - sed -e "/^\$/q" >patch13 && - check_patch patch13 && - ! grep "^Header1: B E Cipient <rcipient@example.com>\$" patch13 + 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 ' test_expect_success 'multiple files' ' - rm -rf patches/ && git checkout side && git format-patch -o patches/ master && @@ -357,7 +332,7 @@ test_expect_success 'reroll count (-v)' ' check_threading () { expect="$1" && shift && - (git format-patch --stdout "$@"; echo $? > status.out) | + git format-patch --stdout "$@" >patch && # Prints everything between the Message-ID and In-Reply-To, # and replaces all Message-ID-lookalikes by a sequence number perl -ne ' @@ -372,12 +347,11 @@ check_threading () { print; } print "---\n" if /^From /i; - ' > actual && - test 0 = "$(cat status.out)" && + ' <patch >actual && test_cmp "$expect" actual } -cat >> expect.no-threading <<EOF +cat >>expect.no-threading <<EOF --- --- --- @@ -388,7 +362,7 @@ test_expect_success 'no threading' ' check_threading expect.no-threading master ' -cat > expect.thread <<EOF +cat >expect.thread <<EOF --- Message-Id: <0> --- @@ -405,7 +379,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> @@ -425,7 +399,7 @@ test_expect_success 'thread in-reply-to' ' --thread master ' -cat > expect.cover-letter <<EOF +cat >expect.cover-letter <<EOF --- Message-Id: <0> --- @@ -446,7 +420,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> @@ -478,7 +452,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> --- @@ -496,7 +470,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> @@ -519,7 +493,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> --- @@ -543,7 +517,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> @@ -594,7 +568,6 @@ test_expect_success 'thread config + --no-thread' ' ' test_expect_success 'excessive subject' ' - rm -rf patches/ && git checkout side && before=$(git hash-object file) && @@ -622,10 +595,9 @@ 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 @@ -636,14 +608,12 @@ 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 @@ -656,16 +626,14 @@ 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 @@ -679,11 +647,9 @@ 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)' ' @@ -736,7 +702,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 ' @@ -827,21 +793,56 @@ test_expect_success 'format-patch with multiple notes refs' ' ! 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 +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 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 && - test 5 = $(grep "^diff --git a/" output | wc -l)' + git format-patch --numstat --stdout master..side >output && + grep "^diff --git a/" output >diff && + test_line_count = 5 diff +' test_expect_success 'format-patch -- <path>' ' git format-patch master..side -- file 2>error && @@ -852,20 +853,25 @@ test_expect_success 'format-patch --ignore-if-in-upstream HEAD' ' git format-patch --ignore-if-in-upstream HEAD ' -git_version="$(git --version | sed "s/.* //")" +test_expect_success 'get git version' ' + git_version=$(git --version) && + git_version=${git_version##* } +' signature() { printf "%s\n%s\n\n" "-- " "${1:-$git_version}" } test_expect_success 'format-patch default signature' ' - git format-patch --stdout -1 | tail -n 3 >output && + git format-patch --stdout -1 >patch && + tail -n 3 patch >output && signature >expect && test_cmp expect output ' test_expect_success 'format-patch --signature' ' - git format-patch --stdout --signature="my sig" -1 | tail -n 3 >output && + git format-patch --stdout --signature="my sig" -1 >patch && + tail -n 3 patch >output && signature "my sig" >expect && test_cmp expect output ' @@ -897,8 +903,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 && - test 2 = $(grep "my sig" output | wc -l) + grep "my sig" output >sig && + test_line_count = 2 sig ' test_expect_success 'format.signature="" suppresses signatures' ' @@ -935,7 +941,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 && @@ -946,7 +952,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 && @@ -968,7 +974,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 && @@ -1037,7 +1043,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 ' @@ -1076,7 +1082,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 ' @@ -1085,7 +1091,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 } @@ -1155,6 +1161,59 @@ test_expect_success 'format-patch wraps extremely long from-header (rfc2047)' ' ' cat >expect <<'EOF' +From: Foรถ Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar + Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo + Bar Foo Bar Foo Bar Foo Bar <author@example.com> +EOF +test_expect_success 'format-patch wraps extremely long from-header (non-ASCII without Q-encoding)' ' + echo content >>file && + git add file && + GIT_AUTHOR_NAME="Foรถ Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar" \ + git commit -m author-check && + git format-patch --no-encode-email-headers --stdout -1 >patch && + sed -n "/^From: /p; /^ /p; /^$/q" patch >actual && + test_cmp expect actual +' + +cat >expect <<'EOF' +Subject: [PATCH] Foรถ +EOF +test_expect_success 'subject lines are unencoded with --no-encode-email-headers' ' + echo content >>file && + git add file && + git commit -m "Foรถ" && + git format-patch --no-encode-email-headers -1 --stdout >patch && + grep ^Subject: patch >actual && + test_cmp expect actual +' + +cat >expect <<'EOF' +Subject: [PATCH] Foรถ +EOF +test_expect_success 'subject lines are unencoded with format.encodeEmailHeaders=false' ' + echo content >>file && + git add file && + git commit -m "Foรถ" && + git config format.encodeEmailHeaders false && + git format-patch -1 --stdout >patch && + grep ^Subject: patch >actual && + test_cmp expect actual +' + +cat >expect <<'EOF' +Subject: [PATCH] =?UTF-8?q?Fo=C3=B6?= +EOF +test_expect_success '--encode-email-headers overrides format.encodeEmailHeaders' ' + echo content >>file && + git add file && + git commit -m "Foรถ" && + git config format.encodeEmailHeaders false && + git format-patch --encode-email-headers -1 --stdout >patch && + grep ^Subject: patch >actual && + test_cmp expect actual +' + +cat >expect <<'EOF' Subject: header with . in it EOF test_expect_success 'subject lines do not have 822 atom-quoting' ' @@ -1205,7 +1264,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 ' @@ -1217,7 +1276,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 ' @@ -1227,7 +1286,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 ' @@ -1242,7 +1301,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 ' @@ -1256,283 +1315,283 @@ append_signoff() test_expect_success 'signoff: commit with no body' ' append_signoff </dev/null >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 + 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 ' test_expect_success 'signoff: commit with only subject' ' echo subject | append_signoff >actual && - cat >expected <<\EOF && -4:Subject: [PATCH] subject -8: -9:Signed-off-by: C O Mitter <committer@example.com> -EOF - test_cmp expected actual + cat >expect <<-\EOF && + 4:Subject: [PATCH] subject + 8: + 9:Signed-off-by: C O Mitter <committer@example.com> + EOF + test_cmp expect actual ' test_expect_success 'signoff: commit with only subject that does not end with NL' ' printf subject | append_signoff >actual && - cat >expected <<\EOF && -4:Subject: [PATCH] subject -8: -9:Signed-off-by: C O Mitter <committer@example.com> -EOF - test_cmp expected actual + cat >expect <<-\EOF && + 4:Subject: [PATCH] subject + 8: + 9:Signed-off-by: C O Mitter <committer@example.com> + EOF + test_cmp expect actual ' test_expect_success 'signoff: no existing signoffs' ' - append_signoff <<\EOF >actual && -subject + append_signoff <<-\EOF >actual && + subject -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 + 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 ' test_expect_success 'signoff: no existing signoffs and no trailing NL' ' printf "subject\n\nbody" | append_signoff >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 + cat >expect <<-\EOF && + 4:Subject: [PATCH] subject + 8: + 10: + 11:Signed-off-by: C O Mitter <committer@example.com> + EOF + test_cmp expect 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 >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 + 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 ' 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 >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 + 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 ' 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 >expected <<\EOF && -4:Subject: [PATCH] subject -8: -11: -12:Signed-off-by: C O Mitter <committer@example.com> -EOF - test_cmp expected actual + 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 ' 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 >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 + 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 ' 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 >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 + 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 ' 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 >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 + 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 ' 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 >expected <<\EOF && -4:Subject: [PATCH] subject -8: -10: -11:Signed-off-by: C O Mitter <committer@example.com> -EOF - test_cmp expected actual + 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 ' 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 >expected <<\EOF && -4:Subject: [PATCH] subject -8: -9:Signed-off-by: C O Mitter <committer@example.com> -EOF - test_cmp expected actual + cat >expect <<-\EOF && + 4:Subject: [PATCH] subject + 8: + 9:Signed-off-by: C O Mitter <committer@example.com> + EOF + test_cmp expect 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 >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 + 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 ' 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 >expected <<\EOF && -4:Subject: [PATCH] subject -8: -10: -13:Signed-off-by: C O Mitter <committer@example.com> -EOF - test_cmp expected actual + 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 ' test_expect_success 'signoff: respect trailer config' ' - append_signoff <<\EOF >actual && -subject + append_signoff <<-\EOF >actual && + subject -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 && + 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 && test_config trailer.Myfooter.ifexists add && - append_signoff <<\EOF >actual && -subject + append_signoff <<-\EOF >actual && + subject -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 + 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 ' 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 >expected <<\EOF && -4:Subject: [PATCH] subject -8: -10: -14:Signed-off-by: C O Mitter <committer@example.com> -EOF - test_cmp expected actual + 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 ' test_expect_success 'format patch ignores color.ui' ' @@ -1543,46 +1602,231 @@ test_expect_success 'format patch ignores color.ui' ' test_cmp expect actual ' +test_expect_success 'format patch respects diff.relative' ' + rm -rf subdir && + mkdir subdir && + echo other content >subdir/file2 && + git add subdir/file2 && + git commit -F msg && + test_unconfig diff.relative && + git format-patch --relative=subdir --stdout -1 >expect && + test_config diff.relative true && + git -C subdir format-patch --stdout -1 >actual && + 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 >/dev/null + grep hello actual ' 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 >/dev/null + grep hello actual ' 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 >/dev/null + grep hello actual ' 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 >/dev/null + grep hello actual ' 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 >/dev/null + grep hello actual ' 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 >/dev/null + grep hello actual ' test_expect_success 'cover letter with nothing' ' @@ -1632,11 +1876,39 @@ 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 && - test $(git rev-list master..side | wc -l) -eq $(ls patches | wc -l) + count=$(git rev-list --count master..side) && + ls patches >list && + test_line_count = $count list ' test_expect_success 'format-patch -o overrides format.outputDirectory' ' @@ -1649,20 +1921,41 @@ 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 | 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 && + + 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 && + echo >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 && + 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 && ! test_cmp fail actual1 && ! test_cmp fail actual2 ' @@ -1672,8 +1965,9 @@ 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 && - echo "base-commit: $(git rev-parse HEAD~2)" >expected && - test_cmp expected actual + git rev-parse HEAD~2 >commit-id-base && + echo "base-commit: $(cat commit-id-base)" >expect && + test_cmp expect actual ' test_expect_success 'format-patch --base errors out when base commit is not ancestor of revision list' ' @@ -1699,8 +1993,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)" >expected && - test_cmp expected actual + echo "base-commit: $(cat commit-id-base)" >expect && + test_cmp expect actual ' test_expect_success 'format-patch --base=auto' ' @@ -1711,8 +2005,9 @@ test_expect_success 'format-patch --base=auto' ' test_commit N2 && git format-patch --stdout --base=auto -2 >patch && grep "^base-commit:" patch >actual && - echo "base-commit: $(git rev-parse upstream)" >expected && - test_cmp expected actual + git rev-parse upstream >commit-id-base && + echo "base-commit: $(cat commit-id-base)" >expect && + test_cmp expect actual ' test_expect_success 'format-patch errors out when history involves criss-cross' ' @@ -1742,23 +2037,51 @@ 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.useAutoBaseoption' ' - test_when_finished "git config --unset format.useAutoBase" && +test_expect_success 'format-patch format.useAutoBase whenAble history involves criss-cross' ' + test_config format.useAutoBase whenAble && + git format-patch -1 >patch && + ! grep "^base-commit:" patch +' + +test_expect_success 'format-patch format.useAutoBase option' ' git checkout local && - git config format.useAutoBase true && + test_config format.useAutoBase true && git format-patch --stdout -1 >patch && grep "^base-commit:" patch >actual && - echo "base-commit: $(git rev-parse upstream)" >expected && - test_cmp expected actual + git rev-parse upstream >commit-id-base && + echo "base-commit: $(cat commit-id-base)" >expect && + test_cmp expect actual +' + +test_expect_success 'format-patch format.useAutoBase option with whenAble' ' + git checkout local && + test_config format.useAutoBase whenAble && + 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 ' test_expect_success 'format-patch --base overrides format.useAutoBase' ' - test_when_finished "git config --unset format.useAutoBase" && - git config format.useAutoBase true && + test_config format.useAutoBase true && git format-patch --stdout --base=HEAD~1 -1 >patch && grep "^base-commit:" patch >actual && - echo "base-commit: $(git rev-parse HEAD~1)" >expected && - test_cmp expected 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 +' + +test_expect_success 'format-patch --no-base overrides format.useAutoBase whenAble' ' + test_config format.useAutoBase whenAble && + git format-patch --stdout --no-base -1 >patch && + ! grep "^base-commit:" patch ' test_expect_success 'format-patch --base with --attach' ' @@ -1833,7 +2156,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 ' @@ -1849,7 +2172,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 6b087df3dc..8bdaa0a693 100755 --- a/third_party/git/t/t4015-diff-whitespace.sh +++ b/third_party/git/t/t4015-diff-whitespace.sh @@ -16,6 +16,8 @@ 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 @@ -24,10 +26,12 @@ 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 adf3937..6edc172 100644 + index $before..$after 100644 --- a/x +++ b/x @@ -1,3 +1,5 @@ @@ -61,6 +65,8 @@ 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 @@ -70,10 +76,12 @@ 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 d99af23..22d9f73 100644 + index $before..$after 100644 --- a/x +++ b/x @@ -1,6 +1,6 @@ @@ -108,9 +116,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 d99af23..22d9f73 100644 + index $before..$after 100644 --- a/x +++ b/x @@ -1,6 +1,6 @@ @@ -132,9 +140,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 d99af23..22d9f73 100644 + index $before..$after 100644 --- a/x +++ b/x @@ -1,6 +1,6 @@ @@ -154,9 +162,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_d99af23..22d9f73 100644 + index_$before..$after 100644 --- a/x +++ b/x @@ -1,6 +1,6 @@ @@ -522,13 +530,15 @@ 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 && - git diff --check | grep "space before tab in indent" + test_must_fail git diff --check >check && + grep "space before tab in indent" check ' test_expect_success 'check mixed tabs and spaces in indent' ' # This is indented with HT SP HT. echo " foo();" >x && - git diff --check | grep "space before tab in indent" + test_must_fail git diff --check >check && + grep "space before tab in indent" check ' test_expect_success 'check with no whitespace errors' ' @@ -749,20 +759,23 @@ 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 && - git diff --check | grep "x:2:" + test_must_fail git diff --check >check && + grep "x:2:" check ' test_expect_success 'checkdiff detects new trailing blank lines (1)' ' echo "foo();" >x && echo "" >>x && - git diff --check | grep "new blank line" + test_must_fail git diff --check >check && + grep "new blank line" check ' test_expect_success 'checkdiff detects new trailing blank lines (2)' ' - { echo a; echo b; echo; echo; } >x && + test_write_lines a b "" "" >x && git add x && - { echo a; echo; echo; echo; echo; } >x && - git diff --check | grep "new blank line" + test_write_lines a "" "" "" "" >x && + test_must_fail git diff --check >check && + grep "new blank line" check ' test_expect_success 'checkdiff allows new blank lines' ' @@ -776,7 +789,7 @@ test_expect_success 'checkdiff allows new blank lines' ' git diff --check ' -test_expect_success 'whitespace-only changes not reported' ' +test_expect_success 'whitespace-only changes not reported (diff)' ' git reset --hard && echo >x "hello world" && git add x && @@ -786,14 +799,25 @@ 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' ' +test_expect_success 'whitespace-only changes not reported (diffstat)' ' + # reuse state from previous test + git diff --stat -b >actual && + test_must_be_empty actual +' + +test_expect_success 'whitespace changes with modification reported (diffstat)' ' + git reset --hard && + echo >x "hello world" && + git update-index --chmod=+x x && + git diff --stat --cached -b >actual && + cat <<-EOF >expect && + x | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + EOF + test_cmp expect actual +' + +test_expect_success 'whitespace-only changes reported across renames (diffstat)' ' 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 && @@ -801,8 +825,35 @@ test_expect_success 'whitespace-only changes reported across renames' ' sed -e "5s/^/ /" x >z && git rm x && git add z && - git diff -w -M --cached | - sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" >actual && + git diff -w -M --cached --stat >actual && + cat <<-EOF >expect && + x => z | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + EOF + test_cmp expect actual +' + +test_expect_success 'whitespace-only changes reported across renames' ' + git reset --hard HEAD~1 && + 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 test_cmp expect actual ' @@ -834,7 +885,8 @@ test_expect_success 'combined diff with autocrlf conversion' ' git config core.autocrlf true && test_must_fail git merge master && - git diff | sed -e "1,/^@@@/d" >actual && + git diff >actual.raw && + sed -e "1,/^@@@/d" actual.raw >actual && ! grep "^-" actual ' @@ -858,13 +910,18 @@ 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 && - git diff --color | test_decode_color >current && + 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 && - cat >expected <<-\EOF && + cat >expected <<-EOF && <BOLD>diff --git a/x b/x<RESET> - <BOLD>index 9daeafb..2874b91 100644<RESET> + <BOLD>index $before..$after 100644<RESET> <BOLD>--- a/x<RESET> <BOLD>+++ b/x<RESET> <CYAN>@@ -1 +1,4 @@<RESET> @@ -883,19 +940,23 @@ 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 | - test_decode_color >current && + git diff --color >current.raw && + test_decode_color <current.raw >current && - cat >expected <<-\EOF && + cat >expected <<-EOF && <BOLD>diff --git a/x b/x<RESET> - <BOLD>index d0233a2..700886e 100644<RESET> + <BOLD>index $before..$after 100644<RESET> <BOLD>--- a/x<RESET> <BOLD>+++ b/x<RESET> <CYAN>@@ -1,2 +1,3 @@<RESET> @@ -915,16 +976,20 @@ 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 d0233a2..700886e 100644<RESET> + <BOLD>index $before..$after 100644<RESET> <BOLD>--- a/x<RESET> <BOLD>+++ b/x<RESET> <CYAN>@@ -1,2 +1,3 @@<RESET> @@ -934,9 +999,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 d0233a2..700886e 100644<RESET> + <BOLD>index $before..$after 100644<RESET> <BOLD>--- a/x<RESET> <BOLD>+++ b/x<RESET> <CYAN>@@ -1,2 +1,3 @@<RESET> @@ -946,9 +1011,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 d0233a2..700886e 100644<RESET> + <BOLD>index $before..$after 100644<RESET> <BOLD>--- a/x<RESET> <BOLD>+++ b/x<RESET> <CYAN>@@ -1,2 +1,3 @@<RESET> @@ -962,32 +1027,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 | - test_decode_color >current && + git diff --color --ws-error-highlight=default,old >current.raw && + test_decode_color <current.raw >current && test_cmp expect.default-old current && - git diff --color --ws-error-highlight=all | - test_decode_color >current && + git diff --color --ws-error-highlight=all >current.raw && + test_decode_color <current.raw >current && test_cmp expect.all current && - git diff --color --ws-error-highlight=none | - test_decode_color >current && + git diff --color --ws-error-highlight=none >current.raw && + test_decode_color <current.raw >current && test_cmp expect.none current ' test_expect_success 'test diff.wsErrorHighlight config' ' - git -c diff.wsErrorHighlight=default,old diff --color | - test_decode_color >current && + git -c diff.wsErrorHighlight=default,old diff --color >current.raw && + test_decode_color <current.raw >current && test_cmp expect.default-old current && - git -c diff.wsErrorHighlight=all diff --color | - test_decode_color >current && + git -c diff.wsErrorHighlight=all diff --color >current.raw && + test_decode_color <current.raw >current && test_cmp expect.all current && - git -c diff.wsErrorHighlight=none diff --color | - test_decode_color >current && + git -c diff.wsErrorHighlight=none diff --color >current.raw && + test_decode_color <current.raw >current && test_cmp expect.none current ' @@ -995,18 +1060,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 | - test_decode_color >current && + diff --color --ws-error-highlight=default,old >current.raw && + test_decode_color <current.raw >current && test_cmp expect.default-old current && git -c diff.wsErrorHighlight=default \ - diff --color --ws-error-highlight=all | - test_decode_color >current && + diff --color --ws-error-highlight=all >current.raw && + test_decode_color <current.raw >current && test_cmp expect.all current && git -c diff.wsErrorHighlight=all \ - diff --color --ws-error-highlight=none | - test_decode_color >current && + diff --color --ws-error-highlight=none >current.raw && + test_decode_color <current.raw >current && test_cmp expect.none current ' @@ -1022,14 +1087,16 @@ 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 | test_decode_color >actual && - cat >expected <<-\EOF && + git diff HEAD --color-moved=zebra --color --no-renames >actual.raw && + test_decode_color <actual.raw >actual && + cat >expected <<-EOF && <BOLD>diff --git a/main.c b/main.c<RESET> <BOLD>new file mode 100644<RESET> - <BOLD>index 0000000..a986c57<RESET> + <BOLD>index 0000000..$file<RESET> <BOLD>--- /dev/null<RESET> <BOLD>+++ b/main.c<RESET> <CYAN>@@ -0,0 +1,5 @@<RESET> @@ -1040,7 +1107,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 a986c57..0000000<RESET> + <BOLD>index $file..0000000<RESET> <BOLD>--- a/test.c<RESET> <BOLD>+++ /dev/null<RESET> <CYAN>@@ -1,5 +0,0 @@<RESET> @@ -1094,6 +1161,8 @@ 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() @@ -1126,10 +1195,15 @@ test_expect_success 'detect malicious moved code, inside file' ' bar(); } EOF - git diff HEAD --no-renames --color-moved=zebra --color | test_decode_color >actual && - cat <<-\EOF >expected && + 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 && <BOLD>diff --git a/main.c b/main.c<RESET> - <BOLD>index 27a619c..7cf9336 100644<RESET> + <BOLD>index $before_main..$after_main 100644<RESET> <BOLD>--- a/main.c<RESET> <BOLD>+++ b/main.c<RESET> <CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET> @@ -1147,7 +1221,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 1dc1d85..2bedec9 100644<RESET> + <BOLD>index $before_test..$after_test 100644<RESET> <BOLD>--- a/test.c<RESET> <BOLD>+++ b/test.c<RESET> <CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET> @@ -1175,10 +1249,11 @@ 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 | test_decode_color >actual && - cat <<-\EOF >expected && + git diff HEAD --no-renames --color-moved=plain --color >actual.raw && + test_decode_color <actual.raw >actual && + cat <<-EOF >expected && <BOLD>diff --git a/main.c b/main.c<RESET> - <BOLD>index 27a619c..7cf9336 100644<RESET> + <BOLD>index $before_main..$after_main 100644<RESET> <BOLD>--- a/main.c<RESET> <BOLD>+++ b/main.c<RESET> <CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET> @@ -1196,7 +1271,7 @@ test_expect_success 'plain moved code, inside file' ' {<RESET> foo();<RESET> <BOLD>diff --git a/test.c b/test.c<RESET> - <BOLD>index 1dc1d85..2bedec9 100644<RESET> + <BOLD>index $before_test..$after_test 100644<RESET> <BOLD>--- a/test.c<RESET> <BOLD>+++ b/test.c<RESET> <CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET> @@ -1754,7 +1829,8 @@ test_expect_success 'move detection with submodules' ' ! grep BRED decoded_actual && # nor did we mess with it another way - git diff --submodule=diff --color | test_decode_color >expect && + git diff --submodule=diff --color >expect.raw && + test_decode_color <expect.raw >expect && test_cmp expect decoded_actual && rm -rf bananas && git submodule deinit bananas @@ -2008,11 +2084,6 @@ 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 && @@ -2022,6 +2093,7 @@ test_expect_success 'combine --ignore-blank-lines with --function-context' ' cat <<-\EOF >expect && @@ -1,6 +1,4 @@ 1 + - 2 3 4 @@ -2030,4 +2102,27 @@ 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 9261d6d3a0..9d07797579 100755 --- a/third_party/git/t/t4018-diff-funcname.sh +++ b/third_party/git/t/t4018-diff-funcname.sh @@ -31,11 +31,14 @@ diffpatterns=" cpp csharp css + dts + elixir fortran fountain golang html java + markdown matlab objc pascal @@ -104,7 +107,6 @@ 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 new file mode 100644 index 0000000000..b21ef8737b --- /dev/null +++ b/third_party/git/t/t4018/dts-labels @@ -0,0 +1,9 @@ +/ { + 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 new file mode 100644 index 0000000000..c5287d9141 --- /dev/null +++ b/third_party/git/t/t4018/dts-node-unitless @@ -0,0 +1,8 @@ +/ { + 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 new file mode 100644 index 0000000000..5a4334bb16 --- /dev/null +++ b/third_party/git/t/t4018/dts-nodes @@ -0,0 +1,8 @@ +/ { + 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 new file mode 100644 index 0000000000..afc6b5b404 --- /dev/null +++ b/third_party/git/t/t4018/dts-nodes-boolean-prop @@ -0,0 +1,9 @@ +/ { + 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 new file mode 100644 index 0000000000..559dfce9b3 --- /dev/null +++ b/third_party/git/t/t4018/dts-nodes-comment1 @@ -0,0 +1,8 @@ +/ { + 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 new file mode 100644 index 0000000000..27e9718b31 --- /dev/null +++ b/third_party/git/t/t4018/dts-nodes-comment2 @@ -0,0 +1,8 @@ +/ { + 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 new file mode 100644 index 0000000000..072d58b69d --- /dev/null +++ b/third_party/git/t/t4018/dts-nodes-multiline-prop @@ -0,0 +1,13 @@ +/ { + 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 new file mode 100644 index 0000000000..8f0c87d863 --- /dev/null +++ b/third_party/git/t/t4018/dts-reference @@ -0,0 +1,9 @@ +&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 new file mode 100644 index 0000000000..4353b8220c --- /dev/null +++ b/third_party/git/t/t4018/dts-root @@ -0,0 +1,5 @@ +/ { 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 new file mode 100644 index 0000000000..333a625c70 --- /dev/null +++ b/third_party/git/t/t4018/dts-root-comment @@ -0,0 +1,8 @@ +/ { 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 new file mode 100644 index 0000000000..fae08ba7e8 --- /dev/null +++ b/third_party/git/t/t4018/elixir-do-not-pick-end @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..0560a2b697 --- /dev/null +++ b/third_party/git/t/t4018/elixir-ex-unit-test @@ -0,0 +1,6 @@ +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 new file mode 100644 index 0000000000..d452f495a7 --- /dev/null +++ b/third_party/git/t/t4018/elixir-function @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..4f925e9ad4 --- /dev/null +++ b/third_party/git/t/t4018/elixir-macro @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..91a4e7aa20 --- /dev/null +++ b/third_party/git/t/t4018/elixir-module @@ -0,0 +1,9 @@ +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 new file mode 100644 index 0000000000..c9910d0675 --- /dev/null +++ b/third_party/git/t/t4018/elixir-module-func @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000000..771ebc5c42 --- /dev/null +++ b/third_party/git/t/t4018/elixir-nested-module @@ -0,0 +1,9 @@ +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 new file mode 100644 index 0000000000..1aabe33b7a --- /dev/null +++ b/third_party/git/t/t4018/elixir-private-function @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..7d9173691e --- /dev/null +++ b/third_party/git/t/t4018/elixir-protocol @@ -0,0 +1,6 @@ +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 new file mode 100644 index 0000000000..f9234bbfc4 --- /dev/null +++ b/third_party/git/t/t4018/elixir-protocol-implementation @@ -0,0 +1,5 @@ +defimpl RIGHT do + # Docs + # Docs + def foo(ChangeMe), do: :ok +end diff --git a/third_party/git/t/t4018/fortran-block-data b/third_party/git/t/t4018/fortran-block-data new file mode 100644 index 0000000000..63d4e21d0a --- /dev/null +++ b/third_party/git/t/t4018/fortran-block-data @@ -0,0 +1,5 @@ + BLOCK DATA RIGHT + + COMMON /B/ C, ChangeMe + DATA C, ChangeMe / 2.0, 6.0 / + END diff --git a/third_party/git/t/t4018/fortran-comment b/third_party/git/t/t4018/fortran-comment new file mode 100644 index 0000000000..7b10d17658 --- /dev/null +++ b/third_party/git/t/t4018/fortran-comment @@ -0,0 +1,13 @@ + module a + + contains + + ! subroutine wrong + subroutine RIGHT + ! subroutine wrong + + real ChangeMe + + end subroutine RIGHT + + end module a diff --git a/third_party/git/t/t4018/fortran-comment-keyword b/third_party/git/t/t4018/fortran-comment-keyword new file mode 100644 index 0000000000..e9206a5379 --- /dev/null +++ b/third_party/git/t/t4018/fortran-comment-keyword @@ -0,0 +1,14 @@ + module a + + contains + + subroutine RIGHT (funcA, funcB) + + real funcA ! grid function a + real funcB ! grid function b + + real ChangeMe + + end subroutine RIGHT + + end module a diff --git a/third_party/git/t/t4018/fortran-comment-legacy b/third_party/git/t/t4018/fortran-comment-legacy new file mode 100644 index 0000000000..53cd062c1e --- /dev/null +++ b/third_party/git/t/t4018/fortran-comment-legacy @@ -0,0 +1,13 @@ + module a + + contains + +C subroutine wrong + subroutine RIGHT +C subroutine wrong + + real ChangeMe + + end subroutine RIGHT + + end module a diff --git a/third_party/git/t/t4018/fortran-comment-legacy-star b/third_party/git/t/t4018/fortran-comment-legacy-star new file mode 100644 index 0000000000..2cbcdc3d8a --- /dev/null +++ b/third_party/git/t/t4018/fortran-comment-legacy-star @@ -0,0 +1,13 @@ + module a + + contains + +* subroutine wrong + subroutine RIGHT +* subroutine wrong + + real ChangeMe + + end subroutine RIGHT + + end module a diff --git a/third_party/git/t/t4018/fortran-external-function b/third_party/git/t/t4018/fortran-external-function new file mode 100644 index 0000000000..5a2d85d3aa --- /dev/null +++ b/third_party/git/t/t4018/fortran-external-function @@ -0,0 +1,9 @@ +function RIGHT(a, b) result(c) + +integer, intent(in) :: ChangeMe +integer, intent(in) :: b +integer, intent(out) :: c + +c = a+b + +end function RIGHT diff --git a/third_party/git/t/t4018/fortran-external-subroutine b/third_party/git/t/t4018/fortran-external-subroutine new file mode 100644 index 0000000000..4ce85fea13 --- /dev/null +++ b/third_party/git/t/t4018/fortran-external-subroutine @@ -0,0 +1,5 @@ +subroutine RIGHT + +real ChangeMe + +end subroutine RIGHT diff --git a/third_party/git/t/t4018/fortran-module b/third_party/git/t/t4018/fortran-module new file mode 100644 index 0000000000..c4b737dac3 --- /dev/null +++ b/third_party/git/t/t4018/fortran-module @@ -0,0 +1,5 @@ +module RIGHT + +use ChangeMe + +end module RIGHT diff --git a/third_party/git/t/t4018/fortran-module-procedure b/third_party/git/t/t4018/fortran-module-procedure new file mode 100644 index 0000000000..1ce6d854c2 --- /dev/null +++ b/third_party/git/t/t4018/fortran-module-procedure @@ -0,0 +1,13 @@ + module RIGHT + + implicit none + private + + interface letters ! generic interface + module procedure aaaa, & + bbbb, & + ChangeMe, & + dddd + end interface + +end module RIGHT diff --git a/third_party/git/t/t4018/fortran-program b/third_party/git/t/t4018/fortran-program new file mode 100644 index 0000000000..4616895e4b --- /dev/null +++ b/third_party/git/t/t4018/fortran-program @@ -0,0 +1,5 @@ +program RIGHT + +call ChangeMe + +end program RIGHT diff --git a/third_party/git/t/t4018/markdown-heading-indented b/third_party/git/t/t4018/markdown-heading-indented new file mode 100644 index 0000000000..1991c2bd45 --- /dev/null +++ b/third_party/git/t/t4018/markdown-heading-indented @@ -0,0 +1,6 @@ +Indented headings are allowed, as long as the indent is no more than 3 spaces. + + ### RIGHT + +- something +- ChangeMe diff --git a/third_party/git/t/t4018/markdown-heading-non-headings b/third_party/git/t/t4018/markdown-heading-non-headings new file mode 100644 index 0000000000..c479c1a3f1 --- /dev/null +++ b/third_party/git/t/t4018/markdown-heading-non-headings @@ -0,0 +1,17 @@ +Headings can be right next to other lines of the file: +# RIGHT +Indents of four or more spaces make a code block: + + # code comment, not heading + +If there's no space after the final hash, it's not a heading: + +#hashtag + +Sequences of more than 6 hashes don't make a heading: + +####### over-enthusiastic heading + +So the detected heading should be right up at the start of this file. + +ChangeMe diff --git a/third_party/git/t/t4018/python-async-def b/third_party/git/t/t4018/python-async-def new file mode 100644 index 0000000000..87640e03d2 --- /dev/null +++ b/third_party/git/t/t4018/python-async-def @@ -0,0 +1,4 @@ +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 new file mode 100644 index 0000000000..ba9e741430 --- /dev/null +++ b/third_party/git/t/t4018/python-class @@ -0,0 +1,4 @@ +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 new file mode 100644 index 0000000000..e50b31b0ad --- /dev/null +++ b/third_party/git/t/t4018/python-def @@ -0,0 +1,4 @@ +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 new file mode 100644 index 0000000000..f5d03258af --- /dev/null +++ b/third_party/git/t/t4018/python-indented-async-def @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000000..19b4f35c4c --- /dev/null +++ b/third_party/git/t/t4018/python-indented-class @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..208fbadd2b --- /dev/null +++ b/third_party/git/t/t4018/python-indented-def @@ -0,0 +1,7 @@ +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 671e951ee5..c0b642c1ab 100755 --- a/third_party/git/t/t4026-color.sh +++ b/third_party/git/t/t4026-color.sh @@ -30,6 +30,14 @@ 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" ' @@ -74,6 +82,10 @@ 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 9aa8e2b39b..d7145ccca4 100755 --- a/third_party/git/t/t4027-diff-submodule.sh +++ b/third_party/git/t/t4027-diff-submodule.sh @@ -36,7 +36,8 @@ test_expect_success setup ' ' test_expect_success 'git diff --raw HEAD' ' - git diff --raw --abbrev=40 HEAD >actual && + hexsz=$(test_oid hexsz) && + git diff --raw --abbrev=$hexsz HEAD >actual && test_cmp expect actual ' @@ -245,23 +246,21 @@ test_expect_success 'git diff (empty submodule dir)' ' ' test_expect_success 'conflicted submodule setup' ' - - # 39 efs - c=fffffffffffffffffffffffffffffffffffffff && + c=$(test_oid ff_1) && ( 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 2fffffffffffffffffffffffffffffffffffffff - -Subproject commit 3fffffffffffffffffffffffffffffffffffffff -++Subproject commit 0000000000000000000000000000000000000000'\'' && +- Subproject commit 2$c + -Subproject commit 3$c +++Subproject commit $ZERO_OID" && 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 912df91226..0c8fb39ced 100755 --- a/third_party/git/t/t4034-diff-words.sh +++ b/third_party/git/t/t4034-diff-words.sh @@ -19,9 +19,11 @@ cat >post.simple <<-\EOF aeff = aeff * ( aaa ) EOF -cat >expect.letter-runs-are-words <<-\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 <BOLD>diff --git a/pre b/post<RESET> - <BOLD>index 330b04f..5ed8eff 100644<RESET> + <BOLD>index $pre..$post 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,3 +1,7 @@<RESET> @@ -33,9 +35,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 330b04f..5ed8eff 100644<RESET> + <BOLD>index $pre..$post 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,3 +1,7 @@<RESET> @@ -49,9 +51,12 @@ 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 && - test_cmp expect output.decrypted + sed -e "2s/index [^ ]*/index $pre..$post/" expect >expected + test_cmp expected output.decrypted } test_language_driver () { @@ -77,9 +82,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 330b04f..5ed8eff 100644<RESET> + <BOLD>index $pre..$post 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,3 +1,7 @@<RESET> @@ -97,9 +102,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 330b04f..5ed8eff 100644 + index $pre..$post 100644 --- a/pre +++ b/post @@ -1,3 +1,7 @@ @@ -121,9 +126,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 330b04f..5ed8eff 100644 + index $pre..$post 100644 --- a/pre +++ b/post @@ -1,3 +1,7 @@ @@ -140,9 +145,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 330b04f..5ed8eff 100644<RESET> + <BOLD>index $pre..$post 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,3 +1,7 @@<RESET> @@ -158,9 +163,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 330b04f..5ed8eff 100644<RESET> + <BOLD>index $pre..$post 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1 +1 @@<RESET> @@ -207,9 +212,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 330b04f..5ed8eff 100644<RESET> + <BOLD>index $pre..$post 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,3 +1,7 @@<RESET> @@ -234,9 +239,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 330b04f..5ed8eff 100644<RESET> + <BOLD>index $pre..$post 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,3 +1,7 @@<RESET> @@ -254,9 +259,11 @@ test_expect_success 'use configured regex' ' test_expect_success 'test parsing words for newline' ' echo "aaa (aaa)" >pre && echo "aaa (aaa) aaa" >post && - cat >expect <<-\EOF && + pre=$(git rev-parse --short $(git hash-object pre)) && + post=$(git rev-parse --short $(git hash-object post)) && + cat >expect <<-EOF && <BOLD>diff --git a/pre b/post<RESET> - <BOLD>index c29453b..be22f37 100644<RESET> + <BOLD>index $pre..$post 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1 +1 @@<RESET> @@ -268,9 +275,11 @@ test_expect_success 'test parsing words for newline' ' test_expect_success 'test when words are only removed at the end' ' echo "(:" >pre && echo "(" >post && - cat >expect <<-\EOF && + pre=$(git rev-parse --short $(git hash-object pre)) && + post=$(git rev-parse --short $(git hash-object post)) && + cat >expect <<-EOF && <BOLD>diff --git a/pre b/post<RESET> - <BOLD>index 289cb9d..2d06f37 100644<RESET> + <BOLD>index $pre..$post 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1 +1 @@<RESET> @@ -282,9 +291,11 @@ test_expect_success 'test when words are only removed at the end' ' test_expect_success '--word-diff=none' ' echo "(:" >pre && echo "(" >post && - cat >expect <<-\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 289cb9d..2d06f37 100644 + index $pre..$post 100644 --- a/pre +++ b/post @@ -1 +1 @@ @@ -303,6 +314,7 @@ 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 @@ -316,16 +328,6 @@ 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 @@ -336,21 +338,35 @@ 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' ' - cat >expect <<-\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 && diff --git a/pre b/post - index 7bf316e..3dd0303 100644 + index $pre..$post 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 new file mode 100644 index 0000000000..560fc99184 --- /dev/null +++ b/third_party/git/t/t4034/dts/expect @@ -0,0 +1,37 @@ +<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 new file mode 100644 index 0000000000..7803aee280 --- /dev/null +++ b/third_party/git/t/t4034/dts/post @@ -0,0 +1,32 @@ +/ { + 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 new file mode 100644 index 0000000000..b6a905113c --- /dev/null +++ b/third_party/git/t/t4034/dts/pre @@ -0,0 +1,32 @@ +/ { + 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 d4afe12554..94680836ce 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://public-inbox.org/git/20130515143508.GO25742@login.drsnuggles.stderr.nl/ +# https://lore.kernel.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,11 +440,13 @@ 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 && @@ -452,13 +454,14 @@ 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 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR filename-side1c filename-side2c filename-merged + cat <<-EOF >expect && + ::100644 100644 100644 $side1cf $side2cf $mergedf 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 && @@ -482,11 +485,13 @@ 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 && @@ -494,12 +499,14 @@ 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* && - git commit + headf=$(git hash-object fickle*) && + git commit && + head=$(git rev-parse HEAD) ' test_expect_success FUNNYNAMES '--combined-all-paths and --raw and funny names' ' - cat <<-\EOF >expect && - ::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR "file\twith\ttabs" "i\tam\ttabbed" "fickle\tnaming" + cat <<-EOF >expect && + ::100644 100644 100644 $side1df $side2df $headf 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 && @@ -507,9 +514,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 "aaf8087c3cbd4db8e185a2d074cf27c53cfb75d7\0::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR\0file\twith\ttabs\0i\tam\ttabbed\0fickle\tnaming\0" >expect && + printf "$head\0::100644 100644 100644 $side1df $side2df $headf 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 -a expect actual + test_cmp 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 53ac44b0f0..0eb0314a8b 100755 --- a/third_party/git/t/t4039-diff-assume-unchanged.sh +++ b/third_party/git/t/t4039-diff-assume-unchanged.sh @@ -12,6 +12,7 @@ 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 && @@ -20,7 +21,7 @@ test_expect_success 'setup' ' ' test_expect_success 'diff-index does not examine assume-unchanged entries' ' - git diff-index HEAD^ -- one | grep -q 5626abf0f72e58d7a153368ba57db4c673c0e171 + git diff-index HEAD^ -- one | grep -q $blob ' 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 619bf97098..f852136585 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 modifed content' ' +test_expect_success 'submodule contains untracked and modified 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 modifed content' ' test_cmp expected actual ' -test_expect_success 'submodule contains untracked and modifed content (untracked ignored)' ' +test_expect_success 'submodule contains untracked and modified 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 modifed content (untracked test_cmp expected actual ' -test_expect_success 'submodule contains untracked and modifed content (dirty ignored)' ' +test_expect_success 'submodule contains untracked and modified 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 modifed content (all ignored)' ' +test_expect_success 'submodule contains untracked and modified 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 modifed content' ' +test_expect_success 'submodule contains modified 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 modifed content' ' +test_expect_success 'modified submodule contains untracked and modified 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 modifed content' test_cmp expected actual ' -test_expect_success 'modified submodule contains untracked and modifed content (untracked ignored)' ' +test_expect_success 'modified submodule contains untracked and modified 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 modifed content ( test_cmp expected actual ' -test_expect_success 'modified submodule contains untracked and modifed content (dirty ignored)' ' +test_expect_success 'modified submodule contains untracked and modified 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 modifed content ( test_cmp expected actual ' -test_expect_success 'modified submodule contains untracked and modifed content (all ignored)' ' +test_expect_success 'modified submodule contains untracked and modified 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 modifed content' ' +test_expect_success 'modified submodule contains modified 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 647905e01f..4701796d10 100755 --- a/third_party/git/t/t4044-diff-index-unique-abbrev.sh +++ b/third_party/git/t/t4044-diff-index-unique-abbrev.sh @@ -3,34 +3,48 @@ test_description='test unique sha1 abbreviation on "index from..to" line' . ./test-lib.sh -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 +test_expect_success 'setup' ' + test_oid_cache <<-EOF && + val1 sha1:4827 + val1 sha256:5664 -cat >expect_update <<EOF -100644 blob 51d2738efb4ad8a1e40bed839ab8e116f0a15e47 foo -EOF + val2 sha1:11742 + val2 sha256:10625 -test_expect_success 'setup' ' - echo 4827 > foo && + 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 + + cat >expect_update <<-EOF && + 100644 blob $(test_oid hash2) foo + EOF + + echo "$(test_oid val1)" > foo && git add foo && git commit -m "initial" && git cat-file -p HEAD: > actual && test_cmp expect_initial actual && - echo 11742 > foo && + echo "$(test_oid val2)" > foo && git commit -a -m "update" && git cat-file -p HEAD: > actual && test_cmp expect_update actual ' cat >expect <<EOF -index 51d27384..51d2738e 100644 +index $(test_oid hasht1)..$(test_oid hasht2) 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 36f8ed8a81..7be1de736d 100755 --- a/third_party/git/t/t4045-diff-relative.sh +++ b/third_party/git/t/t4045-diff-relative.sh @@ -8,7 +8,8 @@ test_expect_success 'setup' ' echo content >file1 && mkdir subdir && echo other content >subdir/file2 && - blob=$(git hash-object subdir/file2) && + blob_file1=$(git hash-object file1) && + blob_file2=$(git hash-object subdir/file2) && git add . && git commit -m one ' @@ -18,7 +19,7 @@ check_diff () { shift expect=$1 shift - short_blob=$(git rev-parse --short $blob) + short_blob=$(git rev-parse --short $blob_file2) cat >expected <<-EOF diff --git a/$expect b/$expect new file mode 100644 @@ -70,7 +71,7 @@ check_raw () { expect=$1 shift cat >expected <<-EOF - :000000 100644 0000000000000000000000000000000000000000 $blob A $expect + :000000 100644 $ZERO_OID $blob_file2 A $expect EOF test_expect_success "--raw $*" " git -C '$dir' diff --no-abbrev --raw $* HEAD^ >actual && @@ -86,4 +87,79 @@ do check_$type . dir/file2 --relative=sub done +check_diff_relative_option () { + dir=$1 + shift + expect=$1 + shift + relative_opt=$1 + shift + test_expect_success "config diff.relative $relative_opt -p $*" " + short_blob=\$(git rev-parse --short $blob_file2) && + cat >expected <<-EOF && + diff --git a/$expect b/$expect + new file mode 100644 + index 0000000..\$short_blob + --- /dev/null + +++ b/$expect + @@ -0,0 +1 @@ + +other content + EOF + test_config -C $dir diff.relative $relative_opt && + git -C '$dir' diff -p $* HEAD^ >actual && + test_cmp expected actual + " +} + +check_diff_no_relative_option () { + dir=$1 + shift + expect=$1 + shift + relative_opt=$1 + shift + test_expect_success "config diff.relative $relative_opt -p $*" " + short_blob_file1=\$(git rev-parse --short $blob_file1) && + short_blob_file2=\$(git rev-parse --short $blob_file2) && + cat >expected <<-EOF && + diff --git a/file1 b/file1 + new file mode 100644 + index 0000000..\$short_blob_file1 + --- /dev/null + +++ b/file1 + @@ -0,0 +1 @@ + +content + diff --git a/$expect b/$expect + new file mode 100644 + index 0000000..\$short_blob_file2 + --- /dev/null + +++ b/$expect + @@ -0,0 +1 @@ + +other content + EOF + test_config -C $dir diff.relative $relative_opt && + git -C '$dir' diff -p $* HEAD^ >actual && + test_cmp expected actual + " +} + +check_diff_no_relative_option . subdir/file2 false +check_diff_no_relative_option . subdir/file2 true --no-relative +check_diff_no_relative_option . subdir/file2 false --no-relative +check_diff_no_relative_option subdir subdir/file2 false +check_diff_no_relative_option subdir subdir/file2 true --no-relative +check_diff_no_relative_option subdir subdir/file2 false --no-relative + +check_diff_relative_option . file2 false --relative=subdir/ +check_diff_relative_option . file2 false --relative=subdir +check_diff_relative_option . file2 true --relative=subdir/ +check_diff_relative_option . file2 true --relative=subdir +check_diff_relative_option subdir file2 false --relative +check_diff_relative_option subdir file2 true --relative +check_diff_relative_option subdir file2 true +check_diff_relative_option subdir file2 false --no-relative --relative +check_diff_relative_option subdir file2 true --no-relative --relative +check_diff_relative_option . file2 false --no-relative --relative=subdir +check_diff_relative_option . file2 true --no-relative --relative=subdir + test_done diff --git a/third_party/git/t/t4048-diff-combined-binary.sh b/third_party/git/t/t4048-diff-combined-binary.sh index 87a8949500..7f9ad9fa3d 100755 --- a/third_party/git/t/t4048-diff-combined-binary.sh +++ b/third_party/git/t/t4048-diff-combined-binary.sh @@ -9,24 +9,27 @@ 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 + git commit -a -m resolved && + res=$(git rev-parse --short HEAD:binary) ' -cat >expect <<'EOF' +cat >expect <<EOF resolved diff --git a/binary b/binary -index 7ea6ded..9563691 100644 +index $three..$res 100644 Binary files a/binary and b/binary differ resolved diff --git a/binary b/binary -index 6197570..9563691 100644 +index $two..$res 100644 Binary files a/binary and b/binary differ EOF test_expect_success 'diff -m indicates binary-ness' ' @@ -34,11 +37,11 @@ test_expect_success 'diff -m indicates binary-ness' ' test_cmp expect actual ' -cat >expect <<'EOF' +cat >expect <<EOF resolved diff --combined binary -index 7ea6ded,6197570..9563691 +index $three,$two..$res Binary files differ EOF test_expect_success 'diff -c indicates binary-ness' ' @@ -46,11 +49,11 @@ test_expect_success 'diff -c indicates binary-ness' ' test_cmp expect actual ' -cat >expect <<'EOF' +cat >expect <<EOF resolved diff --cc binary -index 7ea6ded,6197570..9563691 +index $three,$two..$res Binary files differ EOF test_expect_success 'diff --cc indicates binary-ness' ' @@ -62,23 +65,26 @@ 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 2bdf67a..2ab19ae 100644 +index $three..$res 100644 Binary files a/text and b/text differ resolved diff --git a/text b/text -index f719efd..2ab19ae 100644 +index $two..$res 100644 Binary files a/text and b/text differ EOF test_expect_success 'diff -m respects binary attribute' ' @@ -86,11 +92,11 @@ test_expect_success 'diff -m respects binary attribute' ' test_cmp expect actual ' -cat >expect <<'EOF' +cat >expect <<EOF resolved diff --combined text -index 2bdf67a,f719efd..2ab19ae +index $three,$two..$res Binary files differ EOF test_expect_success 'diff -c respects binary attribute' ' @@ -98,11 +104,11 @@ test_expect_success 'diff -c respects binary attribute' ' test_cmp expect actual ' -cat >expect <<'EOF' +cat >expect <<EOF resolved diff --cc text -index 2bdf67a,f719efd..2ab19ae +index $three,$two..$res Binary files differ EOF test_expect_success 'diff --cc respects binary attribute' ' @@ -115,11 +121,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 2bdf67a..2ab19ae 100644 +index $three..$res 100644 --- a/text +++ b/text @@ -1 +1 @@ @@ -128,7 +134,7 @@ index 2bdf67a..2ab19ae 100644 resolved diff --git a/text b/text -index f719efd..2ab19ae 100644 +index $two..$res 100644 --- a/text +++ b/text @@ -1 +1 @@ @@ -140,11 +146,11 @@ test_expect_success 'diff -m respects textconv attribute' ' test_cmp expect actual ' -cat >expect <<'EOF' +cat >expect <<EOF resolved diff --combined text -index 2bdf67a,f719efd..2ab19ae +index $three,$two..$res --- a/text +++ b/text @@@ -1,1 -1,1 +1,1 @@@ @@ -157,11 +163,11 @@ test_expect_success 'diff -c respects textconv attribute' ' test_cmp expect actual ' -cat >expect <<'EOF' +cat >expect <<EOF resolved diff --cc text -index 2bdf67a,f719efd..2ab19ae +index $three,$two..$res --- a/text +++ b/text @@@ -1,1 -1,1 +1,1 @@@ @@ -174,9 +180,9 @@ test_expect_success 'diff --cc respects textconv attribute' ' test_cmp expect actual ' -cat >expect <<'EOF' +cat >expect <<EOF diff --combined text -index 2bdf67a,f719efd..2ab19ae +index $three,$two..$res --- a/text +++ b/text @@@ -1,1 -1,1 +1,1 @@@ @@ -190,9 +196,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 2bdf67a,f719efd..0000000 +index $three,$two..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 fcae82fffa..8c95f152b2 100755 --- a/third_party/git/t/t4054-diff-bogus-tree.sh +++ b/third_party/git/t/t4054-diff-bogus-tree.sh @@ -4,8 +4,9 @@ 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 fooQQQQQQQQQQQQQQQQQQQQQ" | + printf "100644 fooQ$name" | 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 dff36b77ec..0b78573733 100755 --- a/third_party/git/t/t4057-diff-combined-paths.sh +++ b/third_party/git/t/t4057-diff-combined-paths.sh @@ -14,7 +14,7 @@ diffc_verify () { test_expect_success 'trivial merge - combine-diff empty' ' for i in $(test_seq 1 9) do - echo $i >$i.txt && + echo $i >$i.txt && git add $i.txt done && git commit -m "init" && @@ -33,7 +33,7 @@ test_expect_success 'trivial merge - combine-diff empty' ' ' -test_expect_success 'only one trully conflicting path' ' +test_expect_success 'only one truly 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 9dcb69df5c..fc8229c726 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,6 +42,17 @@ 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 && @@ -69,7 +80,7 @@ test_expect_success 'added submodule' ' @@ -0,0 +1 @@ +foo2 EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'added submodule, set diff.submodule' ' @@ -93,7 +104,7 @@ test_expect_success 'added submodule, set diff.submodule' ' @@ -0,0 +1 @@ +foo2 EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success '--submodule=short overrides diff.submodule' ' @@ -109,7 +120,7 @@ test_expect_success '--submodule=short overrides diff.submodule' ' @@ -0,0 +1 @@ +Subproject commit $fullhead1 EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'diff.submodule does not affect plumbing' ' @@ -124,7 +135,7 @@ test_expect_success 'diff.submodule does not affect plumbing' ' @@ -0,0 +1 @@ +Subproject commit $fullhead1 EOF - test_cmp expected actual + diff_cmp expected actual ' commit_file sm1 && @@ -142,7 +153,7 @@ test_expect_success 'modified submodule(forward)' ' @@ -0,0 +1 @@ +foo3 EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'modified submodule(forward)' ' @@ -157,7 +168,7 @@ test_expect_success 'modified submodule(forward)' ' @@ -0,0 +1 @@ +foo3 EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'modified submodule(forward) --submodule' ' @@ -166,7 +177,7 @@ test_expect_success 'modified submodule(forward) --submodule' ' Submodule sm1 $head1..$head2: > Add foo3 ($added foo3) EOF - test_cmp expected actual + diff_cmp expected actual ' fullhead2=$(cd sm1; git rev-parse --verify HEAD) @@ -181,7 +192,7 @@ test_expect_success 'modified submodule(forward) --submodule=short' ' -Subproject commit $fullhead1 +Subproject commit $fullhead2 EOF - test_cmp expected actual + diff_cmp expected actual ' commit_file sm1 && @@ -210,7 +221,7 @@ test_expect_success 'modified submodule(backward)' ' @@ -1 +0,0 @@ -foo3 EOF - test_cmp expected actual + diff_cmp expected actual ' head4=$(add_file sm1 foo4 foo5) @@ -247,7 +258,7 @@ test_expect_success 'modified submodule(backward and forward)' ' @@ -0,0 +1 @@ +foo5 EOF - test_cmp expected actual + diff_cmp expected actual ' commit_file sm1 && @@ -291,7 +302,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --cached' ' @@ -0,0 +1 @@ +sm1 EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'typechanged submodule(submodule->blob)' ' @@ -327,7 +338,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' ' @@ -0,0 +1 @@ +foo5 EOF - test_cmp expected actual + diff_cmp expected actual ' rm -rf sm1 && @@ -344,7 +355,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' ' @@ -0,0 +1 @@ +sm1 EOF - test_cmp expected actual + diff_cmp expected actual ' rm -f sm1 && @@ -356,7 +367,7 @@ test_expect_success 'nonexistent commit' ' cat >expected <<-EOF && Submodule sm1 $head4...$head6 (commits not present) EOF - test_cmp expected actual + diff_cmp expected actual ' commit_file @@ -386,11 +397,12 @@ test_expect_success 'typechanged submodule(blob->submodule)' ' @@ -0,0 +1 @@ +foo7 EOF - test_cmp expected actual + diff_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 ' @@ -401,7 +413,7 @@ test_expect_success 'submodule contains untracked content' ' cat >expected <<-EOF && Submodule sm1 contains untracked content EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'submodule contains untracked content (untracked ignored)' ' @@ -433,7 +445,7 @@ test_expect_success 'submodule contains untracked and modified content' ' -foo6 +new EOF - test_cmp expected actual + diff_cmp expected actual ' # NOT OK @@ -450,7 +462,7 @@ test_expect_success 'submodule contains untracked and modified content (untracke -foo6 +new EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'submodule contains untracked and modified content (dirty ignored)' ' @@ -478,7 +490,7 @@ test_expect_success 'submodule contains modified content' ' -foo6 +new EOF - test_cmp expected actual + diff_cmp expected actual ' (cd sm1; git commit -mchange foo6 >/dev/null) && @@ -486,7 +498,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 17243c9..$head8: + Submodule sm1 $head7..$head8: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..3e75765 100644 --- a/sm1/foo6 @@ -495,7 +507,7 @@ test_expect_success 'submodule is modified' ' -foo6 +new EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'modified submodule contains untracked content' ' @@ -503,7 +515,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 17243c9..$head8: + Submodule sm1 $head7..$head8: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..3e75765 100644 --- a/sm1/foo6 @@ -512,13 +524,13 @@ test_expect_success 'modified submodule contains untracked content' ' -foo6 +new EOF - test_cmp expected actual + diff_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 17243c9..$head8: + Submodule sm1 $head7..$head8: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..3e75765 100644 --- a/sm1/foo6 @@ -527,13 +539,13 @@ test_expect_success 'modified submodule contains untracked content (untracked ig -foo6 +new EOF - test_cmp expected actual + diff_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 17243c9..cfce562: + Submodule sm1 $head7..$head8: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..3e75765 100644 --- a/sm1/foo6 @@ -542,7 +554,7 @@ test_expect_success 'modified submodule contains untracked content (dirty ignore -foo6 +new EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'modified submodule contains untracked content (all ignored)' ' @@ -556,7 +568,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 17243c9..cfce562: + Submodule sm1 $head7..$head8: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..dfda541 100644 --- a/sm1/foo6 @@ -566,7 +578,7 @@ test_expect_success 'modified submodule contains untracked and modified content' +new +modification EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'modified submodule contains untracked and modified content (untracked ignored)' ' @@ -574,7 +586,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 17243c9..cfce562: + Submodule sm1 $head7..$head8: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..e20e2d9 100644 --- a/sm1/foo6 @@ -585,14 +597,14 @@ test_expect_success 'modified submodule contains untracked and modified content +modification +modification EOF - test_cmp expected actual + diff_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 17243c9..cfce562: + Submodule sm1 $head7..$head8: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..3e75765 100644 --- a/sm1/foo6 @@ -601,7 +613,7 @@ test_expect_success 'modified submodule contains untracked and modified content -foo6 +new EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'modified submodule contains untracked and modified content (all ignored)' ' @@ -616,7 +628,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 17243c9..cfce562: + Submodule sm1 $head7..$head8: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..ac466ca 100644 --- a/sm1/foo6 @@ -629,29 +641,29 @@ test_expect_success 'modified submodule contains modified content' ' +modification +modification EOF - test_cmp expected actual + diff_cmp expected actual ' rm -rf sm1 test_expect_success 'deleted submodule' ' git diff-index -p --submodule=diff HEAD >actual && cat >expected <<-EOF && - Submodule sm1 17243c9...0000000 (submodule deleted) + Submodule sm1 $head7...0000000 (submodule deleted) EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'create second submodule' ' test_create_repo sm2 && - head7=$(add_file sm2 foo8 foo9) && + head9=$(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 17243c9...0000000 (submodule deleted) - Submodule sm2 0000000...a5a65c9 (new submodule) + Submodule sm1 $head7...0000000 (submodule deleted) + Submodule sm2 0000000...$head9 (new submodule) diff --git a/sm2/foo8 b/sm2/foo8 new file mode 100644 index 0000000..db9916b @@ -667,13 +679,13 @@ test_expect_success 'multiple submodules' ' @@ -0,0 +1 @@ +foo9 EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'path filter' ' git diff-index -p --submodule=diff HEAD sm2 >actual && cat >expected <<-EOF && - Submodule sm2 0000000...a5a65c9 (new submodule) + Submodule sm2 0000000...$head9 (new submodule) diff --git a/sm2/foo8 b/sm2/foo8 new file mode 100644 index 0000000..db9916b @@ -689,15 +701,15 @@ test_expect_success 'path filter' ' @@ -0,0 +1 @@ +foo9 EOF - test_cmp expected actual + diff_cmp expected actual ' commit_file sm2 test_expect_success 'given commit' ' git diff-index -p --submodule=diff HEAD^ >actual && cat >expected <<-EOF && - Submodule sm1 17243c9...0000000 (submodule deleted) - Submodule sm2 0000000...a5a65c9 (new submodule) + Submodule sm1 $head7...0000000 (submodule deleted) + Submodule sm2 0000000...$head9 (new submodule) diff --git a/sm2/foo8 b/sm2/foo8 new file mode 100644 index 0000000..db9916b @@ -713,7 +725,7 @@ test_expect_success 'given commit' ' @@ -0,0 +1 @@ +foo9 EOF - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'setup .git file for sm2' ' @@ -726,8 +738,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 17243c9...0000000 (submodule deleted) - Submodule sm2 0000000...a5a65c9 (new submodule) + Submodule sm1 $head7...0000000 (submodule deleted) + Submodule sm2 0000000...$head9 (new submodule) diff --git a/sm2/foo8 b/sm2/foo8 new file mode 100644 index 0000000..db9916b @@ -743,25 +755,27 @@ test_expect_success 'diff --submodule=diff with .git file' ' @@ -0,0 +1 @@ +foo9 EOF - test_cmp expected actual + diff_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" + git -C sm2 commit -a -m "nested sub" && + head10=$(git -C sm2 rev-parse --short --verify HEAD) ' 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" + git -C sm2/nested commit --allow-empty -m "new HEAD" && + head11=$(git -C sm2/nested rev-parse --short --verify HEAD) ' test_expect_success 'diff --submodule=diff with moved nested submodule HEAD' ' cat >expected <<-EOF && - Submodule nested a5a65c9..b55928c: + Submodule nested $head9..$head11: diff --git a/nested/file b/nested/file new file mode 100644 index 0000000..ca281f5 @@ -772,13 +786,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 && - test_cmp expected actual + diff_cmp expected actual ' test_expect_success 'diff --submodule=diff recurses into nested submodules' ' cat >expected <<-EOF && Submodule sm2 contains modified content - Submodule sm2 a5a65c9..280969a: + Submodule sm2 $head9..$head10: diff --git a/sm2/.gitmodules b/sm2/.gitmodules new file mode 100644 index 0000000..3a816b8 @@ -788,7 +802,7 @@ test_expect_success 'diff --submodule=diff recurses into nested submodules' ' +[submodule "nested"] + path = nested + url = ../sm2 - Submodule nested 0000000...b55928c (new submodule) + Submodule nested 0000000...$head11 (new submodule) diff --git a/sm2/nested/file b/sm2/nested/file new file mode 100644 index 0000000..ca281f5 @@ -813,7 +827,7 @@ test_expect_success 'diff --submodule=diff recurses into nested submodules' ' EOF git diff --submodule=diff >actual 2>err && test_must_be_empty err && - test_cmp expected actual + diff_cmp expected actual ' test_done diff --git a/third_party/git/t/t4061-diff-indent.sh b/third_party/git/t/t4061-diff-indent.sh index 2affd7a100..0f7a6d97a8 100755 --- a/third_party/git/t/t4061-diff-indent.sh +++ b/third_party/git/t/t4061-diff-indent.sh @@ -17,7 +17,7 @@ compare_diff () { # Compare blame output using the expectation for a diff as reference. # Only look for the lines coming from non-boundary commits. compare_blame () { - sed -n -e "1,4d" -e "s/^\+//p" <"$1" >.tmp-1 + sed -n -e "1,4d" -e "s/^+//p" <"$1" >.tmp-1 sed -ne "s/^[^^][^)]*) *//p" <"$2" >.tmp-2 test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2 } diff --git a/third_party/git/t/t4064-diff-oidfind.sh b/third_party/git/t/t4064-diff-oidfind.sh index 3bdf317af8..6d8c8986fc 100755 --- a/third_party/git/t/t4064-diff-oidfind.sh +++ b/third_party/git/t/t4064-diff-oidfind.sh @@ -65,4 +65,59 @@ test_expect_success 'find a submodule' ' test_cmp expect actual ' +test_expect_success 'set up merge tests' ' + test_commit base && + + git checkout -b boring base^ && + echo boring >file && + git add file && + git commit -m boring && + + git checkout -b interesting base^ && + echo interesting >file && + git add file && + git commit -m interesting && + + blob=$(git rev-parse interesting:file) +' + +test_expect_success 'detect merge which introduces blob' ' + git checkout -B merge base && + git merge --no-commit boring && + echo interesting >file && + git commit -am "introduce blob" && + git diff-tree --format=%s --find-object=$blob -c --name-status HEAD >actual && + cat >expect <<-\EOF && + introduce blob + + AM file + EOF + test_cmp expect actual +' + +test_expect_success 'detect merge which removes blob' ' + git checkout -B merge interesting && + git merge --no-commit base && + echo boring >file && + git commit -am "remove blob" && + git diff-tree --format=%s --find-object=$blob -c --name-status HEAD >actual && + cat >expect <<-\EOF && + remove blob + + MA file + EOF + test_cmp expect actual +' + +test_expect_success 'do not detect merge that does not touch blob' ' + git checkout -B merge interesting && + git merge -m "untouched blob" base && + git diff-tree --format=%s --find-object=$blob -c --name-status HEAD >actual && + cat >expect <<-\EOF && + untouched blob + + EOF + test_cmp expect 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 5df6b5e64e..6331f63b12 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..1784810 + index 0000000..$(git rev-parse --short D:D.t) --- /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..3cc58df + index 0000000..$(git rev-parse --short C:C.t) --- /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..223b783 + index 0000000..$(git rev-parse --short B:B.t) --- /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..f70f10e + index 0000000..$(git rev-parse --short A:A.t) --- /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 90c8fb2901..804f2a82e8 100755 --- a/third_party/git/t/t4067-diff-partial-clone.sh +++ b/third_party/git/t/t4067-diff-partial-clone.sh @@ -20,7 +20,7 @@ test_expect_success 'git show batches blobs' ' # Ensure that there is exactly 1 negotiation by checking that there is # only 1 "done" line sent. ("done" marks the end of negotiation.) GIT_TRACE_PACKET="$(pwd)/trace" git -C client show HEAD && - grep "git> done" trace >done_lines && + grep "fetch> done" trace >done_lines && test_line_count = 1 done_lines ' @@ -44,7 +44,7 @@ test_expect_success 'diff batches blobs' ' # Ensure that there is exactly 1 negotiation by checking that there is # only 1 "done" line sent. ("done" marks the end of negotiation.) GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD && - grep "git> done" trace >done_lines && + grep "fetch> done" trace >done_lines && test_line_count = 1 done_lines ' @@ -75,6 +75,37 @@ 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" && @@ -94,9 +125,57 @@ test_expect_success 'diff with rename detection batches blobs' ' # Ensure that there is exactly 1 negotiation by checking that there is # only 1 "done" line sent. ("done" marks the end of negotiation.) - GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff -M HEAD^ HEAD >out && - grep "similarity index" out && - grep "git> done" trace >done_lines && + GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD >out && + grep ":100644 100644.*R[0-9][0-9][0-9].*b.*c" out && + grep "fetch> done" trace >done_lines && + test_line_count = 1 done_lines +' + +test_expect_success 'diff does not fetch anything if inexact rename detection is not needed' ' + test_when_finished "rm -rf server client trace" && + + test_create_repo server && + echo a >server/a && + printf "b\nb\nb\nb\nb\n" >server/b && + git -C server add a b && + git -C server commit -m x && + mv server/b server/c && + git -C server add c && + git -C server commit -a -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 && + + # Ensure no fetches. + GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD && + ! test_path_exists trace +' + +test_expect_success 'diff --break-rewrites fetches only if necessary, and batches blobs if it does' ' + test_when_finished "rm -rf server client trace" && + + test_create_repo server && + echo a >server/a && + printf "b\nb\nb\nb\nb\n" >server/b && + git -C server add a b && + git -C server commit -m x && + printf "c\nc\nc\nc\nc\n" >server/b && + git -C server commit -a -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 && + + # Ensure no fetches. + GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD && + ! test_path_exists trace && + + # But with --break-rewrites, ensure that there is exactly 1 negotiation + # by checking that there is only 1 "done" line sent. ("done" marks the + # end of negotiation.) + GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --break-rewrites --raw -M HEAD^ HEAD && + grep "fetch> done" trace >done_lines && test_line_count = 1 done_lines ' diff --git a/third_party/git/t/t4068-diff-symmetric.sh b/third_party/git/t/t4068-diff-symmetric.sh new file mode 100755 index 0000000000..31d17a5af0 --- /dev/null +++ b/third_party/git/t/t4068-diff-symmetric.sh @@ -0,0 +1,91 @@ +#!/bin/sh + +test_description='behavior of diff with symmetric-diff setups' + +. ./test-lib.sh + +# build these situations: +# - normal merge with one merge base (br1...b2r); +# - criss-cross merge ie 2 merge bases (br1...master); +# - disjoint subgraph (orphan branch, br3...master). +# +# B---E <-- master +# / \ / +# A X +# \ / \ +# C---D--G <-- br1 +# \ / +# ---F <-- br2 +# +# H <-- br3 +# +# We put files into a few commits so that we can verify the +# output as well. + +test_expect_success setup ' + git commit --allow-empty -m A && + echo b >b && + git add b && + git commit -m B && + git checkout -b br1 HEAD^ && + echo c >c && + git add c && + git commit -m C && + git tag commit-C && + git merge -m D master && + git tag commit-D && + git checkout master && + git merge -m E commit-C && + git checkout -b br2 commit-C && + echo f >f && + git add f && + git commit -m F && + git checkout br1 && + git merge -m G br2 && + git checkout --orphan br3 && + git commit -m H +' + +test_expect_success 'diff with one merge base' ' + git diff commit-D...br1 >tmp && + tail -n 1 tmp >actual && + echo +f >expect && + test_cmp expect actual +' + +# The output (in tmp) can have +b or +c depending +# on which merge base (commit B or C) is picked. +# It should have one of those two, which comes out +# to seven lines. +test_expect_success 'diff with two merge bases' ' + git diff br1...master >tmp 2>err && + test_line_count = 7 tmp && + test_line_count = 1 err +' + +test_expect_success 'diff with no merge bases' ' + test_must_fail git diff br2...br3 >tmp 2>err && + test_i18ngrep "fatal: br2...br3: no merge base" err +' + +test_expect_success 'diff with too many symmetric differences' ' + test_must_fail git diff br1...master br2...br3 >tmp 2>err && + test_i18ngrep "usage" err +' + +test_expect_success 'diff with symmetric difference and extraneous arg' ' + test_must_fail git diff master br1...master >tmp 2>err && + test_i18ngrep "usage" err +' + +test_expect_success 'diff with two ranges' ' + test_must_fail git diff master br1..master br2..br3 >tmp 2>err && + test_i18ngrep "usage" err +' + +test_expect_success 'diff with ranges and extra arg' ' + test_must_fail git diff master br1..master commit-D >tmp 2>err && + test_i18ngrep "usage" err +' + +test_done diff --git a/third_party/git/t/t4100/t-apply-1.patch b/third_party/git/t/t4100/t-apply-1.patch index 90ab54f0f5..43394f8285 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 - Interogators: -@@ -156,8 +156,8 @@ Interogators: + Interrogators: +@@ -156,8 +156,8 @@ Interrogators: 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 90cdbaa5bb..cac172e779 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 pach subcomponent, and we need +- * Otherwise, we're at a patch 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 5f6ddc1059..57ec79d887 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 - Interogators: -@@ -156,8 +156,8 @@ Interogators: + Interrogators: +@@ -156,8 +156,8 @@ Interrogators: 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 07c6589e74..fa24305108 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 pach subcomponent, and we need +- * Otherwise, we're at a patch 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/t4104-apply-boundary.sh b/third_party/git/t/t4104-apply-boundary.sh index 32e3b0ee0b..71ef4132d1 100755 --- a/third_party/git/t/t4104-apply-boundary.sh +++ b/third_party/git/t/t4104-apply-boundary.sh @@ -3,80 +3,55 @@ # Copyright (c) 2005 Junio C Hamano # -test_description='git apply boundary tests +test_description='git apply boundary tests' -' . ./test-lib.sh L="c d e f g h i j k l m n o p q r s t u v w x" test_expect_success setup ' - for i in b '"$L"' y - do - echo $i - done >victim && + test_write_lines b $L y >victim && cat victim >original && git update-index --add victim && # add to the head - for i in a b '"$L"' y - do - echo $i - done >victim && + test_write_lines a b $L y >victim && cat victim >add-a-expect && git diff victim >add-a-patch.with && git diff --unified=0 >add-a-patch.without && # insert at line two - for i in b a '"$L"' y - do - echo $i - done >victim && + test_write_lines b a $L y >victim && cat victim >insert-a-expect && git diff victim >insert-a-patch.with && git diff --unified=0 >insert-a-patch.without && # modify at the head - for i in a '"$L"' y - do - echo $i - done >victim && + test_write_lines a $L y >victim && cat victim >mod-a-expect && git diff victim >mod-a-patch.with && git diff --unified=0 >mod-a-patch.without && # remove from the head - for i in '"$L"' y - do - echo $i - done >victim && + test_write_lines $L y >victim && cat victim >del-a-expect && git diff victim >del-a-patch.with && git diff --unified=0 >del-a-patch.without && # add to the tail - for i in b '"$L"' y z - do - echo $i - done >victim && + test_write_lines b $L y z >victim && cat victim >add-z-expect && git diff victim >add-z-patch.with && git diff --unified=0 >add-z-patch.without && # modify at the tail - for i in b '"$L"' z - do - echo $i - done >victim && + test_write_lines b $L z >victim && cat victim >mod-z-expect && git diff victim >mod-z-patch.with && git diff --unified=0 >mod-z-patch.without && # remove from the tail - for i in b '"$L"' - do - echo $i - done >victim && + test_write_lines b $L >victim && cat victim >del-z-expect && git diff victim >del-z-patch.with && git diff --unified=0 >del-z-patch.without @@ -88,15 +63,15 @@ for with in with without do case "$with" in with) u= ;; - without) u='--unidiff-zero ' ;; + without) u=--unidiff-zero ;; esac for kind in add-a add-z insert-a mod-a mod-z del-a del-z do test_expect_success "apply $kind-patch $with context" ' cat original >victim && git update-index victim && - git apply --index '"$u$kind-patch.$with"' && - test_cmp '"$kind"'-expect victim + git apply --index $u "$kind-patch.$with" && + test_cmp "$kind-expect" victim ' done done @@ -110,13 +85,12 @@ do test_expect_success "apply non-git $kind-patch without context" ' cat original >victim && git update-index victim && - git apply --unidiff-zero --index '"$kind-ng.without"' && - test_cmp '"$kind"'-expect victim + git apply --unidiff-zero --index "$kind-ng.without" && + test_cmp "$kind-expect" victim ' done test_expect_success 'two lines' ' - >file && git add file && echo aaa >file && @@ -125,11 +99,10 @@ test_expect_success 'two lines' ' echo bbb >file && git add file && test_must_fail git apply --check patch - ' test_expect_success 'apply patch with 3 context lines matching at end' ' - { echo a; echo b; echo c; echo d; } >file && + test_write_lines a b c d >file && git add file && echo e >>file && git diff >patch && diff --git a/third_party/git/t/t4108-apply-threeway.sh b/third_party/git/t/t4108-apply-threeway.sh index fa5d4efb89..d7349ced6b 100755 --- a/third_party/git/t/t4108-apply-threeway.sh +++ b/third_party/git/t/t4108-apply-threeway.sh @@ -4,23 +4,17 @@ test_description='git apply --3way' . ./test-lib.sh -create_file () { - for i - do - echo "$i" - done -} - -sanitize_conflicted_diff () { +print_sanitized_conflicted_diff () { + git diff HEAD >diff.raw && sed -e ' /^index /d - s/^\(+[<>][<>][<>][<>]*\) .*/\1/ - ' + s/^\(+[<>|][<>|][<>|][<>|]*\) .*/\1/ + ' diff.raw } test_expect_success setup ' test_tick && - create_file >one 1 2 3 4 5 6 7 && + test_write_lines 1 2 3 4 5 6 7 >one && cat one >two && git add one two && git commit -m initial && @@ -28,13 +22,13 @@ test_expect_success setup ' git branch side && test_tick && - create_file >one 1 two 3 4 5 six 7 && - create_file >two 1 two 3 4 5 6 7 && + test_write_lines 1 two 3 4 5 six 7 >one && + test_write_lines 1 two 3 4 5 6 7 >two && git commit -a -m master && git checkout side && - create_file >one 1 2 3 4 five 6 7 && - create_file >two 1 2 3 4 five 6 7 && + test_write_lines 1 2 3 4 five 6 7 >one && + test_write_lines 1 2 3 4 five 6 7 >two && git commit -a -m side && git checkout master @@ -52,7 +46,7 @@ test_expect_success 'apply without --3way' ' git diff-index --exit-code --cached HEAD ' -test_expect_success 'apply with --3way' ' +test_apply_with_3way () { # Merging side should be similar to applying this patch git diff ...side >P.diff && @@ -61,22 +55,31 @@ test_expect_success 'apply with --3way' ' git checkout master^0 && test_must_fail git merge --no-commit side && git ls-files -s >expect.ls && - git diff HEAD | sanitize_conflicted_diff >expect.diff && + print_sanitized_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 && - git diff HEAD | sanitize_conflicted_diff >actual.diff && + print_sanitized_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' ' - git config rerere.enabled true && + test_config rerere.enabled true && # Merging side should be similar to applying this patch git diff ...side >P.diff && @@ -87,7 +90,7 @@ test_expect_success 'apply with --3way with rerere enabled' ' test_must_fail git merge --no-commit side && # Manually resolve and record the resolution - create_file 1 two 3 4 five six 7 >one && + test_write_lines 1 two 3 4 five six 7 >one && git rerere && cat one >expect && @@ -104,14 +107,14 @@ test_expect_success 'apply -3 with add/add conflict setup' ' git reset --hard && git checkout -b adder && - create_file 1 2 3 4 5 6 7 >three && - create_file 1 2 3 4 5 6 7 >four && + test_write_lines 1 2 3 4 5 6 7 >three && + test_write_lines 1 2 3 4 5 6 7 >four && git add three four && git commit -m "add three and four" && git checkout -b another adder^ && - create_file 1 2 3 4 5 6 7 >three && - create_file 1 2 3 four 5 6 7 >four && + test_write_lines 1 2 3 4 5 6 7 >three && + test_write_lines 1 2 3 four 5 6 7 >four && git add three four && git commit -m "add three and four" && @@ -121,7 +124,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 && - git diff HEAD | sanitize_conflicted_diff >expect.diff + print_sanitized_conflicted_diff >expect.diff ' test_expect_success 'apply -3 with add/add conflict' ' @@ -131,7 +134,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 && - git diff HEAD | sanitize_conflicted_diff >actual.diff && + print_sanitized_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 f7de6f077a..0ee93fe845 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 && - cat file1.rej && + test_path_is_file 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 && - cat file2.rej && + test_path_is_file 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 && - cat file2.rej && + test_path_is_file 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 ff51e9e789..0ca29821ec 100755 --- a/third_party/git/t/t4124-apply-ws-rule.sh +++ b/third_party/git/t/t4124-apply-ws-rule.sh @@ -35,9 +35,15 @@ 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 | - git apply "$@" + $cmd_prefix git apply "$@" } test_fix () { @@ -46,6 +52,13 @@ test_fix () { # find touched lines $DIFF file target | sed -n -e "s/^> //p" >fixed + # busybox's diff(1) doesn't output normal format + if ! test -s fixed + then + $DIFF -u file target | + grep -v '^+++ target' | + sed -ne "/^+/s/+//p" >fixed + fi # the changed lines are all expected to change fixed_cnt=$(wc -l <fixed) @@ -99,7 +112,7 @@ test_expect_success 'whitespace=warn, default rule' ' test_expect_success 'whitespace=error-all, default rule' ' - test_must_fail apply_patch --whitespace=error-all && + 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 0043930ca6..d1c16ba33c 100755 --- a/third_party/git/t/t4134-apply-submodule.sh +++ b/third_party/git/t/t4134-apply-submodule.sh @@ -15,7 +15,7 @@ index 0000000..0123456 --- /dev/null +++ b/dir/sm @@ -0,0 +1 @@ -+Subproject commit 0123456789abcdef0123456789abcdef01234567 ++Subproject commit $(test_oid numeric) EOF cat > remove-sm.patch <<EOF diff --git a/dir/sm b/dir/sm @@ -24,7 +24,7 @@ index 0123456..0000000 --- a/dir/sm +++ /dev/null @@ -1 +0,0 @@ --Subproject commit 0123456789abcdef0123456789abcdef01234567 +-Subproject commit $(test_oid numeric) EOF ' diff --git a/third_party/git/t/t4137-apply-submodule.sh b/third_party/git/t/t4137-apply-submodule.sh index a9bd40a6d0..07d5262537 100755 --- a/third_party/git/t/t4137-apply-submodule.sh +++ b/third_party/git/t/t4137-apply-submodule.sh @@ -6,15 +6,19 @@ test_description='git apply handling submodules' . "$TEST_DIRECTORY"/lib-submodule-update.sh apply_index () { - git diff --ignore-submodules=dirty "..$1" | git apply --index - + git diff --ignore-submodules=dirty "..$1" >diff && + may_only_be_test_must_fail "$2" && + $2 git apply --index diff } -test_submodule_switch "apply_index" +test_submodule_switch_func "apply_index" apply_3way () { - git diff --ignore-submodules=dirty "..$1" | git apply --3way - + git diff --ignore-submodules=dirty "..$1" >diff && + may_only_be_test_must_fail "$2" && + $2 git apply --3way diff } -test_submodule_switch "apply_3way" +test_submodule_switch_func "apply_3way" test_done diff --git a/third_party/git/t/t4138-apply-ws-expansion.sh b/third_party/git/t/t4138-apply-ws-expansion.sh index 3b636a63a3..b19faeb67a 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 && - git diff --no-index before after | - sed -e "s/before/test-1/" -e "s/after/test-1/" >patch1.patch && + 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 && 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 && - git diff --no-index before after | - sed -e "s/before/test-2/" -e "s/after/test-2/" >patch2.patch && + 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 && 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 && - git diff --no-index before after | - sed -e "s/before/test-3/" -e "s/after/test-3/" >patch3.patch && + 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 && 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 && - git diff --no-index before after | - sed -e "s/before/test-4/" -e "s/after/test-4/" >patch4.patch && + 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 && >test-4 && x=0 && while test $x -lt 50 diff --git a/third_party/git/t/t4140-apply-ita.sh b/third_party/git/t/t4140-apply-ita.sh new file mode 100755 index 0000000000..c614eaf04c --- /dev/null +++ b/third_party/git/t/t4140-apply-ita.sh @@ -0,0 +1,56 @@ +#!/bin/sh + +test_description='git apply of i-t-a file' + +. ./test-lib.sh + +test_expect_success setup ' + test_write_lines 1 2 3 4 5 >blueprint && + + cat blueprint >test-file && + git add -N test-file && + git diff >creation-patch && + grep "new file mode 100644" creation-patch && + + rm -f test-file && + git diff >deletion-patch && + grep "deleted file mode 100644" deletion-patch +' + +test_expect_success 'apply creation patch to ita path (--cached)' ' + git rm -f test-file && + cat blueprint >test-file && + git add -N test-file && + + git apply --cached creation-patch && + git cat-file blob :test-file >actual && + test_cmp blueprint actual +' + +test_expect_success 'apply creation patch to ita path (--index)' ' + git rm -f test-file && + cat blueprint >test-file && + git add -N test-file && + rm -f test-file && + + test_must_fail git apply --index creation-patch +' + +test_expect_success 'apply deletion patch to ita path (--cached)' ' + git rm -f test-file && + cat blueprint >test-file && + git add -N test-file && + + git apply --cached deletion-patch && + test_must_fail git ls-files --stage --error-unmatch test-file +' + +test_expect_success 'apply deletion patch to ita path (--index)' ' + cat blueprint >test-file && + git add -N test-file && + + test_must_fail git apply --index deletion-patch && + git ls-files --stage --error-unmatch test-file +' + +test_done diff --git a/third_party/git/t/t4150-am.sh b/third_party/git/t/t4150-am.sh index 3f7f750cc8..3ecbef6f8e 100755 --- a/third_party/git/t/t4150-am.sh +++ b/third_party/git/t/t4150-am.sh @@ -166,7 +166,7 @@ test_expect_success setup ' test_tick && git commit -m third && - git format-patch --stdout first >patch2 && + git format-patch --stdout first >patch2 && git checkout -b lorem && sed -n -e "11,\$p" msg >file && @@ -465,7 +465,7 @@ test_expect_success 'am changes committer and keeps author' ' test_expect_success 'am --signoff adds Signed-off-by: line' ' rm -fr .git/rebase-apply && git reset --hard && - git checkout -b master2 first && + git checkout -b topic_2 first && git am --signoff <patch2 && { printf "third\n\nSigned-off-by: %s <%s>\n\n" \ @@ -479,7 +479,7 @@ test_expect_success 'am --signoff adds Signed-off-by: line' ' ' test_expect_success 'am stays in branch' ' - echo refs/heads/master2 >expected && + echo refs/heads/topic_2 >expected && git symbolic-ref HEAD >actual && test_cmp expected actual ' @@ -540,7 +540,7 @@ test_expect_success 'am without --keep removes Re: and [PATCH] stuff' ' git reset --hard HEAD^ && git am <patch4 && git rev-parse HEAD >expected && - git rev-parse master2 >actual && + git rev-parse topic_2 >actual && test_cmp expected actual ' @@ -567,7 +567,7 @@ test_expect_success 'am --keep-non-patch really keeps the non-patch part' ' test_expect_success 'setup am -3' ' rm -fr .git/rebase-apply && git reset --hard && - git checkout -b base3way master2 && + git checkout -b base3way topic_2 && sed -n -e "3,\$p" msg >file && head -n 9 msg >>file && git add file && @@ -666,6 +666,26 @@ 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 && @@ -969,7 +989,7 @@ test_expect_success 'am -s unexpected trailer block' ' Signed-off-by: J C H <j@c.h> EOF git commit -F msg && - git cat-file commit HEAD | sed -e '1,/^$/d' >original && + git cat-file commit HEAD | sed -e "1,/^$/d" >original && git format-patch --stdout -1 >patch && git reset --hard HEAD^ && @@ -978,7 +998,7 @@ test_expect_success 'am -s unexpected trailer block' ' cat original && echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" ) >expect && - git cat-file commit HEAD | sed -e '1,/^$/d' >actual && + git cat-file commit HEAD | sed -e "1,/^$/d" >actual && test_cmp expect actual && cat >msg <<-\EOF && @@ -989,7 +1009,7 @@ test_expect_success 'am -s unexpected trailer block' ' EOF git reset HEAD^ && git commit -F msg file && - git cat-file commit HEAD | sed -e '1,/^$/d' >original && + git cat-file commit HEAD | sed -e "1,/^$/d" >original && git format-patch --stdout -1 >patch && git reset --hard HEAD^ && @@ -1000,7 +1020,7 @@ test_expect_success 'am -s unexpected trailer block' ' echo && echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" ) >expect && - git cat-file commit HEAD | sed -e '1,/^$/d' >actual && + git cat-file commit HEAD | sed -e "1,/^$/d" >actual && test_cmp expect actual ' @@ -1061,4 +1081,72 @@ 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_expect_success 'apply binary blob in partial clone' ' + printf "\\000" >binary && + git add binary && + git commit -m "binary blob" && + git format-patch --stdout -m HEAD^ >patch && + + test_create_repo server && + test_config -C server uploadpack.allowfilter 1 && + test_config -C server uploadpack.allowanysha1inwant 1 && + git clone --filter=blob:none "file://$(pwd)/server" client && + test_when_finished "rm -rf client" && + + # Exercise to make sure that it works + git -C client am ../patch +' + test_done diff --git a/third_party/git/t/t4200-rerere.sh b/third_party/git/t/t4200-rerere.sh index 55b7750ade..b12b43e9e9 100755 --- a/third_party/git/t/t4200-rerere.sh +++ b/third_party/git/t/t4200-rerere.sh @@ -210,7 +210,7 @@ test_expect_success 'set up for garbage collection tests' ' echo Hello >$rr/preimage && echo World >$rr/postimage && - sha2=4000000000000000000000000000000000000000 && + sha2=$(test_oid deadbeef) && rr2=.git/rr-cache/$sha2 && mkdir $rr2 && echo Hello >$rr2/preimage && @@ -363,7 +363,7 @@ test_expect_success 'set up an unresolved merge' ' git reset --hard && git checkout version2 && fifth=$(git rev-parse fifth) && - echo "$fifth branch 'fifth' of ." | + echo "$fifth branch fifth of ." | git fmt-merge-msg >msg && ancestor=$(git merge-base version2 fifth) && test_must_fail git merge-recursive "$ancestor" -- HEAD fifth && diff --git a/third_party/git/t/t4201-shortlog.sh b/third_party/git/t/t4201-shortlog.sh index d3a7ce6bbb..3d5c4a2086 100755 --- a/third_party/git/t/t4201-shortlog.sh +++ b/third_party/git/t/t4201-shortlog.sh @@ -215,4 +215,145 @@ test_expect_success 'shortlog --committer (external)' ' test_cmp expect actual ' +test_expect_success '--group=committer is the same as --committer' ' + git shortlog -ns --group=committer HEAD >actual && + test_cmp expect actual +' + +test_expect_success 'shortlog --group=trailer:signed-off-by' ' + git commit --allow-empty -m foo -s && + GIT_COMMITTER_NAME="SOB One" \ + GIT_COMMITTER_EMAIL=sob@example.com \ + git commit --allow-empty -m foo -s && + git commit --allow-empty --amend --no-edit -s && + cat >expect <<-\EOF && + 2 C O Mitter <committer@example.com> + 1 SOB One <sob@example.com> + EOF + git shortlog -nse --group=trailer:signed-off-by HEAD >actual && + test_cmp expect actual +' + +test_expect_success 'trailer idents are split' ' + cat >expect <<-\EOF && + 2 C O Mitter + 1 SOB One + EOF + git shortlog -ns --group=trailer:signed-off-by HEAD >actual && + test_cmp expect actual +' + +test_expect_success 'trailer idents are mailmapped' ' + cat >expect <<-\EOF && + 2 C O Mitter + 1 Another Name + EOF + echo "Another Name <sob@example.com>" >mail.map && + git -c mailmap.file=mail.map shortlog -ns \ + --group=trailer:signed-off-by HEAD >actual && + test_cmp expect actual +' + +test_expect_success 'shortlog de-duplicates trailers in a single commit' ' + git commit --allow-empty -F - <<-\EOF && + subject one + + this message has two distinct values, plus a repeat + + Repeated-trailer: Foo + Repeated-trailer: Bar + Repeated-trailer: Foo + EOF + + git commit --allow-empty -F - <<-\EOF && + subject two + + similar to the previous, but without the second distinct value + + Repeated-trailer: Foo + Repeated-trailer: Foo + EOF + + cat >expect <<-\EOF && + 2 Foo + 1 Bar + EOF + git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual && + test_cmp expect actual +' + +test_expect_success 'shortlog can match multiple groups' ' + git commit --allow-empty -F - <<-\EOF && + subject one + + this has two trailers that are distinct from the author; it will count + 3 times in the output + + Some-trailer: User A <a@example.com> + Another-trailer: User B <b@example.com> + EOF + + git commit --allow-empty -F - <<-\EOF && + subject two + + this one has two trailers, one of which is a duplicate with the author; + it will only be counted once for them + + Another-trailer: A U Thor <author@example.com> + Some-trailer: User B <b@example.com> + EOF + + cat >expect <<-\EOF && + 2 A U Thor + 2 User B + 1 User A + EOF + git shortlog -ns \ + --group=author \ + --group=trailer:some-trailer \ + --group=trailer:another-trailer \ + -2 HEAD >actual && + test_cmp expect actual +' + +test_expect_success 'set up option selection tests' ' + git commit --allow-empty -F - <<-\EOF + subject + + body + + Trailer-one: value-one + Trailer-two: value-two + EOF +' + +test_expect_success '--no-group resets group list to author' ' + cat >expect <<-\EOF && + 1 A U Thor + EOF + git shortlog -ns \ + --group=committer \ + --group=trailer:trailer-one \ + --no-group \ + -1 HEAD >actual && + test_cmp expect actual +' + +test_expect_success '--no-group resets trailer list' ' + cat >expect <<-\EOF && + 1 value-two + EOF + git shortlog -ns \ + --group=trailer:trailer-one \ + --no-group \ + --group=trailer:trailer-two \ + -1 HEAD >actual && + test_cmp expect actual +' + +test_expect_success 'stdin with multiple groups reports error' ' + git log >log && + test_must_fail git shortlog --group=author --group=committer <log +' + test_done diff --git a/third_party/git/t/t4202-log.sh b/third_party/git/t/t4202-log.sh index c20209324c..56d34ed465 100755 --- a/third_party/git/t/t4202-log.sh +++ b/third_party/git/t/t4202-log.sh @@ -5,6 +5,11 @@ 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 ' @@ -87,12 +92,12 @@ test_expect_success 'format %w(,1,2)' ' ' cat > expect << EOF -804a787 sixth -394ef78 fifth -5d31159 fourth -2fbe8c0 third -f7dab8e second -3a2fdcb initial +$(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 EOF test_expect_success 'oneline' ' @@ -173,43 +178,45 @@ 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 -804a787 sixth -394ef78 fifth -5d31159 fourth +$(git rev-parse --short :/sixth ) sixth +$(git rev-parse --short :/fifth ) fifth +$(git rev-parse --short :/fourth) fourth EOF test_expect_success 'git log --no-walk <commits> sorts by commit time' ' - git log --no-walk --oneline 5d31159 804a787 394ef78 > actual && + git log --no-walk --oneline $last_three > actual && test_cmp expect actual ' test_expect_success 'git log --no-walk=sorted <commits> sorts by commit time' ' - git log --no-walk=sorted --oneline 5d31159 804a787 394ef78 > actual && + git log --no-walk=sorted --oneline $last_three > actual && test_cmp expect actual ' cat > expect << EOF -=== 804a787 sixth -=== 394ef78 fifth -=== 5d31159 fourth +=== $(git rev-parse --short :/sixth ) sixth +=== $(git rev-parse --short :/fifth ) fifth +=== $(git rev-parse --short :/fourth) fourth EOF test_expect_success 'git log --line-prefix="=== " --no-walk <commits> sorts by commit time' ' - git log --line-prefix="=== " --no-walk --oneline 5d31159 804a787 394ef78 > actual && + git log --line-prefix="=== " --no-walk --oneline $last_three > actual && test_cmp expect actual ' cat > expect << EOF -5d31159 fourth -804a787 sixth -394ef78 fifth +$(git rev-parse --short :/fourth) fourth +$(git rev-parse --short :/sixth ) sixth +$(git rev-parse --short :/fifth ) fifth EOF test_expect_success 'git log --no-walk=unsorted <commits> leaves list of commits as given' ' - git log --no-walk=unsorted --oneline 5d31159 804a787 394ef78 > actual && + git log --no-walk=unsorted --oneline $last_three > actual && test_cmp expect actual ' test_expect_success 'git show <commits> leaves list of commits as given' ' - git show --oneline -s 5d31159 804a787 394ef78 > actual && + git show --oneline -s $last_three > actual && test_cmp expect actual ' @@ -450,8 +457,7 @@ cat > expect <<EOF EOF test_expect_success 'simple log --graph' ' - git log --graph --pretty=tformat:%s >actual && - test_cmp expect actual + test_cmp_graph ' cat > expect <<EOF @@ -465,8 +471,7 @@ cat > expect <<EOF EOF test_expect_success 'simple log --graph --line-prefix="123 "' ' - git log --graph --line-prefix="123 " --pretty=tformat:%s >actual && - test_cmp expect actual + test_cmp_graph --line-prefix="123 " ' test_expect_success 'set up merge history' ' @@ -493,9 +498,7 @@ cat > expect <<\EOF EOF test_expect_success 'log --graph with merge' ' - git log --graph --date-order --pretty=tformat:%s | - sed "s/ *\$//" >actual && - test_cmp expect actual + test_cmp_graph --date-order ' cat > expect <<\EOF @@ -514,9 +517,7 @@ cat > expect <<\EOF EOF test_expect_success 'log --graph --line-prefix="| | | " with merge' ' - git log --line-prefix="| | | " --graph --date-order --pretty=tformat:%s | - sed "s/ *\$//" >actual && - test_cmp expect actual + test_cmp_graph --line-prefix="| | | " --date-order ' cat > expect.colors <<\EOF @@ -536,9 +537,7 @@ EOF test_expect_success 'log --graph with merge with log.graphColors' ' test_config log.graphColors " blue,invalid-color, cyan, red , " && - git log --color=always --graph --date-order --pretty=tformat:%s | - test_decode_color | sed "s/ *\$//" >actual && - test_cmp expect.colors actual + lib_test_cmp_colored_graph --date-order --format=%s ' test_expect_success 'log --raw --graph -m with merge' ' @@ -667,16 +666,14 @@ cat > expect <<\EOF * | | fifth * | | fourth |/ / -* | third +* / third |/ * second * initial EOF test_expect_success 'log --graph with merge' ' - git log --graph --date-order --pretty=tformat:%s | - sed "s/ *\$//" >actual && - test_cmp expect actual + test_cmp_graph --date-order ' test_expect_success 'log.decorate configuration' ' @@ -745,7 +742,23 @@ test_expect_success 'decorate-refs with glob' ' octopus-a (octopus-a) reach EOF + cat >expect.no-decorate <<-\EOF && + Merge-tag-reach + Merge-tags-octopus-a-and-octopus-b + seventh + octopus-b + octopus-a + reach + EOF + git log -n6 --decorate=short --pretty="tformat:%f%d" \ + --decorate-refs="heads/octopus*" >actual && + test_cmp expect.decorate actual && git log -n6 --decorate=short --pretty="tformat:%f%d" \ + --decorate-refs-exclude="heads/octopus*" \ + --decorate-refs="heads/octopus*" >actual && + test_cmp expect.no-decorate actual && + git -c log.excludeDecoration="heads/octopus*" log \ + -n6 --decorate=short --pretty="tformat:%f%d" \ --decorate-refs="heads/octopus*" >actual && test_cmp expect.decorate actual ' @@ -790,6 +803,9 @@ test_expect_success 'decorate-refs-exclude with glob' ' EOF git log -n6 --decorate=short --pretty="tformat:%f%d" \ --decorate-refs-exclude="heads/octopus*" >actual && + test_cmp expect.decorate actual && + git -c log.excludeDecoration="heads/octopus*" log \ + -n6 --decorate=short --pretty="tformat:%f%d" >actual && test_cmp expect.decorate actual ' @@ -804,6 +820,9 @@ test_expect_success 'decorate-refs-exclude without globs' ' EOF git log -n6 --decorate=short --pretty="tformat:%f%d" \ --decorate-refs-exclude="tags/reach" >actual && + test_cmp expect.decorate actual && + git -c log.excludeDecoration="tags/reach" log \ + -n6 --decorate=short --pretty="tformat:%f%d" >actual && test_cmp expect.decorate actual ' @@ -819,11 +838,19 @@ test_expect_success 'multiple decorate-refs-exclude' ' git log -n6 --decorate=short --pretty="tformat:%f%d" \ --decorate-refs-exclude="heads/octopus*" \ --decorate-refs-exclude="tags/reach" >actual && + test_cmp expect.decorate actual && + git -c log.excludeDecoration="heads/octopus*" \ + -c log.excludeDecoration="tags/reach" log \ + -n6 --decorate=short --pretty="tformat:%f%d" >actual && + test_cmp expect.decorate actual && + git -c log.excludeDecoration="heads/octopus*" log \ + --decorate-refs-exclude="tags/reach" \ + -n6 --decorate=short --pretty="tformat:%f%d" >actual && test_cmp expect.decorate actual ' test_expect_success 'decorate-refs and decorate-refs-exclude' ' - cat >expect.decorate <<-\EOF && + cat >expect.no-decorate <<-\EOF && Merge-tag-reach (master) Merge-tags-octopus-a-and-octopus-b seventh @@ -834,6 +861,40 @@ test_expect_success 'decorate-refs and decorate-refs-exclude' ' git log -n6 --decorate=short --pretty="tformat:%f%d" \ --decorate-refs="heads/*" \ --decorate-refs-exclude="heads/oc*" >actual && + test_cmp expect.no-decorate actual +' + +test_expect_success 'deocrate-refs and log.excludeDecoration' ' + cat >expect.decorate <<-\EOF && + Merge-tag-reach (master) + Merge-tags-octopus-a-and-octopus-b + seventh + octopus-b (octopus-b) + octopus-a (octopus-a) + reach (reach) + EOF + git -c log.excludeDecoration="heads/oc*" log \ + --decorate-refs="heads/*" \ + -n6 --decorate=short --pretty="tformat:%f%d" >actual && + 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 && + git -c log.excludeDecoration="*octopus*" log \ + -n6 --decorate=short --pretty="tformat:%f%d" \ + --simplify-by-decoration >actual && test_cmp expect.decorate actual ' @@ -942,7 +1003,7 @@ cat >expect <<\EOF | | | | diff --git a/reach.t b/reach.t | | new file mode 100644 -| | index 0000000..10c9591 +| | index BEFORE..AFTER | | --- /dev/null | | +++ b/reach.t | | @@ -0,0 +1 @@ @@ -965,7 +1026,7 @@ cat >expect <<\EOF | | | | | | diff --git a/octopus-b.t b/octopus-b.t | | | new file mode 100644 -| | | index 0000000..d5fcad0 +| | | index BEFORE..AFTER | | | --- /dev/null | | | +++ b/octopus-b.t | | | @@ -0,0 +1 @@ @@ -981,7 +1042,7 @@ cat >expect <<\EOF | | | | diff --git a/octopus-a.t b/octopus-a.t | | new file mode 100644 -| | index 0000000..11ee015 +| | index BEFORE..AFTER | | --- /dev/null | | +++ b/octopus-a.t | | @@ -0,0 +1 @@ @@ -997,7 +1058,7 @@ cat >expect <<\EOF | | diff --git a/seventh.t b/seventh.t | new file mode 100644 -| index 0000000..9744ffc +| index BEFORE..AFTER | --- /dev/null | +++ b/seventh.t | @@ -0,0 +1 @@ @@ -1031,7 +1092,7 @@ cat >expect <<\EOF | | | | | | | | diff --git a/tangle-a b/tangle-a | | | | new file mode 100644 -| | | | index 0000000..7898192 +| | | | index BEFORE..AFTER | | | | --- /dev/null | | | | +++ b/tangle-a | | | | @@ -0,0 +1 @@ @@ -1053,7 +1114,7 @@ cat >expect <<\EOF | | | | | | | | diff --git a/2 b/2 | | | | new file mode 100644 -| | | | index 0000000..0cfbf08 +| | | | index BEFORE..AFTER | | | | --- /dev/null | | | | +++ b/2 | | | | @@ -0,0 +1 @@ @@ -1069,7 +1130,7 @@ cat >expect <<\EOF | | | | | | | | diff --git a/1 b/1 | | | | new file mode 100644 -| | | | index 0000000..d00491f +| | | | index BEFORE..AFTER | | | | --- /dev/null | | | | +++ b/1 | | | | @@ -0,0 +1 @@ @@ -1085,7 +1146,7 @@ cat >expect <<\EOF | | | | | | | | diff --git a/one b/one | | | | new file mode 100644 -| | | | index 0000000..9a33383 +| | | | index BEFORE..AFTER | | | | --- /dev/null | | | | +++ b/one | | | | @@ -0,0 +1 @@ @@ -1101,7 +1162,7 @@ cat >expect <<\EOF | | | | | | diff --git a/a/two b/a/two | | | deleted file mode 100644 -| | | index 9245af5..0000000 +| | | index BEFORE..AFTER | | | --- a/a/two | | | +++ /dev/null | | | @@ -1 +0,0 @@ @@ -1117,7 +1178,7 @@ cat >expect <<\EOF | | | | | | diff --git a/a/two b/a/two | | | new file mode 100644 -| | | index 0000000..9245af5 +| | | index BEFORE..AFTER | | | --- /dev/null | | | +++ b/a/two | | | @@ -0,0 +1 @@ @@ -1133,7 +1194,7 @@ cat >expect <<\EOF | | | | diff --git a/ein b/ein | | new file mode 100644 -| | index 0000000..9d7e69f +| | index BEFORE..AFTER | | --- /dev/null | | +++ b/ein | | @@ -0,0 +1 @@ @@ -1150,14 +1211,14 @@ cat >expect <<\EOF | | diff --git a/ichi b/ichi | new file mode 100644 -| index 0000000..9d7e69f +| index BEFORE..AFTER | --- /dev/null | +++ b/ichi | @@ -0,0 +1 @@ | +ichi | diff --git a/one b/one | deleted file mode 100644 -| index 9d7e69f..0000000 +| index BEFORE..AFTER | --- a/one | +++ /dev/null | @@ -1 +0,0 @@ @@ -1172,7 +1233,7 @@ cat >expect <<\EOF | 1 file changed, 1 insertion(+), 1 deletion(-) | | diff --git a/one b/one -| index 5626abf..9d7e69f 100644 +| index BEFORE..AFTER 100644 | --- a/one | +++ b/one | @@ -1 +1 @@ @@ -1189,30 +1250,15 @@ cat >expect <<\EOF diff --git a/one b/one new file mode 100644 - index 0000000..5626abf + index BEFORE..AFTER --- /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' ' - git log --no-renames --graph --pretty=short --stat -p >actual && - sanitize_output >actual.sanitized <actual && - test_i18ncmp expect actual.sanitized + lib_test_cmp_short_graph --no-renames --stat -p ' cat >expect <<\EOF @@ -1232,7 +1278,7 @@ cat >expect <<\EOF *** | | *** | | diff --git a/reach.t b/reach.t *** | | new file mode 100644 -*** | | index 0000000..10c9591 +*** | | index BEFORE..AFTER *** | | --- /dev/null *** | | +++ b/reach.t *** | | @@ -0,0 +1 @@ @@ -1255,7 +1301,7 @@ cat >expect <<\EOF *** | | | *** | | | diff --git a/octopus-b.t b/octopus-b.t *** | | | new file mode 100644 -*** | | | index 0000000..d5fcad0 +*** | | | index BEFORE..AFTER *** | | | --- /dev/null *** | | | +++ b/octopus-b.t *** | | | @@ -0,0 +1 @@ @@ -1271,7 +1317,7 @@ cat >expect <<\EOF *** | | *** | | diff --git a/octopus-a.t b/octopus-a.t *** | | new file mode 100644 -*** | | index 0000000..11ee015 +*** | | index BEFORE..AFTER *** | | --- /dev/null *** | | +++ b/octopus-a.t *** | | @@ -0,0 +1 @@ @@ -1287,7 +1333,7 @@ cat >expect <<\EOF *** | *** | diff --git a/seventh.t b/seventh.t *** | new file mode 100644 -*** | index 0000000..9744ffc +*** | index BEFORE..AFTER *** | --- /dev/null *** | +++ b/seventh.t *** | @@ -0,0 +1 @@ @@ -1321,7 +1367,7 @@ cat >expect <<\EOF *** | | | | *** | | | | diff --git a/tangle-a b/tangle-a *** | | | | new file mode 100644 -*** | | | | index 0000000..7898192 +*** | | | | index BEFORE..AFTER *** | | | | --- /dev/null *** | | | | +++ b/tangle-a *** | | | | @@ -0,0 +1 @@ @@ -1343,7 +1389,7 @@ cat >expect <<\EOF *** | | | | *** | | | | diff --git a/2 b/2 *** | | | | new file mode 100644 -*** | | | | index 0000000..0cfbf08 +*** | | | | index BEFORE..AFTER *** | | | | --- /dev/null *** | | | | +++ b/2 *** | | | | @@ -0,0 +1 @@ @@ -1359,7 +1405,7 @@ cat >expect <<\EOF *** | | | | *** | | | | diff --git a/1 b/1 *** | | | | new file mode 100644 -*** | | | | index 0000000..d00491f +*** | | | | index BEFORE..AFTER *** | | | | --- /dev/null *** | | | | +++ b/1 *** | | | | @@ -0,0 +1 @@ @@ -1375,7 +1421,7 @@ cat >expect <<\EOF *** | | | | *** | | | | diff --git a/one b/one *** | | | | new file mode 100644 -*** | | | | index 0000000..9a33383 +*** | | | | index BEFORE..AFTER *** | | | | --- /dev/null *** | | | | +++ b/one *** | | | | @@ -0,0 +1 @@ @@ -1391,7 +1437,7 @@ cat >expect <<\EOF *** | | | *** | | | diff --git a/a/two b/a/two *** | | | deleted file mode 100644 -*** | | | index 9245af5..0000000 +*** | | | index BEFORE..AFTER *** | | | --- a/a/two *** | | | +++ /dev/null *** | | | @@ -1 +0,0 @@ @@ -1407,7 +1453,7 @@ cat >expect <<\EOF *** | | | *** | | | diff --git a/a/two b/a/two *** | | | new file mode 100644 -*** | | | index 0000000..9245af5 +*** | | | index BEFORE..AFTER *** | | | --- /dev/null *** | | | +++ b/a/two *** | | | @@ -0,0 +1 @@ @@ -1423,7 +1469,7 @@ cat >expect <<\EOF *** | | *** | | diff --git a/ein b/ein *** | | new file mode 100644 -*** | | index 0000000..9d7e69f +*** | | index BEFORE..AFTER *** | | --- /dev/null *** | | +++ b/ein *** | | @@ -0,0 +1 @@ @@ -1440,14 +1486,14 @@ cat >expect <<\EOF *** | *** | diff --git a/ichi b/ichi *** | new file mode 100644 -*** | index 0000000..9d7e69f +*** | index BEFORE..AFTER *** | --- /dev/null *** | +++ b/ichi *** | @@ -0,0 +1 @@ *** | +ichi *** | diff --git a/one b/one *** | deleted file mode 100644 -*** | index 9d7e69f..0000000 +*** | index BEFORE..AFTER *** | --- a/one *** | +++ /dev/null *** | @@ -1 +0,0 @@ @@ -1462,7 +1508,7 @@ cat >expect <<\EOF *** | 1 file changed, 1 insertion(+), 1 deletion(-) *** | *** | diff --git a/one b/one -*** | index 5626abf..9d7e69f 100644 +*** | index BEFORE..AFTER 100644 *** | --- a/one *** | +++ b/one *** | @@ -1 +1 @@ @@ -1479,7 +1525,7 @@ cat >expect <<\EOF *** *** diff --git a/one b/one *** new file mode 100644 -*** index 0000000..5626abf +*** index BEFORE..AFTER *** --- /dev/null *** +++ b/one *** @@ -0,0 +1 @@ @@ -1487,9 +1533,7 @@ cat >expect <<\EOF EOF test_expect_success 'log --line-prefix="*** " --graph with diff and stats' ' - git log --line-prefix="*** " --no-renames --graph --pretty=short --stat -p >actual && - sanitize_output >actual.sanitized <actual && - test_i18ncmp expect actual.sanitized + lib_test_cmp_short_graph --line-prefix="*** " --no-renames --stat -p ' cat >expect <<-\EOF @@ -1511,9 +1555,7 @@ cat >expect <<-\EOF EOF test_expect_success 'log --graph with --name-status' ' - git log --graph --format=%s --name-status tangle..reach >actual && - sanitize_output <actual >actual.sanitized && - test_cmp expect actual.sanitized + test_cmp_graph --name-status tangle..reach ' cat >expect <<-\EOF @@ -1535,9 +1577,7 @@ cat >expect <<-\EOF EOF test_expect_success 'log --graph with --name-only' ' - git log --graph --format=%s --name-only tangle..reach >actual && - sanitize_output <actual >actual.sanitized && - test_cmp expect actual.sanitized + test_cmp_graph --name-only tangle..reach ' test_expect_success 'dotdot is a parent directory' ' @@ -1555,6 +1595,14 @@ 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 && @@ -1565,6 +1613,18 @@ 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 && @@ -1596,6 +1656,86 @@ 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 GPG 'log --graph --show-signature for merged tag with missing key' ' + test_when_finished "git reset --hard && git checkout master" && + git checkout -b plain-nokey master && + echo aaa >bar && + git add bar && + git commit -m bar_commit && + git checkout -b tagged-nokey master && + echo bbb >baz && + git add baz && + git commit -m baz_commit && + git tag -s -m signed_tag_msg signed_tag_nokey && + git checkout plain-nokey && + git merge --no-ff -m msg signed_tag_nokey && + GNUPGHOME=. git log --graph --show-signature -n1 plain-nokey >actual && + grep "^|\\\ merged tag" actual && + grep "^| | gpg: Signature made" actual && + grep -E "^| | gpg: Can'"'"'t check signature: (public key not found|No public key)" actual +' + +test_expect_success GPG 'log --graph --show-signature for merged tag with bad signature' ' + test_when_finished "git reset --hard && git checkout master" && + git checkout -b plain-bad master && + echo aaa >bar && + git add bar && + git commit -m bar_commit && + git checkout -b tagged-bad master && + echo bbb >baz && + git add baz && + git commit -m baz_commit && + git tag -s -m signed_tag_msg signed_tag_bad && + git cat-file tag signed_tag_bad >raw && + sed -e "s/signed_tag_msg/forged/" raw >forged && + git hash-object -w -t tag forged >forged.tag && + git checkout plain-bad && + git merge --no-ff -m msg "$(cat forged.tag)" && + git log --graph --show-signature -n1 plain-bad >actual && + grep "^|\\\ merged tag" actual && + grep "^| | gpg: Signature made" actual && + grep "^| | gpg: BAD signature from" actual +' + +test_expect_success GPG 'log --show-signature for merged tag with GPG failure' ' + test_when_finished "git reset --hard && git checkout master" && + git checkout -b plain-fail master && + echo aaa >bar && + git add bar && + git commit -m bar_commit && + git checkout -b tagged-fail master && + echo bbb >baz && + git add baz && + git commit -m baz_commit && + git tag -s -m signed_tag_msg signed_tag_fail && + git checkout plain-fail && + git merge --no-ff -m msg signed_tag_fail && + TMPDIR="$(pwd)/bogus" git log --show-signature -n1 plain-fail >actual && + grep "^merged tag" actual && + grep "^No signature" actual && + ! grep "^gpg: Signature made" 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 && @@ -1617,6 +1757,51 @@ test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' ' grep "^| | gpgsm: Good signature" actual ' +test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 missing key' ' + test_when_finished "git reset --hard && git checkout master" && + test_config gpg.format x509 && + test_config user.signingkey $GIT_COMMITTER_EMAIL && + git checkout -b plain-x509-nokey master && + echo aaa >bar && + git add bar && + git commit -m bar_commit && + git checkout -b tagged-x509-nokey master && + echo bbb >baz && + git add baz && + git commit -m baz_commit && + git tag -s -m signed_tag_msg signed_tag_x509_nokey && + git checkout plain-x509-nokey && + git merge --no-ff -m msg signed_tag_x509_nokey && + GNUPGHOME=. git log --graph --show-signature -n1 plain-x509-nokey >actual && + grep "^|\\\ merged tag" actual && + grep "^| | gpgsm: certificate not found" actual +' + +test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 bad signature' ' + test_when_finished "git reset --hard && git checkout master" && + test_config gpg.format x509 && + test_config user.signingkey $GIT_COMMITTER_EMAIL && + git checkout -b plain-x509-bad master && + echo aaa >bar && + git add bar && + git commit -m bar_commit && + git checkout -b tagged-x509-bad master && + echo bbb >baz && + git add baz && + git commit -m baz_commit && + git tag -s -m signed_tag_msg signed_tag_x509_bad && + git cat-file tag signed_tag_x509_bad >raw && + sed -e "s/signed_tag_msg/forged/" raw >forged && + git hash-object -w -t tag forged >forged.tag && + git checkout plain-x509-bad && + git merge --no-ff -m msg "$(cat forged.tag)" && + git log --graph --show-signature -n1 plain-x509-bad >actual && + grep "^|\\\ merged tag" actual && + grep "^| | gpgsm: Signature made" actual && + grep "^| | gpgsm: invalid signature" actual +' + + test_expect_success GPG '--no-show-signature overrides --show-signature' ' git log -1 --show-signature --no-show-signature signed >actual && ! grep "^gpg:" actual @@ -1665,6 +1850,16 @@ test_expect_success 'log does not default to HEAD when rev input is given' ' test_must_be_empty actual ' +test_expect_success 'do not default to HEAD with ignored object on cmdline' ' + git log --ignore-missing $ZERO_OID >actual && + test_must_be_empty actual +' + +test_expect_success 'do not default to HEAD with ignored object on stdin' ' + echo $ZERO_OID | git log --ignore-missing --stdin >actual && + test_must_be_empty actual +' + test_expect_success 'set up --source tests' ' git checkout --orphan source-a && test_commit one && @@ -1674,10 +1869,10 @@ test_expect_success 'set up --source tests' ' ' test_expect_success 'log --source paints branch names' ' - cat >expect <<-\EOF && - 09e12a9 source-b three - 8e393e1 source-a two - 1ac6c77 source-b one + 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 EOF git log --oneline --source source-a source-b >actual && test_cmp expect actual @@ -1685,19 +1880,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 && - 09e12a9 source-tag three - 8e393e1 source-a two - 1ac6c77 source-tag one + 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 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 && - 09e12a9 source-b three - 8e393e1 source-a two + cat >expect <<-EOF && + $(git rev-parse --short :/three) source-b three + $(git rev-parse --short :/two ) source-a two EOF git log --oneline --source source-a...source-b >actual && test_cmp expect actual @@ -1707,4 +1902,11 @@ 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 918ada69eb..586c3a86b1 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 && - A U Thor <author@example.com> + cat >contacts <<- EOF && + $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 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 && - A U Thor <author@example.com> + cat >expect <<- EOF && + $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> nick1 <bugs@company.xx> EOF git check-mailmap \ - "A U Thor <author@example.com>" \ + "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" \ "nick1 <bugs@company.xx>" >actual && test_cmp expect actual ' test_expect_success 'check-mailmap --stdin' ' - cat >expect <<-\EOF && - A U Thor <author@example.com> + cat >expect <<- EOF && + $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 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 -A U Thor (1): +cat >expect << EOF +$GIT_AUTHOR_NAME (1): initial nick1 (1): @@ -90,7 +90,7 @@ nick1 (1): EOF test_expect_success 'default .mailmap' ' - echo "Repo Guy <author@example.com>" > .mailmap && + echo "Repo Guy <$GIT_AUTHOR_EMAIL>" > .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 <author@example.com>" >> internal_mailmap/.mailmap && + echo "External Guy <$GIT_AUTHOR_EMAIL>" >> 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 -A U Thor (1): +cat >expect << EOF +$GIT_AUTHOR_NAME (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 <author@example.com> + cat >both <<- EOF && + Blob Guy <$GIT_AUTHOR_EMAIL> Blob Guy <bugs@company.xx> EOF - printf "Tricky Guy <author@example.com>" >no-newline && + printf "Tricky Guy <$GIT_AUTHOR_EMAIL>" >no-newline && git add just-bugs both no-newline && git commit -m "my mailmaps" && - echo "Repo Guy <author@example.com>" >.mailmap && - echo "Internal Guy <author@example.com>" >internal.map + echo "Repo Guy <$GIT_AUTHOR_EMAIL>" >.mailmap && + echo "Internal Guy <$GIT_AUTHOR_EMAIL>" >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 <author@example.com>" && + test_commit one .mailmap "Fake Name <$GIT_AUTHOR_EMAIL>" && echo " 1 Fake Name" >expect && git shortlog -ns HEAD >actual && test_cmp expect actual && rm .mailmap && - echo " 1 A U Thor" >expect && + echo " 1 $GIT_AUTHOR_NAME" >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 <author@example.com>" >expect && + echo " 1 A <$GIT_AUTHOR_EMAIL>" >expect && echo " 1 nick1 <bugs@company.xx>" >>expect && - echo "A <author@example.com>" >.mailmap && + echo "A <$GIT_AUTHOR_EMAIL>" >.mailmap && test_when_finished "rm .mailmap" && git shortlog -es HEAD >actual && test_cmp expect actual ' test_expect_success 'preserve canonical email case' ' - echo " 1 A U Thor <AUTHOR@example.com>" >expect && + echo " 1 $GIT_AUTHOR_NAME <AUTHOR@example.com>" >expect && echo " 1 nick1 <bugs@company.xx>" >>expect && - echo "<AUTHOR@example.com> <author@example.com>" >.mailmap && + echo "<AUTHOR@example.com> <$GIT_AUTHOR_EMAIL>" >.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 -A U Thor <author@example.com> (1): +cat >expect << EOF +$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> (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 <committer@example.com>" > internal_mailmap/.mailmap && + echo "Committed <$GIT_COMMITTER_EMAIL>" > 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 C O Mitter <committer@example.com> maps to Committed <committer@example.com> +Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> Author claus <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx> -Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> +Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> Author santa <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx> -Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> +Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> Author nick2 <nick2@company.xx> maps to Other Author <other@author.xx> -Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> +Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> Author nick2 <bugs@company.xx> maps to Other Author <other@author.xx> -Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> +Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> Author nick1 <bugs@company.xx> maps to Some Dude <some@dude.xx> -Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> +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> +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> EOF test_expect_success 'Log output (complex mapping)' ' @@ -412,14 +412,42 @@ test_expect_success 'Log output (complex mapping)' ' test_cmp expect actual ' -cat >expect <<\EOF +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 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: A U Thor <author@example.com> +Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> EOF test_expect_success 'Log output with --use-mailmap' ' @@ -427,14 +455,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: A U Thor <author@example.com> +Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> EOF test_expect_success 'Log output with log.mailmap' ' @@ -443,28 +471,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: A U Thor <author@example.com> + Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 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: A U Thor <author@example.com> + Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> EOF git log --no-use-mailmap | grep Author > actual && test_cmp expect actual @@ -500,8 +528,8 @@ test_expect_success 'Only grep replaced author with --use-mailmap' ' ' # git blame -cat >expect <<\EOF -^OBJI (A U Thor DATE 1) one +cat >expect <<EOF +^OBJI ($GIT_AUTHOR_NAME 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 0288c17ec6..8ff8bd84c7 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 "^[a-f0-9]\{40\} $(git rev-parse HEAD)$" output + grep "^$OID_REGEX $(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 f42a69faa2..204c149d5a 100755 --- a/third_party/git/t/t4205-log-pretty-formats.sh +++ b/third_party/git/t/t4205-log-pretty-formats.sh @@ -134,6 +134,36 @@ 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 && @@ -503,6 +533,12 @@ 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) && @@ -640,7 +676,7 @@ test_expect_success 'pretty format %(trailers:key=foo) multiple keys' ' test_cmp expect actual ' -test_expect_success '%(trailers:key=nonexistant) becomes empty' ' +test_expect_success '%(trailers:key=nonexistent) becomes empty' ' git log --no-walk --pretty="x%(trailers:key=Nacked-by)x" >actual && echo "xx" >expect && test_cmp expect actual @@ -788,4 +824,47 @@ 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/t4208-log-magic-pathspec.sh b/third_party/git/t/t4208-log-magic-pathspec.sh index 4c8f3b8e1b..6cdbe4747a 100755 --- a/third_party/git/t/t4208-log-magic-pathspec.sh +++ b/third_party/git/t/t4208-log-magic-pathspec.sh @@ -55,6 +55,10 @@ test_expect_success '"git log -- :/a" should not be ambiguous' ' git log -- :/a ' +test_expect_success '"git log :/any/path/" should not segfault' ' + test_must_fail git log :/any/path/ +' + # This differs from the ":/a" check above in that :/in looks like a pathspec, # but doesn't match an actual file. test_expect_success '"git log :/in" should not be ambiguous' ' diff --git a/third_party/git/t/t4210-log-i18n.sh b/third_party/git/t/t4210-log-i18n.sh index 7c519436ef..d2dfcf164e 100755 --- a/third_party/git/t/t4210-log-i18n.sh +++ b/third_party/git/t/t4210-log-i18n.sh @@ -1,12 +1,22 @@ #!/bin/sh test_description='test log with i18n features' -. ./test-lib.sh +. ./lib-gettext.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 "(" + +have_reg_illseq= +if test_have_prereq GETTEXT_LOCALE && + ! LC_ALL=$is_IS_locale test-tool regex --silent $latin1_e +then + have_reg_illseq=1 +fi + test_expect_success 'create commits in different encodings' ' test_tick && cat >msg <<-EOF && @@ -53,4 +63,72 @@ test_expect_success 'log --grep does not find non-reencoded values (latin1)' ' test_must_be_empty actual ' +triggers_undefined_behaviour () { + local engine=$1 + + case $engine in + fixed) + if test -n "$have_reg_illseq" && + ! test_have_prereq LIBPCRE2 + then + return 0 + fi + ;; + basic|extended) + if test -n "$have_reg_illseq" + then + return 0 + fi + ;; + esac + return 1 +} + +mismatched_git_log () { + local pattern=$1 + + LC_ALL=$is_IS_locale git log --encoding=ISO-8859-1 --format=%s \ + --grep=$pattern +} + +for engine in fixed basic extended perl +do + prereq= + if test $engine = "perl" + then + prereq=PCRE + fi + force_regex= + if test $engine != "fixed" + then + force_regex='.*' + fi + + test_expect_success $prereq "config grep.patternType=$engine" " + git config grep.patternType $engine + " + + test_expect_success GETTEXT_LOCALE,$prereq "log --grep does not find non-reencoded values (latin1 + locale)" " + mismatched_git_log '$force_regex$utf8_e' >actual && + test_must_be_empty actual + " + + if ! triggers_undefined_behaviour $engine + then + test_expect_success !MINGW,GETTEXT_LOCALE,$prereq "log --grep searches in log output encoding (latin1 + locale)" " + cat >expect <<-\EOF && + latin1 + utf8 + EOF + mismatched_git_log '$force_regex$latin1_e' >actual && + test_cmp expect actual + " + + test_expect_success GETTEXT_LOCALE,$prereq "log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)" " + mismatched_git_log '$force_regex$invalid_e' >actual && + test_must_be_empty actual + " + fi +done + test_done diff --git a/third_party/git/t/t4211-line-log.sh b/third_party/git/t/t4211-line-log.sh index 1db7bd0f59..2d1d7b5d19 100755 --- a/third_party/git/t/t4211-line-log.sh +++ b/third_party/git/t/t4211-line-log.sh @@ -11,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/expect.$3 actual + test_cmp \"\$TEST_DIRECTORY\"/t4211/$(test_oid algo)/expect.$3 actual " } @@ -132,4 +132,162 @@ 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 +' + +# Create the following linear history, where each commit does what its +# subject line promises: +# +# * 66c6410 Modify func2() in file.c +# * 50834e5 Modify other-file +# * fe5851c Modify func1() in file.c +# * 8c7c7dd Add other-file +# * d5f4417 Add func1() and func2() in file.c +test_expect_success 'setup for checking line-log and parent oids' ' + git checkout --orphan parent-oids && + git reset --hard && + + cat >file.c <<-\EOF && + int func1() + { + return F1; + } + + int func2() + { + return F2; + } + EOF + git add file.c && + test_tick && + first_tick=$test_tick && + git commit -m "Add func1() and func2() in file.c" && + + echo 1 >other-file && + git add other-file && + test_tick && + git commit -m "Add other-file" && + + sed -e "s/F1/F1 + 1/" file.c >tmp && + mv tmp file.c && + git commit -a -m "Modify func1() in file.c" && + + echo 2 >other-file && + git commit -a -m "Modify other-file" && + + sed -e "s/F2/F2 + 2/" file.c >tmp && + mv tmp file.c && + git commit -a -m "Modify func2() in file.c" && + + head_oid=$(git rev-parse --short HEAD) && + prev_oid=$(git rev-parse --short HEAD^) && + root_oid=$(git rev-parse --short HEAD~4) +' + +# Parent oid should be from immediate parent. +test_expect_success 'parent oids without parent rewriting' ' + cat >expect <<-EOF && + $head_oid $prev_oid Modify func2() in file.c + $root_oid Add func1() and func2() in file.c + EOF + git log --format="%h %p %s" --no-patch -L:func2:file.c >actual && + test_cmp expect actual +' + +# Parent oid should be from the most recent ancestor touching func2(), +# i.e. in this case from the root commit. +test_expect_success 'parent oids with parent rewriting' ' + cat >expect <<-EOF && + $head_oid $root_oid Modify func2() in file.c + $root_oid Add func1() and func2() in file.c + EOF + git log --format="%h %p %s" --no-patch -L:func2:file.c --parents >actual && + test_cmp expect actual +' + +test_expect_success 'line-log with --before' ' + echo $root_oid >expect && + git log --format=%h --no-patch -L:func2:file.c --before=$first_tick >actual && + test_cmp expect actual +' + test_done diff --git a/third_party/git/t/t4211/expect.beginning-of-file b/third_party/git/t/t4211/sha1/expect.beginning-of-file index 91b4054898..91b4054898 100644 --- a/third_party/git/t/t4211/expect.beginning-of-file +++ b/third_party/git/t/t4211/sha1/expect.beginning-of-file diff --git a/third_party/git/t/t4211/expect.end-of-file b/third_party/git/t/t4211/sha1/expect.end-of-file index bd25bb2f59..bd25bb2f59 100644 --- a/third_party/git/t/t4211/expect.end-of-file +++ b/third_party/git/t/t4211/sha1/expect.end-of-file diff --git a/third_party/git/t/t4211/expect.move-support-f b/third_party/git/t/t4211/sha1/expect.move-support-f index c905e01bc2..c905e01bc2 100644 --- a/third_party/git/t/t4211/expect.move-support-f +++ b/third_party/git/t/t4211/sha1/expect.move-support-f diff --git a/third_party/git/t/t4211/expect.multiple b/third_party/git/t/t4211/sha1/expect.multiple index 76ad5b598c..76ad5b598c 100644 --- a/third_party/git/t/t4211/expect.multiple +++ b/third_party/git/t/t4211/sha1/expect.multiple diff --git a/third_party/git/t/t4211/expect.multiple-overlapping b/third_party/git/t/t4211/sha1/expect.multiple-overlapping index d930b6eec4..d930b6eec4 100644 --- a/third_party/git/t/t4211/expect.multiple-overlapping +++ b/third_party/git/t/t4211/sha1/expect.multiple-overlapping diff --git a/third_party/git/t/t4211/expect.multiple-superset b/third_party/git/t/t4211/sha1/expect.multiple-superset index d930b6eec4..d930b6eec4 100644 --- a/third_party/git/t/t4211/expect.multiple-superset +++ b/third_party/git/t/t4211/sha1/expect.multiple-superset diff --git a/third_party/git/t/t4211/expect.parallel-change-f-to-main b/third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main index 052def8074..052def8074 100644 --- a/third_party/git/t/t4211/expect.parallel-change-f-to-main +++ b/third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main diff --git a/third_party/git/t/t4211/expect.simple-f b/third_party/git/t/t4211/sha1/expect.simple-f index a1f5bc49c8..a1f5bc49c8 100644 --- a/third_party/git/t/t4211/expect.simple-f +++ b/third_party/git/t/t4211/sha1/expect.simple-f diff --git a/third_party/git/t/t4211/expect.simple-f-to-main b/third_party/git/t/t4211/sha1/expect.simple-f-to-main index a475768710..a475768710 100644 --- a/third_party/git/t/t4211/expect.simple-f-to-main +++ b/third_party/git/t/t4211/sha1/expect.simple-f-to-main diff --git a/third_party/git/t/t4211/expect.simple-main b/third_party/git/t/t4211/sha1/expect.simple-main index 39ce39bebe..39ce39bebe 100644 --- a/third_party/git/t/t4211/expect.simple-main +++ b/third_party/git/t/t4211/sha1/expect.simple-main diff --git a/third_party/git/t/t4211/expect.simple-main-to-end b/third_party/git/t/t4211/sha1/expect.simple-main-to-end index 8480bd9cc4..8480bd9cc4 100644 --- a/third_party/git/t/t4211/expect.simple-main-to-end +++ b/third_party/git/t/t4211/sha1/expect.simple-main-to-end diff --git a/third_party/git/t/t4211/expect.two-ranges b/third_party/git/t/t4211/sha1/expect.two-ranges index 6109aa0dce..6109aa0dce 100644 --- a/third_party/git/t/t4211/expect.two-ranges +++ b/third_party/git/t/t4211/sha1/expect.two-ranges diff --git a/third_party/git/t/t4211/expect.vanishes-early b/third_party/git/t/t4211/sha1/expect.vanishes-early index 1f7cd06941..1f7cd06941 100644 --- a/third_party/git/t/t4211/expect.vanishes-early +++ b/third_party/git/t/t4211/sha1/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 new file mode 100644 index 0000000000..5adfdfc1a1 --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.beginning-of-file @@ -0,0 +1,43 @@ +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 new file mode 100644 index 0000000000..03ab5c1784 --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.end-of-file @@ -0,0 +1,62 @@ +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 new file mode 100644 index 0000000000..223b4ed2a0 --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.move-support-f @@ -0,0 +1,80 @@ +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 new file mode 100644 index 0000000000..ca00409b9a --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.multiple @@ -0,0 +1,104 @@ +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 new file mode 100644 index 0000000000..9015a45a25 --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.multiple-overlapping @@ -0,0 +1,187 @@ +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 new file mode 100644 index 0000000000..9015a45a25 --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.multiple-superset @@ -0,0 +1,187 @@ +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 new file mode 100644 index 0000000000..e68f8928ea --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.parallel-change-f-to-main @@ -0,0 +1,160 @@ +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 new file mode 100644 index 0000000000..65508d7c0b --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.simple-f @@ -0,0 +1,59 @@ +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 new file mode 100644 index 0000000000..77b721c196 --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.simple-f-to-main @@ -0,0 +1,100 @@ +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 new file mode 100644 index 0000000000..d20708c9f9 --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.simple-main @@ -0,0 +1,68 @@ +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 new file mode 100644 index 0000000000..617cdf3481 --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.simple-main-to-end @@ -0,0 +1,70 @@ +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 new file mode 100644 index 0000000000..af57c8b997 --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.two-ranges @@ -0,0 +1,102 @@ +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 new file mode 100644 index 0000000000..11ec9bdecf --- /dev/null +++ b/third_party/git/t/t4211/sha256/expect.vanishes-early @@ -0,0 +1,39 @@ +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 7f90f58c03..53a4af3244 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 expecte and actual output + # replace SP with a dot both in the expected 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 dab96c89aa..a080325098 100755 --- a/third_party/git/t/t4214-log-graph-octopus.sh +++ b/third_party/git/t/t4214-log-graph-octopus.sh @@ -3,82 +3,86 @@ 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' ' - cat >expect.uncolored <<-\EOF && + 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 * 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> *<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> *<MAGENTA>-<RESET><MAGENTA>.<RESET> octopus-merge + <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_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 + test_cmp_colored_graph left octopus-merge ' # 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' ' - cat >expect.uncolored <<-\EOF && + test_cmp_graph octopus-merge <<-\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' ' @@ -88,15 +92,256 @@ 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 && - 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_cmp_colored_graph octopus-merge ' + +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 new file mode 100755 index 0000000000..28d0779a8c --- /dev/null +++ b/third_party/git/t/t4215-log-skewed-merges.sh @@ -0,0 +1,373 @@ +#!/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/t4216-log-bloom.sh b/third_party/git/t/t4216-log-bloom.sh new file mode 100755 index 0000000000..d11040ce41 --- /dev/null +++ b/third_party/git/t/t4216-log-bloom.sh @@ -0,0 +1,405 @@ +#!/bin/sh + +test_description='git log for a path with Bloom filters' +. ./test-lib.sh + +GIT_TEST_COMMIT_GRAPH=0 +GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0 + +test_expect_success 'setup test - repo, commits, commit graph, log outputs' ' + git init && + mkdir A A/B A/B/C && + test_commit c1 A/file1 && + test_commit c2 A/B/file2 && + test_commit c3 A/B/C/file3 && + test_commit c4 A/file1 && + test_commit c5 A/B/file2 && + test_commit c6 A/B/C/file3 && + test_commit c7 A/file1 && + test_commit c8 A/B/file2 && + test_commit c9 A/B/C/file3 && + test_commit c10 file_to_be_deleted && + git checkout -b side HEAD~4 && + test_commit side-1 file4 && + git checkout master && + git merge side && + test_commit c11 file5 && + mv file5 file5_renamed && + git add file5_renamed && + git commit -m "rename" && + rm file_to_be_deleted && + git add . && + git commit -m "file removed" && + git commit --allow-empty -m "empty" && + git commit-graph write --reachable --changed-paths && + + test_oid_cache <<-EOF + oid_version sha1:1 + oid_version sha256:2 + EOF +' + +graph_read_expect () { + NUM_CHUNKS=5 + cat >expect <<- EOF + header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0 + num_commits: $1 + chunks: oid_fanout oid_lookup commit_metadata bloom_indexes bloom_data + EOF + test-tool read-graph >actual && + test_cmp expect actual +} + +test_expect_success 'commit-graph write wrote out the bloom chunks' ' + graph_read_expect 16 +' + +# Turn off any inherited trace2 settings for this test. +sane_unset GIT_TRACE2 GIT_TRACE2_PERF GIT_TRACE2_EVENT +sane_unset GIT_TRACE2_PERF_BRIEF +sane_unset GIT_TRACE2_CONFIG_PARAMS + +setup () { + rm -f "$TRASH_DIRECTORY/trace.perf" && + git -c core.commitGraph=false log --pretty="format:%s" $1 >log_wo_bloom && + GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.perf" git -c core.commitGraph=true log --pretty="format:%s" $1 >log_w_bloom +} + +test_bloom_filters_used () { + log_args=$1 + bloom_trace_prefix="statistics:{\"filter_not_present\":${2:-0},\"maybe\"" + setup "$log_args" && + grep -q "$bloom_trace_prefix" "$TRASH_DIRECTORY/trace.perf" && + test_cmp log_wo_bloom log_w_bloom && + test_path_is_file "$TRASH_DIRECTORY/trace.perf" +} + +test_bloom_filters_not_used () { + log_args=$1 + setup "$log_args" && + ! grep -q "statistics:{\"filter_not_present\":" "$TRASH_DIRECTORY/trace.perf" && + test_cmp log_wo_bloom log_w_bloom +} + +for path in A A/B A/B/C A/file1 A/B/file2 A/B/C/file3 file4 file5 file5_renamed file_to_be_deleted +do + for option in "" \ + "--all" \ + "--full-history" \ + "--full-history --simplify-merges" \ + "--simplify-merges" \ + "--simplify-by-decoration" \ + "--follow" \ + "--first-parent" \ + "--topo-order" \ + "--date-order" \ + "--author-date-order" \ + "--ancestry-path side..master" + do + test_expect_success "git log option: $option for path: $path" ' + test_bloom_filters_used "$option -- $path" && + test_config commitgraph.readChangedPaths false && + test_bloom_filters_not_used "$option -- $path" + ' + done +done + +test_expect_success 'git log -- folder works with and without the trailing slash' ' + test_bloom_filters_used "-- A" && + test_bloom_filters_used "-- A/" +' + +test_expect_success 'git log for path that does not exist. ' ' + test_bloom_filters_used "-- path_does_not_exist" +' + +test_expect_success 'git log with --walk-reflogs does not use Bloom filters' ' + test_bloom_filters_not_used "--walk-reflogs -- A" +' + +test_expect_success 'git log -- multiple path specs does not use Bloom filters' ' + test_bloom_filters_not_used "-- file4 A/file1" +' + +test_expect_success 'git log -- "." pathspec at root does not use Bloom filters' ' + test_bloom_filters_not_used "-- ." +' + +test_expect_success 'git log with wildcard that resolves to a single path uses Bloom filters' ' + test_bloom_filters_used "-- *4" && + test_bloom_filters_used "-- *renamed" +' + +test_expect_success 'git log with wildcard that resolves to a multiple paths does not uses Bloom filters' ' + test_bloom_filters_not_used "-- *" && + test_bloom_filters_not_used "-- file*" +' + +test_expect_success 'setup - add commit-graph to the chain without Bloom filters' ' + test_commit c14 A/anotherFile2 && + test_commit c15 A/B/anotherFile2 && + test_commit c16 A/B/C/anotherFile2 && + git commit-graph write --reachable --split --no-changed-paths && + test_line_count = 2 .git/objects/info/commit-graphs/commit-graph-chain +' + +test_expect_success 'use Bloom filters even if the latest graph does not have Bloom filters' ' + # Ensure that the number of empty filters is equal to the number of + # filters in the latest graph layer to prove that they are loaded (and + # ignored). + test_bloom_filters_used "-- A/B" 3 +' + +test_expect_success 'setup - add commit-graph to the chain with Bloom filters' ' + test_commit c17 A/anotherFile3 && + git commit-graph write --reachable --changed-paths --split && + test_line_count = 3 .git/objects/info/commit-graphs/commit-graph-chain +' + +test_bloom_filters_used_when_some_filters_are_missing () { + log_args=$1 + bloom_trace_prefix="statistics:{\"filter_not_present\":3,\"maybe\":6,\"definitely_not\":9" + setup "$log_args" && + grep -q "$bloom_trace_prefix" "$TRASH_DIRECTORY/trace.perf" && + test_cmp log_wo_bloom log_w_bloom +} + +test_expect_success 'Use Bloom filters if they exist in the latest but not all commit graphs in the chain.' ' + test_bloom_filters_used_when_some_filters_are_missing "-- A/B" +' + +test_expect_success 'persist filter settings' ' + test_when_finished rm -rf .git/objects/info/commit-graph* && + rm -rf .git/objects/info/commit-graph* && + GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \ + GIT_TRACE2_EVENT_NESTING=5 \ + GIT_TEST_BLOOM_SETTINGS_NUM_HASHES=9 \ + GIT_TEST_BLOOM_SETTINGS_BITS_PER_ENTRY=15 \ + git commit-graph write --reachable --changed-paths && + grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2.txt && + GIT_TRACE2_EVENT="$(pwd)/trace2-auto.txt" \ + GIT_TRACE2_EVENT_NESTING=5 \ + git commit-graph write --reachable --changed-paths && + grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2-auto.txt +' + +test_max_changed_paths () { + grep "\"max_changed_paths\":$1" $2 +} + +test_filter_not_computed () { + grep "\"key\":\"filter-not-computed\",\"value\":\"$1\"" $2 +} + +test_filter_computed () { + grep "\"key\":\"filter-computed\",\"value\":\"$1\"" $2 +} + +test_filter_trunc_empty () { + grep "\"key\":\"filter-trunc-empty\",\"value\":\"$1\"" $2 +} + +test_filter_trunc_large () { + grep "\"key\":\"filter-trunc-large\",\"value\":\"$1\"" $2 +} + +test_expect_success 'correctly report changes over limit' ' + git init limits && + ( + cd limits && + mkdir d && + mkdir d/e && + + for i in $(test_seq 1 2) + do + printf $i >d/file$i.txt && + printf $i >d/e/file$i.txt || return 1 + done && + + mkdir mode && + printf bash >mode/script.sh && + + mkdir foo && + touch foo/bar && + touch foo.txt && + + git add d foo foo.txt mode && + git commit -m "files" && + + # Commit has 7 file and 4 directory adds + GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=10 \ + GIT_TRACE2_EVENT="$(pwd)/trace" \ + git commit-graph write --reachable --changed-paths && + test_max_changed_paths 10 trace && + test_filter_computed 1 trace && + test_filter_trunc_large 1 trace && + + for path in $(git ls-tree -r --name-only HEAD) + do + git -c commitGraph.readChangedPaths=false log \ + -- $path >expect && + git log -- $path >actual && + test_cmp expect actual || return 1 + done && + + # Make a variety of path changes + printf new1 >d/e/file1.txt && + printf new2 >d/file2.txt && + rm d/e/file2.txt && + rm -r foo && + printf text >foo && + mkdir f && + printf new1 >f/file1.txt && + + # including a mode-only change (counts as modified) + git update-index --chmod=+x mode/script.sh && + + git add foo d f && + git commit -m "complicated" && + + # start from scratch and rebuild + rm -f .git/objects/info/commit-graph && + GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=10 \ + GIT_TRACE2_EVENT="$(pwd)/trace-edit" \ + git commit-graph write --reachable --changed-paths && + test_max_changed_paths 10 trace-edit && + test_filter_computed 2 trace-edit && + test_filter_trunc_large 2 trace-edit && + + for path in $(git ls-tree -r --name-only HEAD) + do + git -c commitGraph.readChangedPaths=false log \ + -- $path >expect && + git log -- $path >actual && + test_cmp expect actual || return 1 + done && + + # start from scratch and rebuild + rm -f .git/objects/info/commit-graph && + GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=11 \ + GIT_TRACE2_EVENT="$(pwd)/trace-update" \ + git commit-graph write --reachable --changed-paths && + test_max_changed_paths 11 trace-update && + test_filter_computed 2 trace-update && + test_filter_trunc_large 0 trace-update && + + for path in $(git ls-tree -r --name-only HEAD) + do + git -c commitGraph.readChangedPaths=false log \ + -- $path >expect && + git log -- $path >actual && + test_cmp expect actual || return 1 + done + ) +' + +test_expect_success 'correctly report commits with no changed paths' ' + git init empty && + test_when_finished "rm -fr empty" && + ( + cd empty && + + git commit --allow-empty -m "initial commit" && + + GIT_TRACE2_EVENT="$(pwd)/trace.event" \ + git commit-graph write --reachable --changed-paths && + test_filter_computed 1 trace.event && + test_filter_not_computed 0 trace.event && + test_filter_trunc_empty 1 trace.event && + test_filter_trunc_large 0 trace.event + ) +' + +test_expect_success 'Bloom generation is limited by --max-new-filters' ' + ( + cd limits && + test_commit c2 filter && + test_commit c3 filter && + test_commit c4 no-filter && + + rm -f trace.event && + GIT_TRACE2_EVENT="$(pwd)/trace.event" \ + git commit-graph write --reachable --split=replace \ + --changed-paths --max-new-filters=2 && + + test_filter_computed 2 trace.event && + test_filter_not_computed 3 trace.event && + test_filter_trunc_empty 0 trace.event && + test_filter_trunc_large 0 trace.event + ) +' + +test_expect_success 'Bloom generation backfills previously-skipped filters' ' + # Check specifying commitGraph.maxNewFilters over "git config" works. + test_config -C limits commitGraph.maxNewFilters 1 && + ( + cd limits && + + rm -f trace.event && + GIT_TRACE2_EVENT="$(pwd)/trace.event" \ + git commit-graph write --reachable --changed-paths \ + --split=replace && + test_filter_computed 1 trace.event && + test_filter_not_computed 4 trace.event && + test_filter_trunc_empty 0 trace.event && + test_filter_trunc_large 0 trace.event + ) +' + +test_expect_success '--max-new-filters overrides configuration' ' + git init override && + test_when_finished "rm -fr override" && + test_config -C override commitGraph.maxNewFilters 2 && + ( + cd override && + test_commit one && + test_commit two && + + rm -f trace.event && + GIT_TRACE2_EVENT="$(pwd)/trace.event" \ + git commit-graph write --reachable --changed-paths \ + --max-new-filters=1 && + test_filter_computed 1 trace.event && + test_filter_not_computed 1 trace.event && + test_filter_trunc_empty 0 trace.event && + test_filter_trunc_large 0 trace.event + ) +' + +test_expect_success 'Bloom generation backfills empty commits' ' + git init empty && + test_when_finished "rm -fr empty" && + ( + cd empty && + for i in $(test_seq 1 6) + do + git commit --allow-empty -m "$i" + done && + + # Generate Bloom filters for empty commits 1-6, two at a time. + for i in $(test_seq 1 3) + do + rm -f trace.event && + GIT_TRACE2_EVENT="$(pwd)/trace.event" \ + git commit-graph write --reachable \ + --changed-paths --max-new-filters=2 && + test_filter_computed 2 trace.event && + test_filter_not_computed 4 trace.event && + test_filter_trunc_empty 2 trace.event && + test_filter_trunc_large 0 trace.event + done && + + # Finally, make sure that once all commits have filters, that + # none are subsequently recomputed. + rm -f trace.event && + GIT_TRACE2_EVENT="$(pwd)/trace.event" \ + git commit-graph write --reachable \ + --changed-paths --max-new-filters=2 && + test_filter_computed 0 trace.event && + test_filter_not_computed 6 trace.event && + test_filter_trunc_empty 0 trace.event && + test_filter_trunc_large 0 trace.event + ) +' + +test_done diff --git a/third_party/git/t/t4254-am-corrupt.sh b/third_party/git/t/t4254-am-corrupt.sh index fd3bdbfe2c..daf01c309d 100755 --- a/third_party/git/t/t4254-am-corrupt.sh +++ b/third_party/git/t/t4254-am-corrupt.sh @@ -3,6 +3,37 @@ test_description='git am with corrupt input' . ./test-lib.sh +make_mbox_with_nul () { + space=' ' + q_nul_in_subject= + q_nul_in_body= + while test $# -ne 0 + do + case "$1" in + subject) q_nul_in_subject='=00' ;; + body) q_nul_in_body='=00' ;; + esac && + shift + done && + cat <<-EOF + From ec7364544f690c560304f5a5de9428ea3b978b26 Mon Sep 17 00:00:00 2001 + From: A U Thor <author@example.com> + Date: Sun, 19 Apr 2020 13:42:07 +0700 + Subject: [PATCH] =?ISO-8859-1?q?=C4=CB${q_nul_in_subject}=D1=CF=D6?= + MIME-Version: 1.0 + Content-Type: text/plain; charset=ISO-8859-1 + Content-Transfer-Encoding: quoted-printable + + abc${q_nul_in_body}def + --- + diff --git a/afile b/afile + new file mode 100644 + index 0000000000..e69de29bb2 + --$space + 2.26.1 + EOF +} + test_expect_success setup ' # Note the missing "+++" line: cat >bad-patch.diff <<-\EOF && @@ -25,13 +56,27 @@ test_expect_success setup ' # fatal: unable to write file '(null)' mode 100644: Bad address # Also, it had the unwanted side-effect of deleting f. test_expect_success 'try to apply corrupted patch' ' - test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual -' - -test_expect_success 'compare diagnostic; ensure file is still here' ' + test_when_finished "git am --abort" && + test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual && echo "error: git diff header lacks filename information (line 4)" >expected && test_path_is_file f && test_i18ncmp expected actual ' +test_expect_success "NUL in commit message's body" ' + test_when_finished "git am --abort" && + make_mbox_with_nul body >body.patch && + test_must_fail git am body.patch 2>err && + grep "a NUL byte in commit log message not allowed" err +' + +test_expect_success "NUL in commit message's header" " + test_when_finished 'git am --abort' && + make_mbox_with_nul subject >subject.patch && + test_must_fail git mailinfo msg patch <subject.patch 2>err && + grep \"a NUL byte in 'Subject' is not allowed\" err && + test_must_fail git am subject.patch 2>err && + grep \"a NUL byte in 'Subject' is not allowed\" err +" + test_done diff --git a/third_party/git/t/t4255-am-submodule.sh b/third_party/git/t/t4255-am-submodule.sh index 0ba8194403..a7ba08f728 100755 --- a/third_party/git/t/t4255-am-submodule.sh +++ b/third_party/git/t/t4255-am-submodule.sh @@ -6,17 +6,21 @@ test_description='git am handling submodules' . "$TEST_DIRECTORY"/lib-submodule-update.sh am () { - git format-patch --stdout --ignore-submodules=dirty "..$1" | git am - + git format-patch --stdout --ignore-submodules=dirty "..$1" >patch && + may_only_be_test_must_fail "$2" && + $2 git am patch } -test_submodule_switch "am" +test_submodule_switch_func "am" am_3way () { - git format-patch --stdout --ignore-submodules=dirty "..$1" | git am --3way - + git format-patch --stdout --ignore-submodules=dirty "..$1" >patch && + may_only_be_test_must_fail "$2" && + $2 git am --3way patch } KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 -test_submodule_switch "am_3way" +test_submodule_switch_func "am_3way" test_expect_success 'setup diff.submodule' ' test_commit one && diff --git a/third_party/git/t/t4256-am-format-flowed.sh b/third_party/git/t/t4256-am-format-flowed.sh index 6340310e9a..2369c4e17a 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" >stdout 2>stderr && + git am <"$TEST_DIRECTORY/t4256/1/patch" 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 d87cc7d9ef..e59601e5fe 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' ' - cat >expected <<\EXPECTED && + 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 && added in remote - their 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE + their 100644 $(git rev-parse HEAD:ONE) 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,10 +41,15 @@ test_expect_success 'file add A, B (same)' ' ' test_expect_success 'file add A, B (different)' ' - cat >expected <<\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 && + cat >expected <<EXPECTED && added in both - our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE - their 100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE + our 100644 $(git rev-parse add-a-b-diff-A:ONE) ONE + their 100644 $(git rev-parse add-a-b-diff-B:ONE) ONE @@ -1 +1,5 @@ +<<<<<<< .our AAA @@ -53,11 +58,6 @@ 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' ' - cat >expected <<\EXPECTED && + 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 && merged - result 100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file - our 100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file + result 100644 $(git rev-parse change-a-not-b:initial-file) initial-file + our 100644 $(git rev-parse initial:initial-file ) 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,11 +94,16 @@ test_expect_success 'file change A, B (same)' ' ' test_expect_success 'file change A, B (different)' ' - cat >expected <<\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 && + cat >expected <<EXPECTED && changed in both - base 100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file - our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d initial-file - their 100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file + 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 @@ -1 +1,5 @@ +<<<<<<< .our AAA @@ -107,34 +112,10 @@ 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 @@ -159,6 +140,26 @@ 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 ' @@ -173,20 +174,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 ' @@ -201,14 +202,6 @@ 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" && @@ -218,16 +211,18 @@ EXPECTED 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" && @@ -238,6 +233,11 @@ EXPECTED 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,10 +250,17 @@ test_expect_success 'tree add A, B (same)' ' ' test_expect_success 'tree add A, B (different)' ' - cat >expect <<-\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 && + cat >expect <<-EOF && added in both - our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file - their 100644 ba629238ca89489f2b350e196ca445e09d8bb834 sub/file + 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 @@ -1 +1,5 @@ +<<<<<<< .our AAA @@ -261,24 +268,10 @@ 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 && @@ -287,6 +280,13 @@ 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 43aa4fdec31eb92e1fdc2f0ce6ea9ddb7c32bcf7 initial-file/ONE + their 100644 $(git rev-parse turn-file-to-tree:initial-file/ONE) initial-file/ONE @@ -0,0 +1 @@ +CCC removed in remote - base 100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file - our 100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file + base 100644 $(git rev-parse initial:initial-file) initial-file + our 100644 $(git rev-parse initial:initial-file) 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 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path - our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path + base 100644 $(git rev-parse add-tree:dir/path) dir/path + our 100644 $(git rev-parse add-tree:dir/path) dir/path @@ -1 +0,0 @@ -AAA added in remote - their 100644 43aa4fdec31eb92e1fdc2f0ce6ea9ddb7c32bcf7 dir + their 100644 $(git rev-parse make-file:dir) dir @@ -0,0 +1 @@ +CCC EOF diff --git a/third_party/git/t/t5000-tar-tree.sh b/third_party/git/t/t5000-tar-tree.sh index 37655a237c..3ebb0d3b65 100755 --- a/third_party/git/t/t5000-tar-tree.sh +++ b/third_party/git/t/t5000-tar-tree.sh @@ -94,6 +94,16 @@ check_tar() { ' } +check_added() { + dir=$1 + path_in_fs=$2 + path_in_archive=$3 + + test_expect_success " validate extra file $path_in_archive" ' + diff -r $path_in_fs $dir/$path_in_archive + ' +} + test_expect_success 'setup' ' test_oid_cache <<-EOF obj sha1:19f9c8273ec45a8938e6999cb59b3ff66739902a @@ -164,6 +174,25 @@ test_expect_success 'git-archive --prefix=olde-' ' check_tar with_olde-prefix olde- +test_expect_success 'git archive --add-file' ' + echo untracked >untracked && + git archive --add-file=untracked HEAD >with_untracked.tar +' + +check_tar with_untracked +check_added with_untracked untracked untracked + +test_expect_success 'git archive --add-file twice' ' + echo untracked >untracked && + git archive --prefix=one/ --add-file=untracked \ + --prefix=two/ --add-file=untracked \ + --prefix= HEAD >with_untracked2.tar +' + +check_tar with_untracked2 +check_added with_untracked2 untracked one/untracked +check_added with_untracked2 untracked two/untracked + test_expect_success 'git archive on large files' ' test_config core.bigfilethreshold 1 && git archive HEAD >b3.tar && diff --git a/third_party/git/t/t5003-archive-zip.sh b/third_party/git/t/t5003-archive-zip.sh index 106eddbd85..1e6d18b140 100755 --- a/third_party/git/t/t5003-archive-zip.sh +++ b/third_party/git/t/t5003-archive-zip.sh @@ -7,12 +7,12 @@ test_description='git archive --format=zip test' SUBSTFORMAT=%H%n test_lazy_prereq UNZIP_SYMLINKS ' - ( - mkdir unzip-symlinks && - cd unzip-symlinks && - "$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip && - test -h symlink - ) + "$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip && + test -h symlink +' + +test_lazy_prereq UNZIP_CONVERT ' + "$GIT_UNZIP" -a "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip ' check_zip() { @@ -39,39 +39,49 @@ check_zip() { extracted=${dir_with_prefix}a original=a - test_expect_success UNZIP " extract ZIP archive with EOL conversion" ' + test_expect_success UNZIP_CONVERT " extract ZIP archive with EOL conversion" ' (mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile) ' - test_expect_success UNZIP " validate that text files are converted" " + test_expect_success UNZIP_CONVERT " validate that text files are converted" " test_cmp_bin $extracted/text.cr $extracted/text.crlf && test_cmp_bin $extracted/text.cr $extracted/text.lf " - test_expect_success UNZIP " validate that binary files are unchanged" " + test_expect_success UNZIP_CONVERT " validate that binary files are unchanged" " test_cmp_bin $original/binary.cr $extracted/binary.cr && test_cmp_bin $original/binary.crlf $extracted/binary.crlf && test_cmp_bin $original/binary.lf $extracted/binary.lf " - test_expect_success UNZIP " validate that diff files are converted" " + test_expect_success UNZIP_CONVERT " validate that diff files are converted" " test_cmp_bin $extracted/diff.cr $extracted/diff.crlf && test_cmp_bin $extracted/diff.cr $extracted/diff.lf " - test_expect_success UNZIP " validate that -diff files are unchanged" " + test_expect_success UNZIP_CONVERT " validate that -diff files are unchanged" " test_cmp_bin $original/nodiff.cr $extracted/nodiff.cr && test_cmp_bin $original/nodiff.crlf $extracted/nodiff.crlf && test_cmp_bin $original/nodiff.lf $extracted/nodiff.lf " - test_expect_success UNZIP " validate that custom diff is unchanged " " + test_expect_success UNZIP_CONVERT " validate that custom diff is unchanged " " test_cmp_bin $original/custom.cr $extracted/custom.cr && test_cmp_bin $original/custom.crlf $extracted/custom.crlf && test_cmp_bin $original/custom.lf $extracted/custom.lf " } +check_added() { + dir=$1 + path_in_fs=$2 + path_in_archive=$3 + + test_expect_success UNZIP " validate extra file $path_in_archive" ' + diff -r $path_in_fs $dir/$path_in_archive + ' +} + test_expect_success \ 'populate workdir' \ 'mkdir a && @@ -188,4 +198,22 @@ test_expect_success 'git archive --format=zip on large files' ' check_zip large-compressed +test_expect_success 'git archive --format=zip --add-file' ' + echo untracked >untracked && + git archive --format=zip --add-file=untracked HEAD >with_untracked.zip +' + +check_zip with_untracked +check_added with_untracked untracked untracked + +test_expect_success 'git archive --format=zip --add-file twice' ' + echo untracked >untracked && + git archive --format=zip --prefix=one/ --add-file=untracked \ + --prefix=two/ --add-file=untracked \ + --prefix= HEAD >with_untracked2.zip +' +check_zip with_untracked2 +check_added with_untracked2 untracked one/untracked +check_added with_untracked2 untracked two/untracked + test_done diff --git a/third_party/git/t/t5004-archive-corner-cases.sh b/third_party/git/t/t5004-archive-corner-cases.sh index 271eb5a1fd..3e7b23cb32 100755 --- a/third_party/git/t/t5004-archive-corner-cases.sh +++ b/third_party/git/t/t5004-archive-corner-cases.sh @@ -204,4 +204,23 @@ 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 9690dcad4f..147e616533 100755 --- a/third_party/git/t/t5100-mailinfo.sh +++ b/third_party/git/t/t5100-mailinfo.sh @@ -213,4 +213,19 @@ 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 852dcd913f..c1811ea0f4 100755 --- a/third_party/git/t/t5150-request-pull.sh +++ b/third_party/git/t/t5150-request-pull.sh @@ -4,6 +4,12 @@ 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 && @@ -144,7 +150,6 @@ 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 && @@ -173,7 +178,6 @@ 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/t5300-pack-object.sh b/third_party/git/t/t5300-pack-object.sh index 410a09b0dd..392201cabd 100755 --- a/third_party/git/t/t5300-pack-object.sh +++ b/third_party/git/t/t5300-pack-object.sh @@ -412,18 +412,18 @@ test_expect_success 'set up pack for non-repo tests' ' ' test_expect_success 'index-pack --stdin complains of non-repo' ' - nongit test_must_fail git index-pack --stdin <foo.pack && + nongit test_must_fail git index-pack --object-format=$(test_oid algo) --stdin <foo.pack && test_path_is_missing non-repo/.git ' test_expect_success 'index-pack <pack> works in non-repo' ' - nongit git index-pack ../foo.pack && + nongit git index-pack --object-format=$(test_oid algo) ../foo.pack && test_path_is_file foo.idx ' test_expect_success 'index-pack --strict <pack> works in non-repo' ' rm -f foo.idx && - nongit git index-pack --strict ../foo.pack && + nongit git index-pack --strict --object-format=$(test_oid algo) ../foo.pack && test_path_is_file foo.idx ' @@ -496,4 +496,40 @@ test_expect_success 'make sure index-pack detects the SHA1 collision (large blob ) ' +test_expect_success 'prefetch objects' ' + rm -rf server client && + + git init server && + test_config -C server uploadpack.allowanysha1inwant 1 && + test_config -C server uploadpack.allowfilter 1 && + test_config -C server protocol.version 2 && + + echo one >server/one && + git -C server add one && + git -C server commit -m one && + git -C server branch one_branch && + + echo two_a >server/two_a && + echo two_b >server/two_b && + git -C server add two_a two_b && + git -C server commit -m two && + + echo three >server/three && + git -C server add three && + git -C server commit -m three && + git -C server branch three_branch && + + # Clone, fetch "two" with blobs excluded, and re-push it. This requires + # the client to have the blobs of "two" - verify that these are + # prefetched in one batch. + git clone --filter=blob:none --single-branch -b one_branch \ + "file://$(pwd)/server" client && + test_config -C client protocol.version 2 && + TWO=$(git -C server rev-parse three_branch^) && + git -C client fetch --filter=blob:none origin "$TWO" && + GIT_TRACE_PACKET=$(pwd)/trace git -C client push origin "$TWO":refs/heads/two_branch && + grep "fetch> done" trace >donelines && + test_line_count = 1 donelines +' + test_done diff --git a/third_party/git/t/t5302-pack-index.sh b/third_party/git/t/t5302-pack-index.sh index 91d51b35f9..7c9d687367 100755 --- a/third_party/git/t/t5302-pack-index.sh +++ b/third_party/git/t/t5302-pack-index.sh @@ -6,64 +6,65 @@ test_description='pack index with 64-bit offsets and object CRC' . ./test-lib.sh -test_expect_success \ - 'setup' \ - 'rm -rf .git && - git init && - git config pack.threads 1 && - i=1 && - while test $i -le 100 - do - iii=$(printf '%03i' $i) - test-tool genrandom "bar" 200 > wide_delta_$iii && - test-tool genrandom "baz $iii" 50 >> wide_delta_$iii && - test-tool genrandom "foo"$i 100 > deep_delta_$iii && - test-tool genrandom "foo"$(expr $i + 1) 100 >> deep_delta_$iii && - test-tool genrandom "foo"$(expr $i + 2) 100 >> deep_delta_$iii && - echo $iii >file_$iii && - test-tool genrandom "$iii" 8192 >>file_$iii && - git update-index --add file_$iii deep_delta_$iii wide_delta_$iii && - i=$(expr $i + 1) || return 1 - done && - { echo 101 && test-tool genrandom 100 8192; } >file_101 && - git update-index --add file_101 && - tree=$(git write-tree) && - commit=$(git commit-tree $tree </dev/null) && { - echo $tree && - git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/" - } >obj-list && - git update-ref HEAD $commit' +test_expect_success 'setup' ' + rawsz=$(test_oid rawsz) && + rm -rf .git && + git init && + git config pack.threads 1 && + i=1 && + while test $i -le 100 + do + iii=$(printf "%03i" $i) + test-tool genrandom "bar" 200 > wide_delta_$iii && + test-tool genrandom "baz $iii" 50 >> wide_delta_$iii && + test-tool genrandom "foo"$i 100 > deep_delta_$iii && + test-tool genrandom "foo"$(expr $i + 1) 100 >> deep_delta_$iii && + test-tool genrandom "foo"$(expr $i + 2) 100 >> deep_delta_$iii && + echo $iii >file_$iii && + test-tool genrandom "$iii" 8192 >>file_$iii && + git update-index --add file_$iii deep_delta_$iii wide_delta_$iii && + i=$(expr $i + 1) || return 1 + done && + { echo 101 && test-tool genrandom 100 8192; } >file_101 && + git update-index --add file_101 && + tree=$(git write-tree) && + commit=$(git commit-tree $tree </dev/null) && { + echo $tree && + git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/" + } >obj-list && + git update-ref HEAD $commit +' -test_expect_success \ - 'pack-objects with index version 1' \ - 'pack1=$(git pack-objects --index-version=1 test-1 <obj-list) && - git verify-pack -v "test-1-${pack1}.pack"' +test_expect_success 'pack-objects with index version 1' ' + pack1=$(git pack-objects --index-version=1 test-1 <obj-list) && + git verify-pack -v "test-1-${pack1}.pack" +' -test_expect_success \ - 'pack-objects with index version 2' \ - 'pack2=$(git pack-objects --index-version=2 test-2 <obj-list) && - git verify-pack -v "test-2-${pack2}.pack"' +test_expect_success 'pack-objects with index version 2' ' + pack2=$(git pack-objects --index-version=2 test-2 <obj-list) && + git verify-pack -v "test-2-${pack2}.pack" +' -test_expect_success \ - 'both packs should be identical' \ - 'cmp "test-1-${pack1}.pack" "test-2-${pack2}.pack"' +test_expect_success 'both packs should be identical' ' + cmp "test-1-${pack1}.pack" "test-2-${pack2}.pack" +' -test_expect_success \ - 'index v1 and index v2 should be different' \ - '! cmp "test-1-${pack1}.idx" "test-2-${pack2}.idx"' +test_expect_success 'index v1 and index v2 should be different' ' + ! cmp "test-1-${pack1}.idx" "test-2-${pack2}.idx" +' -test_expect_success \ - 'index-pack with index version 1' \ - 'git index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack"' +test_expect_success 'index-pack with index version 1' ' + git index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack" +' -test_expect_success \ - 'index-pack with index version 2' \ - 'git index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack"' +test_expect_success 'index-pack with index version 2' ' + git index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack" +' -test_expect_success \ - 'index-pack results should match pack-objects ones' \ - 'cmp "test-1-${pack1}.idx" "1.idx" && - cmp "test-2-${pack2}.idx" "2.idx"' +test_expect_success 'index-pack results should match pack-objects ones' ' + cmp "test-1-${pack1}.idx" "1.idx" && + cmp "test-2-${pack2}.idx" "2.idx" +' test_expect_success 'index-pack --verify on index version 1' ' git index-pack --verify "test-1-${pack1}.pack" @@ -73,13 +74,13 @@ test_expect_success 'index-pack --verify on index version 2' ' git index-pack --verify "test-2-${pack2}.pack" ' -test_expect_success \ - 'pack-objects --index-version=2, is not accepted' \ - 'test_must_fail git pack-objects --index-version=2, test-3 <obj-list' +test_expect_success 'pack-objects --index-version=2, is not accepted' ' + test_must_fail git pack-objects --index-version=2, test-3 <obj-list +' -test_expect_success \ - 'index v2: force some 64-bit offsets with pack-objects' \ - 'pack3=$(git pack-objects --index-version=2,0x40000 test-3 <obj-list)' +test_expect_success 'index v2: force some 64-bit offsets with pack-objects' ' + pack3=$(git pack-objects --index-version=2,0x40000 test-3 <obj-list) +' if msg=$(git verify-pack -v "test-3-${pack3}.pack" 2>&1) || ! (echo "$msg" | grep "pack too large .* off_t") @@ -89,21 +90,21 @@ else say "# skipping tests concerning 64-bit offsets" fi -test_expect_success OFF64_T \ - 'index v2: verify a pack with some 64-bit offsets' \ - 'git verify-pack -v "test-3-${pack3}.pack"' +test_expect_success OFF64_T 'index v2: verify a pack with some 64-bit offsets' ' + git verify-pack -v "test-3-${pack3}.pack" +' -test_expect_success OFF64_T \ - '64-bit offsets: should be different from previous index v2 results' \ - '! cmp "test-2-${pack2}.idx" "test-3-${pack3}.idx"' +test_expect_success OFF64_T '64-bit offsets: should be different from previous index v2 results' ' + ! cmp "test-2-${pack2}.idx" "test-3-${pack3}.idx" +' -test_expect_success OFF64_T \ - 'index v2: force some 64-bit offsets with index-pack' \ - 'git index-pack --index-version=2,0x40000 -o 3.idx "test-1-${pack1}.pack"' +test_expect_success OFF64_T 'index v2: force some 64-bit offsets with index-pack' ' + git index-pack --index-version=2,0x40000 -o 3.idx "test-1-${pack1}.pack" +' -test_expect_success OFF64_T \ - '64-bit offsets: index-pack result should match pack-objects one' \ - 'cmp "test-3-${pack3}.idx" "3.idx"' +test_expect_success OFF64_T '64-bit offsets: index-pack result should match pack-objects one' ' + cmp "test-3-${pack3}.idx" "3.idx" +' test_expect_success OFF64_T 'index-pack --verify on 64-bit offset v2 (cheat)' ' # This cheats by knowing which lower offset should still be encoded @@ -118,134 +119,143 @@ test_expect_success OFF64_T 'index-pack --verify on 64-bit offset v2' ' # returns the object number for given object in given pack index index_obj_nr() { - idx_file=$1 - object_sha1=$2 - nr=0 - git show-index < $idx_file | - while read offs sha1 extra - do - nr=$(($nr + 1)) - test "$sha1" = "$object_sha1" || continue - echo "$(($nr - 1))" - break - done + idx_file=$1 + object_sha1=$2 + nr=0 + git show-index < $idx_file | + while read offs sha1 extra + do + nr=$(($nr + 1)) + test "$sha1" = "$object_sha1" || continue + echo "$(($nr - 1))" + break + done } # returns the pack offset for given object as found in given pack index index_obj_offset() { - idx_file=$1 - object_sha1=$2 - git show-index < $idx_file | grep $object_sha1 | - ( read offs extra && echo "$offs" ) + idx_file=$1 + object_sha1=$2 + git show-index < $idx_file | grep $object_sha1 | + ( read offs extra && echo "$offs" ) } -test_expect_success \ - '[index v1] 1) stream pack to repository' \ - 'git index-pack --index-version=1 --stdin < "test-1-${pack1}.pack" && - git prune-packed && - git count-objects | ( read nr rest && test "$nr" -eq 1 ) && - cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" && - cmp "test-1-${pack1}.idx" ".git/objects/pack/pack-${pack1}.idx"' +test_expect_success '[index v1] 1) stream pack to repository' ' + git index-pack --index-version=1 --stdin < "test-1-${pack1}.pack" && + git prune-packed && + git count-objects | ( read nr rest && test "$nr" -eq 1 ) && + cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" && + cmp "test-1-${pack1}.idx" ".git/objects/pack/pack-${pack1}.idx" +' test_expect_success \ - '[index v1] 2) create a stealth corruption in a delta base reference' \ - '# This test assumes file_101 is a delta smaller than 16 bytes. - # It should be against file_100 but we substitute its base for file_099 - sha1_101=$(git hash-object file_101) && - sha1_099=$(git hash-object file_099) && - 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" && - 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 * 24)) \ - bs=1 count=20 conv=notrunc && - git cat-file blob $sha1_101 > file_101_foo1' + '[index v1] 2) create a stealth corruption in a delta base reference' ' + # This test assumes file_101 is a delta smaller than 16 bytes. + # It should be against file_100 but we substitute its base for file_099 + sha1_101=$(git hash-object file_101) && + sha1_099=$(git hash-object file_099) && + 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 && + git cat-file blob $sha1_101 > file_101_foo1 +' test_expect_success \ - '[index v1] 3) corrupted delta happily returned wrong data' \ - 'test -f file_101_foo1 && ! cmp file_101 file_101_foo1' + '[index v1] 3) corrupted delta happily returned wrong data' ' + test -f file_101_foo1 && ! cmp file_101 file_101_foo1 +' test_expect_success \ - '[index v1] 4) confirm that the pack is actually corrupted' \ - 'test_must_fail git fsck --full $commit' + '[index v1] 4) confirm that the pack is actually corrupted' ' + test_must_fail git fsck --full $commit +' test_expect_success \ - '[index v1] 5) pack-objects happily reuses corrupted data' \ - 'pack4=$(git pack-objects test-4 <obj-list) && - test -f "test-4-${pack4}.pack"' + '[index v1] 5) pack-objects happily reuses corrupted data' ' + pack4=$(git pack-objects test-4 <obj-list) && + test -f "test-4-${pack4}.pack" +' -test_expect_success \ - '[index v1] 6) newly created pack is BAD !' \ - 'test_must_fail git verify-pack -v "test-4-${pack4}.pack"' +test_expect_success '[index v1] 6) newly created pack is BAD !' ' + test_must_fail git verify-pack -v "test-4-${pack4}.pack" +' -test_expect_success \ - '[index v2] 1) stream pack to repository' \ - 'rm -f .git/objects/pack/* && - git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" && - git prune-packed && - git count-objects | ( read nr rest && test "$nr" -eq 1 ) && - cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" && - cmp "test-2-${pack1}.idx" ".git/objects/pack/pack-${pack1}.idx"' +test_expect_success '[index v2] 1) stream pack to repository' ' + rm -f .git/objects/pack/* && + git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" && + git prune-packed && + git count-objects | ( read nr rest && test "$nr" -eq 1 ) && + cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" && + cmp "test-2-${pack1}.idx" ".git/objects/pack/pack-${pack1}.idx" +' test_expect_success \ - '[index v2] 2) create a stealth corruption in a delta base reference' \ - '# This test assumes file_101 is a delta smaller than 16 bytes. - # It should be against file_100 but we substitute its base for file_099 - sha1_101=$(git hash-object file_101) && - sha1_099=$(git hash-object file_099) && - 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" && - 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 * 20)) \ - bs=1 count=20 conv=notrunc && - git cat-file blob $sha1_101 > file_101_foo2' + '[index v2] 2) create a stealth corruption in a delta base reference' ' + # This test assumes file_101 is a delta smaller than 16 bytes. + # It should be against file_100 but we substitute its base for file_099 + sha1_101=$(git hash-object file_101) && + sha1_099=$(git hash-object file_099) && + 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" && + 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 && + git cat-file blob $sha1_101 > file_101_foo2 +' test_expect_success \ - '[index v2] 3) corrupted delta happily returned wrong data' \ - 'test -f file_101_foo2 && ! cmp file_101 file_101_foo2' + '[index v2] 3) corrupted delta happily returned wrong data' ' + test -f file_101_foo2 && ! cmp file_101 file_101_foo2 +' test_expect_success \ - '[index v2] 4) confirm that the pack is actually corrupted' \ - 'test_must_fail git fsck --full $commit' + '[index v2] 4) confirm that the pack is actually corrupted' ' + test_must_fail git fsck --full $commit +' test_expect_success \ - '[index v2] 5) pack-objects refuses to reuse corrupted data' \ - 'test_must_fail git pack-objects test-5 <obj-list && - test_must_fail git pack-objects --no-reuse-object test-6 <obj-list' + '[index v2] 5) pack-objects refuses to reuse corrupted data' ' + test_must_fail git pack-objects test-5 <obj-list && + test_must_fail git pack-objects --no-reuse-object test-6 <obj-list +' test_expect_success \ - '[index v2] 6) verify-pack detects CRC mismatch' \ - 'rm -f .git/objects/pack/* && - git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" && - git verify-pack ".git/objects/pack/pack-${pack1}.pack" && - obj=$(git hash-object file_001) && - 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) * 20 + $nr * 4)) && - ( while read obj - do git cat-file -p $obj >/dev/null || exit 1 - done <obj-list ) && - test_must_fail git verify-pack ".git/objects/pack/pack-${pack1}.pack" + '[index v2] 6) verify-pack detects CRC mismatch' ' + rm -f .git/objects/pack/* && + git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" && + git verify-pack ".git/objects/pack/pack-${pack1}.pack" && + obj=$(git hash-object file_001) && + 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)) && + ( while read obj + do git cat-file -p $obj >/dev/null || exit 1 + done <obj-list ) && + test_must_fail git verify-pack ".git/objects/pack/pack-${pack1}.pack" ' test_expect_success 'running index-pack in the object store' ' - rm -f .git/objects/pack/* && - cp test-1-${pack1}.pack .git/objects/pack/pack-${pack1}.pack && - ( - cd .git/objects/pack && - git index-pack pack-${pack1}.pack - ) && - test -f .git/objects/pack/pack-${pack1}.idx + rm -f .git/objects/pack/* && + cp test-1-${pack1}.pack .git/objects/pack/pack-${pack1}.pack && + ( + cd .git/objects/pack && + git index-pack pack-${pack1}.pack + ) && + test -f .git/objects/pack/pack-${pack1}.idx ' test_expect_success 'index-pack --strict warns upon missing tagger in tag' ' - sha=$(git rev-parse HEAD) && - cat >wrong-tag <<EOF && + sha=$(git rev-parse HEAD) && + cat >wrong-tag <<EOF && object $sha type commit tag guten tag @@ -253,18 +263,25 @@ tag guten tag This is an invalid tag. EOF - tag=$(git hash-object -t tag -w --stdin <wrong-tag) && - pack1=$(echo $tag $sha | git pack-objects tag-test) && - echo remove tag object && - thirtyeight=${tag#??} && - rm -f .git/objects/${tag%$thirtyeight}/$thirtyeight && - git index-pack --strict tag-test-${pack1}.pack 2>err && - grep "^warning:.* expected .tagger. line" err + tag=$(git hash-object -t tag -w --stdin <wrong-tag) && + pack1=$(echo $tag $sha | git pack-objects tag-test) && + echo remove tag object && + thirtyeight=${tag#??} && + rm -f .git/objects/${tag%$thirtyeight}/$thirtyeight && + git index-pack --strict tag-test-${pack1}.pack 2>err && + grep "^warning:.* expected .tagger. line" err ' test_expect_success 'index-pack --fsck-objects also warns upon missing tagger in tag' ' - git index-pack --fsck-objects tag-test-${pack1}.pack 2>err && - grep "^warning:.* expected .tagger. line" err + git index-pack --fsck-objects tag-test-${pack1}.pack 2>err && + grep "^warning:.* expected .tagger. line" err +' + +test_expect_success 'index-pack -v --stdin produces progress for both phases' ' + pack=$(git pack-objects --all pack </dev/null) && + GIT_PROGRESS_DELAY=0 git index-pack -v --stdin <pack-$pack.pack 2>err && + test_i18ngrep "Receiving objects" err && + test_i18ngrep "Resolving deltas" err ' test_done diff --git a/third_party/git/t/t5307-pack-missing-commit.sh b/third_party/git/t/t5307-pack-missing-commit.sh index dacb440b27..f4338abb78 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 rev-list HEAD + test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list HEAD ' test_expect_success 'rev-list notices corruption (2)' ' - test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list --objects HEAD + test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --objects HEAD ' test_expect_success 'pack-objects notices corruption' ' diff --git a/third_party/git/t/t5308-pack-detect-duplicates.sh b/third_party/git/t/t5308-pack-detect-duplicates.sh index 6845c1f3c3..693b2411c8 100755 --- a/third_party/git/t/t5308-pack-detect-duplicates.sh +++ b/third_party/git/t/t5308-pack-detect-duplicates.sh @@ -4,23 +4,27 @@ test_description='handling of duplicate objects in incoming 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 +test_expect_success 'setup' ' + test_oid_cache <<-EOF + lo_oid sha1:e68fe8129b546b101aee9510c5328e7f21ca1d18 + lo_oid sha256:471819e8c52bf11513f100b2810a8aa0622d5cd3d1c913758a071dd4b3bad8fe + + missing_oid sha1:e69d000000000000000000000000000000000000 + missing_oid sha256:4720000000000000000000000000000000000000000000000000000000000000 + EOF +' # The sha1s we have in our pack. It's important that these have the same # starting byte, so that they end up in the same fanout section of the index. # That lets us make sure we are exercising the binary search with both sets. -LO_SHA1=e68fe8129b546b101aee9510c5328e7f21ca1d18 -HI_SHA1=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 +LO_SHA1=$(test_oid lo_oid) +HI_SHA1=$EMPTY_BLOB # And here's a "missing sha1" which will produce failed lookups. It must also # be in the same fanout section, and should be between the two (so that during # our binary search, we are sure to end up looking at one or the other of the # duplicate runs). -MISSING_SHA1='e69d000000000000000000000000000000000000' +MISSING_SHA1=$(test_oid missing_oid) # git will never intentionally create packfiles with # duplicate objects, so we have to construct them by hand. diff --git a/third_party/git/t/t5309-pack-delta-cycles.sh b/third_party/git/t/t5309-pack-delta-cycles.sh index 491556dad9..55b787630f 100755 --- a/third_party/git/t/t5309-pack-delta-cycles.sh +++ b/third_party/git/t/t5309-pack-delta-cycles.sh @@ -4,15 +4,9 @@ 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=01d7713666f4de822776c7622c10f1b07de280dc -B=e68fe8129b546b101aee9510c5328e7f21ca1d18 +A=$(test_oid packlib_7_0) +B=$(test_oid packlib_7_76) # double-check our hand-constucted packs test_expect_success 'index-pack works with a single delta (A->B)' ' @@ -62,13 +56,13 @@ test_expect_success 'index-pack detects REF_DELTA cycles' ' test_must_fail git index-pack --fix-thin --stdin <cycle.pack ' -test_expect_failure 'failover to an object in another pack' ' +test_expect_success 'failover to an object in another pack' ' clear_packs && git index-pack --stdin <ab.pack && - git index-pack --stdin --fix-thin <cycle.pack + test_must_fail git index-pack --stdin --fix-thin <cycle.pack ' -test_expect_failure 'failover to a duplicate object in the same pack' ' +test_expect_success 'failover to a duplicate object in the same pack' ' clear_packs && { pack_header 3 && @@ -77,7 +71,7 @@ test_expect_failure 'failover to a duplicate object in the same pack' ' pack_obj $A } >recoverable.pack && pack_trailer recoverable.pack && - git index-pack --fix-thin --stdin <recoverable.pack + test_must_fail 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 6640329ebf..8318781d2b 100755 --- a/third_party/git/t/t5310-pack-bitmaps.sh +++ b/third_party/git/t/t5310-pack-bitmaps.sh @@ -74,16 +74,24 @@ rev_list_tests() { test_cmp expect actual ' - test_expect_success "enumerate --objects ($state)" ' - 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_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 + ' + test_expect_success "bitmap --objects handles non-commit objects ($state)" ' git rev-list --objects --use-bitmap-index HEAD tagged-blob >actual && grep $blob actual @@ -99,6 +107,20 @@ 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 f1708d415e..535313e4dc 100755 --- a/third_party/git/t/t5313-pack-bounds-checks.sh +++ b/third_party/git/t/t5313-pack-bounds-checks.sh @@ -38,16 +38,26 @@ munge () { # for the initial, and another ofs(4*nr) past that for the extended. # ofs_table () { - echo $((4 + 4 + 4*256 + 20*$1 + 4*$1)) + echo $((4 + 4 + 4*256 + $(test_oid rawsz)*$1 + 4*$1)) } extended_table () { echo $(($(ofs_table "$1") + 4*$1)) } +test_expect_success 'setup' ' + 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 74 >file && + echo $(test_oid oidfff) >file && git add file && git commit -m base && git repack -ad && @@ -140,10 +150,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-sha1 order. The sha1 of 1485 starts + # the second entry in sorted-hash order. The hash of this object starts # with "000", which sorts before that of $object (which starts # with "fff"). - second=$(echo 1485 | git hash-object -w --stdin) && + second=$(test_oid oid000 | 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 e525466de0..0aec8619e2 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 the tree $1 and blob $1:file, with +# Create a pack containing 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 2d2f5d0229..dc0446574b 100755 --- a/third_party/git/t/t5317-pack-objects-filter-objects.sh +++ b/third_party/git/t/t5317-pack-objects-filter-objects.sh @@ -45,12 +45,7 @@ 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 | - awk -f print_1.awk | - sort >observed && - - nr=$(wc -l <observed) && - test 0 -eq $nr + ! grep blob verify_result ' test_expect_success 'verify normal and blob:none packfiles have same commits/trees' ' @@ -72,7 +67,8 @@ 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" && - del=$(git -C r5 rev-parse HEAD^{tree} | sed "s|..|&/|") && + git -C r5 rev-parse HEAD^{tree} >tree && + del=$(sed "s|..|&/|" tree) && rm r5/.git/objects/$del && test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF && HEAD @@ -148,12 +144,7 @@ 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 | - awk -f print_1.awk | - sort >observed && - - nr=$(wc -l <observed) && - test 0 -eq $nr + ! grep blob verify_result ' test_expect_success 'verify blob:limit=1000' ' @@ -163,12 +154,7 @@ 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 | - awk -f print_1.awk | - sort >observed && - - nr=$(wc -l <observed) && - test 0 -eq $nr + ! grep blob verify_result ' test_expect_success 'verify blob:limit=1001' ' @@ -230,10 +216,9 @@ test_expect_success 'verify explicitly specifying oversized blob in input' ' awk -f print_2.awk ls_files_result | sort >expected && - git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF && - HEAD - $(git -C r2 rev-parse HEAD:large.10000) - EOF + 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 index-pack ../filter.pack && git -C r2 verify-pack -v ../filter.pack >verify_result && @@ -377,7 +362,8 @@ test_expect_success 'verify sparse:oid=OID' ' awk -f print_2.awk ls_files_result | sort >expected && - oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) && + git -C r4 ls-files -s pattern >staged && + oid=$(awk -f print_2.awk staged) && 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 22cb9d6643..2ed0c1544d 100755 --- a/third_party/git/t/t5318-commit-graph.sh +++ b/third_party/git/t/t5318-commit-graph.sh @@ -3,13 +3,23 @@ test_description='commit graph' . ./test-lib.sh +GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0 + test_expect_success 'setup full repo' ' mkdir full && cd "$TRASH_DIRECTORY/full" && git init && git config core.commitGraph true && objdir=".git/objects" && - test_oid_init + + test_oid_cache <<-EOF + oid_version sha1:1 + oid_version sha256:2 + EOF +' + +test_expect_success POSIXPERM 'tweak umask for modebit tests' ' + umask 022 ' test_expect_success 'verify graph with no graph file' ' @@ -19,15 +29,14 @@ 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 . && - test_path_is_missing info/commit-graph + git commit-graph write --object-dir $objdir && + test_path_is_missing $objdir/info/commit-graph ' -test_expect_success 'close with correct error on bad input' ' +test_expect_success 'exit with correct error on bad input to --stdin-packs' ' cd "$TRASH_DIRECTORY/full" && echo doesnotexist >in && - { git commit-graph write --stdin-packs <in 2>stderr; ret=$?; } && - test "$ret" = 1 && + test_expect_code 1 git commit-graph write --stdin-packs <in 2>stderr && test_i18ngrep "error adding pack" stderr ' @@ -73,14 +82,30 @@ graph_read_expect() { NUM_CHUNKS=$((3 + $(echo "$2" | wc -w))) fi cat >expect <<- EOF - header: 43475048 1 1 $NUM_CHUNKS 0 + header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0 num_commits: $1 chunks: oid_fanout oid_lookup commit_metadata$OPTIONAL EOF - git commit-graph read >output && + test-tool read-graph >output && test_cmp expect output } +test_expect_success 'exit with correct error on bad input to --stdin-commits' ' + cd "$TRASH_DIRECTORY/full" && + # invalid, non-hex OID + echo HEAD >in && + test_expect_code 1 git commit-graph write --stdin-commits <in 2>stderr && + test_i18ngrep "unexpected non-hex object ID: HEAD" stderr && + # non-existent OID + echo $ZERO_OID >in && + test_expect_code 1 git commit-graph write --stdin-commits <in 2>stderr && + test_i18ngrep "invalid object" stderr && + # valid commit and tree OID + git rev-parse HEAD HEAD^{tree} >in && + git commit-graph write --stdin-commits <in && + graph_read_expect 3 +' + test_expect_success 'write graph' ' cd "$TRASH_DIRECTORY/full" && git commit-graph write && @@ -88,6 +113,13 @@ test_expect_success 'write graph' ' graph_read_expect "3" ' +test_expect_success POSIXPERM 'write graph has correct permissions' ' + test_path_is_file $objdir/info/commit-graph && + echo "-r--r--r--" >expect && + test_modebits $objdir/info/commit-graph >actual && + test_cmp expect actual +' + graph_git_behavior 'graph exists' full commits/3 commits/1 test_expect_success 'Add more commits' ' @@ -116,6 +148,63 @@ 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_must_be_empty 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_must_be_empty err +' + +test_expect_success 'commit-graph write --stdin-commits progress off for redirected stderr' ' + cd "$TRASH_DIRECTORY/full" && + git rev-parse commits/5 >in && + git commit-graph write --stdin-commits <in 2>err && + test_must_be_empty err +' + +test_expect_success 'commit-graph write --stdin-commits force progress on for stderr' ' + cd "$TRASH_DIRECTORY/full" && + git rev-parse commits/5 >in && + GIT_PROGRESS_DELAY=0 git commit-graph write --stdin-commits --progress <in 2>err && + test_i18ngrep "Collecting commits from input" err +' + +test_expect_success 'commit-graph write --stdin-commits with the --no-progress option' ' + cd "$TRASH_DIRECTORY/full" && + git rev-parse commits/5 >in && + git commit-graph write --stdin-commits --no-progress <in 2>err && + test_must_be_empty err +' + +test_expect_success 'commit-graph verify progress off for redirected stderr' ' + cd "$TRASH_DIRECTORY/full" && + git commit-graph verify 2>err && + test_must_be_empty 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_must_be_empty err +' + # Current graph structure: # # __M3___ @@ -328,6 +417,35 @@ test_expect_success 'replace-objects invalidates commit-graph' ' ) ' +test_expect_success 'warn on improper hash version' ' + git init --object-format=sha1 sha1 && + ( + cd sha1 && + test_commit 1 && + git commit-graph write --reachable && + mv .git/objects/info/commit-graph ../cg-sha1 + ) && + git init --object-format=sha256 sha256 && + ( + cd sha256 && + test_commit 1 && + git commit-graph write --reachable && + mv .git/objects/info/commit-graph ../cg-sha256 + ) && + ( + cd sha1 && + mv ../cg-sha256 .git/objects/info/commit-graph && + git log -1 2>err && + test_i18ngrep "commit-graph hash version 2 does not match version 1" err + ) && + ( + cd sha256 && + mv ../cg-sha1 .git/objects/info/commit-graph && + git log -1 2>err && + test_i18ngrep "commit-graph hash version 1 does not match version 2" err + ) +' + # the verify tests below expect the commit-graph to contain # exactly the commits reachable from the commits/8 branch. # If the file changes the set of commits in the list, then the @@ -377,7 +495,8 @@ GRAPH_BYTE_FOOTER=$(($GRAPH_OCTOPUS_DATA_OFFSET + 4 * $NUM_OCTOPUS_EDGES)) corrupt_graph_setup() { cd "$TRASH_DIRECTORY/full" && test_when_finished mv commit-graph-backup $objdir/info/commit-graph && - cp $objdir/info/commit-graph commit-graph-backup + cp $objdir/info/commit-graph commit-graph-backup && + chmod u+w $objdir/info/commit-graph } corrupt_graph_verify() { @@ -390,7 +509,8 @@ corrupt_graph_verify() { cp $objdir/info/commit-graph commit-graph-pre-write-test fi && git status --short && - GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD=true git commit-graph write && + GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE=true git commit-graph write && + chmod u+w $objdir/info/commit-graph && git commit-graph verify } @@ -437,12 +557,12 @@ test_expect_success 'detect bad version' ' ' test_expect_success 'detect bad hash version' ' - corrupt_graph_and_verify $GRAPH_BYTE_HASH "\02" \ + corrupt_graph_and_verify $GRAPH_BYTE_HASH "\03" \ "hash version" ' test_expect_success 'detect low chunk count' ' - corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\02" \ + corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\01" \ "missing the .* chunk" ' @@ -528,7 +648,8 @@ test_expect_success 'detect invalid checksum hash' ' test_expect_success 'detect incorrect chunk count' ' corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\377" \ - "chunk lookup table entry missing" $GRAPH_CHUNK_LOOKUP_OFFSET + "commit-graph file is too small to hold [0-9]* chunks" \ + $GRAPH_CHUNK_LOOKUP_OFFSET ' test_expect_success 'git fsck (checks commit-graph)' ' @@ -577,4 +698,47 @@ 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 c72ca04399..f340b376bc 100755 --- a/third_party/git/t/t5319-multi-pack-index.sh +++ b/third_party/git/t/t5319-multi-pack-index.sh @@ -5,6 +5,8 @@ test_description='multi-pack-indexes' objdir=.git/objects +HASH_LEN=$(test_oid rawsz) + midx_read_expect () { NUM_PACKS=$1 NUM_OBJECTS=$2 @@ -13,7 +15,7 @@ midx_read_expect () { EXTRA_CHUNKS="$5" { cat <<-EOF && - header: 4d494458 1 $NUM_CHUNKS $NUM_PACKS + header: 4d494458 1 $HASH_LEN $NUM_CHUNKS $NUM_PACKS chunks: pack-names oid-fanout oid-lookup object-offsets$EXTRA_CHUNKS num_objects: $NUM_OBJECTS packs: @@ -28,10 +30,28 @@ midx_read_expect () { test_cmp expect actual } -test_expect_success 'write midx with no packs' ' - test_when_finished rm -f pack/multi-pack-index && - git multi-pack-index --object-dir=. write && - midx_read_expect 0 0 4 . +test_expect_success 'setup' ' + 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 "don't write midx with no packs" ' + test_must_fail git multi-pack-index --object-dir=. write && + test_path_is_missing pack/multi-pack-index +' + +test_expect_success SHA1 'warn if a midx contains no oid' ' + cp "$TEST_DIRECTORY"/t5319/no-objects.midx $objdir/pack/multi-pack-index && + test_must_fail git multi-pack-index verify && + rm $objdir/pack/multi-pack-index ' generate_objects () { @@ -147,6 +167,21 @@ 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 @@ -165,10 +200,59 @@ test_expect_success 'write midx with twelve packs' ' compare_results_with_midx "twelve packs" +test_expect_success 'warn on improper hash version' ' + git init --object-format=sha1 sha1 && + ( + cd sha1 && + git config core.multiPackIndex true && + test_commit 1 && + git repack -a && + git multi-pack-index write && + mv .git/objects/pack/multi-pack-index ../mpi-sha1 + ) && + git init --object-format=sha256 sha256 && + ( + cd sha256 && + git config core.multiPackIndex true && + test_commit 1 && + git repack -a && + git multi-pack-index write && + mv .git/objects/pack/multi-pack-index ../mpi-sha256 + ) && + ( + cd sha1 && + mv ../mpi-sha256 .git/objects/pack/multi-pack-index && + git log -1 2>err && + test_i18ngrep "multi-pack-index hash version 2 does not match version 1" err + ) && + ( + cd sha256 && + mv ../mpi-sha1 .git/objects/pack/multi-pack-index && + git log -1 2>err && + test_i18ngrep "multi-pack-index hash version 1 does not match version 2" err + ) +' + + 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 && @@ -195,7 +279,6 @@ test_expect_success 'verify bad signature' ' "multi-pack-index signature" ' -HASH_LEN=20 NUM_OBJECTS=74 MIDX_BYTE_VERSION=4 MIDX_BYTE_OID_VERSION=5 @@ -208,9 +291,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 + 652)) +MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + $(test_oid packnameoff))) MIDX_OID_FANOUT_WIDTH=4 -MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + 1)) +MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + $(test_oid fanoutoff))) 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)) @@ -224,7 +307,7 @@ test_expect_success 'verify bad version' ' ' test_expect_success 'verify bad OID version' ' - corrupt_midx_and_verify $MIDX_BYTE_OID_VERSION "\02" $objdir \ + corrupt_midx_and_verify $MIDX_BYTE_OID_VERSION "\03" $objdir \ "hash version" ' @@ -274,22 +357,77 @@ test_expect_success 'verify incorrect pack-int-id' ' ' test_expect_success 'verify incorrect offset' ' - corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \ + corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \ "incorrect object offset" ' test_expect_success 'git-fsck incorrect offset' ' - corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \ + corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \ "incorrect object offset" \ "git -c core.multipackindex=true fsck" ' -test_expect_success 'repack removes multi-pack-index' ' +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 when deleting packs' ' test_path_is_file $objdir/pack/multi-pack-index && - GIT_TEST_MULTI_PACK_INDEX=0 git repack -adf && + # Set GIT_TEST_MULTI_PACK_INDEX to 0 to avoid writing a new + # multi-pack-index after repacking, but set "core.multiPackIndex" to + # true so that "git repack" can read the existing MIDX. + GIT_TEST_MULTI_PACK_INDEX=0 git -c core.multiPackIndex repack -adf && test_path_is_missing $objdir/pack/multi-pack-index ' +test_expect_success 'repack preserves multi-pack-index when creating packs' ' + git init preserve && + test_when_finished "rm -fr preserve" && + ( + cd preserve && + packdir=.git/objects/pack && + midx=$packdir/multi-pack-index && + + test_commit 1 && + pack1=$(git pack-objects --all $packdir/pack) && + touch $packdir/pack-$pack1.keep && + test_commit 2 && + pack2=$(git pack-objects --revs $packdir/pack) && + touch $packdir/pack-$pack2.keep && + + git multi-pack-index write && + cp $midx $midx.bak && + + cat >pack-input <<-EOF && + HEAD + ^HEAD~1 + EOF + test_commit 3 && + pack3=$(git pack-objects --revs $packdir/pack <pack-input) && + test_commit 4 && + pack4=$(git pack-objects --revs $packdir/pack <pack-input) && + + GIT_TEST_MULTI_PACK_INDEX=0 git -c core.multiPackIndex repack -ad && + ls -la $packdir && + test_path_is_file $packdir/pack-$pack1.pack && + test_path_is_file $packdir/pack-$pack2.pack && + test_path_is_missing $packdir/pack-$pack3.pack && + test_path_is_missing $packdir/pack-$pack4.pack && + test_cmp_bin $midx.bak $midx + ) +' + compare_results_with_midx "after repack" test_expect_success 'multi-pack-index and pack-bitmap' ' @@ -342,7 +480,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 2999 "\02" && + corrupt_data $idx64 $(test_oid idxoff) "\02" && midx64=$(git multi-pack-index --object-dir=objects64 write) && midx_read_expect 1 63 5 objects64 " large-offsets" ' @@ -413,6 +551,30 @@ 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 && @@ -438,10 +600,10 @@ test_expect_success 'repack with minimum size does not alter existing packs' ' cd dup && rm -rf .git/objects/pack && mv .git/objects/pack-backup .git/objects/pack && - touch -m -t 201901010000 .git/objects/pack/pack-D* && - touch -m -t 201901010001 .git/objects/pack/pack-C* && - touch -m -t 201901010002 .git/objects/pack/pack-B* && - touch -m -t 201901010003 .git/objects/pack/pack-A* && + test-tool chmtime =-5 .git/objects/pack/pack-D* && + test-tool chmtime =-4 .git/objects/pack/pack-C* && + test-tool chmtime =-3 .git/objects/pack/pack-B* && + test-tool chmtime =-2 .git/objects/pack/pack-A* && ls .git/objects/pack >expect && MINSIZE=$(test-tool path-utils file-size .git/objects/pack/*pack | sort -n | head -n 1) && git multi-pack-index repack --batch-size=$MINSIZE && @@ -450,6 +612,33 @@ test_expect_success 'repack with minimum size does not alter existing packs' ' ) ' +test_expect_success 'repack respects repack.packKeptObjects=false' ' + test_when_finished rm -f dup/.git/objects/pack/*keep && + ( + cd dup && + ls .git/objects/pack/*idx >idx-list && + test_line_count = 5 idx-list && + ls .git/objects/pack/*.pack | sed "s/\.pack/.keep/" >keep-list && + test_line_count = 5 keep-list && + for keep in $(cat keep-list) + do + touch $keep || return 1 + done && + git multi-pack-index repack --batch-size=0 && + ls .git/objects/pack/*idx >idx-list && + test_line_count = 5 idx-list && + test-tool read-midx .git/objects | grep idx >midx-list && + test_line_count = 5 midx-list && + THIRD_SMALLEST_SIZE=$(test-tool path-utils file-size .git/objects/pack/*pack | sort -n | sed -n 3p) && + BATCH_SIZE=$((THIRD_SMALLEST_SIZE + 1)) && + git multi-pack-index repack --batch-size=$BATCH_SIZE && + ls .git/objects/pack/*idx >idx-list && + test_line_count = 5 idx-list && + test-tool read-midx .git/objects | grep idx >midx-list && + test_line_count = 5 midx-list + ) +' + test_expect_success 'repack creates a new pack' ' ( cd dup && @@ -528,6 +717,7 @@ test_expect_success 'expire respects .keep files' ' ' test_expect_success 'repack --batch-size=0 repacks everything' ' + cp -r dup dup2 && ( cd dup && rm .git/objects/pack/*.keep && @@ -547,4 +737,21 @@ test_expect_success 'repack --batch-size=0 repacks everything' ' ) ' +test_expect_success 'repack --batch-size=<large> repacks everything' ' + ( + cd dup2 && + rm .git/objects/pack/*.keep && + ls .git/objects/pack/*idx >idx-list && + test_line_count = 2 idx-list && + git multi-pack-index repack --batch-size=2000000 && + ls .git/objects/pack/*idx >idx-list && + test_line_count = 3 idx-list && + test-tool read-midx .git/objects | grep idx >midx-list && + test_line_count = 3 midx-list && + git multi-pack-index expire && + ls -al .git/objects/pack/*idx >idx-list && + test_line_count = 1 idx-list + ) +' + test_done diff --git a/third_party/git/t/t5319/no-objects.midx b/third_party/git/t/t5319/no-objects.midx new file mode 100644 index 0000000000..e466b8e086 --- /dev/null +++ b/third_party/git/t/t5319/no-objects.midx Binary files differdiff --git a/third_party/git/t/t5321-pack-large-objects.sh b/third_party/git/t/t5321-pack-large-objects.sh index a75eab87d3..8a56d98a0e 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=01d7713666f4de822776c7622c10f1b07de280dc -B=e68fe8129b546b101aee9510c5328e7f21ca1d18 +A=$(test_oid packlib_7_0) +B=$(test_oid packlib_7_76) test_expect_success 'setup' ' clear_packs && diff --git a/third_party/git/t/t5322-pack-objects-sparse.sh b/third_party/git/t/t5322-pack-objects-sparse.sh index 7124b5581a..a581eaf529 100755 --- a/third_party/git/t/t5322-pack-objects-sparse.sh +++ b/third_party/git/t/t5322-pack-objects-sparse.sh @@ -105,14 +105,16 @@ test_expect_success 'non-sparse pack-objects' ' test_cmp required_objects.txt nonsparse_required_objects.txt ' +# --sparse is enabled by default by pack.useSparse test_expect_success 'sparse pack-objects' ' + GIT_TEST_PACK_SPARSE=-1 && git rev-parse \ topic1 \ topic1^{tree} \ topic1:f3 \ topic1:f3/f4 \ topic1:f3/f4/data.txt | sort >expect_sparse_objects.txt && - git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack && + git pack-objects --stdout --revs <packinput.txt >sparse.pack && git index-pack -o sparse.idx sparse.pack && git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt && test_cmp expect_sparse_objects.txt sparse_objects.txt diff --git a/third_party/git/t/t5324-split-commit-graph.sh b/third_party/git/t/t5324-split-commit-graph.sh index 99f4ef4c19..c334ee9155 100755 --- a/third_party/git/t/t5324-split-commit-graph.sh +++ b/third_party/git/t/t5324-split-commit-graph.sh @@ -4,13 +4,24 @@ test_description='split commit graph' . ./test-lib.sh GIT_TEST_COMMIT_GRAPH=0 +GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=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 + + oid_version sha1:1 + oid_version sha256:2 + EOM ' graph_read_expect() { @@ -20,14 +31,18 @@ graph_read_expect() { NUM_BASE=$2 fi cat >expect <<- EOF - header: 43475048 1 1 3 $NUM_BASE + header: 43475048 1 $(test_oid oid_version) 3 $NUM_BASE num_commits: $1 chunks: oid_fanout oid_lookup commit_metadata EOF - git commit-graph read >output && + test-tool read-graph >output && test_cmp expect output } +test_expect_success POSIXPERM 'tweak umask for modebit tests' ' + umask 022 +' + test_expect_success 'create commits and write commit-graph' ' for i in $(test_seq 3) do @@ -202,8 +217,14 @@ test_expect_success 'test merge stragety constants' ' git config core.commitGraph true && test_line_count = 2 $graphdir/commit-graph-chain && test_commit 15 && - git commit-graph write --reachable --split --size-multiple=10 --expire-time=1980-01-01 && + touch $graphdir/to-delete.graph $graphdir/to-keep.graph && + test-tool chmtime =1546362000 $graphdir/to-delete.graph && + test-tool chmtime =1546362001 $graphdir/to-keep.graph && + git commit-graph write --reachable --split --size-multiple=10 \ + --expire-time="2019-01-01 12:00 -05:00" && test_line_count = 1 $graphdir/commit-graph-chain && + test_path_is_missing $graphdir/to-delete.graph && + test_path_is_file $graphdir/to-keep.graph && ls $graphdir/graph-*.graph >graph-files && test_line_count = 3 graph-files ) && @@ -247,7 +268,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" 1760 "\01" && + corrupt_file "$base_file" $(test_oid shallow) "\01" && test_must_fail git commit-graph verify --shallow 2>test_err && grep -v "^+" test_err >err && test_i18ngrep "incorrect checksum" err @@ -274,7 +295,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" 1376 "\01" && + corrupt_file "$base_file" $(test_oid base) "\01" && git commit-graph verify --shallow 2>test_err && grep -v "^+" test_err >err && test_i18ngrep "commit-graph chain does not match" err @@ -319,7 +340,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 2>err && + git commit-graph verify --progress 2>err && test_line_count = 3 err && test_i18ngrep ! warning err && test_line_count = 3 $graphdir/commit-graph-chain @@ -334,6 +355,7 @@ 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 && @@ -342,4 +364,80 @@ test_expect_success 'split across alternate where alternate is not split' ' test_cmp commit-graph .git/objects/info/commit-graph ' +test_expect_success '--split=no-merge always writes an incremental' ' + test_when_finished rm -rf a b && + rm -rf $graphdir $infodir/commit-graph && + git reset --hard commits/2 && + git rev-list HEAD~1 >a && + git rev-list HEAD >b && + git commit-graph write --split --stdin-commits <a && + git commit-graph write --split=no-merge --stdin-commits <b && + test_line_count = 2 $graphdir/commit-graph-chain +' + +test_expect_success '--split=replace replaces the chain' ' + rm -rf $graphdir $infodir/commit-graph && + git reset --hard commits/3 && + git rev-list -1 HEAD~2 >a && + git rev-list -1 HEAD~1 >b && + git rev-list -1 HEAD >c && + git commit-graph write --split=no-merge --stdin-commits <a && + git commit-graph write --split=no-merge --stdin-commits <b && + git commit-graph write --split=no-merge --stdin-commits <c && + test_line_count = 3 $graphdir/commit-graph-chain && + git commit-graph write --stdin-commits --split=replace <b && + test_path_is_missing $infodir/commit-graph && + test_path_is_file $graphdir/commit-graph-chain && + ls $graphdir/graph-*.graph >graph-files && + test_line_count = 1 graph-files && + verify_chain_files_exist $graphdir && + graph_read_expect 2 +' + +test_expect_success ULIMIT_FILE_DESCRIPTORS 'handles file descriptor exhaustion' ' + git init ulimit && + ( + cd ulimit && + for i in $(test_seq 64) + do + test_commit $i && + run_with_limited_open_files test_might_fail git commit-graph write \ + --split=no-merge --reachable || return 1 + done + ) +' + +while read mode modebits +do + test_expect_success POSIXPERM "split commit-graph respects core.sharedrepository $mode" ' + rm -rf $graphdir $infodir/commit-graph && + git reset --hard commits/1 && + test_config core.sharedrepository "$mode" && + git commit-graph write --split --reachable && + ls $graphdir/graph-*.graph >graph-files && + test_line_count = 1 graph-files && + echo "$modebits" >expect && + test_modebits $graphdir/graph-*.graph >actual && + test_cmp expect actual && + test_modebits $graphdir/commit-graph-chain >actual && + test_cmp expect actual + ' +done <<\EOF +0666 -r--r--r-- +0600 -r-------- +EOF + +test_expect_success '--split=replace with partial Bloom data' ' + rm -rf $graphdir $infodir/commit-graph && + git reset --hard commits/3 && + git rev-list -1 HEAD~2 >a && + git rev-list -1 HEAD~1 >b && + git commit-graph write --split=no-merge --stdin-commits --changed-paths <a && + git commit-graph write --split=no-merge --stdin-commits <b && + git commit-graph write --split=replace --stdin-commits --changed-paths <c && + ls $graphdir/graph-*.graph >graph-files && + test_line_count = 1 graph-files && + verify_chain_files_exist $graphdir +' + test_done diff --git a/third_party/git/t/t5400-send-pack.sh b/third_party/git/t/t5400-send-pack.sh index 571d620aed..b84618c925 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= \ + GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION=0 \ 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 7344253bfb..80750a817e 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' ' +test_expect_success 'git rebase --apply' ' git reset --hard D && clear_hook_input && - test_must_fail git rebase --onto A B && + test_must_fail git rebase --apply --onto A B && echo C > foo && git add foo && git rebase --continue && @@ -68,10 +68,10 @@ test_expect_success 'git rebase' ' verify_hook_input ' -test_expect_success 'git rebase --skip' ' +test_expect_success 'git rebase --apply --skip' ' git reset --hard D && clear_hook_input && - test_must_fail git rebase --onto A B && + test_must_fail git rebase --apply --onto A B && test_must_fail git rebase --skip && echo D > foo && git add foo && @@ -84,10 +84,10 @@ test_expect_success 'git rebase --skip' ' verify_hook_input ' -test_expect_success 'git rebase --skip the last one' ' +test_expect_success 'git rebase --apply --skip the last one' ' git reset --hard F && clear_hook_input && - test_must_fail git rebase --onto D A && + test_must_fail git rebase --apply --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 interactive backend' ' +test_expect_success 'git rebase with implicit use of merge 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 interactive backend' ' verify_hook_input ' -test_expect_success 'git rebase --skip with implicit use of interactive backend' ' +test_expect_success 'git rebase --skip with implicit use of merge 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 2a8c449661..5d8f401d8e 100755 --- a/third_party/git/t/t5409-colorize-remote-messages.sh +++ b/third_party/git/t/t5409-colorize-remote-messages.sh @@ -56,14 +56,13 @@ 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 && cat output && + git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output && test_decode_color <output >decoded && grep " <BOLD;RED>error<RESET>: leading space" decoded ' diff --git a/third_party/git/t/t5411-proc-receive-hook.sh b/third_party/git/t/t5411-proc-receive-hook.sh new file mode 100755 index 0000000000..746487286f --- /dev/null +++ b/third_party/git/t/t5411-proc-receive-hook.sh @@ -0,0 +1,117 @@ +#!/bin/sh +# +# Copyright (c) 2020 Jiang Xin +# + +test_description='Test proc-receive hook' + +. ./test-lib.sh + +. "$TEST_DIRECTORY"/t5411/common-functions.sh + +setup_upstream_and_workbench () { + # Refs of upstream : master(A) + # Refs of workbench: master(A) tags/v123 + test_expect_success "setup upstream and workbench" ' + rm -rf upstream.git && + rm -rf workbench && + git init --bare upstream.git && + git init workbench && + create_commits_in workbench A B && + ( + cd workbench && + # Try to make a stable fixed width for abbreviated commit ID, + # this fixed-width oid will be replaced with "<OID>". + git config core.abbrev 7 && + git tag -m "v123" v123 $A && + git remote add origin ../upstream.git && + git push origin master && + git update-ref refs/heads/master $A $B && + git -C ../upstream.git update-ref \ + refs/heads/master $A $B + ) && + TAG=$(git -C workbench rev-parse v123) && + + # setup pre-receive hook + write_script upstream.git/hooks/pre-receive <<-\EOF && + exec >&2 + echo "# pre-receive hook" + while read old new ref + do + echo "pre-receive< $old $new $ref" + done + EOF + + # setup post-receive hook + write_script upstream.git/hooks/post-receive <<-\EOF && + exec >&2 + echo "# post-receive hook" + while read old new ref + do + echo "post-receive< $old $new $ref" + done + EOF + + upstream=upstream.git + ' +} + +run_proc_receive_hook_test() { + case $1 in + http) + PROTOCOL="HTTP protocol" + URL_PREFIX="http://.*" + ;; + local) + PROTOCOL="builtin protocol" + URL_PREFIX="\.\." + ;; + esac + + # Include test cases for both file and HTTP protocol + for t in "$TEST_DIRECTORY"/t5411/test-*.sh + do + . "$t" + done +} + +# Initialize the upstream repository and local workbench. +setup_upstream_and_workbench + +# Load test cases that only need to be executed once. +for t in "$TEST_DIRECTORY"/t5411/once-*.sh +do + . "$t" +done + +# Initialize the upstream repository and local workbench. +setup_upstream_and_workbench + +# Run test cases for 'proc-receive' hook on local file protocol. +run_proc_receive_hook_test local + +ROOT_PATH="$PWD" +. "$TEST_DIRECTORY"/lib-gpg.sh +. "$TEST_DIRECTORY"/lib-httpd.sh +. "$TEST_DIRECTORY"/lib-terminal.sh +start_httpd + +# Re-initialize the upstream repository and local workbench. +setup_upstream_and_workbench + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "setup for HTTP protocol" ' + git -C upstream.git config http.receivepack true && + upstream="$HTTPD_DOCUMENT_ROOT_PATH/upstream.git" && + mv upstream.git "$upstream" && + git -C workbench remote set-url origin "$HTTPD_URL/auth-push/smart/upstream.git" && + set_askpass user@host pass@host +' + +setup_askpass_helper + +# Run test cases for 'proc-receive' hook on HTTP protocol. +run_proc_receive_hook_test http + +test_done diff --git a/third_party/git/t/t5411/common-functions.sh b/third_party/git/t/t5411/common-functions.sh new file mode 100644 index 0000000000..6580bebd8e --- /dev/null +++ b/third_party/git/t/t5411/common-functions.sh @@ -0,0 +1,56 @@ +# Create commits in <repo> and assign each commit's oid to shell variables +# given in the arguments (A, B, and C). E.g.: +# +# create_commits_in <repo> A B C +# +# NOTE: Never calling this function from a subshell since variable +# assignments will disappear when subshell exits. +create_commits_in () { + repo="$1" && + if ! parent=$(git -C "$repo" rev-parse HEAD^{} --) + then + parent= + fi && + T=$(git -C "$repo" write-tree) && + shift && + while test $# -gt 0 + do + name=$1 && + test_tick && + if test -z "$parent" + then + oid=$(echo $name | git -C "$repo" commit-tree $T) + else + oid=$(echo $name | git -C "$repo" commit-tree -p $parent $T) + fi && + eval $name=$oid && + parent=$oid && + shift || + return 1 + done && + git -C "$repo" update-ref refs/heads/master $oid +} + +# Format the output of git-push, git-show-ref and other commands to make a +# user-friendly and stable text. We can easily prepare the expect text +# without having to worry about future changes of the commit ID and spaces +# of the output. Single quotes are replaced with double quotes, because +# it is boring to prepare unquoted single quotes in expect text. We also +# remove some locale error messages, which break test if we turn on +# `GIT_TEST_GETTEXT_POISON=true` in order to test unintentional translations +# on plumbing commands. +make_user_friendly_and_stable_output () { + sed \ + -e "s/ *\$//" \ + -e "s/ */ /g" \ + -e "s/'/\"/g" \ + -e "s/ / /g" \ + -e "s/$A/<COMMIT-A>/g" \ + -e "s/$B/<COMMIT-B>/g" \ + -e "s/$TAG/<TAG-v123>/g" \ + -e "s/$ZERO_OID/<ZERO-OID>/g" \ + -e "s/$(echo $A | cut -c1-7)[0-9a-f]*/<OID-A>/g" \ + -e "s/$(echo $B | cut -c1-7)[0-9a-f]*/<OID-B>/g" \ + -e "s#To $URL_PREFIX/upstream.git#To <URL/of/upstream.git>#" \ + -e "/^error: / d" +} diff --git a/third_party/git/t/t5411/once-0010-report-status-v1.sh b/third_party/git/t/t5411/once-0010-report-status-v1.sh new file mode 100644 index 0000000000..dc2cf4a522 --- /dev/null +++ b/third_party/git/t/t5411/once-0010-report-status-v1.sh @@ -0,0 +1,94 @@ +test_expect_success "setup receive.procReceiveRefs" ' + git -C "$upstream" config --add receive.procReceiveRefs refs/for +' + +test_expect_success "setup proc-receive hook" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic1" \ + -r "option fall-through" \ + -r "ok refs/for/master/topic2" \ + -r "option refname refs/for/changes/23/123/1" \ + -r "option new-oid $A" \ + -r "ok refs/for/master/topic2" \ + -r "option refname refs/for/changes/24/124/2" \ + -r "option old-oid $B" \ + -r "option new-oid $A" \ + -r "option forced-update" \ + -r "ng refs/for/next/topic target branch not exist" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : (B) refs/for/master/topic1(A) foo(A) refs/for/next/topic(A) refs/for/master/topic2(A) +test_expect_success "proc-receive: report status v1" ' + { + if test -z "$GIT_DEFAULT_HASH" || test "$GIT_DEFAULT_HASH" = "sha1" + then + printf "%s %s refs/heads/master\0report-status\n" \ + $A $B | packetize + else + printf "%s %s refs/heads/master\0report-status object-format=$GIT_DEFAULT_HASH\n" \ + $A $B | packetize + fi && + printf "%s %s refs/for/master/topic1\n" \ + $ZERO_OID $A | packetize && + printf "%s %s refs/heads/foo\n" \ + $ZERO_OID $A | packetize && + printf "%s %s refs/for/next/topic\n" \ + $ZERO_OID $A | packetize && + printf "%s %s refs/for/master/topic2\n" \ + $ZERO_OID $A | packetize && + printf 0000 && + printf "" | git -C "$upstream" pack-objects --stdout + } | git receive-pack "$upstream" --stateless-rpc \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + # pre-receive hook + pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic1 + pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo + pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic + pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic2 + # proc-receive hook + proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic1 + proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic + proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic2 + proc-receive> ok refs/for/master/topic1 + proc-receive> option fall-through + proc-receive> ok refs/for/master/topic2 + proc-receive> option refname refs/for/changes/23/123/1 + proc-receive> option new-oid <COMMIT-A> + proc-receive> ok refs/for/master/topic2 + proc-receive> option refname refs/for/changes/24/124/2 + proc-receive> option old-oid <COMMIT-B> + proc-receive> option new-oid <COMMIT-A> + proc-receive> option forced-update + proc-receive> ng refs/for/next/topic target branch not exist + 000eunpack ok + 0019ok refs/heads/master + 001eok refs/for/master/topic1 + 0016ok refs/heads/foo + 0033ng refs/for/next/topic target branch not exist + 001eok refs/for/master/topic2 + 0000# post-receive hook + post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic1 + post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo + post-receive< <ZERO-OID> <COMMIT-A> refs/for/changes/23/123/1 + post-receive< <COMMIT-B> <COMMIT-A> refs/for/changes/24/124/2 + EOF + test_cmp expect actual && + + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/for/master/topic1 + <COMMIT-A> refs/heads/foo + <COMMIT-B> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0000-standard-git-push.sh b/third_party/git/t/t5411/test-0000-standard-git-push.sh new file mode 100644 index 0000000000..e206587348 --- /dev/null +++ b/third_party/git/t/t5411/test-0000-standard-git-push.sh @@ -0,0 +1,143 @@ +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git-push : master(B) next(A) +test_expect_success "git-push ($PROTOCOL)" ' + git -C workbench push origin \ + $B:refs/heads/master \ + HEAD:refs/heads/next \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + To <URL/of/upstream.git> + <OID-A>..<OID-B> <COMMIT-B> -> master + * [new branch] HEAD -> next + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual +' + +# Refs of upstream : master(B) next(A) +# Refs of workbench: master(A) tags/v123 +# git-push --atomic: master(A) next(B) +test_expect_success "git-push --atomic ($PROTOCOL)" ' + test_must_fail git -C workbench push --atomic origin \ + master \ + $B:refs/heads/next \ + >out 2>&1 && + make_user_friendly_and_stable_output <out | + sed -n \ + -e "/^To / { s/ */ /g; p; }" \ + -e "/^ ! / { s/ */ /g; p; }" \ + >actual && + cat >expect <<-EOF && + To <URL/of/upstream.git> + ! [rejected] master -> master (non-fast-forward) + ! [rejected] <COMMIT-B> -> next (atomic push failed) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual +' + +# Refs of upstream : master(B) next(A) +# Refs of workbench: master(A) tags/v123 +# git-push : master(A) next(B) +test_expect_success "non-fast-forward git-push ($PROTOCOL)" ' + test_must_fail git \ + -C workbench \ + -c advice.pushUpdateRejected=false \ + push origin \ + master \ + $B:refs/heads/next \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/next + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next + To <URL/of/upstream.git> + <OID-A>..<OID-B> <COMMIT-B> -> next + ! [rejected] master -> master (non-fast-forward) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/master + <COMMIT-B> refs/heads/next + EOF + test_cmp expect actual +' + +# Refs of upstream : master(B) next(B) +# Refs of workbench: master(A) tags/v123 +# git-push -f : master(A) NULL tags/v123 refs/review/master/topic(A) a/b/c(A) +test_expect_success "git-push -f ($PROTOCOL)" ' + git -C workbench push -f origin \ + refs/tags/v123 \ + :refs/heads/next \ + master \ + master:refs/review/master/topic \ + HEAD:refs/heads/a/b/c \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/master + remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next + remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123 + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/master/topic + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c + remote: # post-receive hook + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/master + remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next + remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123 + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/master/topic + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c + To <URL/of/upstream.git> + + <OID-B>...<OID-A> master -> master (forced update) + - [deleted] next + * [new tag] v123 -> v123 + * [new reference] master -> refs/review/master/topic + * [new branch] HEAD -> a/b/c + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/a/b/c + <COMMIT-A> refs/heads/master + <COMMIT-A> refs/review/master/topic + <TAG-v123> refs/tags/v123 + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) tags/v123 refs/review/master/topic(A) a/b/c(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL)" ' + ( + cd "$upstream" && + git update-ref -d refs/review/master/topic && + git update-ref -d refs/tags/v123 && + git update-ref -d refs/heads/a/b/c + ) +' diff --git a/third_party/git/t/t5411/test-0001-standard-git-push--porcelain.sh b/third_party/git/t/t5411/test-0001-standard-git-push--porcelain.sh new file mode 100644 index 0000000000..48f6fcc846 --- /dev/null +++ b/third_party/git/t/t5411/test-0001-standard-git-push--porcelain.sh @@ -0,0 +1,147 @@ +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git-push : master(B) next(A) +test_expect_success "git-push ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain origin \ + $B:refs/heads/master \ + HEAD:refs/heads/next \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + To <URL/of/upstream.git> + <COMMIT-B>:refs/heads/master <OID-A>..<OID-B> + * HEAD:refs/heads/next [new branch] + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual +' + +# Refs of upstream : master(B) next(A) +# Refs of workbench: master(A) tags/v123 +# git-push --atomic: master(A) next(B) +test_expect_success "git-push --atomic ($PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --atomic --porcelain origin \ + master \ + $B:refs/heads/next \ + >out 2>&1 && + make_user_friendly_and_stable_output <out | + sed -n \ + -e "s/^# GETTEXT POISON #//" \ + -e "/^To / { s/ */ /g; p; }" \ + -e "/^! / { s/ */ /g; p; }" \ + >actual && + cat >expect <<-EOF && + To <URL/of/upstream.git> + ! refs/heads/master:refs/heads/master [rejected] (non-fast-forward) + ! <COMMIT-B>:refs/heads/next [rejected] (atomic push failed) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual +' + +# Refs of upstream : master(B) next(A) +# Refs of workbench: master(A) tags/v123 +# git-push : master(A) next(B) +test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" ' + test_must_fail git \ + -C workbench \ + -c advice.pushUpdateRejected=false \ + push --porcelain origin \ + master \ + $B:refs/heads/next \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/next + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next + To <URL/of/upstream.git> + <COMMIT-B>:refs/heads/next <OID-A>..<OID-B> + ! refs/heads/master:refs/heads/master [rejected] (non-fast-forward) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/master + <COMMIT-B> refs/heads/next + EOF + test_cmp expect actual +' + +# Refs of upstream : master(B) next(B) +# Refs of workbench: master(A) tags/v123 +# git-push -f : master(A) NULL tags/v123 refs/review/master/topic(A) a/b/c(A) +test_expect_success "git-push -f ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain -f origin \ + refs/tags/v123 \ + :refs/heads/next \ + master \ + master:refs/review/master/topic \ + HEAD:refs/heads/a/b/c \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/master + remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next + remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123 + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/master/topic + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c + remote: # post-receive hook + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/master + remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next + remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123 + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/master/topic + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c + To <URL/of/upstream.git> + + refs/heads/master:refs/heads/master <OID-B>...<OID-A> (forced update) + - :refs/heads/next [deleted] + * refs/tags/v123:refs/tags/v123 [new tag] + * refs/heads/master:refs/review/master/topic [new reference] + * HEAD:refs/heads/a/b/c [new branch] + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/a/b/c + <COMMIT-A> refs/heads/master + <COMMIT-A> refs/review/master/topic + <TAG-v123> refs/tags/v123 + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) tags/v123 refs/review/master/topic(A) a/b/c(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL/porcelain)" ' + ( + cd "$upstream" && + git update-ref -d refs/review/master/topic && + git update-ref -d refs/tags/v123 && + git update-ref -d refs/heads/a/b/c + ) +' diff --git a/third_party/git/t/t5411/test-0002-pre-receive-declined.sh b/third_party/git/t/t5411/test-0002-pre-receive-declined.sh new file mode 100644 index 0000000000..c246f7e68e --- /dev/null +++ b/third_party/git/t/t5411/test-0002-pre-receive-declined.sh @@ -0,0 +1,33 @@ +test_expect_success "setup pre-receive hook ($PROTOCOL)" ' + mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" && + write_script "$upstream/hooks/pre-receive" <<-EOF + exit 1 + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git-push : master(B) next(A) +test_expect_success "git-push is declined ($PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + $B:refs/heads/master \ + HEAD:refs/heads/next \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + To <URL/of/upstream.git> + ! [remote rejected] <COMMIT-B> -> master (pre-receive hook declined) + ! [remote rejected] HEAD -> next (pre-receive hook declined) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "cleanup ($PROTOCOL)" ' + mv "$upstream/hooks/pre-receive.ok" "$upstream/hooks/pre-receive" +' diff --git a/third_party/git/t/t5411/test-0003-pre-receive-declined--porcelain.sh b/third_party/git/t/t5411/test-0003-pre-receive-declined--porcelain.sh new file mode 100644 index 0000000000..b14894de81 --- /dev/null +++ b/third_party/git/t/t5411/test-0003-pre-receive-declined--porcelain.sh @@ -0,0 +1,34 @@ +test_expect_success "setup pre-receive hook ($PROTOCOL/porcelain)" ' + mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" && + write_script "$upstream/hooks/pre-receive" <<-EOF + exit 1 + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git-push : master(B) next(A) +test_expect_success "git-push is declined ($PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain origin \ + $B:refs/heads/master \ + HEAD:refs/heads/next \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + To <URL/of/upstream.git> + ! <COMMIT-B>:refs/heads/master [remote rejected] (pre-receive hook declined) + ! HEAD:refs/heads/next [remote rejected] (pre-receive hook declined) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "cleanup ($PROTOCOL/porcelain)" ' + mv "$upstream/hooks/pre-receive.ok" "$upstream/hooks/pre-receive" +' diff --git a/third_party/git/t/t5411/test-0010-proc-receive-settings.sh b/third_party/git/t/t5411/test-0010-proc-receive-settings.sh new file mode 100644 index 0000000000..a36809927b --- /dev/null +++ b/third_party/git/t/t5411/test-0010-proc-receive-settings.sh @@ -0,0 +1,7 @@ +test_expect_success "add two receive.procReceiveRefs settings" ' + ( + cd "$upstream" && + git config --add receive.procReceiveRefs refs/for && + git config --add receive.procReceiveRefs refs/review/ + ) +' diff --git a/third_party/git/t/t5411/test-0011-no-hook-error.sh b/third_party/git/t/t5411/test-0011-no-hook-error.sh new file mode 100644 index 0000000000..bb6ec92a92 --- /dev/null +++ b/third_party/git/t/t5411/test-0011-no-hook-error.sh @@ -0,0 +1,64 @@ +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : next(A) refs/for/master/topic(A) +test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + HEAD:next \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: error: cannot find hook "proc-receive" + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + To <URL/of/upstream.git> + * [new branch] HEAD -> next + ! [remote rejected] HEAD -> refs/for/master/topic (fail to run proc-receive hook) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) next(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL)" ' + git -C "$upstream" update-ref -d refs/heads/next +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push --atomic: (B) next(A) refs/for/master/topic(A) +test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCOL)" ' + test_must_fail git -C workbench push --atomic origin \ + $B:master \ + HEAD:next \ + HEAD:refs/for/master/topic >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: error: cannot find hook "proc-receive" + To <URL/of/upstream.git> + ! [remote rejected] <COMMIT-B> -> master (fail to run proc-receive hook) + ! [remote rejected] HEAD -> next (fail to run proc-receive hook) + ! [remote rejected] HEAD -> refs/for/master/topic (fail to run proc-receive hook) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0012-no-hook-error--porcelain.sh b/third_party/git/t/t5411/test-0012-no-hook-error--porcelain.sh new file mode 100644 index 0000000000..4814f74dc2 --- /dev/null +++ b/third_party/git/t/t5411/test-0012-no-hook-error--porcelain.sh @@ -0,0 +1,66 @@ +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : next(A) refs/for/master/topic(A) +test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain origin \ + HEAD:next \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: error: cannot find hook "proc-receive" + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + To <URL/of/upstream.git> + * HEAD:refs/heads/next [new branch] + ! HEAD:refs/for/master/topic [remote rejected] (fail to run proc-receive hook) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) next(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL/porcelain)" ' + git -C "$upstream" update-ref -d refs/heads/next +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push --atomic: (B) next(A) refs/for/master/topic(A) +test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain --atomic origin \ + $B:master \ + HEAD:next \ + HEAD:refs/for/master/topic >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: error: cannot find hook "proc-receive" + To <URL/of/upstream.git> + ! <COMMIT-B>:refs/heads/master [remote rejected] (fail to run proc-receive hook) + ! HEAD:refs/heads/next [remote rejected] (fail to run proc-receive hook) + ! HEAD:refs/for/master/topic [remote rejected] (fail to run proc-receive hook) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0013-bad-protocol.sh b/third_party/git/t/t5411/test-0013-bad-protocol.sh new file mode 100644 index 0000000000..c5fe4cb37b --- /dev/null +++ b/third_party/git/t/t5411/test-0013-bad-protocol.sh @@ -0,0 +1,217 @@ +test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v --version 2 + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic(A) +test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + + # Check status report for git-push + sed -n \ + -e "/^To / { p; n; p; }" \ + <actual >actual-report && + cat >expect <<-EOF && + To <URL/of/upstream.git> + ! [remote rejected] HEAD -> refs/for/master/topic (fail to run proc-receive hook) + EOF + test_cmp expect actual-report && + + # Check error message from "receive-pack", but ignore unstable fatal error + # message ("remote: fatal: the remote end hung up unexpectedly") which + # is different from the remote HTTP server with different locale settings. + grep "^remote: error:" <actual >actual-error && + cat >expect <<-EOF && + remote: error: proc-receive version "2" is not supported + EOF + test_cmp expect actual-error && + + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (hook --die-version, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v --die-version + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic(A) +test_expect_success "proc-receive: bad protocol (hook --die-version, $PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: fatal: bad protocol version: 1 + remote: error: proc-receive version "0" is not supported + To <URL/of/upstream.git> + ! [remote rejected] HEAD -> refs/for/master/topic (fail to run proc-receive hook) + EOF + test_cmp expect actual && + + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (hook --die-readline, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v --die-readline + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic(A) +test_expect_success "proc-receive: bad protocol (hook --die-readline, $PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + + grep "remote: fatal: protocol error: expected \"old new ref\", got \"<ZERO-OID> <COMMIT-A> refs/for/master/topic\"" actual && + + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (no report, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : next(A) refs/for/master/topic(A) +test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + HEAD:refs/heads/next \ + HEAD:refs/for/master/topic >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + To <URL/of/upstream.git> + * [new branch] HEAD -> next + ! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) next(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL)" ' + git -C "$upstream" update-ref -d refs/heads/next + +' + +test_expect_success "setup proc-receive hook (no ref, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic +test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + HEAD:refs/for/master/topic\ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok + remote: error: proc-receive reported incomplete status line: "ok" + To <URL/of/upstream.git> + ! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "xx refs/for/master/topic" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic +test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> xx refs/for/master/topic + remote: error: proc-receive reported bad status "xx" on ref "refs/for/master/topic" + To <URL/of/upstream.git> + ! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0014-bad-protocol--porcelain.sh b/third_party/git/t/t5411/test-0014-bad-protocol--porcelain.sh new file mode 100644 index 0000000000..53b47b0185 --- /dev/null +++ b/third_party/git/t/t5411/test-0014-bad-protocol--porcelain.sh @@ -0,0 +1,160 @@ +test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v --version 2 + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic(A) +test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + + # Check status report for git-push + sed -n \ + -e "/^To / { p; n; p; n; p; }" \ + <actual >actual-report && + cat >expect <<-EOF && + To <URL/of/upstream.git> + ! HEAD:refs/for/master/topic [remote rejected] (fail to run proc-receive hook) + Done + EOF + test_cmp expect actual-report && + + # Check error message from "receive-pack", but ignore unstable fatal error + # message ("remote: fatal: the remote end hung up unexpectedly") which + # is different from the remote HTTP server with different locale settings. + grep "^remote: error:" <actual >actual-error && + cat >expect <<-EOF && + remote: error: proc-receive version "2" is not supported + EOF + test_cmp expect actual-error && + + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (no report, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : next(A) refs/for/master/topic(A) +test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain origin \ + HEAD:refs/heads/next \ + HEAD:refs/for/master/topic >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + To <URL/of/upstream.git> + * HEAD:refs/heads/next [new branch] + ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) next(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL/porcelain)" ' + git -C "$upstream" update-ref -d refs/heads/next + +' + +test_expect_success "setup proc-receive hook (no ref, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic +test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic\ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok + remote: error: proc-receive reported incomplete status line: "ok" + To <URL/of/upstream.git> + ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "xx refs/for/master/topic" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic +test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> xx refs/for/master/topic + remote: error: proc-receive reported bad status "xx" on ref "refs/for/master/topic" + To <URL/of/upstream.git> + ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0020-report-ng.sh b/third_party/git/t/t5411/test-0020-report-ng.sh new file mode 100644 index 0000000000..f726b7ca9c --- /dev/null +++ b/third_party/git/t/t5411/test-0020-report-ng.sh @@ -0,0 +1,67 @@ +test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ng refs/for/master/topic" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic +test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ng refs/for/master/topic + To <URL/of/upstream.git> + ! [remote rejected] HEAD -> refs/for/master/topic (failed) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (ng message, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ng refs/for/master/topic error msg" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic +test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ng refs/for/master/topic error msg + To <URL/of/upstream.git> + ! [remote rejected] HEAD -> refs/for/master/topic (error msg) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0021-report-ng--porcelain.sh b/third_party/git/t/t5411/test-0021-report-ng--porcelain.sh new file mode 100644 index 0000000000..fbf5569103 --- /dev/null +++ b/third_party/git/t/t5411/test-0021-report-ng--porcelain.sh @@ -0,0 +1,69 @@ +test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ng refs/for/master/topic" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic +test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ng refs/for/master/topic + To <URL/of/upstream.git> + ! HEAD:refs/for/master/topic [remote rejected] (failed) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (ng message, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ng refs/for/master/topic error msg" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic +test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ng refs/for/master/topic error msg + To <URL/of/upstream.git> + ! HEAD:refs/for/master/topic [remote rejected] (error msg) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0022-report-unexpect-ref.sh b/third_party/git/t/t5411/test-0022-report-unexpect-ref.sh new file mode 100644 index 0000000000..92a415b929 --- /dev/null +++ b/third_party/git/t/t5411/test-0022-report-unexpect-ref.sh @@ -0,0 +1,45 @@ +test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/heads/master" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : (B) refs/for/master/topic +test_expect_success "proc-receive: report unexpected ref ($PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + $B:refs/heads/master \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/heads/master + remote: error: proc-receive reported status on unexpected ref: refs/heads/master + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + To <URL/of/upstream.git> + <OID-A>..<OID-B> <COMMIT-B> -> master + ! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/master + EOF + test_cmp expect actual +' + +# Refs of upstream : master(B) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL)" ' + git -C "$upstream" update-ref refs/heads/master $A +' diff --git a/third_party/git/t/t5411/test-0023-report-unexpect-ref--porcelain.sh b/third_party/git/t/t5411/test-0023-report-unexpect-ref--porcelain.sh new file mode 100644 index 0000000000..acbf93e40a --- /dev/null +++ b/third_party/git/t/t5411/test-0023-report-unexpect-ref--porcelain.sh @@ -0,0 +1,46 @@ +test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/heads/master" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : (B) refs/for/master/topic +test_expect_success "proc-receive: report unexpected ref ($PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain origin \ + $B:refs/heads/master \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/heads/master + remote: error: proc-receive reported status on unexpected ref: refs/heads/master + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + To <URL/of/upstream.git> + <COMMIT-B>:refs/heads/master <OID-A>..<OID-B> + ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/master + EOF + test_cmp expect actual +' + +# Refs of upstream : master(B) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL/porcelain)" ' + git -C "$upstream" update-ref refs/heads/master $A +' diff --git a/third_party/git/t/t5411/test-0024-report-unknown-ref.sh b/third_party/git/t/t5411/test-0024-report-unknown-ref.sh new file mode 100644 index 0000000000..c3946f329a --- /dev/null +++ b/third_party/git/t/t5411/test-0024-report-unknown-ref.sh @@ -0,0 +1,34 @@ +test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/a/b/c/my/topic +test_expect_success "proc-receive: report unknown reference ($PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + HEAD:refs/for/a/b/c/my/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic + remote: proc-receive> ok refs/for/master/topic + remote: error: proc-receive reported status on unknown ref: refs/for/master/topic + To <URL/of/upstream.git> + ! [remote rejected] HEAD -> refs/for/a/b/c/my/topic (proc-receive failed to report status) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0025-report-unknown-ref--porcelain.sh b/third_party/git/t/t5411/test-0025-report-unknown-ref--porcelain.sh new file mode 100644 index 0000000000..d093b1a579 --- /dev/null +++ b/third_party/git/t/t5411/test-0025-report-unknown-ref--porcelain.sh @@ -0,0 +1,35 @@ +test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/a/b/c/my/topic +test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain origin \ + HEAD:refs/for/a/b/c/my/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic + remote: proc-receive> ok refs/for/master/topic + remote: error: proc-receive reported status on unknown ref: refs/for/master/topic + To <URL/of/upstream.git> + ! HEAD:refs/for/a/b/c/my/topic [remote rejected] (proc-receive failed to report status) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0026-push-options.sh b/third_party/git/t/t5411/test-0026-push-options.sh new file mode 100644 index 0000000000..d0c4da8b23 --- /dev/null +++ b/third_party/git/t/t5411/test-0026-push-options.sh @@ -0,0 +1,79 @@ +test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL)" ' + git -C "$upstream" config receive.advertisePushOptions false && + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push -o ... : refs/for/master/topic +test_expect_success "proc-receive: not support push options ($PROTOCOL)" ' + test_must_fail git -C workbench push \ + -o issue=123 \ + -o reviewer=user1 \ + origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + test_i18ngrep "fatal: the receiving end does not support push options" \ + actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "enable push options ($PROTOCOL)" ' + git -C "$upstream" config receive.advertisePushOptions true +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push -o ... : next(A) refs/for/master/topic +test_expect_success "proc-receive: push with options ($PROTOCOL)" ' + git -C workbench push \ + --atomic \ + -o issue=123 \ + -o reviewer=user1 \ + origin \ + HEAD:refs/heads/next \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive: atomic push_options + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive< issue=123 + remote: proc-receive< reviewer=user1 + remote: proc-receive> ok refs/for/master/topic + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + To <URL/of/upstream.git> + * [new branch] HEAD -> next + * [new reference] HEAD -> refs/for/master/topic + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) next(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL)" ' + git -C "$upstream" update-ref -d refs/heads/next +' diff --git a/third_party/git/t/t5411/test-0027-push-options--porcelain.sh b/third_party/git/t/t5411/test-0027-push-options--porcelain.sh new file mode 100644 index 0000000000..c89a1e7c57 --- /dev/null +++ b/third_party/git/t/t5411/test-0027-push-options--porcelain.sh @@ -0,0 +1,82 @@ +test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL/porcelain)" ' + git -C "$upstream" config receive.advertisePushOptions false && + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push -o ... : refs/for/master/topic +test_expect_success "proc-receive: not support push options ($PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push \ + --porcelain \ + -o issue=123 \ + -o reviewer=user1 \ + origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + test_i18ngrep "fatal: the receiving end does not support push options" \ + actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "enable push options ($PROTOCOL/porcelain)" ' + git -C "$upstream" config receive.advertisePushOptions true +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push -o ... : next(A) refs/for/master/topic +test_expect_success "proc-receive: push with options ($PROTOCOL/porcelain)" ' + git -C workbench push \ + --porcelain \ + --atomic \ + -o issue=123 \ + -o reviewer=user1 \ + origin \ + HEAD:refs/heads/next \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive: atomic push_options + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive< issue=123 + remote: proc-receive< reviewer=user1 + remote: proc-receive> ok refs/for/master/topic + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + To <URL/of/upstream.git> + * HEAD:refs/heads/next [new branch] + * HEAD:refs/for/master/topic [new reference] + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) next(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL/porcelain)" ' + git -C "$upstream" update-ref -d refs/heads/next +' diff --git a/third_party/git/t/t5411/test-0030-report-ok.sh b/third_party/git/t/t5411/test-0030-report-ok.sh new file mode 100644 index 0000000000..44c99d3831 --- /dev/null +++ b/third_party/git/t/t5411/test-0030-report-ok.sh @@ -0,0 +1,35 @@ +test_expect_success "setup proc-receive hook (ok, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic +test_expect_success "proc-receive: ok ($PROTOCOL)" ' + git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + To <URL/of/upstream.git> + * [new reference] HEAD -> refs/for/master/topic + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0031-report-ok--porcelain.sh b/third_party/git/t/t5411/test-0031-report-ok--porcelain.sh new file mode 100644 index 0000000000..3223b26184 --- /dev/null +++ b/third_party/git/t/t5411/test-0031-report-ok--porcelain.sh @@ -0,0 +1,36 @@ +test_expect_success "setup proc-receive hook (ok, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic +test_expect_success "proc-receive: ok ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + To <URL/of/upstream.git> + * HEAD:refs/for/master/topic [new reference] + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0032-report-with-options.sh b/third_party/git/t/t5411/test-0032-report-with-options.sh new file mode 100644 index 0000000000..b77b78c49f --- /dev/null +++ b/third_party/git/t/t5411/test-0032-report-with-options.sh @@ -0,0 +1,256 @@ +test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "option refname refs/pull/123/head" \ + -r "option old-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report option without matching ok ($PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> option refname refs/pull/123/head + remote: proc-receive> option old-oid <COMMIT-B> + remote: error: proc-receive reported "option" without a matching "ok/ng" directive + To <URL/of/upstream.git> + ! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (option refname, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/pull/123/head" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report option refname ($PROTOCOL)" ' + git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/pull/123/head + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head + To <URL/of/upstream.git> + * [new reference] HEAD -> refs/pull/123/head + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (option refname and forced-update, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/pull/123/head" \ + -r "option forced-update" + EOF +' +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report option refname and forced-update ($PROTOCOL)" ' + git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/pull/123/head + remote: proc-receive> option forced-update + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head + To <URL/of/upstream.git> + * [new reference] HEAD -> refs/pull/123/head + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/pull/123/head" \ + -r "option old-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL)" ' + git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/pull/123/head + remote: proc-receive> option old-oid <COMMIT-B> + remote: # post-receive hook + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/123/head + To <URL/of/upstream.git> + <OID-B>..<OID-A> HEAD -> refs/pull/123/head + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option old-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report option old-oid ($PROTOCOL)" ' + git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option old-oid <COMMIT-B> + remote: # post-receive hook + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/master/topic + To <URL/of/upstream.git> + <OID-B>..<OID-A> HEAD -> refs/for/master/topic + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option old-oid $A" \ + -r "option new-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL)" ' + git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic + To <URL/of/upstream.git> + <OID-A>..<OID-B> HEAD -> refs/for/master/topic + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/a/b/c/topic" \ + -r "ok refs/for/next/topic" \ + -r "option refname refs/pull/123/head" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/pull/124/head" \ + -r "option old-oid $B" \ + -r "option forced-update" \ + -r "option new-oid $A" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL)" ' + git -C workbench push origin \ + HEAD:refs/for/next/topic \ + HEAD:refs/for/a/b/c/topic \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/a/b/c/topic + remote: proc-receive> ok refs/for/next/topic + remote: proc-receive> option refname refs/pull/123/head + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/pull/124/head + remote: proc-receive> option old-oid <COMMIT-B> + remote: proc-receive> option forced-update + remote: proc-receive> option new-oid <COMMIT-A> + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head + To <URL/of/upstream.git> + * [new reference] HEAD -> refs/pull/123/head + * [new reference] HEAD -> refs/for/a/b/c/topic + + <OID-B>...<OID-A> HEAD -> refs/pull/124/head (forced update) + EOF + test_cmp expect actual && + + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0033-report-with-options--porcelain.sh b/third_party/git/t/t5411/test-0033-report-with-options--porcelain.sh new file mode 100644 index 0000000000..1fe352b686 --- /dev/null +++ b/third_party/git/t/t5411/test-0033-report-with-options--porcelain.sh @@ -0,0 +1,265 @@ +test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "option refname refs/pull/123/head" \ + -r "option old-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report option without matching ok ($PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> option refname refs/pull/123/head + remote: proc-receive> option old-oid <COMMIT-B> + remote: error: proc-receive reported "option" without a matching "ok/ng" directive + To <URL/of/upstream.git> + ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) + Done + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (option refname, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/pull/123/head" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report option refname ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/pull/123/head + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head + To <URL/of/upstream.git> + * HEAD:refs/pull/123/head [new reference] + Done + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (option refname and forced-update, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/pull/123/head" \ + -r "option forced-update" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report option refname and forced-update ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/pull/123/head + remote: proc-receive> option forced-update + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head + To <URL/of/upstream.git> + * HEAD:refs/pull/123/head [new reference] + Done + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/pull/123/head" \ + -r "option old-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/pull/123/head + remote: proc-receive> option old-oid <COMMIT-B> + remote: # post-receive hook + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/123/head + To <URL/of/upstream.git> + HEAD:refs/pull/123/head <OID-B>..<OID-A> + Done + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option old-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report option old-oid ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option old-oid <COMMIT-B> + remote: # post-receive hook + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/master/topic + To <URL/of/upstream.git> + HEAD:refs/for/master/topic <OID-B>..<OID-A> + Done + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option old-oid $A" \ + -r "option new-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic + To <URL/of/upstream.git> + HEAD:refs/for/master/topic <OID-A>..<OID-B> + Done + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/a/b/c/topic" \ + -r "ok refs/for/next/topic" \ + -r "option refname refs/pull/123/head" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/pull/124/head" \ + -r "option old-oid $B" \ + -r "option forced-update" \ + -r "option new-oid $A" + + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain origin \ + HEAD:refs/for/next/topic \ + HEAD:refs/for/a/b/c/topic \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/a/b/c/topic + remote: proc-receive> ok refs/for/next/topic + remote: proc-receive> option refname refs/pull/123/head + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/pull/124/head + remote: proc-receive> option old-oid <COMMIT-B> + remote: proc-receive> option forced-update + remote: proc-receive> option new-oid <COMMIT-A> + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head + To <URL/of/upstream.git> + * HEAD:refs/pull/123/head [new reference] + * HEAD:refs/for/a/b/c/topic [new reference] + + HEAD:refs/pull/124/head <OID-B>...<OID-A> (forced update) + Done + EOF + test_cmp expect actual && + + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0034-report-ft.sh b/third_party/git/t/t5411/test-0034-report-ft.sh new file mode 100644 index 0000000000..aca2b0676c --- /dev/null +++ b/third_party/git/t/t5411/test-0034-report-ft.sh @@ -0,0 +1,44 @@ +test_expect_success "setup proc-receive hook (ft, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option fall-through" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic(B) +test_expect_success "proc-receive: fall throught, let receive-pack to execute ($PROTOCOL)" ' + git -C workbench push origin \ + $B:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-B> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-B> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option fall-through + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-B> refs/for/master/topic + To <URL/of/upstream.git> + * [new reference] <COMMIT-B> -> refs/for/master/topic + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/for/master/topic + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) refs/for/master/topic(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL)" ' + git -C "$upstream" update-ref -d refs/for/master/topic +' diff --git a/third_party/git/t/t5411/test-0035-report-ft--porcelain.sh b/third_party/git/t/t5411/test-0035-report-ft--porcelain.sh new file mode 100644 index 0000000000..30ffffb352 --- /dev/null +++ b/third_party/git/t/t5411/test-0035-report-ft--porcelain.sh @@ -0,0 +1,45 @@ +test_expect_success "setup proc-receive hook (fall-through, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option fall-through" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic(B) +test_expect_success "proc-receive: fall throught, let receive-pack to execute ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain origin \ + $B:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-B> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-B> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option fall-through + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-B> refs/for/master/topic + To <URL/of/upstream.git> + * <COMMIT-B>:refs/for/master/topic [new reference] + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/for/master/topic + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) refs/for/master/topic(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL/porcelain)" ' + git -C "$upstream" update-ref -d refs/for/master/topic +' diff --git a/third_party/git/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh b/third_party/git/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh new file mode 100644 index 0000000000..73283d81e8 --- /dev/null +++ b/third_party/git/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh @@ -0,0 +1,227 @@ +test_expect_success "setup git config for remote-tracking of special refs" ' + ( + cd workbench && + if ! git config --get-all remote.origin.fetch | grep refs/for/ + then + git config --add remote.origin.fetch \ + "+refs/for/*:refs/t/for/*" && + git config --add remote.origin.fetch \ + "+refs/pull/*:refs/t/pull/*" && + git config --add remote.origin.fetch \ + "+refs/changes/*:refs/t/changes/*" + fi + ) +' + +test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option old-oid $A" \ + -r "option new-oid $B" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/changes/24/124/1" \ + -r "option old-oid $ZERO_OID" \ + -r "option new-oid $A" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/changes/25/125/1" \ + -r "option old-oid $A" \ + -r "option new-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic(A) +test_expect_success "proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite ($PROTOCOL)" ' + git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/changes/24/124/1 + remote: proc-receive> option old-oid <ZERO-OID> + remote: proc-receive> option new-oid <COMMIT-A> + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/changes/25/125/1 + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1 + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/25/125/1 + To <URL/of/upstream.git> + <OID-A>..<OID-B> HEAD -> refs/for/master/topic + * [new reference] HEAD -> refs/changes/24/124/1 + <OID-A>..<OID-B> HEAD -> refs/changes/25/125/1 + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "proc-receive: check remote-tracking #1 ($PROTOCOL)" ' + git -C workbench show-ref | + grep -v -e refs/remotes -e refs/heads -e refs/tags >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/t/changes/24/124/1 + <COMMIT-B> refs/t/changes/25/125/1 + <COMMIT-B> refs/t/for/master/topic + EOF + test_cmp expect actual && + git -C workbench update-ref -d refs/t/for/master/topic && + git -C workbench update-ref -d refs/t/changes/24/124/1 && + git -C workbench update-ref -d refs/t/changes/25/125/1 +' + +test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/changes/24/124/1" \ + -r "option old-oid $ZERO_OID" \ + -r "option new-oid $A" \ + -r "ok refs/for/master/topic" \ + -r "option old-oid $A" \ + -r "option new-oid $B" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/changes/25/125/1" \ + -r "option old-oid $B" \ + -r "option new-oid $A" \ + -r "option forced-update" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic(A) +test_expect_success "proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite ($PROTOCOL)" ' + git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/changes/24/124/1 + remote: proc-receive> option old-oid <ZERO-OID> + remote: proc-receive> option new-oid <COMMIT-A> + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/changes/25/125/1 + remote: proc-receive> option old-oid <COMMIT-B> + remote: proc-receive> option new-oid <COMMIT-A> + remote: proc-receive> option forced-update + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1 + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/changes/25/125/1 + To <URL/of/upstream.git> + * [new reference] HEAD -> refs/changes/24/124/1 + <OID-A>..<OID-B> HEAD -> refs/for/master/topic + + <OID-B>...<OID-A> HEAD -> refs/changes/25/125/1 (forced update) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "proc-receive: check remote-tracking #2 ($PROTOCOL)" ' + git -C workbench show-ref | + grep -v -e refs/remotes -e refs/heads -e refs/tags >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/t/changes/24/124/1 + <COMMIT-A> refs/t/changes/25/125/1 + <COMMIT-B> refs/t/for/master/topic + EOF + test_cmp expect actual && + git -C workbench update-ref -d refs/t/for/master/topic && + git -C workbench update-ref -d refs/t/changes/24/124/1 && + git -C workbench update-ref -d refs/t/changes/25/125/1 +' + +test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/changes/23/123/1" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/changes/24/124/2" \ + -r "option old-oid $A" \ + -r "option new-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic(A) +test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL)" ' + git -C workbench push origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/changes/23/123/1 + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/changes/24/124/2 + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/23/123/1 + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/24/124/2 + To <URL/of/upstream.git> + * [new reference] HEAD -> refs/changes/23/123/1 + <OID-A>..<OID-B> HEAD -> refs/changes/24/124/2 + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "proc-receive: check remote-tracking #3 ($PROTOCOL)" ' + git -C workbench show-ref | + grep -v -e refs/remotes -e refs/heads -e refs/tags >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/t/changes/23/123/1 + <COMMIT-B> refs/t/changes/24/124/2 + EOF + test_cmp expect actual && + git -C workbench update-ref -d refs/t/changes/24/124/1 && + git -C workbench update-ref -d refs/t/changes/25/125/2 +' diff --git a/third_party/git/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh b/third_party/git/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh new file mode 100644 index 0000000000..77b5b22ed4 --- /dev/null +++ b/third_party/git/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh @@ -0,0 +1,172 @@ +test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option old-oid $A" \ + -r "option new-oid $B" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/changes/24/124/1" \ + -r "option old-oid $ZERO_OID" \ + -r "option new-oid $A" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/changes/25/125/1" \ + -r "option old-oid $A" \ + -r "option new-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic(A) +test_expect_success "proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/changes/24/124/1 + remote: proc-receive> option old-oid <ZERO-OID> + remote: proc-receive> option new-oid <COMMIT-A> + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/changes/25/125/1 + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1 + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/25/125/1 + To <URL/of/upstream.git> + HEAD:refs/for/master/topic <OID-A>..<OID-B> + * HEAD:refs/changes/24/124/1 [new reference] + HEAD:refs/changes/25/125/1 <OID-A>..<OID-B> + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/changes/24/124/1" \ + -r "option old-oid $ZERO_OID" \ + -r "option new-oid $A" \ + -r "ok refs/for/master/topic" \ + -r "option old-oid $A" \ + -r "option new-oid $B" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/changes/25/125/1" \ + -r "option old-oid $B" \ + -r "option new-oid $A" \ + -r "option forced-update" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic(A) +test_expect_success "proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/changes/24/124/1 + remote: proc-receive> option old-oid <ZERO-OID> + remote: proc-receive> option new-oid <COMMIT-A> + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/changes/25/125/1 + remote: proc-receive> option old-oid <COMMIT-B> + remote: proc-receive> option new-oid <COMMIT-A> + remote: proc-receive> option forced-update + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1 + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/changes/25/125/1 + To <URL/of/upstream.git> + * HEAD:refs/changes/24/124/1 [new reference] + HEAD:refs/for/master/topic <OID-A>..<OID-B> + + HEAD:refs/changes/25/125/1 <OID-B>...<OID-A> (forced update) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/changes/23/123/1" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/changes/24/124/2" \ + -r "option old-oid $A" \ + -r "option new-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : refs/for/master/topic(A) +test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain origin \ + HEAD:refs/for/master/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/changes/23/123/1 + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/changes/24/124/2 + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: # post-receive hook + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/23/123/1 + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/24/124/2 + To <URL/of/upstream.git> + * HEAD:refs/changes/23/123/1 [new reference] + HEAD:refs/changes/24/124/2 <OID-A>..<OID-B> + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5411/test-0038-report-mixed-refs.sh b/third_party/git/t/t5411/test-0038-report-mixed-refs.sh new file mode 100644 index 0000000000..a74a2cb449 --- /dev/null +++ b/third_party/git/t/t5411/test-0038-report-mixed-refs.sh @@ -0,0 +1,89 @@ +test_expect_success "setup proc-receive hook ($PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/next/topic2" \ + -r "ng refs/for/next/topic1 fail to call Web API" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/for/master/topic" \ + -r "option old-oid $A" \ + -r "option new-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : (B) bar(A) baz(A) refs/for/next/topic(A) foo(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL)" ' + test_must_fail git -C workbench push origin \ + $B:refs/heads/master \ + HEAD:refs/heads/bar \ + HEAD:refs/heads/baz \ + HEAD:refs/for/next/topic2 \ + HEAD:refs/for/next/topic1 \ + HEAD:refs/heads/foo \ + HEAD:refs/for/master/topic \ + HEAD:refs/for/next/topic3 \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2 + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1 + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3 + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2 + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1 + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3 + remote: proc-receive> ok refs/for/next/topic2 + remote: proc-receive> ng refs/for/next/topic1 fail to call Web API + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/for/master/topic + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2 + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic + To <URL/of/upstream.git> + <OID-A>..<OID-B> <COMMIT-B> -> master + * [new branch] HEAD -> bar + * [new branch] HEAD -> baz + * [new reference] HEAD -> refs/for/next/topic2 + * [new branch] HEAD -> foo + <OID-A>..<OID-B> HEAD -> refs/for/master/topic + ! [remote rejected] HEAD -> refs/for/next/topic1 (fail to call Web API) + ! [remote rejected] HEAD -> refs/for/next/topic3 (proc-receive failed to report status) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/bar + <COMMIT-A> refs/heads/baz + <COMMIT-A> refs/heads/foo + <COMMIT-B> refs/heads/master + EOF + test_cmp expect actual +' + +# Refs of upstream : master(B) foo(A) bar(A)) baz(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL)" ' + ( + cd "$upstream" && + git update-ref refs/heads/master $A && + git update-ref -d refs/heads/foo && + git update-ref -d refs/heads/bar && + git update-ref -d refs/heads/baz + ) +' diff --git a/third_party/git/t/t5411/test-0039-report-mixed-refs--porcelain.sh b/third_party/git/t/t5411/test-0039-report-mixed-refs--porcelain.sh new file mode 100644 index 0000000000..e4baa13ea3 --- /dev/null +++ b/third_party/git/t/t5411/test-0039-report-mixed-refs--porcelain.sh @@ -0,0 +1,91 @@ +test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/for/next/topic2" \ + -r "ng refs/for/next/topic1 fail to call Web API" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/for/master/topic" \ + -r "option old-oid $A" \ + -r "option new-oid $B" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : (B) bar(A) baz(A) refs/for/next/topic(A) foo(A) refs/for/master/topic(A) +test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL/porcelain)" ' + test_must_fail git -C workbench push --porcelain origin \ + $B:refs/heads/master \ + HEAD:refs/heads/bar \ + HEAD:refs/heads/baz \ + HEAD:refs/for/next/topic2 \ + HEAD:refs/for/next/topic1 \ + HEAD:refs/heads/foo \ + HEAD:refs/for/master/topic \ + HEAD:refs/for/next/topic3 \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2 + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1 + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3 + remote: # proc-receive hook + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2 + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1 + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3 + remote: proc-receive> ok refs/for/next/topic2 + remote: proc-receive> ng refs/for/next/topic1 fail to call Web API + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/for/master/topic + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2 + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic + To <URL/of/upstream.git> + <COMMIT-B>:refs/heads/master <OID-A>..<OID-B> + * HEAD:refs/heads/bar [new branch] + * HEAD:refs/heads/baz [new branch] + * HEAD:refs/for/next/topic2 [new reference] + * HEAD:refs/heads/foo [new branch] + HEAD:refs/for/master/topic <OID-A>..<OID-B> + ! HEAD:refs/for/next/topic1 [remote rejected] (fail to call Web API) + ! HEAD:refs/for/next/topic3 [remote rejected] (proc-receive failed to report status) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/bar + <COMMIT-A> refs/heads/baz + <COMMIT-A> refs/heads/foo + <COMMIT-B> refs/heads/master + EOF + test_cmp expect actual +' + +# Refs of upstream : master(B) foo(A) bar(A)) baz(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL/porcelain)" ' + ( + cd "$upstream" && + git update-ref refs/heads/master $A && + git update-ref -d refs/heads/foo && + git update-ref -d refs/heads/bar && + git update-ref -d refs/heads/baz + ) + +' diff --git a/third_party/git/t/t5411/test-0040-process-all-refs.sh b/third_party/git/t/t5411/test-0040-process-all-refs.sh new file mode 100644 index 0000000000..b07c999f53 --- /dev/null +++ b/third_party/git/t/t5411/test-0040-process-all-refs.sh @@ -0,0 +1,113 @@ +test_expect_success "config receive.procReceiveRefs = refs ($PROTOCOL)" ' + git -C "$upstream" config --unset-all receive.procReceiveRefs && + git -C "$upstream" config --add receive.procReceiveRefs refs +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "setup upstream branches ($PROTOCOL)" ' + ( + cd "$upstream" && + git update-ref refs/heads/master $B && + git update-ref refs/heads/foo $A && + git update-ref refs/heads/bar $A && + git update-ref refs/heads/baz $A + ) + +' + +test_expect_success "setup proc-receive hook ($PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/heads/master" \ + -r "option fall-through" \ + -r "ok refs/heads/foo" \ + -r "option fall-through" \ + -r "ok refs/heads/bar" \ + -r "option fall-through" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/pull/123/head" \ + -r "option old-oid $A" \ + -r "option new-oid $B" \ + -r "ok refs/for/next/topic" \ + -r "option refname refs/pull/124/head" \ + -r "option old-oid $B" \ + -r "option new-oid $A" \ + -r "option forced-update" + EOF +' + +# Refs of upstream : master(B) foo(A) bar(A)) baz(A) +# Refs of workbench: master(A) tags/v123 +# git push -f : master(A) (NULL) (B) refs/for/master/topic(A) refs/for/next/topic(A) +test_expect_success "proc-receive: process all refs ($PROTOCOL)" ' + git -C workbench push -f origin \ + HEAD:refs/heads/master \ + :refs/heads/foo \ + $B:refs/heads/bar \ + HEAD:refs/for/master/topic \ + HEAD:refs/for/next/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar + remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo + remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/master + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic + remote: # proc-receive hook + remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar + remote: proc-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo + remote: proc-receive< <COMMIT-B> <COMMIT-A> refs/heads/master + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic + remote: proc-receive> ok refs/heads/master + remote: proc-receive> option fall-through + remote: proc-receive> ok refs/heads/foo + remote: proc-receive> option fall-through + remote: proc-receive> ok refs/heads/bar + remote: proc-receive> option fall-through + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/pull/123/head + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: proc-receive> ok refs/for/next/topic + remote: proc-receive> option refname refs/pull/124/head + remote: proc-receive> option old-oid <COMMIT-B> + remote: proc-receive> option new-oid <COMMIT-A> + remote: proc-receive> option forced-update + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar + remote: post-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/master + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/pull/123/head + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head + To <URL/of/upstream.git> + <OID-A>..<OID-B> <COMMIT-B> -> bar + - [deleted] foo + + <OID-B>...<OID-A> HEAD -> master (forced update) + <OID-A>..<OID-B> HEAD -> refs/pull/123/head + + <OID-B>...<OID-A> HEAD -> refs/pull/124/head (forced update) + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/bar + <COMMIT-A> refs/heads/baz + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) bar(A) baz(B) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL)" ' + ( + cd "$upstream" && + git update-ref -d refs/heads/bar && + git update-ref -d refs/heads/baz + ) +' diff --git a/third_party/git/t/t5411/test-0041-process-all-refs--porcelain.sh b/third_party/git/t/t5411/test-0041-process-all-refs--porcelain.sh new file mode 100644 index 0000000000..0dd9824616 --- /dev/null +++ b/third_party/git/t/t5411/test-0041-process-all-refs--porcelain.sh @@ -0,0 +1,114 @@ +test_expect_success "config receive.procReceiveRefs = refs ($PROTOCOL/porcelain)" ' + git -C "$upstream" config --unset-all receive.procReceiveRefs && + git -C "$upstream" config --add receive.procReceiveRefs refs +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "setup upstream branches ($PROTOCOL/porcelain)" ' + ( + cd "$upstream" && + git update-ref refs/heads/master $B && + git update-ref refs/heads/foo $A && + git update-ref refs/heads/bar $A && + git update-ref refs/heads/baz $A + ) + +' + +test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/heads/master" \ + -r "option fall-through" \ + -r "ok refs/heads/foo" \ + -r "option fall-through" \ + -r "ok refs/heads/bar" \ + -r "option fall-through" \ + -r "ok refs/for/master/topic" \ + -r "option refname refs/pull/123/head" \ + -r "option old-oid $A" \ + -r "option new-oid $B" \ + -r "ok refs/for/next/topic" \ + -r "option refname refs/pull/124/head" \ + -r "option old-oid $B" \ + -r "option new-oid $A" \ + -r "option forced-update" + EOF +' + +# Refs of upstream : master(B) foo(A) bar(A)) baz(A) +# Refs of workbench: master(A) tags/v123 +# git push -f : master(A) (NULL) (B) refs/for/master/topic(A) refs/for/next/topic(A) +test_expect_success "proc-receive: process all refs ($PROTOCOL/porcelain)" ' + git -C workbench push --porcelain -f origin \ + HEAD:refs/heads/master \ + :refs/heads/foo \ + $B:refs/heads/bar \ + HEAD:refs/for/master/topic \ + HEAD:refs/for/next/topic \ + >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar + remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo + remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/master + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic + remote: # proc-receive hook + remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar + remote: proc-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo + remote: proc-receive< <COMMIT-B> <COMMIT-A> refs/heads/master + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic + remote: proc-receive> ok refs/heads/master + remote: proc-receive> option fall-through + remote: proc-receive> ok refs/heads/foo + remote: proc-receive> option fall-through + remote: proc-receive> ok refs/heads/bar + remote: proc-receive> option fall-through + remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> option refname refs/pull/123/head + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: proc-receive> ok refs/for/next/topic + remote: proc-receive> option refname refs/pull/124/head + remote: proc-receive> option old-oid <COMMIT-B> + remote: proc-receive> option new-oid <COMMIT-A> + remote: proc-receive> option forced-update + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar + remote: post-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/master + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/pull/123/head + remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head + To <URL/of/upstream.git> + <COMMIT-B>:refs/heads/bar <OID-A>..<OID-B> + - :refs/heads/foo [deleted] + + HEAD:refs/heads/master <OID-B>...<OID-A> (forced update) + HEAD:refs/pull/123/head <OID-A>..<OID-B> + + HEAD:refs/pull/124/head <OID-B>...<OID-A> (forced update) + Done + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/bar + <COMMIT-A> refs/heads/baz + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) bar(A) baz(B) +# Refs of workbench: master(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL/porcelain)" ' + ( + cd "$upstream" && + git update-ref -d refs/heads/bar && + git update-ref -d refs/heads/baz + ) +' diff --git a/third_party/git/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh b/third_party/git/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh new file mode 100644 index 0000000000..c22849cbe2 --- /dev/null +++ b/third_party/git/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh @@ -0,0 +1,135 @@ +test_expect_success "config receive.procReceiveRefs with modifiers ($PROTOCOL)" ' + ( + cd "$upstream" && + git config --unset-all receive.procReceiveRefs && + git config --add receive.procReceiveRefs m:refs/heads/master && + git config --add receive.procReceiveRefs ad:refs/heads && + git config --add receive.procReceiveRefs "a!:refs/heads" + ) +' + +test_expect_success "setup proc-receive hook ($PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/heads/master" \ + -r "option refname refs/pull/123/head" \ + -r "option old-oid $A" \ + -r "option new-oid $B" \ + -r "ok refs/tags/v123 " \ + -r "option refname refs/pull/124/head" + EOF +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +# git push : master(B) tags/v123 +test_expect_success "proc-receive: update branch and new tag ($PROTOCOL)" ' + git -C workbench push origin \ + $B:refs/heads/master \ + v123 >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123 + remote: # proc-receive hook + remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/master + remote: proc-receive< <ZERO-OID> <TAG-v123> refs/tags/v123 + remote: proc-receive> ok refs/heads/master + remote: proc-receive> option refname refs/pull/123/head + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <COMMIT-B> + remote: proc-receive> ok refs/tags/v123 + remote: proc-receive> option refname refs/pull/124/head + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/pull/123/head + remote: post-receive< <ZERO-OID> <TAG-v123> refs/pull/124/head + To <URL/of/upstream.git> + <OID-A>..<OID-B> <COMMIT-B> -> refs/pull/123/head + * [new reference] v123 -> refs/pull/124/head + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + EOF + test_cmp expect actual +' + +# Refs of upstream : master(A) +# Refs of workbench: master(A) tags/v123 +test_expect_success "setup upstream: create tags/v123 ($PROTOCOL)" ' + git -C "$upstream" update-ref refs/heads/topic $A && + git -C "$upstream" update-ref refs/tags/v123 $TAG && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + <COMMIT-A> refs/heads/topic + <TAG-v123> refs/tags/v123 + EOF + test_cmp expect actual +' + +test_expect_success "setup proc-receive hook ($PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + -r "ok refs/heads/master" \ + -r "option refname refs/pull/123/head" \ + -r "option old-oid $A" \ + -r "option new-oid $ZERO_OID" \ + -r "ok refs/heads/next" \ + -r "option refname refs/pull/124/head" \ + -r "option new-oid $A" + EOF +' + +# Refs of upstream : master(A) topic(A) tags/v123 +# Refs of workbench: master(A) tags/v123 +# git push : NULL topic(B) NULL next(A) +test_expect_success "proc-receive: create/delete branch, and delete tag ($PROTOCOL)" ' + git -C workbench push origin \ + :refs/heads/master \ + $B:refs/heads/topic \ + $A:refs/heads/next \ + :refs/tags/v123 >out 2>&1 && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + remote: # pre-receive hook + remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/master + remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/topic + remote: pre-receive< <TAG-v123> <ZERO-OID> refs/tags/v123 + remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: # proc-receive hook + remote: proc-receive< <COMMIT-A> <ZERO-OID> refs/heads/master + remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/heads/next + remote: proc-receive> ok refs/heads/master + remote: proc-receive> option refname refs/pull/123/head + remote: proc-receive> option old-oid <COMMIT-A> + remote: proc-receive> option new-oid <ZERO-OID> + remote: proc-receive> ok refs/heads/next + remote: proc-receive> option refname refs/pull/124/head + remote: proc-receive> option new-oid <COMMIT-A> + remote: # post-receive hook + remote: post-receive< <COMMIT-A> <ZERO-OID> refs/pull/123/head + remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/topic + remote: post-receive< <TAG-v123> <ZERO-OID> refs/tags/v123 + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/124/head + To <URL/of/upstream.git> + - [deleted] refs/pull/123/head + <OID-A>..<OID-B> <COMMIT-B> -> topic + - [deleted] v123 + * [new reference] <COMMIT-A> -> refs/pull/124/head + EOF + test_cmp expect actual && + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-A> refs/heads/master + <COMMIT-B> refs/heads/topic + EOF + test_cmp expect actual +' diff --git a/third_party/git/t/t5500-fetch-pack.sh b/third_party/git/t/t5500-fetch-pack.sh index 1c71c0ec77..3557374312 100755 --- a/third_party/git/t/t5500-fetch-pack.sh +++ b/third_party/git/t/t5500-fetch-pack.sh @@ -385,6 +385,54 @@ test_expect_success 'clone shallow with packed refs' ' test_cmp count8.expected count8.actual ' +test_expect_success 'in_vain not triggered before first ACK' ' + rm -rf myserver myclient && + git init myserver && + test_commit -C myserver foo && + git clone "file://$(pwd)/myserver" myclient && + + # MAX_IN_VAIN is 256. Because of batching, the client will send 496 + # (16+32+64+128+256) commits, not 256, before giving up. So create 496 + # irrelevant commits. + test_commit_bulk -C myclient 496 && + + # The new commit that the client wants to fetch. + test_commit -C myserver bar && + + git -C myclient fetch --progress origin 2>log && + test_i18ngrep "remote: Total 3 " log +' + +test_expect_success 'in_vain resetted upon ACK' ' + rm -rf myserver myclient && + git init myserver && + + # Linked list of commits on master. The first is common; the rest are + # not. + test_commit -C myserver first_master_commit && + git clone "file://$(pwd)/myserver" myclient && + test_commit_bulk -C myclient 255 && + + # Another linked list of commits on anotherbranch with no connection to + # master. The first is common; the rest are not. + git -C myserver checkout --orphan anotherbranch && + test_commit -C myserver first_anotherbranch_commit && + git -C myclient fetch origin anotherbranch:refs/heads/anotherbranch && + git -C myclient checkout anotherbranch && + test_commit_bulk -C myclient 255 && + + # The new commit that the client wants to fetch. + git -C myserver checkout master && + test_commit -C myserver to_fetch && + + # The client will send (as "have"s) all 256 commits in anotherbranch + # first. The 256th commit is common between the client and the server, + # and should reset in_vain. This allows negotiation to continue until + # the client reports that first_anotherbranch_commit is common. + git -C myclient fetch --progress origin master 2>log && + test_i18ngrep "Total 3 " log +' + test_expect_success 'fetch in shallow repo unreachable shallow objects' ' ( git clone --bare --branch B --single-branch "file://$(pwd)/." no-reflog && @@ -440,11 +488,12 @@ 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 '' 1 2 +for version in '' 0 1 2 do test_expect_success "protocol.version=$version fetch refs from cmdline" " ( @@ -638,7 +687,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= git -C client fetch-pack ../server \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 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 ' @@ -708,13 +757,22 @@ do # file with scheme for p in file do - test_expect_success "fetch-pack --diag-url $p://$h/$r" ' + test_expect_success !MINGW "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 "fetch-pack --diag-url $p://$h/~$r" ' + test_expect_success !MINGW "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 @@ -783,6 +841,45 @@ 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 + $(echo "object-format=$(test_oid algo)" | packetize) + 00010013deepen-since 1 + $(echo "want $(git rev-parse other)" | packetize) + $(echo "have $(git rev-parse master)" | packetize) + 0000 + EOF + ) +' + test_expect_success 'shallow clone exclude tag two' ' test_create_repo shallow-exclude && ( @@ -870,7 +967,10 @@ test_expect_success 'filtering by size' ' git -C client fetch-pack --filter=blob:limit=0 ../server HEAD && # Ensure that object is not inadvertently fetched - test_must_fail git -C client cat-file -e $(git hash-object server/one.t) + 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_expect_success 'filtering by size has no effect if support for it is not advertised' ' @@ -882,7 +982,10 @@ 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 - git -C client cat-file -e $(git hash-object server/one.t) && + 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_i18ngrep "filtering not recognized by server" err ' @@ -897,16 +1000,17 @@ fetch_filter_blob_limit_zero () { test_config -C "$SERVER" uploadpack.allowfilter 1 && git clone "$URL" client && - test_config -C client extensions.partialclone origin && test_commit -C "$SERVER" two && git -C client fetch --filter=blob:limit=0 origin HEAD:somewhere && # Ensure that commit is fetched, but blob is not - 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") + 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_expect_success 'fetch with --filter=blob:limit=0' ' @@ -920,4 +1024,7 @@ 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 fdfe179b11..1a16ac4c0d 100755 --- a/third_party/git/t/t5504-fetch-receive-strict.sh +++ b/third_party/git/t/t5504-fetch-receive-strict.sh @@ -64,6 +64,7 @@ test_expect_success 'fetch with transfer.fsckobjects' ' cat >exp <<EOF To dst ! refs/heads/master:refs/heads/test [remote rejected] (missing necessary objects) +Done EOF test_expect_success 'push without strict' ' @@ -144,11 +145,11 @@ test_expect_success 'fsck with no skipList input' ' test_expect_success 'setup sorted and unsorted skipLists' ' cat >SKIP.unsorted <<-EOF && - 0000000000000000000000000000000000000004 - 0000000000000000000000000000000000000002 + $(test_oid 004) + $(test_oid 002) $commit - 0000000000000000000000000000000000000001 - 0000000000000000000000000000000000000003 + $(test_oid 001) + $(test_oid 003) EOF sort SKIP.unsorted >SKIP.sorted ' @@ -172,14 +173,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 - 0000000000000000000000000000000000000001 + $(test_oid 001) 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 && - 0000000000000000000000000000000000000001 + $(test_oid 001) - 0000000000000000000000000000000000000002 + $(test_oid 002) 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 @@ -204,7 +205,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 " 0000000000000000000000000000000000000001" >>SKIP.exhaustive && + echo " $(test_oid 001)" >>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 883b32efa0..8d62edd98b 100755 --- a/third_party/git/t/t5505-remote.sh +++ b/third_party/git/t/t5505-remote.sh @@ -734,15 +734,53 @@ 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.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" ) ' @@ -784,6 +822,54 @@ 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 @@ -902,7 +988,7 @@ test_expect_success 'remote set-branches' ' +refs/heads/maint:refs/remotes/scratch/maint +refs/heads/master:refs/remotes/scratch/master +refs/heads/next:refs/remotes/scratch/next - +refs/heads/pu:refs/remotes/scratch/pu + +refs/heads/seen:refs/remotes/scratch/seen +refs/heads/t/topic:refs/remotes/scratch/t/topic EOF sort <<-\EOF >expect.setup-ffonly && @@ -912,7 +998,7 @@ test_expect_success 'remote set-branches' ' sort <<-\EOF >expect.respect-ffonly && refs/heads/master:refs/remotes/scratch/master +refs/heads/next:refs/remotes/scratch/next - +refs/heads/pu:refs/remotes/scratch/pu + +refs/heads/seen:refs/remotes/scratch/seen EOF git clone .git/ setbranches && @@ -930,7 +1016,7 @@ test_expect_success 'remote set-branches' ' git config --get-all remote.scratch.fetch >config-result && sort <config-result >../actual.replace && - git remote set-branches --add scratch pu t/topic && + git remote set-branches --add scratch seen t/topic && git config --get-all remote.scratch.fetch >config-result && sort <config-result >../actual.add-two && @@ -942,7 +1028,7 @@ test_expect_success 'remote set-branches' ' git config --get-all remote.scratch.fetch >config-result && sort <config-result >../actual.setup-ffonly && - git remote set-branches --add scratch pu && + git remote set-branches --add scratch seen && git config --get-all remote.scratch.fetch >config-result && sort <config-result >../actual.respect-ffonly ) && diff --git a/third_party/git/t/t5509-fetch-push-namespaces.sh b/third_party/git/t/t5509-fetch-push-namespaces.sh index 75cbfcc392..a67f792adf 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 pushee && + git init --bare pushee && git init puller ' @@ -152,4 +152,15 @@ 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 139f7106f7..dbc724e4c0 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 '^[0-9a-f]\{40\} ' verify.out | wc -l) + test "$2" = $(grep "^$OID_REGEX " verify.out | wc -l) } convert_bundle_to_pack () { @@ -174,6 +174,30 @@ 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" && @@ -189,7 +213,7 @@ test_expect_success 'fetch tags when there is no tags' ' test_expect_success 'fetch following tags' ' cd "$D" && - git tag -a -m 'annotated' anno HEAD && + git tag -a -m "annotated" anno HEAD && git tag light HEAD && mkdir four && @@ -257,14 +281,19 @@ test_expect_success 'create bundle 1' ' cd "$D" && echo >file updated again by origin && git commit -a -m "tip" && - git bundle create bundle1 master^..master + git bundle create --version=3 bundle1 master^..master ' test_expect_success 'header of bundle looks right' ' - head -n 1 "$D"/bundle1 | grep "^#" && - 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 "^$" + cat >expect <<-EOF && + # v3 git bundle + @object-format=$(test_oid algo) + -OID updated by origin + OID refs/heads/master + + EOF + sed -e "s/$OID_REGEX/OID/g" -e "5q" "$D"/bundle1 >actual && + test_cmp expect actual ' test_expect_success 'create bundle 2' ' @@ -289,7 +318,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 -b42-)" + test "tip" = "$(git log -1 --pretty=oneline master | cut -d" " -f2)" ' test_expect_success 'bundle does not prerequisite objects' ' @@ -306,7 +335,7 @@ test_expect_success 'bundle does not prerequisite objects' ' test_expect_success 'bundle should be able to create a full history' ' cd "$D" && - git tag -a -m '1.0' v1.0 master && + git tag -a -m "1.0" v1.0 master && git bundle create bundle4 v1.0 ' @@ -354,7 +383,6 @@ 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 ' @@ -515,10 +543,23 @@ test_expect_success 'fetch into the current branch with --update-head-ok' ' ' -test_expect_success 'fetch --dry-run' ' +test_expect_success 'fetch --dry-run does not touch FETCH_HEAD, but still prints what would be written' ' + rm -f .git/FETCH_HEAD err && + git fetch --dry-run . 2>err && + ! test -f .git/FETCH_HEAD && + grep FETCH_HEAD err +' +test_expect_success '--no-write-fetch-head does not touch FETCH_HEAD, and does not print what would be written' ' + rm -f .git/FETCH_HEAD err && + git fetch --no-write-fetch-head . 2>err && + ! test -f .git/FETCH_HEAD && + ! grep FETCH_HEAD err +' + +test_expect_success '--write-fetch-head gets defeated by --dry-run' ' rm -f .git/FETCH_HEAD && - git fetch --dry-run . && + git fetch --dry-run --write-fetch-head . && ! test -f .git/FETCH_HEAD ' @@ -570,6 +611,35 @@ 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 () { @@ -744,7 +814,7 @@ test_configured_prune true true unset unset pruned pruned \ "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*" # --prune-tags on its own does nothing, needs --prune as well, same -# for for fetch.pruneTags without fetch.prune +# for fetch.pruneTags without fetch.prune test_configured_prune unset unset unset unset kept kept "--prune-tags" test_configured_prune unset unset true unset kept kept "" test_configured_prune unset unset unset true kept kept "" @@ -866,7 +936,7 @@ test_expect_success 'fetching with auto-gc does not lock up' ' git config fetch.unpackLimit 1 && git config gc.autoPackLimit 1 && git config gc.autoDetach false && - GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 && + GIT_ASK_YESNO="$D/askyesno" git fetch --verbose >fetch.out 2>&1 && test_i18ngrep "Auto packing the repository" fetch.out && ! grep "Should I try again" fetch.out ) @@ -902,6 +972,29 @@ 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" @@ -978,27 +1071,7 @@ test_expect_success '--negotiation-tip limits "have" lines sent with HTTP protoc check_negotiation_tip ' -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 - ) -' +# 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/t5512-ls-remote.sh b/third_party/git/t/t5512-ls-remote.sh index 43e1d8d4d2..e98c3a0174 100755 --- a/third_party/git/t/t5512-ls-remote.sh +++ b/third_party/git/t/t5512-ls-remote.sh @@ -4,6 +4,14 @@ test_description='git ls-remote' . ./test-lib.sh +generate_references () { + for ref + do + oid=$(git rev-parse "$ref") && + printf '%s\t%s\n' "$oid" "$ref" || return 1 + done +} + test_expect_success setup ' >file && git add file && @@ -13,11 +21,11 @@ test_expect_success setup ' git tag mark1.1 && git tag mark1.2 && git tag mark1.10 && - git show-ref --tags -d | sed -e "s/ / /" >expected.tag && - ( - echo "$(git rev-parse HEAD) HEAD" && - git show-ref -d | sed -e "s/ / /" - ) >expected.all && + git show-ref --tags -d >expected.tag.raw && + sed -e "s/ / /" expected.tag.raw >expected.tag && + generate_references HEAD >expected.all && + git show-ref -d >refs && + sed -e "s/ / /" refs >>expected.all && git remote add self "$(pwd)/.git" ' @@ -43,34 +51,31 @@ test_expect_success 'ls-remote self' ' ' test_expect_success 'ls-remote --sort="version:refname" --tags self' ' - cat >expect <<-EOF && - $(git rev-parse mark) refs/tags/mark - $(git rev-parse mark1.1) refs/tags/mark1.1 - $(git rev-parse mark1.2) refs/tags/mark1.2 - $(git rev-parse mark1.10) refs/tags/mark1.10 - EOF + generate_references \ + refs/tags/mark \ + refs/tags/mark1.1 \ + refs/tags/mark1.2 \ + refs/tags/mark1.10 >expect && git ls-remote --sort="version:refname" --tags self >actual && test_cmp expect actual ' test_expect_success 'ls-remote --sort="-version:refname" --tags self' ' - cat >expect <<-EOF && - $(git rev-parse mark1.10) refs/tags/mark1.10 - $(git rev-parse mark1.2) refs/tags/mark1.2 - $(git rev-parse mark1.1) refs/tags/mark1.1 - $(git rev-parse mark) refs/tags/mark - EOF + generate_references \ + refs/tags/mark1.10 \ + refs/tags/mark1.2 \ + refs/tags/mark1.1 \ + refs/tags/mark >expect && git ls-remote --sort="-version:refname" --tags self >actual && test_cmp expect actual ' test_expect_success 'ls-remote --sort="-refname" --tags self' ' - cat >expect <<-EOF && - $(git rev-parse mark1.2) refs/tags/mark1.2 - $(git rev-parse mark1.10) refs/tags/mark1.10 - $(git rev-parse mark1.1) refs/tags/mark1.1 - $(git rev-parse mark) refs/tags/mark - EOF + generate_references \ + refs/tags/mark1.2 \ + refs/tags/mark1.10 \ + refs/tags/mark1.1 \ + refs/tags/mark >expect && git ls-remote --sort="-refname" --tags self >actual && test_cmp expect actual ' @@ -92,7 +97,7 @@ test_expect_success 'use "origin" when no remote specified' ' test_expect_success 'suppress "From <url>" with -q' ' git ls-remote -q 2>actual_err && - test_must_fail test_cmp exp_err actual_err + ! test_cmp exp_err actual_err ' test_expect_success 'use branch.<name>.remote if possible' ' @@ -180,8 +185,8 @@ do test_config $configsection.hiderefs refs/tags && git ls-remote . >actual && test_unconfig $configsection.hiderefs && - git ls-remote . | - sed -e "/ refs\/tags\//d" >expect && + git ls-remote . >expect.raw && + sed -e "/ refs\/tags\//d" expect.raw >expect && test_cmp expect actual ' @@ -212,62 +217,64 @@ test_expect_success 'protocol v2 supports hiderefs' ' test_expect_success 'ls-remote --symref' ' git fetch origin && - cat >expect <<-EOF && - ref: refs/heads/master HEAD - $(git rev-parse HEAD) HEAD - $(git rev-parse refs/heads/master) refs/heads/master - $(git rev-parse HEAD) refs/remotes/origin/HEAD - $(git rev-parse refs/remotes/origin/master) refs/remotes/origin/master - $(git rev-parse refs/tags/mark) refs/tags/mark - $(git rev-parse refs/tags/mark1.1) refs/tags/mark1.1 - $(git rev-parse refs/tags/mark1.10) refs/tags/mark1.10 - $(git rev-parse refs/tags/mark1.2) refs/tags/mark1.2 - EOF + echo "ref: refs/heads/master HEAD" >expect && + generate_references \ + HEAD \ + refs/heads/master >>expect && + oid=$(git rev-parse HEAD) && + echo "$oid refs/remotes/origin/HEAD" >>expect && + generate_references \ + refs/remotes/origin/master \ + refs/tags/mark \ + refs/tags/mark1.1 \ + refs/tags/mark1.10 \ + refs/tags/mark1.2 >>expect && # Protocol v2 supports sending symrefs for refs other than HEAD, so use # protocol v0 here. - GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref >actual && + GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref >actual && test_cmp expect actual ' test_expect_success 'ls-remote with filtered symref (refname)' ' - cat >expect <<-\EOF && + rev=$(git rev-parse HEAD) && + cat >expect <<-EOF && ref: refs/heads/master HEAD - 1bd44cb9d13204b0fe1958db0082f5028a16eb3a HEAD + $rev HEAD EOF # Protocol v2 supports sending symrefs for refs other than HEAD, so use # protocol v0 here. - GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref . HEAD >actual && + GIT_TEST_PROTOCOL_VERSION=0 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 - 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/foo - 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/master + $rev refs/heads/foo + $rev refs/heads/master EOF # Protocol v2 supports sending symrefs for refs other than HEAD, so use # protocol v0 here. - GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref --heads . >actual && + GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref --heads . >actual && test_cmp expect actual ' test_expect_success 'ls-remote --symref omits filtered-out matches' ' - cat >expect <<-\EOF && - 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/foo - 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/master + cat >expect <<-EOF && + $rev refs/heads/foo + $rev refs/heads/master EOF # Protocol v2 supports sending symrefs for refs other than HEAD, so use # protocol v0 here. - GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref --heads . >actual && + GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref --heads . >actual && test_cmp expect actual && - GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref . "refs/heads/*" >actual && + GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref . "refs/heads/*" >actual && test_cmp expect actual ' test_lazy_prereq GIT_DAEMON ' - git env--helper --type=bool --default=true --exit-code GIT_TEST_GIT_DAEMON + test_bool_env GIT_TEST_GIT_DAEMON true ' # 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 5426d4b5ab..bd202ec6f3 100755 --- a/third_party/git/t/t5514-fetch-multiple.sh +++ b/third_party/git/t/t5514-fetch-multiple.sh @@ -108,7 +108,7 @@ test_expect_success 'git fetch --multiple (two remotes)' ' GIT_TRACE=1 git fetch --multiple one two 2>trace && git branch -r > output && test_cmp ../expect output && - grep "built-in: git gc" trace >gc && + grep "built-in: git maintenance" trace >gc && test_line_count = 1 gc ) ' @@ -183,4 +183,15 @@ 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 e55d8474ef..70a9d2d8ab 100755 --- a/third_party/git/t/t5515-fetch-merge-logic.sh +++ b/third_party/git/t/t5515-fetch-merge-logic.sh @@ -8,18 +8,60 @@ 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= +GIT_TEST_PROTOCOL_VERSION=0 +export GIT_TEST_PROTOCOL_VERSION . ./test-lib.sh -LF=' -' +build_script () { + script="$1" && + for i in one three_file master topic_2 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" +} 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 + + topic_2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f + topic_2 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 && @@ -89,7 +131,8 @@ 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 + done && + build_script sed_script ' # Merge logic depends on branch properties and Pull: or .fetch lines @@ -140,6 +183,10 @@ 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 @@ -155,18 +202,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 c81ca360ac..d11382f769 100755 --- a/third_party/git/t/t5516-fetch-push.sh +++ b/third_party/git/t/t5516-fetch-push.sh @@ -747,42 +747,42 @@ test_expect_success 'deletion of a non-existent ref alone does trigger post-rece ' test_expect_success 'mixed ref updates, deletes, invalid deletes trigger hooks with correct input' ' - mk_test_with_hooks testrepo heads/master heads/next heads/pu && + mk_test_with_hooks testrepo heads/master heads/next heads/seen && orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) && newmaster=$(git show-ref -s --verify refs/heads/master) && orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) && newnext=$ZERO_OID && - orgpu=$(cd testrepo && git show-ref -s --verify refs/heads/pu) && - newpu=$(git show-ref -s --verify refs/heads/master) && + orgseen=$(cd testrepo && git show-ref -s --verify refs/heads/seen) && + newseen=$(git show-ref -s --verify refs/heads/master) && git push testrepo refs/heads/master:refs/heads/master \ - refs/heads/master:refs/heads/pu :refs/heads/next \ + refs/heads/master:refs/heads/seen :refs/heads/next \ :refs/heads/nonexistent && ( cd testrepo/.git && cat >pre-receive.expect <<-EOF && $orgmaster $newmaster refs/heads/master $orgnext $newnext refs/heads/next - $orgpu $newpu refs/heads/pu + $orgseen $newseen refs/heads/seen $ZERO_OID $ZERO_OID refs/heads/nonexistent EOF cat >update.expect <<-EOF && refs/heads/master $orgmaster $newmaster refs/heads/next $orgnext $newnext - refs/heads/pu $orgpu $newpu + refs/heads/seen $orgseen $newseen refs/heads/nonexistent $ZERO_OID $ZERO_OID EOF cat >post-receive.expect <<-EOF && $orgmaster $newmaster refs/heads/master $orgnext $newnext refs/heads/next - $orgpu $newpu refs/heads/pu + $orgseen $newseen refs/heads/seen EOF cat >post-update.expect <<-EOF && refs/heads/master refs/heads/next - refs/heads/pu + refs/heads/seen EOF test_cmp pre-receive.expect pre-receive.actual && @@ -1039,7 +1039,7 @@ test_force_fetch_tag "annotated tag" "-f -a -m'tag message'" test_expect_success 'push --porcelain' ' mk_empty testrepo && echo >.git/foo "To testrepo" && - echo >>.git/foo "* refs/heads/master:refs/remotes/origin/master [new branch]" && + echo >>.git/foo "* refs/heads/master:refs/remotes/origin/master [new reference]" && echo >>.git/foo "Done" && git push >.git/bar --porcelain testrepo refs/heads/master:refs/remotes/origin/master && ( @@ -1066,6 +1066,7 @@ test_expect_success 'push --porcelain rejected' ' echo >.git/foo "To testrepo" && echo >>.git/foo "! refs/heads/master:refs/heads/master [remote rejected] (branch is currently checked out)" && + echo >>.git/foo "Done" && test_must_fail git push >.git/bar --porcelain testrepo refs/heads/master:refs/heads/master && test_cmp .git/foo .git/bar @@ -1151,7 +1152,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= \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ 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 +1211,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= \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ 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 +1242,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= \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ git fetch ../testrepo/.git $SHA1_3 && - test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ git fetch ../testrepo/.git $SHA1_1 && git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true && git fetch ../testrepo/.git $SHA1_1 && @@ -1251,7 +1252,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= \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ git fetch ../testrepo/.git $SHA1_3 2>err && test_i18ngrep "remote error:.*not our ref.*$SHA1_3\$" err ) @@ -1291,7 +1292,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= \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ git fetch testrepo $oid 2>err && test_i18ngrep "Server does not allow request for unadvertised object" err ' @@ -1712,4 +1713,15 @@ 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 c05a661400..e4edd56404 100755 --- a/third_party/git/t/t5517-push-mirror.sh +++ b/third_party/git/t/t5517-push-mirror.sh @@ -265,4 +265,14 @@ 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 cf4cc32fd0..9fae07cdfa 100755 --- a/third_party/git/t/t5520-pull.sh +++ b/third_party/git/t/t5520-pull.sh @@ -5,18 +5,22 @@ 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" } test_pull_autostash () { + expect_parent_num="$1" && + shift && git reset --hard before-rebase && echo dirty >new_file && git add new_file && git pull "$@" . copy && - test_cmp_rev HEAD^ copy && - test "$(cat new_file)" = dirty && - test "$(cat file)" = "modified again" + test_cmp_rev HEAD^"$expect_parent_num" copy && + echo dirty >expect && + test_cmp expect new_file && + echo "modified again" >expect && + test_cmp expect file } test_pull_autostash_fail () { @@ -24,7 +28,7 @@ test_pull_autostash_fail () { echo dirty >new_file && git add new_file && test_must_fail git pull "$@" . copy 2>err && - test_i18ngrep "uncommitted changes." err + test_i18ngrep -E "uncommitted changes.|overwritten by merge:" err } test_expect_success setup ' @@ -39,8 +43,8 @@ test_expect_success 'pulling into void' ' cd cloned && git pull .. ) && - test -f file && - test -f cloned/file && + test_path_is_file file && + test_path_is_file cloned/file && test_cmp file cloned/file ' @@ -50,8 +54,8 @@ test_expect_success 'pulling into void using master:master' ' cd cloned-uho && git pull .. master:master ) && - test -f file && - test -f cloned-uho/file && + test_path_is_file file && + test_path_is_file cloned-uho/file && test_cmp file cloned-uho/file ' @@ -99,7 +103,7 @@ test_expect_success 'pulling into void must not create an octopus' ' ( cd cloned-octopus && test_must_fail git pull .. master master && - ! test -f file + test_path_is_missing file ) ' @@ -110,9 +114,11 @@ test_expect_success 'test . as a remote' ' echo updated >file && git commit -a -m updated && git checkout copy && - test "$(cat file)" = file && + echo file >expect && + test_cmp expect file && git pull && - test "$(cat file)" = updated && + echo updated >expect && + test_cmp expect file && 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 && @@ -125,9 +131,11 @@ test_expect_success 'the default remote . should not break explicit pull' ' git commit -a -m modified && git checkout copy && git reset --hard HEAD^ && - test "$(cat file)" = file && + echo file >expect && + test_cmp expect file && git pull . second && - test "$(cat file)" = modified && + echo modified >expect && + test_cmp expect file && 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 && @@ -137,10 +145,11 @@ 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" && - test "$(cat file)" = file && + echo file >expect && + test_cmp expect file && test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err && test_i18ngrep "no candidates for merging" err && - test "$(cat file)" = file + test_cmp expect file ' test_expect_success 'fail if no branches specified with non-default remote' ' @@ -148,11 +157,12 @@ 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" && - test "$(cat file)" = file && + echo file >expect && + test_cmp expect 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 "$(cat file)" = file + test_cmp expect file ' test_expect_success 'fail if not on a branch' ' @@ -160,10 +170,11 @@ 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" && - test "$(cat file)" = file && + echo file >expect && + test_cmp expect file && test_must_fail git pull 2>err && test_i18ngrep "not currently on a branch" err && - test "$(cat file)" = file + test_cmp expect file ' test_expect_success 'fail if no configuration for current branch' ' @@ -172,10 +183,11 @@ 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 && - test "$(cat file)" = file && + echo file >expect && + test_cmp expect file && test_must_fail git pull 2>err && test_i18ngrep "no tracking information" err && - test "$(cat file)" = file + test_cmp expect file ' test_expect_success 'pull --all: fail if no configuration for current branch' ' @@ -184,10 +196,11 @@ 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 && - test "$(cat file)" = file && + echo file >expect && + test_cmp expect file && test_must_fail git pull --all 2>err && test_i18ngrep "There is no tracking information" err && - test "$(cat file)" = file + test_cmp expect file ' test_expect_success 'fail if upstream branch does not exist' ' @@ -195,26 +208,31 @@ 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 && - test "$(cat file)" = file && + echo file >expect && + test_cmp expect file && test_must_fail git pull 2>err && test_i18ngrep "no such ref was fetched" err && - test "$(cat file)" = file + test_cmp expect 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" && - test "$(cat file)" = file && + echo file >expect && + test_cmp expect file && test_commit modified2 file && - test -z "$(git ls-files -u)" && + git ls-files -u >unmerged && + test_must_be_empty unmerged && test_must_fail git pull . second && - test -n "$(git ls-files -u)" && + git ls-files -u >unmerged && + test_file_not_empty unmerged && 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 && - test -z "$(git ls-files -u)" && + git ls-files -u >unmerged && + test_must_be_empty unmerged && test_must_fail git pull . second 2>err && test_i18ngrep "You have not concluded your merge" err && test_cmp expected file @@ -223,47 +241,66 @@ 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" && - test "$(cat file)" = file && + echo file >expect && + test_cmp expect file && git pull . second:third 2>err && test_i18ngrep "fetch updated the current branch head" err && - test "$(cat file)" = modified && - test "$(git rev-parse third)" = "$(git rev-parse second)" + echo modified >expect && + test_cmp expect file && + test_cmp_rev third 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" && - test "$(cat file)" = file && + echo file >expect && + test_cmp expect file && echo conflict >file && test_must_fail git pull . second:third 2>err && test_i18ngrep "Cannot fast-forward your working tree" err && - test "$(cat file)" = conflict && - test "$(git rev-parse third)" = "$(git rev-parse second)" + echo conflict >expect && + test_cmp expect file && + test_cmp_rev third 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 "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && - test new = "$(git show HEAD:file2)" + test_cmp_rev HEAD^ copy && + echo new >expect && + git show HEAD:file2 >actual && + test_cmp expect actual ' -test_expect_success '--rebase fast forward' ' +test_expect_success '--rebase (merge) 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 pull --rebase . ff && - test "$(git rev-parse HEAD)" = "$(git rev-parse ff)" && + 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 && # The above only validates the result. Did we actually bypass rebase? git reflog -1 >reflog.actual && @@ -287,7 +324,7 @@ test_expect_success '--rebase --autostash fast forward' ' git checkout behind && echo dirty >file && git pull --rebase --autostash . to-rebase-ff && - test "$(git rev-parse HEAD)" = "$(git rev-parse to-rebase-ff)" + test_cmp_rev HEAD to-rebase-ff ' test_expect_success '--rebase with conflicts shows advice' ' @@ -305,7 +342,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" out + test_i18ngrep "Resolve all conflicts manually" err ' test_expect_success 'failed --rebase shows advice' ' @@ -319,35 +356,37 @@ 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" out + test_i18ngrep "Resolve all conflicts manually" err ' test_expect_success '--rebase fails with multiple branches' ' git reset --hard before-rebase && test_must_fail git pull --rebase . copy master 2>err && - test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" && + test_cmp_rev HEAD before-rebase && test_i18ngrep "Cannot rebase onto multiple branches" err && - test modified = "$(git show HEAD:file)" + echo modified >expect && + git show HEAD:file >actual && + test_cmp expect actual ' test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' ' test_config rebase.autostash true && - test_pull_autostash --rebase + test_pull_autostash 1 --rebase ' test_expect_success 'pull --rebase --autostash & rebase.autostash=true' ' test_config rebase.autostash true && - test_pull_autostash --rebase --autostash + test_pull_autostash 1 --rebase --autostash ' test_expect_success 'pull --rebase --autostash & rebase.autostash=false' ' test_config rebase.autostash false && - test_pull_autostash --rebase --autostash + test_pull_autostash 1 --rebase --autostash ' test_expect_success 'pull --rebase --autostash & rebase.autostash unset' ' test_unconfig rebase.autostash && - test_pull_autostash --rebase --autostash + test_pull_autostash 1 --rebase --autostash ' test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' ' @@ -365,25 +404,54 @@ test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' ' test_pull_autostash_fail --rebase --no-autostash ' -for i in --autostash --no-autostash -do - test_expect_success "pull $i (without --rebase) is illegal" ' - test_must_fail git pull $i . copy 2>err && - test_i18ngrep "only valid with --rebase" err - ' -done +test_expect_success 'pull succeeds with dirty working directory and merge.autostash set' ' + test_config merge.autostash true && + test_pull_autostash 2 +' + +test_expect_success 'pull --autostash & merge.autostash=true' ' + test_config merge.autostash true && + test_pull_autostash 2 --autostash +' + +test_expect_success 'pull --autostash & merge.autostash=false' ' + test_config merge.autostash false && + test_pull_autostash 2 --autostash +' + +test_expect_success 'pull --autostash & merge.autostash unset' ' + test_unconfig merge.autostash && + test_pull_autostash 2 --autostash +' + +test_expect_success 'pull --no-autostash & merge.autostash=true' ' + test_config merge.autostash true && + test_pull_autostash_fail --no-autostash +' + +test_expect_success 'pull --no-autostash & merge.autostash=false' ' + test_config merge.autostash false && + test_pull_autostash_fail --no-autostash +' + +test_expect_success 'pull --no-autostash & merge.autostash unset' ' + test_unconfig merge.autostash && + test_pull_autostash_fail --no-autostash +' test_expect_success 'pull.rebase' ' git reset --hard before-rebase && test_config pull.rebase true && git pull . copy && - test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && - test new = "$(git show HEAD:file2)" + test_cmp_rev HEAD^ copy && + echo new >expect && + git show HEAD:file2 >actual && + test_cmp expect actual ' test_expect_success 'pull --autostash & pull.rebase=true' ' test_config pull.rebase true && - test_pull_autostash --autostash + test_pull_autostash 1 --autostash ' test_expect_success 'pull --no-autostash & pull.rebase=true' ' @@ -395,8 +463,10 @@ test_expect_success 'branch.to-rebase.rebase' ' git reset --hard before-rebase && test_config branch.to-rebase.rebase true && git pull . copy && - test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && - test new = "$(git show HEAD:file2)" + test_cmp_rev HEAD^ copy && + echo new >expect && + git show HEAD:file2 >actual && + test_cmp expect actual ' test_expect_success 'branch.to-rebase.rebase should override pull.rebase' ' @@ -404,23 +474,29 @@ 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 "$(git rev-parse HEAD^)" != "$(git rev-parse copy)" && - test new = "$(git show HEAD:file2)" + test_cmp_rev ! HEAD^ copy && + echo new >expect && + git show HEAD:file2 >actual && + test_cmp expect actual ' -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 "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && - test new = "$(git show HEAD:file2)" && + test_cmp_rev HEAD^ copy && + echo new >expect && + git show HEAD:file2 >actual && + test_cmp expect actual && 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 "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && - test new = "$(git show HEAD:file2)" && + test_cmp_rev HEAD^ copy && + echo new >expect && + git show HEAD:file2 >actual && + test_cmp expect actual && test_i18ngrep ! "verify-signatures" err ' @@ -440,25 +516,31 @@ 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 "$(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_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_expect_success 'pull.rebase=true flattens keep-merge' ' git reset --hard before-preserve-rebase && test_config pull.rebase true && git pull . copy && - test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && - test file3 = "$(git show HEAD:file3.t)" + test_cmp_rev HEAD^^ copy && + echo file3 >expect && + git show HEAD:file3.t >actual && + test_cmp expect actual ' 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 "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && - test file3 = "$(git show HEAD:file3.t)" + test_cmp_rev HEAD^^ copy && + echo file3 >expect && + git show HEAD:file3.t >actual && + test_cmp expect actual ' test_expect_success REBASE_P \ @@ -466,8 +548,8 @@ test_expect_success REBASE_P \ git reset --hard before-preserve-rebase && test_config pull.rebase preserve && git pull . copy && - test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && - test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)" + test_cmp_rev HEAD^^ copy && + test_cmp_rev HEAD^2 keep-merge ' test_expect_success 'pull.rebase=interactive' ' @@ -478,7 +560,8 @@ 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 && - test "I was here" = "$(cat fake.out)" + echo "I was here" >expect && + test_cmp expect fake.out ' test_expect_success 'pull --rebase=i' ' @@ -489,30 +572,35 @@ 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 && - test "I was here, too" = "$(cat fake.out)" + echo "I was here, too" >expect && + test_cmp expect fake.out ' test_expect_success 'pull.rebase=invalid fails' ' git reset --hard before-preserve-rebase && test_config pull.rebase invalid && - ! git pull . copy + test_must_fail 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 "$(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_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_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 "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && - test file3 = "$(git show HEAD:file3.t)" + test_cmp_rev HEAD^^ copy && + echo file3 >expect && + git show HEAD:file3.t >actual && + test_cmp expect actual ' test_expect_success REBASE_P \ @@ -520,58 +608,62 @@ test_expect_success REBASE_P \ git reset --hard before-preserve-rebase && test_config pull.rebase true && git pull --rebase=preserve . copy && - test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && - test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)" + test_cmp_rev HEAD^^ copy && + test_cmp_rev HEAD^2 keep-merge ' test_expect_success '--rebase=invalid fails' ' git reset --hard before-preserve-rebase && - ! git pull --rebase=invalid . copy + test_must_fail 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 "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && - test file3 = "$(git show HEAD:file3.t)" + test_cmp_rev HEAD^^ copy && + echo file3 >expect && + git show HEAD:file3.t >actual && + test_cmp expect actual ' 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 && - test "conflicting modification" = "$(cat file)" && - test file = "$(cat file2)" - + echo "conflicting modification" >expect && + test_cmp expect file && + echo file >expect && + test_cmp expect 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 && - test "conflicting modification" = "$(cat file)" && - test file = "$(cat file2)" + echo "conflicting modification" >expect && + test_cmp expect file && + echo file >expect && + test_cmp expect 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 && - test "conflicting modification" = "$(cat file)" && - test file = "$(cat file2)" - + echo "conflicting modification" >expect && + test_cmp expect file && + echo file >expect && + test_cmp expect file2 ' test_expect_success 'rebased upstream + fetch + pull --rebase' ' @@ -582,13 +674,14 @@ test_expect_success 'rebased upstream + fetch + pull --rebase' ' git reset --hard to-rebase-orig && git fetch && git pull --rebase && - test "conflicting modification" = "$(cat file)" && - test file = "$(cat file2)" + echo "conflicting modification" >expect && + test_cmp expect file && + echo file >expect && + test_cmp expect 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)" && @@ -596,23 +689,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 "$COPY" = "$(git rev-parse --verify me/copy)" && + test_cmp_rev "$COPY" me/copy && git checkout HEAD -- file && git pull && - test "$COPY" != "$(git rev-parse --verify me/copy)" - + test_cmp_rev ! "$COPY" 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 ' @@ -624,10 +717,14 @@ test_expect_success 'pull --rebase fails on unborn branch with staged changes' ' cd empty_repo2 && echo staged-file >staged-file && git add staged-file && - test "$(git ls-files)" = staged-file && + echo staged-file >expect && + git ls-files >actual && + test_cmp expect actual && test_must_fail git pull --rebase .. master 2>err && - test "$(git ls-files)" = staged-file && - test "$(git show :staged-file)" = staged-file && + git ls-files >actual && + test_cmp expect actual && + git show :staged-file >actual && + test_cmp expect actual && test_i18ngrep "unborn branch with changes added to the index" err ) ' @@ -638,7 +735,8 @@ test_expect_success 'pull --rebase fails on corrupt HEAD' ' ( cd corrupt && test_commit one && - obj=$(git rev-parse --verify HEAD | sed "s#^..#&/#") && + git rev-parse --verify HEAD >head && + obj=$(sed "s#^..#&/#" head) && rm -f .git/objects/$obj && test_must_fail git pull --rebase ) @@ -646,66 +744,79 @@ 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 && - test -z "$(git ls-files -u)" + ( + cd dst && + git pull --rebase && + git ls-files -u >untracked && + test_must_be_empty untracked ) ' 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 && - test 1 = $(find .git/rebase-apply -name "000*" | wc -l) + ( + 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 ) ' test_expect_success 'git pull --rebase against local branch' ' git checkout -b copy2 to-rebase-orig && git pull --rebase . to-rebase && - test "conflicting modification" = "$(cat file)" && - test file = "$(cat file2)" + echo "conflicting modification" >expect && + test_cmp expect file && + echo file >expect && + test_cmp expect file2 ' test_done diff --git a/third_party/git/t/t5521-pull-options.sh b/third_party/git/t/t5521-pull-options.sh index ccde8ba491..db1a381cd9 100755 --- a/third_party/git/t/t5521-pull-options.sh +++ b/third_party/git/t/t5521-pull-options.sh @@ -11,10 +11,10 @@ test_expect_success 'setup' ' git commit -m one) ' -test_expect_success 'git pull -q' ' +test_expect_success 'git pull -q --no-rebase' ' mkdir clonedq && (cd clonedq && git init && - git pull -q "../parent" >out 2>err && + git pull -q --no-rebase "../parent" >out 2>err && test_must_be_empty err && test_must_be_empty out) ' @@ -30,10 +30,10 @@ test_expect_success 'git pull -q --rebase' ' test_must_be_empty out) ' -test_expect_success 'git pull' ' +test_expect_success 'git pull --no-rebase' ' mkdir cloned && (cd cloned && git init && - git pull "../parent" >out 2>err && + git pull --no-rebase "../parent" >out 2>err && test -s err && test_must_be_empty out) ' @@ -46,10 +46,10 @@ test_expect_success 'git pull --rebase' ' test_must_be_empty out) ' -test_expect_success 'git pull -v' ' +test_expect_success 'git pull -v --no-rebase' ' mkdir clonedv && (cd clonedv && git init && - git pull -v "../parent" >out 2>err && + git pull -v --no-rebase "../parent" >out 2>err && test -s err && test_must_be_empty out) ' @@ -62,29 +62,36 @@ test_expect_success 'git pull -v --rebase' ' test_must_be_empty out) ' -test_expect_success 'git pull -v -q' ' +test_expect_success 'git pull -v -q --no-rebase' ' mkdir clonedvq && (cd clonedvq && git init && - git pull -v -q "../parent" >out 2>err && + git pull -v -q --no-rebase "../parent" >out 2>err && test_must_be_empty out && test_must_be_empty err) ' -test_expect_success 'git pull -q -v' ' +test_expect_success 'git pull -q -v --no-rebase' ' mkdir clonedqv && (cd clonedqv && git init && - git pull -q -v "../parent" >out 2>err && + git pull -q -v --no-rebase "../parent" >out 2>err && test_must_be_empty out && test -s err) ' test_expect_success 'git pull --cleanup errors early on invalid argument' ' mkdir clonedcleanup && (cd clonedcleanup && git init && - test_must_fail git pull --cleanup invalid "../parent" >out 2>err && + test_must_fail git pull --no-rebase --cleanup invalid "../parent" >out 2>err && test_must_be_empty out && test -s err) ' +test_expect_success 'git pull --no-write-fetch-head fails' ' + mkdir clonedwfh && + (cd clonedwfh && git init && + test_expect_code 129 git pull --no-write-fetch-head "../parent" >out 2>err && + test_must_be_empty out && + test_i18ngrep "no-write-fetch-head" err) +' test_expect_success 'git pull --force' ' mkdir clonedoldstyle && diff --git a/third_party/git/t/t5523-push-upstream.sh b/third_party/git/t/t5523-push-upstream.sh index c0df81a014..e47b5db5d6 100755 --- a/third_party/git/t/t5523-push-upstream.sh +++ b/third_party/git/t/t5523-push-upstream.sh @@ -41,20 +41,20 @@ test_expect_success 'push -u --dry-run master:otherX' ' check_config master upstream refs/heads/other ' -test_expect_success 'push -u master2:master2' ' - git branch master2 && - git push -u upstream master2:master2 && - check_config master2 upstream refs/heads/master2 +test_expect_success 'push -u topic_2:topic_2' ' + git branch topic_2 && + git push -u upstream topic_2:topic_2 && + check_config topic_2 upstream refs/heads/topic_2 ' -test_expect_success 'push -u master2:other2' ' - git push -u upstream master2:other2 && - check_config master2 upstream refs/heads/other2 +test_expect_success 'push -u topic_2:other2' ' + git push -u upstream topic_2:other2 && + check_config topic_2 upstream refs/heads/other2 ' -test_expect_success 'push -u :master2' ' - git push -u upstream :master2 && - check_config master2 upstream refs/heads/other2 +test_expect_success 'push -u :topic_2' ' + git push -u upstream :topic_2 && + check_config topic_2 upstream refs/heads/other2 ' test_expect_success 'push -u --all' ' diff --git a/third_party/git/t/t5528-push-default.sh b/third_party/git/t/t5528-push-default.sh index 44309566f1..f0a287d97d 100755 --- a/third_party/git/t/t5528-push-default.sh +++ b/third_party/git/t/t5528-push-default.sh @@ -98,6 +98,12 @@ test_expect_success 'push from/to new branch with upstream, matching and simple' test_push_failure upstream ' +test_expect_success '"matching" fails if none match' ' + git init --bare empty && + test_must_fail git push empty : 2>actual && + test_i18ngrep "Perhaps you should specify a branch" actual +' + test_expect_success 'push ambiguously named branch with upstream, matching and simple' ' git checkout -b ambiguous && test_config branch.ambiguous.remote parent1 && @@ -163,7 +169,7 @@ test_pushdefault_workflow success current master # update parent1's foo (which is our upstream) test_pushdefault_workflow success upstream foo -# upsream is foo which is not the name of the current branch +# upstream 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 a1d3031d40..205a2631e7 100755 --- a/third_party/git/t/t5530-upload-pack-error.sh +++ b/third_party/git/t/t5530-upload-pack-error.sh @@ -14,7 +14,6 @@ corrupt_repo () { } test_expect_success 'setup and corrupt repository' ' - echo file >file && git add file && git rev-parse :file && @@ -31,9 +30,10 @@ test_expect_success 'fsck fails' ' ' test_expect_success 'upload-pack fails due to error in pack-objects packing' ' - - printf "0032want %s\n00000009done\n0000" \ - $(git rev-parse HEAD) >input && + head=$(git rev-parse HEAD) && + hexsz=$(test_oid hexsz) && + printf "%04xwant %s\n00000009done\n0000" \ + $(($hexsz + 10)) $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 @@ -51,16 +51,17 @@ test_expect_success 'fsck fails' ' ' test_expect_success 'upload-pack fails due to error in rev-list' ' - printf "0032want %s\n0034shallow %s00000009done\n0000" \ - $(git rev-parse HEAD) $(git rev-parse HEAD^) >input && + printf "%04xwant %s\n%04xshallow %s00000009done\n0000" \ + $(($hexsz + 10)) $(git rev-parse HEAD) \ + $(($hexsz + 12)) $(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 "0045want %s multi_ack_detailed\n00000009done\n0000" \ - "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" >input && + printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \ + $(($hexsz + 29)) $(test_oid deadbeef) >input && test_must_fail git upload-pack . <input >output 2>output.err && grep "not our ref" output.err && grep "ERR" output && @@ -70,8 +71,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 "0045want %s multi_ack_detailed\n00000009done\n0000" \ - "$oid" >input && + printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \ + $(($hexsz + 29)) "$oid" >input && test_must_fail git upload-pack . <input >output 2>output.err && grep "not our ref" output.err && grep "ERR" output && @@ -80,8 +81,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 "0032want %s\n00000009done\n0000" \ - $(git rev-parse HEAD) >input && + printf "%04xwant %s\n00000009done\n0000" \ + $((hexsz + 10)) $(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/t5534-push-signed.sh b/third_party/git/t/t5534-push-signed.sh index 030331f1c5..af0385fb89 100755 --- a/third_party/git/t/t5534-push-signed.sh +++ b/third_party/git/t/t5534-push-signed.sh @@ -273,4 +273,26 @@ test_expect_success GPGSM 'fail without key and heed user.signingkey x509' ' test_cmp expect dst/push-cert-status ' +test_expect_success GPG 'failed atomic push does not execute GPG' ' + prepare_dst && + git -C dst config receive.certnonceseed sekrit && + write_script gpg <<-EOF && + # should check atomic push locally before running GPG. + exit 1 + EOF + test_must_fail env PATH="$TRASH_DIRECTORY:$PATH" git push \ + --signed --atomic --porcelain \ + dst noop ff noff >out 2>err && + + test_i18ngrep ! "gpg failed to sign" err && + cat >expect <<-EOF && + To dst + = refs/heads/noop:refs/heads/noop [up to date] + ! refs/heads/ff:refs/heads/ff [rejected] (atomic push failed) + ! refs/heads/noff:refs/heads/noff [rejected] (non-fast-forward) + Done + EOF + test_cmp expect out +' + test_done diff --git a/third_party/git/t/t5535-fetch-push-symref.sh b/third_party/git/t/t5535-fetch-push-symref.sh index 8ed58d27f2..e8f6d233ff 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 thru symref aliasing' +test_description='avoiding conflicting update through 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 66f0b64d39..a55202d2d3 100755 --- a/third_party/git/t/t5537-fetch-shallow.sh +++ b/third_party/git/t/t5537-fetch-shallow.sh @@ -15,16 +15,17 @@ test_expect_success 'setup' ' commit 2 && commit 3 && commit 4 && - git config --global transfer.fsckObjects true + 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 ' test_expect_success 'setup shallow clone' ' git clone --no-local --depth=2 .git shallow && git --git-dir=shallow/.git log --format=%s >actual && - cat <<EOF >expect && -4 -3 -EOF + test_write_lines 4 3 >expect && test_cmp expect actual ' @@ -34,10 +35,7 @@ test_expect_success 'clone from shallow clone' ' cd shallow2 && git fsck && git log --format=%s >actual && - cat <<EOF >expect && -4 -3 -EOF + test_write_lines 4 3 >expect && test_cmp expect actual ) ' @@ -52,11 +50,7 @@ test_expect_success 'fetch from shallow clone' ' git fetch && git fsck && git log --format=%s origin/master >actual && - cat <<EOF >expect && -5 -4 -3 -EOF + test_write_lines 5 4 3 >expect && test_cmp expect actual ) ' @@ -71,10 +65,7 @@ test_expect_success 'fetch --depth from shallow clone' ' git fetch --depth=2 && git fsck && git log --format=%s origin/master >actual && - cat <<EOF >expect && -6 -5 -EOF + test_write_lines 6 5 >expect && test_cmp expect actual ) ' @@ -85,12 +76,21 @@ test_expect_success 'fetch --unshallow from shallow clone' ' git fetch --unshallow && git fsck && git log --format=%s origin/master >actual && - cat <<EOF >expect && -6 -5 -4 -3 -EOF + test_write_lines 6 5 4 3 >expect && + test_cmp expect actual + ) +' + +test_expect_success 'fetch --unshallow from a full clone' ' + git clone --no-local --depth=2 .git shallow3 && + ( + cd shallow3 && + git log --format=%s >actual && + test_write_lines 4 3 >expect && + test_cmp expect actual && + git -c fetch.writeCommitGraph fetch --unshallow && + git log origin/master --format=%s >actual && + test_write_lines 4 3 2 1 >expect && test_cmp expect actual ) ' @@ -107,15 +107,10 @@ test_expect_success 'fetch something upstream has but hidden by clients shallow git fetch ../.git +refs/heads/master:refs/remotes/top/master && git fsck && git log --format=%s top/master >actual && - cat <<EOF >expect && -add-1-back -4 -3 -EOF + test_write_lines add-1-back 4 3 >expect && test_cmp expect actual ) && git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null - ' test_expect_success 'fetch that requires changes in .git/shallow is filtered' ' @@ -127,16 +122,12 @@ test_expect_success 'fetch that requires changes in .git/shallow is filtered' ' git init notshallow && ( cd notshallow && - git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/*&& + git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/* && git for-each-ref --format="%(refname)" >actual.refs && - cat <<EOF >expect.refs && -refs/remotes/shallow/no-shallow -EOF + echo refs/remotes/shallow/no-shallow >expect.refs && test_cmp expect.refs actual.refs && git log --format=%s shallow/no-shallow >actual && - cat <<EOF >expect && -no-shallow -EOF + echo no-shallow >expect && test_cmp expect actual ) ' @@ -154,21 +145,44 @@ test_expect_success 'fetch --update-shallow' ' git fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/* && git fsck && git for-each-ref --sort=refname --format="%(refname)" >actual.refs && - cat <<EOF >expect.refs && -refs/remotes/shallow/master -refs/remotes/shallow/no-shallow -refs/tags/heavy-tag -refs/tags/light-tag -EOF + cat <<-\EOF >expect.refs && + refs/remotes/shallow/master + refs/remotes/shallow/no-shallow + refs/tags/heavy-tag + refs/tags/light-tag + EOF test_cmp expect.refs actual.refs && git log --format=%s shallow/master >actual && - cat <<EOF >expect && -7 -6 -5 -4 -3 -EOF + test_write_lines 7 6 5 4 3 >expect && + test_cmp expect actual + ) +' + +test_expect_success 'fetch --update-shallow (with fetch.writeCommitGraph)' ' + ( + cd shallow && + git checkout master && + commit 8 && + git tag -m foo heavy-tag-for-graph HEAD^ && + git tag light-tag-for-graph HEAD^:tracked + ) && + test_config -C notshallow fetch.writeCommitGraph true && + ( + cd notshallow && + git fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/* && + git fsck && + git for-each-ref --sort=refname --format="%(refname)" >actual.refs && + cat <<-EOF >expect.refs && + refs/remotes/shallow/master + refs/remotes/shallow/no-shallow + refs/tags/heavy-tag + refs/tags/heavy-tag-for-graph + refs/tags/light-tag + refs/tags/light-tag-for-graph + EOF + test_cmp expect.refs actual.refs && + git log --format=%s shallow/master >actual && + test_write_lines 8 7 6 5 4 3 >expect && test_cmp expect actual ) ' @@ -179,10 +193,7 @@ test_expect_success POSIXPERM,SANITY 'shallow fetch from a read-only repo' ' find read-only.git -print | xargs chmod -w && git clone --no-local --depth=2 read-only.git from-read-only && git --git-dir=from-read-only/.git log --format=%s >actual && - cat >expect <<EOF && -add-1-back -4 -EOF + test_write_lines add-1-back 4 >expect && test_cmp expect actual ' @@ -233,26 +244,29 @@ 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_sed/repo" master:a_branch && + git -C client fetch --depth=2 "$HTTPD_URL/one_time_perl/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 "s/0034shallow %s/0036unshallow %s/" \ + printf "$(test_oid perl)" \ "$(git -C "$REPO" rev-parse HEAD)" \ "$(git -C "$REPO" rev-parse HEAD^)" \ - >"$HTTPD_ROOT_PATH/one-time-sed" && + >"$HTTPD_ROOT_PATH/one-time-perl" && test_must_fail env GIT_TEST_SIDEBAND_ALL=0 git -C client \ - fetch --depth=1 "$HTTPD_URL/one_time_sed/repo" \ + fetch --depth=1 "$HTTPD_URL/one_time_perl/repo" \ master:a_branch && - # Ensure that the one-time-sed script was used. - ! test -e "$HTTPD_ROOT_PATH/one-time-sed" && + # Ensure that the one-time-perl script was used. + ! test -e "$HTTPD_ROOT_PATH/one-time-perl" && # 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 b4ad81f006..82aa99ae87 100755 --- a/third_party/git/t/t5539-fetch-http-shallow.sh +++ b/third_party/git/t/t5539-fetch-http-shallow.sh @@ -9,10 +9,12 @@ start_httpd commit() { echo "$1" >tracked && git add tracked && + test_tick && git commit -m "$1" } test_expect_success 'setup shallow clone' ' + test_tick=1500000000 && commit 1 && commit 2 && commit 3 && @@ -48,7 +50,6 @@ EOF test_expect_success 'no shallow lines after receiving ACK ready' ' ( cd shallow && - test_tick && for i in $(test_seq 15) do git checkout --orphan unrelated$i && @@ -66,10 +67,11 @@ test_expect_success 'no shallow lines after receiving ACK ready' ' ( cd clone && git checkout --orphan newnew && + test_tick=1400000000 && 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= \ + GIT_TRACE_PACKET="$TRASH_DIRECTORY/trace" GIT_TEST_PROTOCOL_VERSION=0 \ 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 a094fd5e71..450321fddb 100755 --- a/third_party/git/t/t5540-http-push-webdav.sh +++ b/third_party/git/t/t5540-http-push-webdav.sh @@ -126,6 +126,22 @@ test_expect_success 'create and delete remote branch' ' test_must_fail git show-ref --verify refs/remotes/origin/dev ' +test_expect_success 'non-force push fails if not up to date' ' + git init --bare "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_conflict.git && + git -C "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_conflict.git update-server-info && + git clone $HTTPD_URL/dumb/test_repo_conflict.git "$ROOT_PATH"/c1 && + git clone $HTTPD_URL/dumb/test_repo_conflict.git "$ROOT_PATH"/c2 && + test_commit -C "$ROOT_PATH/c1" path1 && + git -C "$ROOT_PATH/c1" push origin HEAD && + git -C "$ROOT_PATH/c2" pull && + test_commit -C "$ROOT_PATH/c1" path2 && + git -C "$ROOT_PATH/c1" push origin HEAD && + test_commit -C "$ROOT_PATH/c2" path3 && + git -C "$ROOT_PATH/c1" log --graph --all && + git -C "$ROOT_PATH/c2" log --graph --all && + test_must_fail git -C "$ROOT_PATH/c2" push origin HEAD +' + test_expect_success 'MKCOL sends directory names with trailing slashes' ' ! grep "\"MKCOL.*[^/] HTTP/[^ ]*\"" < "$HTTPD_ROOT_PATH"/access.log @@ -134,15 +150,13 @@ test_expect_success 'MKCOL sends directory names with trailing slashes' ' x1="[0-9a-f]" x2="$x1$x1" -x5="$x1$x1$x1$x1$x1" -x38="$x5$x5$x5$x5$x5$x5$x5$x1$x1$x1" -x40="$x38$x2" +xtrunc=$(echo $OID_REGEX | sed -e "s/\[0-9a-f\]\[0-9a-f\]//") 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/${x38}_$x40|WANTED_PATH_REQUEST|" \ + -e "s|/objects/$x2/${xtrunc}_$OID_REGEX|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 b86ddb60f2..187454f5dd 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 -z "$GIT_TEST_PROTOCOL_VERSION" + if test "$GIT_TEST_PROTOCOL_VERSION" = 0 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 -z "$GIT_TEST_PROTOCOL_VERSION" + if test "$GIT_TEST_PROTOCOL_VERSION" = 0 then check_access_log exp fi @@ -177,6 +177,9 @@ test_expect_success 'push (chunked)' ' test $HEAD = $(git rev-parse --verify HEAD)) ' +## References of remote: atomic1(1) master(2) collateral(2) other(2) +## References of local : atomic2(2) master(1) collateral(3) other(2) collateral1(3) atomic(1) +## Atomic push : master(1) collateral(3) atomic(1) test_expect_success 'push --atomic also prevents branch creation, reports collateral' ' # Setup upstream repo - empty for now d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-branches.git && @@ -184,11 +187,13 @@ 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 two branches for now + # Tell "$up" about three branches for now test_commit atomic1 && test_commit atomic2 && git branch collateral && - git push "$up" master collateral && + git branch other && + git push "$up" atomic1 master collateral other && + git tag -d atomic1 && # collateral is a valid push, but should be failed by atomic push git checkout collateral && @@ -223,7 +228,46 @@ test_expect_success 'push --atomic also prevents branch creation, reports collat # the collateral failure refs should be indicated to the user grep "^ ! .*rejected.* atomic -> atomic .*atomic push failed" output && - grep "^ ! .*rejected.* collateral -> collateral .*atomic push failed" output + grep "^ ! .*rejected.* collateral -> collateral .*atomic push failed" output && + + # never report what we do not push + ! grep "^ ! .*rejected.* atomic1 " output && + ! grep "^ ! .*rejected.* other " 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' ' @@ -262,7 +306,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' ' @@ -277,7 +321,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' ' @@ -285,7 +329,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' ' @@ -420,6 +464,36 @@ test_expect_success 'push status output scrubs password' ' grep "^To $HTTPD_URL/smart/test_repo.git" status ' +test_expect_success 'clone/fetch scrubs password from reflogs' ' + cd "$ROOT_PATH" && + git clone "$HTTPD_URL_USER_PASS/smart/test_repo.git" \ + reflog-test && + cd reflog-test && + test_commit prepare-for-force-fetch && + git switch -c away && + git fetch "$HTTPD_URL_USER_PASS/smart/test_repo.git" \ + +master:master && + # should have been scrubbed down to vanilla URL + git log -g master >reflog && + grep "$HTTPD_URL" reflog && + ! grep "$HTTPD_URL_USER_PASS" reflog +' + +test_expect_success 'Non-ASCII branch name can be used with --force-with-lease' ' + cd "$ROOT_PATH" && + git clone "$HTTPD_URL_USER_PASS/smart/test_repo.git" non-ascii && + cd non-ascii && + git checkout -b rama-de-รกrbol && + test_commit F && + git push --force-with-lease origin rama-de-รกrbol && + git ls-remote origin refs/heads/rama-de-รกrbol >actual && + git ls-remote . refs/heads/rama-de-รกrbol >expect && + test_cmp expect actual && + git push --delete --force-with-lease origin rama-de-รกrbol && + git ls-remote origin refs/heads/rama-de-รกrbol >actual && + test_must_be_empty actual +' + test_expect_success 'colorize errors/hints' ' cd "$ROOT_PATH"/test_repo_clone && test_must_fail git -c color.transport=always -c color.advice=always \ diff --git a/third_party/git/t/t5543-atomic-push.sh b/third_party/git/t/t5543-atomic-push.sh index 7079bcf9a0..620c30d58f 100755 --- a/third_party/git/t/t5543-atomic-push.sh +++ b/third_party/git/t/t5543-atomic-push.sh @@ -27,6 +27,12 @@ test_refs () { test_cmp expect actual } +fmt_status_report () { + sed -n \ + -e "/^To / { s/ */ /g; p; }" \ + -e "/^ ! / { s/ */ /g; p; }" +} + test_expect_success 'atomic push works for a single branch' ' mk_repo_pair && ( @@ -191,4 +197,87 @@ test_expect_success 'atomic push is not advertised if configured' ' test_refs master HEAD@{1} ' +# References in upstream : master(1) one(1) foo(1) +# References in workbench: master(2) foo(1) two(2) bar(2) +# Atomic push : master(2) two(2) bar(2) +test_expect_success 'atomic push reports (reject by update hook)' ' + mk_repo_pair && + ( + cd workbench && + test_commit one && + git branch foo && + git push up master one foo && + git tag -d one + ) && + ( + mkdir -p upstream/.git/hooks && + cat >upstream/.git/hooks/update <<-EOF && + #!/bin/sh + + if test "\$1" = "refs/heads/bar" + then + echo >&2 "Pusing to branch bar is prohibited" + exit 1 + fi + EOF + chmod a+x upstream/.git/hooks/update + ) && + ( + cd workbench && + test_commit two && + git branch bar + ) && + test_must_fail git -C workbench \ + push --atomic up master two bar >out 2>&1 && + fmt_status_report <out >actual && + cat >expect <<-EOF && + To ../upstream + ! [remote rejected] master -> master (atomic push failure) + ! [remote rejected] two -> two (atomic push failure) + ! [remote rejected] bar -> bar (hook declined) + EOF + test_cmp expect actual +' + +# References in upstream : master(1) one(1) foo(1) +# References in workbench: master(2) foo(1) two(2) bar(2) +test_expect_success 'atomic push reports (mirror, but reject by update hook)' ' + ( + cd workbench && + git remote remove up && + git remote add up ../upstream + ) && + test_must_fail git -C workbench \ + push --atomic --mirror up >out 2>&1 && + fmt_status_report <out >actual && + cat >expect <<-EOF && + To ../upstream + ! [remote rejected] master -> master (atomic push failure) + ! [remote rejected] one (atomic push failure) + ! [remote rejected] bar -> bar (hook declined) + ! [remote rejected] two -> two (atomic push failure) + EOF + test_cmp expect actual +' + +# References in upstream : master(2) one(1) foo(1) +# References in workbench: master(1) foo(1) two(2) bar(2) +test_expect_success 'atomic push reports (reject by non-ff)' ' + rm upstream/.git/hooks/update && + ( + cd workbench && + git push up master && + git reset --hard HEAD^ + ) && + test_must_fail git -C workbench \ + push --atomic up master foo bar >out 2>&1 && + fmt_status_report <out >actual && + cat >expect <<-EOF && + To ../upstream + ! [rejected] master -> master (non-fast-forward) + ! [rejected] bar -> bar (atomic push failed) + EOF + test_cmp expect actual +' + test_done diff --git a/third_party/git/t/t5545-push-options.sh b/third_party/git/t/t5545-push-options.sh index 6d1d59c9b1..38e6f7340e 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 submoule" && + git -C parent commit -m "add submodule" && test_commit -C parent/workbench two && git -C parent add workbench && @@ -278,4 +278,7 @@ 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/t5548-push-porcelain.sh b/third_party/git/t/t5548-push-porcelain.sh new file mode 100755 index 0000000000..1b19b3ef55 --- /dev/null +++ b/third_party/git/t/t5548-push-porcelain.sh @@ -0,0 +1,279 @@ +#!/bin/sh +# +# Copyright (c) 2020 Jiang Xin +# +test_description='Test git push porcelain output' + +. ./test-lib.sh + +# Create commits in <repo> and assign each commit's oid to shell variables +# given in the arguments (A, B, and C). E.g.: +# +# create_commits_in <repo> A B C +# +# NOTE: Never calling this function from a subshell since variable +# assignments will disappear when subshell exits. +create_commits_in () { + repo="$1" && + if ! parent=$(git -C "$repo" rev-parse HEAD^{} --) + then + parent= + fi && + T=$(git -C "$repo" write-tree) && + shift && + while test $# -gt 0 + do + name=$1 && + test_tick && + if test -z "$parent" + then + oid=$(echo $name | git -C "$repo" commit-tree $T) + else + oid=$(echo $name | git -C "$repo" commit-tree -p $parent $T) + fi && + eval $name=$oid && + parent=$oid && + shift || + return 1 + done && + git -C "$repo" update-ref refs/heads/master $oid +} + +# Format the output of git-push, git-show-ref and other commands to make a +# user-friendly and stable text. We can easily prepare the expect text +# without having to worry about future changes of the commit ID and spaces +# of the output. +make_user_friendly_and_stable_output () { + sed \ + -e "s/ *\$//" \ + -e "s/ */ /g" \ + -e "s/ / /g" \ + -e "s/$A/<COMMIT-A>/g" \ + -e "s/$B/<COMMIT-B>/g" \ + -e "s/$ZERO_OID/<ZERO-OID>/g" \ + -e "s/$(echo $A | cut -c1-7)[0-9a-f]*/<OID-A>/g" \ + -e "s/$(echo $B | cut -c1-7)[0-9a-f]*/<OID-B>/g" \ + -e "s#To $URL_PREFIX/upstream.git#To <URL/of/upstream.git>#" +} + +setup_upstream_and_workbench () { + # Upstream after setup : master(B) foo(A) bar(A) baz(A) + # Workbench after setup : master(A) + test_expect_success "setup upstream repository and workbench" ' + rm -rf upstream.git workbench && + git init --bare upstream.git && + git init workbench && + create_commits_in workbench A B && + ( + cd workbench && + # Try to make a stable fixed width for abbreviated commit ID, + # this fixed-width oid will be replaced with "<OID>". + git config core.abbrev 7 && + git remote add origin ../upstream.git && + git update-ref refs/heads/master $A && + git push origin \ + $B:refs/heads/master \ + $A:refs/heads/foo \ + $A:refs/heads/bar \ + $A:refs/heads/baz + ) && + git -C "workbench" config advice.pushUpdateRejected false && + upstream=upstream.git + ' +} + +run_git_push_porcelain_output_test() { + case $1 in + http) + PROTOCOL="HTTP protocol" + URL_PREFIX="http://.*" + ;; + file) + PROTOCOL="builtin protocol" + URL_PREFIX="\.\." + ;; + esac + + # Refs of upstream : master(B) foo(A) bar(A) baz(A) + # Refs of workbench: master(A) baz(A) next(A) + # git-push : master(A) NULL (B) baz(A) next(A) + test_expect_success "porcelain output of successful git-push ($PROTOCOL)" ' + ( + cd workbench && + git update-ref refs/heads/master $A && + git update-ref refs/heads/baz $A && + git update-ref refs/heads/next $A && + git push --porcelain --force origin \ + master \ + :refs/heads/foo \ + $B:bar \ + baz \ + next + ) >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + To <URL/of/upstream.git> + = refs/heads/baz:refs/heads/baz [up to date] + <COMMIT-B>:refs/heads/bar <OID-A>..<OID-B> + - :refs/heads/foo [deleted] + + refs/heads/master:refs/heads/master <OID-B>...<OID-A> (forced update) + * refs/heads/next:refs/heads/next [new branch] + Done + EOF + test_cmp expect actual && + + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/bar + <COMMIT-A> refs/heads/baz + <COMMIT-A> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual + ' + + # Refs of upstream : master(A) bar(B) baz(A) next(A) + # Refs of workbench: master(B) bar(A) baz(A) next(A) + # git-push : master(B) bar(A) NULL next(A) + test_expect_success "atomic push failed ($PROTOCOL)" ' + ( + cd workbench && + git update-ref refs/heads/master $B && + git update-ref refs/heads/bar $A && + test_must_fail git push --atomic --porcelain origin \ + master \ + bar \ + :baz \ + next + ) >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + To <URL/of/upstream.git> + = refs/heads/next:refs/heads/next [up to date] + ! refs/heads/bar:refs/heads/bar [rejected] (non-fast-forward) + ! (delete):refs/heads/baz [rejected] (atomic push failed) + ! refs/heads/master:refs/heads/master [rejected] (atomic push failed) + Done + EOF + test_cmp expect actual && + + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/bar + <COMMIT-A> refs/heads/baz + <COMMIT-A> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual + ' + test_expect_success "prepare pre-receive hook ($PROTOCOL)" ' + write_script "$upstream/hooks/pre-receive" <<-EOF + exit 1 + EOF + ' + + # Refs of upstream : master(A) bar(B) baz(A) next(A) + # Refs of workbench: master(B) bar(A) baz(A) next(A) + # git-push : master(B) bar(A) NULL next(A) + test_expect_success "pre-receive hook declined ($PROTOCOL)" ' + ( + cd workbench && + git update-ref refs/heads/master $B && + git update-ref refs/heads/bar $A && + test_must_fail git push --porcelain --force origin \ + master \ + bar \ + :baz \ + next + ) >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + To <URL/of/upstream.git> + = refs/heads/next:refs/heads/next [up to date] + ! refs/heads/bar:refs/heads/bar [remote rejected] (pre-receive hook declined) + ! :refs/heads/baz [remote rejected] (pre-receive hook declined) + ! refs/heads/master:refs/heads/master [remote rejected] (pre-receive hook declined) + Done + EOF + test_cmp expect actual && + + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/bar + <COMMIT-A> refs/heads/baz + <COMMIT-A> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual + ' + + test_expect_success "remove pre-receive hook ($PROTOCOL)" ' + rm "$upstream/hooks/pre-receive" + ' + + # Refs of upstream : master(A) bar(B) baz(A) next(A) + # Refs of workbench: master(B) bar(A) baz(A) next(A) + # git-push : master(B) bar(A) NULL next(A) + test_expect_success "non-fastforward push ($PROTOCOL)" ' + ( + cd workbench && + test_must_fail git push --porcelain origin \ + master \ + bar \ + :baz \ + next + ) >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + To <URL/of/upstream.git> + = refs/heads/next:refs/heads/next [up to date] + - :refs/heads/baz [deleted] + refs/heads/master:refs/heads/master <OID-A>..<OID-B> + ! refs/heads/bar:refs/heads/bar [rejected] (non-fast-forward) + Done + EOF + test_cmp expect actual && + + git -C "$upstream" show-ref >out && + make_user_friendly_and_stable_output <out >actual && + cat >expect <<-EOF && + <COMMIT-B> refs/heads/bar + <COMMIT-B> refs/heads/master + <COMMIT-A> refs/heads/next + EOF + test_cmp expect actual + ' +} + +# Initialize the upstream repository and local workbench. +setup_upstream_and_workbench + +# Run git-push porcelain test on builtin protocol +run_git_push_porcelain_output_test file + +ROOT_PATH="$PWD" +. "$TEST_DIRECTORY"/lib-gpg.sh +. "$TEST_DIRECTORY"/lib-httpd.sh +. "$TEST_DIRECTORY"/lib-terminal.sh +start_httpd + +# Re-initialize the upstream repository and local workbench. +setup_upstream_and_workbench + +test_expect_success "setup for http" ' + git -C upstream.git config http.receivepack true && + upstream="$HTTPD_DOCUMENT_ROOT_PATH/upstream.git" && + mv upstream.git "$upstream" && + + git -C workbench remote set-url origin $HTTPD_URL/smart/upstream.git +' + +setup_askpass_helper + +# Run git-push porcelain test on HTTP protocol +run_git_push_porcelain_output_test http + +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 b811d89cfd..483578b2d7 100755 --- a/third_party/git/t/t5550-http-fetch-dumb.sh +++ b/third_party/git/t/t5550-http-fetch-dumb.sh @@ -50,6 +50,24 @@ test_expect_success 'create password-protected repository' ' "$HTTPD_DOCUMENT_ROOT_PATH/auth/dumb/repo.git" ' +test_expect_success 'create empty remote repository' ' + git init --bare "$HTTPD_DOCUMENT_ROOT_PATH/empty.git" && + (cd "$HTTPD_DOCUMENT_ROOT_PATH/empty.git" && + mkdir -p hooks && + write_script "hooks/post-update" <<-\EOF && + exec git update-server-info + EOF + hooks/post-update + ) +' + +test_expect_success 'empty dumb HTTP repository has default hash algorithm' ' + test_when_finished "rm -fr clone-empty" && + git clone $HTTPD_URL/dumb/empty.git clone-empty && + git -C clone-empty rev-parse --show-object-format >empty-format && + test "$(cat empty-format)" = "$(test_oid algo)" +' + setup_askpass_helper test_expect_success 'cloning password-protected repository can fail' ' @@ -199,6 +217,28 @@ test_expect_success 'fetch packed objects' ' git clone $HTTPD_URL/dumb/repo_pack.git ' +test_expect_success 'http-fetch --packfile' ' + # Arbitrary hash. Use rev-parse so that we get one of the correct + # length. + ARBITRARY=$(git -C "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git rev-parse HEAD) && + + git init packfileclient && + p=$(cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git && ls objects/pack/pack-*.pack) && + git -C packfileclient http-fetch --packfile=$ARBITRARY "$HTTPD_URL"/dumb/repo_pack.git/$p >out && + + grep "^keep.[0-9a-f]\{16,\}$" out && + cut -c6- out >packhash && + + # Ensure that the expected files are generated + test -e "packfileclient/.git/objects/pack/pack-$(cat packhash).pack" && + test -e "packfileclient/.git/objects/pack/pack-$(cat packhash).idx" && + test -e "packfileclient/.git/objects/pack/pack-$(cat packhash).keep" && + + # Ensure that it has the HEAD of repo_pack, at least + HASH=$(git -C "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git rev-parse HEAD) && + git -C packfileclient cat-file -e "$HASH" +' + test_expect_success 'fetch notices corrupt pack' ' cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad1.git && (cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad1.git && @@ -214,6 +254,14 @@ test_expect_success 'fetch notices corrupt pack' ' ) ' +test_expect_success 'http-fetch --packfile with corrupt pack' ' + rm -rf packfileclient && + git init packfileclient && + p=$(cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad1.git && ls objects/pack/pack-*.pack) && + test_must_fail git -C packfileclient http-fetch --packfile \ + "$HTTPD_URL"/dumb/repo_bad1.git/$p +' + test_expect_success 'fetch notices corrupt idx' ' cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad2.git && (cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad2.git && @@ -248,9 +296,7 @@ test_expect_success 'fetch can handle previously-fetched .idx files' ' ' test_expect_success 'did not use upload-pack service' ' - test_might_fail grep '/git-upload-pack' <"$HTTPD_ROOT_PATH"/access.log >act && - : >exp && - test_cmp exp act + ! grep "/git-upload-pack" "$HTTPD_ROOT_PATH/access.log" ' test_expect_success 'git client shows text/plain errors' ' @@ -321,11 +367,17 @@ test_expect_success 'git client does not send an empty Accept-Language' ' ' test_expect_success 'remote-http complains cleanly about malformed urls' ' - # 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_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 ' 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 e38e543867..e40e9ed52f 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= \ + GIT_TRACE_CURL=true GIT_TEST_PROTOCOL_VERSION=0 \ 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 -z "$GIT_TEST_PROTOCOL_VERSION" + if test "$GIT_TEST_PROTOCOL_VERSION" = 0 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 -z "$GIT_TEST_PROTOCOL_VERSION" + if test "$GIT_TEST_PROTOCOL_VERSION" = 0 then check_access_log exp fi @@ -185,6 +185,40 @@ test_expect_success 'redirects send auth to new location' ' expect_askpass both user@host auth/smart/repo.git ' +test_expect_success 'GIT_TRACE_CURL redacts auth details' ' + rm -rf redact-auth trace && + set_askpass user@host pass@host && + GIT_TRACE_CURL="$(pwd)/trace" git clone --bare "$HTTPD_URL/auth/smart/repo.git" redact-auth && + expect_askpass both user@host && + + # Ensure that there is no "Basic" followed by a base64 string, but that + # the auth details are redacted + ! grep "Authorization: Basic [0-9a-zA-Z+/]" trace && + grep "Authorization: Basic <redacted>" trace +' + +test_expect_success 'GIT_CURL_VERBOSE redacts auth details' ' + rm -rf redact-auth trace && + set_askpass user@host pass@host && + GIT_CURL_VERBOSE=1 git clone --bare "$HTTPD_URL/auth/smart/repo.git" redact-auth 2>trace && + expect_askpass both user@host && + + # Ensure that there is no "Basic" followed by a base64 string, but that + # the auth details are redacted + ! grep "Authorization: Basic [0-9a-zA-Z+/]" trace && + grep "Authorization: Basic <redacted>" trace +' + +test_expect_success 'GIT_TRACE_CURL does not redact auth details if GIT_TRACE_REDACT=0' ' + rm -rf redact-auth trace && + set_askpass user@host pass@host && + GIT_TRACE_REDACT=0 GIT_TRACE_CURL="$(pwd)/trace" \ + git clone --bare "$HTTPD_URL/auth/smart/repo.git" redact-auth && + expect_askpass both user@host && + + grep "Authorization: Basic [0-9a-zA-Z+/]" trace +' + test_expect_success 'disable dumb http on server' ' git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \ config http.getanyfile false @@ -241,7 +275,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 -z "$GIT_TEST_PROTOCOL_VERSION" + if test "$GIT_TEST_PROTOCOL_VERSION" = 0 then tail -3 cookies.txt | sort >cookies_tail.txt && test_cmp expect_cookies.txt cookies_tail.txt @@ -336,7 +370,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= \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ git -C test_reachable.git fetch origin "$(git rev-parse HEAD)" ' @@ -358,7 +392,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= \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ git -C test_reachable.git fetch origin "$(git rev-parse HEAD)" && git -C "$server" config uploadpack.allowanysha1inwant 1 && @@ -430,27 +464,39 @@ test_expect_success 'fetch by SHA-1 without tag following' ' --no-tags origin $(cat bar_hash) ' -test_expect_success 'GIT_REDACT_COOKIES redacts cookies' ' +test_expect_success 'cookies are redacted by default' ' rm -rf clone && echo "Set-Cookie: Foo=1" >cookies && echo "Set-Cookie: Bar=2" >>cookies && - GIT_TRACE_CURL=true GIT_REDACT_COOKIES=Bar,Baz \ + GIT_TRACE_CURL=true \ git -c "http.cookieFile=$(pwd)/cookies" clone \ $HTTPD_URL/smart/repo.git clone 2>err && - grep "Cookie:.*Foo=1" err && + grep "Cookie:.*Foo=<redacted>" err && grep "Cookie:.*Bar=<redacted>" err && + ! grep "Cookie:.*Foo=1" err && ! grep "Cookie:.*Bar=2" err ' -test_expect_success 'GIT_REDACT_COOKIES handles empty values' ' +test_expect_success 'empty values of cookies are also redacted' ' rm -rf clone && echo "Set-Cookie: Foo=" >cookies && - GIT_TRACE_CURL=true GIT_REDACT_COOKIES=Foo \ + GIT_TRACE_CURL=true \ git -c "http.cookieFile=$(pwd)/cookies" clone \ $HTTPD_URL/smart/repo.git clone 2>err && grep "Cookie:.*Foo=<redacted>" err ' +test_expect_success 'GIT_TRACE_REDACT=0 disables cookie redaction' ' + rm -rf clone && + echo "Set-Cookie: Foo=1" >cookies && + echo "Set-Cookie: Bar=2" >>cookies && + GIT_TRACE_REDACT=0 GIT_TRACE_CURL=true \ + git -c "http.cookieFile=$(pwd)/cookies" clone \ + $HTTPD_URL/smart/repo.git clone 2>err && + grep "Cookie:.*Foo=1" err && + grep "Cookie:.*Bar=2" err +' + test_expect_success 'GIT_TRACE_CURL_NO_DATA prevents data from being traced' ' rm -rf clone && GIT_TRACE_CURL=true \ diff --git a/third_party/git/t/t5552-skipping-fetch-negotiator.sh b/third_party/git/t/t5552-skipping-fetch-negotiator.sh index 8a14be51a1..156c704040 100755 --- a/third_party/git/t/t5552-skipping-fetch-negotiator.sh +++ b/third_party/git/t/t5552-skipping-fetch-negotiator.sh @@ -60,29 +60,6 @@ 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 && @@ -130,7 +107,11 @@ 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= trace_fetch client origin to_fetch && + ( + GIT_TEST_PROTOCOL_VERSION=0 && + export GIT_TEST_PROTOCOL_VERSION && + trace_fetch client origin to_fetch + ) && have_sent c5 c4^ c2side && have_not_sent c4 c4^^ c4^^^ ' @@ -192,7 +173,17 @@ 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 && - trace_fetch client "$(pwd)/server" to_fetch && + + # 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 + ) && 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 new file mode 100755 index 0000000000..7622981cbf --- /dev/null +++ b/third_party/git/t/t5553-set-upstream.sh @@ -0,0 +1,178 @@ +#!/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/t5554-noop-fetch-negotiator.sh b/third_party/git/t/t5554-noop-fetch-negotiator.sh new file mode 100755 index 0000000000..2ac7b5859e --- /dev/null +++ b/third_party/git/t/t5554-noop-fetch-negotiator.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +test_description='test noop fetch negotiator' +. ./test-lib.sh + +test_expect_success 'noop negotiator does not emit any "have"' ' + rm -f trace && + + test_create_repo server && + test_commit -C server to_fetch && + + test_create_repo client && + test_commit -C client we_have && + + test_config -C client fetch.negotiationalgorithm noop && + GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "$(pwd)/server" && + + ! grep "fetch> have" trace && + grep "fetch> done" trace +' + +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 f0f425b2cf..e5d3d15ba8 100755 --- a/third_party/git/t/t5562-http-backend-content-length.sh +++ b/third_party/git/t/t5562-http-backend-content-length.sh @@ -53,15 +53,20 @@ test_expect_success 'setup' ' test_commit c1 && hash_head=$(git rev-parse HEAD) && hash_prev=$(git rev-parse HEAD~1) && - printf "want %s" "$hash_head" | packetize >fetch_body && - printf 0000 >>fetch_body && - printf "have %s" "$hash_prev" | packetize >>fetch_body && - printf done | packetize >>fetch_body && + { + packetize "want $hash_head" && + printf 0000 && + packetize "have $hash_prev" && + packetize "done" + } >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" "$_z40" "$hash_next" | packetize >push_body && - printf 0000 >>push_body && - echo "$hash_next" | git pack-objects --stdout >>push_body && + { + printf "%s %s refs/heads/newbranch\\0report-status object-format=%s\\n" \ + "$ZERO_OID" "$hash_next" "$(test_oid algo)" | packetize && + printf 0000 && + echo "$hash_next" | git pack-objects --stdout + } >push_body && test_copy_bytes 10 <push_body >push_body.trunc && : >empty_body ' diff --git a/third_party/git/t/t5572-pull-submodule.sh b/third_party/git/t/t5572-pull-submodule.sh index f916729a12..1d75e3b12b 100755 --- a/third_party/git/t/t5572-pull-submodule.sh +++ b/third_party/git/t/t5572-pull-submodule.sh @@ -13,34 +13,38 @@ reset_branch_to_HEAD () { git_pull () { reset_branch_to_HEAD "$1" && - git pull + may_only_be_test_must_fail "$2" && + $2 git pull } # pulls without conflicts -test_submodule_switch "git_pull" +test_submodule_switch_func "git_pull" git_pull_ff () { reset_branch_to_HEAD "$1" && - git pull --ff + may_only_be_test_must_fail "$2" && + $2 git pull --ff } -test_submodule_switch "git_pull_ff" +test_submodule_switch_func "git_pull_ff" git_pull_ff_only () { reset_branch_to_HEAD "$1" && - git pull --ff-only + may_only_be_test_must_fail "$2" && + $2 git pull --ff-only } -test_submodule_switch "git_pull_ff_only" +test_submodule_switch_func "git_pull_ff_only" git_pull_noff () { reset_branch_to_HEAD "$1" && - git pull --no-ff + may_only_be_test_must_fail "$2" && + $2 git pull --no-ff } KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 -test_submodule_switch "git_pull_noff" +test_submodule_switch_func "git_pull_noff" test_expect_success 'pull --recurse-submodule setup' ' test_create_repo child && diff --git a/third_party/git/t/t5573-pull-verify-signatures.sh b/third_party/git/t/t5573-pull-verify-signatures.sh index 3e9876e197..a53dd8550d 100755 --- a/third_party/git/t/t5573-pull-verify-signatures.sh +++ b/third_party/git/t/t5573-pull-verify-signatures.sh @@ -60,6 +60,27 @@ 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 && @@ -79,10 +100,53 @@ 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-clone-push-unc.sh b/third_party/git/t/t5580-unc-paths.sh index b3c8a92450..cf768b3a27 100755 --- a/third_party/git/t/t5580-clone-push-unc.sh +++ b/third_party/git/t/t5580-unc-paths.sh @@ -40,11 +40,23 @@ 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 && @@ -58,7 +70,7 @@ test_expect_success push ' test_expect_success MINGW 'remote nick cannot contain backslashes' ' BACKSLASHED="$(winpwd | tr / \\\\)" && - git ls-remote "$BACKSLASHED" >out 2>err && + git ls-remote "$BACKSLASHED" 2>err && test_i18ngrep ! "unable to access" err ' diff --git a/third_party/git/t/t5581-http-curl-verbose.sh b/third_party/git/t/t5581-http-curl-verbose.sh index 5129b0724f..927aad0820 100755 --- a/third_party/git/t/t5581-http-curl-verbose.sh +++ b/third_party/git/t/t5581-http-curl-verbose.sh @@ -20,7 +20,7 @@ test_expect_success 'failure in git-upload-pack is shown' ' test_might_fail env GIT_CURL_VERBOSE=1 \ git clone "$HTTPD_URL/error_git_upload_pack/smart/repo.git" \ 2>curl_log && - grep "< HTTP/1.1 500 Intentional Breakage" curl_log + grep "<= Recv header: HTTP/1.1 500 Intentional Breakage" curl_log ' test_done diff --git a/third_party/git/t/t5582-fetch-negative-refspec.sh b/third_party/git/t/t5582-fetch-negative-refspec.sh new file mode 100755 index 0000000000..8c61e28fec --- /dev/null +++ b/third_party/git/t/t5582-fetch-negative-refspec.sh @@ -0,0 +1,189 @@ +#!/bin/sh +# Copyright (c) 2020, Jacob Keller. + +test_description='"git fetch" with negative refspecs. + +' + +. ./test-lib.sh + +test_expect_success setup ' + echo >file original && + git add file && + git commit -a -m original +' + +test_expect_success "clone and setup child repos" ' + git clone . one && + ( + cd one && + echo >file updated by one && + git commit -a -m "updated by one" && + git switch -c alternate && + echo >file updated again by one && + git commit -a -m "updated by one again" && + git switch master + ) && + git clone . two && + ( + cd two && + git config branch.master.remote one && + git config remote.one.url ../one/.git/ && + git config remote.one.fetch +refs/heads/*:refs/remotes/one/* && + git config --add remote.one.fetch ^refs/heads/alternate + ) && + git clone . three +' + +test_expect_success "fetch one" ' + echo >file updated by origin && + git commit -a -m "updated by origin" && + ( + cd two && + test_must_fail git rev-parse --verify refs/remotes/one/alternate && + git fetch one && + test_must_fail git rev-parse --verify refs/remotes/one/alternate && + git rev-parse --verify refs/remotes/one/master && + mine=$(git rev-parse refs/remotes/one/master) && + his=$(cd ../one && git rev-parse refs/heads/master) && + test "z$mine" = "z$his" + ) +' + +test_expect_success "fetch with negative refspec on commandline" ' + echo >file updated by origin again && + git commit -a -m "updated by origin again" && + ( + cd three && + alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) && + echo $alternate_in_one >expect && + git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/master && + cut -f -1 .git/FETCH_HEAD >actual && + test_cmp expect actual + ) +' + +test_expect_success "fetch with negative sha1 refspec fails" ' + echo >file updated by origin yet again && + git commit -a -m "updated by origin yet again" && + ( + cd three && + master_in_one=$(cd ../one && git rev-parse refs/heads/master) && + test_must_fail git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^$master_in_one + ) +' + +test_expect_success "fetch with negative pattern refspec" ' + echo >file updated by origin once more && + git commit -a -m "updated by origin once more" && + ( + cd three && + alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) && + echo $alternate_in_one >expect && + git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/m* && + cut -f -1 .git/FETCH_HEAD >actual && + test_cmp expect actual + ) +' + +test_expect_success "fetch with negative pattern refspec does not expand prefix" ' + echo >file updated by origin another time && + git commit -a -m "updated by origin another time" && + ( + cd three && + alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) && + master_in_one=$(cd ../one && git rev-parse refs/heads/master) && + echo $alternate_in_one >expect && + echo $master_in_one >>expect && + git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^master && + cut -f -1 .git/FETCH_HEAD >actual && + test_cmp expect actual + ) +' + +test_expect_success "fetch with negative refspec avoids duplicate conflict" ' + cd "$D" && + ( + cd one && + git branch dups/a && + git branch dups/b && + git branch dups/c && + git branch other/a && + git rev-parse --verify refs/heads/other/a >../expect && + git rev-parse --verify refs/heads/dups/b >>../expect && + git rev-parse --verify refs/heads/dups/c >>../expect + ) && + ( + cd three && + git fetch ../one/.git ^refs/heads/dups/a refs/heads/dups/*:refs/dups/* refs/heads/other/a:refs/dups/a && + git rev-parse --verify refs/dups/a >../actual && + git rev-parse --verify refs/dups/b >>../actual && + git rev-parse --verify refs/dups/c >>../actual + ) && + test_cmp expect actual +' + +test_expect_success "push --prune with negative refspec" ' + ( + cd two && + git branch prune/a && + git branch prune/b && + git branch prune/c && + git push ../three refs/heads/prune/* && + git branch -d prune/a && + git branch -d prune/b && + git push --prune ../three refs/heads/prune/* ^refs/heads/prune/b + ) && + ( + cd three && + test_write_lines b c >expect && + git for-each-ref --format="%(refname:lstrip=3)" refs/heads/prune/ >actual && + test_cmp expect actual + ) +' + +test_expect_success "push --prune with negative refspec apply to the destination" ' + ( + cd two && + git branch ours/a && + git branch ours/b && + git branch ours/c && + git push ../three refs/heads/ours/*:refs/heads/theirs/* && + git branch -d ours/a && + git branch -d ours/b && + git push --prune ../three refs/heads/ours/*:refs/heads/theirs/* ^refs/heads/theirs/b + ) && + ( + cd three && + test_write_lines b c >expect && + git for-each-ref --format="%(refname:lstrip=3)" refs/heads/theirs/ >actual && + test_cmp expect actual + ) +' + +test_expect_success "fetch --prune with negative refspec" ' + ( + cd two && + git branch fetch/a && + git branch fetch/b && + git branch fetch/c + ) && + ( + cd three && + git fetch ../two/.git refs/heads/fetch/*:refs/heads/copied/* + ) && + ( + cd two && + git branch -d fetch/a && + git branch -d fetch/b + ) && + ( + cd three && + test_write_lines b c >expect && + git fetch -v ../two/.git --prune refs/heads/fetch/*:refs/heads/copied/* ^refs/heads/fetch/b && + git for-each-ref --format="%(refname:lstrip=3)" refs/heads/copied/ >actual && + test_cmp expect actual + ) +' + +test_done diff --git a/third_party/git/t/t5601-clone.sh b/third_party/git/t/t5601-clone.sh index 37d76808d4..7df3c5373a 100755 --- a/third_party/git/t/t5601-clone.sh +++ b/third_party/git/t/t5601-clone.sh @@ -271,7 +271,9 @@ test_expect_success 'fetch from gitfile parent' ' test_expect_success 'clone separate gitdir where target already exists' ' rm -rf dst && - test_must_fail git clone --separate-git-dir realgitdir src dst + echo foo=bar >>realgitdir/config && + test_must_fail git clone --separate-git-dir realgitdir src dst && + grep foo=bar realgitdir/config ' test_expect_success 'clone --reference from original' ' @@ -434,7 +436,6 @@ 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" \ @@ -630,16 +631,30 @@ test_expect_success CASE_INSENSITIVE_FS 'colliding file detection' ' test_i18ngrep "the following paths have collided" icasefs/warning ' +test_expect_success 'clone with GIT_DEFAULT_HASH' ' + ( + sane_unset GIT_DEFAULT_HASH && + git init --object-format=sha1 test-sha1 && + git init --object-format=sha256 test-sha256 + ) && + test_commit -C test-sha1 foo && + test_commit -C test-sha256 foo && + GIT_DEFAULT_HASH=sha1 git clone test-sha256 test-clone-sha256 && + GIT_DEFAULT_HASH=sha256 git clone test-sha1 test-clone-sha1 && + git -C test-clone-sha1 status && + git -C test-clone-sha256 status +' + partial_clone_server () { SERVER="$1" && rm -rf "$SERVER" client && test_create_repo "$SERVER" && test_commit -C "$SERVER" one && - HASH1=$(git hash-object "$SERVER/one.t") && + HASH1=$(git -C "$SERVER" hash-object one.t) && git -C "$SERVER" revert HEAD && test_commit -C "$SERVER" two && - HASH2=$(git hash-object "$SERVER/two.t") && + HASH2=$(git -C "$SERVER" hash-object two.t) && test_config -C "$SERVER" uploadpack.allowfilter 1 && test_config -C "$SERVER" uploadpack.allowanysha1inwant 1 } @@ -654,7 +669,8 @@ partial_clone () { git -C client fsck && # Ensure that unneeded blobs are not inadvertently fetched. - test_config -C client extensions.partialclone "not a remote" && + test_config -C client remote.origin.promisor "false" && + git -C client config --unset remote.origin.partialclonefilter && test_must_fail git -C client cat-file -e "$HASH1" && # But this blob was fetched, because clone performs an initial checkout @@ -667,7 +683,8 @@ test_expect_success 'partial clone' ' test_expect_success 'partial clone with -o' ' partial_clone_server server && - git clone -o blah --filter=blob:limit=0 "file://$(pwd)/server" client + git clone -o blah --filter=blob:limit=0 "file://$(pwd)/server" client && + test_cmp_config -C client "blob:limit=0" --get-all remote.blah.partialclonefilter ' test_expect_success 'partial clone: warn if server does not support object filtering' ' @@ -702,7 +719,7 @@ test_expect_success 'batch missing blob request during checkout' ' # Ensure that there is only one negotiation by checking that there is # only "done" line sent. ("done" marks the end of negotiation.) GIT_TRACE_PACKET="$(pwd)/trace" git -C client checkout HEAD^ && - grep "git> done" trace >done_lines && + grep "fetch> done" trace >done_lines && test_line_count = 1 done_lines ' @@ -739,4 +756,7 @@ 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 4894237ab8..2f7be23044 100755 --- a/third_party/git/t/t5604-clone-reference.sh +++ b/third_party/git/t/t5604-clone-reference.sh @@ -175,7 +175,7 @@ test_expect_success 'clone using repo pointed at by gitfile as reference' ' test_expect_success 'clone and dissociate from reference' ' git init P && ( - cd P && test_commit one + cd P && test_commit one ) && git clone P Q && ( @@ -326,15 +326,16 @@ 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 || return 1 + -e "/multi-pack-index/d" <$raw >$raw.de-sha-1 && + sort $raw.de-sha-1 >$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/t5606-clone-options.sh b/third_party/git/t/t5606-clone-options.sh index 9e24ec88e6..e69427f881 100755 --- a/third_party/git/t/t5606-clone-options.sh +++ b/third_party/git/t/t5606-clone-options.sh @@ -35,4 +35,28 @@ test_expect_success 'redirected clone -v does show progress' ' ' +test_expect_success 'chooses correct default initial branch name' ' + git init --bare empty && + git -c init.defaultBranch=up clone empty whats-up && + test refs/heads/up = $(git -C whats-up symbolic-ref HEAD) && + test refs/heads/up = $(git -C whats-up config branch.up.merge) +' + +test_expect_success 'guesses initial branch name correctly' ' + git init --initial-branch=guess initial-branch && + test_commit -C initial-branch no-spoilers && + git -C initial-branch branch abc guess && + git clone initial-branch is-it && + test refs/heads/guess = $(git -C is-it symbolic-ref HEAD) && + + git -c init.defaultBranch=none init --bare no-head && + git -C initial-branch push ../no-head guess abc && + git clone no-head is-it2 && + test_must_fail git -C is-it2 symbolic-ref refs/remotes/origin/HEAD && + git -C no-head update-ref --no-deref HEAD refs/heads/guess && + git -c init.defaultBranch=guess clone no-head is-it3 && + test refs/remotes/origin/guess = \ + $(git -C is-it3 symbolic-ref refs/remotes/origin/HEAD) +' + test_done diff --git a/third_party/git/t/t5607-clone-bundle.sh b/third_party/git/t/t5607-clone-bundle.sh index 2a0fb15cf1..26985f4b44 100755 --- a/third_party/git/t/t5607-clone-bundle.sh +++ b/third_party/git/t/t5607-clone-bundle.sh @@ -4,6 +4,10 @@ test_description='some bundle related tests' . ./test-lib.sh test_expect_success 'setup' ' + test_oid_cache <<-EOF && + version sha1:2 + version sha256:3 + EOF test_commit initial && test_tick && git tag -m tag tag && @@ -16,7 +20,7 @@ test_expect_success 'setup' ' test_expect_success '"verify" needs a worktree' ' git bundle create tip.bundle -1 master && - test_must_fail nongit git bundle verify ../tip.bundle 2>err && + nongit test_must_fail git bundle verify ../tip.bundle 2>err && test_i18ngrep "need a repository" err ' @@ -64,7 +68,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 "^-[0-9a-f]\\{40\\} " boundary + grep "^-$OID_REGEX " boundary ' test_expect_success 'prerequisites with an empty commit message' ' @@ -83,4 +87,42 @@ 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_expect_success 'git bundle uses expected default format' ' + git bundle create bundle HEAD^.. && + head -n1 bundle | grep "^# v$(test_oid version) git bundle$" +' + +test_expect_success 'git bundle v3 has expected contents' ' + git branch side HEAD && + git bundle create --version=3 bundle HEAD^..side && + head -n2 bundle >actual && + cat >expect <<-EOF && + # v3 git bundle + @object-format=$(test_oid algo) + EOF + test_cmp expect actual && + git bundle verify bundle +' + +test_expect_success 'git bundle v3 rejects unknown capabilities' ' + cat >new <<-EOF && + # v3 git bundle + @object-format=$(test_oid algo) + @unknown=silly + EOF + test_must_fail git bundle verify new 2>output && + test_i18ngrep "unknown capability .unknown=silly." output +' + test_done diff --git a/third_party/git/t/t5608-clone-2gb.sh b/third_party/git/t/t5608-clone-2gb.sh index 2c6bc07344..4c476d2fa1 100755 --- a/third_party/git/t/t5608-clone-2gb.sh +++ b/third_party/git/t/t5608-clone-2gb.sh @@ -3,14 +3,13 @@ test_description='Test cloning a repository larger than 2 gigabyte' . ./test-lib.sh -if test -z "$GIT_TEST_CLONE_2GB" +if ! test_bool_env GIT_TEST_CLONE_2GB false then - say 'Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t' -else - test_set_prereq CLONE_2GB + skip_all='expensive 2GB clone test; enable with GIT_TEST_CLONE_2GB=true' + test_done fi -test_expect_success CLONE_2GB 'setup' ' +test_expect_success 'setup' ' git config pack.compression 0 && git config pack.depth 0 && @@ -38,13 +37,13 @@ test_expect_success CLONE_2GB 'setup' ' ' -test_expect_success CLONE_2GB 'clone - bare' ' +test_expect_success 'clone - bare' ' git clone --bare --no-hardlinks . clone-bare ' -test_expect_success CLONE_2GB 'clone - with worktree, file:// protocol' ' +test_expect_success 'clone - with worktree, file:// protocol' ' git clone "file://$(pwd)" clone-wt diff --git a/third_party/git/t/t5611-clone-config.sh b/third_party/git/t/t5611-clone-config.sh index 60c1ba951b..8e0fd39823 100755 --- a/third_party/git/t/t5611-clone-config.sh +++ b/third_party/git/t/t5611-clone-config.sh @@ -92,24 +92,17 @@ test_expect_success 'clone -c remote.<remote>.fetch=<refspec> --origin=<name>' ' test_cmp expect actual ' -# Tests for the hidden file attribute on windows -is_hidden () { - # Use the output of `attrib`, ignore the absolute path - case "$(attrib "$1")" in *H*?:*) return 0;; esac - return 1 -} - test_expect_success MINGW 'clone -c core.hideDotFiles' ' test_commit attributes .gitattributes "" && rm -rf child && git clone -c core.hideDotFiles=false . child && - ! is_hidden child/.gitattributes && + ! test_path_is_hidden child/.gitattributes && rm -rf child && git clone -c core.hideDotFiles=dotGitOnly . child && - ! is_hidden child/.gitattributes && + ! test_path_is_hidden child/.gitattributes && rm -rf child && git clone -c core.hideDotFiles=true . child && - is_hidden child/.gitattributes + test_path_is_hidden child/.gitattributes ' test_done diff --git a/third_party/git/t/t5612-clone-refspec.sh b/third_party/git/t/t5612-clone-refspec.sh index e36ac01661..e3b436d8ae 100755 --- a/third_party/git/t/t5612-clone-refspec.sh +++ b/third_party/git/t/t5612-clone-refspec.sh @@ -71,9 +71,9 @@ test_expect_success 'by default all branches will be kept updated' ' ( cd dir_all && git fetch && - git for-each-ref refs/remotes/origin | + git for-each-ref refs/remotes/origin >refs && sed -e "/HEAD$/d" \ - -e "s|/remotes/origin/|/heads/|" >../actual + -e "s|/remotes/origin/|/heads/|" refs >../actual ) && # follow both master and side git for-each-ref refs/heads >expect && @@ -87,7 +87,7 @@ test_expect_success 'by default no tags will be kept updated' ' git for-each-ref refs/tags >../actual ) && git for-each-ref refs/tags >expect && - test_must_fail test_cmp expect actual && + ! test_cmp expect actual && test_line_count = 2 actual ' @@ -104,9 +104,9 @@ test_expect_success '--single-branch while HEAD pointing at master' ' ( cd dir_master && git fetch --force && - git for-each-ref refs/remotes/origin | + git for-each-ref refs/remotes/origin >refs && sed -e "/HEAD$/d" \ - -e "s|/remotes/origin/|/heads/|" >../actual + -e "s|/remotes/origin/|/heads/|" refs >../actual ) && # only follow master git for-each-ref refs/heads/master >expect && @@ -126,9 +126,9 @@ test_expect_success '--single-branch while HEAD pointing at master and --no-tags ( cd dir_master_no_tags && git fetch && - git for-each-ref refs/remotes/origin | + git for-each-ref refs/remotes/origin >refs && sed -e "/HEAD$/d" \ - -e "s|/remotes/origin/|/heads/|" >../actual + -e "s|/remotes/origin/|/heads/|" refs >../actual ) && # only follow master git for-each-ref refs/heads/master >expect && @@ -156,9 +156,9 @@ test_expect_success '--single-branch while HEAD pointing at side' ' ( cd dir_side && git fetch && - git for-each-ref refs/remotes/origin | + git for-each-ref refs/remotes/origin >refs && sed -e "/HEAD$/d" \ - -e "s|/remotes/origin/|/heads/|" >../actual + -e "s|/remotes/origin/|/heads/|" refs >../actual ) && # only follow side git for-each-ref refs/heads/side >expect && @@ -169,9 +169,9 @@ test_expect_success '--single-branch with explicit --branch side' ' ( cd dir_side2 && git fetch && - git for-each-ref refs/remotes/origin | + git for-each-ref refs/remotes/origin >refs && sed -e "/HEAD$/d" \ - -e "s|/remotes/origin/|/heads/|" >../actual + -e "s|/remotes/origin/|/heads/|" refs >../actual ) && # only follow side git for-each-ref refs/heads/side >expect && @@ -223,9 +223,9 @@ test_expect_success '--single-branch with detached' ' ( cd dir_detached && git fetch && - git for-each-ref refs/remotes/origin | + git for-each-ref refs/remotes/origin >refs && sed -e "/HEAD$/d" \ - -e "s|/remotes/origin/|/heads/|" >../actual + -e "s|/remotes/origin/|/heads/|" refs >../actual ) && # nothing test_must_be_empty actual diff --git a/third_party/git/t/t5616-partial-clone.sh b/third_party/git/t/t5616-partial-clone.sh index b91ef548f8..f4d49d8335 100755 --- a/third_party/git/t/t5616-partial-clone.sh +++ b/third_party/git/t/t5616-partial-clone.sh @@ -42,8 +42,16 @@ 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 extensions.partialclone)" = "origin" && - test "$(git -C pc1 config --local core.partialclonefilter)" = "blob:none" + 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-parse --verify HEAD >headhash && + grep "$(cat headhash) HEAD" $(cat promisorlist) && + grep "$(cat headhash) refs/heads/master" $(cat promisorlist) ' # checkout master to force dynamic object fetch of blobs at HEAD. @@ -155,6 +163,22 @@ test_expect_success 'manual prefetch of missing objects' ' test_line_count = 0 observed.oids ' +test_expect_success 'partial clone with transfer.fsckobjects=1 works with submodules' ' + test_create_repo submodule && + test_commit -C submodule mycommit && + + test_create_repo src_with_sub && + test_config -C src_with_sub uploadpack.allowfilter 1 && + test_config -C src_with_sub uploadpack.allowanysha1inwant 1 && + + git -C src_with_sub submodule add "file://$(pwd)/submodule" mysub && + git -C src_with_sub commit -m "commit with submodule" && + + git -c transfer.fsckobjects=1 \ + clone --filter="blob:none" "file://$(pwd)/src_with_sub" dst && + test_when_finished rm -rf dst +' + test_expect_success 'partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects' ' git init src && test_commit -C src x && @@ -208,6 +232,58 @@ 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 'upload-pack fails banned object filters' ' + test_config -C srv.bare uploadpackfilter.blob:none.allow false && + test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \ + "file://$(pwd)/srv.bare" pc3 2>err && + test_i18ngrep "filter '\''blob:none'\'' not supported" err +' + +test_expect_success 'upload-pack fails banned combine object filters' ' + test_config -C srv.bare uploadpackfilter.allow false && + test_config -C srv.bare uploadpackfilter.combine.allow true && + test_config -C srv.bare uploadpackfilter.tree.allow true && + test_config -C srv.bare uploadpackfilter.blob:none.allow false && + test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \ + --filter=blob:none "file://$(pwd)/srv.bare" pc3 2>err && + test_i18ngrep "filter '\''blob:none'\'' not supported" err +' + +test_expect_success 'upload-pack fails banned object filters with fallback' ' + test_config -C srv.bare uploadpackfilter.allow false && + test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \ + "file://$(pwd)/srv.bare" pc3 2>err && + test_i18ngrep "filter '\''blob:none'\'' not supported" err +' + +test_expect_success 'upload-pack limits tree depth filters' ' + test_config -C srv.bare uploadpackfilter.allow false && + test_config -C srv.bare uploadpackfilter.tree.allow true && + test_config -C srv.bare uploadpackfilter.tree.maxDepth 0 && + test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \ + "file://$(pwd)/srv.bare" pc3 2>err && + test_i18ngrep "tree filter allows max depth 0, but got 1" err +' + test_expect_success 'partial clone fetches blobs pointed to by refs even if normally filtered out' ' rm -rf src dst && git init src && @@ -241,6 +317,218 @@ 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 +' + +test_expect_success 'fetch does not lazy-fetch missing targets of its refs' ' + rm -rf server client trace && + + test_create_repo server && + test_config -C server uploadpack.allowfilter 1 && + test_config -C server uploadpack.allowanysha1inwant 1 && + test_commit -C server foo && + + git clone --filter=blob:none "file://$(pwd)/server" client && + # Make all refs point to nothing by deleting all objects. + rm client/.git/objects/pack/* && + + test_commit -C server bar && + GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \ + --no-tags --recurse-submodules=no \ + origin refs/tags/bar && + FOO_HASH=$(git -C server rev-parse foo) && + ! grep "want $FOO_HASH" trace +' + +# The following two tests must be in this order. It is important that +# the srv.bare repository did not have tags during clone, but has tags +# in the fetch. + +test_expect_success '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_expect_success 'single-branch tag following respects partial clone' ' + git clone --single-branch -b B --filter=blob:none \ + "file://$(pwd)/srv.bare" single && + git -C single rev-parse --verify refs/tags/B && + git -C single rev-parse --verify refs/tags/A && + test_must_fail git -C single rev-parse --verify refs/tags/C +' + +test_expect_success 'fetch from a partial clone, protocol v0' ' + rm -rf server client trace && + + # Pretend that the server is a partial clone + git init server && + git -C server remote add a_remote "file://$(pwd)/" && + test_config -C server core.repositoryformatversion 1 && + test_config -C server extensions.partialclone a_remote && + test_config -C server protocol.version 0 && + test_commit -C server foo && + + # Fetch from the server + git init client && + test_config -C client protocol.version 0 && + test_commit -C client bar && + GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "file://$(pwd)/server" && + ! grep "version 2" trace +' + +test_expect_success 'fetch from a partial clone, protocol v2' ' + rm -rf server client trace && + + # Pretend that the server is a partial clone + git init server && + git -C server remote add a_remote "file://$(pwd)/" && + test_config -C server core.repositoryformatversion 1 && + test_config -C server extensions.partialclone a_remote && + test_config -C server protocol.version 2 && + test_commit -C server foo && + + # Fetch from the server + git init client && + test_config -C client protocol.version 2 && + test_commit -C client bar && + GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "file://$(pwd)/server" && + grep "version 2" trace +' + . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd @@ -255,14 +543,18 @@ intersperse () { sed 's/\(..\)/'$1'\1/g' } -# Create a one-time-sed command to replace the existing packfile with $1. +# Create a one-time-perl 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. - printf "1,/packfile/!c %04x\\\\x01%s0000" \ - "$(($(wc -c <$1) + 5))" \ - "$(hex_unpack <$1 | intersperse '\\x')" \ - >"$HTTPD_ROOT_PATH/one-time-sed" + 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" } test_expect_success 'upon cloning, check that all refs point to objects' ' @@ -286,16 +578,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 sed command looks for the "packfile" + # Use protocol v2 because the perl 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_sed/server repo 2>err && + --filter=blob:none $HTTPD_URL/one_time_perl/server repo 2>err && test_i18ngrep "did not send all necessary objects" err && - # Ensure that the one-time-sed script was used. - ! test -e "$HTTPD_ROOT_PATH/one-time-sed" + # Ensure that the one-time-perl script was used. + ! test -e "$HTTPD_ROOT_PATH/one-time-perl" ' test_expect_success 'when partial cloning, tolerate server not sending target of tag' ' @@ -326,17 +618,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 sed command looks for the "packfile" + # Use protocol v2 because the perl 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_sed/server repo 2> err && + --filter=blob:none $HTTPD_URL/one_time_perl/server repo 2> err && ! grep "missing object referenced by" err && - # Ensure that the one-time-sed script was used. - ! test -e "$HTTPD_ROOT_PATH/one-time-sed" + # Ensure that the one-time-perl script was used. + ! test -e "$HTTPD_ROOT_PATH/one-time-perl" ' test_expect_success 'tolerate server sending REF_DELTA against missing promisor objects' ' @@ -359,7 +651,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_sed/server repo && + --filter=blob:none $HTTPD_URL/one_time_perl/server repo && git -C repo hash-object -w -- "$SERVER/have.txt" && # Sanity check to ensure that the client does not have @@ -400,7 +692,7 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor replace_packfile thin.pack && - # Use protocol v2 because the sed command looks for the "packfile" + # Use protocol v2 because the perl command looks for the "packfile" # section header. test_config -C "$SERVER" protocol.version 2 && @@ -413,8 +705,11 @@ 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-sed script was used. - ! test -e "$HTTPD_ROOT_PATH/one-time-sed" + # Ensure that the one-time-perl script was used. + ! test -e "$HTTPD_ROOT_PATH/one-time-perl" ' +# 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 37fcce9c40..1a041df10b 100755 --- a/third_party/git/t/t5617-clone-submodules-remote.sh +++ b/third_party/git/t/t5617-clone-submodules-remote.sh @@ -14,7 +14,8 @@ test_expect_success 'setup' ' cd sub && git init && test_commit subcommit1 && - git tag sub_when_added_to_super + git tag sub_when_added_to_super && + git branch other ) && git submodule add "file://$pwd/sub" sub && git commit -m "add submodule" && @@ -51,4 +52,14 @@ 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 7c9511c593..022901b9eb 100755 --- a/third_party/git/t/t5700-protocol-v1.sh +++ b/third_party/git/t/t5700-protocol-v1.sh @@ -5,7 +5,8 @@ test_description='test git wire-protocol transition' TEST_NO_CREATE_REPO=1 # This is a protocol-specific test. -GIT_TEST_PROTOCOL_VERSION= +GIT_TEST_PROTOCOL_VERSION=0 +export GIT_TEST_PROTOCOL_VERSION . ./test-lib.sh @@ -292,4 +293,7 @@ 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/t5701-git-serve.sh b/third_party/git/t/t5701-git-serve.sh index ffb9613885..a1f5fdc9fd 100755 --- a/third_party/git/t/t5701-git-serve.sh +++ b/third_party/git/t/t5701-git-serve.sh @@ -5,12 +5,17 @@ test_description='test protocol v2 server commands' . ./test-lib.sh test_expect_success 'test capability advertisement' ' + test_oid_cache <<-EOF && + wrong_algo sha1:sha256 + wrong_algo sha256:sha1 + EOF cat >expect <<-EOF && version 2 agent=git/$(git version | cut -d" " -f3) ls-refs fetch=shallow server-option + object-format=$(test_oid algo) 0000 EOF @@ -45,6 +50,7 @@ test_expect_success 'request invalid capability' ' test_expect_success 'request with no command' ' test-tool pkt-line pack >in <<-EOF && agent=git/test + object-format=$(test_oid algo) 0000 EOF test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in && @@ -54,6 +60,7 @@ test_expect_success 'request with no command' ' test_expect_success 'request invalid command' ' test-tool pkt-line pack >in <<-EOF && command=foo + object-format=$(test_oid algo) agent=git/test 0000 EOF @@ -61,6 +68,17 @@ test_expect_success 'request invalid command' ' test_i18ngrep "invalid command" err ' +test_expect_success 'wrong object-format' ' + test-tool pkt-line pack >in <<-EOF && + command=fetch + agent=git/test + object-format=$(test_oid wrong_algo) + 0000 + EOF + test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in && + test_i18ngrep "mismatched object format" err +' + # Test the basics of ls-refs # test_expect_success 'setup some refs and tags' ' @@ -74,6 +92,7 @@ test_expect_success 'setup some refs and tags' ' test_expect_success 'basics of ls-refs' ' test-tool pkt-line pack >in <<-EOF && command=ls-refs + object-format=$(test_oid algo) 0000 EOF @@ -96,6 +115,7 @@ test_expect_success 'basics of ls-refs' ' test_expect_success 'basic ref-prefixes' ' test-tool pkt-line pack >in <<-EOF && command=ls-refs + object-format=$(test_oid algo) 0001 ref-prefix refs/heads/master ref-prefix refs/tags/one @@ -116,6 +136,7 @@ test_expect_success 'basic ref-prefixes' ' test_expect_success 'refs/heads prefix' ' test-tool pkt-line pack >in <<-EOF && command=ls-refs + object-format=$(test_oid algo) 0001 ref-prefix refs/heads/ 0000 @@ -136,6 +157,7 @@ test_expect_success 'refs/heads prefix' ' test_expect_success 'peel parameter' ' test-tool pkt-line pack >in <<-EOF && command=ls-refs + object-format=$(test_oid algo) 0001 peel ref-prefix refs/tags/ @@ -157,6 +179,7 @@ test_expect_success 'peel parameter' ' test_expect_success 'symrefs parameter' ' test-tool pkt-line pack >in <<-EOF && command=ls-refs + object-format=$(test_oid algo) 0001 symrefs ref-prefix refs/heads/ @@ -178,6 +201,7 @@ test_expect_success 'symrefs parameter' ' test_expect_success 'sending server-options' ' test-tool pkt-line pack >in <<-EOF && command=ls-refs + object-format=$(test_oid algo) server-option=hello server-option=world 0001 @@ -200,6 +224,7 @@ test_expect_success 'unexpected lines are not allowed in fetch request' ' test-tool pkt-line pack >in <<-EOF && command=fetch + object-format=$(test_oid algo) 0001 this-is-not-a-command 0000 diff --git a/third_party/git/t/t5702-protocol-v2.sh b/third_party/git/t/t5702-protocol-v2.sh index 011b81d4fc..7d5b17909b 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 advertisment is filtered with ls-remote using protocol v2' ' +test_expect_success 'ref advertisement 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 advertisment is filtered with ls-remote using protocol v2' ' +test_expect_success 'ref advertisement 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 advertisment is filtered during fetch using protocol v2' ' +test_expect_success 'ref advertisement is filtered during fetch using protocol v2' ' test_when_finished "rm -f log" && test_commit -C file_parent three && @@ -348,7 +348,6 @@ test_expect_success 'partial fetch' ' rm -rf client "$(pwd)/trace" && git init client && SERVER="file://$(pwd)/server" && - test_config -C client extensions.partialClone "$SERVER" && GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \ fetch --filter=blob:none "$SERVER" master:refs/heads/other && @@ -394,6 +393,7 @@ test_expect_success 'even with handcrafted request, filter does not work if not # Custom request that tries to filter even though it is not advertised. test-tool pkt-line pack >in <<-EOF && command=fetch + object-format=$(test_oid algo) 0001 want $(git -C server rev-parse master) filter blob:none @@ -586,6 +586,53 @@ test_expect_success 'clone with http:// using protocol v2' ' ! grep "Send header: Transfer-Encoding: chunked" log ' +test_expect_success 'clone repository with http:// using protocol v2 with incomplete pktline length' ' + test_when_finished "rm -f log" && + + git init "$HTTPD_DOCUMENT_ROOT_PATH/incomplete_length" && + test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/incomplete_length" file && + + test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" git -c protocol.version=2 \ + clone "$HTTPD_URL/smart/incomplete_length" incomplete_length_child 2>err && + + # Client requested to use protocol v2 + grep "Git-Protocol: version=2" log && + # Server responded using protocol v2 + grep "git< version 2" log && + # Client reported appropriate failure + test_i18ngrep "bytes of length header were received" err +' + +test_expect_success 'clone repository with http:// using protocol v2 with incomplete pktline body' ' + test_when_finished "rm -f log" && + + git init "$HTTPD_DOCUMENT_ROOT_PATH/incomplete_body" && + test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/incomplete_body" file && + + test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" git -c protocol.version=2 \ + clone "$HTTPD_URL/smart/incomplete_body" incomplete_body_child 2>err && + + # Client requested to use protocol v2 + grep "Git-Protocol: version=2" log && + # Server responded using protocol v2 + grep "git< version 2" log && + # Client reported appropriate failure + test_i18ngrep "bytes of body are still expected" err +' + +test_expect_success 'clone with http:// using protocol v2 and invalid parameters' ' + test_when_finished "rm -f log" && + + test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" \ + git -c protocol.version=2 \ + clone --shallow-since=20151012 "$HTTPD_URL/smart/http_parent" http_child_invalid && + + # Client requested to use protocol v2 + grep "Git-Protocol: version=2" log && + # Server responded using protocol v2 + grep "git< version 2" log +' + test_expect_success 'clone big repository with http:// using protocol v2' ' test_when_finished "rm -f log" && @@ -631,6 +678,19 @@ 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" && @@ -652,6 +712,18 @@ 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 @@ -669,9 +741,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 didnt request to use protocol v2 + # Client did not request to use protocol v2 ! grep "Git-Protocol: version=2" log && - # Server didnt respond using protocol v2 + # Server did not respond using protocol v2 ! grep "git< version 2" log ' @@ -687,11 +759,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/,$ s/0001/0000/" \ - >"$HTTPD_ROOT_PATH/one-time-sed" && + printf "\$ready = 1 if /ready/; \$ready && s/0001/0000/" \ + >"$HTTPD_ROOT_PATH/one-time-perl" && test_must_fail git -C http_child -c protocol.version=2 \ - fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err && + fetch "$HTTPD_URL/one_time_perl/http_parent" 2> err && test_i18ngrep "expected packfile to be sent after .ready." err ' @@ -712,15 +784,159 @@ 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 "/acknowledgments/,$ s/0000/0001/" \ - >"$HTTPD_ROOT_PATH/one-time-sed" && + printf "\$ack = 1 if /acknowledgments/; \$ack && s/0000/0001/" \ + >"$HTTPD_ROOT_PATH/one-time-perl" && test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" git -C http_child \ -c protocol.version=2 \ - fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err && + fetch "$HTTPD_URL/one_time_perl/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 ' +configure_exclusion () { + git -C "$1" hash-object "$2" >objh && + git -C "$1" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh && + git -C "$1" config --add \ + "uploadpack.blobpackfileuri" \ + "$(cat objh) $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" && + cat objh +} + +test_expect_success 'part of packfile response provided as URI' ' + P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + rm -rf "$P" http_child log && + + git init "$P" && + git -C "$P" config "uploadpack.allowsidebandall" "true" && + + echo my-blob >"$P/my-blob" && + git -C "$P" add my-blob && + echo other-blob >"$P/other-blob" && + git -C "$P" add other-blob && + git -C "$P" commit -m x && + + configure_exclusion "$P" my-blob >h && + configure_exclusion "$P" other-blob >h2 && + + GIT_TRACE=1 GIT_TRACE_PACKET="$(pwd)/log" GIT_TEST_SIDEBAND_ALL=1 \ + git -c protocol.version=2 \ + -c fetch.uriprotocols=http,https \ + clone "$HTTPD_URL/smart/http_parent" http_child && + + # Ensure that my-blob and other-blob are in separate packfiles. + for idx in http_child/.git/objects/pack/*.idx + do + git verify-pack --object-format=$(test_oid algo) --verbose $idx >out && + { + grep "^[0-9a-f]\{16,\} " out || : + } >out.objectlist && + if test_line_count = 1 out.objectlist + then + if grep $(cat h) out + then + >hfound + fi && + if grep $(cat h2) out + then + >h2found + fi + fi + done && + test -f hfound && + test -f h2found && + + # Ensure that there are exactly 6 files (3 .pack and 3 .idx). + ls http_child/.git/objects/pack/* >filelist && + test_line_count = 6 filelist +' + +test_expect_success 'fetching with valid packfile URI but invalid hash fails' ' + P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + rm -rf "$P" http_child log && + + git init "$P" && + git -C "$P" config "uploadpack.allowsidebandall" "true" && + + echo my-blob >"$P/my-blob" && + git -C "$P" add my-blob && + echo other-blob >"$P/other-blob" && + git -C "$P" add other-blob && + git -C "$P" commit -m x && + + configure_exclusion "$P" my-blob >h && + # Configure a URL for other-blob. Just reuse the hash of the object as + # the hash of the packfile, since the hash does not matter for this + # test as long as it is not the hash of the pack, and it is of the + # expected length. + git -C "$P" hash-object other-blob >objh && + git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh && + git -C "$P" config --add \ + "uploadpack.blobpackfileuri" \ + "$(cat objh) $(cat objh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" && + + test_must_fail env GIT_TEST_SIDEBAND_ALL=1 \ + git -c protocol.version=2 \ + -c fetch.uriprotocols=http,https \ + clone "$HTTPD_URL/smart/http_parent" http_child 2>err && + test_i18ngrep "pack downloaded from.*does not match expected hash" err +' + +test_expect_success 'packfile-uri with transfer.fsckobjects' ' + P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + rm -rf "$P" http_child log && + + git init "$P" && + git -C "$P" config "uploadpack.allowsidebandall" "true" && + + echo my-blob >"$P/my-blob" && + git -C "$P" add my-blob && + git -C "$P" commit -m x && + + configure_exclusion "$P" my-blob >h && + + sane_unset GIT_TEST_SIDEBAND_ALL && + git -c protocol.version=2 -c transfer.fsckobjects=1 \ + -c fetch.uriprotocols=http,https \ + clone "$HTTPD_URL/smart/http_parent" http_child && + + # Ensure that there are exactly 4 files (2 .pack and 2 .idx). + ls http_child/.git/objects/pack/* >filelist && + test_line_count = 4 filelist +' + +test_expect_success 'packfile-uri with transfer.fsckobjects fails on bad object' ' + P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + rm -rf "$P" http_child log && + + git init "$P" && + git -C "$P" config "uploadpack.allowsidebandall" "true" && + + cat >bogus-commit <<-EOF && + tree $EMPTY_TREE + author Bugs Bunny 1234567890 +0000 + committer Bugs Bunny <bugs@bun.ni> 1234567890 +0000 + + This commit object intentionally broken + EOF + BOGUS=$(git -C "$P" hash-object -t commit -w --stdin <bogus-commit) && + git -C "$P" branch bogus-branch "$BOGUS" && + + echo my-blob >"$P/my-blob" && + git -C "$P" add my-blob && + git -C "$P" commit -m x && + + configure_exclusion "$P" my-blob >h && + + sane_unset GIT_TEST_SIDEBAND_ALL && + test_must_fail git -c protocol.version=2 -c transfer.fsckobjects=1 \ + -c fetch.uriprotocols=http,https \ + clone "$HTTPD_URL/smart/http_parent" http_child 2>error && + test_i18ngrep "invalid author/committer line - missing email" error +' + +# 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 de4b6106ef..d9ecf0f4a9 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 @@ -13,19 +13,27 @@ get_actual_refs () { } get_actual_commits () { - sed -n -e '/packfile/,/0000/{ - /packfile/d - p - }' <out | test-tool pkt-line unpack-sideband >o.pack && + test-tool pkt-line unpack-sideband <out >o.pack && git index-pack o.pack && - git verify-pack -v o.idx | grep commit | cut -c-40 | sort >actual_commits + git verify-pack -v o.idx >objs && + grep commit objs | cut -d" " -f1 | sort >actual_commits } check_output () { get_actual_refs && test_cmp expected_refs actual_refs && get_actual_commits && - test_cmp expected_commits actual_commits + sort expected_commits >sorted_commits && + test_cmp sorted_commits actual_commits +} + +write_command () { + echo "command=$1" + + if test "$(test_oid algo)" != sha1 + then + echo "object-format=$(test_oid algo)" + fi } # c(o/foo) d(o/bar) @@ -49,20 +57,23 @@ test_expect_success 'setup repository' ' test_expect_success 'config controls ref-in-want advertisement' ' test-tool serve-v2 --advertise-capabilities >out && - ! grep -a ref-in-want out && + perl -ne "/ref-in-want/ and print" out >out.filter && + test_must_be_empty out.filter && git config uploadpack.allowRefInWant false && test-tool serve-v2 --advertise-capabilities >out && - ! grep -a ref-in-want out && + perl -ne "/ref-in-want/ and print" out >out.filter && + test_must_be_empty out.filter && git config uploadpack.allowRefInWant true && test-tool serve-v2 --advertise-capabilities >out && - grep -a ref-in-want out + perl -ne "/ref-in-want/ and print" out >out.filter && + test_file_not_empty out.filter ' test_expect_success 'invalid want-ref line' ' test-tool pkt-line pack >in <<-EOF && - command=fetch + $(write_command fetch) 0001 no-progress want-ref refs/heads/non-existent @@ -75,17 +86,19 @@ test_expect_success 'invalid want-ref line' ' ' test_expect_success 'basic want-ref' ' + oid=$(git rev-parse f) && cat >expected_refs <<-EOF && - $(git rev-parse f) refs/heads/master + $oid refs/heads/master EOF - git rev-parse f | sort >expected_commits && + git rev-parse f >expected_commits && + oid=$(git rev-parse a) && test-tool pkt-line pack >in <<-EOF && - command=fetch + $(write_command fetch) 0001 no-progress want-ref refs/heads/master - have $(git rev-parse a) + have $oid done 0000 EOF @@ -95,19 +108,22 @@ 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 && - $(git rev-parse c) refs/heads/o/foo - $(git rev-parse d) refs/heads/o/bar + $oid_c refs/heads/o/foo + $oid_d refs/heads/o/bar EOF - git rev-parse c d | sort >expected_commits && + git rev-parse c d >expected_commits && + oid=$(git rev-parse b) && test-tool pkt-line pack >in <<-EOF && - command=fetch + $(write_command fetch) 0001 no-progress want-ref refs/heads/o/foo want-ref refs/heads/o/bar - have $(git rev-parse b) + have $oid done 0000 EOF @@ -117,13 +133,14 @@ test_expect_success 'multiple want-ref lines' ' ' test_expect_success 'mix want and want-ref' ' + oid=$(git rev-parse f) && cat >expected_refs <<-EOF && - $(git rev-parse f) refs/heads/master + $oid refs/heads/master EOF - git rev-parse e f | sort >expected_commits && + git rev-parse e f >expected_commits && test-tool pkt-line pack >in <<-EOF && - command=fetch + $(write_command fetch) 0001 no-progress want-ref refs/heads/master @@ -138,17 +155,19 @@ 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 && - $(git rev-parse c) refs/heads/o/foo + $oid refs/heads/o/foo EOF >expected_commits && + oid=$(git rev-parse c) && test-tool pkt-line pack >in <<-EOF && - command=fetch + $(write_command fetch) 0001 no-progress want-ref refs/heads/o/foo - have $(git rev-parse c) + have $oid done 0000 EOF @@ -157,106 +176,6 @@ 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" @@ -311,13 +230,14 @@ 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 \ - $(git -C "$REPO" rev-parse d):refs/heads/actual && + "$oid":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 $(git -C "$REPO" rev-parse d)" log + grep "want $oid" log ' test_expect_success 'fetching multiple refs' ' @@ -339,13 +259,14 @@ 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 $(git -C "$REPO" rev-parse b):refs/heads/actual && + master "$oid":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 $(git -C "$REPO" rev-parse b)" log && + grep "want $oid" log && grep "want-ref refs/heads/master" log ' @@ -372,4 +293,107 @@ 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/t5704-protocol-violations.sh b/third_party/git/t/t5704-protocol-violations.sh new file mode 100755 index 0000000000..5c941949b9 --- /dev/null +++ b/third_party/git/t/t5704-protocol-violations.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +test_description='Test responses to violations of the network protocol. In most +of these cases it will generally be acceptable for one side to break off +communications if the other side says something unexpected. We are mostly +making sure that we do not segfault or otherwise behave badly.' +. ./test-lib.sh + +test_expect_success 'extra delim packet in v2 ls-refs args' ' + { + packetize command=ls-refs && + packetize "object-format=$(test_oid algo)" && + printf 0001 && + # protocol expects 0000 flush here + printf 0001 + } >input && + test_must_fail env GIT_PROTOCOL=version=2 \ + git upload-pack . <input 2>err && + test_i18ngrep "expected flush after ls-refs arguments" err +' + +test_expect_success 'extra delim packet in v2 fetch args' ' + { + packetize command=fetch && + packetize "object-format=$(test_oid algo)" && + printf 0001 && + # protocol expects 0000 flush here + printf 0001 + } >input && + test_must_fail env GIT_PROTOCOL=version=2 \ + git upload-pack . <input 2>err && + test_i18ngrep "expected flush after fetch arguments" err +' + +test_done diff --git a/third_party/git/t/t5801-remote-helpers.sh b/third_party/git/t/t5801-remote-helpers.sh index 2d6c4a281e..0f04b6cddb 100755 --- a/third_party/git/t/t5801-remote-helpers.sh +++ b/third_party/git/t/t5801-remote-helpers.sh @@ -11,9 +11,15 @@ test_description='Test remote-helper import and export commands' PATH="$TEST_DIRECTORY/t5801:$PATH" compare_refs() { + fail= && + if test "x$1" = 'x!' + then + fail='!' && + shift + fi && git --git-dir="$1/.git" rev-parse --verify $2 >expect && git --git-dir="$3/.git" rev-parse --verify $4 >actual && - test_cmp expect actual + eval $fail test_cmp expect actual } test_expect_success 'setup repository' ' @@ -189,7 +195,7 @@ test_expect_success GPG 'push signed tag' ' git push origin signed-tag ) && compare_refs local signed-tag^{} server signed-tag^{} && - test_must_fail compare_refs local signed-tag server signed-tag + compare_refs ! local signed-tag server signed-tag ' test_expect_success GPG 'push signed tag with signed-tags capability' ' @@ -247,7 +253,6 @@ 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/t5801/git-remote-testgit b/third_party/git/t/t5801/git-remote-testgit index 6b9f0b5dc7..1544d6dc6b 100755 --- a/third_party/git/t/t5801/git-remote-testgit +++ b/third_party/git/t/t5801/git-remote-testgit @@ -52,9 +52,11 @@ do test -n "$GIT_REMOTE_TESTGIT_SIGNED_TAGS" && echo "signed-tags" test -n "$GIT_REMOTE_TESTGIT_NO_PRIVATE_UPDATE" && echo "no-private-update" echo 'option' + echo 'object-format' echo ;; list) + echo ":object-format $(git rev-parse --show-object-format=storage)" git for-each-ref --format='? %(refname)' 'refs/heads/' 'refs/tags/' head=$(git symbolic-ref HEAD) echo "@$head HEAD" @@ -139,6 +141,10 @@ do test $val = "true" && force="true" || force= echo "ok" ;; + object-format) + test $val = "true" && object_format="true" || object_format= + echo "ok" + ;; *) echo "unsupported" ;; diff --git a/third_party/git/t/t6000-rev-list-misc.sh b/third_party/git/t/t6000-rev-list-misc.sh index 52a9e38d66..fc4d55dcb2 100755 --- a/third_party/git/t/t6000-rev-list-misc.sh +++ b/third_party/git/t/t6000-rev-list-misc.sh @@ -8,6 +8,7 @@ test_expect_success setup ' echo content1 >wanted_file && echo content2 >unwanted_file && git add wanted_file unwanted_file && + test_tick && git commit -m one ' @@ -21,6 +22,7 @@ test_expect_success 'rev-list --objects with pathspecs and deeper paths' ' mkdir foo && >foo/file && git add foo/file && + test_tick && git commit -m two && git rev-list --objects HEAD -- foo >output && @@ -69,6 +71,7 @@ test_expect_success '--no-object-names and --object-names are last-one-wins' ' ' test_expect_success 'rev-list A..B and rev-list ^A B are the same' ' + test_tick && git commit --allow-empty -m another && git tag -a -m "annotated" v1.0 && git rev-list --objects ^v1.0^ v1.0 >expect && @@ -84,10 +87,10 @@ test_expect_success 'propagate uninteresting flag down correctly' ' test_expect_success 'symleft flag bit is propagated down from tag' ' git log --format="%m %s" --left-right v1.0...master >actual && cat >expect <<-\EOF && - > two - > one < another < that + > two + > one EOF test_cmp expect actual ' @@ -104,13 +107,16 @@ 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 @@ -122,8 +128,8 @@ test_expect_success 'rev-list can negate index objects' ' test_cmp expect actual ' -test_expect_success '--bisect and --first-parent can not be combined' ' - test_must_fail git rev-list --bisect --first-parent HEAD +test_expect_success '--bisect and --first-parent can be combined' ' + git rev-list --bisect --first-parent HEAD ' test_expect_success '--header shows a NUL after each commit' ' @@ -140,4 +146,24 @@ 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/t6002-rev-list-bisect.sh b/third_party/git/t/t6002-rev-list-bisect.sh index a661408038..b95a0212ad 100755 --- a/third_party/git/t/t6002-rev-list-bisect.sh +++ b/third_party/git/t/t6002-rev-list-bisect.sh @@ -263,4 +263,49 @@ test_expect_success 'rev-parse --bisect can default to good/bad refs' ' test_cmp expect.sorted actual.sorted ' +test_output_expect_success '--bisect --first-parent' 'git rev-list --bisect --first-parent E ^F' <<EOF +e4 +EOF + +test_output_expect_success '--first-parent' 'git rev-list --first-parent E ^F' <<EOF +E +e1 +e2 +e3 +e4 +e5 +e6 +e7 +e8 +EOF + +test_output_expect_success '--bisect-vars --first-parent' 'git rev-list --bisect-vars --first-parent E ^F' <<EOF +bisect_rev='e5' +bisect_nr=4 +bisect_good=4 +bisect_bad=3 +bisect_all=9 +bisect_steps=2 +EOF + +test_expect_success '--bisect-all --first-parent' ' + cat >expect.unsorted <<-EOF && + $(git rev-parse E) (tag: E, dist=0) + $(git rev-parse e1) (tag: e1, dist=1) + $(git rev-parse e2) (tag: e2, dist=2) + $(git rev-parse e3) (tag: e3, dist=3) + $(git rev-parse e4) (tag: e4, dist=4) + $(git rev-parse e5) (tag: e5, dist=4) + $(git rev-parse e6) (tag: e6, dist=3) + $(git rev-parse e7) (tag: e7, dist=2) + $(git rev-parse e8) (tag: e8, dist=1) + EOF + + # expect results to be ordered by distance (descending), + # commit hash (ascending) + sort -k4,4r -k1,1 expect.unsorted >expect && + git rev-list --bisect-all --first-parent E ^F >actual && + test_cmp expect 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 da113d975b..bc95da8a5f 100755 --- a/third_party/git/t/t6006-rev-list-format.sh +++ b/third_party/git/t/t6006-rev-list-format.sh @@ -109,31 +109,35 @@ commit $head1 EOF # we don't test relative here -test_format author %an%n%ae%n%ad%n%aD%n%at <<EOF +test_format author %an%n%ae%n%al%n%ad%n%aD%n%at <<EOF commit $head2 -A U Thor -author@example.com +$GIT_AUTHOR_NAME +$GIT_AUTHOR_EMAIL +$TEST_AUTHOR_LOCALNAME Thu Apr 7 15:13:13 2005 -0700 Thu, 7 Apr 2005 15:13:13 -0700 1112911993 commit $head1 -A U Thor -author@example.com +$GIT_AUTHOR_NAME +$GIT_AUTHOR_EMAIL +$TEST_AUTHOR_LOCALNAME 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%cd%n%cD%n%ct <<EOF +test_format committer %cn%n%ce%n%cl%n%cd%n%cD%n%ct <<EOF commit $head2 -C O Mitter -committer@example.com +$GIT_COMMITTER_NAME +$GIT_COMMITTER_EMAIL +$TEST_COMMITTER_LOCALNAME Thu Apr 7 15:13:13 2005 -0700 Thu, 7 Apr 2005 15:13:13 -0700 1112911993 commit $head1 -C O Mitter -committer@example.com +$GIT_COMMITTER_NAME +$GIT_COMMITTER_EMAIL +$TEST_COMMITTER_LOCALNAME Thu Apr 7 15:13:13 2005 -0700 Thu, 7 Apr 2005 15:13:13 -0700 1112911993 @@ -410,7 +414,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" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700" + verbose test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700" ' test_expect_success 'del LF before empty (1)' ' @@ -459,9 +463,10 @@ 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 = 41 + test $len = $expected ' test_expect_success '%h is not affected by --abbrev-commit' ' @@ -495,15 +500,14 @@ test_expect_success '%gd shortens ref name' ' ' test_expect_success 'reflog identity' ' - echo "C O Mitter:committer@example.com" >expect && + echo "$GIT_COMMITTER_NAME:$GIT_COMMITTER_EMAIL" >expect && git log -g -1 --format="%gn:%ge" >actual && test_cmp expect actual ' test_expect_success 'oneline with 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 commit --allow-empty --cleanup=verbatim -m "$LF" && + git commit --allow-empty --allow-empty-message && 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 545b461e51..bad02cf5b8 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 rev-list --all > /dev/null + test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --all > /dev/null ' test_expect_success 'git repack _MUST_ fail' \ diff --git a/third_party/git/t/t6012-rev-list-simplify.sh b/third_party/git/t/t6012-rev-list-simplify.sh index a10f0df02b..7fc10f8593 100755 --- a/third_party/git/t/t6012-rev-list-simplify.sh +++ b/third_party/git/t/t6012-rev-list-simplify.sh @@ -154,4 +154,124 @@ test_expect_success '--full-diff is not affected by --parents' ' test_cmp expected actual ' +# +# Create a new history to demonstrate the value of --show-pulls +# with respect to the subtleties of simplified history, --full-history, +# and --simplify-merges. +# +# .-A---M-----C--N---O---P +# / / \ \ \/ / / +# I B \ R-'`-Z' / +# \ / \/ / +# \ / /\ / +# `---X--' `---Y--' +# +# This example is explained in Documentation/rev-list-options.txt + +test_expect_success 'rebuild repo' ' + rm -rf .git * && + git init && + git switch -c topic && + + echo base >file && + git add file && + test_commit I && + + echo A >file && + git add file && + test_commit A && + + git switch -c branchB I && + echo B >file && + git add file && + test_commit B && + + git switch topic && + test_must_fail git merge -m "M" B && + echo A >file && + echo B >>file && + git add file && + git merge --continue && + note M && + + echo C >other && + git add other && + test_commit C && + + git switch -c branchX I && + echo X >file && + git add file && + test_commit X && + + git switch -c branchR M && + git merge -m R -Xtheirs X && + note R && + + git switch topic && + git merge -m N R && + note N && + + git switch -c branchY M && + echo Y >y && + git add y && + test_commit Y && + + git switch -c branchZ C && + echo Z >z && + git add z && + test_commit Z && + + git switch topic && + git merge -m O Z && + note O && + + git merge -m P Y && + note P +' + +check_result 'X I' -- file +check_result 'N R X I' --show-pulls -- file + +check_result 'P O N R X M B A I' --full-history --topo-order -- file +check_result 'N R X M B A I' --simplify-merges --topo-order --show-pulls -- file +check_result 'R X M B A I' --simplify-merges --topo-order -- file +check_result 'N M A I' --first-parent -- file +check_result 'N M A I' --first-parent --show-pulls -- file + +# --ancestry-path implies --full-history +check_result 'P O N R M' --topo-order \ + --ancestry-path A..HEAD -- file +check_result 'P O N R M' --topo-order \ + --show-pulls \ + --ancestry-path A..HEAD -- file +check_result 'P O N R M' --topo-order \ + --full-history \ + --ancestry-path A..HEAD -- file +check_result 'R M' --topo-order \ + --simplify-merges \ + --ancestry-path A..HEAD -- file +check_result 'N R M' --topo-order \ + --simplify-merges --show-pulls \ + --ancestry-path A..HEAD -- file + +test_expect_success 'log --graph --simplify-merges --show-pulls' ' + cat >expect <<-\EOF && + * N + * R + |\ + | * X + * | M + |\ \ + | * | B + | |/ + * / A + |/ + * I + EOF + git log --graph --pretty="%s" \ + --simplify-merges --show-pulls \ + -- file >actual && + test_cmp expect actual +' + test_done 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 f7181d1d6a..f5e6e92f5b 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,11 +67,10 @@ 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 "| \\ " >> expected && + echo "*-. | $A4" >> expected && + echo "|\\ \\| " >> expected && echo "| | * $C2" >> expected && echo "| | * $C1" >> expected && echo "| * | $B2" >> expected && @@ -97,11 +96,10 @@ 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 "| \\ " >> expected && + echo "*-. | $A4" >> expected && + echo "|\\ \\| " >> expected && echo "| | * $C2" >> expected && echo "| | * $C1" >> expected && echo "| * | $B2" >> expected && @@ -131,9 +129,8 @@ 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 "| |/ " >> expected && + echo "* | $A4" >> expected && + echo "|\\| " >> expected && echo "| * $C2" >> expected && echo "| * $C1" >> expected && echo "* | $A3" >> expected && @@ -151,9 +148,8 @@ test_expect_success '--graph --full-history -- bar.txt' ' echo "|\\ " >> expected && echo "| * $C4" >> expected && echo "* | $A5" >> expected && - echo "* | $A4" >> expected && - echo "|\\ \\ " >> expected && - echo "| |/ " >> expected && + echo "* | $A4" >> expected && + echo "|\\| " >> expected && echo "* | $A3" >> expected && echo "|/ " >> expected && echo "* $A2" >> expected && @@ -255,7 +251,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/t6018-rev-list-glob.sh b/third_party/git/t/t6018-rev-list-glob.sh index bb5aeac07f..fe2f3cec3d 100755 --- a/third_party/git/t/t6018-rev-list-glob.sh +++ b/third_party/git/t/t6018-rev-list-glob.sh @@ -32,11 +32,11 @@ test_expect_success 'setup' ' git checkout -b someref master && commit some && git checkout master && - commit master2 && + commit topic_2 && git tag foo/bar master && - commit master3 && + commit topic_3 && git update-ref refs/remotes/foo/baz master && - commit master4 && + commit topic_4 && git update-ref refs/remotes/upstream/one subspace/one && git update-ref refs/remotes/upstream/two subspace/two && git update-ref refs/remotes/upstream/x subspace-x && @@ -345,6 +345,11 @@ test_expect_success 'rev-list should succeed with empty output with empty glob' test_must_be_empty actual ' +test_expect_success 'rev-list should succeed with empty output when ignoring missing' ' + git rev-list --ignore-missing $ZERO_OID >actual && + test_must_be_empty actual +' + test_expect_success 'shortlog accepts --glob/--tags/--remotes' ' compare shortlog "subspace/one subspace/two" --branches=subspace && 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 beadaf6cca..353f84313f 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 -z "$(cat actual)") + test_must_be_empty 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 -z "$(cat actual)") + test_must_be_empty actual) ' test_done diff --git a/third_party/git/t/t6021-merge-criss-cross.sh b/third_party/git/t/t6021-merge-criss-cross.sh deleted file mode 100755 index 213deecab1..0000000000 --- a/third_party/git/t/t6021-merge-criss-cross.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2005 Fredrik Kuivinen -# - -# 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' \ -'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/t6023-merge-file.sh b/third_party/git/t/t6023-merge-file.sh deleted file mode 100755 index 51ee887a77..0000000000 --- a/third_party/git/t/t6023-merge-file.sh +++ /dev/null @@ -1,362 +0,0 @@ -#!/bin/sh - -test_description='RCS merge replacement: merge-file' -. ./test-lib.sh - -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 && - git merge-file test.txt orig.txt orig.txt && - test_cmp test.txt orig.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 && - cp new1.txt dir/a.txt && - cp orig.txt dir/o.txt && - cp new2.txt dir/b.txt && - ( cd dir && git merge-file a.txt o.txt b.txt ) && - test_path_is_missing a.txt -' - -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 \ - orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err && - 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' ' - - test_must_fail git merge-file -p new6.txt new5.txt new7.txt > output && - 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' ' - - test_must_fail git merge-file -p \ - new8.txt new5.txt new9.txt > merge.out && - test 1 = $(grep ======= < merge.out | wc -l) - -' - -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, ->>>>>>> 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 -' - -test_expect_success '"diff3 -m" style output (2)' ' - git config merge.conflictstyle diff3 && - test_must_fail git merge-file -p \ - new8.txt new5.txt new9.txt >actual && - test_cmp expect actual -' - -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, ->>>>>>>>>> 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 -' - -printf "line1\nline2\nline3" >nolf-orig.txt -printf "line1\nline2\nline3x" >nolf-diff1.txt -printf "line1\nline2\nline3y" >nolf-diff2.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 --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 && - printf "1\\r\\n2\\r\\n4" >crlf-diff1.txt && - printf "1\\r\\n2\\r\\n5" >crlf-diff2.txt && - test_must_fail git -c core.eol=crlf merge-file -p \ - crlf-diff1.txt crlf-orig.txt crlf-diff2.txt >crlf.txt && - test $(tr "\015" Q <crlf.txt | grep "^[<=>].*Q$" | wc -l) = 3 && - test $(tr "\015" Q <crlf.txt | grep "[345]Q$" | wc -l) = 3 && - test_must_fail git -c core.eol=crlf merge-file -p \ - nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >nolf.txt && - test $(tr "\015" Q <nolf.txt | grep "^[<=>].*Q$" | wc -l) = 0 -' - -test_done diff --git a/third_party/git/t/t6024-recursive-merge.sh b/third_party/git/t/t6024-recursive-merge.sh deleted file mode 100755 index 27c7de90ce..0000000000 --- a/third_party/git/t/t6024-recursive-merge.sh +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh - -test_description='Test merge without common ancestors' -. ./test-lib.sh - -# This scenario is based on a real-world repository of Shawn Pearce. - -# 1 - A - D - F -# \ X / -# B X -# X \ -# 2 - C - E - G - -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_expect_success 'combined merge conflicts' ' - test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G -' - -cat > expect << EOF -<<<<<<< HEAD -F -======= -G ->>>>>>> G -EOF - -test_expect_success "result contains a conflict" "test_cmp expect a1" - -git ls-files --stage > out -cat > expect << EOF -100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1 a1 -100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1 -100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1 -EOF - -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 && - git add binary-file && - git commit -m binary && - git checkout G && - printf "\0\0" > binary-file && - git add binary-file && - git commit -m binary2 && - test_must_fail git merge F > merge.out 2> merge.err && - grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge.err -' - -test_expect_success 'mark rename/delete as unmerged' ' - - git reset --hard && - git checkout -b delete && - git rm a1 && - test_tick && - git commit -m delete && - git checkout -b rename HEAD^ && - git mv a1 a2 && - test_tick && - git commit -m rename && - test_must_fail git merge delete && - test 1 = $(git ls-files --unmerged | wc -l) && - git rev-parse --verify :2:a2 && - test_must_fail git rev-parse --verify :3:a2 && - git checkout -f delete && - test_must_fail git merge rename && - 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 deleted file mode 100755 index 433c4de08f..0000000000 --- a/third_party/git/t/t6025-merge-symlinks.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2007 Johannes Sixt -# - -test_description='merging symlinks on filesystem w/o symlink support. - -This tests that git merge-recursive writes merge results as plain files -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 -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/t6030-bisect-porcelain.sh b/third_party/git/t/t6030-bisect-porcelain.sh index bdc42e9440..aa226381be 100755 --- a/third_party/git/t/t6030-bisect-porcelain.sh +++ b/third_party/git/t/t6030-bisect-porcelain.sh @@ -82,6 +82,13 @@ test_expect_success 'bisect fails if given any junk instead of revs' ' git bisect bad $HASH4 ' +test_expect_success 'bisect start without -- takes unknown arg as pathspec' ' + git bisect reset && + git bisect start foo bar && + grep foo ".git/BISECT_NAMES" && + grep bar ".git/BISECT_NAMES" +' + test_expect_success 'bisect reset: back in the master branch' ' git bisect reset && echo "* master" > branch.expect && @@ -148,7 +155,7 @@ test_expect_success 'bisect start: no ".git/BISECT_START" created if junk rev' ' test_must_fail git bisect start $HASH4 foo -- && git branch > branch.output && grep "* other" branch.output > /dev/null && - test_must_fail test -e .git/BISECT_START + test_path_is_missing .git/BISECT_START ' test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if junk rev' ' @@ -166,7 +173,7 @@ test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' ' test_must_fail git bisect start $HASH1 $HASH4 -- && git branch > branch.output && grep "* other" branch.output > /dev/null && - test_must_fail test -e .git/BISECT_START + test_path_is_missing .git/BISECT_START ' test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' ' @@ -175,7 +182,7 @@ test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' ' git branch && git branch > branch.output && grep "* other" branch.output > /dev/null && - test_must_fail test -e .git/BISECT_START && + test_path_is_missing .git/BISECT_START && test -z "$(git for-each-ref "refs/bisect/*")" && git checkout HEAD hello ' @@ -243,32 +250,30 @@ test_expect_success 'bisect skip: with commit both bad and skipped' ' ' # We want to automatically find the commit that -# introduced "Another" into hello. -test_expect_success \ - '"git bisect run" simple case' \ - 'echo "#"\!"/bin/sh" > test_script.sh && - echo "grep Another hello > /dev/null" >> test_script.sh && - echo "test \$? -ne 0" >> test_script.sh && - chmod +x test_script.sh && - git bisect start && - git bisect good $HASH1 && - git bisect bad $HASH4 && - git bisect run ./test_script.sh > my_bisect_log.txt && - grep "$HASH3 is the first bad commit" my_bisect_log.txt && - git bisect reset' +# added "Another" into hello. +test_expect_success '"git bisect run" simple case' ' + write_script test_script.sh <<-\EOF && + ! grep Another hello >/dev/null + EOF + git bisect start && + git bisect good $HASH1 && + git bisect bad $HASH4 && + git bisect run ./test_script.sh >my_bisect_log.txt && + grep "$HASH3 is the first bad commit" my_bisect_log.txt && + git bisect reset +' # We want to automatically find the commit that -# introduced "Ciao" into hello. -test_expect_success \ - '"git bisect run" with more complex "git bisect start"' \ - 'echo "#"\!"/bin/sh" > test_script.sh && - echo "grep Ciao hello > /dev/null" >> test_script.sh && - echo "test \$? -ne 0" >> test_script.sh && - chmod +x test_script.sh && - git bisect start $HASH4 $HASH1 && - git bisect run ./test_script.sh > my_bisect_log.txt && - grep "$HASH4 is the first bad commit" my_bisect_log.txt && - git bisect reset' +# added "Ciao" into hello. +test_expect_success '"git bisect run" with more complex "git bisect start"' ' + write_script test_script.sh <<-\EOF && + ! grep Ciao hello >/dev/null + EOF + git bisect start $HASH4 $HASH1 && + git bisect run ./test_script.sh >my_bisect_log.txt && + grep "$HASH4 is the first bad commit" my_bisect_log.txt && + git bisect reset +' # $HASH1 is good, $HASH5 is bad, we skip $HASH3 # but $HASH4 is good, @@ -295,24 +300,17 @@ HASH6= test_expect_success 'bisect run & skip: cannot tell between 2' ' add_line_into_file "6: Yet a line." hello && HASH6=$(git rev-parse --verify HEAD) && - echo "#"\!"/bin/sh" > test_script.sh && - echo "sed -ne \\\$p hello | grep Ciao > /dev/null && exit 125" >> test_script.sh && - echo "grep line hello > /dev/null" >> test_script.sh && - echo "test \$? -ne 0" >> test_script.sh && - chmod +x test_script.sh && + write_script test_script.sh <<-\EOF && + sed -ne \$p hello | grep Ciao >/dev/null && exit 125 + ! grep line hello >/dev/null + EOF git bisect start $HASH6 $HASH1 && - if git bisect run ./test_script.sh > my_bisect_log.txt - then - echo Oops, should have failed. - false - else - test $? -eq 2 && - grep "first bad commit could be any of" my_bisect_log.txt && - ! grep $HASH3 my_bisect_log.txt && - ! grep $HASH6 my_bisect_log.txt && - grep $HASH4 my_bisect_log.txt && - grep $HASH5 my_bisect_log.txt - fi + test_expect_code 2 git bisect run ./test_script.sh >my_bisect_log.txt && + grep "first bad commit could be any of" my_bisect_log.txt && + ! grep $HASH3 my_bisect_log.txt && + ! grep $HASH6 my_bisect_log.txt && + grep $HASH4 my_bisect_log.txt && + grep $HASH5 my_bisect_log.txt ' HASH7= @@ -320,14 +318,13 @@ test_expect_success 'bisect run & skip: find first bad' ' git bisect reset && add_line_into_file "7: Should be the last line." hello && HASH7=$(git rev-parse --verify HEAD) && - echo "#"\!"/bin/sh" > test_script.sh && - echo "sed -ne \\\$p hello | grep Ciao > /dev/null && exit 125" >> test_script.sh && - echo "sed -ne \\\$p hello | grep day > /dev/null && exit 125" >> test_script.sh && - echo "grep Yet hello > /dev/null" >> test_script.sh && - echo "test \$? -ne 0" >> test_script.sh && - chmod +x test_script.sh && + write_script test_script.sh <<-\EOF && + sed -ne \$p hello | grep Ciao >/dev/null && exit 125 + sed -ne \$p hello | grep day >/dev/null && exit 125 + ! grep Yet hello >/dev/null + EOF git bisect start $HASH7 $HASH1 && - git bisect run ./test_script.sh > my_bisect_log.txt && + git bisect run ./test_script.sh >my_bisect_log.txt && grep "$HASH6 is the first bad commit" my_bisect_log.txt ' @@ -458,6 +455,24 @@ test_expect_success 'many merge bases creation' ' grep "$SIDE_HASH5" merge_bases.txt ' +# We want to automatically find the merge that +# added "line" into hello. +test_expect_success '"git bisect run --first-parent" simple case' ' + git rev-list --first-parent $B_HASH ^$HASH4 >first_parent_chain.txt && + write_script test_script.sh <<-\EOF && + grep $(git rev-parse HEAD) first_parent_chain.txt || exit -1 + ! grep line hello >/dev/null + EOF + git bisect start --first-parent && + test_path_is_file ".git/BISECT_FIRST_PARENT" && + git bisect good $HASH4 && + git bisect bad $B_HASH && + git bisect run ./test_script.sh >my_bisect_log.txt && + grep "$B_HASH is the first bad commit" my_bisect_log.txt && + git bisect reset && + test_path_is_missing .git/BISECT_FIRST_PARENT +' + test_expect_success 'good merge bases when good and bad are siblings' ' git bisect start "$B_HASH" "$A_HASH" > my_bisect_log.txt && test_i18ngrep "merge base must be tested" my_bisect_log.txt && @@ -482,10 +497,10 @@ 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 > my_bisect_log3.txt && + git bisect bad && 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" + test_path_is_missing ".git/BISECT_ANCESTORS_OK" ' # This creates another side branch called "parallel" with some files @@ -792,6 +807,13 @@ test_expect_success 'bisect replay with old and new' ' git bisect reset ' +test_expect_success 'bisect replay with CRLF log' ' + append_cr <log_to_replay.txt >log_to_replay_crlf.txt && + git bisect replay log_to_replay_crlf.txt >bisect_result_crlf && + grep "$HASH2 is the first new commit" bisect_result_crlf && + git bisect reset +' + test_expect_success 'bisect cannot mix old/new and good/bad' ' git bisect start && git bisect bad $HASH4 && @@ -859,7 +881,9 @@ test_expect_success 'bisect cannot mix terms' ' test_expect_success 'bisect terms rejects invalid terms' ' git bisect reset && + test_must_fail git bisect start --term-good && test_must_fail git bisect start --term-good invalid..term && + test_must_fail git bisect start --term-bad && test_must_fail git bisect terms --term-bad invalid..term && test_must_fail git bisect terms --term-good bad && test_must_fail git bisect terms --term-good old && diff --git a/third_party/git/t/t6034-merge-rename-nocruft.sh b/third_party/git/t/t6034-merge-rename-nocruft.sh deleted file mode 100755 index 89871aa5b0..0000000000 --- a/third_party/git/t/t6034-merge-rename-nocruft.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh - -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 - -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 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 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' - -# This test broke in 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae -test_expect_success 'merge white into red (A->B,M->N)' \ -' - git checkout -b red-white red && - git merge white && - git write-tree && - test_path_is_file B && - test_path_is_file N && - test_path_is_file R && - test_path_is_missing A && - test_path_is_missing M -' - -# This test broke in 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9 -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 && - git write-tree && - test_path_is_file A && - echo dirty >expect && - test_cmp expect A && - test_path_is_file B && - test_path_is_file N && - test_path_is_missing M -' - -test_done diff --git a/third_party/git/t/t6040-tracking-info.sh b/third_party/git/t/t6040-tracking-info.sh index ad1922b999..50a934e1b2 100755 --- a/third_party/git/t/t6040-tracking-info.sh +++ b/third_party/git/t/t6040-tracking-info.sh @@ -264,25 +264,25 @@ test_expect_success 'fail to track annotated tags' ' test_expect_success '--set-upstream-to does not change branch' ' git branch from-master master && git branch --set-upstream-to master from-master && - git branch from-master2 master && - test_must_fail git config branch.from-master2.merge > actual && - git rev-list from-master2 && - git update-ref refs/heads/from-master2 from-master2^ && - git rev-parse from-master2 >expect2 && - git branch --set-upstream-to master from-master2 && + git branch from-topic_2 master && + test_must_fail git config branch.from-topic_2.merge > actual && + git rev-list from-topic_2 && + git update-ref refs/heads/from-topic_2 from-topic_2^ && + git rev-parse from-topic_2 >expect2 && + git branch --set-upstream-to master from-topic_2 && git config branch.from-master.merge > actual && - git rev-parse from-master2 >actual2 && + git rev-parse from-topic_2 >actual2 && grep -q "^refs/heads/master$" actual && cmp expect2 actual2 ' test_expect_success '--set-upstream-to @{-1}' ' git checkout follower && - git checkout from-master2 && - git config branch.from-master2.merge > expect2 && + git checkout from-topic_2 && + git config branch.from-topic_2.merge > expect2 && git branch --set-upstream-to @{-1} from-master && git config branch.from-master.merge > actual && - git config branch.from-master2.merge > actual2 && + git config branch.from-topic_2.merge > actual2 && git branch --set-upstream-to follower from-master && git config branch.from-master.merge > expect && test_cmp expect2 actual2 && diff --git a/third_party/git/t/t6041-bisect-submodule.sh b/third_party/git/t/t6041-bisect-submodule.sh index 62b8a2e7bb..df1eff0fb8 100755 --- a/third_party/git/t/t6041-bisect-submodule.sh +++ b/third_party/git/t/t6041-bisect-submodule.sh @@ -10,7 +10,12 @@ git_bisect () { ls -1pR * >>expect && tar cf "$TRASH_DIRECTORY/tmp.tar" * && GOOD=$(git rev-parse --verify HEAD) && - git checkout "$1" && + may_only_be_test_must_fail "$2" && + $2 git checkout "$1" && + if test -n "$2" + then + return + fi && echo "foo" >bar && git add bar && git commit -m "bisect bad" && @@ -27,6 +32,6 @@ git_bisect () { git bisect bad $BAD } -test_submodule_switch "git_bisect" +test_submodule_switch_func "git_bisect" test_done diff --git a/third_party/git/t/t6050-replace.sh b/third_party/git/t/t6050-replace.sh index e7e64e085d..c80dc10b8f 100755 --- a/third_party/git/t/t6050-replace.sh +++ b/third_party/git/t/t6050-replace.sh @@ -135,7 +135,7 @@ test_expect_success 'tag replaced commit' ' test_expect_success '"git fsck" works' ' git fsck master >fsck_master.out && test_i18ngrep "dangling commit $R" fsck_master.out && - test_i18ngrep "dangling tag $(cat .git/refs/tags/mytag)" fsck_master.out && + test_i18ngrep "dangling tag $(git show-ref -s refs/tags/mytag)" fsck_master.out && test -z "$(git fsck)" ' diff --git a/third_party/git/t/t6100-rev-list-in-order.sh b/third_party/git/t/t6100-rev-list-in-order.sh index b2bb0a7f61..e934bc239c 100755 --- a/third_party/git/t/t6100-rev-list-in-order.sh +++ b/third_party/git/t/t6100-rev-list-in-order.sh @@ -22,7 +22,7 @@ test_expect_success 'setup a commit history with trees, blobs' ' test_expect_success 'rev-list --in-commit-order' ' git rev-list --in-commit-order --objects HEAD >actual.raw && - cut -c 1-40 >actual <actual.raw && + cut -d" " -f1 >actual <actual.raw && git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF && HEAD^{commit} @@ -49,7 +49,7 @@ test_expect_success 'rev-list --in-commit-order' ' test_expect_success 'rev-list lists blobs and trees after commits' ' git rev-list --objects HEAD >actual.raw && - cut -c 1-40 >actual <actual.raw && + cut -d" " -f1 >actual <actual.raw && git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF && HEAD^{commit} diff --git a/third_party/git/t/t6101-rev-parse-parents.sh b/third_party/git/t/t6101-rev-parse-parents.sh index 7683e4a114..7531262a5e 100755 --- a/third_party/git/t/t6101-rev-parse-parents.sh +++ b/third_party/git/t/t6101-rev-parse-parents.sh @@ -34,7 +34,7 @@ test_expect_success 'setup' ' ' test_expect_success 'start is valid' ' - git rev-parse start | grep "^[0-9a-f]\{40\}$" + git rev-parse start | grep "^$OID_REGEX$" ' test_expect_success 'start^0' ' 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 28611c978e..52cde097dd 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 $commit $broken_commit \ + test_must_fail git rev-list --objects $blob $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 acd7f5ab80..de0e5a5d36 100755 --- a/third_party/git/t/t6112-rev-list-filters-objects.sh +++ b/third_party/git/t/t6112-rev-list-filters-objects.sh @@ -278,7 +278,19 @@ 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 + ! 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 ' # Test tree:# filters. @@ -330,6 +342,148 @@ 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. @@ -373,6 +527,37 @@ 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 @@ -441,11 +626,4 @@ 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 new file mode 100755 index 0000000000..2b551e6fd0 --- /dev/null +++ b/third_party/git/t/t6113-rev-list-bitmap-filters.sh @@ -0,0 +1,77 @@ +#!/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_expect_success 'tree:0 filter' ' + git rev-list --objects --filter=tree:0 HEAD >expect && + git rev-list --use-bitmap-index \ + --objects --filter=tree:0 HEAD >actual && + test_bitmap_traversal expect actual +' + +test_expect_success 'tree:0 filter with specified blob, tree' ' + git rev-list --objects --filter=tree:0 HEAD HEAD:two.t >expect && + git rev-list --use-bitmap-index \ + --objects --filter=tree:0 HEAD HEAD:two.t >actual && + test_bitmap_traversal expect actual +' + +test_expect_success 'tree:1 filter' ' + git rev-list --objects --filter=tree:1 HEAD >expect && + git rev-list --use-bitmap-index \ + --objects --filter=tree:1 HEAD >actual && + test_cmp expect actual +' + +test_done diff --git a/third_party/git/t/t6120-describe.sh b/third_party/git/t/t6120-describe.sh index 2b883d8174..f822d5d328 100755 --- a/third_party/git/t/t6120-describe.sh +++ b/third_party/git/t/t6120-describe.sh @@ -1,28 +1,27 @@ #!/bin/sh -test_description='test describe +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. - 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 - R=$(git describe "$@" 2>err.actual) - S=$? - cat err.actual >&3 - test_expect_success "describe $*" ' - test $S = 0 && + describe_opts="$@" + test_expect_success "describe $describe_opts" ' + R=$(git describe $describe_opts 2>err.actual) && case "$R" in $expect) echo happy ;; - *) echo "Oops - $R is not $expect"; + *) echo "Oops - $R is not $expect" && false ;; esac ' @@ -130,12 +129,30 @@ test_expect_success 'rename tag A to Q locally' ' mv .git/refs/tags/A .git/refs/tags/Q ' cat - >err.expect <<EOF -warning: tag 'A' is really 'Q' here +warning: tag 'Q' is externally known as 'A' EOF check_describe A-* HEAD test_expect_success 'warning was displayed for Q' ' test_i18ncmp err.expect err.actual ' +test_expect_success 'misnamed annotated tag forces long output' ' + description=$(git describe --no-long Q^0) && + expr "$description" : "A-0-g[0-9a-f]*$" && + git rev-parse --verify "$description" >actual && + git rev-parse --verify Q^0 >expect && + test_cmp expect actual +' + +test_expect_success 'abbrev=0 will not break misplaced tag (1)' ' + description=$(git describe --abbrev=0 Q^0) && + expr "$description" : "A-0-g[0-9a-f]*$" +' + +test_expect_success 'abbrev=0 will not break misplaced tag (2)' ' + description=$(git describe --abbrev=0 c^0) && + expr "$description" : "A-1-g[0-9a-f]*$" +' + test_expect_success 'rename tag Q back to A' ' mv .git/refs/tags/Q .git/refs/tags/A ' @@ -382,7 +399,7 @@ test_expect_success 'describe tag object' ' test_i18ngrep "fatal: test-blob-1 is neither a commit nor blob" actual ' -test_expect_failure ULIMIT_STACK_SIZE 'name-rev works in a deep repo' ' +test_expect_success ULIMIT_STACK_SIZE 'name-rev works in a deep repo' ' i=1 && while test $i -lt 8000 do @@ -424,4 +441,111 @@ 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 37760233a5..ba7902c9cd 100755 --- a/third_party/git/t/t6130-pathspec-noglob.sh +++ b/third_party/git/t/t6130-pathspec-noglob.sh @@ -10,6 +10,7 @@ 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/t6132-pathspec-exclude.sh b/third_party/git/t/t6132-pathspec-exclude.sh index 2462b19ddd..30328b87f0 100755 --- a/third_party/git/t/t6132-pathspec-exclude.sh +++ b/third_party/git/t/t6132-pathspec-exclude.sh @@ -211,4 +211,37 @@ test_expect_success 't_e_i() exclude case #8' ' ) ' +test_expect_success 'grep --untracked PATTERN' ' + # This test is not an actual test of exclude patterns, rather it + # is here solely to ensure that if any tests are inserted, deleted, or + # changed above, that we still have untracked files with the expected + # contents for the NEXT two tests. + cat <<-\EOF >expect-grep && + actual + expect + sub/actual + sub/expect + EOF + git grep -l --untracked file -- >actual-grep && + test_cmp expect-grep actual-grep +' + +test_expect_success 'grep --untracked PATTERN :(exclude)DIR' ' + cat <<-\EOF >expect-grep && + actual + expect + EOF + git grep -l --untracked file -- ":(exclude)sub" >actual-grep && + test_cmp expect-grep actual-grep +' + +test_expect_success 'grep --untracked PATTERN :(exclude)*FILE' ' + cat <<-\EOF >expect-grep && + actual + sub/actual + EOF + git grep -l --untracked file -- ":(exclude)*expect" >actual-grep && + test_cmp expect-grep actual-grep +' + test_done diff --git a/third_party/git/t/t6136-pathspec-in-bare.sh b/third_party/git/t/t6136-pathspec-in-bare.sh new file mode 100755 index 0000000000..b117251366 --- /dev/null +++ b/third_party/git/t/t6136-pathspec-in-bare.sh @@ -0,0 +1,38 @@ +#!/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/t6200-fmt-merge-msg.sh b/third_party/git/t/t6200-fmt-merge-msg.sh index 8a72b4c43a..7d549748ef 100755 --- a/third_party/git/t/t6200-fmt-merge-msg.sh +++ b/third_party/git/t/t6200-fmt-merge-msg.sh @@ -6,6 +6,7 @@ test_description='fmt-merge-msg test' . ./test-lib.sh +. "$TEST_DIRECTORY/lib-gpg.sh" test_expect_success setup ' echo one >one && @@ -73,6 +74,10 @@ test_expect_success setup ' apos="'\''" ' +test_expect_success GPG 'set up a signed tag' ' + git tag -s -m signed-tag-msg signed-good-tag left +' + test_expect_success 'message for merging local branch' ' echo "Merge branch ${apos}left${apos}" >expected && @@ -83,6 +88,24 @@ test_expect_success 'message for merging local branch' ' test_cmp expected actual ' +test_expect_success GPG 'message for merging local tag signed by good key' ' + git checkout master && + git fetch . signed-good-tag && + git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 && + grep "^Merge tag ${apos}signed-good-tag${apos}" actual && + grep "^# gpg: Signature made" actual && + grep "^# gpg: Good signature from" actual +' + +test_expect_success GPG 'message for merging local tag signed by unknown key' ' + git checkout master && + git fetch . signed-good-tag && + GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 && + grep "^Merge tag ${apos}signed-good-tag${apos}" actual && + grep "^# gpg: Signature made" actual && + grep -E "^# gpg: Can${apos}t check signature: (public key not found|No public key)" actual +' + test_expect_success 'message for merging external branch' ' echo "Merge branch ${apos}left${apos} of $(pwd)" >expected && @@ -519,4 +542,24 @@ test_expect_success 'merge-msg with "merging" an annotated tag' ' test_cmp expected .git/MERGE_MSG ' +test_expect_success 'merge.suppressDest configuration' ' + git checkout -B side master && + git commit --allow-empty -m "One step ahead" && + git checkout master && + git fetch . side && + + git -c merge.suppressDest="" fmt-merge-msg <.git/FETCH_HEAD >full.1 && + head -n1 full.1 >actual && + grep -e "Merge branch .side. into master" actual && + + git -c merge.suppressDest="mast" fmt-merge-msg <.git/FETCH_HEAD >full.2 && + head -n1 full.2 >actual && + grep -e "Merge branch .side. into master$" actual && + + git -c merge.suppressDest="ma??er" fmt-merge-msg <.git/FETCH_HEAD >full.3 && + head -n1 full.3 >actual && + grep -e "Merge branch .side." actual && + ! grep -e " into master$" actual +' + 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 ab69aa176d..b359023189 100755 --- a/third_party/git/t/t6300-for-each-ref.sh +++ b/third_party/git/t/t6300-for-each-ref.sh @@ -20,6 +20,10 @@ setdate_and_increment () { } test_expect_success setup ' + test_oid_cache <<-EOF && + disklen sha1:138 + disklen sha256:154 + EOF setdate_and_increment && echo "Using $datestamp" > one && git add one && @@ -48,8 +52,30 @@ test_atom() { sanitize_pgp <actual >actual.clean && test_cmp expected actual.clean " + # Automatically test "contents:size" atom after testing "contents" + if test "$2" = "contents" + then + case $(git cat-file -t "$ref") in + tag) + # We cannot use $3 as it expects sanitize_pgp to run + expect=$(git cat-file tag $ref | tail -n +6 | wc -c) ;; + tree | blob) + expect='' ;; + commit) + expect=$(printf '%s' "$3" | wc -c) ;; + esac + # Leave $expect unquoted to lose possible leading whitespaces + echo $expect >expected + test_expect_${4:-success} $PREREQ "basic atom: $1 contents:size" ' + git for-each-ref --format="%(contents:size)" "$ref" >actual && + test_cmp expected actual + ' + fi } +hexlen=$(test_oid hexsz) +disklen=$(test_oid disklen) + test_atom head refname refs/heads/master test_atom head refname: refs/heads/master test_atom head refname:short master @@ -82,15 +108,21 @@ test_atom head push:rstrip=-1 refs test_atom head push:strip=1 remotes/myfork/master test_atom head push:strip=-1 master test_atom head objecttype commit -test_atom head objectsize 171 -test_atom head objectsize:disk 138 -test_atom head deltabase 0000000000000000000000000000000000000000 +test_atom head objectsize $((131 + hexlen)) +test_atom head objectsize:disk $disklen +test_atom head deltabase $ZERO_OID test_atom head objectname $(git rev-parse refs/heads/master) test_atom head objectname:short $(git rev-parse --short refs/heads/master) test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/master) test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/master) test_atom head tree $(git rev-parse refs/heads/master^{tree}) +test_atom head tree:short $(git rev-parse --short refs/heads/master^{tree}) +test_atom head tree:short=1 $(git rev-parse --short=1 refs/heads/master^{tree}) +test_atom head tree:short=10 $(git rev-parse --short=10 refs/heads/master^{tree}) test_atom head parent '' +test_atom head parent:short '' +test_atom head parent:short=1 '' +test_atom head parent:short=10 '' test_atom head numparent 0 test_atom head object '' test_atom head type '' @@ -99,19 +131,26 @@ test_atom head '*objecttype' '' test_atom head author 'A U Thor <author@example.com> 1151968724 +0200' test_atom head authorname 'A U Thor' test_atom head authoremail '<author@example.com>' +test_atom head authoremail:trim 'author@example.com' +test_atom head authoremail:localpart 'author' test_atom head authordate 'Tue Jul 4 01:18:44 2006 +0200' test_atom head committer 'C O Mitter <committer@example.com> 1151968723 +0200' test_atom head committername 'C O Mitter' test_atom head committeremail '<committer@example.com>' +test_atom head committeremail:trim 'committer@example.com' +test_atom head committeremail:localpart 'committer' test_atom head committerdate 'Tue Jul 4 01:18:43 2006 +0200' test_atom head tag '' test_atom head tagger '' test_atom head taggername '' test_atom head taggeremail '' +test_atom head taggeremail:trim '' +test_atom head taggeremail:localpart '' test_atom head taggerdate '' test_atom head creator 'C O Mitter <committer@example.com> 1151968723 +0200' test_atom head creatordate 'Tue Jul 4 01:18:43 2006 +0200' test_atom head subject 'Initial' +test_atom head subject:sanitize 'Initial' test_atom head contents:subject 'Initial' test_atom head body '' test_atom head contents:body '' @@ -125,38 +164,51 @@ test_atom tag refname:short testtag test_atom tag upstream '' test_atom tag push '' test_atom tag objecttype tag -test_atom tag objectsize 154 -test_atom tag objectsize:disk 138 -test_atom tag '*objectsize:disk' 138 -test_atom tag deltabase 0000000000000000000000000000000000000000 -test_atom tag '*deltabase' 0000000000000000000000000000000000000000 +test_atom tag objectsize $((114 + hexlen)) +test_atom tag objectsize:disk $disklen +test_atom tag '*objectsize:disk' $disklen +test_atom tag deltabase $ZERO_OID +test_atom tag '*deltabase' $ZERO_OID test_atom tag objectname $(git rev-parse refs/tags/testtag) test_atom tag objectname:short $(git rev-parse --short refs/tags/testtag) test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/master) test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/master) test_atom tag tree '' +test_atom tag tree:short '' +test_atom tag tree:short=1 '' +test_atom tag tree:short=10 '' test_atom tag parent '' +test_atom tag parent:short '' +test_atom tag parent:short=1 '' +test_atom tag parent:short=10 '' test_atom tag numparent '' test_atom tag object $(git rev-parse refs/tags/testtag^0) test_atom tag type 'commit' -test_atom tag '*objectname' 'ea122842f48be4afb2d1fc6a4b96c05885ab7463' +test_atom tag '*objectname' $(git rev-parse refs/tags/testtag^{}) test_atom tag '*objecttype' 'commit' test_atom tag author '' test_atom tag authorname '' test_atom tag authoremail '' +test_atom tag authoremail:trim '' +test_atom tag authoremail:localpart '' test_atom tag authordate '' test_atom tag committer '' test_atom tag committername '' test_atom tag committeremail '' +test_atom tag committeremail:trim '' +test_atom tag committeremail:localpart '' test_atom tag committerdate '' test_atom tag tag 'testtag' test_atom tag tagger 'C O Mitter <committer@example.com> 1151968725 +0200' test_atom tag taggername 'C O Mitter' test_atom tag taggeremail '<committer@example.com>' +test_atom tag taggeremail:trim 'committer@example.com' +test_atom tag taggeremail:localpart 'committer' test_atom tag taggerdate 'Tue Jul 4 01:18:45 2006 +0200' test_atom tag creator 'C O Mitter <committer@example.com> 1151968725 +0200' test_atom tag creatordate 'Tue Jul 4 01:18:45 2006 +0200' test_atom tag subject 'Tagging at 1151968727' +test_atom tag subject:sanitize 'Tagging-at-1151968727' test_atom tag contents:subject 'Tagging at 1151968727' test_atom tag body '' test_atom tag contents:body '' @@ -526,6 +578,29 @@ 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 taggeremail:trim '' +test_atom refs/tags/taggerless taggeremail:localpart '' +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 committeremail:trim '' +test_atom refs/tags/taggerless committeremail:localpart '' +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 && @@ -546,6 +621,7 @@ test_expect_success 'create tag with subject and body content' ' git tag -F msg subject-body ' test_atom refs/tags/subject-body subject 'the subject line' +test_atom refs/tags/subject-body subject:sanitize 'the-subject-line' test_atom refs/tags/subject-body body 'first body line second body line ' @@ -566,6 +642,7 @@ test_expect_success 'create tag with multiline subject' ' git tag -F msg multiline ' test_atom refs/tags/multiline subject 'first subject line second subject line' +test_atom refs/tags/multiline subject:sanitize 'first-subject-line-second-subject-line' test_atom refs/tags/multiline contents:subject 'first subject line second subject line' test_atom refs/tags/multiline body 'first body line second body line @@ -598,6 +675,7 @@ sig='-----BEGIN PGP SIGNATURE----- PREREQ=GPG test_atom refs/tags/signed-empty subject '' +test_atom refs/tags/signed-empty subject:sanitize '' test_atom refs/tags/signed-empty contents:subject '' test_atom refs/tags/signed-empty body "$sig" test_atom refs/tags/signed-empty contents:body '' @@ -605,6 +683,7 @@ test_atom refs/tags/signed-empty contents:signature "$sig" test_atom refs/tags/signed-empty contents "$sig" test_atom refs/tags/signed-short subject 'subject line' +test_atom refs/tags/signed-short subject:sanitize 'subject-line' test_atom refs/tags/signed-short contents:subject 'subject line' test_atom refs/tags/signed-short body "$sig" test_atom refs/tags/signed-short contents:body '' @@ -613,6 +692,7 @@ test_atom refs/tags/signed-short contents "subject line $sig" test_atom refs/tags/signed-long subject 'subject line' +test_atom refs/tags/signed-long subject:sanitize 'subject-line' test_atom refs/tags/signed-long contents:subject 'subject line' test_atom refs/tags/signed-long body "body contents $sig" @@ -624,17 +704,78 @@ test_atom refs/tags/signed-long contents "subject line body contents $sig" -cat >expected <<EOF -$(git rev-parse refs/tags/bogo) <committer@example.com> refs/tags/bogo -$(git rev-parse refs/tags/master) <committer@example.com> refs/tags/master -EOF +test_expect_success 'set up refs pointing to tree and blob' ' + git update-ref refs/mytrees/first refs/heads/master^{tree} && + git update-ref refs/myblobs/first refs/heads/master:one +' + +test_atom refs/mytrees/first subject "" +test_atom refs/mytrees/first contents:subject "" +test_atom refs/mytrees/first body "" +test_atom refs/mytrees/first contents:body "" +test_atom refs/mytrees/first contents:signature "" +test_atom refs/mytrees/first contents "" + +test_atom refs/myblobs/first subject "" +test_atom refs/myblobs/first contents:subject "" +test_atom refs/myblobs/first body "" +test_atom refs/myblobs/first contents:body "" +test_atom refs/myblobs/first contents:signature "" +test_atom refs/myblobs/first contents "" + +test_expect_success 'set up multiple-sort tags' ' + for when in 100000 200000 + do + for email in user1 user2 + do + for ref in ref1 ref2 + do + GIT_COMMITTER_DATE="@$when +0000" \ + GIT_COMMITTER_EMAIL="$email@example.com" \ + git tag -m "tag $ref-$when-$email" \ + multi-$ref-$when-$email || return 1 + done + done + done +' test_expect_success 'Verify sort with multiple keys' ' - git for-each-ref --format="%(objectname) %(taggeremail) %(refname)" --sort=objectname --sort=taggeremail \ - refs/tags/bogo refs/tags/master > actual && + cat >expected <<-\EOF && + 100000 <user1@example.com> refs/tags/multi-ref2-100000-user1 + 100000 <user1@example.com> refs/tags/multi-ref1-100000-user1 + 100000 <user2@example.com> refs/tags/multi-ref2-100000-user2 + 100000 <user2@example.com> refs/tags/multi-ref1-100000-user2 + 200000 <user1@example.com> refs/tags/multi-ref2-200000-user1 + 200000 <user1@example.com> refs/tags/multi-ref1-200000-user1 + 200000 <user2@example.com> refs/tags/multi-ref2-200000-user2 + 200000 <user2@example.com> refs/tags/multi-ref1-200000-user2 + EOF + git for-each-ref \ + --format="%(taggerdate:unix) %(taggeremail) %(refname)" \ + --sort=-refname \ + --sort=taggeremail \ + --sort=taggerdate \ + "refs/tags/multi-*" >actual && test_cmp expected actual ' +test_expect_success 'equivalent sorts fall back on refname' ' + cat >expected <<-\EOF && + 100000 <user1@example.com> refs/tags/multi-ref1-100000-user1 + 100000 <user2@example.com> refs/tags/multi-ref1-100000-user2 + 100000 <user1@example.com> refs/tags/multi-ref2-100000-user1 + 100000 <user2@example.com> refs/tags/multi-ref2-100000-user2 + 200000 <user1@example.com> refs/tags/multi-ref1-200000-user1 + 200000 <user2@example.com> refs/tags/multi-ref1-200000-user2 + 200000 <user1@example.com> refs/tags/multi-ref2-200000-user1 + 200000 <user2@example.com> refs/tags/multi-ref2-200000-user2 + EOF + git for-each-ref \ + --format="%(taggerdate:unix) %(taggeremail) %(refname)" \ + --sort=taggerdate \ + "refs/tags/multi-*" >actual && + test_cmp expected actual +' test_expect_success 'do not dereference NULL upon %(HEAD) on unborn branch' ' test_when_finished "git checkout master" && @@ -670,61 +811,40 @@ test_expect_success 'set up trailers for next test' ' ' test_expect_success '%(trailers:unfold) unfolds trailers' ' - git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual && { unfold <trailers echo } >expect && + git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual && + test_cmp expect actual && + git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual && test_cmp expect actual ' test_expect_success '%(trailers:only) shows only "key: value" trailers' ' - git for-each-ref --format="%(trailers:only)" refs/heads/master >actual && { grep -v patch.description <trailers && echo } >expect && + git for-each-ref --format="%(trailers:only)" refs/heads/master >actual && + test_cmp expect actual && + git for-each-ref --format="%(contents:trailers:only)" refs/heads/master >actual && test_cmp expect actual ' test_expect_success '%(trailers:only) and %(trailers:unfold) work together' ' - git for-each-ref --format="%(trailers:only,unfold)" refs/heads/master >actual && - git for-each-ref --format="%(trailers:unfold,only)" refs/heads/master >reverse && - test_cmp actual reverse && { grep -v patch.description <trailers | unfold && echo } >expect && - test_cmp expect actual -' - -test_expect_success '%(contents:trailers:unfold) unfolds trailers' ' - git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual && - { - unfold <trailers - echo - } >expect && - test_cmp expect actual -' - -test_expect_success '%(contents:trailers:only) shows only "key: value" trailers' ' - git for-each-ref --format="%(contents:trailers:only)" refs/heads/master >actual && - { - grep -v patch.description <trailers && - echo - } >expect && - test_cmp expect actual -' - -test_expect_success '%(contents:trailers:only) and %(contents:trailers:unfold) work together' ' + git for-each-ref --format="%(trailers:only,unfold)" refs/heads/master >actual && + test_cmp expect actual && + git for-each-ref --format="%(trailers:unfold,only)" refs/heads/master >actual && + test_cmp actual actual && git for-each-ref --format="%(contents:trailers:only,unfold)" refs/heads/master >actual && - git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/master >reverse && - test_cmp actual reverse && - { - grep -v patch.description <trailers | unfold && - echo - } >expect && - test_cmp expect actual + test_cmp expect actual && + git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/master >actual && + test_cmp actual actual ' test_expect_success '%(trailers) rejects unknown trailers arguments' ' @@ -733,15 +853,16 @@ test_expect_success '%(trailers) rejects unknown trailers arguments' ' fatal: unknown %(trailers) argument: unsupported EOF test_must_fail git for-each-ref --format="%(trailers:unsupported)" 2>actual && + test_i18ncmp expect actual && + test_must_fail git for-each-ref --format="%(contents:trailers:unsupported)" 2>actual && test_i18ncmp expect actual ' -test_expect_success '%(contents:trailers) rejects unknown trailers arguments' ' - # error message cannot be checked under i18n +test_expect_success 'if arguments, %(contents:trailers) shows error if colon is missing' ' cat >expect <<-EOF && - fatal: unknown %(trailers) argument: unsupported + fatal: unrecognized %(contents) argument: trailersonly EOF - test_must_fail git for-each-ref --format="%(contents:trailers:unsupported)" 2>actual && + test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual && test_i18ncmp expect actual ' @@ -869,4 +990,44 @@ test_expect_success 'for-each-ref --ignore-case ignores case' ' test_cmp expect actual ' +test_expect_success 'for-each-ref --ignore-case works on multiple sort keys' ' + # name refs numerically to avoid case-insensitive filesystem conflicts + nr=0 && + for email in a A b B + do + for subject in a A b B + do + GIT_COMMITTER_EMAIL="$email@example.com" \ + git tag -m "tag $subject" icase-$(printf %02d $nr) && + nr=$((nr+1))|| + return 1 + done + done && + git for-each-ref --ignore-case \ + --format="%(taggeremail) %(subject) %(refname)" \ + --sort=refname \ + --sort=subject \ + --sort=taggeremail \ + refs/tags/icase-* >actual && + cat >expect <<-\EOF && + <a@example.com> tag a refs/tags/icase-00 + <a@example.com> tag A refs/tags/icase-01 + <A@example.com> tag a refs/tags/icase-04 + <A@example.com> tag A refs/tags/icase-05 + <a@example.com> tag b refs/tags/icase-02 + <a@example.com> tag B refs/tags/icase-03 + <A@example.com> tag b refs/tags/icase-06 + <A@example.com> tag B refs/tags/icase-07 + <b@example.com> tag a refs/tags/icase-08 + <b@example.com> tag A refs/tags/icase-09 + <B@example.com> tag a refs/tags/icase-12 + <B@example.com> tag A refs/tags/icase-13 + <b@example.com> tag b refs/tags/icase-10 + <b@example.com> tag B refs/tags/icase-11 + <B@example.com> tag b refs/tags/icase-14 + <B@example.com> tag B refs/tags/icase-15 + EOF + test_cmp expect actual +' + test_done diff --git a/third_party/git/t/t6301-for-each-ref-errors.sh b/third_party/git/t/t6301-for-each-ref-errors.sh index 49cc65bb58..809854fc0c 100755 --- a/third_party/git/t/t6301-for-each-ref-errors.sh +++ b/third_party/git/t/t6301-for-each-ref-errors.sh @@ -5,9 +5,9 @@ test_description='for-each-ref errors for broken refs' . ./test-lib.sh ZEROS=$ZERO_OID -MISSING=abababababababababababababababababababab test_expect_success setup ' + MISSING=$(test_oid deadbeef) && git commit --allow-empty -m "Initial" && git tag testtag && git for-each-ref >full-list && diff --git a/third_party/git/t/t6302-for-each-ref-filter.sh b/third_party/git/t/t6302-for-each-ref-filter.sh index 35408d53fd..781e470aea 100755 --- a/third_party/git/t/t6302-for-each-ref-filter.sh +++ b/third_party/git/t/t6302-for-each-ref-filter.sh @@ -437,8 +437,8 @@ test_expect_success 'check %(if:notequals=<string>)' ' test_cmp expect actual ' -test_expect_success '--merged is incompatible with --no-merged' ' - test_must_fail git for-each-ref --merged HEAD --no-merged HEAD +test_expect_success '--merged is compatible with --no-merged' ' + git for-each-ref --merged HEAD --no-merged HEAD ' test_expect_success 'validate worktree atom' ' diff --git a/third_party/git/t/t6020-merge-df.sh b/third_party/git/t/t6400-merge-df.sh index 46b506b3b7..f1b84617af 100755 --- a/third_party/git/t/t6020-merge-df.sh +++ b/third_party/git/t/t6400-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 -f letters/file && - test -f letters.txt && - test -f letters~modify + test_path_is_file letters/file && + test_path_is_file letters.txt && + test_path_is_file letters~modify ' test_expect_success 'modify/delete + directory/file conflict; other way' ' @@ -99,9 +99,52 @@ 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 -f letters/file && - test -f letters.txt && - test -f letters~HEAD + 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 topic && + git branch other && + + git checkout other && + echo other >foo/bar-2/baz && + git add -u && + git commit -m other && + + git checkout topic && + echo topic >foo/bar/baz && + git add -u && + git commit -m topic && + + 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_done diff --git a/third_party/git/t/t6401-merge-criss-cross.sh b/third_party/git/t/t6401-merge-criss-cross.sh new file mode 100755 index 0000000000..9d5e992878 --- /dev/null +++ b/third_party/git/t/t6401-merge-criss-cross.sh @@ -0,0 +1,67 @@ +#!/bin/sh +# +# Copyright (c) 2005 Fredrik Kuivinen +# + +# See https://lore.kernel.org/git/Pine.LNX.4.44.0504271254120.4678-100000@wax.eds.org/ 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_done diff --git a/third_party/git/t/t6022-merge-rename.sh b/third_party/git/t/t6402-merge-rename.sh index 53cc9b2ffb..bbbba3dcbf 100755 --- a/third_party/git/t/t6022-merge-rename.sh +++ b/third_party/git/t/t6402-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,12 +242,24 @@ 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_i18ngrep "^Skipped B" out && + + test-tool chmtime --get B >new-mtime && + test_cmp old-mtime new-mtime && + 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_i18ngrep ! "^Skipped B" out + + test_path_is_missing A && + test-tool chmtime --get B >new-mtime && + test $(cat old-mtime) -lt $(cat new-mtime) ' test_expect_success 'setup for rename + d/f conflicts' ' @@ -288,14 +300,15 @@ 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 -f dir && + test_path_is_file dir && + test_write_lines 1 2 3 4 5555 6 7 8 9 10 11 >expected && test_cmp expected dir ' @@ -315,8 +328,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 -f dir/file-in-the-way && - test -f dir~HEAD && + test_path_is_file dir/file-in-the-way && + test_path_is_file dir~HEAD && test_cmp expected dir~HEAD ' @@ -337,29 +350,11 @@ test_expect_success 'Same as previous, but merged other way' ' test_must_fail git diff --quiet && test_must_fail git diff --cached --quiet && - test -f dir/file-in-the-way && - test -f dir~renamed-file-has-no-conflicts && + test_path_is_file dir/file-in-the-way && + test_path_is_file 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~* && @@ -372,7 +367,24 @@ 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 -f dir && + 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_cmp expected dir ' @@ -391,29 +403,11 @@ 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 -f dir/file-in-the-way && - test -f dir~HEAD && + test_path_is_file dir/file-in-the-way && + test_path_is_file 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~* && @@ -427,8 +421,25 @@ test_expect_success 'Same as previous, but merged other way' ' test_must_fail git diff --quiet && test_must_fail git diff --cached --quiet && - test -f dir/file-in-the-way && - test -f dir~renamed-file-has-conflicts && + 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_cmp expected dir~renamed-file-has-conflicts ' @@ -464,9 +475,9 @@ test_expect_success 'both rename source and destination involved in D/F conflict test_must_fail git diff --quiet && - test -f destdir/foo && - test -f one && - test -f destdir~HEAD && + test_path_is_file destdir/foo && + test_path_is_file one && + test_path_is_file destdir~HEAD && test "stuff" = "$(cat destdir~HEAD)" ' @@ -507,9 +518,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 -d one && - test -f one~rename-two && - test -f two && + test_path_is_dir one && + test_path_is_file one~rename-two && + test_path_is_file two && test "other" = $(cat one~rename-two) && test "stuff" = $(cat two) ' @@ -527,8 +538,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 -f one && - test -f two && + test_path_is_file one && + test_path_is_file two && test "other" = $(cat one) && test "stuff" = $(cat two) ' @@ -568,11 +579,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 -f one/file && - test -f two/file && - test -f one~HEAD && - test -f two~second-rename && - ! test -f original + 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_expect_success 'setup rename one file to two; directories moving out of the way' ' @@ -607,9 +618,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 -f one && - test -f two && - ! test -f original + test_path_is_file one && + test_path_is_file two && + test_path_is_missing original ' test_expect_success 'setup avoid unnecessary update, normal rename' ' @@ -635,7 +646,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 =1000000000 rename >expect && + test-tool chmtime --get -3600 rename >expect && git merge merge-branch-1 && test-tool chmtime --get rename >actual && test_cmp expect actual # "rename" should have stayed intact @@ -667,7 +678,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 =1000000000 df >expect && + test-tool chmtime --get -3600 df >expect && git merge merge-branch-2 && test-tool chmtime --get df >actual && test_cmp expect actual # "df" should have stayed intact @@ -698,7 +709,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 =1000000000 df >expect && + test-tool chmtime --get -3600 df >expect && git merge side && test-tool chmtime --get df >actual && test_cmp expect actual # "df" should have stayed intact @@ -727,7 +738,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 =1000000000 file >expect && + test-tool chmtime --get -3600 file >expect && test_must_fail git merge side && test-tool chmtime --get file >actual && test_cmp expect actual # "file" should have stayed intact @@ -755,7 +766,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 =1000000000 newfile >expect && + test-tool chmtime --get -3600 newfile >expect && git merge side && test-tool chmtime --get newfile >actual && test_cmp expect actual # "file" should have stayed intact @@ -810,48 +821,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/t6403-merge-file.sh b/third_party/git/t/t6403-merge-file.sh new file mode 100755 index 0000000000..2f421d967a --- /dev/null +++ b/third_party/git/t/t6403-merge-file.sh @@ -0,0 +1,390 @@ +#!/bin/sh + +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 +' + +test_expect_success 'merge with no changes' ' + cp orig.txt test.txt && + git merge-file test.txt orig.txt orig.txt && + 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 +' + +test_expect_success 'works in subdirectory' ' + mkdir dir && + cp new1.txt dir/a.txt && + cp orig.txt dir/o.txt && + cp new2.txt dir/b.txt && + ( cd dir && git merge-file a.txt o.txt b.txt ) && + 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 +' + +test_expect_success 'binary files cannot be merged' ' + test_must_fail git merge-file -p \ + orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err && + grep "Cannot merge binary files" merge.err +' + +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_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) +' + +test_expect_success '"diff3 -m" style output (1)' ' + 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, + >>>>>>> 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_must_fail git merge-file -p --diff3 \ + new8.txt new5.txt new9.txt >actual && + test_cmp expect actual +' + +test_expect_success '"diff3 -m" style output (2)' ' + git config merge.conflictstyle diff3 && + test_must_fail git merge-file -p \ + new8.txt new5.txt new9.txt >actual && + test_cmp expect actual +' + +test_expect_success 'marker size' ' + 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, + >>>>>>>>>> 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_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 && + + 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 --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 && + printf "1\\r\\n2\\r\\n4" >crlf-diff1.txt && + printf "1\\r\\n2\\r\\n5" >crlf-diff2.txt && + test_must_fail git -c core.eol=crlf merge-file -p \ + crlf-diff1.txt crlf-orig.txt crlf-diff2.txt >crlf.txt && + test $(tr "\015" Q <crlf.txt | grep "^[<=>].*Q$" | wc -l) = 3 && + test $(tr "\015" Q <crlf.txt | grep "[345]Q$" | wc -l) = 3 && + test_must_fail git -c core.eol=crlf merge-file -p \ + nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >nolf.txt && + test $(tr "\015" Q <nolf.txt | grep "^[<=>].*Q$" | wc -l) = 0 +' + +test_done diff --git a/third_party/git/t/t6404-recursive-merge.sh b/third_party/git/t/t6404-recursive-merge.sh new file mode 100755 index 0000000000..332cfc53fd --- /dev/null +++ b/third_party/git/t/t6404-recursive-merge.sh @@ -0,0 +1,131 @@ +#!/bin/sh + +test_description='Test merge without common ancestors' +. ./test-lib.sh + +# This scenario is based on a real-world repository of Shawn Pearce. + +# 1 - A - D - F +# \ X / +# B X +# X \ +# 2 - C - E - G + +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 '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 + + test_cmp expect a1 +' + +test_expect_success 'virtual trees were processed' ' + git ls-files --stage >out && + + 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 + + test_cmp expect out +' + +test_expect_success 'refuse to merge binary files' ' + git reset --hard && + printf "\0" >binary-file && + git add binary-file && + git commit -m binary && + git checkout G && + printf "\0\0" >binary-file && + git add binary-file && + git commit -m binary2 && + test_must_fail git merge F >merge.out 2>merge.err && + grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge.err +' + +test_expect_success 'mark rename/delete as unmerged' ' + + git reset --hard && + git checkout -b delete && + git rm a1 && + test_tick && + git commit -m delete && + git checkout -b rename HEAD^ && + git mv a1 a2 && + test_tick && + git commit -m rename && + test_must_fail git merge delete && + test 1 = $(git ls-files --unmerged | wc -l) && + git rev-parse --verify :2:a2 && + test_must_fail git rev-parse --verify :3:a2 && + git checkout -f delete && + test_must_fail git merge rename && + 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/t6405-merge-symlinks.sh b/third_party/git/t/t6405-merge-symlinks.sh new file mode 100755 index 0000000000..6c0a90d044 --- /dev/null +++ b/third_party/git/t/t6405-merge-symlinks.sh @@ -0,0 +1,62 @@ +#!/bin/sh +# +# Copyright (c) 2007 Johannes Sixt +# + +test_description='merging symlinks on filesystem w/o symlink support. + +This tests that git merge-recursive writes merge results as plain files +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_done diff --git a/third_party/git/t/t6026-merge-attr.sh b/third_party/git/t/t6406-merge-attr.sh index 8f9b48a493..76a55f838c 100755 --- a/third_party/git/t/t6026-merge-attr.sh +++ b/third_party/git/t/t6406-merge-attr.sh @@ -32,7 +32,29 @@ test_expect_success setup ' test_tick && git commit -m Side && - git tag anchor + 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 ' test_expect_success merge ' @@ -82,28 +104,6 @@ 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 && @@ -122,7 +122,7 @@ test_expect_success 'custom merge backend' ' o=$(git unpack-file master^:text) && a=$(git unpack-file side^:text) && b=$(git unpack-file master:text) && - sh -c "./custom-merge $o $a $b 0 'text'" && + sh -c "./custom-merge $o $a $b 0 text" && sed -e 1,3d $a >check-2 && cmp check-1 check-2 && rm -f $o $a $b @@ -149,7 +149,7 @@ test_expect_success 'custom merge backend' ' o=$(git unpack-file master^:text) && a=$(git unpack-file anchor:text) && b=$(git unpack-file master:text) && - sh -c "./custom-merge $o $a $b 0 'text'" && + sh -c "./custom-merge $o $a $b 0 text" && sed -e 1,3d $a >check-2 && cmp check-1 check-2 && sed -e 1,3d -e 4q $a >check-3 && diff --git a/third_party/git/t/t6027-merge-binary.sh b/third_party/git/t/t6407-merge-binary.sh index 4e6c7cb77e..4e6c7cb77e 100755 --- a/third_party/git/t/t6027-merge-binary.sh +++ b/third_party/git/t/t6407-merge-binary.sh diff --git a/third_party/git/t/t6028-merge-up-to-date.sh b/third_party/git/t/t6408-merge-up-to-date.sh index 7763c1ba98..7763c1ba98 100755 --- a/third_party/git/t/t6028-merge-up-to-date.sh +++ b/third_party/git/t/t6408-merge-up-to-date.sh diff --git a/third_party/git/t/t6029-merge-subtree.sh b/third_party/git/t/t6409-merge-subtree.sh index 793f0c8bf3..b8e8b6f642 100755 --- a/third_party/git/t/t6029-merge-subtree.sh +++ b/third_party/git/t/t6409-merge-subtree.sh @@ -35,11 +35,11 @@ test_expect_success 'setup branch sub' ' test_commit foo ' -test_expect_success 'setup branch main' ' - git checkout -b main master && +test_expect_success 'setup topic branch' ' + git checkout -b topic master && git merge -s ours --no-commit --allow-unrelated-histories sub && git read-tree --prefix=dir/ -u sub && - git commit -m "initial merge of sub into main" && + git commit -m "initial merge of sub into topic" && test_path_is_file dir/foo.t && test_path_is_file hello ' @@ -49,9 +49,9 @@ test_expect_success 'update branch sub' ' test_commit bar ' -test_expect_success 'update branch main' ' - git checkout main && - git merge -s subtree sub -m "second merge of sub into main" && +test_expect_success 'update topic branch' ' + git checkout topic && + git merge -s subtree sub -m "second merge of sub into topic" && test_path_is_file dir/bar.t && test_path_is_file dir/foo.t && test_path_is_file hello @@ -94,10 +94,10 @@ test_expect_success 'merge update' ' echo git-gui2 > git-gui.sh && o3=$(git hash-object git-gui.sh) && git add git-gui.sh && - git checkout -b master2 && + git checkout -b topic_2 && git commit -m "update git-gui" && cd ../git && - git pull -s subtree gui master2 && + git pull -s subtree gui topic_2 && git ls-files -s >actual && ( echo "100644 $o3 0 git-gui/git-gui.sh" && @@ -109,7 +109,7 @@ test_expect_success 'merge update' ' test_expect_success 'initial ambiguous subtree' ' cd ../git && git reset --hard master && - git checkout -b master2 && + git checkout -b topic_2 && git merge -s ours --no-commit gui/master && git read-tree --prefix=git-gui2/ -u gui/master && git commit -m "Merge git-gui2 as our subdirectory" && @@ -125,8 +125,8 @@ test_expect_success 'initial ambiguous subtree' ' test_expect_success 'merge using explicit' ' cd ../git && - git reset --hard master2 && - git pull -Xsubtree=git-gui gui master2 && + git reset --hard topic_2 && + git pull -Xsubtree=git-gui gui topic_2 && git ls-files -s >actual && ( echo "100644 $o3 0 git-gui/git-gui.sh" && @@ -138,8 +138,8 @@ test_expect_success 'merge using explicit' ' test_expect_success 'merge2 using explicit' ' cd ../git && - git reset --hard master2 && - git pull -Xsubtree=git-gui2 gui master2 && + git reset --hard topic_2 && + git pull -Xsubtree=git-gui2 gui topic_2 && git ls-files -s >actual && ( echo "100644 $o1 0 git-gui/git-gui.sh" && diff --git a/third_party/git/t/t6031-merge-filemode.sh b/third_party/git/t/t6411-merge-filemode.sh index 87741efad3..87741efad3 100755 --- a/third_party/git/t/t6031-merge-filemode.sh +++ b/third_party/git/t/t6411-merge-filemode.sh diff --git a/third_party/git/t/t6032-merge-large-rename.sh b/third_party/git/t/t6412-merge-large-rename.sh index 80777386dc..80777386dc 100755 --- a/third_party/git/t/t6032-merge-large-rename.sh +++ b/third_party/git/t/t6412-merge-large-rename.sh diff --git a/third_party/git/t/t6033-merge-crlf.sh b/third_party/git/t/t6413-merge-crlf.sh index e8d65eefb5..e8d65eefb5 100755 --- a/third_party/git/t/t6033-merge-crlf.sh +++ b/third_party/git/t/t6413-merge-crlf.sh diff --git a/third_party/git/t/t6414-merge-rename-nocruft.sh b/third_party/git/t/t6414-merge-rename-nocruft.sh new file mode 100755 index 0000000000..a25e730460 --- /dev/null +++ b/third_party/git/t/t6414-merge-rename-nocruft.sh @@ -0,0 +1,97 @@ +#!/bin/sh + +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 + + 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 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 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 +' + +# This test broke in 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae +test_expect_success 'merge white into red (A->B,M->N)' ' + git checkout -b red-white red && + git merge white && + git write-tree && + test_path_is_file B && + test_path_is_file N && + test_path_is_file R && + test_path_is_missing A && + test_path_is_missing M +' + +# This test broke in 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9 +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 && + git write-tree && + test_path_is_file A && + echo dirty >expect && + test_cmp expect A && + test_path_is_file B && + test_path_is_file N && + test_path_is_missing M +' + +test_done diff --git a/third_party/git/t/t6035-merge-dir-to-symlink.sh b/third_party/git/t/t6415-merge-dir-to-symlink.sh index 9324ea4416..2eddcc7664 100755 --- a/third_party/git/t/t6035-merge-dir-to-symlink.sh +++ b/third_party/git/t/t6415-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 -f a/b-2/c/d + test_path_is_file 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 -f a/b-2/c/d + test_path_is_file a/b-2/c/d ' test_expect_success 'setup for merge test' ' git reset --hard && - test -f a/b-2/c/d && + test_path_is_file 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 -f a/b-2/c/d + test_path_is_file 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 -f a/b-2/c/d + test_path_is_file 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 -f a/b-2/c/d + test_path_is_file 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 -f a/b-2/c/d + test_path_is_file 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 -f a/b/c/e && - test -f a/b-2/c/d + test_path_is_file a/b/c/e && + test_path_is_file 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 -f a/b/c/e && - test -f a/b-2/c/d + test_path_is_file a/b/c/e && + test_path_is_file 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 -f a/b/c/d + test_path_is_file 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 -f a/b/c/d + test_path_is_file 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 -f a/b/c/d + test_path_is_file 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/t6416-recursive-corner-cases.sh index d23b948f27..fd98989b14 100755 --- a/third_party/git/t/t6036-recursive-corner-cases.sh +++ b/third_party/git/t/t6416-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 = 2 out && + test_line_count = 5 out && git ls-files -u >out && - test_line_count = 2 out && + test_line_count = 3 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 = 2 out && + test_line_count = 5 out && git ls-files -u >out && - test_line_count = 2 out && + test_line_count = 3 out && git ls-files -o >out && test_line_count = 1 out && @@ -218,8 +218,18 @@ test_expect_success 'git detects differently handled merges conflict' ' git ls-files -o >out && test_line_count = 1 out && - git rev-parse >expect \ - C:new_a D:new_a E:new_a && + 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 >actual \ :1:new_a :2:new_a :3:new_a && test_cmp expect actual && @@ -257,7 +267,8 @@ 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 differences; rest is copy-paste of last test + # End of most differences; rest is copy-paste of last test, + # other than swapping C:a and C:new_a due to order switch git checkout D^0 && test_must_fail git merge -s recursive E^0 && @@ -269,8 +280,18 @@ test_expect_success 'git detects differently handled merges conflict, swapped' ' git ls-files -o >out && test_line_count = 1 out && - git rev-parse >expect \ - C:new_a D:new_a E:new_a && + 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 >actual \ :1:new_a :2:new_a :3:new_a && test_cmp expect actual && @@ -431,7 +452,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev # # So choice 5 at least provides some kind of conflict for the original case, # and can merge cleanly as expected with D1 and E3. It also made things just -# slightly funny for merging D1 and e$, where E4 is defined as: +# slightly funny for merging D1 and E4, where E4 is defined as: # Commit E4: Merge B & C, modifying 'a' and renaming to 'a2', and deleting 'a/' # in this case, we'll get a rename/rename(1to2) conflict because a~$UNIQUE # gets renamed to 'a' in D1 and to 'a2' in E4. But that's better than having @@ -1123,7 +1144,7 @@ test_expect_failure 'check symlink add/add' ' test_must_fail git merge -s recursive E^0 && git ls-files -s >out && - test_line_count = 2 out && + test_line_count = 3 out && git ls-files -u >out && test_line_count = 2 out && git ls-files -o >out && @@ -1532,7 +1553,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 "verson R1 of files" && + test_tick && git commit -m "version R1 of files" && git tag R1 && # Create first merge on left side @@ -1562,6 +1583,7 @@ 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 @@ -1582,7 +1604,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 "merged common ancestors" \ + -L "$MASTER" \ -L "Temporary merge branch 2" \ ours \ base \ @@ -1594,7 +1616,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 "merged common ancestors" \ + -L "$MASTER" \ -L "Temporary merge branch 2" \ ours \ base \ @@ -1695,7 +1717,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 "verson R1 of content" && + test_tick && git commit -m "version R1 of content" && git tag R1 && # Create L2 @@ -1732,6 +1754,7 @@ 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 @@ -1760,7 +1783,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 "merged common ancestors" \ + -L "$MASTER" \ -L "Temporary merge branch 2" \ merged-once \ base \ diff --git a/third_party/git/t/t6037-merge-ours-theirs.sh b/third_party/git/t/t6417-merge-ours-theirs.sh index 0aebc6c028..0aebc6c028 100755 --- a/third_party/git/t/t6037-merge-ours-theirs.sh +++ b/third_party/git/t/t6417-merge-ours-theirs.sh diff --git a/third_party/git/t/t6038-merge-text-auto.sh b/third_party/git/t/t6418-merge-text-auto.sh index 5e8d5fa50c..30983d18b1 100755 --- a/third_party/git/t/t6038-merge-text-auto.sh +++ b/third_party/git/t/t6418-merge-text-auto.sh @@ -158,7 +158,7 @@ test_expect_success 'Detect LF/CRLF conflict from addition of text=auto' ' compare_files expected file.fuzzy ' -test_expect_failure 'checkout -m after setting text=auto' ' +test_expect_success 'checkout -m after setting text=auto' ' cat <<-\EOF >expected && first line same line @@ -168,12 +168,12 @@ test_expect_failure 'checkout -m after setting text=auto' ' git rm -fr . && rm -f .gitattributes && git reset --hard initial && - git checkout a -- . && + git restore --source=a -- . && git checkout -m b && - compare_files expected file + git diff --no-index --ignore-cr-at-eol expected file ' -test_expect_failure 'checkout -m addition of text=auto' ' +test_expect_success 'checkout -m addition of text=auto' ' cat <<-\EOF >expected && first line same line @@ -183,23 +183,9 @@ test_expect_failure 'checkout -m addition of text=auto' ' git rm -fr . && rm -f .gitattributes file && git reset --hard initial && - git checkout b -- . && + git restore --source=b -- . && git checkout -m a && - compare_files expected file -' - -test_expect_failure 'cherry-pick patch from after text=auto was added' ' - append_cr <<-\EOF >expected && - first line - same line - EOF - - git config merge.renormalize true && - git rm -fr . && - git reset --hard b && - test_must_fail git cherry-pick a >err 2>&1 && - grep "[Nn]othing added" err && - compare_files expected file + git diff --no-index --ignore-cr-at-eol expected file ' test_expect_success 'Test delete/normalize conflict' ' @@ -211,7 +197,8 @@ test_expect_success 'Test delete/normalize conflict' ' git commit -m "remove file" && git checkout master && git reset --hard a^ && - git merge side + git merge side && + test_path_is_missing file ' test_done diff --git a/third_party/git/t/t6039-merge-ignorecase.sh b/third_party/git/t/t6419-merge-ignorecase.sh index 531850d834..531850d834 100755 --- a/third_party/git/t/t6039-merge-ignorecase.sh +++ b/third_party/git/t/t6419-merge-ignorecase.sh diff --git a/third_party/git/t/t6042-merge-rename-corner-cases.sh b/third_party/git/t/t6422-merge-rename-corner-cases.sh index c5b57f40c3..3375eaf4e7 100755 --- a/third_party/git/t/t6042-merge-rename-corner-cases.sh +++ b/third_party/git/t/t6422-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_expect_success 'setup rename/delete + untracked file' ' +test_setup_rename_delete_untracked () { test_create_repo rename-delete-untracked && ( cd rename-delete-untracked && @@ -29,9 +29,10 @@ test_expect_success 'setup rename/delete + untracked file' ' 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 && @@ -49,7 +50,7 @@ test_expect_success "Does git preserve Gollum's precious artifact?" ' # # We should be able to merge B & C cleanly -test_expect_success 'setup rename/modify/add-source conflict' ' +test_setup_rename_modify_add_source () { test_create_repo rename-modify-add-source && ( cd rename-modify-add-source && @@ -70,9 +71,10 @@ test_expect_success 'setup rename/modify/add-source conflict' ' 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 && @@ -88,7 +90,7 @@ test_expect_failure 'rename/modify/add-source conflict resolvable' ' ) ' -test_expect_success 'setup resolvable conflict missed if rename missed' ' +test_setup_break_detection_1 () { test_create_repo break-detection-1 && ( cd break-detection-1 && @@ -110,9 +112,10 @@ test_expect_success 'setup resolvable conflict missed if rename missed' ' 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 && @@ -135,7 +138,7 @@ test_expect_failure 'conflict caused if rename not detected' ' ) ' -test_expect_success 'setup conflict resolved wrong if rename missed' ' +test_setup_break_detection_2 () { test_create_repo break-detection-2 && ( cd break-detection-2 && @@ -160,9 +163,10 @@ test_expect_success 'setup conflict resolved wrong if rename missed' ' 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 && @@ -182,7 +186,7 @@ test_expect_failure 'missed conflict if rename not detected' ' # Commit B: rename a->b # Commit C: rename a->b, add unrelated a -test_expect_success 'setup undetected rename/add-source causes data loss' ' +test_setup_break_detection_3 () { test_create_repo break-detection-3 && ( cd break-detection-3 && @@ -202,9 +206,10 @@ test_expect_success 'setup undetected rename/add-source causes data loss' ' 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 && @@ -231,6 +236,7 @@ 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 && @@ -256,10 +262,10 @@ test_expect_failure 'detect rename/add-source and preserve all data, merge other ) ' -test_expect_success 'setup content merge + rename/directory conflict' ' - test_create_repo rename-directory-1 && +test_setup_rename_directory () { + 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 && @@ -290,11 +296,12 @@ test_expect_success 'setup content merge + rename/directory conflict' ' test_tick && git commit -m left ) -' +} test_expect_success 'rename/directory conflict + clean content merge' ' + test_setup_rename_directory 1a && ( - cd rename-directory-1 && + cd rename-directory-1a && git checkout left-clean^0 && @@ -320,8 +327,9 @@ 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-1 && + cd rename-directory-1b && git reset --hard && git clean -fdqx && @@ -358,7 +366,7 @@ test_expect_success 'rename/directory conflict + content merge conflict' ' ) ' -test_expect_success 'setup content merge + rename/directory conflict w/ disappearing dir' ' +test_setup_rename_directory_2 () { test_create_repo rename-directory-2 && ( cd rename-directory-2 && @@ -385,9 +393,10 @@ test_expect_success 'setup content merge + rename/directory conflict w/ disappea 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 && @@ -416,10 +425,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_expect_success 'setup rename-with-content-merge vs. add' ' - test_create_repo rename-with-content-merge-and-add && +test_setup_rename_with_content_merge_and_add () { + test_create_repo rename-with-content-merge-and-add-$1 && ( - cd rename-with-content-merge-and-add && + cd rename-with-content-merge-and-add-$1 && test_seq 1 5 >a && git add a && @@ -438,16 +447,17 @@ test_expect_success 'setup rename-with-content-merge vs. 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 && + cd rename-with-content-merge-and-add-AB && git checkout A^0 && test_must_fail git merge -s recursive B^0 >out && - test_i18ngrep "CONFLICT (rename/add)" out && + test_i18ngrep "CONFLICT (.*/add)" out && git ls-files -s >out && test_line_count = 2 out && @@ -483,8 +493,9 @@ 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 && + cd rename-with-content-merge-and-add-BA && git reset --hard && git clean -fdx && @@ -492,7 +503,7 @@ test_expect_success 'handle rename-with-content-merge vs. add, merge other way' git checkout B^0 && test_must_fail git merge -s recursive A^0 >out && - test_i18ngrep "CONFLICT (rename/add)" out && + test_i18ngrep "CONFLICT (.*/add)" out && git ls-files -s >out && test_line_count = 2 out && @@ -539,7 +550,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_expect_success 'setup rename/rename (2to1) + modify/modify' ' +test_setup_rename_rename_2to1 () { test_create_repo rename-rename-2to1 && ( cd rename-rename-2to1 && @@ -562,16 +573,17 @@ test_expect_success 'setup rename/rename (2to1) + modify/modify' ' 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 && git checkout B^0 && test_must_fail git merge -s recursive C^0 >out && - test_i18ngrep "CONFLICT (rename/rename)" out && + test_i18ngrep "CONFLICT (\(.*\)/\1)" out && git ls-files -s >out && test_line_count = 2 out && @@ -610,7 +622,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_expect_success 'setup simple rename/rename (1to2) conflict' ' +test_setup_rename_rename_1to2 () { test_create_repo rename-rename-1to2 && ( cd rename-rename-1to2 && @@ -631,9 +643,10 @@ test_expect_success 'setup simple rename/rename (1to2) conflict' ' test_tick && git commit -m C ) -' +} test_expect_success 'merge has correct working tree contents' ' + test_setup_rename_rename_1to2 && ( cd rename-rename-1to2 && @@ -667,7 +680,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_expect_success 'setup rename/rename(1to2)/add-source conflict' ' +test_setup_rename_rename_1to2_add_source_1 () { test_create_repo rename-rename-1to2-add-source-1 && ( cd rename-rename-1to2-add-source-1 && @@ -687,9 +700,10 @@ test_expect_success 'setup rename/rename(1to2)/add-source conflict' ' 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 && @@ -714,7 +728,7 @@ test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge' ) ' -test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' ' +test_setup_rename_rename_1to2_add_source_2 () { test_create_repo rename-rename-1to2-add-source-2 && ( cd rename-rename-1to2-add-source-2 && @@ -737,9 +751,10 @@ test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' ' 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 && @@ -759,7 +774,7 @@ test_expect_failure 'rename/rename/add-source still tracks new a file' ' ) ' -test_expect_success 'setup rename/rename(1to2)/add-dest conflict' ' +test_setup_rename_rename_1to2_add_dest () { test_create_repo rename-rename-1to2-add-dest && ( cd rename-rename-1to2-add-dest && @@ -784,9 +799,10 @@ test_expect_success 'setup rename/rename(1to2)/add-dest conflict' ' 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 && @@ -838,7 +854,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_expect_success 'rad-setup: rename/add/delete conflict' ' +test_setup_rad () { test_create_repo rad && ( cd rad && @@ -860,21 +876,27 @@ test_expect_success 'rad-setup: rename/add/delete conflict' ' 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 && git checkout B^0 && test_must_fail git merge -s recursive A^0 >out 2>err && - # Not sure whether the output should contain just one - # "CONFLICT (rename/add/delete)" line, or if it should break - # it into a pair of "CONFLICT (rename/delete)" and - # "CONFLICT (rename/add)"; allow for either. - test_i18ngrep "CONFLICT (rename.*add)" out && - test_i18ngrep "CONFLICT (rename.*delete)" out && + # Instead of requiring the output to contain one combined line + # CONFLICT (rename/add/delete) + # or perhaps two lines: + # CONFLICT (rename/add): new file collides with rename target + # CONFLICT (rename/delete): rename source removed on other side + # and instead of requiring "rename/add" instead of "add/add", + # be flexible in the type of console output message(s) reported + # for this particular case; we will be more stringent about the + # contents of the index and working directory. + test_i18ngrep "CONFLICT (.*/add)" out && + test_i18ngrep "CONFLICT (rename.*/delete)" out && test_must_be_empty err && git ls-files -s >file_count && @@ -882,14 +904,14 @@ test_expect_failure 'rad-check: rename/add/delete conflict' ' git ls-files -u >file_count && test_line_count = 2 file_count && git ls-files -o >file_count && - test_line_count = 2 file_count && + test_line_count = 3 file_count && git rev-parse >actual \ :2:bar :3:bar && git rev-parse >expect \ B:bar A:bar && - test_cmp file_is_missing foo && + test_path_is_missing foo && # bar should have two-way merged contents of the different # versions of bar; check that content from both sides is # present. @@ -904,7 +926,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_expect_success 'rrdd-setup: rename/rename(2to1)/delete/delete conflict' ' +test_setup_rrdd () { test_create_repo rrdd && ( cd rrdd && @@ -927,20 +949,27 @@ test_expect_success 'rrdd-setup: rename/rename(2to1)/delete/delete conflict' ' 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 && git checkout A^0 && test_must_fail git merge -s recursive B^0 >out 2>err && - # Not sure whether the output should contain just one - # "CONFLICT (rename/rename/delete/delete)" line, or if it - # should break it into three: "CONFLICT (rename/rename)" and - # two "CONFLICT (rename/delete)" lines; allow for either. - test_i18ngrep "CONFLICT (rename/rename)" out && + # Instead of requiring the output to contain one combined line + # CONFLICT (rename/rename/delete/delete) + # or perhaps two lines: + # CONFLICT (rename/rename): ... + # CONFLICT (rename/delete): info about pair 1 + # CONFLICT (rename/delete): info about pair 2 + # and instead of requiring "rename/rename" instead of "add/add", + # be flexible in the type of console output message(s) reported + # for this particular case; we will be more stringent about the + # contents of the index and working directory. + test_i18ngrep "CONFLICT (\(.*\)/\1)" out && test_i18ngrep "CONFLICT (rename.*delete)" out && test_must_be_empty err && @@ -949,15 +978,15 @@ test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' ' git ls-files -u >file_count && test_line_count = 2 file_count && git ls-files -o >file_count && - test_line_count = 2 file_count && + test_line_count = 3 file_count && git rev-parse >actual \ :2:baz :3:baz && git rev-parse >expect \ O:foo O:bar && - test_cmp file_is_missing foo && - test_cmp file_is_missing bar && + test_path_is_missing foo && + test_path_is_missing bar && # baz should have two-way merged contents of the original # contents of foo and bar; check that content from both sides # is present. @@ -973,7 +1002,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_expect_success 'mod6-setup: chains of rename/rename(1to2) and rename/rename(2to1)' ' +test_setup_mod6 () { test_create_repo mod6 && ( cd mod6 && @@ -1009,9 +1038,10 @@ test_expect_success 'mod6-setup: chains of rename/rename(1to2) and rename/rename 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 && @@ -1023,25 +1053,25 @@ test_expect_failure 'mod6-check: chains of rename/rename(1to2) and rename/rename test_must_be_empty err && git ls-files -s >file_count && - test_line_count = 6 file_count && + test_line_count = 9 file_count && git ls-files -u >file_count && - test_line_count = 6 file_count && + test_line_count = 9 file_count && git ls-files -o >file_count && test_line_count = 3 file_count && test_seq 10 20 >merged-one && test_seq 51 60 >merged-five && # Determine what the merge of three would give us. - test_seq 30 40 >three-side-A && + test_seq 31 39 >three-base && + test_seq 31 40 >three-side-A && test_seq 31 39 >three-side-B && - echo forty >three-side-B && - >empty && + echo forty >>three-side-B && test_must_fail git merge-file \ - -L "HEAD" \ + -L "HEAD:four" \ -L "" \ - -L "B^0" \ - three-side-A empty three-side-B && - sed -e "s/^\([<=>]\)/\1\1\1/" three-side-A >merged-three && + -L "B^0:two" \ + three-side-A three-base three-side-B && + sed -e "s/^\([<=>]\)/\1\1/" three-side-A >merged-three && # Verify the index is as expected git rev-parse >actual \ @@ -1056,6 +1086,7 @@ test_expect_failure 'mod6-check: chains of rename/rename(1to2) and rename/rename git cat-file -p :2:two >expect && git cat-file -p :3:two >other && + >empty && test_must_fail git merge-file \ -L "HEAD" -L "" -L "B^0" \ expect empty other && @@ -1108,7 +1139,8 @@ test_conflicts_with_adds_and_renames() { # files. Is it present? # 4) There should not be any three~* files in the working # tree - test_expect_success "setup simple $sideL/$sideR conflict" ' + test_setup_collision_conflict () { + #test_expect_success "setup simple $sideL/$sideR conflict" ' test_create_repo simple_${sideL}_${sideR} && ( cd simple_${sideL}_${sideR} && @@ -1185,9 +1217,11 @@ 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} && @@ -1254,7 +1288,7 @@ test_conflicts_with_adds_and_renames add add # # So, we have four different conflicting files that all end up at path # 'three'. -test_expect_success 'setup nested conflicts from rename/rename(2to1)' ' +test_setup_nested_conflicts_from_rename_rename () { test_create_repo nested_conflicts_from_rename_rename && ( cd nested_conflicts_from_rename_rename && @@ -1305,9 +1339,10 @@ test_expect_success 'setup nested conflicts from rename/rename(2to1)' ' 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 && @@ -1356,4 +1391,59 @@ test_expect_success 'check nested conflicts from rename/rename(2to1)' ' ) ' +# Testcase rename/rename(1to2) of a binary file +# Commit O: orig +# Commit A: orig-A +# Commit B: orig-B +# Expected: CONFLICT(rename/rename) message, three unstaged entries in the +# index, and contents of orig-[AB] at path orig-[AB] +test_setup_rename_rename_1_to_2_binary () { + test_create_repo rename_rename_1_to_2_binary && + ( + cd rename_rename_1_to_2_binary && + + echo '* binary' >.gitattributes && + git add .gitattributes && + + test_seq 1 10 >orig && + git add orig && + git commit -m orig && + + git branch A && + git branch B && + + git checkout A && + git mv orig orig-A && + test_seq 1 11 >orig-A && + git add orig-A && + git commit -m orig-A && + + git checkout B && + git mv orig orig-B && + test_seq 0 10 >orig-B && + git add orig-B && + git commit -m orig-B + + ) +} + +test_expect_success 'rename/rename(1to2) with a binary file' ' + test_setup_rename_rename_1_to_2_binary && + ( + cd rename_rename_1_to_2_binary && + + git checkout A^0 && + + test_must_fail git merge -s recursive B^0 && + + # Make sure the index has the right number of entries + git ls-files -s >actual && + test_line_count = 4 actual && + + git rev-parse A:orig-A B:orig-B >expect && + git hash-object orig-A orig-B >actual && + test_cmp expect actual + ) +' + test_done diff --git a/third_party/git/t/t6043-merge-rename-directories.sh b/third_party/git/t/t6423-merge-rename-directories.sh index c966147d5d..f7ecbb886d 100755 --- a/third_party/git/t/t6043-merge-rename-directories.sh +++ b/third_party/git/t/t6423-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_expect_success '1a-setup: Simple directory rename detection' ' +test_setup_1a () { test_create_repo 1a && ( cd 1a && @@ -67,9 +67,10 @@ test_expect_success '1a-setup: Simple directory rename detection' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '1a-check: Simple directory rename detection' ' +test_expect_success '1a: Simple directory rename detection' ' + test_setup_1a && ( cd 1a && @@ -103,7 +104,7 @@ test_expect_success '1a-check: Simple directory rename detection' ' # Commit B: y/{b,c,d} # Expected: y/{b,c,d,e} -test_expect_success '1b-setup: Merge a directory with another' ' +test_setup_1b () { test_create_repo 1b && ( cd 1b && @@ -134,9 +135,10 @@ test_expect_success '1b-setup: Merge a directory with another' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '1b-check: Merge a directory with another' ' +test_expect_success '1b: Merge a directory with another' ' + test_setup_1b && ( cd 1b && @@ -165,7 +167,7 @@ test_expect_success '1b-check: Merge a directory with another' ' # Commit B: z/{b,c,d} # Expected: y/{b,c,d} (because x/d -> z/d -> y/d) -test_expect_success '1c-setup: Transitive renaming' ' +test_setup_1c () { test_create_repo 1c && ( cd 1c && @@ -193,9 +195,10 @@ test_expect_success '1c-setup: Transitive renaming' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '1c-check: Transitive renaming' ' +test_expect_success '1c: Transitive renaming' ' + test_setup_1c && ( cd 1c && @@ -227,7 +230,7 @@ test_expect_success '1c-check: 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_expect_success '1d-setup: Directory renames cause a rename/rename(2to1) conflict' ' +test_setup_1d () { test_create_repo 1d && ( cd 1d && @@ -262,16 +265,17 @@ test_expect_success '1d-setup: Directory renames cause a rename/rename(2to1) con test_tick && git commit -m "B" ) -' +} -test_expect_success '1d-check: Directory renames cause a rename/rename(2to1) conflict' ' +test_expect_success '1d: Directory renames cause a rename/rename(2to1) conflict' ' + test_setup_1d && ( cd 1d && git checkout A^0 && test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out && - test_i18ngrep "CONFLICT (rename/rename)" out && + test_i18ngrep "CONFLICT (\(.*\)/\1)" out && git ls-files -s >out && test_line_count = 8 out && @@ -313,7 +317,7 @@ test_expect_success '1d-check: Directory renames cause a rename/rename(2to1) con # Commit B: z/{oldb,oldc,d} # Expected: y/{newb,newc,d} -test_expect_success '1e-setup: Renamed directory, with all files being renamed too' ' +test_setup_1e () { test_create_repo 1e && ( cd 1e && @@ -342,9 +346,10 @@ test_expect_success '1e-setup: Renamed directory, with all files being renamed t test_tick && git commit -m "B" ) -' +} -test_expect_success '1e-check: Renamed directory, with all files being renamed too' ' +test_expect_success '1e: Renamed directory, with all files being renamed too' ' + test_setup_1e && ( cd 1e && @@ -371,7 +376,7 @@ test_expect_success '1e-check: Renamed directory, with all files being renamed t # Commit B: y/{b,c}, x/{d,e,f} # Expected: y/{b,c}, x/{d,e,f,g} -test_expect_success '1f-setup: Split a directory into two other directories' ' +test_setup_1f () { test_create_repo 1f && ( cd 1f && @@ -408,9 +413,10 @@ test_expect_success '1f-setup: Split a directory into two other directories' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '1f-check: Split a directory into two other directories' ' +test_expect_success '1f: Split a directory into two other directories' ' + test_setup_1f && ( cd 1f && @@ -459,7 +465,7 @@ test_expect_success '1f-check: 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_expect_success '2a-setup: Directory split into two on one side, with equal numbers of paths' ' +test_setup_2a () { test_create_repo 2a && ( cd 2a && @@ -489,9 +495,10 @@ test_expect_success '2a-setup: Directory split into two on one side, with equal test_tick && git commit -m "B" ) -' +} -test_expect_success '2a-check: Directory split into two on one side, with equal numbers of paths' ' +test_expect_success '2a: Directory split into two on one side, with equal numbers of paths' ' + test_setup_2a && ( cd 2a && @@ -520,7 +527,7 @@ test_expect_success '2a-check: Directory split into two on one side, with equal # 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_expect_success '2b-setup: Directory split into two on one side, with equal numbers of paths' ' +test_setup_2b () { test_create_repo 2b && ( cd 2b && @@ -551,9 +558,10 @@ test_expect_success '2b-setup: Directory split into two on one side, with equal test_tick && git commit -m "B" ) -' +} -test_expect_success '2b-check: Directory split into two on one side, with equal numbers of paths' ' +test_expect_success '2b: Directory split into two on one side, with equal numbers of paths' ' + test_setup_2b && ( cd 2b && @@ -601,7 +609,7 @@ test_expect_success '2b-check: Directory split into two on one side, with equal # Commit A: z/{b,c,d} (no change) # Commit B: y/{b,c}, x/d # Expected: y/{b,c}, x/d -test_expect_success '3a-setup: Avoid implicit rename if involved as source on other side' ' +test_setup_3a () { test_create_repo 3a && ( cd 3a && @@ -632,9 +640,10 @@ test_expect_success '3a-setup: Avoid implicit rename if involved as source on ot test_tick && git commit -m "B" ) -' +} -test_expect_success '3a-check: Avoid implicit rename if involved as source on other side' ' +test_expect_success '3a: Avoid implicit rename if involved as source on other side' ' + test_setup_3a && ( cd 3a && @@ -664,7 +673,7 @@ test_expect_success '3a-check: Avoid implicit rename if involved as source on ot # 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_expect_success '3b-setup: Avoid implicit rename if involved as source on current side' ' +test_setup_3b () { test_create_repo 3b && ( cd 3b && @@ -697,9 +706,10 @@ test_expect_success '3b-setup: Avoid implicit rename if involved as source on cu test_tick && git commit -m "B" ) -' +} -test_expect_success '3b-check: Avoid implicit rename if involved as source on current side' ' +test_expect_success '3b: Avoid implicit rename if involved as source on current side' ' + test_setup_3b && ( cd 3b && @@ -744,7 +754,7 @@ test_expect_success '3b-check: Avoid implicit rename if involved as source on cu # # 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 commmit and then recreated +# equivalently, fully renamed a directory in one commit and then recreated # that directory in a later commit adding some new files and then tried to # merge? # @@ -786,7 +796,7 @@ test_expect_success '3b-check: Avoid implicit rename if involved as source on cu # 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_expect_success '4a-setup: Directory split, with original directory still present' ' +test_setup_4a () { test_create_repo 4a && ( cd 4a && @@ -818,9 +828,10 @@ test_expect_success '4a-setup: Directory split, with original directory still pr test_tick && git commit -m "B" ) -' +} -test_expect_success '4a-check: Directory split, with original directory still present' ' +test_expect_success '4a: Directory split, with original directory still present' ' + test_setup_4a && ( cd 4a && @@ -874,7 +885,7 @@ test_expect_success '4a-check: Directory split, with original directory still pr # of history, giving us no way to represent this conflict in the # index. -test_expect_success '5a-setup: Merge directories, other side adds files to original and target' ' +test_setup_5a () { test_create_repo 5a && ( cd 5a && @@ -907,9 +918,10 @@ test_expect_success '5a-setup: Merge directories, other side adds files to origi test_tick && git commit -m "B" ) -' +} -test_expect_success '5a-check: Merge directories, other side adds files to original and target' ' +test_expect_success '5a: Merge directories, other side adds files to original and target' ' + test_setup_5a && ( cd 5a && @@ -941,14 +953,14 @@ test_expect_success '5a-check: Merge directories, other side adds files to origi # 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 normaly would since z/ is being renamed to y/, then this would be +# we normally 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_expect_success '5b-setup: Rename/delete in order to get add/add/add conflict' ' +test_setup_5b () { test_create_repo 5b && ( cd 5b && @@ -981,9 +993,10 @@ test_expect_success '5b-setup: Rename/delete in order to get add/add/add conflic test_tick && git commit -m "B" ) -' +} -test_expect_success '5b-check: Rename/delete in order to get add/add/add conflict' ' +test_expect_success '5b: Rename/delete in order to get add/add/add conflict' ' + test_setup_5b && ( cd 5b && @@ -1024,7 +1037,7 @@ test_expect_success '5b-check: Rename/delete in order to get add/add/add conflic # 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_expect_success '5c-setup: Transitive rename would cause rename/rename/rename/add/add/add' ' +test_setup_5c () { test_create_repo 5c && ( cd 5c && @@ -1061,9 +1074,10 @@ test_expect_success '5c-setup: Transitive rename would cause rename/rename/renam test_tick && git commit -m "B" ) -' +} -test_expect_success '5c-check: Transitive rename would cause rename/rename/rename/add/add/add' ' +test_expect_success '5c: Transitive rename would cause rename/rename/rename/add/add/add' ' + test_setup_5c && ( cd 5c && @@ -1113,7 +1127,7 @@ test_expect_success '5c-check: Transitive rename would cause rename/rename/renam # detection for z/d_2, but that doesn't prevent us from applying the # directory rename detection for z/f -> y/f. -test_expect_success '5d-setup: Directory/file/file conflict due to directory rename' ' +test_setup_5d () { test_create_repo 5d && ( cd 5d && @@ -1145,9 +1159,10 @@ test_expect_success '5d-setup: Directory/file/file conflict due to directory ren test_tick && git commit -m "B" ) -' +} -test_expect_success '5d-check: Directory/file/file conflict due to directory rename' ' +test_expect_success '5d: Directory/file/file conflict due to directory rename' ' + test_setup_5d && ( cd 5d && @@ -1205,7 +1220,7 @@ test_expect_success '5d-check: Directory/file/file conflict due to directory ren # them under y/ doesn't accidentally catch z/d and make it look like # it is also involved in a rename/delete conflict. -test_expect_success '6a-setup: Tricky rename/delete' ' +test_setup_6a () { test_create_repo 6a && ( cd 6a && @@ -1235,9 +1250,10 @@ test_expect_success '6a-setup: Tricky rename/delete' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '6a-check: Tricky rename/delete' ' +test_expect_success '6a: Tricky rename/delete' ' + test_setup_6a && ( cd 6a && @@ -1271,7 +1287,7 @@ test_expect_success '6a-check: 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_expect_success '6b-setup: Same rename done on both sides' ' +test_setup_6b () { test_create_repo 6b && ( cd 6b && @@ -1300,9 +1316,10 @@ test_expect_success '6b-setup: Same rename done on both sides' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '6b-check: Same rename done on both sides' ' +test_expect_success '6b: Same rename done on both sides' ' + test_setup_6b && ( cd 6b && @@ -1334,7 +1351,7 @@ test_expect_success '6b-check: 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_expect_success '6c-setup: Rename only done on same side' ' +test_setup_6c () { test_create_repo 6c && ( cd 6c && @@ -1362,9 +1379,10 @@ test_expect_success '6c-setup: Rename only done on same side' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '6c-check: Rename only done on same side' ' +test_expect_success '6c: Rename only done on same side' ' + test_setup_6c && ( cd 6c && @@ -1396,7 +1414,7 @@ test_expect_success '6c-check: 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_expect_success '6d-setup: We do not always want transitive renaming' ' +test_setup_6d () { test_create_repo 6d && ( cd 6d && @@ -1424,9 +1442,10 @@ test_expect_success '6d-setup: We do not always want transitive renaming' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '6d-check: We do not always want transitive renaming' ' +test_expect_success '6d: We do not always want transitive renaming' ' + test_setup_6d && ( cd 6d && @@ -1458,7 +1477,7 @@ test_expect_success '6d-check: 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_expect_success '6e-setup: Add/add from one side' ' +test_setup_6e () { test_create_repo 6e && ( cd 6e && @@ -1487,9 +1506,10 @@ test_expect_success '6e-setup: Add/add from one side' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '6e-check: Add/add from one side' ' +test_expect_success '6e: Add/add from one side' ' + test_setup_6e && ( cd 6e && @@ -1552,7 +1572,7 @@ test_expect_success '6e-check: 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_expect_success '7a-setup: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' ' +test_setup_7a () { test_create_repo 7a && ( cd 7a && @@ -1583,9 +1603,10 @@ test_expect_success '7a-setup: rename-dir vs. rename-dir (NOT split evenly) PLUS test_tick && git commit -m "B" ) -' +} -test_expect_success '7a-check: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' ' +test_expect_success '7a: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' ' + test_setup_7a && ( cd 7a && @@ -1623,7 +1644,7 @@ test_expect_success '7a-check: rename-dir vs. rename-dir (NOT split evenly) PLUS # 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_expect_success '7b-setup: rename/rename(2to1), but only due to transitive rename' ' +test_setup_7b () { test_create_repo 7b && ( cd 7b && @@ -1655,16 +1676,17 @@ test_expect_success '7b-setup: rename/rename(2to1), but only due to transitive r test_tick && git commit -m "B" ) -' +} -test_expect_success '7b-check: rename/rename(2to1), but only due to transitive rename' ' +test_expect_success '7b: rename/rename(2to1), but only due to transitive rename' ' + test_setup_7b && ( cd 7b && git checkout A^0 && test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out && - test_i18ngrep "CONFLICT (rename/rename)" out && + test_i18ngrep "CONFLICT (\(.*\)/\1)" out && git ls-files -s >out && test_line_count = 4 out && @@ -1702,7 +1724,7 @@ test_expect_success '7b-check: rename/rename(2to1), but only due to transitive r # neither CONFLICT(x/d -> w/d vs. z/d) # nor CONFLiCT x/d -> w/d vs. y/d vs. z/d) -test_expect_success '7c-setup: rename/rename(1to...2or3); transitive rename may add complexity' ' +test_setup_7c () { test_create_repo 7c && ( cd 7c && @@ -1732,9 +1754,10 @@ test_expect_success '7c-setup: rename/rename(1to...2or3); transitive rename may test_tick && git commit -m "B" ) -' +} -test_expect_success '7c-check: rename/rename(1to...2or3); transitive rename may add complexity' ' +test_expect_success '7c: rename/rename(1to...2or3); transitive rename may add complexity' ' + test_setup_7c && ( cd 7c && @@ -1766,7 +1789,7 @@ test_expect_success '7c-check: rename/rename(1to...2or3); transitive rename may # 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_expect_success '7d-setup: transitive rename involved in rename/delete; how is it reported?' ' +test_setup_7d () { test_create_repo 7d && ( cd 7d && @@ -1796,9 +1819,10 @@ test_expect_success '7d-setup: transitive rename involved in rename/delete; how test_tick && git commit -m "B" ) -' +} -test_expect_success '7d-check: transitive rename involved in rename/delete; how is it reported?' ' +test_expect_success '7d: transitive rename involved in rename/delete; how is it reported?' ' + test_setup_7d && ( cd 7d && @@ -1851,7 +1875,7 @@ test_expect_success '7d-check: transitive rename involved in rename/delete; how # see testcases 9c and 9d for further discussion of this issue and # how it's resolved. -test_expect_success '7e-setup: transitive rename in rename/delete AND dirs in the way' ' +test_setup_7e () { test_create_repo 7e && ( cd 7e && @@ -1886,9 +1910,10 @@ test_expect_success '7e-setup: transitive rename in rename/delete AND dirs in th test_tick && git commit -m "B" ) -' +} -test_expect_success '7e-check: transitive rename in rename/delete AND dirs in the way' ' +test_expect_success '7e: transitive rename in rename/delete AND dirs in the way' ' + test_setup_7e && ( cd 7e && @@ -1945,7 +1970,7 @@ test_expect_success '7e-check: transitive rename in rename/delete AND dirs in th # simple rule from section 5 prevents me from handling this as optimally as # we potentially could. -test_expect_success '8a-setup: Dual-directory rename, one into the others way' ' +test_setup_8a () { test_create_repo 8a && ( cd 8a && @@ -1977,9 +2002,10 @@ test_expect_success '8a-setup: Dual-directory rename, one into the others way' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '8a-check: Dual-directory rename, one into the others way' ' +test_expect_success '8a: Dual-directory rename, one into the others way' ' + test_setup_8a && ( cd 8a && @@ -2023,7 +2049,7 @@ test_expect_success '8a-check: 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_expect_success '8b-setup: Dual-directory rename, one into the others way, with conflicting filenames' ' +test_setup_8b () { test_create_repo 8b && ( cd 8b && @@ -2055,9 +2081,10 @@ test_expect_success '8b-setup: Dual-directory rename, one into the others way, w test_tick && git commit -m "B" ) -' +} -test_expect_success '8b-check: Dual-directory rename, one into the others way, with conflicting filenames' ' +test_expect_success '8b: Dual-directory rename, one into the others way, with conflicting filenames' ' + test_setup_8b && ( cd 8b && @@ -2089,14 +2116,14 @@ test_expect_success '8b-check: Dual-directory rename, one into the others way, w # # 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 modifed version of d should be present in y/ after +# and that the modified 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_expect_success '8c-setup: modify/delete or rename+modify/delete?' ' +test_setup_8c () { test_create_repo 8c && ( cd 8c && @@ -2127,9 +2154,10 @@ test_expect_success '8c-setup: modify/delete or rename+modify/delete?' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '8c-check: modify/delete or rename+modify/delete' ' +test_expect_success '8c: modify/delete or rename+modify/delete' ' + test_setup_8c && ( cd 8c && @@ -2175,7 +2203,7 @@ test_expect_success '8c-check: modify/delete or rename+modify/delete' ' # during merging are supposed to be about opposite sides doing things # differently. -test_expect_success '8d-setup: rename/delete...or not?' ' +test_setup_8d () { test_create_repo 8d && ( cd 8d && @@ -2204,9 +2232,10 @@ test_expect_success '8d-setup: rename/delete...or not?' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '8d-check: rename/delete...or not?' ' +test_expect_success '8d: rename/delete...or not?' ' + test_setup_8d && ( cd 8d && @@ -2231,26 +2260,25 @@ test_expect_success '8d-check: rename/delete...or not?' ' # Commit B: w/{b,c}, z/d # # Possible Resolutions: -# w/o dir-rename detection: z/d, CONFLICT(z/b -> y/b vs. w/b), -# CONFLICT(z/c -> y/c vs. w/c) -# Currently expected: y/d, CONFLICT(z/b -> y/b vs. w/b), -# CONFLICT(z/c -> y/c vs. w/c) -# Optimal: ?? +# if z not considered renamed: z/d, CONFLICT(z/b -> y/b vs. w/b), +# CONFLICT(z/c -> y/c vs. w/c) +# if z->y rename considered: y/d, CONFLICT(z/b -> y/b vs. w/b), +# CONFLICT(z/c -> y/c vs. w/c) +# Optimal: ?? # # Notes: In commit A, directory z got renamed to y. In commit B, directory z # did NOT get renamed; the directory is still present; instead it is # considered to have just renamed a subset of paths in directory z -# elsewhere. Therefore, the directory rename done in commit A to z/ -# applies to z/d and maps it to y/d. +# elsewhere. However, this is much like testcase 6b (where commit B +# moves all the original paths out of z/ but opted to keep d +# within z/). This makes it hard to judge where d should end up. # # It's possible that users would get confused about this, but what -# should we do instead? Silently leaving at z/d seems just as bad or -# maybe even worse. Perhaps we could print a big warning about z/d -# and how we're moving to y/d in this case, but when I started thinking -# 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. +# should we do instead? It's not at all clear to me whether z/d or +# y/d or something else is a better resolution here, and other cases +# start getting really tricky, so I just picked one. -test_expect_success '8e-setup: Both sides rename, one side adds to original directory' ' +test_setup_8e () { test_create_repo 8e && ( cd 8e && @@ -2279,9 +2307,10 @@ test_expect_success '8e-setup: Both sides rename, one side adds to original dire test_tick && git commit -m "B" ) -' +} -test_expect_success '8e-check: Both sides rename, one side adds to original directory' ' +test_expect_success '8e: Both sides rename, one side adds to original directory' ' + test_setup_8e && ( cd 8e && @@ -2333,7 +2362,7 @@ test_expect_success '8e-check: Both sides rename, one side adds to original dire # 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_expect_success '9a-setup: Inner renamed directory within outer renamed directory' ' +test_setup_9a () { test_create_repo 9a && ( cd 9a && @@ -2366,9 +2395,10 @@ test_expect_success '9a-setup: Inner renamed directory within outer renamed dire test_tick && git commit -m "B" ) -' +} -test_expect_success '9a-check: Inner renamed directory within outer renamed directory' ' +test_expect_success '9a: Inner renamed directory within outer renamed directory' ' + test_setup_9a && ( cd 9a && @@ -2404,7 +2434,7 @@ test_expect_success '9a-check: Inner renamed directory within outer renamed dire # Commit B: z/{b,c,d_3} # Expected: y/{b,c,d_merged} -test_expect_success '9b-setup: Transitive rename with content merge' ' +test_setup_9b () { test_create_repo 9b && ( cd 9b && @@ -2436,9 +2466,10 @@ test_expect_success '9b-setup: Transitive rename with content merge' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '9b-check: Transitive rename with content merge' ' +test_expect_success '9b: Transitive rename with content merge' ' + test_setup_9b && ( cd 9b && @@ -2491,7 +2522,7 @@ test_expect_success '9b-check: Transitive rename with content merge' ' # away, then ignore that particular rename from the other side of # history for any implicit directory renames. -test_expect_success '9c-setup: Doubly transitive rename?' ' +test_setup_9c () { test_create_repo 9c && ( cd 9c && @@ -2526,9 +2557,10 @@ test_expect_success '9c-setup: Doubly transitive rename?' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '9c-check: Doubly transitive rename?' ' +test_expect_success '9c: Doubly transitive rename?' ' + test_setup_9c && ( cd 9c && @@ -2579,7 +2611,7 @@ test_expect_success '9c-check: Doubly transitive rename?' ' # simple rules that are consistent with what we need for all the other # testcases and simplifies things for the user. -test_expect_success '9d-setup: N-way transitive rename?' ' +test_setup_9d () { test_create_repo 9d && ( cd 9d && @@ -2614,9 +2646,10 @@ test_expect_success '9d-setup: N-way transitive rename?' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '9d-check: N-way transitive rename?' ' +test_expect_success '9d: N-way transitive rename?' ' + test_setup_9d && ( cd 9d && @@ -2653,7 +2686,7 @@ test_expect_success '9d-check: 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_expect_success '9e-setup: N-to-1 whammo' ' +test_setup_9e () { test_create_repo 9e && ( cd 9e && @@ -2696,9 +2729,10 @@ test_expect_success '9e-setup: N-to-1 whammo' ' test_tick && git commit -m "B" ) -' +} -test_expect_success C_LOCALE_OUTPUT '9e-check: N-to-1 whammo' ' +test_expect_success C_LOCALE_OUTPUT '9e: N-to-1 whammo' ' + test_setup_9e && ( cd 9e && @@ -2745,7 +2779,7 @@ test_expect_success C_LOCALE_OUTPUT '9e-check: N-to-1 whammo' ' # Commit B: goal/{a,b}/$more_files, goal/c # Expected: priority/{a,b}/$more_files, priority/c -test_expect_success '9f-setup: Renamed directory that only contained immediate subdirs' ' +test_setup_9f () { test_create_repo 9f && ( cd 9f && @@ -2774,9 +2808,10 @@ test_expect_success '9f-setup: Renamed directory that only contained immediate s test_tick && git commit -m "B" ) -' +} -test_expect_success '9f-check: Renamed directory that only contained immediate subdirs' ' +test_expect_success '9f: Renamed directory that only contained immediate subdirs' ' + test_setup_9f && ( cd 9f && @@ -2808,8 +2843,16 @@ test_expect_success '9f-check: Renamed directory that only contained immediate s # Commit A: priority/{alpha,bravo}/$more_files # Commit B: goal/{a,b}/$more_files, goal/c # Expected: priority/{alpha,bravo}/$more_files, priority/c - -test_expect_success '9g-setup: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' ' +# We currently fail this test because the directory renames we detect are +# goal/a/ -> priority/alpha/ +# goal/b/ -> priority/bravo/ +# We do not detect +# goal/ -> priority/ +# because of no files found within goal/, and the fact that "a" != "alpha" +# and "b" != "bravo". But I'm not sure it's really a failure given that +# viewpoint... + +test_setup_9g () { test_create_repo 9g && ( cd 9g && @@ -2841,9 +2884,10 @@ test_expect_success '9g-setup: Renamed directory that only contained immediate s test_tick && git commit -m "B" ) -' +} -test_expect_failure '9g-check: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' ' +test_expect_failure '9g: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' ' + test_setup_9g && ( cd 9g && @@ -2877,7 +2921,7 @@ test_expect_failure '9g-check: Renamed directory that only contained immediate s # 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_expect_success '9h-setup: Avoid dir rename on merely modified path' ' +test_setup_9h () { test_create_repo 9h && ( cd 9h && @@ -2910,9 +2954,10 @@ test_expect_success '9h-setup: Avoid dir rename on merely modified path' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '9h-check: Avoid dir rename on merely modified path' ' +test_expect_success '9h: Avoid dir rename on merely modified path' ' + test_setup_9h && ( cd 9h && @@ -2957,7 +3002,7 @@ test_expect_success '9h-check: Avoid dir rename on merely modified path' ' # Expected: Aborted Merge + # ERROR_MSG(untracked working tree files would be overwritten by merge) -test_expect_success '10a-setup: Overwrite untracked with normal rename/delete' ' +test_setup_10a () { test_create_repo 10a && ( cd 10a && @@ -2983,9 +3028,10 @@ test_expect_success '10a-setup: Overwrite untracked with normal rename/delete' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '10a-check: Overwrite untracked with normal rename/delete' ' +test_expect_success '10a: Overwrite untracked with normal rename/delete' ' + test_setup_10a && ( cd 10a && @@ -3021,7 +3067,7 @@ test_expect_success '10a-check: 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_expect_success '10b-setup: Overwrite untracked with dir rename + delete' ' +test_setup_10b () { test_create_repo 10b && ( cd 10b && @@ -3050,9 +3096,10 @@ test_expect_success '10b-setup: Overwrite untracked with dir rename + delete' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '10b-check: Overwrite untracked with dir rename + delete' ' +test_expect_success '10b: Overwrite untracked with dir rename + delete' ' + test_setup_10b && ( cd 10b && @@ -3098,10 +3145,10 @@ test_expect_success '10b-check: Overwrite untracked with dir rename + delete' ' # y/c~B^0 + # ERROR_MSG(Refusing to lose untracked file at y/c) -test_expect_success '10c-setup: Overwrite untracked with dir rename/rename(1to2)' ' - test_create_repo 10c && +test_setup_10c () { + test_create_repo 10c_$1 && ( - cd 10c && + cd 10c_$1 && mkdir z x && echo a >z/a && @@ -3128,11 +3175,12 @@ test_expect_success '10c-setup: Overwrite untracked with dir rename/rename(1to2) test_tick && git commit -m "B" ) -' +} -test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2)' ' +test_expect_success '10c1: Overwrite untracked with dir rename/rename(1to2)' ' + test_setup_10c 1 && ( - cd 10c && + cd 10c_1 && git checkout A^0 && echo important >y/c && @@ -3163,9 +3211,10 @@ test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2) ) ' -test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2), other direction' ' +test_expect_success '10c2: Overwrite untracked with dir rename/rename(1to2), other direction' ' + test_setup_10c 2 && ( - cd 10c && + cd 10c_2 && git reset --hard && git clean -fdqx && @@ -3208,7 +3257,7 @@ test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2) # CONFLICT(rename/rename) z/c_1 vs x/f_2 -> y/wham # ERROR_MSG(Refusing to lose untracked file at y/wham) -test_expect_success '10d-setup: Delete untracked with dir rename/rename(2to1)' ' +test_setup_10d () { test_create_repo 10d && ( cd 10d && @@ -3240,9 +3289,10 @@ test_expect_success '10d-setup: Delete untracked with dir rename/rename(2to1)' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '10d-check: Delete untracked with dir rename/rename(2to1)' ' +test_expect_success '10d: Delete untracked with dir rename/rename(2to1)' ' + test_setup_10d && ( cd 10d && @@ -3290,7 +3340,7 @@ test_expect_success '10d-check: Delete untracked with dir rename/rename(2to1)' ' # Commit B: z/{a,b,c} # Expected: y/{a,b,c} + untracked z/c -test_expect_success '10e-setup: Does git complain about untracked file that is not really in the way?' ' +test_setup_10e () { test_create_repo 10e && ( cd 10e && @@ -3317,9 +3367,10 @@ test_expect_success '10e-setup: Does git complain about untracked file that is n test_tick && git commit -m "B" ) -' +} -test_expect_failure '10e-check: Does git complain about untracked file that is not really in the way?' ' +test_expect_failure '10e: Does git complain about untracked file that is not really in the way?' ' + test_setup_10e && ( cd 10e && @@ -3371,7 +3422,7 @@ test_expect_failure '10e-check: Does git complain about untracked file that is n # z/c~HEAD with contents of B:z/b_v2, # z/c with uncommitted mods on top of A:z/c_v1 -test_expect_success '11a-setup: Avoid losing dirty contents with simple rename' ' +test_setup_11a () { test_create_repo 11a && ( cd 11a && @@ -3398,9 +3449,10 @@ test_expect_success '11a-setup: Avoid losing dirty contents with simple rename' test_tick && git commit -m "B" ) -' +} -test_expect_success '11a-check: Avoid losing dirty contents with simple rename' ' +test_expect_success '11a: Avoid losing dirty contents with simple rename' ' + test_setup_11a && ( cd 11a && @@ -3441,7 +3493,7 @@ test_expect_success '11a-check: Avoid losing dirty contents with simple rename' # ERROR_MSG(Refusing to lose dirty file at z/c) -test_expect_success '11b-setup: Avoid losing dirty file involved in directory rename' ' +test_setup_11b () { test_create_repo 11b && ( cd 11b && @@ -3470,9 +3522,10 @@ test_expect_success '11b-setup: Avoid losing dirty file involved in directory re test_tick && git commit -m "B" ) -' +} -test_expect_success '11b-check: Avoid losing dirty file involved in directory rename' ' +test_expect_success '11b: Avoid losing dirty file involved in directory rename' ' + test_setup_11b && ( cd 11b && @@ -3515,7 +3568,7 @@ test_expect_success '11b-check: Avoid losing dirty file involved in directory re # Expected: Abort_msg("following files would be overwritten by merge") + # y/c left untouched (still has uncommitted mods) -test_expect_success '11c-setup: Avoid losing not-uptodate with rename + D/F conflict' ' +test_setup_11c () { test_create_repo 11c && ( cd 11c && @@ -3545,9 +3598,10 @@ test_expect_success '11c-setup: Avoid losing not-uptodate with rename + D/F conf test_tick && git commit -m "B" ) -' +} -test_expect_success '11c-check: Avoid losing not-uptodate with rename + D/F conflict' ' +test_expect_success '11c: Avoid losing not-uptodate with rename + D/F conflict' ' + test_setup_11c && ( cd 11c && @@ -3581,7 +3635,7 @@ test_expect_success '11c-check: Avoid losing not-uptodate with rename + D/F conf # 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_expect_success '11d-setup: Avoid losing not-uptodate with rename + D/F conflict' ' +test_setup_11d () { test_create_repo 11d && ( cd 11d && @@ -3612,9 +3666,10 @@ test_expect_success '11d-setup: Avoid losing not-uptodate with rename + D/F conf test_tick && git commit -m "B" ) -' +} -test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conflict' ' +test_expect_success '11d: Avoid losing not-uptodate with rename + D/F conflict' ' + test_setup_11d && ( cd 11d && @@ -3659,7 +3714,7 @@ test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conf # y/c~HEAD has A:y/c_2 contents # y/c has dirty file from before merge -test_expect_success '11e-setup: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' ' +test_setup_11e () { test_create_repo 11e && ( cd 11e && @@ -3691,9 +3746,10 @@ test_expect_success '11e-setup: Avoid deleting not-uptodate with dir rename/rena test_tick && git commit -m "B" ) -' +} -test_expect_success '11e-check: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' ' +test_expect_success '11e: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' ' + test_setup_11e && ( cd 11e && @@ -3744,7 +3800,7 @@ test_expect_success '11e-check: Avoid deleting not-uptodate with dir rename/rena # CONFLICT(rename/rename) x/c vs x/d -> y/wham # ERROR_MSG(Refusing to lose dirty file at y/wham) -test_expect_success '11f-setup: Avoid deleting not-uptodate with dir rename/rename(2to1)' ' +test_setup_11f () { test_create_repo 11f && ( cd 11f && @@ -3773,9 +3829,10 @@ test_expect_success '11f-setup: Avoid deleting not-uptodate with dir rename/rena test_tick && git commit -m "B" ) -' +} -test_expect_success '11f-check: Avoid deleting not-uptodate with dir rename/rename(2to1)' ' +test_expect_success '11f: Avoid deleting not-uptodate with dir rename/rename(2to1)' ' + test_setup_11f && ( cd 11f && @@ -3832,7 +3889,7 @@ test_expect_success '11f-check: Avoid deleting not-uptodate with dir rename/rena # Commit B: node1/{leaf1,leaf2,leaf5}, node2/{leaf3,leaf4,leaf6} # Expected: node1/{leaf1,leaf2,leaf5,node2/{leaf3,leaf4,leaf6}} -test_expect_success '12a-setup: Moving one directory hierarchy into another' ' +test_setup_12a () { test_create_repo 12a && ( cd 12a && @@ -3862,9 +3919,10 @@ test_expect_success '12a-setup: Moving one directory hierarchy into another' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '12a-check: Moving one directory hierarchy into another' ' +test_expect_success '12a: Moving one directory hierarchy into another' ' + test_setup_12a && ( cd 12a && @@ -3910,7 +3968,7 @@ test_expect_success '12a-check: 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_expect_success '12b-setup: Moving two directory hierarchies into each other' ' +test_setup_12b () { test_create_repo 12b && ( cd 12b && @@ -3938,9 +3996,10 @@ test_expect_success '12b-setup: Moving two directory hierarchies into each other test_tick && git commit -m "B" ) -' +} -test_expect_success '12b-check: Moving two directory hierarchies into each other' ' +test_expect_success '12b: Moving two directory hierarchies into each other' ' + test_setup_12b && ( cd 12b && @@ -3976,7 +4035,7 @@ test_expect_success '12b-check: 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_expect_success '12c-setup: Moving one directory hierarchy into another w/ content merge' ' +test_setup_12c () { test_create_repo 12c && ( cd 12c && @@ -4008,9 +4067,10 @@ test_expect_success '12c-setup: Moving one directory hierarchy into another w/ c test_tick && git commit -m "B" ) -' +} -test_expect_success '12c-check: Moving one directory hierarchy into another w/ content merge' ' +test_expect_success '12c: Moving one directory hierarchy into another w/ content merge' ' + test_setup_12c && ( cd 12c && @@ -4051,6 +4111,122 @@ test_expect_success '12c-check: Moving one directory hierarchy into another w/ c ) ' +# 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 # @@ -4068,10 +4244,10 @@ test_expect_success '12c-check: Moving one directory hierarchy into another w/ c # 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_expect_success '13a-setup: messages for newly added files' ' - test_create_repo 13a && +test_setup_13a () { + test_create_repo 13a_$1 && ( - cd 13a && + cd 13a_$1 && mkdir z && echo b >z/b && @@ -4097,11 +4273,12 @@ test_expect_success '13a-setup: messages for newly added files' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '13a-check(conflict): messages for newly added files' ' +test_expect_success '13a(conflict): messages for newly added files' ' + test_setup_13a conflict && ( - cd 13a && + cd 13a_conflict && git checkout A^0 && @@ -4121,9 +4298,10 @@ test_expect_success '13a-check(conflict): messages for newly added files' ' ) ' -test_expect_success '13a-check(info): messages for newly added files' ' +test_expect_success '13a(info): messages for newly added files' ' + test_setup_13a info && ( - cd 13a && + cd 13a_info && git reset --hard && git checkout A^0 && @@ -4153,10 +4331,10 @@ test_expect_success '13a-check(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_expect_success '13b-setup: messages for transitive rename with conflicted content' ' - test_create_repo 13b && +test_setup_13b () { + test_create_repo 13b_$1 && ( - cd 13b && + cd 13b_$1 && mkdir x && mkdir z && @@ -4185,11 +4363,12 @@ test_expect_success '13b-setup: messages for transitive rename with conflicted c test_tick && git commit -m "B" ) -' +} -test_expect_success '13b-check(conflict): messages for transitive rename with conflicted content' ' +test_expect_success '13b(conflict): messages for transitive rename with conflicted content' ' + test_setup_13b conflict && ( - cd 13b && + cd 13b_conflict && git checkout A^0 && @@ -4207,9 +4386,10 @@ test_expect_success '13b-check(conflict): messages for transitive rename with co ) ' -test_expect_success '13b-check(info): messages for transitive rename with conflicted content' ' +test_expect_success '13b(info): messages for transitive rename with conflicted content' ' + test_setup_13b info && ( - cd 13b && + cd 13b_info && git reset --hard && git checkout A^0 && @@ -4232,16 +4412,16 @@ test_expect_success '13b-check(info): messages for transitive rename with confli # Commit O: z/{b,c}, x/{d,e} # Commit A: y/{b,c,d}, x/e # Commit B: z/{b,c,d}, x/e -# Expected: y/{b,c,d}, with info or conflict messages for d ( +# Expected: y/{b,c,d}, x/e, with info or conflict messages for d # A: renamed x/d -> z/d; B: renamed z/ -> y/ AND renamed x/d to y/d # One could argue A had partial knowledge of what was done with # d and B had full knowledge, but that's a slippery slope as # shown in testcase 13d. -test_expect_success '13c-setup: messages for rename/rename(1to1) via transitive rename' ' - test_create_repo 13c && +test_setup_13c () { + test_create_repo 13c_$1 && ( - cd 13c && + cd 13c_$1 && mkdir x && mkdir z && @@ -4269,11 +4449,12 @@ test_expect_success '13c-setup: messages for rename/rename(1to1) via transitive test_tick && git commit -m "B" ) -' +} -test_expect_success '13c-check(conflict): messages for rename/rename(1to1) via transitive rename' ' +test_expect_success '13c(conflict): messages for rename/rename(1to1) via transitive rename' ' + test_setup_13c conflict && ( - cd 13c && + cd 13c_conflict && git checkout A^0 && @@ -4290,9 +4471,10 @@ test_expect_success '13c-check(conflict): messages for rename/rename(1to1) via t ) ' -test_expect_success '13c-check(info): messages for rename/rename(1to1) via transitive rename' ' +test_expect_success '13c(info): messages for rename/rename(1to1) via transitive rename' ' + test_setup_13c info && ( - cd 13c && + cd 13c_info && git reset --hard && git checkout A^0 && @@ -4324,10 +4506,10 @@ test_expect_success '13c-check(info): messages for rename/rename(1to1) via trans # * 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_expect_success '13d-setup: messages for rename/rename(1to1) via dual transitive rename' ' - test_create_repo 13d && +test_setup_13d () { + test_create_repo 13d_$1 && ( - cd 13d && + cd 13d_$1 && mkdir a && mkdir b && @@ -4356,11 +4538,12 @@ test_expect_success '13d-setup: messages for rename/rename(1to1) via dual transi test_tick && git commit -m "B" ) -' +} -test_expect_success '13d-check(conflict): messages for rename/rename(1to1) via dual transitive rename' ' +test_expect_success '13d(conflict): messages for rename/rename(1to1) via dual transitive rename' ' + test_setup_13d conflict && ( - cd 13d && + cd 13d_conflict && git checkout A^0 && @@ -4380,9 +4563,10 @@ test_expect_success '13d-check(conflict): messages for rename/rename(1to1) via d ) ' -test_expect_success '13d-check(info): messages for rename/rename(1to1) via dual transitive rename' ' +test_expect_success '13d(info): messages for rename/rename(1to1) via dual transitive rename' ' + test_setup_13d info && ( - cd 13d && + cd 13d_info && git reset --hard && git checkout A^0 && @@ -4448,7 +4632,7 @@ test_expect_success '13d-check(info): messages for rename/rename(1to1) via dual # in the outer merge for this special kind of setup, but it at # least avoids hitting a BUG(). # -test_expect_success '13e-setup: directory rename detection in recursive case' ' +test_setup_13e () { test_create_repo 13e && ( cd 13e && @@ -4493,9 +4677,10 @@ test_expect_success '13e-setup: directory rename detection in recursive case' ' test_tick && git commit -m "D" ) -' +} -test_expect_success '13e-check: directory rename detection in recursive case' ' +test_expect_success '13e: directory rename detection in recursive case' ' + test_setup_13e && ( cd 13e && diff --git a/third_party/git/t/t6044-merge-unrelated-index-changes.sh b/third_party/git/t/t6424-merge-unrelated-index-changes.sh index 5e3779ebc9..5e3779ebc9 100755 --- a/third_party/git/t/t6044-merge-unrelated-index-changes.sh +++ b/third_party/git/t/t6424-merge-unrelated-index-changes.sh diff --git a/third_party/git/t/t6045-merge-rename-delete.sh b/third_party/git/t/t6425-merge-rename-delete.sh index 5d33577d2f..f79d021590 100755 --- a/third_party/git/t/t6045-merge-rename-delete.sh +++ b/third_party/git/t/t6425-merge-rename-delete.sh @@ -17,7 +17,8 @@ test_expect_success 'rename/delete' ' git commit -m "delete" && test_must_fail git merge --strategy=recursive rename >output && - test_i18ngrep "CONFLICT (rename/delete): A deleted in HEAD and renamed to B in rename. Version rename of B left in tree." output + test_i18ngrep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output && + test_i18ngrep "CONFLICT (rename/delete): A.*deleted in HEAD." output ' test_done diff --git a/third_party/git/t/t6046-merge-skip-unneeded-updates.sh b/third_party/git/t/t6426-merge-skip-unneeded-updates.sh index 3a47623ed3..699813671c 100755 --- a/third_party/git/t/t6046-merge-skip-unneeded-updates.sh +++ b/third_party/git/t/t6426-merge-skip-unneeded-updates.sh @@ -36,10 +36,10 @@ test_description="merge cases" # Commit B: b_3 # Expected: b_2 -test_expect_success '1a-setup: Modify(A)/Modify(B), change on B subset of A' ' - test_create_repo 1a && +test_setup_1a () { + test_create_repo 1a_$1 && ( - cd 1a && + cd 1a_$1 && test_write_lines 1 2 3 4 5 6 7 8 9 10 >b && git add b && @@ -62,26 +62,24 @@ test_expect_success '1a-setup: Modify(A)/Modify(B), change on B subset of A' ' test_tick && git commit -m "B" ) -' +} -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" && +test_expect_success '1a-L: Modify(A)/Modify(B), change on B subset of A' ' + test_setup_1a L && ( - cd 1a && + cd 1a_L && git checkout A^0 && - test-tool chmtime =31337 b && - test-tool chmtime -v +0 b >expected-mtime && + test-tool chmtime --get -3600 b >old-mtime && GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err && - test_i18ngrep "Skipped b" out && test_must_be_empty err && - test-tool chmtime -v +0 b >actual-mtime && - test_cmp expected-mtime actual-mtime && + # Make sure b was NOT updated + test-tool chmtime --get b >new-mtime && + test_cmp old-mtime new-mtime && git ls-files -s >index_files && test_line_count = 1 index_files && @@ -96,17 +94,20 @@ test_expect_success '1a-check-L: Modify(A)/Modify(B), change on B subset of A' ' ) ' -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" && +test_expect_success '1a-R: Modify(A)/Modify(B), change on B subset of A' ' + test_setup_1a R && ( - cd 1a && + cd 1a_R && 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 && - test_i18ngrep "Auto-merging b" out && + # Make sure b WAS updated + test-tool chmtime --get b >new-mtime && + test $(cat old-mtime) -lt $(cat new-mtime) && + test_must_be_empty err && git ls-files -s >index_files && @@ -133,10 +134,10 @@ test_expect_success '1a-check-R: Modify(A)/Modify(B), change on B subset of A' ' # Commit B: c_1 # Expected: c_2 -test_expect_success '2a-setup: Modify(A)/rename(B)' ' - test_create_repo 2a && +test_setup_2a () { + test_create_repo 2a_$1 && ( - cd 2a && + cd 2a_$1 && test_seq 1 10 >b && git add b && @@ -158,20 +159,19 @@ test_expect_success '2a-setup: Modify(A)/rename(B)' ' test_tick && git commit -m "B" ) -' +} -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" && +test_expect_success '2a-L: Modify/rename, merge into modify side' ' + test_setup_2a L && ( - cd 2a && + cd 2a_L && git checkout A^0 && + test_path_is_missing c && GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err && - test_i18ngrep ! "Skipped c" out && - test_must_be_empty err && + test_path_is_file c && git ls-files -s >index_files && test_line_count = 1 index_files && @@ -189,17 +189,20 @@ test_expect_success '2a-check-L: Modify/rename, merge into modify side' ' ) ' -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" && +test_expect_success '2a-R: Modify/rename, merge into rename side' ' + test_setup_2a R && ( - cd 2a && + cd 2a_R && 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 && - test_i18ngrep ! "Skipped c" out && + # Make sure c WAS updated + test-tool chmtime --get c >new-mtime && + test $(cat old-mtime) -lt $(cat new-mtime) && + test_must_be_empty err && git ls-files -s >index_files && @@ -224,10 +227,10 @@ test_expect_success '2a-check-R: Modify/rename, merge into rename side' ' # Commit B: b_3 # Expected: c_2 -test_expect_success '2b-setup: Rename+Mod(A)/Mod(B), B mods subset of A' ' - test_create_repo 2b && +test_setup_2b () { + test_create_repo 2b_$1 && ( - cd 2b && + cd 2b_$1 && test_write_lines 1 2 3 4 5 6 7 8 9 10 >b && git add b && @@ -251,26 +254,23 @@ test_expect_success '2b-setup: Rename+Mod(A)/Mod(B), B mods subset of A' ' test_tick && git commit -m "B" ) -' +} -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" && +test_expect_success '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A' ' + test_setup_2b L && ( - cd 2b && + cd 2b_L && git checkout A^0 && - test-tool chmtime =31337 c && - test-tool chmtime -v +0 c >expected-mtime && - + test-tool chmtime --get -3600 c >old-mtime && GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err && - test_i18ngrep "Skipped c" out && test_must_be_empty err && - test-tool chmtime -v +0 c >actual-mtime && - test_cmp expected-mtime actual-mtime && + # Make sure c WAS updated + test-tool chmtime --get c >new-mtime && + test_cmp old-mtime new-mtime && git ls-files -s >index_files && test_line_count = 1 index_files && @@ -288,17 +288,19 @@ test_expect_success '2b-check-L: Rename+Mod(A)/Mod(B), B mods subset of A' ' ) ' -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" && +test_expect_success '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A' ' + test_setup_2b R && ( - cd 2b && + cd 2b_R && git checkout B^0 && + test_path_is_missing c && GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err && - test_i18ngrep "Auto-merging c" out && + # Make sure c now present (and thus was updated) + test_path_is_file c && + test_must_be_empty err && git ls-files -s >index_files && @@ -332,7 +334,7 @@ test_expect_success '2b-check-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_expect_success '2c-setup: Modify b & add c VS rename b->c' ' +test_setup_2c () { test_create_repo 2c && ( cd 2c && @@ -358,21 +360,26 @@ test_expect_success '2c-setup: Modify b & add c VS rename b->c' ' test_tick && git commit -m "B" ) -' +} -test_expect_success '2c-check: Modify b & add c VS rename b->c' ' +test_expect_success '2c: Modify b & add c VS rename b->c' ' + test_setup_2c && ( 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_i18ngrep ! "Skipped c" out && - test_must_be_empty err + test_i18ngrep "CONFLICT (.*/add):" 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) # FIXME: rename/add conflicts are horribly broken right now; # when I get back to my patch series fixing it and @@ -428,10 +435,10 @@ test_expect_success '2c-check: Modify b & add c VS rename b->c' ' # Commit B: bq_1, bar/whatever # Expected: bar/{bq_2, whatever} -test_expect_success '3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' - test_create_repo 3a && +test_setup_3a () { + test_create_repo 3a_$1 && ( - cd 3a && + cd 3a_$1 && mkdir foo && test_seq 1 10 >bq && @@ -456,21 +463,22 @@ test_expect_success '3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' test_tick && git commit -m "B" ) -' +} -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" && +test_expect_success '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' + test_setup_3a L && ( - cd 3a && + cd 3a_L && 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 && @@ -487,19 +495,20 @@ test_expect_success '3a-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' ) ' -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" && +test_expect_success '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' + test_setup_3a R && ( - cd 3a && + cd 3a_R && 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 && @@ -522,10 +531,10 @@ test_expect_success '3a-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' # Commit B: bq_2, bar/whatever # Expected: bar/{bq_2, whatever} -test_expect_success '3b-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' - test_create_repo 3b && +test_setup_3b () { + test_create_repo 3b_$1 && ( - cd 3b && + cd 3b_$1 && mkdir foo && test_seq 1 10 >bq && @@ -550,21 +559,22 @@ test_expect_success '3b-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' test_tick && git commit -m "B" ) -' +} -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" && +test_expect_success '3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' + test_setup_3b L && ( - cd 3b && + cd 3b_L && 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 && @@ -581,19 +591,20 @@ test_expect_success '3b-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' ) ' -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" && +test_expect_success '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' + test_setup_3b R && ( - cd 3b && + cd 3b_R && 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 && @@ -621,7 +632,7 @@ test_expect_success '3b-check-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_expect_success '4a-setup: Change on A, change on B subset of A, dirty mods present' ' +test_setup_4a () { test_create_repo 4a && ( cd 4a && @@ -647,33 +658,31 @@ test_expect_success '4a-setup: Change on A, change on B subset of A, dirty mods 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 +# set to true, it will error out on a case like this claiming that the locally # modified file would be overwritten by the merge. Getting this testcase # 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-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" && +test_expect_failure '4a: Change on A, change on B subset of A, dirty mods present' ' + test_setup_4a && ( cd 4a && git checkout A^0 && echo "File rewritten" >b && - test-tool chmtime =31337 b && - test-tool chmtime -v +0 b >expected-mtime && + test-tool chmtime --get -3600 b >old-mtime && GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err && - test_i18ngrep "Skipped b" out && test_must_be_empty err && - test-tool chmtime -v +0 b >actual-mtime && - test_cmp expected-mtime actual-mtime && + # Make sure b was NOT updated + test-tool chmtime --get b >new-mtime && + test_cmp old-mtime new-mtime && git ls-files -s >index_files && test_line_count = 1 index_files && @@ -695,7 +704,7 @@ test_expect_failure '4a-check: Change on A, change on B subset of A, dirty mods # Working copy: c_4 # Expected: c_2 -test_expect_success '4b-setup: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' ' +test_setup_4b () { test_create_repo 4b && ( cd 4b && @@ -722,27 +731,25 @@ test_expect_success '4b-setup: Rename+Mod(A)/Mod(B), change on B subset of A, di test_tick && git commit -m "B" ) -' +} -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" && +test_expect_success '4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' ' + test_setup_4b && ( cd 4b && git checkout A^0 && echo "File rewritten" >c && - test-tool chmtime =31337 c && - test-tool chmtime -v +0 c >expected-mtime && + test-tool chmtime --get -3600 c >old-mtime && GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err && - test_i18ngrep "Skipped c" out && test_must_be_empty err && - test-tool chmtime -v +0 c >actual-mtime && - test_cmp expected-mtime actual-mtime && + # Make sure c was NOT updated + test-tool chmtime --get c >new-mtime && + test_cmp old-mtime new-mtime && git ls-files -s >index_files && test_line_count = 1 index_files && diff --git a/third_party/git/t/t6427-diff3-conflict-markers.sh b/third_party/git/t/t6427-diff3-conflict-markers.sh new file mode 100755 index 0000000000..f4655bb358 --- /dev/null +++ b/third_party/git/t/t6427-diff3-conflict-markers.sh @@ -0,0 +1,211 @@ +#!/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/t3030-merge-recursive.sh b/third_party/git/t/t6430-merge-recursive.sh index ff641b348a..a328260d42 100755 --- a/third_party/git/t/t3030-merge-recursive.sh +++ b/third_party/git/t/t6430-merge-recursive.sh @@ -452,6 +452,34 @@ 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" && @@ -576,7 +604,7 @@ test_expect_success 'merge removes empty directories' ' git commit -mremoved-d/e && git checkout master && git merge -s recursive rm && - test_must_fail test -d d + test_path_is_missing d ' test_expect_success 'merge-recursive simple w/submodule' ' @@ -635,7 +663,7 @@ test_expect_failure 'merge-recursive rename vs. rename/symlink' ' test_expect_success 'merging with triple rename across D/F conflict' ' git reset --hard HEAD && - git checkout -b main && + git checkout -b topic && git rm -rf . && echo "just a file" >sub1 && @@ -654,7 +682,7 @@ test_expect_success 'merging with triple rename across D/F conflict' ' test_tick && git commit -a -m changesimplefile && - git checkout main && + git checkout topic && git rm sub1 && git mv sub2 sub1 && test_tick && @@ -667,15 +695,22 @@ 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/t3031-merge-criscross.sh b/third_party/git/t/t6431-merge-criscross.sh index 3824756a02..3824756a02 100755 --- a/third_party/git/t/t3031-merge-criscross.sh +++ b/third_party/git/t/t6431-merge-criscross.sh diff --git a/third_party/git/t/t3032-merge-recursive-space-options.sh b/third_party/git/t/t6432-merge-recursive-space-options.sh index b56180ee4a..b56180ee4a 100755 --- a/third_party/git/t/t3032-merge-recursive-space-options.sh +++ b/third_party/git/t/t6432-merge-recursive-space-options.sh diff --git a/third_party/git/t/t3033-merge-toplevel.sh b/third_party/git/t/t6433-merge-toplevel.sh index d314599428..e29c284b9b 100755 --- a/third_party/git/t/t3033-merge-toplevel.sh +++ b/third_party/git/t/t6433-merge-toplevel.sh @@ -142,6 +142,17 @@ test_expect_success 'refuse two-project merge by default' ' test_must_fail git merge five ' +test_expect_success 'refuse two-project merge by default, quit before --autostash happens' ' + t3033_reset && + git reset --hard four && + echo change >>one.t && + git diff >expect && + test_must_fail git merge --autostash five 2>err && + test_i18ngrep ! "stash" err && + git diff >actual && + test_cmp expect actual +' + test_expect_success 'two-project merge with --allow-unrelated-histories' ' t3033_reset && git reset --hard four && @@ -149,4 +160,15 @@ test_expect_success 'two-project merge with --allow-unrelated-histories' ' git diff --exit-code five ' +test_expect_success 'two-project merge with --allow-unrelated-histories with --autostash' ' + t3033_reset && + git reset --hard four && + echo change >>one.t && + git diff one.t >expect && + git merge --allow-unrelated-histories --autostash five 2>err && + test_i18ngrep "Applied autostash." err && + git diff one.t >actual && + test_cmp expect actual +' + test_done diff --git a/third_party/git/t/t3034-merge-recursive-rename-options.sh b/third_party/git/t/t6434-merge-recursive-rename-options.sh index 3d9fae68c4..3d9fae68c4 100755 --- a/third_party/git/t/t3034-merge-recursive-rename-options.sh +++ b/third_party/git/t/t6434-merge-recursive-rename-options.sh diff --git a/third_party/git/t/t3035-merge-sparse.sh b/third_party/git/t/t6435-merge-sparse.sh index c4b4a94324..74562e1235 100755 --- a/third_party/git/t/t3035-merge-sparse.sh +++ b/third_party/git/t/t6435-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 && - ! git merge theirs + test_must_fail 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' ' - ! git merge theirs + test_must_fail git merge theirs ' test_expect_success 'Merge abort works after the conflict' ' diff --git a/third_party/git/t/t7607-merge-overwrite.sh b/third_party/git/t/t6436-merge-overwrite.sh index dd8ab7ede1..dd8ab7ede1 100755 --- a/third_party/git/t/t7607-merge-overwrite.sh +++ b/third_party/git/t/t6436-merge-overwrite.sh diff --git a/third_party/git/t/t7405-submodule-merge.sh b/third_party/git/t/t6437-submodule-merge.sh index aa33978ed2..6a1e5f8232 100755 --- a/third_party/git/t/t7405-submodule-merge.sh +++ b/third_party/git/t/t6437-submodule-merge.sh @@ -195,7 +195,7 @@ test_expect_success 'git submodule status should display the merge conflict prop url = $TRASH_DIRECTORY/sub EOF cat >expect <<EOF && -U0000000000000000000000000000000000000000 sub +U$ZERO_OID sub EOF git submodule status > actual && test_cmp expect actual && @@ -214,7 +214,7 @@ test_expect_success 'git submodule status should display the merge conflict prop url = $TRASH_DIRECTORY/sub EOF cat >expect <<EOF && -U0000000000000000000000000000000000000000 sub +U$ZERO_OID sub EOF git submodule status > actual && test_cmp expect actual && diff --git a/third_party/git/t/t7613-merge-submodule.sh b/third_party/git/t/t6438-submodule-directory-file-conflicts.sh index d1e9fcc781..04bf4be7d7 100755 --- a/third_party/git/t/t7613-merge-submodule.sh +++ b/third_party/git/t/t6438-submodule-directory-file-conflicts.sh @@ -6,14 +6,14 @@ test_description='merge can handle submodules' . "$TEST_DIRECTORY"/lib-submodule-update.sh # merges without conflicts -test_submodule_switch "git merge" +test_submodule_switch "merge" -test_submodule_switch "git merge --ff" +test_submodule_switch "merge --ff" -test_submodule_switch "git merge --ff-only" +test_submodule_switch "merge --ff-only" KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 -test_submodule_switch "git merge --no-ff" +test_submodule_switch "merge --no-ff" test_done diff --git a/third_party/git/t/t7609-merge-co-error-msgs.sh b/third_party/git/t/t6439-merge-co-error-msgs.sh index e90413204e..5c8894d94f 100755 --- a/third_party/git/t/t7609-merge-co-error-msgs.sh +++ b/third_party/git/t/t6439-merge-co-error-msgs.sh @@ -126,7 +126,7 @@ test_expect_success 'not_uptodate_dir porcelain checkout error' ' git rm rep2 -r && >rep && >rep2 && - git add rep rep2&& + git add rep rep2 && git commit -m "added test as a file" && git checkout master && >rep/untracked-file && diff --git a/third_party/git/t/t6500-gc.sh b/third_party/git/t/t6500-gc.sh index c0f04dc6b0..4a3b8f48ac 100755 --- a/third_party/git/t/t6500-gc.sh +++ b/third_party/git/t/t6500-gc.sh @@ -10,7 +10,24 @@ test_expect_success 'setup' ' # do not let the amount of physical memory affects gc # behavior, make sure we always pack everything to one pack by # default - git config gc.bigPackThreshold 2g + git config gc.bigPackThreshold 2g && + + # These are simply values which, when hashed as a blob with a newline, + # produce a hash where the first byte is 0x17 in their respective + # algorithms. + test_oid_cache <<-EOF + obj1 sha1:263 + obj1 sha256:34 + + obj2 sha1:410 + obj2 sha256:174 + + obj3 sha1:523 + obj3 sha256:313 + + obj4 sha1:790 + obj4 sha256:481 + EOF ' test_expect_success 'gc empty repository' ' @@ -85,13 +102,13 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre # We need to create two object whose sha1s start with 17 # since this is what git gc counts. As it happens, these # two blobs will do so. - test_commit 263 && - test_commit 410 && + test_commit "$(test_oid obj1)" && + test_commit "$(test_oid obj2)" && # Our first gc will create a pack; our second will create a second pack git gc --auto && ls .git/objects/pack | sort >existing_packs && - test_commit 523 && - test_commit 790 && + test_commit "$(test_oid obj3)" && + test_commit "$(test_oid obj4)" && git gc --auto 2>err && test_i18ngrep ! "^warning:" err && @@ -103,14 +120,14 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre ' test_expect_success 'gc --no-quiet' ' - git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && + GIT_PROGRESS_DELAY=0 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 git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && + test_terminal env GIT_PROGRESS_DELAY=0 \ + 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 033871ee5f..8a3bb4105b 100755 --- a/third_party/git/t/t6501-freshen-objects.sh +++ b/third_party/git/t/t6501-freshen-objects.sh @@ -128,33 +128,33 @@ for repack in '' true; do done test_expect_success 'do not complain about existing broken links (commit)' ' - cat >broken-commit <<-\EOF && - tree 0000000000000000000000000000000000000001 - parent 0000000000000000000000000000000000000002 + cat >broken-commit <<-EOF && + tree $(test_oid 001) + parent $(test_oid 002) author whatever <whatever@example.com> 1234 -0000 committer whatever <whatever@example.com> 1234 -0000 some message EOF commit=$(git hash-object -t commit -w broken-commit) && - git gc 2>stderr && + git gc -q 2>stderr && verbose git cat-file -e $commit && test_must_be_empty stderr ' test_expect_success 'do not complain about existing broken links (tree)' ' - cat >broken-tree <<-\EOF && - 100644 blob 0000000000000000000000000000000000000003 foo + cat >broken-tree <<-EOF && + 100644 blob $(test_oid 003) foo EOF tree=$(git mktree --missing <broken-tree) && - git gc 2>stderr && + git gc -q 2>stderr && git cat-file -e $tree && test_must_be_empty stderr ' test_expect_success 'do not complain about existing broken links (tag)' ' - cat >broken-tag <<-\EOF && - object 0000000000000000000000000000000000000004 + cat >broken-tag <<-EOF && + object $(test_oid 004) type commit tag broken tagger whatever <whatever@example.com> 1234 -0000 @@ -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 2>stderr && + git gc -q 2>stderr && git cat-file -e $tag && test_must_be_empty stderr ' diff --git a/third_party/git/t/t6600-test-reach.sh b/third_party/git/t/t6600-test-reach.sh index b24d850036..f807276337 100755 --- a/third_party/git/t/t6600-test-reach.sh +++ b/third_party/git/t/t6600-test-reach.sh @@ -51,8 +51,10 @@ test_expect_success 'setup' ' done && git commit-graph write --reachable && mv .git/objects/info/commit-graph commit-graph-full && + chmod u+w commit-graph-full && git show-ref -s commit-5-5 | git commit-graph write --stdin-commits && mv .git/objects/info/commit-graph commit-graph-half && + chmod u+w commit-graph-half && git config core.commitGraph true ' @@ -108,6 +110,36 @@ test_expect_success 'in_merge_bases:miss' ' test_three_modes in_merge_bases ' +test_expect_success 'in_merge_bases_many:hit' ' + cat >input <<-\EOF && + A:commit-6-8 + X:commit-6-9 + X:commit-5-7 + EOF + echo "in_merge_bases_many(A,X):1" >expect && + test_three_modes in_merge_bases_many +' + +test_expect_success 'in_merge_bases_many:miss' ' + cat >input <<-\EOF && + A:commit-6-8 + X:commit-7-7 + X:commit-8-6 + EOF + echo "in_merge_bases_many(A,X):0" >expect && + test_three_modes in_merge_bases_many +' + +test_expect_success 'in_merge_bases_many:miss-heuristic' ' + cat >input <<-\EOF && + A:commit-6-8 + X:commit-7-5 + X:commit-6-6 + EOF + echo "in_merge_bases_many(A,X):0" >expect && + test_three_modes in_merge_bases_many +' + test_expect_success 'is_descendant_of:hit' ' cat >input <<-\EOF && A:commit-5-7 diff --git a/third_party/git/t/t7001-mv.sh b/third_party/git/t/t7001-mv.sh index 36b50d0b4c..63d5f41a12 100755 --- a/third_party/git/t/t7001-mv.sh +++ b/third_party/git/t/t7001-mv.sh @@ -177,7 +177,7 @@ test_expect_success "Sergey Vlasov's test case" ' date >ab.c && date >ab/d && git add ab.c ab && - git commit -m 'initial' && + git commit -m "initial" && git mv ab a ' @@ -248,6 +248,23 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' ' rm -f dirty dirty2 +# NB: This test is about the error message +# as well as the failure. +test_expect_success 'git mv error on conflicted file' ' + rm -fr .git && + git init && + >conflict && + test_when_finished "rm -f conflict" && + cfhash=$(git hash-object -w conflict) && + q_to_tab <<-EOF | git update-index --index-info && + 0 $cfhash 0Qconflict + 100644 $cfhash 1Qconflict + EOF + + test_must_fail git mv conflict newname 2>actual && + test_i18ngrep "conflicted" actual +' + test_expect_success 'git mv should overwrite symlink to a file' ' rm -fr .git && diff --git a/third_party/git/t/t7003-filter-branch.sh b/third_party/git/t/t7003-filter-branch.sh index e23de7d0b5..36477cb1f4 100755 --- a/third_party/git/t/t7003-filter-branch.sh +++ b/third_party/git/t/t7003-filter-branch.sh @@ -463,10 +463,11 @@ test_expect_success 'rewrite submodule with another content' ' ' test_expect_success 'replace submodule revision' ' + invalid=$(test_oid numeric) && git reset --hard original && git filter-branch -f --tree-filter \ "if git ls-files --error-unmatch -- submod > /dev/null 2>&1 - then git update-index --cacheinfo 160000 0123456789012345678901234567890123456789 submod + then git update-index --cacheinfo 160000 $invalid submod fi" HEAD && test $orig_head != $(git show-ref --hash --head HEAD) ' diff --git a/third_party/git/t/t7004-tag.sh b/third_party/git/t/t7004-tag.sh index 80eb13d94e..05f411c821 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 myhead && - test_must_fail git tag -d mytag anothertag && + ! tag_exists nonexistingtag && + test_must_fail git tag -d mytag nonexistingtag && ! tag_exists mytag && - ! tag_exists myhead + ! tag_exists nonexistingtag ' test_expect_success 'trying to delete an already deleted tag should fail' \ @@ -517,7 +517,6 @@ 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 && @@ -1420,7 +1419,7 @@ test_expect_success \ get_tag_header reuse $commit commit $time >expect echo "An annotation to be reused" >> expect test_expect_success \ - 'overwriting an annoted tag should use its previous body' ' + 'overwriting an annotated 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 && @@ -1727,6 +1726,7 @@ test_expect_success 'recursive tagging should give advice' ' hint: already a tag. If you meant to tag the object that it points to, use: hint: | hint: git tag -f nested annotated-v4.0^{} + hint: Disable this message with "git config advice.nestedTag false" EOF git tag -m nested nested annotated-v4.0 2>actual && test_i18ncmp expect actual @@ -2015,8 +2015,8 @@ test_expect_success '--merged can be used in non-list mode' ' test_cmp expect actual ' -test_expect_success '--merged is incompatible with --no-merged' ' - test_must_fail git tag --merged HEAD --no-merged HEAD +test_expect_success '--merged is compatible with --no-merged' ' + git tag --merged HEAD --no-merged HEAD ' test_expect_success '--merged shows merged tags' ' diff --git a/third_party/git/t/t7009-filter-branch-null-sha1.sh b/third_party/git/t/t7008-filter-branch-null-sha1.sh index 9ba9f24ad2..9ba9f24ad2 100755 --- a/third_party/git/t/t7009-filter-branch-null-sha1.sh +++ b/third_party/git/t/t7008-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 9d1abe50ef..7476781979 100755 --- a/third_party/git/t/t7012-skip-worktree-writing.sh +++ b/third_party/git/t/t7012-skip-worktree-writing.sh @@ -134,6 +134,21 @@ 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 041e319e79..5c5bc32ccb 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 "nineth gpgsm-signed" && - git tag -s -m nineth nineth-signed-x509 + echo 9 >file && test_tick && git commit -a -m "ninth gpgsm-signed" && + git tag -s -m ninth ninth-signed-x509 ' test_expect_success GPG 'verify and show signatures' ' @@ -80,10 +80,34 @@ test_expect_success GPG 'verify and show signatures' ' ' test_expect_success GPGSM 'verify and show signatures x509' ' - git verify-tag nineth-signed-x509 2>actual && + git verify-tag ninth-signed-x509 2>actual && grep "Good signature from" actual && ! grep "BAD signature from" actual && - echo nineth-signed-x509 OK + 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 ' test_expect_success GPG 'detect fudged signature' ' @@ -127,10 +151,10 @@ test_expect_success GPG 'verify signatures with --raw' ' ' test_expect_success GPGSM 'verify signatures with --raw x509' ' - git verify-tag --raw nineth-signed-x509 2>actual && + git verify-tag --raw ninth-signed-x509 2>actual && grep "GOODSIG" actual && ! grep "BADSIG" actual && - echo nineth-signed-x509 OK + echo ninth-signed-x509 OK ' test_expect_success GPG 'verify multiple tags' ' @@ -147,7 +171,7 @@ test_expect_success GPG 'verify multiple tags' ' ' test_expect_success GPGSM 'verify multiple tags x509' ' - tags="seventh-signed nineth-signed-x509" && + tags="seventh-signed ninth-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 0c394cf995..2f9bea9793 100755 --- a/third_party/git/t/t7061-wtstatus-ignore.sh +++ b/third_party/git/t/t7061-wtstatus-ignore.sh @@ -30,6 +30,31 @@ test_expect_success 'same with gitignore starting with BOM' ' test_cmp expected actual ' +test_expect_success 'status untracked files --ignored with pathspec (no match)' ' + git status --porcelain --ignored -- untracked/i >actual && + test_must_be_empty actual && + git status --porcelain --ignored -- untracked/u >actual && + test_must_be_empty actual +' + +test_expect_success 'status untracked files --ignored with pathspec (literal match)' ' + git status --porcelain --ignored -- untracked/ignored >actual && + echo "!! untracked/ignored" >expected && + test_cmp expected actual && + git status --porcelain --ignored -- untracked/uncommitted >actual && + echo "?? untracked/uncommitted" >expected && + test_cmp expected actual +' + +test_expect_success 'status untracked files --ignored with pathspec (glob match)' ' + git status --porcelain --ignored -- untracked/i\* >actual && + echo "!! untracked/ignored" >expected && + test_cmp expected actual && + git status --porcelain --ignored -- untracked/u\* >actual && + echo "?? untracked/uncommitted" >expected && + test_cmp expected actual +' + cat >expected <<\EOF ?? .gitignore ?? actual @@ -43,11 +68,16 @@ test_expect_success 'status untracked directory with --ignored -u' ' test_cmp expected actual ' cat >expected <<\EOF -?? untracked/uncommitted +?? untracked/ !! untracked/ignored EOF -test_expect_success 'status prefixed untracked directory with --ignored' ' +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 && + git status --porcelain --ignored untracked/ >actual && test_cmp expected actual ' diff --git a/third_party/git/t/t7063-status-untracked-cache.sh b/third_party/git/t/t7063-status-untracked-cache.sh index 190ae149cf..a682a3d826 100755 --- a/third_party/git/t/t7063-status-untracked-cache.sh +++ b/third_party/git/t/t7063-status-untracked-cache.sh @@ -18,7 +18,7 @@ GIT_FORCE_UNTRACKED_CACHE=true export GIT_FORCE_UNTRACKED_CACHE sync_mtime () { - find . -type d -ls >/dev/null + find . -type d -exec ls -ld {} + >/dev/null } avoid_racy() { @@ -30,6 +30,30 @@ status_is_clean() { test_must_be_empty ../status.actual } +# Ignore_Untracked_Cache, abbreviated to 3 letters because then people can +# compare commands side-by-side, e.g. +# iuc status --porcelain >expect && +# git status --porcelain >actual && +# test_cmp expect actual +iuc () { + git ls-files -s >../current-index-entries + git ls-files -t | sed -ne s/^S.//p >../current-sparse-entries + + GIT_INDEX_FILE=.git/tmp_index + export GIT_INDEX_FILE + git update-index --index-info <../current-index-entries + git update-index --skip-worktree $(cat ../current-sparse-entries) + + git -c core.untrackedCache=false "$@" + ret=$? + + rm ../current-index-entries + rm $GIT_INDEX_FILE + unset GIT_INDEX_FILE + + return $ret +} + test_lazy_prereq UNTRACKED_CACHE ' { git update-index --test-untracked-cache; ret=$?; } && test $ret -ne 1 @@ -51,14 +75,24 @@ test_expect_success 'setup' ' touch one two three done/one dtwo/two dthree/three && git add one two done/one && : >.git/info/exclude && - git update-index --untracked-cache + git update-index --untracked-cache && + test_oid_cache <<-EOF + root sha1:e6fcc8f2ee31bae321d66afd183fcb7237afae6e + root sha256:b90c672088c015b9c83876e919da311bad4cd39639fb139f988af6a11493b974 + + exclude sha1:13263c0978fb9fad16b2d580fb800b6d811c3ff0 + exclude sha256:fe4aaa1bbbbce4cb8f73426748a14c5ad6026b26f90505a0bf2494b165a5b76c + + done sha1:1946f0437f90c5005533cbe1736a6451ca301714 + done sha256:7f079501d79f665b3acc50f5e0e9e94509084d5032ac20113a37dd5029b757cc + EOF ' test_expect_success 'untracked cache is empty' ' test-tool dump-untracked-cache >../actual && cat >../expect-empty <<EOF && -info/exclude 0000000000000000000000000000000000000000 -core.excludesfile 0000000000000000000000000000000000000000 +info/exclude $ZERO_OID +core.excludesfile $ZERO_OID exclude_per_dir .gitignore flags 00000006 EOF @@ -76,17 +110,17 @@ EOF cat >../dump.expect <<EOF && info/exclude $EMPTY_BLOB -core.excludesfile 0000000000000000000000000000000000000000 +core.excludesfile $ZERO_OID exclude_per_dir .gitignore flags 00000006 -/ 0000000000000000000000000000000000000000 recurse valid +/ $ZERO_OID recurse valid dthree/ dtwo/ three -/done/ 0000000000000000000000000000000000000000 recurse valid -/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid +/done/ $ZERO_OID recurse valid +/dthree/ $ZERO_OID recurse check_only valid three -/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid +/dtwo/ $ZERO_OID recurse check_only valid two EOF @@ -95,6 +129,8 @@ test_expect_success 'status first time (empty cache)' ' : >../trace && GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \ git status --porcelain >../actual && + iuc status --porcelain >../status.iuc && + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../actual && cat >../trace.expect <<EOF && node creation: 3 @@ -115,6 +151,8 @@ test_expect_success 'status second time (fully populated cache)' ' : >../trace && GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \ git status --porcelain >../actual && + iuc status --porcelain >../status.iuc && + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../actual && cat >../trace.expect <<EOF && node creation: 0 @@ -136,6 +174,7 @@ test_expect_success 'modify in root directory, one dir invalidation' ' : >../trace && GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \ git status --porcelain >../actual && + iuc status --porcelain >../status.iuc && cat >../status.expect <<EOF && A done/one A one @@ -145,6 +184,7 @@ A two ?? four ?? three EOF + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../actual && cat >../trace.expect <<EOF && node creation: 0 @@ -160,18 +200,18 @@ test_expect_success 'verify untracked cache dump' ' test-tool dump-untracked-cache >../actual && cat >../expect <<EOF && info/exclude $EMPTY_BLOB -core.excludesfile 0000000000000000000000000000000000000000 +core.excludesfile $ZERO_OID exclude_per_dir .gitignore flags 00000006 -/ 0000000000000000000000000000000000000000 recurse valid +/ $ZERO_OID recurse valid dthree/ dtwo/ four three -/done/ 0000000000000000000000000000000000000000 recurse valid -/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid +/done/ $ZERO_OID recurse valid +/dthree/ $ZERO_OID recurse check_only valid three -/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid +/dtwo/ $ZERO_OID recurse check_only valid two EOF test_cmp ../expect ../actual @@ -183,6 +223,7 @@ test_expect_success 'new .gitignore invalidates recursively' ' : >../trace && GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \ git status --porcelain >../actual && + iuc status --porcelain >../status.iuc && cat >../status.expect <<EOF && A done/one A one @@ -192,6 +233,7 @@ A two ?? dtwo/ ?? three EOF + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../actual && cat >../trace.expect <<EOF && node creation: 0 @@ -207,18 +249,18 @@ test_expect_success 'verify untracked cache dump' ' test-tool dump-untracked-cache >../actual && cat >../expect <<EOF && info/exclude $EMPTY_BLOB -core.excludesfile 0000000000000000000000000000000000000000 +core.excludesfile $ZERO_OID exclude_per_dir .gitignore flags 00000006 -/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid +/ $(test_oid root) recurse valid .gitignore dthree/ dtwo/ three -/done/ 0000000000000000000000000000000000000000 recurse valid -/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid +/done/ $ZERO_OID recurse valid +/dthree/ $ZERO_OID recurse check_only valid three -/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid +/dtwo/ $ZERO_OID recurse check_only valid two EOF test_cmp ../expect ../actual @@ -230,6 +272,7 @@ test_expect_success 'new info/exclude invalidates everything' ' : >../trace && GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \ git status --porcelain >../actual && + iuc status --porcelain >../status.iuc && cat >../status.expect <<EOF && A done/one A one @@ -237,6 +280,7 @@ A two ?? .gitignore ?? dtwo/ EOF + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../actual && cat >../trace.expect <<EOF && node creation: 0 @@ -250,16 +294,16 @@ EOF test_expect_success 'verify untracked cache dump' ' test-tool dump-untracked-cache >../actual && cat >../expect <<EOF && -info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0 -core.excludesfile 0000000000000000000000000000000000000000 +info/exclude $(test_oid exclude) +core.excludesfile $ZERO_OID exclude_per_dir .gitignore flags 00000006 -/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid +/ $(test_oid root) recurse valid .gitignore dtwo/ -/done/ 0000000000000000000000000000000000000000 recurse valid -/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid -/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid +/done/ $ZERO_OID recurse valid +/dthree/ $ZERO_OID recurse check_only valid +/dtwo/ $ZERO_OID recurse check_only valid two EOF test_cmp ../expect ../actual @@ -269,14 +313,14 @@ test_expect_success 'move two from tracked to untracked' ' git rm --cached two && test-tool dump-untracked-cache >../actual && cat >../expect <<EOF && -info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0 -core.excludesfile 0000000000000000000000000000000000000000 +info/exclude $(test_oid exclude) +core.excludesfile $ZERO_OID exclude_per_dir .gitignore flags 00000006 -/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse -/done/ 0000000000000000000000000000000000000000 recurse valid -/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid -/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid +/ $(test_oid root) recurse +/done/ $ZERO_OID recurse valid +/dthree/ $ZERO_OID recurse check_only valid +/dtwo/ $ZERO_OID recurse check_only valid two EOF test_cmp ../expect ../actual @@ -286,6 +330,7 @@ test_expect_success 'status after the move' ' : >../trace && GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \ git status --porcelain >../actual && + iuc status --porcelain >../status.iuc && cat >../status.expect <<EOF && A done/one A one @@ -293,6 +338,7 @@ A one ?? dtwo/ ?? two EOF + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../actual && cat >../trace.expect <<EOF && node creation: 0 @@ -306,17 +352,17 @@ EOF test_expect_success 'verify untracked cache dump' ' test-tool dump-untracked-cache >../actual && cat >../expect <<EOF && -info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0 -core.excludesfile 0000000000000000000000000000000000000000 +info/exclude $(test_oid exclude) +core.excludesfile $ZERO_OID exclude_per_dir .gitignore flags 00000006 -/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid +/ $(test_oid root) recurse valid .gitignore dtwo/ two -/done/ 0000000000000000000000000000000000000000 recurse valid -/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid -/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid +/done/ $ZERO_OID recurse valid +/dthree/ $ZERO_OID recurse check_only valid +/dtwo/ $ZERO_OID recurse check_only valid two EOF test_cmp ../expect ../actual @@ -326,14 +372,14 @@ test_expect_success 'move two from untracked to tracked' ' git add two && test-tool dump-untracked-cache >../actual && cat >../expect <<EOF && -info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0 -core.excludesfile 0000000000000000000000000000000000000000 +info/exclude $(test_oid exclude) +core.excludesfile $ZERO_OID exclude_per_dir .gitignore flags 00000006 -/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse -/done/ 0000000000000000000000000000000000000000 recurse valid -/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid -/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid +/ $(test_oid root) recurse +/done/ $ZERO_OID recurse valid +/dthree/ $ZERO_OID recurse check_only valid +/dtwo/ $ZERO_OID recurse check_only valid two EOF test_cmp ../expect ../actual @@ -343,6 +389,7 @@ test_expect_success 'status after the move' ' : >../trace && GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \ git status --porcelain >../actual && + iuc status --porcelain >../status.iuc && cat >../status.expect <<EOF && A done/one A one @@ -350,6 +397,7 @@ A two ?? .gitignore ?? dtwo/ EOF + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../actual && cat >../trace.expect <<EOF && node creation: 0 @@ -363,16 +411,16 @@ EOF test_expect_success 'verify untracked cache dump' ' test-tool dump-untracked-cache >../actual && cat >../expect <<EOF && -info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0 -core.excludesfile 0000000000000000000000000000000000000000 +info/exclude $(test_oid exclude) +core.excludesfile $ZERO_OID exclude_per_dir .gitignore flags 00000006 -/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid +/ $(test_oid root) recurse valid .gitignore dtwo/ -/done/ 0000000000000000000000000000000000000000 recurse valid -/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid -/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid +/done/ $ZERO_OID recurse valid +/dthree/ $ZERO_OID recurse check_only valid +/dtwo/ $ZERO_OID recurse check_only valid two EOF test_cmp ../expect ../actual @@ -390,10 +438,12 @@ test_expect_success 'status after commit' ' : >../trace && GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \ git status --porcelain >../actual && + iuc status --porcelain >../status.iuc && cat >../status.expect <<EOF && ?? .gitignore ?? dtwo/ EOF + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../actual && cat >../trace.expect <<EOF && node creation: 0 @@ -407,16 +457,16 @@ EOF test_expect_success 'untracked cache correct after commit' ' test-tool dump-untracked-cache >../actual && cat >../expect <<EOF && -info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0 -core.excludesfile 0000000000000000000000000000000000000000 +info/exclude $(test_oid exclude) +core.excludesfile $ZERO_OID exclude_per_dir .gitignore flags 00000006 -/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid +/ $(test_oid root) recurse valid .gitignore dtwo/ -/done/ 0000000000000000000000000000000000000000 recurse valid -/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid -/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid +/done/ $ZERO_OID recurse valid +/dthree/ $ZERO_OID recurse check_only valid +/dtwo/ $ZERO_OID recurse check_only valid two EOF test_cmp ../expect ../actual @@ -447,12 +497,14 @@ test_expect_success 'test sparse status with untracked cache' ' avoid_racy && GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \ git status --porcelain >../status.actual && + iuc status --porcelain >../status.iuc && cat >../status.expect <<EOF && M done/two ?? .gitignore ?? done/five ?? dtwo/ EOF + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../status.actual && cat >../trace.expect <<EOF && node creation: 0 @@ -466,17 +518,17 @@ EOF test_expect_success 'untracked cache correct after status' ' test-tool dump-untracked-cache >../actual && cat >../expect <<EOF && -info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0 -core.excludesfile 0000000000000000000000000000000000000000 +info/exclude $(test_oid exclude) +core.excludesfile $ZERO_OID exclude_per_dir .gitignore flags 00000006 -/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid +/ $(test_oid root) recurse valid .gitignore dtwo/ -/done/ 1946f0437f90c5005533cbe1736a6451ca301714 recurse valid +/done/ $(test_oid done) recurse valid five -/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid -/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid +/dthree/ $ZERO_OID recurse check_only valid +/dtwo/ $ZERO_OID recurse check_only valid two EOF test_cmp ../expect ../actual @@ -487,12 +539,14 @@ test_expect_success 'test sparse status again with untracked cache' ' : >../trace && GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \ git status --porcelain >../status.actual && + iuc status --porcelain >../status.iuc && cat >../status.expect <<EOF && M done/two ?? .gitignore ?? done/five ?? dtwo/ EOF + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../status.actual && cat >../trace.expect <<EOF && node creation: 0 @@ -514,6 +568,7 @@ test_expect_success 'test sparse status with untracked cache and subdir' ' : >../trace && GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \ git status --porcelain >../status.actual && + iuc status --porcelain >../status.iuc && cat >../status.expect <<EOF && M done/two ?? .gitignore @@ -521,6 +576,7 @@ test_expect_success 'test sparse status with untracked cache and subdir' ' ?? done/sub/ ?? dtwo/ EOF + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../status.actual && cat >../trace.expect <<EOF && node creation: 2 @@ -534,22 +590,22 @@ EOF test_expect_success 'verify untracked cache dump (sparse/subdirs)' ' test-tool dump-untracked-cache >../actual && cat >../expect-from-test-dump <<EOF && -info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0 -core.excludesfile 0000000000000000000000000000000000000000 +info/exclude $(test_oid exclude) +core.excludesfile $ZERO_OID exclude_per_dir .gitignore flags 00000006 -/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid +/ $(test_oid root) recurse valid .gitignore dtwo/ -/done/ 1946f0437f90c5005533cbe1736a6451ca301714 recurse valid +/done/ $(test_oid done) recurse valid five sub/ -/done/sub/ 0000000000000000000000000000000000000000 recurse check_only valid +/done/sub/ $ZERO_OID recurse check_only valid sub/ -/done/sub/sub/ 0000000000000000000000000000000000000000 recurse check_only valid +/done/sub/sub/ $ZERO_OID recurse check_only valid file -/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid -/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid +/dthree/ $ZERO_OID recurse check_only valid +/dtwo/ $ZERO_OID recurse check_only valid two EOF test_cmp ../expect-from-test-dump ../actual @@ -560,6 +616,8 @@ test_expect_success 'test sparse status again with untracked cache and subdir' ' : >../trace && GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \ git status --porcelain >../status.actual && + iuc status --porcelain >../status.iuc && + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../status.actual && cat >../trace.expect <<EOF && node creation: 0 @@ -573,6 +631,7 @@ EOF test_expect_success 'move entry in subdir from untracked to cached' ' git add dtwo/two && git status --porcelain >../status.actual && + iuc status --porcelain >../status.iuc && cat >../status.expect <<EOF && M done/two A dtwo/two @@ -580,12 +639,14 @@ A dtwo/two ?? done/five ?? done/sub/ EOF + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../status.actual ' test_expect_success 'move entry in subdir from cached to untracked' ' git rm --cached dtwo/two && git status --porcelain >../status.actual && + iuc status --porcelain >../status.iuc && cat >../status.expect <<EOF && M done/two ?? .gitignore @@ -593,6 +654,7 @@ test_expect_success 'move entry in subdir from cached to untracked' ' ?? done/sub/ ?? dtwo/ EOF + test_cmp ../status.expect ../status.iuc && test_cmp ../status.expect ../status.actual ' @@ -754,8 +816,8 @@ test_expect_success '"status" after file replacement should be clean with UC=tru test-tool dump-untracked-cache >../actual && grep -F "recurse valid" ../actual >../actual.grep && cat >../expect.grep <<EOF && -/ 0000000000000000000000000000000000000000 recurse valid -/two/ 0000000000000000000000000000000000000000 recurse valid +/ $ZERO_OID recurse valid +/two/ $ZERO_OID recurse valid EOF status_is_clean && test_cmp ../expect.grep ../actual.grep diff --git a/third_party/git/t/t7102-reset.sh b/third_party/git/t/t7102-reset.sh index 97be0d968d..22161b3b2d 100755 --- a/third_party/git/t/t7102-reset.sh +++ b/third_party/git/t/t7102-reset.sh @@ -37,17 +37,23 @@ test_expect_success 'creating initial files and commits' ' echo "2nd line 1st file" >>first && git commit -a -m "modify 1st file" && + head5p2=$(git rev-parse --verify HEAD) && + head5p2f=$(git rev-parse --short HEAD:first) && git rm first && git mv second secondfile && git commit -a -m "remove 1st and rename 2nd" && + head5p1=$(git rev-parse --verify HEAD) && + head5p1s=$(git rev-parse --short HEAD:secondfile) && echo "1st line 2nd file" >secondfile && echo "2nd line 2nd file" >>secondfile && # "git commit -m" would break MinGW, as Windows refuse to pass # $test_encoding encoded parameter to git. commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - && - head5=$(git rev-parse --verify HEAD) + head5=$(git rev-parse --verify HEAD) && + head5s=$(git rev-parse --short HEAD:secondfile) && + head5sl=$(git rev-parse HEAD:secondfile) ' # git log --pretty=oneline # to see those SHA1 involved @@ -94,7 +100,7 @@ test_expect_success 'giving a non existing revision should fail' ' test_expect_success 'reset --soft with unmerged index should fail' ' touch .git/MERGE_HEAD && - echo "100644 44c5b5884550c17758737edcced463447b91d42b 1 un" | + echo "100644 $head5sl 1 un" | git update-index --index-info && test_must_fail git reset --soft HEAD && rm .git/MERGE_HEAD && @@ -192,7 +198,7 @@ test_expect_success \ >.diff_expect cat >.cached_expect <<EOF diff --git a/secondfile b/secondfile -index 1bbba79..44c5b58 100644 +index $head5p1s..$head5s 100644 --- a/secondfile +++ b/secondfile @@ -1 +1,2 @@ @@ -207,7 +213,7 @@ secondfile: EOF test_expect_success '--soft reset only should show changes in diff --cached' ' git reset --soft HEAD^ && - check_changes d1a4bc3abce4829628ae2dcb0d60ef3d1a78b1c4 && + check_changes $head5p1 && test "$(git rev-parse ORIG_HEAD)" = \ $head5 ' @@ -242,7 +248,7 @@ EOF test_expect_success \ '--hard reset should change the files and undo commits permanently' ' git reset --hard HEAD~2 && - check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e && + check_changes $head5p2 && test "$(git rev-parse ORIG_HEAD)" = \ $head4 ' @@ -251,7 +257,7 @@ test_expect_success \ cat >.cached_expect <<EOF diff --git a/first b/first deleted file mode 100644 -index 8206c22..0000000 +index $head5p2f..0000000 --- a/first +++ /dev/null @@ -1,2 +0,0 @@ @@ -259,14 +265,14 @@ index 8206c22..0000000 -2nd line 1st file diff --git a/second b/second deleted file mode 100644 -index 1bbba79..0000000 +index $head5p1s..0000000 --- a/second +++ /dev/null @@ -1 +0,0 @@ -2nd file diff --git a/secondfile b/secondfile new file mode 100644 -index 0000000..44c5b58 +index 0000000..$head5s --- /dev/null +++ b/secondfile @@ -0,0 +1,2 @@ @@ -286,13 +292,13 @@ test_expect_success \ echo "1st line 2nd file" >secondfile && echo "2nd line 2nd file" >>secondfile && git add secondfile && - check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e + check_changes $head5p2 ' cat >.diff_expect <<EOF diff --git a/first b/first deleted file mode 100644 -index 8206c22..0000000 +index $head5p2f..0000000 --- a/first +++ /dev/null @@ -1,2 +0,0 @@ @@ -300,7 +306,7 @@ index 8206c22..0000000 -2nd line 1st file diff --git a/second b/second deleted file mode 100644 -index 1bbba79..0000000 +index $head5p1s..0000000 --- a/second +++ /dev/null @@ -1 +0,0 @@ @@ -314,9 +320,8 @@ secondfile: EOF test_expect_success '--mixed reset to HEAD should unadd the files' ' git reset && - check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e && - test "$(git rev-parse ORIG_HEAD)" = \ - ddaefe00f1da16864591c61fdc7adb5d7cd6b74e + check_changes $head5p2 && + test "$(git rev-parse ORIG_HEAD)" = $head5p2 ' >.diff_expect @@ -328,7 +333,7 @@ secondfile: EOF test_expect_success 'redoing the last two commits should succeed' ' git add secondfile && - git reset --hard ddaefe00f1da16864591c61fdc7adb5d7cd6b74e && + git reset --hard $head5p2 && git rm first && git mv second secondfile && @@ -389,47 +394,55 @@ test_expect_success \ check_changes $head5 ' -cat > expect << EOF -diff --git a/file1 b/file1 -index d00491f..7ed6ff8 100644 ---- a/file1 -+++ b/file1 -@@ -1 +1 @@ --1 -+5 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 0cfbf08..0000000 ---- a/file2 -+++ /dev/null -@@ -1 +0,0 @@ --2 -EOF -cat > cached_expect << EOF -diff --git a/file4 b/file4 -new file mode 100644 -index 0000000..b8626c4 ---- /dev/null -+++ b/file4 -@@ -0,0 +1 @@ -+4 -EOF test_expect_success 'test --mixed <paths>' ' echo 1 > file1 && echo 2 > file2 && git add file1 file2 && test_tick && git commit -m files && + before1=$(git rev-parse --short HEAD:file1) && + before2=$(git rev-parse --short HEAD:file2) && git rm file2 && echo 3 > file3 && echo 4 > file4 && echo 5 > file1 && + after1=$(git rev-parse --short $(git hash-object file1)) && + after4=$(git rev-parse --short $(git hash-object file4)) && git add file1 file3 file4 && git reset HEAD -- file1 file2 file3 && test_must_fail git diff --quiet && git diff > output && + + cat > expect <<-EOF && + diff --git a/file1 b/file1 + index $before1..$after1 100644 + --- a/file1 + +++ b/file1 + @@ -1 +1 @@ + -1 + +5 + diff --git a/file2 b/file2 + deleted file mode 100644 + index $before2..0000000 + --- a/file2 + +++ /dev/null + @@ -1 +0,0 @@ + -2 + EOF + test_cmp expect output && git diff --cached > output && + + cat > cached_expect <<-EOF && + diff --git a/file4 b/file4 + new file mode 100644 + index 0000000..$after4 + --- /dev/null + +++ b/file4 + @@ -0,0 +1 @@ + +4 + EOF + test_cmp cached_expect output ' diff --git a/third_party/git/t/t7105-reset-patch.sh b/third_party/git/t/t7105-reset-patch.sh index bd10a96727..fc2a6cf5c7 100755 --- a/third_party/git/t/t7105-reset-patch.sh +++ b/third_party/git/t/t7105-reset-patch.sh @@ -38,6 +38,27 @@ 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 new file mode 100755 index 0000000000..15ccb14f7e --- /dev/null +++ b/third_party/git/t/t7107-reset-pathspec-file.sh @@ -0,0 +1,178 @@ +#!/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 && + if test "x$1" = 'x!' + then + ! test_cmp expect actual + else + test_cmp expect actual + fi +} + +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 + 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/t7112-reset-submodule.sh b/third_party/git/t/t7112-reset-submodule.sh index a1cb9ff858..19830d9036 100755 --- a/third_party/git/t/t7112-reset-submodule.sh +++ b/third_party/git/t/t7112-reset-submodule.sh @@ -5,7 +5,6 @@ test_description='reset can handle submodules' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-submodule-update.sh -KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED=1 KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1 KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1 @@ -13,10 +12,10 @@ test_submodule_switch_recursing_with_args "reset --keep" test_submodule_forced_switch_recursing_with_args "reset --hard" -test_submodule_switch "git reset --keep" +test_submodule_switch "reset --keep" -test_submodule_switch "git reset --merge" +test_submodule_switch "reset --merge" -test_submodule_forced_switch "git reset --hard" +test_submodule_forced_switch "reset --hard" test_done diff --git a/third_party/git/t/t7201-co.sh b/third_party/git/t/t7201-co.sh index b696bae5f5..4d62b9b00f 100755 --- a/third_party/git/t/t7201-co.sh +++ b/third_party/git/t/t7201-co.sh @@ -230,9 +230,10 @@ test_expect_success 'switch to another branch while carrying a deletion' ' test_expect_success 'checkout to detach HEAD (with advice declined)' ' git config advice.detachedHead false && + rev=$(git rev-parse --short renamer^) && git checkout -f renamer && git clean -f && git checkout renamer^ 2>messages && - test_i18ngrep "HEAD is now at 7329388" messages && + test_i18ngrep "HEAD is now at $rev" messages && test_line_count = 1 messages && H=$(git rev-parse --verify HEAD) && M=$(git show-ref -s --verify refs/heads/master) && @@ -248,9 +249,10 @@ test_expect_success 'checkout to detach HEAD (with advice declined)' ' test_expect_success 'checkout to detach HEAD' ' git config advice.detachedHead true && + rev=$(git rev-parse --short renamer^) && git checkout -f renamer && git clean -f && GIT_TEST_GETTEXT_POISON=false git checkout renamer^ 2>messages && - grep "HEAD is now at 7329388" messages && + grep "HEAD is now at $rev" messages && test_line_count -gt 1 messages && H=$(git rev-parse --verify HEAD) && M=$(git show-ref -s --verify refs/heads/master) && diff --git a/third_party/git/t/t7300-clean.sh b/third_party/git/t/t7300-clean.sh index a2c45d1902..cb5e34d94c 100755 --- a/third_party/git/t/t7300-clean.sh +++ b/third_party/git/t/t7300-clean.sh @@ -117,6 +117,7 @@ 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 @@ -129,6 +130,7 @@ 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 @@ -547,7 +549,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 remove it' ' +test_expect_success 'giving path in nested git work tree will NOT remove it' ' rm -fr repo && mkdir repo && ( @@ -559,7 +561,7 @@ test_expect_success 'giving path in nested git work tree will 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_missing repo/bar/baz + test_path_is_file repo/bar/baz/hello.world ' test_expect_success 'giving path to nested .git will not remove it' ' @@ -577,7 +579,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 remove contents' ' +test_expect_success 'giving path to nested .git/ will NOT remove contents' ' rm -fr repo untracked && mkdir repo untracked && ( @@ -587,7 +589,7 @@ test_expect_success 'giving path to nested .git/ will remove contents' ' ) && git clean -f -d repo/.git/ && test_path_is_dir repo/.git && - test_dir_is_empty repo/.git && + test_path_is_file repo/.git/HEAD && test_path_is_dir untracked/ ' @@ -669,6 +671,60 @@ 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 && @@ -681,4 +737,13 @@ 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 a208cb26e1..fec7e0299d 100755 --- a/third_party/git/t/t7400-submodule-basic.sh +++ b/third_party/git/t/t7400-submodule-basic.sh @@ -55,6 +55,21 @@ 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 && ( @@ -156,9 +171,11 @@ test_expect_success 'submodule add to .gitignored path fails' ' ( cd addtest-ignore && cat <<-\EOF >expect && - The following path is ignored by one of your .gitignore files: + The following paths are ignored by one of your .gitignore files: submod - Use -f if you really want to add it. + hint: Use -f if you really want to add them. + hint: Turn this message off by running + hint: "git config advice.addIgnoredFile false" EOF # Does not use test_commit due to the ignore echo "*" > .gitignore && @@ -191,6 +208,17 @@ 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 && @@ -356,6 +384,28 @@ 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" && @@ -377,6 +427,14 @@ 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 @@ -527,7 +585,6 @@ 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 && @@ -545,7 +602,6 @@ 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 && @@ -882,7 +938,7 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano echo "repo" >expect && test_must_fail git config -f .gitmodules submodule.repo.path && git config -f .gitmodules submodule.repo_new.path >actual && - test_cmp expect actual&& + test_cmp expect actual && echo "$submodurl/repo" >expect && test_must_fail git config -f .gitmodules submodule.repo.url && echo "$submodurl/bare.git" >expect && @@ -954,7 +1010,7 @@ test_expect_success 'submodule add with an existing name fails unless forced' ' test -d repo && echo "repo" >expect && git config -f .gitmodules submodule.repo_new.path >actual && - test_cmp expect actual&& + test_cmp expect actual && echo "$submodurl/repo.git" >expect && git config -f .gitmodules submodule.repo_new.url >actual && test_cmp expect actual && @@ -1175,7 +1231,7 @@ test_expect_success 'submodule helper list is not confused by common prefixes' ' git submodule add /dir1/b dir1/b && git submodule add /dir2/b dir2/b && git commit -m "first submodule commit" && - git submodule--helper list dir1/b |cut -c51- >actual && + git submodule--helper list dir1/b | cut -f 2 >actual && echo "dir1/b" >expect && test_cmp expect actual ' @@ -1204,7 +1260,7 @@ test_expect_success 'submodule update --init with a specification' ' pwd=$(pwd) && git clone file://"$pwd"/multisuper multisuper_clone && git -C multisuper_clone submodule update --init . ":(exclude)sub0" && - git -C multisuper_clone submodule status |cut -c 1,43- >actual && + git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual && test_cmp expect actual ' @@ -1215,7 +1271,7 @@ test_expect_success 'submodule update --init with submodule.active set' ' git -C multisuper_clone config submodule.active "." && git -C multisuper_clone config --add submodule.active ":(exclude)sub0" && git -C multisuper_clone submodule update --init && - git -C multisuper_clone submodule status |cut -c 1,43- >actual && + git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual && test_cmp expect actual ' @@ -1234,7 +1290,7 @@ test_expect_success 'submodule update and setting submodule.<name>.active' ' -sub3 EOF git -C multisuper_clone submodule update && - git -C multisuper_clone submodule status |cut -c 1,43- >actual && + git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual && test_cmp expect actual ' @@ -1251,12 +1307,12 @@ test_expect_success 'clone active submodule without submodule url set' ' git submodule update && git submodule status >actual_raw && - cut -c 1,43- actual_raw >actual && + cut -d" " -f3- actual_raw >actual && cat >expect <<-\EOF && - sub0 (test2) - sub1 (test2) - sub2 (test2) - sub3 (test2) + sub0 (test2) + sub1 (test2) + sub2 (test2) + sub3 (test2) EOF test_cmp expect actual ) @@ -1272,7 +1328,7 @@ test_expect_success 'clone --recurse-submodules with a pathspec works' ' EOF git clone --recurse-submodules="sub0" multisuper multisuper_clone && - git -C multisuper_clone submodule status |cut -c1,43- >actual && + git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual && test_cmp expected actual ' @@ -1289,7 +1345,7 @@ test_expect_success 'clone with multiple --recurse-submodules options' ' --recurse-submodules=":(exclude)sub0" \ --recurse-submodules=":(exclude)sub2" \ multisuper multisuper_clone && - git -C multisuper_clone submodule status |cut -c1,43- >actual && + git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual && test_cmp expect actual ' @@ -1317,7 +1373,7 @@ test_expect_success 'clone and subsequent updates correctly auto-initialize subm --recurse-submodules=":(exclude)sub4" \ multisuper multisuper_clone && - git -C multisuper_clone submodule status |cut -c1,43- >actual && + git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual && test_cmp expect actual && git -C multisuper submodule add ../sub1 sub4 && @@ -1326,7 +1382,7 @@ test_expect_success 'clone and subsequent updates correctly auto-initialize subm # obtain the new superproject git -C multisuper_clone pull && git -C multisuper_clone submodule update --init && - git -C multisuper_clone submodule status |cut -c1,43- >actual && + git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual && test_cmp expect2 actual ' diff --git a/third_party/git/t/t7401-submodule-summary.sh b/third_party/git/t/t7401-submodule-summary.sh index 9bc841d085..7608814708 100755 --- a/third_party/git/t/t7401-submodule-summary.sh +++ b/third_party/git/t/t7401-submodule-summary.sh @@ -5,9 +5,18 @@ test_description='Summary support for submodules -This test tries to verify the sanity of summary subcommand of git submodule. +This test script tries to verify the sanity of summary subcommand of git submodule. ' +# NOTE: This test script uses 'git add' instead of 'git submodule add' to add +# submodules to the superproject. Some submodule subcommands such as init and +# deinit might not work as expected in this script. t7421 does not have this +# caveat. +# +# NEEDSWORK: This test script is old fashioned and may need a big cleanup due to +# various reasons, one of them being that there are lots of commands taking place +# outside of 'test_expect_success' block, which is no longer in good-style. + . ./test-lib.sh add_file () { @@ -16,12 +25,12 @@ add_file () { owd=$(pwd) cd "$sm" for name; do - echo "$name" > "$name" && + echo "$name" >"$name" && git add "$name" && test_tick && git commit -m "Add $name" done >/dev/null - git rev-parse --verify HEAD | cut -c1-7 + git rev-parse --short HEAD cd "$owd" } commit_file () { @@ -38,10 +47,10 @@ test_expect_success 'added submodule' " git add sm1 && git submodule summary >actual && cat >expected <<-EOF && -* sm1 0000000...$head1 (2): - > Add foo2 + * sm1 0000000...$head1 (2): + > Add foo2 -EOF + EOF test_cmp expected actual " @@ -52,10 +61,10 @@ test_expect_success 'added submodule (subdirectory)' " git submodule summary >../actual ) && cat >expected <<-EOF && -* ../sm1 0000000...$head1 (2): - > Add foo2 + * ../sm1 0000000...$head1 (2): + > Add foo2 -EOF + EOF test_cmp expected actual " @@ -73,10 +82,10 @@ test_expect_success 'added submodule (subdirectory with explicit path)' " git submodule summary ../sm1 >../actual ) && cat >expected <<-EOF && -* ../sm1 0000000...$head1 (2): - > Add foo2 + * ../sm1 0000000...$head1 (2): + > Add foo2 -EOF + EOF test_cmp expected actual " @@ -86,20 +95,20 @@ head2=$(add_file sm1 foo3) test_expect_success 'modified submodule(forward)' " git submodule summary >actual && cat >expected <<-EOF && -* sm1 $head1...$head2 (1): - > Add foo3 + * sm1 $head1...$head2 (1): + > Add foo3 -EOF + EOF test_cmp expected actual " test_expect_success 'modified submodule(forward), --files' " git submodule summary --files >actual && cat >expected <<-EOF && -* sm1 $head1...$head2 (1): - > Add foo3 + * sm1 $head1...$head2 (1): + > Add foo3 -EOF + EOF test_cmp expected actual " @@ -110,10 +119,10 @@ test_expect_success 'no ignore=all setting has any effect' " git config diff.ignoreSubmodules all && git submodule summary >actual && cat >expected <<-EOF && -* sm1 $head1...$head2 (1): - > Add foo3 + * sm1 $head1...$head2 (1): + > Add foo3 -EOF + EOF test_cmp expected actual && git config --unset diff.ignoreSubmodules && git config --remove-section submodule.sm1 && @@ -125,17 +134,17 @@ commit_file sm1 && head3=$( cd sm1 && git reset --hard HEAD~2 >/dev/null && - git rev-parse --verify HEAD | cut -c1-7 + git rev-parse --short HEAD ) test_expect_success 'modified submodule(backward)' " git submodule summary >actual && cat >expected <<-EOF && -* sm1 $head2...$head3 (2): - < Add foo3 - < Add foo2 + * sm1 $head2...$head3 (2): + < Add foo3 + < Add foo2 -EOF + EOF test_cmp expected actual " @@ -144,25 +153,25 @@ head4_full=$(GIT_DIR=sm1/.git git rev-parse --verify HEAD) test_expect_success 'modified submodule(backward and forward)' " git submodule summary >actual && cat >expected <<-EOF && -* sm1 $head2...$head4 (4): - > Add foo5 - > Add foo4 - < Add foo3 - < Add foo2 + * sm1 $head2...$head4 (4): + > Add foo5 + > Add foo4 + < Add foo3 + < Add foo2 -EOF + EOF test_cmp expected actual " test_expect_success '--summary-limit' " git submodule summary -n 3 >actual && cat >expected <<-EOF && -* sm1 $head2...$head4 (4): - > Add foo5 - > Add foo4 - < Add foo3 + * sm1 $head2...$head4 (4): + > Add foo5 + > Add foo4 + < Add foo3 -EOF + EOF test_cmp expected actual " @@ -177,21 +186,21 @@ mv sm1-bak sm1 test_expect_success 'typechanged submodule(submodule->blob), --cached' " git submodule summary --cached >actual && cat >expected <<-EOF && -* sm1 $head4(submodule)->$head5(blob) (3): - < Add foo5 + * sm1 $head4(submodule)->$head5(blob) (3): + < Add foo5 -EOF - test_i18ncmp actual expected + EOF + test_i18ncmp expected actual " test_expect_success 'typechanged submodule(submodule->blob), --files' " git submodule summary --files >actual && cat >expected <<-EOF && -* sm1 $head5(blob)->$head4(submodule) (3): - > Add foo5 + * sm1 $head5(blob)->$head4(submodule) (3): + > Add foo5 -EOF - test_i18ncmp actual expected + EOF + test_i18ncmp expected actual " rm -rf sm1 && @@ -199,10 +208,10 @@ git checkout-index sm1 test_expect_success 'typechanged submodule(submodule->blob)' " git submodule summary >actual && cat >expected <<-EOF && -* sm1 $head4(submodule)->$head5(blob): + * sm1 $head4(submodule)->$head5(blob): -EOF - test_i18ncmp actual expected + EOF + test_i18ncmp expected actual " rm -f sm1 && @@ -211,21 +220,21 @@ head6=$(add_file sm1 foo6 foo7) test_expect_success 'nonexistent commit' " git submodule summary >actual && cat >expected <<-EOF && -* sm1 $head4...$head6: - Warn: sm1 doesn't contain commit $head4_full + * sm1 $head4...$head6: + Warn: sm1 doesn't contain commit $head4_full -EOF - test_i18ncmp actual expected + EOF + test_i18ncmp expected actual " commit_file test_expect_success 'typechanged submodule(blob->submodule)' " git submodule summary >actual && cat >expected <<-EOF && -* sm1 $head5(blob)->$head6(submodule) (2): - > Add foo7 + * sm1 $head5(blob)->$head6(submodule) (2): + > Add foo7 -EOF + EOF test_i18ncmp expected actual " @@ -234,9 +243,9 @@ rm -rf sm1 test_expect_success 'deleted submodule' " git submodule summary >actual && cat >expected <<-EOF && -* sm1 $head6...0000000: + * sm1 $head6...0000000: -EOF + EOF test_cmp expected actual " @@ -249,22 +258,22 @@ test_expect_success 'create second submodule' ' test_expect_success 'multiple submodules' " git submodule summary >actual && cat >expected <<-EOF && -* sm1 $head6...0000000: + * sm1 $head6...0000000: -* sm2 0000000...$head7 (2): - > Add foo9 + * sm2 0000000...$head7 (2): + > Add foo9 -EOF + EOF test_cmp expected actual " test_expect_success 'path filter' " git submodule summary sm2 >actual && cat >expected <<-EOF && -* sm2 0000000...$head7 (2): - > Add foo9 + * sm2 0000000...$head7 (2): + > Add foo9 -EOF + EOF test_cmp expected actual " @@ -272,24 +281,24 @@ commit_file sm2 test_expect_success 'given commit' " git submodule summary HEAD^ >actual && cat >expected <<-EOF && -* sm1 $head6...0000000: + * sm1 $head6...0000000: -* sm2 0000000...$head7 (2): - > Add foo9 + * sm2 0000000...$head7 (2): + > Add foo9 -EOF + EOF test_cmp expected actual " test_expect_success '--for-status' " git submodule summary --for-status HEAD^ >actual && - test_i18ncmp actual - <<EOF -* sm1 $head6...0000000: + test_i18ncmp - actual <<-EOF + * sm1 $head6...0000000: -* sm2 0000000...$head7 (2): - > Add foo9 + * sm2 0000000...$head7 (2): + > Add foo9 -EOF + EOF " test_expect_success 'fail when using --files together with --cached' " diff --git a/third_party/git/t/t7406-submodule-update.sh b/third_party/git/t/t7406-submodule-update.sh index c973278300..acb8766ac2 100755 --- a/third_party/git/t/t7406-submodule-update.sh +++ b/third_party/git/t/t7406-submodule-update.sh @@ -70,6 +70,22 @@ test_expect_success 'setup a submodule tree' ' ) ' +test_expect_success 'update --remote falls back to using HEAD' ' + test_create_repo main-branch-submodule && + test_commit -C main-branch-submodule initial && + + test_create_repo main-branch && + git -C main-branch submodule add ../main-branch-submodule && + git -C main-branch commit -m add-submodule && + + git -C main-branch-submodule switch -c hello && + test_commit -C main-branch-submodule world && + + git clone --recursive main-branch main-branch-clone && + git -C main-branch-clone submodule update --remote main-branch-submodule && + test_path_exists main-branch-clone/main-branch-submodule/world.t +' + test_expect_success 'submodule update detaching the HEAD ' ' (cd super/submodule && git reset --hard HEAD~1 @@ -158,7 +174,6 @@ 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 && @@ -168,7 +183,7 @@ test_expect_success 'submodule update does not fetch already present commits' ' ) && (cd super/submodule && head=$(git rev-parse --verify HEAD) && - echo "Submodule path ${apos}submodule$apos: checked out $apos$head$apos" > ../../expected && + echo "Submodule path ${SQ}submodule$SQ: checked out $SQ$head$SQ" > ../../expected && git reset --hard HEAD~1 ) && (cd super && @@ -407,12 +422,26 @@ test_expect_success 'submodule update - command in .git/config' ' ) ' -test_expect_success 'submodule update - command in .gitmodules is ignored' ' +test_expect_success 'submodule update - command in .gitmodules is rejected' ' 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^ && - git -C super submodule update submodule + 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 + ) ' cat << EOF >expect @@ -481,6 +510,9 @@ 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) && @@ -489,10 +521,9 @@ 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 && - git submodule init submodule1 && - echo "none" >expect && - git config submodule.submodule1.update >actual && - test_cmp expect actual + test_must_fail git submodule init submodule1 && + test_expect_code 1 git config submodule.submodule1.update >actual && + test_must_be_empty actual ) ' @@ -945,7 +976,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= \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ git submodule update --init --depth=1 2>actual && test_i18ngrep "Direct fetching of that commit failed." actual && git -C ../submodule config uploadpack.allowReachableSHA1InWant true && @@ -991,4 +1022,16 @@ test_expect_success 'git clone passes the parallel jobs config on to submodules' rm -rf super4 ' +test_expect_success 'submodule update --quiet passes quietness to merge/rebase' ' + (cd super && + test_commit -C rebasing message && + git submodule update --rebase --quiet >out 2>err && + test_must_be_empty out && + test_must_be_empty err && + git submodule update --rebase -v >out 2>err && + test_file_not_empty out && + test_must_be_empty err + ) +' + test_done diff --git a/third_party/git/t/t7408-submodule-reference.sh b/third_party/git/t/t7408-submodule-reference.sh index 34ac28c056..a3892f494b 100755 --- a/third_party/git/t/t7408-submodule-reference.sh +++ b/third_party/git/t/t7408-submodule-reference.sh @@ -122,8 +122,8 @@ test_expect_success 'missing submodule alternate fails clone and submodule updat # update of the submodule succeeds test_must_fail git submodule update --init && # and we have no alternates: - test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub && - test_must_fail test_path_is_file sub/file1 + test_path_is_missing .git/modules/sub/objects/info/alternates && + test_path_is_missing sub/file1 ) ' @@ -137,7 +137,7 @@ test_expect_success 'ignoring missing submodule alternates passes clone and subm # update of the submodule succeeds git submodule update --init && # and we have no alternates: - test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub && + test_path_is_missing .git/modules/sub/objects/info/alternates && test_path_is_file sub/file1 ) ' @@ -182,7 +182,7 @@ check_that_two_of_three_alternates_are_used() { # immediate submodule has alternate: test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub && # but nested submodule has no alternate: - test_must_fail test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub + test_path_is_missing .git/modules/subwithsub/modules/sub/objects/info/alternates } diff --git a/third_party/git/t/t7410-submodule-checkout-to.sh b/third_party/git/t/t7410-submodule-checkout-to.sh deleted file mode 100755 index f1b492ebc4..0000000000 --- a/third_party/git/t/t7410-submodule-checkout-to.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/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 49a37efe9c..f70368bc2e 100755 --- a/third_party/git/t/t7415-submodule-names.sh +++ b/third_party/git/t/t7415-submodule-names.sh @@ -191,4 +191,61 @@ 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 1cd2c1c1ea..eec96e0ba9 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 .gitmodule url with dash' +test_description='check handling of disallowed .gitmodule urls' . ./test-lib.sh test_expect_success 'create submodule with protected dash in url' ' @@ -46,4 +46,159 @@ 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 756af8c4d6..f7e7e94d7b 100755 --- a/third_party/git/t/t7417-submodule-path-url.sh +++ b/third_party/git/t/t7417-submodule-path-url.sh @@ -25,4 +25,21 @@ 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 c4b370ea85..3b925c302f 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 && - test_must_fail grep branch .gitmodules + ! grep branch .gitmodules ) ' @@ -52,12 +52,13 @@ test_expect_success 'test submodule set-branch --branch' ' ' test_expect_success 'test submodule set-branch --default' ' + test_commit -C submodule c && (cd super && git submodule set-branch --default submodule && - test_must_fail grep branch .gitmodules && + ! grep branch .gitmodules && git submodule update --remote && cat <<-\EOF >expect && - a + c EOF git -C submodule show -s --pretty=%s >actual && test_cmp expect actual @@ -65,6 +66,7 @@ test_expect_success 'test submodule set-branch --default' ' ' test_expect_success 'test submodule set-branch -b' ' + test_commit -C submodule b && (cd super && git submodule set-branch -b topic submodule && grep "branch = topic" .gitmodules && @@ -78,12 +80,13 @@ test_expect_success 'test submodule set-branch -b' ' ' test_expect_success 'test submodule set-branch -d' ' + test_commit -C submodule d && (cd super && git submodule set-branch -d submodule && - test_must_fail grep branch .gitmodules && + ! grep branch .gitmodules && git submodule update --remote && cat <<-\EOF >expect && - a + d EOF git -C submodule show -s --pretty=%s >actual && test_cmp expect actual diff --git a/third_party/git/t/t7420-submodule-set-url.sh b/third_party/git/t/t7420-submodule-set-url.sh new file mode 100755 index 0000000000..ef0cb6e8e1 --- /dev/null +++ b/third_party/git/t/t7420-submodule-set-url.sh @@ -0,0 +1,55 @@ +#!/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/t7421-submodule-summary-add.sh b/third_party/git/t/t7421-submodule-summary-add.sh new file mode 100755 index 0000000000..b070f13714 --- /dev/null +++ b/third_party/git/t/t7421-submodule-summary-add.sh @@ -0,0 +1,69 @@ +#!/bin/sh +# +# Copyright (C) 2020 Shourya Shukla +# + +test_description='Summary support for submodules, adding them using git submodule add + +This test script tries to verify the sanity of summary subcommand of git submodule +while making sure to add submodules using `git submodule add` instead of +`git add` as done in t7401. +' + +. ./test-lib.sh + +test_expect_success 'summary test environment setup' ' + git init sm && + test_commit -C sm "add file" file file-content file-tag && + + git submodule add ./sm my-subm && + test_tick && + git commit -m "add submodule" +' + +test_expect_success 'submodule summary output for initialized submodule' ' + test_commit -C sm "add file2" file2 file2-content file2-tag && + git submodule update --remote && + test_tick && + git commit -m "update submodule" my-subm && + git submodule summary HEAD^ >actual && + rev1=$(git -C sm rev-parse --short HEAD^) && + rev2=$(git -C sm rev-parse --short HEAD) && + cat >expected <<-EOF && + * my-subm ${rev1}...${rev2} (1): + > add file2 + + EOF + test_cmp expected actual +' + +test_expect_success 'submodule summary output for deinitialized submodule' ' + git submodule deinit my-subm && + git submodule summary HEAD^ >actual && + test_must_be_empty actual && + git submodule update --init my-subm && + git submodule summary HEAD^ >actual && + rev1=$(git -C sm rev-parse --short HEAD^) && + rev2=$(git -C sm rev-parse --short HEAD) && + cat >expected <<-EOF && + * my-subm ${rev1}...${rev2} (1): + > add file2 + + EOF + test_cmp expected actual +' + +test_expect_success 'submodule summary output for submodules with changed paths' ' + git mv my-subm subm && + git commit -m "change submodule path" && + rev=$(git -C sm rev-parse --short HEAD^) && + git submodule summary HEAD^^ -- my-subm >actual 2>err && + test_must_be_empty err && + cat >expected <<-EOF && + * my-subm ${rev}...0000000: + + EOF + test_cmp expected 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 46a5cd4b73..6d19ece05d 100755 --- a/third_party/git/t/t7500-commit-template-squash-signoff.sh +++ b/third_party/git/t/t7500-commit-template-squash-signoff.sh @@ -382,4 +382,13 @@ 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 f1349af56e..110b4bf459 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,9 +285,8 @@ test_expect_success 'overriding author from command line' ' ' test_expect_success PERL 'interactive add' ' - echo 7 | - git commit --interactive | - grep "What now" + echo 7 | test_must_fail git commit --interactive >out && + grep "What now" out ' test_expect_success PERL "commit --interactive doesn't change index if editor aborts" ' @@ -362,12 +361,12 @@ test_expect_success 'amend commit to fix author' ' oldtick=$GIT_AUTHOR_DATE && test_tick && git reset --hard && - git cat-file -p HEAD | + git cat-file -p HEAD >commit && sed -e "s/author.*/author $author $oldtick/" \ - -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \ - expected && + -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \ + commit >expected && git commit --amend --author="$author" && - git cat-file -p HEAD > current && + git cat-file -p HEAD >current && test_cmp expected current ' @@ -377,12 +376,12 @@ test_expect_success 'amend commit to fix date' ' test_tick && newtick=$GIT_AUTHOR_DATE && git reset --hard && - git cat-file -p HEAD | + git cat-file -p HEAD >commit && sed -e "s/author.*/author $author $newtick/" \ - -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \ - expected && + -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \ + commit >expected && git commit --amend --date="$newtick" && - git cat-file -p HEAD > current && + git cat-file -p HEAD >current && test_cmp expected current ' @@ -409,12 +408,13 @@ test_expect_success 'sign off (1)' ' echo 1 >positive && git add positive && git commit -s -m "thank you" && - git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && + git cat-file commit HEAD >commit && + sed -e "1,/^\$/d" commit >actual && ( echo thank you && echo && - git var GIT_COMMITTER_IDENT | - sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" + git var GIT_COMMITTER_IDENT >ident && + sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident ) >expected && test_cmp expected actual @@ -428,13 +428,14 @@ test_expect_success 'sign off (2)' ' git commit -s -m "thank you $existing" && - git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && + git cat-file commit HEAD >commit && + sed -e "1,/^\$/d" commit >actual && ( echo thank you && echo && echo $existing && - git var GIT_COMMITTER_IDENT | - sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" + git var GIT_COMMITTER_IDENT >ident && + sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident ) >expected && test_cmp expected actual @@ -448,13 +449,14 @@ test_expect_success 'signoff gap' ' git commit -s -m "welcome $alt" && - git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && + git cat-file commit HEAD >commit && + sed -e "1,/^\$/d" commit >actual && ( echo welcome && echo && echo $alt && - git var GIT_COMMITTER_IDENT | - sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" + git var GIT_COMMITTER_IDENT >ident && + sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident ) >expected && test_cmp expected actual ' @@ -468,15 +470,16 @@ test_expect_success 'signoff gap 2' ' We have now $alt" && - git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && + git cat-file commit HEAD >commit && + sed -e "1,/^\$/d" commit >actual && ( echo welcome && echo && echo We have now && echo $alt && echo && - git var GIT_COMMITTER_IDENT | - sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" + git var GIT_COMMITTER_IDENT >ident && + sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident ) >expected && test_cmp expected actual ' @@ -489,7 +492,8 @@ test_expect_success 'signoff respects trailer config' ' non-trailer line Myfooter: x" && - git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && + git cat-file commit HEAD >commit && + sed -e "1,/^\$/d" commit >actual && ( echo subject && echo && @@ -506,7 +510,8 @@ Myfooter: x" && non-trailer line Myfooter: x" && - git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && + git cat-file commit HEAD >commit && + sed -e "1,/^\$/d" commit >actual && ( echo subject && echo && @@ -538,7 +543,8 @@ test_expect_success 'multiple -m' ' >negative && git add negative && git commit -m "one" -m "two" -m "three" && - git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && + git cat-file commit HEAD >commit && + sed -e "1,/^\$/d" commit >actual && ( echo one && echo && @@ -555,23 +561,25 @@ test_expect_success 'amend commit to fix author' ' oldtick=$GIT_AUTHOR_DATE && test_tick && git reset --hard && - git cat-file -p HEAD | + git cat-file -p HEAD >commit && sed -e "s/author.*/author $author $oldtick/" \ - -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \ - expected && + -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \ + commit >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 | grep elif && - git diff --cached | grep chz + git show --stat >stat && + grep elif stat && + git diff --cached >diff && + grep chz diff ' test_expect_success 'same tree (single parent)' ' @@ -584,7 +592,8 @@ 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 | grep forced + git cat-file commit HEAD >commit && + grep forced commit ' 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 new file mode 100755 index 0000000000..b3485450a2 --- /dev/null +++ b/third_party/git/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh @@ -0,0 +1,281 @@ +#!/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 deleted file mode 100755 index 984889b39d..0000000000 --- a/third_party/git/t/t7503-pre-commit-hook.sh +++ /dev/null @@ -1,139 +0,0 @@ -#!/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 ba8bd1b514..94f85cdf83 100755 --- a/third_party/git/t/t7505-prepare-commit-msg-hook.sh +++ b/third_party/git/t/t7505-prepare-commit-msg-hook.sh @@ -241,13 +241,7 @@ test_rebase () { git add b && git rebase --continue ) && - 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 && + git log --pretty=%s -g -n18 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 c514bdbb94..93bada596e 100644 --- a/third_party/git/t/t7505/expected-rebase-i +++ b/third_party/git/t/t7505/expected-rebase-i @@ -7,7 +7,8 @@ message (no editor) [edit rebase-10] message [fixup rebase-9] message (no editor) [fixup rebase-8] message (no editor) [squash rebase-7] -message [reword rebase-6] +HEAD [reword rebase-6] +message (no editor) [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/t7506-status-submodule.sh b/third_party/git/t/t7506-status-submodule.sh index 08629a6e70..3fcb44767f 100755 --- a/third_party/git/t/t7506-status-submodule.sh +++ b/third_party/git/t/t7506-status-submodule.sh @@ -22,6 +22,10 @@ sanitize_output () { mv output2 output } +sanitize_diff () { + sed -e "/^index [0-9a-f,]*\.\.[0-9a-f]*/d" "$1" +} + test_expect_success 'setup' ' test_create_repo_with_commit sub && @@ -269,7 +273,6 @@ short_sha1_merge_sub1=$(cd sub1 && git rev-parse --short HEAD) short_sha1_merge_sub2=$(cd sub2 && git rev-parse --short HEAD) cat >diff_expect <<\EOF diff --cc .gitmodules -index badaa4c,44f999a..0000000 --- a/.gitmodules +++ b/.gitmodules @@@ -1,3 -1,3 +1,9 @@@ @@ -286,7 +289,6 @@ EOF cat >diff_submodule_expect <<\EOF diff --cc .gitmodules -index badaa4c,44f999a..0000000 --- a/.gitmodules +++ b/.gitmodules @@@ -1,3 -1,3 +1,9 @@@ @@ -306,7 +308,8 @@ test_expect_success 'diff with merge conflict in .gitmodules' ' cd super && git diff >../diff_actual 2>&1 ) && - test_cmp diff_expect diff_actual + sanitize_diff diff_actual >diff_sanitized && + test_cmp diff_expect diff_sanitized ' test_expect_success 'diff --submodule with merge conflict in .gitmodules' ' @@ -314,7 +317,8 @@ test_expect_success 'diff --submodule with merge conflict in .gitmodules' ' cd super && git diff --submodule >../diff_submodule_actual 2>&1 ) && - test_cmp diff_submodule_expect diff_submodule_actual + sanitize_diff diff_submodule_actual >diff_sanitized && + test_cmp diff_submodule_expect diff_sanitized ' # We'll setup different cases for further testing: diff --git a/third_party/git/t/t7508-status.sh b/third_party/git/t/t7508-status.sh index 4e676cdce8..963fed6821 100755 --- a/third_party/git/t/t7508-status.sh +++ b/third_party/git/t/t7508-status.sh @@ -814,6 +814,33 @@ test_expect_success 'status -s without relative paths' ' ' +cat >expect <<\EOF + M dir1/modified +A dir2/added +A "file with spaces" +?? dir1/untracked +?? dir2/modified +?? dir2/untracked +?? "file with spaces 2" +?? untracked +EOF + +test_expect_success 'status -s without relative paths' ' + test_when_finished "git rm --cached \"file with spaces\"; rm -f file*" && + >"file with spaces" && + >"file with spaces 2" && + >"expect with spaces" && + git add "file with spaces" && + + git status -s >output && + test_cmp expect output && + + git status -s --ignored >output && + grep "^!! \"expect with spaces\"$" output && + grep -v "^!! " output >output-wo-ignored && + test_cmp expect output-wo-ignored +' + test_expect_success 'dry-run of partial commit excluding new file in index' ' cat >expect <<EOF && On branch master @@ -837,7 +864,7 @@ EOF ' cat >expect <<EOF -:100644 100644 $EMPTY_BLOB 0000000000000000000000000000000000000000 M dir1/modified +:100644 100644 $EMPTY_BLOB $ZERO_OID M dir1/modified EOF test_expect_success 'status refreshes the index' ' touch dir2/added && @@ -846,6 +873,18 @@ test_expect_success 'status refreshes the index' ' test_cmp expect output ' +test_expect_success 'status shows detached HEAD properly after checking out non-local upstream branch' ' + test_when_finished rm -rf upstream downstream actual && + + test_create_repo upstream && + test_commit -C upstream foo && + + git clone upstream downstream && + git -C downstream checkout @{u} && + git -C downstream status >actual && + test_i18ngrep "HEAD detached at [0-9a-f]\\+" actual +' + test_expect_success 'setup status submodule summary' ' test_create_repo sm && ( cd sm && @@ -1471,7 +1510,7 @@ test_expect_success '"status.branch=true" same as "-b"' ' test_expect_success '"status.branch=true" different from "--no-branch"' ' git status -s --no-branch >expected_nobranch && git -c status.branch=true status -s >actual && - test_must_fail test_cmp expected_nobranch actual + ! test_cmp expected_nobranch actual ' test_expect_success '"status.branch=true" weaker than "--no-branch"' ' @@ -1571,7 +1610,7 @@ test_expect_success '"status.showStash=true" weaker than "--no-show-stash"' ' test_cmp expected_without_stash actual ' -test_expect_success 'no additionnal info if no stash entries' ' +test_expect_success 'no additional 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 682b23a068..6baaa1ad91 100755 --- a/third_party/git/t/t7510-signed-commit.sh +++ b/third_party/git/t/t7510-signed-commit.sh @@ -6,6 +6,11 @@ GNUPGHOME_NOT_USED=$GNUPGHOME . "$TEST_DIRECTORY/lib-gpg.sh" test_expect_success GPG 'create signed commits' ' + test_oid_cache <<-\EOF && + header sha1:gpgsig + header sha256:gpgsig-sha256 + EOF + test_when_finished "test_unconfig commit.gpgsign" && echo 1 >file && git add file && @@ -109,6 +114,21 @@ 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 @@ -140,6 +160,11 @@ test_expect_success GPG 'verify signatures with --raw' ' ) ' +test_expect_success GPG 'proper header is used for hash algorithm' ' + git cat-file commit fourth-signed >output && + grep "^$(test_oid header) -----BEGIN PGP SIGNATURE-----" output +' + test_expect_success GPG 'show signed commit with signature' ' git show -s initial >commit && git show -s --show-signature initial >show && @@ -147,7 +172,7 @@ test_expect_success GPG 'show signed commit with signature' ' git cat-file commit initial >cat && grep -v -e "gpg: " -e "Warning: " show >show.commit && grep -e "gpg: " -e "Warning: " show >show.gpg && - grep -v "^ " cat | grep -v "^gpgsig " >cat.commit && + grep -v "^ " cat | grep -v "^$(test_oid header) " >cat.commit && test_cmp show.commit commit && test_cmp show.gpg verify.2 && test_cmp cat.commit verify.1 @@ -219,6 +244,30 @@ 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 @@ -260,10 +309,10 @@ test_expect_success GPG 'check config gpg.format values' ' test_expect_success GPG 'detect fudged commit with double signature' ' sed -e "/gpgsig/,/END PGP/d" forged1 >double-base && sed -n -e "/gpgsig/,/END PGP/p" forged1 | \ - sed -e "s/^gpgsig//;s/^ //" | gpg --dearmor >double-sig1.sig && + sed -e "s/^$(test_oid header)//;s/^ //" | gpg --dearmor >double-sig1.sig && gpg -o double-sig2.sig -u 29472784 --detach-sign double-base && cat double-sig1.sig double-sig2.sig | gpg --enarmor >double-combined.asc && - sed -e "s/^\(-.*\)ARMORED FILE/\1SIGNATURE/;1s/^/gpgsig /;2,\$s/^/ /" \ + sed -e "s/^\(-.*\)ARMORED FILE/\1SIGNATURE/;1s/^/$(test_oid header) /;2,\$s/^/ /" \ double-combined.asc > double-gpgsig && sed -e "/committer/r double-gpgsig" double-base >double-commit && git hash-object -w -t commit double-commit >double-commit.commit && diff --git a/third_party/git/t/t7512-status-help.sh b/third_party/git/t/t7512-status-help.sh index e01c285cbf..29518e0949 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 in progress before resolving conflicts' ' +test_expect_success 'status when rebase --apply in progress before resolving conflicts' ' test_when_finished "git rebase --abort" && ONTO=$(git rev-parse --short HEAD^^) && - test_must_fail git rebase HEAD^ --onto HEAD^^ && + test_must_fail git rebase --apply 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 in progress before rebase --continue' ' +test_expect_success 'status when rebase --apply 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 HEAD^ --onto HEAD^^ && + test_must_fail git rebase --apply 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 conflicts with statushints disabled' ' +test_expect_success 'status when rebase --apply 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 conflicts with statushints disabled' ' test_commit three_statushints main.txt three && test_when_finished "git rebase --abort" && ONTO=$(git rev-parse --short HEAD^^) && - test_must_fail git rebase HEAD^ --onto HEAD^^ && + test_must_fail git rebase --apply HEAD^ --onto HEAD^^ && cat >expected <<EOF && rebase in progress; onto $ONTO You are currently rebasing branch '\''statushints_disabled'\'' on '\''$ONTO'\''. @@ -733,6 +733,7 @@ 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: @@ -757,6 +758,7 @@ 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: @@ -778,6 +780,7 @@ 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) @@ -835,6 +838,7 @@ 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: @@ -855,6 +859,7 @@ 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: @@ -887,6 +892,7 @@ 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 f19202b509..6602790b5f 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 commiter information' ' +test_expect_success 'with command using committer 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/t7518-ident-corner-cases.sh b/third_party/git/t/t7518-ident-corner-cases.sh index b22f631261..dc3e9c8c88 100755 --- a/third_party/git/t/t7518-ident-corner-cases.sh +++ b/third_party/git/t/t7518-ident-corner-cases.sh @@ -29,7 +29,18 @@ test_expect_success 'empty configured name does not auto-detect' ' sane_unset GIT_AUTHOR_NAME && test_must_fail \ git -c user.name= commit --allow-empty -m foo 2>err && - test_i18ngrep "empty ident name" err + test_i18ngrep "empty ident name" err && + test_i18ngrep "Author identity unknown" err + ) +' + +test_expect_success 'empty configured name does not auto-detect for committer' ' + ( + sane_unset GIT_COMMITTER_NAME && + test_must_fail \ + git -c user.name= commit --allow-empty -m foo 2>err && + test_i18ngrep "empty ident name" err && + test_i18ngrep "Committer identity unknown" err ) ' diff --git a/third_party/git/t/t7519-status-fsmonitor.sh b/third_party/git/t/t7519-status-fsmonitor.sh index 81a375fa0f..fbfdcca000 100755 --- a/third_party/git/t/t7519-status-fsmonitor.sh +++ b/third_party/git/t/t7519-status-fsmonitor.sh @@ -32,11 +32,12 @@ write_integration_script () { echo "$0: exactly 2 arguments expected" exit 2 fi - if test "$1" != 1 + if test "$1" != 2 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" @@ -106,6 +107,9 @@ 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 && @@ -164,6 +168,9 @@ 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 && @@ -203,6 +210,7 @@ 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 && @@ -218,11 +226,12 @@ 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 && @@ -271,6 +280,7 @@ 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 && @@ -294,7 +304,7 @@ do done done -# test that splitting the index dosn't interfere +# test that splitting the index doesn't interfere test_expect_success 'splitting the index results in the same state' ' write_integration_script && dirty_repo && @@ -354,4 +364,23 @@ 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 691bc94dc2..94ab66bd3d 100755 --- a/third_party/git/t/t7519/fsmonitor-all +++ b/third_party/git/t/t7519/fsmonitor-all @@ -17,7 +17,6 @@ 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 new file mode 100755 index 0000000000..061907e88b --- /dev/null +++ b/third_party/git/t/t7519/fsmonitor-all-v2 @@ -0,0 +1,21 @@ +#!/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 new file mode 100755 index 0000000000..8f1f7ab164 --- /dev/null +++ b/third_party/git/t/t7519/fsmonitor-env @@ -0,0 +1,24 @@ +#!/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 5514edcf68..264b9daf83 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 - $time = int $time / 1000000000; + # subtract one second to make sure watchman will return all changes + $time = int ($time / 1000000000) - 1; } else { - die "Unsupported query-fsmonitor hook version '$version'.\n" . - "Falling back to scanning...\n"; + exit 1; } my $git_work_tree; @@ -54,18 +54,12 @@ 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. 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. + # output to file names only. my $query = <<" END"; ["query", "$git_work_tree", { "since": $time, - "fields": ["name"], - "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] + "fields": ["name"] }] END diff --git a/third_party/git/t/t7519/fsmonitor-watchman-v2 b/third_party/git/t/t7519/fsmonitor-watchman-v2 new file mode 100755 index 0000000000..14ed0aa42d --- /dev/null +++ b/third_party/git/t/t7519/fsmonitor-watchman-v2 @@ -0,0 +1,173 @@ +#!/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 new file mode 100755 index 0000000000..5fbe47ebcd --- /dev/null +++ b/third_party/git/t/t7526-commit-pathspec-file.sh @@ -0,0 +1,164 @@ +#!/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/t7600-merge.sh b/third_party/git/t/t7600-merge.sh index 132608879a..1c85f75555 100755 --- a/third_party/git/t/t7600-merge.sh +++ b/third_party/git/t/t7600-merge.sh @@ -29,15 +29,19 @@ Testing basic merge operations/option parsing. . ./test-lib.sh . "$TEST_DIRECTORY"/lib-gpg.sh -printf '%s\n' 1 2 3 4 5 6 7 8 9 >file -printf '%s\n' '1 X' 2 3 4 5 6 7 8 9 >file.1 -printf '%s\n' 1 2 3 4 '5 X' 6 7 8 9 >file.5 -printf '%s\n' 1 2 3 4 5 6 7 8 '9 X' >file.9 -printf '%s\n' 1 2 3 4 5 6 7 8 '9 Y' >file.9y -printf '%s\n' '1 X' 2 3 4 5 6 7 8 9 >result.1 -printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 9 >result.1-5 -printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 '9 X' >result.1-5-9 -printf '%s\n' 1 2 3 4 5 6 7 8 '9 Z' >result.9z +test_write_lines 1 2 3 4 5 6 7 8 9 >file +cp file file.orig +test_write_lines '1 X' 2 3 4 5 6 7 8 9 >file.1 +test_write_lines 1 2 '3 X' 4 5 6 7 8 9 >file.3 +test_write_lines 1 2 3 4 '5 X' 6 7 8 9 >file.5 +test_write_lines 1 2 3 4 5 6 7 8 '9 X' >file.9 +test_write_lines 1 2 3 4 5 6 7 8 '9 Y' >file.9y +test_write_lines '1 X' 2 3 4 5 6 7 8 9 >result.1 +test_write_lines '1 X' 2 3 4 '5 X' 6 7 8 9 >result.1-5 +test_write_lines '1 X' 2 3 4 5 6 7 8 '9 X' >result.1-9 +test_write_lines '1 X' 2 3 4 '5 X' 6 7 8 '9 X' >result.1-5-9 +test_write_lines '1 X' 2 '3 X' 4 '5 X' 6 7 8 '9 X' >result.1-3-5-9 +test_write_lines 1 2 3 4 5 6 7 8 '9 Z' >result.9z create_merge_msgs () { echo "Merge tag 'c2'" >msg.1-5 && @@ -81,7 +85,7 @@ verify_head () { } verify_parents () { - printf '%s\n' "$@" >parents.expected && + test_write_lines "$@" >parents.expected && >parents.actual && i=1 && while test $i -le $# @@ -95,7 +99,7 @@ verify_parents () { } verify_mergeheads () { - printf '%s\n' "$@" >mergehead.expected && + test_write_lines "$@" >mergehead.expected && while read sha1 rest do git rev-parse $sha1 @@ -242,7 +246,7 @@ test_expect_success 'merge --squash c3 with c7' ' # file EOF git cat-file commit HEAD >raw && - sed -e '1,/^$/d' raw >actual && + sed -e "1,/^$/d" raw >actual && test_cmp expect actual ' @@ -264,7 +268,7 @@ test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' ' # file EOF git cat-file commit HEAD >raw && - sed -e '1,/^$/d' raw >actual && + sed -e "1,/^$/d" raw >actual && test_i18ncmp expect actual ' @@ -288,7 +292,7 @@ test_expect_success 'merge c3 with c7 with --squash commit.cleanup = scissors' ' # file EOF git cat-file commit HEAD >raw && - sed -e '1,/^$/d' raw >actual && + sed -e "1,/^$/d" raw >actual && test_i18ncmp expect actual ' @@ -675,6 +679,134 @@ test_expect_success 'refresh the index before merging' ' git merge c3 ' +test_expect_success 'merge with --autostash' ' + git reset --hard c1 && + git merge-file file file.orig file.9 && + git merge --autostash c2 2>err && + test_i18ngrep "Applied autostash." err && + git show HEAD:file >merge-result && + test_cmp result.1-5 merge-result && + test_cmp result.1-5-9 file +' + +test_expect_success 'merge with merge.autoStash' ' + test_config merge.autoStash true && + git reset --hard c1 && + git merge-file file file.orig file.9 && + git merge c2 2>err && + test_i18ngrep "Applied autostash." err && + git show HEAD:file >merge-result && + test_cmp result.1-5 merge-result && + test_cmp result.1-5-9 file +' + +test_expect_success 'fast-forward merge with --autostash' ' + git reset --hard c0 && + git merge-file file file.orig file.5 && + git merge --autostash c1 2>err && + test_i18ngrep "Applied autostash." err && + test_cmp result.1-5 file +' + +test_expect_success 'octopus merge with --autostash' ' + git reset --hard c1 && + git merge-file file file.orig file.3 && + git merge --autostash c2 c3 2>err && + test_i18ngrep "Applied autostash." err && + git show HEAD:file >merge-result && + test_cmp result.1-5-9 merge-result && + test_cmp result.1-3-5-9 file +' + +test_expect_success 'conflicted merge with --autostash, --abort restores stash' ' + git reset --hard c3 && + cp file.1 file && + test_must_fail git merge --autostash c7 && + git merge --abort 2>err && + test_i18ngrep "Applied autostash." err && + test_cmp file.1 file +' + +test_expect_success 'completed merge (git commit) with --no-commit and --autostash' ' + git reset --hard c1 && + git merge-file file file.orig file.9 && + git diff >expect && + git merge --no-commit --autostash c2 && + git stash show -p MERGE_AUTOSTASH >actual && + test_cmp expect actual && + git commit 2>err && + test_i18ngrep "Applied autostash." err && + git show HEAD:file >merge-result && + test_cmp result.1-5 merge-result && + test_cmp result.1-5-9 file +' + +test_expect_success 'completed merge (git merge --continue) with --no-commit and --autostash' ' + git reset --hard c1 && + git merge-file file file.orig file.9 && + git diff >expect && + git merge --no-commit --autostash c2 && + git stash show -p MERGE_AUTOSTASH >actual && + test_cmp expect actual && + git merge --continue 2>err && + test_i18ngrep "Applied autostash." err && + git show HEAD:file >merge-result && + test_cmp result.1-5 merge-result && + test_cmp result.1-5-9 file +' + +test_expect_success 'aborted merge (merge --abort) with --no-commit and --autostash' ' + git reset --hard c1 && + git merge-file file file.orig file.9 && + git diff >expect && + git merge --no-commit --autostash c2 && + git stash show -p MERGE_AUTOSTASH >actual && + test_cmp expect actual && + git merge --abort 2>err && + test_i18ngrep "Applied autostash." err && + git diff >actual && + test_cmp expect actual +' + +test_expect_success 'aborted merge (reset --hard) with --no-commit and --autostash' ' + git reset --hard c1 && + git merge-file file file.orig file.9 && + git diff >expect && + git merge --no-commit --autostash c2 && + git stash show -p MERGE_AUTOSTASH >actual && + test_cmp expect actual && + git reset --hard 2>err && + test_i18ngrep "Autostash exists; creating a new stash entry." err && + git diff --exit-code +' + +test_expect_success 'quit merge with --no-commit and --autostash' ' + git reset --hard c1 && + git merge-file file file.orig file.9 && + git diff >expect && + git merge --no-commit --autostash c2 && + git stash show -p MERGE_AUTOSTASH >actual && + test_cmp expect actual && + git diff HEAD >expect && + git merge --quit 2>err && + test_i18ngrep "Autostash exists; creating a new stash entry." err && + git diff HEAD >actual && + test_cmp expect actual +' + +test_expect_success 'merge with conflicted --autostash changes' ' + git reset --hard c1 && + git merge-file file file.orig file.9y && + git diff >expect && + test_when_finished "test_might_fail git stash drop" && + git merge --autostash c3 2>err && + test_i18ngrep "Applying autostash resulted in conflicts." err && + git show HEAD:file >merge-result && + test_cmp result.1-9 merge-result && + git stash show -p >actual && + test_cmp expect actual +' + cat >expected.branch <<\EOF Merge branch 'c5-branch' (early part) EOF diff --git a/third_party/git/t/t7601-merge-pull-config.sh b/third_party/git/t/t7601-merge-pull-config.sh index c6c44ec570..c5c4ea5fc0 100755 --- a/third_party/git/t/t7601-merge-pull-config.sh +++ b/third_party/git/t/t7601-merge-pull-config.sh @@ -27,6 +27,63 @@ test_expect_success 'setup' ' git tag c3 ' +test_expect_success 'pull.rebase not set' ' + git reset --hard c0 && + git pull . c1 2>err && + test_i18ngrep "Pulling without specifying how to reconcile" err +' + +test_expect_success 'pull.rebase not set and pull.ff=true' ' + git reset --hard c0 && + test_config pull.ff true && + git pull . c1 2>err && + test_i18ngrep ! "Pulling without specifying how to reconcile" err +' + +test_expect_success 'pull.rebase not set and pull.ff=false' ' + git reset --hard c0 && + test_config pull.ff false && + git pull . c1 2>err && + test_i18ngrep ! "Pulling without specifying how to reconcile" err +' + +test_expect_success 'pull.rebase not set and pull.ff=only' ' + git reset --hard c0 && + test_config pull.ff only && + git pull . c1 2>err && + test_i18ngrep ! "Pulling without specifying how to reconcile" err +' + +test_expect_success 'pull.rebase not set and --rebase given' ' + git reset --hard c0 && + git pull --rebase . c1 2>err && + test_i18ngrep ! "Pulling without specifying how to reconcile" err +' + +test_expect_success 'pull.rebase not set and --no-rebase given' ' + git reset --hard c0 && + git pull --no-rebase . c1 2>err && + test_i18ngrep ! "Pulling without specifying how to reconcile" err +' + +test_expect_success 'pull.rebase not set and --ff given' ' + git reset --hard c0 && + git pull --ff . c1 2>err && + test_i18ngrep ! "Pulling without specifying how to reconcile" err +' + +test_expect_success 'pull.rebase not set and --no-ff given' ' + git reset --hard c0 && + git pull --no-ff . c1 2>err && + test_i18ngrep ! "Pulling without specifying how to reconcile" err +' + +test_expect_success 'pull.rebase not set and --ff-only given' ' + git reset --hard c0 && + git pull --ff-only . c1 2>err && + test_i18ngrep ! "Pulling without specifying how to reconcile" err +' + test_expect_success 'merge c1 with c2' ' git reset --hard c1 && test -f c0.c && diff --git a/third_party/git/t/t7612-merge-verify-signatures.sh b/third_party/git/t/t7612-merge-verify-signatures.sh index d99218a725..a426f3a89a 100755 --- a/third_party/git/t/t7612-merge-verify-signatures.sh +++ b/third_party/git/t/t7612-merge-verify-signatures.sh @@ -66,6 +66,20 @@ 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 && @@ -73,6 +87,14 @@ 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 4e855bc21b..25b235c063 100755 --- a/third_party/git/t/t7700-repack.sh +++ b/third_party/git/t/t7700-repack.sh @@ -4,129 +4,104 @@ test_description='git repack works correctly' . ./test-lib.sh -commit_and_pack() { - test_commit "$@" >/dev/null && - SHA1=$(git pack-objects --all --unpacked --incremental .git/objects/pack/pack </dev/null) && - echo pack-${SHA1}.pack +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" } 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 | grep -v file2 | - git pack-objects pack > /dev/null && + git rev-list --objects --all >objs && + grep -v file2 objs | git pack-objects pack && # The second pack will contain the excluded object - 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/") && + 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/") && mv pack-* .git/objects/pack/ && git repack -A -d -l && git prune-packed && - 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_has_duplicate_object false ' test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' ' - # build on $objsha1, $packsha1, and .keep state from previous + # build on $oid, $packid, and .keep state from previous git repack -Adbl && - 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_has_duplicate_object true ' test_expect_success 'writing bitmaps via config can duplicate .keep objects' ' - # build on $objsha1, $packsha1, and .keep state from previous + # build on $oid, $packid, and .keep state from previous git -c repack.writebitmaps=true repack -Adl && - 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_has_duplicate_object true ' 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 && - objsha1=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) && + echo $(pwd)/alt_objects >.git/objects/info/alternates && + echo content3 >file3 && + oid=$(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 && - 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_has_duplicate_object false ' 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 && - 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_no_missing_in_packs ' 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 && - 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_no_missing_in_packs ' test_expect_success 'packed obs in alternate ODB kept pack are repacked' ' @@ -134,7 +109,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 -f alt_objects/pack/$base_name.keep + if test_path_is_file alt_objects/pack/$base_name.keep then rm alt_objects/pack/$base_name.keep else @@ -142,22 +117,13 @@ test_expect_success 'packed obs in alternate ODB kept pack are repacked' ' fi done && git repack -a -d && - 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_no_missing_in_packs ' 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/ && - csha1=$(git rev-parse HEAD^{commit}) && + coid=$(git rev-parse HEAD^{commit}) && git reset --hard HEAD^ && test_tick && git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all && @@ -167,15 +133,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/ && - 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 + git verify-pack -v -- .git/objects/pack/*.idx >packlist && + ! grep "^$coid " packlist && + echo >.git/objects/info/alternates && + test_must_fail git show $coid ' test_expect_success 'local packed unreachable obs that exist in alternate ODB are not loosened' ' - echo $(pwd)/alt_objects > .git/objects/info/alternates && - echo "$csha1" | git pack-objects --non-empty --all --reflog pack && + echo $(pwd)/alt_objects >.git/objects/info/alternates && + echo "$coid" | 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 @@ -184,10 +150,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/ && - 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 + git verify-pack -v -- .git/objects/pack/*.idx >packlist && + ! grep "^$coid " && + echo >.git/objects/info/alternates && + test_must_fail git show $coid ' test_expect_success 'objects made unreachable by grafts only are kept' ' @@ -196,7 +162,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 @@ -235,7 +201,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 2>/dev/null || :) && + bitmap=$(ls bare.git/objects/pack/*.bitmap || :) && test -z "$bitmap" ' diff --git a/third_party/git/t/t7800-difftool.sh b/third_party/git/t/t7800-difftool.sh index 6bac9ed180..524f30f7dc 100755 --- a/third_party/git/t/t7800-difftool.sh +++ b/third_party/git/t/t7800-difftool.sh @@ -125,15 +125,14 @@ 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 "$2" + echo failed 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_cmp expect actual + test_line_count = 1 actual ' test_expect_success 'difftool honors exit status if command not found' ' @@ -721,6 +720,14 @@ test_expect_success SYMLINKS 'difftool --dir-diff handles modified symlinks' ' test_cmp expect actual ' +test_expect_success 'add -N and difftool -d' ' + test_when_finished git reset --hard && + + test_write_lines A B C >intent-to-add && + git add -N intent-to-add && + git difftool --dir-diff --extcmd ls +' + test_expect_success 'outside worktree' ' echo 1 >1 && echo 2 >2 && diff --git a/third_party/git/t/t7810-grep.sh b/third_party/git/t/t7810-grep.sh index 7d7b396c23..991d5bd9c0 100755 --- a/third_party/git/t/t7810-grep.sh +++ b/third_party/git/t/t7810-grep.sh @@ -72,6 +72,11 @@ test_expect_success setup ' # Still a no-op. function dummy() {} EOF + if test_have_prereq FUNNYNAMES + then + echo unusual >"\"unusual\" pathname" && + echo unusual >"t/nested \"unusual\" pathname" + fi && git add . && test_tick && git commit -m initial @@ -481,6 +486,48 @@ do git grep --count -h -e b $H -- ab >actual && test_cmp expected actual ' + + test_expect_success FUNNYNAMES "grep $L should quote unusual pathnames" ' + cat >expected <<-EOF && + ${HC}"\"unusual\" pathname":unusual + ${HC}"t/nested \"unusual\" pathname":unusual + EOF + git grep unusual $H >actual && + test_cmp expected actual + ' + + test_expect_success FUNNYNAMES "grep $L in subdir should quote unusual relative pathnames" ' + cat >expected <<-EOF && + ${HC}"nested \"unusual\" pathname":unusual + EOF + ( + cd t && + git grep unusual $H + ) >actual && + test_cmp expected actual + ' + + test_expect_success FUNNYNAMES "grep -z $L with unusual pathnames" ' + cat >expected <<-EOF && + ${HC}"unusual" pathname:unusual + ${HC}t/nested "unusual" pathname:unusual + EOF + git grep -z unusual $H >actual && + tr "\0" ":" <actual >actual-replace-null && + test_cmp expected actual-replace-null + ' + + test_expect_success FUNNYNAMES "grep -z $L in subdir with unusual relative pathnames" ' + cat >expected <<-EOF && + ${HC}nested "unusual" pathname:unusual + EOF + ( + cd t && + git grep -z unusual $H + ) >actual && + tr "\0" ":" <actual >actual-replace-null && + test_cmp expected actual-replace-null + ' done cat >expected <<EOF diff --git a/third_party/git/t/t7811-grep-open.sh b/third_party/git/t/t7811-grep-open.sh index d1ebfd88c7..a98785da79 100755 --- a/third_party/git/t/t7811-grep-open.sh +++ b/third_party/git/t/t7811-grep-open.sh @@ -113,7 +113,6 @@ 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 0c685d3598..03dba6685a 100755 --- a/third_party/git/t/t7812-grep-icase-non-ascii.sh +++ b/third_party/git/t/t7812-grep-icase-non-ascii.sh @@ -53,4 +53,35 @@ 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 a11366b4ce..828cb3ba58 100755 --- a/third_party/git/t/t7814-grep-recurse-submodules.sh +++ b/third_party/git/t/t7814-grep-recurse-submodules.sh @@ -345,7 +345,16 @@ test_incompatible_with_recurse_submodules () } test_incompatible_with_recurse_submodules --untracked -test_incompatible_with_recurse_submodules --no-index + +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_expect_success 'grep --recurse-submodules should pass the pattern type along' ' # Fixed @@ -408,4 +417,25 @@ 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/t7008-grep-binary.sh b/third_party/git/t/t7815-grep-binary.sh index 2d87c49b75..90ebb64f46 100755 --- a/third_party/git/t/t7008-grep-binary.sh +++ b/third_party/git/t/t7815-grep-binary.sh @@ -4,41 +4,6 @@ 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 && @@ -102,72 +67,6 @@ 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/t7816-grep-binary-pattern.sh b/third_party/git/t/t7816-grep-binary-pattern.sh new file mode 100755 index 0000000000..60bab291e4 --- /dev/null +++ b/third_party/git/t/t7816-grep-binary-pattern.sh @@ -0,0 +1,127 @@ +#!/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/t7900-maintenance.sh b/third_party/git/t/t7900-maintenance.sh new file mode 100755 index 0000000000..53c883531e --- /dev/null +++ b/third_party/git/t/t7900-maintenance.sh @@ -0,0 +1,65 @@ +#!/bin/sh + +test_description='git maintenance builtin' + +. ./test-lib.sh + +GIT_TEST_COMMIT_GRAPH=0 + +test_expect_success 'help text' ' + test_expect_code 129 git maintenance -h 2>err && + test_i18ngrep "usage: git maintenance run" err && + test_expect_code 128 git maintenance barf 2>err && + test_i18ngrep "invalid subcommand: barf" err && + test_expect_code 129 git maintenance 2>err && + test_i18ngrep "usage: git maintenance" err +' + +test_expect_success 'run [--auto|--quiet]' ' + GIT_TRACE2_EVENT="$(pwd)/run-no-auto.txt" \ + git maintenance run 2>/dev/null && + GIT_TRACE2_EVENT="$(pwd)/run-auto.txt" \ + git maintenance run --auto 2>/dev/null && + GIT_TRACE2_EVENT="$(pwd)/run-no-quiet.txt" \ + git maintenance run --no-quiet 2>/dev/null && + test_subcommand git gc --quiet <run-no-auto.txt && + test_subcommand ! git gc --auto --quiet <run-auto.txt && + test_subcommand git gc --no-quiet <run-no-quiet.txt +' + +test_expect_success 'maintenance.<task>.enabled' ' + git config maintenance.gc.enabled false && + git config maintenance.commit-graph.enabled true && + GIT_TRACE2_EVENT="$(pwd)/run-config.txt" git maintenance run 2>err && + test_subcommand ! git gc --quiet <run-config.txt && + test_subcommand git commit-graph write --split --reachable --no-progress <run-config.txt +' + +test_expect_success 'run --task=<task>' ' + GIT_TRACE2_EVENT="$(pwd)/run-commit-graph.txt" \ + git maintenance run --task=commit-graph 2>/dev/null && + GIT_TRACE2_EVENT="$(pwd)/run-gc.txt" \ + git maintenance run --task=gc 2>/dev/null && + GIT_TRACE2_EVENT="$(pwd)/run-commit-graph.txt" \ + git maintenance run --task=commit-graph 2>/dev/null && + GIT_TRACE2_EVENT="$(pwd)/run-both.txt" \ + git maintenance run --task=commit-graph --task=gc 2>/dev/null && + test_subcommand ! git gc --quiet <run-commit-graph.txt && + test_subcommand git gc --quiet <run-gc.txt && + test_subcommand git gc --quiet <run-both.txt && + test_subcommand git commit-graph write --split --reachable --no-progress <run-commit-graph.txt && + test_subcommand ! git commit-graph write --split --reachable --no-progress <run-gc.txt && + test_subcommand git commit-graph write --split --reachable --no-progress <run-both.txt +' + +test_expect_success 'run --task=bogus' ' + test_must_fail git maintenance run --task=bogus 2>err && + test_i18ngrep "is not a valid task" err +' + +test_expect_success 'run --task duplicate' ' + test_must_fail git maintenance run --task=gc --task=gc 2>err && + test_i18ngrep "cannot be selected multiple times" err +' + +test_done diff --git a/third_party/git/t/t8002-blame.sh b/third_party/git/t/t8002-blame.sh index eea048e52c..015973e8fe 100755 --- a/third_party/git/t/t8002-blame.sh +++ b/third_party/git/t/t8002-blame.sh @@ -6,6 +6,10 @@ test_description='git blame' PROG='git blame -c' . "$TEST_DIRECTORY"/annotate-tests.sh +test_expect_success 'setup' ' + hexsz=$(test_oid hexsz) +' + test_expect_success 'blame untracked file in empty repo' ' >untracked && test_must_fail git blame untracked @@ -105,21 +109,32 @@ test_expect_success 'blame --abbrev=<n> works' ' ' test_expect_success 'blame -l aligns regular and boundary commits' ' - check_abbrev 40 -l HEAD && - check_abbrev 39 -l ^HEAD + check_abbrev $hexsz -l HEAD && + check_abbrev $((hexsz - 1)) -l ^HEAD ' -test_expect_success 'blame --abbrev=40 behaves like -l' ' - check_abbrev 40 --abbrev=40 HEAD && - check_abbrev 39 --abbrev=40 ^HEAD +test_expect_success 'blame --abbrev with full length behaves like -l' ' + check_abbrev $hexsz --abbrev=$hexsz HEAD && + check_abbrev $((hexsz - 1)) --abbrev=$hexsz ^HEAD ' -test_expect_success '--no-abbrev works like --abbrev=40' ' - check_abbrev 40 --no-abbrev +test_expect_success '--no-abbrev works like --abbrev with full length' ' + check_abbrev $hexsz --no-abbrev ' test_expect_success '--exclude-promisor-objects does not BUG-crash' ' test_must_fail git blame --exclude-promisor-objects one ' +test_expect_success 'blame with uncommitted edits in partial clone does not crash' ' + git init server && + echo foo >server/file.txt && + git -C server add file.txt && + git -C server commit -m file && + + git clone --filter=blob:none "file://$(pwd)/server" client && + echo bar >>client/file.txt && + git -C client blame file.txt +' + 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 1c5fb1d1f8..ba8013b002 100755 --- a/third_party/git/t/t8003-blame-corner-cases.sh +++ b/third_party/git/t/t8003-blame-corner-cases.sh @@ -6,7 +6,6 @@ test_description='git blame corner cases' pick_fc='s/^[0-9a-f^]* *\([^ ]*\) *(\([^ ]*\) .*/\1-\2/' test_expect_success setup ' - echo A A A A A >one && echo B B B B B >two && echo C C C C C >tres && @@ -173,7 +172,6 @@ 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 @@ -275,18 +273,14 @@ test_expect_success 'blame file with CRLF core.autocrlf=true' ' grep "A U Thor" actual ' -# Tests the splitting and merging of blame entries in blame_coalesce(). -# The output of blame is the same, regardless of whether blame_coalesce() runs -# or not, so we'd likely only notice a problem if blame crashes or assigned -# blame to the "splitting" commit ('SPLIT' below). -test_expect_success 'blame coalesce' ' +test_expect_success 'setup coalesce tests' ' cat >giraffe <<-\EOF && ABC DEF EOF git add giraffe && git commit -m "original file" && - oid=$(git rev-parse HEAD) && + orig=$(git rev-parse HEAD) && cat >giraffe <<-\EOF && ABC @@ -295,6 +289,7 @@ test_expect_success 'blame coalesce' ' EOF git add giraffe && git commit -m "interior SPLIT line" && + split=$(git rev-parse HEAD) && cat >giraffe <<-\EOF && ABC @@ -302,12 +297,25 @@ test_expect_success 'blame coalesce' ' EOF git add giraffe && git commit -m "same contents as original" && + final=$(git rev-parse HEAD) +' + +test_expect_success 'blame coalesce' ' + cat >expect <<-EOF && + $orig 1 1 2 + $orig 2 2 + EOF + git blame --porcelain $final giraffe >actual.raw && + grep "^$orig" actual.raw >actual && + test_cmp expect actual +' +test_expect_success 'blame does not coalesce non-adjacent result lines' ' cat >expect <<-EOF && - $oid 1) ABC - $oid 2) DEF + $orig 1) ABC + $orig 3) DEF EOF - git -c core.abbrev=40 blame -s giraffe >actual && + git blame --no-abbrev -s -L1,1 -L3,3 $split giraffe >actual && test_cmp expect actual ' diff --git a/third_party/git/t/t8011-blame-split-file.sh b/third_party/git/t/t8011-blame-split-file.sh index 831125047b..bdda0c03fe 100755 --- a/third_party/git/t/t8011-blame-split-file.sh +++ b/third_party/git/t/t8011-blame-split-file.sh @@ -54,7 +54,7 @@ test_expect_success 'setup simulated porcelain' ' cat >read-porcelain.pl <<-\EOF my $field = shift; while (<>) { - if (/^[0-9a-f]{40} /) { + if (/^[0-9a-f]{40,} /) { flush(); $hash = $&; } elsif (/^$field (.*)/) { diff --git a/third_party/git/t/t8013-blame-ignore-revs.sh b/third_party/git/t/t8013-blame-ignore-revs.sh index 36dc31eb39..24ae5018e8 100755 --- a/third_party/git/t/t8013-blame-ignore-revs.sh +++ b/third_party/git/t/t8013-blame-ignore-revs.sh @@ -21,6 +21,7 @@ test_expect_success setup ' test_tick && git commit -m X && git tag X && + git tag -a -m "X (annotated)" XT && git blame --line-porcelain file >blame_raw && @@ -31,20 +32,36 @@ test_expect_success setup ' grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual && git rev-parse X >expect && test_cmp expect actual +' + +# Ensure bogus --ignore-rev requests are caught +test_expect_success 'validate --ignore-rev' ' + test_must_fail git blame --ignore-rev X^{tree} file +' + +# Ensure bogus --ignore-revs-file requests are caught +test_expect_success 'validate --ignore-revs-file' ' + git rev-parse X^{tree} >ignore_x && + test_must_fail git blame --ignore-revs-file ignore_x file +' + +for I in X XT +do + # Ignore X (or XT), make sure A is blamed for line 1 and B for line 2. + # Giving X (i.e. commit) and XT (i.e. annotated tag to commit) should + # produce the same result. + test_expect_success "ignore_rev_changing_lines ($I)" ' + git blame --line-porcelain --ignore-rev $I file >blame_raw && + + grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual && + git rev-parse A >expect && + test_cmp expect actual && + + grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual && + git rev-parse B >expect && + test_cmp expect actual ' - -# Ignore X, make sure A is blamed for line 1 and B for line 2. -test_expect_success ignore_rev_changing_lines ' - git blame --line-porcelain --ignore-rev X file >blame_raw && - - grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual && - git rev-parse A >expect && - test_cmp expect actual && - - grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual && - git rev-parse B >expect && - test_cmp expect actual - ' +done # For ignored revs that have added 'unblamable' lines, attribute those to the # ignored commit. @@ -67,7 +84,7 @@ test_expect_success ignore_rev_adding_unblamable_lines ' grep -E "^[0-9a-f]+ [0-9]+ 4" blame_raw | sed -e "s/ .*//" >actual && test_cmp expect actual - ' +' # Ignore X and Y, both in separate files. Lines 1 == A, 2 == B. test_expect_success ignore_revs_from_files ' @@ -82,7 +99,7 @@ test_expect_success ignore_revs_from_files ' grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual && git rev-parse B >expect && test_cmp expect actual - ' +' # Ignore X from the config option, Y from a file. test_expect_success ignore_revs_from_configs_and_files ' @@ -96,7 +113,7 @@ test_expect_success ignore_revs_from_configs_and_files ' grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual && git rev-parse B >expect && test_cmp expect actual - ' +' # Override blame.ignoreRevsFile (ignore_x) with an empty string. X should be # blamed now for lines 1 and 2, since we are no longer ignoring X. @@ -120,7 +137,7 @@ test_expect_success bad_files_and_revs ' echo NOREV >ignore_norev && test_must_fail git blame file --ignore-revs-file ignore_norev 2>err && test_i18ngrep "invalid object name: NOREV" err - ' +' # For ignored revs that have added 'unblamable' lines, mark those lines with a # '*' @@ -138,7 +155,7 @@ test_expect_success mark_unblamable_lines ' sed -n "4p" blame_raw | cut -c1 >actual && test_cmp expect actual - ' +' # Commit Z will touch the first two lines. Y touched all four. # A--B--X--Y--Z @@ -171,7 +188,7 @@ test_expect_success mark_ignored_lines ' sed -n "4p" blame_raw | cut -c1 >actual && ! test_cmp expect actual - ' +' # For ignored revs that added 'unblamable' lines and more recent commits changed # the blamable lines, mark the unblamable lines with a @@ -190,7 +207,7 @@ test_expect_success mark_unblamable_lines_intermediate ' sed -n "4p" blame_raw | cut -c1 >actual && test_cmp expect actual - ' +' # The heuristic called by guess_line_blames() tries to find the size of a # blame_entry 'e' in the parent's address space. Those calculations need to @@ -227,7 +244,7 @@ test_expect_success ignored_chunk_negative_parent_size ' git tag C && git blame file --ignore-rev B >blame_raw - ' +' # Resetting the repo and creating: # @@ -269,6 +286,6 @@ test_expect_success ignore_merge ' grep -E "^[0-9a-f]+ [0-9]+ 9" blame_raw | sed -e "s/ .*//" >actual && git rev-parse C >expect && test_cmp expect actual - ' +' test_done diff --git a/third_party/git/t/t8014-blame-ignore-fuzzy.sh b/third_party/git/t/t8014-blame-ignore-fuzzy.sh index 6e61882b6f..e68e6115a6 100755 --- a/third_party/git/t/t8014-blame-ignore-fuzzy.sh +++ b/third_party/git/t/t8014-blame-ignore-fuzzy.sh @@ -248,7 +248,7 @@ Final EOF # The first line of b matches best with the last line of a, but the overall -# match is better if we match it with the the first line of a. +# match is better if we match it with the first line of a. title11="Piggy in the middle" cat <<EOF >a11 abcdefg diff --git a/third_party/git/t/t9001-send-email.sh b/third_party/git/t/t9001-send-email.sh index 997f90b42b..a08f72596a 100755 --- a/third_party/git/t/t9001-send-email.sh +++ b/third_party/git/t/t9001-send-email.sh @@ -42,7 +42,8 @@ clean_fake_sendmail () { } test_expect_success $PREREQ 'Extract patches' ' - patches=$(git format-patch -s --cc="One <one@example.com>" --cc=two@example.com -n HEAD^1) + patches=$(git format-patch -s --cc="One <one@example.com>" --cc=two@example.com -n HEAD^1) && + threaded_patches=$(git format-patch -o threaded -s --in-reply-to="format" HEAD^1) ' # Test no confirm early to ensure remaining tests will not hang @@ -1194,8 +1195,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 | - grep "In-Reply-To: <in-reply-id@example.com>" + $patches >out && + grep "In-Reply-To: <in-reply-id@example.com>" out ' test_expect_success $PREREQ 'no in-reply-to and no threading' ' @@ -1219,6 +1220,17 @@ test_expect_success $PREREQ 'threading but no chain-reply-to' ' grep "In-Reply-To: " stdout ' +test_expect_success $PREREQ 'override in-reply-to if no threading' ' + git send-email \ + --dry-run \ + --from="Example <nobody@example.com>" \ + --to=nobody@example.com \ + --no-thread \ + --in-reply-to="override" \ + $threaded_patches >stdout && + grep "In-Reply-To: <override>" stdout +' + test_expect_success $PREREQ 'sendemail.to works' ' git config --replace-all sendemail.to "Somebody <somebody@ex.com>" && git send-email \ @@ -1260,7 +1272,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 existance overrides' ' +test_expect_success $PREREQ 'sendemail.identity: bool identity variable existence overrides' ' git -c sendemail.identity=cloud \ -c sendemail.xmailer=true \ -c sendemail.cloud.xmailer=false \ @@ -1539,7 +1551,7 @@ test_expect_success $PREREQ '8-bit and sendemail.transferencoding=quoted-printab --smtp-server="$(pwd)/fake.sendmail" \ email-using-8bit \ 2>errors >out && - sed '1,/^$/d' msgtxt1 >actual && + sed "1,/^$/d" msgtxt1 >actual && test_cmp expected actual ' @@ -1556,7 +1568,7 @@ test_expect_success $PREREQ '8-bit and sendemail.transferencoding=base64' ' --smtp-server="$(pwd)/fake.sendmail" \ email-using-8bit \ 2>errors >out && - sed '1,/^$/d' msgtxt1 >actual && + sed "1,/^$/d" msgtxt1 >actual && test_cmp expected actual ' @@ -1582,7 +1594,7 @@ test_expect_success $PREREQ 'convert from quoted-printable to base64' ' --smtp-server="$(pwd)/fake.sendmail" \ email-using-qp \ 2>errors >out && - sed '1,/^$/d' msgtxt1 >actual && + sed "1,/^$/d" msgtxt1 >actual && test_cmp expected actual ' @@ -1612,7 +1624,7 @@ test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=quoted-printabl --smtp-server="$(pwd)/fake.sendmail" \ email-using-crlf \ 2>errors >out && - sed '1,/^$/d' msgtxt1 >actual && + sed "1,/^$/d" msgtxt1 >actual && test_cmp expected actual ' @@ -1629,7 +1641,7 @@ test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=base64' ' --smtp-server="$(pwd)/fake.sendmail" \ email-using-crlf \ 2>errors >out && - sed '1,/^$/d' msgtxt1 >actual && + sed "1,/^$/d" msgtxt1 >actual && test_cmp expected actual ' @@ -2066,7 +2078,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 "Q bcc1@example.com Q" | q_to_nul) && + BCC1=$(echo " bcc1@example.com Q" | q_to_nul) && git send-email \ --dry-run \ --from=" Example <from@example.com>" \ @@ -2130,4 +2142,33 @@ test_expect_success $PREREQ 'test that send-email works outside a repo' ' "$(pwd)/0001-add-master.patch" ' +test_expect_success $PREREQ 'test that sendmail config is rejected' ' + test_config sendmail.program sendmail && + test_must_fail git send-email \ + --from="Example <nobody@example.com>" \ + --to=nobody@example.com \ + --smtp-server="$(pwd)/fake.sendmail" \ + HEAD^ 2>err && + test_i18ngrep "found configuration options for '"'"sendmail"'"'" err +' + +test_expect_success $PREREQ 'test that sendmail config rejection is specific' ' + test_config resendmail.program sendmail && + git send-email \ + --from="Example <nobody@example.com>" \ + --to=nobody@example.com \ + --smtp-server="$(pwd)/fake.sendmail" \ + HEAD^ +' + +test_expect_success $PREREQ 'test forbidSendmailVariables behavior override' ' + test_config sendmail.program sendmail && + test_config sendemail.forbidSendmailVariables false && + git send-email \ + --from="Example <nobody@example.com>" \ + --to=nobody@example.com \ + --smtp-server="$(pwd)/fake.sendmail" \ + HEAD^ +' + test_done diff --git a/third_party/git/t/t9010-svn-fe.sh b/third_party/git/t/t9010-svn-fe.sh deleted file mode 100755 index 0b20b07e68..0000000000 --- a/third_party/git/t/t9010-svn-fe.sh +++ /dev/null @@ -1,1107 +0,0 @@ -#!/bin/sh - -test_description='check svn dumpfile importer' - -. ./test-lib.sh - -if test_have_prereq !PIPE -then - skip_all="svn dumpfile importer testing requires the PIPE prerequisite" - test_done -fi - -reinit_git () { - rm -fr .git && - rm -f stream backflow && - git init && - mkfifo stream backflow -} - -try_dump () { - input=$1 && - maybe_fail_svnfe=${2:+test_$2} && - maybe_fail_fi=${3:+test_$3} && - - { - $maybe_fail_svnfe test-svn-fe "$input" >stream 3<backflow & - } && - $maybe_fail_fi git fast-import --cat-blob-fd=3 <stream 3>backflow && - wait $! -} - -properties () { - while test "$#" -ne 0 - do - property="$1" && - value="$2" && - printf "%s\n" "K ${#property}" && - printf "%s\n" "$property" && - printf "%s\n" "V ${#value}" && - printf "%s\n" "$value" && - shift 2 || - return 1 - done -} - -text_no_props () { - text="$1 -" && - printf "%s\n" "Prop-content-length: 10" && - printf "%s\n" "Text-content-length: ${#text}" && - printf "%s\n" "Content-length: $((${#text} + 10))" && - printf "%s\n" "" "PROPS-END" && - printf "%s\n" "$text" -} - ->empty - -test_expect_success 'empty dump' ' - reinit_git && - echo "SVN-fs-dump-format-version: 2" >input && - try_dump input -' - -test_expect_success 'v4 dumps not supported' ' - reinit_git && - echo "SVN-fs-dump-format-version: 4" >v4.dump && - try_dump v4.dump must_fail -' - -test_expect_failure 'empty revision' ' - reinit_git && - printf "rev <nobody, nobody@local>: %s\n" "" "" >expect && - cat >emptyrev.dump <<-\EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - Prop-content-length: 0 - Content-length: 0 - - Revision-number: 2 - Prop-content-length: 0 - Content-length: 0 - - EOF - try_dump emptyrev.dump && - git log -p --format="rev <%an, %ae>: %s" HEAD >actual && - test_cmp expect actual -' - -test_expect_success 'empty properties' ' - reinit_git && - printf "rev <nobody, nobody@local>: %s\n" "" "" >expect && - cat >emptyprop.dump <<-\EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Revision-number: 2 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - EOF - try_dump emptyprop.dump && - git log -p --format="rev <%an, %ae>: %s" HEAD >actual && - test_cmp expect actual -' - -test_expect_success 'author name and commit message' ' - reinit_git && - echo "<author@example.com, author@example.com@local>" >expect.author && - cat >message <<-\EOF && - A concise summary of the change - - A detailed description of the change, why it is needed, what - was broken and why applying this is the best course of action. - - * file.c - Details pertaining to an individual file. - EOF - { - properties \ - svn:author author@example.com \ - svn:log "$(cat message)" && - echo PROPS-END - } >props && - { - echo "SVN-fs-dump-format-version: 3" && - echo && - echo "Revision-number: 1" && - echo Prop-content-length: $(wc -c <props) && - echo Content-length: $(wc -c <props) && - echo && - cat props - } >log.dump && - try_dump log.dump && - git log -p --format="%B" HEAD >actual.log && - git log --format="<%an, %ae>" >actual.author && - test_cmp message actual.log && - test_cmp expect.author actual.author -' - -test_expect_success 'unsupported properties are ignored' ' - reinit_git && - echo author >expect && - cat >extraprop.dump <<-\EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - Prop-content-length: 56 - Content-length: 56 - - K 8 - nonsense - V 1 - y - K 10 - svn:author - V 6 - author - PROPS-END - EOF - try_dump extraprop.dump && - git log -p --format=%an HEAD >actual && - test_cmp expect actual -' - -test_expect_failure 'timestamp and empty file' ' - echo author@example.com >expect.author && - echo 1999-01-01 >expect.date && - echo file >expect.files && - reinit_git && - { - properties \ - svn:author author@example.com \ - svn:date "1999-01-01T00:01:002.000000Z" \ - svn:log "add empty file" && - echo PROPS-END - } >props && - { - cat <<-EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - EOF - echo Prop-content-length: $(wc -c <props) && - echo Content-length: $(wc -c <props) && - echo && - cat props && - cat <<-\EOF - - Node-path: empty-file - Node-kind: file - Node-action: add - Content-length: 0 - - EOF - } >emptyfile.dump && - try_dump emptyfile.dump && - git log --format=%an HEAD >actual.author && - git log --date=short --format=%ad HEAD >actual.date && - git ls-tree -r --name-only HEAD >actual.files && - test_cmp expect.author actual.author && - test_cmp expect.date actual.date && - test_cmp expect.files actual.files && - git checkout HEAD empty-file && - test_cmp empty file -' - -test_expect_success 'directory with files' ' - reinit_git && - printf "%s\n" directory/file1 directory/file2 >expect.files && - echo hi >hi && - echo hello >hello && - { - properties \ - svn:author author@example.com \ - svn:date "1999-02-01T00:01:002.000000Z" \ - svn:log "add directory with some files in it" && - echo PROPS-END - } >props && - { - cat <<-EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - EOF - echo Prop-content-length: $(wc -c <props) && - echo Content-length: $(wc -c <props) && - echo && - cat props && - cat <<-\EOF && - - Node-path: directory - Node-kind: dir - Node-action: add - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: directory/file1 - Node-kind: file - Node-action: add - EOF - text_no_props hello && - cat <<-\EOF && - Node-path: directory/file2 - Node-kind: file - Node-action: add - EOF - text_no_props hi - } >directory.dump && - try_dump directory.dump && - - git ls-tree -r --name-only HEAD >actual.files && - git checkout HEAD directory && - test_cmp expect.files actual.files && - test_cmp hello directory/file1 && - test_cmp hi directory/file2 -' - -test_expect_success 'branch name with backslash' ' - reinit_git && - sort <<-\EOF >expect.branch-files && - trunk/file1 - trunk/file2 - "branches/UpdateFOPto094\\/file1" - "branches/UpdateFOPto094\\/file2" - EOF - - echo hi >hi && - echo hello >hello && - { - properties \ - svn:author author@example.com \ - svn:date "1999-02-02T00:01:02.000000Z" \ - svn:log "add directory with some files in it" && - echo PROPS-END - } >props.setup && - { - properties \ - svn:author brancher@example.com \ - svn:date "2007-12-06T21:38:34.000000Z" \ - svn:log "Updating fop to .94 and adjust fo-stylesheets" && - echo PROPS-END - } >props.branch && - { - cat <<-EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - EOF - echo Prop-content-length: $(wc -c <props.setup) && - echo Content-length: $(wc -c <props.setup) && - echo && - cat props.setup && - cat <<-\EOF && - - Node-path: trunk - Node-kind: dir - Node-action: add - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: branches - Node-kind: dir - Node-action: add - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: trunk/file1 - Node-kind: file - Node-action: add - EOF - text_no_props hello && - cat <<-\EOF && - Node-path: trunk/file2 - Node-kind: file - Node-action: add - EOF - text_no_props hi && - cat <<-\EOF && - - Revision-number: 2 - EOF - echo Prop-content-length: $(wc -c <props.branch) && - echo Content-length: $(wc -c <props.branch) && - echo && - cat props.branch && - cat <<-\EOF - - Node-path: branches/UpdateFOPto094\ - Node-kind: dir - Node-action: add - Node-copyfrom-rev: 1 - Node-copyfrom-path: trunk - - Node-kind: dir - Node-action: add - Prop-content-length: 34 - Content-length: 34 - - K 13 - svn:mergeinfo - V 0 - - PROPS-END - EOF - } >branch.dump && - try_dump branch.dump && - - git ls-tree -r --name-only HEAD | - sort >actual.branch-files && - test_cmp expect.branch-files actual.branch-files -' - -test_expect_success 'node without action' ' - reinit_git && - cat >inaction.dump <<-\EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: directory - Node-kind: dir - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - EOF - try_dump inaction.dump must_fail -' - -test_expect_success 'action: add node without text' ' - reinit_git && - cat >textless.dump <<-\EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: textless - Node-kind: file - Node-action: add - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - EOF - try_dump textless.dump must_fail -' - -test_expect_failure 'change file mode but keep old content' ' - reinit_git && - cat >expect <<-\EOF && - OBJID - :120000 100644 OBJID OBJID T greeting - OBJID - :100644 120000 OBJID OBJID T greeting - OBJID - :000000 100644 OBJID OBJID A greeting - EOF - echo "link hello" >expect.blob && - echo hello >hello && - cat >filemode.dump <<-\EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: greeting - Node-kind: file - Node-action: add - Prop-content-length: 10 - Text-content-length: 11 - Content-length: 21 - - PROPS-END - link hello - - Revision-number: 2 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: greeting - Node-kind: file - Node-action: change - Prop-content-length: 33 - Content-length: 33 - - K 11 - svn:special - V 1 - * - PROPS-END - - Revision-number: 3 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: greeting - Node-kind: file - Node-action: change - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - EOF - try_dump filemode.dump && - { - git rev-list HEAD | - git diff-tree --root --stdin | - sed "s/$OID_REGEX/OBJID/g" - } >actual && - git show HEAD:greeting >actual.blob && - git show HEAD^:greeting >actual.target && - test_cmp expect actual && - test_cmp expect.blob actual.blob && - test_cmp hello actual.target -' - -test_expect_success 'NUL in property value' ' - reinit_git && - echo "commit message" >expect.message && - { - properties \ - unimportant "something with a NUL (Q)" \ - svn:log "commit message"&& - echo PROPS-END - } | - q_to_nul >props && - { - cat <<-\EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - EOF - echo Prop-content-length: $(wc -c <props) && - echo Content-length: $(wc -c <props) && - echo && - cat props - } >nulprop.dump && - try_dump nulprop.dump && - git diff-tree --always -s --format=%s HEAD >actual.message && - test_cmp expect.message actual.message -' - -test_expect_success 'NUL in log message, file content, and property name' ' - # Caveat: svnadmin 1.6.16 (r1073529) truncates at \0 in the - # svn:specialQnotreally example. - reinit_git && - cat >expect <<-\EOF && - OBJID - :100644 100644 OBJID OBJID M greeting - OBJID - :000000 100644 OBJID OBJID A greeting - EOF - printf "\n%s\n" "something with an ASCII NUL (Q)" >expect.message && - printf "%s\n" "helQo" >expect.hello1 && - printf "%s\n" "link hello" >expect.hello2 && - { - properties svn:log "something with an ASCII NUL (Q)" && - echo PROPS-END - } | - q_to_nul >props && - { - q_to_nul <<-\EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: greeting - Node-kind: file - Node-action: add - Prop-content-length: 10 - Text-content-length: 6 - Content-length: 16 - - PROPS-END - helQo - - Revision-number: 2 - EOF - echo Prop-content-length: $(wc -c <props) && - echo Content-length: $(wc -c <props) && - echo && - cat props && - q_to_nul <<-\EOF - - Node-path: greeting - Node-kind: file - Node-action: change - Prop-content-length: 43 - Text-content-length: 11 - Content-length: 54 - - K 21 - svn:specialQnotreally - V 1 - * - PROPS-END - link hello - EOF - } >8bitclean.dump && - try_dump 8bitclean.dump && - { - git rev-list HEAD | - git diff-tree --root --stdin | - sed "s/$OID_REGEX/OBJID/g" - } >actual && - { - git cat-file commit HEAD | nul_to_q && - echo - } | - sed -ne "/^\$/,\$ p" >actual.message && - git cat-file blob HEAD^:greeting | nul_to_q >actual.hello1 && - git cat-file blob HEAD:greeting | nul_to_q >actual.hello2 && - test_cmp expect actual && - test_cmp expect.message actual.message && - test_cmp expect.hello1 actual.hello1 && - test_cmp expect.hello2 actual.hello2 -' - -test_expect_success 'change file mode and reiterate content' ' - reinit_git && - cat >expect <<-\EOF && - OBJID - :120000 100644 OBJID OBJID T greeting - OBJID - :100644 120000 OBJID OBJID T greeting - OBJID - :000000 100644 OBJID OBJID A greeting - EOF - echo "link hello" >expect.blob && - echo hello >hello && - cat >filemode2.dump <<-\EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: greeting - Node-kind: file - Node-action: add - Prop-content-length: 10 - Text-content-length: 11 - Content-length: 21 - - PROPS-END - link hello - - Revision-number: 2 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: greeting - Node-kind: file - Node-action: change - Prop-content-length: 33 - Text-content-length: 11 - Content-length: 44 - - K 11 - svn:special - V 1 - * - PROPS-END - link hello - - Revision-number: 3 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: greeting - Node-kind: file - Node-action: change - Prop-content-length: 10 - Text-content-length: 11 - Content-length: 21 - - PROPS-END - link hello - EOF - try_dump filemode2.dump && - { - git rev-list HEAD | - git diff-tree --root --stdin | - sed "s/$OID_REGEX/OBJID/g" - } >actual && - git show HEAD:greeting >actual.blob && - git show HEAD^:greeting >actual.target && - test_cmp expect actual && - test_cmp expect.blob actual.blob && - test_cmp hello actual.target -' - -test_expect_success 'deltas supported' ' - reinit_git && - { - # (old) h + (inline) ello + (old) \n - printf "SVNQ%b%b%s" "Q\003\006\005\004" "\001Q\0204\001\002" "ello" | - q_to_nul - } >delta && - { - properties \ - svn:author author@example.com \ - svn:date "1999-01-05T00:01:002.000000Z" \ - svn:log "add greeting" && - echo PROPS-END - } >props && - { - properties \ - svn:author author@example.com \ - svn:date "1999-01-06T00:01:002.000000Z" \ - svn:log "change it" && - echo PROPS-END - } >props2 && - { - echo SVN-fs-dump-format-version: 3 && - echo && - echo Revision-number: 1 && - echo Prop-content-length: $(wc -c <props) && - echo Content-length: $(wc -c <props) && - echo && - cat props && - cat <<-\EOF && - - Node-path: hello - Node-kind: file - Node-action: add - Prop-content-length: 10 - Text-content-length: 3 - Content-length: 13 - - PROPS-END - hi - - EOF - echo Revision-number: 2 && - echo Prop-content-length: $(wc -c <props2) && - echo Content-length: $(wc -c <props2) && - echo && - cat props2 && - cat <<-\EOF && - - Node-path: hello - Node-kind: file - Node-action: change - Text-delta: true - Prop-content-length: 10 - EOF - echo Text-content-length: $(wc -c <delta) && - echo Content-length: $((10 + $(wc -c <delta))) && - echo && - echo PROPS-END && - cat delta - } >delta.dump && - try_dump delta.dump -' - -test_expect_success 'property deltas supported' ' - reinit_git && - cat >expect <<-\EOF && - OBJID - :100755 100644 OBJID OBJID M script.sh - EOF - { - properties \ - svn:author author@example.com \ - svn:date "1999-03-06T00:01:002.000000Z" \ - svn:log "make an executable, or chmod -x it" && - echo PROPS-END - } >revprops && - { - echo SVN-fs-dump-format-version: 3 && - echo && - echo Revision-number: 1 && - echo Prop-content-length: $(wc -c <revprops) && - echo Content-length: $(wc -c <revprops) && - echo && - cat revprops && - echo && - cat <<-\EOF && - Node-path: script.sh - Node-kind: file - Node-action: add - Text-content-length: 0 - Prop-content-length: 39 - Content-length: 39 - - K 14 - svn:executable - V 4 - true - PROPS-END - - EOF - echo Revision-number: 2 && - echo Prop-content-length: $(wc -c <revprops) && - echo Content-length: $(wc -c <revprops) && - echo && - cat revprops && - echo && - cat <<-\EOF - Node-path: script.sh - Node-kind: file - Node-action: change - Prop-delta: true - Prop-content-length: 30 - Content-length: 30 - - D 14 - svn:executable - PROPS-END - EOF - } >propdelta.dump && - try_dump propdelta.dump && - { - git rev-list HEAD | - git diff-tree --stdin | - sed "s/$OID_REGEX/OBJID/g" - } >actual && - test_cmp expect actual -' - -test_expect_success 'properties on /' ' - reinit_git && - cat <<-\EOF >expect && - OBJID - OBJID - :000000 100644 OBJID OBJID A greeting - EOF - sed -e "s/X$//" <<-\EOF >changeroot.dump && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: greeting - Node-kind: file - Node-action: add - Text-content-length: 0 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Revision-number: 2 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: X - Node-kind: dir - Node-action: change - Prop-delta: true - Prop-content-length: 43 - Content-length: 43 - - K 10 - svn:ignore - V 11 - build-area - - PROPS-END - EOF - try_dump changeroot.dump && - { - git rev-list HEAD | - git diff-tree --root --always --stdin | - sed "s/$OID_REGEX/OBJID/g" - } >actual && - test_cmp expect actual -' - -test_expect_success 'deltas for typechange' ' - reinit_git && - cat >expect <<-\EOF && - OBJID - :120000 100644 OBJID OBJID T test-file - OBJID - :100755 120000 OBJID OBJID T test-file - OBJID - :000000 100755 OBJID OBJID A test-file - EOF - cat >deleteprop.dump <<-\EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: test-file - Node-kind: file - Node-action: add - Prop-delta: true - Prop-content-length: 35 - Text-content-length: 17 - Content-length: 52 - - K 14 - svn:executable - V 0 - - PROPS-END - link testing 123 - - Revision-number: 2 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: test-file - Node-kind: file - Node-action: change - Prop-delta: true - Prop-content-length: 53 - Text-content-length: 17 - Content-length: 70 - - K 11 - svn:special - V 1 - * - D 14 - svn:executable - PROPS-END - link testing 231 - - Revision-number: 3 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: test-file - Node-kind: file - Node-action: change - Prop-delta: true - Prop-content-length: 27 - Text-content-length: 17 - Content-length: 44 - - D 11 - svn:special - PROPS-END - link testing 321 - EOF - try_dump deleteprop.dump && - { - git rev-list HEAD | - git diff-tree --root --stdin | - sed "s/$OID_REGEX/OBJID/g" - } >actual && - test_cmp expect actual -' - -test_expect_success 'deltas need not consume the whole preimage' ' - reinit_git && - cat >expect <<-\EOF && - OBJID - :120000 100644 OBJID OBJID T postimage - OBJID - :100644 120000 OBJID OBJID T postimage - OBJID - :000000 100644 OBJID OBJID A postimage - EOF - echo "first preimage" >expect.1 && - printf target >expect.2 && - printf lnk >expect.3 && - { - printf "SVNQ%b%b%b" "QQ\017\001\017" "\0217" "first preimage\n" | - q_to_nul - } >delta.1 && - { - properties svn:special "*" && - echo PROPS-END - } >symlink.props && - { - printf "SVNQ%b%b%b" "Q\002\013\004\012" "\0201\001\001\0211" "lnk target" | - q_to_nul - } >delta.2 && - { - printf "SVNQ%b%b" "Q\004\003\004Q" "\001Q\002\002" | - q_to_nul - } >delta.3 && - { - cat <<-\EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: postimage - Node-kind: file - Node-action: add - Text-delta: true - Prop-content-length: 10 - EOF - echo Text-content-length: $(wc -c <delta.1) && - echo Content-length: $((10 + $(wc -c <delta.1))) && - echo && - echo PROPS-END && - cat delta.1 && - cat <<-\EOF && - - Revision-number: 2 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: postimage - Node-kind: file - Node-action: change - Text-delta: true - EOF - echo Prop-content-length: $(wc -c <symlink.props) && - echo Text-content-length: $(wc -c <delta.2) && - echo Content-length: $(($(wc -c <symlink.props) + $(wc -c <delta.2))) && - echo && - cat symlink.props && - cat delta.2 && - cat <<-\EOF && - - Revision-number: 3 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: postimage - Node-kind: file - Node-action: change - Text-delta: true - Prop-content-length: 10 - EOF - echo Text-content-length: $(wc -c <delta.3) && - echo Content-length: $((10 + $(wc -c <delta.3))) && - echo && - echo PROPS-END && - cat delta.3 && - echo - } >deltapartial.dump && - try_dump deltapartial.dump && - { - git rev-list HEAD | - git diff-tree --root --stdin | - sed "s/$OID_REGEX/OBJID/g" - } >actual && - test_cmp expect actual && - git show HEAD:postimage >actual.3 && - git show HEAD^:postimage >actual.2 && - git show HEAD^^:postimage >actual.1 && - test_cmp expect.1 actual.1 && - test_cmp expect.2 actual.2 && - test_cmp expect.3 actual.3 -' - -test_expect_success 'no hang for delta trying to read past end of preimage' ' - reinit_git && - { - # COPY 1 - printf "SVNQ%b%b" "Q\001\001\002Q" "\001Q" | - q_to_nul - } >greedy.delta && - { - cat <<-\EOF && - SVN-fs-dump-format-version: 3 - - Revision-number: 1 - Prop-content-length: 10 - Content-length: 10 - - PROPS-END - - Node-path: bootstrap - Node-kind: file - Node-action: add - Text-delta: true - Prop-content-length: 10 - EOF - echo Text-content-length: $(wc -c <greedy.delta) && - echo Content-length: $((10 + $(wc -c <greedy.delta))) && - echo && - echo PROPS-END && - cat greedy.delta && - echo - } >greedydelta.dump && - try_dump greedydelta.dump must_fail might_fail -' - -test_expect_success 'set up svn repo' ' - svnconf=$PWD/svnconf && - mkdir -p "$svnconf" && - - if - svnadmin -h >/dev/null 2>&1 && - svnadmin create simple-svn && - svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" && - svn export --config-dir "$svnconf" "file://$PWD/simple-svn" simple-svnco - then - test_set_prereq SVNREPO - fi -' - -test_expect_success SVNREPO 't9135/svn.dump' ' - mkdir -p simple-git && - ( - cd simple-git && - reinit_git && - try_dump "$TEST_DIRECTORY/t9135/svn.dump" - ) && - ( - cd simple-svnco && - git init && - git add . && - git fetch ../simple-git master && - git diff --exit-code FETCH_HEAD - ) -' - -test_done diff --git a/third_party/git/t/t9011-svn-da.sh b/third_party/git/t/t9011-svn-da.sh deleted file mode 100755 index ab1ef28fd9..0000000000 --- a/third_party/git/t/t9011-svn-da.sh +++ /dev/null @@ -1,248 +0,0 @@ -#!/bin/sh - -test_description='test parsing of svndiff0 files - -Using the "test-svn-fe -d" helper, check that svn-fe correctly -interprets deltas using various facilities (some from the spec, -some only learned from practice). -' -. ./test-lib.sh - ->empty -printf foo >preimage - -test_expect_success 'reject empty delta' ' - test_must_fail test-svn-fe -d preimage empty 0 -' - -test_expect_success 'delta can empty file' ' - printf "SVNQ" | q_to_nul >clear.delta && - test-svn-fe -d preimage clear.delta 4 >actual && - test_must_be_empty actual -' - -test_expect_success 'reject svndiff2' ' - printf "SVN\002" >bad.filetype && - test_must_fail test-svn-fe -d preimage bad.filetype 4 -' - -test_expect_success 'one-window empty delta' ' - printf "SVNQ%s" "QQQQQ" | q_to_nul >clear.onewindow && - test-svn-fe -d preimage clear.onewindow 9 >actual && - test_must_be_empty actual -' - -test_expect_success 'reject incomplete window header' ' - printf "SVNQ%s" "QQQQQ" | q_to_nul >clear.onewindow && - printf "SVNQ%s" "QQ" | q_to_nul >clear.partialwindow && - test_must_fail test-svn-fe -d preimage clear.onewindow 6 && - test_must_fail test-svn-fe -d preimage clear.partialwindow 6 -' - -test_expect_success 'reject declared delta longer than actual delta' ' - printf "SVNQ%s" "QQQQQ" | q_to_nul >clear.onewindow && - printf "SVNQ%s" "QQ" | q_to_nul >clear.partialwindow && - test_must_fail test-svn-fe -d preimage clear.onewindow 14 && - test_must_fail test-svn-fe -d preimage clear.partialwindow 9 -' - -test_expect_success 'two-window empty delta' ' - printf "SVNQ%s%s" "QQQQQ" "QQQQQ" | q_to_nul >clear.twowindow && - test-svn-fe -d preimage clear.twowindow 14 >actual && - test_must_fail test-svn-fe -d preimage clear.twowindow 13 && - test_must_be_empty actual -' - -test_expect_success 'noisy zeroes' ' - printf "SVNQ%s" \ - "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRQQQQQ" | - tr R "\200" | - q_to_nul >clear.noisy && - len=$(wc -c <clear.noisy) && - test-svn-fe -d preimage clear.noisy $len && - test_must_be_empty actual -' - -test_expect_success 'reject variable-length int in magic' ' - printf "SVNRQ" | tr R "\200" | q_to_nul >clear.badmagic && - test_must_fail test-svn-fe -d preimage clear.badmagic 5 -' - -test_expect_success 'reject truncated integer' ' - printf "SVNQ%s%s" "QQQQQ" "QQQQRRQ" | - tr R "\200" | - q_to_nul >clear.fullint && - printf "SVNQ%s%s" "QQQQQ" "QQQQRR" | - tr RT "\201" | - q_to_nul >clear.partialint && - test_must_fail test-svn-fe -d preimage clear.fullint 15 && - test-svn-fe -d preimage clear.fullint 16 && - test_must_fail test-svn-fe -d preimage clear.partialint 15 -' - -test_expect_success 'nonempty (but unused) preimage view' ' - printf "SVNQ%b" "Q\003QQQ" | q_to_nul >clear.readpreimage && - test-svn-fe -d preimage clear.readpreimage 9 >actual && - test_must_be_empty actual -' - -test_expect_success 'preimage view: right endpoint cannot backtrack' ' - printf "SVNQ%b%b" "Q\003QQQ" "Q\002QQQ" | - q_to_nul >clear.backtrack && - test_must_fail test-svn-fe -d preimage clear.backtrack 14 -' - -test_expect_success 'preimage view: left endpoint can advance' ' - printf "SVNQ%b%b" "Q\003QQQ" "\001\002QQQ" | - q_to_nul >clear.preshrink && - printf "SVNQ%b%b" "Q\003QQQ" "\001\001QQQ" | - q_to_nul >clear.shrinkbacktrack && - test-svn-fe -d preimage clear.preshrink 14 >actual && - test_must_fail test-svn-fe -d preimage clear.shrinkbacktrack 14 && - test_must_be_empty actual -' - -test_expect_success 'preimage view: offsets compared by value' ' - printf "SVNQ%b%b" "\001\001QQQ" "\0200Q\003QQQ" | - q_to_nul >clear.noisybacktrack && - printf "SVNQ%b%b" "\001\001QQQ" "\0200\001\002QQQ" | - q_to_nul >clear.noisyadvance && - test_must_fail test-svn-fe -d preimage clear.noisybacktrack 15 && - test-svn-fe -d preimage clear.noisyadvance 15 && - test_must_be_empty actual -' - -test_expect_success 'preimage view: reject truncated preimage' ' - printf "SVNQ%b" "\010QQQQ" | q_to_nul >clear.lateemptyread && - printf "SVNQ%b" "\010\001QQQ" | q_to_nul >clear.latenonemptyread && - printf "SVNQ%b" "\001\010QQQ" | q_to_nul >clear.longread && - test_must_fail test-svn-fe -d preimage clear.lateemptyread 9 && - test_must_fail test-svn-fe -d preimage clear.latenonemptyread 9 && - test_must_fail test-svn-fe -d preimage clear.longread 9 -' - -test_expect_success 'forbid unconsumed inline data' ' - printf "SVNQ%b%s%b%s" "QQQQ\003" "bar" "QQQQ\001" "x" | - q_to_nul >inline.clear && - test_must_fail test-svn-fe -d preimage inline.clear 18 >actual -' - -test_expect_success 'reject truncated inline data' ' - printf "SVNQ%b%s" "QQQQ\003" "b" | q_to_nul >inline.trunc && - test_must_fail test-svn-fe -d preimage inline.trunc 10 -' - -test_expect_success 'reject truncated inline data (after instruction section)' ' - printf "SVNQ%b%b%s" "QQ\001\001\003" "\0201" "b" | q_to_nul >insn.trunc && - test_must_fail test-svn-fe -d preimage insn.trunc 11 -' - -test_expect_success 'copyfrom_data' ' - echo hi >expect && - printf "SVNQ%b%b%b" "QQ\003\001\003" "\0203" "hi\n" | q_to_nul >copydat && - test-svn-fe -d preimage copydat 13 >actual && - test_cmp expect actual -' - -test_expect_success 'multiple copyfrom_data' ' - echo hi >expect && - printf "SVNQ%b%b%b%b%b" "QQ\003\002\003" "\0201\0202" "hi\n" \ - "QQQ\002Q" "\0200Q" | q_to_nul >copy.multi && - len=$(wc -c <copy.multi) && - test-svn-fe -d preimage copy.multi $len >actual && - test_cmp expect actual -' - -test_expect_success 'incomplete multiple insn' ' - printf "SVNQ%b%b%b" "QQ\003\002\003" "\0203\0200" "hi\n" | - q_to_nul >copy.partial && - len=$(wc -c <copy.partial) && - test_must_fail test-svn-fe -d preimage copy.partial $len -' - -test_expect_success 'catch attempt to copy missing data' ' - printf "SVNQ%b%b%s%b%s" "QQ\002\002\001" "\0201\0201" "X" \ - "QQQQ\002" "YZ" | - q_to_nul >copy.incomplete && - len=$(wc -c <copy.incomplete) && - test_must_fail test-svn-fe -d preimage copy.incomplete $len -' - -test_expect_success 'copyfrom target to repeat data' ' - printf foofoo >expect && - printf "SVNQ%b%b%s" "QQ\006\004\003" "\0203\0100\003Q" "foo" | - q_to_nul >copytarget.repeat && - len=$(wc -c <copytarget.repeat) && - test-svn-fe -d preimage copytarget.repeat $len >actual && - test_cmp expect actual -' - -test_expect_success 'copyfrom target out of order' ' - printf foooof >expect && - printf "SVNQ%b%b%s" \ - "QQ\006\007\003" "\0203\0101\002\0101\001\0101Q" "foo" | - q_to_nul >copytarget.reverse && - len=$(wc -c <copytarget.reverse) && - test-svn-fe -d preimage copytarget.reverse $len >actual && - test_cmp expect actual -' - -test_expect_success 'catch copyfrom future' ' - printf "SVNQ%b%b%s" "QQ\004\004\003" "\0202\0101\002\0201" "XYZ" | - q_to_nul >copytarget.infuture && - len=$(wc -c <copytarget.infuture) && - test_must_fail test-svn-fe -d preimage copytarget.infuture $len -' - -test_expect_success 'copy to sustain' ' - printf XYXYXYXYXYXZ >expect && - printf "SVNQ%b%b%s" "QQ\014\004\003" "\0202\0111Q\0201" "XYZ" | - q_to_nul >copytarget.sustain && - len=$(wc -c <copytarget.sustain) && - test-svn-fe -d preimage copytarget.sustain $len >actual && - test_cmp expect actual -' - -test_expect_success 'catch copy that overflows' ' - printf "SVNQ%b%b%s" "QQ\003\003\001" "\0201\0177Q" X | - q_to_nul >copytarget.overflow && - len=$(wc -c <copytarget.overflow) && - test_must_fail test-svn-fe -d preimage copytarget.overflow $len -' - -test_expect_success 'copyfrom source' ' - printf foo >expect && - printf "SVNQ%b%b" "Q\003\003\002Q" "\003Q" | q_to_nul >copysource.all && - test-svn-fe -d preimage copysource.all 11 >actual && - test_cmp expect actual -' - -test_expect_success 'copy backwards' ' - printf oof >expect && - printf "SVNQ%b%b" "Q\003\003\006Q" "\001\002\001\001\001Q" | - q_to_nul >copysource.rev && - test-svn-fe -d preimage copysource.rev 15 >actual && - test_cmp expect actual -' - -test_expect_success 'offsets are relative to window' ' - printf fo >expect && - printf "SVNQ%b%b%b%b" "Q\003\001\002Q" "\001Q" \ - "\002\001\001\002Q" "\001Q" | - q_to_nul >copysource.two && - test-svn-fe -d preimage copysource.two 18 >actual && - test_cmp expect actual -' - -test_expect_success 'example from notes/svndiff' ' - printf aaaaccccdddddddd >expect && - printf aaaabbbbcccc >source && - printf "SVNQ%b%b%s" "Q\014\020\007\001" \ - "\004Q\004\010\0201\0107\010" d | - q_to_nul >delta.example && - len=$(wc -c <delta.example) && - test-svn-fe -d source delta.example $len >actual && - test_cmp expect actual -' - -test_done diff --git a/third_party/git/t/t9020-remote-svn.sh b/third_party/git/t/t9020-remote-svn.sh deleted file mode 100755 index 6fca08e5e3..0000000000 --- a/third_party/git/t/t9020-remote-svn.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh - -test_description='tests remote-svn' - -. ./test-lib.sh - -MARKSPATH=.git/info/fast-import/remote-svn - -if ! test_have_prereq PYTHON -then - skip_all='skipping remote-svn tests, python not available' - test_done -fi - -# Override svnrdump with our simulator -PATH="$HOME:$PATH" -export PATH PYTHON_PATH GIT_BUILD_DIR - -write_script "$HOME/svnrdump" <<\EOF -exec "$PYTHON_PATH" "$GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py" "$@" -EOF - -init_git () { - rm -fr .git && - git init && - #git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9020/example.svnrdump - # let's reuse an existing dump file!? - git remote add svnsim "testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump" - git remote add svnfile "testsvn::file://$TEST_DIRECTORY/t9154/svn.dump" -} - -if test -e "$GIT_BUILD_DIR/git-remote-testsvn" -then - test_set_prereq REMOTE_SVN -fi - -test_debug ' - git --version - type git - type svnrdump -' - -test_expect_success REMOTE_SVN 'simple fetch' ' - init_git && - git fetch svnsim && - test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master && - cp .git/refs/remotes/svnsim/master master.good -' - -test_debug ' - cat .git/refs/svn/svnsim/master - cat .git/refs/remotes/svnsim/master -' - -test_expect_success REMOTE_SVN 'repeated fetch, nothing shall change' ' - git fetch svnsim && - test_cmp master.good .git/refs/remotes/svnsim/master -' - -test_expect_success REMOTE_SVN 'fetch from a file:// url gives the same result' ' - git fetch svnfile -' - -test_expect_failure REMOTE_SVN 'the sha1 differ because the git-svn-id line in the commit msg contains the url' ' - test_cmp .git/refs/remotes/svnfile/master .git/refs/remotes/svnsim/master -' - -test_expect_success REMOTE_SVN 'mark-file regeneration' ' - # filter out any other marks, that can not be regenerated. Only up to 3 digit revisions are allowed here - grep ":[0-9]\{1,3\} " $MARKSPATH/svnsim.marks > $MARKSPATH/svnsim.marks.old && - rm $MARKSPATH/svnsim.marks && - git fetch svnsim && - test_cmp $MARKSPATH/svnsim.marks.old $MARKSPATH/svnsim.marks -' - -test_expect_success REMOTE_SVN 'incremental imports must lead to the same head' ' - SVNRMAX=3 && - export SVNRMAX && - init_git && - git fetch svnsim && - test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master && - unset SVNRMAX && - git fetch svnsim && - test_cmp master.good .git/refs/remotes/svnsim/master -' - -test_debug 'git branch -a' - -test_done diff --git a/third_party/git/t/t9100-git-svn-basic.sh b/third_party/git/t/t9100-git-svn-basic.sh index 2c309a57d9..e4bb22034e 100755 --- a/third_party/git/t/t9100-git-svn-basic.sh +++ b/third_party/git/t/t9100-git-svn-basic.sh @@ -63,16 +63,16 @@ test_expect_success "$name" ' name='detect node change from file to directory #1' -test_expect_success "$name" " +test_expect_success "$name" ' mkdir dir/new_file && mv dir/file dir/new_file/file && mv dir/new_file dir/file && git update-index --remove dir/file && git update-index --add dir/file/file && - git commit -m '$name' && + git commit -m "$name" && test_must_fail git svn set-tree --find-copies-harder --rmdir \ remotes/git-svn..mybranch -" +' name='detect node change from directory to file #1' @@ -200,17 +200,19 @@ GIT_SVN_ID=alt export GIT_SVN_ID test_expect_success "$name" \ 'git svn init "$svnrepo" && git svn fetch && - git rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a && - git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b && + git log --format="tree %T %s" remotes/git-svn | + awk "!seen[\$0]++ { print \$1, \$2 }" >a && + git log --format="tree %T" alt >b && test_cmp a b' name='check imported tree checksums expected tree checksums' rm -f expected if test_have_prereq UTF8 then - echo tree dc68b14b733e4ec85b04ab6f712340edc5dc936e > expected + echo tree dc68b14b733e4ec85b04ab6f712340edc5dc936e > expected.sha1 + echo tree b95b55b29d771f5eb73aa9b9d52d02fe11a2538c2feb0829f754ce20a91d98eb > expected.sha256 fi -cat >> expected <<\EOF +cat >> expected.sha1 <<\EOF tree c3322890dcf74901f32d216f05c5044f670ce632 tree d3ccd5035feafd17b030c5732e7808cc49122853 tree d03e1630363d4881e68929d532746b20b0986b83 @@ -220,8 +222,20 @@ tree 149d63cd5878155c846e8c55d7d8487de283f89e tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4 EOF +cat >> expected.sha256 <<\EOF +tree 8d12756699d0b5b110514240a0ff141f6cbf8891fd69ab05e5594196fb437c9f +tree 8187168d33f7d4ccb8c1cc6e99532810aaccb47658f35d19b3803072d1128d7a +tree 74e535d85da8ee25eb23d7b506790c5ab3ccdb1ba0826bd57625ed44ef361650 +tree 6fd7dd963e3cdca0cbd6368ed3cfcc8037cc154d2e7719d9d369a0952364fd95 +tree 1fd6cec6aa95102d69266e20419bb62ec2a06372d614b9850ef23ff204103bb4 +tree 6fd7dd963e3cdca0cbd6368ed3cfcc8037cc154d2e7719d9d369a0952364fd95 +tree deb2b7ac79cd8ce6f52af6a5a0a08691e94ba74a2ed55966bb27dbec551730eb +tree 59e2e936761188476a7752034e8aa0a822b34050c8504b0dfd946407f4bc9215 +EOF -test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp expected a" +test_expect_success POSIXPERM,SYMLINKS "$name" ' + test_cmp expected.$(test_oid algo) a +' test_expect_success 'exit if remote refs are ambigious' ' git config --add svn-remote.svn.fetch \ diff --git a/third_party/git/t/t9101-git-svn-props.sh b/third_party/git/t/t9101-git-svn-props.sh index c26c4b0927..8b5681dd68 100755 --- a/third_party/git/t/t9101-git-svn-props.sh +++ b/third_party/git/t/t9101-git-svn-props.sh @@ -160,11 +160,13 @@ cat >create-ignore.expect <<\EOF /no-such-file* EOF -cat >create-ignore-index.expect <<\EOF -100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0 .gitignore -100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0 deeply/.gitignore -100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0 deeply/nested/.gitignore -100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0 deeply/nested/directory/.gitignore +expectoid=$(git hash-object create-ignore.expect) + +cat >create-ignore-index.expect <<EOF +100644 $expectoid 0 .gitignore +100644 $expectoid 0 deeply/.gitignore +100644 $expectoid 0 deeply/nested/.gitignore +100644 $expectoid 0 deeply/nested/directory/.gitignore EOF test_expect_success 'test create-ignore' " diff --git a/third_party/git/t/t9104-git-svn-follow-parent.sh b/third_party/git/t/t9104-git-svn-follow-parent.sh index 5e0ad19177..67eed2fefc 100755 --- a/third_party/git/t/t9104-git-svn-follow-parent.sh +++ b/third_party/git/t/t9104-git-svn-follow-parent.sh @@ -161,6 +161,7 @@ test_expect_success "track initial change if it was only made to parent" ' ' test_expect_success "follow-parent is atomic" ' + record_size=$(($(test_oid rawsz) + 4)) && ( cd wc && svn_cmd up && @@ -186,7 +187,7 @@ test_expect_success "follow-parent is atomic" ' mkdir -p "$GIT_DIR"/svn/refs/remotes/flunk@18 && rev_map=$(cd "$GIT_DIR"/svn/refs/remotes/stunk && ls .rev_map*) && dd if="$GIT_DIR"/svn/refs/remotes/stunk/$rev_map \ - of="$GIT_DIR"/svn/refs/remotes/flunk@18/$rev_map bs=24 count=1 && + of="$GIT_DIR"/svn/refs/remotes/flunk@18/$rev_map bs=$record_size count=1 && rm -rf "$GIT_DIR"/svn/refs/remotes/stunk && git svn init --minimize-url -i flunk "$svnrepo"/flunk && git svn fetch -i flunk && 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 dbe8deac0d..aec45bca3b 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,7 +92,8 @@ test_expect_success 'multiple dcommit from git svn will not clobber svn' " test_expect_success 'check that rebase really failed' ' - test -d .git/rebase-apply + git status >output && + grep currently.rebasing output ' test_expect_success 'resolve, continue the rebase and dcommit' " diff --git a/third_party/git/t/t9108-git-svn-glob.sh b/third_party/git/t/t9108-git-svn-glob.sh index 6990f64364..d5939d4753 100755 --- a/third_party/git/t/t9108-git-svn-glob.sh +++ b/third_party/git/t/t9108-git-svn-glob.sh @@ -48,7 +48,7 @@ test_expect_success 'test refspec globbing' ' "tags/*/src/a:refs/remotes/tags/*" && git svn multi-fetch && git log --pretty=oneline refs/remotes/tags/end >actual && - sed -e "s/^.\{41\}//" actual >output.end && + cut -d" " -f2- actual >output.end && test_cmp expect.end output.end && test "$(git rev-parse refs/remotes/tags/end~1)" = \ "$(git rev-parse refs/remotes/branches/start)" && @@ -84,7 +84,7 @@ test_expect_success 'test left-hand-side only globbing' ' test $(git rev-parse refs/remotes/two/tags/end~3) = \ $(git rev-parse refs/remotes/two/branches/start) && git log --pretty=oneline refs/remotes/two/tags/end >actual && - sed -e "s/^.\{41\}//" actual >output.two && + cut -d" " -f2- actual >output.two && test_cmp expect.two output.two ' diff --git a/third_party/git/t/t9109-git-svn-multi-glob.sh b/third_party/git/t/t9109-git-svn-multi-glob.sh index c1e7542a37..648dcee1ea 100755 --- a/third_party/git/t/t9109-git-svn-multi-glob.sh +++ b/third_party/git/t/t9109-git-svn-multi-glob.sh @@ -48,7 +48,7 @@ test_expect_success 'test refspec globbing' ' "tags/*/src/a:refs/remotes/tags/*" && git svn multi-fetch && git log --pretty=oneline refs/remotes/tags/end >actual && - sed -e "s/^.\{41\}//" actual >output.end && + cut -d" " -f2- actual >output.end && test_cmp expect.end output.end && test "$(git rev-parse refs/remotes/tags/end~1)" = \ "$(git rev-parse refs/remotes/branches/v1/start)" && @@ -84,7 +84,7 @@ test_expect_success 'test left-hand-side only globbing' ' test $(git rev-parse refs/remotes/two/tags/end~3) = \ $(git rev-parse refs/remotes/two/branches/v1/start) && git log --pretty=oneline refs/remotes/two/tags/end >actual && - sed -e "s/^.\{41\}//" actual >output.two && + cut -d" " -f2- actual >output.two && test_cmp expect.two output.two ' cat > expect.four <<EOF @@ -135,7 +135,7 @@ test_expect_success 'test another branch' ' test $(git rev-parse refs/remotes/four/tags/next~2) = \ $(git rev-parse refs/remotes/four/branches/v2/start) && git log --pretty=oneline refs/remotes/four/tags/next >actual && - sed -e "s/^.\{41\}//" actual >output.four && + cut -d" " -f2- actual >output.four && test_cmp expect.four output.four ' diff --git a/third_party/git/t/t9116-git-svn-log.sh b/third_party/git/t/t9116-git-svn-log.sh index 45773ee560..0a9f1ef366 100755 --- a/third_party/git/t/t9116-git-svn-log.sh +++ b/third_party/git/t/t9116-git-svn-log.sh @@ -43,14 +43,18 @@ test_expect_success 'setup repository and import' ' test_expect_success 'run log' " git reset --hard origin/a && - git svn log -r2 origin/trunk | grep ^r2 && - git svn log -r4 origin/trunk | grep ^r4 && - git svn log -r3 | grep ^r3 + 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 " test_expect_success 'run log against a from trunk' " git reset --hard origin/trunk && - git svn log -r3 origin/a | grep ^r3 + git svn log -r3 origin/a >out && + grep ^r3 out " printf 'r1 \nr2 \nr4 \n' > expected-range-r1-r2-r4 diff --git a/third_party/git/t/t9141-git-svn-multiple-branches.sh b/third_party/git/t/t9141-git-svn-multiple-branches.sh index 8e7f7d68b7..bf168a3645 100755 --- a/third_party/git/t/t9141-git-svn-multiple-branches.sh +++ b/third_party/git/t/t9141-git-svn-multiple-branches.sh @@ -90,10 +90,10 @@ test_expect_success 'Multiple branch or tag paths require -d' ' ) && ( cd svn_project && svn_cmd up && - test_must_fail test -d b_one/Nope && - test_must_fail test -d b_two/Nope && - test_must_fail test -d tags_A/Tagless && - test_must_fail test -d tags_B/Tagless + test_path_is_missing b_one/Nope && + test_path_is_missing b_two/Nope && + test_path_is_missing tags_A/Tagless && + test_path_is_missing tags_B/Tagless ) ' diff --git a/third_party/git/t/t9160-git-svn-preserve-empty-dirs.sh b/third_party/git/t/t9160-git-svn-preserve-empty-dirs.sh index 0ede3cfedb..36c6b1a12f 100755 --- a/third_party/git/t/t9160-git-svn-preserve-empty-dirs.sh +++ b/third_party/git/t/t9160-git-svn-preserve-empty-dirs.sh @@ -86,8 +86,8 @@ test_expect_success 'remove non-last entry from directory' ' cd "$GIT_REPO" && git checkout HEAD~2 ) && - test_must_fail test -f "$GIT_REPO"/2/.gitignore && - test_must_fail test -f "$GIT_REPO"/3/.gitignore + test_path_is_missing "$GIT_REPO"/2/.gitignore && + test_path_is_missing "$GIT_REPO"/3/.gitignore ' # After re-cloning the repository with --placeholder-file specified, there diff --git a/third_party/git/t/t9164-git-svn-dcommit-concurrent.sh b/third_party/git/t/t9164-git-svn-dcommit-concurrent.sh index 90346ff4e9..8466269bf5 100755 --- a/third_party/git/t/t9164-git-svn-dcommit-concurrent.sh +++ b/third_party/git/t/t9164-git-svn-dcommit-concurrent.sh @@ -92,7 +92,7 @@ test_expect_success 'check if post-commit hook creates a concurrent commit' ' echo 1 >> file && svn_cmd commit -m "changing file" && svn_cmd up && - test_must_fail test_cmp auto_updated_file au_file_saved + ! test_cmp auto_updated_file au_file_saved ) ' @@ -103,7 +103,7 @@ test_expect_success 'check if pre-commit hook fails' ' echo 2 >> file && svn_cmd commit -m "changing file once again" && echo 3 >> file && - test_must_fail svn_cmd commit -m "this commit should fail" && + ! svn_cmd commit -m "this commit should fail" && svn_cmd revert file ) ' diff --git a/third_party/git/t/t9168-git-svn-partially-globbed-names.sh b/third_party/git/t/t9168-git-svn-partially-globbed-names.sh index bdf6e84999..854b3419b2 100755 --- a/third_party/git/t/t9168-git-svn-partially-globbed-names.sh +++ b/third_party/git/t/t9168-git-svn-partially-globbed-names.sh @@ -49,7 +49,7 @@ test_expect_success 'test refspec prefixed globbing' ' "tags/t_*/src/a:refs/remotes/tags/t_*" && git svn multi-fetch && git log --pretty=oneline refs/remotes/tags/t_end >actual && - sed -e "s/^.\{41\}//" actual >output.end && + cut -d" " -f2- actual >output.end && test_cmp expect.end output.end && test "$(git rev-parse refs/remotes/tags/t_end~1)" = \ "$(git rev-parse refs/remotes/branches/b_start)" && @@ -87,7 +87,7 @@ test_expect_success 'test left-hand-side only prefixed globbing' ' test $(git rev-parse refs/remotes/two/tags/t_end~3) = \ $(git rev-parse refs/remotes/two/branches/b_start) && git log --pretty=oneline refs/remotes/two/tags/t_end >actual && - sed -e "s/^.\{41\}//" actual >output.two && + cut -d" " -f2- actual >output.two && test_cmp expect.two output.two ' @@ -129,7 +129,7 @@ test_expect_success 'test prefixed globs match just prefix' ' test $(git rev-parse refs/remotes/three/tags/t_~1) = \ $(git rev-parse refs/remotes/three/branches/b_) && git log --pretty=oneline refs/remotes/three/tags/t_ >actual && - sed -e "s/^.\{41\}//" actual >output.three && + cut -d" " -f2- actual >output.three && test_cmp expect.three output.three ' @@ -199,7 +199,7 @@ test_expect_success 'test globbing in the middle of the word' ' test $(git rev-parse refs/remotes/five/tags/fghij~1) = \ $(git rev-parse refs/remotes/five/branches/abcde) && git log --pretty=oneline refs/remotes/five/tags/fghij >actual && - sed -e "s/^.\{41\}//" actual >output.five && + cut -d" " -f2- actual >output.five && test_cmp expect.five output.five ' diff --git a/third_party/git/t/t9300-fast-import.sh b/third_party/git/t/t9300-fast-import.sh index 141b7fa35e..308c1ef42c 100755 --- a/third_party/git/t/t9300-fast-import.sh +++ b/third_party/git/t/t9300-fast-import.sh @@ -85,6 +85,36 @@ 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 $ZERO_OID + + tag nested + mark :6 + from :4 + data <<EOF + Tag of our lovely commit + EOF + + reset refs/tags/nested + from $ZERO_OID + + 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 @@ -157,12 +187,19 @@ 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 ' @@ -247,8 +284,9 @@ test_expect_success 'A: verify pack' ' ' test_expect_success 'A: verify diff' ' + copy=$(git rev-parse --verify master:file2) && cat >expect <<-EOF && - :000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A copy-of-file2 + :000000 100755 $ZERO_OID $copy A copy-of-file2 EOF git diff-tree -M -r master verify--import-marks >actual && compare_diff_raw expect actual && @@ -327,7 +365,7 @@ test_expect_success 'B: fail on invalid blob sha1' ' COMMIT from refs/heads/master - M 755 0000000000000000000000000000000000000001 zero1 + M 755 $(echo $ZERO_OID | sed -e "s/0$/1/") zero1 INPUT_END @@ -373,6 +411,34 @@ test_expect_success 'B: accept empty committer' ' test -z "$out" ' +test_expect_success 'B: reject invalid timezone' ' + cat >input <<-INPUT_END && + commit refs/heads/invalid-timezone + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800 + data <<COMMIT + empty commit + COMMIT + INPUT_END + + test_when_finished "git update-ref -d refs/heads/invalid-timezone" && + test_must_fail git fast-import <input +' + +test_expect_success 'B: accept invalid timezone with raw-permissive' ' + cat >input <<-INPUT_END && + commit refs/heads/invalid-timezone + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800 + data <<COMMIT + empty commit + COMMIT + INPUT_END + + git init invalid-timezone && + git -C invalid-timezone fast-import --date-format=raw-permissive <input && + git -C invalid-timezone cat-file -p invalid-timezone >out && + grep "1234567890 [+]051800" out +' + test_expect_success 'B: accept and fixup committer with no name' ' cat >input <<-INPUT_END && commit refs/heads/empty-committer-2 @@ -463,6 +529,7 @@ test_expect_success 'B: fail on invalid committer (5)' ' test_expect_success 'C: incremental import create pack from stdin' ' newf=$(echo hi newf | git hash-object -w --stdin) && oldf=$(git rev-parse --verify master:file2) && + thrf=$(git rev-parse --verify master:file3) && test_tick && cat >input <<-INPUT_END && commit refs/heads/branch @@ -505,10 +572,11 @@ test_expect_success 'C: verify commit' ' ' test_expect_success 'C: validate rename result' ' + zero=$ZERO_OID && cat >expect <<-EOF && - :000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A file2/newf - :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100 file2 file2/oldf - :100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D file3 + :000000 100755 $zero $newf A file2/newf + :100644 100644 $oldf $oldf R100 file2 file2/oldf + :100644 000000 $thrf $zero D file3 EOF git diff-tree -M -r master branch >actual && compare_diff_raw expect actual @@ -549,9 +617,11 @@ test_expect_success 'D: verify pack' ' ' test_expect_success 'D: validate new files added' ' + f5id=$(echo "$file5_data" | git hash-object --stdin) && + f6id=$(echo "$file6_data" | git hash-object --stdin) && cat >expect <<-EOF && - :000000 100755 0000000000000000000000000000000000000000 e74b7d465e52746be2b4bae983670711e6e66657 A newdir/exec.sh - :000000 100644 0000000000000000000000000000000000000000 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 A newdir/interesting + :000000 100755 $ZERO_OID $f6id A newdir/exec.sh + :000000 100644 $ZERO_OID $f5id A newdir/interesting EOF git diff-tree -M -r branch^ branch >actual && compare_diff_raw expect actual @@ -714,12 +784,13 @@ test_expect_success 'H: verify pack' ' ' test_expect_success 'H: validate old files removed, new files added' ' + f4id=$(git rev-parse HEAD:file4) && cat >expect <<-EOF && - :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file2/newf - :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file2/oldf - :100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D file4 - :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100 newdir/interesting h/e/l/lo - :100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D newdir/exec.sh + :100755 000000 $newf $zero D file2/newf + :100644 000000 $oldf $zero D file2/oldf + :100755 000000 $f4id $zero D file4 + :100644 100644 $f5id $f5id R100 newdir/interesting h/e/l/lo + :100755 000000 $f6id $zero D newdir/exec.sh EOF git diff-tree -M -r H^ H >actual && compare_diff_raw expect actual @@ -870,14 +941,15 @@ test_expect_success 'L: verify internal tree sorting' ' INPUT_END cat >expect <<-EXPECT_END && - :100644 100644 4268632... 55d3a52... M b. - :040000 040000 0ae5cac... 443c768... M b - :100644 100644 4268632... 55d3a52... M ba + :100644 100644 M b. + :040000 040000 M b + :100644 100644 M ba EXPECT_END git fast-import <input && GIT_PRINT_SHA1_ELLIPSIS="yes" git diff-tree --abbrev --raw L^ L >output && - test_cmp expect output + cut -d" " -f1,2,5 output >actual && + test_cmp expect actual ' test_expect_success 'L: nested tree copy does not corrupt deltas' ' @@ -939,7 +1011,7 @@ test_expect_success 'M: rename file in same subdirectory' ' INPUT_END cat >expect <<-EOF && - :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf file2/n.e.w.f + :100755 100755 $newf $newf R100 file2/newf file2/n.e.w.f EOF git fast-import <input && git diff-tree -M -r M1^ M1 >actual && @@ -960,7 +1032,7 @@ test_expect_success 'M: rename file to new subdirectory' ' INPUT_END cat >expect <<-EOF && - :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf i/am/new/to/you + :100755 100755 $newf $newf R100 file2/newf i/am/new/to/you EOF git fast-import <input && git diff-tree -M -r M2^ M2 >actual && @@ -981,7 +1053,7 @@ test_expect_success 'M: rename subdirectory to new subdirectory' ' INPUT_END cat >expect <<-EOF && - :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 i/am/new/to/you other/sub/am/new/to/you + :100755 100755 $newf $newf R100 i/am/new/to/you other/sub/am/new/to/you EOF git fast-import <input && git diff-tree -M -r M3^ M3 >actual && @@ -1002,15 +1074,14 @@ test_expect_success 'M: rename root to subdirectory' ' INPUT_END cat >expect <<-EOF && - :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100 file2/oldf sub/file2/oldf - :100755 100755 85df50785d62d3b05ab03d9cbf7e4a0b49449730 85df50785d62d3b05ab03d9cbf7e4a0b49449730 R100 file4 sub/file4 - :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 i/am/new/to/you sub/i/am/new/to/you - :100755 100755 e74b7d465e52746be2b4bae983670711e6e66657 e74b7d465e52746be2b4bae983670711e6e66657 R100 newdir/exec.sh sub/newdir/exec.sh - :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100 newdir/interesting sub/newdir/interesting + :100644 100644 $oldf $oldf R100 file2/oldf sub/file2/oldf + :100755 100755 $f4id $f4id R100 file4 sub/file4 + :100755 100755 $newf $newf R100 i/am/new/to/you sub/i/am/new/to/you + :100755 100755 $f6id $f6id R100 newdir/exec.sh sub/newdir/exec.sh + :100644 100644 $f5id $f5id R100 newdir/interesting sub/newdir/interesting EOF git fast-import <input && git diff-tree -M -r M4^ M4 >actual && - cat actual && compare_diff_raw expect actual ' @@ -1033,7 +1104,7 @@ test_expect_success 'N: copy file in same subdirectory' ' INPUT_END cat >expect <<-EOF && - :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file2/n.e.w.f + :100755 100755 $newf $newf C100 file2/newf file2/n.e.w.f EOF git fast-import <input && git diff-tree -C --find-copies-harder -r N1^ N1 >actual && @@ -1065,9 +1136,9 @@ test_expect_success 'N: copy then modify subdirectory' ' INPUT_END cat >expect <<-EOF && - :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5 - :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf - :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf + :100644 100644 $f5id $f5id C100 newdir/interesting file3/file5 + :100755 100755 $newf $newf C100 file2/newf file3/newf + :100644 100644 $oldf $oldf C100 file2/oldf file3/oldf EOF git fast-import <input && git diff-tree -C --find-copies-harder -r N2^^ N2 >actual && @@ -1098,9 +1169,9 @@ test_expect_success 'N: copy dirty subdirectory' ' ' test_expect_success 'N: copy directory by id' ' - cat >expect <<-\EOF && - :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf - :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf + cat >expect <<-EOF && + :100755 100755 $newf $newf C100 file2/newf file3/newf + :100644 100644 $oldf $oldf C100 file2/oldf file3/oldf EOF subdir=$(git rev-parse refs/heads/branch^0:file2) && cat >input <<-INPUT_END && @@ -1119,9 +1190,9 @@ test_expect_success 'N: copy directory by id' ' ' test_expect_success PIPE 'N: read and copy directory' ' - cat >expect <<-\EOF && - :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf - :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf + cat >expect <<-EOF && + :100755 100755 $newf $newf C100 file2/newf file3/newf + :100644 100644 $oldf $oldf C100 file2/oldf file3/oldf EOF git update-ref -d refs/heads/N4 && rm -f backflow && @@ -1190,9 +1261,9 @@ test_expect_success PIPE 'N: empty directory reads as missing' ' ' test_expect_success 'N: copy root directory by tree hash' ' - cat >expect <<-\EOF && - :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file3/newf - :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file3/oldf + cat >expect <<-EOF && + :100755 000000 $newf $zero D file3/newf + :100644 000000 $oldf $zero D file3/oldf EOF root=$(git rev-parse refs/heads/branch^0^{tree}) && cat >input <<-INPUT_END && @@ -1211,12 +1282,12 @@ test_expect_success 'N: copy root directory by tree hash' ' ' test_expect_success 'N: copy root by path' ' - cat >expect <<-\EOF && - :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf oldroot/file2/newf - :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf oldroot/file2/oldf - :100755 100755 85df50785d62d3b05ab03d9cbf7e4a0b49449730 85df50785d62d3b05ab03d9cbf7e4a0b49449730 C100 file4 oldroot/file4 - :100755 100755 e74b7d465e52746be2b4bae983670711e6e66657 e74b7d465e52746be2b4bae983670711e6e66657 C100 newdir/exec.sh oldroot/newdir/exec.sh - :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting oldroot/newdir/interesting + cat >expect <<-EOF && + :100755 100755 $newf $newf C100 file2/newf oldroot/file2/newf + :100644 100644 $oldf $oldf C100 file2/oldf oldroot/file2/oldf + :100755 100755 $f4id $f4id C100 file4 oldroot/file4 + :100755 100755 $f6id $f6id C100 newdir/exec.sh oldroot/newdir/exec.sh + :100644 100644 $f5id $f5id C100 newdir/interesting oldroot/newdir/interesting EOF cat >input <<-INPUT_END && commit refs/heads/N-copy-root-path @@ -1276,10 +1347,10 @@ test_expect_success 'N: delete directory by copying' ' ' test_expect_success 'N: modify copied tree' ' - cat >expect <<-\EOF && - :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5 - :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf - :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf + cat >expect <<-EOF && + :100644 100644 $f5id $f5id C100 newdir/interesting file3/file5 + :100755 100755 $newf $newf C100 file2/newf file3/newf + :100644 100644 $oldf $oldf C100 file2/oldf file3/oldf EOF subdir=$(git rev-parse refs/heads/branch^0:file2) && cat >input <<-INPUT_END && @@ -2106,12 +2177,27 @@ 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 ' @@ -2125,19 +2211,29 @@ test_expect_success 'R: export-marks feature results in a marks file being creat EOF - cat input | git fast-import && + git fast-import --allow-unsafe-features <input && grep :1 git.marks ' test_expect_success 'R: export-marks options can be overridden by commandline options' ' - cat input | git fast-import --export-marks=other.marks && - grep :1 other.marks + 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 ' 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 + test_must_fail git fast-import --allow-unsafe-features ' test_expect_success 'R: import and output marks can be the same file' ' @@ -2192,7 +2288,8 @@ 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 <<-\EOF && + git fast-import --export-marks=io.marks \ + --allow-unsafe-features <<-\EOF && feature import-marks-if-exists=not_io.marks EOF test_must_be_empty io.marks && @@ -2203,7 +2300,8 @@ test_expect_success 'R: feature import-marks-if-exists' ' echo ":1 $blob" >expect && echo ":2 $blob" >>expect && - git fast-import --export-marks=io.marks <<-\EOF && + git fast-import --export-marks=io.marks \ + --allow-unsafe-features <<-\EOF && feature import-marks-if-exists=io.marks blob mark :2 @@ -2216,7 +2314,8 @@ test_expect_success 'R: feature import-marks-if-exists' ' echo ":3 $blob" >>expect && git fast-import --import-marks=io.marks \ - --export-marks=io.marks <<-\EOF && + --export-marks=io.marks \ + --allow-unsafe-features <<-\EOF && feature import-marks-if-exists=not_io.marks blob mark :3 @@ -2227,7 +2326,8 @@ 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 <<-\EOF && + --export-marks=io.marks \ + --allow-unsafe-features <<-\EOF && feature import-marks-if-exists=io.marks EOF test_must_be_empty io.marks @@ -2239,7 +2339,7 @@ test_expect_success 'R: import to output marks works without any content' ' feature export-marks=marks.new EOF - cat input | git fast-import && + git fast-import --allow-unsafe-features <input && test_cmp marks.out marks.new ' @@ -2249,7 +2349,7 @@ test_expect_success 'R: import marks prefers commandline marks file over the str feature export-marks=marks.new EOF - cat input | git fast-import --import-marks=marks.out && + git fast-import --import-marks=marks.out --allow-unsafe-features <input && test_cmp marks.out marks.new ' @@ -2262,7 +2362,8 @@ 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 <input && + git fast-import --import-marks=one.marks --import-marks=two.marks \ + --allow-unsafe-features <input && test_cmp marks.out combined.marks ' @@ -2275,7 +2376,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 <input && + git fast-import --allow-unsafe-features <input && test_cmp marks.new .git/info/fast-import/relative.out ' @@ -2287,7 +2388,7 @@ test_expect_success 'R: feature no-relative-marks should be honoured' ' feature export-marks=non-relative.out EOF - git fast-import <input && + git fast-import --allow-unsafe-features <input && test_cmp marks.new non-relative.out ' @@ -2440,9 +2541,6 @@ 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 && ( @@ -2557,7 +2655,7 @@ test_expect_success 'R: quiet option results in no stats being output' ' EOF - cat input | git fast-import 2> output && + git fast-import 2>output <input && test_must_be_empty output ' @@ -2635,7 +2733,7 @@ test_expect_success 'R: corrupt lines do not mess marks file' ' rm -f io.marks && blob=$(echo hi | git hash-object --stdin) && cat >expect <<-EOF && - :3 0000000000000000000000000000000000000000 + :3 $ZERO_OID :1 $blob :2 $blob EOF @@ -2781,7 +2879,6 @@ 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 ' @@ -2798,7 +2895,6 @@ test_expect_success 'S: filemodify with garbage after inline must fail' ' inline BLOB EOF - cat err && test_i18ngrep "nvalid dataref" err ' @@ -2812,7 +2908,6 @@ 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 ' @@ -2828,7 +2923,6 @@ 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 ' @@ -2844,7 +2938,6 @@ test_expect_success 'S: notemodify with garbage after inline dataref must fail' note blob BLOB EOF - cat err && test_i18ngrep "nvalid dataref" err ' @@ -2858,7 +2951,6 @@ 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 ' @@ -2874,7 +2966,6 @@ 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 ' @@ -2908,7 +2999,6 @@ test_expect_success 'S: from with garbage after mark must fail' ' EOF # now evaluate the error - cat err && test_i18ngrep "after mark" err ' @@ -2928,7 +3018,6 @@ 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 ' @@ -2944,7 +3033,6 @@ test_expect_success 'S: tag with garbage after mark must fail' ' tag S TAG EOF - cat err && test_i18ngrep "after mark" err ' @@ -2955,7 +3043,6 @@ 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 ' @@ -2966,7 +3053,6 @@ 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 ' @@ -2975,7 +3061,6 @@ 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 ' @@ -2999,7 +3084,7 @@ test_expect_success 'T: delete branch' ' git branch to-delete && git fast-import <<-EOF && reset refs/heads/to-delete - from 0000000000000000000000000000000000000000 + from $ZERO_OID EOF test_must_fail git rev-parse --verify refs/heads/to-delete ' @@ -3039,6 +3124,9 @@ test_expect_success 'U: initialize for U tests' ' INPUT_END + f7id=$(echo "blob 1" | git hash-object --stdin) && + f8id=$(echo "sleep well" | git hash-object --stdin) && + f9id=$(echo "au revoir" | git hash-object --stdin) && git fast-import <input ' @@ -3059,7 +3147,7 @@ test_expect_success 'U: filedelete file succeeds' ' test_expect_success 'U: validate file delete result' ' cat >expect <<-EOF && - :100644 000000 2907ebb4bf85d91bf0716bb3bd8a68ef48d6da76 0000000000000000000000000000000000000000 D good/night.txt + :100644 000000 $f8id $ZERO_OID D good/night.txt EOF git diff-tree -M -r U^1 U >actual && @@ -3084,7 +3172,7 @@ test_expect_success 'U: filedelete directory succeeds' ' test_expect_success 'U: validate directory delete result' ' cat >expect <<-EOF && - :100644 000000 69cb75792f55123d8389c156b0b41c2ff00ed507 0000000000000000000000000000000000000000 D good/bye.txt + :100644 000000 $f9id $ZERO_OID D good/bye.txt EOF git diff-tree -M -r U^1 U >actual && @@ -3109,7 +3197,7 @@ test_expect_success 'U: filedelete root succeeds' ' test_expect_success 'U: validate root delete result' ' cat >expect <<-EOF && - :100644 000000 c18147dc648481eeb65dc5e66628429a64843327 0000000000000000000000000000000000000000 D hello.c + :100644 000000 $f7id $ZERO_OID D hello.c EOF git diff-tree -M -r U^1 U >actual && @@ -3140,13 +3228,22 @@ background_import_then_checkpoint () { exec 9<>V.output rm V.output - git fast-import $options <&8 >&9 & - echo $! >V.pid + ( + 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 # We don't mind if fast-import has already died by the time the test # ends. test_when_finished " exec 8>&-; exec 9>&-; - kill $(cat V.pid) && wait $(cat V.pid) + kill $sh_pid && wait $sh_pid + kill $fi_pid && wait $fi_pid true" # Start in the background to ensure we adhere strictly to (blocking) @@ -3166,6 +3263,9 @@ background_import_then_checkpoint () { then error=0 break + elif test "$output" = "UNEXPECTED" + then + break fi # otherwise ignore cruft echo >&2 "cruft: $output" @@ -3178,7 +3278,7 @@ background_import_then_checkpoint () { } background_import_still_running () { - if ! kill -0 "$(cat V.pid)" + if ! kill -0 "$fi_pid" then echo >&2 "background fast-import terminated too early" false @@ -3319,4 +3419,113 @@ test_expect_success 'X: handling encoding' ' git log -1 --format=%B encoding | grep $(printf "\317\200") ' +### +### series Y (submodules and hash algorithms) +### + +cat >Y-sub-input <<\Y_INPUT_END +blob +mark :1 +data 4 +foo + +reset refs/heads/master +commit refs/heads/master +mark :2 +author Full Name <user@company.tld> 1000000000 +0100 +committer Full Name <user@company.tld> 1000000000 +0100 +data 24 +Test submodule commit 1 +M 100644 :1 file + +blob +mark :3 +data 8 +foo +bar + +commit refs/heads/master +mark :4 +author Full Name <user@company.tld> 1000000001 +0100 +committer Full Name <user@company.tld> 1000000001 +0100 +data 24 +Test submodule commit 2 +from :2 +M 100644 :3 file +Y_INPUT_END + +# Note that the submodule object IDs are intentionally not translated. +cat >Y-main-input <<\Y_INPUT_END +blob +mark :1 +data 4 +foo + +reset refs/heads/master +commit refs/heads/master +mark :2 +author Full Name <user@company.tld> 2000000000 +0100 +committer Full Name <user@company.tld> 2000000000 +0100 +data 14 +Test commit 1 +M 100644 :1 file + +blob +mark :3 +data 73 +[submodule "sub1"] + path = sub1 + url = https://void.example.com/main.git + +commit refs/heads/master +mark :4 +author Full Name <user@company.tld> 2000000001 +0100 +committer Full Name <user@company.tld> 2000000001 +0100 +data 14 +Test commit 2 +from :2 +M 100644 :3 .gitmodules +M 160000 0712c5be7cf681388e355ef47525aaf23aee1a6d sub1 + +blob +mark :5 +data 8 +foo +bar + +commit refs/heads/master +mark :6 +author Full Name <user@company.tld> 2000000002 +0100 +committer Full Name <user@company.tld> 2000000002 +0100 +data 14 +Test commit 3 +from :4 +M 100644 :5 file +M 160000 ff729f5e62f72c0c3978207d9a80e5f3a65f14d7 sub1 +Y_INPUT_END + +cat >Y-marks <<\Y_INPUT_END +:2 0712c5be7cf681388e355ef47525aaf23aee1a6d +:4 ff729f5e62f72c0c3978207d9a80e5f3a65f14d7 +Y_INPUT_END + +test_expect_success 'Y: setup' ' + test_oid_cache <<-EOF + Ymaster sha1:9afed2f9161ddf416c0a1863b8b0725b00070504 + Ymaster sha256:c0a1010da1df187b2e287654793df01b464bd6f8e3f17fc1481a7dadf84caee3 + EOF +' + +test_expect_success 'Y: rewrite submodules' ' + git init main1 && + ( + cd main1 && + git init sub2 && + git -C sub2 fast-import --export-marks=../sub2-marks <../Y-sub-input && + git fast-import --rewrite-submodules-from=sub:../Y-marks \ + --rewrite-submodules-to=sub:sub2-marks <../Y-main-input && + test "$(git rev-parse master)" = "$(test_oid Ymaster)" + ) +' + test_done diff --git a/third_party/git/t/t9301-fast-import-notes.sh b/third_party/git/t/t9301-fast-import-notes.sh index dadc70b7d5..14c1baa739 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 concatentation notes with M command' ' +test_expect_success 'add concatenation notes with M command' ' git fast-import <input && GIT_NOTES_REF=refs/notes/test git log | grep "^ " > actual && @@ -470,12 +470,13 @@ test_expect_success 'add lots of commits and notes' ' ' test_expect_success 'verify that lots of notes trigger a fanout scheme' ' + hexsz=$(test_oid hexsz) && # None of the entries in the top-level notes tree should be a full SHA1 git ls-tree --name-only refs/notes/many_notes | while read path do - if test $(expr length "$path") -ge 40 + if test $(expr length "$path") -ge $hexsz then return 1 fi @@ -518,7 +519,7 @@ test_expect_success 'verify that importing a notes tree respects the fanout sche git ls-tree --name-only refs/notes/other_notes | while read path do - if test $(expr length "$path") -ge 40 + if test $(expr length "$path") -ge $hexsz then return 1 fi @@ -593,7 +594,7 @@ test_expect_success 'verify that changing notes respect existing fanout' ' git ls-tree --name-only refs/notes/many_notes | while read path do - if test $(expr length "$path") -ge 40 + if test $(expr length "$path") -ge $hexsz then return 1 fi @@ -616,7 +617,7 @@ i=$(($num_commits - $remaining_notes)) for sha1 in $(git rev-list -n $i refs/heads/many_commits) do cat >>input <<INPUT_END -N 0000000000000000000000000000000000000000 $sha1 +N $ZERO_OID $sha1 INPUT_END done @@ -646,7 +647,6 @@ test_expect_success 'remove lots of notes' ' ' test_expect_success 'verify that removing notes trigger fanout consolidation' ' - # All entries in the top-level notes tree should be a full SHA1 git ls-tree --name-only -r refs/notes/many_notes | while read path @@ -656,7 +656,7 @@ test_expect_success 'verify that removing notes trigger fanout consolidation' ' test "$path" = "deadbeef" && continue test "$path" = "de/adbeef" && continue - if test $(expr length "$path") -ne 40 + if test $(expr length "$path") -ne $hexsz then return 1 fi diff --git a/third_party/git/t/t9350-fast-export.sh b/third_party/git/t/t9350-fast-export.sh index b4004e05c2..1372842559 100755 --- a/third_party/git/t/t9350-fast-export.sh +++ b/third_party/git/t/t9350-fast-export.sh @@ -53,6 +53,33 @@ 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 && @@ -105,12 +132,12 @@ test_expect_success 'reencoding iso-8859-7' ' sed "s/wer/i18n/" iso-8859-7.fi | (cd new && git fast-import && - # The commit object, if not re-encoded, would be 240 bytes. + # The commit object, if not re-encoded, would be 200 bytes plus hash. # Removing the "encoding iso-8859-7\n" header drops 20 bytes. # Re-encoding the Pi character from \xF0 (\360) in iso-8859-7 # to \xCF\x80 (\317\200) in UTF-8 adds a byte. Check for # the expected size. - test 221 -eq "$(git cat-file -s i18n)" && + test $(($(test_oid hexsz) + 181)) -eq "$(git cat-file -s i18n)" && # ...and for the expected translation of bytes. git cat-file commit i18n >actual && grep $(printf "\317\200") actual && @@ -137,12 +164,12 @@ test_expect_success 'preserving iso-8859-7' ' sed "s/wer/i18n-no-recoding/" iso-8859-7.fi | (cd new && git fast-import && - # The commit object, if not re-encoded, is 240 bytes. + # The commit object, if not re-encoded, is 200 bytes plus hash. # Removing the "encoding iso-8859-7\n" header would drops 20 # bytes. Re-encoding the Pi character from \xF0 (\360) in # iso-8859-7 to \xCF\x80 (\317\200) in UTF-8 adds a byte. # Check for the expected size... - test 240 -eq "$(git cat-file -s i18n-no-recoding)" && + test $(($(test_oid hexsz) + 200)) -eq "$(git cat-file -s i18n-no-recoding)" && # ...as well as the expected byte. git cat-file commit i18n-no-recoding >actual && grep $(printf "\360") actual && @@ -165,7 +192,7 @@ test_expect_success 'encoding preserved if reencoding fails' ' grep ^encoding actual && # Verify that the commit has the expected size; i.e. # that no bytes were re-encoded to a different encoding. - test 252 -eq "$(git cat-file -s i18n-invalid)" && + test $(($(test_oid hexsz) + 212)) -eq "$(git cat-file -s i18n-invalid)" && # ...and check for the original special bytes grep $(printf "\360") actual && grep $(printf "\377") actual) @@ -513,10 +540,41 @@ 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 && @@ -542,9 +600,10 @@ 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 update-index --add \ + git -c core.protectNTFS=false update-index --add \ --cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \ --cacheinfo 100644 $blob "path with \"quote\"" \ --cacheinfo 100644 $blob "path with \\backslash" \ @@ -567,17 +626,15 @@ 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=marks-cur --branches | \ - git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks=marks-new && + 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 && (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=marks-new --branches | \ - git fast-import --export-marks=marks-cur --import-marks=marks-cur + 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 ' cat > expected << EOF @@ -637,7 +694,7 @@ test_expect_success 'delete ref because entire history excluded' ' git fast-export to-delete ^to-delete >actual && cat >expected <<-EOF && reset refs/heads/to-delete - from 0000000000000000000000000000000000000000 + from $ZERO_OID EOF test_cmp expected actual @@ -647,7 +704,7 @@ test_expect_success 'delete refspec' ' git fast-export --refspec :refs/heads/to-delete >actual && cat >expected <<-EOF && reset refs/heads/to-delete - from 0000000000000000000000000000000000000000 + from $ZERO_OID EOF test_cmp expected actual diff --git a/third_party/git/t/t9351-fast-export-anonymize.sh b/third_party/git/t/t9351-fast-export-anonymize.sh index 897dc50907..5ac2c3b5ee 100755 --- a/third_party/git/t/t9351-fast-export-anonymize.sh +++ b/third_party/git/t/t9351-fast-export-anonymize.sh @@ -6,15 +6,24 @@ test_description='basic tests for fast-export --anonymize' test_expect_success 'setup simple repo' ' test_commit base && test_commit foo && + test_commit retain-me && git checkout -b other HEAD^ && mkdir subdir && test_commit subdir/bar && test_commit subdir/xyzzy && + fake_commit=$(echo $ZERO_OID | sed s/0/a/) && + git update-index --add --cacheinfo 160000,$fake_commit,link1 && + git update-index --add --cacheinfo 160000,$fake_commit,link2 && + git commit -m "add gitlink" && git tag -m "annotated tag" mytag ' test_expect_success 'export anonymized stream' ' - git fast-export --anonymize --all >stream + git fast-export --anonymize --all \ + --anonymize-map=retain-me \ + --anonymize-map=xyzzy:custom-name \ + --anonymize-map=other \ + >stream ' # this also covers commit messages @@ -26,12 +35,23 @@ test_expect_success 'stream omits path names' ' ! grep xyzzy stream ' -test_expect_success 'stream allows master as refname' ' - grep master stream +test_expect_success 'stream contains user-specified names' ' + grep retain-me stream && + grep custom-name stream +' + +test_expect_success 'stream omits gitlink oids' ' + # avoid relying on the whole oid to remain hash-agnostic; this is + # plenty to be unique within our test case + ! grep a000000000000000000 stream +' + +test_expect_success 'stream retains other as refname' ' + grep other stream ' test_expect_success 'stream omits other refnames' ' - ! grep other stream && + ! grep master stream && ! grep mytag stream ' @@ -57,7 +77,8 @@ test_expect_success 'import stream to new repository' ' test_expect_success 'result has two branches' ' git for-each-ref --format="%(refname)" refs/heads >branches && test_line_count = 2 branches && - other_branch=$(grep -v refs/heads/master branches) + other_branch=refs/heads/other && + main_branch=$(grep -v $other_branch branches) ' test_expect_success 'repo has original shape and timestamps' ' @@ -65,34 +86,35 @@ test_expect_success 'repo has original shape and timestamps' ' git log --format="%m %ct" --left-right --boundary "$@" } && (cd .. && shape master...other) >expect && - shape master...$other_branch >actual && + shape $main_branch...$other_branch >actual && test_cmp expect actual ' test_expect_success 'root tree has original shape' ' # the output entries are not necessarily in the same - # order, but we know at least that we will have one tree - # and one blob, so just check the sorted order - cat >expect <<-\EOF && - blob - tree - EOF + # order, but we should at least have the same set of + # object types. + git -C .. ls-tree HEAD >orig-root && + cut -d" " -f2 <orig-root | sort >expect && git ls-tree $other_branch >root && cut -d" " -f2 <root | sort >actual && test_cmp expect actual ' test_expect_success 'paths in subdir ended up in one tree' ' - cat >expect <<-\EOF && - blob - blob - EOF + git -C .. ls-tree other:subdir >orig-subdir && + cut -d" " -f2 <orig-subdir | sort >expect && tree=$(grep tree root | cut -f2) && git ls-tree $other_branch:$tree >tree && cut -d" " -f2 <tree >actual && test_cmp expect actual ' +test_expect_success 'identical gitlinks got identical oid' ' + awk "/commit/ { print \$3 }" <root | sort -u >commits && + test_line_count = 1 commits +' + test_expect_success 'tag points to branch tip' ' git rev-parse $other_branch >expect && git for-each-ref --format="%(*objectname)" | grep . >actual && diff --git a/third_party/git/t/t9400-git-cvsserver-server.sh b/third_party/git/t/t9400-git-cvsserver-server.sh index a5e5dca753..4a46f31c41 100755 --- a/third_party/git/t/t9400-git-cvsserver-server.sh +++ b/third_party/git/t/t9400-git-cvsserver-server.sh @@ -603,7 +603,7 @@ test_expect_success 'cvs server does not run with vanilla git-shell' ' cd cvswork && CVS_SERVER=$WORKDIR/remote-cvs && export CVS_SERVER && - test_must_fail cvs log merge + ! cvs log merge ) ' diff --git a/third_party/git/t/t9401-git-cvsserver-crlf.sh b/third_party/git/t/t9401-git-cvsserver-crlf.sh index 84787eee9a..c7a0dd84a4 100755 --- a/third_party/git/t/t9401-git-cvsserver-crlf.sh +++ b/third_party/git/t/t9401-git-cvsserver-crlf.sh @@ -167,10 +167,10 @@ test_expect_success 'adding files' ' test_expect_success 'updating' ' git pull gitcvs.git && - echo 'hi' > subdir/newfile.bin && - echo 'junk' > subdir/file.h && - echo 'hi' > subdir/newfile.c && - echo 'hello' >> binfile.bin && + echo "hi" >subdir/newfile.bin && + echo "junk" >subdir/file.h && + echo "hi" >subdir/newfile.c && + echo "hello" >>binfile.bin && git add subdir/newfile.bin subdir/file.h subdir/newfile.c binfile.bin && git commit -q -m "Add and change some files" && git push gitcvs.git >/dev/null && diff --git a/third_party/git/t/t9402-git-cvsserver-refs.sh b/third_party/git/t/t9402-git-cvsserver-refs.sh index cf31ace667..6436c91a3c 100755 --- a/third_party/git/t/t9402-git-cvsserver-refs.sh +++ b/third_party/git/t/t9402-git-cvsserver-refs.sh @@ -178,7 +178,7 @@ test_expect_success 'setup v1.2 on b1' ' mkdir cdir && echo "cdir/cfile" >cdir/cfile && git add -A cdir adir t3 t2 && - git commit -q -m 'v1.2' && + git commit -q -m "v1.2" && git tag v1.2 && git push --tags gitcvs.git b1:b1 ' diff --git a/third_party/git/t/t9500-gitweb-standalone-no-errors.sh b/third_party/git/t/t9500-gitweb-standalone-no-errors.sh index cc8d463e01..b484e3e250 100755 --- a/third_party/git/t/t9500-gitweb-standalone-no-errors.sh +++ b/third_party/git/t/t9500-gitweb-standalone-no-errors.sh @@ -53,7 +53,7 @@ test_expect_success \ test_expect_success \ 'Make initial commit' \ - 'echo "Not an empty file." > file && + 'echo "Not an empty file." >file && git add file && git commit -a -m "Initial commit." && git branch b' @@ -139,7 +139,7 @@ test_expect_success \ test_expect_success \ 'commitdiff(0): file added' \ - 'echo "New file" > new_file && + 'echo "New file" >new_file && git add new_file && git commit -a -m "File added." && gitweb_run "p=.git;a=commitdiff"' @@ -179,7 +179,7 @@ test_expect_success \ test_expect_success \ 'commitdiff(0): mode change and modified' \ - 'echo "New line" >> file2 && + 'echo "New line" >>file2 && test_chmod +x file2 && git commit -a -m "Mode change and modification." && gitweb_run "p=.git;a=commitdiff"' @@ -197,14 +197,14 @@ propter nomen suum. EOF git commit -a -m "File added." && git mv file2 file3 && - echo "Propter nomen suum." >> file3 && + echo "Propter nomen suum." >>file3 && git commit -a -m "File rename and modification." && gitweb_run "p=.git;a=commitdiff"' test_expect_success \ 'commitdiff(0): renamed, mode change and modified' \ 'git mv file3 file2 && - echo "Propter nomen suum." >> file2 && + echo "Propter nomen suum." >>file2 && test_chmod +x file2 && git commit -a -m "File rename, mode change and modification." && gitweb_run "p=.git;a=commitdiff"' @@ -213,8 +213,8 @@ test_expect_success \ # commitdiff testing (taken from t4114-apply-typechange.sh) test_expect_success 'setup typechange commits' ' - echo "hello world" > foo && - echo "hi planet" > bar && + echo "hello world" >foo && + echo "hi planet" >bar && git update-index --add foo bar && git commit -m initial && git branch initial && @@ -223,18 +223,18 @@ test_expect_success 'setup typechange commits' ' git commit -m "foo symlinked to bar" && git branch foo-symlinked-to-bar && rm -f foo && - echo "how far is the sun?" > foo && + echo "how far is the sun?" >foo && git update-index foo && git commit -m "foo back to file" && git branch foo-back-to-file && rm -f foo && git update-index --remove foo && mkdir foo && - echo "if only I knew" > foo/baz && + echo "if only I knew" >foo/baz && git update-index --add foo/baz && git commit -m "foo becomes a directory" && git branch "foo-becomes-a-directory" && - echo "hello world" > foo/baz && + echo "hello world" >foo/baz && git update-index foo/baz && git commit -m "foo/baz is the original foo" && git branch foo-baz-renamed-from-foo @@ -324,7 +324,7 @@ test_expect_success 'commitdiff(1): removal of incomplete line' ' test_expect_success \ 'Create a merge' \ 'git checkout b && - echo "Branch" >> b && + echo "Branch" >>b && git add b && git commit -a -m "On branch" && git checkout master && @@ -342,26 +342,26 @@ test_expect_success \ test_expect_success \ 'Prepare large commit' \ 'git checkout b && - echo "To be changed" > 01-change && - echo "To be renamed" > 02-pure-rename-from && - echo "To be deleted" > 03-delete && - echo "To be renamed and changed" > 04-rename-from && - echo "To have mode changed" > 05-mode-change && - echo "File to symlink" > 06-file-or-symlink && - echo "To be changed and have mode changed" > 07-change-mode-change && + echo "To be changed" >01-change && + echo "To be renamed" >02-pure-rename-from && + echo "To be deleted" >03-delete && + echo "To be renamed and changed" >04-rename-from && + echo "To have mode changed" >05-mode-change && + echo "File to symlink" >06-file-or-symlink && + echo "To be changed and have mode changed" >07-change-mode-change && git add 0* && git commit -a -m "Prepare large commit" && - echo "Changed" > 01-change && + echo "Changed" >01-change && git mv 02-pure-rename-from 02-pure-rename-to && git rm 03-delete && rm -f 03-delete && - echo "A new file" > 03-new && + echo "A new file" >03-new && git add 03-new && git mv 04-rename-from 04-rename-to && - echo "Changed" >> 04-rename-to && + echo "Changed" >>04-rename-to && test_chmod +x 05-mode-change && rm -f 06-file-or-symlink && test_ln_s_add 01-change 06-file-or-symlink && - echo "Changed and have mode changed" > 07-change-mode-change && + echo "Changed and have mode changed" >07-change-mode-change && test_chmod +x 07-change-mode-change && git commit -a -m "Large commit" && git checkout master' @@ -444,7 +444,7 @@ test_expect_success \ test_expect_success \ 'logs: history (implicit HEAD, deleted file)' \ 'git checkout master && - echo "to be deleted" > deleted_file && + echo "to be deleted" >deleted_file && git add deleted_file && git commit -m "Add file to be deleted" && git rm deleted_file && @@ -522,7 +522,7 @@ test_expect_success \ '. "$TEST_DIRECTORY"/t3901/utf8.txt && test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" && test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" && - echo "UTF-8" >> file && + echo "UTF-8" >>file && git add file && git commit -F "$TEST_DIRECTORY"/t3900/1-UTF-8.txt && gitweb_run "p=.git;a=commit"' @@ -532,7 +532,7 @@ test_expect_success \ '. "$TEST_DIRECTORY"/t3901/8859-1.txt && test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" && test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" && - echo "ISO-8859-1" >> file && + echo "ISO-8859-1" >>file && git add file && test_config i18n.commitencoding ISO-8859-1 && git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt && @@ -621,12 +621,22 @@ test_expect_success \ git config gitweb.snapshot "zip,tgz, tbz2" && gitweb_run "p=.git;a=tree"' -cat >.git/config <<\EOF -# testing noval and alternate separator -[gitweb] - blame - snapshot = zip tgz -EOF +test_expect_success 'setup' ' + version=$(git config core.repositoryformatversion) && + algo=$(test_might_fail git config extensions.objectformat) && + cat >.git/config <<-\EOF && + # testing noval and alternate separator + [gitweb] + blame + snapshot = zip tgz + EOF + git config core.repositoryformatversion "$version" && + if test -n "$algo" + then + git config extensions.objectformat "$algo" + fi +' + test_expect_success \ 'config override: tree view, features enabled in repo config (2)' \ 'gitweb_run "p=.git;a=tree"' @@ -675,8 +685,8 @@ test_expect_success \ test_expect_success \ 'README.html with non-ASCII characters (utf-8)' \ - 'echo "<b>UTF-8 example:</b><br />" > .git/README.html && - cat "$TEST_DIRECTORY"/t3900/1-UTF-8.txt >> .git/README.html && + 'echo "<b>UTF-8 example:</b><br />" >.git/README.html && + cat "$TEST_DIRECTORY"/t3900/1-UTF-8.txt >>.git/README.html && gitweb_run "p=.git;a=summary"' # ---------------------------------------------------------------------- @@ -704,7 +714,7 @@ test_expect_success HIGHLIGHT \ test_expect_success HIGHLIGHT \ 'syntax highlighting (highlighted, shell script)' \ 'git config gitweb.highlight yes && - echo "#!/usr/bin/sh" > test.sh && + echo "#!/usr/bin/sh" >test.sh && git add test.sh && git commit -m "Add test.sh" && gitweb_run "p=.git;a=blob;f=test.sh"' @@ -712,7 +722,7 @@ test_expect_success HIGHLIGHT \ test_expect_success HIGHLIGHT \ 'syntax highlighting (highlighter language autodetection)' \ 'git config gitweb.highlight yes && - echo "#!/usr/bin/perl" > test && + echo "#!/usr/bin/perl" >test && git add test && git commit -m "Add test" && gitweb_run "p=.git;a=blob;f=test"' @@ -729,11 +739,11 @@ test_expect_success \ 'git init --bare foo.git && git --git-dir=foo.git --work-tree=. add file && git --git-dir=foo.git --work-tree=. commit -m "Initial commit" && - echo "foo" > foo.git/description && + echo "foo" >foo.git/description && mkdir -p foo && (cd foo && git clone --shared --bare ../foo.git foo-forked.git && - echo "fork of foo" > foo-forked.git/description)' + echo "fork of foo" >foo-forked.git/description)' test_expect_success \ 'forks: projects list' \ @@ -754,8 +764,8 @@ EOF test_expect_success \ 'ctags: tag cloud in projects list' \ 'mkdir .git/ctags && - echo "2" > .git/ctags/foo && - echo "1" > .git/ctags/bar && + echo "2" >.git/ctags/foo && + echo "1" >.git/ctags/bar && gitweb_run' test_expect_success \ @@ -769,8 +779,8 @@ test_expect_success \ test_expect_success \ 'ctags: malformed tag weights' \ 'mkdir -p .git/ctags && - echo "not-a-number" > .git/ctags/nan && - echo "not-a-number-2" > .git/ctags/nan2 && + echo "not-a-number" >.git/ctags/nan && + echo "not-a-number-2" >.git/ctags/nan2 && echo "0.1" >.git/ctags/floating-point && gitweb_run' 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 0796a438bc..e38cbc97d3 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 $1..." && - gitweb_run "$1" && + echo >&2 "Checking $*..." && + gitweb_run "$@" && if grep "$TAG" gitweb.body; then echo >&2 "xss: $TAG should have been quoted in output" return 1 @@ -200,7 +200,8 @@ xss() { test_expect_success 'xss checks' ' TAG="<magic-xss-tag>" && xss "a=rss&p=$TAG" && - xss "a=rss&p=foo.git&f=$TAG" + xss "a=rss&p=foo.git&f=$TAG" && + xss "" "$TAG+" ' test_done diff --git a/third_party/git/t/t9700/test.pl b/third_party/git/t/t9700/test.pl index 34cd01366f..e046f7db76 100755 --- a/third_party/git/t/t9700/test.pl +++ b/third_party/git/t/t9700/test.pl @@ -23,6 +23,8 @@ sub adjust_dirsep { return $path; } +my $oid_re = qr/^[0-9a-fA-F]{40}(?:[0-9a-fA-F]{24})?$/; + BEGIN { use_ok('Git') } # set up @@ -59,15 +61,15 @@ ok($@, "config_bool: non-boolean values fail"); open STDERR, ">&", $tmpstderr or die "cannot restore STDERR"; # ident -like($r->ident("aUthor"), qr/^A U Thor <author\@example.com> [0-9]+ \+0000$/, +like($r->ident("aUthor"), qr/^A U Thor <author\@example.com> [0-9]+ [+-]\d{4}$/, "ident scalar: author (type)"); -like($r->ident("cOmmitter"), qr/^C O Mitter <committer\@example.com> [0-9]+ \+0000$/, +like($r->ident("cOmmitter"), qr/^C O Mitter <committer\@example.com> [0-9]+ [+-]\d{4}$/, "ident scalar: committer (type)"); is($r->ident("invalid"), "invalid", "ident scalar: invalid ident string (no parsing)"); my ($name, $email, $time_tz) = $r->ident('author'); is_deeply([$name, $email], ["A U Thor", "author\@example.com"], "ident array: author"); -like($time_tz, qr/[0-9]+ \+0000/, "ident array: author"); +like($time_tz, qr/[0-9]+ [+-]\d{4}/, "ident array: author"); is_deeply([$r->ident("Name <email> 123 +0000")], ["Name", "email", "123 +0000"], "ident array: ident string"); is_deeply([$r->ident("invalid")], [], "ident array: invalid ident string"); @@ -93,7 +95,7 @@ is(Git::hash_object("blob", $tmpfile), $file1hash, "hash_object: roundtrip"); open TEMPFILE, ">$tmpfile" or die "Can't open $tmpfile: $!"; print TEMPFILE my $test_text = "test blob, to be inserted\n"; close TEMPFILE or die "Failed writing to $tmpfile: $!"; -like(our $newhash = $r->hash_and_insert_object($tmpfile), qr/[0-9a-fA-F]{40}/, +like(our $newhash = $r->hash_and_insert_object($tmpfile), $oid_re, "hash_and_insert_object: returns hash"); open TEMPFILE, "+>$tmpfile" or die "Can't open $tmpfile: $!"; is($r->cat_blob($newhash, \*TEMPFILE), length $test_text, "cat_blob: roundtrip size"); @@ -119,7 +121,7 @@ is($r2->wc_subdir, "directory2/", "wc_subdir initial (2)"); # commands in sub directory my $last_commit = $r2->command_oneline(qw(rev-parse --verify HEAD)); -like($last_commit, qr/^[0-9a-fA-F]{40}$/, 'rev-parse returned hash'); +like($last_commit, $oid_re, 'rev-parse returned hash'); my $dir_commit = $r2->command_oneline('log', '-n1', '--pretty=format:%H', '.'); isnt($last_commit, $dir_commit, 'log . does not show last commit'); diff --git a/third_party/git/t/t9800-git-p4-basic.sh b/third_party/git/t/t9800-git-p4-basic.sh index 5856563068..c98c1dfc23 100755 --- a/third_party/git/t/t9800-git-p4-basic.sh +++ b/third_party/git/t/t9800-git-p4-basic.sh @@ -202,7 +202,6 @@ 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 3cff1fce1b..9c9710d8c7 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 overlayed together? +# What happens when two files of the same name are overlaid 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 57b533dc6f..e3836888ec 100755 --- a/third_party/git/t/t9810-git-p4-rcs.sh +++ b/third_party/git/t/t9810-git-p4-rcs.sh @@ -294,7 +294,6 @@ 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/t9819-git-p4-case-folding.sh b/third_party/git/t/t9819-git-p4-case-folding.sh index 600ce1e0b0..b4d93f0c17 100755 --- a/third_party/git/t/t9819-git-p4-case-folding.sh +++ b/third_party/git/t/t9819-git-p4-case-folding.sh @@ -30,7 +30,7 @@ test_expect_success 'Check p4 is in case-folding mode' ' cd "$cli" && >lc/FILE.TXT && p4 add lc/FILE.TXT && - test_must_fail p4 submit -d "Cannot add file differing only in case" lc/FILE.TXT + ! p4 submit -d "Cannot add file differing only in case" lc/FILE.TXT ) ' diff --git a/third_party/git/t/t9831-git-p4-triggers.sh b/third_party/git/t/t9831-git-p4-triggers.sh index d743ca33ee..ff6c0352e6 100755 --- a/third_party/git/t/t9831-git-p4-triggers.sh +++ b/third_party/git/t/t9831-git-p4-triggers.sh @@ -58,7 +58,7 @@ test_expect_success 'import with extra info lines from verbose p4 trigger' ' ( cd "$git" && git p4 sync - )&& + ) && ( p4 triggers -i <<-EOF Triggers: diff --git a/third_party/git/t/t9832-unshelve.sh b/third_party/git/t/t9832-unshelve.sh index e9276c48f4..7194fb2855 100755 --- a/third_party/git/t/t9832-unshelve.sh +++ b/third_party/git/t/t9832-unshelve.sh @@ -29,8 +29,11 @@ test_expect_success 'init depot' ' ) ' +# Create an initial clone, with a commit unrelated to the P4 change +# on HEAD test_expect_success 'initial clone' ' - git p4 clone --dest="$git" //depot/@all + git p4 clone --dest="$git" //depot/@all && + test_commit -C "$git" "unrelated" ' test_expect_success 'create shelved changelist' ' diff --git a/third_party/git/t/t9834-git-p4-file-dir-bug.sh b/third_party/git/t/t9834-git-p4-file-dir-bug.sh new file mode 100755 index 0000000000..dac67e89d7 --- /dev/null +++ b/third_party/git/t/t9834-git-p4-file-dir-bug.sh @@ -0,0 +1,70 @@ +#!/bin/sh + +test_description='git p4 directory/file bug handling + +This test creates files and directories with the same name in perforce and +checks that git-p4 recovers from the error at the same time as the perforce +repository.' + +. ./lib-git-p4.sh + +test_expect_success 'start p4d' ' + start_p4d && + { p4 configure set submit.collision.check=0 || :; } +' + +test_expect_success 'init depot' ' + ( + cd "$cli" && + + touch add_file_add_dir_del_file add_file_add_dir_del_dir && + p4 add add_file_add_dir_del_file add_file_add_dir_del_dir && + mkdir add_dir_add_file_del_file add_dir_add_file_del_dir && + touch add_dir_add_file_del_file/file add_dir_add_file_del_dir/file && + p4 add add_dir_add_file_del_file/file add_dir_add_file_del_dir/file && + p4 submit -d "add initial" && + + rm -f add_file_add_dir_del_file add_file_add_dir_del_dir && + mkdir add_file_add_dir_del_file add_file_add_dir_del_dir && + touch add_file_add_dir_del_file/file add_file_add_dir_del_dir/file && + p4 add add_file_add_dir_del_file/file add_file_add_dir_del_dir/file && + rm -rf add_dir_add_file_del_file add_dir_add_file_del_dir && + touch add_dir_add_file_del_file add_dir_add_file_del_dir && + p4 add add_dir_add_file_del_file add_dir_add_file_del_dir && + p4 submit -d "add conflicting" && + + p4 delete -k add_file_add_dir_del_file && + p4 delete -k add_file_add_dir_del_dir/file && + p4 delete -k add_dir_add_file_del_file && + p4 delete -k add_dir_add_file_del_dir/file && + p4 submit -d "delete conflicting" && + + p4 delete -k "add_file_add_dir_del_file/file" && + p4 delete -k "add_file_add_dir_del_dir" && + p4 delete -k "add_dir_add_file_del_file/file" && + p4 delete -k "add_dir_add_file_del_dir" && + p4 submit -d "delete remaining" + ) +' + +test_expect_success 'clone with git-p4' ' + git p4 clone --dest="$git" //depot/@1,3 +' + +test_expect_success 'check contents' ' + test_path_is_dir "$git/add_file_add_dir_del_file" && + test_path_is_file "$git/add_file_add_dir_del_dir" && + test_path_is_dir "$git/add_dir_add_file_del_file" && + test_path_is_file "$git/add_dir_add_file_del_dir" +' + +test_expect_success 'rebase and check empty' ' + git -C "$git" p4 rebase && + + test_path_is_missing "$git/add_file_add_dir_del_file" && + test_path_is_missing "$git/add_file_add_dir_del_dir" && + test_path_is_missing "$git/add_dir_add_file_del_file" && + test_path_is_missing "$git/add_dir_add_file_del_dir" +' + +test_done diff --git a/third_party/git/t/t9902-completion.sh b/third_party/git/t/t9902-completion.sh index 75512c3403..7b7bc6e4bd 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", -# "filter-branch" and "ls-files" are listed for this. +# "rebase" and "ls-files" are listed for this. -GIT_TESTING_ALL_COMMAND_LIST='add checkout check-attr filter-branch ls-files' -GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout filter-branch' +GIT_TESTING_ALL_COMMAND_LIST='add checkout check-attr rebase ls-files' +GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout rebase' . "$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 cant find repo' ' +test_expect_success '__gitdir - returns error when cannot find repo' ' ( __git_dir="non-existing" && test_must_fail __gitdir >"$actual" @@ -494,7 +494,7 @@ test_expect_success '__gitcomp - prefix' ' ' test_expect_success '__gitcomp - suffix' ' - test_gitcomp "branch.me" "master maint next pu" "branch." \ + test_gitcomp "branch.me" "master maint next seen" "branch." \ "ma" "." <<-\EOF branch.master.Z branch.maint.Z @@ -542,37 +542,37 @@ test_expect_success '__gitcomp - doesnt fail because of invalid variable name' ' ' read -r -d "" refs <<-\EOF +main maint -master next -pu +seen EOF test_expect_success '__gitcomp_nl - trailing space' ' test_gitcomp_nl "m" "$refs" <<-EOF + main Z maint Z - master Z EOF ' test_expect_success '__gitcomp_nl - prefix' ' test_gitcomp_nl "--fixup=m" "$refs" "--fixup=" "m" <<-EOF + --fixup=main Z --fixup=maint Z - --fixup=master Z EOF ' test_expect_success '__gitcomp_nl - suffix' ' test_gitcomp_nl "branch.ma" "$refs" "branch." "ma" "." <<-\EOF + branch.main.Z branch.maint.Z - branch.master.Z EOF ' test_expect_success '__gitcomp_nl - no suffix' ' test_gitcomp_nl "ma" "$refs" "" "ma" "" <<-\EOF + mainZ maintZ - masterZ EOF ' @@ -945,7 +945,7 @@ test_expect_success 'setup for filtering matching refs' ' rm -f .git/FETCH_HEAD ' -test_expect_success '__git_refs - dont filter refs unless told so' ' +test_expect_success '__git_refs - do not filter refs unless told so' ' cat >expected <<-EOF && HEAD master @@ -1240,6 +1240,461 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified & prefix' ' test_cmp expected out ' +test_expect_success 'git switch - with no options, complete local branches and unique remote branch names for DWIM logic' ' + test_completion "git switch " <<-\EOF + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + EOF +' + +test_expect_success 'git checkout - completes refs and unique remote branches for DWIM' ' + test_completion "git checkout " <<-\EOF + HEAD Z + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git switch - with --no-guess, complete only local branches' ' + test_completion "git switch --no-guess " <<-\EOF + master Z + matching-branch Z + EOF +' + +test_expect_success 'git switch - with GIT_COMPLETION_CHECKOUT_NO_GUESS=1, complete only local branches' ' + GIT_COMPLETION_CHECKOUT_NO_GUESS=1 test_completion "git switch " <<-\EOF + master Z + matching-branch Z + EOF +' + +test_expect_success 'git switch - --guess overrides GIT_COMPLETION_CHECKOUT_NO_GUESS=1, complete local branches and unique remote names for DWIM logic' ' + GIT_COMPLETION_CHECKOUT_NO_GUESS=1 test_completion "git switch --guess " <<-\EOF + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + EOF +' + +test_expect_success 'git switch - a later --guess overrides previous --no-guess, complete local and remote unique branches for DWIM' ' + test_completion "git switch --no-guess --guess " <<-\EOF + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + EOF +' + +test_expect_success 'git switch - a later --no-guess overrides previous --guess, complete only local branches' ' + test_completion "git switch --guess --no-guess " <<-\EOF + master Z + matching-branch Z + EOF +' + +test_expect_success 'git checkout - with GIT_COMPLETION_NO_GUESS=1 only completes refs' ' + GIT_COMPLETION_CHECKOUT_NO_GUESS=1 test_completion "git checkout " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - --guess overrides GIT_COMPLETION_NO_GUESS=1, complete refs and unique remote branches for DWIM' ' + GIT_COMPLETION_CHECKOUT_NO_GUESS=1 test_completion "git checkout --guess " <<-\EOF + HEAD Z + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - with --no-guess, only completes refs' ' + test_completion "git checkout --no-guess " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - a later --guess overrides previous --no-guess, complete refs and unique remote branches for DWIM' ' + test_completion "git checkout --no-guess --guess " <<-\EOF + HEAD Z + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - a later --no-guess overrides previous --guess, complete only refs' ' + test_completion "git checkout --guess --no-guess " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git switch - with --detach, complete all references' ' + test_completion "git switch --detach " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - with --detach, complete only references' ' + test_completion "git checkout --detach " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git switch - with -d, complete all references' ' + test_completion "git switch -d " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - with -d, complete only references' ' + test_completion "git checkout -d " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git switch - with --track, complete only remote branches' ' + test_completion "git switch --track " <<-\EOF + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - with --track, complete only remote branches' ' + test_completion "git checkout --track " <<-\EOF + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git switch - with --no-track, complete only local branch names' ' + test_completion "git switch --no-track " <<-\EOF + master Z + matching-branch Z + EOF +' + +test_expect_success 'git checkout - with --no-track, complete only local references' ' + test_completion "git checkout --no-track " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git switch - with -c, complete all references' ' + test_completion "git switch -c new-branch " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git switch - with -C, complete all references' ' + test_completion "git switch -C new-branch " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git switch - with -c and --track, complete all references' ' + test_completion "git switch -c new-branch --track " <<-EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git switch - with -C and --track, complete all references' ' + test_completion "git switch -C new-branch --track " <<-EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git switch - with -c and --no-track, complete all references' ' + test_completion "git switch -c new-branch --no-track " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git switch - with -C and --no-track, complete all references' ' + test_completion "git switch -C new-branch --no-track " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - with -b, complete all references' ' + test_completion "git checkout -b new-branch " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - with -B, complete all references' ' + test_completion "git checkout -B new-branch " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - with -b and --track, complete all references' ' + test_completion "git checkout -b new-branch --track " <<-EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - with -B and --track, complete all references' ' + test_completion "git checkout -B new-branch --track " <<-EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - with -b and --no-track, complete all references' ' + test_completion "git checkout -b new-branch --no-track " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - with -B and --no-track, complete all references' ' + test_completion "git checkout -B new-branch --no-track " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git switch - for -c, complete local branches and unique remote branches' ' + test_completion "git switch -c " <<-\EOF + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + EOF +' + +test_expect_success 'git switch - for -C, complete local branches and unique remote branches' ' + test_completion "git switch -C " <<-\EOF + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + EOF +' + +test_expect_success 'git switch - for -c with --no-guess, complete local branches only' ' + test_completion "git switch --no-guess -c " <<-\EOF + master Z + matching-branch Z + EOF +' + +test_expect_success 'git switch - for -C with --no-guess, complete local branches only' ' + test_completion "git switch --no-guess -C " <<-\EOF + master Z + matching-branch Z + EOF +' + +test_expect_success 'git switch - for -c with --no-track, complete local branches only' ' + test_completion "git switch --no-track -c " <<-\EOF + master Z + matching-branch Z + EOF +' + +test_expect_success 'git switch - for -C with --no-track, complete local branches only' ' + test_completion "git switch --no-track -C " <<-\EOF + master Z + matching-branch Z + EOF +' + +test_expect_success 'git checkout - for -b, complete local branches and unique remote branches' ' + test_completion "git checkout -b " <<-\EOF + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + EOF +' + +test_expect_success 'git checkout - for -B, complete local branches and unique remote branches' ' + test_completion "git checkout -B " <<-\EOF + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + EOF +' + +test_expect_success 'git checkout - for -b with --no-guess, complete local branches only' ' + test_completion "git checkout --no-guess -b " <<-\EOF + master Z + matching-branch Z + EOF +' + +test_expect_success 'git checkout - for -B with --no-guess, complete local branches only' ' + test_completion "git checkout --no-guess -B " <<-\EOF + master Z + matching-branch Z + EOF +' + +test_expect_success 'git checkout - for -b with --no-track, complete local branches only' ' + test_completion "git checkout --no-track -b " <<-\EOF + master Z + matching-branch Z + EOF +' + +test_expect_success 'git checkout - for -B with --no-track, complete local branches only' ' + test_completion "git checkout --no-track -B " <<-\EOF + master Z + matching-branch Z + EOF +' + +test_expect_success 'git switch - with --orphan completes local branch names and unique remote branch names' ' + test_completion "git switch --orphan " <<-\EOF + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + EOF +' + +test_expect_success 'git switch - --orphan with branch already provided completes nothing else' ' + test_completion "git switch --orphan master " <<-\EOF + + EOF +' + +test_expect_success 'git checkout - with --orphan completes local branch names and unique remote branch names' ' + test_completion "git checkout --orphan " <<-\EOF + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + EOF +' + +test_expect_success 'git checkout - --orphan with branch already provided completes local refs for a start-point' ' + test_completion "git checkout --orphan master " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + test_expect_success 'teardown after ref completion' ' git branch -d matching-branch && git tag -d matching-tag && @@ -1257,7 +1712,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 dont have to bother adding any + # untracked files we do not have to bother adding any # paths to the index in those tests. __git_complete_index_file --others && print_comp @@ -1363,6 +1818,63 @@ 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 && @@ -1392,12 +1904,12 @@ test_expect_success 'basic' ' # built-in grep -q "^add \$" out && # script - grep -q "^filter-branch \$" out && + grep -q "^rebase \$" out && # plumbing ! grep -q "^ls-files \$" out && - run_completion "git f" && - ! grep -q -v "^f" out + run_completion "git r" && + ! grep -q -v "^r" out ' test_expect_success 'double dash "git" itself' ' @@ -1438,6 +1950,8 @@ test_expect_success 'double dash "git checkout"' ' --no-guess Z --no-... Z --overlay Z + --pathspec-file-nul Z + --pathspec-from-file=Z EOF ' @@ -1548,7 +2062,10 @@ test_expect_success 'complete tree filename with metacharacters' ' ' test_expect_success PERL 'send-email' ' - test_completion "git send-email --cov" "--cover-letter " && + test_completion "git send-email --cov" <<-\EOF && + --cover-from-description=Z + --cover-letter Z + EOF test_completion "git send-email ma" "master " ' @@ -1576,6 +2093,11 @@ test_expect_success 'complete files' ' echo modify > modified && test_completion "git add " "modified" && + mkdir -p some/deep && + touch some/deep/path && + test_completion "git add some/" "some/deep" && + git clean -f some && + touch untracked && : TODO .gitignore should not be here && @@ -1698,6 +2220,69 @@ 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 88bc733ad6..ab5da2cabc 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-i 2/3)" >expected && + printf " (b1|REBASE 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-i 1/3)" >expected && + printf " (b2|REBASE 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' ' +test_expect_success 'prompt - rebase am' ' printf " (b2|REBASE 1/3)" >expected && git checkout b2 && test_when_finished "git checkout master" && - test_must_fail git rebase b1 b2 && + test_must_fail git rebase --apply 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 e0b3f28d3a..8d59b90348 100644 --- a/third_party/git/t/test-lib-functions.sh +++ b/third_party/git/t/test-lib-functions.sh @@ -228,9 +228,11 @@ test_commit () { # can be a tag pointing to the commit-to-merge. test_merge () { + label="$1" && + shift && test_tick && - git merge -m "$1" "$2" && - git tag "$1" + git merge -m "$label" "$@" && + git tag "$label" } # Efficiently create <nr> commits, each with a unique number (from 1 to <nr> @@ -306,7 +308,7 @@ test_commit_bulk () { total=$1 add_from= - if git -C "$indir" rev-parse --verify "$ref" + if git -C "$indir" rev-parse --quiet --verify "$ref" then add_from=t fi @@ -580,7 +582,7 @@ test_expect_failure () { export test_prereq if ! test_skip "$@" then - say >&3 "checking known breakage: $2" + say >&3 "checking known breakage of $TEST_NUMBER.$test_count '$1': $2" if test_run_ "$2" expecting_failure then test_known_broken_ok_ "$1" @@ -600,7 +602,7 @@ test_expect_success () { export test_prereq if ! test_skip "$@" then - say >&3 "expecting success: $2" + say >&3 "expecting success of $TEST_NUMBER.$test_count '$1': $2" if test_run_ "$2" then test_ok_ "$1" @@ -796,6 +798,37 @@ list_contains () { return 1 } +# Returns success if the arguments indicate that a command should be +# accepted by test_must_fail(). If the command is run with env, the env +# and its corresponding variable settings will be stripped before we +# test the command being run. +test_must_fail_acceptable () { + if test "$1" = "env" + then + shift + while test $# -gt 0 + do + case "$1" in + *?=*) + shift + ;; + *) + break + ;; + esac + done + fi + + case "$1" in + git|__git*|test-tool|test_terminal) + return 0 + ;; + *) + return 1 + ;; + esac +} + # This is not among top-level (test_expect_success | test_expect_failure) # but is a prefix that can be used in the test script, like: # @@ -815,6 +848,17 @@ list_contains () { # Multiple signals can be specified as a comma separated list. # Currently recognized signal names are: sigpipe, success. # (Don't use 'success', use 'test_might_fail' instead.) +# +# Do not use this to run anything but "git" and other specific testable +# commands (see test_must_fail_acceptable()). We are not in the +# business of vetting system supplied commands -- in other words, this +# is wrong: +# +# test_must_fail grep pattern output +# +# Instead use '!': +# +# ! grep pattern output test_must_fail () { case "$1" in @@ -826,6 +870,11 @@ test_must_fail () { _test_ok= ;; esac + if ! test_must_fail_acceptable "$@" + then + echo >&7 "test_must_fail: only 'git' is allowed: $*" + return 1 + fi "$@" 2>&7 exit_code=$? if test $exit_code -eq 0 && ! list_contains "$_test_ok" success @@ -903,7 +952,13 @@ test_expect_code () { # - not all diff versions understand "-u" test_cmp() { - $GIT_TEST_CMP "$@" + test $# -eq 2 || BUG "test_cmp requires two arguments" + if ! eval "$GIT_TEST_CMP" '"$@"' + then + test "x$1" = x- || test -e "$1" || BUG "test_cmp '$1' missing" + test "x$2" = x- || test -e "$2" || BUG "test_cmp '$2' missing" + return 1 + fi } # Check that the given config key has the expected value. @@ -932,7 +987,13 @@ test_cmp_config() { # test_cmp_bin - helper to compare binary files test_cmp_bin() { - cmp "$@" + test $# -eq 2 || BUG "test_cmp_bin requires two arguments" + if ! cmp "$@" + then + test "x$1" = x- || test -e "$1" || BUG "test_cmp_bin '$1' missing" + test "x$2" = x- || test -e "$2" || BUG "test_cmp_bin '$2' missing" + return 1 + fi } # Use this instead of test_cmp to compare files that contain expected and @@ -1010,19 +1071,30 @@ test_must_be_empty () { fi } -# Tests that its two parameters refer to the same revision +# Tests that its two parameters refer to the same revision, or if '!' is +# provided first, that its other two parameters refer to different +# revisions. 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") && - if test "$r1" != "$r2" + r2=$(git rev-parse --verify "$2") || return 1 + + if ! test "$r1" "$op" "$r2" then cat >&4 <<-EOF - error: two revisions point to different objects: + error: two revisions point to $wrong_result objects: '$1': $r1 '$2': $r2 EOF @@ -1173,6 +1245,34 @@ 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 @@ -1181,7 +1281,7 @@ perl () { # The error/skip message should be given by $2. # test_skip_or_die () { - if ! git env--helper --type=bool --default=false --exit-code $1 + if ! test_bool_env "$1" false then skip_all=$2 test_done @@ -1321,14 +1421,22 @@ nongit () { ) } 7>&2 2>&4 -# convert stdin to pktline representation; note that empty input becomes an -# empty packet, not a flush packet (for that you can just print 0000 yourself). +# convert function arguments or stdin (if not arguments given) to pktline +# representation. If multiple arguments are given, they are separated by +# whitespace and put in a single packet. Note that data containing NULs must be +# given on stdin, and that empty input becomes an empty packet, not a flush +# packet (for that you can just print 0000 yourself). packetize() { - cat >packetize.tmp && - len=$(wc -c <packetize.tmp) && - printf '%04x%s' "$(($len + 4))" && - cat packetize.tmp && - rm -f packetize.tmp + if test $# -gt 0 + then + packet="$*" + printf '%04x%s' "$((4 + ${#packet}))" "$packet" + else + perl -e ' + my $packet = do { local $/; <STDIN> }; + printf "%04x%s", 4 + length($packet), $packet; + ' + fi } # Parse the input as a series of pktlines, writing the result to stdout. @@ -1368,9 +1476,7 @@ test_set_hash () { # Detect the hash algorithm in use. test_detect_hash () { - # Currently we only support SHA-1, but in the future this function will - # actually detect the algorithm in use. - test_hash_algo='sha1' + test_hash_algo="${GIT_TEST_DEFAULT_HASH:-sha1}" } # Load common hash metadata and common placeholder object IDs for use with @@ -1419,7 +1525,17 @@ test_oid_cache () { # Look up a per-hash value based on a key ($1). The value must have been loaded # by test_oid_init or test_oid_cache. test_oid () { - local var="test_oid_${test_hash_algo}_$1" && + local algo="${test_hash_algo}" && + + case "$1" in + --hash=*) + algo="${1#--hash=}" && + shift;; + *) + ;; + esac && + + local var="test_oid_${algo}_$1" && # If the variable is unset, we must be missing an entry for this # key-hash pair, so exit with an error. @@ -1475,3 +1591,73 @@ 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" +} + +# Tests for the hidden file attribute on Windows +test_path_is_hidden () { + test_have_prereq MINGW || + BUG "test_path_is_hidden can only be used on Windows" + + # Use the output of `attrib`, ignore the absolute path + case "$("$SYSTEMROOT"/system32/attrib "$1")" in *H*?:*) return 0;; esac + return 1 +} + +# Check that the given command was invoked as part of the +# trace2-format trace on stdin. +# +# test_subcommand [!] <command> <args>... < <trace> +# +# For example, to look for an invocation of "git upload-pack +# /path/to/repo" +# +# GIT_TRACE2_EVENT=event.log git fetch ... && +# test_subcommand git upload-pack "$PATH" <event.log +# +# If the first parameter passed is !, this instead checks that +# the given command was not called. +# +test_subcommand () { + local negate= + if test "$1" = "!" + then + negate=t + shift + fi + + local expr=$(printf '"%s",' "$@") + expr="${expr%,}" + + if test -n "$negate" + then + ! grep "\[$expr\]" + else + grep "\[$expr\]" + fi +} diff --git a/third_party/git/t/test-lib.sh b/third_party/git/t/test-lib.sh index 30b07e310f..ef31f40037 100644 --- a/third_party/git/t/test-lib.sh +++ b/third_party/git/t/test-lib.sh @@ -78,20 +78,23 @@ then exit 1 fi -# Parse options while taking care to leave $@ intact, so we will still -# have all the original command line options when executing the test -# script again for '--tee' and '--verbose-log' below. store_arg_to= -prev_opt= -for opt -do - if test -n "$store_arg_to" +opt_required_arg= +# $1: option string +# $2: name of the var where the arg will be stored +mark_option_requires_arg () { + if test -n "$opt_required_arg" then - eval $store_arg_to=\$opt - store_arg_to= - prev_opt= - continue + echo "error: options that require args cannot be bundled" \ + "together: '$opt_required_arg' and '$1'" >&2 + exit 1 fi + opt_required_arg=$1 + store_arg_to=$2 +} + +parse_option () { + local opt="$1" case "$opt" in -d|--d|--de|--deb|--debu|--debug) @@ -101,7 +104,7 @@ do -l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests) GIT_TEST_LONG=t; export GIT_TEST_LONG ;; -r) - store_arg_to=run_list + mark_option_requires_arg "$opt" run_list ;; --run=*) run_list=${opt#--*=} ;; @@ -185,12 +188,42 @@ do *) echo "error: unknown test option '$opt'" >&2; exit 1 ;; esac +} - prev_opt=$opt +# Parse options while taking care to leave $@ intact, so we will still +# have all the original command line options when executing the test +# script again for '--tee' and '--verbose-log' later. +for opt +do + if test -n "$store_arg_to" + then + eval $store_arg_to=\$opt + store_arg_to= + opt_required_arg= + continue + fi + + case "$opt" in + --*|-?) + parse_option "$opt" ;; + -?*) + # bundled short options must be fed separately to parse_option + opt=${opt#-} + while test -n "$opt" + do + extra=${opt#?} + this=${opt%$extra} + opt=$extra + parse_option "-$this" + done + ;; + *) + echo "error: unknown test option '$opt'" >&2; exit 1 ;; + esac done if test -n "$store_arg_to" then - echo "error: $prev_opt requires an argument" >&2 + echo "error: $opt_required_arg requires an argument" >&2 exit 1 fi @@ -212,6 +245,8 @@ 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" @@ -402,17 +437,27 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e ' unset XDG_CACHE_HOME unset XDG_CONFIG_HOME unset GITPERLLIB -GIT_AUTHOR_EMAIL=author@example.com +TEST_AUTHOR_LOCALNAME=author +TEST_AUTHOR_DOMAIN=example.com +GIT_AUTHOR_EMAIL=${TEST_AUTHOR_LOCALNAME}@${TEST_AUTHOR_DOMAIN} GIT_AUTHOR_NAME='A U Thor' -GIT_COMMITTER_EMAIL=committer@example.com +GIT_AUTHOR_DATE='1112354055 +0200' +TEST_COMMITTER_LOCALNAME=committer +TEST_COMMITTER_DOMAIN=example.com +GIT_COMMITTER_EMAIL=${TEST_COMMITTER_LOCALNAME}@${TEST_COMMITTER_DOMAIN} GIT_COMMITTER_NAME='C O Mitter' +GIT_COMMITTER_DATE='1112354055 +0200' GIT_MERGE_VERBOSITY=5 GIT_MERGE_AUTOEDIT=no export GIT_MERGE_VERBOSITY GIT_MERGE_AUTOEDIT export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME +export GIT_COMMITTER_DATE GIT_AUTHOR_DATE export EDITOR +GIT_DEFAULT_HASH="${GIT_TEST_DEFAULT_HASH:-sha1}" +export GIT_DEFAULT_HASH + # Tests using GIT_TRACE typically don't want <timestamp> <file>:<line> output GIT_TRACE_BARE=1 export GIT_TRACE_BARE @@ -488,25 +533,13 @@ case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in ;; esac -# Convenience -# -# A regexp to match 5, 35 and 40 hexdigits -_x05='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' -_x35="$_x05$_x05$_x05$_x05$_x05$_x05$_x05" -_x40="$_x35$_x05" - -# Zero SHA-1 -_z40=0000000000000000000000000000000000000000 - -OID_REGEX="$_x40" -ZERO_OID=$_z40 -EMPTY_TREE=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -EMPTY_BLOB=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 - # Line feed LF=' ' +# Single quote +SQ=\' + # UTF-8 ZERO WIDTH NON-JOINER, which HFS+ ignores # when case-folding filenames u200c=$(printf '\342\200\214') @@ -567,6 +600,7 @@ export TERM error () { say_color error "error: $*" + finalize_junit_xml GIT_EXIT_OK=t exit 1 } @@ -695,7 +729,7 @@ test_failure_ () { say_color error "not ok $test_count - $1" shift printf '%s\n' "$*" | sed -e 's/^/# /' - test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; } + test "$immediate" = "" || { finalize_junit_xml; GIT_EXIT_OK=t; exit 1; } } test_known_broken_ok_ () { @@ -872,6 +906,7 @@ maybe_setup_valgrind () { fi } +trace_level_=0 want_trace () { test "$trace" = t && { test "$verbose" = t || test "$verbose_log" = t @@ -885,7 +920,7 @@ want_trace () { test_eval_inner_ () { # Do not add anything extra (including LF) after '$*' eval " - want_trace && set -x + want_trace && trace_level_=$(($trace_level_+1)) && set -x $*" } @@ -916,7 +951,8 @@ test_eval_ () { test_eval_ret_=$? if want_trace then - set +x + test 1 = $trace_level_ && set +x + trace_level_=$(($trace_level_-1)) fi } 2>/dev/null 4>&2 @@ -994,6 +1030,12 @@ 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 @@ -1006,12 +1048,6 @@ 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) @@ -1063,6 +1099,27 @@ 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\"/" \ + -e '/^ *<\/testsuite/d' \ + <"$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 @@ -1085,21 +1142,7 @@ test_done () { # removed, so the commands can access pidfiles and socket files. test_atexit_handler - 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 + finalize_junit_xml if test -z "$HARNESS_ACTIVE" then @@ -1367,6 +1410,21 @@ then fi fi +# Convenience +# A regexp to match 5, 35 and 40 hexdigits +_x05='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' +_x35="$_x05$_x05$_x05$_x05$_x05$_x05$_x05" +_x40="$_x35$_x05" + +test_oid_init + +ZERO_OID=$(test_oid zero) +OID_REGEX=$(echo $ZERO_OID | sed -e 's/0/[0-9a-f]/g') +OIDPATH_REGEX=$(test_oid_to_path $ZERO_OID | sed -e 's/0/[0-9a-f]/g') +EMPTY_TREE=$(test_oid empty_tree) +EMPTY_BLOB=$(test_oid empty_blob) +_z40=$ZERO_OID + # Provide an implementation of the 'yes' utility; the upper bound # limit is there to help Windows that cannot stop this loop from # wasting cycles when the downstream stops reading, so do not be @@ -1391,23 +1449,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". Only do that work if needed by seeing if -# GIT_TEST_FAIL_PREREQS is set at all. +# 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. GIT_TEST_FAIL_PREREQS_INTERNAL= if test -n "$GIT_TEST_FAIL_PREREQS" then - if git env--helper --type=bool --default=0 --exit-code GIT_TEST_FAIL_PREREQS + if test_bool_env GIT_TEST_FAIL_PREREQS false then GIT_TEST_FAIL_PREREQS_INTERNAL=true test_set_prereq FAIL_PREREQS fi else test_lazy_prereq FAIL_PREREQS ' - git env--helper --type=bool --default=0 --exit-code GIT_TEST_FAIL_PREREQS + test_bool_env GIT_TEST_FAIL_PREREQS false ' fi -# Fix some commands on Windows +# Fix some commands on Windows, and other OS-specific things uname_s=$(uname -s) case $uname_s in *MINGW*) @@ -1445,6 +1503,14 @@ case $uname_s in ;; esac +# Detect arches where a few things don't work +uname_m=$(uname -m) +case $uname_m in +parisc* | hppa*) + test_set_prereq HPPA + ;; +esac + ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 test -z "$NO_PERL" && test_set_prereq PERL test -z "$NO_PTHREADS" && test_set_prereq PTHREADS @@ -1462,7 +1528,7 @@ then fi test_lazy_prereq C_LOCALE_OUTPUT ' - ! git env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON + ! test_bool_env GIT_TEST_GETTEXT_POISON false ' if test -z "$GIT_TEST_CHECK_CACHE_TREE" @@ -1584,7 +1650,7 @@ run_with_limited_cmdline () { } test_lazy_prereq CMDLINE_LIMIT ' - test_have_prereq !MINGW,!CYGWIN && + test_have_prereq !HPPA,!MINGW,!CYGWIN && run_with_limited_cmdline true ' @@ -1593,10 +1659,19 @@ run_with_limited_stack () { } test_lazy_prereq ULIMIT_STACK_SIZE ' - test_have_prereq !MINGW,!CYGWIN && + test_have_prereq !HPPA,!MINGW,!CYGWIN && run_with_limited_stack true ' +run_with_limited_open_files () { + (ulimit -n 32 && "$@") +} + +test_lazy_prereq ULIMIT_FILE_DESCRIPTORS ' + test_have_prereq !MINGW,!CYGWIN && + run_with_limited_open_files true +' + build_option () { git version --build-options | sed -ne "s/^$1: //p" @@ -1617,7 +1692,11 @@ test_lazy_prereq CURL ' # which will not work with other hash algorithms and tests that work but don't # test anything meaningful (e.g. special values which cause short collisions). test_lazy_prereq SHA1 ' - test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 + case "$GIT_DEFAULT_HASH" in + sha1) true ;; + "") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;; + *) false ;; + esac ' test_lazy_prereq REBASE_P ' diff --git a/third_party/git/t/test-terminal.perl b/third_party/git/t/test-terminal.perl index 46bf618479..1bcf01a9a4 100755 --- a/third_party/git/t/test-terminal.perl +++ b/third_party/git/t/test-terminal.perl @@ -81,24 +81,24 @@ if ($#ARGV < 1) { die "usage: test-terminal program args"; } $ENV{TERM} = 'vt100'; -my $master_in = new IO::Pty; -my $master_out = new IO::Pty; -my $master_err = new IO::Pty; -$master_in->set_raw(); -$master_out->set_raw(); -$master_err->set_raw(); -$master_in->slave->set_raw(); -$master_out->slave->set_raw(); -$master_err->slave->set_raw(); -my $pid = start_child(\@ARGV, $master_in->slave, $master_out->slave, $master_err->slave); -close $master_in->slave; -close $master_out->slave; -close $master_err->slave; -my $in_pid = copy_stdin($master_in); -copy_stdio($master_out, $master_err); +my $parent_in = new IO::Pty; +my $parent_out = new IO::Pty; +my $parent_err = new IO::Pty; +$parent_in->set_raw(); +$parent_out->set_raw(); +$parent_err->set_raw(); +$parent_in->slave->set_raw(); +$parent_out->slave->set_raw(); +$parent_err->slave->set_raw(); +my $pid = start_child(\@ARGV, $parent_in->slave, $parent_out->slave, $parent_err->slave); +close $parent_in->slave; +close $parent_out->slave; +close $parent_err->slave; +my $in_pid = copy_stdin($parent_in); +copy_stdio($parent_out, $parent_err); my $ret = finish_child($pid); # If the child process terminates before our copy_stdin() process is able to -# write all of its data to $master_in, the copy_stdin() process could stall. +# write all of its data to $parent_in, the copy_stdin() process could stall. # Send SIGTERM to it to ensure it terminates. kill 'TERM', $in_pid; finish_child($in_pid); diff --git a/third_party/git/tag.c b/third_party/git/tag.c index 5db870edb9..1ed2684e45 100644 --- a/third_party/git/tag.c +++ b/third_party/git/tag.c @@ -103,7 +103,7 @@ struct tag *lookup_tag(struct repository *r, const struct object_id *oid) struct object *obj = lookup_object(r, oid); if (!obj) return create_object(r, oid, alloc_tag_node(r)); - return object_as_type(r, obj, OBJ_TAG, 0); + return object_as_type(obj, OBJ_TAG, 0); } static timestamp_t parse_tag_date(const char *buf, const char *tail) @@ -141,7 +141,16 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u if (item->object.parsed) return 0; - item->object.parsed = 1; + + 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); + } if (size < the_hash_algo->hexsz + 24) return -1; @@ -167,10 +176,15 @@ 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 { - error("Unknown type %s", type); - item->tagged = NULL; + return error("unknown tag type '%s' in %s", + type, oid_to_hex(&item->object.oid)); } + 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 @@ -187,6 +201,7 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u else item->date = 0; + item->object.parsed = 1; return 0; } @@ -212,3 +227,10 @@ 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 03265fbfe2..3ce8e72192 100644 --- a/third_party/git/tag.h +++ b/third_party/git/tag.h @@ -19,5 +19,6 @@ 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 3467705e9b..6b258c4d4a 100644 --- a/third_party/git/tar.h +++ b/third_party/git/tar.h @@ -1,3 +1,6 @@ +#ifndef TAR_H +#define TAR_H + #define TYPEFLAG_AUTO '\0' #define TYPEFLAG_REG '0' #define TYPEFLAG_LNK '2' @@ -23,3 +26,5 @@ struct ustar_header { char devminor[8]; /* 337 */ char prefix[155]; /* 345 */ }; + +#endif /* TAR_H */ diff --git a/third_party/git/tempfile.c b/third_party/git/tempfile.c index d43ad8c191..94aa18f3f7 100644 --- a/third_party/git/tempfile.c +++ b/third_party/git/tempfile.c @@ -130,17 +130,17 @@ static void deactivate_tempfile(struct tempfile *tempfile) } /* Make sure errno contains a meaningful value on error */ -struct tempfile *create_tempfile(const char *path) +struct tempfile *create_tempfile_mode(const char *path, int mode) { struct tempfile *tempfile = new_tempfile(); strbuf_add_absolute_path(&tempfile->filename, path); tempfile->fd = open(tempfile->filename.buf, - O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC, 0666); + O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC, mode); if (O_CLOEXEC && tempfile->fd < 0 && errno == EINVAL) /* Try again w/o O_CLOEXEC: the kernel might not support it */ tempfile->fd = open(tempfile->filename.buf, - O_RDWR | O_CREAT | O_EXCL, 0666); + O_RDWR | O_CREAT | O_EXCL, mode); if (tempfile->fd < 0) { deactivate_tempfile(tempfile); return NULL; diff --git a/third_party/git/tempfile.h b/third_party/git/tempfile.h index cddda0a33c..4de3bc77d2 100644 --- a/third_party/git/tempfile.h +++ b/third_party/git/tempfile.h @@ -88,8 +88,16 @@ struct tempfile { * Attempt to create a temporary file at the specified `path`. Return * a tempfile (whose "fd" member can be used for writing to it), or * NULL on error. It is an error if a file already exists at that path. + * Note that `mode` will be further modified by the umask, and possibly + * `core.sharedRepository`, so it is not guaranteed to have the given + * mode. */ -struct tempfile *create_tempfile(const char *path); +struct tempfile *create_tempfile_mode(const char *path, int mode); + +static inline struct tempfile *create_tempfile(const char *path) +{ + return create_tempfile_mode(path, 0666); +} /* * Register an existing file as a tempfile, meaning that it will be diff --git a/third_party/git/templates/hooks--fsmonitor-watchman.sample b/third_party/git/templates/hooks--fsmonitor-watchman.sample index e673bb3980..14ed0aa42d 100755 --- a/third_party/git/templates/hooks--fsmonitor-watchman.sample +++ b/third_party/git/templates/hooks--fsmonitor-watchman.sample @@ -8,107 +8,166 @@ 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 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. +# 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, $time) = @ARGV; +my ($version, $last_update_token) = @ARGV; -# Check the hook interface version +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; -if ($version == 1) { - # convert nanoseconds to seconds - $time = int $time / 1000000000; -} else { +# 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; -if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $git_work_tree = Win32::GetCwd(); - $git_work_tree =~ tr/\\/\//; -} else { - require Cwd; - $git_work_tree = Cwd::cwd(); -} +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"; + 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 $time but were not transient (ie created after - # $time but no longer exist). + # 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. - # - # 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. - + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + } my $query = <<" END"; ["query", "$git_work_tree", { - "since": $time, + "since": $last_update_token, "fields": ["name"], - "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] + "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 ""; + "Falling back to scanning...\n" if $response eq ""; die "Watchman: command returned invalid output: $response\n" . - "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"; + "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--; - qx/watchman watch "$git_work_tree"/; + 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. - print "/\0"; + 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() }; - exit 0; + return 0; } - die "Watchman: $o->{error}.\n" . - "Falling back to scanning...\n" if $o->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; - binmode STDOUT, ":utf8"; - local $, = "\0"; - print @{$o->{files}}; + 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/templates/hooks--pre-commit.sample b/third_party/git/templates/hooks--pre-commit.sample index 6a75641638..e144712c85 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 --bool hooks.allownonascii) +allownonascii=$(git config --type=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 new file mode 100755 index 0000000000..399eab1924 --- /dev/null +++ b/third_party/git/templates/hooks--pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/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--pre-push.sample b/third_party/git/templates/hooks--pre-push.sample index 6187dbf439..4ce688d32b 100755 --- a/third_party/git/templates/hooks--pre-push.sample +++ b/third_party/git/templates/hooks--pre-push.sample @@ -14,7 +14,7 @@ # Information about the commits which are being pushed is supplied as lines to # the standard input in the form: # -# <local ref> <local sha1> <remote ref> <remote sha1> +# <local ref> <local oid> <remote ref> <remote oid> # # This sample shows how to prevent push of commits where the log message starts # with "WIP" (work in progress). @@ -22,27 +22,27 @@ remote="$1" url="$2" -z40=0000000000000000000000000000000000000000 +zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0') -while read local_ref local_sha remote_ref remote_sha +while read local_ref local_oid remote_ref remote_oid do - if [ "$local_sha" = $z40 ] + if test "$local_oid" = "$zero" then # Handle delete : else - if [ "$remote_sha" = $z40 ] + if test "$remote_oid" = "$zero" then # New branch, examine all commits - range="$local_sha" + range="$local_oid" else # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" + range="$remote_oid..$local_oid" fi # Check for WIP commit - commit=`git rev-list -n 1 --grep '^WIP' "$range"` - if [ -n "$commit" ] + commit=$(git rev-list -n 1 --grep '^WIP' "$range") + if test -n "$commit" then echo >&2 "Found WIP commit in $local_ref, not pushing" exit 1 diff --git a/third_party/git/templates/hooks--update.sample b/third_party/git/templates/hooks--update.sample index 80ba94135c..c4d426bc6e 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 --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) +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) # check for no description projectdesc=$(sed -e '1q' "$GIT_DIR/description") @@ -60,7 +60,7 @@ esac # --- Check types # if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" +zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0') if [ "$newrev" = "$zero" ]; then newrev_type=delete else diff --git a/third_party/git/tmp-objdir.c b/third_party/git/tmp-objdir.c index 91c00567f4..42ed4db5d3 100644 --- a/third_party/git/tmp-objdir.c +++ b/third_party/git/tmp-objdir.c @@ -4,13 +4,13 @@ #include "sigchain.h" #include "string-list.h" #include "strbuf.h" -#include "argv-array.h" +#include "strvec.h" #include "quote.h" #include "object-store.h" struct tmp_objdir { struct strbuf path; - struct argv_array env; + struct strvec env; }; /* @@ -24,7 +24,7 @@ static struct tmp_objdir *the_tmp_objdir; static void tmp_objdir_free(struct tmp_objdir *t) { strbuf_release(&t->path); - argv_array_clear(&t->env); + strvec_clear(&t->env); free(t); } @@ -79,7 +79,7 @@ static void remove_tmp_objdir_on_signal(int signo) * separated by PATH_SEP (which is what separate values in * GIT_ALTERNATE_OBJECT_DIRECTORIES). */ -static void env_append(struct argv_array *env, const char *key, const char *val) +static void env_append(struct strvec *env, const char *key, const char *val) { struct strbuf quoted = STRBUF_INIT; const char *old; @@ -97,16 +97,16 @@ static void env_append(struct argv_array *env, const char *key, const char *val) old = getenv(key); if (!old) - argv_array_pushf(env, "%s=%s", key, val); + strvec_pushf(env, "%s=%s", key, val); else - argv_array_pushf(env, "%s=%s%c%s", key, old, PATH_SEP, val); + strvec_pushf(env, "%s=%s%c%s", key, old, PATH_SEP, val); strbuf_release("ed); } -static void env_replace(struct argv_array *env, const char *key, const char *val) +static void env_replace(struct strvec *env, const char *key, const char *val) { - argv_array_pushf(env, "%s=%s", key, val); + strvec_pushf(env, "%s=%s", key, val); } static int setup_tmp_objdir(const char *root) @@ -131,7 +131,7 @@ struct tmp_objdir *tmp_objdir_create(void) t = xmalloc(sizeof(*t)); strbuf_init(&t->path, 0); - argv_array_init(&t->env); + strvec_init(&t->env); strbuf_addf(&t->path, "%s/incoming-XXXXXX", get_object_directory()); @@ -283,7 +283,7 @@ const char **tmp_objdir_env(const struct tmp_objdir *t) { if (!t) return NULL; - return t->env.argv; + return t->env.v; } void tmp_objdir_add_as_alternate(const struct tmp_objdir *t) diff --git a/third_party/git/trace.c b/third_party/git/trace.c index fa4a2e7120..f726686fd9 100644 --- a/third_party/git/trace.c +++ b/third_party/git/trace.c @@ -29,7 +29,7 @@ struct trace_key trace_perf_key = TRACE_KEY_INIT(PERFORMANCE); struct trace_key trace_setup_key = TRACE_KEY_INIT(SETUP); /* Get a trace file descriptor from "key" env variable. */ -static int get_trace_fd(struct trace_key *key) +static int get_trace_fd(struct trace_key *key, const char *override_envvar) { const char *trace; @@ -37,7 +37,7 @@ static int get_trace_fd(struct trace_key *key) if (key->initialized) return key->fd; - trace = getenv(key->key); + trace = override_envvar ? override_envvar : getenv(key->key); if (!trace || !strcmp(trace, "") || !strcmp(trace, "0") || !strcasecmp(trace, "false")) @@ -68,6 +68,18 @@ static int get_trace_fd(struct trace_key *key) return key->fd; } +void trace_override_envvar(struct trace_key *key, const char *value) +{ + trace_disable(key); + key->initialized = 0; + + /* + * Invoke get_trace_fd() to initialize key using the given value + * instead of the value of the environment variable. + */ + get_trace_fd(key, value); +} + void trace_disable(struct trace_key *key) { if (key->need_close) @@ -88,8 +100,6 @@ 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; @@ -114,7 +124,7 @@ static int prepare_trace_line(const char *file, int line, static void trace_write(struct trace_key *key, const void *buf, unsigned len) { - if (write_in_full(get_trace_fd(key), buf, len) < 0) { + if (write_in_full(get_trace_fd(key, NULL), buf, len) < 0) { warning("unable to write trace for %s: %s", key->key, strerror(errno)); trace_disable(key); @@ -385,7 +395,7 @@ void trace_repo_setup(const char *prefix) int trace_want(struct trace_key *key) { - return !!get_trace_fd(key); + return !!get_trace_fd(key, NULL); } #if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CLOCK_MONOTONIC) diff --git a/third_party/git/trace.h b/third_party/git/trace.h index 9fa3e7a594..0dbbad0e41 100644 --- a/third_party/git/trace.h +++ b/third_party/git/trace.h @@ -4,6 +4,82 @@ #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; @@ -18,31 +94,90 @@ 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); + +/** + * Enables or disables tracing for the specified key, as if the environment + * variable was set to the given value. + */ +void trace_override_envvar(struct trace_key *key, const char *value); + +/** + * 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. */ +/** + * 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"); + * ------------ + */ __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. */ +/** + * 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"); + * ------------ + */ __attribute__((format (printf, 2, 3))) void trace_performance_since(uint64_t start, const char *format, ...); diff --git a/third_party/git/trace2.c b/third_party/git/trace2.c index c7b4f14d29..2c6b570077 100644 --- a/third_party/git/trace2.c +++ b/third_party/git/trace2.c @@ -121,6 +121,7 @@ static void tr2main_atexit_handler(void) tr2_sid_release(); tr2_cmd_name_release(); tr2_cfg_free_patterns(); + tr2_cfg_free_env_vars(); tr2_sysenv_release(); trace2_enabled = 0; @@ -311,6 +312,14 @@ void trace2_cmd_list_config_fl(const char *file, int line) tr2_cfg_list_config_fl(file, line); } +void trace2_cmd_list_env_vars_fl(const char *file, int line) +{ + if (!trace2_enabled) + return; + + tr2_list_env_vars_fl(file, line); +} + void trace2_cmd_set_config_fl(const char *file, int line, const char *key, const char *value) { diff --git a/third_party/git/trace2.h b/third_party/git/trace2.h index 050bf3c8c1..b18bc5529c 100644 --- a/third_party/git/trace2.h +++ b/third_party/git/trace2.h @@ -1,6 +1,40 @@ #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; @@ -39,7 +73,12 @@ 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. - * Emits a 'version' event. + * 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. * * Cleanup/Termination is handled automatically by a registered * atexit() routine. @@ -49,7 +88,7 @@ void trace2_initialize_fl(const char *file, int line); #define trace2_initialize() trace2_initialize_fl(__FILE__, __LINE__) /* - * Return true if trace2 is enabled. + * Return 1 if trace2 is enabled (at least one target is active). */ int trace2_is_enabled(void); @@ -114,7 +153,8 @@ 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)) /* - * Emit an 'alias' expansion event. + * Emits an "alias" message containing the alias used and the argument + * expansion. */ void trace2_cmd_alias_fl(const char *file, int line, const char *alias, const char **argv); @@ -123,7 +163,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 "interesting" configuration + * Emit one or more 'def_param' events for "important" configuration * settings. * * Use the TR2_SYSENV_CFG_PARAM setting to register a comma-separated @@ -143,8 +183,21 @@ void trace2_cmd_list_config_fl(const char *file, int line); #define trace2_cmd_list_config() trace2_cmd_list_config_fl(__FILE__, __LINE__) /* + * Emit one or more 'def_param' events for "important" environment variables. + * + * Use the TR2_SYSENV_ENV_VARS setting to register a comma-separated list of + * environment variables considered important. For example: + * git config --system trace2.envVars 'GIT_HTTP_USER_AGENT,GIT_CONFIG' + * or: + * GIT_TRACE2_ENV_VARS="GIT_HTTP_USER_AGENT,GIT_CONFIG" + */ +void trace2_cmd_list_env_vars_fl(const char *file, int line); + +#define trace2_cmd_list_env_vars() trace2_cmd_list_env_vars_fl(__FILE__, __LINE__) + +/* * Emit a "def_param" event for the given config key/value pair IF - * we consider the key to be "interesting". + * we consider the key to be "important". * * Use this for new/updated config settings created/updated after * trace2_cmd_list_config() is called. @@ -155,20 +208,34 @@ 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)) -/* - * Emit a 'child_start' event prior to spawning a child process. +/** + * Emits a "child_start" message containing the "child-id", + * "child-argv", and "child-classification". * * 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)) -/* - * Emit a 'child_exit' event after the child process completes. +/** + * 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. */ void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd, int child_exit_code); @@ -176,21 +243,22 @@ 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 the "exec_id". + * Returns a unique "exec-id". This value is used later + * if the exec() fails and a "exec-result" message is necessary. */ 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, @@ -226,11 +294,12 @@ void trace2_thread_exit_fl(const char *file, int line); #define trace2_thread_exit() trace2_thread_exit_fl(__FILE__, __LINE__) /* - * Emit a 'param' event. + * Emits a "def_param" message containing a key/value pair. * - * 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. + * 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_def_param_fl(const char *file, int line, const char *param, const char *value); @@ -243,18 +312,35 @@ 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. * - * 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. + * 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_enter_fl(const char *file, int line, const char *category, const char *label, const struct repository *repo, ...); @@ -289,12 +375,17 @@ 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, ...); @@ -329,10 +420,12 @@ 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_cfg.c b/third_party/git/trace2/tr2_cfg.c index caa7f06948..ec9ac1a6ef 100644 --- a/third_party/git/trace2/tr2_cfg.c +++ b/third_party/git/trace2/tr2_cfg.c @@ -7,6 +7,10 @@ static struct strbuf **tr2_cfg_patterns; static int tr2_cfg_count_patterns; static int tr2_cfg_loaded; +static struct strbuf **tr2_cfg_env_vars; +static int tr2_cfg_env_vars_count; +static int tr2_cfg_env_vars_loaded; + /* * Parse a string containing a comma-delimited list of config keys * or wildcard patterns into a list of strbufs. @@ -46,6 +50,45 @@ void tr2_cfg_free_patterns(void) tr2_cfg_loaded = 0; } +/* + * Parse a string containing a comma-delimited list of environment variable + * names into a list of strbufs. + */ +static int tr2_load_env_vars(void) +{ + struct strbuf **s; + const char *varlist; + + if (tr2_cfg_env_vars_loaded) + return tr2_cfg_env_vars_count; + tr2_cfg_env_vars_loaded = 1; + + varlist = tr2_sysenv_get(TR2_SYSENV_ENV_VARS); + if (!varlist || !*varlist) + return tr2_cfg_env_vars_count; + + tr2_cfg_env_vars = strbuf_split_buf(varlist, strlen(varlist), ',', -1); + for (s = tr2_cfg_env_vars; *s; s++) { + struct strbuf *buf = *s; + + if (buf->len && buf->buf[buf->len - 1] == ',') + strbuf_setlen(buf, buf->len - 1); + strbuf_trim_trailing_newline(*s); + strbuf_trim(*s); + } + + tr2_cfg_env_vars_count = s - tr2_cfg_env_vars; + return tr2_cfg_env_vars_count; +} + +void tr2_cfg_free_env_vars(void) +{ + if (tr2_cfg_env_vars) + strbuf_list_free(tr2_cfg_env_vars); + tr2_cfg_env_vars_count = 0; + tr2_cfg_env_vars_loaded = 0; +} + struct tr2_cfg_data { const char *file; int line; @@ -79,6 +122,21 @@ void tr2_cfg_list_config_fl(const char *file, int line) read_early_config(tr2_cfg_cb, &data); } +void tr2_list_env_vars_fl(const char *file, int line) +{ + struct strbuf **s; + + if (tr2_load_env_vars() <= 0) + return; + + for (s = tr2_cfg_env_vars; *s; s++) { + struct strbuf *buf = *s; + const char *val = getenv(buf->buf); + if (val && *val) + trace2_def_param_fl(file, line, buf->buf, val); + } +} + void tr2_cfg_set_fl(const char *file, int line, const char *key, const char *value) { diff --git a/third_party/git/trace2/tr2_cfg.h b/third_party/git/trace2/tr2_cfg.h index d9c98f64dd..a11d71feb5 100644 --- a/third_party/git/trace2/tr2_cfg.h +++ b/third_party/git/trace2/tr2_cfg.h @@ -8,6 +8,12 @@ void tr2_cfg_list_config_fl(const char *file, int line); /* + * Iterate over all "interesting" environment variables and emit 'def_param' + * events for them to TRACE2. + */ +void tr2_list_env_vars_fl(const char *file, int line); + +/* * Emit a "def_param" event for the given key/value pair IF we consider * the key to be "interesting". */ @@ -16,4 +22,6 @@ void tr2_cfg_set_fl(const char *file, int line, const char *key, void tr2_cfg_free_patterns(void); +void tr2_cfg_free_env_vars(void); + #endif /* TR2_CFG_H */ diff --git a/third_party/git/trace2/tr2_dst.c b/third_party/git/trace2/tr2_dst.c index 5dda0ca1cd..ae052a07fe 100644 --- a/third_party/git/trace2/tr2_dst.c +++ b/third_party/git/trace2/tr2_dst.c @@ -8,6 +8,19 @@ */ #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; @@ -32,9 +45,75 @@ 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 fd; + int too_many_files; const char *last_slash, *sid = tr2_sid_get(); struct strbuf path = STRBUF_INIT; size_t base_path_len; @@ -50,18 +129,29 @@ static int tr2_dst_try_auto_path(struct tr2_dst *dst, const char *tgt_prefix) strbuf_addstr(&path, sid); base_path_len = path.len; - 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); + 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; } - - fd = open(path.buf, O_WRONLY | O_CREAT | O_EXCL, 0666); - if (fd != -1) - break; + } 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; } - if (fd == -1) { + if (dst->fd == -1) { if (tr2_dst_want_warning()) warning("trace2: could not open '%.*s' for '%s' tracing: %s", (int) base_path_len, path.buf, @@ -75,7 +165,6 @@ 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; @@ -215,13 +304,8 @@ connected: static void tr2_dst_malformed_warning(struct tr2_dst *dst, const char *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); + warning("trace2: unknown value for '%s': '%s'", + tr2_sysenv_display_name(dst->sysenv_var), tgt_value); } 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 3adf3bac13..b1a8c144e0 100644 --- a/third_party/git/trace2/tr2_dst.h +++ b/third_party/git/trace2/tr2_dst.h @@ -9,6 +9,7 @@ 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 6948fd4108..dc6e75ef13 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 signifcant + * where <process> is a 9 character string containing the least significant * 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 5958cfc424..a380dcf910 100644 --- a/third_party/git/trace2/tr2_sysenv.c +++ b/third_party/git/trace2/tr2_sysenv.c @@ -29,6 +29,8 @@ struct tr2_sysenv_entry { static struct tr2_sysenv_entry tr2_sysenv_settings[] = { [TR2_SYSENV_CFG_PARAM] = { "GIT_TRACE2_CONFIG_PARAMS", "trace2.configparams" }, + [TR2_SYSENV_ENV_VARS] = { "GIT_TRACE2_ENV_VARS", + "trace2.envvars" }, [TR2_SYSENV_DST_DEBUG] = { "GIT_TRACE2_DST_DEBUG", "trace2.destinationdebug" }, @@ -49,6 +51,9 @@ 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 8dd82a7a56..3292ee15bc 100644 --- a/third_party/git/trace2/tr2_sysenv.h +++ b/third_party/git/trace2/tr2_sysenv.h @@ -11,6 +11,7 @@ */ enum tr2_sysenv_variable { TR2_SYSENV_CFG_PARAM = 0, + TR2_SYSENV_ENV_VARS, TR2_SYSENV_DST_DEBUG, @@ -24,6 +25,8 @@ 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 c2852d1bd2..6353e8ad91 100644 --- a/third_party/git/trace2/tr2_tgt_event.c +++ b/third_party/git/trace2/tr2_tgt_event.c @@ -10,16 +10,17 @@ #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" -static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0 }; +static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0, 0 }; /* - * 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. + * 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. */ -#define TR2_EVENT_VERSION "1" +#define TR2_EVENT_VERSION "2" /* * Region nesting limit for messages written to the event target. @@ -107,6 +108,19 @@ 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"; @@ -120,6 +134,9 @@ 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, @@ -205,11 +222,6 @@ 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 00b116d797..31b602c171 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 }; +static struct tr2_dst tr2dst_normal = { TR2_SYSENV_NORMAL, 0, 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_quote_argv_pretty(&buf_payload, argv); + sq_append_quote_argv_pretty(&buf_payload, argv); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); } @@ -135,11 +135,6 @@ 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, @@ -147,8 +142,11 @@ 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 "); - maybe_append_string_va(&buf_payload, fmt, ap); + strbuf_addstr(&buf_payload, "error"); + if (fmt && *fmt) { + strbuf_addch(&buf_payload, ' '); + maybe_append_string_va(&buf_payload, fmt, ap); + } normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); } @@ -188,8 +186,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_quote_argv_pretty(&buf_payload, argv); + strbuf_addf(&buf_payload, "alias %s -> ", alias); + sq_append_quote_argv_pretty(&buf_payload, argv); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); } @@ -200,12 +198,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, ";"); } /* @@ -213,9 +211,10 @@ 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_quote_argv_pretty(&buf_payload, cmd->argv); + strbuf_addstr(&buf_payload, "git "); + sq_append_quote_argv_pretty(&buf_payload, cmd->argv); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); @@ -240,9 +239,11 @@ 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); - sq_quote_argv_pretty(&buf_payload, argv); + strbuf_addch(&buf_payload, ' '); + } + sq_append_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 ea0cbbe13e..a8018f18cc 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 }; +static struct tr2_dst tr2dst_perf = { TR2_SYSENV_PERF, 0, 0, 0, 0 }; /* * Use TR2_SYSENV_PERF_BRIEF to omit the "<time> <file>:<line>" @@ -21,17 +21,14 @@ static struct tr2_dst tr2dst_perf = { TR2_SYSENV_PERF, 0, 0, 0 }; */ static int tr2env_perf_be_brief; -#define TR2FMT_PERF_FL_WIDTH (50) +#define TR2FMT_PERF_FL_WIDTH (28) #define TR2FMT_PERF_MAX_EVENT_NAME (12) -#define TR2FMT_PERF_REPO_WIDTH (4) -#define TR2FMT_PERF_CATEGORY_WIDTH (10) +#define TR2FMT_PERF_REPO_WIDTH (3) +#define TR2FMT_PERF_CATEGORY_WIDTH (12) -#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); @@ -41,8 +38,6 @@ 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)) @@ -54,8 +49,6 @@ static int fn_init(void) static void fn_term(void) { tr2_dst_trace_disable(&tr2dst_perf); - - strbuf_release(&dots); } /* @@ -79,17 +72,36 @@ 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, ' '); - if (file && *file) - strbuf_addf(buf, "%s:%d ", file, line); - while (buf->len < TR2FMT_PERF_FL_WIDTH) + 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) strbuf_addch(buf, ' '); - strbuf_addstr(buf, "| "); + strbuf_addstr(buf, " | "); } strbuf_addf(buf, "d%d | ", tr2_sid_depth()); @@ -102,7 +114,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 | ", @@ -116,17 +128,11 @@ static void perf_fmt_prepare(const char *event_name, else strbuf_addf(buf, "%9s | ", " "); - strbuf_addf(buf, "%-*s | ", TR2FMT_PERF_CATEGORY_WIDTH, - (category ? category : "")); + strbuf_addf(buf, "%-*.*s | ", TR2FMT_PERF_CATEGORY_WIDTH, + TR2FMT_PERF_CATEGORY_WIDTH, (category ? category : "")); - 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); - } + if (ctx->nr_open_regions > 0) + strbuf_addchars(buf, '.', TR2_INDENT_LENGTH(ctx)); } static void perf_io_write_fl(const char *file, int line, const char *event_name, @@ -165,7 +171,7 @@ static void fn_start_fl(const char *file, int line, const char *event_name = "start"; struct strbuf buf_payload = STRBUF_INIT; - sq_quote_argv_pretty(&buf_payload, argv); + sq_append_quote_argv_pretty(&buf_payload, argv); perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute, NULL, NULL, &buf_payload); @@ -220,11 +226,6 @@ 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, @@ -285,8 +286,9 @@ 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_quote_argv_pretty(&buf_payload, argv); + strbuf_addf(&buf_payload, "alias:%s argv:[", alias); + sq_append_quote_argv_pretty(&buf_payload, argv); + strbuf_addch(&buf_payload, ']'); perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL, &buf_payload); @@ -315,10 +317,14 @@ 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"); - sq_quote_argv_pretty(&buf_payload, cmd->argv); + 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, ']'); perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute, NULL, NULL, &buf_payload); @@ -369,10 +375,14 @@ 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_addf(&buf_payload, " %s", exe); - sq_quote_argv_pretty(&buf_payload, argv); + 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, ']'); perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute, NULL, NULL, &buf_payload); @@ -433,8 +443,11 @@ 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); - maybe_append_string_va(&buf_payload, fmt, ap); + strbuf_addf(&buf_payload, "label:%s", label); + if (fmt && *fmt) { + strbuf_addch(&buf_payload, ' '); + maybe_append_string_va(&buf_payload, fmt, ap); + } perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute, NULL, category, &buf_payload); @@ -450,8 +463,11 @@ static void fn_region_leave_printf_va_fl( struct strbuf buf_payload = STRBUF_INIT; if (label) - strbuf_addf(&buf_payload, "label:%s ", label); - maybe_append_string_va(&buf_payload, fmt, ap); + strbuf_addf(&buf_payload, "label:%s", label); + if (fmt && *fmt) { + strbuf_addch(&buf_payload, ' ' ); + 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/trailer.c b/third_party/git/trailer.c index 0c414f2fed..3f7391d793 100644 --- a/third_party/git/trailer.c +++ b/third_party/git/trailer.c @@ -221,15 +221,13 @@ static char *apply_command(const char *command, const char *arg) struct strbuf cmd = STRBUF_INIT; struct strbuf buf = STRBUF_INIT; struct child_process cp = CHILD_PROCESS_INIT; - const char *argv[] = {NULL, NULL}; char *result; strbuf_addstr(&cmd, command); if (arg) strbuf_replace(&cmd, TRAILER_ARG_STRING, arg); - argv[0] = cmd.buf; - cp.argv = argv; + strvec_push(&cp.args, cmd.buf); cp.env = local_repo_env; cp.no_stdin = 1; cp.use_shell = 1; @@ -1185,3 +1183,39 @@ void format_trailers_from_commit(struct strbuf *out, const char *msg, format_trailer_info(out, &info, opts); trailer_info_release(&info); } + +void trailer_iterator_init(struct trailer_iterator *iter, const char *msg) +{ + struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT; + strbuf_init(&iter->key, 0); + strbuf_init(&iter->val, 0); + opts.no_divider = 1; + trailer_info_get(&iter->info, msg, &opts); + iter->cur = 0; +} + +int trailer_iterator_advance(struct trailer_iterator *iter) +{ + while (iter->cur < iter->info.trailer_nr) { + char *trailer = iter->info.trailers[iter->cur++]; + int separator_pos = find_separator(trailer, separators); + + if (separator_pos < 1) + continue; /* not a real trailer */ + + strbuf_reset(&iter->key); + strbuf_reset(&iter->val); + parse_trailer(&iter->key, &iter->val, NULL, + trailer, separator_pos); + unfold_value(&iter->val); + return 1; + } + return 0; +} + +void trailer_iterator_release(struct trailer_iterator *iter) +{ + trailer_info_release(&iter->info); + strbuf_release(&iter->val); + strbuf_release(&iter->key); +} diff --git a/third_party/git/trailer.h b/third_party/git/trailer.h index 203acf4ee1..cd93e7ddea 100644 --- a/third_party/git/trailer.h +++ b/third_party/git/trailer.h @@ -2,8 +2,7 @@ #define TRAILER_H #include "list.h" - -struct strbuf; +#include "strbuf.h" enum trailer_where { WHERE_DEFAULT, @@ -103,4 +102,46 @@ void trailer_info_release(struct trailer_info *info); void format_trailers_from_commit(struct strbuf *out, const char *msg, const struct process_trailer_options *opts); +/* + * An interface for iterating over the trailers found in a particular commit + * message. Use like: + * + * struct trailer_iterator iter; + * trailer_iterator_init(&iter, msg); + * while (trailer_iterator_advance(&iter)) + * ... do something with iter.key and iter.val ... + * trailer_iterator_release(&iter); + */ +struct trailer_iterator { + struct strbuf key; + struct strbuf val; + + /* private */ + struct trailer_info info; + size_t cur; +}; + +/* + * Initialize "iter" in preparation for walking over the trailers in the commit + * message "msg". The "msg" pointer must remain valid until the iterator is + * released. + * + * After initializing, note that key/val will not yet point to any trailer. + * Call advance() to parse the first one (if any). + */ +void trailer_iterator_init(struct trailer_iterator *iter, const char *msg); + +/* + * Advance to the next trailer of the iterator. Returns 0 if there is no such + * trailer, and 1 otherwise. The key and value of the trailer can be + * fetched from the iter->key and iter->value fields (which are valid + * only until the next advance). + */ +int trailer_iterator_advance(struct trailer_iterator *iter); + +/* + * Release all resources associated with the trailer iteration. + */ +void trailer_iterator_release(struct trailer_iterator *iter); + #endif /* TRAILER_H */ diff --git a/third_party/git/transport-helper.c b/third_party/git/transport-helper.c index 6b05a88faf..b573b6c730 100644 --- a/third_party/git/transport-helper.c +++ b/third_party/git/transport-helper.c @@ -9,7 +9,7 @@ #include "string-list.h" #include "thread-utils.h" #include "sigchain.h" -#include "argv-array.h" +#include "strvec.h" #include "refs.h" #include "refspec.h" #include "transport-internal.h" @@ -32,7 +32,18 @@ struct helper_data { signed_tags : 1, check_connectivity : 1, no_disconnect_req : 1, - no_private_update : 1; + no_private_update : 1, + object_format : 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 */ @@ -117,17 +128,17 @@ static struct child_process *get_helper(struct transport *transport) helper->in = -1; helper->out = -1; helper->err = 0; - argv_array_pushf(&helper->args, "git-remote-%s", data->name); - argv_array_push(&helper->args, transport->remote->name); - argv_array_push(&helper->args, remove_ext_force(transport->url)); - helper->git_cmd = 0; + strvec_pushf(&helper->args, "remote-%s", data->name); + strvec_push(&helper->args, transport->remote->name); + strvec_push(&helper->args, remove_ext_force(transport->url)); + helper->git_cmd = 1; helper->silent_exec_failure = 1; if (have_git_dir()) - argv_array_pushf(&helper->env_array, "%s=%s", - GIT_DIR_ENVIRONMENT, get_git_dir()); + strvec_pushf(&helper->env_array, "%s=%s", + GIT_DIR_ENVIRONMENT, get_git_dir()); - helper->trace2_child_class = helper->args.argv[0]; /* "remote-<name>" */ + helper->trace2_child_class = helper->args.v[0]; /* "remote-<name>" */ code = start_command(helper); if (code < 0 && errno == ENOENT) @@ -197,6 +208,8 @@ static struct child_process *get_helper(struct transport *transport) data->import_marks = xstrdup(arg); } else if (starts_with(capname, "no-private-update")) { data->no_private_update = 1; + } else if (starts_with(capname, "object-format")) { + data->object_format = 1; } else if (mandatory) { die(_("unknown mandatory capability %s; this remote " "helper probably needs newer version of Git"), @@ -394,15 +407,17 @@ static int fetch_with_fetch(struct transport *transport, sendline(data, &buf); while (1) { + const char *name; + if (recvline(data, &buf)) exit(128); - if (starts_with(buf.buf, "lock ")) { - const char *name = buf.buf + 5; - if (transport->pack_lockfile) + if (skip_prefix(buf.buf, "lock ", &name)) { + if (transport->pack_lockfiles.nr) warning(_("%s also locked %s"), data->name, name); else - transport->pack_lockfile = xstrdup(name); + string_list_append(&transport->pack_lockfiles, + name); } else if (data->check_connectivity && data->transport_options.check_self_contained_and_connected && @@ -424,12 +439,13 @@ static int get_importer(struct transport *transport, struct child_process *fasti int cat_blob_fd, code; child_process_init(fastimport); fastimport->in = xdup(helper->out); - argv_array_push(&fastimport->args, "fast-import"); - argv_array_push(&fastimport->args, debug ? "--stats" : "--quiet"); + strvec_push(&fastimport->args, "fast-import"); + strvec_push(&fastimport->args, "--allow-unsafe-features"); + strvec_push(&fastimport->args, debug ? "--stats" : "--quiet"); if (data->bidi_import) { cat_blob_fd = xdup(helper->in); - argv_array_pushf(&fastimport->args, "--cat-blob-fd=%d", cat_blob_fd); + strvec_pushf(&fastimport->args, "--cat-blob-fd=%d", cat_blob_fd); } fastimport->git_cmd = 1; @@ -450,17 +466,17 @@ static int get_exporter(struct transport *transport, /* we need to duplicate helper->in because we want to use it after * fastexport is done with it. */ fastexport->out = dup(helper->in); - argv_array_push(&fastexport->args, "fast-export"); - argv_array_push(&fastexport->args, "--use-done-feature"); - argv_array_push(&fastexport->args, data->signed_tags ? + strvec_push(&fastexport->args, "fast-export"); + strvec_push(&fastexport->args, "--use-done-feature"); + strvec_push(&fastexport->args, data->signed_tags ? "--signed-tags=verbatim" : "--signed-tags=warn-strip"); if (data->export_marks) - argv_array_pushf(&fastexport->args, "--export-marks=%s.tmp", data->export_marks); + strvec_pushf(&fastexport->args, "--export-marks=%s.tmp", data->export_marks); if (data->import_marks) - argv_array_pushf(&fastexport->args, "--import-marks=%s", data->import_marks); + strvec_pushf(&fastexport->args, "--import-marks=%s", data->import_marks); for (i = 0; i < revlist_args->nr; i++) - argv_array_push(&fastexport->args, revlist_args->items[i].string); + strvec_push(&fastexport->args, revlist_args->items[i].string); fastexport->git_cmd = 1; return start_command(fastexport); @@ -652,17 +668,25 @@ 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)) @@ -682,13 +706,9 @@ static int fetch(struct transport *transport, set_helper_option(transport, "update-shallow", "true"); if (data->transport_options.filter_options.choice) { - 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); + const char *spec = expand_list_objects_filter_spec( + &data->transport_options.filter_options); + set_helper_option(transport, "filter", spec); } if (data->transport_options.negotiation_tips) @@ -703,13 +723,61 @@ static int fetch(struct transport *transport, return -1; } +struct push_update_ref_state { + struct ref *hint; + struct ref_push_report *report; + int new_report; +}; + static int push_update_ref_status(struct strbuf *buf, - struct ref **ref, + struct push_update_ref_state *state, struct ref *remote_refs) { char *refname, *msg; int status, forced = 0; + if (starts_with(buf->buf, "option ")) { + struct object_id old_oid, new_oid; + const char *key, *val; + char *p; + + if (!state->hint || !(state->report || state->new_report)) + die(_("'option' without a matching 'ok/error' directive")); + if (state->new_report) { + if (!state->hint->report) { + state->hint->report = xcalloc(1, sizeof(struct ref_push_report)); + state->report = state->hint->report; + } else { + state->report = state->hint->report; + while (state->report->next) + state->report = state->report->next; + state->report->next = xcalloc(1, sizeof(struct ref_push_report)); + state->report = state->report->next; + } + state->new_report = 0; + } + key = buf->buf + 7; + p = strchr(key, ' '); + if (p) + *p++ = '\0'; + val = p; + if (!strcmp(key, "refname")) + state->report->ref_name = xstrdup_or_null(val); + else if (!strcmp(key, "old-oid") && val && + !parse_oid_hex(val, &old_oid, &val)) + state->report->old_oid = oiddup(&old_oid); + else if (!strcmp(key, "new-oid") && val && + !parse_oid_hex(val, &new_oid, &val)) + state->report->new_oid = oiddup(&new_oid); + else if (!strcmp(key, "forced-update")) + state->report->forced_update = 1; + /* Not update remote namespace again. */ + return 1; + } + + state->report = NULL; + state->new_report = 0; + if (starts_with(buf->buf, "ok ")) { status = REF_STATUS_OK; refname = buf->buf + 3; @@ -765,16 +833,16 @@ static int push_update_ref_status(struct strbuf *buf, } } - if (*ref) - *ref = find_ref_by_name(*ref, refname); - if (!*ref) - *ref = find_ref_by_name(remote_refs, refname); - if (!*ref) { + if (state->hint) + state->hint = find_ref_by_name(state->hint, refname); + if (!state->hint) + state->hint = find_ref_by_name(remote_refs, refname); + if (!state->hint) { warning(_("helper reported unexpected status of %s"), refname); return 1; } - if ((*ref)->status != REF_STATUS_NONE) { + if (state->hint->status != REF_STATUS_NONE) { /* * Earlier, the ref was marked not to be pushed, so ignore the ref * status reported by the remote helper if the latter is 'no match'. @@ -783,9 +851,11 @@ static int push_update_ref_status(struct strbuf *buf, return 1; } - (*ref)->status = status; - (*ref)->forced_update |= forced; - (*ref)->remote_status = msg; + if (status == REF_STATUS_OK) + state->new_report = 1; + state->hint->status = status; + state->hint->forced_update |= forced; + state->hint->remote_status = msg; return !(status == REF_STATUS_OK); } @@ -793,37 +863,57 @@ static int push_update_refs_status(struct helper_data *data, struct ref *remote_refs, int flags) { + struct ref *ref; + struct ref_push_report *report; struct strbuf buf = STRBUF_INIT; - struct ref *ref = remote_refs; - int ret = 0; + struct push_update_ref_state state = { remote_refs, NULL, 0 }; for (;;) { - char *private; - if (recvline(data, &buf)) { - ret = 1; - break; + strbuf_release(&buf); + return 1; } - if (!buf.len) break; + push_update_ref_status(&buf, &state, remote_refs); + } + strbuf_release(&buf); - if (push_update_ref_status(&buf, &ref, remote_refs)) - continue; + if (flags & TRANSPORT_PUSH_DRY_RUN || !data->rs.nr || data->no_private_update) + return 0; - if (flags & TRANSPORT_PUSH_DRY_RUN || !data->rs.nr || data->no_private_update) - continue; + /* propagate back the update to the remote namespace */ + for (ref = remote_refs; ref; ref = ref->next) { + char *private; - /* propagate back the update to the remote namespace */ - private = apply_refspecs(&data->rs, ref->name); - if (!private) + if (ref->status != REF_STATUS_OK) continue; - update_ref("update by helper", private, &ref->new_oid, NULL, - 0, 0); - free(private); + + if (!ref->report) { + private = apply_refspecs(&data->rs, ref->name); + if (!private) + continue; + update_ref("update by helper", private, &(ref->new_oid), + NULL, 0, 0); + free(private); + } else { + for (report = ref->report; report; report = report->next) { + private = apply_refspecs(&data->rs, + report->ref_name + ? report->ref_name + : ref->name); + if (!private) + continue; + update_ref("update by helper", private, + report->new_oid + ? report->new_oid + : &(ref->new_oid), + NULL, 0, 0); + free(private); + } + } } - strbuf_release(&buf); - return ret; + return 0; } static void set_common_push_options(struct transport *transport, @@ -840,6 +930,10 @@ 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) @@ -874,6 +968,7 @@ static int push_refs_with_push(struct transport *transport, case REF_STATUS_REJECT_STALE: case REF_STATUS_REJECT_ALREADY_EXISTS: if (atomic) { + reject_atomic_push(remote_refs, mirror); string_list_clear(&cas_options, 0); return 0; } else @@ -1025,7 +1120,7 @@ static int push_refs(struct transport *transport, if (!remote_refs) { fprintf(stderr, _("No refs in common and none specified; doing nothing.\n" - "Perhaps you should specify a branch such as 'master'.\n")); + "Perhaps you should specify a branch.\n")); return 0; } @@ -1057,7 +1152,20 @@ 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) + const struct strvec *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; @@ -1066,11 +1174,13 @@ static struct ref *get_refs_list(struct transport *transport, int for_push, 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->object_format) { + write_str_in_full(helper->in, "option object-format\n"); + if (recvline(data, &buf) || strcmp(buf.buf, "ok")) + exit(128); } if (data->push && for_push) @@ -1085,6 +1195,17 @@ static struct ref *get_refs_list(struct transport *transport, int for_push, if (!*buf.buf) break; + else if (buf.buf[0] == ':') { + const char *value; + if (skip_prefix(buf.buf, ":object-format ", &value)) { + int algo = hash_algo_by_name(value); + if (algo == GIT_HASH_UNKNOWN) + die(_("unsupported object format '%s'"), + value); + transport->hash_algo = &hash_algos[algo]; + } + continue; + } eov = strchr(buf.buf, ' '); if (!eov) @@ -1097,7 +1218,7 @@ static struct ref *get_refs_list(struct transport *transport, int for_push, if (buf.buf[0] == '@') (*tail)->symref = xstrdup(buf.buf + 1); else if (buf.buf[0] != '?') - get_oid_hex(buf.buf, &(*tail)->old_oid); + get_oid_hex_algop(buf.buf, &(*tail)->old_oid, transport->hash_algo); if (eon) { if (has_attribute(eon + 1, "unchanged")) { (*tail)->status |= REF_STATUS_UPTODATE; @@ -1119,7 +1240,6 @@ static struct ref *get_refs_list(struct transport *transport, int for_push, } static struct transport_vtable vtable = { - 0, set_helper_option, get_refs_list, fetch, @@ -1460,3 +1580,25 @@ int bidirectional_transfer_loop(int input, int output) return tloop_spawnwait_tasks(&state); } + +void reject_atomic_push(struct ref *remote_refs, int mirror_mode) +{ + struct ref *ref; + + /* Mark other refs as failed */ + for (ref = remote_refs; ref; ref = ref->next) { + if (!ref->peer_ref && !mirror_mode) + continue; + + switch (ref->status) { + case REF_STATUS_NONE: + case REF_STATUS_OK: + case REF_STATUS_EXPECTING_REPORT: + ref->status = REF_STATUS_ATOMIC_PUSH_FAILED; + continue; + default: + break; /* do nothing */ + } + } + return; +} diff --git a/third_party/git/transport-internal.h b/third_party/git/transport-internal.h index 004bee5e36..27c9daffc4 100644 --- a/third_party/git/transport-internal.h +++ b/third_party/git/transport-internal.h @@ -3,16 +3,10 @@ struct ref; struct transport; -struct argv_array; +struct strvec; 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. @@ -36,7 +30,7 @@ struct transport_vtable { * in the ref's old_sha1 field; otherwise it should be all 0. **/ struct ref *(*get_refs_list)(struct transport *transport, int for_push, - const struct argv_array *ref_prefixes); + const struct strvec *ref_prefixes); /** * Fetch the objects for the given refs. Note that this gets diff --git a/third_party/git/transport.c b/third_party/git/transport.c index 778c60bf57..ffe2115845 100644 --- a/third_party/git/transport.c +++ b/third_party/git/transport.c @@ -16,7 +16,7 @@ #include "url.h" #include "submodule.h" #include "string-list.h" -#include "sha1-array.h" +#include "oid-array.h" #include "sigchain.h" #include "transport-internal.h" #include "protocol.h" @@ -122,11 +122,12 @@ 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, int for_push, - const struct argv_array *ref_prefixes) + const struct strvec *ref_prefixes) { struct bundle_transport_data *data = transport->data; struct ref *result = NULL; @@ -135,11 +136,16 @@ 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); if (data->fd < 0) die(_("could not read bundle '%s'"), transport->url); + + transport->hash_algo = data->header.hash_algo; + for (i = 0; i < data->header.references.nr; i++) { struct ref_list_entry *e = data->header.references.list + i; struct ref *ref = alloc_ref(e->name); @@ -154,8 +160,14 @@ static int fetch_refs_from_bundle(struct transport *transport, int nr_heads, struct ref **to_fetch) { struct bundle_transport_data *data = transport->data; - return unbundle(the_repository, &data->header, data->fd, - transport->progress ? BUNDLE_VERBOSE : 0); + int ret; + + if (!data->get_refs_from_bundle_called) + get_refs_from_bundle(transport, 0, NULL); + ret = unbundle(the_repository, &data->header, data->fd, + transport->progress ? BUNDLE_VERBOSE : 0); + transport->hash_algo = data->header.hash_algo; + return ret; } static int close_bundle(struct transport *transport) @@ -220,10 +232,8 @@ static int set_git_option(struct git_transport_options *opts, } else if (!strcmp(name, TRANS_OPT_FROM_PROMISOR)) { opts->from_promisor = !!value; return 0; - } else if (!strcmp(name, TRANS_OPT_NO_DEPENDENTS)) { - 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; } @@ -270,7 +280,7 @@ static void die_if_server_options(struct transport *transport) * remote refs. */ static struct ref *handshake(struct transport *transport, int for_push, - const struct argv_array *ref_prefixes, + const struct strvec *ref_prefixes, int must_list_refs) { struct git_transport_data *data = transport->data; @@ -290,7 +300,8 @@ static struct ref *handshake(struct transport *transport, int for_push, if (must_list_refs) get_remote_refs(data->fd[1], &reader, &refs, for_push, ref_prefixes, - transport->server_options); + transport->server_options, + transport->stateless_rpc); break; case protocol_v1: case protocol_v0: @@ -304,6 +315,7 @@ static struct ref *handshake(struct transport *transport, int for_push, BUG("unknown protocol version"); } data->got_remote_heads = 1; + transport->hash_algo = reader.hash_algo; if (reader.line_peeked) BUG("buffer must be empty at the end of handshake()"); @@ -312,7 +324,7 @@ static struct ref *handshake(struct transport *transport, int for_push, } static struct ref *get_refs_via_connect(struct transport *transport, int for_push, - const struct argv_array *ref_prefixes) + const struct strvec *ref_prefixes) { return handshake(transport, for_push, ref_prefixes, 1); } @@ -344,7 +356,6 @@ static int fetch_refs_via_pack(struct transport *transport, args.cloning = transport->cloning; args.update_shallow = data->options.update_shallow; args.from_promisor = data->options.from_promisor; - args.no_dependents = data->options.no_dependents; args.filter_options = data->options.filter_options; args.stateless_rpc = transport->stateless_rpc; args.server_options = transport->server_options; @@ -362,24 +373,15 @@ static int fetch_refs_via_pack(struct transport *transport, refs_tmp = handshake(transport, 0, NULL, must_list_refs); } - switch (data->version) { - case protocol_v2: - refs = fetch_pack(&args, data->fd, - refs_tmp ? refs_tmp : transport->remote_refs, - to_fetch, nr_heads, &data->shallow, - &transport->pack_lockfile, data->version); - break; - case protocol_v1: - case protocol_v0: - die_if_server_options(transport); - refs = fetch_pack(&args, data->fd, - refs_tmp ? refs_tmp : transport->remote_refs, - to_fetch, nr_heads, &data->shallow, - &transport->pack_lockfile, data->version); - break; - case protocol_unknown_version: + if (data->version == protocol_unknown_version) BUG("unknown protocol version"); - } + else if (data->version <= protocol_v1) + die_if_server_options(transport); + + refs = fetch_pack(&args, data->fd, + refs_tmp ? refs_tmp : transport->remote_refs, + to_fetch, nr_heads, &data->shallow, + &transport->pack_lockfiles, data->version); close(data->fd[0]); close(data->fd[1]); @@ -430,37 +432,67 @@ int transport_refs_pushed(struct ref *ref) return 0; } -void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose) +static void update_one_tracking_ref(struct remote *remote, char *refname, + struct object_id *new_oid, int deletion, + int verbose) { struct refspec_item rs; - if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE) - return; - - rs.src = ref->name; + memset(&rs, 0, sizeof(rs)); + rs.src = refname; rs.dst = NULL; if (!remote_find_tracking(remote, &rs)) { if (verbose) fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst); - if (ref->deletion) { + if (deletion) delete_ref(NULL, rs.dst, NULL, 0); - } else - update_ref("update by push", rs.dst, &ref->new_oid, + else + update_ref("update by push", rs.dst, new_oid, NULL, 0, 0); free(rs.dst); } } +void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose) +{ + char *refname; + struct object_id *new_oid; + struct ref_push_report *report; + + if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE) + return; + + report = ref->report; + if (!report) + update_one_tracking_ref(remote, ref->name, &ref->new_oid, + ref->deletion, verbose); + else + for (; report; report = report->next) { + refname = report->ref_name ? (char *)report->ref_name : ref->name; + new_oid = report->new_oid ? report->new_oid : &ref->new_oid; + update_one_tracking_ref(remote, refname, new_oid, + is_null_oid(new_oid), verbose); + } +} + static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg, + struct ref_push_report *report, int porcelain, int summary_width) { + const char *to_name; + + if (report && report->ref_name) + to_name = report->ref_name; + else + to_name = to->name; + if (porcelain) { if (from) - fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to->name); + fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to_name); else - fprintf(stdout, "%c\t:%s\t", flag, to->name); + fprintf(stdout, "%c\t:%s\t", flag, to_name); if (msg) fprintf(stdout, "%s (%s)\n", summary, msg); else @@ -474,9 +506,11 @@ static void print_ref_status(char flag, const char *summary, fprintf(stderr, " %s%c %-*s%s ", red, flag, summary_width, summary, reset); if (from) - fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name)); + fprintf(stderr, "%s -> %s", + prettify_refname(from->name), + prettify_refname(to_name)); else - fputs(prettify_refname(to->name), stderr); + fputs(prettify_refname(to_name), stderr); if (msg) { fputs(" (", stderr); fputs(msg, stderr); @@ -486,24 +520,52 @@ static void print_ref_status(char flag, const char *summary, } } -static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_width) +static void print_ok_ref_status(struct ref *ref, + struct ref_push_report *report, + int porcelain, int summary_width) { + struct object_id *old_oid; + struct object_id *new_oid; + const char *ref_name; + int forced_update; + + if (report && report->old_oid) + old_oid = report->old_oid; + else + old_oid = &ref->old_oid; + if (report && report->new_oid) + new_oid = report->new_oid; + else + new_oid = &ref->new_oid; + if (report && report->forced_update) + forced_update = report->forced_update; + else + forced_update = ref->forced_update; + if (report && report->ref_name) + ref_name = report->ref_name; + else + ref_name = ref->name; + if (ref->deletion) print_ref_status('-', "[deleted]", ref, NULL, NULL, - porcelain, summary_width); - else if (is_null_oid(&ref->old_oid)) + report, porcelain, summary_width); + else if (is_null_oid(old_oid)) print_ref_status('*', - (starts_with(ref->name, "refs/tags/") ? "[new tag]" : - "[new branch]"), - ref, ref->peer_ref, NULL, porcelain, summary_width); + (starts_with(ref_name, "refs/tags/") + ? "[new tag]" + : (starts_with(ref_name, "refs/heads/") + ? "[new branch]" + : "[new reference]")), + ref, ref->peer_ref, NULL, + report, porcelain, summary_width); else { struct strbuf quickref = STRBUF_INIT; char type; const char *msg; - strbuf_add_unique_abbrev(&quickref, &ref->old_oid, + strbuf_add_unique_abbrev(&quickref, old_oid, DEFAULT_ABBREV); - if (ref->forced_update) { + if (forced_update) { strbuf_addstr(&quickref, "..."); type = '+'; msg = "forced update"; @@ -512,16 +574,17 @@ static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_widt type = ' '; msg = NULL; } - strbuf_add_unique_abbrev(&quickref, &ref->new_oid, + strbuf_add_unique_abbrev(&quickref, new_oid, DEFAULT_ABBREV); print_ref_status(type, quickref.buf, ref, ref->peer_ref, msg, - porcelain, summary_width); + report, porcelain, summary_width); strbuf_release(&quickref); } } -static int print_one_push_status(struct ref *ref, const char *dest, int count, +static int print_one_push_report(struct ref *ref, const char *dest, int count, + struct ref_push_report *report, int porcelain, int summary_width) { if (!count) { @@ -533,65 +596,89 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count, switch(ref->status) { case REF_STATUS_NONE: print_ref_status('X', "[no match]", ref, NULL, NULL, - porcelain, summary_width); + report, porcelain, summary_width); break; case REF_STATUS_REJECT_NODELETE: print_ref_status('!', "[rejected]", ref, NULL, "remote does not support deleting refs", - porcelain, summary_width); + report, porcelain, summary_width); break; case REF_STATUS_UPTODATE: print_ref_status('=', "[up to date]", ref, - ref->peer_ref, NULL, porcelain, summary_width); + ref->peer_ref, NULL, + report, porcelain, summary_width); break; case REF_STATUS_REJECT_NONFASTFORWARD: print_ref_status('!', "[rejected]", ref, ref->peer_ref, - "non-fast-forward", porcelain, summary_width); + "non-fast-forward", + report, porcelain, summary_width); break; case REF_STATUS_REJECT_ALREADY_EXISTS: print_ref_status('!', "[rejected]", ref, ref->peer_ref, - "already exists", porcelain, summary_width); + "already exists", + report, porcelain, summary_width); break; case REF_STATUS_REJECT_FETCH_FIRST: print_ref_status('!', "[rejected]", ref, ref->peer_ref, - "fetch first", porcelain, summary_width); + "fetch first", + report, porcelain, summary_width); break; case REF_STATUS_REJECT_NEEDS_FORCE: print_ref_status('!', "[rejected]", ref, ref->peer_ref, - "needs force", porcelain, summary_width); + "needs force", + report, porcelain, summary_width); break; case REF_STATUS_REJECT_STALE: print_ref_status('!', "[rejected]", ref, ref->peer_ref, - "stale info", porcelain, summary_width); + "stale info", + report, porcelain, summary_width); break; case REF_STATUS_REJECT_SHALLOW: print_ref_status('!', "[rejected]", ref, ref->peer_ref, "new shallow roots not allowed", - porcelain, summary_width); + report, porcelain, summary_width); break; case REF_STATUS_REMOTE_REJECT: print_ref_status('!', "[remote rejected]", ref, ref->deletion ? NULL : ref->peer_ref, - ref->remote_status, porcelain, summary_width); + ref->remote_status, + report, porcelain, summary_width); break; case REF_STATUS_EXPECTING_REPORT: print_ref_status('!', "[remote failure]", ref, ref->deletion ? NULL : ref->peer_ref, "remote failed to report status", - porcelain, summary_width); + report, porcelain, summary_width); break; case REF_STATUS_ATOMIC_PUSH_FAILED: print_ref_status('!', "[rejected]", ref, ref->peer_ref, - "atomic push failed", porcelain, summary_width); + "atomic push failed", + report, porcelain, summary_width); break; case REF_STATUS_OK: - print_ok_ref_status(ref, porcelain, summary_width); + print_ok_ref_status(ref, report, porcelain, summary_width); break; } return 1; } +static int print_one_push_status(struct ref *ref, const char *dest, int count, + int porcelain, int summary_width) +{ + struct ref_push_report *report; + int n = 0; + + if (!ref->report) + return print_one_push_report(ref, dest, count, + NULL, porcelain, summary_width); + + for (report = ref->report; report; report = report->next) + print_one_push_report(ref, dest, count + n++, + report, porcelain, summary_width); + return n; +} + static int measure_abbrev(const struct object_id *oid, int sofar) { char hex[GIT_MAX_HEXSZ + 1]; @@ -708,7 +795,15 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re close(data->fd[1]); close(data->fd[0]); - ret |= finish_connect(data->conn); + /* + * Atomic push may abort the connection early and close the pipe, + * which may cause an error for `finish_connect()`. Ignore this error + * for atomic git-push. + */ + if (ret || args.atomic) + finish_connect(data->conn); + else + ret = finish_connect(data->conn); data->conn = NULL; data->got_remote_heads = 0; @@ -730,7 +825,7 @@ static int disconnect_git(struct transport *transport) { struct git_transport_data *data = transport->data; if (data->conn) { - if (data->got_remote_heads) + if (data->got_remote_heads && !transport->stateless_rpc) packet_flush(data->fd[1]); close(data->fd[0]); close(data->fd[1]); @@ -742,7 +837,6 @@ static int disconnect_git(struct transport *transport) } static struct transport_vtable taken_over_vtable = { - 1, NULL, get_refs_via_connect, fetch_refs_via_pack, @@ -892,7 +986,6 @@ void transport_check_allowed(const char *type) } static struct transport_vtable bundle_vtable = { - 0, NULL, get_refs_from_bundle, fetch_refs_from_bundle, @@ -902,7 +995,6 @@ static struct transport_vtable bundle_vtable = { }; static struct transport_vtable builtin_smart_vtable = { - 1, NULL, get_refs_via_connect, fetch_refs_via_pack, @@ -917,6 +1009,7 @@ struct transport *transport_get(struct remote *remote, const char *url) struct transport *ret = xcalloc(1, sizeof(*ret)); ret->progress = isatty(2); + string_list_init(&ret->pack_lockfiles, 1); if (!remote) BUG("No remote provided to transport_get()"); @@ -984,9 +1077,16 @@ struct transport *transport_get(struct remote *remote, const char *url) ret->smart_options->receivepack = remote->receivepack; } + ret->hash_algo = &hash_algos[GIT_HASH_SHA1]; + return ret; } +const struct git_hash_algo *transport_get_hash_algo(struct transport *transport) +{ + return transport->hash_algo; +} + int transport_set_option(struct transport *transport, const char *name, const char *value) { @@ -1134,17 +1234,19 @@ int transport_push(struct repository *r, int porcelain = flags & TRANSPORT_PUSH_PORCELAIN; int pretend = flags & TRANSPORT_PUSH_DRY_RUN; int push_ret, ret, err; - struct argv_array ref_prefixes = ARGV_ARRAY_INIT; + struct strvec ref_prefixes = STRVEC_INIT; if (check_push_refs(local_refs, rs) < 0) return -1; 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); + strvec_clear(&ref_prefixes); if (flags & TRANSPORT_PUSH_ALL) match_flags |= MATCH_REFS_ALL; @@ -1178,6 +1280,7 @@ 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, @@ -1190,9 +1293,11 @@ 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) || @@ -1203,6 +1308,7 @@ 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, @@ -1213,33 +1319,23 @@ 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)) + if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) { + trace2_region_enter("transport_push", "push_refs", r); push_ret = transport->vtable->push_refs(transport, remote_refs, flags); - else + trace2_region_leave("transport_push", "push_refs", r); + } else push_ret = 0; err = push_had_errors(remote_refs); ret = push_ret | err; - if ((flags & TRANSPORT_PUSH_ATOMIC) && err) { - struct ref *it; - for (it = remote_refs; it; it = it->next) - switch (it->status) { - case REF_STATUS_NONE: - case REF_STATUS_UPTODATE: - case REF_STATUS_OK: - it->status = REF_STATUS_ATOMIC_PUSH_FAILED; - break; - default: - break; - } - } - if (!quiet || err) transport_print_push_status(transport->url, remote_refs, verbose | porcelain, porcelain, @@ -1266,7 +1362,7 @@ int transport_push(struct repository *r, } const struct ref *transport_get_remote_refs(struct transport *transport, - const struct argv_array *ref_prefixes) + const struct strvec *ref_prefixes) { if (!transport->got_remote_refs) { transport->remote_refs = @@ -1285,15 +1381,6 @@ 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 && @@ -1325,10 +1412,11 @@ int transport_fetch_refs(struct transport *transport, struct ref *refs) void transport_unlock_pack(struct transport *transport) { - if (transport->pack_lockfile) { - unlink_or_warn(transport->pack_lockfile); - FREE_AND_NULL(transport->pack_lockfile); - } + int i; + + for (i = 0; i < transport->pack_lockfiles.nr; i++) + unlink_or_warn(transport->pack_lockfiles.items[i].string); + string_list_clear(&transport->pack_lockfiles, 0); } int transport_connect(struct transport *transport, const char *name, diff --git a/third_party/git/transport.h b/third_party/git/transport.h index 0b5f7806f6..ca409ea1e4 100644 --- a/third_party/git/transport.h +++ b/third_party/git/transport.h @@ -5,8 +5,7 @@ #include "run-command.h" #include "remote.h" #include "list-objects-filter-options.h" - -struct string_list; +#include "string-list.h" struct git_transport_options { unsigned thin : 1; @@ -16,8 +15,9 @@ struct git_transport_options { unsigned self_contained_and_connected : 1; unsigned update_shallow : 1; unsigned deepen_relative : 1; + + /* see documentation of corresponding flag in fetch-pack.h */ unsigned from_promisor : 1; - unsigned no_dependents : 1; /* * If this transport supports connect or stateless-connect, @@ -98,7 +98,8 @@ struct transport { */ const struct string_list *server_options; - char *pack_lockfile; + struct string_list pack_lockfiles; + signed verbose : 3; /** * Transports should not set this directly, and should use this @@ -115,6 +116,8 @@ struct transport { struct git_transport_options *smart_options; enum transport_family family; + + const struct git_hash_algo *hash_algo; }; #define TRANSPORT_PUSH_ALL (1<<0) @@ -199,15 +202,12 @@ void transport_check_allowed(const char *type); /* Indicate that these objects are being fetched by a promisor */ #define TRANS_OPT_FROM_PROMISOR "from-promisor" -/* - * Indicate that only the objects wanted need to be fetched, not their - * dependents - */ -#define TRANS_OPT_NO_DEPENDENTS "no-dependents" - /* 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. @@ -238,8 +238,14 @@ int transport_push(struct repository *repo, * ref_prefixes. */ const struct ref *transport_get_remote_refs(struct transport *transport, - const struct argv_array *ref_prefixes); + const struct strvec *ref_prefixes); +/* + * Fetch the hash algorithm used by a remote. + * + * This can only be called after fetching the remote refs. + */ +const struct git_hash_algo *transport_get_hash_algo(struct transport *transport); int transport_fetch_refs(struct transport *transport, struct ref *refs); void transport_unlock_pack(struct transport *transport); int transport_disconnect(struct transport *transport); @@ -262,4 +268,7 @@ int transport_refs_pushed(struct ref *ref); void transport_print_push_status(const char *dest, struct ref *refs, int verbose, int porcelain, unsigned int *reject_reasons); +/* common method used by transport-helper.c and send-pack.c */ +void reject_atomic_push(struct ref *refs, int mirror_mode); + #endif diff --git a/third_party/git/tree-diff.c b/third_party/git/tree-diff.c index 33ded7f8b3..7cebbb327e 100644 --- a/third_party/git/tree-diff.c +++ b/third_party/git/tree-diff.c @@ -29,9 +29,9 @@ static struct combine_diff_path *ll_diff_tree_paths( struct combine_diff_path *p, const struct object_id *oid, const struct object_id **parents_oid, int nparent, struct strbuf *base, struct diff_options *opt); -static int ll_diff_tree_oid(const struct object_id *old_oid, - const struct object_id *new_oid, - struct strbuf *base, struct diff_options *opt); +static void ll_diff_tree_oid(const struct object_id *old_oid, + const struct object_id *new_oid, + struct strbuf *base, struct diff_options *opt); /* * Compare two tree entries, taking into account only path/S_ISDIR(mode), @@ -434,6 +434,9 @@ static struct combine_diff_path *ll_diff_tree_paths( if (diff_can_quit_early(opt)) break; + if (opt->max_changes && diff_queued_diff.nr > opt->max_changes) + break; + if (opt->pathspec.nr) { skip_uninteresting(&t, base, opt); for (i = 0; i < nparent; i++) @@ -673,9 +676,9 @@ static void try_to_follow_renames(const struct object_id *old_oid, q->nr = 1; } -static int ll_diff_tree_oid(const struct object_id *old_oid, - const struct object_id *new_oid, - struct strbuf *base, struct diff_options *opt) +static void ll_diff_tree_oid(const struct object_id *old_oid, + const struct object_id *new_oid, + struct strbuf *base, struct diff_options *opt) { struct combine_diff_path phead, *p; pathchange_fn_t pathchange_old = opt->pathchange; @@ -691,29 +694,27 @@ static int ll_diff_tree_oid(const struct object_id *old_oid, } opt->pathchange = pathchange_old; - return 0; } -int diff_tree_oid(const struct object_id *old_oid, - const struct object_id *new_oid, - const char *base_str, struct diff_options *opt) +void diff_tree_oid(const struct object_id *old_oid, + const struct object_id *new_oid, + const char *base_str, struct diff_options *opt) { struct strbuf base; - int retval; strbuf_init(&base, PATH_MAX); strbuf_addstr(&base, base_str); - retval = ll_diff_tree_oid(old_oid, new_oid, &base, opt); + ll_diff_tree_oid(old_oid, new_oid, &base, opt); if (!*base_str && opt->flags.follow_renames && diff_might_be_rename()) try_to_follow_renames(old_oid, new_oid, &base, opt); strbuf_release(&base); - - return retval; } -int diff_root_tree_oid(const struct object_id *new_oid, const char *base, struct diff_options *opt) +void diff_root_tree_oid(const struct object_id *new_oid, + const char *base, + struct diff_options *opt) { - return diff_tree_oid(NULL, new_oid, base, opt); + diff_tree_oid(NULL, new_oid, base, opt); } diff --git a/third_party/git/tree-walk.c b/third_party/git/tree-walk.c index c20b62f49e..0160294712 100644 --- a/third_party/git/tree-walk.c +++ b/third_party/git/tree-walk.c @@ -1,6 +1,5 @@ #include "cache.h" #include "tree-walk.h" -#include "unpack-trees.h" #include "dir.h" #include "object-store.h" #include "tree.h" @@ -170,40 +169,61 @@ int tree_entry_gently(struct tree_desc *desc, struct name_entry *entry) void setup_traverse_info(struct traverse_info *info, const char *base) { - int pathlen = strlen(base); + size_t 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.path = base; - info->name.pathlen = pathlen; - if (pathlen) { - hashcpy(info->name.oid.hash, (const unsigned char *)base + pathlen + 1); + info->name = base; + info->namelen = pathlen; + if (pathlen) info->prev = &dummy; - } } -char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n) +char *make_traverse_path(char *path, size_t pathlen, + const struct traverse_info *info, + const char *name, size_t namelen) { - int len = tree_entry_len(n); - int pathlen = info->pathlen; + /* 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"); - path[pathlen + len] = 0; + path[pos] = 0; for (;;) { - memcpy(path + pathlen, n->path, len); - if (!pathlen) + if (pos < namelen) + BUG("traverse_info pathlen does not match strings"); + pos -= namelen; + memcpy(path + pos, name, namelen); + + if (!pos) break; - path[--pathlen] = '/'; - n = &info->name; - len = tree_entry_len(n); + path[--pos] = '/'; + + if (!info) + BUG("traverse_info ran out of list items"); + name = info->name; + namelen = info->namelen; 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; @@ -389,24 +409,28 @@ int traverse_trees(struct index_state *istate, struct traverse_info *info) { int error = 0; - struct name_entry *entry = xmalloc(n*sizeof(*entry)); + struct name_entry entry[MAX_TRAVERSE_TREES]; int i; - struct tree_desc_x *tx = xcalloc(n, sizeof(*tx)); + struct tree_desc_x tx[ARRAY_SIZE(entry)]; struct strbuf base = STRBUF_INIT; int interesting = 1; char *traverse_path; - for (i = 0; i < n; i++) + if (n >= ARRAY_SIZE(entry)) + BUG("traverse_trees() called with too many trees (%d)", n); + + for (i = 0; i < n; i++) { tx[i].d = t[i]; + tx[i].skip = NULL; + } if (info->prev) { - 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); + strbuf_make_traverse_path(&base, info->prev, + info->name, info->namelen); + strbuf_addch(&base, '/'); + traverse_path = xstrndup(base.buf, base.len); } else { - traverse_path = xstrndup(info->name.path, info->pathlen); + traverse_path = xstrndup(info->name, info->pathlen); } info->traverse_path = traverse_path; for (;;) { @@ -486,10 +510,8 @@ 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); @@ -829,7 +851,14 @@ static int match_entry(const struct pathspec_item *item, if (matchlen > pathlen) { if (match[pathlen] != '/') return 0; - if (!S_ISDIR(entry->mode) && !S_ISGITLINK(entry->mode)) + /* + * Reject non-directories as partial pathnames, except + * when match is a submodule with a trailing slash and + * nothing else (to handle 'submod/' and 'submod' + * uniformly). + */ + if (!S_ISDIR(entry->mode) && + (!S_ISGITLINK(entry->mode) || matchlen > pathlen + 1)) return 0; } @@ -1104,7 +1133,7 @@ match_wildcards: * later on. * max_depth is ignored but we may consider support it * in future, see - * https://public-inbox.org/git/7vmxo5l2g4.fsf@alter.siamese.dyndns.org/ + * https://lore.kernel.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 2a5db29e8f..a5058469e9 100644 --- a/third_party/git/tree-walk.h +++ b/third_party/git/tree-walk.h @@ -3,6 +3,15 @@ #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; @@ -10,12 +19,29 @@ 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; @@ -23,6 +49,11 @@ 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; @@ -33,48 +64,145 @@ 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); /* - * Helper function that does both tree_entry_extract() and update_tree_entry() - * and returns true for success + * 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. */ 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; - struct name_entry name; - int pathlen; + + /* 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 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 *); -char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n); + +/** + * 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. + */ void setup_traverse_info(struct traverse_info *info, const char *base); -static inline int traverse_path_len(const struct traverse_info *info, const struct name_entry *n) +/** + * 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) { - return info->pathlen + tree_entry_len(n); + return st_add(info->pathlen, namelen); } /* in general, positive means "kind of interesting" */ diff --git a/third_party/git/tree.c b/third_party/git/tree.c index 4720945e6a..e76517f6b1 100644 --- a/third_party/git/tree.c +++ b/third_party/git/tree.c @@ -200,7 +200,7 @@ struct tree *lookup_tree(struct repository *r, const struct object_id *oid) struct object *obj = lookup_object(r, oid); if (!obj) return create_object(r, oid, alloc_tree_node(r)); - return object_as_type(r, obj, OBJ_TREE, 0); + return object_as_type(obj, OBJ_TREE, 0); } int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size) @@ -244,19 +244,7 @@ void free_tree_buffer(struct tree *tree) struct tree *parse_tree_indirect(const struct object_id *oid) { - 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); + 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); } diff --git a/third_party/git/unicode-width.h b/third_party/git/unicode-width.h index c9d027625d..b50e686bae 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 }, -{ 0x0B56, 0x0B56 }, +{ 0x0B55, 0x0B56 }, { 0x0B62, 0x0B63 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, @@ -82,6 +82,7 @@ static const struct interval zero_width[] = { { 0x0D41, 0x0D44 }, { 0x0D4D, 0x0D4D }, { 0x0D62, 0x0D63 }, +{ 0x0D81, 0x0D81 }, { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, @@ -139,7 +140,7 @@ static const struct interval zero_width[] = { { 0x1A65, 0x1A6C }, { 0x1A73, 0x1A7C }, { 0x1A7F, 0x1A7F }, -{ 0x1AB0, 0x1ABE }, +{ 0x1AB0, 0x1AC0 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, { 0x1B36, 0x1B3A }, @@ -182,6 +183,7 @@ static const struct interval zero_width[] = { { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, { 0xA825, 0xA826 }, +{ 0xA82C, 0xA82C }, { 0xA8C4, 0xA8C5 }, { 0xA8E0, 0xA8F1 }, { 0xA8FF, 0xA8FF }, @@ -223,6 +225,7 @@ static const struct interval zero_width[] = { { 0x10A3F, 0x10A3F }, { 0x10AE5, 0x10AE6 }, { 0x10D24, 0x10D27 }, +{ 0x10EAB, 0x10EAC }, { 0x10F46, 0x10F50 }, { 0x11001, 0x11001 }, { 0x11038, 0x11046 }, @@ -238,6 +241,7 @@ static const struct interval zero_width[] = { { 0x11180, 0x11181 }, { 0x111B6, 0x111BE }, { 0x111C9, 0x111CC }, +{ 0x111CF, 0x111CF }, { 0x1122F, 0x11231 }, { 0x11234, 0x11234 }, { 0x11236, 0x11237 }, @@ -273,6 +277,9 @@ static const struct interval zero_width[] = { { 0x11727, 0x1172B }, { 0x1182F, 0x11837 }, { 0x11839, 0x1183A }, +{ 0x1193B, 0x1193C }, +{ 0x1193E, 0x1193E }, +{ 0x11943, 0x11943 }, { 0x119D4, 0x119D7 }, { 0x119DA, 0x119DB }, { 0x119E0, 0x119E0 }, @@ -305,6 +312,7 @@ static const struct interval zero_width[] = { { 0x16B30, 0x16B36 }, { 0x16F4F, 0x16F4F }, { 0x16F8F, 0x16F92 }, +{ 0x16FE4, 0x16FE4 }, { 0x1BC9D, 0x1BC9E }, { 0x1BCA0, 0x1BCA3 }, { 0x1D167, 0x1D169 }, @@ -376,8 +384,7 @@ static const struct interval double_width[] = { { 0x3099, 0x30FF }, { 0x3105, 0x312F }, { 0x3131, 0x318E }, -{ 0x3190, 0x31BA }, -{ 0x31C0, 0x31E3 }, +{ 0x3190, 0x31E3 }, { 0x31F0, 0x321E }, { 0x3220, 0x3247 }, { 0x3250, 0x4DBF }, @@ -392,9 +399,11 @@ static const struct interval double_width[] = { { 0xFE68, 0xFE6B }, { 0xFF01, 0xFF60 }, { 0xFFE0, 0xFFE6 }, -{ 0x16FE0, 0x16FE3 }, +{ 0x16FE0, 0x16FE4 }, +{ 0x16FF0, 0x16FF1 }, { 0x17000, 0x187F7 }, -{ 0x18800, 0x18AF2 }, +{ 0x18800, 0x18CD5 }, +{ 0x18D00, 0x18D08 }, { 0x1B000, 0x1B11E }, { 0x1B150, 0x1B152 }, { 0x1B164, 0x1B167 }, @@ -429,20 +438,22 @@ static const struct interval double_width[] = { { 0x1F680, 0x1F6C5 }, { 0x1F6CC, 0x1F6CC }, { 0x1F6D0, 0x1F6D2 }, -{ 0x1F6D5, 0x1F6D5 }, +{ 0x1F6D5, 0x1F6D7 }, { 0x1F6EB, 0x1F6EC }, -{ 0x1F6F4, 0x1F6FA }, +{ 0x1F6F4, 0x1F6FC }, { 0x1F7E0, 0x1F7EB }, -{ 0x1F90D, 0x1F971 }, -{ 0x1F973, 0x1F976 }, -{ 0x1F97A, 0x1F9A2 }, -{ 0x1F9A5, 0x1F9AA }, -{ 0x1F9AE, 0x1F9CA }, +{ 0x1F90C, 0x1F93A }, +{ 0x1F93C, 0x1F945 }, +{ 0x1F947, 0x1F978 }, +{ 0x1F97A, 0x1F9CB }, { 0x1F9CD, 0x1F9FF }, -{ 0x1FA70, 0x1FA73 }, +{ 0x1FA70, 0x1FA74 }, { 0x1FA78, 0x1FA7A }, -{ 0x1FA80, 0x1FA82 }, -{ 0x1FA90, 0x1FA95 }, +{ 0x1FA80, 0x1FA86 }, +{ 0x1FA90, 0x1FAA8 }, +{ 0x1FAB0, 0x1FAB6 }, +{ 0x1FAC0, 0x1FAC2 }, +{ 0x1FAD0, 0x1FAD6 }, { 0x20000, 0x2FFFD }, { 0x30000, 0x3FFFD } }; diff --git a/third_party/git/unpack-trees.c b/third_party/git/unpack-trees.c index 62276d4fef..323280dd48 100644 --- a/third_party/git/unpack-trees.c +++ b/third_party/git/unpack-trees.c @@ -1,5 +1,5 @@ #include "cache.h" -#include "argv-array.h" +#include "strvec.h" #include "repository.h" #include "config.h" #include "dir.h" @@ -11,12 +11,11 @@ #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 "fetch-object.h" +#include "promisor-remote.h" /* * Error messages expected by scripts out of plumbing commands such as @@ -25,7 +24,7 @@ * situation better. See how "git checkout" and "git merge" replaces * them using setup_unpack_trees_porcelain(), for example. */ -static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { +static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = { /* ERROR_WOULD_OVERWRITE */ "Entry '%s' would be overwritten by merge. Cannot merge.", @@ -44,17 +43,20 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { /* ERROR_BIND_OVERLAP */ "Entry '%s' overlaps with '%s'. Cannot bind.", - /* ERROR_SPARSE_NOT_UPTODATE_FILE */ - "Entry '%s' not uptodate. Cannot update sparse checkout.", + /* ERROR_WOULD_LOSE_SUBMODULE */ + "Submodule '%s' cannot checkout new HEAD.", - /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ - "Working tree file '%s' would be overwritten by sparse checkout update.", + /* NB_UNPACK_TREES_ERROR_TYPES; just a meta value */ + "", - /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */ - "Working tree file '%s' would be removed by sparse checkout update.", + /* WARNING_SPARSE_NOT_UPTODATE_FILE */ + "Path '%s' not uptodate; will not remove from working tree.", - /* ERROR_WOULD_LOSE_SUBMODULE */ - "Submodule '%s' cannot checkout new HEAD.", + /* WARNING_SPARSE_UNMERGED_FILE */ + "Path '%s' unmerged; will not remove from working tree.", + + /* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */ + "Path '%s' already present; will not overwrite with sparse update.", }; #define ERRORMSG(o,type) \ @@ -104,7 +106,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, const char **msgs = opts->msgs; const char *msg; - argv_array_init(&opts->msgs_to_free); + strvec_init(&opts->msgs_to_free); if (!strcmp(cmd, "checkout")) msg = advice_commit_before_merge @@ -122,7 +124,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, "Please commit your changes or stash them before you %s.") : _("Your local changes to the following files would be overwritten by %s:\n%%s"); msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = - argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); + strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd); msgs[ERROR_NOT_UPTODATE_DIR] = _("Updating the following directories would lose untracked files in them:\n%s"); @@ -143,7 +145,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, "Please move or remove them before you %s.") : _("The following untracked working tree files would be removed by %s:\n%%s"); msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = - argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); + strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd); if (!strcmp(cmd, "checkout")) msg = advice_commit_before_merge @@ -161,7 +163,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, "Please move or remove them before you %s.") : _("The following untracked working tree files would be overwritten by %s:\n%%s"); msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = - argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); + strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd); /* * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we @@ -169,15 +171,16 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, */ msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind."); - msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = - _("Cannot update sparse checkout: the following entries are not up to date:\n%s"); - msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = - _("The following working tree files would be overwritten by sparse checkout update:\n%s"); - msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = - _("The following working tree files would be removed by sparse checkout update:\n%s"); msgs[ERROR_WOULD_LOSE_SUBMODULE] = _("Cannot update submodule:\n%s"); + msgs[WARNING_SPARSE_NOT_UPTODATE_FILE] = + _("The following paths are not up to date and were left despite sparse patterns:\n%s"); + msgs[WARNING_SPARSE_UNMERGED_FILE] = + _("The following paths are unmerged and were left despite sparse patterns:\n%s"); + msgs[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN] = + _("The following paths were already present and thus not updated despite sparse patterns:\n%s"); + opts->show_all_errors = 1; /* rejected paths may not have a static buffer */ for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++) @@ -186,7 +189,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, void clear_unpack_trees_porcelain(struct unpack_trees_options *opts) { - argv_array_clear(&opts->msgs_to_free); + strvec_clear(&opts->msgs_to_free); memset(opts->msgs, 0, sizeof(opts->msgs)); } @@ -227,7 +230,7 @@ static int add_rejected_path(struct unpack_trees_options *o, /* * Otherwise, insert in a list for future display by - * display_error_msgs() + * display_(error|warning)_msgs() */ string_list_append(&o->unpack_rejects[e], path); return -1; @@ -238,13 +241,16 @@ static int add_rejected_path(struct unpack_trees_options *o, */ static void display_error_msgs(struct unpack_trees_options *o) { - int e, i; - int something_displayed = 0; + int e; + unsigned error_displayed = 0; for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { struct string_list *rejects = &o->unpack_rejects[e]; + if (rejects->nr > 0) { + int i; struct strbuf path = STRBUF_INIT; - something_displayed = 1; + + error_displayed = 1; for (i = 0; i < rejects->nr; i++) strbuf_addf(&path, "\t%s\n", rejects->items[i].string); error(ERRORMSG(o, e), super_prefixed(path.buf)); @@ -252,10 +258,36 @@ static void display_error_msgs(struct unpack_trees_options *o) } string_list_clear(rejects, 0); } - if (something_displayed) + if (error_displayed) fprintf(stderr, _("Aborting\n")); } +/* + * display all the warning messages stored in a nice way + */ +static void display_warning_msgs(struct unpack_trees_options *o) +{ + int e; + unsigned warning_displayed = 0; + for (e = NB_UNPACK_TREES_ERROR_TYPES + 1; + e < NB_UNPACK_TREES_WARNING_TYPES; e++) { + struct string_list *rejects = &o->unpack_rejects[e]; + + if (rejects->nr > 0) { + int i; + struct strbuf path = STRBUF_INIT; + + warning_displayed = 1; + for (i = 0; i < rejects->nr; i++) + strbuf_addf(&path, "\t%s\n", rejects->items[i].string); + warning(ERRORMSG(o, e), super_prefixed(path.buf)); + strbuf_release(&path); + } + string_list_clear(rejects, 0); + } + if (warning_displayed) + fprintf(stderr, _("After fixing the above paths, you may want to run `git sparse-checkout reapply`.\n")); +} static int check_submodule_move_head(const struct cache_entry *ce, const char *old_id, const char *new_id, @@ -276,9 +308,9 @@ static int check_submodule_move_head(const struct cache_entry *ce, } /* - * Preform the loading of the repository's gitmodules file. This function is + * Perform the loading of the repository's gitmodules file. This function is * used by 'check_update()' to perform loading of the gitmodules file in two - * differnt situations: + * different 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 @@ -292,19 +324,19 @@ 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); + repo_read_gitmodules(the_repository, 0); } else if (state && (ce->ce_flags & CE_UPDATE)) { submodule_free(the_repository); checkout_entry(ce, state, NULL, NULL); - repo_read_gitmodules(the_repository); + repo_read_gitmodules(the_repository, 0); } } } -static struct progress *get_progress(struct unpack_trees_options *o) +static struct progress *get_progress(struct unpack_trees_options *o, + struct index_state *index) { unsigned cnt = 0, total = 0; - struct index_state *index = &o->result; if (!o->update || !o->verbose_update) return NULL; @@ -358,12 +390,12 @@ static void report_collided_checkout(struct index_state *index) string_list_clear(&list, 0); } -static int check_updates(struct unpack_trees_options *o) +static int check_updates(struct unpack_trees_options *o, + struct index_state *index) { unsigned cnt = 0; int errs = 0; struct progress *progress; - struct index_state *index = &o->result; struct checkout state = CHECKOUT_INIT; int i; @@ -372,16 +404,22 @@ static int check_updates(struct unpack_trees_options *o) state.quiet = 1; state.refresh_cache = 1; state.istate = index; + clone_checkout_metadata(&state.meta, &o->meta, NULL); + + 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); + progress = get_progress(o, index); - if (o->update) - git_attr_set_direction(GIT_ATTR_CHECKOUT); + git_attr_set_direction(GIT_ATTR_CHECKOUT); - if (should_update_submodules() && o->update && !o->dry_run) + if (should_update_submodules()) load_gitmodules_file(index, NULL); for (i = 0; i < index->cache_nr; i++) { @@ -389,18 +427,18 @@ static int check_updates(struct unpack_trees_options *o) if (ce->ce_flags & CE_WT_REMOVE) { display_progress(progress, ++cnt); - if (o->update && !o->dry_run) - unlink_entry(ce); + unlink_entry(ce); } } + remove_marked_cache_entries(index, 0); remove_scheduled_dirs(); - if (should_update_submodules() && o->update && !o->dry_run) + if (should_update_submodules()) load_gitmodules_file(index, &state); enable_delayed_checkout(&state); - if (repository_format_partial_clone && o->update && !o->dry_run) { + if (has_promisor_remote()) { /* * Prefetch the objects that are to be checked out in the loop * below. @@ -418,9 +456,8 @@ static int check_updates(struct unpack_trees_options *o) continue; oid_array_append(&to_fetch, &ce->oid); } - if (to_fetch.nr) - fetch_objects(repository_format_partial_clone, - to_fetch.oid, to_fetch.nr); + promisor_remote_get_direct(the_repository, + to_fetch.oid, to_fetch.nr); oid_array_clear(&to_fetch); } for (i = 0; i < index->cache_nr; i++) { @@ -432,15 +469,12 @@ static int check_updates(struct unpack_trees_options *o) ce->name); display_progress(progress, ++cnt); ce->ce_flags &= ~CE_UPDATE; - if (o->update && !o->dry_run) { - errs |= checkout_entry(ce, &state, NULL, NULL); - } + errs |= checkout_entry(ce, &state, NULL, NULL); } } stop_progress(&progress); errs |= finish_delayed_checkout(&state, NULL); - if (o->update) - git_attr_set_direction(GIT_ATTR_CHECKIN); + git_attr_set_direction(GIT_ATTR_CHECKIN); if (o->clone) report_collided_checkout(index); @@ -503,19 +537,39 @@ static int apply_sparse_checkout(struct index_state *istate, * also stat info may have lost after merged_entry() so calling * verify_uptodate() again may fail */ - if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o)) + if (!(ce->ce_flags & CE_UPDATE) && + verify_uptodate_sparse(ce, o)) { + ce->ce_flags &= ~CE_SKIP_WORKTREE; return -1; + } ce->ce_flags |= CE_WT_REMOVE; ce->ce_flags &= ~CE_UPDATE; } if (was_skip_worktree && !ce_skip_worktree(ce)) { - if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) + if (verify_absent_sparse(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o)) return -1; ce->ce_flags |= CE_UPDATE; } return 0; } +static int warn_conflicted_path(struct index_state *istate, + int i, + struct unpack_trees_options *o) +{ + char *conflicting_path = istate->cache[i]->name; + int count = 0; + + add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path); + + /* Find out how many higher stage entries are at same path */ + while ((++count) + i < istate->cache_nr && + !strcmp(conflicting_path, istate->cache[count + i]->name)) + ; /* do nothing */ + + return count; +} + static inline int call_unpack_fn(const struct cache_entry * const *src, struct unpack_trees_options *o) { @@ -632,7 +686,7 @@ static int unpack_index_entry(struct cache_entry *ce, return ret; } -static int find_cache_pos(struct traverse_info *, const struct name_entry *); +static int find_cache_pos(struct traverse_info *, const char *p, size_t len); static void restore_cache_bottom(struct traverse_info *info, int bottom) { @@ -651,7 +705,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); + pos = find_cache_pos(info->prev, info->name, info->namelen); if (pos < -1) o->cache_bottom = -2 - pos; @@ -686,21 +740,21 @@ static int index_pos_by_traverse_info(struct name_entry *names, struct traverse_info *info) { struct unpack_trees_options *o = info->data; - int len = traverse_path_len(info, names); - char *name = xmalloc(len + 1 /* slash */ + 1 /* NUL */); + struct strbuf name = STRBUF_INIT; int pos; - make_traverse_path(name, info, names); - name[len++] = '/'; - name[len] = '\0'; - pos = index_name_pos(o->src_index, name, len); + strbuf_make_traverse_path(&name, info, names->path, names->pathlen); + strbuf_addch(&name, '/'); + pos = index_name_pos(o->src_index, name.buf, name.len); if (pos >= 0) BUG("This is a directory and should not exist in index"); pos = -pos - 1; - 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); + 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); return pos; } @@ -811,8 +865,10 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, newinfo = *info; newinfo.prev = info; newinfo.pathspec = info->pathspec; - newinfo.name = *p; - newinfo.pathlen += tree_entry_len(p) + 1; + newinfo.name = p->path; + newinfo.namelen = p->pathlen; + newinfo.mode = p->mode; + newinfo.pathlen = st_add3(newinfo.pathlen, tree_entry_len(p), 1); newinfo.df_conflicts |= df_conflicts; /* @@ -863,14 +919,18 @@ 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 struct name_entry *n) +static int do_compare_entry_piecewise(const struct cache_entry *ce, + const struct traverse_info *info, + const char *name, size_t namelen, + unsigned mode) { - int len, pathlen, ce_len; + int pathlen, ce_len; const char *ce_name; if (info->prev) { int cmp = do_compare_entry_piecewise(ce, info->prev, - &info->name); + info->name, info->namelen, + info->mode); if (cmp) return cmp; } @@ -884,15 +944,15 @@ static int do_compare_entry_piecewise(const struct cache_entry *ce, const struct ce_len -= pathlen; ce_name = ce->name + pathlen; - len = tree_entry_len(n); - return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); + return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode); } static int do_compare_entry(const struct cache_entry *ce, const struct traverse_info *info, - const struct name_entry *n) + const char *name, size_t namelen, + unsigned mode) { - int len, pathlen, ce_len; + int pathlen, ce_len; const char *ce_name; int cmp; @@ -902,7 +962,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, n); + return do_compare_entry_piecewise(ce, info, name, namelen, mode); cmp = strncmp(ce->name, info->traverse_path, info->pathlen); if (cmp) @@ -917,13 +977,12 @@ static int do_compare_entry(const struct cache_entry *ce, ce_len -= pathlen; ce_name = ce->name + pathlen; - len = tree_entry_len(n); - return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); + return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, 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); + int cmp = do_compare_entry(ce, info, n->path, n->pathlen, n->mode); if (cmp) return cmp; @@ -931,7 +990,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, n); + return ce_namelen(ce) > traverse_path_len(info, tree_entry_len(n)); } static int ce_in_traverse_path(const struct cache_entry *ce, @@ -939,7 +998,8 @@ 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)) + if (do_compare_entry(ce, info->prev, + info->name, info->namelen, info->mode)) return 0; /* * If ce (blob) is the same name as the path (which is a tree @@ -954,7 +1014,7 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info, struct index_state *istate, int is_transient) { - int len = traverse_path_len(info, n); + size_t len = traverse_path_len(info, tree_entry_len(n)); struct cache_entry *ce = is_transient ? make_empty_transient_cache_entry(len) : @@ -964,7 +1024,8 @@ 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); - make_traverse_path(ce->name, info, n); + /* len+1 because the cache_entry allocates space for NUL */ + make_traverse_path(ce->name, len + 1, info, n->path, n->pathlen); return ce; } @@ -1057,13 +1118,12 @@ static int unpack_failed(struct unpack_trees_options *o, const char *message) * the directory. */ static int find_cache_pos(struct traverse_info *info, - const struct name_entry *p) + const char *p, size_t p_len) { 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]; @@ -1099,7 +1159,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->path, p_len, ce_name, ce_len); + cmp = name_compare(p, p_len, ce_name, ce_len); /* * Exact match; if we have a directory we need to * delay returning it. @@ -1114,7 +1174,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->path, p_len) && + if (p_len < ce_len && !memcmp(ce_name, p, p_len) && ce_name[p_len] < '/') continue; /* keep looking */ break; @@ -1125,7 +1185,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); + int pos = find_cache_pos(info, p->path, p->pathlen); struct unpack_trees_options *o = info->data; if (0 <= pos) @@ -1138,10 +1198,10 @@ static void debug_path(struct traverse_info *info) { if (info->prev) { debug_path(info->prev); - if (*info->prev->name.path) + if (*info->prev->name) putchar('/'); } - printf("%s", info->name.path); + printf("%s", info->name); } static void debug_name_entry(int i, struct name_entry *n) @@ -1265,7 +1325,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 exclude_list *el, int defval); + struct pattern_list *pl, + enum pattern_match_result default_match, + int progress_nr); /* Whole directory matching */ static int clear_ce_flags_dir(struct index_state *istate, @@ -1273,19 +1335,24 @@ static int clear_ce_flags_dir(struct index_state *istate, struct strbuf *prefix, char *basename, int select_mask, int clear_mask, - struct exclude_list *el, int defval) + struct pattern_list *pl, + enum pattern_match_result default_match, + int progress_nr) { 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 (ret < 0) - ret = defval; + if (orig_ret == UNDECIDED) + ret = default_match; + else + ret = orig_ret; for (cache_end = cache; cache_end != cache + nr; cache_end++) { struct cache_entry *ce = *cache_end; @@ -1293,24 +1360,31 @@ static int clear_ce_flags_dir(struct index_state *istate, break; } - /* - * 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); + 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); + } + strbuf_setlen(prefix, prefix->len - 1); return rc; } /* * Traverse the index, find every entry that matches according to - * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the + * o->pl. 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 @@ -1327,9 +1401,11 @@ 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 exclude_list *el, int defval) + struct pattern_list *pl, + enum pattern_match_result default_match, + int progress_nr) { - struct cache_entry **cache_end = cache + nr; + struct cache_entry **cache_end = nr ? cache + nr : cache; /* * Process all entries that have the given prefix and meet @@ -1338,10 +1414,14 @@ 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, ret; + int len, dtype; + enum pattern_match_result ret; + + display_progress(istate->progress, progress_nr); if (select_mask && !(ce->ce_flags & select_mask)) { cache++; + progress_nr++; continue; } @@ -1362,58 +1442,84 @@ static int clear_ce_flags_1(struct index_state *istate, prefix, prefix->buf + prefix->len - len, select_mask, clear_mask, - el, defval); + pl, default_match, + progress_nr); /* 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, '/'); - cache += clear_ce_flags_1(istate, cache, cache_end - cache, - prefix, - select_mask, clear_mask, el, defval); + 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; + strbuf_setlen(prefix, prefix->len - len - 1); continue; } /* Non-directory */ dtype = ce_to_dtype(ce); - ret = is_excluded_from_list(ce->name, ce_namelen(ce), - name, &dtype, el, istate); - if (ret < 0) - ret = defval; - if (ret > 0) + 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) 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 exclude_list *el) + struct pattern_list *pl, + int show_progress) { static struct strbuf prefix = STRBUF_INIT; + char label[100]; + int rval; strbuf_reset(&prefix); - - return clear_ce_flags_1(istate, + 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, istate->cache, istate->cache_nr, &prefix, select_mask, clear_mask, - el, 0); + pl, 0, 0); + trace2_region_leave("unpack_trees", label, the_repository); + + stop_progress(&istate->progress); + return rval; } /* * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout */ -static void mark_new_skip_worktree(struct exclude_list *el, +static void mark_new_skip_worktree(struct pattern_list *pl, struct index_state *istate, - int select_flag, int skip_wt_flag) + int select_flag, int skip_wt_flag, + int show_progress) { int i; @@ -1437,9 +1543,23 @@ static void mark_new_skip_worktree(struct exclude_list *el, * 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, el); + clear_ce_flags(istate, select_flag, skip_wt_flag, pl, show_progress); +} + +static void populate_from_existing_patterns(struct unpack_trees_options *o, + struct pattern_list *pl) +{ + 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) + o->skip_sparse_checkout = 1; + else + o->pl = pl; + free(sparse); } + static int verify_absent(const struct cache_entry *, enum unpack_trees_error_types, struct unpack_trees_options *); @@ -1453,22 +1573,19 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options { int i, ret; static struct cache_entry *dfc; - struct exclude_list el; + struct pattern_list pl; + int free_pattern_list = 0; if (len > MAX_UNPACK_TREES) die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES); trace_performance_enter(); - memset(&el, 0, sizeof(el)); if (!core_apply_sparse_checkout || !o->update) o->skip_sparse_checkout = 1; - if (!o->skip_sparse_checkout) { - char *sparse = git_pathdup("info/sparse-checkout"); - if (add_excludes_from_file_to_list(sparse, "", 0, &el, NULL) < 0) - o->skip_sparse_checkout = 1; - else - o->el = ⪙ - free(sparse); + if (!o->skip_sparse_checkout && !o->pl) { + memset(&pl, 0, sizeof(pl)); + free_pattern_list = 1; + populate_from_existing_patterns(o, &pl); } memset(&o->result, 0, sizeof(o->result)); @@ -1494,11 +1611,15 @@ 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->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE); + mark_new_skip_worktree(o->pl, o->src_index, 0, + CE_NEW_SKIP_WORKTREE, o->verbose_update); if (!dfc) dfc = xcalloc(1, cache_entry_size(0)); @@ -1556,14 +1677,14 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options } if (!o->skip_sparse_checkout) { - int empty_worktree = 1; - /* * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1 - * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE + * If they 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->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE); + mark_new_skip_worktree(o->pl, &o->result, + CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE, + o->verbose_update); ret = 0; for (i = 0; i < o->result.cache_nr; i++) { @@ -1578,36 +1699,24 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options * correct CE_NEW_SKIP_WORKTREE */ if (ce->ce_flags & CE_ADDED && - verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) { - if (!o->show_all_errors) - goto return_failed; - ret = -1; - } - - if (apply_sparse_checkout(&o->result, ce, o)) { - if (!o->show_all_errors) - goto return_failed; - ret = -1; - } - if (!ce_skip_worktree(ce)) - empty_worktree = 0; + verify_absent(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o)) + ret = 1; + if (apply_sparse_checkout(&o->result, ce, o)) + ret = 1; } - if (ret < 0) - goto return_failed; - /* - * Sparse checkout is meant to narrow down checkout area - * but it does not make sense to narrow down to empty working - * tree. This is usually a mistake in sparse checkout rules. - * Do not allow users to do that. - */ - if (o->result.cache_nr && empty_worktree) { - ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory"); - goto done; + if (ret == 1) { + /* + * Inability to sparsify or de-sparsify individual + * paths is not an error, but just a warning. + */ + if (o->show_all_errors) + display_warning_msgs(o); + ret = 0; } } - ret = check_updates(o) ? (-2) : 0; + ret = check_updates(o, &o->result) ? (-2) : 0; if (o->dst_index) { move_index_extensions(&o->result, o->src_index); if (!ret) { @@ -1630,8 +1739,9 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options o->src_index = NULL; done: + if (free_pattern_list) + clear_pattern_list(&pl); trace_performance_leave("unpack_trees"); - clear_exclude_list(&el); return ret; return_failed: @@ -1644,6 +1754,74 @@ return_failed: goto done; } +/* + * Update SKIP_WORKTREE bits according to sparsity patterns, and update + * working directory to match. + * + * CE_NEW_SKIP_WORKTREE is used internally. + */ +enum update_sparsity_result update_sparsity(struct unpack_trees_options *o) +{ + enum update_sparsity_result ret = UPDATE_SPARSITY_SUCCESS; + struct pattern_list pl; + int i; + unsigned old_show_all_errors; + int free_pattern_list = 0; + + old_show_all_errors = o->show_all_errors; + o->show_all_errors = 1; + + /* Sanity checks */ + if (!o->update || o->index_only || o->skip_sparse_checkout) + BUG("update_sparsity() is for reflecting sparsity patterns in working directory"); + if (o->src_index != o->dst_index || o->fn) + BUG("update_sparsity() called wrong"); + + trace_performance_enter(); + + /* If we weren't given patterns, use the recorded ones */ + if (!o->pl) { + memset(&pl, 0, sizeof(pl)); + free_pattern_list = 1; + populate_from_existing_patterns(o, &pl); + if (o->skip_sparse_checkout) + goto skip_sparse_checkout; + } + + /* Set NEW_SKIP_WORKTREE on existing entries. */ + mark_all_ce_unused(o->src_index); + mark_new_skip_worktree(o->pl, o->src_index, 0, + CE_NEW_SKIP_WORKTREE, o->verbose_update); + + /* Then loop over entries and update/remove as needed */ + ret = UPDATE_SPARSITY_SUCCESS; + for (i = 0; i < o->src_index->cache_nr; i++) { + struct cache_entry *ce = o->src_index->cache[i]; + + + if (ce_stage(ce)) { + /* -1 because for loop will increment by 1 */ + i += warn_conflicted_path(o->src_index, i, o) - 1; + ret = UPDATE_SPARSITY_WARNINGS; + continue; + } + + if (apply_sparse_checkout(o->src_index, ce, o)) + ret = UPDATE_SPARSITY_WARNINGS; + } + +skip_sparse_checkout: + if (check_updates(o, o->src_index)) + ret = UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES; + + display_warning_msgs(o); + o->show_all_errors = old_show_all_errors; + if (free_pattern_list) + clear_pattern_list(&pl); + trace_performance_leave("update_sparsity"); + return ret; +} + /* Here come the merge functions */ static int reject_merge(const struct cache_entry *ce, @@ -1728,7 +1906,7 @@ int verify_uptodate(const struct cache_entry *ce, static int verify_uptodate_sparse(const struct cache_entry *ce, struct unpack_trees_options *o) { - return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE); + return verify_uptodate_1(ce, o, WARNING_SPARSE_NOT_UPTODATE_FILE); } /* @@ -1754,9 +1932,6 @@ static void invalidate_ce_path(const struct cache_entry *ce, /* * Check that checking out ce->sha1 in subdir ce->name is not * going to overwrite any working files. - * - * Currently, git does not checkout subprojects during a superproject - * checkout, so it is not going to overwrite anything. */ static int verify_clean_submodule(const char *old_sha1, const struct cache_entry *ce, @@ -1969,11 +2144,7 @@ static int verify_absent_sparse(const struct cache_entry *ce, enum unpack_trees_error_types error_type, struct unpack_trees_options *o) { - enum unpack_trees_error_types orphaned_error = error_type; - if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN) - orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN; - - return verify_absent_1(ce, orphaned_error, o); + return verify_absent_1(ce, error_type, o); } static int merged_entry(const struct cache_entry *ce, @@ -2006,7 +2177,7 @@ static int merged_entry(const struct cache_entry *ce, } invalidate_ce_path(merge, o); - if (submodule_from_ce(ce)) { + if (submodule_from_ce(ce) && file_exists(ce->name)) { int ret = check_submodule_move_head(ce, NULL, oid_to_hex(&ce->oid), o); @@ -2035,7 +2206,7 @@ static int merged_entry(const struct cache_entry *ce, invalidate_ce_path(old, o); } - if (submodule_from_ce(ce)) { + if (submodule_from_ce(ce) && file_exists(ce->name)) { int ret = check_submodule_move_head(ce, oid_to_hex(&old->oid), oid_to_hex(&ce->oid), o); @@ -2050,7 +2221,8 @@ static int merged_entry(const struct cache_entry *ce, invalidate_ce_path(old, o); } - do_add_entry(o, merge, update, CE_STAGEMASK); + if (do_add_entry(o, merge, update, CE_STAGEMASK) < 0) + return -1; return 1; } @@ -2374,7 +2546,8 @@ 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)) { + if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old) && + !(old->ce_flags & CE_FSMONITOR_VALID)) { 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 d344d7d296..2e87875b15 100644 --- a/third_party/git/unpack-trees.h +++ b/third_party/git/unpack-trees.h @@ -2,15 +2,15 @@ #define UNPACK_TREES_H #include "cache.h" -#include "argv-array.h" +#include "strvec.h" #include "string-list.h" #include "tree-walk.h" -#define MAX_UNPACK_TREES 8 +#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES struct cache_entry; struct unpack_trees_options; -struct exclude_list; +struct pattern_list; typedef int (*merge_fn_t)(const struct cache_entry * const *src, struct unpack_trees_options *options); @@ -22,11 +22,15 @@ enum unpack_trees_error_types { ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, ERROR_BIND_OVERLAP, - ERROR_SPARSE_NOT_UPTODATE_FILE, - ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN, - ERROR_WOULD_LOSE_ORPHANED_REMOVED, ERROR_WOULD_LOSE_SUBMODULE, - NB_UNPACK_TREES_ERROR_TYPES + + NB_UNPACK_TREES_ERROR_TYPES, + + WARNING_SPARSE_NOT_UPTODATE_FILE, + WARNING_SPARSE_UNMERGED_FILE, + WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, + + NB_UNPACK_TREES_WARNING_TYPES, }; /* @@ -65,13 +69,13 @@ struct unpack_trees_options { struct dir_struct *dir; struct pathspec *pathspec; merge_fn_t fn; - const char *msgs[NB_UNPACK_TREES_ERROR_TYPES]; - struct argv_array msgs_to_free; + const char *msgs[NB_UNPACK_TREES_WARNING_TYPES]; + struct strvec msgs_to_free; /* * Store error messages in an array, each case * corresponding to a error message type */ - struct string_list unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES]; + struct string_list unpack_rejects[NB_UNPACK_TREES_WARNING_TYPES]; int head_idx; int merge_size; @@ -83,12 +87,22 @@ struct unpack_trees_options { struct index_state *src_index; struct index_state result; - struct exclude_list *el; /* for internal use */ + struct pattern_list *pl; /* for internal use */ + struct checkout_metadata meta; }; int unpack_trees(unsigned n, struct tree_desc *t, struct unpack_trees_options *options); +enum update_sparsity_result { + UPDATE_SPARSITY_SUCCESS = 0, + UPDATE_SPARSITY_WARNINGS = 1, + UPDATE_SPARSITY_INDEX_UPDATE_FAILURES = -1, + UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES = -2 +}; + +enum update_sparsity_result update_sparsity(struct unpack_trees_options *options); + int verify_uptodate(const struct cache_entry *ce, struct unpack_trees_options *o); diff --git a/third_party/git/upload-pack.c b/third_party/git/upload-pack.c index 222cd3ad89..3b858eb457 100644 --- a/third_party/git/upload-pack.c +++ b/third_party/git/upload-pack.c @@ -18,7 +18,7 @@ #include "sigchain.h" #include "version.h" #include "string-list.h" -#include "argv-array.h" +#include "strvec.h" #include "prio-queue.h" #include "protocol.h" #include "quote.h" @@ -26,6 +26,7 @@ #include "serve.h" #include "commit-graph.h" #include "commit-reach.h" +#include "shallow.h" /* Remember to update object flag allocation in object.h */ #define THEY_HAVE (1u << 11) @@ -41,43 +42,130 @@ #define ALL_FLAGS (THEY_HAVE | OUR_REF | WANTED | COMMON_KNOWN | SHALLOW | \ NOT_SHALLOW | CLIENT_SHALLOW | HIDDEN_REF) -static timestamp_t oldest_have; - -static int multi_ack; -static int no_done; -static int use_thin_pack, use_ofs_delta, use_include_tag; -static int no_progress, daemon_mode; -/* Allow specifying sha1 if it is a ref tip. */ -#define ALLOW_TIP_SHA1 01 -/* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */ -#define ALLOW_REACHABLE_SHA1 02 -/* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */ -#define ALLOW_ANY_SHA1 07 -static unsigned int allow_unadvertised_object_request; -static int shallow_nr; -static struct object_array extra_edge_obj; -static unsigned int timeout; -static int keepalive = 5; -/* 0 for no sideband, - * otherwise maximum packet size (up to 65520 bytes). +/* Enum for allowed unadvertised object request (UOR) */ +enum allow_uor { + /* Allow specifying sha1 if it is a ref tip. */ + ALLOW_TIP_SHA1 = 0x01, + /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */ + ALLOW_REACHABLE_SHA1 = 0x02, + /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */ + ALLOW_ANY_SHA1 = 0x07 +}; + +/* + * Please annotate, and if possible group together, fields used only + * for protocol v0 or only for protocol v2. */ -static int use_sideband; -static int stateless_rpc; -static const char *pack_objects_hook; +struct upload_pack_data { + struct string_list symref; /* v0 only */ + struct object_array want_obj; + struct object_array have_obj; + struct oid_array haves; /* v2 only */ + struct string_list wanted_refs; /* v2 only */ + + struct object_array shallows; + struct string_list deepen_not; + struct object_array extra_edge_obj; + int depth; + timestamp_t deepen_since; + int deepen_rev_list; + int deepen_relative; + int keepalive; + int shallow_nr; + timestamp_t oldest_have; + + unsigned int timeout; /* v0 only */ + enum { + NO_MULTI_ACK = 0, + MULTI_ACK = 1, + MULTI_ACK_DETAILED = 2 + } multi_ack; /* v0 only */ + + /* 0 for no sideband, otherwise DEFAULT_PACKET_MAX or LARGE_PACKET_MAX */ + int use_sideband; + + struct string_list uri_protocols; + enum allow_uor allow_uor; + + struct list_objects_filter_options filter_options; + struct string_list allowed_filters; + + struct packet_writer writer; + + const char *pack_objects_hook; + + unsigned stateless_rpc : 1; /* v0 only */ + unsigned no_done : 1; /* v0 only */ + unsigned daemon_mode : 1; /* v0 only */ + unsigned filter_capability_requested : 1; /* v0 only */ + + unsigned use_thin_pack : 1; + unsigned use_ofs_delta : 1; + unsigned no_progress : 1; + unsigned use_include_tag : 1; + unsigned allow_filter : 1; + unsigned allow_filter_fallback : 1; + unsigned long tree_filter_max_depth; + + unsigned done : 1; /* v2 only */ + unsigned allow_ref_in_want : 1; /* v2 only */ + unsigned allow_sideband_all : 1; /* v2 only */ +}; -static int filter_capability_requested; -static int allow_filter; -static int allow_ref_in_want; -static struct list_objects_filter_options filter_options; +static void upload_pack_data_init(struct upload_pack_data *data) +{ + struct string_list symref = STRING_LIST_INIT_DUP; + struct string_list wanted_refs = STRING_LIST_INIT_DUP; + struct object_array want_obj = OBJECT_ARRAY_INIT; + struct object_array have_obj = OBJECT_ARRAY_INIT; + struct oid_array haves = OID_ARRAY_INIT; + struct object_array shallows = OBJECT_ARRAY_INIT; + struct string_list deepen_not = STRING_LIST_INIT_DUP; + struct string_list uri_protocols = STRING_LIST_INIT_DUP; + struct object_array extra_edge_obj = OBJECT_ARRAY_INIT; + struct string_list allowed_filters = STRING_LIST_INIT_DUP; + + memset(data, 0, sizeof(*data)); + data->symref = symref; + data->wanted_refs = wanted_refs; + data->want_obj = want_obj; + data->have_obj = have_obj; + data->haves = haves; + data->shallows = shallows; + data->deepen_not = deepen_not; + data->uri_protocols = uri_protocols; + data->extra_edge_obj = extra_edge_obj; + data->allowed_filters = allowed_filters; + data->allow_filter_fallback = 1; + data->tree_filter_max_depth = ULONG_MAX; + packet_writer_init(&data->writer, 1); -static int allow_sideband_all; + data->keepalive = 5; +} + +static void upload_pack_data_clear(struct upload_pack_data *data) +{ + string_list_clear(&data->symref, 1); + string_list_clear(&data->wanted_refs, 1); + object_array_clear(&data->want_obj); + object_array_clear(&data->have_obj); + oid_array_clear(&data->haves); + object_array_clear(&data->shallows); + string_list_clear(&data->deepen_not, 0); + object_array_clear(&data->extra_edge_obj); + list_objects_filter_release(&data->filter_options); + string_list_clear(&data->allowed_filters, 1); + + free((char *)data->pack_objects_hook); +} -static void reset_timeout(void) +static void reset_timeout(unsigned int timeout) { alarm(timeout); } -static void send_client_data(int fd, const char *data, ssize_t sz) +static void send_client_data(int fd, const char *data, ssize_t sz, + int use_sideband) { if (use_sideband) { send_sideband(1, fd, data, sz, use_sideband); @@ -102,58 +190,133 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data) return 0; } -static void create_pack_file(const struct object_array *have_obj, - const struct object_array *want_obj) +struct output_state { + char buffer[8193]; + int used; + unsigned packfile_uris_started : 1; + unsigned packfile_started : 1; +}; + +static int relay_pack_data(int pack_objects_out, struct output_state *os, + int use_sideband, int write_packfile_line) +{ + /* + * We keep the last byte to ourselves + * in case we detect broken rev-list, so that we + * can leave the stream corrupted. This is + * unfortunate -- unpack-objects would happily + * accept a valid packdata with trailing garbage, + * so appending garbage after we pass all the + * pack data is not good enough to signal + * breakage to downstream. + */ + ssize_t readsz; + + readsz = xread(pack_objects_out, os->buffer + os->used, + sizeof(os->buffer) - os->used); + if (readsz < 0) { + return readsz; + } + os->used += readsz; + + while (!os->packfile_started) { + char *p; + if (os->used >= 4 && !memcmp(os->buffer, "PACK", 4)) { + os->packfile_started = 1; + if (write_packfile_line) { + if (os->packfile_uris_started) + packet_delim(1); + packet_write_fmt(1, "\1packfile\n"); + } + break; + } + if ((p = memchr(os->buffer, '\n', os->used))) { + if (!os->packfile_uris_started) { + os->packfile_uris_started = 1; + if (!write_packfile_line) + BUG("packfile_uris requires sideband-all"); + packet_write_fmt(1, "\1packfile-uris\n"); + } + *p = '\0'; + packet_write_fmt(1, "\1%s\n", os->buffer); + + os->used -= p - os->buffer + 1; + memmove(os->buffer, p + 1, os->used); + } else { + /* + * Incomplete line. + */ + return readsz; + } + } + + if (os->used > 1) { + send_client_data(1, os->buffer, os->used - 1, use_sideband); + os->buffer[0] = os->buffer[os->used - 1]; + os->used = 1; + } else { + send_client_data(1, os->buffer, os->used, use_sideband); + os->used = 0; + } + + return readsz; +} + +static void create_pack_file(struct upload_pack_data *pack_data, + const struct string_list *uri_protocols) { struct child_process pack_objects = CHILD_PROCESS_INIT; - char data[8193], progress[128]; + struct output_state output_state = { { 0 } }; + char progress[128]; char abort_msg[] = "aborting due to possible repository " "corruption on the remote side."; - int buffered = -1; ssize_t sz; int i; FILE *pipe_fd; - if (!pack_objects_hook) + if (!pack_data->pack_objects_hook) pack_objects.git_cmd = 1; else { - argv_array_push(&pack_objects.args, pack_objects_hook); - argv_array_push(&pack_objects.args, "git"); + strvec_push(&pack_objects.args, pack_data->pack_objects_hook); + strvec_push(&pack_objects.args, "git"); pack_objects.use_shell = 1; } - if (shallow_nr) { - argv_array_push(&pack_objects.args, "--shallow-file"); - argv_array_push(&pack_objects.args, ""); + if (pack_data->shallow_nr) { + strvec_push(&pack_objects.args, "--shallow-file"); + strvec_push(&pack_objects.args, ""); } - argv_array_push(&pack_objects.args, "pack-objects"); - argv_array_push(&pack_objects.args, "--revs"); - if (use_thin_pack) - argv_array_push(&pack_objects.args, "--thin"); - - argv_array_push(&pack_objects.args, "--stdout"); - if (shallow_nr) - argv_array_push(&pack_objects.args, "--shallow"); - if (!no_progress) - argv_array_push(&pack_objects.args, "--progress"); - if (use_ofs_delta) - argv_array_push(&pack_objects.args, "--delta-base-offset"); - if (use_include_tag) - argv_array_push(&pack_objects.args, "--include-tag"); - if (filter_options.filter_spec) { - struct strbuf expanded_filter_spec = STRBUF_INIT; - expand_list_objects_filter_spec(&filter_options, - &expanded_filter_spec); + strvec_push(&pack_objects.args, "pack-objects"); + strvec_push(&pack_objects.args, "--revs"); + if (pack_data->use_thin_pack) + strvec_push(&pack_objects.args, "--thin"); + + strvec_push(&pack_objects.args, "--stdout"); + if (pack_data->shallow_nr) + strvec_push(&pack_objects.args, "--shallow"); + if (!pack_data->no_progress) + strvec_push(&pack_objects.args, "--progress"); + if (pack_data->use_ofs_delta) + strvec_push(&pack_objects.args, "--delta-base-offset"); + if (pack_data->use_include_tag) + strvec_push(&pack_objects.args, "--include-tag"); + if (pack_data->filter_options.choice) { + const char *spec = + expand_list_objects_filter_spec(&pack_data->filter_options); if (pack_objects.use_shell) { struct strbuf buf = STRBUF_INIT; - sq_quote_buf(&buf, expanded_filter_spec.buf); - argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf); + sq_quote_buf(&buf, spec); + strvec_pushf(&pack_objects.args, "--filter=%s", buf.buf); strbuf_release(&buf); } else { - argv_array_pushf(&pack_objects.args, "--filter=%s", - expanded_filter_spec.buf); + strvec_pushf(&pack_objects.args, "--filter=%s", spec); } } + if (uri_protocols) { + for (i = 0; i < uri_protocols->nr; i++) + strvec_pushf(&pack_objects.args, "--uri-protocol=%s", + uri_protocols->items[i].string); + } pack_objects.in = -1; pack_objects.out = -1; @@ -164,19 +327,19 @@ static void create_pack_file(const struct object_array *have_obj, pipe_fd = xfdopen(pack_objects.in, "w"); - if (shallow_nr) + if (pack_data->shallow_nr) for_each_commit_graft(write_one_shallow, pipe_fd); - for (i = 0; i < want_obj->nr; i++) + for (i = 0; i < pack_data->want_obj.nr; i++) fprintf(pipe_fd, "%s\n", - oid_to_hex(&want_obj->objects[i].item->oid)); + oid_to_hex(&pack_data->want_obj.objects[i].item->oid)); fprintf(pipe_fd, "--not\n"); - for (i = 0; i < have_obj->nr; i++) + for (i = 0; i < pack_data->have_obj.nr; i++) fprintf(pipe_fd, "%s\n", - oid_to_hex(&have_obj->objects[i].item->oid)); - for (i = 0; i < extra_edge_obj.nr; i++) + oid_to_hex(&pack_data->have_obj.objects[i].item->oid)); + for (i = 0; i < pack_data->extra_edge_obj.nr; i++) fprintf(pipe_fd, "%s\n", - oid_to_hex(&extra_edge_obj.objects[i].item->oid)); + oid_to_hex(&pack_data->extra_edge_obj.objects[i].item->oid)); fprintf(pipe_fd, "\n"); fflush(pipe_fd); fclose(pipe_fd); @@ -187,10 +350,10 @@ static void create_pack_file(const struct object_array *have_obj, while (1) { struct pollfd pfd[2]; - int pe, pu, pollsize; + int pe, pu, pollsize, polltimeout; int ret; - reset_timeout(); + reset_timeout(pack_data->timeout); pollsize = 0; pe = pu = -1; @@ -211,8 +374,11 @@ static void create_pack_file(const struct object_array *have_obj, if (!pollsize) break; - ret = poll(pfd, pollsize, - keepalive < 0 ? -1 : 1000 * keepalive); + polltimeout = pack_data->keepalive < 0 + ? -1 + : 1000 * pack_data->keepalive; + + ret = poll(pfd, pollsize, polltimeout); if (ret < 0) { if (errno != EINTR) { @@ -228,7 +394,8 @@ static void create_pack_file(const struct object_array *have_obj, sz = xread(pack_objects.err, progress, sizeof(progress)); if (0 < sz) - send_client_data(2, progress, sz); + send_client_data(2, progress, sz, + pack_data->use_sideband); else if (sz == 0) { close(pack_objects.err); pack_objects.err = -1; @@ -239,39 +406,17 @@ static void create_pack_file(const struct object_array *have_obj, continue; } if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) { - /* Data ready; we keep the last byte to ourselves - * in case we detect broken rev-list, so that we - * can leave the stream corrupted. This is - * unfortunate -- unpack-objects would happily - * accept a valid packdata with trailing garbage, - * so appending garbage after we pass all the - * pack data is not good enough to signal - * breakage to downstream. - */ - char *cp = data; - ssize_t outsz = 0; - if (0 <= buffered) { - *cp++ = buffered; - outsz++; - } - sz = xread(pack_objects.out, cp, - sizeof(data) - outsz); - if (0 < sz) - ; - else if (sz == 0) { + int result = relay_pack_data(pack_objects.out, + &output_state, + pack_data->use_sideband, + !!uri_protocols); + + if (result == 0) { close(pack_objects.out); pack_objects.out = -1; - } - else + } else if (result < 0) { goto fail; - sz += outsz; - if (1 < sz) { - buffered = data[sz-1] & 0xFF; - sz--; } - else - buffered = -1; - send_client_data(1, data, sz); } /* @@ -284,7 +429,7 @@ static void create_pack_file(const struct object_array *have_obj, * protocol to say anything, so those clients are just out of * luck. */ - if (!ret && use_sideband) { + if (!ret && pack_data->use_sideband) { static const char buf[] = "0005\1"; write_or_die(1, buf, 5); } @@ -296,32 +441,26 @@ static void create_pack_file(const struct object_array *have_obj, } /* flush the data */ - if (0 <= buffered) { - data[0] = buffered; - send_client_data(1, data, 1); + if (output_state.used > 0) { + send_client_data(1, output_state.buffer, output_state.used, + pack_data->use_sideband); fprintf(stderr, "flushed.\n"); } - if (use_sideband) + if (pack_data->use_sideband) packet_flush(1); return; fail: - send_client_data(3, abort_msg, sizeof(abort_msg)); + send_client_data(3, abort_msg, sizeof(abort_msg), + pack_data->use_sideband); die("git upload-pack: %s", abort_msg); } -static int got_oid(const char *hex, struct object_id *oid, - struct object_array *have_obj) +static int do_got_oid(struct upload_pack_data *data, const struct object_id *oid) { - struct object *o; int we_knew_they_have = 0; + struct object *o = parse_object(the_repository, oid); - if (get_oid_hex(hex, oid)) - die("git upload-pack: expected SHA1 object, got '%s'", hex); - if (!has_object_file(oid)) - return -1; - - o = parse_object(the_repository, oid); if (!o) die("oops (%s)", oid_to_hex(oid)); if (o->type == OBJ_COMMIT) { @@ -331,36 +470,45 @@ static int got_oid(const char *hex, struct object_id *oid, we_knew_they_have = 1; else o->flags |= THEY_HAVE; - if (!oldest_have || (commit->date < oldest_have)) - oldest_have = commit->date; + if (!data->oldest_have || (commit->date < data->oldest_have)) + data->oldest_have = commit->date; for (parents = commit->parents; parents; parents = parents->next) parents->item->object.flags |= THEY_HAVE; } if (!we_knew_they_have) { - add_object_array(o, NULL, have_obj); + add_object_array(o, NULL, &data->have_obj); return 1; } return 0; } -static int ok_to_give_up(const struct object_array *have_obj, - struct object_array *want_obj) +static int got_oid(struct upload_pack_data *data, + const char *hex, struct object_id *oid) +{ + if (get_oid_hex(hex, oid)) + die("git upload-pack: expected SHA1 object, got '%s'", hex); + if (!has_object_file_with_flags(oid, + OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT)) + return -1; + return do_got_oid(data, oid); +} + +static int ok_to_give_up(struct upload_pack_data *data) { uint32_t min_generation = GENERATION_NUMBER_ZERO; - if (!have_obj->nr) + if (!data->have_obj.nr) return 0; - return can_all_from_reach_with_flag(want_obj, THEY_HAVE, - COMMON_KNOWN, oldest_have, + return can_all_from_reach_with_flag(&data->want_obj, THEY_HAVE, + COMMON_KNOWN, data->oldest_have, min_generation); } -static int get_common_commits(struct packet_reader *reader, - struct object_array *have_obj, - struct object_array *want_obj) +static int get_common_commits(struct upload_pack_data *data, + struct packet_reader *reader) { struct object_id oid; char last_hex[GIT_MAX_HEXSZ + 1]; @@ -373,34 +521,37 @@ static int get_common_commits(struct packet_reader *reader, for (;;) { const char *arg; - reset_timeout(); + reset_timeout(data->timeout); if (packet_reader_read(reader) != PACKET_READ_NORMAL) { - if (multi_ack == 2 && got_common - && !got_other && ok_to_give_up(have_obj, want_obj)) { + if (data->multi_ack == MULTI_ACK_DETAILED + && got_common + && !got_other + && ok_to_give_up(data)) { sent_ready = 1; packet_write_fmt(1, "ACK %s ready\n", last_hex); } - if (have_obj->nr == 0 || multi_ack) + if (data->have_obj.nr == 0 || data->multi_ack) packet_write_fmt(1, "NAK\n"); - if (no_done && sent_ready) { + if (data->no_done && sent_ready) { packet_write_fmt(1, "ACK %s\n", last_hex); return 0; } - if (stateless_rpc) + if (data->stateless_rpc) exit(0); got_common = 0; got_other = 0; continue; } if (skip_prefix(reader->line, "have ", &arg)) { - switch (got_oid(arg, &oid, have_obj)) { + switch (got_oid(data, arg, &oid)) { case -1: /* they have what we do not */ got_other = 1; - if (multi_ack && ok_to_give_up(have_obj, want_obj)) { + if (data->multi_ack + && ok_to_give_up(data)) { const char *hex = oid_to_hex(&oid); - if (multi_ack == 2) { + if (data->multi_ack == MULTI_ACK_DETAILED) { sent_ready = 1; packet_write_fmt(1, "ACK %s ready\n", hex); } else @@ -410,19 +561,19 @@ static int get_common_commits(struct packet_reader *reader, default: got_common = 1; oid_to_hex_r(last_hex, &oid); - if (multi_ack == 2) + if (data->multi_ack == MULTI_ACK_DETAILED) packet_write_fmt(1, "ACK %s common\n", last_hex); - else if (multi_ack) + else if (data->multi_ack) packet_write_fmt(1, "ACK %s continue\n", last_hex); - else if (have_obj->nr == 1) + else if (data->have_obj.nr == 1) packet_write_fmt(1, "ACK %s\n", last_hex); break; } continue; } if (!strcmp(reader->line, "done")) { - if (have_obj->nr > 0) { - if (multi_ack) + if (data->have_obj.nr > 0) { + if (data->multi_ack) packet_write_fmt(1, "ACK %s\n", last_hex); return 0; } @@ -433,10 +584,10 @@ static int get_common_commits(struct packet_reader *reader, } } -static int is_our_ref(struct object *o) +static int is_our_ref(struct object *o, enum allow_uor allow_uor) { - int allow_hidden_ref = (allow_unadvertised_object_request & - (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1)); + int allow_hidden_ref = (allow_uor & + (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1)); return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF); } @@ -445,15 +596,15 @@ static int is_our_ref(struct object *o) */ static int do_reachable_revlist(struct child_process *cmd, struct object_array *src, - struct object_array *reachable) + struct object_array *reachable, + enum allow_uor allow_uor) { static const char *argv[] = { "rev-list", "--stdin", NULL, }; struct object *o; - char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */ + FILE *cmd_in = NULL; int i; - const unsigned hexsz = the_hash_algo->hexsz; cmd->argv = argv; cmd->git_cmd = 1; @@ -471,35 +622,34 @@ static int do_reachable_revlist(struct child_process *cmd, if (start_command(cmd)) goto error; - namebuf[0] = '^'; - namebuf[hexsz + 1] = '\n'; + cmd_in = xfdopen(cmd->in, "w"); + for (i = get_max_object_index(); 0 < i; ) { o = get_indexed_object(--i); if (!o) continue; if (reachable && o->type == OBJ_COMMIT) o->flags &= ~TMP_MARK; - if (!is_our_ref(o)) + if (!is_our_ref(o, allow_uor)) continue; - memcpy(namebuf + 1, oid_to_hex(&o->oid), hexsz); - if (write_in_full(cmd->in, namebuf, hexsz + 2) < 0) + if (fprintf(cmd_in, "^%s\n", oid_to_hex(&o->oid)) < 0) goto error; } - namebuf[hexsz] = '\n'; for (i = 0; i < src->nr; i++) { o = src->objects[i].item; - if (is_our_ref(o)) { + if (is_our_ref(o, allow_uor)) { if (reachable) add_object_array(o, NULL, reachable); continue; } if (reachable && o->type == OBJ_COMMIT) o->flags |= TMP_MARK; - memcpy(namebuf, oid_to_hex(&o->oid), hexsz); - if (write_in_full(cmd->in, namebuf, hexsz + 1) < 0) + if (fprintf(cmd_in, "%s\n", oid_to_hex(&o->oid)) < 0) goto error; } - close(cmd->in); + if (ferror(cmd_in) || fflush(cmd_in)) + goto error; + fclose(cmd_in); cmd->in = -1; sigchain_pop(SIGPIPE); @@ -508,14 +658,14 @@ static int do_reachable_revlist(struct child_process *cmd, error: sigchain_pop(SIGPIPE); - if (cmd->in >= 0) - close(cmd->in); + if (cmd_in) + fclose(cmd_in); if (cmd->out >= 0) close(cmd->out); return -1; } -static int get_reachable_list(struct object_array *src, +static int get_reachable_list(struct upload_pack_data *data, struct object_array *reachable) { struct child_process cmd = CHILD_PROCESS_INIT; @@ -524,7 +674,8 @@ static int get_reachable_list(struct object_array *src, char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */ const unsigned hexsz = the_hash_algo->hexsz; - if (do_reachable_revlist(&cmd, src, reachable) < 0) + if (do_reachable_revlist(&cmd, &data->shallows, reachable, + data->allow_uor) < 0) return -1; while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) { @@ -555,13 +706,13 @@ static int get_reachable_list(struct object_array *src, return 0; } -static int has_unreachable(struct object_array *src) +static int has_unreachable(struct object_array *src, enum allow_uor allow_uor) { struct child_process cmd = CHILD_PROCESS_INIT; char buf[1]; int i; - if (do_reachable_revlist(&cmd, src, NULL) < 0) + if (do_reachable_revlist(&cmd, src, NULL, allow_uor) < 0) return 1; /* @@ -586,14 +737,12 @@ static int has_unreachable(struct object_array *src) return 0; error: - sigchain_pop(SIGPIPE); if (cmd.out >= 0) close(cmd.out); return 1; } -static void check_non_tip(struct object_array *want_obj, - struct packet_writer *writer) +static void check_non_tip(struct upload_pack_data *data) { int i; @@ -602,18 +751,18 @@ static void check_non_tip(struct object_array *want_obj, * uploadpack.allowReachableSHA1InWant, * non-tip requests can never happen. */ - if (!stateless_rpc && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1)) + if (!data->stateless_rpc && !(data->allow_uor & ALLOW_REACHABLE_SHA1)) goto error; - if (!has_unreachable(want_obj)) + if (!has_unreachable(&data->want_obj, data->allow_uor)) /* All the non-tip ones are ancestors of what we advertised */ return; error: /* Pick one of them (we know there at least is one) */ - for (i = 0; i < want_obj->nr; i++) { - struct object *o = want_obj->objects[i].item; - if (!is_our_ref(o)) { - packet_writer_error(writer, + for (i = 0; i < data->want_obj.nr; i++) { + struct object *o = data->want_obj.objects[i].item; + if (!is_our_ref(o, data->allow_uor)) { + packet_writer_error(&data->writer, "upload-pack: not our ref %s", oid_to_hex(&o->oid)); die("git upload-pack: not our ref %s", @@ -622,32 +771,30 @@ error: } } -static void send_shallow(struct packet_writer *writer, +static void send_shallow(struct upload_pack_data *data, struct commit_list *result) { while (result) { struct object *object = &result->item->object; if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) { - packet_writer_write(writer, "shallow %s", + packet_writer_write(&data->writer, "shallow %s", oid_to_hex(&object->oid)); register_shallow(the_repository, &object->oid); - shallow_nr++; + data->shallow_nr++; } result = result->next; } } -static void send_unshallow(struct packet_writer *writer, - const struct object_array *shallows, - struct object_array *want_obj) +static void send_unshallow(struct upload_pack_data *data) { int i; - for (i = 0; i < shallows->nr; i++) { - struct object *object = shallows->objects[i].item; + for (i = 0; i < data->shallows.nr; i++) { + struct object *object = data->shallows.objects[i].item; if (object->flags & NOT_SHALLOW) { struct commit_list *parents; - packet_writer_write(writer, "unshallow %s", + packet_writer_write(&data->writer, "unshallow %s", oid_to_hex(&object->oid)); object->flags &= ~CLIENT_SHALLOW; /* @@ -663,10 +810,10 @@ static void send_unshallow(struct packet_writer *writer, parents = ((struct commit *)object)->parents; while (parents) { add_object_array(&parents->item->object, - NULL, want_obj); + NULL, &data->want_obj); parents = parents->next; } - add_object_array(object, NULL, &extra_edge_obj); + add_object_array(object, NULL, &data->extra_edge_obj); } /* make sure commit traversal conforms to client */ register_shallow(the_repository, &object->oid); @@ -675,17 +822,16 @@ static void send_unshallow(struct packet_writer *writer, static int check_ref(const char *refname_full, const struct object_id *oid, int flag, void *cb_data); -static void deepen(struct packet_writer *writer, int depth, int deepen_relative, - struct object_array *shallows, struct object_array *want_obj) +static void deepen(struct upload_pack_data *data, int depth) { if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) { int i; - for (i = 0; i < shallows->nr; i++) { - struct object *object = shallows->objects[i].item; + for (i = 0; i < data->shallows.nr; i++) { + struct object *object = data->shallows.objects[i].item; object->flags |= NOT_SHALLOW; } - } else if (deepen_relative) { + } else if (data->deepen_relative) { struct object_array reachable_shallows = OBJECT_ARRAY_INIT; struct commit_list *result; @@ -696,87 +842,80 @@ static void deepen(struct packet_writer *writer, int depth, int deepen_relative, head_ref_namespaced(check_ref, NULL); for_each_namespaced_ref(check_ref, NULL); - get_reachable_list(shallows, &reachable_shallows); + get_reachable_list(data, &reachable_shallows); result = get_shallow_commits(&reachable_shallows, depth + 1, SHALLOW, NOT_SHALLOW); - send_shallow(writer, result); + send_shallow(data, result); free_commit_list(result); object_array_clear(&reachable_shallows); } else { struct commit_list *result; - result = get_shallow_commits(want_obj, depth, + result = get_shallow_commits(&data->want_obj, depth, SHALLOW, NOT_SHALLOW); - send_shallow(writer, result); + send_shallow(data, result); free_commit_list(result); } - send_unshallow(writer, shallows, want_obj); + send_unshallow(data); } -static void deepen_by_rev_list(struct packet_writer *writer, int ac, - const char **av, - struct object_array *shallows, - struct object_array *want_obj) +static void deepen_by_rev_list(struct upload_pack_data *data, + int ac, + const char **av) { struct commit_list *result; - close_commit_graph(the_repository->objects); + disable_commit_graph(the_repository); result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW); - send_shallow(writer, result); + send_shallow(data, result); free_commit_list(result); - send_unshallow(writer, shallows, want_obj); + send_unshallow(data); } /* Returns 1 if a shallow list is sent or 0 otherwise */ -static int send_shallow_list(struct packet_writer *writer, - int depth, int deepen_rev_list, - timestamp_t deepen_since, - struct string_list *deepen_not, - int deepen_relative, - struct object_array *shallows, - struct object_array *want_obj) +static int send_shallow_list(struct upload_pack_data *data) { int ret = 0; - if (depth > 0 && deepen_rev_list) + if (data->depth > 0 && data->deepen_rev_list) die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together"); - if (depth > 0) { - deepen(writer, depth, deepen_relative, shallows, want_obj); + if (data->depth > 0) { + deepen(data, data->depth); ret = 1; - } else if (deepen_rev_list) { - struct argv_array av = ARGV_ARRAY_INIT; + } else if (data->deepen_rev_list) { + struct strvec av = STRVEC_INIT; int i; - argv_array_push(&av, "rev-list"); - if (deepen_since) - argv_array_pushf(&av, "--max-age=%"PRItime, deepen_since); - if (deepen_not->nr) { - argv_array_push(&av, "--not"); - for (i = 0; i < deepen_not->nr; i++) { - struct string_list_item *s = deepen_not->items + i; - argv_array_push(&av, s->string); + strvec_push(&av, "rev-list"); + if (data->deepen_since) + strvec_pushf(&av, "--max-age=%"PRItime, data->deepen_since); + if (data->deepen_not.nr) { + strvec_push(&av, "--not"); + for (i = 0; i < data->deepen_not.nr; i++) { + struct string_list_item *s = data->deepen_not.items + i; + strvec_push(&av, s->string); } - argv_array_push(&av, "--not"); + strvec_push(&av, "--not"); } - for (i = 0; i < want_obj->nr; i++) { - struct object *o = want_obj->objects[i].item; - argv_array_push(&av, oid_to_hex(&o->oid)); + for (i = 0; i < data->want_obj.nr; i++) { + struct object *o = data->want_obj.objects[i].item; + strvec_push(&av, oid_to_hex(&o->oid)); } - deepen_by_rev_list(writer, av.argc, av.argv, shallows, want_obj); - argv_array_clear(&av); + deepen_by_rev_list(data, av.nr, av.v); + strvec_clear(&av); ret = 1; } else { - if (shallows->nr > 0) { + if (data->shallows.nr > 0) { int i; - for (i = 0; i < shallows->nr; i++) + for (i = 0; i < data->shallows.nr; i++) register_shallow(the_repository, - &shallows->objects[i].item->oid); + &data->shallows.objects[i].item->oid); } } - shallow_nr += shallows->nr; + data->shallow_nr += data->shallows.nr; return ret; } @@ -849,42 +988,94 @@ static int process_deepen_not(const char *line, struct string_list *deepen_not, return 0; } -static void receive_needs(struct packet_reader *reader, struct object_array *want_obj) +NORETURN __attribute__((format(printf,2,3))) +static void send_err_and_die(struct upload_pack_data *data, + const char *fmt, ...) +{ + struct strbuf buf = STRBUF_INIT; + va_list ap; + + va_start(ap, fmt); + strbuf_vaddf(&buf, fmt, ap); + va_end(ap); + + packet_writer_error(&data->writer, "%s", buf.buf); + die("%s", buf.buf); +} + +static void check_one_filter(struct upload_pack_data *data, + struct list_objects_filter_options *opts) +{ + const char *key = list_object_filter_config_name(opts->choice); + struct string_list_item *item = string_list_lookup(&data->allowed_filters, + key); + int allowed; + + if (item) + allowed = (intptr_t)item->util; + else + allowed = data->allow_filter_fallback; + + if (!allowed) + send_err_and_die(data, "filter '%s' not supported", key); + + if (opts->choice == LOFC_TREE_DEPTH && + opts->tree_exclude_depth > data->tree_filter_max_depth) + send_err_and_die(data, + "tree filter allows max depth %lu, but got %lu", + data->tree_filter_max_depth, + opts->tree_exclude_depth); +} + +static void check_filter_recurse(struct upload_pack_data *data, + struct list_objects_filter_options *opts) +{ + size_t i; + + check_one_filter(data, opts); + if (opts->choice != LOFC_COMBINE) + return; + + for (i = 0; i < opts->sub_nr; i++) + check_filter_recurse(data, &opts->sub[i]); +} + +static void die_if_using_banned_filter(struct upload_pack_data *data) +{ + check_filter_recurse(data, &data->filter_options); +} + +static void receive_needs(struct upload_pack_data *data, + struct packet_reader *reader) { - struct object_array shallows = OBJECT_ARRAY_INIT; - struct string_list deepen_not = STRING_LIST_INIT_DUP; - int depth = 0; int has_non_tip = 0; - timestamp_t deepen_since = 0; - int deepen_rev_list = 0; - int deepen_relative = 0; - struct packet_writer writer; - shallow_nr = 0; - packet_writer_init(&writer, 1); + data->shallow_nr = 0; for (;;) { struct object *o; const char *features; struct object_id oid_buf; const char *arg; - reset_timeout(); + reset_timeout(data->timeout); if (packet_reader_read(reader) != PACKET_READ_NORMAL) break; - if (process_shallow(reader->line, &shallows)) + if (process_shallow(reader->line, &data->shallows)) continue; - if (process_deepen(reader->line, &depth)) + if (process_deepen(reader->line, &data->depth)) continue; - if (process_deepen_since(reader->line, &deepen_since, &deepen_rev_list)) + if (process_deepen_since(reader->line, &data->deepen_since, &data->deepen_rev_list)) continue; - if (process_deepen_not(reader->line, &deepen_not, &deepen_rev_list)) + if (process_deepen_not(reader->line, &data->deepen_not, &data->deepen_rev_list)) continue; if (skip_prefix(reader->line, "filter ", &arg)) { - if (!filter_capability_requested) + if (!data->filter_capability_requested) die("git upload-pack: filtering capability not negotiated"); - parse_list_objects_filter(&filter_options, arg); + list_objects_filter_die_if_populated(&data->filter_options); + parse_list_objects_filter(&data->filter_options, arg); + die_if_using_banned_filter(data); continue; } @@ -894,31 +1085,32 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan "expected to get object ID, not '%s'", reader->line); if (parse_feature_request(features, "deepen-relative")) - deepen_relative = 1; + data->deepen_relative = 1; if (parse_feature_request(features, "multi_ack_detailed")) - multi_ack = 2; + data->multi_ack = MULTI_ACK_DETAILED; else if (parse_feature_request(features, "multi_ack")) - multi_ack = 1; + data->multi_ack = MULTI_ACK; if (parse_feature_request(features, "no-done")) - no_done = 1; + data->no_done = 1; if (parse_feature_request(features, "thin-pack")) - use_thin_pack = 1; + data->use_thin_pack = 1; if (parse_feature_request(features, "ofs-delta")) - use_ofs_delta = 1; + data->use_ofs_delta = 1; if (parse_feature_request(features, "side-band-64k")) - use_sideband = LARGE_PACKET_MAX; + data->use_sideband = LARGE_PACKET_MAX; else if (parse_feature_request(features, "side-band")) - use_sideband = DEFAULT_PACKET_MAX; + data->use_sideband = DEFAULT_PACKET_MAX; if (parse_feature_request(features, "no-progress")) - no_progress = 1; + data->no_progress = 1; if (parse_feature_request(features, "include-tag")) - use_include_tag = 1; - if (allow_filter && parse_feature_request(features, "filter")) - filter_capability_requested = 1; + data->use_include_tag = 1; + if (data->allow_filter && + parse_feature_request(features, "filter")) + data->filter_capability_requested = 1; o = parse_object(the_repository, &oid_buf); if (!o) { - packet_writer_error(&writer, + packet_writer_error(&data->writer, "upload-pack: not our ref %s", oid_to_hex(&oid_buf)); die("git upload-pack: not our ref %s", @@ -926,10 +1118,10 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan } if (!(o->flags & WANTED)) { o->flags |= WANTED; - if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1 - || is_our_ref(o))) + if (!((data->allow_uor & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1 + || is_our_ref(o, data->allow_uor))) has_non_tip = 1; - add_object_array(o, NULL, want_obj); + add_object_array(o, NULL, &data->want_obj); } } @@ -941,19 +1133,16 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan * by another process that handled the initial request. */ if (has_non_tip) - check_non_tip(want_obj, &writer); + check_non_tip(data); - if (!use_sideband && daemon_mode) - no_progress = 1; + if (!data->use_sideband && data->daemon_mode) + data->no_progress = 1; - if (depth == 0 && !deepen_rev_list && shallows.nr == 0) + if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0) return; - if (send_shallow_list(&writer, depth, deepen_rev_list, deepen_since, - &deepen_not, deepen_relative, &shallows, - want_obj)) + if (send_shallow_list(data)) packet_flush(1); - object_array_clear(&shallows); } /* return non-zero if the ref is hidden, otherwise 0 */ @@ -997,6 +1186,7 @@ static int send_ref(const char *refname, const struct object_id *oid, " deepen-relative no-progress include-tag multi_ack_detailed"; const char *refname_nons = strip_namespace(refname); struct object_id peeled; + struct upload_pack_data *data = cb_data; if (mark_our_ref(refname_nons, refname, oid)) return 0; @@ -1004,17 +1194,18 @@ static int send_ref(const char *refname, const struct object_id *oid, if (capabilities) { struct strbuf symref_info = STRBUF_INIT; - format_symref_info(&symref_info, cb_data); - packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n", + format_symref_info(&symref_info, &data->symref); + packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s object-format=%s agent=%s\n", oid_to_hex(oid), refname_nons, 0, capabilities, - (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ? + (data->allow_uor & ALLOW_TIP_SHA1) ? " allow-tip-sha1-in-want" : "", - (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ? + (data->allow_uor & ALLOW_REACHABLE_SHA1) ? " allow-reachable-sha1-in-want" : "", - stateless_rpc ? " no-done" : "", + data->stateless_rpc ? " no-done" : "", symref_info.buf, - allow_filter ? " filter" : "", + data->allow_filter ? " filter" : "", + the_hash_algo->name, git_user_agent_sanitized()); strbuf_release(&symref_info); } else { @@ -1042,132 +1233,124 @@ static int find_symref(const char *refname, const struct object_id *oid, return 0; } -static int upload_pack_config(const char *var, const char *value, void *unused) +static int parse_object_filter_config(const char *var, const char *value, + struct upload_pack_data *data) +{ + struct strbuf buf = STRBUF_INIT; + const char *sub, *key; + size_t sub_len; + + if (parse_config_key(var, "uploadpackfilter", &sub, &sub_len, &key)) + return 0; + + if (!sub) { + if (!strcmp(key, "allow")) + data->allow_filter_fallback = git_config_bool(var, value); + return 0; + } + + strbuf_add(&buf, sub, sub_len); + + if (!strcmp(key, "allow")) + string_list_insert(&data->allowed_filters, buf.buf)->util = + (void *)(intptr_t)git_config_bool(var, value); + else if (!strcmp(buf.buf, "tree") && !strcmp(key, "maxdepth")) { + if (!value) { + strbuf_release(&buf); + return config_error_nonbool(var); + } + string_list_insert(&data->allowed_filters, buf.buf)->util = + (void *)(intptr_t)1; + data->tree_filter_max_depth = git_config_ulong(var, value); + } + + strbuf_release(&buf); + return 0; +} + +static int upload_pack_config(const char *var, const char *value, void *cb_data) { + struct upload_pack_data *data = cb_data; + if (!strcmp("uploadpack.allowtipsha1inwant", var)) { if (git_config_bool(var, value)) - allow_unadvertised_object_request |= ALLOW_TIP_SHA1; + data->allow_uor |= ALLOW_TIP_SHA1; else - allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1; + data->allow_uor &= ~ALLOW_TIP_SHA1; } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) { if (git_config_bool(var, value)) - allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1; + data->allow_uor |= ALLOW_REACHABLE_SHA1; else - allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1; + data->allow_uor &= ~ALLOW_REACHABLE_SHA1; } else if (!strcmp("uploadpack.allowanysha1inwant", var)) { if (git_config_bool(var, value)) - allow_unadvertised_object_request |= ALLOW_ANY_SHA1; + data->allow_uor |= ALLOW_ANY_SHA1; else - allow_unadvertised_object_request &= ~ALLOW_ANY_SHA1; + data->allow_uor &= ~ALLOW_ANY_SHA1; } else if (!strcmp("uploadpack.keepalive", var)) { - keepalive = git_config_int(var, value); - if (!keepalive) - keepalive = -1; + data->keepalive = git_config_int(var, value); + if (!data->keepalive) + data->keepalive = -1; } else if (!strcmp("uploadpack.allowfilter", var)) { - allow_filter = git_config_bool(var, value); + data->allow_filter = git_config_bool(var, value); } else if (!strcmp("uploadpack.allowrefinwant", var)) { - allow_ref_in_want = git_config_bool(var, value); + data->allow_ref_in_want = git_config_bool(var, value); } else if (!strcmp("uploadpack.allowsidebandall", var)) { - allow_sideband_all = git_config_bool(var, value); + data->allow_sideband_all = git_config_bool(var, value); } else if (!strcmp("core.precomposeunicode", var)) { precomposed_unicode = git_config_bool(var, value); } - if (current_config_scope() != CONFIG_SCOPE_REPO) { + if (current_config_scope() != CONFIG_SCOPE_LOCAL && + current_config_scope() != CONFIG_SCOPE_WORKTREE) { if (!strcmp("uploadpack.packobjectshook", var)) - return git_config_string(&pack_objects_hook, var, value); + return git_config_string(&data->pack_objects_hook, var, value); } + parse_object_filter_config(var, value, data); + return parse_hide_refs_config(var, value, "uploadpack"); } void upload_pack(struct upload_pack_options *options) { - struct string_list symref = STRING_LIST_INIT_DUP; - struct object_array want_obj = OBJECT_ARRAY_INIT; struct packet_reader reader; + struct upload_pack_data data; + + upload_pack_data_init(&data); - stateless_rpc = options->stateless_rpc; - timeout = options->timeout; - daemon_mode = options->daemon_mode; + git_config(upload_pack_config, &data); - git_config(upload_pack_config, NULL); + data.stateless_rpc = options->stateless_rpc; + data.daemon_mode = options->daemon_mode; + data.timeout = options->timeout; - head_ref_namespaced(find_symref, &symref); + head_ref_namespaced(find_symref, &data.symref); - if (options->advertise_refs || !stateless_rpc) { - reset_timeout(); - head_ref_namespaced(send_ref, &symref); - for_each_namespaced_ref(send_ref, &symref); + if (options->advertise_refs || !data.stateless_rpc) { + reset_timeout(data.timeout); + head_ref_namespaced(send_ref, &data); + for_each_namespaced_ref(send_ref, &data); advertise_shallow_grafts(1); packet_flush(1); } else { head_ref_namespaced(check_ref, NULL); for_each_namespaced_ref(check_ref, NULL); } - string_list_clear(&symref, 1); - if (options->advertise_refs) - return; - packet_reader_init(&reader, 0, NULL, 0, - PACKET_READ_CHOMP_NEWLINE | - PACKET_READ_DIE_ON_ERR_PACKET); + if (!options->advertise_refs) { + packet_reader_init(&reader, 0, NULL, 0, + PACKET_READ_CHOMP_NEWLINE | + PACKET_READ_DIE_ON_ERR_PACKET); - receive_needs(&reader, &want_obj); - if (want_obj.nr) { - struct object_array have_obj = OBJECT_ARRAY_INIT; - get_common_commits(&reader, &have_obj, &want_obj); - create_pack_file(&have_obj, &want_obj); + receive_needs(&data, &reader); + if (data.want_obj.nr) { + get_common_commits(&data, &reader); + create_pack_file(&data, NULL); + } } -} -struct upload_pack_data { - struct object_array wants; - struct string_list wanted_refs; - struct oid_array haves; - - struct object_array shallows; - struct string_list deepen_not; - int depth; - timestamp_t deepen_since; - int deepen_rev_list; - int deepen_relative; - - struct packet_writer writer; - - unsigned stateless_rpc : 1; - - unsigned use_thin_pack : 1; - unsigned use_ofs_delta : 1; - unsigned no_progress : 1; - unsigned use_include_tag : 1; - unsigned done : 1; -}; - -static void upload_pack_data_init(struct upload_pack_data *data) -{ - struct object_array wants = OBJECT_ARRAY_INIT; - struct string_list wanted_refs = STRING_LIST_INIT_DUP; - struct oid_array haves = OID_ARRAY_INIT; - struct object_array shallows = OBJECT_ARRAY_INIT; - struct string_list deepen_not = STRING_LIST_INIT_DUP; - - memset(data, 0, sizeof(*data)); - data->wants = wants; - data->wanted_refs = wanted_refs; - data->haves = haves; - data->shallows = shallows; - data->deepen_not = deepen_not; - packet_writer_init(&data->writer, 1); -} - -static void upload_pack_data_clear(struct upload_pack_data *data) -{ - object_array_clear(&data->wants); - string_list_clear(&data->wanted_refs, 1); - oid_array_clear(&data->haves); - object_array_clear(&data->shallows); - string_list_clear(&data->deepen_not, 0); + upload_pack_data_clear(&data); } static int parse_want(struct packet_writer *writer, const char *line, @@ -1248,19 +1431,18 @@ static int parse_have(const char *line, struct oid_array *haves) } static void process_args(struct packet_reader *request, - struct upload_pack_data *data, - struct object_array *want_obj) + struct upload_pack_data *data) { - while (packet_reader_read(request) != PACKET_READ_FLUSH) { + while (packet_reader_read(request) == PACKET_READ_NORMAL) { const char *arg = request->line; const char *p; /* process want */ - if (parse_want(&data->writer, arg, want_obj)) + if (parse_want(&data->writer, arg, &data->want_obj)) continue; - if (allow_ref_in_want && + if (data->allow_ref_in_want && parse_want_ref(&data->writer, arg, &data->wanted_refs, - want_obj)) + &data->want_obj)) continue; /* process have line */ if (parse_have(arg, &data->haves)) @@ -1268,19 +1450,19 @@ static void process_args(struct packet_reader *request, /* process args like thin-pack */ if (!strcmp(arg, "thin-pack")) { - use_thin_pack = 1; + data->use_thin_pack = 1; continue; } if (!strcmp(arg, "ofs-delta")) { - use_ofs_delta = 1; + data->use_ofs_delta = 1; continue; } if (!strcmp(arg, "no-progress")) { - no_progress = 1; + data->no_progress = 1; continue; } if (!strcmp(arg, "include-tag")) { - use_include_tag = 1; + data->use_include_tag = 1; continue; } if (!strcmp(arg, "done")) { @@ -1304,100 +1486,89 @@ static void process_args(struct packet_reader *request, continue; } - if (allow_filter && skip_prefix(arg, "filter ", &p)) { - parse_list_objects_filter(&filter_options, p); + if (data->allow_filter && skip_prefix(arg, "filter ", &p)) { + list_objects_filter_die_if_populated(&data->filter_options); + parse_list_objects_filter(&data->filter_options, p); + die_if_using_banned_filter(data); continue; } if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) || - allow_sideband_all) && + data->allow_sideband_all) && !strcmp(arg, "sideband-all")) { data->writer.use_sideband = 1; continue; } + if (skip_prefix(arg, "packfile-uris ", &p)) { + string_list_split(&data->uri_protocols, p, ',', -1); + continue; + } + /* ignore unknown lines maybe? */ die("unexpected line: '%s'", arg); } + + if (data->uri_protocols.nr && !data->writer.use_sideband) + string_list_clear(&data->uri_protocols, 0); + + if (request->status != PACKET_READ_FLUSH) + die(_("expected flush after fetch arguments")); } -static int process_haves(struct oid_array *haves, struct oid_array *common, - struct object_array *have_obj) +static int process_haves(struct upload_pack_data *data, struct oid_array *common) { int i; /* Process haves */ - for (i = 0; i < haves->nr; i++) { - const struct object_id *oid = &haves->oid[i]; - struct object *o; - int we_knew_they_have = 0; + for (i = 0; i < data->haves.nr; i++) { + const struct object_id *oid = &data->haves.oid[i]; - if (!has_object_file(oid)) + if (!has_object_file_with_flags(oid, + OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT)) continue; oid_array_append(common, oid); - o = parse_object(the_repository, oid); - if (!o) - die("oops (%s)", oid_to_hex(oid)); - if (o->type == OBJ_COMMIT) { - struct commit_list *parents; - struct commit *commit = (struct commit *)o; - if (o->flags & THEY_HAVE) - we_knew_they_have = 1; - else - o->flags |= THEY_HAVE; - if (!oldest_have || (commit->date < oldest_have)) - oldest_have = commit->date; - for (parents = commit->parents; - parents; - parents = parents->next) - parents->item->object.flags |= THEY_HAVE; - } - if (!we_knew_they_have) - add_object_array(o, NULL, have_obj); + do_got_oid(data, oid); } return 0; } -static int send_acks(struct packet_writer *writer, struct oid_array *acks, - const struct object_array *have_obj, - struct object_array *want_obj) +static int send_acks(struct upload_pack_data *data, struct oid_array *acks) { int i; - packet_writer_write(writer, "acknowledgments\n"); + packet_writer_write(&data->writer, "acknowledgments\n"); /* Send Acks */ if (!acks->nr) - packet_writer_write(writer, "NAK\n"); + packet_writer_write(&data->writer, "NAK\n"); for (i = 0; i < acks->nr; i++) { - packet_writer_write(writer, "ACK %s\n", + packet_writer_write(&data->writer, "ACK %s\n", oid_to_hex(&acks->oid[i])); } - if (ok_to_give_up(have_obj, want_obj)) { + if (ok_to_give_up(data)) { /* Send Ready */ - packet_writer_write(writer, "ready\n"); + packet_writer_write(&data->writer, "ready\n"); return 1; } return 0; } -static int process_haves_and_send_acks(struct upload_pack_data *data, - struct object_array *have_obj, - struct object_array *want_obj) +static int process_haves_and_send_acks(struct upload_pack_data *data) { struct oid_array common = OID_ARRAY_INIT; int ret = 0; - process_haves(&data->haves, &common, have_obj); + process_haves(data, &common); if (data->done) { ret = 1; - } else if (send_acks(&data->writer, &common, have_obj, want_obj)) { + } else if (send_acks(data, &common)) { packet_writer_delim(&data->writer); ret = 1; } else { @@ -1429,8 +1600,7 @@ static void send_wanted_ref_info(struct upload_pack_data *data) packet_writer_delim(&data->writer); } -static void send_shallow_info(struct upload_pack_data *data, - struct object_array *want_obj) +static void send_shallow_info(struct upload_pack_data *data) { /* No shallow info needs to be sent */ if (!data->depth && !data->deepen_rev_list && !data->shallows.nr && @@ -1439,14 +1609,9 @@ static void send_shallow_info(struct upload_pack_data *data, packet_writer_write(&data->writer, "shallow-info\n"); - if (!send_shallow_list(&data->writer, data->depth, - data->deepen_rev_list, - data->deepen_since, &data->deepen_not, - data->deepen_relative, - &data->shallows, want_obj) && + if (!send_shallow_list(data) && is_repository_shallow(the_repository)) - deepen(&data->writer, INFINITE_DEPTH, data->deepen_relative, - &data->shallows, want_obj); + deepen(data, INFINITE_DEPTH); packet_delim(1); } @@ -1458,27 +1623,25 @@ enum fetch_state { FETCH_DONE, }; -int upload_pack_v2(struct repository *r, struct argv_array *keys, +int upload_pack_v2(struct repository *r, struct strvec *keys, struct packet_reader *request) { enum fetch_state state = FETCH_PROCESS_ARGS; struct upload_pack_data data; - struct object_array have_obj = OBJECT_ARRAY_INIT; - struct object_array want_obj = OBJECT_ARRAY_INIT; clear_object_flags(ALL_FLAGS); - git_config(upload_pack_config, NULL); - upload_pack_data_init(&data); - use_sideband = LARGE_PACKET_MAX; + data.use_sideband = LARGE_PACKET_MAX; + + git_config(upload_pack_config, &data); while (state != FETCH_DONE) { switch (state) { case FETCH_PROCESS_ARGS: - process_args(request, &data, &want_obj); + process_args(request, &data); - if (!want_obj.nr) { + if (!data.want_obj.nr) { /* * Request didn't contain any 'want' lines, * guess they didn't want anything. @@ -1498,18 +1661,21 @@ int upload_pack_v2(struct repository *r, struct argv_array *keys, } break; case FETCH_SEND_ACKS: - if (process_haves_and_send_acks(&data, &have_obj, - &want_obj)) + if (process_haves_and_send_acks(&data)) state = FETCH_SEND_PACK; else state = FETCH_DONE; break; case FETCH_SEND_PACK: send_wanted_ref_info(&data); - send_shallow_info(&data, &want_obj); + send_shallow_info(&data); - packet_writer_write(&data.writer, "packfile\n"); - create_pack_file(&have_obj, &want_obj); + if (data.uri_protocols.nr) { + create_pack_file(&data, &data.uri_protocols); + } else { + packet_writer_write(&data.writer, "packfile\n"); + create_pack_file(&data, NULL); + } state = FETCH_DONE; break; case FETCH_DONE: @@ -1518,8 +1684,6 @@ int upload_pack_v2(struct repository *r, struct argv_array *keys, } upload_pack_data_clear(&data); - object_array_clear(&have_obj); - object_array_clear(&want_obj); return 0; } @@ -1530,6 +1694,7 @@ int upload_pack_advertise(struct repository *r, int allow_filter_value; int allow_ref_in_want; int allow_sideband_all_value; + char *str = NULL; strbuf_addstr(value, "shallow"); @@ -1551,6 +1716,14 @@ int upload_pack_advertise(struct repository *r, &allow_sideband_all_value) && allow_sideband_all_value)) strbuf_addstr(value, " sideband-all"); + + if (!repo_config_get_string(the_repository, + "uploadpack.blobpackfileuri", + &str) && + str) { + strbuf_addstr(value, " packfile-uris"); + free(str); + } } return 1; diff --git a/third_party/git/upload-pack.h b/third_party/git/upload-pack.h index 4bafe16a22..27ddcdc6cb 100644 --- a/third_party/git/upload-pack.h +++ b/third_party/git/upload-pack.h @@ -11,9 +11,9 @@ struct upload_pack_options { void upload_pack(struct upload_pack_options *options); struct repository; -struct argv_array; +struct strvec; struct packet_reader; -int upload_pack_v2(struct repository *r, struct argv_array *keys, +int upload_pack_v2(struct repository *r, struct strvec *keys, struct packet_reader *request); struct strbuf; diff --git a/third_party/git/url.c b/third_party/git/url.c index 1b8ef78cea..e04bd60b6b 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 sightly looser check + * '[A-Za-z][A-Za-z0-9+.-]*'. But use slightly 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,6 +86,12 @@ 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 00b7d58c33..2a27c34277 100644 --- a/third_party/git/url.h +++ b/third_party/git/url.h @@ -7,6 +7,14 @@ 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 3e42bd7504..33a2ccd306 100644 --- a/third_party/git/urlmatch.c +++ b/third_party/git/urlmatch.c @@ -557,6 +557,8 @@ 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) @@ -570,10 +572,14 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb) config_url = xmemdupz(key, dot - key); norm_url = url_normalize_1(config_url, &norm_info, 1); + if (norm_url) + retval = match_urls(url, &norm_info, &matched); + else if (collect->fallback_match_fn) + retval = collect->fallback_match_fn(config_url, + collect->cb); + else + retval = 0; free(config_url); - if (!norm_url) - return 0; - retval = match_urls(url, &norm_info, &matched); free(norm_url); if (!retval) return 0; @@ -587,7 +593,7 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb) if (!item->util) { item->util = xcalloc(1, sizeof(matched)); } else { - if (cmp_matches(&matched, item->util) < 0) + if (select_fn(&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 eed5f29235..6ff42f81b0 100644 --- a/third_party/git/urlmatch.h +++ b/third_party/git/urlmatch.h @@ -50,6 +50,20 @@ 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); + /* + * An optional callback to allow e.g. for partial URLs; it shall + * return 1 or 0 depending whether `url` matches or not. + */ + int (*fallback_match_fn)(const char *url, void *cb); }; 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 2fdb20086b..58fb5fff5f 100644 --- a/third_party/git/usage.c +++ b/third_party/git/usage.c @@ -9,14 +9,26 @@ void vreportf(const char *prefix, const char *err, va_list params) { char msg[4096]; - char *p; + char *p, *pend = msg + sizeof(msg); + size_t prefix_len = strlen(prefix); - vsnprintf(msg, sizeof(msg), err, params); - for (p = msg; *p; 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++) { if (iscntrl(*p) && *p != '\t' && *p != '\n') *p = '?'; } - fprintf(stderr, "%s%s\n", prefix, msg); + + *(p++) = '\n'; /* we no longer need a NUL */ + fflush(stderr); + write_in_full(2, msg, p - 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 e74a6d4022..fde02f225b 100644 --- a/third_party/git/userdiff.c +++ b/third_party/git/userdiff.c @@ -23,11 +23,37 @@ 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", + /* Don't match comment lines */ "!^([C*]|[ \t]*!)\n" + /* Don't match 'module procedure' lines */ "!^[ \t]*MODULE[ \t]+PROCEDURE[ \t]\n" + /* Program, module, block data */ "^[ \t]*((END[ \t]+)?(PROGRAM|MODULE|BLOCK[ \t]+DATA" - "|([^'\" \t]+[ \t]+)*(SUBROUTINE|FUNCTION))[ \t]+[A-Z].*)$", + /* Subroutines and functions */ + "|([^!'\" \t]+[ \t]+)*(SUBROUTINE|FUNCTION))[ \t]+[A-Z].*)$", /* -- */ "[a-zA-Z][a-zA-Z0-9_]*" "|\\.([Ee][Qq]|[Nn][Ee]|[Gg][TtEe]|[Ll][TtEe]|[Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee]|[Aa][Nn][Dd]|[Oo][Rr]|[Nn]?[Ee][Qq][Vv]|[Nn][Oo][Tt])\\." @@ -57,6 +83,9 @@ PATTERNS("java", "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" "|[-+*/<>%&^|=!]=" "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"), +PATTERNS("markdown", + "^ {0,3}#{1,6}[ \t].*", + "[^<>= \t]+"), PATTERNS("matlab", /* * Octave pattern is mostly the same as matlab, except that '%%%' and @@ -124,7 +153,7 @@ PATTERNS("php", "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+" "|[-+*/<>%&^|=!.]=|--|\\+\\+|<<=?|>>=?|===|&&|\\|\\||::|->"), -PATTERNS("python", "^[ \t]*((class|def)[ \t].*)$", +PATTERNS("python", "^[ \t]*((class|(async[ \t]+)?def)[ \t].*)$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+[jJlL]?|0[xX]?[0-9a-fA-F]+[lL]?" @@ -200,7 +229,7 @@ static struct userdiff_driver driver_false = { { NULL, 0 } }; -static struct userdiff_driver *userdiff_find_by_namelen(const char *k, int len) +static struct userdiff_driver *userdiff_find_by_namelen(const char *k, size_t len) { int i; for (i = 0; i < ndrivers; i++) { @@ -244,7 +273,7 @@ int userdiff_config(const char *k, const char *v) { struct userdiff_driver *drv; const char *name, *type; - int namelen; + size_t namelen; if (parse_config_key(k, "diff", &name, &namelen, &type) || !name) return 0; diff --git a/third_party/git/utf8.c b/third_party/git/utf8.c index 3b42fadffd..5b39361ada 100644 --- a/third_party/git/utf8.c +++ b/third_party/git/utf8.c @@ -95,13 +95,11 @@ static int git_wcwidth(ucs_char_t ch) return -1; /* binary search in table of non-spacing characters */ - if (bisearch(ch, zero_width, sizeof(zero_width) - / sizeof(struct interval) - 1)) + if (bisearch(ch, zero_width, ARRAY_SIZE(zero_width) - 1)) return 0; /* binary search in table of double width characters */ - if (bisearch(ch, double_width, sizeof(double_width) - / sizeof(struct interval) - 1)) + if (bisearch(ch, double_width, ARRAY_SIZE(double_width) - 1)) return 2; return 1; @@ -413,11 +411,10 @@ out: */ static int same_utf_encoding(const char *src, const char *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); + if (skip_iprefix(src, "utf", &src) && skip_iprefix(dst, "utf", &dst)) { + skip_prefix(src, "-", &src); + skip_prefix(dst, "-", &dst); + return !strcasecmp(src, dst); } return 0; } diff --git a/third_party/git/vcs-svn/LICENSE b/third_party/git/vcs-svn/LICENSE deleted file mode 100644 index eb91858b82..0000000000 --- a/third_party/git/vcs-svn/LICENSE +++ /dev/null @@ -1,32 +0,0 @@ -Copyright (C) 2010 David Barr <david.barr@cordelta.com>. -All rights reserved. - -Copyright (C) 2010 Jonathan Nieder <jrnieder@gmail.com>. - -Copyright (C) 2005 Stefan Hegny, hydrografix Consulting GmbH, -Frankfurt/Main, Germany -and others, see http://svn2cc.sarovar.org - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice(s), this list of conditions and the following disclaimer - unmodified other than the allowable addition of one or more - copyright notices. -2. Redistributions in binary form must reproduce the above copyright - notice(s), this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/third_party/git/vcs-svn/fast_export.c b/third_party/git/vcs-svn/fast_export.c deleted file mode 100644 index b5b8913cb0..0000000000 --- a/third_party/git/vcs-svn/fast_export.c +++ /dev/null @@ -1,365 +0,0 @@ -/* - * Licensed under a two-clause BSD-style license. - * See LICENSE for details. - */ - -#include "cache.h" -#include "quote.h" -#include "fast_export.h" -#include "strbuf.h" -#include "svndiff.h" -#include "sliding_window.h" -#include "line_buffer.h" - -#define MAX_GITSVN_LINE_LEN 4096 - -static uint32_t first_commit_done; -static struct line_buffer postimage = LINE_BUFFER_INIT; -static struct line_buffer report_buffer = LINE_BUFFER_INIT; - -/* NEEDSWORK: move to fast_export_init() */ -static int init_postimage(void) -{ - static int postimage_initialized; - if (postimage_initialized) - return 0; - postimage_initialized = 1; - return buffer_tmpfile_init(&postimage); -} - -void fast_export_init(int fd) -{ - first_commit_done = 0; - if (buffer_fdinit(&report_buffer, fd)) - die_errno("cannot read from file descriptor %d", fd); -} - -void fast_export_deinit(void) -{ - if (buffer_deinit(&report_buffer)) - die_errno("error closing fast-import feedback stream"); -} - -void fast_export_delete(const char *path) -{ - putchar('D'); - putchar(' '); - quote_c_style(path, NULL, stdout, 0); - putchar('\n'); -} - -static void fast_export_truncate(const char *path, uint32_t mode) -{ - fast_export_modify(path, mode, "inline"); - printf("data 0\n\n"); -} - -void fast_export_modify(const char *path, uint32_t mode, const char *dataref) -{ - /* Mode must be 100644, 100755, 120000, or 160000. */ - if (!dataref) { - fast_export_truncate(path, mode); - return; - } - printf("M %06"PRIo32" %s ", mode, dataref); - quote_c_style(path, NULL, stdout, 0); - putchar('\n'); -} - -void fast_export_begin_note(uint32_t revision, const char *author, - const char *log, timestamp_t timestamp, const char *note_ref) -{ - static int firstnote = 1; - size_t loglen = strlen(log); - printf("commit %s\n", note_ref); - printf("committer %s <%s@%s> %"PRItime" +0000\n", author, author, "local", timestamp); - printf("data %"PRIuMAX"\n", (uintmax_t)loglen); - fwrite(log, loglen, 1, stdout); - if (firstnote) { - if (revision > 1) - printf("from %s^0", note_ref); - firstnote = 0; - } - fputc('\n', stdout); -} - -void fast_export_note(const char *committish, const char *dataref) -{ - printf("N %s %s\n", dataref, committish); -} - -static char gitsvnline[MAX_GITSVN_LINE_LEN]; -void fast_export_begin_commit(uint32_t revision, const char *author, - const struct strbuf *log, - const char *uuid, const char *url, - timestamp_t timestamp, const char *local_ref) -{ - static const struct strbuf empty = STRBUF_INIT; - if (!log) - log = ∅ - if (*uuid && *url) { - snprintf(gitsvnline, MAX_GITSVN_LINE_LEN, - "\n\ngit-svn-id: %s@%"PRIu32" %s\n", - url, revision, uuid); - } else { - *gitsvnline = '\0'; - } - printf("commit %s\n", local_ref); - printf("mark :%"PRIu32"\n", revision); - printf("committer %s <%s@%s> %"PRItime" +0000\n", - *author ? author : "nobody", - *author ? author : "nobody", - *uuid ? uuid : "local", timestamp); - printf("data %"PRIuMAX"\n", - (uintmax_t) (log->len + strlen(gitsvnline))); - fwrite(log->buf, log->len, 1, stdout); - printf("%s\n", gitsvnline); - if (!first_commit_done) { - if (revision > 1) - printf("from :%"PRIu32"\n", revision - 1); - first_commit_done = 1; - } -} - -void fast_export_end_commit(uint32_t revision) -{ - printf("progress Imported commit %"PRIu32".\n\n", revision); -} - -static void ls_from_rev(uint32_t rev, const char *path) -{ - /* ls :5 path/to/old/file */ - printf("ls :%"PRIu32" ", rev); - quote_c_style(path, NULL, stdout, 0); - putchar('\n'); - fflush(stdout); -} - -static void ls_from_active_commit(const char *path) -{ - /* ls "path/to/file" */ - printf("ls \""); - quote_c_style(path, NULL, stdout, 1); - printf("\"\n"); - fflush(stdout); -} - -static const char *get_response_line(void) -{ - const char *line = buffer_read_line(&report_buffer); - if (line) - return line; - if (buffer_ferror(&report_buffer)) - die_errno("error reading from fast-import"); - die("unexpected end of fast-import feedback"); -} - -static void die_short_read(struct line_buffer *input) -{ - if (buffer_ferror(input)) - die_errno("error reading dump file"); - die("invalid dump: unexpected end of file"); -} - -static int parse_cat_response_line(const char *header, off_t *len) -{ - uintmax_t n; - const char *type; - const char *end; - - if (ends_with(header, " missing")) - return error("cat-blob reports missing blob: %s", header); - type = strstr(header, " blob "); - if (!type) - return error("cat-blob header has wrong object type: %s", header); - n = strtoumax(type + strlen(" blob "), (char **) &end, 10); - if (end == type + strlen(" blob ")) - return error("cat-blob header does not contain length: %s", header); - if (memchr(type + strlen(" blob "), '-', end - type - strlen(" blob "))) - return error("cat-blob header contains negative length: %s", header); - if (n == UINTMAX_MAX || n > maximum_signed_value_of_type(off_t)) - return error("blob too large for current definition of off_t"); - *len = n; - if (*end) - return error("cat-blob header contains garbage after length: %s", header); - return 0; -} - -static void check_preimage_overflow(off_t a, off_t b) -{ - if (signed_add_overflows(a, b)) - die("blob too large for current definition of off_t"); -} - -static long apply_delta(off_t len, struct line_buffer *input, - const char *old_data, uint32_t old_mode) -{ - long ret; - struct sliding_view preimage = SLIDING_VIEW_INIT(&report_buffer, 0); - FILE *out; - - if (init_postimage() || !(out = buffer_tmpfile_rewind(&postimage))) - die("cannot open temporary file for blob retrieval"); - if (old_data) { - const char *response; - printf("cat-blob %s\n", old_data); - fflush(stdout); - response = get_response_line(); - if (parse_cat_response_line(response, &preimage.max_off)) - die("invalid cat-blob response: %s", response); - check_preimage_overflow(preimage.max_off, 1); - } - if (old_mode == S_IFLNK) { - strbuf_addstr(&preimage.buf, "link "); - check_preimage_overflow(preimage.max_off, strlen("link ")); - preimage.max_off += strlen("link "); - check_preimage_overflow(preimage.max_off, 1); - } - if (svndiff0_apply(input, len, &preimage, out)) - die("cannot apply delta"); - if (old_data) { - /* Read the remainder of preimage and trailing newline. */ - assert(!signed_add_overflows(preimage.max_off, 1)); - preimage.max_off++; /* room for newline */ - if (move_window(&preimage, preimage.max_off - 1, 1)) - die("cannot seek to end of input"); - if (preimage.buf.buf[0] != '\n') - die("missing newline after cat-blob response"); - } - ret = buffer_tmpfile_prepare_to_read(&postimage); - if (ret < 0) - die("cannot read temporary file for blob retrieval"); - strbuf_release(&preimage.buf); - return ret; -} - -void fast_export_buf_to_data(const struct strbuf *data) -{ - printf("data %"PRIuMAX"\n", (uintmax_t)data->len); - fwrite(data->buf, data->len, 1, stdout); - fputc('\n', stdout); -} - -void fast_export_data(uint32_t mode, off_t len, struct line_buffer *input) -{ - assert(len >= 0); - if (mode == S_IFLNK) { - /* svn symlink blobs start with "link " */ - if (len < 5) - die("invalid dump: symlink too short for \"link\" prefix"); - len -= 5; - if (buffer_skip_bytes(input, 5) != 5) - die_short_read(input); - } - printf("data %"PRIuMAX"\n", (uintmax_t) len); - if (buffer_copy_bytes(input, len) != len) - die_short_read(input); - fputc('\n', stdout); -} - -static int parse_ls_response(const char *response, uint32_t *mode, - struct strbuf *dataref) -{ - const char *tab; - const char *response_end; - - assert(response); - response_end = response + strlen(response); - - if (*response == 'm') { /* Missing. */ - errno = ENOENT; - return -1; - } - - /* Mode. */ - if (response_end - response < (signed) strlen("100644") || - response[strlen("100644")] != ' ') - die("invalid ls response: missing mode: %s", response); - *mode = 0; - for (; *response != ' '; response++) { - char ch = *response; - if (ch < '0' || ch > '7') - die("invalid ls response: mode is not octal: %s", response); - *mode *= 8; - *mode += ch - '0'; - } - - /* ' blob ' or ' tree ' */ - if (response_end - response < (signed) strlen(" blob ") || - (response[1] != 'b' && response[1] != 't')) - die("unexpected ls response: not a tree or blob: %s", response); - response += strlen(" blob "); - - /* Dataref. */ - tab = memchr(response, '\t', response_end - response); - if (!tab) - die("invalid ls response: missing tab: %s", response); - strbuf_add(dataref, response, tab - response); - return 0; -} - -int fast_export_ls_rev(uint32_t rev, const char *path, - uint32_t *mode, struct strbuf *dataref) -{ - ls_from_rev(rev, path); - return parse_ls_response(get_response_line(), mode, dataref); -} - -int fast_export_ls(const char *path, uint32_t *mode, struct strbuf *dataref) -{ - ls_from_active_commit(path); - return parse_ls_response(get_response_line(), mode, dataref); -} - -const char *fast_export_read_path(const char *path, uint32_t *mode_out) -{ - int err; - static struct strbuf buf = STRBUF_INIT; - - strbuf_reset(&buf); - err = fast_export_ls(path, mode_out, &buf); - if (err) { - if (errno != ENOENT) - BUG("unexpected fast_export_ls error: %s", - strerror(errno)); - /* Treat missing paths as directories. */ - *mode_out = S_IFDIR; - return NULL; - } - return buf.buf; -} - -void fast_export_copy(uint32_t revision, const char *src, const char *dst) -{ - int err; - uint32_t mode; - static struct strbuf data = STRBUF_INIT; - - strbuf_reset(&data); - err = fast_export_ls_rev(revision, src, &mode, &data); - if (err) { - if (errno != ENOENT) - BUG("unexpected fast_export_ls_rev error: %s", - strerror(errno)); - fast_export_delete(dst); - return; - } - fast_export_modify(dst, mode, data.buf); -} - -void fast_export_blob_delta(uint32_t mode, - uint32_t old_mode, const char *old_data, - off_t len, struct line_buffer *input) -{ - long postimage_len; - - assert(len >= 0); - postimage_len = apply_delta(len, input, old_data, old_mode); - if (mode == S_IFLNK) { - buffer_skip_bytes(&postimage, strlen("link ")); - postimage_len -= strlen("link "); - } - printf("data %ld\n", postimage_len); - buffer_copy_bytes(&postimage, postimage_len); - fputc('\n', stdout); -} diff --git a/third_party/git/vcs-svn/line_buffer.c b/third_party/git/vcs-svn/line_buffer.c deleted file mode 100644 index e416caf8a4..0000000000 --- a/third_party/git/vcs-svn/line_buffer.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Licensed under a two-clause BSD-style license. - * See LICENSE for details. - */ - -#include "git-compat-util.h" -#include "line_buffer.h" -#include "strbuf.h" - -#define COPY_BUFFER_LEN 4096 - -int buffer_init(struct line_buffer *buf, const char *filename) -{ - buf->infile = filename ? fopen(filename, "r") : stdin; - if (!buf->infile) - return -1; - return 0; -} - -int buffer_fdinit(struct line_buffer *buf, int fd) -{ - buf->infile = fdopen(fd, "r"); - if (!buf->infile) - return -1; - return 0; -} - -int buffer_tmpfile_init(struct line_buffer *buf) -{ - buf->infile = tmpfile(); - if (!buf->infile) - return -1; - return 0; -} - -int buffer_deinit(struct line_buffer *buf) -{ - int err; - if (buf->infile == stdin) - return ferror(buf->infile); - err = ferror(buf->infile); - err |= fclose(buf->infile); - return err; -} - -FILE *buffer_tmpfile_rewind(struct line_buffer *buf) -{ - rewind(buf->infile); - return buf->infile; -} - -long buffer_tmpfile_prepare_to_read(struct line_buffer *buf) -{ - long pos = ftell(buf->infile); - if (pos < 0) - return error_errno("ftell error"); - if (fseek(buf->infile, 0, SEEK_SET)) - return error_errno("seek error"); - return pos; -} - -int buffer_ferror(struct line_buffer *buf) -{ - return ferror(buf->infile); -} - -int buffer_read_char(struct line_buffer *buf) -{ - return fgetc(buf->infile); -} - -/* Read a line without trailing newline. */ -char *buffer_read_line(struct line_buffer *buf) -{ - char *end; - if (!fgets(buf->line_buffer, sizeof(buf->line_buffer), buf->infile)) - /* Error or data exhausted. */ - return NULL; - end = buf->line_buffer + strlen(buf->line_buffer); - if (end[-1] == '\n') - end[-1] = '\0'; - else if (feof(buf->infile)) - ; /* No newline at end of file. That's fine. */ - else - /* - * Line was too long. - * There is probably a saner way to deal with this, - * but for now let's return an error. - */ - return NULL; - return buf->line_buffer; -} - -size_t buffer_read_binary(struct line_buffer *buf, - struct strbuf *sb, size_t size) -{ - return strbuf_fread(sb, size, buf->infile); -} - -off_t buffer_copy_bytes(struct line_buffer *buf, off_t nbytes) -{ - char byte_buffer[COPY_BUFFER_LEN]; - off_t done = 0; - while (done < nbytes && !feof(buf->infile) && !ferror(buf->infile)) { - off_t len = nbytes - done; - size_t in = len < COPY_BUFFER_LEN ? len : COPY_BUFFER_LEN; - in = fread(byte_buffer, 1, in, buf->infile); - done += in; - fwrite(byte_buffer, 1, in, stdout); - if (ferror(stdout)) - return done + buffer_skip_bytes(buf, nbytes - done); - } - return done; -} - -off_t buffer_skip_bytes(struct line_buffer *buf, off_t nbytes) -{ - char byte_buffer[COPY_BUFFER_LEN]; - off_t done = 0; - while (done < nbytes && !feof(buf->infile) && !ferror(buf->infile)) { - off_t len = nbytes - done; - size_t in = len < COPY_BUFFER_LEN ? len : COPY_BUFFER_LEN; - done += fread(byte_buffer, 1, in, buf->infile); - } - return done; -} diff --git a/third_party/git/vcs-svn/line_buffer.txt b/third_party/git/vcs-svn/line_buffer.txt deleted file mode 100644 index 8e139eb22d..0000000000 --- a/third_party/git/vcs-svn/line_buffer.txt +++ /dev/null @@ -1,77 +0,0 @@ -line_buffer API -=============== - -The line_buffer library provides a convenient interface for -mostly-line-oriented input. - -Each line is not permitted to exceed 10000 bytes. The provided -functions are not thread-safe or async-signal-safe, and like -`fgets()`, they generally do not function correctly if interrupted -by a signal without SA_RESTART set. - -Calling sequence ----------------- - -The calling program: - - - initializes a `struct line_buffer` to LINE_BUFFER_INIT - - specifies a file to read with `buffer_init` - - processes input with `buffer_read_line`, `buffer_skip_bytes`, - and `buffer_copy_bytes` - - closes the file with `buffer_deinit`, perhaps to start over and - read another file. - -When finished, the caller can use `buffer_reset` to deallocate -resources. - -Using temporary files ---------------------- - -Temporary files provide a place to store data that should not outlive -the calling program. A program - - - initializes a `struct line_buffer` to LINE_BUFFER_INIT - - requests a temporary file with `buffer_tmpfile_init` - - acquires an output handle by calling `buffer_tmpfile_rewind` - - uses standard I/O functions like `fprintf` and `fwrite` to fill - the temporary file - - declares writing is over with `buffer_tmpfile_prepare_to_read` - - can re-read what was written with `buffer_read_line`, - `buffer_copy_bytes`, and so on - - can reuse the temporary file by calling `buffer_tmpfile_rewind` - again - - removes the temporary file with `buffer_deinit`, perhaps to - reuse the line_buffer for some other file. - -When finished, the calling program can use `buffer_reset` to deallocate -resources. - -Functions ---------- - -`buffer_init`, `buffer_fdinit`:: - Open the named file or file descriptor for input. - buffer_init(buf, NULL) prepares to read from stdin. - On failure, returns -1 (with errno indicating the nature - of the failure). - -`buffer_deinit`:: - Stop reading from the current file (closing it unless - it was stdin). Returns nonzero if `fclose` fails or - the error indicator was set. - -`buffer_read_line`:: - Read a line and strip off the trailing newline. - On failure or end of file, returns NULL. - -`buffer_copy_bytes`:: - Read `len` bytes of input and dump them to the standard output - stream. Returns early for error or end of file. - -`buffer_skip_bytes`:: - Discards `len` bytes from the input stream (stopping early - if necessary because of an error or eof). Return value is - the number of bytes successfully read. - -`buffer_reset`:: - Deallocates non-static buffers. diff --git a/third_party/git/vcs-svn/sliding_window.c b/third_party/git/vcs-svn/sliding_window.c deleted file mode 100644 index 06d273c9e8..0000000000 --- a/third_party/git/vcs-svn/sliding_window.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Licensed under a two-clause BSD-style license. - * See LICENSE for details. - */ - -#include "git-compat-util.h" -#include "sliding_window.h" -#include "line_buffer.h" -#include "strbuf.h" - -static int input_error(struct line_buffer *file) -{ - if (!buffer_ferror(file)) - return error("delta preimage ends early"); - return error_errno("cannot read delta preimage"); -} - -static int skip_or_whine(struct line_buffer *file, off_t gap) -{ - if (buffer_skip_bytes(file, gap) != gap) - return input_error(file); - return 0; -} - -static int read_to_fill_or_whine(struct line_buffer *file, - struct strbuf *buf, size_t width) -{ - buffer_read_binary(file, buf, width - buf->len); - if (buf->len != width) - return input_error(file); - return 0; -} - -static int check_offset_overflow(off_t offset, uintmax_t len) -{ - if (len > maximum_signed_value_of_type(off_t)) - return error("unrepresentable length in delta: " - "%"PRIuMAX" > OFF_MAX", len); - if (signed_add_overflows(offset, (off_t) len)) - return error("unrepresentable offset in delta: " - "%"PRIuMAX" + %"PRIuMAX" > OFF_MAX", - (uintmax_t) offset, len); - return 0; -} - -int move_window(struct sliding_view *view, off_t off, size_t width) -{ - off_t file_offset; - assert(view); - assert(view->width <= view->buf.len); - assert(!check_offset_overflow(view->off, view->buf.len)); - - if (check_offset_overflow(off, width)) - return -1; - if (off < view->off || off + width < view->off + view->width) - return error("invalid delta: window slides left"); - if (view->max_off >= 0 && view->max_off < off + (off_t) width) - return error("delta preimage ends early"); - - file_offset = view->off + view->buf.len; - if (off < file_offset) { - /* Move the overlapping region into place. */ - strbuf_remove(&view->buf, 0, off - view->off); - } else { - /* Seek ahead to skip the gap. */ - if (skip_or_whine(view->file, off - file_offset)) - return -1; - strbuf_setlen(&view->buf, 0); - } - - if (view->buf.len > width) - ; /* Already read. */ - else if (read_to_fill_or_whine(view->file, &view->buf, width)) - return -1; - - view->off = off; - view->width = width; - return 0; -} diff --git a/third_party/git/vcs-svn/svndiff.c b/third_party/git/vcs-svn/svndiff.c deleted file mode 100644 index 75c753162a..0000000000 --- a/third_party/git/vcs-svn/svndiff.c +++ /dev/null @@ -1,309 +0,0 @@ -/* - * Licensed under a two-clause BSD-style license. - * See LICENSE for details. - */ - -#include "git-compat-util.h" -#include "sliding_window.h" -#include "line_buffer.h" -#include "svndiff.h" - -/* - * svndiff0 applier - * - * See http://svn.apache.org/repos/asf/subversion/trunk/notes/svndiff. - * - * svndiff0 ::= 'SVN\0' window* - * window ::= int int int int int instructions inline_data; - * instructions ::= instruction*; - * instruction ::= view_selector int int - * | copyfrom_data int - * | packed_view_selector int - * | packed_copyfrom_data - * ; - * view_selector ::= copyfrom_source - * | copyfrom_target - * ; - * copyfrom_source ::= # binary 00 000000; - * copyfrom_target ::= # binary 01 000000; - * copyfrom_data ::= # binary 10 000000; - * packed_view_selector ::= # view_selector OR-ed with 6 bit value; - * packed_copyfrom_data ::= # copyfrom_data OR-ed with 6 bit value; - * int ::= highdigit* lowdigit; - * highdigit ::= # binary 1000 0000 OR-ed with 7 bit value; - * lowdigit ::= # 7 bit value; - */ - -#define INSN_MASK 0xc0 -#define INSN_COPYFROM_SOURCE 0x00 -#define INSN_COPYFROM_TARGET 0x40 -#define INSN_COPYFROM_DATA 0x80 -#define OPERAND_MASK 0x3f - -#define VLI_CONTINUE 0x80 -#define VLI_DIGIT_MASK 0x7f -#define VLI_BITS_PER_DIGIT 7 - -struct window { - struct sliding_view *in; - struct strbuf out; - struct strbuf instructions; - struct strbuf data; -}; - -#define WINDOW_INIT(w) { (w), STRBUF_INIT, STRBUF_INIT, STRBUF_INIT } - -static void window_release(struct window *ctx) -{ - strbuf_release(&ctx->out); - strbuf_release(&ctx->instructions); - strbuf_release(&ctx->data); -} - -static int write_strbuf(struct strbuf *sb, FILE *out) -{ - if (fwrite(sb->buf, 1, sb->len, out) == sb->len) /* Success. */ - return 0; - return error_errno("cannot write delta postimage"); -} - -static int error_short_read(struct line_buffer *input) -{ - if (buffer_ferror(input)) - return error_errno("error reading delta"); - return error("invalid delta: unexpected end of file"); -} - -static int read_chunk(struct line_buffer *delta, off_t *delta_len, - struct strbuf *buf, size_t len) -{ - assert(*delta_len >= 0); - strbuf_reset(buf); - if (len > (uintmax_t) *delta_len || - buffer_read_binary(delta, buf, len) != len) - return error_short_read(delta); - *delta_len -= buf->len; - return 0; -} - -static int read_magic(struct line_buffer *in, off_t *len) -{ - static const char magic[] = {'S', 'V', 'N', '\0'}; - struct strbuf sb = STRBUF_INIT; - - if (read_chunk(in, len, &sb, sizeof(magic))) { - strbuf_release(&sb); - return -1; - } - if (memcmp(sb.buf, magic, sizeof(magic))) { - strbuf_release(&sb); - return error("invalid delta: unrecognized file type"); - } - strbuf_release(&sb); - return 0; -} - -static int read_int(struct line_buffer *in, uintmax_t *result, off_t *len) -{ - uintmax_t rv = 0; - off_t sz; - for (sz = *len; sz; sz--) { - const int ch = buffer_read_char(in); - if (ch == EOF) - break; - - rv <<= VLI_BITS_PER_DIGIT; - rv += (ch & VLI_DIGIT_MASK); - if (ch & VLI_CONTINUE) - continue; - - *result = rv; - *len = sz - 1; - return 0; - } - return error_short_read(in); -} - -static int parse_int(const char **buf, size_t *result, const char *end) -{ - size_t rv = 0; - const char *pos; - for (pos = *buf; pos != end; pos++) { - unsigned char ch = *pos; - - rv <<= VLI_BITS_PER_DIGIT; - rv += (ch & VLI_DIGIT_MASK); - if (ch & VLI_CONTINUE) - continue; - - *result = rv; - *buf = pos + 1; - return 0; - } - return error("invalid delta: unexpected end of instructions section"); -} - -static int read_offset(struct line_buffer *in, off_t *result, off_t *len) -{ - uintmax_t val; - if (read_int(in, &val, len)) - return -1; - if (val > maximum_signed_value_of_type(off_t)) - return error("unrepresentable offset in delta: %"PRIuMAX"", val); - *result = val; - return 0; -} - -static int read_length(struct line_buffer *in, size_t *result, off_t *len) -{ - uintmax_t val; - if (read_int(in, &val, len)) - return -1; - if (val > SIZE_MAX) - return error("unrepresentable length in delta: %"PRIuMAX"", val); - *result = val; - return 0; -} - -static int copyfrom_source(struct window *ctx, const char **instructions, - size_t nbytes, const char *insns_end) -{ - size_t offset; - if (parse_int(instructions, &offset, insns_end)) - return -1; - if (unsigned_add_overflows(offset, nbytes) || - offset + nbytes > ctx->in->width) - return error("invalid delta: copies source data outside view"); - strbuf_add(&ctx->out, ctx->in->buf.buf + offset, nbytes); - return 0; -} - -static int copyfrom_target(struct window *ctx, const char **instructions, - size_t nbytes, const char *instructions_end) -{ - size_t offset; - if (parse_int(instructions, &offset, instructions_end)) - return -1; - if (offset >= ctx->out.len) - return error("invalid delta: copies from the future"); - for (; nbytes > 0; nbytes--) - strbuf_addch(&ctx->out, ctx->out.buf[offset++]); - return 0; -} - -static int copyfrom_data(struct window *ctx, size_t *data_pos, size_t nbytes) -{ - const size_t pos = *data_pos; - if (unsigned_add_overflows(pos, nbytes) || - pos + nbytes > ctx->data.len) - return error("invalid delta: copies unavailable inline data"); - strbuf_add(&ctx->out, ctx->data.buf + pos, nbytes); - *data_pos += nbytes; - return 0; -} - -static int parse_first_operand(const char **buf, size_t *out, const char *end) -{ - size_t result = (unsigned char) *(*buf)++ & OPERAND_MASK; - if (result) { /* immediate operand */ - *out = result; - return 0; - } - return parse_int(buf, out, end); -} - -static int execute_one_instruction(struct window *ctx, - const char **instructions, size_t *data_pos) -{ - unsigned int instruction; - const char *insns_end = ctx->instructions.buf + ctx->instructions.len; - size_t nbytes; - assert(ctx); - assert(instructions && *instructions); - assert(data_pos); - - instruction = (unsigned char) **instructions; - if (parse_first_operand(instructions, &nbytes, insns_end)) - return -1; - switch (instruction & INSN_MASK) { - case INSN_COPYFROM_SOURCE: - return copyfrom_source(ctx, instructions, nbytes, insns_end); - case INSN_COPYFROM_TARGET: - return copyfrom_target(ctx, instructions, nbytes, insns_end); - case INSN_COPYFROM_DATA: - return copyfrom_data(ctx, data_pos, nbytes); - default: - return error("invalid delta: unrecognized instruction"); - } -} - -static int apply_window_in_core(struct window *ctx) -{ - const char *instructions; - size_t data_pos = 0; - - /* - * Fill ctx->out.buf using data from the source, target, - * and inline data views. - */ - for (instructions = ctx->instructions.buf; - instructions != ctx->instructions.buf + ctx->instructions.len; - ) - if (execute_one_instruction(ctx, &instructions, &data_pos)) - return -1; - if (data_pos != ctx->data.len) - return error("invalid delta: does not copy all inline data"); - return 0; -} - -static int apply_one_window(struct line_buffer *delta, off_t *delta_len, - struct sliding_view *preimage, FILE *out) -{ - int rv = -1; - struct window ctx = WINDOW_INIT(preimage); - size_t out_len; - size_t instructions_len; - size_t data_len; - assert(delta_len); - - /* "source view" offset and length already handled; */ - if (read_length(delta, &out_len, delta_len) || - read_length(delta, &instructions_len, delta_len) || - read_length(delta, &data_len, delta_len) || - read_chunk(delta, delta_len, &ctx.instructions, instructions_len) || - read_chunk(delta, delta_len, &ctx.data, data_len)) - goto error_out; - strbuf_grow(&ctx.out, out_len); - if (apply_window_in_core(&ctx)) - goto error_out; - if (ctx.out.len != out_len) { - rv = error("invalid delta: incorrect postimage length"); - goto error_out; - } - if (write_strbuf(&ctx.out, out)) - goto error_out; - rv = 0; -error_out: - window_release(&ctx); - return rv; -} - -int svndiff0_apply(struct line_buffer *delta, off_t delta_len, - struct sliding_view *preimage, FILE *postimage) -{ - assert(delta && preimage && postimage && delta_len >= 0); - - if (read_magic(delta, &delta_len)) - return -1; - while (delta_len) { /* For each window: */ - off_t pre_off = -1; - size_t pre_len; - - if (read_offset(delta, &pre_off, &delta_len) || - read_length(delta, &pre_len, &delta_len) || - move_window(preimage, pre_off, pre_len) || - apply_one_window(delta, &delta_len, preimage, postimage)) - return -1; - } - return 0; -} diff --git a/third_party/git/vcs-svn/svndump.c b/third_party/git/vcs-svn/svndump.c deleted file mode 100644 index 08d136b8cc..0000000000 --- a/third_party/git/vcs-svn/svndump.c +++ /dev/null @@ -1,540 +0,0 @@ -/* - * Parse and rearrange a svnadmin dump. - * Create the dump with: - * svnadmin dump --incremental -r<startrev>:<endrev> <repository> >outfile - * - * Licensed under a two-clause BSD-style license. - * See LICENSE for details. - */ - -#include "cache.h" -#include "fast_export.h" -#include "line_buffer.h" -#include "strbuf.h" -#include "svndump.h" - -/* - * Compare start of string to literal of equal length; - * must be guarded by length test. - */ -#define constcmp(s, ref) memcmp(s, ref, sizeof(ref) - 1) - -#define REPORT_FILENO 3 - -#define NODEACT_REPLACE 4 -#define NODEACT_DELETE 3 -#define NODEACT_ADD 2 -#define NODEACT_CHANGE 1 -#define NODEACT_UNKNOWN 0 - -/* States: */ -#define DUMP_CTX 0 /* dump metadata */ -#define REV_CTX 1 /* revision metadata */ -#define NODE_CTX 2 /* node metadata */ -#define INTERNODE_CTX 3 /* between nodes */ - -#define DATE_RFC2822_LEN 31 - -static struct line_buffer input = LINE_BUFFER_INIT; - -static struct { - uint32_t action, srcRev, type; - off_t prop_length, text_length; - struct strbuf src, dst; - uint32_t text_delta, prop_delta; -} node_ctx; - -static struct { - uint32_t revision; - timestamp_t timestamp; - struct strbuf log, author, note; -} rev_ctx; - -static struct { - uint32_t version; - struct strbuf uuid, url; -} dump_ctx; - -static void reset_node_ctx(char *fname) -{ - node_ctx.type = 0; - node_ctx.action = NODEACT_UNKNOWN; - node_ctx.prop_length = -1; - node_ctx.text_length = -1; - strbuf_reset(&node_ctx.src); - node_ctx.srcRev = 0; - strbuf_reset(&node_ctx.dst); - if (fname) - strbuf_addstr(&node_ctx.dst, fname); - node_ctx.text_delta = 0; - node_ctx.prop_delta = 0; -} - -static void reset_rev_ctx(uint32_t revision) -{ - rev_ctx.revision = revision; - rev_ctx.timestamp = 0; - strbuf_reset(&rev_ctx.log); - strbuf_reset(&rev_ctx.author); - strbuf_reset(&rev_ctx.note); -} - -static void reset_dump_ctx(const char *url) -{ - strbuf_reset(&dump_ctx.url); - if (url) - strbuf_addstr(&dump_ctx.url, url); - dump_ctx.version = 1; - strbuf_reset(&dump_ctx.uuid); -} - -static void handle_property(const struct strbuf *key_buf, - struct strbuf *val, - uint32_t *type_set) -{ - const char *key = key_buf->buf; - size_t keylen = key_buf->len; - - switch (keylen + 1) { - case sizeof("svn:log"): - if (constcmp(key, "svn:log")) - break; - if (!val) - die("invalid dump: unsets svn:log"); - strbuf_swap(&rev_ctx.log, val); - break; - case sizeof("svn:author"): - if (constcmp(key, "svn:author")) - break; - if (!val) - strbuf_reset(&rev_ctx.author); - else - strbuf_swap(&rev_ctx.author, val); - break; - case sizeof("svn:date"): - if (constcmp(key, "svn:date")) - break; - if (!val) - die("invalid dump: unsets svn:date"); - if (parse_date_basic(val->buf, &rev_ctx.timestamp, NULL)) - warning("invalid timestamp: %s", val->buf); - break; - case sizeof("svn:executable"): - case sizeof("svn:special"): - if (keylen == strlen("svn:executable") && - constcmp(key, "svn:executable")) - break; - if (keylen == strlen("svn:special") && - constcmp(key, "svn:special")) - break; - if (*type_set) { - if (!val) - return; - die("invalid dump: sets type twice"); - } - if (!val) { - node_ctx.type = S_IFREG | 0644; - return; - } - *type_set = 1; - node_ctx.type = keylen == strlen("svn:executable") ? - (S_IFREG | 0755) : - S_IFLNK; - } -} - -static void die_short_read(void) -{ - if (buffer_ferror(&input)) - die_errno("error reading dump file"); - die("invalid dump: unexpected end of file"); -} - -static void read_props(void) -{ - static struct strbuf key = STRBUF_INIT; - static struct strbuf val = STRBUF_INIT; - const char *t; - /* - * NEEDSWORK: to support simple mode changes like - * K 11 - * svn:special - * V 1 - * * - * D 14 - * svn:executable - * we keep track of whether a mode has been set and reset to - * plain file only if not. We should be keeping track of the - * symlink and executable bits separately instead. - */ - uint32_t type_set = 0; - while ((t = buffer_read_line(&input)) && strcmp(t, "PROPS-END")) { - uint32_t len; - const char type = t[0]; - int ch; - - if (!type || t[1] != ' ') - die("invalid property line: %s", t); - len = atoi(&t[2]); - strbuf_reset(&val); - buffer_read_binary(&input, &val, len); - if (val.len < len) - die_short_read(); - - /* Discard trailing newline. */ - ch = buffer_read_char(&input); - if (ch == EOF) - die_short_read(); - if (ch != '\n') - die("invalid dump: expected newline after %s", val.buf); - - switch (type) { - case 'K': - strbuf_swap(&key, &val); - continue; - case 'D': - handle_property(&val, NULL, &type_set); - continue; - case 'V': - handle_property(&key, &val, &type_set); - strbuf_reset(&key); - continue; - default: - die("invalid property line: %s", t); - } - } -} - -static void handle_node(void) -{ - const uint32_t type = node_ctx.type; - const int have_props = node_ctx.prop_length != -1; - const int have_text = node_ctx.text_length != -1; - /* - * Old text for this node: - * NULL - directory or bug - * empty_blob - empty - * "<dataref>" - data retrievable from fast-import - */ - static const char *const empty_blob = "::empty::"; - const char *old_data = NULL; - uint32_t old_mode = S_IFREG | 0644; - - if (node_ctx.action == NODEACT_DELETE) { - if (have_text || have_props || node_ctx.srcRev) - die("invalid dump: deletion node has " - "copyfrom info, text, or properties"); - fast_export_delete(node_ctx.dst.buf); - return; - } - if (node_ctx.action == NODEACT_REPLACE) { - fast_export_delete(node_ctx.dst.buf); - node_ctx.action = NODEACT_ADD; - } - if (node_ctx.srcRev) { - fast_export_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf); - if (node_ctx.action == NODEACT_ADD) - node_ctx.action = NODEACT_CHANGE; - } - if (have_text && type == S_IFDIR) - die("invalid dump: directories cannot have text attached"); - - /* - * Find old content (old_data) and decide on the new mode. - */ - if (node_ctx.action == NODEACT_CHANGE && !*node_ctx.dst.buf) { - if (type != S_IFDIR) - die("invalid dump: root of tree is not a regular file"); - old_data = NULL; - } else if (node_ctx.action == NODEACT_CHANGE) { - uint32_t mode; - old_data = fast_export_read_path(node_ctx.dst.buf, &mode); - if (mode == S_IFDIR && type != S_IFDIR) - die("invalid dump: cannot modify a directory into a file"); - if (mode != S_IFDIR && type == S_IFDIR) - die("invalid dump: cannot modify a file into a directory"); - node_ctx.type = mode; - old_mode = mode; - } else if (node_ctx.action == NODEACT_ADD) { - if (type == S_IFDIR) - old_data = NULL; - else if (have_text) - old_data = empty_blob; - else - die("invalid dump: adds node without text"); - } else { - die("invalid dump: Node-path block lacks Node-action"); - } - - /* - * Adjust mode to reflect properties. - */ - if (have_props) { - if (!node_ctx.prop_delta) - node_ctx.type = type; - if (node_ctx.prop_length) - read_props(); - } - - /* - * Save the result. - */ - if (type == S_IFDIR) /* directories are not tracked. */ - return; - assert(old_data); - if (old_data == empty_blob) - /* For the fast_export_* functions, NULL means empty. */ - old_data = NULL; - if (!have_text) { - fast_export_modify(node_ctx.dst.buf, node_ctx.type, old_data); - return; - } - if (!node_ctx.text_delta) { - fast_export_modify(node_ctx.dst.buf, node_ctx.type, "inline"); - fast_export_data(node_ctx.type, node_ctx.text_length, &input); - return; - } - fast_export_modify(node_ctx.dst.buf, node_ctx.type, "inline"); - fast_export_blob_delta(node_ctx.type, old_mode, old_data, - node_ctx.text_length, &input); -} - -static void begin_revision(const char *remote_ref) -{ - if (!rev_ctx.revision) /* revision 0 gets no git commit. */ - return; - fast_export_begin_commit(rev_ctx.revision, rev_ctx.author.buf, - &rev_ctx.log, dump_ctx.uuid.buf, dump_ctx.url.buf, - rev_ctx.timestamp, remote_ref); -} - -static void end_revision(const char *note_ref) -{ - struct strbuf mark = STRBUF_INIT; - if (rev_ctx.revision) { - fast_export_end_commit(rev_ctx.revision); - fast_export_begin_note(rev_ctx.revision, "remote-svn", - "Note created by remote-svn.", rev_ctx.timestamp, note_ref); - strbuf_addf(&mark, ":%"PRIu32, rev_ctx.revision); - fast_export_note(mark.buf, "inline"); - fast_export_buf_to_data(&rev_ctx.note); - strbuf_release(&mark); - } -} - -void svndump_read(const char *url, const char *local_ref, const char *notes_ref) -{ - char *val; - char *t; - uint32_t active_ctx = DUMP_CTX; - uint32_t len; - - reset_dump_ctx(url); - while ((t = buffer_read_line(&input))) { - val = strchr(t, ':'); - if (!val) - continue; - val++; - if (*val != ' ') - continue; - val++; - - /* strlen(key) + 1 */ - switch (val - t - 1) { - case sizeof("SVN-fs-dump-format-version"): - if (constcmp(t, "SVN-fs-dump-format-version")) - continue; - dump_ctx.version = atoi(val); - if (dump_ctx.version > 3) - die("expected svn dump format version <= 3, found %"PRIu32, - dump_ctx.version); - break; - case sizeof("UUID"): - if (constcmp(t, "UUID")) - continue; - strbuf_reset(&dump_ctx.uuid); - strbuf_addstr(&dump_ctx.uuid, val); - break; - case sizeof("Revision-number"): - if (constcmp(t, "Revision-number")) - continue; - if (active_ctx == NODE_CTX) - handle_node(); - if (active_ctx == REV_CTX) - begin_revision(local_ref); - if (active_ctx != DUMP_CTX) - end_revision(notes_ref); - active_ctx = REV_CTX; - reset_rev_ctx(atoi(val)); - strbuf_addf(&rev_ctx.note, "%s\n", t); - break; - case sizeof("Node-path"): - if (constcmp(t, "Node-")) - continue; - if (!constcmp(t + strlen("Node-"), "path")) { - if (active_ctx == NODE_CTX) - handle_node(); - if (active_ctx == REV_CTX) - begin_revision(local_ref); - active_ctx = NODE_CTX; - reset_node_ctx(val); - strbuf_addf(&rev_ctx.note, "%s\n", t); - break; - } - if (constcmp(t + strlen("Node-"), "kind")) - continue; - strbuf_addf(&rev_ctx.note, "%s\n", t); - if (!strcmp(val, "dir")) - node_ctx.type = S_IFDIR; - else if (!strcmp(val, "file")) - node_ctx.type = S_IFREG | 0644; - else - fprintf(stderr, "Unknown node-kind: %s\n", val); - break; - case sizeof("Node-action"): - if (constcmp(t, "Node-action")) - continue; - strbuf_addf(&rev_ctx.note, "%s\n", t); - if (!strcmp(val, "delete")) { - node_ctx.action = NODEACT_DELETE; - } else if (!strcmp(val, "add")) { - node_ctx.action = NODEACT_ADD; - } else if (!strcmp(val, "change")) { - node_ctx.action = NODEACT_CHANGE; - } else if (!strcmp(val, "replace")) { - node_ctx.action = NODEACT_REPLACE; - } else { - fprintf(stderr, "Unknown node-action: %s\n", val); - node_ctx.action = NODEACT_UNKNOWN; - } - break; - case sizeof("Node-copyfrom-path"): - if (constcmp(t, "Node-copyfrom-path")) - continue; - strbuf_reset(&node_ctx.src); - strbuf_addstr(&node_ctx.src, val); - strbuf_addf(&rev_ctx.note, "%s\n", t); - break; - case sizeof("Node-copyfrom-rev"): - if (constcmp(t, "Node-copyfrom-rev")) - continue; - node_ctx.srcRev = atoi(val); - strbuf_addf(&rev_ctx.note, "%s\n", t); - break; - case sizeof("Text-content-length"): - if (constcmp(t, "Text") && constcmp(t, "Prop")) - continue; - if (constcmp(t + 4, "-content-length")) - continue; - { - char *end; - uintmax_t len; - - len = strtoumax(val, &end, 10); - if (!isdigit(*val) || *end) - die("invalid dump: non-numeric length %s", val); - if (len > maximum_signed_value_of_type(off_t)) - die("unrepresentable length in dump: %s", val); - - if (*t == 'T') - node_ctx.text_length = (off_t) len; - else - node_ctx.prop_length = (off_t) len; - break; - } - case sizeof("Text-delta"): - if (!constcmp(t, "Text-delta")) { - node_ctx.text_delta = !strcmp(val, "true"); - break; - } - if (constcmp(t, "Prop-delta")) - continue; - node_ctx.prop_delta = !strcmp(val, "true"); - break; - case sizeof("Content-length"): - if (constcmp(t, "Content-length")) - continue; - len = atoi(val); - t = buffer_read_line(&input); - if (!t) - die_short_read(); - if (*t) - die("invalid dump: expected blank line after content length header"); - if (active_ctx == REV_CTX) { - read_props(); - } else if (active_ctx == NODE_CTX) { - handle_node(); - active_ctx = INTERNODE_CTX; - } else { - fprintf(stderr, "Unexpected content length header: %"PRIu32"\n", len); - if (buffer_skip_bytes(&input, len) != len) - die_short_read(); - } - } - } - if (buffer_ferror(&input)) - die_short_read(); - if (active_ctx == NODE_CTX) - handle_node(); - if (active_ctx == REV_CTX) - begin_revision(local_ref); - if (active_ctx != DUMP_CTX) - end_revision(notes_ref); -} - -static void init(int report_fd) -{ - fast_export_init(report_fd); - strbuf_init(&dump_ctx.uuid, 4096); - strbuf_init(&dump_ctx.url, 4096); - strbuf_init(&rev_ctx.log, 4096); - strbuf_init(&rev_ctx.author, 4096); - strbuf_init(&rev_ctx.note, 4096); - strbuf_init(&node_ctx.src, 4096); - strbuf_init(&node_ctx.dst, 4096); - reset_dump_ctx(NULL); - reset_rev_ctx(0); - reset_node_ctx(NULL); - return; -} - -int svndump_init(const char *filename) -{ - if (buffer_init(&input, filename)) - return error_errno("cannot open %s", filename ? filename : "NULL"); - init(REPORT_FILENO); - return 0; -} - -int svndump_init_fd(int in_fd, int back_fd) -{ - if(buffer_fdinit(&input, xdup(in_fd))) - return error_errno("cannot open fd %d", in_fd); - init(xdup(back_fd)); - return 0; -} - -void svndump_deinit(void) -{ - fast_export_deinit(); - reset_dump_ctx(NULL); - reset_rev_ctx(0); - reset_node_ctx(NULL); - strbuf_release(&rev_ctx.log); - strbuf_release(&rev_ctx.author); - strbuf_release(&rev_ctx.note); - strbuf_release(&node_ctx.src); - strbuf_release(&node_ctx.dst); - if (buffer_deinit(&input)) - fprintf(stderr, "Input error\n"); - if (ferror(stdout)) - fprintf(stderr, "Output error\n"); -} - -void svndump_reset(void) -{ - strbuf_release(&dump_ctx.uuid); - strbuf_release(&dump_ctx.url); - strbuf_release(&rev_ctx.log); - strbuf_release(&rev_ctx.author); -} diff --git a/third_party/git/walker.c b/third_party/git/walker.c index 06cd2bd569..4984bf8b3d 100644 --- a/third_party/git/walker.c +++ b/third_party/git/walker.c @@ -8,6 +8,7 @@ #include "tag.h" #include "blob.h" #include "refs.h" +#include "progress.h" static struct object_id current_commit_oid; @@ -162,6 +163,11 @@ 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; @@ -176,15 +182,20 @@ 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)) + if (process_object(walker, obj)) { + stop_progress(&progress); return -1; + } + display_progress(progress, ++nr); } + stop_progress(&progress); return 0; } @@ -261,12 +272,14 @@ 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 = xmalloc(targets * sizeof(struct object_id)); + struct object_id *oids; 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 6d8ae00e5b..d40b016bab 100644 --- a/third_party/git/walker.h +++ b/third_party/git/walker.h @@ -10,6 +10,7 @@ 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 5b4793caa3..f84ceae87d 100644 --- a/third_party/git/worktree.c +++ b/third_party/git/worktree.c @@ -21,7 +21,7 @@ void free_worktrees(struct worktree **worktrees) } /** - * Update head_sha1, head_ref and is_detached of the given worktree + * Update head_oid, head_ref and is_detached of the given worktree */ static void add_head_info(struct worktree *wt) { @@ -47,14 +47,10 @@ 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()); - if (!strbuf_strip_suffix(&worktree_path, "/.git")) - strbuf_strip_suffix(&worktree_path, "/."); - - strbuf_addf(&path, "%s/HEAD", get_git_common_dir()); + strbuf_add_real_path(&worktree_path, get_git_common_dir()); + strbuf_strip_suffix(&worktree_path, "/.git"); worktree = xcalloc(1, sizeof(*worktree)); worktree->path = strbuf_detach(&worktree_path, NULL); @@ -68,9 +64,6 @@ static struct worktree *get_main_worktree(void) worktree->is_bare = (is_bare_repository_cfg == 1) || is_bare_repository(); add_head_info(worktree); - - strbuf_release(&path); - strbuf_release(&worktree_path); return worktree; } @@ -87,16 +80,8 @@ static struct worktree *get_linked_worktree(const char *id) if (strbuf_read_file(&worktree_path, path.buf, 0) <= 0) /* invalid gitdir file */ goto done; - strbuf_rtrim(&worktree_path); - if (!strbuf_strip_suffix(&worktree_path, "/.git")) { - strbuf_reset(&worktree_path); - strbuf_add_absolute_path(&worktree_path, "."); - strbuf_strip_suffix(&worktree_path, "/."); - } - - strbuf_reset(&path); - strbuf_addf(&path, "%s/worktrees/%s/HEAD", get_git_common_dir(), id); + strbuf_strip_suffix(&worktree_path, "/.git"); worktree = xcalloc(1, sizeof(*worktree)); worktree->path = strbuf_detach(&worktree_path, NULL); @@ -126,14 +111,7 @@ static void mark_current_worktree(struct worktree **worktrees) free(git_dir); } -static int compare_worktree(const void *a_, const void *b_) -{ - const struct worktree *const *a = a_; - const struct worktree *const *b = b_; - return fspathcmp((*a)->path, (*b)->path); -} - -struct worktree **get_worktrees(unsigned flags) +struct worktree **get_worktrees(void) { struct worktree **list = NULL; struct strbuf path = STRBUF_INIT; @@ -164,13 +142,6 @@ struct worktree **get_worktrees(unsigned flags) ALLOC_GROW(list, counter + 1, alloc); list[counter] = NULL; - if (flags & GWT_SORT_LINKED) - /* - * don't sort the first item (main worktree), which will - * always be the first - */ - QSORT(list + 1, counter - 1, compare_worktree); - mark_current_worktree(list); return list; } @@ -215,7 +186,6 @@ 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))) @@ -223,19 +193,27 @@ struct worktree *find_worktree(struct worktree **list, if (prefix) arg = to_free = prefix_filename(prefix, arg); - path = real_pathdup(arg, 0); - if (!path) { - free(to_free); + wt = find_worktree_by_path(list, arg); + free(to_free); + return wt; +} + +struct worktree *find_worktree_by_path(struct worktree **list, const char *p) +{ + struct strbuf wt_path = STRBUF_INIT; + char *path = real_pathdup(p, 0); + + if (!path) return NULL; - } for (; *list; list++) { - const char *wt_path = real_path_if_valid((*list)->path); + if (!strbuf_realpath(&wt_path, (*list)->path, 0)) + continue; - if (wt_path && !fspathcmp(path, wt_path)) + if (!fspathcmp(path, wt_path.buf)) break; } free(path); - free(to_free); + strbuf_release(&wt_path); return *list; } @@ -284,6 +262,7 @@ int validate_worktree(const struct worktree *wt, struct strbuf *errmsg, unsigned flags) { struct strbuf wt_path = STRBUF_INIT; + struct strbuf realpath = STRBUF_INIT; char *path = NULL; int err, ret = -1; @@ -335,7 +314,8 @@ int validate_worktree(const struct worktree *wt, struct strbuf *errmsg, goto done; } - ret = fspathcmp(path, real_path(git_common_path("worktrees/%s", wt->id))); + strbuf_realpath(&realpath, git_common_path("worktrees/%s", wt->id), 1); + ret = fspathcmp(path, realpath.buf); if (ret) strbuf_addf_gently(errmsg, _("'%s' does not point back to '%s'"), @@ -343,6 +323,7 @@ int validate_worktree(const struct worktree *wt, struct strbuf *errmsg, done: free(path); strbuf_release(&wt_path); + strbuf_release(&realpath); return ret; } @@ -371,13 +352,12 @@ int is_worktree_being_rebased(const struct worktree *wt, memset(&state, 0, sizeof(state)); found_rebase = wt_status_check_rebase(wt, &state) && - ((state.rebase_in_progress || - state.rebase_interactive_in_progress) && - state.branch && - starts_with(target, "refs/heads/") && - !strcmp(state.branch, target + strlen("refs/heads/"))); - free(state.branch); - free(state.onto); + (state.rebase_in_progress || + state.rebase_interactive_in_progress) && + state.branch && + skip_prefix(target, "refs/heads/", &target) && + !strcmp(state.branch, target); + wt_status_state_free_buffers(&state); return found_rebase; } @@ -385,15 +365,15 @@ int is_worktree_being_bisected(const struct worktree *wt, const char *target) { struct wt_status_state state; - int found_rebase; + int found_bisect; memset(&state, 0, sizeof(state)); - found_rebase = wt_status_check_bisect(wt, &state) && - state.branch && - starts_with(target, "refs/heads/") && - !strcmp(state.branch, target + strlen("refs/heads/")); - free(state.branch); - return found_rebase; + found_bisect = wt_status_check_bisect(wt, &state) && + state.branch && + skip_prefix(target, "refs/heads/", &target) && + !strcmp(state.branch, target); + wt_status_state_free_buffers(&state); + return found_bisect; } /* @@ -411,7 +391,7 @@ const struct worktree *find_shared_symref(const char *symref, if (worktrees) free_worktrees(worktrees); - worktrees = get_worktrees(0); + worktrees = get_worktrees(); for (i = 0; worktrees[i]; i++) { struct worktree *wt = worktrees[i]; @@ -449,7 +429,7 @@ const struct worktree *find_shared_symref(const char *symref, int submodule_uses_worktrees(const char *path) { char *submodule_gitdir; - struct strbuf sb = STRBUF_INIT; + struct strbuf sb = STRBUF_INIT, err = STRBUF_INIT; DIR *dir; struct dirent *d; int ret = 0; @@ -463,18 +443,16 @@ int submodule_uses_worktrees(const char *path) get_common_dir_noenv(&sb, submodule_gitdir); free(submodule_gitdir); - /* - * The check below is only known to be good for repository format - * version 0 at the time of writing this code. - */ strbuf_addstr(&sb, "/config"); read_repository_format(&format, sb.buf); - if (format.version != 0) { + if (verify_repository_format(&format, &err)) { + strbuf_release(&err); strbuf_release(&sb); clear_repository_format(&format); return 1; } clear_repository_format(&format); + strbuf_release(&err); /* Replace config by worktrees. */ strbuf_setlen(&sb, sb.len - strlen("config")); @@ -558,21 +536,13 @@ void strbuf_worktree_ref(const struct worktree *wt, strbuf_addstr(sb, refname); } -const char *worktree_ref(const struct worktree *wt, const char *refname) -{ - static struct strbuf sb = STRBUF_INIT; - - strbuf_reset(&sb); - strbuf_worktree_ref(wt, &sb, refname); - return sb.buf; -} - int other_head_refs(each_ref_fn fn, void *cb_data) { struct worktree **worktrees, **p; + struct strbuf refname = STRBUF_INIT; int ret = 0; - worktrees = get_worktrees(0); + worktrees = get_worktrees(); for (p = worktrees; *p; p++) { struct worktree *wt = *p; struct object_id oid; @@ -581,14 +551,152 @@ int other_head_refs(each_ref_fn fn, void *cb_data) if (wt->is_current) continue; + strbuf_reset(&refname); + strbuf_worktree_ref(wt, &refname, "HEAD"); if (!refs_read_ref_full(get_main_ref_store(the_repository), - worktree_ref(wt, "HEAD"), + refname.buf, RESOLVE_REF_READING, &oid, &flag)) - ret = fn(worktree_ref(wt, "HEAD"), &oid, flag, cb_data); + ret = fn(refname.buf, &oid, flag, cb_data); if (ret) break; } free_worktrees(worktrees); + strbuf_release(&refname); return ret; } + +/* + * Repair worktree's /path/to/worktree/.git file if missing, corrupt, or not + * pointing at <repo>/worktrees/<id>. + */ +static void repair_gitfile(struct worktree *wt, + worktree_repair_fn fn, void *cb_data) +{ + struct strbuf dotgit = STRBUF_INIT; + struct strbuf repo = STRBUF_INIT; + char *backlink; + const char *repair = NULL; + int err; + + /* missing worktree can't be repaired */ + if (!file_exists(wt->path)) + return; + + if (!is_directory(wt->path)) { + fn(1, wt->path, _("not a directory"), cb_data); + return; + } + + strbuf_realpath(&repo, git_common_path("worktrees/%s", wt->id), 1); + strbuf_addf(&dotgit, "%s/.git", wt->path); + backlink = xstrdup_or_null(read_gitfile_gently(dotgit.buf, &err)); + + if (err == READ_GITFILE_ERR_NOT_A_FILE) + fn(1, wt->path, _(".git is not a file"), cb_data); + else if (err) + repair = _(".git file broken"); + else if (fspathcmp(backlink, repo.buf)) + repair = _(".git file incorrect"); + + if (repair) { + fn(0, wt->path, repair, cb_data); + write_file(dotgit.buf, "gitdir: %s", repo.buf); + } + + free(backlink); + strbuf_release(&repo); + strbuf_release(&dotgit); +} + +static void repair_noop(int iserr, const char *path, const char *msg, + void *cb_data) +{ + /* nothing */ +} + +void repair_worktrees(worktree_repair_fn fn, void *cb_data) +{ + struct worktree **worktrees = get_worktrees(); + struct worktree **wt = worktrees + 1; /* +1 skips main worktree */ + + if (!fn) + fn = repair_noop; + for (; *wt; wt++) + repair_gitfile(*wt, fn, cb_data); + free_worktrees(worktrees); +} + +static int is_main_worktree_path(const char *path) +{ + struct strbuf target = STRBUF_INIT; + struct strbuf maindir = STRBUF_INIT; + int cmp; + + strbuf_add_real_path(&target, path); + strbuf_strip_suffix(&target, "/.git"); + strbuf_add_real_path(&maindir, get_git_common_dir()); + strbuf_strip_suffix(&maindir, "/.git"); + cmp = fspathcmp(maindir.buf, target.buf); + + strbuf_release(&maindir); + strbuf_release(&target); + return !cmp; +} + +/* + * Repair <repo>/worktrees/<id>/gitdir if missing, corrupt, or not pointing at + * the worktree's path. + */ +void repair_worktree_at_path(const char *path, + worktree_repair_fn fn, void *cb_data) +{ + struct strbuf dotgit = STRBUF_INIT; + struct strbuf realdotgit = STRBUF_INIT; + struct strbuf gitdir = STRBUF_INIT; + struct strbuf olddotgit = STRBUF_INIT; + char *backlink = NULL; + const char *repair = NULL; + int err; + + if (!fn) + fn = repair_noop; + + if (is_main_worktree_path(path)) + goto done; + + strbuf_addf(&dotgit, "%s/.git", path); + if (!strbuf_realpath(&realdotgit, dotgit.buf, 0)) { + fn(1, path, _("not a valid path"), cb_data); + goto done; + } + + backlink = xstrdup_or_null(read_gitfile_gently(realdotgit.buf, &err)); + if (err == READ_GITFILE_ERR_NOT_A_FILE) { + fn(1, realdotgit.buf, _("unable to locate repository; .git is not a file"), cb_data); + goto done; + } else if (err) { + fn(1, realdotgit.buf, _("unable to locate repository; .git file broken"), cb_data); + goto done; + } + + strbuf_addf(&gitdir, "%s/gitdir", backlink); + if (strbuf_read_file(&olddotgit, gitdir.buf, 0) < 0) + repair = _("gitdir unreadable"); + else { + strbuf_rtrim(&olddotgit); + if (fspathcmp(olddotgit.buf, realdotgit.buf)) + repair = _("gitdir incorrect"); + } + + if (repair) { + fn(0, gitdir.buf, repair, cb_data); + write_file(gitdir.buf, "%s", realdotgit.buf); + } +done: + free(backlink); + strbuf_release(&olddotgit); + strbuf_release(&gitdir); + strbuf_release(&realdotgit); + strbuf_release(&dotgit); +} diff --git a/third_party/git/worktree.h b/third_party/git/worktree.h index caecc7a281..f38e6fd5a2 100644 --- a/third_party/git/worktree.h +++ b/third_party/git/worktree.h @@ -18,19 +18,14 @@ struct worktree { int lock_reason_valid; /* private */ }; -/* Functions for acting on the information about worktrees. */ - -#define GWT_SORT_LINKED (1 << 0) /* keeps linked worktrees sorted */ - /* * Get the worktrees. The primary worktree will always be the first returned, - * and linked worktrees will be pointed to by 'next' in each subsequent - * worktree. No specific ordering is done on the linked worktrees. + * and linked worktrees will follow in no particular order. * * The caller is responsible for freeing the memory from the returned - * worktree(s). + * worktrees by calling free_worktrees(). */ -struct worktree **get_worktrees(unsigned flags); +struct worktree **get_worktrees(void); /* * Returns 1 if linked worktrees exist, 0 otherwise. @@ -44,14 +39,30 @@ int submodule_uses_worktrees(const char *path); const char *get_worktree_git_dir(const struct worktree *wt); /* - * Search a worktree that can be unambiguously identified by - * "arg". "prefix" must not be NULL. + * 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. */ 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); @@ -78,6 +89,29 @@ int validate_worktree(const struct worktree *wt, void update_worktree_location(struct worktree *wt, const char *path_); +typedef void (* worktree_repair_fn)(int iserr, const char *path, + const char *msg, void *cb_data); + +/* + * Visit each registered linked worktree and repair corruptions. For each + * repair made or error encountered while attempting a repair, the callback + * function, if non-NULL, is called with the path of the worktree and a + * description of the repair or error, along with the callback user-data. + */ +void repair_worktrees(worktree_repair_fn, void *cb_data); + +/* + * Repair administrative files corresponding to the worktree at the given path. + * The worktree's .git file pointing at the repository must be intact for the + * repair to succeed. Useful for re-associating an orphaned worktree with the + * repository if the worktree has been moved manually (without using "git + * worktree move"). For each repair made or error encountered while attempting + * a repair, the callback function, if non-NULL, is called with the path of the + * worktree and a description of the repair or error, along with the callback + * user-data. + */ +void repair_worktree_at_path(const char *, worktree_repair_fn, void *cb_data); + /* * Free up the memory for worktree(s) */ @@ -125,11 +159,4 @@ void strbuf_worktree_ref(const struct worktree *wt, struct strbuf *sb, const char *refname); -/* - * Return a refname suitable for access from the current ref - * store. The result will be destroyed at the next call. - */ -const char *worktree_ref(const struct worktree *wt, - const char *refname); - #endif diff --git a/third_party/git/wrapper.c b/third_party/git/wrapper.c index 1e45ab7b92..bcda41e374 100644 --- a/third_party/git/wrapper.c +++ b/third_party/git/wrapper.c @@ -4,12 +4,6 @@ #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; @@ -30,24 +24,11 @@ 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) { - try_to_free_routine(strlen(str) + 1); - ret = strdup(str); - if (!ret) - die("Out of memory, strdup failed"); - } + if (!ret) + die("Out of memory, strdup failed"); return ret; } @@ -61,19 +42,13 @@ static void *do_xmalloc(size_t size, int gentle) if (!ret && !size) ret = malloc(1); if (!ret) { - 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; - } + 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 @@ -130,22 +105,27 @@ char *xstrndup(const char *str, size_t len) return xmemdupz(str, p ? p - str : len); } +int xstrncmpz(const char *s, const char *t, size_t len) +{ + int res = strncmp(s, t, len); + if (res) + return res; + return s[len] == '\0' ? 0 : 1; +} + void *xrealloc(void *ptr, size_t size) { void *ret; + if (!size) { + free(ptr); + return xmalloc(0); + } + memory_limit_check(size, 0); ret = realloc(ptr, size); - if (!ret && !size) - ret = realloc(ptr, 1); - 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"); - } + if (!ret) + die("Out of memory, realloc failed"); return ret; } @@ -160,14 +140,8 @@ void *xcalloc(size_t nmemb, size_t size) ret = calloc(nmemb, size); if (!ret && (!nmemb || !size)) ret = calloc(1, 1); - 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"); - } + if (!ret) + die("Out of memory, calloc failed"); return ret; } @@ -255,7 +229,7 @@ ssize_t xread(int fd, void *buf, size_t len) { ssize_t nr; if (len > MAX_IO_SIZE) - len = MAX_IO_SIZE; + len = MAX_IO_SIZE; while (1) { nr = read(fd, buf, len); if (nr < 0) { @@ -277,7 +251,7 @@ ssize_t xwrite(int fd, const void *buf, size_t len) { ssize_t nr; if (len > MAX_IO_SIZE) - len = MAX_IO_SIZE; + len = MAX_IO_SIZE; while (1) { nr = write(fd, buf, len); if (nr < 0) { @@ -478,7 +452,9 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode) "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "0123456789"; - static const int num_letters = 62; + 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; uint64_t value; struct timeval tv; char *filename_template; @@ -487,12 +463,12 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode) len = strlen(pattern); - if (len < 6 + suffix_len) { + if (len < num_x + suffix_len) { errno = EINVAL; return -1; } - if (strncmp(&pattern[len - 6 - suffix_len], "XXXXXX", 6)) { + if (strncmp(&pattern[len - num_x - suffix_len], x_pattern, num_x)) { errno = EINVAL; return -1; } @@ -503,16 +479,15 @@ 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 - 6 - suffix_len]; + filename_template = &pattern[len - num_x - suffix_len]; for (count = 0; count < TMP_MAX; ++count) { uint64_t v = value; + int i; /* Fill in the random bits. */ - 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; + for (i = 0; i < num_x; i++) { + filename_template[i] = 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 9f6c65a580..7074bbdd53 100644 --- a/third_party/git/wt-status.c +++ b/third_party/git/wt-status.c @@ -8,7 +8,7 @@ #include "diffcore.h" #include "quote.h" #include "run-command.h" -#include "argv-array.h" +#include "strvec.h" #include "remote.h" #include "refs.h" #include "submodule.h" @@ -259,8 +259,6 @@ static void wt_longstatus_print_trailer(struct wt_status *s) status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", ""); } -#define quote_path quote_path_relative - static const char *wt_status_unmerged_status_string(int stagemask) { switch (stagemask) { @@ -338,7 +336,7 @@ static void wt_longstatus_print_unmerged_data(struct wt_status *s, memset(padding, ' ', label_width); } - one = quote_path(it->string, s->prefix, &onebuf); + one = quote_path(it->string, s->prefix, &onebuf, 0); status_printf(s, color(WT_STATUS_HEADER, s), "\t"); how = wt_status_unmerged_status_string(d->stagemask); @@ -404,8 +402,8 @@ static void wt_longstatus_print_change_data(struct wt_status *s, if (d->rename_status == status) one_name = d->rename_source; - one = quote_path(one_name, s->prefix, &onebuf); - two = quote_path(two_name, s->prefix, &twobuf); + one = quote_path(one_name, s->prefix, &onebuf, 0); + two = quote_path(two_name, s->prefix, &twobuf, 0); status_printf(s, color(WT_STATUS_HEADER, s), "\t"); what = wt_status_diff_status_string(status); @@ -703,7 +701,7 @@ static void wt_status_collect_untracked(struct wt_status *s) if (!s->show_untracked_files) return; - memset(&dir, 0, sizeof(dir)); + dir_init(&dir); if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES) dir.flags |= DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES; @@ -722,23 +720,17 @@ static void wt_status_collect_untracked(struct wt_status *s) for (i = 0; i < dir.nr; i++) { struct dir_entry *ent = dir.entries[i]; - if (index_name_is_other(istate, ent->name, ent->len) && - dir_path_match(istate, ent, &s->pathspec, 0, NULL)) + if (index_name_is_other(istate, ent->name, ent->len)) string_list_insert(&s->untracked, ent->name); - free(ent); } for (i = 0; i < dir.ignored_nr; i++) { struct dir_entry *ent = dir.ignored[i]; - if (index_name_is_other(istate, ent->name, ent->len) && - dir_path_match(istate, ent, &s->pathspec, 0, NULL)) + if (index_name_is_other(istate, ent->name, ent->len)) string_list_insert(&s->ignored, ent->name); - free(ent); } - free(dir.entries); - free(dir.ignored); - clear_directory(&dir); + dir_clear(&dir); if (advice_status_u_option) s->untracked_in_ms = (getnanotime() - t_begin) / 1000000; @@ -784,9 +776,14 @@ void wt_status_collect(struct wt_status *s) void wt_status_collect_free_buffers(struct wt_status *s) { - free(s->state.branch); - free(s->state.onto); - free(s->state.detached_from); + wt_status_state_free_buffers(&s->state); +} + +void wt_status_state_free_buffers(struct wt_status_state *state) +{ + FREE_AND_NULL(state->branch); + FREE_AND_NULL(state->onto); + FREE_AND_NULL(state->detached_from); } static void wt_longstatus_print_unmerged(struct wt_status *s) @@ -915,17 +912,16 @@ static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncom struct strbuf summary = STRBUF_INIT; char *summary_content; - argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", - s->index_file); + strvec_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", s->index_file); - argv_array_push(&sm_summary.args, "submodule"); - argv_array_push(&sm_summary.args, "summary"); - argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached"); - argv_array_push(&sm_summary.args, "--for-status"); - argv_array_push(&sm_summary.args, "--summary-limit"); - argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary); + strvec_push(&sm_summary.args, "submodule"); + strvec_push(&sm_summary.args, "summary"); + strvec_push(&sm_summary.args, uncommitted ? "--files" : "--cached"); + strvec_push(&sm_summary.args, "--for-status"); + strvec_push(&sm_summary.args, "--summary-limit"); + strvec_pushf(&sm_summary.args, "%d", s->submodule_summary); if (!uncommitted) - argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD"); + strvec_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD"); sm_summary.git_cmd = 1; sm_summary.no_stdin = 1; @@ -973,7 +969,7 @@ static void wt_longstatus_print_other(struct wt_status *s, struct string_list_item *it; const char *path; it = &(l->items[i]); - path = quote_path(it->string, s->prefix, &buf); + path = quote_path(it->string, s->prefix, &buf, 0); if (column_active(s->colopts)) { string_list_append(&output, path); continue; @@ -1234,7 +1230,7 @@ static int split_commit_in_progress(struct wt_status *s) * The function assumes that the line does not contain useless spaces * before or after the command. */ -static void abbrev_sha1_in_line(struct strbuf *line) +static void abbrev_oid_in_line(struct strbuf *line) { struct strbuf **split; int i; @@ -1284,7 +1280,7 @@ static int read_rebase_todolist(const char *fname, struct string_list *lines) strbuf_trim(&line); if (!line.len) continue; - abbrev_sha1_in_line(&line); + abbrev_oid_in_line(&line); string_list_append(lines, line.buf); } fclose(f); @@ -1434,6 +1430,8 @@ 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); @@ -1461,6 +1459,8 @@ 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); @@ -1482,6 +1482,18 @@ static void show_bisect_in_progress(struct wt_status *s, wt_longstatus_print_trailer(s); } +static void show_sparse_checkout_in_use(struct wt_status *s, + const char *color) +{ + if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_DISABLED) + return; + + status_printf_ln(s, color, + _("You are in a sparse checkout with %d%% of tracked files present."), + s->state.sparse_checkout_percentage); + wt_longstatus_print_trailer(s); +} + /* * Extract branch information from rebase/bisect */ @@ -1560,10 +1572,10 @@ static void wt_status_get_detached_from(struct repository *r, return; } - if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref) == 1 && - /* sha1 is a commit? match without further lookup */ + if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref, 1) == 1 && + /* oid is a commit? match without further lookup */ (oideq(&cb.noid, &oid) || - /* perhaps sha1 is a tag, try to dereference to a commit */ + /* perhaps oid is a tag, try to dereference to a commit */ ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL && oideq(&cb.noid, &commit->object.oid)))) { const char *from = ref; @@ -1621,6 +1633,31 @@ int wt_status_check_bisect(const struct worktree *wt, return 0; } +static void wt_status_check_sparse_checkout(struct repository *r, + struct wt_status_state *state) +{ + int skip_worktree = 0; + int i; + + if (!core_apply_sparse_checkout || r->index->cache_nr == 0) { + /* + * Don't compute percentage of checked out files if we + * aren't in a sparse checkout or would get division by 0. + */ + state->sparse_checkout_percentage = SPARSE_CHECKOUT_DISABLED; + return; + } + + for (i = 0; i < r->index->cache_nr; i++) { + struct cache_entry *ce = r->index->cache[i]; + if (ce_skip_worktree(ce)) + skip_worktree++; + } + + state->sparse_checkout_percentage = + 100 - (100 * skip_worktree)/r->index->cache_nr; +} + void wt_status_get_state(struct repository *r, struct wt_status_state *state, int get_detached_from) @@ -1634,13 +1671,13 @@ void wt_status_get_state(struct repository *r, state->merge_in_progress = 1; } else if (wt_status_check_rebase(NULL, state)) { ; /* all set */ - } else if (!stat(git_path_cherry_pick_head(r), &st) && - !get_oid("CHERRY_PICK_HEAD", &oid)) { + } else if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") && + !get_oid("CHERRY_PICK_HEAD", &oid)) { state->cherry_pick_in_progress = 1; oidcpy(&state->cherry_pick_head_oid, &oid); } wt_status_check_bisect(NULL, state); - if (!stat(git_path_revert_head(r), &st) && + if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") && !get_oid("REVERT_HEAD", &oid)) { state->revert_in_progress = 1; oidcpy(&state->revert_head_oid, &oid); @@ -1656,6 +1693,7 @@ void wt_status_get_state(struct repository *r, } if (get_detached_from) wt_status_get_detached_from(r, state); + wt_status_check_sparse_checkout(r, state); } static void wt_longstatus_print_state(struct wt_status *s) @@ -1679,6 +1717,9 @@ static void wt_longstatus_print_state(struct wt_status *s) show_revert_in_progress(s, state_color); if (state->bisect_in_progress) show_bisect_in_progress(s, state_color); + + if (state->sparse_checkout_percentage != SPARSE_CHECKOUT_DISABLED) + show_sparse_checkout_in_use(s, state_color); } static void wt_longstatus_print(struct wt_status *s) @@ -1763,29 +1804,36 @@ static void wt_longstatus_print(struct wt_status *s) ; /* nothing */ else if (s->workdir_dirty) { if (s->hints) - printf(_("no changes added to commit " - "(use \"git add\" and/or \"git commit -a\")\n")); + fprintf(s->fp, _("no changes added to commit " + "(use \"git add\" and/or " + "\"git commit -a\")\n")); else - printf(_("no changes added to commit\n")); + fprintf(s->fp, _("no changes added to " + "commit\n")); } else if (s->untracked.nr) { if (s->hints) - printf(_("nothing added to commit but untracked files " - "present (use \"git add\" to track)\n")); + fprintf(s->fp, _("nothing added to commit but " + "untracked files present (use " + "\"git add\" to track)\n")); else - printf(_("nothing added to commit but untracked files present\n")); + fprintf(s->fp, _("nothing added to commit but " + "untracked files present\n")); } else if (s->is_initial) { if (s->hints) - printf(_("nothing to commit (create/copy files " - "and use \"git add\" to track)\n")); + fprintf(s->fp, _("nothing to commit (create/" + "copy files and use \"git " + "add\" to track)\n")); else - printf(_("nothing to commit\n")); + fprintf(s->fp, _("nothing to commit\n")); } else if (!s->show_untracked_files) { if (s->hints) - printf(_("nothing to commit (use -u to show untracked files)\n")); + fprintf(s->fp, _("nothing to commit (use -u to " + "show untracked files)\n")); else - printf(_("nothing to commit\n")); + fprintf(s->fp, _("nothing to commit\n")); } else - printf(_("nothing to commit, working tree clean\n")); + fprintf(s->fp, _("nothing to commit, working tree " + "clean\n")); } if(s->show_stash) wt_longstatus_print_stash_summary(s); @@ -1808,12 +1856,12 @@ static void wt_shortstatus_unmerged(struct string_list_item *it, } color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how); if (s->null_termination) { - fprintf(stdout, " %s%c", it->string, 0); + fprintf(s->fp, " %s%c", it->string, 0); } else { struct strbuf onebuf = STRBUF_INIT; const char *one; - one = quote_path(it->string, s->prefix, &onebuf); - printf(" %s\n", one); + one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP); + fprintf(s->fp, " %s\n", one); strbuf_release(&onebuf); } } @@ -1826,37 +1874,28 @@ static void wt_shortstatus_status(struct string_list_item *it, if (d->index_status) color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status); else - putchar(' '); + fputc(' ', s->fp); if (d->worktree_status) color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status); else - putchar(' '); - putchar(' '); + fputc(' ', s->fp); + fputc(' ', s->fp); if (s->null_termination) { - fprintf(stdout, "%s%c", it->string, 0); + fprintf(s->fp, "%s%c", it->string, 0); if (d->rename_source) - fprintf(stdout, "%s%c", d->rename_source, 0); + fprintf(s->fp, "%s%c", d->rename_source, 0); } else { struct strbuf onebuf = STRBUF_INIT; const char *one; if (d->rename_source) { - one = quote_path(d->rename_source, s->prefix, &onebuf); - if (*one != '"' && strchr(one, ' ') != NULL) { - putchar('"'); - strbuf_addch(&onebuf, '"'); - one = onebuf.buf; - } - printf("%s -> ", one); + one = quote_path(d->rename_source, s->prefix, &onebuf, + QUOTE_PATH_QUOTE_SP); + fprintf(s->fp, "%s -> ", one); strbuf_release(&onebuf); } - one = quote_path(it->string, s->prefix, &onebuf); - if (*one != '"' && strchr(one, ' ') != NULL) { - putchar('"'); - strbuf_addch(&onebuf, '"'); - one = onebuf.buf; - } - printf("%s\n", one); + one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP); + fprintf(s->fp, "%s\n", one); strbuf_release(&onebuf); } } @@ -1865,13 +1904,13 @@ static void wt_shortstatus_other(struct string_list_item *it, struct wt_status *s, const char *sign) { if (s->null_termination) { - fprintf(stdout, "%s %s%c", sign, it->string, 0); + fprintf(s->fp, "%s %s%c", sign, it->string, 0); } else { struct strbuf onebuf = STRBUF_INIT; const char *one; - one = quote_path(it->string, s->prefix, &onebuf); + one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP); color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign); - printf(" %s\n", one); + fprintf(s->fp, " %s\n", one); strbuf_release(&onebuf); } } @@ -1992,7 +2031,7 @@ static void wt_porcelain_print(struct wt_status *s) * [# branch.upstream <upstream><eol> * [# branch.ab +<ahead> -<behind><eol>]] * - * <commit> ::= the current commit hash or the the literal + * <commit> ::= the current commit hash or the literal * "(initial)" to indicate an initialized repo * with no commits. * @@ -2025,7 +2064,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)" : sha1_to_hex(s->sha1_commit)), + (s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)), eol); if (!s->branch) @@ -2186,9 +2225,9 @@ static void wt_porcelain_v2_print_changed_entry( */ sep_char = '\t'; eol_char = '\n'; - path = quote_path(it->string, s->prefix, &buf); + path = quote_path(it->string, s->prefix, &buf, 0); if (d->rename_source) - path_from = quote_path(d->rename_source, s->prefix, &buf_from); + path_from = quote_path(d->rename_source, s->prefix, &buf_from, 0); } if (path_from) @@ -2274,7 +2313,7 @@ static void wt_porcelain_v2_print_unmerged_entry( if (s->null_termination) path_index = it->string; else - path_index = quote_path(it->string, s->prefix, &buf_index); + path_index = quote_path(it->string, s->prefix, &buf_index, 0); fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c", unmerged_prefix, key, submodule_token, @@ -2307,7 +2346,7 @@ static void wt_porcelain_v2_print_other( path = it->string; eol_char = '\0'; } else { - path = quote_path(it->string, s->prefix, &buf); + path = quote_path(it->string, s->prefix, &buf, 0); eol_char = '\n'; } diff --git a/third_party/git/wt-status.h b/third_party/git/wt-status.h index 77dad5b920..35b44c388e 100644 --- a/third_party/git/wt-status.h +++ b/third_party/git/wt-status.h @@ -38,9 +38,22 @@ enum show_ignored_type { enum commit_whence { FROM_COMMIT, /* normal */ FROM_MERGE, /* commit came from merge */ - FROM_CHERRY_PICK /* commit came from cherry-pick */ + FROM_CHERRY_PICK_SINGLE, /* commit came from cherry-pick */ + FROM_CHERRY_PICK_MULTI, /* commit came from a sequence of cherry-picks */ + FROM_REBASE_PICK /* commit came from a pick/reword/edit */ }; +static inline int is_from_cherry_pick(enum commit_whence whence) +{ + return whence == FROM_CHERRY_PICK_SINGLE || + whence == FROM_CHERRY_PICK_MULTI; +} + +static inline int is_from_rebase(enum commit_whence whence) +{ + return whence == FROM_REBASE_PICK; +} + struct wt_status_change_data { int worktree_status; int index_status; @@ -66,6 +79,7 @@ enum wt_status_format { #define HEAD_DETACHED_AT _("HEAD detached at ") #define HEAD_DETACHED_FROM _("HEAD detached from ") +#define SPARSE_CHECKOUT_DISABLED -1 struct wt_status_state { int merge_in_progress; @@ -77,6 +91,7 @@ struct wt_status_state { int bisect_in_progress; int revert_in_progress; int detached_at; + int sparse_checkout_percentage; /* SPARSE_CHECKOUT_DISABLED if not sparse */ char *branch; char *onto; char *detached_from; @@ -116,7 +131,7 @@ struct wt_status { int rename_limit; enum wt_status_format status_format; struct wt_status_state state; - unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */ + struct object_id oid_commit; /* when not Initial */ /* These are computed during processing of the individual sections */ int committable; @@ -136,7 +151,14 @@ void wt_status_add_cut_line(FILE *fp); void wt_status_prepare(struct repository *r, struct wt_status *s); void wt_status_print(struct wt_status *s); void wt_status_collect(struct wt_status *s); +/* + * Frees the buffers allocated by wt_status_collect. + */ void wt_status_collect_free_buffers(struct wt_status *s); +/* + * Frees the buffers of the wt_status_state. + */ +void wt_status_state_free_buffers(struct wt_status_state *s); void wt_status_get_state(struct repository *repo, struct wt_status_state *state, int get_detached_from); diff --git a/third_party/git/xdiff-interface.c b/third_party/git/xdiff-interface.c index 8509f9ea22..4d20069302 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->ptr + a->size; - char *bp = b->ptr + b->size; + char *ap = a->size ? a->ptr + a->size : a->ptr; + char *bp = b->size ? b->ptr + b->size : b->ptr; long smaller = (a->size < b->size) ? a->size : b->size; while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) { @@ -250,9 +250,13 @@ 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 = strchr(value, '\n'), *expression; + const char *ep, *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); @@ -265,7 +269,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 + 1; + value = ep ? ep + 1 : NULL; } } diff --git a/third_party/git/xdiff-interface.h b/third_party/git/xdiff-interface.h index ede4246bbd..93df26900c 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 comparision. + * are treated for the comparison. */ 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 1f1f4a3c78..bd035139f9 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 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. + * 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. */ static long xdl_split(unsigned long const *ha1, long off1, long lim1, unsigned long const *ha2, long off2, long lim2, @@ -63,11 +63,13 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1, int got_snake = 0; /* - * We need to extent the diagonal "domain" by one. If the next + * We need to extend 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 check inside the core loop. + * avoid extra conditions in the check inside the core loop. */ if (fmin > dmin) kvdf[--fmin - 1] = -1; @@ -98,11 +100,13 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1, } /* - * We need to extent the diagonal "domain" by one. If the next + * We need to extend 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 check inside the core loop. + * avoid extra conditions in the check inside the core loop. */ if (bmin > dmin) kvdb[--bmin - 1] = XDL_LINE_MAX; @@ -138,7 +142,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 the, have reached an "interesting" path. Our + * if some of them 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 @@ -196,8 +200,9 @@ 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; @@ -244,9 +249,9 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1, /* - * 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. + * 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. */ int xdl_recs_cmp(diffdata_t *dd1, long off1, long lim1, diffdata_t *dd2, long off2, long lim2, @@ -323,7 +328,9 @@ 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; @@ -394,8 +401,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 @@ -429,9 +436,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 @@ -443,8 +450,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; @@ -454,8 +461,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; @@ -581,13 +588,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) { @@ -809,13 +816,16 @@ 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; @@ -858,17 +868,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)) @@ -879,14 +889,15 @@ 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 30713ae9a9..9d7d6c5087 100644 --- a/third_party/git/xdiff/xemit.c +++ b/third_party/git/xdiff/xemit.c @@ -172,10 +172,12 @@ 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); @@ -212,6 +214,21 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, 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; + } } } |